diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c919b1d8..6273ddde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,13 +24,25 @@ jobs:
       # default build, so lint it in a dedicated pass.
       - run: cargo clippy -p exav-core --all-targets --features unstable-internals -- -D warnings
       - run: cargo clippy -p exav-render --all-targets --features dwg -- -D warnings
-      - run: cargo clippy -p exav-render --all-targets --no-default-features --features ifc,stl -- -D warnings
+      - run: cargo clippy -p exav --all-targets --no-default-features --features yara,zip -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features ifc,stl,obj,ply,gltf -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features markdown -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features text-pdf -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features office-sheets -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features office-slides -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features office-docs -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features office,office-test-util -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features -- -D warnings
+      - run: cargo clippy -p exav-render --all-targets --no-default-features --features text-office,office-test-util -- -D warnings
+      - run: cargo clippy -p exav-core --all-targets --features visible-text-office -- -D warnings
+      - run: cargo clippy -p exav-grep --all-targets --features text-office -- -D warnings
+      - run: cargo clippy -p exav-unpack --all-targets --features text-pdf -- -D warnings
       # The full native test matrix, every feature pass. Defined once in the
       # Makefile so this and a local `make test` can't drift.
       - run: make test-native
 
-  # The promised floor is `rust-version` in Cargo.toml (1.92, imposed by the
-  # hayro image decoders). `make msrv` reads it there and installs that toolchain on
+  # The promised floor is `rust-version` in Cargo.toml (1.95, imposed by the
+  # delharc LHA reader). `make msrv` reads it there and installs that toolchain on
   # demand, so a bump flows through with no edit here, and a contributor on
   # stable can't land a newer feature without this going red.
   msrv:
@@ -127,7 +139,7 @@ jobs:
       - uses: actions/checkout@v7
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 24
           cache: npm
           cache-dependency-path: www/package-lock.json
       # exav.org is the authoritative answer on format coverage and CLI flags,
@@ -194,7 +206,7 @@ jobs:
           # the masked fixtures are unmasked.
           seeds="$RUNNER_TEMP/fuzz-seeds"
           scripts/fuzz-seeds.sh "$seeds"
-          for t in filetype sigs cvd pe unpack analyze bytecode full_pipeline seekable yara pcre clamd icap volumes authenticode database ndb_compile rar3_ppmd pe_emulator x86_decode parser_recursion imagehash drawing cad_dxf cad_dwg ifc; do
+          for t in filetype sigs cvd pe unpack analyze bytecode full_pipeline seekable yara pcre clamd icap volumes authenticode database ndb_compile rar3_ppmd pe_emulator x86_decode parser_recursion imagehash drawing cad_dxf cad_dwg ifc mesh; do
             mkdir -p "fuzz/corpus/$t"
             extra=""
             [ -d "$seeds/$t" ] && extra="$seeds/$t"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d86142dc..1830849d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -128,7 +128,7 @@ jobs:
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest
+            type=raw,value=latest,enable=${{ !contains(github.ref_name, '-') }}
       - uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e63d2ac6..732028ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,6 +33,22 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+      # Everything a release publishes is labelled with a version of its own:
+      # the binaries with the workspace's, the npm packages with theirs. One
+      # that was not bumped ships next to the others under another number, and
+      # nothing else fails. Checked before anything is built.
+      - name: Check every version matches the tag
+        run: |
+          TAG_VERSION="${GITHUB_REF_NAME#v}"
+          WORKSPACE=$(sed -n '/^\[workspace.package\]/,/^\[/{s/^version *= *"\(.*\)"/\1/p;}' Cargo.toml | head -1)
+          VIEWER=$(node -p "require('./crates/exav-viewer/package.json').version")
+          UNPACK=$(node -p "require('./crates/exav-unpack-wasm/package.json').version")
+          status=0
+          for pair in "Cargo.toml:$WORKSPACE" "crates/exav-viewer/package.json:$VIEWER" "crates/exav-unpack-wasm/package.json:$UNPACK"; do
+            file="${pair%%:*}"; version="${pair#*:}"
+            [ "$version" = "$TAG_VERSION" ] || { echo "$file is $version, the tag is $TAG_VERSION"; status=1; }
+          done
+          exit $status
       - uses: taiki-e/create-gh-release-action@v1
         with:
           # The release notes are this tag's section of the changelog
diff --git a/.github/workflows/www.yml b/.github/workflows/www.yml
index bdf952f5..68659e85 100644
--- a/.github/workflows/www.yml
+++ b/.github/workflows/www.yml
@@ -49,6 +49,10 @@ jobs:
             --site "${{ steps.pages.outputs.origin }}" \
             --base "${{ steps.pages.outputs.base_path }}"
         working-directory: ${{ env.BUILD_PATH }}
+      # Every internal link and #anchor of the built pages must resolve (offline,
+      # a second or two). The demo's own pages are copied in below.
+      - name: Check internal links
+        run: node scripts/check-links.mjs ${{ env.BUILD_PATH }}/dist
       # The @exav/viewer demo, served at /viewer/demo/: the package and its wasm
       # modules built from this commit, the archive engine's pkg/ too.
       - uses: dtolnay/rust-toolchain@stable
@@ -71,8 +75,14 @@ jobs:
           npm ci
           npm run build:wasm
           npm run build
-          # The sidebar's files: github.com/sylvinus/exav-samples, HEAD.
+          # The sidebar's files, from the network: github.com/sylvinus/exav-samples, HEAD.
           npm run demo:showcase
+          # `demo:build` runs `npm run demo:examples` first: the example files
+          # committed under demo/examples/files/ are copied, and the others (tens
+          # of MB, from Zenodo, figshare, Wikimedia Commons and the like) are
+          # downloaded at build time, each checked against its size and SHA-256 in
+          # demo/examples/examples.json. The build fails when one cannot be fetched
+          # or has changed.
           # DEMO_ORIGIN goes into the sandboxed frame's policy, for Safari.
           DEMO_BASE="${{ steps.pages.outputs.base_path }}/viewer/demo/" DEMO_ORIGIN="${{ steps.pages.outputs.origin }}" npm run demo:build
           # dist/viewer/ holds the File viewer docs; the demo must not land on them.
diff --git a/.oss-scanner/Dockerfile b/.oss-scanner/Dockerfile
index 420c5858..97959193 100644
--- a/.oss-scanner/Dockerfile
+++ b/.oss-scanner/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Build it the way the scanner does, from the repository root:
 #   docker build -f .oss-scanner/Dockerfile -t exav-oss-scanner .
-FROM rust:1.92-bookworm
+FROM rust:1.95-bookworm
 
 # Frame pointers and line tables for a debugger, without the full debug info
 # that makes the build several times larger.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3df55884..02fdf119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,114 @@ follow [semantic versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.0.3] - 2026-10-29
+
+Many more formats read, in place and in bounded memory; a visible-text layer;
+a much larger viewer; and a review round that closed the cases where exav read
+a file differently from the program that opens it.
+
+### Highlights
+
+- **More formats, read where they lie.** Virtual disks (VHD, VHDX, QCOW2,
+  VMDK), filesystems (exFAT, SquashFS, cramfs, romfs, EROFS, HFS+, APFS, with
+  ext, FAT and NTFS) and 7z, WIM and xar are read from a seekable source
+  without holding them. A file past `--max-object-bytes` inside one is
+  scanned in full, not skipped. The registry lists 126 formats.
+- **A visible-text layer** (`visible-text`, on by default, off under
+  `--clamav-compat`): Markdown, HTML, Word, PowerPoint, Excel, OpenDocument and
+  AutoCAD files are also scanned as the text a reader sees, for `Target:0` and
+  `Target:7` signatures and `--alert-phishing`. PDF text and the text of legacy
+  and flat office files (DOC, XLS, PPT, RTF, FODT and others) are opt-in
+  (`visible-text-pdf`, `visible-text-office`). `exav-grep --text` searches it.
+- **Office documents converted in safe Rust, in `exav-render`** (features
+  `office-sheets`, `office-slides`, `office-docs`, `office`; none is a
+  default): XLS, ODS, FODS, Numbers, Excel 2003 XML, HTML tables and SYLK to
+  XLSX; PowerPoint 95 to 2003, ODP, FODP and Keynote to PPTX; DOC, ODT, FODT,
+  RTF, Word 2003 XML and Pages to DOCX; ODG, FODG and Visio (VSDX) to PPTX.
+  The viewer shows them through `xlsx()`, `pptx()` and `docx()`. Each file is
+  bounded in input, memory and decompressed size, and an encrypted, oversized
+  or damaged file is reported with its reason.
+- **One reader per format.** The scanner and `exav-render` share the readers
+  for OLE2 (`exav_unpack::cfb`), Excel decryption, RTF, BIFF and code pages.
+- **Bounded memory and time.** Deterministic sweeps (`saturate`, `nesting`,
+  `office_memory`) and new limits for the block cache, bytecode memory and
+  archive entries; `exav-grep` searches a file of any size in bounded memory.
+- **The viewer** (`@exav/viewer`) opens many more files (RAW cameras, JPEG XL,
+  SVG, OBJ, PLY, glTF, more IFC, older Office, more archives), draws pages of
+  documents, 3D models and drawings, can be driven by the host's own UI, and
+  speaks German, Spanish and Dutch.
+- **Daemon**: `--listen-health ADDR`, a listener that answers while the
+  workers are busy, and a `STATS` that reports the whole pool.
+
+### Breaking changes
+
+- The minimum Rust version is 1.95 (it was 1.92) and every crate is edition
+  2024.
+- A `.cvd` whose header md5 does not match, or that is cut short, is refused.
+- A source with no end (`exav /dev/zero`) is an error, not `OK`.
+- A YARA rule nested more than 10 parentheses deep is refused (12 before): the
+  parser's time doubles with each level.
+- A one-shot scan that `--max-scan-secs` ends keeps the exit status of what it
+  found (`1`, then `2`) and otherwise follows `--partial-as`; it was always `3`.
+- The `Content-Range` of an HTTP answer is checked; a server that answers
+  with another range or object is an error.
+- `--object-cache-block-bytes` defaults to 1 MiB (it was 64 KiB, fixed).
+- The viewer's CSS prefix is `exav-viewer-` (it was `exv-`), the sandboxed
+  frame's protocol is version 5 (it was 3), and `controllers.viewport` is
+  computed only while used.
+- exav-render's office features depend on `exav-unpack`. `exav-unpack`'s `ole`
+  feature no longer pulls the `cfb` crate, now a dev-dependency.
+- `exav-unpack` ext, FAT, HFS+ and APFS readers are in-tree: member names no
+  longer begin with `/`, and a damaged volume ends with an error after the
+  files before the damage.
+- Objects already scanned clean in the same place are scanned once per scan.
+
+### Added
+
+- Settings: `--max-extracted-bytes` (back), `--max-bytecode-memory-bytes`,
+  `--object-cache-bytes`, `--object-cache-block-bytes`, `--http-request-bytes`,
+  `maxArchiveEntries` and `maxEntities` in the viewer.
+- Formats: LZFSE, LZVN and InstallShield Z in-tree, camera RAW, DDS, ICO and cursors, PLY, OBJ, glTF, TIFF variants (fax,
+  CMYK, Zstandard, tiled, planar and more), and an external converter hook for
+  the viewer.
+- `scripts/bench-speed.sh`, a speed benchmark against `clamscan`.
+- 243 freely licensed example files for the viewer demo.
+
+### Changed
+
+- Dependencies are at their latest versions, except the image decoders pinned
+  to libclamav 1.5.4. Fewer dependencies and less `unsafe`: 8 crates and
+  1,155 `unsafe` uses fewer in a default build.
+- `fuzzy_img` JPEGs are decoded by zune-jpeg 0.5.15, not libclamav's 0.5.8: the
+  hashes are the same except for baseline JPEGs with a scan for each component,
+  which 0.5.8 drew flat (`8000000000000000`), and damaged files it panicked on.
+- A damaged CAB or archive keeps more of what it decoded.
+
+### Fixed
+
+The ones that could change a verdict:
+
+- **Files that a reader opens differently from exav are read as that reader
+  reads them:** ZIP, PDF, mail, ISO and UDF, `ar`, `cpio`, bzip2, xz, CAB,
+  NSIS and PowerPoint objects, and files holding a second archive. A message
+  attached to an email is now scanned.
+- **Base64 in scripts and pages:** more archive types are decoded, and a cap
+  on the number of decoded files is reported (`LIMITS-EXCEEDED`).
+- A damaged executable carved from a file no longer turns a detection behind
+  it into `PARTIAL` or `OK`.
+- Large files over HTTP no longer cost a request per executable candidate.
+- `exav-unpack` no longer makes symbolic links that lead out of the extraction
+  directory, and no longer panics on a closed pipe. `VERSIONCOMMANDS` no longer
+  lists `SHUTDOWN` and `QUIT` on a daemon that refuses them.
+- Resource bounds: nested documents, YARA rules, Visio formulas, PPMd, zstd,
+  JPEG XL, JBIG2, bytecode, 7z headers, RAR key derivation, and the memory of
+  XML trees, converters and drawings are bounded. Several recursive readers
+  no longer overflow the stack.
+- Rendering and decoding fixes across TIFF, BMP, PNM, ICO, DWG, DXF, IFC, STL,
+  glTF, JPEG 2000, DDS, Word, Excel and PowerPoint files.
+- PDF strings `\b` and `\f`, which made encrypted PDFs that open with an empty
+  password report password-protected.
+
 ## [0.0.2] - 2026-10-11
 
 The scanner, rebuilt around one streaming scan; three new projects (a browser
diff --git a/Cargo.lock b/Cargo.lock
index 8737f16c..05bf3aa7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,6 +28,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.6"
@@ -88,20 +97,38 @@ dependencies = [
 ]
 
 [[package]]
-name = "apfs"
-version = "0.2.4"
+name = "archmage"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1b4ecd96379464ea8b4ef2517c8eb674d8658ad364e9176bf5b8c278aa801e"
+checksum = "15785ee3576fbd41276a25f063b1e6b5bf323af9b4924632e25a8de6a3065f06"
 dependencies = [
- "byteorder",
- "thiserror",
+ "archmage-macros",
+ "safe_unaligned_simd",
+ "winarm-cpufeatures",
 ]
 
 [[package]]
-name = "arraydeque"
-version = "0.4.5"
+name = "archmage-macros"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8"
+checksum = "ce7707714970d5cf476caccbae2d282000c6c14ca5aada878e722a10d8e1c153"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
 [[package]]
 name = "ascii_tree"
@@ -110,16 +137,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6c635b3aa665c649ad1415f1573c85957dfa47690ec27aebe7ec17efe3c643"
 
 [[package]]
-name = "autocfg"
-version = "1.5.1"
+name = "atomic_refcell"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+checksum = "21e4227379beff4205943696e6c3e0cd809bacdf3f0edd6e3dd153e2269571a4"
 
 [[package]]
-name = "base64"
-version = "0.22.1"
+name = "autocfg"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base64"
@@ -128,31 +155,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
-name = "beef"
-version = "0.5.2"
+name = "bcdec_rs"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+checksum = "f09c37bc0e9f0924b7dae9988265ef3c76c88538f41a3b06caf4bed07cee5226"
 
 [[package]]
 name = "bit-set"
-version = "0.8.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+dependencies = [
+ "borsh",
+ "serde",
+]
 
 [[package]]
 name = "bitflags"
@@ -187,6 +212,30 @@ dependencies = [
  "hybrid-array",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "borsh-derive",
+ "bytes",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "bstr"
 version = "1.13.1"
@@ -209,6 +258,20 @@ name = "bytemuck"
 version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
 
 [[package]]
 name = "byteorder"
@@ -260,9 +323,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.5.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f360145194ee8e21db5ee7f3fcd4fe52210864c75c985dae33218202c8bbe040"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -270,9 +333,9 @@ dependencies = [
 
 [[package]]
 name = "cfb"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3"
+checksum = "0f13298d9178622b7916ec5d01d470425c04273c8ed07e87b1c38b34c4f4612b"
 dependencies = [
  "fnv",
  "uuid",
@@ -343,7 +406,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -376,12 +439,6 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -415,36 +472,15 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
-
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crunchy"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
-
 [[package]]
 name = "crypto-common"
 version = "0.2.2"
@@ -456,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "ctutils"
-version = "0.4.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+checksum = "38d28fb6aa7dd680b3ffd1a3e64e115c177bdba63c0ae7f9cd48129ff05c4fa0"
 dependencies = [
  "cmov",
 ]
@@ -471,20 +507,21 @@ checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
 
 [[package]]
 name = "delharc"
-version = "0.6.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3658b90877f637514897c3dcbd628e0d290bcc7fee551a398b3994ebdc62d51e"
+checksum = "9cfdcd2bee8dc367afd9064f3b0849156a4c29fc70d98370dae62773594d04dd"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
+ "bytemuck",
  "chrono",
  "memchr",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e"
 
 [[package]]
 name = "des"
@@ -509,9 +546,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
 
 [[package]]
 name = "encoding_rs"
@@ -527,15 +564,50 @@ dependencies = [
  "simdutf8",
 ]
 
+[[package]]
+name = "enough"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877362cb7b70d1c617f0cd3c67708bd58d894a86af5104018e2c10ebaee3c02f"
+
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
+
+[[package]]
+name = "euclid"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
+dependencies = [
+ "num-traits",
+]
 
 [[package]]
 name = "exav"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "clap",
  "exav-core",
@@ -548,14 +620,15 @@ dependencies = [
 
 [[package]]
 name = "exav-core"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bit-set",
  "cab",
  "cfb",
  "crc32fast",
  "exav-imagehash",
+ "exav-render",
  "exav-unpack",
  "exav-x86",
  "flate2",
@@ -586,17 +659,19 @@ dependencies = [
 
 [[package]]
 name = "exav-grep"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "clap",
+ "exav-render",
  "exav-unpack",
+ "memchr",
  "regex",
  "walkdir",
 ]
 
 [[package]]
 name = "exav-imagehash"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "crc32fast",
  "exav-render",
@@ -606,7 +681,7 @@ dependencies = [
 
 [[package]]
 name = "exav-pe-emu"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "exav-x86",
  "rustc-hash 2.1.3",
@@ -614,36 +689,41 @@ dependencies = [
 
 [[package]]
 name = "exav-render"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
+ "bcdec_rs",
  "bytemuck",
+ "encoding_rs",
  "exav-unpack",
  "fax",
  "flate2",
  "gif",
- "half",
  "hayro-ccitt",
  "hayro-jbig2",
  "hayro-jpeg2000",
  "image",
+ "lzma-rust2",
  "png",
+ "pulldown-cmark",
  "quick-error",
+ "quick-xml",
+ "ruzstd",
  "serde_json",
  "sha2",
  "weezl",
- "zune-core 0.4.12",
- "zune-core 0.5.0",
+ "zenjxl-decoder",
+ "zip",
+ "zune-core 0.5.3",
  "zune-jpeg 0.4.21",
- "zune-jpeg 0.5.8",
+ "zune-jpeg 0.5.15",
 ]
 
 [[package]]
 name = "exav-unpack"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "aes",
- "apfs",
- "base64 0.22.1",
+ "base64",
  "bitstream-io",
  "byteorder",
  "bzip2",
@@ -651,7 +731,6 @@ dependencies = [
  "cbc",
  "cfb",
  "chrono",
- "constant_time_eq",
  "crc32fast",
  "deflate64",
  "delharc",
@@ -659,14 +738,14 @@ dependencies = [
  "digest",
  "encoding_rs",
  "exav-pe-emu",
- "explode",
- "ext4-view",
- "fatfs",
  "flate2",
- "hfsplus",
+ "hayro-interpret",
+ "hayro-syntax",
  "hmac",
+ "html5gum",
+ "kurbo",
  "lzfse_rust",
- "lzma-rust2 0.21.0",
+ "lzma-rust2",
  "lznt1",
  "lzxd",
  "mail-parser",
@@ -684,14 +763,13 @@ dependencies = [
  "tar",
  "thiserror",
  "tinyvec",
- "unshield",
  "xz4rust",
  "zip",
 ]
 
 [[package]]
 name = "exav-update"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "crc32fast",
  "sha2",
@@ -700,40 +778,16 @@ dependencies = [
 
 [[package]]
 name = "exav-x86"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "iced-x86",
 ]
 
 [[package]]
-name = "explode"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46695dd0a1b7a2a6c3e0800604bd9738c2699682b9fc325d4886b6c1a78025ac"
-dependencies = [
- "arraydeque",
-]
-
-[[package]]
-name = "ext4-view"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ecf6379b7cfeace5e109ccc51955afc05f5f7f2466ae0cf2697bda46afd01e6"
-dependencies = [
- "bitflags 2.13.2",
- "crc",
-]
-
-[[package]]
-name = "fatfs"
-version = "0.3.6"
+name = "fastrand"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05669f8e7e2d7badc545c513710f0eba09c2fbef683eb859fd79c46c355048e0"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "log",
-]
+checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "fax"
@@ -764,6 +818,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "fearless_simd"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3296eb97d869113eaf148a6bdf01884e90b3828ad7ae2340b0f93362fc158611"
+
 [[package]]
 name = "filetime"
 version = "0.2.29"
@@ -776,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "flate2"
@@ -797,6 +857,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "font-types"
+version = "0.12.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "futures-core"
 version = "0.3.34"
@@ -865,17 +934,6 @@ dependencies = [
  "scroll",
 ]
 
-[[package]]
-name = "half"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
-dependencies = [
- "cfg-if",
- "crunchy",
- "zerocopy",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -906,12 +964,41 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2866f0d976e76497480b853d5e258dab6e4b89ecfe991124e08f15dfa8fd03ad"
 
+[[package]]
+name = "hayro-cmap"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d285dc30731c8485de5fa732fbdf2b3affdf01e4da7c2135022ca6fa664bf6"
+dependencies = [
+ "hayro-postscript",
+]
+
+[[package]]
+name = "hayro-interpret"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9df074ff163a63864cec9b0bf640ccbff8abf4e44481df7369ce0ac172ffbe"
+dependencies = [
+ "bitflags",
+ "hayro-cmap",
+ "hayro-syntax",
+ "kurbo",
+ "moxcms 0.8.1",
+ "phf",
+ "rustc-hash 2.1.3",
+ "siphasher",
+ "skrifa",
+ "smallvec",
+ "yoke",
+]
+
 [[package]]
 name = "hayro-jbig2"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000e025850f4592ddcaee85640db70704151f2bafd43b6f431aa5b6a2c6a35a9"
 dependencies = [
+ "fearless_simd",
  "hayro-ccitt",
 ]
 
@@ -920,23 +1007,38 @@ name = "hayro-jpeg2000"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "122c5f834c37a2260b9c851bb8be685cf539b2a8b94b704a931ef7d2525d5835"
+dependencies = [
+ "fearless_simd",
+]
 
 [[package]]
-name = "heck"
-version = "0.5.0"
+name = "hayro-postscript"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "885c5ef0654933139a9b9546fc2c69e18d37f38aa2520f079092b1be18f1fcaa"
 
 [[package]]
-name = "hfsplus"
-version = "0.2.4"
+name = "hayro-syntax"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1003d8eed80d61e8e8ea6a958bbe1afd3aef060882b9d6134e50500dd307c0dc"
+checksum = "6cdc818d8d265dcb42081d488f7599df4f73fb79e9d347ecedcd3c23809d2026"
 dependencies = [
- "byteorder",
- "thiserror",
+ "flate2",
+ "hayro-ccitt",
+ "hayro-jbig2",
+ "hayro-jpeg2000",
+ "memchr",
+ "rustc-hash 2.1.3",
+ "smallvec",
+ "zune-jpeg 0.5.15",
 ]
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hmac"
 version = "0.13.0"
@@ -946,6 +1048,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "html5gum"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "428502d3ec1742c35e015871aef742bc4722a9acfcb616b8ff79b519922e1c36"
+
 [[package]]
 name = "http"
 version = "1.5.0"
@@ -1015,7 +1123,7 @@ dependencies = [
  "color_quant",
  "gif",
  "image-webp",
- "moxcms",
+ "moxcms 0.7.11",
  "num-traits",
  "png",
  "qoi",
@@ -1043,9 +1151,9 @@ dependencies = [
 
 [[package]]
 name = "inout"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
+checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f"
 dependencies = [
  "block-padding",
  "hybrid-array",
@@ -1059,9 +1167,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
 dependencies = [
  "either",
 ]
@@ -1083,6 +1191,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "kurbo"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "polycool",
+ "smallvec",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.1"
@@ -1097,9 +1217,9 @@ checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c"
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "log"
@@ -1109,34 +1229,32 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "logos"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff472f899b4ec2d99161c51f60ff7075eeb3097069a36050d8037a6325eb8154"
+checksum = "eb2c55a318a87600ea870ff8c2012148b44bf18b74fad48d0f835c38c7d07c5f"
 dependencies = [
  "logos-derive",
 ]
 
 [[package]]
 name = "logos-codegen"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "192a3a2b90b0c05b27a0b2c43eecdb7c415e29243acc3f89cc8247a5b693045c"
+checksum = "58b3ffaa284e1350d017a57d04ada118c4583cf260c8fb01e0fe28a2e9cf8970"
 dependencies = [
- "beef",
  "fnv",
- "lazy_static",
  "proc-macro2",
  "quote",
+ "regex-automata",
  "regex-syntax",
- "rustc_version",
  "syn 2.0.119",
 ]
 
 [[package]]
 name = "logos-derive"
-version = "0.15.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605d9697bcd5ef3a42d38efc51541aa3d6a4a25f7ab6d1ed0da5ac632a26b470"
+checksum = "52d3a9855747c17eaf4383823f135220716ab49bea5fbea7dd42cc9a92f8aa31"
 dependencies = [
  "logos-codegen",
 ]
@@ -1149,15 +1267,9 @@ checksum = "5edeac3ec657925dececc672bdd58fa2212291886ddcb3e08aa46924c78340c6"
 
 [[package]]
 name = "lzma-rust2"
-version = "0.16.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca93e534d1142d1d0dcca6d25fe302508a5dfb40b302802904577725ea0b695b"
-
-[[package]]
-name = "lzma-rust2"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde178a3caf126c440fa15628147772d8ee590a39477d711353fbe2e58a73a5b"
+checksum = "f1c46f3fcd2e888afdb01a07efc071cb21300e07c68d32c3e8b01b5c8cb1fcaa"
 dependencies = [
  "sha2",
 ]
@@ -1208,6 +1320,15 @@ version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1238,6 +1359,16 @@ dependencies = [
  "pxfm",
 ]
 
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
 [[package]]
 name = "multiversion_no_op"
 version = "1.0.0"
@@ -1250,7 +1381,7 @@ version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -1280,6 +1411,17 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.47"
@@ -1310,6 +1452,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pbkdf2"
 version = "0.13.0"
@@ -1326,6 +1474,48 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
@@ -1344,24 +1534,33 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
  "crc32fast",
  "fdeflate",
  "flate2",
  "miniz_oxide 0.8.9",
 ]
 
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "powerfmt"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958"
 
 [[package]]
 name = "ppmd-rust"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196a7c80b9a7652aba7cc070827516c2abe4ccdf53d128e1944003cf5726cff1"
+checksum = "cd4acc8d264ea385db64ccfdcdfd5909ee9eda0975666723d59f3bfec80b3611"
 
 [[package]]
 name = "primal-check"
@@ -1372,6 +1571,37 @@ dependencies = [
  "num-integer",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -1381,6 +1611,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "278e9268c93b9e498a2da46c34d90ba93a3255eb99009646398f34bc73ab36eb"
+dependencies = [
+ "bitflags",
+ "memchr",
+ "unicase",
+]
+
 [[package]]
 name = "pxfm"
 version = "0.1.30"
@@ -1404,9 +1645,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
 dependencies = [
  "memchr",
 ]
@@ -1451,6 +1692,17 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
+[[package]]
+name = "read-fonts"
+version = "0.43.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea"
+dependencies = [
+ "bytemuck",
+ "font-types",
+ "once_cell",
+]
+
 [[package]]
 name = "regex"
 version = "1.13.1"
@@ -1515,12 +1767,13 @@ dependencies = [
 
 [[package]]
 name = "rowan"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "417a3a9f582e349834051b8a10c8d71ca88da4211e4093528e36b9845f6b5f21"
+checksum = "14b574c58582fa59fa43a2feb6608b8744184659f08a2e0117e4b8224d95ed61"
 dependencies = [
  "countme",
  "hashbrown 0.14.5",
+ "memoffset",
  "rustc-hash 1.1.0",
  "text-size",
 ]
@@ -1537,15 +1790,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustdct"
 version = "0.7.1"
@@ -1571,9 +1815,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.45"
+version = "0.23.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
+checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
 dependencies = [
  "log",
  "once_cell",
@@ -1595,9 +1839,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.15"
+version = "0.103.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1612,12 +1856,15 @@ checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ruzstd"
-version = "0.8.3"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8"
-dependencies = [
- "twox-hash",
-]
+checksum = "69e4ce4a039f42bf25920b95667e4d789e98749ab11bbb8d2c2936f788421bb5"
+
+[[package]]
+name = "safe_unaligned_simd"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9c874fb993656d484725d58fbfddb39dfcf98ebcadc1a1d09568aa6b39bafba"
 
 [[package]]
 name = "salzweg"
@@ -1657,15 +1904,9 @@ checksum = "e1a36a382ed65dbcc0ab47fd5e9a94112417ccd34560a392ef3b7b0f0ec39148"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
 [[package]]
 name = "serde"
 version = "1.0.229"
@@ -1693,14 +1934,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -1711,14 +1952,14 @@ dependencies = [
 
 [[package]]
 name = "sevenz-rust2"
-version = "0.20.2"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29225600349ef74beda5a9fffb36ac660a24613c0bde9315d0c49be1d51e9c24"
+checksum = "2f0c68c0e8289bfd09e49ef433e8de02c7c464afc1d7f5a275c99749a880e301"
 dependencies = [
  "bzip2",
  "crc32fast",
  "js-sys",
- "lzma-rust2 0.16.5",
+ "lzma-rust2",
  "ppmd-rust",
  "wasm-bindgen",
 ]
@@ -1736,9 +1977,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1763,12 +2004,40 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
+[[package]]
+name = "siphasher"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256"
+
+[[package]]
+name = "skrifa"
+version = "0.46.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4febebda507fb889c545a37a135517769d1391941013561292897961d1887d6"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
+[[package]]
+name = "smallvec"
+version = "1.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
 [[package]]
 name = "strength_reduce"
 version = "0.2.4"
@@ -1811,15 +2080,26 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "tar"
 version = "0.4.46"
@@ -1853,7 +2133,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1887,6 +2167,36 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7184dfffa0d05e10284df327c6cb52f0d62c5aa6c9a8b9236fa151d4361882f1"
 
+[[package]]
+name = "toml_datetime"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.17+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"
+dependencies = [
+ "winnow",
+]
+
 [[package]]
 name = "transpose"
 version = "0.2.3"
@@ -1897,17 +2207,11 @@ dependencies = [
  "strength_reduce",
 ]
 
-[[package]]
-name = "twox-hash"
-version = "2.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5283634e518fe9e82c7b20520bb4bc209009fd16c82077c802f8111ecbb0117a"
-
 [[package]]
 name = "typed-path"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e"
+checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c"
 
 [[package]]
 name = "typenum"
@@ -1915,6 +2219,12 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
+[[package]]
+name = "unicase"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
@@ -1923,15 +2233,15 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d"
 dependencies = [
  "tinyvec",
 ]
@@ -1942,16 +2252,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 
-[[package]]
-name = "unshield"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd29bc2ffd8a674b7de402169d86b3c083229373d05c388526d626408416c5c"
-dependencies = [
- "byteorder",
- "explode",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -1960,11 +2260,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "3.4.2"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc"
+checksum = "cde93ff05758a36a851a398a772b0b79a82fbe3c186a46f2696baaeaf84c966b"
 dependencies = [
- "base64 0.23.1",
+ "base64",
  "flate2",
  "log",
  "percent-encoding",
@@ -1977,11 +2277,11 @@ dependencies = [
 
 [[package]]
 name = "ureq-proto"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86fd172ccca569e458f61b6bdd6220965a9ef36e672a6852953b51a0e1583be"
+checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922"
 dependencies = [
- "base64 0.23.1",
+ "base64",
  "http",
  "httparse",
  "log",
@@ -2001,9 +2301,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.26.1"
+version = "1.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
+checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2057,7 +2357,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -2082,9 +2382,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
+checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2104,6 +2404,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "winarm-cpufeatures"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d107c80dd656e1a2c254dfb1d57ece73b7f515b8a8684c270c23cab68f4a440d"
+
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -2245,6 +2551,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winnow"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "xz4rust"
 version = "0.2.3"
@@ -2253,12 +2568,12 @@ checksum = "606930b71bad6379f366994e4e6252a3462fa28bfc3695c33b07bef8f967d6d6"
 
 [[package]]
 name = "yara-x-parser"
-version = "1.19.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5564d72253142774903eafc8f4c92bebef40d65c176a11d351258e80cc8a1c7"
+checksum = "89313553cc4cf8961c257d282c902da1d5de568cd656b39962bdf9edd1e3935e"
 dependencies = [
  "ascii_tree",
- "bitflags 2.13.2",
+ "bitflags",
  "bstr",
  "indexmap",
  "itertools",
@@ -2269,36 +2584,103 @@ dependencies = [
 ]
 
 [[package]]
-name = "zerocopy"
-version = "0.8.59"
+name = "yoke"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"
+checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3"
 dependencies = [
- "zerocopy-derive",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
 ]
 
 [[package]]
-name = "zerocopy-derive"
-version = "0.8.59"
+name = "yoke-derive"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"
+checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
 dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+ "synstructure",
+]
+
+[[package]]
+name = "zenjxl-decoder"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2d68502daf17b161b6fb73657f4a4c60ba5a0491846aae769e33b34dc5ec513"
+dependencies = [
+ "aligned-vec",
+ "array-init",
+ "atomic_refcell",
+ "bytemuck",
+ "byteorder",
+ "enough",
+ "num-derive",
+ "num-traits",
+ "paste",
+ "smallvec",
+ "thiserror",
+ "zenjxl-decoder-macros",
+ "zenjxl-decoder-simd",
+]
+
+[[package]]
+name = "zenjxl-decoder-macros"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d5f705a56b0a01d283503fbe7d5e3b3e51d7321b5f1bba7b07bdeea7e2c6f3d"
+dependencies = [
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "zenjxl-decoder-simd"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237f3740d3d098854c6008515cdff29d8cbadcb6b4e3a1582e28dd3a04e3213e"
+dependencies = [
+ "archmage",
+ "paste",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879"
 
 [[package]]
 name = "zip"
-version = "9.0.1"
+version = "9.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49ade69c4434c55dd651d36fe05f38e0578db948b773cbc01c48c4b5e560692"
+checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e"
 dependencies = [
  "bitstream-io",
  "crc32fast",
@@ -2329,9 +2711,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
 name = "zune-core"
-version = "0.5.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b"
 
 [[package]]
 name = "zune-jpeg"
@@ -2344,9 +2726,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.5.8"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
 dependencies = [
- "zune-core 0.5.0",
+ "zune-core 0.5.3",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 8ab9bf75..454dcc33 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,24 +1,25 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = ["crates/exav", "crates/exav-core", "crates/exav-grep", "crates/exav-unpack", "crates/exav-pe-emu", "crates/exav-x86", "crates/exav-update", "crates/exav-imagehash", "crates/exav-render"]
 exclude = ["fuzz", "crates/exav-unpack-wasm", "crates/exav-viewer"]
 
 [workspace.package]
-version = "0.0.2"
-edition = "2021"
+version = "0.0.3"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/sylvinus/exav"
 homepage = "https://exav.org"
 # Checked by `make msrv` rather than asserted: a floor nothing verifies drifts.
 #
-# The number is set by dependencies, not by this code: exav-render's image
-# decoders hayro-jpeg2000 0.4, hayro-jbig2 0.3.1 and hayro-ccitt 0.4 declare
-# 1.92 (and `yara-x-parser` 1.91), so cargo refuses to build them on anything
-# older. exav's own source needs only 1.88 (`slice::as_chunks`,
+# The number is set by dependencies, not by this code: exav-unpack's LHA reader
+# delharc 0.8 declares 1.95 (if-let guards), `sevenz-rust2` 0.24 1.93,
+# exav-render's image decoders hayro-jpeg2000 0.4, hayro-jbig2 0.3.1 and
+# hayro-ccitt 0.4 1.92, and `yara-x-parser` 1.91, so cargo refuses to build them
+# on anything older. exav's own source needs only 1.88 (`slice::as_chunks`,
 # `is_multiple_of`, and the let-chains the `zip` dependency uses). Worth
 # rechecking when those dependencies move; lowering it means confirming with
 # `make msrv`, not editing this line.
-rust-version = "1.92"
+rust-version = "1.95"
 # crates.io discovery. keywords: max 5, <=20 chars each. categories must be from
 # https://crates.io/category_slugs (an invalid one fails `cargo publish`).
 keywords = ["antivirus", "clamav", "malware", "scanner", "security"]
@@ -28,7 +29,7 @@ categories = ["command-line-utilities", "filesystem"]
 # `env` lets every flag name the environment variable it falls back to, so the
 # precedence (flag, then environment, then default) is one rule the parser
 # applies and `--help` prints, rather than per-flag code.
-clap = { version = "4.5", features = ["derive", "env"] }
+clap = { version = "4.6", features = ["derive", "env"] }
 walkdir = "2.5"
 
 # Catch integer overflow in release too: on hostile input a silent wraparound
diff --git a/Dockerfile b/Dockerfile
index e6c653a1..7f6c4d24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,9 +38,9 @@ ARG BIN_SOURCE=build
 #     of magnitude slower than cross-compiling it.
 # rust:alpine targets *-unknown-linux-musl and links statically. `build-base`
 # provides the C toolchain the TLS stack (ring, via the `http` feature's ureq →
-# rustls) needs to compile under musl. Pinned to 1.92, the MSRV floor (see the
+# rustls) needs to compile under musl. Pinned to 1.95, the MSRV floor (see the
 # workspace `rust-version`, which says what sets it); bump both together.
-FROM rust:1.92-alpine AS build
+FROM rust:1.95-alpine AS build
 RUN apk add --no-cache musl-dev build-base
 WORKDIR /src
 COPY . .
diff --git a/Makefile b/Makefile
index d235de8a..176d763b 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ DBDIR   ?= exav-db
 EXAVDB  ?= exav.exavdb
 
 .DEFAULT_GOAL := build
-.PHONY: build release test test-native test-yara-diff test-wasm test-js test-viewer test-www test-helm wasm-sizes lint fmt msrv av-audit miri publish-check publish fuzz db exavdb cache daily clean www-dev www-build help
+.PHONY: build release test test-native test-yara-diff test-wasm test-js test-viewer test-www test-formats formats test-helm wasm-sizes lint fmt msrv stack-frames deps-review av-audit miri publish-check publish fuzz db exavdb cache daily clean www-dev www-build help
 
 ## build: compile the release binary
 build release:
@@ -71,7 +71,32 @@ test-native:
 	$(CARGO) test -p exav-render --no-default-features --features dwg
 	# IFC and STL, behind `ifc` and `stl`, as @exav/viewer's model module
 	# builds them.
-	$(CARGO) test -p exav-render --no-default-features --features ifc,stl
+	$(CARGO) test -p exav-render --no-default-features --features ifc,stl,obj,ply,gltf
+	# Markdown, behind `markdown`, as @exav/viewer's text module builds it.
+	$(CARGO) test -p exav-render --no-default-features --features markdown
+	# The office converters (spreadsheets, presentations, text documents),
+	# behind `office-*`, as @exav/viewer's sheets, slides and docs modules
+	# build them: each alone, since slides compile part of sheets, then all
+	# of them with the test writers the integration tests build documents with.
+	$(CARGO) test -p exav-render --no-default-features --features office-sheets
+	$(CARGO) test -p exav-render --no-default-features --features office-slides,office-test-util
+	$(CARGO) test -p exav-render --no-default-features --features office-docs,office-test-util
+	$(CARGO) test -p exav-render --no-default-features --features office,office-test-util
+	# The text a reader sees, behind `text` (HTML, Office XML parts, drawings)
+	# and `text-pdf` (PDF, through hayro, which switches flate2 to zlib-rs: its
+	# own pass, so that the default passes do not run with it).
+	$(CARGO) test -p exav-unpack --features text
+	$(CARGO) test -p exav-render --no-default-features --features text
+	$(CARGO) test -p exav-unpack --features text-pdf --test all text::
+	$(CARGO) test -p exav-render --no-default-features --features text-pdf
+	$(CARGO) test -p exav-core --features visible-text-pdf --test all visible_text
+	$(CARGO) test -p exav-grep --features text-pdf --test text
+	# The office formats' text (DOC, XLS, PPT, RTF, flat OpenDocument, iWork...),
+	# behind `text-office`.
+	$(CARGO) test -p exav-render --no-default-features --features text-office,office-test-util
+	$(CARGO) test -p exav-core --features visible-text-office --test all visible_text
+	$(CARGO) test -p exav-grep --features text-office --test text --test text_office
+	$(CARGO) test -p exav --features visible-text-office --test office_text
 
 ## test-yara-diff: the yara-x A/B differential harness. Compiles the SAME rules
 ##                 with both engines and asserts equal matching-rule sets. NOT
@@ -119,6 +144,19 @@ test-viewer:
 test-www:
 	./scripts/test-www.sh
 
+## formats: write the pages generated from the format registry
+##          (formats/registry.json): the format matrix and the viewer's
+##          summary sentence in the READMEs and the site.
+formats:
+	node scripts/formats.mjs generate
+
+## test-formats: the format registry against the extractor's formats, the
+##               scanner's file types, the viewer's plugins, and the pages
+##               generated from it (test-www runs it too; the viewer's and the
+##               scanner's own registry tests are in test-viewer and test-native).
+test-formats:
+	node scripts/formats.mjs check
+
 ## test-helm: render-check the Helm chart (render guards, hardening settings,
 ##            packaging). Needs `helm` on PATH, no cluster. CI runs `ct lint`
 ##            in addition. See scripts/test-helm.sh.
@@ -141,7 +179,18 @@ lint:
 	$(CARGO) clippy --all-targets --features exav-core/http -- -D warnings
 	$(CARGO) clippy -p exav-core --all-targets --features unstable-internals -- -D warnings
 	$(CARGO) clippy -p exav-render --all-targets --features dwg -- -D warnings
-	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features ifc,stl -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features ifc,stl,obj,ply,gltf -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features markdown -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features text-pdf -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features office-sheets -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features office-slides -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features office-docs -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features office,office-test-util -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features -- -D warnings
+	$(CARGO) clippy -p exav-render --all-targets --no-default-features --features text-office,office-test-util -- -D warnings
+	$(CARGO) clippy -p exav-core --all-targets --features visible-text-office -- -D warnings
+	$(CARGO) clippy -p exav-grep --all-targets --features text-office -- -D warnings
+	$(CARGO) clippy -p exav-unpack --all-targets --features text-pdf -- -D warnings
 
 ## fmt: format the code
 fmt:
@@ -159,6 +208,23 @@ msrv:
 	  rustup toolchain install $$v --profile minimal >/dev/null 2>&1 || true; \
 	  echo "checking MSRV $$v"; rustup run $$v cargo check --workspace --all-targets
 
+## stack-frames: the stack frames of the functions that recurse into nested input
+##               (container walks, shape and block walks of the converters), read
+##               from release builds. A frame over 16 KiB is a value held while the
+##               next level is read, once per level; see scripts/stack-frames.py.
+stack-frames:
+	$(CARGO) build --release -p exav
+	$(CARGO) test --release -p exav-render --features office-docs,office-slides,office-sheets --test nesting --no-run
+	python3 -I scripts/stack-frames.py $(EXAV) \
+	  $$(ls -t target/release/deps/nesting-* | grep -v '\.d$$' | head -1)
+
+## deps-review: the dependency report of docs/DEPENDENCIES.md ("Lifecycle"):
+##              versions, release age, `unsafe`, vendored copies against their
+##              upstream. Queries crates.io, GitHub and PyPI; `DEPS_ARGS=--offline`
+##              uses the last answers.
+deps-review:
+	python3 -I scripts/deps-review.py $(DEPS_ARGS)
+
 ## av-audit: scan the tracked tree with a real engine and signature set, to catch
 ##           a committed fixture that other people's scanners will detect. Run it
 ##           when fixtures change, not on every release: it needs `clamscan` and
@@ -172,7 +238,7 @@ av-audit:
 	@[ -d $(DBDIR) ] || { echo "av-audit needs $(DBDIR); run 'make db'"; exit 1; }
 	@echo "scanning $$(git ls-files | wc -l | tr -d ' ') tracked files with $(DBDIR)"
 	@hits=$$(git ls-files -z | xargs -0 clamscan -d $(DBDIR) --no-summary 2>/dev/null \
-	          | grep -v ': OK$$' || true); \
+	          | grep -v -e ': OK$$' -e ': Empty file$$' || true); \
 	  if [ -n "$$hits" ]; then echo "$$hits"; \
 	    echo "-> mask these (see crates/exav-unpack/tests/fixtures/README.md)"; exit 1; \
 	  fi; \
diff --git a/NOTICE b/NOTICE
index a0fb856e..e9eaf830 100644
--- a/NOTICE
+++ b/NOTICE
@@ -74,7 +74,12 @@ Copyright (c) 2024. The YARA-X Authors. All Rights Reserved.
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Other BSD-3-Clause components linked by exav (same 3-clause terms above, with
-their respective copyright holders): subtle, tlsh2.
+their respective copyright holders): subtle, tlsh2, and, in exav-render's `jxl`
+feature (JPEG XL in @exav/viewer's image module), zenjxl-decoder with its
+zenjxl-decoder-simd and zenjxl-decoder-macros: "Copyright (c) the JPEG XL
+Project Authors. All rights reserved." It is a fork of the libjxl team's
+jxl-rs (https://github.com/libjxl/jxl-rs), built `forbid(unsafe_code)` and
+without its SIMD.
 
 
 -------------------------------------------------------------------------------
@@ -255,13 +260,18 @@ Copyright (c) Mike Krüger.
 
 
 -------------------------------------------------------------------------------
-1h1. unshield / explode, MIT (linked dependency + test fixtures)
+1h1. unshield / explode, MIT, and blast.c, zlib (source derivatives + test
+     fixtures)
 -------------------------------------------------------------------------------
 
-crates/exav-unpack/src/formats/ishield_z.rs reads InstallShield `.z` archives
-through the `unshield` crate, whose only real dependency is `explode`, a leaf
-decoder for the PKWARE Data Compression Library "implode" codec those archives
-use. Both MIT.
+crates/exav-unpack/src/formats/ishield_z.rs reads the table of contents of
+InstallShield `.z` archives as the `unshield` crate 0.2.0 does, and
+crates/exav-unpack/src/formats/dcl_explode.rs decodes their PKWARE Data
+Compression Library "implode" members as the `explode` crate 0.1.2 does. Both
+crates are MIT. `explode` is a port of Mark Adler's `blast.c` (zlib
+`contrib/blast`, zlib licence, text in section 1l; Copyright (C) Mark Adler),
+whose algorithm and code-length tables dcl_explode.rs keeps; it is altered
+from both: it decodes a whole slice into a capped buffer.
 
 The fixtures in crates/exav-unpack/tests/fixtures/ishieldz/ are that project's
 own examples, redistributed under the same terms. `undhr.z` is shipped alongside
@@ -360,6 +370,57 @@ Copyright © 1995-2011 by Fredrik Lundh and contributors
 Copyright © 2010 by Jeffrey 'Alex' Clark and contributors
 
 
+-------------------------------------------------------------------------------
+1h6. Apple lzfse, BSD-3-Clause (source derivative)
+-------------------------------------------------------------------------------
+
+crates/exav-unpack/src/formats/lzfse.rs, the LZFSE and LZVN decoder for DMG
+runs, is a Rust port of the decoder of Apple's reference implementation
+(lzfse_decode_base.c, lzfse_fse.c/.h, lzvn_decode_base.c and the tables of
+lzfse_internal.h), changed to decode a whole buffer into a capped one.
+
+Upstream: https://github.com/lzfse/lzfse
+Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+
+  3. Neither the name of the copyright holder(s) nor the names of any
+     contributors may be used to endorse or promote products derived from this
+     software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-------------------------------------------------------------------------------
+1h7. cmpfs, MIT (source derivative)
+-------------------------------------------------------------------------------
+
+crates/exav-unpack/src/formats/decmpfs.rs, the decoder of the files macOS
+compresses (decmpfs) for HFS+ and APFS, follows cmpfs 0.1.0's reading of the
+attribute and of the resource fork (the types, the block tables, the stored-block
+markers), over exav's own codecs and with its own bounds.
+
+Upstream: https://github.com/Dil4rd/dpp
+Copyright (c) 2026 Dil4rd
+
+
 -------------------------------------------------------------------------------
 1h. oletools test sample, BSD-2-Clause (test fixture)
 -------------------------------------------------------------------------------
@@ -461,6 +522,9 @@ Copyright (c) Nullsoft and contributors.
 
   3. This notice may not be removed or altered from any source distribution.
 
+The zlib-rs crate (the `text-pdf` features' DEFLATE) is under the same
+Zlib terms: (C) 2024 Trifecta Tech Foundation.
+
 
 -------------------------------------------------------------------------------
 1m. sevenz-rust2, Apache-2.0 (design reference)
@@ -494,6 +558,153 @@ Open Font License 1.1. NOTICE.md beside them gives each face's copyright and
 version, and OFL-1.1.txt the licence.
 
 
+-------------------------------------------------------------------------------
+1o. numbers-parser data (MIT) and the OpenOffice.org Excel format documentation
+-------------------------------------------------------------------------------
+
+These are the office converters of exav-render (the `office-sheets`,
+`office-slides` and `office-docs` features, `src/formats/office/`). They reach
+the @exav/viewer npm package and, with `text-office`, exav-grep; the default
+exav binary contains none of them. Their full notice is
+crates/exav-render/NOTICE.
+
+They are written from published specifications: Microsoft's Open
+Specifications ([MS-XLS], [MS-PPT], [MS-DOC], [MS-CFB], [MS-ODRAW],
+[MS-OSHARED], [MS-OFFCRYPTO], [MS-VSDX]) and Visio file format reference,
+ECMA-376 and ISO/IEC 29500, OpenDocument 1.2 and 1.3 (OASIS), the RTF
+specification, Apple's Technical Notes TN2067 and TN2073 (Keynote 1) and RFC
+1741 (BinHex 4.0). OpenOffice.org's "Microsoft Excel File Format" documentation
+(Public Documentation License) gives the BIFF2 to BIFF5 record layouts.
+
+Two projects supply data: numbers-parser (https://github.com/masaccio/numbers-parser,
+MIT, Copyright 2021 Jon Connell) gave Numbers' function indexes, the families
+of macOS fonts' PostScript names and the layout of table records; keynote-parser
+(https://github.com/psobot/keynote-parser, MIT, Copyright 2019-2025 Peter
+Sobot) gave the Keynote and Pages message layout, and its sample.key and
+table.key are test fixtures.
+
+The readers for PowerPoint 95 and Keynote 2 to 5 follow no published
+description: they were written from sample documents, with the output of other
+office applications on them used as a black box (rendered pages, never source).
+No source of another office application or of a document-format library was
+read.
+
+
+-------------------------------------------------------------------------------
+1p. Camera RAW previews (exav-render `raw`): specifications and sample files
+-------------------------------------------------------------------------------
+
+crates/exav-render/src/formats/image/raw.rs and raw/ read the previews of
+camera RAW files. No code was taken from another implementation. They were
+written from these public specifications, which are not redistributed here:
+
+- TIFF Revision 6.0 (Adobe Systems Incorporated, 1992), published by Adobe for
+  anyone to implement.
+- Adobe Digital Negative (DNG) Specification 1.7.1.0 (Adobe), published with a
+  royalty-free licence to implement DNG.
+- Exif 2.32, CIPA DC-008-2019 (Camera & Imaging Products Association), freely
+  downloadable.
+- ITU-T T.81 | ISO/IEC 10918-1, the JPEG standard.
+- ISO/IEC 14496-12, ISO base media file format, from ISO's publicly available
+  standards.
+
+What the makers' own containers hold (the signatures of RAF, X3F, CRW, MRW,
+ORF, RW2 and IIQ, the compression numbers of their sensor data) was read off
+sample files from https://raw.pixls.us, which its contributors dedicate to the
+public domain under CC0 1.0
+(https://creativecommons.org/publicdomain/zero/1.0/), with tools written for
+the purpose. None of those files is in this repository; the tests use the
+synthetic containers of crates/exav-render/tests/fixtures/raw/make.py.
+
+The Canon CR3 reader (raw/bmff.rs and the CR3 parts of raw.rs and make.py) was
+written from ISO/IEC 14496-12 and the Exif and TIFF specifications above, and
+from 110 CR3 sample files of the same CC0 source, which a box lister written
+for the purpose walked: the box layout (the `crx ` brand of `ftyp`, the `uuid`
+boxes of `moov`, the box that holds the Exif of the first directory and its
+orientation, the JPEGs the file embeds and where) was read off those files
+alone. No CR3 documentation or source code of any other project was read: no
+format description, no README, no tag table, and no other RAW reader or
+converter.
+
+
+-------------------------------------------------------------------------------
+1q. Example files of the @exav/viewer demo
+-------------------------------------------------------------------------------
+
+The @exav/viewer demo lists example files kept in
+crates/exav-viewer/demo/examples/. Most are made by scripts of this repository
+and given to the public domain (CC0-1.0). The others are public domain, CC0,
+CC-BY, MIT, BSD or Apache files, each credited with its author, its
+source and the page that states its licence in examples.json, NOTICE.md and
+https://exav.org/viewer/examples/. The small ones are committed; the rest are
+downloaded by `npm run demo:examples` from pinned addresses and checked against
+their SHA-256. They are test inputs only and are not part of any published
+package.
+
+
+-------------------------------------------------------------------------------
+1r. IFC geometry (exav-render `ifc`): specifications
+-------------------------------------------------------------------------------
+
+The curved-face, sweep-parameter, alignment, grid and storey code is written
+from buildingSMART International's published IFC4 and IFC4X3 EXPRESS schemas
+and documentation (CC BY-ND 4.0, read, not copied) and the surface and curve
+definitions of ISO 10303-42. No code from another IFC library was read.
+
+
+-------------------------------------------------------------------------------
+1s. yoke, yoke-derive, zerofrom, zerofrom-derive, Unicode License v3
+-------------------------------------------------------------------------------
+
+These crates (the ICU4X project's, linked through hayro-interpret, the PDF
+interpreter of the `text-pdf` features) carry this licence; reproduce its
+notice in distributions.
+
+  UNICODE LICENSE V3
+
+  COPYRIGHT AND PERMISSION NOTICE
+
+  Copyright © 2020-2024 Unicode, Inc.
+
+  NOTICE TO USER: Carefully read the following legal agreement. BY
+  DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+  SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+  TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+  DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of data files and any associated documentation (the "Data Files") or
+  software and any associated documentation (the "Software") to deal in the
+  Data Files or Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, and/or sell
+  copies of the Data Files or Software, and to permit persons to whom the
+  Data Files or Software are furnished to do so, provided that either (a)
+  this copyright and permission notice appear with all copies of the Data
+  Files or Software, or (b) this copyright and permission notice appear in
+  associated Documentation.
+
+  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+  THIRD PARTY RIGHTS.
+
+  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+  BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+  OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+  FILES OR SOFTWARE.
+
+  Except as contained in this notice, the name of a copyright holder shall
+  not be used in advertising or otherwise to promote the sale, use or other
+  dealings in these Data Files or Software without prior written
+  authorization of the copyright holder.
+
+  Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+  ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines
+  Corporation and others.
+
+
 -------------------------------------------------------------------------------
 2. ISC-licensed components
 -------------------------------------------------------------------------------
@@ -520,11 +731,22 @@ the distributor's choice. Notable examples:
   clap                                   CLI parsing
   sha1, sha2, md-5, digest (RustCrypto)  hashing
   flate2, miniz_oxide                    DEFLATE / gzip / zlib
-  lzfse_rust, delharc, lzxd              DMG/LHA/CAB codecs
+  delharc, lzxd                          LHA/CAB codecs
   bitstream-io                           bit-level readers for decoders
   stringprep                             PDF password normalization
-  ext4-view                              ext2/3/4 filesystem reader
   image                                  image decoding (image hashing)
+  pulldown-cmark                         Markdown in exav-render (`markdown`
+                                           feature) and @exav/viewer; MIT,
+                                           2015 Google Inc.
+  html5gum                               HTML text in exav-unpack (`text`
+                                           feature): the tokenizer; MIT,
+                                           2021 Markus Unterwaditzer
+  hayro-interpret, hayro-syntax,         PDF text in exav-unpack (`text-pdf`
+    hayro-cmap, hayro-postscript           feature, off by default): Apache-2.0
+                                           OR MIT, Laurenz Stampfl
+  phf                                    glyph-name tables in hayro; MIT,
+                                           2014-2022 Steven Fackler, Yuki
+                                           Okushi
   hayro-jpeg2000, hayro-jbig2,           JPEG 2000, JBIG2 and CCITT fax in
     hayro-ccitt                            exav-render (image hashing) and
                                            @exav/viewer; hayro-jpeg2000's
@@ -536,16 +758,18 @@ the distributor's choice. Notable examples:
   wasm-bindgen, js-sys, web-sys,         WebAssembly/JS bindings; these reach
     wasm-bindgen-futures                   the published npm artifact
 
-sevenz-rust2, bzip2 and ppmd-rust are dev-only: they build test fixtures. The
-shipped 7z reader is native (§1m) and the bzip2 decoder is vendored (§1h3).
+sevenz-rust2, bzip2, ppmd-rust and lzfse_rust are dev-only: they build test
+fixtures. The shipped 7z reader is native (§1m), the bzip2 decoder is vendored
+(§1h3) and the LZFSE decoder is ported from Apple's (§1h6).
 
 MIT-only components (the MIT copyright and permission notice must be retained;
-the MIT text is in the exav LICENSE file): apfs, ascii_tree, cfb, color_quant,
-deflate64, explode, fatfs, fax, fax_derive, goblin, hfsplus, lznt1, quick-xml,
+the MIT text is in the exav LICENSE file): ascii_tree, bcdec_rs (2023 SMG;
+a port of bcdec, MIT or public domain, 2022 Sergii Kudlai), cfb, color_quant,
+deflate64, fax, fax_derive, goblin, lznt1, quick-xml,
 rmp, rmp-serde, ruzstd, salzweg, scroll, scroll_derive, simd-adler32, slab,
-strsim, twox-hash, unshield, xz4rust, zip, zmij, and bytes (`http` features
-only). fancy-regex and tiff are vendored, and Pillow's resampler ported
-(§1h5).
+strsim, xz4rust, zip, zmij, and bytes (`http` features only). fancy-regex and
+tiff are vendored, and Pillow's resampler ported (§1h5); unshield and explode
+are ported (§1h1).
 
 Apache-2.0-only: lzma-rust2 (it ships no NOTICE file of its own; the license
 text is in section 4).
@@ -555,10 +779,10 @@ BSD-3-Clause: yara-x-parser (§1), and subtle (`http` features only). tlsh2 is
 Apache-2.0 OR BSD-3-Clause.
 
 RustCrypto crates are MIT OR Apache-2.0. Offered under Zlib among other
-licenses: miniz_oxide, tinyvec, bytemuck. Unicode-3.0: unicode-ident
-(build-time). Other permissive
-licenses: CC0-1.0 OR MIT-0 OR Apache-2.0 (constant_time_eq),
-CDLA-Permissive-2.0 (webpki-roots, TLS root store, `http` features only). The
+licenses: miniz_oxide, tinyvec, bytemuck. Zlib: zlib-rs (§1l). Unicode-3.0:
+unicode-ident (build-time), and yoke, yoke-derive, zerofrom and
+zerofrom-derive (§1s). Other permissive
+licenses: CDLA-Permissive-2.0 (webpki-roots, TLS root store, `http` features only). The
 dev-only crates add CC0-1.0 / MIT-0 (ppmd-rust) and bzip2-1.0.6
 (libbz2-rs-sys), which reach no shipped artifact.
 
diff --git a/README.md b/README.md
index 61720a7e..4532278a 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,7 @@ cargo install exav-unpack
 
 ## File viewer: `@exav/viewer`
 
-A file viewer for the browser: PDF, images, DWG and DXF drawings, Office
-documents, IFC and STL models, media and archives. Each file can open in a
+A file viewer for the browser: <!-- formats:viewer-summary -->PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint and CSV, text (Markdown, JSON, XML, source code), IFC, STL, OBJ, PLY and glTF models, video, audio, and what is inside an archive<!-- /formats:viewer-summary -->. Each file can open in a
 sandboxed frame of its own, and exav's own decoders run in WebAssembly.
 
 ```sh
@@ -62,7 +61,7 @@ npm install @exav/viewer
 |---|---|
 | [`exav-grep`](crates/exav-grep/README.md) | `grep`, but it can see inside archives |
 | [`exav-core`](crates/exav-core/README.md) | The scanning engine, as a Rust library |
-| [`exav-render`](crates/exav-render/README.md) | The decoders behind the viewer: images, DWG, DXF, IFC, STL |
+| [`exav-render`](crates/exav-render/README.md) | The decoders behind the viewer: images, DWG, DXF, IFC, STL, OBJ, PLY, glTF, Office documents |
 | [`exav-imagehash`](crates/exav-imagehash/README.md) | Perceptual image hashes, ClamAV's `fuzzy_img` among them |
 | [`exav-pe-emu`](crates/exav-pe-emu/README.md) | A bounded x86-32 emulator that runs packer stubs to unpack them |
 | [`exav-x86`](crates/exav-x86/README.md) | A decode-only x86-32 instruction decoder |
diff --git a/crates/exav-core/Cargo.toml b/crates/exav-core/Cargo.toml
index ef9104f8..e2b6a6ba 100644
--- a/crates/exav-core/Cargo.toml
+++ b/crates/exav-core/Cargo.toml
@@ -32,39 +32,45 @@ memchr = "2"
 md-5 = "0.11"
 sha1 = "0.11"
 sha2 = "0.11"
-# executable parsing (PE/ELF/Mach-O)
-goblin = "0.10"
+# PE and ELF parsing. Without Mach-O, `ar` archives and TE images, which exav
+# reads with its own code or not at all: fewer of goblin's parsers compiled.
+goblin = { version = "0.10", default-features = false, features = ["std", "elf32", "elf64", "pe32", "pe64"] }
 # x86 instruction decoder for the bytecode disasm_x86 API. Decode-only, in the
 # workspace, and dependency-free: a general-purpose decoder covers the whole ISA
 # at the cost of hundreds of `unsafe` blocks, which is a poor trade for one API.
-exav-x86 = { path = "../exav-x86", version = "0.0.2" }
+exav-x86 = { path = "../exav-x86", version = "0.0.3" }
 # archive/container extraction (its own crate). Formats are selected via this
 # crate's forwarding features (see `[features]`); `default-features = false` so a
 # lean build can pick only the formats it needs.
 # gzip+tar are not optional: a `.cvd` is a gzip'd tar, a `.cld` a raw one, so
 # loading any signature database needs both.
-exav-unpack = { path = "../exav-unpack", version = "0.0.2", default-features = false, features = ["gzip", "tar"] }
+exav-unpack = { path = "../exav-unpack", version = "0.0.3", default-features = false, features = ["gzip", "tar"] }
 # fuzzy hashing
 tlsh2 = { version = "1", features = ["diff"] }
 # The `fuzzy_img#` image hash, ClamAV's to the bit (`image-hash` feature). Its
 # formats past the five clamscan treats as graphics, JPEG 2000 and JBIG2
 # included, are hashed except under `--clamav-compat`.
-exav-imagehash = { path = "../exav-imagehash", version = "0.0.2", default-features = false, features = ["webp", "ico", "pnm", "qoi", "dds", "ff", "hdr", "jp2", "jbig2"], optional = true }
+exav-imagehash = { path = "../exav-imagehash", version = "0.0.3", default-features = false, features = ["webp", "ico", "pnm", "qoi", "dds", "ff", "hdr", "jp2", "jbig2"], optional = true }
+# The text of a document as a reader sees it (`visible-text` feature):
+# exav-render's `text`: Markdown (pulldown-cmark without its `html` and `simd`
+# features), HTML (html5gum's tokenizer), Office and OpenDocument XML parts,
+# PDF (hayro) and drawings.
+exav-render = { path = "../exav-render", version = "0.0.3", default-features = false, features = ["text"], optional = true }
 # HTTP(S) range-request backend (optional)
 ureq = { version = "3", optional = true }
 # Anchor-frequency counting at database build: tens of millions of u64 gram
 # keys, where the hash is the whole cost of the lookup.
 rustc-hash = "2"
-serde = { version = "1.0.228", features = ["derive"] }
+serde = { version = "1.0.229", features = ["derive"] }
 rmp-serde = "1.3.1"
 # The `.exavdb` binary blobs, written and read directly (see `database::enc_bytes`).
 rmp = "0.8.15"
-regex = "1.12.4"
+regex = "1.13.1"
 # The backtracking engine for the PCRE subsignatures `regex` cannot run
 # (lookaround, backreferences, atomic groups) is fancy-regex, vendored in
 # `src/fancy_regex/` (its README says why). It needs this beside `regex-automata`
 # and `regex-syntax` below.
-bit-set = { version = "0.8", default-features = false, features = ["std"] }
+bit-set = { version = "0.11", default-features = false, features = ["std"] }
 # YARA rule support (ClamAV loads .yar/.yara by default, so a drop-in must too),
 # via exav's native YARA engine under `src/yara/`. It compiles rules to a native
 # tree-walking evaluator (no runtime codegen at scan time, W^X preserved) and
@@ -75,7 +81,7 @@ bit-set = { version = "0.8", default-features = false, features = ["std"] }
 #
 # Parser + AST only. The AST borrows the source, so the compiler lowers it into
 # an owned IR.
-yara-x-parser = { version = "1.18", optional = true }
+yara-x-parser = { version = "1.19", optional = true }
 # Byte-oriented regex engine with anchored search: YARA regexp patterns, the
 # `matches` operator and hex patterns (lowered to byte regexes), and the lazy
 # DFAs that run a regex over an object read through the block cache.
@@ -87,14 +93,30 @@ regex-automata = "0.4"
 # match is ever missed).
 regex-syntax = "0.8"
 # base64 alphabet handling for the `base64`/`base64wide` string modifiers.
-base64 = { version = "0.22", optional = true }
+base64 = { version = "0.23", optional = true }
 # The database file's checksum, and crc32/checksum32 for YARA's `hash` module.
 crc32fast = "1"
 # JSON output for the WASI binary (`wasi-bin`), nothing else.
-serde_json = { version = "1.0.140", optional = true }
+serde_json = { version = "1.0.154", optional = true }
 
 [features]
-default = ["yara", "all-formats", "decrypt", "dlp", "phishing", "image-hash"]
+default = ["yara", "all-formats", "decrypt", "dlp", "phishing", "image-hash", "visible-text"]
+# A document's visible text (its words, and where each link leads) is matched
+# as a text view, as well as its bytes: Markdown, HTML, Office and OpenDocument
+# XML parts, PDF and drawings. Not under `--clamav-compat`.
+visible-text = ["dep:exav-render"]
+# And PDF's, read by hayro. Not a default: hayro-interpret turns on
+# hayro-syntax's `unsafe` feature, which switches every `flate2` in the build to
+# zlib-rs (and changes what a damaged stream gives back) and adds SIMD to the
+# image decoders; it also adds some 40 crates. See docs/DEPENDENCIES.md.
+visible-text-pdf = ["visible-text", "exav-render/text-pdf"]
+# And the office formats the XML parts do not reach: DOC, XLS, PPT, RTF, Word
+# 2003 XML, SpreadsheetML 2003, SYLK, flat OpenDocument, Numbers, Pages and
+# Keynote, from exav-render's converters (`office`). Safe Rust and within the
+# scan's limits, but the largest readers of the scan: not a default. A document
+# of those formats whose text cannot be read (encrypted, past a limit, damaged)
+# marks the scan incomplete.
+visible-text-office = ["visible-text", "exav-render/text-office"]
 # `fuzzy_img#` subsignatures, through exav-imagehash and its image decoders.
 # Without it they load as unsupported, and no image is ever decoded.
 image-hash = ["dep:exav-imagehash"]
@@ -134,7 +156,7 @@ decrypt = ["exav-unpack/decrypt"]
 # individual formats for a smaller build (e.g. `features = ["zip"]`). A format
 # exav recognises but wasn't compiled to unpack is reported unsupported, never
 # silently clean.
-all-formats = ["exav-unpack/all-formats", "pdf", "base64scan"]
+all-formats = ["exav-unpack/all-formats", "pdf", "base64scan", "lzw", "lzma", "rpm", "diskimage"]
 base64scan = ["exav-unpack/base64scan"]
 zip = ["exav-unpack/zip"]
 gzip = ["exav-unpack/gzip"]
@@ -143,7 +165,9 @@ bzip2 = ["exav-unpack/bzip2"]
 xz = ["exav-unpack/xz"]
 zstd = ["exav-unpack/zstd"]
 lzip = ["exav-unpack/lzip"]
-cab = ["exav-unpack/cab"]
+lzma = ["exav-unpack/lzma"]
+rpm = ["exav-unpack/rpm"]
+cab =["exav-unpack/cab"]
 chm = ["exav-unpack/chm"]
 sevenz = ["exav-unpack/sevenz"]
 rar = ["exav-unpack/rar"]
@@ -188,6 +212,11 @@ alz = ["exav-unpack/alz"]
 egg = ["exav-unpack/egg"]
 hwp3 = ["exav-unpack/hwp3"]
 ext = ["exav-unpack/ext"]
+exfat = ["exav-unpack/exfat"]
+squashfs = ["exav-unpack/squashfs"]
+cramfs = ["exav-unpack/cramfs"]
+romfs = ["exav-unpack/romfs"]
+erofs = ["exav-unpack/erofs"]
 zoo = ["exav-unpack/zoo"]
 ishieldz = ["exav-unpack/ishieldz"]
 pepack = ["exav-unpack/pepack"]
@@ -235,18 +264,20 @@ zip = { version = "9", default-features = false, features = ["deflate-flate2"] }
 # into the build at all.
 flate2 = "1"
 tar = { version = "0.4", default-features = false }
-cfb = "0.14"
+cfb = "0.15"
 # Writes the MSZIP cabinets the damaged-member tests break.
 cab = "0.6.0"
 # only for the base64-embedded-executable end-to-end test
-base64 = "0.22"
+base64 = "0.23"
+# Reads formats/registry.json, which the detection is checked against.
+serde_json = "1.0.154"
 # The reference PPMd8 encoder, for the ZIP method-98 end-to-end test.
 ppmd-rust = "1"
 # Encodes the images the `fuzzy_img#` tests scan.
 image = { version = "=0.25.9", default-features = false, features = ["png", "webp"] }
 # The unit tests of the vendored `src/fancy_regex/`, as upstream wrote them.
 matches = "0.1.10"
-quickcheck = { version = "1.0", default-features = false }
+quickcheck = { version = "1.1", default-features = false }
 # Small chunks when reading a source, so tests on small inputs cross many
 # chunk seams. Features only: which formats are built stays with the
 # dependency above.
diff --git a/crates/exav-core/examples/bc_scan.rs b/crates/exav-core/examples/bc_scan.rs
index ac2fd3a3..44928601 100644
--- a/crates/exav-core/examples/bc_scan.rs
+++ b/crates/exav-core/examples/bc_scan.rs
@@ -15,10 +15,10 @@ fn main() {
     let mut sources = Vec::new();
     for e in std::fs::read_dir(&dir).unwrap().flatten() {
         let p = e.path();
-        if p.extension().map(|x| x == "cbc").unwrap_or(false) {
-            if let Ok(t) = std::fs::read_to_string(&p) {
-                sources.push(t);
-            }
+        if p.extension().map(|x| x == "cbc").unwrap_or(false)
+            && let Ok(t) = std::fs::read_to_string(&p)
+        {
+            sources.push(t);
         }
     }
     let (rt, triggers) = BytecodeRuntime::standalone(sources);
diff --git a/crates/exav-core/examples/diag.rs b/crates/exav-core/examples/diag.rs
index d6df19dc..49a6f882 100644
--- a/crates/exav-core/examples/diag.rs
+++ b/crates/exav-core/examples/diag.rs
@@ -99,6 +99,8 @@ fn main() {
     }
     eprintln!("  top fan-out groups (alen gsize hits fanout | best_off coverage%):");
     for (alen, gsize, hits, fan, off, cov) in db.engine().scan_diag_groups(&data, ft) {
-        eprintln!("    alen={alen} gsize={gsize:>5} hits={hits:>7} fanout={fan:>10} | off={off:>4} cov={cov}%");
+        eprintln!(
+            "    alen={alen} gsize={gsize:>5} hits={hits:>7} fanout={fan:>10} | off={off:>4} cov={cov}%"
+        );
     }
 }
diff --git a/crates/exav-core/examples/triage_bc.rs b/crates/exav-core/examples/triage_bc.rs
index e2c57682..35aeb10e 100644
--- a/crates/exav-core/examples/triage_bc.rs
+++ b/crates/exav-core/examples/triage_bc.rs
@@ -53,11 +53,7 @@ fn input_for(trigger: &str) -> Vec<u8> {
         .and_then(|s| s.split([',', ';']).next())
         .and_then(|s| s.trim().parse::<u32>().ok())
         .unwrap_or(0);
-    if target == 1 {
-        benign_pe()
-    } else {
-        benign()
-    }
+    if target == 1 { benign_pe() } else { benign() }
 }
 
 const OP_NAMES: &[&str] = &[
@@ -225,5 +221,7 @@ fn main() {
         "{executed}/{} executed to completion (no unsupported op/API)",
         rows.len()
     );
-    println!("  of which {ran_clean} clean, {false_pos} set a name (trigger-gated programs run standalone — not false positives)");
+    println!(
+        "  of which {ran_clean} clean, {false_pos} set a name (trigger-gated programs run standalone — not false positives)"
+    );
 }
diff --git a/crates/exav-core/examples/yara_coverage.rs b/crates/exav-core/examples/yara_coverage.rs
index e94c08f2..5db9ddc0 100644
--- a/crates/exav-core/examples/yara_coverage.rs
+++ b/crates/exav-core/examples/yara_coverage.rs
@@ -97,10 +97,10 @@ fn main() {
             // A real rule rejection.
             rule_rejects += 1;
             let bucket = normalize(err.message());
-            if bucket == "external variable / unknown identifier" {
-                if let Some(id) = extract_ident(err.message()) {
-                    *ext_idents.entry(id).or_default() += 1;
-                }
+            if bucket == "external variable / unknown identifier"
+                && let Some(id) = extract_ident(err.message())
+            {
+                *ext_idents.entry(id).or_default() += 1;
             }
             *buckets.entry(bucket).or_default() += 1;
         }
@@ -183,10 +183,10 @@ fn collect(dir: &Path, out: &mut Vec<PathBuf>) {
         let path = entry.path();
         if path.is_dir() {
             collect(&path, out);
-        } else if let Some(ext) = path.extension().and_then(|e| e.to_str()) {
-            if ext == "yar" || ext == "yara" {
-                out.push(path);
-            }
+        } else if let Some(ext) = path.extension().and_then(|e| e.to_str())
+            && (ext == "yar" || ext == "yara")
+        {
+            out.push(path);
         }
     }
 }
diff --git a/crates/exav-core/src/authenticode/mod.rs b/crates/exav-core/src/authenticode/mod.rs
index 2fdab91f..cb106ccc 100644
--- a/crates/exav-core/src/authenticode/mod.rs
+++ b/crates/exav-core/src/authenticode/mod.rs
@@ -154,10 +154,10 @@ impl CrbDb {
             } else {
                 continue;
             }
-            if let Some(ref ser) = e.serial {
-                if ser.trim_start_matches('0') != cser {
-                    continue;
-                }
+            if let Some(ref ser) = e.serial
+                && ser.trim_start_matches('0') != cser
+            {
+                continue;
             }
             return Some(&e.name);
         }
diff --git a/crates/exav-core/src/bin/exav-wasm.rs b/crates/exav-core/src/bin/exav-wasm.rs
index 1dd4310c..908959dc 100644
--- a/crates/exav-core/src/bin/exav-wasm.rs
+++ b/crates/exav-core/src/bin/exav-wasm.rs
@@ -22,7 +22,7 @@
 
 #![forbid(unsafe_code)]
 
-use exav_core::{analyze, ScanOptions, Scanner, VerdictCategory};
+use exav_core::{ScanOptions, Scanner, VerdictCategory, analyze};
 use std::path::{Path, PathBuf};
 
 fn main() {
diff --git a/crates/exav-core/src/bytecode/exec.rs b/crates/exav-core/src/bytecode/exec.rs
index 4b8e781f..522b604c 100644
--- a/crates/exav-core/src/bytecode/exec.rs
+++ b/crates/exav-core/src/bytecode/exec.rs
@@ -103,6 +103,9 @@ const MAX_ALLOC: usize = 256 << 20;
 /// The largest `malloc` ClamAV 1.4.3 grants: it returns NULL from
 /// `(128 << 20) - 8` bytes up, and so does exav.
 const MAX_MALLOC: usize = (128 << 20) - 9;
+/// Bytes one bulk read or write of memory costs one step: a program that
+/// copies megabytes in an instruction is not one step of work.
+const BYTES_PER_STEP: u64 = 16;
 /// Size of `__clambc_pedata`.
 const PEDATA_LEN: usize = 648;
 
@@ -452,12 +455,22 @@ pub struct Ctx<'a> {
 pub struct WriteLimits {
     pub file: u64,
     pub total: u64,
+    /// What a run may hold in all: its `malloc`s (a program frees nothing, and
+    /// a loop of allocations each under the per-allocation limit would take
+    /// the host's memory long before its steps ran out), the frames of the
+    /// calls in progress, and the globals it has read. Past it the run stops as
+    /// incomplete.
+    pub memory: u64,
 }
 
+/// What a run may hold unless the scan says otherwise.
+pub const DEFAULT_MEMORY: u64 = 256 << 20;
+
 impl WriteLimits {
     pub const NONE: Self = WriteLimits {
         file: u64::MAX,
         total: u64::MAX,
+        memory: DEFAULT_MEMORY,
     };
 }
 
@@ -491,11 +504,16 @@ struct Machine<'a> {
     layouts: Vec<Option<(Rc<[Slot]>, usize)>>,
     /// The program's declared APIs, by `CALL_API` id, resolved once per run.
     apis: Vec<(u32, Api)>,
-    /// Globals rendered to bytes once (a global read happens in hot loops, so
-    /// this must not reallocate per access).
-    gcache: Vec<Vec<u8>>,
+    /// Globals rendered to bytes at their first read (a global read happens in
+    /// hot loops, so this must not reallocate per access, and a global the
+    /// program never reads costs nothing).
+    gcache: Vec<Option<Vec<u8>>>,
     /// `malloc` allocations, indexed by region `R_HEAP + i`.
     heaps: Vec<Vec<u8>>,
+    /// What the run holds in all: the `malloc`s, the frames of the calls in
+    /// progress and the globals read, against `memory`.
+    held: usize,
+    memory: usize,
     /// The in-progress extraction buffer (`write` appends here).
     extract_cur: Vec<u8>,
     /// Finalized extracted buffers (`extract_new` flushes `extract_cur` here).
@@ -646,8 +664,8 @@ impl<'a> Machine<'a> {
         match self.ctx.globals.values.get(g as usize).map(|v| v.len()) {
             Some(l) if l >= 2 => self.global_ptr(g),
             Some(_) => self.ctx.globals.values[g as usize]
-                .first()
-                .map(|&v| v as i64)
+                .get(0)
+                .map(|v| v as i64)
                 .unwrap_or(0),
             None => {
                 self.flag();
@@ -714,8 +732,7 @@ impl<'a> Machine<'a> {
             self.flag();
             return R_NULL;
         };
-        if gv.len() >= 2 {
-            let (offset, target) = (gv[0], gv[1]);
+        if let (Some(offset), Some(target)) = (gv.get(0), gv.get(1)) {
             if target & GLOBAL_PREDEFINED != 0 {
                 return match target {
                     GLOBAL_FILESIZE => compose(R_FILESIZE, offset as u32),
@@ -764,7 +781,7 @@ impl<'a> Machine<'a> {
         }
         if region >= R_GLOBAL {
             let g = (region - R_GLOBAL) as usize;
-            let v = self.gcache.get(g).and_then(|b| read_le(b, off as usize, w));
+            let v = read_le(self.global_bytes(g), off as usize, w);
             return v.unwrap_or_else(|| {
                 self.flag();
                 0
@@ -815,12 +832,40 @@ impl<'a> Machine<'a> {
         }
     }
 
-    fn global_bytes(&self, g: usize) -> &[u8] {
-        self.gcache.get(g).map(|v| v.as_slice()).unwrap_or(&[])
+    /// Global `g` as bytes, rendered at its first read and held from then on.
+    /// One the run has no memory left for ends it as incomplete.
+    fn global_bytes(&mut self, g: usize) -> &[u8] {
+        if self.gcache.get(g).is_some_and(Option::is_none) {
+            let len = self.ctx.globals.values[g].len();
+            if !self.hold(len) {
+                self.gap();
+                return &[];
+            }
+            self.gcache[g] = Some(self.ctx.globals.values[g].bytes());
+        }
+        self.gcache.get(g).and_then(|v| v.as_deref()).unwrap_or(&[])
+    }
+
+    /// Charges the steps a copy of `n` bytes is worth; the run ends, as it
+    /// does for any other instruction, when they pass `MAX_STEPS`.
+    fn charge_bytes(&mut self, n: usize) {
+        self.steps = self.steps.saturating_add(n as u64 / BYTES_PER_STEP);
+    }
+
+    /// Takes `n` bytes of the run's memory, or says that none is left.
+    fn hold(&mut self, n: usize) -> bool {
+        match self.held.checked_add(n) {
+            Some(held) if held <= self.memory => {
+                self.held = held;
+                true
+            }
+            _ => false,
+        }
     }
 
     /// Read `len` bytes through a pointer (for API arguments and memops).
     fn read_region(&mut self, p: i64, len: usize) -> Vec<u8> {
+        self.charge_bytes(len.min(MAX_ALLOC));
         let (region, off) = (ptr_region(p), ptr_off(p) as usize);
         let slice = |buf: &[u8]| {
             buf.get(off..off.saturating_add(len).min(buf.len()))
@@ -866,6 +911,27 @@ impl<'a> Machine<'a> {
         Vec::new()
     }
     fn write_region(&mut self, p: i64, bytes: &[u8]) {
+        self.charge_bytes(bytes.len());
+        // Within one region, in a piece: a program that asks for megabytes
+        // (`get_environment` into a frame) is not megabytes of single stores.
+        let (region, off) = (ptr_region(p), ptr_off(p) as usize);
+        let target = if (R_HEAP..R_GLOBAL).contains(&region) {
+            self.heaps
+                .get_mut((region - R_HEAP) as usize)
+                .map(Vec::as_mut_slice)
+        } else if (R_STACK..R_HEAP).contains(&region) {
+            self.frames
+                .get_mut((region - R_STACK) as usize)
+                .map(|f| f.stack.as_mut_slice())
+        } else {
+            None
+        };
+        if let Some(to) = target.and_then(|t| t.get_mut(off..off.checked_add(bytes.len())?)) {
+            to.copy_from_slice(bytes);
+            return;
+        }
+        // Past the end of the region (the first byte there ends the run, with
+        // the bytes before it written) or in none.
         for (i, &b) in bytes.iter().enumerate() {
             self.store_int(
                 compose(ptr_region(p), ptr_off(p).wrapping_add(i as u32)),
@@ -875,7 +941,7 @@ impl<'a> Machine<'a> {
         }
     }
 
-    fn read_cstring(&self, p: i64) -> Option<String> {
+    fn read_cstring(&mut self, p: i64) -> Option<String> {
         let (region, off) = (ptr_region(p), ptr_off(p) as usize);
         let take = |b: &[u8]| -> Option<String> {
             let s: Vec<u8> = b
@@ -1088,6 +1154,10 @@ impl<'a> Machine<'a> {
                 if self.trace {
                     eprintln!("[trace] malloc({size}) -> heap#{}", self.heaps.len());
                 }
+                if !self.hold(size as usize) {
+                    self.gap();
+                    return 0;
+                }
                 let idx = self.heaps.len();
                 self.heaps.push(vec![0u8; size as usize]);
                 compose(R_HEAP + idx as i64, 0)
@@ -1414,7 +1484,7 @@ impl<'a> Machine<'a> {
         let types = self.ctx.types;
         let (slots, nbytes) = self.layouts[idx].get_or_insert_with(|| layout(f, types));
         let (slots, nbytes) = (Rc::clone(slots), *nbytes);
-        if nbytes > MAX_BYTES {
+        if nbytes > MAX_BYTES || !self.hold(nbytes) {
             self.gap();
             return 0;
         }
@@ -1472,6 +1542,7 @@ impl<'a> Machine<'a> {
             }
         }
         self.frames.pop();
+        self.held -= nbytes;
         ret
     }
 
@@ -1851,19 +1922,15 @@ pub fn run_without_pe_data(funcs: &[Function], entry: usize, ctx: &Ctx) -> Outco
 }
 
 fn run_inner(funcs: &[Function], entry: usize, ctx: &Ctx, pe_missing: bool) -> Outcome {
-    let gcache: Vec<Vec<u8>> = ctx
-        .globals
-        .values
-        .iter()
-        .map(|v| v.iter().map(|&c| c as u8).collect())
-        .collect();
     let mut m = Machine {
         ctx,
         frames: Vec::new(),
         layouts: Vec::new(),
         apis: resolve_apis(ctx),
-        gcache,
+        gcache: vec![None; ctx.globals.values.len()],
         heaps: Vec::new(),
+        held: 0,
+        memory: usize::try_from(ctx.write_limits.memory).unwrap_or(usize::MAX),
         extract_cur: Vec::new(),
         extracted: Vec::new(),
         written: 0,
@@ -1910,7 +1977,7 @@ mod tests {
     use crate::bytecode::instr::{
         Body, Function, Inst, OP_BRANCH, OP_CALL_API, OP_JMP, OP_RET, OP_RET_VOID,
     };
-    use crate::bytecode::types::{Globals, TypeTable};
+    use crate::bytecode::types::{Global, Globals, TypeTable};
 
     fn detector() -> Vec<Function> {
         let blocks = vec![
@@ -2011,13 +2078,10 @@ mod tests {
             }],
             layouts: Vec::new(),
             apis: resolve_apis(c),
-            gcache: c
-                .globals
-                .values
-                .iter()
-                .map(|v| v.iter().map(|&x| x as u8).collect())
-                .collect(),
+            gcache: vec![None; c.globals.values.len()],
             heaps: Vec::new(),
+            held: 0,
+            memory: usize::try_from(c.write_limits.memory).unwrap_or(usize::MAX),
             extract_cur: Vec::new(),
             extracted: Vec::new(),
             written: 0,
@@ -2347,12 +2411,75 @@ mod tests {
         assert!(!m.unsupported && !m.gap);
     }
 
+    /// A program frees nothing, so allocations that each fit are held until
+    /// the run ends: past a total the run stops as incomplete, rather than the
+    /// host running out of memory first.
+    #[test]
+    fn globals_of_zeros_cost_nothing_until_read_and_then_count_against_the_memory() {
+        // A thousand globals of 16.7 million components, as 5 KB of signature
+        // declares them: each is 16 MiB once read.
+        let globals = Globals {
+            values: (0..1000).map(|_| Global::zeros(1 << 24)).collect(),
+        };
+        let (apis, types) = (apis(), TypeTable::default());
+        let mut c = ctx(b"", &apis, &globals, &types);
+        c.write_limits.memory = 100 << 20;
+        let mut m = machine(&c);
+        assert_eq!(m.held, 0, "nothing is made before a read");
+        for g in 0..6 {
+            assert_eq!(m.global_bytes(g).len(), 1 << 24);
+        }
+        assert!(!m.gap, "six of them are inside 100 MiB");
+        assert!(m.global_bytes(6).is_empty());
+        assert!(m.gap && m.halt, "the seventh ends the run as incomplete");
+        // One read twice is held once.
+        assert_eq!(m.held, 6 << 24);
+        assert_eq!(m.global_bytes(0).len(), 1 << 24);
+        assert_eq!(m.held, 6 << 24);
+    }
+
+    /// 16 MiB written by one call used to be 16 million single-byte stores that
+    /// no step counted: a loop of calls ran for years inside the step limit.
+    #[test]
+    fn a_bulk_write_is_one_copy_and_costs_steps_by_its_size() {
+        let (apis, globals, types) = (apis(), Globals::default(), TypeTable::default());
+        let c = ctx(b"", &apis, &globals, &types);
+        let mut m = machine(&c);
+        let p = m.call_api(0, Api::Malloc, &[Operand::Const(16 << 20)]);
+        let before = m.steps;
+        let started = std::time::Instant::now();
+        m.write_region(p, &vec![7u8; 16 << 20]);
+        assert!(started.elapsed().as_millis() < 500, "{:?}", started.elapsed());
+        assert_eq!(m.steps - before, (16 << 20) / BYTES_PER_STEP);
+        assert!(!m.halt);
+        assert_eq!(m.read_region(p, 4), [7, 7, 7, 7]);
+        // The bytes before the end of the region are written, and the first
+        // one past it ends the run.
+        m.write_region(p, &vec![9u8; (16 << 20) + 1]);
+        assert!(m.halt);
+        assert_eq!(m.read_region(p, 1), [9]);
+    }
+
+    #[test]
+    fn malloc_in_all_past_the_heap_cap_stops_the_run() {
+        let (apis, globals, types) = (apis(), Globals::default(), TypeTable::default());
+        let c = ctx(b"", &apis, &globals, &types);
+        let mut m = machine(&c);
+        let each = Operand::Const(100 << 20);
+        assert_ne!(m.call_api(0, Api::Malloc, &[each]), 0);
+        assert_ne!(m.call_api(0, Api::Malloc, &[each]), 0);
+        assert!(!m.halt);
+        assert_eq!(m.call_api(0, Api::Malloc, &[each]), 0);
+        assert!(m.gap && m.halt, "the run ends as incomplete");
+        assert_eq!(m.held, 200 << 20);
+    }
+
     /// Output past exav's own cap is not dropped silently: the run stops
     /// as incomplete.
     #[test]
     fn write_past_the_extraction_cap_is_a_gap() {
         let globals = Globals {
-            values: vec![vec![0, 1], vec![0x41, 0x42]],
+            values: vec![vec![0, 1].into(), vec![0x41, 0x42].into()],
         };
         let (apis, types) = (apis(), TypeTable::default());
         let c = ctx(b"", &apis, &globals, &types);
@@ -2372,13 +2499,17 @@ mod tests {
     #[test]
     fn write_past_the_scan_limits_fails_and_the_run_goes_on() {
         let globals = Globals {
-            values: vec![vec![0, 1], vec![0x41, 0x42, 0x43]],
+            values: vec![vec![0, 1].into(), vec![0x41, 0x42, 0x43].into()],
         };
         let (apis, types) = (apis(), TypeTable::default());
         let args = [Operand::Global(0), Operand::Const(3)];
         // Three bytes to one file, seven in all.
         let c = Ctx {
-            write_limits: WriteLimits { file: 3, total: 7 },
+            write_limits: WriteLimits {
+                file: 3,
+                total: 7,
+                ..WriteLimits::NONE
+            },
             ..ctx(b"", &apis, &globals, &types)
         };
         let mut m = machine(&c);
@@ -2447,10 +2578,37 @@ mod tests {
         assert!(out.incomplete, "a program cut short is not one that found nothing");
     }
 
+    /// Each call's frame may be large and a program may recurse deep, so the
+    /// frames in progress together are bounded: past it the run ends as
+    /// incomplete, and the frames of calls that returned are given back.
+    #[test]
+    fn frames_in_all_are_bounded() {
+        let funcs = vec![Function {
+            num_args: 0,
+            return_type: 0,
+            types: vec![32],
+            num_insts: 1,
+            num_bb: 1,
+            blocks: vec![vec![]],
+        }];
+        let (apis, globals, types) = (Vec::new(), Globals::default(), TypeTable::default());
+        let c = ctx(b"", &apis, &globals, &types);
+        let mut m = machine(&c);
+        m.exec_fn(&funcs, 0, &[], 0);
+        assert!(!m.gap && m.held == 0, "a returned call's frame is given back");
+        m.held = m.memory;
+        m.exec_fn(&funcs, 0, &[], 1);
+        assert!(m.gap && m.halt, "no room left for another frame");
+    }
+
     #[test]
     fn resolves_global_string() {
         let globals = Globals {
-            values: vec![vec![0], vec![69, 105, 99, 97, 114, 0], vec![0, 1]],
+            values: vec![
+                vec![0].into(),
+                vec![69, 105, 99, 97, 114, 0].into(),
+                vec![0, 1].into(),
+            ],
         };
         let (apis, types) = (Vec::<(u32, String)>::new(), TypeTable::default());
         let c = ctx(b"", &apis, &globals, &types);
@@ -2462,7 +2620,7 @@ mod tests {
     #[test]
     fn resolves_filesize_global() {
         let globals = Globals {
-            values: vec![vec![0, GLOBAL_FILESIZE]],
+            values: vec![vec![0, GLOBAL_FILESIZE].into()],
         };
         let (apis, types) = (Vec::<(u32, String)>::new(), TypeTable::default());
         let c = ctx(b"12345678", &apis, &globals, &types);
diff --git a/crates/exav-core/src/bytecode/runtime.rs b/crates/exav-core/src/bytecode/runtime.rs
index 45075185..56b81ec3 100644
--- a/crates/exav-core/src/bytecode/runtime.rs
+++ b/crates/exav-core/src/bytecode/runtime.rs
@@ -224,11 +224,10 @@ impl BytecodeRuntime {
         let mut out = Vec::new();
         for (idx, bc) in self.programs.iter().enumerate() {
             let o = run_program(bc, &data, pe.as_ref(), pe_missing, Some(&pdf), &[], exec::WriteLimits::NONE);
-            if !o.hit_unsupported {
-                if let Some(d) = o.detection {
+            if !o.hit_unsupported
+                && let Some(d) = o.detection {
                     out.push((d, idx));
                 }
-            }
         }
         out
     }
@@ -257,11 +256,10 @@ fn take_outcome(
     if o.hit_unsupported {
         return;
     }
-    if det.is_none() {
-        if let Some(d) = o.detection {
+    if det.is_none()
+        && let Some(d) = o.detection {
             *det = Some((d, idx));
         }
-    }
 }
 
 /// Run one program's entry function (0) under a bounded, panic-isolated VM.
diff --git a/crates/exav-core/src/bytecode/types.rs b/crates/exav-core/src/bytecode/types.rs
index c4fde8a7..b1a51bfa 100644
--- a/crates/exav-core/src/bytecode/types.rs
+++ b/crates/exav-core/src/bytecode/types.rs
@@ -14,6 +14,8 @@ const START_TID: u32 = 69;
 /// Predefined pointer types occupying ids 65..69.
 const NUM_STATIC: usize = (START_TID - 65) as usize;
 const MAX_TYPES: usize = 1 << 20;
+/// Most components one global may declare. The memory a run takes for what it
+/// reads of them is counted against the run's memory limit as it is read.
 const MAX_GLOBAL_COMPONENTS: usize = 1 << 24;
 
 #[derive(Debug, Clone)]
@@ -261,7 +263,53 @@ fn read_type_id(r: &mut Reader) -> Result<u32, ParseError> {
 /// Constant globals: a flat list, per global a list of 64-bit components.
 #[derive(Debug, Clone, Default)]
 pub struct Globals {
-    pub values: Vec<Vec<u64>>,
+    pub values: Vec<Global>,
+}
+
+/// One global's components. A zero initializer is two bytes of text whatever
+/// the size of the global, so a global of zeros is kept as its length and
+/// holds nothing until it is read.
+#[derive(Debug, Clone, Default)]
+pub struct Global {
+    len: usize,
+    /// The components, or nothing for a global of zeros.
+    init: Vec<u64>,
+}
+
+impl Global {
+    /// A global of `len` zeros.
+    pub fn zeros(len: usize) -> Global {
+        Global { len, init: vec![] }
+    }
+
+    pub fn len(&self) -> usize {
+        self.len
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len == 0
+    }
+
+    pub fn get(&self, i: usize) -> Option<u64> {
+        (i < self.len).then(|| self.init.get(i).copied().unwrap_or(0))
+    }
+
+    /// The first byte of each component.
+    pub fn bytes(&self) -> Vec<u8> {
+        if self.init.is_empty() {
+            return vec![0u8; self.len];
+        }
+        self.init.iter().map(|&c| c as u8).collect()
+    }
+}
+
+impl From<Vec<u64>> for Global {
+    fn from(init: Vec<u64>) -> Global {
+        Global {
+            len: init.len(),
+            init,
+        }
+    }
 }
 
 impl Globals {
@@ -275,7 +323,7 @@ impl Globals {
         if num > MAX_TYPES {
             return Err(perr("too many globals"));
         }
-        let mut values = Vec::with_capacity(num);
+        let mut values = Vec::with_capacity(num.min(rec.len()));
         for _ in 0..num {
             let tid = read_type_id(&mut r)?;
             let comp = types.components(tid)?;
@@ -290,15 +338,16 @@ impl Globals {
 
 /// Read `comp` constant components, or a zero-initializer (`@\``), terminated
 /// by a `` ` `` byte.
-fn read_constant(r: &mut Reader, comp: usize) -> Result<Vec<u64>, ParseError> {
+fn read_constant(r: &mut Reader, comp: usize) -> Result<Global, ParseError> {
     let m = |_| perr("truncated constant");
     // Zero initializer: bytes 0x40 ('@') 0x60 ('`').
     if r.peek() == Some(0x40) && r.peek_at(1) == Some(0x60) {
         r.byte().map_err(m)?;
         r.byte().map_err(m)?;
-        return Ok(vec![0u64; comp]);
+        return Ok(Global::zeros(comp));
     }
-    let mut out = Vec::with_capacity(comp);
+    // The text bounds what is read, not the declared count.
+    let mut out = Vec::with_capacity(comp.min(1 << 16));
     while r.peek() != Some(0x60) {
         if out.len() >= comp {
             return Err(perr("constant has too many components"));
@@ -320,7 +369,7 @@ fn read_constant(r: &mut Reader, comp: usize) -> Result<Vec<u64>, ParseError> {
     if out.len() != comp {
         return Err(perr("constant has too few components"));
     }
-    Ok(out)
+    Ok(out.into())
 }
 
 fn read_nibble(r: &mut Reader) -> Result<u8, ParseError> {
@@ -330,3 +379,4 @@ fn read_nibble(r: &mut Reader) -> Result<u8, ParseError> {
     }
     Ok(b & 0x0f)
 }
+
diff --git a/crates/exav-core/src/cvd.rs b/crates/exav-core/src/cvd.rs
index 872c48f5..5e719cf9 100644
--- a/crates/exav-core/src/cvd.rs
+++ b/crates/exav-core/src/cvd.rs
@@ -84,6 +84,21 @@ pub fn read_with_limits(
     let header = parse_header(data)?;
     let payload = &data[512..];
 
+    // A `.cvd` names the md5 of the bytes after its header. A file cut short by
+    // an interrupted download or a full disk, or damaged since, no longer
+    // matches, and the decompressor would hand back the part it could read: a
+    // database with signatures missing and nothing to say so. (A `.cld`, a tar
+    // that updates rewrite in place, does not carry the md5 of its own body.)
+    if payload.starts_with(&[0x1f, 0x8b]) {
+        let got = md5_hex(payload);
+        if !header.md5.trim().eq_ignore_ascii_case(&got) {
+            return Err(format!(
+                "cvd is damaged or incomplete: its header says md5 {}, its contents are {got}",
+                header.md5.trim()
+            ));
+        }
+    }
+
     // A CVD payload is a gzip-compressed tar; a CLD's is a raw tar. Both are
     // unpacked through exav-unpack's gzip/tar extractors. The signature container
     // is TRUSTED, so the budget only caps total size/count to reject a corrupt or
@@ -120,6 +135,11 @@ pub fn read_with_limits(
     Ok((header, files))
 }
 
+fn md5_hex(data: &[u8]) -> String {
+    use md5::{Digest, Md5};
+    crate::hexsig::encode_hex(&Md5::digest(data))
+}
+
 /// A permissive [`Budget`] for unpacking the TRUSTED CVD/CLD container: it caps
 /// total bytes + file count (so a corrupt or maliciously-oversized database is
 /// rejected rather than OOMing the loader) but disables the ratio / scan-byte /
@@ -164,10 +184,18 @@ mod tests {
         gz.write_all(&tar_buf).unwrap();
         let payload = gz.finish().unwrap();
 
-        let mut header = "ClamAV-VDB:01 Jan 2026 00-00 +0000:58:1234:90:abcdef0123456789:dsig:exav-test:1700000000".to_string()
+        header_for(&payload, 1234)
+    }
+
+    /// A `.cvd` around `payload`: its header names the payload's md5.
+    fn header_for(payload: &[u8], sigs: u32) -> Vec<u8> {
+        let mut header = format!(
+            "ClamAV-VDB:01 Jan 2026 00-00 +0000:58:{sigs}:90:{}:dsig:exav-test:1700000000",
+            md5_hex(payload)
+        )
         .into_bytes();
         header.resize(512, b' ');
-        header.extend_from_slice(&payload);
+        header.extend_from_slice(payload);
         header
     }
 
@@ -203,13 +231,7 @@ mod tests {
         let mut gz = GzEncoder::new(Vec::new(), Compression::default());
         gz.write_all(&tar_buf).unwrap();
         let payload = gz.finish().unwrap();
-        let mut header =
-            "ClamAV-VDB:01 Jan 2026 00-00 +0000:58:3:90:abcdef0123456789:dsig:exav-test:1700000000"
-                .to_string()
-                .into_bytes();
-        header.resize(512, b' ');
-        header.extend_from_slice(&payload);
-        header
+        header_for(&payload, 3)
     }
 
     // Regression for the per-entry-only budget (review finding C1): the
@@ -225,4 +247,32 @@ mod tests {
         assert!(read_with_limits(&cvd, &limits).is_err());
         assert!(read(&cvd).is_ok()); // default limits accept it
     }
+
+    // A database cut short or damaged in place loads fewer signatures without
+    // saying so, unless its header's md5 is checked.
+    #[test]
+    fn a_cvd_cut_short_or_damaged_is_refused() {
+        let cvd = make_cvd();
+        assert!(read(&cvd).is_ok());
+        // Cut inside the compressed payload: the unpacker would still return
+        // the files it reached.
+        for cut in [cvd.len() - 1, cvd.len() - 20, 512 + 40] {
+            let e = read(&cvd[..cut]).err().unwrap_or_default();
+            assert!(e.contains("damaged or incomplete"), "cut at {cut}: {e:?}");
+        }
+        let mut flipped = cvd.clone();
+        let at = flipped.len() - 12;
+        flipped[at] ^= 1;
+        let e = read(&flipped).err().unwrap_or_default();
+        assert!(e.contains("damaged or incomplete"), "{e:?}");
+    }
+
+    #[test]
+    fn the_shipped_header_md5_is_the_md5_of_the_body() {
+        // The rule the check relies on, against a real container's layout: the
+        // md5 is of everything after the 512-byte header.
+        let cvd = make_cvd();
+        let hdr = parse_header(&cvd).unwrap();
+        assert_eq!(hdr.md5, md5_hex(&cvd[512..]));
+    }
 }
diff --git a/crates/exav-core/src/database.rs b/crates/exav-core/src/database.rs
index 4a438584..08a190d1 100644
--- a/crates/exav-core/src/database.rs
+++ b/crates/exav-core/src/database.rs
@@ -16,11 +16,11 @@ use std::path::Path;
 
 use crc32fast::Hasher as Crc32;
 
+use crate::Scanner;
 use crate::engine::SigEngine;
 use crate::fuzzy::FuzzyDb;
 use crate::hashes::{HashDb, SectionHashDb};
 use crate::ml::HeuristicModel;
-use crate::Scanner;
 
 /// 8-byte format tag for the `.exavdb` prebuilt database. The 6-char ASCII name
 /// plus two fixed bytes; the format *serial* lives in the separate [`VERSION`]
@@ -677,7 +677,7 @@ pub fn load(path: &Path) -> io::Result<Scanner> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{analyze, ScanOptions, Verdict};
+    use crate::{ScanOptions, Verdict, analyze};
 
     /// What the indexed encoder writes, rmp-serde reads back as the same
     /// value, every shape serde has; and no variant goes by its name.
diff --git a/crates/exav-core/src/dlp.rs b/crates/exav-core/src/dlp.rs
index f16cc0a4..19a0daaa 100644
--- a/crates/exav-core/src/dlp.rs
+++ b/crates/exav-core/src/dlp.rs
@@ -440,7 +440,7 @@ mod tests {
 
     #[test]
     fn integration_structured_cc_verdict() {
-        use crate::{analyze, Method, ScanOptions, Scanner, Verdict};
+        use crate::{Method, ScanOptions, Scanner, Verdict, analyze};
         let db = Scanner::builtin();
         let mut buf = Vec::new();
         for card in [VISA, MC, AMEX, DISCOVER] {
@@ -469,7 +469,7 @@ mod tests {
 
     #[test]
     fn counts_read_in_blocks_are_the_counts_from_memory() {
-        use crate::byte_source::{BlockCache, Stepper, CHUNK};
+        use crate::byte_source::{BlockCache, CHUNK, Stepper};
         let plants: &[&[u8]] = &[
             VISA,
             MC,
diff --git a/crates/exav-core/src/engine/mod.rs b/crates/exav-core/src/engine/mod.rs
index f95e4420..64e29ec1 100644
--- a/crates/exav-core/src/engine/mod.rs
+++ b/crates/exav-core/src/engine/mod.rs
@@ -432,6 +432,53 @@ pub fn reset_scan_truncated() {
     SCAN_TRUNCATED.with(|c| c.set(false));
     SCAN_OVER_SIZE.with(|r| r.borrow_mut().take());
     SCAN_CAPPED.with(|r| r.borrow_mut().take());
+    CLEAN_SEEN.with(|m| m.borrow_mut().clear());
+}
+
+/// Most objects remembered as scanned clean in one scan.
+const CLEAN_SEEN_MAX: usize = 4096;
+
+thread_local! {
+    /// Objects this scan has scanned to the end and found clean, by a digest of
+    /// their bytes and of everything about where they sit that a scan reads,
+    /// with the shallowest depth one was scanned at. Cleared with the
+    /// truncation flags, at the start of each top-level scan.
+    static CLEAN_SEEN: RefCell<std::collections::HashMap<[u8; 32], u32>> =
+        RefCell::new(std::collections::HashMap::new());
+}
+
+/// Whether an object with this digest was already scanned clean at `depth` or
+/// shallower. Deeper copies are not covered: the walk has fewer levels left
+/// there, so the same bytes could be reported over the limit.
+pub(crate) fn clean_seen(key: &[u8; 32], depth: u32) -> bool {
+    let seen = CLEAN_SEEN.with(|m| m.borrow().get(key).is_some_and(|&d| d <= depth));
+    #[cfg(test)]
+    if seen {
+        CLEAN_SKIPS.with(|c| c.set(c.get() + 1));
+    }
+    seen
+}
+
+#[cfg(test)]
+thread_local! {
+    /// How many objects [`clean_seen`] let a scan skip on this thread.
+    pub(crate) static CLEAN_SKIPS: std::cell::Cell<u64> = const { std::cell::Cell::new(0) };
+}
+
+/// Remember an object scanned clean at `depth`.
+pub(crate) fn clean_seen_insert(key: [u8; 32], depth: u32) {
+    CLEAN_SEEN.with(|m| {
+        let mut m = m.borrow_mut();
+        if m.len() < CLEAN_SEEN_MAX || m.contains_key(&key) {
+            m.entry(key).and_modify(|d| *d = (*d).min(depth)).or_insert(depth);
+        }
+    });
+}
+
+/// The container types above the object being scanned, outermost first, as
+/// `Intermediates:` reads them.
+pub(crate) fn ancestry_snapshot() -> Vec<Option<ClType>> {
+    ANCESTRY.with(|a| a.borrow().clone())
 }
 
 /// Record that carving reached its cap with more to carve, and why. Unlike a
@@ -1717,21 +1764,18 @@ impl Ldb {
                 SubSig::Bcomp(b) => {
                     if b.trigger < n && c[b.trigger] > 0 {
                         // Offset anchored at the trigger subsig's first match.
-                        if let SubSig::Bodies(ids) = &self.subs[b.trigger] {
-                            if let Some(off) = ids.iter().filter_map(|&id| body_off(id)).min() {
-                                if b.matches(buf.src, off) {
+                        if let SubSig::Bodies(ids) = &self.subs[b.trigger]
+                            && let Some(off) = ids.iter().filter_map(|&id| body_off(id)).min()
+                                && b.matches(buf.src, off) {
                                     c[i] = 1;
                                 }
-                            }
-                        }
                     }
                 }
                 SubSig::Fuzzy(h, dist) => {
-                    if let Some(ih) = img_hash {
-                        if hamming64(&ih, h) <= *dist {
+                    if let Some(ih) = img_hash
+                        && hamming64(&ih, h) <= *dist {
                             c[i] = 1;
                         }
-                    }
                 }
                 SubSig::Bodies(_) => {}
             }
@@ -2228,11 +2272,10 @@ impl EngineBuilder {
             match &body.elems {
                 Some(elems) => {
                     for e in elems {
-                        if let Elem::Bytes(b) = e {
-                            if b.len() >= MIN_ANCHOR {
+                        if let Elem::Bytes(b) = e
+                            && b.len() >= MIN_ANCHOR {
                                 f(b);
                             }
-                        }
                     }
                 }
                 None => {
@@ -2483,7 +2526,7 @@ impl Groups {
     fn valid(&self, n: usize) -> bool {
         self.start.first() == Some(&0)
             && self.start.last().is_some_and(|&e| e as usize == self.bodies.len())
-            && self.start.windows(2).all(|w| w[0] <= w[1])
+            && self.start.array_windows().all(|[a, b]| a <= b)
             && self.bodies.iter().all(|&b| (b as usize) < n)
     }
 }
@@ -3262,11 +3305,10 @@ impl SigEngine {
                     total += count as u64;
                     return true;
                 }
-                if let Some(hits) = buffered.take() {
-                    if v.replay(&hits, None) {
+                if let Some(hits) = buffered.take()
+                    && v.replay(&hits, None) {
                         return false;
                     }
-                }
                 !v.hit(pidx, value, start, count, None)
             };
             // The pinned bodies first, each a group of its own in the
@@ -3449,11 +3491,10 @@ impl SigEngine {
             }
             let body_off = |b: usize| sc.first_offset(b);
             if let Some(program) = ldb.bytecode {
-                if let Some(fired) = fired.as_deref_mut() {
-                    if ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
+                if let Some(fired) = fired.as_deref_mut()
+                    && ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
                         fired.push((program, sub_offsets(ldb, &sc)));
                     }
-                }
                 continue;
             }
             if ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
@@ -3582,22 +3623,20 @@ impl SigEngine {
                 continue;
             }
             if let Some(program) = ldb.bytecode {
-                if let Some(fired) = fired.as_deref_mut() {
-                    if ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
+                if let Some(fired) = fired.as_deref_mut()
+                    && ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
                         fired.push((program, sub_offsets(ldb, &sc)));
                     }
-                }
                 continue;
             }
             // A `HandlerType:` signature re-types rather than alerts, so it has
             // no name to collect, but the re-type itself must still be recorded,
             // or `--all-matches` runs a different signature set than a normal scan.
             if ldb.handler_type.is_some() {
-                if let Some(ft) = ldb.handler_type {
-                    if ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
+                if let Some(ft) = ldb.handler_type
+                    && ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx) {
                         set_retype(src, ft);
                     }
-                }
                 continue;
             }
             if ldb.eval(&hay,&|b| sc.counts[b], &body_off, img_hash, icon_ctx)
@@ -4030,7 +4069,7 @@ fn verify_inner<B: ByteSource + ?Sized, L: ByteSource + ?Sized>(
     // run hits thousands of times per file, and all but the pinned hit are
     // rejected without running it.
     macro_rules! sim {
-        ($toks:expr, $at:expr) => {{
+        ($toks:expr_2021, $at:expr_2021) => {{
             if *budget == 0 {
                 SCAN_TRUNCATED.with(|c| c.set(true));
                 return None;
@@ -4208,9 +4247,9 @@ fn match_forward<B: ByteSource + ?Sized>(
             // SIMD-search for each occurrence of that literal within the gap
             // window and recurse only there. Case-sensitive only (memmem can't
             // fold case); the `nocase` path keeps the scalar fallback.
-            if !nocase {
-                if let Some((Elem::Bytes(lit), tail)) = rest.split_first() {
-                    if !lit.is_empty() {
+            if !nocase
+                && let Some((Elem::Bytes(lit), tail)) = rest.split_first()
+                    && !lit.is_empty() {
                         let lo = pos + *min;
                         let last_start = pos + hi; // literal may start up to here
                         if lo > last_start || lo >= buf.len() {
@@ -4252,8 +4291,6 @@ fn match_forward<B: ByteSource + ?Sized>(
                         }
                         return false;
                     }
-                }
-            }
             for g in *min..=hi {
                 if match_forward(rest, buf, pos + g, nocase, budget) {
                     return true;
@@ -4347,11 +4384,10 @@ fn match_backward<B: ByteSource + ?Sized>(
         }
         Elem::AltMasked { opts } => {
             for o in opts {
-                if end >= o.len() && masked_eq(o, &buf.window(end - o.len(), o.len()), nocase) {
-                    if let Some(s) = match_backward(rest, buf, end - o.len(), nocase, budget) {
+                if end >= o.len() && masked_eq(o, &buf.window(end - o.len(), o.len()), nocase)
+                    && let Some(s) = match_backward(rest, buf, end - o.len(), nocase, budget) {
                         return Some(s);
                     }
-                }
                 if *budget == 0 {
                     SCAN_TRUNCATED.with(|c| c.set(true));
                     return None;
@@ -4373,11 +4409,10 @@ fn match_backward<B: ByteSource + ?Sized>(
                 match_backward(rest, buf, end - l, nocase, budget)
             } else {
                 for o in opts {
-                    if end >= o.len() && bytes_eq(&buf.window(end - o.len(), o.len()), o, nocase) {
-                        if let Some(s) = match_backward(rest, buf, end - o.len(), nocase, budget) {
+                    if end >= o.len() && bytes_eq(&buf.window(end - o.len(), o.len()), o, nocase)
+                        && let Some(s) = match_backward(rest, buf, end - o.len(), nocase, budget) {
                             return Some(s);
                         }
-                    }
                     if *budget == 0 {
                         return None;
                     }
@@ -4534,12 +4569,11 @@ const MAX_REACH: usize = 1 << 20;
 /// interval when they touch it. `false`, with the scan flagged incomplete,
 /// when the set is full.
 fn reach_push(out: &mut Vec<(usize, usize)>, lo: usize, hi: usize) -> bool {
-    if let Some(last) = out.last_mut() {
-        if lo >= last.0 && lo <= last.1.saturating_add(1) {
+    if let Some(last) = out.last_mut()
+        && lo >= last.0 && lo <= last.1.saturating_add(1) {
             last.1 = last.1.max(hi);
             return true;
         }
-    }
     if out.len() >= MAX_REACH {
         SCAN_TRUNCATED.with(|c| c.set(true));
         return false;
diff --git a/crates/exav-core/src/engine/parse.rs b/crates/exav-core/src/engine/parse.rs
index eeca2b77..76e3e5f8 100644
--- a/crates/exav-core/src/engine/parse.rs
+++ b/crates/exav-core/src/engine/parse.rs
@@ -614,8 +614,8 @@ pub(super) fn pick_anchor(
     let mut best_fixed: Option<(isize, usize, Prefix)> = None;
     let mut best_any: Option<(isize, usize, usize)> = None; // (score, len, idx)
     for (i, e) in elems.iter().enumerate() {
-        if let Elem::Bytes(b) = e {
-            if b.len() >= MIN_ANCHOR {
+        if let Elem::Bytes(b) = e
+            && b.len() >= MIN_ANCHOR {
                 let score = anchor_score(b, stats);
                 let better = |cur: &Option<(isize, usize, Prefix)>| match cur {
                     Some((s, l, _)) => score > *s || (score == *s && b.len() > *l),
@@ -625,11 +625,9 @@ pub(super) fn pick_anchor(
                 // no fixed-prefix one, instead of one at a wrapped distance.
                 if let (true, Ok(len), Ok(anchor_idx)) =
                     (in_fixed_prefix, u32::try_from(fixed), u32::try_from(i))
-                {
-                    if better(&best_fixed) {
+                    && better(&best_fixed) {
                         best_fixed = Some((score, b.len(), Prefix::Fixed { anchor_idx, len }));
                     }
-                }
                 let any_better = match &best_any {
                     Some((s, l, _)) => score > *s || (score == *s && b.len() > *l),
                     None => true,
@@ -638,15 +636,14 @@ pub(super) fn pick_anchor(
                     best_any = Some((score, b.len(), i));
                 }
             }
-        }
         match e.width() {
             Some(w) => fixed = fixed.saturating_add(w),
             None => in_fixed_prefix = false, // past the first variable element
         }
     }
     // Prefer an internal anchor only when it beats the fixed-prefix one.
-    if allow_internal {
-        if let Some((any_score, _, idx)) = best_any {
+    if allow_internal
+        && let Some((any_score, _, idx)) = best_any {
             // No fixed-prefix candidate at all must lose to every real one:
             // scores are signed, so a `0` floor here would reject a merely
             // common internal anchor and leave the body with no anchor — i.e.
@@ -663,18 +660,15 @@ pub(super) fn pick_anchor(
                 }
             }
         }
-    }
     if let Some((.., p)) = best_fixed {
         return Some(p);
     }
     // Floating: a single leading variable gap, then a usable literal.
-    if matches!(elems.first(), Some(Elem::Gap { .. })) {
-        if let Some(Elem::Bytes(b)) = elems.get(1) {
-            if b.len() >= MIN_ANCHOR {
+    if matches!(elems.first(), Some(Elem::Gap { .. }))
+        && let Some(Elem::Bytes(b)) = elems.get(1)
+            && b.len() >= MIN_ANCHOR {
                 return Some(Prefix::Floating { anchor_idx: 1 });
             }
-        }
-    }
     None
 }
 
@@ -881,14 +875,13 @@ fn digits_or_empty(s: &str) -> Option<u64> {
 
 pub(super) fn parse_tdb_engine(tdb: &str) -> (u32, u32) {
     for field in tdb.split(',') {
-        if let Some(v) = field.trim().strip_prefix("Engine:") {
-            if let Some((a, b)) = v.trim().split_once('-') {
+        if let Some(v) = field.trim().strip_prefix("Engine:")
+            && let Some((a, b)) = v.trim().split_once('-') {
                 return (
                     a.trim().parse().unwrap_or(0),
                     b.trim().parse().unwrap_or(u32::MAX),
                 );
             }
-        }
     }
     (0, u32::MAX)
 }
diff --git a/crates/exav-core/src/fancy_regex/README.md b/crates/exav-core/src/fancy_regex/README.md
index 7784fbab..98cd4a9f 100644
--- a/crates/exav-core/src/fancy_regex/README.md
+++ b/crates/exav-core/src/fancy_regex/README.md
@@ -33,13 +33,29 @@ It is vendored rather than depended on because a crate published on crates.io
 can only depend on crates.io releases: `cargo install exav` would build the
 release without the fixes.
 
-## Two fixes of exav's own
+## Fixes of exav's own
+
+0.20.0 (2026-10-24) has the two pull requests above and, on its own, the last
+two fixes below (`utf8_empty(false)` is in its `compile.rs`, the ASCII word
+boundaries in its `vm.rs`). Run against it, `cargo test -p exav-core pcre`
+passes but for the first fix.
+
+`analyze.rs`, `compile.rs`: the size analysis adds and multiplies with
+saturating arithmetic where 0.19.2 and 0.20.0 use `+` and `*` for the minimum
+size (`min_size * lo` of a repeat, the sums over a conditional and over the
+children of a sequence, `go_back` of a lookbehind). A signature of nested
+repeat counts, `((((a{65535}){65535}){65535}){65535}){65535}\1`, overflows
+`usize`: a panic where overflow checks are on (this workspace's release
+profile has them), a wrong size where they are off. Pinned by
+`nested_repeat_counts_do_not_overflow_the_size_analysis` in `engine/pcre.rs`,
+which panics inside 0.20.0's `analyze.rs`. Not yet reported upstream.
 
 `compile.rs`: the delegated regex-automata engines are configured with
 `utf8_empty(false)` outside `BytesMode::Unicode`. With its default (`true`) an
 engine skips an empty match at a position inside what would be a UTF-8
 sequence, so a delegated `x*` found no match before a byte over 0x7F, and
 `(\bb)x*` did not match `b\x9e`. Pinned by the same test as the next fix.
+Fixed in 0.20.0.
 
 `vm.rs`: in `BytesMode::Ascii`, `\b`, `\B` and `\b{start}`/`\b{end}` (and their
 half forms) read a word character as an ASCII one, as `\w` does. 0.19.2 asks
@@ -48,8 +64,7 @@ the position as UTF-8: `\bab` did not match `1\x9aab` (the byte `\x9a` was read
 with the `1` before it), where `regex` and PCRE2 find a boundary after `\x9a`,
 no word character. Found by `fuzz/fuzz_targets/pcre.rs`, pinned by
 `a_word_boundary_beside_a_high_byte_reads_the_same_in_both_engines` in
-`engine/pcre.rs`. Not yet reported upstream: when it is, say so here, and drop
-the change once a release carries the fix.
+`engine/pcre.rs`. Fixed in 0.20.0.
 
 ## What differs from upstream's `src/`
 
@@ -70,15 +85,18 @@ and do not run here.
 
 ## Going back to the crates.io release
 
-Once a release has both fixes (0.19.3 or later):
+Once a release has the size analysis fix above. 0.20.0 has everything else
+(with `variable-lookbehinds` in its features, which `exav-core` needs) and fails
+`nested_repeat_counts_do_not_overflow_the_size_analysis`. It also depends on
+`bit-set` 0.8, so the direct `bit-set` 0.11 goes with the copy.
 
 1. Delete this directory, and in `lib.rs` the `mod fancy_regex` declaration and
    `extern crate alloc`.
-2. In `Cargo.toml`, add `fancy-regex = "0.19.3"`, and remove `bit-set`, the
+2. In `Cargo.toml`, add `fancy-regex` with `default-features = false` and the
+   features `std`, `unicode`, `perf` and `variable-lookbehinds`, and remove `bit-set`, the
    `matches` and `quickcheck` dev-dependencies, and `[lib] doctest = false`.
 3. `crate::fancy_regex::` becomes `fancy_regex::` in `engine/mod.rs` and
    `engine/pcre.rs`.
-4. `cargo test -p exav-core pcre`: the cases there with a byte above 0x7F in a
-   lookaround or back reference fail without the fixes, and
-   `a_word_boundary_beside_a_high_byte_reads_the_same_in_both_engines` fails
-   unless the release also has the ASCII word boundary fix above.
+4. `cargo test -p exav-core pcre`, then the `pcre` fuzz target for a few
+   minutes: the cases with a byte above 0x7F in a lookaround or back reference,
+   and the word boundary ones, are what the fixes above are pinned by.
diff --git a/crates/exav-core/src/fancy_regex/analyze.rs b/crates/exav-core/src/fancy_regex/analyze.rs
index 4add9395..44edbd5f 100644
--- a/crates/exav-core/src/fancy_regex/analyze.rs
+++ b/crates/exav-core/src/fancy_regex/analyze.rs
@@ -579,7 +579,7 @@ impl<'a> Analyzer<'a> {
             Expr::Absent(ref absent) => {
                 use crate::fancy_regex::Absent::*;
                 match absent {
-                    Repeater(ref child) => {
+                    Repeater(child) => {
                         let child_info =
                             self.visit(child, min_pos_in_group, inside_zero_rep, enclosing_group)?;
                         min_size = 0;
@@ -589,8 +589,8 @@ impl<'a> Analyzer<'a> {
                         children.push(child_info);
                     }
                     Expression {
-                        ref absent,
-                        ref exp,
+                        absent,
+                        exp,
                     } => {
                         let absent_info =
                             self.visit(absent, min_pos_in_group, inside_zero_rep, enclosing_group)?;
@@ -603,7 +603,7 @@ impl<'a> Analyzer<'a> {
                         children.push(absent_info);
                         children.push(exp_info);
                     }
-                    Stopper(ref child) => {
+                    Stopper(child) => {
                         let child_info =
                             self.visit(child, min_pos_in_group, inside_zero_rep, enclosing_group)?;
                         // Absent stopper doesn't consume any characters itself
diff --git a/crates/exav-core/src/fancy_regex/compile.rs b/crates/exav-core/src/fancy_regex/compile.rs
index a772c307..4307669e 100644
--- a/crates/exav-core/src/fancy_regex/compile.rs
+++ b/crates/exav-core/src/fancy_regex/compile.rs
@@ -849,7 +849,7 @@ impl<'a> Compiler<'a> {
             return Ok(());
         }
         if infos.len() == 1 {
-            if let Expr::LiteralBytes { ref bytes, .. } = infos[0].expr {
+            if let Expr::LiteralBytes { bytes, .. } = infos[0].expr {
                 self.emit_literal_bytes(bytes);
                 return Ok(());
             }
@@ -1898,7 +1898,7 @@ mod tests {
         assert_eq!(prog.len(), 5, "prog: {:?}", prog);
 
         assert_matches!(prog[0], Save(2));
-        assert_matches!(&prog[1], BackwardsDelegate(ReverseBackwardsDelegate { pattern, dfa: _, cache_pool: _, capture_group_extraction_inner: ref inner, capture_groups: Some(CaptureGroupRange(0, 1)) }) if pattern == "a(b+)" && inner.is_some());
+        assert_matches!(&prog[1], BackwardsDelegate(ReverseBackwardsDelegate { pattern, dfa: _, cache_pool: _, capture_group_extraction_inner: inner, capture_groups: Some(CaptureGroupRange(0, 1)) }) if pattern == "a(b+)" && inner.is_some());
         assert_matches!(prog[2], Restore(2));
         assert_matches!(prog[3], Lit(ref l) if l == "x");
         assert_matches!(prog[4], End);
diff --git a/crates/exav-core/src/fancy_regex/mod.rs b/crates/exav-core/src/fancy_regex/mod.rs
index 58c1eb0e..55121f37 100644
--- a/crates/exav-core/src/fancy_regex/mod.rs
+++ b/crates/exav-core/src/fancy_regex/mod.rs
@@ -2663,12 +2663,12 @@ impl<'a> Iterator for ExprChildrenIter<'a> {
     fn next(&mut self) -> Option<Self::Item> {
         match self {
             ExprChildrenIter::Empty => None,
-            ExprChildrenIter::Single(ref mut child) => child.take(),
-            ExprChildrenIter::Vec(ref mut iter) => iter.next(),
+            ExprChildrenIter::Single(child) => child.take(),
+            ExprChildrenIter::Vec(iter) => iter.next(),
             ExprChildrenIter::Triple {
-                ref mut first,
-                ref mut second,
-                ref mut third,
+                first,
+                second,
+                third,
             } => first
                 .take()
                 .or_else(|| second.take())
@@ -2683,12 +2683,12 @@ impl<'a> Iterator for ExprChildrenIterMut<'a> {
     fn next(&mut self) -> Option<Self::Item> {
         match self {
             ExprChildrenIterMut::Empty => None,
-            ExprChildrenIterMut::Single(ref mut child) => child.take(),
-            ExprChildrenIterMut::Vec(ref mut iter) => iter.next(),
+            ExprChildrenIterMut::Single(child) => child.take(),
+            ExprChildrenIterMut::Vec(iter) => iter.next(),
             ExprChildrenIterMut::Triple {
-                ref mut first,
-                ref mut second,
-                ref mut third,
+                first,
+                second,
+                third,
             } => first
                 .take()
                 .or_else(|| second.take())
@@ -2698,7 +2698,7 @@ impl<'a> Iterator for ExprChildrenIterMut<'a> {
 }
 
 macro_rules! children_iter_match {
-    ($self:expr, $iter:ident, $vec_method:ident, $single_method:ident, $group_method:ident) => {
+    ($self:expr_2021, $iter:ident, $vec_method:ident, $single_method:ident, $group_method:ident) => {
         match $self {
             Expr::Concat(children) | Expr::Alt(children) => $iter::Vec(children.$vec_method()),
             Expr::Group(child) => $iter::Single(Some(Arc::$group_method(child))),
diff --git a/crates/exav-core/src/fancy_regex/optimize.rs b/crates/exav-core/src/fancy_regex/optimize.rs
index b66cbab4..c192c502 100644
--- a/crates/exav-core/src/fancy_regex/optimize.rs
+++ b/crates/exav-core/src/fancy_regex/optimize.rs
@@ -621,7 +621,7 @@ fn optimize_trailing_lookahead(tree: &mut ExprTree) -> bool {
                 unreachable!("already checked it is a lookahead");
             }
         }
-    } else if let Expr::LookAround(ref mut inner, LookAround::LookAhead) = &mut tree.expr {
+    } else if let Expr::LookAround(inner, LookAround::LookAhead) = &mut tree.expr {
         let group0 = Expr::Group(Arc::new(Expr::Empty));
         let mut swap = Expr::Empty;
         mem::swap(&mut swap, inner);
diff --git a/crates/exav-core/src/fancy_regex/vm.rs b/crates/exav-core/src/fancy_regex/vm.rs
index a78c3dd0..f4a90045 100644
--- a/crates/exav-core/src/fancy_regex/vm.rs
+++ b/crates/exav-core/src/fancy_regex/vm.rs
@@ -179,7 +179,7 @@ pub enum CharClassMatcher {
 
 impl fmt::Debug for CharClassMatcher {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if let Some(ref name) = match self {
+        if let Some(name) = match self {
             CharClassMatcher::Codepoint { name, .. } => name,
             CharClassMatcher::Byte { name, .. } => name,
         } {
diff --git a/crates/exav-core/src/filetype.rs b/crates/exav-core/src/filetype.rs
index ef8adf9b..89dda73d 100644
--- a/crates/exav-core/src/filetype.rs
+++ b/crates/exav-core/src/filetype.rs
@@ -187,6 +187,11 @@ pub enum FileType {
     Fat,         // FAT12/16/32 filesystem
     Inno,        // Inno Setup installer (recognised, not decoded)
     Ntfs,        // NTFS filesystem
+    Exfat,       // exFAT filesystem
+    Squashfs,    // SquashFS image
+    Cramfs,      // cramfs image
+    Romfs,       // romfs image
+    Erofs,       // EROFS image
     Zstd,        // Zstandard compressed stream
     Lzip,        // Lzip compressed stream
     Uuencode,    // uuencode / base64-uuencode wrapped file
@@ -271,6 +276,11 @@ impl FileType {
             FileType::Fat => "FAT",
             FileType::Inno => "InnoSetup",
             FileType::Ntfs => "NTFS",
+            FileType::Exfat => "exFAT",
+            FileType::Squashfs => "SquashFS",
+            FileType::Cramfs => "cramfs",
+            FileType::Romfs => "romfs",
+            FileType::Erofs => "EROFS",
             FileType::Zstd => "ZSTD",
             FileType::Lzip => "LZIP",
             FileType::Uuencode => "uuencode",
@@ -308,7 +318,7 @@ pub fn identify(buf: &[u8]) -> FileType {
 }
 
 /// Bytes of an object's start the content sniffers below read.
-const SNIFF_HEAD: usize = 8192;
+const SNIFF_HEAD: usize = 64 * 1024;
 
 /// As [`identify`], over an object that need not be held in memory: its start
 /// is read, and the container detection reads what it needs.
@@ -456,32 +466,61 @@ fn looks_like_html(buf: &[u8]) -> bool {
         .any(|m| memchr::memmem::find(&lower, m).is_some())
 }
 
-/// Heuristic RFC822/MIME detection (email has no magic bytes). Conservative:
-/// the message must start with a recognized header line *and* carry a
-/// MIME-Version/Content-Type header, or be an mbox (`From ` separator).
+/// How much of the start is read to judge a message by its headers.
+const EMAIL_HEAD: usize = 64 * 1024;
+
+/// Heuristic RFC822/MIME detection (email has no magic bytes).
+///
+/// An mbox (`From ` separator), or a header block that starts with a header
+/// field and carries a MIME header and a header only mail has. Names are not
+/// case sensitive and the first field is any: a mail client writes its own
+/// (`X-Mozilla-Status`, `X-Account-Key`) ahead of the rest, and a gateway adds
+/// a long run of `Received` fields before the MIME headers.
 fn looks_like_email(buf: &[u8]) -> bool {
-    let head = &buf[..buf.len().min(8192)];
-    let text = String::from_utf8_lossy(head);
-    if text.starts_with("From ") {
+    let head = &buf[..buf.len().min(EMAIL_HEAD)];
+    if head.starts_with(b"From ") {
         return true; // mbox
     }
-    let first_is_header = text.lines().next().is_some_and(|l| {
-        let key = l.split_once(':').map(|(k, _)| k).unwrap_or("");
-        matches!(
-            key,
-            "Received"
-                | "Return-Path"
-                | "From"
-                | "To"
-                | "Subject"
-                | "Date"
-                | "Message-ID"
-                | "Delivered-To"
-                | "MIME-Version"
-                | "Content-Type"
-        )
-    });
-    first_is_header && (text.contains("MIME-Version:") || text.contains("Content-Type:"))
+    // The header block: up to the first empty line.
+    let end = head
+        .windows(2)
+        .position(|w| w == b"\n\n")
+        .into_iter()
+        .chain(head.windows(4).position(|w| w == b"\r\n\r\n"))
+        .min()
+        .unwrap_or(head.len());
+    let block = &head[..end];
+    let field_name = |line: &[u8]| -> Option<String> {
+        let colon = line.iter().position(|&b| b == b':')?;
+        let name = &line[..colon];
+        (!name.is_empty()
+            && name.len() <= 64
+            && name.iter().all(|b| b.is_ascii_graphic() && *b != b':'))
+        .then(|| String::from_utf8_lossy(name).to_ascii_lowercase())
+    };
+    let mut lines = block.split(|&b| b == b'\n');
+    let Some(first) = lines.next().and_then(field_name) else {
+        return false;
+    };
+    // Folded lines start with white space and name nothing.
+    let names: Vec<String> = std::iter::once(first.clone())
+        .chain(lines.filter_map(field_name))
+        .collect();
+    let has = |n: &str| names.iter().any(|x| x == n);
+    let mime = has("mime-version") || has("content-type");
+    const ONLY_MAIL: &[&str] = &[
+        "received",
+        "return-path",
+        "from",
+        "to",
+        "subject",
+        "date",
+        "message-id",
+        "delivered-to",
+        "mime-version",
+    ];
+    // A part saved on its own starts with its `Content-Type`.
+    mime && (first == "content-type" || ONLY_MAIL.iter().any(|n| has(n)))
 }
 
 /// Whether a MIME document is an **MHTML web archive** rather than a mail
@@ -555,6 +594,10 @@ pub(crate) fn filetype_of_format(fmt: crate::unpack::Format) -> FileType {
         // the filesystem inside, which is typed when the member is scanned.
         Format::Vhd => FileType::Unknown,
         Format::Lzw => FileType::Unknown,
+        // LZMA Utils' `.lzma` has no ClamAV type either.
+        Format::Lzma => FileType::Unknown,
+        // So has an RPM package.
+        Format::Rpm => FileType::Unknown,
         Format::Qcow2 | Format::Vmdk | Format::Vhdx => FileType::Unknown,
         Format::Wim => FileType::Wim,
         Format::Lz4 => FileType::Lz4,
@@ -575,6 +618,11 @@ pub(crate) fn filetype_of_format(fmt: crate::unpack::Format) -> FileType {
         Format::Fat => FileType::Fat,
         Format::Inno => FileType::Inno,
         Format::Ntfs => FileType::Ntfs,
+        Format::Exfat => FileType::Exfat,
+        Format::Squashfs => FileType::Squashfs,
+        Format::Cramfs => FileType::Cramfs,
+        Format::Romfs => FileType::Romfs,
+        Format::Erofs => FileType::Erofs,
         Format::Zstd => FileType::Zstd,
         Format::Lzip => FileType::Lzip,
         Format::Uuencode => FileType::Uuencode,
@@ -633,6 +681,8 @@ pub(crate) const MAGIC_DISPATCH_ONLY: &[crate::unpack::Format] = &[
     crate::unpack::Format::Dmg,
     crate::unpack::Format::Vhd,
     crate::unpack::Format::Lzw,
+    crate::unpack::Format::Lzma,
+    crate::unpack::Format::Rpm,
     crate::unpack::Format::Qcow2,
     crate::unpack::Format::Vmdk,
     crate::unpack::Format::Vhdx,
@@ -769,4 +819,58 @@ mod tests {
         // Plain prose with a colon must not be misread as email (it is text).
         assert_eq!(identify(b"Notes: buy milk\nand eggs\n"), FileType::Text);
     }
+
+    /// A message is a message by what its headers are, not by which one comes
+    /// first or how it is spelt: a mail client writes its own header ahead of the
+    /// rest, and a header name is not case sensitive.
+    #[test]
+    fn a_message_is_known_by_its_headers_not_by_the_first_of_them() {
+        let rest = "Subject: x\r\nMIME-Version: 1.0\r\nContent-Type: text/plain\r\n\r\nhi";
+        for first in [
+            "X-Mozilla-Status: 0001",
+            "X-Account-Key: account1",
+            "Cc: a@b",
+            "Message-Id: <1@b>",
+            "Authentication-Results: mx; spf=pass",
+            "FROM: a@b",
+            "received: from x",
+        ] {
+            let eml = format!("{first}\r\n{rest}");
+            assert_eq!(identify(eml.as_bytes()), FileType::Email, "{first}");
+        }
+        let lower = "from: a@b\nmime-version: 1.0\ncontent-type: text/plain\n\nhi";
+        assert_eq!(identify(lower.as_bytes()), FileType::Email);
+    }
+
+    /// Header blocks of mail that went through gateways run past 8 KiB.
+    #[test]
+    fn a_long_header_block_does_not_hide_the_mime_headers() {
+        let mut eml = String::new();
+        for i in 0..200 {
+            eml.push_str(&format!("Received: from relay{i}.example.org by mx{i}.example.net; Tue, 1 Jan 2030 00:00:00 +0000\r\n"));
+        }
+        let at = eml.len();
+        eml.push_str("MIME-Version: 1.0\r\nContent-Type: text/plain\r\n\r\nhi");
+        assert!(at > 8192, "{at}");
+        assert_eq!(identify(eml.as_bytes()), FileType::Email);
+    }
+
+    #[test]
+    fn headers_alone_do_not_make_a_message() {
+        // No MIME header.
+        assert_ne!(
+            identify(b"X-Thing: a\r\nFrom: a@b\r\n\r\nhi"),
+            FileType::Email
+        );
+        // MIME headers in the body, not the headers.
+        assert_ne!(
+            identify(b"X-Thing: a\r\nFrom: a@b\r\n\r\nContent-Type: text/plain\r\nhi"),
+            FileType::Email
+        );
+        // A header-looking first line and nothing mail about it.
+        assert_ne!(
+            identify(b"Server: x\r\nContent-Length: 3\r\nContent-Type: text/plain\r\n\r\nhi"),
+            FileType::Email
+        );
+    }
 }
diff --git a/crates/exav-core/src/grams/mod.rs b/crates/exav-core/src/grams/mod.rs
index c132bc55..51dbc708 100644
--- a/crates/exav-core/src/grams/mod.rs
+++ b/crates/exav-core/src/grams/mod.rs
@@ -31,11 +31,11 @@
 mod rarity;
 mod sweep;
 
-#[cfg(feature = "yara")]
-pub(crate) use rarity::structural;
 #[cfg(test)]
 pub(crate) use rarity::FILTER_MIN_BODIES;
-pub(crate) use rarity::{anchor_score, GramStats};
+#[cfg(feature = "yara")]
+pub(crate) use rarity::structural;
+pub(crate) use rarity::{GramStats, anchor_score};
 pub(crate) use sweep::sweep;
 #[cfg(test)]
 pub(crate) use sweep::{MIN_SKIP_RUN, NO_RUN_COLLAPSE, SWEEP_WINDOW};
@@ -737,8 +737,8 @@ impl Grams {
             };
             if !list.iter().all(fits)
                 || !list
-                    .windows(2)
-                    .all(|p| window(&pool, &p[0], w) <= window(&pool, &p[1], w))
+                    .array_windows()
+                    .all(|[a, b]| window(&pool, a, w) <= window(&pool, b, w))
             {
                 return Err(bad());
             }
diff --git a/crates/exav-core/src/grams/rarity.rs b/crates/exav-core/src/grams/rarity.rs
index 2b9157e9..7db812f1 100644
--- a/crates/exav-core/src/grams/rarity.rs
+++ b/crates/exav-core/src/grams/rarity.rs
@@ -144,11 +144,7 @@ impl GramStats {
 /// literal is never penalised, and the penalty grows with an order of
 /// magnitude rather than with a raw count that spans 1..10^6.
 fn log2_floor(c: u32) -> isize {
-    if c <= 1 {
-        0
-    } else {
-        c.ilog2() as isize
-    }
+    if c <= 1 { 0 } else { c.ilog2() as isize }
 }
 
 /// How rare `b` should be from its bytes alone. A low-entropy run (a constant
diff --git a/crates/exav-core/src/grams/sweep.rs b/crates/exav-core/src/grams/sweep.rs
index 46211b59..f881ce7e 100644
--- a/crates/exav-core/src/grams/sweep.rs
+++ b/crates/exav-core/src/grams/sweep.rs
@@ -1,7 +1,7 @@
 //! One pass over an object, a window at a time, looking up the anchors of a
 //! [`Grams`] at every position but inside long runs of one byte.
 
-use super::{Grams, Scan, GRAM};
+use super::{GRAM, Grams, Scan};
 use crate::byte_source::ByteSource;
 
 /// Bytes of the object [`sweep`] reads at a time; in memory, a slice of it.
diff --git a/crates/exav-core/src/hashes.rs b/crates/exav-core/src/hashes.rs
index 67877b29..e4661f06 100644
--- a/crates/exav-core/src/hashes.rs
+++ b/crates/exav-core/src/hashes.rs
@@ -80,7 +80,7 @@ impl<K: Record> Serialize for SortedTable<K> {
         }
         let spans: Vec<u8> = self.spans.iter().flat_map(|&(o, l)| [o.to_le_bytes(), l.to_le_bytes()]).flatten().collect();
         let mut bits = vec![0u8; self.unofficial.len().div_ceil(8)];
-        for (i, _) in self.unofficial.iter().enumerate().filter(|(_, &u)| u) {
+        for (i, _) in self.unofficial.iter().enumerate().filter(|&(_, &u)| u) {
             bits[i / 8] |= 1 << (i % 8);
         }
         (Blob(&keys), Blob(&spans), &self.names, Blob(&bits)).serialize(s)
diff --git a/crates/exav-core/src/icon.rs b/crates/exav-core/src/icon.rs
index bd668b69..27d47312 100644
--- a/crates/exav-core/src/icon.rs
+++ b/crates/exav-core/src/icon.rs
@@ -421,19 +421,17 @@ impl<'a> Resources<'a> {
                 Some(a) => a,
                 None => continue,
             };
-            if let Some(namedir) = self.find_id_subdir(t3abs, icon_id) {
-                if let Some((coff, csize)) = self.first_data_leaf(namedir, 0) {
+            if let Some(namedir) = self.find_id_subdir(t3abs, icon_id)
+                && let Some((coff, csize)) = self.first_data_leaf(namedir, 0) {
                     let end = coff
                         .checked_add(csize)
                         .map(|e| e.min(self.data.len()))
                         .unwrap_or(self.data.len());
-                    if let Some(slice) = self.data.get(coff..end) {
-                        if !slice.is_empty() {
+                    if let Some(slice) = self.data.get(coff..end)
+                        && !slice.is_empty() {
                             out.push(slice);
                         }
-                    }
                 }
-            }
         }
         out
     }
@@ -1260,11 +1258,10 @@ fn take_cells(
     let mut cells = [Cell::default(); 3];
     for c in cells.iter_mut() {
         let avg = take_field(b, pos, avg_n)?;
-        if let Some(mx) = avg_max {
-            if avg > mx {
+        if let Some(mx) = avg_max
+            && avg > mx {
                 return None;
             }
-        }
         let x = take_field(b, pos, 2)?;
         if x > coord_max {
             return None;
@@ -1346,11 +1343,10 @@ fn matchpoint(side: u32, a: &[Cell; 3], b: &[Cell; 3], max: u32) -> u32 {
     for ca in a {
         let mut best = 0u32;
         for cb in b {
-            if let Some(score) = cell_score(ca, cb, dist_lim, avg_lim) {
-                if score > best {
+            if let Some(score) = cell_score(ca, cb, dist_lim, avg_lim)
+                && score > best {
                     best = score;
                 }
-            }
         }
         total += best;
     }
@@ -1365,11 +1361,10 @@ fn matchbwpoint(side: u32, a: &[Cell; 6], b: &[Cell; 6]) -> u32 {
     for ca in a {
         let mut best = 0u32;
         for cb in b {
-            if let Some(score) = cell_score(ca, cb, dist_lim, avg_lim) {
-                if score > best {
+            if let Some(score) = cell_score(ca, cb, dist_lim, avg_lim)
+                && score > best {
                     best = score;
                 }
-            }
         }
         total += best;
     }
diff --git a/crates/exav-core/src/jsnorm.rs b/crates/exav-core/src/jsnorm.rs
index 83119671..5e7cfaf9 100644
--- a/crates/exav-core/src/jsnorm.rs
+++ b/crates/exav-core/src/jsnorm.rs
@@ -22,11 +22,10 @@
 //! purely static rewriter: it never executes code, so runtime-assembled payloads
 //! (numeric-array VMs, dynamic dispatch) are intentionally out of scope.
 //!
-//! Not yet implemented (tracked in tmp/GAPS.md):
-//! * **Microsoft Script Encoder** (`#@~^…^#~@`, JScript.Encode/VBScript.Encode)
-//!   decoding — needs the exact published 119×3 translation + 64-entry pick
-//!   tables; deferred rather than ship an unverified table (and near-absent in
-//!   the current corpus).
+//! Not done here: Microsoft Script Encoder (`#@~^…^#~@`) blobs are decoded by
+//! exav-unpack's `screnc`, which surfaces the plaintext as a member of its own.
+//!
+//! Not yet implemented:
 //! * **base64→script rescan** — decoding long base64 runs to *script/text* (not
 //!   just exec-magic payloads, which `exav-unpack::base64_payloads` already
 //!   covers). The higher-yield lever per corpus evidence, but needs a distinct
@@ -805,13 +804,12 @@ fn percent_decode(s: &[u8]) -> Vec<u8> {
                 continue;
             }
         }
-        if s[i] == b'%' && i + 2 < n {
-            if let Some(v) = hex2(s[i + 1], s[i + 2]) {
+        if s[i] == b'%' && i + 2 < n
+            && let Some(v) = hex2(s[i + 1], s[i + 2]) {
                 out.push(v);
                 i += 3;
                 continue;
             }
-        }
         out.push(s[i]);
         i += 1;
     }
@@ -900,11 +898,10 @@ impl Emitter {
             }
             Tok::Punct(b) => std::slice::from_ref(b),
         };
-        if let (Some(&last), Some(&first)) = (self.out.last(), piece.first()) {
-            if is_ident(last) && is_ident(first) {
+        if let (Some(&last), Some(&first)) = (self.out.last(), piece.first())
+            && is_ident(last) && is_ident(first) {
                 self.out.push(b' ');
             }
-        }
         self.out.extend_from_slice(piece);
     }
 
diff --git a/crates/exav-core/src/lib.rs b/crates/exav-core/src/lib.rs
index eab32a2e..8955f31a 100644
--- a/crates/exav-core/src/lib.rs
+++ b/crates/exav-core/src/lib.rs
@@ -204,6 +204,11 @@ fn unpack_format(ft: FileType) -> Option<unpack::Format> {
         FileType::Fat => unpack::Format::Fat,
         FileType::Inno => unpack::Format::Inno,
         FileType::Ntfs => unpack::Format::Ntfs,
+        FileType::Exfat => unpack::Format::Exfat,
+        FileType::Squashfs => unpack::Format::Squashfs,
+        FileType::Cramfs => unpack::Format::Cramfs,
+        FileType::Romfs => unpack::Format::Romfs,
+        FileType::Erofs => unpack::Format::Erofs,
         FileType::Zstd => unpack::Format::Zstd,
         FileType::Lzip => unpack::Format::Lzip,
         FileType::Uuencode => unpack::Format::Uuencode,
@@ -254,6 +259,8 @@ pub(crate) struct Facts<'a> {
 struct Shared {
     want: hashes::Want,
     carve: bool,
+    /// Far candidates carving holds before it checks them.
+    far: usize,
 }
 
 impl<'a> Facts<'a> {
@@ -271,12 +278,13 @@ impl<'a> Facts<'a> {
 
     /// The facts of `data` scanned by `db`, carved when `carve`: when `data`
     /// is not held in memory, all worked out in one read of it.
-    fn for_scan(data: &'a dyn ByteSource, db: &Scanner, carve: bool) -> Self {
+    fn for_scan(data: &'a dyn ByteSource, db: &Scanner, carve: bool, opts: &ScanOptions) -> Self {
         let facts = Facts::new(data);
         if data.as_slice().is_none() {
             facts.shared.set(Some(Shared {
                 want: digests_wanted_by(db, data.len() as u64),
                 carve,
+                far: opts.carve_pending(),
             }));
         }
         facts
@@ -325,7 +333,7 @@ impl<'a> Facts<'a> {
     /// The one read of an object not held in memory, the first time a step
     /// asks, if it was not made yet.
     fn read_once(&self) {
-        let Some(Shared { want, carve }) = self.shared.take() else {
+        let Some(Shared { want, carve, far }) = self.shared.take() else {
             return;
         };
         let search = self.fmt.get().is_none() && unpack::Prescan::needed(self.data.len());
@@ -335,7 +343,7 @@ impl<'a> Facts<'a> {
         let data = self.data;
         let len = data.len();
         let mut hashing = (want != hashes::Want::default()).then(|| hashes::Hashing::new(want));
-        let mut carving = carve.then(pe::Carving::new);
+        let mut carving = carve.then(|| pe::Carving::new(far));
         let mut prescan = None;
         let overlap = unpack::Prescan::OVERLAP.max(pe::Carving::OVERLAP);
         let mut at = 0;
@@ -372,7 +380,8 @@ impl<'a> Facts<'a> {
         if let Some(h) = hashing {
             let _ = self.digests.set(h.finish());
         }
-        if let Some(c) = carving {
+        if let Some(mut c) = carving {
+            c.settle(data);
             *self.embedded.borrow_mut() = Some(c.found);
         }
         *self.prescan.borrow_mut() = prescan;
@@ -420,28 +429,26 @@ fn unpack_target(
     // from the magic. Compat mode leaves them off: stock ClamAV opens none of
     // them, and extracting more there would be counted as a disagreement.
     let detected = || facts.format();
-    if !restrict {
-        if let Some(fmt) = detected() {
-            if filetype::MAGIC_DISPATCH_ONLY.contains(&fmt) {
-                return Some(fmt);
-            }
-        }
+    if !restrict
+        && let Some(fmt) = detected()
+        && filetype::MAGIC_DISPATCH_ONLY.contains(&fmt)
+    {
+        return Some(fmt);
     }
     // Installers and self-extractors: real executables, so `identify` answers
     // `Pe`/`Elf` and `unpack_format` has nothing to map. Their payload is the
     // installer's own format rather than a recognisable archive, so carving does
     // not reach it either. Without this an NSIS or Inno installer scans clean
     // with every file it packages unexamined.
-    if ft.is_executable() {
-        if let Some(fmt) = detected() {
-            if filetype::EXECUTABLE_CONTAINERS.contains(&fmt) {
-                // Stock ClamAV unpacks NSIS, AutoIt and SFX, so those stay on in
-                // compat mode; it has no Inno Setup support, and claiming the
-                // extra reach there would register as a disagreement.
-                if !restrict || fmt != unpack::Format::Inno {
-                    return Some(fmt);
-                }
-            }
+    if ft.is_executable()
+        && let Some(fmt) = detected()
+        && filetype::EXECUTABLE_CONTAINERS.contains(&fmt)
+    {
+        // Stock ClamAV unpacks NSIS, AutoIt and SFX, so those stay on in
+        // compat mode; it has no Inno Setup support, and claiming the
+        // extra reach there would register as a disagreement.
+        if !restrict || fmt != unpack::Format::Inno {
+            return Some(fmt);
         }
     }
     // UPX unpacking. ClamAV's UPX unpacker is invoked only from its PE scan path;
@@ -874,6 +881,21 @@ pub struct ScanOptions {
     /// over this limit with no spill to go to is not scanned, and reported.
     /// A scan also holds `limits.max_buffer_bytes` to it. Default 256 MiB.
     pub deep_analysis_max: u64,
+    /// Memory of the block cache of an object read in place, in bytes
+    /// (`--object-cache-bytes`): an object past `deep_analysis_max`, a spilled
+    /// member or view, a spilled stream. One cache for each such object being
+    /// scanned, nested ones included. Carving also holds up to this much of
+    /// candidates waiting for a check while it reads such an object. Default
+    /// 8 MiB.
+    pub object_cache_bytes: u64,
+    /// One block of that cache, in bytes (`--object-cache-block-bytes`): the
+    /// unit it reads from the object, and over HTTP what a read at an offset
+    /// elsewhere fetches. Default 1 MiB.
+    pub object_cache_block_bytes: u64,
+    /// Over HTTP, the most one range request fetches (`--http-request-bytes`),
+    /// reached by a read that goes on from where the last stopped, which asks
+    /// for twice as much each time from one block. Default 8 MiB.
+    pub http_request_bytes: u64,
     /// Largest object PCRE subsignatures run on (`--max-pcre-bytes`); on a
     /// larger one they do not match, as ClamAV's `PCREMaxFileSize` has it.
     /// `None` = no limit (default); 100 MiB under `--clamav-compat`.
@@ -1032,11 +1054,43 @@ pub struct ScanOptions {
     pub spill: Option<std::sync::Arc<dyn spill::Spill>>,
 }
 
+impl ScanOptions {
+    /// The block and capacity, in bytes, of a block cache: at least a byte a
+    /// block, and room for two.
+    pub(crate) fn cache_sizes(&self) -> (usize, usize) {
+        let block = usize::try_from(self.object_cache_block_bytes)
+            .unwrap_or(usize::MAX)
+            .max(1);
+        let bytes = usize::try_from(self.object_cache_bytes).unwrap_or(usize::MAX);
+        (block, bytes)
+    }
+
+    /// How many far candidates carving holds before it checks them: their
+    /// 16 bytes each fill no more than the object cache does.
+    pub(crate) fn carve_pending(&self) -> usize {
+        usize::try_from(self.object_cache_bytes / 16)
+            .unwrap_or(usize::MAX)
+            .max(1)
+    }
+
+    /// A block cache over `reader`, sized by these options.
+    pub(crate) fn object_cache<R: Read + Seek>(
+        &self,
+        reader: R,
+    ) -> io::Result<byte_source::BlockCache<R>> {
+        let (block, bytes) = self.cache_sizes();
+        byte_source::BlockCache::with_sizes(reader, block, bytes)
+    }
+}
+
 impl Default for ScanOptions {
     fn default() -> Self {
         Self {
             max_scan_size: None,
             deep_analysis_max: 256 * 1024 * 1024,
+            object_cache_bytes: 8 * 1024 * 1024,
+            object_cache_block_bytes: 1024 * 1024,
+            http_request_bytes: 8 * 1024 * 1024,
             max_pcre_bytes: None,
             min_scan_bytes: MIN_SCAN_BYTES,
             heuristics: false,
@@ -1084,6 +1138,9 @@ impl ScanOptions {
         Self {
             max_scan_size: Some(100 * 1024 * 1024),
             deep_analysis_max: 400 * 1024 * 1024,
+            object_cache_bytes: 8 * 1024 * 1024,
+            object_cache_block_bytes: 1024 * 1024,
+            http_request_bytes: 8 * 1024 * 1024,
             // ClamAV's PCREMaxFileSize default.
             max_pcre_bytes: Some(100 * 1024 * 1024),
             min_scan_bytes: MIN_SCAN_BYTES,
@@ -1267,10 +1324,10 @@ impl Scanner {
     fn identify_inner(&self, facts: &Facts) -> FileType {
         let data = facts.data;
         let mut ft = filetype::identify_source_with(data, || facts.format());
-        if ft == FileType::Unknown {
-            if let Some(f) = self.ftm.identify_source(data) {
-                ft = f;
-            }
+        if ft == FileType::Unknown
+            && let Some(f) = self.ftm.identify_source(data)
+        {
+            ft = f;
         }
         // The bzip2 (`BZh`), CAB (`MSCF`), gzip (`1f 8b`) and ARJ (`60 ea`)
         // file-type magics are short and collide with ordinary binary data; a
@@ -1500,16 +1557,16 @@ pub fn scan_seekable<R: Read + Seek>(
     // Thread-local, so it carries over from whatever this thread scanned last
     // unless every entry point clears it.
     engine::reset_scan_truncated();
-    if let Some(max) = opts.max_scan_size {
-        if size > max {
-            // Invariant 2 (see crate docs): scan what is within the limit
-            // before refusing by size, so a detection in it still wins.
-            let head = scan_within(db, Window::new(&mut reader, max)?, max, opts)?;
-            if head.verdict.category() == VerdictCategory::Infected {
-                return Ok(head);
-            }
-            return Ok(max_file_size_report(size, max, opts));
+    if let Some(max) = opts.max_scan_size
+        && size > max
+    {
+        // Invariant 2 (see crate docs): scan what is within the limit
+        // before refusing by size, so a detection in it still wins.
+        let head = scan_within(db, Window::new(&mut reader, max)?, max, opts)?;
+        if head.verdict.category() == VerdictCategory::Infected {
+            return Ok(head);
         }
+        return Ok(max_file_size_report(size, max, opts));
     }
     scan_within(db, reader, size, opts)
 }
@@ -1531,10 +1588,20 @@ fn scan_within<R: Read + Seek>(
         if data.len() as u64 <= opts.deep_analysis_max {
             return Ok(analyze(db, &data, opts));
         }
-        // It grew while it was read: scanned as the larger object it now is.
+        // It grew while it was read: scanned as the larger object it now is,
+        // if it says it is. A device that reads on without end (`/dev/zero`)
+        // measures nothing, and a scan of its measure would be of no bytes.
+        let end = reader.seek(SeekFrom::End(0))?;
         reader.seek(SeekFrom::Start(0))?;
+        if end <= opts.deep_analysis_max {
+            return Err(io::Error::other(format!(
+                "the source gave more than {} bytes and says it has {end}: \
+                 it is not a file with a length, and cannot be scanned as one",
+                opts.deep_analysis_max
+            )));
+        }
     }
-    let cache = byte_source::BlockCache::new(reader)?;
+    let cache = opts.object_cache(reader)?;
     let report = analyze_source(db, &cache, opts);
     // A read that failed part way leaves bytes the scan never saw.
     if let Some(e) = cache.read_error() {
@@ -1644,11 +1711,11 @@ fn max_file_size_report(size: u64, max: u64, opts: &ScanOptions) -> ScanReport {
 /// The alert a top-level file larger than `max_scan_size` is reported as
 /// under `--alert-exceeds-max`, or else the reason it is over the limit.
 fn max_file_size(size: u64, max: u64, opts: &ScanOptions) -> Result<&'static str, String> {
-    if opts.alert_exceeds_max {
-        if let Some(name) = limits_alert_name(unpack::LimitKind::MaxFileSize) {
-            match_loc_record();
-            return Ok(name);
-        }
+    if opts.alert_exceeds_max
+        && let Some(name) = limits_alert_name(unpack::LimitKind::MaxFileSize)
+    {
+        match_loc_record();
+        return Ok(name);
     }
     Err(format!(
         "file size {size} exceeds max-input-bytes {max}; scanned first {max} bytes only"
@@ -1661,15 +1728,15 @@ fn max_file_size(size: u64, max: u64, opts: &ScanOptions) -> Result<&'static str
 /// treated as complete: a kind with no alert name keeps the `LimitsExceeded`
 /// verdict and its reason.
 fn limits_outcome(opts: &ScanOptions, kind: unpack::LimitKind, reason: String) -> DeepOutcome {
-    if opts.alert_exceeds_max {
-        if let Some(name) = limits_alert_name(kind) {
-            match_loc_record();
-            return DeepOutcome::Infected {
-                signature: name.to_string(),
-                offset: 0,
-                method: Method::Heuristic,
-            };
-        }
+    if opts.alert_exceeds_max
+        && let Some(name) = limits_alert_name(kind)
+    {
+        match_loc_record();
+        return DeepOutcome::Infected {
+            signature: name.to_string(),
+            offset: 0,
+            method: Method::Heuristic,
+        };
     }
     DeepOutcome::Limits(reason)
 }
@@ -1753,7 +1820,11 @@ fn read_member(
     let Some(spill) = &cx.opts.spill else {
         return not_scanned(tally, "spilling to disk is off");
     };
-    match spill::spill_stream(spill.as_ref(), &mut io::Cursor::new(buf).chain(rest)) {
+    match spill::spill_stream(
+        spill.as_ref(),
+        &mut io::Cursor::new(buf).chain(rest),
+        cx.opts.cache_sizes(),
+    ) {
         Ok(spilled) => Ok(Body::Spilled(spilled)),
         Err(spill::SpillStreamError::Read(e)) if unpack::is_budget_overflow(&e) => {
             Err(over_budget())
@@ -1805,10 +1876,11 @@ fn visit_member(
     // to decompress to itself, so the guard lives here rather than in any
     // extractor. The length test is false for essentially every real member,
     // so the comparison is only reached by a genuine fixed point.
-    if let Body::Mem(data) = &body {
-        if data.len() == container.len() && *container.window(0, data.len()) == data[..] {
-            return None;
-        }
+    if let Body::Mem(data) = &body
+        && data.len() == container.len()
+        && *container.window(0, data.len()) == data[..]
+    {
+        return None;
     }
     let size_real = match &body {
         Body::Mem(data) => data.len() as u64,
@@ -1829,7 +1901,7 @@ fn visit_member(
                 // of it is a real Clean: exav scans for malware, it is not a
                 // file-integrity validator. Undecodable bytes still present
                 // keep the not-fully-scanned verdict.
-                let o = member_content_scan(cx, tally, &data, budget, findings, sink);
+                let o = member_content_scan(cx, tally, &meta.name, &data, budget, findings, sink);
                 if o.is_none() && unpack::decode_error_hides_content(&e) {
                     tally.unscannable.get_or_insert_with(|| {
                         format!(
@@ -1848,10 +1920,10 @@ fn visit_member(
                 unpack::volume::Offer::Held => return None,
                 unpack::volume::Offer::PassThrough { data, .. } => data,
             };
-            member_content_scan(cx, tally, &data, budget, findings, sink)
+            member_content_scan(cx, tally, &meta.name, &data, budget, findings, sink)
         }
         Body::Spilled(spilled) => {
-            let o = member_content_scan(cx, tally, &spilled, budget, findings, sink);
+            let o = member_content_scan(cx, tally, &meta.name, &spilled, budget, findings, sink);
             if let Some(e) = spilled.read_error() {
                 tally
                     .unscannable
@@ -1957,14 +2029,13 @@ fn walk_members(
             break;
         }
         let _mpg = MatchPathGuard::enter(&name);
-        terminal = member_content_scan(&cx, &mut tally, &buf, budget, findings, sink);
+        terminal = member_content_scan(&cx, &mut tally, &name, &buf, budget, findings, sink);
     }
-    if let Some(name) = tally.encrypted.take() {
-        if !matches!(terminal, Some(DeepOutcome::Infected { .. })) {
-            if let Some(o) = sink.hit(name.to_string(), 0, Method::Heuristic) {
-                return o;
-            }
-        }
+    if let Some(name) = tally.encrypted.take()
+        && !matches!(terminal, Some(DeepOutcome::Infected { .. }))
+        && let Some(o) = sink.hit(name.to_string(), 0, Method::Heuristic)
+    {
+        return o;
     }
     terminal.unwrap_or_else(|| tally.verdict())
 }
@@ -1996,8 +2067,8 @@ pub struct VolumeSetVerdict {
 /// whole set with it. Byte-split naming records no part count, so a set missing
 /// its LAST part still looks contiguous and would join into a truncated prefix,
 /// which parses as the archive and scans clean. The set is reported
-/// `Unscannable` instead. The dropped part's own scan, which the caller does
-/// separately, still covers that part's bytes.
+/// `Unscannable` instead, each part read and not held included. The caller's
+/// own scan of a part says only that the fragment is not malware itself.
 ///
 /// Returns one entry per *part*, each carrying the verdict of the archive that
 /// part belongs to, including `Unscannable` for a set with a hole in it, whose
@@ -2025,13 +2096,21 @@ where
     // missing trailing index leaves no trace in them.
     let mut broken: std::collections::BTreeMap<String, &'static str> =
         std::collections::BTreeMap::new();
+    // The parts the collector read and would not hold. It keeps no trace of
+    // them, so a set none of whose parts it holds comes back with no entry.
+    let mut passed: Vec<String> = Vec::new();
+    // Parts group without regard to case, so a set is known by its lower-case
+    // name here, whichever part's case it was joined under.
+    fn set_key(name: &str) -> String {
+        name.to_ascii_lowercase()
+    }
     for name in names {
         if !unpack::volume::parse(name).is_some_and(|v| v.scheme.is_byte_split()) {
             continue;
         }
         let Ok(data) = fetch(name) else {
             broken.insert(
-                volume_set_name(name),
+                set_key(&volume_set_name(name)),
                 "part of a multi-volume set one of whose volumes could not be read",
             );
             continue;
@@ -2041,9 +2120,10 @@ where
         // cap, or a second part claiming an index another part already holds.
         if let unpack::volume::Offer::PassThrough { name, .. } = collector.offer(name, data) {
             broken.insert(
-                volume_set_name(&name),
+                set_key(&volume_set_name(&name)),
                 "part of a multi-volume set that could not be reassembled whole",
             );
+            passed.push(name);
         }
     }
     if !any {
@@ -2059,7 +2139,7 @@ where
     for j in held.joined {
         // A set with a hole gets the hole's verdict, not a verdict read off the
         // bytes that happened to arrive.
-        let report = match broken.get(j.name.as_str()) {
+        let report = match broken.get(set_key(&j.name).as_str()) {
             Some(reason) => ScanReport::unscannable((*reason).to_string(), Vec::new()),
             None => analyze(db, &j.data, opts),
         };
@@ -2074,19 +2154,288 @@ where
     for u in held.unjoined {
         // A lone numbered file is not a set: plenty of ordinary files end in
         // `.001`, and the caller's own scan of it is the right answer.
-        let Some(reason) = u.incomplete_set else {
+        // Unless a part of it was lost: one readable part of a set whose other
+        // part could not be read is not a lone file.
+        let set = volume_set_name(&u.name);
+        let Some(reason) = u
+            .incomplete_set
+            .or_else(|| broken.get(set_key(&set).as_str()).copied())
+        else {
             continue;
         };
-        let set = volume_set_name(&u.name);
         out.push(VolumeSetVerdict {
             name: u.name,
             set,
             report: ScanReport::unscannable(reason.to_string(), Vec::new()),
         });
     }
+    // A part that was read and not held belongs to a set that cannot be
+    // rejoined: it is not a clean file because its own bytes scan clean.
+    for name in passed {
+        if out.iter().any(|v| v.name == name) {
+            continue;
+        }
+        let set = volume_set_name(&name);
+        out.push(VolumeSetVerdict {
+            name,
+            set,
+            report: ScanReport::unscannable(
+                "part of a multi-volume set that could not be reassembled whole".to_string(),
+                Vec::new(),
+            ),
+        });
+    }
     out
 }
 
+/// The sets of **format-aware volumes** among a group of files that arrived
+/// together, each put back into the one archive it was cut from and scanned:
+/// RAR (`x.part1.rar`, `x.part2.rar`, ..., or `x.rar`, `x.r00`, ...), ZIP
+/// (`x.z01`, `x.z02`, ..., `x.zip`) and CAB (`a.cab`, `b.cab`, as each header
+/// names the one after it). Each volume carries its own headers, so the join is
+/// the format's, not a concatenation, and the parts of a set scanned alone are
+/// cut short.
+///
+/// `fetch(name, None)` is a whole file and `fetch(name, Some(n))` its first `n`
+/// bytes. Whole files are fetched only for the parts of a set, up to
+/// `max-object-bytes` of them together; the heads of `.cab` files are read to
+/// find which of them name a neighbour. Names are labels, never paths: a
+/// cabinet's own header names its neighbours, and they are looked for in
+/// `names` only.
+///
+/// As [`analyze_volume_sets`]: one entry per *part*, with the verdict of the
+/// archive that part belongs to, `Unscannable` for a set with a hole in it or
+/// one that does not fit together. A file that is not part of a set is not in
+/// the result.
+#[cfg(feature = "all-formats")]
+pub fn analyze_split_sets<F>(
+    db: &Scanner,
+    names: &[String],
+    opts: &ScanOptions,
+    mut fetch: F,
+) -> Vec<VolumeSetVerdict>
+where
+    F: FnMut(&str, Option<usize>) -> io::Result<Vec<u8>>,
+{
+    use unpack::volume::{Scheme, group, parse};
+
+    #[derive(Clone, Copy, PartialEq)]
+    enum Kind {
+        Rar,
+        Zip,
+        Cab,
+    }
+    struct Set {
+        name: String,
+        kind: Kind,
+        parts: Vec<String>,
+        /// Why the set cannot be joined, when it is known from the names.
+        broken: Option<&'static str>,
+    }
+    let mut sets: Vec<Set> = Vec::new();
+    let lower = |s: &str| s.to_ascii_lowercase();
+
+    // RAR: the naming schemes say the order, and a gap says a part is missing.
+    let rar: Vec<&str> = names
+        .iter()
+        .map(String::as_str)
+        .filter(|n| {
+            matches!(
+                parse(n).map(|v| v.scheme),
+                Some(Scheme::RarPart { .. } | Scheme::RarOld)
+            )
+        })
+        .collect();
+    for set in group(&rar) {
+        let parts: Vec<&str> = set.iter().map(|&i| rar[i]).collect();
+        let first = parse(parts[0]).expect("grouped by name");
+        let contiguous = parts
+            .iter()
+            .enumerate()
+            .all(|(i, p)| parse(p).is_some_and(|v| v.index == i));
+        sets.push(Set {
+            name: format!("{}.rar", first.stem),
+            kind: Kind::Rar,
+            parts: parts.iter().map(|p| (*p).to_string()).collect(),
+            broken: (!contiguous).then_some("part of a multi-volume RAR set with a volume missing"),
+        });
+    }
+
+    // ZIP: `x.z01` ... and the `x.zip` that comes last and holds the directory.
+    let mut stems: Vec<String> = Vec::new();
+    for n in names {
+        if let Some(v) = parse(n).filter(|v| v.scheme == Scheme::ZipSplit)
+            && !stems.iter().any(|s| s.eq_ignore_ascii_case(&v.stem))
+        {
+            stems.push(v.stem);
+        }
+    }
+    for stem in stems {
+        let mut numbered: Vec<(usize, &String)> = names
+            .iter()
+            .filter_map(|n| {
+                parse(n)
+                    .filter(|v| v.scheme == Scheme::ZipSplit && v.stem.eq_ignore_ascii_case(&stem))
+                    .map(|v| (v.index, n))
+            })
+            .collect();
+        numbered.sort();
+        let last = names
+            .iter()
+            .find(|n| lower(n) == lower(&format!("{stem}.zip")));
+        let contiguous = numbered.iter().enumerate().all(|(i, (idx, _))| *idx == i);
+        let mut parts: Vec<String> = numbered.iter().map(|(_, n)| (*n).clone()).collect();
+        let broken = match last {
+            Some(l) => {
+                parts.push(l.clone());
+                (!contiguous).then_some("part of a multi-volume ZIP set with a volume missing")
+            }
+            None => Some(
+                "part of a multi-volume ZIP set whose last volume, the `.zip`, was not present",
+            ),
+        };
+        sets.push(Set {
+            name: format!("{stem}.zip"),
+            kind: Kind::Zip,
+            parts,
+            broken,
+        });
+    }
+
+    // CAB: no naming scheme; each header names its neighbours.
+    let mut cabs: Vec<(String, unpack::CabLinks)> = Vec::new();
+    for n in names.iter().filter(|n| lower(n).ends_with(".cab")) {
+        // The header, its reserved area and the two names fit in 64 KiB.
+        if let Some(l) = fetch(n, Some(64 * 1024))
+            .ok()
+            .and_then(|h| unpack::cab_links(&h))
+        {
+            cabs.push((n.clone(), l));
+        }
+    }
+    let mut ids: Vec<u16> = cabs.iter().map(|(_, l)| l.set_id).collect();
+    ids.sort_unstable();
+    ids.dedup();
+    for id in ids {
+        let mut members: Vec<&(String, unpack::CabLinks)> =
+            cabs.iter().filter(|(_, l)| l.set_id == id).collect();
+        members.sort_by_key(|(_, l)| l.index);
+        // The header's name is a label: its last component, whatever separator.
+        let leaf = |s: &str| lower(s.rsplit(['/', '\\']).next().unwrap_or(s));
+        let chained = members.iter().enumerate().all(|(i, (name, l))| {
+            usize::from(l.index) == i
+                && (i == 0) == l.prev.is_none()
+                && (i + 1 == members.len()) == l.next.is_none()
+                && l.next
+                    .as_deref()
+                    .is_none_or(|n| members.get(i + 1).is_some_and(|m| leaf(n) == lower(&m.0)))
+                && l.prev
+                    .as_deref()
+                    .is_none_or(|p| i > 0 && leaf(p) == lower(&members[i - 1].0))
+                && !name.is_empty()
+        });
+        sets.push(Set {
+            name: members[0].0.clone(),
+            kind: Kind::Cab,
+            parts: members.iter().map(|(n, _)| n.clone()).collect(),
+            broken: (!chained).then_some("part of a multi-volume CAB set whose cabinets do not follow one another as their headers say"),
+        });
+    }
+
+    let mut out = Vec::new();
+    let mut held_total = 0usize;
+    for set in sets {
+        let verdict = |report: ScanReport, out: &mut Vec<VolumeSetVerdict>| {
+            for part in &set.parts {
+                out.push(VolumeSetVerdict {
+                    name: part.clone(),
+                    set: set.name.clone(),
+                    report: report.clone(),
+                });
+            }
+        };
+        if let Some(reason) = set.broken {
+            verdict(
+                ScanReport::unscannable(reason.to_string(), Vec::new()),
+                &mut out,
+            );
+            continue;
+        }
+        let mut data: Vec<Vec<u8>> = Vec::new();
+        let mut lost = None;
+        for part in &set.parts {
+            match fetch(part, None) {
+                Ok(d) => {
+                    // Counted only once held, so a part turned away leaves
+                    // the budget as the sets after it found it.
+                    if held_total.saturating_add(d.len()) > opts.deep_analysis_max as usize {
+                        lost = Some(
+                            "part of a multi-volume set too large to hold for rejoining (--max-object-bytes)",
+                        );
+                        break;
+                    }
+                    held_total += d.len();
+                    data.push(d);
+                }
+                Err(_) => {
+                    lost =
+                        Some("part of a multi-volume set one of whose volumes could not be read");
+                    break;
+                }
+            }
+        }
+        held_total = held_total.saturating_sub(data.iter().map(Vec::len).sum());
+        if let Some(reason) = lost {
+            verdict(
+                ScanReport::unscannable(reason.to_string(), Vec::new()),
+                &mut out,
+            );
+            continue;
+        }
+        let joined: Result<ScanReport, String> = match set.kind {
+            Kind::Rar | Kind::Cab => {
+                let refs: Vec<&[u8]> = data.iter().map(Vec::as_slice).collect();
+                let joined = if set.kind == Kind::Rar {
+                    unpack::join_rar_volumes(&refs)
+                } else {
+                    unpack::join_cab_volumes(&refs)
+                };
+                joined.map(|j| analyze(db, &j, opts))
+            }
+            Kind::Zip => {
+                let parts = data
+                    .into_iter()
+                    .map(|d| Box::new(d) as Box<dyn ByteSource>)
+                    .collect();
+                unpack::span::ZipSpan::new(parts).map(|s| analyze_source(db, &s, opts))
+            }
+        };
+        let report = joined.unwrap_or_else(|e| {
+            ScanReport::unscannable(
+                format!("part of a multi-volume set that could not be rejoined: {e}"),
+                Vec::new(),
+            )
+        });
+        verdict(report, &mut out);
+    }
+    out
+}
+
+/// Without `all-formats` no archive format is read, so no part of a set of
+/// volumes is known to belong to one: nothing is joined.
+#[cfg(not(feature = "all-formats"))]
+pub fn analyze_split_sets<F>(
+    _db: &Scanner,
+    _names: &[String],
+    _opts: &ScanOptions,
+    _fetch: F,
+) -> Vec<VolumeSetVerdict>
+where
+    F: FnMut(&str, Option<usize>) -> io::Result<Vec<u8>>,
+{
+    Vec::new()
+}
+
 /// The name a part's SET is reported under, matching what
 /// `unpack::volume::Collector` names a joined set. A name that does not parse as
 /// a volume is its own set of one.
@@ -2206,17 +2555,17 @@ pub fn analyze_all_seekable<R: Read + Seek>(
     size: u64,
     opts: &ScanOptions,
 ) -> io::Result<(Vec<(String, Method)>, AllMatchOutcome)> {
-    if let Some(max) = opts.max_scan_size {
-        if size > max {
-            let (mut names, outcome) = all_within(db, Window::new(&mut reader, max)?, max, opts)?;
-            return Ok(match max_file_size(size, max, opts) {
-                Ok(name) => {
-                    names.push((name.to_string(), Method::Heuristic));
-                    (names, outcome)
-                }
-                Err(reason) => (names, AllMatchOutcome::LimitsExceeded(reason)),
-            });
-        }
+    if let Some(max) = opts.max_scan_size
+        && size > max
+    {
+        let (mut names, outcome) = all_within(db, Window::new(&mut reader, max)?, max, opts)?;
+        return Ok(match max_file_size(size, max, opts) {
+            Ok(name) => {
+                names.push((name.to_string(), Method::Heuristic));
+                (names, outcome)
+            }
+            Err(reason) => (names, AllMatchOutcome::LimitsExceeded(reason)),
+        });
     }
     all_within(db, reader, size, opts)
 }
@@ -2238,7 +2587,7 @@ fn all_within<R: Read + Seek>(
         }
         reader.seek(SeekFrom::Start(0))?;
     }
-    let cache = byte_source::BlockCache::new(reader)?;
+    let cache = opts.object_cache(reader)?;
     let found = analyze_all_source(db, &cache, opts);
     // A read that failed part way leaves bytes the scan never saw.
     if let Some(e) = cache.read_error() {
@@ -2385,14 +2734,14 @@ fn whole_buffer_heuristics(
     // many.
     if (opts.clamav_heuristics || opts.heuristics) && ft == FileType::Zip {
         const OVERLAP_THRESHOLD: usize = 5;
-        if unpack::overlapping_local_records(src) > OVERLAP_THRESHOLD {
-            if let Some(o) = sink.hit(
+        if unpack::overlapping_local_records(src) > OVERLAP_THRESHOLD
+            && let Some(o) = sink.hit(
                 "Heuristics.Zip.OverlappingFiles".to_string(),
                 0,
                 Method::Heuristic,
-            ) {
-                return Some(o);
-            }
+            )
+        {
+            return Some(o);
         }
     }
 
@@ -2404,16 +2753,15 @@ fn whole_buffer_heuristics(
     if ft == FileType::Xz {
         // The stream header and the first block header, which is at most
         // 1024 bytes.
-        if let Some(dict) = unpack::xz_declared_dict_size(&src.window(0, 12 + 1024 + 64)) {
-            if dict > unpack::XZ_MAX_DICT {
-                if let Some(o) = sink.hit(
-                    "Heuristics.XZ.DicSizeLimit".to_string(),
-                    0,
-                    Method::Heuristic,
-                ) {
-                    return Some(o);
-                }
-            }
+        if let Some(dict) = unpack::xz_declared_dict_size(&src.window(0, 12 + 1024 + 64))
+            && dict > unpack::XZ_MAX_DICT
+            && let Some(o) = sink.hit(
+                "Heuristics.XZ.DicSizeLimit".to_string(),
+                0,
+                Method::Heuristic,
+            )
+        {
+            return Some(o);
         }
     }
 
@@ -2432,12 +2780,12 @@ fn whole_buffer_heuristics(
     ]
     .iter()
     .any(|m| head.starts_with(m));
-    if opts.alert_broken_media && media {
-        if let Some(name) = whole().and_then(unpack::broken_media_alert) {
-            if let Some(o) = sink.hit(name.to_string(), 0, Method::Heuristic) {
-                return Some(o);
-            }
-        }
+    if opts.alert_broken_media
+        && media
+        && let Some(name) = whole().and_then(unpack::broken_media_alert)
+        && let Some(o) = sink.hit(name.to_string(), 0, Method::Heuristic)
+    {
+        return Some(o);
     }
 
     // A file that claims to be an executable and whose headers describe a
@@ -2451,14 +2799,17 @@ fn whole_buffer_heuristics(
     // that does not parse is a fragment or a false hit, not a broken file.
     // clamscan `--alert-broken` agrees: it reports a broken PE or ELF alone and
     // not embedded in another file.
-    if opts.alert_broken && executable && !embedded && pe::looks_broken_in(src) {
-        if let Some(o) = sink.hit(
+    if opts.alert_broken
+        && executable
+        && !embedded
+        && pe::looks_broken_in(src)
+        && let Some(o) = sink.hit(
             "Heuristics.Broken.Executable".to_string(),
             0,
             Method::Heuristic,
-        ) {
-            return Some(o);
-        }
+        )
+    {
+        return Some(o);
     }
     // An ELF whose section-header table has been stripped. Detected in BOTH
     // modes; only the name differs. It is not breakage (the program headers are
@@ -2484,12 +2835,11 @@ fn whole_buffer_heuristics(
     // so the image shows one filesystem to whatever mounts it and another to
     // whatever scans it. Parser confusion one layer below the ZIP case above.
     // Opt-in, matching ClamAV's `--alert-partition-intersection`.
-    if opts.alert_partition_intersection {
-        if let Some(name) = unpack::partition_intersection_alert(src) {
-            if let Some(o) = sink.hit(name.to_string(), 0, Method::Heuristic) {
-                return Some(o);
-            }
-        }
+    if opts.alert_partition_intersection
+        && let Some(name) = unpack::partition_intersection_alert(src)
+        && let Some(o) = sink.hit(name.to_string(), 0, Method::Heuristic)
+    {
+        return Some(o);
     }
 
     // ClamAV `Heuristics.PDF.ObfuscatedNameObject`: a PDF whose name objects
@@ -2500,14 +2850,13 @@ fn whole_buffer_heuristics(
     if (opts.clamav_heuristics || opts.heuristics)
         && ft == FileType::Pdf
         && whole().is_some_and(unpack::has_obfuscated_name_object)
-    {
-        if let Some(o) = sink.hit(
+        && let Some(o) = sink.hit(
             "Heuristics.PDF.ObfuscatedNameObject".to_string(),
             0,
             Method::Heuristic,
-        ) {
-            return Some(o);
-        }
+        )
+    {
+        return Some(o);
     }
     None
 }
@@ -2719,12 +3068,11 @@ fn member_metadata_scan(
     // Opt-in (`--detect packed`): name the packer as well as reporting that its
     // payload went unread. Same rule as the encryption case above: two facts,
     // both true, both reported.
-    if cx.opts.alert_packed {
-        if let Some(n) = packed_heuristic_name(&e.name) {
-            if let Some(o) = sink.hit(n, 0, Method::Heuristic) {
-                return Some(o);
-            }
-        }
+    if cx.opts.alert_packed
+        && let Some(n) = packed_heuristic_name(&e.name)
+        && let Some(o) = sink.hit(n, 0, Method::Heuristic)
+    {
+        return Some(o);
     }
     if let Some(r) = e.unsupported {
         if e.encrypted {
@@ -2745,14 +3093,14 @@ fn member_metadata_scan(
         // for an Excel 4.0 macro sheet. Emitting the bare name looked harmless
         // and is not: a gateway filtering on ClamAV's exact string matches
         // neither of ours.
-        if let Some(kind) = macro_dialect(&e.name) {
-            if let Some(o) = sink.hit(
+        if let Some(kind) = macro_dialect(&e.name)
+            && let Some(o) = sink.hit(
                 format!("Heuristics.OLE2.ContainsMacros.{kind}"),
                 0,
                 Method::Heuristic,
-            ) {
-                return Some(o);
-            }
+            )
+        {
+            return Some(o);
         }
     }
     if !cx.db.cdb.is_empty() {
@@ -2790,6 +3138,54 @@ fn member_metadata_scan(
     None
 }
 
+/// Smallest and largest member worth remembering as scanned clean: below the
+/// first, scanning again costs about what the digest does; past the second, the
+/// digest is another read of a very large object.
+const CLEAN_MEMO_MIN: usize = 64 * 1024;
+const CLEAN_MEMO_MAX: usize = 512 * 1024 * 1024;
+
+/// A digest of a member's bytes and of what a scan of it reads from its place:
+/// the type of its container, the type its container forces on it, the types
+/// above it, and the extension of its name. `None` for a member outside the
+/// sizes worth remembering.
+fn clean_memo_key(
+    cx: &MemberCtx<'_>,
+    name: &str,
+    core_type: Option<FileType>,
+    data: &dyn ByteSource,
+) -> Option<[u8; 32]> {
+    use sha2::Digest;
+    let len = data.len();
+    if !(CLEAN_MEMO_MIN..=CLEAN_MEMO_MAX).contains(&len) {
+        return None;
+    }
+    let ext = name
+        .rsplit_once('.')
+        .map_or("", |(_, e)| e)
+        .to_ascii_lowercase();
+    let mut h = sha2::Sha256::new();
+    h.update(
+        format!(
+            "{:?}|{core_type:?}|{:?}|{ext}|{len}|",
+            cx.member_container,
+            engine::ancestry_snapshot()
+        )
+        .as_bytes(),
+    );
+    let mut at = 0;
+    while at < len {
+        let w = data.window(at, byte_source::CHUNK.min(len - at));
+        if w.is_empty() {
+            return None;
+        }
+        h.update(&w[..]);
+        at += w.len();
+    }
+    let mut key = [0u8; 32];
+    key.copy_from_slice(&h.finalize());
+    Some(key)
+}
+
 /// Scan one member's bytes, as an object one level below its container.
 ///
 /// Split from [`member_metadata_scan`] because a member of a multi-volume set
@@ -2800,6 +3196,7 @@ fn member_metadata_scan(
 fn member_content_scan(
     cx: &MemberCtx<'_>,
     tally: &mut MemberTally,
+    name: &str,
     data: &dyn ByteSource,
     budget: &mut Budget,
     findings: &mut Vec<Finding>,
@@ -2825,11 +3222,30 @@ fn member_content_scan(
         container: cx.member_container,
         core_type,
         filename: None,
+        name: Some(name),
         core: true,
         carve: true,
         embedded: false,
     };
-    match scan_object(cx.db, data, obj, cx.opts, budget, findings, sink) {
+    // The same bytes in the same place, already scanned clean at this depth or
+    // shallower, cannot give a different answer, and a document that holds
+    // copies of itself would otherwise be scanned once per copy.
+    let seen = clean_memo_key(cx, name, core_type, data);
+    if seen
+        .as_ref()
+        .is_some_and(|k| engine::clean_seen(k, obj.depth))
+    {
+        return None;
+    }
+    let truncated_before = engine::scan_was_truncated();
+    let outcome = scan_object(cx.db, data, obj, cx.opts, budget, findings, sink);
+    if let (DeepOutcome::Clean, Some(k)) = (&outcome, seen) {
+        // A scan that stopped short on the way has not seen all of it.
+        if truncated_before || !engine::scan_was_truncated() {
+            engine::clean_seen_insert(k, obj.depth);
+        }
+    }
+    match outcome {
         DeepOutcome::Clean => None,
         // Nested unscannable/encrypted members are remembered, not propagated as
         // a stop: keep scanning the rest of this container.
@@ -2866,6 +3282,11 @@ struct Obj<'a> {
     /// The input's name, for YARA's filename externals. Nothing inside the
     /// input has one.
     filename: Option<&'a str>,
+    /// The name the object has where it sits (the input's, or a member's), for
+    /// what only a name says, like which text format a plain file is. Unlike
+    /// `filename`, a member has one; what is carved or decoded does not.
+    #[cfg_attr(not(feature = "visible-text"), allow(dead_code))]
+    name: Option<&'a str>,
     /// Whether to match the object's own bytes. Off for an archive carved out
     /// of an object whose own match already covered them.
     core: bool,
@@ -2888,6 +3309,7 @@ impl<'a> Obj<'a> {
             container: None,
             core_type: None,
             filename: opts.filename.as_deref(),
+            name: opts.filename.as_deref(),
             core: true,
             carve: true,
             embedded: false,
@@ -2901,6 +3323,7 @@ impl<'a> Obj<'a> {
             container,
             core_type: None,
             filename: None,
+            name: None,
             core: true,
             carve: true,
             embedded: false,
@@ -2931,7 +3354,7 @@ fn scan_object(
     // anything inside it is a detection. Keyed on the object's bytes, so an
     // entry means the same thing wherever the object is found.
     let carve = obj.carve && obj.depth < budget.limits().max_recursion;
-    let facts = Facts::for_scan(data, db, carve);
+    let facts = Facts::for_scan(data, db, carve, opts);
     if allowlisted(db, &facts) {
         return DeepOutcome::Clean;
     }
@@ -2961,10 +3384,23 @@ fn scan_archive(
     if obj.depth == 0 {
         findings.push(Finding::new("type", ft.as_str()));
     }
-    if let Some(o) = scan_carried(db, data, obj, ft, opts, budget, findings, sink) {
+    let mut carried = DeepOutcome::Clean;
+    if let Some(o) = scan_carried(
+        db,
+        data,
+        obj,
+        ft,
+        opts,
+        budget,
+        findings,
+        sink,
+        &mut carried,
+    ) {
         return o;
     }
-    let members = walk_members(db, data, obj, ft, fmt, opts, budget, findings, sink);
+    let mut members = walk_members(db, data, obj, ft, fmt, opts, budget, findings, sink);
+    // What the encoded files in the object turned up, if the walk found nothing.
+    defer(&mut members, carried);
     // Matched whatever stopped the walk short of a detection: a detection beats
     // a limit.
     if matches!(members, DeepOutcome::Infected { .. }) || !obj.core {
@@ -2996,6 +3432,49 @@ fn scan_archive(
     ) {
         return o;
     }
+    // A file can be two archives. The magic at its start types it as one, and a
+    // reader that goes by another structure opens the other: a ZIP appended to a
+    // PDF, a tar or a gzip is the archive `unzip` finds by the record at the end
+    // of the file, and an ISO or ext image may begin with an archive's magic in
+    // the space it leaves free. What the first walk did not reach is walked as
+    // the second.
+    if obj.carve && obj.depth < budget.limits().max_recursion {
+        let second = Obj {
+            carve: false,
+            embedded: true,
+            ..obj.inner(obj.container)
+        };
+        if fmt != unpack::Format::Zip
+            && let Some(at) = unpack::appended_zip_start(data)
+            && let Ok(at) = usize::try_from(at)
+            && at < data.len()
+        {
+            let sub = &byte_source::Sub::new(data, at, data.len() - at);
+            match scan_found(db, sub, second, opts, budget, findings, sink) {
+                DeepOutcome::Clean => {}
+                o @ (DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) => return o,
+                o => defer(&mut outcome, o),
+            }
+        }
+        if let Some(other) = unpack::also_reads_as(data, fmt) {
+            let o = walk_members(
+                db,
+                data,
+                second,
+                filetype::filetype_of_format(other),
+                other,
+                opts,
+                budget,
+                findings,
+                sink,
+            );
+            match o {
+                DeepOutcome::Clean => {}
+                o @ (DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) => return o,
+                o => defer(&mut outcome, o),
+            }
+        }
+    }
     // An OLE2 file's executables are also carved from its own bytes, each
     // scanned from its header to the end of the file, as ClamAV carves them.
     // Its streams are sectors laid out in any order, so what follows an
@@ -3038,6 +3517,7 @@ fn scan_carried(
     budget: &mut Budget,
     findings: &mut Vec<Finding>,
     sink: &mut Sink,
+    deferred: &mut DeepOutcome,
 ) -> Option<DeepOutcome> {
     // Embedded base64-encoded executables. Scripts/RTF/HTML carriers stash a
     // PE/ELF as a long base64 string (PowerShell reflective loaders, JS/VBS
@@ -3046,14 +3526,13 @@ fn scan_carried(
     // real executable. Bounded by recursion depth and the scan budget;
     // exav-exclusive, so off under `--clamav-compat` and `--no-base64`.
     #[cfg(feature = "base64scan")]
-    if opts.decode_base64
-        && obj.depth < budget.limits().max_recursion
-        && mostly_text(&data.window(0, 8192))
-    {
-        for (b64ix, payload) in unpack::base64_payloads(data, budget.limits().max_buffer_bytes)
-            .into_iter()
-            .enumerate()
-        {
+    if opts.decode_base64 && obj.depth < budget.limits().max_recursion && text_anywhere(data) {
+        let (payloads, capped) =
+            unpack::base64_payloads_capped(data, budget.limits().max_buffer_bytes);
+        if capped {
+            engine::mark_capped(base64_capped);
+        }
+        for (b64ix, payload) in payloads.into_iter().enumerate() {
             // Name the decoded run so a hit inside it is attributable. Without
             // this the detection reports no location and reads as a match on the
             // carrier's own bytes, which is how a correct `Win.Trojan.Mimikatz`
@@ -3071,9 +3550,10 @@ fn scan_carried(
                 carve: false,
                 ..obj.inner(payload_container)
             };
-            let o = scan_found(db, &payload, inner, opts, budget, findings, sink);
-            if matches!(o, DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) {
-                return Some(o);
+            match scan_found(db, &payload, inner, opts, budget, findings, sink) {
+                DeepOutcome::Clean => {}
+                o @ (DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) => return Some(o),
+                o => defer(deferred, o),
             }
         }
     }
@@ -3087,23 +3567,26 @@ fn scan_carried(
     // those constraints exist to separate "this image, in a document" from
     // "this image, on its own".
     #[cfg(feature = "base64scan")]
-    if opts.decode_base64 && obj.depth < budget.limits().max_recursion {
-        if let Some(mc) = markup_cltype(ft, &data.window(0, 4096)) {
-            let _ag = engine::AncestryGuard::enter(Some(mc));
-            for (ix, payload) in
-                unpack::markup_embedded_payloads(data, budget.limits().max_buffer_bytes)
-                    .into_iter()
-                    .enumerate()
-            {
-                let _mpg = MatchPathGuard::enter(&format!("embedded-asset-{}", ix + 1));
-                let inner = Obj {
-                    carve: false,
-                    ..obj.inner(Some(mc))
-                };
-                let o = scan_found(db, &payload, inner, opts, budget, findings, sink);
-                if matches!(o, DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) {
-                    return Some(o);
-                }
+    if opts.decode_base64
+        && obj.depth < budget.limits().max_recursion
+        && let Some(mc) = markup_cltype(ft, &data.window(0, 4096))
+    {
+        let _ag = engine::AncestryGuard::enter(Some(mc));
+        let (payloads, capped) =
+            unpack::markup_embedded_payloads_capped(data, budget.limits().max_buffer_bytes);
+        if capped {
+            engine::mark_capped(base64_capped);
+        }
+        for (ix, payload) in payloads.into_iter().enumerate() {
+            let _mpg = MatchPathGuard::enter(&format!("embedded-asset-{}", ix + 1));
+            let inner = Obj {
+                carve: false,
+                ..obj.inner(Some(mc))
+            };
+            match scan_found(db, &payload, inner, opts, budget, findings, sink) {
+                DeepOutcome::Clean => {}
+                o @ (DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) => return Some(o),
+                o => defer(deferred, o),
             }
         }
     }
@@ -3252,7 +3735,17 @@ fn scan_file(
     ) {
         return o;
     }
-    if let Some(o) = scan_carried(db, data, obj, ft, opts, budget, findings, sink) {
+    if let Some(o) = scan_carried(
+        db,
+        data,
+        obj,
+        ft,
+        opts,
+        budget,
+        findings,
+        sink,
+        &mut deferred,
+    ) {
         return o;
     }
 
@@ -3305,7 +3798,11 @@ fn scan_file(
             let sub = &byte_source::Sub::new(data, off, data.len() - off);
             match scan_found(db, sub, carved, opts, budget, findings, sink) {
                 DeepOutcome::Clean => {}
-                other => return other,
+                // As in the loops below: an image that could not be read whole
+                // is reported if nothing else is found, and must not stop the
+                // scan of the rest of the carrier.
+                o @ (DeepOutcome::Infected { .. } | DeepOutcome::Limits(_)) => return o,
+                o => defer(&mut deferred, o),
             }
         }
 
@@ -3393,27 +3890,27 @@ fn scan_file(
     // Only a PE carries one, and it is parsed from all of the file.
     let signed =
         (opts.alert_broken_authenticode || !db.crb.is_empty()) && data.window(0, 2)[..] == *b"MZ";
-    if signed {
-        if let Some(sig) =
+    if signed
+        && let Some(sig) =
             whole(data, opts, "the Authenticode checks").and_then(|w| authenticode::analyze_pe(&w))
-        {
-            for cert in &sig.certs {
-                if let Some(name) = db.crb.blocked(cert) {
-                    if let Some(o) = sink.hit(name.to_string(), 0, Method::Hash) {
-                        return o;
-                    }
-                }
-            }
-            if opts.alert_broken_authenticode && !sig.digest_matches {
-                if let Some(o) = sink.hit(
-                    "Heuristics.Authenticode.HashMismatch".to_string(),
-                    0,
-                    Method::Heuristic,
-                ) {
-                    return o;
-                }
+    {
+        for cert in &sig.certs {
+            if let Some(name) = db.crb.blocked(cert)
+                && let Some(o) = sink.hit(name.to_string(), 0, Method::Hash)
+            {
+                return o;
             }
         }
+        if opts.alert_broken_authenticode
+            && !sig.digest_matches
+            && let Some(o) = sink.hit(
+                "Heuristics.Authenticode.HashMismatch".to_string(),
+                0,
+                Method::Heuristic,
+            )
+        {
+            return o;
+        }
     }
 
     // Nothing below fires unless at least the ClamAV-default heuristics are on
@@ -3424,14 +3921,13 @@ fn scan_file(
 
     // TLSH fuzzy matching is exav-exclusive (ClamAV has no TLSH), so it stays
     // behind the full `--detect exav-heuristics` flag and off under `--clamav-compat`.
-    if opts.heuristics {
-        if let Some(hit) = profile::timed("fuzzy", data.len() as u64, || {
+    if opts.heuristics
+        && let Some(hit) = profile::timed("fuzzy", data.len() as u64, || {
             db.fuzzy.match_tlsh_source(data)
-        }) {
-            if let Some(o) = sink.hit(hit, 0, Method::Fuzzy) {
-                return o;
-            }
-        }
+        })
+        && let Some(o) = sink.hit(hit, 0, Method::Fuzzy)
+    {
+        return o;
     }
 
     // Parsed from all of the PE, so read only when something below uses it.
@@ -3451,10 +3947,9 @@ fn scan_file(
             if let Some(hit) = db
                 .fuzzy
                 .match_imphash(&info.imphash, info.import_count as u64)
+                && let Some(o) = sink.hit(hit, 0, Method::Fuzzy)
             {
-                if let Some(o) = sink.hit(hit, 0, Method::Fuzzy) {
-                    return o;
-                }
+                return o;
             }
             if opts.heuristics {
                 if depth == 0 {
@@ -3486,23 +3981,24 @@ fn scan_file(
                         format!("{score:.2} ({})", db.model.name()),
                     ));
                 }
-                if score >= db.ml_threshold {
-                    if let Some(o) = sink.hit(
+                if score >= db.ml_threshold
+                    && let Some(o) = sink.hit(
                         format!("Heuristics.Static.Suspect.{:.0}", score * 100.0),
                         0,
                         Method::Static,
-                    ) {
-                        return o;
-                    }
+                    )
+                {
+                    return o;
                 }
-                if info.looks_packed() && info.suspicious_imports.len() >= 2 {
-                    if let Some(o) = sink.hit(
+                if info.looks_packed()
+                    && info.suspicious_imports.len() >= 2
+                    && let Some(o) = sink.hit(
                         "Heuristics.PE.PackedWithInjectionImports".to_string(),
                         0,
                         Method::Heuristic,
-                    ) {
-                        return o;
-                    }
+                    )
+                {
+                    return o;
                 }
             }
         }
@@ -3576,27 +4072,25 @@ fn structured_data_scan(
         Some(d) => dlp::count_ssns(d, dlp::SsnMode::Both),
         None => dlp::count_ssns_in(&mut byte_source::Stepper::new(data), dlp::SsnMode::Both),
     };
-    if let Some(threshold) = opts.structured_cc_count {
-        if count_cards() >= threshold as usize {
-            if let Some(o) = sink.hit(
-                "Heuristics.Structured.CreditCardNumber".to_string(),
-                0,
-                Method::Heuristic,
-            ) {
-                return Some(o);
-            }
-        }
+    if let Some(threshold) = opts.structured_cc_count
+        && count_cards() >= threshold as usize
+        && let Some(o) = sink.hit(
+            "Heuristics.Structured.CreditCardNumber".to_string(),
+            0,
+            Method::Heuristic,
+        )
+    {
+        return Some(o);
     }
-    if let Some(threshold) = opts.structured_ssn_count {
-        if count_ssns() >= threshold as usize {
-            if let Some(o) = sink.hit(
-                "Heuristics.Structured.SSN".to_string(),
-                0,
-                Method::Heuristic,
-            ) {
-                return Some(o);
-            }
-        }
+    if let Some(threshold) = opts.structured_ssn_count
+        && count_ssns() >= threshold as usize
+        && let Some(o) = sink.hit(
+            "Heuristics.Structured.SSN".to_string(),
+            0,
+            Method::Heuristic,
+        )
+    {
+        return Some(o);
     }
     None
 }
@@ -3715,6 +4209,33 @@ fn mostly_text(data: &[u8]) -> bool {
     printable * 100 >= sample.len() * 90
 }
 
+/// Whether any stretch of `data` is text, going by up to four 8 KiB samples (its
+/// start, its end and the thirds between, stopping at the first that has any)
+/// and by the kilobytes of a sample one by one. A script behind a binary header
+/// or a long comment of high bytes is text where it matters. Each sample over a
+/// cache is a block of it read, so a binary object pays at most three more than
+/// the first.
+#[cfg(feature = "base64scan")]
+fn text_anywhere(data: &dyn ByteSource) -> bool {
+    const SAMPLE: usize = 8192;
+    let texty = |at: usize| data.window(at, SAMPLE).chunks(1024).any(mostly_text);
+    let len = data.len();
+    if len <= SAMPLE {
+        return texty(0);
+    }
+    let last = len - SAMPLE;
+    [0, last, last / 3, last / 3 * 2].into_iter().any(texty)
+}
+
+/// Why an object that has more base64-encoded files than are decoded in one
+/// object is not fully scanned.
+#[cfg(feature = "base64scan")]
+fn base64_capped() -> String {
+    "more base64-encoded executables, archives or images than are decoded in one object: \
+     the rest were not scanned"
+        .to_string()
+}
+
 /// The normalised views of `data` a textual file is matched against, in order.
 /// The caller makes each with [`make_view`] and drops it before the next.
 ///
@@ -3735,7 +4256,7 @@ fn normalizations(ft: FileType, data: &dyn ByteSource) -> Vec<(ViewKind, FileTyp
             return vec![
                 (ViewKind::Html, FileType::HtmlView),
                 (ViewKind::Text, FileType::TextView),
-            ]
+            ];
         }
         FileType::Html => (ViewKind::Html, FileType::HtmlView),
         _ => (ViewKind::Text, FileType::TextView),
@@ -3748,6 +4269,58 @@ fn normalizations(ft: FileType, data: &dyn ByteSource) -> Vec<(ViewKind, FileTyp
     v
 }
 
+/// The text a reader sees in the object `data` called `name` (Markdown, HTML,
+/// an Office or OpenDocument XML part, PDF, a drawing): its words, and where
+/// each link leads (`exav_render::text`).
+///
+/// The text as a text view is matched, and each link whose label is not its
+/// target as `(label, target)`.
+///
+/// `None` when the object has none, or when it cannot be made, and the scan is
+/// then marked incomplete: the object is past `deep_analysis_max`, so it is
+/// neither held in memory nor read whole. A text cut at four times the object and a little,
+/// which no real document comes to, and a PDF past the extraction limits, mark
+/// the scan incomplete too; what was made is still scanned. So does an
+/// office document (with `visible-text-office`) whose text cannot be taken
+/// out: encrypted, past a limit, damaged.
+#[cfg(feature = "visible-text")]
+fn visible_text_view(name: &str, data: &dyn ByteSource, opts: &ScanOptions) -> Option<VisibleView> {
+    if !exav_render::text::wants(name, &data.window(0, 1024)) {
+        return None;
+    }
+    let bytes = whole(data, opts, "the reading of its visible text")?;
+    let cap = bytes
+        .len()
+        .saturating_mul(4)
+        .saturating_add(64 << 10)
+        .min(usize::try_from(opts.deep_analysis_max).unwrap_or(usize::MAX));
+    let visible = exav_render::text::visible_text(name, &bytes, cap, &opts.limits)?;
+    if visible.truncated {
+        engine::mark_scan_truncated();
+    }
+    // A document of a kind that has text, whose text could not be taken out
+    // (encrypted, past a limit, damaged): its bytes are still scanned, and the
+    // scan is not complete.
+    if visible.unreadable.is_some() {
+        engine::mark_scan_truncated();
+        return None;
+    }
+    // As any text view is, so that `Target:7` signatures, written against the
+    // lowercased, whitespace-collapsed form, apply.
+    Some(VisibleView {
+        text: normalize::text(visible.text.as_bytes()),
+        links: visible.links,
+    })
+}
+
+/// A document's visible text as a text view, and its links.
+#[cfg(feature = "visible-text")]
+struct VisibleView {
+    text: Vec<u8>,
+    /// Each link whose label is not its target, as `(label, target)`.
+    links: Vec<(String, String)>,
+}
+
 /// A normalised view of an object: [`normalize`]'s three, and [`jsnorm`]'s.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum ViewKind {
@@ -3819,7 +4392,7 @@ fn make_view(kind: ViewKind, data: &dyn ByteSource, opts: &ScanOptions) -> Optio
         ViewKind::Text => normalize::text_into(&mut src, &mut out),
         _ => normalize::javascript_into(&mut src, &mut out),
     }
-    match out.finish() {
+    match out.finish(opts.cache_sizes()) {
         Ok(spilled) => Some(View::Spilled(spilled)),
         Err(e) => {
             not_made(&e);
@@ -3877,6 +4450,7 @@ fn write_limits(budget: &Budget) -> bytecode::exec::WriteLimits {
     bytecode::exec::WriteLimits {
         file: budget.limits().max_buffer_bytes,
         total: budget.remaining_scan(),
+        memory: budget.limits().max_bytecode_memory_bytes,
     }
 }
 
@@ -3938,8 +4512,13 @@ fn core_matches(
     };
     // A PE's structure (layout, icons, section table) is parsed from all of it.
     let image = pe_image(ft, data, opts);
-    // PE layout lets the engine resolve EP/section-relative offsets.
-    let layout = image.as_deref().and_then(pe::layout);
+    // PE layout lets the engine resolve EP/section-relative offsets, and so
+    // does an ELF's or a Mach-O's, read from its headers.
+    let layout = image.as_deref().and_then(pe::layout).or_else(|| match ft {
+        FileType::Elf => pe::elf_layout(data),
+        FileType::MachO => pe::macho_layout(data),
+        _ => None,
+    });
     // PE-icon perceptual metrics for `IconGroup1/2`-constrained logical
     // signatures: computed only for a PE when `.idb` entries are loaded. They
     // gate such sigs (the structural condition must also hold); see [`icon`].
@@ -4001,6 +4580,31 @@ fn core_matches(
             engine_pass(view.source(), as_type, None, None, None)?;
         }
     }
+    // The words of a document, and where each link leads: what a reader sees,
+    // which the bytes above do not give (a label naming one site over a target
+    // on another, markup, an entity, a compressed stream or an escape in the
+    // middle of a signature's text).
+    #[cfg(feature = "visible-text")]
+    if !opts.clamav_compat
+        && !db.engine.is_empty()
+        && let Some(view) = profile::timed("visible-text", data.len() as u64, || {
+            visible_text_view(obj.name.unwrap_or(""), data, opts)
+        })
+    {
+        // Reported where the document is, as the other views are.
+        engine_pass(&view.text, FileType::TextView, None, None, None)?;
+        // A link that says one site and goes to another, in a document
+        // that is not HTML: judged as an anchor of an HTML one is.
+        if opts.alert_phishing {
+            let (found, complete) = phishing::scan_links(&view.links, &db.phishing);
+            if !complete {
+                engine::mark_scan_truncated();
+            }
+            if let Some(p) = found {
+                hit(p.signature(), false, 0, Method::Heuristic)?;
+            }
+        }
+    }
     // Bytecode programs whose trigger/hook fires (gated execution). Their
     // names are reported verbatim, never `.UNOFFICIAL`-suffixed.
     let mut unpacked = Vec::new();
@@ -4014,28 +4618,29 @@ fn core_matches(
         }
         unpacked = extracted;
     }
-    if !db.sections.is_empty() {
-        if let Some(image) = &image {
-            let found: Vec<_> = profile::timed("sections", data.len() as u64, || {
-                pe::section_slices(image)
-                    .into_iter()
-                    .filter_map(|(size, slice)| {
-                        db.sections
-                            .lookup(size, &hashes::section_digests(&db.sections, size, slice))
-                    })
-                    .collect()
-            });
-            for (name, unofficial) in found {
-                hit(&name, unofficial, 0, Method::Hash)?;
-            }
+    if !db.sections.is_empty()
+        && let Some(image) = &image
+    {
+        let found: Vec<_> = profile::timed("sections", data.len() as u64, || {
+            pe::section_slices(image)
+                .into_iter()
+                .filter_map(|(size, slice)| {
+                    db.sections
+                        .lookup(size, &hashes::section_digests(&db.sections, size, slice))
+                })
+                .collect()
+        });
+        for (name, unofficial) in found {
+            hit(&name, unofficial, 0, Method::Hash)?;
         }
     }
-    if !db.hashes.is_empty() && hash_matchable(data.len() as u64) {
-        if let Some((name, unofficial)) = profile::timed("hashes", data.len() as u64, || {
+    if !db.hashes.is_empty()
+        && hash_matchable(data.len() as u64)
+        && let Some((name, unofficial)) = profile::timed("hashes", data.len() as u64, || {
             db.hashes.lookup(facts.digests(db), data.len() as u64)
-        }) {
-            hit(&name, unofficial, 0, Method::Hash)?;
-        }
+        })
+    {
+        hit(&name, unofficial, 0, Method::Hash)?;
     }
     if !db.yara.is_empty() {
         let unofficial = db.yara.unofficial();
@@ -4078,8 +4683,8 @@ mod tests {
     /// How many times over a scan by `db` reads `data` from a source it does
     /// not hold in memory.
     fn passes_over(db: &Scanner, data: &[u8]) -> f64 {
-        use std::sync::atomic::{AtomicU64, Ordering};
         use std::sync::Arc;
+        use std::sync::atomic::{AtomicU64, Ordering};
         let read = Arc::new(AtomicU64::new(0));
         let reader = Counting(Cursor::new(data.to_vec()), read.clone());
         let opts = ScanOptions {
@@ -4160,6 +4765,106 @@ mod tests {
         }
     }
 
+    /// The size of the cache of an object read in place and of its blocks are
+    /// the scan's: a cache past the object serves the later reads of it from
+    /// memory, and a smaller block is more reads of the source.
+    #[test]
+    fn the_object_cache_follows_the_options() {
+        use std::sync::atomic::{AtomicU64, Ordering};
+        struct Tally(Cursor<Vec<u8>>, std::sync::Arc<(AtomicU64, AtomicU64)>);
+        impl std::io::Read for Tally {
+            fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+                let n = self.0.read(buf)?;
+                self.1.0.fetch_add(n as u64, Ordering::Relaxed);
+                self.1.1.fetch_add(1, Ordering::Relaxed);
+                Ok(n)
+            }
+        }
+        impl std::io::Seek for Tally {
+            fn seek(&mut self, p: std::io::SeekFrom) -> std::io::Result<u64> {
+                self.0.seek(p)
+            }
+        }
+        // Noise with no magic, a hash signature of its size: detection, the
+        // digests and the sweep each read it through.
+        let size = 12 << 20;
+        let mut state = 0x9e37_79b9_7f4a_7c15u64;
+        let mut noise: Vec<u8> = (0..size)
+            .map(|_| {
+                state ^= state << 13;
+                state ^= state >> 7;
+                state ^= state << 17;
+                (state >> 24) as u8
+            })
+            .collect();
+        for w in 0..noise.len() - 1 {
+            if matches!(
+                &noise[w..w + 2],
+                b"MZ" | b"PK" | b"7z" | b"BZ" | b"\x1f\x8b" | b"Ra" | b"MS"
+            ) {
+                noise[w] ^= 0x80;
+            }
+        }
+        let mut l = loader::Builder::new();
+        l.add_named_bytes("a.ndb", b"Sig.Pat:0:*:0badc0de0badf00d0bad\n", true);
+        let hdb = format!("0123456789abcdef0123456789abcdef:{size}:Sig.Hash\n");
+        l.add_named_bytes("c.hdb", hdb.as_bytes(), true);
+        let db = l.build().unwrap();
+        // (bytes read from the source, reads of it) for a scan.
+        let reads = |cache: u64, block: u64| {
+            let tally = std::sync::Arc::new((AtomicU64::new(0), AtomicU64::new(0)));
+            let opts = ScanOptions {
+                deep_analysis_max: 1 << 20,
+                object_cache_bytes: cache,
+                object_cache_block_bytes: block,
+                ..ScanOptions::default()
+            };
+            let reader = Tally(Cursor::new(noise.clone()), tally.clone());
+            scan_seekable(&db, reader, size as u64, &opts).unwrap();
+            (
+                tally.0.load(Ordering::Relaxed),
+                tally.1.load(Ordering::Relaxed),
+            )
+        };
+        let (small, small_reads) = reads(8 << 20, 64 << 10);
+        let (big, _) = reads(16 << 20, 64 << 10);
+        assert!(small > size as u64 * 3 / 2, "{small}");
+        assert!(big <= size as u64 + (1 << 20), "{big}");
+        let (_, fine_reads) = reads(8 << 20, 4 << 10);
+        assert!(
+            fine_reads > 8 * small_reads,
+            "{fine_reads} vs {small_reads}"
+        );
+    }
+
+    /// A source that reads on without end and measures itself as empty (a
+    /// character device such as `/dev/zero`) is an error, not a clean scan of
+    /// nothing.
+    #[test]
+    fn a_source_with_no_length_is_an_error_not_a_clean_scan() {
+        struct Endless;
+        impl std::io::Read for Endless {
+            fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+                buf.fill(0);
+                Ok(buf.len())
+            }
+        }
+        impl std::io::Seek for Endless {
+            fn seek(&mut self, _: std::io::SeekFrom) -> std::io::Result<u64> {
+                Ok(0)
+            }
+        }
+        let opts = ScanOptions {
+            deep_analysis_max: 4096,
+            ..ScanOptions::default()
+        };
+        let e = scan_seekable(&Scanner::builtin(), Endless, 0, &opts).unwrap_err();
+        assert!(e.to_string().contains("not a file with a length"), "{e}");
+        // A file that grew while it was read is still scanned as what it is.
+        let big = std::io::Cursor::new(vec![b'a'; 10_000]);
+        assert!(scan_seekable(&Scanner::builtin(), big, 100, &opts).is_ok());
+    }
+
     /// The one read of a streamed object finds what each step's own read of
     /// it would, whichever step asks first.
     #[test]
@@ -4206,7 +4911,7 @@ mod tests {
             let cache =
                 byte_source::BlockCache::with_sizes(Cursor::new(data.clone()), 4093, 16 * 4093)
                     .unwrap();
-            let facts = Facts::for_scan(&cache, &db, true);
+            let facts = Facts::for_scan(&cache, &db, true, &ScanOptions::default());
             let mut embedded = None;
             for step in (0..3).map(|k| (first + k) % 3) {
                 match step {
@@ -4256,7 +4961,7 @@ mod tests {
             let read = std::sync::Arc::new(AtomicU64::new(0));
             let reader = Counting(Cursor::new(vec![b'.'; len]), read.clone());
             let cache = byte_source::BlockCache::with_sizes(reader, 4093, 16 * 4093).unwrap();
-            let facts = Facts::for_scan(&cache, &db, false);
+            let facts = Facts::for_scan(&cache, &db, false, &ScanOptions::default());
             let before = read.load(Ordering::Relaxed);
             assert!(!allowlisted(&db, &facts));
             assert_eq!(
@@ -5123,6 +5828,111 @@ mod tests {
         }
     }
 
+    /// 128 KiB of text that differs with `seed`.
+    #[cfg(feature = "all-formats")]
+    fn memo_body(seed: usize) -> Vec<u8> {
+        let text: String = (0..4096)
+            .map(|i| format!("line {seed} {i} of a member with nothing in it\n"))
+            .collect();
+        text.as_bytes()[..128 * 1024].to_vec()
+    }
+
+    /// A stored zip of `n` members of `memo_body`, the same in each when `same`.
+    #[cfg(feature = "all-formats")]
+    fn memo_zip(n: usize, same: bool) -> Vec<u8> {
+        use std::io::Write;
+        let stored = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        for k in 0..n {
+            z.start_file(format!("member{k}.txt"), stored).unwrap();
+            z.write_all(&memo_body(if same { 0 } else { k })).unwrap();
+        }
+        z.finish().unwrap().into_inner()
+    }
+
+    fn clean_skips_of(data: &[u8]) -> (Verdict, u64) {
+        engine::CLEAN_SKIPS.with(|c| c.set(0));
+        let v = analyze(&Scanner::builtin(), data, &ScanOptions::default()).verdict;
+        (v, engine::CLEAN_SKIPS.with(|c| c.get()))
+    }
+
+    /// Bytes already scanned clean in the same place are not scanned again:
+    /// the first of 40 copies is scanned and the other 39 are not.
+    #[test]
+    #[cfg(feature = "all-formats")]
+    fn copies_of_a_clean_member_are_scanned_once() {
+        assert_eq!(clean_skips_of(&memo_zip(40, true)), (Verdict::Clean, 39));
+    }
+
+    /// The control: members that differ are each scanned.
+    #[test]
+    #[cfg(feature = "all-formats")]
+    fn members_that_differ_are_each_scanned() {
+        assert_eq!(clean_skips_of(&memo_zip(40, false)), (Verdict::Clean, 0));
+    }
+
+    /// Members under the size worth remembering are scanned every time.
+    #[test]
+    #[cfg(feature = "all-formats")]
+    fn small_copies_are_each_scanned() {
+        use std::io::Write;
+        let stored = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        for k in 0..10 {
+            z.start_file(format!("m{k}.txt"), stored).unwrap();
+            z.write_all(&memo_body(0)[..1000]).unwrap();
+        }
+        let z = z.finish().unwrap().into_inner();
+        assert_eq!(clean_skips_of(&z), (Verdict::Clean, 0));
+    }
+
+    /// A copy that is not clean is found wherever it is, after clean ones with
+    /// the same start.
+    #[test]
+    #[cfg(feature = "all-formats")]
+    fn an_infected_member_after_clean_copies_is_found() {
+        use std::io::Write;
+        let stored = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        // Deflated, so the signature is in the member only, not in the zip's bytes.
+        let deflated = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Deflated);
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        for k in 0..3 {
+            z.start_file(format!("clean{k}.bin"), stored).unwrap();
+            z.write_all(&memo_body(0)).unwrap();
+        }
+        let mut dirty = memo_body(0);
+        dirty.extend_from_slice(&[eicar(), b"\n"].concat().repeat(64));
+        z.start_file("dirty.bin", deflated).unwrap();
+        z.write_all(&dirty).unwrap();
+        let z = z.finish().unwrap().into_inner();
+        let (v, skips) = clean_skips_of(&z);
+        assert_eq!(skips, 2);
+        assert!(matches!(v, Verdict::Infected { .. }), "{v:?}");
+    }
+
+    /// The memo remembers the shallowest depth a clean scan was at: a copy
+    /// deeper than that is covered, one shallower is not.
+    #[test]
+    fn a_clean_copy_covers_only_the_same_depth_or_deeper() {
+        engine::reset_scan_truncated();
+        let key = [7u8; 32];
+        assert!(!engine::clean_seen(&key, 3));
+        engine::clean_seen_insert(key, 3);
+        assert!(!engine::clean_seen(&key, 2));
+        assert!(engine::clean_seen(&key, 3));
+        assert!(engine::clean_seen(&key, 9));
+        engine::clean_seen_insert(key, 1);
+        assert!(engine::clean_seen(&key, 1));
+        assert!(!engine::clean_seen(&key, 0));
+        // A new scan starts with nothing remembered.
+        engine::reset_scan_truncated();
+        assert!(!engine::clean_seen(&key, 9));
+    }
+
     #[test]
     fn detects_eicar_pattern() {
         let db = Scanner::builtin();
@@ -5472,8 +6282,8 @@ mod tests {
 
     #[test]
     fn finds_eicar_inside_gzip() {
-        use flate2::write::GzEncoder;
         use flate2::Compression;
+        use flate2::write::GzEncoder;
         use std::io::Write;
         let mut e = GzEncoder::new(Vec::new(), Compression::default());
         e.write_all(eicar()).unwrap();
@@ -5611,8 +6421,8 @@ mod tests {
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn streamed_gzip_over_cap_finds_eicar() {
-        use flate2::write::GzEncoder;
         use flate2::Compression;
+        use flate2::write::GzEncoder;
         use std::io::Write;
         let mut e = GzEncoder::new(Vec::new(), Compression::default());
         e.write_all(eicar()).unwrap();
@@ -5700,8 +6510,8 @@ mod tests {
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn nested_gzip_over_entry_cap_is_streamed_and_found() {
-        use flate2::write::GzEncoder;
         use flate2::Compression;
+        use flate2::write::GzEncoder;
         use std::io::Write;
         // gzip whose decompressed content (padding + EICAR at the end) far exceeds
         // the tiny per-member buffer cap set below.
@@ -5874,8 +6684,8 @@ mod tests {
     fn http_range_scan_fetches_only_what_it_needs() {
         use std::io::{BufRead, BufReader, Write};
         use std::net::TcpListener;
-        use std::sync::atomic::{AtomicU64, Ordering};
         use std::sync::Arc;
+        use std::sync::atomic::{AtomicU64, Ordering};
         use std::thread;
 
         let big: Vec<u8> = (0..1_000_000u32).map(|i| (i as u8) ^ 0x5a).collect();
@@ -5932,7 +6742,10 @@ mod tests {
                 served_t.fetch_add(slice.len() as u64, Ordering::SeqCst);
                 let hdr = format!(
                     "HTTP/1.1 206 Partial Content\r\nContent-Range: bytes {}-{}/{}\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
-                    a, b, blob_t.len(), slice.len()
+                    a,
+                    b,
+                    blob_t.len(),
+                    slice.len()
                 );
                 let _ = stream.write_all(hdr.as_bytes());
                 let _ = stream.write_all(slice);
@@ -5995,10 +6808,9 @@ mod parity {
                     unpack::read_fixture(
                         path.to_string_lossy().trim_end_matches(".xor"),
                     )
+                    && data.len() < 8 << 20
                 {
-                    if data.len() < 8 << 20 {
-                        out.push((path.display().to_string(), data));
-                    }
+                    out.push((path.display().to_string(), data));
                 }
             }
         }
diff --git a/crates/exav-core/src/loader.rs b/crates/exav-core/src/loader.rs
index de691bcf..e949f8a7 100644
--- a/crates/exav-core/src/loader.rs
+++ b/crates/exav-core/src/loader.rs
@@ -89,11 +89,11 @@ fn read_capped(path: &Path) -> Result<Vec<u8>, LoadError> {
     }
     Ok(buf)
 }
+use crate::Scanner;
 use crate::fuzzy::FuzzyDb;
 use crate::hashes::{HashDb, SectionHashDb};
 use crate::ml::HeuristicModel;
 use crate::patterns::eicar;
-use crate::Scanner;
 
 /// Accumulates parsed signatures from multiple files before building.
 #[derive(Default)]
@@ -799,7 +799,7 @@ Sig.C;td;0;cleartext-pw\n"; // duplicate password de-duped
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn report_time_suffix_from_one_db() {
-        use crate::{analyze, ScanOptions, Verdict};
+        use crate::{ScanOptions, Verdict, analyze};
         let dir = crate::tmpfile::TempDir::new().unwrap();
         std::fs::write(dir.path().join("a.ndb"), "Demo.Loose:0:*:6d616c77617265\n").unwrap();
         let db = load(dir.path()).unwrap();
@@ -828,7 +828,7 @@ Sig.C;td;0;cleartext-pw\n"; // duplicate password de-duped
     /// mixed source.
     #[test]
     fn official_cvd_never_suffixed_mixed_source() {
-        use crate::{analyze, ScanOptions, Verdict};
+        use crate::{ScanOptions, Verdict, analyze};
         let mut builder = Builder::new();
         // Official member (as if from a `.cvd`): 6f6666696369616c = "official".
         builder.add_named_text("main.ndb", "Demo.Official:0:*:6f6666696369616c\n", true);
@@ -866,7 +866,7 @@ Sig.C;td;0;cleartext-pw\n"; // duplicate password de-duped
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn ign_suppresses_suffixed_name_in_compat() {
-        use crate::{analyze, ScanOptions, Verdict};
+        use crate::{ScanOptions, Verdict, analyze};
         let dir = crate::tmpfile::TempDir::new().unwrap();
         std::fs::write(dir.path().join("a.ndb"), "Demo.Loose:0:*:6d616c77617265\n").unwrap();
         // A real-world compat `.ign2` names the suffixed detection.
@@ -896,7 +896,7 @@ Sig.C;td;0;cleartext-pw\n"; // duplicate password de-duped
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn a_db_signature_matches_in_memory() {
-        use crate::{analyze, ScanOptions, Verdict};
+        use crate::{ScanOptions, Verdict, analyze};
         let dir = crate::tmpfile::TempDir::new().unwrap();
         std::fs::write(dir.path().join("x.db"), "Test.Db=6576696c31706179\n").unwrap();
         let db = load(dir.path()).unwrap();
@@ -913,7 +913,7 @@ Sig.C;td;0;cleartext-pw\n"; // duplicate password de-duped
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn pua_literals_stay_off_by_default() {
-        use crate::{analyze, ScanOptions, Verdict};
+        use crate::{ScanOptions, Verdict, analyze};
         let scan = |db: &Scanner, data: &[u8]| analyze(db, data, &ScanOptions::default());
         let dir = crate::tmpfile::TempDir::new().unwrap();
         std::fs::write(
@@ -943,7 +943,7 @@ Sig.C;td;0;cleartext-pw\n"; // duplicate password de-duped
         ignore = "host filesystem/tempdir unavailable under WASI"
     )]
     fn pua_signatures_stay_off_on_every_scan_path() {
-        use crate::{analyze, scan_path, scan_seekable, ScanOptions, Verdict};
+        use crate::{ScanOptions, Verdict, analyze, scan_path, scan_seekable};
         use std::io::Write;
         let dir = crate::tmpfile::TempDir::new().unwrap();
         std::fs::write(
diff --git a/crates/exav-core/src/normalize.rs b/crates/exav-core/src/normalize.rs
index fbc053b1..0a3fd2ab 100644
--- a/crates/exav-core/src/normalize.rs
+++ b/crates/exav-core/src/normalize.rs
@@ -155,11 +155,10 @@ pub(crate) fn javascript_into<B: Bytes, O: Out>(data: &mut B, out: &mut O) {
         let c = lower(b);
         if pending_ws {
             pending_ws = false;
-            if let Some(last) = out.last() {
-                if is_word(last) && is_word(c) {
+            if let Some(last) = out.last()
+                && is_word(last) && is_word(c) {
                     out.push(b' ');
                 }
-            }
         }
         out.push(c);
     });
@@ -453,11 +452,10 @@ mod tests {
                 let c = lower(b);
                 if pending_ws {
                     pending_ws = false;
-                    if let Some(&last) = out.last() {
-                        if is_word(last) && is_word(c) {
+                    if let Some(&last) = out.last()
+                        && is_word(last) && is_word(c) {
                             out.push(b' ');
                         }
-                    }
                 }
                 out.push(c);
             }
diff --git a/crates/exav-core/src/pe.rs b/crates/exav-core/src/pe.rs
index a8723f2c..bf21d0a9 100644
--- a/crates/exav-core/src/pe.rs
+++ b/crates/exav-core/src/pe.rs
@@ -538,6 +538,162 @@ pub fn layout(data: &[u8]) -> Option<PeLayout> {
     })
 }
 
+/// Most sections an ELF or Mach-O layout lists: a section table is a `u16`
+/// long in an ELF, and nothing a real file has comes near it.
+const MAX_EXEC_SECTIONS: u64 = 1 << 16;
+
+/// [`PeLayout`] of an ELF file, for the `EP`, `Sn`, `SL` and `SEn` offsets of a
+/// `Target:6` signature, read from the headers alone (the object is not held).
+///
+/// As clamscan resolves them (measured, with one signature per offset and one
+/// wrong by three bytes as the control): `EP` is the entry point's file
+/// offset, found by the loadable segment whose memory image holds it (the
+/// part past the file's bytes, the `.bss`, included), and `Sn` is the file
+/// offset of section header `n`, counted from the null section at 0.
+/// A section with no bytes in the file (`SHT_NOBITS`) is a point.
+pub fn elf_layout(src: &dyn ByteSource) -> Option<PeLayout> {
+    let mut f = Fields::new(src);
+    let ident = f.get(0, 16)?;
+    if &ident[..4] != b"\x7fELF" {
+        return None;
+    }
+    let wide = match ident[4] {
+        1 => false,
+        2 => true,
+        _ => return None,
+    };
+    // Anything but little-endian is read as big-endian, as `elf_broken` does.
+    f.be = ident[5] != 1;
+    let (header, ph_min, sh_min) = if wide { (64, 56, 64) } else { (52, 32, 40) };
+    f.get(0, header)?;
+    let w = if wide { 8 } else { 4 };
+    let entry_va = f.word(24, wide)?;
+    let (phoff, shoff) = (f.word(24 + w, wide)?, f.word(24 + 2 * w, wide)?);
+    let fields = 28 + 3 * w;
+    let [ph_entsize, phnum, sh_entsize, shnum] =
+        [2, 4, 6, 8].map(|i| f.u16(fields + i).map(u64::from));
+    let (ph_entsize, phnum, sh_entsize, shnum) =
+        (ph_entsize?, phnum?, sh_entsize?, shnum?);
+
+    let mut entry = None;
+    if ph_entsize >= ph_min {
+        let (offset_at, vaddr_at, memsz_at) = if wide { (8, 16, 40) } else { (4, 8, 20) };
+        for i in 0..phnum {
+            let p = phoff.checked_add(i * ph_entsize)?;
+            let (Some(kind), Some(offset), Some(vaddr), Some(memsz)) = (
+                f.u32(p),
+                p.checked_add(offset_at).and_then(|a| f.word(a, wide)),
+                p.checked_add(vaddr_at).and_then(|a| f.word(a, wide)),
+                p.checked_add(memsz_at).and_then(|a| f.word(a, wide)),
+            ) else {
+                break;
+            };
+            // PT_LOAD
+            if kind == 1 && entry_va >= vaddr && entry_va - vaddr < memsz {
+                entry = offset.checked_add(entry_va - vaddr);
+                break;
+            }
+        }
+    }
+
+    let mut section_rawptrs = Vec::new();
+    let mut section_rawsizes = Vec::new();
+    if sh_entsize >= sh_min {
+        let (offset_at, size_at) = if wide { (24, 32) } else { (16, 20) };
+        for i in 0..shnum.min(MAX_EXEC_SECTIONS) {
+            let Some(s) = shoff.checked_add(i * sh_entsize) else {
+                break;
+            };
+            let (Some(kind), Some(offset), Some(size)) = (
+                s.checked_add(4).and_then(|a| f.u32(a)),
+                s.checked_add(offset_at).and_then(|a| f.word(a, wide)),
+                s.checked_add(size_at).and_then(|a| f.word(a, wide)),
+            ) else {
+                break;
+            };
+            section_rawptrs.push(offset);
+            // SHT_NOBITS
+            section_rawsizes.push(if kind == 8 { 0 } else { size });
+        }
+    }
+    Some(PeLayout {
+        entry,
+        section_rawptrs,
+        section_rawsizes,
+        version_info: Vec::new(),
+    })
+}
+
+/// [`PeLayout`] of a thin Mach-O file, for the `Sn`, `SL` and `SEn` offsets
+/// of a `Target:9` signature. `n` counts the sections of every segment in the
+/// order of the load commands, and an offset is the section's own.
+///
+/// `EP` is left unresolved: clamscan 1.4.3 does not resolve it on a Mach-O of
+/// either width, from `LC_MAIN` or from `LC_UNIXTHREAD` (a signature
+/// anchored there never fired in any of eight variants, where the section
+/// offsets did, each with a control), so a signature using it matches
+/// nowhere, as it does there.
+pub fn macho_layout(src: &dyn ByteSource) -> Option<PeLayout> {
+    let mut f = Fields::new(src);
+    let (wide, be) = match f.get(0, 4)? {
+        [0xCE, 0xFA, 0xED, 0xFE] => (false, false),
+        [0xCF, 0xFA, 0xED, 0xFE] => (true, false),
+        [0xFE, 0xED, 0xFA, 0xCE] => (false, true),
+        [0xFE, 0xED, 0xFA, 0xCF] => (true, true),
+        _ => return None,
+    };
+    f.be = be;
+    let header: u64 = if wide { 32 } else { 28 };
+    let (ncmds, sizeofcmds) = (u64::from(f.u32(16)?), u64::from(f.u32(20)?));
+    let end = header.checked_add(sizeofcmds)?;
+    if end > src.len() as u64 {
+        return None;
+    }
+    // LC_SEGMENT and LC_SEGMENT_64, and what each one's sections are like.
+    let (segment, nsects_at, first_section, section_len, size_at, offset_at) = if wide {
+        (0x19u32, 64u64, 72u64, 80u64, 40u64, 48u64)
+    } else {
+        (0x1, 48, 56, 68, 36, 40)
+    };
+    let mut section_rawptrs = Vec::new();
+    let mut section_rawsizes = Vec::new();
+    let mut at = header;
+    'commands: for _ in 0..ncmds.min(MAX_EXEC_SECTIONS) {
+        let (Some(cmd), Some(size)) = (f.u32(at), f.u32(at + 4).map(u64::from)) else {
+            break;
+        };
+        if size < 8 || at.checked_add(size)? > end {
+            break;
+        }
+        if cmd == segment {
+            let Some(nsects) = f.u32(at + nsects_at).map(u64::from) else {
+                break;
+            };
+            for i in 0..nsects {
+                let s = at + first_section + i * section_len;
+                if s + section_len > at + size || section_rawptrs.len() as u64 >= MAX_EXEC_SECTIONS {
+                    break 'commands;
+                }
+                let (Some(offset), Some(len)) =
+                    (f.u32(s + offset_at).map(u64::from), f.word(s + size_at, wide))
+                else {
+                    break 'commands;
+                };
+                section_rawptrs.push(offset);
+                // A zero-fill section has no bytes in the file.
+                section_rawsizes.push(if offset == 0 { 0 } else { len });
+            }
+        }
+        at += size;
+    }
+    Some(PeLayout {
+        entry: None,
+        section_rawptrs,
+        section_rawsizes,
+        version_info: Vec::new(),
+    })
+}
+
 /// One PE section in the shape the bytecode PE APIs expect
 /// (`cli_exe_section`).
 ///
@@ -754,7 +910,7 @@ const CARVE_MAGICS: [(&[u8], Magic); 14] = [
 /// is validated as it is met. The search stops once every kind is at its cap
 /// and one more candidate has been seen past a cap.
 pub(crate) fn embedded_in(data: &dyn ByteSource) -> Embedded {
-    let mut carving = Carving::new();
+    let mut carving = Carving::new(usize::MAX);
     let len = data.len();
     let mut at = 0;
     while at < len && !carving.full() {
@@ -770,6 +926,7 @@ pub(crate) fn embedded_in(data: &dyn ByteSource) -> Embedded {
         }
         at += owned;
     }
+    carving.settle(data);
     carving.found
 }
 
@@ -778,9 +935,41 @@ pub(crate) fn embedded_in(data: &dyn ByteSource) -> Embedded {
 pub(crate) struct Carving {
     finders: Vec<memchr::memmem::Finder<'static>>,
     hits: Vec<(usize, Magic)>,
+    /// Where the last ZIP local header seen says the next entry begins, when
+    /// it can say (see [`zip_next_header`]).
+    zip_next: Option<usize>,
+    /// `(header, MZ)` of candidates whose `PE\0\0` header lies beyond the
+    /// window they were found in, in an object not held in memory. Checked
+    /// by [`Carving::settle`] in offset order, so a header costs one read of
+    /// its block however many candidates point near it.
+    far: Vec<(usize, usize)>,
+    /// How many of those wait before they are settled.
+    far_max: usize,
     pub(crate) found: Embedded,
 }
 
+/// Where the ZIP local header at `off` says the next entry begins: after its
+/// name, extra field and compressed data. `None` when it cannot say: the entry
+/// is encrypted, its sizes follow the data (a data descriptor), or its size is
+/// ZIP64's.
+fn zip_next_header(data: &dyn ByteSource, off: usize) -> Option<usize> {
+    let h = data.window(off, 30);
+    if h.len() != 30 || h[..4] != *b"PK\x03\x04" {
+        return None;
+    }
+    let flags = u16::from_le_bytes([h[6], h[7]]);
+    if flags & 0b1001 != 0 {
+        return None;
+    }
+    let csize = u32::from_le_bytes([h[18], h[19], h[20], h[21]]);
+    if csize == u32::MAX {
+        return None;
+    }
+    let name = usize::from(u16::from_le_bytes([h[26], h[27]]));
+    let extra = usize::from(u16::from_le_bytes([h[28], h[29]]));
+    off.checked_add(30 + name + extra)?.checked_add(csize as usize)
+}
+
 impl Carving {
     /// Bytes each window must run into the next, so a magic across the seam
     /// is seen whole.
@@ -796,10 +985,14 @@ impl Carving {
         longest - 1
     };
 
-    pub(crate) fn new() -> Self {
+    /// A search that settles its far candidates once `far_max` wait.
+    pub(crate) fn new(far_max: usize) -> Self {
         Carving {
             finders: CARVE_MAGICS.iter().map(|(m, _)| memchr::memmem::Finder::new(m)).collect(),
             hits: Vec::new(),
+            zip_next: None,
+            far: Vec::new(),
+            far_max: far_max.max(1),
             found: Embedded::default(),
         }
     }
@@ -808,7 +1001,8 @@ impl Carving {
     /// at its cap, and candidates past the caps were already seen.
     pub(crate) fn full(&self) -> bool {
         let f = &self.found;
-        f.pe_capped
+        self.far.is_empty()
+            && f.pe_capped
             && f.others_capped
             && f.pe.len() >= MAX_EMBEDDED_PE
             && f.elf.len() >= MAX_EMBEDDED_PE
@@ -822,32 +1016,90 @@ impl Carving {
     pub(crate) fn feed(&mut self, data: &dyn ByteSource, at: usize, w: &[u8], owned: usize) {
         let found = &mut self.found;
         let hits = &mut self.hits;
+        let zip_next = &mut self.zip_next;
+        let far = &mut self.far;
+        // A header beyond the window is a read of its own, where the object
+        // is not in memory.
+        let held = at + w.len();
+        let in_memory = data.as_slice().is_some();
         hits.clear();
         for (f, (_, kind)) in self.finders.iter().zip(CARVE_MAGICS) {
             hits.extend(f.find_iter(w).take_while(|&p| p < owned).map(|p| (at + p, kind)));
         }
         hits.sort_unstable_by_key(|&(off, _)| off);
         for &(off, kind) in hits.iter() {
+            let zip = matches!(kind, Magic::Archive) && data.window(off, 4)[..] == *b"PK\x03\x04";
             if off == 0 {
-                continue; // the object's own image or archive
+                // The object's own image or archive; a ZIP's later entries
+                // are its own, not archives stapled inside it.
+                if zip {
+                    *zip_next = zip_next_header(data, off);
+                }
+                continue;
+            }
+            // The next entry of a ZIP already taken is read when that ZIP is:
+            // its walk reaches every local header after its own, wherever the
+            // directory points. Counting each as an archive of its own would
+            // fill the cap with one zip's members and rescan the rest of the
+            // object once per member.
+            if zip && *zip_next == Some(off) {
+                *zip_next = zip_next_header(data, off);
+                continue;
             }
             let (list, cap, ok) = match kind {
-                Magic::Pe => (&mut found.pe, MAX_EMBEDDED_PE, pe_at(data, off)),
+                Magic::Pe => {
+                    match pe_target(data, off) {
+                        Some(pe) if pe >= held && !in_memory => far.push((pe, off)),
+                        Some(pe) if pe_header_at(data, pe) => accept_pe(found, off),
+                        _ => {}
+                    }
+                    continue;
+                }
                 Magic::Elf => (&mut found.elf, MAX_EMBEDDED_PE, elf_at(data, off)),
                 Magic::MachoThin(be) => (&mut found.macho, MAX_EMBEDDED_PE, macho_thin_at(data, off, be)),
                 Magic::MachoFat => (&mut found.macho, MAX_EMBEDDED_PE, macho_fat_at(data, off)),
                 Magic::Archive => (&mut found.archives, MAX_EMBEDDED_ARCHIVES, archive_at(data, off)),
             };
+            // The chain follows only a ZIP that will be scanned.
+            if zip {
+                *zip_next = None;
+            }
             if ok {
                 if list.len() < cap {
                     list.push(off);
-                } else if matches!(kind, Magic::Pe) {
-                    found.pe_capped = true;
+                    if zip {
+                        *zip_next = zip_next_header(data, off);
+                    }
                 } else {
                     found.others_capped = true;
                 }
             }
         }
+        if self.far.len() >= self.far_max {
+            self.settle(data);
+        }
+    }
+
+    /// Check the far candidates waiting, in the order of the headers they
+    /// point at. Call it once the object is fed.
+    pub(crate) fn settle(&mut self, data: &dyn ByteSource) {
+        self.far.sort_unstable();
+        for (pe, off) in std::mem::take(&mut self.far) {
+            if pe_header_at(data, pe) {
+                accept_pe(&mut self.found, off);
+            }
+        }
+    }
+}
+
+/// Take the PE at `off`: the lowest [`MAX_EMBEDDED_PE`] offsets are listed
+/// whatever order they are found in, and one more makes the object capped.
+fn accept_pe(found: &mut Embedded, off: usize) {
+    let at = found.pe.partition_point(|&o| o < off);
+    found.pe.insert(at, off);
+    if found.pe.len() > MAX_EMBEDDED_PE {
+        found.pe.pop();
+        found.pe_capped = true;
     }
 }
 
@@ -868,22 +1120,26 @@ fn archive_at(data: &dyn ByteSource, off: usize) -> bool {
     }
 }
 
-/// An `MZ` at `off` whose `e_lfanew` points to a sane `PE\0\0` header.
+/// An `MZ` at `off` whose `e_lfanew` points to a sane `PE\0\0` header: what
+/// carving finds, one candidate at a time, for the tests to compare it to.
+#[cfg(test)]
 fn pe_at(data: &dyn ByteSource, off: usize) -> bool {
+    pe_target(data, off).is_some_and(|pe| pe_header_at(data, pe))
+}
+
+/// Where the `MZ` at `off` says its PE header is, if that is in bounds.
+fn pe_target(data: &dyn ByteSource, off: usize) -> Option<usize> {
     if off + 0x40 > data.len() {
-        return false;
+        return None;
     }
-    let Some(e_lfanew) = le_u32_at(data, off + 0x3c) else {
-        return false;
-    };
-    let e_lfanew = e_lfanew as usize;
+    let e_lfanew = le_u32_at(data, off + 0x3c)? as usize;
     // e_lfanew is relative to the MZ; the PE header must be in-bounds.
-    let Some(pe) = off.checked_add(e_lfanew) else {
-        return false;
-    };
-    if e_lfanew < 0x40 || pe + 4 > data.len() {
-        return false;
-    }
+    let pe = off.checked_add(e_lfanew)?;
+    (e_lfanew >= 0x40 && pe + 4 <= data.len()).then_some(pe)
+}
+
+/// A sane `PE\0\0` header at `pe`.
+fn pe_header_at(data: &dyn ByteSource, pe: usize) -> bool {
     data.window(pe, 4)[..] == *b"PE\0\0" && valid_pe_coff(data, pe)
 }
 
@@ -1126,6 +1382,27 @@ mod tests {
         assert_eq!(pe.rawaddr(0x1200, 0x10000), None);
     }
 
+    /// Header offsets near the top of u64 are the file's to claim: the table
+    /// they name is past the file, not an overflow.
+    #[test]
+    fn elf_table_offsets_near_the_top_of_u64_are_absent_not_a_panic() {
+        for off in [u64::MAX, u64::MAX - 1, u64::MAX - 8, u64::MAX - 40] {
+            let mut elf = vec![0u8; 120];
+            elf[..4].copy_from_slice(b"\x7fELF");
+            elf[4] = 2;
+            elf[5] = 1;
+            elf[32..40].copy_from_slice(&off.to_le_bytes());
+            elf[40..48].copy_from_slice(&off.to_le_bytes());
+            // e_phentsize, e_phnum, e_shentsize, e_shnum
+            for (at, v) in [(54, 56u16), (56, 2), (58, 64), (60, 2)] {
+                elf[at..at + 2].copy_from_slice(&v.to_le_bytes());
+            }
+            assert!(elf_broken(&elf.as_slice()), "{off:#x}");
+            let layout = elf_layout(&elf.as_slice()).unwrap();
+            assert!(layout.section_rawptrs.is_empty(), "{off:#x}");
+        }
+    }
+
     /// One read finds what looking for each magic at every offset finds:
     /// every validated image and archive candidate, in order and within its
     /// cap, whatever window seam it straddles, in memory and read through a
@@ -1211,6 +1488,61 @@ mod tests {
         }
     }
 
+    /// An `MZ` points its header anywhere in the object. Over a source that
+    /// is not in memory, those headers are checked in order, so many
+    /// candidates cost about one pass over the object and not a block read
+    /// each, and a real header far from its `MZ` is still found.
+    #[test]
+    fn far_headers_are_read_in_order() {
+        use crate::byte_source::BlockCache;
+        use std::sync::atomic::{AtomicU64, Ordering};
+        struct Tally(std::io::Cursor<Vec<u8>>, std::sync::Arc<AtomicU64>);
+        impl std::io::Read for Tally {
+            fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+                self.1.fetch_add(1, Ordering::Relaxed);
+                self.0.read(buf)
+            }
+        }
+        impl std::io::Seek for Tally {
+            fn seek(&mut self, p: std::io::SeekFrom) -> std::io::Result<u64> {
+                self.0.seek(p)
+            }
+        }
+        const BLOCK: usize = 4096;
+        let len = 1024 * BLOCK;
+        let mut data = vec![b'a'; len];
+        let mut state = 0x9e37_79b9_7f4a_7c15u64;
+        // Candidates whose headers are somewhere else in the object.
+        for k in 0..8000 {
+            state ^= state << 13;
+            state ^= state >> 7;
+            state ^= state << 17;
+            let off = 1000 + k * 500;
+            let to = 0x40 + (state as usize % (len - off - 0x80));
+            data[off..off + 2].copy_from_slice(b"MZ");
+            data[off + 0x3c..off + 0x40].copy_from_slice(&(to as u32).to_le_bytes());
+        }
+        // A real one, whose header is 3 MiB on.
+        let at = 100;
+        let header = at + (3 << 20);
+        data[at..at + 2].copy_from_slice(b"MZ");
+        data[at + 0x3c..at + 0x40].copy_from_slice(&(3u32 << 20).to_le_bytes());
+        let mut pe = b"PE\0\0\x4c\x01\x03\0".to_vec();
+        pe.resize(20, 0);
+        pe.extend_from_slice(&0xe0u16.to_le_bytes());
+        pe.extend_from_slice(&[0, 0, 0x0b, 0x01]);
+        data[header..header + pe.len()].copy_from_slice(&pe);
+
+        let reads = std::sync::Arc::new(AtomicU64::new(0));
+        let src = BlockCache::with_sizes(Tally(std::io::Cursor::new(data), reads.clone()), BLOCK, 8 * BLOCK).unwrap();
+        let found = embedded_in(&src);
+        assert_eq!(found.pe, [at]);
+        assert!(!found.pe_capped);
+        let reads = reads.load(Ordering::Relaxed) as usize;
+        let blocks = len / BLOCK;
+        assert!(reads <= 3 * blocks, "{reads} reads for {blocks} blocks");
+    }
+
     /// A chance `1f 8b 08` run is not a gzip candidate unless the header's
     /// `XFL` and `OS` hold up, so random data cannot fill the archive cap and
     /// make an object `LIMITS-EXCEEDED`.
@@ -1235,6 +1567,82 @@ mod tests {
         assert!(found.others_capped);
     }
 
+    /// A ZIP local header for an entry named `name` holding `len` bytes, with
+    /// the general-purpose `flags` and a declared compressed size of `csize`,
+    /// followed by `len` bytes of data.
+    fn zip_entry(name: &str, flags: u16, csize: u32, len: usize) -> Vec<u8> {
+        let mut e = b"PK\x03\x04\x14\0".to_vec();
+        e.extend_from_slice(&flags.to_le_bytes());
+        e.extend_from_slice(&[0, 0, 0, 0, 0x21, 0, 0, 0, 0, 0]);
+        e.extend_from_slice(&csize.to_le_bytes());
+        e.extend_from_slice(&(len as u32).to_le_bytes());
+        e.extend_from_slice(&(name.len() as u16).to_le_bytes());
+        e.extend_from_slice(&[0, 0]);
+        e.extend_from_slice(name.as_bytes());
+        e.extend_from_slice(&vec![b'.'; len]);
+        e
+    }
+
+    /// `entries` entries of a ZIP (each declaring its size truthfully) after a
+    /// text prefix.
+    fn zip_after_prefix(entries: usize, flags: u16) -> (Vec<u8>, usize) {
+        let mut data = b"a carrier with a zip stapled inside it\n".to_vec();
+        let first = data.len();
+        for k in 0..entries {
+            data.extend(zip_entry(&format!("m{k}"), flags, 20, 20));
+        }
+        (data, first)
+    }
+
+    /// The entries of one ZIP stapled into an object are read when the ZIP is,
+    /// so only the first is a candidate: they neither fill the cap nor are the
+    /// object rescanned once per entry.
+    #[test]
+    fn the_entries_of_a_zip_are_not_archives_of_their_own() {
+        let (data, first) = zip_after_prefix(MAX_EMBEDDED_ARCHIVES * 2, 0);
+        let found = embedded_in(&&data[..]);
+        assert_eq!(found.archives, [first]);
+        assert!(!found.others_capped);
+    }
+
+    /// A ZIP that is the object itself: every header after its own is an entry.
+    #[test]
+    fn the_entries_of_a_zip_at_offset_zero_are_not_archives_of_their_own() {
+        let (data, first) = zip_after_prefix(40, 0);
+        let found = embedded_in(&&data[first..]);
+        assert!(found.archives.is_empty() && !found.others_capped);
+    }
+
+    /// Where the header does not say where the next entry begins, each header
+    /// stays a candidate: a data descriptor, encryption or ZIP64's size leaves
+    /// the position unknown.
+    #[test]
+    fn a_header_that_cannot_place_the_next_one_keeps_every_candidate() {
+        for flags in [0b1000, 0b0001] {
+            let (data, _) = zip_after_prefix(5, flags);
+            assert_eq!(embedded_in(&&data[..]).archives.len(), 5, "flags {flags:#b}");
+        }
+        let mut data = b"carrier\n".to_vec();
+        for k in 0..5 {
+            data.extend(zip_entry(&format!("m{k}"), 0, u32::MAX, 20));
+        }
+        assert_eq!(embedded_in(&&data[..]).archives.len(), 5, "ZIP64 size");
+    }
+
+    /// A header that names a size that does not lead to the next header does
+    /// not hide it: a second archive placed anywhere else is still a
+    /// candidate.
+    #[test]
+    fn a_size_that_misses_the_next_header_keeps_it_a_candidate() {
+        let mut data = b"carrier\n".to_vec();
+        let first = data.len();
+        // Declares 10 bytes of data, holds 20: the chain lands inside them.
+        data.extend(zip_entry("a", 0, 10, 20));
+        let second = data.len();
+        data.extend(zip_entry("b", 0, 20, 20));
+        assert_eq!(embedded_in(&&data[..]).archives, [first, second]);
+    }
+
     #[test]
     fn embedded_macho_carved_and_java_rejected() {
         // A 64-bit LE Mach-O executable header (MH_MAGIC_64 = CF FA ED FE) at a
diff --git a/crates/exav-core/src/phishing.rs b/crates/exav-core/src/phishing.rs
index 6a012958..635b9a25 100644
--- a/crates/exav-core/src/phishing.rs
+++ b/crates/exav-core/src/phishing.rs
@@ -69,15 +69,13 @@ impl PhishingDb {
                                 disp.trim().to_ascii_lowercase(),
                             ));
                         }
-                    } else if let Some(rest) = line.strip_prefix("X:") {
-                        if let Some((real, disp)) = rest.split_once(':') {
-                            if let (Ok(re), Ok(rd)) = (compile_pattern(real), compile_pattern(disp))
-                            {
-                                self.allow_regex.push((re, rd));
-                                self.allow_regex_src
-                                    .push((real.to_string(), disp.to_string()));
-                            }
-                        }
+                    } else if let Some(rest) = line.strip_prefix("X:")
+                        && let Some((real, disp)) = rest.split_once(':')
+                        && let (Ok(re), Ok(rd)) = (compile_pattern(real), compile_pattern(disp))
+                    {
+                        self.allow_regex.push((re, rd));
+                        self.allow_regex_src
+                            .push((real.to_string(), disp.to_string()));
                     }
                 }
                 _ => {}
@@ -235,7 +233,37 @@ pub(crate) fn scan_complete_source(
     (None, true)
 }
 
-/// Offset of the next `<a ` (case-insensitive) at or after `from`. `bytes`
+/// [`scan_complete`] over links already read: `(display, href)` pairs, from a
+/// document that is not HTML (Markdown, a PDF) and has its own way of saying
+/// where a link goes. Judged as an anchor is, allow-list included.
+#[cfg(feature = "visible-text")]
+pub(crate) fn scan_links(links: &[(String, String)], db: &PhishingDb) -> (Option<Phish>, bool) {
+    let mut allow_checks = 0usize;
+    for (display, href) in links {
+        let Some(p) = classify(href, display, db) else {
+            continue;
+        };
+        if db.has_allow_list() {
+            if allow_checks == MAX_ALLOW_CHECKS {
+                return (None, false);
+            }
+            allow_checks += 1;
+            if allow_listed(href, display, db) {
+                continue;
+            }
+        }
+        return (Some(p), true);
+    }
+    (None, true)
+}
+
+/// The bytes HTML5 takes for white space after a tag name.
+fn is_tag_space(b: u8) -> bool {
+    matches!(b, b' ' | b'\t' | b'\n' | b'\r' | 0x0c)
+}
+
+/// Offset of the next `<a` and white space (case-insensitive) at or after
+/// `from`. `bytes`
 /// reads `data` when it is not held in memory, and is kept across calls so
 /// the object is read forward once.
 fn find_anchor(
@@ -247,7 +275,7 @@ fn find_anchor(
     if let Some(data) = data.as_slice() {
         let hay = data.get(from..)?;
         return memchr::memchr_iter(b'<', hay)
-            .find(|&i| matches!(hay.get(i + 1..i + 3), Some([b'a' | b'A', b' '])))
+            .find(|&i| matches!(hay.get(i + 1..i + 3), Some([b'a' | b'A', b]) if is_tag_space(*b)))
             .map(|i| from + i);
     }
     let n = data.len();
@@ -255,7 +283,7 @@ fn find_anchor(
         bytes.at(i) == b'<'
             && i + 2 < n
             && matches!(bytes.at(i + 1), b'a' | b'A')
-            && bytes.at(i + 2) == b' '
+            && is_tag_space(bytes.at(i + 2))
     })
 }
 
@@ -277,17 +305,19 @@ fn classify(href: &str, display: &str, db: &PhishingDb) -> Option<Phish> {
     let disp_host = display_host(display);
     // Userinfo cloak: `http://paypal.com@evil/` — flag only when the userinfo
     // itself looks like a hostname of a different registered domain.
-    if let Some(ui) = userinfo {
-        if ui.contains('.') && registered(ui) != registered(host) {
-            return Some(Phish::CloakedUsername);
-        }
+    if let Some(ui) = userinfo
+        && ui.contains('.')
+        && registered(ui) != registered(host)
+    {
+        return Some(Phish::CloakedUsername);
     }
     // Raw-IP host under a domain-looking display.
     if is_ipv4(host) {
-        if let Some(dh) = &disp_host {
-            if !is_ipv4(dh) && dh.contains('.') {
-                return Some(Phish::CloakedIp);
-            }
+        if let Some(dh) = &disp_host
+            && !is_ipv4(dh)
+            && dh.contains('.')
+        {
+            return Some(Phish::CloakedIp);
         }
         return None;
     }
@@ -296,13 +326,14 @@ fn classify(href: &str, display: &str, db: &PhishingDb) -> Option<Phish> {
     // the scheme is a domain spoof, the more specific finding. (Getting this
     // order wrong made a paypal.com-spoofing link report as a mere SSL
     // mismatch — the existing `spoofed_domain` test caught it.)
-    if let Some(dh) = &disp_host {
-        if !dh.is_empty() && registered(dh) != registered(host) {
-            if db.scoped() && !db.is_protected(dh) {
-                return None;
-            }
-            return Some(Phish::SpoofedDomain);
+    if let Some(dh) = &disp_host
+        && !dh.is_empty()
+        && registered(dh) != registered(host)
+    {
+        if db.scoped() && !db.is_protected(dh) {
+            return None;
         }
+        return Some(Phish::SpoofedDomain);
     }
     // Transport lie: the display promises https, the href is plain http, and the
     // domains agree — the one phishing shape where everything except the scheme
@@ -398,10 +429,10 @@ fn strip_http(url: &str) -> Option<&str> {
 /// The host named by anchor display text, if it is (or contains) a URL or bare host.
 fn display_host(display: &str) -> Option<String> {
     let d = display.trim();
-    if let Some((_, h)) = split_host(d) {
-        if !h.is_empty() {
-            return Some(h.to_ascii_lowercase());
-        }
+    if let Some((_, h)) = split_host(d)
+        && !h.is_empty()
+    {
+        return Some(h.to_ascii_lowercase());
     }
     let token = d
         .split_whitespace()
@@ -423,15 +454,34 @@ fn display_host(display: &str) -> Option<String> {
     None
 }
 
-/// Approximate registered domain: the last two DNS labels, lowercased.
+/// Labels that stand before a country code in a two-label public suffix:
+/// `co.uk`, `com.au`, `gov.uk`, `ne.jp`, `ac.nz`. Not the whole of the public
+/// suffix list, which has thousands of entries (`city.kawasaki.jp`,
+/// `pvt.k12.ma.us`): these are the ones that carry nearly all the registrations
+/// of the countries that use the form.
+const SECOND_LEVEL: &[&str] = &[
+    "ac", "asn", "biz", "co", "com", "edu", "go", "gob", "gouv", "gov", "id", "info", "int", "ltd",
+    "me", "mil", "mod", "ne", "net", "nhs", "nom", "or", "org", "plc", "police", "sch", "web",
+];
+
+/// Approximate registered domain, lowercased: the last two DNS labels, or the
+/// last three when they end in a two-label public suffix of a country
+/// (`barclays.co.uk`), where the last two would be the suffix alone and every
+/// brand under it one and the same.
 fn registered(host: &str) -> String {
     let h = host.trim_end_matches('.').to_ascii_lowercase();
     let labels: Vec<&str> = h.split('.').filter(|s| !s.is_empty()).collect();
-    if labels.len() <= 2 {
-        labels.join(".")
+    let n = labels.len();
+    let keep = if n >= 3
+        && labels[n - 1].len() == 2
+        && labels[n - 1].bytes().all(|b| b.is_ascii_alphabetic())
+        && SECOND_LEVEL.contains(&labels[n - 2])
+    {
+        3
     } else {
-        labels[labels.len() - 2..].join(".")
-    }
+        2
+    };
+    labels[n.saturating_sub(keep)..].join(".")
 }
 
 /// True for a dotted-quad IPv4 literal.
@@ -497,6 +547,78 @@ mod tests {
         );
     }
 
+    /// HTML5 takes a space, a tab, a line feed, a form feed and a carriage
+    /// return alike after a tag name, and so does every browser and mail client.
+    #[test]
+    fn an_anchor_may_be_followed_by_any_html_space() {
+        use crate::byte_source::{BlockCache, CHUNK};
+        for space in [" ", "\t", "\n", "\r", "\x0c", "\r\n\t "] {
+            let html =
+                format!("<a{space}href=\"http://evil.example/login\">http://paypal.com/signin</a>");
+            assert_eq!(
+                scan0(html.as_bytes()),
+                Some(Phish::SpoofedDomain),
+                "{space:?}"
+            );
+            let upper = html.replace("<a", "<A");
+            assert_eq!(
+                scan0(upper.as_bytes()),
+                Some(Phish::SpoofedDomain),
+                "{space:?}"
+            );
+            // Read in blocks, from an offset that puts the tag name's end at
+            // the end of a block.
+            let mut page = vec![b' '; CHUNK - 2];
+            page.extend_from_slice(html.as_bytes());
+            let cache =
+                BlockCache::with_sizes(std::io::Cursor::new(page.clone()), 61, 4 * 61).unwrap();
+            assert_eq!(
+                scan_complete_source(&cache, &PhishingDb::default()).0,
+                Some(Phish::SpoofedDomain),
+                "{space:?} in blocks"
+            );
+        }
+        // A tag that only begins with `a` is not an anchor.
+        assert_eq!(
+            scan0(br#"<abbr href="http://evil.example/">http://paypal.com</abbr>"#),
+            None
+        );
+    }
+
+    #[test]
+    fn a_brand_under_a_two_label_suffix_is_its_own_registered_domain() {
+        assert_eq!(registered("www.barclays.co.uk"), "barclays.co.uk");
+        assert_eq!(registered("barclays.co.uk"), "barclays.co.uk");
+        assert_eq!(registered("co.uk"), "co.uk");
+        assert_eq!(registered("a.b.shop.com.au"), "shop.com.au");
+        assert_eq!(registered("x.example.co.jp."), "example.co.jp");
+        assert_eq!(registered("www.paypal.com"), "paypal.com");
+        assert_eq!(registered("paypal.com"), "paypal.com");
+        // A generic label before a generic top-level domain is a domain.
+        assert_eq!(registered("www.co.com"), "co.com");
+        assert_eq!(registered("localhost"), "localhost");
+        assert_eq!(registered(""), "");
+    }
+
+    #[test]
+    fn spoofs_under_a_two_label_suffix_are_found() {
+        let spoof = br#"<a href="http://secure-barclays-login.co.uk/">http://barclays.co.uk</a>"#;
+        let cloak = br#"<a href="http://barclays.co.uk@phishing-login.co.uk/x">your bank</a>"#;
+        assert_eq!(scan0(spoof), Some(Phish::SpoofedDomain));
+        assert_eq!(scan0(cloak), Some(Phish::CloakedUsername));
+        // The same brand under its own subdomain is not a spoof.
+        let same = br#"<a href="http://online.barclays.co.uk/x">www.barclays.co.uk</a>"#;
+        assert_eq!(scan0(same), None);
+        // A monitored brand under a two-label suffix is monitored as itself,
+        // not as every domain under the suffix.
+        let mut db = PhishingDb::default();
+        db.add_text("pdb", "H:smile.co.uk\n");
+        let hit = br#"<a href="http://evil-login.co.uk/">www.smile.co.uk</a>"#;
+        let other = br#"<a href="http://evil-login.co.uk/">www.example.co.uk</a>"#;
+        assert_eq!(scan(hit, &db), Some(Phish::SpoofedDomain));
+        assert_eq!(scan(other, &db), None);
+    }
+
     #[test]
     fn userinfo_and_ip_cloak() {
         assert_eq!(
diff --git a/crates/exav-core/src/profile.rs b/crates/exav-core/src/profile.rs
index 3a26fb92..ed2593f4 100644
--- a/crates/exav-core/src/profile.rs
+++ b/crates/exav-core/src/profile.rs
@@ -4,4 +4,4 @@
 //! scan infra at the bottom of the dependency stack, so the packer emulator in
 //! `exav-unpack` and the matchers here record into the same thread-local
 //! profile. Re-exported so existing paths keep working.
-pub use exav_unpack::profile::{enable, take, timed, Profile, Stat};
+pub use exav_unpack::profile::{Profile, Stat, enable, take, timed};
diff --git a/crates/exav-core/src/source.rs b/crates/exav-core/src/source.rs
index 610692ea..3b807e64 100644
--- a/crates/exav-core/src/source.rs
+++ b/crates/exav-core/src/source.rs
@@ -14,19 +14,20 @@ mod http {
     use std::io::{self, Read, Seek, SeekFrom};
 
     /// Bytes fetched by a range request that does not continue the previous
-    /// one.
-    const BLOCK: u64 = 64 * 1024;
+    /// one, unless the caller says otherwise: the block of the cache that
+    /// reads through the reader, so that a block is one request.
+    pub const BLOCK: u64 = 1024 * 1024;
 
-    /// Most bytes one range request fetches.
-    const MAX_BLOCK: u64 = 8 * 1024 * 1024;
+    /// Most bytes one range request fetches, unless the caller says otherwise.
+    pub const MAX_BLOCK: u64 = 8 * 1024 * 1024;
 
     /// A `Read + Seek` view over an HTTP(S) resource, served by range
     /// requests, the last one's bytes kept.
     ///
     /// A request that continues the previous one fetches twice as much, up to
-    /// [`MAX_BLOCK`]: a pass through the object costs a request per 8 MiB
-    /// rather than per 64 KiB, while reads scattered through it (a ZIP's
-    /// directory, then its members) stay small.
+    /// the largest request (8 MiB unless set): a pass through the object costs a
+    /// request per 8 MiB rather than per block, while reads scattered through it
+    /// (a ZIP's directory, then its members) stay one block.
     pub struct HttpRangeReader {
         agent: ureq::Agent,
         url: String,
@@ -38,12 +39,25 @@ mod http {
         pub bytes_fetched: u64,
         /// Number of range requests issued.
         pub requests: u64,
+        /// What a request that does not continue the previous one fetches.
+        first: u64,
+        /// The most one request fetches.
+        most: u64,
     }
 
     impl HttpRangeReader {
         /// Open a URL, probing its length and range support with a single
         /// `bytes=0-0` request.
         pub fn open(url: &str) -> io::Result<Self> {
+            Self::open_with(url, BLOCK, MAX_BLOCK)
+        }
+
+        /// [`Self::open`] with the size of a request that does not continue
+        /// the previous one (`first`, at least 1) and the most any request
+        /// fetches (`most`, never below `first`).
+        pub fn open_with(url: &str, first: u64, most: u64) -> io::Result<Self> {
+            let first = first.max(1);
+            let most = most.max(first);
             let agent: ureq::Agent = ureq::Agent::config_builder()
                 .user_agent(concat!("exav/", env!("CARGO_PKG_VERSION")))
                 .build()
@@ -74,6 +88,8 @@ mod http {
                 block_start: 0,
                 bytes_fetched: 0,
                 requests: 0,
+                first,
+                most,
             })
         }
 
@@ -93,8 +109,8 @@ mod http {
             let continues =
                 !self.block.is_empty() && start == self.block_start + self.block.len() as u64;
             let size = match continues {
-                true => (self.block.len() as u64 * 2).min(MAX_BLOCK),
-                false => BLOCK,
+                true => (self.block.len() as u64 * 2).min(self.most),
+                false => self.first,
             };
             self.block.clear();
             self.block_start = start;
@@ -116,6 +132,33 @@ mod http {
                     resp.status()
                 )));
             }
+            // The range it says it sent, of the object it said it was: a server
+            // that answers another range hands over bytes of another place, and
+            // one whose object has changed since a scan began hands over a
+            // mixture. Neither is the object that was asked to be scanned.
+            let range = resp
+                .headers()
+                .get("Content-Range")
+                .and_then(|cr| cr.to_str().ok())
+                .and_then(|cr| cr.trim().strip_prefix("bytes "))
+                .and_then(|cr| {
+                    let (span, total) = cr.split_once('/')?;
+                    let (from, _) = span.split_once('-')?;
+                    Some((
+                        from.trim().parse::<u64>().ok()?,
+                        total.trim().parse::<u64>().ok(),
+                    ))
+                });
+            match range {
+                Some((from, total)) if from == start && total.is_none_or(|t| t == self.len) => {}
+                other => {
+                    return Err(io::Error::other(format!(
+                        "range request for bytes {start}-{last} of {} answered with {other:?} \
+                         (the object is {} bytes)",
+                        self.url, self.len
+                    )));
+                }
+            }
             let mut buf = Vec::new();
             resp.into_body()
                 .into_reader()
@@ -139,7 +182,7 @@ mod http {
                 // holding a position elsewhere.
                 let start = match self.pos == next {
                     true => next,
-                    false => (self.pos / BLOCK) * BLOCK,
+                    false => (self.pos / self.first) * self.first,
                 };
                 self.fetch_block(start)?;
             }
@@ -240,6 +283,68 @@ mod tests {
         url
     }
 
+    /// A server that answers the first request as it should and every later one
+    /// with the range `shift` bytes on from the one asked for (`Offset`), or with
+    /// the range asked for of an object of another size (`Total`).
+    enum Wrong {
+        Offset,
+        Total,
+    }
+
+    fn serve_wrong(body: Vec<u8>, wrong: Wrong) -> String {
+        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+        let url = format!("http://{}/obj", listener.local_addr().unwrap());
+        std::thread::spawn(move || {
+            for (n, conn) in listener.incoming().enumerate() {
+                let Ok(mut conn) = conn else { return };
+                let mut range = (0usize, 0usize);
+                let mut reader = BufReader::new(conn.try_clone().unwrap());
+                loop {
+                    let mut line = String::new();
+                    if reader.read_line(&mut line).unwrap_or(0) == 0 || line == "\r\n" {
+                        break;
+                    }
+                    if let Some(r) = line.to_ascii_lowercase().strip_prefix("range: bytes=") {
+                        let (a, b) = r.trim().split_once('-').unwrap();
+                        range = (a.parse().unwrap(), b.parse().unwrap());
+                    }
+                }
+                let (a, b) = range;
+                let (from, to, total) = match (&wrong, n) {
+                    (_, 0) => (a, b, body.len()),
+                    (Wrong::Offset, _) => (
+                        (a + 1).min(body.len() - 1),
+                        (b + 1).min(body.len() - 1),
+                        body.len(),
+                    ),
+                    (Wrong::Total, _) => (a, b, body.len() + 7),
+                };
+                let part = &body[from..=to];
+                let h = format!(
+                    "HTTP/1.1 206 Partial Content\r\nContent-Range: bytes {from}-{to}/{total}\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
+                    part.len()
+                );
+                let _ = conn.write_all(&[h.as_bytes(), part].concat());
+            }
+        });
+        url
+    }
+
+    /// The bytes of a range are the bytes of the range that was asked for, of
+    /// the object that was asked about.
+    #[test]
+    fn an_answer_for_another_range_or_another_object_is_refused() {
+        let body: Vec<u8> = (0..200_000u32).map(|i| (i % 251) as u8).collect();
+        for wrong in [Wrong::Offset, Wrong::Total] {
+            let mut r = HttpRangeReader::open(&serve_wrong(body.clone(), wrong)).unwrap();
+            let mut all = Vec::new();
+            let e = r
+                .read_to_end(&mut all)
+                .expect_err("the answer is not the range asked for");
+            assert!(e.to_string().contains("answered with"), "{e}");
+        }
+    }
+
     #[test]
     fn ranges_are_read_where_they_are() {
         let body: Vec<u8> = (0..200_000u32).map(|i| (i % 251) as u8).collect();
@@ -255,6 +360,38 @@ mod tests {
         assert_eq!(all, body);
     }
 
+    /// The size of a request that starts a read, and the most one may grow to,
+    /// are the caller's.
+    #[test]
+    fn the_request_sizes_are_the_callers() {
+        let body = vec![7u8; 3_000_000];
+        let sequential = |first, most| {
+            let mut r =
+                HttpRangeReader::open_with(&serve(body.clone(), false), first, most).unwrap();
+            let mut all = Vec::new();
+            r.read_to_end(&mut all).unwrap();
+            assert_eq!(all, body);
+            r
+        };
+        // One request per 100,000 bytes.
+        assert_eq!(sequential(100_000, 100_000).requests, 30);
+        // 10 KB, doubling up to 1 MB: seven requests to 1,270,000 bytes, two
+        // of 1 MB, the rest.
+        let mut r = sequential(10_000, 1_000_000);
+        assert_eq!(r.requests, 9);
+        // A read elsewhere is one request of the first size, from its block.
+        let (requests, fetched) = (r.requests, r.bytes_fetched);
+        r.seek(SeekFrom::Start(123)).unwrap();
+        r.read_exact(&mut [0u8; 10]).unwrap();
+        assert_eq!(r.requests, requests + 1);
+        assert_eq!(r.bytes_fetched, fetched + 10_000);
+        // The defaults are the ones `open` has.
+        assert_eq!(
+            (super::http::BLOCK, super::http::MAX_BLOCK),
+            (1 << 20, 8 << 20)
+        );
+    }
+
     /// A seek past the largest offset is refused, not wrapped to a small one.
     #[test]
     fn a_seek_past_u64_is_an_error_not_a_wrap() {
diff --git a/crates/exav-core/src/spill.rs b/crates/exav-core/src/spill.rs
index 7e16e720..4d661325 100644
--- a/crates/exav-core/src/spill.rs
+++ b/crates/exav-core/src/spill.rs
@@ -61,22 +61,24 @@ impl SpillOut {
     }
 
     fn flush(&mut self) {
-        if self.failed.is_none() && !self.batch.is_empty() {
-            if let Err(e) = self.file.write(&self.batch) {
-                self.failed = Some(e);
-            }
+        if self.failed.is_none()
+            && !self.batch.is_empty()
+            && let Err(e) = self.file.write(&self.batch)
+        {
+            self.failed = Some(e);
         }
         self.batch.clear();
     }
 
     /// What was written, to read back.
-    pub(crate) fn finish(mut self) -> Result<Spilled, String> {
+    pub(crate) fn finish(mut self, cache: (usize, usize)) -> Result<Spilled, String> {
         self.flush();
         if let Some(e) = self.failed {
             return Err(e);
         }
         let reader = self.file.finish()?;
-        BlockCache::new(reader).map_err(|e| format!("spill file unreadable: {e}"))
+        BlockCache::with_sizes(reader, cache.0, cache.1)
+            .map_err(|e| format!("spill file unreadable: {e}"))
     }
 }
 
@@ -108,6 +110,7 @@ pub(crate) enum SpillStreamError {
 pub(crate) fn spill_stream(
     spill: &dyn Spill,
     reader: &mut dyn Read,
+    cache: (usize, usize),
 ) -> Result<Spilled, SpillStreamError> {
     let mut out = SpillOut::new(spill.create().map_err(SpillStreamError::Spill)?);
     let mut buf = vec![0u8; CHUNK];
@@ -122,7 +125,7 @@ pub(crate) fn spill_stream(
             return Err(SpillStreamError::Spill(e));
         }
     }
-    out.finish().map_err(SpillStreamError::Spill)
+    out.finish(cache).map_err(SpillStreamError::Spill)
 }
 
 #[cfg(test)]
@@ -168,12 +171,12 @@ pub(crate) mod tests {
             budget: usize::MAX,
             made: Arc::default(),
         };
-        let back = spill_stream(&spill, &mut Cursor::new(&data)).unwrap();
+        let back = spill_stream(&spill, &mut Cursor::new(&data), (64 * 1024, 8 << 20)).unwrap();
         assert_eq!(back.window(0, back.len()), &data[..]);
         let small = MemSpill {
             budget: CHUNK,
             made: Arc::default(),
         };
-        assert!(spill_stream(&small, &mut Cursor::new(&data)).is_err());
+        assert!(spill_stream(&small, &mut Cursor::new(&data), (64 * 1024, 8 << 20)).is_err());
     }
 }
diff --git a/crates/exav-core/src/yara/atoms.rs b/crates/exav-core/src/yara/atoms.rs
index 42d092a5..c7c1dfe0 100644
--- a/crates/exav-core/src/yara/atoms.rs
+++ b/crates/exav-core/src/yara/atoms.rs
@@ -32,8 +32,8 @@ use regex_syntax::hir::literal::{ExtractKind, Extractor};
 use serde::{Deserialize, Serialize};
 
 use crate::byte_source::ByteSource;
-use crate::grams::{structural, sweep, GramStats, Grams, IndexAnchor};
-use crate::yara::matcher::{parse_hir, widen_hir, Base64Sub, Needle};
+use crate::grams::{GramStats, Grams, IndexAnchor, structural, sweep};
+use crate::yara::matcher::{Base64Sub, Needle, parse_hir, widen_hir};
 
 /// Maximum atom window length taken from a literal / base64 needle. A longer
 /// window is a strictly more selective (rarer) gate; the cap bounds what the
diff --git a/crates/exav-core/src/yara/compiler.rs b/crates/exav-core/src/yara/compiler.rs
index 91323b5a..d9a8da8e 100644
--- a/crates/exav-core/src/yara/compiler.rs
+++ b/crates/exav-core/src/yara/compiler.rs
@@ -18,7 +18,7 @@ use crate::yara::ir::{
     Quant, StrOp, Value,
 };
 use crate::yara::matcher::{
-    build_regex, build_wide_regex, widen, Base64SubDef, Needle, PatternDef, PatternMatcher,
+    Base64SubDef, Needle, PatternDef, PatternMatcher, build_regex, build_wide_regex, widen,
 };
 use crate::yara::modules::{self, FieldName, ModuleKind, SchemaNode};
 use crate::yara::scanner::{CompiledRule, Rules};
@@ -147,6 +147,7 @@ impl Compiler {
     /// sources may reference rules defined in earlier ones. Returns an error on
     /// the first parse error or unsupported construct.
     pub fn add_source(&mut self, src: &str) -> Result<&mut Self> {
+        check_paren_depth(src)?;
         let ast = AST::from(src);
         if let Some(err) = ast.errors().first() {
             return Err(Error::new(format!("parse error: {err:?}")));
@@ -190,6 +191,10 @@ impl Compiler {
     /// the returned list.
     pub fn add_source_lenient(&mut self, src: &str) -> Vec<(String, Error)> {
         let mut rejected = Vec::new();
+        if let Err(e) = check_paren_depth(src) {
+            rejected.push((String::new(), e));
+            return rejected;
+        }
         let ast = AST::from(src);
         if let Some(err) = ast.errors().first() {
             rejected.push((String::new(), Error::new(format!("parse error: {err:?}"))));
@@ -760,7 +765,7 @@ impl RuleCtx<'_> {
             Expr::LiteralFloat(f) => Cond::Float(f.value),
             Expr::LiteralString(s) => Cond::Str(ls_bytes(s)),
             Expr::Regexp(_) => {
-                return Err(Error::unsupported("bare regular expression in condition"))
+                return Err(Error::unsupported("bare regular expression in condition"));
             }
 
             Expr::Ident(id) => {
@@ -772,7 +777,7 @@ impl RuleCtx<'_> {
                                 "variable `{}` is a struct and cannot be used as a value \
                                  (access one of its fields)",
                                 id.name
-                            )))
+                            )));
                         }
                     }
                 } else if let Some(&idx) = self.rule_index.get(id.name) {
@@ -930,7 +935,7 @@ impl RuleCtx<'_> {
                     _ => {
                         return Err(Error::unsupported(format!(
                             "method call `{name}()` on a non-module value"
-                        )))
+                        )));
                     }
                 };
                 let args: Vec<Cond> = fc
@@ -1327,7 +1332,7 @@ impl RuleCtx<'_> {
                     _ => {
                         return Err(Error::new(
                             "expression is not iterable (expected an array or map)",
-                        ))
+                        ));
                     }
                 };
                 let (elem, nvars) = node.iterable().ok_or_else(|| {
@@ -1419,6 +1424,137 @@ fn const_to_cond(v: crate::yara::ir::Value) -> Cond {
 /// Maps an integer file-read function name to its [`IntKind`], or `None` for
 /// non-integer reads (e.g. `float32`, which is not implemented). Single-byte
 /// `_be` variants are equivalent to their little-endian forms.
+/// Deepest parenthesis nesting a rule source may have. The parser tries each
+/// `(` twice, as a boolean group and as an arithmetic one, and does not keep
+/// what the first try parsed, so a rule with an error inside `d` open
+/// parentheses costs about 2^d steps (a 3.5 KB rule with 15 took 5.6 s, and
+/// one of 3 KB with 12 took 0.3 s, which is 6 s under a sanitizer).
+const MAX_PAREN_DEPTH: usize = 10;
+
+/// Most operators (characters and keywords) one expression of a condition may
+/// chain, between `and`, `or`, a comma or a parenthesis. The parser and what
+/// is built from it recurse once per operator of a chain (`1 << 1 << 1 ...`,
+/// `not not not ...`, `a contains b contains c ...`): 20,000 of them, a 40 KB
+/// rule, overflowed a 2 MiB stack and aborted the process.
+const MAX_OP_CHAIN: usize = 256;
+
+/// Words of a condition that are operators.
+const OP_WORDS: [&[u8]; 10] = [
+    b"not",
+    b"defined",
+    b"contains",
+    b"icontains",
+    b"startswith",
+    b"istartswith",
+    b"endswith",
+    b"iendswith",
+    b"iequals",
+    b"matches",
+];
+
+/// Refuses a source nested deeper than [`MAX_PAREN_DEPTH`], or with more than
+/// [`MAX_OP_CHAIN`] chained operators, before it is parsed. Strings, comments
+/// and regular expressions are skipped.
+fn check_paren_depth(src: &str) -> Result<()> {
+    let b = src.as_bytes();
+    let mut i = 0;
+    // `ops` at the start of each open parenthesis or bracket: the chain that
+    // `and` and `or` inside it go back to.
+    let mut open: Vec<usize> = vec![];
+    let (mut ops, mut in_condition) = (0usize, false);
+    // The last byte that was not whitespace, to tell a regex from a division.
+    let mut prev = 0u8;
+    while i < b.len() {
+        let c = b[i];
+        match c {
+            b'"' => {
+                i += 1;
+                while i < b.len() && b[i] != b'"' {
+                    i += if b[i] == b'\\' { 2 } else { 1 };
+                }
+            }
+            b'/' if b.get(i + 1) == Some(&b'/') => {
+                while i < b.len() && b[i] != b'\n' {
+                    i += 1;
+                }
+            }
+            b'/' if b.get(i + 1) == Some(&b'*') => {
+                i += 2;
+                while i < b.len() && !b[i..].starts_with(b"*/") {
+                    i += 1;
+                }
+                i += 1;
+            }
+            b'/' if prev == b'=' || b[..i].trim_ascii_end().ends_with(b"matches") => {
+                i += 1;
+                let mut class = false;
+                while i < b.len() && (class || b[i] != b'/') {
+                    match b[i] {
+                        b'\\' => i += 1,
+                        b'[' => class = true,
+                        b']' => class = false,
+                        _ => {}
+                    }
+                    i += 1;
+                }
+            }
+            b'(' | b'[' if c == b'(' || in_condition => {
+                open.push(ops);
+                if open.len() > MAX_PAREN_DEPTH {
+                    return Err(Error::new(format!(
+                        "parentheses nested more than {MAX_PAREN_DEPTH} deep"
+                    )));
+                }
+            }
+            b')' | b']' if c == b')' || in_condition => {
+                // The group is one operand of the chain it sits in.
+                let at = open.pop();
+                if in_condition {
+                    ops = at.map_or(ops, |at| at + 1);
+                }
+            }
+            b',' => ops = open.last().copied().unwrap_or(0),
+            _ if c.is_ascii_alphabetic() || c == b'_' => {
+                let end = b[i..]
+                    .iter()
+                    .position(|x| !(x.is_ascii_alphanumeric() || *x == b'_'))
+                    .map_or(b.len(), |n| i + n);
+                let word = &b[i..end];
+                // `$rule`, `#and`: the name of a string.
+                if !(i > 0 && matches!(b[i - 1], b'$' | b'#' | b'@' | b'!')) {
+                    if word == b"rule" {
+                        in_condition = false;
+                    } else if word == b"condition" {
+                        (in_condition, ops) = (true, 0);
+                    } else if in_condition && (word == b"and" || word == b"or") {
+                        ops = open.last().copied().unwrap_or(0);
+                    } else if in_condition && OP_WORDS.contains(&word) {
+                        ops += 1;
+                    }
+                }
+                i = end - 1;
+            }
+            b'<' | b'>' | b'=' | b'!' | b'-' | b'+' | b'*' | b'%' | b'&' | b'|' | b'^' | b'~'
+            | b'/'
+                if in_condition =>
+            {
+                ops += 1;
+            }
+            _ => {}
+        }
+        if ops > MAX_OP_CHAIN {
+            return Err(Error::new(format!(
+                "more than {MAX_OP_CHAIN} operators chained in one expression"
+            )));
+        }
+        if !c.is_ascii_whitespace() {
+            prev = c;
+        }
+        i += 1;
+    }
+    Ok(())
+}
+
 fn int_kind(name: &str) -> Option<IntKind> {
     Some(match name {
         "uint8" | "uint8be" => IntKind::U8,
@@ -1434,3 +1570,163 @@ fn int_kind(name: &str) -> Option<IntKind> {
         _ => return None,
     })
 }
+
+#[cfg(test)]
+mod paren_depth_tests {
+    use super::{Compiler, MAX_OP_CHAIN, MAX_PAREN_DEPTH};
+    use std::time::{Duration, Instant};
+
+    fn nested(depth: usize) -> String {
+        format!(
+            "rule r {{ condition: {}true{} }}",
+            "(".repeat(depth),
+            ")".repeat(depth)
+        )
+    }
+
+    /// A 3.5 KB rule with an error inside 15 open parentheses (`yara`, fuzz
+    /// timeout): the parser took 5.6 s to refuse it.
+    #[test]
+    fn a_rule_with_an_error_deep_in_parentheses_is_refused_fast() {
+        let src = include_str!("../../tests/fixtures/fuzz/yara_nested_parens.yar");
+        let start = Instant::now();
+        let err = Compiler::new().add_source(src).err().expect("refused");
+        assert!(
+            start.elapsed() < Duration::from_millis(500),
+            "{:?}",
+            start.elapsed()
+        );
+        assert!(err.to_string().contains("nested"), "{err}");
+        let start = Instant::now();
+        let rejected = Compiler::new().add_source_lenient(src);
+        assert!(
+            start.elapsed() < Duration::from_millis(500),
+            "{:?}",
+            start.elapsed()
+        );
+        assert_eq!(rejected.len(), 1);
+    }
+
+    /// A 3 KB rule with an error inside 12 open parentheses (`yara`, fuzz run
+    /// of the 2026-10-30 campaign): 0.3 s in a release build, 6 s under the
+    /// sanitizer, so it was close to the fuzzer's timeout.
+    #[test]
+    fn a_rule_with_an_error_in_twelve_parentheses_is_refused_fast() {
+        let src = include_str!("../../tests/fixtures/fuzz/yara_nested_parens_12.yar");
+        let start = Instant::now();
+        let err = Compiler::new().add_source(src).err().expect("refused");
+        assert!(
+            start.elapsed() < Duration::from_millis(100),
+            "{:?}",
+            start.elapsed()
+        );
+        assert!(err.to_string().contains("nested"), "{err}");
+    }
+
+    #[test]
+    fn nesting_up_to_the_bound_compiles_and_one_more_is_refused() {
+        assert!(Compiler::new().add_source(&nested(MAX_PAREN_DEPTH)).is_ok());
+        assert!(
+            Compiler::new()
+                .add_source(&nested(MAX_PAREN_DEPTH + 1))
+                .is_err()
+        );
+    }
+
+    fn rule(condition: &str) -> String {
+        format!("import \"pe\"\nrule r {{ strings: $a = \"x\" condition: {condition} }}")
+    }
+
+    /// Compiles `src` on a 1 MiB stack, where a chain this long recursed to
+    /// an overflow before it was bounded.
+    fn compile_small_stack(src: String) -> bool {
+        std::thread::Builder::new()
+            .stack_size(1 << 20)
+            .spawn(move || Compiler::new().add_source(&src).is_ok())
+            .unwrap()
+            .join()
+            .unwrap()
+    }
+
+    #[test]
+    fn a_long_chain_of_operators_is_refused_not_recursed_into() {
+        let n = 20_000;
+        let chain = |op: &str| format!("{} == 1", vec!["1"; n].join(op));
+        let conditions = [
+            format!("{}true", "not ".repeat(n)),
+            format!("{}true", "defined ".repeat(n)),
+            format!("{}1 == 1", "- ".repeat(n)),
+            format!("{}1 == 1", "~ ".repeat(n)),
+            chain(" << "),
+            chain(" | "),
+            chain(" & "),
+            chain(" ^ "),
+            chain(" == "),
+            chain(" - 1 + "),
+            format!("\"a\"{}", " contains \"a\"".repeat(n)),
+            format!("\"a\" matches /x/{}", " matches /x/".repeat(n)),
+            format!("{}0{} == 1", "pe.sections[".repeat(n), "]".repeat(n)),
+        ];
+        for c in conditions {
+            assert!(!compile_small_stack(rule(&c)), "{}", &c[..40]);
+        }
+    }
+
+    #[test]
+    fn a_chain_up_to_the_bound_compiles_and_one_more_is_refused() {
+        let chain = |terms: usize| rule(&format!("{} == 1", vec!["1"; terms].join(" << ")));
+        // A term is an operator and its operand, and the `==` is two characters.
+        let ok = (MAX_OP_CHAIN - 2) / 2 + 1;
+        assert!(compile_small_stack(chain(ok)));
+        let err = Compiler::new().add_source(&chain(ok + 1)).err().unwrap();
+        assert!(err.to_string().contains("chained"), "{err}");
+    }
+
+    #[test]
+    fn and_or_and_commas_start_a_new_chain() {
+        let each = "1 << 1 << 1 << 1 == 1";
+        let ors = vec![each; 5_000].join(" or ");
+        assert!(compile_small_stack(rule(&ors)));
+        let ands = vec![each; 5_000].join(" and ");
+        assert!(compile_small_stack(rule(&ands)));
+        let of = format!("any of ({})", vec!["$a"; 5_000].join(", "));
+        assert!(compile_small_stack(rule(&of)));
+    }
+
+    #[test]
+    fn a_group_is_one_operand_of_the_chain_it_is_in() {
+        // `or` inside each group must not hide the chain outside them.
+        let mut c = String::from("true");
+        for _ in 0..200 {
+            c.push_str(" == (true or true)");
+        }
+        let err = Compiler::new().add_source(&rule(&c)).err().unwrap();
+        assert!(err.to_string().contains("chained"), "{err}");
+    }
+
+    #[test]
+    fn operators_outside_the_condition_are_not_counted() {
+        let mut src = String::from("rule r { strings:");
+        for i in 0..400 {
+            src.push_str(&format!(
+                " $s{i} = \"abc\" xor(1-2) $h{i} = {{ 41 [1-2] 42 }}"
+            ));
+        }
+        src.push_str(" condition: $s0 }");
+        Compiler::new().add_source(&src).expect("compiles");
+        // Nor the name of a string that looks like a keyword.
+        let src = rule("$a and #a > 0 and @a[1] > 0 and !a[1] > 0");
+        Compiler::new().add_source(&src).expect("compiles");
+    }
+
+    #[test]
+    fn parentheses_in_strings_comments_and_regexes_are_not_counted() {
+        let many = "(".repeat(40);
+        let src = format!(
+            "rule r {{ strings: $a = \"{many}\" $b = /x\\({many_esc}y/ $c = /[{many}]/ \
+             condition: // {many}\n /* {many} */ ($a or $b or $c) and \"{many}\" contains \"(\" }}",
+            many_esc = "\\(".repeat(40)
+        );
+        Compiler::new().add_source(&src).expect("compiles");
+    }
+}
diff --git a/crates/exav-core/src/yara/ir.rs b/crates/exav-core/src/yara/ir.rs
index 4ab2ebaa..dc8ea0e5 100644
--- a/crates/exav-core/src/yara/ir.rs
+++ b/crates/exav-core/src/yara/ir.rs
@@ -6,11 +6,11 @@ use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::rc::Rc;
 
-use regex_automata::{meta::Regex, Input};
+use regex_automata::{Input, meta::Regex};
 use serde::{Deserialize, Serialize};
 
 use crate::byte_source::ByteSource;
-use crate::yara::matcher::{build_regex, Match};
+use crate::yara::matcher::{Match, build_regex};
 use crate::yara::modules::{self, FuncId, ModuleCtx, ModuleKind};
 
 /// A compiled `matches` regexp plus the source it was built from.
@@ -641,7 +641,7 @@ fn count_in_range(id: usize, range: &Option<(Box<Cond>, Box<Cond>)>, ctx: &EvalC
 fn read_int(kind: IntKind, data: &dyn ByteSource, offset: i64) -> Option<Value> {
     let off: usize = offset.try_into().ok()?;
     macro_rules! rd {
-        ($n:literal, $conv:expr) => {{
+        ($n:literal, $conv:expr_2021) => {{
             let bytes: [u8; $n] = data.window(off, $n).as_ref().try_into().ok()?;
             $conv(bytes)
         }};
@@ -726,11 +726,7 @@ fn index_value(idx: &Option<Box<Cond>>, ctx: &EvalCtx) -> Option<usize> {
         None => 1,
         Some(e) => eval_int(e, ctx)?,
     };
-    if i < 1 {
-        None
-    } else {
-        Some((i - 1) as usize)
-    }
+    if i < 1 { None } else { Some((i - 1) as usize) }
 }
 
 fn eval_arith(op: ArithOp, a: &Cond, b: &Cond, ctx: &EvalCtx) -> Option<Value> {
diff --git a/crates/exav-core/src/yara/matcher.rs b/crates/exav-core/src/yara/matcher.rs
index bcec07c8..b4c2ccc9 100644
--- a/crates/exav-core/src/yara/matcher.rs
+++ b/crates/exav-core/src/yara/matcher.rs
@@ -13,9 +13,9 @@
 use std::ops::Range;
 
 use base64::Engine;
-use regex_automata::{meta, meta::Regex, util::syntax, Input};
-use regex_syntax::hir::{self, Hir, HirKind};
+use regex_automata::{Input, meta, meta::Regex, util::syntax};
 use regex_syntax::ParserBuilder;
+use regex_syntax::hir::{self, Hir, HirKind};
 use serde::{Deserialize, Serialize};
 
 use crate::byte_source::{ByteSource, CHUNK};
@@ -241,15 +241,17 @@ fn verify_full_word(data: &[u8], start: usize, end: usize, wide: bool, xor_key:
 /// (up to) two bytes after it.
 fn full_word_between(before: &[u8], after: &[u8], wide: bool, xor_key: u8) -> bool {
     if wide {
-        if let [a, b] = before {
-            if (b ^ xor_key) == 0 && is_word(a ^ xor_key) {
-                return false;
-            }
+        if let [a, b] = before
+            && (b ^ xor_key) == 0
+            && is_word(a ^ xor_key)
+        {
+            return false;
         }
-        if let [a, b] = after {
-            if (b ^ xor_key) == 0 && is_word(a ^ xor_key) {
-                return false;
-            }
+        if let [a, b] = after
+            && (b ^ xor_key) == 0
+            && is_word(a ^ xor_key)
+        {
+            return false;
         }
     } else {
         if before.last().is_some_and(|b| is_word(b ^ xor_key)) {
@@ -553,17 +555,17 @@ impl PatternMatcher {
                     }
                     let last = data.len() - e.searched.len();
                     for pos in keep.start..keep.end.min(last + 1) {
-                        if data[pos..].starts_with(&e.searched) {
-                            if let Some(r) = verify_base64(
+                        if data[pos..].starts_with(&e.searched)
+                            && let Some(r) = verify_base64(
                                 &e.pattern,
                                 data,
                                 e.padding as usize,
                                 pos,
                                 &e.engine,
                                 e.wide,
-                            ) {
-                                out.push(origin + r.0, r.1 - r.0);
-                            }
+                            )
+                        {
+                            out.push(origin + r.0, r.1 - r.0);
                         }
                     }
                 }
diff --git a/crates/exav-core/src/yara/modules/dotnet.rs b/crates/exav-core/src/yara/modules/dotnet.rs
index 1394d18b..b9303242 100644
--- a/crates/exav-core/src/yara/modules/dotnet.rs
+++ b/crates/exav-core/src/yara/modules/dotnet.rs
@@ -242,34 +242,18 @@ impl<'a> Meta<'a> {
     }
 
     fn str_w(&self) -> usize {
-        if self.wide_str {
-            4
-        } else {
-            2
-        }
+        if self.wide_str { 4 } else { 2 }
     }
     fn guid_w(&self) -> usize {
-        if self.wide_guid {
-            4
-        } else {
-            2
-        }
+        if self.wide_guid { 4 } else { 2 }
     }
     fn blob_w(&self) -> usize {
-        if self.wide_blob {
-            4
-        } else {
-            2
-        }
+        if self.wide_blob { 4 } else { 2 }
     }
 
     /// A simple index into one table: two bytes unless that table is large.
     fn idx_w(&self, table: usize) -> usize {
-        if self.rows[table] >= 1 << 16 {
-            4
-        } else {
-            2
-        }
+        if self.rows[table] >= 1 << 16 { 4 } else { 2 }
     }
 
     /// A coded index packs a table tag into the low bits, so it widens once any
diff --git a/crates/exav-core/src/yara/modules/hash.rs b/crates/exav-core/src/yara/modules/hash.rs
index e7031419..425ed38e 100644
--- a/crates/exav-core/src/yara/modules/hash.rs
+++ b/crates/exav-core/src/yara/modules/hash.rs
@@ -182,7 +182,7 @@ mod tests {
     #[test]
     fn a_range_read_in_chunks_hashes_as_the_slice_does() {
         use super::super::FuncId::*;
-        use super::{call, Value};
+        use super::{Value, call};
         use crate::byte_source::{BlockCache, CHUNK};
 
         let h: Vec<u8> = (0..3 * CHUNK + 5).map(|i| (i * 31 % 251) as u8).collect();
diff --git a/crates/exav-core/src/yara/modules/math.rs b/crates/exav-core/src/yara/modules/math.rs
index fe738f3a..c4cd5983 100644
--- a/crates/exav-core/src/yara/modules/math.rs
+++ b/crates/exav-core/src/yara/modules/math.rs
@@ -299,11 +299,7 @@ impl SerialCorrelation {
         let scc = (len * adjacent_product_sum - byte_sum_squared)
             / (len * self.byte_square_sum - byte_sum_squared);
 
-        if scc.is_nan() {
-            -100000.0
-        } else {
-            scc
-        }
+        if scc.is_nan() { -100000.0 } else { scc }
     }
 }
 
@@ -596,7 +592,7 @@ mod tests {
     #[test]
     fn a_range_read_in_chunks_computes_what_the_slice_does() {
         use super::super::FuncId::*;
-        use super::{call, Value};
+        use super::{Value, call};
         use crate::byte_source::{BlockCache, CHUNK};
 
         let h: Vec<u8> = (0..3 * CHUNK + 5).map(|i| (i * 31 % 251) as u8).collect();
diff --git a/crates/exav-core/src/yara/modules/mod.rs b/crates/exav-core/src/yara/modules/mod.rs
index 7fb1c13e..6c2cc4b2 100644
--- a/crates/exav-core/src/yara/modules/mod.rs
+++ b/crates/exav-core/src/yara/modules/mod.rs
@@ -445,7 +445,7 @@ pub(crate) fn resolve_func(module: ModuleKind, name: &str, args: &[Cond]) -> Res
                         "unsupported pe.imports() overload (only string dll, \
                          (dll, func) and (dll, ordinal) forms are implemented; \
                          regexp and import_flags forms are not)",
-                    ))
+                    ));
                 }
             },
             "exports" => match kinds.as_slice() {
@@ -456,7 +456,7 @@ pub(crate) fn resolve_func(module: ModuleKind, name: &str, args: &[Cond]) -> Res
                         "unsupported pe.exports() overload (only string name and \
                          integer ordinal forms are implemented; the regexp form \
                          is not)",
-                    ))
+                    ));
                 }
             },
             "section_index" if kinds.as_slice() == [ArgKind::Str] => FuncId::PeSectionIndexName,
diff --git a/crates/exav-core/src/yara/modules/pe.rs b/crates/exav-core/src/yara/modules/pe.rs
index ad22e9ce..8736845d 100644
--- a/crates/exav-core/src/yara/modules/pe.rs
+++ b/crates/exav-core/src/yara/modules/pe.rs
@@ -194,10 +194,7 @@ fn build_pe(_data: &[u8], pe: &goblin::pe::PE) -> (Value, PeExtra) {
         let dll = imp.dll.to_string();
         let entry = match imports.iter_mut().find(|(d, _)| *d == dll) {
             Some(e) => e,
-            None => {
-                imports.push((dll, Vec::new()));
-                imports.last_mut().unwrap()
-            }
+            None => imports.push_mut((dll, Vec::new())),
         };
         entry.1.push(ImpFunc {
             name: Some(imp.name.to_string()),
diff --git a/crates/exav-core/src/yara/scanner.rs b/crates/exav-core/src/yara/scanner.rs
index cf4a9010..bbfbc9d3 100644
--- a/crates/exav-core/src/yara/scanner.rs
+++ b/crates/exav-core/src/yara/scanner.rs
@@ -10,7 +10,7 @@ use crate::yara::atoms::PatternGate;
 use crate::yara::compiler::ExternalValue;
 use crate::yara::error::{Error, Result};
 use crate::yara::ir::{Cond, EvalCtx, Value};
-use crate::yara::matcher::{find_all_windowed, Match, PatternDef, PatternMatcher, StreamRegexes};
+use crate::yara::matcher::{Match, PatternDef, PatternMatcher, StreamRegexes, find_all_windowed};
 use crate::yara::modules::{ModuleCtx, ModuleKind};
 
 /// A compiled rule (internal representation).
@@ -293,7 +293,7 @@ impl<'r> Scanner<'r> {
                 .iter()
                 .zip(&results)
                 .enumerate()
-                .filter(|(_, (r, &res))| res && !r.private)
+                .filter(|&(_, (r, &res))| res && !r.private)
                 .map(|(i, _)| i)
                 .collect()
         } else {
@@ -401,7 +401,7 @@ impl<'a, 'r, 'd> Rule<'a, 'r, 'd> {
     }
 
     /// The rule's metadata entries as `(identifier, value-as-string)` pairs.
-    pub fn metadata(&self) -> impl Iterator<Item = (&'a str, &'a str)> {
+    pub fn metadata(&self) -> impl Iterator<Item = (&'a str, &'a str)> + use<'a> {
         self.res.rules.rules[self.idx]
             .meta
             .iter()
@@ -753,7 +753,9 @@ mod source_tests {
             .collect();
         assert_eq!(
             names,
-            ["literals", "b64", "hexes", "regexes", "counts", "reads", "maths", "hashes"]
+            [
+                "literals", "b64", "hexes", "regexes", "counts", "reads", "maths", "hashes"
+            ]
         );
     }
 
diff --git a/crates/exav-core/tests/fixtures/eicar.rpm.xor b/crates/exav-core/tests/fixtures/eicar.rpm.xor
new file mode 100644
index 00000000..d2931965
--- /dev/null
+++ b/crates/exav-core/tests/fixtures/eicar.rpm.xor
@@ -0,0 +1,3 @@
+��YZZZZ[2?665ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ[Z_ZZZZZZZZZZZZZZZZ���[ZZZZZZZ[ZZZ^ZZY�ZZZ]ZZZZZZZ^ZZZZZZZZ���[ZZZZZZZYZZZJZZY�ZZZ\ZZZZZZZ[ZZ^>ZZZ\ZZZ\ZZZ[ZZ^?ZZZ\ZZZQZZZ[2?665Z9*35Z= 3*ZE�RZZZZZX�ijmjmjn�Zj7;�28�GB�(W�Xܔj��$3+�$+8�$0�$0<(8�($tYY���8���9����������#�����9�4*����9�����=�=
+2�4�1*�����������LM�FY>eK.�[#�S�RS(^�D���R��[Z
��
+[ZZ
\ No newline at end of file
diff --git a/crates/exav-core/tests/fixtures/eicar.txt.lzma.xor b/crates/exav-core/tests/fixtures/eicar.txt.lzma.xor
new file mode 100644
index 00000000..61a18d47
Binary files /dev/null and b/crates/exav-core/tests/fixtures/eicar.txt.lzma.xor differ
diff --git a/crates/exav-core/tests/fixtures/fuzz/yara_nested_parens.yar b/crates/exav-core/tests/fixtures/fuzz/yara_nested_parens.yar
new file mode 100644
index 00000000..68cb702f
Binary files /dev/null and b/crates/exav-core/tests/fixtures/fuzz/yara_nested_parens.yar differ
diff --git a/crates/exav-core/tests/fixtures/fuzz/yara_nested_parens_12.yar b/crates/exav-core/tests/fixtures/fuzz/yara_nested_parens_12.yar
new file mode 100644
index 00000000..06a1564e
Binary files /dev/null and b/crates/exav-core/tests/fixtures/fuzz/yara_nested_parens_12.yar differ
diff --git a/crates/exav-core/tests/fixtures/upx_damaged.elf b/crates/exav-core/tests/fixtures/upx_damaged.elf
new file mode 100644
index 00000000..e4c3ea02
Binary files /dev/null and b/crates/exav-core/tests/fixtures/upx_damaged.elf differ
diff --git a/crates/exav-core/tests/fixtures/volumes/set4.r00 b/crates/exav-core/tests/fixtures/volumes/set4.r00
new file mode 100644
index 00000000..3cd62dcc
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/set4.r00 differ
diff --git a/crates/exav-core/tests/fixtures/volumes/set4.r01 b/crates/exav-core/tests/fixtures/volumes/set4.r01
new file mode 100644
index 00000000..a2f7ed66
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/set4.r01 differ
diff --git a/crates/exav-core/tests/fixtures/volumes/set4.rar b/crates/exav-core/tests/fixtures/volumes/set4.rar
new file mode 100644
index 00000000..a7a9a8a9
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/set4.rar differ
diff --git a/crates/exav-core/tests/fixtures/volumes/set5.part1.rar b/crates/exav-core/tests/fixtures/volumes/set5.part1.rar
new file mode 100644
index 00000000..b95cd62b
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/set5.part1.rar differ
diff --git a/crates/exav-core/tests/fixtures/volumes/set5.part2.rar b/crates/exav-core/tests/fixtures/volumes/set5.part2.rar
new file mode 100644
index 00000000..344e4d8c
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/set5.part2.rar differ
diff --git a/crates/exav-core/tests/fixtures/volumes/set5.part3.rar b/crates/exav-core/tests/fixtures/volumes/set5.part3.rar
new file mode 100644
index 00000000..dedba0a2
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/set5.part3.rar differ
diff --git a/crates/exav-core/tests/fixtures/volumes/split.z01 b/crates/exav-core/tests/fixtures/volumes/split.z01
new file mode 100644
index 00000000..24bd1033
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/split.z01 differ
diff --git a/crates/exav-core/tests/fixtures/volumes/split.zip b/crates/exav-core/tests/fixtures/volumes/split.zip
new file mode 100644
index 00000000..05bd7431
Binary files /dev/null and b/crates/exav-core/tests/fixtures/volumes/split.zip differ
diff --git a/crates/exav-core/tests/suites/allmatch_parity.rs b/crates/exav-core/tests/suites/allmatch_parity.rs
index b19ddac6..4b79b28a 100644
--- a/crates/exav-core/tests/suites/allmatch_parity.rs
+++ b/crates/exav-core/tests/suites/allmatch_parity.rs
@@ -15,7 +15,7 @@
 //!
 //! This test pins the invariant rather than the one bug.
 
-use exav_core::{analyze, analyze_all, loader, ScanOptions, Scanner};
+use exav_core::{ScanOptions, Scanner, analyze, analyze_all, loader};
 use std::io::Write;
 
 /// A macro-stream signature: `Target:2` (OLE2) with a literal body, the exact
diff --git a/crates/exav-core/tests/suites/authenticode.rs b/crates/exav-core/tests/suites/authenticode.rs
index 728c36c5..4a36920d 100644
--- a/crates/exav-core/tests/suites/authenticode.rs
+++ b/crates/exav-core/tests/suites/authenticode.rs
@@ -2,7 +2,7 @@
 //! embedded digest does not cover the file (tampered / appended-to after
 //! signing), and stays silent unless the flag is set.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn fixture(name: &str) -> Vec<u8> {
     let p = format!(
diff --git a/crates/exav-core/tests/suites/base64_scan.rs b/crates/exav-core/tests/suites/base64_scan.rs
index 1ac0ceaf..2c5ef3c7 100644
--- a/crates/exav-core/tests/suites/base64_scan.rs
+++ b/crates/exav-core/tests/suites/base64_scan.rs
@@ -3,7 +3,7 @@
 //! pattern) is detected when — and only when — `decode_base64` is on.
 
 use base64::Engine;
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 // The standard EICAR test string — the built-in DB carries a signature for it.
 // Assembled at runtime; see `exav_core::unpack::eicar` for why it is never a
@@ -91,3 +91,171 @@ fn base64_scan_off_leaves_it_clean() {
         "base64 scan disabled should leave the carrier clean"
     );
 }
+
+// ---- What the scan decodes, and what it says when it stops ------------------
+
+/// A decoy: it starts as an executable, so the scan decodes it, and it is none.
+fn decoy() -> Vec<u8> {
+    let mut d = vec![0u8; 2048];
+    d[0] = b'M';
+    d[1] = b'Z';
+    d
+}
+
+/// A PE that is valid and holds nothing.
+fn clean_pe() -> Vec<u8> {
+    let mut pe = vec![0u8; 2048];
+    pe[0] = b'M';
+    pe[1] = b'Z';
+    pe[0x3c..0x40].copy_from_slice(&0x40u32.to_le_bytes());
+    pe[0x40..0x44].copy_from_slice(b"PE\x00\x00");
+    pe
+}
+
+fn script_with_all(runs: &[Vec<u8>]) -> Vec<u8> {
+    let mut s = String::from("# dropper\r\n");
+    for (i, r) in runs.iter().enumerate() {
+        let b64 = base64::engine::general_purpose::STANDARD.encode(r);
+        s.push_str(&format!("$p{i} = \"{b64}\"\r\n"));
+    }
+    s.into_bytes()
+}
+
+fn verdict_of(blob: &[u8]) -> Verdict {
+    let eicar = eicar();
+    assert!(
+        !blob.windows(eicar.len()).any(|w| w == eicar),
+        "the string must not be in the file's bytes"
+    );
+    analyze(&Scanner::builtin(), blob, &ScanOptions::default()).verdict
+}
+
+fn limited(v: &Verdict) -> bool {
+    matches!(v, Verdict::LimitsExceeded { reason } if reason.contains("base64"))
+}
+
+#[test]
+fn a_payload_behind_many_decoys_is_found_or_the_scan_says_it_stopped() {
+    let payload = eicar_pe();
+    // Within the number of runs it tries.
+    let mut runs = vec![decoy(); 20];
+    runs.push(payload.clone());
+    assert!(matches!(
+        verdict_of(&script_with_all(&runs)),
+        Verdict::Infected { .. }
+    ));
+    // Past it: not a clean file.
+    let mut runs = vec![decoy(); 80];
+    runs.push(payload);
+    let v = verdict_of(&script_with_all(&runs));
+    assert!(limited(&v), "{v:?}");
+}
+
+#[test]
+fn a_payload_behind_many_executables_is_found_or_the_scan_says_it_stopped() {
+    let payload = eicar_pe();
+    let mut runs = vec![clean_pe(); 5];
+    runs.push(payload.clone());
+    assert!(matches!(
+        verdict_of(&script_with_all(&runs)),
+        Verdict::Infected { .. }
+    ));
+    let mut runs = vec![clean_pe(); 12];
+    runs.push(payload);
+    let v = verdict_of(&script_with_all(&runs));
+    assert!(limited(&v), "{v:?}");
+}
+
+#[test]
+fn a_script_behind_a_long_run_of_high_bytes_is_still_read_as_text() {
+    let mut blob = vec![0xE9u8; 4000];
+    blob.extend_from_slice(b"\r\n");
+    blob.extend_from_slice(&script_with_base64(&eicar_pe()));
+    // Text over most of the file, and bytes over the start of it.
+    let mut long = blob.clone();
+    long.extend_from_slice(&vec![b'#'; 20000]);
+    assert!(
+        matches!(verdict_of(&long), Verdict::Infected { .. }),
+        "{:?}",
+        verdict_of(&long)
+    );
+}
+
+/// A ZIP with a member of deflated EICAR and a member of bytes that do not
+/// compress, which is also how it comes to be long enough for the scan to read.
+fn zip_with_payload() -> Vec<u8> {
+    use std::io::Write;
+    let deflated = zip::write::SimpleFileOptions::default()
+        .compression_method(zip::CompressionMethod::Deflated);
+    let stored =
+        zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    z.start_file("e.com", deflated).unwrap();
+    z.write_all(&[eicar(), b"\n"].concat().repeat(40)).unwrap();
+    z.start_file("pad.bin", stored).unwrap();
+    let mut x = 0x2545_f491u32;
+    let pad: Vec<u8> = (0..1500)
+        .map(|_| {
+            x ^= x << 13;
+            x ^= x >> 17;
+            x ^= x << 5;
+            x as u8
+        })
+        .collect();
+    z.write_all(&pad).unwrap();
+    z.finish().unwrap().into_inner()
+}
+
+#[test]
+fn a_zip_in_base64_in_a_script_is_opened() {
+    let b64 = base64::engine::general_purpose::STANDARD.encode(zip_with_payload());
+    let blob = format!("var z = atob(\"{b64}\");\r\nsave(z, 'invoice.zip');\r\n").into_bytes();
+    assert!(
+        matches!(verdict_of(&blob), Verdict::Infected { .. }),
+        "{:?}",
+        verdict_of(&blob)
+    );
+}
+
+#[test]
+fn a_zip_in_a_data_uri_of_a_page_is_opened() {
+    let b64 = base64::engine::general_purpose::STANDARD.encode(zip_with_payload());
+    let blob = format!(
+        "<html><body><a download=\"invoice.zip\" href=\"data:application/zip;base64,{b64}\">invoice</a></body></html>"
+    )
+    .into_bytes();
+    assert!(
+        matches!(verdict_of(&blob), Verdict::Infected { .. }),
+        "{:?}",
+        verdict_of(&blob)
+    );
+}
+
+#[test]
+fn a_run_that_only_starts_like_a_zip_is_not_an_archive() {
+    // PK\x03\x04 and noise: a coincidence of four bytes must not make a file
+    // that fails to open.
+    let mut noise = b"PK\x03\x04".to_vec();
+    noise.resize(2000, 0x41);
+    let b64 = base64::engine::general_purpose::STANDARD.encode(&noise);
+    let blob = format!("var z = \"{b64}\";\r\n").into_bytes();
+    assert!(
+        matches!(verdict_of(&blob), Verdict::Clean),
+        "{:?}",
+        verdict_of(&blob)
+    );
+}
+
+#[test]
+fn a_small_script_behind_a_block_of_high_bytes_is_read_as_text() {
+    // Under one sample, and a fifth of it bytes that are not text.
+    let mut blob = vec![0xE9u8; 500];
+    blob.extend_from_slice(b"\r\n");
+    blob.extend_from_slice(&script_with_base64(&eicar_pe()));
+    assert!(blob.len() < 8192);
+    assert!(
+        matches!(verdict_of(&blob), Verdict::Infected { .. }),
+        "{:?}",
+        verdict_of(&blob)
+    );
+}
diff --git a/crates/exav-core/tests/suites/broken_executable.rs b/crates/exav-core/tests/suites/broken_executable.rs
index c5fd00d3..b850115e 100644
--- a/crates/exav-core/tests/suites/broken_executable.rs
+++ b/crates/exav-core/tests/suites/broken_executable.rs
@@ -12,7 +12,7 @@
 //! `.so` with junk section headers. Meanwhile PEs whose alignment or section
 //! layout no loader accepts parsed fine and passed.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 
 fn empty_db() -> Scanner {
     let mut l = loader::Builder::new();
diff --git a/crates/exav-core/tests/suites/bytecode_gating.rs b/crates/exav-core/tests/suites/bytecode_gating.rs
index 58460acb..fa0cd6ec 100644
--- a/crates/exav-core/tests/suites/bytecode_gating.rs
+++ b/crates/exav-core/tests/suites/bytecode_gating.rs
@@ -5,7 +5,7 @@
 
 use exav_core::bytecode::runtime::BytecodeRuntime;
 use exav_core::filetype::FileType;
-use exav_core::{analyze, analyze_all, ScanOptions, Verdict};
+use exav_core::{ScanOptions, Verdict, analyze, analyze_all};
 
 const HEADER_MAGIC: u64 = 0x53e5_493e_9f3d_1c30;
 
@@ -91,7 +91,7 @@ fn synth_cbc_when(name: &str, marker: &[u8], attrs: &str) -> String {
     b.push(nib(2)); // opcode hi nibble
     b.push(nib(0)); // numOps = fixed(1) 0
     b.push_str(&num(5)); // funcid number (decoded = 5-1 = 4 -> global id 5)
-                         // terminator: ret_void (opcode 20 = 0x14).
+    // terminator: ret_void (opcode 20 = 0x14).
     b.push('T');
     b.push(nib(4));
     b.push(nib(1));
diff --git a/crates/exav-core/tests/suites/cdb_stream.rs b/crates/exav-core/tests/suites/cdb_stream.rs
index e0c8b526..589cd219 100644
--- a/crates/exav-core/tests/suites/cdb_stream.rs
+++ b/crates/exav-core/tests/suites/cdb_stream.rs
@@ -5,7 +5,7 @@
 //! no CDB matching, so these detections were silently missed. It also exercises
 //! the 1-based `FilePos` semantics (ClamAV counts members from 1).
 
-use exav_core::{loader, scan_seekable, ScanOptions, Verdict};
+use exav_core::{ScanOptions, Verdict, loader, scan_seekable};
 use std::io::Cursor;
 
 fn db_with_dualext() -> exav_core::Scanner {
diff --git a/crates/exav-core/tests/suites/checksum_mismatch.rs b/crates/exav-core/tests/suites/checksum_mismatch.rs
index ba002bab..7f46b96a 100644
--- a/crates/exav-core/tests/suites/checksum_mismatch.rs
+++ b/crates/exav-core/tests/suites/checksum_mismatch.rs
@@ -10,7 +10,7 @@
 //! written by RAR and zoo. EICAR is compressed in every one, so it is found
 //! only in the decoded member, never in the archive's own bytes.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 enum Want {
diff --git a/crates/exav-core/tests/suites/cut_short_members.rs b/crates/exav-core/tests/suites/cut_short_members.rs
index 730ddd4d..8e24d294 100644
--- a/crates/exav-core/tests/suites/cut_short_members.rs
+++ b/crates/exav-core/tests/suites/cut_short_members.rs
@@ -14,7 +14,7 @@
 
 use std::io::{Read, Write};
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 #[derive(Clone, Copy, Debug)]
 enum Want {
diff --git a/crates/exav-core/tests/suites/embedded_carve.rs b/crates/exav-core/tests/suites/embedded_carve.rs
index 0331c0f5..ae88d511 100644
--- a/crates/exav-core/tests/suites/embedded_carve.rs
+++ b/crates/exav-core/tests/suites/embedded_carve.rs
@@ -2,7 +2,7 @@
 //! dropper — must be carved and scanned. The normal scan only types offset 0, so
 //! without embedded-archive carving the payload in the overlay is invisible.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 use std::io::Write;
 
 /// A text carrier holding `n` copies of `item`, each after some filler, so no
@@ -110,6 +110,80 @@ fn appended_overlay_zip_is_carved_and_scanned() {
     }
 }
 
+/// A zip of a few hundred entries stapled into a document is one archive, not
+/// one per entry: it is scanned once and does not trip the carving cap.
+#[test]
+fn a_zip_of_many_entries_stapled_into_a_document_is_clean() {
+    let stored =
+        zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    for k in 0..300 {
+        z.start_file(format!("entry{k}.txt"), stored).unwrap();
+        z.write_all(b"nothing to see here").unwrap();
+    }
+    let z = z.finish().unwrap().into_inner();
+    let mut doc = b"a document with a zip stapled inside it\n".to_vec();
+    doc.extend_from_slice(&z);
+    doc.extend_from_slice(&[b'.'; 100]);
+    assert_eq!(verdict(&doc), Verdict::Clean);
+}
+
+/// A zip whose first header names a size that lands on a second archive does
+/// not hide that archive: the first one's walk reaches every local header
+/// after its own, whether the second sits inside the first one's span (before
+/// its central directory) or after its end.
+#[test]
+fn a_second_zip_at_the_offset_the_first_one_names_is_still_found() {
+    let eicar = exav_core::unpack::eicar();
+    let deflated = zip::write::SimpleFileOptions::default()
+        .compression_method(zip::CompressionMethod::Deflated);
+    let mut x = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    x.start_file("p.txt", deflated).unwrap();
+    x.write_all(&[eicar, b"\n"].concat().repeat(64)).unwrap();
+    let x = x.finish().unwrap().into_inner();
+    assert!(!x.windows(eicar.len()).any(|w| w == eicar));
+
+    // A: one stored entry "a.txt", then `middle`, then its directory.
+    let a = |middle: &[u8]| {
+        let data = b"hello";
+        let mut crc = flate2::Crc::new();
+        crc.update(data);
+        let mut out = b"PK\x03\x04\x14\0\0\0\0\0\0\0\x21\0".to_vec();
+        out.extend_from_slice(&crc.sum().to_le_bytes());
+        out.extend_from_slice(&[5, 0, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0]);
+        out.extend_from_slice(b"a.txt");
+        out.extend_from_slice(data);
+        let cd_at = out.len() + middle.len();
+        out.extend_from_slice(middle);
+        let cd = out.len();
+        out.extend_from_slice(b"PK\x01\x02\x14\0\x14\0\0\0\0\0\0\0\x21\0");
+        out.extend_from_slice(&crc.sum().to_le_bytes());
+        // Sizes, name length 5, then the extra, comment, disk, attribute and
+        // local header offset fields, all zero.
+        out.extend_from_slice(&[5, 0, 0, 0, 5, 0, 0, 0, 5, 0]);
+        out.extend_from_slice(&[0; 16]);
+        out.extend_from_slice(b"a.txt");
+        let size = (out.len() - cd) as u32;
+        out.extend_from_slice(b"PK\x05\x06\0\0\0\0\x01\0\x01\0");
+        out.extend_from_slice(&size.to_le_bytes());
+        out.extend_from_slice(&(cd_at as u32).to_le_bytes());
+        out.extend_from_slice(&[0, 0]);
+        out
+    };
+    for (what, zip) in [("inside", a(&x)), ("after", [a(b""), x.clone()].concat())] {
+        let mut doc = b"a document with two zips stapled inside it\n".to_vec();
+        doc.extend_from_slice(&zip);
+        doc.extend_from_slice(&[b'.'; 100]);
+        match verdict(&doc) {
+            Verdict::Infected { signature, .. } => assert!(
+                signature.to_ascii_uppercase().contains("EICAR"),
+                "{what}: unexpected signature {signature}"
+            ),
+            other => panic!("{what}: EICAR in the second zip must be found, got {other:?}"),
+        }
+    }
+}
+
 /// An executable in an OLE2 file is also carved from the file's own bytes and
 /// scanned to the end of the file, as ClamAV carves it: a PE-only signature on
 /// bytes of a later stream matches, which carving inside the executable's own
@@ -147,3 +221,46 @@ fn an_ole2_file_is_carved_from_its_own_bytes() {
         other => panic!("expected the carved executable to match, got {other:?}"),
     }
 }
+
+/// A carved executable that cannot be read whole is a finding of its own, but
+/// not the end of the scan: an archive stapled before it is still opened. Else a
+/// damaged decoy after a payload turns `FOUND` into `PARTIAL`, or into `OK`
+/// under `--partial-as ok`.
+#[test]
+fn a_damaged_executable_in_a_carrier_does_not_hide_the_archive_with_the_payload() {
+    // `upx_nrv2d.upx` with five bytes of its compressed data changed.
+    let decoy = include_bytes!("../fixtures/upx_damaged.elf");
+    let mut zip = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    let deflated = zip::write::SimpleFileOptions::default()
+        .compression_method(zip::CompressionMethod::Deflated);
+    zip.start_file("e.com", deflated).unwrap();
+    // Repetitive, so the compressor codes it and the string is not in the bytes.
+    zip.write_all(&[exav_core::unpack::eicar(), b"\n"].concat().repeat(64))
+        .unwrap();
+    let zip = zip.finish().unwrap().into_inner();
+    let eicar = exav_core::unpack::eicar();
+    assert!(
+        !zip.windows(eicar.len()).any(|w| w == eicar),
+        "the string must not be in the archive's bytes"
+    );
+
+    let mut stub = b"MZ".to_vec();
+    stub.resize(62, 0);
+    let control = [stub.as_slice(), &zip].concat();
+    assert!(
+        matches!(verdict(&control), Verdict::Infected { .. }),
+        "the premise"
+    );
+    let alone = [stub.as_slice(), decoy.as_slice()].concat();
+    assert!(
+        matches!(verdict(&alone), Verdict::Unscannable { .. }),
+        "the decoy must not unpack"
+    );
+    let both = [stub.as_slice(), &zip, decoy.as_slice()].concat();
+    match verdict(&both) {
+        Verdict::Infected { .. } => {}
+        other => {
+            panic!("the archive before a damaged executable must still be found, got {other:?}")
+        }
+    }
+}
diff --git a/crates/exav-core/tests/suites/encrypted_archives.rs b/crates/exav-core/tests/suites/encrypted_archives.rs
index da232959..e9961235 100644
--- a/crates/exav-core/tests/suites/encrypted_archives.rs
+++ b/crates/exav-core/tests/suites/encrypted_archives.rs
@@ -11,7 +11,7 @@
 //! With the password the inner EICAR is FOUND (`Infected`); without it the scan
 //! is `PasswordProtected` — never `Clean`, never `Infected`.
 
-use exav_core::{analyze, loader, ScanOptions, Verdict};
+use exav_core::{ScanOptions, Verdict, analyze, loader};
 
 fn builtin_db() -> exav_core::Scanner {
     // The built-in DB carries the EICAR signature, which is all we need.
diff --git a/crates/exav-core/tests/suites/exec_offsets.rs b/crates/exav-core/tests/suites/exec_offsets.rs
new file mode 100644
index 00000000..b44c5db0
--- /dev/null
+++ b/crates/exav-core/tests/suites/exec_offsets.rs
@@ -0,0 +1,370 @@
+//! `EP`, `Sn`, `SL` and `SEn` offsets on ELF (`Target:6`) and Mach-O
+//! (`Target:9`) files.
+//!
+//! Until a layout was read from their headers these offsets matched nothing
+//! there: a signature anchored at an ELF's entry point was in the database, the
+//! file was that ELF, and the scan said `OK`.
+//!
+//! The expectations are clamscan 1.4.3's, measured one signature at a time on
+//! a gcc-built ELF and on hand-built Mach-O files, each offset with a control
+//! (the same bytes at an offset wrong by three, which must not fire):
+//!
+//! * ELF `EP`: the entry point's file offset, through the loadable segment
+//!   whose memory image holds it, the `.bss` part included; nothing past it,
+//!   nothing for another file type.
+//! * ELF and Mach-O `Sn`: section `n`'s file offset, counted from the null
+//!   section 0 (ELF) or over the segments in load order (Mach-O); `SL` the last.
+//! * `SEn`: the match starts inside section `n`, its end included.
+//! * Mach-O `EP`: never resolved (`LC_MAIN` and `LC_UNIXTHREAD`, both widths).
+
+use exav_core::{ScanOptions, Verdict, analyze, loader};
+
+/// 64 bytes of distinct content for a section: `seed` and the position.
+fn block(seed: u8) -> Vec<u8> {
+    (0..64u32)
+        .map(|j| ((u32::from(seed) * 61 + j * 7 + 13) % 251 + 1) as u8)
+        .collect()
+}
+
+fn put(v: &mut Vec<u8>, at: usize, bytes: &[u8]) {
+    if v.len() < at + bytes.len() {
+        v.resize(at + bytes.len(), 0);
+    }
+    v[at..at + bytes.len()].copy_from_slice(bytes);
+}
+
+/// Bytes of an integer field of `width` bytes in the file's order.
+fn int(v: u64, width: usize, be: bool) -> Vec<u8> {
+    let mut b = v.to_le_bytes()[..width].to_vec();
+    if be {
+        b.reverse();
+    }
+    b
+}
+
+/// An ELF with a null section, `.text`, `.rodata`, `.data` and a `.bss`:
+/// two loadable segments, the second at a virtual address that is not its file
+/// offset plus the first's, and with memory past its bytes. Returns the file,
+/// and the file offsets of the sections' contents.
+fn elf(wide: bool, be: bool, entry: u64) -> Vec<u8> {
+    let w = if wide { 8 } else { 4 };
+    let (ehsize, phsize, shsize) = if wide { (64, 56, 64) } else { (52, 32, 40) };
+    let mut f = vec![0u8; 0x600];
+    put(&mut f, 0, b"\x7fELF");
+    f[4] = if wide { 2 } else { 1 };
+    f[5] = if be { 2 } else { 1 };
+    f[6] = 1;
+    let mut at = 16;
+    for (v, n) in [(2u64, 2), (62, 2), (1, 4)] {
+        put(&mut f, at, &int(v, n, be));
+        at += n;
+    }
+    let (phoff, shoff) = (ehsize as u64, 0x400u64);
+    for v in [entry, phoff, shoff] {
+        put(&mut f, at, &int(v, w, be));
+        at += w;
+    }
+    put(&mut f, at, &int(0, 4, be)); // e_flags
+    at += 4;
+    for v in [ehsize as u64, phsize as u64, 2, shsize as u64, 5, 0] {
+        put(&mut f, at, &int(v, 2, be));
+        at += 2;
+    }
+    // Program headers: (type, offset, vaddr, filesz, memsz).
+    let segments = [
+        (1u64, 0u64, 0x10000u64, 0x300u64, 0x300u64),
+        (1, 0x300, 0x30000, 0x40, 0x80),
+    ];
+    for (i, (kind, offset, vaddr, filesz, memsz)) in segments.iter().enumerate() {
+        let p = ehsize + i * phsize;
+        put(&mut f, p, &int(*kind, 4, be));
+        if wide {
+            for (off, v) in [
+                (8, offset),
+                (16, vaddr),
+                (24, vaddr),
+                (32, filesz),
+                (40, memsz),
+            ] {
+                put(&mut f, p + off, &int(*v, 8, be));
+            }
+        } else {
+            for (off, v) in [
+                (4, offset),
+                (8, vaddr),
+                (12, vaddr),
+                (16, filesz),
+                (20, memsz),
+            ] {
+                put(&mut f, p + off, &int(*v, 4, be));
+            }
+        }
+    }
+    // Section contents, then the section headers: (type, offset, size).
+    for (i, off) in [0x200usize, 0x240, 0x300].iter().enumerate() {
+        put(&mut f, *off, &block(i as u8));
+    }
+    // What follows `.rodata`, which is not in it, and what the file holds
+    // where the `.bss` would be, so that a wrong offset reads other bytes.
+    put(&mut f, 0x280, &block(9)[..32]);
+    put(&mut f, 0x340, &block(7));
+    let sections = [
+        (0u64, 0u64, 0u64),
+        (1, 0x200, 0x40),
+        (1, 0x240, 0x40),
+        (1, 0x300, 0x40),
+        (8, 0x340, 0x40),
+    ];
+    for (i, (kind, offset, size)) in sections.iter().enumerate() {
+        let s = shoff as usize + i * shsize;
+        put(&mut f, s + 4, &int(*kind, 4, be));
+        let (off_at, size_at) = if wide { (24, 32) } else { (16, 20) };
+        put(&mut f, s + off_at, &int(*offset, w, be));
+        put(&mut f, s + size_at, &int(*size, w, be));
+    }
+    f
+}
+
+/// A Mach-O with `__text` and `__cstring` in `__TEXT`, `__data` in `__DATA`,
+/// and an `LC_MAIN` whose entry is at 0x210.
+fn macho(wide: bool, be: bool) -> Vec<u8> {
+    let (seg_cmd, seg_head, sect_len, sect_fields) = if wide {
+        (0x19u64, 72usize, 80usize, 8usize)
+    } else {
+        (0x1, 56, 68, 4)
+    };
+    let sections = [
+        ("__text", "__TEXT", 0x200u64),
+        ("__cstring", "__TEXT", 0x240),
+        ("__data", "__DATA", 0x280),
+    ];
+    let mut cmds = Vec::new();
+    for (segname, group) in [("__TEXT", &sections[..2]), ("__DATA", &sections[2..])] {
+        let size = seg_head + group.len() * sect_len;
+        let mut c = vec![0u8; size];
+        put(&mut c, 0, &int(seg_cmd, 4, be));
+        put(&mut c, 4, &int(size as u64, 4, be));
+        put(&mut c, 8, segname.as_bytes());
+        let nsects_at = if wide { 64 } else { 48 };
+        put(&mut c, nsects_at, &int(group.len() as u64, 4, be));
+        for (i, (name, seg, offset)) in group.iter().enumerate() {
+            let s = seg_head + i * sect_len;
+            put(&mut c, s, name.as_bytes());
+            put(&mut c, s + 16, seg.as_bytes());
+            put(
+                &mut c,
+                s + 32,
+                &int(0x1_0000_0000 + offset, sect_fields, be),
+            );
+            put(&mut c, s + 32 + sect_fields, &int(0x40, sect_fields, be));
+            put(&mut c, s + 32 + 2 * sect_fields, &int(*offset, 4, be));
+        }
+        cmds.extend(c);
+    }
+    let mut main = vec![0u8; 24];
+    put(&mut main, 0, &int(0x8000_0028, 4, be));
+    put(&mut main, 4, &int(24, 4, be));
+    put(&mut main, 8, &int(0x210, 8, be));
+    cmds.extend(main);
+    let header = if wide { 32 } else { 28 };
+    let mut f = vec![0u8; 0x300];
+    let magic: [u8; 4] = match (wide, be) {
+        (true, false) => [0xCF, 0xFA, 0xED, 0xFE],
+        (false, false) => [0xCE, 0xFA, 0xED, 0xFE],
+        (true, true) => [0xFE, 0xED, 0xFA, 0xCF],
+        (false, true) => [0xFE, 0xED, 0xFA, 0xCE],
+    };
+    put(&mut f, 0, &magic);
+    put(&mut f, 4, &int(if wide { 0x0100_000c } else { 7 }, 4, be));
+    put(&mut f, 12, &int(2, 4, be));
+    put(&mut f, 16, &int(3, 4, be));
+    put(&mut f, 20, &int(cmds.len() as u64, 4, be));
+    put(&mut f, header, &cmds);
+    for (i, (_, _, offset)) in sections.iter().enumerate() {
+        put(&mut f, *offset as usize, &block(i as u8));
+    }
+    f
+}
+
+fn hex(b: &[u8]) -> String {
+    b.iter().map(|x| format!("{x:02x}")).collect()
+}
+
+/// The names of the signatures among `lines` (`name:target:offset:bytes`)
+/// that fire on `file`, all of them listed.
+fn fired(file: &[u8], lines: &[(&str, &str, &str, &[u8])]) -> Vec<String> {
+    let mut found = Vec::new();
+    // One signature a database: a first-match scan would stop at the first.
+    for (name, target, offset, bytes) in lines {
+        let mut b = loader::Builder::new();
+        b.add_named_bytes(
+            "t.ndb",
+            format!("{name}:{target}:{offset}:{}\n", hex(bytes)).as_bytes(),
+            true,
+        );
+        let Ok(db) = b.build() else {
+            continue;
+        };
+        if matches!(
+            analyze(&db, file, &ScanOptions::default()).verdict,
+            Verdict::Infected { .. }
+        ) {
+            found.push((*name).to_string());
+        }
+    }
+    found
+}
+
+fn names(v: &[&str]) -> Vec<String> {
+    v.iter().map(|s| (*s).to_string()).collect()
+}
+
+#[test]
+fn an_elf_resolves_its_entry_point_and_its_sections_in_every_class_and_order() {
+    for (wide, be) in [(true, false), (false, false), (true, true), (false, true)] {
+        let f = elf(wide, be, 0x10210);
+        let at = |o: usize| f[o..o + 12].to_vec();
+        let got = fired(
+            &f,
+            &[
+                ("EP", "6", "EP+0", &at(0x210)),
+                ("EPwrong", "6", "EP+3", &at(0x210)),
+                ("EPelsewhere", "6", "EP+0", &at(0x200)),
+                ("S0", "6", "S0+0", &at(0)),
+                ("S1", "6", "S1+0", &at(0x200)),
+                ("S1wrong", "6", "S1+3", &at(0x200)),
+                ("S2", "6", "S2+0", &at(0x240)),
+                ("S3", "6", "S3+0", &at(0x300)),
+                ("S3wrong", "6", "S3+3", &at(0x300)),
+                ("S4", "6", "S4+0", &at(0x340)),
+                ("S5none", "6", "S5+0", &at(0x200)),
+                ("SL", "6", "SL+0", &at(0x340)),
+                ("SLwrong", "6", "SL+3", &at(0x340)),
+                // Another file type's target.
+                ("EPasPe", "1", "EP+0", &at(0x210)),
+            ],
+        );
+        assert_eq!(
+            got,
+            names(&["EP", "S0", "S1", "S2", "S3", "S4", "SL"]),
+            "wide {wide} big-endian {be}"
+        );
+    }
+}
+
+#[test]
+fn an_elf_entry_point_is_found_through_the_segment_that_maps_it() {
+    // In the second segment, whose address is not its offset plus the first's.
+    let f = elf(true, false, 0x30010);
+    let sig = |o: usize| f[o..o + 12].to_vec();
+    assert_eq!(
+        fired(
+            &f,
+            &[
+                ("EP", "6", "EP+0", &sig(0x310)),
+                ("EPasAddr", "6", "EP+0", &sig(0x10)),
+                ("EPwrong", "6", "EP+3", &sig(0x310))
+            ]
+        ),
+        names(&["EP"])
+    );
+    // In the memory past the segment's bytes, which has an offset all the same.
+    let f = elf(true, false, 0x30050);
+    assert_eq!(
+        fired(&f, &[("EP", "6", "EP+0", &f[0x350..0x35c])]),
+        names(&["EP"])
+    );
+    // Past the segment's memory, in none.
+    let f = elf(true, false, 0x30080);
+    assert_eq!(
+        fired(
+            &f,
+            &[
+                ("EP", "6", "EP+0", &f[0x380..0x38c]),
+                ("EP0", "6", "EP+0", &f[0..12])
+            ]
+        ),
+        Vec::<String>::new()
+    );
+}
+
+#[test]
+fn se_means_a_start_inside_the_section_its_end_included() {
+    let f = elf(true, false, 0x10210);
+    // `.rodata` is 0x240..0x280.
+    let got = fired(
+        &f,
+        &[
+            ("inside", "6", "SE2", &f[0x244..0x24a]),
+            ("first", "6", "SE2", &f[0x240..0x246]),
+            ("lastByteRunningOut", "6", "SE2", &f[0x27e..0x286]),
+            ("atTheEnd", "6", "SE2", &f[0x280..0x288]),
+            ("inTheNextOne", "6", "SE2", &f[0x304..0x30a]),
+            ("inThePrevious", "6", "SE2", &f[0x204..0x20a]),
+        ],
+    );
+    assert_eq!(
+        got,
+        names(&["inside", "first", "lastByteRunningOut", "atTheEnd"])
+    );
+}
+
+#[test]
+fn a_macho_resolves_its_sections_in_load_order_and_never_its_entry_point() {
+    for (wide, be) in [(true, false), (false, false), (true, true), (false, true)] {
+        let f = macho(wide, be);
+        let at = |o: usize| f[o..o + 8].to_vec();
+        let got = fired(
+            &f,
+            &[
+                ("S0", "9", "S0+0", &at(0x200)),
+                ("S0wrong", "9", "S0+3", &at(0x200)),
+                ("S1", "9", "S1+0", &at(0x240)),
+                ("S2", "9", "S2+0", &at(0x280)),
+                ("S3none", "9", "S3+0", &at(0x280)),
+                ("SL", "9", "SL+0", &at(0x280)),
+                ("SLwrong", "9", "SL+3", &at(0x280)),
+                ("SE1", "9", "SE1", &f[0x244..0x24a]),
+                ("SE1elsewhere", "9", "SE1", &f[0x284..0x28a]),
+                ("EP", "9", "EP+0", &at(0x210)),
+            ],
+        );
+        assert_eq!(
+            got,
+            names(&["S0", "S1", "S2", "SL", "SE1"]),
+            "wide {wide} big-endian {be}"
+        );
+    }
+}
+
+#[test]
+fn headers_that_lie_give_no_layout_and_no_panic() {
+    let elf = elf(true, false, 0x10210);
+    let macho = macho(true, false);
+    for file in [&elf, &macho] {
+        // Every field at its extremes, 4 bytes at a time, and the file cut short.
+        for at in (0..file.len().min(0x120)).step_by(4) {
+            for v in [0xFFFF_FFFFu32, 0x8000_0000, 0x7FFF_FFFF, 0] {
+                let mut f = file.clone();
+                f[at..at + 4].copy_from_slice(&v.to_le_bytes());
+                let _ = fired(
+                    &f,
+                    &[
+                        ("S1", "6", "S1+0", &[1, 2, 3, 4]),
+                        ("S1m", "9", "S1+0", &[1, 2, 3, 4]),
+                        ("EP", "6", "EP+0", &[1, 2, 3, 4]),
+                    ],
+                );
+            }
+        }
+        for cut in (0..file.len()).step_by(37) {
+            let _ = fired(
+                &file[..cut],
+                &[
+                    ("SL", "6", "SL+0", &[1, 2, 3, 4]),
+                    ("SLm", "9", "SL+0", &[1, 2, 3, 4]),
+                ],
+            );
+        }
+    }
+}
diff --git a/crates/exav-core/tests/suites/format_registry.rs b/crates/exav-core/tests/suites/format_registry.rs
new file mode 100644
index 00000000..4cd403c9
--- /dev/null
+++ b/crates/exav-core/tests/suites/format_registry.rs
@@ -0,0 +1,82 @@
+//! The scanner's detection against the format registry (`formats/registry.json`,
+//! checked against the rest of the code by `scripts/formats.mjs`): the magic
+//! bytes the registry gives a format, written into an otherwise empty buffer,
+//! are typed as the format's scanner type.
+
+use exav_core::filetype::identify;
+
+fn registry() -> serde_json::Value {
+    let path = concat!(env!("CARGO_MANIFEST_DIR"), "/../../formats/registry.json");
+    serde_json::from_str(&std::fs::read_to_string(path).expect("formats/registry.json")).unwrap()
+}
+
+fn hex(s: &str) -> Vec<u8> {
+    (0..s.len())
+        .step_by(2)
+        .map(|i| u8::from_str_radix(&s[i..i + 2], 16).unwrap())
+        .collect()
+}
+
+/// A buffer holding `conditions` (`offset:hex`) and zeros elsewhere.
+fn buffer(conditions: &[&str]) -> Vec<u8> {
+    let parts: Vec<(usize, Vec<u8>)> = conditions
+        .iter()
+        .map(|c| {
+            let (offset, bytes) = c.split_once(':').unwrap();
+            (offset.parse().unwrap(), hex(bytes))
+        })
+        .collect();
+    let end = parts.iter().map(|(o, b)| o + b.len()).max().unwrap();
+    let mut buf = vec![0u8; end.max(1024)];
+    for (offset, bytes) in parts {
+        buf[offset..offset + bytes.len()].copy_from_slice(&bytes);
+    }
+    buf
+}
+
+#[test]
+fn the_magic_of_a_format_is_typed_as_that_format() {
+    let registry = registry();
+    let mut checked = 0;
+    let mut skipped = 0;
+    let mut wrong = Vec::new();
+    for f in registry["formats"].as_array().unwrap() {
+        let scan = &f["scan"];
+        let Some(want) = scan["type"].as_str() else {
+            continue;
+        };
+        if !matches!(scan["mode"].as_str(), Some("container" | "reported")) {
+            continue;
+        }
+        let id = f["id"].as_str().unwrap();
+        // A format the scanner types only when more than the magic holds (a
+        // header's checksum, a structure that parses) says so in the registry.
+        if scan.get("needs").is_some() {
+            skipped += 1;
+            continue;
+        }
+        for alt in f["magic"].as_array().into_iter().flatten() {
+            let conditions: Vec<&str> = alt
+                .as_array()
+                .unwrap()
+                .iter()
+                .map(|c| c.as_str().unwrap())
+                .collect();
+            let got = identify(&buffer(&conditions)).as_str();
+            checked += 1;
+            if got != want {
+                wrong.push(format!(
+                    "{id} {conditions:?}: typed {got}, the registry says {want}"
+                ));
+            }
+        }
+    }
+    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
+    assert!(checked > 20, "only {checked} magics were checked");
+    assert!(skipped <= 3, "{skipped} formats are excused from the check");
+}
+
+#[test]
+fn a_buffer_with_no_magic_of_the_registry_is_data() {
+    assert_eq!(identify(&vec![0u8; 4096]).as_str(), "data");
+}
diff --git a/crates/exav-core/tests/suites/fuzzy_img_formats.rs b/crates/exav-core/tests/suites/fuzzy_img_formats.rs
index 10b5ac78..fdc7b93b 100644
--- a/crates/exav-core/tests/suites/fuzzy_img_formats.rs
+++ b/crates/exav-core/tests/suites/fuzzy_img_formats.rs
@@ -10,7 +10,7 @@
 //! the same segments reordered. The hashes are what `sigtool --fuzzy-img`
 //! (ClamAV 1.4.3) prints for the two PNGs.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 
 fn fixture(name: &str) -> Vec<u8> {
     let path = format!(
diff --git a/crates/exav-core/tests/suites/heuristic_alerts.rs b/crates/exav-core/tests/suites/heuristic_alerts.rs
index b33b3906..b7eb6990 100644
--- a/crates/exav-core/tests/suites/heuristic_alerts.rs
+++ b/crates/exav-core/tests/suites/heuristic_alerts.rs
@@ -16,7 +16,7 @@
 
 use std::io::Write;
 
-use exav_core::{analyze, Method, ScanOptions, Scanner, Verdict};
+use exav_core::{Method, ScanOptions, Scanner, Verdict, analyze};
 
 fn builtin_db() -> Scanner {
     // The built-in DB carries only the EICAR signature; the heuristics under
diff --git a/crates/exav-core/tests/suites/heuristic_names.rs b/crates/exav-core/tests/suites/heuristic_names.rs
index 8e20610e..36d7ed77 100644
--- a/crates/exav-core/tests/suites/heuristic_names.rs
+++ b/crates/exav-core/tests/suites/heuristic_names.rs
@@ -16,7 +16,7 @@
 //! Both were found by enumerating ClamAV's emitted names rather than by reading
 //! exav, which is the only way this class of bug shows up.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 use std::io::Write;
 
 fn empty_db() -> Scanner {
diff --git a/crates/exav-core/tests/suites/limits_alerts.rs b/crates/exav-core/tests/suites/limits_alerts.rs
index 87f71f1e..ea4102ae 100644
--- a/crates/exav-core/tests/suites/limits_alerts.rs
+++ b/crates/exav-core/tests/suites/limits_alerts.rs
@@ -14,7 +14,7 @@
 //! detection name from prose is how a reworded message silently becomes a
 //! different alert.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 use std::io::Write;
 
 fn scanner() -> Scanner {
diff --git a/crates/exav-core/tests/suites/match_location.rs b/crates/exav-core/tests/suites/match_location.rs
index 5b763575..1cc8869b 100644
--- a/crates/exav-core/tests/suites/match_location.rs
+++ b/crates/exav-core/tests/suites/match_location.rs
@@ -12,7 +12,7 @@
 //! matched. Recording is first-write-wins, so the assertion is that *some*
 //! location is reported for a hit that is nested.
 
-use exav_core::{scan_seekable_located, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, scan_seekable_located};
 use std::io::Cursor;
 
 fn eicar() -> &'static [u8] {
diff --git a/crates/exav-core/tests/suites/matryoshka.rs b/crates/exav-core/tests/suites/matryoshka.rs
index c1598bf1..f8c32ec5 100644
--- a/crates/exav-core/tests/suites/matryoshka.rs
+++ b/crates/exav-core/tests/suites/matryoshka.rs
@@ -40,7 +40,7 @@
 //!    scanner that gives up quietly on a deeply nested archive has been evaded
 //!    by nothing more than a shell loop.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 /// Recursion levels needed to reach the payload. One less than this and exav
 /// cannot get there; the fixture sits exactly at this depth so the boundary is
diff --git a/crates/exav-core/tests/suites/mod.rs b/crates/exav-core/tests/suites/mod.rs
index 26f69243..e7784864 100644
--- a/crates/exav-core/tests/suites/mod.rs
+++ b/crates/exav-core/tests/suites/mod.rs
@@ -27,6 +27,9 @@ mod cut_short_members;
 mod embedded_carve;
 #[cfg(feature = "all-formats")]
 mod encrypted_archives;
+mod exec_offsets;
+#[cfg(feature = "all-formats")]
+mod format_registry;
 #[cfg(feature = "image-hash")]
 mod fuzzy_img_formats;
 #[cfg(feature = "all-formats")]
@@ -41,6 +44,7 @@ mod match_location;
 mod matryoshka;
 #[cfg(feature = "all-formats")]
 mod multi_volume;
+mod nesting;
 #[cfg(feature = "all-formats")]
 mod one_scan;
 #[cfg(feature = "all-formats")]
@@ -49,14 +53,22 @@ mod ooxml_container;
 mod oversize_container;
 mod salvage;
 #[cfg(feature = "all-formats")]
+mod second_structure;
+#[cfg(feature = "all-formats")]
 mod sevenz_ppmd;
 mod size_caps;
+#[cfg(feature = "all-formats")]
+mod split_sets;
 mod tar_size_terminator;
 mod target_flash;
 mod target_text;
 #[cfg(feature = "all-formats")]
 mod tdb_attributes;
 mod untyped_container_dispatch;
+#[cfg(feature = "visible-text")]
+mod visible_text;
+#[cfg(feature = "visible-text-office")]
+mod visible_text_office;
 #[cfg(feature = "yara")]
 mod yara_dotnet;
 #[cfg(feature = "all-formats")]
diff --git a/crates/exav-core/tests/suites/multi_volume.rs b/crates/exav-core/tests/suites/multi_volume.rs
index b57913ee..c1dc5cb7 100644
--- a/crates/exav-core/tests/suites/multi_volume.rs
+++ b/crates/exav-core/tests/suites/multi_volume.rs
@@ -11,7 +11,7 @@
 //! rejoined: those bytes were withheld from the scan, and dropping them there
 //! would be a silent clean — the exact failure this scanner exists to prevent.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
@@ -415,3 +415,83 @@ fn ordinary_names_cost_nothing_and_return_nothing() {
     );
     assert!(v.is_empty(), "no sets, no verdicts");
 }
+
+/// `analyze_volume_sets` over `parts` with `opts`, the `unreadable` ones failing to read.
+fn sets_with(
+    parts: &[(String, Vec<u8>)],
+    unreadable: &[&str],
+    opts: &ScanOptions,
+) -> Vec<exav_core::VolumeSetVerdict> {
+    let names: Vec<String> = parts.iter().map(|(n, _)| n.clone()).collect();
+    exav_core::analyze_volume_sets(&Scanner::builtin(), &names, opts, |want| {
+        if unreadable.contains(&want) {
+            return Err(std::io::Error::other("permission denied"));
+        }
+        parts
+            .iter()
+            .find(|(n, _)| n == want)
+            .map(|(_, d)| d.clone())
+            .ok_or_else(|| std::io::Error::other("no such file"))
+    })
+}
+
+#[test]
+fn a_set_none_of_whose_parts_fits_the_budget_is_not_clean_part_by_part() {
+    // Every part is read and turned away, so the collector holds nothing of the
+    // set and has no entry to report. Each part then scanned alone as an
+    // ordinary file, and the archive was never looked at.
+    let parts = vec![
+        ("big.7z.001".to_string(), vec![b'A'; 5000]),
+        ("big.7z.002".to_string(), vec![b'B'; 5000]),
+    ];
+    let mut opts = ScanOptions::default();
+    opts.deep_analysis_max = 4096;
+    let v = sets_with(&parts, &[], &opts);
+    assert_eq!(v.len(), 2, "a verdict for each part: {v:?}");
+    for e in &v {
+        assert!(
+            matches!(e.report.verdict, Verdict::Unscannable { .. }),
+            "{}: got {:?}",
+            e.name,
+            e.report.verdict
+        );
+    }
+}
+
+#[test]
+fn a_set_is_known_by_the_same_name_whatever_the_case_of_its_parts() {
+    // The collector groups parts without regard to case. The unreadable last
+    // part was recorded under its own case, so the set joined under the first
+    // part's case missed it and its readable prefix scanned clean.
+    let mut parts = set_with_payload_in_the_tail("truncated");
+    parts[0].0 = parts[0].0.to_uppercase();
+    let last = parts[2].0.clone();
+    let v = sets(&parts, &[last.as_str()]);
+    assert!(!v.is_empty());
+    for e in &v {
+        assert!(
+            !matches!(e.report.verdict, Verdict::Clean),
+            "{}: a set that lost a volume was reported CLEAN: {:?}",
+            e.name,
+            e.report.verdict
+        );
+    }
+}
+
+#[test]
+fn the_one_readable_part_of_a_set_with_an_unreadable_part_is_not_a_lone_file() {
+    // `big.bin.001` alone looks like an ordinary numbered file, which is left
+    // to the caller's own scan. With `.002` present and unreadable it is half of
+    // an archive, and that scan says nothing about the other half.
+    let parts = vec![
+        ("big.bin.001".to_string(), vec![b'A'; 100]),
+        ("big.bin.002".to_string(), eicar().to_vec()),
+    ];
+    let v = sets(&parts, &["big.bin.002"]);
+    assert_eq!(v.len(), 1, "{v:?}");
+    assert!(
+        matches!(v[0].report.verdict, Verdict::Unscannable { .. }),
+        "{:?}",
+        v[0].report.verdict
+    );
+}
diff --git a/crates/exav-core/tests/suites/nesting.rs b/crates/exav-core/tests/suites/nesting.rs
new file mode 100644
index 00000000..4f1478e5
--- /dev/null
+++ b/crates/exav-core/tests/suites/nesting.rs
@@ -0,0 +1,504 @@
+//! Signature text nested or chained as long as the file is.
+//!
+//! A database comes from a feed and is read with the stack of whatever thread
+//! loads it. A signature that nests groups or chains operators deeper than the
+//! parser expects must be refused or read, not recursed into until the stack
+//! ends, which ends the process. Each database kind that has such a syntax is
+//! loaded and scanned against here on a small stack with a signature as deep
+//! as 200 KB of text makes it.
+
+use exav_core::loader::Builder;
+use exav_core::{ScanOptions, analyze};
+use std::time::{Duration, Instant};
+
+const STACK: usize = 512 * 1024;
+const N: usize = 50_000;
+
+/// Loads `text` as the database `name` and scans a few bytes with it, on a
+/// thread with a [`STACK`] stack. What went wrong, if anything.
+fn load_small(name: &'static str, text: String) -> Option<String> {
+    let started = Instant::now();
+    let r = std::thread::Builder::new()
+        .stack_size(STACK)
+        .spawn(move || {
+            let mut loader = Builder::new();
+            loader.add_named_bytes(name, text.as_bytes(), false);
+            if let Ok(db) = loader.build() {
+                let _ = analyze(
+                    &db,
+                    b"MZ\x90\x00 a short file with abc and 0123",
+                    &ScanOptions::default(),
+                );
+            }
+        })
+        .unwrap()
+        .join();
+    match r {
+        Err(_) => Some(format!("{name}: overflowed its stack or panicked")),
+        Ok(()) if started.elapsed() > Duration::from_secs(30) => Some(format!(
+            "{name}: took {:.1} s",
+            started.elapsed().as_secs_f64()
+        )),
+        Ok(()) => None,
+    }
+}
+
+fn assert_all(findings: Vec<Option<String>>) {
+    let findings: Vec<String> = findings.into_iter().flatten().collect();
+    assert!(findings.is_empty(), "\n{}", findings.join("\n"));
+}
+
+/// The harness loads what it is given: a plain signature of each kind found
+/// in the bytes it scans, so the cases below are read and not skipped.
+#[test]
+fn the_databases_here_are_loaded_and_matched() {
+    let data = b"MZ\x90\x00 a short file with abc and 0123";
+    for (name, text) in [
+        ("t.ndb", "Canary.N:0:*:616263"),
+        ("t.ldb", "Canary.L;Target:0;0&1;616263;30313233"),
+    ] {
+        let mut loader = Builder::new();
+        loader.add_named_bytes(name, text.as_bytes(), false);
+        let db = loader.build().unwrap();
+        let report = analyze(&db, data, &ScanOptions::default());
+        assert!(
+            matches!(report.verdict, exav_core::Verdict::Infected { .. }),
+            "{name}: {:?}",
+            report.verdict
+        );
+    }
+}
+
+#[test]
+fn body_signatures() {
+    let a = "aabbcc";
+    let cases: Vec<(&str, String)> = vec![
+        (
+            "parentheses",
+            format!("T:0:*:{}{a}{}", "(".repeat(N), ")".repeat(N)),
+        ),
+        ("alternatives", format!("T:0:*:({})", vec![a; N].join("|"))),
+        (
+            "nested alternatives",
+            format!("T:0:*:{}{a}{}", "(aa|".repeat(N), ")".repeat(N)),
+        ),
+        ("not", format!("T:0:*:{}({a}|dd)", "!".repeat(N))),
+        ("jumps", format!("T:0:*:{}", "aa{1-2}".repeat(N))),
+        ("stars", format!("T:0:*:{}", "aa*".repeat(N))),
+        ("wildcards", format!("T:0:*:{}", "??".repeat(N))),
+        ("nibbles", format!("T:0:*:{}", "a?".repeat(N))),
+        ("anchored jumps", format!("T:0:*:{}", "aa[1-2]".repeat(N))),
+        ("offsets", format!("T:0:{}EP+0:{a}", "EP+0,".repeat(N))),
+        ("sections", format!("T:0:{}SE1:{a}", "SL+0,".repeat(N))),
+        ("a long name", format!("{}:0:*:{a}", "T".repeat(N * 4))),
+        (
+            "many signatures",
+            (0..N * 2)
+                .map(|i| format!("T{i}:0:*:{a}{i:04x}\n"))
+                .collect::<String>(),
+        ),
+    ];
+    assert_all(
+        cases
+            .into_iter()
+            .map(|(n, t)| load_small("t.ndb", t).map(|e| format!("{n}: {e}")))
+            .collect(),
+    );
+}
+
+#[test]
+fn logical_signatures() {
+    let sub = "6162;6364";
+    let flat = |op: &str, n: usize| vec!["0"; n].join(op);
+    let cases: Vec<(&str, String)> = vec![
+        (
+            "parentheses",
+            format!(
+                "T;Engine:51-255,Target:0;{}0{};{sub}",
+                "(".repeat(N),
+                ")".repeat(N)
+            ),
+        ),
+        ("and chain", format!("T;Target:0;{};{sub}", flat("&", N))),
+        ("or chain", format!("T;Target:0;{};{sub}", flat("|", N))),
+        (
+            "mixed chain",
+            format!("T;Target:0;{};{sub}", vec!["0&1|"; N].concat() + "0"),
+        ),
+        ("negation", format!("T;Target:0;{}0;{sub}", "!".repeat(N))),
+        (
+            "counts",
+            format!("T;Target:0;{}0>1;{sub}", "(".repeat(N / 100)),
+        ),
+        (
+            "many subsignatures",
+            format!("T;Target:0;0;{}", vec!["6162"; N].join(";")),
+        ),
+        ("a high index", format!("T;Target:0;{};{sub}", N * 1000)),
+        (
+            "fuzzy-hash chain",
+            format!(
+                "T;Target:0;0;{}",
+                "fuzzy_img#00000000000000000#0;".repeat(N / 100)
+            ),
+        ),
+        (
+            "pcre groups",
+            format!("T;Target:0;0;0/{}a{}/", "(".repeat(N), ")".repeat(N)),
+        ),
+        (
+            "pcre alternations",
+            format!("T;Target:0;0;0/{}/", "a|".repeat(N)),
+        ),
+        (
+            "pcre quantifiers",
+            format!("T;Target:0;0;0/{}/", "a*".repeat(N)),
+        ),
+        (
+            "pcre classes",
+            format!("T;Target:0;0;0/{}/", "[a-z]".repeat(N)),
+        ),
+        (
+            "pcre lookaheads",
+            format!("T;Target:0;0;0/{}a{}/", "(?=".repeat(N), ")".repeat(N)),
+        ),
+        (
+            "pcre backrefs",
+            format!("T;Target:0;0;0/(a){}/", "\\1".repeat(N)),
+        ),
+        ("pcre flags", format!("T;Target:0;0;0/a/{}", "i".repeat(N))),
+        (
+            "macros",
+            format!("T;Target:0;0;6162${{1-2}}{}$", "1$".repeat(N)),
+        ),
+    ];
+    assert_all(
+        cases
+            .into_iter()
+            .map(|(n, t)| load_small("t.ldb", t).map(|e| format!("{n}: {e}")))
+            .collect(),
+    );
+}
+
+#[test]
+fn phishing_and_regex_databases() {
+    let cases: Vec<(&'static str, &str, String)> = vec![
+        (
+            "pdb groups",
+            "t.pdb",
+            format!("R:.+{}a{}:.+", "(".repeat(N), ")".repeat(N)),
+        ),
+        (
+            "pdb alternations",
+            "t.pdb",
+            format!("R:.+({}):.+", "a|".repeat(N)),
+        ),
+        (
+            "pdb many",
+            "t.pdb",
+            (0..N).map(|i| format!("R:.+x{i}.com:.+\n")).collect(),
+        ),
+        (
+            "wdb groups",
+            "t.wdb",
+            format!("X:.+{}a{}:.+", "(".repeat(N), ")".repeat(N)),
+        ),
+        (
+            "wdb mixed",
+            "t.wdb",
+            format!("M:{}:{}", "(a|".repeat(N), ")".repeat(N)),
+        ),
+        ("gdb", "t.gdb", format!("H:{}", "a.".repeat(N))),
+        ("crb", "t.crb", format!("T;{}", "(".repeat(N))),
+        (
+            "ftm",
+            "t.ftm",
+            format!("0:0:{}:Name:CL_TYPE_X:CL_TYPE_ANY", "(".repeat(N)),
+        ),
+        (
+            "cdb",
+            "t.cdb",
+            format!("N:CL_TYPE_ANY:{}:*:*:*:*:*:*", "9".repeat(N)),
+        ),
+        (
+            "idb",
+            "t.idb",
+            format!("IconName:GroupName:{}", "0".repeat(N * 4)),
+        ),
+        ("hdb", "t.hdb", format!("{}:1:N", "a".repeat(N * 4))),
+        ("hsb", "t.hsb", format!("{}:1:N:73", "a".repeat(N * 4))),
+        ("fp", "t.fp", format!("{}:1:N", "b".repeat(N * 4))),
+        ("mdb", "t.mdb", format!("1:{}:N", "c".repeat(N * 4))),
+        ("cfg", "t.cfg", "(".repeat(N * 4)),
+        ("ign", "t.ign2", "N:".repeat(N)),
+        (
+            "pwdb",
+            "t.pwdb",
+            format!("T;Engine:81-255;0;{}", "x".repeat(N * 4)),
+        ),
+    ];
+    assert_all(
+        cases
+            .into_iter()
+            .map(|(n, file, t)| load_small(file, t).map(|e| format!("{n}: {e}")))
+            .collect(),
+    );
+}
+
+#[cfg(feature = "yara")]
+#[test]
+fn yara_sources() {
+    use exav_core::yara::Compiler;
+    let rule = |def: &str, cond: &str| {
+        format!("import \"pe\"\nrule r {{ strings: $a = \"x\" $b = {def} condition: {cond} }}")
+    };
+    let sources: Vec<(&str, String)> = vec![
+        (
+            "regex groups",
+            rule(&format!("/{}a{}/", "(".repeat(N), ")".repeat(N)), "$b"),
+        ),
+        (
+            "regex alternations",
+            rule(&format!("/{}/", "a|".repeat(N)), "$b"),
+        ),
+        (
+            "regex repeats",
+            rule(&format!("/{}/", "a{1,2}".repeat(N)), "$b"),
+        ),
+        (
+            "hex groups",
+            rule(
+                &format!("{{ {}41{} }}", "( 41 | ".repeat(N), " )".repeat(N)),
+                "$b",
+            ),
+        ),
+        (
+            "hex jumps",
+            rule(&format!("{{ 41 {} 42 }}", "[1-2] 41 ".repeat(N)), "$b"),
+        ),
+        (
+            "hex alternatives",
+            rule(&format!("{{ ( {} ) }}", vec!["41"; N].join(" | ")), "$b"),
+        ),
+        (
+            "condition groups",
+            rule("\"y\"", &format!("{}true{}", "(".repeat(N), ")".repeat(N))),
+        ),
+        (
+            "for loops",
+            rule(
+                "\"y\"",
+                &format!("{}true", "for any i in (1..2) : ( ".repeat(N)),
+            ),
+        ),
+        (
+            "with",
+            rule("\"y\"", &format!("{}true", "with a = 1 : ( ".repeat(N))),
+        ),
+        (
+            "of sets",
+            rule(
+                "\"y\"",
+                &format!("any of ({})", vec!["$a"; N * 2].join(",")),
+            ),
+        ),
+        (
+            "many rules",
+            (0..N)
+                .map(|i| format!("rule r{i} {{ condition: true }}\n"))
+                .collect(),
+        ),
+        (
+            "rule chain",
+            (0..N)
+                .map(|i| format!("rule r{i} {{ condition: r{} }}\n", i.saturating_sub(1)))
+                .collect::<String>()
+                + "rule r0 { condition: true }",
+        ),
+        ("imports", "import \"pe\"\n".repeat(N)),
+        (
+            "tags",
+            format!("rule r : {} {{ condition: true }}", vec!["t"; N].join(" ")),
+        ),
+        (
+            "meta",
+            format!("rule r {{ meta: {} condition: true }}", "a = 1 ".repeat(N)),
+        ),
+    ];
+    let findings: Vec<Option<String>> = sources
+        .into_iter()
+        .map(|(name, src)| {
+            let started = Instant::now();
+            let r = std::thread::Builder::new()
+                .stack_size(STACK)
+                .spawn(move || {
+                    let mut c = Compiler::new();
+                    let rejected = c.add_source_lenient(&src);
+                    if rejected.is_empty() {
+                        let rules = c.build();
+                        let _ = exav_core::yara::Scanner::new(&rules).scan(b"xxxx");
+                    }
+                })
+                .unwrap()
+                .join();
+            match r {
+                Err(_) => Some(format!("yara {name}: overflowed its stack or panicked")),
+                Ok(()) if started.elapsed() > Duration::from_secs(30) => Some(format!(
+                    "yara {name}: took {:.1} s",
+                    started.elapsed().as_secs_f64()
+                )),
+                Ok(()) => None,
+            }
+        })
+        .collect();
+    assert_all(findings);
+}
+
+/// A stored ZIP of one member, `data`.
+#[cfg(feature = "all-formats")]
+fn stored_zip(data: &[u8]) -> Vec<u8> {
+    use std::io::Write;
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    let o =
+        zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    z.start_file("a.bin", o).unwrap();
+    z.write_all(data).unwrap();
+    z.finish().unwrap().into_inner()
+}
+
+/// The payload, deflated so that the raw scan of the outer layers cannot see
+/// it: it is found only by walking every layer.
+#[cfg(feature = "all-formats")]
+fn deflated_eicar() -> Vec<u8> {
+    use std::io::Write;
+    let mut data = exav_core::unpack::eicar().to_vec();
+    data.extend(std::iter::repeat_n(b'A', 8192));
+    let mut e = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
+    e.write_all(&data).unwrap();
+    e.finish().unwrap()
+}
+
+/// Containers nested to the depth the user allows (`--max-unpack-depth` takes
+/// up to 255) are walked to the payload on a 1 MiB stack. At the test profile's
+/// opt-level this holds without the frame fixes in the ZIP and XZ walkers; the
+/// frames of a release build are what `scripts/stack-frames.py` audits.
+#[cfg(feature = "all-formats")]
+#[test]
+fn zips_in_zips_to_the_allowed_depth_are_walked_on_a_small_stack() {
+    let mut layers = deflated_eicar();
+    for _ in 0..60 {
+        layers = stored_zip(&layers);
+    }
+    let found = std::thread::Builder::new()
+        .stack_size(1 << 20)
+        .spawn(move || {
+            let db = exav_core::Scanner::builtin();
+            let mut opts = ScanOptions::default();
+            opts.limits.max_recursion = 255;
+            matches!(
+                analyze(&db, &layers, &opts).verdict,
+                exav_core::Verdict::Infected { .. }
+            )
+        })
+        .unwrap()
+        .join()
+        .expect("no stack overflow");
+    assert!(found, "the payload at the bottom is found");
+}
+
+/// Script, markup and text with nesting as deep as 400 KB of it makes it, scanned
+/// with every content analysis on, on a small stack: the normalizers, the
+/// phishing reader, the structured-data counters.
+#[test]
+fn script_and_markup_nested_as_deep_as_the_file_is_long() {
+    let n = 100_000;
+    let rep = |s: &str| s.repeat(n);
+    let html = |inner: String| format!("<html><body>{inner}</body></html>");
+    let script = |inner: String| format!("<html><script>{inner}</script></html>");
+    let cases: Vec<(&str, String)> = vec![
+        (
+            "js parentheses",
+            script(format!("{}1{}", rep("("), rep(")"))),
+        ),
+        ("js brackets", script(format!("{}1{}", rep("["), rep("]")))),
+        ("js braces", script(format!("{}1{}", rep("{"), rep("}")))),
+        (
+            "js functions",
+            script(format!("{}1{}", rep("function f(){"), rep("}"))),
+        ),
+        ("js ternaries", script(format!("x={}1", rep("a?b:")))),
+        ("js signs", script(format!("x={}1", rep("-")))),
+        ("js negations", script(format!("x={}1", rep("!")))),
+        (
+            "js concatenations",
+            script(format!("x=\"a\"{}", rep("+\"b\""))),
+        ),
+        ("js eval", script(format!("{}1{}", rep("eval("), rep(")")))),
+        (
+            "js unescape",
+            script(format!("{}\"%41\"{}", rep("unescape("), rep(")"))),
+        ),
+        (
+            "js atob",
+            script(format!("{}\"QQ==\"{}", rep("atob("), rep(")"))),
+        ),
+        (
+            "js from char code",
+            script(format!("{}65{}", rep("String.fromCharCode("), rep(")"))),
+        ),
+        ("js arrays of arrays", script(format!("x={}", rep("[1,")))),
+        (
+            "js objects",
+            script(format!("x={}1{}", rep("{a:"), rep("}"))),
+        ),
+        ("js ifs", script(format!("{}x=1", rep("if(a)")))),
+        ("js comments", script(rep("/*"))),
+        ("js template strings", script(format!("x={}", rep("`${")))),
+        ("js regexes", script(format!("x={}", rep("/(/")))),
+        (
+            "js escapes",
+            script(format!("x=\"{}\"", rep("\\x41\\u0042"))),
+        ),
+        ("html divs", html(rep("<div>"))),
+        ("html tables", html(rep("<table><tr><td>"))),
+        (
+            "html anchors",
+            html(rep("<a href=\"http://a.example.com\">http://b.example.com")),
+        ),
+        ("html comments", html(rep("<!--"))),
+        ("html entities", html(rep("&amp;lt;"))),
+        ("html attributes", html(rep("<a b=\"c\" "))),
+        ("html scripts", html(rep("<script>"))),
+        ("html iframes", html(rep("<iframe src=\"http://a\">"))),
+        ("text digits", rep("4111 1111 1111 1111 ")),
+        ("text ssns", rep("123-45-6789 ")),
+        ("text base64", rep("QUJDREVGR0hJSktM")),
+        ("text parentheses", rep("(")),
+        ("text quotes", rep("\"")),
+    ];
+    let mut findings = vec![];
+    for (name, data) in cases {
+        let r = std::thread::Builder::new()
+            .stack_size(512 * 1024)
+            .spawn(move || {
+                let mut loader = Builder::new();
+                loader.add_named_bytes("t.ndb", b"Canary.N:0:*:6162636465", false);
+                loader.add_named_bytes("t.pdb", b"H:example.com", false);
+                let db = loader.build().unwrap();
+                let mut opts = ScanOptions::default();
+                opts.heuristics = true;
+                opts.clamav_heuristics = true;
+                opts.alert_phishing = true;
+                opts.structured_cc_count = Some(1);
+                opts.structured_ssn_count = Some(1);
+                opts.alert_macros = true;
+                let _ = analyze(&db, data.as_bytes(), &opts);
+            })
+            .unwrap()
+            .join();
+        if r.is_err() {
+            findings.push(Some(format!("{name}: overflowed its stack or panicked")));
+        }
+    }
+    assert_all(findings);
+}
diff --git a/crates/exav-core/tests/suites/one_scan.rs b/crates/exav-core/tests/suites/one_scan.rs
index 7691c3b8..dc3c769b 100644
--- a/crates/exav-core/tests/suites/one_scan.rs
+++ b/crates/exav-core/tests/suites/one_scan.rs
@@ -3,7 +3,7 @@
 
 use std::io::Write;
 
-use exav_core::{scan_path, scan_seekable, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, scan_path, scan_seekable};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
diff --git a/crates/exav-core/tests/suites/ooxml_container.rs b/crates/exav-core/tests/suites/ooxml_container.rs
index c51d629b..b8781186 100644
--- a/crates/exav-core/tests/suites/ooxml_container.rs
+++ b/crates/exav-core/tests/suites/ooxml_container.rs
@@ -7,7 +7,7 @@
 //! plain ZIP member and the `Container:`-scoped sig was skipped. A plain ZIP
 //! carrying the same bytes must NOT fire (the constraint still discriminates).
 
-use exav_core::{loader, scan_seekable, ScanOptions, Verdict};
+use exav_core::{ScanOptions, Verdict, loader, scan_seekable};
 use std::io::Cursor;
 
 /// The marker the logical signature keys on (appears in `word/document.xml`).
diff --git a/crates/exav-core/tests/suites/oversize_container.rs b/crates/exav-core/tests/suites/oversize_container.rs
index a70e60d6..c7a6ebf6 100644
--- a/crates/exav-core/tests/suites/oversize_container.rs
+++ b/crates/exav-core/tests/suites/oversize_container.rs
@@ -12,7 +12,7 @@
 //! and one rule, so the rule needs a test on both or they drift.
 
 use exav_core::spill::{Spill, SpillReader, SpillWriter};
-use exav_core::{loader, scan_path, scan_seekable, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, loader, scan_path, scan_seekable};
 use std::io::Write;
 
 /// Spill space held in memory.
@@ -195,6 +195,79 @@ fn an_oversize_disk_image_has_its_files_scanned() {
     }
 }
 
+/// A file inside a filesystem that is past the limit is read as it goes and
+/// scanned from spill space, or is the size limit where there is none. The
+/// image is compressed, so the signature is in no byte of it: only the file
+/// holds it.
+#[cfg(feature = "all-formats")]
+#[test]
+fn an_oversize_file_in_a_filesystem_is_scanned_from_spill_space() {
+    // `frag.bin` of the fixture tree: 100000 bytes, made by `pat` with seed 9.
+    let pat = |seed: u32, n: usize| -> Vec<u8> {
+        (0..n)
+            .map(|i| {
+                if (i / 64) % 2 == 0 {
+                    (((i as u32).wrapping_mul(2654435761)).wrapping_add(seed.wrapping_mul(40503))
+                        >> 13) as u8
+                } else {
+                    b"abcdefghij0123456789"[(i + seed as usize) % 20]
+                }
+            })
+            .collect()
+    };
+    // The bytes of `pat` repeat from one seed to another at some offsets, so
+    // the window is one that no other file of the tree has.
+    let file = pat(9, 100000);
+    let hex: String = file[38400..38424]
+        .iter()
+        .map(|b| format!("{b:02x}"))
+        .collect();
+    let mut l = loader::Builder::new();
+    l.add_named_bytes("t.ndb", format!("Zzz.InFile:0:*:{hex}\n").as_bytes(), true);
+    let db = l.build().expect("build database");
+    let path = concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/../exav-unpack/tests/fixtures/fs/squashfs_gzip.img.gz"
+    );
+    let mut image = Vec::new();
+    std::io::Read::read_to_end(
+        &mut flate2::read::GzDecoder::new(std::fs::File::open(path).unwrap()),
+        &mut image,
+    )
+    .unwrap();
+    assert!(
+        !image.windows(24).any(|w| w == &file[38400..38424]),
+        "compressed"
+    );
+    let size = image.len() as u64;
+
+    let mut spilling = tiny_deep_analysis();
+    spilling.spill = Some(std::sync::Arc::new(MemSpill));
+    let report =
+        scan_seekable(&db, std::io::Cursor::new(image.clone()), size, &spilling).expect("scan");
+    match report.verdict {
+        Verdict::Infected { signature, .. } => assert_eq!(signature, "Zzz.InFile"),
+        other => panic!("expected the file to be found, got {other:?}"),
+    }
+
+    let report = scan_seekable(
+        &db,
+        std::io::Cursor::new(image),
+        size,
+        &tiny_deep_analysis(),
+    )
+    .expect("scan");
+    match report.verdict {
+        Verdict::LimitsExceeded { reason } => {
+            assert!(reason.contains("--max-object-bytes"), "{reason}")
+        }
+        other => panic!(
+            "expected LIMITS-EXCEEDED without spill space, got {other:?} {:?}",
+            report.findings
+        ),
+    }
+}
+
 #[test]
 fn oversize_flat_content_is_a_limit_too() {
     // Text past the cap has its normalised views made in spill space. With
diff --git a/crates/exav-core/tests/suites/salvage.rs b/crates/exav-core/tests/suites/salvage.rs
index 8f82edc0..27dbf0ac 100644
--- a/crates/exav-core/tests/suites/salvage.rs
+++ b/crates/exav-core/tests/suites/salvage.rs
@@ -6,7 +6,7 @@
 
 use std::io::Write;
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
diff --git a/crates/exav-core/tests/suites/second_structure.rs b/crates/exav-core/tests/suites/second_structure.rs
new file mode 100644
index 00000000..9c49c543
--- /dev/null
+++ b/crates/exav-core/tests/suites/second_structure.rs
@@ -0,0 +1,126 @@
+//! A file can be two archives, and a reader opens the one it goes by.
+//!
+//! The magic at the start types a file as one format. `unzip` goes by the record
+//! at the end of the file instead, and a disk image keeps the start of its first
+//! sectors for boot code, so a PDF, a tar or a gzip with a ZIP behind it, or an
+//! ISO that begins with an archive's magic, is a second archive for the reader
+//! that opens it as that. Each payload here is deflated EICAR, so the string is
+//! not in the bytes of the file.
+
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
+use std::io::Write;
+
+fn payload() -> Vec<u8> {
+    [exav_core::unpack::eicar(), b"\n"].concat().repeat(40)
+}
+
+fn verdict(data: &[u8]) -> Verdict {
+    let eicar = exav_core::unpack::eicar();
+    assert!(
+        !data.windows(eicar.len()).any(|w| w == eicar),
+        "the string must not be in the file's bytes"
+    );
+    analyze(&Scanner::builtin(), data, &ScanOptions::default()).verdict
+}
+
+fn zip_with_payload() -> Vec<u8> {
+    let deflated = zip::write::SimpleFileOptions::default()
+        .compression_method(zip::CompressionMethod::Deflated);
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    z.start_file("e.com", deflated).unwrap();
+    z.write_all(&payload()).unwrap();
+    z.finish().unwrap().into_inner()
+}
+
+fn gzip(data: &[u8]) -> Vec<u8> {
+    let mut gz = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
+    gz.write_all(data).unwrap();
+    gz.finish().unwrap()
+}
+
+fn is_infected(v: &Verdict) -> bool {
+    matches!(v, Verdict::Infected { .. })
+}
+
+#[test]
+fn the_zip_alone_is_infected() {
+    assert!(is_infected(&verdict(&zip_with_payload())));
+}
+
+#[test]
+fn a_zip_behind_a_pdf_is_found() {
+    let mut f =
+        b"%PDF-1.5\n1 0 obj\n<< /Type /Catalog >>\nendobj\ntrailer\n<< /Root 1 0 R >>\n%%EOF\n"
+            .to_vec();
+    assert!(!is_infected(&verdict(&f)), "the PDF alone is clean");
+    f.extend_from_slice(&zip_with_payload());
+    assert!(is_infected(&verdict(&f)), "{:?}", verdict(&f));
+}
+
+#[test]
+fn a_zip_behind_a_tar_is_found() {
+    let mut tar = tar::Builder::new(Vec::new());
+    let mut h = tar::Header::new_gnu();
+    h.set_size(5);
+    h.set_mode(0o644);
+    h.set_cksum();
+    tar.append_data(&mut h, "note.txt", &b"hello"[..]).unwrap();
+    let mut f = tar.into_inner().unwrap();
+    assert!(!is_infected(&verdict(&f)));
+    f.extend_from_slice(&zip_with_payload());
+    assert!(is_infected(&verdict(&f)), "{:?}", verdict(&f));
+}
+
+#[test]
+fn a_zip_behind_a_gzip_is_found() {
+    let mut f = gzip(b"nothing to see here\n");
+    assert!(!is_infected(&verdict(&f)));
+    f.extend_from_slice(&zip_with_payload());
+    assert!(is_infected(&verdict(&f)), "{:?}", verdict(&f));
+}
+
+const SECTOR: usize = 2048;
+
+fn dir_record(lba: u32, size: u32, is_dir: bool, name: &[u8]) -> Vec<u8> {
+    let mut r = vec![0u8; 33 + name.len()];
+    r[2..6].copy_from_slice(&lba.to_le_bytes());
+    r[10..14].copy_from_slice(&size.to_le_bytes());
+    r[25] = if is_dir { 2 } else { 0 };
+    r[32] = name.len() as u8;
+    r[33..].copy_from_slice(name);
+    r[0] = r.len() as u8;
+    r
+}
+
+/// An ISO 9660 image with one file in its primary tree: sector 16 the volume
+/// descriptor, 17 its terminator, 18 the root directory, 19 the file. The
+/// first bytes are left to `system_area`, as the format allows.
+fn iso_with(system_area: &[u8], file: &[u8]) -> Vec<u8> {
+    let mut img = vec![0u8; 20 * SECTOR];
+    img[..system_area.len()].copy_from_slice(system_area);
+    let mut put = |sector: usize, off: usize, bytes: &[u8]| {
+        let a = sector * SECTOR + off;
+        img[a..a + bytes.len()].copy_from_slice(bytes);
+    };
+    put(16, 0, &[1]);
+    put(16, 1, b"CD001");
+    put(16, 156, &dir_record(18, SECTOR as u32, true, &[0]));
+    put(17, 0, &[255]);
+    put(17, 1, b"CD001");
+    let mut root = dir_record(18, SECTOR as u32, true, &[0]);
+    root.extend(dir_record(18, SECTOR as u32, true, &[1]));
+    root.extend(dir_record(19, file.len() as u32, false, b"E.GZ;1"));
+    put(18, 0, &root);
+    put(19, 0, file);
+    img
+}
+
+#[test]
+fn an_iso_that_begins_with_an_archive_magic_is_walked_as_the_iso_it_is() {
+    let file = gzip(&payload());
+    // A plain ISO: the control.
+    assert!(is_infected(&verdict(&iso_with(&[], &file))));
+    // The same image under a ZIP's local header magic, in the system area.
+    let img = iso_with(b"PK\x03\x04", &file);
+    assert!(is_infected(&verdict(&img)), "{:?}", verdict(&img));
+}
diff --git a/crates/exav-core/tests/suites/sevenz_ppmd.rs b/crates/exav-core/tests/suites/sevenz_ppmd.rs
index 06d4f807..a47bbeb8 100644
--- a/crates/exav-core/tests/suites/sevenz_ppmd.rs
+++ b/crates/exav-core/tests/suites/sevenz_ppmd.rs
@@ -1,7 +1,7 @@
 //! A 7z member compressed with PPMd whose stream is cut short, at the verdict
 //! level: the part never decoded leaves the file not clean.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 /// `ppmd_plain_header.7z` (see exav-unpack's `sevenz_ppmd` suite): one text
 /// member, PPMd, the header uncompressed.
diff --git a/crates/exav-core/tests/suites/size_caps.rs b/crates/exav-core/tests/suites/size_caps.rs
index 1ac76aa3..e72837f5 100644
--- a/crates/exav-core/tests/suites/size_caps.rs
+++ b/crates/exav-core/tests/suites/size_caps.rs
@@ -6,7 +6,7 @@
 //! tree of an ISO image, and the typing of a top-level input too large to
 //! buffer.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 use std::io::{Cursor, Read};
 #[cfg(feature = "all-formats")]
 use {exav_core::scan_seekable, std::io::Write};
diff --git a/crates/exav-core/tests/suites/split_sets.rs b/crates/exav-core/tests/suites/split_sets.rs
new file mode 100644
index 00000000..e1587d1e
--- /dev/null
+++ b/crates/exav-core/tests/suites/split_sets.rs
@@ -0,0 +1,334 @@
+//! Sets of volumes whose headers say how they join (RAR, ZIP, CAB), scanned as
+//! the archives they are.
+//!
+//! Each volume holds part of a member's bytes, so no volume read alone shows
+//! what the member is. The signatures here are the ones only the whole member
+//! satisfies: its MD5 (`.hdb`) for the RAR and ZIP sets, and for the CAB a
+//! marker that straddles the place the folder was cut. A control in each test
+//! scans the parts one at a time and finds nothing.
+//!
+//! Fixtures: the RAR sets are official RAR's (`rar a -ma5 -m3 -v8k` and
+//! `-ma4 -m3 -vn -v8k`, `text.txt` and `noise.bin`; the MD5s are of the inputs,
+//! made by `random.Random(20261001)`, see exav-unpack's `rar_solid` suite); the
+//! ZIP is `zip -0 -s 64k split.zip payload.bin` of 100,000 bytes of
+//! `random.Random(77)`, whose rejoined archive (`zip -s 0`) holds the payload.
+
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, analyze_split_sets, loader};
+use std::cell::RefCell;
+
+fn fixture(name: &str) -> Vec<u8> {
+    let path = format!(
+        "{}/tests/fixtures/volumes/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&path).unwrap_or_else(|e| panic!("{path}: {e}"))
+}
+
+fn db(files: &[(&str, &str)]) -> Scanner {
+    let mut b = loader::Builder::new();
+    for (name, text) in files {
+        b.add_named_bytes(name, text.as_bytes(), true);
+    }
+    b.build().expect("database")
+}
+
+fn infected(v: &Verdict) -> Option<&str> {
+    match v {
+        Verdict::Infected { signature, .. } => Some(signature.as_str()),
+        _ => None,
+    }
+}
+
+fn names(v: &[&str]) -> Vec<String> {
+    v.iter().map(|s| (*s).to_string()).collect()
+}
+
+const NOISE_MD5: &str = "147b5c8ca1767bca1ef297b3024fb0dd";
+const PAYLOAD_MD5: &str = "2e94a8cfc2ebdd36f886a897aeb0cf96";
+
+#[test]
+fn rar_sets_are_scanned_as_the_archive_they_are() {
+    let scanner = db(&[("t.hdb", &format!("{NOISE_MD5}:20000:Test.Noise\n"))]);
+    let opts = ScanOptions::default();
+    for (set, parts) in [
+        (
+            "set5.rar",
+            ["set5.part1.rar", "set5.part2.rar", "set5.part3.rar"],
+        ),
+        ("set4.rar", ["set4.rar", "set4.r00", "set4.r01"]),
+    ] {
+        // Alone, no volume shows the member.
+        for p in parts {
+            assert!(
+                infected(&analyze(&scanner, &fixture(p), &opts).verdict).is_none(),
+                "{p} alone"
+            );
+        }
+        let mut given = names(&parts);
+        given.push("notes.txt".into());
+        let fetched = RefCell::new(Vec::new());
+        let got = analyze_split_sets(&scanner, &given, &opts, |n, head| {
+            fetched.borrow_mut().push(n.to_string());
+            assert!(head.is_none(), "a RAR volume is read whole or not at all");
+            Ok(fixture(n))
+        });
+        assert_eq!(got.len(), 3, "{set}");
+        for v in &got {
+            assert_eq!(
+                infected(&v.report.verdict),
+                Some("Test.Noise"),
+                "{set}: {}",
+                v.name
+            );
+            assert_eq!(v.set, set);
+        }
+        assert!(
+            !fetched.borrow().iter().any(|n| n == "notes.txt"),
+            "a file of no set is not read"
+        );
+    }
+}
+
+#[test]
+fn a_rar_set_with_a_volume_missing_is_unscannable_not_clean() {
+    let scanner = db(&[("t.hdb", &format!("{NOISE_MD5}:20000:Test.Noise\n"))]);
+    let given = names(&["set5.part1.rar", "set5.part3.rar"]);
+    let got = analyze_split_sets(&scanner, &given, &ScanOptions::default(), |n, _| {
+        Ok(fixture(n))
+    });
+    assert_eq!(got.len(), 2);
+    for v in &got {
+        assert!(
+            matches!(v.report.verdict, Verdict::Unscannable { .. }),
+            "{}: {:?}",
+            v.name,
+            v.report.verdict
+        );
+    }
+    // One volume of a set is a file, not a set.
+    let alone = analyze_split_sets(
+        &scanner,
+        &names(&["set5.part1.rar"]),
+        &ScanOptions::default(),
+        |n, _| Ok(fixture(n)),
+    );
+    assert!(alone.is_empty());
+}
+
+#[test]
+fn a_split_zip_is_scanned_as_the_archive_it_is() {
+    let scanner = db(&[("t.hdb", &format!("{PAYLOAD_MD5}:100000:Test.Payload\n"))]);
+    let opts = ScanOptions::default();
+    for p in ["split.z01", "split.zip"] {
+        assert!(
+            infected(&analyze(&scanner, &fixture(p), &opts).verdict).is_none(),
+            "{p} alone"
+        );
+    }
+    let got = analyze_split_sets(
+        &scanner,
+        &names(&["split.zip", "other.bin", "split.z01"]),
+        &opts,
+        |n, _| Ok(fixture(n)),
+    );
+    assert_eq!(got.len(), 2);
+    for v in &got {
+        assert_eq!(
+            infected(&v.report.verdict),
+            Some("Test.Payload"),
+            "{}",
+            v.name
+        );
+        assert_eq!(v.set, "split.zip");
+    }
+    // Without its last part, the `.zip`, the others are a set with a hole.
+    let hole = analyze_split_sets(
+        &scanner,
+        &names(&["split.z01", "other.bin"]),
+        &opts,
+        |n, _| Ok(fixture(n)),
+    );
+    assert_eq!(hole.len(), 1);
+    assert!(
+        matches!(hole[0].report.verdict, Verdict::Unscannable { .. }),
+        "{:?}",
+        hole[0].report.verdict
+    );
+}
+
+/// A cabinet of one folder, uncompressed, as exav-unpack's tests build them.
+fn cab(
+    prev: Option<&str>,
+    next: Option<&str>,
+    index: u16,
+    files: &[(u32, u32, u16, &str)],
+    blocks: &[(u16, &[u8])],
+) -> Vec<u8> {
+    let flags = u16::from(prev.is_some()) | (u16::from(next.is_some()) << 1);
+    let mut links = Vec::new();
+    for n in [prev, next].into_iter().flatten() {
+        links.extend_from_slice(n.as_bytes());
+        links.extend_from_slice(b"\0disk\0");
+    }
+    let mut records = Vec::new();
+    for (size, offset, place, name) in files {
+        records.extend_from_slice(&size.to_le_bytes());
+        records.extend_from_slice(&offset.to_le_bytes());
+        records.extend_from_slice(&place.to_le_bytes());
+        records.extend_from_slice(&[0x21, 0x5a, 0x00, 0x60, 0x20, 0x00]);
+        records.extend_from_slice(name.as_bytes());
+        records.push(0);
+    }
+    let coff_files = 36 + links.len() + 8;
+    let data_at = coff_files + records.len();
+    let mut data = Vec::new();
+    for (uncompressed, payload) in blocks {
+        data.extend_from_slice(&0u32.to_le_bytes());
+        data.extend_from_slice(&(payload.len() as u16).to_le_bytes());
+        data.extend_from_slice(&uncompressed.to_le_bytes());
+        data.extend_from_slice(payload);
+    }
+    let mut out = b"MSCF".to_vec();
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&((data_at + data.len()) as u32).to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&(coff_files as u32).to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&[3, 1]);
+    for v in [1u16, files.len() as u16, flags, 5, index] {
+        out.extend_from_slice(&v.to_le_bytes());
+    }
+    out.extend(links);
+    out.extend_from_slice(&(data_at as u32).to_le_bytes());
+    out.extend_from_slice(&(blocks.len() as u16).to_le_bytes());
+    out.extend_from_slice(&0u16.to_le_bytes());
+    out.extend(records);
+    out.extend(data);
+    out
+}
+
+const MARKER: &[u8] = b"exav-cab-set-marker-0123456789-end";
+
+fn cab_set() -> (Vec<u8>, Vec<u8>) {
+    let mut stream = vec![b'.'; 600];
+    stream.extend_from_slice(MARKER);
+    stream.extend_from_slice(&[b'.'; 600]);
+    // One block cut inside the marker.
+    let cut = 600 + MARKER.len() / 2;
+    let one = cab(
+        None,
+        Some("part2.cab"),
+        0,
+        &[(stream.len() as u32, 0, 0xFFFE, "marker.txt")],
+        &[(0, &stream[..cut])],
+    );
+    let two = cab(
+        Some("part1.cab"),
+        None,
+        1,
+        &[(stream.len() as u32, 0, 0xFFFD, "marker.txt")],
+        &[(stream.len() as u16, &stream[cut..])],
+    );
+    (one, two)
+}
+
+fn cab_db() -> Scanner {
+    let hex: String = MARKER.iter().map(|b| format!("{b:02x}")).collect();
+    db(&[("t.ndb", &format!("Test.Cab:0:*:{hex}\n"))])
+}
+
+#[test]
+fn a_cab_set_is_found_by_the_names_its_headers_give() {
+    let (one, two) = cab_set();
+    let scanner = cab_db();
+    let opts = ScanOptions::default();
+    for (p, name) in [(&one, "part1.cab"), (&two, "part2.cab")] {
+        assert!(
+            infected(&analyze(&scanner, p, &opts).verdict).is_none(),
+            "{name} alone"
+        );
+    }
+    let files = [
+        ("part1.cab", one.clone()),
+        ("part2.cab", two.clone()),
+        ("Readme.txt", b"hello".to_vec()),
+    ];
+    let given = names(&["part2.cab", "readme.txt", "part1.cab", "solo.cab"]);
+    let reads = RefCell::new(Vec::new());
+    let got = analyze_split_sets(&scanner, &given, &opts, |n, head| {
+        reads.borrow_mut().push((n.to_string(), head));
+        files
+            .iter()
+            .find(|(f, _)| *f == n)
+            .map(|(_, d)| d.clone())
+            .ok_or_else(|| std::io::Error::other("no such file"))
+    });
+    assert_eq!(got.len(), 2, "{got:?}");
+    for v in &got {
+        assert_eq!(infected(&v.report.verdict), Some("Test.Cab"), "{}", v.name);
+        assert_eq!(v.set, "part1.cab");
+    }
+    // A text file is not read at all; a cabinet is read by its head to see whether it names a neighbour.
+    assert!(!reads.borrow().iter().any(|(n, _)| n == "readme.txt"));
+    assert!(
+        reads
+            .borrow()
+            .iter()
+            .any(|(n, h)| n == "part1.cab" && h.is_some())
+    );
+}
+
+#[test]
+fn cabinets_that_do_not_follow_one_another_as_their_headers_say_are_not_joined() {
+    let (one, two) = cab_set();
+    let scanner = cab_db();
+    let files = [("part1.cab", one), ("renamed.cab", two)];
+    let got = analyze_split_sets(
+        &scanner,
+        &names(&["part1.cab", "renamed.cab"]),
+        &ScanOptions::default(),
+        |n, _| {
+            files
+                .iter()
+                .find(|(f, _)| *f == n)
+                .map(|(_, d)| d.clone())
+                .ok_or_else(|| std::io::Error::other("no such file"))
+        },
+    );
+    assert_eq!(got.len(), 2);
+    for v in &got {
+        assert!(
+            matches!(v.report.verdict, Verdict::Unscannable { .. }),
+            "{}: {:?}",
+            v.name,
+            v.report.verdict
+        );
+    }
+}
+
+#[test]
+fn a_set_turned_away_for_its_size_does_not_use_up_the_budget_of_the_next() {
+    // The first set trips the cap. The part that did it was counted and never
+    // given back, so the second set, which fits, was "too large to hold" too.
+    let scanner = db(&[]);
+    let mut opts = ScanOptions::default();
+    opts.deep_analysis_max = 4096;
+    let given = names(&["a.part1.rar", "a.part2.rar", "b.part1.rar", "b.part2.rar"]);
+    let got = analyze_split_sets(&scanner, &given, &opts, |n, _| {
+        Ok(vec![0u8; if n == "a.part1.rar" { 4097 } else { 1000 }])
+    });
+    let reason = |name: &str| match &got.iter().find(|v| v.name == name).unwrap().report.verdict {
+        Verdict::Unscannable { reason } => reason.clone(),
+        other => format!("{other:?}"),
+    };
+    assert!(
+        reason("a.part1.rar").contains("too large to hold"),
+        "{}",
+        reason("a.part1.rar")
+    );
+    assert!(
+        !reason("b.part1.rar").contains("too large to hold"),
+        "b fits the budget: {}",
+        reason("b.part1.rar")
+    );
+}
diff --git a/crates/exav-core/tests/suites/tar_size_terminator.rs b/crates/exav-core/tests/suites/tar_size_terminator.rs
index 4c3bddf2..6123454f 100644
--- a/crates/exav-core/tests/suites/tar_size_terminator.rs
+++ b/crates/exav-core/tests/suites/tar_size_terminator.rs
@@ -14,7 +14,7 @@
 //! tar — clean. Every npm package tarball is written by node-tar, which uses the
 //! space-then-NUL form.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
@@ -147,7 +147,7 @@ fn a_size_field_terminated_by_a_space_alone_is_parsed() {
 /// Pinning them together is what stops the next divergence hiding the same way.
 #[test]
 fn both_tar_readers_see_the_same_members() {
-    use exav_unpack::{extract, Budget, Format, Limits};
+    use exav_unpack::{Budget, Format, Limits, extract};
 
     // A COMPRESSED member, so the payload appears nowhere verbatim: the raw scan
     // cannot reach it and only the streaming walk can. With a plain member this
diff --git a/crates/exav-core/tests/suites/target_flash.rs b/crates/exav-core/tests/suites/target_flash.rs
index e8c350ce..cbe0b646 100644
--- a/crates/exav-core/tests/suites/target_flash.rs
+++ b/crates/exav-core/tests/suites/target_flash.rs
@@ -17,7 +17,7 @@
 //! * an untyped binary and a PE carrying the identical bytes — OK. A target-11
 //!   signature must not reach content that merely contains the pattern.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 
 /// A distinctive body, present verbatim in every fixture below. Only the file's
 /// *type* differs between them, so any difference in verdict is attributable to
diff --git a/crates/exav-core/tests/suites/target_text.rs b/crates/exav-core/tests/suites/target_text.rs
index 2c15a850..5fdefe13 100644
--- a/crates/exav-core/tests/suites/target_text.rs
+++ b/crates/exav-core/tests/suites/target_text.rs
@@ -12,8 +12,13 @@
 //!
 //! exav ran 3, 4 and 7 over raw bytes of any text-like type, and HTML and text
 //! views over every one of them: matches clamscan cannot make.
+//!
+//! The clamscan cases hold under `ScanOptions::clamav_compat()`. With the
+//! `visible-text` feature, the default options add a text view of the words a
+//! reader sees in an HTML file (Markdown, Office XML and drawings too), which
+//! `Target:7` signatures match: a widening on purpose, tested in `visible_text`.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 
 fn scanner(target: u8, body: &str) -> Scanner {
     let hex: String = body.bytes().map(|b| format!("{b:02x}")).collect();
@@ -31,6 +36,12 @@ fn found(target: u8, body: &str, file: &[u8]) -> bool {
     matches!(v, Verdict::Infected { .. })
 }
 
+/// As clamscan scans: no visible-text view.
+fn found_compat(target: u8, body: &str, file: &[u8]) -> bool {
+    let v = analyze(&scanner(target, body), file, &ScanOptions::clamav_compat()).verdict;
+    matches!(v, Verdict::Infected { .. })
+}
+
 const TEXT: &[u8] = b"Some text HELLO WORLD MARKER here\n";
 const RTF: &[u8] = b"{\\rtf1\\ansi HELLO WORLD MARKER}\n";
 const HTML: &[u8] = b"<html><body>HELLO WORLD MARKER</body></html>\n";
@@ -44,13 +55,24 @@ fn text_signatures_match_the_text_view_alone() {
     assert!(found(0, lower, TEXT));
     assert!(found(7, lower, TEXT));
     assert!(!found(7, upper, TEXT), "never the raw bytes");
-    assert!(!found(7, lower, HTML), "nor an HTML file");
+    assert!(!found_compat(7, lower, HTML), "nor an HTML file");
     assert!(
         !found(0, lower, b"Some text &#104;ello world marker\n"),
         "a text file's entities are not decoded"
     );
 }
 
+/// The visible-text view is what lets a text signature see an HTML file; its
+/// markup is still not part of it.
+#[cfg(feature = "visible-text")]
+#[test]
+fn text_signatures_see_the_words_of_an_html_file_by_default() {
+    let lower = "hello world marker";
+    assert!(found(7, lower, HTML));
+    assert!(!found(7, "<body>hello world marker", HTML), "no tags");
+    assert!(!found(7, "HELLO WORLD MARKER", HTML), "never the raw bytes");
+}
+
 #[test]
 fn html_signatures_match_the_html_view_alone() {
     let lower = "hello world marker";
diff --git a/crates/exav-core/tests/suites/tdb_attributes.rs b/crates/exav-core/tests/suites/tdb_attributes.rs
index 2cde8491..a779cbe7 100644
--- a/crates/exav-core/tests/suites/tdb_attributes.rs
+++ b/crates/exav-core/tests/suites/tdb_attributes.rs
@@ -15,7 +15,7 @@
 //! * `Container:CL_TYPE_HTML` is satisfiable, which only holds because the
 //!   assets a page carries inline get extracted from it.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 use std::io::Write;
 
 const MARK: &[u8] = b"exav-tdb-probe-marker-0123456789";
diff --git a/crates/exav-core/tests/suites/untyped_container_dispatch.rs b/crates/exav-core/tests/suites/untyped_container_dispatch.rs
index 23ff4ad3..4564a543 100644
--- a/crates/exav-core/tests/suites/untyped_container_dispatch.rs
+++ b/crates/exav-core/tests/suites/untyped_container_dispatch.rs
@@ -12,7 +12,7 @@
 //! appears nowhere in their bytes (asserted below), so a verdict of `Infected`
 //! can only come from the container actually being opened.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
@@ -47,6 +47,21 @@ fn a_unix_compress_stream_is_decompressed_and_scanned() {
     assert_found("eicar.txt.Z");
 }
 
+#[test]
+#[cfg(feature = "lzma")]
+fn an_lzma_alone_stream_is_decompressed_and_scanned() {
+    // `xz --format=lzma`: no magic number, found by the header's own rules.
+    assert_found("eicar.txt.lzma");
+}
+
+#[test]
+#[cfg(feature = "rpm")]
+fn an_rpm_payload_is_decompressed_and_scanned() {
+    // A package whose gzip cpio payload holds the EICAR file (`make.py` in
+    // exav-unpack's rpm fixtures).
+    assert_found("eicar.rpm");
+}
+
 #[test]
 #[cfg(feature = "diskimage")]
 fn a_compressed_qcow2_is_reconstructed_and_scanned() {
diff --git a/crates/exav-core/tests/suites/visible_text.rs b/crates/exav-core/tests/suites/visible_text.rs
new file mode 100644
index 00000000..8912d33d
--- /dev/null
+++ b/crates/exav-core/tests/suites/visible_text.rs
@@ -0,0 +1,345 @@
+//! A Markdown document is matched through the text a reader sees as well as
+//! its bytes: its words without the marks, entities decoded, and where each
+//! link leads. Which files are Markdown is their name's: `.md` and
+//! `.markdown`, the input's or a member's.
+
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
+
+/// A one-signature database: `Target:7`, which a text view alone matches.
+fn scanner(target: u8, body: &str) -> Scanner {
+    let hex: String = body.bytes().map(|b| format!("{b:02x}")).collect();
+    let mut l = loader::Builder::new();
+    l.add_named_bytes(
+        "t.ndb",
+        format!("Test.Visible:{target}:*:{hex}\n").as_bytes(),
+        true,
+    );
+    l.build().unwrap()
+}
+
+fn verdict(db: &Scanner, name: Option<&str>, file: &[u8], compat: bool) -> Verdict {
+    let mut o = ScanOptions::default();
+    o.filename = name.map(str::to_string);
+    o.clamav_compat = compat;
+    analyze(db, file, &o).verdict
+}
+
+fn found(target: u8, body: &str, name: Option<&str>, file: &[u8]) -> bool {
+    matches!(
+        verdict(&scanner(target, body), name, file, false),
+        Verdict::Infected { .. }
+    )
+}
+
+#[test]
+fn the_words_are_matched_without_the_marks_between_them() {
+    let md = b"Please *Download* the **new** version.\n";
+    let sig = "please download the new version.";
+    assert!(found(7, sig, Some("README.md"), md));
+    assert!(found(7, sig, Some("notes.MARKDOWN"), md));
+    // The same bytes under another name are text, whose view keeps the marks.
+    assert!(!found(7, sig, Some("notes.txt"), md));
+    assert!(!found(7, sig, None, md));
+}
+
+#[test]
+fn an_entity_is_matched_as_the_character_it_is() {
+    let md = b"Fish &amp; chips &lt;now&gt;\n";
+    assert!(found(7, "fish & chips <now>", Some("a.md"), md));
+    assert!(!found(7, "fish & chips <now>", Some("a.txt"), md));
+}
+
+#[test]
+fn a_link_is_matched_as_its_label_and_where_it_goes() {
+    let md = b"[Click here](https://evil.example/payload.exe) to continue\n";
+    assert!(found(
+        7,
+        "click here (https://evil.example/payload.exe) to continue",
+        Some("a.md"),
+        md
+    ));
+    // The label names one site, the target another.
+    let spoof = b"Sign in at [https://www.paypal.com/login](https://evil.example/steal)\n";
+    assert!(found(
+        7,
+        "https://www.paypal.com/login (https://evil.example/steal)",
+        Some("a.md"),
+        spoof
+    ));
+    // A target the viewer would refuse is still seen.
+    assert!(found(
+        7,
+        "run (javascript:alert(1))",
+        Some("a.md"),
+        b"[run](javascript:alert(1))\n"
+    ));
+}
+
+#[test]
+fn target_zero_signatures_see_it_too_and_html_ones_do_not() {
+    let md = b"a *b* c\n";
+    assert!(found(0, "a b c", Some("a.md"), md));
+    assert!(!found(3, "a b c", Some("a.md"), md));
+}
+
+#[test]
+fn the_bytes_are_still_matched_as_before() {
+    assert!(found(0, "a *b* c", Some("a.md"), b"A *B* C\n"));
+}
+
+#[test]
+fn not_under_clamav_compat() {
+    let md = b"Please *download* it\n";
+    let db = scanner(7, "please download it");
+    assert!(matches!(
+        verdict(&db, Some("a.md"), md, false),
+        Verdict::Infected { .. }
+    ));
+    assert!(matches!(
+        verdict(&db, Some("a.md"), md, true),
+        Verdict::Clean
+    ));
+}
+
+/// A stored-only ZIP holding one member.
+fn zip_with(name: &str, data: &[u8]) -> Vec<u8> {
+    let crc = {
+        let mut c = !0u32;
+        for &b in data {
+            c ^= b as u32;
+            for _ in 0..8 {
+                c = if c & 1 != 0 {
+                    (c >> 1) ^ 0xEDB8_8320
+                } else {
+                    c >> 1
+                };
+            }
+        }
+        !c
+    };
+    let mut out = Vec::new();
+    out.extend_from_slice(b"PK\x03\x04");
+    for v in [20u16, 0, 0, 0, 0] {
+        out.extend_from_slice(&v.to_le_bytes());
+    }
+    out.extend_from_slice(&crc.to_le_bytes());
+    out.extend_from_slice(&(data.len() as u32).to_le_bytes());
+    out.extend_from_slice(&(data.len() as u32).to_le_bytes());
+    out.extend_from_slice(&(name.len() as u16).to_le_bytes());
+    out.extend_from_slice(&0u16.to_le_bytes());
+    out.extend_from_slice(name.as_bytes());
+    out.extend_from_slice(data);
+    let cd = out.len() as u32;
+    let mut c = Vec::new();
+    c.extend_from_slice(b"PK\x01\x02");
+    for v in [20u16, 20, 0, 0, 0, 0] {
+        c.extend_from_slice(&v.to_le_bytes());
+    }
+    c.extend_from_slice(&crc.to_le_bytes());
+    c.extend_from_slice(&(data.len() as u32).to_le_bytes());
+    c.extend_from_slice(&(data.len() as u32).to_le_bytes());
+    c.extend_from_slice(&(name.len() as u16).to_le_bytes());
+    for v in [0u16, 0, 0, 0] {
+        c.extend_from_slice(&v.to_le_bytes());
+    }
+    c.extend_from_slice(&0u32.to_le_bytes());
+    c.extend_from_slice(&0u32.to_le_bytes());
+    c.extend_from_slice(name.as_bytes());
+    let cl = c.len() as u32;
+    out.extend_from_slice(&c);
+    out.extend_from_slice(b"PK\x05\x06");
+    for v in [0u16, 0, 1, 1] {
+        out.extend_from_slice(&v.to_le_bytes());
+    }
+    out.extend_from_slice(&cl.to_le_bytes());
+    out.extend_from_slice(&cd.to_le_bytes());
+    out.extend_from_slice(&0u16.to_le_bytes());
+    out
+}
+
+#[test]
+fn a_member_is_markdown_by_its_own_name() {
+    let md = b"Please *download* the **new** version.\n";
+    let sig = scanner(7, "please download the new version.");
+    let yes = zip_with("docs/Readme.md", md);
+    let no = zip_with("docs/readme.txt", md);
+    assert!(matches!(
+        verdict(&sig, None, &yes, false),
+        Verdict::Infected { .. }
+    ));
+    assert!(matches!(verdict(&sig, None, &no, false), Verdict::Clean));
+    // The archive's own name does not make its members Markdown.
+    assert!(matches!(
+        verdict(&sig, Some("x.md"), &no, false),
+        Verdict::Clean
+    ));
+}
+
+/// A one-page PDF, its text drawn by `content`, padded to `pad` bytes.
+#[cfg(feature = "visible-text-pdf")]
+fn pdf_with(content: &str, pad: usize) -> Vec<u8> {
+    let mut v = format!(
+        "%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n\
+         2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n\
+         3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>endobj\n\
+         4 0 obj<</Length {}>>\nstream\n{content}\nendstream\nendobj\n\
+         5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>endobj\n\
+         trailer<</Root 1 0 R>>\n%%EOF\n",
+        content.len()
+    )
+    .into_bytes();
+    if v.len() < pad {
+        v.resize(pad, b'\n');
+    }
+    v
+}
+
+#[cfg(feature = "visible-text-pdf")]
+#[test]
+fn a_pdfs_text_is_matched_though_its_bytes_hold_it_in_pieces() {
+    let pdf = pdf_with(
+        "BT /F1 12 Tf 72 700 Td [(Pay to ev) 10 (il.exa) 5 (mple)] TJ ET",
+        0,
+    );
+    assert!(found(7, "pay to evil.example", None, &pdf));
+    assert!(found(0, "pay to evil.example", None, &pdf));
+}
+
+#[cfg(feature = "visible-text-pdf")]
+#[test]
+fn a_compressed_pdf_stream_is_read_through() {
+    use std::io::Write;
+    let content = "BT /F1 12 Tf 72 700 Td (Compressed bait text) Tj ET";
+    let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+    z.write_all(content.as_bytes()).unwrap();
+    let z = z.finish().unwrap();
+    let mut pdf = b"%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>endobj\n".to_vec();
+    pdf.extend_from_slice(
+        format!(
+            "4 0 obj<</Length {}/Filter/FlateDecode>>\nstream\n",
+            z.len()
+        )
+        .as_bytes(),
+    );
+    pdf.extend_from_slice(&z);
+    pdf.extend_from_slice(b"\nendstream\nendobj\n5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>endobj\ntrailer<</Root 1 0 R>>\n%%EOF\n");
+    assert!(found(7, "compressed bait text", None, &pdf));
+}
+
+#[test]
+fn html_is_matched_without_its_tags() {
+    let html = b"<html><body><p>Click <b>here</b> to <a href='http://evil.example/x'>continue</a></p></body></html>";
+    assert!(found(
+        7,
+        "click here to continue (http://evil.example/x)",
+        Some("mail.html"),
+        html
+    ));
+    // Found by its content too, with no name.
+    assert!(found(
+        7,
+        "click here to continue (http://evil.example/x)",
+        None,
+        html
+    ));
+    // A link whose label names another site.
+    let spoof = b"<a href='https://evil.example/steal'>https://www.paypal.com/login</a>";
+    assert!(found(
+        7,
+        "https://www.paypal.com/login (https://evil.example/steal)",
+        None,
+        spoof
+    ));
+}
+
+fn phishing(name: &str, file: &[u8], alert: bool) -> Verdict {
+    let mut o = ScanOptions::default();
+    o.filename = Some(name.to_string());
+    o.alert_phishing = alert;
+    analyze(&scanner(7, "never present"), file, &o).verdict
+}
+
+#[test]
+fn a_link_that_says_one_site_and_goes_to_another_is_phishing_in_markdown_too() {
+    let md = b"Sign in at [https://www.paypal.com/login](https://evil.example/steal) today\n";
+    match phishing("mail.md", md, true) {
+        Verdict::Infected { signature, .. } => {
+            assert_eq!(signature, "Heuristics.Phishing.Email.SpoofedDomain")
+        }
+        v => panic!("{v:?}"),
+    }
+    // Off unless asked for, as for HTML.
+    assert!(matches!(phishing("mail.md", md, false), Verdict::Clean));
+    // A link that is what it says is not.
+    assert!(matches!(
+        phishing(
+            "mail.md",
+            b"[www.paypal.com](https://www.paypal.com/login)\n",
+            true
+        ),
+        Verdict::Clean
+    ));
+    // Nor a label that names no site.
+    assert!(matches!(
+        phishing("mail.md", b"[click here](https://evil.example/x)\n", true),
+        Verdict::Clean
+    ));
+}
+
+#[test]
+fn an_html_link_whose_target_is_written_in_entities_is_judged_as_it_reads() {
+    // The raw anchor reader sees `https&#58;//...`; the page reads `https://...`.
+    let html = b"<a href=\"https&#58;//evil.example/x\">www.paypal.com</a>";
+    assert!(matches!(
+        phishing("mail.html", html, true),
+        Verdict::Infected { .. }
+    ));
+}
+
+#[test]
+fn the_parts_of_an_office_file_are_matched_by_their_path() {
+    let part = b"<w:document><w:body><w:p><w:r><w:t>Please down</w:t></w:r><w:r><w:t>load the</w:t></w:r><w:r><w:t xml:space=\"preserve\"> attachment</w:t></w:r></w:p></w:body></w:document>";
+    let sig = scanner(7, "please download the attachment");
+    let docx = zip_with("word/document.xml", part);
+    let other = zip_with("word/other.xml", part);
+    assert!(matches!(
+        verdict(&sig, None, &docx, false),
+        Verdict::Infected { .. }
+    ));
+    assert!(matches!(verdict(&sig, None, &other, false), Verdict::Clean));
+}
+
+#[test]
+fn a_drawings_text_is_matched_without_its_formatting() {
+    let dxf = "  0\nSECTION\n  2\nENTITIES\n  0\nMTEXT\n  8\n0\n 10\n0.0\n 20\n0.0\n 30\n0.0\n 40\n2.5\n  1\nPay\\Pnow\n  0\nENDSEC\n  0\nEOF\n";
+    assert!(found(7, "pay now", Some("plan.dxf"), dxf.as_bytes()));
+    assert!(!found(7, "pay now", Some("plan.txt"), b"Pay\\Pnow"));
+}
+
+#[test]
+fn an_object_not_held_in_memory_is_not_reported_clean_when_it_has_text() {
+    let db = scanner(7, "never present");
+    // An HTML page: binary objects get no text view for the size to matter to.
+    let mut page = b"<html><body><p>words</p></body></html>".to_vec();
+    page.resize(16 * 1024, b' ');
+    let verdict = |max: u64| {
+        let mut o = ScanOptions::default();
+        o.deep_analysis_max = max;
+        o.filename = Some("page.html".to_string());
+        analyze(&db, &page, &o).verdict
+    };
+    assert!(matches!(verdict(1 << 20), Verdict::Clean));
+    // `analyze` holds the bytes whatever the limit; a larger input is read through a cache.
+    let mut o = ScanOptions::default();
+    o.deep_analysis_max = 4096;
+    o.filename = Some("page.html".to_string());
+    let v = exav_core::scan_seekable(
+        &db,
+        std::io::Cursor::new(page.clone()),
+        page.len() as u64,
+        &o,
+    )
+    .expect("scan")
+    .verdict;
+    assert!(!matches!(v, Verdict::Clean), "{v:?}");
+}
diff --git a/crates/exav-core/tests/suites/visible_text_office.rs b/crates/exav-core/tests/suites/visible_text_office.rs
new file mode 100644
index 00000000..16442a34
--- /dev/null
+++ b/crates/exav-core/tests/suites/visible_text_office.rs
@@ -0,0 +1,138 @@
+//! The office formats' text (`visible-text-office`): a DOC, an XLS, a PPT, an
+//! RTF, a flat OpenDocument file is matched through the words a reader sees,
+//! its links are judged, and one whose text cannot be taken out is never
+//! reported clean.
+
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
+
+const DOC: &[u8] = include_bytes!("../../../exav-render/tests/fixtures/office/docs/sample.doc");
+const XLS: &[u8] = include_bytes!("../../../exav-render/tests/fixtures/office/sheets/sample.xls");
+const PPT: &[u8] = include_bytes!("../../../exav-render/tests/fixtures/office/slides/sample.ppt");
+
+/// A one-signature database: `Target:7`, which a text view alone matches.
+fn scanner(body: &str) -> Scanner {
+    let hex: String = body.bytes().map(|b| format!("{b:02x}")).collect();
+    let mut l = loader::Builder::new();
+    l.add_named_bytes(
+        "t.ndb",
+        format!("Test.Visible:7:*:{hex}\n").as_bytes(),
+        true,
+    );
+    l.build().unwrap()
+}
+
+fn verdict(db: &Scanner, name: &str, file: &[u8], phishing: bool) -> Verdict {
+    let mut o = ScanOptions::default();
+    o.filename = Some(name.to_string());
+    o.alert_phishing = phishing;
+    analyze(db, file, &o).verdict
+}
+
+fn found(words: &str, name: &str, file: &[u8]) -> bool {
+    matches!(
+        verdict(&scanner(words), name, file, false),
+        Verdict::Infected { .. }
+    )
+}
+
+#[test]
+fn an_rtf_phrase_split_by_its_groups_is_matched_as_the_words() {
+    let rtf = b"{\\rtf1\\ansi Please down{\\b load} the \\i attach\\i0 ment\\par}";
+    assert!(found("please download the attachment", "mail.rtf", rtf));
+    // The words of another document are not there.
+    assert!(!found("please upload the attachment", "mail.rtf", rtf));
+}
+
+#[test]
+fn the_words_of_a_doc_an_xls_and_a_ppt_are_matched() {
+    assert!(found("revenue grew by twelve percent", "report.doc", DOC));
+    assert!(found("merged note across three columns", "budget.xls", XLS));
+    assert!(found("revenue up 12%", "deck.ppt", PPT));
+    // A compound file is read by its name: another one is not read.
+    assert!(!found("revenue up 12%", "deck.bin", PPT));
+}
+
+#[test]
+fn a_flat_opendocument_file_is_matched_without_its_markup() {
+    let fodt = br#"<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:mimetype="application/vnd.oasis.opendocument.text"><office:body><office:text><text:p>Wire the <text:span>funds</text:span> <text:s/>today</text:p></office:text></office:body></office:document>"#;
+    assert!(found("wire the funds today", "invoice.fodt", fodt));
+}
+
+#[test]
+fn a_link_that_says_one_site_and_goes_to_another_is_phishing_in_a_legacy_format_too() {
+    let rtf = b"{\\rtf1\\ansi Sign in: {\\field{\\*\\fldinst HYPERLINK \"https://evil.example/steal\"}{\\fldrslt https://www.paypal.com/login}}\\par}";
+    let db = scanner("never present");
+    match verdict(&db, "mail.rtf", rtf, true) {
+        Verdict::Infected { signature, .. } => {
+            assert_eq!(signature, "Heuristics.Phishing.Email.SpoofedDomain")
+        }
+        v => panic!("{v:?}"),
+    }
+    assert!(matches!(
+        verdict(&db, "mail.rtf", rtf, false),
+        Verdict::Clean
+    ));
+}
+
+/// The sample DOC with its FIB's encrypted flag set.
+fn encrypted_doc() -> Vec<u8> {
+    let mut d = DOC.to_vec();
+    // The WordDocument stream starts a sector with the FIB's magic, 0xA5EC.
+    let at = (1..d.len() / 512)
+        .map(|s| s * 512)
+        .find(|&o| d[o] == 0xEC && d[o + 1] == 0xA5)
+        .expect("the FIB");
+    // fEncrypted: bit 8 of the flags word at 0x0A.
+    d[at + 0x0B] |= 0x01;
+    d
+}
+
+#[test]
+fn a_document_whose_text_cannot_be_read_is_not_reported_clean() {
+    let db = scanner("never present");
+    // Read, nothing found: clean.
+    assert!(matches!(
+        verdict(&db, "report.doc", DOC, false),
+        Verdict::Clean
+    ));
+    // Encrypted: its text is not seen, and the scan says so.
+    let v = verdict(&db, "report.doc", &encrypted_doc(), false);
+    assert!(
+        !matches!(v, Verdict::Clean | Verdict::Infected { .. }),
+        "{v:?}"
+    );
+}
+
+#[test]
+fn a_damaged_document_whose_text_cannot_be_taken_out_makes_the_scan_incomplete() {
+    // The FIB's fields erased: the reader refuses it as damaged, and nothing
+    // else in the scan looks at what a reader would see.
+    let mut d = DOC.to_vec();
+    let at = (1..d.len() / 512)
+        .map(|s| s * 512)
+        .find(|&o| d[o] == 0xEC && d[o + 1] == 0xA5)
+        .expect("the FIB");
+    d[at + 0x20..at + 0x60].fill(0xFF);
+    let db = scanner("never present");
+    let v = verdict(&db, "broken.doc", &d, false);
+    assert!(
+        !matches!(v, Verdict::Clean | Verdict::Infected { .. }),
+        "{v:?}"
+    );
+    // The same bytes under a name that is not an office document's: read as
+    // nothing, clean.
+    assert!(matches!(
+        verdict(&db, "broken.bin", &d, false),
+        Verdict::Clean
+    ));
+}
+
+#[test]
+fn a_file_that_only_looks_like_a_document_by_its_name_is_not_reported_incomplete() {
+    // Not a compound file at all, under a .doc name: nothing to read.
+    let db = scanner("never present");
+    assert!(matches!(
+        verdict(&db, "notes.doc", b"just some plain words", false),
+        Verdict::Clean
+    ));
+}
diff --git a/crates/exav-core/tests/suites/yara_dotnet.rs b/crates/exav-core/tests/suites/yara_dotnet.rs
index d8f97c52..bd7bc762 100644
--- a/crates/exav-core/tests/suites/yara_dotnet.rs
+++ b/crates/exav-core/tests/suites/yara_dotnet.rs
@@ -24,7 +24,7 @@
 //! field offsets, 22 assembly refs — which is too large to commit;
 //! `scripts/yara-dotnet-difftest.sh` reproduces that run.
 
-use exav_core::{analyze, loader, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze, loader};
 
 fn fixture() -> Vec<u8> {
     let p = format!(
diff --git a/crates/exav-core/tests/suites/zip_dual_index.rs b/crates/exav-core/tests/suites/zip_dual_index.rs
index 176d7baa..ee83e3f3 100644
--- a/crates/exav-core/tests/suites/zip_dual_index.rs
+++ b/crates/exav-core/tests/suites/zip_dual_index.rs
@@ -11,7 +11,7 @@
 //! a member exav could not read is content it did not examine, and reporting the
 //! containing file clean on that basis is exactly the silent-clean bug.
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
@@ -309,7 +309,7 @@ fn streamed_orphan_members_carrying_eicar_are_found() {
         env!("CARGO_MANIFEST_DIR"),
         "/../exav-unpack/tests/fixtures/zip/eicar_lzma.zip"
     );
-    let zip = std::fs::read(path).unwrap();
+    let zip = exav_core::unpack::read_fixture(path).unwrap();
     let field = |o: usize| u32::from_le_bytes(zip[o..o + 4].try_into().unwrap()) as usize;
     let start = 30 + usize::from(u16::from_le_bytes([zip[26], zip[27]]));
     assert_eq!((&zip[..4], zip[8], zip[28]), (&b"PK\x03\x04"[..], 14, 0));
diff --git a/crates/exav-core/tests/suites/zip_ppmd.rs b/crates/exav-core/tests/suites/zip_ppmd.rs
index 4e6a59ed..b9dc6de2 100644
--- a/crates/exav-core/tests/suites/zip_ppmd.rs
+++ b/crates/exav-core/tests/suites/zip_ppmd.rs
@@ -3,7 +3,7 @@
 
 use std::io::Write;
 
-use exav_core::{analyze, ScanOptions, Scanner, Verdict};
+use exav_core::{ScanOptions, Scanner, Verdict, analyze};
 
 fn eicar() -> &'static [u8] {
     exav_core::unpack::eicar()
diff --git a/crates/exav-core/tests/yara_conformance.rs b/crates/exav-core/tests/yara_conformance.rs
index d759cbd3..873776f0 100644
--- a/crates/exav-core/tests/yara_conformance.rs
+++ b/crates/exav-core/tests/yara_conformance.rs
@@ -43,7 +43,7 @@ fn pattern_data(pattern: &str, data: &[u8]) -> Option<Vec<u8>> {
 }
 
 macro_rules! condition_true {
-    ($cond:literal, $data:expr) => {
+    ($cond:literal, $data:expr_2021) => {
         test_condition($cond, $data, true)
     };
     ($cond:literal) => {
@@ -51,7 +51,7 @@ macro_rules! condition_true {
     };
 }
 macro_rules! condition_false {
-    ($cond:literal, $data:expr) => {
+    ($cond:literal, $data:expr_2021) => {
         test_condition($cond, $data, false)
     };
     ($cond:literal) => {
@@ -59,23 +59,23 @@ macro_rules! condition_false {
     };
 }
 macro_rules! rule_true {
-    ($rule:expr, $data:expr) => {
+    ($rule:expr_2021, $data:expr_2021) => {
         test_rule($rule, $data, true)
     };
-    ($rule:expr) => {
+    ($rule:expr_2021) => {
         test_rule($rule, &[], true)
     };
 }
 macro_rules! rule_false {
-    ($rule:expr, $data:expr) => {
+    ($rule:expr_2021, $data:expr_2021) => {
         test_rule($rule, $data, false)
     };
-    ($rule:expr) => {
+    ($rule:expr_2021) => {
         test_rule($rule, &[], false)
     };
 }
 macro_rules! pattern_true {
-    ($pattern:literal, $data:expr) => {
+    ($pattern:literal, $data:expr_2021) => {
         assert!(
             pattern_data($pattern, $data).is_some(),
             "pattern `{}` should match {:?}",
@@ -85,7 +85,7 @@ macro_rules! pattern_true {
     };
 }
 macro_rules! pattern_false {
-    ($pattern:literal, $data:expr) => {
+    ($pattern:literal, $data:expr_2021) => {
         assert!(
             pattern_data($pattern, $data).is_none(),
             "pattern `{}` should NOT match {:?}",
@@ -95,7 +95,7 @@ macro_rules! pattern_false {
     };
 }
 macro_rules! pattern_match {
-    ($pattern:literal, $data:expr, $expected:expr) => {{
+    ($pattern:literal, $data:expr_2021, $expected:expr_2021) => {{
         let got = pattern_data($pattern, $data)
             .unwrap_or_else(|| panic!("pattern `{}` should match", $pattern));
         assert_eq!(
@@ -648,7 +648,9 @@ fn xor() {
     pattern_false!(r#""mississippi" xor(2-255)"#, b"lhrrhrrhqqh");
     pattern_true!(
         r#""mississippi" xor(255)"#,
-        &[0x92, 0x96, 0x8C, 0x8C, 0x96, 0x8C, 0x8C, 0x96, 0x8F, 0x8F, 0x96]
+        &[
+            0x92, 0x96, 0x8C, 0x8C, 0x96, 0x8C, 0x8C, 0x96, 0x8F, 0x8F, 0x96
+        ]
     );
 }
 
diff --git a/crates/exav-grep/Cargo.toml b/crates/exav-grep/Cargo.toml
index d6be1134..102f9dcf 100644
--- a/crates/exav-grep/Cargo.toml
+++ b/crates/exav-grep/Cargo.toml
@@ -9,20 +9,34 @@ homepage.workspace = true
 keywords = ["grep", "search", "archive", "zip", "extract"]
 categories = ["command-line-utilities", "filesystem"]
 readme = "README.md"
-description = "grep for the inside of archives: search text across zip/rar/7z/tar/iso/OLE/PDF/email members, recursively, in memory."
+description = "grep for the inside of archives: search text across zip/rar/7z/tar/iso/OLE/PDF/email members, recursively, in bounded memory."
 
 [[bin]]
 name = "exav-grep"
 path = "src/main.rs"
 
 [dependencies]
-exav-unpack = { path = "../exav-unpack", version = "0.0.2", default-features = false, features = ["all-formats"] }
+exav-unpack = { path = "../exav-unpack", version = "0.0.3", default-features = false, features = ["all-formats"] }
+memchr = "2"
 regex = "1"
 clap = { workspace = true }
 walkdir = { workspace = true }
+# The text of a document as a reader sees it (`text` feature): exav-render's
+# `text`: Markdown, HTML, Office and OpenDocument XML parts, PDF and drawings.
+exav-render = { path = "../exav-render", version = "0.0.3", default-features = false, features = ["text"], optional = true }
 
 [features]
-default = ["decrypt"]
+default = ["decrypt", "text"]
+# `--text`: search the text a reader sees rather than the bytes, for the
+# formats that have one (Markdown, HTML, Office and OpenDocument XML parts,
+# PDF, drawings).
+text = ["dep:exav-render"]
+# And PDF's, read by hayro.
+text-pdf = ["text", "exav-render/text-pdf"]
+# And the office formats the XML parts do not reach: DOC, XLS, PPT, RTF, Word
+# 2003 XML, SpreadsheetML 2003, SYLK, flat OpenDocument, Numbers, Pages and
+# Keynote, by sheet, slide and part. The largest readers: not a default.
+text-office = ["text", "exav-render/text-office"]
 # Decrypt encrypted members (ZIP/7z/DMG/Office) so their contents are searchable
 # rather than reported as unreadable.
 decrypt = ["exav-unpack/decrypt"]
diff --git a/crates/exav-grep/README.md b/crates/exav-grep/README.md
index eab7bbe5..f5188c2f 100644
--- a/crates/exav-grep/README.md
+++ b/crates/exav-grep/README.md
@@ -24,13 +24,20 @@ searcher.search_path(std::path::Path::new("backup.zip"), &mut |ev| {
 })?;
 ```
 
-## Everything happens in memory
+## Bounded memory, nothing on disk
 
 No member is ever written to disk, so the zip-slip / path-traversal / symlink
 class of bug does not arise: there is no path to traverse to. Extraction runs
 under the same decompression-bomb budgets the exav scanner uses, so a malicious
 archive cannot turn a search into an unbounded allocation.
 
+A file is never read whole past 16 MiB: a container is walked through a block
+cache, and anything else is searched a megabyte at a time. A 3.4 GB log was
+searched with an 18 MB peak, and a 1.5 GB stored member of a ZIP with 280 MB.
+A member up to `--max-object-bytes` (256 MiB) is held, so that a container
+inside it can be opened; a longer one is searched as it is read, and a
+container in it is reported unreadable. So is a line longer than that limit.
+
 `#![forbid(unsafe_code)]`, in this crate and in the extractor beneath it.
 
 ## Members that cannot be read are reported
diff --git a/crates/exav-grep/src/lib.rs b/crates/exav-grep/src/lib.rs
index ac0a8b36..7548c9ae 100644
--- a/crates/exav-grep/src/lib.rs
+++ b/crates/exav-grep/src/lib.rs
@@ -9,12 +9,23 @@
 //! backup.zip!logs.tar.gz!logs/app.log:42:  connection from 10.0.0.7
 //! ```
 //!
-//! Everything happens **in memory** — no member is ever written to disk, so the
-//! zip-slip / path-traversal / symlink class does not arise. Extraction runs
-//! under [`exav_unpack::Budget`], the same decompression-bomb budgets the
-//! scanner uses, so a malicious archive cannot turn a search into an unbounded
+//! No member is ever written to disk, so the zip-slip / path-traversal /
+//! symlink class does not arise. Extraction runs under
+//! [`exav_unpack::Budget`], the same decompression-bomb budgets the scanner
+//! uses, so a malicious archive cannot turn a search into an unbounded
 //! allocation.
 //!
+//! ## Memory
+//!
+//! A file is read as the search needs it, never whole past a small size: a
+//! container is walked through a block cache, and a file or a member that is
+//! not a container is searched a megabyte at a time. What is held is bounded
+//! by [`exav_unpack::Limits::max_buffer_bytes`]: a member up to it is held (so
+//! that a container inside it can be opened), a longer one is searched as it
+//! is read, and a container in it, which cannot be opened without holding it,
+//! is reported unreadable. A line longer than the bound is reported
+//! unreadable too.
+//!
 //! ## Members that cannot be read are reported
 //!
 //! A member exav cannot decode — unsupported codec, encryption without a working
@@ -39,10 +50,23 @@
 // on docs.rs after publishing.
 #![warn(missing_docs)]
 
+use std::collections::VecDeque;
 use std::fmt;
+use std::io::{self, Read};
 use std::path::Path;
 
-use exav_unpack::{Budget, Limits};
+use exav_unpack::source::{BlockCache, Reader};
+use exav_unpack::{Budget, ByteSource, Format, Limits, Member, MemberMeta};
+
+/// Files up to this size are read into memory; a larger one is read through a
+/// block cache.
+const HOLD_WHOLE: u64 = 16 << 20;
+
+/// Bytes read at a time when a file or a member is searched as a stream.
+const READ: usize = 1 << 20;
+
+/// How much of a member is looked at to tell text from binary.
+const BINARY_PROBE: usize = 8192;
 
 /// Separator between a container and a member in a reported path, mirroring the
 /// convention `7z`/`unzip` tooling uses so the output is greppable in turn.
@@ -103,6 +127,14 @@ pub struct Options {
     pub max_count: usize,
     /// Treat a member as binary and report only that it matched, not the line.
     pub binary_as_matches: bool,
+    /// Search the text a reader sees rather than the bytes, for a member that
+    /// has one: Markdown, HTML, the XML parts of Office and OpenDocument files,
+    /// PDF and drawings are searched as their words, with entities decoded and
+    /// each link followed by where it goes, under the path `file.md!text`, its
+    /// line numbers being the text's. A document that is also a container (a
+    /// PDF, a drawing) is walked for its members as before. Does nothing
+    /// without the `text` feature.
+    pub text: bool,
 }
 
 /// One result of the search.
@@ -218,12 +250,10 @@ impl Searcher {
     /// has gone away — a closed pipe, a full disk — keeps being handed results
     /// for the rest of the walk.
     ///
-    /// A file larger than the per-object budget is reported rather than read:
-    /// the extraction limits bound what comes OUT of a container, and nothing
-    /// bounded what went in, so a sparse file, a disk image or a `/proc`-style
-    /// pseudo-file was read whole into memory first. Under a memory cgroup that
-    /// is a kill rather than an error, and a killed process reports nothing at
-    /// all.
+    /// A file of any size is searched in bounded memory: one over 16 MiB is
+    /// read through a block cache, so a disk image or a multi-gigabyte log costs
+    /// what its walk holds and not its size. A pseudo-file that is not a regular
+    /// file is reported rather than read.
     pub fn search_path(&mut self, path: &Path, sink: Sink) -> std::io::Result<bool> {
         let label = path.display().to_string();
         let meta = std::fs::metadata(path)?;
@@ -234,24 +264,40 @@ impl Searcher {
                 reason: "not a regular file".to_string(),
             }));
         }
-        let cap = self.opts.limits.max_buffer_bytes;
-        if meta.len() > cap {
-            self.unreadable += 1;
-            return Ok(sink(Event::Unreadable {
-                path: label,
-                reason: format!("{} bytes, over the {cap}-byte input cap", meta.len()),
-            }));
+        let file = std::fs::File::open(path)?;
+        if meta.len() <= HOLD_WHOLE {
+            let mut data = Vec::with_capacity(meta.len() as usize);
+            (&file).take(HOLD_WHOLE + 1).read_to_end(&mut data)?;
+            return Ok(self.search_source(&label, &data, sink));
         }
-        let data = std::fs::read(path)?;
-        Ok(self.search_bytes(&label, &data, sink))
+        let cache = BlockCache::new(file)?;
+        Ok(self.search_source(&label, &cache, sink))
     }
 
     /// Search an in-memory buffer under `label`.
-    ///
     pub fn search_bytes(&mut self, label: &str, data: &[u8], sink: Sink) -> bool {
+        self.search_source(label, &data, sink)
+    }
+
+    /// Search any readable-at-an-offset source under `label`. A read that
+    /// failed is reported unreadable, never taken for the end of the data.
+    fn search_source(&mut self, label: &str, src: &dyn ByteSource, sink: Sink) -> bool {
         let mut budget = Budget::new(self.opts.limits.clone());
         budget.passwords = self.opts.passwords.clone();
-        self.walk(label, data, &mut budget, 0, sink)
+        let go = self.walk(label, src, &mut budget, 0, sink);
+        if go && let Some(e) = src.read_error() {
+            self.unreadable += 1;
+            return sink(Event::Unreadable {
+                path: label.to_string(),
+                reason: format!("read failed: {e}"),
+            });
+        }
+        go
+    }
+
+    /// The most a buffer may hold, as `usize`.
+    fn cap(&self) -> usize {
+        usize::try_from(self.opts.limits.max_buffer_bytes).unwrap_or(usize::MAX)
     }
 
     /// Search `data`, then recurse into it if it is a container. Returns `false`
@@ -259,7 +305,7 @@ impl Searcher {
     fn walk(
         &mut self,
         label: &str,
-        data: &[u8],
+        src: &dyn ByteSource,
         budget: &mut Budget,
         depth: u32,
         sink: Sink,
@@ -279,9 +325,31 @@ impl Searcher {
                 ),
             });
         }
-        let Some(fmt) = exav_unpack::detect(&data).or_else(|| packed_executable(data)) else {
-            // A leaf: search its bytes.
-            return self.search_one(label, data, sink);
+        let mut unchecked = false;
+        let fmt = exav_unpack::detect(src).or_else(|| match self.packed_executable(src) {
+            Packed::Is(fmt) => Some(fmt),
+            Packed::Not => None,
+            Packed::Unchecked => {
+                unchecked = true;
+                None
+            }
+        });
+        let Some(fmt) = fmt else {
+            // A leaf: search its bytes, or its text.
+            if !self.search_leaf(label, src, sink) {
+                return false;
+            }
+            if unchecked {
+                self.unreadable += 1;
+                return sink(Event::Unreadable {
+                    path: label.to_string(),
+                    reason: format!(
+                        "an executable over the {}-byte limit: whether it is packed was not checked",
+                        self.opts.limits.max_buffer_bytes
+                    ),
+                });
+            }
+            return true;
         };
         // A container is searched through its MEMBERS, not its raw bytes — for a
         // stored member those are the same bytes, and reporting both would
@@ -290,7 +358,7 @@ impl Searcher {
         // still gets looked at rather than silently producing no output.
         let mut members = 0usize;
         let mut keep_going = true;
-        let r = exav_unpack::walk(fmt, &data, budget, &mut |meta, content, b| {
+        let r = exav_unpack::walk(fmt, src, budget, &mut |meta, content, b| {
             let child = format!("{label}{NESTING_SEP}{}", meta.name);
             // Counted as a member whether or not it yields anything. The
             // fallback below exists for a buffer the walker found no members in
@@ -302,25 +370,31 @@ impl Searcher {
             // A member exav could not decode is content this search did not
             // see. Saying nothing here would report "no matches" for bytes
             // nobody looked at.
-            let (data, unread) = match meta.unsupported {
-                Some(reason) => (Vec::new(), Some(reason)),
-                None => match content.map(|c| c.into_bytes(meta, b)).transpose() {
-                    Err(hit) => return Some(Err(hit)),
-                    Ok(None) => (Vec::new(), None),
-                    Ok(Some((data, partial))) => {
-                        (data, partial.then_some("member failed to decode part way"))
-                    }
-                },
-            };
             let mut go = true;
-            if unread.is_none() || !data.is_empty() {
-                go = self.walk(&child, &data, b, depth + 1, sink);
+            let mut unread: Option<String> = None;
+            match (meta.unsupported, content) {
+                (Some(reason), _) => unread = Some(reason.to_string()),
+                (None, None) => go = self.walk(&child, &Vec::<u8>::new(), b, depth + 1, sink),
+                (None, Some(Member::Bytes(data))) => {
+                    go = self.walk(&child, &data, b, depth + 1, sink);
+                }
+                (None, Some(Member::Stream(stream))) => {
+                    match self.walk_stream(&child, meta, stream, b, depth, sink) {
+                        Err(hit) => return Some(Err(hit)),
+                        Ok((more, partial)) => {
+                            go = more;
+                            if partial {
+                                unread = Some("member failed to decode part way".to_string());
+                            }
+                        }
+                    }
+                }
             }
             if let Some(reason) = unread.filter(|_| go) {
                 self.unreadable += 1;
                 go = sink(Event::Unreadable {
                     path: child,
-                    reason: reason.to_string(),
+                    reason,
                 });
             }
             if go {
@@ -331,7 +405,8 @@ impl Searcher {
             }
         });
         let r = match r {
-            Ok(Some(Err(hit))) | Err(hit) => Err(hit),
+            Ok(Some(Err(why))) => Err(why),
+            Err(hit) => Err(hit.to_string()),
             Ok(_) => Ok(()),
         };
         // A budget stop or a decoder failure means members went unexamined.
@@ -348,89 +423,475 @@ impl Searcher {
         // yielded no entries, so the bytes themselves are the only content there
         // is to look at.
         if keep_going && members == 0 {
-            return self.search_one(label, data, sink);
+            return self.search_lines(label, src, sink);
+        }
+        // A container with text of its own (a PDF, a drawing) is searched as
+        // that too, besides its members.
+        #[cfg(feature = "text")]
+        if keep_going && let Some(go) = self.text_of(label, src, sink) {
+            return go;
         }
         keep_going
     }
 
+    /// A member that is read as it is produced. Up to the buffer limit it is
+    /// held, and searched like any other member, so a container in it can be
+    /// opened. A longer one is searched as it is read: held memory does not
+    /// grow with it. `Err` is a budget that ran out, which ends the walk. The
+    /// flag says the decoder failed part way.
+    fn walk_stream(
+        &mut self,
+        child: &str,
+        meta: &MemberMeta,
+        stream: &mut dyn Read,
+        budget: &mut Budget,
+        depth: u32,
+        sink: Sink,
+    ) -> Result<(bool, bool), String> {
+        let name = &meta.name;
+        let cap = budget.reserve().map_err(|hit| hit.to_string())?;
+        let mut data = Vec::new();
+        let mut partial = false;
+        match stream.take(cap.saturating_add(1)).read_to_end(&mut data) {
+            Ok(_) => {}
+            Err(e) if exav_unpack::is_budget_overflow(&e) => {
+                return Err(format!("member '{name}': {e}"));
+            }
+            Err(e) if budget.should_verify_checksums() => {
+                return Err(format!("member '{name}': {e}"));
+            }
+            Err(e) => partial = exav_unpack::decode_error_hides_content(&e),
+        }
+        if data.len() as u64 <= cap {
+            budget.commit(data.len() as u64);
+            if partial && data.is_empty() {
+                return Ok((true, true));
+            }
+            return Ok((self.walk(child, &data, budget, depth + 1, sink), partial));
+        }
+        // Past the limit. A container cannot be opened without holding it, so
+        // it is reported; anything else is searched as it is read.
+        let probe = &data[..data.len().min(64 << 10)];
+        if let Some(fmt) = exav_unpack::detect(&probe) {
+            self.unreadable += 1;
+            let reason = format!(
+                "a {fmt:?} container over the {cap}-byte limit: its members were not searched"
+            );
+            let go = sink(Event::Unreadable {
+                path: child.to_string(),
+                reason,
+            });
+            return Ok((go, false));
+        }
+        #[cfg(feature = "text")]
+        if self.opts.text && exav_render::text::wants(name, probe) {
+            self.unreadable += 1;
+            let path = format!("{child}{NESTING_SEP}text");
+            let reason = format!("visible text: over the {cap}-byte limit");
+            if !sink(Event::Unreadable { path, reason }) {
+                return Ok((false, false));
+            }
+        }
+        let mut whole = io::Cursor::new(data).chain(stream);
+        match self.search_reader(child, &mut whole, sink) {
+            Ok(go) => Ok((go, false)),
+            Err(e) if exav_unpack::is_budget_overflow(&e) => Err(format!("member '{name}': {e}")),
+            Err(e) if budget.should_verify_checksums() => Err(format!("member '{name}': {e}")),
+            // What decoded was searched. Only damage that hides content, not a
+            // checksum that failed after a full decode, makes it a partial one.
+            Err(e) => Ok((true, exav_unpack::decode_error_hides_content(&e))),
+        }
+    }
+
+    /// Whether a leaf is a packed executable, which `detect` cannot say: a
+    /// packed PE is not a container by magic, and "this is a PE" says nothing
+    /// about whether the program on disk is the program that runs. Searched as
+    /// it lies, it would report "no matches" for contents never seen. Only an
+    /// executable is looked at, and only one that can be held: the check reads
+    /// all of it.
+    fn packed_executable(&self, src: &dyn ByteSource) -> Packed {
+        if !is_executable(&src.window(0, 4)) {
+            return Packed::Not;
+        }
+        let Some(data) = src.materialize(self.cap()) else {
+            return Packed::Unchecked;
+        };
+        if exav_unpack::is_upx(&data) {
+            Packed::Is(Format::Upx)
+        } else if exav_unpack::is_pepack(&data) {
+            Packed::Is(Format::PePacked)
+        } else {
+            Packed::Not
+        }
+    }
+
+    /// Search a leaf: its text under `--text` when it has one, else its bytes.
+    fn search_leaf(&mut self, label: &str, src: &dyn ByteSource, sink: Sink) -> bool {
+        #[cfg(feature = "text")]
+        if let Some(go) = self.text_of(label, src, sink) {
+            return go;
+        }
+        self.search_lines(label, src, sink)
+    }
+
+    /// The text of `src` under `--text`, when it is a kind of document that has
+    /// some (see [`Self::search_text`]). A document too large to hold has its
+    /// text unread: reported, and `None` so its bytes are searched instead.
+    #[cfg(feature = "text")]
+    fn text_of(&mut self, label: &str, src: &dyn ByteSource, sink: Sink) -> Option<bool> {
+        if !self.opts.text {
+            return None;
+        }
+        let name = label.rsplit(NESTING_SEP).next().unwrap_or(label);
+        if !exav_render::text::wants(name, &src.window(0, 1024)) {
+            return None;
+        }
+        let cap = self.cap();
+        match src.materialize(cap) {
+            Some(data) => self.search_text(label, &data, sink),
+            None => {
+                self.unreadable += 1;
+                let path = format!("{label}{NESTING_SEP}text");
+                let reason = format!(
+                    "visible text: {} bytes, over the {cap}-byte limit",
+                    src.len()
+                );
+                (!sink(Event::Unreadable { path, reason })).then_some(false)
+            }
+        }
+    }
+
+    /// Line-match the bytes of `src`: in place when it is in memory, else as
+    /// they are read.
+    fn search_lines(&mut self, label: &str, src: &dyn ByteSource, sink: Sink) -> bool {
+        if let Some(data) = src.as_slice() {
+            return self.search_one(label, data, sink);
+        }
+        match self.search_reader(label, &mut Reader::new(src), sink) {
+            Ok(go) => go,
+            // The source says it failed: `search_source` reports that, once.
+            Err(_) if src.read_error().is_some() => true,
+            Err(e) => {
+                self.unreadable += 1;
+                let reason = format!("read failed: {e}");
+                sink(Event::Unreadable {
+                    path: label.to_string(),
+                    reason,
+                })
+            }
+        }
+    }
+
+    /// Search the text a reader sees in `data`, as `label!text` (and
+    /// `label!text/<section>` for a sheet or a slide), when it is a kind of
+    /// document that has some (`None` when it is not, and also when its text
+    /// could not be taken out: that is reported unreadable and its bytes are
+    /// searched instead). A text cut short is reported unreadable, as a
+    /// member that failed part way is.
+    #[cfg(feature = "text")]
+    fn search_text(&mut self, label: &str, data: &[u8], sink: Sink) -> Option<bool> {
+        let name = label.rsplit(NESTING_SEP).next().unwrap_or(label);
+        let cap = usize::try_from(self.opts.limits.max_buffer_bytes).unwrap_or(usize::MAX);
+        let cap = data
+            .len()
+            .saturating_mul(4)
+            .saturating_add(64 << 10)
+            .min(cap);
+        let visible = exav_render::text::visible_text(name, data, cap, &self.opts.limits)?;
+        let path = format!("{label}{NESTING_SEP}text");
+        if let Some(why) = &visible.unreadable {
+            // A document of a kind that has text whose text could not be
+            // taken out: said, and its bytes are searched instead.
+            self.unreadable += 1;
+            if !sink(Event::Unreadable {
+                path,
+                reason: format!("visible text: {why}"),
+            }) {
+                return Some(false);
+            }
+            return None;
+        }
+        // One search to a section (a sheet, a slide), so that a match says
+        // where it is: `book.xls!text/sheet "Budget"`; what comes before the
+        // first section, and a document of one block, is `!text`.
+        let mut at = 0;
+        let mut parts: Vec<(String, std::ops::Range<usize>)> = Vec::new();
+        for (section, range) in &visible.sections {
+            if range.start > at {
+                parts.push((path.clone(), at..range.start));
+            }
+            parts.push((format!("{path}/{section}"), range.clone()));
+            at = range.end;
+        }
+        if at < visible.text.len() || parts.is_empty() {
+            parts.push((path.clone(), at..visible.text.len()));
+        }
+        for (part, range) in parts {
+            let bytes = visible.text.as_bytes().get(range).unwrap_or_default();
+            if !self.search_one(&part, bytes, sink) {
+                return Some(false);
+            }
+        }
+        if visible.truncated {
+            self.unreadable += 1;
+            return Some(sink(Event::Unreadable {
+                path,
+                reason: format!("visible text cut at {cap} bytes"),
+            }));
+        }
+        Some(true)
+    }
+
     /// Line-match a single object's bytes.
     fn search_one(&mut self, path: &str, data: &[u8], sink: Sink) -> bool {
-        if looks_binary(data) {
-            let any = data
-                .split(|&b| b == b'\n')
-                .any(|l| self.matcher.hits(strip_cr(l)));
-            if any {
-                if self.opts.binary_as_matches {
-                    // Counted here because this returns without reaching the
-                    // line loop. When the loop DOES run it does its own
-                    // counting, and doing both made every matching binary
-                    // member count twice in `matched_count()`.
-                    self.matched += 1;
-                    return sink(Event::BinaryMatch {
-                        path: path.to_string(),
-                    });
+        // A cursor over memory cannot fail.
+        self.search_reader(path, &mut io::Cursor::new(data), sink)
+            .unwrap_or(true)
+    }
+
+    /// Line-match a stream, holding a line at a time (and the lines of
+    /// `-B` context). `Err` is a read error: every line read before it has
+    /// been matched. `Ok(false)` is the sink asking to stop.
+    fn search_reader(&mut self, path: &str, r: &mut dyn Read, sink: Sink) -> io::Result<bool> {
+        let mut lines = Lines::new(path, self.cap());
+        let mut buf = vec![0u8; READ];
+        let mut probe = Vec::new();
+        let mut failed = None;
+        while !lines.done {
+            let n = match r.read(&mut buf) {
+                Ok(0) => break,
+                Ok(n) => n,
+                Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
+                Err(e) => {
+                    failed = Some(e);
+                    break;
                 }
+            };
+            if lines.binary.is_none() {
+                probe.extend_from_slice(&buf[..n]);
+                if probe.len() < BINARY_PROBE {
+                    continue;
+                }
+                lines.binary = Some(looks_binary(&probe));
+                let held = std::mem::take(&mut probe);
+                self.feed(&mut lines, &held, sink);
             } else {
-                return true;
+                self.feed(&mut lines, &buf[..n], sink);
             }
         }
+        if lines.binary.is_none() {
+            lines.binary = Some(looks_binary(&probe));
+            let held = std::mem::take(&mut probe);
+            self.feed(&mut lines, &held, sink);
+        }
+        if !lines.done {
+            self.finish(&mut lines, sink);
+        }
+        if lines.stopped {
+            return Ok(false);
+        }
+        failed.map_or(Ok(true), Err)
+    }
 
-        let mut lines: Vec<&[u8]> = data.split(|&b| b == b'\n').map(strip_cr).collect();
-        // `split` on a trailing newline yields a final empty element that is not
-        // a line of the file. It rarely matches a pattern, but `-v` matches
-        // everything it is not given, so leaving it in reports a phantom match
-        // at line N+1 for every file that ends the way text files end.
-        if lines.len() > 1 && lines.last().is_some_and(|l| l.is_empty()) {
-            lines.pop();
-        }
-        let mut hits = 0usize;
-        let mut last_printed: Option<usize> = None;
-        let mut counted = false;
-        for (i, line) in lines.iter().enumerate() {
-            if !self.matcher.hits(line) {
-                continue;
+    /// Match every complete line of `chunk`, and keep the rest for the next.
+    fn feed(&mut self, lines: &mut Lines, chunk: &[u8], sink: Sink) {
+        let mut rest = chunk;
+        while !lines.done {
+            let Some(end) = memchr::memchr(b'\n', rest) else {
+                break;
+            };
+            if lines.partial.is_empty() {
+                self.line(lines, &rest[..end], sink);
+            } else {
+                lines.partial.extend_from_slice(&rest[..end]);
+                let whole = std::mem::take(&mut lines.partial);
+                self.line(lines, &whole, sink);
             }
-            if !counted {
+            rest = &rest[end + 1..];
+        }
+        if lines.done {
+            return;
+        }
+        lines.partial.extend_from_slice(rest);
+        if lines.partial.len() > lines.max_line {
+            self.unreadable += 1;
+            lines.done = true;
+            lines.stopped = !sink(Event::Unreadable {
+                path: lines.path.clone(),
+                reason: format!(
+                    "line {} is longer than {} bytes: the rest of it was not searched",
+                    lines.n + 1,
+                    lines.max_line
+                ),
+            });
+        }
+    }
+
+    /// The end of the data: a last line with no terminator, or the one empty
+    /// line of an empty object. A terminator at the very end does not start
+    /// another line, which `-v` would otherwise match.
+    fn finish(&mut self, lines: &mut Lines, sink: Sink) {
+        if !lines.partial.is_empty() {
+            let whole = std::mem::take(&mut lines.partial);
+            self.line(lines, &whole, sink);
+        } else if lines.n == 0 {
+            self.line(lines, b"", sink);
+        }
+    }
+
+    /// One line, without its `\n`.
+    fn line(&mut self, lines: &mut Lines, raw: &[u8], sink: Sink) {
+        let text = strip_cr(raw);
+        let at = lines.n;
+        lines.n += 1;
+        let hit = self.matcher.hits(text);
+        let emit = |lines: &mut Lines, ev: Event, sink: Sink| {
+            if !sink(ev) {
+                lines.stopped = true;
+                lines.done = true;
+            }
+        };
+        if hit && lines.binary == Some(true) && self.opts.binary_as_matches {
+            // One result for the member, not a line.
+            self.matched += 1;
+            lines.done = true;
+            let ev = Event::BinaryMatch {
+                path: lines.path.clone(),
+            };
+            emit(lines, ev, sink);
+            return;
+        }
+        let context = |lines: &Lines, line_no: usize, line: &[u8]| Event::Context {
+            path: lines.path.clone(),
+            line_no,
+            line: line.to_vec(),
+        };
+        // After the last wanted match, only its trailing context remains.
+        if lines.finished_matching {
+            if lines.after_left == 0 {
+                lines.done = true;
+                return;
+            }
+            lines.after_left -= 1;
+            let ev = context(lines, at + 1, text);
+            emit(lines, ev, sink);
+            if lines.after_left == 0 {
+                lines.done = true;
+            }
+            return;
+        }
+        if hit {
+            if !lines.counted {
                 self.matched += 1;
-                counted = true;
+                lines.counted = true;
             }
-            let from = i.saturating_sub(self.opts.before_context);
-            let to = i
-                .saturating_add(self.opts.after_context)
-                .min(lines.len().saturating_sub(1));
-            for (j, l) in lines.iter().enumerate().take(to + 1).skip(from) {
-                // Don't reprint a line already emitted as context for an earlier
-                // match, and never downgrade a match line to a context line.
-                if last_printed.is_some_and(|p| j <= p) {
-                    continue;
+            // The context before a match is only what has not been printed.
+            while let Some((line_no, held)) = lines.before.pop_front() {
+                lines.before_bytes -= held.len();
+                let ev = context(lines, line_no, &held);
+                emit(lines, ev, sink);
+                if lines.done {
+                    return;
                 }
-                let ev = if j == i {
-                    Event::Match {
-                        path: path.to_string(),
-                        line_no: j + 1,
-                        line: l.to_vec(),
-                    }
-                } else {
-                    Event::Context {
-                        path: path.to_string(),
-                        line_no: j + 1,
-                        line: l.to_vec(),
-                    }
-                };
-                if !sink(ev) {
-                    return false;
+            }
+            let ev = Event::Match {
+                path: lines.path.clone(),
+                line_no: at + 1,
+                line: text.to_vec(),
+            };
+            emit(lines, ev, sink);
+            lines.after_left = self.opts.after_context;
+            lines.hits += 1;
+            if self.opts.max_count != 0 && lines.hits >= self.opts.max_count {
+                lines.finished_matching = true;
+                if lines.after_left == 0 {
+                    lines.done = true;
                 }
-                last_printed = Some(j);
             }
-            hits += 1;
-            if self.opts.max_count != 0 && hits >= self.opts.max_count {
-                break;
+        } else if lines.after_left > 0 {
+            lines.after_left -= 1;
+            let ev = context(lines, at + 1, text);
+            emit(lines, ev, sink);
+        } else if self.opts.before_context > 0 {
+            lines.before_bytes += text.len();
+            lines.before.push_back((at + 1, text.to_vec()));
+            while lines.before.len() > self.opts.before_context
+                || lines.before_bytes > lines.max_line
+            {
+                if let Some((_, held)) = lines.before.pop_front() {
+                    lines.before_bytes -= held.len();
+                }
             }
         }
-        true
     }
 }
 
+/// Where a line search is, between chunks.
+struct Lines {
+    path: String,
+    /// Lines completed so far.
+    n: usize,
+    /// The line being read, when it is not whole in the chunk.
+    partial: Vec<u8>,
+    /// The longest line held.
+    max_line: usize,
+    /// Whether the start looked binary, once enough has been read to say.
+    binary: Option<bool>,
+    /// Unprinted lines kept for `-B`, with their numbers.
+    before: VecDeque<(usize, Vec<u8>)>,
+    before_bytes: usize,
+    /// Lines of trailing context still to print.
+    after_left: usize,
+    hits: usize,
+    counted: bool,
+    /// `-m` was met: only the trailing context is left.
+    finished_matching: bool,
+    /// Nothing more to read.
+    done: bool,
+    /// The sink asked to stop.
+    stopped: bool,
+}
+
+impl Lines {
+    fn new(path: &str, max_line: usize) -> Self {
+        Lines {
+            path: path.to_string(),
+            n: 0,
+            partial: Vec::new(),
+            max_line,
+            binary: None,
+            before: VecDeque::new(),
+            before_bytes: 0,
+            after_left: 0,
+            hits: 0,
+            counted: false,
+            finished_matching: false,
+            done: false,
+            stopped: false,
+        }
+    }
+}
+
+/// What looking at a leaf for a packer found.
+enum Packed {
+    /// A packed executable, to be opened as this.
+    Is(Format),
+    Not,
+    /// An executable too large to hold, which the check needs whole.
+    Unchecked,
+}
+
+/// Whether `head` starts like a PE, an ELF or a Mach-O: what a packed
+/// executable is.
+fn is_executable(head: &[u8]) -> bool {
+    head.starts_with(b"MZ")
+        || head.starts_with(b"\x7fELF")
+        || matches!(
+            head,
+            [0xfe, 0xed, 0xfa, 0xce | 0xcf, ..] | [0xce | 0xcf, 0xfa, 0xed, 0xfe, ..]
+        )
+}
+
 fn strip_cr(line: &[u8]) -> &[u8] {
     match line.split_last() {
         Some((b'\r', rest)) => rest,
@@ -443,23 +904,6 @@ fn looks_binary(data: &[u8]) -> bool {
     data.iter().take(8192).any(|&b| b == 0)
 }
 
-/// The format for a *packed executable*, which `detect` cannot report.
-///
-/// A packed PE is not a container by magic — "this is a PE" says nothing about
-/// whether the program on disk is the program that runs. The scanner routes
-/// these by content; a search tool has to do the same, or it reads the packed
-/// bytes, matches nothing, and reports a clean "no matches" for a file whose
-/// contents it never saw.
-fn packed_executable(data: &[u8]) -> Option<exav_unpack::Format> {
-    if exav_unpack::is_upx(data) {
-        Some(exav_unpack::Format::Upx)
-    } else if exav_unpack::is_pepack(data) {
-        Some(exav_unpack::Format::PePacked)
-    } else {
-        None
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -614,9 +1058,10 @@ mod tests {
             &z,
         );
         // "beta" and the trailing empty line both fail to match "Alpha".
-        assert!(ev
-            .iter()
-            .any(|e| matches!(e, Event::Match { line, .. } if line == b"beta")));
+        assert!(
+            ev.iter()
+                .any(|e| matches!(e, Event::Match { line, .. } if line == b"beta"))
+        );
     }
 
     #[test]
@@ -677,4 +1122,249 @@ mod tests {
             "got {ev:?}"
         );
     }
+
+    /// `(kind, line number)` of the line events.
+    fn shown(ev: &[Event]) -> Vec<(char, usize)> {
+        ev.iter()
+            .filter_map(|e| match e {
+                Event::Match { line_no, .. } => Some(('M', *line_no)),
+                Event::Context { line_no, .. } => Some(('C', *line_no)),
+                _ => None,
+            })
+            .collect()
+    }
+
+    fn capped(bytes: u64) -> Options {
+        let mut opts = Options::default();
+        opts.limits.max_buffer_bytes = bytes;
+        opts
+    }
+
+    #[test]
+    fn a_match_in_the_trailing_context_of_another_is_still_a_match() {
+        let opts = Options {
+            after_context: 1,
+            ..Options::default()
+        };
+        let ev = collect(
+            Matcher::fixed("b", false).unwrap(),
+            opts,
+            "f",
+            b"a\nb\nb\nc\nd\n",
+        );
+        assert_eq!(shown(&ev), vec![('M', 2), ('M', 3), ('C', 4)]);
+    }
+
+    #[test]
+    fn the_last_wanted_match_still_gets_its_trailing_context() {
+        let opts = Options {
+            after_context: 1,
+            max_count: 1,
+            ..Options::default()
+        };
+        let ev = collect(Matcher::fixed("x", false).unwrap(), opts, "f", b"x\nx\nx\n");
+        assert_eq!(shown(&ev), vec![('M', 1), ('C', 2)]);
+    }
+
+    #[test]
+    fn before_context_is_not_printed_twice() {
+        let opts = Options {
+            before_context: 2,
+            after_context: 1,
+            ..Options::default()
+        };
+        let ev = collect(
+            Matcher::fixed("T", false).unwrap(),
+            opts,
+            "f",
+            b"1\n2\nT\n4\n5\n6\nT\n8\n",
+        );
+        assert_eq!(
+            shown(&ev),
+            vec![
+                ('C', 1),
+                ('C', 2),
+                ('M', 3),
+                ('C', 4),
+                ('C', 5),
+                ('C', 6),
+                ('M', 7),
+                ('C', 8)
+            ]
+        );
+    }
+
+    #[test]
+    fn an_empty_object_is_one_empty_line_and_a_final_newline_starts_no_other() {
+        let inverted = || Matcher::fixed("zzz", false).unwrap().inverted(true);
+        let ev = collect(inverted(), Options::default(), "f", b"");
+        assert_eq!(shown(&ev), vec![('M', 1)]);
+        let ev = collect(inverted(), Options::default(), "f", b"a\n");
+        assert_eq!(shown(&ev), vec![('M', 1)]);
+        let ev = collect(inverted(), Options::default(), "f", b"a\n\n");
+        assert_eq!(shown(&ev), vec![('M', 1), ('M', 2)]);
+    }
+
+    #[test]
+    fn a_carriage_return_is_not_part_of_the_line_and_the_last_line_needs_no_newline() {
+        let ev = collect(
+            Matcher::regex("^needle$", false).unwrap(),
+            Options::default(),
+            "f",
+            b"a\r\nneedle",
+        );
+        assert_eq!(shown(&ev), vec![('M', 2)]);
+    }
+
+    #[test]
+    fn a_binary_member_that_matches_counts_once() {
+        let mut s = Searcher::new(Matcher::fixed("needle", false).unwrap(), {
+            Options {
+                binary_as_matches: true,
+                ..Options::default()
+            }
+        });
+        let mut ev = Vec::new();
+        s.search_bytes("f", b"\0\0\0 needle \n needle again\0", &mut |e| {
+            ev.push(e);
+            true
+        });
+        assert_eq!(ev.len(), 1, "got {ev:?}");
+        assert!(matches!(ev[0], Event::BinaryMatch { .. }));
+        assert_eq!(s.matched_count(), 1);
+    }
+
+    /// A stored-member ZIP with its central directory, so that its members are
+    /// read as they are produced rather than found by their local headers.
+    fn zip_indexed(members: &[(&str, &[u8])]) -> Vec<u8> {
+        let mut v = zip_of(members);
+        let mut directory = Vec::new();
+        let mut offset = 0u32;
+        for (name, body) in members {
+            directory.extend_from_slice(b"PK\x01\x02");
+            directory.extend_from_slice(&20u16.to_le_bytes()); // made by
+            directory.extend_from_slice(&20u16.to_le_bytes()); // needed
+            directory.extend_from_slice(&[0; 2]); // flags
+            directory.extend_from_slice(&[0; 2]); // stored
+            directory.extend_from_slice(&[0; 4]); // time, date
+            directory.extend_from_slice(&[0; 4]); // crc
+            directory.extend_from_slice(&(body.len() as u32).to_le_bytes());
+            directory.extend_from_slice(&(body.len() as u32).to_le_bytes());
+            directory.extend_from_slice(&(name.len() as u16).to_le_bytes());
+            directory.extend_from_slice(&[0; 8]); // extra, comment, disk, internal attributes
+            directory.extend_from_slice(&[0; 4]); // external attributes
+            directory.extend_from_slice(&offset.to_le_bytes());
+            directory.extend_from_slice(name.as_bytes());
+            offset += 30 + name.len() as u32 + body.len() as u32;
+        }
+        let at = v.len() as u32;
+        v.extend_from_slice(&directory);
+        v.extend_from_slice(b"PK\x05\x06");
+        v.extend_from_slice(&[0; 4]); // disk numbers
+        v.extend_from_slice(&(members.len() as u16).to_le_bytes());
+        v.extend_from_slice(&(members.len() as u16).to_le_bytes());
+        v.extend_from_slice(&(directory.len() as u32).to_le_bytes());
+        v.extend_from_slice(&at.to_le_bytes());
+        v.extend_from_slice(&[0; 2]); // comment
+        v
+    }
+
+    #[test]
+    fn a_line_longer_than_the_limit_is_reported_not_searched_in_part() {
+        // Longer than one read, so it cannot be matched where it lies.
+        let mut data = vec![b'a'; 3 << 20];
+        data.extend_from_slice(b"needle\n");
+        let mut s = Searcher::new(Matcher::fixed("needle", false).unwrap(), capped(1024));
+        let mut ev = Vec::new();
+        s.search_bytes("f", &data, &mut |e| {
+            ev.push(e);
+            true
+        });
+        assert!(shown(&ev).is_empty(), "got {ev:?}");
+        assert!(
+            matches!(ev.as_slice(), [Event::Unreadable { reason, .. }] if reason.contains("longer than 1024")),
+            "got {ev:?}"
+        );
+        assert_eq!(s.unreadable_count(), 1);
+    }
+
+    /// A text of `n` lines whose last one holds the needle.
+    fn log_of(n: usize) -> Vec<u8> {
+        let mut data = Vec::new();
+        for i in 0..n {
+            data.extend_from_slice(format!("line {i} of the log, nothing to see\n").as_bytes());
+        }
+        data.extend_from_slice(b"the needle is here\n");
+        data
+    }
+
+    #[test]
+    fn a_source_read_in_blocks_is_searched_as_it_is_read() {
+        let data = log_of(100_000);
+        let cache = BlockCache::with_sizes(std::io::Cursor::new(data.clone()), 512, 8192).unwrap();
+        let mut s = Searcher::new(Matcher::fixed("needle", false).unwrap(), capped(64 << 10));
+        let mut ev = Vec::new();
+        s.search_source("log", &cache, &mut |e| {
+            ev.push(e);
+            true
+        });
+        assert_eq!(shown(&ev), vec![('M', 100_001)], "got {:?}", ev.len());
+        assert_eq!(s.unreadable_count(), 0);
+    }
+
+    #[test]
+    fn a_file_over_the_limit_is_searched_not_refused() {
+        let path = std::env::temp_dir().join(format!("exav-grep-big-{}.log", std::process::id()));
+        // Past HOLD_WHOLE, so it goes through the block cache.
+        let data = log_of(600_000);
+        assert!(data.len() as u64 > HOLD_WHOLE);
+        std::fs::write(&path, &data).unwrap();
+        let mut s = Searcher::new(Matcher::fixed("needle", false).unwrap(), capped(1 << 20));
+        let mut ev = Vec::new();
+        let r = s.search_path(&path, &mut |e| {
+            ev.push(e);
+            true
+        });
+        std::fs::remove_file(&path).unwrap();
+        assert!(r.unwrap());
+        assert_eq!(shown(&ev), vec![('M', 600_001)]);
+        assert_eq!(s.unreadable_count(), 0, "got {} events", ev.len());
+    }
+
+    #[test]
+    fn a_member_over_the_limit_is_searched_as_it_is_read() {
+        let z = zip_indexed(&[("big.txt", &log_of(10_000))]);
+        let mut s = Searcher::new(Matcher::fixed("needle", false).unwrap(), capped(64 << 10));
+        let mut ev = Vec::new();
+        s.search_bytes("a.zip", &z, &mut |e| {
+            ev.push(e);
+            true
+        });
+        assert!(
+            ev.iter()
+                .any(|e| matches!(e, Event::Match { path, line_no, .. }
+                if path == "a.zip!big.txt" && *line_no == 10_001)),
+            "got {ev:?}"
+        );
+        assert_eq!(s.unreadable_count(), 0, "got {ev:?}");
+    }
+
+    #[test]
+    fn a_container_over_the_limit_inside_a_member_is_reported_not_opened() {
+        let inner = zip_indexed(&[("deep.txt", &log_of(10_000))]);
+        let outer = zip_indexed(&[("inner.zip", &inner)]);
+        let mut s = Searcher::new(Matcher::fixed("needle", false).unwrap(), capped(64 << 10));
+        let mut ev = Vec::new();
+        s.search_bytes("o.zip", &outer, &mut |e| {
+            ev.push(e);
+            true
+        });
+        assert!(shown(&ev).is_empty(), "got {ev:?}");
+        assert!(
+            ev.iter()
+                .any(|e| matches!(e, Event::Unreadable { path, reason }
+                if path == "o.zip!inner.zip" && reason.contains("container"))),
+            "got {ev:?}"
+        );
+    }
 }
diff --git a/crates/exav-grep/src/main.rs b/crates/exav-grep/src/main.rs
index 2dacb599..fb2156be 100644
--- a/crates/exav-grep/src/main.rs
+++ b/crates/exav-grep/src/main.rs
@@ -1,7 +1,7 @@
 //! `exav-grep` — grep that can see inside archives.
 //!
 //! Familiar flags, but every ZIP/RAR/7z/tar/ISO/OLE/PDF/email it meets is
-//! descended into, recursively, in memory. Matches are reported with the nesting
+//! descended into, recursively, in bounded memory. Matches are reported with the nesting
 //! path (`backup.zip!logs.tar!app.log:42:…`) so the output stays greppable.
 //!
 //! Exit codes follow `grep`, with one addition:
@@ -80,7 +80,10 @@ struct Cli {
     #[arg(long = "passwords", value_name = "PASSWORD")]
     passwords: Vec<String>,
 
-    /// Max bytes any single member may decompress to.
+    /// Most bytes held in memory at once for one file or member (default
+    /// 256M). A member up to it is held, so a container in it can be opened;
+    /// a longer one is searched as it is read, and a container in it is
+    /// reported unreadable.
     #[arg(long = "max-object-bytes", value_name = "BYTES")]
     max_object_bytes: Option<u64>,
 
@@ -101,6 +104,15 @@ struct Cli {
     /// hiding them turns "I couldn't look" into an indistinguishable "no match".
     #[arg(long)]
     quiet_unreadable: bool,
+
+    /// Search the text a reader sees rather than the bytes, for the files that
+    /// have one: Markdown, HTML, Office and OpenDocument XML parts, PDF and
+    /// drawings (DXF, DWG). Entities are decoded and each link is followed by
+    /// where it goes; matches are reported under `file.md!text`, with the
+    /// text's line numbers.
+    #[cfg(feature = "text")]
+    #[arg(long)]
+    text: bool,
 }
 
 fn main() -> ExitCode {
@@ -137,6 +149,10 @@ fn main() -> ExitCode {
         after_context: cli.after_context.max(ctx),
         max_count: cli.max_count,
         binary_as_matches: true,
+        #[cfg(feature = "text")]
+        text: cli.text,
+        #[cfg(not(feature = "text"))]
+        text: false,
     };
 
     let mut searcher = Searcher::new(matcher, opts);
diff --git a/crates/exav-grep/tests/text.rs b/crates/exav-grep/tests/text.rs
new file mode 100644
index 00000000..bf90bea6
--- /dev/null
+++ b/crates/exav-grep/tests/text.rs
@@ -0,0 +1,178 @@
+//! `--text`: a Markdown file is searched as the text a reader sees.
+
+#![cfg(feature = "text")]
+
+use std::path::{Path, PathBuf};
+use std::process::{Command, Output};
+
+const BIN: &str = env!("CARGO_BIN_EXE_exav-grep");
+
+/// A scratch directory unique to one test, removed when the test ends.
+struct Scratch(PathBuf);
+
+impl Scratch {
+    fn new(tag: &str) -> Self {
+        let d = std::env::temp_dir().join(format!("exav-grep-text-{}-{tag}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&d);
+        std::fs::create_dir_all(&d).expect("scratch dir");
+        Scratch(d)
+    }
+
+    fn write(&self, name: &str, bytes: &[u8]) -> PathBuf {
+        let p = self.0.join(name);
+        std::fs::write(&p, bytes).expect("write fixture");
+        p
+    }
+}
+
+impl Drop for Scratch {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_dir_all(&self.0);
+    }
+}
+
+fn run(args: &[&str], file: &Path) -> Output {
+    Command::new(BIN)
+        .args(args)
+        .arg(file)
+        .output()
+        .expect("spawn exav-grep")
+}
+
+fn code(o: &Output) -> i32 {
+    o.status.code().expect("exited normally, not by signal")
+}
+
+fn stdout(o: &Output) -> String {
+    String::from_utf8_lossy(&o.stdout).into_owned()
+}
+
+/// Minimal stored-member ZIP (local headers only: exav reads those).
+fn zip_of(name: &str, body: &[u8]) -> Vec<u8> {
+    let mut v = Vec::new();
+    v.extend_from_slice(b"PK\x03\x04");
+    for n in [20u16, 0, 0, 0, 0] {
+        v.extend_from_slice(&n.to_le_bytes());
+    }
+    v.extend_from_slice(&0u32.to_le_bytes());
+    v.extend_from_slice(&(body.len() as u32).to_le_bytes());
+    v.extend_from_slice(&(body.len() as u32).to_le_bytes());
+    v.extend_from_slice(&(name.len() as u16).to_le_bytes());
+    v.extend_from_slice(&0u16.to_le_bytes());
+    v.extend_from_slice(name.as_bytes());
+    v.extend_from_slice(body);
+    v
+}
+
+#[test]
+fn words_split_by_marks_are_found_only_with_text() {
+    let s = Scratch::new("marks");
+    let f = s.write(
+        "notes.md",
+        b"# Title\n\nPlease *download* the **new** version.\n",
+    );
+    let with = run(&["--text", "-F", "Please download the new version"], &f);
+    assert_eq!(code(&with), 0, "{}", stdout(&with));
+    assert_eq!(
+        stdout(&with),
+        format!("{}!text:2:Please download the new version.\n", f.display())
+    );
+    // Without it, the bytes are searched, marks and all.
+    assert_eq!(
+        code(&run(&["-F", "Please download the new version"], &f)),
+        1
+    );
+    // And what is in the bytes still is, with it, only as the reader sees it.
+    assert_eq!(code(&run(&["--text", "-F", "**new**"], &f)), 1);
+}
+
+#[test]
+fn a_link_is_followed_by_where_it_goes_and_an_entity_is_decoded() {
+    let s = Scratch::new("links");
+    let f = s.write(
+        "a.markdown",
+        b"Sign in at [https://www.paypal.com/login](https://evil.example/steal) &amp; pay\n",
+    );
+    let o = run(&["--text", "evil.example/steal"], &f);
+    assert_eq!(code(&o), 0);
+    assert!(
+        stdout(&o).contains("https://www.paypal.com/login (https://evil.example/steal) & pay"),
+        "{}",
+        stdout(&o)
+    );
+}
+
+#[test]
+fn a_member_of_an_archive_is_searched_by_its_own_name() {
+    let s = Scratch::new("zip");
+    let body = b"Please *download* it\n";
+    let md = s.write("a.zip", &zip_of("docs/readme.md", body));
+    let o = run(&["--text", "-F", "Please download it"], &md);
+    assert_eq!(code(&o), 0);
+    assert_eq!(
+        stdout(&o),
+        format!(
+            "{}!docs/readme.md!text:1:Please download it\n",
+            md.display()
+        )
+    );
+    let txt = s.write("b.zip", &zip_of("docs/readme.txt", body));
+    assert_eq!(code(&run(&["--text", "-F", "Please download it"], &txt)), 1);
+}
+
+#[test]
+fn html_is_searched_without_its_tags() {
+    let s = Scratch::new("html");
+    let f = s.write(
+        "page.html",
+        b"<html><body><p>Click <b>here</b> to <a href='http://evil.example/x'>go on</a></p></body></html>",
+    );
+    let o = run(
+        &[
+            "--text",
+            "-F",
+            "Click here to go on (http://evil.example/x)",
+        ],
+        &f,
+    );
+    assert_eq!(code(&o), 0, "{}", stdout(&o));
+    assert_eq!(
+        stdout(&o),
+        format!(
+            "{}!text:1:Click here to go on (http://evil.example/x)\n",
+            f.display()
+        )
+    );
+    assert_eq!(code(&run(&["-F", "Click here to go on"], &f)), 1);
+}
+
+#[cfg(feature = "text-pdf")]
+#[test]
+fn a_pdf_is_searched_as_its_text_besides_its_streams() {
+    let s = Scratch::new("pdf");
+    let content = "BT /F1 12 Tf 72 700 Td [(Pay to ev) 10 (il.exa) 5 (mple)] TJ ET";
+    let pdf = format!(
+        "%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n\
+         3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>endobj\n\
+         4 0 obj<</Length {}>>\nstream\n{content}\nendstream\nendobj\n\
+         5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>endobj\ntrailer<</Root 1 0 R>>\n%%EOF\n",
+        content.len()
+    );
+    let f = s.write("doc.pdf", pdf.as_bytes());
+    let o = run(&["--text", "-F", "Pay to evil.example"], &f);
+    assert_eq!(code(&o), 0, "{}", stdout(&o));
+    assert_eq!(
+        stdout(&o),
+        format!("{}!text:1:Pay to evil.example\n", f.display())
+    );
+    assert_eq!(code(&run(&["-F", "Pay to evil.example"], &f)), 1);
+}
+
+#[test]
+fn other_files_are_searched_as_they_are() {
+    let s = Scratch::new("other");
+    let f = s.write("notes.txt", b"a *b* c\n");
+    let o = run(&["--text", "-F", "a *b* c"], &f);
+    assert_eq!(code(&o), 0);
+    assert_eq!(stdout(&o), format!("{}:1:a *b* c\n", f.display()));
+}
diff --git a/crates/exav-grep/tests/text_office.rs b/crates/exav-grep/tests/text_office.rs
new file mode 100644
index 00000000..b8111846
--- /dev/null
+++ b/crates/exav-grep/tests/text_office.rs
@@ -0,0 +1,129 @@
+//! `--text` on the office formats the XML parts do not reach: a match says
+//! its sheet or slide, and a document whose text cannot be taken out is
+//! reported unreadable.
+
+#![cfg(feature = "text-office")]
+
+use std::path::{Path, PathBuf};
+use std::process::{Command, Output};
+
+const BIN: &str = env!("CARGO_BIN_EXE_exav-grep");
+
+const XLS: &[u8] = include_bytes!("../../exav-render/tests/fixtures/office/sheets/sample.xls");
+const PPT: &[u8] = include_bytes!("../../exav-render/tests/fixtures/office/slides/sample.ppt");
+const DOC: &[u8] = include_bytes!("../../exav-render/tests/fixtures/office/docs/sample.doc");
+
+/// A scratch directory unique to one test, removed when the test ends.
+struct Scratch(PathBuf);
+
+impl Scratch {
+    fn new(tag: &str) -> Self {
+        let d = std::env::temp_dir().join(format!("exav-grep-office-{}-{tag}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&d);
+        std::fs::create_dir_all(&d).expect("scratch dir");
+        Scratch(d)
+    }
+
+    fn write(&self, name: &str, bytes: &[u8]) -> PathBuf {
+        let p = self.0.join(name);
+        std::fs::write(&p, bytes).expect("write fixture");
+        p
+    }
+}
+
+impl Drop for Scratch {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_dir_all(&self.0);
+    }
+}
+
+fn run(args: &[&str], file: &Path) -> Output {
+    Command::new(BIN)
+        .args(args)
+        .arg(file)
+        .output()
+        .expect("spawn exav-grep")
+}
+
+fn code(o: &Output) -> i32 {
+    o.status.code().expect("exited normally, not by signal")
+}
+
+fn stdout(o: &Output) -> String {
+    String::from_utf8_lossy(&o.stdout).into_owned()
+}
+
+#[test]
+fn a_match_in_a_workbook_says_its_sheet() {
+    let s = Scratch::new("xls");
+    let f = s.write("budget.xls", XLS);
+    let o = run(&["--text", "-F", "Second sheet"], &f);
+    assert_eq!(code(&o), 0, "{}", stdout(&o));
+    // The text, by sheet (the workbook's own stream is a member too, and its
+    // bytes match as well).
+    let line = format!("{}!text/sheet \"Notes\":2:Second sheet\t1\n", f.display());
+    assert!(stdout(&o).contains(&line), "{}", stdout(&o));
+    assert!(!stdout(&o).contains("sheet \"Budget\""), "{}", stdout(&o));
+    // Another sheet's words are in that sheet.
+    let o = run(&["--text", "-F", "Merged note"], &f);
+    assert!(
+        stdout(&o).contains(&format!("{}!text/sheet \"Budget\":", f.display())),
+        "{}",
+        stdout(&o)
+    );
+}
+
+#[test]
+fn a_match_in_a_presentation_says_its_slide() {
+    let s = Scratch::new("ppt");
+    let f = s.write("deck.ppt", PPT);
+    let o = run(&["--text", "-F", "Second slide text"], &f);
+    assert_eq!(code(&o), 0, "{}", stdout(&o));
+    assert_eq!(
+        stdout(&o),
+        format!("{}!text/slide 2:2:Second slide text\n", f.display())
+    );
+}
+
+#[test]
+fn a_documents_words_are_found_without_its_formatting_and_one_block_is_the_text() {
+    let s = Scratch::new("doc");
+    let f = s.write("report.doc", DOC);
+    let o = run(&["--text", "-F", "costs stayed flat"], &f);
+    assert_eq!(code(&o), 0, "{}", stdout(&o));
+    assert!(
+        stdout(&o).starts_with(&format!("{}!text:", f.display())),
+        "{}",
+        stdout(&o)
+    );
+}
+
+#[test]
+fn an_encrypted_document_is_reported_unreadable_and_its_bytes_are_searched() {
+    let s = Scratch::new("locked");
+    let mut doc = DOC.to_vec();
+    let at = (1..doc.len() / 512)
+        .map(|n| n * 512)
+        .find(|&o| doc[o] == 0xEC && doc[o + 1] == 0xA5)
+        .expect("the FIB");
+    doc[at + 0x0B] |= 0x01;
+    let f = s.write("locked.doc", &doc);
+    let o = run(&["--text", "-F", "no such words"], &f);
+    // No match, and a part that could not be read: the search is incomplete.
+    assert_eq!(code(&o), 3, "{}", stdout(&o));
+    let all = format!("{}{}", stdout(&o), String::from_utf8_lossy(&o.stderr));
+    assert!(
+        all.contains("visible text") && all.contains("ncrypted"),
+        "{all}"
+    );
+}
+
+#[test]
+fn without_text_the_bytes_are_searched_as_before() {
+    let s = Scratch::new("bytes");
+    let f = s.write("deck.ppt", PPT);
+    let o = run(&["-a", "-F", "Second slide text"], &f);
+    // The text is stored as UTF-16 or 8-bit in a compound file: the word
+    // search on bytes may or may not see it, and never says a sheet or a slide.
+    assert!(!stdout(&o).contains("!text"), "{}", stdout(&o));
+}
diff --git a/crates/exav-imagehash/Cargo.toml b/crates/exav-imagehash/Cargo.toml
index 96f04e5a..c6011858 100644
--- a/crates/exav-imagehash/Cargo.toml
+++ b/crates/exav-imagehash/Cargo.toml
@@ -29,7 +29,7 @@ required-features = ["cli"]
 # The decoders, at the versions libclamav 1.5.4 links, so that ClamAV's hash is
 # reproduced bit for bit: the hash is the signature. This crate only hashes the
 # pixels they give.
-exav-render = { path = "../exav-render", version = "0.0.2", default-features = false, features = ["image"] }
+exav-render = { path = "../exav-render", version = "0.0.3", default-features = false, features = ["image"] }
 # The resize and the conversions to RGB, as ClamAV runs them; the same `=` pin
 # as exav-render's, since its pixels arrive in this crate's buffers.
 image = { version = "=0.25.9", default-features = false }
diff --git a/crates/exav-imagehash/NOTICE b/crates/exav-imagehash/NOTICE
index 977f65a4..7c282315 100644
--- a/crates/exav-imagehash/NOTICE
+++ b/crates/exav-imagehash/NOTICE
@@ -8,26 +8,20 @@ the exav binaries link are in the NOTICE file at the root of the exav
 repository: https://github.com/sylvinus/exav/blob/main/NOTICE
 
 
-image, MIT OR Apache-2.0 (source derivative)
---------------------------------------------
+The JPEG and TIFF decoders this crate hashes through (adapted from image
+0.25.9 and tiff 0.10.3) are in exav-render's `src/image_codecs/`, with their
+licenses and notices.
 
-src/image_codecs/jpeg.rs and src/image_codecs/tiff_image.rs are adapted from
-image 0.25.9's JPEG and TIFF decoders. Used under the MIT License, whose text
-is in src/image_codecs/LICENSE-image.
 
-Upstream: https://github.com/image-rs/image
-The image-rs Developers.
+rustdct, MIT OR Apache-2.0 (source derivative)
+----------------------------------------------
 
+src/dct.rs holds rustdct 0.7.1's DCT-II for power-of-two lengths, with bounds
+checks where upstream skips them with `unsafe`. Used under the MIT License,
+whose text is in src/LICENSE-rustdct.
 
-tiff, MIT (source derivative)
------------------------------
-
-src/image_codecs/tiff/ is vendored from the decoder of tiff 0.10.3, with its
-byte casts done through bytemuck. The license is in
-src/image_codecs/tiff/LICENSE.
-
-Upstream: https://github.com/image-rs/image-tiff
-Copyright (c) 2018 PistonDevelopers
+Upstream: https://github.com/ejmahler/rust_dct
+Copyright (c) 2015 The RustFFT Developers
 
 
 Pillow, MIT-CMU (source derivative)
diff --git a/crates/exav-imagehash/README.md b/crates/exav-imagehash/README.md
index 9ebc8950..5a739836 100644
--- a/crates/exav-imagehash/README.md
+++ b/crates/exav-imagehash/README.md
@@ -48,7 +48,10 @@ JBIG2 image hashes as the same pixels do in a PNG.
 
 **How exact.** Checked against the tools themselves:
 
-- ClamAV preset: equal to `sigtool --fuzzy-img` on 9,751 JPEGs, 372 TIFFs in 31
+- ClamAV preset: equal to `sigtool --fuzzy-img` on 9,751 JPEGs (measured with
+  zune-jpeg 0.5.8; with 0.5.15, which exav now uses, the hashes are the same on
+  every file tried but the baseline JPEGs with a scan for each component, which
+  0.5.8 draws flat, and the files that make it panic), 372 TIFFs in 31
   encodings, and 780 images in every mode of PNG, GIF, BMP, WebP, ICO, PNM and
   QOI; the images it cannot hash, it does not hash either.
 - imagehash preset: equal on those 780 (8-bit and 16-bit, grey, palette,
diff --git a/crates/exav-imagehash/src/lib.rs b/crates/exav-imagehash/src/lib.rs
index 041778a9..cdf75cab 100644
--- a/crates/exav-imagehash/src/lib.rs
+++ b/crates/exav-imagehash/src/lib.rs
@@ -34,14 +34,14 @@ use std::fmt;
 use std::str::FromStr;
 
 use exav_render::image::{Channels, Pixels, Samples};
-use image::{imageops::FilterType, DynamicImage, GrayImage, ImageBuffer};
+use image::{DynamicImage, GrayImage, ImageBuffer, imageops::FilterType};
 
 mod dct;
 mod pillow;
 
 use dct::dct2d;
 
-pub use exav_render::image::{Format, DECODE_MAX};
+pub use exav_render::image::{DECODE_MAX, Format};
 pub use pillow::PillowFilter;
 
 /// The format's bit in a [`Formats`]: its place in [`Format::ALL`].
diff --git a/crates/exav-imagehash/src/pillow.rs b/crates/exav-imagehash/src/pillow.rs
index 6c947635..456b30e0 100644
--- a/crates/exav-imagehash/src/pillow.rs
+++ b/crates/exav-imagehash/src/pillow.rs
@@ -35,11 +35,7 @@ impl PillowFilter {
             }
             PillowFilter::Bilinear => {
                 let x = x.abs();
-                if x < 1.0 {
-                    1.0 - x
-                } else {
-                    0.0
-                }
+                if x < 1.0 { 1.0 - x } else { 0.0 }
             }
             PillowFilter::Hamming => {
                 let x = x.abs();
diff --git a/crates/exav-imagehash/src/tests.rs b/crates/exav-imagehash/src/tests.rs
index 3fa5dd32..73cf7354 100644
--- a/crates/exav-imagehash/src/tests.rs
+++ b/crates/exav-imagehash/src/tests.rs
@@ -252,9 +252,11 @@ fn pixels_hash_as_the_file_does() {
             "{preset:?}"
         );
     }
-    assert!(Hasher::new(Preset::ClamAv)
-        .hash_rgb8(97, 61, &[0; 5])
-        .is_err());
+    assert!(
+        Hasher::new(Preset::ClamAv)
+            .hash_rgb8(97, 61, &[0; 5])
+            .is_err()
+    );
 }
 
 /// Dimensions are the caller's: ones whose pixel count does not fit a `usize`
@@ -322,9 +324,11 @@ fn bad_params_are_refused() {
             "{p:?}"
         );
     }
-    assert!(Hasher::with_params(Params {
-        keep_dc: false,
-        ..Params::CLAMAV
-    })
-    .is_ok());
+    assert!(
+        Hasher::with_params(Params {
+            keep_dc: false,
+            ..Params::CLAMAV
+        })
+        .is_ok()
+    );
 }
diff --git a/crates/exav-pe-emu/Cargo.toml b/crates/exav-pe-emu/Cargo.toml
index c893dbad..269a2e93 100644
--- a/crates/exav-pe-emu/Cargo.toml
+++ b/crates/exav-pe-emu/Cargo.toml
@@ -27,7 +27,7 @@ path = "src/main.rs"
 # here more than anywhere else in exav: this is the one component where a
 # scanned file supplies control flow rather than data, so the bytes reach the
 # decoder directly and in volume.
-exav-x86 = { path = "../exav-x86", version = "0.0.2" }
+exav-x86 = { path = "../exav-x86", version = "0.0.3" }
 # The emulator looks pages and export traps up once per executed instruction,
 # tens of millions of times per packed file. `HashMap`'s DoS-resistant hasher
 # costs more than the lookup; `FxHashMap` hashes a `u32` key in a multiply and
diff --git a/crates/exav-pe-emu/NOTICE b/crates/exav-pe-emu/NOTICE
index d61ed5d6..c0b3d881 100644
--- a/crates/exav-pe-emu/NOTICE
+++ b/crates/exav-pe-emu/NOTICE
@@ -1,7 +1,85 @@
 exav-pe-emu: third-party notices
+================================
 
-This crate is part of exav and contains no third-party source. The notices
-for the components exav links are in the NOTICE file at the root of the exav
-repository, which also ships in every release archive:
+exav-pe-emu is licensed under the MIT License (see LICENSE). This file gives the
+notices for the third-party data in this crate's source. The notices for the
+components the exav binaries link are in the NOTICE file at the root of the
+exav repository: https://github.com/sylvinus/exav/blob/main/NOTICE
 
-https://github.com/sylvinus/exav/blob/main/NOTICE
+
+Microsoft API documentation, CC BY 4.0 (export name lists)
+----------------------------------------------------------
+
+src/exports/{kernel32,ntdll,user32,advapi32}.txt list the export names the
+synthetic system DLLs advertise. scripts/gen-exports.py, in this crate,
+extracts them from the metadata of Microsoft's API reference pages: for each
+page marked as a DLL export, the function name and the DLLs that export it.
+Nothing else from the pages is used. The lists are a selection and
+rearrangement of that metadata (names only, sorted, one per line). One name is
+added by the script with its reason stated there: ntdll's RtlDecompressBuffer,
+which the documentation records only under NtosKrnl.exe.
+
+Sources, pinned by commit:
+
+  MicrosoftDocs/sdk-api
+    https://github.com/MicrosoftDocs/sdk-api
+    commit 9e0d205d747b5e0f08019cc7e202112c3aa1f68c
+  MicrosoftDocs/windows-driver-docs-ddi
+    https://github.com/MicrosoftDocs/windows-driver-docs-ddi
+    commit 7515063cea4c9e98db6a92986c5b4ddb0463fd16
+
+Copyright (c) Microsoft Corporation.
+
+The documentation is licensed under the Creative Commons Attribution 4.0
+International Public License (CC BY 4.0):
+https://creativecommons.org/licenses/by/4.0/legalcode
+
+The material is provided as-is, without warranties of any kind, as stated in
+section 5 of that licence.
+
+
+Layout facts for the synthetic TEB, PEB, loader lists and KUSER_SHARED_DATA
+---------------------------------------------------------------------------
+
+src/win.rs tags each field it writes with where its offset comes from. No text
+is copied; these are the sources of the facts, all Microsoft documentation
+under the CC BY 4.0 notice above:
+
+  [pe]  PE Format specification, "The .tls Section" (TEB+0x2C TLS array)
+        MicrosoftDocs/win32, desktop-src/Debug/pe-format.md,
+        commit 8a9c5d8f32001411f5e572a17e6d736d6fcc055f
+  [dbg] Debugger documentation, `dt` output from 32-bit Windows: TEB NtTib
+        (0x00), ClientId (0x20), ThreadLocalStoragePointer (0x2C),
+        ProcessEnvironmentBlock (0x30); PEB Ldr (0x0C); PEB_LDR_DATA Length
+        (0x28), Initialized (0x04) and its three list heads (0x0C, 0x14, 0x1C).
+        MicrosoftDocs/windows-driver-docs, commit
+        6de78e042e0eaba466569c7f5ed65c250c644a0b: debugger/
+        debugging-a-stack-overflow.md, debuggercmds/dt--display-type-.md,
+        debuggercmds/c---numbers-and-operators.md
+  [wtl] winternl.h reference: LDR_DATA_TABLE_ENTRY (InMemoryOrderLinks 0x08,
+        DllBase 0x18, FullDllName 0x24, and the positions of the reserved
+        slots at 0x00, 0x10, 0x1C and 0x2C), MicrosoftDocs/sdk-api (commit
+        above), ns-winternl-peb_ldr_data.md
+  [kus] KUSER_SHARED_DATA reference: field order only,
+        MicrosoftDocs/windows-driver-docs-ddi (commit above),
+        ns-ntddk-kuser_shared_data.md
+
+Fields tagged [obs] are not given by these sources. Each holds a value a
+32-bit Windows process can compare against an API that reports the same thing,
+which is how the offset is established:
+
+  TEB 0x00/0x04/0x08   ExceptionList, StackBase, StackLimit: the SEH chain
+                       head and the stack bounds of the running thread
+  TEB 0x18             Self: equals the TEB address
+  TEB 0x20/0x24        GetCurrentProcessId(), GetCurrentThreadId()
+  PEB 0x08             GetModuleHandle(NULL)
+  PEB 0x18             GetProcessHeap()
+  PEB 0x64             GetSystemInfo().dwNumberOfProcessors
+  PEB 0x68             global flags as set with gflags for the image
+  PEB 0xA4..0xB0       RtlGetVersion(): major, minor, build, platform id
+  LDR entry 0x00/0x10  walking the load-order and initialisation-order lists
+                       reaches the same entries the memory-order list does
+  LDR entry 0x1C/0x20  the module's entry point and SizeOfImage from its headers
+  LDR entry 0x2C       the module's file name
+  KUSER 0x00..0x270    GetTickCount(), the system time, the system root and
+                       RtlGetVersion() major/minor
diff --git a/crates/exav-pe-emu/scripts/gen-exports.py b/crates/exav-pe-emu/scripts/gen-exports.py
new file mode 100644
index 00000000..afe9fdb5
--- /dev/null
+++ b/crates/exav-pe-emu/scripts/gen-exports.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python3
+# Regenerate src/exports/<dll>.txt: the export-name sets the synthetic system
+# DLLs advertise, so a stub that resolves imports by hashing export names finds
+# the function it looks for even when the emulator does not implement it.
+#
+# Source: Microsoft's own API documentation, which records for every exported
+# function the DLLs that export it. Each reference page carries YAML front
+# matter with `UID: NF:<header>.<Name>` (the exact exported name; ANSI and
+# Unicode variants each have their own page), `api_type: DllExport` and an
+# `api_location` list of DLLs. Only those three fields are read.
+#
+#   MicrosoftDocs/sdk-api                 (Win32 API reference)
+#   MicrosoftDocs/windows-driver-docs-ddi (WDK reference; Rtl*/Zw* in ntdll)
+#
+# Both are (c) Microsoft Corporation, documentation licensed under CC BY 4.0.
+# The attribution is in this crate's NOTICE. Nothing else is taken from them.
+#
+# Usage: download the two archives below (any path), then
+#   gen-exports.py sdk-api.tar.gz windows-driver-docs-ddi.tar.gz
+# The archives are read in place, never extracted. The commit is the pin; the
+# SHA-256 is of GitHub's tar.gz for that commit as downloaded on 2026-10-18.
+# GitHub does not promise byte-stable archives, so on a hash mismatch rebuild the
+# archive from the pinned commit (`git archive --format=tar.gz`) and re-pin.
+
+import hashlib
+import os
+import re
+import sys
+import tarfile
+
+SOURCES = [
+    {
+        "repo": "MicrosoftDocs/sdk-api",
+        "commit": "9e0d205d747b5e0f08019cc7e202112c3aa1f68c",
+        "url": "https://codeload.github.com/MicrosoftDocs/sdk-api/tar.gz/"
+        "9e0d205d747b5e0f08019cc7e202112c3aa1f68c",
+        "sha256": "7ea18a09a9eb9dc2d50fddc8835f488bb349c6763a2e4eff1d1d3f99a4b53928",
+    },
+    {
+        "repo": "MicrosoftDocs/windows-driver-docs-ddi",
+        "commit": "7515063cea4c9e98db6a92986c5b4ddb0463fd16",
+        "url": "https://codeload.github.com/MicrosoftDocs/windows-driver-docs-ddi/tar.gz/"
+        "7515063cea4c9e98db6a92986c5b4ddb0463fd16",
+        "sha256": "3c3fb42a76ec66aa3b7d61a78901ad1d5612220f9e89847f61ae94a5c11dc2fc",
+    },
+]
+
+# The preloaded DLLs the documentation records exports for. `msvcrt.dll` is
+# absent: the CRT reference does not map functions to it.
+DLLS = ["kernel32.dll", "ntdll.dll", "user32.dll", "advapi32.dll"]
+
+# Names added by hand, each with its justification. The documentation records
+# the DLLs a function is exported from, and a few user-mode ntdll exports are
+# documented only under the kernel.
+ADDED = {
+    "ntdll.dll": [
+        # Documented in the WDK (ntifs.h, nf-ntifs-rtldecompressbuffer) with
+        # api_location NtosKrnl.exe only. ntdll.dll exports it too, and
+        # Alienyze resolves it there by hashing ntdll's export names; without
+        # it the stub skips decompression.
+        "RtlDecompressBuffer",
+    ],
+}
+
+# Cap per module, so a synthetic module's export directory stays inside the
+# region below its trap range (see `MAX_EXPORT_DIR` in src/win.rs).
+MAX_PER_MODULE = 2000
+
+IDENT = re.compile(r"[A-Za-z_][A-Za-z0-9_]*")
+
+
+def front_matter(text):
+    """The scalar and list fields of a page's leading `---` block."""
+    if not text.startswith("---"):
+        return None
+    end = text.find("\n---", 3)
+    if end < 0:
+        return None
+    fields, key = {}, None
+    for line in text[3:end].splitlines():
+        if line.startswith(" - ") and key is not None:
+            fields.setdefault(key, []).append(line[3:].strip())
+            continue
+        m = re.match(r"([A-Za-z0-9_.-]+):\s*(.*)$", line)
+        if m:
+            key, value = m.group(1), m.group(2).strip()
+            fields[key] = [value] if value else []
+    return fields
+
+
+def exports_in(archive, out):
+    with tarfile.open(archive, "r:gz") as tar:
+        for member in tar:
+            if not member.isfile() or not member.name.endswith(".md"):
+                continue
+            # Reference pages only; a page is a few kilobytes, so anything far
+            # larger is not one and is skipped unread.
+            if member.size > 1 << 20:
+                continue
+            raw = tar.extractfile(member).read().decode("utf-8", "replace")
+            fm = front_matter(raw)
+            if not fm:
+                continue
+            if "DllExport" not in fm.get("api_type", []):
+                continue
+            # VersionHelpers.h functions are inline in the header, not exports,
+            # though their pages list ntdll.dll.
+            if (fm.get("req.header") or [""])[0].lower() == "versionhelpers.h":
+                continue
+            uid = (fm.get("UID") or [""])[0]
+            if not uid.startswith("NF:") or "." not in uid:
+                continue
+            name = uid.rsplit(".", 1)[1]
+            if not IDENT.fullmatch(name) or name not in fm.get("api_name", []):
+                continue
+            for loc in fm.get("api_location", []):
+                dll = loc.strip().lower()
+                if dll in out:
+                    out[dll].add(name)
+
+
+def sha256(path):
+    h = hashlib.sha256()
+    with open(path, "rb") as f:
+        for block in iter(lambda: f.read(1 << 20), b""):
+            h.update(block)
+    return h.hexdigest()
+
+
+def main():
+    if len(sys.argv) != len(SOURCES) + 1:
+        sys.exit("usage: gen-exports.py sdk-api.tar.gz windows-driver-docs-ddi.tar.gz")
+    out = {dll: set() for dll in DLLS}
+    for src, path in zip(SOURCES, sys.argv[1:]):
+        got = sha256(path)
+        if got != src["sha256"]:
+            sys.exit(f"{path}: sha256 {got}, expected {src['sha256']} ({src['repo']}@{src['commit']})")
+        exports_in(path, out)
+    for dll, names in ADDED.items():
+        out[dll].update(names)
+    out_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "src", "exports")
+    os.makedirs(out_dir, exist_ok=True)
+    for dll in DLLS:
+        names = sorted(out[dll])[:MAX_PER_MODULE]
+        dest = os.path.join(out_dir, dll.removesuffix(".dll") + ".txt")
+        with open(dest, "w") as f:
+            f.write("".join(n + "\n" for n in names))
+        print(f"{dll}: {len(names)} names")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/crates/exav-pe-emu/src/cpu.rs b/crates/exav-pe-emu/src/cpu.rs
index f060be5f..f6dc0629 100644
--- a/crates/exav-pe-emu/src/cpu.rs
+++ b/crates/exav-pe-emu/src/cpu.rs
@@ -768,14 +768,14 @@ impl Cpu {
         // clearing every slot each time costs more than the decoding it was
         // meant to save. A self-modifying stub turns the cache into pure
         // overhead, by orders of magnitude, unless invalidation is this cheap.
-        let gen = mem.code_generation();
+        let r#gen = mem.code_generation();
         // Indexed by the full address, not `eip >> 1`: consecutive
         // instructions often differ by one byte (`inc ecx; dec ecx`), and
         // folding that bit away maps neighbours onto the same slot, so
         // straight-line code evicts itself every step and never hits.
         let slot = self.eip as usize & (CACHE_SLOTS - 1);
         let insn = match &self.cache[slot] {
-            Some((g, ip, insn)) if *g == gen && *ip == self.eip => insn.clone(),
+            Some((g, ip, insn)) if *g == r#gen && *ip == self.eip => insn.clone(),
             _ => {
                 let mut buf = [0u8; MAX_INSN];
                 let n = mem.read_code(self.eip, &mut buf);
@@ -795,7 +795,7 @@ impl Cpu {
                 // to either one invalidates the cached decode.
                 mem.mark_executed(self.eip);
                 mem.mark_executed(self.eip.wrapping_add(insn.len as u32 - 1));
-                self.cache[slot] = Some((gen, self.eip, insn.clone()));
+                self.cache[slot] = Some((r#gen, self.eip, insn.clone()));
                 insn
             }
         };
@@ -1359,7 +1359,7 @@ impl Cpu {
 
             // Port I/O from ring 3: a fault the program is expected to catch.
             In | Out | Insb | Insw | Insd | Outsb | Outsw | Outsd => {
-                return Err(Stop::Privileged(ip))
+                return Err(Stop::Privileged(ip));
             }
 
             // Packed BCD. No compiler emits these; obfuscators do, precisely
@@ -1559,7 +1559,8 @@ impl Cpu {
                 };
                 self.cf = r & 1 != 0;
                 if count == 1 {
-                    self.of = ((r ^ (r << 1)) & sign_bit(size)) != 0;
+                    // MSB of the result xor the bit rotated into CF.
+                    self.of = (r & sign_bit(size) != 0) != self.cf;
                 }
                 r
             }
@@ -1592,7 +1593,16 @@ impl Cpu {
                     }
                 }
                 self.cf = (acc >> bits) & 1 != 0;
-                (acc as u32) & mask(size)
+                let r = (acc as u32) & mask(size);
+                if count == 1 {
+                    let msb = r & sign_bit(size) != 0;
+                    self.of = if m == Rcl {
+                        msb != self.cf
+                    } else {
+                        msb != (r & (sign_bit(size) >> 1) != 0)
+                    };
+                }
+                r
             }
             _ => unreachable!("shift dispatch"),
         };
@@ -1759,11 +1769,9 @@ impl Cpu {
                 let merges = matches!(m, Movss | Movsd)
                     && matches!(insn.ops[0], Op::Xmm(_))
                     && matches!(insn.ops[1], Op::Xmm(_));
-                if merges {
-                    if let Op::Xmm(r) = insn.ops[0] {
-                        self.xmm[r as usize & 7][..n].copy_from_slice(&v[..n]);
-                        return Ok(true);
-                    }
+                if merges && let Op::Xmm(r) = insn.ops[0] {
+                    self.xmm[r as usize & 7][..n].copy_from_slice(&v[..n]);
+                    return Ok(true);
                 }
                 self.write_simd(mem, insn, 0, &v)?;
                 Ok(true)
@@ -2442,6 +2450,30 @@ mod tests {
         assert!(cpu.cf);
     }
 
+    #[test]
+    fn rotate_by_one_sets_overflow_from_the_result() {
+        // OF after a 1-bit rotate is MSB(result) xor CF-bit-rotated. A tElock
+        // decryptor branches on it; getting it wrong sent the stub into an
+        // `EB FE` self-loop. Values checked against a reference x86.
+        //   rol: 0x80000000 rol 1 -> CF=1, result MSB=0, so OF = 1 ^ 0 = 1.
+        let (cpu, _) = run(&[0xb8, 0, 0, 0, 0x80, 0xd1, 0xc0], |_| {});
+        assert_eq!(cpu.regs[EAX], 1);
+        assert!(cpu.cf && cpu.of, "rol: CF=1, OF=1");
+        //   rol 0x40000000 by 1 -> 0x80000000, CF=0, MSB=1, OF = 1 ^ 0 = 1.
+        let (cpu, _) = run(&[0xb8, 0, 0, 0, 0x40, 0xd1, 0xc0], |_| {});
+        assert_eq!(cpu.regs[EAX], 0x8000_0000);
+        assert!(!cpu.cf && cpu.of, "rol: CF=0, OF=1");
+        //   ror 1 of odd value: 0x00000001 -> 0x80000000, CF=1, top two bits
+        //   10, so OF = MSB xor next-bit = 1 ^ 0 = 1.
+        let (cpu, _) = run(&[0xb8, 1, 0, 0, 0, 0xd1, 0xc8], |_| {});
+        assert_eq!(cpu.regs[EAX], 0x8000_0000);
+        assert!(cpu.cf && cpu.of, "ror: CF=1, OF=1");
+        //   rcr 1 with CF=0 of 1 -> 0, CF out = 1, both top bits 0, OF = 0.
+        let (cpu, _) = run(&[0xb8, 1, 0, 0, 0, 0xd1, 0xd8], |c| c.cf = false);
+        assert_eq!(cpu.regs[EAX], 0);
+        assert!(cpu.cf && !cpu.of, "rcr: CF=1, OF=0");
+    }
+
     #[test]
     fn mul_and_div_roundtrip() {
         // b8 00 00 10 00   mov eax, 0x100000
diff --git a/crates/exav-pe-emu/src/exports/advapi32.txt b/crates/exav-pe-emu/src/exports/advapi32.txt
new file mode 100644
index 00000000..907e3c8e
--- /dev/null
+++ b/crates/exav-pe-emu/src/exports/advapi32.txt
@@ -0,0 +1,541 @@
+AbortSystemShutdownA
+AbortSystemShutdownW
+AccessCheck
+AccessCheckAndAuditAlarmA
+AccessCheckAndAuditAlarmW
+AccessCheckByType
+AccessCheckByTypeAndAuditAlarmA
+AccessCheckByTypeAndAuditAlarmW
+AccessCheckByTypeResultList
+AccessCheckByTypeResultListAndAuditAlarmA
+AccessCheckByTypeResultListAndAuditAlarmByHandleA
+AccessCheckByTypeResultListAndAuditAlarmByHandleW
+AccessCheckByTypeResultListAndAuditAlarmW
+AddAccessAllowedAce
+AddAccessAllowedAceEx
+AddAccessAllowedObjectAce
+AddAccessDeniedAce
+AddAccessDeniedAceEx
+AddAccessDeniedObjectAce
+AddAce
+AddAuditAccessAce
+AddAuditAccessAceEx
+AddAuditAccessObjectAce
+AddConditionalAce
+AddMandatoryAce
+AddUsersToEncryptedFile
+AdjustTokenGroups
+AdjustTokenPrivileges
+AllocateAndInitializeSid
+AllocateLocallyUniqueId
+AreAllAccessesGranted
+AreAnyAccessesGranted
+AuditComputeEffectivePolicyBySid
+AuditComputeEffectivePolicyByToken
+AuditEnumerateCategories
+AuditEnumeratePerUserPolicy
+AuditEnumerateSubCategories
+AuditFree
+AuditLookupCategoryGuidFromCategoryId
+AuditLookupCategoryIdFromCategoryGuid
+AuditLookupCategoryNameA
+AuditLookupCategoryNameW
+AuditLookupSubCategoryNameA
+AuditLookupSubCategoryNameW
+AuditQueryGlobalSaclA
+AuditQueryGlobalSaclW
+AuditQueryPerUserPolicy
+AuditQuerySecurity
+AuditQuerySystemPolicy
+AuditSetGlobalSaclA
+AuditSetGlobalSaclW
+AuditSetPerUserPolicy
+AuditSetSecurity
+AuditSetSystemPolicy
+BackupEventLogA
+BackupEventLogW
+BuildExplicitAccessWithNameA
+BuildExplicitAccessWithNameW
+BuildSecurityDescriptorA
+BuildSecurityDescriptorW
+BuildTrusteeWithNameA
+BuildTrusteeWithNameW
+BuildTrusteeWithObjectsAndNameA
+BuildTrusteeWithObjectsAndNameW
+BuildTrusteeWithObjectsAndSidA
+BuildTrusteeWithObjectsAndSidW
+BuildTrusteeWithSidA
+BuildTrusteeWithSidW
+ChangeServiceConfig2A
+ChangeServiceConfig2W
+ChangeServiceConfigA
+ChangeServiceConfigW
+CheckTokenMembership
+ClearEventLogA
+ClearEventLogW
+CloseEncryptedFileRaw
+CloseEventLog
+CloseServiceHandle
+CloseThreadWaitChainSession
+ControlService
+ControlServiceExA
+ControlServiceExW
+ConvertSecurityDescriptorToStringSecurityDescriptorA
+ConvertSecurityDescriptorToStringSecurityDescriptorW
+ConvertSidToStringSidA
+ConvertSidToStringSidW
+ConvertStringSecurityDescriptorToSecurityDescriptorA
+ConvertStringSecurityDescriptorToSecurityDescriptorW
+ConvertStringSidToSidA
+ConvertStringSidToSidW
+ConvertToAutoInheritPrivateObjectSecurity
+CopySid
+CreatePrivateObjectSecurity
+CreatePrivateObjectSecurityEx
+CreatePrivateObjectSecurityWithMultipleInheritance
+CreateProcessAsUserA
+CreateProcessAsUserW
+CreateProcessWithLogonW
+CreateProcessWithTokenW
+CreateRestrictedToken
+CreateServiceA
+CreateServiceW
+CreateWellKnownSid
+CredDeleteA
+CredDeleteW
+CredEnumerateA
+CredEnumerateW
+CredFindBestCredentialA
+CredFindBestCredentialW
+CredFree
+CredGetSessionTypes
+CredGetTargetInfoA
+CredGetTargetInfoW
+CredIsMarshaledCredentialA
+CredIsMarshaledCredentialW
+CredIsProtectedA
+CredIsProtectedW
+CredMarshalCredentialA
+CredMarshalCredentialW
+CredMarshalTargetInfo
+CredProtectA
+CredProtectW
+CredReadA
+CredReadDomainCredentialsA
+CredReadDomainCredentialsW
+CredReadW
+CredRenameA
+CredRenameW
+CredUnmarshalCredentialA
+CredUnmarshalCredentialW
+CredUnprotectA
+CredUnprotectW
+CredWriteA
+CredWriteDomainCredentialsA
+CredWriteDomainCredentialsW
+CredWriteW
+CryptAcquireContextA
+CryptAcquireContextW
+CryptContextAddRef
+CryptCreateHash
+CryptDecrypt
+CryptDeriveKey
+CryptDestroyHash
+CryptDestroyKey
+CryptDuplicateHash
+CryptDuplicateKey
+CryptEncrypt
+CryptEnumProviderTypesA
+CryptEnumProviderTypesW
+CryptEnumProvidersA
+CryptEnumProvidersW
+CryptExportKey
+CryptGenKey
+CryptGenRandom
+CryptGetDefaultProviderA
+CryptGetDefaultProviderW
+CryptGetHashParam
+CryptGetKeyParam
+CryptGetProvParam
+CryptGetUserKey
+CryptHashData
+CryptHashSessionKey
+CryptImportKey
+CryptReleaseContext
+CryptSetHashParam
+CryptSetKeyParam
+CryptSetProvParam
+CryptSetProviderA
+CryptSetProviderExA
+CryptSetProviderExW
+CryptSetProviderW
+CryptSignHashA
+CryptSignHashW
+CryptVerifySignatureA
+CryptVerifySignatureW
+CveEventWrite
+DecryptFileA
+DecryptFileW
+DeleteAce
+DeleteService
+DeregisterEventSource
+DestroyPrivateObjectSecurity
+DuplicateEncryptionInfoFile
+DuplicateToken
+DuplicateTokenEx
+EncryptFileA
+EncryptFileW
+EncryptionDisable
+EnumDependentServicesA
+EnumDependentServicesW
+EnumDynamicTimeZoneInformation
+EnumServicesStatusA
+EnumServicesStatusExA
+EnumServicesStatusExW
+EnumServicesStatusW
+EqualDomainSid
+EqualPrefixSid
+EqualSid
+EventAccessControl
+EventAccessQuery
+EventAccessRemove
+FileEncryptionStatusA
+FileEncryptionStatusW
+FindFirstFreeAce
+FreeEncryptionCertificateHashList
+FreeInheritedFromArray
+FreeSid
+GetAce
+GetAclInformation
+GetAuditedPermissionsFromAclA
+GetAuditedPermissionsFromAclW
+GetCurrentHwProfileA
+GetCurrentHwProfileW
+GetDynamicTimeZoneInformationEffectiveYears
+GetEffectiveRightsFromAclA
+GetEffectiveRightsFromAclW
+GetEventLogInformation
+GetExplicitEntriesFromAclA
+GetExplicitEntriesFromAclW
+GetFileSecurityA
+GetFileSecurityW
+GetInheritanceSourceA
+GetInheritanceSourceW
+GetKernelObjectSecurity
+GetLengthSid
+GetLocalManagedApplications
+GetManagedApplicationCategories
+GetManagedApplications
+GetNamedSecurityInfoA
+GetNamedSecurityInfoW
+GetNumberOfEventLogRecords
+GetOldestEventLogRecord
+GetPrivateObjectSecurity
+GetSecurityDescriptorControl
+GetSecurityDescriptorDacl
+GetSecurityDescriptorGroup
+GetSecurityDescriptorLength
+GetSecurityDescriptorOwner
+GetSecurityDescriptorRMControl
+GetSecurityDescriptorSacl
+GetSecurityInfo
+GetServiceDisplayNameA
+GetServiceDisplayNameW
+GetServiceKeyNameA
+GetServiceKeyNameW
+GetSidIdentifierAuthority
+GetSidLengthRequired
+GetSidSubAuthority
+GetSidSubAuthorityCount
+GetThreadWaitChain
+GetTokenInformation
+GetTrusteeFormA
+GetTrusteeFormW
+GetTrusteeNameA
+GetTrusteeNameW
+GetTrusteeTypeA
+GetTrusteeTypeW
+GetUserNameA
+GetUserNameW
+GetWindowsAccountDomainSid
+ImpersonateAnonymousToken
+ImpersonateLoggedOnUser
+ImpersonateNamedPipeClient
+ImpersonateSelf
+InitializeAcl
+InitializeSecurityDescriptor
+InitializeSid
+InitiateShutdownA
+InitiateShutdownW
+InitiateSystemShutdownA
+InitiateSystemShutdownExA
+InitiateSystemShutdownExW
+InitiateSystemShutdownW
+InstallApplication
+IsTextUnicode
+IsTokenRestricted
+IsValidAcl
+IsValidSecurityDescriptor
+IsValidSid
+IsWellKnownSid
+LockServiceDatabase
+LogonUserA
+LogonUserExA
+LogonUserExW
+LogonUserW
+LookupAccountNameA
+LookupAccountNameW
+LookupAccountSidA
+LookupAccountSidW
+LookupPrivilegeDisplayNameA
+LookupPrivilegeDisplayNameW
+LookupPrivilegeNameA
+LookupPrivilegeNameW
+LookupPrivilegeValueA
+LookupPrivilegeValueW
+LookupSecurityDescriptorPartsA
+LookupSecurityDescriptorPartsW
+LsaAddAccountRights
+LsaClose
+LsaCreateTrustedDomainEx
+LsaDeleteTrustedDomain
+LsaEnumerateAccountRights
+LsaEnumerateAccountsWithUserRight
+LsaEnumerateTrustedDomains
+LsaEnumerateTrustedDomainsEx
+LsaFreeMemory
+LsaGetAppliedCAPIDs
+LsaLookupNames
+LsaLookupNames2
+LsaLookupPrivilegeValue
+LsaLookupSids
+LsaLookupSids2
+LsaNtStatusToWinError
+LsaOpenPolicy
+LsaOpenTrustedDomainByName
+LsaQueryCAPs
+LsaQueryDomainInformationPolicy
+LsaQueryForestTrustInformation
+LsaQueryInformationPolicy
+LsaQueryTrustedDomainInfo
+LsaQueryTrustedDomainInfoByName
+LsaRemoveAccountRights
+LsaRetrievePrivateData
+LsaSetDomainInformationPolicy
+LsaSetForestTrustInformation
+LsaSetInformationPolicy
+LsaSetTrustedDomainInfoByName
+LsaSetTrustedDomainInformation
+LsaStorePrivateData
+MSChapSrvChangePassword
+MSChapSrvChangePassword2
+MakeAbsoluteSD
+MakeSelfRelativeSD
+MapGenericMask
+NotifyBootConfigStatus
+NotifyChangeEventLog
+NotifyServiceStatusChangeA
+NotifyServiceStatusChangeW
+ObjectCloseAuditAlarmA
+ObjectCloseAuditAlarmW
+ObjectDeleteAuditAlarmA
+ObjectDeleteAuditAlarmW
+ObjectOpenAuditAlarmA
+ObjectOpenAuditAlarmW
+ObjectPrivilegeAuditAlarmA
+ObjectPrivilegeAuditAlarmW
+OpenBackupEventLogA
+OpenBackupEventLogW
+OpenEncryptedFileRawA
+OpenEncryptedFileRawW
+OpenEventLogA
+OpenEventLogW
+OpenProcessToken
+OpenSCManagerA
+OpenSCManagerW
+OpenServiceA
+OpenServiceW
+OpenThreadToken
+OpenThreadWaitChainSession
+OperationEnd
+OperationStart
+PerfAddCounters
+PerfCloseQueryHandle
+PerfCreateInstance
+PerfDecrementULongCounterValue
+PerfDecrementULongLongCounterValue
+PerfDeleteCounters
+PerfDeleteInstance
+PerfEnumerateCounterSet
+PerfEnumerateCounterSetInstances
+PerfIncrementULongCounterValue
+PerfIncrementULongLongCounterValue
+PerfOpenQueryHandle
+PerfQueryCounterData
+PerfQueryCounterInfo
+PerfQueryCounterSetRegistrationInfo
+PerfQueryInstance
+PerfSetCounterRefValue
+PerfSetCounterSetInfo
+PerfSetULongCounterValue
+PerfSetULongLongCounterValue
+PerfStartProvider
+PerfStartProviderEx
+PerfStopProvider
+PrivilegeCheck
+PrivilegedServiceAuditAlarmA
+PrivilegedServiceAuditAlarmW
+QueryRecoveryAgentsOnEncryptedFile
+QuerySecurityAccessMask
+QueryServiceConfig2A
+QueryServiceConfig2W
+QueryServiceConfigA
+QueryServiceConfigW
+QueryServiceDynamicInformation
+QueryServiceLockStatusA
+QueryServiceLockStatusW
+QueryServiceObjectSecurity
+QueryServiceStatus
+QueryServiceStatusEx
+QueryUsersOnEncryptedFile
+ReadEncryptedFileRaw
+ReadEventLogA
+ReadEventLogW
+RegCloseKey
+RegConnectRegistryA
+RegConnectRegistryW
+RegCopyTreeA
+RegCopyTreeW
+RegCreateKeyA
+RegCreateKeyExA
+RegCreateKeyExW
+RegCreateKeyTransactedA
+RegCreateKeyTransactedW
+RegCreateKeyW
+RegDeleteKeyA
+RegDeleteKeyExA
+RegDeleteKeyExW
+RegDeleteKeyTransactedA
+RegDeleteKeyTransactedW
+RegDeleteKeyValueA
+RegDeleteKeyValueW
+RegDeleteKeyW
+RegDeleteTreeA
+RegDeleteTreeW
+RegDeleteValueA
+RegDeleteValueW
+RegDisablePredefinedCache
+RegDisablePredefinedCacheEx
+RegDisableReflectionKey
+RegEnableReflectionKey
+RegEnumKeyA
+RegEnumKeyExA
+RegEnumKeyExW
+RegEnumKeyW
+RegEnumValueA
+RegEnumValueW
+RegFlushKey
+RegGetKeySecurity
+RegGetValueA
+RegGetValueW
+RegLoadAppKeyA
+RegLoadAppKeyW
+RegLoadKeyA
+RegLoadKeyW
+RegLoadMUIStringA
+RegLoadMUIStringW
+RegNotifyChangeKeyValue
+RegOpenCurrentUser
+RegOpenKeyA
+RegOpenKeyExA
+RegOpenKeyExW
+RegOpenKeyTransactedA
+RegOpenKeyTransactedW
+RegOpenKeyW
+RegOpenUserClassesRoot
+RegOverridePredefKey
+RegQueryInfoKeyA
+RegQueryInfoKeyW
+RegQueryMultipleValuesA
+RegQueryMultipleValuesW
+RegQueryReflectionKey
+RegQueryValueA
+RegQueryValueExA
+RegQueryValueExW
+RegQueryValueW
+RegReplaceKeyA
+RegReplaceKeyW
+RegRestoreKeyA
+RegRestoreKeyW
+RegSaveKeyA
+RegSaveKeyExA
+RegSaveKeyExW
+RegSaveKeyW
+RegSetKeySecurity
+RegSetKeyValueA
+RegSetKeyValueW
+RegSetValueA
+RegSetValueExA
+RegSetValueExW
+RegSetValueW
+RegUnLoadKeyA
+RegUnLoadKeyW
+RegisterEventSourceA
+RegisterEventSourceW
+RegisterServiceCtrlHandlerA
+RegisterServiceCtrlHandlerExA
+RegisterServiceCtrlHandlerExW
+RegisterServiceCtrlHandlerW
+RegisterWaitChainCOMCallback
+RemoveUsersFromEncryptedFile
+ReportEventA
+ReportEventW
+RevertToSelf
+RtlDecryptMemory
+RtlEncryptMemory
+RtlGenRandom
+SaferCloseLevel
+SaferComputeTokenFromLevel
+SaferCreateLevel
+SaferGetLevelInformation
+SaferGetPolicyInformation
+SaferIdentifyLevel
+SaferRecordEventLogEntry
+SaferSetLevelInformation
+SaferSetPolicyInformation
+SaferiIsExecutableFileType
+SetAclInformation
+SetEntriesInAclA
+SetEntriesInAclW
+SetFileSecurityA
+SetFileSecurityW
+SetKernelObjectSecurity
+SetNamedSecurityInfoA
+SetNamedSecurityInfoW
+SetPrivateObjectSecurity
+SetPrivateObjectSecurityEx
+SetSecurityAccessMask
+SetSecurityDescriptorControl
+SetSecurityDescriptorDacl
+SetSecurityDescriptorGroup
+SetSecurityDescriptorOwner
+SetSecurityDescriptorRMControl
+SetSecurityDescriptorSacl
+SetSecurityInfo
+SetServiceBits
+SetServiceObjectSecurity
+SetServiceStatus
+SetThreadToken
+SetTokenInformation
+SetUserFileEncryptionKey
+StartServiceA
+StartServiceCtrlDispatcherA
+StartServiceCtrlDispatcherW
+StartServiceW
+TreeResetNamedSecurityInfoA
+TreeResetNamedSecurityInfoW
+TreeSetNamedSecurityInfoA
+TreeSetNamedSecurityInfoW
+UninstallApplication
+UnlockServiceDatabase
+WriteEncryptedFileRaw
diff --git a/crates/exav-pe-emu/src/exports/kernel32.txt b/crates/exav-pe-emu/src/exports/kernel32.txt
new file mode 100644
index 00000000..4c5c2327
--- /dev/null
+++ b/crates/exav-pe-emu/src/exports/kernel32.txt
@@ -0,0 +1,1267 @@
+AcquireSRWLockExclusive
+AcquireSRWLockShared
+ActivateActCtx
+AddAtomA
+AddAtomW
+AddDllDirectory
+AddIntegrityLabelToBoundaryDescriptor
+AddRefActCtx
+AddResourceAttributeAce
+AddSIDToBoundaryDescriptor
+AddScopedPolicyIDAce
+AddSecureMemoryCacheCallback
+AddVectoredContinueHandler
+AddVectoredExceptionHandler
+AllocateUserPhysicalPages
+AllocateUserPhysicalPagesNuma
+AppPolicyGetCreateFileAccess
+AppPolicyGetProcessTerminationMethod
+AppPolicyGetShowDeveloperDiagnostic
+AppPolicyGetThreadInitializationType
+AppPolicyGetWindowingModel
+ApplicationRecoveryFinished
+ApplicationRecoveryInProgress
+AreFileApisANSI
+AssignProcessToJobObject
+BackupRead
+BackupSeek
+BackupWrite
+Beep
+BeginUpdateResourceA
+BeginUpdateResourceW
+BindIoCompletionCallback
+BuildCommDCBA
+BuildCommDCBAndTimeoutsA
+BuildCommDCBAndTimeoutsW
+BuildCommDCBW
+CallEnclave
+CallNamedPipeA
+CallNamedPipeW
+CallbackMayRunLong
+CancelIo
+CancelIoEx
+CancelSynchronousIo
+CancelThreadpoolIo
+CancelWaitableTimer
+CeipIsOptedIn
+ChangeTimerQueueTimer
+CheckNameLegalDOS8Dot3A
+CheckNameLegalDOS8Dot3W
+CheckRemoteDebuggerPresent
+CheckTokenCapability
+CheckTokenMembershipEx
+ClearCommBreak
+ClearCommError
+CloseHandle
+ClosePackageInfo
+ClosePrivateNamespace
+CloseThreadpool
+CloseThreadpoolCleanupGroup
+CloseThreadpoolCleanupGroupMembers
+CloseThreadpoolIo
+CloseThreadpoolTimer
+CloseThreadpoolWait
+CloseThreadpoolWork
+CommConfigDialogA
+CommConfigDialogW
+CompareFileTime
+CompareObjectHandles
+CompareString
+CompareStringA
+CompareStringEx
+CompareStringOrdinal
+CompareStringW
+ConnectNamedPipe
+ContinueDebugEvent
+ConvertAuxiliaryCounterToPerformanceCounter
+ConvertDefaultLocale
+ConvertFiberToThread
+ConvertPerformanceCounterToAuxiliaryCounter
+ConvertThreadToFiber
+ConvertThreadToFiberEx
+CopyContext
+CopyFile
+CopyFile2
+CopyFileA
+CopyFileExA
+CopyFileExW
+CopyFileTransactedA
+CopyFileTransactedW
+CopyFileW
+CreateActCtxA
+CreateActCtxW
+CreateBoundaryDescriptorA
+CreateBoundaryDescriptorW
+CreateDirectory
+CreateDirectoryA
+CreateDirectoryExA
+CreateDirectoryExW
+CreateDirectoryTransactedA
+CreateDirectoryTransactedW
+CreateDirectoryW
+CreateEnclave
+CreateEventA
+CreateEventExA
+CreateEventExW
+CreateEventW
+CreateFiber
+CreateFiberEx
+CreateFile2
+CreateFileA
+CreateFileMapping2
+CreateFileMappingA
+CreateFileMappingFromApp
+CreateFileMappingNumaA
+CreateFileMappingNumaW
+CreateFileMappingW
+CreateFileTransactedA
+CreateFileTransactedW
+CreateFileW
+CreateHardLinkA
+CreateHardLinkTransactedA
+CreateHardLinkTransactedW
+CreateHardLinkW
+CreateIoCompletionPort
+CreateJobObjectA
+CreateJobObjectW
+CreateMailslotA
+CreateMailslotW
+CreateMemoryResourceNotification
+CreateMutexA
+CreateMutexExA
+CreateMutexExW
+CreateMutexW
+CreateNamedPipeA
+CreateNamedPipeW
+CreatePipe
+CreatePrivateNamespaceA
+CreatePrivateNamespaceW
+CreateProcessA
+CreateProcessAsUserA
+CreateProcessAsUserW
+CreateProcessW
+CreateRemoteThread
+CreateRemoteThreadEx
+CreateSemaphoreA
+CreateSemaphoreExA
+CreateSemaphoreExW
+CreateSemaphoreW
+CreateSymbolicLinkA
+CreateSymbolicLinkTransactedA
+CreateSymbolicLinkTransactedW
+CreateSymbolicLinkW
+CreateTapePartition
+CreateThread
+CreateThreadpool
+CreateThreadpoolCleanupGroup
+CreateThreadpoolIo
+CreateThreadpoolTimer
+CreateThreadpoolWait
+CreateThreadpoolWork
+CreateTimerQueue
+CreateTimerQueueTimer
+CreateToolhelp32Snapshot
+CreateUmsCompletionList
+CreateUmsThreadContext
+CreateWaitableTimerExW
+CreateWaitableTimerW
+DeactivateActCtx
+DebugActiveProcess
+DebugActiveProcessStop
+DebugBreak
+DebugBreakProcess
+DebugSetProcessKillOnExit
+DefineDosDeviceA
+DefineDosDeviceW
+DeleteAtom
+DeleteBoundaryDescriptor
+DeleteCriticalSection
+DeleteEnclave
+DeleteFiber
+DeleteFile
+DeleteFileA
+DeleteFileTransactedA
+DeleteFileTransactedW
+DeleteFileW
+DeleteProcThreadAttributeList
+DeleteSynchronizationBarrier
+DeleteTimerQueue
+DeleteTimerQueueEx
+DeleteTimerQueueTimer
+DeleteUmsCompletionList
+DeleteUmsThreadContext
+DeleteVolumeMountPointA
+DeleteVolumeMountPointW
+DequeueUmsCompletionListItems
+DeviceIoControl
+DisableThreadLibraryCalls
+DisableThreadProfiling
+DisassociateCurrentThreadFromCallback
+DiscardVirtualMemory
+DisconnectNamedPipe
+DnsHostnameToComputerNameA
+DnsHostnameToComputerNameW
+DosDateTimeToFileTime
+DuplicateHandle
+EmptyWorkingSet
+EnableThreadProfiling
+EndUpdateResourceA
+EndUpdateResourceW
+EnterCriticalSection
+EnterSynchronizationBarrier
+EnterUmsSchedulingMode
+EnumCalendarInfoA
+EnumCalendarInfoExA
+EnumCalendarInfoExEx
+EnumCalendarInfoExW
+EnumCalendarInfoW
+EnumDateFormatsA
+EnumDateFormatsExA
+EnumDateFormatsExEx
+EnumDateFormatsExW
+EnumDateFormatsW
+EnumDeviceDrivers
+EnumDynamicTimeZoneInformation
+EnumLanguageGroupLocalesA
+EnumLanguageGroupLocalesW
+EnumPageFilesA
+EnumPageFilesW
+EnumProcessModules
+EnumProcessModulesEx
+EnumProcesses
+EnumResourceLanguagesA
+EnumResourceLanguagesExA
+EnumResourceLanguagesExW
+EnumResourceLanguagesW
+EnumResourceNamesA
+EnumResourceNamesExA
+EnumResourceNamesExW
+EnumResourceNamesW
+EnumResourceTypesA
+EnumResourceTypesExA
+EnumResourceTypesExW
+EnumResourceTypesW
+EnumSystemCodePagesA
+EnumSystemCodePagesW
+EnumSystemFirmwareTables
+EnumSystemGeoID
+EnumSystemGeoNames
+EnumSystemLanguageGroupsA
+EnumSystemLanguageGroupsW
+EnumSystemLocalesA
+EnumSystemLocalesEx
+EnumSystemLocalesW
+EnumTimeFormatsA
+EnumTimeFormatsEx
+EnumTimeFormatsW
+EnumUILanguagesA
+EnumUILanguagesW
+EraseTape
+EscapeCommFunction
+ExecuteUmsThread
+ExitProcess
+ExitThread
+ExpandEnvironmentStringsA
+ExpandEnvironmentStringsW
+FatalAppExitA
+FatalAppExitW
+FatalExit
+FileTimeToDosDateTime
+FileTimeToLocalFileTime
+FileTimeToSystemTime
+FindActCtxSectionGuid
+FindActCtxSectionStringA
+FindActCtxSectionStringW
+FindAtomA
+FindAtomW
+FindClose
+FindCloseChangeNotification
+FindFirstChangeNotificationA
+FindFirstChangeNotificationW
+FindFirstFileA
+FindFirstFileExA
+FindFirstFileExW
+FindFirstFileNameTransactedW
+FindFirstFileNameW
+FindFirstFileTransactedA
+FindFirstFileTransactedW
+FindFirstFileW
+FindFirstStreamTransactedW
+FindFirstStreamW
+FindFirstVolumeA
+FindFirstVolumeMountPointA
+FindFirstVolumeMountPointW
+FindFirstVolumeW
+FindNLSString
+FindNLSStringEx
+FindNextChangeNotification
+FindNextFileA
+FindNextFileNameW
+FindNextFileW
+FindNextStreamW
+FindNextVolumeA
+FindNextVolumeMountPointA
+FindNextVolumeMountPointW
+FindNextVolumeW
+FindPackagesByPackageFamily
+FindResourceA
+FindResourceExA
+FindResourceExW
+FindResourceW
+FindStringOrdinal
+FindVolumeClose
+FindVolumeMountPointClose
+FlsAlloc
+FlsFree
+FlsGetValue
+FlsSetValue
+FlushFileBuffers
+FlushInstructionCache
+FlushProcessWriteBuffers
+FlushViewOfFile
+FoldStringA
+FoldStringW
+FormatApplicationUserModelId
+FormatMessage
+FormatMessageA
+FormatMessageW
+FreeEnvironmentStringsA
+FreeEnvironmentStringsW
+FreeLibrary
+FreeLibraryAndExitThread
+FreeLibraryWhenCallbackReturns
+FreeMemoryJobObject
+FreeResource
+FreeUserPhysicalPages
+GetACP
+GetActiveProcessorCount
+GetActiveProcessorGroupCount
+GetAppContainerNamedObjectPath
+GetApplicationRecoveryCallback
+GetApplicationRestartSettings
+GetApplicationUserModelId
+GetApplicationUserModelIdFromToken
+GetAtomNameA
+GetAtomNameW
+GetBinaryTypeA
+GetBinaryTypeW
+GetCPInfo
+GetCPInfoExA
+GetCPInfoExW
+GetCalendarInfoA
+GetCalendarInfoEx
+GetCalendarInfoW
+GetCommConfig
+GetCommMask
+GetCommModemStatus
+GetCommProperties
+GetCommState
+GetCommTimeouts
+GetCommandLineA
+GetCommandLineW
+GetCompressedFileSizeA
+GetCompressedFileSizeTransactedA
+GetCompressedFileSizeTransactedW
+GetCompressedFileSizeW
+GetComputerNameA
+GetComputerNameExA
+GetComputerNameExW
+GetComputerNameW
+GetCurrencyFormatA
+GetCurrencyFormatEx
+GetCurrencyFormatW
+GetCurrentActCtx
+GetCurrentApplicationUserModelId
+GetCurrentDirectory
+GetCurrentPackageFamilyName
+GetCurrentPackageFullName
+GetCurrentPackageId
+GetCurrentPackageInfo
+GetCurrentPackagePath
+GetCurrentProcess
+GetCurrentProcessId
+GetCurrentProcessorNumber
+GetCurrentProcessorNumberEx
+GetCurrentThread
+GetCurrentThreadId
+GetCurrentThreadStackLimits
+GetCurrentUmsThread
+GetDateFormatA
+GetDateFormatEx
+GetDateFormatW
+GetDefaultCommConfigA
+GetDefaultCommConfigW
+GetDeviceDriverBaseNameA
+GetDeviceDriverBaseNameW
+GetDeviceDriverFileNameA
+GetDeviceDriverFileNameW
+GetDevicePowerState
+GetDiskFreeSpaceA
+GetDiskFreeSpaceExA
+GetDiskFreeSpaceExW
+GetDiskFreeSpaceW
+GetDiskSpaceInformationA
+GetDiskSpaceInformationW
+GetDllDirectoryA
+GetDllDirectoryW
+GetDriveTypeA
+GetDriveTypeW
+GetDurationFormat
+GetDurationFormatEx
+GetDynamicTimeZoneInformation
+GetDynamicTimeZoneInformationEffectiveYears
+GetEnabledXStateFeatures
+GetEnvironmentStrings
+GetEnvironmentStringsW
+GetEnvironmentVariable
+GetEnvironmentVariableA
+GetEnvironmentVariableW
+GetErrorMode
+GetExitCodeProcess
+GetExitCodeThread
+GetFileAttributesA
+GetFileAttributesExA
+GetFileAttributesExW
+GetFileAttributesTransactedA
+GetFileAttributesTransactedW
+GetFileAttributesW
+GetFileBandwidthReservation
+GetFileInformationByHandle
+GetFileInformationByHandleEx
+GetFileMUIInfo
+GetFileMUIPath
+GetFileSize
+GetFileSizeEx
+GetFileTime
+GetFileType
+GetFinalPathNameByHandleA
+GetFinalPathNameByHandleW
+GetFirmwareEnvironmentVariableA
+GetFirmwareEnvironmentVariableExA
+GetFirmwareEnvironmentVariableExW
+GetFirmwareEnvironmentVariableW
+GetFirmwareType
+GetFullPathNameA
+GetFullPathNameTransactedA
+GetFullPathNameTransactedW
+GetFullPathNameW
+GetGeoInfoA
+GetGeoInfoEx
+GetGeoInfoW
+GetHandleInformation
+GetLargePageMinimum
+GetLastError
+GetLocalTime
+GetLocaleInfoA
+GetLocaleInfoEx
+GetLocaleInfoW
+GetLogicalDriveStringsA
+GetLogicalDriveStringsW
+GetLogicalDrives
+GetLogicalProcessorInformation
+GetLogicalProcessorInformationEx
+GetLongPathNameA
+GetLongPathNameTransactedA
+GetLongPathNameTransactedW
+GetLongPathNameW
+GetMachineTypeAttributes
+GetMailslotInfo
+GetMappedFileNameA
+GetMappedFileNameW
+GetMaximumProcessorCount
+GetMaximumProcessorGroupCount
+GetMemoryErrorHandlingCapabilities
+GetModuleBaseNameA
+GetModuleBaseNameW
+GetModuleFileNameA
+GetModuleFileNameExA
+GetModuleFileNameExW
+GetModuleFileNameW
+GetModuleHandleA
+GetModuleHandleExA
+GetModuleHandleExW
+GetModuleHandleW
+GetModuleInformation
+GetNLSVersion
+GetNLSVersionEx
+GetNamedPipeClientComputerNameA
+GetNamedPipeClientComputerNameW
+GetNamedPipeClientProcessId
+GetNamedPipeClientSessionId
+GetNamedPipeHandleStateA
+GetNamedPipeHandleStateW
+GetNamedPipeInfo
+GetNamedPipeServerProcessId
+GetNamedPipeServerSessionId
+GetNativeSystemInfo
+GetNextUmsListItem
+GetNumaAvailableMemoryNode
+GetNumaAvailableMemoryNodeEx
+GetNumaHighestNodeNumber
+GetNumaNodeNumberFromHandle
+GetNumaNodeProcessorMask
+GetNumaNodeProcessorMaskEx
+GetNumaProcessorNode
+GetNumaProcessorNodeEx
+GetNumaProximityNode
+GetNumaProximityNodeEx
+GetNumberFormatA
+GetNumberFormatEx
+GetNumberFormatW
+GetOEMCP
+GetOverlappedResult
+GetOverlappedResultEx
+GetPackageApplicationIds
+GetPackageFamilyName
+GetPackageFamilyNameFromToken
+GetPackageFullName
+GetPackageFullNameFromToken
+GetPackageId
+GetPackageInfo
+GetPackagePath
+GetPackagePathByFullName
+GetPackagesByPackageFamily
+GetPerformanceInfo
+GetPhysicallyInstalledSystemMemory
+GetPriorityClass
+GetPrivateProfileInt
+GetPrivateProfileIntA
+GetPrivateProfileIntW
+GetPrivateProfileSection
+GetPrivateProfileSectionA
+GetPrivateProfileSectionNames
+GetPrivateProfileSectionNamesA
+GetPrivateProfileSectionNamesW
+GetPrivateProfileSectionW
+GetPrivateProfileString
+GetPrivateProfileStringA
+GetPrivateProfileStringW
+GetPrivateProfileStruct
+GetPrivateProfileStructA
+GetPrivateProfileStructW
+GetProcAddress
+GetProcessAffinityMask
+GetProcessDEPPolicy
+GetProcessDefaultCpuSetMasks
+GetProcessGroupAffinity
+GetProcessHandleCount
+GetProcessHeap
+GetProcessHeaps
+GetProcessId
+GetProcessIdOfThread
+GetProcessImageFileNameA
+GetProcessImageFileNameW
+GetProcessInformation
+GetProcessIoCounters
+GetProcessMemoryInfo
+GetProcessMitigationPolicy
+GetProcessPreferredUILanguages
+GetProcessPriorityBoost
+GetProcessShutdownParameters
+GetProcessTimes
+GetProcessVersion
+GetProcessWorkingSetSize
+GetProcessWorkingSetSizeEx
+GetProcessorSystemCycleTime
+GetProductInfo
+GetProfileIntA
+GetProfileIntW
+GetProfileSectionA
+GetProfileSectionW
+GetProfileStringA
+GetProfileStringW
+GetQueuedCompletionStatus
+GetQueuedCompletionStatusEx
+GetShortPathNameA
+GetShortPathNameW
+GetStagedPackageOrigin
+GetStagedPackagePathByFullName
+GetStartupInfoW
+GetStringScripts
+GetStringTypeA
+GetStringTypeExW
+GetStringTypeW
+GetSystemDEPPolicy
+GetSystemDefaultLCID
+GetSystemDefaultLangID
+GetSystemDefaultLocaleName
+GetSystemDefaultUILanguage
+GetSystemDirectoryA
+GetSystemDirectoryW
+GetSystemFileCacheSize
+GetSystemFirmwareTable
+GetSystemInfo
+GetSystemPowerStatus
+GetSystemPreferredUILanguages
+GetSystemRegistryQuota
+GetSystemTime
+GetSystemTimeAdjustment
+GetSystemTimeAsFileTime
+GetSystemTimePreciseAsFileTime
+GetSystemTimes
+GetSystemWindowsDirectoryA
+GetSystemWindowsDirectoryW
+GetSystemWow64Directory2A
+GetSystemWow64Directory2W
+GetSystemWow64DirectoryA
+GetSystemWow64DirectoryW
+GetTapeParameters
+GetTapePosition
+GetTapeStatus
+GetTempFileName
+GetTempFileNameA
+GetTempFileNameW
+GetTempPath2A
+GetTempPath2W
+GetTempPathA
+GetTempPathW
+GetThreadContext
+GetThreadDescription
+GetThreadErrorMode
+GetThreadGroupAffinity
+GetThreadIOPendingFlag
+GetThreadId
+GetThreadIdealProcessorEx
+GetThreadInformation
+GetThreadLocale
+GetThreadPreferredUILanguages
+GetThreadPriority
+GetThreadPriorityBoost
+GetThreadSelectedCpuSetMasks
+GetThreadSelectorEntry
+GetThreadTimes
+GetThreadUILanguage
+GetTickCount
+GetTickCount64
+GetTimeFormatA
+GetTimeFormatEx
+GetTimeFormatW
+GetTimeZoneInformation
+GetTimeZoneInformationForYear
+GetUILanguageInfo
+GetUmsCompletionListEvent
+GetUmsSystemThreadInformation
+GetUserDefaultGeoName
+GetUserDefaultLCID
+GetUserDefaultLangID
+GetUserDefaultLocaleName
+GetUserDefaultUILanguage
+GetUserGeoID
+GetUserPreferredUILanguages
+GetVersion
+GetVersionExA
+GetVersionExW
+GetVolumeInformationA
+GetVolumeInformationByHandleW
+GetVolumeInformationW
+GetVolumeNameForVolumeMountPointA
+GetVolumeNameForVolumeMountPointW
+GetVolumePathNameA
+GetVolumePathNameW
+GetVolumePathNamesForVolumeNameA
+GetVolumePathNamesForVolumeNameW
+GetWindowsDirectoryA
+GetWindowsDirectoryW
+GetWriteWatch
+GetWsChanges
+GetWsChangesEx
+GetXStateFeaturesMask
+GlobalAddAtomA
+GlobalAddAtomExA
+GlobalAddAtomExW
+GlobalAddAtomW
+GlobalAlloc
+GlobalDeleteAtom
+GlobalFindAtomA
+GlobalFindAtomW
+GlobalFlags
+GlobalFree
+GlobalGetAtomNameA
+GlobalGetAtomNameW
+GlobalHandle
+GlobalLock
+GlobalMemoryStatus
+GlobalMemoryStatusEx
+GlobalReAlloc
+GlobalSize
+GlobalUnlock
+Heap32First
+Heap32ListFirst
+Heap32ListNext
+Heap32Next
+HeapAlloc
+HeapCompact
+HeapCreate
+HeapDestroy
+HeapFree
+HeapLock
+HeapQueryInformation
+HeapReAlloc
+HeapSetInformation
+HeapSize
+HeapSummary
+HeapUnlock
+HeapValidate
+HeapWalk
+IdnToAscii
+ImpersonateNamedPipeClient
+InitAtomTable
+InitOnceBeginInitialize
+InitOnceComplete
+InitOnceExecuteOnce
+InitOnceInitialize
+InitSecurityInterfaceA
+InitSecurityInterfaceW
+InitializeConditionVariable
+InitializeContext
+InitializeCriticalSection
+InitializeCriticalSectionAndSpinCount
+InitializeCriticalSectionEx
+InitializeEnclave
+InitializeProcThreadAttributeList
+InitializeProcessForWsWatch
+InitializeSListHead
+InitializeSRWLock
+InitializeSynchronizationBarrier
+InstallELAMCertificateInfo
+InterlockedCompareExchange
+InterlockedCompareExchange64
+InterlockedDecrement
+InterlockedExchange
+InterlockedExchangeAdd
+InterlockedFlushSList
+InterlockedIncrement
+InterlockedPopEntrySList
+InterlockedPushEntrySList
+InterlockedPushListSListEx
+IsBadCodePtr
+IsBadReadPtr
+IsBadStringPtrA
+IsBadStringPtrW
+IsBadWritePtr
+IsDBCSLeadByte
+IsDBCSLeadByteEx
+IsDebuggerPresent
+IsEnclaveTypeSupported
+IsNLSDefinedString
+IsNativeVhdBoot
+IsProcessCritical
+IsProcessInJob
+IsProcessorFeaturePresent
+IsSystemResumeAutomatic
+IsThreadAFiber
+IsThreadpoolTimerSet
+IsValidCodePage
+IsValidLanguageGroup
+IsValidLocale
+IsValidLocaleName
+IsValidNLSVersion
+IsWow64GuestMachineSupported
+IsWow64Process
+IsWow64Process2
+LCIDToLocaleName
+LCMapStringA
+LCMapStringEx
+LCMapStringW
+LeaveCriticalSection
+LeaveCriticalSectionWhenCallbackReturns
+LoadEnclaveData
+LoadEnclaveImageA
+LoadEnclaveImageW
+LoadLibraryA
+LoadLibraryExA
+LoadLibraryExW
+LoadLibraryW
+LoadModule
+LoadPackagedLibrary
+LoadResource
+LoadStringA
+LoadStringByReference
+LoadStringW
+LocalAlloc
+LocalFileTimeToFileTime
+LocalFlags
+LocalFree
+LocalHandle
+LocalLock
+LocalReAlloc
+LocalSize
+LocalUnlock
+LocaleNameToLCID
+LocateXStateFeature
+LockFile
+LockFileEx
+LockResource
+MapUserPhysicalPages
+MapUserPhysicalPagesScatter
+MapViewOfFile
+MapViewOfFile2
+MapViewOfFile3
+MapViewOfFile3FromApp
+MapViewOfFileEx
+MapViewOfFileExNuma
+MapViewOfFileFromApp
+Module32First
+Module32FirstW
+Module32Next
+Module32NextW
+MoveFile
+MoveFileA
+MoveFileExA
+MoveFileExW
+MoveFileTransactedA
+MoveFileTransactedW
+MoveFileW
+MoveFileWithProgressA
+MoveFileWithProgressW
+MulDiv
+MultiByteToWideChar
+NdisAllocateBuffer
+NdisAllocateBufferPool
+NdisAllocatePacketPoolEx
+NdisCancelSendPackets
+NdisCloseAdapter
+NdisCopyFromPacketToPacketSafe
+NdisDeregisterProtocol
+NdisFreePacketPool
+NdisGetReceivedPacket
+NdisIMCopySendCompletePerPacketInfo
+NdisIMCopySendPerPacketInfo
+NdisIMDeregisterLayeredMiniport
+NdisIMGetDeviceContext
+NdisIMNotifyPnPEvent
+NdisIMRegisterLayeredMiniport
+NdisMDeregisterDevice
+NdisMIndicateStatus
+NdisMInitializeWrapper
+NdisMRegisterDevice
+NdisMRegisterUnloadHandler
+NdisMSetAttributesEx
+NdisOpenAdapter
+NdisOpenProtocolConfiguration
+NdisPacketPoolUsage
+NdisRegisterProtocol
+NdisRequest
+NdisScheduleWorkItem
+NdisTerminateWrapper
+NdisUnchainBufferAtBack
+NeedCurrentDirectoryForExePathA
+NeedCurrentDirectoryForExePathW
+NotifyUILanguageChange
+OfferVirtualMemory
+OpenEventA
+OpenEventW
+OpenFile
+OpenFileById
+OpenFileMappingA
+OpenFileMappingFromApp
+OpenFileMappingW
+OpenJobObjectA
+OpenJobObjectW
+OpenMutexW
+OpenPackageInfoByFullName
+OpenPrivateNamespaceA
+OpenPrivateNamespaceW
+OpenProcess
+OpenProcessToken
+OpenSemaphoreW
+OpenThread
+OpenThreadToken
+OpenWaitableTimerW
+OutputDebugStringA
+OutputDebugStringW
+PackageFamilyNameFromFullName
+PackageFamilyNameFromId
+PackageFullNameFromId
+PackageIdFromFullName
+PackageNameAndPublisherIdFromFamilyName
+ParseApplicationUserModelId
+PeekNamedPipe
+PostQueuedCompletionStatus
+PowerClearRequest
+PowerCreateRequest
+PowerSetRequest
+PrefetchVirtualMemory
+PrepareTape
+Process32First
+Process32FirstW
+Process32Next
+Process32NextW
+ProcessIdToSessionId
+PssCaptureSnapshot
+PssDuplicateSnapshot
+PssFreeSnapshot
+PssQuerySnapshot
+PssWalkMarkerCreate
+PssWalkMarkerFree
+PssWalkMarkerGetPosition
+PssWalkMarkerSeekToBeginning
+PssWalkMarkerSetPosition
+PssWalkSnapshot
+PulseEvent
+PurgeComm
+QueryActCtxSettingsW
+QueryActCtxW
+QueryAuxiliaryCounterFrequency
+QueryDepthSList
+QueryDosDeviceA
+QueryDosDeviceW
+QueryFullProcessImageNameA
+QueryFullProcessImageNameW
+QueryIdleProcessorCycleTime
+QueryIdleProcessorCycleTimeEx
+QueryInformationJobObject
+QueryInterruptTime
+QueryInterruptTimePrecise
+QueryIoRateControlInformationJobObject
+QueryMemoryResourceNotification
+QueryPerformanceCounter
+QueryPerformanceFrequency
+QueryProcessAffinityUpdateMode
+QueryProcessCycleTime
+QueryProtectedPolicy
+QueryThreadCycleTime
+QueryThreadProfiling
+QueryThreadpoolStackInformation
+QueryUmsThreadInformation
+QueryUnbiasedInterruptTime
+QueryUnbiasedInterruptTimePrecise
+QueryWorkingSet
+QueryWorkingSetEx
+QueueUserAPC
+QueueUserWorkItem
+RaiseException
+RaiseFailFastException
+ReOpenFile
+ReadDirectoryChangesExW
+ReadDirectoryChangesW
+ReadFile
+ReadFileEx
+ReadFileScatter
+ReadProcessMemory
+ReadThreadProfilingData
+ReclaimVirtualMemory
+RegCloseKey
+RegDeleteKeyA
+RegDeleteKeyExA
+RegDeleteKeyExW
+RegDeleteKeyValueA
+RegDeleteTreeA
+RegDeleteTreeW
+RegEnumKeyExA
+RegEnumValueA
+RegNotifyChangeKeyValue
+RegOpenKeyExA
+RegQueryInfoKeyA
+RegQueryValueExA
+RegQueryValueExW
+RegisterApplicationRecoveryCallback
+RegisterApplicationRestart
+RegisterBadMemoryNotification
+RegisterWaitForSingleObject
+RegisterWaitUntilOOBECompleted
+ReleaseActCtx
+ReleaseMutex
+ReleaseMutexWhenCallbackReturns
+ReleaseSRWLockExclusive
+ReleaseSRWLockShared
+ReleaseSemaphore
+ReleaseSemaphoreWhenCallbackReturns
+RemoveDirectoryA
+RemoveDirectoryTransactedA
+RemoveDirectoryTransactedW
+RemoveDirectoryW
+RemoveDllDirectory
+RemoveSecureMemoryCacheCallback
+RemoveVectoredContinueHandler
+RemoveVectoredExceptionHandler
+ReplaceFileA
+ReplaceFileW
+RequestWakeupLatency
+ResetEvent
+ResetWriteWatch
+ResolveLocaleName
+RestoreLastError
+ResumeThread
+RtlAddFunctionTable
+RtlCaptureContext
+RtlCompareMemory
+RtlDeleteFunctionTable
+RtlFillMemory
+RtlInstallFunctionTableCallback
+RtlLookupFunctionEntry
+RtlPcToFileHeader
+RtlRestoreContext
+RtlUnwind
+RtlUnwind2
+RtlUnwindEx
+RtlVirtualUnwind
+SearchPathA
+SearchPathW
+SetCalendarInfoA
+SetCalendarInfoW
+SetCommBreak
+SetCommConfig
+SetCommMask
+SetCommState
+SetCommTimeouts
+SetComputerNameA
+SetComputerNameExA
+SetComputerNameExW
+SetComputerNameW
+SetCriticalSectionSpinCount
+SetCurrentDirectory
+SetDefaultCommConfigA
+SetDefaultCommConfigW
+SetDefaultDllDirectories
+SetDllDirectoryA
+SetDllDirectoryW
+SetDynamicTimeZoneInformation
+SetEndOfFile
+SetEnvironmentStringsA
+SetEnvironmentStringsW
+SetEnvironmentVariable
+SetEnvironmentVariableA
+SetEnvironmentVariableW
+SetErrorMode
+SetEvent
+SetEventWhenCallbackReturns
+SetFileApisToANSI
+SetFileApisToOEM
+SetFileAttributesA
+SetFileAttributesTransactedA
+SetFileAttributesTransactedW
+SetFileAttributesW
+SetFileBandwidthReservation
+SetFileCompletionNotificationModes
+SetFileInformationByHandle
+SetFileIoOverlappedRange
+SetFilePointer
+SetFilePointerEx
+SetFileShortNameA
+SetFileShortNameW
+SetFileTime
+SetFileValidData
+SetFirmwareEnvironmentVariableA
+SetFirmwareEnvironmentVariableExA
+SetFirmwareEnvironmentVariableExW
+SetFirmwareEnvironmentVariableW
+SetHandleCount
+SetHandleInformation
+SetInformationJobObject
+SetIoRateControlInformationJobObject
+SetLastError
+SetLocalTime
+SetLocaleInfoA
+SetLocaleInfoW
+SetMailslotInfo
+SetNamedPipeHandleState
+SetPriorityClass
+SetProcessAffinityMask
+SetProcessAffinityUpdateMode
+SetProcessDEPPolicy
+SetProcessDefaultCpuSetMasks
+SetProcessInformation
+SetProcessMitigationPolicy
+SetProcessPreferredUILanguages
+SetProcessPriorityBoost
+SetProcessShutdownParameters
+SetProcessWorkingSetSize
+SetProcessWorkingSetSizeEx
+SetProtectedPolicy
+SetSearchPathMode
+SetStdHandleEx
+SetSystemFileCacheSize
+SetSystemPowerState
+SetSystemTime
+SetSystemTimeAdjustment
+SetTapeParameters
+SetTapePosition
+SetThreadAffinityMask
+SetThreadContext
+SetThreadDescription
+SetThreadErrorMode
+SetThreadExecutionState
+SetThreadGroupAffinity
+SetThreadIdealProcessor
+SetThreadIdealProcessorEx
+SetThreadInformation
+SetThreadLocale
+SetThreadPreferredUILanguages
+SetThreadPriority
+SetThreadPriorityBoost
+SetThreadSelectedCpuSetMasks
+SetThreadSelectedCpuSets
+SetThreadStackGuarantee
+SetThreadToken
+SetThreadUILanguage
+SetThreadpoolStackInformation
+SetThreadpoolThreadMaximum
+SetThreadpoolThreadMinimum
+SetThreadpoolTimer
+SetThreadpoolTimerEx
+SetThreadpoolWait
+SetThreadpoolWaitEx
+SetTimeZoneInformation
+SetUmsThreadInformation
+SetUnhandledExceptionFilter
+SetUserGeoID
+SetUserGeoName
+SetVolumeLabelA
+SetVolumeLabelW
+SetVolumeMountPointA
+SetVolumeMountPointW
+SetWaitableTimer
+SetWaitableTimerEx
+SetXStateFeaturesMask
+SetupComm
+SignalObjectAndWait
+SizeofResource
+Sleep
+SleepConditionVariableCS
+SleepConditionVariableSRW
+SleepEx
+StartThreadpoolIo
+SubmitThreadpoolWork
+SuspendThread
+SwitchToFiber
+SwitchToThread
+SystemTimeToFileTime
+SystemTimeToTzSpecificLocalTime
+SystemTimeToTzSpecificLocalTimeEx
+TerminateEnclave
+TerminateJobObject
+TerminateProcess
+TerminateThread
+Thread32First
+Thread32Next
+TlsAlloc
+TlsFree
+TlsGetValue
+TlsSetValue
+Toolhelp32ReadProcessMemory
+TransactNamedPipe
+TransmitCommChar
+TryAcquireSRWLockExclusive
+TryAcquireSRWLockShared
+TryEnterCriticalSection
+TrySubmitThreadpoolCallback
+TzSpecificLocalTimeToSystemTime
+TzSpecificLocalTimeToSystemTimeEx
+UmsThreadYield
+UnhandledExceptionFilter
+UnlockFile
+UnlockFileEx
+UnmapViewOfFile
+UnmapViewOfFile2
+UnmapViewOfFileEx
+UnregisterApplicationRecoveryCallback
+UnregisterApplicationRestart
+UnregisterBadMemoryNotification
+UnregisterWait
+UnregisterWaitEx
+UnregisterWaitUntilOOBECompleted
+UpdateProcThreadAttribute
+UpdateResourceA
+UpdateResourceW
+VerLanguageNameA
+VerLanguageNameW
+VerSetConditionMask
+VerifyScripts
+VerifyVersionInfoA
+VerifyVersionInfoW
+VirtualAlloc
+VirtualAlloc2FromApp
+VirtualAllocEx
+VirtualAllocExNuma
+VirtualAllocFromApp
+VirtualFree
+VirtualFreeEx
+VirtualLock
+VirtualProtect
+VirtualProtectEx
+VirtualProtectFromApp
+VirtualQuery
+VirtualQueryEx
+VirtualUnlock
+WTSGetActiveConsoleSessionId
+WaitCommEvent
+WaitForDebugEvent
+WaitForDebugEventEx
+WaitForMultipleObjects
+WaitForMultipleObjectsEx
+WaitForSingleObject
+WaitForSingleObjectEx
+WaitForThreadpoolIoCallbacks
+WaitForThreadpoolTimerCallbacks
+WaitForThreadpoolWaitCallbacks
+WaitForThreadpoolWorkCallbacks
+WaitNamedPipeA
+WaitNamedPipeW
+WaitOnAddress
+WakeAllConditionVariable
+WakeByAddressAll
+WakeByAddressSingle
+WakeConditionVariable
+WerGetFlags
+WerRegisterAdditionalProcess
+WerRegisterAppLocalDump
+WerRegisterCustomMetadata
+WerRegisterExcludedMemoryBlock
+WerRegisterFile
+WerRegisterMemoryBlock
+WerRegisterRuntimeExceptionModule
+WerSetFlags
+WerUnregisterAdditionalProcess
+WerUnregisterAppLocalDump
+WerUnregisterExcludedMemoryBlock
+WerUnregisterFile
+WerUnregisterMemoryBlock
+WerUnregisterRuntimeExceptionModule
+WideCharToMultiByte
+WinExec
+Wow64DisableWow64FsRedirection
+Wow64GetThreadSelectorEntry
+Wow64RevertWow64FsRedirection
+Wow64SuspendThread
+WriteFile
+WriteFileEx
+WriteFileGather
+WritePrivateProfileSectionA
+WritePrivateProfileSectionW
+WritePrivateProfileStringA
+WritePrivateProfileStringW
+WritePrivateProfileStructA
+WritePrivateProfileStructW
+WriteProcessMemory
+WriteProfileSectionA
+WriteProfileSectionW
+WriteProfileStringA
+WriteProfileStringW
+WriteTapemark
+ZombifyActCtx
+_lclose
+_lcreat
+_llseek
+_lopen
+_lread
+_lwrite
+if_nametoindex
+lstrcatA
+lstrcatW
+lstrcmpA
+lstrcmpW
+lstrcmpiA
+lstrcmpiW
+lstrcpyA
+lstrcpyW
+lstrcpynA
+lstrcpynW
+lstrlenA
+lstrlenW
+timeBeginPeriod
+timeEndPeriod
+timeGetDevCaps
+timeGetSystemTime
+timeGetTime
+uaw_wcslen
diff --git a/crates/exav-pe-emu/src/exports/ntdll.txt b/crates/exav-pe-emu/src/exports/ntdll.txt
new file mode 100644
index 00000000..2a68b6e2
--- /dev/null
+++ b/crates/exav-pe-emu/src/exports/ntdll.txt
@@ -0,0 +1,133 @@
+DbgBreakPoint
+DbgPrint
+DbgPrintEx
+DbgPrompt
+EtwActivityIdControl
+EtwUnregister
+EtwWriteTransfer
+GetCurrentProcessorNumber
+NtClose
+NtCreateFile
+NtCurrentTeb
+NtDeviceIoControlFile
+NtNotifyChangeMultipleKeys
+NtOpenFile
+NtQueryInformationProcess
+NtQueryInformationThread
+NtQueryMultipleValueKey
+NtQueryObject
+NtQuerySystemInformation
+NtQuerySystemTime
+NtRenameKey
+NtSetInformationKey
+NtWaitForSingleObject
+ReleaseSRWLockShared
+RtlAbsoluteToSelfRelativeSD
+RtlAddAce
+RtlAddFunctionTable
+RtlAddGrowableFunctionTable
+RtlAllocateHeap
+RtlAnsiStringToUnicodeString
+RtlAppendUnicodeToString
+RtlCaptureContext
+RtlCaptureStackBackTrace
+RtlCharToInteger
+RtlClearAllBits
+RtlCompareMemory
+RtlCompareMemoryUlong
+RtlCompareString
+RtlConvertDeviceFamilyInfoToString
+RtlConvertSidToUnicodeString
+RtlCopyMemory
+RtlCopyMemoryNonTemporal
+RtlCopySid
+RtlCopyUnicodeString
+RtlCreateHeap
+RtlCreateSecurityDescriptor
+RtlCreateUnicodeString
+RtlDecompressBuffer
+RtlDeleteFunctionTable
+RtlDeleteGrowableFunctionTable
+RtlDowncaseUnicodeChar
+RtlEqualPrefixSid
+RtlEqualSid
+RtlEqualString
+RtlEqualUnicodeString
+RtlEthernetAddressToStringA
+RtlEthernetAddressToStringW
+RtlEthernetStringToAddressA
+RtlEthernetStringToAddressW
+RtlFillMemory
+RtlFirstEntrySList
+RtlFreeAnsiString
+RtlFreeOemString
+RtlFreeUnicodeString
+RtlGUIDFromString
+RtlGetAce
+RtlGetEnabledExtendedFeatures
+RtlGetOwnerSecurityDescriptor
+RtlGrowFunctionTable
+RtlInitString
+RtlInitUnicodeString
+RtlInitializeBitMap
+RtlInitializeSListHead
+RtlInitializeSid
+RtlInstallFunctionTableCallback
+RtlIntegerToUnicodeString
+RtlInterlockedFlushSList
+RtlInterlockedPopEntrySList
+RtlInterlockedPushEntrySList
+RtlIpv4AddressToStringA
+RtlIpv4AddressToStringExA
+RtlIpv4AddressToStringExW
+RtlIpv4AddressToStringW
+RtlIpv4StringToAddressA
+RtlIpv4StringToAddressExA
+RtlIpv4StringToAddressExW
+RtlIpv4StringToAddressW
+RtlIpv6AddressToStringA
+RtlIpv6AddressToStringExA
+RtlIpv6AddressToStringExW
+RtlIpv6AddressToStringW
+RtlIpv6StringToAddressA
+RtlIpv6StringToAddressExA
+RtlIpv6StringToAddressExW
+RtlIpv6StringToAddressW
+RtlIsCloudFilesPlaceholder
+RtlIsNameLegalDOS8Dot3
+RtlLengthRequiredSid
+RtlLengthSid
+RtlLocalTimeToSystemTime
+RtlLookupFunctionEntry
+RtlMultiByteToUnicodeN
+RtlNtStatusToDosError
+RtlNumberOfSetBits
+RtlPcToFileHeader
+RtlQueryDepthSList
+RtlRaiseException
+RtlRestoreContext
+RtlSetBits
+RtlSetDaclSecurityDescriptor
+RtlSetGroupSecurityDescriptor
+RtlSetOwnerSecurityDescriptor
+RtlStringFromGUID
+RtlSubAuthoritySid
+RtlTimeToSecondsSince1970
+RtlTimeToTimeFields
+RtlUnicodeStringToAnsiString
+RtlUnicodeStringToInteger
+RtlUnicodeStringToOemString
+RtlUnicodeToMultiByteSize
+RtlUniform
+RtlUnwind
+RtlUnwindEx
+RtlUpcaseUnicodeChar
+RtlUpcaseUnicodeString
+RtlValidSid
+RtlVerifyVersionInfo
+RtlVirtualUnwind
+TryAcquireSRWLockShared
+UnhandledExceptionFilter
+VerSetConditionMask
+vDbgPrintEx
+vDbgPrintExWithPrefix
diff --git a/crates/exav-pe-emu/src/exports/user32.txt b/crates/exav-pe-emu/src/exports/user32.txt
new file mode 100644
index 00000000..ec00b7cb
--- /dev/null
+++ b/crates/exav-pe-emu/src/exports/user32.txt
@@ -0,0 +1,755 @@
+ActivateKeyboardLayout
+AddClipboardFormatListener
+AdjustWindowRect
+AdjustWindowRectEx
+AdjustWindowRectExForDpi
+AllowSetForegroundWindow
+AnimateWindow
+AnyPopup
+AppendMenuA
+AppendMenuW
+AreDpiAwarenessContextsEqual
+ArrangeIconicWindows
+AttachThreadInput
+BeginDeferWindowPos
+BeginPaint
+BlockInput
+BringWindowToTop
+BroadcastSystemMessage
+BroadcastSystemMessageA
+BroadcastSystemMessageExA
+BroadcastSystemMessageExW
+BroadcastSystemMessageW
+CalculatePopupWindowPosition
+CallMsgFilterA
+CallMsgFilterW
+CallNextHookEx
+CallWindowProcA
+CallWindowProcW
+CascadeWindows
+ChangeClipboardChain
+ChangeDisplaySettingsA
+ChangeDisplaySettingsExA
+ChangeDisplaySettingsExW
+ChangeDisplaySettingsW
+ChangeWindowMessageFilter
+ChangeWindowMessageFilterEx
+CharLowerA
+CharLowerBuffA
+CharLowerBuffW
+CharLowerW
+CharNextA
+CharNextExA
+CharNextW
+CharPrevA
+CharPrevExA
+CharPrevW
+CharToOemA
+CharToOemBuffA
+CharToOemBuffW
+CharToOemW
+CharUpperA
+CharUpperBuffA
+CharUpperBuffW
+CharUpperW
+CheckDlgButton
+CheckMenuItem
+CheckMenuRadioItem
+CheckRadioButton
+ChildWindowFromPoint
+ChildWindowFromPointEx
+ClientToScreen
+ClipCursor
+CloseClipboard
+CloseDesktop
+CloseGestureInfoHandle
+CloseTouchInputHandle
+CloseWindow
+CloseWindowStation
+CopyAcceleratorTableA
+CopyAcceleratorTableW
+CopyIcon
+CopyImage
+CopyRect
+CountClipboardFormats
+CreateAcceleratorTableA
+CreateAcceleratorTableW
+CreateCaret
+CreateCursor
+CreateDesktopA
+CreateDesktopExA
+CreateDesktopExW
+CreateDesktopW
+CreateDialogA
+CreateDialogIndirectA
+CreateDialogIndirectParamA
+CreateDialogIndirectParamW
+CreateDialogIndirectW
+CreateDialogParamA
+CreateDialogParamW
+CreateDialogW
+CreateIcon
+CreateIconFromResource
+CreateIconFromResourceEx
+CreateIconIndirect
+CreateMDIWindowA
+CreateMDIWindowW
+CreateMenu
+CreatePopupMenu
+CreateSyntheticPointerDevice
+CreateWindowExA
+CreateWindowExW
+CreateWindowStationA
+CreateWindowStationW
+DdeAbandonTransaction
+DdeAccessData
+DdeAddData
+DdeClientTransaction
+DdeCmpStringHandles
+DdeConnect
+DdeConnectList
+DdeCreateDataHandle
+DdeCreateStringHandleA
+DdeCreateStringHandleW
+DdeDisconnect
+DdeDisconnectList
+DdeEnableCallback
+DdeFreeDataHandle
+DdeFreeStringHandle
+DdeGetData
+DdeGetLastError
+DdeImpersonateClient
+DdeInitializeA
+DdeInitializeW
+DdeKeepStringHandle
+DdeNameService
+DdePostAdvise
+DdeQueryConvInfo
+DdeQueryNextServer
+DdeQueryStringA
+DdeQueryStringW
+DdeReconnect
+DdeSetQualityOfService
+DdeSetUserHandle
+DdeUnaccessData
+DdeUninitialize
+DefDlgProcA
+DefDlgProcW
+DefFrameProcA
+DefFrameProcW
+DefMDIChildProcA
+DefMDIChildProcW
+DefRawInputProc
+DefWindowProcA
+DefWindowProcW
+DeferWindowPos
+DeleteMenu
+DeregisterShellHookWindow
+DestroyAcceleratorTable
+DestroyCaret
+DestroyCursor
+DestroyIcon
+DestroyMenu
+DestroySyntheticPointerDevice
+DestroyWindow
+DialogBoxA
+DialogBoxIndirectA
+DialogBoxIndirectParamA
+DialogBoxIndirectParamW
+DialogBoxIndirectW
+DialogBoxParamA
+DialogBoxParamW
+DialogBoxW
+DisableProcessWindowsGhosting
+DispatchMessage
+DispatchMessageA
+DispatchMessageW
+DisplayConfigGetDeviceInfo
+DisplayConfigSetDeviceInfo
+DlgDirListA
+DlgDirListComboBoxA
+DlgDirListComboBoxW
+DlgDirListW
+DlgDirSelectComboBoxExA
+DlgDirSelectComboBoxExW
+DlgDirSelectExA
+DlgDirSelectExW
+DragDetect
+DrawAnimatedRects
+DrawCaption
+DrawEdge
+DrawFocusRect
+DrawFrameControl
+DrawIcon
+DrawIconEx
+DrawMenuBar
+DrawStateA
+DrawStateW
+DrawText
+DrawTextA
+DrawTextExA
+DrawTextExW
+DrawTextW
+EmptyClipboard
+EnableMenuItem
+EnableMouseInPointer
+EnableNonClientDpiScaling
+EnableScrollBar
+EnableWindow
+EndDeferWindowPos
+EndDialog
+EndMenu
+EndPaint
+EndTask
+EnumChildWindows
+EnumClipboardFormats
+EnumDesktopWindows
+EnumDesktopsA
+EnumDesktopsW
+EnumDisplayDevicesA
+EnumDisplayDevicesW
+EnumDisplayMonitors
+EnumDisplaySettingsA
+EnumDisplaySettingsExA
+EnumDisplaySettingsExW
+EnumDisplaySettingsW
+EnumPropsA
+EnumPropsExA
+EnumPropsExW
+EnumPropsW
+EnumThreadWindows
+EnumWindowStationsA
+EnumWindowStationsW
+EnumWindows
+EqualRect
+EvaluateProximityToPolygon
+EvaluateProximityToRect
+ExcludeUpdateRgn
+ExitWindowsEx
+FillRect
+FindWindowA
+FindWindowExA
+FindWindowExW
+FindWindowW
+FlashWindow
+FlashWindowEx
+FrameRect
+FreeDDElParam
+GetActiveWindow
+GetAltTabInfoA
+GetAltTabInfoW
+GetAncestor
+GetAsyncKeyState
+GetAutoRotationState
+GetAwarenessFromDpiAwarenessContext
+GetCIMSSM
+GetCapture
+GetCaretBlinkTime
+GetCaretPos
+GetClassInfoA
+GetClassInfoExA
+GetClassInfoExW
+GetClassInfoW
+GetClassLongA
+GetClassLongPtrA
+GetClassLongPtrW
+GetClassLongW
+GetClassName
+GetClassNameA
+GetClassNameW
+GetClassWord
+GetClientRect
+GetClipCursor
+GetClipboardData
+GetClipboardFormatNameA
+GetClipboardFormatNameW
+GetClipboardOwner
+GetClipboardSequenceNumber
+GetClipboardViewer
+GetComboBoxInfo
+GetCurrentInputMessageSource
+GetCursor
+GetCursorInfo
+GetCursorPos
+GetDC
+GetDCEx
+GetDesktopWindow
+GetDialogBaseUnits
+GetDialogControlDpiChangeBehavior
+GetDialogDpiChangeBehavior
+GetDisplayAutoRotationPreferences
+GetDisplayConfigBufferSizes
+GetDlgCtrlID
+GetDlgItem
+GetDlgItemInt
+GetDlgItemTextA
+GetDlgItemTextW
+GetDoubleClickTime
+GetDpiAwarenessContextForProcess
+GetDpiForSystem
+GetDpiForWindow
+GetDpiFromDpiAwarenessContext
+GetFocus
+GetForegroundWindow
+GetGUIThreadInfo
+GetGestureConfig
+GetGestureExtraArgs
+GetGestureInfo
+GetGuiResources
+GetIconInfo
+GetIconInfoExA
+GetIconInfoExW
+GetInputState
+GetKBCodePage
+GetKeyNameTextA
+GetKeyNameTextW
+GetKeyState
+GetKeyboardLayout
+GetKeyboardLayoutList
+GetKeyboardLayoutNameA
+GetKeyboardLayoutNameW
+GetKeyboardState
+GetKeyboardType
+GetLastActivePopup
+GetLastInputInfo
+GetLayeredWindowAttributes
+GetListBoxInfo
+GetMenu
+GetMenuBarInfo
+GetMenuCheckMarkDimensions
+GetMenuContextHelpId
+GetMenuDefaultItem
+GetMenuInfo
+GetMenuItemCount
+GetMenuItemID
+GetMenuItemInfoA
+GetMenuItemInfoW
+GetMenuItemRect
+GetMenuState
+GetMenuStringA
+GetMenuStringW
+GetMessage
+GetMessageA
+GetMessageExtraInfo
+GetMessagePos
+GetMessageTime
+GetMessageW
+GetMonitorInfoA
+GetMonitorInfoW
+GetMouseMovePointsEx
+GetNextDlgGroupItem
+GetNextDlgTabItem
+GetOpenClipboardWindow
+GetParent
+GetPhysicalCursorPos
+GetPointerCursorId
+GetPointerDevice
+GetPointerDeviceCursors
+GetPointerDeviceProperties
+GetPointerDeviceRects
+GetPointerDevices
+GetPointerFrameInfo
+GetPointerFrameInfoHistory
+GetPointerFramePenInfo
+GetPointerFramePenInfoHistory
+GetPointerFrameTouchInfo
+GetPointerFrameTouchInfoHistory
+GetPointerInfo
+GetPointerInfoHistory
+GetPointerInputTransform
+GetPointerPenInfo
+GetPointerPenInfoHistory
+GetPointerTouchInfo
+GetPointerTouchInfoHistory
+GetPointerType
+GetPriorityClipboardFormat
+GetProcessDefaultLayout
+GetProcessWindowStation
+GetPropA
+GetPropW
+GetQueueStatus
+GetRawInputBuffer
+GetRawInputData
+GetRawInputDeviceInfoA
+GetRawInputDeviceInfoW
+GetRawInputDeviceList
+GetRawPointerDeviceData
+GetRegisteredRawInputDevices
+GetScrollBarInfo
+GetScrollInfo
+GetScrollPos
+GetScrollRange
+GetShellWindow
+GetSubMenu
+GetSysColor
+GetSysColorBrush
+GetSystemDpiForProcess
+GetSystemMenu
+GetSystemMetrics
+GetSystemMetricsForDpi
+GetTabbedTextExtentA
+GetTabbedTextExtentW
+GetThreadDesktop
+GetThreadDpiAwarenessContext
+GetThreadDpiHostingBehavior
+GetTitleBarInfo
+GetTopWindow
+GetTouchInputInfo
+GetUnpredictedMessagePos
+GetUpdateRect
+GetUpdateRgn
+GetUpdatedClipboardFormats
+GetUserObjectInformationA
+GetUserObjectInformationW
+GetUserObjectSecurity
+GetWindow
+GetWindowContextHelpId
+GetWindowDC
+GetWindowDisplayAffinity
+GetWindowDpiAwarenessContext
+GetWindowDpiHostingBehavior
+GetWindowFeedbackSetting
+GetWindowInfo
+GetWindowLongA
+GetWindowLongPtrA
+GetWindowLongPtrW
+GetWindowLongW
+GetWindowModuleFileNameA
+GetWindowModuleFileNameW
+GetWindowPlacement
+GetWindowRect
+GetWindowRgn
+GetWindowRgnBox
+GetWindowTextA
+GetWindowTextLengthA
+GetWindowTextLengthW
+GetWindowTextW
+GetWindowThreadProcessId
+GetWindowWord
+GrayStringA
+GrayStringW
+HideCaret
+HiliteMenuItem
+ImpersonateDdeClientWindow
+InSendMessage
+InSendMessageEx
+InflateRect
+InheritWindowMonitor
+InitializeTouchInjection
+InjectSyntheticPointerInput
+InjectTouchInput
+InsertMenuA
+InsertMenuItemA
+InsertMenuItemW
+InsertMenuW
+InternalGetWindowText
+IntersectRect
+InvalidateRect
+InvalidateRgn
+InvertRect
+IsCharAlphaA
+IsCharAlphaNumericA
+IsCharAlphaNumericW
+IsCharAlphaW
+IsCharLowerA
+IsCharLowerW
+IsCharUpperA
+IsCharUpperW
+IsChild
+IsClipboardFormatAvailable
+IsDialogMessageA
+IsDialogMessageW
+IsDlgButtonChecked
+IsGUIThread
+IsHungAppWindow
+IsIconic
+IsImmersiveProcess
+IsMenu
+IsMouseInPointerEnabled
+IsProcessDPIAware
+IsRectEmpty
+IsTouchWindow
+IsValidDpiAwarenessContext
+IsWinEventHookInstalled
+IsWindow
+IsWindowArranged
+IsWindowEnabled
+IsWindowUnicode
+IsWindowVisible
+IsWow64Message
+IsZoomed
+KillTimer
+LoadAcceleratorsA
+LoadAcceleratorsW
+LoadBitmapA
+LoadBitmapW
+LoadCursorA
+LoadCursorFromFileA
+LoadCursorFromFileW
+LoadCursorW
+LoadIconA
+LoadIconW
+LoadImageA
+LoadImageW
+LoadKeyboardLayoutA
+LoadKeyboardLayoutW
+LoadMenuA
+LoadMenuIndirectA
+LoadMenuIndirectW
+LoadMenuW
+LoadStringA
+LoadStringW
+LockSetForegroundWindow
+LockWindowUpdate
+LockWorkStation
+LogicalToPhysicalPoint
+LogicalToPhysicalPointForPerMonitorDPI
+LookupIconIdFromDirectory
+LookupIconIdFromDirectoryEx
+MapDialogRect
+MapVirtualKeyA
+MapVirtualKeyExA
+MapVirtualKeyExW
+MapVirtualKeyW
+MapWindowPoints
+MenuItemFromPoint
+MessageBeep
+MessageBox
+MessageBoxA
+MessageBoxExA
+MessageBoxExW
+MessageBoxIndirectA
+MessageBoxIndirectW
+MessageBoxW
+ModifyMenuA
+ModifyMenuW
+MonitorFromPoint
+MonitorFromRect
+MonitorFromWindow
+MoveWindow
+MsgWaitForMultipleObjects
+MsgWaitForMultipleObjectsEx
+NotifyWinEvent
+OemKeyScan
+OemToCharA
+OemToCharBuffA
+OemToCharBuffW
+OemToCharW
+OffsetRect
+OpenClipboard
+OpenDesktopA
+OpenDesktopW
+OpenIcon
+OpenInputDesktop
+OpenWindowStationA
+OpenWindowStationW
+PackDDElParam
+PackTouchHitTestingProximityEvaluation
+PaintDesktop
+PeekMessageA
+PeekMessageW
+PhysicalToLogicalPoint
+PhysicalToLogicalPointForPerMonitorDPI
+PostMessageA
+PostMessageW
+PostQuitMessage
+PostThreadMessageA
+PostThreadMessageW
+PrintWindow
+PrivateExtractIconsA
+PrivateExtractIconsW
+PtInRect
+QueryDisplayConfig
+RealChildWindowFromPoint
+RealGetWindowClassA
+RealGetWindowClassW
+RedrawWindow
+RegisterClassA
+RegisterClassExA
+RegisterClassExW
+RegisterClassW
+RegisterClipboardFormatA
+RegisterClipboardFormatW
+RegisterDeviceNotificationA
+RegisterDeviceNotificationW
+RegisterHotKey
+RegisterPointerDeviceNotifications
+RegisterPointerInputTarget
+RegisterPointerInputTargetEx
+RegisterPowerSettingNotification
+RegisterRawInputDevices
+RegisterShellHookWindow
+RegisterSuspendResumeNotification
+RegisterTouchHitTestingWindow
+RegisterTouchWindow
+RegisterWindowMessageA
+RegisterWindowMessageW
+ReleaseCapture
+ReleaseDC
+RemoveClipboardFormatListener
+RemoveMenu
+RemovePropA
+RemovePropW
+ReplyMessage
+ReuseDDElParam
+ScreenToClient
+ScrollDC
+ScrollWindow
+ScrollWindowEx
+SendDlgItemMessageA
+SendDlgItemMessageW
+SendIMEMessageExA
+SendIMEMessageExW
+SendInput
+SendMessage
+SendMessageA
+SendMessageCallbackA
+SendMessageCallbackW
+SendMessageTimeoutA
+SendMessageTimeoutW
+SendMessageW
+SendNotifyMessageA
+SendNotifyMessageW
+SetActiveWindow
+SetCapture
+SetCaretBlinkTime
+SetCaretPos
+SetClassLongA
+SetClassLongPtrA
+SetClassLongPtrW
+SetClassLongW
+SetClassWord
+SetClipboardData
+SetClipboardViewer
+SetCoalescableTimer
+SetCursor
+SetCursorPos
+SetDialogDpiChangeBehavior
+SetDisplayAutoRotationPreferences
+SetDisplayConfig
+SetDlgItemInt
+SetDlgItemTextA
+SetDlgItemTextW
+SetDoubleClickTime
+SetFocus
+SetForegroundWindow
+SetGestureConfig
+SetKeyboardState
+SetLastErrorEx
+SetLayeredWindowAttributes
+SetMenu
+SetMenuContextHelpId
+SetMenuDefaultItem
+SetMenuInfo
+SetMenuItemBitmaps
+SetMenuItemInfoA
+SetMenuItemInfoW
+SetMessageExtraInfo
+SetParent
+SetPhysicalCursorPos
+SetProcessDPIAware
+SetProcessDefaultLayout
+SetProcessDpiAwarenessContext
+SetProcessRestrictionExemption
+SetProcessWindowStation
+SetPropA
+SetPropW
+SetRect
+SetRectEmpty
+SetScrollInfo
+SetScrollPos
+SetScrollRange
+SetSysColors
+SetSystemCursor
+SetThreadCursorCreationScaling
+SetThreadDesktop
+SetThreadDpiAwarenessContext
+SetThreadDpiHostingBehavior
+SetTimer
+SetUserObjectInformationA
+SetUserObjectInformationW
+SetUserObjectSecurity
+SetWinEventHook
+SetWindowContextHelpId
+SetWindowDisplayAffinity
+SetWindowFeedbackSetting
+SetWindowLongA
+SetWindowLongPtrA
+SetWindowLongPtrW
+SetWindowLongW
+SetWindowPlacement
+SetWindowPos
+SetWindowRgn
+SetWindowTextA
+SetWindowTextW
+SetWindowsHookExA
+SetWindowsHookExW
+ShowCaret
+ShowCursor
+ShowOwnedPopups
+ShowScrollBar
+ShowWindow
+ShowWindowAsync
+ShutdownBlockReasonCreate
+ShutdownBlockReasonDestroy
+ShutdownBlockReasonQuery
+SkipPointerFrameMessages
+SoundSentry
+SubtractRect
+SwapMouseButton
+SwitchDesktop
+SwitchToThisWindow
+SystemParametersInfoA
+SystemParametersInfoForDpi
+SystemParametersInfoW
+TabbedTextOutA
+TabbedTextOutW
+TileWindows
+ToAscii
+ToAsciiEx
+ToUnicode
+ToUnicodeEx
+TrackMouseEvent
+TrackPopupMenu
+TrackPopupMenuEx
+TranslateAcceleratorA
+TranslateAcceleratorW
+TranslateMDISysAccel
+TranslateMessage
+UnhookWinEvent
+UnhookWindowsHookEx
+UnionRect
+UnloadKeyboardLayout
+UnpackDDElParam
+UnregisterClassA
+UnregisterClassW
+UnregisterDeviceNotification
+UnregisterHotKey
+UnregisterPointerInputTarget
+UnregisterPointerInputTargetEx
+UnregisterPowerSettingNotification
+UnregisterSuspendResumeNotification
+UnregisterTouchWindow
+UpdateLayeredWindow
+UpdateWindow
+UserHandleGrantAccess
+ValidateRect
+ValidateRgn
+VkKeyScanA
+VkKeyScanExA
+VkKeyScanExW
+VkKeyScanW
+WINNLSEnableIME
+WaitForInputIdle
+WaitMessage
+WinHelpA
+WinHelpW
+WindowFromDC
+WindowFromPhysicalPoint
+WindowFromPoint
+keybd_event
+mouse_event
+wsprintfA
+wsprintfW
+wvsprintfA
+wvsprintfW
diff --git a/crates/exav-pe-emu/src/image.rs b/crates/exav-pe-emu/src/image.rs
index c97a4418..fca6fd1e 100644
--- a/crates/exav-pe-emu/src/image.rs
+++ b/crates/exav-pe-emu/src/image.rs
@@ -2,10 +2,17 @@
 //!
 //! Loading follows what the Windows loader does to the parts a stub can
 //! observe: headers at the image base, each section at its virtual address,
-//! zero-fill where the virtual size exceeds the raw size. Nothing else — no
-//! relocations (the emulator maps at the image's preferred base, so there are
-//! none to apply), no import binding (the stub resolves its own), no TLS
-//! callbacks.
+//! zero-fill where the virtual size exceeds the raw size. No relocations (the
+//! emulator maps at the image's preferred base, so there are none to apply) and
+//! no import binding here (the stub resolves its own, with a hand from
+//! [`crate::win::Env::bind_imports`]).
+//!
+//! The one piece of loader work this module parses but [`crate::run`] performs
+//! is the **TLS directory** (data directory 9): its callbacks run, with
+//! `DLL_PROCESS_ATTACH`, before the entry point, because a packer can put its
+//! unpacking there precisely so a tool that starts at the entry point sees
+//! nothing. [`PeImage::tls_dir`] is the directory's `(rva, size)`; the run
+//! driver reads the `IMAGE_TLS_DIRECTORY32` it points at.
 //!
 //! Dumping is the reverse, with one deliberate difference: the dump is written
 //! in **memory layout**, with `PointerToRawData == VirtualAddress` and the file
@@ -46,6 +53,10 @@ pub struct PeImage {
     /// functions its stub needs, and the *loader* — not the stub — fills those
     /// slots in. Emulating that binding is what lets the stub call them.
     pub import_dir: (u32, u32),
+    /// TLS directory (RVA, size), data directory 9. Zero when absent. The run
+    /// driver reads the `IMAGE_TLS_DIRECTORY32` here and runs its callbacks
+    /// before the entry point, as the Windows loader does.
+    pub tls_dir: (u32, u32),
     pub sections: Vec<Section>,
     /// Offset of the section table within the file, so the dump can patch it.
     sec_table_off: usize,
@@ -105,6 +116,15 @@ impl PeImage {
         } else {
             (0, 0)
         };
+        // Data directory 9 is the TLS directory, at opt + 96 + 9 * 8.
+        let tls_dir = if num_dirs >= 10 {
+            (
+                u32_at(data, opt + 168).unwrap_or(0),
+                u32_at(data, opt + 172).unwrap_or(0),
+            )
+        } else {
+            (0, 0)
+        };
 
         let mut sections = Vec::with_capacity(num_sections);
         for i in 0..num_sections {
@@ -140,6 +160,7 @@ impl PeImage {
             file_align,
             is_dll,
             import_dir,
+            tls_dir,
             sections,
             sec_table_off,
             pe_off,
diff --git a/crates/exav-pe-emu/src/lib.rs b/crates/exav-pe-emu/src/lib.rs
index 4812a8e9..645baf24 100644
--- a/crates/exav-pe-emu/src/lib.rs
+++ b/crates/exav-pe-emu/src/lib.rs
@@ -39,4 +39,4 @@ pub mod run;
 pub(crate) mod win;
 
 pub use mem::PAGE_SIZE;
-pub use run::{unpack, EmuLimits, Report, Unpacked};
+pub use run::{EmuLimits, Report, Unpacked, unpack};
diff --git a/crates/exav-pe-emu/src/main.rs b/crates/exav-pe-emu/src/main.rs
index 2d774ade..a9f66b4a 100644
--- a/crates/exav-pe-emu/src/main.rs
+++ b/crates/exav-pe-emu/src/main.rs
@@ -18,7 +18,7 @@
 
 #![forbid(unsafe_code)]
 
-use exav_pe_emu::{unpack, EmuLimits};
+use exav_pe_emu::{EmuLimits, unpack};
 use std::path::PathBuf;
 use std::process::ExitCode;
 
@@ -74,7 +74,7 @@ fn parse_args() -> Result<Opts, String> {
                     .map_err(|_| "--ticks needs a number")?
             }
             other if other.starts_with('-') && other.len() > 1 => {
-                return Err(format!("unknown option {other}"))
+                return Err(format!("unknown option {other}"));
             }
             other => o.files.push(other.into()),
         }
@@ -103,11 +103,11 @@ fn main() -> ExitCode {
             };
         }
     };
-    if let Some(dir) = &opts.dir {
-        if let Err(e) = std::fs::create_dir_all(dir) {
-            eprintln!("exav-pe-emu: {}: {e}", dir.display());
-            return ExitCode::from(2);
-        }
+    if let Some(dir) = &opts.dir
+        && let Err(e) = std::fs::create_dir_all(dir)
+    {
+        eprintln!("exav-pe-emu: {}: {e}", dir.display());
+        return ExitCode::from(2);
     }
 
     let limits = EmuLimits {
diff --git a/crates/exav-pe-emu/src/mem.rs b/crates/exav-pe-emu/src/mem.rs
index 29c65fd2..6ff25cd4 100644
--- a/crates/exav-pe-emu/src/mem.rs
+++ b/crates/exav-pe-emu/src/mem.rs
@@ -129,10 +129,11 @@ impl Mem {
     #[inline]
     fn count_dirty(&mut self, page: u32) {
         self.dirty_pages += 1;
-        if let Some((lo, hi)) = self.watch {
-            if page >= lo && page < hi {
-                self.watch_dirty += 1;
-            }
+        if let Some((lo, hi)) = self.watch
+            && page >= lo
+            && page < hi
+        {
+            self.watch_dirty += 1;
         }
     }
 
diff --git a/crates/exav-pe-emu/src/run.rs b/crates/exav-pe-emu/src/run.rs
index 2d886e62..16f2c957 100644
--- a/crates/exav-pe-emu/src/run.rs
+++ b/crates/exav-pe-emu/src/run.rs
@@ -35,8 +35,25 @@
 //! handler, and resumes from the context the handler leaves behind — including
 //! any registers or instruction pointer it edited, which is exactly the
 //! mechanism those stubs are using.
-
-use crate::cpu::{Cpu, Stop, EAX, EBX, ESP};
+//!
+//! ## TLS callbacks
+//!
+//! The Windows loader runs a module's TLS callbacks before its entry point, so
+//! a packer can hide its unpacking there to defeat a tool that starts at the
+//! entry point. The driver does the same: it sets up the static TLS block,
+//! writes the index to `AddressOfIndex`, points the TEB's
+//! `ThreadLocalStoragePointer` at it, then calls each callback as
+//! `cb(image_base, DLL_PROCESS_ATTACH, 0)`, re-reading the callback array after
+//! each one as the loader does (a callback may extend it). Only then does it
+//! start at the entry point. The directory layout, the TEB+0x2C TLS array and
+//! the callback prototype are as Microsoft's PE Format specification gives them
+//! (section "The .tls Section"). A callback that faults or raises goes through the
+//! same SEH machinery as the stub. If nothing handles it, or a callback runs
+//! past its slice of the budget, or the callback count cap is hit, the TLS
+//! phase is abandoned and execution proceeds to the entry point rather than
+//! ending the run: the payload is still worth trying to recover from there.
+
+use crate::cpu::{Cpu, EAX, EBX, ESP, Stop};
 use crate::image::PeImage;
 use crate::mem::{Mem, PAGE_SIZE};
 use crate::win::{ApiEffect, Env, INITIAL_ESP, TEB_BASE};
@@ -80,6 +97,24 @@ const MIN_WRITE_SPREAD: u32 = 6;
 /// skewed, so a run that makes many of them is not executing anything real.
 const MAX_UNIMPLEMENTED_CALLS: u32 = 64;
 
+/// Most TLS callbacks a run will invoke before giving up on the rest and
+/// starting the entry point. A real image has one or two; a hostile directory
+/// can name far more, or point its array at itself.
+const MAX_TLS_CALLBACKS: u32 = 64;
+
+/// Fraction of the whole instruction budget any single TLS callback may spend.
+/// A callback is bounded so a stub cannot park the emulator in one forever, but
+/// generously, since a packer that unpacks from a callback does real work there.
+const TLS_CALLBACK_BUDGET_DIVISOR: u64 = 8;
+
+/// Largest static TLS block the loader will build, so a crafted
+/// `SizeOfZeroFill` cannot demand an arbitrary allocation.
+const MAX_TLS_BLOCK: u32 = 1 << 20;
+
+/// `DLL_PROCESS_ATTACH`, the reason a TLS callback and `DllMain` receive at
+/// process start.
+const DLL_PROCESS_ATTACH: u32 = 1;
+
 /// Everything that bounds a run.
 ///
 /// This is the sandbox's contract. The emulator follows control flow supplied
@@ -218,32 +253,39 @@ pub fn unpack(file: &[u8], limits: &EmuLimits) -> Report {
     let _ = env.bind_imports(&mut mem, image.base, dir_rva, dir_size);
 
     let mut cpu = Cpu::new();
-    cpu.eip = image.base.wrapping_add(image.entry_rva);
-    cpu.regs[ESP] = INITIAL_ESP;
     cpu.fs_base = TEB_BASE;
-    // What a thread sees at the entry point on Windows: EBX holds the PEB, and
-    // the return address is into kernel32.
-    cpu.regs[EBX] = crate::win::PEB_BASE;
     let process_return = env.process_return();
     let seh_return = env.seh_return();
-    // A DLL is entered as `DllMain(hinstDLL, DLL_PROCESS_ATTACH, NULL)`. Those
-    // three arguments have to be on the stack: a packed DLL's stub reads them,
-    // and without them it faults on its first instruction.
-    let pushed = if image.is_dll {
-        cpu.push32(&mut mem, 0)
-            .and_then(|()| cpu.push32(&mut mem, 1))
-            .and_then(|()| cpu.push32(&mut mem, image.base))
-            .and_then(|()| cpu.push32(&mut mem, process_return))
-    } else {
-        cpu.push32(&mut mem, process_return)
+    let tls_return = env.tls_return();
+    let image_end = image.base.saturating_add(image.size_of_image);
+
+    // The loader runs TLS callbacks before the entry point. Set the static TLS
+    // block up and queue the callbacks; if there are none, start at the entry
+    // point straight away. `tls_cb_array` is the VA of the callback array, re-
+    // read before each call because a callback can grow it.
+    let tls_cb_array = setup_tls(&image, &mut env, &mut mem);
+    let mut tls_next: u32 = 0;
+    let mut tls_calls: u32 = 0;
+    let mut in_tls = false;
+    // Per-callback slice of the budget; a callback that outruns it is abandoned.
+    let tls_callback_budget = limits.max_ticks / TLS_CALLBACK_BUDGET_DIVISOR;
+    let mut tls_deadline: u64 = tls_callback_budget;
+
+    let start_ok = match tls_cb_array.and_then(|a| next_tls_callback(&mut mem, a, 0, &image)) {
+        Some(cb) => {
+            in_tls = true;
+            tls_next = 1;
+            tls_calls = 1;
+            enter_tls_callback(&mut cpu, &mut mem, cb, image.base, tls_return).is_ok()
+        }
+        None => start_entry(&mut cpu, &mut mem, &image, process_return).is_ok(),
     };
-    if pushed.is_err() {
+    if !start_ok {
         report.stop = "stack is not mapped".to_string();
         return report;
     }
 
     let stub_section = image.section_of(image.entry_rva);
-    let image_end = image.base.saturating_add(image.size_of_image);
 
     let mut seh = SehState {
         seh_return,
@@ -275,8 +317,49 @@ pub fn unpack(file: &[u8], limits: &EmuLimits) -> Report {
             }
             progress_deadline = ticks + PROGRESS_WINDOW;
         }
+        // A TLS callback that outran its slice of the budget. Abandon the rest
+        // of the TLS phase and start the entry point with what it produced.
+        if in_tls && ticks >= tls_deadline {
+            in_tls = false;
+            if start_entry(&mut cpu, &mut mem, &image, process_return).is_err() {
+                stop_reason = "stack is not mapped".to_string();
+                break;
+            }
+            continue;
+        }
         let eip = cpu.eip;
 
+        if in_tls && eip == tls_return {
+            ticks += 1;
+            // A callback returned. The loader re-reads the array because a
+            // callback may have appended to it; take the next entry if there is
+            // one and the count cap allows, otherwise the TLS phase is done.
+            let next = if tls_calls < MAX_TLS_CALLBACKS {
+                tls_cb_array.and_then(|a| next_tls_callback(&mut mem, a, tls_next, &image))
+            } else {
+                None
+            };
+            match next {
+                Some(cb) => {
+                    tls_next += 1;
+                    tls_calls += 1;
+                    tls_deadline = ticks + tls_callback_budget;
+                    if enter_tls_callback(&mut cpu, &mut mem, cb, image.base, tls_return).is_err() {
+                        stop_reason = "stack is not mapped".to_string();
+                        break;
+                    }
+                }
+                None => {
+                    in_tls = false;
+                    if start_entry(&mut cpu, &mut mem, &image, process_return).is_err() {
+                        stop_reason = "stack is not mapped".to_string();
+                        break;
+                    }
+                }
+            }
+            continue;
+        }
+
         if eip == process_return {
             stop_reason = "the stub returned to the loader".to_string();
             break;
@@ -509,6 +592,123 @@ pub fn unpack(file: &[u8], limits: &EmuLimits) -> Report {
     report
 }
 
+/// Point the CPU at the entry point with the stack a thread starts with: EBX at
+/// the PEB, and a return address (plus `DllMain`'s three arguments for a DLL).
+fn start_entry(
+    cpu: &mut Cpu,
+    mem: &mut Mem,
+    image: &PeImage,
+    process_return: u32,
+) -> Result<(), ()> {
+    cpu.eip = image.base.wrapping_add(image.entry_rva);
+    cpu.regs[ESP] = INITIAL_ESP;
+    cpu.regs[EBX] = crate::win::PEB_BASE;
+    // A DLL is entered as `DllMain(hinstDLL, DLL_PROCESS_ATTACH, NULL)`. Those
+    // three arguments have to be on the stack: a packed DLL's stub reads them,
+    // and without them it faults on its first instruction.
+    let pushed = if image.is_dll {
+        cpu.push32(mem, 0)
+            .and_then(|()| cpu.push32(mem, DLL_PROCESS_ATTACH))
+            .and_then(|()| cpu.push32(mem, image.base))
+            .and_then(|()| cpu.push32(mem, process_return))
+    } else {
+        cpu.push32(mem, process_return)
+    };
+    pushed.map_err(|_| ())
+}
+
+/// Enter a TLS callback as `cb(image_base, DLL_PROCESS_ATTACH, 0)`, returning to
+/// `tls_return` so the driver can run the next one.
+fn enter_tls_callback(
+    cpu: &mut Cpu,
+    mem: &mut Mem,
+    callback: u32,
+    image_base: u32,
+    tls_return: u32,
+) -> Result<(), ()> {
+    cpu.regs[ESP] = INITIAL_ESP;
+    cpu.push32(mem, 0) // reserved
+        .and_then(|()| cpu.push32(mem, DLL_PROCESS_ATTACH))
+        .and_then(|()| cpu.push32(mem, image_base))
+        .and_then(|()| cpu.push32(mem, tls_return))
+        .map_err(|_| ())?;
+    cpu.eip = callback;
+    Ok(())
+}
+
+/// Set up the static TLS block and return the VA of the callback array, or
+/// `None` when the directory is absent, malformed, or points outside the image.
+///
+/// The `IMAGE_TLS_DIRECTORY32` fields are virtual addresses (the image is mapped
+/// at its preferred base, so a VA is `base + RVA`). Every one is bounds-checked
+/// against the mapped image before it is dereferenced, since a packed file's TLS
+/// directory is attacker-controlled.
+fn setup_tls(image: &PeImage, env: &mut Env, mem: &mut Mem) -> Option<u32> {
+    let (rva, size) = image.tls_dir;
+    if rva == 0 || size < 0x18 {
+        return None;
+    }
+    let image_end = image.base.saturating_add(image.size_of_image);
+    let in_image = |va: u32| va >= image.base && va < image_end;
+    let td = image.base.wrapping_add(rva);
+    if !in_image(td) || !mem.is_mapped(td, 0x18) {
+        return None;
+    }
+    let raw_start = mem.read_u32(td).ok()?;
+    let raw_end = mem.read_u32(td + 4).ok()?;
+    let index_va = mem.read_u32(td + 8).ok()?;
+    let cb_array = mem.read_u32(td + 12).ok()?;
+    let zero_fill = mem.read_u32(td + 16).ok()?;
+
+    // The static TLS template: the raw data, then the zero fill. A directory
+    // whose raw range is backwards or outside the image contributes no data;
+    // the block is still created so `AddressOfIndex` and the TEB are wired up.
+    let mut template = Vec::new();
+    if raw_end > raw_start && in_image(raw_start) && in_image(raw_end) {
+        let len = (raw_end - raw_start).min(MAX_TLS_BLOCK);
+        if mem.is_mapped(raw_start, len) {
+            template = mem.snapshot(raw_start, len as usize);
+        }
+    }
+    let total = (template.len() as u32)
+        .saturating_add(zero_fill)
+        .min(MAX_TLS_BLOCK);
+    template.resize(total as usize, 0);
+
+    // `AddressOfIndex` must be writable storage inside the image; a directory
+    // that points it elsewhere gets no index written, matching a loader that
+    // would fault and abandon the module rather than scribble out of bounds.
+    let index_va = if index_va != 0 && in_image(index_va) && mem.is_mapped(index_va, 4) {
+        index_va
+    } else {
+        0
+    };
+    env.install_static_tls(mem, &template, 0, index_va).ok()??;
+
+    if cb_array != 0 && in_image(cb_array) && mem.is_mapped(cb_array, 4) {
+        Some(cb_array)
+    } else {
+        None
+    }
+}
+
+/// The `idx`-th callback in the array at `cb_array`, if it is present, non-null
+/// and points into the image. Re-read every time because a callback can extend
+/// the array.
+fn next_tls_callback(mem: &mut Mem, cb_array: u32, idx: u32, image: &PeImage) -> Option<u32> {
+    let slot = cb_array.wrapping_add(idx.wrapping_mul(4));
+    if !mem.is_mapped(slot, 4) {
+        return None;
+    }
+    let cb = mem.read_u32(slot).ok()?;
+    let image_end = image.base.saturating_add(image.size_of_image);
+    if cb != 0 && cb >= image.base && cb < image_end {
+        Some(cb)
+    } else {
+        None
+    }
+}
+
 /// Whether the section execution just entered was *rebuilt* rather than merely
 /// touched.
 ///
@@ -622,8 +822,14 @@ fn disassemble(cpu: &Cpu, mem: &mut Mem) -> String {
     format!(
         "{:08x}  {text:<32} eax={:08x} ecx={:08x} edx={:08x} ebx={:08x} esp={:08x} ebp={:08x} esi={:08x} edi={:08x}",
         cpu.eip,
-        cpu.regs[0], cpu.regs[1], cpu.regs[2], cpu.regs[3],
-        cpu.regs[4], cpu.regs[5], cpu.regs[6], cpu.regs[7],
+        cpu.regs[0],
+        cpu.regs[1],
+        cpu.regs[2],
+        cpu.regs[3],
+        cpu.regs[4],
+        cpu.regs[5],
+        cpu.regs[6],
+        cpu.regs[7],
     )
 }
 
diff --git a/crates/exav-pe-emu/src/win.rs b/crates/exav-pe-emu/src/win.rs
index 4e68ee85..134158a6 100644
--- a/crates/exav-pe-emu/src/win.rs
+++ b/crates/exav-pe-emu/src/win.rs
@@ -28,7 +28,7 @@
 
 use rustc_hash::FxHashMap;
 
-use crate::cpu::{Cpu, Stop, EAX, ESP};
+use crate::cpu::{Cpu, EAX, ESP, Stop};
 use crate::mem::{Mem, PAGE_SIZE};
 
 /// How far below the initial stack the emulator will keep mapping pages on
@@ -60,15 +60,35 @@ const ENV_BASE: u32 = 0x0009_0000;
 const HEAP_BASE: u32 = 0x0100_0000;
 const HEAP_LIMIT: u32 = 0x6000_0000;
 
-/// Address space each synthetic DLL occupies. The first 0x4000 bytes hold the
-/// headers and export directory; the rest is the trap range its exports point
-/// into.
-const MODULE_SIZE: u32 = 0x0001_0000;
-const TRAP_OFFSET: u32 = 0x4000;
+/// Address space each synthetic DLL occupies. The headers and export directory
+/// live below `TRAP_OFFSET`; the trap range its exports point into runs from
+/// there. The region is large because a synthetic DLL advertises the real one's
+/// documented export names (over a thousand for `kernel32`), so a stub that
+/// resolves imports by hashing export names finds what it looks for.
+const MODULE_SIZE: u32 = 0x0004_0000;
+const TRAP_OFFSET: u32 = 0x0001_8000;
 const TRAP_STRIDE: u32 = 0x10;
-/// Offset within `kernel32` that the emulator's two return sentinels sit at:
-/// past the trap range, still inside the module image.
-const RETURN_OFFSET: u32 = 0xc000;
+/// Offset within `kernel32` that the emulator's return sentinels sit at: past
+/// the trap range, still inside the module image.
+const RETURN_OFFSET: u32 = 0x0003_f000;
+
+/// Largest export directory, in bytes, a synthetic module may build below its
+/// trap range. Bounds the per-module name set so the directory cannot grow into
+/// the traps.
+const MAX_EXPORT_DIR: u32 = TRAP_OFFSET - 0x1000;
+
+/// The documented export-name set each synthetic system DLL advertises, beyond
+/// the handful the emulator implements. Names only, extracted from Microsoft's
+/// API documentation by `scripts/gen-exports.py` (provenance and licence in
+/// this crate's NOTICE). Undocumented exports are not in it. A name here with
+/// no implementation resolves to a trap that reports itself and returns
+/// failure, never to undefined behaviour.
+const EXTRA_EXPORTS: &[(&str, &str)] = &[
+    ("kernel32.dll", include_str!("exports/kernel32.txt")),
+    ("ntdll.dll", include_str!("exports/ntdll.txt")),
+    ("user32.dll", include_str!("exports/user32.txt")),
+    ("advapi32.dll", include_str!("exports/advapi32.txt")),
+];
 
 /// Handle values with fixed meanings on Windows.
 const INVALID_HANDLE: u32 = 0xffff_ffff;
@@ -162,6 +182,9 @@ enum Api {
     WriteFile,
     SetFilePointer,
     GetFileSize,
+    GetFileAttributesEx {
+        wide: bool,
+    },
     CreateFileMapping,
     MapViewOfFile,
     GetStdHandle,
@@ -484,6 +507,16 @@ const APIS: &[ApiSpec] = &[
     k("CreateDirectoryW", 2, Api::Const(0)),
     k("GetFileAttributesA", 1, Api::Const(0xffff_ffff)),
     k("GetFileAttributesW", 1, Api::Const(0xffff_ffff)),
+    k(
+        "GetFileAttributesExA",
+        3,
+        Api::GetFileAttributesEx { wide: false },
+    ),
+    k(
+        "GetFileAttributesExW",
+        3,
+        Api::GetFileAttributesEx { wide: true },
+    ),
     k("SetFileAttributesA", 2, Api::Const(0)),
     k("CopyFileA", 3, Api::Const(0)),
     k("MoveFileA", 2, Api::Const(0)),
@@ -846,6 +879,45 @@ impl<'a> Env<'a> {
         self.kernel32_base() + RETURN_OFFSET + 0x10
     }
 
+    /// Return address a TLS callback returns to, so the driver runs the next
+    /// one. A distinct sentinel from `process_return` because a callback
+    /// returning is not the stub returning to the loader.
+    pub fn tls_return(&self) -> u32 {
+        self.kernel32_base() + RETURN_OFFSET + 0x20
+    }
+
+    /// Set up the static TLS block the way the loader does before a TLS
+    /// callback runs: a copy of the module's TLS template (raw data plus zero
+    /// fill), the TEB's `ThreadLocalStoragePointer` pointing at a one-slot array
+    /// that holds it, and the assigned index written to `*index_va`.
+    ///
+    /// Returns the block's base, or `None` when the allocation does not fit.
+    pub fn install_static_tls(
+        &mut self,
+        mem: &mut Mem,
+        template: &[u8],
+        index: u32,
+        index_va: u32,
+    ) -> Result<Option<u32>, Stop> {
+        let block = self.alloc(mem, 0, (template.len() as u32).max(1));
+        if block == 0 {
+            return Ok(None);
+        }
+        mem.write_bytes(block, template).map_err(Stop::Fault)?;
+        let array = self.alloc(mem, 0, (index + 1) * 4);
+        if array == 0 {
+            return Ok(None);
+        }
+        mem.write_u32(array + index * 4, block)
+            .map_err(Stop::Fault)?;
+        // TEB.ThreadLocalStoragePointer is at offset 0x2C on x86 [pe][dbg].
+        mem.write_u32(TEB_BASE + 0x2c, array).map_err(Stop::Fault)?;
+        if index_va != 0 {
+            mem.write_u32(index_va, index).map_err(Stop::Fault)?;
+        }
+        Ok(Some(block))
+    }
+
     fn kernel32_base(&self) -> u32 {
         self.find_module_by_name("kernel32.dll")
             .map(|m| m.base)
@@ -861,18 +933,67 @@ impl<'a> Env<'a> {
         self.modules.iter().find(|m| m.name == want)
     }
 
-    /// Create a synthetic DLL: PE headers, an export directory naming every API
-    /// the emulator implements for it, and one trap address per export.
+    /// The sorted export set a synthetic module advertises: every API the
+    /// emulator implements for it, plus the real DLL's other documented export
+    /// names, bounded so the directory stays below the trap range.
+    ///
+    /// The list is sorted by name, because Windows keeps the export name table
+    /// sorted and hand-written resolvers binary-search it. Implemented exports
+    /// are never dropped by the size bound; only extra names are.
+    fn module_exports(&self, name: &str) -> Vec<(&'static str, Option<Api>, u8)> {
+        let mut implemented: Vec<(&'static str, Option<Api>, u8)> = APIS
+            .iter()
+            .filter(|s| s.module == name)
+            .map(|s| (s.name, Some(s.api), s.argc))
+            .collect();
+
+        // Running size of the export directory below RVA 0x1000: the three
+        // parallel arrays (10 bytes an entry) plus the name strings, plus the
+        // module's own name string. Kept under `MAX_EXPORT_DIR`.
+        let mut used = 40u32 + export_dir_name(name).len() as u32 + 1;
+        let entry_cost = |s: &str| 10 + s.len() as u32 + 1;
+        for (ename, ..) in &implemented {
+            used += entry_cost(ename);
+        }
+
+        if let Some((_, list)) = EXTRA_EXPORTS.iter().find(|(m, _)| *m == name) {
+            let known: std::collections::HashSet<&str> =
+                implemented.iter().map(|(n, ..)| *n).collect();
+            for ename in list.lines().map(str::trim).filter(|l| !l.is_empty()) {
+                if known.contains(ename) {
+                    continue;
+                }
+                let cost = entry_cost(ename);
+                if used + cost > MAX_EXPORT_DIR {
+                    break;
+                }
+                used += cost;
+                // A name this module exports but the emulator implements under
+                // another module (a forwarder) resolves to that implementation,
+                // as `export_addr` does by name across modules. Only a name no
+                // module implements becomes an unimplemented trap.
+                let spec = APIS.iter().find(|s| s.name == ename);
+                implemented.push((
+                    ename,
+                    spec.map(|s| s.api),
+                    spec.map(|s| s.argc).unwrap_or(0),
+                ));
+            }
+        }
+        implemented.sort_by(|a, b| a.0.cmp(b.0));
+        implemented
+    }
+
+    /// Create a synthetic DLL: PE headers and an export directory. The directory
+    /// names every API the emulator implements for the module *and* the real
+    /// DLL's other documented exports (names only), so a stub that resolves imports by
+    /// hashing export names finds what it looks for. Each export points at a
+    /// trap; an unimplemented one's trap reports itself and returns failure when
+    /// called, never undefined behaviour.
     fn create_module(&mut self, mem: &mut Mem, name: &str, base: u32) -> Result<(), Stop> {
         map(mem, base, MODULE_SIZE)?;
         let name = normalize_module(name);
-        let exports: Vec<&ApiSpec> = {
-            let mut v: Vec<&ApiSpec> = APIS.iter().filter(|s| s.module == name).collect();
-            // Windows keeps the export name table sorted, and hand-written
-            // resolvers binary-search it.
-            v.sort_by_key(|s| s.name);
-            v
-        };
+        let exports = self.module_exports(&name);
 
         let mut trap = base + TRAP_OFFSET;
         // Export directory at RVA 0x1000, arrays and strings after it.
@@ -887,11 +1008,7 @@ impl<'a> Env<'a> {
         ed.extend_from_slice(&0u32.to_le_bytes()); // Characteristics
         ed.extend_from_slice(&0u32.to_le_bytes()); // TimeDateStamp
         ed.extend_from_slice(&0u32.to_le_bytes()); // Major/Minor version
-        ed.extend_from_slice(&strings_rva.to_le_bytes()); // Name (points at the
-                                                          // first string, which
-                                                          // is close enough for
-                                                          // a resolver that
-                                                          // only reads exports)
+        ed.extend_from_slice(&0u32.to_le_bytes()); // Name, patched below
         ed.extend_from_slice(&1u32.to_le_bytes()); // Base ordinal
         ed.extend_from_slice(&n.to_le_bytes()); // NumberOfFunctions
         ed.extend_from_slice(&n.to_le_bytes()); // NumberOfNames
@@ -901,7 +1018,7 @@ impl<'a> Env<'a> {
         mem.write_bytes(base + ed_rva, &ed).map_err(Stop::Fault)?;
 
         let mut str_rva = strings_rva;
-        for (i, spec) in exports.iter().enumerate() {
+        for (i, (ename, api, argc)) in exports.iter().enumerate() {
             let i = i as u32;
             mem.write_u32(base + funcs_rva + i * 4, trap - base)
                 .map_err(Stop::Fault)?;
@@ -909,19 +1026,27 @@ impl<'a> Env<'a> {
                 .map_err(Stop::Fault)?;
             mem.write_u16(base + ords_rva + i * 2, i as u16)
                 .map_err(Stop::Fault)?;
-            write_c_str(mem, base + str_rva, spec.name)?;
-            str_rva += spec.name.len() as u32 + 1;
+            write_c_str(mem, base + str_rva, ename)?;
+            str_rva += ename.len() as u32 + 1;
             self.traps.insert(
                 trap,
                 Trap {
-                    api: Some(spec.api),
-                    argc: spec.argc,
+                    api: *api,
+                    argc: *argc,
                     module: name.clone(),
-                    name: spec.name.to_string(),
+                    name: ename.to_string(),
                 },
             );
             trap += TRAP_STRIDE;
         }
+        // The DLL's own name, spelled as the real export directory spells it.
+        // tElock reads it to check that the module it found is `KERNEL32` and
+        // spins forever when it is not.
+        let export_name = export_dir_name(&name);
+        write_c_str(mem, base + str_rva, &export_name)?;
+        mem.write_u32(base + ed_rva + 12, str_rva)
+            .map_err(Stop::Fault)?;
+        str_rva += export_name.len() as u32 + 1;
 
         write_module_headers(mem, base, MODULE_SIZE, ed_rva, str_rva - ed_rva)?;
         self.modules.push(Module {
@@ -933,23 +1058,34 @@ impl<'a> Env<'a> {
         Ok(())
     }
 
+    // Where each layout fact below comes from (pinned sources in the NOTICE):
+    //   [pe]  Microsoft PE Format specification, "The .tls Section".
+    //   [dbg] Microsoft debugger documentation: `dt` output on 32-bit Windows.
+    //   [wtl] Microsoft winternl.h reference; x86 offsets follow from the
+    //         documented member types.
+    //   [kus] Microsoft WDK reference for KUSER_SHARED_DATA, which gives the
+    //         field order but not every type, so not the offsets.
+    //   [obs] Not given by those sources. Each is observable on 32-bit Windows
+    //         by comparing the field with the API that reports the same value
+    //         (listed in the NOTICE); kept on that basis.
+
     /// Fill `KUSER_SHARED_DATA` with the handful of fields a stub reads: the
     /// interrupt/tick counters (used for timing checks) and the OS version.
     fn build_shared_user_data(&self, mem: &mut Mem) -> Result<(), Stop> {
         map(mem, SHARED_USER_DATA, PAGE_SIZE as u32)?;
         mem.write_u32(SHARED_USER_DATA, 0x0010_0000)
-            .map_err(Stop::Fault)?; // TickCountLow
+            .map_err(Stop::Fault)?; // TickCountLowDeprecated [kus][obs]
         mem.write_u32(SHARED_USER_DATA + 0x04, 0x000f_a000)
-            .map_err(Stop::Fault)?; // TickCountMultiplier
+            .map_err(Stop::Fault)?; // TickCountMultiplier [kus][obs]
         mem.write_u32(SHARED_USER_DATA + 0x08, 0x0010_0000)
-            .map_err(Stop::Fault)?; // InterruptTime.LowPart
+            .map_err(Stop::Fault)?; // InterruptTime, low part [kus][obs]
         mem.write_u32(SHARED_USER_DATA + 0x14, 0x1000_0000)
-            .map_err(Stop::Fault)?; // SystemTime.LowPart
-        write_utf16(mem, SHARED_USER_DATA + 0x30, "C:\\WINDOWS")?; // NtSystemRoot
+            .map_err(Stop::Fault)?; // SystemTime, low part [kus][obs]
+        write_utf16(mem, SHARED_USER_DATA + 0x30, "C:\\WINDOWS")?; // NtSystemRoot [kus][obs]
         mem.write_u32(SHARED_USER_DATA + 0x26c, 5)
-            .map_err(Stop::Fault)?; // NtMajorVersion
+            .map_err(Stop::Fault)?; // NtMajorVersion [kus][obs]
         mem.write_u32(SHARED_USER_DATA + 0x270, 1)
-            .map_err(Stop::Fault)?; // NtMinorVersion
+            .map_err(Stop::Fault)?; // NtMinorVersion [kus][obs]
         Ok(())
     }
 
@@ -963,35 +1099,36 @@ impl<'a> Env<'a> {
         map(mem, TEB_BASE, PAGE_SIZE as u32)?;
         map(mem, PEB_BASE, PAGE_SIZE as u32)?;
 
-        // TEB.
-        mem.write_u32(TEB_BASE, 0xffff_ffff).map_err(Stop::Fault)?; // ExceptionList: chain end
+        // TEB. NtTib (an NT_TIB) is at 0x00 [dbg]; its members' order is
+        // consistent with the [dbg] `dd` example, and is [obs].
+        mem.write_u32(TEB_BASE, 0xffff_ffff).map_err(Stop::Fault)?; // NtTib.ExceptionList: chain end [obs]
         mem.write_u32(TEB_BASE + 0x04, STACK_TOP)
-            .map_err(Stop::Fault)?; // StackBase
+            .map_err(Stop::Fault)?; // NtTib.StackBase [obs]
         mem.write_u32(TEB_BASE + 0x08, STACK_BASE)
-            .map_err(Stop::Fault)?; // StackLimit
+            .map_err(Stop::Fault)?; // NtTib.StackLimit [obs]
         mem.write_u32(TEB_BASE + 0x18, TEB_BASE)
-            .map_err(Stop::Fault)?; // Self
+            .map_err(Stop::Fault)?; // NtTib.Self [obs]
         mem.write_u32(TEB_BASE + 0x20, 0x0000_0abc)
-            .map_err(Stop::Fault)?; // ProcessId
+            .map_err(Stop::Fault)?; // ClientId.UniqueProcess: ClientId at 0x20 [dbg], member order [obs]
         mem.write_u32(TEB_BASE + 0x24, 0x0000_0def)
-            .map_err(Stop::Fault)?; // ThreadId
+            .map_err(Stop::Fault)?; // ClientId.UniqueThread [obs]
         mem.write_u32(TEB_BASE + 0x30, PEB_BASE)
-            .map_err(Stop::Fault)?; // PEB
+            .map_err(Stop::Fault)?; // ProcessEnvironmentBlock [dbg]
 
         // PEB. `BeingDebugged` and `NtGlobalFlag` are the two fields anti-debug
         // stubs read directly, and both say "no debugger".
         mem.write_u32(PEB_BASE + 0x08, image_base)
-            .map_err(Stop::Fault)?; // ImageBaseAddress
+            .map_err(Stop::Fault)?; // ImageBaseAddress [obs]
         mem.write_u32(PEB_BASE + 0x0c, LDR_BASE)
-            .map_err(Stop::Fault)?; // Ldr
+            .map_err(Stop::Fault)?; // Ldr [dbg]
         mem.write_u32(PEB_BASE + 0x18, PROCESS_HEAP)
-            .map_err(Stop::Fault)?; // ProcessHeap
-        mem.write_u32(PEB_BASE + 0x64, 1).map_err(Stop::Fault)?; // NumberOfProcessors
-        mem.write_u32(PEB_BASE + 0x68, 0).map_err(Stop::Fault)?; // NtGlobalFlag
-        mem.write_u32(PEB_BASE + 0xa4, 5).map_err(Stop::Fault)?; // OSMajorVersion
-        mem.write_u32(PEB_BASE + 0xa8, 1).map_err(Stop::Fault)?; // OSMinorVersion
-        mem.write_u32(PEB_BASE + 0xac, 2600).map_err(Stop::Fault)?; // OSBuildNumber
-        mem.write_u32(PEB_BASE + 0xb0, 2).map_err(Stop::Fault)?; // PlatformId
+            .map_err(Stop::Fault)?; // ProcessHeap [obs]
+        mem.write_u32(PEB_BASE + 0x64, 1).map_err(Stop::Fault)?; // NumberOfProcessors [obs]
+        mem.write_u32(PEB_BASE + 0x68, 0).map_err(Stop::Fault)?; // NtGlobalFlag [obs]
+        mem.write_u32(PEB_BASE + 0xa4, 5).map_err(Stop::Fault)?; // OSMajorVersion [obs]
+        mem.write_u32(PEB_BASE + 0xa8, 1).map_err(Stop::Fault)?; // OSMinorVersion [obs]
+        mem.write_u32(PEB_BASE + 0xac, 2600).map_err(Stop::Fault)?; // OSBuildNumber [obs]
+        mem.write_u32(PEB_BASE + 0xb0, 2).map_err(Stop::Fault)?; // OSPlatformId [obs]
 
         // PEB_LDR_DATA followed by one LDR_DATA_TABLE_ENTRY per module. The
         // executable itself comes first in load and memory order, but not in
@@ -1027,8 +1164,10 @@ impl<'a> Env<'a> {
         let mem_head = ldr + 0x14;
         let init_head = ldr + 0x1c;
 
-        mem.write_u32(ldr, 0x28).map_err(Stop::Fault)?; // Length
-        mem.write_u32(ldr + 4, 1).map_err(Stop::Fault)?; // Initialized
+        // PEB_LDR_DATA: Length (0x28), Initialized, and the three list heads at
+        // 0x0c / 0x14 / 0x1c [dbg].
+        mem.write_u32(ldr, 0x28).map_err(Stop::Fault)?; // Length [dbg]
+        mem.write_u32(ldr + 4, 1).map_err(Stop::Fault)?; // Initialized [dbg]
 
         let init_idx: Vec<usize> = (0..list.len()).filter(|&i| list[i].in_init).collect();
         let all_idx: Vec<usize> = (0..list.len()).collect();
@@ -1053,17 +1192,23 @@ impl<'a> Env<'a> {
             mem.write_u32(head + 4, last).map_err(Stop::Fault)?;
             Ok(())
         };
+        // LDR_DATA_TABLE_ENTRY links. InMemoryOrderLinks at 0x08 [wtl]. The
+        // load-order links at 0x00 follow from the [dbg] example, where the two
+        // lists' heads point 8 bytes apart into the same entry. The
+        // initialisation-order links fill the documented reserved slot at 0x10
+        // [wtl], their meaning [obs].
         link(mem, load_head, 0x00, &all_idx)?;
         link(mem, mem_head, 0x08, &all_idx)?;
         link(mem, init_head, 0x10, &init_idx)?;
 
         for (i, l) in list.iter().enumerate() {
             let e = addr_of(i);
-            mem.write_u32(e + 0x18, l.base).map_err(Stop::Fault)?; // DllBase
-            mem.write_u32(e + 0x1c, l.base).map_err(Stop::Fault)?; // EntryPoint
-            mem.write_u32(e + 0x20, l.size).map_err(Stop::Fault)?; // SizeOfImage
-                                                                   // FullDllName / BaseDllName as UNICODE_STRINGs pointing into the
-                                                                   // string area after the entries.
+            mem.write_u32(e + 0x18, l.base).map_err(Stop::Fault)?; // DllBase [wtl]
+            mem.write_u32(e + 0x1c, l.base).map_err(Stop::Fault)?; // EntryPoint: reserved slot [wtl], meaning [obs]
+            mem.write_u32(e + 0x20, l.size).map_err(Stop::Fault)?; // SizeOfImage: reserved slot [wtl], meaning [obs]
+            // FullDllName at 0x24 [wtl] and BaseDllName at 0x2c (reserved slot
+            // [wtl], meaning [obs]), as UNICODE_STRINGs into the string area
+            // after the entries.
             let str_addr = entry0 + list.len() as u32 * ENTRY_SIZE + i as u32 * 0x80;
             let wide: Vec<u8> = l
                 .name
@@ -1518,6 +1663,28 @@ impl<'a> Env<'a> {
                 }
                 self.file.len() as u32
             }
+            Api::GetFileAttributesEx { wide } => {
+                // The program's own file exists and reports a size; every other
+                // path is absent, as with `CreateFile`. A stub that stats itself
+                // before unpacking (Alienyze does) needs the success answer, not
+                // the "file not found" that stops it.
+                let p = arg(cpu, mem, 0)?;
+                let path = read_str(mem, p, wide)?;
+                let out = arg(cpu, mem, 2)?;
+                if self.is_own_path(&path) && out != 0 {
+                    // WIN32_FILE_ATTRIBUTE_DATA: attributes, three FILETIMEs,
+                    // then the 64-bit size. Only the attributes and size carry
+                    // information a stub acts on.
+                    let mut data = [0u8; 0x24];
+                    data[0..4].copy_from_slice(&0x80u32.to_le_bytes()); // FILE_ATTRIBUTE_NORMAL
+                    data[0x20..0x24].copy_from_slice(&(self.file.len() as u32).to_le_bytes());
+                    mem.write_bytes(out, &data).map_err(Stop::Fault)?;
+                    1
+                } else {
+                    self.last_error = 2; // ERROR_FILE_NOT_FOUND
+                    0
+                }
+            }
             Api::CreateFileMapping => {
                 let h = arg(cpu, mem, 0)?;
                 if self.open_files.contains_key(&h) {
@@ -1930,6 +2097,18 @@ fn normalize_module(name: &str) -> String {
     }
 }
 
+/// The name a DLL's export directory gives itself: `KERNEL32.dll`, `ntdll.dll`.
+/// Most system DLLs spell the stem in capitals; `ntdll` and `msvcrt` do not.
+fn export_dir_name(normalized: &str) -> String {
+    if matches!(normalized, "ntdll.dll" | "msvcrt.dll") {
+        return normalized.to_string();
+    }
+    match normalized.rsplit_once('.') {
+        Some((stem, ext)) => format!("{}.{ext}", stem.to_ascii_uppercase()),
+        None => normalized.to_ascii_uppercase(),
+    }
+}
+
 fn write_utf16(mem: &mut Mem, addr: u32, s: &str) -> Result<(), Stop> {
     let b: Vec<u8> = s
         .encode_utf16()
@@ -2092,6 +2271,23 @@ mod tests {
         );
     }
 
+    #[test]
+    fn a_synthetic_dll_names_itself_as_the_real_one_does() {
+        // The export directory's Name field is `KERNEL32.dll`, not the lower-
+        // case internal name. A stub that walks the loader list and checks the
+        // export name (tElock does, and spins when it does not match) has to see
+        // what a real module shows.
+        let (mut mem, _env) = env();
+        for (base, want) in [(0x7c80_0000u32, "KERNEL32.dll"), (0x7c90_0000, "ntdll.dll")] {
+            let e_lfanew = mem.read_u32(base + 0x3c).unwrap();
+            let dd = base + e_lfanew + 24 + 96;
+            let ed = base + mem.read_u32(dd).unwrap();
+            let name_va = base + mem.read_u32(ed + 12).unwrap();
+            let name = read_str(&mut mem, name_va, false).unwrap();
+            assert_eq!(name, want);
+        }
+    }
+
     /// A block copy reports the volume it moved, so the driver can charge for it.
     ///
     /// The tick budget bounds instructions executed, which stands in for work
@@ -2264,6 +2460,85 @@ mod tests {
         assert!(env.is_trap(cpu.regs[EAX]));
     }
 
+    #[test]
+    fn the_export_directory_advertises_the_real_dll_names_not_just_implemented() {
+        // A stub that resolves imports by hashing export names walks the name
+        // table itself. The synthetic kernel32 therefore advertises the real
+        // DLL's exports, not only the handful the emulator implements, so such a
+        // walk finds its function. Alienyze fails exactly this way otherwise.
+        let (mut mem, mut env) = env();
+        let base = 0x7c80_0000u32;
+        let e_lfanew = mem.read_u32(base + 0x3c).unwrap();
+        let ed = base + mem.read_u32(base + e_lfanew + 24 + 96).unwrap();
+        let n_names = mem.read_u32(ed + 24).unwrap();
+        let names = base + mem.read_u32(ed + 32).unwrap();
+        let funcs = base + mem.read_u32(ed + 28).unwrap();
+        // `GetVolumeInformationA` is a real kernel32 export the emulator does not
+        // implement. It must still be in the directory, and resolve to a trap.
+        let mut found = None;
+        for i in 0..n_names {
+            let p = base + mem.read_u32(names + i * 4).unwrap();
+            if read_str(&mut mem, p, false).unwrap() == "GetVolumeInformationA" {
+                found = Some(base + mem.read_u32(funcs + i * 4).unwrap());
+            }
+        }
+        let addr = found.expect("an unimplemented real export is still advertised");
+        assert!(
+            env.is_trap(addr),
+            "it resolves to a trap the driver services"
+        );
+
+        // Calling it is safe and observable: it returns failure and is recorded,
+        // never undefined behaviour.
+        let mut cpu = Cpu::new();
+        cpu.regs[ESP] = INITIAL_ESP;
+        cpu.push32(&mut mem, 0xdead_0000).unwrap(); // return address
+        cpu.eip = addr;
+        let effect = env.call(&mut cpu, &mut mem).unwrap();
+        assert_eq!(effect, ApiEffect::Unimplemented);
+        assert_eq!(cpu.regs[EAX], 0);
+        assert!(
+            env.missing_apis
+                .iter()
+                .any(|m| m.ends_with("GetVolumeInformationA"))
+        );
+    }
+
+    #[test]
+    fn get_file_attributes_ex_reports_the_program_exists_with_its_size() {
+        // The program's own file exists and reports its size; a stub that stats
+        // itself before unpacking (Alienyze does) needs the success answer, not
+        // the "not found" that stops it. Every other path is absent.
+        let mut mem = Mem::new(4096);
+        mem.map(0x0040_0000, 0x1000).unwrap();
+        let file: &[u8] = &vec![0u8; 0x1234];
+        let mut env = Env::new(&mut mem, 0x0040_0000, 0x1_0000, file).unwrap();
+
+        let name = 0x0050_0000u32;
+        let out = 0x0051_0000u32;
+        mem.map(name, 0x1000).unwrap();
+        mem.map(out, 0x1000).unwrap();
+        mem.write_bytes(name, b"C:\\sample.exe\0").unwrap();
+        // GetFileAttributesExA(lpFileName, GetFileExInfoStandard, out).
+        assert_eq!(
+            call_k32(&mut env, &mut mem, "GetFileAttributesExA", &[name, 0, out]),
+            1
+        );
+        assert_eq!(mem.read_u32(out).unwrap(), 0x80, "FILE_ATTRIBUTE_NORMAL");
+        assert_eq!(
+            mem.read_u32(out + 0x20).unwrap(),
+            0x1234,
+            "nFileSizeLow is the file length"
+        );
+
+        mem.write_bytes(name, b"C:\\other.exe\0").unwrap();
+        assert_eq!(
+            call_k32(&mut env, &mut mem, "GetFileAttributesExA", &[name, 0, out]),
+            0,
+            "a path that is not the program does not exist"
+        );
+    }
+
     #[test]
     fn loadlibrary_of_an_unknown_dll_creates_a_module() {
         let (mut mem, mut env) = env();
diff --git a/crates/exav-pe-emu/tests/end_to_end.rs b/crates/exav-pe-emu/tests/end_to_end.rs
new file mode 100644
index 00000000..4358488a
--- /dev/null
+++ b/crates/exav-pe-emu/tests/end_to_end.rs
@@ -0,0 +1,249 @@
+//! End-to-end tests a consumer of the crate can run: build a PE in memory, run
+//! its stub through [`exav_pe_emu::unpack`], and check the image that comes out.
+//!
+//! The fixtures are assembled here rather than committed as binaries, so nothing
+//! third-party or packed is checked in. [`pe`] is the generator: a minimal but
+//! real PE32 with the sections, entry point and (optionally) TLS directory each
+//! test needs.
+
+use exav_pe_emu::{EmuLimits, unpack};
+
+/// A minimal PE32 builder. The image has two sections, `.text` (the empty
+/// destination a stub fills) at RVA 0x1000 and `.pack` (the stub's own bytes)
+/// at RVA 0x2000, mapped at base 0x400000. The caller supplies `.pack`'s raw
+/// bytes, the entry RVA, and an optional TLS directory RVA.
+mod pe {
+    pub const BASE: u32 = 0x0040_0000;
+    pub const TEXT_RVA: u32 = 0x1000;
+    pub const PACK_RVA: u32 = 0x2000;
+
+    pub struct Pe {
+        pub entry_rva: u32,
+        pub pack: Vec<u8>,
+        pub tls_dir_rva: Option<u32>,
+    }
+
+    impl Pe {
+        pub fn build(&self) -> Vec<u8> {
+            let pe_off = 0x80usize;
+            let opt_size = 0xe0usize;
+            let sec_table = pe_off + 24 + opt_size;
+            let num = 2usize;
+            let headers = 0x400usize;
+            let pack_raw = headers;
+            let pack_len = self.pack.len().max(0x200);
+            let mut d = vec![0u8; pack_raw + pack_len];
+
+            d[..2].copy_from_slice(b"MZ");
+            d[0x3c..0x40].copy_from_slice(&(pe_off as u32).to_le_bytes());
+            d[pe_off..pe_off + 4].copy_from_slice(b"PE\0\0");
+            let coff = pe_off + 4;
+            d[coff..coff + 2].copy_from_slice(&0x14cu16.to_le_bytes()); // i386
+            d[coff + 2..coff + 4].copy_from_slice(&(num as u16).to_le_bytes());
+            d[coff + 16..coff + 18].copy_from_slice(&(opt_size as u16).to_le_bytes());
+
+            let opt = coff + 20;
+            d[opt..opt + 2].copy_from_slice(&0x10bu16.to_le_bytes()); // PE32
+            d[opt + 16..opt + 20].copy_from_slice(&self.entry_rva.to_le_bytes());
+            d[opt + 28..opt + 32].copy_from_slice(&BASE.to_le_bytes());
+            d[opt + 32..opt + 36].copy_from_slice(&0x1000u32.to_le_bytes()); // SectionAlignment
+            d[opt + 36..opt + 40].copy_from_slice(&0x200u32.to_le_bytes()); // FileAlignment
+            d[opt + 56..opt + 60].copy_from_slice(&0x3000u32.to_le_bytes()); // SizeOfImage
+            d[opt + 60..opt + 64].copy_from_slice(&0x400u32.to_le_bytes()); // SizeOfHeaders
+            // 16 data directories, so the TLS slot (9) is present.
+            d[opt + 92..opt + 96].copy_from_slice(&16u32.to_le_bytes());
+            if let Some(tls_rva) = self.tls_dir_rva {
+                let dd = opt + 96 + 9 * 8; // data directory 9
+                d[dd..dd + 4].copy_from_slice(&tls_rva.to_le_bytes());
+                d[dd + 4..dd + 8].copy_from_slice(&0x18u32.to_le_bytes());
+            }
+
+            // Section 0: `.text`, the empty destination (no raw data).
+            let s0 = sec_table;
+            d[s0..s0 + 5].copy_from_slice(b".text");
+            d[s0 + 8..s0 + 12].copy_from_slice(&0x1000u32.to_le_bytes()); // VirtualSize
+            d[s0 + 12..s0 + 16].copy_from_slice(&TEXT_RVA.to_le_bytes());
+            d[s0 + 36..s0 + 40].copy_from_slice(&0xe000_0020u32.to_le_bytes());
+
+            // Section 1: `.pack`, holding the stub.
+            let s1 = sec_table + 40;
+            d[s1..s1 + 5].copy_from_slice(b".pack");
+            d[s1 + 8..s1 + 12].copy_from_slice(&0x1000u32.to_le_bytes());
+            d[s1 + 12..s1 + 16].copy_from_slice(&PACK_RVA.to_le_bytes());
+            d[s1 + 16..s1 + 20].copy_from_slice(&(self.pack.len() as u32).to_le_bytes());
+            d[s1 + 20..s1 + 24].copy_from_slice(&(pack_raw as u32).to_le_bytes());
+            d[s1 + 36..s1 + 40].copy_from_slice(&0xe000_0020u32.to_le_bytes());
+
+            d[pack_raw..pack_raw + self.pack.len()].copy_from_slice(&self.pack);
+            d
+        }
+    }
+
+    /// `.text`'s raw offset inside a dump, so a test can read the bytes a stub
+    /// wrote there. A memory-layout dump puts `PointerToRawData == VirtualAddress`.
+    pub fn text_offset_in_dump(dump: &[u8]) -> usize {
+        let pe = u32::from_le_bytes(dump[0x3c..0x40].try_into().unwrap()) as usize;
+        let opt = pe + 24;
+        let sec = opt + u16::from_le_bytes(dump[pe + 20..pe + 22].try_into().unwrap()) as usize;
+        u32::from_le_bytes(dump[sec + 20..sec + 24].try_into().unwrap()) as usize
+    }
+}
+
+/// Limits with the dirty-byte floors dropped, because these hand-written stubs
+/// rebuild a page, not the tens of kilobytes a real unpack produces.
+fn limits() -> EmuLimits {
+    EmuLimits {
+        min_unpack_dirty: 0,
+        min_partial_dirty: 0,
+        ..Default::default()
+    }
+}
+
+#[test]
+fn a_decrypt_and_jump_stub_unpacks() {
+    // The archetype: XOR-decrypt a body from `.pack` into `.text`, then jump to
+    // it. Mirrors a runtime packer's tail transfer.
+    let plain: &[u8] = b"ORIGINAL PROGRAM";
+    let cipher: Vec<u8> = plain.iter().map(|b| b ^ 0x5a).collect();
+
+    // src = PACK_RVA + 0x40 (the cipher text, below the stub).
+    let src = pe::BASE + pe::PACK_RVA + 0x40;
+    let dst = pe::BASE + pe::TEXT_RVA;
+    let mut stub = vec![
+        0xbe, 0, 0, 0, 0, // mov esi, src
+        0xbf, 0, 0, 0, 0, // mov edi, dst
+        0xb9, 0, 0, 0, 0, // mov ecx, len
+        0xac, 0x34, 0x5a, 0xaa, 0xe2, 0xfa, // lodsb; xor al,0x5a; stosb; loop -6
+    ];
+    stub[1..5].copy_from_slice(&src.to_le_bytes());
+    stub[6..10].copy_from_slice(&dst.to_le_bytes());
+    stub[11..15].copy_from_slice(&(plain.len() as u32).to_le_bytes());
+    // jmp dst (rel32 from the end of this instruction).
+    let jmp_at = pe::BASE + pe::PACK_RVA + stub.len() as u32;
+    let rel = dst.wrapping_sub(jmp_at + 5) as i32;
+    stub.push(0xe9);
+    stub.extend_from_slice(&rel.to_le_bytes());
+
+    let mut pack = vec![0u8; 0x40];
+    pack[..stub.len()].copy_from_slice(&stub);
+    pack.extend_from_slice(&cipher);
+
+    let file = pe::Pe {
+        entry_rva: pe::PACK_RVA,
+        pack,
+        tls_dir_rva: None,
+    }
+    .build();
+
+    let r = unpack(&file, &limits());
+    let u = r.unpacked.expect("an image was reconstructed");
+    assert!(u.reached_oep, "stopped at the tail jump: {}", r.stop);
+    assert_eq!(u.oep_rva, pe::TEXT_RVA);
+    let at = pe::text_offset_in_dump(&u.data);
+    assert_eq!(&u.data[at..at + plain.len()], plain);
+}
+
+#[test]
+fn a_stub_that_writes_nothing_yields_no_image() {
+    // `ret`: a stub that does nothing produces no reconstruction, and the crate
+    // reports that rather than handing back the input under an "unpacked" name.
+    let file = pe::Pe {
+        entry_rva: pe::PACK_RVA,
+        pack: vec![0xc3],
+        tls_dir_rva: None,
+    }
+    .build();
+    let r = unpack(&file, &limits());
+    assert!(r.unpacked.is_none(), "{}", r.stop);
+    assert_eq!(r.dirty_bytes, 0);
+}
+
+/// Build the TLS fixture: a file whose entry point only jumps into `.text`,
+/// which is empty until a TLS callback copies the payload there. Reaching the
+/// original entry point therefore proves the callback ran before the entry
+/// point, as the Windows loader runs it.
+fn tls_fixture() -> Vec<u8> {
+    let payload: &[u8] = b"OEP-CODE-PLACED-BY-TLS-CALLBACK";
+
+    // Layout inside `.pack` (RVA 0x2000):
+    //   0x00  entry: jmp .text            (nothing of its own to unpack)
+    //   0x10  callback: rep movsb payload -> .text; ret
+    //   0x60  payload bytes
+    //   0xA0  callback array: [callback_va, 0]
+    //   0xC0  TLS directory (IMAGE_TLS_DIRECTORY32)
+    //   0xE0  AddressOfIndex storage
+    let entry_off = 0x00u32;
+    let cb_off = 0x10u32;
+    let payload_off = 0x60u32;
+    let cb_array_off = 0xa0u32;
+    let tls_dir_off = 0xc0u32;
+    let index_off = 0xe0u32;
+    let va = |off: u32| pe::BASE + pe::PACK_RVA + off;
+    let dst = pe::BASE + pe::TEXT_RVA;
+
+    let mut pack = vec![0u8; 0x100];
+
+    // entry: jmp .text
+    let rel = dst.wrapping_sub(va(entry_off) + 5) as i32;
+    pack[entry_off as usize] = 0xe9;
+    pack[entry_off as usize + 1..entry_off as usize + 5].copy_from_slice(&rel.to_le_bytes());
+
+    // callback(image_base, reason, reserved): copy the payload into .text, ret.
+    let cb = [
+        vec![0xbf],
+        dst.to_le_bytes().to_vec(), // mov edi, .text
+        vec![0xbe],
+        va(payload_off).to_le_bytes().to_vec(), // mov esi, payload
+        vec![0xb9],
+        (payload.len() as u32).to_le_bytes().to_vec(), // mov ecx, len
+        vec![0xf3, 0xa4],                              // rep movsb
+        vec![0xc3],                                    // ret
+    ]
+    .concat();
+    pack[cb_off as usize..cb_off as usize + cb.len()].copy_from_slice(&cb);
+
+    pack[payload_off as usize..payload_off as usize + payload.len()].copy_from_slice(payload);
+
+    // Callback array: one callback, null-terminated.
+    pack[cb_array_off as usize..cb_array_off as usize + 4]
+        .copy_from_slice(&va(cb_off).to_le_bytes());
+
+    // IMAGE_TLS_DIRECTORY32: no raw data, AddressOfIndex -> our storage,
+    // AddressOfCallBacks -> the array.
+    let td = tls_dir_off as usize;
+    pack[td + 8..td + 12].copy_from_slice(&va(index_off).to_le_bytes()); // AddressOfIndex
+    pack[td + 12..td + 16].copy_from_slice(&va(cb_array_off).to_le_bytes()); // AddressOfCallBacks
+
+    let _ = index_off;
+    pe::Pe {
+        entry_rva: pe::PACK_RVA,
+        pack,
+        tls_dir_rva: Some(pe::PACK_RVA + tls_dir_off),
+    }
+    .build()
+}
+
+#[test]
+fn a_tls_callback_runs_before_the_entry_point() {
+    // PE-1 coverage. The entry point only jumps into `.text`; `.text` holds the
+    // original code only because the TLS callback put it there first. If the
+    // callback did not run, `.text` is empty and nothing is recovered.
+    let payload: &[u8] = b"OEP-CODE-PLACED-BY-TLS-CALLBACK";
+    let file = tls_fixture();
+    let r = unpack(&file, &limits());
+    let u = r
+        .unpacked
+        .expect("the TLS callback filled .text and the entry point reached it");
+    assert!(
+        u.reached_oep,
+        "did not reach the original entry point: {}",
+        r.stop
+    );
+    assert_eq!(u.oep_rva, pe::TEXT_RVA);
+    let at = pe::text_offset_in_dump(&u.data);
+    assert_eq!(
+        &u.data[at..at + payload.len()],
+        payload,
+        "the dump holds the code the TLS callback wrote"
+    );
+}
diff --git a/crates/exav-render/Cargo.toml b/crates/exav-render/Cargo.toml
index 7c574e9f..d537aaf5 100644
--- a/crates/exav-render/Cargo.toml
+++ b/crates/exav-render/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 name = "exav-render"
-description = "Memory-safe decoders that turn files into something to draw: images into pixels, DWG and DXF drawings and IFC and STL models into GPU-ready geometry."
+description = "Memory-safe decoders that turn files into something to draw: images into pixels, DWG and DXF drawings and IFC, STL, OBJ, PLY and glTF models into GPU-ready geometry, and office documents (spreadsheets, presentations, text documents) into XLSX, PPTX and DOCX."
 version.workspace = true
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
 repository.workspace = true
 homepage.workspace = true
-keywords = ["image", "dwg", "ifc", "decoder", "cad"]
+keywords = ["image", "dwg", "ifc", "office", "cad"]
 categories = ["multimedia::images", "rendering::data-formats"]
 readme = "README.md"
-# The stroke font the build script compiles in, and its licence.
-include = ["src/**/*", "fonts/**/*", "build.rs", "README.md", "LICENSE"]
+# The stroke font the build script compiles in, and the licences and notices.
+include = ["src/**/*", "fonts/**/*", "build.rs", "README.md", "LICENSE", "NOTICE"]
 
 # The vendored `tiff` decoder's doc examples are written for it as a crate of
 # its own: here their `use tiff::...` cannot resolve.
@@ -20,47 +20,72 @@ doctest = false
 
 [dependencies]
 # The decoders are at the versions libclamav 1.5.4 links, so that exav-imagehash
-# reproduces ClamAV's hash bit for bit. JPEG and TIFF are not `image` features:
-# they go through `src/image_codecs/`, `image`'s own decoders over zune-jpeg
-# built without its SIMD code (its only `unsafe`), which `image` and `tiff`
-# cannot turn off. Pinned with `=` for `cargo install`, which resolves without
-# Cargo.lock.
+# reproduces ClamAV's hash bit for bit, except zune-jpeg for JPEG, which is
+# newer (see `src/image_codecs/README.md`). JPEG and TIFF are not `image`
+# features: they go through `src/image_codecs/`, `image`'s own decoders over
+# zune-jpeg built without its SIMD code (its only `unsafe`), which `image` and
+# `tiff` cannot turn off. Pinned with `=` for `cargo install`, which resolves
+# without Cargo.lock.
 image = { version = "=0.25.9", default-features = false, features = ["png", "gif", "bmp"], optional = true }
 png = { version = "=0.18.0", optional = true }
 gif = { version = "=0.14.1", optional = true }
-zune-jpeg = { version = "=0.5.8", default-features = false, features = ["std"], optional = true }
-zune-core = { version = "=0.5.0", optional = true }
-zune-core-04 = { package = "zune-core", version = "=0.4.12", optional = true }
-# The vendored `tiff` decoder's dependencies, as tiff 0.10.3 has them, and
-# `bytemuck` for its byte casts.
+zune-jpeg = { version = "=0.5.15", default-features = false, features = ["std"], optional = true }
+zune-core = { version = "=0.5.3", optional = true }
+# The vendored `tiff` decoder's dependencies, as tiff 0.10.3 has them less
+# `half`, and `bytemuck` for its byte casts.
 zune-jpeg-04 = { package = "zune-jpeg", version = "=0.4.21", default-features = false, features = ["std"], optional = true }
 fax34 = { package = "fax", version = "=0.2.6", optional = true }
-flate2 = { version = "1.0.20", optional = true }
-half = { version = "2.4.1", optional = true }
+flate2 = { version = "1.1.10", optional = true }
 quick-error = { version = "2.0.1", optional = true }
 # Also `gif`'s LZW. 0.1.12, not libclamav's 0.1.10: it only corrects a debug
 # assertion that a TIFF stream without a clear code tripped; it decodes the same.
 weezl = { version = "=0.1.12", optional = true }
 bytemuck = { version = "1", optional = true }
+# Zstandard strips and tiles of a TIFF, for the viewer's `decode_any` only (as
+# exav-unpack reads them, same version).
+ruzstd = { version = "0.9.1", default-features = false, features = ["std"], optional = true }
+# LZMA strips and tiles of a TIFF (libtiff's `LZMA`, written by GDAL), for the
+# viewer's `decode_any` only; the LZMA2 decoder that exav-unpack uses, same version.
+lzma-rust2 = { version = "0.23", default-features = false, features = ["std"], optional = true }
 # JPEG 2000, JBIG2 and CCITT fax, which libclamav does not decode.
 # `forbid(unsafe_code)` crates, built without `simd` (fearless_simd, whose
 # intrinsics are `unsafe`) and `image` (the `image` and moxcms integration).
 # hayro-ccitt is hayro-jbig2's own MMR decoder.
+# BC1 to BC7 blocks for the viewer's DDS fallback (`decode_any`): safe, no
+# dependencies, MIT.
+bcdec_rs = { version = "=0.2.0", optional = true }
 hayro-jpeg2000 = { version = "=0.4.1", default-features = false, features = ["std"], optional = true }
 hayro-jbig2 = { version = "=0.3.1", default-features = false, features = ["std"], optional = true }
 hayro-ccitt = { version = "=0.4.0", optional = true }
+# JPEG XL: zenjxl-decoder, a fork of the libjxl team's jxl-rs that is
+# `#![forbid(unsafe_code)]` unless its `allow-unsafe` feature is on, with
+# limits on pixels and memory. Built without its SIMD (the default
+# `all-simd`) and without `threads`; no CMS, no JPEG reconstruction.
+zenjxl-decoder = { version = "=0.3.10", default-features = false, optional = true }
 # DXF's pairs, records and code pages, and DWG's bit codes, sections and
 # objects, which the drawing model (`cad`) is read from; those formats
 # alone, none of the scanner's others.
-exav-unpack = { path = "../exav-unpack", version = "0.0.2", default-features = false, features = ["dxf", "dwg"], optional = true }
+exav-unpack = { path = "../exav-unpack", version = "0.0.3", default-features = false, features = ["dxf", "dwg"], optional = true }
+# Markdown: CommonMark with tables and strikethrough, read as events. Without
+# its `html` and `simd` features: no markup is made, and its only `unsafe`
+# (the SIMD scanners) is off.
+pulldown-cmark = { version = "=0.13.5", default-features = false, optional = true }
+# The office converters (`office-*`): packages are read, and the XLSX, PPTX
+# and DOCX written, as ZIP.
+zip = { version = "9", default-features = false, features = ["deflate-flate2"], optional = true }
+# ODF's XML. 0.41 bounds namespace declarations per element and checks
+# duplicate attributes in linear time (RUSTSEC-2026-0194, -0195).
+quick-xml = { version = "0.42", optional = true }
+# Text in Windows and Mac code pages; the DOS ones are tables of our own.
+encoding_rs = { version = "0.8.42", default-features = false, features = ["alloc"], optional = true }
 
 [features]
-default = ["image", "webp", "ico", "pnm", "qoi", "dds", "ff", "hdr", "jp2", "jbig2", "ccitt"]
+default = ["image", "webp", "ico", "pnm", "qoi", "dds", "ff", "hdr", "jp2", "jbig2", "ccitt", "raw"]
 # Raster images: PNG, GIF, JPEG, TIFF and BMP, plus the formats below.
 image = [
-    "dep:image", "dep:png", "dep:gif", "dep:zune-jpeg", "dep:zune-core", "dep:zune-core-04",
-    "dep:zune-jpeg-04", "dep:fax34", "dep:flate2", "dep:half", "dep:quick-error", "dep:weezl",
-    "dep:bytemuck",
+    "dep:image", "dep:png", "dep:gif", "dep:zune-jpeg", "dep:zune-core",
+    "dep:zune-jpeg-04", "dep:fax34", "dep:flate2", "dep:quick-error", "dep:weezl",
+    "dep:bytemuck", "dep:ruzstd", "dep:lzma-rust2",
 ]
 # Each is a decoder without `unsafe`: image-webp and qoi are
 # `forbid(unsafe_code)`, the others are `image`'s own. OpenEXR is left out: its
@@ -69,7 +94,7 @@ webp = ["image", "image/webp"]
 ico = ["image", "image/ico"]
 pnm = ["image", "image/pnm"]
 qoi = ["image", "image/qoi"]
-dds = ["image", "image/dds"]
+dds = ["image", "image/dds", "dep:bcdec_rs"]
 ff = ["image", "image/ff"]
 hdr = ["image", "image/hdr"]
 # JPEG 2000: with `image`, a JP2 or JPX file or a raw codestream (.j2k,
@@ -80,6 +105,14 @@ jp2 = ["dep:hayro-jpeg2000"]
 jbig2 = ["dep:hayro-jbig2"]
 # A PDF's CCITTFaxDecode streams (`pdf_image`).
 ccitt = ["dep:hayro-ccitt"]
+# Camera RAW files (DNG, CR2, CR3, NEF, ARW, ORF, RW2, RAF, PEF, SRW, 3FR,
+# IIQ, X3F...), shown by the largest JPEG or RGB preview they embed
+# (`image::raw`). The sensor data is not decoded.
+raw = ["image"]
+# JPEG XL, first frame, as 8-bit grey or RGBA. Not a default: libclamav does
+# not decode it, so the scanner's image hash has no use for it, and it is the
+# largest decoder here.
+jxl = ["image", "dep:zenjxl-decoder"]
 # DXF (R12 to 2018) and DWG (R13 to 2018) into the drawing model
 # (`cad`), tessellated for a GPU.
 dwg = ["dep:exav-unpack"]
@@ -89,11 +122,54 @@ vp-debug = ["dwg"]
 ifc = []
 # Binary and ASCII STL into the same meshes (`stl`, `mesh`).
 stl = []
+# Wavefront OBJ (`obj`), Stanford PLY (`ply`) and glTF 2.0 with GLB (`gltf`,
+# with a JSON reader of its own) into the same meshes.
+obj = []
+ply = []
+gltf = []
+# Markdown into a tree of blocks and inlines (`markdown`), as data: no HTML
+# is ever made.
+markdown = ["dep:pulldown-cmark"]
+# The text of a document as a reader sees it, one entry for every kind that has
+# some (`text`): Markdown, HTML, Office and OpenDocument XML parts, PDF (hayro)
+# and drawings. For a scanner or a search; the viewer does not use it.
+text = ["markdown", "dwg", "exav-unpack/text"]
+# And PDF's, read by hayro: the largest part of `text`.
+text-pdf = ["text", "exav-unpack/text-pdf"]
+# And the office formats' the XML parts do not reach, from what `office`
+# reads: DOC, XLS, PPT, RTF, Word 2003 XML, SpreadsheetML 2003, SYLK, flat
+# OpenDocument, Numbers, Pages, Keynote.
+text-office = ["text", "office"]
+# What every office converter shares (`formats::office::common`): ZIP
+# packages, ODF's XML, style sheets, and the readers of exav-unpack (compound
+# files, BIFF, code pages, HTML). Not a feature to ask for.
+_office = ["dep:zip", "dep:flate2", "dep:quick-xml", "dep:encoding_rs", "dep:exav-unpack", "exav-unpack/ole", "exav-unpack/html"]
+# Spreadsheets into XLSX (`sheets`): Excel 2 to 2003, ODS, FODS, OTS, Apple
+# Numbers, XML Spreadsheet 2003, HTML tables and SYLK. Also the chart writer
+# the presentations use for ODF charts.
+office-sheets = ["_office", "exav-unpack/offcrypto"]
+# Presentations into PPTX (`slides`): PowerPoint 95 and 97 to 2003, ODP, FODP,
+# OTP and Apple Keynote; drawings: ODG, OTG, FODG and Visio (VSDX). It
+# compiles the spreadsheet reader (an embedded workbook's chart), which opens
+# a workbook with a password.
+office-slides = ["_office", "exav-unpack/offcrypto"]
+# Text documents into DOCX (`docs`): Word 6 to 2003, ODT, FODT, OTT, RTF,
+# Word 2003 XML, Apple Pages and HTML pages (Word's "Save as Web Page"), which
+# are read with the HTML reader of `exav-unpack`.
+office-docs = ["_office", "exav-unpack/rtf"]
+# Every office converter.
+office = ["office-sheets", "office-slides", "office-docs"]
+# Writers of compound files, protobuf messages and Snappy blocks, for the
+# tests that build the documents they read. Not a feature to ask for.
+office-test-util = ["_office", "exav-unpack/test-util"]
 
 [dev-dependencies]
 serde_json = "1"
+# The writers of compound files and encrypted workbooks the converters' own
+# tests build their inputs with.
+exav-unpack = { path = "../exav-unpack", default-features = false, features = ["ole", "offcrypto", "test-util"] }
 # The drawing fixtures are gzipped.
-flate2 = "1.0.20"
+flate2 = "1.1.10"
 # The DWG oracle test names local corpus files by hash.
 sha2 = "0.11"
 
@@ -129,6 +205,14 @@ required-features = ["dwg"]
 name = "ifc"
 required-features = ["ifc"]
 
+[[test]]
+name = "ifc_geometry"
+required-features = ["ifc"]
+
+[[test]]
+name = "ifc_hostile"
+required-features = ["ifc"]
+
 [[test]]
 name = "ifc_oracle"
 required-features = ["ifc"]
@@ -137,6 +221,118 @@ required-features = ["ifc"]
 name = "stl"
 required-features = ["stl"]
 
+[[test]]
+name = "obj"
+required-features = ["obj"]
+
+[[test]]
+name = "ply"
+required-features = ["ply"]
+
+[[test]]
+name = "gltf"
+required-features = ["gltf"]
+
+[[test]]
+name = "jxl"
+required-features = ["jxl"]
+
+[[test]]
+name = "raw"
+required-features = ["raw"]
+
+[[test]]
+name = "markdown"
+required-features = ["markdown"]
+
+[[test]]
+name = "markdown_text"
+required-features = ["markdown"]
+
+[[test]]
+name = "text"
+required-features = ["text"]
+
+[[test]]
+name = "office_sheets"
+required-features = ["office-sheets"]
+
+[[test]]
+name = "office_text_sheets"
+required-features = ["office-sheets"]
+
+[[test]]
+name = "office_slides"
+required-features = ["office-slides", "office-test-util"]
+
+[[test]]
+name = "office_slides_draw"
+required-features = ["office-slides"]
+
+[[test]]
+name = "office_text_slides"
+required-features = ["office-slides"]
+
+[[test]]
+name = "office_slides_vsdx"
+required-features = ["office-slides", "office-test-util"]
+
+[[test]]
+name = "office_slides_keynote_xml"
+required-features = ["office-slides"]
+
+[[test]]
+name = "office_slides_odp_features"
+required-features = ["office-slides"]
+
+[[test]]
+name = "office_slides_old_ppt"
+required-features = ["office-slides", "office-test-util"]
+
+[[test]]
+name = "office_docs_doc"
+required-features = ["office-docs", "office-test-util"]
+
+[[test]]
+name = "saturate"
+required-features = ["office-docs", "office-slides", "office-sheets"]
+
+[[test]]
+name = "nesting"
+required-features = ["office-docs", "office-slides", "office-sheets"]
+
+[[test]]
+name = "office_memory"
+required-features = ["office-docs", "office-slides", "office-sheets", "office-test-util"]
+
+[[test]]
+name = "office_docs_formats"
+required-features = ["office-docs", "office-test-util"]
+
+[[test]]
+name = "office_docs_html"
+required-features = ["office-docs", "office-test-util"]
+
+[[test]]
+name = "office_text_docs"
+required-features = ["office-docs", "office-test-util"]
+
+[[example]]
+name = "office_docs_convert"
+required-features = ["office-docs"]
+
+[[example]]
+name = "office_slides_convert"
+required-features = ["office-slides"]
+
+[[example]]
+name = "office_text"
+required-features = ["text-office"]
+
+[[example]]
+name = "raw_preview"
+required-features = ["raw"]
+
 [[example]]
 name = "cad_dump"
 required-features = ["dwg"]
diff --git a/crates/exav-render/NOTICE b/crates/exav-render/NOTICE
new file mode 100644
index 00000000..1d0a5a6e
--- /dev/null
+++ b/crates/exav-render/NOTICE
@@ -0,0 +1,224 @@
+exav-render: notices
+====================
+
+exav-render is licensed under the MIT License (see LICENSE). This file
+covers the office converters (the `office-sheets`, `office-slides` and
+`office-docs` features, `src/formats/office/`). The vendored image decoders
+keep their licences in `src/image_codecs/` and the stroke font its
+dedication in `fonts/`; the notices of the rest of the workspace are in the
+repository's NOTICE.
+
+The office converters are written from published specifications and from the
+black-box behaviour of other converters (their output on sample files). No
+code of another office application is in them:
+
+- no code of another spreadsheet application is in `sheets`;
+- no code of another presentation application is in `slides`;
+- no code of another word-processing application is in `docs`, and none was
+  read while writing it;
+- `common` is written from published specifications alone.
+
+Specifications and documentation they follow
+--------------------------------------------
+
+Shared (`common`):
+
+- Microsoft's Open Specifications: [MS-CFB], under the Microsoft Open
+  Specifications Promise.
+- OASIS OpenDocument 1.2 and 1.3, for the namespaces.
+- Google's Snappy format description, and the protocol buffers encoding
+  documented at protobuf.dev.
+
+Spreadsheets (`sheets`):
+
+- Microsoft's Open Specifications: [MS-XLS], [MS-OFFCRYPTO], [MS-ODRAW],
+  [MS-CFB], under the Microsoft Open Specifications Promise.
+- OpenOffice.org's "Microsoft Excel File Format" documentation (Daniel
+  Rentz, Public Documentation License 1.0), for the BIFF2 to BIFF5 record
+  layouts [MS-XLS] does not give, and the argument counts of the function
+  table (exav-unpack's src/formats/biff/ftab.rs).
+- OASIS OpenDocument 1.2 and 1.3, and OpenFormula.
+- ECMA-376 (Office Open XML), for the XLSX written.
+- Google's Snappy format description, and the protocol buffers encoding
+  documented at protobuf.dev.
+- Microsoft's "XML Spreadsheet Reference" (Office XP, 2001) for
+  SpreadsheetML; the "Microsoft Office HTML and XML Reference" (Office
+  2000) for Excel's HTML; Microsoft's "SYLK summary" (sylksum.doc, 1986)
+  and knowledge base article Q64338 for SYLK, with ISO 6937 for its
+  escapes; ECMA-376 for column widths in pixels; the W3C's CSS Color
+  Module Level 4 for colour names.
+
+Presentations (`slides`):
+
+- Microsoft's Open Specifications: [MS-PPT], [MS-ODRAW], [MS-CFB],
+  [MS-OSHARED] and [MS-OFFCRYPTO] (to recognise encrypted files), under the
+  Microsoft Open Specifications Promise.
+- ECMA-376 (Office Open XML) Part 1, for the PPTX written, and its
+  presetShapeDefinitions.xml, for the preset shapes' names and adjustments.
+- OASIS OpenDocument 1.2 (Part 1) and 1.3 (Part 3, schema).
+- Google's Snappy format description, and the protocol buffers encoding
+  documented at protobuf.dev.
+- Apple's Technical Notes TN2067 (About the Keynote XML File Format, APXL
+  Schema) and TN2073 (Deconstructing a Keynote Document: Part One,
+  Slides), for Keynote 1 (src/formats/office/slides/keynote/apxl1.rs).
+- RFC 1741 (BinHex 4.0), to find the data fork of a Macintosh PowerPoint
+  file saved as text.
+- Visio drawings (src/formats/office/slides/vsdx): Microsoft's Visio file
+  format reference (Visio 2013 file format, learn.microsoft.com/office/
+  client-developer/visio: the Introduction, Schema map, Elements and Types
+  pages and the ShapeSheet reference pages of the geometry rows, the fill,
+  line, character, paragraph, text block, layer and hyperlink cells, and the
+  THEMEVAL and NURBS functions); [MS-VSDX] (Visio Graphics Service VSDX File
+  Format), under the Microsoft Open Specifications Promise, for the package
+  parts, the coordinate transforms, the inheritance of masters and styles,
+  the colour table, the fill patterns, line patterns and line ends (pictures
+  in it), the formula grammar and the theme; ECMA-376 Part 2 (Open
+  Packaging Conventions), for the package and its relationships.
+
+Text documents (`docs`):
+
+- Microsoft's Open Specifications: [MS-DOC], [MS-ODRAW], [MS-OSHARED] and
+  [MS-CFB], under the Microsoft Open Specifications Promise.
+- ECMA-376 (Office Open XML) Part 1, for the DOCX written.
+- OASIS OpenDocument 1.2 (Part 1) and 1.3 (Part 3, schema).
+- Microsoft's Rich Text Format specification, version 1.9.1, and the
+  WordprocessingML 2003 element and attribute names, for
+  src/formats/office/docs/rtf and src/formats/office/docs/wml.
+- Google's Snappy format description, and the protocol buffers encoding
+  documented at protobuf.dev, for Pages (through `common`).
+
+Formats nobody published
+------------------------
+
+- Microsoft published no description of PowerPoint 95 and of PowerPoint 2 to
+  4, and Apple none of Keynote 2 to 5. src/formats/office/slides/ppt/ppt95.rs
+  and src/formats/office/slides/keynote/apxl.rs were written from sample
+  documents, the output of another office application on them used as a black
+  box (rendered pages, never its source code), and the structure of the files themselves.
+  src/formats/office/slides/ppt/old.rs reads only the headers of PowerPoint
+  2 to 4, to report them as unsupported.
+
+- Apple published none of Pages. src/formats/office/docs/pages was written
+  from sample documents and the structure of the files themselves (the
+  document message's page size and margin fields were found there), with the
+  text messages' layout below.
+
+- The Numbers '08 and '09 reader (src/formats/office/sheets/numbers/v09.rs)
+  follows no description of the format: Apple published none. It was written
+  from sample documents (Apache Tika's, below, and others used only as
+  inputs), with another application's conversions of them as a black-box
+  reference.
+
+- The Visio reader (src/formats/office/slides/vsdx) is written from the
+  specifications listed above and from sample drawings used only as inputs:
+  48 VSDX files collected from public bug trackers and test suites of other
+  projects (not part of this repository), to see what real files hold. Where
+  the specifications are silent, the reader follows what those files and
+  another application's rendering of them show, used as a black box (its PDF
+  of each file compared with ours, never any source code, which was not
+  read): the quick
+  style colours 200 to 206 (read as 100 to 106), the side an arc's bow
+  bulges to, and that a `Themed` value with no quick style of its own is the
+  root style sheet's. The gradient patterns 25 to 40 are approximations of
+  the pictures in [MS-VSDX]. Formats the reader leaves out: the binary .vsd
+  and the Visio 2003 XML .vdx.
+
+Data from other projects
+------------------------
+
+- src/formats/office/sheets/numbers/functions.rs (Numbers' function indexes)
+  and src/formats/office/sheets/numbers/fonts.rs (PostScript names of macOS
+  fonts and their families) are generated, by
+  scripts/office/sheets/numbers_functions.py and
+  scripts/office/sheets/numbers_fonts.py, from numbers-parser
+  (https://github.com/masaccio/numbers-parser), MIT:
+
+    Copyright 2021 Jon Connell
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+  The layout of the Numbers messages read (their field numbers) follows the
+  message definitions numbers-parser publishes under the same licence; the
+  older cell records follow SheetJS's reader (Apache-2.0). The record layout
+  of Keynote tables (src/formats/office/slides/keynote/table.rs) follows, for
+  the cell records, numbers-parser too, under the same licence.
+
+- The layout of the Keynote and Pages messages read (their type and field
+  numbers, named where src/formats/office/slides/keynote and
+  src/formats/office/docs/pages read them) follows the message definitions
+  keynote-parser (https://github.com/psobot/keynote-parser) publishes, MIT:
+
+    Copyright 2019-2025 Peter Sobot
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Test fixtures
+-------------
+
+The fixtures are in tests/fixtures/office and are not packaged with the
+crate.
+
+- sheets/sample.numbers is numbers-parser's tests/data/issue-18.numbers (MIT,
+  as above); see sheets/README.md.
+
+- sheets/numbers09.numbers is Apache Tika's test document
+  testNumbers.numbers, unmodified, under the Apache License 2.0
+  (https://www.apache.org/licenses/LICENSE-2.0). Apache Tika, Copyright The
+  Apache Software Foundation; it includes software developed at The Apache
+  Software Foundation (http://www.apache.org/). It is a test input only.
+
+- slides/sample.key is keynote-parser's tests/data/simple-oneslide.key, under
+  the same licence as keynote-parser above.
+
+- draw/make_vsdx.py writes sample.vsdx and themed.vsdx, Visio drawings of
+  shapes written for this crate (CC0); see draw/README.md.
+
+- docs/make.py writes sample.odt, sample.fodt and sample.rtf from text
+  written for this crate (CC0). docs/sample.doc is a conversion
+  of sample.odt by an office application, and docs/sample-2003.xml was written by hand; none holds
+  anyone else's content.
+
+- tests/fixtures/dwg/make.py writes the drawings as DXF with ezdxf (MIT,
+  not distributed). The `.dwg.gz` files are those drawings converted to DWG by
+  the Open Design Alliance's ODA File Converter, run as a black box on the
+  maintainers' machines: no code or data of the converter is in the repository,
+  and the drawings are this crate's own, written for the tests and under its
+  licence. The converter's own terms
+  (https://www.opendesign.com) apply to the converter, not to the files it was
+  given. The DWG files carry the file-format markers ODA's writer puts in every
+  file.
diff --git a/crates/exav-render/README.md b/crates/exav-render/README.md
index 9ec8a07a..25c1eacf 100644
--- a/crates/exav-render/README.md
+++ b/crates/exav-render/README.md
@@ -13,11 +13,40 @@ behind [`@exav/viewer`](../exav-viewer) and the decoding half of
   code (its only `unsafe`); see the README there. JPEG 2000 and JBIG2
   files too (`jp2`, `jbig2`, default), through hayro-jpeg2000 and
   hayro-jbig2 built without their SIMD code (libclamav decodes neither;
-  exav-imagehash hashes them like the others).
+  exav-imagehash hashes them like the others). JPEG XL (`jxl`, not a
+  default) goes through zenjxl-decoder, a fork of the libjxl team's jxl-rs
+  that is `forbid(unsafe_code)`, built without its SIMD: the first frame, as
+  8-bit grey or RGBA, within the caller's memory budget.
+- **Camera RAW files** (`raw`, default): the largest JPEG or RGB preview a
+  RAW file embeds, as 8-bit pixels with the Exif orientation applied
+  (`image::raw`, and `decode_any`). DNG, Canon CR2, CR3 and CRW, Nikon NEF and
+  NRW, Sony ARW, SR2 and SRF, Olympus ORF, Panasonic RW2, RAW and Leica RWL,
+  Fujifilm RAF, Pentax PEF, Samsung SRW, Hasselblad 3FR, Phase One IIQ, Sigma
+  X3F, Kodak, Epson, Mamiya and Leaf, told by their bytes, not their names: a
+  plain TIFF is not one of them and the TIFF decoder reads it. The sensor
+  data is not decoded, so a file that holds no preview (most phones' DNG) is
+  `Error::NoPreview`. The previews come from the tags TIFF 6.0 and DNG
+  define, and from a search of the file for the JPEG streams the makers keep
+  elsewhere. Written from the public specifications, see `raw.rs`.
 - **PDF images** (`jp2`, `jbig2`, `ccitt`): the JPXDecode, JBIG2Decode and
   CCITTFaxDecode images of PDF streams, into the buffers pdf.js reads from
   its own decoders (`src/formats/pdf_image/`), which @exav/viewer gives
   pdf.js in place of its OpenJPEG and PDFium builds.
+- **Markdown** (`markdown`, not a default): CommonMark with tables and
+  strikethrough, read by pulldown-cmark (without its `html` and `simd`
+  features: `forbid(unsafe_code)`) into a tree of blocks and inlines, as
+  data. Raw HTML is text, an image is its alt text, a link is kept only for
+  an absolute http, https or mailto address; nesting, columns and nodes are
+  bounded. `Document::to_json` is the shape @exav/viewer's page reads.
+- **The text of a document** (`text`, `text-pdf`, `text-office`; not used by
+  the viewer): `text::visible_text` gives the words a reader sees, for a
+  scanner or a search: Markdown, HTML, the XML parts of Office and
+  OpenDocument files, DWG and DXF, PDF (`text-pdf`, through hayro) and, with
+  `text-office`, DOC, XLS, PPT, RTF, Word 2003 XML, SpreadsheetML 2003, SYLK,
+  the flat OpenDocument files, Numbers, Pages and Keynote, taken from what
+  the office converters read, in sections (a sheet, a slide). A link is its
+  label then its target. A document of those kinds whose text could not be
+  taken out says so in `Visible::unreadable`.
 - **DWG and DXF** (`dwg`): read into the drawing model below and
   tessellated into GPU-ready buffers: strokes with their lineweight, fills,
   text runs, layers and layouts. See `src/formats/dwg/`.
@@ -37,10 +66,50 @@ behind [`@exav/viewer`](../exav-viewer) and the decoding half of
   (`mesh::Scene`): batches by class and colour, each element's ranges, its
   GlobalId, class, name and storey, the spatial tree. Written from
   buildingSMART's schemas and documentation, booleans and openings
-  included. See `src/formats/ifc/`. Not drawn faithfully yet: conical,
-  spherical and toroidal B-rep faces (flat), B-spline face trimming, IFC4X3
-  alignments, sweep start/end parameters, grid placements (listed on
-  exav.org's exav-render page).
+  included. See `src/formats/ifc/`. Wavefront OBJ (`obj`), Stanford PLY
+  (`ply`) and glTF 2.0 with GLB (`gltf`, with a JSON reader of its own and
+  no dependency) read into the same meshes, never opening another file.
+  B-rep faces on spheres, tori, cylinders and B-spline surfaces are meshed
+  in their surface's parameters (B-spline faces cut by their bounds),
+  sweeps honour their start and end parameters, IFC4X3 curve segments
+  (lines, circles, clothoids and the other spirals, polynomials), gradient
+  curves and linear placements along them are evaluated, grid placements
+  sit at their grid intersections, and each element and batch has its
+  building storey (`Element::storey`, `Batch::storey`, `Node::elevation`).
+  What is not drawn yet is on exav.org's exav-render page.
+
+- **Office documents** (`office-sheets`, `office-slides`, `office-docs`, or
+  `office` for the three; not defaults): converted to the Open XML package an
+  Open XML renderer draws, in the browser behind `@exav/viewer`. A
+  conversion is bounded by `Limits` (input, cells, slides, paragraphs,
+  memory, each decompressed part) and fails with `Error::TooLarge` rather
+  than convert part of a document. Nothing is recalculated and no macro runs.
+  - **Spreadsheets** (`sheets`, to XLSX): Excel 2.x to 2003 (BIFF2 to BIFF8,
+    a lenient compound file reader, default-password encryption), ODS, FODS
+    and OTS, Apple Numbers (Numbers 3 and later, and '08 and '09), and the
+    text formats Excel opens from a .xls file: XML Spreadsheet 2003, HTML
+    tables and SYLK. Values, formulas as text with their cached results,
+    styles and number formats, merges, conditional formats, validations,
+    comments, links, pictures, shapes and charts.
+  - **Presentations** (`slides`, to PPTX): PowerPoint 95 and 97 to 2003
+    (2 to 4 are recognised and reported as unsupported), ODP, FODP and OTP,
+    and Apple Keynote in every version. Masters, placeholders, styles,
+    shapes and their geometry, text, pictures, tables and charts, every
+    property resolved in the PPTX written. `convert_first` converts the first
+    slides only, `convert_first_from` reads a package part by part from any
+    `Read + Seek` source. Drawings too, a page to a slide in the pages'
+    largest size: ODG, OTG and FODG, and Visio 2013 and later (VSDX, VSDM,
+    VSTX, VSTM: shapes through their masters and styles, formulas where a
+    master's depend on the instance, geometry rows, splines, text, pictures,
+    layers, hyperlinks, the theme's colours; the binary .vsd and the Visio
+    2003 XML .vdx are not read).
+  - **Text documents** (`docs`, to DOCX): Word 6 to 2003, ODT, OTT and FODT,
+    RTF, Word 2003 XML and Apple Pages (text, page size and margins). Styles
+    stay styles; sections with headers and footers, lists, tables, notes,
+    comments, fields, pictures and OfficeArt shapes.
+  - Encrypted files are refused. Fuzzed by the `sheets_*`, `slides_*` and
+    `docs_*` targets (docs/FUZZING.md). See NOTICE for the specifications
+    and data they are written from.
 
 The crate is `forbid(unsafe_code)`.
 
@@ -53,5 +122,12 @@ let rgba = pixels.to_rgba8();
 # Ok::<(), Box<dyn std::error::Error>>(())
 ```
 
+```rust,ignore
+// With the `office-sheets` feature.
+use exav_render::sheets::{convert, Format, Limits};
+
+let xlsx = convert(&bytes, Format::Ods, &Limits::default())?.xlsx;
+```
+
 MIT. The vendored decoders keep their licences (`src/image_codecs/`), and
 the NewStroke stroke font its CC0-1.0 dedication (`fonts/`).
diff --git a/crates/exav-render/examples/ifc_stats.rs b/crates/exav-render/examples/ifc_stats.rs
index 65750fd6..0416358f 100644
--- a/crates/exav-render/examples/ifc_stats.rs
+++ b/crates/exav-render/examples/ifc_stats.rs
@@ -115,7 +115,18 @@ fn print_stats(s: &Scene) {
         let closed = !edges.is_empty() && edges.values().all(|&n| n == 2);
         println!(
             "{{\"id\":{},\"class\":\"{}\",\"triangles\":{},\"min\":[{},{},{}],\"max\":[{},{},{}],\"area\":{},\"volume\":{},\"closed\":{}}}",
-            e.id, e.class, triangles, lo[0], lo[1], lo[2], hi[0], hi[1], hi[2], area, volume, closed
+            e.id,
+            e.class,
+            triangles,
+            lo[0],
+            lo[1],
+            lo[2],
+            hi[0],
+            hi[1],
+            hi[2],
+            area,
+            volume,
+            closed
         );
     }
 }
diff --git a/crates/exav-render/examples/office_docs_convert.rs b/crates/exav-render/examples/office_docs_convert.rs
new file mode 100644
index 00000000..8e73f52d
--- /dev/null
+++ b/crates/exav-render/examples/office_docs_convert.rs
@@ -0,0 +1,108 @@
+//! Converts files from the command line:
+//! `cargo run -p exav-render --features office-docs --example office_docs_convert -- <command>`.
+//!
+//! `convert one <format> <in> <out.docx>` converts one file.
+//! `convert batch <format> <in dir> <out dir>` converts every file of a
+//! directory, writing `<out dir>/<name>.docx` and printing one JSON line
+//! per file: its name, the outcome, the time in microseconds, the size of
+//! the DOCX, and the warnings.
+
+use exav_render::docs::{Format, Limits, convert};
+use std::time::Instant;
+
+fn format(name: &str) -> Format {
+    Format::from_extension(name).unwrap_or_else(|| {
+        eprintln!("unknown format {name}");
+        std::process::exit(2);
+    })
+}
+
+fn json(s: &str) -> String {
+    let mut o = String::from("\"");
+    for c in s.chars() {
+        match c {
+            '"' => o.push_str("\\\""),
+            '\\' => o.push_str("\\\\"),
+            '\n' => o.push_str("\\n"),
+            c if (c as u32) < 0x20 => o.push(' '),
+            c => o.push(c),
+        }
+    }
+    o.push('"');
+    o
+}
+
+fn main() {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    let limits = Limits::default();
+    match args.iter().map(String::as_str).collect::<Vec<_>>()[..] {
+        ["one", fmt, input, output] => {
+            let bytes = std::fs::read(input).expect("read the input");
+            match convert(&bytes, format(fmt), &limits) {
+                Ok(c) => {
+                    std::fs::write(output, &c.docx).expect("write the output");
+                    for w in &c.warnings {
+                        eprintln!("warning: {w}");
+                    }
+                }
+                Err(e) => {
+                    eprintln!("{}: {e}", e.kind());
+                    std::process::exit(1);
+                }
+            }
+        }
+        ["batch", fmt, dir, out] => {
+            let fmt = format(fmt);
+            std::fs::create_dir_all(out).expect("create the output directory");
+            let mut names: Vec<_> = std::fs::read_dir(dir)
+                .expect("read the directory")
+                .filter_map(|e| e.ok())
+                .map(|e| e.path())
+                .collect();
+            names.sort();
+            for p in names {
+                let name = p
+                    .file_name()
+                    .unwrap_or_default()
+                    .to_string_lossy()
+                    .to_string();
+                let Ok(bytes) = std::fs::read(&p) else {
+                    continue;
+                };
+                let t = Instant::now();
+                let r = std::panic::catch_unwind(|| convert(&bytes, fmt, &Limits::default()));
+                let us = t.elapsed().as_micros();
+                match r {
+                    Ok(Ok(c)) => {
+                        let stem = name.rsplit_once('.').map(|s| s.0).unwrap_or(&name);
+                        std::fs::write(format!("{out}/{stem}.docx"), &c.docx).expect("write");
+                        let w: Vec<String> = c.warnings.iter().map(|w| json(w)).collect();
+                        println!(
+                            "{{\"name\":{},\"ok\":true,\"us\":{us},\"size\":{},\"paragraphs\":{},\"warnings\":[{}]}}",
+                            json(&name),
+                            c.docx.len(),
+                            c.paragraphs,
+                            w.join(",")
+                        );
+                    }
+                    Ok(Err(e)) => println!(
+                        "{{\"name\":{},\"ok\":false,\"kind\":\"{}\",\"error\":{},\"us\":{us}}}",
+                        json(&name),
+                        e.kind(),
+                        json(&e.to_string())
+                    ),
+                    Err(_) => println!(
+                        "{{\"name\":{},\"ok\":false,\"kind\":\"panic\",\"error\":\"panic\",\"us\":{us}}}",
+                        json(&name)
+                    ),
+                }
+            }
+        }
+        _ => {
+            eprintln!(
+                "usage: convert one <format> <in> <out> | convert batch <format> <dir> <out dir>"
+            );
+            std::process::exit(2);
+        }
+    }
+}
diff --git a/crates/exav-render/examples/office_slides_convert.rs b/crates/exav-render/examples/office_slides_convert.rs
new file mode 100644
index 00000000..272bff3a
--- /dev/null
+++ b/crates/exav-render/examples/office_slides_convert.rs
@@ -0,0 +1,106 @@
+//! Converts presentations and drawings from the command line:
+//! `cargo run -p exav-render --features office-slides --example office_slides_convert -- <command>`.
+//!
+//! `one <format> <in> <out.pptx>` converts one file.
+//! `batch <format> <in dir> <out dir>` converts every file of a directory,
+//! writing `<out dir>/<name>.pptx` and printing one JSON line per file: its
+//! name, the outcome, the time in microseconds, the size of the PPTX, the
+//! slides, and the warnings.
+
+use exav_render::slides::{Format, Limits, convert};
+use std::time::Instant;
+
+fn format(name: &str) -> Format {
+    Format::from_extension(name).unwrap_or_else(|| {
+        eprintln!("unknown format {name}");
+        std::process::exit(2);
+    })
+}
+
+fn json(s: &str) -> String {
+    let mut o = String::from("\"");
+    for c in s.chars() {
+        match c {
+            '"' => o.push_str("\\\""),
+            '\\' => o.push_str("\\\\"),
+            '\n' => o.push_str("\\n"),
+            c if (c as u32) < 0x20 => o.push(' '),
+            c => o.push(c),
+        }
+    }
+    o.push('"');
+    o
+}
+
+fn main() {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    let limits = Limits::default();
+    match args.iter().map(String::as_str).collect::<Vec<_>>()[..] {
+        ["one", fmt, input, output] => {
+            let bytes = std::fs::read(input).expect("read the input");
+            match convert(&bytes, format(fmt), &limits) {
+                Ok(c) => {
+                    std::fs::write(output, &c.pptx).expect("write the output");
+                    for w in &c.warnings {
+                        eprintln!("warning: {w}");
+                    }
+                }
+                Err(e) => {
+                    eprintln!("{}: {e}", e.kind());
+                    std::process::exit(1);
+                }
+            }
+        }
+        ["batch", fmt, dir, out] => {
+            let fmt = format(fmt);
+            std::fs::create_dir_all(out).expect("create the output directory");
+            let mut names: Vec<_> = std::fs::read_dir(dir)
+                .expect("read the directory")
+                .filter_map(|e| e.ok())
+                .map(|e| e.path())
+                .collect();
+            names.sort();
+            for p in names {
+                let name = p
+                    .file_name()
+                    .unwrap_or_default()
+                    .to_string_lossy()
+                    .to_string();
+                let Ok(bytes) = std::fs::read(&p) else {
+                    continue;
+                };
+                let t = Instant::now();
+                let r = std::panic::catch_unwind(|| convert(&bytes, fmt, &Limits::default()));
+                let us = t.elapsed().as_micros();
+                match r {
+                    Ok(Ok(c)) => {
+                        let stem = name.rsplit_once('.').map(|s| s.0).unwrap_or(&name);
+                        std::fs::write(format!("{out}/{stem}.pptx"), &c.pptx).expect("write");
+                        let w: Vec<String> = c.warnings.iter().map(|w| json(w)).collect();
+                        println!(
+                            "{{\"name\":{},\"ok\":true,\"us\":{us},\"size\":{},\"slides\":{},\"warnings\":[{}]}}",
+                            json(&name),
+                            c.pptx.len(),
+                            c.slides,
+                            w.join(",")
+                        );
+                    }
+                    Ok(Err(e)) => println!(
+                        "{{\"name\":{},\"ok\":false,\"kind\":\"{}\",\"error\":{},\"us\":{us}}}",
+                        json(&name),
+                        e.kind(),
+                        json(&e.to_string())
+                    ),
+                    Err(_) => println!(
+                        "{{\"name\":{},\"ok\":false,\"kind\":\"panic\",\"error\":\"panic\",\"us\":{us}}}",
+                        json(&name)
+                    ),
+                }
+            }
+        }
+        _ => {
+            eprintln!("usage: one <format> <in> <out> | batch <format> <dir> <out dir>");
+            std::process::exit(2);
+        }
+    }
+}
diff --git a/crates/exav-render/examples/office_text.rs b/crates/exav-render/examples/office_text.rs
new file mode 100644
index 00000000..5493b8f2
--- /dev/null
+++ b/crates/exav-render/examples/office_text.rs
@@ -0,0 +1,87 @@
+//! The text of office documents, as the scanner and `exav-grep --text` read it:
+//! `cargo run --release -p exav-render --features text-office --example office_text -- <command>`.
+//!
+//! `one <file>` prints the file's sections and its text, and the links.
+//! `bench <dir>` reads every file of a directory (not recursively) and prints
+//! one JSON line each, the name, the outcome, the microseconds and the text's
+//! bytes, then the totals.
+
+use exav_render::text::visible_text;
+use std::time::Instant;
+
+fn main() {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    let limits = exav_unpack::Limits::default();
+    match args.iter().map(String::as_str).collect::<Vec<_>>()[..] {
+        ["one", file] => {
+            let data = std::fs::read(file).expect("read the file");
+            let name = file.rsplit('/').next().unwrap_or(file);
+            match visible_text(name, &data, 1 << 24, &limits) {
+                None => println!("no text view"),
+                Some(v) => {
+                    if let Some(why) = &v.unreadable {
+                        println!("unreadable: {why}");
+                    }
+                    for (label, range) in &v.sections {
+                        println!("--- {label} ({} bytes)", range.len());
+                    }
+                    print!("{}", v.text);
+                    for (label, target) in &v.links {
+                        println!("link: {label} -> {target}");
+                    }
+                }
+            }
+        }
+        ["bench", dir] => {
+            let mut names: Vec<_> = std::fs::read_dir(dir)
+                .expect("read the directory")
+                .filter_map(|e| e.ok())
+                .map(|e| e.path())
+                .filter(|p| p.is_file())
+                .collect();
+            names.sort();
+            let (mut bytes, mut micros, mut read) = (0u64, 0u128, 0u32);
+            for p in names {
+                let Ok(data) = std::fs::read(&p) else {
+                    continue;
+                };
+                let name = p
+                    .file_name()
+                    .unwrap_or_default()
+                    .to_string_lossy()
+                    .to_string();
+                let t = Instant::now();
+                let r = std::panic::catch_unwind(|| {
+                    visible_text(&name, &data, 1 << 24, &exav_unpack::Limits::default())
+                });
+                let us = t.elapsed().as_micros();
+                let outcome = match &r {
+                    Ok(Some(v)) if v.unreadable.is_some() => "unreadable",
+                    Ok(Some(_)) => "text",
+                    Ok(None) => "none",
+                    Err(_) => "panic",
+                };
+                let text = match &r {
+                    Ok(Some(v)) => v.text.len(),
+                    _ => 0,
+                };
+                if outcome == "text" {
+                    bytes += data.len() as u64;
+                    micros += us;
+                    read += 1;
+                }
+                println!(
+                    "{{\"name\":{name:?},\"outcome\":\"{outcome}\",\"us\":{us},\"text\":{text}}}"
+                );
+            }
+            println!(
+                "{{\"documents\":{read},\"input_bytes\":{bytes},\"us\":{micros},\"mb_per_s\":{:.1}}}",
+                bytes as f64 / micros.max(1) as f64
+            );
+        }
+        _ => {
+            eprintln!("usage: one <file> | bench <dir>");
+            std::process::exit(2);
+        }
+    }
+}
diff --git a/crates/exav-render/examples/raw_preview.rs b/crates/exav-render/examples/raw_preview.rs
new file mode 100644
index 00000000..bd99a3e3
--- /dev/null
+++ b/crates/exav-render/examples/raw_preview.rs
@@ -0,0 +1,73 @@
+//! Print what the RAW reader makes of each file given: its family, the
+//! preview chosen, and how long it took, one tab-separated line a file. With
+//! `--png DIR`, the preview is also saved there as `<file name>.png`.
+//!
+//!     cargo run --release -p exav-render --example raw_preview -- \
+//!         [--png DIR] [--budget BYTES] <file>...
+
+use std::time::Instant;
+
+use exav_render::image::DECODE_MAX;
+use exav_render::image::raw;
+
+fn main() {
+    let mut args = std::env::args().skip(1).peekable();
+    let (mut png_dir, mut budget) = (None, DECODE_MAX);
+    let mut files = Vec::new();
+    while let Some(a) = args.next() {
+        match a.as_str() {
+            "--png" => png_dir = args.next(),
+            "--budget" => budget = args.next().and_then(|v| v.parse().ok()).unwrap_or(budget),
+            _ => files.push(a),
+        }
+    }
+    for f in files {
+        let data = match std::fs::read(&f) {
+            Ok(d) => d,
+            Err(e) => {
+                println!("{f}\tERR\tread: {e}");
+                continue;
+            }
+        };
+        let name = std::path::Path::new(&f)
+            .file_name()
+            .map_or_else(String::new, |n| n.to_string_lossy().into_owned());
+        let started = Instant::now();
+        let result = raw::preview(&data, budget);
+        let ms = started.elapsed().as_millis();
+        match result {
+            Ok((pixels, info)) => {
+                println!(
+                    "{name}\t{}\t{}x{}\to{}\t{}\tfound {}\tout {}x{}\t{ms} ms",
+                    info.kind.name(),
+                    info.width,
+                    info.height,
+                    info.orientation,
+                    if info.jpeg { "jpeg" } else { "samples" },
+                    info.found,
+                    pixels.width,
+                    pixels.height,
+                );
+                if let Some(dir) = &png_dir {
+                    let rgba = pixels.to_rgba8();
+                    if let Some(img) = image::RgbaImage::from_raw(pixels.width, pixels.height, rgba)
+                    {
+                        let _ = img.save(format!("{dir}/{name}.png"));
+                    }
+                }
+            }
+            // Not a RAW file for the reader: `decode_any` reads it as the
+            // image it may be (a plain TIFF).
+            Err(exav_render::image::Error::Unsupported) => {
+                match exav_render::image::decode_any(&data, budget) {
+                    Ok(p) => println!("{name}\tOTHER\t{}x{}\t{ms} ms", p.width, p.height),
+                    Err(e) => println!("{name}\t-\tERR\t{e}\t{ms} ms"),
+                }
+            }
+            Err(e) => match raw::detect(&data) {
+                Some(kind) => println!("{name}\t{}\tERR\t{e}\t{ms} ms", kind.name()),
+                None => println!("{name}\t-\tERR\t{e}\t{ms} ms"),
+            },
+        }
+    }
+}
diff --git a/crates/exav-render/examples/scene_stats.rs b/crates/exav-render/examples/scene_stats.rs
index 61d471b2..34d547e3 100644
--- a/crates/exav-render/examples/scene_stats.rs
+++ b/crates/exav-render/examples/scene_stats.rs
@@ -17,7 +17,7 @@ use std::fmt::Write as _;
 
 use exav_render::cad::EntityKind;
 use exav_render::dwg::{
-    Document, Drawing, Tessellator, FILL_BYTES, STROKE_BYTES, TEXT_RECORD_BYTES,
+    Document, Drawing, FILL_BYTES, STROKE_BYTES, TEXT_RECORD_BYTES, Tessellator,
 };
 
 /// Cells per side of the occupancy grids.
@@ -222,9 +222,11 @@ fn summarise(out: &mut String, d: &Drawing) {
             .map(|b| String::from_utf8_lossy(b).into_owned())
             .unwrap_or_default();
         texts.push(format!(
-            "{s}|h={}|rot={}|align={},{}|face={}|rgba={:08x}",
+            "{s}|u={},{}|v={},{}|align={},{}|face={}|rgba={:08x}",
             sig(f32_at(r, 8)),
             sig(f32_at(r, 12)),
+            sig(f32_at(r, 16)),
+            sig(f32_at(r, 20)),
             r[38],
             r[39],
             r[44],
diff --git a/crates/exav-render/scripts/font-tables.py b/crates/exav-render/scripts/font-tables.py
index f42c1f89..ff9b503a 100644
--- a/crates/exav-render/scripts/font-tables.py
+++ b/crates/exav-render/scripts/font-tables.py
@@ -44,8 +44,14 @@
         0x2206, 0x2300,                  # increment, diameter
         0x2264, 0x2265, 0x2260,          # <=, >=, !=
         0x00B0, 0x00B1, 0x00B2, 0x00B3,  # already dense, listed to assert
-        0x03A9, 0x03BC,                  # ohm, micro
+        0x2200, 0x2203, 0x220B, 0x2217,  # Symbol's for all, exists, contains, star
+        0x2212, 0x2234, 0x223C, 0x2245,  # minus, therefore, tilde, congruent
+        0x22A5,                          # perpendicular
     }
+    # Greek, with Symbol's theta, phi and pi symbols, and basic Cyrillic:
+    # what Greek and Russian notes on a sheet are written in.
+    | set(range(0x0384, 0x03D7))
+    | set(range(0x0400, 0x0460))
 )
 
 # Fixed-point divisor for a stored advance, in em units. An advance is under
diff --git a/crates/exav-render/scripts/office/sheets/ftab.json b/crates/exav-render/scripts/office/sheets/ftab.json
new file mode 100644
index 00000000..0de7e7fd
--- /dev/null
+++ b/crates/exav-render/scripts/office/sheets/ftab.json
@@ -0,0 +1,375 @@
+[
+[0, "COUNT", -1],
+[1, "IF", -1],
+[2, "ISNA", 1],
+[3, "ISERROR", 1],
+[4, "SUM", -1],
+[5, "AVERAGE", -1],
+[6, "MIN", -1],
+[7, "MAX", -1],
+[8, "ROW", -1],
+[9, "COLUMN", -1],
+[10, "NA", 0],
+[11, "NPV", -1],
+[12, "STDEV", -1],
+[13, "DOLLAR", -1],
+[14, "FIXED", -1],
+[15, "SIN", 1],
+[16, "COS", 1],
+[17, "TAN", 1],
+[18, "ATAN", 1],
+[19, "PI", 0],
+[20, "SQRT", 1],
+[21, "EXP", 1],
+[22, "LN", 1],
+[23, "LOG10", 1],
+[24, "ABS", 1],
+[25, "INT", 1],
+[26, "SIGN", 1],
+[27, "ROUND", 2],
+[28, "LOOKUP", -1],
+[29, "INDEX", -1],
+[30, "REPT", 2],
+[31, "MID", 3],
+[32, "LEN", 1],
+[33, "VALUE", 1],
+[34, "TRUE", 0],
+[35, "FALSE", 0],
+[36, "AND", -1],
+[37, "OR", -1],
+[38, "NOT", 1],
+[39, "MOD", 2],
+[40, "DCOUNT", 3],
+[41, "DSUM", 3],
+[42, "DAVERAGE", 3],
+[43, "DMIN", 3],
+[44, "DMAX", 3],
+[45, "DSTDEV", 3],
+[46, "VAR", -1],
+[47, "DVAR", 3],
+[48, "TEXT", 2],
+[49, "LINEST", -1],
+[50, "TREND", -1],
+[51, "LOGEST", -1],
+[52, "GROWTH", -1],
+[53, "GOTO", 1],
+[54, "HALT", -1],
+[55, "RETURN", -1],
+[56, "PV", -1],
+[57, "FV", -1],
+[58, "NPER", -1],
+[59, "PMT", -1],
+[60, "RATE", -1],
+[61, "MIRR", 3],
+[62, "IRR", -1],
+[63, "RAND", 0],
+[64, "MATCH", -1],
+[65, "DATE", 3],
+[66, "TIME", 3],
+[67, "DAY", 1],
+[68, "MONTH", 1],
+[69, "YEAR", 1],
+[70, "WEEKDAY", -1],
+[71, "HOUR", 1],
+[72, "MINUTE", 1],
+[73, "SECOND", 1],
+[74, "NOW", 0],
+[75, "AREAS", 1],
+[76, "ROWS", 1],
+[77, "COLUMNS", 1],
+[78, "OFFSET", -1],
+[79, "ABSREF", 2],
+[80, "RELREF", 2],
+[81, "ARGUMENT", -1],
+[82, "SEARCH", -1],
+[83, "TRANSPOSE", 1],
+[84, "ERROR", -1],
+[85, "STEP", 0],
+[86, "TYPE", 1],
+[87, "ECHO", -1],
+[88, "SET.NAME", -1],
+[89, "CALLER", 0],
+[90, "DEREF", 1],
+[91, "WINDOWS", -1],
+[92, "SERIES", -1],
+[93, "DOCUMENTS", -1],
+[94, "ACTIVE.CELL", 0],
+[95, "SELECTION", 0],
+[96, "RESULT", -1],
+[97, "ATAN2", 2],
+[98, "ASIN", 1],
+[99, "ACOS", 1],
+[100, "CHOOSE", -1],
+[101, "HLOOKUP", -1],
+[102, "VLOOKUP", -1],
+[103, "LINKS", -1],
+[104, "INPUT", -1],
+[105, "ISREF", 1],
+[106, "GET.FORMULA", 1],
+[107, "GET.NAME", -1],
+[108, "SET.VALUE", 2],
+[109, "LOG", -1],
+[110, "EXEC", -1],
+[111, "CHAR", 1],
+[112, "LOWER", 1],
+[113, "UPPER", 1],
+[114, "PROPER", 1],
+[115, "LEFT", -1],
+[116, "RIGHT", -1],
+[117, "EXACT", 2],
+[118, "TRIM", 1],
+[119, "REPLACE", 4],
+[120, "SUBSTITUTE", -1],
+[121, "CODE", 1],
+[122, "NAMES", -1],
+[123, "DIRECTORY", -1],
+[124, "FIND", -1],
+[125, "CELL", -1],
+[126, "ISERR", 1],
+[127, "ISTEXT", 1],
+[128, "ISNUMBER", 1],
+[129, "ISBLANK", 1],
+[130, "T", 1],
+[131, "N", 1],
+[132, "FOPEN", -1],
+[133, "FCLOSE", 1],
+[134, "FSIZE", 1],
+[135, "FREADLN", 1],
+[136, "FREAD", 2],
+[137, "FWRITELN", 2],
+[138, "FWRITE", 2],
+[139, "FPOS", -1],
+[140, "DATEVALUE", 1],
+[141, "TIMEVALUE", 1],
+[142, "SLN", 3],
+[143, "SYD", 4],
+[144, "DDB", -1],
+[145, "GET.DEF", -1],
+[146, "REFTEXT", -1],
+[147, "TEXTREF", -1],
+[148, "INDIRECT", -1],
+[149, "REGISTER", -1],
+[150, "CALL", -1],
+[151, "ADD.BAR", -1],
+[152, "ADD.MENU", -1],
+[153, "ADD.COMMAND", -1],
+[154, "ENABLE.COMMAND", -1],
+[155, "CHECK.COMMAND", -1],
+[156, "RENAME.COMMAND", -1],
+[157, "SHOW.BAR", -1],
+[158, "DELETE.MENU", -1],
+[159, "DELETE.COMMAND", -1],
+[160, "GET.CHART.ITEM", -1],
+[161, "DIALOG.BOX", 1],
+[162, "CLEAN", 1],
+[163, "MDETERM", 1],
+[164, "MINVERSE", 1],
+[165, "MMULT", 2],
+[166, "FILES", -1],
+[167, "IPMT", -1],
+[168, "PPMT", -1],
+[169, "COUNTA", -1],
+[170, "CANCEL.KEY", -1],
+[171, "FOR", -1],
+[172, "WHILE", 1],
+[173, "BREAK", 0],
+[174, "NEXT", 0],
+[175, "INITIATE", 2],
+[176, "REQUEST", 2],
+[177, "POKE", 3],
+[178, "EXECUTE", 2],
+[179, "TERMINATE", 1],
+[180, "RESTART", -1],
+[181, "HELP", -1],
+[182, "GET.BAR", -1],
+[183, "PRODUCT", -1],
+[184, "FACT", 1],
+[185, "GET.CELL", -1],
+[186, "GET.WORKSPACE", 1],
+[187, "GET.WINDOW", -1],
+[188, "GET.DOCUMENT", -1],
+[189, "DPRODUCT", 3],
+[190, "ISNONTEXT", 1],
+[191, "GET.NOTE", -1],
+[192, "NOTE", -1],
+[193, "STDEVP", -1],
+[194, "VARP", -1],
+[195, "DSTDEVP", 3],
+[196, "DVARP", 3],
+[197, "TRUNC", -1],
+[198, "ISLOGICAL", 1],
+[199, "DCOUNTA", 3],
+[200, "DELETE.BAR", 1],
+[201, "UNREGISTER", 1],
+[204, "USDOLLAR", -1],
+[205, "FINDB", -1],
+[206, "SEARCHB", -1],
+[207, "REPLACEB", 4],
+[208, "LEFTB", -1],
+[209, "RIGHTB", -1],
+[210, "MIDB", 3],
+[211, "LENB", 1],
+[212, "ROUNDUP", 2],
+[213, "ROUNDDOWN", 2],
+[214, "ASC", 1],
+[215, "DBCS", 1],
+[216, "RANK", -1],
+[219, "ADDRESS", -1],
+[220, "DAYS360", -1],
+[221, "TODAY", 0],
+[222, "VDB", -1],
+[223, "ELSE", 0],
+[224, "ELSE.IF", 1],
+[225, "END.IF", 0],
+[226, "FOR.CELL", -1],
+[227, "MEDIAN", -1],
+[228, "SUMPRODUCT", -1],
+[229, "SINH", 1],
+[230, "COSH", 1],
+[231, "TANH", 1],
+[232, "ASINH", 1],
+[233, "ACOSH", 1],
+[234, "ATANH", 1],
+[235, "DGET", 3],
+[236, "CREATE.OBJECT", -1],
+[237, "VOLATILE", -1],
+[238, "LAST.ERROR", 0],
+[239, "CUSTOM.UNDO", -1],
+[240, "CUSTOM.REPEAT", -1],
+[241, "FORMULA.CONVERT", -1],
+[242, "GET.LINK.INFO", -1],
+[243, "TEXT.BOX", -1],
+[244, "INFO", 1],
+[245, "GROUP", 0],
+[246, "GET.OBJECT", -1],
+[247, "DB", -1],
+[248, "PAUSE", -1],
+[251, "RESUME", -1],
+[252, "FREQUENCY", 2],
+[253, "ADD.TOOLBAR", -1],
+[254, "DELETE.TOOLBAR", 1],
+[255, "User Defined Function", -1],
+[256, "RESET.TOOLBAR", 1],
+[257, "EVALUATE", 1],
+[258, "GET.TOOLBAR", -1],
+[259, "GET.TOOL", -1],
+[260, "SPELLING.CHECK", -1],
+[261, "ERROR.TYPE", 1],
+[262, "APP.TITLE", -1],
+[263, "WINDOW.TITLE", -1],
+[264, "SAVE.TOOLBAR", -1],
+[265, "ENABLE.TOOL", 3],
+[266, "PRESS.TOOL", 3],
+[267, "REGISTER.ID", -1],
+[268, "GET.WORKBOOK", -1],
+[269, "AVEDEV", -1],
+[270, "BETADIST", -1],
+[271, "GAMMALN", 1],
+[272, "BETAINV", -1],
+[273, "BINOMDIST", 4],
+[274, "CHIDIST", 2],
+[275, "CHIINV", 2],
+[276, "COMBIN", 2],
+[277, "CONFIDENCE", 3],
+[278, "CRITBINOM", 3],
+[279, "EVEN", 1],
+[280, "EXPONDIST", 3],
+[281, "FDIST", 3],
+[282, "FINV", 3],
+[283, "FISHER", 1],
+[284, "FISHERINV", 1],
+[285, "FLOOR", 2],
+[286, "GAMMADIST", 4],
+[287, "GAMMAINV", 3],
+[288, "CEILING", 2],
+[289, "HYPGEOMDIST", 4],
+[290, "LOGNORMDIST", 3],
+[291, "LOGINV", 3],
+[292, "NEGBINOMDIST", 3],
+[293, "NORMDIST", 4],
+[294, "NORMSDIST", 1],
+[295, "NORMINV", 3],
+[296, "NORMSINV", 1],
+[297, "STANDARDIZE", 3],
+[298, "ODD", 1],
+[299, "PERMUT", 2],
+[300, "POISSON", 3],
+[301, "TDIST", 3],
+[302, "WEIBULL", 4],
+[303, "SUMXMY2", 2],
+[304, "SUMX2MY2", 2],
+[305, "SUMX2PY2", 2],
+[306, "CHITEST", 2],
+[307, "CORREL", 2],
+[308, "COVAR", 2],
+[309, "FORECAST", 3],
+[310, "FTEST", 2],
+[311, "INTERCEPT", 2],
+[312, "PEARSON", 2],
+[313, "RSQ", 2],
+[314, "STEYX", 2],
+[315, "SLOPE", 2],
+[316, "TTEST", 4],
+[317, "PROB", -1],
+[318, "DEVSQ", -1],
+[319, "GEOMEAN", -1],
+[320, "HARMEAN", -1],
+[321, "SUMSQ", -1],
+[322, "KURT", -1],
+[323, "SKEW", -1],
+[324, "ZTEST", -1],
+[325, "LARGE", 2],
+[326, "SMALL", 2],
+[327, "QUARTILE", 2],
+[328, "PERCENTILE", 2],
+[329, "PERCENTRANK", -1],
+[330, "MODE", -1],
+[331, "TRIMMEAN", 2],
+[332, "TINV", 2],
+[334, "MOVIE.COMMAND", -1],
+[335, "GET.MOVIE", -1],
+[336, "CONCATENATE", -1],
+[337, "POWER", 2],
+[338, "PIVOT.ADD.DATA", -1],
+[339, "GET.PIVOT.TABLE", -1],
+[340, "GET.PIVOT.FIELD", -1],
+[341, "GET.PIVOT.ITEM", -1],
+[342, "RADIANS", 1],
+[343, "DEGREES", 1],
+[344, "SUBTOTAL", -1],
+[345, "SUMIF", -1],
+[346, "COUNTIF", 2],
+[347, "COUNTBLANK", 1],
+[348, "SCENARIO.GET", -1],
+[349, "OPTIONS.LISTS.GET", 1],
+[350, "ISPMT", 4],
+[351, "DATEDIF", 3],
+[352, "DATESTRING", 1],
+[353, "NUMBERSTRING", 2],
+[354, "ROMAN", -1],
+[355, "OPEN.DIALOG", -1],
+[356, "SAVE.DIALOG", -1],
+[357, "VIEW.GET", -1],
+[358, "GETPIVOTDATA", -1],
+[359, "HYPERLINK", -1],
+[360, "PHONETIC", 1],
+[361, "AVERAGEA", -1],
+[362, "MAXA", -1],
+[363, "MINA", -1],
+[364, "STDEVPA", -1],
+[365, "VARPA", -1],
+[366, "STDEVA", -1],
+[367, "VARA", -1],
+[368, "BAHTTEXT", 1],
+[369, "THAIDAYOFWEEK", 1],
+[370, "THAIDIGIT", 1],
+[371, "THAIMONTHOFYEAR", 1],
+[372, "THAINUMSOUND", 1],
+[373, "THAINUMSTRING", 1],
+[374, "THAISTRINGLENGTH", 1],
+[375, "ISTHAIDIGIT", 1],
+[376, "ROUNDBAHTDOWN", 1],
+[377, "ROUNDBAHTUP", 1],
+[378, "THAIYEAR", 1],
+[379, "RTD", -1]
+]
diff --git a/crates/exav-render/scripts/office/sheets/ftab.py b/crates/exav-render/scripts/office/sheets/ftab.py
new file mode 100644
index 00000000..a9875a46
--- /dev/null
+++ b/crates/exav-render/scripts/office/sheets/ftab.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+"""Writes src/formats/office/sheets/xls/ftab.rs, the table of Excel's built-in
+functions by their BIFF index, from scripts/office/sheets/ftab.json: rows of
+[index, name, fixed argument count or -1], with the names of [MS-XLS]
+2.5.198.17 Ftab and the argument counts of OpenOffice.org's Excel file format
+documentation, 3.11.
+
+usage, from crates/exav-render:
+python3 -I scripts/office/sheets/ftab.py scripts/office/sheets/ftab.json > src/formats/office/sheets/xls/ftab.rs
+"""
+import json
+import sys
+
+rows = sorted(json.load(open(sys.argv[1])), key=lambda r: r[0])
+print("// Generated by scripts/office/sheets/ftab.py from ftab.json. Do not edit.")
+print()
+print("/// (BIFF function index, name, fixed argument count or -1), by index.")
+print("#[rustfmt::skip]")
+print("pub(crate) const FTAB: &[(u16, &str, i8)] = &[")
+for i, name, n in rows:
+    print(f'    ({i}, "{name}", {n}),')
+print("];")
diff --git a/crates/exav-render/scripts/office/sheets/numbers_fonts.py b/crates/exav-render/scripts/office/sheets/numbers_fonts.py
new file mode 100644
index 00000000..476e46ba
--- /dev/null
+++ b/crates/exav-render/scripts/office/sheets/numbers_fonts.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+"""Writes src/formats/office/sheets/numbers/fonts.rs: the PostScript names of
+macOS fonts whose family the rule in style::family (split at '-', drop an MT
+or PSMT suffix, a space before each capital that follows a lower-case letter)
+gets wrong, from numbers-parser's src/numbers_parser/generated/fontmap.py
+(MIT, Jon Connell).
+
+usage, from crates/exav-render:
+python3 -I scripts/office/sheets/numbers_fonts.py fontmap.py > src/formats/office/sheets/numbers/fonts.rs
+"""
+import ast
+import sys
+
+text = open(sys.argv[1]).read()
+fonts = ast.literal_eval(text[text.index("{"):])
+
+
+def rule(ps):
+    base = ps.split("-", 1)[0]
+    for suffix in ("PSMT", "MT"):
+        if base.endswith(suffix):
+            base = base[: -len(suffix)]
+            break
+    out = ""
+    prev_lower = False
+    for c in base:
+        if c.isupper() and prev_lower:
+            out += " "
+        prev_lower = c.islower()
+        out += c
+    return out
+
+
+rows = sorted((ps, v["family"]) for ps, v in fonts.items() if rule(ps) != v["family"])
+print("// Generated by scripts/office/sheets/numbers_fonts.py from numbers-parser's")
+print("// fontmap.py (MIT, Jon Connell). Do not edit.")
+print()
+print("/// (PostScript name, family), by name.")
+print("#[rustfmt::skip]")
+print("pub(crate) const FAMILIES: &[(&str, &str)] = &[")
+for ps, fam in rows:
+    print(f'    ({ps!r}, {fam!r}),'.replace("'", '"'))
+print("];")
diff --git a/crates/exav-render/scripts/office/sheets/numbers_functions.py b/crates/exav-render/scripts/office/sheets/numbers_functions.py
new file mode 100644
index 00000000..25d91afd
--- /dev/null
+++ b/crates/exav-render/scripts/office/sheets/numbers_functions.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+"""Writes src/formats/office/sheets/numbers/functions.rs, Numbers' function
+indexes (the AST_function_node_index of TSCE formula nodes) to their names,
+from numbers-parser's src/numbers_parser/generated/functionmap.py (MIT, Jon
+Connell), which maps them from the iWork applications.
+
+usage, from crates/exav-render:
+python3 -I scripts/office/sheets/numbers_functions.py functionmap.py > src/formats/office/sheets/numbers/functions.rs
+"""
+import re
+import sys
+
+text = open(sys.argv[1]).read()
+rows = sorted((int(k), v) for k, v in re.findall(r'^\s*(\d+):\s*"([A-Z0-9.]+)"', text, re.M))
+print("// Generated by scripts/office/sheets/numbers_functions.py from numbers-parser's")
+print("// functionmap.py (MIT, Jon Connell). Do not edit.")
+print()
+print("/// (function index, name), by index.")
+print("#[rustfmt::skip]")
+print("pub(crate) const FUNCTIONS: &[(u32, &str)] = &[")
+for k, v in rows:
+    print(f'    ({k}, "{v}"),')
+print("];")
diff --git a/crates/exav-render/src/formats/cad/dwg/blocks.rs b/crates/exav-render/src/formats/cad/dwg/blocks.rs
index 2b3da90a..5aec1b37 100644
--- a/crates/exav-render/src/formats/cad/dwg/blocks.rs
+++ b/crates/exav-render/src/formats/cad/dwg/blocks.rs
@@ -7,10 +7,10 @@ use std::collections::HashSet;
 
 use exav_unpack::dwg::{BitResult, Bits, Object, Version};
 
+use super::Ctx;
 use super::entities::{self, Followers};
 use super::header::Vars;
 use super::tables::{entries, entry_head, lineweight, typed};
-use super::Ctx;
 use crate::formats::cad::model::*;
 use crate::formats::cad::proxy;
 
@@ -35,6 +35,26 @@ struct Record {
 /// first, as DXF's BLOCK_RECORD table has them.
 pub(crate) fn read(ctx: &mut Ctx<'_, '_>, vars: &Vars) -> Vec<Block> {
     let mut handles = entries(ctx, vars.block_control, "the BLOCK control", 2);
+    if handles.is_empty() {
+        // A control that cannot be read (a writer that gets its bit size
+        // wrong) lists nothing: the records are the objects of that type.
+        let dwg = ctx.dwg;
+        handles = dwg
+            .object_map()
+            .iter()
+            .filter(|(_, at)| dwg.type_at(*at) == Ok(BLOCK_HEADER))
+            .map(|(h, _)| *h)
+            .collect();
+        if !handles.is_empty() {
+            ctx.warn(
+                WarningKind::Malformed,
+                format!(
+                    "the block records ({}) were found in the object map",
+                    handles.len()
+                ),
+            );
+        }
+    }
     // The control lists model and paper space last.
     for space in [vars.paper_space, vars.model_space] {
         if let Some(i) = handles.iter().position(|h| *h == space) {
@@ -74,12 +94,19 @@ pub(crate) fn read(ctx: &mut Ctx<'_, '_>, vars: &Vars) -> Vec<Block> {
                 }
             }
         }
-        ctx.names.insert(h, block.name.clone());
         if block.end_handle.0 != 0 {
             let _ = typed(ctx, block.end_handle.0, ENDBLK, "ENDBLK");
         }
-        records.push(rec);
+        records.push((h, rec));
     }
+    number_anonymous(&mut records);
+    let records: Vec<Record> = records
+        .into_iter()
+        .map(|(h, rec)| {
+            ctx.names.insert(h, rec.block.name.clone());
+            rec
+        })
+        .collect();
     let mut out = Vec::new();
     for rec in records {
         let mut block = rec.block;
@@ -112,6 +139,33 @@ pub(crate) fn read(ctx: &mut Ctx<'_, '_>, vars: &Vars) -> Vec<Block> {
     out
 }
 
+/// AutoCAD's files can keep an anonymous block's name without its number in
+/// both its record and its BLOCK entity: several `*U` blocks, each named by
+/// its inserts, and found by that name. Each gets a number past the highest
+/// one the drawing has, as AutoCAD numbers them when it loads the file.
+fn number_anonymous(records: &mut [(u64, Record)]) {
+    let bare = |n: &str| matches!(n.as_bytes(), [b'*', c] if c.is_ascii_alphabetic());
+    let mut next = records
+        .iter()
+        .filter_map(|(_, r)| {
+            let n = &r.block.name;
+            let digits = n
+                .trim_start_matches('*')
+                .trim_start_matches(|c: char| c.is_ascii_alphabetic());
+            (n.starts_with('*') && !digits.is_empty())
+                .then(|| digits.parse::<u64>().ok())
+                .flatten()
+        })
+        .max()
+        .unwrap_or(0);
+    for (_, r) in records.iter_mut() {
+        if bare(&r.block.name) {
+            next = next.saturating_add(1);
+            r.block.name = format!("{}{next}", r.block.name);
+        }
+    }
+}
+
 /// A layout's viewports have no number or status in DWG (spec 20.4.38),
 /// which DXF has (69, 68). As the converter writes them: an on viewport's
 /// number is its place among the layout's viewports from 1 and its status
@@ -556,6 +610,52 @@ fn common(ctx: &mut Ctx<'_, '_>, vars: &Vars, o: &Object<'_>, record: Handle) ->
 mod tests {
     use super::*;
 
+    /// Inserts find their block by name, so two blocks named `*U` drew the
+    /// first one for both (AutoCAD's blocks_and_tables sample).
+    #[test]
+    fn bare_anonymous_names_are_numbered_past_the_highest() {
+        let mut records: Vec<(u64, Record)> = [
+            "*Model_Space",
+            "*Paper_Space0",
+            "*U2",
+            "*U",
+            "*U",
+            "*D",
+            "*B12",
+        ]
+        .iter()
+        .map(|n| {
+            let block = Block {
+                name: (*n).to_string(),
+                ..Block::default()
+            };
+            (
+                0,
+                Record {
+                    block,
+                    first: 0,
+                    last: 0,
+                    owned: Vec::new(),
+                },
+            )
+        })
+        .collect();
+        number_anonymous(&mut records);
+        let names: Vec<&str> = records.iter().map(|(_, r)| r.block.name.as_str()).collect();
+        assert_eq!(
+            names,
+            [
+                "*Model_Space",
+                "*Paper_Space0",
+                "*U2",
+                "*U13",
+                "*U14",
+                "*D15",
+                "*B12"
+            ]
+        );
+    }
+
     #[test]
     fn the_spaces_have_their_names_whatever_the_release_wrote() {
         for (written, read) in [
diff --git a/crates/exav-render/src/formats/cad/dwg/entities.rs b/crates/exav-render/src/formats/cad/dwg/entities.rs
index 4ea60c19..07efd5f9 100644
--- a/crates/exav-render/src/formats/cad/dwg/entities.rs
+++ b/crates/exav-render/src/formats/cad/dwg/entities.rs
@@ -10,8 +10,8 @@
 
 use exav_unpack::dwg::{BitError, BitResult, Bits, EedValue, Object, Version};
 
-use super::tables::cmc;
 use super::Ctx;
+use super::tables::cmc;
 use crate::formats::cad::model::*;
 
 /// The entities an INSERT or a POLYLINE owns (its ATTRIBs, its VERTEXes):
@@ -127,7 +127,7 @@ pub(crate) fn read(
         0x03 => {
             return none(EntityKind::AttributeDefinition(Box::new(attribute(
                 ctx, o, true,
-            )?)))
+            )?)));
         }
         0x07 | 0x08 => {
             let (i, f) = insert(ctx, o, o.type_code == 0x08)?;
@@ -153,6 +153,7 @@ pub(crate) fn read(
         0x29 => return none(EntityKind::XLine(ray(o)?)),
         0x2C => return none(EntityKind::MText(Box::new(mtext(ctx, o)?))),
         0x2D => return none(EntityKind::Leader(Box::new(leader(ctx, o)?))),
+        0x2E => return none(EntityKind::Tolerance(Box::new(tolerance(ctx, o)?))),
         0x2F => return none(EntityKind::MLine(Box::new(mline(ctx, o)?))),
         _ => {}
     }
@@ -169,6 +170,7 @@ pub(crate) fn read(
         }
         "MULTILEADER" => none(EntityKind::MultiLeader(Box::new(multileader(ctx, o)?))),
         "HELIX" => none(EntityKind::Helix(Box::new(helix(ctx, o)?))),
+        "MESH" => none(EntityKind::Mesh(Box::new(mesh(ctx, o)?))),
         "ACAD_TABLE" => none(EntityKind::Table(Box::new(table(ctx, o)?))),
         "PDFUNDERLAY" => none(EntityKind::Underlay(Box::new(underlay(
             ctx,
@@ -401,6 +403,60 @@ fn quad(o: &mut Object<'_>, v: Version) -> BitResult<Quad> {
     })
 }
 
+/// TOLERANCE: R13 and R14 a BS, the height and the gap (BD each), not
+/// kept; then the
+/// insertion, direction and extrusion (3BD each), the text (TV), and the
+/// dimension style in the handle stream.
+fn tolerance(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<Tolerance> {
+    let b = &mut o.data;
+    if ctx.version < Version::R2000 {
+        b.bs()?;
+        b.bd()?;
+        b.bd()?;
+    }
+    let mut t = Tolerance {
+        insertion: v3(b.bd3()?),
+        x_direction: v3(b.bd3()?),
+        extrusion: v3(b.bd3()?),
+        ..Tolerance::default()
+    };
+    t.text = string(ctx, o)?;
+    t.dimstyle = entry(ctx, o, "dimension style")?;
+    Ok(t)
+}
+
+/// MESH: BS version, B blend crease, BL subdivision level, BL vertex count
+/// and the vertices (3BD), BL face list length and the list (BL each), each
+/// face its count then its corners; the edges and creases after it are not
+/// read.
+fn mesh(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<Mesh> {
+    let b = &mut o.data;
+    b.bs()?;
+    b.b()?;
+    b.bl()?;
+    let n = i64::from(b.bl()?);
+    let n = count(b, n, 6)?;
+    let mut m = Mesh::default();
+    for _ in 0..n {
+        let p = v3(o.data.bd3()?);
+        if ctx.room(m.vertices.len()) {
+            m.vertices.push(p);
+        }
+    }
+    let b = &mut o.data;
+    let n = i64::from(b.bl()?);
+    let n = count(b, n, 2)?;
+    let mut list = Vec::new();
+    for _ in 0..n {
+        let k = i64::from(o.data.bl()?);
+        if ctx.room(list.len()) {
+            list.push(k);
+        }
+    }
+    m.faces = Mesh::faces_from_list(&list, m.vertices.len());
+    Ok(m)
+}
+
 fn face3d(o: &mut Object<'_>, v: Version) -> BitResult<Face3D> {
     let b = &mut o.data;
     let mut f = Face3D::default();
@@ -599,6 +655,9 @@ fn insert(
     let block = o.handle_ref()?;
     i.block_name = ctx.name(block).unwrap_or_default().to_string();
     let f = followers(o, v, has_attribs, n)?;
+    if o.xdictionary != 0 {
+        i.clip = super::objects::insert_clip(ctx, o.xdictionary);
+    }
     Ok((i, f))
 }
 
@@ -1565,7 +1624,7 @@ fn image(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<Image> {
         ..Image::default()
     };
     if v >= Version::R2010 {
-        i.clip_inside = b.b()?;
+        i.clip_inverted = b.b()?;
     }
     i.clip_type = b.bs()?;
     if i.clip_type == 1 {
@@ -1662,8 +1721,12 @@ fn viewport(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<Viewport> {
     }
     let frozen = count(&o.handles, frozen, 8)?;
     for _ in 0..frozen {
+        // AutoCAD's files can hold null references here, which name no
+        // layer and which DXF leaves out.
         let h = o.handle_ref()?;
-        push(ctx, &mut p.frozen_layers, Handle(h));
+        if h != 0 {
+            push(ctx, &mut p.frozen_layers, Handle(h));
+        }
     }
     p.clip_boundary = Handle(o.handle_ref()?);
     Ok(p)
diff --git a/crates/exav-render/src/formats/cad/dwg/header.rs b/crates/exav-render/src/formats/cad/dwg/header.rs
index 7bb0fdf4..4c62a0ca 100644
--- a/crates/exav-render/src/formats/cad/dwg/header.rs
+++ b/crates/exav-render/src/formats/cad/dwg/header.rs
@@ -250,7 +250,7 @@ fn variables(s: &mut HeaderStreams<'_>, v: Version, vars: &mut Vars) -> BitResul
     // TDINDWG, TDUSRTIMER
     skip_bl(s, 4)?;
     cmc(s, v)?; // CECOLOR
-                // HANDSEED is in the data stream, also from R2007.
+    // HANDSEED is in the data stream, also from R2007.
     hd.handle_seed = Handle(s.data.h()?.value);
     vars.clayer = h(s)?;
     vars.textstyle = h(s)?;
@@ -308,7 +308,7 @@ fn variables(s: &mut HeaderStreams<'_>, v: Version, vars: &mut Vars) -> BitResul
             s.data.rc()?;
         }
         s.data.b()?; // DIMUPT
-                     // DIMTZIN, DIMALTZ, DIMALTTZ, DIMTAD
+        // DIMTZIN, DIMALTZ, DIMALTTZ, DIMTAD
         for _ in 0..4 {
             s.data.rc()?;
         }
@@ -349,7 +349,7 @@ fn variables(s: &mut HeaderStreams<'_>, v: Version, vars: &mut Vars) -> BitResul
         s.data.bd()?; // DIMALTRND
         s.data.b()?; // DIMALT
         s.data.bs()?; // DIMALTD
-                      // DIMTOFL, DIMSAH, DIMTIX, DIMSOXD
+        // DIMTOFL, DIMSAH, DIMTIX, DIMSOXD
         skip_b(s, 4)?;
     }
     // DIMCLRD, DIMCLRE, DIMCLRT
@@ -361,7 +361,7 @@ fn variables(s: &mut HeaderStreams<'_>, v: Version, vars: &mut Vars) -> BitResul
         // DIMLUNIT, DIMDSEP, DIMTMOVE, DIMJUST
         skip_bs(s, 11)?;
         skip_b(s, 2)?; // DIMSD1, DIMSD2
-                       // DIMTOLJ, DIMTZIN, DIMALTZ, DIMALTTZ
+        // DIMTOLJ, DIMTZIN, DIMALTZ, DIMALTTZ
         skip_bs(s, 4)?;
         s.data.b()?; // DIMUPT
         s.data.bs()?; // DIMATFIT
@@ -438,8 +438,11 @@ fn variables(s: &mut HeaderStreams<'_>, v: Version, vars: &mut Vars) -> BitResul
     }
     if r2004 {
         // SORTENTS, INDEXCTL, HIDETEXT, XCLIPFRAME, DIMASSOC, HALOGAP
-        for _ in 0..6 {
-            s.data.rc()?;
+        for i in 0..6 {
+            let x = s.data.rc()?;
+            if i == 3 {
+                vars.header.xclipframe = i16::from(x);
+            }
         }
         // OBSCUREDCOLOR, INTERSECTIONCOLOR
         skip_bs(s, 2)?;
diff --git a/crates/exav-render/src/formats/cad/dwg/objects.rs b/crates/exav-render/src/formats/cad/dwg/objects.rs
index bdcce728..9e1817b9 100644
--- a/crates/exav-render/src/formats/cad/dwg/objects.rs
+++ b/crates/exav-render/src/formats/cad/dwg/objects.rs
@@ -7,10 +7,10 @@
 
 use exav_unpack::dwg::{BitError, BitResult, Object, Version};
 
+use super::Ctx;
 use super::blocks::number_viewports;
 use super::header::Vars;
 use super::tables::cmc;
-use super::Ctx;
 use crate::formats::cad::model::*;
 
 fn v3(p: [f64; 3]) -> Vec3 {
@@ -243,6 +243,67 @@ pub(crate) fn annotative_columns(ctx: &mut Ctx<'_, '_>, xdictionary: u64) -> Opt
     first.flatten()
 }
 
+/// An insert's XCLIP boundary: its extension dictionary's ACAD_FILTER
+/// dictionary, whose SPATIAL entry is a SPATIAL_FILTER: BS
+/// count (70), 2RD points (10), 3BD extrusion (210), 3BD origin (11), BS
+/// display boundary (71), BS front clip on (72) and BD distance (40) when
+/// set, the same for the back (73, 41), then the inverse insert matrix and
+/// the clip boundary's, 12BD each (40).
+pub(crate) fn insert_clip(ctx: &mut Ctx<'_, '_>, xdictionary: u64) -> Option<InsertClip> {
+    let entry = |entries: Vec<(String, Handle)>, name: &str| {
+        entries
+            .into_iter()
+            .find(|(n, _)| n.eq_ignore_ascii_case(name))
+            .map(|(_, h)| h)
+    };
+    let acad = entry(entries_of(ctx, xdictionary), "ACAD_FILTER")?;
+    let spatial = entry(entries_of(ctx, acad.0), "SPATIAL")?;
+    let mut o = ctx.object(spatial.0, "spatial filter")?;
+    if ctx.dwg.type_name(o.type_code).as_deref() != Some("SPATIAL_FILTER") {
+        return None;
+    }
+    match spatial_filter(ctx, &mut o) {
+        Ok(c) => c,
+        Err(e) => {
+            ctx.warn(
+                WarningKind::Malformed,
+                format!("spatial filter {:X} could not be read: {e}", spatial.0),
+            );
+            None
+        }
+    }
+}
+
+fn spatial_filter(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<Option<InsertClip>> {
+    let b = &mut o.data;
+    let n = i64::from(b.bs()?);
+    let n = count(n, b.remaining(), 128)?;
+    let mut points = Vec::new();
+    for _ in 0..n {
+        let p = v2(b.rd2()?);
+        if ctx.room(points.len()) {
+            points.push(p);
+        }
+    }
+    b.bd3()?; // extrusion
+    b.bd3()?; // origin
+    let enabled = b.bs()? != 0;
+    if b.bs()? != 0 {
+        b.bd()?; // front distance
+    }
+    if b.bs()? != 0 {
+        b.bd()?; // back distance
+    }
+    let mut inverse = [0.0; 12];
+    for m in &mut inverse {
+        *m = b.bd()?;
+    }
+    if points.len() < 2 {
+        return Ok(None);
+    }
+    Ok(Some(InsertClip::from_filter(&points, &inverse, enabled)))
+}
+
 /// An ACDB_MTEXTOBJECTCONTEXTDATA_CLASS object: whether it is the default
 /// context, and its columns.
 fn mtext_context(
diff --git a/crates/exav-render/src/formats/cad/dwg/tables.rs b/crates/exav-render/src/formats/cad/dwg/tables.rs
index 2c46cff7..5efde3b9 100644
--- a/crates/exav-render/src/formats/cad/dwg/tables.rs
+++ b/crates/exav-render/src/formats/cad/dwg/tables.rs
@@ -4,8 +4,8 @@
 
 use exav_unpack::dwg::{BitResult, EedValue, Object, Version};
 
-use super::header::Vars;
 use super::Ctx;
+use super::header::Vars;
 use crate::formats::cad::model::*;
 
 /// The fixed type codes of the tables' objects (spec 20.3).
@@ -248,10 +248,10 @@ fn layer(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<Layer> {
             continue;
         }
         for (code, value) in eed.items(ctx.version) {
-            if let (1071, EedValue::Long(v)) = (code, value) {
-                if let Transparency::Alpha(a) = Transparency::from_code(i64::from(v)) {
-                    l.alpha = a;
-                }
+            if let (1071, EedValue::Long(v)) = (code, value)
+                && let Transparency::Alpha(a) = Transparency::from_code(i64::from(v))
+            {
+                l.alpha = a;
             }
         }
     }
@@ -421,9 +421,8 @@ fn dim_style(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<DimStyle> {
         for _ in 0..11 {
             b.b()?;
         }
-        // DIMALTD, DIMZIN
-        b.rc()?;
-        b.rc()?;
+        b.rc()?; // DIMALTD
+        s.dimzin = i16::from(b.rc()?);
         // DIMSD1, DIMSD2
         b.b()?;
         b.b()?;
@@ -432,12 +431,17 @@ fn dim_style(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<DimStyle> {
             b.rc()?;
         }
         b.b()?; // DIMUPT
-                // DIMTZIN, DIMALTZ, DIMALTTZ, DIMTAD
-        for _ in 0..4 {
+        // DIMTZIN, DIMALTZ, DIMALTTZ
+        for _ in 0..3 {
             b.rc()?;
         }
-        // DIMUNIT, DIMAUNIT, DIMDEC, DIMTDEC, DIMALTU, DIMALTTD
-        for _ in 0..6 {
+        s.dimtad = i16::from(b.rc()?);
+        // DIMUNIT, DIMAUNIT
+        b.bs()?;
+        b.bs()?;
+        s.dimdec = b.bs()?;
+        // DIMTDEC, DIMALTU, DIMALTTD
+        for _ in 0..3 {
             b.bs()?;
         }
         s.dimscale = b.bd()?;
@@ -453,10 +457,11 @@ fn dim_style(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<DimStyle> {
         s.dimtxt = b.bd()?;
         b.bd()?; // DIMCEN
         s.dimtsz = b.bd()?;
-        // DIMALTF, DIMLFAC, DIMTVP, DIMTFAC
-        for _ in 0..4 {
-            b.bd()?;
-        }
+        b.bd()?; // DIMALTF
+        s.dimlfac = b.bd()?;
+        // DIMTVP, DIMTFAC
+        b.bd()?;
+        b.bd()?;
         s.dimgap = b.bd()?;
         // DIMPOST, DIMAPOST, DIMBLK, DIMBLK1, DIMBLK2
         for _ in 0..5 {
@@ -497,25 +502,25 @@ fn dim_style(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<DimStyle> {
         for _ in 0..6 {
             b.b()?;
         }
-        // DIMTAD, DIMZIN, DIMAZIN
-        for _ in 0..3 {
-            b.bs()?;
-        }
+        s.dimtad = b.bs()?;
+        s.dimzin = b.bs()?;
+        b.bs()?; // DIMAZIN
         if ctx.version >= Version::R2007 {
             b.bs()?; // DIMARCSYM
         }
         s.dimtxt = b.bd()?;
         b.bd()?; // DIMCEN
         s.dimtsz = b.bd()?;
-        // DIMALTF, DIMLFAC, DIMTVP, DIMTFAC
-        for _ in 0..4 {
-            b.bd()?;
-        }
+        b.bd()?; // DIMALTF
+        s.dimlfac = b.bd()?;
+        // DIMTVP, DIMTFAC
+        b.bd()?;
+        b.bd()?;
         s.dimgap = b.bd()?;
         b.bd()?; // DIMALTRND
         b.b()?; // DIMALT
         b.bs()?; // DIMALTD
-                 // DIMTOFL, DIMSAH, DIMTIX, DIMSOXD
+        // DIMTOFL, DIMSAH, DIMTIX, DIMSOXD
         for _ in 0..4 {
             b.b()?;
         }
@@ -523,11 +528,16 @@ fn dim_style(ctx: &mut Ctx<'_, '_>, o: &mut Object<'_>) -> BitResult<DimStyle> {
         s.dimclre = cmc(o, ctx.version)?.0;
         s.dimclrt = cmc(o, ctx.version)?.0;
         let b = &mut o.data;
-        // DIMADEC, DIMDEC, DIMTDEC, DIMALTU, DIMALTTD, DIMAUNIT, DIMFRAC,
-        // DIMLUNIT, DIMDSEP, DIMTMOVE, DIMJUST
-        for _ in 0..11 {
+        s.dimadec = b.bs()?;
+        s.dimdec = b.bs()?;
+        // DIMTDEC, DIMALTU, DIMALTTD, DIMAUNIT, DIMFRAC, DIMLUNIT
+        for _ in 0..6 {
             b.bs()?;
         }
+        s.dimdsep = b.bs()?;
+        // DIMTMOVE, DIMJUST
+        b.bs()?;
+        b.bs()?;
         // DIMSD1, DIMSD2
         b.b()?;
         b.b()?;
diff --git a/crates/exav-render/src/formats/cad/dxf/build.rs b/crates/exav-render/src/formats/cad/dxf/build.rs
index 69a8fe84..f6b03c99 100644
--- a/crates/exav-render/src/formats/cad/dxf/build.rs
+++ b/crates/exav-render/src/formats/cad/dxf/build.rs
@@ -223,7 +223,7 @@ pub(crate) fn build(mut raw: Raw, ctx: Ctx<'_>) -> Drawing {
         }
     }
 
-    // The ENTITIES section into the block each entity names as its owner,
+    // The ENTITIES section into the layout each entity names as its owner,
     // or model or paper space by its paper-space flag.
     let mut by_record: HashMap<Handle, usize> = HashMap::new();
     for (i, b) in blocks.iter().enumerate() {
@@ -234,9 +234,17 @@ pub(crate) fn build(mut raw: Raw, ctx: Ctx<'_>) -> Drawing {
         .iter()
         .position(|b| b.name.eq_ignore_ascii_case(PAPER_SPACE));
     for mut e in std::mem::take(&mut raw.entities) {
+        // The owner chooses among the layouts; the section holds no entity of
+        // an ordinary block (a writer that gives the model space's entities
+        // the owner of its first BLOCK is read as the section says).
         let at = by_record
             .get(&e.owner)
             .copied()
+            .filter(|&i| {
+                blocks
+                    .get(i)
+                    .is_some_and(|b| b.is_model_space() || b.is_paper_space())
+            })
             .or(if e.paper_space { paper } else { model });
         let Some(block) = at.and_then(|i| blocks.get_mut(i)) else {
             continue;
@@ -317,6 +325,27 @@ pub(crate) fn build(mut raw: Raw, ctx: Ctx<'_>) -> Drawing {
         }
     }
 
+    // An insert's clipping boundary: its extension dictionary's ACAD_FILTER
+    // dictionary, whose SPATIAL entry is the filter.
+    if !ctx.insert_dictionaries.is_empty() {
+        let dictionaries: HashMap<Handle, &Dictionary> =
+            raw.dictionaries.iter().map(|d| (d.handle, d)).collect();
+        let filter_of = |xdict: u64| -> Option<InsertClip> {
+            let acad = dictionaries.get(&Handle(xdict))?.get("ACAD_FILTER")?;
+            let spatial = dictionaries.get(&acad)?.get("SPATIAL")?;
+            ctx.spatial_filters.get(&spatial.0).cloned()
+        };
+        for b in &mut blocks {
+            for e in &mut b.entities {
+                if let EntityKind::Insert(ins) = &mut e.kind
+                    && let Some(&x) = ctx.insert_dictionaries.get(&e.handle.0)
+                {
+                    ins.clip = filter_of(x);
+                }
+            }
+        }
+    }
+
     Drawing {
         header: raw.header,
         layers: raw.layers,
diff --git a/crates/exav-render/src/formats/cad/dxf/entities.rs b/crates/exav-render/src/formats/cad/dxf/entities.rs
index 2950ef61..5bc3f51c 100644
--- a/crates/exav-render/src/formats/cad/dxf/entities.rs
+++ b/crates/exav-render/src/formats/cad/dxf/entities.rs
@@ -92,6 +92,20 @@ fn plane(p: &mut Plane, t: &Tag<'_>) -> bool {
     p3(&mut p.extrusion, t, 210)
 }
 
+/// A record's extension dictionary: group 360 of its `{ACAD_XDICTIONARY`
+/// application group, which `Parts` sets aside.
+fn xdictionary(tags: &[Tag<'_>]) -> Option<u64> {
+    let start = tags
+        .iter()
+        .position(|t| t.code == 102 && t.is("{ACAD_XDICTIONARY"))?;
+    tags.get(start + 1..)?
+        .iter()
+        .take_while(|t| t.code != 102)
+        .find(|t| t.code == 360)
+        .map(|t| t.handle())
+        .filter(|h| *h != 0)
+}
+
 pub(crate) fn entity(rec: &Record<'_>, ctx: &mut Ctx<'_>) -> Entity {
     let parts = Parts::new(&rec.tags, false);
     let mut e = Entity {
@@ -114,10 +128,17 @@ pub(crate) fn entity(rec: &Record<'_>, ctx: &mut Ctx<'_>) -> Entity {
         "SOLID" => EntityKind::Solid(quad(data)),
         "TRACE" => EntityKind::Trace(quad(data)),
         "3DFACE" => EntityKind::Face3D(face3d(data)),
+        "MESH" => EntityKind::Mesh(Box::new(mesh(data, ctx))),
+        "TOLERANCE" => EntityKind::Tolerance(Box::new(tolerance(data, ctx))),
         "TEXT" => EntityKind::Text(Box::new(text(data, false, ctx).0)),
         "ATTRIB" => EntityKind::Attribute(Box::new(attribute(&parts, data, ctx))),
         "ATTDEF" => EntityKind::AttributeDefinition(Box::new(attribute(&parts, data, ctx))),
-        "INSERT" => EntityKind::Insert(Box::new(insert(data, ctx))),
+        "INSERT" => {
+            if let Some(d) = xdictionary(&rec.tags) {
+                ctx.insert_dictionaries.insert(e.handle.0, d);
+            }
+            EntityKind::Insert(Box::new(insert(data, ctx)))
+        }
         "MTEXT" => {
             let mut m = mtext(data, ctx);
             if m.columns.is_none() {
@@ -163,10 +184,9 @@ pub(crate) fn entity(rec: &Record<'_>, ctx: &mut Ctx<'_>) -> Entity {
 /// AcDbZombieEntity) before the entity's own data.
 fn graphics(parts: &Parts<'_>, ctx: &mut Ctx<'_>) -> Option<Box<ProxyGraphics>> {
     fn sized<'p, 'a>(tags: &'p [Tag<'a>]) -> Option<(i64, &'p [Tag<'a>])> {
-        let at = tags.windows(2).position(|w| {
-            matches!(w.first(), Some(t) if t.code == 92 || t.code == 160)
-                && matches!(w.get(1), Some(t) if t.code == 310)
-        })?;
+        let at = tags
+            .array_windows()
+            .position(|[a, b]| (a.code == 92 || a.code == 160) && b.code == 310)?;
         Some((tags.get(at)?.int(), tags.get(at + 1..)?))
     }
     let (size, chunks) = sized(parts.common())
@@ -436,6 +456,81 @@ fn quad(data: &[Tag<'_>]) -> Quad {
     q
 }
 
+/// MESH: its level 0 cage, 92 vertices (10, 20, 30) and a face list of 93
+/// values (90), each face its corner count then its corners; the edges
+/// (94), creases (95) and overrides after it are not read.
+fn mesh(data: &[Tag<'_>], ctx: &mut Ctx<'_>) -> Mesh {
+    #[derive(PartialEq)]
+    enum At {
+        Head,
+        Vertices,
+        Faces(usize),
+        Tail,
+    }
+    let mut m = Mesh::default();
+    let mut list: Vec<i64> = Vec::new();
+    let mut at = At::Head;
+    for t in data {
+        match (&at, t.code) {
+            (At::Head, 92) => at = At::Vertices,
+            (At::Vertices, 10) => {
+                if ctx.room(m.vertices.len()) {
+                    m.vertices.push(Vec3::new(t.f64(), 0.0, 0.0));
+                }
+            }
+            (At::Vertices, 20) => {
+                if let Some(v) = m.vertices.last_mut() {
+                    v.y = t.f64();
+                }
+            }
+            (At::Vertices, 30) => {
+                if let Some(v) = m.vertices.last_mut() {
+                    v.z = t.f64();
+                }
+            }
+            (At::Head | At::Vertices, 93) => {
+                let n = usize::try_from(t.int()).unwrap_or(0);
+                at = if n > 0 { At::Faces(n) } else { At::Tail };
+            }
+            (At::Faces(left), 90) => {
+                let left = *left;
+                if ctx.room(list.len()) {
+                    list.push(t.int());
+                }
+                at = if left > 1 {
+                    At::Faces(left - 1)
+                } else {
+                    At::Tail
+                };
+            }
+            (_, 94) => at = At::Tail,
+            _ => {}
+        }
+    }
+    m.faces = Mesh::faces_from_list(&list, m.vertices.len());
+    m
+}
+
+/// TOLERANCE: insertion (10), direction (11), extrusion (210), text (1),
+/// dimension style (3).
+fn tolerance(data: &[Tag<'_>], ctx: &mut Ctx<'_>) -> Tolerance {
+    let mut x = Tolerance::default();
+    for t in data {
+        if p3(&mut x.insertion, t, 10)
+            || p3(&mut x.x_direction, t, 11)
+            || p3(&mut x.extrusion, t, 210)
+        {
+            continue;
+        }
+        match t.code {
+            1 => x.text = ctx.text(t),
+            3 => x.dimstyle = ctx.text(t),
+            _ => {}
+        }
+    }
+    x
+}
+
 fn face3d(data: &[Tag<'_>]) -> Face3D {
     let mut f = Face3D::default();
     let mut fourth = false;
@@ -886,10 +981,10 @@ fn multileader(data: &[Tag<'_>], ctx: &mut Ctx<'_>) -> MultiLeader {
                     continue;
                 }
                 if t.code == 304 {
-                    if let Some(r) = m.context.leaders.last_mut() {
-                        if ctx.room(r.lines.len()) {
-                            r.lines.push(MLeaderLine::default());
-                        }
+                    if let Some(r) = m.context.leaders.last_mut()
+                        && ctx.room(r.lines.len())
+                    {
+                        r.lines.push(MLeaderLine::default());
                     }
                     state = MlState::Line;
                     continue;
@@ -1126,10 +1221,10 @@ fn hatch(data: &[Tag<'_>], ctx: &mut Ctx<'_>) -> Hatch {
                         }
                     }
                     63 => {
-                        if let Some(stop) = g.colors.last_mut() {
-                            if stop.1 == Color::ByLayer {
-                                stop.1 = Color::from_aci(t.int());
-                            }
+                        if let Some(stop) = g.colors.last_mut()
+                            && stop.1 == Color::ByLayer
+                        {
+                            stop.1 = Color::from_aci(t.int());
                         }
                     }
                     _ => {
@@ -1233,10 +1328,10 @@ fn edge(c: &mut Cursor<'_, '_>, ctx: &mut Ctx<'_>) -> Option<Edge> {
             let mut weights = Vec::new();
             for _ in 0..n_points {
                 let Some(p) = c.point2(10) else { break };
-                if let Some(w) = c.f64(42) {
-                    if ctx.room(weights.len()) {
-                        weights.push(w);
-                    }
+                if let Some(w) = c.f64(42)
+                    && ctx.room(weights.len())
+                {
+                    weights.push(w);
                 }
                 if ctx.room(control_points.len()) {
                     control_points.push(p);
@@ -1487,10 +1582,10 @@ fn r12_viewport(v: &mut Viewport, x: &[Tag<'_>], ctx: &mut Ctx<'_>) {
             .iter()
             .find(|(n, _)| n.eq_ignore_ascii_case(&name))
             .map(|(_, h)| *h);
-        if let Some(h) = found {
-            if ctx.room(v.frozen_layers.len()) {
-                v.frozen_layers.push(h);
-            }
+        if let Some(h) = found
+            && ctx.room(v.frozen_layers.len())
+        {
+            v.frozen_layers.push(h);
         }
     }
 }
@@ -1516,7 +1611,7 @@ fn image(data: &[Tag<'_>], ctx: &mut Ctx<'_>) -> Image {
             283 => i.fade = t.i16(),
             360 => i.reactor = handle(t),
             71 => i.clip_type = t.i16(),
-            290 => i.clip_inside = t.bool(),
+            290 => i.clip_inverted = t.bool(),
             _ => {}
         }
     }
diff --git a/crates/exav-render/src/formats/cad/dxf/header.rs b/crates/exav-render/src/formats/cad/dxf/header.rs
index 18aa11d9..ceabc72a 100644
--- a/crates/exav-render/src/formats/cad/dxf/header.rs
+++ b/crates/exav-render/src/formats/cad/dxf/header.rs
@@ -106,6 +106,7 @@ pub(crate) fn read(tags: &[Tag<'_>], raw: &mut Raw, ctx: &mut Ctx<'_>) {
             "$LWDISPLAY" => h.lwdisplay = v.bool(),
             "$FILLMODE" => h.fillmode = v.bool(),
             "$MIRRTEXT" => h.mirrtext = v.bool(),
+            "$XCLIPFRAME" => h.xclipframe = v.i16(),
             _ => {}
         }
     }
diff --git a/crates/exav-render/src/formats/cad/dxf/mod.rs b/crates/exav-render/src/formats/cad/dxf/mod.rs
index 9f750e68..4c776b1e 100644
--- a/crates/exav-render/src/formats/cad/dxf/mod.rs
+++ b/crates/exav-render/src/formats/cad/dxf/mod.rs
@@ -11,7 +11,7 @@ mod tests;
 
 use std::borrow::Cow;
 
-use exav_unpack::dxf::{looks_like_dxf, Decoder, Parts, Record, Records, Stop, Tag, Value};
+use exav_unpack::dxf::{Decoder, Parts, Record, Records, Stop, Tag, Value, looks_like_dxf};
 
 use super::model::*;
 use super::{Error, Limits};
@@ -64,6 +64,11 @@ pub(crate) struct Ctx<'l> {
     /// Layer names and handles, once the tables are read: R12 viewports
     /// name their frozen layers.
     pub layer_handles: Vec<(String, Handle)>,
+    /// Each INSERT's extension dictionary, by the insert's handle: where its
+    /// clipping boundary is found once the objects are read.
+    pub insert_dictionaries: std::collections::HashMap<u64, u64>,
+    /// SPATIAL_FILTER objects, by handle.
+    pub spatial_filters: std::collections::HashMap<u64, InsertClip>,
 }
 
 impl<'l> Ctx<'l> {
@@ -79,6 +84,8 @@ impl<'l> Ctx<'l> {
             entity_limit_hit: false,
             item_limit_hit: false,
             layer_handles: Vec::new(),
+            insert_dictionaries: Default::default(),
+            spatial_filters: Default::default(),
         }
     }
 
@@ -406,7 +413,7 @@ impl<'a> Reader<'a, '_> {
                         || r.is("SECTION")
                         || r.is("EOF") =>
                 {
-                    return
+                    return;
                 }
                 _ => {}
             }
diff --git a/crates/exav-render/src/formats/cad/dxf/objects.rs b/crates/exav-render/src/formats/cad/dxf/objects.rs
index 26c1083f..487519bf 100644
--- a/crates/exav-render/src/formats/cad/dxf/objects.rs
+++ b/crates/exav-render/src/formats/cad/dxf/objects.rs
@@ -34,10 +34,10 @@ pub(crate) fn object(rec: &Record<'_>, raw: &mut Raw, ctx: &mut Ctx<'_>) {
                     281 => d.cloning = t.i16(),
                     3 => pending = Some(ctx.text(t)),
                     350 | 360 => {
-                        if let Some(n) = pending.take() {
-                            if ctx.room(d.entries.len()) {
-                                d.entries.push((n, Handle(t.handle())));
-                            }
+                        if let Some(n) = pending.take()
+                            && ctx.room(d.entries.len())
+                        {
+                            d.entries.push((n, Handle(t.handle())));
                         }
                     }
                     _ => {}
@@ -46,6 +46,42 @@ pub(crate) fn object(rec: &Record<'_>, raw: &mut Raw, ctx: &mut Ctx<'_>) {
             raw.dictionaries.push(d);
         }
         "LAYOUT" => raw.layouts.push(layout(&parts, handle, ctx)),
+        // An XCLIP boundary: its points (10), clipping on (71), then two
+        // matrices of 12 (40), the inverse insert matrix and the clip
+        // boundary's; the front and back distances are 40 and 41 before
+        // them, so the matrices are the last 24 of the 40s.
+        "SPATIAL_FILTER" => {
+            let mut points: Vec<Vec2> = Vec::new();
+            let mut forties: Vec<f64> = Vec::new();
+            let mut enabled = true;
+            for t in class(&parts, "AcDbSpatialFilter") {
+                match t.code {
+                    10 => {
+                        if ctx.room(points.len()) {
+                            points.push(Vec2::new(t.f64(), 0.0));
+                        }
+                    }
+                    20 => {
+                        if let Some(p) = points.last_mut() {
+                            p.y = t.f64();
+                        }
+                    }
+                    71 => enabled = t.bool(),
+                    40 if ctx.room(forties.len()) => forties.push(t.f64()),
+                    _ => {}
+                }
+            }
+            let at = forties.len().saturating_sub(24);
+            let inverse = forties
+                .get(at..at + 12)
+                .and_then(|m| <[f64; 12]>::try_from(m).ok());
+            if let (Some(inverse), true) = (inverse, forties.len() >= 24 && points.len() >= 2) {
+                ctx.spatial_filters.insert(
+                    handle.0,
+                    InsertClip::from_filter(&points, &inverse, enabled),
+                );
+            }
+        }
         "SORTENTSTABLE" => {
             let mut s = SortEntsTable {
                 handle,
@@ -57,10 +93,10 @@ pub(crate) fn object(rec: &Record<'_>, raw: &mut Raw, ctx: &mut Ctx<'_>) {
                     330 => s.block_record = Handle(t.handle()),
                     331 => entity = Some(Handle(t.handle())),
                     5 => {
-                        if let Some(e) = entity.take() {
-                            if ctx.room(s.entries.len()) {
-                                s.entries.push((e, Handle(t.handle())));
-                            }
+                        if let Some(e) = entity.take()
+                            && ctx.room(s.entries.len())
+                        {
+                            s.entries.push((e, Handle(t.handle())));
                         }
                     }
                     _ => {}
diff --git a/crates/exav-render/src/formats/cad/dxf/tables.rs b/crates/exav-render/src/formats/cad/dxf/tables.rs
index b6cbca85..7fc42eaf 100644
--- a/crates/exav-render/src/formats/cad/dxf/tables.rs
+++ b/crates/exav-render/src/formats/cad/dxf/tables.rs
@@ -95,12 +95,11 @@ fn layer(parts: &Parts<'_>, handle: Handle, ctx: &mut Ctx<'_>) -> Layer {
     if let Some(c) = rgb {
         l.color = c;
     }
-    if let Some(x) = parts.xdata("AcCmTransparency") {
-        if let Some(t) = x.iter().find(|t| t.code == 1071) {
-            if let Transparency::Alpha(a) = Transparency::from_code(t.int()) {
-                l.alpha = a;
-            }
-        }
+    if let Some(x) = parts.xdata("AcCmTransparency")
+        && let Some(t) = x.iter().find(|t| t.code == 1071)
+        && let Transparency::Alpha(a) = Transparency::from_code(t.int())
+    {
+        l.alpha = a;
     }
     l
 }
@@ -195,6 +194,12 @@ fn dim_style(parts: &Parts<'_>, handle: Handle, ctx: &mut Ctx<'_>) -> DimStyle {
             140 => d.dimtxt = t.f64(),
             142 => d.dimtsz = t.f64(),
             147 => d.dimgap = t.f64(),
+            77 => d.dimtad = t.i16(),
+            78 => d.dimzin = t.i16(),
+            144 => d.dimlfac = t.f64(),
+            271 => d.dimdec = t.i16(),
+            179 => d.dimadec = t.i16(),
+            278 => d.dimdsep = t.i16(),
             176 => d.dimclrd = Color::from_aci(t.int()),
             177 => d.dimclre = Color::from_aci(t.int()),
             178 => d.dimclrt = Color::from_aci(t.int()),
diff --git a/crates/exav-render/src/formats/cad/dxf/tests.rs b/crates/exav-render/src/formats/cad/dxf/tests.rs
index 476f5261..16bbd21f 100644
--- a/crates/exav-render/src/formats/cad/dxf/tests.rs
+++ b/crates/exav-render/src/formats/cad/dxf/tests.rs
@@ -1,7 +1,7 @@
 //! Records written by hand, for the cases where a group code means one thing
 //! in one subclass or position and another elsewhere.
 
-use super::super::{read_dxf, EntityKind, HAlign, VAlign};
+use super::super::{EntityKind, HAlign, VAlign, read_dxf};
 
 fn drawing(sections: &str) -> super::super::Drawing {
     let text = format!("{sections}0\nEOF\n");
@@ -244,3 +244,21 @@ fn an_r12_viewport_view_is_read_from_its_extended_data() {
     assert_ne!(v.flags & 0x200, 0);
     assert_eq!((v.grid_spacing.x, v.grid_spacing.y), (0.5, 0.5));
 }
+
+/// An R14 file from a writer with no block record table gives every entity
+/// of the ENTITIES section the owner of its first BLOCK (1F). The section is
+/// the model space's whatever the owner says.
+#[test]
+fn entities_owned_by_an_ordinary_block_are_still_the_models() {
+    let d = drawing(
+        "0\nSECTION\n2\nBLOCKS\n0\nBLOCK\n5\n20\n330\n1F\n100\nAcDbEntity\n8\n0\n\
+         100\nAcDbBlockBegin\n2\n*U\n70\n1\n10\n0\n20\n0\n30\n0\n3\n*U\n1\n\n\
+         0\nENDBLK\n5\n21\n330\n1F\n100\nAcDbEntity\n8\n0\n100\nAcDbBlockEnd\n0\nENDSEC\n\
+         0\nSECTION\n2\nENTITIES\n0\nLINE\n5\n8B\n330\n1F\n100\nAcDbEntity\n8\n0\n\
+         100\nAcDbLine\n10\n0\n20\n0\n30\n0\n11\n1\n21\n1\n31\n0\n0\nENDSEC\n",
+    );
+    let model = d.model_space().expect("a model space");
+    assert_eq!(model.entities.len(), 1);
+    let star_u = d.blocks.iter().find(|b| b.name == "*U").expect("*U");
+    assert!(star_u.entities.is_empty());
+}
diff --git a/crates/exav-render/src/formats/cad/json.rs b/crates/exav-render/src/formats/cad/json.rs
index f29aad58..34b8d5b7 100644
--- a/crates/exav-render/src/formats/cad/json.rs
+++ b/crates/exav-render/src/formats/cad/json.rs
@@ -340,6 +340,7 @@ fn header(o: &mut Obj<'_>, h: &Header) {
     o.b("lwdisplay", h.lwdisplay);
     o.b("fillmode", h.fillmode);
     o.b("mirrtext", h.mirrtext);
+    o.i("xclipframe", h.xclipframe);
 }
 
 fn layer(o: &mut Obj<'_>, l: &Layer) {
@@ -401,6 +402,12 @@ fn dim_style(o: &mut Obj<'_>, d: &DimStyle) {
     o.f("dimtsz", d.dimtsz);
     o.f("dimtxt", d.dimtxt);
     o.f("dimgap", d.dimgap);
+    o.i("dimtad", d.dimtad);
+    o.i("dimzin", d.dimzin);
+    o.f("dimlfac", d.dimlfac);
+    o.i("dimdec", d.dimdec);
+    o.i("dimadec", d.dimadec);
+    o.i("dimdsep", d.dimdsep);
     o.color("dimclrd", d.dimclrd);
     o.color("dimclre", d.dimclre);
     o.color("dimclrt", d.dimclrt);
@@ -855,7 +862,7 @@ fn image(o: &mut Obj<'_>, i: &Image) {
     o.h("reactor", i.reactor);
     o.i("clip_type", i.clip_type);
     o.v2s("clip_vertices", &i.clip_vertices);
-    o.b("clip_inside", i.clip_inside);
+    o.b("clip_inverted", i.clip_inverted);
 }
 
 fn entity(o: &mut Obj<'_>, e: &Entity) {
@@ -947,6 +954,26 @@ fn kind(o: &mut Obj<'_>, k: &EntityKind) {
             o.v3s("corners", &f.corners);
             o.i("invisible_edges", f.invisible_edges);
         }
+        EntityKind::Mesh(m) => {
+            o.v3s("vertices", &m.vertices);
+            o.list("faces", &m.faces, |s, f| {
+                s.push('[');
+                for (n, i) in f.iter().enumerate() {
+                    if n > 0 {
+                        s.push(',');
+                    }
+                    let _ = write!(s, "{i}");
+                }
+                s.push(']');
+            });
+        }
+        EntityKind::Tolerance(t) => {
+            o.v3("insertion", t.insertion);
+            o.v3("x_direction", t.x_direction);
+            o.v3("extrusion", t.extrusion);
+            o.str("text", &t.text);
+            o.str("dimstyle", &t.dimstyle);
+        }
         EntityKind::Text(t) => text(o, t),
         EntityKind::Attribute(a) | EntityKind::AttributeDefinition(a) => attribute(o, a),
         EntityKind::Insert(i) => {
@@ -960,6 +987,13 @@ fn kind(o: &mut Obj<'_>, k: &EntityKind) {
             o.f("row_spacing", i.row_spacing);
             o.v3("extrusion", i.extrusion);
             o.objects("attributes", &i.attributes, entity);
+            match &i.clip {
+                Some(c) => o.object("clip", |o| {
+                    o.v2s("boundary", &c.boundary);
+                    o.b("enabled", c.enabled);
+                }),
+                None => o.null("clip"),
+            }
         }
         EntityKind::MText(m) => mtext(o, m),
         EntityKind::Dimension(d) => {
diff --git a/crates/exav-render/src/formats/cad/mod.rs b/crates/exav-render/src/formats/cad/mod.rs
index 73795aa8..e9a532e6 100644
--- a/crates/exav-render/src/formats/cad/mod.rs
+++ b/crates/exav-render/src/formats/cad/mod.rs
@@ -47,12 +47,30 @@ mod json;
 pub mod model;
 mod preview;
 mod proxy;
+mod xref;
 
 pub use exav_unpack::dwg::{looks_like_dwg, pre_r13_version};
-pub use exav_unpack::dxf::{looks_like_dxf, Limits};
+pub use exav_unpack::dxf::{Limits, looks_like_dxf};
 pub use json::to_json;
 pub use model::*;
 pub use preview::preview;
+pub use xref::MAX_BOUND_ENTITIES;
+
+/// What an entity takes in memory once read, as a line does, the commonest
+/// (the room a list grows into while the drawing is read is not counted).
+pub const ENTITY_BYTES: u64 = 512;
+
+/// Limits for a drawing that may take about `memory` bytes: its entities and
+/// what the compressed sections of a DWG expand to are each bound by it.
+pub fn limits_within(memory: u64) -> Limits {
+    let default = Limits::default();
+    Limits {
+        max_entities: usize::try_from(memory / ENTITY_BYTES)
+            .map_or(default.max_entities, |n| n.min(default.max_entities)),
+        max_decompressed_bytes: memory,
+        ..default
+    }
+}
 
 /// Why a file could not be read at all.
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/crates/exav-render/src/formats/cad/model.rs b/crates/exav-render/src/formats/cad/model.rs
index 136633ac..c2b8d246 100644
--- a/crates/exav-render/src/formats/cad/model.rs
+++ b/crates/exav-render/src/formats/cad/model.rs
@@ -244,6 +244,8 @@ pub struct Header {
     pub lwdisplay: bool,
     pub fillmode: bool,
     pub mirrtext: bool,
+    /// `$XCLIPFRAME`: 0 hidden, 1 shown and plotted, 2 shown only.
+    pub xclipframe: i16,
 }
 
 impl Default for Header {
@@ -286,6 +288,7 @@ impl Default for Header {
             lwdisplay: false,
             fillmode: true,
             mirrtext: false,
+            xclipframe: 2,
         }
     }
 }
diff --git a/crates/exav-render/src/formats/cad/model/entity.rs b/crates/exav-render/src/formats/cad/model/entity.rs
index 60ed8f86..b04e8a7a 100644
--- a/crates/exav-render/src/formats/cad/model/entity.rs
+++ b/crates/exav-render/src/formats/cad/model/entity.rs
@@ -68,6 +68,7 @@ pub enum EntityKind {
     Leader(Box<Leader>),
     Line(Line),
     LwPolyline(LwPolyline),
+    Mesh(Box<Mesh>),
     MLine(Box<MLine>),
     MText(Box<MText>),
     MultiLeader(Box<MultiLeader>),
@@ -80,6 +81,7 @@ pub enum EntityKind {
     Spline(Box<Spline>),
     Table(Box<Table>),
     Text(Box<Text>),
+    Tolerance(Box<Tolerance>),
     Trace(Quad),
     Underlay(Box<Underlay>),
     Viewport(Box<Viewport>),
@@ -106,6 +108,7 @@ impl EntityKind {
             EntityKind::Leader(_) => "LEADER",
             EntityKind::Line(_) => "LINE",
             EntityKind::LwPolyline(_) => "LWPOLYLINE",
+            EntityKind::Mesh(_) => "MESH",
             EntityKind::MLine(_) => "MLINE",
             EntityKind::MText(_) => "MTEXT",
             EntityKind::MultiLeader(_) => "MULTILEADER",
@@ -118,6 +121,7 @@ impl EntityKind {
             EntityKind::Spline(_) => "SPLINE",
             EntityKind::Table(_) => "ACAD_TABLE",
             EntityKind::Text(_) => "TEXT",
+            EntityKind::Tolerance(_) => "TOLERANCE",
             EntityKind::Trace(_) => "TRACE",
             EntityKind::Underlay(u) => match u.kind {
                 UnderlayKind::Pdf => "PDFUNDERLAY",
@@ -412,6 +416,63 @@ pub struct Quad {
     pub plane: Plane,
 }
 
+/// MESH (2010 on): a subdivision mesh's control cage, in world
+/// coordinates; its smoothed levels are not stored.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Mesh {
+    pub vertices: Vec<Vec3>,
+    /// Each face's vertex indices, from 0.
+    pub faces: Vec<Vec<u32>>,
+}
+
+impl Mesh {
+    /// The faces of a stored face list (each its corner count, then its
+    /// corners), those naming a vertex the mesh does not have left out.
+    pub fn faces_from_list(list: &[i64], vertices: usize) -> Vec<Vec<u32>> {
+        let mut faces = Vec::new();
+        let mut i = 0;
+        while let Some(&n) = list.get(i) {
+            let Ok(n) = usize::try_from(n) else { break };
+            let Some(ids) = list.get(i + 1..i + 1 + n) else {
+                break;
+            };
+            let face: Option<Vec<u32>> = ids
+                .iter()
+                .map(|&k| u32::try_from(k).ok().filter(|&k| (k as usize) < vertices))
+                .collect();
+            if let Some(face) = face.filter(|f| f.len() >= 2) {
+                faces.push(face);
+            }
+            i += n + 1;
+        }
+        faces
+    }
+}
+
+/// TOLERANCE: a feature control frame, its text in the GD&T font's codes
+/// (`{\Fgdt;j}`), `%%v` between its boxes and `^J` between its rows.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Tolerance {
+    pub insertion: Vec3,
+    pub x_direction: Vec3,
+    pub extrusion: Vec3,
+    pub text: String,
+    /// The dimension style: its text height, gap and colours.
+    pub dimstyle: String,
+}
+
+impl Default for Tolerance {
+    fn default() -> Self {
+        Tolerance {
+            insertion: Vec3::default(),
+            x_direction: Vec3::new(1.0, 0.0, 0.0),
+            extrusion: Vec3::Z,
+            text: String::new(),
+            dimstyle: String::new(),
+        }
+    }
+}
+
 /// 3DFACE, in world coordinates.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct Face3D {
@@ -548,6 +609,39 @@ pub struct Insert {
     pub extrusion: Vec3,
     /// The ATTRIB entities that follow it.
     pub attributes: Vec<Entity>,
+    /// Its clipping boundary (XCLIP), when it has one.
+    pub clip: Option<InsertClip>,
+}
+
+/// An insert's clipping boundary: the SPATIAL_FILTER its extension
+/// dictionary names under ACAD_FILTER, then SPATIAL.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct InsertClip {
+    /// In the block's coordinates: the filter's points through its inverse
+    /// insert matrix. Two points are a rectangle's opposite corners.
+    pub boundary: Vec<Vec2>,
+    /// Group 71: clipping is on.
+    pub enabled: bool,
+}
+
+impl InsertClip {
+    /// The boundary from a filter's points and its inverse insert matrix,
+    /// 12 numbers by rows of 4 (x' = m0 x + m1 y + m2 z + m3, ...).
+    pub fn from_filter(points: &[Vec2], inverse: &[f64; 12], enabled: bool) -> InsertClip {
+        let m = inverse;
+        InsertClip {
+            boundary: points
+                .iter()
+                .map(|p| {
+                    Vec2::new(
+                        m[0] * p.x + m[1] * p.y + m[3],
+                        m[4] * p.x + m[5] * p.y + m[7],
+                    )
+                })
+                .collect(),
+            enabled,
+        }
+    }
 }
 
 impl Default for Insert {
@@ -563,6 +657,7 @@ impl Default for Insert {
             row_spacing: 0.0,
             extrusion: Vec3::Z,
             attributes: Vec::new(),
+            clip: None,
         }
     }
 }
@@ -1315,8 +1410,9 @@ pub struct Image {
     /// Group 71: 1 rectangular, 2 polygonal.
     pub clip_type: i16,
     pub clip_vertices: Vec<Vec2>,
-    /// Group 290: true keeps the inside of the boundary.
-    pub clip_inside: bool,
+    /// Group 290: false keeps the inside of the boundary, true the outside.
+    /// Vertices are in pixels from the image's top left, y down.
+    pub clip_inverted: bool,
 }
 
 impl Default for Image {
@@ -1336,7 +1432,7 @@ impl Default for Image {
             reactor: Handle::NULL,
             clip_type: 1,
             clip_vertices: Vec::new(),
-            clip_inside: false,
+            clip_inverted: false,
         }
     }
 }
diff --git a/crates/exav-render/src/formats/cad/model/tables.rs b/crates/exav-render/src/formats/cad/model/tables.rs
index bdafbfa8..f0bb4da3 100644
--- a/crates/exav-render/src/formats/cad/model/tables.rs
+++ b/crates/exav-render/src/formats/cad/model/tables.rs
@@ -162,6 +162,17 @@ pub struct DimStyle {
     pub dimtsz: f64,
     pub dimtxt: f64,
     pub dimgap: f64,
+    /// Text above the dimension line (1 and up) or centred on it (0).
+    pub dimtad: i16,
+    /// Zero suppression: 4 leading, 8 trailing.
+    pub dimzin: i16,
+    /// Scale applied to linear measurements.
+    pub dimlfac: f64,
+    /// Decimal places of linear and of angular measurements.
+    pub dimdec: i16,
+    pub dimadec: i16,
+    /// The decimal separator's character code.
+    pub dimdsep: i16,
     pub dimclrd: Color,
     pub dimclre: Color,
     pub dimclrt: Color,
@@ -190,6 +201,12 @@ impl Default for DimStyle {
             dimtsz: 0.0,
             dimtxt: 0.18,
             dimgap: 0.09,
+            dimtad: 0,
+            dimzin: 0,
+            dimlfac: 1.0,
+            dimdec: 4,
+            dimadec: 0,
+            dimdsep: 46,
             dimclrd: Color::ByBlock,
             dimclre: Color::ByBlock,
             dimclrt: Color::ByBlock,
diff --git a/crates/exav-render/src/formats/cad/proxy.rs b/crates/exav-render/src/formats/cad/proxy.rs
index 7291e210..065f8fe0 100644
--- a/crates/exav-render/src/formats/cad/proxy.rs
+++ b/crates/exav-render/src/formats/cad/proxy.rs
@@ -260,11 +260,11 @@ fn item(c: &mut Chunk<'_>, kind: u32, r: &Reading<'_>) -> Option<Option<ProxyIte
                 DwgVersion::R13,
             ] {
                 let mut b = Bits::new(bytes);
-                if let Ok(p) = super::dwg::lwpolyline_bits(&mut b, v, &mut room) {
-                    if b.remaining() < 8 {
-                        found = Some(p);
-                        break;
-                    }
+                if let Ok(p) = super::dwg::lwpolyline_bits(&mut b, v, &mut room)
+                    && b.remaining() < 8
+                {
+                    found = Some(p);
+                    break;
                 }
             }
             ProxyItem::LwPolyline(Box::new(found?))
@@ -335,10 +335,10 @@ fn text2(c: &mut Chunk<'_>, unicode: bool, r: &Reading<'_>) -> Option<ProxyText>
     };
     // The length in characters, -1 when the string ends at its zero.
     let len = c.rl()? as i32;
-    if let Ok(n) = usize::try_from(len) {
-        if let Some((cut, _)) = s.char_indices().nth(n) {
-            s.truncate(cut);
-        }
+    if let Ok(n) = usize::try_from(len)
+        && let Some((cut, _)) = s.char_indices().nth(n)
+    {
+        s.truncate(cut);
     }
     t.value = s;
     // The spec has "0 if raw, 1 if not"; the converter writes the `%%` of
diff --git a/crates/exav-render/src/formats/cad/xref.rs b/crates/exav-render/src/formats/cad/xref.rs
new file mode 100644
index 00000000..3dc220c2
--- /dev/null
+++ b/crates/exav-render/src/formats/cad/xref.rs
@@ -0,0 +1,266 @@
+//! Binding an external reference: the caller reads the drawing a reference
+//! names, and its model space becomes the content of the block that refers
+//! to it. What it brings along is named as AutoCAD names it in the host,
+//! `XREF|NAME`: its layers, linetypes, text and dimension styles, and its
+//! blocks. A reference inside it keeps its path, and is bound in turn.
+
+use super::model::{Block, Drawing, Entity, EntityKind, Handle};
+
+/// How many references deep a binding goes: `A|B|C|...`.
+const MAX_DEPTH: usize = 8;
+
+/// The entities a drawing may hold once references are bound into it.
+pub const MAX_BOUND_ENTITIES: usize = 8_000_000;
+
+/// The handles of what is bound in carry the number of the binding in the
+/// byte above those a drawing uses, so they do not meet the host's.
+const TAG_SHIFT: u32 = 56;
+
+fn depth(name: &str) -> usize {
+    name.matches('|').count()
+}
+
+/// An xref block with no content yet, deep enough to be shown: an overlay
+/// inside a reference is not.
+fn is_open(b: &Block) -> bool {
+    b.is_xref()
+        && b.entities.is_empty()
+        && depth(&b.name) < MAX_DEPTH
+        && !(b.flags & 8 != 0 && depth(&b.name) > 0)
+}
+
+fn untouched(linetype: &str) -> bool {
+    ["BYLAYER", "BYBLOCK", "CONTINUOUS"]
+        .iter()
+        .any(|k| linetype.eq_ignore_ascii_case(k))
+}
+
+struct Bind<'a> {
+    prefix: &'a str,
+    tag: u64,
+}
+
+impl Bind<'_> {
+    fn name(&self, s: &str) -> String {
+        format!("{}|{}", self.prefix, s)
+    }
+
+    fn handle(&self, h: Handle) -> Handle {
+        if h.is_null() {
+            h
+        } else {
+            Handle(h.0 & ((1 << TAG_SHIFT) - 1) | self.tag << TAG_SHIFT)
+        }
+    }
+
+    fn linetype(&self, s: &str) -> String {
+        if untouched(s) {
+            s.to_string()
+        } else {
+            self.name(s)
+        }
+    }
+
+    fn entity(&self, e: &Entity, nesting: usize) -> Entity {
+        let mut e = e.clone();
+        e.handle = self.handle(e.handle);
+        e.owner = self.handle(e.owner);
+        e.layer = self.name(&e.layer);
+        e.linetype = self.linetype(&e.linetype);
+        match &mut e.kind {
+            EntityKind::Insert(i) => {
+                i.block_name = self.name(&i.block_name);
+                if nesting > 0 {
+                    i.attributes = i
+                        .attributes
+                        .iter()
+                        .map(|a| self.entity(a, nesting - 1))
+                        .collect();
+                }
+            }
+            EntityKind::Dimension(d) => {
+                if !d.block_name.is_empty() {
+                    d.block_name = self.name(&d.block_name);
+                }
+                d.style = self.name(&d.style);
+            }
+            EntityKind::Text(t) => t.style = self.name(&t.style),
+            EntityKind::MText(m) => m.style = self.name(&m.style),
+            EntityKind::Attribute(a) | EntityKind::AttributeDefinition(a) => {
+                a.text.style = self.name(&a.text.style);
+                if let Some(m) = &mut a.mtext {
+                    m.style = self.name(&m.style);
+                }
+            }
+            EntityKind::Leader(l) => l.style = self.name(&l.style),
+            EntityKind::Tolerance(t) => t.dimstyle = self.name(&t.dimstyle),
+            EntityKind::Table(t) => {
+                if !t.block_name.is_empty() {
+                    t.block_name = self.name(&t.block_name);
+                }
+            }
+            EntityKind::Image(i) | EntityKind::Wipeout(i) => {
+                i.image_def = self.handle(i.image_def);
+                i.reactor = self.handle(i.reactor);
+            }
+            EntityKind::Underlay(u) => u.definition = self.handle(u.definition),
+            _ => {}
+        }
+        e
+    }
+}
+
+impl Drawing {
+    /// The files the drawing's unbound external references name, each once:
+    /// as the drawing wrote them, a path of the machine that made it.
+    pub fn unresolved_xrefs(&self) -> Vec<String> {
+        let mut out: Vec<String> = Vec::new();
+        for b in self.blocks.iter().filter(|b| is_open(b)) {
+            if !b.xref_path.is_empty() && !out.iter().any(|p| p.eq_ignore_ascii_case(&b.xref_path))
+            {
+                out.push(b.xref_path.clone());
+            }
+        }
+        out
+    }
+
+    /// The entities of every block, which a binding is limited by.
+    fn entity_count(&self) -> usize {
+        self.blocks.iter().map(|b| b.entities.len()).sum()
+    }
+
+    /// Bind `xref`, the drawing the path `path` names, into every block of
+    /// this drawing that refers to that path and has no content. Returns how
+    /// many blocks it filled: none for a path nothing refers to, and for a
+    /// drawing that would bring this one past [`MAX_BOUND_ENTITIES`].
+    pub fn attach_xref(&mut self, path: &str, xref: &Drawing) -> usize {
+        let Some(model) = xref.model_space() else {
+            return 0;
+        };
+        let targets: Vec<usize> = self
+            .blocks
+            .iter()
+            .enumerate()
+            .filter(|(_, b)| is_open(b) && b.xref_path.eq_ignore_ascii_case(path))
+            .map(|(i, _)| i)
+            .collect();
+        let mut bound = 0;
+        for i in targets {
+            if self.entity_count().saturating_add(xref.entity_count()) > MAX_BOUND_ENTITIES {
+                break;
+            }
+            let Some(prefix) = self.blocks.get(i).map(|b| b.name.clone()) else {
+                continue;
+            };
+            let used = self.handle_tags();
+            if used >= u64::from(u8::MAX) {
+                break;
+            }
+            let bind = Bind {
+                prefix: &prefix,
+                tag: used + 1,
+            };
+            self.bring(&bind, xref);
+            let content: Vec<Entity> = model.entities.iter().map(|e| bind.entity(e, 2)).collect();
+            if let Some(b) = self.blocks.get_mut(i) {
+                b.entities = content;
+            }
+            bound += 1;
+        }
+        bound
+    }
+
+    /// The highest tag among the handles of what was bound in.
+    fn handle_tags(&self) -> u64 {
+        let tag = |h: Handle| h.0 >> TAG_SHIFT;
+        let layers = self.layers.iter().map(|l| tag(l.handle));
+        let blocks = self.blocks.iter().map(|b| tag(b.record));
+        let images = self.image_defs.iter().map(|d| tag(d.handle));
+        layers.chain(blocks).chain(images).max().unwrap_or(0)
+    }
+
+    /// Add what the entities of `xref` refer to, under the names a binding
+    /// gives them, except what the host already has under that name.
+    fn bring(&mut self, bind: &Bind<'_>, xref: &Drawing) {
+        for l in &xref.layers {
+            let name = bind.name(&l.name);
+            if self.layer(&name).is_none() {
+                let mut l = l.clone();
+                l.name = name;
+                l.handle = bind.handle(l.handle);
+                l.linetype = bind.linetype(&l.linetype);
+                self.layers.push(l);
+            }
+        }
+        for t in &xref.linetypes {
+            let name = bind.name(&t.name);
+            if !untouched(&t.name) && self.linetype(&name).is_none() {
+                let mut t = t.clone();
+                t.name = name;
+                t.handle = bind.handle(t.handle);
+                self.linetypes.push(t);
+            }
+        }
+        for s in &xref.text_styles {
+            let name = bind.name(&s.name);
+            if self.text_style(&name).is_none() {
+                let mut s = s.clone();
+                s.name = name;
+                s.handle = bind.handle(s.handle);
+                self.text_styles.push(s);
+            }
+        }
+        for d in &xref.dim_styles {
+            let name = bind.name(&d.name);
+            if !self
+                .dim_styles
+                .iter()
+                .any(|e| e.name.eq_ignore_ascii_case(&name))
+            {
+                let mut d = d.clone();
+                d.name = name;
+                d.handle = bind.handle(d.handle);
+                self.dim_styles.push(d);
+            }
+        }
+        for b in &xref.blocks {
+            if b.is_model_space() || b.is_paper_space() {
+                continue;
+            }
+            let name = bind.name(&b.name);
+            if self.block(&name).is_some() {
+                continue;
+            }
+            let mut copy = b.clone();
+            copy.name = name;
+            copy.record = bind.handle(b.record);
+            copy.handle = bind.handle(b.handle);
+            copy.end_handle = bind.handle(b.end_handle);
+            copy.layout = Handle::NULL;
+            copy.layer = bind.name(&b.layer);
+            copy.entities = b.entities.iter().map(|e| bind.entity(e, 2)).collect();
+            self.blocks.push(copy);
+        }
+        for d in &xref.image_defs {
+            let mut d = d.clone();
+            d.handle = bind.handle(d.handle);
+            self.image_defs.push(d);
+        }
+        for d in &xref.underlay_defs {
+            let mut d = d.clone();
+            d.handle = bind.handle(d.handle);
+            self.underlay_defs.push(d);
+        }
+        for t in &xref.sort_tables {
+            let mut t = t.clone();
+            t.handle = bind.handle(t.handle);
+            t.block_record = bind.handle(t.block_record);
+            t.entries = t
+                .entries
+                .iter()
+                .map(|(a, b)| (bind.handle(*a), bind.handle(*b)))
+                .collect();
+            self.sort_tables.push(t);
+        }
+    }
+}
diff --git a/crates/exav-render/src/formats/dwg/DESIGN.md b/crates/exav-render/src/formats/dwg/DESIGN.md
index b23e3041..2240be52 100644
--- a/crates/exav-render/src/formats/dwg/DESIGN.md
+++ b/crates/exav-render/src/formats/dwg/DESIGN.md
@@ -71,11 +71,26 @@ entities.
 | Fills | Hatch, Solid, Face3D, gradients | triangles: colour, layer id |
 | Glyphs | Text, MText, Attribute in an outline face | instanced quads into a Canvas-built atlas |
 
-Curves are flattened at a tolerance chosen from the drawing's extents. Both
+Circles, arcs and bulged polyline segments are strokes too, when nothing
+dashes them and the transform keeps circles round: each carries a bulge, at
+most a quarter turn's, and the fragment shader measures the distance to the
+arc itself, so a curve is exact at any zoom. Other curves (ellipses,
+splines, dashed arcs, arcs in a block scaled unevenly) are flattened at a
+fixed sagitta of a thousandth of their radius, and an arc crossing a clip
+boundary is cut as its flattened pieces. Both
 the stroke and fill buffers are sorted into spatial buckets recording the true
-box of their contents, so a view draws only the buckets it touches. Buckets
-are built within the opaque and the translucent halves, which are two passes
-(only the first writes depth).
+box of their contents, so a view draws only the buckets it touches. Only the
+opaque half is bucketed. The translucent half follows it in draw order, cut
+into tiles of consecutive entities, and is drawn after all opaque geometry,
+fills and strokes interleaved by draw order (`translucent_runs`). Both passes
+write depth, so an entity's overlaps with itself blend once. Text under
+translucent geometry is drawn in two parts: the glyphs' solid cores before
+the translucent pass, their edges after it.
+
+The context has no multisampling: strokes measure their own coverage. An
+opaque fill of one colour is outlined by strokes of no width (`FILL_EDGE`),
+whose fringe is the coverage of the pixels just outside it; drawn at the
+fill's depth, they are hidden wherever the fill is.
 
 ### 3.3 Layer show and hide without re-uploading
 
@@ -125,19 +140,28 @@ it into the view matrix.
 |---|---|
 | Lines, arcs, circles, ellipses, polylines, splines | Drawn |
 | Blocks and inserts, nested, scaled, rotated, MINSERT arrays | Drawn, with a cycle guard |
-| Dimensions | Drawn from the anonymous block AutoCAD bakes |
+| Dimensions | Drawn from the anonymous block AutoCAD bakes; one saved without it from its definition points and style (`dimension.rs`: no DIMTIH, feet and inches, tolerances or alternate units) |
 | MLINE, HELIX | Drawn |
 | Layers: colour, on/off, freeze, transparency | From the file |
 | Lineweight | Instanced quads, zoom-aware |
 | Solid and gradient hatch, islands | Even-odd, holes bridged into the outer ring |
 | Pattern hatch | Line families clipped to the region, with dash phase |
 | Linetypes | Dashed in drawing units, phase carried along a polyline; LTSCALE, per-entity and block scale |
+| Complex linetypes | Their text; the shapes of ltypeshp.shx (AutoCAD's own TRACKS, ZIGZAG, FENCELINE1 and 2, BATTING), redrawn; other shape files' shapes left out |
 | Extrusion (OCS) | Arbitrary Axis Algorithm, for the entity types stored in object coordinates |
-| TrueType text | Bundled faces, glyph atlas |
+| TrueType text | Bundled faces, glyph atlas sized to the view; distance fields when the character set is too large for that size |
 | SHX text | Substituted, see 5.3 |
-| MTEXT formatting | Colour, height, font, the three rules, indents and tabs kept; stacked fractions as `a/b` |
+| MTEXT formatting | Colour, height, font, width factor, oblique, tracking, the three rules, indents, tabs, justification, stacks, background masks and frames |
+| Text placement | Mirrored and stretched with its block, TEXT's backward and upside-down flags, Bottom and Middle on the face's descender |
+| Symbol fonts | symbol.ttf, greeks/greekc.shx and gdt.shx as the characters they draw |
+| Characters the stroke font lacks (CJK) | The run drawn in the outline face, completed from the browser's fonts |
 | Paper-space layouts and viewports | Drawn |
-| External references, images, OLE | Frame only; counted in the warnings |
+| External references, images, OLE | Xrefs: the drawing bound in when the caller has its file (`cad::xref`: its model space becomes the xref block's content, its layers, styles, linetypes and blocks named `XREF\|NAME` as AutoCAD names them in the host, its handles tagged so they do not meet the host's, nested references in turn to a depth of eight); else their path at the insertion point (on a layout, at most a hundredth of the paper high). Images, underlays, OLE: frame only (an image's is its crop). The ones not drawn are counted, with the files they name, in the warnings |
+| XCLIP | The block cut to its boundary, the frame as `$XCLIPFRAME` says |
+| Points | `$PDMODE` shapes, `$PDSIZE` (a share of the drawing's height when not in units) |
+| 3DFACE, polyface and polygon meshes, MESH | Their visible edges, in plan |
+| TOLERANCE | Feature control frame, GD&T symbols |
+| Leader arrowheads | The style's arrow block, else AutoCAD's built-in shape of that name |
 | Custom objects (proxy graphics) | Drawn from the graphics saved with them, see 5.4; those saved without are counted in the warnings |
 | Plot styles (CTB/STB) | Not planned |
 
@@ -161,7 +185,12 @@ extrusion vector, and an extrusion of (0, 0, -1) mirrors the X axis: a block
 at x = 16613 drawn at x = -16613. The transform is the Arbitrary Axis
 Algorithm, not a sign flip, and applies only to the entity types that are in
 OCS: LINE, POINT, SPLINE, ELLIPSE, 3DFACE and MLINE carry an extrusion vector
-but store world coordinates.
+but store world coordinates. An ELLIPSE's extrusion is the plane's normal: the
+minor axis is the normal crossed with the major, so a normal of -Z runs the
+parameter the other way and a tilted plane is squashed as seen from above. An
+MTEXT's is the normal of the plane the text lies in, its insertion point and
+X-axis direction being world coordinates: the text's own axes are the X
+direction and the normal crossed with it, and the plan view takes their XY.
 
 ### 5.3 SHX
 
diff --git a/crates/exav-render/src/formats/dwg/clip.rs b/crates/exav-render/src/formats/dwg/clip.rs
index 9d42dea6..c3b55142 100644
--- a/crates/exav-render/src/formats/dwg/clip.rs
+++ b/crates/exav-render/src/formats/dwg/clip.rs
@@ -65,6 +65,17 @@ impl ClipShape {
         })
     }
 
+    /// The region as triangles.
+    pub fn triangles(&self) -> Vec<[[f64; 2]; 3]> {
+        match self {
+            ClipShape::Rect { min, max } => vec![
+                [[min[0], min[1]], [max[0], min[1]], [max[0], max[1]]],
+                [[min[0], min[1]], [max[0], max[1]], [min[0], max[1]]],
+            ],
+            ClipShape::Poly { pieces, .. } => pieces.clone(),
+        }
+    }
+
     pub fn bounds(&self) -> ([f64; 2], [f64; 2]) {
         match self {
             ClipShape::Rect { min, max } => (*min, *max),
@@ -237,11 +248,7 @@ fn liang_barsky(a: [f64; 2], b: [f64; 2], min: [f64; 2], max: [f64; 2]) -> Optio
             }
         }
     }
-    if t1 <= t0 {
-        None
-    } else {
-        Some((t0, t1))
-    }
+    if t1 <= t0 { None } else { Some((t0, t1)) }
 }
 
 /// Sutherland-Hodgman against the four edges of a box.
diff --git a/crates/exav-render/src/formats/dwg/curves.rs b/crates/exav-render/src/formats/dwg/curves.rs
index e43b56e7..cce9e8e3 100644
--- a/crates/exav-render/src/formats/dwg/curves.rs
+++ b/crates/exav-render/src/formats/dwg/curves.rs
@@ -4,8 +4,9 @@
 use std::f64::consts::TAU;
 
 /// Sagitta error target as a fraction of radius. 0.001 gives ~70 segments for a
-/// full circle, which holds up past the zoom levels a viewer reaches before
-/// re-tessellation would kick in.
+/// full circle. The curves that reach here are flattened once and never
+/// refined at a closer zoom; a circle, arc or bulge that nothing prevents is
+/// not flattened at all (see DESIGN.md).
 const SAGITTA_RATIO: f64 = 0.001;
 const MIN_SEGMENTS: usize = 8;
 const MAX_SEGMENTS: usize = 512;
@@ -31,6 +32,58 @@ fn ccw_sweep(sweep: f64) -> Option<f64> {
     Some(if s > 0.0 { s } else { TAU })
 }
 
+/// The centre, radius and angles of the arc from `a` to `b` with this
+/// bulge: (cx, cy, r, start, signed sweep). None for a straight one.
+pub fn bulge_arc(a: [f64; 2], b: [f64; 2], bulge: f64) -> Option<(f64, f64, f64, f64, f64)> {
+    let chord = (b[0] - a[0]).hypot(b[1] - a[1]);
+    if bulge == 0.0 || !bulge.is_finite() || chord < 1e-12 {
+        return None;
+    }
+    let sweep = 4.0 * bulge.atan();
+    let r = chord / (2.0 * (sweep / 2.0).sin().abs());
+    // The centre lies off the chord's middle, to its left for a
+    // counter-clockwise arc under half a turn.
+    let (mx, my) = ((a[0] + b[0]) / 2.0, (a[1] + b[1]) / 2.0);
+    let (ux, uy) = ((b[0] - a[0]) / chord, (b[1] - a[1]) / chord);
+    let d = chord / 2.0 / (sweep / 2.0).tan();
+    let (cx, cy) = (mx - uy * d, my + ux * d);
+    let start = (a[1] - cy).atan2(a[0] - cx);
+    Some((cx, cy, r, start, sweep))
+}
+
+/// `n` + 1 points along the arc from `a` to `b` with this bulge.
+pub fn bulge_points(a: [f64; 2], b: [f64; 2], bulge: f64, n: usize) -> Vec<[f64; 2]> {
+    let Some((cx, cy, r, start, sweep)) = bulge_arc(a, b, bulge) else {
+        return vec![a, b];
+    };
+    let n = n.max(1);
+    let mut out: Vec<[f64; 2]> = (0..=n)
+        .map(|i| {
+            let t = start + sweep * i as f64 / n as f64;
+            [cx + r * t.cos(), cy + r * t.sin()]
+        })
+        .collect();
+    // The ends exactly where they were.
+    out[0] = a;
+    out[n] = b;
+    out
+}
+
+/// Sample a circular arc from `start` over a signed `sweep` (radians,
+/// positive counter-clockwise).
+pub fn arc_points(cx: f64, cy: f64, r: f64, start: f64, sweep: f64) -> Vec<[f64; 2]> {
+    if !r.is_finite() || r <= 0.0 || !sweep.is_finite() || !start.is_finite() {
+        return Vec::new();
+    }
+    let n = segments_for_sweep(sweep);
+    (0..=n)
+        .map(|i| {
+            let a = start + sweep * (i as f64 / n as f64);
+            [cx + r * a.cos(), cy + r * a.sin()]
+        })
+        .collect()
+}
+
 /// Sample a circular arc counter-clockwise from `start` to `end` (radians).
 pub fn flatten_arc(cx: f64, cy: f64, r: f64, start: f64, end: f64) -> Vec<[f64; 2]> {
     if !r.is_finite() || r <= 0.0 {
@@ -74,13 +127,67 @@ pub fn flatten_ellipse(
     start_param: f64,
     end_param: f64,
 ) -> Vec<[f64; 2]> {
-    let a = (major_x * major_x + major_y * major_y).sqrt();
-    if !a.is_finite() || a <= 0.0 || !ratio.is_finite() {
+    // The minor axis is the major turned a quarter, times the ratio.
+    let r = ratio.abs();
+    flatten_ellipse_axes(
+        [cx, cy],
+        [major_x, major_y],
+        [-major_y * r, major_x * r],
+        start_param,
+        end_param,
+    )
+}
+
+/// An ellipse as DXF gives it, in world coordinates: the plane's normal
+/// (its extrusion) says which way the parameter runs, and the minor axis is
+/// the normal crossed with the major, times the ratio. Drawn from above, so
+/// a plane that is not flat has an ellipse that is squashed, and one with a
+/// normal of -Z runs the other way round.
+pub fn flatten_ellipse_in_space(
+    center: [f64; 3],
+    major: [f64; 3],
+    normal: [f64; 3],
+    ratio: f64,
+    start_param: f64,
+    end_param: f64,
+) -> Vec<[f64; 2]> {
+    let length = normal.iter().map(|v| v * v).sum::<f64>().sqrt();
+    let n = if length.is_finite() && length > 0.0 {
+        normal.map(|v| v / length)
+    } else {
+        [0.0, 0.0, 1.0]
+    };
+    let r = ratio.abs();
+    if !r.is_finite() {
+        return Vec::new();
+    }
+    let minor = [
+        (n[1] * major[2] - n[2] * major[1]) * r,
+        (n[2] * major[0] - n[0] * major[2]) * r,
+    ];
+    flatten_ellipse_axes(
+        [center[0], center[1]],
+        [major[0], major[1]],
+        minor,
+        start_param,
+        end_param,
+    )
+}
+
+/// Sample the ellipse `centre + u cos t + v sin t` between two parameters.
+fn flatten_ellipse_axes(
+    c: [f64; 2],
+    u: [f64; 2],
+    v: [f64; 2],
+    start_param: f64,
+    end_param: f64,
+) -> Vec<[f64; 2]> {
+    let a = u[0].hypot(u[1]);
+    let b = v[0].hypot(v[1]);
+    if !a.is_finite() || !b.is_finite() || (a <= 0.0 && b <= 0.0) {
         return Vec::new();
     }
-    let b = a * ratio.abs();
-    let rot = major_y.atan2(major_x);
-    let (sin_r, cos_r) = rot.sin_cos();
+    let (big, small) = (a.max(b), a.min(b));
 
     let sweep = end_param - start_param;
     // A full ellipse is stored as 0..2pi; treat a zero sweep as closed.
@@ -93,14 +200,15 @@ pub fn flatten_ellipse(
     };
 
     // Use the larger semi-axis for the segment budget so flat ellipses stay smooth.
-    let n = segments_for_sweep(sweep * (1.0 + (a / b.max(1e-12)).min(8.0)) / 2.0);
+    let n = segments_for_sweep(sweep * (1.0 + (big / small.max(1e-12)).min(8.0)) / 2.0);
     let mut out = Vec::with_capacity(n + 1);
     for i in 0..=n {
         let t = start_param + sweep * (i as f64 / n as f64);
         let (sin_t, cos_t) = t.sin_cos();
-        let ex = a * cos_t;
-        let ey = b * sin_t;
-        out.push([cx + ex * cos_r - ey * sin_r, cy + ex * sin_r + ey * cos_r]);
+        out.push([
+            c[0] + u[0] * cos_t + v[0] * sin_t,
+            c[1] + u[1] * cos_t + v[1] * sin_t,
+        ]);
     }
     out
 }
@@ -256,8 +364,8 @@ pub fn fit_spline(
     // Chord-length parameters.
     let mut t = Vec::with_capacity(pts.len());
     t.push(0.0);
-    for w in pts.windows(2) {
-        let d = (w[1][0] - w[0][0]).hypot(w[1][1] - w[0][1]);
+    for [a, b] in pts.array_windows() {
+        let d = (b[0] - a[0]).hypot(b[1] - a[1]);
         t.push(t[t.len() - 1] + d.max(1e-9));
     }
 
@@ -318,7 +426,7 @@ fn second_derivatives(t: &[f64], y: &[f64], d0: Option<f64>, dn: Option<f64>) ->
     if n < 2 {
         return vec![0.0; n];
     }
-    let h: Vec<f64> = t.windows(2).map(|w| w[1] - w[0]).collect();
+    let h: Vec<f64> = t.array_windows().map(|[a, b]| b - a).collect();
 
     // Tridiagonal system, row i: lower[i] * m[i-1] + diag[i] * m[i] + upper[i] * m[i+1] = rhs[i]
     let mut lower = vec![0.0; n];
@@ -529,6 +637,25 @@ mod tests {
         ((a[0] - b[0]).powi(2) + (a[1] - b[1]).powi(2)).sqrt()
     }
 
+    #[test]
+    fn a_bulge_is_its_arc() {
+        let quarter = (PI / 8.0).tan();
+        // Counter-clockwise from (1,0) to (0,1): about the origin, radius 1.
+        let (cx, cy, r, start, sweep) = bulge_arc([1.0, 0.0], [0.0, 1.0], quarter).unwrap();
+        assert!(cx.abs() < 1e-12 && cy.abs() < 1e-12 && (r - 1.0).abs() < 1e-12);
+        assert!(start.abs() < 1e-12 && (sweep - PI / 2.0).abs() < 1e-12);
+        // Clockwise the other way round: about (1,1).
+        let (cx, cy, _, _, sweep) = bulge_arc([1.0, 0.0], [0.0, 1.0], -quarter).unwrap();
+        assert!((cx - 1.0).abs() < 1e-12 && (cy - 1.0).abs() < 1e-12 && sweep < 0.0);
+        // Three quarters of a turn: its middle point on the far side.
+        let pts = bulge_points([1.0, 0.0], [0.0, -1.0], (3.0 * PI / 8.0).tan(), 2);
+        assert!(
+            dist(pts[1], [-(0.5f64.sqrt()), 0.5f64.sqrt()]) < 1e-12,
+            "{pts:?}"
+        );
+        assert!(bulge_arc([1.0, 0.0], [0.0, 1.0], 0.0).is_none());
+    }
+
     /// `f`'s result, or a failure if it has not returned within five seconds
     /// (the thread is left spinning; the test binary exits anyway).
     fn finishes<T: Send + 'static>(f: impl FnOnce() -> T + Send + 'static) -> T {
@@ -630,6 +757,56 @@ mod tests {
         assert!((max_x - 1.0).abs() < 2e-3, "max_x {max_x}");
     }
 
+    #[test]
+    fn an_ellipse_in_a_tilted_plane_is_drawn_squashed() {
+        // Major axis 10 along x, ratio 0.5, in the plane of normal (0, -.6, .8):
+        // its minor axis is 5 long in that plane, (0, 4, 3), so from above the
+        // ellipse has semi-axes 10 and 4.
+        let pts = flatten_ellipse_in_space(
+            [60.0, 0.0, 0.0],
+            [10.0, 0.0, 0.0],
+            [0.0, -0.6, 0.8],
+            0.5,
+            0.0,
+            TAU,
+        );
+        assert!(pts.len() > 16);
+        for p in &pts {
+            let on = ((p[0] - 60.0) / 10.0).powi(2) + (p[1] / 4.0).powi(2);
+            assert!((on - 1.0).abs() < 1e-9, "{p:?}");
+        }
+    }
+
+    #[test]
+    fn an_ellipse_with_a_normal_of_minus_z_runs_the_other_way_round() {
+        // A quarter from the major axis' end: with +Z it goes up to (0, 5), with
+        // -Z, which turns the plane over, down to (0, -5).
+        let up = flatten_ellipse_in_space(
+            [0.0; 3],
+            [10.0, 0.0, 0.0],
+            [0.0, 0.0, 1.0],
+            0.5,
+            0.0,
+            TAU / 4.0,
+        );
+        let down = flatten_ellipse_in_space(
+            [0.0; 3],
+            [10.0, 0.0, 0.0],
+            [0.0, 0.0, -1.0],
+            0.5,
+            0.0,
+            TAU / 4.0,
+        );
+        assert!(dist(up[0], [10.0, 0.0]) < 1e-9 && dist(*up.last().unwrap(), [0.0, 5.0]) < 1e-9);
+        assert!(
+            dist(down[0], [10.0, 0.0]) < 1e-9 && dist(*down.last().unwrap(), [0.0, -5.0]) < 1e-9
+        );
+        // A normal of no length is Z.
+        let flat =
+            flatten_ellipse_in_space([0.0; 3], [10.0, 0.0, 0.0], [0.0; 3], 0.5, 0.0, TAU / 4.0);
+        assert_eq!(flat, up);
+    }
+
     #[test]
     fn semicircle_bulge_has_correct_radius() {
         // bulge = 1 is a half circle from (0,0) to (2,0) about centre (1,0).
diff --git a/crates/exav-render/src/formats/dwg/dimension.rs b/crates/exav-render/src/formats/dwg/dimension.rs
new file mode 100644
index 00000000..d30aec09
--- /dev/null
+++ b/crates/exav-render/src/formats/dwg/dimension.rs
@@ -0,0 +1,471 @@
+//! A dimension's graphics, for one saved without the anonymous block AutoCAD
+//! draws it from: generators often leave the block out. The geometry follows
+//! the definition points and the style's sizes; what this leaves to the
+//! block (DIMTIH, DIMLUNIT's feet and inches, tolerances, alternate units,
+//! arrows flipped outside a short dimension) is not drawn.
+
+use crate::cad::{DimStyle, Dimension, DimensionKind, Vec3};
+
+/// A style's sizes in drawing units (DIMSCALE applied) and how it writes
+/// numbers.
+pub struct Style {
+    pub asz: f64,
+    pub exo: f64,
+    pub exe: f64,
+    pub dle: f64,
+    pub tsz: f64,
+    pub txt: f64,
+    pub gap: f64,
+    /// Text above the dimension line, else centred on it, the line broken.
+    pub above: bool,
+    pub zin: i16,
+    pub lfac: f64,
+    pub dec: usize,
+    pub adec: usize,
+    pub dsep: char,
+}
+
+impl Style {
+    pub fn new(s: &DimStyle) -> Style {
+        let scale = if s.dimscale > 0.0 && s.dimscale.is_finite() {
+            s.dimscale
+        } else {
+            1.0
+        };
+        let size = |v: f64| if v.is_finite() { v.abs() * scale } else { 0.0 };
+        let places = |v: i16| usize::from(v.clamp(0, 8) as u8);
+        Style {
+            asz: size(s.dimasz),
+            exo: size(s.dimexo),
+            exe: size(s.dimexe),
+            dle: size(s.dimdle),
+            tsz: size(s.dimtsz),
+            txt: size(s.dimtxt),
+            gap: size(s.dimgap),
+            above: s.dimtad != 0,
+            zin: s.dimzin,
+            lfac: if s.dimlfac.is_finite() && s.dimlfac != 0.0 {
+                s.dimlfac.abs()
+            } else {
+                1.0
+            },
+            dec: places(s.dimdec),
+            adec: places(s.dimadec),
+            dsep: char::from_u32(u32::from(s.dimdsep.max(0) as u16))
+                .filter(|c| !c.is_control())
+                .unwrap_or('.'),
+        }
+    }
+}
+
+/// The text, its middle at `at`, turned by `rotation` (radians).
+pub struct Label {
+    pub text: String,
+    pub at: [f64; 2],
+    pub rotation: f64,
+}
+
+#[derive(Default)]
+pub struct Graphics {
+    pub lines: Vec<[[f64; 2]; 2]>,
+    /// Centre, radius, start angle and signed sweep (radians).
+    pub arcs: Vec<([f64; 2], f64, f64, f64)>,
+    /// An arrowhead's tip, and a point it points away from.
+    pub arrows: Vec<([f64; 2], [f64; 2])>,
+    pub label: Option<Label>,
+}
+
+type P = [f64; 2];
+
+fn p(v: Vec3) -> P {
+    [v.x, v.y]
+}
+fn sub(a: P, b: P) -> P {
+    [a[0] - b[0], a[1] - b[1]]
+}
+fn add(a: P, b: P) -> P {
+    [a[0] + b[0], a[1] + b[1]]
+}
+fn mul(a: P, k: f64) -> P {
+    [a[0] * k, a[1] * k]
+}
+fn dot(a: P, b: P) -> f64 {
+    a[0] * b[0] + a[1] * b[1]
+}
+fn len(a: P) -> f64 {
+    a[0].hypot(a[1])
+}
+fn unit(a: P) -> Option<P> {
+    let l = len(a);
+    (l > 1e-12 && l.is_finite()).then(|| mul(a, 1.0 / l))
+}
+fn perp(a: P) -> P {
+    [-a[1], a[0]]
+}
+fn polar(a: f64) -> P {
+    [a.cos(), a.sin()]
+}
+
+/// An angle turned to read left to right: in (-90, 90] degrees.
+fn readable(a: f64) -> f64 {
+    use std::f64::consts::{FRAC_PI_2, PI, TAU};
+    let a = a.rem_euclid(TAU);
+    if a > FRAC_PI_2 + 1e-9 && a <= 3.0 * FRAC_PI_2 + 1e-9 {
+        a - PI
+    } else if a > 3.0 * FRAC_PI_2 {
+        a - TAU
+    } else {
+        a
+    }
+}
+
+/// A number as the style writes it: its decimal places, its separator, and
+/// leading (4) or trailing (8) zeros suppressed as DIMZIN says.
+pub fn number(v: f64, places: usize, zin: i16, sep: char) -> String {
+    // Halves away from zero, as AutoCAD rounds: formatting alone takes them
+    // to even, 100.5 to 100.
+    let k = 10f64.powi(places as i32);
+    let rounded = (v * k).round() / k;
+    let v = if rounded.is_finite() { rounded } else { v };
+    let mut s = format!("{v:.places$}");
+    if s.starts_with('-') && s[1..].chars().all(|c| c == '0' || c == '.') {
+        s.remove(0);
+    }
+    if zin & 8 != 0 && s.contains('.') {
+        s = s.trim_end_matches('0').trim_end_matches('.').to_string();
+    }
+    if zin & 4 != 0 {
+        if let Some(rest) = s.strip_prefix("0.") {
+            s = format!(".{rest}");
+        } else if let Some(rest) = s.strip_prefix("-0.") {
+            s = format!("-.{rest}");
+        }
+    }
+    if sep != '.' {
+        s = s.replace('.', &sep.to_string());
+    }
+    s
+}
+
+/// What the dimension says: its own text, where `<>` stands for the
+/// measurement (empty is the measurement alone, a single space nothing).
+fn content(d: &Dimension, measured: String) -> Option<String> {
+    match d.text.as_str() {
+        " " => None,
+        "" => Some(measured),
+        t => Some(t.replace("<>", &measured)),
+    }
+}
+
+/// The text's middle the dimension stores (group 11), when it stores one:
+/// a generator that leaves out the block leaves it at the origin too.
+fn stored_text(d: &Dimension) -> Option<P> {
+    let t = d.text_midpoint;
+    (d.flags & 128 != 0 || t.x != 0.0 || t.y != 0.0).then(|| p(t))
+}
+
+pub fn graphics(d: &Dimension, s: &Style, measure: &dyn Fn(&str) -> f64) -> Option<Graphics> {
+    match d.kind {
+        DimensionKind::Linear | DimensionKind::Aligned => linear(d, s, measure),
+        DimensionKind::Radius | DimensionKind::Diameter => radial(d, s),
+        DimensionKind::Angular | DimensionKind::Angular3Point => angular(d, s),
+        DimensionKind::Ordinate => ordinate(d, s),
+    }
+}
+
+/// An extension line from `from` to `to` on the dimension line: `exo` short
+/// of the feature, `exe` past the line.
+fn extension(g: &mut Graphics, from: P, to: P, s: &Style) {
+    if let Some(e) = unit(sub(to, from))
+        && len(sub(to, from)) > s.exo
+    {
+        g.lines
+            .push([add(from, mul(e, s.exo)), add(to, mul(e, s.exe))]);
+    }
+}
+
+/// The ends of a dimension line or arc: arrowheads, or with DIMTSZ ticks
+/// at 45 degrees and the line run on by DIMDLE.
+fn ends(g: &mut Graphics, a: P, b: P, s: &Style) {
+    let Some(u) = unit(sub(b, a)) else {
+        return;
+    };
+    if s.tsz > 0.0 {
+        let t = mul(add(u, perp(u)), 0.5 * s.tsz);
+        for c in [a, b] {
+            g.lines.push([sub(c, t), add(c, t)]);
+        }
+    } else {
+        g.arrows.push((a, b));
+        g.arrows.push((b, a));
+    }
+}
+
+fn linear(d: &Dimension, s: &Style, measure: &dyn Fn(&str) -> f64) -> Option<Graphics> {
+    let (p1, p2, on) = (p(d.point13), p(d.point14), p(d.definition_point));
+    let u = match d.kind {
+        DimensionKind::Aligned => unit(sub(p2, p1)).unwrap_or([1.0, 0.0]),
+        _ => polar(d.angle),
+    };
+    let a = add(on, mul(u, dot(sub(p1, on), u)));
+    let b = add(on, mul(u, dot(sub(p2, on), u)));
+    let mut g = Graphics::default();
+    extension(&mut g, p1, a, s);
+    extension(&mut g, p2, b, s);
+    let measured = dot(sub(p2, p1), u).abs() * s.lfac;
+    let rotation = if d.text_rotation != 0.0 {
+        d.text_rotation
+    } else {
+        readable(u[1].atan2(u[0]))
+    };
+    let up = perp(polar(rotation));
+    let mid = mul(add(a, b), 0.5);
+    let label = content(d, number(measured, s.dec, s.zin, s.dsep)).map(|text| Label {
+        at: stored_text(d).unwrap_or_else(|| {
+            if s.above {
+                add(mid, mul(up, s.gap + s.txt / 2.0))
+            } else {
+                mid
+            }
+        }),
+        text,
+        rotation,
+    });
+    let du = unit(sub(b, a)).unwrap_or(u);
+    let run_on = if s.tsz > 0.0 {
+        mul(du, s.dle)
+    } else {
+        [0.0, 0.0]
+    };
+    let (from, to) = (sub(a, run_on), add(b, run_on));
+    // Text on the line breaks it, a gap either side.
+    let cut = label.as_ref().filter(|l| {
+        let off = sub(l.at, a);
+        let along = dot(off, du);
+        (dot(off, perp(du))).abs() < s.txt / 2.0 && along > 0.0 && along < len(sub(b, a))
+    });
+    match cut {
+        Some(l) => {
+            let half = measure(&l.text) * s.txt / 2.0 + s.gap;
+            let along = dot(sub(l.at, a), du);
+            let (c0, c1) = (add(a, mul(du, along - half)), add(a, mul(du, along + half)));
+            if dot(sub(c0, from), du) > 0.0 {
+                g.lines.push([from, c0]);
+            }
+            if dot(sub(to, c1), du) > 0.0 {
+                g.lines.push([c1, to]);
+            }
+        }
+        None => g.lines.push([from, to]),
+    }
+    ends(&mut g, a, b, s);
+    g.label = label;
+    Some(g)
+}
+
+fn radial(d: &Dimension, s: &Style) -> Option<Graphics> {
+    let (far, near) = (p(d.definition_point), p(d.point15));
+    let mut g = Graphics::default();
+    let label_at = stored_text(d);
+    let (measured, prefix) = match d.kind {
+        DimensionKind::Radius => (len(sub(near, far)), "R"),
+        _ => (len(sub(near, far)), "%%c"),
+    };
+    let u = unit(sub(near, far))?;
+    match d.kind {
+        DimensionKind::Radius => {
+            // From the centre to the curve, or from the curve out to text
+            // placed outside it.
+            let outside = label_at.filter(|t| len(sub(*t, far)) > measured);
+            match outside {
+                Some(t) => g.lines.push([near, t]),
+                None => g.lines.push([far, near]),
+            }
+            g.arrows.push((near, far));
+        }
+        _ => {
+            g.lines.push([far, near]);
+            g.arrows.push((near, far));
+            g.arrows.push((far, near));
+        }
+    }
+    let rotation = if d.text_rotation != 0.0 {
+        d.text_rotation
+    } else {
+        readable(u[1].atan2(u[0]))
+    };
+    let mid = mul(add(far, near), 0.5);
+    // The prefix is part of the measurement, `<>` included.
+    let measured = format!(
+        "{prefix}{}",
+        number(measured * s.lfac, s.dec, s.zin, s.dsep)
+    );
+    g.label = content(d, measured).map(|text| Label {
+        at: label_at.unwrap_or_else(|| add(mid, mul(perp(polar(rotation)), s.gap + s.txt / 2.0))),
+        text,
+        rotation,
+    });
+    Some(g)
+}
+
+/// Where two lines cross, each through two points.
+fn crossing(a0: P, a1: P, b0: P, b1: P) -> Option<P> {
+    let (r, q) = (sub(a1, a0), sub(b1, b0));
+    let den = r[0] * q[1] - r[1] * q[0];
+    if den.abs() < 1e-12 * len(r) * len(q) || !den.is_finite() {
+        return None;
+    }
+    let t = ((b0[0] - a0[0]) * q[1] - (b0[1] - a0[1]) * q[0]) / den;
+    Some(add(a0, mul(r, t)))
+}
+
+fn angular(d: &Dimension, s: &Style) -> Option<Graphics> {
+    use std::f64::consts::{PI, TAU};
+    // The two legs, as the rays out of the centre and the feature points
+    // along each.
+    let (centre, legs, on) = match d.kind {
+        DimensionKind::Angular3Point => {
+            let c = p(d.point15);
+            (
+                c,
+                [[c, p(d.point13)], [c, p(d.point14)]],
+                p(d.definition_point),
+            )
+        }
+        _ => {
+            let l1 = [p(d.point13), p(d.point14)];
+            let l2 = [p(d.point15), p(d.definition_point)];
+            (
+                crossing(l1[0], l1[1], l2[0], l2[1])?,
+                [l1, l2],
+                p(d.point16),
+            )
+        }
+    };
+    let radius = len(sub(on, centre));
+    if !(radius > 1e-12) {
+        return None;
+    }
+    let theta = (on[1] - centre[1]).atan2(on[0] - centre[0]);
+    let (start, sweep) = match d.kind {
+        DimensionKind::Angular3Point => {
+            let a1 = angle_of(sub(legs[0][1], centre))?;
+            let a2 = angle_of(sub(legs[1][1], centre))?;
+            let ccw = (a2 - a1).rem_euclid(TAU);
+            if (theta - a1).rem_euclid(TAU) <= ccw {
+                (a1, ccw)
+            } else {
+                (a2, TAU - ccw)
+            }
+        }
+        _ => {
+            // The sector of the four the two lines make that holds the arc's
+            // point.
+            let a1 = angle_of(sub(legs[0][1], legs[0][0]))?;
+            let a2 = angle_of(sub(legs[1][1], legs[1][0]))?;
+            let mut rays = [a1, a1 + PI, a2, a2 + PI].map(|a| a.rem_euclid(TAU));
+            rays.sort_by(f64::total_cmp);
+            let t = theta.rem_euclid(TAU);
+            let i = rays.iter().rposition(|r| *r <= t).unwrap_or(3);
+            let (lo, hi) = (rays[i], if i == 3 { rays[0] + TAU } else { rays[i + 1] });
+            (lo, hi - lo)
+        }
+    };
+    let mut g = Graphics::default();
+    g.arcs.push((centre, radius, start, sweep));
+    let e1 = add(centre, mul(polar(start), radius));
+    let e2 = add(centre, mul(polar(start + sweep), radius));
+    // An extension line from the leg's nearer feature point out to the arc,
+    // when the arc lies beyond the leg.
+    for (end, ray) in [(e1, polar(start)), (e2, polar(start + sweep))] {
+        let leg = legs.iter().find(|l| {
+            let dir = sub(l[1], l[0]);
+            (dir[0] * ray[1] - dir[1] * ray[0]).abs() < 1e-9 * len(dir)
+        });
+        if let Some(leg) = leg {
+            let ts: Vec<(f64, P)> = leg
+                .iter()
+                .map(|q| (dot(sub(*q, centre), ray), *q))
+                .collect();
+            let near = ts
+                .iter()
+                .min_by(|a, b| (a.0 - radius).abs().total_cmp(&(b.0 - radius).abs()))?;
+            let (lo, hi) = (ts[0].0.min(ts[1].0), ts[0].0.max(ts[1].0));
+            if radius > hi + 1e-9 || radius < lo - 1e-9 {
+                extension(&mut g, near.1, end, s);
+            }
+        }
+    }
+    if s.tsz > 0.0 {
+        ends(&mut g, e1, e2, s);
+    } else {
+        let t1 = perp(polar(start));
+        let t2 = perp(polar(start + sweep));
+        g.arrows.push((e1, add(e1, t1)));
+        g.arrows.push((e2, sub(e2, t2)));
+    }
+    let mid = start + sweep / 2.0;
+    let rotation = if d.text_rotation != 0.0 {
+        d.text_rotation
+    } else {
+        readable(mid + PI / 2.0)
+    };
+    let lift = if s.above { s.gap + s.txt / 2.0 } else { 0.0 };
+    let degrees = number(sweep.to_degrees(), s.adec, 0, s.dsep) + "%%d";
+    g.label = content(d, degrees).map(|text| Label {
+        at: stored_text(d).unwrap_or_else(|| add(centre, mul(polar(mid), radius + lift))),
+        text,
+        rotation,
+    });
+    Some(g)
+}
+
+fn angle_of(v: P) -> Option<f64> {
+    unit(v).map(|u| u[1].atan2(u[0]))
+}
+
+fn ordinate(d: &Dimension, s: &Style) -> Option<Graphics> {
+    use std::f64::consts::FRAC_PI_2;
+    let (origin, feature, end) = (p(d.definition_point), p(d.point13), p(d.point14));
+    let x_type = d.flags & 64 != 0;
+    let mut g = Graphics::default();
+    extension(&mut g, feature, end, s);
+    let measured = if x_type {
+        feature[0] - origin[0]
+    } else {
+        feature[1] - origin[1]
+    };
+    let rotation = if x_type { FRAC_PI_2 } else { 0.0 };
+    let dir = unit(sub(end, feature)).unwrap_or(polar(rotation));
+    g.label = content(d, number(measured.abs() * s.lfac, s.dec, s.zin, s.dsep)).map(|text| Label {
+        at: stored_text(d).unwrap_or_else(|| add(end, mul(dir, s.gap + s.txt))),
+        text,
+        rotation,
+    });
+    Some(g)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn numbers_follow_the_style() {
+        assert_eq!(number(12.5, 4, 0, '.'), "12.5000");
+        assert_eq!(number(12.5, 4, 8, '.'), "12.5");
+        assert_eq!(number(12.0, 2, 8, ','), "12");
+        assert_eq!(number(0.25, 2, 4, ','), ",25");
+        assert_eq!(number(-0.0001, 2, 0, '.'), "0.00");
+        assert_eq!(number(100.5, 0, 0, '.'), "101");
+        assert_eq!(number(2.25, 1, 0, '.'), "2.3");
+    }
+
+    #[test]
+    fn readable_text_never_runs_upside_down() {
+        use std::f64::consts::PI;
+        assert!((readable(PI) - 0.0).abs() < 1e-12);
+        assert!((readable(-PI / 2.0) - PI / 2.0).abs() < 1e-12);
+        assert!((readable(PI / 2.0) - PI / 2.0).abs() < 1e-12);
+        assert!((readable(0.3) - 0.3).abs() < 1e-12);
+    }
+}
diff --git a/crates/exav-render/src/formats/dwg/fill.rs b/crates/exav-render/src/formats/dwg/fill.rs
index f0248c74..c9aa1b82 100644
--- a/crates/exav-render/src/formats/dwg/fill.rs
+++ b/crates/exav-render/src/formats/dwg/fill.rs
@@ -252,8 +252,7 @@ pub fn fill_region(loops: &[Vec<[f64; 2]>], style: IslandStyle) -> Vec<[f64; 2]>
     let mut next = 0;
     let mut active: Vec<usize> = Vec::new();
 
-    for w in ys.windows(2) {
-        let (ya, yb) = (w[0], w[1]);
+    for &[ya, yb] in ys.array_windows() {
         if yb - ya < 1e-12 {
             continue;
         }
diff --git a/crates/exav-render/src/formats/dwg/font.rs b/crates/exav-render/src/formats/dwg/font.rs
index 9b8a8a34..d2a85e2a 100644
--- a/crates/exav-render/src/formats/dwg/font.rs
+++ b/crates/exav-render/src/formats/dwg/font.rs
@@ -409,6 +409,73 @@ fn table_for(f: TrueTypeFace) -> (&'static [u16], &'static [(u32, u16)], f32) {
     }
 }
 
+/// A font whose letters stand for other characters.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum Symbols {
+    /// Symbol's Greek and mathematical signs; the SHX Greek fonts' letters.
+    Symbol,
+    /// greeks.shx, greekc.shx: Greek letters only.
+    Greek,
+    /// gdt.shx: the geometric tolerancing signs on lowercase letters.
+    Gdt,
+}
+
+/// The symbol set a font file draws, by name.
+pub fn symbols_of(file: &str) -> Option<Symbols> {
+    let lower = file.trim().to_ascii_lowercase();
+    let base = lower.rsplit(['/', '\\']).next().unwrap_or(&lower);
+    let stem = base.rsplit_once('.').map_or(base, |(s, _)| s);
+    match stem {
+        "symbol" => Some(Symbols::Symbol),
+        "greeks" | "greekc" => Some(Symbols::Greek),
+        "gdt" | "amgdt" => Some(Symbols::Gdt),
+        _ => None,
+    }
+}
+
+/// Greek for the Latin letters, in the order Symbol puts them: A Alpha, C
+/// Chi, F Phi, J theta symbol, Q Theta, V final sigma, W Omega...
+const GREEK_UPPER: [char; 26] = [
+    'Α', 'Β', 'Χ', 'Δ', 'Ε', 'Φ', 'Γ', 'Η', 'Ι', 'ϑ', 'Κ', 'Λ', 'Μ', 'Ν', 'Ο', 'Π', 'Θ', 'Ρ', 'Σ',
+    'Τ', 'Υ', 'ς', 'Ω', 'Ξ', 'Ψ', 'Ζ',
+];
+const GREEK_LOWER: [char; 26] = [
+    'α', 'β', 'χ', 'δ', 'ε', 'φ', 'γ', 'η', 'ι', 'ϕ', 'κ', 'λ', 'μ', 'ν', 'ο', 'π', 'θ', 'ρ', 'σ',
+    'τ', 'υ', 'ϖ', 'ω', 'ξ', 'ψ', 'ζ',
+];
+/// gdt.shx's lowercase letters: a angularity, b perpendicularity, c
+/// flatness, d surface profile, e circularity, f parallelism, g
+/// cylindricity, h circular runout, i symmetry, j position, k line profile,
+/// l LMC, m MMC, n diameter, o square, p projected zone, q centre line, r
+/// concentricity, s RFS, t total runout, u straightness, v counterbore, w
+/// countersink, x depth, y conical taper, z slope.
+const GDT: [char; 26] = [
+    '∠', '⊥', '⏥', '⌓', '○', '∥', '⌭', '↗', '⌯', '⌖', '⌒', 'Ⓛ', 'Ⓜ', '⌀', '□', 'Ⓟ', '℄', '◎', 'Ⓢ',
+    '⌰', '⏤', '⌴', '⌵', '↧', '⌲', '⌳',
+];
+
+/// What a string in a symbol font shows.
+pub fn map_symbols(s: &str, set: Symbols) -> String {
+    let letter = |c: char, table: &[char; 26]| table[(c as u8 - b'a') as usize];
+    s.chars()
+        .map(|c| match (set, c) {
+            (Symbols::Symbol | Symbols::Greek, 'A'..='Z') => GREEK_UPPER[(c as u8 - b'A') as usize],
+            (Symbols::Symbol | Symbols::Greek, 'a'..='z') => letter(c, &GREEK_LOWER),
+            (Symbols::Gdt, 'a'..='z') => letter(c, &GDT),
+            (Symbols::Symbol, '"') => '∀',
+            (Symbols::Symbol, '$') => '∃',
+            (Symbols::Symbol, '\'') => '∋',
+            (Symbols::Symbol, '*') => '∗',
+            (Symbols::Symbol, '-') => '−',
+            (Symbols::Symbol, '@') => '≅',
+            (Symbols::Symbol, '\\') => '∴',
+            (Symbols::Symbol, '^') => '⊥',
+            (Symbols::Symbol, '~') => '∼',
+            _ => c,
+        })
+        .collect()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -420,6 +487,28 @@ mod tests {
         }
     }
 
+    /// Greek and Cyrillic have their own widths, not the fallback's.
+    #[test]
+    fn greek_and_cyrillic_are_measured() {
+        let m = Metrics::for_face(Face::default());
+        assert!(m.advance('Ж') > m.advance('г') * 1.5);
+        assert!(m.advance('Ω') > m.advance('ι') * 1.5);
+        assert_eq!(m.advance('Ω'), m.advance('\u{03A9}'));
+    }
+
+    #[test]
+    fn symbol_fonts_draw_what_their_letters_stand_for() {
+        assert_eq!(symbols_of("SYMBOL.TTF"), Some(Symbols::Symbol));
+        assert_eq!(symbols_of("fonts\\greeks.shx"), Some(Symbols::Greek));
+        assert_eq!(symbols_of("gdt"), Some(Symbols::Gdt));
+        assert_eq!(symbols_of("arial.ttf"), None);
+        assert_eq!(map_symbols("abg D=@", Symbols::Symbol), "αβγ Δ=≅");
+        // The SHX Greek fonts change letters only.
+        assert_eq!(map_symbols("abg D=@", Symbols::Greek), "αβγ Δ=@");
+        // GD&T: diameter 0.05, position, MMC; capitals stay.
+        assert_eq!(map_symbols("n0.05 jm A", Symbols::Gdt), "⌀0.05 ⌖Ⓜ A");
+    }
+
     /// The case the corpus is full of: a stock stroke font, stored with no
     /// extension at all. Testing for ".shx" would miss every one of these.
     #[test]
diff --git a/crates/exav-render/src/formats/dwg/hatch.rs b/crates/exav-render/src/formats/dwg/hatch.rs
index 88ffb0cc..17b3a475 100644
--- a/crates/exav-render/src/formats/dwg/hatch.rs
+++ b/crates/exav-render/src/formats/dwg/hatch.rs
@@ -128,11 +128,7 @@ fn bbox(loops: &[Loop]) -> Option<[f64; 4]> {
             b[3] = b[3].max(p[1]);
         }
     }
-    if any {
-        Some(b)
-    } else {
-        None
-    }
+    if any { Some(b) } else { None }
 }
 
 /// Parameters along `u` where a line through `origin` crosses the loops,
@@ -235,11 +231,7 @@ pub fn min_spacing(lines: &[PatternLine]) -> f64 {
             best = best.min(step);
         }
     }
-    if best == f64::MAX {
-        0.0
-    } else {
-        best
-    }
+    if best == f64::MAX { 0.0 } else { best }
 }
 
 /// Generate the drawn segments of a hatch pattern, clipped to the region.
diff --git a/crates/exav-render/src/formats/dwg/linetype.rs b/crates/exav-render/src/formats/dwg/linetype.rs
index 6e613704..ce365732 100644
--- a/crates/exav-render/src/formats/dwg/linetype.rs
+++ b/crates/exav-render/src/formats/dwg/linetype.rs
@@ -10,27 +10,74 @@
 /// segments for something that reads as solid anyway.
 const MAX_DASHES: usize = 20_000;
 
-/// Text carried by one element of a complex linetype.
+/// Text or a shape carried by one element of a complex linetype.
 ///
 /// A linetype like GAZ draws its dashes and stamps "GAS" into the gaps at every
 /// repetition. Without this the line is drawn as plain dashes and the label
 /// that says what the pipe carries is missing.
 #[derive(Clone, Debug)]
 pub struct Label {
-    /// Index into `runs` of the element that carries the text.
+    /// Index into `runs` of the element that carries the label, which is
+    /// placed at that element's end.
     pub run: usize,
-    pub text: String,
-    /// Text height in drawing units.
+    pub mark: Mark,
+    /// Text height, or the shape's unit, in drawing units.
     pub height: f64,
-    /// Offset from the element's position: along the line, then across it.
+    /// Offset from the element's end: along the line, then across it.
     pub offset: [f64; 2],
     pub rotation: f64,
     /// Rotation is world-absolute rather than relative to the line.
     pub absolute_rotation: bool,
-    /// The face the label's text style resolves to. These are usually stroke
-    /// fonts, since a linetype that stamps a symbol along a line is drawn from
-    /// an SHX shape file.
-    pub face: super::font::Face,
+}
+
+#[derive(Clone, Debug)]
+pub enum Mark {
+    /// `face` is what the label's text style resolves to.
+    Text {
+        text: String,
+        face: super::font::Face,
+    },
+    /// A shape of ltypeshp.shx, as `ltypeshp_shape` draws it.
+    Shape(&'static [ShapePart]),
+}
+
+/// A piece of a shape, in shape units from its insertion point, the line
+/// running along +x.
+#[derive(Debug, PartialEq)]
+pub enum ShapePart {
+    Line(&'static [[f64; 2]]),
+    /// Centre, radius, start angle and signed sweep (radians).
+    Arc([f64; 2], f64, f64, f64),
+}
+
+/// The shapes of ltypeshp.shx, which AutoCAD's own complex linetypes
+/// (TRACKS, ZIGZAG, FENCELINE1 and 2, BATTING) stamp, redrawn here: the file
+/// itself cannot be shipped, any more than an SHX font. Others are left out.
+pub fn ltypeshp_shape(number: i16) -> Option<&'static [ShapePart]> {
+    use std::f64::consts::PI;
+    const TRACK1: &[ShapePart] = &[ShapePart::Line(&[[0.0, 1.0], [0.0, -1.0]])];
+    const ZIG: &[ShapePart] = &[ShapePart::Line(&[[0.0, 0.0], [1.0, 1.0], [2.0, 0.0]])];
+    const BOX: &[ShapePart] = &[ShapePart::Line(&[
+        [0.0, -1.0],
+        [2.0, -1.0],
+        [2.0, 1.0],
+        [0.0, 1.0],
+        [0.0, -1.0],
+    ])];
+    const CIRC1: &[ShapePart] = &[ShapePart::Arc([1.0, 0.0], 1.0, PI, -2.0 * PI)];
+    const BAT: &[ShapePart] = &[
+        ShapePart::Line(&[[0.0, 0.0], [-1.0, 2.0]]),
+        ShapePart::Arc([1.0, 2.0], 2.0, PI, -PI),
+        ShapePart::Line(&[[3.0, 2.0], [2.0, 0.0]]),
+    ];
+    match number {
+        130 => Some(TRACK1),
+        131 => Some(ZIG),
+        132 => Some(BOX),
+        133 => Some(CIRC1),
+        134 => Some(BAT),
+        _ => None,
+    }
 }
 
 /// One placed copy of a label, in drawing coordinates.
@@ -94,8 +141,8 @@ impl Pattern {
 #[cfg(test)]
 fn polyline_length(pts: &[[f64; 2]], closed: bool) -> f64 {
     let mut total = 0.0;
-    for w in pts.windows(2) {
-        total += ((w[1][0] - w[0][0]).powi(2) + (w[1][1] - w[0][1]).powi(2)).sqrt();
+    for [a, b] in pts.array_windows() {
+        total += ((b[0] - a[0]).powi(2) + (b[1] - a[1]).powi(2)).sqrt();
     }
     if closed && pts.len() > 2 {
         let a = pts[pts.len() - 1];
@@ -215,7 +262,8 @@ pub fn dash_polyline(
     Some(out)
 }
 
-/// Where each copy of the pattern's embedded text lands along a polyline.
+/// Where each copy of the pattern's embedded text and shapes lands along a
+/// polyline: the end of the element carrying it, shifted by its offset.
 ///
 /// The phase is the same walk the dashes use, so a label sits in the gap its
 /// definition puts it in rather than drifting against the dashes.
@@ -241,7 +289,7 @@ pub fn dash_labels(pts: &[[f64; 2]], closed: bool, pattern: &Pattern) -> Vec<Pla
                 if label.run != i {
                     continue;
                 }
-                let at = s + label.offset[0];
+                let at = s + run.abs() + label.offset[0];
                 if at < 0.0 || at > len {
                     continue;
                 }
@@ -296,8 +344,8 @@ fn arc_lengths(pts: &[[f64; 2]], closed: bool) -> Option<(Vec<[f64; 2]>, Vec<f64
     let mut cum = Vec::with_capacity(path.len());
     let mut acc = 0.0;
     cum.push(0.0);
-    for w in path.windows(2) {
-        acc += ((w[1][0] - w[0][0]).powi(2) + (w[1][1] - w[0][1]).powi(2)).sqrt();
+    for [a, b] in path.array_windows() {
+        acc += ((b[0] - a[0]).powi(2) + (b[1] - a[1]).powi(2)).sqrt();
         cum.push(acc);
     }
     (acc > 1e-12).then_some((path, cum))
@@ -323,12 +371,14 @@ mod embedded_text {
             &[10.0, -5.0],
             &[Label {
                 run: 1,
-                text: "GAS".to_string(),
+                mark: Mark::Text {
+                    text: "GAS".to_string(),
+                    face: super::super::font::Face::Stroke,
+                },
                 height: 2.54,
                 offset: [-2.54, -1.27],
                 rotation: 0.0,
                 absolute_rotation: false,
-                face: super::super::font::Face::Stroke,
             }],
             scale,
         )
@@ -347,13 +397,8 @@ mod embedded_text {
         );
 
         // Evenly spaced, one period apart.
-        for w in places.windows(2) {
-            assert!(
-                (w[1].x - w[0].x - 15.0).abs() < 1e-6,
-                "{} to {}",
-                w[0].x,
-                w[1].x
-            );
+        for [a, b] in places.array_windows() {
+            assert!((b.x - a.x - 15.0).abs() < 1e-6, "{} to {}", a.x, b.x);
         }
     }
 
@@ -361,9 +406,9 @@ mod embedded_text {
     fn the_offsets_place_it_along_and_across_the_line() {
         let places = dash_labels(&[[0.0, 0.0], [100.0, 0.0]], false, &gaz(1.0));
         let first = &places[0];
-        // The dash runs 0..10, so the gap starts at 10 and the label sits
-        // 2.54 back along it and 1.27 below it.
-        assert!((first.x - (10.0 - 2.54)).abs() < 1e-6, "x {}", first.x);
+        // The gap carrying it runs 10..15, and the label sits 2.54 back from
+        // its end and 1.27 below the line.
+        assert!((first.x - (15.0 - 2.54)).abs() < 1e-6, "x {}", first.x);
         assert!((first.y - -1.27).abs() < 1e-6, "y {}", first.y);
         assert!(first.angle.abs() < 1e-9, "angle {}", first.angle);
     }
@@ -374,7 +419,7 @@ mod embedded_text {
         assert!((p.labels[0].height - 5.08).abs() < 1e-9);
         let places = dash_labels(&[[0.0, 0.0], [200.0, 0.0]], false, &p);
         assert!(
-            (places[0].x - (20.0 - 5.08)).abs() < 1e-6,
+            (places[0].x - (30.0 - 5.08)).abs() < 1e-6,
             "x {}",
             places[0].x
         );
@@ -418,12 +463,14 @@ mod tests {
         assert!(dash_polyline(&pts, false, &p).is_none());
         let label = Label {
             run: 1,
-            text: "X".to_string(),
+            mark: Mark::Text {
+                text: "X".to_string(),
+                face: super::super::font::Face::Stroke,
+            },
             height: 1.0,
             offset: [0.0, 0.0],
             rotation: 0.0,
             absolute_rotation: false,
-            face: super::super::font::Face::Stroke,
         };
         let labelled = Pattern::with_labels(&[1.0, -1.0], &[label], 1.0).unwrap();
         assert!(dash_labels(&pts, false, &labelled).is_empty());
@@ -558,9 +605,11 @@ mod tests {
         assert!(dash_polyline(&[], false, &p).unwrap().is_empty());
         assert!(dash_polyline(&[[0.0, 0.0]], false, &p).unwrap().is_empty());
         // Zero-length path.
-        assert!(dash_polyline(&[[1.0, 1.0], [1.0, 1.0]], false, &p)
-            .unwrap()
-            .is_empty());
+        assert!(
+            dash_polyline(&[[1.0, 1.0], [1.0, 1.0]], false, &p)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     #[test]
diff --git a/crates/exav-render/src/formats/dwg/metrics.rs b/crates/exav-render/src/formats/dwg/metrics.rs
index 700e5c7b..89ad8fce 100644
--- a/crates/exav-render/src/formats/dwg/metrics.rs
+++ b/crates/exav-render/src/formats/dwg/metrics.rs
@@ -49,13 +49,187 @@ pub static SANS: [u16; 560] = [
     3186, 2278, 2732, 2048, 1430, 2804, 1504, 910, 3632, 3632, 2732, 2958, 2048, 2278, 2502, 2048,
     2048, 2378, 1856, 2732, 2958, 2736, 2732, 2278, 2048, 910, 3020, 2278, 2958, 1364, 2732, 2048,
 ];
-pub static SANS_SPARSE: [(u32, u16); 22] = [
+pub static SANS_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1364),
     (0x00b3, 1364),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2734),
+    (0x0387, 1138),
+    (0x0388, 3212),
+    (0x0389, 3432),
+    (0x038a, 1572),
+    (0x038c, 3172),
+    (0x038e, 3504),
+    (0x038f, 3082),
+    (0x0390, 910),
+    (0x0391, 2732),
+    (0x0392, 2732),
+    (0x0393, 2256),
+    (0x0394, 2736),
+    (0x0395, 2732),
+    (0x0396, 2502),
+    (0x0397, 2958),
+    (0x0398, 3186),
+    (0x0399, 1138),
+    (0x039a, 2732),
+    (0x039b, 2736),
+    (0x039c, 3412),
+    (0x039d, 2958),
+    (0x039e, 2662),
+    (0x039f, 3186),
+    (0x03a0, 2958),
+    (0x03a1, 2732),
+    (0x03a3, 2532),
+    (0x03a4, 2502),
+    (0x03a5, 2732),
+    (0x03a6, 3268),
+    (0x03a7, 2732),
+    (0x03a8, 3422),
     (0x03a9, 3062),
+    (0x03aa, 1138),
+    (0x03ab, 2732),
+    (0x03ac, 2368),
+    (0x03ad, 1826),
+    (0x03ae, 2278),
+    (0x03af, 910),
+    (0x03b0, 2240),
+    (0x03b1, 2368),
+    (0x03b2, 2356),
+    (0x03b3, 2048),
+    (0x03b4, 2280),
+    (0x03b5, 1826),
+    (0x03b6, 1806),
+    (0x03b7, 2278),
+    (0x03b8, 2278),
+    (0x03b9, 910),
+    (0x03ba, 2048),
+    (0x03bb, 2048),
     (0x03bc, 2360),
+    (0x03bd, 2048),
+    (0x03be, 1834),
+    (0x03bf, 2278),
+    (0x03c0, 2826),
+    (0x03c1, 2330),
+    (0x03c2, 1974),
+    (0x03c3, 2528),
+    (0x03c4, 1618),
+    (0x03c5, 2240),
+    (0x03c6, 2656),
+    (0x03c7, 2150),
+    (0x03c8, 2920),
+    (0x03c9, 3198),
+    (0x03ca, 910),
+    (0x03cb, 2240),
+    (0x03cc, 2278),
+    (0x03cd, 2240),
+    (0x03ce, 3198),
+    (0x03cf, 2732),
+    (0x03d0, 2356),
+    (0x03d1, 2240),
+    (0x03d2, 3164),
+    (0x03d3, 3924),
+    (0x03d4, 3164),
+    (0x03d5, 2294),
+    (0x03d6, 3198),
+    (0x0400, 2732),
+    (0x0401, 2734),
+    (0x0402, 3542),
+    (0x0403, 2218),
+    (0x0404, 2944),
+    (0x0405, 2732),
+    (0x0406, 1138),
+    (0x0407, 1138),
+    (0x0408, 2048),
+    (0x0409, 4330),
+    (0x040a, 4138),
+    (0x040b, 3498),
+    (0x040c, 2386),
+    (0x040d, 2944),
+    (0x040e, 2602),
+    (0x040f, 2944),
+    (0x0410, 2732),
+    (0x0411, 2688),
+    (0x0412, 2732),
+    (0x0413, 2218),
+    (0x0414, 2774),
+    (0x0415, 2732),
+    (0x0416, 3782),
+    (0x0417, 2474),
+    (0x0418, 2944),
+    (0x0419, 2944),
+    (0x041a, 2386),
+    (0x041b, 2688),
+    (0x041c, 3412),
+    (0x041d, 2958),
+    (0x041e, 3186),
+    (0x041f, 2944),
+    (0x0420, 2732),
+    (0x0421, 2958),
+    (0x0422, 2502),
+    (0x0423, 2602),
+    (0x0424, 3114),
+    (0x0425, 2732),
+    (0x0426, 3030),
+    (0x0427, 2730),
+    (0x0428, 3754),
+    (0x0429, 3840),
+    (0x042a, 3242),
+    (0x042b, 3626),
+    (0x042c, 2688),
+    (0x042d, 2944),
+    (0x042e, 4138),
+    (0x042f, 2958),
+    (0x0430, 2278),
+    (0x0431, 2346),
+    (0x0432, 2176),
+    (0x0433, 1494),
+    (0x0434, 2390),
+    (0x0435, 2278),
+    (0x0436, 2740),
+    (0x0437, 1878),
+    (0x0438, 2288),
+    (0x0439, 2288),
+    (0x043a, 1792),
+    (0x043b, 2390),
+    (0x043c, 2816),
+    (0x043d, 2262),
+    (0x043e, 2278),
+    (0x043f, 2218),
+    (0x0440, 2278),
+    (0x0441, 2048),
+    (0x0442, 1876),
+    (0x0443, 2048),
+    (0x0444, 3370),
+    (0x0445, 2048),
+    (0x0446, 2346),
+    (0x0447, 2134),
+    (0x0448, 3286),
+    (0x0449, 3370),
+    (0x044a, 2560),
+    (0x044b, 2944),
+    (0x044c, 2134),
+    (0x044d, 2090),
+    (0x044e, 3072),
+    (0x044f, 2218),
+    (0x0450, 2278),
+    (0x0451, 2278),
+    (0x0452, 2278),
+    (0x0453, 1494),
+    (0x0454, 2090),
+    (0x0455, 2048),
+    (0x0456, 910),
+    (0x0457, 1138),
+    (0x0458, 910),
+    (0x0459, 3712),
+    (0x045a, 3328),
+    (0x045b, 2278),
+    (0x045c, 1792),
+    (0x045d, 2288),
+    (0x045e, 2048),
+    (0x045f, 2260),
     (0x2013, 2278),
     (0x2014, 4096),
     (0x2018, 910),
@@ -69,6 +243,7 @@ pub static SANS_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2392),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -110,13 +285,187 @@ pub static SANS_BOLD: [u16; 560] = [
     3186, 2502, 2732, 2278, 2044, 3414, 2072, 1138, 3906, 3906, 2958, 2958, 2278, 2502, 2502, 2278,
     2048, 2642, 1982, 2958, 2958, 2732, 2732, 2278, 2278, 1138, 3174, 2502, 2958, 1594, 2732, 2278,
 ];
-pub static SANS_BOLD_SPARSE: [(u32, u16); 22] = [
+pub static SANS_BOLD_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1364),
     (0x00b3, 1364),
+    (0x0384, 1364),
+    (0x0385, 1904),
+    (0x0386, 2958),
+    (0x0387, 1364),
+    (0x0388, 3494),
+    (0x0389, 3710),
+    (0x038a, 1940),
+    (0x038c, 3378),
+    (0x038e, 3798),
+    (0x038f, 3432),
+    (0x0390, 1138),
+    (0x0391, 2958),
+    (0x0392, 2958),
+    (0x0393, 2462),
+    (0x0394, 2944),
+    (0x0395, 2732),
+    (0x0396, 2502),
+    (0x0397, 2958),
+    (0x0398, 3186),
+    (0x0399, 1138),
+    (0x039a, 2958),
+    (0x039b, 2732),
+    (0x039c, 3412),
+    (0x039d, 2958),
+    (0x039e, 2636),
+    (0x039f, 3186),
+    (0x03a0, 2958),
+    (0x03a1, 2732),
+    (0x03a3, 2458),
+    (0x03a4, 2502),
+    (0x03a5, 2732),
+    (0x03a6, 3362),
+    (0x03a7, 2732),
+    (0x03a8, 3314),
     (0x03a9, 3284),
+    (0x03aa, 1138),
+    (0x03ab, 2732),
+    (0x03ac, 2518),
+    (0x03ad, 1848),
+    (0x03ae, 2502),
+    (0x03af, 1138),
+    (0x03b0, 2384),
+    (0x03b1, 2518),
+    (0x03b2, 2500),
+    (0x03b3, 2278),
+    (0x03b4, 2484),
+    (0x03b5, 1944),
+    (0x03b6, 1886),
+    (0x03b7, 2502),
+    (0x03b8, 2214),
+    (0x03b9, 1138),
+    (0x03ba, 2284),
+    (0x03bb, 2278),
     (0x03bc, 2506),
+    (0x03bd, 2278),
+    (0x03be, 1824),
+    (0x03bf, 2502),
+    (0x03c0, 3136),
+    (0x03c1, 2534),
+    (0x03c2, 2130),
+    (0x03c3, 2802),
+    (0x03c4, 1828),
+    (0x03c5, 2384),
+    (0x03c6, 2930),
+    (0x03c7, 2358),
+    (0x03c8, 3086),
+    (0x03c9, 3460),
+    (0x03ca, 1138),
+    (0x03cb, 2384),
+    (0x03cc, 2502),
+    (0x03cd, 2384),
+    (0x03ce, 3460),
+    (0x03cf, 2958),
+    (0x03d0, 2500),
+    (0x03d1, 2384),
+    (0x03d2, 3154),
+    (0x03d3, 4100),
+    (0x03d4, 3154),
+    (0x03d5, 3070),
+    (0x03d6, 3460),
+    (0x0400, 2732),
+    (0x0401, 2740),
+    (0x0402, 3626),
+    (0x0403, 2322),
+    (0x0404, 2914),
+    (0x0405, 2732),
+    (0x0406, 1138),
+    (0x0407, 1130),
+    (0x0408, 2278),
+    (0x0409, 4480),
+    (0x040a, 4352),
+    (0x040b, 3584),
+    (0x040c, 2500),
+    (0x040d, 2944),
+    (0x040e, 2548),
+    (0x040f, 2944),
+    (0x0410, 2958),
+    (0x0411, 2944),
+    (0x0412, 2958),
+    (0x0413, 2322),
+    (0x0414, 2918),
+    (0x0415, 2732),
+    (0x0416, 3702),
+    (0x0417, 2566),
+    (0x0418, 2944),
+    (0x0419, 2944),
+    (0x041a, 2500),
+    (0x041b, 2874),
+    (0x041c, 3412),
+    (0x041d, 2958),
+    (0x041e, 3186),
+    (0x041f, 2944),
+    (0x0420, 2732),
+    (0x0421, 2958),
+    (0x0422, 2502),
+    (0x0423, 2548),
+    (0x0424, 3496),
+    (0x0425, 2732),
+    (0x0426, 2992),
+    (0x0427, 2878),
+    (0x0428, 4116),
+    (0x0429, 4174),
+    (0x042a, 3562),
+    (0x042b, 4010),
+    (0x042c, 2944),
+    (0x042d, 2914),
+    (0x042e, 4224),
+    (0x042f, 2944),
+    (0x0430, 2278),
+    (0x0431, 2530),
+    (0x0432, 2518),
+    (0x0433, 1706),
+    (0x0434, 2600),
+    (0x0435, 2278),
+    (0x0436, 2904),
+    (0x0437, 2036),
+    (0x0438, 2518),
+    (0x0439, 2518),
+    (0x043a, 2050),
+    (0x043b, 2602),
+    (0x043c, 3030),
+    (0x043d, 2474),
+    (0x043e, 2502),
+    (0x043f, 2474),
+    (0x0440, 2502),
+    (0x0441, 2278),
+    (0x0442, 2006),
+    (0x0443, 2278),
+    (0x0444, 3584),
+    (0x0445, 2278),
+    (0x0446, 2518),
+    (0x0447, 2378),
+    (0x0448, 3414),
+    (0x0449, 3456),
+    (0x044a, 2986),
+    (0x044b, 3498),
+    (0x044c, 2518),
+    (0x044d, 2262),
+    (0x044e, 3498),
+    (0x044f, 2390),
+    (0x0450, 2278),
+    (0x0451, 2278),
+    (0x0452, 2502),
+    (0x0453, 1706),
+    (0x0454, 2262),
+    (0x0455, 2278),
+    (0x0456, 1138),
+    (0x0457, 1152),
+    (0x0458, 1138),
+    (0x0459, 3968),
+    (0x045a, 3712),
+    (0x045b, 2502),
+    (0x045c, 2050),
+    (0x045d, 2518),
+    (0x045e, 2278),
+    (0x045f, 2474),
     (0x2013, 2278),
     (0x2014, 4096),
     (0x2018, 1138),
@@ -130,6 +479,7 @@ pub static SANS_BOLD_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2392),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -171,13 +521,187 @@ pub static SANS_ITALIC: [u16; 560] = [
     3186, 2278, 2732, 2048, 1204, 2576, 1424, 910, 3618, 3608, 2732, 2958, 2048, 2278, 2502, 2048,
     2048, 2378, 1856, 2732, 2958, 2732, 2732, 2278, 2048, 910, 3092, 2278, 2958, 1364, 2732, 2048,
 ];
-pub static SANS_ITALIC_SPARSE: [(u32, u16); 22] = [
+pub static SANS_ITALIC_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1364),
     (0x00b3, 1364),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2732),
+    (0x0387, 1138),
+    (0x0388, 3230),
+    (0x0389, 3466),
+    (0x038a, 1592),
+    (0x038c, 3252),
+    (0x038e, 3544),
+    (0x038f, 3174),
+    (0x0390, 910),
+    (0x0391, 2732),
+    (0x0392, 2732),
+    (0x0393, 2336),
+    (0x0394, 2748),
+    (0x0395, 2732),
+    (0x0396, 2502),
+    (0x0397, 2958),
+    (0x0398, 3186),
+    (0x0399, 1138),
+    (0x039a, 2732),
+    (0x039b, 2732),
+    (0x039c, 3412),
+    (0x039d, 2958),
+    (0x039e, 2656),
+    (0x039f, 3186),
+    (0x03a0, 2968),
+    (0x03a1, 2732),
+    (0x03a3, 2456),
+    (0x03a4, 2502),
+    (0x03a5, 2732),
+    (0x03a6, 3428),
+    (0x03a7, 2732),
+    (0x03a8, 3402),
     (0x03a9, 3116),
+    (0x03aa, 1138),
+    (0x03ab, 2732),
+    (0x03ac, 2336),
+    (0x03ad, 1800),
+    (0x03ae, 2274),
+    (0x03af, 910),
+    (0x03b0, 2252),
+    (0x03b1, 2336),
+    (0x03b2, 2340),
+    (0x03b3, 2048),
+    (0x03b4, 2276),
+    (0x03b5, 1800),
+    (0x03b6, 1898),
+    (0x03b7, 2274),
+    (0x03b8, 2222),
+    (0x03b9, 910),
+    (0x03ba, 2048),
+    (0x03bb, 2016),
     (0x03bc, 2244),
+    (0x03bd, 2048),
+    (0x03be, 1830),
+    (0x03bf, 2278),
+    (0x03c0, 2744),
+    (0x03c1, 2346),
+    (0x03c2, 1992),
+    (0x03c3, 2470),
+    (0x03c4, 1532),
+    (0x03c5, 2252),
+    (0x03c6, 2672),
+    (0x03c7, 2236),
+    (0x03c8, 2980),
+    (0x03c9, 3190),
+    (0x03ca, 910),
+    (0x03cb, 2252),
+    (0x03cc, 2278),
+    (0x03cd, 2252),
+    (0x03ce, 3190),
+    (0x03cf, 2732),
+    (0x03d0, 2068),
+    (0x03d1, 2252),
+    (0x03d2, 2932),
+    (0x03d3, 3612),
+    (0x03d4, 2932),
+    (0x03d5, 2278),
+    (0x03d6, 3190),
+    (0x0400, 2732),
+    (0x0401, 2732),
+    (0x0402, 3452),
+    (0x0403, 2228),
+    (0x0404, 2898),
+    (0x0405, 2732),
+    (0x0406, 1138),
+    (0x0407, 1138),
+    (0x0408, 2048),
+    (0x0409, 4366),
+    (0x040a, 4024),
+    (0x040b, 3458),
+    (0x040c, 2414),
+    (0x040d, 2930),
+    (0x040e, 2618),
+    (0x040f, 2964),
+    (0x0410, 2732),
+    (0x0411, 2666),
+    (0x0412, 2732),
+    (0x0413, 2228),
+    (0x0414, 2884),
+    (0x0415, 2732),
+    (0x0416, 3756),
+    (0x0417, 2514),
+    (0x0418, 2930),
+    (0x0419, 2930),
+    (0x041a, 2414),
+    (0x041b, 2808),
+    (0x041c, 3412),
+    (0x041d, 2958),
+    (0x041e, 3186),
+    (0x041f, 2968),
+    (0x0420, 2732),
+    (0x0421, 2958),
+    (0x0422, 2502),
+    (0x0423, 2618),
+    (0x0424, 3256),
+    (0x0425, 2732),
+    (0x0426, 2978),
+    (0x0427, 2758),
+    (0x0428, 3770),
+    (0x0429, 3780),
+    (0x042a, 3298),
+    (0x042b, 3630),
+    (0x042c, 2666),
+    (0x042d, 2842),
+    (0x042e, 4188),
+    (0x042f, 2792),
+    (0x0430, 2278),
+    (0x0431, 2304),
+    (0x0432, 2138),
+    (0x0433, 2020),
+    (0x0434, 2264),
+    (0x0435, 2278),
+    (0x0436, 2818),
+    (0x0437, 1904),
+    (0x0438, 2278),
+    (0x0439, 2278),
+    (0x043a, 1934),
+    (0x043b, 2310),
+    (0x043c, 2808),
+    (0x043d, 2254),
+    (0x043e, 2278),
+    (0x043f, 2254),
+    (0x0440, 2278),
+    (0x0441, 2048),
+    (0x0442, 3412),
+    (0x0443, 2048),
+    (0x0444, 3422),
+    (0x0445, 2048),
+    (0x0446, 2342),
+    (0x0447, 2120),
+    (0x0448, 3400),
+    (0x0449, 3486),
+    (0x044a, 2544),
+    (0x044b, 3014),
+    (0x044c, 2154),
+    (0x044d, 2014),
+    (0x044e, 3080),
+    (0x044f, 2188),
+    (0x0450, 2278),
+    (0x0451, 2278),
+    (0x0452, 2278),
+    (0x0453, 1548),
+    (0x0454, 2030),
+    (0x0455, 2048),
+    (0x0456, 910),
+    (0x0457, 910),
+    (0x0458, 910),
+    (0x0459, 3728),
+    (0x045a, 3390),
+    (0x045b, 2278),
+    (0x045c, 1934),
+    (0x045d, 2278),
+    (0x045e, 2048),
+    (0x045f, 2278),
     (0x2013, 2278),
     (0x2014, 4096),
     (0x2018, 910),
@@ -191,6 +715,7 @@ pub static SANS_ITALIC_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2392),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -232,13 +757,187 @@ pub static SANS_BOLD_ITALIC: [u16; 560] = [
     3186, 2502, 2732, 2278, 1852, 3216, 2086, 1138, 3906, 3898, 2958, 2958, 2278, 2502, 2502, 2278,
     2048, 2642, 1982, 2958, 2958, 2732, 2732, 2278, 2278, 1138, 3198, 2502, 2958, 1594, 2732, 2278,
 ];
-pub static SANS_BOLD_ITALIC_SPARSE: [(u32, u16); 22] = [
+pub static SANS_BOLD_ITALIC_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1364),
     (0x00b3, 1364),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2958),
+    (0x0387, 1364),
+    (0x0388, 3498),
+    (0x0389, 3710),
+    (0x038a, 1938),
+    (0x038c, 3458),
+    (0x038e, 3810),
+    (0x038f, 3470),
+    (0x0390, 1138),
+    (0x0391, 2958),
+    (0x0392, 2958),
+    (0x0393, 2498),
+    (0x0394, 2750),
+    (0x0395, 2732),
+    (0x0396, 2502),
+    (0x0397, 2958),
+    (0x0398, 3186),
+    (0x0399, 1138),
+    (0x039a, 2958),
+    (0x039b, 2732),
+    (0x039c, 3412),
+    (0x039d, 2958),
+    (0x039e, 2692),
+    (0x039f, 3186),
+    (0x03a0, 2940),
+    (0x03a1, 2732),
+    (0x03a3, 2418),
+    (0x03a4, 2502),
+    (0x03a5, 2732),
+    (0x03a6, 3368),
+    (0x03a7, 2732),
+    (0x03a8, 3394),
     (0x03a9, 3198),
+    (0x03aa, 1138),
+    (0x03ab, 2732),
+    (0x03ac, 2540),
+    (0x03ad, 1960),
+    (0x03ae, 2502),
+    (0x03af, 1138),
+    (0x03b0, 2422),
+    (0x03b1, 2540),
+    (0x03b2, 2542),
+    (0x03b3, 2278),
+    (0x03b4, 2500),
+    (0x03b5, 1960),
+    (0x03b6, 2014),
+    (0x03b7, 2502),
+    (0x03b8, 2284),
+    (0x03b9, 1138),
+    (0x03ba, 2318),
+    (0x03bb, 2278),
     (0x03bc, 2470),
+    (0x03bd, 2278),
+    (0x03be, 1842),
+    (0x03bf, 2502),
+    (0x03c0, 2916),
+    (0x03c1, 2480),
+    (0x03c2, 2180),
+    (0x03c3, 2718),
+    (0x03c4, 1674),
+    (0x03c5, 2422),
+    (0x03c6, 2882),
+    (0x03c7, 2366),
+    (0x03c8, 3166),
+    (0x03c9, 3418),
+    (0x03ca, 1138),
+    (0x03cb, 2422),
+    (0x03cc, 2502),
+    (0x03cd, 2422),
+    (0x03ce, 3418),
+    (0x03cf, 2958),
+    (0x03d0, 2310),
+    (0x03d1, 2422),
+    (0x03d2, 3066),
+    (0x03d3, 4066),
+    (0x03d4, 3066),
+    (0x03d5, 3102),
+    (0x03d6, 3418),
+    (0x0400, 2732),
+    (0x0401, 2732),
+    (0x0402, 3628),
+    (0x0403, 2514),
+    (0x0404, 2944),
+    (0x0405, 2732),
+    (0x0406, 1138),
+    (0x0407, 1138),
+    (0x0408, 2278),
+    (0x0409, 4482),
+    (0x040a, 4268),
+    (0x040b, 3496),
+    (0x040c, 2518),
+    (0x040d, 2946),
+    (0x040e, 2774),
+    (0x040f, 2946),
+    (0x0410, 2958),
+    (0x0411, 2900),
+    (0x0412, 2958),
+    (0x0413, 2514),
+    (0x0414, 2958),
+    (0x0415, 2732),
+    (0x0416, 3798),
+    (0x0417, 2632),
+    (0x0418, 2946),
+    (0x0419, 2946),
+    (0x041a, 2518),
+    (0x041b, 2814),
+    (0x041c, 3412),
+    (0x041d, 2958),
+    (0x041e, 3186),
+    (0x041f, 2946),
+    (0x0420, 2732),
+    (0x0421, 2958),
+    (0x0422, 2502),
+    (0x0423, 2774),
+    (0x0424, 3198),
+    (0x0425, 2732),
+    (0x0426, 2986),
+    (0x0427, 2900),
+    (0x0428, 4010),
+    (0x0429, 4050),
+    (0x042a, 3498),
+    (0x042b, 4096),
+    (0x042c, 2900),
+    (0x042d, 2944),
+    (0x042e, 4268),
+    (0x042f, 2986),
+    (0x0430, 2278),
+    (0x0431, 2536),
+    (0x0432, 2474),
+    (0x0433, 2186),
+    (0x0434, 2532),
+    (0x0435, 2278),
+    (0x0436, 3016),
+    (0x0437, 2090),
+    (0x0438, 2502),
+    (0x0439, 2502),
+    (0x043a, 2076),
+    (0x043b, 2548),
+    (0x043c, 3030),
+    (0x043d, 2474),
+    (0x043e, 2502),
+    (0x043f, 2502),
+    (0x0440, 2502),
+    (0x0441, 2278),
+    (0x0442, 3642),
+    (0x0443, 2278),
+    (0x0444, 3624),
+    (0x0445, 2278),
+    (0x0446, 2646),
+    (0x0447, 2388),
+    (0x0448, 3642),
+    (0x0449, 3830),
+    (0x044a, 2896),
+    (0x044b, 3498),
+    (0x044c, 2432),
+    (0x044d, 2260),
+    (0x044e, 3542),
+    (0x044f, 2412),
+    (0x0450, 2278),
+    (0x0451, 2278),
+    (0x0452, 2502),
+    (0x0453, 1922),
+    (0x0454, 2306),
+    (0x0455, 2278),
+    (0x0456, 1138),
+    (0x0457, 1138),
+    (0x0458, 1138),
+    (0x0459, 3970),
+    (0x045a, 3710),
+    (0x045b, 2502),
+    (0x045c, 2076),
+    (0x045d, 2502),
+    (0x045e, 2278),
+    (0x045f, 2502),
     (0x2013, 2278),
     (0x2014, 4096),
     (0x2018, 1138),
@@ -252,6 +951,7 @@ pub static SANS_BOLD_ITALIC_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2392),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -293,13 +993,187 @@ pub static SERIF: [u16; 560] = [
     2958, 2048, 2958, 2048, 1138, 2048, 1298, 1138, 3170, 3164, 2958, 2732, 2048, 2502, 2502, 1594,
     1818, 2186, 1628, 2732, 2958, 2970, 2502, 1818, 1594, 1138, 2876, 2048, 2732, 1364, 2958, 2048,
 ];
-pub static SERIF_SPARSE: [(u32, u16); 22] = [
+pub static SERIF_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1228),
     (0x00b3, 1228),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2958),
+    (0x0387, 1138),
+    (0x0388, 2842),
+    (0x0389, 3310),
+    (0x038a, 1684),
+    (0x038c, 2958),
+    (0x038e, 3342),
+    (0x038f, 3044),
+    (0x0390, 1102),
+    (0x0391, 2958),
+    (0x0392, 2732),
+    (0x0393, 2368),
+    (0x0394, 2634),
+    (0x0395, 2502),
+    (0x0396, 2502),
+    (0x0397, 2958),
+    (0x0398, 2958),
+    (0x0399, 1364),
+    (0x039a, 2958),
+    (0x039b, 2970),
+    (0x039c, 3642),
+    (0x039d, 2958),
+    (0x039e, 2634),
+    (0x039f, 2958),
+    (0x03a0, 2958),
+    (0x03a1, 2278),
+    (0x03a3, 2384),
+    (0x03a4, 2502),
+    (0x03a5, 2958),
+    (0x03a6, 2994),
+    (0x03a7, 2958),
+    (0x03a8, 3022),
     (0x03a9, 3044),
+    (0x03aa, 1364),
+    (0x03ab, 2958),
+    (0x03ac, 2146),
+    (0x03ad, 1720),
+    (0x03ae, 2142),
+    (0x03af, 1102),
+    (0x03b0, 2028),
+    (0x03b1, 2146),
+    (0x03b2, 2084),
+    (0x03b3, 1810),
+    (0x03b4, 1930),
+    (0x03b5, 1720),
+    (0x03b6, 1696),
+    (0x03b7, 2142),
+    (0x03b8, 1962),
+    (0x03b9, 1102),
+    (0x03ba, 2064),
+    (0x03bb, 1986),
     (0x03bc, 2196),
+    (0x03bd, 1852),
+    (0x03be, 1826),
+    (0x03bf, 2048),
+    (0x03c0, 2068),
+    (0x03c1, 2044),
+    (0x03c2, 1622),
+    (0x03c3, 2208),
+    (0x03c4, 1646),
+    (0x03c5, 2028),
+    (0x03c6, 2364),
+    (0x03c7, 1818),
+    (0x03c8, 2564),
+    (0x03c9, 2696),
+    (0x03ca, 1102),
+    (0x03cb, 2028),
+    (0x03cc, 2048),
+    (0x03cd, 2028),
+    (0x03ce, 2696),
+    (0x03cf, 2958),
+    (0x03d0, 2084),
+    (0x03d1, 2028),
+    (0x03d2, 2958),
+    (0x03d3, 3646),
+    (0x03d4, 2958),
+    (0x03d5, 2156),
+    (0x03d6, 2696),
+    (0x0400, 2502),
+    (0x0401, 2502),
+    (0x0402, 3080),
+    (0x0403, 2368),
+    (0x0404, 2704),
+    (0x0405, 2278),
+    (0x0406, 1364),
+    (0x0407, 1364),
+    (0x0408, 1594),
+    (0x0409, 3572),
+    (0x040a, 3572),
+    (0x040b, 3036),
+    (0x040c, 2732),
+    (0x040d, 2958),
+    (0x040e, 2900),
+    (0x040f, 2958),
+    (0x0410, 2958),
+    (0x0411, 2352),
+    (0x0412, 2732),
+    (0x0413, 2368),
+    (0x0414, 2794),
+    (0x0415, 2502),
+    (0x0416, 3670),
+    (0x0417, 2052),
+    (0x0418, 2958),
+    (0x0419, 2958),
+    (0x041a, 2732),
+    (0x041b, 2778),
+    (0x041c, 3642),
+    (0x041d, 2958),
+    (0x041e, 2958),
+    (0x041f, 2958),
+    (0x0420, 2278),
+    (0x0421, 2732),
+    (0x0422, 2502),
+    (0x0423, 2900),
+    (0x0424, 3236),
+    (0x0425, 2958),
+    (0x0426, 2958),
+    (0x0427, 2662),
+    (0x0428, 4132),
+    (0x0429, 4132),
+    (0x042a, 2892),
+    (0x042b, 3572),
+    (0x042c, 2352),
+    (0x042d, 2704),
+    (0x042e, 4210),
+    (0x042f, 2732),
+    (0x0430, 1818),
+    (0x0431, 2084),
+    (0x0432, 1934),
+    (0x0433, 1680),
+    (0x0434, 2084),
+    (0x0435, 1818),
+    (0x0436, 2830),
+    (0x0437, 1618),
+    (0x0438, 2192),
+    (0x0439, 2192),
+    (0x043a, 1990),
+    (0x043b, 2044),
+    (0x043c, 2592),
+    (0x043d, 2192),
+    (0x043e, 2048),
+    (0x043f, 2192),
+    (0x0440, 2048),
+    (0x0441, 1818),
+    (0x0442, 1790),
+    (0x0443, 2048),
+    (0x0444, 2654),
+    (0x0445, 2048),
+    (0x0446, 2192),
+    (0x0447, 2060),
+    (0x0448, 3154),
+    (0x0449, 3154),
+    (0x044a, 2118),
+    (0x044b, 2752),
+    (0x044c, 1868),
+    (0x044d, 1758),
+    (0x044e, 3060),
+    (0x044f, 1884),
+    (0x0450, 1818),
+    (0x0451, 1818),
+    (0x0452, 1978),
+    (0x0453, 1680),
+    (0x0454, 1758),
+    (0x0455, 1594),
+    (0x0456, 1138),
+    (0x0457, 1138),
+    (0x0458, 1138),
+    (0x0459, 2978),
+    (0x045a, 2962),
+    (0x045b, 2048),
+    (0x045c, 1990),
+    (0x045d, 2192),
+    (0x045e, 2048),
+    (0x045f, 2192),
     (0x2013, 2048),
     (0x2014, 4096),
     (0x2018, 1364),
@@ -313,6 +1187,7 @@ pub static SERIF_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2310),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -354,13 +1229,187 @@ pub static SERIF_BOLD: [u16; 560] = [
     3186, 2048, 2958, 2048, 1138, 2278, 1478, 1364, 3370, 3370, 2958, 2958, 2048, 2732, 2732, 1594,
     1818, 2180, 1908, 2732, 2958, 2936, 2732, 1818, 2048, 1364, 3378, 2278, 2958, 1818, 2958, 2048,
 ];
-pub static SERIF_BOLD_SPARSE: [(u32, u16); 22] = [
+pub static SERIF_BOLD_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1228),
     (0x00b3, 1228),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2958),
+    (0x0387, 1364),
+    (0x0388, 3272),
+    (0x0389, 3724),
+    (0x038a, 2138),
+    (0x038c, 3186),
+    (0x038e, 3542),
+    (0x038f, 3280),
+    (0x0390, 1270),
+    (0x0391, 2958),
+    (0x0392, 2732),
+    (0x0393, 2606),
+    (0x0394, 2568),
+    (0x0395, 2732),
+    (0x0396, 2732),
+    (0x0397, 3186),
+    (0x0398, 3186),
+    (0x0399, 1594),
+    (0x039a, 3186),
+    (0x039b, 2936),
+    (0x039c, 3866),
+    (0x039d, 2958),
+    (0x039e, 2774),
+    (0x039f, 3186),
+    (0x03a0, 3186),
+    (0x03a1, 2502),
+    (0x03a3, 2678),
+    (0x03a4, 2732),
+    (0x03a5, 2958),
+    (0x03a6, 3396),
+    (0x03a7, 2958),
+    (0x03a8, 3194),
     (0x03a9, 3280),
+    (0x03aa, 1594),
+    (0x03ab, 2958),
+    (0x03ac, 2286),
+    (0x03ad, 1750),
+    (0x03ae, 2326),
+    (0x03af, 1270),
+    (0x03b0, 2126),
+    (0x03b1, 2286),
+    (0x03b2, 2158),
+    (0x03b3, 1916),
+    (0x03b4, 2126),
+    (0x03b5, 1750),
+    (0x03b6, 1692),
+    (0x03b7, 2326),
+    (0x03b8, 2138),
+    (0x03b9, 1270),
+    (0x03ba, 2274),
+    (0x03bb, 2012),
     (0x03bc, 2322),
+    (0x03bd, 1830),
+    (0x03be, 1826),
+    (0x03bf, 2048),
+    (0x03c0, 2244),
+    (0x03c1, 2192),
+    (0x03c2, 1728),
+    (0x03c3, 2228),
+    (0x03c4, 1888),
+    (0x03c5, 2126),
+    (0x03c6, 2556),
+    (0x03c7, 1892),
+    (0x03c8, 2818),
+    (0x03c9, 2994),
+    (0x03ca, 1270),
+    (0x03cb, 2126),
+    (0x03cc, 2048),
+    (0x03cd, 2126),
+    (0x03ce, 2994),
+    (0x03cf, 3186),
+    (0x03d0, 2158),
+    (0x03d1, 2454),
+    (0x03d2, 2958),
+    (0x03d3, 3782),
+    (0x03d4, 2958),
+    (0x03d5, 2556),
+    (0x03d6, 2994),
+    (0x0400, 2732),
+    (0x0401, 2732),
+    (0x0402, 3276),
+    (0x0403, 2606),
+    (0x0404, 2778),
+    (0x0405, 2278),
+    (0x0406, 1594),
+    (0x0407, 1594),
+    (0x0408, 2048),
+    (0x0409, 4108),
+    (0x040a, 4104),
+    (0x040b, 3276),
+    (0x040c, 2970),
+    (0x040d, 3186),
+    (0x040e, 3006),
+    (0x040f, 3186),
+    (0x0410, 2958),
+    (0x0411, 2708),
+    (0x0412, 2732),
+    (0x0413, 2606),
+    (0x0414, 2818),
+    (0x0415, 2732),
+    (0x0416, 4050),
+    (0x0417, 2162),
+    (0x0418, 3186),
+    (0x0419, 3186),
+    (0x041a, 2970),
+    (0x041b, 3052),
+    (0x041c, 3866),
+    (0x041d, 3186),
+    (0x041e, 3186),
+    (0x041f, 3186),
+    (0x0420, 2502),
+    (0x0421, 2958),
+    (0x0422, 2732),
+    (0x0423, 3006),
+    (0x0424, 3518),
+    (0x0425, 2958),
+    (0x0426, 3186),
+    (0x0427, 3006),
+    (0x0428, 4498),
+    (0x0429, 4498),
+    (0x042a, 3134),
+    (0x042b, 4022),
+    (0x042c, 2708),
+    (0x042d, 2778),
+    (0x042e, 4612),
+    (0x042f, 2958),
+    (0x0430, 2048),
+    (0x0431, 2048),
+    (0x0432, 2212),
+    (0x0433, 1860),
+    (0x0434, 2072),
+    (0x0435, 1818),
+    (0x0436, 2970),
+    (0x0437, 1646),
+    (0x0438, 2360),
+    (0x0439, 2360),
+    (0x043a, 2360),
+    (0x043b, 2298),
+    (0x043c, 2790),
+    (0x043d, 2360),
+    (0x043e, 2048),
+    (0x043f, 2360),
+    (0x0440, 2278),
+    (0x0441, 1818),
+    (0x0442, 2012),
+    (0x0443, 2048),
+    (0x0444, 2834),
+    (0x0445, 2048),
+    (0x0446, 2360),
+    (0x0447, 2310),
+    (0x0448, 3458),
+    (0x0449, 3458),
+    (0x044a, 2388),
+    (0x044b, 3198),
+    (0x044c, 2166),
+    (0x044d, 1770),
+    (0x044e, 3130),
+    (0x044f, 2216),
+    (0x0450, 1818),
+    (0x0451, 1818),
+    (0x0452, 2200),
+    (0x0453, 1860),
+    (0x0454, 1770),
+    (0x0455, 1594),
+    (0x0456, 1138),
+    (0x0457, 1138),
+    (0x0458, 1364),
+    (0x0459, 3194),
+    (0x045a, 3264),
+    (0x045b, 2278),
+    (0x045c, 2360),
+    (0x045d, 2360),
+    (0x045e, 2048),
+    (0x045f, 2360),
     (0x2013, 2048),
     (0x2014, 4096),
     (0x2018, 1364),
@@ -374,6 +1423,7 @@ pub static SERIF_BOLD_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2334),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -415,13 +1465,187 @@ pub static SERIF_ITALIC: [u16; 560] = [
     2958, 2048, 2278, 1818, 1138, 2048, 1138, 1138, 3082, 3088, 2502, 2732, 2048, 2278, 2278, 1594,
     1594, 1994, 1786, 2502, 2958, 2474, 2502, 1818, 1818, 1138, 2900, 2048, 2502, 1594, 2278, 1818,
 ];
-pub static SERIF_ITALIC_SPARSE: [(u32, u16); 22] = [
+pub static SERIF_ITALIC_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1228),
     (0x00b3, 1228),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2502),
+    (0x0387, 1364),
+    (0x0388, 2782),
+    (0x0389, 3244),
+    (0x038a, 1646),
+    (0x038c, 2958),
+    (0x038e, 2704),
+    (0x038f, 2974),
+    (0x0390, 1138),
+    (0x0391, 2502),
+    (0x0392, 2502),
+    (0x0393, 2330),
+    (0x0394, 2404),
+    (0x0395, 2502),
+    (0x0396, 2278),
+    (0x0397, 2958),
+    (0x0398, 2958),
+    (0x0399, 1364),
+    (0x039a, 2732),
+    (0x039b, 2474),
+    (0x039c, 3412),
+    (0x039d, 2732),
+    (0x039e, 2618),
+    (0x039f, 2958),
+    (0x03a0, 2958),
+    (0x03a1, 2502),
+    (0x03a3, 2434),
+    (0x03a4, 2278),
+    (0x03a5, 2278),
+    (0x03a6, 3118),
+    (0x03a7, 2502),
+    (0x03a8, 2880),
     (0x03a9, 2962),
+    (0x03aa, 1364),
+    (0x03ab, 2278),
+    (0x03ac, 2150),
+    (0x03ad, 1614),
+    (0x03ae, 2032),
+    (0x03af, 1138),
+    (0x03b0, 1880),
+    (0x03b1, 2150),
+    (0x03b2, 2040),
+    (0x03b3, 1614),
+    (0x03b4, 1904),
+    (0x03b5, 1614),
+    (0x03b6, 1658),
+    (0x03b7, 2032),
+    (0x03b8, 2012),
+    (0x03b9, 1138),
+    (0x03ba, 1966),
+    (0x03bb, 1774),
     (0x03bc, 2056),
+    (0x03bd, 1818),
+    (0x03be, 1754),
+    (0x03bf, 2048),
+    (0x03c0, 2052),
+    (0x03c1, 1966),
+    (0x03c2, 1662),
+    (0x03c3, 2020),
+    (0x03c4, 1466),
+    (0x03c5, 1880),
+    (0x03c6, 2266),
+    (0x03c7, 1802),
+    (0x03c8, 2544),
+    (0x03c9, 2892),
+    (0x03ca, 1138),
+    (0x03cb, 1880),
+    (0x03cc, 2048),
+    (0x03cd, 1880),
+    (0x03ce, 2858),
+    (0x03cf, 2732),
+    (0x03d0, 2040),
+    (0x03d1, 2010),
+    (0x03d2, 2606),
+    (0x03d3, 3108),
+    (0x03d4, 2606),
+    (0x03d5, 2120),
+    (0x03d6, 2892),
+    (0x0400, 2502),
+    (0x0401, 2502),
+    (0x0402, 3264),
+    (0x0403, 2330),
+    (0x0404, 2740),
+    (0x0405, 2048),
+    (0x0406, 1364),
+    (0x0407, 1364),
+    (0x0408, 1818),
+    (0x0409, 3798),
+    (0x040a, 3772),
+    (0x040b, 3272),
+    (0x040c, 2720),
+    (0x040d, 2958),
+    (0x040e, 2756),
+    (0x040f, 2958),
+    (0x0410, 2502),
+    (0x0411, 2416),
+    (0x0412, 2502),
+    (0x0413, 2330),
+    (0x0414, 2606),
+    (0x0415, 2502),
+    (0x0416, 3752),
+    (0x0417, 2028),
+    (0x0418, 2958),
+    (0x0419, 2958),
+    (0x041a, 2720),
+    (0x041b, 2774),
+    (0x041c, 3412),
+    (0x041d, 2958),
+    (0x041e, 2958),
+    (0x041f, 2958),
+    (0x0420, 2502),
+    (0x0421, 2732),
+    (0x0422, 2278),
+    (0x0423, 2756),
+    (0x0424, 3294),
+    (0x0425, 2502),
+    (0x0426, 2958),
+    (0x0427, 2822),
+    (0x0428, 4272),
+    (0x0429, 4272),
+    (0x042a, 2768),
+    (0x042b, 3572),
+    (0x042c, 2416),
+    (0x042d, 2682),
+    (0x042e, 4228),
+    (0x042f, 2692),
+    (0x0430, 2048),
+    (0x0431, 2060),
+    (0x0432, 1778),
+    (0x0433, 1598),
+    (0x0434, 2072),
+    (0x0435, 1818),
+    (0x0436, 3810),
+    (0x0437, 1598),
+    (0x0438, 2048),
+    (0x0439, 2048),
+    (0x043a, 1916),
+    (0x043b, 1786),
+    (0x043c, 2614),
+    (0x043d, 2032),
+    (0x043e, 2048),
+    (0x043f, 2048),
+    (0x0440, 2048),
+    (0x0441, 1818),
+    (0x0442, 2958),
+    (0x0443, 1818),
+    (0x0444, 2908),
+    (0x0445, 1818),
+    (0x0446, 2048),
+    (0x0447, 1954),
+    (0x0448, 3092),
+    (0x0449, 3092),
+    (0x044a, 2126),
+    (0x044b, 2774),
+    (0x044c, 1864),
+    (0x044d, 1806),
+    (0x044e, 2888),
+    (0x044f, 1904),
+    (0x0450, 1818),
+    (0x0451, 1818),
+    (0x0452, 1962),
+    (0x0453, 1544),
+    (0x0454, 1786),
+    (0x0455, 1594),
+    (0x0456, 1138),
+    (0x0457, 1138),
+    (0x0458, 1138),
+    (0x0459, 2782),
+    (0x045a, 2916),
+    (0x045b, 2048),
+    (0x045c, 1916),
+    (0x045d, 2048),
+    (0x045e, 1818),
+    (0x045f, 2048),
     (0x2013, 2048),
     (0x2014, 3642),
     (0x2018, 1364),
@@ -435,6 +1659,7 @@ pub static SERIF_ITALIC_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2764),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -476,13 +1701,187 @@ pub static SERIF_BOLD_ITALIC: [u16; 560] = [
     2958, 2048, 2502, 1818, 1138, 2278, 1138, 1138, 2998, 3010, 2732, 2732, 2048, 2502, 2502, 1594,
     1594, 2084, 1908, 2732, 2958, 2732, 2732, 1818, 2048, 1138, 3214, 2048, 2732, 1594, 2502, 1818,
 ];
-pub static SERIF_BOLD_ITALIC_SPARSE: [(u32, u16); 22] = [
+pub static SERIF_BOLD_ITALIC_SPARSE: [(u32, u16); 197] = [
     (0x00b0, 1638),
     (0x00b1, 2248),
     (0x00b2, 1228),
     (0x00b3, 1228),
+    (0x0384, 1364),
+    (0x0385, 1364),
+    (0x0386, 2732),
+    (0x0387, 1364),
+    (0x0388, 3182),
+    (0x0389, 3666),
+    (0x038a, 2072),
+    (0x038c, 2994),
+    (0x038e, 3072),
+    (0x038f, 3216),
+    (0x0390, 1138),
+    (0x0391, 2732),
+    (0x0392, 2732),
+    (0x0393, 2474),
+    (0x0394, 2568),
+    (0x0395, 2732),
+    (0x0396, 2502),
+    (0x0397, 3186),
+    (0x0398, 3126),
+    (0x0399, 1594),
+    (0x039a, 2732),
+    (0x039b, 2732),
+    (0x039c, 3642),
+    (0x039d, 2958),
+    (0x039e, 2700),
+    (0x039f, 2958),
+    (0x03a0, 3186),
+    (0x03a1, 2502),
+    (0x03a3, 2536),
+    (0x03a4, 2502),
+    (0x03a5, 2502),
+    (0x03a6, 3232),
+    (0x03a7, 2732),
+    (0x03a8, 3276),
     (0x03a9, 3056),
+    (0x03aa, 1594),
+    (0x03ab, 2502),
+    (0x03ac, 2266),
+    (0x03ad, 1680),
+    (0x03ae, 2248),
+    (0x03af, 1138),
+    (0x03b0, 2006),
+    (0x03b1, 2266),
+    (0x03b2, 2098),
+    (0x03b3, 1704),
+    (0x03b4, 2098),
+    (0x03b5, 1680),
+    (0x03b6, 1806),
+    (0x03b7, 2248),
+    (0x03b8, 2126),
+    (0x03b9, 1138),
+    (0x03ba, 2170),
+    (0x03bb, 1818),
     (0x03bc, 2278),
+    (0x03bd, 1818),
+    (0x03be, 1840),
+    (0x03bf, 2048),
+    (0x03c0, 2236),
+    (0x03c1, 2110),
+    (0x03c2, 1826),
+    (0x03c3, 2208),
+    (0x03c4, 1818),
+    (0x03c5, 2006),
+    (0x03c6, 2396),
+    (0x03c7, 1904),
+    (0x03c8, 2736),
+    (0x03c9, 2962),
+    (0x03ca, 1138),
+    (0x03cb, 2006),
+    (0x03cc, 2048),
+    (0x03cd, 2006),
+    (0x03ce, 2962),
+    (0x03cf, 2732),
+    (0x03d0, 2098),
+    (0x03d1, 2160),
+    (0x03d2, 2968),
+    (0x03d3, 3444),
+    (0x03d4, 2968),
+    (0x03d5, 2370),
+    (0x03d6, 3098),
+    (0x0400, 2732),
+    (0x0401, 2732),
+    (0x0402, 3350),
+    (0x0403, 2474),
+    (0x0404, 2692),
+    (0x0405, 2278),
+    (0x0406, 1594),
+    (0x0407, 1594),
+    (0x0408, 2048),
+    (0x0409, 3720),
+    (0x040a, 3998),
+    (0x040b, 3322),
+    (0x040c, 2778),
+    (0x040d, 3186),
+    (0x040e, 2850),
+    (0x040f, 3186),
+    (0x0410, 2732),
+    (0x0411, 2602),
+    (0x0412, 2732),
+    (0x0413, 2474),
+    (0x0414, 2798),
+    (0x0415, 2732),
+    (0x0416, 3760),
+    (0x0417, 2084),
+    (0x0418, 3186),
+    (0x0419, 3186),
+    (0x041a, 2778),
+    (0x041b, 2810),
+    (0x041c, 3642),
+    (0x041d, 3186),
+    (0x041e, 2958),
+    (0x041f, 3186),
+    (0x0420, 2502),
+    (0x0421, 2732),
+    (0x0422, 2502),
+    (0x0423, 2850),
+    (0x0424, 3482),
+    (0x0425, 2732),
+    (0x0426, 3186),
+    (0x0427, 3064),
+    (0x0428, 4612),
+    (0x0429, 4612),
+    (0x042a, 3114),
+    (0x042b, 3970),
+    (0x042c, 2596),
+    (0x042d, 2666),
+    (0x042e, 4326),
+    (0x042f, 2822),
+    (0x0430, 2048),
+    (0x0431, 2044),
+    (0x0432, 1830),
+    (0x0433, 1512),
+    (0x0434, 2032),
+    (0x0435, 1818),
+    (0x0436, 3900),
+    (0x0437, 1598),
+    (0x0438, 2278),
+    (0x0439, 2278),
+    (0x043a, 2076),
+    (0x043b, 2102),
+    (0x043c, 2806),
+    (0x043d, 2274),
+    (0x043e, 2048),
+    (0x043f, 2278),
+    (0x0440, 2048),
+    (0x0441, 1818),
+    (0x0442, 3186),
+    (0x0443, 1818),
+    (0x0444, 2932),
+    (0x0445, 2048),
+    (0x0446, 2278),
+    (0x0447, 2150),
+    (0x0448, 3412),
+    (0x0449, 3412),
+    (0x044a, 2158),
+    (0x044b, 2842),
+    (0x044c, 1872),
+    (0x044d, 1700),
+    (0x044e, 2990),
+    (0x044f, 2110),
+    (0x0450, 1818),
+    (0x0451, 1818),
+    (0x0452, 2142),
+    (0x0453, 1610),
+    (0x0454, 1700),
+    (0x0455, 1594),
+    (0x0456, 1138),
+    (0x0457, 1138),
+    (0x0458, 1138),
+    (0x0459, 2700),
+    (0x045a, 2920),
+    (0x045b, 2278),
+    (0x045c, 2076),
+    (0x045d, 2278),
+    (0x045e, 1818),
+    (0x045f, 2278),
     (0x2013, 2048),
     (0x2014, 4096),
     (0x2018, 1364),
@@ -496,6 +1895,7 @@ pub static SERIF_BOLD_ITALIC_SPARSE: [(u32, u16); 22] = [
     (0x2192, 4096),
     (0x2193, 2048),
     (0x2206, 2506),
+    (0x2212, 2482),
     (0x2260, 2248),
     (0x2264, 2248),
     (0x2265, 2248),
@@ -537,13 +1937,186 @@ pub static MONO: [u16; 560] = [
     2458, 2458, 2458, 2458, 2458, 2458, 2458, 0, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458,
     2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458, 2458,
 ];
-pub static MONO_SPARSE: [(u32, u16); 22] = [
+pub static MONO_SPARSE: [(u32, u16); 196] = [
     (0x00b0, 2458),
     (0x00b1, 2458),
     (0x00b2, 2458),
     (0x00b3, 2458),
+    (0x0384, 2458),
+    (0x0385, 2458),
+    (0x0386, 2458),
+    (0x0387, 2458),
+    (0x0388, 2458),
+    (0x0389, 2458),
+    (0x038a, 2458),
+    (0x038c, 2458),
+    (0x038e, 2458),
+    (0x038f, 2458),
+    (0x0390, 2458),
+    (0x0391, 2458),
+    (0x0392, 2458),
+    (0x0393, 2458),
+    (0x0394, 2458),
+    (0x0395, 2458),
+    (0x0396, 2458),
+    (0x0397, 2458),
+    (0x0398, 2458),
+    (0x0399, 2458),
+    (0x039a, 2458),
+    (0x039b, 2458),
+    (0x039c, 2458),
+    (0x039d, 2458),
+    (0x039e, 2458),
+    (0x039f, 2458),
+    (0x03a0, 2458),
+    (0x03a1, 2458),
+    (0x03a3, 2458),
+    (0x03a4, 2458),
+    (0x03a5, 2458),
+    (0x03a6, 2458),
+    (0x03a7, 2458),
+    (0x03a8, 2458),
     (0x03a9, 2458),
+    (0x03aa, 2458),
+    (0x03ab, 2458),
+    (0x03ac, 2458),
+    (0x03ad, 2458),
+    (0x03ae, 2458),
+    (0x03af, 2458),
+    (0x03b0, 2458),
+    (0x03b1, 2458),
+    (0x03b2, 2458),
+    (0x03b3, 2458),
+    (0x03b4, 2458),
+    (0x03b5, 2458),
+    (0x03b6, 2458),
+    (0x03b7, 2458),
+    (0x03b8, 2458),
+    (0x03b9, 2458),
+    (0x03ba, 2458),
+    (0x03bb, 2458),
     (0x03bc, 2458),
+    (0x03bd, 2458),
+    (0x03be, 2458),
+    (0x03bf, 2458),
+    (0x03c0, 2458),
+    (0x03c1, 2458),
+    (0x03c2, 2458),
+    (0x03c3, 2458),
+    (0x03c4, 2458),
+    (0x03c5, 2458),
+    (0x03c6, 2458),
+    (0x03c7, 2458),
+    (0x03c8, 2458),
+    (0x03c9, 2458),
+    (0x03ca, 2458),
+    (0x03cb, 2458),
+    (0x03cc, 2458),
+    (0x03cd, 2458),
+    (0x03ce, 2458),
+    (0x03d0, 2458),
+    (0x03d1, 2458),
+    (0x03d2, 2458),
+    (0x03d3, 2458),
+    (0x03d4, 2458),
+    (0x03d5, 2458),
+    (0x03d6, 2458),
+    (0x0400, 2458),
+    (0x0401, 2458),
+    (0x0402, 2458),
+    (0x0403, 2458),
+    (0x0404, 2458),
+    (0x0405, 2458),
+    (0x0406, 2458),
+    (0x0407, 2458),
+    (0x0408, 2458),
+    (0x0409, 2458),
+    (0x040a, 2458),
+    (0x040b, 2458),
+    (0x040c, 2458),
+    (0x040d, 2458),
+    (0x040e, 2458),
+    (0x040f, 2458),
+    (0x0410, 2458),
+    (0x0411, 2458),
+    (0x0412, 2458),
+    (0x0413, 2458),
+    (0x0414, 2458),
+    (0x0415, 2458),
+    (0x0416, 2458),
+    (0x0417, 2458),
+    (0x0418, 2458),
+    (0x0419, 2458),
+    (0x041a, 2458),
+    (0x041b, 2458),
+    (0x041c, 2458),
+    (0x041d, 2458),
+    (0x041e, 2458),
+    (0x041f, 2458),
+    (0x0420, 2458),
+    (0x0421, 2458),
+    (0x0422, 2458),
+    (0x0423, 2458),
+    (0x0424, 2458),
+    (0x0425, 2458),
+    (0x0426, 2458),
+    (0x0427, 2458),
+    (0x0428, 2458),
+    (0x0429, 2458),
+    (0x042a, 2458),
+    (0x042b, 2458),
+    (0x042c, 2458),
+    (0x042d, 2458),
+    (0x042e, 2458),
+    (0x042f, 2458),
+    (0x0430, 2458),
+    (0x0431, 2458),
+    (0x0432, 2458),
+    (0x0433, 2458),
+    (0x0434, 2458),
+    (0x0435, 2458),
+    (0x0436, 2458),
+    (0x0437, 2458),
+    (0x0438, 2458),
+    (0x0439, 2458),
+    (0x043a, 2458),
+    (0x043b, 2458),
+    (0x043c, 2458),
+    (0x043d, 2458),
+    (0x043e, 2458),
+    (0x043f, 2458),
+    (0x0440, 2458),
+    (0x0441, 2458),
+    (0x0442, 2458),
+    (0x0443, 2458),
+    (0x0444, 2458),
+    (0x0445, 2458),
+    (0x0446, 2458),
+    (0x0447, 2458),
+    (0x0448, 2458),
+    (0x0449, 2458),
+    (0x044a, 2458),
+    (0x044b, 2458),
+    (0x044c, 2458),
+    (0x044d, 2458),
+    (0x044e, 2458),
+    (0x044f, 2458),
+    (0x0450, 2458),
+    (0x0451, 2458),
+    (0x0452, 2458),
+    (0x0453, 2458),
+    (0x0454, 2458),
+    (0x0455, 2458),
+    (0x0456, 2458),
+    (0x0457, 2458),
+    (0x0458, 2458),
+    (0x0459, 2458),
+    (0x045a, 2458),
+    (0x045b, 2458),
+    (0x045c, 2458),
+    (0x045d, 2458),
+    (0x045e, 2458),
+    (0x045f, 2458),
     (0x2013, 2458),
     (0x2014, 2458),
     (0x2018, 2458),
@@ -557,6 +2130,7 @@ pub static MONO_SPARSE: [(u32, u16); 22] = [
     (0x2192, 2458),
     (0x2193, 2458),
     (0x2206, 2458),
+    (0x2212, 2458),
     (0x2260, 2458),
     (0x2264, 2458),
     (0x2265, 2458),
diff --git a/crates/exav-render/src/formats/dwg/mod.rs b/crates/exav-render/src/formats/dwg/mod.rs
index 5916d107..e055bafb 100644
--- a/crates/exav-render/src/formats/dwg/mod.rs
+++ b/crates/exav-render/src/formats/dwg/mod.rs
@@ -18,6 +18,7 @@
 
 mod clip;
 mod curves;
+mod dimension;
 mod fill;
 mod font;
 mod gradient;
@@ -31,17 +32,20 @@ pub mod stroke_font;
 mod tessellate;
 mod text;
 mod tiles;
+mod wide;
 
 pub use curves::{flatten_arc, flatten_circle, flatten_ellipse};
 pub use fill::fill_even_odd;
 pub use font::{
-    resolve_file, resolve_override, resolve_style, Face, Family, Metrics, TrueTypeFace, FACE_COUNT,
+    FACE_COUNT, Face, Family, Metrics, TrueTypeFace, resolve_file, resolve_override, resolve_style,
 };
 pub use hatch::nesting_depths;
 pub use palette::Palette;
-pub use scene::{Affine, Scene, FILL_BYTES, STROKE_BYTES};
-pub use tessellate::{expand_bulges, LayerInfo, LayoutInfo, Tessellator, Warnings, SCENE_BUDGET};
-pub use text::{mtext_lines, HAlign, TextRun, VAlign, TEXT_RECORD_BYTES};
+pub use scene::{Affine, FILL_BYTES, FILL_EDGE, STROKE_BYTES, Scene};
+pub use tessellate::{
+    LayerInfo, LayoutInfo, SCENE_BUDGET, Sheet, Tessellator, Warnings, expand_bulges,
+};
+pub use text::{HAlign, TEXT_RECORD_BYTES, TextRun, VAlign, mtext_lines};
 
 /// Why a file did not parse.
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -147,6 +151,31 @@ impl Document {
         &self.doc
     }
 
+    /// The files the drawing's external references name and that are not
+    /// bound yet, as the drawing wrote them. A bound drawing may name more.
+    pub fn xref_paths(&self) -> Vec<String> {
+        self.doc.unresolved_xrefs()
+    }
+
+    /// [`xref_paths`](Self::xref_paths) as a JSON array of strings.
+    pub fn xref_paths_json(&self) -> String {
+        let items: Vec<String> = self.xref_paths().iter().map(|p| json_string(p)).collect();
+        format!("[{}]", items.join(","))
+    }
+
+    /// Bind the drawing in `bytes`, the file `path` names, into the
+    /// references to it. Returns how many it filled, which is none for a path
+    /// no reference names or once the entity limit is reached.
+    pub fn attach_xref(
+        &mut self,
+        path: &str,
+        bytes: &[u8],
+        limits: &crate::cad::Limits,
+    ) -> Result<usize, ParseError> {
+        let xref = Self::parse_with(bytes, limits)?;
+        Ok(self.doc.attach_xref(path, &xref.doc))
+    }
+
     /// The drawing's tabs, model space first.
     pub fn layouts(&self) -> Vec<LayoutInfo> {
         Tessellator::new(&self.doc).layouts()
@@ -191,6 +220,14 @@ impl Document {
         };
         let mut t = Tessellator::with_palette(&self.doc, palette);
         t.budget = budget;
+        // What the reader dropped at one of its limits is part of the drawing
+        // left out, as the entities the scene budget stops are.
+        if (self.doc.warnings)
+            .iter()
+            .any(|w| w.kind == crate::cad::WarningKind::LimitReached)
+        {
+            t.warnings.scene_truncated = t.warnings.scene_truncated.saturating_add(1);
+        }
         let drawn = match layout {
             Some(name) if !name.is_empty() && t.run_layout(name) => name.to_string(),
             _ => {
@@ -198,24 +235,31 @@ impl Document {
                 String::new()
             }
         };
+        // Everything read from the scene before `buffers`, which empties it.
         let (texts, text_strings) = t.scene.text_buffers();
+        let (origin, extents) = (t.scene.origin(), t.scene.extents_local());
+        let clips = t.scene.clip_buffer();
+        let b = t.scene.buffers();
         Drawing {
             layout: drawn,
-            strokes: t.scene.stroke_buffer(),
-            fills: t.scene.fill_buffer(),
+            strokes: b.strokes,
+            fills: b.fills,
             texts,
             text_strings,
-            origin: t.scene.origin(),
-            extents: t.scene.extents_local(),
+            origin,
+            extents,
             max_order: t.scene.max_order(),
-            opaque_strokes: t.scene.opaque_strokes(),
-            opaque_fills: t.scene.opaque_fills(),
-            stroke_tiles: t.scene.stroke_tiles(),
-            fill_tiles: t.scene.fill_tiles(),
-            opaque_stroke_tiles: t.scene.opaque_stroke_tiles(),
-            opaque_fill_tiles: t.scene.opaque_fill_tiles(),
+            opaque_strokes: b.opaque_strokes,
+            opaque_fills: b.opaque_fills,
+            clips,
+            stroke_tiles: b.stroke_tiles,
+            fill_tiles: b.fill_tiles,
+            opaque_stroke_tiles: b.opaque_stroke_tiles,
+            opaque_fill_tiles: b.opaque_fill_tiles,
+            translucent_runs: b.translucent_runs,
             layers: t.layers,
             warnings: t.warnings,
+            sheet: t.sheet,
         }
     }
 }
@@ -236,8 +280,9 @@ pub struct Drawing {
     /// for does not exist.
     pub layout: String,
     /// Stroke instances, [`STROKE_BYTES`] each: `f32 x0, y0, x1, y1 | u32 rgba
-    /// | u32 attr | u32 order`, little-endian. `attr` packs the layer id, the
-    /// lineweight and the flags (see `scene.rs`).
+    /// | u32 attr | u32 order | f32 bulge`, little-endian. `attr` packs the
+    /// layer id, the lineweight and the flags (see `scene.rs`); `bulge` is 0
+    /// for a line, else the stroke is a circular arc (`Stroke::bulge`).
     pub strokes: Vec<u8>,
     /// Fill vertices, [`FILL_BYTES`] each: `f32 x, y | u32 rgba | u32 attr |
     /// u32 order`.
@@ -245,12 +290,16 @@ pub struct Drawing {
     /// Text placement records, [`TEXT_RECORD_BYTES`] each, indexing into
     /// `text_strings`: `f32 x, y, height, rotation, widthFactor, oblique | u32
     /// rgba, attr, strOffset | u16 strLen | u8 hAlign, vAlign | u32 order | u8
-    /// face | 3 bytes padding`. Only runs in an outline face appear here; a
+    /// face | u8 padding | u16 clip`. Only runs in an outline face appear here; a
     /// stroke-font run is drawn as strokes, so that the drawing's lineweight
     /// decides how thick its letters are.
     pub texts: Vec<u8>,
     /// UTF-8, every run's characters back to back.
     pub text_strings: Vec<u8>,
+    /// The regions text runs are clipped to (a viewport's window, an XCLIP
+    /// boundary), which a run's `clip` numbers from 1: for each, `u32`
+    /// triangle count, then `f32 x, y` per corner relative to `origin`.
+    pub clips: Vec<u8>,
     /// World coordinates the buffers are relative to.
     pub origin: [f64; 2],
     /// `[min_x, min_y, max_x, max_y]`, relative to `origin`.
@@ -258,22 +307,29 @@ pub struct Drawing {
     /// Highest draw-order index, for normalising depth.
     pub max_order: u32,
     /// Leading strokes and fill vertices that are opaque; the rest are
-    /// translucent and are drawn after, without writing depth.
+    /// translucent, in draw order, and are drawn after.
     pub opaque_strokes: usize,
     pub opaque_fills: usize,
-    /// Spatial buckets: `u32 start, count | f32 min_x, min_y, max_x, max_y`,
-    /// 24 bytes each, `start` and `count` in strokes (in vertices for fills).
-    /// The box is the true extent of the contents, which can reach outside
-    /// the bucket's grid square.
+    /// Tiles: `u32 start, count | f32 min_x, min_y, max_x, max_y`, 24 bytes
+    /// each, `start` and `count` in strokes (in vertices for fills). The
+    /// opaque half's are spatial buckets, the translucent half's runs of it
+    /// in draw order. The box is the true extent of the contents, which can
+    /// reach outside the bucket's grid square.
     pub stroke_tiles: Vec<u8>,
     pub fill_tiles: Vec<u8>,
     /// Leading entries of each table covering the opaque half.
     pub opaque_stroke_tiles: usize,
     pub opaque_fill_tiles: usize,
+    /// The order of the translucent pass: for each run, `u32` 1 for fill
+    /// tiles or 0 for stroke tiles, then the first tile and the one past the
+    /// last, indices into that kind's table.
+    pub translucent_runs: Vec<u8>,
     /// The layer table; a vertex's layer id indexes it.
     pub layers: Vec<LayerInfo>,
     /// What could not be drawn.
     pub warnings: Warnings,
+    /// What the tab is drawn on.
+    pub sheet: Sheet,
 }
 
 impl Drawing {
@@ -310,11 +366,38 @@ impl Drawing {
         format!("[{}]", items.join(","))
     }
 
+    /// [`Sheet`] as JSON: `{"mmPerUnit", "lineweights"}`.
+    pub fn sheet_json(&self) -> String {
+        let s = &self.sheet;
+        // The paper relative to `origin`, as the buffers are.
+        let paper = match s.paper {
+            Some(p) => format!(
+                "[{},{},{},{}]",
+                json_number(p[0] - self.origin[0]),
+                json_number(p[1] - self.origin[1]),
+                json_number(p[2] - self.origin[0]),
+                json_number(p[3] - self.origin[1])
+            ),
+            None => "null".to_string(),
+        };
+        format!(
+            r#"{{"mmPerUnit":{},"lineweights":{},"paper":{paper}}}"#,
+            json_number(s.mm_per_unit),
+            s.lineweights
+        )
+    }
+
     /// [`Warnings`] as JSON. All zeroes means everything was drawn.
     pub fn warnings_json(&self) -> String {
         let w = &self.warnings;
+        let not_drawn: Vec<String> = w
+            .not_drawn
+            .iter()
+            .map(|(k, n)| format!("{}:{n}", json_string(k)))
+            .collect();
+        let files: Vec<String> = w.external_files.iter().map(|f| json_string(f)).collect();
         format!(
-            r#"{{"unknownEntities":{},"missingBlocks":{},"textRuns":{},"strokeGlyphs":{},"hatchPatternsMissing":{},"hatchPatternsTruncated":{},"externalReferences":{},"depthExceeded":{},"sceneTruncated":{},"proxyWithoutGraphics":{}}}"#,
+            r#"{{"unknownEntities":{},"missingBlocks":{},"textRuns":{},"strokeGlyphs":{},"hatchPatternsMissing":{},"hatchPatternsTruncated":{},"externalReferences":{},"depthExceeded":{},"sceneTruncated":{},"proxyWithoutGraphics":{},"notDrawn":{{{}}},"externalFiles":[{}]}}"#,
             w.unknown_entities,
             w.missing_blocks,
             w.text_runs,
@@ -324,11 +407,22 @@ impl Drawing {
             w.external_references,
             w.depth_exceeded,
             w.scene_truncated,
-            w.proxy_without_graphics
+            w.proxy_without_graphics,
+            not_drawn.join(","),
+            files.join(",")
         )
     }
 }
 
+/// A number JSON can hold: a non-finite one is 0.
+fn json_number(v: f64) -> String {
+    if v.is_finite() {
+        format!("{v}")
+    } else {
+        "0".to_string()
+    }
+}
+
 /// JSON string escaping. Layer and layout names are file data and routinely
 /// hold quotes, backslashes and control characters.
 fn json_string(s: &str) -> String {
diff --git a/crates/exav-render/src/formats/dwg/scene.rs b/crates/exav-render/src/formats/dwg/scene.rs
index ce74c9da..e9d228f3 100644
--- a/crates/exav-render/src/formats/dwg/scene.rs
+++ b/crates/exav-render/src/formats/dwg/scene.rs
@@ -4,6 +4,8 @@
 //! precision, then re-emitted as f32 relative to a per-drawing origin. See
 //! DESIGN.md section 4.4.
 
+use super::tiles::Tile;
+
 /// 2D affine transform, applied as the block/insert stack is walked.
 ///
 /// x' = a*x + c*y + e
@@ -119,6 +121,33 @@ impl Affine {
         }
     }
 
+    /// A text plane in world coordinates, as an MTEXT has it: its X axis (a
+    /// vector, not necessarily unit) and its normal. The Y axis is the normal
+    /// crossed with X, so a normal of -Z mirrors the text. The map takes the
+    /// text's own (along, up) to the plan view, with `origin` as its corner.
+    /// `None` when the axes are not a plane.
+    pub fn from_plane(x_axis: [f64; 3], normal: [f64; 3], origin: [f64; 2]) -> Option<Affine> {
+        let unit = |v: [f64; 3]| {
+            let l = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
+            (l.is_finite() && l > 1e-12).then(|| v.map(|c| c / l))
+        };
+        let x = unit(x_axis)?;
+        let n = unit(normal)?;
+        let y = unit([
+            n[1] * x[2] - n[2] * x[1],
+            n[2] * x[0] - n[0] * x[2],
+            n[0] * x[1] - n[1] * x[0],
+        ])?;
+        Some(Affine {
+            a: x[0],
+            b: x[1],
+            c: y[0],
+            d: y[1],
+            e: origin[0],
+            f: origin[1],
+        })
+    }
+
     /// Mean absolute scale, used to keep lineweight sane through scaled blocks.
     pub fn scale_magnitude(&self) -> f64 {
         let sx = (self.a * self.a + self.b * self.b).sqrt();
@@ -127,7 +156,8 @@ impl Affine {
     }
 }
 
-/// One line segment, pre-transform-applied, still in drawing coordinates.
+/// One line segment, or circular arc, pre-transform-applied, still in drawing
+/// coordinates.
 #[derive(Clone, Copy)]
 pub struct Stroke {
     pub x0: f64,
@@ -139,6 +169,32 @@ pub struct Stroke {
     pub attr: u32,
     /// Position in the drawing's draw order. See `Scene::order`.
     pub order: u32,
+    /// 0 for a line; for an arc from the first point to the second, the tan
+    /// of a quarter of its sweep, positive counter-clockwise (DXF's bulge),
+    /// at most [`MAX_ARC_BULGE`]: the renderer draws it exactly at any zoom.
+    pub bulge: f32,
+}
+
+/// The largest bulge a stroke carries, a quarter turn's: an arc stroke then
+/// lies within the box of its ends widened by a fifth of its chord, and
+/// within its sector the shader's test is two cross products.
+pub const MAX_ARC_BULGE: f64 = 0.414_213_562_373_095_1;
+
+impl Stroke {
+    /// How far an arc stroke's curve stands off its chord, at most.
+    pub fn sagitta(&self) -> f64 {
+        (self.bulge.abs() as f64) * (self.x1 - self.x0).hypot(self.y1 - self.y0) / 2.0
+    }
+
+    /// The stroke as straight segments: itself, or its arc in `n` pieces.
+    pub fn flatten(&self, n: usize) -> Vec<[[f64; 2]; 2]> {
+        let (a, b) = ([self.x0, self.y0], [self.x1, self.y1]);
+        if self.bulge == 0.0 {
+            return vec![[a, b]];
+        }
+        let pts = super::curves::bulge_points(a, b, self.bulge as f64, n);
+        pts.array_windows().copied().collect()
+    }
 }
 
 /// One triangle corner.
@@ -151,7 +207,7 @@ pub struct FillVertex {
     pub order: u32,
 }
 
-pub const STROKE_BYTES: usize = 28;
+pub const STROKE_BYTES: usize = 32;
 pub const FILL_BYTES: usize = 20;
 
 /// Fill flag: paint the viewer's background colour instead of the vertex's.
@@ -160,6 +216,10 @@ pub const FILL_BYTES: usize = 20;
 /// background, which the tessellator does not know. The renderer substitutes it.
 pub const FILL_FLAG_BACKGROUND: u8 = 1;
 
+/// The lineweight code of a fill's edge, a stroke of no width whose fringe is
+/// the fill's anti-aliasing (`shaders.ts`). Lineweights stop at 211.
+pub const FILL_EDGE: u8 = 255;
+
 /// Flag: this colour is AutoCAD's colour 7, so it flips with the background.
 ///
 /// Colour 7 means "white or black, whichever contrasts". A true colour that
@@ -178,15 +238,22 @@ pub const FLAG_CONTRAST: u8 = 0x80;
 /// should average out to. 0 means "do not fade".
 #[inline]
 pub fn encode_fade_spacing(spacing: f64) -> u8 {
-    if !spacing.is_finite() || spacing <= 1.0 {
+    if !spacing.is_finite() || spacing <= 0.0 {
         return 0;
     }
-    // Logarithmic, eight steps to the octave, which covers millimetres through
-    // to tens of metres in the seven bits left beside the contrast flag.
-    let code = (spacing.log2() * 8.0).round();
+    // Logarithmic, five steps to the octave from 2^-9: in the seven bits left
+    // beside the contrast flag, 0.002 to 86,000 units, a pattern a few
+    // millimetres apart in a drawing in metres to one metres apart in a
+    // drawing in millimetres. `spacingFade` in shaders.ts decodes it.
+    let code = ((spacing.log2() + FADE_OCTAVES_BELOW_ONE) * FADE_STEPS_PER_OCTAVE).round();
     code.clamp(1.0, 127.0) as u8
 }
 
+/// Octaves below a unit `encode_fade_spacing` reaches, and its steps per
+/// octave.
+const FADE_OCTAVES_BELOW_ONE: f64 = 9.0;
+const FADE_STEPS_PER_OCTAVE: f64 = 5.0;
+
 #[inline]
 pub fn pack_attr(layer: u16, lineweight: u8, flags: u8) -> u32 {
     (layer as u32) | ((lineweight as u32) << 16) | ((flags as u32) << 24)
@@ -217,11 +284,15 @@ pub struct Scene {
     pub strokes: Vec<Stroke>,
     pub fills: Vec<FillVertex>,
     pub texts: Vec<super::text::TextRun>,
+    /// Clip regions as triangles, a text run's `clip` indexing them from 1.
+    pub clips: Vec<Vec<[[f64; 2]; 3]>>,
     /// Draw order counter. AutoCAD paints entities in this sequence, and later
     /// entities cover earlier ones: a small solid fill placed over a hatch is
     /// how a roof vent masks the tiles beneath it. Without it a viewer that
     /// batches all fills before all strokes draws the hatch back on top.
     pub order: u32,
+    /// Fill vertices `edge_fills` has outlined.
+    edged: usize,
     min_x: f64,
     min_y: f64,
     max_x: f64,
@@ -234,7 +305,9 @@ impl Scene {
             strokes: Vec::new(),
             fills: Vec::new(),
             texts: Vec::new(),
+            clips: Vec::new(),
             order: 0,
+            edged: 0,
             min_x: f64::INFINITY,
             min_y: f64::INFINITY,
             max_x: f64::NEG_INFINITY,
@@ -245,7 +318,10 @@ impl Scene {
     /// Record a text run. Only the anchor grows the extents: the rendered width
     /// depends on font metrics the renderer has and this side does not.
     pub fn push_text(&mut self, run: super::text::TextRun) {
-        if !(run.x.is_finite() && run.y.is_finite() && run.height.is_finite()) {
+        if ![run.x, run.y, run.u[0], run.u[1], run.v[0], run.v[1]]
+            .iter()
+            .all(|c| c.is_finite())
+        {
             return;
         }
         if run.text.is_empty() {
@@ -286,16 +362,72 @@ impl Scene {
             rgba,
             attr,
             order,
+            bulge: 0.0,
         });
     }
 
+    /// Push a circular arc as arc strokes of at most a quarter turn each:
+    /// centre, radius, start angle and signed sweep (positive
+    /// counter-clockwise), in drawing coordinates.
+    #[allow(clippy::too_many_arguments)]
+    pub fn push_arc(
+        &mut self,
+        cx: f64,
+        cy: f64,
+        r: f64,
+        start: f64,
+        sweep: f64,
+        rgba: u32,
+        attr: u32,
+    ) {
+        if ![cx, cy, r, start, sweep].iter().all(|v| v.is_finite()) || r <= 0.0 || sweep == 0.0 {
+            return;
+        }
+        let n = (sweep.abs() / std::f64::consts::FRAC_PI_2).ceil().max(1.0) as usize;
+        let step = sweep / n as f64;
+        let bulge = (step / 4.0).tan() as f32;
+        debug_assert!(f64::from(bulge.abs()) <= MAX_ARC_BULGE + 1e-6);
+        let at = |a: f64| [cx + r * a.cos(), cy + r * a.sin()];
+        // The extents: the arc's ends and the quadrant points it passes.
+        let (lo, hi) = if sweep > 0.0 {
+            (start, start + sweep)
+        } else {
+            (start + sweep, start)
+        };
+        let first = (lo / std::f64::consts::FRAC_PI_2).ceil() as i64;
+        let last = (hi / std::f64::consts::FRAC_PI_2).floor() as i64;
+        for k in first..=last.min(first + 4) {
+            let p = at(k as f64 * std::f64::consts::FRAC_PI_2);
+            self.grow(p[0], p[1]);
+        }
+        let order = self.order;
+        for i in 0..n {
+            let (a, b) = (
+                at(start + step * i as f64),
+                at(start + step * (i + 1) as f64),
+            );
+            self.grow(a[0], a[1]);
+            self.grow(b[0], b[1]);
+            self.strokes.push(Stroke {
+                x0: a[0],
+                y0: a[1],
+                x1: b[0],
+                y1: b[1],
+                rgba,
+                attr,
+                order,
+                bulge,
+            });
+        }
+    }
+
     /// Push a flattened polyline as a run of segments.
     pub fn push_polyline(&mut self, pts: &[[f64; 2]], closed: bool, rgba: u32, attr: u32) {
         if pts.len() < 2 {
             return;
         }
-        for w in pts.windows(2) {
-            self.push_stroke(w[0][0], w[0][1], w[1][0], w[1][1], rgba, attr);
+        for [a, b] in pts.array_windows() {
+            self.push_stroke(a[0], a[1], b[0], b[1], rgba, attr);
         }
         if closed {
             let a = pts[pts.len() - 1];
@@ -355,6 +487,60 @@ impl Scene {
     }
 
     /// Where each buffer currently ends, for a later `clip_since`.
+    /// Outline the opaque fills of one colour pushed since the last call with
+    /// `FILL_EDGE` strokes, whose fringe anti-aliases the fill's edge: drawn
+    /// at the fill's depth, each is hidden where the fill is and shows only
+    /// outside it. An edge two triangles share is left out; a translucent,
+    /// shaded or background fill is not outlined.
+    pub fn edge_fills(&mut self) {
+        let from = self.edged.min(self.fills.len());
+        self.edged = self.fills.len();
+        let tris = self.fills[from..].as_chunks::<3>().0;
+        if tris.is_empty() {
+            return;
+        }
+        let key = |a: &FillVertex, b: &FillVertex| {
+            let (pa, pb) = (
+                [a.x.to_bits(), a.y.to_bits()],
+                [b.x.to_bits(), b.y.to_bits()],
+            );
+            let (lo, hi) = if pa <= pb { (pa, pb) } else { (pb, pa) };
+            (a.rgba, a.attr, a.order, lo, hi)
+        };
+        let mut edges = Vec::new();
+        let mut uses: std::collections::HashMap<_, u32> = std::collections::HashMap::new();
+        for t in tris {
+            let one_colour = t[1].rgba == t[0].rgba && t[2].rgba == t[0].rgba;
+            let opaque = t[0].rgba >> 24 == 255;
+            let background = (t[0].attr >> 24) as u8 & FILL_FLAG_BACKGROUND != 0;
+            if !one_colour || !opaque || background {
+                continue;
+            }
+            for (a, b) in [(&t[0], &t[1]), (&t[1], &t[2]), (&t[2], &t[0])] {
+                *uses.entry(key(a, b)).or_insert(0) += 1;
+                edges.push((*a, *b));
+            }
+        }
+        for (a, b) in edges {
+            if uses[&key(&a, &b)] != 1 {
+                continue;
+            }
+            let attr = (a.attr & 0xFFFF)
+                | u32::from(FILL_EDGE) << 16
+                | (a.attr & (u32::from(FLAG_CONTRAST) << 24));
+            self.strokes.push(Stroke {
+                x0: a.x,
+                y0: a.y,
+                x1: b.x,
+                y1: b.y,
+                rgba: a.rgba,
+                attr,
+                order: a.order,
+                bulge: 0.0,
+            });
+        }
+    }
+
     pub fn mark(&self) -> Mark {
         Mark {
             strokes: self.strokes.len(),
@@ -381,15 +567,30 @@ impl Scene {
                 }
                 continue;
             }
-            shape.clip_segment(a, b, &mut spans);
-            for (t0, t1) in spans.iter().copied() {
-                kept.push(Stroke {
-                    x0: a[0] + (b[0] - a[0]) * t0,
-                    y0: a[1] + (b[1] - a[1]) * t0,
-                    x1: a[0] + (b[0] - a[0]) * t1,
-                    y1: a[1] + (b[1] - a[1]) * t1,
-                    ..s
-                });
+            // An arc wholly inside stays one; one crossing the edge is cut as
+            // the straight pieces of its curve.
+            if s.bulge != 0.0 {
+                let [x0, y0, x1, y1] = stroke_box(&s);
+                if [[x0, y0], [x1, y0], [x1, y1], [x0, y1]]
+                    .iter()
+                    .all(|&c| shape.contains(c))
+                {
+                    kept.push(s);
+                    continue;
+                }
+            }
+            for [a, b] in s.flatten(16) {
+                shape.clip_segment(a, b, &mut spans);
+                for (t0, t1) in spans.iter().copied() {
+                    kept.push(Stroke {
+                        x0: a[0] + (b[0] - a[0]) * t0,
+                        y0: a[1] + (b[1] - a[1]) * t0,
+                        x1: a[0] + (b[0] - a[0]) * t1,
+                        y1: a[1] + (b[1] - a[1]) * t1,
+                        bulge: 0.0,
+                        ..s
+                    });
+                }
             }
         }
         self.strokes.extend(kept);
@@ -411,12 +612,87 @@ impl Scene {
             }
         }
         self.fills.extend(kept_fills);
-
-        // A run is kept or dropped whole: its rendered width lives on the other
-        // side of the worker boundary, so there is no box here to cut against.
+        // Outlined before they were cut, and the outlines cut with the
+        // strokes.
+        self.edged = self.fills.len();
+
+        // A run's glyphs are laid out on the other side of the worker
+        // boundary, so it cannot be cut here: one that may cross the shape's
+        // edge is drawn through a clip region, which the renderer masks it
+        // with. One wholly outside is dropped, one wholly inside is left be.
         let tail: Vec<super::text::TextRun> = self.texts.drain(mark.texts..).collect();
-        self.texts
-            .extend(tail.into_iter().filter(|r| shape.contains([r.x, r.y])));
+        let (min, max) = shape.bounds();
+        let mut regions: std::collections::HashMap<u16, Option<u16>> = Default::default();
+        for mut r in tail {
+            let reach = text_reach(&r);
+            if r.x + reach < min[0]
+                || r.x - reach > max[0]
+                || r.y + reach < min[1]
+                || r.y - reach > max[1]
+            {
+                continue;
+            }
+            let corners = [
+                [r.x - reach, r.y - reach],
+                [r.x + reach, r.y - reach],
+                [r.x + reach, r.y + reach],
+                [r.x - reach, r.y + reach],
+            ];
+            if !corners.iter().all(|c| shape.contains(*c)) {
+                let region = *regions
+                    .entry(r.clip)
+                    .or_insert_with(|| self.clip_region(r.clip, shape));
+                match region {
+                    Some(id) => r.clip = id,
+                    // Nothing of the earlier region is inside this one.
+                    None => continue,
+                }
+            }
+            self.texts.push(r);
+        }
+    }
+
+    /// A new clip region: the shape, or the part of region `within` it, as
+    /// its id; None when that is empty, or when ids have run out (the run is
+    /// then kept or dropped by its anchor, as before regions).
+    fn clip_region(&mut self, within: u16, shape: &super::clip::ClipShape) -> Option<u16> {
+        let triangles = if within == 0 {
+            shape.triangles()
+        } else {
+            let mut out = Vec::new();
+            let mut piece = Vec::new();
+            for t in self
+                .clips
+                .get(within as usize - 1)
+                .cloned()
+                .unwrap_or_default()
+            {
+                shape.clip_triangle(t, &mut piece);
+                out.extend_from_slice(&piece);
+            }
+            out
+        };
+        if triangles.is_empty() || self.clips.len() >= u16::MAX as usize {
+            return None;
+        }
+        self.clips.push(triangles);
+        Some(self.clips.len() as u16)
+    }
+
+    /// The clip regions as the renderer takes them: for each, a `u32`
+    /// triangle count, then `f32 x, y` for each corner, relative to
+    /// `origin()`.
+    pub fn clip_buffer(&self) -> Vec<u8> {
+        let o = self.origin();
+        let mut out = Vec::new();
+        for region in &self.clips {
+            out.extend_from_slice(&(region.len() as u32).to_le_bytes());
+            for p in region.iter().flatten() {
+                out.extend_from_slice(&((p[0] - o[0]) as f32).to_le_bytes());
+                out.extend_from_slice(&((p[1] - o[1]) as f32).to_le_bytes());
+            }
+        }
+        out
     }
 
     /// Declare the extents instead of deriving them from the geometry.
@@ -452,6 +728,48 @@ impl Scene {
         }
     }
 
+    /// Narrow the extents to where the drawing is when a few strays lie far
+    /// off it (a point left at the origin of a drawing in national grid
+    /// coordinates): the f32 origin, the fitted view and the culling grid
+    /// then serve the drawing, not the empty space between it and them,
+    /// which cost it centimetres of precision and showed it as a speck.
+    /// The core is what lies between the 0.5th and 99.5th percentiles on
+    /// each axis, with a margin; the strays are still drawn.
+    pub fn focus_on_core(&mut self) {
+        let points = self.strokes.len() * 2 + self.fills.len() + self.texts.len();
+        if points < 200 || !self.min_x.is_finite() {
+            return;
+        }
+        let stride = (points / 50_000).max(1);
+        let all = self
+            .strokes
+            .iter()
+            .flat_map(|s| [[s.x0, s.y0], [s.x1, s.y1]])
+            .chain(self.fills.iter().map(|v| [v.x, v.y]))
+            .chain(self.texts.iter().map(|r| [r.x, r.y]));
+        let (mut xs, mut ys): (Vec<f64>, Vec<f64>) =
+            all.step_by(stride).map(|p| (p[0], p[1])).unzip();
+        let span = |v: &mut Vec<f64>| -> (f64, f64) {
+            let n = v.len();
+            let (lo, hi) = (n / 200, (n - 1) - n / 200);
+            let a = *v.select_nth_unstable_by(lo, f64::total_cmp).1;
+            let b = *v.select_nth_unstable_by(hi, f64::total_cmp).1;
+            (a, b)
+        };
+        let ((x0, x1), (y0, y1)) = (span(&mut xs), span(&mut ys));
+        let margin = (x1 - x0).max(y1 - y0) * 0.25;
+        let core = [x0 - margin, y0 - margin, x1 + margin, y1 + margin];
+        let (full_w, full_h) = (self.max_x - self.min_x, self.max_y - self.min_y);
+        let (core_w, core_h) = (core[2] - core[0], core[3] - core[1]);
+        if !(core_w > 0.0 && core_h > 0.0) || (full_w <= 4.0 * core_w && full_h <= 4.0 * core_h) {
+            return;
+        }
+        self.min_x = self.min_x.max(core[0]);
+        self.min_y = self.min_y.max(core[1]);
+        self.max_x = self.max_x.min(core[2]);
+        self.max_y = self.max_y.min(core[3]);
+    }
+
     /// Highest draw-order value used, for normalising depth.
     pub fn max_order(&self) -> u32 {
         self.order
@@ -492,173 +810,285 @@ impl Scene {
         [self.min_x, self.min_y, self.max_x, self.max_y]
     }
 
-    /// Interleaved stroke instance buffer, `STROKE_BYTES` per segment.
+    /// The geometry as the renderer takes it (see [`Buffers`]).
     ///
-    /// Opaque segments come first, then translucent ones, and each half is
-    /// sorted into spatial buckets so the renderer can skip what a view does
-    /// not touch. The halves stay whole: the opaque pass writes depth and the
-    /// translucent pass only tests it, so interleaving them by bucket would let
-    /// one bucket's opaque geometry paint over another's translucent.
-    pub fn stroke_buffer(&self) -> Vec<u8> {
+    /// Opaque geometry comes first, sorted into spatial buckets so the
+    /// renderer can skip what a view does not touch, then translucent
+    /// geometry in draw order: blending is drawn in order, and the opaque
+    /// pass must be done before any of it, so the halves stay whole.
+    ///
+    /// It takes the strokes and fills out of the scene as it encodes them,
+    /// so each list is freed once its bytes are made: read the origin, the
+    /// extents, the text and the clip regions first.
+    pub fn buffers(&mut self) -> Buffers {
         let o = self.origin();
-        let mut out = Vec::with_capacity(self.strokes.len() * STROKE_BYTES);
-        for half in self.stroke_halves() {
-            let (order, _) = self.bucket_strokes(&half);
-            for i in order {
-                let s = half[i as usize];
-                out.extend_from_slice(&((s.x0 - o[0]) as f32).to_le_bytes());
-                out.extend_from_slice(&((s.y0 - o[1]) as f32).to_le_bytes());
-                out.extend_from_slice(&((s.x1 - o[0]) as f32).to_le_bytes());
-                out.extend_from_slice(&((s.y1 - o[1]) as f32).to_le_bytes());
-                out.extend_from_slice(&s.rgba.to_le_bytes());
-                out.extend_from_slice(&s.attr.to_le_bytes());
-                out.extend_from_slice(&s.order.to_le_bytes());
+        // Indices rather than copies: a stroke is 48 bytes, its index 4.
+        let [opaque_strokes, strokes] = self.stroke_halves();
+        let [opaque_fills, fills] = self.fill_halves();
+        let (stroke_order, mut stroke_tiles) = self.bucket_strokes(&opaque_strokes);
+        let (fill_order, mut fill_tiles) = self.bucket_fills(&opaque_fills);
+        let translucent = self.translucent(&strokes, &fills);
+
+        let mut stroke_bytes = Vec::with_capacity(self.strokes.len() * STROKE_BYTES);
+        let ordered = stroke_order
+            .iter()
+            .map(|&i| opaque_strokes[i as usize])
+            .chain(strokes.iter().copied());
+        for s in ordered.map(|i| &self.strokes[i as usize]) {
+            stroke_bytes.extend_from_slice(&((s.x0 - o[0]) as f32).to_le_bytes());
+            stroke_bytes.extend_from_slice(&((s.y0 - o[1]) as f32).to_le_bytes());
+            stroke_bytes.extend_from_slice(&((s.x1 - o[0]) as f32).to_le_bytes());
+            stroke_bytes.extend_from_slice(&((s.y1 - o[1]) as f32).to_le_bytes());
+            stroke_bytes.extend_from_slice(&s.rgba.to_le_bytes());
+            stroke_bytes.extend_from_slice(&s.attr.to_le_bytes());
+            stroke_bytes.extend_from_slice(&s.order.to_le_bytes());
+            stroke_bytes.extend_from_slice(&s.bulge.to_le_bytes());
+        }
+        drop((stroke_order, strokes));
+        self.strokes = Vec::new();
+        let mut fill_bytes = Vec::with_capacity(self.fills.len() * FILL_BYTES);
+        let ordered = fill_order
+            .iter()
+            .map(|&i| opaque_fills[i as usize])
+            .chain(fills.iter().copied());
+        for t in ordered {
+            for v in &self.fills[t as usize * 3..t as usize * 3 + 3] {
+                fill_bytes.extend_from_slice(&((v.x - o[0]) as f32).to_le_bytes());
+                fill_bytes.extend_from_slice(&((v.y - o[1]) as f32).to_le_bytes());
+                fill_bytes.extend_from_slice(&v.rgba.to_le_bytes());
+                fill_bytes.extend_from_slice(&v.attr.to_le_bytes());
+                fill_bytes.extend_from_slice(&v.order.to_le_bytes());
             }
         }
-        out
-    }
+        drop((fill_order, fills));
+        self.fills = Vec::new();
+
+        // Tiles count strokes, and fill vertices (for drawArrays); the
+        // translucent ones start past the opaque half.
+        for tile in &mut fill_tiles {
+            tile.start *= 3;
+            tile.count *= 3;
+        }
+        let (opaque_stroke_tiles, opaque_fill_tiles) = (stroke_tiles.len(), fill_tiles.len());
+        for mut tile in translucent.strokes {
+            tile.start += opaque_strokes.len() as u32;
+            stroke_tiles.push(tile);
+        }
+        for mut tile in translucent.fills {
+            tile.start = (opaque_fills.len() as u32 + tile.start) * 3;
+            tile.count *= 3;
+            fill_tiles.push(tile);
+        }
+        let mut runs = Vec::with_capacity(translucent.runs.len() * 12);
+        for (fill, from, to) in translucent.runs {
+            let base = if fill {
+                opaque_fill_tiles
+            } else {
+                opaque_stroke_tiles
+            } as u32;
+            runs.extend_from_slice(&u32::from(fill).to_le_bytes());
+            runs.extend_from_slice(&(base + from).to_le_bytes());
+            runs.extend_from_slice(&(base + to).to_le_bytes());
+        }
 
-    /// Interleaved fill vertex buffer, `FILL_BYTES` per vertex.
-    pub fn fill_buffer(&self) -> Vec<u8> {
-        let o = self.origin();
-        let mut out = Vec::with_capacity(self.fills.len() * FILL_BYTES);
-        for half in self.fill_halves() {
-            let (order, _) = self.bucket_fills(&half);
-            for i in order {
-                for v in half[i as usize] {
-                    out.extend_from_slice(&((v.x - o[0]) as f32).to_le_bytes());
-                    out.extend_from_slice(&((v.y - o[1]) as f32).to_le_bytes());
-                    out.extend_from_slice(&v.rgba.to_le_bytes());
-                    out.extend_from_slice(&v.attr.to_le_bytes());
-                    out.extend_from_slice(&v.order.to_le_bytes());
-                }
-            }
+        Buffers {
+            strokes: stroke_bytes,
+            fills: fill_bytes,
+            opaque_strokes: opaque_strokes.len(),
+            opaque_fills: opaque_fills.len() * 3,
+            stroke_tiles: super::tiles::encode(&stroke_tiles, o),
+            fill_tiles: super::tiles::encode(&fill_tiles, o),
+            opaque_stroke_tiles,
+            opaque_fill_tiles,
+            translucent_runs: runs,
         }
-        out
     }
 
-    /// Strokes split into the opaque half and the translucent half, in that
-    /// order. Both buffer emission and the tile table walk this, so they cannot
-    /// disagree about what went where.
-    fn stroke_halves(&self) -> [Vec<Stroke>; 2] {
-        let (a, b): (Vec<Stroke>, Vec<Stroke>) =
-            self.strokes.iter().partition(|s| is_opaque(s.rgba));
+    /// The strokes of the opaque half and of the translucent half, by
+    /// index, the translucent one in draw order. Both buffer emission and
+    /// the tile table walk this, so they cannot disagree about what went
+    /// where.
+    fn stroke_halves(&self) -> [Vec<u32>; 2] {
+        let all = 0..self.strokes.len() as u32;
+        let (a, mut b): (Vec<u32>, Vec<u32>) =
+            all.partition(|&i| is_opaque(self.strokes[i as usize].rgba));
+        b.sort_by_key(|&i| self.strokes[i as usize].order);
         [a, b]
     }
 
-    /// The same for fills, kept as whole triangles. A gradient gives its
-    /// corners different colours but the same alpha, so one corner decides.
-    fn fill_halves(&self) -> [Vec<[FillVertex; 3]>; 2] {
-        let tris: Vec<[FillVertex; 3]> = self.fills.as_chunks::<3>().0.to_vec();
-        let (a, b): (Vec<_>, Vec<_>) = tris.into_iter().partition(|t| is_opaque(t[0].rgba));
+    /// The same for fills, by triangle. A gradient gives its corners
+    /// different colours but the same alpha, so one corner decides.
+    fn fill_halves(&self) -> [Vec<u32>; 2] {
+        let all = 0..(self.fills.len() / 3) as u32;
+        let (a, mut b): (Vec<u32>, Vec<u32>) =
+            all.partition(|&t| is_opaque(self.fills[t as usize * 3].rgba));
+        b.sort_by_key(|&t| self.fills[t as usize * 3].order);
         [a, b]
     }
 
-    fn bucket_strokes(&self, half: &[Stroke]) -> (Vec<u32>, Vec<super::tiles::Tile>) {
+    fn triangle(&self, t: u32) -> &[FillVertex; 3] {
+        let at = t as usize * 3;
+        self.fills[at..at + 3].try_into().expect("three vertices")
+    }
+
+    /// The translucent halves' tiles, and the order to draw them in. A tile
+    /// is a run of the half in draw order, so it is no spatial bucket, but
+    /// neighbours in draw order are often neighbours on the sheet too. Fills
+    /// and strokes interleave by draw order, a run of tiles of one kind at a
+    /// time; past [`MAX_TRANSLUCENT_RUNS`] runs, the fills then the strokes.
+    fn translucent(&self, strokes: &[u32], fills: &[u32]) -> Translucent {
+        let stroke = |i: u32| &self.strokes[i as usize];
+        let mut t = Translucent::default();
+        let (mut i, mut j) = (0, 0);
+        while i < strokes.len() || j < fills.len() {
+            let fill = match (strokes.get(i), fills.get(j)) {
+                (Some(&s), Some(&f)) => self.triangle(f)[0].order <= stroke(s).order,
+                (None, _) => true,
+                (Some(_), None) => false,
+            };
+            if fill {
+                t.push(true, j, fill_box(self.triangle(fills[j])));
+                j += 1;
+            } else {
+                t.push(false, i, stroke_box(stroke(strokes[i])));
+                i += 1;
+            }
+        }
+        if t.runs.len() > MAX_TRANSLUCENT_RUNS {
+            t = Translucent::default();
+            for (j, &f) in fills.iter().enumerate() {
+                t.push(true, j, fill_box(self.triangle(f)));
+            }
+            for (i, &s) in strokes.iter().enumerate() {
+                t.push(false, i, stroke_box(stroke(s)));
+            }
+        }
+        t
+    }
+
+    fn bucket_strokes(&self, half: &[u32]) -> (Vec<u32>, Vec<Tile>) {
+        let stroke = |i: &u32| &self.strokes[*i as usize];
         super::tiles::bucket(
             half,
             self.world_extent(),
-            |s| [(s.x0 + s.x1) / 2.0, (s.y0 + s.y1) / 2.0],
-            |s| {
-                [
-                    s.x0.min(s.x1),
-                    s.y0.min(s.y1),
-                    s.x0.max(s.x1),
-                    s.y0.max(s.y1),
-                ]
+            |i| {
+                let s = stroke(i);
+                [(s.x0 + s.x1) / 2.0, (s.y0 + s.y1) / 2.0]
             },
+            |i| stroke_box(stroke(i)),
         )
     }
 
-    fn bucket_fills(&self, half: &[[FillVertex; 3]]) -> (Vec<u32>, Vec<super::tiles::Tile>) {
+    fn bucket_fills(&self, half: &[u32]) -> (Vec<u32>, Vec<Tile>) {
         super::tiles::bucket(
             half,
             self.world_extent(),
-            |t| {
+            |&i| {
+                let t = self.triangle(i);
                 [
                     (t[0].x + t[1].x + t[2].x) / 3.0,
                     (t[0].y + t[1].y + t[2].y) / 3.0,
                 ]
             },
-            |t| {
-                [
-                    t[0].x.min(t[1].x).min(t[2].x),
-                    t[0].y.min(t[1].y).min(t[2].y),
-                    t[0].x.max(t[1].x).max(t[2].x),
-                    t[0].y.max(t[1].y).max(t[2].y),
-                ]
-            },
+            |&i| fill_box(self.triangle(i)),
         )
     }
+}
 
-    /// Tile table for `stroke_buffer`, counted in strokes. The translucent
-    /// half's tiles are offset past the opaque half, so a start index addresses
-    /// the whole buffer.
-    pub fn stroke_tiles(&self) -> Vec<u8> {
-        let halves = self.stroke_halves();
-        let mut tiles = Vec::new();
-        let mut base = 0u32;
-        for half in &halves {
-            let (_, mut t) = self.bucket_strokes(half);
-            for tile in &mut t {
-                tile.start += base;
-            }
-            base += half.len() as u32;
-            tiles.extend(t);
-        }
-        super::tiles::encode(&tiles, self.origin())
-    }
-
-    /// Tile table for `fill_buffer`, counted in vertices, so it can be handed
-    /// straight to `drawArrays`.
-    pub fn fill_tiles(&self) -> Vec<u8> {
-        let halves = self.fill_halves();
-        let mut tiles = Vec::new();
-        let mut base = 0u32;
-        for half in &halves {
-            let (_, mut t) = self.bucket_fills(half);
-            for tile in &mut t {
-                tile.start = base + tile.start * 3;
-                tile.count *= 3;
-            }
-            base += half.len() as u32 * 3;
-            tiles.extend(t);
-        }
-        super::tiles::encode(&tiles, self.origin())
-    }
+/// What [`Scene::buffers`] hands the renderer; see [`super::Drawing`].
+pub struct Buffers {
+    pub strokes: Vec<u8>,
+    pub fills: Vec<u8>,
+    pub opaque_strokes: usize,
+    pub opaque_fills: usize,
+    pub stroke_tiles: Vec<u8>,
+    pub fill_tiles: Vec<u8>,
+    pub opaque_stroke_tiles: usize,
+    pub opaque_fill_tiles: usize,
+    pub translucent_runs: Vec<u8>,
+}
 
-    /// Where the translucent tiles begin, as an index into the tile table.
-    pub fn opaque_stroke_tiles(&self) -> usize {
-        self.bucket_strokes(&self.stroke_halves()[0]).1.len()
-    }
+/// Elements in one tile of a translucent half.
+const TRANSLUCENT_TILE: u32 = 4096;
+/// Most runs the translucent pass alternates fills and strokes in, each a
+/// few draw calls.
+const MAX_TRANSLUCENT_RUNS: usize = 1024;
 
-    pub fn opaque_fill_tiles(&self) -> usize {
-        self.bucket_fills(&self.fill_halves()[0]).1.len()
-    }
+/// The translucent halves' tiles, `start` and `count` in elements of the
+/// half, and the runs of tiles to draw: (fills, first tile, end tile).
+#[derive(Default)]
+struct Translucent {
+    strokes: Vec<Tile>,
+    fills: Vec<Tile>,
+    runs: Vec<(bool, u32, u32)>,
+}
 
-    /// How many leading strokes of `stroke_buffer` are opaque.
-    pub fn opaque_strokes(&self) -> usize {
-        self.strokes.iter().filter(|s| is_opaque(s.rgba)).count()
+impl Translucent {
+    /// Element `index` of a half, next in draw order.
+    fn push(&mut self, fill: bool, index: usize, b: [f64; 4]) {
+        let tiles = if fill {
+            &mut self.fills
+        } else {
+            &mut self.strokes
+        };
+        let same_run = self.runs.last().is_some_and(|r| r.0 == fill);
+        if let Some(t) = tiles
+            .last_mut()
+            .filter(|t| same_run && t.count < TRANSLUCENT_TILE)
+        {
+            t.count += 1;
+            t.min_x = t.min_x.min(b[0]);
+            t.min_y = t.min_y.min(b[1]);
+            t.max_x = t.max_x.max(b[2]);
+            t.max_y = t.max_y.max(b[3]);
+            return;
+        }
+        tiles.push(Tile {
+            start: index as u32,
+            count: 1,
+            min_x: b[0],
+            min_y: b[1],
+            max_x: b[2],
+            max_y: b[3],
+        });
+        let n = tiles.len() as u32;
+        match self.runs.last_mut() {
+            Some(r) if same_run => r.2 = n,
+            _ => self.runs.push((fill, n - 1, n)),
+        }
     }
+}
 
-    /// How many leading vertices of `fill_buffer` are opaque.
-    pub fn opaque_fills(&self) -> usize {
-        self.fills
-            .as_chunks::<3>()
-            .0
-            .iter()
-            .filter(|t| is_opaque(t[0].rgba))
-            .count()
-            * 3
-    }
+fn stroke_box(s: &Stroke) -> [f64; 4] {
+    let h = s.sagitta();
+    [
+        s.x0.min(s.x1) - h,
+        s.y0.min(s.y1) - h,
+        s.x0.max(s.x1) + h,
+        s.y0.max(s.y1) + h,
+    ]
 }
 
-/// Fully opaque geometry can write depth; translucent geometry cannot.
-///
-/// The draw order is resolved through the depth buffer, so a translucent
-/// entity that writes depth rejects everything drawn behind it afterwards
-/// instead of letting it blend through. Splitting the buffers lets the
-/// renderer draw the translucent tail with depth writes off.
+fn fill_box(t: &[FillVertex; 3]) -> [f64; 4] {
+    [
+        t[0].x.min(t[1].x).min(t[2].x),
+        t[0].y.min(t[1].y).min(t[2].y),
+        t[0].x.max(t[1].x).max(t[2].x),
+        t[0].y.max(t[1].y).max(t[2].y),
+    ]
+}
+
+/// How far from its anchor a run can reach, whatever its alignment and
+/// rotation: every character an em wide, which no bundled face exceeds, and
+/// a line's height.
+fn text_reach(r: &super::text::TextRun) -> f64 {
+    let chars = r.text.chars().count() as f64;
+    r.unit() * (chars + 1.0)
+}
+
+/// Fully opaque geometry can be drawn in any order, the depth buffer
+/// deciding what covers what; translucent geometry blends over what is
+/// already drawn, so it comes after, in draw order.
 #[inline]
 fn is_opaque(rgba: u32) -> bool {
     rgba >> 24 == 255
@@ -736,23 +1166,119 @@ mod tests {
         s.push_triangle([0.0, 0.0], [1.0, 0.0], [0.0, 1.0], clear, 0);
         s.push_triangle([2.0, 0.0], [3.0, 0.0], [2.0, 1.0], solid, 0);
 
-        assert_eq!(s.opaque_strokes(), 1);
-        assert_eq!(s.opaque_fills(), 3);
+        let b = s.buffers();
+        assert_eq!(b.opaque_strokes, 1);
+        assert_eq!(b.opaque_fills, 3);
 
         // The opaque one comes first in the buffer whatever order it arrived in.
-        let buf = s.stroke_buffer();
-        let first_rgba = u32::from_le_bytes(buf[16..20].try_into().unwrap());
+        let first_rgba = u32::from_le_bytes(b.strokes[16..20].try_into().unwrap());
         assert_eq!(first_rgba, solid);
-        let fills = s.fill_buffer();
-        let first_fill_rgba = u32::from_le_bytes(fills[8..12].try_into().unwrap());
+        let first_fill_rgba = u32::from_le_bytes(b.fills[8..12].try_into().unwrap());
         assert_eq!(first_fill_rgba, solid);
     }
 
+    fn u32s(b: &[u8]) -> Vec<u32> {
+        b.as_chunks::<4>()
+            .0
+            .iter()
+            .map(|c| u32::from_le_bytes(*c))
+            .collect()
+    }
+
+    /// An opaque fill is outlined by edges of no width, which anti-alias it:
+    /// a square of two triangles by its four sides, not their diagonal. A
+    /// translucent fill and a background one are not.
+    #[test]
+    fn opaque_fills_are_outlined_for_their_edges() {
+        let mut s = Scene::new();
+        let red = pack_rgba(255, 0, 0, 255);
+        let attr = pack_attr(3, 25, FLAG_CONTRAST);
+        s.push_triangle([0.0, 0.0], [1.0, 0.0], [1.0, 1.0], red, attr);
+        s.push_triangle([0.0, 0.0], [1.0, 1.0], [0.0, 1.0], red, attr);
+        s.edge_fills();
+        assert_eq!(s.strokes.len(), 4);
+        for k in &s.strokes {
+            assert_eq!(k.attr, pack_attr(3, FILL_EDGE, FLAG_CONTRAST));
+            assert_eq!(k.rgba, red);
+            assert!(k.x0 == k.x1 || k.y0 == k.y1, "a side, not the diagonal");
+        }
+        // Each fill once: a second call outlines nothing more.
+        s.edge_fills();
+        assert_eq!(s.strokes.len(), 4);
+        s.push_triangle(
+            [5.0, 0.0],
+            [6.0, 0.0],
+            [6.0, 1.0],
+            pack_rgba(255, 0, 0, 128),
+            attr,
+        );
+        s.push_triangle(
+            [7.0, 0.0],
+            [8.0, 0.0],
+            [8.0, 1.0],
+            red,
+            pack_attr(3, 25, FILL_FLAG_BACKGROUND),
+        );
+        s.edge_fills();
+        assert_eq!(s.strokes.len(), 4);
+    }
+
+    /// Translucent geometry is drawn in draw order, fills and strokes
+    /// interleaved, wherever it was pushed from.
+    #[test]
+    fn translucent_geometry_keeps_draw_order() {
+        let mut s = Scene::new();
+        let clear = pack_rgba(255, 0, 0, 128);
+        for (order, fill) in [(3, false), (1, true), (2, false), (4, true), (0, false)] {
+            s.order = order;
+            if fill {
+                s.push_triangle([0.0, 0.0], [1.0, 0.0], [0.0, 1.0], clear, 0);
+            } else {
+                s.push_stroke(0.0, 0.0, 1.0, 0.0, clear, 0);
+            }
+        }
+        // An opaque stroke elsewhere gives the stroke table a bucket first.
+        s.order = 9;
+        s.push_stroke(50.0, 50.0, 60.0, 50.0, pack_rgba(0, 0, 0, 255), 0);
+        let b = s.buffers();
+        let orders: Vec<u32> = b
+            .strokes
+            .chunks(STROKE_BYTES)
+            .map(|c| u32s(&c[24..28])[0])
+            .collect();
+        assert_eq!(orders, [9, 0, 2, 3]);
+        // Strokes 0, fill 1, strokes 2 and 3, fill 4: stroke tiles from 1
+        // (past the opaque bucket), fill tiles from 0.
+        assert_eq!(
+            u32s(&b.translucent_runs),
+            [0, 1, 2, 1, 0, 1, 0, 2, 3, 1, 1, 2]
+        );
+        let tiles = u32s(&b.stroke_tiles);
+        let starts: Vec<u32> = tiles.chunks(6).map(|t| t[0]).collect();
+        let counts: Vec<u32> = tiles.chunks(6).map(|t| t[1]).collect();
+        assert_eq!((starts, counts), (vec![0, 1, 2], vec![1, 1, 2]));
+    }
+
+    /// Past the most runs, the fills then the strokes.
+    #[test]
+    fn translucent_runs_have_a_ceiling() {
+        let mut s = Scene::new();
+        let clear = pack_rgba(255, 0, 0, 128);
+        for i in 0..MAX_TRANSLUCENT_RUNS as u32 {
+            s.order = 2 * i;
+            s.push_triangle([0.0, 0.0], [1.0, 0.0], [0.0, 1.0], clear, 0);
+            s.order = 2 * i + 1;
+            s.push_stroke(0.0, 0.0, 1.0, 0.0, clear, 0);
+        }
+        let runs = u32s(&s.buffers().translucent_runs);
+        assert_eq!(runs, [1, 0, 1, 0, 0, 1]);
+    }
+
     #[test]
     fn the_contrast_flag_and_the_fade_code_share_one_byte() {
         // Both live in the flags byte, so a hatch on colour 7 has to carry its
         // spacing and its flip without either eating the other.
-        for spacing in [1.5f64, 16.0, 500.0, 50_000.0] {
+        for spacing in [0.01, 0.5, 1.5f64, 16.0, 500.0, 50_000.0] {
             let fade = encode_fade_spacing(spacing);
             assert!(
                 fade > 0 && fade < FLAG_CONTRAST,
@@ -765,18 +1291,18 @@ mod tests {
             assert_eq!(a & 0xFFFF, 7);
             assert_eq!((a >> 16) & 0xFF, 25);
         }
-        assert_eq!(encode_fade_spacing(0.5), 0);
+        assert_eq!(encode_fade_spacing(0.0), 0);
     }
 
     #[test]
     fn the_fade_code_still_resolves_a_useful_spacing_range() {
-        // Seven bits, eight steps to the octave: a millimetre up to tens of
-        // metres, which is every hatch spacing a drawing uses.
-        let decode = |code: u8| (code as f64 / 8.0).exp2();
-        for spacing in [2.0f64, 40.0, 5000.0] {
+        // Seven bits, five steps to the octave from 2^-9: a pattern
+        // millimetres apart in metres, or metres apart in millimetres.
+        let decode = |code: u8| (code as f64 / 5.0 - 9.0).exp2();
+        for spacing in [0.003f64, 0.05, 0.5, 2.0, 40.0, 5000.0, 80_000.0] {
             let back = decode(encode_fade_spacing(spacing));
             assert!(
-                (back / spacing - 1.0).abs() < 0.05,
+                (back / spacing - 1.0).abs() < 0.075,
                 "{spacing} came back as {back}"
             );
         }
@@ -796,7 +1322,7 @@ mod tests {
         let o = s.origin();
         assert!((o[0] - 6_500_000.5).abs() < 1e-6);
 
-        let buf = s.stroke_buffer();
+        let buf = s.buffers().strokes;
         let x0 = f32::from_le_bytes(buf[0..4].try_into().unwrap());
         let x1 = f32::from_le_bytes(buf[8..12].try_into().unwrap());
         // Relative coordinates keep the 1-unit separation intact.
@@ -814,13 +1340,67 @@ mod tests {
         );
     }
 
+    /// A circle is four quarter arcs, its extents its own box exactly; an
+    /// arc inside a clip stays one, one across it is cut along its curve.
+    #[test]
+    fn arcs_are_strokes_of_a_quarter_turn() {
+        let mut s = Scene::new();
+        s.push_arc(10.0, 0.0, 2.0, 0.0, std::f64::consts::TAU, 0, 0);
+        assert_eq!(s.strokes.len(), 4);
+        let quarter = (std::f64::consts::PI / 8.0).tan() as f32;
+        assert!(s.strokes.iter().all(|k| (k.bulge - quarter).abs() < 1e-6));
+        let o = s.origin();
+        assert_eq!(
+            s.extents_local().map(|v| (v * 1e4).round() / 1e4),
+            [-2.0, -2.0, 2.0, 2.0]
+        );
+        assert_eq!(o, [10.0, 0.0]);
+        // The encoding carries the bulge last.
+        let b = s.buffers();
+        let at = STROKE_BYTES - 4;
+        assert_eq!(
+            f32::from_le_bytes(b.strokes[at..at + 4].try_into().unwrap()),
+            quarter
+        );
+
+        let mut s = Scene::new();
+        s.push_arc(0.0, 0.0, 1.0, 0.0, std::f64::consts::FRAC_PI_2, 0, 0);
+        let mark = Mark {
+            strokes: 0,
+            fills: 0,
+            texts: 0,
+        };
+        s.clip_since(
+            mark,
+            &super::super::clip::ClipShape::rect([0.0, 0.0], 10.0, 10.0),
+        );
+        assert_eq!(s.strokes.len(), 1, "inside: still one arc");
+        s.clip_since(
+            mark,
+            &super::super::clip::ClipShape::rect([1.0, 0.0], 1.0, 10.0),
+        );
+        assert!(
+            s.strokes.len() > 1
+                && s.strokes
+                    .iter()
+                    .all(|k| k.bulge == 0.0 && k.x0 >= 0.5 - 1e-9)
+        );
+        // On the curve, to the flattening's sagitta.
+        assert!(
+            s.strokes
+                .iter()
+                .all(|k| (k.x0.hypot(k.y0) - 1.0).abs() < 2e-3)
+        );
+    }
+
     #[test]
     fn buffers_have_the_documented_stride() {
         let mut s = Scene::new();
         s.push_stroke(0.0, 0.0, 1.0, 1.0, 0, 0);
         s.push_triangle([0.0, 0.0], [1.0, 0.0], [0.0, 1.0], 0, 0);
-        assert_eq!(s.stroke_buffer().len(), STROKE_BYTES);
-        assert_eq!(s.fill_buffer().len(), 3 * FILL_BYTES);
+        let b = s.buffers();
+        assert_eq!(b.strokes.len(), STROKE_BYTES);
+        assert_eq!(b.fills.len(), 3 * FILL_BYTES);
     }
 
     #[test]
diff --git a/crates/exav-render/src/formats/dwg/stroke_font/fontobene.rs b/crates/exav-render/src/formats/dwg/stroke_font/fontobene.rs
index e7b80772..13df00d6 100644
--- a/crates/exav-render/src/formats/dwg/stroke_font/fontobene.rs
+++ b/crates/exav-render/src/formats/dwg/stroke_font/fontobene.rs
@@ -234,10 +234,10 @@ fn parse_polyline(line: &str, line_no: usize) -> Result<Vec<[f32; 2]>, ParseErro
     let mut out: Vec<[f32; 2]> = Vec::with_capacity(pts.len());
     for (i, (p, bulge)) in pts.iter().enumerate() {
         out.push(*p);
-        if let Some((next, _)) = pts.get(i + 1) {
-            if *bulge != 0.0 {
-                flatten_arc(*p, *next, *bulge, &mut out);
-            }
+        if let Some((next, _)) = pts.get(i + 1)
+            && *bulge != 0.0
+        {
+            flatten_arc(*p, *next, *bulge, &mut out);
         }
     }
     Ok(out)
@@ -452,8 +452,8 @@ license = CC0-1.0
         let src = "[font]\n\n---\n\n[0041] A\n0,0,9;18,0\n";
         let g = &parse(src).unwrap().glyphs[&0x41];
         let arc = &g.polylines[0];
-        for w in arc.windows(2) {
-            let mid = [(w[0][0] + w[1][0]) / 2.0, (w[0][1] + w[1][1]) / 2.0];
+        for [a, b] in arc.array_windows() {
+            let mid = [(a[0] + b[0]) / 2.0, (a[1] + b[1]) / 2.0];
             // Sagitta is how far the chord midpoint falls inside the circle.
             let r = ((mid[0] - 9.0).powi(2) + mid[1].powi(2)).sqrt();
             assert!(
diff --git a/crates/exav-render/src/formats/dwg/stroke_font/mod.rs b/crates/exav-render/src/formats/dwg/stroke_font/mod.rs
index ca6734be..aa9f8e7a 100644
--- a/crates/exav-render/src/formats/dwg/stroke_font/mod.rs
+++ b/crates/exav-render/src/formats/dwg/stroke_font/mod.rs
@@ -186,7 +186,7 @@ impl<'a> Glyph<'a> {
 
     /// The strokes, each a run of points in cap-height units with the origin on
     /// the baseline at the glyph's left edge.
-    pub fn polylines(&self) -> impl Iterator<Item = Polyline<'a>> + 'a {
+    pub fn polylines(&self) -> impl Iterator<Item = Polyline<'a>> + 'a + use<'a> {
         let (a, z) = self.poly_range();
         let font = self.font;
         (a..z).map(move |i| Polyline { font, index: i })
@@ -218,7 +218,7 @@ impl<'a> Polyline<'a> {
     }
 
     /// The points, in cap heights.
-    pub fn points(&self) -> impl Iterator<Item = [f32; 2]> + 'a {
+    pub fn points(&self) -> impl Iterator<Item = [f32; 2]> + 'a + use<'a> {
         let (a, z) = self.range();
         let font = self.font;
         (a..z).map(move |i| {
diff --git a/crates/exav-render/src/formats/dwg/tessellate.rs b/crates/exav-render/src/formats/dwg/tessellate.rs
index c83f1585..c424f5c0 100644
--- a/crates/exav-render/src/formats/dwg/tessellate.rs
+++ b/crates/exav-render/src/formats/dwg/tessellate.rs
@@ -1,25 +1,27 @@
 //! Walk a drawing model and turn drawable entities into GPU buffers.
 
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 
 use crate::cad::{
     Color, Drawing as CadDrawing, Edge, Entity, EntityKind, HAlign, Handle, LineWeight,
-    PolylineKind, Transparency, VAlign, MODEL_SPACE, PAPER_SPACE,
+    MODEL_SPACE, PAPER_SPACE, PolylineKind, Transparency, VAlign,
 };
 
 use super::clip::ClipShape;
 use super::curves;
+use super::dimension;
 use super::fill;
 use super::font;
 use super::gradient::{self, Gradient};
 use super::hatch;
-use super::linetype::{self, dash_polyline, Pattern};
+use super::linetype::{self, Pattern, dash_polyline};
 use super::palette::Palette;
 use super::proxy;
 use super::scene::{
-    encode_fade_spacing, pack_attr, pack_rgba, Affine, Scene, FILL_FLAG_BACKGROUND, FLAG_CONTRAST,
+    Affine, FILL_FLAG_BACKGROUND, FLAG_CONTRAST, Scene, encode_fade_spacing, pack_attr, pack_rgba,
 };
 use super::text;
+use super::wide::{self, WideVertex};
 
 fn h_align_of(a: HAlign) -> text::HAlign {
     match a {
@@ -47,7 +49,8 @@ fn v_align_of(a: VAlign) -> text::VAlign {
 /// Only some entity types are stored in OCS. LINE, POINT, SPLINE, ELLIPSE,
 /// 3DFACE and MLINE carry an extrusion vector but their coordinates are
 /// already world-space, so applying the transform to them would mirror
-/// geometry that was correct to begin with.
+/// geometry that was correct to begin with. MTEXT is world-space too, with
+/// its own plane (`mtext_plane`).
 fn ocs_of(e: &EntityKind) -> Option<Affine> {
     let (n, elevation) = match e {
         EntityKind::Circle(x) => (x.plane.extrusion, x.center.z),
@@ -58,7 +61,7 @@ fn ocs_of(e: &EntityKind) -> Option<Affine> {
         }
         EntityKind::Solid(x) | EntityKind::Trace(x) => (x.plane.extrusion, x.corners[0].z),
         EntityKind::Text(x) => (x.plane.extrusion, x.insertion.z),
-        EntityKind::MText(x) => (x.extrusion, x.insertion.z),
+        EntityKind::MText(x) => return mtext_plane(x),
         EntityKind::Attribute(x) | EntityKind::AttributeDefinition(x) => {
             (x.text.plane.extrusion, x.text.insertion.z)
         }
@@ -73,6 +76,52 @@ fn ocs_of(e: &EntityKind) -> Option<Affine> {
     Some(Affine::from_extrusion(n.x, n.y, n.z, elevation))
 }
 
+/// An MTEXT is not in OCS: its insertion point and text direction are world
+/// coordinates, and its extrusion is the normal of the plane the text lies in
+/// (ezdxf reads it so, tested against AutoCAD's own files). `None` for the
+/// plain plane, the drawing's own. Otherwise the map of the text's own
+/// (along, up) to the plan view, with the insertion point as its origin.
+fn mtext_plane(m: &crate::cad::MText) -> Option<Affine> {
+    let n = m.extrusion;
+    let len = (n.x * n.x + n.y * n.y + n.z * n.z).sqrt();
+    if !len.is_finite()
+        || len < 1e-12
+        || (n.z > 0.0 && n.x.abs() / len < 1e-12 && n.y.abs() / len < 1e-12)
+    {
+        return None;
+    }
+    let x_axis = match m.x_direction {
+        Some(d) if d.x != 0.0 || d.y != 0.0 || d.z != 0.0 => [d.x, d.y, d.z],
+        // A rotation is an angle in the plane's own frame: the arbitrary axis
+        // algorithm's X and Y, as ezdxf takes it.
+        _ => {
+            let unit = [n.x / len, n.y / len, n.z / len];
+            let cross = |a: [f64; 3], b: [f64; 3]| {
+                [
+                    a[1] * b[2] - a[2] * b[1],
+                    a[2] * b[0] - a[0] * b[2],
+                    a[0] * b[1] - a[1] * b[0],
+                ]
+            };
+            let ax = if unit[0].abs() < 1.0 / 64.0 && unit[1].abs() < 1.0 / 64.0 {
+                cross([0.0, 1.0, 0.0], unit)
+            } else {
+                cross([0.0, 0.0, 1.0], unit)
+            };
+            let al = ax.iter().map(|v| v * v).sum::<f64>().sqrt();
+            let ax = ax.map(|v| v / al);
+            let ay = cross(unit, ax);
+            let (s, c) = m.rotation.sin_cos();
+            [
+                c * ax[0] + s * ay[0],
+                c * ax[1] + s * ay[1],
+                c * ax[2] + s * ay[2],
+            ]
+        }
+    };
+    Affine::from_plane(x_axis, [n.x, n.y, n.z], [m.insertion.x, m.insertion.y])
+}
+
 /// How a hatch wants its islands treated (group 75).
 ///
 /// The drawing says so per hatch, and it changes what gets drawn: a rooflight
@@ -94,6 +143,230 @@ fn island_style(h: &crate::cad::Hatch) -> fill::IslandStyle {
 /// step AutoCAD's own editor appears to use and is the width of a typical list
 /// indent; it is a guess, and it is only ever reached by text that tabs without
 /// declaring where to.
+/// An arrowhead one unit long, its tip at the origin pointing along +x:
+/// triangles to fill and lines to stroke.
+struct ArrowShape {
+    filled: Vec<[f64; 2]>,
+    lines: Vec<Vec<[f64; 2]>>,
+}
+
+/// AutoCAD's built-in arrowheads by block name (`_OPEN`...); an empty or
+/// unknown name is the closed filled one.
+fn arrow_shape(name: &str) -> ArrowShape {
+    let circle = |r: f64, cx: f64| -> Vec<[f64; 2]> {
+        let mut c = curves::flatten_circle(cx, 0.0, r);
+        if let Some(&first) = c.first() {
+            c.push(first);
+        }
+        c
+    };
+    let disc = |r: f64| -> Vec<[f64; 2]> {
+        let ring = curves::flatten_circle(0.0, 0.0, r);
+        (0..ring.len())
+            .flat_map(|i| [[0.0, 0.0], ring[i], ring[(i + 1) % ring.len()]])
+            .collect()
+    };
+    let triangle = |w: f64, l: f64| vec![[0.0, 0.0], [-l, w], [-l, -w]];
+    let (filled, lines) = match name {
+        "_NONE" => (vec![], vec![]),
+        "_OPEN" => (
+            vec![],
+            vec![vec![[-1.0, 1.0 / 6.0], [0.0, 0.0], [-1.0, -1.0 / 6.0]]],
+        ),
+        "_OPEN30" => (
+            vec![],
+            vec![vec![[-1.0, 0.268], [0.0, 0.0], [-1.0, -0.268]]],
+        ),
+        "_OPEN90" => (vec![], vec![vec![[-0.5, 0.5], [0.0, 0.0], [-0.5, -0.5]]]),
+        "_CLOSEDBLANK" => (
+            vec![],
+            vec![{
+                let mut t = triangle(1.0 / 6.0, 1.0);
+                t.push([0.0, 0.0]);
+                t
+            }],
+        ),
+        "_CLOSED" => (
+            vec![],
+            vec![
+                {
+                    let mut t = triangle(1.0 / 6.0, 1.0);
+                    t.push([0.0, 0.0]);
+                    t
+                },
+                vec![[-1.0, 0.0], [0.0, 0.0]],
+            ],
+        ),
+        "_SMALL" => (triangle(1.0 / 12.0, 0.5), vec![]),
+        "_DOT" => (disc(0.25), vec![]),
+        "_DOTSMALL" => (disc(1.0 / 16.0), vec![]),
+        "_DOTBLANK" => (vec![], vec![circle(0.25, 0.0)]),
+        "_ORIGIN" => (vec![], vec![circle(0.5, 0.0)]),
+        "_ORIGIN2" => (vec![], vec![circle(0.5, 0.0), circle(0.25, 0.0)]),
+        "_OBLIQUE" | "_ARCHTICK" => (vec![], vec![vec![[-0.5, -0.5], [0.5, 0.5]]]),
+        "_BOXFILLED" => (
+            vec![
+                [-0.5, -0.5],
+                [0.5, -0.5],
+                [0.5, 0.5],
+                [-0.5, -0.5],
+                [0.5, 0.5],
+                [-0.5, 0.5],
+            ],
+            vec![],
+        ),
+        "_BOXBLANK" => (
+            vec![],
+            vec![vec![
+                [-0.5, -0.5],
+                [0.5, -0.5],
+                [0.5, 0.5],
+                [-0.5, 0.5],
+                [-0.5, -0.5],
+            ]],
+        ),
+        "_DATUMFILLED" => (vec![[0.0, 0.577], [0.0, -0.577], [-1.0, 0.0]], vec![]),
+        "_DATUMBLANK" => (
+            vec![],
+            vec![vec![[0.0, 0.577], [0.0, -0.577], [-1.0, 0.0], [0.0, 0.577]]],
+        ),
+        _ => (triangle(1.0 / 6.0, 1.0), vec![]),
+    };
+    ArrowShape { filled, lines }
+}
+
+/// A tolerance box's text with its GD&T font runs (`{\Fgdt;j}`, the font
+/// code in any case) as the symbols they stand for, the braces gone.
+fn gdt_codes(s: &str) -> String {
+    let mut out = String::with_capacity(s.len());
+    let mut rest = s;
+    while let Some(at) = rest.to_ascii_lowercase().find("\\fgdt;") {
+        let before = &rest[..at];
+        out.push_str(before.strip_suffix('{').unwrap_or(before));
+        let after = &rest[at + "\\fgdt;".len()..];
+        let end = after.find('}').unwrap_or(after.len());
+        out.push_str(&font::map_symbols(&after[..end], font::Symbols::Gdt));
+        rest = after.get(end + 1..).unwrap_or("");
+    }
+    out.push_str(rest);
+    out
+}
+
+/// A polygon mesh's lines: along M and along N, closed as its flags say
+/// (1 in M, 32 in N).
+fn polygon_mesh_edges(p: &crate::cad::Polyline) -> Vec<Vec<[f64; 2]>> {
+    let (m, n) = (p.m_count.max(0) as usize, p.n_count.max(0) as usize);
+    let pts: Vec<[f64; 2]> = p
+        .vertices
+        .iter()
+        .map(|v| [v.location.x, v.location.y])
+        .collect();
+    if m < 1 || n < 1 || pts.len() < m * n {
+        return Vec::new();
+    }
+    let at = |i: usize, j: usize| pts[i * n + j];
+    let mut out = Vec::new();
+    for i in 0..m {
+        let mut row: Vec<[f64; 2]> = (0..n).map(|j| at(i, j)).collect();
+        if p.flags & 32 != 0 && n > 2 {
+            row.push(at(i, 0));
+        }
+        out.push(row);
+    }
+    for j in 0..n {
+        let mut column: Vec<[f64; 2]> = (0..m).map(|i| at(i, j)).collect();
+        if p.flags & 1 != 0 && m > 2 {
+            column.push(at(0, j));
+        }
+        out.push(column);
+    }
+    out
+}
+
+/// A polyface mesh's visible edges: each face's sides, but those whose
+/// starting index is negative, each side once.
+fn polyface_edges(p: &crate::cad::Polyline) -> Vec<Vec<[f64; 2]>> {
+    let corners: Vec<[f64; 2]> = p
+        .vertices
+        .iter()
+        .filter(|v| v.flags & 64 != 0)
+        .map(|v| [v.location.x, v.location.y])
+        .collect();
+    let mut seen = HashSet::new();
+    let mut out = Vec::new();
+    for face in p
+        .vertices
+        .iter()
+        .filter(|v| v.flags & 64 == 0 && v.flags & 128 != 0)
+    {
+        let ids: Vec<i32> = face
+            .indices
+            .iter()
+            .copied()
+            .take_while(|&i| i != 0)
+            .collect();
+        for k in 0..ids.len() {
+            let (a, b) = (ids[k], ids[(k + 1) % ids.len()]);
+            if a < 0 || ids.len() < 2 {
+                continue;
+            }
+            let (a, b) = (a.unsigned_abs() as usize, b.unsigned_abs() as usize);
+            let (Some(&pa), Some(&pb)) = (corners.get(a - 1), corners.get(b - 1)) else {
+                continue;
+            };
+            if seen.insert((a.min(b), a.max(b))) {
+                out.push(vec![pa, pb]);
+            }
+        }
+    }
+    out
+}
+
+/// Opacity of the fill drawn for a pattern too dense to draw: about what
+/// sub-pixel lines, faded by their spacing, add up to on screen.
+const TRUNCATED_PATTERN_TONE: f64 = 0.5;
+
+/// The scale, turn and mirroring of a transform that keeps circles round
+/// (rotation, uniform scale, perhaps a mirror); None for any other.
+fn similarity(xf: &Affine) -> Option<(f64, f64, bool)> {
+    let scale = xf.a.hypot(xf.b);
+    let tolerance = 1e-9 * scale.max(1e-300);
+    let turn = xf.b.atan2(xf.a);
+    if (xf.a - xf.d).abs() <= tolerance && (xf.b + xf.c).abs() <= tolerance {
+        return (scale > 0.0).then_some((scale, turn, false));
+    }
+    if (xf.a + xf.d).abs() <= tolerance && (xf.b - xf.c).abs() <= tolerance {
+        return (scale > 0.0).then_some((scale, turn, true));
+    }
+    None
+}
+
+/// A stack's parts against the text height: AutoCAD's default (`TSTACKSIZE`).
+const STACK_SIZE: f64 = 0.7;
+
+/// A run's height: the entity's, times a `\H...x` factor, or a `\H` height.
+fn span_height(s: &text::Span, base: f64) -> f64 {
+    match s.height {
+        text::SpanHeight::Factor(f) if f > 0.0 => base * f,
+        text::SpanHeight::Absolute(h) if h > 0.0 => h,
+        _ => base,
+    }
+}
+
+/// How wide a stack is drawn: its wider part, or both parts and the slash
+/// of a diagonal one.
+fn stack_width(s: &text::Stack, metrics: &font::Metrics, height: f64, w: f64) -> f64 {
+    let part = height * STACK_SIZE;
+    let (upper, lower) = (
+        metrics.measure(&s.upper) * part * w,
+        metrics.measure(&s.lower) * part * w,
+    );
+    match s.kind {
+        text::StackKind::Diagonal => upper + 0.5 * part + lower,
+        _ => upper.max(lower),
+    }
+}
+
 fn next_tab_stop(cursor: f64, paragraph: &text::Paragraph, height: f64) -> f64 {
     if let Some(stop) = paragraph.tabs.iter().find(|s| **s > cursor + 1e-9) {
         return *stop;
@@ -130,41 +403,69 @@ struct LineTypeDef {
     labels: Vec<linetype::Label>,
 }
 
-/// The text a complex linetype embeds, ready to scale.
+/// The text and shapes a complex linetype embeds, ready to scale.
 ///
-/// Shape elements are skipped: they name a glyph in an SHX shape file, which
-/// cannot be shipped any more than an SHX font can (DESIGN.md section 5.3).
+/// A shape names a glyph in an SHX shape file, which cannot be shipped any
+/// more than an SHX font can (DESIGN.md section 5.3): only ltypeshp.shx's,
+/// which AutoCAD's own linetypes use, are drawn, redrawn here.
 fn embedded_labels(doc: &CadDrawing, lt: &crate::cad::Linetype) -> Vec<linetype::Label> {
     let mut out = Vec::new();
     for (run, e) in lt.elements.iter().enumerate() {
-        if !e.has_text() || e.text.is_empty() || !e.scale.is_finite() || e.scale <= 0.0 {
+        if !e.scale.is_finite() || e.scale <= 0.0 {
             continue;
         }
-        // The element's scale multiplies the style's fixed height, or is the
-        // height itself when the style leaves it free, which is the usual case.
         let style = doc
             .text_styles
             .iter()
             .find(|s| !e.style.is_null() && s.handle == e.style);
-        let style_height = style.map(|s| s.height).unwrap_or(0.0);
-        let height = if style_height > 0.0 {
-            style_height * e.scale
+        let (mark, height) = if e.has_text() && !e.text.is_empty() {
+            // The element's scale multiplies the style's fixed height, or is
+            // the height itself when the style leaves it free, which is the
+            // usual case.
+            let style_height = style.map(|s| s.height).unwrap_or(0.0);
+            let height = if style_height > 0.0 {
+                style_height * e.scale
+            } else {
+                e.scale
+            };
+            let face = style.map(font::resolve_style).unwrap_or(font::Face::Stroke);
+            (
+                linetype::Mark::Text {
+                    text: text::decode_special(&e.text),
+                    face,
+                },
+                height,
+            )
+        } else if e.has_shape() {
+            let Some(shape) = style
+                .filter(|s| is_ltypeshp(&s.font_file))
+                .and_then(|_| linetype::ltypeshp_shape(e.shape_number))
+            else {
+                continue;
+            };
+            (linetype::Mark::Shape(shape), e.scale)
         } else {
-            e.scale
+            continue;
         };
         out.push(linetype::Label {
             run,
-            text: text::decode_special(&e.text),
+            mark,
             height,
             offset: [e.offset.x, e.offset.y],
             rotation: e.rotation,
             absolute_rotation: e.absolute_rotation(),
-            face: style.map(font::resolve_style).unwrap_or(font::Face::Stroke),
         });
     }
     out
 }
 
+/// A style's font file is ltypeshp.shx, under any path or case.
+fn is_ltypeshp(file: &str) -> bool {
+    let name = file.rsplit(['/', '\\']).next().unwrap_or(file);
+    let stem = name.split('.').next().unwrap_or(name);
+    stem.eq_ignore_ascii_case("ltypeshp")
+}
+
 /// A RAY or XLINE, held back until the drawing's extents are known.
 struct InfiniteLine {
     base: [f64; 2],
@@ -219,6 +520,32 @@ pub struct LayoutInfo {
     pub tab_order: i16,
     /// The sheet, as `[min_x, min_y, max_x, max_y]` in paper units.
     pub limits: Option<[f64; 4]>,
+    /// Millimetres per paper unit: 25.4 for a sheet set up in inches.
+    pub mm_per_unit: f64,
+}
+
+/// What a tab is drawn on, beyond its geometry.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Sheet {
+    /// Millimetres per drawing unit, which a lineweight on a layout is a
+    /// width in: 25.4 for a sheet in inches. 0 for model space, where a
+    /// lineweight is a width on the screen.
+    pub mm_per_unit: f64,
+    /// `$LWDISPLAY`: the drawing is shown with its lineweights.
+    pub lineweights: bool,
+    /// A layout's paper, `[min_x, min_y, max_x, max_y]` in drawing units:
+    /// its limits. None for model space.
+    pub paper: Option<[f64; 4]>,
+}
+
+impl Default for Sheet {
+    fn default() -> Self {
+        Sheet {
+            mm_per_unit: 0.0,
+            lineweights: true,
+            paper: None,
+        }
+    }
 }
 
 pub struct LayerInfo {
@@ -259,6 +586,33 @@ pub struct Warnings {
     /// without proxy graphics, or with graphics that draw nothing: only the
     /// application that made them can show them.
     pub proxy_without_graphics: u32,
+    /// What `unknown_entities` counts, by DXF type, at most
+    /// [`MAX_NAMED`] types.
+    pub not_drawn: BTreeMap<String, u32>,
+    /// The files external references name (xrefs, images, underlays), at
+    /// most [`MAX_NAMED`].
+    pub external_files: BTreeSet<String>,
+}
+
+/// Most names a warning lists.
+pub const MAX_NAMED: usize = 16;
+
+impl Warnings {
+    fn not_drawn(&mut self, kind: &str) {
+        self.unknown_entities = self.unknown_entities.saturating_add(1);
+        if let Some(n) = self.not_drawn.get_mut(kind) {
+            *n = n.saturating_add(1);
+        } else if self.not_drawn.len() < MAX_NAMED {
+            self.not_drawn.insert(kind.to_string(), 1);
+        }
+    }
+
+    fn external(&mut self, file: &str) {
+        self.external_references = self.external_references.saturating_add(1);
+        if !file.is_empty() && self.external_files.len() < MAX_NAMED {
+            self.external_files.insert(file.to_string());
+        }
+    }
 }
 
 /// Default for [`Tessellator::budget`]: strokes and fill vertices one layout
@@ -318,13 +672,14 @@ pub struct Tessellator<'a> {
     /// because a drawing names a handful of styles and uses them thousands of
     /// times.
     style_faces: HashMap<String, font::Face>,
-    /// The same, by style handle: entities that reference a style by name are
-    /// the common case, but leaders and dimensions point at one by handle.
-    style_faces_by_handle: HashMap<u64, font::Face>,
+    /// Styles whose font draws symbols for letters (symbol.ttf, gdt.shx).
+    style_symbols: HashMap<String, font::Symbols>,
     /// Which ACI table indexed colours resolve through.
     palette: Palette,
     /// Block names currently being expanded, to break reference cycles.
     stack: Vec<String>,
+    /// What the tab drawn last is drawn on.
+    pub sheet: Sheet,
 }
 
 fn normalize(name: &str) -> String {
@@ -449,13 +804,17 @@ impl<'a> Tessellator<'a> {
                 .iter()
                 .map(|s| (normalize(&s.name), font::resolve_style(s)))
                 .collect(),
-            style_faces_by_handle: doc
+            style_symbols: doc
                 .text_styles
                 .iter()
-                .map(|s| (s.handle.0, font::resolve_style(s)))
+                .filter_map(|s| Some((normalize(&s.name), font::symbols_of(&s.font_file)?)))
                 .collect(),
             palette,
             stack: Vec::new(),
+            sheet: Sheet {
+                lineweights: doc.header.lwdisplay,
+                ..Sheet::default()
+            },
         }
     }
 
@@ -504,60 +863,74 @@ impl<'a> Tessellator<'a> {
         maxy += pad;
 
         for line in std::mem::take(&mut self.pending_infinite) {
-            let len = (line.dir[0] * line.dir[0] + line.dir[1] * line.dir[1]).sqrt();
-            if !len.is_finite() || len < 1e-12 {
-                continue;
-            }
-            let u = [line.dir[0] / len, line.dir[1] / len];
+            self.push_infinite(&line, [minx, miny], [maxx, maxy]);
+        }
+    }
 
-            // Slab clip: the parameter range where the line is inside the box.
-            let mut t0 = if line.both_ways {
-                f64::NEG_INFINITY
-            } else {
-                0.0
-            };
-            let mut t1 = f64::INFINITY;
-            let mut outside = false;
-            for (p, d, lo, hi) in [
-                (line.base[0], u[0], minx, maxx),
-                (line.base[1], u[1], miny, maxy),
-            ] {
-                if d.abs() < 1e-12 {
-                    if p < lo || p > hi {
-                        outside = true;
-                    }
-                    continue;
+    /// The part of a ray or xline inside a box, as a stroke.
+    fn push_infinite(&mut self, line: &InfiniteLine, min: [f64; 2], max: [f64; 2]) {
+        let len = (line.dir[0] * line.dir[0] + line.dir[1] * line.dir[1]).sqrt();
+        if !len.is_finite() || len < 1e-12 {
+            return;
+        }
+        let u = [line.dir[0] / len, line.dir[1] / len];
+
+        // Slab clip: the parameter range where the line is inside the box.
+        let mut t0 = if line.both_ways {
+            f64::NEG_INFINITY
+        } else {
+            0.0
+        };
+        let mut t1 = f64::INFINITY;
+        for (p, d, lo, hi) in [
+            (line.base[0], u[0], min[0], max[0]),
+            (line.base[1], u[1], min[1], max[1]),
+        ] {
+            if d.abs() < 1e-12 {
+                if p < lo || p > hi {
+                    return;
                 }
-                let (a, b) = ((lo - p) / d, (hi - p) / d);
-                let (a, b) = if a <= b { (a, b) } else { (b, a) };
-                t0 = t0.max(a);
-                t1 = t1.min(b);
-            }
-            if outside || !(t1 > t0) || !t0.is_finite() || !t1.is_finite() {
                 continue;
             }
-
-            self.scene.push_stroke(
-                line.base[0] + u[0] * t0,
-                line.base[1] + u[1] * t0,
-                line.base[0] + u[0] * t1,
-                line.base[1] + u[1] * t1,
-                line.rgba,
-                line.attr,
-            );
+            let (a, b) = ((lo - p) / d, (hi - p) / d);
+            let (a, b) = if a <= b { (a, b) } else { (b, a) };
+            t0 = t0.max(a);
+            t1 = t1.min(b);
+        }
+        if !(t1 > t0) || !t0.is_finite() || !t1.is_finite() {
+            return;
         }
+
+        self.scene.push_stroke(
+            line.base[0] + u[0] * t0,
+            line.base[1] + u[1] * t0,
+            line.base[0] + u[0] * t1,
+            line.base[1] + u[1] * t1,
+            line.rgba,
+            line.attr,
+        );
     }
 
     /// Leader lines plus the label they point at.
     fn multi_leader(&mut self, m: &crate::cad::MultiLeader, ctx: &Ctx, rgba: u32, attr: u32) {
         let c = &m.context;
 
-        // Every leader root contributes one or more polylines.
+        // Every leader root contributes one or more polylines, each with
+        // its arrowhead at its first vertex.
+        let scale = if c.scale > 0.0 { c.scale } else { 1.0 };
+        let size = m.arrowhead_size * scale;
         for root in &c.leaders {
             for line in &root.lines {
-                let pts: Vec<[f64; 2]> = line.vertices.iter().map(|p| [p.x, p.y]).collect();
+                // From the arrow's tip through the line's vertices to where
+                // the root lands.
+                let mut pts: Vec<[f64; 2]> = line.vertices.iter().map(|p| [p.x, p.y]).collect();
+                let landing = [root.connection_point.x, root.connection_point.y];
+                if pts.last() != Some(&landing) && (root.has_connection_point || pts.len() < 2) {
+                    pts.push(landing);
+                }
                 if pts.len() >= 2 {
                     self.push_transformed(&pts, false, &ctx.xf, rgba, attr, None);
+                    self.arrowhead(m.arrowhead, pts[0], pts[1], size, ctx, rgba, attr);
                 }
             }
             // The landing runs from the last leader point to the content.
@@ -582,47 +955,32 @@ impl<'a> Tessellator<'a> {
             } else {
                 2.5
             };
-            let spacing = height
-                * text::MTEXT_LINE_SPACING
-                * if c.line_spacing_factor > 0.0 {
-                    c.line_spacing_factor
-                } else {
-                    1.0
-                };
-            let lines = text::mtext_lines(&c.text);
-            let face = self.style_face_by_handle(c.text_style);
-            // Attachment codes match MTEXT's.
-            let (h_align, dy0) =
-                text::mtext_layout(c.text_attachment as u8, lines.len(), height, spacing);
-            let (sin_r, cos_r) = rotation.sin_cos();
             let text_rgba = match c.text_color {
                 Color::ByLayer | Color::ByBlock => rgba,
                 ref col => colour_rgb(col, self.palette)
-                    .map(|(r, g, b)| pack_rgba(r, g, b, 255))
+                    .map(|(r, g, b)| pack_rgba(r, g, b, (rgba >> 24) as u8))
                     .unwrap_or(rgba),
             };
-
-            for (i, line) in lines.iter().enumerate() {
-                if line.is_empty() {
-                    continue;
-                }
-                let dy = dy0 - i as f64 * spacing;
-                self.push_text_run(
-                    line.clone(),
-                    c.text_location.x - dy * sin_r,
-                    c.text_location.y + dy * cos_r,
-                    height,
-                    rotation,
-                    1.0,
-                    0.0,
-                    h_align,
-                    text::VAlign::Baseline,
-                    ctx,
-                    text_rgba,
-                    attr,
-                    face,
-                );
-            }
+            // The content is MTEXT, drawn as one (attachment codes match).
+            let style = self
+                .doc
+                .text_styles
+                .iter()
+                .find(|s| s.handle == c.text_style && !c.text_style.is_null())
+                .map(|s| s.name.clone())
+                .unwrap_or_default();
+            let content = crate::cad::MText {
+                insertion: c.text_location,
+                height,
+                reference_width: c.text_width,
+                attachment: c.text_attachment,
+                style,
+                rotation,
+                line_spacing_factor: c.line_spacing_factor,
+                text: c.text.clone(),
+                ..crate::cad::MText::default()
+            };
+            self.mtext(&content, ctx, text_rgba, attr);
         }
     }
 
@@ -717,13 +1075,14 @@ impl<'a> Tessellator<'a> {
             .unwrap_or(font::Face::Stroke)
     }
 
-    /// The same, for an entity that points at its style by handle.
-    fn style_face_by_handle(&self, handle: Handle) -> font::Face {
-        self.style_faces_by_handle
-            .get(&handle.0)
-            .copied()
-            .filter(|_| !handle.is_null())
-            .unwrap_or(font::Face::Stroke)
+    /// A TEXT's or ATTRIB's string as its style shows it: the `%%` codes
+    /// decoded, then a symbol font's letters as the symbols they draw.
+    fn style_text(&self, style: &str, raw: &str) -> String {
+        let s = text::decode_special(raw);
+        match self.style_symbols.get(&normalize(style)) {
+            Some(&set) => font::map_symbols(&s, set),
+            None => s,
+        }
     }
 
     /// MTEXT content as the lines it is drawn on: the explicit `\P` breaks,
@@ -755,138 +1114,347 @@ impl<'a> Tessellator<'a> {
             .collect()
     }
 
-    /// Draw one laid-out MTEXT line, honouring per-run colour, height and rules.
+    /// A style's width factor and oblique angle, which MTEXT takes unless
+    /// `\W` and `\Q` say otherwise.
+    fn style_shape(&self, style: &str) -> (f64, f64) {
+        self.doc
+            .text_styles
+            .iter()
+            .find(|s| s.name.eq_ignore_ascii_case(style))
+            .map(|s| {
+                let w = if s.width_factor > 0.0 {
+                    s.width_factor
+                } else {
+                    1.0
+                };
+                (w, s.oblique)
+            })
+            .unwrap_or((1.0, 0.0))
+    }
+
+    /// An MTEXT, or a multiline attribute: its lines wrapped to its box and
+    /// stacked from the attachment point, each aligned as its paragraph
+    /// says, over its background mask when it has one.
+    fn mtext(&mut self, m: &crate::cad::MText, ctx: &Ctx, rgba: u32, attr: u32) {
+        let height = if m.height > 0.0 { m.height } else { 1.0 };
+        let face = self.style_face(&m.style);
+        let shape = self.style_shape(&m.style);
+        let mut lines = self.wrap_mtext(&m.text, m.reference_width / shape.0, height, face);
+        if let Some(&set) = self.style_symbols.get(&normalize(&m.style)) {
+            for s in lines
+                .iter_mut()
+                .flat_map(|l| l.spans.iter_mut())
+                .filter(|s| s.face.is_none())
+            {
+                s.text = font::map_symbols(&s.text, set);
+            }
+        }
+        let spacing = height
+            * text::MTEXT_LINE_SPACING
+            * if m.line_spacing_factor > 0.0 {
+                m.line_spacing_factor
+            } else {
+                1.0
+            };
+
+        // DWG stores the text direction as a vector when it has one.
+        let in_plane = mtext_plane(m).is_some();
+        let rotation = match m.x_direction {
+            _ if in_plane => 0.0,
+            Some(d) if d.x != 0.0 || d.y != 0.0 => d.y.atan2(d.x),
+            _ => m.rotation,
+        };
+        // Out of the drawing's plane the text is laid out in its own frame
+        // from the origin, and the entity's map places it.
+        let origin = if in_plane {
+            [0.0, 0.0]
+        } else {
+            [m.insertion.x, m.insertion.y]
+        };
+        let (h_align, dy0) = text::mtext_layout(m.attachment as u8, lines.len(), height, spacing);
+        let (sin_r, cos_r) = rotation.sin_cos();
+        let at = |along: f64, up: f64| {
+            [
+                origin[0] + along * cos_r - up * sin_r,
+                origin[1] + along * sin_r + up * cos_r,
+            ]
+        };
+
+        // The box lines align in and the mask covers: the entity's width,
+        // else its widest line.
+        let realigned = lines
+            .iter()
+            .any(|l| l.paragraph.align.is_some_and(|a| a != h_align));
+        let masked = m.background_fill & 0x13 != 0;
+        let box_width = if m.reference_width > 0.0 {
+            m.reference_width
+        } else if realigned || masked {
+            lines
+                .iter()
+                .map(|l| self.mtext_line_layout(l, height, face, shape.0).1)
+                .fold(0.0, f64::max)
+        } else {
+            0.0
+        };
+        let left = match h_align {
+            text::HAlign::Center | text::HAlign::Middle => -box_width / 2.0,
+            text::HAlign::Right => -box_width,
+            _ => 0.0,
+        };
+
+        if masked {
+            // A border of (scale - 1) heights around the lines, from the
+            // first line's capitals to the last line's baseline.
+            let scale = if m.background_scale > 0.0 {
+                m.background_scale
+            } else {
+                1.5
+            };
+            let border = height * (scale - 1.0).max(0.0);
+            let top = dy0 + height + border;
+            let bottom = dy0 - (lines.len().max(1) - 1) as f64 * spacing - border;
+            let corners: Vec<[f64; 2]> = [
+                (left - border, bottom),
+                (left + box_width + border, bottom),
+                (left + box_width + border, top),
+                (left - border, top),
+            ]
+            .iter()
+            .map(|&(a, b)| {
+                let p = at(a, b);
+                ctx.xf.apply(p[0], p[1])
+            })
+            .collect();
+            self.mtext_background(m, &corners, rgba, attr);
+            // The text over its own mask: one step later in draw order.
+            self.scene.order = self.scene.order.saturating_add(1);
+            if m.background_fill & 0x10 != 0 {
+                self.scene.push_polyline(&corners, true, rgba, attr);
+            }
+        }
+
+        for (i, line) in lines.iter().enumerate() {
+            if line.spans.is_empty() {
+                continue;
+            }
+            // Lines stack along the text's own down direction.
+            let dy = dy0 - i as f64 * spacing;
+            let (align, along) = match line.paragraph.align {
+                Some(a) if a != h_align && box_width > 0.0 => (
+                    a,
+                    left + match a {
+                        text::HAlign::Center => box_width / 2.0,
+                        text::HAlign::Right => box_width,
+                        _ => 0.0,
+                    },
+                ),
+                _ => (h_align, 0.0),
+            };
+            let p = at(along, dy);
+            self.mtext_line(
+                line, height, p, rotation, align, shape, ctx, rgba, attr, face,
+            );
+        }
+    }
+
+    /// An MTEXT's background: its colour (group 90 bit 1) or the drawing
+    /// area's (bit 2), as a WIPEOUT paints it.
+    fn mtext_background(
+        &mut self,
+        m: &crate::cad::MText,
+        corners: &[[f64; 2]],
+        rgba: u32,
+        attr: u32,
+    ) {
+        let base = attr & 0x00FF_FFFF;
+        let colour = (m.background_fill & 2 == 0)
+            .then(|| colour_rgb(&m.background_color, self.palette))
+            .flatten();
+        let (fill, fill_attr) = match colour {
+            Some((r, g, b)) => (pack_rgba(r, g, b, 255), base),
+            None => (rgba, base | u32::from(FILL_FLAG_BACKGROUND) << 24),
+        };
+        for t in fill::fill_even_odd(&[corners.to_vec()]).chunks(3) {
+            if t.len() == 3 {
+                self.scene.push_triangle(t[0], t[1], t[2], fill, fill_attr);
+            }
+        }
+    }
+
+    /// Where each run of an MTEXT line goes, from the line's left edge: the
+    /// runs as (span, text, start, width), and the line's width. A tab stop
+    /// is measured from that edge, so alignment comes after.
+    fn mtext_line_layout(
+        &self,
+        line: &text::Line,
+        base_height: f64,
+        face: font::Face,
+        base_width: f64,
+    ) -> (Vec<(usize, String, f64, f64)>, f64) {
+        let mut placed = Vec::new();
+        // The paragraph's indents; a first line can be indented differently
+        // from the rest, which is what makes a numbered list hang.
+        let mut cursor = line.paragraph.indent
+            + if line.first {
+                line.paragraph.first_indent
+            } else {
+                0.0
+            };
+        for (i, span) in line.spans.iter().enumerate() {
+            let height = span_height(span, base_height);
+            let w = span.width.unwrap_or(base_width);
+            // Each run is measured in its own face, since a `\f` in the
+            // middle of a line changes how wide the rest of it sits.
+            let metrics = font::Metrics::for_face(span.face.unwrap_or(face));
+            if let Some(stack) = &span.stack {
+                let width = stack_width(stack, &metrics, height, w);
+                placed.push((i, String::new(), cursor, width));
+                cursor += width;
+                continue;
+            }
+            for (n, piece) in span.text.split('\t').enumerate() {
+                if n > 0 {
+                    cursor = next_tab_stop(cursor, &line.paragraph, base_height);
+                }
+                if piece.is_empty() {
+                    continue;
+                }
+                let width = metrics.measure(piece) * height * w * span.tracking.unwrap_or(1.0);
+                placed.push((i, piece.to_string(), cursor, width));
+                cursor += width;
+            }
+        }
+        (placed, cursor)
+    }
+
+    /// Draw one laid-out MTEXT line, honouring per-run colour, height, width
+    /// factor, slant, tracking, stacks and rules.
     ///
-    /// A line of one run is handed to the renderer to align, which measures the
-    /// string with the real font. A line of several has to be placed here,
-    /// because each run starts where the one before it ended.
+    /// A line of plain text is handed to the renderer to align, which
+    /// measures the string with the real font. Any other has to be placed
+    /// here, because each run starts where the one before it ended.
     #[allow(clippy::too_many_arguments)]
-    fn push_mtext_line(
+    fn mtext_line(
         &mut self,
         line: &text::Line,
         base_height: f64,
-        x: f64,
-        y: f64,
+        [x, y]: [f64; 2],
         rotation: f64,
         h_align: text::HAlign,
+        (base_width, base_oblique): (f64, f64),
         ctx: &Ctx,
         rgba: u32,
         attr: u32,
         face: font::Face,
     ) {
         let spans = &line.spans;
-        let height_of = |s: &text::Span| match s.height {
-            text::SpanHeight::Factor(f) if f > 0.0 => base_height * f,
-            text::SpanHeight::Absolute(h) if h > 0.0 => h,
-            _ => base_height,
+        let plain = |s: &text::Span| {
+            s.color.is_none()
+                && !s.underline
+                && !s.overline
+                && !s.strike
+                && s.width.is_none()
+                && s.oblique.is_none()
+                && s.tracking.is_none()
+                && s.stack.is_none()
+                && !s.text.contains('\t')
         };
-        // A `\f` run draws in the face it names; the rest take the entity's.
-        let face_of = |s: &text::Span| s.face.unwrap_or(face);
-
-        // Where the line starts, from its paragraph's indents. The first line
-        // of a paragraph can be indented differently from the rest, which is
-        // what makes a numbered list hang.
-        let indent = line.paragraph.indent
-            + if line.first {
-                line.paragraph.first_indent
-            } else {
-                0.0
-            };
-        let tabbed = spans.iter().any(|s| s.text.contains('\t'));
-
-        let styled = tabbed
-            || indent != 0.0
-            || spans.iter().any(|s| {
-                s.color.is_some()
-                    || s.face.is_some_and(|f| f != face)
-                    || s.underline
-                    || s.overline
-                    || s.strike
-                    || height_of(s) != base_height
-            });
+        let indented =
+            line.paragraph.indent != 0.0 || line.first && line.paragraph.first_indent != 0.0;
+        let first = &spans[0];
+        let one_style = spans.iter().all(|s| {
+            s.face.unwrap_or(face) == first.face.unwrap_or(face)
+                && span_height(s, base_height) == span_height(first, base_height)
+        });
 
         // Nothing to place: hand the whole line over as one run.
-        if !styled
-            || spans.len() == 1
-                && !spans[0].underline
-                && !spans[0].overline
-                && !spans[0].strike
-                && spans[0].color.is_none()
-        {
+        if !indented && one_style && spans.iter().all(plain) {
             let text: String = spans.iter().map(|s| s.text.as_str()).collect();
-            let height = spans.first().map(height_of).unwrap_or(base_height);
-            let face = spans.first().map(face_of).unwrap_or(face);
             self.push_text_run(
                 text,
                 x,
                 y,
-                height,
-                rotation,
-                1.0,
-                0.0,
+                text::frame(
+                    span_height(first, base_height),
+                    rotation,
+                    base_width,
+                    base_oblique,
+                ),
                 h_align,
                 text::VAlign::Baseline,
                 ctx,
                 rgba,
                 attr,
-                face,
+                first.face.unwrap_or(face),
             );
             return;
         }
 
-        // Lay the line out from its own left edge first. A tab stop is measured
-        // from there, not from the anchor, so alignment can only be applied
-        // once the whole line has been placed.
-        let mut placed: Vec<(usize, String, f64, f64)> = Vec::new();
-        let mut cursor = indent;
-        for (i, span) in spans.iter().enumerate() {
-            let height = height_of(span);
-            for (n, piece) in span.text.split('\t').enumerate() {
-                if n > 0 {
-                    cursor = next_tab_stop(cursor, &line.paragraph, base_height);
-                }
-                if piece.is_empty() {
-                    continue;
-                }
-                // Each run is measured in its own face, since a `\f` in the
-                // middle of a line changes how wide the rest of it sits.
-                let width = font::Metrics::for_face(face_of(span)).measure(piece) * height;
-                placed.push((i, piece.to_string(), cursor, width));
-                cursor += width;
-            }
-        }
-
+        let (placed, total) = self.mtext_line_layout(line, base_height, face, base_width);
         let offset = match h_align {
-            text::HAlign::Center | text::HAlign::Middle => -cursor / 2.0,
-            text::HAlign::Right => -cursor,
+            text::HAlign::Center | text::HAlign::Middle => -total / 2.0,
+            text::HAlign::Right => -total,
             _ => 0.0,
         };
 
         let (sin_r, cos_r) = rotation.sin_cos();
+        let at = |along: f64, up: f64| {
+            [
+                x + along * cos_r - up * sin_r,
+                y + along * sin_r + up * cos_r,
+            ]
+        };
         for (i, piece, start, width) in placed {
             let span = &spans[i];
             let along = start + offset;
-            let width = &width;
-            let height = height_of(span);
+            let height = span_height(span, base_height);
             let (rgba, attr) = match span.color {
                 Some(c) => self.span_colour(c, rgba, attr),
                 None => (rgba, attr),
             };
-            self.push_text_run(
-                piece,
-                x + along * cos_r,
-                y + along * sin_r,
-                height,
-                rotation,
-                1.0,
-                0.0,
-                text::HAlign::Left,
-                text::VAlign::Baseline,
-                ctx,
-                rgba,
-                attr,
-                face_of(span),
-            );
+            let face = span.face.unwrap_or(face);
+            let w = span.width.unwrap_or(base_width);
+            let frame = text::frame(height, rotation, w, span.oblique.unwrap_or(base_oblique));
+            if let Some(stack) = &span.stack {
+                let shape = (w, span.oblique.unwrap_or(base_oblique));
+                self.mtext_stack(
+                    stack,
+                    at(along, 0.0),
+                    rotation,
+                    height,
+                    shape,
+                    width,
+                    ctx,
+                    rgba,
+                    attr,
+                    face,
+                );
+            } else if let Some(t) = span.tracking.filter(|t| *t != 1.0) {
+                // Each character at its advance times the tracking.
+                let metrics = font::Metrics::for_face(face);
+                let mut pen = along;
+                for c in piece.chars() {
+                    let p = at(pen, 0.0);
+                    let (l, b) = (text::HAlign::Left, text::VAlign::Baseline);
+                    self.push_text_run(
+                        c.to_string(),
+                        p[0],
+                        p[1],
+                        frame,
+                        l,
+                        b,
+                        ctx,
+                        rgba,
+                        attr,
+                        face,
+                    );
+                    pen += metrics.advance(c) * height * w * t;
+                }
+            } else {
+                let p = at(along, 0.0);
+                let (l, b) = (text::HAlign::Left, text::VAlign::Baseline);
+                self.push_text_run(piece, p[0], p[1], frame, l, b, ctx, rgba, attr, face);
+            }
 
             // The three rules, as strokes along the run at the usual offsets.
             for (on, dy) in [
@@ -897,19 +1465,76 @@ impl<'a> Tessellator<'a> {
                 if !on {
                     continue;
                 }
-                let a = ctx.xf.apply(
-                    x + along * cos_r - dy * sin_r,
-                    y + along * sin_r + dy * cos_r,
-                );
-                let b = ctx.xf.apply(
-                    x + (along + width) * cos_r - dy * sin_r,
-                    y + (along + width) * sin_r + dy * cos_r,
-                );
+                let (a, b) = (at(along, dy), at(along + width, dy));
+                let (a, b) = (ctx.xf.apply(a[0], a[1]), ctx.xf.apply(b[0], b[1]));
                 self.scene.push_stroke(a[0], a[1], b[0], b[1], rgba, attr);
             }
         }
     }
 
+    /// A stack on the baseline at `p`, `width` wide (`stack_width`): its
+    /// parts at [`STACK_SIZE`] of the height, one above the other about the
+    /// capitals' middle (across a bar for a fraction, left-aligned for a
+    /// tolerance), or side by side across a slash.
+    #[allow(clippy::too_many_arguments)]
+    fn mtext_stack(
+        &mut self,
+        s: &text::Stack,
+        p: [f64; 2],
+        rotation: f64,
+        height: f64,
+        (w, oblique): (f64, f64),
+        width: f64,
+        ctx: &Ctx,
+        rgba: u32,
+        attr: u32,
+        face: font::Face,
+    ) {
+        let part = height * STACK_SIZE;
+        let metrics = font::Metrics::for_face(face);
+        let wide = |t: &str| metrics.measure(t) * part * w;
+        let (sin_r, cos_r) = rotation.sin_cos();
+        let at = |along: f64, up: f64| {
+            [
+                p[0] + along * cos_r - up * sin_r,
+                p[1] + along * sin_r + up * cos_r,
+            ]
+        };
+        let frame = text::frame(part, rotation, w, oblique);
+        // Where each part's baseline starts, and the bar or slash.
+        let (upper, lower, line) = match s.kind {
+            text::StackKind::Diagonal => {
+                let slant = 0.5 * part;
+                let wu = wide(&s.upper);
+                (
+                    (0.0, height - part),
+                    (wu + slant, 0.0),
+                    Some(((wu, 0.0), (wu + slant, height))),
+                )
+            }
+            kind => {
+                let (bar, gap) = (0.5 * height, 0.2 * part);
+                let centre = kind == text::StackKind::Fraction;
+                let x = |t: &str| if centre { (width - wide(t)) / 2.0 } else { 0.0 };
+                (
+                    (x(&s.upper), bar + gap),
+                    (x(&s.lower), bar - gap - part),
+                    centre.then_some(((0.0, bar), (width, bar))),
+                )
+            }
+        };
+        for (t, (along, up)) in [(&s.upper, upper), (&s.lower, lower)] {
+            let q = at(along, up);
+            let (l, b) = (text::HAlign::Left, text::VAlign::Baseline);
+            self.push_text_run(t.clone(), q[0], q[1], frame, l, b, ctx, rgba, attr, face);
+        }
+        if let Some(((a0, a1), (b0, b1))) = line {
+            let (a, b) = (at(a0, a1), at(b0, b1));
+            let (a, b) = (ctx.xf.apply(a[0], a[1]), ctx.xf.apply(b[0], b[1]));
+            self.scene.push_stroke(a[0], a[1], b[0], b[1], rgba, attr);
+        }
+    }
+
     /// Resolve an MTEXT colour escape against the entity's own colour.
     fn span_colour(&self, c: text::SpanColor, rgba: u32, attr: u32) -> (u32, u32) {
         let alpha = (rgba >> 24) as u8;
@@ -970,8 +1595,17 @@ impl<'a> Tessellator<'a> {
                     && limits[2] > limits[0]
                     && limits[3] > limits[1])
                     .then_some(limits),
+                // Group 72: 0 inches, 1 millimetres, 2 pixels (no physical
+                // size, taken as millimetres).
+                mm_per_unit: if l.plot.paper_units == 0 { 25.4 } else { 1.0 },
             });
         }
+        // Without LAYOUT objects, the sheet is in the drawing's own system.
+        let mm_per_unit = if self.doc.header.measurement == 0 {
+            25.4
+        } else {
+            1.0
+        };
 
         // Some drawings carry no LAYOUT objects at all (R13 and R14 DWG
         // saved by AutoCAD before layouts): model space still draws, and so
@@ -984,6 +1618,7 @@ impl<'a> Tessellator<'a> {
                 is_model: true,
                 tab_order: 0,
                 limits: None,
+                mm_per_unit,
             });
         }
         let paper = self
@@ -1002,6 +1637,7 @@ impl<'a> Tessellator<'a> {
                     && limits[2] > limits[0]
                     && limits[3] > limits[1])
                     .then_some(limits),
+                mm_per_unit,
             });
         }
         out.sort_by_key(|l| (!l.is_model, l.tab_order));
@@ -1018,9 +1654,15 @@ impl<'a> Tessellator<'a> {
             return false;
         };
         let block = layout.block.clone();
+        if !layout.is_model {
+            self.sheet.mm_per_unit = layout.mm_per_unit;
+        }
+        // The paper is known first: what is drawn on it is sized by it.
+        let limits = layout.limits.filter(|_| !layout.is_model);
+        self.sheet.paper = limits;
         self.run_block(&block, !layout.is_model);
         // The sheet, not the contents: see `Scene::set_extents`.
-        if let Some(l) = layout.limits.filter(|_| !layout.is_model) {
+        if let Some(l) = limits {
             self.scene.set_extents([l[0], l[1]], [l[2], l[3]]);
         }
         true
@@ -1054,14 +1696,12 @@ impl<'a> Tessellator<'a> {
 
         let roots = self.in_draw_order(entities);
         for e in roots {
-            if paper {
-                if let EntityKind::Viewport(v) = &e.kind {
-                    self.scene.order = self.scene.order.saturating_add(1);
-                    if Some(e.handle.0) != sheet_view {
-                        self.viewport(v);
-                    }
-                    continue;
+            if paper && let EntityKind::Viewport(v) = &e.kind {
+                self.scene.order = self.scene.order.saturating_add(1);
+                if Some(e.handle.0) != sheet_view {
+                    self.viewport(v);
                 }
+                continue;
             }
             self.entity(e, &ctx);
         }
@@ -1071,6 +1711,7 @@ impl<'a> Tessellator<'a> {
         if paper {
             self.scene.recompute_extents();
         }
+        self.scene.focus_on_core();
     }
 
     fn root_ctx(&self) -> Ctx {
@@ -1222,11 +1863,10 @@ impl<'a> Tessellator<'a> {
                 expand_bulges(&pts, true)
             }
             EntityKind::Circle(c) => curves::flatten_circle(c.center.x, c.center.y, c.radius),
-            EntityKind::Ellipse(el) => curves::flatten_ellipse(
-                el.center.x,
-                el.center.y,
-                el.major_axis.x,
-                el.major_axis.y,
+            EntityKind::Ellipse(el) => curves::flatten_ellipse_in_space(
+                [el.center.x, el.center.y, el.center.z],
+                [el.major_axis.x, el.major_axis.y, el.major_axis.z],
+                [el.extrusion.x, el.extrusion.y, el.extrusion.z],
                 el.ratio,
                 el.start_param,
                 el.end_param,
@@ -1292,19 +1932,21 @@ impl<'a> Tessellator<'a> {
 
         // Colour 7 flips with the background; every other colour, including a
         // true colour that happens to be white, is drawn as stored.
-        let (rgba, contrast) = match common.color {
-            Color::ByLayer => (layer.rgba, layer.contrast),
-            Color::ByBlock => (ctx.rgba, ctx.contrast),
+        let (rgb, contrast) = match common.color {
+            Color::ByLayer => (layer.rgba & 0x00ff_ffff, layer.contrast),
+            Color::ByBlock => (ctx.rgba & 0x00ff_ffff, ctx.contrast),
             ref c => {
                 let (r, g, b) = colour_rgb(c, self.palette)?;
-                let alpha = match common.transparency {
-                    Transparency::Alpha(a) => a,
-                    Transparency::ByBlock => (ctx.rgba >> 24) as u8,
-                    Transparency::ByLayer => (layer.rgba >> 24) as u8,
-                };
-                (pack_rgba(r, g, b, alpha), is_contrast_color(c))
+                (pack_rgba(r, g, b, 0), is_contrast_color(c))
             }
         };
+        // Transparency resolves on its own, whatever the colour does.
+        let alpha = match common.transparency {
+            Transparency::Alpha(a) => a,
+            Transparency::ByBlock => (ctx.rgba >> 24) as u8,
+            Transparency::ByLayer => (layer.rgba >> 24) as u8,
+        };
+        let rgba = rgb | u32::from(alpha) << 24;
         let flags = if contrast { FLAG_CONTRAST } else { 0 };
 
         let lw = match common.lineweight {
@@ -1317,6 +1959,11 @@ impl<'a> Tessellator<'a> {
     }
 
     fn entity(&mut self, e: &Entity, outer: &Ctx) {
+        self.entity_geometry(e, outer);
+        self.scene.edge_fills();
+    }
+
+    fn entity_geometry(&mut self, e: &Entity, outer: &Ctx) {
         // Advance the draw order for every entity, drawn or not, so the
         // sequence matches the document's own.
         self.scene.order = self.scene.order.saturating_add(1);
@@ -1361,27 +2008,29 @@ impl<'a> Tessellator<'a> {
             }
 
             EntityKind::Circle(c) => {
-                let pts = curves::flatten_circle(c.center.x, c.center.y, c.radius);
-                self.push_transformed(&pts, false, xf, rgba, attr, pattern);
+                let tau = std::f64::consts::TAU;
+                self.push_curve(
+                    c.center.x, c.center.y, c.radius, 0.0, tau, xf, rgba, attr, pattern,
+                );
             }
 
             EntityKind::Arc(a) => {
-                let pts = curves::flatten_arc(
-                    a.center.x,
-                    a.center.y,
-                    a.radius,
-                    a.start_angle,
-                    a.end_angle,
-                );
-                self.push_transformed(&pts, false, xf, rgba, attr, pattern);
+                // DWG arcs always run counter-clockwise from start to end.
+                let sweep = (a.end_angle - a.start_angle).rem_euclid(std::f64::consts::TAU);
+                let sweep = if sweep > 0.0 {
+                    sweep
+                } else {
+                    std::f64::consts::TAU
+                };
+                let (c, r) = (a.center, a.radius);
+                self.push_curve(c.x, c.y, r, a.start_angle, sweep, xf, rgba, attr, pattern);
             }
 
             EntityKind::Ellipse(el) => {
-                let pts = curves::flatten_ellipse(
-                    el.center.x,
-                    el.center.y,
-                    el.major_axis.x,
-                    el.major_axis.y,
+                let pts = curves::flatten_ellipse_in_space(
+                    [el.center.x, el.center.y, el.center.z],
+                    [el.major_axis.x, el.major_axis.y, el.major_axis.z],
+                    [el.extrusion.x, el.extrusion.y, el.extrusion.z],
                     el.ratio,
                     el.start_param,
                     el.end_param,
@@ -1390,25 +2039,49 @@ impl<'a> Tessellator<'a> {
             }
 
             EntityKind::LwPolyline(p) => {
-                let pts: Vec<([f64; 2], f64)> = p
+                // Group 43, the constant width, stands for every vertex's.
+                let wide: Vec<WideVertex> = p
                     .vertices
                     .iter()
-                    .map(|v| ([v.point.x, v.point.y], v.bulge))
+                    .map(|v| {
+                        let (w0, w1) = if p.constant_width > 0.0 {
+                            (p.constant_width, p.constant_width)
+                        } else {
+                            (v.start_width, v.end_width)
+                        };
+                        WideVertex {
+                            p: [v.point.x, v.point.y],
+                            bulge: v.bulge,
+                            start_width: w0,
+                            end_width: w1,
+                        }
+                    })
                     .collect();
-                let closed = p.is_closed();
-                let flat = expand_bulges(&pts, closed);
-                self.push_transformed(&flat, closed, xf, rgba, attr, pattern);
+                let pattern = pattern.map(|q| (q, p.flags & 128 != 0));
+                self.polyline(&wide, p.is_closed(), xf, rgba, attr, pattern);
             }
 
             EntityKind::Polyline(p) if p.kind() == PolylineKind::Polyline2D => {
-                let pts: Vec<([f64; 2], f64)> = p
+                // A vertex without widths of its own takes the polyline's.
+                let wide: Vec<WideVertex> = p
                     .vertices
                     .iter()
-                    .map(|v| ([v.location.x, v.location.y], v.bulge))
+                    .map(|v| {
+                        let (w0, w1) = if v.start_width == 0.0 && v.end_width == 0.0 {
+                            (p.default_start_width, p.default_end_width)
+                        } else {
+                            (v.start_width, v.end_width)
+                        };
+                        WideVertex {
+                            p: [v.location.x, v.location.y],
+                            bulge: v.bulge,
+                            start_width: w0,
+                            end_width: w1,
+                        }
+                    })
                     .collect();
-                let closed = p.is_closed();
-                let flat = expand_bulges(&pts, closed);
-                self.push_transformed(&flat, closed, xf, rgba, attr, pattern);
+                let pattern = pattern.map(|q| (q, p.flags & 128 != 0));
+                self.polyline(&wide, p.is_closed(), xf, rgba, attr, pattern);
             }
 
             EntityKind::Polyline(p) if p.kind() == PolylineKind::Polyline3D => {
@@ -1425,11 +2098,7 @@ impl<'a> Tessellator<'a> {
                 self.push_transformed(&pts, false, xf, rgba, attr, pattern);
             }
 
-            EntityKind::Point(p) => {
-                // Zero-length stroke; the renderer draws it as a round dot.
-                let a = xf.apply(p.location.x, p.location.y);
-                self.scene.push_stroke(a[0], a[1], a[0], a[1], rgba, attr);
-            }
+            EntityKind::Point(p) => self.point(p, xf, rgba, attr),
 
             EntityKind::Solid(s) | EntityKind::Trace(s) => {
                 // SOLID and TRACE store their corners in Z order, so corners 3
@@ -1453,8 +2122,50 @@ impl<'a> Tessellator<'a> {
                     xf.apply(c[2].x, c[2].y),
                     xf.apply(c[3].x, c[3].y),
                 ];
-                // 3DFACE is an outline in a 2D view, not a filled region.
-                self.push_path(&q, true, rgba, attr, pattern);
+                // 3DFACE is an outline in a 2D view, not a filled region,
+                // without the edges its flags hide.
+                if f.invisible_edges & 0x0F == 0 {
+                    self.push_path(&q, true, rgba, attr, pattern);
+                } else {
+                    for i in 0..4 {
+                        if f.invisible_edges & (1 << i) == 0 {
+                            self.push_path(&[q[i], q[(i + 1) % 4]], false, rgba, attr, pattern);
+                        }
+                    }
+                }
+            }
+
+            // Meshes in plan: their edges.
+            EntityKind::Mesh(m) => {
+                let mut seen = HashSet::new();
+                for f in &m.faces {
+                    for (k, &a) in f.iter().enumerate() {
+                        let b = f[(k + 1) % f.len()];
+                        if !seen.insert((a.min(b), a.max(b))) {
+                            continue;
+                        }
+                        let (pa, pb) = (m.vertices[a as usize], m.vertices[b as usize]);
+                        self.push_transformed(
+                            &[[pa.x, pa.y], [pb.x, pb.y]],
+                            false,
+                            xf,
+                            rgba,
+                            attr,
+                            pattern,
+                        );
+                    }
+                }
+            }
+            EntityKind::Tolerance(t) => self.tolerance(t, ctx, rgba, attr),
+            EntityKind::Polyline(p) if p.kind() == PolylineKind::PolygonMesh => {
+                for edge in polygon_mesh_edges(p) {
+                    self.push_transformed(&edge, false, xf, rgba, attr, pattern);
+                }
+            }
+            EntityKind::Polyline(p) if p.kind() == PolylineKind::PolyfaceMesh => {
+                for edge in polyface_edges(p) {
+                    self.push_transformed(&edge, false, xf, rgba, attr, pattern);
+                }
             }
 
             EntityKind::MLine(m) => {
@@ -1521,6 +2232,12 @@ impl<'a> Tessellator<'a> {
 
             EntityKind::Insert(ins) => self.insert(ins, ctx, lid, rgba, contrast, lw, lt),
 
+            EntityKind::Dimension(d)
+                if d.block_name.is_empty() || self.block(&d.block_name).is_none() =>
+            {
+                self.dimension(d, ctx, rgba, attr);
+            }
+
             EntityKind::Dimension(d) => {
                 // AutoCAD bakes dimension graphics into an anonymous block.
                 // Render that instead of reimplementing the dimension engine.
@@ -1555,49 +2272,23 @@ impl<'a> Tessellator<'a> {
 
             EntityKind::Text(t) => self.text(t, ctx, rgba, attr),
 
-            EntityKind::Attribute(a) => self.attribute_text(&a.text, ctx, rgba, attr),
-
-            EntityKind::MText(m) => {
-                let height = if m.height > 0.0 { m.height } else { 1.0 };
-                let face = self.style_face(&m.style);
-                let lines = self.wrap_mtext(&m.text, m.reference_width, height, face);
-                let spacing = height
-                    * text::MTEXT_LINE_SPACING
-                    * if m.line_spacing_factor > 0.0 {
-                        m.line_spacing_factor
-                    } else {
-                        1.0
-                    };
-
-                // DWG stores the text direction as a vector when it has one.
-                let rotation = match m.x_direction {
-                    Some(d) if d.x != 0.0 || d.y != 0.0 => d.y.atan2(d.x),
-                    _ => m.rotation,
-                };
-                let (h_align, dy0) =
-                    text::mtext_layout(m.attachment as u8, lines.len(), height, spacing);
+            // A multiline attribute (2018 on) is an MTEXT.
+            EntityKind::Attribute(a) => match &a.mtext {
+                Some(m) => self.mtext(m, ctx, rgba, attr),
+                None => self.attribute_text(&a.text, ctx, rgba, attr),
+            },
 
-                let (sin_r, cos_r) = rotation.sin_cos();
-                for (i, line) in lines.iter().enumerate() {
-                    if line.spans.is_empty() {
-                        continue;
-                    }
-                    // Lines stack along the text's own down direction.
-                    let dy = dy0 - i as f64 * spacing;
-                    let x = m.insertion.x - dy * sin_r;
-                    let y = m.insertion.y + dy * cos_r;
-                    self.push_mtext_line(
-                        line, height, x, y, rotation, h_align, ctx, rgba, attr, face,
-                    );
-                }
-            }
+            EntityKind::MText(m) => self.mtext(m, ctx, rgba, attr),
 
             // An ordinary ATTDEF is the template for an ATTRIB carried by the
             // insert, so drawing it too would double the text. A *constant*
             // attribute has no ATTRIB: the definition is the only copy, and
-            // AutoCAD draws it.
-            EntityKind::AttributeDefinition(a) if a.is_constant() => {
-                self.attribute_text(&a.text, ctx, rgba, attr)
+            // AutoCAD draws it, unless it is invisible too.
+            EntityKind::AttributeDefinition(a) if a.is_constant() && !a.is_invisible() => {
+                match &a.mtext {
+                    Some(m) => self.mtext(m, ctx, rgba, attr),
+                    None => self.attribute_text(&a.text, ctx, rgba, attr),
+                }
             }
             EntityKind::AttributeDefinition(_) => {}
 
@@ -1626,13 +2317,13 @@ impl<'a> Tessellator<'a> {
             }),
 
             // A WIPEOUT blanks everything beneath it. Its boundary is given in
-            // image pixel coordinates along the u and v vectors.
+            // image pixel coordinates along the u and v vectors, from the top
+            // left with y down, of a 1 by 1 image.
             EntityKind::Wipeout(w) => {
                 let to_world = |p: [f64; 2]| {
-                    let x =
-                        w.insertion.x + w.u_vector.x * (p[0] + 0.5) + w.v_vector.x * (p[1] + 0.5);
-                    let y =
-                        w.insertion.y + w.u_vector.y * (p[0] + 0.5) + w.v_vector.y * (p[1] + 0.5);
+                    let (a, b) = (p[0] + 0.5, 0.5 - p[1]);
+                    let x = w.insertion.x + w.u_vector.x * a + w.v_vector.x * b;
+                    let y = w.insertion.y + w.u_vector.y * a + w.v_vector.y * b;
                     xf.apply(x, y)
                 };
                 let v = &w.clip_vertices;
@@ -1695,26 +2386,17 @@ impl<'a> Tessellator<'a> {
                 }
 
                 if l.arrowhead {
-                    // A filled triangle at the first vertex, pointing back
-                    // along the first segment, as long as the dimension
-                    // style's arrow size (DIMASZ times DIMSCALE) and a third
-                    // as wide: AutoCAD's default closed filled arrowhead.
+                    // At the first vertex, pointing back along the first
+                    // segment, the dimension style's arrow size (DIMASZ
+                    // times DIMSCALE) long, in its leader arrow (DIMLDRBLK).
                     let size = self.arrow_size(&l.style);
-                    let d = [pts[1][0] - pts[0][0], pts[1][1] - pts[0][1]];
-                    let len = d[0].hypot(d[1]);
-                    if size > 0.0 && len > 1e-9 {
-                        let u = [d[0] / len, d[1] / len];
-                        let n = [-u[1], u[0]];
-                        let base = [pts[0][0] + u[0] * size, pts[0][1] + u[1] * size];
-                        let half = size / 6.0;
-                        self.scene.push_triangle(
-                            xf.apply(pts[0][0], pts[0][1]),
-                            xf.apply(base[0] + n[0] * half, base[1] + n[1] * half),
-                            xf.apply(base[0] - n[0] * half, base[1] - n[1] * half),
-                            rgba,
-                            attr,
-                        );
-                    }
+                    let block = self
+                        .doc
+                        .dim_styles
+                        .iter()
+                        .find(|s| s.name.eq_ignore_ascii_case(&l.style))
+                        .map_or(Handle::NULL, |s| s.dimldrblk);
+                    self.arrowhead(block, pts[0], pts[1], size, ctx, rgba, attr);
                 }
             }
 
@@ -1722,8 +2404,13 @@ impl<'a> Tessellator<'a> {
             // that can be drawn is the frame, which is what AutoCAD shows for
             // an image it cannot load, and the count so the host can say so.
             EntityKind::Image(img) => {
-                self.warnings.external_references =
-                    self.warnings.external_references.saturating_add(1);
+                let file = self
+                    .doc
+                    .image_defs
+                    .iter()
+                    .find(|d| d.handle == img.image_def);
+                self.warnings
+                    .external(file.map_or("", |d| d.file_name.as_str()));
                 let u = [img.u_vector.x, img.u_vector.y];
                 let v = [img.v_vector.x, img.v_vector.y];
                 let o = [img.insertion.x, img.insertion.y];
@@ -1734,18 +2421,42 @@ impl<'a> Tessellator<'a> {
                         o[1] + u[1] * a * w + v[1] * b * h,
                     ]
                 };
-                let frame = [
+                let mut frame = vec![
                     corner(0.0, 0.0),
                     corner(1.0, 0.0),
                     corner(1.0, 1.0),
                     corner(0.0, 1.0),
                 ];
+                // A crop shows only its boundary. Its pixels count from the
+                // top left, y down, and the first pixel is centred on 0.
+                let v = &img.clip_vertices;
+                if img.clipping && !img.clip_inverted && v.len() >= 2 && w > 0.0 && h > 0.0 {
+                    let at = |p: [f64; 2]| corner((p[0] + 0.5) / w, 1.0 - (p[1] + 0.5) / h);
+                    // Two vertices are opposite corners of a rectangle.
+                    let mut poly: Vec<[f64; 2]> = if v.len() == 2 {
+                        let (a, b) = (v[0], v[1]);
+                        vec![[a.x, a.y], [b.x, a.y], [b.x, b.y], [a.x, b.y]]
+                    } else {
+                        v.iter().map(|p| [p.x, p.y]).collect()
+                    };
+                    // A path may repeat its first point to close; the frame
+                    // closes itself.
+                    if poly.len() > 3 && poly.first() == poly.last() {
+                        poly.pop();
+                    }
+                    frame = poly.into_iter().map(at).collect();
+                }
                 self.push_transformed(&frame, true, xf, rgba, attr, pattern);
             }
 
             EntityKind::Underlay(u) => {
-                self.warnings.external_references =
-                    self.warnings.external_references.saturating_add(1);
+                let file = self
+                    .doc
+                    .underlay_defs
+                    .iter()
+                    .find(|d| d.handle == u.definition);
+                self.warnings
+                    .external(file.map_or("", |d| d.file_name.as_str()));
                 if u.clip_vertices.len() >= 2 {
                     let pts: Vec<[f64; 2]> = u.clip_vertices.iter().map(|p| [p.x, p.y]).collect();
                     // Two points are the corners of a rectangle, more are a path.
@@ -1771,8 +2482,7 @@ impl<'a> Tessellator<'a> {
             }
 
             EntityKind::Ole2Frame(o) => {
-                self.warnings.external_references =
-                    self.warnings.external_references.saturating_add(1);
+                self.warnings.external("");
                 let (a, b) = (o.upper_left, o.lower_right);
                 let frame = [[a.x, a.y], [b.x, a.y], [b.x, b.y], [a.x, b.y]];
                 self.push_transformed(&frame, true, xf, rgba, attr, pattern);
@@ -1796,11 +2506,11 @@ impl<'a> Tessellator<'a> {
                     self.warnings.proxy_without_graphics.saturating_add(1);
             }
 
-            // Meshes, SHAPE (a glyph of an SHX file, which cannot be shipped)
-            // and every other type the model does not hold.
-            EntityKind::Polyline(_) | EntityKind::Shape(_) | EntityKind::Unknown(_) => {
-                self.warnings.unknown_entities = self.warnings.unknown_entities.saturating_add(1);
-            }
+            // SHAPE (a glyph of an SHX file, which cannot be shipped) and
+            // every other type the model does not hold.
+            EntityKind::Polyline(_) => self.warnings.not_drawn("POLYLINE"),
+            EntityKind::Shape(_) => self.warnings.not_drawn("SHAPE"),
+            EntityKind::Unknown(u) => self.warnings.not_drawn(&u.type_name),
         }
     }
 
@@ -1841,7 +2551,7 @@ impl<'a> Tessellator<'a> {
         } else {
             t.alignment_point.unwrap_or(t.insertion)
         };
-        let value = text::decode_special(&t.value);
+        let value = self.style_text(&t.style, &t.value);
 
         // Aligned and Fit stretch the string between two points rather than
         // anchoring it at one, so they need its width. Aligned scales the
@@ -1849,31 +2559,42 @@ impl<'a> Tessellator<'a> {
         // instead.
         let stretched = matches!(t.h_align, HAlign::Aligned | HAlign::Fit);
         let face = self.style_face(&t.style);
-        if stretched {
-            if let Some(second) = t.alignment_point {
-                let first = t.insertion;
-                let span = (second.x - first.x).hypot(second.y - first.y);
-                let natural = font::Metrics::for_face(face).measure(&value) * t.height;
-                if span > 1e-9 && natural > 1e-9 {
-                    let factor = span / natural;
-                    let fit = t.h_align == HAlign::Fit;
-                    self.push_text_run(
-                        value,
-                        first.x,
-                        first.y,
-                        if fit { t.height } else { t.height * factor },
-                        (second.y - first.y).atan2(second.x - first.x),
-                        if fit { factor } else { 1.0 },
-                        t.oblique,
-                        text::HAlign::Left,
-                        v_align_of(t.v_align),
-                        ctx,
-                        rgba,
-                        attr,
-                        face,
-                    );
-                    return;
-                }
+        let width_factor = if t.width_factor > 0.0 {
+            t.width_factor
+        } else {
+            1.0
+        };
+        if stretched && let Some(second) = t.alignment_point {
+            let first = t.insertion;
+            let span = (second.x - first.x).hypot(second.y - first.y);
+            let natural = font::Metrics::for_face(face).measure(&value) * t.height * width_factor;
+            if span > 1e-9 && natural > 1e-9 {
+                let factor = span / natural;
+                let fit = t.h_align == HAlign::Fit;
+                let frame = text::generated_frame(
+                    if fit { t.height } else { t.height * factor },
+                    (second.y - first.y).atan2(second.x - first.x),
+                    if fit {
+                        width_factor * factor
+                    } else {
+                        width_factor
+                    },
+                    t.oblique,
+                    t.generation,
+                );
+                self.push_text_run(
+                    value,
+                    first.x,
+                    first.y,
+                    frame,
+                    text::HAlign::Left,
+                    text::VAlign::Baseline,
+                    ctx,
+                    rgba,
+                    attr,
+                    face,
+                );
+                return;
             }
         }
 
@@ -1881,10 +2602,13 @@ impl<'a> Tessellator<'a> {
             value,
             anchor.x,
             anchor.y,
-            t.height,
-            t.rotation,
-            t.width_factor,
-            t.oblique,
+            text::generated_frame(
+                t.height,
+                t.rotation,
+                t.width_factor,
+                t.oblique,
+                t.generation,
+            ),
             h_align_of(t.h_align),
             v_align_of(t.v_align),
             ctx,
@@ -1905,13 +2629,16 @@ impl<'a> Tessellator<'a> {
         };
         let face = self.style_face(&t.style);
         self.push_text_run(
-            text::decode_special(&t.value),
+            self.style_text(&t.style, &t.value),
             anchor.x,
             anchor.y,
-            t.height,
-            t.rotation,
-            t.width_factor,
-            t.oblique,
+            text::generated_frame(
+                t.height,
+                t.rotation,
+                t.width_factor,
+                t.oblique,
+                t.generation,
+            ),
             h_align_of(t.h_align),
             v_align_of(t.v_align),
             ctx,
@@ -1932,10 +2659,7 @@ impl<'a> Tessellator<'a> {
         value: String,
         x: f64,
         y: f64,
-        height: f64,
-        rotation: f64,
-        width_factor: f64,
-        oblique: f64,
+        (u, v): ([f64; 2], [f64; 2]),
         h_align: text::HAlign,
         v_align: text::VAlign,
         ctx: &Ctx,
@@ -1946,22 +2670,30 @@ impl<'a> Tessellator<'a> {
         if value.trim().is_empty() {
             return;
         }
+        // The stroke font has no CJK and few symbols: a run with characters
+        // it lacks goes to an outline face, which the browser completes from
+        // the system's fonts where the bundle has none.
+        let stroke = super::stroke_font::newstroke();
+        let face = if face == font::Face::Stroke
+            && value
+                .chars()
+                .any(|c| !c.is_whitespace() && stroke.glyph(c).is_none())
+        {
+            font::Face::default()
+        } else {
+            face
+        };
         let p = ctx.xf.apply(x, y);
-        // Blocks rotate and scale their contents, so the text follows.
-        let block_rotation = ctx.xf.b.atan2(ctx.xf.a);
-        let scale = ctx.xf.scale_magnitude();
+        // Blocks rotate, scale and mirror their contents, so the text
+        // follows, its frame with them.
+        let xf = &ctx.xf;
+        let linear = |w: [f64; 2]| [xf.a * w[0] + xf.c * w[1], xf.b * w[0] + xf.d * w[1]];
         self.warnings.text_runs = self.warnings.text_runs.saturating_add(1);
         let run = text::TextRun {
             x: p[0],
             y: p[1],
-            height: if height > 0.0 { height * scale } else { scale },
-            rotation: rotation + block_rotation,
-            width_factor: if width_factor > 0.0 {
-                width_factor
-            } else {
-                1.0
-            },
-            oblique,
+            u: linear(u),
+            v: linear(v),
             rgba,
             attr,
             h_align,
@@ -1969,6 +2701,7 @@ impl<'a> Tessellator<'a> {
             text: value,
             face,
             order: self.scene.order,
+            clip: 0,
         };
         match face {
             font::Face::Stroke => self.push_stroke_text(&run),
@@ -1985,19 +2718,14 @@ impl<'a> Tessellator<'a> {
     /// order, layer visibility and viewport clipping all come from `attr`.
     fn push_stroke_text(&mut self, run: &text::TextRun) {
         let stroke = super::stroke_font::newstroke();
-        let height = run.height;
-        if !(height > 0.0) {
+        if !(run.height() > 0.0) {
             return;
         }
-        let advance_scale = height * run.width_factor;
-        let width: f64 = run
-            .text
-            .chars()
-            .map(|c| stroke.advance(c) as f64 * advance_scale)
-            .sum();
+        // Everything is in cap heights until the frame places it.
+        let width: f64 = run.text.chars().map(|c| stroke.advance(c) as f64).sum();
 
-        // Aligned and Fit stretch between two points the record does not carry,
-        // so they centre, as the host's path does.
+        // Aligned and Fit arrive stretched and left-aligned (`text`); here
+        // they centre, as the host's path does.
         let dx = match run.h_align {
             text::HAlign::Center
             | text::HAlign::Middle
@@ -2006,17 +2734,12 @@ impl<'a> Tessellator<'a> {
             text::HAlign::Right => -width,
             text::HAlign::Left => 0.0,
         };
-        let dy = match run.v_align {
-            text::VAlign::Middle => -height / 2.0,
-            text::VAlign::Top => -height,
-            text::VAlign::Baseline | text::VAlign::Bottom => 0.0,
-        };
-
-        let (sin_r, cos_r) = run.rotation.sin_cos();
-        let tan_o = if run.oblique.abs() < std::f64::consts::FRAC_PI_2 {
-            run.oblique.tan()
-        } else {
-            0.0
+        let dy = text::baseline_offset(run.h_align, run.v_align, font::Face::Stroke);
+        let at = |a: f64, b: f64| {
+            [
+                run.x + a * run.u[0] + b * run.v[0],
+                run.y + a * run.u[1] + b * run.v[1],
+            ]
         };
 
         let mut pen = dx;
@@ -2031,22 +2754,142 @@ impl<'a> Tessellator<'a> {
                 for polyline in glyph.polylines() {
                     points.clear();
                     for p in polyline.points() {
-                        // Glyph units are cap heights, so the text height is
-                        // the only scale there is.
-                        let gx = pen + p[0] as f64 * advance_scale;
-                        let gy = dy + p[1] as f64 * height;
-                        // Oblique leans the vertical, shifting x by height.
-                        let sx = gx + gy * tan_o;
-                        points.push([
-                            run.x + sx * cos_r - gy * sin_r,
-                            run.y + sx * sin_r + gy * cos_r,
-                        ]);
+                        points.push(at(pen + p[0] as f64, dy + p[1] as f64));
                     }
                     self.scene.push_polyline(&points, false, run.rgba, run.attr);
                 }
             }
-            pen += stroke.advance(c) as f64 * advance_scale;
+            pen += stroke.advance(c) as f64;
+        }
+    }
+
+    /// An LWPOLYLINE or 2D POLYLINE: a line through its bulges, or, where its
+    /// segments have width, the band they fill (outlined under `$FILLMODE`
+    /// 0). The band is in object coordinates and transformed corner by
+    /// corner, so a scaled block widens it too.
+    ///
+    /// A dashed one carries whether its linetype runs on across its vertices
+    /// (group 70 bit 128, PLINEGEN); without it each segment starts its
+    /// pattern afresh, as AutoCAD draws it.
+    fn polyline(
+        &mut self,
+        verts: &[WideVertex],
+        closed: bool,
+        xf: &Affine,
+        rgba: u32,
+        attr: u32,
+        dashes: Option<(&Pattern, bool)>,
+    ) {
+        let pattern = dashes.map(|(p, _)| p);
+        if !verts
+            .iter()
+            .any(|v| v.start_width > 0.0 || v.end_width > 0.0)
+        {
+            let pts: Vec<([f64; 2], f64)> = verts.iter().map(|v| (v.p, v.bulge)).collect();
+            if pattern.is_none()
+                && pts.iter().any(|p| p.1 != 0.0)
+                && self.push_bulged(&pts, closed, xf, rgba, attr)
+            {
+                return;
+            }
+            if let Some((p, false)) = dashes {
+                let segments = if closed {
+                    pts.len()
+                } else {
+                    pts.len().saturating_sub(1)
+                };
+                for i in 0..segments {
+                    let piece = expand_bulges(&[pts[i], pts[(i + 1) % pts.len()]], false);
+                    self.push_transformed(&piece, false, xf, rgba, attr, Some(p));
+                }
+                return;
+            }
+            let flat = expand_bulges(&pts, closed);
+            self.push_transformed(&flat, closed, xf, rgba, attr, pattern);
+            return;
+        }
+        let band = wide::band(verts, closed);
+        for run in &band.thin {
+            self.push_transformed(run, false, xf, rgba, attr, pattern);
+        }
+        if self.doc.header.fillmode {
+            for [a, b, c] in &band.triangles {
+                self.scene.push_triangle(
+                    xf.apply(a[0], a[1]),
+                    xf.apply(b[0], b[1]),
+                    xf.apply(c[0], c[1]),
+                    rgba,
+                    attr,
+                );
+            }
+        } else {
+            for outline in &band.outlines {
+                self.push_transformed(outline, true, xf, rgba, attr, None);
+            }
+        }
+    }
+
+    /// A circular arc in object coordinates (centre, radius, start angle,
+    /// signed sweep): arc strokes, exact at any zoom, when nothing dashes it
+    /// and the transform keeps circles round; else its flattened points.
+    #[allow(clippy::too_many_arguments)]
+    fn push_curve(
+        &mut self,
+        cx: f64,
+        cy: f64,
+        r: f64,
+        start: f64,
+        sweep: f64,
+        xf: &Affine,
+        rgba: u32,
+        attr: u32,
+        pattern: Option<&Pattern>,
+    ) {
+        if pattern.is_none()
+            && let Some((scale, turn, mirrored)) = similarity(xf)
+        {
+            let c = xf.apply(cx, cy);
+            let (start, sweep) = if mirrored {
+                (turn - start, -sweep)
+            } else {
+                (start + turn, sweep)
+            };
+            self.scene
+                .push_arc(c[0], c[1], r * scale, start, sweep, rgba, attr);
+            return;
+        }
+        let pts = curves::arc_points(cx, cy, r, start, sweep);
+        self.push_transformed(&pts, false, xf, rgba, attr, pattern);
+    }
+
+    /// A polyline's straight and bulged segments, the bulged ones as arc
+    /// strokes, under a transform that keeps circles round; false, drawing
+    /// nothing, under any other.
+    fn push_bulged(
+        &mut self,
+        pts: &[([f64; 2], f64)],
+        closed: bool,
+        xf: &Affine,
+        rgba: u32,
+        attr: u32,
+    ) -> bool {
+        let Some((_, _, mirrored)) = similarity(xf) else {
+            return false;
+        };
+        let n = pts.len();
+        let segments = if closed { n } else { n.saturating_sub(1) };
+        for i in 0..segments {
+            let ((a, bulge), (b, _)) = (pts[i], pts[(i + 1) % n]);
+            let (wa, wb) = (xf.apply(a[0], a[1]), xf.apply(b[0], b[1]));
+            let bulge = if mirrored { -bulge } else { bulge };
+            if bulge == 0.0 || !bulge.is_finite() {
+                self.scene
+                    .push_stroke(wa[0], wa[1], wb[0], wb[1], rgba, attr);
+            } else if let Some((cx, cy, r, start, sweep)) = curves::bulge_arc(wa, wb, bulge) {
+                self.scene.push_arc(cx, cy, r, start, sweep, rgba, attr);
+            }
         }
+        true
     }
 
     fn push_transformed(
@@ -2089,7 +2932,8 @@ impl<'a> Tessellator<'a> {
         self.scene.push_polyline(pts, closed, rgba, attr);
     }
 
-    /// Stamp a complex linetype's text along a path it has just dashed.
+    /// Stamp a complex linetype's text and shapes along a path it has just
+    /// dashed.
     fn push_line_labels(
         &mut self,
         pts: &[[f64; 2]],
@@ -2103,29 +2947,306 @@ impl<'a> Tessellator<'a> {
         }
         for place in linetype::dash_labels(pts, closed, pattern) {
             let label = &pattern.labels[place.label];
-            let run = text::TextRun {
-                x: place.x,
-                y: place.y,
-                height: label.height,
-                rotation: place.angle,
-                width_factor: 1.0,
-                oblique: 0.0,
+            match &label.mark {
+                linetype::Mark::Text { text, face } => {
+                    let (u, v) = text::frame(label.height, place.angle, 1.0, 0.0);
+                    let run = text::TextRun {
+                        x: place.x,
+                        y: place.y,
+                        u,
+                        v,
+                        rgba,
+                        attr,
+                        h_align: text::HAlign::Left,
+                        v_align: text::VAlign::Baseline,
+                        text: text.clone(),
+                        face: *face,
+                        order: self.scene.order,
+                        clip: 0,
+                    };
+                    self.warnings.text_runs = self.warnings.text_runs.saturating_add(1);
+                    match face {
+                        font::Face::Stroke => self.push_stroke_text(&run),
+                        font::Face::TrueType(_) => self.scene.push_text(run),
+                    }
+                }
+                linetype::Mark::Shape(parts) => {
+                    let (sin, cos) = place.angle.sin_cos();
+                    let k = label.height;
+                    let at = |p: [f64; 2]| {
+                        [
+                            place.x + k * (p[0] * cos - p[1] * sin),
+                            place.y + k * (p[0] * sin + p[1] * cos),
+                        ]
+                    };
+                    for part in *parts {
+                        match part {
+                            linetype::ShapePart::Line(ps) => {
+                                for &[p, q] in ps.array_windows() {
+                                    let (a, b) = (at(p), at(q));
+                                    self.scene.push_stroke(a[0], a[1], b[0], b[1], rgba, attr);
+                                }
+                            }
+                            linetype::ShapePart::Arc(c, r, start, sweep) => {
+                                let c = at(*c);
+                                self.scene.push_arc(
+                                    c[0],
+                                    c[1],
+                                    r * k,
+                                    start + place.angle,
+                                    *sweep,
+                                    rgba,
+                                    attr,
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /// An arrowhead `size` long at `tip`, pointing away from `from`: the
+    /// arrow block `block` names, drawn from the drawing's block of that
+    /// name when it has one (AutoCAD saves `_Open` and the like there), else
+    /// the built-in shape of that name, else the closed filled default.
+    #[allow(clippy::too_many_arguments)]
+    fn arrowhead(
+        &mut self,
+        block: Handle,
+        tip: [f64; 2],
+        from: [f64; 2],
+        size: f64,
+        ctx: &Ctx,
+        rgba: u32,
+        attr: u32,
+    ) {
+        let d = [tip[0] - from[0], tip[1] - from[1]];
+        if !(size > 0.0) || !(d[0].hypot(d[1]) > 1e-9) {
+            return;
+        }
+        let angle = d[1].atan2(d[0]);
+        let place = ctx.xf.mul(&Affine::new(tip[0], tip[1], size, size, angle));
+        let name = (!block.is_null())
+            .then(|| self.doc.blocks.iter().find(|b| b.record == block))
+            .flatten();
+        if let Some(b) = name.filter(|b| !b.entities.is_empty()) {
+            let (lid, lw) = (attr as u16, (attr >> 16) as u8);
+            let contrast = (attr >> 24) as u8 & FLAG_CONTRAST != 0;
+            let name = b.name.clone();
+            self.expand_block(
+                &name,
+                &place,
+                lid,
                 rgba,
-                attr,
-                h_align: text::HAlign::Left,
-                v_align: text::VAlign::Baseline,
-                text: label.text.clone(),
-                face: label.face,
-                order: self.scene.order,
+                contrast,
+                lw,
+                0,
+                ctx.lt_scale,
+                ctx.depth,
+            );
+            return;
+        }
+        let kind = name.map_or(String::new(), |b| b.name.to_ascii_uppercase());
+        let shape = arrow_shape(&kind);
+        let world = |p: &[f64; 2]| place.apply(p[0], p[1]);
+        for t in shape.filled.chunks(3) {
+            if let [a, b, c] = t {
+                self.scene
+                    .push_triangle(world(a), world(b), world(c), rgba, attr);
+            }
+        }
+        for line in shape.lines {
+            let pts: Vec<[f64; 2]> = line.iter().map(world).collect();
+            self.scene.push_polyline(&pts, false, rgba, attr);
+        }
+    }
+
+    /// A dimension saved without its block, drawn from its definition points
+    /// and its style (`dimension.rs`). A style the drawing does not have
+    /// falls back to the header's variables.
+    fn dimension(&mut self, d: &crate::cad::Dimension, ctx: &Ctx, rgba: u32, attr: u32) {
+        let h = &self.doc.header;
+        let style = self
+            .doc
+            .dim_styles
+            .iter()
+            .find(|s| s.name.eq_ignore_ascii_case(&d.style))
+            .cloned()
+            .unwrap_or_else(|| crate::cad::DimStyle {
+                dimscale: h.dimscale,
+                dimasz: h.dimasz,
+                dimtxt: h.dimtxt,
+                dimgap: h.dimgap,
+                ..crate::cad::DimStyle::default()
+            });
+        let text_style = self
+            .doc
+            .text_styles
+            .iter()
+            .find(|ts| ts.handle == style.dimtxsty && !style.dimtxsty.is_null())
+            .map(|ts| ts.name.clone())
+            .unwrap_or_default();
+        let face = self.style_face(&text_style);
+        let metrics = font::Metrics::for_face(face);
+        let s = dimension::Style::new(&style);
+        let measure = |t: &str| metrics.measure(&text::decode_special(t));
+        let Some(g) = dimension::graphics(d, &s, &measure) else {
+            return;
+        };
+        for [a, b] in &g.lines {
+            let (a, b) = (ctx.xf.apply(a[0], a[1]), ctx.xf.apply(b[0], b[1]));
+            self.scene.push_stroke(a[0], a[1], b[0], b[1], rgba, attr);
+        }
+        for (c, r, start, sweep) in &g.arcs {
+            self.push_curve(c[0], c[1], *r, *start, *sweep, &ctx.xf, rgba, attr, None);
+        }
+        for (tip, from) in &g.arrows {
+            self.arrowhead(style.dimblk, *tip, *from, s.asz, ctx, rgba, attr);
+        }
+        if let Some(label) = g.label {
+            let content = crate::cad::MText {
+                insertion: crate::cad::Vec3::new(label.at[0], label.at[1], 0.0),
+                height: s.txt,
+                attachment: 5,
+                style: text_style,
+                rotation: label.rotation,
+                text: label.text,
+                ..crate::cad::MText::default()
             };
-            self.warnings.text_runs = self.warnings.text_runs.saturating_add(1);
-            match label.face {
-                font::Face::Stroke => self.push_stroke_text(&run),
-                font::Face::TrueType(_) => self.scene.push_text(run),
+            self.mtext(&content, ctx, rgba, attr);
+        }
+    }
+
+    /// A TOLERANCE's feature control frame: a row per `^J`, a box per
+    /// `%%v`, each its text and the style's gap around it, the GD&T codes as
+    /// the symbols they stand for; hung from the middle of the first row's
+    /// left side, along its direction.
+    fn tolerance(&mut self, t: &crate::cad::Tolerance, ctx: &Ctx, rgba: u32, attr: u32) {
+        let style = self
+            .doc
+            .dim_styles
+            .iter()
+            .find(|s| s.name.eq_ignore_ascii_case(&t.dimstyle));
+        let header = &self.doc.header;
+        let (txt, gap, scale) = match style {
+            Some(s) => (s.dimtxt, s.dimgap, s.dimscale),
+            None => (header.dimtxt, header.dimgap, header.dimscale),
+        };
+        let scale = if scale > 0.0 && scale.is_finite() {
+            scale
+        } else {
+            1.0
+        };
+        let height = if txt > 0.0 { txt * scale } else { 0.18 };
+        let gap = gap.abs() * scale;
+        let face = style
+            .and_then(|s| {
+                self.doc
+                    .text_styles
+                    .iter()
+                    .find(|ts| ts.handle == s.dimtxsty && !s.dimtxsty.is_null())
+            })
+            .map_or(font::Face::Stroke, |ts| self.style_face(&ts.name));
+        let metrics = font::Metrics::for_face(face);
+        let rotation = t.x_direction.y.atan2(t.x_direction.x);
+        let (sin_r, cos_r) = rotation.sin_cos();
+        let at = |a: f64, b: f64| {
+            ctx.xf.apply(
+                t.insertion.x + a * cos_r - b * sin_r,
+                t.insertion.y + a * sin_r + b * cos_r,
+            )
+        };
+        let row_height = height + 2.0 * gap;
+        for (r, row) in t.text.split("^J").enumerate() {
+            // The first row's middle is on the insertion point.
+            let top = row_height / 2.0 - r as f64 * row_height;
+            let mut left = 0.0;
+            for cell in row.split("%%v") {
+                let shown = text::decode_special(&gdt_codes(cell));
+                if shown.is_empty() {
+                    continue;
+                }
+                let width = metrics.measure(&shown) * height + 2.0 * gap;
+                let corners = [
+                    (left, top),
+                    (left + width, top),
+                    (left + width, top - row_height),
+                    (left, top - row_height),
+                ]
+                .map(|(a, b)| at(a, b));
+                self.scene.push_polyline(&corners, true, rgba, attr);
+                let (x, y) = (
+                    t.insertion.x + (left + gap) * cos_r - (top - gap - height) * sin_r,
+                    t.insertion.y + (left + gap) * sin_r + (top - gap - height) * cos_r,
+                );
+                let frame = text::frame(height, rotation, 1.0, 0.0);
+                let (l, b) = (text::HAlign::Left, text::VAlign::Baseline);
+                self.push_text_run(shown, x, y, frame, l, b, ctx, rgba, attr, face);
+                left += width;
             }
         }
     }
 
+    /// A POINT in the drawing's `$PDMODE`: a dot (0), nothing (1), a plus
+    /// (2), a cross (3), a tick up (4), and around it a circle (+32) or a
+    /// square (+64), `$PDSIZE` across: units when above 0, else a share of
+    /// the drawing's height (5% at 0, -n for n%), as AutoCAD takes the
+    /// window's.
+    fn point(&mut self, p: &crate::cad::Point, xf: &Affine, rgba: u32, attr: u32) {
+        let h = &self.doc.header;
+        let mode = h.pdmode;
+        let at = xf.apply(p.location.x, p.location.y);
+        if mode & 7 == 0 {
+            // A zero-length stroke, which the renderer draws as a round dot.
+            self.scene
+                .push_stroke(at[0], at[1], at[0], at[1], rgba, attr);
+        }
+        if mode & !(7 | 32 | 64) != 0 || matches!(mode & 7, 0 | 1) && mode & 96 == 0 {
+            return;
+        }
+        let tall = h.extmax.y - h.extmin.y;
+        let tall = if tall.is_finite() && tall > 0.0 {
+            tall
+        } else {
+            20.0
+        };
+        let size = match h.pdsize {
+            s if s > 0.0 => s,
+            s if s < 0.0 => tall * -s / 100.0,
+            _ => tall * 0.05,
+        };
+        let r = size / 2.0;
+        let (sin_a, cos_a) = p.x_axis_angle.sin_cos();
+        let local = |x: f64, y: f64| {
+            xf.apply(
+                p.location.x + x * cos_a - y * sin_a,
+                p.location.y + x * sin_a + y * cos_a,
+            )
+        };
+        let segments: &[[(f64, f64); 2]] = match mode & 7 {
+            2 => &[[(-r, 0.0), (r, 0.0)], [(0.0, -r), (0.0, r)]],
+            3 => &[[(-r, -r), (r, r)], [(-r, r), (r, -r)]],
+            4 => &[[(0.0, 0.0), (0.0, r)]],
+            _ => &[],
+        };
+        for [(x0, y0), (x1, y1)] in segments {
+            let (a, b) = (local(*x0, *y0), local(*x1, *y1));
+            self.scene.push_stroke(a[0], a[1], b[0], b[1], rgba, attr);
+        }
+        if mode & 32 != 0 {
+            let ring: Vec<[f64; 2]> = curves::flatten_circle(0.0, 0.0, r)
+                .into_iter()
+                .map(|q| local(q[0], q[1]))
+                .collect();
+            self.scene.push_polyline(&ring, true, rgba, attr);
+        }
+        if mode & 64 != 0 {
+            let square = [(-r, -r), (r, -r), (r, r), (-r, r)].map(|(x, y)| local(x, y));
+            self.scene.push_polyline(&square, true, rgba, attr);
+        }
+    }
+
     #[allow(clippy::too_many_arguments)]
     fn insert(
         &mut self,
@@ -2168,9 +3289,12 @@ impl<'a> Tessellator<'a> {
                 ins.insertion.y + dx * sin_r + dy * cos_r,
             ];
             let child = Affine::new(p[0], p[1], sx, sy, ins.rotation);
+            let xf = ctx.xf.mul(&child);
+            let mark = self.scene.mark();
+            let infinite = self.pending_infinite.len();
             self.expand_block(
                 &ins.block_name,
-                &ctx.xf.mul(&child),
+                &xf,
                 lid,
                 rgba,
                 contrast,
@@ -2179,6 +3303,22 @@ impl<'a> Tessellator<'a> {
                 ctx.lt_scale,
                 ctx.depth,
             );
+            if let Some(outline) = self.xclip_outline(ins, &xf) {
+                if let Some(shape) = ClipShape::polygon(outline.clone()) {
+                    // The block's rays and xlines end at the boundary rather
+                    // than at the drawing's extents.
+                    let (min, max) = shape.bounds();
+                    for line in self.pending_infinite.split_off(infinite) {
+                        self.push_infinite(&line, min, max);
+                    }
+                    self.scene.clip_since(mark, &shape);
+                }
+                if self.doc.header.xclipframe != 0 {
+                    let flags = if contrast { FLAG_CONTRAST } else { 0 };
+                    let attr = pack_attr(lid, lw, flags);
+                    self.push_path(&outline, true, rgba, attr, None);
+                }
+            }
         }
 
         // The insert's attributes (title-block fields, room tags) are not in
@@ -2195,14 +3335,37 @@ impl<'a> Tessellator<'a> {
             depth: ctx.depth + 1,
         };
         for a in &ins.attributes {
-            if let EntityKind::Attribute(at) = &a.kind {
-                if !at.is_invisible() {
-                    self.entity(a, &attr_ctx);
-                }
+            if let EntityKind::Attribute(at) = &a.kind
+                && !at.is_invisible()
+            {
+                self.entity(a, &attr_ctx);
             }
         }
     }
 
+    /// An insert's XCLIP boundary in world coordinates, when clipping is on:
+    /// it is in block coordinates, so the block's base point comes off as
+    /// for its entities. Two points are the corners of a rectangle.
+    fn xclip_outline(&self, ins: &crate::cad::Insert, xf: &Affine) -> Option<Vec<[f64; 2]>> {
+        let clip = ins.clip.as_ref().filter(|c| c.enabled)?;
+        let base = self.block(&ins.block_name)?.base_point;
+        let local: Vec<[f64; 2]> = match clip.boundary.as_slice() {
+            [a, b] => {
+                let (x0, x1) = (a.x.min(b.x), a.x.max(b.x));
+                let (y0, y1) = (a.y.min(b.y), a.y.max(b.y));
+                vec![[x0, y0], [x1, y0], [x1, y1], [x0, y1]]
+            }
+            ps if ps.len() >= 3 => ps.iter().map(|p| [p.x, p.y]).collect(),
+            _ => return None,
+        };
+        Some(
+            local
+                .iter()
+                .map(|p| xf.apply(p[0] - base.x, p[1] - base.y))
+                .collect(),
+        )
+    }
+
     #[allow(clippy::too_many_arguments)]
     fn expand_block(
         &mut self,
@@ -2235,6 +3398,51 @@ impl<'a> Tessellator<'a> {
             return;
         };
 
+        // An xref's content is in another file, which this viewer was not
+        // given: its path is drawn at the insertion point, as AutoCAD shows
+        // an xref it cannot find.
+        if block.is_xref() && block.entities.is_empty() {
+            let file = if block.xref_path.is_empty() {
+                &block.name
+            } else {
+                &block.xref_path
+            };
+            self.warnings.external(file);
+            let at = Ctx {
+                xf: *xf,
+                layer: lid,
+                rgba,
+                contrast,
+                lw,
+                lt,
+                lt_scale,
+                depth,
+            };
+            let flags = if contrast { FLAG_CONTRAST } else { 0 };
+            let face = self.style_face(&self.doc.header.textstyle);
+            // $TEXTSIZE through the insert's scale is a label metres tall on
+            // a sheet whose title block is a scaled xref: on a layout it is
+            // held to a hundredth of the paper.
+            let mut height = self.doc.header.textsize;
+            if let Some(p) = self.sheet.paper {
+                let cap = (p[2] - p[0]).min(p[3] - p[1]) / 100.0;
+                height = height.min(cap / xf.scale_magnitude());
+            }
+            self.push_text_run(
+                file.clone(),
+                0.0,
+                0.0,
+                text::frame(height, 0.0, 1.0, 0.0),
+                text::HAlign::Left,
+                text::VAlign::Baseline,
+                &at,
+                rgba,
+                pack_attr(lid, lw, flags),
+                face,
+            );
+            return;
+        }
+
         // Block geometry is defined relative to the block's base point.
         let base = block.base_point;
         let local = xf.mul(&Affine {
@@ -2463,6 +3671,17 @@ impl<'a> Tessellator<'a> {
         if truncated {
             self.warnings.hatch_patterns_truncated =
                 self.warnings.hatch_patterns_truncated.saturating_add(1);
+            // Too dense to draw line by line: the region in the tone so many
+            // lines average out to, rather than some of them and a gap.
+            let alpha = ((rgba >> 24) as f64 * TRUNCATED_PATTERN_TONE).round() as u32;
+            let tone = (rgba & 0x00FF_FFFF) | (alpha << 24);
+            for t in fill::fill_region(&loops, island_style(h)).chunks(3) {
+                if t.len() == 3 {
+                    let [a, b, c] = [t[0], t[1], t[2]].map(|p| ctx.xf.apply(p[0], p[1]));
+                    self.scene.push_triangle(a, b, c, tone, attr);
+                }
+            }
+            return;
         }
 
         // Record the pattern's spacing so the renderer can fade these lines
@@ -2537,12 +3756,16 @@ fn spline_points(s: &crate::cad::Spline) -> Vec<[f64; 2]> {
     )
 }
 
+/// What "Default" stands for: AutoCAD's `LWDEFAULT`, 0.25 mm unless a user
+/// changed it, which is a setting of their AutoCAD, not of the drawing.
+const DEFAULT_LINEWEIGHT: u8 = 25;
+
 /// Resolve a lineweight to hundredths of a millimetre, 0 meaning hairline.
 fn lineweight_value(lw: LineWeight, inherited: u8) -> u8 {
     match lw {
         LineWeight::Value(v) if v > 0 => v.min(211) as u8,
         LineWeight::Value(_) => 0,
-        LineWeight::Default => 0,
+        LineWeight::Default => DEFAULT_LINEWEIGHT,
         LineWeight::ByLayer | LineWeight::ByBlock => inherited,
     }
 }
@@ -2650,8 +3873,11 @@ mod tests {
 
     #[test]
     fn a_minsert_asking_past_the_budget_is_drawn_up_to_it() {
-        // 160,000 rings of about seventy strokes: eleven million asked for.
-        let doc = minsert(400, 400);
+        // 810,000 cells of three rings of four arc strokes: 9.7 million
+        // asked for, under the cell cap.
+        let mut doc = minsert(900, 900);
+        let ring = doc.blocks[1].entities[0].clone();
+        doc.blocks[1].entities.extend([ring.clone(), ring]);
         let mut t = Tessellator::new(&doc);
         t.run();
         // Stopped between entities: over by one circle at most, and not short.
@@ -2715,6 +3941,81 @@ mod tests {
         t.scene
     }
 
+    fn fill_area(s: &Scene) -> f64 {
+        s.fills
+            .chunks(3)
+            .map(|t| {
+                ((t[1].x - t[0].x) * (t[2].y - t[0].y) - (t[2].x - t[0].x) * (t[1].y - t[0].y))
+                    .abs()
+                    / 2.0
+            })
+            .sum()
+    }
+
+    /// A polyline with width fills its band, constant width standing for
+    /// every vertex's; one without stays strokes.
+    #[test]
+    fn a_wide_polyline_is_a_filled_band() {
+        use crate::cad::{LwPolyline, LwVertex, Vec2};
+        let line = |w: f64| LwPolyline {
+            constant_width: w,
+            vertices: vec![
+                LwVertex {
+                    point: Vec2::new(0.0, 0.0),
+                    ..LwVertex::default()
+                },
+                LwVertex {
+                    point: Vec2::new(10.0, 0.0),
+                    ..LwVertex::default()
+                },
+            ],
+            ..LwPolyline::default()
+        };
+        let wide = tessellated(EntityKind::LwPolyline(line(2.0)));
+        // Only the band's four edges, which anti-alias it.
+        assert_eq!(wide.strokes.len(), 4);
+        assert!(
+            wide.strokes
+                .iter()
+                .all(|s| (s.attr >> 16) as u8 == super::super::scene::FILL_EDGE)
+        );
+        assert!(
+            (fill_area(&wide) - 20.0).abs() < 1e-9,
+            "{}",
+            fill_area(&wide)
+        );
+        let thin = tessellated(EntityKind::LwPolyline(line(0.0)));
+        assert_eq!((thin.strokes.len(), thin.fills.len()), (1, 0));
+    }
+
+    /// `$FILLMODE` 0 draws the band's edges instead.
+    #[test]
+    fn without_fillmode_a_wide_polyline_is_its_outline() {
+        use crate::cad::{LwPolyline, LwVertex, Vec2};
+        let mut doc = CadDrawing::default();
+        doc.header.fillmode = false;
+        let mut t = Tessellator::new(&doc);
+        t.tessellate_entity(&Entity {
+            kind: EntityKind::LwPolyline(LwPolyline {
+                constant_width: 2.0,
+                vertices: vec![
+                    LwVertex {
+                        point: Vec2::new(0.0, 0.0),
+                        ..LwVertex::default()
+                    },
+                    LwVertex {
+                        point: Vec2::new(10.0, 0.0),
+                        ..LwVertex::default()
+                    },
+                ],
+                ..LwPolyline::default()
+            }),
+            ..Entity::default()
+        });
+        assert!(t.scene.fills.is_empty());
+        assert_eq!(t.scene.strokes.len(), 4);
+    }
+
     /// TRACE is filled like SOLID, its corners in the same Z order.
     #[test]
     fn a_trace_is_filled_like_a_solid() {
@@ -2800,7 +4101,7 @@ mod tests {
     #[test]
     fn lineweight_resolution() {
         assert_eq!(lineweight_value(LineWeight::Value(50), 9), 50);
-        assert_eq!(lineweight_value(LineWeight::Default, 9), 0);
+        assert_eq!(lineweight_value(LineWeight::Default, 9), DEFAULT_LINEWEIGHT);
         assert_eq!(lineweight_value(LineWeight::ByLayer, 9), 9);
         assert_eq!(lineweight_value(LineWeight::ByBlock, 13), 13);
         // Out-of-range values clamp rather than wrapping through the u8 cast.
diff --git a/crates/exav-render/src/formats/dwg/text.rs b/crates/exav-render/src/formats/dwg/text.rs
index 26efbbe1..6196e7d0 100644
--- a/crates/exav-render/src/formats/dwg/text.rs
+++ b/crates/exav-render/src/formats/dwg/text.rs
@@ -39,10 +39,11 @@ pub enum VAlign {
 pub struct TextRun {
     pub x: f64,
     pub y: f64,
-    pub height: f64,
-    pub rotation: f64,
-    pub width_factor: f64,
-    pub oblique: f64,
+    /// One cap height of advance along the baseline, width factor applied.
+    pub u: [f64; 2],
+    /// One cap height up the glyphs, oblique applied. With `u`, it carries
+    /// rotation, mirroring and a block's non-uniform scale.
+    pub v: [f64; 2],
     pub rgba: u32,
     pub attr: u32,
     pub h_align: HAlign,
@@ -52,6 +53,101 @@ pub struct TextRun {
     pub face: super::font::Face,
     /// Position in the drawing's draw order.
     pub order: u32,
+    /// The clip region the run is drawn through, from 1 (`Scene::clips`),
+    /// or 0: a run that crosses a viewport's edge or an XCLIP boundary is
+    /// cut there by the renderer, which knows how wide it is.
+    pub clip: u16,
+}
+
+impl TextRun {
+    /// Cap height on the sheet.
+    pub fn height(&self) -> f64 {
+        self.v[0].hypot(self.v[1])
+    }
+
+    /// The longer of the frame's two units, for bounding what the run covers.
+    pub fn unit(&self) -> f64 {
+        self.u[0].hypot(self.u[1]).max(self.height())
+    }
+}
+
+/// A run's frame (`TextRun::u`, `TextRun::v`) from a height, a rotation, a
+/// width factor and an oblique angle (radians, leaning right).
+pub fn frame(height: f64, rotation: f64, width_factor: f64, oblique: f64) -> ([f64; 2], [f64; 2]) {
+    let (s, c) = rotation.sin_cos();
+    let height = if height > 0.0 { height } else { 1.0 };
+    let w = if width_factor > 0.0 {
+        width_factor
+    } else {
+        1.0
+    };
+    let t = if oblique.abs() < std::f64::consts::FRAC_PI_2 {
+        oblique.tan()
+    } else {
+        0.0
+    };
+    (
+        [c * height * w, s * height * w],
+        [(c * t - s) * height, (s * t + c) * height],
+    )
+}
+
+/// A TEXT's or ATTRIB's frame, mirrored as its generation flags say: 2
+/// backward (mirrored along the baseline), 4 upside down. A mirror turns the
+/// slant the other way too.
+pub fn generated_frame(
+    height: f64,
+    rotation: f64,
+    width_factor: f64,
+    oblique: f64,
+    generation: i16,
+) -> ([f64; 2], [f64; 2]) {
+    let backward = generation & 2 != 0;
+    let upside_down = generation & 4 != 0;
+    let lean = if backward != upside_down {
+        -oblique
+    } else {
+        oblique
+    };
+    let (mut u, mut v) = frame(height, rotation, width_factor, lean);
+    if backward {
+        u = [-u[0], -u[1]];
+    }
+    if upside_down {
+        v = [-v[0], -v[1]];
+    }
+    (u, v)
+}
+
+/// How far below the baseline a face's descenders reach, in cap heights:
+/// where Bottom alignment puts the baseline. The outline faces' are their
+/// OS/2 descenders over their cap heights; the stroke font stands in for
+/// SHX fonts, whose usual one (txt.shx: 2 below 6 above) is a third.
+pub fn descent(face: Face) -> f64 {
+    match face {
+        Face::Stroke => 1.0 / 3.0,
+        Face::TrueType(f) => match f.family {
+            super::font::Family::Sans => 434.0 / 1409.0,
+            super::font::Family::Serif => 442.0 / 1341.0,
+            super::font::Family::Mono => 615.0 / 1349.0,
+        },
+    }
+}
+
+/// Where the baseline sits from the anchor, in cap heights up: Bottom puts
+/// the descenders on it, Middle centres the capitals, Top their tops, and
+/// the Middle horizontal alignment (TEXT's MIDDLE, unlike Middle Center)
+/// centres capitals and descenders together.
+pub fn baseline_offset(h: HAlign, v: VAlign, face: Face) -> f64 {
+    if h == HAlign::Middle {
+        return -(1.0 - descent(face)) / 2.0;
+    }
+    match v {
+        VAlign::Baseline => 0.0,
+        VAlign::Bottom => descent(face),
+        VAlign::Middle => -0.5,
+        VAlign::Top => -1.0,
+    }
 }
 
 pub const TEXT_RECORD_BYTES: usize = 48;
@@ -224,6 +320,24 @@ pub fn decode_special(s: &str) -> String {
             // %%u, %%o and %%k toggle under/over/strike; we drop the styling.
             Some('u') | Some('U') | Some('o') | Some('O') | Some('k') | Some('K') => {}
             Some('%') => out.push('%'),
+            // %%nnn: the character of that number, three digits.
+            Some(d) if d.is_ascii_digit() => {
+                let mut code = d.to_digit(10).unwrap_or(0);
+                let mut digits = 1;
+                while digits < 3 {
+                    match chars.peek().and_then(|c| c.to_digit(10)) {
+                        Some(n) => {
+                            code = code * 10 + n;
+                            chars.next();
+                            digits += 1;
+                        }
+                        None => break,
+                    }
+                }
+                if let Some(c) = u8::try_from(code).ok().and_then(windows_1252) {
+                    out.push(c);
+                }
+            }
             Some(other) => {
                 out.push('%');
                 out.push('%');
@@ -235,11 +349,24 @@ pub fn decode_special(s: &str) -> String {
     out
 }
 
-/// Strip MTEXT inline formatting and split into lines.
-///
-/// Formatting is dropped rather than honoured: mixed fonts, per-run colour and
-/// stacked fractions are a documented gap. Stacked fractions degrade to `a/b`
-/// so the content survives even though the layout does not.
+/// A Windows-1252 byte as a character; None for a control character or
+/// one of the five the code page leaves out.
+fn windows_1252(b: u8) -> Option<char> {
+    const HIGH: [u16; 32] = [
+        0x20AC, 0, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0160, 0x2039,
+        0x0152, 0, 0x017D, 0, 0, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0x02DC,
+        0x2122, 0x0161, 0x203A, 0x0153, 0, 0x017E, 0x0178,
+    ];
+    match b {
+        0..=0x1F | 0x7F => None,
+        0x80..=0x9F => {
+            char::from_u32(u32::from(HIGH[usize::from(b - 0x80)])).filter(|&c| c != '\0')
+        }
+        _ => Some(char::from(b)),
+    }
+}
+
+/// MTEXT as plain lines: the formatting gone, a stack as `a/b`.
 pub fn mtext_lines(raw: &str) -> Vec<String> {
     mtext_spans(raw)
         .into_iter()
@@ -265,13 +392,35 @@ pub enum SpanHeight {
 ///
 /// The code is not documented by Autodesk; this follows the arguments the
 /// format is widely understood to use: `l` a left indent applying to every
-/// line, `i` an extra indent on the first line only, and `t` a list of tab
-/// stops. `q` justification and `x` line spacing are read and ignored.
+/// line, `i` an extra indent on the first line only, `t` a list of tab stops
+/// and `q` the justification. `x` line spacing is ignored.
 #[derive(Clone, Debug, PartialEq, Default)]
 pub struct Paragraph {
     pub indent: f64,
     pub first_indent: f64,
     pub tabs: Vec<f64>,
+    /// `q`: the lines aligned in the box this way rather than by the
+    /// attachment point (justified and distributed taken as left).
+    pub align: Option<HAlign>,
+}
+
+/// A stacked fraction from `\S`.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Stack {
+    pub upper: String,
+    pub lower: String,
+    pub kind: StackKind,
+}
+
+/// The character between a stack's parts.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum StackKind {
+    /// `/`: one above the other across a bar.
+    Fraction,
+    /// `#`: side by side across a slash.
+    Diagonal,
+    /// `^`: one above the other, no bar, left-aligned (tolerances).
+    Tolerance,
 }
 
 /// One laid-out line: its runs and the paragraph settings in force.
@@ -295,6 +444,14 @@ pub struct Span {
     pub underline: bool,
     pub overline: bool,
     pub strike: bool,
+    /// `\W`: a width factor in place of the style's.
+    pub width: Option<f64>,
+    /// `\Q`: an oblique angle (radians) in place of the style's.
+    pub oblique: Option<f64>,
+    /// `\T`: each character's advance times this.
+    pub tracking: Option<f64>,
+    /// `\S`: drawn as a stack; `text` holds it as `upper/lower`.
+    pub stack: Option<Stack>,
 }
 
 impl Default for Span {
@@ -307,6 +464,10 @@ impl Default for Span {
             underline: false,
             overline: false,
             strike: false,
+            width: None,
+            oblique: None,
+            tracking: None,
+            stack: None,
         }
     }
 }
@@ -319,6 +480,11 @@ impl Span {
             && self.underline == other.underline
             && self.overline == other.overline
             && self.strike == other.strike
+            && self.width == other.width
+            && self.oblique == other.oblique
+            && self.tracking == other.tracking
+            && self.stack.is_none()
+            && other.stack.is_none()
     }
 }
 
@@ -327,11 +493,10 @@ impl Span {
 /// Colour, height and the three rules (under, over, strike) are kept, since
 /// they change what the sheet says: a legend entry written in colour 30 and
 /// underlined is not the same as the body text around it. A font change picks
-/// which bundled face draws the run (DESIGN.md section 5.3), and paragraph
-/// indents and tabs are read; width, tracking, oblique and alignment codes are
-/// dropped.
-/// Stacked fractions degrade to `a/b` so the content survives even though the
-/// layout does not.
+/// which bundled face draws the run (DESIGN.md section 5.3); width factor,
+/// oblique and tracking style the runs; a stack is a span of its own;
+/// paragraph indents, tabs and justification are read. A run's vertical
+/// alignment (`\A`) is dropped.
 pub fn mtext_spans(raw: &str) -> Vec<Line> {
     let mut lines: Vec<Line> = vec![Line {
         first: true,
@@ -378,7 +543,9 @@ pub fn mtext_spans(raw: &str) -> Vec<Line> {
             '\\' => {
                 let Some(code) = chars.next() else { break };
                 match code {
-                    'P' => {
+                    // `\X` splits a dimension's text above and below its
+                    // line: a line break here.
+                    'P' | 'X' => {
                         // A new paragraph keeps the settings in force.
                         let paragraph = lines.last().unwrap().paragraph.clone();
                         lines.push(Line {
@@ -392,10 +559,34 @@ pub fn mtext_spans(raw: &str) -> Vec<Line> {
                     '{' => push_char(&mut lines, &style, '{'),
                     '}' => push_char(&mut lines, &style, '}'),
                     '~' => push_char(&mut lines, &style, '\u{00A0}'),
-                    // Stacked fraction: \S<upper>^<lower>; becomes upper/lower.
+                    // Stacked fraction: \S<upper>/<lower>; (or # or ^), a
+                    // span of its own.
                     'S' => {
-                        let body = argument(&mut chars).replacen(['^', '#'], "/", 1);
-                        push_str(&mut lines, &style, body.trim_end_matches('/'));
+                        let body = argument(&mut chars);
+                        let Some(at) = body.find(['/', '#', '^']) else {
+                            push_str(&mut lines, &style, &body);
+                            continue;
+                        };
+                        let kind = match &body[at..at + 1] {
+                            "#" => StackKind::Diagonal,
+                            "^" => StackKind::Tolerance,
+                            _ => StackKind::Fraction,
+                        };
+                        let (upper, lower) = (&body[..at], &body[at + 1..]);
+                        let text = if lower.is_empty() {
+                            upper.to_string()
+                        } else {
+                            format!("{upper}/{lower}")
+                        };
+                        lines.last_mut().unwrap().spans.push(Span {
+                            text,
+                            stack: Some(Stack {
+                                upper: upper.to_string(),
+                                lower: lower.to_string(),
+                                kind,
+                            }),
+                            ..style.clone()
+                        });
                     }
                     // Colour by index, and by true colour.
                     'C' => {
@@ -456,8 +647,23 @@ pub fn mtext_spans(raw: &str) -> Vec<Line> {
                         let body = argument(&mut chars);
                         style.face = Some(super::font::resolve_file(&body));
                     }
-                    // Settings that do not survive font substitution.
-                    'W' | 'Q' | 'A' | 'T' | 'h' => {
+                    // Width factor, oblique (degrees) and tracking.
+                    'W' | 'Q' | 'T' => {
+                        let body = argument(&mut chars);
+                        let n = body.trim().trim_end_matches(['x', 'X']).parse::<f64>().ok();
+                        let n = n.filter(|n| n.is_finite());
+                        match code {
+                            'W' => style.width = n.filter(|n| *n > 0.0).or(style.width),
+                            'Q' => {
+                                style.oblique = n
+                                    .map(|d| d.clamp(-85.0, 85.0).to_radians())
+                                    .or(style.oblique)
+                            }
+                            _ => style.tracking = n.map(|t| t.clamp(0.75, 4.0)).or(style.tracking),
+                        }
+                    }
+                    // A run's vertical alignment against taller ones.
+                    'A' | 'h' => {
                         argument(&mut chars);
                     }
                     // `\U+XXXX` is how a codepoint outside the drawing's code
@@ -499,6 +705,10 @@ pub fn mtext_spans(raw: &str) -> Vec<Line> {
     for line in &mut lines {
         for span in line.spans.iter_mut() {
             span.text = decode_special(&span.text);
+            if let Some(s) = &mut span.stack {
+                s.upper = decode_special(&s.upper);
+                s.lower = decode_special(&s.lower);
+            }
         }
         line.spans.retain(|s| !s.text.is_empty());
     }
@@ -507,9 +717,9 @@ pub fn mtext_spans(raw: &str) -> Vec<Line> {
 
 /// Read an MTEXT `\p` argument list: `xi-3,l4,t4` and the like.
 ///
-/// Values are in drawing units. A leading `x` and the `q` justification letter
-/// are consumed and ignored; anything unrecognised is skipped rather than
-/// guessed at, since the code is not documented by Autodesk.
+/// Values are in drawing units. A leading `x` is consumed and ignored;
+/// anything unrecognised is skipped rather than guessed at, since the code is
+/// not documented by Autodesk.
 fn parse_paragraph(body: &str) -> Paragraph {
     let mut p = Paragraph::default();
     for part in body.trim_start_matches(['x', 'X']).split(',') {
@@ -521,13 +731,21 @@ fn parse_paragraph(body: &str) -> Paragraph {
         match key {
             'i' => p.first_indent = value.parse().unwrap_or(0.0),
             'l' => p.indent = value.parse().unwrap_or(0.0),
+            'q' => {
+                p.align = match value {
+                    "c" => Some(HAlign::Center),
+                    "r" => Some(HAlign::Right),
+                    "l" | "j" | "d" => Some(HAlign::Left),
+                    _ => None,
+                }
+            }
             't' => {
                 // Each stop can carry a trailing alignment letter.
                 let number = value.trim_end_matches(|c: char| c.is_ascii_alphabetic());
-                if let Ok(v) = number.parse::<f64>() {
-                    if v.is_finite() {
-                        p.tabs.push(v);
-                    }
+                if let Ok(v) = number.parse::<f64>()
+                    && v.is_finite()
+                {
+                    p.tabs.push(v);
                 }
             }
             _ => {}
@@ -561,7 +779,7 @@ pub fn mtext_layout(attachment: u8, line_count: usize, height: f64, spacing: f64
 /// Serialise runs into the wire format: fixed records plus a UTF-8 string blob.
 ///
 /// Record layout, little-endian, `TEXT_RECORD_BYTES` each:
-/// `f32 x, y, height, rotation, widthFactor, oblique | u32 rgba, attr, strOffset | u16 strLen | u8 hAlign, vAlign | u32 order | u8 face | 3 bytes padding`
+/// `f32 x, y, ux, uy, vx, vy | u32 rgba, attr, strOffset | u16 strLen | u8 hAlign, vAlign | u32 order | u8 face | u8 padding | u16 clip`
 pub fn encode(runs: &[TextRun], origin: [f64; 2]) -> (Vec<u8>, Vec<u8>) {
     let mut records = Vec::with_capacity(runs.len() * TEXT_RECORD_BYTES);
     let mut blob: Vec<u8> = Vec::new();
@@ -579,10 +797,9 @@ pub fn encode(runs: &[TextRun], origin: [f64; 2]) -> (Vec<u8>, Vec<u8>) {
 
         records.extend_from_slice(&((r.x - origin[0]) as f32).to_le_bytes());
         records.extend_from_slice(&((r.y - origin[1]) as f32).to_le_bytes());
-        records.extend_from_slice(&(r.height as f32).to_le_bytes());
-        records.extend_from_slice(&(r.rotation as f32).to_le_bytes());
-        records.extend_from_slice(&(r.width_factor as f32).to_le_bytes());
-        records.extend_from_slice(&(r.oblique as f32).to_le_bytes());
+        for c in [r.u[0], r.u[1], r.v[0], r.v[1]] {
+            records.extend_from_slice(&(c as f32).to_le_bytes());
+        }
         records.extend_from_slice(&r.rgba.to_le_bytes());
         records.extend_from_slice(&r.attr.to_le_bytes());
         records.extend_from_slice(&offset.to_le_bytes());
@@ -591,7 +808,8 @@ pub fn encode(runs: &[TextRun], origin: [f64; 2]) -> (Vec<u8>, Vec<u8>) {
         records.push(r.v_align as u8);
         records.extend_from_slice(&r.order.to_le_bytes());
         records.push(r.face.to_byte());
-        records.extend_from_slice(&[0, 0, 0]);
+        records.push(0);
+        records.extend_from_slice(&r.clip.to_le_bytes());
     }
 
     debug_assert_eq!(records.len(), runs.len() * TEXT_RECORD_BYTES);
@@ -703,11 +921,55 @@ mod spans {
 
     #[test]
     fn an_unreadable_paragraph_code_leaves_the_defaults() {
-        let line = one_line("\\pqc;a");
+        let line = one_line("\\pz9,qy;a");
         assert_eq!(line.paragraph, Paragraph::default());
         assert_eq!(line.spans[0].text, "a");
     }
 
+    #[test]
+    fn a_paragraph_says_how_its_lines_align() {
+        assert_eq!(one_line("\\pxqc;a").paragraph.align, Some(HAlign::Center));
+        assert_eq!(one_line("\\pxqr;a").paragraph.align, Some(HAlign::Right));
+        assert_eq!(one_line("\\pxqj;a").paragraph.align, Some(HAlign::Left));
+    }
+
+    #[test]
+    fn width_oblique_and_tracking_style_the_runs_they_open() {
+        let spans = one(r"{\T2;tracked} {\W0.5;half} {\Q20;slant}");
+        let get = |t: &str| spans.iter().find(|s| s.text == t).unwrap().clone();
+        assert_eq!(get("tracked").tracking, Some(2.0));
+        assert_eq!(get("half").width, Some(0.5));
+        assert!((get("slant").oblique.unwrap() - 20f64.to_radians()).abs() < 1e-12);
+        assert_eq!(get(" ").width, None);
+    }
+
+    #[test]
+    fn a_stack_is_a_span_of_its_own() {
+        let spans = one(r"1\S1/2;in \S+0.1^-0.2;\S3#4;");
+        let stacks: Vec<_> = spans.iter().filter_map(|s| s.stack.clone()).collect();
+        assert_eq!(
+            stacks,
+            vec![
+                Stack {
+                    upper: "1".into(),
+                    lower: "2".into(),
+                    kind: StackKind::Fraction
+                },
+                Stack {
+                    upper: "+0.1".into(),
+                    lower: "-0.2".into(),
+                    kind: StackKind::Tolerance
+                },
+                Stack {
+                    upper: "3".into(),
+                    lower: "4".into(),
+                    kind: StackKind::Diagonal
+                },
+            ]
+        );
+        assert_eq!(spans[0].text, "1");
+    }
+
     #[test]
     fn paragraph_settings_carry_to_the_next_line() {
         let lines = mtext_spans("\\pl4;first\\Psecond");
@@ -916,6 +1178,19 @@ mod tests {
         assert_eq!(decode_special("100% done"), "100% done");
     }
 
+    #[test]
+    fn a_percent_number_is_that_character() {
+        assert_eq!(decode_special("%%176 %%065%%0661"), "° AB1");
+        assert_eq!(decode_special("%%128"), "€");
+        // A control character, or none at all, draws nothing.
+        assert_eq!(decode_special("a%%009b%%999c"), "abc");
+    }
+
+    #[test]
+    fn mtext_x_breaks_the_line() {
+        assert_eq!(mtext_lines(r"above\Xbelow"), vec!["above", "below"]);
+    }
+
     #[test]
     fn mtext_splits_on_paragraph_marks() {
         assert_eq!(mtext_lines(r"one\Ptwo\Pthree"), vec!["one", "two", "three"]);
@@ -1019,10 +1294,8 @@ mod tests {
             TextRun {
                 x: 10.0,
                 y: 20.0,
-                height: 2.5,
-                rotation: 0.0,
-                width_factor: 1.0,
-                oblique: 0.0,
+                u: [2.5, 0.0],
+                v: [0.0, 2.5],
                 rgba: 0xFF00FF00,
                 attr: 7,
                 h_align: HAlign::Center,
@@ -1030,14 +1303,13 @@ mod tests {
                 text: "Chambre 1".into(),
                 face: Face::default(),
                 order: 1,
+                clip: 0,
             },
             TextRun {
                 x: 0.0,
                 y: 0.0,
-                height: 1.0,
-                rotation: 0.0,
-                width_factor: 1.0,
-                oblique: 0.0,
+                u: [-0.5, 0.0],
+                v: [0.25, -1.0],
                 rgba: 0,
                 attr: 0,
                 h_align: HAlign::Left,
@@ -1045,6 +1317,7 @@ mod tests {
                 text: "aménagée".into(),
                 face: Face::default(),
                 order: 2,
+                clip: 3,
             },
         ];
         let (rec, blob) = encode(&runs, [0.0, 0.0]);
@@ -1068,6 +1341,15 @@ mod tests {
         );
         assert_eq!(rec[TEXT_RECORD_BYTES + 38], HAlign::Left as u8);
         assert_eq!(rec[TEXT_RECORD_BYTES + 39], VAlign::Baseline as u8);
+        // The frame after the anchor: a mirrored, slanted one survives.
+        let f = |at: usize| f32::from_le_bytes(rec[at..at + 4].try_into().unwrap());
+        let at = TEXT_RECORD_BYTES + 8;
+        assert_eq!(
+            [f(at), f(at + 4), f(at + 8), f(at + 12)],
+            [-0.5, 0.0, 0.25, -1.0]
+        );
+        // The clip region last, little-endian.
+        assert_eq!(rec[TEXT_RECORD_BYTES + 46..TEXT_RECORD_BYTES + 48], [3, 0]);
     }
 
     #[test]
@@ -1075,10 +1357,8 @@ mod tests {
         let runs = vec![TextRun {
             x: 6_500_000.0,
             y: 100.0,
-            height: 1.0,
-            rotation: 0.0,
-            width_factor: 1.0,
-            oblique: 0.0,
+            u: [1.0, 0.0],
+            v: [0.0, 1.0],
             rgba: 0,
             attr: 0,
             h_align: HAlign::Left,
@@ -1086,6 +1366,7 @@ mod tests {
             text: "x".into(),
             face: Face::default(),
             order: 1,
+            clip: 0,
         }];
         let (rec, _) = encode(&runs, [6_500_000.0, 0.0]);
         let x = f32::from_le_bytes(rec[0..4].try_into().unwrap());
diff --git a/crates/exav-render/src/formats/dwg/tiles.rs b/crates/exav-render/src/formats/dwg/tiles.rs
index 7b94a1c6..b65c47e4 100644
--- a/crates/exav-render/src/formats/dwg/tiles.rs
+++ b/crates/exav-render/src/formats/dwg/tiles.rs
@@ -13,11 +13,9 @@
 //!    `order` and is resolved by the depth buffer rather than by the sequence
 //!    of draw calls. This is what makes spatial sorting possible at all.
 //! 2. **Opaque geometry must still be drawn before any translucent geometry**,
-//!    globally, not per bucket. The opaque pass writes depth and the
-//!    translucent pass only tests it; interleaving them by bucket would let a
-//!    later bucket's opaque geometry paint over an earlier bucket's
-//!    translucent. So the buffer is partitioned first and bucketed within each
-//!    half, and the renderer keeps its two passes.
+//!    globally, not per bucket: blending needs what lies behind already
+//!    drawn. So the buffer is partitioned first and only the opaque half is
+//!    bucketed; the translucent half keeps draw order (`scene.rs`).
 //! 3. **A bucket's contents can reach outside it.** A long line belongs to one
 //!    bucket but crosses many, so each bucket records the true bounding box of
 //!    what it holds rather than its own grid square. The renderer tests that.
diff --git a/crates/exav-render/src/formats/dwg/wide.rs b/crates/exav-render/src/formats/dwg/wide.rs
new file mode 100644
index 00000000..e8f96fbc
--- /dev/null
+++ b/crates/exav-render/src/formats/dwg/wide.rs
@@ -0,0 +1,277 @@
+//! Polylines with width, drawn as AutoCAD draws them: a filled band whose
+//! width runs from each vertex's start width to its end width, along straight
+//! and bulged segments alike, mitred where two segments meet. A DONUT is such
+//! a polyline: two half-turn bulges with a width.
+
+use super::curves;
+
+/// One vertex of an LWPOLYLINE or a 2D POLYLINE, in its own coordinates.
+#[derive(Clone, Copy, Debug)]
+pub struct WideVertex {
+    pub p: [f64; 2],
+    pub bulge: f64,
+    /// Width at this vertex and at the next one, for the segment it starts.
+    pub start_width: f64,
+    pub end_width: f64,
+}
+
+/// What a wide polyline draws.
+#[derive(Default)]
+pub struct Band {
+    pub triangles: Vec<[[f64; 2]; 3]>,
+    /// Each segment's outline, for `$FILLMODE` 0, which draws wide polylines
+    /// as their edges.
+    pub outlines: Vec<Vec<[f64; 2]>>,
+    /// The segments without width, as point runs drawn as ordinary lines.
+    pub thin: Vec<Vec<[f64; 2]>>,
+}
+
+/// A miter longer than this many half widths is cut back to a bevel: a
+/// segment doubling back on itself would otherwise spike to infinity.
+const MITER_LIMIT: f64 = 8.0;
+
+/// A segment's cross sections: a centre point, its unit tangent and the
+/// half width there, from its start to its end.
+struct Segment {
+    sections: Vec<([f64; 2], [f64; 2], f64)>,
+    wide: bool,
+}
+
+fn normalize(v: [f64; 2]) -> Option<[f64; 2]> {
+    let l = v[0].hypot(v[1]);
+    (l > 1e-12 && l.is_finite()).then(|| [v[0] / l, v[1] / l])
+}
+
+fn rotate(v: [f64; 2], a: f64) -> [f64; 2] {
+    let (s, c) = a.sin_cos();
+    [v[0] * c - v[1] * s, v[0] * s + v[1] * c]
+}
+
+fn segment(a: WideVertex, b: [f64; 2]) -> Option<Segment> {
+    let chord = normalize([b[0] - a.p[0], b[1] - a.p[1]])?;
+    let (w0, w1) = (a.start_width.max(0.0), a.end_width.max(0.0));
+    let wide = w0 > 0.0 || w1 > 0.0;
+    let mut sections = Vec::new();
+    if a.bulge.abs() < 1e-12 || !a.bulge.is_finite() {
+        sections.push((a.p, chord, w0 / 2.0));
+        sections.push((b, chord, w1 / 2.0));
+    } else {
+        // flatten_bulge samples the arc evenly by angle, so a sample's share
+        // of the sweep is its share of the length: the width runs with it,
+        // and the tangent turns from the chord's minus half the sweep to its
+        // plus half.
+        let theta = 4.0 * a.bulge.atan();
+        let mut pts = vec![a.p];
+        pts.extend(curves::flatten_bulge(a.p, b, a.bulge));
+        let n = (pts.len() - 1) as f64;
+        for (k, p) in pts.into_iter().enumerate() {
+            let f = k as f64 / n;
+            let t = rotate(chord, theta * (f - 0.5));
+            sections.push((p, t, (w0 + (w1 - w0) * f) / 2.0));
+        }
+    }
+    Some(Segment { sections, wide })
+}
+
+fn left(t: [f64; 2]) -> [f64; 2] {
+    [-t[1], t[0]]
+}
+
+fn offset(p: [f64; 2], t: [f64; 2], d: f64) -> [f64; 2] {
+    let n = left(t);
+    [p[0] + n[0] * d, p[1] + n[1] * d]
+}
+
+/// Where the edge `p + s*ta` (offset `da` to the left) meets the edge
+/// `p + s*tb` (offset `db`), within the miter limit.
+fn miter(p: [f64; 2], ta: [f64; 2], da: f64, tb: [f64; 2], db: f64) -> Option<[f64; 2]> {
+    let a = offset(p, ta, da);
+    let b = offset(p, tb, db);
+    let cross = ta[0] * tb[1] - ta[1] * tb[0];
+    if cross.abs() < 1e-9 {
+        return None;
+    }
+    let s = ((b[0] - a[0]) * tb[1] - (b[1] - a[1]) * tb[0]) / cross;
+    let m = [a[0] + ta[0] * s, a[1] + ta[1] * s];
+    let reach = (m[0] - p[0]).hypot(m[1] - p[1]);
+    (reach <= MITER_LIMIT * da.abs().max(db.abs())).then_some(m)
+}
+
+/// The band of a polyline whose vertices carry widths.
+pub fn band(verts: &[WideVertex], closed: bool) -> Band {
+    let mut out = Band::default();
+    if verts.len() < 2 {
+        return out;
+    }
+    let count = if closed { verts.len() } else { verts.len() - 1 };
+    let mut segments: Vec<Segment> = Vec::new();
+    for i in 0..count {
+        let b = verts[(i + 1) % verts.len()].p;
+        if let Some(s) = segment(verts[i], b) {
+            segments.push(s);
+        }
+    }
+    // Each section's two edge points, before the joints move the ends.
+    let mut edges: Vec<Vec<([f64; 2], [f64; 2])>> = segments
+        .iter()
+        .map(|s| {
+            s.sections
+                .iter()
+                .map(|&(p, t, h)| (offset(p, t, h), offset(p, t, -h)))
+                .collect()
+        })
+        .collect();
+    // Mitre each joint between two wide segments: the end of one and the
+    // start of the next move to where their edges cross.
+    let joints = if closed {
+        segments.len()
+    } else {
+        segments.len().saturating_sub(1)
+    };
+    for j in 0..joints {
+        let (ia, ib) = (j, (j + 1) % segments.len());
+        if ia == ib || !segments[ia].wide || !segments[ib].wide {
+            continue;
+        }
+        let &(p, ta, ha) = segments[ia].sections.last().expect("two sections");
+        let &(_, tb, hb) = &segments[ib].sections[0];
+        let (Some(l), Some(r)) = (miter(p, ta, ha, tb, hb), miter(p, ta, -ha, tb, -hb)) else {
+            continue;
+        };
+        *edges[ia].last_mut().expect("two sections") = (l, r);
+        edges[ib][0] = (l, r);
+    }
+
+    for (s, e) in segments.iter().zip(&edges) {
+        if !s.wide {
+            out.thin
+                .push(s.sections.iter().map(|&(p, _, _)| p).collect());
+            continue;
+        }
+        for &[(l0, r0), (l1, r1)] in e.array_windows() {
+            out.triangles.push([l0, r0, l1]);
+            out.triangles.push([r0, r1, l1]);
+        }
+        let mut outline: Vec<[f64; 2]> = e.iter().map(|&(l, _)| l).collect();
+        outline.extend(e.iter().rev().map(|&(_, r)| r));
+        out.outlines.push(outline);
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn area(t: &[[[f64; 2]; 3]]) -> f64 {
+        t.iter()
+            .map(|[a, b, c]| {
+                ((b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1])).abs() / 2.0
+            })
+            .sum()
+    }
+
+    fn v(x: f64, y: f64, bulge: f64, w0: f64, w1: f64) -> WideVertex {
+        WideVertex {
+            p: [x, y],
+            bulge,
+            start_width: w0,
+            end_width: w1,
+        }
+    }
+
+    #[test]
+    fn a_straight_segment_is_its_length_by_its_width() {
+        let b = band(
+            &[v(0.0, 0.0, 0.0, 2.0, 2.0), v(10.0, 0.0, 0.0, 0.0, 0.0)],
+            false,
+        );
+        assert!(
+            (area(&b.triangles) - 20.0).abs() < 1e-9,
+            "{}",
+            area(&b.triangles)
+        );
+        assert!(b.thin.is_empty());
+    }
+
+    #[test]
+    fn a_taper_to_a_point_is_half_the_rectangle() {
+        let b = band(
+            &[v(0.0, 0.0, 0.0, 4.0, 0.0), v(10.0, 0.0, 0.0, 0.0, 0.0)],
+            false,
+        );
+        assert!(
+            (area(&b.triangles) - 20.0).abs() < 1e-9,
+            "{}",
+            area(&b.triangles)
+        );
+    }
+
+    #[test]
+    fn a_donut_is_its_annulus() {
+        // DONUT 8 inside, 12 outside: two half turns of radius 5, width 2.
+        let b = band(
+            &[v(-5.0, 0.0, 1.0, 2.0, 2.0), v(5.0, 0.0, 1.0, 2.0, 2.0)],
+            true,
+        );
+        let annulus = std::f64::consts::PI * (6.0f64.powi(2) - 4.0f64.powi(2));
+        let a = area(&b.triangles);
+        assert!((a / annulus - 1.0).abs() < 0.01, "{a} vs {annulus}");
+    }
+
+    #[test]
+    fn a_right_angle_is_mitred_without_a_notch_or_an_overlap() {
+        // An L, width 2: the arms' area plus the corner square, once.
+        let b = band(
+            &[
+                v(0.0, 0.0, 0.0, 2.0, 2.0),
+                v(10.0, 0.0, 0.0, 2.0, 2.0),
+                v(10.0, 10.0, 0.0, 0.0, 0.0),
+            ],
+            false,
+        );
+        let expected = 10.0 * 2.0 * 2.0;
+        let a = area(&b.triangles);
+        assert!((a - expected).abs() < 1e-9, "{a} vs {expected}");
+        // The outer corner reaches (11, -1).
+        assert!(
+            b.triangles
+                .iter()
+                .flatten()
+                .any(|p| (p[0] - 11.0).abs() < 1e-9 && (p[1] + 1.0).abs() < 1e-9)
+        );
+    }
+
+    #[test]
+    fn segments_without_width_stay_lines() {
+        let b = band(
+            &[
+                v(0.0, 0.0, 0.0, 0.0, 0.0),
+                v(5.0, 0.0, 0.0, 1.0, 1.0),
+                v(10.0, 0.0, 0.0, 0.0, 0.0),
+            ],
+            false,
+        );
+        assert_eq!(b.thin.len(), 1);
+        assert!((area(&b.triangles) - 5.0).abs() < 1e-9);
+    }
+
+    #[test]
+    fn a_hairpin_turn_is_cut_back_rather_than_spiking() {
+        let b = band(
+            &[
+                v(0.0, 0.0, 0.0, 1.0, 1.0),
+                v(10.0, 0.0, 0.0, 1.0, 1.0),
+                v(0.0, 0.01, 0.0, 0.0, 0.0),
+            ],
+            false,
+        );
+        let far = b
+            .triangles
+            .iter()
+            .flatten()
+            .map(|p| p[0])
+            .fold(f64::MIN, f64::max);
+        assert!(far < 11.0, "{far}");
+    }
+}
diff --git a/crates/exav-render/src/formats/gltf.rs b/crates/exav-render/src/formats/gltf.rs
new file mode 100644
index 00000000..0919bb44
--- /dev/null
+++ b/crates/exav-render/src/formats/gltf.rs
@@ -0,0 +1,972 @@
+//! glTF 2.0, `.gltf` and `.glb`, into a [`Scene`] with one element per
+//! node that has a mesh.
+//!
+//! Read: the scene's node tree with its transforms (`matrix`, or
+//! `translation`, `rotation` and `scale`), the meshes' triangle primitives
+//! with their `POSITION`, `NORMAL`, `COLOR_0` and indices (8, 16 or 32 bits),
+//! positions and normals as floats or as small integers (what
+//! `KHR_mesh_quantization` says the node's scale restores), sparse accessors, and the material's `baseColorFactor`, which with
+//! `COLOR_0` colours the vertices. Coordinates are returned as written: glTF
+//! is Y up, in metres.
+//!
+//! Ignored: textures, animations, skins, morph targets, cameras, lights, the
+//! alpha of a colour, and every extension. Primitives drawn as points, lines,
+//! strips or fans, or compressed (`KHR_draco_mesh_compression`,
+//! `EXT_meshopt_compression`), are counted in `warnings.unsupported`. A
+//! primitive whose accessors do not fit the buffers is dropped and counted
+//! in `warnings.invalid`.
+//!
+//! Nothing is fetched: a buffer behind a URI other than a base64 `data:` one
+//! is [`Error::External`] if a mesh needs it. The scene's nodes must form a
+//! forest, no deeper than [`MAX_DEPTH`]; a node with two parents or a cycle
+//! is refused. The work is bounded: triangles looked at, instances of a
+//! mesh included, are limited to a multiple of the triangle budget.
+
+mod json;
+
+use std::borrow::Cow;
+use std::collections::{BTreeMap, HashMap};
+use std::fmt;
+use std::rc::Rc;
+
+use json::Value;
+
+use super::mesh::Scene;
+use super::soup::{Corner, Soup};
+
+/// Why a file was not read.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Error {
+    /// Neither a glTF document nor a GLB container.
+    NotGltf,
+    /// Damaged or inconsistent.
+    Invalid(&'static str),
+    /// A glTF this reader does not read (a version, a compression).
+    Unsupported(&'static str),
+    /// A mesh's data is in a file or at an address, and nothing is fetched.
+    External,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotGltf => f.write_str("not a glTF file"),
+            Error::Invalid(what) => write!(f, "invalid glTF file: {what}"),
+            Error::Unsupported(what) => write!(f, "unsupported glTF file: {what}"),
+            Error::External => f.write_str("the glTF file references external files"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+/// Levels of nodes below the scene's roots.
+pub const MAX_DEPTH: usize = 256;
+
+/// Elements of an accessor that has no bytes of its own to bound it.
+const MAX_ZERO_COUNT: usize = 1 << 22;
+
+/// Most triangles looked at, for each of the budget's, and in all.
+const WORK_FACTOR: u64 = 4;
+const WORK_CAP: u64 = 1 << 26;
+const WORK_MIN: u64 = 1 << 20;
+
+/// A 4x4 matrix, column-major as glTF writes it.
+type Mat = [f64; 16];
+
+const IDENTITY: Mat = [
+    1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
+];
+
+fn mul(a: &Mat, b: &Mat) -> Mat {
+    let mut m = [0.0; 16];
+    for col in 0..4 {
+        for row in 0..4 {
+            m[col * 4 + row] = (0..4).map(|k| a[k * 4 + row] * b[col * 4 + k]).sum();
+        }
+    }
+    m
+}
+
+fn apply(m: &Mat, p: [f64; 3]) -> [f64; 3] {
+    [
+        m[0] * p[0] + m[4] * p[1] + m[8] * p[2] + m[12],
+        m[1] * p[0] + m[5] * p[1] + m[9] * p[2] + m[13],
+        m[2] * p[0] + m[6] * p[1] + m[10] * p[2] + m[14],
+    ]
+}
+
+/// The transpose of the inverse of the matrix's upper 3x3, row-major: the
+/// cofactors over the determinant, which keep the sign a mirror flips.
+fn normal_matrix(m: &Mat, det: f64) -> [f64; 9] {
+    let a = |r: usize, c: usize| m[c * 4 + r];
+    [
+        a(1, 1) * a(2, 2) - a(1, 2) * a(2, 1),
+        a(1, 2) * a(2, 0) - a(1, 0) * a(2, 2),
+        a(1, 0) * a(2, 1) - a(1, 1) * a(2, 0),
+        a(0, 2) * a(2, 1) - a(0, 1) * a(2, 2),
+        a(0, 0) * a(2, 2) - a(0, 2) * a(2, 0),
+        a(0, 1) * a(2, 0) - a(0, 0) * a(2, 1),
+        a(0, 1) * a(1, 2) - a(0, 2) * a(1, 1),
+        a(0, 2) * a(1, 0) - a(0, 0) * a(1, 2),
+        a(0, 0) * a(1, 1) - a(0, 1) * a(1, 0),
+    ]
+    .map(|v| v / det)
+}
+
+fn rotate(n: &[f64; 9], v: [f64; 3]) -> [f64; 3] {
+    [
+        n[0] * v[0] + n[1] * v[1] + n[2] * v[2],
+        n[3] * v[0] + n[4] * v[1] + n[5] * v[2],
+        n[6] * v[0] + n[7] * v[1] + n[8] * v[2],
+    ]
+}
+
+/// A linear component as an sRGB byte.
+fn srgb(v: f32) -> u8 {
+    let v = f64::from(v.clamp(0.0, 1.0));
+    let s = if v <= 0.003_130_8 {
+        12.92 * v
+    } else {
+        1.055 * v.powf(1.0 / 2.4) - 0.055
+    };
+    (s * 255.0).round() as u8
+}
+
+/// Reads at most `max_triangles`; past them the rest is left out and
+/// `warnings.truncated` is 1.
+pub fn read(bytes: &[u8], max_triangles: usize) -> Result<Scene, Error> {
+    read_with(bytes, max_triangles, &[])
+}
+
+/// The JSON of a document and the binary chunk of a GLB file.
+fn document(bytes: &[u8]) -> Result<(Value, Option<&[u8]>), Error> {
+    let (json_bytes, bin) = if bytes.starts_with(b"glTF") {
+        container(bytes)?
+    } else {
+        (bytes, None)
+    };
+    // A chunk may be padded with zeros.
+    let end = json_bytes
+        .iter()
+        .rposition(|&b| b != 0)
+        .map_or(0, |i| i + 1);
+    let json_bytes = &json_bytes[..end];
+    if !json_bytes
+        .iter()
+        .find(|b| !b.is_ascii_whitespace())
+        .is_some_and(|&b| b == b'{' || b == 0xEF)
+    {
+        return Err(Error::NotGltf);
+    }
+    let root = json::parse(json_bytes).map_err(|_| Error::NotGltf)?;
+    let version = root
+        .get("asset")
+        .and_then(|a| a.get("version"))
+        .and_then(Value::str)
+        .ok_or(Error::NotGltf)?;
+    if !version.starts_with("2.") {
+        return Err(Error::Unsupported("version"));
+    }
+    Ok((root, bin))
+}
+
+/// The files the document's buffers are in, as the document writes them (a
+/// relative URI, percent-encoded), in the order of the buffers: those with a
+/// URI that is not a `data:` one. [`read_with`] is given what they hold.
+pub fn external_buffers(bytes: &[u8]) -> Result<Vec<String>, Error> {
+    let (root, _) = document(bytes)?;
+    Ok(root
+        .get("buffers")
+        .map_or(&[][..], Value::array)
+        .iter()
+        .filter_map(|b| b.get("uri").and_then(Value::str))
+        .filter(|u| !u.starts_with("data:"))
+        .map(str::to_string)
+        .collect())
+}
+
+/// [`read`], with the contents of buffer files: each `(uri, bytes)` is
+/// the buffer whose `uri` is that, as written.
+pub fn read_with(
+    bytes: &[u8],
+    max_triangles: usize,
+    files: &[(&str, &[u8])],
+) -> Result<Scene, Error> {
+    let (root, bin) = document(bytes)?;
+    let mut doc = Doc {
+        buffers: buffers(&root, bin, files)?,
+        root: &root,
+        floats: HashMap::new(),
+        indices: HashMap::new(),
+        soup: Soup::new(max_triangles),
+        unsupported: BTreeMap::new(),
+        done: false,
+        work: 0,
+        max_work: (max_triangles as u64)
+            .saturating_mul(WORK_FACTOR)
+            .clamp(WORK_MIN, WORK_CAP),
+    };
+    doc.walk()?;
+    let invalid = doc.soup.invalid;
+    let triangles = doc.soup.triangles();
+    let unsupported = std::mem::take(&mut doc.unsupported);
+    let mut scene = doc.soup.finish();
+    if triangles == 0 && invalid > 0 && scene.warnings.truncated == 0 {
+        return Err(Error::Invalid("no mesh can be drawn"));
+    }
+    scene.warnings.unsupported = unsupported;
+    Ok(scene)
+}
+
+/// The JSON and the first binary chunk of a GLB file.
+fn container(bytes: &[u8]) -> Result<(&[u8], Option<&[u8]>), Error> {
+    let word = |at: usize| -> Option<u32> {
+        let b = bytes.get(at..at.checked_add(4)?)?;
+        Some(u32::from_le_bytes(b.try_into().ok()?))
+    };
+    if word(4) != Some(2) {
+        return Err(Error::Unsupported("GLB version"));
+    }
+    let length = word(8).ok_or(Error::Invalid("GLB header"))? as usize;
+    if length < 12 || length > bytes.len() {
+        return Err(Error::Invalid("GLB length"));
+    }
+    let (mut json, mut bin) = (None, None);
+    let mut at = 12usize;
+    while at < length {
+        if at + 8 > length {
+            return Err(Error::Invalid("GLB chunk"));
+        }
+        let size = word(at).ok_or(Error::Invalid("GLB chunk"))? as usize;
+        let kind = word(at + 4).ok_or(Error::Invalid("GLB chunk"))?;
+        let start = at + 8;
+        let end = start
+            .checked_add(size)
+            .filter(|&e| e <= length)
+            .ok_or(Error::Invalid("GLB chunk length"))?;
+        let data = &bytes[start..end];
+        match kind {
+            0x4E4F_534A if json.is_none() => json = Some(data),
+            0x004E_4942 if bin.is_none() && json.is_some() => bin = Some(data),
+            _ => {}
+        }
+        // A chunk's length includes its padding to four bytes. Some writers
+        // leave the padding out of the length, or out of the file; the next
+        // chunk is where one starts that is a JSON or binary chunk.
+        let padded = end
+            .checked_add(3)
+            .ok_or(Error::Invalid("GLB chunk length"))?
+            & !3;
+        let starts_chunk = |p: usize| {
+            matches!(
+                (word(p), word(p + 4)),
+                (Some(n), Some(0x4E4F_534A | 0x004E_4942))
+                    if p.saturating_add(8).saturating_add(n as usize) <= length
+            )
+        };
+        at = if padded != end && !starts_chunk(padded) && starts_chunk(end) {
+            end
+        } else {
+            padded
+        };
+    }
+    Ok((json.ok_or(Error::Invalid("GLB without JSON"))?, bin))
+}
+
+enum Buffer<'a> {
+    Data(Cow<'a, [u8]>),
+    /// A URI that is not a `data:` one, or no data at all.
+    External,
+}
+
+fn buffers<'a>(
+    root: &Value,
+    bin: Option<&'a [u8]>,
+    files: &[(&str, &'a [u8])],
+) -> Result<Vec<Buffer<'a>>, Error> {
+    let mut out = Vec::new();
+    for (i, b) in root
+        .get("buffers")
+        .map_or(&[][..], Value::array)
+        .iter()
+        .enumerate()
+    {
+        let length = b
+            .get("byteLength")
+            .and_then(Value::usize)
+            .ok_or(Error::Invalid("buffer length"))?;
+        let file = b
+            .get("uri")
+            .and_then(Value::str)
+            .and_then(|u| files.iter().find(|(f, _)| *f == u))
+            .map(|(_, d)| *d);
+        let data: Cow<[u8]> = match (b.get("uri").map(Value::str), bin) {
+            (None, Some(bin)) if i == 0 => Cow::Borrowed(bin),
+            (Some(Some(uri)), _) if uri.starts_with("data:") => {
+                let (_, payload) = uri
+                    .split_once(";base64,")
+                    .ok_or(Error::Invalid("data URI"))?;
+                Cow::Owned(base64(payload.as_bytes()).ok_or(Error::Invalid("base64"))?)
+            }
+            _ => match file {
+                Some(d) => Cow::Borrowed(d),
+                None => {
+                    out.push(Buffer::External);
+                    continue;
+                }
+            },
+        };
+        if data.len() < length {
+            return Err(Error::Invalid("buffer shorter than its length"));
+        }
+        out.push(Buffer::Data(match data {
+            Cow::Borrowed(d) => Cow::Borrowed(&d[..length]),
+            Cow::Owned(mut d) => {
+                d.truncate(length);
+                Cow::Owned(d)
+            }
+        }));
+    }
+    Ok(out)
+}
+
+/// Standard base64, padded or not.
+fn base64(text: &[u8]) -> Option<Vec<u8>> {
+    let text = text
+        .strip_suffix(b"==")
+        .or_else(|| text.strip_suffix(b"="))
+        .unwrap_or(text);
+    let mut out = Vec::with_capacity(text.len() / 4 * 3 + 3);
+    let (mut acc, mut bits) = (0u32, 0u32);
+    for &c in text {
+        let v = match c {
+            b'A'..=b'Z' => c - b'A',
+            b'a'..=b'z' => c - b'a' + 26,
+            b'0'..=b'9' => c - b'0' + 52,
+            b'+' => 62,
+            b'/' => 63,
+            _ => return None,
+        };
+        acc = (acc << 6) | u32::from(v);
+        bits += 6;
+        if bits >= 8 {
+            bits -= 8;
+            out.push((acc >> bits) as u8);
+            acc &= (1 << bits) - 1;
+        }
+    }
+    // A last symbol alone says less than a byte.
+    (text.len() % 4 != 1).then_some(out)
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Comp {
+    I8,
+    U8,
+    I16,
+    U16,
+    U32,
+    F32,
+}
+
+impl Comp {
+    fn from(code: usize) -> Option<Comp> {
+        Some(match code {
+            5120 => Comp::I8,
+            5121 => Comp::U8,
+            5122 => Comp::I16,
+            5123 => Comp::U16,
+            5125 => Comp::U32,
+            5126 => Comp::F32,
+            _ => return None,
+        })
+    }
+
+    fn size(self) -> usize {
+        match self {
+            Comp::I8 | Comp::U8 => 1,
+            Comp::I16 | Comp::U16 => 2,
+            Comp::U32 | Comp::F32 => 4,
+        }
+    }
+
+    /// One component, scaled to 0..1 or -1..1 when `normalized`. `b` holds
+    /// at least `size()` bytes.
+    fn float(self, b: &[u8], normalized: bool) -> f32 {
+        let scale = |max: f32| if normalized { max } else { 1.0 };
+        let v = match self {
+            Comp::I8 => f32::from(b[0] as i8) / scale(127.0),
+            Comp::U8 => f32::from(b[0]) / scale(255.0),
+            Comp::I16 => f32::from(i16::from_le_bytes([b[0], b[1]])) / scale(32767.0),
+            Comp::U16 => f32::from(u16::from_le_bytes([b[0], b[1]])) / scale(65535.0),
+            Comp::U32 => u32::from_le_bytes([b[0], b[1], b[2], b[3]]) as f32,
+            Comp::F32 => return f32::from_le_bytes([b[0], b[1], b[2], b[3]]),
+        };
+        if normalized { v.max(-1.0) } else { v }
+    }
+}
+
+/// A checked run of `count` elements of `elem` bytes, `stride` apart.
+struct Run<'a> {
+    bytes: &'a [u8],
+    stride: usize,
+    elem: usize,
+    count: usize,
+}
+
+impl Run<'_> {
+    fn at(&self, i: usize) -> &[u8] {
+        let start = i * self.stride;
+        &self.bytes[start..start + self.elem]
+    }
+}
+
+struct Doc<'a> {
+    root: &'a Value,
+    buffers: Vec<Buffer<'a>>,
+    floats: HashMap<usize, Rc<Vec<f32>>>,
+    indices: HashMap<usize, Rc<Vec<u32>>>,
+    soup: Soup,
+    unsupported: BTreeMap<String, u32>,
+    done: bool,
+    work: u64,
+    max_work: u64,
+}
+
+/// What a primitive draws with.
+struct Prim {
+    position: Rc<Vec<f32>>,
+    normal: Option<Rc<Vec<f32>>>,
+    /// And its components, 3 or 4.
+    color: Option<(Rc<Vec<f32>>, usize)>,
+    indices: Option<Rc<Vec<u32>>>,
+    /// Linear, from the material.
+    factor: [f32; 3],
+}
+
+fn optional(v: Option<&Value>) -> Result<usize, Error> {
+    v.map_or(Ok(0), |v| v.usize().ok_or(Error::Invalid("offset")))
+}
+
+impl<'a> Doc<'a> {
+    fn list(&self, key: &str) -> &'a [Value] {
+        self.root.get(key).map_or(&[][..], Value::array)
+    }
+
+    fn unsupported(&mut self, what: &str) {
+        let n = self.unsupported.entry(what.to_string()).or_insert(0);
+        *n = n.saturating_add(1);
+    }
+
+    /// Charges `n` triangles looked at; false once the work is spent.
+    fn charge(&mut self, n: u64) -> bool {
+        self.work = self.work.saturating_add(n);
+        if self.work > self.max_work {
+            self.soup.truncated = true;
+            self.done = true;
+            return false;
+        }
+        true
+    }
+
+    /// `count` elements of `elem` bytes at `offset` in a buffer view,
+    /// `stride` apart (the view's, if none is given), checked against the
+    /// view and the buffer.
+    fn run(
+        &self,
+        view: usize,
+        offset: usize,
+        elem: usize,
+        count: usize,
+        stride: Option<usize>,
+    ) -> Result<Run<'_>, Error> {
+        let bad = Error::Invalid("accessor out of bounds");
+        let v = self.list("bufferViews").get(view).ok_or(bad.clone())?;
+        if v.get("extensions")
+            .is_some_and(|e| e.get("EXT_meshopt_compression").is_some())
+        {
+            return Err(Error::Unsupported("EXT_meshopt_compression"));
+        }
+        let buffer = v.get("buffer").and_then(Value::usize).ok_or(bad.clone())?;
+        let data = match self.buffers.get(buffer) {
+            Some(Buffer::Data(data)) => data,
+            Some(Buffer::External) => return Err(Error::External),
+            None => return Err(bad),
+        };
+        let start = optional(v.get("byteOffset"))?;
+        let length = v
+            .get("byteLength")
+            .and_then(Value::usize)
+            .ok_or(bad.clone())?;
+        let stride = match (stride, v.get("byteStride")) {
+            (Some(s), _) => s,
+            (None, Some(s)) => s.usize().ok_or(bad.clone())?,
+            (None, None) => elem,
+        };
+        if stride < elem {
+            return Err(bad);
+        }
+        // In u64, so that a 32-bit build agrees with a 64-bit one.
+        let used = match count as u64 {
+            0 => 0,
+            n => (n - 1)
+                .checked_mul(stride as u64)
+                .and_then(|s| s.checked_add(elem as u64))
+                .ok_or(bad.clone())?,
+        };
+        let last = (offset as u64).checked_add(used).ok_or(bad.clone())?;
+        let end = (start as u64)
+            .checked_add(length as u64)
+            .ok_or(bad.clone())?;
+        if last > length as u64 || end > data.len() as u64 {
+            return Err(bad);
+        }
+        // Each is within the buffer now.
+        let from = start + offset;
+        Ok(Run {
+            bytes: &data[from..from + used as usize],
+            stride,
+            elem,
+            count,
+        })
+    }
+
+    /// An accessor's components as floats, `count * width` of them.
+    fn floats(&mut self, index: usize, widths: &[usize]) -> Result<(Rc<Vec<f32>>, usize), Error> {
+        let a = self
+            .list("accessors")
+            .get(index)
+            .ok_or(Error::Invalid("accessor index"))?;
+        let width = match a.get("type").and_then(Value::str) {
+            Some("SCALAR") => 1,
+            Some("VEC2") => 2,
+            Some("VEC3") => 3,
+            Some("VEC4") => 4,
+            _ => return Err(Error::Invalid("accessor type")),
+        };
+        let comp = a
+            .get("componentType")
+            .and_then(Value::usize)
+            .and_then(Comp::from)
+            .ok_or(Error::Invalid("component type"))?;
+        if !widths.contains(&width) {
+            return Err(Error::Invalid("accessor type"));
+        }
+        if let Some(c) = self.floats.get(&index) {
+            return Ok((c.clone(), width));
+        }
+        let normalized = matches!(a.get("normalized"), Some(Value::Bool(true)));
+        let count = a
+            .get("count")
+            .and_then(Value::usize)
+            .ok_or(Error::Invalid("accessor count"))?;
+        let offset = optional(a.get("byteOffset"))?;
+        let elem = width * comp.size();
+        let mut out: Vec<f32>;
+        match a.get("bufferView") {
+            Some(view) => {
+                let view = view.usize().ok_or(Error::Invalid("bufferView"))?;
+                let run = self.run(view, offset, elem, count, None)?;
+                out = Vec::with_capacity(count * width);
+                for i in 0..run.count {
+                    let e = run.at(i);
+                    for k in 0..width {
+                        out.push(comp.float(&e[k * comp.size()..], normalized));
+                    }
+                }
+            }
+            None => {
+                if count > MAX_ZERO_COUNT {
+                    return Err(Error::Invalid("accessor count"));
+                }
+                out = vec![0.0; count * width];
+            }
+        }
+        if let Some(s) = a.get("sparse") {
+            let bad = Error::Invalid("sparse accessor");
+            let n = s.get("count").and_then(Value::usize).ok_or(bad.clone())?;
+            if n > count {
+                return Err(bad);
+            }
+            let ix = s.get("indices").ok_or(bad.clone())?;
+            let vx = s.get("values").ok_or(bad.clone())?;
+            let ix_comp = ix
+                .get("componentType")
+                .and_then(Value::usize)
+                .and_then(Comp::from)
+                .filter(|c| matches!(c, Comp::U8 | Comp::U16 | Comp::U32))
+                .ok_or(bad.clone())?;
+            let view_of = |v: &Value| {
+                v.get("bufferView")
+                    .and_then(Value::usize)
+                    .ok_or(bad.clone())
+            };
+            let positions = self.run(
+                view_of(ix)?,
+                optional(ix.get("byteOffset"))?,
+                ix_comp.size(),
+                n,
+                Some(ix_comp.size()),
+            )?;
+            let values = self.run(
+                view_of(vx)?,
+                optional(vx.get("byteOffset"))?,
+                elem,
+                n,
+                Some(elem),
+            )?;
+            for j in 0..n {
+                let p = positions.at(j);
+                let target = match ix_comp {
+                    Comp::U8 => usize::from(p[0]),
+                    Comp::U16 => usize::from(u16::from_le_bytes([p[0], p[1]])),
+                    _ => u32::from_le_bytes([p[0], p[1], p[2], p[3]]) as usize,
+                };
+                if target >= count {
+                    return Err(bad);
+                }
+                let e = values.at(j);
+                for k in 0..width {
+                    out[target * width + k] = comp.float(&e[k * comp.size()..], normalized);
+                }
+            }
+        }
+        let out = Rc::new(out);
+        self.floats.insert(index, out.clone());
+        Ok((out, width))
+    }
+
+    /// A SCALAR accessor of unsigned integers.
+    fn index_list(&mut self, index: usize) -> Result<Rc<Vec<u32>>, Error> {
+        if let Some(c) = self.indices.get(&index) {
+            return Ok(c.clone());
+        }
+        let bad = Error::Invalid("index accessor");
+        let a = self.list("accessors").get(index).ok_or(bad.clone())?;
+        if a.get("type").and_then(Value::str) != Some("SCALAR") || a.get("sparse").is_some() {
+            return Err(bad);
+        }
+        let comp = a
+            .get("componentType")
+            .and_then(Value::usize)
+            .and_then(Comp::from)
+            .filter(|c| matches!(c, Comp::U8 | Comp::U16 | Comp::U32))
+            .ok_or(bad.clone())?;
+        let count = a.get("count").and_then(Value::usize).ok_or(bad.clone())?;
+        let offset = optional(a.get("byteOffset"))?;
+        let view = a.get("bufferView").and_then(Value::usize).ok_or(bad)?;
+        let run = self.run(view, offset, comp.size(), count, None)?;
+        let list: Vec<u32> = (0..run.count)
+            .map(|i| {
+                let b = run.at(i);
+                match comp {
+                    Comp::U8 => u32::from(b[0]),
+                    Comp::U16 => u32::from(u16::from_le_bytes([b[0], b[1]])),
+                    _ => u32::from_le_bytes([b[0], b[1], b[2], b[3]]),
+                }
+            })
+            .collect();
+        let list = Rc::new(list);
+        self.indices.insert(index, list.clone());
+        Ok(list)
+    }
+
+    /// A primitive's data; `None` where it is not drawn here.
+    fn prim(&mut self, p: &Value) -> Result<Option<Prim>, Error> {
+        let mode = match p.get("mode") {
+            Some(m) => m.usize().ok_or(Error::Invalid("mode"))?,
+            None => 4,
+        };
+        if mode != 4 {
+            self.unsupported(match mode {
+                0 => "points",
+                1..=3 => "lines",
+                5 => "triangle strips",
+                6 => "triangle fans",
+                _ => "mode",
+            });
+            return Ok(None);
+        }
+        if p.get("extensions")
+            .is_some_and(|e| e.get("KHR_draco_mesh_compression").is_some())
+        {
+            self.unsupported("KHR_draco_mesh_compression");
+            return Ok(None);
+        }
+        let attributes = p
+            .get("attributes")
+            .ok_or(Error::Invalid("primitive without attributes"))?;
+        let attribute = |name: &str| attributes.get(name).and_then(Value::usize);
+        let at = attribute("POSITION").ok_or(Error::Invalid("primitive without positions"))?;
+        // Positions and normals may be small integers (KHR_mesh_quantization,
+        // which gltfpack writes): the node's scale puts them back.
+        let (position, _) = self.floats(at, &[3])?;
+        let vertices = position.len() / 3;
+        // A normal or a colour for another count of vertices is left out.
+        let normal = attribute("NORMAL")
+            .and_then(|i| self.floats(i, &[3]).ok())
+            .map(|(n, _)| n)
+            .filter(|n| n.len() / 3 == vertices);
+        let color = attribute("COLOR_0")
+            .and_then(|i| self.floats(i, &[3, 4]).ok())
+            .filter(|(c, w)| c.len() / w == vertices);
+        let indices = match p.get("indices") {
+            Some(i) => Some(self.index_list(i.usize().ok_or(Error::Invalid("indices"))?)?),
+            None => None,
+        };
+        let factor = p
+            .get("material")
+            .and_then(Value::usize)
+            .and_then(|m| self.list("materials").get(m))
+            .and_then(|m| m.get("pbrMetallicRoughness"))
+            .and_then(|m| m.get("baseColorFactor"))
+            .and_then(|f| f.numbers(4))
+            .map_or([1.0; 3], |f| [f[0] as f32, f[1] as f32, f[2] as f32]);
+        Ok(Some(Prim {
+            position,
+            normal,
+            color,
+            indices,
+            factor,
+        }))
+    }
+
+    /// Triangulates the primitives of a mesh under `world`.
+    fn mesh(&mut self, mesh: usize, world: &Mat) -> Result<(), Error> {
+        let primitives = self
+            .list("meshes")
+            .get(mesh)
+            .ok_or(Error::Invalid("mesh index"))?
+            .get("primitives")
+            .map_or(&[][..], Value::array);
+        let det = world[0] * (world[5] * world[10] - world[6] * world[9])
+            - world[4] * (world[1] * world[10] - world[2] * world[9])
+            + world[8] * (world[1] * world[6] - world[2] * world[5]);
+        if !det.is_finite() {
+            self.soup.invalid = self.soup.invalid.saturating_add(1);
+            return Ok(());
+        }
+        // Scaled to nothing: nothing to draw.
+        if det == 0.0 {
+            return Ok(());
+        }
+        let normals = normal_matrix(world, det);
+        for p in primitives {
+            if !self.charge(1) {
+                break;
+            }
+            let prim = match self.prim(p) {
+                Ok(Some(prim)) => prim,
+                Ok(None) => continue,
+                Err(Error::External) => return Err(Error::External),
+                Err(Error::Unsupported(what)) => {
+                    self.unsupported(what);
+                    continue;
+                }
+                Err(_) => {
+                    self.soup.invalid = self.soup.invalid.saturating_add(1);
+                    continue;
+                }
+            };
+            let vertices = prim.position.len() / 3;
+            let total = prim.indices.as_ref().map_or(vertices, |i| i.len()) / 3 * 3;
+            let corner = |i: u32| -> Option<Corner> {
+                let i = i as usize;
+                if i >= vertices {
+                    return None;
+                }
+                let v = &prim.position[i * 3..i * 3 + 3];
+                let p = apply(world, [f64::from(v[0]), f64::from(v[1]), f64::from(v[2])]);
+                let n = prim.normal.as_ref().map(|n| {
+                    let n = &n[i * 3..i * 3 + 3];
+                    rotate(
+                        &normals,
+                        [f64::from(n[0]), f64::from(n[1]), f64::from(n[2])],
+                    )
+                    .map(|v| v as f32)
+                });
+                let mut linear = prim.factor;
+                let mut coloured = linear != [1.0; 3];
+                if let Some((c, w)) = &prim.color {
+                    for (k, l) in linear.iter_mut().enumerate() {
+                        *l *= c[i * w + k];
+                    }
+                    coloured = true;
+                }
+                Some(Corner {
+                    p: p.map(|v| v as f32),
+                    n,
+                    c: coloured.then(|| linear.map(srgb)),
+                })
+            };
+            let mut at = 0;
+            while at < total {
+                if !self.charge(1) {
+                    break;
+                }
+                let t = match &prim.indices {
+                    Some(list) => [list[at], list[at + 1], list[at + 2]],
+                    None => [at as u32, at as u32 + 1, at as u32 + 2],
+                };
+                at += 3;
+                // A mirror turns the triangles inside out.
+                let t = if det < 0.0 { [t[0], t[2], t[1]] } else { t };
+                let [Some(a), Some(b), Some(c)] = t.map(corner) else {
+                    self.soup.invalid = self.soup.invalid.saturating_add(1);
+                    continue;
+                };
+                if !self.soup.polygon(&[a, b, c]) {
+                    self.done = true;
+                    break;
+                }
+            }
+            if self.done {
+                break;
+            }
+        }
+        Ok(())
+    }
+
+    /// The matrix of a node.
+    fn local(node: &Value) -> Result<Mat, Error> {
+        let bad = Error::Invalid("node transform");
+        if let Some(m) = node.get("matrix") {
+            let v = m.numbers(16).ok_or(bad)?;
+            return Ok(std::array::from_fn(|i| v[i]));
+        }
+        let vector = |key: &str, n: usize, default: &[f64]| -> Result<Vec<f64>, Error> {
+            match node.get(key) {
+                Some(v) => v.numbers(n).ok_or(Error::Invalid("node transform")),
+                None => Ok(default.to_vec()),
+            }
+        };
+        let t = vector("translation", 3, &[0.0, 0.0, 0.0])?;
+        let q = vector("rotation", 4, &[0.0, 0.0, 0.0, 1.0])?;
+        let s = vector("scale", 3, &[1.0, 1.0, 1.0])?;
+        let len = q.iter().map(|v| v * v).sum::<f64>().sqrt();
+        if !len.is_finite() {
+            return Err(bad);
+        }
+        // All zeros is not a rotation; some exporters write it for none.
+        let (x, y, z, w) = if len <= 1e-9 {
+            (0.0, 0.0, 0.0, 1.0)
+        } else {
+            (q[0] / len, q[1] / len, q[2] / len, q[3] / len)
+        };
+        let r = [
+            [
+                1.0 - 2.0 * (y * y + z * z),
+                2.0 * (x * y + z * w),
+                2.0 * (x * z - y * w),
+            ],
+            [
+                2.0 * (x * y - z * w),
+                1.0 - 2.0 * (x * x + z * z),
+                2.0 * (y * z + x * w),
+            ],
+            [
+                2.0 * (x * z + y * w),
+                2.0 * (y * z - x * w),
+                1.0 - 2.0 * (x * x + y * y),
+            ],
+        ];
+        let mut m = IDENTITY;
+        for (c, col) in r.iter().enumerate() {
+            for (row, v) in col.iter().enumerate() {
+                m[c * 4 + row] = v * s[c];
+            }
+        }
+        m[12..15].copy_from_slice(&t);
+        Ok(m)
+    }
+
+    fn walk(&mut self) -> Result<(), Error> {
+        let root = self.root;
+        let nodes = self.list("nodes");
+        let scenes = self.list("scenes");
+        let roots: Vec<usize> = if scenes.is_empty() {
+            let mut child = vec![false; nodes.len()];
+            for n in nodes {
+                for c in n.get("children").map_or(&[][..], Value::array) {
+                    if let Some(i) = c.usize().filter(|&i| i < nodes.len()) {
+                        child[i] = true;
+                    }
+                }
+            }
+            (0..nodes.len()).filter(|&i| !child[i]).collect()
+        } else {
+            let i = match root.get("scene") {
+                Some(s) => s.usize().ok_or(Error::Invalid("scene"))?,
+                None => 0,
+            };
+            scenes
+                .get(i)
+                .ok_or(Error::Invalid("scene"))?
+                .get("nodes")
+                .map_or(&[][..], Value::array)
+                .iter()
+                .map(|n| n.usize().ok_or(Error::Invalid("node index")))
+                .collect::<Result<_, _>>()?
+        };
+        // Depth first, on a stack of the nodes being walked rather than by
+        // recursion. The scene's roots are the children of a node of no
+        // number at the bottom.
+        struct Frame {
+            node: Option<usize>,
+            next: usize,
+            world: Mat,
+        }
+        let mut seen = vec![false; nodes.len()];
+        let mut stack = vec![Frame {
+            node: None,
+            next: 0,
+            world: IDENTITY,
+        }];
+        while let Some(top) = stack.last_mut() {
+            let next = match top.node {
+                None => roots.get(top.next).map(|&i| Ok(i)),
+                Some(n) => nodes[n]
+                    .get("children")
+                    .map_or(&[][..], Value::array)
+                    .get(top.next)
+                    .map(|c| c.usize().ok_or(Error::Invalid("child index"))),
+            };
+            let Some(next) = next else {
+                stack.pop();
+                continue;
+            };
+            top.next += 1;
+            let parent = top.world;
+            if self.done {
+                break;
+            }
+            let index = next?;
+            let node = nodes.get(index).ok_or(Error::Invalid("node index"))?;
+            if std::mem::replace(&mut seen[index], true) {
+                return Err(Error::Invalid("a node with two parents, or a cycle"));
+            }
+            // The root below counts as a level.
+            if stack.len() > MAX_DEPTH {
+                return Err(Error::Invalid("nodes nested too deep"));
+            }
+            let world = mul(&parent, &Self::local(node)?);
+            if let Some(m) = node.get("mesh") {
+                let m = m.usize().ok_or(Error::Invalid("mesh index"))?;
+                let name = node
+                    .get("name")
+                    .or_else(|| self.list("meshes").get(m).and_then(|m| m.get("name")))
+                    .and_then(Value::str)
+                    .unwrap_or("");
+                self.soup.begin(name);
+                self.mesh(m, &world)?;
+            }
+            stack.push(Frame {
+                node: Some(index),
+                next: 0,
+                world,
+            });
+        }
+        Ok(())
+    }
+}
diff --git a/crates/exav-render/src/formats/gltf/json.rs b/crates/exav-render/src/formats/gltf/json.rs
new file mode 100644
index 00000000..80a79a19
--- /dev/null
+++ b/crates/exav-render/src/formats/gltf/json.rs
@@ -0,0 +1,288 @@
+//! A JSON reader for glTF's document: bounded in depth and in size, the
+//! only thing it does. Numbers are `f64`; a duplicate key keeps its first
+//! value on lookup.
+
+/// Nesting deeper than this is refused: glTF's own never passes ten.
+const MAX_DEPTH: usize = 64;
+
+/// Values (of every kind) a document may hold. Each takes tens of bytes,
+/// while a bare `1,` takes two of the file.
+const MAX_VALUES: usize = 2_000_000;
+
+#[derive(Debug, Clone, PartialEq)]
+pub(super) enum Value {
+    Null,
+    Bool(bool),
+    Num(f64),
+    Str(String),
+    Arr(Vec<Value>),
+    Obj(Vec<(String, Value)>),
+}
+
+impl Value {
+    pub fn get(&self, key: &str) -> Option<&Value> {
+        match self {
+            Value::Obj(members) => members.iter().find(|(k, _)| k == key).map(|(_, v)| v),
+            _ => None,
+        }
+    }
+
+    pub fn array(&self) -> &[Value] {
+        match self {
+            Value::Arr(items) => items,
+            _ => &[],
+        }
+    }
+
+    pub fn str(&self) -> Option<&str> {
+        match self {
+            Value::Str(s) => Some(s),
+            _ => None,
+        }
+    }
+
+    pub fn f64(&self) -> Option<f64> {
+        match self {
+            Value::Num(n) => Some(*n),
+            _ => None,
+        }
+    }
+
+    /// A whole number from 0 to 2^53.
+    pub fn usize(&self) -> Option<usize> {
+        let n = self.f64()?;
+        (n >= 0.0 && n.fract() == 0.0 && n <= 9_007_199_254_740_992.0).then_some(n as usize)
+    }
+
+    /// Exactly `n` numbers.
+    pub fn numbers(&self, n: usize) -> Option<Vec<f64>> {
+        let items = match self {
+            Value::Arr(items) if items.len() == n => items,
+            _ => return None,
+        };
+        items.iter().map(Value::f64).collect()
+    }
+}
+
+pub(super) fn parse(bytes: &[u8]) -> Result<Value, &'static str> {
+    let bytes = bytes.strip_prefix(b"\xEF\xBB\xBF").unwrap_or(bytes);
+    let mut p = Parser {
+        b: bytes,
+        at: 0,
+        values: 0,
+    };
+    let v = p.value(0)?;
+    p.space();
+    if p.at != p.b.len() {
+        return Err("data after the document");
+    }
+    Ok(v)
+}
+
+struct Parser<'a> {
+    b: &'a [u8],
+    at: usize,
+    values: usize,
+}
+
+impl Parser<'_> {
+    fn space(&mut self) {
+        while matches!(self.b.get(self.at), Some(b' ' | b'\t' | b'\n' | b'\r')) {
+            self.at += 1;
+        }
+    }
+
+    fn literal(&mut self, word: &[u8], v: Value) -> Result<Value, &'static str> {
+        if self.b[self.at..].starts_with(word) {
+            self.at += word.len();
+            Ok(v)
+        } else {
+            Err("bad literal")
+        }
+    }
+
+    fn value(&mut self, depth: usize) -> Result<Value, &'static str> {
+        if depth > MAX_DEPTH {
+            return Err("nested too deep");
+        }
+        self.values += 1;
+        if self.values > MAX_VALUES {
+            return Err("too many values");
+        }
+        self.space();
+        match self.b.get(self.at).ok_or("unexpected end")? {
+            b'{' => {
+                self.at += 1;
+                let mut members = Vec::new();
+                self.space();
+                if self.b.get(self.at) == Some(&b'}') {
+                    self.at += 1;
+                    return Ok(Value::Obj(members));
+                }
+                loop {
+                    self.space();
+                    if self.b.get(self.at) != Some(&b'"') {
+                        return Err("expected a key");
+                    }
+                    let key = self.string()?;
+                    self.space();
+                    if self.b.get(self.at) != Some(&b':') {
+                        return Err("expected a colon");
+                    }
+                    self.at += 1;
+                    members.push((key, self.value(depth + 1)?));
+                    self.space();
+                    match self.b.get(self.at) {
+                        Some(b',') => self.at += 1,
+                        Some(b'}') => {
+                            self.at += 1;
+                            return Ok(Value::Obj(members));
+                        }
+                        _ => return Err("expected a comma or a brace"),
+                    }
+                }
+            }
+            b'[' => {
+                self.at += 1;
+                let mut items = Vec::new();
+                self.space();
+                if self.b.get(self.at) == Some(&b']') {
+                    self.at += 1;
+                    return Ok(Value::Arr(items));
+                }
+                loop {
+                    items.push(self.value(depth + 1)?);
+                    self.space();
+                    match self.b.get(self.at) {
+                        Some(b',') => self.at += 1,
+                        Some(b']') => {
+                            self.at += 1;
+                            return Ok(Value::Arr(items));
+                        }
+                        _ => return Err("expected a comma or a bracket"),
+                    }
+                }
+            }
+            b'"' => Ok(Value::Str(self.string()?)),
+            b't' => self.literal(b"true", Value::Bool(true)),
+            b'f' => self.literal(b"false", Value::Bool(false)),
+            b'n' => self.literal(b"null", Value::Null),
+            b'-' | b'0'..=b'9' => {
+                let start = self.at;
+                while matches!(
+                    self.b.get(self.at),
+                    Some(b'0'..=b'9' | b'-' | b'+' | b'.' | b'e' | b'E')
+                ) {
+                    self.at += 1;
+                }
+                let n: f64 = std::str::from_utf8(&self.b[start..self.at])
+                    .ok()
+                    .and_then(|s| s.parse().ok())
+                    .ok_or("bad number")?;
+                if n.is_finite() {
+                    Ok(Value::Num(n))
+                } else {
+                    Err("number out of range")
+                }
+            }
+            _ => Err("unexpected character"),
+        }
+    }
+
+    /// A string; `at` is on its opening quote.
+    fn string(&mut self) -> Result<String, &'static str> {
+        self.at += 1;
+        let mut out: Vec<u8> = Vec::new();
+        loop {
+            let c = *self.b.get(self.at).ok_or("unterminated string")?;
+            self.at += 1;
+            match c {
+                b'"' => return String::from_utf8(out).map_err(|_| "string is not UTF-8"),
+                0..=0x1f => return Err("control character in a string"),
+                b'\\' => {
+                    let e = *self.b.get(self.at).ok_or("unterminated string")?;
+                    self.at += 1;
+                    match e {
+                        b'"' | b'\\' | b'/' => out.push(e),
+                        b'b' => out.push(8),
+                        b'f' => out.push(12),
+                        b'n' => out.push(b'\n'),
+                        b'r' => out.push(b'\r'),
+                        b't' => out.push(b'\t'),
+                        b'u' => {
+                            let mut unit = self.hex4()?;
+                            if (0xd800..0xdc00).contains(&unit)
+                                && self.b[self.at..].starts_with(b"\\u")
+                            {
+                                let save = self.at;
+                                self.at += 2;
+                                let low = self.hex4()?;
+                                if (0xdc00..0xe000).contains(&low) {
+                                    unit = 0x10000 + ((unit - 0xd800) << 10) + (low - 0xdc00);
+                                } else {
+                                    self.at = save;
+                                }
+                            }
+                            let ch = char::from_u32(unit).unwrap_or('\u{fffd}');
+                            let mut buf = [0u8; 4];
+                            out.extend_from_slice(ch.encode_utf8(&mut buf).as_bytes());
+                        }
+                        _ => return Err("bad escape"),
+                    }
+                }
+                _ => out.push(c),
+            }
+        }
+    }
+
+    fn hex4(&mut self) -> Result<u32, &'static str> {
+        let digits = self.b.get(self.at..self.at + 4).ok_or("bad escape")?;
+        let mut n = 0;
+        for &d in digits {
+            n = n * 16 + (d as char).to_digit(16).ok_or("bad escape")?;
+        }
+        self.at += 4;
+        Ok(n)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reads_what_it_is_given() {
+        let v =
+            parse(br#" {"a":[1,-2.5e1,true,null],"b":{"c":"x\u00e9\ud83d\ude00\n"}} "#).unwrap();
+        assert_eq!(v.get("a").unwrap().array()[1], Value::Num(-25.0));
+        assert_eq!(
+            v.get("b").unwrap().get("c").unwrap().str(),
+            Some("x\u{e9}\u{1f600}\n")
+        );
+    }
+
+    #[test]
+    fn refuses_what_is_not_json_without_panicking() {
+        for bad in [
+            &b""[..],
+            b"{",
+            b"[1,]",
+            b"{\"a\" 1}",
+            b"\"abc",
+            b"\"\\x\"",
+            b"1e999",
+            b"[1] 2",
+            b"\"\\u12\"",
+            b"nul",
+            b"tru",
+        ] {
+            assert!(parse(bad).is_err(), "{:?}", String::from_utf8_lossy(bad));
+        }
+    }
+
+    #[test]
+    fn nesting_is_bounded() {
+        let deep = "[".repeat(10_000);
+        assert!(parse(deep.as_bytes()).is_err());
+    }
+}
diff --git a/crates/exav-render/src/formats/ifc/alignment.rs b/crates/exav-render/src/formats/ifc/alignment.rs
new file mode 100644
index 00000000..925cf1c7
--- /dev/null
+++ b/crates/exav-render/src/formats/ifc/alignment.rs
@@ -0,0 +1,464 @@
+//! IFC4X3 curves along an alignment: `IfcCompositeCurve` of
+//! `IfcCurveSegment`s (a line, a circle, a spiral or a polynomial curve cut
+//! to a length and placed), `IfcGradientCurve` (a plan curve and a profile
+//! in distance and height), and `IfcAxis2PlacementLinear`, a placement at a
+//! distance along a curve.
+//!
+//! A curve segment's parent curve is parametrised by length from its own
+//! origin. The segment takes the part of it from `SegmentStart` for
+//! `SegmentLength` (against the parent's sense when that is negative), and
+//! sets it down so that its first point is `Placement`'s location and its
+//! direction there is `Placement`'s `RefDirection`: whatever the parent's
+//! position or heading at `SegmentStart` was. Written from the entities'
+//! published definitions (the curvature polynomials of the spirals as
+//! buildingSMART gives them).
+
+use std::f64::consts::TAU;
+
+use super::curves::segments;
+use super::math::{V3, Xf, add, cross, len, scale, sub, unit};
+use super::step::Value;
+use super::{MAX_DEPTH, Reader, first_proj_axis, is};
+
+/// Most points one segment or curve may have.
+const MAX_POINTS: usize = 1 << 16;
+/// Most segments of one composite curve.
+const MAX_SEGMENTS: usize = 1 << 14;
+/// The multiple of the usual chords a curve is sampled with to place
+/// something on it.
+const FINE: usize = 16;
+
+/// The nodes and weights of the 5-point Gauss-Legendre rule on -1..1.
+const GAUSS: [(f64, f64); 5] = [
+    (0.0, 0.568_888_888_888_888_9),
+    (0.538_469_310_105_683_1, 0.478_628_670_499_366_5),
+    (-0.538_469_310_105_683_1, 0.478_628_670_499_366_5),
+    (0.906_179_845_938_664, 0.236_926_885_056_189_1),
+    (-0.906_179_845_938_664, 0.236_926_885_056_189_1),
+];
+
+/// A distance along a curve, and the point there.
+pub(super) type Station = (f64, V3);
+
+/// What a segment is cut from.
+enum Parent {
+    /// A line, by its unit direction.
+    Line(V3),
+    /// A circle, by its placement and radius.
+    Circle(Xf, f64),
+    /// A spiral: its curvature is `sum(c[k] s^k)`.
+    Spiral([f64; 8]),
+    /// `Position` applied to polynomials of the parameter.
+    Polynomial(Xf, [Vec<f64>; 3]),
+}
+
+impl Parent {
+    /// The parent's point at parameter `s`, for the kinds that have one.
+    fn point(&self, s: f64) -> Option<V3> {
+        Some(match self {
+            Parent::Line(d) => scale(*d, s),
+            Parent::Circle(pos, r) => {
+                let a = s / r;
+                pos.point([r * a.cos(), r * a.sin(), 0.0])
+            }
+            Parent::Polynomial(pos, c) => {
+                let at = |c: &Vec<f64>| c.iter().rev().fold(0.0, |acc, k| acc * s + k);
+                pos.point([at(&c[0]), at(&c[1]), at(&c[2])])
+            }
+            Parent::Spiral(_) => return None,
+        })
+    }
+
+    /// The heading of the spiral at `s`: the integral of its curvature.
+    fn heading(c: &[f64; 8], s: f64) -> f64 {
+        c.iter()
+            .enumerate()
+            .rev()
+            .fold(0.0, |acc, (k, ck)| (acc + ck / (k as f64 + 1.0)) * s)
+    }
+}
+
+/// Curvature coefficients from the terms of a polynomial spiral, the
+/// constant term (`A0`) first: `1 / A0`, then `A1 / |A1^3|`, `1 / A2^3`,
+/// `A3 / |A3^5|` and so on, a term that is absent being none. `None` for a
+/// term of zero, which has no curvature.
+fn curvature(terms: &[Option<f64>]) -> Option<[f64; 8]> {
+    let mut c = [0.0; 8];
+    for (k, term) in terms.iter().enumerate().take(8) {
+        let Some(a) = *term else { continue };
+        if a == 0.0 || !a.is_finite() {
+            return None;
+        }
+        c[k] = if k % 2 == 1 {
+            a / a.abs().powi(k as i32 + 2)
+        } else {
+            1.0 / a.powi(k as i32 + 1)
+        };
+    }
+    Some(c)
+}
+
+impl<'a> Reader<'a> {
+    /// The parent curve of an `IfcCurveSegment`.
+    fn parent(&mut self, id: u32) -> Option<Parent> {
+        let (ty, p) = self.get(id)?;
+        let opt = |i: usize| p.get(i).filter(|v| !v.is_null()).and_then(Value::num);
+        match ty {
+            b"IFCLINE" => {
+                let vp = self.f.params(p.get(1)?.id()?)?;
+                Some(Parent::Line(self.direction(vp.first()?.id()?)?))
+            }
+            b"IFCCIRCLE" => {
+                let pos = self.axis2(p.first()?.id()?)?;
+                let r = p.get(1)?.num().filter(|r| *r > 0.0 && r.is_finite())?;
+                Some(Parent::Circle(pos, r))
+            }
+            b"IFCCLOTHOID" => Some(Parent::Spiral(curvature(&[None, Some(opt(1)?)])?)),
+            b"IFCSECONDORDERPOLYNOMIALSPIRAL" => {
+                Some(Parent::Spiral(curvature(&[opt(3), opt(2), Some(opt(1)?)])?))
+            }
+            b"IFCTHIRDORDERPOLYNOMIALSPIRAL" => Some(Parent::Spiral(curvature(&[
+                opt(4),
+                opt(3),
+                opt(2),
+                Some(opt(1)?),
+            ])?)),
+            b"IFCSEVENTHORDERPOLYNOMIALSPIRAL" => Some(Parent::Spiral(curvature(&[
+                opt(8),
+                opt(7),
+                opt(6),
+                opt(5),
+                opt(4),
+                opt(3),
+                opt(2),
+                Some(opt(1)?),
+            ])?)),
+            b"IFCPOLYNOMIALCURVE" => {
+                let pos = self.axis2(p.first()?.id()?)?;
+                let coefficients = |i: usize| -> Option<Vec<f64>> {
+                    match p.get(i) {
+                        Some(v) if !v.is_null() => v
+                            .list()?
+                            .iter()
+                            .map(|x| x.num().filter(|x| x.is_finite()))
+                            .collect(),
+                        _ => Some(Vec::new()),
+                    }
+                };
+                let c = [coefficients(1)?, coefficients(2)?, coefficients(3)?];
+                (c.iter().any(|c| c.len() > 1) && c.iter().all(|c| c.len() <= 16))
+                    .then_some(Parent::Polynomial(pos, c))
+            }
+            _ => {
+                self.unsupported(ty);
+                None
+            }
+        }
+    }
+
+    /// An `IfcCurveSegment` as stations: the distance from its start and the
+    /// point, the segment's own length last. `None` for a segment that is
+    /// not usable.
+    fn curve_segment(&mut self, id: u32) -> Option<Vec<Station>> {
+        self.visit()?;
+        let (ty, p) = self.get(id)?;
+        if ty != b"IFCCURVESEGMENT" {
+            self.unsupported(ty);
+            return None;
+        }
+        let place = self.axis2(p.get(1)?.id()?)?;
+        let s0 = p.get(2)?.num().filter(|v| v.is_finite())?;
+        let signed = p.get(3)?.num().filter(|v| v.is_finite())?;
+        let l = signed.abs();
+        let sign = if signed < 0.0 { -1.0 } else { 1.0 };
+        let parent = self.parent(p.get(4)?.id()?)?;
+        // The parent's heading at the start, and its offsets from there, in
+        // the frame whose x is the direction of travel.
+        let offsets: Vec<(f64, V3)> = match &parent {
+            Parent::Line(_) | Parent::Circle(..) | Parent::Polynomial(..) => {
+                let n = match &parent {
+                    Parent::Line(_) => 1,
+                    Parent::Circle(_, r) => segments(l / r) * self.density,
+                    _ => 32 * self.density,
+                };
+                let at = |u: f64| parent.point(s0 + sign * u);
+                let origin = at(0.0)?;
+                // The direction of travel from a step small next to the
+                // segment and to the parameter.
+                let h = (l.max(1e-3) * 1e-6).max(s0.abs() * 1e-12);
+                let ahead = sub(at(h)?, origin);
+                let heading = ahead[1].atan2(ahead[0]);
+                let (c, s) = (heading.cos(), heading.sin());
+                let mut out = Vec::with_capacity(n + 1);
+                for k in 0..=n {
+                    let u = l * k as f64 / n as f64;
+                    let d = sub(at(u)?, origin);
+                    out.push((u, [c * d[0] + s * d[1], -s * d[0] + c * d[1], d[2]]));
+                }
+                out
+            }
+            Parent::Spiral(c) => {
+                // The heading of travel, then its integral by Gauss steps.
+                let psi = |u: f64| {
+                    let a = Parent::heading(c, s0 + sign * u);
+                    if sign < 0.0 {
+                        a + std::f64::consts::PI
+                    } else {
+                        a
+                    }
+                };
+                let psi0 = psi(0.0);
+                let mut turn = 0.0f64;
+                for k in 1..=64 {
+                    turn = turn.max((psi(l * k as f64 / 64.0) - psi0).abs());
+                }
+                if !turn.is_finite() {
+                    return None;
+                }
+                let n = ((turn / (TAU / 64.0)).ceil() as usize).clamp(8, 512) * self.density;
+                let mut out = Vec::with_capacity(n + 1);
+                let mut at = [0.0; 3];
+                out.push((0.0, at));
+                for k in 0..n {
+                    let (a, b) = (l * k as f64 / n as f64, l * (k + 1) as f64 / n as f64);
+                    let (mid, half) = ((a + b) / 2.0, (b - a) / 2.0);
+                    for (x, w) in GAUSS {
+                        let a = psi(mid + half * x) - psi0;
+                        at[0] += w * half * a.cos();
+                        at[1] += w * half * a.sin();
+                    }
+                    out.push((b, at));
+                }
+                out
+            }
+        };
+        let points: Vec<Station> = offsets
+            .into_iter()
+            .map(|(u, d)| (u, place.point(d)))
+            .collect();
+        (points.len() >= 2
+            && points.len() <= MAX_POINTS
+            && points.iter().all(|(_, q)| q.iter().all(|x| x.is_finite())))
+        .then_some(points)
+    }
+
+    /// The segments of a composite curve as stations, the distance along
+    /// the whole curve first; the segments are `IfcCurveSegment`s.
+    pub(super) fn curve_segments(&mut self, segments: &[Value]) -> Option<Vec<Station>> {
+        if segments.len() > MAX_SEGMENTS {
+            return None;
+        }
+        let mut out: Vec<Station> = Vec::new();
+        let mut start = 0.0;
+        for id in segments.iter().filter_map(Value::id) {
+            if out.len() > MAX_POINTS {
+                return None;
+            }
+            let seg = self.curve_segment(id)?;
+            let length = seg.last().map_or(0.0, |s| s.0);
+            let skip = out
+                .last()
+                .is_some_and(|(_, q)| len(sub(*q, seg[0].1)) <= 1e-6 * (1.0 + len(*q)));
+            // A segment starts where the one before it ended.
+            for (u, q) in seg.into_iter().skip(skip as usize) {
+                out.push((start + u, q));
+            }
+            start += length;
+        }
+        (out.len() >= 2 && out.len() <= MAX_POINTS).then_some(out)
+    }
+
+    /// An `IfcGradientCurve`: its plan curve lifted to the height its
+    /// segments give at each distance along it.
+    pub(super) fn gradient_curve(&mut self, p: &[Value], depth: u32) -> Option<Vec<Station>> {
+        if depth > MAX_DEPTH {
+            return None;
+        }
+        let profile = self.curve_segments(p.first()?.list()?)?;
+        // The profile runs in (distance along, height).
+        if profile.array_windows().any(|[a, b]| b.1[0] < a.1[0]) {
+            return None;
+        }
+        let plan = self.stations(p.get(2)?.id()?, depth + 1)?;
+        let height = |x: f64| -> f64 {
+            let k = profile
+                .partition_point(|s| s.1[0] <= x)
+                .clamp(1, profile.len() - 1);
+            let (a, b) = (profile[k - 1].1, profile[k].1);
+            if b[0] > a[0] {
+                a[1] + (b[1] - a[1]) * ((x - a[0]) / (b[0] - a[0])).clamp(0.0, 1.0)
+            } else {
+                a[1]
+            }
+        };
+        let along = |x: f64| -> V3 {
+            let k = plan.partition_point(|s| s.0 <= x).clamp(1, plan.len() - 1);
+            let (a, b) = (plan[k - 1], plan[k]);
+            let t = if b.0 > a.0 {
+                ((x - a.0) / (b.0 - a.0)).clamp(0.0, 1.0)
+            } else {
+                0.0
+            };
+            [
+                a.1[0] + (b.1[0] - a.1[0]) * t,
+                a.1[1] + (b.1[1] - a.1[1]) * t,
+                0.0,
+            ]
+        };
+        // The distances of both, in order.
+        let end = plan.last()?.0;
+        let mut xs: Vec<f64> = plan.iter().map(|s| s.0).collect();
+        xs.extend(
+            profile
+                .iter()
+                .map(|s| s.1[0])
+                .filter(|x| *x > plan[0].0 && *x < end),
+        );
+        xs.sort_by(f64::total_cmp);
+        xs.dedup_by(|a, b| (*a - *b).abs() <= 1e-9 * (1.0 + a.abs()));
+        let out: Vec<Station> = xs
+            .into_iter()
+            .map(|x| {
+                let q = along(x);
+                (x, [q[0], q[1], height(x)])
+            })
+            .collect();
+        (out.len() >= 2 && out.len() <= 2 * MAX_POINTS).then_some(out)
+    }
+
+    /// A curve of an alignment as stations: `IfcCompositeCurve` of curve
+    /// segments, `IfcGradientCurve`; any other bounded curve by the length
+    /// along its points.
+    pub(super) fn stations(&mut self, id: u32, depth: u32) -> Option<Vec<Station>> {
+        if depth > MAX_DEPTH {
+            return None;
+        }
+        let (ty, p) = self.get(id)?;
+        let first_is_curve_segment = p
+            .first()
+            .and_then(Value::list)
+            .and_then(|l| l.first())
+            .and_then(Value::id)
+            .and_then(|s| self.get(s))
+            .is_some_and(|(t, _)| t == b"IFCCURVESEGMENT");
+        if ty == b"IFCGRADIENTCURVE" {
+            return self.gradient_curve(&p, depth);
+        }
+        if is(ty, &[b"IFCCOMPOSITECURVE", b"IFC2DCOMPOSITECURVE"]) && first_is_curve_segment {
+            return self.curve_segments(p.first()?.list()?);
+        }
+        let pts = self.curve(id, depth + 1)?;
+        let mut d = 0.0;
+        let mut out = Vec::with_capacity(pts.len());
+        for (i, q) in pts.iter().enumerate() {
+            if i > 0 {
+                d += len(sub(*q, pts[i - 1]));
+            }
+            out.push((d, *q));
+        }
+        Some(out)
+    }
+
+    /// An `IfcAxis2PlacementLinear` as a transform: the point a distance
+    /// along its curve, offset to the left, up and along; its x axis along
+    /// the curve's heading, its z axis the global one (`Axis` and
+    /// `RefDirection`, when given, are read in the curve's frame: along it,
+    /// to its left, up from it).
+    pub(super) fn axis2_linear(&mut self, id: u32) -> Option<Xf> {
+        let (ty, p) = self.get(id)?;
+        if ty != b"IFCAXIS2PLACEMENTLINEAR" {
+            return None;
+        }
+        let (pty, pp) = self.get(p.first()?.id()?)?;
+        if pty != b"IFCPOINTBYDISTANCEEXPRESSION" {
+            return None;
+        }
+        let num = |i: usize| {
+            pp.get(i)
+                .filter(|v| !v.is_null())
+                .map_or(Some(0.0), |v| v.num().filter(|x| x.is_finite()))
+        };
+        let along = pp.first()?.num().filter(|x| x.is_finite())?;
+        let (lateral, vertical, longitudinal) = (num(1)?, num(2)?, num(3)?);
+        // A point is placed on the curve, not on a chord of it.
+        self.density = FINE;
+        let stations = self.stations(pp.get(4)?.id()?, 0);
+        self.density = 1;
+        let stations = stations?;
+        let k = stations
+            .partition_point(|s| s.0 <= along)
+            .clamp(1, stations.len() - 1);
+        let (a, b) = (stations[k - 1], stations[k]);
+        let t = if b.0 > a.0 {
+            ((along - a.0) / (b.0 - a.0)).clamp(0.0, 1.0)
+        } else {
+            0.0
+        };
+        let point = add(a.1, scale(sub(b.1, a.1), t));
+        let tangent = unit(sub(b.1, a.1))?;
+        // To the left of the curve, and up from it.
+        let left = unit([-tangent[1], tangent[0], 0.0])
+            .unwrap_or_else(|| super::math::any_perpendicular(tangent));
+        let up = unit(cross(tangent, left))?;
+        let at = add(
+            add(point, scale(left, lateral)),
+            add(scale(up, vertical), scale(tangent, longitudinal)),
+        );
+        let in_frame = |v: Option<&Value>| -> Option<V3> {
+            let d = self.direction(v?.id()?)?;
+            unit(add(
+                add(scale(tangent, d[0]), scale(left, d[1])),
+                scale(up, d[2]),
+            ))
+        };
+        let z = p
+            .get(1)
+            .and_then(|v| in_frame(Some(v)))
+            .unwrap_or([0.0, 0.0, 1.0]);
+        let x = first_proj_axis(z, in_frame(p.get(2)).or(Some(tangent)));
+        let y = cross(z, x);
+        let xf = Xf::new(x, y, z, at);
+        xf.is_finite().then_some(xf)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_clothoid_has_the_curvature_that_grows_with_its_length() {
+        // A = 100: the curvature is s / A^2, the heading s^2 / (2 A^2).
+        let c = curvature(&[None, Some(100.0)]).unwrap();
+        assert!((c[1] - 1.0 / 10_000.0).abs() < 1e-18);
+        let s = 50.0;
+        assert!((Parent::heading(&c, s) - s * s / (2.0 * 10_000.0)).abs() < 1e-15);
+        // A negative constant turns the other way.
+        let c = curvature(&[None, Some(-100.0)]).unwrap();
+        assert!(Parent::heading(&c, s) < 0.0);
+        // A term of zero is not a curve.
+        assert!(curvature(&[None, Some(0.0)]).is_none());
+        assert!(curvature(&[None, Some(f64::NAN)]).is_none());
+    }
+
+    #[test]
+    fn the_polynomial_spirals_terms_follow_the_published_forms() {
+        // A0 = 50: the constant curvature 1 / 50, the heading s / 50.
+        let c = curvature(&[Some(50.0)]).unwrap();
+        assert!((Parent::heading(&c, 10.0) - 0.2).abs() < 1e-15);
+        // A2 = 2: s^2 / 8, and a heading of s^3 / 24.
+        let c = curvature(&[None, None, Some(2.0)]).unwrap();
+        assert!((c[2] - 0.125).abs() < 1e-15);
+        assert!((Parent::heading(&c, 3.0) - 27.0 / 24.0).abs() < 1e-15);
+        // A3 = 2 has the sign in front of 1 / |A3^5|.
+        let c = curvature(&[None, None, None, Some(-2.0)]).unwrap();
+        assert!((c[3] + 1.0 / 16.0).abs() < 1e-15);
+    }
+
+    #[test]
+    fn a_polynomial_of_the_parameter_is_evaluated_by_horner() {
+        let p = Parent::Polynomial(Xf::IDENTITY, [vec![0.0, 1.0], vec![1.0, 0.0, 2.0], vec![]]);
+        let q = p.point(3.0).unwrap();
+        assert_eq!(q, [3.0, 19.0, 0.0]);
+    }
+}
diff --git a/crates/exav-render/src/formats/ifc/csg.rs b/crates/exav-render/src/formats/ifc/csg.rs
index 93099563..81848206 100644
--- a/crates/exav-render/src/formats/ifc/csg.rs
+++ b/crates/exav-render/src/formats/ifc/csg.rs
@@ -6,7 +6,7 @@
 //! its bound is given up (`None`), so that the caller draws the first
 //! operand as it is.
 
-use super::math::{cross, dot, lerp, sub, unit, V3};
+use super::math::{V3, cross, dot, lerp, sub, unit};
 
 /// Most polygon placements (into a tree or through one) per operation.
 const WORK: usize = 30_000_000;
diff --git a/crates/exav-render/src/formats/ifc/curves.rs b/crates/exav-render/src/formats/ifc/curves.rs
index 6fe9d201..0566156f 100644
--- a/crates/exav-render/src/formats/ifc/curves.rs
+++ b/crates/exav-render/src/formats/ifc/curves.rs
@@ -4,9 +4,9 @@
 
 use std::f64::consts::TAU;
 
-use super::math::{self, add, cross, dot, len, scale, sub, unit, Xf, V3};
+use super::math::{self, V3, Xf, add, cross, dot, len, scale, sub, unit};
 use super::step::Value;
-use super::{coords, Reader, MAX_DEPTH};
+use super::{MAX_DEPTH, Reader, coords};
 
 /// Chords per full turn of a circle.
 pub const SEGMENTS_PER_TURN: f64 = 32.0;
@@ -65,11 +65,7 @@ pub fn arc3(a: V3, m: V3, b: V3) -> Vec<V3> {
     let angle = |p: V3| {
         let d = sub(p, c);
         let t = dot(d, e2).atan2(dot(d, e1));
-        if t < 0.0 {
-            t + TAU
-        } else {
-            t
-        }
+        if t < 0.0 { t + TAU } else { t }
     };
     let (tm, tb) = (angle(m), angle(b));
     let sweep = if tm <= tb { tb } else { tb - TAU };
@@ -122,7 +118,19 @@ impl<'a> Reader<'a> {
             | b"IFCOUTERBOUNDARYCURVE"
             | b"IFCBOUNDARYCURVE" => {
                 let mut out = Vec::new();
-                for seg in p.first()?.list()?.iter().filter_map(Value::id) {
+                let segs = p.first()?.list()?;
+                // IFC4X3: segments cut from parent curves, along an alignment.
+                if segs
+                    .first()
+                    .and_then(Value::id)
+                    .and_then(|s| self.get(s))
+                    .is_some_and(|(t, _)| t == b"IFCCURVESEGMENT")
+                {
+                    return self
+                        .curve_segments(segs)
+                        .map(|s| s.into_iter().map(|(_, q)| q).collect());
+                }
+                for seg in segs.iter().filter_map(Value::id) {
                     let (sty, sp) = self.get(seg)?;
                     if !super::is(
                         sty,
@@ -145,7 +153,11 @@ impl<'a> Reader<'a> {
                 }
                 out
             }
-            b"IFCTRIMMEDCURVE" => self.trimmed(&p, depth)?,
+            b"IFCTRIMMEDCURVE" => self
+                .trimmed(&p, depth)?
+                .into_iter()
+                .map(|(_, q)| q)
+                .collect(),
             b"IFCCIRCLE" | b"IFCELLIPSE" => {
                 let (pos, a, b) = self.conic(ty, &p)?;
                 let n = SEGMENTS_PER_TURN as usize;
@@ -156,6 +168,11 @@ impl<'a> Reader<'a> {
             b"IFCBSPLINECURVEWITHKNOTS" | b"IFCRATIONALBSPLINECURVEWITHKNOTS" => {
                 self.bspline(&p)?.into_iter().map(|(_, q)| q).collect()
             }
+            b"IFCGRADIENTCURVE" => self
+                .gradient_curve(&p, depth)?
+                .into_iter()
+                .map(|(_, q)| q)
+                .collect(),
             b"IFCPCURVE" | b"IFCSURFACECURVE" | b"IFCINTERSECTIONCURVE" | b"IFCSEAMCURVE" => {
                 // The 3D curve; the p-curves are its images on surfaces.
                 self.curve(p.first()?.id()?, depth + 1)?
@@ -205,7 +222,7 @@ impl<'a> Reader<'a> {
     }
 
     /// A circle's or an ellipse's placement and semi-axes.
-    fn conic(&self, ty: &[u8], p: &[Value]) -> Option<(Xf, f64, f64)> {
+    pub(super) fn conic(&self, ty: &[u8], p: &[Value]) -> Option<(Xf, f64, f64)> {
         let pos = self.axis2(p.first()?.id()?)?;
         let a = p.get(1)?.num()?;
         let b = if ty == b"IFCELLIPSE" {
@@ -228,7 +245,9 @@ impl<'a> Reader<'a> {
             .collect()
     }
 
-    fn trimmed(&mut self, p: &[Value], depth: u32) -> Option<Vec<V3>> {
+    /// A trimmed curve's points in order, each with its parameter on the
+    /// basis curve (an angle in the file's unit for a circle or ellipse).
+    pub(super) fn trimmed(&mut self, p: &[Value], depth: u32) -> Option<Vec<(f64, V3)>> {
         let basis = p.first()?.id()?;
         let (t1, t2) = (self.trims(p.get(1)), self.trims(p.get(2)));
         let sense = p.get(3).and_then(Value::boolean).unwrap_or(true);
@@ -277,15 +296,18 @@ impl<'a> Reader<'a> {
                     }
                 }
                 let n = segments(e - s);
-                let mut out: Vec<V3> = (0..=n)
-                    .map(|k| conic_point(&pos, a, b, s + (e - s) * k as f64 / n as f64))
+                let mut out: Vec<(f64, V3)> = (0..=n)
+                    .map(|k| {
+                        let t = s + (e - s) * k as f64 / n as f64;
+                        (t / self.angle, conic_point(&pos, a, b, t))
+                    })
                     .collect();
                 // The ends exactly where the trimming points say.
                 if let Trim::Point(q) = t1[i1] {
-                    out[0] = q;
+                    out[0].1 = q;
                 }
                 if let Trim::Point(q) = t2[i2] {
-                    out[n] = q;
+                    out[n].1 = q;
                 }
                 Some(out)
             }
@@ -293,9 +315,17 @@ impl<'a> Reader<'a> {
                 let o = self.point(bp.first()?.id()?)?;
                 let vp = self.f.params(bp.get(1)?.id()?)?;
                 let d = scale(self.direction(vp.first()?.id()?)?, vp.get(1)?.num()?);
+                let dd = dot(d, d);
                 let at = |t: &Trim| match t {
-                    Trim::Point(q) => *q,
-                    Trim::Param(u) => add(o, scale(d, *u)),
+                    Trim::Point(q) => (
+                        if dd > 0.0 {
+                            dot(sub(*q, o), d) / dd
+                        } else {
+                            0.0
+                        },
+                        *q,
+                    ),
+                    Trim::Param(u) => (*u, add(o, scale(d, *u))),
                 };
                 Some(vec![at(&t1[i1]), at(&t2[i2])])
             }
@@ -349,9 +379,9 @@ impl<'a> Reader<'a> {
                 if samples.is_empty() {
                     return None;
                 }
-                let mut out = vec![at(lo)];
-                out.extend(samples.iter().filter(|x| x.0 > lo && x.0 < hi).map(|x| x.1));
-                out.push(at(hi));
+                let mut out = vec![(lo, at(lo))];
+                out.extend(samples.iter().filter(|x| x.0 > lo && x.0 < hi));
+                out.push((hi, at(hi)));
                 // From the first trim to the second.
                 if s > e {
                     out.reverse();
@@ -362,7 +392,7 @@ impl<'a> Reader<'a> {
     }
 
     /// A B-spline curve sampled, with each sample's parameter.
-    fn bspline(&self, p: &[Value]) -> Option<Vec<(f64, V3)>> {
+    pub(super) fn bspline(&self, p: &[Value]) -> Option<Vec<(f64, V3)>> {
         let degree = usize::try_from(p.first()?.int()?)
             .ok()
             .filter(|d| (1..=16).contains(d))?;
@@ -393,7 +423,7 @@ impl<'a> Reader<'a> {
             .zip(&mults)
             .flat_map(|(k, &m)| std::iter::repeat_n(*k, m))
             .collect();
-        if u.len() < n + degree + 1 || u.windows(2).any(|w| w[1] < w[0]) {
+        if u.len() < n + degree + 1 || u.array_windows().any(|[a, b]| b < a) {
             return None;
         }
         if weights
@@ -467,9 +497,10 @@ mod tests {
     fn three_points_make_the_arc_through_them() {
         let pts = arc3([1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [-1.0, 0.0, 0.0]);
         assert_eq!(pts.len(), 17);
-        assert!(pts
-            .iter()
-            .all(|p| (len(*p) - 1.0).abs() < 1e-9 && p[1] >= -1e-12));
+        assert!(
+            pts.iter()
+                .all(|p| (len(*p) - 1.0).abs() < 1e-9 && p[1] >= -1e-12)
+        );
         // The other way round: through the bottom.
         let pts = arc3([1.0, 0.0, 0.0], [0.0, -1.0, 0.0], [-1.0, 0.0, 0.0]);
         assert!(pts.iter().all(|p| p[1] <= 1e-12));
diff --git a/crates/exav-render/src/formats/ifc/directrix.rs b/crates/exav-render/src/formats/ifc/directrix.rs
new file mode 100644
index 00000000..e833d5fc
--- /dev/null
+++ b/crates/exav-render/src/formats/ifc/directrix.rs
@@ -0,0 +1,288 @@
+//! The directrix of a sweep between its start and end parameters
+//! (`StartParam`, `EndParam` of `IfcSweptDiskSolid` and
+//! `IfcDirectrixCurveSweptAreaSolid`): the curve's points from one
+//! parameter to the other, by the parametrisation each kind of curve
+//! publishes. A polyline's parameter is the index of its points, a
+//! composite curve's the sum of its segments' parametric lengths, a circle's
+//! an angle in the file's unit, a line's the multiple of its vector. Two
+//! writers' habits are read as they meant them: a range of 0 to 1 on a
+//! polyline of more than one segment is the whole polyline, and an end that
+//! counts each polyline of a composite curve once is the end of that curve.
+
+use std::f64::consts::TAU;
+
+use super::curves::{conic_point, segments};
+use super::math::{V3, add, scale, sub};
+use super::step::Value;
+use super::{MAX_DEPTH, Reader, is};
+
+/// Most points of a curve that carries parameters.
+const MAX_POINTS: usize = 1 << 16;
+
+/// The points between parameters `s` and `e` (from `s` to `e`, the other
+/// way when `e` is the smaller), the ends at those parameters. `None` when
+/// they leave nothing between them. Parameters beyond the curve are its
+/// ends. `samples` ascend in parameter.
+fn cut(samples: &[(f64, V3)], s: f64, e: f64) -> Option<Vec<V3>> {
+    let (first, last) = (samples.first()?.0, samples.last()?.0);
+    if first.is_nan() || last.is_nan() || first > last {
+        return None;
+    }
+    let (lo, hi) = (s.min(e).clamp(first, last), s.max(e).clamp(first, last));
+    if hi.is_nan() || lo.is_nan() || hi <= lo {
+        return None;
+    }
+    let at = |t: f64| -> V3 {
+        let k = samples
+            .partition_point(|x| x.0 <= t)
+            .clamp(1, samples.len().max(2))
+            - 1;
+        match (samples.get(k), samples.get(k + 1)) {
+            (Some(a), Some(b)) if b.0 > a.0 => add(
+                a.1,
+                scale(sub(b.1, a.1), ((t - a.0) / (b.0 - a.0)).clamp(0.0, 1.0)),
+            ),
+            (Some(a), _) => a.1,
+            _ => [0.0; 3],
+        }
+    };
+    let mut out = vec![at(lo)];
+    out.extend(samples.iter().filter(|x| x.0 > lo && x.0 < hi).map(|x| x.1));
+    out.push(at(hi));
+    if s > e {
+        out.reverse();
+    }
+    Some(out)
+}
+
+impl<'a> Reader<'a> {
+    /// The directrix `id` from `start` to `end`, each a parameter value or
+    /// null for the curve's own end. A curve whose parameters are not known
+    /// is swept whole, and counted.
+    pub(super) fn directrix(
+        &mut self,
+        id: u32,
+        start: Option<&Value>,
+        end: Option<&Value>,
+        depth: u32,
+    ) -> Option<Vec<V3>> {
+        // Null for absent; a value that is no number is no sweep.
+        let param = |v: Option<&Value>| -> Option<Option<f64>> {
+            match v {
+                Some(v) if !v.is_null() => v.num().filter(|x| x.is_finite()).map(Some),
+                _ => Some(None),
+            }
+        };
+        let (s, e) = (param(start)?, param(end)?);
+        if s.is_none() && e.is_none() {
+            return self.curve(id, depth + 1);
+        }
+        let ty = self.get(id)?.0;
+        let Some(mut samples) = self.parametrised(id, s.zip(e), depth + 1) else {
+            self.unsupported(ty);
+            return self.curve(id, depth + 1);
+        };
+        if let Some(alt) = self.counted_by_polyline(id, e, samples.last()?.0, depth) {
+            samples = alt;
+        }
+        // Allplan writes 0 to 1 for a whole polyline of any length.
+        if matches!(ty, b"IFCPOLYLINE" | b"IFCINDEXEDPOLYCURVE")
+            && samples.len() > 2
+            && s == Some(0.0)
+            && e == Some(1.0)
+        {
+            return Some(samples.into_iter().map(|x| x.1).collect());
+        }
+        let first = samples.first()?.0;
+        let last = samples.last()?.0;
+        cut(&samples, s.unwrap_or(first), e.unwrap_or(last))
+    }
+
+    /// The points of curve `id` with their parameters, ascending. `ends`
+    /// are the sweep's parameters, which an unbounded line needs.
+    fn parametrised(
+        &mut self,
+        id: u32,
+        ends: Option<(f64, f64)>,
+        depth: u32,
+    ) -> Option<Vec<(f64, V3)>> {
+        if depth > MAX_DEPTH {
+            return None;
+        }
+        let (ty, p) = self.get(id)?;
+        let indexed = |pts: Vec<V3>| -> Vec<(f64, V3)> {
+            pts.into_iter()
+                .enumerate()
+                .map(|(i, q)| (i as f64, q))
+                .collect()
+        };
+        let samples: Option<Vec<(f64, V3)>> = match ty {
+            b"IFCPOLYLINE" => {
+                Some(indexed(self.points(p.first())?)).filter(|s| s.len() <= MAX_POINTS)
+            }
+            b"IFCINDEXEDPOLYCURVE" => {
+                // Straight parts only: an arc has no published parameter.
+                let arcs = p.get(1).and_then(Value::list).is_some_and(|l| {
+                    l.iter()
+                        .any(|s| matches!(s, Value::Typed(k, _) if *k != b"IFCLINEINDEX"))
+                });
+                if arcs {
+                    return None;
+                }
+                Some(indexed(self.curve(id, depth)?))
+            }
+            b"IFCTRIMMEDCURVE" => self.trimmed(&p, depth),
+            b"IFCCIRCLE" | b"IFCELLIPSE" => {
+                let (pos, a, b) = self.conic(ty, &p)?;
+                let n = segments(TAU);
+                Some(
+                    (0..=n)
+                        .map(|k| {
+                            let t = TAU * k as f64 / n as f64;
+                            (t / self.angle, conic_point(&pos, a, b, t))
+                        })
+                        .collect(),
+                )
+            }
+            b"IFCLINE" => {
+                let (s, e) = ends?;
+                let o = self.point(p.first()?.id()?)?;
+                let vp = self.f.params(p.get(1)?.id()?)?;
+                let d = scale(self.direction(vp.first()?.id()?)?, vp.get(1)?.num()?);
+                Some(vec![
+                    (s.min(e), add(o, scale(d, s.min(e)))),
+                    (s.max(e), add(o, scale(d, s.max(e)))),
+                ])
+            }
+            b"IFCBSPLINECURVEWITHKNOTS" | b"IFCRATIONALBSPLINECURVEWITHKNOTS" => self.bspline(&p),
+            b"IFCCOMPOSITECURVE" | b"IFC2DCOMPOSITECURVE" => {
+                let list = p.first()?.list()?;
+                // Segments of IFC4X3: stations along the curve.
+                let curve_segments = list
+                    .first()
+                    .and_then(Value::id)
+                    .and_then(|s| self.get(s))
+                    .is_some_and(|(t, _)| t == b"IFCCURVESEGMENT");
+                if curve_segments {
+                    return self.curve_segments(list);
+                }
+                self.composite(list, false, depth)
+            }
+            b"IFCGRADIENTCURVE" => self.gradient_curve(&p, depth),
+            _ => None,
+        };
+        samples.filter(|s| s.len() >= 2 && s.array_windows().all(|[a, b]| b.0 >= a.0))
+    }
+
+    /// The samples of composite curve `id` when its `end` parameter only
+    /// fits a count of 1 per polyline, which is how Revit writes it, and
+    /// not the one `last` of the usual count.
+    fn counted_by_polyline(
+        &mut self,
+        id: u32,
+        end: Option<f64>,
+        last: f64,
+        depth: u32,
+    ) -> Option<Vec<(f64, V3)>> {
+        let fits = |a: f64, b: f64| (a - b).abs() <= 1e-6 * b.abs().max(1.0);
+        let end = end.filter(|e| !fits(*e, last))?;
+        let (ty, p) = self.get(id)?;
+        if ty != b"IFCCOMPOSITECURVE" {
+            return None;
+        }
+        let alt = self.composite(p.first()?.list()?, true, depth + 1)?;
+        fits(end, alt.last()?.0).then_some(alt)
+    }
+
+    /// The segments `list` of a composite curve, each spanning its parent
+    /// curve's parameters. With `unit_polylines` a polyline spans 1 however
+    /// many points it has, as Revit counts it.
+    fn composite(
+        &mut self,
+        list: &[Value],
+        unit_polylines: bool,
+        depth: u32,
+    ) -> Option<Vec<(f64, V3)>> {
+        let mut out: Vec<(f64, V3)> = Vec::new();
+        let mut acc = 0.0;
+        for seg in list.iter().filter_map(Value::id) {
+            let (sty, sp) = self.get(seg)?;
+            if !is(
+                sty,
+                &[
+                    b"IFCCOMPOSITECURVESEGMENT",
+                    b"IFCREPARAMETRISEDCOMPOSITECURVESEGMENT",
+                ],
+            ) {
+                return None;
+            }
+            let parent_id = sp.get(2)?.id()?;
+            let parent = self.parametrised(parent_id, None, depth + 1)?;
+            let (t0, t1) = (parent.first()?.0, parent.last()?.0);
+            let own = t1 - t0;
+            let length = if sty == b"IFCREPARAMETRISEDCOMPOSITECURVESEGMENT" {
+                sp.get(3)?.num().filter(|l| *l > 0.0 && l.is_finite())?
+            } else if unit_polylines
+                && self
+                    .get(parent_id)
+                    .is_some_and(|(t, _)| t == b"IFCPOLYLINE")
+            {
+                1.0
+            } else {
+                own
+            };
+            let factor = if own > 0.0 { length / own } else { 0.0 };
+            let same = sp.get(1).and_then(Value::boolean).unwrap_or(true);
+            let mut part: Vec<(f64, V3)> = parent
+                .iter()
+                .map(|&(t, q)| (acc + if same { t - t0 } else { t1 - t } * factor, q))
+                .collect();
+            if !same {
+                part.reverse();
+            }
+            out.extend(part);
+            acc += length;
+            if out.len() > MAX_POINTS {
+                return None;
+            }
+        }
+        Some(out)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn polyline() -> Vec<(f64, V3)> {
+        vec![
+            (0.0, [0.0, 0.0, 0.0]),
+            (1.0, [2.0, 0.0, 0.0]),
+            (2.0, [2.0, 2.0, 0.0]),
+        ]
+    }
+
+    #[test]
+    fn a_polyline_is_cut_between_parameters() {
+        // Half way along the first segment to a quarter along the second.
+        let c = cut(&polyline(), 0.5, 1.25).unwrap();
+        assert_eq!(c, vec![[1.0, 0.0, 0.0], [2.0, 0.0, 0.0], [2.0, 0.5, 0.0]]);
+        // The end first runs the curve the other way.
+        let c = cut(&polyline(), 1.25, 0.5).unwrap();
+        assert_eq!(c, vec![[2.0, 0.5, 0.0], [2.0, 0.0, 0.0], [1.0, 0.0, 0.0]]);
+    }
+
+    #[test]
+    fn parameters_beyond_the_curve_are_its_ends_and_an_empty_range_is_none() {
+        let c = cut(&polyline(), -5.0, 99.0).unwrap();
+        assert_eq!(c.len(), 3);
+        assert_eq!(c[0], [0.0; 3]);
+        assert_eq!(c[2], [2.0, 2.0, 0.0]);
+        assert!(cut(&polyline(), 1.0, 1.0).is_none());
+        assert!(cut(&polyline(), 5.0, 9.0).is_none());
+        assert!(cut(&polyline(), f64::NAN, 1.0).is_none());
+        assert!(cut(&[], 0.0, 1.0).is_none());
+        // Samples out of order are not a curve.
+        assert!(cut(&[(1.0, [0.0; 3]), (0.0, [1.0; 3])], 0.0, 1.0).is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/ifc/faces.rs b/crates/exav-render/src/formats/ifc/faces.rs
new file mode 100644
index 00000000..9b68eaa7
--- /dev/null
+++ b/crates/exav-render/src/formats/ifc/faces.rs
@@ -0,0 +1,1002 @@
+//! Faces of advanced B-reps on curved surfaces: cylinders, spheres, tori and
+//! B-spline surfaces. A face is meshed in its surface's parameters: its
+//! boundary is unrolled into (u, v), and the polygon that bounds it is meshed
+//! there: a regular grid for a rectangle, else its triangles, bisected until
+//! no side strays from the surface by more than a chord of a 32-chord circle
+//! does.
+
+use std::f64::consts::{FRAC_PI_2, TAU};
+
+use super::curves::segments;
+use super::math::{V2, V3, Xf, len, sub};
+use super::spline::{MAX_DEGREE, Spline, expand_knots};
+use super::step::Value;
+use super::triangulate::triangulate;
+use super::{Mesh, Reader};
+
+/// Most triangles one face is bisected into.
+const MAX_FACE_TRIANGLES: usize = 1 << 16;
+/// Most boundary points of one face projected on a B-spline surface.
+const MAX_PROJECTED: usize = 1 << 14;
+/// Samples per side of the grid that starts the projection of a boundary.
+const SEARCH_GRID: usize = 16;
+/// Most points examined simplifying one loop.
+const SIMPLIFY_WORK: usize = 1 << 24;
+
+/// The angle `a`, a whole number of turns off, within half a turn of `prev`.
+/// In one step: turns added one at a time take as many steps as the polyline
+/// has wound, which a long spiral makes quadratic.
+fn continuous(a: f64, prev: f64) -> f64 {
+    a - TAU * ((a - prev) / TAU).round()
+}
+
+/// How far from its chord the surface may be at the middle of a triangle's
+/// side, relative to the chord: that of a circle drawn with 32 chords, which
+/// is how the curves that bound a face are sampled.
+const MAX_SAG: f64 = 0.026;
+
+/// How a polygon of parameters is meshed.
+struct Tess<'f> {
+    /// The grid for a rectangle of this extent: chords in `u` and in `v`.
+    counts: &'f dyn Fn(V2) -> (usize, usize),
+    /// A side of a triangle with a larger extent is split whatever its sag.
+    max_extent: V2,
+}
+
+/// The indices of the points of the closed loop `uv` that stay when those
+/// that lie within `tol` of the line between the two kept on either side
+/// of them are dropped (Douglas-Peucker, from the first point and the
+/// one furthest from it). The work is bounded: past it the rest is kept.
+fn simplify(uv: &[V2], tol: f64) -> Vec<usize> {
+    let n = uv.len();
+    if n <= 4 || !tol.is_finite() || tol <= 0.0 {
+        return (0..n).collect();
+    }
+    let far = (1..n)
+        .max_by(|&i, &j| {
+            let d = |k: usize| (uv[k][0] - uv[0][0]).hypot(uv[k][1] - uv[0][1]);
+            d(i).total_cmp(&d(j))
+        })
+        .unwrap_or(1);
+    let mut keep = vec![false; n];
+    keep[0] = true;
+    keep[far] = true;
+    // Chains of indices a..b, the second one wrapping to the start.
+    let mut stack = vec![(0usize, far), (far, n)];
+    let mut work = 0usize;
+    while let Some((a, b)) = stack.pop() {
+        if b <= a + 1 {
+            continue;
+        }
+        let (pa, pb) = (uv[a % n], uv[b % n]);
+        let (dx, dy) = (pb[0] - pa[0], pb[1] - pa[1]);
+        let l = dx.hypot(dy);
+        let mut worst = (0.0f64, a);
+        for k in a + 1..b {
+            work += 1;
+            let p = uv[k % n];
+            let d = if l > 0.0 {
+                ((p[0] - pa[0]) * dy - (p[1] - pa[1]) * dx).abs() / l
+            } else {
+                (p[0] - pa[0]).hypot(p[1] - pa[1])
+            };
+            if d > worst.0 {
+                worst = (d, k);
+            }
+        }
+        if worst.0 > tol && work < SIMPLIFY_WORK {
+            keep[worst.1 % n] = true;
+            stack.push((a, worst.1));
+            stack.push((worst.1, b));
+        } else if work >= SIMPLIFY_WORK {
+            for k in a + 1..b {
+                keep[k % n] = true;
+            }
+        }
+    }
+    let kept: Vec<usize> = (0..n).filter(|&i| keep[i]).collect();
+    if kept.len() >= 3 {
+        kept
+    } else {
+        (0..n).collect()
+    }
+}
+
+/// The corners of the box round the points.
+fn world_extent(pts: &[V3]) -> (V3, V3) {
+    let mut lo = [f64::INFINITY; 3];
+    let mut hi = [f64::NEG_INFINITY; 3];
+    for p in pts {
+        for k in 0..3 {
+            lo[k] = lo[k].min(p[k]);
+            hi[k] = hi[k].max(p[k]);
+        }
+    }
+    (lo, hi)
+}
+
+/// The corners of the rectangle a boundary is, when its outer loop's points
+/// all lie on the sides of the box round it and it has the box's area.
+fn rectangle(b: &Boundary) -> Option<(V2, V2)> {
+    if !b.holes.is_empty() {
+        return None;
+    }
+    let pts: Vec<V2> = b.outer.iter().map(|&i| b.uv[i as usize]).collect();
+    let (lo, hi) = extent(&pts);
+    let (w, h) = (hi[0] - lo[0], hi[1] - lo[1]);
+    if !(w > 0.0 && h > 0.0 && w.is_finite() && h.is_finite()) {
+        return None;
+    }
+    // Projected points are a little off their sides.
+    let tol = 1e-3 * w.max(h);
+    let on_a_side = |p: &V2| {
+        (p[0] - lo[0]).abs() <= tol
+            || (hi[0] - p[0]).abs() <= tol
+            || (p[1] - lo[1]).abs() <= tol
+            || (hi[1] - p[1]).abs() <= tol
+    };
+    if !pts.iter().all(on_a_side) {
+        return None;
+    }
+    let n = pts.len();
+    let at = |i: usize| [pts[i % n][0] - lo[0], pts[i % n][1] - lo[1]];
+    let area: f64 = (0..n)
+        .map(|i| at(i)[0] * at(i + 1)[1] - at(i + 1)[0] * at(i)[1])
+        .sum::<f64>()
+        / 2.0;
+    ((area.abs() - w * h).abs() <= 5e-3 * w * h).then_some((lo, hi))
+}
+
+/// An elementary surface and its parametrisation (ISO 10303-42), in the
+/// placement `pos`. `u` is the angle round the axis. All three are turned
+/// so that `d/du x d/dv` points out of the surface.
+enum Surf {
+    /// P = pos(r cos u, r sin u, v).
+    Cylinder { pos: Xf, inv: Xf, r: f64 },
+    /// P = pos(r cos v cos u, r cos v sin u, r sin v), v in -pi/2..pi/2.
+    Sphere { pos: Xf, inv: Xf, r: f64 },
+    /// P = pos((R + r cos v) cos u, (R + r cos v) sin u, r sin v).
+    Torus {
+        pos: Xf,
+        inv: Xf,
+        big: f64,
+        small: f64,
+    },
+}
+
+impl Surf {
+    fn eval(&self, u: f64, v: f64) -> V3 {
+        match self {
+            Surf::Cylinder { pos, r, .. } => pos.point([r * u.cos(), r * u.sin(), v]),
+            Surf::Sphere { pos, r, .. } => {
+                // The poles exactly, not a rounding error off.
+                if v.abs() >= FRAC_PI_2 - 1e-12 {
+                    return pos.point([0.0, 0.0, r * v.signum()]);
+                }
+                pos.point([r * v.cos() * u.cos(), r * v.cos() * u.sin(), r * v.sin()])
+            }
+            Surf::Torus {
+                pos, big, small, ..
+            } => {
+                let rho = big + small * v.cos();
+                pos.point([rho * u.cos(), rho * u.sin(), small * v.sin()])
+            }
+        }
+    }
+
+    /// The parameters of a point on the surface, `u` (and `v` where it is an
+    /// angle) within half a turn of those of the point before it.
+    fn uv(&self, p: V3, prev: Option<V2>) -> V2 {
+        let (inv, r) = match self {
+            Surf::Cylinder { inv, r, .. } | Surf::Sphere { inv, r, .. } => (inv, *r),
+            Surf::Torus { inv, big, .. } => (inv, *big),
+        };
+        let l = inv.point(p);
+        let rho = l[0].hypot(l[1]);
+        // On the axis the angle is any: that of the point before it.
+        let mut u = if rho > 1e-9 * r {
+            l[1].atan2(l[0])
+        } else {
+            prev.map_or(0.0, |q| q[0])
+        };
+        if let Some(q) = prev {
+            u = continuous(u, q[0]);
+        }
+        let mut v = match self {
+            Surf::Cylinder { .. } => l[2],
+            Surf::Sphere { .. } => l[2].atan2(rho),
+            Surf::Torus { big, .. } => l[2].atan2(rho - big),
+        };
+        if let (Surf::Torus { .. }, Some(q)) = (self, prev) {
+            v = continuous(v, q[1]);
+        }
+        [u, v]
+    }
+
+    /// The chords across a rectangle of parameters, as many as the curves
+    /// that bound a face of that size are sampled with. A cylinder is
+    /// straight along `v`.
+    fn counts(&self, extent: V2) -> (usize, usize) {
+        let nu = segments(extent[0]);
+        match self {
+            Surf::Cylinder { .. } => (nu, 1),
+            _ => (nu, segments(extent[1])),
+        }
+    }
+
+    /// The parameter extent past which a chord is always split: the curve
+    /// of a surface is never straighter than its chord looks.
+    fn max_extent(&self) -> V2 {
+        let quarter = TAU / 4.0;
+        match self {
+            Surf::Cylinder { .. } => [quarter, f64::INFINITY],
+            _ => [quarter, quarter],
+        }
+    }
+
+    /// Whether `v` is an angle that wraps.
+    fn v_wraps(&self) -> bool {
+        matches!(self, Surf::Torus { .. })
+    }
+}
+
+/// A face's boundary in parameter space and in space: each point once,
+/// the loops as indices into it.
+struct Boundary {
+    uv: Vec<V2>,
+    world: Vec<V3>,
+    outer: Vec<u32>,
+    holes: Vec<Vec<u32>>,
+}
+
+impl Boundary {
+    fn new() -> Self {
+        Boundary {
+            uv: Vec::new(),
+            world: Vec::new(),
+            outer: Vec::new(),
+            holes: Vec::new(),
+        }
+    }
+
+    fn push(&mut self, uv: V2, world: V3) -> u32 {
+        self.uv.push(uv);
+        self.world.push(world);
+        (self.uv.len() - 1) as u32
+    }
+}
+
+/// A closed loop unrolled: its parameters, each next to the one before, and
+/// how many turns it makes round `u` and round `v` (the latter when `v`
+/// wraps).
+fn unroll(surf: &Surf, pts: &[V3]) -> (Vec<V2>, [i64; 2]) {
+    let mut uv: Vec<V2> = Vec::with_capacity(pts.len());
+    for &p in pts {
+        uv.push(surf.uv(p, uv.last().copied()));
+    }
+    let (first, last) = (uv[0], uv[uv.len() - 1]);
+    // The closing step, from the last point back to the first.
+    let turns = |k: usize| ((first[k] - last[k]) / TAU).round();
+    let wu = -turns(0);
+    let wv = if surf.v_wraps() { -turns(1) } else { 0.0 };
+    (uv, [wu as i64, wv as i64])
+}
+
+/// The parameters' bounding box.
+fn extent(uv: &[V2]) -> (V2, V2) {
+    let mut lo = [f64::INFINITY; 2];
+    let mut hi = [f64::NEG_INFINITY; 2];
+    for p in uv {
+        for k in 0..2 {
+            lo[k] = lo[k].min(p[k]);
+            hi[k] = hi[k].max(p[k]);
+        }
+    }
+    (lo, hi)
+}
+
+/// `uv` moved by whole turns, in the parameters that wrap, to lie round
+/// `target`.
+fn near(uv: &mut [V2], target: V2, wraps: [bool; 2]) {
+    let (lo, hi) = extent(uv);
+    for k in 0..2 {
+        if wraps[k] {
+            let shift = TAU * (((target[k] - (lo[k] + hi[k]) / 2.0) / TAU).round());
+            for p in uv.iter_mut() {
+                p[k] += shift;
+            }
+        }
+    }
+}
+
+/// A loop that winds once round parameter `c`, unrolled with `c` growing:
+/// the loop reversed when it winds the other way.
+fn rising(surf: &Surf, pts: &[V3], c: usize) -> Option<(Vec<V2>, Vec<V3>)> {
+    let (uv, wind) = unroll(surf, pts);
+    if wind[c] == 1 {
+        return Some((uv, pts.to_vec()));
+    }
+    let back: Vec<V3> = pts.iter().rev().copied().collect();
+    let (uv, wind) = unroll(surf, &back);
+    (wind[c] == 1).then_some((uv, back))
+}
+
+/// The band between two loops that each wind once round parameter `c`: a
+/// polygon that follows the lower loop once round, climbs the seam to the
+/// upper one, and follows that back.
+fn band(surf: &Surf, a: &[V3], b: &[V3], c: usize) -> Option<Boundary> {
+    let d = 1 - c;
+    let ((a_uv, a_pts), (b_uv, b_pts)) = (rising(surf, a, c)?, rising(surf, b, c)?);
+    let mean = |uv: &[V2]| uv.iter().map(|p| p[d]).sum::<f64>() / uv.len() as f64;
+    // The lower loop first.
+    let ((lo_uv, lo_pts), (hi_uv, hi_pts)) = if mean(&a_uv) <= mean(&b_uv) {
+        ((a_uv, a_pts), (b_uv, b_pts))
+    } else {
+        ((b_uv, b_pts), (a_uv, a_pts))
+    };
+    let start = lo_uv[0][c];
+    // The upper loop with its parameter taken into one turn from `start`,
+    // started where it wraps.
+    let wrapped: Vec<f64> = hi_uv
+        .iter()
+        .map(|p| start + (p[c] - start).rem_euclid(TAU))
+        .collect();
+    let n = wrapped.len();
+    let first = (0..n)
+        .find(|&i| wrapped[i] < wrapped[(i + n - 1) % n])
+        .unwrap_or(0);
+    let order: Vec<usize> = (0..n).map(|k| (first + k) % n).collect();
+    // Where the upper loop crosses the seam: between its last point before
+    // the wrap and its first one after.
+    let (last, next) = (order[n - 1], order[0]);
+    let (cl, cn) = (wrapped[last], wrapped[next] + TAU);
+    let t = if cn > cl {
+        (start + TAU - cl) / (cn - cl)
+    } else {
+        0.0
+    };
+    let seam = hi_uv[last][d] + t * (hi_uv[next][d] - hi_uv[last][d]);
+    let at = |cc: f64, dd: f64| -> V2 {
+        let mut p = [0.0; 2];
+        p[c] = cc;
+        p[d] = dd;
+        p
+    };
+    let mut out = Boundary::new();
+    for (uv, w) in lo_uv.iter().zip(&lo_pts) {
+        let i = out.push(*uv, *w);
+        out.outer.push(i);
+    }
+    let end = at(start + TAU, lo_uv[0][d]);
+    let i = out.push(end, lo_pts[0]);
+    out.outer.push(i);
+    let right = at(start + TAU, seam);
+    let i = out.push(right, surf.eval(right[0], right[1]));
+    out.outer.push(i);
+    for &k in order.iter().rev() {
+        let i = out.push(at(wrapped[k], hi_uv[k][d]), hi_pts[k]);
+        out.outer.push(i);
+    }
+    let left = at(start, seam);
+    let i = out.push(left, surf.eval(left[0], left[1]));
+    out.outer.push(i);
+    Some(out)
+}
+
+/// The boundary of a face on `surf` in its parameters. `left`: the face is
+/// on the left of its outer loop in (u, v), which is the case when the face
+/// faces the way the surface does. A loop that does not wind round the
+/// surface bounds the area inside it; one that winds round a sphere once
+/// (a cap) bounds the area between it and a pole. `None` for the rest.
+fn boundary(surf: &Surf, loops: &[Vec<V3>], left: bool) -> Option<Boundary> {
+    let mut b = Boundary::new();
+    let wraps = [true, surf.v_wraps()];
+    let (outer_pts, hole_pts) = loops.split_first()?;
+    let (outer_uv, wind) = unroll(surf, outer_pts);
+    // Two loops that each wind once round the same parameter, without a
+    // seam between them (as some writers leave a tube): the band between.
+    if let [first, second] = loops {
+        let (wa, wb) = (wind, unroll(surf, second).1);
+        for c in 0..2 {
+            let d = 1 - c;
+            if wraps[c] && wa[c].abs() == 1 && wb[c].abs() == 1 && wa[d] == 0 && wb[d] == 0 {
+                return band(surf, first, second, c);
+            }
+        }
+    }
+    match wind {
+        [0, 0] => {
+            for (uv, w) in outer_uv.iter().zip(outer_pts) {
+                let i = b.push(*uv, *w);
+                b.outer.push(i);
+            }
+        }
+        [w @ (-1 | 1), 0] if matches!(surf, Surf::Sphere { .. }) => {
+            let Surf::Sphere { pos, r, .. } = surf else {
+                return None;
+            };
+            // Seen from the face's side the loop runs one way round the
+            // axis; the face is on its left.
+            let pole = (if left { w } else { -w }) as f64 * FRAC_PI_2;
+            let (u0, v0) = (outer_uv[0][0], outer_uv[0][1]);
+            let u1 = u0 + TAU * w as f64;
+            for (uv, p) in outer_uv.iter().zip(outer_pts) {
+                let i = b.push(*uv, *p);
+                b.outer.push(i);
+            }
+            let end = b.push([u1, v0], outer_pts[0]);
+            let pole_point = pos.point([0.0, 0.0, r * pole.signum()]);
+            let (p1, p0) = (
+                b.push([u1, pole], pole_point),
+                b.push([u0, pole], pole_point),
+            );
+            b.outer.extend([end, p1, p0]);
+        }
+        _ => return None,
+    }
+    // Holes: loops that do not wind, turned into the outer loop's turn.
+    let (lo, hi) = extent(&b.uv);
+    let centre = [(lo[0] + hi[0]) / 2.0, (lo[1] + hi[1]) / 2.0];
+    for h in hole_pts {
+        let (mut uv, wind) = unroll(surf, h);
+        if wind != [0, 0] {
+            return None;
+        }
+        near(&mut uv, centre, wraps);
+        let ring: Vec<u32> = uv.iter().zip(h).map(|(uv, w)| b.push(*uv, *w)).collect();
+        b.holes.push(ring);
+    }
+    Some(b)
+}
+
+impl<'a> Reader<'a> {
+    /// A face on a curved surface, `None` for a plane and for what is not
+    /// handled (counted), which the caller draws flat from the face's loops.
+    pub(super) fn surface_face(&mut self, p: &[Value], depth: u32) -> Option<Mesh> {
+        let sid = p.get(1)?.id()?;
+        let (sty, sp) = self.get(sid)?;
+        let mut m = match sty {
+            b"IFCBSPLINESURFACEWITHKNOTS" | b"IFCRATIONALBSPLINESURFACEWITHKNOTS" => {
+                match self.spline_face(sty, &sp, p, depth) {
+                    Some(m) => m,
+                    None => {
+                        self.unsupported(sty);
+                        return None;
+                    }
+                }
+            }
+            b"IFCCYLINDRICALSURFACE" | b"IFCSPHERICALSURFACE" | b"IFCTOROIDALSURFACE" => {
+                match self.quadric_face(sty, &sp, p, depth) {
+                    Some(m) => m,
+                    None => {
+                        self.unsupported(sty);
+                        return None;
+                    }
+                }
+            }
+            b"IFCPLANE" => return None,
+            _ => {
+                self.unsupported(sty);
+                return None;
+            }
+        };
+        // Meshed facing the way the surface does.
+        if p.get(2).and_then(Value::boolean) == Some(false) {
+            for t in &mut m.t {
+                t.swap(1, 2);
+            }
+        }
+        Some(m)
+    }
+
+    /// The loops of a face's bounds in space, the outer one first, each
+    /// turned as its bound says.
+    fn face_loops(&mut self, bounds: &[Value], depth: u32) -> Option<Vec<Vec<V3>>> {
+        let mut loops: Vec<Vec<V3>> = Vec::new();
+        let mut outer = None;
+        for b in bounds.iter().filter_map(Value::id) {
+            let (bty, bp) = self.get(b)?;
+            let (lty, lp) = self.get(bp.first()?.id()?)?;
+            let mut pts = match lty {
+                b"IFCEDGELOOP" => {
+                    let (pts, connected) = self.edge_loop_checked(&lp, depth)?;
+                    // Edges flagged the wrong way round do not make a loop.
+                    if !connected {
+                        return None;
+                    }
+                    pts
+                }
+                b"IFCPOLYLOOP" => {
+                    let pts: Vec<V3> = lp
+                        .first()?
+                        .list()?
+                        .iter()
+                        .map(|q| self.point(q.id()?))
+                        .collect::<Option<_>>()?;
+                    if pts.len() < 3 {
+                        return None;
+                    }
+                    pts
+                }
+                _ => return None,
+            };
+            if bp.get(1).and_then(Value::boolean) == Some(false) {
+                pts.reverse();
+            }
+            if bty == b"IFCFACEOUTERBOUND" && outer.is_none() {
+                outer = Some(loops.len());
+            }
+            loops.push(pts);
+        }
+        if let Some(i) = outer {
+            loops.swap(0, i);
+        }
+        (!loops.is_empty()).then_some(loops)
+    }
+
+    fn quadric_face(&mut self, sty: &[u8], sp: &[Value], p: &[Value], depth: u32) -> Option<Mesh> {
+        let pos = self.axis2(sp.first()?.id()?)?;
+        let inv = pos.inverse()?;
+        let num = |i: usize| {
+            sp.get(i)
+                .and_then(Value::num)
+                .filter(|v| *v > 0.0 && v.is_finite())
+        };
+        let surf = match sty {
+            b"IFCCYLINDRICALSURFACE" => Surf::Cylinder {
+                pos,
+                inv,
+                r: num(1)?,
+            },
+            b"IFCSPHERICALSURFACE" => Surf::Sphere {
+                pos,
+                inv,
+                r: num(1)?,
+            },
+            _ => {
+                let (big, small) = (num(1)?, num(2)?);
+                // IfcToroidalSurface: MinorRadius < MajorRadius.
+                if small >= big {
+                    return None;
+                }
+                Surf::Torus {
+                    pos,
+                    inv,
+                    big,
+                    small,
+                }
+            }
+        };
+        let loops = self.face_loops(p.first()?.list()?, depth)?;
+        let left = p.get(2).and_then(Value::boolean).unwrap_or(true);
+        let b = boundary(&surf, &loops, left)?;
+        let tess = Tess {
+            counts: &|extent| surf.counts(extent),
+            max_extent: surf.max_extent(),
+        };
+        self.tessellate(b, &tess, |u, v| Some(surf.eval(u, v)))
+    }
+
+    /// A face's polygon in parameter space as triangles on the surface
+    /// `eval` gives. A rectangle of parameters is a regular grid; any other
+    /// polygon is triangulated, and its triangles bisected across the side
+    /// that strays furthest from the surface (the midpoint of the chord
+    /// farther from the surface's point than a 32-chord circle's is) until
+    /// none does. The corners of the polygon keep their points in space,
+    /// the others are `eval` of their parameters.
+    fn tessellate(
+        &mut self,
+        b: Boundary,
+        tess: &Tess,
+        eval: impl Fn(f64, f64) -> Option<V3>,
+    ) -> Option<Mesh> {
+        if let Some((lo, hi)) = rectangle(&b) {
+            return self.grid(lo, hi, tess, eval);
+        }
+        let first = triangulate(&b.uv, &b.outer, &b.holes);
+        if first.is_empty() {
+            return None;
+        }
+        let (lo, hi) = world_extent(&b.world);
+        let eps = len(sub(hi, lo)) * 1e-9;
+        let cap = MAX_FACE_TRIANGLES.min(self.work).min(self.ops / 8);
+        let mut evals_left = self.ops;
+        let Boundary {
+            mut uv, mut world, ..
+        } = b;
+        let mut leaves: Vec<[u32; 3]> = Vec::new();
+        let mut stack: Vec<[u32; 3]> = first.into_iter().rev().collect();
+        while let Some(t) = stack.pop() {
+            // Past the budget the triangles stay as they are.
+            if leaves.len() + stack.len() + 1 >= cap || evals_left < 3 {
+                leaves.push(t);
+                continue;
+            }
+            let side = |i: usize| (t[i], t[(i + 1) % 3]);
+            // Sides longer than the extent are split, the longest first.
+            let extents: Vec<f64> = (0..3)
+                .map(|i| {
+                    let (a, b) = side(i);
+                    let (a, b) = (uv[a as usize], uv[b as usize]);
+                    ((a[0] - b[0]).abs() / tess.max_extent[0])
+                        .max((a[1] - b[1]).abs() / tess.max_extent[1])
+                })
+                .collect();
+            let longest = (0..3)
+                .max_by(|&i, &j| extents[i].total_cmp(&extents[j]))
+                .unwrap_or(0);
+            let (k, mid_world, mid_uv) = if extents[longest] > 1.0 && extents[longest].is_finite() {
+                let (a, b) = side(longest);
+                let (a, b) = (uv[a as usize], uv[b as usize]);
+                let mid = [(a[0] + b[0]) / 2.0, (a[1] + b[1]) / 2.0];
+                evals_left -= 1;
+                (longest, eval(mid[0], mid[1])?, mid)
+            } else {
+                // The side whose midpoint is furthest off its chord.
+                let mut worst: Option<(usize, f64, V3, V2)> = None;
+                for i in 0..3 {
+                    let (a, b) = side(i);
+                    let (ua, ub) = (uv[a as usize], uv[b as usize]);
+                    let mid = [(ua[0] + ub[0]) / 2.0, (ua[1] + ub[1]) / 2.0];
+                    let (pa, pb) = (world[a as usize], world[b as usize]);
+                    let on_surface = eval(mid[0], mid[1])?;
+                    evals_left -= 1;
+                    let chord = [
+                        (pa[0] + pb[0]) / 2.0,
+                        (pa[1] + pb[1]) / 2.0,
+                        (pa[2] + pb[2]) / 2.0,
+                    ];
+                    let excess = len(sub(on_surface, chord)) - MAX_SAG * len(sub(pb, pa)) - eps;
+                    if excess > 0.0 && worst.is_none_or(|w| excess > w.1) {
+                        worst = Some((i, excess, on_surface, mid));
+                    }
+                }
+                let Some((i, _, on_surface, mid)) = worst else {
+                    leaves.push(t);
+                    continue;
+                };
+                (i, on_surface, mid)
+            };
+            // The side from x to y is split, z is opposite.
+            let (x, y, z) = (t[k], t[(k + 1) % 3], t[(k + 2) % 3]);
+            let m = uv.len() as u32;
+            uv.push(mid_uv);
+            world.push(mid_world);
+            stack.push([m, y, z]);
+            stack.push([x, m, z]);
+        }
+        self.charge(self.ops - evals_left)?;
+        Some(Mesh {
+            p: world,
+            t: leaves,
+        })
+    }
+
+    /// The rectangle `lo`..`hi` of parameters as a regular grid.
+    fn grid(
+        &mut self,
+        lo: V2,
+        hi: V2,
+        tess: &Tess,
+        eval: impl Fn(f64, f64) -> Option<V3>,
+    ) -> Option<Mesh> {
+        let (nu, nv) = (tess.counts)([hi[0] - lo[0], hi[1] - lo[1]]);
+        let (nu, nv) = (nu.max(1), nv.max(1));
+        self.budget(nu.checked_mul(nv)?.checked_mul(2)?)?;
+        self.charge((nu + 1) * (nv + 1))?;
+        let mut m = Mesh::default();
+        for i in 0..=nu {
+            let u = lo[0] + (hi[0] - lo[0]) * i as f64 / nu as f64;
+            for k in 0..=nv {
+                let v = lo[1] + (hi[1] - lo[1]) * k as f64 / nv as f64;
+                m.p.push(eval(u, v)?);
+            }
+        }
+        let stride = (nv + 1) as u32;
+        for i in 0..nu as u32 {
+            for k in 0..nv as u32 {
+                let a = i * stride + k;
+                m.t.push([a, a + stride, a + stride + 1]);
+                m.t.push([a, a + stride + 1, a + 1]);
+            }
+        }
+        Some(m)
+    }
+
+    /// A face on a B-spline surface, cut by its bounds: their points
+    /// projected on the surface give the polygon in its parameters. A face
+    /// without bounds is the whole surface; so is one whose bounds are not
+    /// on it, which is said.
+    fn spline_face(&mut self, sty: &[u8], sp: &[Value], p: &[Value], depth: u32) -> Option<Mesh> {
+        let spline = self.spline_surface(sp)?;
+        let bounds = p.first().and_then(Value::list).unwrap_or(&[]);
+        if bounds.iter().any(|b| b.id().is_some()) {
+            let polygon = self.projected_boundary(&spline, bounds, depth);
+            if let Some(m) = polygon.and_then(|b| self.spline_mesh(&spline, b)) {
+                return Some(m);
+            }
+            self.unsupported(sty);
+        }
+        self.whole_spline(&spline)
+    }
+
+    /// The control net, knots and weights of `IfcBSplineSurfaceWithKnots`
+    /// (or the rational one) as a [`Spline`].
+    fn spline_surface(&mut self, p: &[Value]) -> Option<Spline> {
+        let du = usize::try_from(p.first()?.int()?)
+            .ok()
+            .filter(|d| (1..=MAX_DEGREE).contains(d))?;
+        let dv = usize::try_from(p.get(1)?.int()?)
+            .ok()
+            .filter(|d| (1..=MAX_DEGREE).contains(d))?;
+        let rows: Vec<Vec<V3>> = p
+            .get(2)?
+            .list()?
+            .iter()
+            .map(|r| self.points(Some(r)))
+            .collect::<Option<_>>()?;
+        let (nu, nv) = (rows.len(), rows.first()?.len());
+        let knots = |m: &Value, k: &Value, n: usize, d: usize| -> Option<Vec<f64>> {
+            let mults: Vec<usize> = m
+                .list()?
+                .iter()
+                .map(|x| usize::try_from(x.int()?).ok())
+                .collect::<Option<_>>()?;
+            let ks: Vec<f64> = k.list()?.iter().map(Value::num).collect::<Option<_>>()?;
+            expand_knots(&mults, &ks, n, d)
+        };
+        let ku = knots(p.get(7)?, p.get(9)?, nu, du)?;
+        let kv = knots(p.get(8)?, p.get(10)?, nv, dv)?;
+        let weights: Option<Vec<Vec<f64>>> = match p.get(12) {
+            Some(w) if !w.is_null() => Some(
+                w.list()?
+                    .iter()
+                    .map(|r| {
+                        r.list()?
+                            .iter()
+                            .map(Value::num)
+                            .collect::<Option<Vec<f64>>>()
+                    })
+                    .collect::<Option<_>>()?,
+            ),
+            _ => None,
+        };
+        Spline::new(du, dv, &rows, ku, kv, weights)
+    }
+
+    /// The whole domain as a regular grid of points: four chords per
+    /// control point each way, at least 4 and at most 64.
+    fn whole_spline(&mut self, s: &Spline) -> Option<Mesh> {
+        let rectangle = Boundary {
+            uv: vec![
+                [s.u.0, s.v.0],
+                [s.u.1, s.v.0],
+                [s.u.1, s.v.1],
+                [s.u.0, s.v.1],
+            ],
+            world: Vec::new(),
+            outer: vec![0, 1, 2, 3],
+            holes: Vec::new(),
+        };
+        self.spline_mesh(s, rectangle)
+    }
+
+    /// A polygon of a B-spline surface's parameters as triangles.
+    fn spline_mesh(&mut self, s: &Spline, b: Boundary) -> Option<Mesh> {
+        let (su, sv) = (
+            (s.nu_ctrl * 4).clamp(4, 64) as f64,
+            (s.nv_ctrl * 4).clamp(4, 64) as f64,
+        );
+        let (du, dv) = (s.u.1 - s.u.0, s.v.1 - s.v.0);
+        let counts = |e: V2| {
+            let n = |chords: f64, share: f64| (chords * share).ceil().clamp(1.0, chords) as usize;
+            (n(su, e[0] / du), n(sv, e[1] / dv))
+        };
+        // Past a control interval of parameters, a side is always split.
+        let tess = Tess {
+            counts: &counts,
+            max_extent: [4.0 * du / su, 4.0 * dv / sv],
+        };
+        self.tessellate(b, &tess, |u, v| s.eval(u, v))
+    }
+
+    /// The loops of the bounds, their points projected on the surface.
+    fn projected_boundary(&mut self, s: &Spline, bounds: &[Value], depth: u32) -> Option<Boundary> {
+        let loops = self.face_loops(bounds, depth)?;
+        let total: usize = loops.iter().map(Vec::len).sum();
+        if total > MAX_PROJECTED {
+            return None;
+        }
+        // The points of a coarse grid start each search.
+        self.charge((SEARCH_GRID + 1) * (SEARCH_GRID + 1))?;
+        let mut grid: Vec<(f64, f64, V3)> = Vec::new();
+        for i in 0..=SEARCH_GRID {
+            for k in 0..=SEARCH_GRID {
+                let u = s.u.0 + (s.u.1 - s.u.0) * i as f64 / SEARCH_GRID as f64;
+                let v = s.v.0 + (s.v.1 - s.v.0) * k as f64 / SEARCH_GRID as f64;
+                grid.push((u, v, s.eval(u, v)?));
+            }
+        }
+        let (lo, hi) = grid.iter().fold(
+            ([f64::INFINITY; 3], [f64::NEG_INFINITY; 3]),
+            |(mut lo, mut hi), g| {
+                for k in 0..3 {
+                    lo[k] = lo[k].min(g.2[k]);
+                    hi[k] = hi[k].max(g.2[k]);
+                }
+                (lo, hi)
+            },
+        );
+        // A boundary point is on the surface. A tenth of them may be off it
+        // by a few percent of its size (a vertex that is not quite where
+        // its edge ends); more, or any further, and the bounds are of
+        // another surface.
+        let size = len(sub(hi, lo)).max(1e-9);
+        let (close, far) = (size * 1e-3, size * 5e-2);
+        let mut off = 0usize;
+        let mut b = Boundary::new();
+        let mut evals = 0usize;
+        let periods = [s.u.1 - s.u.0, s.v.1 - s.v.0];
+        for (n, l) in loops.iter().enumerate() {
+            let mut uv: Vec<V2> = Vec::with_capacity(l.len());
+            for &q in l {
+                let (u, v, d) = s.nearest(q, &grid, &mut evals)?;
+                if d > far {
+                    return None;
+                }
+                off += usize::from(d > close);
+                let mut p = [u, v];
+                // On a surface that closes on itself a point is at either
+                // end of it: the one next to the point before.
+                if let Some(prev) = uv.last() {
+                    for k in 0..2 {
+                        if s.closed[k] {
+                            p[k] -= periods[k] * ((p[k] - prev[k]) / periods[k]).round();
+                        }
+                    }
+                }
+                uv.push(p);
+            }
+            // A loop that winds round a closed surface is not read.
+            let (first, last) = (uv[0], uv[uv.len() - 1]);
+            if (0..2).any(|k| s.closed[k] && ((first[k] - last[k]) / periods[k]).round() != 0.0) {
+                return None;
+            }
+            // Sampled finely along curves: the points that keep the shape
+            // to a thousandth of the loop's size are enough.
+            let (lo, hi) = extent(&uv);
+            let tol = 1e-3 * (hi[0] - lo[0]).max(hi[1] - lo[1]);
+            let keep = simplify(&uv, tol);
+            let ring: Vec<u32> = keep.iter().map(|&i| b.push(uv[i], l[i])).collect();
+            if n == 0 {
+                b.outer = ring;
+            } else {
+                b.holes.push(ring);
+            }
+        }
+        self.charge(evals)?;
+        (off * 10 <= total).then_some(b)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::math::{cross, dot};
+    use super::*;
+
+    /// The angle is brought next to the previous one by whole turns, however
+    /// far apart they are: adding a turn at a time took a billion steps for
+    /// a polyline wound a billion times.
+    #[test]
+    fn an_angle_is_unrolled_in_one_step_however_far_the_previous_one_is() {
+        use std::f64::consts::PI;
+        assert!((continuous(0.5, 0.5) - 0.5).abs() < 1e-12);
+        assert!((continuous(3.0, -3.0) - (3.0 - TAU)).abs() < 1e-12);
+        assert!((continuous(-3.0, 3.0) - (-3.0 + TAU)).abs() < 1e-12);
+        for prev in [0.0, 7.0, -40.0, 1.0e6, -1.0e12] {
+            for a in [-PI, -1.0, 0.0, 2.5, PI] {
+                let c = continuous(a, prev);
+                assert!((c - prev).abs() <= PI + 1e-6, "{a} next to {prev} gave {c}");
+                let turns = (c - a) / TAU;
+                assert!((turns - turns.round()).abs() < 1e-3, "{a} became {c}");
+            }
+        }
+    }
+
+    fn sphere() -> Surf {
+        Surf::Sphere {
+            pos: Xf::IDENTITY,
+            inv: Xf::IDENTITY,
+            r: 2.0,
+        }
+    }
+
+    /// A circle of latitude `v`, counter-clockwise seen from +z.
+    fn latitude(v: f64, n: usize) -> Vec<V3> {
+        (0..n)
+            .map(|k| sphere().eval(TAU * k as f64 / n as f64, v))
+            .collect()
+    }
+
+    #[test]
+    fn a_point_on_a_surface_goes_to_its_parameters_and_back() {
+        let s = sphere();
+        let p = s.eval(1.0, 0.5);
+        let [u, v] = s.uv(p, None);
+        assert!((u - 1.0).abs() < 1e-12 && (v - 0.5).abs() < 1e-12);
+        let t = Surf::Torus {
+            pos: Xf::IDENTITY,
+            inv: Xf::IDENTITY,
+            big: 3.0,
+            small: 1.0,
+        };
+        let p = t.eval(-2.0, 2.5);
+        let [u, v] = t.uv(p, None);
+        assert!((u + 2.0).abs() < 1e-12 && (v - 2.5).abs() < 1e-12);
+        // The poles are exact.
+        assert_eq!(s.eval(0.3, FRAC_PI_2), [0.0, 0.0, 2.0]);
+    }
+
+    #[test]
+    fn a_loop_round_a_pole_winds_once_and_the_face_is_on_its_left() {
+        let s = sphere();
+        let ring = latitude(1.0, 16);
+        let (_, wind) = unroll(&s, &ring);
+        assert_eq!(wind, [1, 0]);
+        // Left of a loop that runs counter-clockwise seen from +z is the
+        // north cap; the other way round, the south one.
+        let b = boundary(&s, std::slice::from_ref(&ring), true).unwrap();
+        assert!(b.uv.iter().any(|p| (p[1] - FRAC_PI_2).abs() < 1e-12));
+        let b = boundary(&s, std::slice::from_ref(&ring), false).unwrap();
+        assert!(b.uv.iter().any(|p| (p[1] + FRAC_PI_2).abs() < 1e-12));
+        // Reversed, the loop winds the other way.
+        let mut back = ring;
+        back.reverse();
+        let (_, wind) = unroll(&s, &back);
+        assert_eq!(wind, [-1, 0]);
+    }
+
+    #[test]
+    fn a_small_loop_that_does_not_wind_bounds_the_area_inside_it() {
+        let s = sphere();
+        // A square of latitude and longitude around (1, 0.2).
+        let pts: Vec<V3> = [(0.9, 0.1), (1.1, 0.1), (1.1, 0.3), (0.9, 0.3)]
+            .iter()
+            .map(|&(u, v)| s.eval(u, v))
+            .collect();
+        let b = boundary(&s, &[pts], true).unwrap();
+        assert_eq!(b.outer.len(), 4);
+        assert!(boundary(&s, &[], true).is_none());
+    }
+
+    #[test]
+    fn a_loop_that_winds_twice_is_not_a_face_here() {
+        let s = sphere();
+        let mut ring = latitude(0.5, 8);
+        ring.extend(latitude(0.5, 8));
+        assert!(boundary(&s, &[ring], true).is_none());
+    }
+
+    #[test]
+    fn the_cross_product_of_the_parameter_derivatives_points_outwards() {
+        // Counter-clockwise in (u, v) must be outward for the meshes to be.
+        let eps = 1e-6;
+        let c = cross_at(&sphere(), 0.7, 0.4, eps);
+        let p = sphere().eval(0.7, 0.4);
+        assert!(dot(c, p) > 0.0);
+        let t = Surf::Torus {
+            pos: Xf::IDENTITY,
+            inv: Xf::IDENTITY,
+            big: 3.0,
+            small: 1.0,
+        };
+        let c = cross_at(&t, 0.7, 2.0, eps);
+        let centre = [3.0 * 0.7f64.cos(), 3.0 * 0.7f64.sin(), 0.0];
+        assert!(dot(c, sub(t.eval(0.7, 2.0), centre)) > 0.0);
+    }
+
+    fn cross_at(s: &Surf, u: f64, v: f64, eps: f64) -> V3 {
+        let p = s.eval(u, v);
+        cross(sub(s.eval(u + eps, v), p), sub(s.eval(u, v + eps), p))
+    }
+}
diff --git a/crates/exav-render/src/formats/ifc/grid.rs b/crates/exav-render/src/formats/ifc/grid.rs
new file mode 100644
index 00000000..2a86cf4b
--- /dev/null
+++ b/crates/exav-render/src/formats/ifc/grid.rs
@@ -0,0 +1,254 @@
+//! `IfcGridPlacement`: an object placed at the intersection of two axes of
+//! an `IfcGrid` (offset from them, in plan and in height), its x axis along
+//! the first axis, along a given direction, or towards a second
+//! intersection.
+
+use std::collections::HashMap;
+
+use super::math::{V3, Xf, cross, len, scale, sub, unit};
+use super::step::Value;
+use super::{Reader, step};
+
+/// Most pairs of segments tried for one intersection.
+const MAX_PAIRS: usize = 4_000_000;
+
+/// An axis curve in the grid's plane.
+enum Axis {
+    /// A line, unbounded, by a point and a unit direction.
+    Line(V3, V3),
+    /// Segments between points.
+    Poly(Vec<V3>),
+}
+
+/// A segment of an axis, offset: its start, its direction (not unit), and
+/// whether it is bounded.
+struct Segment {
+    from: V3,
+    along: V3,
+    bounded: bool,
+}
+
+impl Axis {
+    /// The segments, `offset` to the left of the way the axis runs (the
+    /// other way when `same` is false).
+    fn segments(&self, offset: f64, same: bool) -> Vec<Segment> {
+        let shifted = |from: V3, along: V3| {
+            let flip = if same { 1.0 } else { -1.0 };
+            let left = unit([-along[1] * flip, along[0] * flip, 0.0]).unwrap_or([0.0; 3]);
+            let along = scale(along, flip);
+            let from = [from[0] + left[0] * offset, from[1] + left[1] * offset, 0.0];
+            // Reversed, the segment starts at the other end.
+            if same {
+                Segment {
+                    from,
+                    along,
+                    bounded: true,
+                }
+            } else {
+                Segment {
+                    from: [from[0] - along[0], from[1] - along[1], 0.0],
+                    along,
+                    bounded: true,
+                }
+            }
+        };
+        match self {
+            Axis::Line(o, d) => {
+                let mut s = shifted(*o, *d);
+                s.bounded = false;
+                vec![s]
+            }
+            Axis::Poly(pts) => pts
+                .array_windows()
+                .map(|&[a, b]| shifted(a, sub(b, a)))
+                .collect(),
+        }
+    }
+}
+
+/// The first point at which two sets of segments cross, and the direction
+/// of the first there.
+fn cross_at(a: &[Segment], b: &[Segment]) -> Option<(V3, V3)> {
+    let eps = 1e-9;
+    for s in a {
+        for t in b {
+            let den = s.along[0] * t.along[1] - s.along[1] * t.along[0];
+            if den.is_nan() || den.abs() <= 1e-12 * len(s.along) * len(t.along) {
+                continue;
+            }
+            let (dx, dy) = (t.from[0] - s.from[0], t.from[1] - s.from[1]);
+            let u = (dx * t.along[1] - dy * t.along[0]) / den;
+            let v = (dx * s.along[1] - dy * s.along[0]) / den;
+            let inside = |p: f64, bounded: bool| !bounded || (-eps..=1.0 + eps).contains(&p);
+            if inside(u, s.bounded) && inside(v, t.bounded) {
+                let at = [s.from[0] + s.along[0] * u, s.from[1] + s.along[1] * u, 0.0];
+                return Some((at, unit(s.along)?));
+            }
+        }
+    }
+    None
+}
+
+impl<'a> Reader<'a> {
+    /// The grid each axis belongs to.
+    fn grid_of(&mut self, axis: u32) -> Option<u32> {
+        if self.grids.is_none() {
+            let mut map: HashMap<u32, u32> = HashMap::new();
+            for g in self.f.of_type(b"IFCGRID") {
+                let Some(p) = self.f.params(g) else { continue };
+                for list in [7, 8, 9] {
+                    for a in p
+                        .get(list)
+                        .and_then(Value::list)
+                        .unwrap_or(&[])
+                        .iter()
+                        .filter_map(Value::id)
+                    {
+                        map.entry(a).or_insert(g);
+                    }
+                }
+            }
+            self.grids = Some(map);
+        }
+        self.grids.as_ref()?.get(&axis).copied()
+    }
+
+    /// An `IfcGridAxis`: its curve in the grid's plane and its sense.
+    fn grid_axis(&mut self, id: u32, depth: u32) -> Option<(Axis, bool)> {
+        let (ty, p) = self.get(id)?;
+        if ty != b"IFCGRIDAXIS" {
+            return None;
+        }
+        let same = p.get(2).and_then(Value::boolean).unwrap_or(true);
+        let curve = p.get(1)?.id()?;
+        let (cty, cp) = self.get(curve)?;
+        if cty == b"IFCLINE" {
+            let o = self.point(cp.first()?.id()?)?;
+            let vp = self.f.params(cp.get(1)?.id()?)?;
+            let d = self.direction(vp.first()?.id()?)?;
+            return Some((Axis::Line(o, unit([d[0], d[1], 0.0])?), same));
+        }
+        let pts = self.curve(curve, depth + 1)?;
+        Some((Axis::Poly(pts), same))
+    }
+
+    /// The point of an `IfcVirtualGridIntersection` in the grid's plane
+    /// (height as given), the first axis's direction there, and the grid.
+    fn grid_intersection(&mut self, id: u32) -> Option<(V3, V3, u32)> {
+        let (ty, p) = self.get(id)?;
+        if ty != b"IFCVIRTUALGRIDINTERSECTION" {
+            return None;
+        }
+        let axes: Vec<u32> = p.first()?.list()?.iter().filter_map(Value::id).collect();
+        let [first, second] = axes[..] else {
+            return None;
+        };
+        let offsets: Vec<f64> = p
+            .get(1)?
+            .list()?
+            .iter()
+            .map(|v| v.num().filter(|x| x.is_finite()))
+            .collect::<Option<_>>()?;
+        let grid = self.grid_of(first)?;
+        if self.grid_of(second)? != grid {
+            return None;
+        }
+        let (a, same_a) = self.grid_axis(first, 0)?;
+        let (b, same_b) = self.grid_axis(second, 0)?;
+        let (sa, sb) = (
+            a.segments(*offsets.first()?, same_a),
+            b.segments(*offsets.get(1)?, same_b),
+        );
+        if sa.len().checked_mul(sb.len())? > MAX_PAIRS {
+            return None;
+        }
+        self.charge(sa.len() * sb.len() / 64 + 1)?;
+        let (at, along) = cross_at(&sa, &sb)?;
+        Some((
+            [at[0], at[1], offsets.get(2).copied().unwrap_or(0.0)],
+            along,
+            grid,
+        ))
+    }
+
+    /// An `IfcGridPlacement`: the placement it hangs from and its transform
+    /// there (in the grid's coordinates).
+    pub(super) fn grid_placement(&mut self, p: &[Value]) -> Option<(Option<u32>, Xf)> {
+        // IFC4X3 gives the placement the grid's own placement as
+        // `PlacementRelTo`, ahead of the other attributes.
+        let ifc4x3 = self.f.schema == step::Schema::Ifc4x3;
+        let at = usize::from(ifc4x3);
+        let (point, along, grid) = self.grid_intersection(p.get(at)?.id()?)?;
+        let x = match p.get(at + 1) {
+            Some(v) if !v.is_null() => {
+                let id = v.id()?;
+                if self.get(id).is_some_and(|(t, _)| t == b"IFCDIRECTION") {
+                    let d = self.direction(id)?;
+                    unit([d[0], d[1], 0.0])?
+                } else {
+                    let (other, _, g) = self.grid_intersection(id)?;
+                    if g != grid {
+                        return None;
+                    }
+                    unit([other[0] - point[0], other[1] - point[1], 0.0])?
+                }
+            }
+            _ => unit([along[0], along[1], 0.0])?,
+        };
+        let z = [0.0, 0.0, 1.0];
+        let local = Xf::new(x, cross(z, x), z, point);
+        let parent = if ifc4x3 {
+            p.first().and_then(Value::id)
+        } else {
+            None
+        };
+        let parent = parent.or_else(|| {
+            self.f
+                .params(grid)
+                .and_then(|g| g.get(5).and_then(Value::id))
+        });
+        local.is_finite().then_some((parent, local))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn line(o: V3, d: V3) -> Axis {
+        Axis::Line(o, unit(d).unwrap())
+    }
+
+    #[test]
+    fn two_lines_cross_where_they_do() {
+        let a = line([0.0, 2.0, 0.0], [1.0, 0.0, 0.0]).segments(0.0, true);
+        let b = line([5.0, 0.0, 0.0], [0.0, 1.0, 0.0]).segments(0.0, true);
+        let (p, d) = cross_at(&a, &b).unwrap();
+        assert_eq!(p, [5.0, 2.0, 0.0]);
+        assert_eq!(d, [1.0, 0.0, 0.0]);
+        // Parallel lines do not.
+        let c = line([0.0, 1.0, 0.0], [1.0, 0.0, 0.0]).segments(0.0, true);
+        assert!(cross_at(&a, &c).is_none());
+    }
+
+    #[test]
+    fn an_offset_is_to_the_left_of_the_way_the_axis_runs() {
+        // The x axis offset by 1 is y = 1; run the other way, y = -1.
+        let b = line([5.0, 0.0, 0.0], [0.0, 1.0, 0.0]);
+        let a = line([0.0, 0.0, 0.0], [1.0, 0.0, 0.0]);
+        let (p, _) = cross_at(&a.segments(1.0, true), &b.segments(0.0, true)).unwrap();
+        assert_eq!(p, [5.0, 1.0, 0.0]);
+        let (p, d) = cross_at(&a.segments(1.0, false), &b.segments(0.0, true)).unwrap();
+        assert_eq!(p, [5.0, -1.0, 0.0]);
+        assert_eq!(d, [-1.0, 0.0, 0.0]);
+    }
+
+    #[test]
+    fn a_bounded_axis_stops_at_its_ends() {
+        let short = Axis::Poly(vec![[0.0; 3], [2.0, 0.0, 0.0]]).segments(0.0, true);
+        let b = line([5.0, -1.0, 0.0], [0.0, 1.0, 0.0]).segments(0.0, true);
+        assert!(cross_at(&short, &b).is_none());
+        let long = Axis::Poly(vec![[0.0; 3], [9.0, 0.0, 0.0]]).segments(0.0, true);
+        assert_eq!(cross_at(&long, &b).unwrap().0, [5.0, 0.0, 0.0]);
+    }
+}
diff --git a/crates/exav-render/src/formats/ifc/items.rs b/crates/exav-render/src/formats/ifc/items.rs
index f49b89fb..28c91b2d 100644
--- a/crates/exav-render/src/formats/ifc/items.rs
+++ b/crates/exav-render/src/formats/ifc/items.rs
@@ -5,9 +5,9 @@
 use std::rc::Rc;
 
 use super::csg::{self, Op, Poly};
-use super::math::{self, cross, dot, sub, unit, Xf, V3};
+use super::math::{self, V3, Xf, cross, dot, sub, unit};
 use super::step::Value;
-use super::{is, Color, Mesh, Piece, Reader, MAX_DEPTH};
+use super::{Color, MAX_DEPTH, Mesh, Piece, Reader, is};
 
 /// Representation identifiers that are not the body: axes, footprints,
 /// boxes, 2D plan symbols and the like.
@@ -218,8 +218,9 @@ impl<'a> Reader<'a> {
             | b"IFCFIXEDREFERENCESWEPTAREASOLID"
             | b"IFCDIRECTRIXCURVESWEPTAREASOLID" => solid(self.swept_area(ty, &p, depth)?),
             b"IFCTRIANGULATEDFACESET" | b"IFCTRIANGULATEDIRREGULARNETWORK" => {
-                let closed = p.get(2).and_then(Value::boolean) == Some(true);
-                let m = self.triangulated_face_set(&p)?;
+                let declared = p.get(2).and_then(Value::boolean);
+                let mut m = self.triangulated_face_set(&p)?;
+                let closed = closed_or_found(&mut m, declared);
                 vec![Piece {
                     color,
                     mesh: m,
@@ -227,8 +228,9 @@ impl<'a> Reader<'a> {
                 }]
             }
             b"IFCPOLYGONALFACESET" => {
-                let closed = p.get(1).and_then(Value::boolean) == Some(true);
-                let m = self.polygonal_face_set(&p)?;
+                let declared = p.get(1).and_then(Value::boolean);
+                let mut m = self.polygonal_face_set(&p)?;
+                let closed = closed_or_found(&mut m, declared);
                 vec![Piece {
                     color,
                     mesh: m,
@@ -240,11 +242,12 @@ impl<'a> Reader<'a> {
             | b"IFCADVANCEDBREP"
             | b"IFCADVANCEDBREPWITHVOIDS" => {
                 let mut m = self.shell(p.first()?.id()?, depth)?;
-                m.orient_outward();
+                // Faces written the wrong way round are common in a shell.
+                m.orient_consistently();
                 for v in ids(p.get(1)) {
                     let mut void = self.shell(v, depth)?;
                     // Inward: a void's volume counts against the solid.
-                    void.orient_outward();
+                    void.orient_consistently();
                     for t in &mut void.t {
                         t.swap(1, 2);
                     }
@@ -581,10 +584,163 @@ fn clipped_box(c: V3, r: f64, o: V3, inside: V3) -> Mesh {
     m
 }
 
+/// Whether a face set is a solid: as it says, and where it says nothing (the
+/// attribute is optional, and Bonsai and others leave it out) as its edges
+/// show, each shared by two faces. A solid has its faces turned outward.
+fn closed_or_found(m: &mut Mesh, declared: Option<bool>) -> bool {
+    let closed = declared.unwrap_or_else(|| m.is_closed());
+    if closed {
+        m.orient_consistently();
+    }
+    closed
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    fn cube(lo: f64, hi: f64) -> Mesh {
+        let p = |x: f64, y: f64, z: f64| [x, y, z];
+        Mesh {
+            p: vec![
+                p(lo, lo, lo),
+                p(hi, lo, lo),
+                p(hi, hi, lo),
+                p(lo, hi, lo),
+                p(lo, lo, hi),
+                p(hi, lo, hi),
+                p(hi, hi, hi),
+                p(lo, hi, hi),
+            ],
+            // Outward.
+            t: vec![
+                [0, 2, 1],
+                [0, 3, 2],
+                [4, 5, 6],
+                [4, 6, 7],
+                [0, 1, 5],
+                [0, 5, 4],
+                [1, 2, 6],
+                [1, 6, 5],
+                [2, 3, 7],
+                [2, 7, 6],
+                [3, 0, 4],
+                [3, 4, 7],
+            ],
+        }
+    }
+
+    #[test]
+    fn a_shell_with_faces_the_wrong_way_round_is_turned_outward() {
+        let mut m = cube(1.0, 3.0);
+        assert!((m.volume6() / 6.0 - 8.0).abs() < 1e-9);
+        // The bottom face written the other way: the volume is wrong, and
+        // turning all of it does not help.
+        m.t[0].swap(1, 2);
+        m.t[1].swap(1, 2);
+        m.orient_outward();
+        assert!((m.volume6() / 6.0 - 8.0).abs() > 1.0);
+        m.orient_consistently();
+        assert!((m.volume6() / 6.0 - 8.0).abs() < 1e-9);
+        // A closed piece written inside out, beside one that is not.
+        let mut two = cube(0.0, 1.0);
+        let mut inside_out = cube(5.0, 6.0);
+        for t in &mut inside_out.t {
+            t.swap(1, 2);
+        }
+        two.append(&inside_out);
+        two.orient_consistently();
+        assert!((two.volume6() / 6.0 - 2.0).abs() < 1e-9);
+    }
+
+    #[test]
+    fn a_surface_that_is_not_closed_keeps_its_first_triangle_s_side() {
+        let mut m = Mesh {
+            p: vec![[0.0; 3], [1.0, 0.0, 0.0], [1.0, 1.0, 0.0], [0.0, 1.0, 0.0]],
+            t: vec![[0, 1, 2], [0, 2, 3]],
+        };
+        // The second triangle turned: both are given the first one's.
+        m.t[1].swap(1, 2);
+        m.orient_consistently();
+        assert_eq!(m.t, vec![[0, 1, 2], [0, 2, 3]]);
+    }
+
+    #[test]
+    fn a_wall_of_a_shell_with_a_face_turned_is_cut_by_its_opening() {
+        // 5 x 0.25 x 3.3 from z 0.2, with a window opening 2.2 wide from z 1.7
+        // to 3.2, both shells with their faces written as a sloppy exporter
+        // does, not all outward.
+        let src = "ISO-10303-21;\nHEADER;\nFILE_SCHEMA(('IFC4'));\nENDSEC;\nDATA;\n\
+#1=IFCWALL('a',$,'w',$,$,#93,#7,$,$);\n\
+#6=IFCSHAPEREPRESENTATION(#100,'Body','BRep',(#8));\n#7=IFCPRODUCTDEFINITIONSHAPE($,$,(#6));\n\
+#8=IFCFACETEDBREP(#9);\n#9=IFCCLOSEDSHELL((#18,#21,#24,#27,#30,#33));\n\
+#10=IFCCARTESIANPOINT((0.,0.,0.2));\n#11=IFCCARTESIANPOINT((5.,0.,0.2));\n#12=IFCCARTESIANPOINT((5.,0.25,0.2));\n#13=IFCCARTESIANPOINT((0.,0.25,0.2));\n\
+#14=IFCCARTESIANPOINT((0.,0.,3.5));\n#15=IFCCARTESIANPOINT((5.,0.,3.5));\n#16=IFCCARTESIANPOINT((5.,0.25,3.5));\n#17=IFCCARTESIANPOINT((0.,0.25,3.5));\n\
+#18=IFCFACE((#19));\n#19=IFCFACEOUTERBOUND(#20,.T.);\n#20=IFCPOLYLOOP((#10,#11,#12,#13));\n\
+#21=IFCFACE((#22));\n#22=IFCFACEOUTERBOUND(#23,.T.);\n#23=IFCPOLYLOOP((#14,#15,#16,#17));\n\
+#24=IFCFACE((#25));\n#25=IFCFACEOUTERBOUND(#26,.T.);\n#26=IFCPOLYLOOP((#10,#11,#15,#14));\n\
+#27=IFCFACE((#28));\n#28=IFCFACEOUTERBOUND(#29,.T.);\n#29=IFCPOLYLOOP((#11,#12,#16,#15));\n\
+#30=IFCFACE((#31));\n#31=IFCFACEOUTERBOUND(#32,.T.);\n#32=IFCPOLYLOOP((#12,#13,#17,#16));\n\
+#33=IFCFACE((#34));\n#34=IFCFACEOUTERBOUND(#35,.T.);\n#35=IFCPOLYLOOP((#13,#10,#14,#17));\n\
+#39=IFCOPENINGELEMENT('b',$,$,$,$,#93,#41,$,$);\n#40=IFCSHAPEREPRESENTATION(#100,'Body','BRep',(#42));\n#41=IFCPRODUCTDEFINITIONSHAPE($,$,(#40));\n\
+#42=IFCFACETEDBREP(#43);\n#43=IFCCLOSEDSHELL((#52,#55,#58,#61,#64,#67));\n\
+#44=IFCCARTESIANPOINT((0.3,0.,1.7));\n#45=IFCCARTESIANPOINT((2.5,0.,1.7));\n#46=IFCCARTESIANPOINT((2.5,0.25,1.7));\n#47=IFCCARTESIANPOINT((0.3,0.25,1.7));\n\
+#48=IFCCARTESIANPOINT((0.3,0.,3.2));\n#49=IFCCARTESIANPOINT((2.5,0.,3.2));\n#50=IFCCARTESIANPOINT((2.5,0.25,3.2));\n#51=IFCCARTESIANPOINT((0.3,0.25,3.2));\n\
+#52=IFCFACE((#53));\n#53=IFCFACEOUTERBOUND(#54,.T.);\n#54=IFCPOLYLOOP((#44,#45,#46,#47));\n\
+#55=IFCFACE((#56));\n#56=IFCFACEOUTERBOUND(#57,.T.);\n#57=IFCPOLYLOOP((#48,#49,#50,#51));\n\
+#58=IFCFACE((#59));\n#59=IFCFACEOUTERBOUND(#60,.T.);\n#60=IFCPOLYLOOP((#44,#45,#49,#48));\n\
+#61=IFCFACE((#62));\n#62=IFCFACEOUTERBOUND(#63,.T.);\n#63=IFCPOLYLOOP((#45,#46,#50,#49));\n\
+#64=IFCFACE((#65));\n#65=IFCFACEOUTERBOUND(#66,.T.);\n#66=IFCPOLYLOOP((#46,#47,#51,#50));\n\
+#67=IFCFACE((#68));\n#68=IFCFACEOUTERBOUND(#69,.T.);\n#69=IFCPOLYLOOP((#47,#44,#48,#51));\n\
+#70=IFCRELVOIDSELEMENT('c',$,$,$,#1,#39);\n\
+#79=IFCAXIS2PLACEMENT3D(#80,#81,#82);\n#80=IFCCARTESIANPOINT((0.,0.,0.));\n#81=IFCDIRECTION((0.,0.,1.));\n#82=IFCDIRECTION((1.,0.,0.));\n\
+#93=IFCLOCALPLACEMENT($,#79);\n#98=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);\n#99=IFCUNITASSIGNMENT((#98));\n\
+#100=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,0.00001,#79,$);\n#71=IFCPROJECT('p',$,$,$,$,$,$,(#100),#99);\n\
+ENDSEC;\nEND-ISO-10303-21;\n";
+        let scene = crate::ifc::read(src.as_bytes(), &crate::ifc::Limits::default()).unwrap();
+        let (lo, hi) = {
+            let b = scene.bounds.unwrap();
+            let o = scene.origin;
+            (
+                [0, 1, 2].map(|k| o[k] + f64::from(b[0][k])),
+                [0, 1, 2].map(|k| o[k] + f64::from(b[1][k])),
+            )
+        };
+        // The wall still reaches its foot (0.2) and head (3.5).
+        assert!(
+            (lo[2] - 0.2).abs() < 1e-4 && (hi[2] - 3.5).abs() < 1e-4,
+            "{lo:?} {hi:?}"
+        );
+        assert_eq!(scene.warnings.booleans_skipped, 0);
+    }
+
+    #[test]
+    fn an_opening_that_does_not_say_it_is_closed_is_cut_when_its_edges_show_it_is() {
+        // A 5 x 0.25 x 3 wall with a window hole 1 x 0.5 x 1 through it, the
+        // hole a polygonal face set whose Closed attribute is left out.
+        let src = "ISO-10303-21;\nHEADER;\nFILE_SCHEMA(('IFC4'));\nENDSEC;\nDATA;\n\
+#1=IFCWALL('a',$,'w',$,$,#93,#7,$,$);\n#7=IFCPRODUCTDEFINITIONSHAPE($,$,(#6));\n\
+#6=IFCSHAPEREPRESENTATION(#100,'Body','SweptSolid',(#8));\n\
+#8=IFCEXTRUDEDAREASOLID(#9,#79,#81,3.);\n#9=IFCRECTANGLEPROFILEDEF(.AREA.,$,#10,5.,0.25);\n\
+#10=IFCAXIS2PLACEMENT2D(#11,$);\n#11=IFCCARTESIANPOINT((2.5,0.125));\n\
+#39=IFCOPENINGELEMENT('b',$,$,$,$,#93,#41,$,$);\n#41=IFCPRODUCTDEFINITIONSHAPE($,$,(#40));\n\
+#40=IFCSHAPEREPRESENTATION(#100,'Body','Tessellation',(#42));\n\
+#42=IFCPOLYGONALFACESET(#43,$,(#51,#52,#53,#54,#55,#56),$);\n\
+#43=IFCCARTESIANPOINTLIST3D(((1.,-0.1,1.),(2.,-0.1,1.),(2.,0.4,1.),(1.,0.4,1.),(1.,-0.1,2.),(2.,-0.1,2.),(2.,0.4,2.),(1.,0.4,2.)));\n\
+#51=IFCINDEXEDPOLYGONALFACE((1,4,3,2));\n#52=IFCINDEXEDPOLYGONALFACE((5,6,7,8));\n\
+#53=IFCINDEXEDPOLYGONALFACE((1,2,6,5));\n#54=IFCINDEXEDPOLYGONALFACE((2,3,7,6));\n\
+#55=IFCINDEXEDPOLYGONALFACE((3,4,8,7));\n#56=IFCINDEXEDPOLYGONALFACE((4,1,5,8));\n\
+#70=IFCRELVOIDSELEMENT('c',$,$,$,#1,#39);\n\
+#79=IFCAXIS2PLACEMENT3D(#80,#81,#82);\n#80=IFCCARTESIANPOINT((0.,0.,0.));\n#81=IFCDIRECTION((0.,0.,1.));\n#82=IFCDIRECTION((1.,0.,0.));\n\
+#93=IFCLOCALPLACEMENT($,#79);\n#98=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);\n#99=IFCUNITASSIGNMENT((#98));\n\
+#100=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,0.00001,#79,$);\n#71=IFCPROJECT('p',$,$,$,$,$,$,(#100),#99);\n\
+ENDSEC;\nEND-ISO-10303-21;\n";
+        let scene = crate::ifc::read(src.as_bytes(), &crate::ifc::Limits::default()).unwrap();
+        assert_eq!(scene.warnings.booleans_skipped, 0);
+        // A box is 12 triangles: with the hole through it, more.
+        assert!(scene.triangles() > 12, "{}", scene.triangles());
+    }
+
     #[test]
     fn a_box_cut_in_half() {
         let m = clipped_box([0.0; 3], 1.0, [0.0, 0.0, 0.25], [0.0, 0.0, -1.0]);
diff --git a/crates/exav-render/src/formats/ifc/mod.rs b/crates/exav-render/src/formats/ifc/mod.rs
index 883c93e0..036d5e80 100644
--- a/crates/exav-render/src/formats/ifc/mod.rs
+++ b/crates/exav-render/src/formats/ifc/mod.rs
@@ -12,14 +12,22 @@
 //! Bounded on any input: references are followed to a fixed depth (which
 //! also breaks reference cycles), every curve and surface is sampled with a
 //! fixed number of points per turn, booleans give up past a fixed amount of
-//! work, and all triangles made, kept or not, come out of one budget.
+//! work, and all triangles made, kept or not, come out of one budget. The
+//! evaluations of surfaces and curves that triangles do not count (boundary
+//! points projected on a surface, stations along an alignment, the edges of
+//! a loop) come out of another, `ops`.
 
+mod alignment;
 mod csg;
 mod curves;
+mod directrix;
+mod faces;
+mod grid;
 mod items;
 mod math;
 mod profiles;
 mod solids;
+mod spline;
 pub mod step;
 mod triangulate;
 
@@ -27,9 +35,9 @@ use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::rc::Rc;
 
-use self::math::{cross, unit, Xf, V3};
+use self::math::{V3, Xf, cross, unit};
 use self::step::{StepFile, Value};
-use super::mesh::{Element, Node, Part, Scene, SceneBuilder, Warnings, DEFAULT_MAX_TRIANGLES};
+use super::mesh::{DEFAULT_MAX_TRIANGLES, Element, Node, Part, Scene, SceneBuilder, Warnings};
 
 /// How much a reader may produce.
 #[derive(Debug, Clone, Copy)]
@@ -71,6 +79,9 @@ pub(crate) type Color = [f32; 4];
 const MAX_DEPTH: u32 = 32;
 /// Deepest chain of object placements.
 const MAX_PLACEMENT_DEPTH: usize = 256;
+/// Most surface and curve evaluations in one file (about 500 operations
+/// each).
+const MAX_OPS: usize = 20_000_000;
 
 /// Triangles in `f64`, in some coordinate system.
 #[derive(Debug, Clone, Default)]
@@ -122,6 +133,109 @@ impl Mesh {
         }
     }
 
+    /// Whether the mesh has triangles and every edge of it is on exactly two,
+    /// which is what a solid is.
+    pub fn is_closed(&self) -> bool {
+        let mut edges: std::collections::HashMap<(u32, u32), u8> =
+            std::collections::HashMap::with_capacity(self.t.len() * 3 / 2 + 1);
+        for t in &self.t {
+            for k in 0..3 {
+                let (a, b) = (t[k], t[(k + 1) % 3]);
+                let n = edges.entry((a.min(b), a.max(b))).or_insert(0);
+                *n = n.saturating_add(1);
+            }
+        }
+        !edges.is_empty() && edges.values().all(|&n| n == 2)
+    }
+
+    /// Makes the triangles that share edges face the same way round, as the
+    /// faces of a shell written by a careless exporter do not, and then
+    /// turns every closed piece outward. A piece that is not closed keeps the
+    /// way its first triangle faces. Edges shared by other than two
+    /// triangles join nothing.
+    pub fn orient_consistently(&mut self) {
+        let n = self.t.len();
+        // Edge (low, high) -> the triangles on it and whether each runs it
+        // low to high.
+        let mut edges: std::collections::HashMap<(u32, u32), Vec<(u32, bool)>> =
+            std::collections::HashMap::with_capacity(n * 3 / 2 + 1);
+        for (i, t) in self.t.iter().enumerate() {
+            for k in 0..3 {
+                let (a, b) = (t[k], t[(k + 1) % 3]);
+                if a != b {
+                    edges
+                        .entry((a.min(b), a.max(b)))
+                        .or_default()
+                        .push((i as u32, a < b));
+                }
+            }
+        }
+        // Per triangle: the neighbours across its edges, with whether they
+        // must be turned when it is not.
+        let mut next: Vec<Vec<(u32, bool)>> = vec![Vec::new(); n];
+        let mut open = vec![false; n];
+        for users in edges.values() {
+            if let [(a, da), (b, db)] = users[..] {
+                // Two triangles agree when they run their edge in opposite ways.
+                let opposite = da != db;
+                next[a as usize].push((b, !opposite));
+                next[b as usize].push((a, !opposite));
+            } else {
+                for &(i, _) in users {
+                    open[i as usize] = true;
+                }
+            }
+        }
+        let mut turn = vec![None::<bool>; n];
+        let mut stack = Vec::new();
+        for seed in 0..n {
+            if turn[seed].is_some() {
+                continue;
+            }
+            turn[seed] = Some(false);
+            let mut members = vec![seed];
+            stack.push(seed);
+            while let Some(i) = stack.pop() {
+                let here = turn[i].unwrap_or(false);
+                for &(j, flips) in &next[i] {
+                    let j = j as usize;
+                    if turn[j].is_none() {
+                        turn[j] = Some(here != flips);
+                        members.push(j);
+                        stack.push(j);
+                    }
+                }
+            }
+            // A closed piece faces outward: six times its volume is positive.
+            let closed = members.iter().all(|&i| !open[i]);
+            if closed {
+                let volume: f64 = members
+                    .iter()
+                    .map(|&i| {
+                        let t = self.t[i];
+                        let (a, b, c) = (
+                            self.p[t[0] as usize],
+                            self.p[t[1] as usize],
+                            self.p[t[2] as usize],
+                        );
+                        let v = math::dot(a, cross(b, c));
+                        if turn[i] == Some(true) { -v } else { v }
+                    })
+                    .sum();
+                if volume < 0.0 {
+                    for &i in &members {
+                        turn[i] = turn[i].map(|x| !x);
+                    }
+                }
+            }
+        }
+        for (t, turn) in self.t.iter_mut().zip(&turn) {
+            if *turn == Some(true) {
+                t.swap(1, 2);
+            }
+        }
+    }
+
     pub fn bounds(&self) -> Option<(V3, V3)> {
         let mut lo = [f64::INFINITY; 3];
         let mut hi = [f64::NEG_INFINITY; 3];
@@ -157,6 +271,14 @@ pub(crate) struct Reader<'a> {
     /// the next one twice, thirty levels down, is four billion visits of
     /// thirty instances; the depth limit alone does not stop it.
     visits: usize,
+    /// Surface and curve evaluations still allowed, for the work that
+    /// triangles do not count: projecting boundary points on a surface,
+    /// sampling curves for a station.
+    ops: usize,
+    /// Axis -> grid, made when a grid placement first asks.
+    grids: Option<HashMap<u32, u32>>,
+    /// Multiplier of the chords a curve segment is sampled with.
+    density: usize,
     placements: HashMap<u32, Xf>,
     maps: HashMap<u32, Rc<Vec<Piece>>>,
     /// Item -> style, from `IfcStyledItem`.
@@ -179,6 +301,9 @@ impl<'a> Reader<'a> {
             warnings: Warnings::default(),
             work,
             visits: f.len().saturating_add(64).saturating_mul(64),
+            ops: f.len().saturating_add(64).saturating_mul(256).min(MAX_OPS),
+            grids: None,
+            density: 1,
             placements: HashMap::new(),
             maps: HashMap::new(),
             styled: HashMap::new(),
@@ -211,6 +336,12 @@ impl<'a> Reader<'a> {
         Some(())
     }
 
+    /// Takes `n` evaluations from the evaluation budget.
+    pub fn charge(&mut self, n: usize) -> Option<()> {
+        self.ops = self.ops.checked_sub(n)?;
+        Some(())
+    }
+
     /// Takes `n` triangles from the work budget.
     pub fn spend(&mut self, n: usize) -> Option<()> {
         self.work = self.work.checked_sub(n)?;
@@ -432,24 +563,36 @@ impl<'a> Reader<'a> {
                 b"IFCLOCALPLACEMENT" => {
                     (p.first().and_then(Value::id), self.axis2(p.get(1)?.id()?)?)
                 }
-                // IFC4X3: the placement along an alignment, with its
-                // Cartesian equivalent precomputed by the writer.
-                b"IFCLINEARPLACEMENT" => (
-                    p.first().and_then(Value::id),
-                    p.get(2)
+                // IFC4X3: the placement along an alignment. The writer's
+                // Cartesian equivalent is used when it has one, else the
+                // placement is worked out along the curve.
+                b"IFCLINEARPLACEMENT" => {
+                    let local = p
+                        .get(2)
                         .and_then(Value::id)
                         .and_then(|c| self.axis2(c))
-                        .unwrap_or(Xf::IDENTITY),
-                ),
-                b"IFCGRIDPLACEMENT" => {
-                    self.unsupported(ty);
-                    let parent = if self.f.schema == step::Schema::Ifc4x3 {
-                        p.first().and_then(Value::id)
-                    } else {
-                        None
-                    };
-                    (parent, Xf::IDENTITY)
+                        .or_else(|| {
+                            p.get(1)
+                                .and_then(Value::id)
+                                .and_then(|r| self.axis2_linear(r))
+                        });
+                    if local.is_none() {
+                        self.unsupported(ty);
+                    }
+                    (p.first().and_then(Value::id), local.unwrap_or(Xf::IDENTITY))
                 }
+                b"IFCGRIDPLACEMENT" => match self.grid_placement(&p) {
+                    Some(placed) => placed,
+                    None => {
+                        self.unsupported(ty);
+                        let parent = if self.f.schema == step::Schema::Ifc4x3 {
+                            p.first().and_then(Value::id)
+                        } else {
+                            None
+                        };
+                        (parent, Xf::IDENTITY)
+                    }
+                },
                 _ => return None,
             };
             chain.push((pid, local));
@@ -763,6 +906,8 @@ pub fn read(bytes: &[u8], limits: &Limits) -> Result<Scene, Error> {
 
     // The spatial tree, from the project down.
     let mut node_of: HashMap<u32, u32> = HashMap::new();
+    // Per node, the storey it is or lies in; parents come first.
+    let mut storey_of_node: Vec<Option<u32>> = Vec::new();
     let mut stack: Vec<(u32, Option<u32>)> = f.of_type(b"IFCPROJECT").map(|p| (p, None)).collect();
     stack.reverse();
     while let Some((id, parent)) = stack.pop() {
@@ -774,11 +919,25 @@ pub fn read(bytes: &[u8], limits: &Limits) -> Result<Scene, Error> {
             continue;
         }
         let index = out.scene.nodes.len() as u32;
+        let is_storey = ty == b"IFCBUILDINGSTOREY";
+        // IfcBuildingStorey.Elevation follows the nine attributes of
+        // IfcSpatialStructureElement.
+        let elevation = p
+            .get(9)
+            .and_then(Value::num)
+            .map(|e| e * r.length)
+            .filter(|e| is_storey && e.is_finite());
         out.scene.nodes.push(Node {
             id,
             class: String::from_utf8_lossy(ty).into_owned(),
             name: p.get(2).and_then(Value::text).unwrap_or_default(),
             parent,
+            elevation,
+        });
+        storey_of_node.push(if is_storey {
+            Some(index)
+        } else {
+            parent.and_then(|q| storey_of_node[q as usize])
         });
         node_of.insert(id, index);
         if let Some(kids) = children.get(&id) {
@@ -788,11 +947,15 @@ pub fn read(bytes: &[u8], limits: &Limits) -> Result<Scene, Error> {
         }
     }
 
-    // Products: GlobalId first, a product definition shape in seventh place.
+    // Products: GlobalId first (some exporters leave it null), a product
+    // definition shape in seventh place.
     let mut origin: Option<V3> = None;
+    // Alignments are axes, curves, which are not drawn.
+    let mut alignments = 0u32;
     for &id in &ids {
         let Some(raw) = f.raw(id) else { continue };
-        if !raw.trim_ascii_start().starts_with(b"'") || !raw.contains(&b'#') {
+        let raw_start = raw.trim_ascii_start();
+        if !(raw_start.starts_with(b"'") || raw_start.starts_with(b"$")) || !raw.contains(&b'#') {
             continue;
         }
         let Some((ty, p)) = r.get(id) else { continue };
@@ -816,6 +979,7 @@ pub fn read(bytes: &[u8], limits: &Limits) -> Result<Scene, Error> {
             .and_then(|m| r.material_color(m, &material_reps, 0));
         let mut pieces = r.product(shape);
         if pieces.is_empty() {
+            alignments += u32::from(ty == b"IFCALIGNMENT");
             continue;
         }
         if let Some(openings) = voids.get(&id) {
@@ -869,11 +1033,18 @@ pub fn read(bytes: &[u8], limits: &Limits) -> Result<Scene, Error> {
             class,
             name: p.get(2).and_then(Value::text).unwrap_or_default(),
             node,
+            storey: node.and_then(|n| storey_of_node[n as usize]),
             ranges: Vec::new(),
         };
         out.add(element, parts);
     }
     out.scene.origin = origin.unwrap_or([0.0; 3]);
+    // A model of nothing else would show nothing and say nothing.
+    if out.scene.elements.is_empty() {
+        for _ in 0..alignments {
+            r.unsupported(b"IFCALIGNMENT");
+        }
+    }
     let mut warnings = r.warnings;
     warnings.truncated = warnings
         .truncated
diff --git a/crates/exav-render/src/formats/ifc/profiles.rs b/crates/exav-render/src/formats/ifc/profiles.rs
index 3caf5b6b..e74e4980 100644
--- a/crates/exav-render/src/formats/ifc/profiles.rs
+++ b/crates/exav-render/src/formats/ifc/profiles.rs
@@ -4,10 +4,10 @@
 
 use std::f64::consts::{FRAC_PI_2, PI, TAU};
 
-use super::curves::{segments, SEGMENTS_PER_TURN};
-use super::math::{Xf, V2, V3};
+use super::curves::{SEGMENTS_PER_TURN, segments};
+use super::math::{V2, V3, Xf};
 use super::step::Value;
-use super::{Reader, MAX_DEPTH};
+use super::{MAX_DEPTH, Reader};
 
 /// Closed areas, each an outer loop (counter-clockwise) and its holes
 /// (clockwise); and open curves, which sweep into surfaces.
diff --git a/crates/exav-render/src/formats/ifc/solids.rs b/crates/exav-render/src/formats/ifc/solids.rs
index dc17be99..ce9f9bc5 100644
--- a/crates/exav-render/src/formats/ifc/solids.rs
+++ b/crates/exav-render/src/formats/ifc/solids.rs
@@ -4,12 +4,12 @@
 
 use std::f64::consts::TAU;
 
-use super::curves::{de_boor, segments, SEGMENTS_PER_TURN};
-use super::math::{add, any_perpendicular, cross, dot, len, scale, sub, unit, Xf, V2, V3};
+use super::curves::{SEGMENTS_PER_TURN, segments};
+use super::math::{V2, V3, Xf, add, any_perpendicular, cross, dot, len, scale, sub, unit};
 use super::profiles::Profile;
 use super::step::Value;
 use super::triangulate::{triangulate, triangulate_3d};
-use super::{is, Mesh, Reader};
+use super::{Mesh, Reader, is};
 
 /// Most triangles one swept or sampled item may have before it is made.
 const MAX_ITEM_TRIANGLES: usize = 4_000_000;
@@ -25,13 +25,6 @@ fn rotate(p: V3, a: V3, d: V3, t: f64) -> V3 {
     add(a, r)
 }
 
-/// The angle `a`, a whole number of turns off, within half a turn of `prev`.
-/// In one step: turns added one at a time take as many steps as the polyline
-/// has wound, which a long spiral makes quadratic.
-fn continuous(a: f64, prev: f64) -> f64 {
-    a - TAU * ((a - prev) / TAU).round()
-}
-
 /// Loops of an area in order: the outer one, then the holes.
 fn loops(area: &(Vec<V2>, Vec<Vec<V2>>)) -> impl Iterator<Item = &Vec<V2>> {
     std::iter::once(&area.0).chain(area.1.iter())
@@ -162,7 +155,7 @@ pub fn prism(areas: &[(Vec<V2>, Vec<Vec<V2>>)], z0: f64, z1: f64) -> Option<Mesh
 }
 
 impl<'a> Reader<'a> {
-    fn budget(&self, n: usize) -> Option<()> {
+    pub(super) fn budget(&self, n: usize) -> Option<()> {
         (n <= MAX_ITEM_TRIANGLES && n <= self.work).then_some(())
     }
 
@@ -273,7 +266,7 @@ impl<'a> Reader<'a> {
     /// `IfcSweptDiskSolid`: a circle (with a hole for `InnerRadius`) along
     /// the directrix, its frame carried without twist.
     pub fn swept_disk(&mut self, p: &[Value], depth: u32) -> Option<Mesh> {
-        let path = self.curve(p.first()?.id()?, depth + 1)?;
+        let path = self.directrix(p.first()?.id()?, p.get(3), p.get(4), depth)?;
         let r = p.get(1)?.num().filter(|r| *r > 0.0 && r.is_finite())?;
         let inner = p
             .get(2)
@@ -307,7 +300,7 @@ impl<'a> Reader<'a> {
     pub fn swept_area(&mut self, ty: &[u8], p: &[Value], depth: u32) -> Option<Mesh> {
         let profile = self.profile(p.first()?.id()?, depth + 1)?;
         let pos = self.axis2_or_identity(p.get(1))?;
-        let path = self.curve(p.get(2)?.id()?, depth + 1)?;
+        let path = self.directrix(p.get(2)?.id()?, p.get(3), p.get(4), depth)?;
         let frames = match ty {
             b"IFCSURFACECURVESWEPTAREASOLID" => {
                 let s = p.get(5)?.id()?;
@@ -350,8 +343,8 @@ impl<'a> Reader<'a> {
             + profile.open.iter().map(Vec::len).sum::<usize>();
         self.budget(ring_len.saturating_mul(2).saturating_mul(pts.len()))?;
         let dirs: Vec<V3> = pts
-            .windows(2)
-            .map(|w| unit(sub(w[1], w[0])))
+            .array_windows()
+            .map(|&[a, b]| unit(sub(b, a)))
             .collect::<Option<_>>()?;
         // The profile's x axis on each segment.
         let mut xs: Vec<V3> = Vec::with_capacity(dirs.len());
@@ -466,12 +459,13 @@ impl<'a> Reader<'a> {
         let faces = p.get(2)?.list()?;
         for f in faces.iter().filter_map(Value::id) {
             let (fty, fp) = self.get(f)?;
-            let mut lps: Vec<Vec<u32>> = vec![fp
-                .first()?
-                .list()?
-                .iter()
-                .map(|i| index(i, &pn, n))
-                .collect::<Option<_>>()?];
+            let mut lps: Vec<Vec<u32>> = vec![
+                fp.first()?
+                    .list()?
+                    .iter()
+                    .map(|i| index(i, &pn, n))
+                    .collect::<Option<_>>()?,
+            ];
             if fty == b"IFCINDEXEDPOLYGONALFACEWITHVOIDS" {
                 for h in fp.get(1)?.list()? {
                     lps.push(
@@ -508,12 +502,12 @@ impl<'a> Reader<'a> {
                 self.warnings.invalid = self.warnings.invalid.saturating_add(1);
                 continue;
             };
-            if fty == b"IFCADVANCEDFACE" || fty == b"IFCFACESURFACE" {
-                if let Some(face) = self.surface_face(&fp, depth) {
-                    self.spend(face.t.len())?;
-                    m.append(&face);
-                    continue;
-                }
+            if (fty == b"IFCADVANCEDFACE" || fty == b"IFCFACESURFACE")
+                && let Some(face) = self.surface_face(&fp, depth)
+            {
+                self.spend(face.t.len())?;
+                m.append(&face);
+                continue;
             }
             let Some(bounds) = fp.first().and_then(Value::list) else {
                 continue;
@@ -553,6 +547,7 @@ impl<'a> Reader<'a> {
                     }
                     b"IFCEDGELOOP" => {
                         let Some(pts) = self.edge_loop(&lpp, depth) else {
+                            self.warnings.invalid = self.warnings.invalid.saturating_add(1);
                             continue;
                         };
                         let base = m.p.len() as u32;
@@ -582,8 +577,16 @@ impl<'a> Reader<'a> {
 
     /// The points of an `IfcEdgeLoop`, each edge's curve sampled between
     /// its vertices.
-    fn edge_loop(&mut self, p: &[Value], depth: u32) -> Option<Vec<V3>> {
+    pub(super) fn edge_loop(&mut self, p: &[Value], depth: u32) -> Option<Vec<V3>> {
+        self.edge_loop_checked(p, depth).map(|(pts, _)| pts)
+    }
+
+    /// [`edge_loop`](Self::edge_loop), and whether each edge starts where
+    /// the one before it ends and the last ends where the first starts
+    /// (some writers flag the edges of a loop the wrong way round).
+    pub(super) fn edge_loop_checked(&mut self, p: &[Value], depth: u32) -> Option<(Vec<V3>, bool)> {
         let mut out: Vec<V3> = Vec::new();
+        let mut connected = true;
         for oe in p.first()?.list()?.iter().filter_map(Value::id) {
             let (oty, op) = self.get(oe)?;
             let (edge, forward) = if oty == b"IFCORIENTEDEDGE" {
@@ -614,199 +617,21 @@ impl<'a> Reader<'a> {
             }
             let tol = 1e-9 * (1.0 + len(pts[0]));
             let skip = out.last().is_some_and(|l| len(sub(*l, pts[0])) <= tol);
+            if let Some(l) = out.last() {
+                connected &= len(sub(*l, pts[0])) <= 1e-6 * (1.0 + len(pts[0]));
+            }
+            // Points are charged as they are made: a loop that lists the
+            // same long edge many times is not free.
+            self.charge(pts.len() / 8 + 1)?;
             out.extend(pts.into_iter().skip(skip as usize));
         }
+        if let (Some(first), Some(last)) = (out.first(), out.last()) {
+            connected &= len(sub(*first, *last)) <= 1e-6 * (1.0 + len(*first));
+        }
         while out.len() > 1 && len(sub(out[0], out[out.len() - 1])) <= 1e-9 * (1.0 + len(out[0])) {
             out.pop();
         }
-        (out.len() >= 3).then_some(out)
-    }
-
-    /// A face on a curved surface: a B-spline surface tessellated over its
-    /// whole domain (its bounds are taken to be its natural edges), a
-    /// cylinder's face triangulated around its axis. `None` for a plane and
-    /// what is not handled, which the caller draws from the face's loops.
-    fn surface_face(&mut self, p: &[Value], depth: u32) -> Option<Mesh> {
-        let sid = p.get(1)?.id()?;
-        let (sty, sp) = self.get(sid)?;
-        match sty {
-            b"IFCBSPLINESURFACEWITHKNOTS" | b"IFCRATIONALBSPLINESURFACEWITHKNOTS" => {
-                let mut m = self.bspline_surface(&sp)?;
-                if p.get(2).and_then(Value::boolean) == Some(false) {
-                    for t in &mut m.t {
-                        t.swap(1, 2);
-                    }
-                }
-                Some(m)
-            }
-            b"IFCCYLINDRICALSURFACE" => {
-                let pos = self.axis2(sp.first()?.id()?)?;
-                let inv = pos.inverse()?;
-                let bounds = p.first()?.list()?;
-                let mut lps: Vec<Vec<V3>> = Vec::new();
-                for b in bounds.iter().filter_map(Value::id) {
-                    let bp = self.f.params(b)?;
-                    let (lty, lp) = self.get(bp.first()?.id()?)?;
-                    if lty != b"IFCEDGELOOP" {
-                        return None;
-                    }
-                    let mut pts = self.edge_loop(&lp, depth)?;
-                    if bp.get(1).and_then(Value::boolean) == Some(false) {
-                        pts.reverse();
-                    }
-                    lps.push(pts);
-                }
-                // Unrolled: (angle, height), the angle kept continuous.
-                let mut flat: Vec<V2> = Vec::new();
-                let mut world: Vec<V3> = Vec::new();
-                let mut idx: Vec<Vec<u32>> = Vec::new();
-                for l in &lps {
-                    let mut ring = Vec::with_capacity(l.len());
-                    let mut prev: Option<f64> = None;
-                    for &q in l {
-                        let lq = inv.point(q);
-                        let mut a = lq[1].atan2(lq[0]);
-                        if let Some(pa) = prev {
-                            a = continuous(a, pa);
-                        }
-                        prev = Some(a);
-                        flat.push([a, lq[2]]);
-                        world.push(q);
-                        ring.push((world.len() - 1) as u32);
-                    }
-                    idx.push(ring);
-                }
-                let first = idx.first()?;
-                let mut m = Mesh {
-                    p: world,
-                    t: triangulate(&flat, first, &idx[1..]),
-                };
-                // Facing out of the cylinder unless the face says otherwise.
-                let outward = p.get(2).and_then(Value::boolean).unwrap_or(true);
-                if let Some(t) = m.t.first() {
-                    let (a, b, c) = (m.p[t[0] as usize], m.p[t[1] as usize], m.p[t[2] as usize]);
-                    let n = cross(sub(b, a), sub(c, a));
-                    let radial = sub(a, pos.point([0.0, 0.0, inv.point(a)[2]]));
-                    if (dot(n, radial) > 0.0) != outward {
-                        for t in &mut m.t {
-                            t.swap(1, 2);
-                        }
-                    }
-                }
-                Some(m)
-            }
-            b"IFCPLANE" => None,
-            _ => {
-                self.unsupported(sty);
-                None
-            }
-        }
-    }
-
-    fn bspline_surface(&mut self, p: &[Value]) -> Option<Mesh> {
-        let du = usize::try_from(p.first()?.int()?)
-            .ok()
-            .filter(|d| (1..=16).contains(d))?;
-        let dv = usize::try_from(p.get(1)?.int()?)
-            .ok()
-            .filter(|d| (1..=16).contains(d))?;
-        let rows: Vec<Vec<V3>> = p
-            .get(2)?
-            .list()?
-            .iter()
-            .map(|r| self.points(Some(r)))
-            .collect::<Option<_>>()?;
-        let (nu, nv) = (rows.len(), rows.first()?.len());
-        if rows.iter().any(|r| r.len() != nv) || nu <= du || nv <= dv {
-            return None;
-        }
-        let knots = |m: &Value, k: &Value, n: usize, d: usize| -> Option<Vec<f64>> {
-            let mults: Vec<usize> = m
-                .list()?
-                .iter()
-                .map(|x| usize::try_from(x.int()?).ok())
-                .collect::<Option<_>>()?;
-            let ks: Vec<f64> = k.list()?.iter().map(Value::num).collect::<Option<_>>()?;
-            let total = mults.iter().try_fold(0usize, |a, &x| a.checked_add(x))?;
-            if mults.len() != ks.len() || total > n + 3 * d + 1 {
-                return None;
-            }
-            let u: Vec<f64> = ks
-                .iter()
-                .zip(&mults)
-                .flat_map(|(k, &m)| std::iter::repeat_n(*k, m))
-                .collect();
-            (u.len() > n + d && u.windows(2).all(|w| w[1] >= w[0])).then_some(u)
-        };
-        let ku = knots(p.get(7)?, p.get(9)?, nu, du)?;
-        let kv = knots(p.get(8)?, p.get(10)?, nv, dv)?;
-        let weights: Option<Vec<Vec<f64>>> = match p.get(12) {
-            Some(w) => Some(
-                w.list()?
-                    .iter()
-                    .map(|r| {
-                        r.list()?
-                            .iter()
-                            .map(Value::num)
-                            .collect::<Option<Vec<f64>>>()
-                    })
-                    .collect::<Option<_>>()?,
-            ),
-            None => None,
-        };
-        if weights.as_ref().is_some_and(|w| {
-            w.len() != nu
-                || w.iter()
-                    .any(|r| r.len() != nv || r.iter().any(|x| *x <= 0.0))
-        }) {
-            return None;
-        }
-        let (su, sv) = ((nu * 4).clamp(4, 64), (nv * 4).clamp(4, 64));
-        self.budget(su * sv * 2)?;
-        let (u0, u1, v0, v1) = (ku[du], ku[nu], kv[dv], kv[nv]);
-        if !(u1 > u0 && v1 > v0) {
-            return None;
-        }
-        let mut m = Mesh::default();
-        for i in 0..=su {
-            let u = u0 + (u1 - u0) * i as f64 / su as f64;
-            // Each column of control points evaluated at u, then the curve
-            // through them at each v (weights carried homogeneously).
-            let mut col: Vec<V3> = Vec::with_capacity(nv);
-            let mut colw: Vec<f64> = Vec::with_capacity(nv);
-            for j in 0..nv {
-                let ctrl: Vec<V3> = rows.iter().map(|r| r[j]).collect();
-                let w: Option<Vec<f64>> =
-                    weights.as_ref().map(|w| w.iter().map(|r| r[j]).collect());
-                let pt = de_boor(du, &ctrl, w.as_deref(), &ku, u)?;
-                let wt = match &w {
-                    Some(w) => de_boor(
-                        du,
-                        &w.iter().map(|x| [*x, 0.0, 0.0]).collect::<Vec<_>>(),
-                        None,
-                        &ku,
-                        u,
-                    )?[0],
-                    None => 1.0,
-                };
-                col.push(pt);
-                colw.push(wt);
-            }
-            for k in 0..=sv {
-                let v = v0 + (v1 - v0) * k as f64 / sv as f64;
-                let w = weights.as_ref().map(|_| colw.as_slice());
-                m.p.push(de_boor(dv, &col, w, &kv, v)?);
-            }
-        }
-        let stride = (sv + 1) as u32;
-        for i in 0..su as u32 {
-            for k in 0..sv as u32 {
-                let a = i * stride + k;
-                m.t.push([a, a + stride, a + stride + 1]);
-                m.t.push([a, a + stride + 1, a + 1]);
-            }
-        }
-        Some(m)
+        (out.len() >= 3).then_some((out, connected))
     }
 
     /// `IfcCurveBoundedPlane`: boundaries in the plane's (u, v).
@@ -1011,25 +836,6 @@ fn between(c: &[V3], a: V3, b: V3, same: bool) -> Vec<V3> {
 mod tests {
     use super::*;
 
-    /// The angle is brought next to the previous one by whole turns, however
-    /// far apart they are: adding a turn at a time took a billion steps for
-    /// a polyline wound a billion times.
-    #[test]
-    fn an_angle_is_unrolled_in_one_step_however_far_the_previous_one_is() {
-        use std::f64::consts::PI;
-        assert!((continuous(0.5, 0.5) - 0.5).abs() < 1e-12);
-        assert!((continuous(3.0, -3.0) - (3.0 - TAU)).abs() < 1e-12);
-        assert!((continuous(-3.0, 3.0) - (-3.0 + TAU)).abs() < 1e-12);
-        for prev in [0.0, 7.0, -40.0, 1.0e6, -1.0e12] {
-            for a in [-PI, -1.0, 0.0, 2.5, PI] {
-                let c = continuous(a, prev);
-                assert!((c - prev).abs() <= PI + 1e-6, "{a} next to {prev} gave {c}");
-                let turns = (c - a) / TAU;
-                assert!((turns - turns.round()).abs() < 1e-3, "{a} became {c}");
-            }
-        }
-    }
-
     #[test]
     fn an_extruded_square_with_a_hole() {
         let profile = Profile {
diff --git a/crates/exav-render/src/formats/ifc/spline.rs b/crates/exav-render/src/formats/ifc/spline.rs
new file mode 100644
index 00000000..71c13108
--- /dev/null
+++ b/crates/exav-render/src/formats/ifc/spline.rs
@@ -0,0 +1,324 @@
+//! B-spline surfaces (`IfcBSplineSurfaceWithKnots`, and the rational one):
+//! evaluation at a parameter pair, and the parameter pair nearest a point.
+
+use super::math::{V3, add, dot, len, scale, sub};
+
+/// Highest degree read.
+pub const MAX_DEGREE: usize = 16;
+
+/// A tensor-product B-spline surface, rational when it has weights.
+pub struct Spline {
+    du: usize,
+    dv: usize,
+    nv: usize,
+    /// Control points, `nv` per row of `u`.
+    ctrl: Vec<V3>,
+    weights: Option<Vec<f64>>,
+    ku: Vec<f64>,
+    kv: Vec<f64>,
+    /// The parameter domain.
+    pub u: (f64, f64),
+    pub v: (f64, f64),
+    /// Control rows and columns.
+    pub nu_ctrl: usize,
+    pub nv_ctrl: usize,
+    /// Whether the surface's two edges of `u` (of `v`) are the same curve.
+    pub closed: [bool; 2],
+}
+
+/// A knot vector from multiplicities and values, checked: non-decreasing,
+/// long enough for `n` control points of degree `p`, and no longer than a
+/// valid one can be made to be.
+pub fn expand_knots(mults: &[usize], values: &[f64], n: usize, p: usize) -> Option<Vec<f64>> {
+    let total = mults.iter().try_fold(0usize, |a, &x| a.checked_add(x))?;
+    if mults.len() != values.len() || total > n + 3 * p + 1 {
+        return None;
+    }
+    let u: Vec<f64> = values
+        .iter()
+        .zip(mults)
+        .flat_map(|(k, &m)| std::iter::repeat_n(*k, m))
+        .collect();
+    (u.len() > n + p && u.iter().all(|k| k.is_finite()) && u.array_windows().all(|[a, b]| b >= a))
+        .then_some(u)
+}
+
+/// The knot span of `t`: the largest `k` in `p..n` with `knots[k] <= t`
+/// (`t` is kept inside the domain). `knots` has more than `n + p` entries.
+fn span(knots: &[f64], n: usize, p: usize, t: f64) -> usize {
+    let t = t.clamp(knots[p], knots[n]);
+    // Largest k in p..n-1 with knots[k] <= t.
+    let (mut lo, mut hi) = (p, n - 1);
+    while lo < hi {
+        let mid = (lo + hi).div_ceil(2);
+        if knots[mid] <= t {
+            lo = mid;
+        } else {
+            hi = mid - 1;
+        }
+    }
+    lo
+}
+
+/// The `p + 1` basis functions that are not zero in span `k` at `t`.
+fn basis(knots: &[f64], p: usize, k: usize, t: f64, out: &mut [f64; MAX_DEGREE + 1]) {
+    let mut left = [0.0; MAX_DEGREE + 1];
+    let mut right = [0.0; MAX_DEGREE + 1];
+    out[0] = 1.0;
+    for j in 1..=p {
+        left[j] = t - knots[k + 1 - j];
+        right[j] = knots[k + j] - t;
+        let mut saved = 0.0;
+        for r in 0..j {
+            let den = right[r + 1] + left[j - r];
+            let temp = if den != 0.0 { out[r] / den } else { 0.0 };
+            out[r] = saved + right[r + 1] * temp;
+            saved = left[j - r] * temp;
+        }
+        out[j] = saved;
+    }
+}
+
+impl Spline {
+    /// `None` unless the data is a valid surface: degrees in range, a
+    /// regular grid of control points with more than the degree of them
+    /// each way, knots that fit, positive weights, a domain with area.
+    pub fn new(
+        du: usize,
+        dv: usize,
+        rows: &[Vec<V3>],
+        ku: Vec<f64>,
+        kv: Vec<f64>,
+        weights: Option<Vec<Vec<f64>>>,
+    ) -> Option<Spline> {
+        if !(1..=MAX_DEGREE).contains(&du) || !(1..=MAX_DEGREE).contains(&dv) {
+            return None;
+        }
+        let (nu, nv) = (rows.len(), rows.first()?.len());
+        if rows.iter().any(|r| r.len() != nv) || nu <= du || nv <= dv {
+            return None;
+        }
+        if ku.len() <= nu + du || kv.len() <= nv + dv {
+            return None;
+        }
+        if let Some(w) = &weights
+            && (w.len() != nu
+                || w.iter()
+                    .any(|r| r.len() != nv || r.iter().any(|x| x.is_nan() || *x <= 0.0)))
+        {
+            return None;
+        }
+        let (u, v) = ((ku[du], ku[nu]), (kv[dv], kv[nv]));
+        if !(u.1 > u.0 && v.1 > v.0 && u.1.is_finite() && v.1.is_finite()) {
+            return None;
+        }
+        let mut s = Spline {
+            du,
+            dv,
+            nv,
+            ctrl: rows.iter().flatten().copied().collect(),
+            weights: weights.map(|w| w.into_iter().flatten().collect()),
+            ku,
+            kv,
+            u,
+            v,
+            nu_ctrl: nu,
+            nv_ctrl: nv,
+            closed: [false; 2],
+        };
+        s.closed = [s.is_closed(0), s.is_closed(1)];
+        Some(s)
+    }
+
+    /// Whether the surface meets itself where parameter `k` (0 for `u`)
+    /// ends, along three lines across it.
+    fn is_closed(&self, k: usize) -> bool {
+        let (along, across) = if k == 0 {
+            (self.u, self.v)
+        } else {
+            (self.v, self.u)
+        };
+        let at = |t: f64, share: f64| {
+            let s = across.0 + (across.1 - across.0) * share;
+            if k == 0 {
+                self.eval(t, s)
+            } else {
+                self.eval(s, t)
+            }
+        };
+        let mut lo = [f64::INFINITY; 3];
+        let mut hi = [f64::NEG_INFINITY; 3];
+        for c in &self.ctrl {
+            for i in 0..3 {
+                lo[i] = lo[i].min(c[i]);
+                hi[i] = hi[i].max(c[i]);
+            }
+        }
+        let tol = 1e-7 * len(sub(hi, lo)).max(1e-9);
+        [0.25, 0.5, 0.75]
+            .iter()
+            .all(|&share| match (at(along.0, share), at(along.1, share)) {
+                (Some(p), Some(q)) => len(sub(p, q)) <= tol,
+                _ => false,
+            })
+    }
+
+    /// `t` in parameter `k`: kept inside its domain, or brought into it by
+    /// whole turns where the surface closes on itself.
+    fn fold(&self, k: usize, t: f64) -> f64 {
+        let (lo, hi) = if k == 0 { self.u } else { self.v };
+        if self.closed[k] {
+            lo + (t - lo).rem_euclid(hi - lo)
+        } else {
+            t.clamp(lo, hi)
+        }
+    }
+
+    /// The point at `(u, v)`, which are kept inside the domain, or turned
+    /// into it where the surface is closed; `None` for a point that is not
+    /// finite.
+    pub fn eval(&self, u: f64, v: f64) -> Option<V3> {
+        let (nu, nv) = (self.nu_ctrl, self.nv_ctrl);
+        let (u, v) = (self.fold(0, u), self.fold(1, v));
+        let (ku, kv) = (
+            span(&self.ku, nu, self.du, u),
+            span(&self.kv, nv, self.dv, v),
+        );
+        let (mut bu, mut bv) = ([0.0; MAX_DEGREE + 1], [0.0; MAX_DEGREE + 1]);
+        basis(&self.ku, self.du, ku, u, &mut bu);
+        basis(&self.kv, self.dv, kv, v, &mut bv);
+        let mut sum = [0.0; 3];
+        let mut wsum = 0.0;
+        for (a, &na) in bu.iter().enumerate().take(self.du + 1) {
+            let row = ku - self.du + a;
+            for (b, &nb) in bv.iter().enumerate().take(self.dv + 1) {
+                let at = row * self.nv + kv - self.dv + b;
+                let w = na * nb * self.weights.as_ref().map_or(1.0, |w| w[at]);
+                let c = self.ctrl[at];
+                sum = add(sum, scale(c, w));
+                wsum += w;
+            }
+        }
+        let p = scale(sum, 1.0 / wsum);
+        (wsum.abs() > 1e-300 && p.iter().all(|x| x.is_finite())).then_some(p)
+    }
+
+    /// The parameters of the surface point nearest `target` and its
+    /// distance: the nearest of `grid` (parameter pairs and their points),
+    /// refined by Gauss-Newton steps, each kept only if it brings the
+    /// point nearer. `evals` counts the surface evaluations made, with the
+    /// search of the grid as one.
+    pub fn nearest(
+        &self,
+        target: V3,
+        grid: &[(f64, f64, V3)],
+        evals: &mut usize,
+    ) -> Option<(f64, f64, f64)> {
+        let &(mut u, mut v, mut s) = grid.iter().min_by(|a, b| {
+            let (da, db) = (len(sub(a.2, target)), len(sub(b.2, target)));
+            da.partial_cmp(&db).unwrap_or(std::cmp::Ordering::Equal)
+        })?;
+        *evals += 1 + grid.len() / 64;
+        let mut best = len(sub(s, target));
+        let (hu, hv) = ((self.u.1 - self.u.0) * 1e-6, (self.v.1 - self.v.0) * 1e-6);
+        for _ in 0..ITERATIONS {
+            *evals += 3;
+            let r = sub(s, target);
+            // One-sided differences that stay inside the domain.
+            let (u1, v1) = (
+                if u + hu <= self.u.1 { u + hu } else { u - hu },
+                if v + hv <= self.v.1 { v + hv } else { v - hv },
+            );
+            let su = scale(sub(self.eval(u1, v)?, s), 1.0 / (u1 - u));
+            let sv = scale(sub(self.eval(u, v1)?, s), 1.0 / (v1 - v));
+            let (a, b, c) = (dot(su, su), dot(su, sv), dot(sv, sv));
+            let det = a * c - b * b;
+            if det.is_nan() || det.abs() <= 1e-300 {
+                break;
+            }
+            let (ru, rv) = (-dot(su, r), -dot(sv, r));
+            let (du, dv) = ((c * ru - b * rv) / det, (a * rv - b * ru) / det);
+            let mut step = 1.0;
+            let mut moved = false;
+            for _ in 0..4 {
+                *evals += 1;
+                let (nu, nv) = (
+                    (u + step * du).clamp(self.u.0, self.u.1),
+                    (v + step * dv).clamp(self.v.0, self.v.1),
+                );
+                let ns = self.eval(nu, nv)?;
+                let nd = len(sub(ns, target));
+                if nd < best {
+                    let size = (nu - u).abs() / (self.u.1 - self.u.0)
+                        + (nv - v).abs() / (self.v.1 - self.v.0);
+                    (u, v, s, best) = (nu, nv, ns, nd);
+                    moved = size > 1e-12;
+                    break;
+                }
+                step /= 2.0;
+            }
+            if !moved {
+                break;
+            }
+        }
+        Some((u, v, best))
+    }
+}
+
+/// Gauss-Newton steps per point.
+pub const ITERATIONS: usize = 12;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// A bilinear patch: degree 1 both ways over the unit square, lifted
+    /// at one corner.
+    fn patch() -> Spline {
+        let rows = vec![
+            vec![[0.0, 0.0, 0.0], [0.0, 1.0, 0.0]],
+            vec![[1.0, 0.0, 0.0], [1.0, 1.0, 1.0]],
+        ];
+        let k = vec![0.0, 0.0, 1.0, 1.0];
+        Spline::new(1, 1, &rows, k.clone(), k, None).unwrap()
+    }
+
+    #[test]
+    fn a_bilinear_patch_is_evaluated_at_its_corners_and_middle() {
+        let s = patch();
+        assert_eq!(s.eval(0.0, 0.0), Some([0.0, 0.0, 0.0]));
+        assert_eq!(s.eval(1.0, 1.0), Some([1.0, 1.0, 1.0]));
+        assert_eq!(s.eval(0.5, 0.5), Some([0.5, 0.5, 0.25]));
+        // Outside the domain the point is that of its edge.
+        assert_eq!(s.eval(2.0, -1.0), s.eval(1.0, 0.0));
+    }
+
+    #[test]
+    fn the_nearest_parameters_of_a_point_on_the_surface() {
+        let s = patch();
+        let grid: Vec<(f64, f64, V3)> = (0..=4)
+            .flat_map(|i| (0..=4).map(move |j| (i as f64 / 4.0, j as f64 / 4.0)))
+            .map(|(u, v)| (u, v, s.eval(u, v).unwrap()))
+            .collect();
+        let mut evals = 0;
+        let (u, v, d) = s.nearest([0.3, 0.7, 0.21], &grid, &mut evals).unwrap();
+        assert!(evals > 0);
+        assert!(
+            (u - 0.3).abs() < 1e-6 && (v - 0.7).abs() < 1e-6 && d < 1e-9,
+            "{u} {v} {d}"
+        );
+        // A point high above it is nearest to the corner that is lifted.
+        let (u, v, d) = s.nearest([0.3, 0.7, 5.0], &grid, &mut evals).unwrap();
+        assert!((u - 1.0).abs() < 1e-6 && (v - 1.0).abs() < 1e-6, "{u} {v}");
+        assert!((d - 4.0718546).abs() < 1e-6, "{d}");
+    }
+
+    #[test]
+    fn knots_must_not_decrease_or_run_long() {
+        assert!(expand_knots(&[2, 2], &[0.0, 1.0], 2, 1).is_some());
+        assert!(expand_knots(&[2, 2], &[1.0, 0.0], 2, 1).is_none());
+        assert!(expand_knots(&[usize::MAX, 2], &[0.0, 1.0], 2, 1).is_none());
+        assert!(expand_knots(&[1_000_000], &[0.0], 2, 1).is_none());
+        assert!(expand_knots(&[2, 2], &[0.0, f64::INFINITY], 2, 1).is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/ifc/step.rs b/crates/exav-render/src/formats/ifc/step.rs
index b767d321..4342bd35 100644
--- a/crates/exav-render/src/formats/ifc/step.rs
+++ b/crates/exav-render/src/formats/ifc/step.rs
@@ -211,6 +211,17 @@ impl<'a> StepFile<'a> {
                     s.skip_space();
                     let start = s.pos;
                     if s.peek() != Some(b'(') || s.skip_balanced().is_none() {
+                        // A header that is not well formed (a stray `;`
+                        // in it, say) says nothing of the instances: the
+                        // schema is what it names before the `;`, and the
+                        // statement ends there.
+                        s.pos = start;
+                        let end = s.rest().iter().position(|&c| c == b';');
+                        if let Some(end) = end {
+                            file.schema = schema_of(&data[start..start + end]);
+                            s.pos = start + end + 1;
+                            continue;
+                        }
                         file.damaged = true;
                         break;
                     }
@@ -260,7 +271,7 @@ impl<'a> StepFile<'a> {
         if file.entries.is_empty() {
             return Err(Error::NoData);
         }
-        if file.entries.windows(2).any(|w| w[0].id >= w[1].id) {
+        if file.entries.array_windows().any(|[a, b]| a.id >= b.id) {
             let mut sorted: Vec<(u32, u32)> = file
                 .entries
                 .iter()
@@ -430,16 +441,25 @@ impl<'a> Scanner<'a> {
         None
     }
 
-    /// From `'` to after the closing one (`''` is a quote inside).
+    /// From `'` to after the closing one (`''` is a quote inside, and so is
+    /// the character `\S\` shifts, a quote too).
     fn skip_string(&mut self) -> Option<()> {
         self.pos += 1;
         loop {
-            let i = self.rest().iter().position(|&c| c == b'\'')?;
-            self.pos += i + 1;
-            if self.peek() == Some(b'\'') {
-                self.pos += 1;
-            } else {
-                return Some(());
+            match self.peek()? {
+                b'\'' => {
+                    self.pos += 1;
+                    if self.peek() == Some(b'\'') {
+                        self.pos += 1;
+                    } else {
+                        return Some(());
+                    }
+                }
+                b'\\' if self.rest().starts_with(b"\\\\") => self.pos += 2,
+                b'\\' if self.rest().starts_with(b"\\S\\") && self.rest().len() >= 4 => {
+                    self.pos += 4;
+                }
+                _ => self.pos += 1,
             }
         }
     }
@@ -671,10 +691,8 @@ impl<'a> Parser<'a> {
                 let text = std::str::from_utf8(&self.src[start..start + n]).ok()?;
                 self.pos += n;
                 let is_real = text.bytes().any(|c| matches!(c, b'.' | b'e' | b'E'));
-                if !is_real {
-                    if let Ok(i) = text.parse::<i64>() {
-                        return Some(Value::Int(i));
-                    }
+                if !is_real && let Ok(i) = text.parse::<i64>() {
+                    return Some(Value::Int(i));
                 }
                 // `1.E5` is STEP; Rust wants a digit after the point.
                 let r = text.parse::<f64>().ok().or_else(|| {
@@ -782,7 +800,9 @@ mod tests {
     use super::*;
 
     fn file(data: &str) -> String {
-        format!("ISO-10303-21;\nHEADER;\nFILE_DESCRIPTION((''),'2;1');\nFILE_NAME('a','',(''),(''),'','','');\nFILE_SCHEMA(('IFC4'));\nENDSEC;\nDATA;\n{data}\nENDSEC;\nEND-ISO-10303-21;\n")
+        format!(
+            "ISO-10303-21;\nHEADER;\nFILE_DESCRIPTION((''),'2;1');\nFILE_NAME('a','',(''),(''),'','','');\nFILE_SCHEMA(('IFC4'));\nENDSEC;\nDATA;\n{data}\nENDSEC;\nEND-ISO-10303-21;\n"
+        )
     }
 
     #[test]
@@ -882,6 +902,30 @@ mod tests {
         assert_eq!(f.ids().collect::<Vec<_>>(), vec![1, 4]);
     }
 
+    #[test]
+    fn a_shifted_quote_does_not_end_a_string() {
+        // Vectorworks writes a quote as `\S\'` in a Japanese path.
+        let src = "ISO-10303-21;\r\nHEADER;\r\nFILE_NAME('/a\\S\\c\\S\\'\\X\\82\\S\\$/b.ifc','',(''),(''),'','','');\r\nFILE_SCHEMA(('IFC2X3'));\r\nENDSEC;\r\nDATA;\r\n#1=IFCA(1);\r\nENDSEC;\r\nEND-ISO-10303-21;\r\n";
+        let f = StepFile::parse(src.as_bytes()).unwrap();
+        assert!(!f.damaged);
+        assert_eq!(f.schema, Schema::Ifc2x3);
+        assert_eq!(f.ids().collect::<Vec<_>>(), vec![1]);
+        // A doubled backslash before an `S` is a backslash and an S.
+        let src =
+            "ISO-10303-21;HEADER;FILE_NAME('c:\\\\S\\\\','');ENDSEC;DATA;#1=IFCA('a\\\\');ENDSEC;";
+        let f = StepFile::parse(src.as_bytes()).unwrap();
+        assert_eq!(f.ids().collect::<Vec<_>>(), vec![1]);
+    }
+
+    #[test]
+    fn a_stray_semicolon_in_the_header_does_not_hide_the_instances() {
+        let src = "ISO-10303-21;\nHEADER;\nFILE_SCHEMA(('IFC4'););\nENDSEC;\nDATA;\n#1=IFCA(1);\n#2=IFCB(2);\nENDSEC;\nEND-ISO-10303-21;\n";
+        let f = StepFile::parse(src.as_bytes()).unwrap();
+        assert!(!f.damaged);
+        assert_eq!(f.schema, Schema::Ifc4);
+        assert_eq!(f.ids().collect::<Vec<_>>(), vec![1, 2]);
+    }
+
     #[test]
     fn nesting_is_bounded() {
         let deep = format!("{}1{}", "(".repeat(100), ")".repeat(100));
diff --git a/crates/exav-render/src/formats/ifc/triangulate.rs b/crates/exav-render/src/formats/ifc/triangulate.rs
index aea10d95..cd617852 100644
--- a/crates/exav-render/src/formats/ifc/triangulate.rs
+++ b/crates/exav-render/src/formats/ifc/triangulate.rs
@@ -2,7 +2,7 @@
 //! bridges (Eberly, "Triangulation by Ear Clipping", 2002), then ear
 //! clipping. The work is bounded: past it, what remains is fanned.
 
-use super::math::{any_perpendicular, cross, dot, sub, unit, V2, V3};
+use super::math::{V2, V3, any_perpendicular, cross, dot, sub, unit};
 
 /// Most point-in-triangle tests one polygon may cost before the rest of it
 /// is fanned.
diff --git a/crates/exav-render/src/formats/image.rs b/crates/exav-render/src/formats/image.rs
index d18e507b..4ae665bb 100644
--- a/crates/exav-render/src/formats/image.rs
+++ b/crates/exav-render/src/formats/image.rs
@@ -39,6 +39,9 @@ pub enum Format {
     /// A JBIG2 file.
     #[cfg(feature = "jbig2")]
     Jbig2,
+    /// JPEG XL, a bare codestream or in its ISO BMFF container.
+    #[cfg(feature = "jxl")]
+    Jxl,
 }
 
 impl Format {
@@ -67,6 +70,8 @@ impl Format {
         Format::Jpeg2000,
         #[cfg(feature = "jbig2")]
         Format::Jbig2,
+        #[cfg(feature = "jxl")]
+        Format::Jxl,
     ];
 
     /// The format `data` starts as, by its magic bytes.
@@ -129,6 +134,12 @@ impl Format {
         if data.starts_with(b"\x97JB2\r\n\x1a\n") {
             return Some(Format::Jbig2);
         }
+        // A bare codestream starts 0xFF 0x0A; the container with its
+        // signature box.
+        #[cfg(feature = "jxl")]
+        if data.starts_with(&[0xFF, 0x0A]) || data.starts_with(b"\0\0\0\x0cJXL \r\n\x87\n") {
+            return Some(Format::Jxl);
+        }
         None
     }
 
@@ -158,6 +169,8 @@ impl Format {
             Format::Jpeg2000 => "jpeg2000",
             #[cfg(feature = "jbig2")]
             Format::Jbig2 => "jbig2",
+            #[cfg(feature = "jxl")]
+            Format::Jxl => "jxl",
         }
     }
 }
@@ -174,6 +187,8 @@ pub enum Error {
     Undecodable,
     /// Decoding it takes more than the limit asked for, under [`DECODE_MAX`].
     TooLarge,
+    /// A camera RAW file that holds no preview a decoder reads (`raw`).
+    NoPreview,
 }
 
 impl std::fmt::Display for Error {
@@ -182,15 +197,14 @@ impl std::fmt::Display for Error {
             Error::Unsupported => "not an image format this build decodes",
             Error::Undecodable => "undecodable image",
             Error::TooLarge => "image too large to decode within the limit",
+            Error::NoPreview => "camera RAW file with no preview to show",
         })
     }
 }
 
 impl std::error::Error for Error {}
 
-/// Most bytes a decoded image may take: the `image` crate's default, which
-/// ClamAV decodes with.
-pub const DECODE_MAX: u64 = 512 * 1024 * 1024;
+pub use super::DECODE_MAX;
 
 /// Which channels each pixel has, in this order.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -321,6 +335,8 @@ pub fn decode(data: &[u8], format: Format, max_alloc: u64) -> Result<Pixels, Err
         Format::Jpeg2000 => jp2::decode(data, max_alloc),
         #[cfg(feature = "jbig2")]
         Format::Jbig2 => jbig2::decode(data, max_alloc),
+        #[cfg(feature = "jxl")]
+        Format::Jxl => jxl::decode(data, max_alloc),
         _ => decode_dynamic(data, format, max_alloc).map(Pixels::from_dynamic),
     })
     .unwrap_or(Err(Error::Undecodable))
@@ -328,7 +344,6 @@ pub fn decode(data: &[u8], format: Format, max_alloc: u64) -> Result<Pixels, Err
 
 /// Refuses a decode that needs more than `max_alloc` bytes (at most
 /// [`DECODE_MAX`]), as the `image` crate's limit does.
-#[cfg(any(feature = "jp2", feature = "jbig2"))]
 fn within(needed: u64, max_alloc: u64) -> Result<(), Error> {
     let limit = max_alloc.min(DECODE_MAX);
     if needed <= limit {
@@ -360,13 +375,88 @@ fn cmyk_to_rgb(cmyk: &[u8], alpha: bool) -> Vec<u8> {
     out
 }
 
-/// [`decode`], the format read from the first bytes.
+/// Full-range YCbCr bytes to RGB, as OpenJPEG and libtiff do it with the
+/// default coefficients.
+fn ycc_to_rgb(mut samples: Vec<u8>) -> Vec<u8> {
+    for px in samples.as_chunks_mut::<3>().0 {
+        let (y, cb, cr) = (
+            i32::from(px[0]),
+            i32::from(px[1]) - 128,
+            i32::from(px[2]) - 128,
+        );
+        let clamp = |v: i32| v.clamp(0, 255) as u8;
+        px[0] = clamp(y + (1.402 * f64::from(cr)) as i32);
+        px[1] = clamp(y - (0.344 * f64::from(cb) + 0.714 * f64::from(cr)) as i32);
+        px[2] = clamp(y + (1.772 * f64::from(cb)) as i32);
+    }
+    samples
+}
+
+/// [`decode`], the format read from the first bytes. With the `raw` feature,
+/// a camera RAW file is shown by its largest embedded preview (`raw`),
+/// where [`Format::detect`] and [`decode`] read a TIFF-structured one as the
+/// TIFF it also is.
 pub fn decode_any(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
-    decode(
-        data,
-        Format::detect(data).ok_or(Error::Unsupported)?,
-        max_alloc,
-    )
+    #[cfg(feature = "raw")]
+    match raw::decode(data, max_alloc) {
+        Err(Error::Unsupported) => {}
+        other => return other,
+    }
+    // A cursor is read as the icon file it is laid out as.
+    #[cfg(feature = "ico")]
+    if data.starts_with(&[0, 0, 2, 0])
+        && let Some(icon) = ico_view::cursor_as_icon(data)
+    {
+        return decode_any(&icon, max_alloc);
+    }
+    // BigTIFF has a magic of its own, which only the viewer reads.
+    let bigtiff = data.starts_with(b"II+\0") || data.starts_with(b"MM\0+");
+    let Some(format) = Format::detect(data).or(bigtiff.then_some(Format::Tiff)) else {
+        // No magic number, so no `Format`: a Targa file is told by its layout.
+        return std::panic::catch_unwind(|| tga_view::decode(data, max_alloc))
+            .unwrap_or(Err(Error::Undecodable));
+    };
+    let pixels = viewed_pixels(data, format, max_alloc)?;
+    Ok(if format == Format::Tiff {
+        tiff_view::oriented(data, pixels)
+    } else {
+        pixels
+    })
+}
+
+/// What `decode_any` shows of a file of this format, before a TIFF's
+/// orientation is applied.
+fn viewed_pixels(data: &[u8], format: Format, max_alloc: u64) -> Result<Pixels, Error> {
+    // What the hashing decoder reads wrongly, or not as the eye would pick
+    // (the image of an icon file with most colour), for the eye only.
+    let viewed = std::panic::catch_unwind(|| match format {
+        Format::Tiff if tiff_view::reads_differently(data) => tiff_view::decode(data, max_alloc),
+        #[cfg(feature = "ico")]
+        Format::Ico => ico_view::decode_largest(data, max_alloc),
+        #[cfg(feature = "dds")]
+        Format::Dds if dds_view::punches_through(data) => dds_view::decode(data, max_alloc),
+        _ => Err(Error::Undecodable),
+    });
+    if let Ok(Ok(pixels)) = viewed {
+        return Ok(pixels);
+    }
+    let decoded = decode(data, format, max_alloc);
+    // What the hashing decoder refuses, for the eye only.
+    if decoded == Err(Error::Undecodable) {
+        let viewed = std::panic::catch_unwind(|| match format {
+            Format::Tiff => tiff_view::decode(data, max_alloc),
+            Format::Bmp => bmp_view::decode_repaired(data, max_alloc),
+            #[cfg(feature = "dds")]
+            Format::Dds => dds_view::decode(data, max_alloc),
+            #[cfg(feature = "pnm")]
+            Format::Pnm => pnm_view::decode_uncommented(data, max_alloc),
+            _ => Err(Error::Undecodable),
+        });
+        if let Ok(Ok(pixels)) = viewed {
+            return Ok(pixels);
+        }
+    }
+    decoded
 }
 
 fn decode_dynamic(data: &[u8], format: Format, max_alloc: u64) -> Result<DynamicImage, Error> {
@@ -420,12 +510,27 @@ fn image_format(f: Format) -> Option<ImageFormat> {
         Format::Jpeg2000 => return None,
         #[cfg(feature = "jbig2")]
         Format::Jbig2 => return None,
+        #[cfg(feature = "jxl")]
+        Format::Jxl => return None,
     })
 }
 
+mod bmp_view;
+#[cfg(feature = "dds")]
+mod dds_view;
+#[cfg(feature = "ico")]
+mod ico_view;
 #[cfg(feature = "jbig2")]
 mod jbig2;
 #[cfg(feature = "jp2")]
 mod jp2;
+#[cfg(feature = "jxl")]
+mod jxl;
+#[cfg(feature = "pnm")]
+mod pnm_view;
+#[cfg(feature = "raw")]
+pub mod raw;
 #[cfg(test)]
 mod tests;
+mod tga_view;
+mod tiff_view;
diff --git a/crates/exav-render/src/formats/image/bmp_view.rs b/crates/exav-render/src/formats/image/bmp_view.rs
new file mode 100644
index 00000000..e1400846
--- /dev/null
+++ b/crates/exav-render/src/formats/image/bmp_view.rs
@@ -0,0 +1,173 @@
+//! BMP files to look at that `image` refuses: an OS/2 2.x header of 64 bytes,
+//! a plane count other than 1, and RLE rows stored top-down (a negative
+//! height, which the format does not allow with compression), and RLE data
+//! with deltas or a missing end that `image` calls corrupt. The header is
+//! rewritten, or the data expanded, and the file decoded again. A fallback of
+//! `decode_any` only.
+
+use super::{Error, Format, Pixels, Samples, decode, within};
+
+pub(super) fn decode_repaired(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    let mut file = data.to_vec();
+    let le = |file: &[u8], at: usize, n: usize| {
+        file.get(at..at + n).map_or(0u64, |b| {
+            b.iter().rev().fold(0, |v, &x| v << 8 | u64::from(x))
+        })
+    };
+    let mut changed = false;
+    if le(&file, 14, 4) == 64 && file.len() >= 78 {
+        // The OS/2 fields after the 40 of a Windows header are dropped.
+        file.drain(54..78);
+        file[14..18].copy_from_slice(&40u32.to_le_bytes());
+        let offset = (le(&file, 10, 4) as u32).saturating_sub(24);
+        file[10..14].copy_from_slice(&offset.to_le_bytes());
+        changed = true;
+    }
+    if le(&file, 14, 4) < 40 || file.len() < 54 {
+        return Err(Error::Undecodable);
+    }
+    if le(&file, 26, 2) != 1 {
+        file[26..28].copy_from_slice(&1u16.to_le_bytes());
+        changed = true;
+    }
+    let (height, compression) = (le(&file, 22, 4) as u32 as i32, le(&file, 30, 4));
+    let flip = height < 0 && matches!(compression, 1 | 2);
+    if flip {
+        file[22..26].copy_from_slice(&height.unsigned_abs().to_le_bytes());
+        changed = true;
+    }
+    let rle = matches!(compression, 1 | 2);
+    if !changed && !rle {
+        return Err(Error::Undecodable);
+    }
+    let decoded = match decode(&file, Format::Bmp, max_alloc) {
+        // `image` refuses an RLE stream that is not exactly as the format has
+        // it; a lenient reading is expanded to a plain 8-bit file.
+        Err(Error::Undecodable) if rle => {
+            let plain = expand_rle(&file, compression == 2, max_alloc)?;
+            decode(&plain, Format::Bmp, max_alloc)
+        }
+        other => other,
+    };
+    let mut pixels = decoded?;
+    if flip && let Samples::U8(samples) = &mut pixels.samples {
+        let row = pixels.width as usize * pixels.channels.count();
+        let rows: Vec<&[u8]> = samples.chunks(row.max(1)).collect();
+        *samples = rows.into_iter().rev().flatten().copied().collect();
+    }
+    Ok(pixels)
+}
+
+/// The file with its RLE4 or RLE8 data expanded to one byte for each pixel, as
+/// a plain 8-bit file with a palette of 256. The stream is read as Windows
+/// does and Pillow does: a run past the row is cut, a delta moves the position,
+/// and what the data never reaches is the first colour.
+fn expand_rle(file: &[u8], four: bool, max_alloc: u64) -> Result<Vec<u8>, Error> {
+    let le = |at: usize, n: usize| {
+        file.get(at..at + n).map_or(0usize, |b| {
+            b.iter().rev().fold(0, |v, &x| v << 8 | usize::from(x))
+        })
+    };
+    let (width, height) = (le(18, 4), le(22, 4));
+    let bits = le(28, 2);
+    if width == 0 || height == 0 || bits != if four { 4 } else { 8 } {
+        return Err(Error::Undecodable);
+    }
+    within(
+        (width as u64)
+            .saturating_mul(height as u64)
+            .saturating_mul(2),
+        max_alloc,
+    )?;
+    let header = le(14, 4);
+    let colors = match le(46, 4) {
+        0 => 1 << bits,
+        n => n.min(256),
+    };
+    let palette = file
+        .get(14usize.saturating_add(header)..)
+        .map(|p| &p[..p.len().min(colors * 4)])
+        .ok_or(Error::Undecodable)?;
+    let body = file.get(le(10, 4)..).ok_or(Error::Undecodable)?;
+
+    let mut index = vec![0u8; width * height];
+    let (mut x, mut y, mut i) = (0usize, 0usize, 0usize);
+    let put = |index: &mut [u8], x: usize, y: usize, v: u8| {
+        if x < width && y < height {
+            index[y * width + x] = v;
+        }
+    };
+    while y < height {
+        let (Some(&n), Some(&v)) = (body.get(i), body.get(i + 1)) else {
+            break;
+        };
+        i += 2;
+        match (n, v) {
+            (0, 0) => (x, y) = (0, y + 1),
+            (0, 1) => break,
+            (0, 2) => {
+                let (Some(&dx), Some(&dy)) = (body.get(i), body.get(i + 1)) else {
+                    break;
+                };
+                i += 2;
+                (x, y) = (x + usize::from(dx), y + usize::from(dy));
+            }
+            (0, count) => {
+                let bytes = if four {
+                    usize::from(count).div_ceil(2)
+                } else {
+                    usize::from(count)
+                };
+                let data = body.get(i..).unwrap_or_default();
+                for k in 0..usize::from(count) {
+                    let byte = if four { k / 2 } else { k };
+                    let Some(&b) = data.get(byte) else { break };
+                    let v = match (four, k % 2) {
+                        (false, _) => b,
+                        (true, 0) => b >> 4,
+                        (true, _) => b & 15,
+                    };
+                    put(&mut index, x + k, y, v);
+                }
+                x += usize::from(count);
+                // A run of literals ends on a word boundary.
+                i += bytes + bytes % 2;
+            }
+            (count, v) => {
+                for k in 0..usize::from(count) {
+                    let v = match (four, k % 2) {
+                        (false, _) => v,
+                        (true, 0) => v >> 4,
+                        (true, _) => v & 15,
+                    };
+                    put(&mut index, x + k, y, v);
+                }
+                x += usize::from(count);
+            }
+        }
+    }
+
+    let stride = width.div_ceil(4) * 4;
+    let offset = 14 + 40 + 1024;
+    let mut out = Vec::with_capacity(offset + stride * height);
+    out.extend_from_slice(b"BM");
+    out.extend_from_slice(&((offset + stride * height) as u32).to_le_bytes());
+    out.extend_from_slice(&[0; 4]);
+    out.extend_from_slice(&(offset as u32).to_le_bytes());
+    out.extend_from_slice(&40u32.to_le_bytes());
+    out.extend_from_slice(&(width as u32).to_le_bytes());
+    out.extend_from_slice(&(height as u32).to_le_bytes());
+    out.extend_from_slice(&[1, 0, 8, 0]);
+    out.extend_from_slice(&[0; 4]);
+    out.extend_from_slice(&((stride * height) as u32).to_le_bytes());
+    out.extend_from_slice(&[0; 8]);
+    out.extend_from_slice(&256u32.to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(palette);
+    out.resize(14 + 40 + 1024, 0);
+    for row in index.chunks(width) {
+        out.extend_from_slice(row);
+        out.resize(out.len() + (stride - width), 0);
+    }
+    Ok(out)
+}
diff --git a/crates/exav-render/src/formats/image/dds_view.rs b/crates/exav-render/src/formats/image/dds_view.rs
new file mode 100644
index 00000000..81191aa6
--- /dev/null
+++ b/crates/exav-render/src/formats/image/dds_view.rs
@@ -0,0 +1,397 @@
+//! DDS textures to look at that `image` does not decode (it reads DXT1, DXT3
+//! and DXT5 of sizes that are multiples of 4, and nothing else): BC1 to BC7,
+//! uncompressed layouts by their masks, 8-bit palettes, half and
+//! single-precision floats. Also DXT1 with transparent texels, which `image`
+//! draws opaque. Used by `decode_any` only, so that `decode`, and what is
+//! hashed, stay what ClamAV's would be.
+//!
+//! The first surface of the file is the picture: the largest mip level of the
+//! first face of a cube map, slice of a volume or element of an array.
+
+use super::{Channels, Error, Pixels, Samples, within};
+
+fn u32_at(data: &[u8], at: usize) -> Option<u32> {
+    Some(u32::from_le_bytes(data.get(at..at + 4)?.try_into().ok()?))
+}
+
+/// How the texels of a surface are stored.
+enum Layout {
+    /// 4x4 blocks: bytes per block, and what is in them.
+    Blocks(usize, Block),
+    /// Pixels of `bytes` each, with the masks of the channels.
+    Masks {
+        bytes: usize,
+        red: u32,
+        green: u32,
+        blue: u32,
+        alpha: u32,
+        /// Red is a luminance; with no alpha mask, the alpha is opaque.
+        luminance: bool,
+    },
+    /// Half (16 bits) or single (32 bits) floats, this many per pixel.
+    Floats { bits: usize, channels: usize },
+    /// 256 RGBA entries, then a byte per pixel.
+    Palette,
+}
+
+#[derive(Clone, Copy)]
+enum Block {
+    Bc1,
+    Bc2,
+    Bc3,
+    Bc4 { signed: bool },
+    Bc5 { signed: bool },
+    Bc6h { signed: bool },
+    Bc7,
+}
+
+const fn masks(bytes: usize, red: u32, green: u32, blue: u32, alpha: u32) -> Layout {
+    Layout::Masks {
+        bytes,
+        red,
+        green,
+        blue,
+        alpha,
+        luminance: false,
+    }
+}
+
+const fn floats(bits: usize, channels: usize) -> Layout {
+    Layout::Floats { bits, channels }
+}
+
+/// The layout a `DXGI_FORMAT` number stands for.
+fn dxgi(format: u32) -> Option<Layout> {
+    use Block::*;
+    Some(match format {
+        70..=72 => Layout::Blocks(8, Bc1),
+        73..=75 => Layout::Blocks(16, Bc2),
+        76..=78 => Layout::Blocks(16, Bc3),
+        79 | 80 => Layout::Blocks(8, Bc4 { signed: false }),
+        81 => Layout::Blocks(8, Bc4 { signed: true }),
+        82 | 83 => Layout::Blocks(16, Bc5 { signed: false }),
+        84 => Layout::Blocks(16, Bc5 { signed: true }),
+        94 | 95 => Layout::Blocks(16, Bc6h { signed: false }),
+        96 => Layout::Blocks(16, Bc6h { signed: true }),
+        97..=99 => Layout::Blocks(16, Bc7),
+        2 | 3 => floats(32, 4),
+        10 | 11 => floats(16, 4),
+        16 | 17 => floats(32, 2),
+        34 => floats(16, 2),
+        41 => floats(32, 1),
+        54 => floats(16, 1),
+        23..=25 => masks(4, 0x3ff, 0xffc00, 0x3ff0_0000, 0xc000_0000),
+        27..=30 => masks(4, 0xff, 0xff00, 0xff_0000, 0xff00_0000),
+        35 | 36 => masks(4, 0xffff, 0xffff_0000, 0, 0),
+        48..=50 => masks(2, 0xff, 0xff00, 0, 0),
+        56 => Layout::Masks {
+            bytes: 2,
+            red: 0xffff,
+            green: 0,
+            blue: 0,
+            alpha: 0,
+            luminance: true,
+        },
+        60..=62 => Layout::Masks {
+            bytes: 1,
+            red: 0xff,
+            green: 0,
+            blue: 0,
+            alpha: 0,
+            luminance: true,
+        },
+        65 => masks(1, 0, 0, 0, 0xff),
+        85 => masks(2, 0xf800, 0x7e0, 0x1f, 0),
+        86 => masks(2, 0x7c00, 0x3e0, 0x1f, 0x8000),
+        87 | 90 | 91 => masks(4, 0xff_0000, 0xff00, 0xff, 0xff00_0000),
+        88 | 92 | 93 => masks(4, 0xff_0000, 0xff00, 0xff, 0),
+        115 => masks(2, 0xf00, 0xf0, 0xf, 0xf000),
+        _ => return None,
+    })
+}
+
+/// The layout the pixel format of the header says, and where the texels start.
+fn layout(data: &[u8]) -> Option<(Layout, usize)> {
+    let flags = u32_at(data, 80)?;
+    let four_cc = data.get(84..88)?;
+    if flags & 4 != 0 {
+        use Block::*;
+        let block = |bytes, b| Some((Layout::Blocks(bytes, b), 128));
+        return match four_cc {
+            b"DXT1" => block(8, Bc1),
+            b"DXT2" | b"DXT3" => block(16, Bc2),
+            b"DXT4" | b"DXT5" => block(16, Bc3),
+            b"ATI1" | b"BC4U" => block(8, Bc4 { signed: false }),
+            b"BC4S" => block(8, Bc4 { signed: true }),
+            b"ATI2" | b"BC5U" => block(16, Bc5 { signed: false }),
+            b"BC5S" => block(16, Bc5 { signed: true }),
+            b"DX10" => Some((dxgi(u32_at(data, 128)?)?, 148)),
+            // D3DFORMAT numbers written in place of a FourCC.
+            _ => match u32::from_le_bytes(four_cc.try_into().ok()?) {
+                111 => Some((floats(16, 1), 128)),
+                112 => Some((floats(16, 2), 128)),
+                113 => Some((floats(16, 4), 128)),
+                114 => Some((floats(32, 1), 128)),
+                115 => Some((floats(32, 2), 128)),
+                116 => Some((floats(32, 4), 128)),
+                _ => None,
+            },
+        };
+    }
+    if flags & 0x20 != 0 && flags & 0x40 == 0 {
+        return Some((Layout::Palette, 128));
+    }
+    let bytes = (u32_at(data, 88)? as usize).div_ceil(8);
+    if !(1..=4).contains(&bytes) {
+        return None;
+    }
+    let (red, green, blue, alpha) = (
+        u32_at(data, 92)?,
+        u32_at(data, 96)?,
+        u32_at(data, 100)?,
+        u32_at(data, 104)?,
+    );
+    let luminance = flags & 0x2_0000 != 0;
+    // DDPF_ALPHA: alpha and nothing else.
+    let alpha_only = flags & 2 != 0 && flags & 0x40 == 0 && !luminance;
+    if red | green | blue | alpha == 0 {
+        return None;
+    }
+    Some((
+        Layout::Masks {
+            bytes,
+            red,
+            green,
+            blue,
+            alpha: if flags & 3 != 0 || alpha_only {
+                alpha
+            } else {
+                0
+            },
+            luminance,
+        },
+        128,
+    ))
+}
+
+/// Whether the file is BC1 with a transparent texel, which `image` draws
+/// opaque: a block with its first colour not above its second keeps the index
+/// 3 for no colour.
+pub(super) fn punches_through(data: &[u8]) -> bool {
+    let (Some((Layout::Blocks(8, Block::Bc1), start)), Some(height), Some(width)) =
+        (layout(data), u32_at(data, 12), u32_at(data, 16))
+    else {
+        return false;
+    };
+    let blocks = (width as usize)
+        .div_ceil(4)
+        .saturating_mul((height as usize).div_ceil(4));
+    data.get(start..).is_some_and(|body| {
+        body.as_chunks::<8>().0.iter().take(blocks).any(|b| {
+            u16::from_le_bytes([b[0], b[1]]) <= u16::from_le_bytes([b[2], b[3]])
+                && b[4..]
+                    .iter()
+                    .any(|&i| (0..4).any(|k| i >> (2 * k) & 3 == 3))
+        })
+    })
+}
+
+pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    if data.get(..4) != Some(b"DDS ") || u32_at(data, 4) != Some(124) {
+        return Err(Error::Undecodable);
+    }
+    let height = u32_at(data, 12).ok_or(Error::Undecodable)?;
+    let width = u32_at(data, 16).ok_or(Error::Undecodable)?;
+    if width == 0 || height == 0 {
+        return Err(Error::Undecodable);
+    }
+    let (layout, start) = layout(data).ok_or(Error::Undecodable)?;
+    let texels = u64::from(width) * u64::from(height);
+    within(texels.saturating_mul(24), max_alloc)?;
+    let (w, h) = (width as usize, height as usize);
+    let body = data.get(start..).ok_or(Error::Undecodable)?;
+    match layout {
+        Layout::Blocks(size, block) => blocks(body, w, h, size, block),
+        Layout::Masks {
+            bytes,
+            red,
+            green,
+            blue,
+            alpha,
+            luminance,
+        } => {
+            let needed = w
+                .checked_mul(h)
+                .and_then(|n| n.checked_mul(bytes))
+                .ok_or(Error::Undecodable)?;
+            let rows = body.get(..needed).ok_or(Error::Undecodable)?;
+            let channel = |px: u32, mask: u32| -> u8 {
+                if mask == 0 {
+                    return 0;
+                }
+                let shift = mask.trailing_zeros();
+                let max = u64::from(mask >> shift);
+                ((u64::from((px & mask) >> shift) * 255 + max / 2) / max) as u8
+            };
+            let mut out = Vec::with_capacity(w * h * 4);
+            for p in rows.chunks_exact(bytes) {
+                let mut px = 0u32;
+                for (i, b) in p.iter().enumerate() {
+                    px |= u32::from(*b) << (8 * i);
+                }
+                let a = if alpha != 0 { channel(px, alpha) } else { 255 };
+                if luminance {
+                    let l = channel(px, red);
+                    out.extend([l, l, l, a]);
+                } else if red | green | blue == 0 {
+                    // Alpha alone, drawn as grey.
+                    out.extend([a, a, a, 255]);
+                } else {
+                    out.extend([channel(px, red), channel(px, green), channel(px, blue), a]);
+                }
+            }
+            Ok(rgba(width, height, out))
+        }
+        Layout::Palette => {
+            let (palette, indices) = body.split_at_checked(1024).ok_or(Error::Undecodable)?;
+            let indices = indices
+                .get(..w.checked_mul(h).ok_or(Error::Undecodable)?)
+                .ok_or(Error::Undecodable)?;
+            let mut out = Vec::with_capacity(indices.len() * 4);
+            for &i in indices {
+                let at = usize::from(i) * 4;
+                out.extend_from_slice(&palette[at..at + 4]);
+            }
+            Ok(rgba(width, height, out))
+        }
+        Layout::Floats { bits, channels } => {
+            let needed = w
+                .checked_mul(h)
+                .and_then(|n| n.checked_mul(channels * bits / 8))
+                .ok_or(Error::Undecodable)?;
+            let raw = body.get(..needed).ok_or(Error::Undecodable)?;
+            let value = |i: usize| -> f32 {
+                if bits == 32 {
+                    f32::from_le_bytes([raw[4 * i], raw[4 * i + 1], raw[4 * i + 2], raw[4 * i + 3]])
+                } else {
+                    half(u16::from_le_bytes([raw[2 * i], raw[2 * i + 1]]))
+                }
+            };
+            let mut out = Vec::with_capacity(w * h * 4);
+            for p in 0..w * h {
+                let v = |c: usize| value(p * channels + c);
+                match channels {
+                    1 => out.extend([v(0), v(0), v(0), 1.0]),
+                    2 => out.extend([v(0), v(1), 0.0, 1.0]),
+                    _ => out.extend([v(0), v(1), v(2), v(3)]),
+                }
+            }
+            Ok(Pixels {
+                width,
+                height,
+                channels: Channels::Rgba,
+                samples: Samples::F32(out),
+            })
+        }
+    }
+}
+
+fn rgba(width: u32, height: u32, samples: Vec<u8>) -> Pixels {
+    Pixels {
+        width,
+        height,
+        channels: Channels::Rgba,
+        samples: Samples::U8(samples),
+    }
+}
+
+/// An IEEE half-precision value from its bits.
+fn half(bits: u16) -> f32 {
+    let sign = if bits & 0x8000 != 0 { -1.0 } else { 1.0 };
+    let exponent = i32::from((bits >> 10) & 0x1f);
+    let fraction = f32::from(bits & 0x3ff);
+    match exponent {
+        0 => sign * fraction * 2f32.powi(-24),
+        31 if fraction == 0.0 => sign * f32::INFINITY,
+        31 => f32::NAN,
+        e => sign * (1.0 + fraction / 1024.0) * 2f32.powi(e - 15),
+    }
+}
+
+/// The first surface of block-compressed texels, cropped from whole blocks.
+fn blocks(body: &[u8], w: usize, h: usize, size: usize, block: Block) -> Result<Pixels, Error> {
+    let (bx, by) = (w.div_ceil(4), h.div_ceil(4));
+    let needed = bx
+        .checked_mul(by)
+        .and_then(|n| n.checked_mul(size))
+        .ok_or(Error::Undecodable)?;
+    let body = body.get(..needed).ok_or(Error::Undecodable)?;
+    let (pw, ph) = (bx * 4, by * 4);
+    let mut rgba8 = vec![0u8; pw * ph * 4];
+    let mut hdr = matches!(block, Block::Bc6h { .. }).then(|| vec![0f32; pw * ph * 3]);
+    for (i, b) in body.chunks_exact(size).enumerate() {
+        let (x, y) = (i % bx * 4, i / bx * 4);
+        let at = (y * pw + x) * 4;
+        match block {
+            Block::Bc1 => bcdec_rs::bc1(b, &mut rgba8[at..], pw * 4),
+            Block::Bc2 => bcdec_rs::bc2(b, &mut rgba8[at..], pw * 4),
+            Block::Bc3 => bcdec_rs::bc3(b, &mut rgba8[at..], pw * 4),
+            Block::Bc7 => bcdec_rs::bc7(b, &mut rgba8[at..], pw * 4),
+            Block::Bc4 { signed } => {
+                let mut one = [0u8; 16];
+                bcdec_rs::bc4(b, &mut one, 4, signed);
+                for (k, v) in one.iter().enumerate() {
+                    let o = ((y + k / 4) * pw + x + k % 4) * 4;
+                    let v = if signed { v.wrapping_add(128) } else { *v };
+                    rgba8[o..o + 4].copy_from_slice(&[v, v, v, 255]);
+                }
+            }
+            Block::Bc5 { signed } => {
+                let mut two = [0u8; 32];
+                bcdec_rs::bc5(b, &mut two, 8, signed);
+                for k in 0..16 {
+                    let o = ((y + k / 4) * pw + x + k % 4) * 4;
+                    let (mut r, mut g) = (two[2 * k], two[2 * k + 1]);
+                    if signed {
+                        r = r.wrapping_add(128);
+                        g = g.wrapping_add(128);
+                    }
+                    // Two channels are a normal map's x and y: z follows.
+                    let (nx, ny) = (f32::from(r) / 127.5 - 1.0, f32::from(g) / 127.5 - 1.0);
+                    let nz = (1.0 - nx * nx - ny * ny).max(0.0).sqrt();
+                    rgba8[o..o + 4].copy_from_slice(&[
+                        r,
+                        g,
+                        ((nz + 1.0) * 127.5).round() as u8,
+                        255,
+                    ]);
+                }
+            }
+            Block::Bc6h { signed } => {
+                if let Some(hdr) = hdr.as_mut() {
+                    bcdec_rs::bc6h_float(b, &mut hdr[(y * pw + x) * 3..], pw * 3, signed);
+                }
+            }
+        }
+    }
+    if let Some(hdr) = hdr {
+        let mut out = Vec::with_capacity(w * h * 4);
+        for row in 0..h {
+            for col in 0..w {
+                let o = (row * pw + col) * 3;
+                out.extend([hdr[o], hdr[o + 1], hdr[o + 2], 1.0]);
+            }
+        }
+        return Ok(Pixels {
+            width: w as u32,
+            height: h as u32,
+            channels: Channels::Rgba,
+            samples: Samples::F32(out),
+        });
+    }
+    let mut out = Vec::with_capacity(w * h * 4);
+    for row in 0..h {
+        out.extend_from_slice(&rgba8[row * pw * 4..(row * pw + w) * 4]);
+    }
+    Ok(rgba(w as u32, h as u32, out))
+}
diff --git a/crates/exav-render/src/formats/image/ico_view.rs b/crates/exav-render/src/formats/image/ico_view.rs
new file mode 100644
index 00000000..f833ef84
--- /dev/null
+++ b/crates/exav-render/src/formats/image/ico_view.rs
@@ -0,0 +1,180 @@
+//! ICO and CUR files as the eye picks an image of them, and some that `image`
+//! refuses as a whole: a PNG that is not 32-bit, or one image that does not
+//! decode among several. Each image is tried alone, the largest first and of
+//! those the one with most colour. Used by `decode_any` only, so that the
+//! image the hash is of stays the one ClamAV's decoder picks.
+
+use super::{Error, Format, Pixels, decode};
+
+pub(super) fn decode_largest(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    let count = usize::from(u16::from_le_bytes([
+        *data.get(4).ok_or(Error::Undecodable)?,
+        *data.get(5).ok_or(Error::Undecodable)?,
+    ]));
+    let mut entries = Vec::new();
+    for i in 0..count.min(256) {
+        let e = data
+            .get(6 + 16 * i..22 + 16 * i)
+            .ok_or(Error::Undecodable)?;
+        // A width or height of 0 is 256.
+        let side = |b: u8| if b == 0 { 256usize } else { usize::from(b) };
+        let size = u32::from_le_bytes([e[8], e[9], e[10], e[11]]) as usize;
+        let at = u32::from_le_bytes([e[12], e[13], e[14], e[15]]) as usize;
+        // Bits per pixel: the entry's, or the image header's when it gives none.
+        let bits = match u16::from_le_bytes([e[6], e[7]]) {
+            0 => data
+                .get(at.saturating_add(14)..at.saturating_add(16))
+                .filter(|_| data.get(at..at.saturating_add(4)) == Some(&[40, 0, 0, 0]))
+                .map_or(32, |b| u16::from_le_bytes([b[0], b[1]])),
+            n => n,
+        };
+        entries.push(((side(e[0]) * side(e[1]), bits), e.to_vec(), size, at));
+    }
+    // The largest, and of those the one with most colour: a file that holds
+    // an image at several depths has the same size more than once.
+    entries.sort_by_key(|e| std::cmp::Reverse(e.0));
+    for (_, entry, size, at) in entries {
+        // The length the entry gives, then all that follows it: a length
+        // that is too short is a common fault.
+        let stated = at.checked_add(size).and_then(|end| data.get(at..end));
+        for image in [stated, data.get(at..)].into_iter().flatten() {
+            let decoded = if image.starts_with(b"\x89PNG") {
+                decode(image, Format::Png, max_alloc)
+            } else {
+                decode(&single_icon(&entry, image), Format::Ico, max_alloc)
+            };
+            if let Ok(pixels) = decoded {
+                return Ok(pixels);
+            }
+        }
+    }
+    Err(Error::Undecodable)
+}
+
+/// An icon file of the one image: its entry corrected to what the image
+/// holds (size, length, offset), and an AND mask cut short filled with
+/// zeros, which keep the pixels.
+fn single_icon(entry: &[u8], image: &[u8]) -> Vec<u8> {
+    let mut e = entry.to_vec();
+    let mut image = image.to_vec();
+    let le = |at: usize, n: usize| {
+        image.get(at..at + n).map_or(0, |b| {
+            b.iter().rev().fold(0u64, |v, &x| v << 8 | u64::from(x))
+        })
+    };
+    // The header is BITMAPINFOHEADER, or the V4 or V5 one that extends it.
+    let header = le(0, 4);
+    if matches!(header, 40 | 108 | 124) {
+        let (width, rows) = (le(4, 4), le(8, 4) as u32 as i32);
+        let (rows, bpp, used) = (u64::from(rows.unsigned_abs()) / 2, le(14, 2), le(32, 4));
+        let compression = le(16, 4);
+        // A V5 header may name a colour profile placed after the pixels,
+        // where `image` would read the AND mask.
+        let profile_at = if header == 124 && le(116, 4) > 0 {
+            usize::try_from(le(112, 4)).unwrap_or(usize::MAX)
+        } else {
+            usize::MAX
+        };
+        // Only an image of 8 bits or fewer has a palette in front of it.
+        let colors = match (bpp <= 8, used) {
+            (true, 0) => 1 << bpp,
+            (true, n) => n,
+            (false, _) => 0,
+        };
+        // The colour masks that follow a plain header, with `BI_BITFIELDS`
+        // (3) or `BI_ALPHABITFIELDS` (6).
+        let masks = match (header, compression) {
+            (40, 3) => 12,
+            (40, 6) => 16,
+            _ => 0,
+        };
+        let start = header + masks + colors.min(256) * 4;
+        let stride = |bits: u64| width.saturating_mul(bits).div_ceil(32) * 4;
+        let xor_end = start.saturating_add(stride(bpp).saturating_mul(rows));
+        let mask = stride(1).saturating_mul(rows);
+        let with_mask = xor_end.saturating_add(mask);
+        image.truncate(profile_at.max(start as usize));
+        // The mask is never longer than the pixels in front of it, and a header
+        // that says otherwise (no bits to a pixel) does not get a buffer made
+        // as large as the width and height say.
+        if (image.len() as u64) >= xor_end
+            && (image.len() as u64) < with_mask
+            && mask <= image.len() as u64
+        {
+            image.resize(with_mask as usize, 0);
+        }
+        if bpp == 32
+            && compression == 0
+            && (image.len() as u64) >= with_mask
+            && let (Ok(start), Ok(w), Ok(r)) = (
+                usize::try_from(start),
+                usize::try_from(width),
+                usize::try_from(rows),
+            )
+        {
+            alpha_or_mask(&mut image, start, w, r);
+        }
+        // Zero stands for 256.
+        e[0] = if width >= 256 { 0 } else { width as u8 };
+        e[1] = if rows >= 256 { 0 } else { rows as u8 };
+    }
+    e[8..12].copy_from_slice(&u32::try_from(image.len()).unwrap_or(u32::MAX).to_le_bytes());
+    e[12..16].copy_from_slice(&22u32.to_le_bytes());
+    let mut one = vec![0, 0, 1, 0, 1, 0];
+    one.extend_from_slice(&e);
+    one.extend_from_slice(&image);
+    one
+}
+
+/// A 32-bit image is drawn by its alpha channel when it has one, and its AND
+/// mask is cut off (Windows does the same; `image` makes transparent every
+/// pixel the mask covers, so a soft edge is lost). With no alpha anywhere the
+/// mask says which pixels are there: those it leaves are made opaque.
+/// `start` is where the pixels start, in rows of `width`, bottom row first.
+fn alpha_or_mask(image: &mut Vec<u8>, start: usize, width: usize, rows: usize) {
+    let end = width
+        .checked_mul(rows)
+        .and_then(|n| n.checked_mul(4))
+        .and_then(|n| n.checked_add(start));
+    let Some(end) = end.filter(|&e| e <= image.len()) else {
+        return;
+    };
+    if image[start..end]
+        .as_chunks::<4>()
+        .0
+        .iter()
+        .any(|p| p[3] != 0)
+    {
+        image.truncate(end);
+        return;
+    }
+    let row_bytes = width.div_ceil(32) * 4;
+    for r in 0..rows {
+        for x in 0..width {
+            let masked = image
+                .get(end + r * row_bytes + x / 8)
+                .is_some_and(|b| b >> (7 - x % 8) & 1 == 1);
+            if !masked {
+                image[start + (r * width + x) * 4 + 3] = 255;
+            }
+        }
+    }
+}
+
+/// A cursor file as an icon file: type 1, and the hotspots, which sit where
+/// an icon has its planes and bit count, cleared.
+pub(super) fn cursor_as_icon(data: &[u8]) -> Option<Vec<u8>> {
+    let count = usize::from(u16::from_le_bytes([*data.get(4)?, *data.get(5)?]));
+    // No images: not a cursor (an uncompressed Targa without an ID field
+    // starts the same four bytes).
+    if count == 0 {
+        return None;
+    }
+    let mut icon = data.get(..6 + 16 * count)?.to_vec();
+    icon[2] = 1;
+    for i in 0..count {
+        icon[10 + 16 * i..14 + 16 * i].fill(0);
+    }
+    icon.extend_from_slice(data.get(icon.len()..)?);
+    Some(icon)
+}
diff --git a/crates/exav-render/src/formats/image/jbig2.rs b/crates/exav-render/src/formats/image/jbig2.rs
index f890a345..cc219138 100644
--- a/crates/exav-render/src/formats/image/jbig2.rs
+++ b/crates/exav-render/src/formats/image/jbig2.rs
@@ -3,7 +3,7 @@
 
 use hayro_jbig2::{Decoder, Image};
 
-use super::{within, Channels, Error, Pixels, Samples};
+use super::{Channels, Error, Pixels, Samples, within};
 use crate::formats::pdf_image::region_pixels;
 
 pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
diff --git a/crates/exav-render/src/formats/image/jp2.rs b/crates/exav-render/src/formats/image/jp2.rs
index 5ffd01b7..dafcab7c 100644
--- a/crates/exav-render/src/formats/image/jp2.rs
+++ b/crates/exav-render/src/formats/image/jp2.rs
@@ -2,9 +2,12 @@
 
 use hayro_jpeg2000::{ColorSpace, DecodeSettings, DecoderContext, Image};
 
-use super::{cmyk_to_rgb, within, Channels, Error, Pixels, Samples};
+use super::{Channels, Error, Pixels, Samples, cmyk_to_rgb, within, ycc_to_rgb};
 
 pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    if crate::formats::jp2_tiles::has_too_many_tiles(data) {
+        return Err(Error::Undecodable);
+    }
     let image = Image::new(data, &DecodeSettings::default()).map_err(|_| Error::Undecodable)?;
     let (width, height) = (image.width(), image.height());
     let colour = u64::from(image.color_space().num_channels());
@@ -18,18 +21,27 @@ pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
             .saturating_mul(5),
         max_alloc,
     )?;
+    let ycc = chroma_subsampled_codestream(data);
+    let grey_bands = enumerated_colourspace(data) == Some(GREYSCALE);
     let data = image
         .decode(&mut DecoderContext::default())
         .map_err(|_| Error::Undecodable)?
         .data_u8();
     let alpha = image.has_alpha();
     let (channels, samples) = match (image.color_space(), colour, alpha) {
+        // Four bands under a greyscale colour box (GDAL's multi-band files)
+        // are not CMYK: the first is shown, as for a multi-band TIFF.
+        (ColorSpace::CMYK, 4, false) if grey_bands => (
+            Channels::Luma,
+            data.as_chunks::<4>().0.iter().map(|p| p[0]).collect(),
+        ),
         (ColorSpace::CMYK, _, _) | (ColorSpace::Icc { .. }, 4, _) => (
             if alpha { Channels::Rgba } else { Channels::Rgb },
             cmyk_to_rgb(&data, alpha),
         ),
         (_, 1, false) => (Channels::Luma, data),
         (_, 1, true) => (Channels::LumaAlpha, data),
+        (_, 3, false) if ycc => (Channels::Rgb, ycc_to_rgb(data)),
         (_, 3, false) => (Channels::Rgb, data),
         (_, 3, true) => (Channels::Rgba, data),
         // A two-component image with no colour specification.
@@ -46,3 +58,49 @@ pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
         samples: Samples::U8(samples),
     })
 }
+
+/// A bare codestream of three components whose second is subsampled has no
+/// colour box to say so, and is YCbCr (the reading of OpenJPEG's tools).
+fn chroma_subsampled_codestream(data: &[u8]) -> bool {
+    // SOC, SIZ, then Csiz at 40 and one (Ssiz, XRsiz, YRsiz) per component.
+    if !data.starts_with(&[0xFF, 0x4F, 0xFF, 0x51]) || data.get(40..42) != Some(&[0, 3]) {
+        return false;
+    }
+    let Some(c) = data.get(42..51) else {
+        return false;
+    };
+    c[1] == c[2] && c[4] != 1
+}
+
+/// The enumerated colour space for greyscale in a colour box.
+const GREYSCALE: u32 = 17;
+
+/// The enumerated colour space of a JP2 file's colour box (method 1).
+fn enumerated_colourspace(data: &[u8]) -> Option<u32> {
+    /// The boxes of `data`: type and contents.
+    fn boxes(data: &[u8]) -> impl Iterator<Item = (&[u8], &[u8])> {
+        let mut at = 0;
+        std::iter::from_fn(move || {
+            let head = data.get(at..at + 8)?;
+            let len = u32::from_be_bytes([head[0], head[1], head[2], head[3]]) as usize;
+            let (start, end) = match len {
+                0 => (at + 8, data.len()),
+                1 => {
+                    let big = data.get(at + 8..at + 16)?;
+                    let len = u64::from_be_bytes(big.try_into().ok()?);
+                    (at + 16, at.checked_add(usize::try_from(len).ok()?)?)
+                }
+                _ => (at + 8, at.checked_add(len)?),
+            };
+            let body = data.get(start..end.min(data.len()))?;
+            at = end.max(start);
+            Some((&head[4..8], body))
+        })
+    }
+    let (_, header) = boxes(data).find(|(t, _)| *t == b"jp2h")?;
+    let (_, colour) = boxes(header).find(|(t, _)| *t == b"colr")?;
+    match colour {
+        [1, _, _, e @ ..] => Some(u32::from_be_bytes(e.get(..4)?.try_into().ok()?)),
+        _ => None,
+    }
+}
diff --git a/crates/exav-render/src/formats/image/jxl.rs b/crates/exav-render/src/formats/image/jxl.rs
new file mode 100644
index 00000000..4a0e106e
--- /dev/null
+++ b/crates/exav-render/src/formats/image/jxl.rs
@@ -0,0 +1,58 @@
+//! JPEG XL through zenjxl-decoder: the first frame, as 8-bit samples (grey with
+//! alpha, or RGBA), in the colour space the file's own profile names
+//! converted to sRGB by the decoder.
+
+use zenjxl_decoder::api::{Error as JxlError, JxlDecoderLimits, JxlDecoderOptions, decode_with};
+
+use super::{Channels, DECODE_MAX, Error, Pixels, Samples};
+
+/// Most pixels of one image, whatever the memory: the decode costs time per
+/// pixel (about 20 Mpx a second in a browser).
+const MAX_PIXELS: u64 = 1 << 27;
+
+/// What the decoder holds for a pixel while it works: the colour as three
+/// floats, each extra channel as one, and the 8-bit result. Its own memory
+/// budget does not see all of it, so the pixel count is what holds it: a file
+/// that declares the most pixels the budget allows, and the most channels,
+/// takes this much of each.
+const BYTES_PER_PIXEL: u64 = 12 + 4 * MAX_EXTRA_CHANNELS as u64 + 4;
+
+/// Extra channels beyond what is drawn: the alpha, and one more. A file with
+/// more is refused as too large, and each costs a float a pixel.
+const MAX_EXTRA_CHANNELS: usize = 2;
+
+pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    let limit = max_alloc.min(DECODE_MAX);
+    let mut limits = JxlDecoderLimits::restrictive();
+    // The decoder tracks what it allocates against this budget. The result
+    // is 8 bits a sample and four samples a pixel at most.
+    limits.max_memory_bytes = Some(limit);
+    limits.max_extra_channels = Some(MAX_EXTRA_CHANNELS);
+    limits.max_pixels = Some((limit / BYTES_PER_PIXEL).min(MAX_PIXELS) as usize);
+    let mut options = JxlDecoderOptions::default();
+    options.limits = limits;
+    let image = decode_with(data, options).map_err(|e| match e {
+        JxlError::LimitExceeded { .. } if limit < DECODE_MAX => Error::TooLarge,
+        _ => Error::Undecodable,
+    })?;
+    let (width, height) = (
+        u32::try_from(image.width).map_err(|_| Error::Undecodable)?,
+        u32::try_from(image.height).map_err(|_| Error::Undecodable)?,
+    );
+    let channels = if image.is_grayscale {
+        Channels::LumaAlpha
+    } else {
+        Channels::Rgba
+    };
+    if image.channels != channels.count()
+        || image.data.len() as u64 != u64::from(width) * u64::from(height) * channels.count() as u64
+    {
+        return Err(Error::Undecodable);
+    }
+    Ok(Pixels {
+        width,
+        height,
+        channels,
+        samples: Samples::U8(image.data),
+    })
+}
diff --git a/crates/exav-render/src/formats/image/pnm_view.rs b/crates/exav-render/src/formats/image/pnm_view.rs
new file mode 100644
index 00000000..fed2ffae
--- /dev/null
+++ b/crates/exav-render/src/formats/image/pnm_view.rs
@@ -0,0 +1,61 @@
+//! PNM files to look at that `image` refuses for their comments: a `#` line
+//! between the size and the maximum value, or in the samples of a plain
+//! (P1 to P3) file. The comments are cut out and the file decoded again. A
+//! fallback of `decode_any` only.
+
+use super::{Error, Format, Pixels, decode};
+
+pub(super) fn decode_uncommented(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    let fixed = uncomment(data).ok_or(Error::Undecodable)?;
+    decode(&fixed, Format::Pnm, max_alloc)
+}
+
+/// The file with a header of numbers on lines of their own, and no comments in
+/// a plain file's samples. `None` for P7 and for a header that is not numbers.
+fn uncomment(data: &[u8]) -> Option<Vec<u8>> {
+    let kind = *data.get(1)?;
+    if data[0] != b'P' || !(b'1'..=b'6').contains(&kind) {
+        return None;
+    }
+    // Width and height; a bitmap has no maximum value.
+    let fields = if matches!(kind, b'1' | b'4') { 2 } else { 3 };
+    let mut out = vec![b'P', kind, b'\n'];
+    let mut at = 2;
+    for _ in 0..fields {
+        loop {
+            match *data.get(at)? {
+                b'#' => {
+                    while *data.get(at)? != b'\n' {
+                        at += 1;
+                    }
+                }
+                c if c.is_ascii_whitespace() => at += 1,
+                _ => break,
+            }
+        }
+        let start = at;
+        while data.get(at).is_some_and(u8::is_ascii_digit) {
+            at += 1;
+        }
+        if at == start {
+            return None;
+        }
+        out.extend_from_slice(&data[start..at]);
+        out.push(b'\n');
+    }
+    if matches!(kind, b'1'..=b'3') {
+        let mut samples = data.get(at..)?.iter();
+        while let Some(&b) = samples.next() {
+            if b == b'#' {
+                samples.by_ref().find(|&&c| c == b'\n');
+                out.push(b'\n');
+            } else {
+                out.push(b);
+            }
+        }
+    } else {
+        // One whitespace byte ends the header of a raw file.
+        out.extend_from_slice(data.get(at + 1..)?);
+    }
+    Some(out)
+}
diff --git a/crates/exav-render/src/formats/image/raw.rs b/crates/exav-render/src/formats/image/raw.rs
new file mode 100644
index 00000000..55f97fa7
--- /dev/null
+++ b/crates/exav-render/src/formats/image/raw.rs
@@ -0,0 +1,545 @@
+//! Camera RAW files, shown by the preview they carry.
+//!
+//! A RAW file holds the sensor data and, next to it, JPEG previews of
+//! several sizes, sometimes an uncompressed RGB one. [`decode`] finds them
+//! and gives the largest the budget allows, with the Exif orientation applied.
+//! The sensor data is not decoded.
+//!
+//! The families it reads, detected from the bytes (never the name):
+//!
+//! - TIFF-structured: Adobe DNG (and the Leica, Ricoh, Pentax, GoPro and
+//!   phone files that are DNG), Canon CR2, Phase One IIQ, Olympus ORF
+//!   (`IIRO`, `IIRS`, `MMOR`), Panasonic RW2, RAW and RWL (`IIU\0`), and
+//!   every other TIFF/EP file that holds a colour filter array or one of the
+//!   makers' own compressions: Nikon NEF and NRW, Sony ARW, SR2 and SRF,
+//!   Pentax PEF, Samsung SRW, Hasselblad 3FR, Kodak, Epson, Mamiya, Leaf.
+//! - Canon CR3 (an ISO base media file with the `crx ` brand), Fujifilm RAF,
+//!   Sigma X3F, Canon CRW, Minolta MRW.
+//!
+//! A plain TIFF is not one of them: [`detect`] says `None`, and the TIFF
+//! decoder reads it.
+//!
+//! The previews of a TIFF-structured file are listed by the tags TIFF 6.0
+//! and the DNG specification define for them (JPEGInterchangeFormat, strips
+//! of JPEG or of uncompressed RGB, in any directory reached through the
+//! chain, SubIFDs and the Exif pointer). Every file is also searched for
+//! the JPEG streams it embeds anywhere else, which is where the makers keep
+//! theirs (inside makernotes, boxes and sections): a stream counts when its
+//! headers are well formed up to its first scan (see `jpeg.rs`). The sensor
+//! data is never taken for a preview: lossless JPEG (what DNG, CR2 and others
+//! compress it with) is not a stream the decoder reads, and the strips of a
+//! directory that holds colour filter array data are skipped.
+//!
+//! Written from the public specifications: TIFF 6.0 and the DNG
+//! specification (Adobe), Exif 2.32 (CIPA DC-008), ITU-T T.81 (JPEG) and
+//! ISO/IEC 14496-12. What the makers' own containers hold (the signatures,
+//! the compression numbers, where the Exif of a CR3 is) was read off CC0
+//! sample files from raw.pixls.us, with tools of our own, not from another
+//! implementation.
+
+use super::{Channels, DECODE_MAX, Error, Pixels, Samples};
+use crate::image_codecs;
+
+mod bmff;
+mod jpeg;
+mod tiff;
+
+/// Previews tried before giving up on a file.
+const MAX_TRIES: usize = 8;
+
+/// The family of a RAW file, as far as its bytes say.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum Kind {
+    /// Adobe DNG, and files that are DNG under another extension.
+    Dng,
+    /// Canon CR2.
+    Cr2,
+    /// Canon CR3.
+    Cr3,
+    /// Canon CRW (CIFF).
+    Crw,
+    /// Olympus ORF (and ORI).
+    Orf,
+    /// Panasonic RW2, RAW and Leica RWL.
+    Rw2,
+    /// Fujifilm RAF.
+    Raf,
+    /// Sigma X3F.
+    X3f,
+    /// Minolta MRW.
+    Mrw,
+    /// Phase One IIQ.
+    Iiq,
+    /// Any other TIFF/EP RAW file: Nikon NEF and NRW, Sony ARW, SR2 and
+    /// SRF, Pentax PEF, Samsung SRW, Hasselblad 3FR, Kodak, Epson, Mamiya.
+    TiffEp,
+}
+
+impl Kind {
+    /// Lower-case name.
+    pub fn name(self) -> &'static str {
+        match self {
+            Kind::Dng => "dng",
+            Kind::Cr2 => "cr2",
+            Kind::Cr3 => "cr3",
+            Kind::Crw => "crw",
+            Kind::Orf => "orf",
+            Kind::Rw2 => "rw2",
+            Kind::Raf => "raf",
+            Kind::X3f => "x3f",
+            Kind::Mrw => "mrw",
+            Kind::Iiq => "iiq",
+            Kind::TiffEp => "tiff-ep",
+        }
+    }
+}
+
+/// Compressions the makers number for their sensor data (Sony, Epson,
+/// Samsung, Nikon, Adobe's lossy DNG, Kodak, Pentax, Leaf).
+const VENDOR_COMPRESSIONS: [u32; 8] = [99, 32767, 32769, 32772, 34713, 34892, 65000, 65535];
+/// PhotometricInterpretation of colour filter array and linear raw data.
+const CFA: u32 = 32803;
+const LINEAR_RAW: u32 = 34892;
+
+/// Holds sensor data, not a picture.
+fn is_sensor(ifd: &tiff::Ifd) -> bool {
+    ifd.cfa
+        || matches!(ifd.photometric, Some(CFA | LINEAR_RAW))
+        || ifd
+            .compression
+            .is_some_and(|c| VENDOR_COMPRESSIONS.contains(&c))
+}
+
+/// Makers of cameras and scanners, as their Make tag begins.
+const MAKES: [&[u8]; 20] = [
+    b"CANON",
+    b"NIKON",
+    b"SONY",
+    b"OLYMPUS",
+    b"PANASONIC",
+    b"LEICA",
+    b"FUJIFILM",
+    b"PENTAX",
+    b"RICOH",
+    b"SAMSUNG",
+    b"KODAK",
+    b"EASTMAN KODAK",
+    b"EPSON",
+    b"MINOLTA",
+    b"MAMIYA",
+    b"LEAF",
+    b"PHASE ONE",
+    b"HASSELBLAD",
+    b"CASIO",
+    b"SIGMA",
+];
+
+/// How sure [`classify`] is.
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Evidence {
+    /// A signature, or sensor data in the file.
+    Strong,
+    /// A camera maker's name next to the structure of its files (a SubIFD or
+    /// a thumbnail) and nothing else: a TIFF a program saved from a camera's
+    /// could look so.
+    Weak,
+}
+
+/// The family of a RAW file, or `None` for anything else, a plain TIFF
+/// included. A TIFF-structured file is a RAW file when it holds sensor
+/// data (a colour filter array, a maker's compression) or the DNG tags, or
+/// carries a camera maker's name and the SubIFD or JPEG thumbnail such a
+/// maker writes; [`preview`] refuses that last kind when it has no preview,
+/// as [`Error::Unsupported`], so that the TIFF it may be is read as one.
+pub fn detect(data: &[u8]) -> Option<Kind> {
+    classify(data).map(|(kind, _)| kind)
+}
+
+fn classify(data: &[u8]) -> Option<(Kind, Evidence)> {
+    let strong = |k| Some((k, Evidence::Strong));
+    if data.starts_with(b"FUJIFILMCCD-RAW") {
+        return strong(Kind::Raf);
+    }
+    if data.starts_with(b"FOVb") {
+        return strong(Kind::X3f);
+    }
+    if data.starts_with(b"\0MRM") {
+        return strong(Kind::Mrw);
+    }
+    if bmff::is_cr3(data) {
+        return strong(Kind::Cr3);
+    }
+    // CIFF: a byte order, the offset of the heap (26), "HEAPCCDR".
+    if matches!(data.get(..2), Some(b"II")) && data.get(2..6) == Some(&[0x1A, 0, 0, 0][..]) {
+        return if data.get(6..14) == Some(b"HEAPCCDR") {
+            strong(Kind::Crw)
+        } else {
+            None
+        };
+    }
+    let header = tiff::header(data)?;
+    match header.magic {
+        0x4F52 | 0x5352 => return strong(Kind::Orf),
+        0x0055 => return strong(Kind::Rw2),
+        42 => {}
+        _ => return None,
+    }
+    if data.get(8..11) == Some(b"CR\x02") {
+        return strong(Kind::Cr2);
+    }
+    if data.get(8..12) == Some(b"IIII") {
+        return strong(Kind::Iiq);
+    }
+    let scan = tiff::scan(data, header);
+    if scan.ifds.iter().any(|i| i.dng) {
+        return strong(Kind::Dng);
+    }
+    if scan.ifds.iter().any(|i| is_sensor(i) || i.private_data) {
+        return strong(Kind::TiffEp);
+    }
+    let made_by_camera_maker = scan.ifds.first().is_some_and(|i| {
+        let make = i.make.to_ascii_uppercase();
+        MAKES.iter().any(|m| make.starts_with(m))
+    });
+    let camera_structure = scan.ifds.iter().any(|i| i.sub_ifds || i.jpeg.is_some());
+    (made_by_camera_maker && camera_structure).then_some((Kind::TiffEp, Evidence::Weak))
+}
+
+/// Where a preview is.
+#[derive(Clone, Copy, Debug)]
+enum Source {
+    /// A JPEG stream at an offset, of this length.
+    Jpeg { at: usize, len: usize },
+    /// Uncompressed 8-bit samples in the strips of directory `ifd`.
+    Samples { ifd: usize },
+}
+
+#[derive(Clone, Copy, Debug)]
+struct Candidate {
+    source: Source,
+    width: u32,
+    height: u32,
+    /// 1 to 8; 1 when nothing says.
+    orientation: u8,
+}
+
+/// What [`preview`] chose.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct Info {
+    pub kind: Kind,
+    /// The preview's size as stored, before the orientation turns it.
+    pub width: u32,
+    pub height: u32,
+    /// The Exif orientation applied, 1 to 8.
+    pub orientation: u8,
+    /// A JPEG preview, not uncompressed samples.
+    pub jpeg: bool,
+    /// Previews found in the file, whether the budget allows them or not.
+    pub found: usize,
+}
+
+/// The largest preview of a RAW file that fits `max_alloc` (at most
+/// [`DECODE_MAX`]) bytes, as 8-bit pixels with the orientation applied. A
+/// preview is budgeted as the RGBA form a display takes (4 bytes a pixel, 6
+/// when it must be turned). [`Error::Unsupported`] when the bytes are not a
+/// RAW file, [`Error::NoPreview`] when it holds none a decoder reads.
+pub fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    preview(data, max_alloc).map(|(p, _)| p)
+}
+
+/// [`decode`], with what was chosen. A decoder panic is caught and reported
+/// [`Error::Undecodable`].
+pub fn preview(data: &[u8], max_alloc: u64) -> Result<(Pixels, Info), Error> {
+    std::panic::catch_unwind(|| read(data, max_alloc)).unwrap_or(Err(Error::Undecodable))
+}
+
+fn read(data: &[u8], max_alloc: u64) -> Result<(Pixels, Info), Error> {
+    let (kind, evidence) = classify(data).ok_or(Error::Unsupported)?;
+    let limit = max_alloc.min(DECODE_MAX);
+    let tiff = tiff::header(data)
+        .filter(|_| {
+            !matches!(
+                kind,
+                Kind::Crw | Kind::Cr3 | Kind::Raf | Kind::X3f | Kind::Mrw
+            )
+        })
+        .map(|h| tiff::scan(data, h));
+    let mut found = candidates(data, kind, tiff.as_ref());
+    if found.is_empty() && evidence == Evidence::Weak {
+        return Err(Error::Unsupported);
+    }
+    // Largest first; the first listed (the structured ones) among equals.
+    found.sort_by_key(|c| std::cmp::Reverse(u64::from(c.width) * u64::from(c.height)));
+    let (mut too_large, mut tries) = (false, 0);
+    for c in &found {
+        let pixels = u64::from(c.width) * u64::from(c.height);
+        let per_pixel = if c.orientation > 1 { 6 } else { 4 };
+        if pixels.saturating_mul(per_pixel) > limit {
+            too_large = true;
+            continue;
+        }
+        tries += 1;
+        if tries > MAX_TRIES {
+            break;
+        }
+        let Some(decoded) = decode_candidate(data, c, tiff.as_ref(), limit) else {
+            continue;
+        };
+        let info = Info {
+            kind,
+            width: c.width,
+            height: c.height,
+            orientation: c.orientation,
+            jpeg: matches!(c.source, Source::Jpeg { .. }),
+            found: found.len(),
+        };
+        return Ok((orient(decoded, c.orientation), info));
+    }
+    Err(if too_large {
+        if limit < DECODE_MAX {
+            Error::TooLarge
+        } else {
+            Error::Undecodable
+        }
+    } else if found.is_empty() {
+        Error::NoPreview
+    } else {
+        Error::Undecodable
+    })
+}
+
+/// The previews a file holds.
+fn candidates(data: &[u8], kind: Kind, tiff: Option<&tiff::Scan>) -> Vec<Candidate> {
+    let main_orientation = match (kind, tiff) {
+        // The JPEGs of a CR3 hold no Exif of their own.
+        (Kind::Cr3, _) => bmff::orientation(data),
+        (_, Some(scan)) => scan
+            .ifds
+            .first()
+            .and_then(|i| i.orientation)
+            .and_then(|o| u8::try_from(o).ok())
+            .filter(|o| (1..=8).contains(o)),
+        _ => None,
+    }
+    .unwrap_or(1);
+    let mut out: Vec<Candidate> = Vec::new();
+    // Where sensor data is, which a stream found by its start marker inside
+    // must not be taken for.
+    let mut sensor: Vec<(usize, usize)> = Vec::new();
+    if let Some(scan) = tiff {
+        for (n, ifd) in scan.ifds.iter().enumerate() {
+            if is_sensor(ifd) {
+                sensor.extend(
+                    ifd.chunks
+                        .iter()
+                        .filter(|c| c.1 > 0)
+                        .map(|&(at, len)| (at as usize, len as usize)),
+                );
+                continue;
+            }
+            if let Some(c) = ifd_jpeg(data, ifd, main_orientation) {
+                out.push(c);
+            } else if let Some(c) = ifd_samples(data, n, ifd, main_orientation) {
+                out.push(c);
+            }
+        }
+    }
+    for (at, info) in jpeg::find(data) {
+        if out
+            .iter()
+            .any(|c| matches!(c.source, Source::Jpeg { at: a, .. } if a == at))
+            || sensor.iter().any(|&(s, len)| at >= s && at - s < len)
+        {
+            continue;
+        }
+        out.push(Candidate {
+            source: Source::Jpeg { at, len: info.len },
+            width: info.width,
+            height: info.height,
+            orientation: info.orientation.unwrap_or(main_orientation),
+        });
+    }
+    out
+}
+
+/// A directory's JPEG preview: JPEGInterchangeFormat, or one strip of JPEG.
+fn ifd_jpeg(data: &[u8], ifd: &tiff::Ifd, main_orientation: u8) -> Option<Candidate> {
+    let (at, len) = match (ifd.jpeg, ifd.compression, ifd.chunks.as_slice()) {
+        (Some(j), _, _) => j,
+        (None, Some(6 | 7), &[one]) if !ifd.tiled => one,
+        _ => return None,
+    };
+    let at = at as usize;
+    let end = if len == 0 {
+        data.len()
+    } else {
+        at.saturating_add(len as usize).min(data.len())
+    };
+    let info = jpeg::parse(data.get(at..end)?)?;
+    Some(Candidate {
+        source: Source::Jpeg { at, len: info.len },
+        width: info.width,
+        height: info.height,
+        orientation: info.orientation.unwrap_or(main_orientation),
+    })
+}
+
+/// A directory's uncompressed 8-bit grey or RGB preview.
+fn ifd_samples(data: &[u8], n: usize, ifd: &tiff::Ifd, main_orientation: u8) -> Option<Candidate> {
+    let (width, height) = (ifd.width?, ifd.height?);
+    let samples = ifd.samples.unwrap_or(1);
+    let fits = match (ifd.photometric?, samples) {
+        (2, 3) | (1, 1) => {
+            ifd.bits.len() == samples as usize
+                && ifd.bits.iter().all(|&b| b == 8 || b == 16)
+                && ifd.bits.iter().all(|&b| b == ifd.bits[0])
+        }
+        _ => false,
+    };
+    if !fits
+        || ifd.compression.unwrap_or(1) != 1
+        || ifd.planar.unwrap_or(1) != 1
+        || ifd.tiled
+        || ifd.chunks_lost
+        || ifd.chunks.is_empty()
+        || width == 0
+        || height == 0
+    {
+        return None;
+    }
+    // The strips are read when the preview is chosen; here they must be there.
+    strips(data, ifd, sample_bytes(ifd, width, height)?)?;
+    Some(Candidate {
+        source: Source::Samples { ifd: n },
+        width,
+        height,
+        orientation: main_orientation,
+    })
+}
+
+/// Bytes of a `width` by `height` image of a directory's samples.
+fn sample_bytes(ifd: &tiff::Ifd, width: u32, height: u32) -> Option<u64> {
+    let per_sample = u64::from(ifd.bits.first()? / 8);
+    Some(
+        (u64::from(width) * u64::from(height))
+            .saturating_mul(u64::from(ifd.samples.unwrap_or(1)))
+            .saturating_mul(per_sample),
+    )
+}
+
+/// The `need` bytes of a directory's strips, laid end to end, as ranges.
+fn strips(data: &[u8], ifd: &tiff::Ifd, need: u64) -> Option<Vec<std::ops::Range<usize>>> {
+    let mut left = usize::try_from(need).ok()?;
+    let mut ranges = Vec::new();
+    for &(at, len) in &ifd.chunks {
+        if left == 0 {
+            break;
+        }
+        let at = at as usize;
+        // A strip with no stated length is the rest of what is needed.
+        let take = if len == 0 {
+            left
+        } else {
+            (len as usize).min(left)
+        };
+        let end = at.checked_add(take)?;
+        data.get(at..end)?;
+        ranges.push(at..end);
+        left -= take;
+    }
+    (left == 0).then_some(ranges)
+}
+
+fn decode_candidate(
+    data: &[u8],
+    c: &Candidate,
+    tiff: Option<&tiff::Scan>,
+    limit: u64,
+) -> Option<Pixels> {
+    match c.source {
+        Source::Jpeg { at, len } => {
+            let mut limits = image::Limits::default();
+            limits.max_alloc = Some(limit);
+            let slice = data.get(at..at.checked_add(len)?)?;
+            let img = image_codecs::jpeg::JpegDecoder::new(slice)
+                .and_then(|d| image_codecs::decode(d, limits))
+                .ok()?;
+            let p = Pixels::from_dynamic(img);
+            // The SOF the candidate was ranked by is what the decoder reads.
+            (p.width == c.width && p.height == c.height).then_some(p)
+        }
+        Source::Samples { ifd } => {
+            let scan = tiff?;
+            let ifd = scan.ifds.get(ifd)?;
+            let channels = if ifd.samples == Some(3) {
+                Channels::Rgb
+            } else {
+                Channels::Luma
+            };
+            // 16-bit samples are shown by their high byte.
+            let wide = ifd.bits.first() == Some(&16);
+            let total = sample_bytes(ifd, c.width, c.height)?;
+            // The strips hold all of it, so the allocation is no larger than
+            // the data it is read from.
+            let ranges = strips(data, ifd, total)?;
+            let mut out =
+                Vec::with_capacity(usize::try_from(total / if wide { 2 } else { 1 }).ok()?);
+            let mut k = 0usize;
+            for r in ranges {
+                for &b in &data[r] {
+                    if !wide || k.is_multiple_of(2) != scan.le {
+                        out.push(b);
+                    }
+                    k += 1;
+                }
+            }
+            Some(Pixels {
+                width: c.width,
+                height: c.height,
+                channels,
+                samples: Samples::U8(out),
+            })
+        }
+    }
+}
+
+/// `pixels` turned and mirrored as Exif orientation `orientation` says (1 is
+/// as stored; 5 to 8 swap width and height).
+fn orient(pixels: Pixels, orientation: u8) -> Pixels {
+    let Samples::U8(src) = &pixels.samples else {
+        return pixels;
+    };
+    if !(2..=8).contains(&orientation) {
+        return pixels;
+    }
+    let (w, h) = (pixels.width as usize, pixels.height as usize);
+    let n = pixels.channels.count();
+    let (nw, nh) = if orientation >= 5 { (h, w) } else { (w, h) };
+    let mut dst = vec![0u8; src.len()];
+    for y in 0..h {
+        for x in 0..w {
+            let (dx, dy) = match orientation {
+                2 => (w - 1 - x, y),
+                3 => (w - 1 - x, h - 1 - y),
+                4 => (x, h - 1 - y),
+                5 => (y, x),
+                6 => (h - 1 - y, x),
+                7 => (h - 1 - y, w - 1 - x),
+                _ => (y, w - 1 - x),
+            };
+            let from = (y * w + x) * n;
+            let to = (dy * nw + dx) * n;
+            dst[to..to + n].copy_from_slice(&src[from..from + n]);
+        }
+    }
+    Pixels {
+        width: nw as u32,
+        height: nh as u32,
+        channels: pixels.channels,
+        samples: Samples::U8(dst),
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/exav-render/src/formats/image/raw/bmff.rs b/crates/exav-render/src/formats/image/raw/bmff.rs
new file mode 100644
index 00000000..310ec8cc
--- /dev/null
+++ b/crates/exav-render/src/formats/image/raw/bmff.rs
@@ -0,0 +1,92 @@
+//! The boxes of an ISO base media file (ISO/IEC 14496-12), read for what a
+//! Canon CR3 keeps there that its embedded JPEGs lack: the Exif orientation.
+//! It is the TIFF structure in the `CMT1` box of a `uuid` box of `moov`.
+
+use std::cell::Cell;
+
+use super::tiff;
+
+/// Boxes read in one file, at every level together.
+pub(super) const MAX_BOXES: usize = 256;
+/// The shortest `ftyp` box: size, type, major brand and minor version.
+const MIN_FTYP: u32 = 16;
+
+/// An ISO base media file whose major brand is `crx `.
+pub(super) fn is_cr3(data: &[u8]) -> bool {
+    data.get(4..12) == Some(b"ftypcrx ")
+        && data
+            .first_chunk::<4>()
+            .is_some_and(|s| u32::from_be_bytes(*s) >= MIN_FTYP)
+}
+
+/// The orientation (1 to 8) in the first `CMT1` box found in the `uuid`
+/// boxes of `moov`.
+pub(super) fn orientation(data: &[u8]) -> Option<u8> {
+    let budget = Cell::new(MAX_BOXES);
+    let moov = Boxes::new(data, &budget).find(|b| b.kind == *b"moov")?;
+    for uuid in Boxes::new(moov.body, &budget).filter(|b| b.kind == *b"uuid") {
+        // A `uuid` box names its type with 16 bytes before its content.
+        let Some(content) = uuid.body.get(16..) else {
+            continue;
+        };
+        if let Some(cmt1) = Boxes::new(content, &budget).find(|b| b.kind == *b"CMT1") {
+            return tiff::orientation(cmt1.body);
+        }
+    }
+    None
+}
+
+struct Item<'a> {
+    kind: [u8; 4],
+    /// What follows the size, the type and the 64-bit size when there is one.
+    body: &'a [u8],
+}
+
+/// The boxes laid end to end in a slice. It ends at the first box that does
+/// not fit the slice, or when the budget, shared with every other `Boxes`
+/// of a file, is spent.
+struct Boxes<'a> {
+    rest: &'a [u8],
+    budget: &'a Cell<usize>,
+}
+
+impl<'a> Boxes<'a> {
+    fn new(data: &'a [u8], budget: &'a Cell<usize>) -> Self {
+        Boxes { rest: data, budget }
+    }
+
+    fn read(&self) -> Option<(Item<'a>, usize)> {
+        let head = self.rest.get(..8)?;
+        let kind = [head[4], head[5], head[6], head[7]];
+        let (header, size) = match u32::from_be_bytes([head[0], head[1], head[2], head[3]]) {
+            // The box runs to the end of the enclosing one.
+            0 => (8, self.rest.len()),
+            // The size is the 64 bits that follow the type.
+            1 => {
+                let big = u64::from_be_bytes(self.rest.get(8..16)?.try_into().ok()?);
+                (16, usize::try_from(big).ok()?)
+            }
+            n => (8, usize::try_from(n).ok()?),
+        };
+        let body = self.rest.get(header..size)?;
+        Some((Item { kind, body }, size))
+    }
+}
+
+impl<'a> Iterator for Boxes<'a> {
+    type Item = Item<'a>;
+
+    fn next(&mut self) -> Option<Item<'a>> {
+        let step = match self.budget.get().checked_sub(1) {
+            Some(left) => self.read().map(|(item, size)| (item, size, left)),
+            None => None,
+        };
+        let Some((item, size, left)) = step else {
+            self.rest = &[];
+            return None;
+        };
+        self.budget.set(left);
+        self.rest = &self.rest[size..];
+        Some(item)
+    }
+}
diff --git a/crates/exav-render/src/formats/image/raw/jpeg.rs b/crates/exav-render/src/formats/image/raw/jpeg.rs
new file mode 100644
index 00000000..2bc52952
--- /dev/null
+++ b/crates/exav-render/src/formats/image/raw/jpeg.rs
@@ -0,0 +1,151 @@
+//! Finding JPEG streams in a byte range, and what their headers say.
+//!
+//! The walk follows ITU-T T.81 (the JPEG standard): marker segments by their
+//! length until the first scan, then the entropy-coded data until the end of
+//! image marker. Nothing here decodes pixels.
+
+use super::tiff;
+
+/// Marker segments read before the first scan. A real file has a few dozen.
+const MAX_SEGMENTS: usize = 256;
+
+/// Where a stream is searched for with [`find`]: candidates tried and found,
+/// so that a file made of nothing but start markers costs a bounded time.
+const MAX_ATTEMPTS: usize = 512;
+const MAX_FOUND: usize = 64;
+
+/// What the headers of one JPEG stream say.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(super) struct Info {
+    pub width: u32,
+    pub height: u32,
+    pub components: u8,
+    /// Bytes from the start marker to the end of the stream: after the end
+    /// marker, or the end of the data when the stream is cut short.
+    pub len: usize,
+    /// The Exif orientation (1 to 8) of the stream's own APP1 segment.
+    pub orientation: Option<u8>,
+}
+
+fn u16_at(d: &[u8], at: usize) -> Option<usize> {
+    let b = d.get(at..at.checked_add(2)?)?;
+    Some(usize::from(b[0]) << 8 | usize::from(b[1]))
+}
+
+/// The stream that starts at `data[0]`: a start marker, then segments up to a
+/// first scan, with a baseline, extended sequential or progressive frame of 8
+/// bits and one, three or four components, which the decoder reads. Lossless,
+/// hierarchical and arithmetic-coded streams are `None`, as is anything else.
+pub(super) fn parse(data: &[u8]) -> Option<Info> {
+    if !data.starts_with(&[0xFF, 0xD8, 0xFF]) {
+        return None;
+    }
+    let mut at = 2;
+    let (mut width, mut height, mut components) = (0usize, 0usize, 0u8);
+    let mut orientation = None;
+    for _ in 0..MAX_SEGMENTS {
+        // Fill bytes may come before a marker.
+        while *data.get(at)? == 0xFF && *data.get(at + 1)? == 0xFF {
+            at += 1;
+        }
+        if *data.get(at)? != 0xFF {
+            return None;
+        }
+        let marker = *data.get(at + 1)?;
+        let len = u16_at(data, at + 2)?;
+        match marker {
+            // Standalone markers, a second start marker, or an end of image
+            // before any scan.
+            0x00 | 0x01 | 0xD0..=0xD9 => return None,
+            // Lossless, differential and arithmetic frames.
+            0xC3 | 0xC5..=0xC7 | 0xC9..=0xCB | 0xCD..=0xCF => return None,
+            _ => {}
+        }
+        if len < 2 {
+            return None;
+        }
+        let body = data.get(at + 4..at.checked_add(2 + len)?)?;
+        match marker {
+            0xC0..=0xC2 => {
+                if width != 0 || body.len() < 6 || body[0] != 8 {
+                    return None;
+                }
+                height = usize::from(body[1]) << 8 | usize::from(body[2]);
+                width = usize::from(body[3]) << 8 | usize::from(body[4]);
+                components = body[5];
+                if width == 0
+                    || height == 0
+                    || !matches!(components, 1 | 3 | 4)
+                    || body.len() != 6 + 3 * usize::from(components)
+                {
+                    return None;
+                }
+            }
+            0xE1 if orientation.is_none() => {
+                orientation = body.strip_prefix(b"Exif\0\0").and_then(tiff::orientation);
+            }
+            0xDA => {
+                if width == 0 {
+                    return None;
+                }
+                return Some(Info {
+                    width: width as u32,
+                    height: height as u32,
+                    components,
+                    len: entropy_end(data, at + 2 + len),
+                    orientation,
+                });
+            }
+            _ => {}
+        }
+        at += 2 + len;
+    }
+    None
+}
+
+/// The end of the stream whose entropy-coded data starts at `at`: past the
+/// end of image marker, or the end of the data. Markers between scans (a
+/// progressive stream's) are skipped by their length.
+fn entropy_end(data: &[u8], mut at: usize) -> usize {
+    while let Some(i) = data[at.min(data.len())..].iter().position(|&b| b == 0xFF) {
+        let ff = at + i;
+        match data.get(ff + 1) {
+            None => return data.len(),
+            Some(0xD9) => return ff + 2,
+            // A stuffed byte, a restart marker, or a fill byte.
+            Some(0x00 | 0xD0..=0xD7 | 0xFF) => at = ff + 1,
+            Some(_) => match u16_at(data, ff + 2) {
+                Some(len) if len >= 2 && ff + 2 + len <= data.len() => at = ff + 2 + len,
+                _ => return data.len(),
+            },
+        }
+    }
+    data.len()
+}
+
+/// The streams in `data`, by their start markers, in file order, with their
+/// offsets. A stream found is not searched again inside. A file that holds
+/// more start markers than the limits allow is read as far as they reach.
+pub(super) fn find(data: &[u8]) -> Vec<(usize, Info)> {
+    let mut found = Vec::new();
+    let (mut at, mut attempts) = (0, 0);
+    while let Some(i) = data[at..].iter().position(|&b| b == 0xFF) {
+        let start = at + i;
+        at = start + 1;
+        if data.get(start + 1..start + 3) != Some(&[0xD8, 0xFF]) {
+            continue;
+        }
+        attempts += 1;
+        if attempts > MAX_ATTEMPTS {
+            break;
+        }
+        if let Some(info) = parse(&data[start..]) {
+            at = start + info.len;
+            found.push((start, info));
+            if found.len() == MAX_FOUND {
+                break;
+            }
+        }
+    }
+    found
+}
diff --git a/crates/exav-render/src/formats/image/raw/tests.rs b/crates/exav-render/src/formats/image/raw/tests.rs
new file mode 100644
index 00000000..0f390a74
--- /dev/null
+++ b/crates/exav-render/src/formats/image/raw/tests.rs
@@ -0,0 +1,777 @@
+use super::*;
+
+/// A JPEG stream's headers: SOI, a frame of `sof` marker, a scan, `scan`
+/// entropy bytes, EOI.
+fn stream(sof: u8, precision: u8, w: u16, h: u16, components: u8, scan: &[u8]) -> Vec<u8> {
+    let mut d = vec![0xFF, 0xD8, 0xFF, sof];
+    d.extend_from_slice(&(8 + 3 * u16::from(components)).to_be_bytes());
+    d.push(precision);
+    d.extend_from_slice(&h.to_be_bytes());
+    d.extend_from_slice(&w.to_be_bytes());
+    d.push(components);
+    for c in 0..components {
+        d.extend_from_slice(&[c + 1, 0x11, 0]);
+    }
+    d.extend_from_slice(&[0xFF, 0xDA, 0x00, 0x08, 1, 1, 0, 0, 0, 0]);
+    d.extend_from_slice(scan);
+    d.extend_from_slice(&[0xFF, 0xD9]);
+    d
+}
+
+fn baseline(w: u16, h: u16) -> Vec<u8> {
+    stream(0xC0, 8, w, h, 3, &[1, 2, 3])
+}
+
+#[test]
+fn a_jpeg_stream_gives_its_frame_and_its_end() {
+    let mut d = baseline(640, 480);
+    let len = d.len();
+    d.extend_from_slice(&[9, 9, 9]);
+    let info = jpeg::parse(&d).unwrap();
+    assert_eq!(
+        info,
+        jpeg::Info {
+            width: 640,
+            height: 480,
+            components: 3,
+            len,
+            orientation: None
+        }
+    );
+}
+
+#[test]
+fn what_the_decoder_does_not_read_is_not_a_stream() {
+    // Lossless, hierarchical, arithmetic: other frame types than 0 to 2.
+    for sof in [0xC3, 0xC5, 0xC6, 0xC7, 0xC9, 0xCA, 0xCB, 0xCD, 0xCF] {
+        assert_eq!(
+            jpeg::parse(&stream(sof, 8, 8, 8, 3, &[])),
+            None,
+            "SOF {sof:#x}"
+        );
+    }
+    // 12-bit samples, an empty frame, two components, a frame that lies about
+    // its components.
+    assert_eq!(jpeg::parse(&stream(0xC0, 12, 8, 8, 3, &[])), None);
+    assert_eq!(jpeg::parse(&stream(0xC0, 8, 0, 8, 3, &[])), None);
+    assert_eq!(jpeg::parse(&stream(0xC0, 8, 8, 0, 3, &[])), None);
+    assert_eq!(jpeg::parse(&stream(0xC0, 8, 8, 8, 2, &[])), None);
+    let mut d = baseline(8, 8);
+    // SOI, marker, length, precision, height, width, then the count.
+    d[11] = 4;
+    assert_eq!(jpeg::parse(&d), None);
+    // A scan before any frame, and a second start marker or an end marker
+    // before the scan.
+    let scan_first = [
+        0xFF, 0xD8, 0xFF, 0xDA, 0, 8, 1, 1, 0, 0, 0, 0, 1, 2, 0xFF, 0xD9,
+    ];
+    assert_eq!(jpeg::parse(&scan_first), None);
+    assert_eq!(jpeg::parse(&[0xFF, 0xD8, 0xFF, 0xD8, 0xFF, 0xD9]), None);
+    assert_eq!(jpeg::parse(&[0xFF, 0xD8, 0xFF, 0xD9]), None);
+    // Not even a start marker, or one with nothing after it.
+    assert_eq!(jpeg::parse(&[0xFF, 0xD8]), None);
+    assert_eq!(jpeg::parse(b""), None);
+}
+
+#[test]
+fn a_segment_longer_than_the_data_is_not_a_stream() {
+    let d = baseline(8, 8);
+    // Up to the end of the scan header (past it the stream is cut short, not
+    // refused).
+    let header = d.array_windows().position(|w| *w == [0xFF, 0xDA]).unwrap() + 2 + 8;
+    for cut in 0..header {
+        assert_eq!(jpeg::parse(&d[..cut]), None, "cut at {cut}");
+    }
+    assert_eq!(jpeg::parse(&d[..header]).unwrap().len, header);
+    // A comment segment that claims more than there is.
+    let mut d = vec![0xFF, 0xD8, 0xFF, 0xFE, 0xFF, 0xFF, 1, 2, 3];
+    assert_eq!(jpeg::parse(&d), None);
+    // A segment length under two.
+    d = vec![0xFF, 0xD8, 0xFF, 0xFE, 0x00, 0x01, 0xFF, 0xDA];
+    assert_eq!(jpeg::parse(&d), None);
+}
+
+#[test]
+fn fill_bytes_before_a_marker_are_skipped() {
+    let mut d = baseline(8, 8);
+    d.splice(2..2, [0xFF, 0xFF, 0xFF]);
+    assert_eq!(jpeg::parse(&d).unwrap().width, 8);
+}
+
+#[test]
+fn the_end_marker_is_not_taken_from_stuffed_bytes_or_restarts() {
+    // 0xFF 0x00 is a data byte, 0xFF 0xD0 to 0xD7 a restart: neither ends it.
+    let d = stream(
+        0xC0,
+        8,
+        8,
+        8,
+        3,
+        &[0xFF, 0x00, 0xFF, 0xD3, 0x12, 0xFF, 0x00],
+    );
+    let info = jpeg::parse(&d).unwrap();
+    assert_eq!(info.len, d.len());
+    // A stream with no end marker runs to the end of the data.
+    let mut cut = d.clone();
+    cut.truncate(cut.len() - 2);
+    assert_eq!(jpeg::parse(&cut).unwrap().len, cut.len());
+    // A progressive stream's markers between scans are skipped by length: the
+    // table marker holds an end-of-image look-alike that is not one.
+    let mut p = stream(0xC2, 8, 8, 8, 3, &[1]);
+    let at = p.len() - 2;
+    p.splice(
+        at..at,
+        [
+            0xFF, 0xC4, 0x00, 0x06, 0xFF, 0xD9, 1, 2, 0xFF, 0xDA, 0, 8, 1, 1, 0, 0, 0, 0, 7,
+        ],
+    );
+    assert_eq!(jpeg::parse(&p).unwrap().len, p.len());
+}
+
+#[test]
+fn the_start_markers_in_a_file_are_found_in_order_and_not_inside_each_other() {
+    let a = baseline(10, 20);
+    let b = baseline(30, 40);
+    let lossless = stream(0xC3, 8, 99, 99, 1, &[5, 5]);
+    let mut d = vec![0u8; 5];
+    d.extend_from_slice(&a);
+    d.extend_from_slice(&[0xFF, 0xD8, 0xFF, 7, 7]);
+    d.extend_from_slice(&lossless);
+    d.extend_from_slice(&b);
+    let found = jpeg::find(&d);
+    let got: Vec<(usize, u32, u32)> = found
+        .iter()
+        .map(|(at, i)| (*at, i.width, i.height))
+        .collect();
+    let b_at = 5 + a.len() + 5 + lossless.len();
+    assert_eq!(got, vec![(5, 10, 20), (b_at, 30, 40)]);
+    // A stream inside a comment segment (a thumbnail in an APP1 segment is
+    // found by itself, but the outer stream is walked past it, once).
+    let inner = baseline(4, 4);
+    let mut outer = vec![0xFF, 0xD8, 0xFF, 0xE1];
+    outer.extend_from_slice(&((inner.len() + 2) as u16).to_be_bytes());
+    outer.extend_from_slice(&inner);
+    outer.extend_from_slice(&baseline(50, 50)[2..]);
+    let found = jpeg::find(&outer);
+    assert_eq!(found.len(), 1);
+    assert_eq!((found[0].0, found[0].1.width), (0, 50));
+}
+
+#[test]
+fn the_orientation_of_a_streams_exif_is_read() {
+    // APP1: "Exif", a little-endian TIFF with one SHORT entry, tag 0x112.
+    let mut exif = b"Exif\0\0II*\0\x08\0\0\0\x01\0\x12\x01\x03\0\x01\0\0\0".to_vec();
+    exif.extend_from_slice(&[6, 0, 0, 0, 0, 0, 0, 0]);
+    let mut d = vec![0xFF, 0xD8, 0xFF, 0xE1];
+    d.extend_from_slice(&((exif.len() + 2) as u16).to_be_bytes());
+    d.extend_from_slice(&exif);
+    d.extend_from_slice(&baseline(8, 8)[2..]);
+    assert_eq!(jpeg::parse(&d).unwrap().orientation, Some(6));
+    // A value outside 1 to 8 is none.
+    let at = d.array_windows().position(|w| *w == [6, 0]).unwrap();
+    d[at] = 9;
+    assert_eq!(jpeg::parse(&d).unwrap().orientation, None);
+    // A segment that is not Exif says nothing.
+    let mut other = d.clone();
+    other[6] = b'X';
+    d[at] = 6;
+    other[at] = 6;
+    assert_eq!(jpeg::parse(&other).unwrap().orientation, None);
+}
+
+#[test]
+fn the_first_exif_segment_gives_the_orientation() {
+    let app1 = |o: u8| {
+        let mut exif = b"Exif\0\0II*\0\x08\0\0\0\x01\0\x12\x01\x03\0\x01\0\0\0".to_vec();
+        exif.extend_from_slice(&[o, 0, 0, 0, 0, 0, 0, 0]);
+        let mut seg = vec![0xFF, 0xE1];
+        seg.extend_from_slice(&((exif.len() + 2) as u16).to_be_bytes());
+        seg.extend_from_slice(&exif);
+        seg
+    };
+    // An XMP segment first says nothing; of two Exif segments, the first wins.
+    let mut d = vec![
+        0xFF, 0xD8, 0xFF, 0xE1, 0x00, 0x08, b'h', b't', b't', b'p', 0, 0,
+    ];
+    d.extend_from_slice(&app1(6));
+    d.extend_from_slice(&app1(3));
+    d.extend_from_slice(&baseline(8, 8)[2..]);
+    assert_eq!(jpeg::parse(&d).unwrap().orientation, Some(6));
+}
+
+#[test]
+fn a_tiffs_orientation_needs_its_magic_and_a_value_from_1_to_8() {
+    let tiff = |magic: u16, value: u16| {
+        let mut d = b"II".to_vec();
+        d.extend_from_slice(&magic.to_le_bytes());
+        d.extend_from_slice(&[8, 0, 0, 0, 1, 0, 0x12, 1, 3, 0, 1, 0, 0, 0]);
+        d.extend_from_slice(&value.to_le_bytes());
+        d.extend_from_slice(&[0, 0, 0, 0, 0, 0]);
+        d
+    };
+    assert_eq!(tiff::orientation(&tiff(42, 8)), Some(8));
+    assert_eq!(tiff::orientation(&tiff(42, 0)), None);
+    assert_eq!(tiff::orientation(&tiff(42, 9)), None);
+    assert_eq!(tiff::orientation(&tiff(43, 8)), None);
+    assert_eq!(tiff::orientation(b"II*\0"), None);
+}
+
+#[test]
+fn a_directory_is_read_once_and_the_total_is_capped() {
+    // Each of 200 directories points at the next, and at itself.
+    let mut d = b"II*\0\x08\0\0\0".to_vec();
+    for k in 0..200u32 {
+        let at = 8 + k * 18;
+        d.extend_from_slice(&1u16.to_le_bytes());
+        // One entry: SubIFDs (LONG, 1) pointing at this directory.
+        d.extend_from_slice(&0x14Au16.to_le_bytes());
+        d.extend_from_slice(&4u16.to_le_bytes());
+        d.extend_from_slice(&1u32.to_le_bytes());
+        d.extend_from_slice(&at.to_le_bytes());
+        d.extend_from_slice(&(at + 18).to_le_bytes());
+    }
+    let scan = tiff::scan(&d, tiff::header(&d).unwrap());
+    assert_eq!(scan.ifds.len(), 64);
+}
+
+#[test]
+fn nesting_of_sub_directories_is_capped() {
+    // A chain where each directory's only link is a SubIFD to the next.
+    let mut d = b"II*\0\x08\0\0\0".to_vec();
+    for k in 0..20u32 {
+        let at = 8 + k * 18;
+        d.extend_from_slice(&1u16.to_le_bytes());
+        d.extend_from_slice(&0x14Au16.to_le_bytes());
+        d.extend_from_slice(&4u16.to_le_bytes());
+        d.extend_from_slice(&1u32.to_le_bytes());
+        d.extend_from_slice(&(at + 18).to_le_bytes());
+        d.extend_from_slice(&0u32.to_le_bytes());
+    }
+    let scan = tiff::scan(&d, tiff::header(&d).unwrap());
+    // The first directory and three levels under it.
+    assert_eq!(scan.ifds.len(), 4);
+}
+
+/// A 3 by 2 picture, a pixel per number, as 2-channel pixels.
+fn picture() -> Pixels {
+    Pixels {
+        width: 3,
+        height: 2,
+        channels: Channels::LumaAlpha,
+        samples: Samples::U8(vec![1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16]),
+    }
+}
+
+fn luma(p: &Pixels) -> Vec<u8> {
+    let Samples::U8(v) = &p.samples else {
+        panic!("8-bit")
+    };
+    v.chunks(2).map(|c| c[0]).collect()
+}
+
+/// Exif's eight orientations of
+///
+///     1 2 3
+///     4 5 6
+///
+/// written out by hand.
+#[test]
+fn orientation_turns_pixels_as_exif_defines_it() {
+    let cases: [(u8, (u32, u32), [u8; 6]); 8] = [
+        (1, (3, 2), [1, 2, 3, 4, 5, 6]),
+        (2, (3, 2), [3, 2, 1, 6, 5, 4]),
+        (3, (3, 2), [6, 5, 4, 3, 2, 1]),
+        (4, (3, 2), [4, 5, 6, 1, 2, 3]),
+        (5, (2, 3), [1, 4, 2, 5, 3, 6]),
+        (6, (2, 3), [4, 1, 5, 2, 6, 3]),
+        (7, (2, 3), [6, 3, 5, 2, 4, 1]),
+        (8, (2, 3), [3, 6, 2, 5, 1, 4]),
+    ];
+    for (o, size, want) in cases {
+        let p = orient(picture(), o);
+        assert_eq!((p.width, p.height), size, "orientation {o}");
+        assert_eq!(luma(&p), want, "orientation {o}");
+        // The second channel travels with its pixel.
+        let Samples::U8(v) = &p.samples else { panic!() };
+        assert!(v.chunks(2).all(|c| c[1] == c[0] + 10), "orientation {o}");
+    }
+}
+
+#[test]
+fn orientation_leaves_other_values_and_other_depths_alone() {
+    for o in [0, 9, 200] {
+        assert_eq!(orient(picture(), o), picture());
+    }
+    let wide = Pixels {
+        width: 2,
+        height: 1,
+        channels: Channels::Luma,
+        samples: Samples::U16(vec![1, 2]),
+    };
+    assert_eq!(orient(wide.clone(), 3), wide);
+}
+
+/// One 64 by 48 JPEG of the fixtures (tests/fixtures/raw/make.py).
+fn good_jpeg() -> Vec<u8> {
+    let raf: &[u8] = include_bytes!("../../../../tests/fixtures/raw/fujifilm-o1.raf");
+    let at = 160;
+    let info = jpeg::parse(&raf[at..]).unwrap();
+    raf[at..at + info.len].to_vec()
+}
+
+/// A Fujifilm-signed file of `broken` larger streams that parse and do not
+/// decode (no tables), then a good smaller one.
+fn file_with_broken_streams(broken: usize) -> Vec<u8> {
+    let mut d = b"FUJIFILMCCD-RAW ".to_vec();
+    for _ in 0..broken {
+        d.extend_from_slice(&stream(0xC0, 8, 100, 100, 3, &[1, 2, 3, 4]));
+        d.extend_from_slice(&[0; 8]);
+    }
+    d.extend_from_slice(&good_jpeg());
+    d
+}
+
+#[test]
+fn a_few_previews_are_tried_before_giving_up() {
+    // Seven that fail, then the good one: the eighth try.
+    let (p, info) = preview(&file_with_broken_streams(MAX_TRIES - 1), DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height, info.found), (64, 48, MAX_TRIES));
+    // The ninth is not tried.
+    assert_eq!(
+        preview(&file_with_broken_streams(MAX_TRIES), DECODE_MAX).err(),
+        Some(Error::Undecodable)
+    );
+}
+
+/// A preview over the budget is not a try: the ones under it still are.
+#[test]
+fn previews_over_the_budget_do_not_count_as_tries() {
+    let (p, _) = preview(&file_with_broken_streams(MAX_TRIES + 3), 64 * 48 * 4).unwrap();
+    assert_eq!((p.width, p.height), (64, 48));
+}
+
+/// A little-endian TIFF of one directory of `entries` (tag, type, count,
+/// value), all inline, whose next directory is `next`.
+fn one_directory(entries: &[(u16, u16, u32, u32)], next: u32) -> Vec<u8> {
+    let mut d = b"II*\0\x08\0\0\0".to_vec();
+    d.extend_from_slice(&(entries.len() as u16).to_le_bytes());
+    for &(tag, typ, count, value) in entries {
+        d.extend_from_slice(&tag.to_le_bytes());
+        d.extend_from_slice(&typ.to_le_bytes());
+        d.extend_from_slice(&count.to_le_bytes());
+        d.extend_from_slice(&value.to_le_bytes());
+    }
+    d.extend_from_slice(&next.to_le_bytes());
+    d
+}
+
+fn scan(d: &[u8]) -> tiff::Scan {
+    tiff::scan(d, tiff::header(d).unwrap())
+}
+
+#[test]
+fn a_directory_that_points_at_itself_is_one_directory() {
+    // SubIFDs and the next directory both name the directory itself.
+    let d = one_directory(&[(0x14A, 4, 1, 8)], 8);
+    assert_eq!(scan(&d).ifds.len(), 1);
+    // The Exif pointer too.
+    let d = one_directory(&[(0x8769, 4, 1, 8)], 0);
+    assert_eq!(scan(&d).ifds.len(), 1);
+}
+
+#[test]
+fn a_directory_of_more_entries_than_the_cap_is_not_read() {
+    let entry = (0x9999, 3, 1, 0);
+    assert_eq!(scan(&one_directory(&[entry; 1024], 0)).ifds.len(), 1);
+    assert_eq!(scan(&one_directory(&[entry; 1025], 0)).ifds.len(), 0);
+}
+
+#[test]
+fn a_sub_ifd_tag_of_too_many_pointers_is_not_followed() {
+    // `n` pointers, out of line after the directory, each to an empty
+    // directory of its own.
+    let build = |n: u32| {
+        let list = 8 + 2 + 12 + 4;
+        let mut d = one_directory(&[(0x14A, 4, n, list)], 0);
+        for k in 0..n {
+            d.extend_from_slice(&(list + 4 * n + 6 * k).to_le_bytes());
+        }
+        for _ in 0..n {
+            d.extend_from_slice(&[0; 6]);
+        }
+        d
+    };
+    assert_eq!(scan(&build(16)).ifds.len(), 17);
+    assert_eq!(scan(&build(17)).ifds.len(), 1);
+}
+
+#[test]
+fn a_list_of_strips_over_the_cap_is_lost_and_one_at_it_is_kept() {
+    // StripOffsets and StripByteCounts of `n` LONGs each, out of line after the
+    // directory.
+    let build = |n: u32| {
+        let first = 8 + 2 + 2 * 12 + 4;
+        let mut d = one_directory(
+            &[
+                (0x111, 4, n, first as u32),
+                (0x117, 4, n, first as u32 + 4 * n),
+            ],
+            0,
+        );
+        d.extend(std::iter::repeat_n(7u8, 8 * n as usize));
+        d
+    };
+    let at_cap = scan(&build(1 << 16));
+    assert!(!at_cap.ifds[0].chunks_lost);
+    assert_eq!(at_cap.ifds[0].chunks.len(), 1 << 16);
+    let over = scan(&build((1 << 16) + 1));
+    assert!(over.ifds[0].chunks_lost);
+    assert!(over.ifds[0].chunks.is_empty());
+}
+
+#[test]
+fn only_so_many_streams_are_kept() {
+    let mut d = Vec::new();
+    for _ in 0..70 {
+        d.extend_from_slice(&baseline(8, 8));
+    }
+    assert_eq!(jpeg::find(&d).len(), 64);
+}
+
+#[test]
+fn a_header_of_too_many_segments_is_not_read() {
+    let with_comments = |n: usize| {
+        let mut d = vec![0xFF, 0xD8];
+        for _ in 0..n {
+            d.extend_from_slice(&[0xFF, 0xFE, 0, 2]);
+        }
+        d.extend_from_slice(&baseline(8, 8)[2..]);
+        d
+    };
+    // The frame and the scan are two of the 256 segments.
+    assert!(jpeg::parse(&with_comments(254)).is_some());
+    assert!(jpeg::parse(&with_comments(255)).is_none());
+}
+
+/// A 2 by 1 uncompressed RGB DNG whose one strip has, or lacks, its byte count.
+fn rgb_dng(with_count: bool) -> Vec<u8> {
+    rgb_dng_edited(with_count, |_| {})
+}
+
+/// [`rgb_dng`] with its entries changed by `edit` before they are written.
+fn rgb_dng_edited(with_count: bool, edit: impl Fn(&mut [(u16, u16, u32, u32)])) -> Vec<u8> {
+    let n: u16 = if with_count { 9 } else { 8 };
+    let bits_at = 8 + 2 + u32::from(n) * 12 + 4;
+    let data_at = bits_at + 6;
+    let mut entries: Vec<(u16, u16, u32, u32)> = vec![
+        (0x100, 4, 1, 2),
+        (0x101, 4, 1, 1),
+        (0x102, 3, 3, bits_at),
+        (0x103, 3, 1, 1),
+        (0x106, 3, 1, 2),
+        (0x111, 4, 1, data_at),
+        (0x115, 3, 1, 3),
+        (0xC612, 1, 4, 0x0000_0401),
+    ];
+    if with_count {
+        entries.push((0x117, 4, 1, 6));
+    }
+    edit(&mut entries);
+    let mut d = one_directory(&entries, 0);
+    d.extend_from_slice(&[8, 0, 8, 0, 8, 0]);
+    d.extend_from_slice(&[10, 20, 30, 40, 50, 60]);
+    d
+}
+
+/// The conditions an uncompressed preview is read under: each, left out, gives
+/// the picture; broken, there is none.
+#[test]
+fn an_uncompressed_preview_is_read_only_as_chunky_untiled_uncompressed_strips() {
+    assert!(preview(&rgb_dng(true), DECODE_MAX).is_ok());
+    let none = |d: Vec<u8>, what: &str| {
+        assert_eq!(
+            preview(&d, DECODE_MAX).err(),
+            Some(Error::NoPreview),
+            "{what}"
+        );
+    };
+    // Tiles, not strips.
+    none(
+        rgb_dng_edited(true, |e| {
+            for x in e.iter_mut() {
+                match x.0 {
+                    0x111 => x.0 = 0x144,
+                    0x117 => x.0 = 0x145,
+                    _ => {}
+                }
+            }
+        }),
+        "tiled",
+    );
+    // A byte count of a type that is not read: the strip is not trusted.
+    none(
+        rgb_dng_edited(true, |e| {
+            for x in e.iter_mut().filter(|x| x.0 == 0x117) {
+                x.1 = 5;
+            }
+        }),
+        "byte count of a rational",
+    );
+    // LZW, not bytes.
+    none(
+        rgb_dng_edited(true, |e| {
+            for x in e.iter_mut().filter(|x| x.0 == 0x103) {
+                x.3 = 5;
+            }
+        }),
+        "compressed",
+    );
+}
+
+#[test]
+fn a_single_strip_may_leave_out_its_byte_count() {
+    for with_count in [true, false] {
+        let (p, info) = preview(&rgb_dng(with_count), DECODE_MAX).unwrap();
+        assert_eq!(
+            (p.width, p.height, info.jpeg),
+            (2, 1, false),
+            "{with_count}"
+        );
+        assert_eq!(p.samples, Samples::U8(vec![10, 20, 30, 40, 50, 60]));
+    }
+}
+
+/// The boxes of an ISO base media file: `size`, `kind`, `body`.
+fn bmff_box(kind: &[u8; 4], body: &[u8]) -> Vec<u8> {
+    let mut d = ((8 + body.len()) as u32).to_be_bytes().to_vec();
+    d.extend_from_slice(kind);
+    d.extend_from_slice(body);
+    d
+}
+
+fn orientation_tiff(o: u16) -> Vec<u8> {
+    one_directory(&[(0x112, 3, 1, u32::from(o))], 0)
+}
+
+/// A `uuid` box: 16 bytes naming its type, then `children`.
+fn bmff_uuid(children: &[u8]) -> Vec<u8> {
+    let mut body = vec![0xAB; 16];
+    body.extend_from_slice(children);
+    bmff_box(b"uuid", &body)
+}
+
+/// A box laid out as a CR3 lays out its Exif: moov > uuid > CMT1.
+fn cr3_moov(orientation: u16) -> Vec<u8> {
+    let cmt1 = bmff_box(b"CMT1", &orientation_tiff(orientation));
+    bmff_box(b"moov", &bmff_uuid(&cmt1))
+}
+
+#[test]
+fn an_orientation_is_the_cmt1_box_of_a_uuid_box_of_moov() {
+    assert_eq!(bmff::orientation(&cr3_moov(6)), Some(6));
+    // After the boxes that come first in a file, and before the ones that
+    // follow it.
+    let mut d = bmff_box(b"ftyp", b"crx \0\0\0\x01");
+    d.extend_from_slice(&bmff_box(b"free", &[0; 9]));
+    d.extend_from_slice(&bmff_uuid(&bmff_box(b"CMT1", &orientation_tiff(3))));
+    d.extend_from_slice(&cr3_moov(8));
+    d.extend_from_slice(&bmff_box(b"mdat", &[0; 20]));
+    assert_eq!(bmff::orientation(&d), Some(8));
+    // The other boxes of `moov` and of the `uuid` box are passed over.
+    let cmt1 = bmff_box(b"CMT1", &orientation_tiff(5));
+    let mut inner = bmff_box(b"CNCV", b"Canon");
+    inner.extend_from_slice(&bmff_box(b"CMT0", &orientation_tiff(2)));
+    inner.extend_from_slice(&cmt1);
+    let mut moov = bmff_box(b"trak", &bmff_box(b"CMT1", &orientation_tiff(2)));
+    moov.extend_from_slice(&bmff_uuid(&inner));
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &moov)), Some(5));
+}
+
+#[test]
+fn an_orientation_is_nowhere_else() {
+    let tiff = orientation_tiff(6);
+    let cmt1 = bmff_box(b"CMT1", &tiff);
+    // At the top, a TIFF box that is not in a `uuid` box of `moov`.
+    assert_eq!(bmff::orientation(&cmt1), None);
+    assert_eq!(bmff::orientation(&bmff_uuid(&cmt1)), None);
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &cmt1)), None);
+    // In a box of `moov` that is not a `uuid` box.
+    let other = bmff_box(b"trak", &cmt1);
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &other)), None);
+    let other = bmff_box(b"trak", &bmff_uuid(&cmt1));
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &other)), None);
+    // Not either with 16 bytes before the boxes, as a `uuid` box has.
+    let other = bmff_box(b"trak", &[&[0xAB; 16][..], &cmt1].concat());
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &other)), None);
+    // A `moov` box inside another box is not looked for.
+    assert_eq!(bmff::orientation(&bmff_box(b"free", &cr3_moov(6))), None);
+    // Another `uuid` box in between is one level too many.
+    let deeper = bmff_box(b"moov", &bmff_uuid(&bmff_uuid(&cmt1)));
+    assert_eq!(bmff::orientation(&deeper), None);
+    // A TIFF box of another name.
+    let moov = |b: &[u8]| bmff_box(b"moov", &bmff_uuid(b));
+    assert_eq!(bmff::orientation(&moov(&bmff_box(b"CMT2", &tiff))), None);
+    // A CMT1 box that holds no orientation, one out of range, or no TIFF.
+    let plain = bmff_box(b"CMT1", &one_directory(&[(0x10F, 3, 1, 1)], 0));
+    assert_eq!(bmff::orientation(&moov(&plain)), None);
+    assert_eq!(bmff::orientation(&cr3_moov(9)), None);
+    assert_eq!(bmff::orientation(&moov(&bmff_box(b"CMT1", b"II*\0"))), None);
+}
+
+#[test]
+fn the_first_cmt1_box_found_is_the_one() {
+    let with = |o| bmff_uuid(&bmff_box(b"CMT1", &orientation_tiff(o)));
+    // A `uuid` box with no CMT1 box, and one too short to hold its type, are
+    // passed over; a second CMT1 is not read.
+    let mut moov = bmff_uuid(&bmff_box(b"free", &[]));
+    moov.extend_from_slice(&bmff_box(b"uuid", &[0xAB; 15]));
+    moov.extend_from_slice(&with(7));
+    moov.extend_from_slice(&with(2));
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &moov)), Some(7));
+    // Even if the first has none.
+    let mut moov = with(0);
+    moov.extend_from_slice(&with(2));
+    assert_eq!(bmff::orientation(&bmff_box(b"moov", &moov)), None);
+    // The first `moov` is the one.
+    let mut d = bmff_box(b"moov", &[]);
+    d.extend_from_slice(&cr3_moov(4));
+    assert_eq!(bmff::orientation(&d), None);
+}
+
+#[test]
+fn a_boxs_size_may_be_64_bits_or_run_to_the_end_but_never_past_it() {
+    let tiff = orientation_tiff(3);
+    let wrap = |cmt1: &[u8]| bmff_box(b"moov", &bmff_uuid(cmt1));
+    // A CMT1 box with the size field given, whatever it is.
+    let cmt1 = |size: u32, extra: &[u8]| {
+        let mut b = size.to_be_bytes().to_vec();
+        b.extend_from_slice(b"CMT1");
+        b.extend_from_slice(extra);
+        b.extend_from_slice(&tiff);
+        b
+    };
+    // Size 1: a 64-bit size follows the type.
+    let big = cmt1(1, &(16 + tiff.len() as u64).to_be_bytes());
+    assert_eq!(bmff::orientation(&wrap(&big)), Some(3));
+    // Size 0: to the end of the enclosing box.
+    assert_eq!(bmff::orientation(&wrap(&cmt1(0, &[]))), Some(3));
+    // A size past the end of the enclosing box, or under the header's own.
+    let past = cmt1(8 + tiff.len() as u32 + 1, &[]);
+    assert_eq!(bmff::orientation(&wrap(&past)), None);
+    for size in [2, 7] {
+        assert_eq!(bmff::orientation(&wrap(&cmt1(size, &[]))), None, "{size}");
+    }
+    // A 64-bit size under its header's, past the end, or not all there.
+    for size in [0u64, 15, 16 + tiff.len() as u64 + 1, u64::MAX] {
+        let b = cmt1(1, &size.to_be_bytes());
+        assert_eq!(bmff::orientation(&wrap(&b)), None, "{size}");
+    }
+    let mut cut = cmt1(1, &[]);
+    cut.truncate(12);
+    assert_eq!(bmff::orientation(&wrap(&cut)), None);
+    // The same sizes on the `moov` box itself.
+    let moov = cr3_moov(6);
+    let mut open = 0u32.to_be_bytes().to_vec();
+    open.extend_from_slice(&moov[4..]);
+    assert_eq!(bmff::orientation(&open), Some(6));
+    let mut big = 1u32.to_be_bytes().to_vec();
+    big.extend_from_slice(b"moov");
+    big.extend_from_slice(&(moov.len() as u64 + 8).to_be_bytes());
+    big.extend_from_slice(&moov[8..]);
+    assert_eq!(bmff::orientation(&big), Some(6));
+    let mut short = moov.clone();
+    short[3] -= 1;
+    assert_eq!(bmff::orientation(&short), None);
+    short[3] += 2;
+    assert_eq!(bmff::orientation(&short), None);
+}
+
+#[test]
+fn a_file_cut_or_flipped_anywhere_is_read_without_a_panic() {
+    let mut d = bmff_box(b"ftyp", b"crx \0\0\0\x01");
+    let moov_at = d.len();
+    d.extend_from_slice(&cr3_moov(6));
+    let end = d.len();
+    // `moov` has to be all there.
+    for n in 0..=end {
+        let want = (n == end).then_some(6);
+        assert_eq!(bmff::orientation(&d[..n]), want, "cut at {n}");
+        let _ = bmff::is_cr3(&d[..n]);
+    }
+    for at in 0..end {
+        for v in [0x00, 0x01, 0x7F, 0x80, 0xFF] {
+            let mut f = d.clone();
+            f[at] = v;
+            let r = bmff::orientation(&f);
+            // The brand and the version of `ftyp` are not read here.
+            if (8..moov_at).contains(&at) {
+                assert_eq!(r, Some(6), "byte {at} = {v:#x}");
+            }
+        }
+    }
+}
+
+#[test]
+fn only_so_many_boxes_are_looked_at() {
+    let free = bmff_box(b"free", &[]);
+    // Each of the boxes before `moov`, `moov`, its `uuid` box and CMT1.
+    let after = |before: usize| {
+        let mut d = free.repeat(before);
+        d.extend_from_slice(&cr3_moov(6));
+        bmff::orientation(&d)
+    };
+    assert_eq!(after(bmff::MAX_BOXES - 3), Some(6));
+    assert_eq!(after(bmff::MAX_BOXES - 2), None);
+    assert_eq!(after(bmff::MAX_BOXES * 40), None);
+    // The budget is one for all the levels: neither level is over it alone.
+    let half = bmff::MAX_BOXES / 2 + 2;
+    let cmt1 = bmff_box(b"CMT1", &orientation_tiff(6));
+    let mut inner = free.repeat(half);
+    inner.extend_from_slice(&cmt1);
+    let mut moov = free.repeat(half);
+    moov.extend_from_slice(&bmff_uuid(&inner));
+    let mut d = free.repeat(half);
+    d.extend_from_slice(&bmff_box(b"moov", &moov));
+    assert_eq!(bmff::orientation(&d), None);
+    // The same with room to spare.
+    let mut inner = free.repeat(half / 4);
+    inner.extend_from_slice(&cmt1);
+    let mut moov = free.repeat(half / 4);
+    moov.extend_from_slice(&bmff_uuid(&inner));
+    let mut d = free.repeat(half / 4);
+    d.extend_from_slice(&bmff_box(b"moov", &moov));
+    assert_eq!(bmff::orientation(&d), Some(6));
+}
+
+#[test]
+fn a_crw_needs_its_heap_signature() {
+    let mut d = b"II\x1a\0\0\0HEAPCCDR".to_vec();
+    d.extend_from_slice(&[0; 32]);
+    assert_eq!(detect(&d), Some(Kind::Crw));
+    d[6..14].copy_from_slice(b"HEAPXXXX");
+    assert_eq!(detect(&d), None);
+}
+
+#[test]
+fn a_cr3_is_an_iso_file_whose_major_brand_is_crx() {
+    assert!(bmff::is_cr3(&bmff_box(b"ftyp", b"crx \0\0\0\x01")));
+    // With compatible brands, or as a prefix of a file.
+    assert!(bmff::is_cr3(&bmff_box(b"ftyp", b"crx \0\0\0\x01crx isom")));
+    assert!(bmff::is_cr3(b"\0\0\0\x18ftypcrx \0\0\0\x01"));
+    // Another major brand, the brand only compatible, another box first.
+    assert!(!bmff::is_cr3(&bmff_box(b"ftyp", b"isom\0\0\0\x01")));
+    assert!(!bmff::is_cr3(&bmff_box(b"ftyp", b"heic\0\0\0\x01crx ")));
+    assert!(!bmff::is_cr3(&bmff_box(b"moov", b"crx \0\0\0\x01")));
+    assert!(!bmff::is_cr3(&bmff_box(b"ftyp", b"CRX \0\0\0\x01")));
+    // Too short to be the box it says.
+    assert!(!bmff::is_cr3(b"\0\0\0\x18ftypcrx"));
+    assert!(!bmff::is_cr3(b""));
+    for size in [0u32, 1, 8, 15] {
+        let mut d = bmff_box(b"ftyp", b"crx \0\0\0\x01");
+        d[..4].copy_from_slice(&size.to_be_bytes());
+        assert!(!bmff::is_cr3(&d), "size {size}");
+    }
+    let mut d = bmff_box(b"ftyp", b"crx \0\0\0\x01");
+    d[..4].copy_from_slice(&16u32.to_be_bytes());
+    assert!(bmff::is_cr3(&d));
+}
diff --git a/crates/exav-render/src/formats/image/raw/tiff.rs b/crates/exav-render/src/formats/image/raw/tiff.rs
new file mode 100644
index 00000000..6a7731f1
--- /dev/null
+++ b/crates/exav-render/src/formats/image/raw/tiff.rs
@@ -0,0 +1,337 @@
+//! The directories of a TIFF-structured file (TIFF 6.0, the DNG
+//! specification, Exif), read for the tags that locate a preview. Every
+//! offset and count is checked against the data; the number of directories,
+//! of entries and of values are capped, and a directory is read once.
+
+/// Directories read from one file.
+const MAX_IFDS: usize = 64;
+/// How deep SubIFD and Exif pointers nest from the first directory.
+const MAX_DEPTH: usize = 3;
+/// Entries read from one directory.
+const MAX_ENTRIES: usize = 1024;
+/// SubIFD pointers followed from one tag.
+const MAX_SUBIFDS: usize = 16;
+/// Strips or tiles listed by one directory.
+const MAX_CHUNKS: usize = 1 << 16;
+
+/// The byte order and first directory of a TIFF-structured file.
+#[derive(Clone, Copy, Debug)]
+pub(super) struct Header {
+    pub le: bool,
+    /// 42 in a TIFF; the variants Olympus and Panasonic put there.
+    pub magic: u16,
+    pub first_ifd: usize,
+}
+
+fn u16_at(d: &[u8], at: usize, le: bool) -> Option<u16> {
+    let b: [u8; 2] = d.get(at..at.checked_add(2)?)?.try_into().ok()?;
+    Some(if le {
+        u16::from_le_bytes(b)
+    } else {
+        u16::from_be_bytes(b)
+    })
+}
+
+fn u32_at(d: &[u8], at: usize, le: bool) -> Option<u32> {
+    let b: [u8; 4] = d.get(at..at.checked_add(4)?)?.try_into().ok()?;
+    Some(if le {
+        u32::from_le_bytes(b)
+    } else {
+        u32::from_be_bytes(b)
+    })
+}
+
+/// The header at `data[0]`, whatever the magic number: the caller says which
+/// are accepted.
+pub(super) fn header(data: &[u8]) -> Option<Header> {
+    let le = match data.get(..2)? {
+        b"II" => true,
+        b"MM" => false,
+        _ => return None,
+    };
+    Some(Header {
+        le,
+        magic: u16_at(data, 2, le)?,
+        first_ifd: u32_at(data, 4, le)? as usize,
+    })
+}
+
+/// The tags the readers use. Others are skipped.
+mod tag {
+    pub const SUBFILE_TYPE: u16 = 0xFE;
+    pub const WIDTH: u16 = 0x100;
+    pub const HEIGHT: u16 = 0x101;
+    pub const BITS: u16 = 0x102;
+    pub const COMPRESSION: u16 = 0x103;
+    pub const PHOTOMETRIC: u16 = 0x106;
+    pub const MAKE: u16 = 0x10F;
+    pub const STRIP_OFFSETS: u16 = 0x111;
+    pub const ORIENTATION: u16 = 0x112;
+    pub const SAMPLES: u16 = 0x115;
+    pub const STRIP_COUNTS: u16 = 0x117;
+    pub const PLANAR: u16 = 0x11C;
+    pub const SUB_IFDS: u16 = 0x14A;
+    pub const TILE_OFFSETS: u16 = 0x144;
+    pub const TILE_COUNTS: u16 = 0x145;
+    pub const JPEG_OFFSET: u16 = 0x201;
+    pub const JPEG_LENGTH: u16 = 0x202;
+    pub const CFA_REPEAT_DIM: u16 = 0x828D;
+    pub const CFA_PATTERN: u16 = 0x828E;
+    pub const EXIF_IFD: u16 = 0x8769;
+    pub const DNG_VERSION: u16 = 0xC612;
+    pub const DNG_PRIVATE_DATA: u16 = 0xC634;
+}
+
+/// One directory, with the tags that matter.
+#[derive(Clone, Debug, Default)]
+pub(super) struct Ifd {
+    pub subfile_type: Option<u32>,
+    pub width: Option<u32>,
+    pub height: Option<u32>,
+    pub bits: Vec<u32>,
+    pub compression: Option<u32>,
+    pub photometric: Option<u32>,
+    pub samples: Option<u32>,
+    pub planar: Option<u32>,
+    pub orientation: Option<u32>,
+    /// Strips or tiles: offset and byte count of each.
+    pub chunks: Vec<(u32, u32)>,
+    /// The strips or tiles of this directory could not be listed.
+    pub chunks_lost: bool,
+    pub tiled: bool,
+    /// JPEGInterchangeFormat and its length.
+    pub jpeg: Option<(u32, u32)>,
+    /// The first bytes of the Make string.
+    pub make: Vec<u8>,
+    /// Holds a colour filter array tag or the DNG version.
+    pub cfa: bool,
+    pub dng: bool,
+    /// DNGPrivateData, which Sony also writes in its ARW and SR2 files.
+    pub private_data: bool,
+    /// Has a SubIFDs tag.
+    pub sub_ifds: bool,
+}
+
+/// Every directory reached from the first.
+#[derive(Debug)]
+pub(super) struct Scan {
+    pub le: bool,
+    /// The first directory first.
+    pub ifds: Vec<Ifd>,
+}
+
+/// Where the value of an entry is: inline in the entry, or at an offset.
+struct Entry {
+    tag: u16,
+    typ: u16,
+    count: u32,
+    /// Offset of the entry's four value bytes.
+    field: usize,
+}
+
+fn type_size(typ: u16) -> Option<usize> {
+    Some(match typ {
+        1 | 2 | 6 | 7 => 1,
+        3 | 8 => 2,
+        4 | 9 | 11 | 13 => 4,
+        5 | 10 | 12 | 16 => 8,
+        _ => return None,
+    })
+}
+
+impl Entry {
+    /// The value bytes, if they lie inside the data.
+    fn bytes<'a>(&self, d: &'a [u8], le: bool) -> Option<&'a [u8]> {
+        let size = type_size(self.typ)?.checked_mul(self.count as usize)?;
+        let at = if size <= 4 {
+            self.field
+        } else {
+            u32_at(d, self.field, le)? as usize
+        };
+        d.get(at..at.checked_add(size)?)
+    }
+
+    /// Up to `max` integers of a BYTE, SHORT or LONG entry; `None` when the
+    /// entry has more or is of another type.
+    fn ints(&self, d: &[u8], le: bool, max: usize) -> Option<Vec<u32>> {
+        if self.count as usize > max {
+            return None;
+        }
+        let b = self.bytes(d, le)?;
+        Some(match self.typ {
+            1 => b.iter().map(|&v| u32::from(v)).collect(),
+            3 => b
+                .as_chunks::<2>()
+                .0
+                .iter()
+                .map(|&c| {
+                    u32::from(if le {
+                        u16::from_le_bytes(c)
+                    } else {
+                        u16::from_be_bytes(c)
+                    })
+                })
+                .collect(),
+            4 | 13 => b
+                .as_chunks::<4>()
+                .0
+                .iter()
+                .map(|&c| {
+                    if le {
+                        u32::from_le_bytes(c)
+                    } else {
+                        u32::from_be_bytes(c)
+                    }
+                })
+                .collect(),
+            _ => return None,
+        })
+    }
+
+    fn int(&self, d: &[u8], le: bool) -> Option<u32> {
+        self.ints(d, le, 1)?.first().copied()
+    }
+}
+
+/// The directories of a TIFF-structured file whose header is `header`, from
+/// the first one. A directory that cannot be read ends its own branch only.
+pub(super) fn scan(data: &[u8], header: Header) -> Scan {
+    let mut ifds: Vec<Ifd> = Vec::new();
+    let mut seen: Vec<usize> = Vec::new();
+    let mut todo = vec![(header.first_ifd, 0usize)];
+    // Depth first, so that the first directory is first and a chain follows it.
+    while let Some((at, depth)) = todo.pop() {
+        if ifds.len() == MAX_IFDS {
+            break;
+        }
+        if seen.contains(&at) {
+            continue;
+        }
+        seen.push(at);
+        let Some((ifd, next, pointers)) = read_ifd(data, header.le, at) else {
+            continue;
+        };
+        ifds.push(ifd);
+        // Pushed in reverse: the next directory of the chain is read before
+        // what hangs off this one.
+        if depth < MAX_DEPTH {
+            for p in pointers.into_iter().rev() {
+                todo.push((p, depth + 1));
+            }
+        }
+        if next != 0 {
+            todo.push((next as usize, depth));
+        }
+    }
+    Scan {
+        le: header.le,
+        ifds,
+    }
+}
+
+/// One directory at `at`: its tags, the offset of the next directory, and the
+/// SubIFD and Exif directories it points to.
+fn read_ifd(d: &[u8], le: bool, at: usize) -> Option<(Ifd, u32, Vec<usize>)> {
+    let count = usize::from(u16_at(d, at, le)?);
+    let entries_at = at.checked_add(2)?;
+    // An entry table past the end of the data is as unreadable as one that
+    // holds too many entries.
+    if count > MAX_ENTRIES || entries_at.checked_add(count * 12)? > d.len() {
+        return None;
+    }
+    let next = u32_at(d, entries_at + count * 12, le).unwrap_or(0);
+    let mut ifd = Ifd::default();
+    let mut pointers = Vec::new();
+    let (mut offsets, mut counts): (Option<Vec<u32>>, Option<Vec<u32>>) = (None, None);
+    let (mut tile_offsets, mut tile_counts): (Option<Vec<u32>>, Option<Vec<u32>>) = (None, None);
+    let (mut jpeg_offset, mut jpeg_length) = (None, None);
+    for k in 0..count {
+        let e = entries_at + k * 12;
+        let entry = Entry {
+            tag: u16_at(d, e, le)?,
+            typ: u16_at(d, e + 2, le)?,
+            count: u32_at(d, e + 4, le)?,
+            field: e + 8,
+        };
+        match entry.tag {
+            tag::SUBFILE_TYPE => ifd.subfile_type = entry.int(d, le),
+            tag::WIDTH => ifd.width = entry.int(d, le),
+            tag::HEIGHT => ifd.height = entry.int(d, le),
+            tag::BITS => ifd.bits = entry.ints(d, le, 8).unwrap_or_default(),
+            tag::COMPRESSION => ifd.compression = entry.int(d, le),
+            tag::PHOTOMETRIC => ifd.photometric = entry.int(d, le),
+            tag::SAMPLES => ifd.samples = entry.int(d, le),
+            tag::PLANAR => ifd.planar = entry.int(d, le),
+            tag::ORIENTATION => ifd.orientation = entry.int(d, le),
+            tag::MAKE => {
+                if entry.typ == 2 {
+                    ifd.make = entry
+                        .bytes(d, le)
+                        .map(|b| b.iter().take(32).copied().collect())
+                        .unwrap_or_default();
+                }
+            }
+            tag::STRIP_OFFSETS => {
+                offsets = entry.ints(d, le, MAX_CHUNKS);
+                ifd.chunks_lost |= offsets.is_none();
+            }
+            tag::STRIP_COUNTS => {
+                counts = entry.ints(d, le, MAX_CHUNKS);
+                ifd.chunks_lost |= counts.is_none();
+            }
+            tag::TILE_OFFSETS => {
+                ifd.tiled = true;
+                tile_offsets = entry.ints(d, le, MAX_CHUNKS);
+                ifd.chunks_lost |= tile_offsets.is_none();
+            }
+            tag::TILE_COUNTS => {
+                tile_counts = entry.ints(d, le, MAX_CHUNKS);
+                ifd.chunks_lost |= tile_counts.is_none();
+            }
+            tag::JPEG_OFFSET => jpeg_offset = entry.int(d, le),
+            tag::JPEG_LENGTH => jpeg_length = entry.int(d, le),
+            tag::CFA_REPEAT_DIM | tag::CFA_PATTERN => ifd.cfa = true,
+            tag::DNG_VERSION => ifd.dng = true,
+            tag::DNG_PRIVATE_DATA => ifd.private_data = true,
+            tag::SUB_IFDS => {
+                ifd.sub_ifds = true;
+                if let Some(v) = entry.ints(d, le, MAX_SUBIFDS) {
+                    pointers.extend(v.into_iter().map(|p| p as usize));
+                }
+            }
+            tag::EXIF_IFD => {
+                if let Some(p) = entry.int(d, le) {
+                    pointers.push(p as usize);
+                }
+            }
+            _ => {}
+        }
+    }
+    ifd.jpeg = jpeg_offset.zip(jpeg_length);
+    let (offsets, counts) = if ifd.tiled {
+        (tile_offsets, tile_counts)
+    } else {
+        (offsets, counts)
+    };
+    match (offsets, counts) {
+        (Some(o), Some(c)) if o.len() == c.len() => ifd.chunks = o.into_iter().zip(c).collect(),
+        // A single strip may leave its length out.
+        (Some(o), None) if o.len() == 1 && !ifd.tiled => ifd.chunks = vec![(o[0], 0)],
+        (None, None) => {}
+        _ => ifd.chunks_lost = true,
+    }
+    Some((ifd, next, pointers))
+}
+
+/// The orientation (1 to 8) in the first directory of the TIFF structure
+/// that starts at `data[0]`.
+pub(super) fn orientation(data: &[u8]) -> Option<u8> {
+    let h = header(data)?;
+    if h.magic != 42 {
+        return None;
+    }
+    let (ifd, _, _) = read_ifd(data, h.le, h.first_ifd)?;
+    ifd.orientation
+        .and_then(|o| u8::try_from(o).ok())
+        .filter(|o| (1..=8).contains(o))
+}
diff --git a/crates/exav-render/src/formats/image/tests.rs b/crates/exav-render/src/formats/image/tests.rs
index 63ac070e..d6f31357 100644
--- a/crates/exav-render/src/formats/image/tests.rs
+++ b/crates/exav-render/src/formats/image/tests.rs
@@ -145,6 +145,39 @@ fn a_jpeg_decodes_to_the_size_its_frame_header_declares() {
     assert_eq!(p.to_rgba8().len(), width as usize * height as usize * 4);
 }
 
+/// Found by the `imagehash` fuzz target: zune-jpeg 0.5.8 asserts in its
+/// upsampler when the components' sampling factors do not nest (here luma 1x2,
+/// a chroma component 2x1). 0.5.15 decodes the file.
+#[test]
+fn a_jpeg_whose_sampling_factors_do_not_nest_is_decoded() {
+    let jpeg: &[u8] =
+        include_bytes!("../../../tests/fixtures/fuzz/jpeg-sampling-factors-that-do-not-nest.jpg");
+    let p = decode(jpeg, Format::Jpeg, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (150, 103));
+}
+
+/// A baseline JPEG with a scan for each component draws what the same picture
+/// in one scan does. zune-jpeg 0.5.8 drew it flat, so that it hashed as
+/// `8000000000000000`, which `sigtool --fuzzy-img` still gives (the pictures
+/// are written by `tests/fixtures/images/make.py`).
+#[test]
+fn a_jpeg_with_a_scan_for_each_component_is_drawn() {
+    let samples = |jpeg: &[u8]| {
+        let p = decode(jpeg, Format::Jpeg, DECODE_MAX).unwrap();
+        let Samples::U8(v) = p.samples else { panic!() };
+        v
+    };
+    let one = samples(include_bytes!(
+        "../../../tests/fixtures/images/sequential-interleaved.jpg"
+    ));
+    let each = samples(include_bytes!(
+        "../../../tests/fixtures/images/sequential-non-interleaved.jpg"
+    ));
+    assert_eq!(one.len(), each.len());
+    assert!(one.iter().any(|&b| b != one[0]), "the picture has detail");
+    assert!(one.iter().zip(&each).all(|(a, b)| a.abs_diff(*b) <= 2));
+}
+
 /// Found by the `imagehash` fuzz target: weezl 0.1.10 asserted, in debug
 /// builds, that a TIFF LZW table never holds 4,095 codes, which a stream
 /// without a clear code reaches. One clear code, then a literal per pixel,
@@ -245,6 +278,810 @@ fn tiff_with(entries: &[(u16, u16, u32, u32)]) -> Vec<u8> {
     tiff
 }
 
+/// Palette indices with an alpha sample beside each (SamplesPerPixel 2): the
+/// hash is of nothing, as ClamAV's decoder refuses it; the viewer draws RGBA.
+#[test]
+fn a_palette_tiff_with_an_alpha_sample_is_shown() {
+    let mut map = vec![0u16; 768];
+    map[1] = 65535; // index 1: red
+    map[256 + 2] = 65535; // index 2: green
+    let map: Vec<u8> = map.iter().flat_map(|v| v.to_le_bytes()).collect();
+    let file = tiff_strip(
+        2,
+        1,
+        &[1, 200, 2, 100],
+        &[
+            (258, 3, [8, 0].repeat(2)),
+            (262, 3, short(3)),
+            (277, 3, short(2)),
+            (320, 3, map),
+            (338, 3, short(2)),
+        ],
+    );
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgba);
+    assert_eq!(p.samples, Samples::U8(vec![255, 0, 0, 200, 0, 255, 0, 100]));
+}
+
+/// A raster of three bands that are not colours (photometric 1) shows its
+/// first band, chunky or planar.
+#[test]
+fn a_multiband_tiff_shows_its_first_band() {
+    let grey = |file: &[u8]| {
+        let p = decode_any(file, DECODE_MAX).unwrap();
+        assert_eq!(p.channels, Channels::Luma);
+        p.samples
+    };
+    let entries = |planar: u16| {
+        vec![
+            (258, 3, [8, 0].repeat(3)),
+            (262, 3, short(1)),
+            (277, 3, short(3)),
+            (284, 3, short(planar)),
+            (338, 3, [0, 0].repeat(2)),
+        ]
+    };
+    let chunky = tiff_strip(2, 1, &[10, 20, 30, 40, 50, 60], &entries(1));
+    assert_eq!(grey(&chunky), Samples::U8(vec![10, 40]));
+    let planar = tiff_strips(2, 1, &[&[10, 40], &[20, 50], &[30, 60]], &entries(2));
+    assert_eq!(grey(&planar), Samples::U8(vec![10, 40]));
+}
+
+/// Old-style LZW (TIFF 5.0: least significant bit first, a code late, as in
+/// GIF) starts 0x00 and an odd byte; libtiff reads it (`quad-lzw-compat.tiff`).
+/// The hashing decoder reads it as the new style and fails.
+#[test]
+fn an_old_style_lzw_tiff_is_shown() {
+    let pixels: Vec<u8> = (0..64).map(|i| (i * 7 % 256) as u8).collect();
+    let strip = weezl::encode::Encoder::new(weezl::BitOrder::Lsb, 8)
+        .encode(&pixels)
+        .unwrap();
+    assert_eq!(strip[0], 0);
+    assert_eq!(strip[1] & 1, 1);
+    let tiff = tiff_strip(
+        8,
+        8,
+        &strip,
+        &[
+            (258, 3, [8, 0].to_vec()),
+            (259, 3, short(5)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+        ],
+    );
+    assert_eq!(
+        decode(&tiff, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!(p.samples, Samples::U8(pixels));
+}
+
+/// YCbCr stored with the chroma sampled 2 by 2 and no JPEG (libtiff's
+/// `ycbcr-cat.tif`, LZW): units of four luma values, Cb and Cr, which the
+/// decoder took for pixels of three samples and failed on.
+#[test]
+fn a_ycbcr_tiff_with_subsampled_chroma_and_no_jpeg_is_shown() {
+    // Two units across, one down: the first all Y 100, Cb 128, Cr 200 (a red,
+    // as in the test above), the second grey 50, 60 over 70, 80.
+    let units = [100, 100, 100, 100, 128, 200, 50, 60, 70, 80, 128, 128];
+    let tiff = tiff_strip(
+        4,
+        2,
+        &units,
+        &[
+            (258, 3, [8, 0].repeat(3)),
+            (262, 3, short(6)),
+            (277, 3, short(3)),
+            (530, 3, [2, 0, 2, 0].to_vec()),
+        ],
+    );
+    assert_eq!(
+        decode(&tiff, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (4, 2));
+    let rgba = p.to_rgba8();
+    let px = |x: usize, y: usize| rgba[(y * 4 + x) * 4..(y * 4 + x) * 4 + 3].to_vec();
+    for (x, y) in [(0, 0), (1, 0), (0, 1), (1, 1)] {
+        assert_eq!(px(x, y), [200, 49, 100], "{x},{y}");
+    }
+    assert_eq!(px(2, 0), [50, 50, 50]);
+    assert_eq!(px(3, 0), [60, 60, 60]);
+    assert_eq!(px(2, 1), [70, 70, 70]);
+    assert_eq!(px(3, 1), [80, 80, 80]);
+}
+
+/// A Deflate strip whose Adler-32 is wrong is read by libtiff and drawn by
+/// Pillow (OpenCV's `multipage.tif`); the hashing decoder refuses it.
+#[test]
+fn a_deflate_tiff_with_a_wrong_checksum_is_shown() {
+    use std::io::Write;
+    let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+    z.write_all(&[1, 2, 3, 4]).unwrap();
+    let mut strip = z.finish().unwrap();
+    let last = strip.len() - 1;
+    strip[last] ^= 0xff;
+    let tiff = tiff_strip(
+        2,
+        2,
+        &strip,
+        &[
+            (258, 3, [8, 0].to_vec()),
+            (259, 3, short(8)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+        ],
+    );
+    assert_eq!(
+        decode(&tiff, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!(p.samples, Samples::U8(vec![1, 2, 3, 4]));
+}
+
+/// A directory whose next link points at itself ends the chain in libtiff,
+/// which draws the image (`test_ifd_loop_to_self.tif`); the hashing decoder
+/// calls it a cycle.
+#[test]
+fn a_tiff_whose_directory_links_to_itself_is_shown() {
+    let mut tiff = tiff_with(&[
+        (256, 3, 1, 2),
+        (257, 3, 1, 1),
+        (258, 3, 1, 8),
+        (262, 3, 1, 1),
+        (273, 4, 1, 8),
+        (279, 4, 1, 2),
+    ]);
+    let end = tiff.len();
+    tiff[end - 4..].copy_from_slice(&16u32.to_le_bytes());
+    assert_eq!(
+        decode(&tiff, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (2, 1));
+}
+
+/// A strip with no StripByteCounts (and no RowsPerStrip) runs to the end of the
+/// file in libtiff, which reads it (a test scan, `tdf115863.tif`).
+#[test]
+fn a_tiff_strip_with_no_byte_count_is_shown() {
+    let mut tiff = tiff_with(&[
+        (256, 3, 1, 2),
+        (257, 3, 1, 1),
+        (258, 3, 1, 8),
+        (262, 3, 1, 1),
+        (273, 4, 1, 8),
+        (277, 3, 1, 1),
+    ]);
+    tiff[8..10].copy_from_slice(&[7, 9]);
+    assert_eq!(
+        decode(&tiff, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!(p.samples, Samples::U8(vec![7, 9]));
+}
+
+/// CIELab (photometric 8): L* of 255 is white, a* and b* are signed.
+#[test]
+fn a_cielab_tiff_is_shown_in_rgb() {
+    let tiff = tiff_strip(
+        4,
+        1,
+        &[255, 0, 0, 0, 0, 0, 128, 127, 0, 128, 129, 0],
+        &[
+            (258, 3, [8, 0].repeat(3)),
+            (262, 3, short(8)),
+            (277, 3, short(3)),
+        ],
+    );
+    assert_eq!(
+        decode(&tiff, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgb);
+    let Samples::U8(v) = p.samples else { panic!() };
+    assert!(v[..3].iter().all(|&c| c >= 254), "{v:?}");
+    assert_eq!(v[3..6], [0, 0, 0]);
+    // a* of +127 is red, of -127 (129 as a byte) green.
+    assert!(v[6] > v[7] + 100, "{v:?}");
+    assert!(v[10] > v[9] + 50, "{v:?}");
+}
+
+/// A JPEG in a TIFF with an Adobe marker, three components and the ids R, G, B
+/// (an RGB JPEG: ImageSharp's `rgb_jpegcompressed_nojpegtable.tiff`).
+/// zune-jpeg 0.4 takes it for CMYK, and the strip is refused.
+#[test]
+fn an_rgb_jpeg_in_a_tiff_is_shown() {
+    const JPEG: &str = "ffd8ffee000e41646f626500640000000000ffdb0043001b12141714111b1716171e1c1b2028422b28252528513a3d3042605565645f555d5b6a7899816a7190735b5d85b586909ea3abadab6780bcc9baa6c799a8aba4ffdb0043011c1e1e2823284e2b2b4ea46e5d6ea4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4a4ffc00011080008000803521100471101421101ffc4001f0000010501010101010100000000000000000102030405060708090a0bffc400b5100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9faffc4001f0100030101010101010101010000000000000102030405060708090a0bffc400b51100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffda000c03520047114211003f00a75ce7ae7fffd9";
+    let jpeg: Vec<u8> = (0..JPEG.len())
+        .step_by(2)
+        .map(|i| u8::from_str_radix(&JPEG[i..i + 2], 16).unwrap())
+        .collect();
+    let tiff = tiff_strip(
+        8,
+        8,
+        &jpeg,
+        &[
+            (258, 3, [8, 0].repeat(3)),
+            (259, 3, short(7)),
+            (262, 3, short(2)),
+            (277, 3, short(3)),
+        ],
+    );
+    let p = decode_any(&tiff, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgb);
+    let Samples::U8(v) = p.samples else { panic!() };
+    // The samples as the JPEG stores them, read as RGB.
+    for (got, want) in v[..3].iter().zip([88u8, 100, 209]) {
+        assert!(got.abs_diff(want) <= 2, "{:?}", &v[..3]);
+    }
+}
+
+/// libtiff keeps the offsets of tiles and of strips in one field: a tiled file
+/// may name its tiles with StripOffsets and StripByteCounts (ImageSharp's
+/// `quad-tile.tiff`).
+#[test]
+fn a_tiled_tiff_with_strip_offsets_is_shown() {
+    // Two tiles of one column each, the first holding 10 and 30.
+    let tiled = tiff_strips(
+        2,
+        2,
+        &[&[10, 30], &[20, 40]],
+        &[
+            (258, 3, [8, 0].to_vec()),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+            (322, 3, short(1)),
+            (323, 3, short(2)),
+        ],
+    );
+    let p = decode_any(&tiled, DECODE_MAX).unwrap();
+    assert_eq!(p.samples, Samples::U8(vec![10, 20, 30, 40]));
+    assert_eq!(
+        decode(&tiled, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+}
+
+/// The Orientation tag of a TIFF says how the stored rows are turned for the
+/// eye; `decode`, which is what is hashed, leaves them as stored.
+#[test]
+fn a_tiff_is_turned_as_its_orientation_says() {
+    // 3x2, stored as 1 2 3 / 4 5 6.
+    for (orientation, w, h, shown) in [
+        (1u16, 3, 2, [1, 2, 3, 4, 5, 6]),
+        (2, 3, 2, [3, 2, 1, 6, 5, 4]),
+        (3, 3, 2, [6, 5, 4, 3, 2, 1]),
+        (4, 3, 2, [4, 5, 6, 1, 2, 3]),
+        (5, 2, 3, [1, 4, 2, 5, 3, 6]),
+        (6, 2, 3, [4, 1, 5, 2, 6, 3]),
+        (7, 2, 3, [6, 3, 5, 2, 4, 1]),
+        (8, 2, 3, [3, 6, 2, 5, 1, 4]),
+        (9, 3, 2, [1, 2, 3, 4, 5, 6]),
+    ] {
+        let file = tiff_strip(
+            3,
+            2,
+            &[1, 2, 3, 4, 5, 6],
+            &[
+                (258, 3, short(8)),
+                (262, 3, short(1)),
+                (274, 3, short(orientation)),
+                (277, 3, short(1)),
+            ],
+        );
+        let hashed = decode(&file, Format::Tiff, DECODE_MAX).unwrap();
+        assert_eq!(hashed.samples, Samples::U8(vec![1, 2, 3, 4, 5, 6]));
+        let p = decode_any(&file, DECODE_MAX).unwrap();
+        assert_eq!((p.width, p.height), (w, h), "orientation {orientation}");
+        assert_eq!(
+            p.samples,
+            Samples::U8(shown.to_vec()),
+            "orientation {orientation}"
+        );
+    }
+}
+
+/// Colours stored premultiplied by their alpha (an extra sample of kind 1)
+/// are drawn as they are, and look dark at a soft edge; the viewer divides
+/// them, the hash is of the samples.
+#[test]
+fn a_tiff_with_associated_alpha_is_shown_divided_by_it() {
+    let rgba8 = (258, 3, [8, 0].repeat(4));
+    let extra = (338, 3, short(1));
+    let file = tiff_strip(
+        2,
+        1,
+        &[10, 20, 30, 128, 90, 90, 90, 0],
+        &[rgba8, (262, 3, short(2)), (277, 3, short(4)), extra],
+    );
+    let Samples::U8(hashed) = decode(&file, Format::Tiff, DECODE_MAX).unwrap().samples else {
+        panic!()
+    };
+    assert_eq!(hashed, [10, 20, 30, 128, 90, 90, 90, 0]);
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgba);
+    assert_eq!(p.samples, Samples::U8(vec![20, 40, 60, 128, 0, 0, 0, 0]));
+    // Grey and alpha, the same.
+    let file = tiff_strip(
+        1,
+        1,
+        &[10, 128],
+        &[
+            (258, 3, [8, 0].repeat(2)),
+            (262, 3, short(1)),
+            (277, 3, short(2)),
+            (338, 3, short(1)),
+        ],
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!(p.samples, Samples::U8(vec![20, 128]));
+}
+
+/// An extra sample of no stated use (ExtraSamples 0) is not a transparency: a
+/// 16-bit picture with such a fourth band came out nearly invisible.
+#[test]
+fn an_extra_sample_of_no_stated_use_is_not_an_alpha() {
+    let sixteen = |n: usize| (258, 3, [16, 0].repeat(n));
+    let value = |v: u16| v.to_le_bytes();
+    let rgba16 = [value(0x1000), value(0x2000), value(0x3000), value(0x0100)].concat();
+    let file = tiff_strip(
+        1,
+        1,
+        &rgba16,
+        &[
+            sixteen(4),
+            (262, 3, short(2)),
+            (277, 3, short(4)),
+            (338, 3, short(0)),
+        ],
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgba);
+    assert_eq!(p.samples, Samples::U8(vec![0x10, 0x20, 0x30, 255]));
+    // The same with the extra sample declared an unassociated alpha: kept.
+    let file = tiff_strip(
+        1,
+        1,
+        &rgba16,
+        &[
+            sixteen(4),
+            (262, 3, short(2)),
+            (277, 3, short(4)),
+            (338, 3, short(2)),
+        ],
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!(
+        p.samples,
+        Samples::U16(vec![0x1000, 0x2000, 0x3000, 0x0100])
+    );
+}
+
+/// Zstandard strips (compression 50000) are the viewer's to read; the hash is
+/// of what ClamAV's decoder reads, which has none.
+#[test]
+fn a_zstandard_tiff_is_shown_and_not_hashed() {
+    let pixels: Vec<u8> = (0..32).map(|i| (i * 8) as u8).collect();
+    let strip =
+        ruzstd::encoding::compress_to_vec(&pixels[..], ruzstd::encoding::CompressionLevel::Fastest);
+    let file = tiff_strip(
+        8,
+        4,
+        &strip,
+        &[
+            (258, 3, short(8)),
+            (259, 3, short(50000)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+        ],
+    );
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height, p.channels), (8, 4, Channels::Luma));
+    assert_eq!(p.samples, Samples::U8(pixels));
+    // The viewer's codecs are off again for what is hashed.
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+}
+
+/// Old-style JPEG (compression 6) in the three layouts files have it in (made
+/// by `tests/fixtures/ojpeg/make.py`, and read by libtiff and Pillow too): a
+/// whole JPEG as the strip, a scan with its tables in tags, a JPEG stream the
+/// file points to that the strip lies in, and one that stops short of the scan
+/// header, which starts the strip. The hash path has none.
+#[test]
+fn old_style_jpeg_tiffs_are_shown() {
+    for name in ["whole", "tables", "interchange", "scanheader"] {
+        let path = format!(
+            "{}/tests/fixtures/ojpeg/{name}.tif",
+            env!("CARGO_MANIFEST_DIR")
+        );
+        let file = std::fs::read(path).unwrap();
+        assert_eq!(
+            decode(&file, Format::Tiff, DECODE_MAX),
+            Err(Error::Undecodable),
+            "{name}"
+        );
+        let p = decode_any(&file, DECODE_MAX).unwrap();
+        assert_eq!(
+            (p.width, p.height, p.channels),
+            (16, 16, Channels::Rgb),
+            "{name}"
+        );
+        let rgba = p.to_rgba8();
+        let near = |x: usize, y: usize, want: [u8; 3]| {
+            let got = &rgba[(y * 16 + x) * 4..][..3];
+            assert!(
+                got.iter().zip(want).all(|(&g, w)| g.abs_diff(w) < 30),
+                "{name} at {x},{y}: {got:?} for {want:?}"
+            );
+        };
+        near(2, 3, [200, 30, 30]);
+        near(13, 12, [30, 30, 200]);
+    }
+}
+
+/// Grey of 12 bits, the values one after another and each row to a byte
+/// (libtiff cannot show them; Pillow reads them as 16-bit): shown stretched,
+/// and reversed when white is zero. The hash path refuses them.
+#[test]
+fn a_twelve_bit_grey_tiff_is_shown() {
+    // 3 values to a row of 5 bytes (36 bits and 4 of padding).
+    let values = [[0u16, 1000, 2000], [3000, 4000, 4095]];
+    let strip: Vec<u8> = values
+        .iter()
+        .flat_map(|row| {
+            let bits = row.iter().fold(0u64, |acc, v| acc << 12 | u64::from(*v)) << 4;
+            bits.to_be_bytes()[3..].to_vec()
+        })
+        .collect();
+    for (photometric, reversed) in [(1, false), (0, true)] {
+        let file = tiff_strip(
+            3,
+            2,
+            &strip,
+            &[
+                (258, 3, short(12)),
+                (262, 3, short(photometric)),
+                (277, 3, short(1)),
+            ],
+        );
+        assert_eq!(
+            decode(&file, Format::Tiff, DECODE_MAX),
+            Err(Error::Undecodable)
+        );
+        let p = decode_any(&file, DECODE_MAX).unwrap();
+        assert_eq!((p.width, p.height, p.channels), (3, 2, Channels::Luma));
+        let Samples::U8(mut v) = p.samples else {
+            panic!()
+        };
+        if reversed {
+            v.reverse();
+        }
+        assert_eq!(v[0], 0);
+        assert_eq!(v[5], 255);
+        // The two brightest share the top of the stretch.
+        assert!(
+            v.array_windows().all(|[a, b]| a <= b) && v[0] < v[1] && v[1] < v[2],
+            "{v:?}"
+        );
+    }
+}
+
+/// Packed samples have no byte order: a big-endian file's 12-bit values are
+/// read as a little-endian file's are.
+#[test]
+fn a_twelve_bit_tiff_of_the_other_byte_order_is_read_the_same() {
+    let entry = |tag: u16, kind: u16, value: u32| {
+        let mut e = tag.to_be_bytes().to_vec();
+        e.extend_from_slice(&kind.to_be_bytes());
+        e.extend_from_slice(&1u32.to_be_bytes());
+        if kind == 3 {
+            e.extend_from_slice(&(value as u16).to_be_bytes());
+            e.extend_from_slice(&[0, 0]);
+        } else {
+            e.extend_from_slice(&value.to_be_bytes());
+        }
+        e
+    };
+    // The values 0x123, 0xABC, 0x456 and 0xFFF, behind the header.
+    let mut file = b"MM\0*\0\0\0\x0e\x12\x3a\xbc\x45\x6f\xff".to_vec();
+    let entries = [
+        entry(256, 3, 4),
+        entry(257, 3, 1),
+        entry(258, 3, 12),
+        entry(259, 3, 1),
+        entry(262, 3, 1),
+        entry(273, 4, 8),
+        entry(277, 3, 1),
+        entry(278, 3, 1),
+        entry(279, 4, 6),
+    ];
+    file.extend_from_slice(&(entries.len() as u16).to_be_bytes());
+    for e in entries {
+        file.extend_from_slice(&e);
+    }
+    file.extend_from_slice(&[0; 4]);
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    let Samples::U8(v) = p.samples else { panic!() };
+    // In the order of the values: 0x123 < 0x456 < 0xABC <= 0xFFF (the top of
+    // the stretch is shared).
+    assert!(v[0] < v[2] && v[2] < v[1] && v[1] <= v[3], "{v:?}");
+}
+
+/// libtiff takes the first entries of a BitsPerSample with more than the
+/// samples a pixel has, and a file with no photometric interpretation is grey
+/// (or RGB with three samples) to GIS programs.
+#[test]
+fn a_tiff_with_extra_bit_counts_or_no_photometric_is_shown() {
+    let extra = tiff_strip(
+        2,
+        1,
+        &[10, 20, 30, 40, 50, 60],
+        &[
+            (
+                258,
+                3,
+                [8u16, 8, 8, 1]
+                    .iter()
+                    .flat_map(|v| v.to_le_bytes())
+                    .collect(),
+            ),
+            (262, 3, short(2)),
+            (277, 3, short(3)),
+        ],
+    );
+    let none = tiff_strip(
+        2,
+        1,
+        &[10, 20, 30, 40, 50, 60],
+        &[(258, 3, vec![8, 0, 8, 0, 8, 0]), (277, 3, short(3))],
+    );
+    for file in [extra, none] {
+        assert_eq!(
+            decode(&file, Format::Tiff, DECODE_MAX),
+            Err(Error::Undecodable)
+        );
+        let p = decode_any(&file, DECODE_MAX).unwrap();
+        assert_eq!(p.channels, Channels::Rgb);
+        assert_eq!(p.samples, Samples::U8(vec![10, 20, 30, 40, 50, 60]));
+    }
+    let grey = tiff_strip(2, 1, &[7, 9], &[(258, 3, short(8)), (277, 3, short(1))]);
+    assert_eq!(
+        decode(&grey, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    assert_eq!(
+        decode_any(&grey, DECODE_MAX).unwrap().samples,
+        Samples::U8(vec![7, 9])
+    );
+}
+
+/// LZMA strips (compression 34925) are an xz stream with one LZMA2 block, as
+/// libtiff writes them, behind a delta filter when it predicts; made with
+/// Python's `lzma`. The viewer reads them, the hash path does not.
+#[test]
+fn an_lzma_tiff_is_shown_and_not_hashed() {
+    let pixels: Vec<u8> = (0..32).map(|i| (i * 8) as u8).collect();
+    for strip in [
+        "fd377a585a000000ff12d9410200210100000000372797d601001f0008101820283038404850586068\
+         707880889098a0a8b0b8c0c8d0d8e0e8f0f8000001302010a3aec406729e7a010000000000595a",
+        "fd377a585a000000ff12d94102010301002101002895101ae0001f00075d0000029169554000000000\
+         011b20795edeb206729e7a010000000000595a",
+    ] {
+        let file = tiff_strip(
+            8,
+            4,
+            &hex(strip),
+            &[
+                (258, 3, short(8)),
+                (259, 3, short(34925)),
+                (262, 3, short(1)),
+                (277, 3, short(1)),
+            ],
+        );
+        assert_eq!(
+            decode(&file, Format::Tiff, DECODE_MAX),
+            Err(Error::Undecodable)
+        );
+        let p = decode_any(&file, DECODE_MAX).unwrap();
+        assert_eq!((p.width, p.height, p.channels), (8, 4, Channels::Luma));
+        assert_eq!(p.samples, Samples::U8(pixels.clone()));
+    }
+}
+
+/// ThunderScan (compression 32809) codes 4-bit pixels as runs of the last
+/// one, 2-bit and 3-bit steps from it, and raw values; a row at a time.
+#[test]
+fn a_thunderscan_tiff_is_shown() {
+    let strip = [
+        // 3 raw, 3 more of it, steps +1 -1 (2 skips), steps +2 -1.
+        0xC3,
+        0x03,
+        0x40 | 1 << 4 | 3 << 2 | 2,
+        0x80 | 2 << 3 | 7,
+        // Eight raw values.
+        0xC0,
+        0xC1,
+        0xC2,
+        0xC3,
+        0xC4,
+        0xC5,
+        0xC6,
+        0xC7,
+        // Eight of the last pixel, which starts a row as 0.
+        0x08,
+        // Raw 15, seven of it.
+        0xCF,
+        0x07,
+    ];
+    let file = tiff_strip(
+        8,
+        4,
+        &strip,
+        &[
+            (258, 3, short(4)),
+            (259, 3, short(32809)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+        ],
+    );
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height, p.channels), (8, 4, Channels::Luma));
+    let want: Vec<u8> = [
+        3, 3, 3, 3, 4, 3, 5, 4, 0, 1, 2, 3, 4, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0,
+    ]
+    .into_iter()
+    .chain([15; 8])
+    .map(|v| v * 17)
+    .collect();
+    assert_eq!(p.samples, Samples::U8(want));
+}
+
+/// A 2x16 grey image in one LZW tile of 16x16. The decoder reads a row's two
+/// bytes, then its 14 of padding, and with this data `weezl` (0.1.10 as well
+/// as 0.1.12) gives 226 of the 256 bytes and stops: the hash is of what
+/// ClamAV's reading gives, none; the viewer's block-wise reading is whole.
+#[test]
+fn an_lzw_tile_that_weezl_ends_short_is_read_whole_for_the_viewer() {
+    let mut x = 27u32.wrapping_mul(2654435761).wrapping_add(12345);
+    let mut tile = Vec::new();
+    let mut pixels = Vec::new();
+    for _ in 0..16 {
+        for column in 0..16 {
+            x = x.wrapping_mul(1103515245).wrapping_add(12345);
+            let value = if column < 2 {
+                (x >> 16) as u8 & 0x3f
+            } else {
+                0
+            };
+            tile.push(value);
+            if column < 2 {
+                pixels.push(value);
+            }
+        }
+    }
+    let strip = weezl::encode::Encoder::with_tiff_size_switch(weezl::BitOrder::Msb, 8)
+        .encode(&tile)
+        .unwrap();
+    // The one tile, at 8; then the directory.
+    let mut file = b"II*\0".to_vec();
+    file.extend_from_slice(&(8 + strip.len() as u32).to_le_bytes());
+    file.extend_from_slice(&strip);
+    let entries: [(u16, u16, u32); 10] = [
+        (256, 3, 2),
+        (257, 3, 16),
+        (258, 3, 8),
+        (259, 3, 5),
+        (262, 3, 1),
+        (277, 3, 1),
+        (322, 3, 16),
+        (323, 3, 16),
+        (324, 4, 8),
+        (325, 4, strip.len() as u32),
+    ];
+    file.extend_from_slice(&(entries.len() as u16).to_le_bytes());
+    for (tag, kind, value) in entries {
+        file.extend_from_slice(&tag.to_le_bytes());
+        file.extend_from_slice(&kind.to_le_bytes());
+        file.extend_from_slice(&1u32.to_le_bytes());
+        file.extend_from_slice(&value.to_le_bytes());
+    }
+    file.extend_from_slice(&0u32.to_le_bytes());
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (2, 16));
+    assert_eq!(p.samples, Samples::U8(pixels));
+}
+
+/// A 20x20 grey image in LZW tiles of 16x16, four of them, the last three
+/// partly outside the image: the decoder reads the data of a row of such a
+/// tile and skips the padding, and at the end of a stream asked for more than
+/// the decoder had taken the end code of, `weezl` said `NoProgress` with two
+/// bytes of output, which the reader asserted against.
+#[test]
+fn lzw_tiles_that_overhang_the_image_decode_whole() {
+    watch_panics();
+    let pixel = |x: usize, y: usize| ((x * 37) ^ (y * 91)).wrapping_add(x * y) as u8;
+    let mut tiles = Vec::new();
+    for (tx, ty) in [(0, 0), (1, 0), (0, 1), (1, 1)] {
+        let mut data = Vec::new();
+        for y in 0..16 {
+            for x in 0..16 {
+                let (px, py) = (tx * 16 + x, ty * 16 + y);
+                data.push(if px < 20 && py < 20 { pixel(px, py) } else { 0 });
+            }
+        }
+        tiles.push(
+            weezl::encode::Encoder::with_tiff_size_switch(weezl::BitOrder::Msb, 8)
+                .encode(&data)
+                .unwrap(),
+        );
+    }
+    let mut file = b"II*\0\0\0\0\0".to_vec();
+    let (mut offsets, mut counts) = (Vec::new(), Vec::new());
+    for t in &tiles {
+        offsets.extend_from_slice(&(file.len() as u32).to_le_bytes());
+        counts.extend_from_slice(&(t.len() as u32).to_le_bytes());
+        file.extend_from_slice(t);
+        file.resize(file.len().next_multiple_of(2), 0);
+    }
+    let (offsets_at, counts_at) = (file.len() as u32, file.len() as u32 + 16);
+    file.extend_from_slice(&offsets);
+    file.extend_from_slice(&counts);
+    let ifd = file.len() as u32;
+    file[4..8].copy_from_slice(&ifd.to_le_bytes());
+    let entries: [(u16, u16, u32, u32); 10] = [
+        (256, 3, 1, 20),
+        (257, 3, 1, 20),
+        (258, 3, 1, 8),
+        (259, 3, 1, 5),
+        (262, 3, 1, 1),
+        (277, 3, 1, 1),
+        (322, 3, 1, 16),
+        (323, 3, 1, 16),
+        (324, 4, 4, offsets_at),
+        (325, 4, 4, counts_at),
+    ];
+    file.extend_from_slice(&(entries.len() as u16).to_le_bytes());
+    for (tag, kind, count, value) in entries {
+        file.extend_from_slice(&tag.to_le_bytes());
+        file.extend_from_slice(&kind.to_le_bytes());
+        file.extend_from_slice(&count.to_le_bytes());
+        file.extend_from_slice(&value.to_le_bytes());
+    }
+    file.extend_from_slice(&0u32.to_le_bytes());
+    let p = decode(&file, Format::Tiff, DECODE_MAX).unwrap();
+    let want: Vec<u8> = (0..20)
+        .flat_map(|y| (0..20).map(move |x| pixel(x, y)))
+        .collect();
+    assert_eq!(p.samples, Samples::U8(want));
+    assert!(!panicked());
+}
+
 /// A tile 4,294,967,295 wide on an image one pixel wide, floating point, with
 /// the floating point predictor: the decoder sets a buffer aside for one row of
 /// the tile, 51 GB, before it reads anything. It is over the limit asked for,
@@ -325,3 +1162,1131 @@ fn tiff_tags_at_the_ends_of_their_ranges_are_errors_not_panics() {
         assert!(!panicked(), "{what} panicked the decoder");
     }
 }
+
+/// A TIFF of one uncompressed strip: `entries` are `(tag, type, values)` with
+/// the values written out of line after the strip.
+fn tiff_strip(width: u32, height: u32, strip: &[u8], entries: &[(u16, u16, Vec<u8>)]) -> Vec<u8> {
+    tiff_strips(width, height, &[strip], entries)
+}
+
+/// [`tiff_strip`] of several strips of `height` rows each (a planar image has
+/// one per band).
+fn tiff_strips(
+    width: u32,
+    height: u32,
+    strips: &[&[u8]],
+    entries: &[(u16, u16, Vec<u8>)],
+) -> Vec<u8> {
+    let long = |v: Vec<u32>| v.iter().flat_map(|x| x.to_le_bytes()).collect::<Vec<u8>>();
+    let mut at = 8u32;
+    let mut offsets = Vec::new();
+    for s in strips {
+        offsets.push(at);
+        at += s.len() as u32;
+    }
+    let mut all: Vec<(u16, u16, Vec<u8>)> = vec![
+        (256, 4, width.to_le_bytes().to_vec()),
+        (257, 4, height.to_le_bytes().to_vec()),
+        (259, 3, 1u16.to_le_bytes().to_vec()),
+        (273, 4, long(offsets)),
+        (278, 4, height.to_le_bytes().to_vec()),
+        (
+            279,
+            4,
+            long(strips.iter().map(|s| s.len() as u32).collect()),
+        ),
+    ];
+    // An entry given replaces the default of its tag.
+    all.retain(|e| !entries.iter().any(|g| g.0 == e.0));
+    all.extend(entries.iter().cloned());
+    all.sort_by_key(|e| e.0);
+    let mut out = b"II*\0".to_vec();
+    out.extend_from_slice(&0u32.to_le_bytes());
+    for s in strips {
+        out.extend_from_slice(s);
+    }
+    let mut blobs = Vec::new();
+    let mut table = Vec::new();
+    let blob_base = at as usize;
+    let entry_count = all.len() as u16;
+    for (tag, kind, bytes) in &all {
+        let size = match kind {
+            3 => 2,
+            4 => 4,
+            _ => 1,
+        };
+        let count = (bytes.len() / size) as u32;
+        table.extend_from_slice(&tag.to_le_bytes());
+        table.extend_from_slice(&kind.to_le_bytes());
+        table.extend_from_slice(&count.to_le_bytes());
+        if bytes.len() <= 4 {
+            let mut v = bytes.clone();
+            v.resize(4, 0);
+            table.extend_from_slice(&v);
+        } else {
+            table.extend_from_slice(&((blob_base + blobs.len()) as u32).to_le_bytes());
+            blobs.extend_from_slice(bytes);
+            if blobs.len() % 2 == 1 {
+                blobs.push(0);
+            }
+        }
+    }
+    out.extend_from_slice(&blobs);
+    let ifd_at = out.len() as u32;
+    out[4..8].copy_from_slice(&ifd_at.to_le_bytes());
+    out.extend_from_slice(&entry_count.to_le_bytes());
+    // The entries must be in tag order.
+    let mut rows: Vec<&[u8]> = table.chunks(12).collect();
+    rows.sort_by_key(|r| u16::from_le_bytes([r[0], r[1]]));
+    for r in rows {
+        out.extend_from_slice(r);
+    }
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out
+}
+
+fn short(v: u16) -> Vec<u8> {
+    v.to_le_bytes().to_vec()
+}
+
+/// No value is a number, so no range is worked out from them.
+#[test]
+fn a_float_tiff_of_nothing_but_nan_is_drawn_black() {
+    let strip: Vec<u8> = [f32::NAN; 4].iter().flat_map(|v| v.to_le_bytes()).collect();
+    let file = tiff_strip(
+        4,
+        1,
+        &strip,
+        &[
+            (258, 3, short(32)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+            (339, 3, short(3)),
+        ],
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    let Samples::U8(v) = p.samples else { panic!() };
+    assert_eq!(v, [0, 0, 0, 0]);
+}
+
+/// What the hashing decoder refuses, `decode_any` draws for the eye.
+#[test]
+fn tiffs_of_floats_signed_values_and_palettes_are_shown() {
+    // 32-bit floats: the 99.5th percentile and up is white.
+    let strip: Vec<u8> = [0.0f32, 100.0, 200.0, 300.0]
+        .iter()
+        .flat_map(|v| v.to_le_bytes())
+        .collect();
+    let file = tiff_strip(
+        4,
+        1,
+        &strip,
+        &[
+            (258, 3, short(32)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+            (339, 3, short(3)),
+        ],
+    );
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Luma);
+    let Samples::U8(v) = p.samples else { panic!() };
+    assert_eq!((v[0], v[2], v[3]), (0, 255, 255));
+    assert!(v[1] > 100 && v[1] < 150, "{v:?}");
+
+    // Signed 16-bit with a nodata value, which is neither the lowest nor
+    // counted in the range.
+    let strip: Vec<u8> = [-9999i16, 10, 20, 30, 40]
+        .iter()
+        .flat_map(|v| v.to_le_bytes())
+        .collect();
+    let file = tiff_strip(
+        5,
+        1,
+        &strip,
+        &[
+            (258, 3, short(16)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+            (339, 3, short(2)),
+            (42113, 2, b"-9999\0".to_vec()),
+        ],
+    );
+    let Samples::U8(v) = decode_any(&file, DECODE_MAX).unwrap().samples else {
+        panic!()
+    };
+    assert_eq!(v, [0, 0, 128, 255, 255]);
+
+    // A palette of 8 bits, and one of 4 bits, packed.
+    let map = |n: usize| -> Vec<u8> {
+        let mut m = Vec::new();
+        for channel in 0..3usize {
+            for i in 0..n {
+                m.extend(((i * (channel + 1) * 257) as u16).to_le_bytes());
+            }
+        }
+        m
+    };
+    let eight = tiff_strip(
+        3,
+        1,
+        &[0, 1, 2],
+        &[
+            (258, 3, short(8)),
+            (262, 3, short(3)),
+            (277, 3, short(1)),
+            (320, 3, map(256)),
+        ],
+    );
+    let four = tiff_strip(
+        3,
+        1,
+        &[0x01, 0x20],
+        &[
+            (258, 3, short(4)),
+            (262, 3, short(3)),
+            (277, 3, short(1)),
+            (320, 3, map(16)),
+        ],
+    );
+    for file in [eight, four] {
+        assert_eq!(
+            decode(&file, Format::Tiff, DECODE_MAX),
+            Err(Error::Undecodable)
+        );
+        let p = decode_any(&file, DECODE_MAX).unwrap();
+        assert_eq!(p.channels, Channels::Rgb);
+        let Samples::U8(v) = p.samples else { panic!() };
+        // Entry i is (i, 2i, 3i) in the high bytes of the 16-bit map.
+        assert_eq!(v, [0, 0, 0, 1, 2, 3, 2, 4, 6]);
+    }
+
+    // One plane of a planar file.
+    let file = tiff_strip(
+        2,
+        2,
+        &[1, 2, 3, 4],
+        &[
+            (258, 3, short(8)),
+            (262, 3, short(1)),
+            (277, 3, short(1)),
+            (284, 3, short(2)),
+        ],
+    );
+    assert_eq!(
+        decode(&file, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let Samples::U8(v) = decode_any(&file, DECODE_MAX).unwrap().samples else {
+        panic!()
+    };
+    assert_eq!(v, [1, 2, 3, 4]);
+
+    // Grey of 4 bits and of 2 bits, black or white first.
+    for (bits, packed, want) in [
+        (4u16, [0x0F, 0x48], [0, 255, 68, 136]),
+        (2, [0b0011_0110, 0], [0, 255, 85, 170]),
+    ] {
+        let file = tiff_strip(
+            4,
+            1,
+            &packed,
+            &[
+                (258, 3, short(bits)),
+                (262, 3, short(1)),
+                (277, 3, short(1)),
+            ],
+        );
+        let Samples::U8(v) = decode_any(&file, DECODE_MAX).unwrap().samples else {
+            panic!()
+        };
+        assert_eq!(v, want, "{bits} bits");
+        let inverted = tiff_strip(
+            4,
+            1,
+            &packed,
+            &[
+                (258, 3, short(bits)),
+                (262, 3, short(0)),
+                (277, 3, short(1)),
+            ],
+        );
+        let Samples::U8(v) = decode_any(&inverted, DECODE_MAX).unwrap().samples else {
+            panic!()
+        };
+        assert_eq!(v, want.map(|w| 255 - w), "{bits} bits, white first");
+    }
+
+    // Damage is still damage.
+    assert!(decode_any(&file[..file.len() / 2], DECODE_MAX).is_err());
+}
+
+/// A DDS header (and the DX10 one when `dxgi` is given) before `body`.
+#[cfg(feature = "dds")]
+fn dds(width: u32, height: u32, pixel_format: [u32; 8], dxgi: Option<u32>, body: &[u8]) -> Vec<u8> {
+    let mut out = b"DDS ".to_vec();
+    let mut header = [0u32; 31];
+    header[0] = 124;
+    header[1] = 0x1007;
+    header[2] = height;
+    header[3] = width;
+    header[18..26].copy_from_slice(&pixel_format);
+    header[26] = 0x1000;
+    for v in header {
+        out.extend_from_slice(&v.to_le_bytes());
+    }
+    if let Some(f) = dxgi {
+        for v in [f, 3, 0, 1, 0] {
+            out.extend_from_slice(&v.to_le_bytes());
+        }
+    }
+    out.extend_from_slice(body);
+    out
+}
+
+#[cfg(feature = "dds")]
+fn four_cc(c: &[u8; 4]) -> [u32; 8] {
+    [32, 4, u32::from_le_bytes(*c), 0, 0, 0, 0, 0]
+}
+
+/// What `image` does not read of DDS, `decode_any` draws.
+#[cfg(feature = "dds")]
+#[test]
+fn dds_of_other_blocks_sizes_and_layouts_is_shown() {
+    let u8s = |p: Pixels| match p.samples {
+        Samples::U8(v) => v,
+        _ => panic!("not bytes"),
+    };
+    // BC1 of a size that is not a multiple of 4: a red block, cropped to 5x3.
+    let red = [0x00, 0xf8, 0x00, 0xf8, 0, 0, 0, 0];
+    let file = dds(5, 3, four_cc(b"DXT1"), None, &[red, red, red, red].concat());
+    assert_eq!(
+        decode(&file, Format::Dds, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (5, 3));
+    let v = u8s(p);
+    assert_eq!(v.len(), 5 * 3 * 4);
+    assert!(v.chunks(4).all(|px| px == [255, 0, 0, 255]), "{v:?}");
+
+    // BC4: 200 as a grey, through the DX10 header (80, BC4_UNORM).
+    let bc4 = [200, 200, 0, 0, 0, 0, 0, 0];
+    let v = u8s(decode_any(&dds(4, 4, four_cc(b"DX10"), Some(80), &bc4), DECODE_MAX).unwrap());
+    assert!(v.chunks(4).all(|px| px == [200, 200, 200, 255]), "{v:?}");
+
+    // A normal map in BC5: x and y as stored, z worked out (flat is 128, 128, 255).
+    let bc5 = [128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0];
+    let v = u8s(decode_any(&dds(4, 4, four_cc(b"ATI2"), None, &bc5), DECODE_MAX).unwrap());
+    assert_eq!(&v[..4], [128, 128, 255, 255]);
+
+    // 16-bit 5:6:5, by its masks.
+    let masks = [32, 0x40, 0, 16, 0xf800, 0x7e0, 0x1f, 0];
+    let body: Vec<u8> = [0xf800u16, 0x07e0, 0x001f, 0xffff]
+        .iter()
+        .flat_map(|v| v.to_le_bytes())
+        .collect();
+    let v = u8s(decode_any(&dds(2, 2, masks, None, &body), DECODE_MAX).unwrap());
+    assert_eq!(
+        v,
+        [
+            255, 0, 0, 255, 0, 255, 0, 255, 0, 0, 255, 255, 255, 255, 255, 255
+        ]
+    );
+
+    // A luminance of 8 bits.
+    let lum = [32, 0x2_0000, 0, 8, 0xff, 0, 0, 0];
+    let v = u8s(decode_any(&dds(2, 1, lum, None, &[10, 250]), DECODE_MAX).unwrap());
+    assert_eq!(v, [10, 10, 10, 255, 250, 250, 250, 255]);
+
+    // Half floats, four to a pixel (DXGI 10).
+    let one = 0x3c00u16.to_le_bytes();
+    let body = [one, [0, 0], [0, 0], one].concat();
+    let p = decode_any(&dds(1, 1, four_cc(b"DX10"), Some(10), &body), DECODE_MAX).unwrap();
+    assert_eq!(p.samples, Samples::F32(vec![1.0, 0.0, 0.0, 1.0]));
+
+    // A typeless BC1 (DXGI 70) is read as BC1.
+    let typeless = dds(
+        5,
+        3,
+        four_cc(b"DX10"),
+        Some(70),
+        &[red, red, red, red].concat(),
+    );
+    let v = u8s(decode_any(&typeless, DECODE_MAX).unwrap());
+    assert!(v.chunks(4).all(|px| px == [255, 0, 0, 255]), "{v:?}");
+
+    // An 8-bit palette of RGBA entries.
+    let mut body = vec![0u8; 1024];
+    body[4..8].copy_from_slice(&[9, 8, 7, 255]);
+    body[8..12].copy_from_slice(&[1, 2, 3, 128]);
+    body.extend_from_slice(&[1, 2]);
+    let v = u8s(decode_any(
+        &dds(2, 1, [32, 0x20, 0, 8, 0, 0, 0, 0], None, &body),
+        DECODE_MAX,
+    )
+    .unwrap());
+    assert_eq!(v, [9, 8, 7, 255, 1, 2, 3, 128]);
+
+    // Too short a body is damage, and the hash path still refuses the same files.
+    assert!(decode_any(&file[..file.len() - 20], DECODE_MAX).is_err());
+}
+
+/// BC1 keeps one index of a block for "no colour" when its first colour is not
+/// above its second: `image` draws it black and opaque (leaves of a tree
+/// cut out of the picture), `decode_any` leaves it transparent.
+#[cfg(feature = "dds")]
+#[test]
+fn a_dxt1_texture_with_transparent_texels_is_shown_with_them() {
+    let block = [0x00, 0x00, 0x00, 0xf8, 0x57, 0x55, 0x55, 0x55];
+    let file = dds(4, 4, four_cc(b"DXT1"), None, &block);
+    let hashed = decode(&file, Format::Dds, DECODE_MAX).unwrap().to_rgba8();
+    assert_eq!(hashed[3], 255);
+    let shown = decode_any(&file, DECODE_MAX).unwrap().to_rgba8();
+    assert_eq!(shown[..4], [0, 0, 0, 0]);
+    assert_eq!(shown[4..8], [255, 0, 0, 255]);
+}
+
+/// A PNG that is not 32-bit inside an ICO is what `image` refuses; the
+/// viewer takes the PNG as it is.
+#[cfg(feature = "ico")]
+#[test]
+fn an_ico_with_a_png_that_is_not_32_bit_is_shown() {
+    let inner = png(
+        2,
+        2,
+        png::ColorType::Grayscale,
+        png::BitDepth::Eight,
+        &[0, 80, 160, 255],
+    );
+    let mut file = vec![0, 0, 1, 0, 1, 0, 2, 2, 0, 0, 1, 0, 32, 0];
+    file.extend_from_slice(&(inner.len() as u32).to_le_bytes());
+    file.extend_from_slice(&22u32.to_le_bytes());
+    file.extend_from_slice(&inner);
+    assert_eq!(
+        decode(&file, Format::Ico, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    let p = decode_any(&file, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (2, 2));
+    assert_eq!(p.to_rgba8()[4..8], [80, 80, 80, 255]);
+}
+
+/// Photoshop writes CMYK with spot or alpha channels after the four inks.
+#[test]
+fn a_cmyk_tiff_with_extra_channels_is_shown_by_its_inks() {
+    let eight = |n: usize| (258, 3, [8, 0].repeat(n));
+    let rgb = |file: &[u8]| {
+        let p = decode_any(file, DECODE_MAX).unwrap();
+        assert_eq!(p.channels, Channels::Rgb);
+        let Samples::U8(v) = p.samples else { panic!() };
+        v
+    };
+    let entries = |planar: bool| {
+        vec![
+            eight(6),
+            (262, 3, short(5)),
+            (277, 3, short(6)),
+            (284, 3, short(if planar { 2 } else { 1 })),
+        ]
+    };
+    let chunky = tiff_strip(
+        2,
+        1,
+        &[0, 0, 0, 0, 7, 9, 100, 0, 0, 50, 7, 9],
+        &entries(false),
+    );
+    assert_eq!(rgb(&chunky), [255, 255, 255, 124, 205, 205]);
+    let planar = tiff_strips(
+        2,
+        1,
+        &[&[0, 100], &[0, 0], &[0, 0], &[0, 50], &[7, 7], &[9, 9]],
+        &entries(true),
+    );
+    assert_eq!(rgb(&planar), [255, 255, 255, 124, 205, 205]);
+}
+
+/// Planar colour, CMYK and YCbCr, which the hashing decoder refuses or
+/// leaves unconverted.
+#[test]
+fn tiffs_of_planar_cmyk_and_ycbcr_are_shown() {
+    let eight = |n: usize| (258, 3, [8, 0].repeat(n));
+    let rgb = |file: &[u8]| {
+        let p = decode_any(file, DECODE_MAX).unwrap();
+        assert_eq!(p.channels, Channels::Rgb);
+        let Samples::U8(v) = p.samples else { panic!() };
+        v
+    };
+
+    // Planar RGB: a strip for each band.
+    let planar = tiff_strips(
+        2,
+        1,
+        &[&[10, 20], &[30, 40], &[50, 60]],
+        &[
+            eight(3),
+            (262, 3, short(2)),
+            (277, 3, short(3)),
+            (284, 3, short(2)),
+        ],
+    );
+    assert_eq!(
+        decode(&planar, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    assert_eq!(rgb(&planar), [10, 30, 50, 20, 40, 60]);
+
+    // Planar CMYK: no ink is white.
+    let cmyk = tiff_strips(
+        2,
+        1,
+        &[&[0, 100], &[0, 0], &[0, 0], &[0, 50]],
+        &[
+            eight(4),
+            (262, 3, short(5)),
+            (277, 3, short(4)),
+            (284, 3, short(2)),
+        ],
+    );
+    assert_eq!(rgb(&cmyk), [255, 255, 255, 124, 205, 205]);
+
+    // YCbCr with no subsampling: Y 100, Cb 128, Cr 200 is (200, 49, 100).
+    let ycc = tiff_strip(
+        1,
+        1,
+        &[100, 128, 200],
+        &[
+            eight(3),
+            (262, 3, short(6)),
+            (277, 3, short(3)),
+            (
+                530,
+                3,
+                [1u16, 1].iter().flat_map(|v| v.to_le_bytes()).collect(),
+            ),
+        ],
+    );
+    assert_eq!(rgb(&ycc), [200, 49, 100]);
+}
+
+/// A `#` line after the maximum value, or among a plain file's samples, is
+/// what `image` refuses.
+#[cfg(feature = "pnm")]
+#[test]
+fn pnm_with_comments_in_odd_places_is_shown() {
+    let rgba = |file: &[u8]| decode_any(file, DECODE_MAX).unwrap().to_rgba8();
+    for (name, file) in [
+        (
+            "after the maximum value",
+            &b"P3\n1 1\n255\n# c\n1 2 3\n"[..],
+        ),
+        ("among the samples", b"P3\n1 1\n255\n1 2 # c\n3\n"),
+    ] {
+        assert_eq!(
+            decode(file, Format::Pnm, DECODE_MAX),
+            Err(Error::Undecodable),
+            "{name}"
+        );
+        assert_eq!(rgba(file), [1, 2, 3, 255], "{name}");
+    }
+    // A raw file keeps its bytes, '#' or not: the header ends at one blank.
+    let raw = b"P6\n1 1\n# c\n255\n#\x02\x03";
+    assert_eq!(rgba(raw), [b'#', 2, 3, 255]);
+}
+
+/// Bytes from a string of 0 and 1, the last byte padded with 0.
+#[cfg(feature = "ccitt")]
+fn bits(s: &str) -> Vec<u8> {
+    s.as_bytes()
+        .chunks(8)
+        .map(|c| c.iter().fold(0u8, |v, b| v << 1 | (b - b'0')) << (8 - c.len()))
+        .collect()
+}
+
+/// CCITT fax: Group 3 one-dimensional (compression 2) and Group 4 with a fill
+/// order of 2, which the hashing decoder does not read.
+#[cfg(feature = "ccitt")]
+#[test]
+fn tiffs_of_ccitt_fax_are_shown() {
+    let grey = |file: &[u8]| {
+        let Samples::U8(v) = decode_any(file, DECODE_MAX).unwrap().samples else {
+            panic!()
+        };
+        v
+    };
+    let fax = |compression: u16, photometric: u16, fill_order: u16, data: &[u8]| {
+        tiff_strip(
+            8,
+            1,
+            data,
+            &[
+                (258, 3, short(1)),
+                (259, 3, short(compression)),
+                (262, 3, short(photometric)),
+                (266, 3, short(fill_order)),
+                (277, 3, short(1)),
+            ],
+        )
+    };
+    // A row of 4 white pixels, then 4 black: runs of 4 are 1011 and 011.
+    let half = [255, 255, 255, 255, 0, 0, 0, 0];
+    let rle = fax(2, 0, 1, &bits("1011011"));
+    assert_eq!(
+        decode(&rle, Format::Tiff, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+    assert_eq!(grey(&rle), half);
+    // A white run is a 0 bit: with 1 as black, the picture is the other way.
+    assert_eq!(
+        grey(&fax(2, 1, 1, &bits("1011011"))),
+        [0, 0, 0, 0, 255, 255, 255, 255]
+    );
+    // Group 4: horizontal mode (001) with the same two runs, then the end of
+    // the block; each byte written with its bits reversed for a fill order of 2.
+    let g4: Vec<u8> = bits("0011011011000000000001000000000001")
+        .iter()
+        .map(|b| b.reverse_bits())
+        .collect();
+    let file = fax(4, 0, 2, &g4);
+    // The hashing decoder reads the bytes as they are, and gets a white row.
+    let Samples::U8(hashed) = decode(&file, Format::Tiff, DECODE_MAX).unwrap().samples else {
+        panic!()
+    };
+    assert_ne!(hashed, half);
+    assert_eq!(grey(&file), half);
+}
+
+/// Found by the `imagehash` fuzz target: values of 3, 5, 6 and 7 bits run
+/// into the next byte, which the unpacking did not allow for (it subtracted
+/// below zero).
+#[test]
+fn tiffs_of_samples_that_run_into_the_next_byte_are_shown() {
+    let grey = |p: Pixels| {
+        let Samples::U8(v) = p.samples else { panic!() };
+        v
+    };
+    // 3 bits: 0 to 7, as 000 001 010 011 100 101 110 111.
+    let three = tiff_strip(
+        8,
+        1,
+        &[0b0000_0101, 0b0011_1001, 0b0111_0111],
+        &[(258, 3, short(3)), (262, 3, short(1)), (277, 3, short(1))],
+    );
+    assert_eq!(
+        grey(decode_any(&three, DECODE_MAX).unwrap()),
+        [0, 36, 72, 109, 145, 182, 218, 255]
+    );
+    // 5 bits, 3 of them: 31, 0, 17 as 11111 00000 10001, then a pad bit.
+    let five = tiff_strip(
+        3,
+        1,
+        &[0b1111_1000, 0b0010_0010],
+        &[(258, 3, short(5)), (262, 3, short(1)), (277, 3, short(1))],
+    );
+    assert_eq!(grey(decode_any(&five, DECODE_MAX).unwrap()), [255, 0, 139]);
+}
+
+/// A fill order of 2 has the bits of each byte in reverse order (libtiff
+/// reads it so); the hashing decoder ignores it.
+#[test]
+fn tiffs_of_samples_low_bit_first_are_shown_in_order() {
+    let grey = |p: Pixels| {
+        let Samples::U8(v) = p.samples else { panic!() };
+        v
+    };
+    // 1 bit: the first of 8 pixels is white, written as bit 0.
+    let one = tiff_strip(
+        8,
+        1,
+        &[0x01],
+        &[
+            (258, 3, short(1)),
+            (262, 3, short(1)),
+            (266, 3, short(2)),
+            (277, 3, short(1)),
+        ],
+    );
+    let hashed = grey(decode(&one, Format::Tiff, DECODE_MAX).unwrap());
+    assert_eq!(hashed[7], 255);
+    assert_eq!(
+        grey(decode_any(&one, DECODE_MAX).unwrap()),
+        [255, 0, 0, 0, 0, 0, 0, 0]
+    );
+    // 2 bits: 0, 1, 2, 3 as 0b00_01_10_11 with the bits of the byte reversed.
+    let two = tiff_strip(
+        4,
+        1,
+        &[0b1101_1000],
+        &[
+            (258, 3, short(2)),
+            (262, 3, short(1)),
+            (266, 3, short(2)),
+            (277, 3, short(1)),
+        ],
+    );
+    assert_eq!(
+        grey(decode_any(&two, DECODE_MAX).unwrap()),
+        [0, 85, 170, 255]
+    );
+}
+
+/// A BMP of 2x2 pixels, 24-bit, with a header of `header` bytes, `planes`
+/// planes and this height.
+fn bmp_of_two_by_two(header: u32, planes: u16, height: i32) -> Vec<u8> {
+    let mut f = b"BM".to_vec();
+    f.extend_from_slice(&(14 + header + 16).to_le_bytes());
+    f.extend_from_slice(&[0; 4]);
+    f.extend_from_slice(&(14 + header).to_le_bytes());
+    f.extend_from_slice(&header.to_le_bytes());
+    f.extend_from_slice(&2u32.to_le_bytes());
+    f.extend_from_slice(&height.to_le_bytes());
+    f.extend_from_slice(&planes.to_le_bytes());
+    f.extend_from_slice(&24u16.to_le_bytes());
+    f.resize(14 + header as usize, 0);
+    // Rows as they come: pixels B, G, R, padded to 8 bytes.
+    f.extend_from_slice(&[1, 2, 3, 4, 5, 6, 0, 0, 7, 8, 9, 10, 11, 12, 0, 0]);
+    f
+}
+
+/// What `image` refuses of BMP: the header of OS/2 2.x, a plane count that is
+/// not 1.
+#[test]
+fn bmps_with_an_os2_header_or_other_planes_are_shown() {
+    let rgb = |file: &[u8]| {
+        let rgba = decode_any(file, DECODE_MAX).unwrap().to_rgba8();
+        rgba.chunks(4)
+            .flat_map(|p| p[..3].to_vec())
+            .collect::<Vec<_>>()
+    };
+    // Bottom row first: (3, 2, 1), (6, 5, 4); then (9, 8, 7), (12, 11, 10).
+    let rows = [9, 8, 7, 12, 11, 10, 3, 2, 1, 6, 5, 4];
+    assert_eq!(rgb(&bmp_of_two_by_two(40, 1, 2)), rows);
+    for (name, file) in [
+        ("an OS/2 header", bmp_of_two_by_two(64, 1, 2)),
+        ("planes", bmp_of_two_by_two(40, 0, 2)),
+    ] {
+        assert_eq!(
+            decode(&file, Format::Bmp, DECODE_MAX),
+            Err(Error::Undecodable),
+            "{name}"
+        );
+        assert_eq!(rgb(&file), rows, "{name}");
+    }
+}
+
+/// RLE rows stored top-down (a negative height, which the format does not
+/// allow with compression) are what `image` refuses.
+#[test]
+fn a_top_down_rle_bmp_is_shown_the_right_way_up() {
+    let rle: &[u8] = &[2, 0, 0, 0, 2, 1, 0, 0, 0, 1];
+    let mut f = b"BM".to_vec();
+    f.extend_from_slice(&(14 + 40 + 8 + rle.len() as u32).to_le_bytes());
+    f.extend_from_slice(&[0; 4]);
+    f.extend_from_slice(&(14u32 + 40 + 8).to_le_bytes());
+    f.extend_from_slice(&40u32.to_le_bytes());
+    f.extend_from_slice(&2u32.to_le_bytes());
+    f.extend_from_slice(&(-2i32).to_le_bytes());
+    f.extend_from_slice(&[1, 0, 8, 0]);
+    f.extend_from_slice(&1u32.to_le_bytes());
+    f.extend_from_slice(&(rle.len() as u32).to_le_bytes());
+    f.extend_from_slice(&[0; 8]);
+    f.extend_from_slice(&2u32.to_le_bytes());
+    f.extend_from_slice(&2u32.to_le_bytes());
+    // Black and white.
+    f.extend_from_slice(&[0, 0, 0, 0, 255, 255, 255, 0]);
+    f.extend_from_slice(rle);
+    assert_eq!(decode(&f, Format::Bmp, DECODE_MAX), Err(Error::Undecodable));
+    let rgba = decode_any(&f, DECODE_MAX).unwrap().to_rgba8();
+    // The first row of the file is the top one: black, then white.
+    assert_eq!(rgba[..3], [0, 0, 0]);
+    assert_eq!(rgba[8..11], [255, 255, 255]);
+}
+
+/// An RLE8 stream that ends with a delta past the last row, which `image` calls
+/// corrupt and Windows and Pillow draw (Mozilla's `rle4-delta-320x240.bmp`
+/// ends so).
+#[test]
+fn an_rle_bmp_with_a_delta_past_the_end_is_shown() {
+    // One pixel of colour 1, a move of 2 right and 1 up, one of colour 2, and
+    // a move up again.
+    let rle: &[u8] = &[1, 1, 0, 2, 2, 1, 1, 2, 0, 2, 0, 1, 0, 1];
+    let mut f = b"BM".to_vec();
+    f.extend_from_slice(&(14 + 40 + 12 + rle.len() as u32).to_le_bytes());
+    f.extend_from_slice(&[0; 4]);
+    f.extend_from_slice(&(14u32 + 40 + 12).to_le_bytes());
+    f.extend_from_slice(&40u32.to_le_bytes());
+    f.extend_from_slice(&4u32.to_le_bytes());
+    f.extend_from_slice(&2u32.to_le_bytes());
+    f.extend_from_slice(&[1, 0, 8, 0]);
+    f.extend_from_slice(&1u32.to_le_bytes());
+    f.extend_from_slice(&(rle.len() as u32).to_le_bytes());
+    f.extend_from_slice(&[0; 8]);
+    f.extend_from_slice(&3u32.to_le_bytes());
+    f.extend_from_slice(&3u32.to_le_bytes());
+    // Black, white, red (blue first).
+    f.extend_from_slice(&[0, 0, 0, 0, 255, 255, 255, 0, 0, 0, 255, 0]);
+    f.extend_from_slice(rle);
+    assert_eq!(decode(&f, Format::Bmp, DECODE_MAX), Err(Error::Undecodable));
+    let p = decode_any(&f, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (4, 2));
+    let rgba = p.to_rgba8();
+    let px = |x: usize, y: usize| rgba[(y * 4 + x) * 4..(y * 4 + x) * 4 + 3].to_vec();
+    // The first row of the picture is the last of the file.
+    assert_eq!(px(3, 0), [255, 0, 0]);
+    assert_eq!(px(0, 0), [0, 0, 0]);
+    assert_eq!(px(0, 1), [255, 255, 255]);
+}
+
+/// A 2x2 32-bit icon image (a DIB with its AND mask), `mask` bytes of it
+/// kept, in a directory of one entry of the given type, entry size and
+/// length.
+#[cfg(feature = "ico")]
+fn icon_of_two_by_two(kind: u8, entry_side: u8, length: Option<u32>, mask: usize) -> Vec<u8> {
+    let mut dib = Vec::new();
+    for v in [40u32, 2, 4] {
+        dib.extend_from_slice(&v.to_le_bytes());
+    }
+    dib.extend_from_slice(&[1, 0, 32, 0]);
+    dib.extend_from_slice(&[0; 24]);
+    for p in 0..4u8 {
+        dib.extend_from_slice(&[10 * p, 20 * p, 30 * p, 255]);
+    }
+    dib.extend_from_slice(&[0; 8][..mask]);
+    let length = length.unwrap_or(dib.len() as u32);
+    let mut file = vec![
+        0, 0, kind, 0, 1, 0, entry_side, entry_side, 0, 0, 1, 0, 32, 0,
+    ];
+    file.extend_from_slice(&length.to_le_bytes());
+    file.extend_from_slice(&22u32.to_le_bytes());
+    file.extend_from_slice(&dib);
+    file
+}
+
+/// A 32-bit icon of 2x2 pixels in the file's order (the bottom row first)
+/// with these alphas, and the first bytes of the two rows of its AND mask.
+#[cfg(feature = "ico")]
+fn icon_of_alphas(alphas: [u8; 4], mask: [u8; 2]) -> Vec<u8> {
+    let mut dib = Vec::new();
+    for v in [40u32, 2, 4] {
+        dib.extend_from_slice(&v.to_le_bytes());
+    }
+    dib.extend_from_slice(&[1, 0, 32, 0]);
+    dib.extend_from_slice(&[0; 24]);
+    for a in alphas {
+        dib.extend_from_slice(&[10, 20, 30, a]);
+    }
+    dib.extend_from_slice(&[mask[0], 0, 0, 0, mask[1], 0, 0, 0]);
+    let mut file = vec![0, 0, 1, 0, 1, 0, 2, 2, 0, 0, 1, 0, 32, 0];
+    file.extend_from_slice(&(dib.len() as u32).to_le_bytes());
+    file.extend_from_slice(&22u32.to_le_bytes());
+    file.extend_from_slice(&dib);
+    file
+}
+
+/// An icon image whose header gives no bits to a pixel and a huge width and
+/// height is not given a mask buffer the size those say.
+#[cfg(feature = "ico")]
+#[test]
+fn an_icon_header_with_huge_sizes_and_no_bits_is_refused_cheaply() {
+    let mut dib = Vec::new();
+    for v in [40u32, 0x7FFF_FFFF, 0x7FFF_FFFE] {
+        dib.extend_from_slice(&v.to_le_bytes());
+    }
+    dib.extend_from_slice(&[1, 0, 0, 0]);
+    dib.resize(40 + 16, 0);
+    let mut file = vec![0, 0, 1, 0, 1, 0, 2, 2, 0, 0, 1, 0, 0, 0];
+    file.extend_from_slice(&(dib.len() as u32).to_le_bytes());
+    file.extend_from_slice(&22u32.to_le_bytes());
+    file.extend_from_slice(&dib);
+    assert!(decode_any(&file, DECODE_MAX).is_err());
+}
+
+/// Windows draws a 32-bit icon by its alpha and leaves its AND mask out, unless
+/// there is no alpha; `image` applies the mask over the alpha.
+#[cfg(feature = "ico")]
+#[test]
+fn a_32_bit_icon_is_drawn_by_its_alpha_or_else_by_its_mask() {
+    let alphas = |file: &[u8]| {
+        let rgba = decode_any(file, DECODE_MAX).unwrap().to_rgba8();
+        rgba.chunks(4).map(|p| p[3]).collect::<Vec<_>>()
+    };
+    // The mask covers the bottom row; its alpha stays, the soft pixel too.
+    assert_eq!(
+        alphas(&icon_of_alphas([255, 255, 128, 255], [0b1100_0000, 0])),
+        [128, 255, 255, 255]
+    );
+    // A count of colours in the header of a 32-bit image puts nothing before
+    // its pixels.
+    let mut junk = icon_of_alphas([255, 255, 128, 255], [0b1100_0000, 0]);
+    junk[22 + 32..22 + 36].copy_from_slice(&12345u32.to_le_bytes());
+    assert_eq!(alphas(&junk), [128, 255, 255, 255]);
+    // No alpha at all: the mask hides the second pixel of the bottom row.
+    assert_eq!(
+        alphas(&icon_of_alphas([0; 4], [0b0100_0000, 0])),
+        [255, 255, 255, 0]
+    );
+}
+
+/// A colour profile after the pixels of a V5 header is not the AND mask.
+#[cfg(feature = "ico")]
+#[test]
+fn the_colour_profile_of_a_v5_icon_image_is_not_read_as_its_mask() {
+    let mut dib = Vec::new();
+    for v in [124u32, 2, 4] {
+        dib.extend_from_slice(&v.to_le_bytes());
+    }
+    dib.extend_from_slice(&[1, 0, 24, 0]);
+    dib.extend_from_slice(&[0; 24]);
+    dib.resize(112, 0);
+    // The profile starts where the 16 bytes of 2x2 24-bit pixels end, and
+    // holds 16 bytes that would hide every pixel as a mask.
+    dib.extend_from_slice(&140u32.to_le_bytes());
+    dib.extend_from_slice(&16u32.to_le_bytes());
+    dib.resize(124, 0);
+    dib.extend_from_slice(&[10, 20, 30, 40, 50, 60, 0, 0, 10, 20, 30, 40, 50, 60, 0, 0]);
+    dib.extend_from_slice(&[0xFF; 16]);
+    let mut file = vec![0, 0, 1, 0, 1, 0, 2, 2, 0, 0, 1, 0, 24, 0];
+    file.extend_from_slice(&(dib.len() as u32).to_le_bytes());
+    file.extend_from_slice(&22u32.to_le_bytes());
+    file.extend_from_slice(&dib);
+    let rgba = decode_any(&file, DECODE_MAX).unwrap().to_rgba8();
+    assert_eq!(rgba.chunks(4).map(|p| p[3]).collect::<Vec<_>>(), [255; 4]);
+}
+
+/// Of the images of one size in an icon file, the one with most colour is
+/// shown, in whatever order the file lists them.
+#[cfg(feature = "ico")]
+#[test]
+fn the_icon_image_with_most_colour_is_shown() {
+    // A 2x2 DIB of one colour (B, G, R, A), then its AND mask.
+    let dib = |bgra: [u8; 4]| {
+        let mut d = Vec::new();
+        for v in [40u32, 2, 4] {
+            d.extend_from_slice(&v.to_le_bytes());
+        }
+        d.extend_from_slice(&[1, 0, 32, 0]);
+        d.extend_from_slice(&[0; 24]);
+        d.extend(bgra.repeat(4));
+        d.extend_from_slice(&[0; 8]);
+        d
+    };
+    let few = (8u8, dib([0, 0, 255, 255]));
+    let many = (32u8, dib([255, 0, 0, 255]));
+    for order in [[&few, &many], [&many, &few]] {
+        let mut file = vec![0, 0, 1, 0, 2, 0];
+        let mut at = 6 + 2 * 16;
+        for (bits, image) in order {
+            file.extend_from_slice(&[2, 2, 0, 0, 1, 0, *bits, 0]);
+            file.extend_from_slice(&(image.len() as u32).to_le_bytes());
+            file.extend_from_slice(&(at as u32).to_le_bytes());
+            at += image.len();
+        }
+        for (_, image) in order {
+            file.extend_from_slice(image);
+        }
+        assert_eq!(
+            decode_any(&file, DECODE_MAX).unwrap().to_rgba8()[..4],
+            [0, 0, 255, 255]
+        );
+    }
+}
+
+/// Cursors, and icons with a length too short, a size that is not the
+/// image's or a cut AND mask, are what `image` refuses.
+#[cfg(feature = "ico")]
+#[test]
+fn damaged_icons_and_cursors_are_shown() {
+    let whole = icon_of_two_by_two(1, 2, None, 8);
+    let p = decode_any(&whole, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (2, 2));
+    // The first pixel of the bottom row of the file is the top row's.
+    let first = p.to_rgba8()[..4].to_vec();
+    for (name, file) in [
+        ("a cursor", icon_of_two_by_two(2, 2, None, 8)),
+        ("a length too short", icon_of_two_by_two(1, 2, Some(10), 8)),
+        ("another size", icon_of_two_by_two(1, 4, None, 8)),
+        ("a cut mask", icon_of_two_by_two(1, 2, None, 4)),
+    ] {
+        let p = decode_any(&file, DECODE_MAX).unwrap_or_else(|e| panic!("{name}: {e:?}"));
+        assert_eq!((p.width, p.height), (2, 2), "{name}");
+        assert_eq!(p.to_rgba8()[..4], first[..], "{name}");
+    }
+}
+
+/// A bare JPEG 2000 codestream of 4x4 pixels, written by opj_compress from
+/// Y = 100, Cb = 128, Cr = 200 with the chroma subsampled 2x2: it has no
+/// colour box, and is YCbCr.
+#[cfg(feature = "jp2")]
+#[test]
+fn a_codestream_with_subsampled_chroma_is_ycbcr() {
+    let file = hex(
+        "ff4fff51002f000000000004000000040000000000000000000000040000000400000000000000000003\
+         070101070202070202ff52000c00000001000004040001ff5c00044040ff640025000143726561746564\
+         206279204f70656e4a5045472076657273696f6e20322e352e33ff90000a0000000000200001ff93c3e7\
+         0e1150548842e11f80cfb41001d78943ffd9",
+    );
+    let p = decode(&file, Format::Jpeg2000, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height), (4, 4));
+    assert_eq!(p.to_rgba8()[..4], [200, 49, 100, 255]);
+}
+
+/// Four 8-bit components under a greyscale colour box (what GDAL writes for a
+/// multi-band raster), made with opj_compress: not CMYK, the first is shown.
+#[cfg(feature = "jp2")]
+#[test]
+fn four_bands_under_a_greyscale_colour_box_show_the_first() {
+    let file = hex(
+        "0000000c6a5020200d0a870a00000014667479706a703220000000006a7032200000002d6a70326800\
+         0000166968647200000004000000040004070700000000000f636f6c720100000000001100\
+         0000c06a703263ff4fff510032000000000004000000040000000000000000000000040000000400\
+         000000000000000004070101070101070101070101ff52000c00000001000004040001ff5c000440\
+         40ff640025000143726561746564206279204f70656e4a5045472076657273696f6e20322e352e33\
+         ff90000a0000000000450001ff93cfb44010dbb0c37aa1c444397f4784cb71b77fcfb42414005\
+         15c0841816a08c3e70e1150548842e11fcfb42c1150495c084241e53e0c1fffd9",
+    );
+    let p = decode(&file, Format::Jpeg2000, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height, p.channels), (4, 4, Channels::Luma));
+    let Samples::U8(v) = p.samples else { panic!() };
+    assert_eq!(v[..4], [5, 15, 25, 35]);
+}
+
+/// A codestream of 776 bytes whose header gives tiles of 16 by 16 samples on a
+/// grid of 3,997,753 by 33: three quarters of a million tiles, where 16 bits
+/// name 65,535. The decoder worked through all of them (0.4 s here, and with
+/// tiles of two samples, minutes).
+#[cfg(feature = "jp2")]
+#[test]
+fn a_codestream_with_more_tiles_than_a_file_can_name_is_refused() {
+    let file = hex(
+        "ff4fff5100290000003d0039000000210000000000000000000000100000001000000000000000000001\
+         078202ff52000c00000001000204040001ff5c000a4040484850484850ff640025000143726561746564\
+         206279204f70656e4a5045472076657273696f6e20322e352e33ff90000a0000000000530001ff93df80\
+         300784051bfd7fc1f38583e70b00f8430cf56f9e7f0b80ff48470be7f3c0f904c0f904c07c8280221cdf\
+         ee8847529fb519be95fcdc789b50f71693b8a2768beb93b9bfff90000a0001000000520001ff93cfb414\
+         0fa88786b7c3ea0483e709ffd8ff0d01987b0b3afcbf0368c3c0f905c0f905407c824022161b4d4a7585\
+         5184a67f1edacf2ad385968304f3202ae04814a5c1269fff90000a0002000000670001ff93df803004e9\
+         1f0fa9e7cfc01a7e00d1f8028004c2f1d9cebf0c4438ef770b0b57902498cfc0423ed0f8fc038015fcd8\
+         48941b94868dc4c0fa2366b9b715fcf2a41807caa44106a5e2b3afdf06c1ed8a09f467872c1b741182e3\
+         ff90000a0003000000420001ff93cfb414078b7669c3c03a0c1f385807c210040f7d03ff7f0447c00055\
+         0001ff93cfb41808f838e7ad7fc1f38383e70901f2030cf64a0b80e9410d590fc1f38c81f20b80f905ad\
+         6d492a80000000b5fa8004ab754844aada945500005b00005faea0000aaa948957b552ab80000000b5fa\
+         940155552112b55524ad000000005fb6a1000955442556d5492b080100002dc0f904407c818011e5c01f\
+         a619cfae42f9a5fd730109bc266716ff90000a0008000000200001ff93c7d4060affffffffffffffffff\
+         ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\
+         ffffffffffffffffffffffffffffffffffffffffffffffffff19be95fcdc789b50f71693b8a2768beb93\
+         b9bfff90000a0001000000520001ff93cfb4140fa88786b7c3eaa2cfc01004b5ff7fc7da0c0b40a5f14f\
+         7fff90000a000a000000200001ef93c7d40606ab5fc1f3820b0bc1f3840f9b66d7ff90000a000b000000\
+         1b0001ff93cfb4080ab580c07c218008ff7fffd9",
+    );
+    assert_eq!(
+        decode(&file, Format::Jpeg2000, DECODE_MAX),
+        Err(Error::Undecodable)
+    );
+}
+
+/// The 18 bytes that start a Targa file: colour map type, image type, first
+/// map entry, map length and entry bits, size, depth and descriptor.
+#[allow(clippy::too_many_arguments)]
+fn tga(
+    map: u8,
+    kind: u8,
+    first: u16,
+    map_len: u16,
+    map_bits: u8,
+    size: (u16, u16),
+    depth: u8,
+    descriptor: u8,
+) -> Vec<u8> {
+    let mut f = vec![0, map, kind];
+    f.extend_from_slice(&first.to_le_bytes());
+    f.extend_from_slice(&map_len.to_le_bytes());
+    f.push(map_bits);
+    f.extend_from_slice(&[0; 4]);
+    f.extend_from_slice(&size.0.to_le_bytes());
+    f.extend_from_slice(&size.1.to_le_bytes());
+    f.extend_from_slice(&[depth, descriptor]);
+    f
+}
+
+/// A Targa file has no magic number, so `Format::detect` does not know it and
+/// the hash path never sees it; the viewer takes a file whose pixels fill it.
+/// This one starts as a cursor file does (00 00 02 00), which must not take it.
+#[test]
+fn a_targa_file_is_shown_though_it_has_no_magic_number() {
+    let mut f = tga(0, 2, 0, 0, 0, (2, 2), 24, 0);
+    // Bottom row first: red, green (blue first in a pixel); then blue, white.
+    f.extend_from_slice(&[0, 0, 255, 0, 255, 0, 255, 0, 0, 255, 255, 255]);
+    assert_eq!(Format::detect(&f), None);
+    let p = decode_any(&f, DECODE_MAX).unwrap();
+    assert_eq!((p.width, p.height, p.channels), (2, 2, Channels::Rgb));
+    let rgba = p.to_rgba8();
+    assert_eq!(
+        rgba.chunks(4).map(|c| c[..3].to_vec()).collect::<Vec<_>>(),
+        [[0, 0, 255], [255, 255, 255], [255, 0, 0], [0, 255, 0]]
+    );
+    // Not a Targa file: the pixels are short, or something follows them.
+    assert_eq!(
+        decode_any(&f[..f.len() - 1], DECODE_MAX),
+        Err(Error::Unsupported)
+    );
+    f.push(0);
+    assert_eq!(decode_any(&f, DECODE_MAX), Err(Error::Unsupported));
+}
+
+/// Run-length packets, a top-left origin, and a version 2 footer, which lets
+/// the file be longer than its pixels; some writers leave the footer's NUL off.
+#[test]
+fn a_run_length_targa_with_a_footer_is_shown() {
+    for nul in [true, false] {
+        let mut f = tga(0, 11, 0, 0, 0, (4, 1), 8, 0x20);
+        // A run of three 7s, then one raw pixel.
+        f.extend_from_slice(&[0x82, 7, 0x00, 200]);
+        f.extend_from_slice(&[0; 8]);
+        f.extend_from_slice(b"TRUEVISION-XFILE.");
+        if nul {
+            f.push(0);
+        }
+        let p = decode_any(&f, DECODE_MAX).unwrap();
+        assert_eq!((p.width, p.height, p.channels), (4, 1, Channels::Luma));
+        assert_eq!(p.samples, Samples::U8(vec![7, 7, 7, 200]));
+    }
+}
+
+/// Indices into a colour map that does not start at entry 0, with its alpha.
+#[test]
+fn a_colour_mapped_targa_is_read_through_its_map() {
+    // Entries 1 and 2 of the map, 32 bits: dark red, half-clear green.
+    let mut f = tga(1, 1, 1, 2, 32, (2, 1), 8, 0x28);
+    f.extend_from_slice(&[0, 0, 128, 255, 0, 255, 0, 128]);
+    f.extend_from_slice(&[2, 1]);
+    let p = decode_any(&f, DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgba);
+    assert_eq!(p.to_rgba8(), [0, 255, 0, 128, 128, 0, 0, 255]);
+}
+
+/// A 32-bit pixel's alpha is shown, unless nothing set it.
+#[test]
+fn the_alpha_of_a_32_bit_targa_is_shown_unless_it_is_all_zero() {
+    let pixels = |alpha: [u8; 2]| {
+        let mut f = tga(0, 2, 0, 0, 0, (2, 1), 32, 0x28);
+        f.extend_from_slice(&[10, 20, 30, alpha[0], 40, 50, 60, alpha[1]]);
+        f
+    };
+    let p = decode_any(&pixels([255, 100]), DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgba);
+    assert_eq!(p.to_rgba8(), [30, 20, 10, 255, 60, 50, 40, 100]);
+    let p = decode_any(&pixels([0, 0]), DECODE_MAX).unwrap();
+    assert_eq!(p.channels, Channels::Rgb);
+    assert_eq!(p.to_rgba8(), [30, 20, 10, 255, 60, 50, 40, 255]);
+}
+
+fn hex(s: &str) -> Vec<u8> {
+    (0..s.len())
+        .step_by(2)
+        .map(|i| u8::from_str_radix(&s[i..i + 2], 16).unwrap())
+        .collect()
+}
diff --git a/crates/exav-render/src/formats/image/tga_view.rs b/crates/exav-render/src/formats/image/tga_view.rs
new file mode 100644
index 00000000..e67aa4cb
--- /dev/null
+++ b/crates/exav-render/src/formats/image/tga_view.rs
@@ -0,0 +1,278 @@
+//! Truevision TGA (Targa) files, for the eye only: a TGA has no magic number at
+//! its start, so [`Format::detect`](super::Format::detect) does not know it and
+//! the hash never sees it. `decode_any` tries this when no other format fits,
+//! and takes a file for a TGA only if its header is sane and its pixel data
+//! fills the rest of the file exactly (before the `TRUEVISION-XFILE.` footer of
+//! version 2 files, when there is one). Colour-mapped, true-colour and grey
+//! images, raw or run-length coded (types 1 to 3 and 9 to 11), 8 to 32 bits.
+
+use super::{Channels, Error, Pixels, Samples, within};
+
+const SIGNATURE: &[u8] = b"TRUEVISION-XFILE.\0";
+
+struct Header {
+    /// 1 colour-mapped, 2 true-colour, 3 grey.
+    kind: u8,
+    rle: bool,
+    id_len: usize,
+    map_first: usize,
+    map_len: usize,
+    map_bits: u8,
+    width: usize,
+    height: usize,
+    depth: u8,
+    descriptor: u8,
+}
+
+impl Header {
+    fn parse(d: &[u8]) -> Option<Header> {
+        let h = d.get(..18)?;
+        let word = |at: usize| usize::from(u16::from_le_bytes([h[at], h[at + 1]]));
+        let (has_map, code) = (h[1], h[2]);
+        let kind = match code {
+            1..=3 | 9..=11 => code & 7,
+            _ => return None,
+        };
+        let header = Header {
+            kind,
+            rle: code > 8,
+            id_len: usize::from(h[0]),
+            map_first: word(3),
+            map_len: if has_map == 1 { word(5) } else { 0 },
+            map_bits: h[7],
+            width: word(12),
+            height: word(14),
+            depth: h[16],
+            descriptor: h[17],
+        };
+        let depth_ok = match kind {
+            1 => matches!(header.depth, 8 | 16),
+            2 => matches!(header.depth, 15 | 16 | 24 | 32),
+            _ => matches!(header.depth, 8 | 16),
+        };
+        let map_ok = match kind {
+            1 => has_map == 1 && header.map_len > 0 && matches!(header.map_bits, 15 | 16 | 24 | 32),
+            // A colour map some writers leave in a true-colour or grey file.
+            _ => has_map == 0 || (has_map == 1 && matches!(header.map_bits, 15 | 16 | 24 | 32)),
+        };
+        // The two top bits of the descriptor are unused.
+        (depth_ok && map_ok && header.width > 0 && header.height > 0 && h[17] & 0xC0 == 0)
+            .then_some(header)
+    }
+
+    /// Bytes of one pixel in the file.
+    fn pixel_bytes(&self) -> usize {
+        usize::from(self.depth).div_ceil(8)
+    }
+
+    /// Where the colour map starts, and where the pixels do.
+    fn map_at(&self) -> usize {
+        18 + self.id_len
+    }
+
+    fn data_at(&self) -> usize {
+        self.map_at() + self.map_len * usize::from(self.map_bits).div_ceil(8)
+    }
+}
+
+/// The bytes of the footer of a version 2 file: the offsets of the extension
+/// area and the developer directory, then the signature (some writers leave
+/// off its final NUL).
+fn footer_len(d: &[u8]) -> Option<usize> {
+    let len = if d.ends_with(SIGNATURE) {
+        8 + SIGNATURE.len()
+    } else if d.ends_with(&SIGNATURE[..SIGNATURE.len() - 1]) {
+        8 + SIGNATURE.len() - 1
+    } else {
+        return None;
+    };
+    (d.len() >= 18 + len).then_some(len)
+}
+
+/// The attribute type of the extension area of a version 2 file: 0 to 2 say the
+/// alpha channel holds nothing, 3 and 4 that it is meant to be used.
+fn attribute_type(d: &[u8], footer: Option<usize>) -> Option<u8> {
+    let at = d.len() - footer?;
+    let area = u32::from_le_bytes(d[at..at + 4].try_into().ok()?) as usize;
+    if area == 0 || area.checked_add(495)? > at {
+        return None;
+    }
+    d.get(area + 494).copied()
+}
+
+/// One 5-5-5 pixel as 8-bit red, green and blue.
+fn rgb555(v: u16) -> [u8; 3] {
+    let c = |shift: u32| {
+        let c = ((v >> shift) & 31) as u8;
+        c << 3 | c >> 2
+    };
+    [c(10), c(5), c(0)]
+}
+
+/// `count` pixels of `bytes` bytes, from the run-length packets of `data`, and
+/// the bytes the packets take.
+fn expand_rle(data: &[u8], bytes: usize, count: usize) -> Option<(Vec<u8>, usize)> {
+    let mut out = Vec::with_capacity(count * bytes);
+    let mut at = 0;
+    while out.len() < count * bytes {
+        let packet = *data.get(at)?;
+        at += 1;
+        let left = count - out.len() / bytes;
+        let n = (usize::from(packet & 0x7F) + 1).min(left);
+        if packet & 0x80 != 0 {
+            let pixel = data.get(at..at + bytes)?;
+            at += bytes;
+            for _ in 0..n {
+                out.extend_from_slice(pixel);
+            }
+        } else {
+            out.extend_from_slice(data.get(at..at + n * bytes)?);
+            at += n * bytes;
+        }
+    }
+    Some((out, at))
+}
+
+/// The pixels of a TGA file, `Unsupported` for a file that is not one.
+pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    let h = Header::parse(data).ok_or(Error::Unsupported)?;
+    let footer_len = footer_len(data);
+    let footer = footer_len.is_some();
+    let (map_at, data_at) = (h.map_at(), h.data_at());
+    if data_at > data.len() {
+        return Err(Error::Unsupported);
+    }
+    let bytes = h.pixel_bytes();
+    let count = h.width * h.height;
+    within((count as u64).saturating_mul(bytes as u64 + 4), max_alloc)?;
+    // With a footer, the pixels may run into it, as some writers leave a
+    // last packet short and readers go on past the end of the image data.
+    let body = &data[data_at..];
+    let source = if h.rle {
+        let (pixels, used) = expand_rle(body, bytes, count).ok_or(Error::Unsupported)?;
+        // Without a footer, nothing may follow the packets.
+        if !footer && used != body.len() {
+            return Err(Error::Unsupported);
+        }
+        pixels
+    } else {
+        if body.len() < count * bytes || (!footer && body.len() != count * bytes) {
+            return Err(Error::Unsupported);
+        }
+        body[..count * bytes].to_vec()
+    };
+
+    let attribute = attribute_type(data, footer_len);
+    let alpha_bits = h.descriptor & 15;
+    // A file that says it has alpha, or says nothing about it.
+    let wants_alpha = alpha_bits > 0 || !matches!(attribute, Some(0..=2));
+    // A bit of a 16-bit pixel is alpha only if the file says so.
+    let bit_alpha = alpha_bits > 0 || matches!(attribute, Some(3 | 4));
+
+    let map: Vec<[u8; 4]> = if h.kind == 1 {
+        let entry = usize::from(h.map_bits).div_ceil(8);
+        data[map_at..data_at]
+            .chunks_exact(entry)
+            .map(|e| match entry {
+                2 => {
+                    let v = u16::from_le_bytes([e[0], e[1]]);
+                    let [r, g, b] = rgb555(v);
+                    [r, g, b, if v >> 15 != 0 { 255 } else { 0 }]
+                }
+                3 => [e[2], e[1], e[0], 255],
+                _ => [e[2], e[1], e[0], e[3]],
+            })
+            .collect()
+    } else {
+        Vec::new()
+    };
+
+    // Each pixel as RGBA, or (for grey) luma and alpha.
+    let pixel = |p: &[u8]| -> [u8; 4] {
+        match (h.kind, bytes) {
+            (1, _) => {
+                let index = if bytes == 2 {
+                    usize::from(u16::from_le_bytes([p[0], p[1]]))
+                } else {
+                    usize::from(p[0])
+                };
+                index
+                    .checked_sub(h.map_first)
+                    .and_then(|i| map.get(i))
+                    .copied()
+                    .unwrap_or([0, 0, 0, 255])
+            }
+            (3, 1) => [p[0], p[0], p[0], 255],
+            (3, _) => [p[0], p[0], p[0], p[1]],
+            (_, 2) => {
+                let v = u16::from_le_bytes([p[0], p[1]]);
+                let [r, g, b] = rgb555(v);
+                [r, g, b, if v >> 15 != 0 { 255 } else { 0 }]
+            }
+            (_, 3) => [p[2], p[1], p[0], 255],
+            _ => [p[2], p[1], p[0], p[3]],
+        }
+    };
+    // Whether the alpha of a pixel is read at all: a colour map of 32-bit
+    // entries or 32-bit pixels, a bit of a 16-bit pixel, a grey pixel's second
+    // byte.
+    let has_alpha = match (h.kind, bytes) {
+        (1, _) => h.map_bits == 32 && wants_alpha || h.map_bits == 16 && bit_alpha,
+        (3, 1) => false,
+        (3, _) => true,
+        (_, 2) => bit_alpha,
+        (_, 3) => false,
+        _ => wants_alpha,
+    };
+
+    let (w, rows) = (h.width, h.height);
+    let top_down = h.descriptor & 0x20 != 0;
+    let right_to_left = h.descriptor & 0x10 != 0;
+    let mut rgba = vec![0u8; count * 4];
+    for y in 0..rows {
+        let from = if top_down { y } else { rows - 1 - y };
+        for x in 0..w {
+            let sx = if right_to_left { w - 1 - x } else { x };
+            let at = (from * w + sx) * bytes;
+            rgba[(y * w + x) * 4..][..4].copy_from_slice(&pixel(&source[at..at + bytes]));
+        }
+    }
+    // Alpha nobody set (a 32-bit file whose writer left the byte at zero) would
+    // draw nothing.
+    let has_alpha = has_alpha && rgba.as_chunks::<4>().0.iter().any(|p| p[3] != 0);
+
+    let grey = h.kind == 3;
+    let (channels, samples) = match (grey, has_alpha) {
+        (true, false) => (
+            Channels::Luma,
+            rgba.as_chunks::<4>()
+                .0
+                .iter()
+                .map(|p| p[0])
+                .collect::<Vec<u8>>(),
+        ),
+        (true, true) => (
+            Channels::LumaAlpha,
+            rgba.as_chunks::<4>()
+                .0
+                .iter()
+                .flat_map(|p| [p[0], p[3]])
+                .collect(),
+        ),
+        (false, true) => (Channels::Rgba, rgba),
+        (false, false) => (
+            Channels::Rgb,
+            rgba.as_chunks::<4>()
+                .0
+                .iter()
+                .flat_map(|p| [p[0], p[1], p[2]])
+                .collect(),
+        ),
+    };
+    Ok(Pixels {
+        width: w as u32,
+        height: rows as u32,
+        channels,
+        samples: Samples::U8(samples),
+    })
+}
diff --git a/crates/exav-render/src/formats/image/tiff_view.rs b/crates/exav-render/src/formats/image/tiff_view.rs
new file mode 100644
index 00000000..20905616
--- /dev/null
+++ b/crates/exav-render/src/formats/image/tiff_view.rs
@@ -0,0 +1,783 @@
+//! TIFF files to look at that the decoder `fuzzy_img` hashes with does not
+//! read: signed, wide and floating-point grey samples (elevation models,
+//! scientific rasters), palette images, planar ones, CMYK, YCbCr and Zstandard. It is a
+//! fallback of `decode_any`, never of `decode`, so that a hash stays what
+//! ClamAV's would be.
+//!
+//! Samples that are not 8-bit are stretched from the 0.5th to the 99.5th
+//! percentile of the values to the grey scale, nodata values left out: the
+//! file says nothing about a range to show.
+
+use std::io::Cursor;
+
+use super::{Channels, Error, Pixels, Samples, within};
+use crate::image_codecs::tiff::ColorType;
+use crate::image_codecs::tiff::decoder::{
+    ChunkType, Decoder, DecodingResult, Limits, with_viewer_codecs,
+};
+use crate::image_codecs::tiff::tags::Tag;
+
+/// Most values looked at to find the range to stretch.
+const RANGE_SAMPLE: usize = 1 << 20;
+
+pub(super) fn decode(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    with_viewer_codecs(|| read(data, max_alloc))
+}
+
+fn read(data: &[u8], max_alloc: u64) -> Result<Pixels, Error> {
+    let limits = Limits {
+        decoding_buffer_size: max_alloc.min(super::DECODE_MAX) as usize,
+        ..Limits::default()
+    };
+    let mut d = Decoder::new(Cursor::new(data))
+        .map_err(|_| Error::Undecodable)?
+        .with_limits(limits);
+    let (width, height) = d.dimensions().map_err(|_| Error::Undecodable)?;
+    // The decoder's colour type refuses a palette; its samples are still read.
+    let palette_file = d
+        .find_tag_unsigned::<u16>(Tag::PhotometricInterpretation)
+        .ok()
+        .flatten()
+        == Some(3);
+    let color = match d.colortype() {
+        Ok(c) => c,
+        Err(_) if palette_file => ColorType::Palette(8),
+        Err(_) => return Err(Error::Undecodable),
+    };
+    let pixels = u64::from(width) * u64::from(height);
+    // The samples as they are read, and the grey or RGB bytes made of them.
+    within(pixels.saturating_mul(16), max_alloc)?;
+    #[cfg(feature = "ccitt")]
+    if let (ColorType::Gray(1), Some(compression @ 2..=4)) = (
+        color,
+        d.find_tag_unsigned::<u16>(Tag::Compression).ok().flatten(),
+    ) {
+        return fax(&mut d, data, compression, width, height, max_alloc);
+    }
+    if let ColorType::RGB(bits @ (8 | 16))
+    | ColorType::RGBA(bits @ (8 | 16))
+    | ColorType::CMYK(bits @ (8 | 16))
+    | ColorType::YCbCr(bits @ 8) = color
+    {
+        let stored = match color {
+            ColorType::RGB(_) | ColorType::YCbCr(_) => 3,
+            _ => 4,
+        };
+        return bands(&mut d, color, bits, width, height, stored);
+    }
+    // Palette indices with an alpha beside each.
+    if palette_file
+        && matches!(
+            color,
+            ColorType::Multiband {
+                bit_depth: 8,
+                num_samples: 2
+            }
+        )
+    {
+        let map = d
+            .get_tag_u16_vec(Tag::ColorMap)
+            .map_err(|_| Error::Undecodable)?;
+        let unspecified = unspecified_extra(&mut d);
+        let DecodingResult::U8(v) = d.read_image().map_err(|_| Error::Undecodable)? else {
+            return Err(Error::Undecodable);
+        };
+        let pairs = v.as_chunks::<2>().0;
+        let rgb = palette(pairs.iter().map(|p| usize::from(p[0])), Some(&map))?;
+        let samples: Vec<u8> = rgb
+            .as_chunks::<3>()
+            .0
+            .iter()
+            .zip(pairs)
+            .flat_map(|(c, p)| [c[0], c[1], c[2], if unspecified { 255 } else { p[1] }])
+            .collect();
+        if samples.len() as u64 != pixels * 4 {
+            return Err(Error::Undecodable);
+        }
+        return Ok(Pixels {
+            width,
+            height,
+            channels: Channels::Rgba,
+            samples: Samples::U8(samples),
+        });
+    }
+    if let (
+        ColorType::Multiband {
+            bit_depth: 8,
+            num_samples: 3,
+        },
+        Some(8),
+    ) = (
+        color,
+        d.find_tag_unsigned::<u16>(Tag::PhotometricInterpretation)
+            .ok()
+            .flatten(),
+    ) {
+        let lab = all_values(&mut d, (width, height), 3)?;
+        return Ok(Pixels {
+            width,
+            height,
+            channels: Channels::Rgb,
+            samples: Samples::U8(lab_to_rgb(&lab)),
+        });
+    }
+    // CMYK with spot or alpha channels after the four inks: the inks only.
+    if let (
+        ColorType::Multiband {
+            bit_depth: bits @ (8 | 16),
+            num_samples: n @ 6..=8,
+        },
+        Some(5),
+    ) = (
+        color,
+        d.find_tag_unsigned::<u16>(Tag::PhotometricInterpretation)
+            .ok()
+            .flatten(),
+    ) {
+        return bands(
+            &mut d,
+            ColorType::CMYK(bits),
+            bits,
+            width,
+            height,
+            usize::from(n),
+        );
+    }
+    // A raster of several bands with no colour meaning (a satellite scene):
+    // the first, as grey.
+    if let ColorType::Multiband {
+        bit_depth: bits @ (8 | 16),
+        num_samples: n @ 3..=6,
+    } = color
+    {
+        let nodata = d
+            .get_tag_ascii_string(Tag::GdalNodata)
+            .ok()
+            .and_then(|s| s.trim().trim_end_matches('\0').parse::<f64>().ok());
+        return first_band(&mut d, bits, usize::from(n), (width, height), nodata);
+    }
+    let channels = match color {
+        ColorType::Gray(_) => Channels::Luma,
+        ColorType::Palette(_) => Channels::Rgb,
+        // Grey and alpha, which the photometric interpretation does not say.
+        ColorType::Multiband {
+            bit_depth: 8,
+            num_samples: 2,
+        } => Channels::LumaAlpha,
+        _ => return Err(Error::Undecodable),
+    };
+    let nodata = d
+        .get_tag_ascii_string(Tag::GdalNodata)
+        .ok()
+        .and_then(|s| s.trim().trim_end_matches('\0').parse::<f64>().ok());
+    let map = match color {
+        ColorType::Palette(_) => d.get_tag_u16_vec(Tag::ColorMap).ok(),
+        _ => None,
+    };
+    let image = d.read_image().map_err(|_| Error::Undecodable)?;
+    let associated = associated_alpha(&mut d);
+    let unspecified = unspecified_extra(&mut d);
+    // The decoder ignores a fill order of 2, bits taken from the low end.
+    let reversed = fill_order_2(&mut d);
+    let (w, h) = (width as usize, height as usize);
+    // Indices of fewer than 8 bits come packed, each row to a byte.
+    let image = match (color, image) {
+        (ColorType::Palette(bits @ 1..=7), DecodingResult::U8(v)) => {
+            DecodingResult::U8(unpack(&v, w, h, bits, reversed))
+        }
+        // Grey of fewer bits, spread over the scale.
+        (ColorType::Gray(bits @ 1..=7), DecodingResult::U8(v)) => {
+            let max = (1u16 << bits) - 1;
+            let mut grey = unpack(&v, w, h, bits, reversed);
+            for g in &mut grey {
+                *g = (u16::from(*g) * 255 / max) as u8;
+            }
+            DecodingResult::U8(grey)
+        }
+        // Grey of 9 to 15 bits, left packed by the decoder.
+        (ColorType::Gray(bits @ 9..=15), DecodingResult::U16(v)) => {
+            let white_is_zero = d
+                .find_tag_unsigned::<u16>(Tag::PhotometricInterpretation)
+                .ok()
+                .flatten()
+                == Some(0);
+            DecodingResult::U16(unpack_wide(&v, w, h, bits, white_is_zero))
+        }
+        (_, image) => image,
+    };
+    let samples = match (channels, image) {
+        (Channels::Rgb, DecodingResult::U8(v)) if matches!(color, ColorType::Palette(_)) => {
+            palette(v.iter().map(|&i| usize::from(i)), map.as_deref())?
+        }
+        (Channels::Rgb, DecodingResult::U16(v)) if matches!(color, ColorType::Palette(_)) => {
+            palette(v.iter().map(|&i| usize::from(i)), map.as_deref())?
+        }
+        (Channels::Luma, DecodingResult::U8(v)) => v,
+        (Channels::LumaAlpha, DecodingResult::U8(v)) if associated => unpremultiply(v, 2),
+        (Channels::LumaAlpha, DecodingResult::U8(v)) if unspecified => opaque(v, 2),
+        (Channels::LumaAlpha, DecodingResult::U8(v)) => v,
+        (Channels::Luma, DecodingResult::U16(v)) => stretch(&v, f64::from, nodata),
+        (Channels::Luma, DecodingResult::U32(v)) => stretch(&v, f64::from, nodata),
+        (Channels::Luma, DecodingResult::U64(v)) => stretch(&v, |x| x as f64, nodata),
+        (Channels::Luma, DecodingResult::I8(v)) => stretch(&v, f64::from, nodata),
+        (Channels::Luma, DecodingResult::I16(v)) => stretch(&v, f64::from, nodata),
+        (Channels::Luma, DecodingResult::I32(v)) => stretch(&v, f64::from, nodata),
+        (Channels::Luma, DecodingResult::I64(v)) => stretch(&v, |x| x as f64, nodata),
+        (Channels::Luma, DecodingResult::F16(v)) => stretch(&v, half, nodata),
+        (Channels::Luma, DecodingResult::F32(v)) => stretch(&v, f64::from, nodata),
+        (Channels::Luma, DecodingResult::F64(v)) => stretch(&v, |x| x, nodata),
+        _ => return Err(Error::Undecodable),
+    };
+    if samples.len() as u64 != pixels * channels.count() as u64 {
+        return Err(Error::Undecodable);
+    }
+    Ok(Pixels {
+        width,
+        height,
+        channels,
+        samples: Samples::U8(samples),
+    })
+}
+
+/// Strips of CCITT fax (compression 2, 3 and 4) through hayro-ccitt: the
+/// decoder reads Group 4 only, and not with a fill order of 2. A white run is
+/// a 0 bit, which is white or black as the photometric interpretation says.
+#[cfg(feature = "ccitt")]
+fn fax(
+    d: &mut Decoder<Cursor<&[u8]>>,
+    data: &[u8],
+    compression: u16,
+    width: u32,
+    height: u32,
+    max_alloc: u64,
+) -> Result<Pixels, Error> {
+    use crate::formats::pdf_image::{CcittParams, decode_ccitt};
+
+    let offsets = d
+        .get_tag_u64_vec(Tag::StripOffsets)
+        .map_err(|_| Error::Undecodable)?;
+    let counts = d
+        .get_tag_u64_vec(Tag::StripByteCounts)
+        .map_err(|_| Error::Undecodable)?;
+    let rows_per_strip = d
+        .find_tag_unsigned::<u32>(Tag::RowsPerStrip)
+        .ok()
+        .flatten()
+        .unwrap_or(height)
+        .clamp(1, height.max(1));
+    // Group 3 options (tag 292): bit 0 is 2-dimensional coding.
+    let options = d
+        .find_tag_unsigned::<u32>(Tag::Unknown(292))
+        .ok()
+        .flatten()
+        .unwrap_or(0);
+    let reversed = d.find_tag_unsigned::<u16>(Tag::FillOrder).ok().flatten() == Some(2);
+    let black_is_zero = d
+        .find_tag_unsigned::<u16>(Tag::PhotometricInterpretation)
+        .ok()
+        .flatten()
+        == Some(1);
+    let k = match compression {
+        4 => -1,
+        3 if options & 1 != 0 => 4,
+        _ => 0,
+    };
+    let (w, h) = (width as usize, height as usize);
+    let mut grey = Vec::with_capacity(w * h);
+    for (&at, &len) in offsets.iter().zip(&counts) {
+        let rows = rows_per_strip.min(height.saturating_sub((grey.len() / w.max(1)) as u32));
+        if rows == 0 {
+            break;
+        }
+        let at = usize::try_from(at).map_err(|_| Error::Undecodable)?;
+        let end = at.saturating_add(usize::try_from(len).unwrap_or(usize::MAX));
+        let mut strip = data
+            .get(at..end.min(data.len()))
+            .ok_or(Error::Undecodable)?
+            .to_vec();
+        if reversed {
+            strip.iter_mut().for_each(|b| *b = b.reverse_bits());
+        }
+        let params = CcittParams {
+            width,
+            height: rows,
+            k,
+            end_of_line: compression == 3,
+            encoded_byte_align: compression == 2,
+            black_is_1: false,
+            columns: width,
+            rows,
+        };
+        let bits = decode_ccitt(&strip, params, max_alloc).map_err(|_| Error::Undecodable)?;
+        for row in bits.chunks(w.div_ceil(8)).take(rows as usize) {
+            grey.extend((0..w).map(|x| {
+                let white_run = row[x / 8] >> (7 - x % 8) & 1 == 1;
+                if white_run != black_is_zero { 255 } else { 0 }
+            }));
+        }
+    }
+    if grey.len() != w * h {
+        return Err(Error::Undecodable);
+    }
+    Ok(Pixels {
+        width,
+        height,
+        channels: Channels::Luma,
+        samples: Samples::U8(grey),
+    })
+}
+
+/// An uncompressed image whose bytes hold their samples low bit first.
+fn fill_order_2(d: &mut Decoder<Cursor<&[u8]>>) -> bool {
+    let mut tag = |t| d.find_tag_unsigned::<u16>(t).ok().flatten();
+    tag(Tag::FillOrder) == Some(2) && tag(Tag::Compression).unwrap_or(1) == 1
+}
+
+/// The image turned as the file's Orientation tag says it is to be shown
+/// (what libtiff does, and a viewer): 2 mirrors it left to right, 3 turns it
+/// round, 4 mirrors it top to bottom, 5 to 8 are those with the rows and
+/// columns swapped (6 a quarter turn clockwise, 8 anticlockwise). Anything
+/// else leaves it as it is.
+pub(super) fn oriented(data: &[u8], pixels: Pixels) -> Pixels {
+    let orientation = Decoder::new(Cursor::new(data))
+        .ok()
+        .and_then(|mut d| d.find_tag_unsigned::<u16>(Tag::Orientation).ok().flatten())
+        .unwrap_or(1);
+    if !(2..=8).contains(&orientation) {
+        return pixels;
+    }
+    let (w, h, n) = (
+        pixels.width as usize,
+        pixels.height as usize,
+        pixels.channels.count(),
+    );
+    let swap = orientation >= 5;
+    let (out_w, out_h) = if swap { (h, w) } else { (w, h) };
+    // The pixel of the source that lands at (x, y).
+    let source = |x: usize, y: usize| -> usize {
+        let (sx, sy) = match orientation {
+            2 => (w - 1 - x, y),
+            3 => (w - 1 - x, h - 1 - y),
+            4 => (x, h - 1 - y),
+            5 => (y, x),
+            6 => (y, h - 1 - x),
+            7 => (w - 1 - y, h - 1 - x),
+            _ => (w - 1 - y, x),
+        };
+        sy * w + sx
+    };
+    fn turn<T: Copy>(
+        src: &[T],
+        out: (usize, usize),
+        n: usize,
+        at: &dyn Fn(usize, usize) -> usize,
+    ) -> Vec<T> {
+        let mut dst = Vec::with_capacity(src.len());
+        for y in 0..out.1 {
+            for x in 0..out.0 {
+                let from = at(x, y) * n;
+                dst.extend_from_slice(&src[from..from + n]);
+            }
+        }
+        dst
+    }
+    let len = match &pixels.samples {
+        Samples::U8(v) => v.len(),
+        Samples::U16(v) => v.len(),
+        Samples::F32(v) => v.len(),
+    };
+    if len != w * h * n {
+        return pixels;
+    }
+    let out = (out_w, out_h);
+    let samples = match &pixels.samples {
+        Samples::U8(v) => Samples::U8(turn(v, out, n, &source)),
+        Samples::U16(v) => Samples::U16(turn(v, out, n, &source)),
+        Samples::F32(v) => Samples::F32(turn(v, out, n, &source)),
+    };
+    Pixels {
+        width: out_w as u32,
+        height: out_h as u32,
+        channels: pixels.channels,
+        samples,
+    }
+}
+
+/// What the first extra sample is: 0 is data of no stated use, 1 an associated
+/// (premultiplied) alpha, 2 an unassociated one. `None` when there is no tag.
+fn extra_sample(d: &mut Decoder<Cursor<&[u8]>>) -> Option<u16> {
+    d.find_tag_unsigned_vec::<u16>(Tag::ExtraSamples)
+        .ok()
+        .flatten()
+        .and_then(|v| v.first().copied())
+}
+
+fn associated_alpha(d: &mut Decoder<Cursor<&[u8]>>) -> bool {
+    extra_sample(d) == Some(1)
+}
+
+/// An extra sample of no stated use is not a transparency: libtiff's reader
+/// and Pillow draw such a picture opaque.
+fn unspecified_extra(d: &mut Decoder<Cursor<&[u8]>>) -> bool {
+    extra_sample(d) == Some(0)
+}
+
+/// Alpha of 255, the last sample of each pixel.
+fn opaque(mut samples: Vec<u8>, per_pixel: usize) -> Vec<u8> {
+    for px in samples.chunks_exact_mut(per_pixel) {
+        px[per_pixel - 1] = 255;
+    }
+    samples
+}
+
+/// Colours of 8-bit samples with the alpha last divided by it, as a viewer
+/// draws a premultiplied image.
+fn unpremultiply(mut samples: Vec<u8>, per_pixel: usize) -> Vec<u8> {
+    for px in samples.chunks_exact_mut(per_pixel) {
+        let alpha = u32::from(px[per_pixel - 1]);
+        for c in &mut px[..per_pixel - 1] {
+            *c = (u32::from(*c) * 255 + alpha / 2)
+                .checked_div(alpha)
+                .map_or(0, |v| v.min(255) as u8);
+        }
+    }
+    samples
+}
+
+/// Whether [`decode`] reads the file differently from the hashing decoder:
+/// which ignores a fill order of 2 (samples of fewer than 8 bits, or Group 4)
+/// and draws premultiplied colours as they are.
+pub(super) fn reads_differently(data: &[u8]) -> bool {
+    let Ok(mut d) = Decoder::new(Cursor::new(data)) else {
+        return false;
+    };
+    let fax = cfg!(feature = "ccitt")
+        && d.find_tag_unsigned::<u16>(Tag::Compression).ok().flatten() == Some(4)
+        && d.find_tag_unsigned::<u16>(Tag::FillOrder).ok().flatten() == Some(2);
+    fax || (fill_order_2(&mut d)
+        && matches!(
+            d.colortype(),
+            Ok(ColorType::Gray(1..=7) | ColorType::Palette(1..=7))
+        ))
+        || (matches!(extra_sample(&mut d), Some(0 | 1))
+            && matches!(
+                d.colortype(),
+                Ok(ColorType::RGBA(8 | 16)
+                    | ColorType::Multiband {
+                        bit_depth: 8,
+                        num_samples: 2
+                    })
+            ))
+}
+
+/// RGB, RGBA, CMYK and YCbCr of 8 or 16 bits: those the hashing decoder
+/// refuses when each strip or tile holds one band (planar), and CMYK and
+/// YCbCr, which it does not convert. 16-bit values keep their high byte.
+/// `stored` is the samples to a pixel in the file; those after the colour
+/// ones are left out.
+fn bands(
+    d: &mut Decoder<Cursor<&[u8]>>,
+    color: ColorType,
+    bits: u8,
+    width: u32,
+    height: u32,
+    stored: usize,
+) -> Result<Pixels, Error> {
+    let count = if matches!(color, ColorType::RGB(_) | ColorType::YCbCr(_)) {
+        3
+    } else {
+        4
+    };
+    let values = all_values(d, (width, height), stored)?;
+    let bytes: Vec<u8> = values
+        .chunks_exact(stored)
+        .flat_map(|p| &p[..count])
+        .map(|&v| if bits == 16 { (v >> 8) as u8 } else { v as u8 })
+        .collect();
+    let (channels, samples) = match color {
+        ColorType::RGB(_) => (Channels::Rgb, bytes),
+        ColorType::RGBA(_) if associated_alpha(d) => (Channels::Rgba, unpremultiply(bytes, 4)),
+        ColorType::RGBA(_) if unspecified_extra(d) => (Channels::Rgba, opaque(bytes, 4)),
+        ColorType::RGBA(_) => (Channels::Rgba, bytes),
+        ColorType::CMYK(_) => (Channels::Rgb, cmyk_to_rgb(&bytes)),
+        _ => (Channels::Rgb, super::ycc_to_rgb(bytes)),
+    };
+    Ok(Pixels {
+        width,
+        height,
+        channels,
+        samples: Samples::U8(samples),
+    })
+}
+
+/// CMYK bytes to RGB the way the hashing decoder does it for chunky ones:
+/// `(255 - c) * (1 - k / 255)`.
+fn cmyk_to_rgb(cmyk: &[u8]) -> Vec<u8> {
+    cmyk.as_chunks::<4>()
+        .0
+        .iter()
+        .flat_map(|p| {
+            let k = 1.0 - f32::from(p[3]) / 255.0;
+            [0, 1, 2].map(|i| ((255.0 - f32::from(p[i])) * k) as u8)
+        })
+        .collect()
+}
+
+/// Every sample of an 8 or 16-bit image, `count` to a pixel, chunky or planar.
+fn all_values(
+    d: &mut Decoder<Cursor<&[u8]>>,
+    (width, height): (u32, u32),
+    count: usize,
+) -> Result<Vec<u16>, Error> {
+    let (w, h) = (width as usize, height as usize);
+    let planar = d
+        .find_tag_unsigned::<u16>(Tag::PlanarConfiguration)
+        .ok()
+        .flatten()
+        == Some(2);
+    let values: Vec<u16> = if planar {
+        planes(d, w, h, count)?
+    } else {
+        match d.read_image().map_err(|_| Error::Undecodable)? {
+            DecodingResult::U8(v) => v.into_iter().map(u16::from).collect(),
+            DecodingResult::U16(v) => v,
+            _ => return Err(Error::Undecodable),
+        }
+    };
+    if values.len() != w * h * count {
+        return Err(Error::Undecodable);
+    }
+    Ok(values)
+}
+
+/// CIELab of 8 bits (photometric 8) as sRGB: L* of 0 to 255 stands for 0 to
+/// 100, a* and b* are signed bytes. D50 is the white, as libtiff assumes.
+fn lab_to_rgb(lab: &[u16]) -> Vec<u8> {
+    const WHITE: [f64; 3] = [0.9642, 1.0, 0.8249];
+    let f = |t: f64| {
+        if t > 6.0 / 29.0 {
+            t.powi(3)
+        } else {
+            3.0 * (6.0f64 / 29.0).powi(2) * (t - 4.0 / 29.0)
+        }
+    };
+    let encode = |v: f64| {
+        let v = v.clamp(0.0, 1.0);
+        let v = if v <= 0.003_130_8 {
+            12.92 * v
+        } else {
+            1.055 * v.powf(1.0 / 2.4) - 0.055
+        };
+        (v * 255.0 + 0.5) as u8
+    };
+    lab.as_chunks::<3>()
+        .0
+        .iter()
+        .flat_map(|p| {
+            let l = f64::from(p[0] as u8) * 100.0 / 255.0;
+            let a = f64::from(p[1] as u8 as i8);
+            let b = f64::from(p[2] as u8 as i8);
+            let fy = (l + 16.0) / 116.0;
+            let (x, y, z) = (
+                WHITE[0] * f(fy + a / 500.0),
+                WHITE[1] * f(fy),
+                WHITE[2] * f(fy - b / 200.0),
+            );
+            [
+                3.133_856_1 * x - 1.616_866_7 * y - 0.490_614_6 * z,
+                -0.978_768_4 * x + 1.916_141_5 * y + 0.033_454_0 * z,
+                0.071_945_3 * x - 0.228_991_4 * y + 1.405_242_7 * z,
+            ]
+            .map(encode)
+        })
+        .collect()
+}
+
+/// The first of `count` bands as grey bytes: 8-bit values as they are, 16-bit
+/// ones stretched like other wide samples.
+fn first_band(
+    d: &mut Decoder<Cursor<&[u8]>>,
+    bits: u8,
+    count: usize,
+    (width, height): (u32, u32),
+    nodata: Option<f64>,
+) -> Result<Pixels, Error> {
+    let values = all_values(d, (width, height), count)?;
+    let band: Vec<u16> = values.chunks_exact(count).map(|p| p[0]).collect();
+    let grey = if bits == 8 {
+        band.iter().map(|&v| v as u8).collect()
+    } else {
+        stretch(&band, f64::from, nodata)
+    };
+    Ok(Pixels {
+        width,
+        height,
+        channels: Channels::Luma,
+        samples: Samples::U8(grey),
+    })
+}
+
+/// The bands of a planar image put together, `count` values to a pixel. The
+/// chunks of the first band come first, then those of the next.
+fn planes(
+    d: &mut Decoder<Cursor<&[u8]>>,
+    width: usize,
+    height: usize,
+    count: usize,
+) -> Result<Vec<u16>, Error> {
+    let chunks = match d.get_chunk_type() {
+        ChunkType::Strip => d.strip_count(),
+        ChunkType::Tile => d.tile_count(),
+    }
+    .map_err(|_| Error::Undecodable)? as usize;
+    if chunks == 0 || !chunks.is_multiple_of(count) {
+        return Err(Error::Undecodable);
+    }
+    let per_band = chunks / count;
+    let (chunk_width, chunk_height) = d.chunk_dimensions();
+    let (chunk_width, chunk_height) = (chunk_width as usize, chunk_height as usize);
+    if chunk_width == 0 || chunk_height == 0 {
+        return Err(Error::Undecodable);
+    }
+    let across = width.div_ceil(chunk_width);
+    let mut out = vec![0u16; width * height * count];
+    for band in 0..count {
+        for c in 0..per_band {
+            let index = (band * per_band + c) as u32;
+            let (w, h) = d.chunk_data_dimensions(index);
+            let (w, h) = (w as usize, h as usize);
+            let values: Vec<u16> = match d.read_chunk(index).map_err(|_| Error::Undecodable)? {
+                DecodingResult::U8(v) => v.into_iter().map(u16::from).collect(),
+                DecodingResult::U16(v) => v,
+                _ => return Err(Error::Undecodable),
+            };
+            let (x0, y0) = match d.get_chunk_type() {
+                ChunkType::Strip => (0, c * chunk_height),
+                ChunkType::Tile => (c % across * chunk_width, c / across * chunk_height),
+            };
+            for row in 0..h {
+                for col in 0..w {
+                    let (x, y) = (x0 + col, y0 + row);
+                    if x < width && y < height {
+                        out[(y * width + x) * count + band] =
+                            values.get(row * w + col).copied().unwrap_or(0);
+                    }
+                }
+            }
+        }
+    }
+    Ok(out)
+}
+
+/// `bits`-bit values, most significant first, `width` to a row and each row
+/// padded to a byte, as one byte each. With `reversed` the bits of every byte
+/// are taken in the opposite order first, as libtiff does for a fill order of 2.
+fn unpack(packed: &[u8], width: usize, height: usize, bits: u8, reversed: bool) -> Vec<u8> {
+    let bits = usize::from(bits);
+    let row = (width * bits).div_ceil(8);
+    let mask = (1u16 << bits) - 1;
+    let byte = |i: usize| {
+        packed.get(i).map_or(0, |&b| {
+            u16::from(if reversed { b.reverse_bits() } else { b })
+        })
+    };
+    let mut out = Vec::with_capacity(width * height);
+    for y in 0..height {
+        for x in 0..width {
+            // A value of 3, 5, 6 or 7 bits can run into the next byte.
+            let at = y * row + x * bits / 8;
+            let word = byte(at) << 8 | byte(at + 1);
+            out.push(((word >> (16 - bits - (x * bits) % 8)) & mask) as u8);
+        }
+    }
+    out
+}
+
+/// `bits`-bit values of 9 to 15 bits, most significant first, `width` to a row
+/// and each row padded to a byte, as 16-bit values. `packed` is what the
+/// decoder left in its buffer of 16-bit values (the bytes as the file has them,
+/// in the memory order of the buffer). With `invert`, a white-is-zero image.
+fn unpack_wide(packed: &[u16], width: usize, height: usize, bits: u8, invert: bool) -> Vec<u16> {
+    let bits = usize::from(bits);
+    let bytes: Vec<u8> = packed.iter().flat_map(|v| v.to_ne_bytes()).collect();
+    let row = (width * bits).div_ceil(8);
+    let max = (1u32 << bits) - 1;
+    let mut out = Vec::with_capacity(width * height);
+    for y in 0..height {
+        for x in 0..width {
+            // The 16 bits that hold the value are read from the byte it starts in.
+            let first = y * row + x * bits / 8;
+            let word = [first, first + 1, first + 2]
+                .map(|i| u32::from(bytes.get(i).copied().unwrap_or(0)));
+            let word = word[0] << 16 | word[1] << 8 | word[2];
+            let value = (word >> (24 - bits - (x * bits) % 8)) & max;
+            out.push((if invert { max - value } else { value }) as u16);
+        }
+    }
+    out
+}
+
+/// RGB bytes from palette indices and a TIFF colour map (all reds, then all
+/// greens, then all blues, 16 bits each).
+fn palette(indices: impl Iterator<Item = usize>, map: Option<&[u16]>) -> Result<Vec<u8>, Error> {
+    let map = map.ok_or(Error::Undecodable)?;
+    let n = map.len() / 3;
+    if n == 0 {
+        return Err(Error::Undecodable);
+    }
+    let mut out = Vec::new();
+    for i in indices {
+        // An index past the map is the last colour, as a short map is a truncated one.
+        let i = i.min(n - 1);
+        out.extend([map[i], map[n + i], map[2 * n + i]].map(|c| (c >> 8) as u8));
+    }
+    Ok(out)
+}
+
+/// An IEEE half-precision value from its bits.
+fn half(bits: u16) -> f64 {
+    let sign = if bits & 0x8000 != 0 { -1.0 } else { 1.0 };
+    let exponent = i32::from((bits >> 10) & 0x1f);
+    let fraction = f64::from(bits & 0x3ff);
+    match exponent {
+        0 => sign * fraction * 2f64.powi(-24),
+        31 if fraction == 0.0 => sign * f64::INFINITY,
+        31 => f64::NAN,
+        e => sign * (1.0 + fraction / 1024.0) * 2f64.powi(e - 15),
+    }
+}
+
+/// Grey bytes from values: `lo` to `hi` (the 0.5th and 99.5th percentiles of
+/// those that are numbers and not nodata) is 0 to 255, values outside it are
+/// clipped, nodata and what is not a number are 0.
+fn stretch<T: Copy>(values: &[T], f: impl Fn(T) -> f64, nodata: Option<f64>) -> Vec<u8> {
+    let valid = |x: f64| x.is_finite() && nodata != Some(x);
+    let step = values.len().div_ceil(RANGE_SAMPLE).max(1);
+    let mut sample: Vec<f64> = values
+        .iter()
+        .step_by(step)
+        .map(|&x| f(x))
+        .filter(|&x| valid(x))
+        .collect();
+    sample.sort_by(f64::total_cmp);
+    let at = |q: f64| {
+        let last = sample.len().checked_sub(1)?;
+        sample.get((last as f64 * q) as usize).copied()
+    };
+    let (lo, hi) = match (at(0.005), at(0.995)) {
+        (Some(lo), Some(hi)) => (lo, hi),
+        _ => return vec![0; values.len()],
+    };
+    let scale = if hi > lo { 255.0 / (hi - lo) } else { 0.0 };
+    values
+        .iter()
+        .map(|&x| {
+            let x = f(x);
+            if valid(x) {
+                ((x - lo) * scale).clamp(0.0, 255.0).round() as u8
+            } else {
+                0
+            }
+        })
+        .collect()
+}
diff --git a/crates/exav-render/src/formats/jp2_tiles.rs b/crates/exav-render/src/formats/jp2_tiles.rs
new file mode 100644
index 00000000..105616f3
--- /dev/null
+++ b/crates/exav-render/src/formats/jp2_tiles.rs
@@ -0,0 +1,112 @@
+//! The tiles a JPEG 2000 codestream's header implies.
+//!
+//! A tile-part names its tile with 16 bits (ISO 15444-1, A.4.2), so a file has
+//! at most 65,535 tiles. hayro-jpeg2000 works through every tile the SIZ
+//! segment implies, whatever the file holds: a 776-byte codestream with tiles
+//! of two samples took minutes to decode.
+
+/// The most tiles a codestream can name.
+const MAX_TILES: u64 = 65_535;
+
+fn be32(d: &[u8], at: usize) -> Option<u64> {
+    Some(u64::from(u32::from_be_bytes(
+        d.get(at..at + 4)?.try_into().ok()?,
+    )))
+}
+
+/// The codestream of `data`: the data itself, or the `jp2c` box of a JP2 file.
+fn codestream(data: &[u8]) -> Option<&[u8]> {
+    if data.starts_with(&[0xFF, 0x4F]) {
+        return Some(data);
+    }
+    let mut rest = data;
+    while let Some(len) = be32(rest, 0) {
+        let kind = rest.get(4..8)?;
+        let (header, len) = match len {
+            0 => (8, rest.len() as u64),
+            1 => (16, be32(rest, 8)? << 32 | be32(rest, 12)?),
+            n => (8, n),
+        };
+        if len < header {
+            return None;
+        }
+        let end = usize::try_from(len).ok()?.min(rest.len());
+        if kind == b"jp2c" {
+            return rest.get(header as usize..end);
+        }
+        rest = rest.get(end..)?;
+    }
+    None
+}
+
+/// Whether the header of the codestream in `data` (a bare one or a JP2 file's)
+/// implies more tiles than a file can hold. A header that cannot be read is
+/// left to the decoder.
+pub(super) fn has_too_many_tiles(data: &[u8]) -> bool {
+    let Some(cs) = codestream(data) else {
+        return false;
+    };
+    if !cs.starts_with(&[0xFF, 0x4F, 0xFF, 0x51]) {
+        return false;
+    }
+    // After SOC and SIZ's marker: Lsiz, Rsiz, then Xsiz, Ysiz, XOsiz, YOsiz,
+    // XTsiz, YTsiz, XTOsiz and YTOsiz, four bytes each.
+    let s = &cs[4..];
+    let (Some(x), Some(y), Some(tw), Some(th), Some(tx0), Some(ty0)) = (
+        be32(s, 4),
+        be32(s, 8),
+        be32(s, 20),
+        be32(s, 24),
+        be32(s, 28),
+        be32(s, 32),
+    ) else {
+        return false;
+    };
+    if tw == 0 || th == 0 {
+        return false;
+    }
+    let across = x.saturating_sub(tx0).div_ceil(tw);
+    let down = y.saturating_sub(ty0).div_ceil(th);
+    across.saturating_mul(down) > MAX_TILES
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// SOC and a SIZ segment of one 8-bit component.
+    fn siz(x: u32, y: u32, tile: (u32, u32)) -> Vec<u8> {
+        let mut v = vec![0xFF, 0x4F, 0xFF, 0x51, 0, 41, 0, 0];
+        for n in [x, y, 0, 0, tile.0, tile.1, 0, 0] {
+            v.extend_from_slice(&n.to_be_bytes());
+        }
+        v.extend_from_slice(&[0, 1, 7, 1, 1]);
+        v
+    }
+
+    #[test]
+    fn the_tiles_of_the_grid_are_counted() {
+        assert!(!has_too_many_tiles(&siz(4080, 4080, (16, 16))));
+        // 256 x 256 tiles is one more than 16 bits name.
+        assert!(has_too_many_tiles(&siz(4096, 4096, (16, 16))));
+        assert!(has_too_many_tiles(&siz(u32::MAX, u32::MAX, (1, 1))));
+        assert!(!has_too_many_tiles(&siz(u32::MAX, 1, (u32::MAX, 1))));
+    }
+
+    #[test]
+    fn a_header_that_cannot_be_read_is_not_judged() {
+        assert!(!has_too_many_tiles(b""));
+        assert!(!has_too_many_tiles(&[0xFF, 0x4F, 0xFF, 0x51, 0, 41]));
+        assert!(!has_too_many_tiles(&siz(100, 100, (0, 0))));
+    }
+
+    #[test]
+    fn a_jp2_file_is_judged_by_its_codestream() {
+        let cs = siz(u32::MAX, u32::MAX, (1, 1));
+        let mut file = b"\0\0\0\x0cjP  \r\n\x87\n".to_vec();
+        file.extend_from_slice(&(8 + cs.len() as u32).to_be_bytes());
+        file.extend_from_slice(b"jp2c");
+        file.extend_from_slice(&cs);
+        assert!(has_too_many_tiles(&file));
+    }
+}
diff --git a/crates/exav-render/src/formats/markdown.rs b/crates/exav-render/src/formats/markdown.rs
new file mode 100644
index 00000000..278d596b
--- /dev/null
+++ b/crates/exav-render/src/formats/markdown.rs
@@ -0,0 +1,877 @@
+//! Markdown into a tree of data: blocks and inlines, never markup.
+//!
+//! CommonMark with tables and strikethrough, parsed by pulldown-cmark, whose
+//! events are folded into [`Block`] and [`Inline`] here. Raw HTML is text (a
+//! `<script>` is the characters `<script>`), an image is its alt text, and
+//! the page that draws the tree decides what a link may do.
+//!
+//! A link is kept only when its target is an absolute http, https or mailto
+//! address of at most [`MAX_TARGET`] bytes, with no space, control, line or
+//! paragraph separator or bidirectional control character and, for http and
+//! https, no credentials
+//! (`https://bank.example@evil.example`). Any other is its label alone. The
+//! drawing side checks the address again with its own URL reader, which is
+//! the one that follows it.
+//!
+//! The work and the tree are bounded whatever the input: quotes and lists
+//! nest to [`MAX_BLOCK_DEPTH`] and what is deeper is kept as one text block,
+//! inlines to [`MAX_INLINE_DEPTH`] (deeper ones are dropped, their content
+//! kept), a table has at most [`MAX_COLUMNS`] columns, and past
+//! [`MAX_NODES`] nodes the rest of the document is left out and
+//! [`Document::truncated`] is set. No step recurses on the input.
+
+use pulldown_cmark::{Alignment, Event, LinkType, Options, Parser, Tag, TagEnd};
+
+/// Nesting of block quotes and lists.
+pub const MAX_BLOCK_DEPTH: usize = 10;
+/// Nesting of emphasis, strong, strikethrough and links in a block.
+pub const MAX_INLINE_DEPTH: usize = 32;
+/// Blocks, inlines and table cells in a document.
+pub const MAX_NODES: usize = 100_000;
+/// Cells kept per table row.
+pub const MAX_COLUMNS: usize = 64;
+/// Bytes of a link target.
+pub const MAX_TARGET: usize = 2048;
+/// The largest list start number (nine digits, as CommonMark has it).
+const MAX_START: u64 = 999_999_999;
+
+/// The content of a paragraph, heading or table cell.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Inline {
+    Text(String),
+    Code(String),
+    /// A hard line break.
+    Br,
+    Em(Vec<Inline>),
+    Strong(Vec<Inline>),
+    Del(Vec<Inline>),
+    /// `url` is an absolute http, https or mailto address, see the module.
+    Link {
+        url: String,
+        children: Vec<Inline>,
+    },
+    /// Never loaded: the alt text, which may be empty.
+    Image {
+        alt: String,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Align {
+    Left,
+    Center,
+    Right,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Block {
+    Para(Vec<Inline>),
+    Heading {
+        level: u8,
+        children: Vec<Inline>,
+    },
+    Code(String),
+    Rule,
+    Quote(Vec<Block>),
+    List {
+        ordered: bool,
+        start: u64,
+        /// No item has a paragraph of its own.
+        tight: bool,
+        items: Vec<Vec<Block>>,
+    },
+    Table {
+        align: Vec<Option<Align>>,
+        head: Vec<Vec<Inline>>,
+        rows: Vec<Vec<Vec<Inline>>>,
+    },
+    /// Raw HTML, or what is nested deeper than [`MAX_BLOCK_DEPTH`], as text.
+    Raw(String),
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Document {
+    pub blocks: Vec<Block>,
+    /// [`MAX_NODES`] was reached: the rest of the document is left out.
+    pub truncated: bool,
+}
+
+/// Reads `src`. The caller bounds its length.
+pub fn parse(src: &str) -> Document {
+    let mut b = Builder::default();
+    b.stack.push(Open::Root(Vec::new()));
+    let options = Options::ENABLE_TABLES | Options::ENABLE_STRIKETHROUGH;
+    for event in Parser::new_ext(src, options) {
+        if b.truncated {
+            break;
+        }
+        b.event(event);
+    }
+    b.finish()
+}
+
+// ── the text a reader sees ───────────────────────────────────────────────────
+
+/// What [`visible_text`] gives back.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Visible {
+    pub text: String,
+    /// `max_len` was reached: the rest of the document is left out.
+    pub truncated: bool,
+    /// Each link whose label is not its target, as `(label, target)`, for a
+    /// check of what a link says against where it goes. At most 4096.
+    pub links: Vec<(String, String)>,
+    /// The parts of the text, in order, as a label and the bytes of `text`
+    /// they cover (a sheet, a slide): to say where a match is. Empty for a
+    /// document of one block.
+    pub sections: Vec<(String, std::ops::Range<usize>)>,
+    /// Why the document's text could not be read in full, when it is a kind
+    /// of document that has some but this one's could not be taken out
+    /// (encrypted, past a limit, damaged): what is in `text` is not all of it.
+    pub unreadable: Option<String>,
+}
+
+fn newline(out: &mut String) {
+    if !out.is_empty() && !out.ends_with('\n') {
+        out.push('\n');
+    }
+}
+
+/// The text of `src` as a reader sees it, for a scanner or a search: the
+/// words of every block in order, one block per line, a table row on a line
+/// with its cells apart by tabs, code and raw HTML as written, an image as its
+/// alt text, and a link as its label followed by its target in parentheses
+/// when the label is not the target. Unlike [`parse`], a link keeps its
+/// target whatever it is (`javascript:` too): what a scanner looks for is what
+/// a reader is being led to.
+///
+/// Reads events and builds no tree, so nesting costs nothing. The text is cut
+/// at `max_len` bytes (a reference used many times repeats its target). The
+/// caller bounds the length of `src`.
+pub fn visible_text(src: &str, max_len: usize) -> Visible {
+    let options = Options::ENABLE_TABLES | Options::ENABLE_STRIKETHROUGH;
+    let mut out = String::new();
+    // Where each open link's label starts, and its target.
+    let mut links: Vec<(usize, String)> = Vec::new();
+    let mut pairs: Vec<(String, String)> = Vec::new();
+    let mut truncated = false;
+    for event in Parser::new_ext(src, options) {
+        match event {
+            Event::Text(s) | Event::Code(s) | Event::Html(s) | Event::InlineHtml(s) => {
+                out.push_str(&s)
+            }
+            Event::SoftBreak | Event::HardBreak => out.push('\n'),
+            Event::Rule => newline(&mut out),
+            Event::Start(Tag::Link { dest_url, .. }) => {
+                links.push((out.len(), dest_url.into_string()))
+            }
+            Event::End(TagEnd::Link) => {
+                if let Some((start, url)) = links.pop() {
+                    let label = out.get(start..).unwrap_or("");
+                    if label != url && label != url.strip_prefix("mailto:").unwrap_or(&url) {
+                        if pairs.len() < 4096 {
+                            pairs.push((
+                                label.trim().chars().take(2048).collect(),
+                                url.chars().take(2048).collect(),
+                            ));
+                        }
+                        out.push_str(" (");
+                        out.push_str(&url);
+                        out.push(')');
+                    }
+                }
+            }
+            Event::End(TagEnd::TableCell) => out.push('\t'),
+            Event::End(
+                TagEnd::Paragraph
+                | TagEnd::Heading(_)
+                | TagEnd::BlockQuote(_)
+                | TagEnd::CodeBlock
+                | TagEnd::HtmlBlock
+                | TagEnd::List(_)
+                | TagEnd::Item
+                | TagEnd::Table
+                | TagEnd::TableHead
+                | TagEnd::TableRow,
+            ) => {
+                // A row ends its last cell's tab.
+                if out.ends_with('\t') {
+                    out.pop();
+                }
+                newline(&mut out);
+            }
+            _ => {}
+        }
+        if out.len() > max_len {
+            let mut cut = max_len;
+            while !out.is_char_boundary(cut) {
+                cut -= 1;
+            }
+            out.truncate(cut);
+            truncated = true;
+            break;
+        }
+    }
+    Visible {
+        text: out,
+        truncated,
+        links: pairs,
+        sections: Vec::new(),
+        unreadable: None,
+    }
+}
+
+// ── the builder ──────────────────────────────────────────────────────────────
+
+enum Leaf {
+    Para,
+    Heading(u8),
+    Cell,
+}
+
+enum Wrap {
+    Base,
+    Em,
+    Strong,
+    Del,
+    Link(String),
+    /// An inline nested past the limit: its content goes to the parent.
+    Flat,
+}
+
+/// A paragraph, heading or table cell being read.
+struct Run {
+    leaf: Leaf,
+    /// A tight list item's text, which has no paragraph event.
+    implicit: bool,
+    frames: Vec<(Wrap, Vec<Inline>)>,
+    /// Nesting depth and alt text of an image being read.
+    image: Option<(usize, String)>,
+}
+
+enum Open {
+    Root(Vec<Block>),
+    Quote(Vec<Block>),
+    List {
+        ordered: bool,
+        start: u64,
+        items: Vec<Vec<Block>>,
+        loose: bool,
+    },
+    Item {
+        blocks: Vec<Block>,
+        paragraph: bool,
+    },
+    Table {
+        align: Vec<Option<Align>>,
+        head: Vec<Vec<Inline>>,
+        rows: Vec<Vec<Vec<Inline>>>,
+        row: Vec<Vec<Inline>>,
+    },
+    Code(String),
+    Html(String),
+}
+
+#[derive(Default)]
+struct Builder {
+    stack: Vec<Open>,
+    leaf: Option<Run>,
+    nodes: usize,
+    truncated: bool,
+    /// Events left to the end of a container nested too deep.
+    deep: usize,
+    flat: String,
+    finishing: bool,
+}
+
+fn safe_target(dest: &str) -> bool {
+    if dest.len() > MAX_TARGET {
+        return false;
+    }
+    let lower = dest.get(..8).unwrap_or(dest).to_ascii_lowercase();
+    let web = lower.starts_with("http://") || lower.starts_with("https://");
+    if !web && !lower.starts_with("mailto:") {
+        return false;
+    }
+    let bad = |c: char| {
+        let c = c as u32;
+        c <= 0x20
+            || (0x7f..=0x9f).contains(&c)
+            || c == 0x2028
+            || c == 0x2029
+            || (0x202a..=0x202e).contains(&c)
+            || (0x2066..=0x2069).contains(&c)
+    };
+    if dest.chars().any(bad) {
+        return false;
+    }
+    if web {
+        let rest = &dest[dest.find("//").map_or(0, |i| i + 2)..];
+        // A backslash ends the authority too, as a URL reader takes it for
+        // a slash.
+        let authority = rest.split(['/', '\\', '?', '#']).next().unwrap_or("");
+        if authority.is_empty() || authority.contains('@') {
+            return false;
+        }
+    } else if dest.len() == "mailto:".len() {
+        return false;
+    }
+    true
+}
+
+impl Builder {
+    fn spend(&mut self) -> bool {
+        // The containers open at the limit are closed with what they have.
+        if self.finishing {
+            return true;
+        }
+        self.nodes += 1;
+        if self.nodes > MAX_NODES {
+            self.truncated = true;
+        }
+        !self.truncated
+    }
+
+    fn push_block(&mut self, block: Block) {
+        if !self.spend() {
+            return;
+        }
+        let target = self.stack.iter_mut().rev().find_map(|o| match o {
+            Open::Root(b) | Open::Quote(b) | Open::Item { blocks: b, .. } => Some(b),
+            _ => None,
+        });
+        if let Some(blocks) = target {
+            blocks.push(block);
+        }
+    }
+
+    fn nesting(&self) -> usize {
+        self.stack
+            .iter()
+            .filter(|o| matches!(o, Open::Quote(_) | Open::List { .. }))
+            .count()
+    }
+
+    /// A tight list item's text has no paragraph around it.
+    fn leaf_mut(&mut self) -> &mut Run {
+        self.leaf.get_or_insert_with(|| Run {
+            leaf: Leaf::Para,
+            implicit: true,
+            frames: vec![(Wrap::Base, Vec::new())],
+            image: None,
+        })
+    }
+
+    fn start_leaf(&mut self, leaf: Leaf) {
+        self.flush_implicit();
+        self.leaf = Some(Run {
+            leaf,
+            implicit: false,
+            frames: vec![(Wrap::Base, Vec::new())],
+            image: None,
+        });
+    }
+
+    fn flush_implicit(&mut self) {
+        if self.leaf.as_ref().is_some_and(|l| l.implicit) {
+            self.end_leaf();
+        }
+    }
+
+    fn push_inline(&mut self, inline: Inline) {
+        if let (Inline::Text(add), Some(Inline::Text(last))) = (
+            &inline,
+            self.leaf_mut()
+                .frames
+                .last_mut()
+                .and_then(|f| f.1.last_mut()),
+        ) {
+            last.push_str(add);
+            return;
+        }
+        if !self.spend() {
+            return;
+        }
+        if let Some(f) = self.leaf_mut().frames.last_mut() {
+            f.1.push(inline);
+        }
+    }
+
+    fn start_inline(&mut self, wrap: Wrap) {
+        let leaf = self.leaf_mut();
+        let wrap = if leaf.frames.len() >= MAX_INLINE_DEPTH {
+            Wrap::Flat
+        } else {
+            wrap
+        };
+        leaf.frames.push((wrap, Vec::new()));
+    }
+
+    fn end_inline(&mut self) {
+        let Some(leaf) = self.leaf.as_mut() else {
+            return;
+        };
+        if leaf.frames.len() < 2 {
+            return;
+        }
+        let Some((wrap, children)) = leaf.frames.pop() else {
+            return;
+        };
+        let inline = match wrap {
+            Wrap::Em => Inline::Em(children),
+            Wrap::Strong => Inline::Strong(children),
+            Wrap::Del => Inline::Del(children),
+            Wrap::Link(url) => Inline::Link { url, children },
+            Wrap::Base | Wrap::Flat => {
+                if let Some(parent) = leaf.frames.last_mut() {
+                    parent.1.extend(children);
+                }
+                return;
+            }
+        };
+        self.push_inline(inline);
+    }
+
+    fn end_leaf(&mut self) {
+        while self.leaf.as_ref().is_some_and(|l| l.frames.len() > 1) {
+            self.end_inline();
+        }
+        let Some(mut leaf) = self.leaf.take() else {
+            return;
+        };
+        if let Some((_, alt)) = leaf.image.take() {
+            // An image the page ended inside of: kept as what it had.
+            leaf.frames[0].1.push(Inline::Image { alt });
+        }
+        let children = leaf.frames.pop().map(|f| f.1).unwrap_or_default();
+        match leaf.leaf {
+            Leaf::Para => self.push_block(Block::Para(children)),
+            Leaf::Heading(level) => self.push_block(Block::Heading { level, children }),
+            Leaf::Cell => {
+                if !self.spend() {
+                    return;
+                }
+                if let Some(Open::Table { row, .. }) = self.stack.last_mut()
+                    && row.len() < MAX_COLUMNS
+                {
+                    row.push(children);
+                }
+            }
+        }
+    }
+
+    /// Closes the container on top of the stack into the one below it.
+    fn close_top(&mut self) {
+        if self.stack.len() < 2 {
+            return;
+        }
+        let Some(top) = self.stack.pop() else { return };
+        match top {
+            Open::Root(_) => {}
+            Open::Quote(blocks) => self.push_block(Block::Quote(blocks)),
+            Open::List {
+                ordered,
+                start,
+                items,
+                loose,
+            } => self.push_block(Block::List {
+                ordered,
+                start,
+                tight: !loose,
+                items,
+            }),
+            Open::Item { blocks, paragraph } => {
+                if let Some(Open::List { items, loose, .. }) = self.stack.last_mut() {
+                    items.push(blocks);
+                    *loose |= paragraph;
+                }
+            }
+            Open::Table {
+                align, head, rows, ..
+            } => self.push_block(Block::Table { align, head, rows }),
+            Open::Code(mut s) => {
+                if s.ends_with('\n') {
+                    s.pop();
+                }
+                self.push_block(Block::Code(s));
+            }
+            Open::Html(s) => self.push_block(Block::Raw(s.trim_end_matches('\n').to_string())),
+        }
+    }
+
+    fn open(&mut self, o: Open) {
+        self.flush_implicit();
+        self.stack.push(o);
+    }
+
+    fn container_start(&mut self, o: Open) {
+        if self.nesting() >= MAX_BLOCK_DEPTH {
+            self.flush_implicit();
+            self.deep = 1;
+            self.flat.clear();
+        } else {
+            self.open(o);
+        }
+    }
+
+    /// Everything inside a container nested too deep, as the text of one block.
+    fn event_deep(&mut self, event: Event<'_>) {
+        match event {
+            Event::Start(_) => self.deep += 1,
+            Event::End(end) => {
+                self.deep -= 1;
+                let block_end = !matches!(
+                    end,
+                    TagEnd::Emphasis
+                        | TagEnd::Strong
+                        | TagEnd::Strikethrough
+                        | TagEnd::Link
+                        | TagEnd::Image
+                        | TagEnd::TableCell
+                );
+                if block_end && !self.flat.is_empty() && !self.flat.ends_with('\n') {
+                    self.flat.push('\n');
+                }
+                if self.deep == 0 {
+                    let text = std::mem::take(&mut self.flat);
+                    self.push_block(Block::Raw(text.trim_end_matches('\n').to_string()));
+                }
+            }
+            Event::Text(s) | Event::Code(s) | Event::Html(s) | Event::InlineHtml(s) => {
+                self.flat.push_str(&s)
+            }
+            Event::SoftBreak | Event::HardBreak => self.flat.push('\n'),
+            _ => {}
+        }
+    }
+
+    fn event_image(&mut self, event: &Event<'_>) {
+        let Some(image) = self.leaf.as_mut().and_then(|l| l.image.as_mut()) else {
+            return;
+        };
+        match event {
+            Event::Start(Tag::Image { .. }) => image.0 += 1,
+            Event::End(TagEnd::Image) => {
+                image.0 -= 1;
+                if image.0 == 0 {
+                    let alt = std::mem::take(&mut image.1);
+                    if let Some(l) = self.leaf.as_mut() {
+                        l.image = None;
+                    }
+                    self.push_inline(Inline::Image { alt });
+                }
+            }
+            // Tags in the description are kept as the text they are.
+            Event::Text(s) | Event::Code(s) | Event::InlineHtml(s) | Event::Html(s) => {
+                image.1.push_str(s)
+            }
+            Event::SoftBreak | Event::HardBreak => image.1.push(' '),
+            _ => {}
+        }
+    }
+
+    fn event(&mut self, event: Event<'_>) {
+        if self.deep > 0 {
+            return self.event_deep(event);
+        }
+        if self.leaf.as_ref().is_some_and(|l| l.image.is_some()) {
+            return self.event_image(&event);
+        }
+        if let (Event::Text(s) | Event::Html(s), Some(Open::Code(text) | Open::Html(text))) =
+            (&event, self.stack.last_mut())
+        {
+            text.push_str(s);
+            return;
+        }
+        match event {
+            Event::Start(tag) => self.start(tag),
+            Event::End(end) => self.end(end),
+            Event::Text(s) | Event::Html(s) | Event::InlineHtml(s) => {
+                self.push_inline(Inline::Text(s.into_string()))
+            }
+            Event::Code(s) => self.push_inline(Inline::Code(s.into_string())),
+            Event::SoftBreak => self.push_inline(Inline::Text("\n".to_string())),
+            Event::HardBreak => self.push_inline(Inline::Br),
+            Event::Rule => {
+                self.flush_implicit();
+                self.push_block(Block::Rule);
+            }
+            _ => {}
+        }
+    }
+
+    fn start(&mut self, tag: Tag<'_>) {
+        match tag {
+            Tag::Paragraph => {
+                if let Some(Open::Item { paragraph, .. }) = self.stack.last_mut() {
+                    *paragraph = true;
+                }
+                self.start_leaf(Leaf::Para);
+            }
+            Tag::Heading { level, .. } => self.start_leaf(Leaf::Heading(level as u8)),
+            Tag::BlockQuote(_) => self.container_start(Open::Quote(Vec::new())),
+            Tag::List(first) => self.container_start(Open::List {
+                ordered: first.is_some(),
+                start: first.unwrap_or(1).min(MAX_START),
+                items: Vec::new(),
+                loose: false,
+            }),
+            Tag::Item => self.open(Open::Item {
+                blocks: Vec::new(),
+                paragraph: false,
+            }),
+            Tag::CodeBlock(_) => self.open(Open::Code(String::new())),
+            Tag::HtmlBlock => self.open(Open::Html(String::new())),
+            Tag::Table(align) => self.open(Open::Table {
+                align: align
+                    .iter()
+                    .take(MAX_COLUMNS)
+                    .map(|a| match a {
+                        Alignment::None => None,
+                        Alignment::Left => Some(Align::Left),
+                        Alignment::Center => Some(Align::Center),
+                        Alignment::Right => Some(Align::Right),
+                    })
+                    .collect(),
+                head: Vec::new(),
+                rows: Vec::new(),
+                row: Vec::new(),
+            }),
+            Tag::TableHead | Tag::TableRow => {
+                if let Some(Open::Table { row, .. }) = self.stack.last_mut() {
+                    row.clear();
+                }
+            }
+            Tag::TableCell => self.start_leaf(Leaf::Cell),
+            Tag::Emphasis => self.start_inline(Wrap::Em),
+            Tag::Strong => self.start_inline(Wrap::Strong),
+            Tag::Strikethrough => self.start_inline(Wrap::Del),
+            Tag::Link {
+                link_type,
+                dest_url,
+                ..
+            } => {
+                // An address between angle brackets has no scheme of its own.
+                let url = if link_type == LinkType::Email {
+                    format!("mailto:{dest_url}")
+                } else {
+                    dest_url.into_string()
+                };
+                let wrap = if safe_target(&url) {
+                    Wrap::Link(url)
+                } else {
+                    Wrap::Flat
+                };
+                self.start_inline(wrap);
+            }
+            Tag::Image { .. } => {
+                self.leaf_mut().image = Some((1, String::new()));
+            }
+            _ => {}
+        }
+    }
+
+    fn end(&mut self, end: TagEnd) {
+        match end {
+            TagEnd::Paragraph | TagEnd::Heading(_) | TagEnd::TableCell => self.end_leaf(),
+            TagEnd::BlockQuote(_)
+            | TagEnd::List(_)
+            | TagEnd::Item
+            | TagEnd::CodeBlock
+            | TagEnd::HtmlBlock
+            | TagEnd::Table => {
+                self.flush_implicit();
+                self.close_top();
+            }
+            TagEnd::TableHead | TagEnd::TableRow => {
+                // A short row gets empty cells, up to the header's width.
+                let missing = match self.stack.last() {
+                    Some(Open::Table { align, row, .. }) => align.len().saturating_sub(row.len()),
+                    _ => 0,
+                };
+                for _ in 0..missing {
+                    if !self.spend() {
+                        break;
+                    }
+                    if let Some(Open::Table { row, .. }) = self.stack.last_mut() {
+                        row.push(Vec::new());
+                    }
+                }
+                if let Some(Open::Table {
+                    head, rows, row, ..
+                }) = self.stack.last_mut()
+                {
+                    let done = std::mem::take(row);
+                    if matches!(end, TagEnd::TableHead) {
+                        *head = done;
+                    } else {
+                        rows.push(done);
+                    }
+                }
+            }
+            TagEnd::Emphasis | TagEnd::Strong | TagEnd::Strikethrough | TagEnd::Link => {
+                self.end_inline()
+            }
+            _ => {}
+        }
+    }
+
+    fn finish(mut self) -> Document {
+        self.finishing = true;
+        if self.deep > 0 && !self.flat.is_empty() {
+            let text = std::mem::take(&mut self.flat);
+            self.push_block(Block::Raw(text.trim_end_matches('\n').to_string()));
+        }
+        self.end_leaf();
+        while self.stack.len() > 1 {
+            self.close_top();
+        }
+        let blocks = match self.stack.pop() {
+            Some(Open::Root(b)) => b,
+            _ => Vec::new(),
+        };
+        Document {
+            blocks,
+            truncated: self.truncated,
+        }
+    }
+}
+
+// ── JSON ─────────────────────────────────────────────────────────────────────
+
+fn string(out: &mut String, s: &str) {
+    out.push('"');
+    for c in s.chars() {
+        match c {
+            '"' => out.push_str("\\\""),
+            '\\' => out.push_str("\\\\"),
+            '\n' => out.push_str("\\n"),
+            '\r' => out.push_str("\\r"),
+            '\t' => out.push_str("\\t"),
+            c if (c as u32) < 0x20 => out.push_str(&format!("\\u{:04x}", c as u32)),
+            c => out.push(c),
+        }
+    }
+    out.push('"');
+}
+
+fn list<T>(out: &mut String, items: &[T], one: fn(&mut String, &T)) {
+    out.push('[');
+    for (i, item) in items.iter().enumerate() {
+        if i > 0 {
+            out.push(',');
+        }
+        one(out, item);
+    }
+    out.push(']');
+}
+
+fn inline(out: &mut String, n: &Inline) {
+    let wrapped = |out: &mut String, t: &str, c: &[Inline]| {
+        out.push_str(&format!("{{\"t\":\"{t}\",\"c\":"));
+        list(out, c, inline);
+        out.push('}');
+    };
+    match n {
+        Inline::Text(s) => {
+            out.push_str("{\"t\":\"text\",\"s\":");
+            string(out, s);
+            out.push('}');
+        }
+        Inline::Code(s) => {
+            out.push_str("{\"t\":\"code\",\"s\":");
+            string(out, s);
+            out.push('}');
+        }
+        Inline::Br => out.push_str("{\"t\":\"br\"}"),
+        Inline::Em(c) => wrapped(out, "em", c),
+        Inline::Strong(c) => wrapped(out, "strong", c),
+        Inline::Del(c) => wrapped(out, "del", c),
+        Inline::Link { url, children } => {
+            out.push_str("{\"t\":\"link\",\"url\":");
+            string(out, url);
+            out.push_str(",\"c\":");
+            list(out, children, inline);
+            out.push('}');
+        }
+        Inline::Image { alt } => {
+            out.push_str("{\"t\":\"image\",\"alt\":");
+            string(out, alt);
+            out.push('}');
+        }
+    }
+}
+
+fn inlines(out: &mut String, c: &[Inline]) {
+    list(out, c, inline);
+}
+
+fn block(out: &mut String, b: &Block) {
+    match b {
+        Block::Para(c) => {
+            out.push_str("{\"t\":\"p\",\"c\":");
+            inlines(out, c);
+            out.push('}');
+        }
+        Block::Heading { level, children } => {
+            out.push_str(&format!("{{\"t\":\"h\",\"level\":{level},\"c\":"));
+            inlines(out, children);
+            out.push('}');
+        }
+        Block::Code(s) => {
+            out.push_str("{\"t\":\"code\",\"s\":");
+            string(out, s);
+            out.push('}');
+        }
+        Block::Rule => out.push_str("{\"t\":\"hr\"}"),
+        Block::Quote(c) => {
+            out.push_str("{\"t\":\"quote\",\"c\":");
+            list(out, c, block);
+            out.push('}');
+        }
+        Block::List {
+            ordered,
+            start,
+            tight,
+            items,
+        } => {
+            out.push_str(&format!("{{\"t\":\"list\",\"ordered\":{ordered},\"start\":{start},\"tight\":{tight},\"items\":"));
+            list(out, items, |out, item| list(out, item, block));
+            out.push('}');
+        }
+        Block::Table { align, head, rows } => {
+            out.push_str("{\"t\":\"table\",\"align\":");
+            list(out, align, |out, a| {
+                out.push_str(match a {
+                    None => "null",
+                    Some(Align::Left) => "\"left\"",
+                    Some(Align::Center) => "\"center\"",
+                    Some(Align::Right) => "\"right\"",
+                })
+            });
+            out.push_str(",\"head\":");
+            list(out, head, |out, c| inlines(out, c));
+            out.push_str(",\"rows\":");
+            list(out, rows, |out, row| {
+                list(out, row, |out, c| inlines(out, c))
+            });
+            out.push('}');
+        }
+        Block::Raw(s) => {
+            out.push_str("{\"t\":\"raw\",\"s\":");
+            string(out, s);
+            out.push('}');
+        }
+    }
+}
+
+impl Document {
+    /// `{"blocks": [...], "truncated": bool}`; the page's `Block` and
+    /// `Inline` types (`ts/text/markdown.ts`) are this shape.
+    pub fn to_json(&self) -> String {
+        let mut out = String::from("{\"blocks\":");
+        list(&mut out, &self.blocks, block);
+        out.push_str(&format!(",\"truncated\":{}}}", self.truncated));
+        out
+    }
+}
diff --git a/crates/exav-render/src/formats/mesh.rs b/crates/exav-render/src/formats/mesh.rs
index 22b18153..1ccf0b54 100644
--- a/crates/exav-render/src/formats/mesh.rs
+++ b/crates/exav-render/src/formats/mesh.rs
@@ -1,14 +1,16 @@
-//! Triangle meshes ready for a GPU, the output of the IFC and STL readers.
+//! Triangle meshes ready for a GPU, the output of the IFC, STL, OBJ, PLY and
+//! glTF readers.
 //!
 //! A [`Scene`] holds its triangles in [`Batch`]es, one per class and colour,
 //! so that a renderer draws a model in few calls; each [`Element`] says
 //! which index ranges of which batches are its own, for picking and
 //! highlighting. Positions are `f32` relative to [`Scene::origin`], which
 //! keeps a georeferenced model, kilometres from zero, precise to the
-//! millimetre. Z is up.
+//! millimetre. Z is up for IFC and STL; OBJ, PLY and glTF keep the axes of
+//! the file (glTF is Y up).
 
-// The scene builder (welding, smoothing, outlines) is the IFC reader's; STL
-// fills its one batch itself.
+// The scene builder (welding, smoothing, outlines) is the IFC reader's; the
+// others fill their one batch themselves.
 #![cfg_attr(not(feature = "ifc"), allow(dead_code))]
 
 use std::collections::{BTreeMap, HashMap};
@@ -44,6 +46,10 @@ pub struct Batch {
     /// RGBA in 0..1 as the file gives it (sRGB); `None` when the file gives
     /// no colour, which leaves the choice to the renderer.
     pub color: Option<[f32; 4]>,
+    /// Index into [`Scene::nodes`] of the storey all its elements belong
+    /// to, so that a storey can be shown or hidden by batch. `None` for
+    /// elements of no storey, and for the other formats.
+    pub storey: Option<u32>,
     /// xyz per vertex.
     pub positions: Vec<f32>,
     /// Unit xyz per vertex.
@@ -67,6 +73,10 @@ pub struct Element {
     pub name: String,
     /// Index into [`Scene::nodes`] of the spatial element that contains it.
     pub node: Option<u32>,
+    /// Index into [`Scene::nodes`] of the building storey it belongs to:
+    /// its container when that is a storey, else the nearest storey above
+    /// it in the spatial tree (a room's storey, for an element in a room).
+    pub storey: Option<u32>,
     pub ranges: Vec<Range>,
 }
 
@@ -87,6 +97,8 @@ pub struct Node {
     pub class: String,
     pub name: String,
     pub parent: Option<u32>,
+    /// A storey's `Elevation` in metres, when the file gives one.
+    pub elevation: Option<f64>,
 }
 
 /// What could not be drawn, counted.
@@ -131,10 +143,13 @@ pub(crate) struct Part {
     pub edges: bool,
 }
 
+/// What a batch is of: class, colour (as bits) and storey.
+type BatchKey = (String, Option<[u32; 4]>, Option<u32>);
+
 /// Builds a [`Scene`] element by element within a triangle budget.
 pub(crate) struct SceneBuilder {
     pub scene: Scene,
-    batches: HashMap<(String, Option<[u32; 4]>), u32>,
+    batches: HashMap<BatchKey, u32>,
     pub budget: usize,
 }
 
@@ -147,8 +162,12 @@ impl SceneBuilder {
         }
     }
 
-    fn batch(&mut self, class: &str, color: Option<[f32; 4]>) -> u32 {
-        let key = (class.to_string(), color.map(|c| c.map(f32::to_bits)));
+    fn batch(&mut self, class: &str, color: Option<[f32; 4]>, storey: Option<u32>) -> u32 {
+        let key = (
+            class.to_string(),
+            color.map(|c| c.map(f32::to_bits)),
+            storey,
+        );
         if let Some(&i) = self.batches.get(&key) {
             return i;
         }
@@ -156,6 +175,7 @@ impl SceneBuilder {
         self.scene.batches.push(Batch {
             class: class.to_string(),
             color,
+            storey,
             ..Batch::default()
         });
         self.batches.insert(key, i);
@@ -176,7 +196,7 @@ impl SceneBuilder {
                 continue;
             }
             self.budget -= finished.indices.len() / 3;
-            let b = self.batch(&element.class, part.color);
+            let b = self.batch(&element.class, part.color, element.storey);
             let batch = &mut self.scene.batches[b as usize];
             let base = (batch.positions.len() / 3) as u32;
             let first = batch.indices.len() as u32;
diff --git a/crates/exav-render/src/formats/mod.rs b/crates/exav-render/src/formats/mod.rs
index dcadc6b9..874a3a79 100644
--- a/crates/exav-render/src/formats/mod.rs
+++ b/crates/exav-render/src/formats/mod.rs
@@ -4,13 +4,39 @@
 pub mod cad;
 #[cfg(feature = "dwg")]
 pub mod dwg;
+#[cfg(feature = "gltf")]
+pub mod gltf;
 #[cfg(feature = "ifc")]
 pub mod ifc;
 #[cfg(feature = "image")]
 pub mod image;
-#[cfg(any(feature = "ifc", feature = "stl"))]
+#[cfg(feature = "jp2")]
+mod jp2_tiles;
+#[cfg(feature = "markdown")]
+pub mod markdown;
+#[cfg(any(
+    feature = "ifc",
+    feature = "stl",
+    feature = "obj",
+    feature = "ply",
+    feature = "gltf"
+))]
 pub mod mesh;
+#[cfg(feature = "obj")]
+pub mod obj;
+#[cfg(feature = "_office")]
+pub mod office;
 #[cfg(any(feature = "jp2", feature = "jbig2", feature = "ccitt"))]
 pub mod pdf_image;
+#[cfg(feature = "ply")]
+pub mod ply;
+#[cfg(any(feature = "obj", feature = "ply", feature = "gltf"))]
+mod soup;
 #[cfg(feature = "stl")]
 pub mod stl;
+#[cfg(feature = "text")]
+pub mod text;
+
+/// Most bytes a decoded image may take: the `image` crate's default, which
+/// ClamAV decodes with.
+pub const DECODE_MAX: u64 = 512 * 1024 * 1024;
diff --git a/crates/exav-render/src/formats/obj.rs b/crates/exav-render/src/formats/obj.rs
new file mode 100644
index 00000000..1e2133d8
--- /dev/null
+++ b/crates/exav-render/src/formats/obj.rs
@@ -0,0 +1,197 @@
+//! Wavefront OBJ into a [`Scene`] with one element per group or object.
+//!
+//! Read: `v` (with the `r g b` some exporters add), `vn` and `f`, in the
+//! `v`, `v/vt`, `v//vn` and `v/vt/vn` forms, with negative indices counted
+//! back from the vertices read so far; `g` and `o` start an element; a line
+//! may continue on the next with a trailing backslash. Polygons are
+//! triangulated, see [`Soup`].
+//!
+//! Ignored: texture coordinates, `usemtl`, `mtllib` and every other
+//! statement. A material library is never opened, so a model has its
+//! vertex colours or none. Lines, points and free-form curves and surfaces
+//! are counted in `warnings.unsupported`. A face that names a vertex not yet
+//! defined, or index 0, is dropped and counted in `warnings.invalid`; a
+//! normal that does not exist is replaced by the face's.
+//!
+//! The file has no up axis: coordinates are returned as written.
+
+use std::fmt;
+
+use super::mesh::Scene;
+use super::soup::{Corner, Soup, number, unit_byte};
+
+/// Why a file was not read.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Error {
+    /// Binary, or without a single vertex or face.
+    NotObj,
+    /// Faces, but none that could be drawn.
+    NoValidFaces,
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotObj => f.write_str("not an OBJ file"),
+            Error::NoValidFaces => f.write_str("no face of the OBJ file can be drawn"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+/// Reads at most `max_triangles`; past them the rest is left out and
+/// `warnings.truncated` is 1.
+pub fn read(bytes: &[u8], max_triangles: usize) -> Result<Scene, Error> {
+    if bytes[..bytes.len().min(8192)].contains(&0) {
+        return Err(Error::NotObj);
+    }
+    let mut soup = Soup::new(max_triangles);
+    let mut positions: Vec<[f32; 3]> = Vec::new();
+    // Per vertex, alpha 0 for none; empty until a vertex has a colour.
+    let mut colors: Vec<[u8; 4]> = Vec::new();
+    let mut normals: Vec<[f32; 3]> = Vec::new();
+    let mut corners: Vec<Corner> = Vec::new();
+    let mut unsupported = std::collections::BTreeMap::<String, u32>::new();
+    let (mut seen, mut faces, mut damaged) = (false, false, false);
+    let mut joined: Vec<u8> = Vec::new();
+
+    let mut lines = bytes.split(|&b| b == b'\n');
+    while let Some(first) = lines.next() {
+        let mut line = first;
+        // A backslash continues the statement on the next line.
+        if ends_with_backslash(line) {
+            joined.clear();
+            let mut part = first;
+            loop {
+                joined.extend_from_slice(trim_backslash(part));
+                joined.push(b' ');
+                if !ends_with_backslash(part) {
+                    break;
+                }
+                match lines.next() {
+                    Some(next) => part = next,
+                    None => break,
+                }
+            }
+            line = &joined;
+        }
+        let mut tokens = line
+            .split(|b| b.is_ascii_whitespace())
+            .filter(|t| !t.is_empty());
+        let Some(keyword) = tokens.next() else {
+            continue;
+        };
+        match keyword {
+            b"v" => {
+                let values: Vec<Option<f64>> = tokens.take(7).map(number).collect();
+                seen = true;
+                let ok = values.len() >= 3 && values[..3].iter().all(Option::is_some);
+                if !ok {
+                    damaged = true;
+                }
+                let at = |i: usize| values.get(i).copied().flatten().unwrap_or(f64::NAN);
+                // NaN placeholders keep the indices of the vertices after it.
+                positions.push(if ok {
+                    [at(0) as f32, at(1) as f32, at(2) as f32]
+                } else {
+                    [f32::NAN; 3]
+                });
+                // Six values are x y z r g b; four are x y z w.
+                let rgb = values.len() >= 6 && values[3..6].iter().all(Option::is_some);
+                if rgb || !colors.is_empty() {
+                    colors.resize(positions.len() - 1, [0; 4]);
+                    colors.push(if rgb {
+                        [unit_byte(at(3)), unit_byte(at(4)), unit_byte(at(5)), 1]
+                    } else {
+                        [0; 4]
+                    });
+                }
+            }
+            b"vn" => {
+                let v: Vec<f64> = tokens.take(3).filter_map(number).collect();
+                normals.push(if v.len() == 3 {
+                    [v[0] as f32, v[1] as f32, v[2] as f32]
+                } else {
+                    [f32::NAN; 3]
+                });
+            }
+            b"f" => {
+                seen = true;
+                faces = true;
+                corners.clear();
+                let mut valid = true;
+                for t in tokens {
+                    let mut parts = t.split(|&b| b == b'/');
+                    let v = parts.next().and_then(|s| index(s, positions.len()));
+                    let n = parts
+                        .nth(1)
+                        .and_then(|s| index(s, normals.len()))
+                        .and_then(|i| normals.get(i).copied());
+                    match v.and_then(|i| positions.get(i).map(|p| (i, *p))) {
+                        Some((i, p)) => {
+                            let c = colors
+                                .get(i)
+                                .filter(|c| c[3] != 0)
+                                .map(|c| [c[0], c[1], c[2]]);
+                            corners.push(Corner { p, n, c });
+                        }
+                        None => {
+                            valid = false;
+                            break;
+                        }
+                    }
+                }
+                if !valid || corners.len() < 3 {
+                    soup.invalid = soup.invalid.saturating_add(1);
+                } else if !soup.polygon(&corners) {
+                    break;
+                }
+            }
+            b"g" | b"o" => {
+                let rest: Vec<u8> = tokens.collect::<Vec<_>>().join(&b' ');
+                soup.begin(&String::from_utf8_lossy(&rest));
+            }
+            b"l" | b"p" | b"curv" | b"curv2" | b"surf" => {
+                let key = String::from_utf8_lossy(keyword).into_owned();
+                let n = unsupported.entry(key).or_insert(0);
+                *n = n.saturating_add(1);
+            }
+            _ => {}
+        }
+    }
+    if !seen {
+        return Err(Error::NotObj);
+    }
+    let invalid = soup.invalid;
+    let truncated = soup.truncated;
+    let triangles = soup.triangles();
+    let mut scene = soup.finish();
+    if faces && triangles == 0 && invalid > 0 && !truncated {
+        return Err(Error::NoValidFaces);
+    }
+    scene.warnings.unsupported = unsupported;
+    scene.warnings.damaged = damaged;
+    Ok(scene)
+}
+
+fn ends_with_backslash(line: &[u8]) -> bool {
+    line.trim_ascii_end().last() == Some(&b'\\')
+}
+
+fn trim_backslash(line: &[u8]) -> &[u8] {
+    let t = line.trim_ascii_end();
+    t.strip_suffix(b"\\").unwrap_or(t)
+}
+
+/// A 1-based index, or a negative one counted back from `count`, as an
+/// offset into the `count` items read so far.
+fn index(token: &[u8], count: usize) -> Option<usize> {
+    let n: i64 = std::str::from_utf8(token).ok()?.parse().ok()?;
+    let at = match n {
+        1.. => n - 1,
+        0 => return None,
+        _ => i64::try_from(count).ok()?.checked_add(n)?,
+    };
+    usize::try_from(at).ok().filter(|&i| i < count)
+}
diff --git a/crates/exav-render/src/formats/office/common/base64.rs b/crates/exav-render/src/formats/office/common/base64.rs
new file mode 100644
index 00000000..ee068867
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/base64.rs
@@ -0,0 +1,49 @@
+//! Base64 (RFC 4648) decoding for binary data embedded in XML.
+
+/// Decodes `s`, ignoring white space; `None` on any other character that is
+/// not in the alphabet, or past `max` bytes of output. Padding is optional.
+pub fn decode(s: &str, max: usize) -> Option<Vec<u8>> {
+    let mut out = Vec::with_capacity((s.len() / 4 * 3).min(max));
+    let mut acc = 0u32;
+    let mut bits = 0u32;
+    for c in s.bytes() {
+        let v = match c {
+            b'A'..=b'Z' => c - b'A',
+            b'a'..=b'z' => c - b'a' + 26,
+            b'0'..=b'9' => c - b'0' + 52,
+            b'+' | b'-' => 62,
+            b'/' | b'_' => 63,
+            b'=' => break,
+            b' ' | b'\t' | b'\r' | b'\n' => continue,
+            _ => return None,
+        };
+        acc = acc << 6 | u32::from(v);
+        bits += 6;
+        if bits >= 8 {
+            bits -= 8;
+            out.push((acc >> bits) as u8);
+            acc &= (1 << bits) - 1;
+            if out.len() > max {
+                return None;
+            }
+        }
+    }
+    Some(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn decodes_with_and_without_padding() {
+        assert_eq!(decode("aGVsbG8=", 100).unwrap(), b"hello");
+        assert_eq!(decode("aGVs\nbG8", 100).unwrap(), b"hello");
+        assert_eq!(decode("", 100).unwrap(), b"");
+        assert_eq!(decode("aGVs*G8", 100), None);
+        // Both alphabets: 62 and 63 are `+/` or `-_`.
+        assert_eq!(decode("+/8=", 100).unwrap(), [0xFB, 0xFF]);
+        assert_eq!(decode("-_8=", 100).unwrap(), [0xFB, 0xFF]);
+        assert_eq!(decode("aGVsbG8=", 3), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/bytes.rs b/crates/exav-render/src/formats/office/common/bytes.rs
new file mode 100644
index 00000000..74d08e6d
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/bytes.rs
@@ -0,0 +1,4 @@
+//! The bounds-checked little-endian cursor, which the scanner's readers use
+//! too.
+
+pub use exav_unpack::bytes::{Cur, u16_at, u32_at};
diff --git a/crates/exav-render/src/formats/office/common/css.rs b/crates/exav-render/src/formats/office/common/css.rs
new file mode 100644
index 00000000..af520cd4
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/css.rs
@@ -0,0 +1,505 @@
+//! The bits of CSS that Office's HTML and SpreadsheetML carry: colours
+//! (hexadecimal, `rgb()`, the CSS named colours and the Windows system
+//! colours Internet Explorer knew), lengths, declaration lists and the
+//! rules of a `<style>` block.
+
+use std::collections::HashMap;
+
+/// 0xRRGGBB.
+pub type Rgb = u32;
+
+/// CSS Color Module Level 4's named colours, sorted.
+const NAMED: &[(&str, Rgb)] = &[
+    ("aliceblue", 0xF0F8FF),
+    ("antiquewhite", 0xFAEBD7),
+    ("aqua", 0x00FFFF),
+    ("aquamarine", 0x7FFFD4),
+    ("azure", 0xF0FFFF),
+    ("beige", 0xF5F5DC),
+    ("bisque", 0xFFE4C4),
+    ("black", 0x000000),
+    ("blanchedalmond", 0xFFEBCD),
+    ("blue", 0x0000FF),
+    ("blueviolet", 0x8A2BE2),
+    ("brown", 0xA52A2A),
+    ("burlywood", 0xDEB887),
+    ("cadetblue", 0x5F9EA0),
+    ("chartreuse", 0x7FFF00),
+    ("chocolate", 0xD2691E),
+    ("coral", 0xFF7F50),
+    ("cornflowerblue", 0x6495ED),
+    ("cornsilk", 0xFFF8DC),
+    ("crimson", 0xDC143C),
+    ("cyan", 0x00FFFF),
+    ("darkblue", 0x00008B),
+    ("darkcyan", 0x008B8B),
+    ("darkgoldenrod", 0xB8860B),
+    ("darkgray", 0xA9A9A9),
+    ("darkgreen", 0x006400),
+    ("darkgrey", 0xA9A9A9),
+    ("darkkhaki", 0xBDB76B),
+    ("darkmagenta", 0x8B008B),
+    ("darkolivegreen", 0x556B2F),
+    ("darkorange", 0xFF8C00),
+    ("darkorchid", 0x9932CC),
+    ("darkred", 0x8B0000),
+    ("darksalmon", 0xE9967A),
+    ("darkseagreen", 0x8FBC8F),
+    ("darkslateblue", 0x483D8B),
+    ("darkslategray", 0x2F4F4F),
+    ("darkslategrey", 0x2F4F4F),
+    ("darkturquoise", 0x00CED1),
+    ("darkviolet", 0x9400D3),
+    ("deeppink", 0xFF1493),
+    ("deepskyblue", 0x00BFFF),
+    ("dimgray", 0x696969),
+    ("dimgrey", 0x696969),
+    ("dodgerblue", 0x1E90FF),
+    ("firebrick", 0xB22222),
+    ("floralwhite", 0xFFFAF0),
+    ("forestgreen", 0x228B22),
+    ("fuchsia", 0xFF00FF),
+    ("gainsboro", 0xDCDCDC),
+    ("ghostwhite", 0xF8F8FF),
+    ("gold", 0xFFD700),
+    ("goldenrod", 0xDAA520),
+    ("gray", 0x808080),
+    ("green", 0x008000),
+    ("greenyellow", 0xADFF2F),
+    ("grey", 0x808080),
+    ("honeydew", 0xF0FFF0),
+    ("hotpink", 0xFF69B4),
+    ("indianred", 0xCD5C5C),
+    ("indigo", 0x4B0082),
+    ("ivory", 0xFFFFF0),
+    ("khaki", 0xF0E68C),
+    ("lavender", 0xE6E6FA),
+    ("lavenderblush", 0xFFF0F5),
+    ("lawngreen", 0x7CFC00),
+    ("lemonchiffon", 0xFFFACD),
+    ("lightblue", 0xADD8E6),
+    ("lightcoral", 0xF08080),
+    ("lightcyan", 0xE0FFFF),
+    ("lightgoldenrodyellow", 0xFAFAD2),
+    ("lightgray", 0xD3D3D3),
+    ("lightgreen", 0x90EE90),
+    ("lightgrey", 0xD3D3D3),
+    ("lightpink", 0xFFB6C1),
+    ("lightsalmon", 0xFFA07A),
+    ("lightseagreen", 0x20B2AA),
+    ("lightskyblue", 0x87CEFA),
+    ("lightslategray", 0x778899),
+    ("lightslategrey", 0x778899),
+    ("lightsteelblue", 0xB0C4DE),
+    ("lightyellow", 0xFFFFE0),
+    ("lime", 0x00FF00),
+    ("limegreen", 0x32CD32),
+    ("linen", 0xFAF0E6),
+    ("magenta", 0xFF00FF),
+    ("maroon", 0x800000),
+    ("mediumaquamarine", 0x66CDAA),
+    ("mediumblue", 0x0000CD),
+    ("mediumorchid", 0xBA55D3),
+    ("mediumpurple", 0x9370DB),
+    ("mediumseagreen", 0x3CB371),
+    ("mediumslateblue", 0x7B68EE),
+    ("mediumspringgreen", 0x00FA9A),
+    ("mediumturquoise", 0x48D1CC),
+    ("mediumvioletred", 0xC71585),
+    ("midnightblue", 0x191970),
+    ("mintcream", 0xF5FFFA),
+    ("mistyrose", 0xFFE4E1),
+    ("moccasin", 0xFFE4B5),
+    ("navajowhite", 0xFFDEAD),
+    ("navy", 0x000080),
+    ("oldlace", 0xFDF5E6),
+    ("olive", 0x808000),
+    ("olivedrab", 0x6B8E23),
+    ("orange", 0xFFA500),
+    ("orangered", 0xFF4500),
+    ("orchid", 0xDA70D6),
+    ("palegoldenrod", 0xEEE8AA),
+    ("palegreen", 0x98FB98),
+    ("paleturquoise", 0xAFEEEE),
+    ("palevioletred", 0xDB7093),
+    ("papayawhip", 0xFFEFD5),
+    ("peachpuff", 0xFFDAB9),
+    ("peru", 0xCD853F),
+    ("pink", 0xFFC0CB),
+    ("plum", 0xDDA0DD),
+    ("powderblue", 0xB0E0E6),
+    ("purple", 0x800080),
+    ("rebeccapurple", 0x663399),
+    ("red", 0xFF0000),
+    ("rosybrown", 0xBC8F8F),
+    ("royalblue", 0x4169E1),
+    ("saddlebrown", 0x8B4513),
+    ("salmon", 0xFA8072),
+    ("sandybrown", 0xF4A460),
+    ("seagreen", 0x2E8B57),
+    ("seashell", 0xFFF5EE),
+    ("sienna", 0xA0522D),
+    ("silver", 0xC0C0C0),
+    ("skyblue", 0x87CEEB),
+    ("slateblue", 0x6A5ACD),
+    ("slategray", 0x708090),
+    ("slategrey", 0x708090),
+    ("snow", 0xFFFAFA),
+    ("springgreen", 0x00FF7F),
+    ("steelblue", 0x4682B4),
+    ("tan", 0xD2B48C),
+    ("teal", 0x008080),
+    ("thistle", 0xD8BFD8),
+    ("tomato", 0xFF6347),
+    ("turquoise", 0x40E0D0),
+    ("violet", 0xEE82EE),
+    ("wheat", 0xF5DEB3),
+    ("white", 0xFFFFFF),
+    ("whitesmoke", 0xF5F5F5),
+    ("yellow", 0xFFFF00),
+    ("yellowgreen", 0x9ACD32),
+];
+
+/// The Windows system colours of a default Windows theme, for the CSS2
+/// system colour names Excel writes (`windowtext` above all), sorted.
+const SYSTEM: &[(&str, Rgb)] = &[
+    ("activeborder", 0xB4B4B4),
+    ("activecaption", 0x99B4D1),
+    ("appworkspace", 0xABABAB),
+    ("background", 0x000000),
+    ("buttonface", 0xF0F0F0),
+    ("buttonhighlight", 0xFFFFFF),
+    ("buttonshadow", 0xA0A0A0),
+    ("buttontext", 0x000000),
+    ("captiontext", 0x000000),
+    ("graytext", 0x6D6D6D),
+    ("highlight", 0x0078D7),
+    ("highlighttext", 0xFFFFFF),
+    ("inactiveborder", 0xF4F7FC),
+    ("inactivecaption", 0xBFCDDB),
+    ("inactivecaptiontext", 0x000000),
+    ("infobackground", 0xFFFFE1),
+    ("infotext", 0x000000),
+    ("menu", 0xF0F0F0),
+    ("menutext", 0x000000),
+    ("scrollbar", 0xC8C8C8),
+    ("threeddarkshadow", 0x696969),
+    ("threedface", 0xF0F0F0),
+    ("threedhighlight", 0xFFFFFF),
+    ("threedlightshadow", 0xE3E3E3),
+    ("threedshadow", 0xA0A0A0),
+    ("window", 0xFFFFFF),
+    ("windowframe", 0x646464),
+    ("windowtext", 0x000000),
+];
+
+/// A colour: `Some(Some(rgb))`, `Some(None)` for the automatic colour or
+/// transparent, `None` when it is not one.
+pub fn color(s: &str) -> Option<Option<Rgb>> {
+    let s = s
+        .trim()
+        .trim_end_matches("!important")
+        .trim()
+        .to_ascii_lowercase();
+    if matches!(
+        s.as_str(),
+        "automatic" | "auto" | "transparent" | "none" | "inherit" | "initial"
+    ) {
+        return Some(None);
+    }
+    if let Some(h) = s.strip_prefix('#') {
+        let v = u32::from_str_radix(h, 16).ok()?;
+        return match h.len() {
+            6 => Some(Some(v)),
+            3 => Some(Some(
+                ((v >> 8) & 0xF) * 0x110000 + ((v >> 4) & 0xF) * 0x1100 + (v & 0xF) * 0x11,
+            )),
+            _ => None,
+        };
+    }
+    if let Some(args) = s.strip_prefix("rgb(").or_else(|| s.strip_prefix("rgba(")) {
+        let parts: Vec<&str> = args
+            .trim_end_matches(')')
+            .split([',', ' ', '/'])
+            .filter(|p| !p.is_empty())
+            .collect();
+        if parts.len() < 3 {
+            return None;
+        }
+        let mut rgb = 0u32;
+        for p in &parts[..3] {
+            let v = match p.strip_suffix('%') {
+                Some(pc) => pc.parse::<f64>().ok()? * 255.0 / 100.0,
+                None => p.parse::<f64>().ok()?,
+            };
+            if !v.is_finite() {
+                return None;
+            }
+            rgb = rgb << 8 | v.round().clamp(0.0, 255.0) as u32;
+        }
+        return Some(Some(rgb));
+    }
+    let find = |t: &[(&str, Rgb)]| {
+        t.binary_search_by_key(&s.as_str(), |e| e.0)
+            .ok()
+            .map(|i| t[i].1)
+    };
+    find(NAMED).or_else(|| find(SYSTEM)).map(Some)
+}
+
+/// A length in points: pt, px (at 96 dpi), in, cm, mm, pc; a bare number
+/// is taken as `bare_unit`.
+pub fn length_pt(s: &str, bare_unit: &str) -> Option<f64> {
+    let s = s
+        .trim()
+        .trim_end_matches("!important")
+        .trim()
+        .to_ascii_lowercase();
+    let split = s
+        .find(|c: char| !(c.is_ascii_digit() || matches!(c, '.' | '-' | '+')))
+        .unwrap_or(s.len());
+    let (num, unit) = s.split_at(split);
+    let v: f64 = num.parse().ok().filter(|v: &f64| v.is_finite())?;
+    let unit = if unit.is_empty() {
+        bare_unit
+    } else {
+        unit.trim()
+    };
+    Some(match unit {
+        "pt" => v,
+        "px" => v * 0.75,
+        "in" => v * 72.0,
+        "cm" => v * 72.0 / 2.54,
+        "mm" => v * 72.0 / 25.4,
+        "pc" => v * 12.0,
+        _ => return None,
+    })
+}
+
+/// A declaration list (`a: b; c: d`), property names in lower case, values
+/// trimmed. Quotes and parentheses keep their semicolons.
+pub fn declarations(s: &str) -> Vec<(String, String)> {
+    let mut out = vec![];
+    let mut start = 0;
+    let mut quote = None;
+    let mut depth = 0u32;
+    let b = s.as_bytes();
+    for i in 0..=b.len() {
+        let c = b.get(i).copied();
+        match (c, quote) {
+            (Some(q), Some(open)) if q == open => quote = None,
+            (Some(_), Some(_)) => {}
+            (Some(q @ (b'"' | b'\'')), None) => quote = Some(q),
+            (Some(b'('), None) => depth += 1,
+            (Some(b')'), None) => depth = depth.saturating_sub(1),
+            (Some(b';'), None) | (None, _) if depth == 0 || c.is_none() => {
+                let decl = &s[start..i];
+                if let Some((k, v)) = decl.split_once(':') {
+                    let k = k.trim().to_ascii_lowercase();
+                    if !k.is_empty() {
+                        out.push((k, v.trim().to_string()));
+                    }
+                }
+                start = i + 1;
+                if out.len() >= 256 {
+                    break;
+                }
+            }
+            _ => {}
+        }
+    }
+    out
+}
+
+/// A style sheet: the declarations of each simple selector (`td`,
+/// `.xl65`, `td.xl65`), in source order.
+#[derive(Default)]
+pub struct Sheet {
+    rules: Vec<(String, Vec<(String, String)>)>,
+    /// The rules of each selector, by position.
+    index: HashMap<String, Vec<usize>>,
+    /// The declarations handed out so far.
+    work: std::cell::Cell<u64>,
+}
+
+/// Declarations a sheet hands out in all, over every element of a page: past
+/// it elements get none, so a long sheet over many elements costs the one
+/// bound and not the product.
+const MAX_HANDED_OUT: u64 = 1 << 24;
+
+impl Sheet {
+    /// The rules of a `<style>` block.
+    pub fn add(&mut self, css_text: &str) {
+        // Comments out, the HTML comment markers Excel wraps it in too.
+        let mut t = String::with_capacity(css_text.len());
+        let mut rest = css_text;
+        while let Some(p) = rest.find("/*") {
+            t.push_str(&rest[..p]);
+            rest = rest[p + 2..]
+                .find("*/")
+                .map_or("", |e| &rest[p + 2 + e + 2..]);
+        }
+        t.push_str(rest);
+        let t = t.replace("<!--", " ").replace("-->", " ");
+        let mut rest = t.as_str();
+        while let Some(open) = rest.find('{') {
+            let Some(close) = rest[open..].find('}').map(|c| open + c) else {
+                break;
+            };
+            let decls = declarations(&rest[open + 1..close]);
+            for sel in rest[..open].split(',') {
+                let sel = sel.trim().to_ascii_lowercase();
+                if !sel.is_empty() && !sel.starts_with('@') && self.rules.len() < 1 << 16 {
+                    self.index
+                        .entry(sel.clone())
+                        .or_default()
+                        .push(self.rules.len());
+                    self.rules.push((sel, decls.clone()));
+                }
+            }
+            rest = &rest[close + 1..];
+        }
+    }
+
+    /// Declarations for an element of `tag` and `classes`: the element's
+    /// rules, then its classes', each in source order. A class naming
+    /// `mso-style-parent` gets that style's declarations under its own.
+    pub fn lookup(&self, tag: &str, classes: &[&str], out: &mut Vec<(String, String)>) {
+        for &i in self.matching(tag) {
+            if !self.hand_out(i, out) {
+                return;
+            }
+        }
+        for cls in classes {
+            let cls = cls.to_ascii_lowercase();
+            let dot = format!(".{cls}");
+            let tagged = format!("{tag}.{cls}");
+            let mut hits: Vec<usize> = self
+                .matching(&dot)
+                .iter()
+                .chain(self.matching(&tagged))
+                .copied()
+                .collect();
+            hits.sort_unstable();
+            for i in hits {
+                let decls = &self.rules[i].1;
+                if let Some(parent) = decls
+                    .iter()
+                    .find(|d| d.0 == "mso-style-parent")
+                    .map(|d| d.1.trim().to_ascii_lowercase())
+                    && parent != cls
+                {
+                    for &j in self.matching(&format!(".{parent}")) {
+                        if !self.hand_out(j, out) {
+                            return;
+                        }
+                    }
+                }
+                if !self.hand_out(i, out) {
+                    return;
+                }
+            }
+        }
+    }
+
+    /// The declarations of every rule, for a reader that wants to know what
+    /// the sheet says anywhere.
+    pub fn declarations(&self) -> impl Iterator<Item = &(String, String)> {
+        self.rules.iter().flat_map(|r| r.1.iter())
+    }
+
+    fn matching(&self, selector: &str) -> &[usize] {
+        if self.work.get() > MAX_HANDED_OUT {
+            return &[];
+        }
+        self.index.get(selector).map_or(&[], Vec::as_slice)
+    }
+
+    /// Adds the declarations of rule `i` to `out`, unless the sheet has handed
+    /// out its share.
+    fn hand_out(&self, i: usize, out: &mut Vec<(String, String)>) -> bool {
+        let decls = &self.rules[i].1;
+        let used = self.work.get().saturating_add(decls.len() as u64 + 1);
+        self.work.set(used);
+        if used > MAX_HANDED_OUT {
+            return false;
+        }
+        out.extend(decls.iter().cloned());
+        true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn tables_are_sorted() {
+        for t in [NAMED, SYSTEM] {
+            assert!(t.array_windows().all(|[a, b]| a.0 < b.0));
+        }
+    }
+
+    #[test]
+    fn colors() {
+        assert_eq!(color("#FF8000"), Some(Some(0xFF8000)));
+        assert_eq!(color("#f80"), Some(Some(0xFF8800)));
+        assert_eq!(color("WindowText"), Some(Some(0)));
+        assert_eq!(color("Silver"), Some(Some(0xC0C0C0)));
+        assert_eq!(color("rgb(255, 0, 50%)"), Some(Some(0xFF0080)));
+        assert_eq!(color("Automatic"), Some(None));
+        assert_eq!(color("nonsense"), None);
+    }
+
+    fn declarations_of(sheet: &Sheet, tag: &str, classes: &[&str]) -> Vec<(String, String)> {
+        let mut out = vec![];
+        sheet.lookup(tag, classes, &mut out);
+        out
+    }
+
+    #[test]
+    fn rules_are_found_in_source_order_with_a_parent_style_first() {
+        let mut s = Sheet::default();
+        s.add("td.x{a:1} .x{b:2; mso-style-parent:base} td{c:3} .base{d:4} .x{e:5} p.x{f:6}");
+        let names = |tag, classes: &[&str]| {
+            declarations_of(&s, tag, classes)
+                .into_iter()
+                .map(|d| d.0)
+                .collect::<Vec<_>>()
+                .join(" ")
+        };
+        assert_eq!(names("td", &["x"]), "c a d b mso-style-parent e");
+        assert_eq!(names("p", &["x"]), "d b mso-style-parent e f");
+        assert_eq!(names("span", &["base", "X"]), "d d b mso-style-parent e");
+    }
+
+    /// What lookups return in all is bounded, so that a long style sheet over
+    /// many elements is not a cost of one times the other.
+    #[test]
+    fn the_declarations_a_sheet_returns_are_bounded() {
+        let mut s = Sheet::default();
+        let big: String = (0..256).map(|i| format!("p{i}:v;")).collect();
+        s.add(&format!(".a{{{big}}}"));
+        let total: usize = (0..100_000)
+            .map(|_| declarations_of(&s, "p", &["a"]).len())
+            .sum();
+        assert!(total > 1 << 23, "{total}");
+        assert!(total <= (1 << 24) + 512, "{total}");
+    }
+
+    #[test]
+    fn lists_and_lengths() {
+        assert_eq!(
+            declarations("mso-number-format:\"0\\.00;\\(0\\)\"; color:red ;;bad"),
+            [
+                (
+                    "mso-number-format".to_string(),
+                    "\"0\\.00;\\(0\\)\"".to_string()
+                ),
+                ("color".to_string(), "red".to_string())
+            ]
+        );
+        assert_eq!(length_pt("20px", "pt"), Some(15.0));
+        assert_eq!(length_pt("12", "pt"), Some(12.0));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/escher.rs b/crates/exav-render/src/formats/office/common/escher.rs
new file mode 100644
index 00000000..5d1904b2
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/escher.rs
@@ -0,0 +1,633 @@
+//! OfficeArt records ([MS-ODRAW] 2.2): an 8-byte header (version and
+//! instance, type, length) and a body; containers hold records. Shape
+//! property tables, the shape tree of a drawing and the picture store.
+
+use super::bytes::Cur;
+use std::io::Read;
+
+pub const DGG_CONTAINER: u16 = 0xF000;
+pub const BSTORE_CONTAINER: u16 = 0xF001;
+pub const DG_CONTAINER: u16 = 0xF002;
+pub const SPGR_CONTAINER: u16 = 0xF003;
+pub const SP_CONTAINER: u16 = 0xF004;
+pub const BSE: u16 = 0xF007;
+pub const FSPGR: u16 = 0xF009;
+pub const FSP: u16 = 0xF00A;
+pub const FOPT: u16 = 0xF00B;
+pub const CLIENT_TEXTBOX: u16 = 0xF00D;
+pub const CHILD_ANCHOR: u16 = 0xF00F;
+pub const CLIENT_ANCHOR: u16 = 0xF010;
+pub const CLIENT_DATA: u16 = 0xF011;
+pub const SECONDARY_FOPT: u16 = 0xF121;
+pub const TERTIARY_FOPT: u16 = 0xF122;
+
+pub const F_GROUP: u32 = 0x1;
+pub const F_CHILD: u32 = 0x2;
+pub const F_PATRIARCH: u32 = 0x4;
+pub const F_DELETED: u32 = 0x8;
+pub const F_OLE: u32 = 0x10;
+pub const F_HAVE_MASTER: u32 = 0x20;
+pub const F_FLIP_H: u32 = 0x40;
+pub const F_FLIP_V: u32 = 0x80;
+pub const F_CONNECTOR: u32 = 0x100;
+pub const F_HAVE_ANCHOR: u32 = 0x200;
+pub const F_BACKGROUND: u32 = 0x400;
+pub const F_HAVE_SPT: u32 = 0x800;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Rec<'a> {
+    pub ver: u8,
+    pub inst: u16,
+    pub typ: u16,
+    pub data: &'a [u8],
+    /// Offset of the header in the slice it was read from.
+    pub at: usize,
+}
+
+impl<'a> Rec<'a> {
+    pub fn children(&self) -> Children<'a> {
+        Children::new(self.data)
+    }
+
+    pub fn child(&self, typ: u16) -> Option<Rec<'a>> {
+        self.children().find(|r| r.typ == typ)
+    }
+
+    pub fn cur(&self) -> Cur<'a> {
+        Cur::new(self.data)
+    }
+}
+
+/// The record at `at` in `d`; a length past the end is cut to what is there.
+pub fn read_at(d: &[u8], at: usize) -> Option<Rec<'_>> {
+    let mut c = Cur::at(d, at);
+    if c.left() < 8 {
+        return None;
+    }
+    let vi = c.u16();
+    let typ = c.u16();
+    let len = c.u32() as usize;
+    let start = at + 8;
+    let end = start.saturating_add(len).min(d.len());
+    Some(Rec {
+        ver: (vi & 0xF) as u8,
+        inst: vi >> 4,
+        typ,
+        data: &d[start..end],
+        at,
+    })
+}
+
+/// The records one after another in a container's body.
+pub struct Children<'a> {
+    d: &'a [u8],
+    p: usize,
+    n: usize,
+}
+
+impl<'a> Children<'a> {
+    pub fn new(d: &'a [u8]) -> Self {
+        Children { d, p: 0, n: 0 }
+    }
+}
+
+const MAX_CHILDREN: usize = 1 << 18;
+
+impl<'a> Iterator for Children<'a> {
+    type Item = Rec<'a>;
+
+    fn next(&mut self) -> Option<Rec<'a>> {
+        if self.n >= MAX_CHILDREN {
+            return None;
+        }
+        let r = read_at(self.d, self.p)?;
+        self.p = self.p + 8 + r.data.len();
+        self.n += 1;
+        Some(r)
+    }
+}
+
+/// One entry of a property table: id (without its flags), value, and for a
+/// complex property its data.
+#[derive(Clone, Debug)]
+pub struct Prop<'a> {
+    pub id: u16,
+    pub value: u32,
+    pub complex: Option<&'a [u8]>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Props<'a>(pub Vec<Prop<'a>>);
+
+impl<'a> Props<'a> {
+    pub fn get(&self, id: u16) -> Option<u32> {
+        self.0.iter().rev().find(|p| p.id == id).map(|p| p.value)
+    }
+
+    pub fn int(&self, id: u16) -> Option<i32> {
+        self.get(id).map(|v| v as i32)
+    }
+
+    pub fn complex(&self, id: u16) -> Option<&'a [u8]> {
+        self.0
+            .iter()
+            .rev()
+            .find(|p| p.id == id)
+            .and_then(|p| p.complex)
+    }
+
+    /// A boolean of a set (its property id `set`): bit `bit` (0 for the last
+    /// of the set's 16 values) when its "use" bit (bit + 16) is set.
+    pub fn flag(&self, set: u16, bit: u32) -> Option<bool> {
+        let v = self.get(set)?;
+        (v & (1 << (bit + 16)) != 0).then_some(v & (1 << bit) != 0)
+    }
+
+    /// `o`'s properties over these.
+    pub fn overlay(&mut self, o: &Props<'a>) {
+        for p in &o.0 {
+            if let Some(q) = self.0.iter_mut().find(|q| q.id == p.id) {
+                // Boolean sets merge bit by bit: each "use" bit of `o` wins.
+                if p.id & 0x3F == 0x3F && p.complex.is_none() {
+                    let used = p.value >> 16;
+                    q.value = (q.value & !(used | used << 16)) | (p.value & (used | used << 16));
+                } else {
+                    *q = p.clone();
+                }
+            } else {
+                self.0.push(p.clone());
+            }
+        }
+    }
+}
+
+/// Reads a property table: `n` entries, then the complex data in order.
+pub fn read_props(d: &[u8], n: u16) -> Props<'_> {
+    let mut c = Cur::new(d);
+    let mut entries = vec![];
+    for _ in 0..n.min(1024) {
+        let opid = c.u16();
+        let value = c.u32();
+        if c.short {
+            break;
+        }
+        entries.push((opid, value));
+    }
+    let mut p = c.p;
+    let mut out = Vec::with_capacity(entries.len());
+    for (opid, value) in entries {
+        let id = opid & 0x3FFF;
+        if opid & 0x8000 != 0 {
+            let len = value as usize;
+            let end = p.saturating_add(len).min(d.len());
+            out.push(Prop {
+                id,
+                value,
+                complex: Some(&d[p.min(end)..end]),
+            });
+            p = end;
+        } else {
+            out.push(Prop {
+                id,
+                value,
+                complex: None,
+            });
+        }
+    }
+    Props(out)
+}
+
+/// The elements of an IMsoArray ([MS-ODRAW] 2.2.51). Element size 0xFFF0
+/// means 4-byte elements holding two 16-bit halves.
+pub fn array(d: &[u8]) -> Vec<&[u8]> {
+    let mut c = Cur::new(d);
+    let n = c.u16() as usize;
+    let _alloc = c.u16();
+    let mut size = c.u16() as usize;
+    if size == 0xFFF0 {
+        size = 4;
+    }
+    if size == 0 || c.short {
+        return vec![];
+    }
+    let body = &d[6.min(d.len())..];
+    body.chunks_exact(size).take(n.min(1 << 20)).collect()
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct OShape<'a> {
+    pub spt: u16,
+    pub spid: u32,
+    pub flags: u32,
+    pub props: Props<'a>,
+    /// Left, top, right, bottom of a ClientAnchor.
+    pub anchor: Option<[i32; 4]>,
+    /// Left, top, right, bottom in the group's coordinates.
+    pub child: Option<[i32; 4]>,
+    /// A group's own coordinate space.
+    pub group: Option<[i32; 4]>,
+    pub client_data: Option<Rec<'a>>,
+    pub textbox: Option<Rec<'a>>,
+    pub children: Vec<OShape<'a>>,
+}
+
+impl OShape<'_> {
+    pub fn is_group(&self) -> bool {
+        self.flags & F_GROUP != 0
+    }
+}
+
+pub fn sp_container<'a>(r: &Rec<'a>) -> OShape<'a> {
+    let mut s = OShape::default();
+    for k in r.children() {
+        let mut c = k.cur();
+        match k.typ {
+            FSP => {
+                s.spt = k.inst;
+                s.spid = c.u32();
+                s.flags = c.u32();
+            }
+            FSPGR => s.group = Some([c.i32(), c.i32(), c.i32(), c.i32()]),
+            CHILD_ANCHOR => s.child = Some([c.i32(), c.i32(), c.i32(), c.i32()]),
+            CLIENT_ANCHOR => {
+                s.anchor = if k.data.len() >= 16 {
+                    let (t, l, r, b) = (c.i32(), c.i32(), c.i32(), c.i32());
+                    Some([l, t, r, b])
+                } else if k.data.len() >= 8 {
+                    let (t, l, r, b) = (c.i16(), c.i16(), c.i16(), c.i16());
+                    Some([l.into(), t.into(), r.into(), b.into()])
+                } else {
+                    None
+                };
+            }
+            FOPT | SECONDARY_FOPT | TERTIARY_FOPT => {
+                let p = read_props(k.data, k.inst);
+                s.props.overlay(&p);
+            }
+            CLIENT_DATA => s.client_data = Some(k),
+            CLIENT_TEXTBOX => s.textbox = Some(k),
+            _ => {}
+        }
+    }
+    s
+}
+
+pub fn group<'a>(r: &Rec<'a>, depth: u32) -> OShape<'a> {
+    let mut kids = r.children();
+    let mut g = match kids.next() {
+        Some(k) if k.typ == SP_CONTAINER => sp_container(&k),
+        _ => OShape {
+            flags: F_GROUP,
+            ..OShape::default()
+        },
+    };
+    g.flags |= F_GROUP;
+    for k in kids {
+        match k.typ {
+            SP_CONTAINER => g.children.push(sp_container(&k)),
+            SPGR_CONTAINER if depth < 32 => g.children.push(group(&k, depth + 1)),
+            _ => {}
+        }
+        if g.children.len() >= 1 << 16 {
+            break;
+        }
+    }
+    g
+}
+
+/// A drawing's shapes (the top group's members) and background shape.
+pub struct Drawing<'a> {
+    pub shapes: Vec<OShape<'a>>,
+    pub background: Option<OShape<'a>>,
+}
+
+/// Reads an OfficeArtDgContainer.
+pub fn drawing<'a>(dg: &Rec<'a>) -> Drawing<'a> {
+    let mut out = Drawing {
+        shapes: vec![],
+        background: None,
+    };
+    for k in dg.children() {
+        match k.typ {
+            SPGR_CONTAINER => {
+                let g = group(&k, 0);
+                out.shapes.extend(g.children);
+            }
+            SP_CONTAINER => {
+                let s = sp_container(&k);
+                if s.flags & F_BACKGROUND != 0 {
+                    out.background = Some(s);
+                }
+            }
+            _ => {}
+        }
+    }
+    out
+}
+
+pub struct Blip {
+    pub ext: &'static str,
+    pub data: Vec<u8>,
+}
+
+/// Metafiles past this size inflated are dropped.
+const MAX_METAFILE: u64 = 64 << 20;
+
+/// The picture records of the store (OfficeArtDggContainer's BStore), in
+/// order: a shape's `pib` is 1-based in it. A BSE whose picture is not in
+/// its record is read from `delay` (the stream the format keeps them in) at
+/// the BSE's offset.
+pub fn blip_records<'a>(dgg: &Rec<'a>, delay: &'a [u8]) -> Vec<Option<Rec<'a>>> {
+    let mut out = vec![];
+    let Some(store) = dgg.child(BSTORE_CONTAINER) else {
+        return out;
+    };
+    for bse in store.children() {
+        if out.len() >= 1 << 16 {
+            break;
+        }
+        if bse.typ != BSE {
+            // A blip itself, where a store lists them directly.
+            out.push(matches!(bse.typ, 0xF01A..=0xF02A).then_some(bse));
+            continue;
+        }
+        let d = bse.data;
+        let size = Cur::at(d, 20).u32() as usize;
+        let at = Cur::at(d, 28).u32() as usize;
+        let name_len = d.get(33).copied().unwrap_or(0) as usize;
+        let inline = d.get(36 + name_len..).filter(|r| r.len() >= 8);
+        let rec = match inline {
+            Some(rest) => read_at(rest, 0),
+            None if size > 0 => read_at(delay, at),
+            None => None,
+        };
+        out.push(rec);
+    }
+    out
+}
+
+/// A picture record's image: its bytes, with metafiles inflated.
+pub fn blip(r: &Rec) -> Option<Blip> {
+    // An instance with its low bit set has a second 16-byte id.
+    let two = |base: u16| if r.inst == base + 1 { 32 } else { 16 };
+    let (ext, skip, meta) = match r.typ {
+        0xF01A => ("emf", two(0x3D4), true),
+        0xF01B => ("wmf", two(0x216), true),
+        0xF01C => ("pict", two(0x542), true),
+        0xF01D | 0xF02A => (
+            "jpeg",
+            if r.inst == 0x46B || r.inst == 0x6E3 {
+                33
+            } else {
+                17
+            },
+            false,
+        ),
+        0xF01E => ("png", two(0x6E0) + 1, false),
+        0xF01F => ("bmp", two(0x7A8) + 1, false),
+        0xF029 => ("tiff", two(0x6E4) + 1, false),
+        _ => return None,
+    };
+    let d = r.data;
+    if !meta {
+        let data = d.get(skip..)?.to_vec();
+        if ext == "bmp" {
+            return Some(Blip {
+                ext,
+                data: super::image::dib_to_bmp(&data),
+            });
+        }
+        return Some(Blip { ext, data });
+    }
+    let hdr = d.get(skip..skip + 34)?;
+    let body = d.get(skip + 34..)?;
+    let data = if hdr[32] == 0 {
+        let mut out = Vec::new();
+        flate2::read::ZlibDecoder::new(body)
+            .take(MAX_METAFILE)
+            .read_to_end(&mut out)
+            .ok()?;
+        out
+    } else {
+        body.to_vec()
+    };
+    let data = if ext == "wmf" && !data.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A]) {
+        placeable_wmf(&data, hdr)
+    } else {
+        data
+    };
+    Some(Blip { ext, data })
+}
+
+/// A WMF without its placeable header gets one, from the blip's bounds.
+fn placeable_wmf(data: &[u8], hdr: &[u8]) -> Vec<u8> {
+    let mut c = Cur::at(hdr, 4);
+    let mut h = vec![0xD7, 0xCD, 0xC6, 0x9A, 0, 0];
+    for _ in 0..4 {
+        h.extend_from_slice(&(c.i32() as i16).to_le_bytes());
+    }
+    h.extend_from_slice(&1440u16.to_le_bytes());
+    h.extend_from_slice(&[0, 0, 0, 0]);
+    let mut sum = 0u16;
+    for k in 0..10 {
+        sum ^= u16::from_le_bytes([h[2 * k], h[2 * k + 1]]);
+    }
+    h.extend_from_slice(&sum.to_le_bytes());
+    h.extend_from_slice(data);
+    h
+}
+
+/// Records written for tests.
+#[cfg(any(test, feature = "office-test-util"))]
+pub mod build {
+    pub fn rec(ver: u8, inst: u16, typ: u16, body: &[u8]) -> Vec<u8> {
+        let mut v = Vec::with_capacity(body.len() + 8);
+        v.extend_from_slice(&(u16::from(ver & 0xF) | inst << 4).to_le_bytes());
+        v.extend_from_slice(&typ.to_le_bytes());
+        v.extend_from_slice(&(body.len() as u32).to_le_bytes());
+        v.extend_from_slice(body);
+        v
+    }
+
+    pub fn container(typ: u16, inst: u16, children: &[Vec<u8>]) -> Vec<u8> {
+        rec(0xF, inst, typ, &children.concat())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::build::*;
+    use super::*;
+
+    fn fopte(id: u16, v: u32) -> Vec<u8> {
+        let mut b = id.to_le_bytes().to_vec();
+        b.extend_from_slice(&v.to_le_bytes());
+        b
+    }
+
+    #[test]
+    fn children_and_truncation() {
+        let c = container(
+            0x03E8,
+            0,
+            &[rec(0, 1, 0x03E9, &[1, 2]), rec(0, 0, 0x0FA0, b"hi")],
+        );
+        let r = read_at(&c, 0).unwrap();
+        let kids: Vec<_> = r
+            .children()
+            .map(|k| (k.typ, k.inst, k.data.to_vec()))
+            .collect();
+        assert_eq!(
+            kids,
+            vec![(0x03E9, 1, vec![1, 2]), (0x0FA0, 0, b"hi".to_vec())]
+        );
+        let r = read_at(&c[..c.len() - 1], 0).unwrap();
+        assert_eq!(r.children().last().unwrap().data, b"h");
+        assert!(read_at(&c, c.len() - 4).is_none());
+    }
+
+    #[test]
+    fn property_tables_with_complex_data() {
+        let mut body = fopte(0x0181, 0x00FF_0000);
+        body.extend(fopte(0x8145, 6 + 8));
+        body.extend(fopte(0x01BF, 0x0010_0010));
+        body.extend(fopte(0xC380, 4));
+        body.extend([2, 0, 2, 0, 4, 0, 1, 0, 2, 0, 3, 0, 4, 0]);
+        body.extend(b"N\0a\0");
+        let p = read_props(&body, 4);
+        assert_eq!(p.get(0x0181), Some(0x00FF_0000));
+        let pts = array(p.complex(0x0145).unwrap());
+        assert_eq!(pts, vec![&[1, 0, 2, 0][..], &[3, 0, 4, 0][..]]);
+        assert_eq!(p.complex(0x0380), Some(&b"N\0a\0"[..]));
+        assert_eq!(p.flag(0x01BF, 4), Some(true));
+        assert_eq!(p.flag(0x01BF, 3), None);
+        // Element size 0xFFF0: four bytes each.
+        let packed = [1, 0, 1, 0, 0xF0, 0xFF, 9, 0, 8, 0];
+        assert_eq!(array(&packed), vec![&[9, 0, 8, 0][..]]);
+        // No element size, or fewer bytes than the header.
+        assert!(array(&[1, 0, 1, 0, 0, 0]).is_empty());
+        assert!(array(&[1]).is_empty());
+    }
+
+    #[test]
+    fn groups_and_anchors() {
+        let fsp = |spt: u16, flags: u32| {
+            let mut b = 1024u32.to_le_bytes().to_vec();
+            b.extend_from_slice(&flags.to_le_bytes());
+            rec(2, spt, FSP, &b)
+        };
+        let anchor = rec(0, 0, CLIENT_ANCHOR, &[10, 0, 20, 0, 120, 0, 60, 0]);
+        let g = container(
+            SPGR_CONTAINER,
+            0,
+            &[
+                container(SP_CONTAINER, 0, &[fsp(0, 4), rec(1, 0, FSPGR, &[0; 16])]),
+                container(SP_CONTAINER, 0, &[fsp(3, 0), anchor]),
+            ],
+        );
+        let top = group(&read_at(&g, 0).unwrap(), 0);
+        assert!(top.is_group());
+        assert_eq!(top.children.len(), 1);
+        let dg = container(DG_CONTAINER, 0, &[g]);
+        let d = drawing(&read_at(&dg, 0).unwrap());
+        assert_eq!(d.shapes.len(), 1);
+        assert_eq!(d.shapes[0].spt, 3);
+        assert_eq!(d.shapes[0].anchor, Some([20, 10, 120, 60]));
+    }
+
+    #[test]
+    fn boolean_sets_merge_bit_by_bit() {
+        // Bits 4 (used, set) of the first; of the second, bit 3 (used, set)
+        // and bit 4 (used, clear).
+        let (da, db) = (fopte(0x01BF, 0x0010_0010), fopte(0x01BF, 0x0008_0008));
+        let mut a = read_props(&da, 1);
+        a.overlay(&read_props(&db, 1));
+        assert_eq!(a.flag(0x01BF, 3), Some(true));
+        // Bit 4 is not used by the second set: the first's stays.
+        assert_eq!(a.flag(0x01BF, 4), Some(true));
+        // A used bit that is clear turns it off.
+        let dc = fopte(0x01BF, 0x0010_0000);
+        a.overlay(&read_props(&dc, 1));
+        assert_eq!(a.flag(0x01BF, 4), Some(false));
+        assert_eq!(a.flag(0x01BF, 3), Some(true));
+        // Other properties are replaced.
+        let (da, db) = (fopte(0x0181, 1), fopte(0x0181, 2));
+        let mut a = read_props(&da, 1);
+        a.overlay(&read_props(&db, 1));
+        assert_eq!(a.get(0x0181), Some(2));
+    }
+
+    #[test]
+    fn client_anchors_come_in_two_sizes() {
+        let mut long = vec![];
+        for v in [20i32, 10, 120, 60] {
+            long.extend_from_slice(&v.to_le_bytes());
+        }
+        let c = container(SP_CONTAINER, 0, &[rec(0, 0, CLIENT_ANCHOR, &long)]);
+        let s = sp_container(&read_at(&c, 0).unwrap());
+        // Top, left, right, bottom in the record; left, top, ... in the shape.
+        assert_eq!(s.anchor, Some([10, 20, 120, 60]));
+        let c = container(SP_CONTAINER, 0, &[rec(0, 0, CLIENT_ANCHOR, &[1, 0, 2, 0])]);
+        assert_eq!(sp_container(&read_at(&c, 0).unwrap()).anchor, None);
+    }
+
+    #[test]
+    fn metafile_blips_are_inflated_and_wmf_gets_a_header() {
+        use std::io::Write;
+        let mut z = flate2::write::ZlibEncoder::new(vec![], flate2::Compression::default());
+        z.write_all(b"META").unwrap();
+        let packed = z.finish().unwrap();
+        // Metafile header: size, bounds (0, 0, 1000, 500), ..., compression
+        // (0: deflate, 0xFE: none) at 32, filter.
+        let header = |compression: u8| {
+            let mut h = vec![0u8; 34];
+            h[12..16].copy_from_slice(&1000i32.to_le_bytes());
+            h[16..20].copy_from_slice(&500i32.to_le_bytes());
+            h[32] = compression;
+            h[33] = 0xFE;
+            h
+        };
+        let record = |typ: u16, inst: u16, uid: usize, compression: u8, body: &[u8]| {
+            let mut d = vec![0u8; uid];
+            d.extend(header(compression));
+            d.extend_from_slice(body);
+            rec(0, inst, typ, &d)
+        };
+        // An EMF with one 16-byte id, deflated.
+        let b = blip(&read_at(&record(0xF01A, 0x3D4, 16, 0, &packed), 0).unwrap()).unwrap();
+        assert_eq!((b.ext, b.data.as_slice()), ("emf", &b"META"[..]));
+        // The odd instance has two ids, 32 bytes; stored as it is.
+        let b = blip(&read_at(&record(0xF01A, 0x3D5, 32, 0xFE, b"META"), 0).unwrap()).unwrap();
+        assert_eq!(b.data, b"META");
+        // A WMF without the placeable header gets one with the bounds.
+        let b = blip(&read_at(&record(0xF01B, 0x216, 16, 0xFE, b"META"), 0).unwrap()).unwrap();
+        assert_eq!(b.ext, "wmf");
+        assert!(b.data.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A, 0, 0]));
+        assert_eq!(&b.data[10..14], [0xE8, 3, 0xF4, 1]);
+        assert_eq!(&b.data[14..16], 1440u16.to_le_bytes());
+        assert!(b.data.ends_with(b"META"));
+        // Not a picture record.
+        assert!(blip(&read_at(&rec(0, 0, 0xF000, &[0; 40]), 0).unwrap()).is_none());
+    }
+
+    #[test]
+    fn blips_from_the_store() {
+        // A PNG blip: uid, tag, then the image.
+        let mut png = vec![0u8; 16];
+        png.push(0xFF);
+        png.extend_from_slice(b"\x89PNG\r\n\x1a\n");
+        let blip_rec = rec(0, 0x6E0, 0xF01E, &png);
+        // A BSE with the blip inline.
+        let mut bse = vec![0u8; 36];
+        bse[1] = 6;
+        bse.extend_from_slice(&blip_rec);
+        let store = container(BSTORE_CONTAINER, 1, &[rec(2, 6, BSE, &bse)]);
+        let dgg = container(DGG_CONTAINER, 0, &[store]);
+        let r = read_at(&dgg, 0).unwrap();
+        let blips = blip_records(&r, &[]);
+        assert_eq!(blips.len(), 1);
+        let b = blip(&blips[0].unwrap()).unwrap();
+        assert_eq!(b.ext, "png");
+        assert!(b.data.starts_with(b"\x89PNG"));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/image.rs b/crates/exav-render/src/formats/office/common/image.rs
new file mode 100644
index 00000000..ab2203fb
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/image.rs
@@ -0,0 +1,284 @@
+//! Pictures by their first bytes: the format, the size in pixels, and the
+//! natural size in EMU where the file says it (resolution of a bitmap,
+//! frame of a metafile).
+
+use super::bytes::{Cur, u16_at, u32_at};
+
+/// The extension of a picture's format: png, jpeg, gif, bmp, tiff, emf,
+/// wmf or svg.
+pub fn ext(d: &[u8]) -> Option<&'static str> {
+    Some(match d {
+        [0x89, b'P', b'N', b'G', ..] => "png",
+        [0xFF, 0xD8, ..] => "jpeg",
+        [b'G', b'I', b'F', ..] => "gif",
+        [b'B', b'M', ..] => "bmp",
+        [b'I', b'I', 42, 0, ..] | [b'M', b'M', 0, 42, ..] => "tiff",
+        [1, 0, 0, 0, _, _, _, _, ..] if d.len() > 44 && &d[40..44] == b" EMF" => "emf",
+        [0xD7, 0xCD, 0xC6, 0x9A, ..] | [1, 0, 9, 0, ..] | [2, 0, 9, 0, ..] => "wmf",
+        _ => {
+            let head = String::from_utf8_lossy(&d[..d.len().min(512)]);
+            if head.contains("<svg") {
+                "svg"
+            } else {
+                return None;
+            }
+        }
+    })
+}
+
+/// Width and height in pixels of a PNG, JPEG, GIF or BMP.
+pub fn pixel_size(d: &[u8]) -> Option<(u32, u32)> {
+    match ext(d)? {
+        "png" if d.len() >= 24 => {
+            let w = be32(d, 16);
+            let h = be32(d, 20);
+            Some((w, h))
+        }
+        "gif" if d.len() >= 10 => Some((u32::from(u16_at(d, 6)), u32::from(u16_at(d, 8)))),
+        "bmp" if d.len() >= 26 => {
+            let hdr = u32_at(d, 14);
+            if hdr == 12 {
+                Some((u32::from(u16_at(d, 18)), u32::from(u16_at(d, 20))))
+            } else {
+                let w = u32_at(d, 18) as i32;
+                let h = u32_at(d, 22) as i32;
+                Some((w.unsigned_abs(), h.unsigned_abs()))
+            }
+        }
+        "jpeg" => jpeg_size(d).map(|(w, h, _)| (w, h)),
+        _ => None,
+    }
+}
+
+fn be32(d: &[u8], p: usize) -> u32 {
+    match d.get(p..p + 4) {
+        Some(&[a, b, c, e]) => u32::from_be_bytes([a, b, c, e]),
+        _ => 0,
+    }
+}
+
+fn be16(d: &[u8], p: usize) -> u16 {
+    match d.get(p..p + 2) {
+        Some(&[a, b]) => u16::from_be_bytes([a, b]),
+        _ => 0,
+    }
+}
+
+/// Dots per inch, horizontally and vertically.
+type Dpi = (f64, f64);
+
+/// Width, height and the JFIF density of a JPEG.
+fn jpeg_size(d: &[u8]) -> Option<(u32, u32, Option<Dpi>)> {
+    let mut p = 2usize;
+    let mut dpi = None;
+    let mut n = 0;
+    while p + 4 <= d.len() && n < 4096 {
+        n += 1;
+        if d[p] != 0xFF {
+            p += 1;
+            continue;
+        }
+        let m = d[p + 1];
+        if m == 0xFF {
+            p += 1;
+            continue;
+        }
+        if (0xD0..=0xD9).contains(&m) || m == 0x01 {
+            p += 2;
+            continue;
+        }
+        let len = usize::from(be16(d, p + 2));
+        if m == 0xE0 && d.get(p + 4..p + 9) == Some(b"JFIF\0") {
+            let unit = d.get(p + 11).copied().unwrap_or(0);
+            let (x, y) = (f64::from(be16(d, p + 12)), f64::from(be16(d, p + 14)));
+            if x > 0.0 && y > 0.0 {
+                dpi = match unit {
+                    1 => Some((x, y)),
+                    2 => Some((x * 2.54, y * 2.54)),
+                    _ => None,
+                };
+            }
+        }
+        if (0xC0..=0xCF).contains(&m) && !matches!(m, 0xC4 | 0xC8 | 0xCC) {
+            let h = u32::from(be16(d, p + 5));
+            let w = u32::from(be16(d, p + 7));
+            return Some((w, h, dpi));
+        }
+        if len < 2 {
+            return None;
+        }
+        p += 2 + len;
+    }
+    None
+}
+
+/// The resolution of a PNG (pHYs chunk), dots per inch.
+fn png_dpi(d: &[u8]) -> Option<(f64, f64)> {
+    let mut p = 8usize;
+    let mut n = 0;
+    while p + 12 <= d.len() && n < 256 {
+        n += 1;
+        let len = be32(d, p) as usize;
+        let kind = d.get(p + 4..p + 8)?;
+        if kind == b"pHYs" && len >= 9 && d.get(p + 16) == Some(&1) {
+            // Dots per metre are whole numbers: 2835 is 72 dpi, not 72.009.
+            let snap = |v: f64| {
+                if (v - v.round()).abs() < 0.05 {
+                    v.round()
+                } else {
+                    v
+                }
+            };
+            let x = snap(f64::from(be32(d, p + 8)) * 0.0254);
+            let y = snap(f64::from(be32(d, p + 12)) * 0.0254);
+            return (x > 0.0 && y > 0.0).then_some((x, y));
+        }
+        if kind == b"IDAT" {
+            break;
+        }
+        p = p.checked_add(12 + len)?;
+    }
+    None
+}
+
+/// The picture's natural size in EMU, when it can be told.
+pub fn natural_emu(d: &[u8]) -> Option<(i64, i64)> {
+    const EMU_IN: f64 = 914_400.0;
+    match ext(d)? {
+        "emf" => {
+            // Header: bounds (device), frame in 0.01 mm at 24..40.
+            let mut c = Cur::at(d, 24);
+            let (l, t, r, b) = (c.i32(), c.i32(), c.i32(), c.i32());
+            let (w, h) = (i64::from(r) - i64::from(l), i64::from(b) - i64::from(t));
+            (w > 0 && h > 0).then_some((w * 360, h * 360))
+        }
+        "wmf" if d.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A]) => {
+            let mut c = Cur::at(d, 6);
+            let (l, t, r, b) = (c.i16(), c.i16(), c.i16(), c.i16());
+            let inch = f64::from(c.u16()).max(1.0);
+            let (w, h) = (f64::from(r) - f64::from(l), f64::from(b) - f64::from(t));
+            (w > 0.0 && h > 0.0).then(|| ((w / inch * EMU_IN) as i64, (h / inch * EMU_IN) as i64))
+        }
+        "png" => {
+            let (w, h) = pixel_size(d)?;
+            let (dx, dy) = png_dpi(d).unwrap_or((96.0, 96.0));
+            Some((
+                (f64::from(w) / dx * EMU_IN) as i64,
+                (f64::from(h) / dy * EMU_IN) as i64,
+            ))
+        }
+        "jpeg" => {
+            let (w, h, dpi) = jpeg_size(d)?;
+            let (dx, dy) = dpi.unwrap_or((96.0, 96.0));
+            Some((
+                (f64::from(w) / dx * EMU_IN) as i64,
+                (f64::from(h) / dy * EMU_IN) as i64,
+            ))
+        }
+        "gif" | "bmp" => {
+            let (w, h) = pixel_size(d)?;
+            Some((i64::from(w) * 9525, i64::from(h) * 9525))
+        }
+        _ => None,
+    }
+}
+
+/// A device-independent bitmap (BITMAPINFO and pixels) with the file header
+/// it lacks.
+pub fn dib_to_bmp(dib: &[u8]) -> Vec<u8> {
+    let hsize = u32_at(dib, 0) as usize;
+    let bits = u32::from(u16_at(dib, 14));
+    let used = u32_at(dib, 32);
+    let colors = if bits <= 8 && bits > 0 {
+        if used > 0 { used.min(256) } else { 1 << bits }
+    } else {
+        used.min(256)
+    };
+    let off = 14 + hsize.min(1 << 16) + colors as usize * 4;
+    let mut out = Vec::with_capacity(dib.len() + 14);
+    out.extend_from_slice(b"BM");
+    out.extend_from_slice(&((dib.len() + 14) as u32).to_le_bytes());
+    out.extend_from_slice(&[0, 0, 0, 0]);
+    out.extend_from_slice(&(off as u32).to_le_bytes());
+    out.extend_from_slice(dib);
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn png(w: u32, h: u32, phys: Option<(u32, u32)>) -> Vec<u8> {
+        let mut v = b"\x89PNG\r\n\x1a\n".to_vec();
+        v.extend_from_slice(&13u32.to_be_bytes());
+        v.extend_from_slice(b"IHDR");
+        v.extend_from_slice(&w.to_be_bytes());
+        v.extend_from_slice(&h.to_be_bytes());
+        v.extend_from_slice(&[8, 2, 0, 0, 0, 0, 0, 0, 0]);
+        if let Some((x, y)) = phys {
+            v.extend_from_slice(&9u32.to_be_bytes());
+            v.extend_from_slice(b"pHYs");
+            v.extend_from_slice(&x.to_be_bytes());
+            v.extend_from_slice(&y.to_be_bytes());
+            v.push(1);
+            v.extend_from_slice(&[0; 4]);
+        }
+        v.extend_from_slice(&[0, 0, 0, 0]);
+        v.extend_from_slice(b"IDAT");
+        v
+    }
+
+    #[test]
+    fn formats_and_sizes() {
+        assert_eq!(ext(b"\x89PNG\r\n"), Some("png"));
+        assert_eq!(ext(&[0xFF, 0xD8, 0xFF]), Some("jpeg"));
+        assert_eq!(ext(b"<?xml version='1.0'?><svg>"), Some("svg"));
+        assert_eq!(ext(b"VCLMTF"), None);
+        let p = png(100, 50, None);
+        assert_eq!(pixel_size(&p), Some((100, 50)));
+        assert_eq!(natural_emu(&p), Some((952_500, 476_250)));
+        // 2835 dots per metre is 72 dpi.
+        let p = png(72, 36, Some((2835, 2835)));
+        assert_eq!(natural_emu(&p), Some((914_400, 457_200)));
+    }
+
+    #[test]
+    fn jpeg_and_metafile_sizes() {
+        let mut j = vec![0xFF, 0xD8];
+        j.extend_from_slice(&[0xFF, 0xE0, 0, 16]);
+        j.extend_from_slice(b"JFIF\0\x01\x01\x01");
+        j.extend_from_slice(&[0, 96, 0, 96, 0, 0]);
+        j.extend_from_slice(&[0xFF, 0xC0, 0, 11, 8, 0, 20, 0, 40, 1, 1, 0x11, 0]);
+        assert_eq!(pixel_size(&j), Some((40, 20)));
+        assert_eq!(natural_emu(&j), Some((40 * 9525, 20 * 9525)));
+        // Placeable WMF: 1440 units per inch, 1440 x 720.
+        let mut w = vec![0xD7, 0xCD, 0xC6, 0x9A, 0, 0];
+        for v in [0i16, 0, 1440, 720] {
+            w.extend_from_slice(&v.to_le_bytes());
+        }
+        w.extend_from_slice(&1440u16.to_le_bytes());
+        assert_eq!(natural_emu(&w), Some((914_400, 457_200)));
+        // An EMF frame of 100 x 50 mm.
+        let mut e = vec![0u8; 88];
+        e[0] = 1;
+        e[40..44].copy_from_slice(b" EMF");
+        e[24..40].copy_from_slice(
+            &[0i32, 0, 10_000, 5_000]
+                .iter()
+                .flat_map(|v| v.to_le_bytes())
+                .collect::<Vec<_>>(),
+        );
+        assert_eq!(natural_emu(&e), Some((3_600_000, 1_800_000)));
+    }
+
+    #[test]
+    fn dib_gets_a_file_header() {
+        let mut dib = vec![0u8; 40];
+        dib[0] = 40;
+        dib[14] = 8;
+        let b = dib_to_bmp(&dib);
+        assert_eq!(&b[..2], b"BM");
+        // 14 + 40 + 256 palette entries.
+        assert_eq!(u32_at(&b, 10), 14 + 40 + 1024);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/iwa/mod.rs b/crates/exav-render/src/formats/office/common/iwa/mod.rs
new file mode 100644
index 00000000..8901cf6d
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/iwa/mod.rs
@@ -0,0 +1,103 @@
+//! IWA ("iWork archive") streams: chunks of Snappy blocks, each a 1-byte
+//! type (0) and a 24-bit length; uncompressed, a run of archives, each a
+//! varint length, a TSP.ArchiveInfo and the payloads its MessageInfos
+//! count. Objects are indexed by their identifier.
+
+pub mod proto;
+pub mod snappy;
+
+use proto::{Msg, varint};
+use std::collections::HashMap;
+
+/// The objects of a document's IWA streams.
+#[derive(Default)]
+pub struct Store {
+    files: Vec<Vec<u8>>,
+    /// identifier: (message type, file, start, length).
+    objects: HashMap<u64, (u32, usize, usize, usize)>,
+}
+
+impl Store {
+    /// Adds a stream; `budget` is the bytes it may still decompress to.
+    /// Returns the bytes used.
+    pub fn add(&mut self, data: &[u8], budget: usize) -> usize {
+        let mut out = Vec::new();
+        let mut p = 0usize;
+        while p + 4 <= data.len() {
+            let kind = data[p];
+            let len = usize::from(data[p + 1])
+                | usize::from(data[p + 2]) << 8
+                | usize::from(data[p + 3]) << 16;
+            p += 4;
+            let Some(chunk) = data.get(p..p + len) else {
+                break;
+            };
+            p += len;
+            if kind != 0 {
+                continue;
+            }
+            let before = out.len();
+            if snappy::decompress(chunk, &mut out, budget).is_none() {
+                // Some writers store a chunk uncompressed.
+                out.truncate(before);
+                if out.len() + chunk.len() > budget {
+                    break;
+                }
+                out.extend_from_slice(chunk);
+            }
+        }
+        let used = out.len();
+        let fi = self.files.len();
+        let d = &out;
+        let mut p = 0usize;
+        while p < d.len() {
+            let Some(n) = varint(d, &mut p).and_then(|n| usize::try_from(n).ok()) else {
+                break;
+            };
+            let Some(info) = d.get(p..p.saturating_add(n)) else {
+                break;
+            };
+            p += n;
+            let info = Msg(info);
+            let id = info.uint(1).unwrap_or(0);
+            let mut first = true;
+            for mi in info.msgs(2).take(64) {
+                let kind = mi.uint(1).unwrap_or(0) as u32;
+                let len = mi.uint(3).unwrap_or(0) as usize;
+                if p.saturating_add(len) > d.len() {
+                    p = d.len();
+                    break;
+                }
+                if first && id != 0 {
+                    self.objects.entry(id).or_insert((kind, fi, p, len));
+                }
+                first = false;
+                p += len;
+            }
+        }
+        self.files.push(out);
+        used
+    }
+
+    /// An object: its message type and its first message.
+    pub fn get(&self, id: u64) -> Option<(u32, Msg<'_>)> {
+        let &(kind, f, start, len) = self.objects.get(&id)?;
+        Some((kind, Msg(self.files.get(f)?.get(start..start + len)?)))
+    }
+
+    /// An object's message, when it is of type `kind`.
+    pub fn typed(&self, id: u64, kind: u32) -> Option<Msg<'_>> {
+        self.get(id).filter(|o| o.0 == kind).map(|o| o.1)
+    }
+
+    pub fn ids_of(&self, kind: u32) -> Vec<u64> {
+        let mut v: Vec<u64> = self
+            .objects
+            .iter()
+            .filter(|o| o.1.0 == kind)
+            .map(|o| *o.0)
+            .collect();
+        v.sort_unstable();
+        v
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/iwa/proto.rs b/crates/exav-render/src/formats/office/common/iwa/proto.rs
new file mode 100644
index 00000000..1c74d350
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/iwa/proto.rs
@@ -0,0 +1,252 @@
+//! A protocol buffers wire-format reader (the encoding documented at
+//! protobuf.dev), schemaless: messages are read field by field, and the
+//! field numbers of the messages used are written where they are used.
+
+#[derive(Clone, Copy, Debug)]
+pub enum Val<'a> {
+    Varint(u64),
+    Fixed64(u64),
+    Bytes(&'a [u8]),
+    Fixed32(u32),
+}
+
+/// One message's bytes.
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Msg<'a>(pub &'a [u8]);
+
+pub fn varint(d: &[u8], p: &mut usize) -> Option<u64> {
+    let mut v: u64 = 0;
+    for shift in (0..64).step_by(7) {
+        let b = *d.get(*p)?;
+        *p += 1;
+        v |= u64::from(b & 0x7F) << shift;
+        if b & 0x80 == 0 {
+            return Some(v);
+        }
+    }
+    None
+}
+
+impl<'a> Msg<'a> {
+    /// Every field, in order; stops at the first damaged one.
+    pub fn fields(self) -> Fields<'a> {
+        Fields { d: self.0, p: 0 }
+    }
+
+    pub fn get(self, n: u32) -> Option<Val<'a>> {
+        self.fields().find(|f| f.0 == n).map(|f| f.1)
+    }
+
+    pub fn all(self, n: u32) -> impl Iterator<Item = Val<'a>> {
+        self.fields().filter(move |f| f.0 == n).map(|f| f.1)
+    }
+
+    pub fn uint(self, n: u32) -> Option<u64> {
+        match self.get(n)? {
+            Val::Varint(v) | Val::Fixed64(v) => Some(v),
+            Val::Fixed32(v) => Some(u64::from(v)),
+            Val::Bytes(_) => None,
+        }
+    }
+
+    pub fn int(self, n: u32) -> Option<i64> {
+        self.uint(n).map(|v| v as i64)
+    }
+
+    /// A zigzag-encoded signed integer (sint32, sint64).
+    pub fn sint(self, n: u32) -> Option<i64> {
+        self.uint(n).map(|v| ((v >> 1) as i64) ^ -((v & 1) as i64))
+    }
+
+    pub fn boolean(self, n: u32) -> Option<bool> {
+        self.uint(n).map(|v| v != 0)
+    }
+
+    pub fn double(self, n: u32) -> Option<f64> {
+        match self.get(n)? {
+            Val::Fixed64(v) => Some(f64::from_bits(v)),
+            _ => None,
+        }
+    }
+
+    pub fn float(self, n: u32) -> Option<f32> {
+        match self.get(n)? {
+            Val::Fixed32(v) => Some(f32::from_bits(v)),
+            _ => None,
+        }
+    }
+
+    pub fn bytes(self, n: u32) -> Option<&'a [u8]> {
+        match self.get(n)? {
+            Val::Bytes(b) => Some(b),
+            _ => None,
+        }
+    }
+
+    pub fn string(self, n: u32) -> Option<String> {
+        self.bytes(n)
+            .map(|b| String::from_utf8_lossy(b).into_owned())
+    }
+
+    pub fn msg(self, n: u32) -> Option<Msg<'a>> {
+        self.bytes(n).map(Msg)
+    }
+
+    pub fn msgs(self, n: u32) -> impl Iterator<Item = Msg<'a>> {
+        self.all(n).filter_map(|v| {
+            if let Val::Bytes(b) = v {
+                Some(Msg(b))
+            } else {
+                None
+            }
+        })
+    }
+
+    /// A TSP.Reference field's identifier (field 1 of the reference).
+    pub fn reference(self, n: u32) -> Option<u64> {
+        self.msg(n)?.uint(1)
+    }
+
+    pub fn references(self, n: u32) -> impl Iterator<Item = u64> + 'a {
+        self.msgs(n).filter_map(|m| m.uint(1))
+    }
+}
+
+pub struct Fields<'a> {
+    d: &'a [u8],
+    p: usize,
+}
+
+impl<'a> Iterator for Fields<'a> {
+    type Item = (u32, Val<'a>);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.p >= self.d.len() {
+            return None;
+        }
+        let key = varint(self.d, &mut self.p)?;
+        let n = u32::try_from(key >> 3).ok()?;
+        let v = match key & 7 {
+            0 => Val::Varint(varint(self.d, &mut self.p)?),
+            1 => {
+                let b = self.d.get(self.p..self.p + 8)?;
+                self.p += 8;
+                Val::Fixed64(u64::from_le_bytes(b.try_into().ok()?))
+            }
+            2 => {
+                let len = usize::try_from(varint(self.d, &mut self.p)?).ok()?;
+                let b = self.d.get(self.p..self.p.checked_add(len)?)?;
+                self.p += len;
+                Val::Bytes(b)
+            }
+            5 => {
+                let b = self.d.get(self.p..self.p + 4)?;
+                self.p += 4;
+                Val::Fixed32(u32::from_le_bytes(b.try_into().ok()?))
+            }
+            _ => {
+                // Groups (3, 4) and unknown types end the message.
+                self.p = self.d.len();
+                return None;
+            }
+        };
+        Some((n, v))
+    }
+}
+
+/// A protobuf writer, for tests that build documents.
+#[cfg(any(test, feature = "office-test-util"))]
+pub mod write {
+    #[derive(Default, Clone)]
+    pub struct W(pub Vec<u8>);
+
+    fn varint(out: &mut Vec<u8>, mut v: u64) {
+        loop {
+            let b = (v & 0x7F) as u8;
+            v >>= 7;
+            if v == 0 {
+                out.push(b);
+                return;
+            }
+            out.push(b | 0x80);
+        }
+    }
+
+    impl W {
+        pub fn uint(mut self, n: u32, v: u64) -> Self {
+            varint(&mut self.0, u64::from(n) << 3);
+            varint(&mut self.0, v);
+            self
+        }
+        pub fn sint(self, n: u32, v: i64) -> Self {
+            self.uint(n, ((v << 1) ^ (v >> 63)) as u64)
+        }
+        pub fn double(mut self, n: u32, v: f64) -> Self {
+            varint(&mut self.0, u64::from(n) << 3 | 1);
+            self.0.extend_from_slice(&v.to_le_bytes());
+            self
+        }
+        pub fn float(mut self, n: u32, v: f32) -> Self {
+            varint(&mut self.0, u64::from(n) << 3 | 5);
+            self.0.extend_from_slice(&v.to_le_bytes());
+            self
+        }
+        pub fn fixed32(mut self, n: u32, v: u32) -> Self {
+            varint(&mut self.0, u64::from(n) << 3 | 5);
+            self.0.extend_from_slice(&v.to_le_bytes());
+            self
+        }
+        pub fn bytes(mut self, n: u32, b: &[u8]) -> Self {
+            varint(&mut self.0, u64::from(n) << 3 | 2);
+            varint(&mut self.0, b.len() as u64);
+            self.0.extend_from_slice(b);
+            self
+        }
+        pub fn msg(self, n: u32, m: W) -> Self {
+            self.bytes(n, &m.0)
+        }
+        pub fn reference(self, n: u32, id: u64) -> Self {
+            self.msg(n, W::default().uint(1, id))
+        }
+        pub fn varint_len(v: u64) -> Vec<u8> {
+            let mut out = vec![];
+            varint(&mut out, v);
+            out
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::write::W;
+    use super::*;
+
+    #[test]
+    fn round_trip() {
+        let m = W::default()
+            .uint(1, 300)
+            .sint(2, -5)
+            .string_test(3, "hi")
+            .double(4, 1.5)
+            .msg(5, W::default().uint(1, 7))
+            .0;
+        let msg = Msg(&m);
+        assert_eq!(msg.uint(1), Some(300));
+        assert_eq!(msg.sint(2), Some(-5));
+        assert_eq!(msg.string(3).as_deref(), Some("hi"));
+        assert_eq!(msg.double(4), Some(1.5));
+        assert_eq!(msg.reference(5), Some(7));
+        // Truncated: no panic, fields up to the damage.
+        assert!(Msg(&m[..m.len() - 1]).fields().count() < 5);
+        assert_eq!(
+            Msg(&[0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F]).fields().count(),
+            0
+        );
+    }
+
+    impl W {
+        fn string_test(self, n: u32, s: &str) -> Self {
+            self.bytes(n, s.as_bytes())
+        }
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/iwa/snappy.rs b/crates/exav-render/src/formats/office/common/iwa/snappy.rs
new file mode 100644
index 00000000..a71aa358
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/iwa/snappy.rs
@@ -0,0 +1,149 @@
+//! Snappy decompression of one raw block (the format description in
+//! Google's snappy repository, format_description.txt): a varint of the
+//! uncompressed length, then literals and back references. IWA streams use
+//! raw blocks inside chunks of their own, without the framing format's
+//! stream identifier or checksums.
+
+/// Decompresses `src`, appending to `out`, refusing to grow `out` past
+/// `limit` bytes. `None` when the block is damaged.
+pub fn decompress(src: &[u8], out: &mut Vec<u8>, limit: usize) -> Option<()> {
+    let mut p = 0usize;
+    let mut len: u64 = 0;
+    let mut shift = 0;
+    loop {
+        let b = *src.get(p)?;
+        p += 1;
+        len |= u64::from(b & 0x7F) << shift;
+        if b & 0x80 == 0 {
+            break;
+        }
+        shift += 7;
+        if shift > 35 {
+            return None;
+        }
+    }
+    let base = out.len();
+    let end = base.checked_add(usize::try_from(len).ok()?)?;
+    if end > limit {
+        return None;
+    }
+    out.reserve(end - base);
+    while p < src.len() {
+        let tag = src[p];
+        p += 1;
+        match tag & 3 {
+            0 => {
+                let mut n = usize::from(tag >> 2);
+                if n >= 60 {
+                    let extra = n - 59;
+                    let b = src.get(p..p + extra)?;
+                    n = b
+                        .iter()
+                        .rev()
+                        .fold(0usize, |a, &x| (a << 8) | usize::from(x));
+                    p += extra;
+                }
+                let n = n + 1;
+                let lit = src.get(p..p.checked_add(n)?)?;
+                if out.len() + n > end {
+                    return None;
+                }
+                out.extend_from_slice(lit);
+                p += n;
+            }
+            kind => {
+                let (n, off) = match kind {
+                    1 => {
+                        let b = *src.get(p)?;
+                        p += 1;
+                        (
+                            usize::from((tag >> 2) & 7) + 4,
+                            usize::from(tag >> 5) << 8 | usize::from(b),
+                        )
+                    }
+                    2 => {
+                        let b = src.get(p..p + 2)?;
+                        p += 2;
+                        (
+                            usize::from(tag >> 2) + 1,
+                            usize::from(u16::from_le_bytes([b[0], b[1]])),
+                        )
+                    }
+                    _ => {
+                        let b = src.get(p..p + 4)?;
+                        p += 4;
+                        (
+                            usize::from(tag >> 2) + 1,
+                            u32::from_le_bytes([b[0], b[1], b[2], b[3]]) as usize,
+                        )
+                    }
+                };
+                if off == 0 || off > out.len() - base || out.len() + n > end {
+                    return None;
+                }
+                let start = out.len() - off;
+                if off >= n {
+                    out.extend_from_within(start..start + n);
+                } else {
+                    // An overlapping copy repeats the last `off` bytes.
+                    for i in 0..n {
+                        let b = out[start + i];
+                        out.push(b);
+                    }
+                }
+            }
+        }
+    }
+    (out.len() == end).then_some(())
+}
+
+/// Compresses `src` as literals only: a valid block, for tests.
+#[cfg(any(test, feature = "office-test-util"))]
+pub fn literal_block(src: &[u8]) -> Vec<u8> {
+    let mut out = vec![];
+    let mut n = src.len() as u64;
+    loop {
+        let b = (n & 0x7F) as u8;
+        n >>= 7;
+        if n == 0 {
+            out.push(b);
+            break;
+        }
+        out.push(b | 0x80);
+    }
+    for chunk in src.chunks(60) {
+        out.push(((chunk.len() - 1) as u8) << 2);
+        out.extend_from_slice(chunk);
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn literals_and_copies() {
+        // "abcabcabcd": a literal "abc", a copy of 6 at offset 3, a literal "d".
+        let block = [10, 2 << 2, b'a', b'b', b'c', 0b0000_1001, 3, 0, b'd'];
+        let mut out = vec![];
+        decompress(&block, &mut out, 100).unwrap();
+        assert_eq!(out, b"abcabcabcd");
+        let mut out = vec![];
+        let data =
+            b"hello hello hello, a longer literal of more than sixty bytes, to use the long form";
+        decompress(&literal_block(data), &mut out, 1000).unwrap();
+        assert_eq!(out, data);
+    }
+
+    #[test]
+    fn damaged_blocks_are_refused() {
+        let mut out = vec![];
+        // A copy before any output.
+        assert!(decompress(&[4, 0b0000_0001, 1], &mut out, 100).is_none());
+        // A length past the limit.
+        assert!(decompress(&[0xFF, 0xFF, 0xFF, 0x7F], &mut out, 100).is_none());
+        // Truncated literal.
+        assert!(decompress(&[5, 4 << 2, b'a'], &mut out, 100).is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/mod.rs b/crates/exav-render/src/formats/office/common/mod.rs
new file mode 100644
index 00000000..608bd2a1
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/mod.rs
@@ -0,0 +1,21 @@
+//! Readers shared by the office converters (`sheets`, `slides`, `docs`):
+//! legacy code pages, OfficeArt records, ZIP packages, iWork archives
+//! (Snappy, protocol buffers, the IWA object store), a bounded XML tree with
+//! OpenDocument's prefixes, and a little-endian cursor that never panics.
+//! Compound files are read by `exav_unpack::cfb`, which the scanner uses too.
+//!
+//! Each converter uses a subset: what a build leaves unused is not an error.
+
+#![allow(dead_code)]
+
+pub mod base64;
+pub mod bytes;
+pub use exav_unpack::charset as codepage;
+pub mod css;
+pub mod escher;
+pub mod image;
+pub mod iwa;
+pub mod odf;
+pub mod package;
+pub mod xml;
+pub mod xmlout;
diff --git a/crates/exav-render/src/formats/office/common/odf.rs b/crates/exav-render/src/formats/office/common/odf.rs
new file mode 100644
index 00000000..3ada900c
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/odf.rs
@@ -0,0 +1,415 @@
+//! OpenDocument styles ([ODF 1.2] part 1, 16) as the text, spreadsheet and
+//! drawing formats share them: named and automatic styles with their parent
+//! chains, default styles, list styles, font faces and page layouts, and the
+//! length, colour and percentage values of their properties.
+
+use super::xml::Node;
+use std::collections::HashMap;
+
+/// A length in points: cm, mm, in, pt, pc, px (96 per inch), em and ex are
+/// not lengths here. A bare number is taken as points.
+pub fn pt(s: &str) -> Option<f64> {
+    let s = s.trim();
+    let at = s
+        .find(|c: char| c.is_ascii_alphabetic() || c == '%')
+        .unwrap_or(s.len());
+    let (num, unit) = s.split_at(at);
+    let v: f64 = num.trim().parse().ok()?;
+    if !v.is_finite() {
+        return None;
+    }
+    let p = match unit {
+        "pt" | "" => v,
+        "cm" => v * 72.0 / 2.54,
+        "mm" => v * 72.0 / 25.4,
+        "in" | "inch" => v * 72.0,
+        "pc" => v * 12.0,
+        "px" => v * 0.75,
+        _ => return None,
+    };
+    Some(p.clamp(-1e9, 1e9))
+}
+
+/// A length in twips (1/20 point).
+pub fn twips(s: &str) -> Option<i32> {
+    pt(s).map(|p| (p * 20.0).round() as i32)
+}
+
+/// A length in EMU.
+pub fn emu(s: &str) -> Option<i64> {
+    pt(s).map(|p| (p * 12_700.0).round() as i64)
+}
+
+/// "#RRGGBB" (or "#RGB") as 0xRRGGBB.
+pub fn color(s: &str) -> Option<u32> {
+    let h = s.trim().strip_prefix('#')?;
+    if h.len() == 3 {
+        let v = u32::from_str_radix(h, 16).ok()?;
+        let (r, g, b) = ((v >> 8) & 0xF, (v >> 4) & 0xF, v & 0xF);
+        return Some(((r * 17) << 16) | ((g * 17) << 8) | (b * 17));
+    }
+    if h.len() != 6 {
+        return None;
+    }
+    u32::from_str_radix(h, 16).ok()
+}
+
+/// "50%" to 0.5.
+pub fn percent(s: &str) -> Option<f64> {
+    let v: f64 = s.trim().strip_suffix('%')?.trim().parse().ok()?;
+    v.is_finite().then_some(v / 100.0)
+}
+
+/// Attributes as (qualified name, value).
+pub type Attrs = Vec<(String, String)>;
+
+/// One style: its parent and every property of its property elements, keyed
+/// by the kind of property element and the qualified name of the attribute:
+/// `text/fo:color`, `paragraph/fo:margin-left`.
+#[derive(Clone, Debug, Default)]
+pub struct StyleDef {
+    pub parent: Option<String>,
+    pub next: Option<String>,
+    /// The attributes of the style element itself (style:display-name,
+    /// style:list-style-name, style:master-page-name, ...).
+    pub attrs: Vec<(String, String)>,
+    pub props: Vec<(String, String)>,
+    /// Elements inside property elements (tab stops, background images,
+    /// drop caps), as (property element, child name, attributes).
+    pub children: Vec<(String, String, Attrs)>,
+    pub automatic: bool,
+}
+
+impl StyleDef {
+    pub fn attr(&self, k: &str) -> Option<&str> {
+        self.attrs.iter().find(|a| a.0 == k).map(|a| a.1.as_str())
+    }
+}
+
+/// Resolved properties: the last value of a key wins.
+#[derive(Clone, Debug, Default)]
+pub struct Props(pub Vec<(String, String)>);
+
+impl Props {
+    pub fn get(&self, k: &str) -> Option<&str> {
+        self.0.iter().rev().find(|p| p.0 == k).map(|p| p.1.as_str())
+    }
+
+    pub fn overlay(&mut self, o: &[(String, String)]) {
+        self.0.extend(o.iter().cloned());
+    }
+
+    pub fn pt(&self, k: &str) -> Option<f64> {
+        self.get(k).and_then(pt)
+    }
+
+    pub fn twips(&self, k: &str) -> Option<i32> {
+        self.get(k).and_then(twips)
+    }
+
+    pub fn color(&self, k: &str) -> Option<u32> {
+        self.get(k).and_then(color)
+    }
+
+    pub fn is(&self, k: &str, v: &str) -> bool {
+        self.get(k) == Some(v)
+    }
+}
+
+/// A list style's level.
+#[derive(Clone, Debug, Default)]
+pub struct ListLevel {
+    /// bullet, number, image or none.
+    pub kind: &'static str,
+    pub attrs: Vec<(String, String)>,
+    /// Properties of the level's list-level-properties and text-properties.
+    pub props: Props,
+    pub tabs: Vec<(String, String)>,
+}
+
+impl ListLevel {
+    pub fn attr(&self, k: &str) -> Option<&str> {
+        self.attrs.iter().find(|a| a.0 == k).map(|a| a.1.as_str())
+    }
+}
+
+/// A list style's levels: (level 1 to 10, definition).
+#[derive(Clone, Debug, Default)]
+pub struct ListDef {
+    pub levels: Vec<(usize, ListLevel)>,
+}
+
+/// The styles of one scope (a document's content, or its styles part).
+#[derive(Default)]
+pub struct Styles {
+    /// (family, name) to style; later definitions replace earlier ones.
+    pub styles: HashMap<(String, String), StyleDef>,
+    /// Style names in the order they were defined, per family.
+    pub order: Vec<(String, String)>,
+    pub defaults: HashMap<String, Vec<(String, String)>>,
+    pub lists: Vec<ListDef>,
+    pub list_names: HashMap<String, usize>,
+    /// Font face name to family.
+    pub fonts: HashMap<String, String>,
+    /// Page layouts' properties by name, with their header and footer style
+    /// properties under "header:" and "footer:" prefixes.
+    pub page_layouts: HashMap<String, Props>,
+}
+
+fn attrs_of(n: &Node) -> Vec<(String, String)> {
+    n.attrs.clone()
+}
+
+/// The attributes of a property element with its kind in front, so that
+/// `fo:background-color` of text and of a paragraph stay apart:
+/// `text/fo:background-color`, `paragraph/fo:background-color`.
+fn prefixed(n: &Node) -> Vec<(String, String)> {
+    let kind = n
+        .name
+        .rsplit(':')
+        .next()
+        .unwrap_or("")
+        .trim_end_matches("-properties");
+    n.attrs
+        .iter()
+        .map(|(k, v)| (format!("{kind}/{k}"), v.clone()))
+        .collect()
+}
+
+impl Styles {
+    /// Reads the style elements under `n` (office:styles,
+    /// office:automatic-styles, office:font-face-decls).
+    pub fn add(&mut self, n: &Node, automatic: bool) {
+        for c in n.nodes() {
+            match c.name.as_str() {
+                "style:style" => {
+                    let family = c.attr("style:family").unwrap_or("").to_string();
+                    let name = c.attr("style:name").unwrap_or("").to_string();
+                    let mut def = StyleDef {
+                        parent: c.attr("style:parent-style-name").map(str::to_string),
+                        next: c.attr("style:next-style-name").map(str::to_string),
+                        attrs: attrs_of(c),
+                        automatic,
+                        ..StyleDef::default()
+                    };
+                    for p in c.nodes() {
+                        if p.name.ends_with("-properties") {
+                            def.props.extend(prefixed(p));
+                            for g in p.nodes() {
+                                def.children
+                                    .push((p.name.clone(), g.name.clone(), attrs_of(g)));
+                                // Tab stops sit one level further.
+                                for t in g.nodes() {
+                                    def.children.push((
+                                        g.name.clone(),
+                                        t.name.clone(),
+                                        attrs_of(t),
+                                    ));
+                                }
+                            }
+                        }
+                    }
+                    let key = (family, name);
+                    if !self.styles.contains_key(&key) {
+                        self.order.push(key.clone());
+                    }
+                    self.styles.insert(key, def);
+                }
+                "style:page-layout" => {
+                    let mut v = vec![];
+                    for p in c.nodes() {
+                        let prefix = match p.name.as_str() {
+                            "style:header-style" => "header:",
+                            "style:footer-style" => "footer:",
+                            _ => "",
+                        };
+                        if prefix.is_empty() {
+                            v.extend(attrs_of(p));
+                            for g in p.nodes() {
+                                if g.name == "style:columns" {
+                                    v.push((
+                                        "columns".into(),
+                                        g.attr("fo:column-count").unwrap_or("1").into(),
+                                    ));
+                                    v.push((
+                                        "columns-gap".into(),
+                                        g.attr("fo:column-gap").unwrap_or("0").into(),
+                                    ));
+                                }
+                            }
+                        } else {
+                            for g in p.nodes() {
+                                for (k, val) in &g.attrs {
+                                    v.push((format!("{prefix}{k}"), val.clone()));
+                                }
+                            }
+                        }
+                    }
+                    if let Some(name) = c.attr("style:name") {
+                        self.page_layouts.insert(name.to_string(), Props(v));
+                    }
+                }
+                "style:default-style" => {
+                    let family = c.attr("style:family").unwrap_or("").to_string();
+                    let mut v = vec![];
+                    for p in c.nodes() {
+                        if p.name.ends_with("-properties") {
+                            v.extend(prefixed(p));
+                        }
+                    }
+                    self.defaults.insert(family, v);
+                }
+                "text:list-style" => {
+                    let i = self.list(c);
+                    if let Some(name) = c.attr("style:name") {
+                        self.list_names.insert(name.to_string(), i);
+                    }
+                }
+                "style:font-face" => {
+                    if let (Some(name), Some(fam)) =
+                        (c.attr("style:name"), c.attr("svg:font-family"))
+                    {
+                        let fam = fam.trim().trim_matches(['\'', '"']).to_string();
+                        self.fonts.insert(name.to_string(), fam);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    /// Reads a text:list-style element (also in a style's properties),
+    /// returning its index in `lists`.
+    pub fn list(&mut self, l: &Node) -> usize {
+        let mut def = ListDef::default();
+        for lv in l.nodes() {
+            let level = lv
+                .attr("text:level")
+                .and_then(|v| v.parse::<usize>().ok())
+                .unwrap_or(1)
+                .clamp(1, 10);
+            let mut x = ListLevel {
+                kind: match lv.name.as_str() {
+                    "text:list-level-style-bullet" => "bullet",
+                    "text:list-level-style-number" | "text:outline-level-style" => "number",
+                    "text:list-level-style-image" => "image",
+                    _ => "none",
+                },
+                attrs: attrs_of(lv),
+                ..ListLevel::default()
+            };
+            let mut p = vec![];
+            for c in lv.nodes() {
+                p.extend(prefixed(c));
+                for g in c.nodes() {
+                    if g.name == "style:tab-stops" {
+                        for t in g.nodes() {
+                            x.tabs.extend(t.attrs.iter().cloned());
+                        }
+                    } else if g.name == "style:list-level-label-alignment" {
+                        p.extend(
+                            g.attrs
+                                .iter()
+                                .map(|(k, v)| (format!("label-alignment/{k}"), v.clone())),
+                        );
+                    }
+                }
+            }
+            x.props = Props(p);
+            def.levels.push((level, x));
+        }
+        self.lists.push(def);
+        self.lists.len() - 1
+    }
+
+    pub fn get(&self, family: &str, name: &str) -> Option<&StyleDef> {
+        self.styles.get(&(family.to_string(), name.to_string()))
+    }
+
+    /// The style's properties over its parents' (family default first).
+    pub fn resolve(&self, family: &str, name: Option<&str>) -> Props {
+        let mut out = Props::default();
+        if let Some(d) = self.defaults.get(family) {
+            out.overlay(d);
+        }
+        let mut chain = vec![];
+        let mut cur = name.map(str::to_string);
+        while let Some(n) = cur.take() {
+            if chain.len() > 32 {
+                break;
+            }
+            if let Some(s) = self.get(family, &n) {
+                chain.push(s);
+                cur = s.parent.clone();
+            }
+        }
+        for s in chain.iter().rev() {
+            out.overlay(&s.props);
+        }
+        out
+    }
+
+    /// The font family a font face name stands for.
+    pub fn font(&self, name: &str) -> String {
+        self.fonts
+            .get(name)
+            .cloned()
+            .unwrap_or_else(|| name.trim_matches(['\'', '"']).to_string())
+    }
+}
+
+/// The text of a node and its descendants.
+pub fn text_of(n: &Node) -> String {
+    use super::xml::Child;
+    let mut s = String::new();
+    for c in &n.children {
+        match c {
+            Child::Text(t) => s.push_str(t),
+            Child::Node(k) => s.push_str(&text_of(k)),
+        }
+    }
+    s
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn lengths_and_colours() {
+        assert_eq!(twips("2.54cm"), Some(1440));
+        assert_eq!(twips("1in"), Some(1440));
+        assert_eq!(emu("10pt"), Some(127_000));
+        assert_eq!(twips("12px"), Some(180));
+        assert_eq!(twips("x"), None);
+        assert_eq!(twips("1em"), None);
+        assert_eq!(color("#3465a4"), Some(0x3465A4));
+        assert_eq!(color("#fff"), Some(0xFFFFFF));
+        assert_eq!(percent("50%"), Some(0.5));
+    }
+
+    #[test]
+    fn styles_resolve_through_parents_and_defaults() {
+        let x = br##"<office:styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"><style:default-style style:family="paragraph"><style:paragraph-properties fo:margin-left="1cm" fo:text-align="start"/></style:default-style><style:style style:name="a" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/></style:style><style:style style:name="b" style:family="paragraph" style:parent-style-name="a"><style:text-properties fo:color="#ff0000"/><style:paragraph-properties fo:margin-right="2cm"/></style:style><style:style style:name="c" style:family="paragraph" style:parent-style-name="b"><style:paragraph-properties fo:text-align="end"/></style:style></office:styles>"##;
+        let n = super::super::xml::parse(x, &mut super::super::xml::within(1 << 20)).unwrap();
+        let mut s = Styles::default();
+        s.add(&n, false);
+        let p = s.resolve("paragraph", Some("b"));
+        // The parent overrides the default, the child adds to the parent.
+        assert_eq!(p.get("paragraph/fo:text-align"), Some("center"));
+        assert_eq!(p.get("paragraph/fo:margin-right"), Some("2cm"));
+        assert_eq!(p.color("text/fo:color"), Some(0xFF0000));
+        assert_eq!(p.get("paragraph/fo:margin-left"), Some("1cm"));
+        assert_eq!(s.order.len(), 3);
+        // A style's own value beats its parents' and the default.
+        let p = s.resolve("paragraph", Some("c"));
+        assert_eq!(p.get("paragraph/fo:text-align"), Some("end"));
+        assert_eq!(p.get("paragraph/fo:margin-right"), Some("2cm"));
+        // An unknown style resolves to the defaults.
+        assert_eq!(
+            s.resolve("paragraph", Some("missing"))
+                .get("paragraph/fo:text-align"),
+            Some("start")
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/package.rs b/crates/exav-render/src/formats/office/common/package.rs
new file mode 100644
index 00000000..e9b46cb9
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/package.rs
@@ -0,0 +1,254 @@
+//! ZIP packages (OpenDocument, OOXML, iWork) read and written within limits.
+
+use std::io::{Cursor, Read, Seek, SeekFrom, Write};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
+
+/// Why a package part was not read or written.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Error {
+    /// Not a ZIP archive.
+    NotZip(String),
+    /// A member is encrypted.
+    Encrypted,
+    /// A member inflates past the bound, or the output grew past its limit.
+    TooLarge,
+    /// The archive could not be written.
+    Write(String),
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Error::NotZip(e) => write!(f, "not a ZIP package: {e}"),
+            Error::Encrypted => f.write_str("encrypted package member"),
+            Error::TooLarge => f.write_str("package part too large"),
+            Error::Write(e) => write!(f, "writing the package: {e}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+/// What a package is read from: its bytes, or a reader that fetches the
+/// parts asked for.
+pub trait Source: Read + Seek {}
+impl<T: Read + Seek> Source for T {}
+
+/// Opens `reader` as a ZIP archive. The directory is first taken where the
+/// end record says, which reads only the end of the file; the crate's own
+/// search for it, which also finds an archive that something precedes,
+/// reads the whole file from its start, and comes second.
+pub(crate) fn open_zip<R: Read + Seek>(
+    mut reader: R,
+) -> zip::result::ZipResult<zip::ZipArchive<R>> {
+    let config = || zip::read::Config {
+        archive_offset: zip::read::ArchiveOffset::Known(0),
+    };
+    if zip::ZipArchive::with_config(config(), &mut reader).is_ok() {
+        return zip::ZipArchive::with_config(config(), reader);
+    }
+    zip::ZipArchive::new(reader)
+}
+
+pub struct Zip<'a> {
+    z: zip::ZipArchive<Box<dyn Source + 'a>>,
+}
+
+impl<'a> Zip<'a> {
+    pub fn open(bytes: &'a [u8]) -> Result<Zip<'a>, Error> {
+        Zip::from_source(Box::new(Cursor::new(bytes)))
+    }
+
+    pub fn from_source(source: Box<dyn Source + 'a>) -> Result<Zip<'a>, Error> {
+        let z = open_zip(source).map_err(|e| Error::NotZip(e.to_string()))?;
+        Ok(Zip { z })
+    }
+
+    /// Member names, at most 65536 of them.
+    pub fn names(&self) -> Vec<String> {
+        self.z
+            .file_names()
+            .take(1 << 16)
+            .filter_map(|s| s.ok().map(|s| s.to_string()))
+            .collect()
+    }
+
+    /// The member's size when inflated, as its directory entry says.
+    pub fn size(&mut self, name: &str) -> Option<u64> {
+        self.z.by_name(name).ok().map(|f| f.size())
+    }
+
+    /// A member, `None` when absent or unreadable; past `max` bytes, an
+    /// error.
+    pub fn read(&mut self, name: &str, max: u64) -> Result<Option<Vec<u8>>, Error> {
+        let f = match self.z.by_name(name) {
+            Ok(f) => f,
+            Err(zip::result::ZipError::UnsupportedArchive(m))
+                if m == zip::result::ZipError::PASSWORD_REQUIRED =>
+            {
+                return Err(Error::Encrypted);
+            }
+            Err(_) => return Ok(None),
+        };
+        let mut v = Vec::new();
+        if f.take(max + 1).read_to_end(&mut v).is_err() {
+            return Ok(None);
+        }
+        if v.len() as u64 > max {
+            return Err(Error::TooLarge);
+        }
+        Ok(Some(v))
+    }
+}
+
+/// A ZIP archive written to memory, refused past `limit` bytes.
+pub struct PackageWriter {
+    // Declared first: dropped first, so that the limit is lifted before the
+    // writer below is finalized by its own drop.
+    _lift: Lift,
+    z: Option<zip::ZipWriter<Out>>,
+}
+
+/// The output of a ZIP writer, refused past a limit.
+pub(crate) struct Out {
+    buf: Cursor<Vec<u8>>,
+    limit: Arc<AtomicU64>,
+}
+
+/// Lifts its [`Out`]'s limit when dropped. A ZIP writer dropped without being
+/// finished is finalized by the `zip` crate, which says on stderr when it
+/// cannot: and a writer that was refused (past its limit) is the usual one. Its
+/// archive is wanted by no one, so it is let finish its last small write
+/// quietly.
+pub(crate) struct Lift(Arc<AtomicU64>);
+
+impl Lift {
+    /// Lets the writer finish: only its central directory and the last of its
+    /// compressed data are left to write, and what was written before is what
+    /// the limit was about.
+    pub(crate) fn lift(&self) {
+        self.0.store(u64::MAX, Ordering::Relaxed);
+    }
+}
+
+impl Drop for Lift {
+    fn drop(&mut self) {
+        self.lift();
+    }
+}
+
+impl Out {
+    /// An output of up to `limit` bytes, with room for `capacity` made at
+    /// once.
+    pub(crate) fn new(capacity: usize, limit: u64) -> (Out, Lift) {
+        let limit = Arc::new(AtomicU64::new(limit));
+        let out = Out {
+            buf: Cursor::new(Vec::with_capacity(capacity)),
+            limit: Arc::clone(&limit),
+        };
+        (out, Lift(limit))
+    }
+
+    pub(crate) fn into_inner(self) -> Vec<u8> {
+        self.buf.into_inner()
+    }
+}
+
+impl Write for Out {
+    fn write(&mut self, b: &[u8]) -> std::io::Result<usize> {
+        if self.buf.position() + b.len() as u64 > self.limit.load(Ordering::Relaxed) {
+            return Err(std::io::Error::other("output too large"));
+        }
+        self.buf.write(b)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}
+
+impl Seek for Out {
+    fn seek(&mut self, p: SeekFrom) -> std::io::Result<u64> {
+        self.buf.seek(p)
+    }
+}
+
+fn werr(e: impl std::fmt::Display) -> Error {
+    let s = e.to_string();
+    if s.contains("too large") {
+        Error::TooLarge
+    } else {
+        Error::Write(s)
+    }
+}
+
+impl PackageWriter {
+    pub fn new(limit: u64) -> PackageWriter {
+        let (out, lift) = Out::new(0, limit);
+        PackageWriter {
+            _lift: lift,
+            z: Some(zip::ZipWriter::new(out)),
+        }
+    }
+
+    /// Adds a member, deflated or stored.
+    pub fn put(&mut self, name: &str, data: &[u8], compress: bool) -> Result<(), Error> {
+        let method = if compress {
+            zip::CompressionMethod::Deflated
+        } else {
+            zip::CompressionMethod::Stored
+        };
+        let opt = zip::write::SimpleFileOptions::default()
+            .compression_method(method)
+            .compression_level(compress.then_some(6))
+            .last_modified_time(zip::DateTime::default());
+        let Some(z) = self.z.as_mut() else {
+            return Err(Error::Write("the package is finished".to_string()));
+        };
+        z.start_file(name, opt).map_err(werr)?;
+        z.write_all(data).map_err(werr)
+    }
+
+    /// The archive's bytes.
+    pub fn finish(mut self) -> Result<Vec<u8>, Error> {
+        let Some(z) = self.z.take() else {
+            return Err(Error::Write("the package is finished".to_string()));
+        };
+        self._lift.lift();
+        let out = z.finish().map_err(werr)?;
+        Ok(out.into_inner())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn round_trip_and_bounds() {
+        let mut w = PackageWriter::new(1 << 20);
+        w.put("a.txt", b"hello", true).unwrap();
+        w.put("b/c.bin", &[7u8; 5000], false).unwrap();
+        let bytes = w.finish().unwrap();
+        let mut z = Zip::open(&bytes).unwrap();
+        assert_eq!(z.names().len(), 2);
+        assert_eq!(z.read("a.txt", 100).unwrap().unwrap(), b"hello");
+        assert_eq!(z.read("missing", 100).unwrap(), None);
+        assert_eq!(z.read("b/c.bin", 100), Err(Error::TooLarge));
+        assert!(matches!(Zip::open(b"nope"), Err(Error::NotZip(_))));
+        // Bit 0 of the general purpose flags marks a member as encrypted.
+        let mut e = bytes.clone();
+        for i in 0..e.len().saturating_sub(10) {
+            if e[i..].starts_with(b"PK\x03\x04") {
+                e[i + 6] |= 1;
+            } else if e[i..].starts_with(b"PK\x01\x02") {
+                e[i + 8] |= 1;
+            }
+        }
+        let mut z = Zip::open(&e).unwrap();
+        assert_eq!(z.read("a.txt", 100), Err(Error::Encrypted));
+        let mut small = PackageWriter::new(100);
+        assert_eq!(small.put("x", &[1u8; 5000], false), Err(Error::TooLarge));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/xml.rs b/crates/exav-render/src/formats/office/common/xml.rs
new file mode 100644
index 00000000..32ce14aa
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/xml.rs
@@ -0,0 +1,475 @@
+//! A small element tree over quick-xml, with element and attribute names
+//! given the usual ODF prefixes whatever prefixes a file declares. Bounded:
+//! nesting depth is limited, and the memory of the tree is told to the caller
+//! as it grows.
+
+use quick_xml::events::Event;
+use std::fmt;
+
+/// Why a document did not parse.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Error {
+    /// Not well-formed, or nested past [`MAX_DEPTH`].
+    Malformed(String),
+    /// More elements than allowed: what was counted.
+    TooLarge(&'static str),
+    /// No element at all.
+    NotFormat(String),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::Malformed(why) | Error::NotFormat(why) => f.write_str(why),
+            Error::TooLarge(what) => write!(f, "too large: {what}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+pub type Result<T> = std::result::Result<T, Error>;
+use quick_xml::NsReader;
+use quick_xml::name::ResolveResult;
+
+#[derive(Debug, Default)]
+pub struct Node {
+    pub name: String,
+    pub attrs: Vec<(String, String)>,
+    pub children: Vec<Child>,
+}
+
+#[derive(Debug)]
+pub enum Child {
+    Node(Node),
+    Text(String),
+}
+
+const NS: &[(&str, &str)] = &[
+    ("urn:oasis:names:tc:opendocument:xmlns:office:1.0", "office"),
+    ("urn:oasis:names:tc:opendocument:xmlns:style:1.0", "style"),
+    ("urn:oasis:names:tc:opendocument:xmlns:text:1.0", "text"),
+    ("urn:oasis:names:tc:opendocument:xmlns:table:1.0", "table"),
+    ("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", "draw"),
+    (
+        "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+        "fo",
+    ),
+    ("http://www.w3.org/1999/xlink", "xlink"),
+    ("http://purl.org/dc/elements/1.1/", "dc"),
+    ("urn:oasis:names:tc:opendocument:xmlns:meta:1.0", "meta"),
+    (
+        "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
+        "number",
+    ),
+    (
+        "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
+        "svg",
+    ),
+    ("urn:oasis:names:tc:opendocument:xmlns:chart:1.0", "chart"),
+    ("urn:oasis:names:tc:opendocument:xmlns:of:1.2", "of"),
+    (
+        "urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0",
+        "calcext",
+    ),
+    (
+        "urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0",
+        "loext",
+    ),
+    ("http://openoffice.org/2009/table", "tableooo"),
+    ("http://openoffice.org/2004/office", "ooo"),
+    ("http://openoffice.org/2004/calc", "oooc"),
+    ("urn:oasis:names:tc:opendocument:xmlns:config:1.0", "config"),
+    ("urn:oasis:names:tc:opendocument:xmlns:form:1.0", "form"),
+    ("http://www.w3.org/1998/Math/MathML", "math"),
+    ("urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0", "dr3d"),
+    (
+        "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
+        "presentation",
+    ),
+    (
+        "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0",
+        "smil",
+    ),
+    (
+        "urn:oasis:names:tc:opendocument:xmlns:animation:1.0",
+        "anim",
+    ),
+    ("http://openoffice.org/2010/draw", "drawooo"),
+    ("http://openoffice.org/2009/office", "officeooo"),
+    // Apple's iWork '04 to '09 documents (Keynote 2 to 5).
+    ("http://developer.apple.com/namespaces/sf", "sf"),
+    ("http://developer.apple.com/namespaces/sfa", "sfa"),
+    ("http://developer.apple.com/namespaces/ls", "ls"),
+    ("http://developer.apple.com/namespaces/keynote2", "key"),
+    ("http://www.w3.org/2001/XMLSchema-instance", "xsi"),
+    // Early OpenDocument drafts used the W3C namespaces.
+    ("http://www.w3.org/2000/svg", "svg"),
+    ("http://www.w3.org/1999/XSL/Format", "fo"),
+    ("http://www.w3.org/2001/SMIL20", "smil"),
+    // Word 2003 XML (WordprocessingML 2003).
+    ("http://schemas.microsoft.com/office/word/2003/wordml", "w"),
+    (
+        "http://schemas.microsoft.com/office/word/2003/auxHint",
+        "wx",
+    ),
+    ("urn:schemas-microsoft-com:office:office", "o"),
+    ("urn:schemas-microsoft-com:vml", "v"),
+    ("urn:schemas-microsoft-com:office:word", "w10"),
+    ("http://schemas.microsoft.com/aml/2001/core", "aml"),
+    // Excel 2003 XML Spreadsheet.
+    ("urn:schemas-microsoft-com:office:spreadsheet", "ss"),
+    ("urn:schemas-microsoft-com:office:excel", "x"),
+    ("http://www.w3.org/TR/REC-html40", "html"),
+    // Visio drawings (VSDX) and the Open Packaging Conventions.
+    (
+        "http://schemas.microsoft.com/office/visio/2012/main",
+        "visio",
+    ),
+    (
+        "http://schemas.microsoft.com/office/visio/2011/1/core",
+        "visio",
+    ),
+    (
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+        "r",
+    ),
+    (
+        "http://schemas.openxmlformats.org/package/2006/relationships",
+        "rels",
+    ),
+    ("http://schemas.openxmlformats.org/drawingml/2006/main", "a"),
+];
+
+fn prefix_of(r: &ResolveResult) -> String {
+    match r {
+        ResolveResult::Bound(ns) => {
+            let u = ns.as_ref();
+            NS.iter()
+                .find(|e| e.0 == u)
+                .map(|e| e.1.to_string())
+                .unwrap_or_else(|| format!("{{{u}}}"))
+        }
+        _ => String::new(),
+    }
+}
+
+fn qualify(p: String, l: &str) -> String {
+    if p.is_empty() {
+        l.to_owned()
+    } else {
+        format!("{p}:{l}")
+    }
+}
+
+/// Bounds of one document.
+pub const MAX_DEPTH: usize = 256;
+
+/// What the tree takes for an element or a text in its parent's list: the
+/// room of the list doubles as it grows.
+const SLOT: u64 = 2 * size_of::<Child>() as u64;
+
+/// What the allocator takes for `len` bytes: a header, a 16-byte grain, and 32
+/// at least.
+fn heap(len: usize) -> u64 {
+    if len == 0 {
+        0
+    } else {
+        ((len as u64 + 8 + 15) & !15).max(32)
+    }
+}
+
+/// A `charge` for [`parse`] that refuses past `max` bytes in all.
+pub fn within(max: u64) -> impl FnMut(u64) -> bool {
+    let mut left = max;
+    move |bytes| match left.checked_sub(bytes) {
+        Some(l) => {
+            left = l;
+            true
+        }
+        None => false,
+    }
+}
+
+/// Parses a document. The memory of the tree is told to `charge` as it grows,
+/// in bytes, and the parse fails once `charge` returns false.
+pub fn parse(xml: &[u8], charge: &mut dyn FnMut(u64) -> bool) -> Result<Node> {
+    let mut spend = |bytes: u64| {
+        if charge(bytes) {
+            Ok(())
+        } else {
+            Err(Error::TooLarge("memory"))
+        }
+    };
+    let mut r = NsReader::from_reader(xml);
+    r.config_mut().check_end_names = false;
+    let mut stack: Vec<Node> = vec![Node {
+        name: "#root".into(),
+        ..Default::default()
+    }];
+    let mut buf = Vec::new();
+    loop {
+        let (res, ev) = r
+            .read_resolved_event_into(&mut buf)
+            .map_err(|e| Error::Malformed(format!("XML: {e}")))?;
+        match ev {
+            Event::Start(ref e) | Event::Empty(ref e) => {
+                let name = qualify(prefix_of(&res), e.local_name().as_ref());
+                let mut cost = SLOT + heap(name.len());
+                let mut attrs = Vec::new();
+                for a in e.attributes().with_checks(false).flatten() {
+                    let (ar, local) = r.resolver().resolve_attribute(a.key);
+                    let key = qualify(prefix_of(&ar), local.as_ref());
+                    let v = a
+                        .normalized_value(quick_xml::XmlVersion::Implicit1_0)
+                        .map(|v| v.into_owned())
+                        .unwrap_or_else(|_| a.value.to_string());
+                    cost += heap(key.len()) + heap(v.len());
+                    attrs.push((key, v));
+                }
+                cost += heap(attrs.capacity() * size_of::<(String, String)>());
+                spend(cost)?;
+                let node = Node {
+                    name,
+                    attrs,
+                    children: vec![],
+                };
+                let empty = matches!(ev, Event::Empty(_));
+                if empty {
+                    if let Some(top) = stack.last_mut() {
+                        top.children.push(Child::Node(node));
+                    }
+                } else if stack.len() < MAX_DEPTH {
+                    stack.push(node);
+                } else {
+                    return Err(Error::Malformed("XML nested too deep".into()));
+                }
+            }
+            Event::End(_) => {
+                if stack.len() > 1
+                    && let Some(n) = stack.pop()
+                    && let Some(top) = stack.last_mut()
+                {
+                    top.children.push(Child::Node(n));
+                }
+            }
+            Event::Text(t) => {
+                let s = t.xml10_content().into_owned();
+                spend(push_text(&mut stack, &s))?;
+            }
+            Event::CData(t) => {
+                spend(push_text(&mut stack, &t))?;
+            }
+            Event::GeneralRef(g) => {
+                let s = match g.resolve_char_ref() {
+                    Ok(Some(c)) => c.to_string(),
+                    _ => match &*g {
+                        "amp" => "&".into(),
+                        "lt" => "<".into(),
+                        "gt" => ">".into(),
+                        "quot" => "\"".into(),
+                        "apos" => "'".into(),
+                        _ => String::new(),
+                    },
+                };
+                spend(push_text(&mut stack, &s))?;
+            }
+            Event::Eof => break,
+            _ => {}
+        }
+        buf.clear();
+    }
+    while stack.len() > 1 {
+        if let Some(n) = stack.pop()
+            && let Some(top) = stack.last_mut()
+        {
+            top.children.push(Child::Node(n));
+        }
+    }
+    let mut root = stack.pop().unwrap_or_default();
+    root.children.retain(|c| matches!(c, Child::Node(_)));
+    match root.children.pop() {
+        Some(Child::Node(n)) => Ok(n),
+        _ => Err(Error::NotFormat("an empty XML document".into())),
+    }
+}
+
+/// Adds `s` to the text of the open element; the bytes it takes in the tree.
+fn push_text(stack: &mut [Node], s: &str) -> u64 {
+    let Some(n) = stack.last_mut() else { return 0 };
+    if let Some(Child::Text(t)) = n.children.last_mut() {
+        t.push_str(s);
+        s.len() as u64
+    } else {
+        n.children.push(Child::Text(s.to_string()));
+        SLOT + heap(s.len())
+    }
+}
+
+impl Node {
+    pub fn attr(&self, k: &str) -> Option<&str> {
+        self.attrs.iter().find(|a| a.0 == k).map(|a| a.1.as_str())
+    }
+
+    pub fn nodes(&self) -> impl Iterator<Item = &Node> {
+        self.children.iter().filter_map(|c| {
+            if let Child::Node(n) = c {
+                Some(n)
+            } else {
+                None
+            }
+        })
+    }
+
+    pub fn child(&self, name: &str) -> Option<&Node> {
+        self.nodes().find(|n| n.name == name)
+    }
+
+    pub fn all<'a>(&'a self, name: &'a str) -> impl Iterator<Item = &'a Node> + 'a {
+        self.nodes().filter(move |n| n.name == name)
+    }
+
+    /// The first descendant named `name`, depth first.
+    pub fn find(&self, name: &str) -> Option<&Node> {
+        let mut stack: Vec<&Node> = self.nodes().collect();
+        stack.reverse();
+        while let Some(n) = stack.pop() {
+            if n.name == name {
+                return Some(n);
+            }
+            let mut kids: Vec<&Node> = n.nodes().collect();
+            kids.reverse();
+            stack.extend(kids);
+        }
+        None
+    }
+
+    /// The node as a document that `parse` reads back to the same names: the
+    /// known namespaces are declared on it. Elements and attributes of
+    /// other namespaces are left out.
+    pub fn to_xml(&self) -> String {
+        fn escape(s: &str, out: &mut String) {
+            for c in s.chars() {
+                match c {
+                    '&' => out.push_str("&amp;"),
+                    '<' => out.push_str("&lt;"),
+                    '>' => out.push_str("&gt;"),
+                    '"' => out.push_str("&quot;"),
+                    c => out.push(c),
+                }
+            }
+        }
+        fn write(n: &Node, root: bool, out: &mut String) {
+            out.push('<');
+            out.push_str(&n.name);
+            if root {
+                let mut seen: Vec<&str> = vec![];
+                for (uri, prefix) in NS {
+                    if !seen.contains(prefix) {
+                        seen.push(prefix);
+                        out.push_str(&format!(" xmlns:{prefix}=\"{uri}\""));
+                    }
+                }
+            }
+            for (k, v) in n.attrs.iter().filter(|a| !a.0.starts_with('{')) {
+                out.push_str(&format!(" {k}=\""));
+                escape(v, out);
+                out.push('"');
+            }
+            out.push('>');
+            for c in &n.children {
+                match c {
+                    Child::Node(k) if !k.name.starts_with('{') => write(k, false, out),
+                    Child::Node(_) => {}
+                    Child::Text(t) => escape(t, out),
+                }
+            }
+            out.push_str("</");
+            out.push_str(&n.name);
+            out.push('>');
+        }
+        let mut out = String::new();
+        write(self, true, &mut out);
+        out
+    }
+
+    /// The text directly in this node.
+    pub fn own_text(&self) -> String {
+        self.children
+            .iter()
+            .filter_map(|c| {
+                if let Child::Text(t) = c {
+                    Some(t.as_str())
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn prefixes_are_normalized() {
+        let x = br#"<a:document xmlns:a="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:t="urn:oasis:names:tc:opendocument:xmlns:table:1.0"><t:table t:name="S&amp;1">x&#65;<![CDATA[<y>]]></t:table></a:document>"#;
+        let d = parse(x, &mut within(1 << 20)).unwrap();
+        assert_eq!(d.name, "office:document");
+        let t = d.child("table:table").unwrap();
+        assert_eq!(t.attr("table:name"), Some("S&1"));
+        assert_eq!(t.own_text(), "xA<y>");
+        // An early draft's W3C SVG namespace reads as svg.
+        let x = br#"<d xmlns:s="http://www.w3.org/2000/svg" s:width="2cm"/>"#;
+        let d = parse(x, &mut within(1 << 20)).unwrap();
+        assert_eq!(d.attr("svg:width"), Some("2cm"));
+    }
+
+    #[test]
+    fn written_back_reads_the_same() {
+        let x = br#"<o:document xmlns:o="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:t="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:z="urn:other" z:skip="1"><t:table t:name="S&amp;&quot;1&quot;">a &lt; b<z:skipped/><t:row/></t:table></o:document>"#;
+        let d = parse(x, &mut within(1 << 20)).unwrap();
+        let back = d.to_xml();
+        assert!(!back.contains("skip"), "{back}");
+        let e = parse(back.as_bytes(), &mut within(1 << 20)).unwrap();
+        assert_eq!(e.name, "office:document");
+        let t = e.child("table:table").unwrap();
+        assert_eq!(t.attr("table:name"), Some("S&\"1\""));
+        assert_eq!(t.own_text(), "a < b");
+        assert!(t.child("table:row").is_some());
+    }
+
+    #[test]
+    fn bounded() {
+        let mut x = String::new();
+        for _ in 0..300 {
+            x.push_str("<a>");
+        }
+        assert!(parse(x.as_bytes(), &mut within(1 << 20)).is_err());
+        // Unclosed elements are closed at the end.
+        let d = parse(b"<a><b>", &mut within(1 << 20)).unwrap();
+        assert_eq!(d.nodes().count(), 1);
+    }
+
+    #[test]
+    fn the_memory_of_the_tree_is_told_as_it_grows() {
+        // An element of four bytes of input takes a node, whatever its size.
+        let x = format!("<r>{}</r>", "<a/>".repeat(10_000));
+        let mut told = 0;
+        parse(x.as_bytes(), &mut |n| {
+            told += n;
+            true
+        })
+        .unwrap();
+        assert!(told >= 10_000 * size_of::<Node>() as u64, "{told}");
+        let refused = parse(x.as_bytes(), &mut within(told / 2));
+        assert_eq!(refused.err(), Some(Error::TooLarge("memory")));
+        // A text takes its slot and its bytes.
+        let x = format!("<r>{}</r>", "x".repeat(100_000));
+        assert_eq!(
+            parse(x.as_bytes(), &mut within(99_999)).err(),
+            Some(Error::TooLarge("memory"))
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/common/xmlout.rs b/crates/exav-render/src/formats/office/common/xmlout.rs
new file mode 100644
index 00000000..298ba0b9
--- /dev/null
+++ b/crates/exav-render/src/formats/office/common/xmlout.rs
@@ -0,0 +1,43 @@
+//! Escaping for the XML parts a converter writes.
+
+/// Appends `s` escaped for XML text or an attribute value. Characters XML
+/// 1.0 cannot hold are dropped.
+pub fn esc_into(o: &mut String, s: &str) {
+    for c in s.chars() {
+        match c {
+            '&' => o.push_str("&amp;"),
+            '<' => o.push_str("&lt;"),
+            '>' => o.push_str("&gt;"),
+            '"' => o.push_str("&quot;"),
+            '\t' | '\n' | '\r' => o.push(c),
+            c if (c as u32) < 0x20 || c == '\u{FFFE}' || c == '\u{FFFF}' => {}
+            c => o.push(c),
+        }
+    }
+}
+
+pub fn esc(s: &str) -> String {
+    let mut o = String::with_capacity(s.len());
+    esc_into(&mut o, s);
+    o
+}
+
+/// RGB as six hex digits.
+pub fn hex(c: u32) -> String {
+    format!("{:06X}", c & 0xFF_FFFF)
+}
+
+pub const XML_HEAD: &str = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn escapes_and_drops_what_xml_cannot_hold() {
+        assert_eq!(esc("a<b & \"c\""), "a&lt;b &amp; &quot;c&quot;");
+        assert_eq!(esc("x\u{1}y\u{FFFF}\u{FFFE}\u{1F}"), "xy");
+        assert_eq!(esc("tab\tok"), "tab\tok");
+        assert_eq!(hex(0x12ABCDEF), "ABCDEF");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/draw.rs b/crates/exav-render/src/formats/office/docs/doc/draw.rs
new file mode 100644
index 00000000..d2b6e0b4
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/draw.rs
@@ -0,0 +1,364 @@
+//! Pictures and shapes: inline pictures in the data stream and floating
+//! shapes in the drawing layer ([MS-DOC] 2.9.190, 2.9.253, [MS-ODRAW]).
+
+use super::Reader;
+use super::fib::idx;
+use super::story::Story;
+use crate::formats::office::common::bytes::{u16_at, u32_at};
+use crate::formats::office::common::escher::{self, Rec, read_at};
+use crate::formats::office::common::image;
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::model::*;
+
+const TWIP_EMU: i64 = 635;
+
+fn color_of(v: u32) -> Option<u32> {
+    // A direct RGB value has no flags in the top byte.
+    (v >> 24 == 0).then_some((v & 0xFF) << 16 | (v & 0xFF00) | (v >> 16) & 0xFF)
+}
+
+fn fixed(v: u32) -> i32 {
+    // 16.16 fixed point to thousandths of a percent of the picture.
+    ((i64::from(v as i32) * 100_000) >> 16) as i32
+}
+
+/// The picture record inside a BSE, or a bare picture record.
+fn blip_of<'a>(r: &Rec<'a>) -> Option<Rec<'a>> {
+    if r.typ == escher::BSE {
+        let d = r.data;
+        let name_len = d.get(33).copied().unwrap_or(0) as usize;
+        let rest = d.get(36 + name_len..).filter(|x| x.len() >= 8)?;
+        return read_at(rest, 0);
+    }
+    matches!(r.typ, 0xF01A..=0xF02A).then_some(*r)
+}
+
+impl Reader<'_> {
+    fn add_blip(&mut self, b: escher::Blip) -> Result<Option<usize>> {
+        let ext = match b.ext {
+            "png" | "jpeg" | "gif" | "bmp" | "tiff" | "emf" | "wmf" => b.ext,
+            _ => match image::ext(&b.data) {
+                Some(e) => e,
+                None => return Ok(None),
+            },
+        };
+        self.b.alloc(b.data.len() as u64)?;
+        Ok(Some(self.doc.add_media(ext, b.data)))
+    }
+
+    /// A picture character's picture, from the data stream.
+    pub(crate) fn inline_picture(&mut self, loc: i32) -> Result<Option<Drawing>> {
+        if self.word6 {
+            return self.word6_picture(loc);
+        }
+        let at = loc as usize;
+        if loc < 0 || at + 68 > self.data.len() {
+            return Ok(None);
+        }
+        let lcb = u32_at(&self.data, at) as usize;
+        let cb_header = usize::from(u16_at(&self.data, at + 4));
+        let mm = u16_at(&self.data, at + 6);
+        let (goal_x, goal_y) = (
+            i64::from(u16_at(&self.data, at + 28)),
+            i64::from(u16_at(&self.data, at + 30)),
+        );
+        let (mx, my) = (
+            i64::from(u16_at(&self.data, at + 32)),
+            i64::from(u16_at(&self.data, at + 34)),
+        );
+        if cb_header < 68 || lcb < cb_header {
+            return Ok(None);
+        }
+        let end = at.saturating_add(lcb).min(self.data.len());
+        let mut start = at + cb_header;
+        if mm == 0x66 {
+            start += 1 + usize::from(self.data.get(start).copied().unwrap_or(0));
+        }
+        let Some(body) = self.data.get(start..end) else {
+            return Ok(None);
+        };
+        // The shape container, then the pictures it uses.
+        let body = body.to_vec();
+        let mut shape: Option<Vec<(u16, u32)>> = None;
+        let mut blips = vec![];
+        let mut pos = 0usize;
+        while let Some(r) = read_at(&body, pos) {
+            pos = pos + 8 + r.data.len();
+            if r.typ == escher::SP_CONTAINER {
+                let s = escher::sp_container(&r);
+                shape = Some(s.props.0.iter().map(|p| (p.id, p.value)).collect());
+            } else if let Some(bl) = blip_of(&r) {
+                blips.push(bl);
+            }
+            if blips.len() > 4 {
+                break;
+            }
+        }
+        let props = shape.unwrap_or_default();
+        let get = |id: u16| props.iter().rev().find(|p| p.0 == id).map(|p| p.1);
+        let pib = get(0x0104).unwrap_or(1) as usize;
+        let rec = blips.get(pib.saturating_sub(1)).or(blips.first()).copied();
+        let Some(rec) = rec else { return Ok(None) };
+        let Some(blip) = escher::blip(&rec) else {
+            return Ok(None);
+        };
+        let Some(media) = self.add_blip(blip)? else {
+            return Ok(None);
+        };
+        let crop = Crop {
+            t: get(0x0100).map(fixed).unwrap_or(0),
+            b: get(0x0101).map(fixed).unwrap_or(0),
+            l: get(0x0102).map(fixed).unwrap_or(0),
+            r: get(0x0103).map(fixed).unwrap_or(0),
+        };
+        let m = &self.doc.media[media];
+        let natural = image::natural_emu(&m.data);
+        let (mut cx, mut cy) = (goal_x * mx / 1000 * TWIP_EMU, goal_y * my / 1000 * TWIP_EMU);
+        if cx <= 0 || cy <= 0 {
+            let (nx, ny) = natural.unwrap_or((914_400, 914_400));
+            cx = nx;
+            cy = ny;
+        }
+        Ok(Some(Drawing {
+            anchor: None,
+            cx,
+            cy,
+            name: "Picture".into(),
+            descr: None,
+            kind: DrawingKind::Picture { media, crop },
+        }))
+    }
+
+    /// The picture a floating shape shows, and its text, by shape id.
+    pub(crate) fn floating_shape(&mut self, cp: u32, story: Story) -> Result<Option<Drawing>> {
+        let hdr = story == Story::Header;
+        let base = if hdr { self.base_hdd() } else { 0 };
+        let spa = {
+            let list = if hdr { &self.spa_hdr } else { &self.spa_main };
+            list.iter().find(|s| s.cp + base == cp).cloned()
+        };
+        let Some(spa) = spa else { return Ok(None) };
+        let (off, len) = self.fib.at(idx::DGG_INFO);
+        let Some(area) = self
+            .tbl
+            .get(off..off.saturating_add(len).min(self.tbl.len()))
+        else {
+            return Ok(None);
+        };
+        // The drawing layer is read from a copy: the text of text boxes needs
+        // the reader itself.
+        let area = area.to_vec();
+        self.floating_inner(&area, &spa, hdr)
+    }
+
+    fn floating_inner(
+        &mut self,
+        area: &[u8],
+        spa: &super::Spa,
+        hdr: bool,
+    ) -> Result<Option<Drawing>> {
+        let Some(dgg) = read_at(area, 0) else {
+            return Ok(None);
+        };
+        // The drawings follow the group record: a byte, then a container.
+        let mut pos = 8 + dgg.data.len();
+        let mut drawing = None;
+        for _ in 0..2 {
+            let label = area.get(pos).copied();
+            let Some(label) = label else { break };
+            let Some(dg) = read_at(area, pos + 1) else {
+                break;
+            };
+            pos += 1 + 8 + dg.data.len();
+            if (label == 1) == hdr {
+                drawing = Some(escher::drawing(&dg));
+                break;
+            }
+        }
+        let Some(d) = drawing else { return Ok(None) };
+        fn find<'a, 'b>(v: &'b [escher::OShape<'a>], id: u32) -> Option<&'b escher::OShape<'a>> {
+            for s in v {
+                if s.spid == id {
+                    return Some(s);
+                }
+                if let Some(x) = find(&s.children, id) {
+                    return Some(x);
+                }
+            }
+            None
+        }
+        let Some(shape) = find(&d.shapes, spa.lid) else {
+            return Ok(None);
+        };
+        if shape.is_group() {
+            return Ok(None);
+        }
+        let p = &shape.props;
+        // Placement.
+        let flags = spa.flags;
+        let bx = (flags >> 1) & 3;
+        let by = (flags >> 3) & 3;
+        let wr = (flags >> 5) & 0xF;
+        let below = flags & 0x4000 != 0;
+        let width = i64::from(spa.rect[2]) - i64::from(spa.rect[0]);
+        let height = i64::from(spa.rect[3]) - i64::from(spa.rect[1]);
+        let anchor = Anchor {
+            h_rel: match bx {
+                0 => "margin",
+                1 => "page",
+                _ => "column",
+            },
+            v_rel: match by {
+                0 => "margin",
+                1 => "page",
+                _ => "paragraph",
+            },
+            h_off: i64::from(spa.rect[0]) * TWIP_EMU,
+            v_off: i64::from(spa.rect[1]) * TWIP_EMU,
+            wrap: match wr {
+                1 => Wrap::TopBottom,
+                3 => Wrap::None,
+                4 => Wrap::Tight,
+                5 => Wrap::Through,
+                _ => Wrap::Square,
+            },
+            behind: below,
+            z: spa.cp % 1_000_000,
+            dist: [
+                p.get(0x0385).map(i64::from).unwrap_or(0),
+                p.get(0x0387).map(i64::from).unwrap_or(0),
+                p.get(0x0384).map(i64::from).unwrap_or(114_300),
+                p.get(0x0386).map(i64::from).unwrap_or(114_300),
+            ],
+            ..Anchor::default()
+        };
+        let (cx, cy) = (width.max(0) * TWIP_EMU, height.max(0) * TWIP_EMU);
+        // A picture shape; its bitmap may be in the delay stream (the
+        // WordDocument stream).
+        if let Some(pib) = p.get(0x0104).filter(|v| *v > 0) {
+            let blip = escher::blip_records(&dgg, &self.wd)
+                .get(pib as usize - 1)
+                .copied()
+                .flatten()
+                .and_then(|r| escher::blip(&r));
+            if let Some(blip) = blip
+                && let Some(media) = self.add_blip(blip)?
+            {
+                let crop = Crop {
+                    t: p.get(0x0100).map(fixed).unwrap_or(0),
+                    b: p.get(0x0101).map(fixed).unwrap_or(0),
+                    l: p.get(0x0102).map(fixed).unwrap_or(0),
+                    r: p.get(0x0103).map(fixed).unwrap_or(0),
+                };
+                return Ok(Some(Drawing {
+                    anchor: Some(anchor),
+                    cx,
+                    cy,
+                    name: "Picture".into(),
+                    descr: None,
+                    kind: DrawingKind::Picture { media, crop },
+                }));
+            }
+        }
+        // A text box or an autoshape.
+        let plc = if hdr { &self.txbx_hdr } else { &self.txbx_main };
+        let base_tx = if hdr {
+            self.base_hdr_txbx()
+        } else {
+            self.base_txbx()
+        };
+        let text_range = plc
+            .data
+            .iter()
+            .position(|d| u32_at(d, 14) == spa.lid && u16_at(d, 8) == 0)
+            .and_then(|k| {
+                Some((
+                    base_tx.checked_add(*plc.cps.get(k)?)?,
+                    base_tx.checked_add(*plc.cps.get(k + 1)?)?,
+                ))
+            });
+        let preset = match shape.spt {
+            2 => "roundRect",
+            3 => "ellipse",
+            4 => "diamond",
+            5 => "triangle",
+            6 => "rtTriangle",
+            7 => "parallelogram",
+            8 => "trapezoid",
+            9 => "hexagon",
+            10 => "octagon",
+            11 => "plus",
+            12 => "star5",
+            13 => "rightArrow",
+            20 | 32 => "line",
+            _ => "rect",
+        };
+        let mut sh = Shape {
+            preset,
+            ..Shape::default()
+        };
+        let filled = p.flag(0x01BF, 4) != Some(false);
+        if filled {
+            let c = p.get(0x0181).and_then(color_of).unwrap_or(0xFFFFFF);
+            sh.fill = Fill::Solid(c);
+        }
+        if p.flag(0x01FF, 3) != Some(false) && (p.get(0x01C0).is_some() || shape.spt == 20) {
+            let c = p.get(0x01C0).and_then(color_of).unwrap_or(0);
+            sh.line = Some(Line {
+                color: Color::Rgb(c),
+                width: p.get(0x01CB).map(i64::from).unwrap_or(9525),
+                dash: "solid",
+            });
+        }
+        sh.insets = [
+            p.get(0x0081).map(i64::from).unwrap_or(91_440),
+            p.get(0x0082).map(i64::from).unwrap_or(45_720),
+            p.get(0x0083).map(i64::from).unwrap_or(91_440),
+            p.get(0x0084).map(i64::from).unwrap_or(45_720),
+        ];
+        sh.v_anchor = match p.get(0x0087).unwrap_or(0) {
+            1 | 4 | 5 | 8 | 9 => "ctr",
+            2 | 3 | 6 | 7 => "b",
+            _ => "t",
+        };
+        sh.flip_h = shape.flags & escher::F_FLIP_H != 0;
+        sh.flip_v = shape.flags & escher::F_FLIP_V != 0;
+        sh.rot = ((p.get(0x0004).unwrap_or(0) as i32 as i64 * 60_000) >> 16) as i32;
+        if let Some((a, b)) = text_range {
+            let b = b.min(self.text.len() as u32);
+            if b > a + 1 {
+                let mut blocks = self.story_blocks(a, b, Story::Textbox)?;
+                // The mark that ends the text box is not a paragraph of it.
+                if blocks.len() > 1
+                    && let Some(Block::Para(last)) = blocks.last()
+                    && last.content.is_empty()
+                {
+                    blocks.pop();
+                }
+                sh.text = blocks;
+            }
+        }
+        Ok(Some(Drawing {
+            anchor: Some(anchor),
+            cx,
+            cy,
+            name: "Shape".into(),
+            descr: None,
+            kind: DrawingKind::Shape(sh),
+        }))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn colours_and_fixed_point() {
+        assert_eq!(color_of(0x0000_00FF), Some(0xFF0000));
+        assert_eq!(color_of(0x0100_0000), None);
+        assert_eq!(color_of(0x00FF_8000), Some(0x0080FF));
+        // 0.25 of the picture.
+        assert_eq!(fixed(0x4000), 25_000);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/fib.rs b/crates/exav-render/src/formats/office/docs/doc/fib.rs
new file mode 100644
index 00000000..3500d1c1
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/fib.rs
@@ -0,0 +1,302 @@
+//! The file information block and the text it locates: the piece table
+//! ([MS-DOC] 2.5, 2.9.38).
+
+use crate::formats::office::common::bytes::{Cur, u16_at, u32_at};
+use crate::formats::office::docs::error::{Error, Result};
+
+pub struct Fib {
+    pub n_fib: u16,
+    pub which_table: bool,
+    pub encrypted: bool,
+    pub ccp_text: i64,
+    pub ccp_ftn: i64,
+    pub ccp_hdd: i64,
+    pub ccp_atn: i64,
+    pub ccp_edn: i64,
+    pub ccp_txbx: i64,
+    pub ccp_hdr_txbx: i64,
+    /// The (fc, lcb) pairs of FibRgFcLcb97, as many as the file has.
+    pub pairs: Vec<(u32, u32)>,
+}
+
+/// A sum of character counts as a character position, saturating.
+pub fn cp(sum: i64) -> u32 {
+    u32::try_from(sum).unwrap_or(u32::MAX)
+}
+
+/// Indexes into FibRgFcLcb97's pairs.
+pub mod idx {
+    pub const STSHF: usize = 1;
+    pub const PLCFFND_REF: usize = 2;
+    pub const PLCFFND_TXT: usize = 3;
+    pub const PLCFAND_REF: usize = 4;
+    pub const PLCFAND_TXT: usize = 5;
+    pub const PLCF_SED: usize = 6;
+    pub const PLCF_HDD: usize = 11;
+    pub const PLCF_BTE_CHPX: usize = 12;
+    pub const PLCF_BTE_PAPX: usize = 13;
+    pub const STTBF_FFN: usize = 15;
+    pub const STTBF_BKMK: usize = 21;
+    pub const PLCF_BKF: usize = 22;
+    pub const PLCF_BKL: usize = 23;
+    pub const DOP: usize = 31;
+    pub const CLX: usize = 33;
+    pub const GRP_XST_ATN_OWNERS: usize = 36;
+    pub const PLC_SPA_MOM: usize = 40;
+    pub const PLC_SPA_HDR: usize = 41;
+    pub const PLCF_ATN_BKF: usize = 42;
+    pub const PLCF_ATN_BKL: usize = 43;
+    pub const PLCFEND_REF: usize = 46;
+    pub const PLCFEND_TXT: usize = 47;
+    pub const DGG_INFO: usize = 50;
+    pub const PLCFTXBX_TXT: usize = 56;
+    pub const PLCF_HDR_TXBX_TXT: usize = 58;
+    pub const PLF_LST: usize = 73;
+    pub const PLF_LFO: usize = 74;
+}
+
+impl Fib {
+    pub fn read(wd: &[u8]) -> Result<Fib> {
+        if wd.len() < 154 {
+            return Err(Error::Malformed(
+                "the WordDocument stream is too short".into(),
+            ));
+        }
+        let w_ident = u16_at(wd, 0);
+        if w_ident != 0xA5EC {
+            return Err(Error::Unsupported(format!(
+                "Word document of an unknown kind (identifier {w_ident:#06x})"
+            )));
+        }
+        let n_fib = u16_at(wd, 2);
+        let flags = u16_at(wd, 10);
+        let csw = usize::from(u16_at(wd, 32));
+        let w_lw = 34 + csw * 2;
+        let cslw = usize::from(u16_at(wd, w_lw));
+        let lw = w_lw + 2;
+        let w_fc = lw + cslw * 4;
+        let cb = usize::from(u16_at(wd, w_fc));
+        let mut pairs = Vec::with_capacity(cb.min(512));
+        for i in 0..cb.min(512) {
+            let p = w_fc + 2 + 8 * i;
+            if p + 8 > wd.len() {
+                break;
+            }
+            pairs.push((u32_at(wd, p), u32_at(wd, p + 4)));
+        }
+        let lwv = |i: usize| i64::from(u32_at(wd, lw + 4 * i) as i32);
+        if cslw < 15 {
+            return Err(Error::Malformed(
+                "the file information block is too short".into(),
+            ));
+        }
+        Ok(Fib {
+            n_fib,
+            which_table: flags & 0x0200 != 0,
+            encrypted: flags & 0x0100 != 0,
+            ccp_text: lwv(3).max(0),
+            ccp_ftn: lwv(4).max(0),
+            ccp_hdd: lwv(5).max(0),
+            ccp_atn: lwv(7).max(0),
+            ccp_edn: lwv(8).max(0),
+            ccp_txbx: lwv(9).max(0),
+            ccp_hdr_txbx: lwv(10).max(0),
+            pairs,
+        })
+    }
+
+    /// The (offset, size) of a structure in the table stream; (0, 0) when the
+    /// file has no such pair.
+    pub fn at(&self, i: usize) -> (usize, usize) {
+        self.pairs
+            .get(i)
+            .map(|p| (p.0 as usize, p.1 as usize))
+            .unwrap_or((0, 0))
+    }
+
+    /// Total characters of all the parts of the document.
+    pub fn total_cp(&self) -> i64 {
+        let parts = self.ccp_text
+            + self.ccp_ftn
+            + self.ccp_hdd
+            + self.ccp_atn
+            + self.ccp_edn
+            + self.ccp_txbx
+            + self.ccp_hdr_txbx;
+        // One more paragraph mark closes the last non-empty part.
+        parts + i64::from(parts > self.ccp_text)
+    }
+}
+
+/// One piece of text: characters `cp0..cp1`, at byte `fc` of the
+/// WordDocument stream.
+#[derive(Clone, Debug)]
+pub struct Piece {
+    pub cp0: u32,
+    pub cp1: u32,
+    pub fc: u32,
+    pub compressed: bool,
+    pub prm: u16,
+}
+
+impl Piece {
+    pub fn unit(&self) -> u32 {
+        if self.compressed { 1 } else { 2 }
+    }
+
+    pub fn fc_of(&self, cp: u32) -> u32 {
+        self.fc
+            .saturating_add((cp - self.cp0).saturating_mul(self.unit()))
+    }
+}
+
+pub struct Clx {
+    pub pieces: Vec<Piece>,
+    /// The grpprls of Prm1 modifiers.
+    pub prcs: Vec<Vec<u8>>,
+}
+
+pub fn read_clx(tbl: &[u8], off: usize, len: usize) -> Result<Clx> {
+    let d = tbl
+        .get(off..off.saturating_add(len).min(tbl.len()))
+        .ok_or_else(|| Error::Malformed("the piece table is outside the table stream".into()))?;
+    let mut c = Cur::new(d);
+    let mut prcs = vec![];
+    loop {
+        match c.u8() {
+            1 => {
+                let n = usize::from(c.u16());
+                prcs.push(c.bytes(n).to_vec());
+                if prcs.len() > 1 << 15 {
+                    return Err(Error::Malformed("too many property modifier groups".into()));
+                }
+            }
+            2 => break,
+            _ => {
+                return Err(Error::Malformed(
+                    "no piece table in the table stream".into(),
+                ));
+            }
+        }
+        if c.short {
+            return Err(Error::Malformed("the piece table is cut short".into()));
+        }
+    }
+    let lcb = c.u32() as usize;
+    let plc = c.bytes(lcb);
+    // n + 1 CPs of 4 bytes and n Pcd of 8 bytes.
+    let n = plc.len().saturating_sub(4) / 12;
+    let mut pieces = Vec::with_capacity(n);
+    for i in 0..n {
+        let cp0 = u32_at(plc, 4 * i);
+        let cp1 = u32_at(plc, 4 * (i + 1));
+        let pcd = 4 * (n + 1) + 8 * i;
+        let fcc = u32_at(plc, pcd + 2);
+        let prm = u16_at(plc, pcd + 6);
+        let compressed = fcc & 0x4000_0000 != 0;
+        let fc = fcc & 0x3FFF_FFFF;
+        if cp1 < cp0 {
+            return Err(Error::Malformed("pieces out of order".into()));
+        }
+        pieces.push(Piece {
+            cp0,
+            cp1,
+            fc: if compressed { fc / 2 } else { fc },
+            compressed,
+            prm,
+        });
+    }
+    if pieces.is_empty() {
+        return Err(Error::Malformed("the document has no text".into()));
+    }
+    Ok(Clx { pieces, prcs })
+}
+
+const CP1252_HIGH: [u16; 32] = [
+    0x20AC, 0x0081, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0x02C6, 0x2030, 0x0160, 0x2039,
+    0x0152, 0x008D, 0x017D, 0x008F, 0x0090, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x009D, 0x017E, 0x0178,
+];
+
+/// The text of every piece as UTF-16 code units, indexed by CP.
+pub fn read_text(wd: &[u8], pieces: &[Piece], total: usize) -> Vec<u16> {
+    read_text_in(wd, pieces, total, None)
+}
+
+/// [`read_text`], the 8-bit characters in a code page of 256 entries rather
+/// than Windows 1252 (a Word 6 or 95 file keeps the document's own).
+pub fn read_text_in(
+    wd: &[u8],
+    pieces: &[Piece],
+    total: usize,
+    table: Option<&[u16; 256]>,
+) -> Vec<u16> {
+    let mut out = vec![0x0Du16; total];
+    for p in pieces {
+        let (a, b) = (p.cp0 as usize, (p.cp1 as usize).min(total));
+        if a >= b {
+            continue;
+        }
+        let fc = p.fc as usize;
+        for (k, slot) in out[a..b].iter_mut().enumerate() {
+            *slot = if p.compressed {
+                match wd.get(fc + k) {
+                    Some(&c) if table.is_some_and(|_| c >= 0x80) => {
+                        table.map_or(u16::from(c), |t| t[usize::from(c)])
+                    }
+                    Some(&c) if (0x80..0xA0).contains(&c) => CP1252_HIGH[usize::from(c - 0x80)],
+                    Some(&c) => u16::from(c),
+                    None => 0x0D,
+                }
+            } else {
+                match wd.get(fc + 2 * k..fc + 2 * k + 2) {
+                    Some(&[x, y]) => u16::from_le_bytes([x, y]),
+                    _ => 0x0D,
+                }
+            };
+        }
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn piece_table_with_both_encodings() {
+        // Clx: one piece of 3 compressed characters at byte 0x100, one of 2
+        // UTF-16 characters at 0x200.
+        let mut plc = vec![];
+        for cp in [0u32, 3, 5] {
+            plc.extend_from_slice(&cp.to_le_bytes());
+        }
+        for (fc, compressed) in [(0x100u32, true), (0x200, false)] {
+            plc.extend_from_slice(&[0, 0]);
+            let v = if compressed {
+                (fc * 2) | 0x4000_0000
+            } else {
+                fc
+            };
+            plc.extend_from_slice(&v.to_le_bytes());
+            plc.extend_from_slice(&[0, 0]);
+        }
+        let mut clx = vec![2u8];
+        clx.extend_from_slice(&(plc.len() as u32).to_le_bytes());
+        clx.extend_from_slice(&plc);
+        let c = read_clx(&clx, 0, clx.len()).unwrap();
+        assert_eq!(c.pieces.len(), 2);
+        assert_eq!((c.pieces[0].fc, c.pieces[0].compressed), (0x100, true));
+        let mut wd = vec![0u8; 0x300];
+        wd[0x100..0x103].copy_from_slice(&[b'a', 0x93, b'c']);
+        wd[0x200..0x204].copy_from_slice(&[0x41, 0x26, 0x42, 0x00]);
+        let t = read_text(&wd, &c.pieces, 5);
+        assert_eq!(t, vec![0x61, 0x201C, 0x63, 0x2641, 0x42]);
+    }
+
+    #[test]
+    fn a_piece_table_without_pieces_is_refused() {
+        assert!(read_clx(&[2, 4, 0, 0, 0, 0, 0, 0, 0], 0, 9).is_err());
+        assert!(read_clx(&[7], 0, 1).is_err());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/lists.rs b/crates/exav-render/src/formats/office/docs/doc/lists.rs
new file mode 100644
index 00000000..8a7a27d9
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/lists.rs
@@ -0,0 +1,370 @@
+//! Lists ([MS-DOC] 2.9.147 to 2.9.150, 2.9.200, 2.9.201): list definitions
+//! and the list instances paragraphs refer to.
+
+use super::props::{ChpAux, Ctx, PapAux, apply_chp_list, apply_pap_list};
+use crate::formats::office::common::bytes::{Cur, u16_at, u32_at};
+use crate::formats::office::docs::model::*;
+
+/// The ST_NumberFormat of an MSONFC ([MS-OSHARED] 2.2.1.3).
+pub fn number_format(nfc: u8) -> &'static str {
+    const NAMES: [&str; 0x3C] = [
+        "decimal",
+        "upperRoman",
+        "lowerRoman",
+        "upperLetter",
+        "lowerLetter",
+        "ordinal",
+        "cardinalText",
+        "ordinalText",
+        "hex",
+        "chicago",
+        "ideographDigital",
+        "japaneseCounting",
+        "aiueo",
+        "iroha",
+        "decimalFullWidth",
+        "decimalHalfWidth",
+        "japaneseLegal",
+        "japaneseDigitalTenThousand",
+        "decimalEnclosedCircle",
+        "decimalFullWidth2",
+        "aiueoFullWidth",
+        "irohaFullWidth",
+        "decimalZero",
+        "bullet",
+        "ganada",
+        "chosung",
+        "decimalEnclosedFullstop",
+        "decimalEnclosedParen",
+        "decimalEnclosedCircleChinese",
+        "ideographEnclosedCircle",
+        "ideographTraditional",
+        "ideographZodiac",
+        "ideographZodiacTraditional",
+        "taiwaneseCounting",
+        "ideographLegalTraditional",
+        "taiwaneseCountingThousand",
+        "taiwaneseDigital",
+        "chineseCounting",
+        "chineseLegalSimplified",
+        "chineseCountingThousand",
+        "decimal",
+        "koreanDigital",
+        "koreanCounting",
+        "koreanLegal",
+        "koreanDigital2",
+        "hebrew1",
+        "arabicAlpha",
+        "hebrew2",
+        "arabicAbjad",
+        "hindiVowels",
+        "hindiConsonants",
+        "hindiNumbers",
+        "hindiCounting",
+        "thaiLetters",
+        "thaiNumbers",
+        "thaiCounting",
+        "vietnameseCounting",
+        "numberInDash",
+        "russianLower",
+        "russianUpper",
+    ];
+    match nfc {
+        0xFF => "none",
+        n => NAMES.get(usize::from(n)).copied().unwrap_or("decimal"),
+    }
+}
+
+/// A bullet written in a symbol font, as Unicode text a font of any kind
+/// can show.
+fn bullet(ch: u16, font: Option<&str>) -> (String, bool) {
+    let low = ch & 0x0FFF;
+    let f = font.unwrap_or("").to_ascii_lowercase();
+    let map = |c: u16| -> Option<char> {
+        Some(match (f.as_str(), c) {
+            ("symbol", 0xB7) => '\u{2022}',
+            ("symbol", 0xA8) => '\u{2666}',
+            ("symbol", 0xD8) => '\u{21D2}',
+            ("symbol", 0xAE) => '\u{2192}',
+            ("wingdings", 0xA7) => '\u{25AA}',
+            ("wingdings", 0xA8) => '\u{25FB}',
+            ("wingdings", 0x76) => '\u{2756}',
+            ("wingdings", 0xD8) => '\u{27A2}',
+            ("wingdings", 0xFC) => '\u{2714}',
+            ("wingdings", 0x6E) => '\u{25A0}',
+            ("wingdings", 0x71) => '\u{2751}',
+            ("wingdings", 0x6C) => '\u{25CF}',
+            ("wingdings", 0xFB) => '\u{2717}',
+            ("wingdings", 0x9F) => '\u{2022}',
+            ("wingdings", 0xA1) => '\u{25CB}',
+            ("wingdings", 0x77) => '\u{2B27}',
+            _ => return None,
+        })
+    };
+    if (ch & 0xF000 != 0 || f == "symbol" || f == "wingdings")
+        && let Some(c) = map(low)
+    {
+        return (c.to_string(), true);
+    }
+    (
+        char::from_u32(u32::from(if ch & 0xF000 != 0 { low } else { ch }))
+            .unwrap_or('\u{2022}')
+            .to_string(),
+        false,
+    )
+}
+
+fn read_lvl(d: &[u8], p: &mut usize, cx: &Ctx, style: Option<String>) -> Option<Level> {
+    let b = d.get(*p..*p + 28)?;
+    let start = i64::from(u32_at(b, 0) as i32);
+    let nfc = b[4];
+    let flags = b[5];
+    let nums = &b[6..15];
+    let follow = b[15];
+    let cb_chpx = usize::from(b[24]);
+    let cb_papx = usize::from(b[25]);
+    let restart_lim = b[26];
+    let mut c = Cur::at(d, *p + 28);
+    let papx = c.bytes(cb_papx);
+    let chpx = c.bytes(cb_chpx);
+    let cch = usize::from(c.u16());
+    let xst = c.bytes(cch * 2);
+    if c.short {
+        return None;
+    }
+    *p = c.p;
+    let units: Vec<u16> = xst
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|x| u16::from_le_bytes(*x))
+        .collect();
+    let mut rpr = RunProps::default();
+    let mut caux = ChpAux::default();
+    apply_chp_list(&mut rpr, &mut caux, chpx, cx);
+    let mut ppr = ParaProps::default();
+    let mut paux = PapAux::default();
+    apply_pap_list(&mut ppr, &mut paux, papx);
+    let fmt = number_format(nfc);
+    let text = if nfc == 0x17 {
+        let (t, mapped) = bullet(
+            units.first().copied().unwrap_or(0x2022),
+            rpr.fonts.ascii.as_deref().or(rpr.fonts.hansi.as_deref()),
+        );
+        if mapped {
+            rpr.fonts = Fonts::default();
+        }
+        t
+    } else {
+        let mut s = String::new();
+        for (k, u) in units.iter().enumerate() {
+            let mark = (k + 1) as u8;
+            if nums.contains(&mark) && *u < 9 {
+                s.push_str(&format!("%{}", u + 1));
+            } else if let Some(ch) = char::from_u32(u32::from(*u)) {
+                s.push(ch);
+            }
+        }
+        s
+    };
+    Some(Level {
+        start,
+        fmt: if nfc == 0xFF { "none" } else { fmt },
+        text,
+        jc: match flags & 3 {
+            1 => Jc::Center,
+            2 => Jc::Right,
+            _ => Jc::Left,
+        },
+        suff: match follow {
+            1 => "space",
+            2 => "nothing",
+            _ => "tab",
+        },
+        style,
+        ppr,
+        rpr,
+        legal: flags & 4 != 0,
+        // Restarts after the levels more significant than the limit.
+        restart: (flags & 8 != 0).then_some(u32::from(restart_lim)),
+    })
+}
+
+pub struct Lists {
+    pub numbering: Numbering,
+}
+
+/// Reads the list definitions and instances. `style_id` names the style an
+/// istd stands for.
+pub fn read(
+    tbl: &[u8],
+    lst: (usize, usize),
+    lfo: (usize, usize),
+    cx: &Ctx,
+    style_id: &dyn Fn(u16) -> Option<String>,
+) -> Lists {
+    let mut out = Numbering::default();
+    let mut lsids = vec![];
+    if lst.1 >= 2 {
+        // The level definitions follow the list definitions, past the size
+        // the file's pair gives.
+        let d = tbl.get(lst.0..).unwrap_or(&[]);
+        let n = usize::from(u16_at(d, 0)).min(4096);
+        let mut p = 2 + 28 * n;
+        for i in 0..n {
+            let b = match d.get(2 + 28 * i..2 + 28 * i + 28) {
+                Some(b) => b,
+                None => break,
+            };
+            let lsid = u32_at(b, 0) as i32;
+            let simple = b[26] & 1 != 0;
+            let styles: Vec<u16> = (0..9).map(|k| u16_at(b, 8 + 2 * k)).collect();
+            let nlvl = if simple { 1 } else { 9 };
+            let mut levels = vec![];
+            for k in 0..nlvl {
+                let st = styles
+                    .get(k)
+                    .filter(|s| **s != 0x0FFF)
+                    .and_then(|s| style_id(*s));
+                match read_lvl(d, &mut p, cx, st) {
+                    Some(l) => levels.push(l),
+                    None => break,
+                }
+            }
+            lsids.push(lsid);
+            out.abstracts.push(AbstractNum {
+                id: i as u32,
+                multi_level: !simple,
+                levels,
+            });
+        }
+    }
+    if lfo.1 >= 4 {
+        let d = tbl
+            .get(lfo.0..lfo.0.saturating_add(lfo.1).min(tbl.len()))
+            .unwrap_or(&[]);
+        let n = (u32_at(d, 0) as usize).min(8192);
+        let mut p = 4 + 16 * n;
+        for i in 0..n {
+            let Some(b) = d.get(4 + 16 * i..4 + 16 * i + 16) else {
+                break;
+            };
+            let lsid = u32_at(b, 0) as i32;
+            let clfolvl = usize::from(b[12]);
+            let abstract_id = lsids
+                .iter()
+                .position(|l| *l == lsid)
+                .map(|x| x as u32)
+                .unwrap_or(0);
+            p += 4;
+            let mut overrides = vec![];
+            for _ in 0..clfolvl {
+                if p + 8 > d.len() {
+                    break;
+                }
+                let start = i64::from(u32_at(d, p) as i32);
+                let fl = u32_at(d, p + 4);
+                let lvl_no = fl & 0xF;
+                p += 8;
+                let has_start = fl & 0x10 != 0;
+                let has_fmt = fl & 0x20 != 0;
+                let def = if has_fmt {
+                    read_lvl(d, &mut p, cx, None)
+                } else {
+                    None
+                };
+                let start_over = (has_start && !has_fmt).then_some(start);
+                overrides.push((lvl_no, start_over, def));
+            }
+            out.nums.push(Num {
+                id: i as u32 + 1,
+                abstract_id,
+                overrides,
+            });
+        }
+    }
+    Lists { numbering: out }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn lvl(nfc: u8, text: &[u16], nums: &[u8], follow: u8) -> Vec<u8> {
+        let mut b = vec![0u8; 28];
+        b[0] = 1;
+        b[4] = nfc;
+        b[6..6 + nums.len()].copy_from_slice(nums);
+        b[15] = follow;
+        let mut v = b;
+        v.extend_from_slice(&(text.len() as u16).to_le_bytes());
+        for u in text {
+            v.extend_from_slice(&u.to_le_bytes());
+        }
+        v
+    }
+
+    #[test]
+    fn levels_become_number_text() {
+        let fonts = vec![];
+        let base = RunProps::default();
+        let cx = Ctx {
+            fonts: &fonts,
+            base: &base,
+        };
+        let v = lvl(0, &[0, 0x2E, 1], &[1], 0);
+        let mut p = 0;
+        let l = read_lvl(&v, &mut p, &cx, None).unwrap();
+        assert_eq!(l.text, "%1.\u{1}");
+        let v = lvl(0, &[0, b'.' as u16], &[1], 1);
+        let mut p = 0;
+        let l = read_lvl(&v, &mut p, &cx, None).unwrap();
+        assert_eq!(
+            (l.text.as_str(), l.fmt, l.suff),
+            ("%1.", "decimal", "space")
+        );
+        let v = lvl(0x17, &[0xF0B7], &[], 0);
+        let mut p = 0;
+        let l = read_lvl(&v, &mut p, &cx, None).unwrap();
+        assert_eq!(l.fmt, "bullet");
+        assert_eq!(l.text, "\u{B7}");
+    }
+
+    #[test]
+    fn definitions_and_instances() {
+        let fonts = vec![];
+        let base = RunProps::default();
+        let cx = Ctx {
+            fonts: &fonts,
+            base: &base,
+        };
+        // One simple list (lsid 7) with one level; one LFO using it with a start override.
+        let mut lst = 1u16.to_le_bytes().to_vec();
+        let mut lstf = vec![0u8; 28];
+        lstf[0] = 7;
+        lstf[26] = 1;
+        for k in 0..9 {
+            lstf[8 + 2 * k] = 0xFF;
+            lstf[9 + 2 * k] = 0x0F;
+        }
+        lst.extend_from_slice(&lstf);
+        lst.extend_from_slice(&lvl(4, &[0, b')' as u16], &[1], 0));
+        let mut lfo = 1u32.to_le_bytes().to_vec();
+        let mut e = vec![0u8; 16];
+        e[0] = 7;
+        e[12] = 1;
+        lfo.extend_from_slice(&e);
+        lfo.extend_from_slice(&[0xFF; 4]);
+        lfo.extend_from_slice(&5u32.to_le_bytes());
+        lfo.extend_from_slice(&0x10u32.to_le_bytes());
+        let mut t = lst.clone();
+        let lfo_at = t.len();
+        t.extend_from_slice(&lfo);
+        let l = read(&t, (0, lst.len()), (lfo_at, lfo.len()), &cx, &|_| None);
+        assert_eq!(l.numbering.abstracts.len(), 1);
+        assert_eq!(l.numbering.abstracts[0].levels[0].fmt, "lowerLetter");
+        assert_eq!(l.numbering.nums.len(), 1);
+        assert_eq!(l.numbering.nums[0].abstract_id, 0);
+        assert_eq!(l.numbering.nums[0].overrides[0].1, Some(5));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/mod.rs b/crates/exav-render/src/formats/office/docs/doc/mod.rs
new file mode 100644
index 00000000..95d6502a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/mod.rs
@@ -0,0 +1,573 @@
+//! Word 6 to 2003 binary documents ([MS-DOC]; Word 6 and 95 in `word6`) to the
+//! document model.
+
+mod draw;
+mod fib;
+pub(crate) mod lists;
+mod props;
+mod sprm;
+mod story;
+mod styles;
+mod tables;
+mod word6;
+
+use crate::formats::office::common::bytes::{u16_at, u32_at};
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+use exav_unpack::cfb::Compound;
+use fib::{Fib, Piece, idx};
+use std::collections::HashMap;
+
+/// An FKP entry: the bytes `lo..hi` of the WordDocument stream and the
+/// modifier list that applies to them.
+#[derive(Clone, Copy)]
+pub(crate) struct Run {
+    pub lo: u32,
+    pub hi: u32,
+    pub off: u32,
+    pub len: u16,
+}
+
+/// A Plc: positions and the fixed-size data between them.
+pub(crate) struct Plc {
+    pub cps: Vec<u32>,
+    pub data: Vec<Vec<u8>>,
+}
+
+pub(crate) fn read_plc(tbl: &[u8], off: usize, len: usize, size: usize) -> Plc {
+    let d = tbl
+        .get(off..off.saturating_add(len).min(tbl.len()))
+        .unwrap_or(&[]);
+    let n = if size == 0 {
+        (d.len() / 4).saturating_sub(1)
+    } else {
+        d.len().saturating_sub(4) / (4 + size)
+    };
+    let n = n.min(1 << 22);
+    let cps = (0..=n).map(|i| u32_at(d, 4 * i)).collect();
+    let data = if size == 0 {
+        vec![]
+    } else {
+        (0..n)
+            .map(|i| {
+                let s = 4 * (n + 1) + size * i;
+                d.get(s..s + size).unwrap_or(&[]).to_vec()
+            })
+            .collect()
+    };
+    Plc { cps, data }
+}
+
+/// A shape anchor ([MS-DOC] 2.9.253).
+#[derive(Clone, Debug)]
+pub(crate) struct Spa {
+    pub cp: u32,
+    pub lid: u32,
+    pub rect: [i32; 4],
+    pub flags: u16,
+}
+
+pub(crate) struct SectionSpan {
+    pub cp1: u32,
+    pub grpprl: Vec<u8>,
+}
+
+pub(crate) struct Reader<'a> {
+    pub b: &'a mut Budget,
+    pub doc: Document,
+    pub wd: Vec<u8>,
+    pub tbl: Vec<u8>,
+    pub data: Vec<u8>,
+    pub fib: Fib,
+    pub pieces: Vec<Piece>,
+    pub prcs: Vec<Vec<u8>>,
+    pub text: Vec<u16>,
+    pub chpx: Vec<Run>,
+    pub papx: Vec<Run>,
+    pub fonts: Vec<String>,
+    pub stsh: styles::Stsh,
+    pub style_ids: Vec<Option<String>>,
+    pub rpr_cache: HashMap<u16, RunProps>,
+    pub ppr_cache: HashMap<u16, ParaProps>,
+    pub sections: Vec<SectionSpan>,
+    pub ftn_ref: Vec<u32>,
+    pub ftn_txt: Vec<u32>,
+    pub edn_ref: Vec<u32>,
+    pub edn_txt: Vec<u32>,
+    pub atn_ref: Vec<(u32, String, usize)>,
+    pub atn_txt: Vec<u32>,
+    pub owners: Vec<String>,
+    /// (cp, is end, id) of bookmark and comment-range marks, by cp.
+    pub marks: Vec<(u32, u8, u32)>,
+    pub spa_main: Vec<Spa>,
+    pub spa_hdr: Vec<Spa>,
+    pub txbx_main: Plc,
+    pub txbx_hdr: Plc,
+    pub hdd: Plc,
+    pub bookmark_names: Vec<String>,
+    pub depth: u32,
+    pub facing: bool,
+    pub rpr_delta: HashMap<u16, RunProps>,
+    /// Sections not yet put on the paragraph that ends them.
+    pub sect_ready: Vec<Option<Section>>,
+    /// A Word 6 or 95 file, whose pictures and tables sit in the main stream.
+    pub word6: bool,
+}
+
+pub(crate) fn read(input: &[u8], budget: &mut Budget) -> Result<Document> {
+    let cf = Compound::open(input).ok_or_else(|| Error::NotFormat("not a compound file".into()))?;
+    let max = budget.limits.max_part as usize;
+    let wd = cf
+        .stream(&["WordDocument"])
+        .ok_or_else(|| Error::NotFormat("no WordDocument stream".into()))?;
+    if wd.len() > max {
+        return Err(Error::TooLarge("the WordDocument stream"));
+    }
+    if matches!(u16_at(&wd, 0), 0xA5DB | 0xA5DC) {
+        return word6::read(wd, budget);
+    }
+    let fib = Fib::read(&wd)?;
+    // XOR obfuscation (fObfuscated) is only set together with fEncrypted.
+    if fib.encrypted {
+        return Err(Error::Encrypted);
+    }
+    if fib.n_fib < 0xC1 {
+        return Err(Error::Unsupported(format!(
+            "Word version {:#06x}",
+            fib.n_fib
+        )));
+    }
+    let tbl = cf
+        .stream(&[if fib.which_table { "1Table" } else { "0Table" }])
+        .ok_or_else(|| Error::Malformed("no table stream".into()))?;
+    if tbl.len() > max {
+        return Err(Error::TooLarge("the table stream"));
+    }
+    let data = cf.stream(&["Data"]).unwrap_or_default();
+    budget.alloc((wd.len() + tbl.len() + data.len()) as u64)?;
+    let (clx_off, clx_len) = fib.at(idx::CLX);
+    let clx = fib::read_clx(&tbl, clx_off, clx_len)?;
+    let total = usize::try_from(fib.total_cp()).unwrap_or(usize::MAX);
+    let last = clx.pieces.iter().map(|p| p.cp1 as usize).max().unwrap_or(0);
+    let total = total
+        .min(last)
+        .max(fib.ccp_text.max(0) as usize)
+        .min(last.max(1));
+    if total > 1 << 28 {
+        return Err(Error::TooLarge("characters"));
+    }
+    budget.alloc(2 * total as u64)?;
+    let text = fib::read_text(&wd, &clx.pieces, total);
+    let mut r = Reader::new(budget, wd, tbl, data, fib, clx, text);
+    r.load()?;
+    r.convert()?;
+    Ok(r.doc)
+}
+
+impl<'a> Reader<'a> {
+    /// A reader of the streams and text, with nothing else read yet.
+    pub(crate) fn new(
+        b: &'a mut Budget,
+        wd: Vec<u8>,
+        tbl: Vec<u8>,
+        data: Vec<u8>,
+        fib: Fib,
+        clx: fib::Clx,
+        text: Vec<u16>,
+    ) -> Reader<'a> {
+        let empty = || Plc {
+            cps: vec![],
+            data: vec![],
+        };
+        Reader {
+            b,
+            doc: Document::default(),
+            wd,
+            tbl,
+            data,
+            fib,
+            pieces: clx.pieces,
+            prcs: clx.prcs,
+            text,
+            chpx: vec![],
+            papx: vec![],
+            fonts: vec![],
+            stsh: styles::Stsh::default(),
+            style_ids: vec![],
+            rpr_cache: HashMap::new(),
+            ppr_cache: HashMap::new(),
+            sections: vec![],
+            ftn_ref: vec![],
+            ftn_txt: vec![],
+            edn_ref: vec![],
+            edn_txt: vec![],
+            atn_ref: vec![],
+            atn_txt: vec![],
+            owners: vec![],
+            marks: vec![],
+            spa_main: vec![],
+            spa_hdr: vec![],
+            txbx_main: empty(),
+            txbx_hdr: empty(),
+            hdd: empty(),
+            bookmark_names: vec![],
+            depth: 0,
+            facing: false,
+            rpr_delta: HashMap::new(),
+            sect_ready: vec![],
+            word6: false,
+        }
+    }
+}
+
+fn utf16(b: &[u8]) -> String {
+    let u: Vec<u16> = b
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|x| u16::from_le_bytes(*x))
+        .collect();
+    String::from_utf16_lossy(&u)
+}
+
+impl Reader<'_> {
+    fn load(&mut self) -> Result<()> {
+        self.read_fonts();
+        let (o, l) = self.fib.at(idx::STSHF);
+        self.stsh = styles::read(&self.tbl, o, l);
+        self.read_fkps();
+        self.read_dop();
+        self.read_sections();
+        self.read_notes();
+        self.read_bookmarks();
+        self.read_shapes_table();
+        let (o, l) = self.fib.at(idx::PLCF_HDD);
+        self.hdd = read_plc(&self.tbl, o, l, 0);
+        Ok(())
+    }
+
+    fn read_fonts(&mut self) {
+        let (o, l) = self.fib.at(idx::STTBF_FFN);
+        let Some(d) = self.tbl.get(o..o.saturating_add(l).min(self.tbl.len())) else {
+            return;
+        };
+        if d.len() < 4 {
+            return;
+        }
+        // An STTB without the extended header: cData, cbExtra, then FFNs.
+        let n = usize::from(u16_at(d, 0));
+        let mut p = 2usize;
+        let cb_extra = usize::from(u16_at(d, 2));
+        let _ = cb_extra;
+        p += 2;
+        for _ in 0..n.min(4096) {
+            let Some(&cb) = d.get(p) else { break };
+            let cb = usize::from(cb);
+            let ffn = d.get(p + 1..p + 1 + cb).unwrap_or(&[]);
+            // FFN: flags, weight (2), charset, alt name index, panose (10),
+            // font signature (24), then the name.
+            let name = ffn.get(39..).unwrap_or(&[]);
+            let end = name
+                .as_chunks::<2>()
+                .0
+                .iter()
+                .position(|c| *c == [0, 0])
+                .map(|k| k * 2)
+                .unwrap_or(name.len() & !1);
+            self.fonts.push(utf16(&name[..end]));
+            p += 1 + cb;
+        }
+    }
+
+    /// The FKP pages of character and paragraph formatting, as sorted runs.
+    fn read_fkps(&mut self) {
+        for (which, para) in [(idx::PLCF_BTE_CHPX, false), (idx::PLCF_BTE_PAPX, true)] {
+            let (o, l) = self.fib.at(which);
+            let plc = read_plc(&self.tbl, o, l, 4);
+            let mut runs = vec![];
+            for pn in plc.data.iter().map(|d| u32_at(d, 0) & 0x3F_FFFF) {
+                let base = pn as usize * 512;
+                let Some(page) = self.wd.get(base..base + 512) else {
+                    continue;
+                };
+                let n = usize::from(page[511]);
+                if n == 0 || 4 * (n + 1) + n > 511 {
+                    continue;
+                }
+                for k in 0..n {
+                    let lo = u32_at(page, 4 * k);
+                    let hi = u32_at(page, 4 * (k + 1));
+                    // The modifier list's place in the page, if it has one.
+                    let at = if para {
+                        let bx = 4 * (n + 1) + 13 * k;
+                        let o2 = usize::from(page.get(bx).copied().unwrap_or(0)) * 2;
+                        if o2 == 0 || o2 >= 511 {
+                            None
+                        } else {
+                            let cb = usize::from(page[o2]);
+                            if cb == 0 {
+                                let cb2 = usize::from(page.get(o2 + 1).copied().unwrap_or(0));
+                                Some((o2 + 2, cb2 * 2))
+                            } else {
+                                Some((o2 + 1, cb * 2 - 1))
+                            }
+                        }
+                    } else {
+                        let o2 = usize::from(page[4 * (n + 1) + k]) * 2;
+                        if o2 == 0 || o2 >= 511 {
+                            None
+                        } else {
+                            Some((o2 + 1, usize::from(page[o2])))
+                        }
+                    };
+                    let (off, len) = match at {
+                        // The list must lie in the page.
+                        Some((o, l)) => (base + o, l.min(512 - o)),
+                        None => (0, 0),
+                    };
+                    if hi > lo {
+                        runs.push(Run {
+                            lo,
+                            hi,
+                            off: off as u32,
+                            len: len as u16,
+                        });
+                    }
+                }
+            }
+            runs.sort_by_key(|r| r.lo);
+            if para {
+                self.papx = runs;
+            } else {
+                self.chpx = runs;
+            }
+        }
+    }
+
+    fn read_dop(&mut self) {
+        let (o, l) = self.fib.at(idx::DOP);
+        let Some(d) = self.tbl.get(o..o.saturating_add(l).min(self.tbl.len())) else {
+            return;
+        };
+        if d.len() < 12 {
+            return;
+        }
+        self.facing = d[0] & 1 != 0;
+        self.doc.settings.even_and_odd_headers = self.facing;
+        let tab = i32::from(u16_at(d, 10));
+        if tab > 0 {
+            self.doc.settings.default_tab_stop = Some(tab);
+        }
+    }
+
+    fn read_sections(&mut self) {
+        let (o, l) = self.fib.at(idx::PLCF_SED);
+        let plc = read_plc(&self.tbl, o, l, 12);
+        for (i, d) in plc.data.iter().enumerate() {
+            let fc = u32_at(d, 2);
+            let grpprl = if fc == 0xFFFF_FFFF {
+                vec![]
+            } else {
+                let cb = usize::from(u16_at(&self.wd, fc as usize));
+                self.wd
+                    .get(fc as usize + 2..fc as usize + 2 + cb)
+                    .unwrap_or(&[])
+                    .to_vec()
+            };
+            self.sections.push(SectionSpan {
+                cp1: plc.cps[i + 1],
+                grpprl,
+            });
+        }
+        if self.sections.is_empty() {
+            self.sections.push(SectionSpan {
+                cp1: self.fib.ccp_text as u32,
+                grpprl: vec![],
+            });
+        }
+    }
+
+    fn read_notes(&mut self) {
+        let f = &self.fib;
+        let base_ftn = fib::cp(f.ccp_text);
+        let base_atn = fib::cp(f.ccp_text + f.ccp_ftn + f.ccp_hdd);
+        let base_edn = fib::cp(f.ccp_text + f.ccp_ftn + f.ccp_hdd + f.ccp_atn);
+        let (o, l) = self.fib.at(idx::PLCFFND_REF);
+        self.ftn_ref = read_plc(&self.tbl, o, l, 2).cps;
+        self.ftn_ref.pop();
+        let (o, l) = self.fib.at(idx::PLCFFND_TXT);
+        self.ftn_txt = read_plc(&self.tbl, o, l, 0)
+            .cps
+            .iter()
+            .map(|c| c.saturating_add(base_ftn))
+            .collect();
+        let (o, l) = self.fib.at(idx::PLCFEND_REF);
+        self.edn_ref = read_plc(&self.tbl, o, l, 2).cps;
+        self.edn_ref.pop();
+        let (o, l) = self.fib.at(idx::PLCFEND_TXT);
+        self.edn_txt = read_plc(&self.tbl, o, l, 0)
+            .cps
+            .iter()
+            .map(|c| c.saturating_add(base_edn))
+            .collect();
+        // Comments: reference marks with initials and author index.
+        let (o, l) = self.fib.at(idx::GRP_XST_ATN_OWNERS);
+        if let Some(d) = self.tbl.get(o..o.saturating_add(l).min(self.tbl.len())) {
+            let mut p = 0usize;
+            // An STTB of authors: the extended header, then strings.
+            if u16_at(d, 0) == 0xFFFF {
+                let n = usize::from(u16_at(d, 2));
+                p = 6;
+                for _ in 0..n.min(1024) {
+                    let cch = usize::from(u16_at(d, p));
+                    let s = d.get(p + 2..p + 2 + cch * 2).unwrap_or(&[]);
+                    self.owners.push(utf16(s));
+                    p += 2 + cch * 2;
+                }
+            } else {
+                while p + 2 <= d.len() && self.owners.len() < 1024 {
+                    let cch = usize::from(u16_at(d, p));
+                    let s = d.get(p + 2..p + 2 + cch * 2).unwrap_or(&[]);
+                    self.owners.push(utf16(s));
+                    p += 2 + cch * 2;
+                }
+            }
+        }
+        let (o, l) = self.fib.at(idx::PLCFAND_REF);
+        let plc = read_plc(&self.tbl, o, l, 30);
+        for (i, d) in plc.data.iter().enumerate() {
+            let cch = usize::from(u16_at(d, 0)).min(9);
+            let initials = utf16(d.get(2..2 + cch * 2).unwrap_or(&[]));
+            let ibst = usize::from(u16_at(d, 20));
+            self.atn_ref.push((plc.cps[i], initials, ibst));
+        }
+        let (o, l) = self.fib.at(idx::PLCFAND_TXT);
+        self.atn_txt = read_plc(&self.tbl, o, l, 0)
+            .cps
+            .iter()
+            .map(|c| c.saturating_add(base_atn))
+            .collect();
+    }
+
+    fn read_bookmarks(&mut self) {
+        let (o, l) = self.fib.at(idx::STTBF_BKMK);
+        if let Some(d) = self.tbl.get(o..o.saturating_add(l).min(self.tbl.len()))
+            && u16_at(d, 0) == 0xFFFF
+            && d.len() >= 6
+        {
+            let n = usize::from(u16_at(d, 2));
+            let extra = usize::from(u16_at(d, 4));
+            let mut p = 6usize;
+            for _ in 0..n.min(1 << 16) {
+                let cch = usize::from(u16_at(d, p));
+                let s = d.get(p + 2..p + 2 + cch * 2).unwrap_or(&[]);
+                self.bookmark_names.push(utf16(s));
+                p += 2 + cch * 2 + extra;
+            }
+        }
+        let (o, l) = self.fib.at(idx::PLCF_BKF);
+        let bkf = read_plc(&self.tbl, o, l, 6);
+        let (o, l) = self.fib.at(idx::PLCF_BKL);
+        let bkl = read_plc(&self.tbl, o, l, 0);
+        for (i, d) in bkf.data.iter().enumerate() {
+            let Some(name) = self.bookmark_names.get(i) else {
+                continue;
+            };
+            if name.starts_with('_') && !name.starts_with("_Toc") && !name.starts_with("_Ref") {
+                continue;
+            }
+            let ibkl = u32_at(d, 0) as usize;
+            let (Some(&start), Some(&end)) = (bkf.cps.get(i), bkl.cps.get(ibkl)) else {
+                continue;
+            };
+            let id = i as u32;
+            self.marks.push((start, 0, id));
+            self.marks.push((end.max(start), 1, id));
+        }
+        // Comment ranges.
+        let (o, l) = self.fib.at(idx::PLCF_ATN_BKF);
+        let bkf = read_plc(&self.tbl, o, l, 6);
+        let (o, l) = self.fib.at(idx::PLCF_ATN_BKL);
+        let bkl = read_plc(&self.tbl, o, l, 0);
+        for (i, d) in bkf.data.iter().enumerate() {
+            let ibkl = u32_at(d, 0) as usize;
+            let (Some(&start), Some(&end)) = (bkf.cps.get(i), bkl.cps.get(ibkl)) else {
+                continue;
+            };
+            // The i-th range belongs to the comment with the same bookmark tag;
+            // the files pair them by index in practice.
+            let id = 1_000_000 + i as u32;
+            self.marks.push((start, 2, id));
+            self.marks.push((end.max(start), 3, id));
+        }
+        self.marks.sort_by_key(|m| (m.0, m.1));
+    }
+
+    fn read_shapes_table(&mut self) {
+        for (which, hdr) in [(idx::PLC_SPA_MOM, false), (idx::PLC_SPA_HDR, true)] {
+            let (o, l) = self.fib.at(which);
+            let plc = read_plc(&self.tbl, o, l, 26);
+            let mut v = vec![];
+            for (i, d) in plc.data.iter().enumerate() {
+                let rect = [
+                    u32_at(d, 4) as i32,
+                    u32_at(d, 8) as i32,
+                    u32_at(d, 12) as i32,
+                    u32_at(d, 16) as i32,
+                ];
+                v.push(Spa {
+                    cp: plc.cps[i],
+                    lid: u32_at(d, 0),
+                    rect,
+                    flags: u16_at(d, 20),
+                });
+            }
+            if hdr {
+                self.spa_hdr = v;
+            } else {
+                self.spa_main = v;
+            }
+        }
+        let (o, l) = self.fib.at(idx::PLCFTXBX_TXT);
+        self.txbx_main = read_plc(&self.tbl, o, l, 22);
+        let (o, l) = self.fib.at(idx::PLCF_HDR_TXBX_TXT);
+        self.txbx_hdr = read_plc(&self.tbl, o, l, 22);
+    }
+
+    /// Base of each document part in CP space.
+    pub(crate) fn base_hdd(&self) -> u32 {
+        (self.fib.ccp_text + self.fib.ccp_ftn) as u32
+    }
+
+    pub(crate) fn base_txbx(&self) -> u32 {
+        (self.fib.ccp_text
+            + self.fib.ccp_ftn
+            + self.fib.ccp_hdd
+            + self.fib.ccp_atn
+            + self.fib.ccp_edn) as u32
+    }
+
+    pub(crate) fn base_hdr_txbx(&self) -> u32 {
+        self.base_txbx() + self.fib.ccp_txbx as u32
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_plc_splits_positions_and_data() {
+        let mut d = vec![];
+        for cp in [0u32, 5, 9] {
+            d.extend_from_slice(&cp.to_le_bytes());
+        }
+        d.extend_from_slice(&[1, 2, 3, 4]);
+        let p = read_plc(&d, 0, d.len(), 2);
+        assert_eq!(p.cps, vec![0, 5, 9]);
+        assert_eq!(p.data, vec![vec![1, 2], vec![3, 4]]);
+        let p = read_plc(&d[..12], 0, 12, 0);
+        assert_eq!(p.cps, vec![0, 5, 9]);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/props.rs b/crates/exav-render/src/formats/office/docs/doc/props.rs
new file mode 100644
index 00000000..9d66b285
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/props.rs
@@ -0,0 +1,870 @@
+//! Character, paragraph and section modifiers ([MS-DOC] 2.6) applied to the
+//! model's property structs.
+
+use super::sprm::{Prl, parse};
+use crate::formats::office::common::bytes::Cur;
+use crate::formats::office::docs::model::*;
+
+/// The 16 colours of an Ico ([MS-DOC] 2.9.119); 0 is automatic.
+pub fn ico(i: u8) -> Color {
+    const P: [u32; 17] = [
+        0, 0x000000, 0x0000FF, 0x00FFFF, 0x00FF00, 0xFF00FF, 0xFF0000, 0xFFFF00, 0xFFFFFF,
+        0x000080, 0x008080, 0x008000, 0x800080, 0x800000, 0x808000, 0x808080, 0xC0C0C0,
+    ];
+    match i {
+        1..=16 => Color::Rgb(P[usize::from(i)]),
+        _ => Color::Auto,
+    }
+}
+
+/// A COLORREF: red, green, blue, then 0xFF when automatic.
+pub fn colorref(v: u32) -> Color {
+    if v >> 24 == 0xFF {
+        return Color::Auto;
+    }
+    let (r, g, b) = (v & 0xFF, (v >> 8) & 0xFF, (v >> 16) & 0xFF);
+    Color::Rgb(r << 16 | g << 8 | b)
+}
+
+fn highlight(i: u8) -> Option<&'static str> {
+    Some(match i {
+        0 => "none",
+        1 => "black",
+        2 => "blue",
+        3 => "cyan",
+        4 => "green",
+        5 => "magenta",
+        6 => "red",
+        7 => "yellow",
+        8 => "white",
+        9 => "darkBlue",
+        10 => "darkCyan",
+        11 => "darkGreen",
+        12 => "darkMagenta",
+        13 => "darkRed",
+        14 => "darkYellow",
+        15 => "darkGray",
+        16 => "lightGray",
+        _ => return None,
+    })
+}
+
+fn underline(k: u8) -> Option<&'static str> {
+    Some(match k {
+        0 => "none",
+        1 => "single",
+        2 => "words",
+        3 => "double",
+        4 => "dotted",
+        6 => "thick",
+        7 => "dash",
+        9 => "dotDash",
+        10 => "dotDotDash",
+        11 => "wave",
+        0x14 => "dottedHeavy",
+        0x17 => "dashedHeavy",
+        0x19 => "dashDotHeavy",
+        0x1A => "dashDotDotHeavy",
+        0x1B => "wavyHeavy",
+        0x27 => "dashLongHeavy",
+        0x2B => "wavyDouble",
+        _ => "single",
+    })
+}
+
+fn border_style(t: u8) -> Option<&'static str> {
+    Some(match t {
+        0 => return None,
+        1 | 5 => "single",
+        3 => "double",
+        6 => "dotted",
+        7 => "dashed",
+        8 => "dotDash",
+        9 => "dotDotDash",
+        10 => "triple",
+        11 => "thinThickSmallGap",
+        12 => "thickThinSmallGap",
+        13 => "thinThickThinSmallGap",
+        14 => "thinThickMediumGap",
+        15 => "thickThinMediumGap",
+        16 => "thinThickThinMediumGap",
+        17 => "thinThickLargeGap",
+        18 => "thickThinLargeGap",
+        19 => "thinThickThinLargeGap",
+        20 => "wave",
+        21 => "doubleWave",
+        22 => "dashSmallGap",
+        23 => "dashDotStroked",
+        24 => "threeDEmboss",
+        25 => "threeDEngrave",
+        26 => "outset",
+        27 => "inset",
+        0xFF => return None,
+        _ => "single",
+    })
+}
+
+/// A Brc80 (4 bytes). `None` for no border.
+pub fn brc80(b: &[u8]) -> Option<Border> {
+    if b.len() < 4 || b[..4] == [0xFF; 4] {
+        return None;
+    }
+    let style = border_style(b[1])?;
+    let size = u32::from(b[0]).clamp(2, 96);
+    Some(Border {
+        style,
+        size,
+        space: u32::from(b[3] & 0x1F),
+        color: ico(b[2]),
+        shadow: b[3] & 0x20 != 0,
+    })
+}
+
+/// A Brc (8 bytes). `None` for no border.
+pub fn brc(b: &[u8]) -> Option<Border> {
+    if b.len() < 8 || b[4..8] == [0xFF; 4] {
+        return None;
+    }
+    let style = border_style(b[5])?;
+    let w = u32::from(b[4]);
+    let size = if b[5] >= 0x40 { w * 8 } else { w }.clamp(2, 96);
+    let flags = u16::from_le_bytes([b[6], b[7]]);
+    Some(Border {
+        style,
+        size,
+        space: u32::from(flags & 0x1F),
+        color: colorref(u32::from_le_bytes([b[0], b[1], b[2], b[3]])),
+        shadow: flags & 0x20 != 0,
+    })
+}
+
+fn rgb_of(c: Color, auto: u32) -> u32 {
+    match c {
+        Color::Rgb(v) => v,
+        Color::Auto => auto,
+    }
+}
+
+/// The share of the foreground colour in a shading pattern.
+fn coverage(ipat: u16) -> f64 {
+    match ipat {
+        0 => 0.0,
+        1 => 1.0,
+        2 => 0.05,
+        3 => 0.10,
+        4 => 0.20,
+        5 => 0.25,
+        6 => 0.30,
+        7 => 0.40,
+        8 => 0.50,
+        9 => 0.60,
+        10 => 0.70,
+        11 => 0.75,
+        12 => 0.80,
+        13 => 0.90,
+        14..=19 => 0.5,
+        20..=25 => 0.25,
+        0x23 => 0.025,
+        0x24 => 0.075,
+        0x25 => 0.125,
+        0x26 => 0.15,
+        0x27 => 0.175,
+        0x28 => 0.225,
+        0x29 => 0.275,
+        0x2A => 0.325,
+        0x2B => 0.35,
+        0x2C => 0.375,
+        0x2D => 0.425,
+        0x2E => 0.45,
+        0x2F => 0.475,
+        0x30 => 0.525,
+        0x31 => 0.55,
+        0x32 => 0.575,
+        0x33 => 0.625,
+        0x34 => 0.65,
+        0x35 => 0.675,
+        0x36 => 0.725,
+        0x37 => 0.775,
+        0x38 => 0.825,
+        0x39 => 0.85,
+        0x3A => 0.875,
+        0x3B => 0.925,
+        0x3C => 0.95,
+        0x3D => 0.975,
+        _ => 0.0,
+    }
+}
+
+/// The flat colour a pattern of `fore` on `back` looks like; `None` for
+/// no shading.
+pub fn blend(fore: Color, back: Color, ipat: u16) -> Option<Shading> {
+    if ipat == 0xFFFF {
+        return None;
+    }
+    let p = coverage(ipat);
+    if p == 0.0 && back == Color::Auto {
+        return None;
+    }
+    let (f, b) = (rgb_of(fore, 0x000000), rgb_of(back, 0xFFFFFF));
+    let mix = |s: u32| {
+        let (x, y) = (f64::from((f >> s) & 0xFF), f64::from((b >> s) & 0xFF));
+        (x * p + y * (1.0 - p)).round() as u32
+    };
+    Some(Shading::fill(Color::Rgb(
+        mix(16) << 16 | mix(8) << 8 | mix(0),
+    )))
+}
+
+/// A Shd (10 bytes).
+pub fn shd(b: &[u8]) -> Option<Shading> {
+    if b.len() < 10 {
+        return None;
+    }
+    let f = colorref(u32::from_le_bytes([b[0], b[1], b[2], b[3]]));
+    let k = colorref(u32::from_le_bytes([b[4], b[5], b[6], b[7]]));
+    blend(f, k, u16::from_le_bytes([b[8], b[9]]))
+}
+
+/// A Shd80 (2 bytes).
+pub fn shd80(v: u16) -> Option<Shading> {
+    if v == 0xFFFF {
+        return None;
+    }
+    blend(
+        ico((v & 0x1F) as u8),
+        ico(((v >> 5) & 0x1F) as u8),
+        (v >> 10) & 0x3F,
+    )
+}
+
+/// What a character modifier list says beyond formatting.
+#[derive(Clone, Debug, Default)]
+pub struct ChpAux {
+    pub pic_loc: Option<i32>,
+    pub spec: bool,
+    pub data: bool,
+    pub ole2: bool,
+    pub obj: bool,
+    pub symbol: Option<(u16, u16)>,
+    /// A character style set by sprmCIstd.
+    pub istd: Option<u16>,
+    pub fld_vanish: bool,
+    pub deleted: bool,
+    pub inserted: bool,
+}
+
+/// What a paragraph modifier list says beyond formatting.
+#[derive(Clone, Debug, Default)]
+pub struct PapAux {
+    pub istd: Option<u16>,
+    pub in_table: bool,
+    pub ttp: bool,
+    pub depth: Option<u32>,
+    pub inner_cell: bool,
+    pub inner_ttp: bool,
+    /// The list instance a paragraph is in, when the modifiers set one.
+    pub ilfo_set: Option<i32>,
+    pub ilvl: u8,
+    pub huge: Option<u32>,
+    pub frame: Option<Frame>,
+    pub drop_cap: Option<(u8, u8)>,
+    pub tabs_cleared: Vec<i32>,
+}
+
+/// Font names by ftc, and the style values toggles are relative to.
+pub struct Ctx<'a> {
+    pub fonts: &'a [String],
+    /// The style-level properties of the text a toggle is relative to.
+    pub base: &'a RunProps,
+}
+
+impl Ctx<'_> {
+    fn font(&self, i: u16) -> Option<String> {
+        self.fonts.get(usize::from(i)).cloned()
+    }
+}
+
+/// A ToggleOperand: 0 off, 1 on, 0x80 as the style, 0x81 as the style's
+/// opposite.
+fn toggle(v: u8, base: Option<bool>, cur: &mut Option<bool>) {
+    match v {
+        0 => *cur = Some(false),
+        1 => *cur = Some(true),
+        0x80 => *cur = None,
+        0x81 => *cur = Some(!base.unwrap_or(false)),
+        _ => {}
+    }
+}
+
+fn bool8(v: u8) -> Option<bool> {
+    Some(v & 1 != 0)
+}
+
+/// Applies a character modifier to `rp`.
+pub fn apply_chp(rp: &mut RunProps, aux: &mut ChpAux, p: &Prl, cx: &Ctx) {
+    let b = cx.base;
+    match p.op {
+        0x0800 => aux.deleted = p.u8() != 0,
+        0x0801 => aux.inserted = p.u8() != 0,
+        0x0802 => aux.fld_vanish = p.u8() & 1 != 0,
+        0x6A03 => aux.pic_loc = Some(p.i32()),
+        0x0806 => aux.data = p.u8() & 1 != 0,
+        0x080A => aux.ole2 = p.u8() & 1 != 0,
+        0x0855 => aux.spec = p.u8() & 1 != 0,
+        0x0856 => aux.obj = p.u8() & 1 != 0,
+        0x6A09 => {
+            let mut c = Cur::new(p.val);
+            let ftc = c.u16();
+            aux.symbol = Some((ftc, c.u16()));
+        }
+        0x4A30 => aux.istd = Some(p.u16()),
+        0x2A33 => {
+            // sprmCPlain: the direct formatting is cleared.
+            let style = rp.style.take();
+            *rp = RunProps::default();
+            rp.style = style;
+        }
+        0x0835 => toggle(p.u8(), b.bold, &mut rp.bold),
+        0x0836 => toggle(p.u8(), b.italic, &mut rp.italic),
+        0x0837 => toggle(p.u8(), b.strike, &mut rp.strike),
+        0x0838 => toggle(p.u8(), b.outline, &mut rp.outline),
+        0x0839 => toggle(p.u8(), b.shadow, &mut rp.shadow),
+        0x083A => toggle(p.u8(), b.small_caps, &mut rp.small_caps),
+        0x083B => toggle(p.u8(), b.caps, &mut rp.caps),
+        0x083C => toggle(p.u8(), b.vanish, &mut rp.vanish),
+        0x0854 => toggle(p.u8(), b.imprint, &mut rp.imprint),
+        0x0858 => toggle(p.u8(), b.emboss, &mut rp.emboss),
+        0x2A53 => toggle(p.u8(), b.dstrike, &mut rp.dstrike),
+        0x085C => toggle(p.u8(), b.bold_cs, &mut rp.bold_cs),
+        0x085D => toggle(p.u8(), b.italic_cs, &mut rp.italic_cs),
+        0x085A => rp.rtl = bool8(p.u8()),
+        0x0882 => rp.cs = bool8(p.u8()),
+        0x2A3E => rp.underline = underline(p.u8()),
+        0x8840 => rp.spacing = Some(i32::from(p.i16())),
+        0x2A42 => rp.color = Some(ico(p.u8())),
+        0x6870 => rp.color = Some(colorref(p.u32())),
+        0x2A0C => rp.highlight = highlight(p.u8()),
+        0x4A43 => rp.size = Some(u32::from(p.u16())),
+        0x4A61 => rp.size_cs = Some(u32::from(p.u16())),
+        0x4845 => rp.position = Some(i32::from(p.i16())),
+        0x2A48 => {
+            rp.vert_align = Some(match p.u8() {
+                1 => VertAlign::Superscript,
+                2 => VertAlign::Subscript,
+                _ => VertAlign::Baseline,
+            })
+        }
+        0x484B => rp.kerning = Some(u32::from(p.u16())),
+        0x4852 => rp.scale = Some(u32::from(p.u16()).clamp(1, 600)),
+        0x4A4F => rp.fonts.ascii = cx.font(p.u16()),
+        0x4A50 => rp.fonts.east_asia = cx.font(p.u16()),
+        0x4A51 => rp.fonts.hansi = cx.font(p.u16()),
+        0x4A5E => rp.fonts.cs = cx.font(p.u16()),
+        0x6865 => rp.border = brc80(p.val),
+        0xCA72 => rp.border = brc(p.var()),
+        0x4866 => rp.shading = shd80(p.u16()),
+        0xCA71 => rp.shading = shd(p.var()),
+        0x6877 => rp.underline_color = Some(colorref(p.u32())),
+        0x4873 | 0x4874 => {}
+        _ => {}
+    }
+}
+
+/// Applies a list of character modifiers.
+pub fn apply_chp_list(rp: &mut RunProps, aux: &mut ChpAux, grpprl: &[u8], cx: &Ctx) {
+    for p in parse(grpprl) {
+        if p.sgc() == super::sprm::SGC_CHAR {
+            apply_chp(rp, aux, &p, cx);
+        }
+    }
+}
+
+fn tab_kind(tbd: u8) -> TabKind {
+    match tbd & 7 {
+        1 => TabKind::Center,
+        2 => TabKind::Right,
+        3 => TabKind::Decimal,
+        4 => TabKind::Bar,
+        _ => TabKind::Left,
+    }
+}
+
+fn tab_leader(tbd: u8) -> TabLeader {
+    match (tbd >> 3) & 7 {
+        1 => TabLeader::Dot,
+        2 => TabLeader::Hyphen,
+        3 => TabLeader::Underscore,
+        4 => TabLeader::Heavy,
+        5 => TabLeader::MiddleDot,
+        _ => TabLeader::None,
+    }
+}
+
+/// sprmPChgTabs and sprmPChgTabsPapx: positions to clear, then to add.
+fn change_tabs(pp: &mut ParaProps, aux: &mut PapAux, v: &[u8], close: bool) {
+    let mut c = Cur::new(v);
+    let del = usize::from(c.u8());
+    let mut dels = vec![];
+    for _ in 0..del.min(64) {
+        dels.push(i32::from(c.i16()));
+    }
+    if close {
+        c.skip(2 * del.min(64));
+    }
+    let add = usize::from(c.u8()).min(64);
+    let mut poss = vec![];
+    for _ in 0..add {
+        poss.push(i32::from(c.i16()));
+    }
+    let mut tabs = vec![];
+    for pos in poss {
+        let tbd = c.u8();
+        tabs.push(Tab {
+            pos,
+            kind: tab_kind(tbd),
+            leader: tab_leader(tbd),
+        });
+    }
+    for d in dels {
+        if !tabs.iter().any(|t| (t.pos - d).abs() < 25) {
+            pp.tabs.retain(|t| (t.pos - d).abs() >= 25);
+            aux.tabs_cleared.push(d);
+            pp.tabs.push(Tab {
+                pos: d,
+                kind: TabKind::Clear,
+                leader: TabLeader::None,
+            });
+        }
+    }
+    for t in tabs {
+        pp.tabs.retain(|x| x.pos != t.pos);
+        pp.tabs.push(t);
+    }
+    pp.tabs.sort_by_key(|t| t.pos);
+}
+
+/// Table nesting beyond this is cut: one table builder is open per level.
+const MAX_TABLE_DEPTH: u32 = 63;
+
+/// Applies a paragraph modifier to `pp`.
+pub fn apply_pap(pp: &mut ParaProps, aux: &mut PapAux, p: &Prl) {
+    match p.op {
+        0x4600 => aux.istd = Some(p.u16()),
+        0x2403 | 0x2461 => {
+            pp.jc = Some(match p.u8() {
+                1 => Jc::Center,
+                2 => Jc::Right,
+                3..=5 | 7 => Jc::Both,
+                8 => Jc::Distribute,
+                _ => Jc::Left,
+            })
+        }
+        0x2405 => pp.keep_lines = bool8(p.u8()),
+        0x2406 => pp.keep_next = bool8(p.u8()),
+        0x2407 => pp.page_break_before = bool8(p.u8()),
+        0x260A => aux.ilvl = p.u8(),
+        0x460B => {
+            let v = i32::from(p.i16());
+            // 0xF801 stands for no list.
+            aux.ilfo_set = Some(if v == -2047 { 0 } else { v });
+        }
+        0x240C => pp.suppress_line_numbers = bool8(p.u8()),
+        0xC60D => change_tabs(pp, aux, p.var(), false),
+        0xC615 => change_tabs(pp, aux, p.var(), true),
+        0x840E | 0x845D => pp.ind_right = Some(i32::from(p.i16())),
+        0x840F | 0x845E => pp.ind_left = Some(i32::from(p.i16())),
+        0x8411 | 0x8460 => {
+            let v = i32::from(p.i16());
+            if v >= 0 {
+                pp.ind_first_line = Some(v);
+                pp.ind_hanging = None;
+            } else {
+                pp.ind_first_line = None;
+                pp.ind_hanging = Some(-v);
+            }
+        }
+        0x6412 => {
+            let mut c = Cur::new(p.val);
+            let dya = c.i16();
+            let mult = c.u16();
+            if mult == 1 {
+                pp.line = Some(i32::from(dya).max(0));
+                pp.line_rule = Some(LineRule::Auto);
+            } else if dya < 0 {
+                pp.line = Some(-i32::from(dya));
+                pp.line_rule = Some(LineRule::Exact);
+            } else {
+                pp.line = Some(i32::from(dya));
+                pp.line_rule = Some(LineRule::AtLeast);
+            }
+        }
+        0xA413 => pp.space_before = Some(i32::from(p.u16())),
+        0xA414 => pp.space_after = Some(i32::from(p.u16())),
+        0x245B => pp.before_auto = bool8(p.u8()),
+        0x245C => pp.after_auto = bool8(p.u8()),
+        0x2416 => aux.in_table = p.u8() & 1 != 0,
+        0x2417 => aux.ttp = p.u8() & 1 != 0,
+        0x6649 => aux.depth = Some(p.u32().min(MAX_TABLE_DEPTH)),
+        0x664A => {
+            // sprmPDtap: a change of table depth.
+            let d = aux.depth.unwrap_or(0) as i64 + i64::from(p.i32());
+            aux.depth = Some(d.clamp(0, i64::from(MAX_TABLE_DEPTH)) as u32);
+        }
+        0x244B => aux.inner_cell = p.u8() & 1 != 0,
+        0x244C => aux.inner_ttp = p.u8() & 1 != 0,
+        0x6646 => aux.huge = Some(p.u32()),
+        0x2431 => pp.widow_control = bool8(p.u8()),
+        0x2441 => pp.bidi = bool8(p.u8()),
+        0x246D => pp.contextual_spacing = bool8(p.u8()),
+        0x2640 => pp.outline_level = Some(u32::from(p.u8().min(9))),
+        0x6424..=0x6428 => {
+            let b = brc80(p.val);
+            match p.op {
+                0x6424 => pp.borders.top = b,
+                0x6425 => pp.borders.left = b,
+                0x6426 => pp.borders.bottom = b,
+                0x6427 => pp.borders.right = b,
+                _ => pp.borders.between = b,
+            }
+        }
+        0xC64E..=0xC652 => {
+            let b = brc(p.var());
+            match p.op {
+                0xC64E => pp.borders.top = b,
+                0xC64F => pp.borders.left = b,
+                0xC650 => pp.borders.bottom = b,
+                0xC651 => pp.borders.right = b,
+                _ => pp.borders.between = b,
+            }
+        }
+        0x442D => pp.shading = shd80(p.u16()),
+        0xC64D => pp.shading = shd(p.var()),
+        0x442C => {
+            // sprmPDcs: drop cap kind in the low 3 bits, lines in the next 5.
+            let v = p.u16();
+            aux.drop_cap = Some(((v & 7) as u8, ((v >> 3) & 0x1F) as u8));
+        }
+        0x261B => {
+            let v = p.u8();
+            let f = aux.frame.get_or_insert_with(Frame::default);
+            f.v_anchor = Some(match (v >> 4) & 3 {
+                0 => "margin",
+                1 => "page",
+                _ => "text",
+            });
+            f.h_anchor = Some(match (v >> 6) & 3 {
+                0 => "text",
+                1 => "margin",
+                _ => "page",
+            });
+        }
+        0x8418 => {
+            let v = p.i16();
+            let f = aux.frame.get_or_insert_with(Frame::default);
+            match v {
+                0 => f.x_align = Some("left"),
+                -4 => f.x_align = Some("center"),
+                -8 => f.x_align = Some("right"),
+                -12 => f.x_align = Some("inside"),
+                -16 => f.x_align = Some("outside"),
+                v => f.x = Some(i32::from(v) - 1),
+            }
+        }
+        0x8419 => {
+            let v = p.i16();
+            let f = aux.frame.get_or_insert_with(Frame::default);
+            match v {
+                0 => {}
+                -4 => f.y_align = Some("top"),
+                -8 => f.y_align = Some("center"),
+                -12 => f.y_align = Some("bottom"),
+                -16 => f.y_align = Some("inside"),
+                -20 => f.y_align = Some("outside"),
+                v => f.y = Some(i32::from(v) - 1),
+            }
+        }
+        0x841A => {
+            let v = p.u16();
+            let f = aux.frame.get_or_insert_with(Frame::default);
+            if v > 0 {
+                f.width = Some(i32::from(v));
+            }
+        }
+        0x442B => {
+            let v = p.u16();
+            let f = aux.frame.get_or_insert_with(Frame::default);
+            if v & 0x7FFF != 0 {
+                f.height = Some(i32::from(v & 0x7FFF));
+                f.height_exact = v & 0x8000 != 0;
+            }
+        }
+        0x2423 => {
+            let f = aux.frame.get_or_insert_with(Frame::default);
+            f.wrap = Some(match p.u8() {
+                1 => "notBeside",
+                2 => "around",
+                3 => "none",
+                4 => "tight",
+                5 => "through",
+                _ => "auto",
+            });
+        }
+        0x842E => {
+            let v = i32::from(p.i16());
+            aux.frame.get_or_insert_with(Frame::default).v_space = Some(v);
+        }
+        0x842F => {
+            let v = i32::from(p.i16());
+            aux.frame.get_or_insert_with(Frame::default).h_space = Some(v);
+        }
+        _ => {}
+    }
+}
+
+pub fn apply_pap_list(pp: &mut ParaProps, aux: &mut PapAux, grpprl: &[u8]) {
+    for p in parse(grpprl) {
+        if p.sgc() == super::sprm::SGC_PARA {
+            apply_pap(pp, aux, &p);
+        }
+    }
+}
+
+/// Applies the section modifiers of `grpprl` to `s`.
+pub fn apply_sep(s: &mut Section, grpprl: &[u8]) {
+    let mut restart = false;
+    let mut start: Option<u32> = None;
+    let mut cols: Option<u32> = None;
+    let mut widths: Vec<(usize, i32, i32)> = vec![];
+    for p in parse(grpprl) {
+        match p.op {
+            0x3009 => {
+                s.kind = match p.u8() {
+                    0 => SectionType::Continuous,
+                    1 => SectionType::NextColumn,
+                    3 => SectionType::EvenPage,
+                    4 => SectionType::OddPage,
+                    _ => SectionType::NextPage,
+                }
+            }
+            0x300A => s.title_page = p.u8() & 1 != 0,
+            0x500B => cols = Some(u32::from(p.u16()) + 1),
+            0x900C => s.columns.space = i32::from(p.u16()),
+            0x3019 => s.columns.separator = p.u8() & 1 != 0,
+            0x300E => {
+                s.page_fmt = Some(match p.u8() {
+                    1 => "upperRoman",
+                    2 => "lowerRoman",
+                    3 => "upperLetter",
+                    4 => "lowerLetter",
+                    _ => "decimal",
+                })
+            }
+            0x3011 => restart = p.u8() & 1 != 0,
+            0x501C | 0x7044 => {
+                start = Some(if p.op == 0x501C {
+                    u32::from(p.u16())
+                } else {
+                    p.u32()
+                });
+            }
+            0xB017 => s.header = i32::from(p.u16()),
+            0xB018 => s.footer = i32::from(p.u16()),
+            0x301A => {
+                s.v_align = match p.u8() {
+                    1 => Some("center"),
+                    2 => Some("both"),
+                    3 => Some("bottom"),
+                    _ => None,
+                }
+            }
+            0x301D => s.landscape = p.u8() == 2,
+            0xB01F => s.width = i32::from(p.u16()),
+            0xB020 => s.height = i32::from(p.u16()),
+            0xB021 => s.left = i32::from(p.u16()),
+            0xB022 => s.right = i32::from(p.u16()),
+            0x9023 => s.top = i32::from(p.i16()),
+            0x9024 => s.bottom = i32::from(p.i16()),
+            0xB025 => s.gutter = i32::from(p.u16()),
+            0x3228 => s.bidi = p.u8() & 1 != 0,
+            0x322A => s.rtl_gutter = p.u8() & 1 != 0,
+            0x702B => s.page_borders.top = brc80(p.val),
+            0x702C => s.page_borders.left = brc80(p.val),
+            0x702D => s.page_borders.bottom = brc80(p.val),
+            0x702E => s.page_borders.right = brc80(p.val),
+            0xD234 => s.page_borders.top = brc(p.var()),
+            0xD235 => s.page_borders.left = brc(p.var()),
+            0xD236 => s.page_borders.bottom = brc(p.var()),
+            0xD237 => s.page_borders.right = brc(p.var()),
+            0x5015 => {
+                let n = u32::from(p.u16());
+                if n > 0 {
+                    let ln = s.line_numbers.get_or_insert((1, n, 0));
+                    ln.1 = n;
+                }
+            }
+            0x9016 => {
+                if let Some(ln) = s.line_numbers.as_mut() {
+                    ln.2 = i32::from(p.u16());
+                }
+            }
+            0x501B => {
+                if let Some(ln) = s.line_numbers.as_mut() {
+                    ln.0 = u32::from(p.u16()) + 1;
+                }
+            }
+            0x5033 => {
+                s.text_direction = match p.u16() {
+                    1 => Some("tbRl"),
+                    3 => Some("btLr"),
+                    _ => None,
+                }
+            }
+            _ => {}
+        }
+        // sprmSDxaColWidth and sprmSDxaColSpacing: (column, twips).
+        if matches!(p.op, 0xF203 | 0xF204)
+            && let [_, i, a, b, ..] = p.val
+        {
+            let v = i32::from(u16::from_le_bytes([*a, *b]));
+            let i = usize::from(*i);
+            let e = match widths.iter().position(|w| w.0 == i) {
+                Some(k) => k,
+                None => {
+                    widths.push((i, 0, 0));
+                    widths.len() - 1
+                }
+            };
+            if p.op == 0xF203 {
+                widths[e].1 = v;
+            } else {
+                widths[e].2 = v;
+            }
+        }
+    }
+    if restart {
+        s.page_start = Some(start.unwrap_or(1));
+    }
+    if let Some(n) = cols {
+        s.columns.num = n;
+        if !widths.is_empty() {
+            widths.sort_by_key(|w| w.0);
+            s.columns.widths = widths.iter().map(|w| (w.1, w.2)).collect();
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn cx() -> (Vec<String>, RunProps) {
+        (vec!["Arial".into(), "Times".into()], RunProps::default())
+    }
+
+    #[test]
+    fn character_modifiers() {
+        let (fonts, base) = cx();
+        let c = Ctx {
+            fonts: &fonts,
+            base: &base,
+        };
+        let mut rp = RunProps::default();
+        let mut aux = ChpAux::default();
+        // bold on, 12 pt, font 1, red.
+        let g = [
+            0x35, 0x08, 1, 0x43, 0x4A, 24, 0, 0x4F, 0x4A, 1, 0, 0x70, 0x68, 0xFF, 0, 0, 0,
+        ];
+        apply_chp_list(&mut rp, &mut aux, &g, &c);
+        assert_eq!(rp.bold, Some(true));
+        assert_eq!(rp.size, Some(24));
+        assert_eq!(rp.fonts.ascii.as_deref(), Some("Times"));
+        assert_eq!(rp.color, Some(Color::Rgb(0xFF0000)));
+    }
+
+    #[test]
+    fn toggles_are_relative_to_the_style() {
+        let fonts = vec![];
+        let base = RunProps {
+            bold: Some(true),
+            ..RunProps::default()
+        };
+        let c = Ctx {
+            fonts: &fonts,
+            base: &base,
+        };
+        let mut rp = RunProps::default();
+        let mut aux = ChpAux::default();
+        apply_chp_list(&mut rp, &mut aux, &[0x35, 0x08, 0x81], &c);
+        assert_eq!(rp.bold, Some(false));
+        apply_chp_list(&mut rp, &mut aux, &[0x35, 0x08, 0x80], &c);
+        assert_eq!(rp.bold, None);
+    }
+
+    #[test]
+    fn paragraph_modifiers() {
+        let mut pp = ParaProps::default();
+        let mut aux = PapAux::default();
+        // centered, left indent 720, first line -348 (hanging), exact 300.
+        let g = [
+            0x61, 0x24, 1, 0x5E, 0x84, 0xD0, 0x02, 0x60, 0x84, 0xA4, 0xFE, 0x12, 0x64, 0xD4, 0xFE,
+            0, 0,
+        ];
+        apply_pap_list(&mut pp, &mut aux, &g);
+        assert_eq!(pp.jc, Some(Jc::Center));
+        assert_eq!(pp.ind_left, Some(720));
+        assert_eq!(pp.ind_hanging, Some(348));
+        assert_eq!(pp.line, Some(300));
+        assert_eq!(pp.line_rule, Some(LineRule::Exact));
+    }
+
+    #[test]
+    fn tab_stops_add_and_clear() {
+        let mut pp = ParaProps::default();
+        let mut aux = PapAux::default();
+        // sprmPChgTabsPapx: no deletions, two tabs (1440 right with dot
+        // leader, then 720 left); the stops end up in order.
+        let g = [0x0D, 0xC6, 8, 0, 2, 0xA0, 0x05, 0xD0, 0x02, 0x0A, 0x00];
+        apply_pap_list(&mut pp, &mut aux, &g);
+        assert_eq!(pp.tabs.len(), 2);
+        assert_eq!(pp.tabs[0].pos, 720);
+        assert_eq!(pp.tabs[1].kind, TabKind::Right);
+        assert_eq!(pp.tabs[1].leader, TabLeader::Dot);
+    }
+
+    #[test]
+    fn colours_and_borders() {
+        assert_eq!(ico(6), Color::Rgb(0xFF0000));
+        assert_eq!(colorref(0xFF00_0000), Color::Auto);
+        assert_eq!(colorref(0x00_33_22_11), Color::Rgb(0x11_22_33));
+        let b = brc80(&[8, 1, 6, 0x32]).unwrap();
+        assert_eq!(
+            (b.style, b.size, b.space, b.shadow),
+            ("single", 8, 18, true)
+        );
+        assert!(brc80(&[0xFF; 4]).is_none());
+        // Yellow behind no pattern; a solid pattern is its foreground.
+        let s = shd80(0x0008 | (7 << 5)).unwrap();
+        assert_eq!(s.fill, Some(Color::Rgb(0xFFFF00)));
+        let s = shd80(0x0001 | (7 << 5) | (1 << 10)).unwrap();
+        assert_eq!(s.fill, Some(Color::Rgb(0x000000)));
+        // A 50% pattern of black on white is mid grey.
+        let s = shd80(1 | (8 << 5) | (8 << 10)).unwrap();
+        assert_eq!(s.fill, Some(Color::Rgb(0x808080)));
+        assert!(shd80(0xFFFF).is_none());
+    }
+
+    #[test]
+    fn section_modifiers() {
+        let mut s = Section::default();
+        // page 11906 x 16838 landscape, left margin 1417, two columns, space 708.
+        let g = [
+            0x1F, 0xB0, 0x82, 0x2E, 0x20, 0xB0, 0xC6, 0x41, 0x1D, 0x30, 2, 0x21, 0xB0, 0x89, 0x05,
+            0x0B, 0x50, 1, 0, 0x0C, 0x90, 0xC4, 0x02,
+        ];
+        apply_sep(&mut s, &g);
+        assert_eq!((s.width, s.height), (11906, 16838));
+        assert!(s.landscape);
+        assert_eq!(s.left, 1417);
+        assert_eq!((s.columns.num, s.columns.space), (2, 708));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/sprm.rs b/crates/exav-render/src/formats/office/docs/doc/sprm.rs
new file mode 100644
index 00000000..3128423a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/sprm.rs
@@ -0,0 +1,140 @@
+//! Property modifiers ([MS-DOC] 2.6): a 16-bit opcode and an operand whose
+//! size the opcode's top bits give.
+
+/// One modifier: its opcode and operand bytes.
+#[derive(Clone, Copy, Debug)]
+pub struct Prl<'a> {
+    pub op: u16,
+    pub val: &'a [u8],
+}
+
+pub const SGC_PARA: u16 = 1;
+pub const SGC_CHAR: u16 = 2;
+pub const SGC_TABLE: u16 = 5;
+
+impl<'a> Prl<'a> {
+    /// 1 paragraph, 2 character, 3 picture, 4 section, 5 table.
+    pub fn sgc(&self) -> u16 {
+        (self.op >> 10) & 7
+    }
+
+    pub fn u8(&self) -> u8 {
+        self.val.first().copied().unwrap_or(0)
+    }
+
+    pub fn u16(&self) -> u16 {
+        match self.val {
+            [a, b, ..] => u16::from_le_bytes([*a, *b]),
+            [a] => u16::from(*a),
+            _ => 0,
+        }
+    }
+
+    pub fn i16(&self) -> i16 {
+        self.u16() as i16
+    }
+
+    pub fn u32(&self) -> u32 {
+        match self.val {
+            [a, b, c, d, ..] => u32::from_le_bytes([*a, *b, *c, *d]),
+            _ => 0,
+        }
+    }
+
+    pub fn i32(&self) -> i32 {
+        self.u32() as i32
+    }
+
+    /// The operand after a length prefix (one byte; two for sprmTDefTable).
+    pub fn var(&self) -> &'a [u8] {
+        let skip = if self.op == 0xD608 { 2 } else { 1 };
+        self.val.get(skip..).unwrap_or(&[])
+    }
+}
+
+/// The modifiers of a grpprl. A truncated last one ends the list.
+pub fn parse(g: &[u8]) -> Vec<Prl<'_>> {
+    let mut out = vec![];
+    let mut p = 0usize;
+    while p + 2 <= g.len() && out.len() < 4096 {
+        let op = u16::from_le_bytes([g[p], g[p + 1]]);
+        p += 2;
+        let rest = &g[p..];
+        let n = match op >> 13 {
+            0 | 1 => 1,
+            2 | 4 | 5 => 2,
+            3 => 4,
+            7 => 3,
+            _ => {
+                if op == 0xD608 {
+                    match rest {
+                        [a, b, ..] => usize::from(u16::from_le_bytes([*a, *b])) + 1,
+                        _ => break,
+                    }
+                } else if op == 0xC615 && rest.first() == Some(&255) {
+                    // The size is that of the deleted and added tab lists.
+                    let del = usize::from(rest.get(1).copied().unwrap_or(0));
+                    let add_at = 2 + 4 * del;
+                    let add = usize::from(rest.get(add_at).copied().unwrap_or(0));
+                    add_at + 1 + 3 * add
+                } else {
+                    match rest.first() {
+                        Some(&c) => usize::from(c) + 1,
+                        None => break,
+                    }
+                }
+            }
+        };
+        if n > rest.len() {
+            // Operand cut short: keep what is there for fixed sizes only.
+            break;
+        }
+        out.push(Prl {
+            op,
+            val: &rest[..n],
+        });
+        p += n;
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn operand_sizes_follow_the_opcode() {
+        // sprmCFBold on, sprmCHps 24, sprmCCv, sprmPChgTabsPapx with 3 bytes.
+        let g = [
+            0x35, 0x08, 1, 0x43, 0x4A, 24, 0, 0x70, 0x68, 1, 2, 3, 0, 0x0D, 0xC6, 3, 9, 9, 9,
+        ];
+        let p = parse(&g);
+        assert_eq!(p.len(), 4);
+        assert_eq!((p[0].op, p[0].u8()), (0x0835, 1));
+        assert_eq!(p[1].u16(), 24);
+        assert_eq!(p[2].val, &[1, 2, 3, 0]);
+        assert_eq!(p[3].var(), &[9, 9, 9]);
+        assert_eq!(p[1].sgc(), SGC_CHAR);
+    }
+
+    #[test]
+    fn table_definition_has_a_two_byte_size() {
+        // cb = 5: four more bytes after the size field.
+        let g = [0x08, 0xD6, 5, 0, 1, 2, 3, 4, 0x35, 0x08, 0];
+        let p = parse(&g);
+        assert_eq!(p.len(), 2);
+        assert_eq!(p[0].val.len(), 6);
+        assert_eq!(p[0].var(), &[1, 2, 3, 4]);
+        assert_eq!(p[1].op, 0x0835);
+        // The group of an opcode: table, section, paragraph.
+        assert_eq!(p[0].sgc(), SGC_TABLE);
+        assert_eq!(parse(&[0x09, 0x30, 1])[0].sgc(), 4);
+        assert_eq!(parse(&[0x03, 0x24, 1])[0].sgc(), SGC_PARA);
+    }
+
+    #[test]
+    fn truncated_operands_end_the_list() {
+        assert_eq!(parse(&[0x43, 0x4A, 24]).len(), 0);
+        assert_eq!(parse(&[0x0D, 0xC6, 9, 1]).len(), 0);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/story.rs b/crates/exav-render/src/formats/office/docs/doc/story.rs
new file mode 100644
index 00000000..c2c49a9a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/story.rs
@@ -0,0 +1,1238 @@
+//! The text of the document parts: paragraphs, runs, fields, tables and the
+//! notes, comments, headers and footers around them.
+
+use super::fib::{self, idx};
+use super::props::*;
+use super::sprm::parse;
+use super::tables::{Tap, parse_tap};
+use super::{Reader, Run as FkpRun};
+use crate::formats::office::common::bytes::u16_at;
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::fields::parse_hyperlink;
+use crate::formats::office::docs::limits::PARA_BYTES;
+use crate::formats::office::docs::model::*;
+use std::collections::HashSet;
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Story {
+    Main,
+    Footnote,
+    Endnote,
+    Header,
+    Comment,
+    Textbox,
+}
+
+/// The sprm that a Prm0 stands for.
+fn prm0_opcode(isprm: u8) -> Option<u16> {
+    Some(match isprm {
+        0x00 => 0x2879,
+        0x04 => 0x2602,
+        0x05 => 0x2461,
+        0x07 => 0x2405,
+        0x08 => 0x2406,
+        0x09 => 0x2407,
+        0x0C => 0x260A,
+        0x0D => 0x2470,
+        0x0E => 0x240C,
+        0x0F => 0x2471,
+        0x18 => 0x2416,
+        0x19 => 0x2417,
+        0x1D => 0x261B,
+        0x25 => 0x2423,
+        0x2C => 0x242A,
+        0x32 => 0x2430,
+        0x33 => 0x2431,
+        0x35 => 0x2433,
+        0x36 => 0x2434,
+        0x37 => 0x2435,
+        0x38 => 0x2436,
+        0x39 => 0x2437,
+        0x3A => 0x2438,
+        0x41 => 0x0800,
+        0x42 => 0x0801,
+        0x43 => 0x0802,
+        0x47 => 0x0806,
+        0x4B => 0x080A,
+        0x4D => 0x2A0C,
+        0x4E => 0x0858,
+        0x4F => 0x2859,
+        0x50 => 0x0811,
+        0x51 => 0x0818,
+        0x53 => 0x2A33,
+        0x55 => 0x0835,
+        0x56 => 0x0836,
+        0x57 => 0x0837,
+        0x58 => 0x0838,
+        0x59 => 0x0839,
+        0x5A => 0x083A,
+        0x5B => 0x083B,
+        0x5C => 0x083C,
+        0x5E => 0x2A3E,
+        0x62 => 0x2A42,
+        0x68 => 0x2A48,
+        0x73 => 0x2A53,
+        0x74 => 0x0854,
+        0x75 => 0x0855,
+        0x76 => 0x0856,
+        0x78 => 0x2640,
+        0x7B => 0x2A90,
+        0x7C => 0x2A86,
+        0x7E => 0x2443,
+        _ => return None,
+    })
+}
+
+struct Span {
+    rp: RunProps,
+    aux: ChpAux,
+}
+
+struct Atom {
+    cp: u32,
+    ch: u16,
+    span: usize,
+}
+
+/// A paragraph found in the text.
+struct ParaRec {
+    depth: u32,
+    role: Role,
+    para: Option<Para>,
+    tap: Option<Tap>,
+}
+
+#[derive(PartialEq, Eq, Clone, Copy)]
+enum Role {
+    Normal,
+    CellEnd,
+    RowEnd,
+}
+
+struct TableBuilder {
+    rows: Vec<(Tap, Vec<Vec<Block>>)>,
+    cells: Vec<Vec<Block>>,
+    cur: Vec<Block>,
+}
+
+/// Deleted and inserted text is drawn in this colour, whoever made the change.
+const REVISION_COLOR: u32 = 0xC00000;
+
+/// The headers or footers `src` has that `dst` has not.
+fn inherit(dst: &mut HeaderFooter, src: HeaderFooter, title_page: bool, facing: bool) {
+    dst.default = dst.default.take().or(src.default);
+    if title_page {
+        dst.first = dst.first.take().or(src.first);
+    }
+    if facing {
+        dst.even = dst.even.take().or(src.even);
+    }
+}
+
+impl Reader<'_> {
+    pub(crate) fn convert(&mut self) -> Result<()> {
+        self.build_styles();
+        self.build_lists();
+        // Sections and their headers first: the body puts each on the
+        // paragraph that ends it.
+        let n = self.sections.len();
+        for i in 0..n {
+            let mut s = self.section_props(i);
+            self.section_stories(i, &mut s)?;
+            self.sect_ready.push(Some(s));
+        }
+        // A section with no text has no paragraph to carry its headers; the
+        // next section, which links to them when it has none, takes them.
+        let mut start = 0;
+        for i in 0..n.saturating_sub(1) {
+            let end = self.sections[i].cp1;
+            if end <= start
+                && let Some(src) = self.sect_ready[i].take()
+                && let Some(dst) = self.sect_ready[i + 1].as_mut()
+            {
+                inherit(&mut dst.headers, src.headers, dst.title_page, self.facing);
+                inherit(&mut dst.footers, src.footers, dst.title_page, self.facing);
+            }
+            start = end;
+        }
+        let ccp = self.fib.ccp_text as u32;
+        let ccp = ccp.min(self.text.len() as u32);
+        let body = self.story_blocks(0, ccp, Story::Main)?;
+        self.doc.body = body;
+        self.doc.section = self
+            .sect_ready
+            .last_mut()
+            .and_then(|s| s.take())
+            .unwrap_or_default();
+        self.read_note_stories()?;
+        self.apply_defaults();
+        Ok(())
+    }
+
+    fn apply_defaults(&mut self) {
+        let f = |me: &Reader, i: i16| {
+            me.fonts
+                .get(usize::try_from(i).unwrap_or(usize::MAX))
+                .cloned()
+        };
+        let s = &self.stsh;
+        let fonts = Fonts {
+            ascii: f(self, s.ftc_ascii),
+            hansi: f(self, s.ftc_other),
+            east_asia: f(self, s.ftc_fe),
+            cs: s.ftc_bi.and_then(|b| f(self, b)),
+        };
+        self.doc.defaults_run.fonts = fonts;
+    }
+
+    // ---- styles ----
+
+    fn style_id_for(&self, istd: u16) -> Option<String> {
+        self.style_ids.get(usize::from(istd)).cloned().flatten()
+    }
+
+    fn build_styles(&mut self) {
+        let n = self.stsh.stds.len();
+        let mut used: HashSet<String> = HashSet::new();
+        let mut ids = vec![None; n];
+        for (i, s) in self.stsh.stds.iter().enumerate() {
+            let Some(s) = s else { continue };
+            let base = match (i, s.sti) {
+                (_, 0) => "Normal".to_string(),
+                (_, 1..=9) => format!("Heading{}", s.sti),
+                (_, 65) => "DefaultParagraphFont".to_string(),
+                (_, 105) => "TableNormal".to_string(),
+                (_, 107) => "NoList".to_string(),
+                _ => {
+                    let c: String = s
+                        .name
+                        .split(',')
+                        .next()
+                        .unwrap_or("")
+                        .chars()
+                        .filter(|c| c.is_alphanumeric())
+                        .collect();
+                    if c.is_empty() {
+                        format!("Style{i}")
+                    } else if c.chars().next().is_some_and(|c| c.is_ascii_digit()) {
+                        format!("S{c}")
+                    } else {
+                        c
+                    }
+                }
+            };
+            let mut id = base.clone();
+            let mut k = 2;
+            while !used.insert(id.clone()) {
+                id = format!("{base}{k}");
+                k += 1;
+            }
+            ids[i] = Some(id);
+        }
+        self.style_ids = ids;
+        let mut out = vec![];
+        for i in 0..n {
+            let Some(std) = self.stsh.stds[i].as_ref() else {
+                continue;
+            };
+            let kind = match std.kind {
+                1 => StyleKind::Paragraph,
+                2 => StyleKind::Character,
+                3 => StyleKind::Table,
+                4 => StyleKind::Numbering,
+                _ => continue,
+            };
+            let name = std.name.split(',').next().unwrap_or("").to_string();
+            let name = match std.sti {
+                0 => "Normal".to_string(),
+                1..=9 => format!("heading {}", std.sti),
+                65 => "Default Paragraph Font".to_string(),
+                105 => "Normal Table".to_string(),
+                107 => "No List".to_string(),
+                _ => name,
+            };
+            let (std_base, std_next, std_link, std_sti) = (std.base, std.next, std.link, std.sti);
+            let id = self.style_ids[i].clone().unwrap_or_default();
+            let mut st = Style::new(&id, &name, kind);
+            st.based_on = (std_base != 0x0FFF && usize::from(std_base) != i)
+                .then(|| self.style_id_for(std_base))
+                .flatten();
+            st.next = (usize::from(std_next) != i)
+                .then(|| self.style_id_for(std_next))
+                .flatten();
+            st.link = (std_link != 0)
+                .then(|| self.style_id_for(std_link))
+                .flatten();
+            st.default = matches!(
+                (std_sti, kind),
+                (0, StyleKind::Paragraph)
+                    | (65, StyleKind::Character)
+                    | (105, StyleKind::Table)
+                    | (107, StyleKind::Numbering)
+            );
+            st.q_format = std_sti <= 9;
+            let (_, delta) = self.style_rpr(i as u16, 0);
+            st.rpr = delta;
+            st.ppr = self.style_ppr(i as u16);
+            if kind == StyleKind::Table {
+                st.tbl = Some(TableProps::default());
+            }
+            out.push(st);
+        }
+        self.doc.styles = out;
+    }
+
+    /// The character properties of a style: all of them (own and inherited),
+    /// and the ones it sets itself.
+    fn style_rpr(&mut self, istd: u16, depth: u32) -> (RunProps, RunProps) {
+        if let Some(r) = self.rpr_cache.get(&istd) {
+            let d = self.rpr_delta.get(&istd).cloned().unwrap_or_default();
+            return (r.clone(), d);
+        }
+        let Some(std) = self
+            .stsh
+            .stds
+            .get(usize::from(istd))
+            .and_then(|s| s.as_ref())
+        else {
+            return (RunProps::default(), RunProps::default());
+        };
+        let (base_istd, chpx, kind) = (std.base, std.chpx.clone(), std.kind);
+        let base = if base_istd != 0x0FFF && base_istd != istd && depth < 32 {
+            self.style_rpr(base_istd, depth + 1).0
+        } else {
+            RunProps::default()
+        };
+        let fonts = self.fonts.clone();
+        let cx = Ctx {
+            fonts: &fonts,
+            base: &base,
+        };
+        let mut delta = RunProps::default();
+        let mut aux = ChpAux::default();
+        apply_chp_list(&mut delta, &mut aux, &chpx, &cx);
+        let _ = kind;
+        let mut all = base;
+        all.overlay(&delta);
+        self.rpr_cache.insert(istd, all.clone());
+        self.rpr_delta.insert(istd, delta.clone());
+        (all, delta)
+    }
+
+    /// The paragraph properties a style sets itself.
+    fn style_ppr(&mut self, istd: u16) -> ParaProps {
+        let Some(std) = self
+            .stsh
+            .stds
+            .get(usize::from(istd))
+            .and_then(|s| s.as_ref())
+        else {
+            return ParaProps::default();
+        };
+        let papx = std.papx.clone();
+        let mut pp = ParaProps::default();
+        let mut aux = PapAux::default();
+        let g = papx.get(2..).unwrap_or(&[]);
+        apply_pap_list(&mut pp, &mut aux, g);
+        if let Some(l) = aux.ilfo_set {
+            if l > 0 {
+                pp.num_id = Some(l as u32);
+                pp.num_level = Some(u32::from(aux.ilvl));
+            } else if l == 0 {
+                pp.num_id = Some(0);
+            }
+        }
+        self.ppr_cache.insert(istd, pp.clone());
+        pp
+    }
+
+    fn style_numbered(&self, istd: u16, depth: u32) -> bool {
+        let Some(pp) = self.ppr_cache.get(&istd) else {
+            return false;
+        };
+        if pp.num_id.is_some_and(|n| n > 0) {
+            return true;
+        }
+        if pp.num_id == Some(0) || depth > 32 {
+            return false;
+        }
+        match self
+            .stsh
+            .stds
+            .get(usize::from(istd))
+            .and_then(|s| s.as_ref())
+        {
+            Some(s) if s.base != 0x0FFF && s.base != istd => self.style_numbered(s.base, depth + 1),
+            _ => false,
+        }
+    }
+
+    fn build_lists(&mut self) {
+        let (lo, ll) = self.fib.at(idx::PLF_LST);
+        let (fo, fl) = self.fib.at(idx::PLF_LFO);
+        let base = RunProps::default();
+        let fonts = self.fonts.clone();
+        let ids = self.style_ids.clone();
+        let cx = Ctx {
+            fonts: &fonts,
+            base: &base,
+        };
+        let lists = super::lists::read(&self.tbl, (lo, ll), (fo, fl), &cx, &|i| {
+            ids.get(usize::from(i)).cloned().flatten()
+        });
+        self.doc.numbering = lists.numbering;
+    }
+
+    // ---- sections ----
+
+    fn section_props(&mut self, i: usize) -> Section {
+        let mut s = Section {
+            left: 1800,
+            right: 1800,
+            ..Section::default()
+        };
+        let g = self.sections[i].grpprl.clone();
+        apply_sep(&mut s, &g);
+        s.top = s.top.abs();
+        s.bottom = s.bottom.abs();
+        s
+    }
+
+    fn section_stories(&mut self, i: usize, s: &mut Section) -> Result<()> {
+        let base = self.base_hdd();
+        for k in 0..6usize {
+            let n = 6 + 6 * i + k;
+            let (Some(&a), Some(&b)) = (self.hdd.cps.get(n), self.hdd.cps.get(n + 1)) else {
+                continue;
+            };
+            if b <= a.saturating_add(1) {
+                continue;
+            }
+            let (Some(lo), Some(hi)) = (base.checked_add(a), base.checked_add(b - 1)) else {
+                continue;
+            };
+            if hi as usize > self.text.len() {
+                continue;
+            }
+            let blocks = self.story_blocks(lo, hi, Story::Header)?;
+            if blocks.is_empty() {
+                continue;
+            }
+            match k {
+                0 => s.headers.even = Some(blocks),
+                1 => s.headers.default = Some(blocks),
+                2 => s.footers.even = Some(blocks),
+                3 => s.footers.default = Some(blocks),
+                4 => s.headers.first = Some(blocks),
+                _ => s.footers.first = Some(blocks),
+            }
+        }
+        if !s.title_page {
+            s.headers.first = None;
+            s.footers.first = None;
+        }
+        if !self.facing {
+            s.headers.even = None;
+            s.footers.even = None;
+        }
+        Ok(())
+    }
+
+    // ---- notes and comments ----
+
+    fn read_note_stories(&mut self) -> Result<()> {
+        let limit_ftn = (self.fib.ccp_text + self.fib.ccp_ftn) as u32;
+        for i in 0..self.ftn_ref.len() {
+            let (Some(&a), Some(&b)) = (self.ftn_txt.get(i), self.ftn_txt.get(i + 1)) else {
+                break;
+            };
+            let b = b.min(limit_ftn).min(self.text.len() as u32);
+            if a >= b {
+                continue;
+            }
+            let content = self.story_blocks(a, b, Story::Footnote)?;
+            self.doc.footnotes.push(Note {
+                id: i as u32 + 1,
+                content,
+            });
+        }
+        let f = &self.fib;
+        let limit_edn = fib::cp(f.ccp_text + f.ccp_ftn + f.ccp_hdd + f.ccp_atn + f.ccp_edn);
+        let limit_atn = fib::cp(f.ccp_text + f.ccp_ftn + f.ccp_hdd + f.ccp_atn);
+        for i in 0..self.edn_ref.len() {
+            let (Some(&a), Some(&b)) = (self.edn_txt.get(i), self.edn_txt.get(i + 1)) else {
+                break;
+            };
+            let b = b.min(limit_edn).min(self.text.len() as u32);
+            if a >= b {
+                continue;
+            }
+            let content = self.story_blocks(a, b, Story::Endnote)?;
+            self.doc.endnotes.push(Note {
+                id: i as u32 + 1,
+                content,
+            });
+        }
+        for i in 0..self.atn_ref.len() {
+            let (Some(&a), Some(&b)) = (self.atn_txt.get(i), self.atn_txt.get(i + 1)) else {
+                break;
+            };
+            let b = b.min(limit_atn).min(self.text.len() as u32);
+            if a >= b {
+                continue;
+            }
+            let content = self.story_blocks(a, b, Story::Comment)?;
+            let (_, initials, ibst) = self.atn_ref[i].clone();
+            self.doc.comments.push(Comment {
+                id: i as u32,
+                author: self.owners.get(ibst).cloned().unwrap_or_default(),
+                initials,
+                date: None,
+                content,
+            });
+        }
+        Ok(())
+    }
+
+    // ---- paragraphs ----
+
+    fn piece_index(&self, cp: u32) -> Option<usize> {
+        let i = self.pieces.partition_point(|p| p.cp1 <= cp);
+        (i < self.pieces.len() && self.pieces[i].cp0 <= cp).then_some(i)
+    }
+
+    /// The byte offset in the WordDocument stream of text at `cp`.
+    fn fc_at(&self, cp: u32) -> Option<u32> {
+        let i = self.piece_index(cp)?;
+        Some(self.pieces[i].fc_of(cp))
+    }
+
+    fn lookup(runs: &[FkpRun], fc: u32) -> Option<&FkpRun> {
+        let i = runs.partition_point(|r| r.lo <= fc);
+        if i == 0 {
+            return None;
+        }
+        let r = &runs[i - 1];
+        (fc < r.hi).then_some(r)
+    }
+
+    /// The modifiers a piece's Prm adds, as a list.
+    fn prm_grpprl(&self, piece: usize) -> Vec<u8> {
+        let prm = self.pieces[piece].prm;
+        if prm == 0 {
+            return vec![];
+        }
+        if prm & 1 != 0 {
+            return self
+                .prcs
+                .get(usize::from(prm >> 1))
+                .cloned()
+                .unwrap_or_default();
+        }
+        let isprm = ((prm >> 1) & 0x7F) as u8;
+        let val = (prm >> 8) as u8;
+        match prm0_opcode(isprm) {
+            Some(op) => vec![op as u8, (op >> 8) as u8, val],
+            None => vec![],
+        }
+    }
+
+    /// Paragraph modifiers at `cp` (the paragraph's last character) and the
+    /// style they start with.
+    fn para_grpprl(&self, cp: u32) -> (u16, Vec<u8>) {
+        let Some(fc) = self.fc_at(cp) else {
+            return (0, vec![]);
+        };
+        let mut istd = 0u16;
+        let mut g = vec![];
+        if let Some(r) = Self::lookup(&self.papx, fc)
+            && r.len >= 2
+        {
+            let b = &self.wd[r.off as usize..r.off as usize + usize::from(r.len)];
+            istd = u16_at(b, 0);
+            g.extend_from_slice(&b[2..]);
+        }
+        if let Some(pi) = self.piece_index(cp) {
+            g.extend(self.prm_grpprl(pi));
+        }
+        (istd, g)
+    }
+
+    /// Runs of `a..b` with their character modifier lists.
+    fn char_runs(&self, a: u32, b: u32) -> Vec<(u32, u32, Vec<u8>)> {
+        let mut out = vec![];
+        let mut cp = a;
+        while cp < b {
+            let Some(pi) = self.piece_index(cp) else {
+                break;
+            };
+            let p = &self.pieces[pi];
+            let end = b.min(p.cp1);
+            let prm = self.prm_grpprl(pi);
+            let mut c = cp;
+            while c < end {
+                let fc = p.fc_of(c);
+                let ri = self.chpx.partition_point(|r| r.hi <= fc);
+                let (run_end_fc, g) = match self.chpx.get(ri) {
+                    Some(r) if r.lo <= fc => (
+                        r.hi,
+                        self.wd[r.off as usize..r.off as usize + usize::from(r.len)].to_vec(),
+                    ),
+                    Some(r) => (r.lo, vec![]),
+                    None => (u32::MAX, vec![]),
+                };
+                let n = if run_end_fc == u32::MAX {
+                    end - c
+                } else {
+                    ((run_end_fc - fc) / p.unit()).max(1).min(end - c)
+                };
+                let mut g = g;
+                g.extend_from_slice(&prm);
+                out.push((c, c + n, g));
+                c += n;
+            }
+            cp = end;
+        }
+        out
+    }
+
+    fn is_section_end(&self, cp_after: u32) -> bool {
+        self.section_ending_at(cp_after).is_some()
+    }
+
+    /// The blocks of the text `lo..hi` of one part of the document.
+    pub(crate) fn story_blocks(&mut self, lo: u32, hi: u32, story: Story) -> Result<Vec<Block>> {
+        if self.depth > 8 {
+            return Ok(vec![]);
+        }
+        self.depth += 1;
+        let r = self.story_blocks_inner(lo, hi, story);
+        self.depth -= 1;
+        r
+    }
+
+    fn story_blocks_inner(&mut self, lo: u32, hi: u32, story: Story) -> Result<Vec<Block>> {
+        let hi = hi.min(self.text.len() as u32);
+        let mut out: Vec<Block> = vec![];
+        let mut stack: Vec<TableBuilder> = vec![];
+        let mut p = lo;
+        let in_main = story == Story::Main;
+        while p < hi {
+            let mut e = p;
+            while e < hi {
+                let c = self.text[e as usize];
+                if c == 0x0D || c == 0x07 || (c == 0x0C && in_main && self.is_section_end(e + 1)) {
+                    break;
+                }
+                e += 1;
+            }
+            let end = e.min(hi - 1);
+            let mut rec = self.para_rec(p, end, story)?;
+            if in_main
+                && let Some(i) = self.section_ending_at(end + 1)
+                && let (Some(para), Some(s)) = (rec.para.as_mut(), self.sect_ready[i].take())
+            {
+                para.section = Some(Box::new(s));
+            }
+            let first_depth = rec.depth;
+            // Close tables deeper than this paragraph; open new ones.
+            while stack.len() as u32 > first_depth {
+                let Some(t) = stack.pop() else { break };
+                let blocks = self.close_table(t);
+                match stack.last_mut() {
+                    Some(parent) => parent.cur.extend(blocks),
+                    None => out.extend(blocks),
+                }
+            }
+            while (stack.len() as u32) < first_depth {
+                stack.push(TableBuilder {
+                    rows: vec![],
+                    cells: vec![],
+                    cur: vec![],
+                });
+            }
+            match (rec.role, rec.para, rec.tap) {
+                (Role::RowEnd, _, tap) => {
+                    if let Some(t) = stack.last_mut() {
+                        let cells = std::mem::take(&mut t.cells);
+                        t.cur.clear();
+                        t.rows.push((tap.unwrap_or_default(), cells));
+                    }
+                }
+                (role, Some(para), _) => {
+                    let block = Block::Para(para);
+                    match stack.last_mut() {
+                        Some(t) => {
+                            t.cur.push(block);
+                            if role == Role::CellEnd {
+                                self.b.cell()?;
+                                let cell = std::mem::take(&mut t.cur);
+                                t.cells.push(cell);
+                            }
+                        }
+                        None => out.push(block),
+                    }
+                }
+                _ => {}
+            }
+            p = end + 1;
+        }
+        while let Some(t) = stack.pop() {
+            let blocks = self.close_table(t);
+            match stack.last_mut() {
+                Some(parent) => parent.cur.extend(blocks),
+                None => out.extend(blocks),
+            }
+        }
+        Ok(out)
+    }
+
+    /// The section (but the last) that ends before `cp_after`.
+    fn section_ending_at(&self, cp_after: u32) -> Option<usize> {
+        let n = self.sections.len();
+        self.sections
+            .iter()
+            .take(n.saturating_sub(1))
+            .position(|s| s.cp1 == cp_after)
+    }
+
+    fn para_rec(&mut self, ps: u32, pe: u32, story: Story) -> Result<ParaRec> {
+        let (istd_papx, g) = self.para_grpprl(pe);
+        let mut pp = ParaProps::default();
+        let mut aux = PapAux::default();
+        apply_pap_list(&mut pp, &mut aux, &g);
+        // A huge PAPX keeps its modifiers in the data stream.
+        if let Some(off) = aux.huge {
+            let o = off as usize;
+            let n = usize::from(u16_at(&self.data, o));
+            if let Some(extra) = self.data.get(o + 2..o + 2 + n) {
+                let extra = extra.to_vec();
+                apply_pap_list(&mut pp, &mut aux, &extra);
+            }
+        }
+        let istd = aux.istd.unwrap_or(istd_papx);
+        let mark = self.text[pe as usize];
+        let depth = match aux.depth {
+            Some(d) => d,
+            None => u32::from(aux.in_table),
+        };
+        let depth = if depth == 0 && (aux.in_table || aux.ttp) {
+            1
+        } else {
+            depth
+        };
+        let ttp = (mark == 0x07 && aux.ttp) || aux.inner_ttp;
+        let cell_end = depth > 0 && !ttp && (mark == 0x07 || aux.inner_cell);
+        let role = if ttp {
+            Role::RowEnd
+        } else if cell_end {
+            Role::CellEnd
+        } else {
+            Role::Normal
+        };
+        if role == Role::RowEnd {
+            let tap = parse_tap(&g);
+            return Ok(ParaRec {
+                depth,
+                role,
+                para: None,
+                tap: Some(tap),
+            });
+        }
+        self.b
+            .paragraph((pe - ps) as usize * 2 + PARA_BYTES as usize / 4)?;
+        // Style and numbering.
+        if istd != 0 {
+            pp.style = self.style_id_for(istd);
+        }
+        match aux.ilfo_set {
+            Some(l) if l > 0 => {
+                pp.num_id = Some(l as u32);
+                pp.num_level = Some(u32::from(aux.ilvl));
+            }
+            Some(l) if l < 0 && l > -0x7FE => {
+                pp.num_id = Some((-l) as u32);
+                pp.num_level = Some(u32::from(aux.ilvl));
+            }
+            Some(0) => {
+                if self.style_numbered(istd, 0) {
+                    pp.num_id = Some(0);
+                }
+            }
+            _ => {
+                if aux.ilvl != 0 && self.style_numbered(istd, 0) {
+                    pp.num_level = Some(u32::from(aux.ilvl));
+                }
+            }
+        }
+        if let Some((kind, lines)) = aux.drop_cap {
+            if kind != 0 {
+                let f = pp.frame.get_or_insert_with(Frame::default);
+                f.drop_cap = Some(if kind == 2 { "margin" } else { "drop" });
+                f.lines = Some(u32::from(lines.max(1)));
+                f.wrap = Some("around");
+                f.h_anchor = Some("text");
+                f.v_anchor = Some("text");
+            }
+        } else if let Some(f) = aux.frame
+            && (f.width.is_some() || f.x.is_some() || f.x_align.is_some() || f.y.is_some())
+        {
+            pp.frame = Some(f);
+        }
+        // The paragraph mark's formatting.
+        let base = self.base_rpr(istd, None);
+        let mut mark_rp = RunProps::default();
+        let mut mark_aux = ChpAux::default();
+        {
+            let g = self.char_runs(pe, pe + 1);
+            let fonts = self.fonts.clone();
+            let cx = Ctx {
+                fonts: &fonts,
+                base: &base,
+            };
+            if let Some((_, _, gr)) = g.first() {
+                apply_chp_list(&mut mark_rp, &mut mark_aux, gr, &cx);
+            }
+        }
+        if let Some(c) = mark_aux.istd {
+            mark_rp.style = self.style_id_for(c);
+        }
+        // Content.
+        let content = if pe > ps {
+            self.inlines_of(ps, pe, istd, story)?
+        } else {
+            vec![]
+        };
+        let para = Para {
+            props: pp,
+            mark: mark_rp,
+            content,
+            section: None,
+        };
+        Ok(ParaRec {
+            depth,
+            role,
+            para: Some(para),
+            tap: None,
+        })
+    }
+
+    fn base_rpr(&mut self, para_istd: u16, char_istd: Option<u16>) -> RunProps {
+        let mut base = self.style_rpr(para_istd, 0).0;
+        if let Some(c) = char_istd {
+            let cr = self.style_rpr(c, 0).0;
+            base.overlay(&cr);
+        }
+        base
+    }
+
+    // ---- runs ----
+
+    fn inlines_of(
+        &mut self,
+        ps: u32,
+        pe: u32,
+        para_istd: u16,
+        story: Story,
+    ) -> Result<Vec<Inline>> {
+        let runs = self.char_runs(ps, pe);
+        let mut spans = vec![];
+        let mut atoms: Vec<Atom> = Vec::with_capacity((pe - ps) as usize);
+        let pbase = self.base_rpr(para_istd, None);
+        let fonts = self.fonts.clone();
+        for (a, b, g) in &runs {
+            let mut rp = RunProps::default();
+            let mut aux = ChpAux::default();
+            // The character style first: its toggles are the base of the rest.
+            let istd = parse(g)
+                .iter()
+                .rev()
+                .find(|p| p.op == 0x4A30)
+                .map(|p| p.u16());
+            let base = match istd {
+                Some(c) => self.base_rpr(para_istd, Some(c)),
+                None => pbase.clone(),
+            };
+            let cx = Ctx {
+                fonts: &fonts,
+                base: &base,
+            };
+            apply_chp_list(&mut rp, &mut aux, g, &cx);
+            // Tracked changes, as an editor shows them.
+            if aux.deleted || aux.inserted {
+                rp.color = Some(Color::Rgb(REVISION_COLOR));
+                if aux.deleted {
+                    rp.strike = Some(true);
+                } else {
+                    rp.underline = Some("single");
+                }
+            }
+            if let Some(c) = aux.istd {
+                rp.style = self.style_id_for(c);
+            }
+            spans.push(Span { rp, aux });
+            let si = spans.len() - 1;
+            for cp in *a..*b {
+                atoms.push(Atom {
+                    cp,
+                    ch: self.text[cp as usize],
+                    span: si,
+                });
+            }
+        }
+        let mut out = vec![];
+        let mut mark = self.marks.partition_point(|m| m.0 < ps);
+        self.emit(&atoms, &spans, story, &mut out, &mut mark, pe)?;
+        // Marks at the end of the paragraph.
+        self.flush_marks(pe, &mut mark, &mut out, true);
+        Ok(out)
+    }
+
+    fn flush_marks(&mut self, upto: u32, mark: &mut usize, out: &mut Vec<Inline>, inclusive: bool) {
+        while let Some(&(cp, kind, id)) = self.marks.get(*mark) {
+            if cp > upto || (cp == upto && !inclusive) {
+                break;
+            }
+            *mark += 1;
+            match kind {
+                0 => {
+                    if let Some(n) = self.bookmark_names.get(id as usize) {
+                        out.push(Inline::BookmarkStart {
+                            id,
+                            name: n.clone(),
+                        });
+                    }
+                }
+                1 => out.push(Inline::BookmarkEnd(id)),
+                2 => out.push(Inline::CommentStart(id - 1_000_000)),
+                _ => out.push(Inline::CommentEnd(id - 1_000_000)),
+            }
+        }
+    }
+
+    fn emit(
+        &mut self,
+        atoms: &[Atom],
+        spans: &[Span],
+        story: Story,
+        out: &mut Vec<Inline>,
+        mark: &mut usize,
+        pe: u32,
+    ) -> Result<()> {
+        let mut items: Vec<RunItem> = vec![];
+        let mut text = String::new();
+        let mut cur: Option<usize> = None;
+        macro_rules! flush {
+            () => {
+                if !text.is_empty() {
+                    items.push(RunItem::Text(std::mem::take(&mut text)));
+                }
+                if !items.is_empty() {
+                    if let Some(s) = cur {
+                        out.push(Inline::Run(Run {
+                            props: spans[s].rp.clone(),
+                            items: std::mem::take(&mut items),
+                        }));
+                    } else {
+                        items.clear();
+                    }
+                }
+            };
+        }
+        let mut i = 0;
+        while i < atoms.len() {
+            let a = &atoms[i];
+            if self.marks.get(*mark).is_some_and(|m| m.0 <= a.cp) {
+                flush!();
+                self.flush_marks(a.cp, mark, out, true);
+            }
+            if cur != Some(a.span) {
+                flush!();
+                cur = Some(a.span);
+            }
+            let span = &spans[a.span];
+            match a.ch {
+                0x13 => {
+                    flush!();
+                    let (consumed, inl) = self.field(&atoms[i..], spans, story, pe)?;
+                    out.extend(inl);
+                    i += consumed.max(1);
+                    cur = None;
+                    continue;
+                }
+                0x14 => {
+                    flush!();
+                    out.push(Inline::FieldChar(FieldCharKind::Separate));
+                }
+                0x15 => {
+                    flush!();
+                    out.push(Inline::FieldChar(FieldCharKind::End));
+                }
+                0x01 if span.aux.spec
+                    && !span.aux.data
+                    && let Some(loc) = span.aux.pic_loc =>
+                {
+                    if let Some(d) = self.inline_picture(loc)? {
+                        items.push(RunItem::Drawing(Box::new(d)));
+                    }
+                }
+                0x02 if span.aux.spec || story == Story::Footnote || story == Story::Endnote => {
+                    if let Ok(k) = self.ftn_ref.binary_search(&a.cp) {
+                        items.push(RunItem::FootnoteRef(k as u32 + 1));
+                    } else if let Ok(k) = self.edn_ref.binary_search(&a.cp) {
+                        items.push(RunItem::EndnoteRef(k as u32 + 1));
+                    } else if story == Story::Footnote {
+                        items.push(RunItem::NoteMark(false));
+                    } else if story == Story::Endnote {
+                        items.push(RunItem::NoteMark(true));
+                    }
+                }
+                0x05 if span.aux.spec => {
+                    if let Some(k) = self.atn_ref.iter().position(|r| r.0 == a.cp) {
+                        items.push(RunItem::CommentRef(k as u32));
+                    }
+                }
+                0x08 if span.aux.spec => {
+                    if let Some(d) = self.floating_shape(a.cp, story)? {
+                        items.push(RunItem::Drawing(Box::new(d)));
+                    }
+                }
+                0x28 if span.aux.spec
+                    && let Some((ftc, ch)) = span.aux.symbol =>
+                {
+                    let font = self
+                        .fonts
+                        .get(usize::from(ftc))
+                        .cloned()
+                        .unwrap_or_else(|| "Symbol".into());
+                    items.push(RunItem::Symbol { font, ch });
+                }
+                0x09 => {
+                    if !text.is_empty() {
+                        items.push(RunItem::Text(std::mem::take(&mut text)));
+                    }
+                    items.push(RunItem::Tab);
+                }
+                0x0B | 0x0A => {
+                    if !text.is_empty() {
+                        items.push(RunItem::Text(std::mem::take(&mut text)));
+                    }
+                    items.push(RunItem::Break(BreakKind::Line));
+                }
+                0x0C => {
+                    if !text.is_empty() {
+                        items.push(RunItem::Text(std::mem::take(&mut text)));
+                    }
+                    items.push(RunItem::Break(BreakKind::Page));
+                }
+                0x0E => {
+                    if !text.is_empty() {
+                        items.push(RunItem::Text(std::mem::take(&mut text)));
+                    }
+                    items.push(RunItem::Break(BreakKind::Column));
+                }
+                0x1E => {
+                    if !text.is_empty() {
+                        items.push(RunItem::Text(std::mem::take(&mut text)));
+                    }
+                    items.push(RunItem::NoBreakHyphen);
+                }
+                0x1F => {
+                    if !text.is_empty() {
+                        items.push(RunItem::Text(std::mem::take(&mut text)));
+                    }
+                    items.push(RunItem::SoftHyphen);
+                }
+                0x00..=0x1F | 0xFFFE | 0xFFFF => {}
+                c => {
+                    // A surrogate pair stays whole across atoms.
+                    if (0xD800..0xDC00).contains(&c) {
+                        if let Some(n) = atoms.get(i + 1)
+                            && (0xDC00..0xE000).contains(&n.ch)
+                        {
+                            let ch = char::decode_utf16([c, n.ch])
+                                .next()
+                                .and_then(|r| r.ok())
+                                .unwrap_or('\u{FFFD}');
+                            text.push(ch);
+                            i += 2;
+                            continue;
+                        }
+                        text.push('\u{FFFD}');
+                    } else if let Some(ch) = char::from_u32(u32::from(c)) {
+                        text.push(ch);
+                    }
+                }
+            }
+            i += 1;
+        }
+        flush!();
+        Ok(())
+    }
+
+    /// A field starting at `atoms[0]` (a field begin mark). Returns the
+    /// atoms consumed and what to emit.
+    fn field(
+        &mut self,
+        atoms: &[Atom],
+        spans: &[Span],
+        story: Story,
+        pe: u32,
+    ) -> Result<(usize, Vec<Inline>)> {
+        // The matching separator and end.
+        let mut depth = 0i32;
+        let mut sep = None;
+        let mut end = None;
+        for (k, a) in atoms.iter().enumerate() {
+            match a.ch {
+                0x13 => depth += 1,
+                0x14 if depth == 1 && sep.is_none() => sep = Some(k),
+                0x15 => {
+                    depth -= 1;
+                    if depth == 0 {
+                        end = Some(k);
+                        break;
+                    }
+                }
+                _ => {}
+            }
+        }
+        let props = spans[atoms[0].span].rp.clone();
+        let instr_end = sep.or(end).unwrap_or(atoms.len());
+        let mut instr = String::new();
+        let mut d = 0;
+        for a in &atoms[1..instr_end] {
+            match a.ch {
+                0x13 => d += 1,
+                0x15 => d -= 1,
+                0x14 => {}
+                c if d == 0 && c >= 0x20 => {
+                    if let Some(ch) = char::from_u32(u32::from(c)) {
+                        instr.push(ch);
+                    }
+                }
+                _ => {}
+            }
+        }
+        let Some(end) = end else {
+            // The field ends in a later paragraph: its marks are kept as they
+            // are.
+            let mut v = vec![Inline::FieldChar(FieldCharKind::Begin)];
+            v.push(Inline::InstrText(instr));
+            if sep.is_some() {
+                v.push(Inline::FieldChar(FieldCharKind::Separate));
+            }
+            return Ok((instr_end + usize::from(sep.is_some()), v));
+        };
+        let result_atoms = match sep {
+            Some(s) => &atoms[s + 1..end],
+            None => &atoms[end..end],
+        };
+        let mut result = vec![];
+        let mut m = usize::MAX;
+        self.emit(result_atoms, spans, story, &mut result, &mut m, pe)?;
+        let instr_trim = instr.trim();
+        let word = instr_trim
+            .split_whitespace()
+            .next()
+            .unwrap_or("")
+            .to_ascii_uppercase();
+        let inl = match word.as_str() {
+            "HYPERLINK" => {
+                let (target, anchor, tip) = parse_hyperlink(instr_trim);
+                vec![Inline::Hyperlink {
+                    target,
+                    anchor,
+                    tooltip: tip,
+                    content: result,
+                }]
+            }
+            "XE" | "TC" | "TA" | "RD" => vec![],
+            // A check box has no result text; its state is in the field's
+            // form field data.
+            "FORMCHECKBOX" => {
+                let aux = &spans[atoms[0].span].aux;
+                let checked = aux
+                    .pic_loc
+                    .filter(|_| aux.data)
+                    .is_some_and(|at| self.checkbox_checked(at));
+                vec![Inline::Run(Run {
+                    props,
+                    items: vec![RunItem::Text(
+                        if checked { "\u{2612}" } else { "\u{2610}" }.into(),
+                    )],
+                })]
+            }
+            _ => vec![Inline::Field {
+                instr,
+                props,
+                result,
+            }],
+        };
+        Ok((end + 1, inl))
+    }
+
+    // ---- tables ----
+
+    /// Whether the check box whose FFData is at `at` of the data stream is
+    /// checked ([MS-DOC] 2.9.78, 2.9.79: a type of 1 and a state of 1).
+    fn checkbox_checked(&self, at: i32) -> bool {
+        let Some(d) = usize::try_from(at)
+            .ok()
+            .and_then(|a| self.data.get(a..a + 6))
+        else {
+            return false;
+        };
+        let bits = u16_at(d, 4);
+        bits & 3 == 1 && (bits >> 2) & 0x1F == 1
+    }
+
+    /// The blocks of a table whose end was reached: the table, if it has a
+    /// row, and the paragraphs of the cell that was left open (or of cells
+    /// whose row never ended) as the plain paragraphs they are.
+    fn close_table(&mut self, t: TableBuilder) -> Vec<Block> {
+        let TableBuilder { rows, cells, cur } = t;
+        let loose = cells.into_iter().flatten().chain(cur);
+        if rows.is_empty() {
+            return loose.collect();
+        }
+        let table = super::tables::build(rows);
+        if table.rows.is_empty() {
+            return loose.collect();
+        }
+        std::iter::once(Block::Table(table)).chain(loose).collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn prm0_maps_to_sprms() {
+        assert_eq!(prm0_opcode(0x55), Some(0x0835));
+        assert_eq!(prm0_opcode(0x01), None);
+    }
+
+    #[test]
+    fn a_section_takes_the_headers_it_lacks_that_it_shows() {
+        let story = || Some(vec![Block::Para(Para::default())]);
+        let src = HeaderFooter {
+            default: story(),
+            first: story(),
+            even: story(),
+        };
+        // No title page and no facing pages: only the default one is taken.
+        let mut dst = HeaderFooter::default();
+        inherit(&mut dst, src.clone(), false, false);
+        assert!(dst.default.is_some() && dst.first.is_none() && dst.even.is_none());
+        // Both: all are, but not over what the section has of its own.
+        let mut dst = HeaderFooter {
+            first: Some(vec![]),
+            ..HeaderFooter::default()
+        };
+        inherit(&mut dst, src, true, true);
+        assert!(dst.default.is_some() && dst.even.is_some());
+        assert_eq!(dst.first.map(|b| b.len()), Some(0));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/styles.rs b/crates/exav-render/src/formats/office/docs/doc/styles.rs
new file mode 100644
index 00000000..03babbd0
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/styles.rs
@@ -0,0 +1,184 @@
+//! The stylesheet ([MS-DOC] 2.9.271): style definitions as their raw
+//! modifier lists.
+
+use crate::formats::office::common::bytes::{Cur, u16_at};
+
+pub struct Std {
+    pub name: String,
+    pub sti: u16,
+    /// 1 paragraph, 2 character, 3 table, 4 numbering.
+    pub kind: u8,
+    pub base: u16,
+    pub next: u16,
+    pub link: u16,
+    pub papx: Vec<u8>,
+    pub chpx: Vec<u8>,
+}
+
+#[derive(Default)]
+pub struct Stsh {
+    pub stds: Vec<Option<Std>>,
+    pub ftc_ascii: i16,
+    pub ftc_fe: i16,
+    pub ftc_other: i16,
+    pub ftc_bi: Option<i16>,
+}
+
+pub fn read(tbl: &[u8], off: usize, len: usize) -> Stsh {
+    let mut out = Stsh::default();
+    let Some(d) = tbl.get(off..off.saturating_add(len).min(tbl.len())) else {
+        return out;
+    };
+    let mut c = Cur::new(d);
+    let cb_stshi = usize::from(c.u16());
+    let stshi = c.bytes(cb_stshi);
+    if stshi.len() < 18 || c.short {
+        return out;
+    }
+    let cstd = usize::from(u16_at(stshi, 0));
+    let cb_base = usize::from(u16_at(stshi, 2));
+    out.ftc_ascii = u16_at(stshi, 12) as i16;
+    out.ftc_fe = u16_at(stshi, 14) as i16;
+    out.ftc_other = u16_at(stshi, 16) as i16;
+    if stshi.len() >= 20 {
+        out.ftc_bi = Some(u16_at(stshi, 18) as i16);
+    }
+    for _ in 0..cstd.min(4096) {
+        let cb = usize::from(c.u16());
+        if c.short {
+            break;
+        }
+        let std = c.bytes(cb);
+        if cb % 2 == 1 {
+            c.skip(1);
+        }
+        if cb == 0 {
+            out.stds.push(None);
+            continue;
+        }
+        out.stds.push(parse_std(std, cb_base));
+    }
+    out
+}
+
+fn parse_std(d: &[u8], cb_base: usize) -> Option<Std> {
+    if cb_base < 10 || d.len() < cb_base + 2 {
+        return None;
+    }
+    let w0 = u16_at(d, 0);
+    let w1 = u16_at(d, 2);
+    let w2 = u16_at(d, 4);
+    let link = if cb_base >= 18 {
+        u16_at(d, 10) & 0x0FFF
+    } else {
+        0
+    };
+    let sti = w0 & 0x0FFF;
+    let kind = (w1 & 0xF) as u8;
+    let base = w1 >> 4;
+    let cupx = usize::from(w2 & 0xF);
+    let next = w2 >> 4;
+    let mut c = Cur::at(d, cb_base);
+    let cch = usize::from(c.u16());
+    let name_bytes = c.bytes(cch * 2);
+    c.skip(2);
+    let units: Vec<u16> = name_bytes
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|x| u16::from_le_bytes(*x))
+        .collect();
+    let name = String::from_utf16_lossy(&units);
+    if c.p % 2 == 1 {
+        c.skip(1);
+    }
+    let mut upx = vec![];
+    for _ in 0..cupx {
+        let n = usize::from(c.u16());
+        if c.short {
+            break;
+        }
+        upx.push(c.bytes(n).to_vec());
+        if n % 2 == 1 {
+            c.skip(1);
+        }
+    }
+    let take =
+        |v: &mut Vec<Vec<u8>>, i: usize| v.get_mut(i).map(std::mem::take).unwrap_or_default();
+    let (mut papx, mut chpx) = (vec![], vec![]);
+    match kind {
+        1 => {
+            papx = take(&mut upx, 0);
+            chpx = take(&mut upx, 1);
+        }
+        2 => chpx = take(&mut upx, 0),
+        3 => {
+            // The table properties (UPX 0) are not used.
+            papx = take(&mut upx, 1);
+            chpx = take(&mut upx, 2);
+        }
+        4 => papx = take(&mut upx, 0),
+        _ => return None,
+    }
+    Some(Std {
+        name,
+        sti,
+        kind,
+        base,
+        next,
+        link,
+        papx,
+        chpx,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// A stylesheet with one paragraph style "Body" based on style 0xFFF.
+    pub fn sample() -> Vec<u8> {
+        let mut stshi = vec![0u8; 18];
+        stshi[0] = 1;
+        stshi[2] = 10;
+        let mut std = vec![0u8; 10];
+        std[0] = 0xFE;
+        std[1] = 0x0F;
+        // stk 1, istdBase 0x0FFF.
+        std[2..4].copy_from_slice(&(1u16 | 0x0FFF << 4).to_le_bytes());
+        std[4..6].copy_from_slice(&(2u16).to_le_bytes());
+        let name: Vec<u8> = "Body"
+            .encode_utf16()
+            .flat_map(|u| u.to_le_bytes())
+            .collect();
+        std.extend_from_slice(&4u16.to_le_bytes());
+        std.extend_from_slice(&name);
+        std.extend_from_slice(&[0, 0]);
+        // papx: istd 0 and sprmPJc centered (3 bytes: no padding needed beyond one).
+        let papx = [0u8, 0, 0x61, 0x24, 1];
+        std.extend_from_slice(&(papx.len() as u16).to_le_bytes());
+        std.extend_from_slice(&papx);
+        std.push(0);
+        let chpx = [0x35u8, 0x08, 1];
+        std.extend_from_slice(&(chpx.len() as u16).to_le_bytes());
+        std.extend_from_slice(&chpx);
+        std.push(0);
+        let mut d = (stshi.len() as u16).to_le_bytes().to_vec();
+        d.extend_from_slice(&stshi);
+        d.extend_from_slice(&(std.len() as u16).to_le_bytes());
+        d.extend_from_slice(&std);
+        d
+    }
+
+    #[test]
+    fn style_definitions_are_split_into_their_modifier_lists() {
+        let d = sample();
+        let s = read(&d, 0, d.len());
+        assert_eq!(s.stds.len(), 1);
+        let std = s.stds[0].as_ref().unwrap();
+        assert_eq!(std.name, "Body");
+        assert_eq!((std.kind, std.base), (1, 0x0FFF));
+        assert_eq!(std.papx, vec![0, 0, 0x61, 0x24, 1]);
+        assert_eq!(std.chpx, vec![0x35, 0x08, 1]);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/tables.rs b/crates/exav-render/src/formats/office/docs/doc/tables.rs
new file mode 100644
index 00000000..4d3340b3
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/tables.rs
@@ -0,0 +1,520 @@
+//! Table rows ([MS-DOC] 2.4.3): the modifiers of a row mark define its cells.
+
+use super::props::{brc, brc80, colorref, shd, shd80};
+use super::sprm::{Prl, parse};
+use crate::formats::office::common::bytes::{Cur, u16_at};
+use crate::formats::office::docs::grid::{self, CellIn, RowIn};
+use crate::formats::office::docs::model::*;
+
+#[derive(Clone, Debug, Default)]
+pub struct Tc {
+    /// 0 none, 1 merged into the cell before, 2 or 3 first of a merged set.
+    pub merge_h: u8,
+    /// 0 none, 1 merged with the cell above, 3 first of a merged set.
+    pub merge_v: u8,
+    pub v_align: u8,
+    pub text_flow: u8,
+    pub fit_text: bool,
+    pub no_wrap: bool,
+    pub width: Option<Width>,
+    /// top, left, bottom, right: `None` inherits, `Some(None)` is no border.
+    pub borders: [Option<Option<Border>>; 4],
+    pub shading: Option<Shading>,
+    pub margins: Margins,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Tap {
+    /// Positions of the cell edges, twips from the margin.
+    pub edges: Vec<i32>,
+    pub tcs: Vec<Tc>,
+    pub borders: TableBorders,
+    pub height: Option<i32>,
+    pub header: bool,
+    pub cant_split: bool,
+    pub jc: Option<Jc>,
+    pub gap_half: Option<i32>,
+    pub left: Option<i32>,
+    pub width: Option<Width>,
+    pub bidi: bool,
+    pub margins: Margins,
+    pub spacing: Option<i32>,
+    pub width_before: Option<Width>,
+    pub width_after: Option<Width>,
+    pub style: Option<u16>,
+}
+
+fn fts(f: u8, w: u16) -> Option<Width> {
+    match f {
+        0 => Some(Width::Auto),
+        2 => Some(Width::Pct(i32::from(w))),
+        3 => Some(Width::Twips(i32::from(w))),
+        _ => None,
+    }
+}
+
+fn tc80(b: &[u8]) -> Tc {
+    let g = u16_at(b, 0);
+    let mut tc = Tc {
+        merge_h: (g & 3) as u8,
+        text_flow: ((g >> 2) & 7) as u8,
+        merge_v: ((g >> 5) & 3) as u8,
+        v_align: ((g >> 7) & 3) as u8,
+        fit_text: g & 0x1000 != 0,
+        no_wrap: g & 0x2000 != 0,
+        width: fts(((g >> 9) & 7) as u8, u16_at(b, 2)),
+        ..Tc::default()
+    };
+    for i in 0..4 {
+        let v = b.get(4 + 4 * i..8 + 4 * i).unwrap_or(&[0; 4]);
+        tc.borders[i] = if v == [0, 0, 0, 0] {
+            None
+        } else if v == [0xFF; 4] {
+            Some(None)
+        } else {
+            Some(brc80(v))
+        };
+    }
+    tc
+}
+
+fn itc(tap: &mut Tap, first: usize, lim: usize, f: impl Fn(&mut Tc)) {
+    for i in first..lim.min(tap.tcs.len()) {
+        f(&mut tap.tcs[i]);
+    }
+}
+
+fn apply_brcs(tc: &mut Tc, which: u8, b: Option<Border>, nil: bool) {
+    let v = if nil { Some(None) } else { Some(b) };
+    for (bit, k) in [(1u8, 0usize), (2, 1), (4, 2), (8, 3)] {
+        if which & bit != 0 {
+            tc.borders[k] = v.clone();
+        }
+    }
+}
+
+fn border_set(tap: &mut Tap, which: u8, b: Option<Border>) {
+    // Bits for the inside lines apply to the table.
+    if which & 0x10 != 0 {
+        tap.borders.inside_h = b.clone();
+    }
+    if which & 0x20 != 0 {
+        tap.borders.inside_v = b;
+    }
+}
+
+fn margins_of(grf: u8, w: i32, m: &mut Margins) {
+    if grf & 1 != 0 {
+        m.top = Some(w);
+    }
+    if grf & 2 != 0 {
+        m.left = Some(w);
+    }
+    if grf & 4 != 0 {
+        m.bottom = Some(w);
+    }
+    if grf & 8 != 0 {
+        m.right = Some(w);
+    }
+}
+
+/// The table properties a row mark's modifiers describe.
+pub fn parse_tap(grpprl: &[u8]) -> Tap {
+    let mut t = Tap::default();
+    for p in parse(grpprl) {
+        if p.sgc() != super::sprm::SGC_TABLE {
+            continue;
+        }
+        apply(&mut t, &p);
+    }
+    t
+}
+
+fn tbl_borders(t: &mut Tap, v: &[u8], size: usize, f: fn(&[u8]) -> Option<Border>) {
+    let get = |i: usize| v.get(i * size..(i + 1) * size).and_then(f);
+    t.borders.top = get(0);
+    t.borders.left = get(1);
+    t.borders.bottom = get(2);
+    t.borders.right = get(3);
+    t.borders.inside_h = get(4);
+    t.borders.inside_v = get(5);
+}
+
+fn apply(t: &mut Tap, p: &Prl) {
+    match p.op {
+        0xD608 => {
+            let v = p.var();
+            let n = usize::from(v.first().copied().unwrap_or(0)).min(63);
+            t.edges = (0..=n)
+                .map(|i| i32::from(u16_at(v, 1 + 2 * i) as i16))
+                .collect();
+            let base = 1 + 2 * (n + 1);
+            t.tcs = (0..n)
+                .map(|i| {
+                    let s = base + 20 * i;
+                    match v.get(s..s + 20) {
+                        Some(b) => tc80(b),
+                        None => Tc::default(),
+                    }
+                })
+                .collect();
+        }
+        0xD605 => tbl_borders(t, p.var(), 4, brc80),
+        0xD613 => tbl_borders(t, p.var(), 8, brc),
+        0xD609 | 0xD612 | 0xD616 | 0xD60C | 0xD670 | 0xD671 | 0xD672 => {
+            let start = match p.op {
+                0xD616 | 0xD671 => 22,
+                0xD60C | 0xD672 => 44,
+                _ => 0,
+            };
+            let v = p.var();
+            let size = if p.op == 0xD609 { 2 } else { 10 };
+            for (k, c) in v.chunks_exact(size).enumerate() {
+                let sh = if size == 2 {
+                    shd80(u16_at(c, 0))
+                } else {
+                    shd(c)
+                };
+                if let Some(tc) = t.tcs.get_mut(start + k) {
+                    tc.shading = sh;
+                }
+            }
+        }
+        0xD62D | 0xD62E => {
+            let v = p.var();
+            if let [a, b, rest @ ..] = v {
+                let sh = shd(rest);
+                itc(t, usize::from(*a), usize::from(*b), |c| {
+                    c.shading = sh.clone()
+                });
+            }
+        }
+        0xD62F => {
+            let v = p.var();
+            if let [a, b, which, rest @ ..] = v {
+                let bd = brc(rest);
+                let nil = rest.len() >= 8 && rest[4..8] == [0xFF; 4];
+                let (which, bd2) = (*which, bd.clone());
+                itc(t, usize::from(*a), usize::from(*b), |c| {
+                    apply_brcs(c, which, bd2.clone(), nil)
+                });
+                border_set(t, which, bd);
+            }
+        }
+        0xD620 => {
+            let v = p.var();
+            if let [a, b, which, rest @ ..] = v {
+                let bd = brc80(rest);
+                let nil = rest.len() >= 4 && rest[..4] == [0xFF; 4];
+                let (which, bd2) = (*which, bd.clone());
+                itc(t, usize::from(*a), usize::from(*b), |c| {
+                    apply_brcs(c, which, bd2.clone(), nil)
+                });
+                border_set(t, which, bd);
+            }
+        }
+        0xD62B => {
+            if let [i, f, ..] = p.var() {
+                let f = *f;
+                itc(t, usize::from(*i), usize::from(*i) + 1, |c| c.merge_v = f);
+            }
+        }
+        0xD62C => {
+            if let [a, b, va, ..] = p.var() {
+                let va = *va;
+                itc(t, usize::from(*a), usize::from(*b), |c| c.v_align = va);
+            }
+        }
+        0xD635 => {
+            if let [a, b, f, w0, w1, ..] = p.var() {
+                let w = fts(*f, u16::from_le_bytes([*w0, *w1]));
+                itc(t, usize::from(*a), usize::from(*b), |c| c.width = w);
+            }
+        }
+        0xD639 => {
+            if let [a, b, ..] = p.var() {
+                itc(t, usize::from(*a), usize::from(*b), |c| c.no_wrap = true);
+            }
+        }
+        0xD632 | 0xD634 => {
+            if let [a, b, grf, _f, w0, w1, ..] = p.var() {
+                let w = i32::from(u16::from_le_bytes([*w0, *w1]));
+                if p.op == 0xD634 {
+                    margins_of(*grf, w, &mut t.margins);
+                } else {
+                    let grf = *grf;
+                    itc(t, usize::from(*a), usize::from(*b), |c| {
+                        margins_of(grf, w, &mut c.margins)
+                    });
+                }
+            }
+        }
+        0xD633 => {
+            if let [_, _, _, _, w0, w1, ..] = p.var() {
+                t.spacing = Some(i32::from(u16::from_le_bytes([*w0, *w1])));
+            }
+        }
+        0x9407 => {
+            let v = i32::from(p.i16());
+            t.height = (v != 0).then_some(v);
+        }
+        0x3404 => t.header = p.u8() & 1 != 0,
+        0x3403 | 0x3466 => t.cant_split = p.u8() & 1 != 0,
+        0x5400 | 0x548A => {
+            t.jc = Some(match p.u16() {
+                1 => Jc::Center,
+                2 => Jc::Right,
+                _ => Jc::Left,
+            })
+        }
+        0x9601 => t.left = Some(i32::from(p.i16())),
+        0x9602 => t.gap_half = Some(i32::from(p.i16())),
+        0xF614 => {
+            if let [f, w0, w1, ..] = p.val {
+                t.width = fts(*f, u16::from_le_bytes([*w0, *w1]));
+            }
+        }
+        0xF617 => {
+            if let [f, w0, w1, ..] = p.val {
+                t.width_before = fts(*f, u16::from_le_bytes([*w0, *w1]));
+            }
+        }
+        0xF618 => {
+            if let [f, w0, w1, ..] = p.val {
+                t.width_after = fts(*f, u16::from_le_bytes([*w0, *w1]));
+            }
+        }
+        0x560B | 0x5664 => t.bidi = p.u16() & 1 != 0,
+        0x563A => t.style = Some(p.u16()),
+        0x7621 => {
+            // sprmTInsert: itcFirst, ctc, dxaCol.
+            let mut c = Cur::new(p.val);
+            let first = usize::from(c.u8());
+            let n = usize::from(c.u8());
+            let dxa = i32::from(c.u16());
+            if first <= t.tcs.len() && n > 0 && t.tcs.len() + n <= 63 {
+                if t.edges.is_empty() {
+                    t.edges.push(0);
+                }
+                for k in 0..n {
+                    t.tcs.insert(first + k, Tc::default());
+                }
+                // Shift the edges after the inserted cells.
+                let at = first.min(t.edges.len() - 1);
+                let base = t.edges[at];
+                for e in t.edges.iter_mut().skip(at + 1) {
+                    *e += dxa * n as i32;
+                }
+                for k in 0..n {
+                    t.edges.insert(at + 1 + k, base + dxa * (k as i32 + 1));
+                }
+                t.edges.truncate(t.tcs.len() + 1);
+            }
+        }
+        0x5622 => {
+            if let [a, b, ..] = p.val {
+                let (a, b) = (usize::from(*a), usize::from(*b).min(t.tcs.len()));
+                if a < b && b - a < t.tcs.len() {
+                    let w: i32 =
+                        t.edges.get(b).copied().unwrap_or(0) - t.edges.get(a).copied().unwrap_or(0);
+                    t.tcs.drain(a..b);
+                    if a < t.edges.len() {
+                        t.edges.drain(a + 1..(b + 1).min(t.edges.len()));
+                        for e in t.edges.iter_mut().skip(a + 1) {
+                            *e -= w;
+                        }
+                    }
+                }
+            }
+        }
+        0x7623 => {
+            if let [a, b, w0, w1, ..] = p.val {
+                let w = i32::from(u16::from_le_bytes([*w0, *w1]));
+                let (a, b) = (usize::from(*a), usize::from(*b).min(t.tcs.len()));
+                for i in a..b {
+                    if i + 1 < t.edges.len() {
+                        let delta = (t.edges[i] + w) - t.edges[i + 1];
+                        for e in t.edges.iter_mut().skip(i + 1) {
+                            *e += delta;
+                        }
+                    }
+                }
+            }
+        }
+        0x5624 => {
+            if let [a, b, ..] = p.val {
+                let (a, b) = (usize::from(*a), usize::from(*b).min(t.tcs.len()));
+                for i in a..b {
+                    t.tcs[i].merge_h = if i == a { 2 } else { 1 };
+                }
+            }
+        }
+        0x5625 => {
+            if let [a, b, ..] = p.val {
+                let (a, b) = (usize::from(*a), usize::from(*b).min(t.tcs.len()));
+                for i in a..b {
+                    t.tcs[i].merge_h = 0;
+                }
+            }
+        }
+        0xD60A | 0xD62A => {}
+        _ => {
+            let _ = colorref;
+        }
+    }
+}
+
+/// A table from its rows: the cell edges of every row make up the grid; a
+/// cell spans the grid columns between its edges.
+pub fn build(rows: Vec<(Tap, Vec<Vec<Block>>)>) -> Table {
+    let mut props = TableProps::default();
+    if let Some((t, _)) = rows.first() {
+        let gap = t.gap_half.unwrap_or(108);
+        props.cell_margins = Margins {
+            top: None,
+            left: Some(gap),
+            bottom: None,
+            right: Some(gap),
+        };
+        props.borders = t.borders.clone();
+        props.jc = t.jc;
+        props.bidi = t.bidi;
+        props.cell_spacing = t.spacing.filter(|s| *s > 0);
+        props.indent = Some(t.edges.first().copied().unwrap_or(0) + gap);
+        props.width = t.width.filter(|w| *w != Width::Auto);
+    }
+    let mut rows_in = vec![];
+    for (tap, contents) in rows {
+        let mut row = RowIn {
+            edges: tap.edges.clone(),
+            props: RowProps::default(),
+            cells: vec![],
+        };
+        row.props.height = tap.height.map(i32::abs);
+        row.props.height_exact = tap.height.is_some_and(|h| h < 0);
+        row.props.header = tap.header;
+        row.props.cant_split = tap.cant_split;
+        let n = tap.tcs.len().min(tap.edges.len().saturating_sub(1));
+        let mut contents = contents.into_iter();
+        for k in 0..n {
+            let tc = &tap.tcs[k];
+            let content = contents.next().unwrap_or_default();
+            let mut cp = CellProps {
+                v_merge: match tc.merge_v {
+                    3 => VMerge::Restart,
+                    1 => VMerge::Continue,
+                    _ => VMerge::None,
+                },
+                shading: tc.shading.clone(),
+                v_align: match tc.v_align {
+                    1 => Some(VAlign::Center),
+                    2 => Some(VAlign::Bottom),
+                    _ => None,
+                },
+                no_wrap: tc.no_wrap,
+                fit_text: tc.fit_text,
+                margins: tc.margins.clone(),
+                ..CellProps::default()
+            };
+            cp.text_direction = match tc.text_flow {
+                1 => Some("tbRl"),
+                3 => Some("btLr"),
+                _ => None,
+            };
+            for (slot, b) in [
+                (&mut cp.borders.top, &tc.borders[0]),
+                (&mut cp.borders.left, &tc.borders[1]),
+                (&mut cp.borders.bottom, &tc.borders[2]),
+                (&mut cp.borders.right, &tc.borders[3]),
+            ] {
+                *slot = match b {
+                    None => None,
+                    Some(Some(b)) => Some(b.clone()),
+                    Some(None) => Some(Border {
+                        style: "nil",
+                        size: 0,
+                        space: 0,
+                        color: Color::Auto,
+                        shadow: false,
+                    }),
+                };
+            }
+            row.cells.push(CellIn {
+                props: cp,
+                content,
+                merged_left: tc.merge_h == 1,
+            });
+        }
+        // Content past the cells goes into the last one.
+        let extra: Vec<Vec<Block>> = contents.collect();
+        if let Some(last) = row.cells.last_mut() {
+            for e in extra {
+                last.content.extend(e);
+            }
+        }
+        rows_in.push(row);
+    }
+    grid::build(rows_in, props)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn def_table(edges: &[i16], tcs: &[[u8; 20]]) -> Vec<u8> {
+        let n = edges.len() - 1;
+        let mut body = vec![n as u8];
+        for e in edges {
+            body.extend_from_slice(&e.to_le_bytes());
+        }
+        for t in tcs {
+            body.extend_from_slice(t);
+        }
+        let mut g = vec![0x08, 0xD6];
+        g.extend_from_slice(&((body.len() + 1) as u16).to_le_bytes());
+        g.extend_from_slice(&body);
+        g
+    }
+
+    #[test]
+    fn cell_edges_and_merges() {
+        let mut first = [0u8; 20];
+        first[0] = 2; // first of a merged set
+        let mut second = [0u8; 20];
+        second[0] = 1;
+        let g = def_table(&[0, 1000, 2000, 3000], &[first, second, [0; 20]]);
+        let t = parse_tap(&g);
+        assert_eq!(t.edges, vec![0, 1000, 2000, 3000]);
+        assert_eq!(t.tcs.len(), 3);
+        assert_eq!((t.tcs[0].merge_h, t.tcs[1].merge_h), (2, 1));
+    }
+
+    #[test]
+    fn shading_in_the_two_byte_form() {
+        let mut g = def_table(&[0, 1000, 2000], &[[0; 20], [0; 20]]);
+        // sprmTDefTableShd80: the first cell none, the second a yellow
+        // background (colour 8 is white over 7, yellow, with no pattern).
+        g.extend_from_slice(&[0x09, 0xD6, 4, 0xFF, 0xFF, 0x08 | 7 << 5, 0]);
+        let t = parse_tap(&g);
+        assert!(t.tcs[0].shading.is_none());
+        let s = t.tcs[1].shading.as_ref().unwrap();
+        assert_eq!(s.fill, Some(Color::Rgb(0xFFFF00)));
+    }
+
+    #[test]
+    fn row_height_header_and_shading() {
+        let mut g = def_table(&[0, 1000, 2000], &[[0; 20], [0; 20]]);
+        // exact 300 (negative), header row, shading of the second cell.
+        g.extend_from_slice(&[0x07, 0x94, 0xD4, 0xFE, 0x04, 0x34, 1]);
+        g.extend_from_slice(&[0x12, 0xD6, 20]);
+        // The first cell has no shading (automatic colours, no pattern); the
+        // second a solid pattern of red.
+        g.extend_from_slice(&[0, 0, 0, 0xFF, 0, 0, 0, 0xFF, 0, 0]);
+        g.extend_from_slice(&[0xFF, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0, 1, 0]);
+        let t = parse_tap(&g);
+        assert_eq!(t.height, Some(-300));
+        assert!(t.header);
+        assert!(t.tcs[0].shading.is_none());
+        assert!(t.tcs[1].shading.is_some());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/doc/word6.rs b/crates/exav-render/src/formats/office/docs/doc/word6.rs
new file mode 100644
index 00000000..fc0c3318
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/doc/word6.rs
@@ -0,0 +1,1378 @@
+//! Word 6 and Word 95 documents (nFib 101 and 104): the compound file of
+//! Word 97, but with one `WordDocument` stream that holds the tables too,
+//! 8-bit text, one-byte modifier opcodes and FKP entries of other sizes. The
+//! modifiers are translated to Word 97's here, so that the rest of the reader
+//! knows nothing of the old form.
+
+use super::fib::{self, Clx, Fib, Piece};
+use super::props::ico;
+use super::styles::{Std, Stsh};
+use super::{Reader, Run, SectionSpan, read_plc};
+use crate::formats::office::common::bytes::{u16_at, u32_at};
+use crate::formats::office::common::image;
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+
+/// Positions of the (fc, lcb) pairs in the FIB.
+mod at {
+    pub const STSHF: usize = 96;
+    pub const FND_REF: usize = 104;
+    pub const FND_TXT: usize = 112;
+    pub const SED: usize = 136;
+    pub const HDD: usize = 176;
+    pub const BTE_CHPX: usize = 184;
+    pub const BTE_PAPX: usize = 192;
+    pub const FFN: usize = 208;
+    pub const BKMK: usize = 256;
+    pub const BKF: usize = 264;
+    pub const BKL: usize = 272;
+    pub const DOP: usize = 336;
+    pub const CLX: usize = 352;
+    pub const END_REF: usize = 466;
+    pub const END_TXT: usize = 474;
+}
+
+/// The (offset, size) of a structure of the main stream, by its place in the FIB.
+fn pair(wd: &[u8], pos: usize) -> (usize, usize) {
+    (u32_at(wd, pos) as usize, u32_at(wd, pos + 4) as usize)
+}
+
+fn part(wd: &[u8], pos: usize) -> &[u8] {
+    let (o, l) = pair(wd, pos);
+    wd.get(o..o.saturating_add(l).min(wd.len())).unwrap_or(&[])
+}
+
+/// How a modifier's operand is sized.
+enum Size {
+    /// This many bytes.
+    Fixed(usize),
+    /// A length byte, then that many.
+    Counted,
+    /// Two bytes of length (the operand's size plus one), then the operand.
+    Long,
+}
+
+fn size(op: u8) -> Option<Size> {
+    use Size::*;
+    Some(match op {
+        4..=11
+        | 13
+        | 14
+        | 24
+        | 25
+        | 29
+        | 37
+        | 44
+        | 50
+        | 51
+        | 65
+        | 66
+        | 67
+        | 71
+        | 75
+        | 85..=92
+        | 94
+        | 98..=102
+        | 104
+        | 117..=119
+        | 131
+        | 132
+        | 138
+        | 139
+        | 142
+        | 143
+        | 146
+        | 147
+        | 150..=153
+        | 158
+        | 159
+        | 162
+        | 185
+        | 186 => Fixed(1),
+        2
+        | 16..=19
+        | 21
+        | 22
+        | 26..=28
+        | 30..=36
+        | 38..=43
+        | 45..=49
+        | 69
+        | 72
+        | 80
+        | 93
+        | 96
+        | 97
+        | 107
+        | 109
+        | 110
+        | 121..=124
+        | 140
+        | 141
+        | 144
+        | 145
+        | 148
+        | 149
+        | 154..=157
+        | 160
+        | 161
+        | 164..=171
+        | 182..=184
+        | 189
+        | 195
+        | 197
+        | 198 => Fixed(2),
+        73 | 95 | 136 | 137 => Fixed(3),
+        20 | 70 | 192 | 194 | 196 | 200 => Fixed(4),
+        193 | 199 => Fixed(5),
+        187 => Fixed(12),
+        83 => Fixed(0),
+        3 | 12 | 15 | 23 | 52 | 68 | 74 | 81 | 82 | 103 | 105 | 106 | 108 | 120 | 133 | 163 => {
+            Counted
+        }
+        188 | 190 | 191 => Long,
+        _ => return None,
+    })
+}
+
+fn put1(o: &mut Vec<u8>, op: u16, v: u8) {
+    o.extend_from_slice(&op.to_le_bytes());
+    o.push(v);
+}
+
+fn put2(o: &mut Vec<u8>, op: u16, v: u16) {
+    o.extend_from_slice(&op.to_le_bytes());
+    o.extend_from_slice(&v.to_le_bytes());
+}
+
+fn put4(o: &mut Vec<u8>, op: u16, v: &[u8]) {
+    o.extend_from_slice(&op.to_le_bytes());
+    o.extend_from_slice(v);
+}
+
+fn put_var(o: &mut Vec<u8>, op: u16, v: &[u8]) {
+    o.extend_from_slice(&op.to_le_bytes());
+    o.push(v.len().min(255) as u8);
+    o.extend_from_slice(&v[..v.len().min(255)]);
+}
+
+/// A Word 6 border (a word) as Word 97's Brc80: line width in eighths of a
+/// point, type, colour, space and shadow.
+fn brc(w: u16) -> [u8; 4] {
+    let units = (w & 7) as u8;
+    let kind = ((w >> 3) & 3) as u8;
+    let shadow = (w >> 5) & 1;
+    let color = ((w >> 6) & 0x1F) as u8;
+    let space = ((w >> 11) & 0x1F) as u8;
+    if kind == 0 {
+        return [0, 0, 0, 0];
+    }
+    // 0.75 point units; 6 and 7 are dotted and dashed lines.
+    let (width, style) = match units {
+        6 => (6, 6),
+        7 => (6, 7),
+        u => (
+            (u.max(1) * 6).saturating_mul(if kind == 2 { 2 } else { 1 }),
+            if kind == 3 { 3 } else { 1 },
+        ),
+    };
+    [width, style, color, space | (shadow as u8) << 5]
+}
+
+/// The key of an autonumber, for lists.
+const ANLD_LEN: usize = 52;
+
+/// Translates a Word 6 modifier list to Word 97's. Autonumber descriptors
+/// are collected in `anlds`; a paragraph gets the list of its descriptor.
+pub(super) fn translate(g: &[u8], anlds: &mut Vec<Vec<u8>>) -> Vec<u8> {
+    let mut out = vec![];
+    let mut p = 0usize;
+    while p < g.len() {
+        let op = g[p];
+        let Some(sz) = size(op) else { break };
+        let (b0, n, cb): (usize, usize, u8) = match sz {
+            Size::Fixed(n) => (p + 1, n, 0),
+            Size::Counted => {
+                let Some(&c) = g.get(p + 1) else { break };
+                if op == 23 && c == 255 {
+                    // The tabs to delete and to add give the size.
+                    let del = usize::from(g.get(p + 2).copied().unwrap_or(0));
+                    let add = usize::from(g.get(p + 3 + 4 * del).copied().unwrap_or(0));
+                    (p + 2, 2 + 4 * del + 3 * add, 255)
+                } else {
+                    (p + 2, usize::from(c), c)
+                }
+            }
+            Size::Long => {
+                let len = usize::from(u16_at(g, p + 1));
+                (p + 3, len.saturating_sub(1), 0)
+            }
+        };
+        let Some(b) = g.get(b0..b0 + n) else { break };
+        p = b0 + n;
+        modifier(op, b, cb, &mut out, anlds);
+    }
+    out
+}
+
+fn modifier(op: u8, b: &[u8], cb: u8, o: &mut Vec<u8>, anlds: &mut Vec<Vec<u8>>) {
+    let w = || u16_at(b, 0);
+    let b0 = b.first().copied().unwrap_or(0);
+    match op {
+        // ---- paragraphs ----
+        2 => put2(o, 0x4600, w()),
+        5 => put1(o, 0x2403, b0),
+        7 => put1(o, 0x2405, b0),
+        8 => put1(o, 0x2406, b0),
+        9 => put1(o, 0x2407, b0),
+        12 => {
+            if b.len() >= ANLD_LEN {
+                let key = b[..ANLD_LEN].to_vec();
+                let at = anlds.iter().position(|a| *a == key).unwrap_or_else(|| {
+                    anlds.push(key);
+                    anlds.len() - 1
+                });
+                put2(o, 0x460B, at as u16 + 1);
+                put1(o, 0x260A, 0);
+            }
+        }
+        14 => put1(o, 0x240C, b0),
+        15 => put_var(o, 0xC60D, b),
+        16 => put2(o, 0x845D, w()),
+        17 => put2(o, 0x845E, w()),
+        19 => put2(o, 0x8460, w()),
+        20 => put4(o, 0x6412, b),
+        21 => put2(o, 0xA413, w()),
+        22 => put2(o, 0xA414, w()),
+        23 => {
+            o.extend_from_slice(&0xC615u16.to_le_bytes());
+            o.push(cb);
+            o.extend_from_slice(b);
+        }
+        24 => put1(o, 0x2416, b0),
+        25 => put1(o, 0x2417, b0),
+        38..=42 => put4(o, 0x6424 + u16::from(op - 38), &brc(w())),
+        47 => put2(o, 0x442D, w()),
+        51 => put1(o, 0x2431, b0),
+        // ---- characters ----
+        65 => put1(o, 0x0800, b0),
+        66 => put1(o, 0x0801, b0),
+        67 => put1(o, 0x0802, b0),
+        68 => {
+            put4(o, 0x6A03, b.get(..4).unwrap_or(&[0; 4]));
+            put1(o, 0x0855, 1);
+        }
+        71 => put1(o, 0x0806, b0),
+        74 => {
+            put4(
+                o,
+                0x6A09,
+                &[
+                    b0,
+                    b.get(1).copied().unwrap_or(0),
+                    b.get(2).copied().unwrap_or(0),
+                    0,
+                ],
+            );
+            put1(o, 0x0855, 1);
+        }
+        75 => put1(o, 0x080A, b0),
+        80 => put2(o, 0x4A30, w()),
+        82 | 83 => put1(o, 0x2A33, 0),
+        85..=92 => put1(o, 0x0835 + u16::from(op - 85), b0),
+        93 => {
+            put2(o, 0x4A4F, w());
+            put2(o, 0x4A51, w());
+        }
+        94 => put1(o, 0x2A3E, b0),
+        95 => {
+            if b0 != 0 {
+                put2(o, 0x4A43, u16::from(b0));
+            }
+            let pos = b.get(2).copied().unwrap_or(128);
+            if pos != 128 {
+                put2(o, 0x4845, i16::from(pos as i8) as u16);
+            }
+        }
+        96 => put2(o, 0x8840, w()),
+        98 => put1(o, 0x2A42, b0),
+        99 => put2(o, 0x4A43, u16::from(b0)),
+        101 => put2(o, 0x4845, i16::from(b0 as i8) as u16),
+        104 => put1(o, 0x2A48, b0),
+        105 => put2(o, 0x4A43, w()),
+        107 => put2(o, 0x484B, w()),
+        117 => put1(o, 0x0855, b0),
+        118 => put1(o, 0x0856, b0),
+        // ---- sections ----
+        136 => put4(o, 0xF203, b),
+        137 => put4(o, 0xF204, b),
+        142 => put1(o, 0x3009, b0),
+        143 => put1(o, 0x300A, b0),
+        144 => put2(o, 0x500B, w()),
+        145 => put2(o, 0x900C, w()),
+        147 => put1(o, 0x300E, b0),
+        150 => put1(o, 0x3011, b0),
+        154 => put2(o, 0x5015, w()),
+        155 => put2(o, 0x9016, w()),
+        156 => put2(o, 0xB017, w()),
+        157 => put2(o, 0xB018, w()),
+        158 => put1(o, 0x3019, b0),
+        159 => put1(o, 0x301A, b0),
+        160 => put2(o, 0x501B, w()),
+        161 => put2(o, 0x501C, w()),
+        162 => put1(o, 0x301D, b0),
+        164 => put2(o, 0xB01F, w()),
+        165 => put2(o, 0xB020, w()),
+        166 => put2(o, 0xB021, w()),
+        167 => put2(o, 0xB022, w()),
+        168 => put2(o, 0x9023, w()),
+        169 => put2(o, 0x9024, w()),
+        170 => put2(o, 0xB025, w()),
+        // ---- tables ----
+        182 => put2(o, 0x5400, w()),
+        183 => put2(o, 0x9601, w()),
+        184 => put2(o, 0x9602, w()),
+        185 => put1(o, 0x3403, b0),
+        186 => put1(o, 0x3404, b0),
+        187 => {
+            let mut v = vec![];
+            for k in 0..6 {
+                v.extend_from_slice(&brc(u16_at(b, 2 * k)));
+            }
+            put_var(o, 0xD605, &v);
+        }
+        189 => put2(o, 0x9407, w()),
+        190 => table_definition(b, o),
+        191 => {
+            let n = usize::from(b0);
+            let mut v = vec![];
+            for k in 0..n {
+                v.extend_from_slice(b.get(1 + 2 * k..3 + 2 * k).unwrap_or(&[0, 0]));
+            }
+            put_var(o, 0xD609, &v);
+        }
+        193 => {
+            let mut v = vec![
+                b0,
+                b.get(1).copied().unwrap_or(0),
+                b.get(2).copied().unwrap_or(0),
+            ];
+            v.extend_from_slice(&brc(u16_at(b, 3)));
+            put_var(o, 0xD620, &v);
+        }
+        194 => put4(o, 0x7621, b),
+        195 => put2(o, 0x5622, w()),
+        196 => put4(o, 0x7623, b),
+        197 => put2(o, 0x5624, w()),
+        198 => put2(o, 0x5625, w()),
+        200 => {
+            // A Shd80 over a range of cells, as the long form.
+            let (f, l) = (b0, b.get(1).copied().unwrap_or(0));
+            let s = u16_at(b, 2);
+            let color = |c: u8| match ico(c) {
+                Color::Rgb(v) => (v >> 16 & 0xFF, v >> 8 & 0xFF, v & 0xFF),
+                Color::Auto => (0xFF, 0xFF, 0xFF),
+            };
+            let (fr, fg, fb) = color((s & 0x1F) as u8);
+            let (br, bg, bb) = color(((s >> 5) & 0x1F) as u8);
+            let mut v = vec![
+                f, l, fr as u8, fg as u8, fb as u8, 0, br as u8, bg as u8, bb as u8, 0,
+            ];
+            v.extend_from_slice(&(s >> 10 & 0x3F).to_le_bytes());
+            put_var(o, 0xD62D, &v);
+        }
+        _ => {}
+    }
+}
+
+/// sprmTDefTable: the cell edges and each cell's flags and borders, as
+/// Word 97's TC80 of 20 bytes.
+fn table_definition(b: &[u8], o: &mut Vec<u8>) {
+    let n = usize::from(b.first().copied().unwrap_or(0)).min(32);
+    let mut v = vec![n as u8];
+    for k in 0..=n {
+        v.extend_from_slice(b.get(1 + 2 * k..3 + 2 * k).unwrap_or(&[0, 0]));
+    }
+    let base = 1 + 2 * (n + 1);
+    for k in 0..n {
+        let tc = b.get(base + 10 * k..base + 10 * k + 10).unwrap_or(&[0; 10]);
+        let rgf = u16_at(tc, 0);
+        // Merged with the cell before is 1, the first of a set 2.
+        let merge: u16 = if rgf & 1 != 0 {
+            2
+        } else if rgf & 2 != 0 {
+            1
+        } else {
+            0
+        };
+        v.extend_from_slice(&merge.to_le_bytes());
+        v.extend_from_slice(&[0, 0]);
+        for e in 0..4 {
+            v.extend_from_slice(&brc(u16_at(tc, 2 + 2 * e)));
+        }
+    }
+    o.extend_from_slice(&0xD608u16.to_le_bytes());
+    o.extend_from_slice(&(v.len() as u16 + 1).to_le_bytes());
+    o.extend_from_slice(&v);
+}
+
+/// The modifiers `g` (Word 6 form) as a list at the end of the main stream.
+struct Lists<'a> {
+    wd: &'a mut Vec<u8>,
+    b: &'a mut Budget,
+    anlds: Vec<Vec<u8>>,
+}
+
+impl Lists<'_> {
+    /// Translates `g` and keeps it, against the memory budget; `prefix`
+    /// leads it (a style code).
+    fn keep(&mut self, prefix: &[u8], g: &[u8]) -> Result<(u32, u16)> {
+        let mut v = prefix.to_vec();
+        v.extend(translate(g, &mut self.anlds));
+        let len = v.len().min(0xFFFF);
+        self.b.alloc(len as u64)?;
+        let off = self.wd.len();
+        self.wd.extend_from_slice(&v[..len]);
+        Ok((off as u32, len as u16))
+    }
+}
+
+pub(crate) fn read(wd: Vec<u8>, budget: &mut Budget) -> Result<Document> {
+    if wd.len() < 0x200 {
+        return Err(Error::Malformed(
+            "the WordDocument stream is too short".into(),
+        ));
+    }
+    let flags = u16_at(&wd, 10);
+    if flags & 0x0100 != 0 {
+        return Err(Error::Encrypted);
+    }
+    let lw = |o: usize| i64::from(u32_at(&wd, o) as i32).max(0);
+    let fib = Fib {
+        n_fib: u16_at(&wd, 2),
+        which_table: false,
+        encrypted: false,
+        ccp_text: lw(52),
+        ccp_ftn: lw(56),
+        ccp_hdd: lw(60),
+        ccp_atn: lw(68),
+        ccp_edn: lw(72),
+        ccp_txbx: lw(76),
+        ccp_hdr_txbx: lw(80),
+        pairs: vec![],
+    };
+    let fc_min = u32_at(&wd, 24);
+    let fc_mac = u32_at(&wd, 28);
+    let total_cp = (fib.total_cp() + lw(64)).max(fib.ccp_text);
+    budget.alloc(wd.len() as u64)?;
+    // The pieces: the whole text from fcMin, or the piece table of a file
+    // that was fast-saved.
+    let complex = flags & 0x0004 != 0;
+    let mut clx = Clx {
+        pieces: vec![],
+        prcs: vec![],
+    };
+    if complex {
+        clx = read_clx(&wd)?;
+    }
+    if clx.pieces.is_empty() {
+        let avail = i64::from(fc_mac.saturating_sub(fc_min));
+        let total = total_cp.min(avail).max(fib.ccp_text.min(avail)).max(1) as u32;
+        clx.pieces.push(Piece {
+            cp0: 0,
+            cp1: total,
+            fc: fc_min,
+            compressed: true,
+            prm: 0,
+        });
+    }
+    let last = clx.pieces.iter().map(|p| p.cp1 as usize).max().unwrap_or(1);
+    let total = usize::try_from(total_cp)
+        .unwrap_or(usize::MAX)
+        .min(last)
+        .max(fib.ccp_text.max(0) as usize)
+        .min(last.max(1));
+    if total > 1 << 28 {
+        return Err(Error::TooLarge("characters"));
+    }
+    budget.alloc(2 * total as u64)?;
+    let table = codepage(&wd).map(|cp| {
+        std::array::from_fn(|b| {
+            crate::formats::office::common::codepage::decode(&[b as u8], cp)
+                .encode_utf16()
+                .next()
+                .unwrap_or(0xFFFD)
+        })
+    });
+    let text = fib::read_text_in(&wd, &clx.pieces, total, table.as_ref());
+    // A modifier of a piece, or an index to a list of them, in Word 97's form.
+    let mut anlds = vec![];
+    let mut prcs: Vec<Vec<u8>> = vec![];
+    for g in &clx.prcs {
+        prcs.push(translate(g, &mut anlds));
+    }
+    for p in &mut clx.pieces {
+        if p.prm & 1 == 0 && p.prm != 0 {
+            // One modifier: its opcode (7 bits) and its operand byte.
+            let g = [((p.prm >> 1) & 0x7F) as u8, (p.prm >> 8) as u8];
+            prcs.push(translate(&g, &mut anlds));
+            p.prm = ((prcs.len() - 1) as u16) << 1 | 1;
+        }
+    }
+    clx.prcs = prcs;
+    let mut r = Reader::new(budget, wd, vec![], vec![], fib, clx, text);
+    r.word6 = true;
+    r.load6(anlds)?;
+    r.convert()?;
+    Ok(r.doc)
+}
+
+/// The Windows code page of a Word 6 or 95 document other than 1252, from
+/// the language in its header (the text is in the code page of the system
+/// that wrote it), or Mac Roman for a Macintosh one.
+fn codepage(wd: &[u8]) -> Option<u16> {
+    if u16_at(wd, 0x14) == 256 {
+        return Some(10000);
+    }
+    Some(match u16_at(wd, 6) & 0x3FF {
+        0x19 | 0x22 | 0x02 | 0x23 | 0x2F | 0x3F | 0x40 | 0x44 | 0x50 => 1251,
+        0x15 | 0x05 | 0x0E | 0x1B | 0x24 | 0x1A | 0x18 | 0x1C => 1250,
+        0x08 => 1253,
+        0x1F | 0x2C => 1254,
+        0x0D => 1255,
+        0x01 | 0x29 | 0x20 => 1256,
+        0x25..=0x27 => 1257,
+        0x2A => 1258,
+        0x1E => 874,
+        _ => return None,
+    })
+}
+
+/// The grpprls and the piece table of a fast-saved file: the length of each
+/// group is two bytes, that of the piece table four.
+fn read_clx(wd: &[u8]) -> Result<Clx> {
+    let d = part(wd, at::CLX);
+    let mut p = 0usize;
+    let mut prcs = vec![];
+    loop {
+        match d.get(p).copied() {
+            Some(1) => {
+                let n = usize::from(u16_at(d, p + 1));
+                prcs.push(d.get(p + 3..p + 3 + n).unwrap_or(&[]).to_vec());
+                p += 3 + n;
+                if prcs.len() > 1 << 15 {
+                    return Err(Error::Malformed("too many property modifier groups".into()));
+                }
+            }
+            Some(2) => {
+                // The piece table's length is four bytes, the groups' two.
+                let n = u32_at(d, p + 1) as usize;
+                let plc = d
+                    .get(p + 5..p.saturating_add(5).saturating_add(n))
+                    .unwrap_or(&[]);
+                let count = plc.len().saturating_sub(4) / 12;
+                let mut pieces = Vec::with_capacity(count);
+                for i in 0..count {
+                    let (cp0, cp1) = (u32_at(plc, 4 * i), u32_at(plc, 4 * (i + 1)));
+                    if cp1 < cp0 {
+                        return Err(Error::Malformed("pieces out of order".into()));
+                    }
+                    let pcd = 4 * (count + 1) + 8 * i;
+                    pieces.push(Piece {
+                        cp0,
+                        cp1,
+                        fc: u32_at(plc, pcd + 2),
+                        compressed: true,
+                        prm: u16_at(plc, pcd + 6),
+                    });
+                }
+                return Ok(Clx { pieces, prcs });
+            }
+            _ => return Err(Error::Malformed("no piece table in the file".into())),
+        }
+    }
+}
+
+impl Reader<'_> {
+    pub(crate) fn load6(&mut self, anlds: Vec<Vec<u8>>) -> Result<()> {
+        let mut lists = Lists {
+            wd: &mut self.wd,
+            b: &mut *self.b,
+            anlds,
+        };
+        let (fonts, stsh) = (read_fonts(lists.wd), read_styles(&mut lists)?);
+        let (chpx, papx) = (
+            read_fkps(&mut lists, at::BTE_CHPX, false)?,
+            read_fkps(&mut lists, at::BTE_PAPX, true)?,
+        );
+        let sections = read_sections(&mut lists)?;
+        let anlds = std::mem::take(&mut lists.anlds);
+        self.fonts = fonts;
+        self.stsh = stsh;
+        self.chpx = chpx;
+        self.papx = papx;
+        let (heads, ihdt) = (sections.0, sections.1);
+        self.sections = heads;
+        self.read_dop6();
+        self.read_notes6();
+        self.read_bookmarks6();
+        self.hdd = story_table(&self.wd, &ihdt);
+        self.doc.numbering = numbering(&anlds, &self.fonts);
+        Ok(())
+    }
+
+    fn read_dop6(&mut self) {
+        let d = part(&self.wd, at::DOP);
+        if d.len() < 12 {
+            return;
+        }
+        self.facing = d[0] & 1 != 0;
+        self.doc.settings.even_and_odd_headers = self.facing;
+        let tab = i32::from(u16_at(d, 10));
+        if tab > 0 {
+            self.doc.settings.default_tab_stop = Some(tab);
+        }
+    }
+
+    fn read_notes6(&mut self) {
+        let base_ftn = self.fib.ccp_text as u32;
+        let (o, l) = pair(&self.wd, at::FND_REF);
+        self.ftn_ref = read_plc(&self.wd, o, l, 2).cps;
+        self.ftn_ref.pop();
+        let (o, l) = pair(&self.wd, at::FND_TXT);
+        self.ftn_txt = read_plc(&self.wd, o, l, 0)
+            .cps
+            .iter()
+            .map(|c| c.saturating_add(base_ftn))
+            .collect();
+        let f = &self.fib;
+        // The macro story (ccpMcr) sits between the headers and the annotations.
+        let mcr = i64::from(u32_at(&self.wd, 64));
+        let base_edn = fib::cp(f.ccp_text + f.ccp_ftn + f.ccp_hdd + mcr + f.ccp_atn);
+        let (o, l) = pair(&self.wd, at::END_REF);
+        self.edn_ref = read_plc(&self.wd, o, l, 2).cps;
+        self.edn_ref.pop();
+        let (o, l) = pair(&self.wd, at::END_TXT);
+        self.edn_txt = read_plc(&self.wd, o, l, 0)
+            .cps
+            .iter()
+            .map(|c| c.saturating_add(base_edn))
+            .collect();
+    }
+
+    fn read_bookmarks6(&mut self) {
+        let d = part(&self.wd, at::BKMK);
+        let mut p = 2usize;
+        while p < d.len() && self.bookmark_names.len() < 1 << 16 {
+            let n = usize::from(d[p]);
+            let s = d.get(p + 1..p + 1 + n).unwrap_or(&[]);
+            self.bookmark_names
+                .push(s.iter().map(|&c| char::from(c)).collect());
+            p += 1 + n;
+        }
+        let (o, l) = pair(&self.wd, at::BKF);
+        let bkf = read_plc(&self.wd, o, l, 4);
+        let (o, l) = pair(&self.wd, at::BKL);
+        let bkl = read_plc(&self.wd, o, l, 0);
+        for (i, d) in bkf.data.iter().enumerate() {
+            let Some(name) = self.bookmark_names.get(i) else {
+                continue;
+            };
+            if name.starts_with('_') && !name.starts_with("_Toc") && !name.starts_with("_Ref") {
+                continue;
+            }
+            let ibkl = usize::from(u16_at(d, 0));
+            let (Some(&start), Some(&end)) = (bkf.cps.get(i), bkl.cps.get(ibkl)) else {
+                continue;
+            };
+            self.marks.push((start, 0, i as u32));
+            self.marks.push((end.max(start), 1, i as u32));
+        }
+        self.marks.sort_by_key(|m| (m.0, m.1));
+    }
+
+    /// A picture character's picture: a metafile after its PIC, in the main
+    /// stream.
+    pub(crate) fn word6_picture(&mut self, loc: i32) -> Result<Option<Drawing>> {
+        let at = loc as usize;
+        if loc < 0 || at + 58 > self.wd.len() {
+            return Ok(None);
+        }
+        let lcb = u32_at(&self.wd, at) as usize;
+        let cb_header = usize::from(u16_at(&self.wd, at + 4));
+        let mm = u16_at(&self.wd, at + 6);
+        if cb_header < 58 || lcb < cb_header || mm == 98 || mm == 99 {
+            // A TIFF file's name, or a device bitmap.
+            return Ok(None);
+        }
+        let (gx, gy) = (
+            i64::from(u16_at(&self.wd, at + 28)),
+            i64::from(u16_at(&self.wd, at + 30)),
+        );
+        let (mx, my) = (
+            i64::from(u16_at(&self.wd, at + 32)),
+            i64::from(u16_at(&self.wd, at + 34)),
+        );
+        let end = at.saturating_add(lcb).min(self.wd.len());
+        let Some(body) = self.wd.get(at + cb_header..end) else {
+            return Ok(None);
+        };
+        if body.len() < 18 {
+            return Ok(None);
+        }
+        let data = placeable(body, gx, gy);
+        self.b.alloc(data.len() as u64)?;
+        let media = self.doc.add_media("wmf", data);
+        let (mut cx, mut cy) = (gx * mx / 1000 * TWIP_EMU, gy * my / 1000 * TWIP_EMU);
+        if cx <= 0 || cy <= 0 {
+            let (nx, ny) =
+                image::natural_emu(&self.doc.media[media].data).unwrap_or((914_400, 914_400));
+            cx = nx;
+            cy = ny;
+        }
+        Ok(Some(Drawing {
+            anchor: None,
+            cx,
+            cy,
+            name: "Picture".into(),
+            descr: None,
+            kind: DrawingKind::Picture {
+                media,
+                crop: Crop::default(),
+            },
+        }))
+    }
+}
+
+/// EMU in a twip.
+const TWIP_EMU: i64 = 635;
+
+/// A metafile with the header that says its size, from twips.
+fn placeable(wmf: &[u8], gx: i64, gy: i64) -> Vec<u8> {
+    if wmf.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A]) {
+        return wmf.to_vec();
+    }
+    let mut h = vec![0xD7, 0xCD, 0xC6, 0x9A, 0, 0];
+    for v in [0i64, 0, gx.clamp(1, 32767), gy.clamp(1, 32767)] {
+        h.extend_from_slice(&(v as i16).to_le_bytes());
+    }
+    h.extend_from_slice(&1440u16.to_le_bytes());
+    h.extend_from_slice(&[0, 0, 0, 0]);
+    let mut sum = 0u16;
+    for k in 0..10 {
+        sum ^= u16::from_le_bytes([h[2 * k], h[2 * k + 1]]);
+    }
+    h.extend_from_slice(&sum.to_le_bytes());
+    h.extend_from_slice(wmf);
+    h
+}
+
+/// The font names: a size, then FFNs (a length, flags, weight, character
+/// set, the name from byte 6).
+fn read_fonts(wd: &[u8]) -> Vec<String> {
+    let d = part(wd, at::FFN);
+    let mut out = vec![];
+    let mut p = 2usize;
+    while p < d.len() && out.len() < 4096 {
+        let cb = usize::from(d[p]);
+        let ffn = d.get(p + 1..p + 1 + cb).unwrap_or(&[]);
+        let name = ffn.get(5..).unwrap_or(&[]);
+        let end = name.iter().position(|&c| c == 0).unwrap_or(name.len());
+        out.push(name[..end].iter().map(|&c| char::from(c)).collect());
+        p += 1 + cb;
+    }
+    out
+}
+
+fn read_styles(l: &mut Lists) -> Result<Stsh> {
+    let mut out = Stsh::default();
+    let d = part(l.wd, at::STSHF).to_vec();
+    let cb_stshi = usize::from(u16_at(&d, 0));
+    let Some(stshi) = d.get(2..2 + cb_stshi) else {
+        return Ok(out);
+    };
+    if stshi.len() < 12 {
+        return Ok(out);
+    }
+    let cstd = usize::from(u16_at(stshi, 0));
+    let cb_base = usize::from(u16_at(stshi, 2));
+    out.ftc_ascii = u16_at(stshi, 12) as i16;
+    out.ftc_other = out.ftc_ascii;
+    out.ftc_fe = out.ftc_ascii;
+    let mut p = 2 + cb_stshi;
+    for _ in 0..cstd.min(4096) {
+        let cb = usize::from(u16_at(&d, p));
+        if p + 2 > d.len() {
+            break;
+        }
+        let std = d.get(p + 2..p + 2 + cb).unwrap_or(&[]);
+        p += 2 + cb + (cb & 1);
+        if cb == 0 {
+            out.stds.push(None);
+            continue;
+        }
+        out.stds.push(read_std(std, cb_base, l));
+    }
+    Ok(out)
+}
+
+fn read_std(d: &[u8], cb_base: usize, l: &mut Lists) -> Option<Std> {
+    if cb_base < 8 || d.len() < cb_base + 1 {
+        return None;
+    }
+    let w0 = u16_at(d, 0);
+    let w1 = u16_at(d, 2);
+    let w2 = u16_at(d, 4);
+    let sti = w0 & 0x0FFF;
+    let kind = ((w0 >> 12) & 0xF) as u8;
+    let base = w1 & 0x0FFF;
+    let cupx = usize::from(w1 >> 12);
+    let next = w2 & 0x0FFF;
+    // The name, a counted string, then each part on an even offset.
+    let n = usize::from(d[cb_base]);
+    let name: String = d
+        .get(cb_base + 1..cb_base + 1 + n)
+        .unwrap_or(&[])
+        .iter()
+        .map(|&c| char::from(c))
+        .collect();
+    let mut p = cb_base + 1 + n + 1;
+    p += p & 1;
+    let mut upx: Vec<&[u8]> = vec![];
+    for _ in 0..cupx {
+        if p + 2 > d.len() {
+            break;
+        }
+        let cb = usize::from(u16_at(d, p));
+        upx.push(d.get(p + 2..p + 2 + cb).unwrap_or(&[]));
+        p += 2 + cb + (cb & 1);
+    }
+    let mut keep = |prefix: &[u8], g: &[u8]| {
+        let mut v = prefix.to_vec();
+        v.extend(translate(g, &mut l.anlds));
+        v
+    };
+    let (papx, chpx) = match kind {
+        1 => {
+            let u = upx.first().copied().unwrap_or(&[]);
+            let istd = u.get(..2).unwrap_or(&[0, 0]).to_vec();
+            (
+                keep(&istd, u.get(2..).unwrap_or(&[])),
+                keep(&[], upx.get(1).copied().unwrap_or(&[])),
+            )
+        }
+        2 => (vec![], keep(&[], upx.first().copied().unwrap_or(&[]))),
+        _ => return None,
+    };
+    Some(Std {
+        name,
+        sti,
+        kind,
+        base,
+        next,
+        link: 0,
+        papx,
+        chpx,
+    })
+}
+
+/// The runs of the character or paragraph FKPs, their modifier lists
+/// translated and kept.
+fn read_fkps(l: &mut Lists, pos: usize, para: bool) -> Result<Vec<Run>> {
+    let (o, len) = pair(l.wd, pos);
+    let plc = read_plc(l.wd, o, len, 2);
+    let mut runs = vec![];
+    // A page the bin table names twice is read once, and a modifier list
+    // several runs share is kept once: neither is more memory than the file.
+    let mut seen = std::collections::HashSet::new();
+    for d in &plc.data {
+        let base = usize::from(u16_at(d, 0)) * 512;
+        if !seen.insert(base) {
+            continue;
+        }
+        let page = match l.wd.get(base..base + 512) {
+            Some(p) => p.to_vec(),
+            None => continue,
+        };
+        let mut kept: std::collections::HashMap<usize, (u32, u16)> =
+            std::collections::HashMap::new();
+        let n = usize::from(page[511]);
+        let entry = if para { 7 } else { 1 };
+        if n == 0 || 4 * (n + 1) + entry * n > 511 {
+            continue;
+        }
+        for k in 0..n {
+            let (lo, hi) = (u32_at(&page, 4 * k), u32_at(&page, 4 * (k + 1)));
+            let at = usize::from(page[4 * (n + 1) + entry * k]) * 2;
+            let (off, len) = if at == 0 || at >= 511 {
+                (0, 0)
+            } else if let Some(&k) = kept.get(&at) {
+                k
+            } else {
+                let k = if para {
+                    // Words, the style code, then the modifiers.
+                    let cw = usize::from(page[at]);
+                    let g = page.get(at + 3..(at + 2 * cw).min(511)).unwrap_or(&[]);
+                    let istd = page.get(at + 1..at + 3).unwrap_or(&[0, 0]);
+                    l.keep(istd, g)?
+                } else {
+                    let cb = usize::from(page[at]);
+                    l.keep(&[], page.get(at + 1..(at + 1 + cb).min(511)).unwrap_or(&[]))?
+                };
+                kept.insert(at, k);
+                k
+            };
+            if hi > lo {
+                runs.push(Run { lo, hi, off, len });
+            }
+        }
+    }
+    runs.sort_by_key(|r| r.lo);
+    Ok(runs)
+}
+
+/// The sections, with their modifiers translated, and the header stories
+/// each has (its `grpfIhdt`).
+fn read_sections(l: &mut Lists) -> Result<(Vec<SectionSpan>, Vec<u8>)> {
+    let (o, len) = pair(l.wd, at::SED);
+    let plc = read_plc(l.wd, o, len, 12);
+    let mut out = vec![];
+    let mut ihdt = vec![];
+    for (i, d) in plc.data.iter().enumerate() {
+        let fc = u32_at(d, 2);
+        let raw = if fc == 0xFFFF_FFFF {
+            vec![]
+        } else {
+            let cb = usize::from(l.wd.get(fc as usize).copied().unwrap_or(0));
+            l.wd.get(fc as usize + 1..fc as usize + 1 + cb)
+                .unwrap_or(&[])
+                .to_vec()
+        };
+        ihdt.push(headers_of(&raw));
+        let grpprl = translate(&raw, &mut l.anlds);
+        out.push(SectionSpan {
+            cp1: plc.cps.get(i + 1).copied().unwrap_or(0),
+            grpprl,
+        });
+    }
+    if out.is_empty() {
+        out.push(SectionSpan {
+            cp1: u32::MAX,
+            grpprl: vec![],
+        });
+        ihdt.push(0);
+    }
+    Ok((out, ihdt))
+}
+
+/// The `grpfIhdt` of a section's modifiers (sprmSGprfIhdt).
+fn headers_of(g: &[u8]) -> u8 {
+    let mut p = 0usize;
+    let mut out = 0;
+    while p < g.len() {
+        let op = g[p];
+        let Some(sz) = size(op) else { break };
+        let (b0, n) = match sz {
+            Size::Fixed(n) => (p + 1, n),
+            Size::Counted => (p + 2, usize::from(g.get(p + 1).copied().unwrap_or(0))),
+            Size::Long => (p + 3, usize::from(u16_at(g, p + 1)).saturating_sub(1)),
+        };
+        if op == 153 {
+            out = g.get(b0).copied().unwrap_or(0);
+        }
+        p = b0 + n;
+    }
+    out
+}
+
+/// The header stories in the layout of Word 97: six for the notes'
+/// separators, then six for each section (even header, default header, even
+/// footer, default footer, first header, first footer), the ones the file
+/// has taken in order from its list.
+fn story_table(wd: &[u8], ihdt: &[u8]) -> super::Plc {
+    let (o, l) = pair(wd, at::HDD);
+    let have = read_plc(wd, o, l, 0).cps;
+    let dop_bits = part(wd, at::DOP).get(1).copied().unwrap_or(0);
+    let mut cps = vec![have.first().copied().unwrap_or(0)];
+    let mut next = 0usize;
+    let mut slot = |present: bool, cps: &mut Vec<u32>| {
+        let last = *cps.last().unwrap_or(&0);
+        if present {
+            if let Some(&end) = have.get(next + 1) {
+                cps.push(end);
+            } else {
+                cps.push(last);
+            }
+            next += 1;
+        } else {
+            cps.push(last);
+        }
+    };
+    // The footnote separator, its continuation separator and notice.
+    for k in 0..6u8 {
+        slot(k < 3 && dop_bits & (0x80 >> k) != 0, &mut cps);
+    }
+    for bits in ihdt {
+        for k in 0..6u8 {
+            slot(bits & (0x80 >> k) != 0, &mut cps);
+        }
+    }
+    super::Plc { cps, data: vec![] }
+}
+
+/// One list per autonumber descriptor: the number format, the text around
+/// it, and the indents.
+fn numbering(anlds: &[Vec<u8>], fonts: &[String]) -> Numbering {
+    let mut out = Numbering::default();
+    for (i, a) in anlds.iter().enumerate() {
+        let nfc = a[0];
+        let before = usize::from(a[1]);
+        let after = usize::from(a[2]);
+        let text = a.get(20..52).unwrap_or(&[]);
+        let pre: String = text
+            .get(..before.min(32))
+            .unwrap_or(&[])
+            .iter()
+            .map(|&c| char::from(c))
+            .collect();
+        let post: String = text
+            .get(before.min(32)..(before + after).min(32))
+            .unwrap_or(&[])
+            .iter()
+            .map(|&c| char::from(c))
+            .collect();
+        let fmt = match nfc {
+            0 => "decimal",
+            1 => "upperRoman",
+            2 => "lowerRoman",
+            3 => "upperLetter",
+            4 => "lowerLetter",
+            5 => "ordinal",
+            _ => "bullet",
+        };
+        let hang = a[3] & 0x08 != 0;
+        let dxa_indent = i32::from(u16_at(a, 12));
+        let dxa_space = i32::from(u16_at(a, 14));
+        let mut level = Level {
+            start: i64::from(u16_at(a, 10).max(1)),
+            fmt,
+            jc: match a[3] & 3 {
+                1 => Jc::Center,
+                2 => Jc::Right,
+                _ => Jc::Left,
+            },
+            ..Level::default()
+        };
+        level.text = if fmt == "bullet" {
+            // A bullet is the text before the number, in a symbol font.
+            let font = fonts
+                .get(usize::from(u16_at(a, 6)))
+                .map(String::as_str)
+                .unwrap_or("");
+            let symbolic = font.eq_ignore_ascii_case("symbol")
+                || font.to_ascii_lowercase().contains("wingdings");
+            match pre.chars().next() {
+                Some(_) if symbolic => "\u{2022}".to_string(),
+                Some(c) => c.to_string(),
+                None => "\u{2022}".to_string(),
+            }
+        } else {
+            format!("{pre}%1{post}")
+        };
+        if hang {
+            level.ppr.ind_left = Some(dxa_indent.max(dxa_space));
+            level.ppr.ind_hanging = Some(dxa_indent.max(dxa_space));
+        }
+        out.abstracts.push(AbstractNum {
+            id: i as u32,
+            multi_level: false,
+            levels: vec![level],
+        });
+        out.nums.push(Num {
+            id: i as u32 + 1,
+            abstract_id: i as u32,
+            overrides: vec![],
+        });
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn tr(g: &[u8]) -> Vec<u8> {
+        translate(g, &mut vec![])
+    }
+
+    #[test]
+    fn every_modifier_of_the_format_has_a_size() {
+        for op in (2..=52u8)
+            .chain(65..=75)
+            .chain(80..=83)
+            .chain(85..=110)
+            .chain(117..=124)
+            .chain(131..=133)
+            .chain(136..=171)
+            .chain(182..=200)
+        {
+            assert!(size(op).is_some(), "{op}");
+        }
+        assert!(size(60).is_none());
+        assert!(size(250).is_none());
+    }
+
+    #[test]
+    fn modifiers_become_word_97s() {
+        // Bold, 12 pt, centered, 360 after: the opcodes and operands.
+        assert_eq!(tr(&[85, 1, 99, 24]), [0x35, 0x08, 1, 0x43, 0x4A, 24, 0]);
+        assert_eq!(
+            tr(&[5, 1, 22, 0x68, 1]),
+            [0x03, 0x24, 1, 0x14, 0xA4, 0x68, 1]
+        );
+        // A symbol sets the special flag; a picture location too.
+        assert_eq!(
+            tr(&[74, 3, 7, 0, 0xB7]),
+            [0x09, 0x6A, 7, 0, 0xB7, 0, 0x55, 0x08, 1]
+        );
+        // A modifier of no known size ends the list.
+        assert_eq!(tr(&[85, 1, 60, 1, 86, 1]), [0x35, 0x08, 1]);
+        // A truncated operand ends it too.
+        assert_eq!(tr(&[85, 1, 99]), [0x35, 0x08, 1]);
+    }
+
+    #[test]
+    fn borders_keep_their_width_type_colour_and_space() {
+        // 1 unit (0.75 pt) single, red, 2 points of space, shadow.
+        let w = 1 | 1 << 3 | 1 << 5 | 6 << 6 | 2 << 11;
+        assert_eq!(brc(w), [6, 1, 6, 2 | 0x20]);
+        // Thick doubles the width; double is its own type; none is nothing.
+        assert_eq!(brc(1 | 2 << 3), [12, 1, 0, 0]);
+        assert_eq!(brc(2 | 3 << 3)[1], 3);
+        assert_eq!(brc(0), [0, 0, 0, 0]);
+        // Dotted and dashed lines are the widths 6 and 7.
+        assert_eq!(brc(6 | 1 << 3), [6, 6, 0, 0]);
+        assert_eq!(brc(7 | 1 << 3), [6, 7, 0, 0]);
+    }
+
+    #[test]
+    fn table_cells_are_two_edges_and_ten_bytes_each() {
+        // Two cells: edges 0, 1000, 2000; the first the first of a merged
+        // set (bit 0), the second merged with it (bit 1).
+        let mut g = vec![190, 0, 0, 2];
+        for e in [0i16, 1000, 2000] {
+            g.extend_from_slice(&e.to_le_bytes());
+        }
+        let len = g.len() as u16 - 3 + 20 + 1;
+        g.extend_from_slice(&[1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+        g[1..3].copy_from_slice(&len.to_le_bytes());
+        g.extend_from_slice(&[85, 1]);
+        let o = tr(&g);
+        // The edges, then 20 bytes a cell: the merge in the first word.
+        assert_eq!(&o[..2], [0x08, 0xD6]);
+        // The size is one more than what follows it: the cell count, the
+        // three edges and the two cells.
+        assert_eq!(u16::from_le_bytes([o[2], o[3]]) as usize, 1 + 6 + 40 + 1);
+        assert_eq!(o[4], 2);
+        let cells = &o[4 + 1 + 6..];
+        assert_eq!(u16::from_le_bytes([cells[0], cells[1]]), 2);
+        assert_eq!(u16::from_le_bytes([cells[20], cells[21]]), 1);
+        // And the modifier after it is still read.
+        assert_eq!(&o[o.len() - 3..], [0x35, 0x08, 1]);
+    }
+
+    #[test]
+    fn an_autonumber_is_a_list_shared_by_equal_descriptors() {
+        let mut a = vec![0u8; ANLD_LEN];
+        a[0] = 4;
+        let mut b = a.clone();
+        b[0] = 0;
+        let mut anlds = vec![];
+        let mut g = vec![12, ANLD_LEN as u8];
+        g.extend_from_slice(&a);
+        let first = translate(&g, &mut anlds);
+        let again = translate(&g, &mut anlds);
+        assert_eq!(first, again);
+        assert_eq!(anlds.len(), 1);
+        // The list number is one-based.
+        assert_eq!(&first[..4], [0x0B, 0x46, 1, 0]);
+        let mut g = vec![12, ANLD_LEN as u8];
+        g.extend_from_slice(&b);
+        let other = translate(&g, &mut anlds);
+        assert_eq!(&other[..4], [0x0B, 0x46, 2, 0]);
+        let n = numbering(&anlds, &[]);
+        assert_eq!(n.nums.len(), 2);
+        assert_eq!(n.abstracts[0].levels[0].fmt, "lowerLetter");
+        assert_eq!(n.abstracts[1].levels[0].fmt, "decimal");
+    }
+
+    #[test]
+    fn the_text_of_a_word_6_file_is_in_the_code_page_of_its_language() {
+        let mut wd = vec![0u8; 0x20];
+        assert_eq!(codepage(&wd), None);
+        // Russian, 0x0419: Windows 1251; Greek: 1253; Mac: Roman.
+        wd[6..8].copy_from_slice(&0x0419u16.to_le_bytes());
+        assert_eq!(codepage(&wd), Some(1251));
+        wd[6..8].copy_from_slice(&0x0408u16.to_le_bytes());
+        assert_eq!(codepage(&wd), Some(1253));
+        wd[0x14] = 0;
+        wd[0x15] = 1;
+        assert_eq!(codepage(&wd), Some(10000));
+        // The bytes of "Привет" in 1251 come out as Cyrillic.
+        let pieces = [Piece {
+            cp0: 0,
+            cp1: 6,
+            fc: 0x20,
+            compressed: true,
+            prm: 0,
+        }];
+        let mut wd = vec![0u8; 0x30];
+        wd[0x20..0x26].copy_from_slice(&[0xCF, 0xF0, 0xE8, 0xE2, 0xE5, 0xF2]);
+        let table = std::array::from_fn(|b| {
+            crate::formats::office::common::codepage::decode(&[b as u8], 1251)
+                .encode_utf16()
+                .next()
+                .unwrap()
+        });
+        let t = fib::read_text_in(&wd, &pieces, 6, Some(&table));
+        assert_eq!(String::from_utf16(&t).unwrap(), "Привет");
+        // Without a table it is Windows 1252, as before.
+        let t = fib::read_text_in(&wd, &pieces, 6, None);
+        assert_eq!(String::from_utf16(&t).unwrap(), "Ïðèâåò");
+    }
+
+    #[test]
+    fn a_fast_saved_file_has_its_pieces_and_modifier_lists_in_the_complex_part() {
+        // A list of one modifier (bold), then a piece table of two pieces: the
+        // first at byte 0x500 with a list, the second at 0x600 with a single
+        // modifier (italic, 1) in its prm.
+        let mut clx = vec![1u8, 2, 0, 85, 1, 2];
+        let mut plc = vec![];
+        for cp in [0u32, 5, 9] {
+            plc.extend_from_slice(&cp.to_le_bytes());
+        }
+        for (fc, prm) in [(0x500u32, 1u16), (0x600, (86 << 1) | (1 << 8))] {
+            plc.extend_from_slice(&[0, 0]);
+            plc.extend_from_slice(&fc.to_le_bytes());
+            plc.extend_from_slice(&prm.to_le_bytes());
+        }
+        clx.extend_from_slice(&(plc.len() as u32).to_le_bytes());
+        clx.extend_from_slice(&plc);
+        let mut wd = vec![0u8; 0x300];
+        wd[0x100..0x100 + clx.len()].copy_from_slice(&clx);
+        wd[352..356].copy_from_slice(&0x100u32.to_le_bytes());
+        wd[356..360].copy_from_slice(&(clx.len() as u32).to_le_bytes());
+        let c = read_clx(&wd).unwrap();
+        assert_eq!(c.prcs, vec![vec![85, 1]]);
+        assert_eq!(c.pieces.len(), 2);
+        assert_eq!(
+            (c.pieces[0].cp0, c.pieces[0].cp1, c.pieces[0].fc),
+            (0, 5, 0x500)
+        );
+        assert_eq!(
+            (c.pieces[1].cp0, c.pieces[1].cp1, c.pieces[1].fc),
+            (5, 9, 0x600)
+        );
+        assert!(c.pieces.iter().all(|p| p.compressed));
+        assert_eq!(c.pieces[1].prm, (86 << 1) | (1 << 8));
+        // Neither a list nor a piece table: refused.
+        wd[0x100] = 9;
+        assert!(read_clx(&wd).is_err());
+    }
+
+    #[test]
+    fn translated_modifier_lists_are_kept_once_and_count_against_the_memory_limit() {
+        use crate::formats::office::docs::limits::Limits;
+        // A character FKP at 0x200 of three runs that all point at one CHPX
+        // (bold), twice named by the bin table.
+        let mut wd = vec![0u8; 0x400];
+        let page = 0x200;
+        for (i, fc) in [0x100u32, 0x110, 0x120, 0x130].iter().enumerate() {
+            wd[page + 4 * i..page + 4 * i + 4].copy_from_slice(&fc.to_le_bytes());
+        }
+        // One word offset (0x80) for each of the three runs: the CHPX at
+        // page + 0x100 is a count of 2 and bold on.
+        wd[page + 16..page + 19].copy_from_slice(&[0x80, 0x80, 0x80]);
+        wd[page + 0x100..page + 0x103].copy_from_slice(&[2, 85, 1]);
+        wd[page + 511] = 3;
+        let bte: Vec<u8> = [0x100u32, 0x120, 0x130]
+            .iter()
+            .flat_map(|c| c.to_le_bytes())
+            .chain([1, 0, 1, 0])
+            .collect();
+        wd[0x20..0x20 + bte.len()].copy_from_slice(&bte);
+        // Both entries name page 1 (0x200 / 512 = 1).
+        wd[184..188].copy_from_slice(&0x20u32.to_le_bytes());
+        wd[188..192].copy_from_slice(&(bte.len() as u32).to_le_bytes());
+        let mut b = Budget::new(Limits::default());
+        let mut l = Lists {
+            wd: &mut wd,
+            b: &mut b,
+            anlds: vec![],
+        };
+        let runs = read_fkps(&mut l, at::BTE_CHPX, false).unwrap();
+        assert_eq!(runs.len(), 3);
+        // One list of the three bytes of Word 97's bold, shared.
+        assert_eq!(l.wd.len(), 0x400 + 3);
+        assert!(runs.iter().all(|r| r.off == runs[0].off && r.len == 3));
+        // The memory is the budget's.
+        let mut b = Budget::new(Limits::default().with_max_memory(4));
+        let mut wd = vec![];
+        let mut l = Lists {
+            wd: &mut wd,
+            b: &mut b,
+            anlds: vec![],
+        };
+        assert!(l.keep(&[], &[85, 1]).is_ok());
+        assert!(l.keep(&[], &[85, 1]).is_err());
+    }
+
+    #[test]
+    fn a_metafile_gets_the_header_that_gives_its_size() {
+        let wmf = [1u8, 0, 9, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        let h = placeable(&wmf, 1440, 720);
+        assert_eq!(&h[..4], [0xD7, 0xCD, 0xC6, 0x9A]);
+        // Bounds 0, 0, 1440, 720 at 1440 units to the inch.
+        assert_eq!(&h[6..14], [0, 0, 0, 0, 0xA0, 5, 0xD0, 2]);
+        assert_eq!(&h[14..16], 1440u16.to_le_bytes());
+        assert!(h.ends_with(&wmf));
+        // One that has it is left alone.
+        assert_eq!(placeable(&h, 1, 1), h);
+    }
+
+    #[test]
+    fn a_section_says_which_headers_it_has() {
+        assert_eq!(headers_of(&[142, 2, 153, 0x44, 143, 1]), 0x44);
+        assert_eq!(headers_of(&[]), 0);
+        // Each story the section's bits name is the next of the file's list;
+        // the first slots are the notes' separators.
+        let mut wd = vec![0u8; 0x400];
+        let hdd: Vec<u8> = [0u32, 4, 9, 12]
+            .iter()
+            .flat_map(|c| c.to_le_bytes())
+            .collect();
+        wd[0x100..0x100 + hdd.len()].copy_from_slice(&hdd);
+        wd[176..180].copy_from_slice(&0x100u32.to_le_bytes());
+        wd[180..184].copy_from_slice(&(hdd.len() as u32).to_le_bytes());
+        // A default header (bit 6) and a first-page footer (bit 2).
+        let t = story_table(&wd, &[0x40 | 0x04]);
+        assert_eq!(t.cps.len(), 13);
+        // Slots 0 to 5 are empty, then the section's: even header (empty),
+        // default header 0..4, even footer, odd footer (empty), first header,
+        // first footer 4..9.
+        assert_eq!(t.cps[6], 0);
+        assert_eq!(&t.cps[7..9], [0, 4]);
+        assert_eq!(&t.cps[9..13], [4, 4, 4, 9]);
+        // The document's own bits (7, 6 and 5) name the notes' separators, the
+        // first stories of the list: here the footnote separator.
+        wd[0x200 + 1] = 0x80;
+        wd[336..340].copy_from_slice(&0x200u32.to_le_bytes());
+        wd[340..344].copy_from_slice(&84u32.to_le_bytes());
+        let t = story_table(&wd, &[0]);
+        assert_eq!(&t.cps[..3], [0, 4, 4]);
+        // A section with none: every slot is empty after it.
+        assert_eq!(t.cps.len(), 13);
+        assert!(t.cps[1..].iter().all(|&c| c == 4));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/docx/body.rs b/crates/exav-render/src/formats/office/docs/docx/body.rs
new file mode 100644
index 00000000..9c95dd7f
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/docx/body.rs
@@ -0,0 +1,621 @@
+//! Blocks, paragraphs, runs and drawings as WordprocessingML.
+
+use super::props::*;
+use crate::formats::office::common::xmlout::{esc_into, hex};
+use crate::formats::office::docs::model::*;
+use std::fmt::Write;
+
+pub const REL_IMAGE: &str =
+    "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
+pub const REL_HYPERLINK: &str =
+    "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
+pub const REL_HEADER: &str =
+    "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";
+pub const REL_FOOTER: &str =
+    "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";
+
+#[derive(Default)]
+pub struct Rels {
+    pub items: Vec<(String, String, String, bool)>,
+}
+
+impl Rels {
+    pub fn add(&mut self, typ: &str, target: &str, external: bool) -> String {
+        if let Some(r) = self
+            .items
+            .iter()
+            .find(|r| r.1 == typ && r.2 == target && r.3 == external)
+        {
+            return r.0.clone();
+        }
+        let id = format!("rId{}", self.items.len() + 1);
+        self.items
+            .push((id.clone(), typ.to_string(), target.to_string(), external));
+        id
+    }
+}
+
+/// A header or footer part written while a section is.
+pub struct HfPart {
+    pub name: String,
+    pub header: bool,
+    pub xml: String,
+    pub rels: Rels,
+}
+
+pub struct W<'a> {
+    pub doc: &'a Document,
+    pub next_id: u32,
+    pub parts: Vec<HfPart>,
+    /// The part being written is a note or a comment: no section breaks.
+    pub depth: u32,
+    /// What one part's XML may take in memory before it is deflated.
+    pub limit: u64,
+    /// A part's XML grew past `limit`: what is left is not written.
+    pub over: bool,
+}
+
+const NS_DECL: &str = "xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\"";
+
+pub fn root(name: &str) -> String {
+    format!(
+        "{}<w:{name} {NS_DECL}>",
+        crate::formats::office::common::xmlout::XML_HEAD
+    )
+}
+
+impl<'a> W<'a> {
+    pub fn new(doc: &'a Document, limit: u64) -> W<'a> {
+        W {
+            doc,
+            next_id: 1,
+            parts: vec![],
+            depth: 0,
+            limit,
+            over: false,
+        }
+    }
+
+    pub fn blocks(&mut self, o: &mut String, blocks: &[Block], rels: &mut Rels) {
+        for b in blocks {
+            match b {
+                Block::Para(p) => self.para(o, p, rels),
+                Block::Table(t) => self.table(o, t, rels),
+            }
+            // The XML of a part is held whole before it is deflated, and it
+            // is what the model's text and runs become with their markup.
+            if o.len() as u64 > self.limit {
+                self.over = true;
+                return;
+            }
+        }
+    }
+
+    /// The content of a cell, note or text box: it must end with a
+    /// paragraph.
+    pub fn story(&mut self, o: &mut String, blocks: &[Block], rels: &mut Rels) {
+        self.blocks(o, blocks, rels);
+        if !matches!(blocks.last(), Some(Block::Para(_))) {
+            o.push_str("<w:p/>");
+        }
+    }
+
+    fn table(&mut self, o: &mut String, t: &Table, rels: &mut Rels) {
+        // A DOCX table has a row; one without has nothing to show.
+        if t.rows.is_empty() {
+            return;
+        }
+        o.push_str("<w:tbl>");
+        table_props(o, &t.props, true);
+        o.push_str("<w:tblGrid>");
+        for g in &t.grid {
+            let _ = write!(o, "<w:gridCol w:w=\"{}\"/>", (*g).max(0));
+        }
+        o.push_str("</w:tblGrid>");
+        for r in &t.rows {
+            o.push_str("<w:tr>");
+            row_props(o, &r.props);
+            for c in &r.cells {
+                o.push_str("<w:tc>");
+                cell_props(o, &c.props);
+                self.story(o, &c.content, rels);
+                o.push_str("</w:tc>");
+            }
+            o.push_str("</w:tr>");
+        }
+        o.push_str("</w:tbl>");
+    }
+
+    fn para(&mut self, o: &mut String, p: &Para, rels: &mut Rels) {
+        o.push_str("<w:p>");
+        let sect = p
+            .section
+            .as_ref()
+            .filter(|_| self.depth == 0)
+            .map(|s| self.sect_pr(s, rels, false));
+        para_props(o, &p.props, &p.mark, sect.as_deref());
+        self.inlines(o, &p.content, rels);
+        o.push_str("</w:p>");
+    }
+
+    fn inlines(&mut self, o: &mut String, content: &[Inline], rels: &mut Rels) {
+        for i in content {
+            match i {
+                Inline::Run(r) => self.run(o, r, rels),
+                Inline::FieldChar(k) => {
+                    let t = match k {
+                        FieldCharKind::Begin => "begin",
+                        FieldCharKind::Separate => "separate",
+                        FieldCharKind::End => "end",
+                    };
+                    let _ = write!(o, "<w:r><w:fldChar w:fldCharType=\"{t}\"/></w:r>");
+                }
+                Inline::InstrText(s) => {
+                    o.push_str("<w:r><w:instrText xml:space=\"preserve\">");
+                    esc_into(o, s);
+                    o.push_str("</w:instrText></w:r>");
+                }
+                Inline::Field {
+                    instr,
+                    props,
+                    result,
+                } => {
+                    o.push_str("<w:r>");
+                    run_props(o, props);
+                    o.push_str("<w:fldChar w:fldCharType=\"begin\"/></w:r><w:r>");
+                    run_props(o, props);
+                    o.push_str("<w:instrText xml:space=\"preserve\">");
+                    esc_into(o, instr);
+                    o.push_str("</w:instrText></w:r><w:r>");
+                    run_props(o, props);
+                    o.push_str("<w:fldChar w:fldCharType=\"separate\"/></w:r>");
+                    self.inlines(o, result, rels);
+                    o.push_str("<w:r>");
+                    run_props(o, props);
+                    o.push_str("<w:fldChar w:fldCharType=\"end\"/></w:r>");
+                }
+                Inline::Hyperlink {
+                    target,
+                    anchor,
+                    tooltip,
+                    content,
+                } => {
+                    o.push_str("<w:hyperlink");
+                    if let Some(t) = target {
+                        let id = rels.add(REL_HYPERLINK, t, true);
+                        attr(o, "r:id", &id);
+                    }
+                    if let Some(a) = anchor {
+                        attr(o, "w:anchor", a);
+                    }
+                    if let Some(t) = tooltip {
+                        attr(o, "w:tooltip", t);
+                    }
+                    o.push('>');
+                    self.inlines(o, content, rels);
+                    o.push_str("</w:hyperlink>");
+                }
+                Inline::BookmarkStart { id, name } => {
+                    let _ = write!(o, "<w:bookmarkStart w:id=\"{id}\"");
+                    attr(o, "w:name", name);
+                    o.push_str("/>");
+                }
+                Inline::BookmarkEnd(id) => {
+                    let _ = write!(o, "<w:bookmarkEnd w:id=\"{id}\"/>");
+                }
+                Inline::CommentStart(id) => {
+                    let _ = write!(o, "<w:commentRangeStart w:id=\"{id}\"/>");
+                }
+                Inline::CommentEnd(id) => {
+                    let _ = write!(o, "<w:commentRangeEnd w:id=\"{id}\"/>");
+                }
+            }
+        }
+    }
+
+    fn run(&mut self, o: &mut String, r: &Run, rels: &mut Rels) {
+        if r.items.is_empty() {
+            return;
+        }
+        o.push_str("<w:r>");
+        run_props(o, &r.props);
+        for it in &r.items {
+            match it {
+                RunItem::Text(t) => {
+                    o.push_str("<w:t xml:space=\"preserve\">");
+                    esc_into(o, t);
+                    o.push_str("</w:t>");
+                }
+                RunItem::Tab => o.push_str("<w:tab/>"),
+                RunItem::Break(k) => match k {
+                    BreakKind::Line => o.push_str("<w:br/>"),
+                    BreakKind::Page => o.push_str("<w:br w:type=\"page\"/>"),
+                    BreakKind::Column => o.push_str("<w:br w:type=\"column\"/>"),
+                },
+                RunItem::NoBreakHyphen => o.push_str("<w:noBreakHyphen/>"),
+                RunItem::SoftHyphen => o.push_str("<w:softHyphen/>"),
+                RunItem::Symbol { font, ch } => {
+                    o.push_str("<w:sym");
+                    attr(o, "w:font", font);
+                    let _ = write!(o, " w:char=\"{ch:04X}\"/>");
+                }
+                RunItem::FootnoteRef(id) => {
+                    let _ = write!(o, "<w:footnoteReference w:id=\"{id}\"/>");
+                }
+                RunItem::EndnoteRef(id) => {
+                    let _ = write!(o, "<w:endnoteReference w:id=\"{id}\"/>");
+                }
+                RunItem::NoteMark(endnote) => {
+                    o.push_str(if *endnote {
+                        "<w:endnoteRef/>"
+                    } else {
+                        "<w:footnoteRef/>"
+                    });
+                }
+                RunItem::CommentRef(id) => {
+                    let _ = write!(o, "<w:commentReference w:id=\"{id}\"/>");
+                }
+                RunItem::PageNumber => {
+                    o.push_str("<w:fldChar w:fldCharType=\"begin\"/><w:instrText xml:space=\"preserve\"> PAGE </w:instrText><w:fldChar w:fldCharType=\"separate\"/><w:t>1</w:t><w:fldChar w:fldCharType=\"end\"/>");
+                }
+                RunItem::Drawing(d) => self.drawing(o, d, rels),
+            }
+        }
+        o.push_str("</w:r>");
+    }
+
+    fn drawing(&mut self, o: &mut String, d: &Drawing, rels: &mut Rels) {
+        let id = self.next_id;
+        self.next_id += 1;
+        let (cx, cy) = (d.cx.clamp(0, 1 << 40), d.cy.clamp(0, 1 << 40));
+        o.push_str("<w:drawing>");
+        match &d.anchor {
+            None => {
+                o.push_str("<wp:inline distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\">");
+            }
+            Some(a) => {
+                let _ = write!(
+                    o,
+                    "<wp:anchor distT=\"{}\" distB=\"{}\" distL=\"{}\" distR=\"{}\" simplePos=\"0\" relativeHeight=\"{}\" behindDoc=\"{}\" locked=\"0\" layoutInCell=\"1\" allowOverlap=\"1\"><wp:simplePos x=\"0\" y=\"0\"/>",
+                    a.dist[0].clamp(0, 1 << 32),
+                    a.dist[1].clamp(0, 1 << 32),
+                    a.dist[2].clamp(0, 1 << 32),
+                    a.dist[3].clamp(0, 1 << 32),
+                    251_658_240u64 + u64::from(a.z.min(1 << 24)),
+                    u8::from(a.behind)
+                );
+                for (tag, rel, off, align) in [
+                    ("positionH", a.h_rel, a.h_off, a.h_align),
+                    ("positionV", a.v_rel, a.v_off, a.v_align),
+                ] {
+                    let _ = write!(o, "<wp:{tag} relativeFrom=\"{rel}\">");
+                    match align {
+                        Some(al) => {
+                            let _ = write!(o, "<wp:align>{al}</wp:align>");
+                        }
+                        None => {
+                            let _ = write!(
+                                o,
+                                "<wp:posOffset>{}</wp:posOffset>",
+                                off.clamp(-(1 << 36), 1 << 36)
+                            );
+                        }
+                    }
+                    let _ = write!(o, "</wp:{tag}>");
+                }
+            }
+        }
+        let _ = write!(o, "<wp:extent cx=\"{cx}\" cy=\"{cy}\"/>");
+        if let Some(a) = &d.anchor {
+            o.push_str("<wp:effectExtent l=\"0\" t=\"0\" r=\"0\" b=\"0\"/>");
+            match a.wrap {
+                Wrap::None => o.push_str("<wp:wrapNone/>"),
+                Wrap::Square => o.push_str("<wp:wrapSquare wrapText=\"bothSides\"/>"),
+                Wrap::TopBottom => o.push_str("<wp:wrapTopAndBottom/>"),
+                Wrap::Tight | Wrap::Through => {
+                    o.push_str("<wp:wrapTight wrapText=\"bothSides\"><wp:wrapPolygon edited=\"0\"><wp:start x=\"0\" y=\"0\"/><wp:lineTo x=\"0\" y=\"21600\"/><wp:lineTo x=\"21600\" y=\"21600\"/><wp:lineTo x=\"21600\" y=\"0\"/><wp:lineTo x=\"0\" y=\"0\"/></wp:wrapPolygon></wp:wrapTight>");
+                }
+            }
+        }
+        let _ = write!(o, "<wp:docPr id=\"{id}\"");
+        attr(o, "name", &d.name);
+        if let Some(t) = &d.descr {
+            attr(o, "descr", t);
+        }
+        o.push_str("/>");
+        o.push_str("<wp:cNvGraphicFramePr/>");
+        o.push_str("<a:graphic>");
+        match &d.kind {
+            DrawingKind::Picture { media, crop } => {
+                let m = self.doc.media.get(*media);
+                let target = m.map(|m| format!("media/image{}.{}", media + 1, m.ext));
+                o.push_str("<a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/picture\"><pic:pic><pic:nvPicPr><pic:cNvPr");
+                let _ = write!(o, " id=\"{id}\"");
+                attr(o, "name", &d.name);
+                o.push_str("/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill>");
+                match target {
+                    Some(t) => {
+                        let rid = rels.add(REL_IMAGE, &t, false);
+                        o.push_str("<a:blip");
+                        attr(o, "r:embed", &rid);
+                        o.push_str("/>");
+                    }
+                    None => o.push_str("<a:blip/>"),
+                }
+                if *crop != Crop::default() {
+                    let _ = write!(
+                        o,
+                        "<a:srcRect l=\"{}\" t=\"{}\" r=\"{}\" b=\"{}\"/>",
+                        crop.l, crop.t, crop.r, crop.b
+                    );
+                }
+                let _ = write!(
+                    o,
+                    "<a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"{cx}\" cy=\"{cy}\"/></a:xfrm><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData>"
+                );
+            }
+            DrawingKind::Shape(s) => {
+                o.push_str("<a:graphicData uri=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"><wps:wsp>");
+                o.push_str(if s.text.is_empty() {
+                    "<wps:cNvSpPr/>"
+                } else {
+                    "<wps:cNvSpPr txBox=\"1\"/>"
+                });
+                o.push_str("<wps:spPr><a:xfrm");
+                if s.rot != 0 {
+                    let _ = write!(o, " rot=\"{}\"", s.rot);
+                }
+                if s.flip_h {
+                    o.push_str(" flipH=\"1\"");
+                }
+                if s.flip_v {
+                    o.push_str(" flipV=\"1\"");
+                }
+                let _ = write!(
+                    o,
+                    "><a:off x=\"0\" y=\"0\"/><a:ext cx=\"{cx}\" cy=\"{cy}\"/></a:xfrm><a:prstGeom prst=\"{}\"><a:avLst/></a:prstGeom>",
+                    s.preset
+                );
+                match &s.fill {
+                    Fill::None => o.push_str("<a:noFill/>"),
+                    Fill::Solid(c) => {
+                        let _ = write!(
+                            o,
+                            "<a:solidFill><a:srgbClr val=\"{}\"/></a:solidFill>",
+                            hex(*c)
+                        );
+                    }
+                }
+                match &s.line {
+                    None => o.push_str("<a:ln><a:noFill/></a:ln>"),
+                    Some(l) => {
+                        let c = match l.color {
+                            Color::Rgb(v) => v,
+                            Color::Auto => 0,
+                        };
+                        let _ = write!(
+                            o,
+                            "<a:ln w=\"{}\"><a:solidFill><a:srgbClr val=\"{}\"/></a:solidFill><a:prstDash val=\"{}\"/></a:ln>",
+                            l.width.clamp(0, 1 << 24),
+                            hex(c),
+                            l.dash
+                        );
+                    }
+                }
+                o.push_str("</wps:spPr>");
+                if !s.text.is_empty() {
+                    o.push_str("<wps:txbx><w:txbxContent>");
+                    let save = self.depth;
+                    self.depth += 1;
+                    self.story(o, &s.text, rels);
+                    self.depth = save;
+                    o.push_str("</w:txbxContent></wps:txbx>");
+                }
+                let _ = write!(
+                    o,
+                    "<wps:bodyPr rot=\"0\" lIns=\"{}\" tIns=\"{}\" rIns=\"{}\" bIns=\"{}\" anchor=\"{}\"><a:noAutofit/></wps:bodyPr></wps:wsp></a:graphicData>",
+                    s.insets[0], s.insets[1], s.insets[2], s.insets[3], s.v_anchor
+                );
+            }
+        }
+        o.push_str("</a:graphic>");
+        o.push_str(if d.anchor.is_some() {
+            "</wp:anchor>"
+        } else {
+            "</wp:inline>"
+        });
+        o.push_str("</w:drawing>");
+    }
+
+    /// A w:sectPr for `s`, writing its headers and footers as parts.
+    pub fn sect_pr(&mut self, s: &Section, rels: &mut Rels, last: bool) -> String {
+        let mut o = String::from("<w:sectPr>");
+        let _ = last;
+        for (header, hf) in [(true, &s.headers), (false, &s.footers)] {
+            for (kind, content) in [
+                ("default", &hf.default),
+                ("first", &hf.first),
+                ("even", &hf.even),
+            ] {
+                let Some(blocks) = content else { continue };
+                let n = self.parts.iter().filter(|p| p.header == header).count() + 1;
+                let name = format!("{}{}.xml", if header { "header" } else { "footer" }, n);
+                let mut xml = root(if header { "hdr" } else { "ftr" });
+                let mut prels = Rels::default();
+                let save = self.depth;
+                self.depth += 1;
+                self.story(&mut xml, blocks, &mut prels);
+                self.depth = save;
+                xml.push_str(if header { "</w:hdr>" } else { "</w:ftr>" });
+                self.parts.push(HfPart {
+                    name: name.clone(),
+                    header,
+                    xml,
+                    rels: prels,
+                });
+                let rid = rels.add(if header { REL_HEADER } else { REL_FOOTER }, &name, false);
+                let _ = write!(
+                    o,
+                    "<w:{}Reference w:type=\"{kind}\" r:id=\"{rid}\"/>",
+                    if header { "header" } else { "footer" }
+                );
+            }
+        }
+        if s.kind != SectionType::NextPage {
+            let k = match s.kind {
+                SectionType::Continuous => "continuous",
+                SectionType::EvenPage => "evenPage",
+                SectionType::OddPage => "oddPage",
+                SectionType::NextColumn => "nextColumn",
+                SectionType::NextPage => "nextPage",
+            };
+            let _ = write!(o, "<w:type w:val=\"{k}\"/>");
+        }
+        let _ = write!(
+            o,
+            "<w:pgSz w:w=\"{}\" w:h=\"{}\"",
+            s.width.max(0),
+            s.height.max(0)
+        );
+        if s.landscape {
+            o.push_str(" w:orient=\"landscape\"");
+        }
+        let _ = write!(
+            o,
+            "/><w:pgMar w:top=\"{}\" w:right=\"{}\" w:bottom=\"{}\" w:left=\"{}\" w:header=\"{}\" w:footer=\"{}\" w:gutter=\"{}\"/>",
+            s.top,
+            s.right,
+            s.bottom,
+            s.left,
+            s.header.max(0),
+            s.footer.max(0),
+            s.gutter.max(0)
+        );
+        if !s.page_borders.is_empty() {
+            o.push_str("<w:pgBorders>");
+            let b = &s.page_borders;
+            for (n, v) in [
+                ("top", &b.top),
+                ("left", &b.left),
+                ("bottom", &b.bottom),
+                ("right", &b.right),
+            ] {
+                if let Some(v) = v {
+                    border(&mut o, n, v);
+                }
+            }
+            o.push_str("</w:pgBorders>");
+        }
+        if let Some((start, count_by, distance)) = s.line_numbers {
+            let _ = write!(
+                o,
+                "<w:lnNumType w:countBy=\"{}\" w:start=\"{}\" w:distance=\"{}\"/>",
+                count_by.max(1),
+                start,
+                distance.max(0)
+            );
+        }
+        if s.page_start.is_some() || s.page_fmt.is_some() {
+            o.push_str("<w:pgNumType");
+            if let Some(f) = s.page_fmt {
+                attr(&mut o, "w:fmt", f);
+            }
+            if let Some(v) = s.page_start {
+                let _ = write!(o, " w:start=\"{v}\"");
+            }
+            o.push_str("/>");
+        }
+        let c = &s.columns;
+        if c.num > 1 || !c.widths.is_empty() {
+            let _ = write!(o, "<w:cols w:num=\"{}\"", c.num.max(1));
+            if c.separator {
+                o.push_str(" w:sep=\"1\"");
+            }
+            if c.widths.is_empty() {
+                let _ = write!(o, " w:space=\"{}\" w:equalWidth=\"1\"/>", c.space.max(0));
+            } else {
+                o.push_str(" w:equalWidth=\"0\">");
+                for (w, sp) in &c.widths {
+                    let _ = write!(
+                        o,
+                        "<w:col w:w=\"{}\" w:space=\"{}\"/>",
+                        (*w).max(0),
+                        (*sp).max(0)
+                    );
+                }
+                o.push_str("</w:cols>");
+            }
+        }
+        if let Some(v) = s.v_align {
+            let _ = write!(o, "<w:vAlign w:val=\"{v}\"/>");
+        }
+        if s.title_page {
+            o.push_str("<w:titlePg/>");
+        }
+        if let Some(d) = s.text_direction {
+            let _ = write!(o, "<w:textDirection w:val=\"{d}\"/>");
+        }
+        if s.bidi {
+            o.push_str("<w:bidi/>");
+        }
+        if s.rtl_gutter {
+            o.push_str("<w:rtlGutter/>");
+        }
+        o.push_str("</w:sectPr>");
+        o
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::common::package::Zip;
+
+    #[test]
+    fn a_table_without_a_row_is_not_written() {
+        let doc = Document {
+            body: vec![
+                Block::Table(Table {
+                    props: TableProps::default(),
+                    grid: vec![1],
+                    rows: vec![],
+                }),
+                Block::Para(Para::default()),
+            ],
+            ..Document::default()
+        };
+        let bytes = crate::formats::office::docs::docx::write(&doc, 1 << 20).unwrap();
+        let mut z = Zip::open(&bytes).unwrap();
+        let body =
+            String::from_utf8(z.read("word/document.xml", 1 << 20).unwrap().unwrap()).unwrap();
+        assert!(
+            !body.contains("<w:tbl>") && body.contains("<w:p>"),
+            "{body}"
+        );
+    }
+
+    /// The XML of the body is held whole before it is deflated, so a body that
+    /// deflates to nothing still counts at its own size.
+    #[test]
+    fn a_body_that_deflates_small_is_still_refused_at_its_size() {
+        let para = |text: &str| {
+            Block::Para(Para {
+                content: vec![Inline::Run(Run::text(RunProps::default(), text))],
+                ..Para::default()
+            })
+        };
+        let long = "a".repeat(1000);
+        let doc = Document {
+            body: (0..1000).map(|_| para(&long)).collect(),
+            ..Document::default()
+        };
+        // About a megabyte of XML, a few kilobytes deflated.
+        assert!(crate::formats::office::docs::docx::write(&doc, 2 << 20).is_ok());
+        assert_eq!(
+            crate::formats::office::docs::docx::write(&doc, 100 << 10),
+            Err(crate::formats::office::docs::error::Error::TooLarge(
+                "memory"
+            ))
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/docx/mod.rs b/crates/exav-render/src/formats/office/docs/docx/mod.rs
new file mode 100644
index 00000000..8d69b068
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/docx/mod.rs
@@ -0,0 +1,198 @@
+//! The document model to a DOCX package (ECMA-376 WordprocessingML).
+
+mod body;
+mod parts;
+mod props;
+
+use crate::formats::office::common::package::PackageWriter;
+use crate::formats::office::common::xmlout::XML_HEAD;
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::model::*;
+use body::{Rels, W, root};
+use std::fmt::Write;
+
+const CT_MAIN: &str = "application/vnd.openxmlformats-officedocument.wordprocessingml";
+const REL_BASE: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+
+fn mime(ext: &str) -> &'static str {
+    match ext {
+        "png" => "image/png",
+        "jpeg" => "image/jpeg",
+        "gif" => "image/gif",
+        "bmp" => "image/bmp",
+        "tiff" => "image/tiff",
+        "emf" => "image/x-emf",
+        "wmf" => "image/x-wmf",
+        "svg" => "image/svg+xml",
+        _ => "application/octet-stream",
+    }
+}
+
+fn rels_xml(r: &Rels) -> String {
+    let mut o = String::from(XML_HEAD);
+    o.push_str(
+        "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">",
+    );
+    for (id, typ, target, external) in &r.items {
+        let _ = write!(o, "<Relationship Id=\"{id}\" Type=\"{typ}\"");
+        props::attr(&mut o, "Target", target);
+        if *external {
+            o.push_str(" TargetMode=\"External\"");
+        }
+        o.push_str("/>");
+    }
+    o.push_str("</Relationships>");
+    o
+}
+
+/// Writes `doc` as a DOCX, refusing to grow past `limit` bytes.
+pub fn write(doc: &Document, limit: u64) -> Result<Vec<u8>> {
+    let mut z = PackageWriter::new(limit);
+    let mut w = W::new(doc, limit);
+    let mut rels = Rels::default();
+
+    // Parts that other parts refer to are numbered first, so that their
+    // ids do not depend on the body.
+    let styles = parts::styles(doc);
+    let numbering = parts::numbering(&doc.numbering);
+    let settings = parts::settings(doc);
+    rels.add(&format!("{REL_BASE}/styles"), "styles.xml", false);
+    if numbering.is_some() {
+        rels.add(&format!("{REL_BASE}/numbering"), "numbering.xml", false);
+    }
+    rels.add(&format!("{REL_BASE}/settings"), "settings.xml", false);
+
+    // The body, in a string; the last section's properties close it.
+    let mut body = root("document");
+    body.push_str("<w:body>");
+    w.blocks(&mut body, &doc.body, &mut rels);
+    let last = w.sect_pr(&doc.section, &mut rels, true);
+    body.push_str(&last);
+    body.push_str("</w:body></w:document>");
+    if w.over {
+        return Err(Error::TooLarge("memory"));
+    }
+
+    let mut notes_rels = Rels::default();
+    let footnotes = (!doc.footnotes.is_empty())
+        .then(|| parts::notes(&mut w, &doc.footnotes, false, &mut notes_rels));
+    let mut endnotes_rels = Rels::default();
+    let endnotes = (!doc.endnotes.is_empty())
+        .then(|| parts::notes(&mut w, &doc.endnotes, true, &mut endnotes_rels));
+    let mut comments_rels = Rels::default();
+    let comments = (!doc.comments.is_empty())
+        .then(|| parts::comments(&mut w, &doc.comments, &mut comments_rels));
+    if footnotes.is_some() {
+        rels.add(&format!("{REL_BASE}/footnotes"), "footnotes.xml", false);
+    }
+    if endnotes.is_some() {
+        rels.add(&format!("{REL_BASE}/endnotes"), "endnotes.xml", false);
+    }
+    if comments.is_some() {
+        rels.add(&format!("{REL_BASE}/comments"), "comments.xml", false);
+    }
+
+    let mut ct = String::from(XML_HEAD);
+    ct.push_str("<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/>");
+    let mut exts: Vec<&str> = doc.media.iter().map(|m| m.ext).collect();
+    exts.sort_unstable();
+    exts.dedup();
+    for e in exts {
+        let _ = write!(
+            ct,
+            "<Default Extension=\"{e}\" ContentType=\"{}\"/>",
+            mime(e)
+        );
+    }
+    let over = |ct: &mut String, name: &str, kind: &str| {
+        let _ = write!(
+            ct,
+            "<Override PartName=\"/word/{name}\" ContentType=\"{CT_MAIN}.{kind}+xml\"/>"
+        );
+    };
+    over(&mut ct, "document.xml", "document.main");
+    over(&mut ct, "styles.xml", "styles");
+    over(&mut ct, "settings.xml", "settings");
+    if numbering.is_some() {
+        over(&mut ct, "numbering.xml", "numbering");
+    }
+    if footnotes.is_some() {
+        over(&mut ct, "footnotes.xml", "footnotes");
+    }
+    if endnotes.is_some() {
+        over(&mut ct, "endnotes.xml", "endnotes");
+    }
+    if comments.is_some() {
+        over(&mut ct, "comments.xml", "comments");
+    }
+    for p in &w.parts {
+        over(&mut ct, &p.name, if p.header { "header" } else { "footer" });
+    }
+    ct.push_str("</Types>");
+
+    let pk = |e: crate::formats::office::common::package::Error| -> Error { e.into() };
+    z.put("[Content_Types].xml", ct.as_bytes(), true)
+        .map_err(pk)?;
+    let mut top = String::from(XML_HEAD);
+    let _ = write!(
+        top,
+        "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"{REL_BASE}/officeDocument\" Target=\"word/document.xml\"/></Relationships>"
+    );
+    z.put("_rels/.rels", top.as_bytes(), true).map_err(pk)?;
+    z.put("word/document.xml", body.as_bytes(), true)
+        .map_err(pk)?;
+    z.put(
+        "word/_rels/document.xml.rels",
+        rels_xml(&rels).as_bytes(),
+        true,
+    )
+    .map_err(pk)?;
+    z.put("word/styles.xml", styles.as_bytes(), true)
+        .map_err(pk)?;
+    z.put("word/settings.xml", settings.as_bytes(), true)
+        .map_err(pk)?;
+    if let Some(n) = &numbering {
+        z.put("word/numbering.xml", n.as_bytes(), true)
+            .map_err(pk)?;
+    }
+    for (name, xml, r) in [
+        ("footnotes.xml", &footnotes, &notes_rels),
+        ("endnotes.xml", &endnotes, &endnotes_rels),
+        ("comments.xml", &comments, &comments_rels),
+    ] {
+        if let Some(x) = xml {
+            z.put(&format!("word/{name}"), x.as_bytes(), true)
+                .map_err(pk)?;
+            if !r.items.is_empty() {
+                z.put(
+                    &format!("word/_rels/{name}.rels"),
+                    rels_xml(r).as_bytes(),
+                    true,
+                )
+                .map_err(pk)?;
+            }
+        }
+    }
+    for p in &w.parts {
+        z.put(&format!("word/{}", p.name), p.xml.as_bytes(), true)
+            .map_err(pk)?;
+        if !p.rels.items.is_empty() {
+            z.put(
+                &format!("word/_rels/{}.rels", p.name),
+                rels_xml(&p.rels).as_bytes(),
+                true,
+            )
+            .map_err(pk)?;
+        }
+    }
+    for (i, m) in doc.media.iter().enumerate() {
+        let compress = !matches!(m.ext, "png" | "jpeg" | "gif");
+        z.put(
+            &format!("word/media/image{}.{}", i + 1, m.ext),
+            &m.data,
+            compress,
+        )
+        .map_err(pk)?;
+    }
+    z.finish().map_err(pk)
+}
diff --git a/crates/exav-render/src/formats/office/docs/docx/parts.rs b/crates/exav-render/src/formats/office/docs/docx/parts.rs
new file mode 100644
index 00000000..0ef544d1
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/docx/parts.rs
@@ -0,0 +1,318 @@
+//! styles.xml, numbering.xml, settings.xml, notes and comments.
+
+use super::body::{Rels, W, root};
+use super::props::*;
+use crate::formats::office::common::xmlout::XML_HEAD;
+use crate::formats::office::docs::model::*;
+use std::fmt::Write;
+
+const NS_W: &str = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+
+pub fn styles(doc: &Document) -> String {
+    let mut o = String::from(XML_HEAD);
+    let _ = write!(o, "<w:styles xmlns:w=\"{NS_W}\"><w:docDefaults>");
+    o.push_str("<w:rPrDefault>");
+    let mut rp = doc.defaults_run.clone();
+    if rp.size.is_none() {
+        rp.size = Some(20);
+    }
+    run_props(&mut o, &rp);
+    o.push_str("</w:rPrDefault><w:pPrDefault>");
+    let mut pp = String::new();
+    para_props_body(&mut pp, &doc.defaults_para);
+    if !pp.is_empty() {
+        o.push_str("<w:pPr>");
+        o.push_str(&pp);
+        o.push_str("</w:pPr>");
+    }
+    o.push_str("</w:pPrDefault></w:docDefaults>");
+    let has = |kind: StyleKind, default: bool| {
+        doc.styles
+            .iter()
+            .any(|s| s.kind == kind && s.default == default)
+    };
+    if !has(StyleKind::Paragraph, true) {
+        let n = Style {
+            default: true,
+            ..Style::new("Normal", "Normal", StyleKind::Paragraph)
+        };
+        style(&mut o, &n);
+    }
+    if !has(StyleKind::Character, true) {
+        let n = Style {
+            default: true,
+            ..Style::new(
+                "DefaultParagraphFont",
+                "Default Paragraph Font",
+                StyleKind::Character,
+            )
+        };
+        style(&mut o, &n);
+    }
+    if !has(StyleKind::Table, true) {
+        let mut n = Style {
+            default: true,
+            ..Style::new("TableNormal", "Normal Table", StyleKind::Table)
+        };
+        n.tbl = Some(TableProps {
+            cell_margins: Margins {
+                top: Some(0),
+                left: Some(108),
+                bottom: Some(0),
+                right: Some(108),
+            },
+            ..TableProps::default()
+        });
+        style(&mut o, &n);
+    }
+    for s in &doc.styles {
+        style(&mut o, s);
+    }
+    o.push_str("</w:styles>");
+    o
+}
+
+fn style(o: &mut String, s: &Style) {
+    let kind = match s.kind {
+        StyleKind::Paragraph => "paragraph",
+        StyleKind::Character => "character",
+        StyleKind::Table => "table",
+        StyleKind::Numbering => "numbering",
+    };
+    let _ = write!(o, "<w:style w:type=\"{kind}\"");
+    if s.default {
+        o.push_str(" w:default=\"1\"");
+    }
+    attr(o, "w:styleId", &s.id);
+    o.push_str("><w:name");
+    attr(o, "w:val", &s.name);
+    o.push_str("/>");
+    if let Some(b) = &s.based_on {
+        o.push_str("<w:basedOn");
+        attr(o, "w:val", b);
+        o.push_str("/>");
+    }
+    if let Some(b) = &s.next {
+        o.push_str("<w:next");
+        attr(o, "w:val", b);
+        o.push_str("/>");
+    }
+    if let Some(b) = &s.link {
+        o.push_str("<w:link");
+        attr(o, "w:val", b);
+        o.push_str("/>");
+    }
+    if let Some(p) = s.ui_priority {
+        let _ = write!(o, "<w:uiPriority w:val=\"{p}\"/>");
+    }
+    if s.hidden {
+        o.push_str("<w:semiHidden/>");
+    }
+    if s.q_format {
+        o.push_str("<w:qFormat/>");
+    }
+    if s.kind != StyleKind::Table || s.tbl.is_none() {
+        let mut pp = String::new();
+        para_props_body(&mut pp, &s.ppr);
+        if !pp.is_empty() {
+            o.push_str("<w:pPr>");
+            o.push_str(&pp);
+            o.push_str("</w:pPr>");
+        }
+    }
+    run_props(o, &s.rpr);
+    if let Some(t) = &s.tbl {
+        table_props(o, t, false);
+    }
+    o.push_str("</w:style>");
+}
+
+fn level(o: &mut String, ilvl: usize, l: &Level, in_override: bool) {
+    let _ = write!(o, "<w:lvl w:ilvl=\"{ilvl}\">");
+    let _ = write!(o, "<w:start w:val=\"{}\"/>", l.start);
+    let _ = write!(o, "<w:numFmt w:val=\"{}\"/>", l.fmt);
+    if let Some(r) = l.restart {
+        let _ = write!(o, "<w:lvlRestart w:val=\"{r}\"/>");
+    }
+    if let Some(s) = &l.style {
+        o.push_str("<w:pStyle");
+        attr(o, "w:val", s);
+        o.push_str("/>");
+    }
+    if l.legal {
+        o.push_str("<w:isLgl/>");
+    }
+    if l.suff != "tab" {
+        let _ = write!(o, "<w:suff w:val=\"{}\"/>", l.suff);
+    }
+    o.push_str("<w:lvlText");
+    attr(o, "w:val", &l.text);
+    o.push_str("/>");
+    let jc = match l.jc {
+        Jc::Right => "right",
+        Jc::Center => "center",
+        _ => "left",
+    };
+    let _ = write!(o, "<w:lvlJc w:val=\"{jc}\"/>");
+    let mut pp = String::new();
+    para_props_body(&mut pp, &l.ppr);
+    if !pp.is_empty() {
+        o.push_str("<w:pPr>");
+        o.push_str(&pp);
+        o.push_str("</w:pPr>");
+    }
+    run_props(o, &l.rpr);
+    let _ = in_override;
+    o.push_str("</w:lvl>");
+}
+
+pub fn numbering(n: &Numbering) -> Option<String> {
+    if n.abstracts.is_empty() && n.nums.is_empty() {
+        return None;
+    }
+    let mut o = String::from(XML_HEAD);
+    let _ = write!(o, "<w:numbering xmlns:w=\"{NS_W}\">");
+    for a in &n.abstracts {
+        let _ = write!(o, "<w:abstractNum w:abstractNumId=\"{}\">", a.id);
+        let _ = write!(
+            o,
+            "<w:multiLevelType w:val=\"{}\"/>",
+            if a.multi_level {
+                "multilevel"
+            } else {
+                "singleLevel"
+            }
+        );
+        for (i, l) in a.levels.iter().enumerate().take(9) {
+            level(&mut o, i, l, false);
+        }
+        o.push_str("</w:abstractNum>");
+    }
+    for m in &n.nums {
+        let _ = write!(
+            o,
+            "<w:num w:numId=\"{}\"><w:abstractNumId w:val=\"{}\"/>",
+            m.id, m.abstract_id
+        );
+        for (lvl, start, def) in &m.overrides {
+            let _ = write!(o, "<w:lvlOverride w:ilvl=\"{lvl}\">");
+            if let Some(s) = start {
+                let _ = write!(o, "<w:startOverride w:val=\"{s}\"/>");
+            }
+            if let Some(d) = def {
+                level(&mut o, *lvl as usize, d, true);
+            }
+            o.push_str("</w:lvlOverride>");
+        }
+        o.push_str("</w:num>");
+    }
+    o.push_str("</w:numbering>");
+    Some(o)
+}
+
+pub fn settings(doc: &Document) -> String {
+    let s = &doc.settings;
+    let mut o = String::from(XML_HEAD);
+    let _ = write!(o, "<w:settings xmlns:w=\"{NS_W}\">");
+    if s.mirror_margins {
+        o.push_str("<w:mirrorMargins/>");
+    }
+    if s.gutter_at_top {
+        o.push_str("<w:gutterAtTop/>");
+    }
+    let _ = write!(
+        o,
+        "<w:defaultTabStop w:val=\"{}\"/>",
+        s.default_tab_stop.unwrap_or(720).max(1)
+    );
+    if s.even_and_odd_headers {
+        o.push_str("<w:evenAndOddHeaders/>");
+    }
+    for (tag, pos, fmt, start, restart, has_sep) in [
+        (
+            "footnotePr",
+            s.footnote_pos,
+            s.footnote_fmt,
+            s.footnote_start,
+            s.footnote_restart,
+            !doc.footnotes.is_empty(),
+        ),
+        (
+            "endnotePr",
+            None,
+            s.endnote_fmt,
+            s.endnote_start,
+            s.endnote_restart,
+            !doc.endnotes.is_empty(),
+        ),
+    ] {
+        if pos.is_none() && fmt.is_none() && start.is_none() && restart.is_none() && !has_sep {
+            continue;
+        }
+        let _ = write!(o, "<w:{tag}>");
+        if let Some(p) = pos {
+            let _ = write!(o, "<w:pos w:val=\"{p}\"/>");
+        }
+        if let Some(f) = fmt {
+            let _ = write!(o, "<w:numFmt w:val=\"{f}\"/>");
+        }
+        if let Some(v) = start {
+            let _ = write!(o, "<w:numStart w:val=\"{v}\"/>");
+        }
+        if let Some(r) = restart {
+            let _ = write!(o, "<w:numRestart w:val=\"{r}\"/>");
+        }
+        let n = if tag == "footnotePr" {
+            "footnote"
+        } else {
+            "endnote"
+        };
+        if has_sep {
+            let _ = write!(o, "<w:{n} w:id=\"-1\"/><w:{n} w:id=\"0\"/>");
+        }
+        let _ = write!(o, "</w:{tag}>");
+    }
+    o.push_str("<w:compat><w:compatSetting w:name=\"compatibilityMode\" w:uri=\"http://schemas.microsoft.com/office/word\" w:val=\"15\"/></w:compat></w:settings>");
+    o
+}
+
+pub fn notes(w: &mut W, notes: &[Note], endnotes: bool, rels: &mut Rels) -> String {
+    let tag = if endnotes { "endnote" } else { "footnote" };
+    let mut o = root(if endnotes { "endnotes" } else { "footnotes" });
+    let _ = write!(
+        o,
+        "<w:{tag} w:type=\"separator\" w:id=\"-1\"><w:p><w:r><w:separator/></w:r></w:p></w:{tag}><w:{tag} w:type=\"continuationSeparator\" w:id=\"0\"><w:p><w:r><w:continuationSeparator/></w:r></w:p></w:{tag}>"
+    );
+    w.depth += 1;
+    for n in notes {
+        let _ = write!(o, "<w:{tag} w:id=\"{}\">", n.id);
+        w.story(&mut o, &n.content, rels);
+        let _ = write!(o, "</w:{tag}>");
+    }
+    w.depth -= 1;
+    let _ = write!(
+        o,
+        "</w:{}>",
+        if endnotes { "endnotes" } else { "footnotes" }
+    );
+    o
+}
+
+pub fn comments(w: &mut W, comments: &[Comment], rels: &mut Rels) -> String {
+    let mut o = root("comments");
+    w.depth += 1;
+    for c in comments {
+        let _ = write!(o, "<w:comment w:id=\"{}\"", c.id);
+        attr(&mut o, "w:author", &c.author);
+        if let Some(d) = &c.date {
+            attr(&mut o, "w:date", d);
+        }
+        attr(&mut o, "w:initials", &c.initials);
+        o.push('>');
+        w.story(&mut o, &c.content, rels);
+        o.push_str("</w:comment>");
+    }
+    w.depth -= 1;
+    o.push_str("</w:comments>");
+    o
+}
diff --git a/crates/exav-render/src/formats/office/docs/docx/props.rs b/crates/exav-render/src/formats/office/docs/docx/props.rs
new file mode 100644
index 00000000..a44b7e31
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/docx/props.rs
@@ -0,0 +1,647 @@
+//! Property elements (WordprocessingML w:rPr, w:pPr, w:tblPr, ...) written in
+//! schema order.
+
+use crate::formats::office::common::xmlout::{esc_into, hex};
+use crate::formats::office::docs::model::*;
+use std::fmt::Write;
+
+pub fn attr(o: &mut String, k: &str, v: &str) {
+    o.push(' ');
+    o.push_str(k);
+    o.push_str("=\"");
+    esc_into(o, v);
+    o.push('"');
+}
+
+fn num_attr(o: &mut String, k: &str, v: impl std::fmt::Display) {
+    let _ = write!(o, " {k}=\"{v}\"");
+}
+
+fn color_val(c: Color) -> String {
+    match c {
+        Color::Auto => "auto".to_string(),
+        Color::Rgb(v) => hex(v),
+    }
+}
+
+/// `<w:name w:val="..."/>` for a boolean toggle.
+fn toggle(o: &mut String, name: &str, v: Option<bool>) {
+    match v {
+        Some(true) => {
+            let _ = write!(o, "<w:{name}/>");
+        }
+        Some(false) => {
+            let _ = write!(o, "<w:{name} w:val=\"0\"/>");
+        }
+        None => {}
+    }
+}
+
+pub fn border(o: &mut String, name: &str, b: &Border) {
+    let _ = write!(o, "<w:{name}");
+    attr(o, "w:val", b.style);
+    num_attr(
+        o,
+        "w:sz",
+        b.size
+            .clamp(2, 96)
+            .max(if b.style == "nil" || b.style == "none" {
+                0
+            } else {
+                2
+            }),
+    );
+    num_attr(o, "w:space", b.space.min(31));
+    attr(o, "w:color", &color_val(b.color));
+    if b.shadow {
+        o.push_str(" w:shadow=\"1\"");
+    }
+    o.push_str("/>");
+}
+
+pub fn shading(o: &mut String, s: &Shading) {
+    o.push_str("<w:shd");
+    attr(o, "w:val", s.pattern);
+    attr(
+        o,
+        "w:color",
+        &s.color.map(color_val).unwrap_or_else(|| "auto".into()),
+    );
+    attr(
+        o,
+        "w:fill",
+        &s.fill.map(color_val).unwrap_or_else(|| "auto".into()),
+    );
+    o.push_str("/>");
+}
+
+pub fn run_props_body(o: &mut String, p: &RunProps) {
+    if let Some(s) = &p.style {
+        o.push_str("<w:rStyle");
+        attr(o, "w:val", s);
+        o.push_str("/>");
+    }
+    let f = &p.fonts;
+    if f.ascii.is_some() || f.hansi.is_some() || f.east_asia.is_some() || f.cs.is_some() {
+        o.push_str("<w:rFonts");
+        if let Some(v) = &f.ascii {
+            attr(o, "w:ascii", v);
+        }
+        if let Some(v) = &f.hansi {
+            attr(o, "w:hAnsi", v);
+        }
+        if let Some(v) = &f.east_asia {
+            attr(o, "w:eastAsia", v);
+        }
+        if let Some(v) = &f.cs {
+            attr(o, "w:cs", v);
+        }
+        o.push_str("/>");
+    }
+    toggle(o, "b", p.bold);
+    toggle(o, "bCs", p.bold_cs);
+    toggle(o, "i", p.italic);
+    toggle(o, "iCs", p.italic_cs);
+    toggle(o, "caps", p.caps);
+    toggle(o, "smallCaps", p.small_caps);
+    toggle(o, "strike", p.strike);
+    toggle(o, "dstrike", p.dstrike);
+    toggle(o, "outline", p.outline);
+    toggle(o, "shadow", p.shadow);
+    toggle(o, "emboss", p.emboss);
+    toggle(o, "imprint", p.imprint);
+    toggle(o, "vanish", p.vanish);
+    if let Some(c) = p.color {
+        o.push_str("<w:color");
+        attr(o, "w:val", &color_val(c));
+        o.push_str("/>");
+    }
+    if let Some(v) = p.spacing {
+        let _ = write!(o, "<w:spacing w:val=\"{v}\"/>");
+    }
+    if let Some(v) = p.scale {
+        let _ = write!(o, "<w:w w:val=\"{}\"/>", v.clamp(1, 600));
+    }
+    if let Some(v) = p.kerning {
+        let _ = write!(o, "<w:kern w:val=\"{v}\"/>");
+    }
+    if let Some(v) = p.position {
+        let _ = write!(o, "<w:position w:val=\"{v}\"/>");
+    }
+    if let Some(v) = p.size {
+        let _ = write!(o, "<w:sz w:val=\"{}\"/>", v.clamp(1, 3277));
+    }
+    if let Some(v) = p.size_cs {
+        let _ = write!(o, "<w:szCs w:val=\"{}\"/>", v.clamp(1, 3277));
+    }
+    if let Some(h) = p.highlight {
+        o.push_str("<w:highlight");
+        attr(o, "w:val", h);
+        o.push_str("/>");
+    }
+    if let Some(u) = p.underline {
+        o.push_str("<w:u");
+        attr(o, "w:val", u);
+        if let Some(c) = p.underline_color {
+            attr(o, "w:color", &color_val(c));
+        }
+        o.push_str("/>");
+    }
+    if let Some(b) = &p.border {
+        border(o, "bdr", b);
+    }
+    if let Some(s) = &p.shading {
+        shading(o, s);
+    }
+    if let Some(v) = p.vert_align {
+        let v = match v {
+            VertAlign::Baseline => "baseline",
+            VertAlign::Superscript => "superscript",
+            VertAlign::Subscript => "subscript",
+        };
+        let _ = write!(o, "<w:vertAlign w:val=\"{v}\"/>");
+    }
+    toggle(o, "rtl", p.rtl);
+    toggle(o, "cs", p.cs);
+    if p.lang.is_some() || p.lang_east_asia.is_some() || p.lang_bidi.is_some() {
+        o.push_str("<w:lang");
+        if let Some(v) = &p.lang {
+            attr(o, "w:val", v);
+        }
+        if let Some(v) = &p.lang_east_asia {
+            attr(o, "w:eastAsia", v);
+        }
+        if let Some(v) = &p.lang_bidi {
+            attr(o, "w:bidi", v);
+        }
+        o.push_str("/>");
+    }
+}
+
+pub fn run_props(o: &mut String, p: &RunProps) {
+    let mut b = String::new();
+    run_props_body(&mut b, p);
+    if !b.is_empty() {
+        o.push_str("<w:rPr>");
+        o.push_str(&b);
+        o.push_str("</w:rPr>");
+    }
+}
+
+fn jc_val(j: Jc) -> &'static str {
+    match j {
+        Jc::Left => "left",
+        Jc::Center => "center",
+        Jc::Right => "right",
+        Jc::Both => "both",
+        Jc::Distribute => "distribute",
+    }
+}
+
+fn frame_pr(o: &mut String, f: &Frame) {
+    o.push_str("<w:framePr");
+    if let Some(v) = f.drop_cap {
+        attr(o, "w:dropCap", v);
+    }
+    if let Some(v) = f.lines {
+        num_attr(o, "w:lines", v);
+    }
+    if let Some(v) = f.width {
+        num_attr(o, "w:w", v);
+    }
+    if let Some(v) = f.height {
+        num_attr(o, "w:h", v);
+        attr(
+            o,
+            "w:hRule",
+            if f.height_exact { "exact" } else { "atLeast" },
+        );
+    }
+    if let Some(v) = f.h_space {
+        num_attr(o, "w:hSpace", v);
+    }
+    if let Some(v) = f.v_space {
+        num_attr(o, "w:vSpace", v);
+    }
+    if let Some(v) = f.wrap {
+        attr(o, "w:wrap", v);
+    }
+    if let Some(v) = f.h_anchor {
+        attr(o, "w:hAnchor", v);
+    }
+    if let Some(v) = f.v_anchor {
+        attr(o, "w:vAnchor", v);
+    }
+    if let Some(v) = f.x {
+        num_attr(o, "w:x", v);
+    }
+    if let Some(v) = f.x_align {
+        attr(o, "w:xAlign", v);
+    }
+    if let Some(v) = f.y {
+        num_attr(o, "w:y", v);
+    }
+    if let Some(v) = f.y_align {
+        attr(o, "w:yAlign", v);
+    }
+    o.push_str("/>");
+}
+
+/// The children of a w:pPr, in schema order, without the paragraph mark's
+/// run properties.
+pub fn para_props_body(o: &mut String, p: &ParaProps) {
+    if let Some(s) = &p.style {
+        o.push_str("<w:pStyle");
+        attr(o, "w:val", s);
+        o.push_str("/>");
+    }
+    toggle(o, "keepNext", p.keep_next);
+    toggle(o, "keepLines", p.keep_lines);
+    toggle(o, "pageBreakBefore", p.page_break_before);
+    if let Some(f) = &p.frame {
+        frame_pr(o, f);
+    }
+    toggle(o, "widowControl", p.widow_control);
+    if p.num_id.is_some() || p.num_level.is_some() {
+        o.push_str("<w:numPr>");
+        if let Some(l) = p.num_level {
+            let _ = write!(o, "<w:ilvl w:val=\"{}\"/>", l.min(8));
+        }
+        if let Some(n) = p.num_id {
+            let _ = write!(o, "<w:numId w:val=\"{n}\"/>");
+        }
+        o.push_str("</w:numPr>");
+    }
+    toggle(o, "suppressLineNumbers", p.suppress_line_numbers);
+    if !p.borders.is_empty() {
+        o.push_str("<w:pBdr>");
+        let b = &p.borders;
+        for (name, v) in [
+            ("top", &b.top),
+            ("left", &b.left),
+            ("bottom", &b.bottom),
+            ("right", &b.right),
+            ("between", &b.between),
+        ] {
+            if let Some(v) = v {
+                border(o, name, v);
+            }
+        }
+        o.push_str("</w:pBdr>");
+    }
+    if let Some(s) = &p.shading {
+        shading(o, s);
+    }
+    if !p.tabs.is_empty() {
+        o.push_str("<w:tabs>");
+        for t in p.tabs.iter().take(64) {
+            let kind = match t.kind {
+                TabKind::Left => "left",
+                TabKind::Center => "center",
+                TabKind::Right => "right",
+                TabKind::Decimal => "decimal",
+                TabKind::Bar => "bar",
+                TabKind::Clear => "clear",
+            };
+            let leader = match t.leader {
+                TabLeader::None => "none",
+                TabLeader::Dot => "dot",
+                TabLeader::Hyphen => "hyphen",
+                TabLeader::Underscore => "underscore",
+                TabLeader::MiddleDot => "middleDot",
+                TabLeader::Heavy => "heavy",
+            };
+            let _ = write!(
+                o,
+                "<w:tab w:val=\"{kind}\" w:leader=\"{leader}\" w:pos=\"{}\"/>",
+                t.pos
+            );
+        }
+        o.push_str("</w:tabs>");
+    }
+    toggle(o, "bidi", p.bidi);
+    toggle(o, "snapToGrid", p.snap_to_grid);
+    if p.space_before.is_some()
+        || p.space_after.is_some()
+        || p.line.is_some()
+        || p.before_auto.is_some()
+        || p.after_auto.is_some()
+    {
+        o.push_str("<w:spacing");
+        if let Some(v) = p.space_before {
+            num_attr(o, "w:before", v.max(0));
+        }
+        if let Some(v) = p.before_auto {
+            num_attr(o, "w:beforeAutospacing", u8::from(v));
+        }
+        if let Some(v) = p.space_after {
+            num_attr(o, "w:after", v.max(0));
+        }
+        if let Some(v) = p.after_auto {
+            num_attr(o, "w:afterAutospacing", u8::from(v));
+        }
+        if let Some(v) = p.line {
+            num_attr(o, "w:line", v.max(0));
+            attr(
+                o,
+                "w:lineRule",
+                match p.line_rule.unwrap_or(LineRule::Auto) {
+                    LineRule::Auto => "auto",
+                    LineRule::Exact => "exact",
+                    LineRule::AtLeast => "atLeast",
+                },
+            );
+        }
+        o.push_str("/>");
+    }
+    if p.ind_left.is_some()
+        || p.ind_right.is_some()
+        || p.ind_first_line.is_some()
+        || p.ind_hanging.is_some()
+    {
+        o.push_str("<w:ind");
+        if let Some(v) = p.ind_left {
+            num_attr(o, "w:left", v);
+        }
+        if let Some(v) = p.ind_right {
+            num_attr(o, "w:right", v);
+        }
+        if let Some(v) = p.ind_hanging {
+            num_attr(o, "w:hanging", v.max(0));
+        } else if let Some(v) = p.ind_first_line {
+            num_attr(o, "w:firstLine", v.max(0));
+        }
+        o.push_str("/>");
+    }
+    toggle(o, "contextualSpacing", p.contextual_spacing);
+    if let Some(j) = p.jc {
+        let _ = write!(o, "<w:jc w:val=\"{}\"/>", jc_val(j));
+    }
+    if let Some(l) = p.outline_level {
+        let _ = write!(o, "<w:outlineLvl w:val=\"{}\"/>", l.min(9));
+    }
+}
+
+pub fn para_props(o: &mut String, p: &ParaProps, mark: &RunProps, section: Option<&str>) {
+    let mut b = String::new();
+    para_props_body(&mut b, p);
+    run_props(&mut b, mark);
+    if let Some(s) = section {
+        b.push_str(s);
+    }
+    if !b.is_empty() {
+        o.push_str("<w:pPr>");
+        o.push_str(&b);
+        o.push_str("</w:pPr>");
+    }
+}
+
+pub fn width(o: &mut String, name: &str, w: Width) {
+    match w {
+        Width::Auto => {
+            let _ = write!(o, "<w:{name} w:w=\"0\" w:type=\"auto\"/>");
+        }
+        Width::Twips(v) => {
+            let _ = write!(o, "<w:{name} w:w=\"{v}\" w:type=\"dxa\"/>");
+        }
+        Width::Pct(v) => {
+            let _ = write!(o, "<w:{name} w:w=\"{v}\" w:type=\"pct\"/>");
+        }
+    }
+}
+
+fn margins(o: &mut String, name: &str, m: &Margins) {
+    if m.top.is_none() && m.left.is_none() && m.bottom.is_none() && m.right.is_none() {
+        return;
+    }
+    let _ = write!(o, "<w:{name}>");
+    for (n, v) in [
+        ("top", m.top),
+        ("left", m.left),
+        ("bottom", m.bottom),
+        ("right", m.right),
+    ] {
+        if let Some(v) = v {
+            let _ = write!(o, "<w:{n} w:w=\"{}\" w:type=\"dxa\"/>", v.max(0));
+        }
+    }
+    let _ = write!(o, "</w:{name}>");
+}
+
+fn table_borders(o: &mut String, name: &str, b: &TableBorders, cell: bool) {
+    let any = b.top.is_some()
+        || b.left.is_some()
+        || b.bottom.is_some()
+        || b.right.is_some()
+        || b.inside_h.is_some()
+        || b.inside_v.is_some();
+    if !any {
+        return;
+    }
+    let _ = write!(o, "<w:{name}>");
+    let all = [
+        ("top", &b.top),
+        ("left", &b.left),
+        ("bottom", &b.bottom),
+        ("right", &b.right),
+        ("insideH", &b.inside_h),
+        ("insideV", &b.inside_v),
+    ];
+    for (n, v) in all {
+        if let Some(v) = v {
+            border(o, n, v);
+        }
+    }
+    let _ = cell;
+    let _ = write!(o, "</w:{name}>");
+}
+
+pub fn table_props(o: &mut String, t: &TableProps, with_style: bool) {
+    let mut b = String::new();
+    if with_style && let Some(s) = &t.style {
+        b.push_str("<w:tblStyle");
+        attr(&mut b, "w:val", s);
+        b.push_str("/>");
+    }
+    if let Some(f) = &t.float {
+        b.push_str("<w:tblpPr");
+        if let Some(v) = f.h_anchor {
+            attr(&mut b, "w:horzAnchor", v);
+        }
+        if let Some(v) = f.v_anchor {
+            attr(&mut b, "w:vertAnchor", v);
+        }
+        if let Some(v) = f.x {
+            num_attr(&mut b, "w:tblpX", v);
+        }
+        if let Some(v) = f.y {
+            num_attr(&mut b, "w:tblpY", v);
+        }
+        if let Some(v) = f.x_align {
+            attr(&mut b, "w:tblpXSpec", v);
+        }
+        if let Some(v) = f.y_align {
+            attr(&mut b, "w:tblpYSpec", v);
+        }
+        b.push_str("/>");
+    }
+    if t.bidi {
+        b.push_str("<w:bidiVisual/>");
+    }
+    if let Some(w) = t.width {
+        width(&mut b, "tblW", w);
+    }
+    if let Some(j) = t.jc {
+        let _ = write!(b, "<w:jc w:val=\"{}\"/>", jc_val(j));
+    }
+    if let Some(v) = t.cell_spacing {
+        let _ = write!(b, "<w:tblCellSpacing w:w=\"{v}\" w:type=\"dxa\"/>");
+    }
+    if let Some(v) = t.indent {
+        let _ = write!(b, "<w:tblInd w:w=\"{v}\" w:type=\"dxa\"/>");
+    }
+    table_borders(&mut b, "tblBorders", &t.borders, false);
+    if let Some(s) = &t.shading {
+        shading(&mut b, s);
+    }
+    if t.fixed_layout {
+        b.push_str("<w:tblLayout w:type=\"fixed\"/>");
+    }
+    margins(&mut b, "tblCellMar", &t.cell_margins);
+    if !b.is_empty() || with_style {
+        o.push_str("<w:tblPr>");
+        o.push_str(&b);
+        o.push_str("</w:tblPr>");
+    }
+}
+
+pub fn row_props(o: &mut String, r: &RowProps) {
+    let mut b = String::new();
+    if r.grid_before > 0 {
+        let _ = write!(b, "<w:gridBefore w:val=\"{}\"/>", r.grid_before);
+    }
+    if r.grid_after > 0 {
+        let _ = write!(b, "<w:gridAfter w:val=\"{}\"/>", r.grid_after);
+    }
+    if let Some(w) = r.width_before {
+        width(&mut b, "wBefore", w);
+    }
+    if let Some(w) = r.width_after {
+        width(&mut b, "wAfter", w);
+    }
+    if r.cant_split {
+        b.push_str("<w:cantSplit/>");
+    }
+    if let Some(h) = r.height {
+        let _ = write!(
+            b,
+            "<w:trHeight w:val=\"{}\" w:hRule=\"{}\"/>",
+            h.max(0),
+            if r.height_exact { "exact" } else { "atLeast" }
+        );
+    }
+    if r.header {
+        b.push_str("<w:tblHeader/>");
+    }
+    if let Some(j) = r.jc {
+        let _ = write!(b, "<w:jc w:val=\"{}\"/>", jc_val(j));
+    }
+    if !b.is_empty() {
+        o.push_str("<w:trPr>");
+        o.push_str(&b);
+        o.push_str("</w:trPr>");
+    }
+}
+
+pub fn cell_props(o: &mut String, c: &CellProps) {
+    let mut b = String::new();
+    if let Some(w) = c.width {
+        width(&mut b, "tcW", w);
+    }
+    if c.grid_span > 1 {
+        let _ = write!(b, "<w:gridSpan w:val=\"{}\"/>", c.grid_span);
+    }
+    match c.v_merge {
+        VMerge::None => {}
+        VMerge::Restart => b.push_str("<w:vMerge w:val=\"restart\"/>"),
+        VMerge::Continue => b.push_str("<w:vMerge/>"),
+    }
+    table_borders(&mut b, "tcBorders", &c.borders, true);
+    if let Some(s) = &c.shading {
+        shading(&mut b, s);
+    }
+    if c.no_wrap {
+        b.push_str("<w:noWrap/>");
+    }
+    margins(&mut b, "tcMar", &c.margins);
+    if let Some(d) = c.text_direction {
+        let _ = write!(b, "<w:textDirection w:val=\"{d}\"/>");
+    }
+    if c.fit_text {
+        b.push_str("<w:tcFitText/>");
+    }
+    if let Some(v) = c.v_align {
+        let v = match v {
+            VAlign::Top => "top",
+            VAlign::Center => "center",
+            VAlign::Bottom => "bottom",
+        };
+        let _ = write!(b, "<w:vAlign w:val=\"{v}\"/>");
+    }
+    if !b.is_empty() {
+        o.push_str("<w:tcPr>");
+        o.push_str(&b);
+        o.push_str("</w:tcPr>");
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn run_properties_come_in_schema_order() {
+        let p = RunProps {
+            bold: Some(true),
+            size: Some(24),
+            color: Some(Color::Rgb(0xFF0000)),
+            underline: Some("single"),
+            italic: Some(false),
+            ..RunProps::default()
+        };
+        let mut o = String::new();
+        run_props(&mut o, &p);
+        assert_eq!(
+            o,
+            "<w:rPr><w:b/><w:i w:val=\"0\"/><w:color w:val=\"FF0000\"/><w:sz w:val=\"24\"/><w:u w:val=\"single\"/></w:rPr>"
+        );
+        // Sizes the format cannot hold are cut to its range.
+        let big = RunProps {
+            size: Some(100_000),
+            ..RunProps::default()
+        };
+        let mut o = String::new();
+        run_props(&mut o, &big);
+        assert_eq!(o, "<w:rPr><w:sz w:val=\"3277\"/></w:rPr>");
+    }
+
+    #[test]
+    fn paragraph_properties() {
+        let p = ParaProps {
+            style: Some("Heading1".into()),
+            jc: Some(Jc::Center),
+            ind_left: Some(720),
+            ind_first_line: Some(360),
+            space_after: Some(120),
+            num_id: Some(3),
+            num_level: Some(1),
+            ..ParaProps::default()
+        };
+        let mut o = String::new();
+        para_props(&mut o, &p, &RunProps::default(), None);
+        assert_eq!(
+            o,
+            "<w:pPr><w:pStyle w:val=\"Heading1\"/><w:numPr><w:ilvl w:val=\"1\"/><w:numId w:val=\"3\"/></w:numPr><w:spacing w:after=\"120\"/><w:ind w:left=\"720\" w:firstLine=\"360\"/><w:jc w:val=\"center\"/></w:pPr>"
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/error.rs b/crates/exav-render/src/formats/office/docs/error.rs
new file mode 100644
index 00000000..672cff91
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/error.rs
@@ -0,0 +1,70 @@
+use std::fmt;
+
+/// Why a document was not converted.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum Error {
+    /// The bytes are not a document of the format asked for.
+    NotFormat(String),
+    /// Encrypted with a password.
+    Encrypted,
+    /// A valid document of a version or kind this reader does not convert.
+    Unsupported(String),
+    /// Past one of the [`Limits`](crate::formats::office::docs::Limits): what it was.
+    TooLarge(&'static str),
+    /// Damaged beyond what this reader recovers from.
+    Malformed(String),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotFormat(why) => write!(f, "not a document of this format: {why}"),
+            Error::Encrypted => f.write_str("encrypted with a password"),
+            Error::Unsupported(what) => write!(f, "unsupported: {what}"),
+            Error::TooLarge(what) => write!(f, "too large: {what}"),
+            Error::Malformed(why) => write!(f, "damaged: {why}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl Error {
+    /// A short machine-readable kind: `not-format`, `encrypted`,
+    /// `unsupported`, `too-large` or `malformed`.
+    pub fn kind(&self) -> &'static str {
+        match self {
+            Error::NotFormat(_) => "not-format",
+            Error::Encrypted => "encrypted",
+            Error::Unsupported(_) => "unsupported",
+            Error::TooLarge(_) => "too-large",
+            Error::Malformed(_) => "malformed",
+        }
+    }
+}
+
+impl From<crate::formats::office::common::xml::Error> for Error {
+    fn from(e: crate::formats::office::common::xml::Error) -> Self {
+        use crate::formats::office::common::xml::Error as X;
+        match e {
+            X::Malformed(why) => Error::Malformed(format!("XML: {why}")),
+            X::TooLarge(what) => Error::TooLarge(what),
+            X::NotFormat(why) => Error::NotFormat(why),
+        }
+    }
+}
+
+impl From<crate::formats::office::common::package::Error> for Error {
+    fn from(e: crate::formats::office::common::package::Error) -> Self {
+        use crate::formats::office::common::package::Error as P;
+        match e {
+            P::NotZip(why) => Error::NotFormat(format!("not a ZIP package: {why}")),
+            P::Encrypted => Error::Encrypted,
+            P::TooLarge => Error::TooLarge("a package part"),
+            P::Write(why) => Error::Malformed(format!("writing the package: {why}")),
+        }
+    }
+}
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
diff --git a/crates/exav-render/src/formats/office/docs/fields.rs b/crates/exav-render/src/formats/office/docs/fields.rs
new file mode 100644
index 00000000..56a4e2b5
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/fields.rs
@@ -0,0 +1,77 @@
+//! Field instructions as the formats write them.
+
+/// `HYPERLINK "target" \l "anchor" \o "tip"`: the target, the anchor and the
+/// tooltip. Targets that run script are dropped.
+pub fn parse_hyperlink(instr: &str) -> (Option<String>, Option<String>, Option<String>) {
+    let mut target = None;
+    let mut anchor = None;
+    let mut tip = None;
+    let mut words: Vec<String> = vec![];
+    let mut cur = String::new();
+    let mut quoted = false;
+    let mut had = false;
+    for c in instr.chars() {
+        match c {
+            '"' => {
+                quoted = !quoted;
+                had = true;
+            }
+            c if c.is_whitespace() && !quoted => {
+                if !cur.is_empty() || had {
+                    words.push(std::mem::take(&mut cur));
+                    had = false;
+                }
+            }
+            c => cur.push(c),
+        }
+    }
+    if !cur.is_empty() || had {
+        words.push(cur);
+    }
+    let mut i = 1;
+    while i < words.len() {
+        match words[i].as_str() {
+            "\\l" => {
+                anchor = words.get(i + 1).cloned();
+                i += 1;
+            }
+            "\\o" => {
+                tip = words.get(i + 1).cloned();
+                i += 1;
+            }
+            "\\t" | "\\m" | "\\n" => {
+                i += 1;
+            }
+            w if !w.starts_with('\\') && target.is_none() => target = Some(w.to_string()),
+            _ => {}
+        }
+        i += 1;
+    }
+    let target = target.filter(|t| safe_target(t));
+    (target, anchor, tip)
+}
+
+/// Whether a link target is one a viewer may follow: not a script or data
+/// URL.
+pub fn safe_target(t: &str) -> bool {
+    let l = t.trim().to_ascii_lowercase();
+    !(l.starts_with("javascript:") || l.starts_with("vbscript:") || l.starts_with("data:"))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn hyperlink_instructions() {
+        let (t, a, tip) = parse_hyperlink("HYPERLINK \"http://example.org/a b\" \\o \"Tip\"");
+        assert_eq!(t.as_deref(), Some("http://example.org/a b"));
+        assert_eq!(tip.as_deref(), Some("Tip"));
+        assert!(a.is_none());
+        let (t, a, _) = parse_hyperlink("HYPERLINK \\l \"_Toc1\"");
+        assert!(t.is_none());
+        assert_eq!(a.as_deref(), Some("_Toc1"));
+        let (t, _, _) = parse_hyperlink("HYPERLINK \"javascript:alert(1)\"");
+        assert!(t.is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/grid.rs b/crates/exav-render/src/formats/office/docs/grid.rs
new file mode 100644
index 00000000..57aa78ad
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/grid.rs
@@ -0,0 +1,169 @@
+//! Tables whose rows give their own cell edges (DOC, RTF, Word 2003 XML): the
+//! edges of all rows make up the grid, and a cell spans the grid columns
+//! between its edges.
+
+use crate::formats::office::docs::model::*;
+
+const TOL: i32 = 3;
+
+/// A cell of a row as its reader found it.
+pub struct CellIn {
+    pub props: CellProps,
+    pub content: Vec<Block>,
+    /// Merged into the cell before it (its edge is joined to that cell).
+    pub merged_left: bool,
+}
+
+/// A row: the cell edges in twips (one more than cells), and the cells.
+pub struct RowIn {
+    pub edges: Vec<i32>,
+    pub props: RowProps,
+    pub cells: Vec<CellIn>,
+}
+
+fn nearest(grid: &[i32], x: i32) -> usize {
+    let mut best = 0usize;
+    for (i, g) in grid.iter().enumerate() {
+        if (g - x).abs() < (grid[best] - x).abs() {
+            best = i;
+        }
+    }
+    best
+}
+
+/// The table made of `rows`, with `props` for the whole table.
+pub fn build(rows: Vec<RowIn>, mut props: TableProps) -> Table {
+    let mut all: Vec<i32> = rows.iter().flat_map(|r| r.edges.iter().copied()).collect();
+    all.sort_unstable();
+    let mut grid: Vec<i32> = vec![];
+    for x in all {
+        if grid.last().is_none_or(|l| x - l > TOL) {
+            grid.push(x);
+        }
+    }
+    if grid.len() < 2 {
+        grid = vec![0, 1];
+    }
+    props.fixed_layout = true;
+    if props.width.is_none() {
+        props.width = Some(Width::Twips(grid[grid.len() - 1] - grid[0]));
+    }
+    let m = grid.len() - 1;
+    let mut table = Table {
+        props,
+        grid: grid.array_windows().map(|[a, b]| b - a).collect(),
+        rows: vec![],
+    };
+    for r in rows {
+        let mut row = Row {
+            props: r.props,
+            cells: vec![],
+        };
+        let mut placed: Vec<(usize, usize, Cell)> = vec![];
+        for (k, c) in r.cells.into_iter().enumerate() {
+            let (Some(&le), Some(&re)) = (r.edges.get(k), r.edges.get(k + 1)) else {
+                // A cell with no edges: its content joins the last cell.
+                if let Some(last) = placed.last_mut() {
+                    last.2.content.extend(c.content);
+                }
+                continue;
+            };
+            let (l, rr) = (nearest(&grid, le), nearest(&grid, re));
+            if c.merged_left
+                && let Some(prev) = placed.last_mut()
+            {
+                prev.1 = rr.max(prev.1);
+                continue;
+            }
+            let mut cell = Cell {
+                props: c.props,
+                content: if c.content.is_empty() {
+                    vec![Block::Para(Para::default())]
+                } else {
+                    c.content
+                },
+            };
+            cell.props.width = Some(Width::Twips((re - le).max(0)));
+            placed.push((l, rr, cell));
+        }
+        if placed.is_empty() {
+            continue;
+        }
+        let first = placed[0].0;
+        row.props.grid_before = first as u32;
+        if first > 0 {
+            row.props.width_before = Some(Width::Twips(grid[first] - grid[0]));
+        }
+        let last = placed[placed.len() - 1].1;
+        row.props.grid_after = m.saturating_sub(last) as u32;
+        if last < m {
+            row.props.width_after = Some(Width::Twips(grid[m] - grid[last]));
+        }
+        for (l, rr, mut c) in placed {
+            c.props.grid_span = rr.saturating_sub(l).max(1) as u32;
+            row.cells.push(c);
+        }
+        table.rows.push(row);
+    }
+    table
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn cell(merged_left: bool) -> CellIn {
+        CellIn {
+            props: CellProps::default(),
+            content: vec![],
+            merged_left,
+        }
+    }
+
+    #[test]
+    fn edges_make_the_grid_and_spans() {
+        let rows = vec![
+            RowIn {
+                edges: vec![0, 1000, 2000],
+                props: RowProps::default(),
+                cells: vec![cell(false), cell(false)],
+            },
+            RowIn {
+                edges: vec![0, 1000, 1500, 2000],
+                props: RowProps::default(),
+                cells: vec![cell(false), cell(false), cell(false)],
+            },
+            // The second and third cells are one.
+            RowIn {
+                edges: vec![0, 1000, 1500, 2000],
+                props: RowProps::default(),
+                cells: vec![cell(false), cell(false), cell(true)],
+            },
+        ];
+        let t = build(rows, TableProps::default());
+        assert_eq!(t.grid, vec![1000, 500, 500]);
+        assert_eq!(t.rows[0].cells[1].props.grid_span, 2);
+        assert_eq!(t.rows[1].cells.len(), 3);
+        assert_eq!(t.rows[2].cells.len(), 2);
+        assert_eq!(t.rows[2].cells[1].props.grid_span, 2);
+    }
+
+    #[test]
+    fn a_row_that_starts_late_has_grid_before() {
+        let rows = vec![
+            RowIn {
+                edges: vec![0, 1000, 2000],
+                props: RowProps::default(),
+                cells: vec![cell(false), cell(false)],
+            },
+            RowIn {
+                edges: vec![1000, 2000],
+                props: RowProps::default(),
+                cells: vec![cell(false)],
+            },
+        ];
+        let t = build(rows, TableProps::default());
+        assert_eq!(t.rows[1].props.grid_before, 1);
+        assert_eq!(t.rows[1].props.width_before, Some(Width::Twips(1000)));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/html/mime.rs b/crates/exav-render/src/formats/office/docs/html/mime.rs
new file mode 100644
index 00000000..9cc19ef3
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/html/mime.rs
@@ -0,0 +1,226 @@
+//! The HTML page and the pictures of a MIME-wrapped page: what Word saves as
+//! "Single File Web Page" (MHTML), often under the name `.doc`. A multipart
+//! message whose first HTML part is the page and whose image parts are named by
+//! their `Content-Location` or `Content-ID`.
+
+use crate::formats::office::common::base64;
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::limits::Budget;
+use exav_unpack::html::decode as html_utf8;
+
+/// Parts read, and levels of multipart in multipart.
+const MAX_PARTS: usize = 4096;
+const MAX_DEPTH: usize = 3;
+
+pub(super) struct Picture {
+    /// What the page may call it: the location as given, its last component,
+    /// the content ID. Lower case.
+    pub names: Vec<String>,
+    pub data: Vec<u8>,
+}
+
+pub(super) struct Mime {
+    pub html: String,
+    pub pictures: Vec<Picture>,
+}
+
+/// The page and pictures of `input` when it is a MIME message with an HTML part.
+pub(super) fn parse(input: &[u8], budget: &mut Budget) -> Result<Option<Mime>> {
+    let head = String::from_utf8_lossy(&input[..input.len().min(2048)]).to_ascii_lowercase();
+    if !head.trim_start().starts_with("mime-version:")
+        && !(head.contains("\nmime-version:") && head.contains("content-type:"))
+    {
+        return Ok(None);
+    }
+    let mut mime = Mime {
+        html: String::new(),
+        pictures: vec![],
+    };
+    let mut parts = 0;
+    let found = walk(input, 0, &mut parts, &mut mime, budget)?;
+    Ok((found && !mime.html.is_empty()).then_some(mime))
+}
+
+/// A message or part: its headers, and its body.
+fn split(data: &[u8]) -> (Vec<(String, String)>, &[u8]) {
+    let (end, skip) = ["\r\n\r\n", "\n\n"]
+        .iter()
+        .filter_map(|sep| find(data, sep.as_bytes()).map(|at| (at, sep.len())))
+        .min()
+        .unwrap_or((data.len(), 0));
+    let block = String::from_utf8_lossy(&data[..end]).to_string();
+    let mut headers: Vec<(String, String)> = vec![];
+    for line in block.lines() {
+        if line.starts_with([' ', '\t']) {
+            if let Some(last) = headers.last_mut() {
+                last.1.push(' ');
+                last.1.push_str(line.trim());
+            }
+        } else if let Some((k, v)) = line.split_once(':') {
+            headers.push((k.trim().to_ascii_lowercase(), v.trim().to_string()));
+        }
+    }
+    (headers, &data[(end + skip).min(data.len())..])
+}
+
+fn find(hay: &[u8], needle: &[u8]) -> Option<usize> {
+    hay.windows(needle.len()).position(|w| w == needle)
+}
+
+fn header<'a>(h: &'a [(String, String)], name: &str) -> Option<&'a str> {
+    h.iter().find(|(k, _)| k == name).map(|(_, v)| v.as_str())
+}
+
+/// A parameter of a header value: `charset=utf-8`, `boundary="x"`.
+fn param(value: &str, name: &str) -> Option<String> {
+    let lower = value.to_ascii_lowercase();
+    let at = lower.find(&format!("{name}="))?;
+    let rest = &value[at + name.len() + 1..];
+    let rest = rest.trim_start();
+    Some(if let Some(q) = rest.strip_prefix('"') {
+        q.split('"').next()?.to_string()
+    } else {
+        rest.split([';', ' ', '\t']).next()?.to_string()
+    })
+}
+
+fn walk(
+    data: &[u8],
+    depth: usize,
+    parts: &mut usize,
+    out: &mut Mime,
+    budget: &mut Budget,
+) -> Result<bool> {
+    *parts += 1;
+    if *parts > MAX_PARTS || depth > MAX_DEPTH {
+        return Ok(false);
+    }
+    let (h, body) = split(data);
+    let ctype = header(&h, "content-type").unwrap_or("text/plain");
+    let lower = ctype.to_ascii_lowercase();
+    if lower.starts_with("multipart/") {
+        let Some(boundary) = param(ctype, "boundary") else {
+            return Ok(false);
+        };
+        let delim = format!("--{boundary}");
+        let mut found = false;
+        let mut at = 0;
+        // The parts: between one delimiter line and the next.
+        let mut starts = vec![];
+        while let Some(p) = find(&body[at..], delim.as_bytes()).map(|p| p + at) {
+            if p == 0 || body[p - 1] == b'\n' {
+                starts.push(p);
+            }
+            at = p + delim.len();
+        }
+        for &[start, next] in starts.array_windows() {
+            let after = start + delim.len();
+            // The delimiter's line ends; the part follows, up to the line break
+            // that belongs to the next delimiter.
+            let Some(nl) = body[after..]
+                .iter()
+                .position(|&b| b == b'\n')
+                .map(|n| after + n + 1)
+            else {
+                continue;
+            };
+            let mut end = next;
+            if end > nl && body[end - 1] == b'\n' {
+                end -= 1;
+                if end > nl && body[end - 1] == b'\r' {
+                    end -= 1;
+                }
+            }
+            if end < nl {
+                continue;
+            }
+            found |= walk(&body[nl..end], depth + 1, parts, out, budget)?;
+        }
+        return Ok(found);
+    }
+    let decoded = decode(&h, body, budget)?;
+    if lower.starts_with("text/html") {
+        if out.html.is_empty() {
+            let text = match param(ctype, "charset")
+                .and_then(|c| encoding_rs::Encoding::for_label(c.as_bytes()))
+            {
+                Some(enc) => enc.decode_without_bom_handling(&decoded).0.into_owned(),
+                None => html_utf8(&decoded).into_owned(),
+            };
+            out.html = text;
+            return Ok(true);
+        }
+    } else if lower.starts_with("image/") {
+        let mut names = vec![];
+        if let Some(l) = header(&h, "content-location") {
+            let l = l.trim().to_ascii_lowercase();
+            if let Some(last) = l.rsplit(['/', '\\']).next() {
+                names.push(last.to_string());
+            }
+            names.push(l);
+        }
+        if let Some(id) = header(&h, "content-id") {
+            names.push(id.trim().trim_matches(['<', '>']).to_ascii_lowercase());
+        }
+        if !names.is_empty() {
+            out.pictures.push(Picture {
+                names,
+                data: decoded,
+            });
+        }
+    }
+    Ok(false)
+}
+
+/// A body with its transfer encoding undone.
+fn decode(h: &[(String, String)], body: &[u8], budget: &mut Budget) -> Result<Vec<u8>> {
+    let max = budget.limits.max_part as usize;
+    let out = match header(h, "content-transfer-encoding")
+        .map(|e| e.trim().to_ascii_lowercase())
+        .as_deref()
+    {
+        Some("quoted-printable") => quoted_printable(body),
+        Some("base64") => {
+            let text = String::from_utf8_lossy(body);
+            base64::decode(&text, max).unwrap_or_default()
+        }
+        _ => body.to_vec(),
+    };
+    budget.alloc(out.len() as u64)?;
+    Ok(out)
+}
+
+fn quoted_printable(b: &[u8]) -> Vec<u8> {
+    let mut out = Vec::with_capacity(b.len());
+    let mut i = 0;
+    while i < b.len() {
+        if b[i] != b'=' {
+            out.push(b[i]);
+            i += 1;
+            continue;
+        }
+        // A soft line break, or a byte in hexadecimal.
+        match (b.get(i + 1), b.get(i + 2)) {
+            (Some(b'\r'), Some(b'\n')) => i += 3,
+            (Some(b'\n'), _) => i += 2,
+            (Some(&a), Some(&c)) => {
+                let hex = |x: u8| (x as char).to_digit(16);
+                match (hex(a), hex(c)) {
+                    (Some(a), Some(c)) => {
+                        out.push((a * 16 + c) as u8);
+                        i += 3;
+                    }
+                    _ => {
+                        out.push(b'=');
+                        i += 1;
+                    }
+                }
+            }
+            _ => {
+                out.push(b'=');
+                i += 1;
+            }
+        }
+    }
+    out
+}
diff --git a/crates/exav-render/src/formats/office/docs/html/mod.rs b/crates/exav-render/src/formats/office/docs/html/mod.rs
new file mode 100644
index 00000000..aa922658
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/html/mod.rs
@@ -0,0 +1,1421 @@
+//! HTML pages to the document model: Word's "Save as Web Page" (a `.doc` that
+//! is HTML, the most common thing named `.doc` that is not a Word document) and
+//! other pages read as documents. Text, headings, lists, tables, links, and the
+//! character and paragraph formatting of the style sheet and the `style`
+//! attributes. Data only: scripts, frames and forms are dropped, nothing is
+//! fetched, a picture held in a `data:` address is embedded and one named by a
+//! file or a URL is told by its alternative text, and a link is kept only when
+//! it goes to a web, mail, phone or FTP address or to a place in the page.
+//!
+//! The tokens are those of `exav_unpack::html`, which the spreadsheet
+//! converter reads Excel's pages with too; the style sheets are
+//! `common::css`.
+
+use crate::formats::office::common::css::{self, Sheet};
+use crate::formats::office::common::{base64, image};
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+use exav_unpack::html::{self, Token, attr as get};
+use std::borrow::Cow;
+use std::collections::HashMap;
+
+mod mime;
+
+/// Open elements kept; deeper ones are read as text of their parent.
+const MAX_DEPTH: usize = 128;
+/// Twips in a pixel at 96 dpi.
+const PX: f64 = 15.0;
+/// EMU in a pixel.
+const PX_EMU: i64 = 9525;
+/// The widest a picture is drawn: the text width of a letter page.
+const MAX_PICTURE: i64 = 5_943_600;
+
+/// Elements that have no end tag.
+const VOID: &[&str] = &[
+    "br", "hr", "img", "meta", "link", "input", "col", "base", "area", "param", "wbr", "embed",
+    "source", "track",
+];
+/// Elements whose content is not text of the page.
+const HIDDEN: &[&str] = &[
+    "head", "script", "style", "title", "xml", "noscript", "template", "iframe", "frameset",
+    "select", "textarea", "object", "applet", "svg", "math", "canvas", "audio", "video",
+];
+/// Elements that start a paragraph of their own.
+const BLOCKS: &[&str] = &[
+    "p",
+    "div",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "pre",
+    "blockquote",
+    "center",
+    "address",
+    "li",
+    "dt",
+    "dd",
+    "ul",
+    "ol",
+    "dl",
+    "form",
+    "fieldset",
+    "legend",
+    "section",
+    "article",
+    "header",
+    "footer",
+    "nav",
+    "main",
+    "aside",
+    "figure",
+    "figcaption",
+    "caption",
+    "body",
+    "menu",
+    "dir",
+    "listing",
+    "xmp",
+    "plaintext",
+];
+
+struct Frame {
+    name: String,
+    /// The character properties in force, from the document's root to here.
+    run: RunProps,
+    /// The paragraph properties a paragraph started here has.
+    para: ParaProps,
+    hidden: bool,
+    /// Whitespace is kept (`pre`).
+    pre: bool,
+    /// A list: whether numbered, and the count so far.
+    list: Option<(bool, u32)>,
+}
+
+struct CellB {
+    blocks: Vec<Block>,
+    colspan: u32,
+    rowspan: u32,
+    props: CellProps,
+}
+
+#[derive(Default)]
+struct TableB {
+    props: TableProps,
+    rows: Vec<Vec<CellB>>,
+    row: Option<Vec<CellB>>,
+}
+
+enum Cont {
+    Body(Vec<Block>),
+    Table(TableB),
+    Cell(CellB),
+}
+
+struct Link {
+    target: Option<String>,
+    anchor: Option<String>,
+    tooltip: Option<String>,
+    content: Vec<Inline>,
+}
+
+struct Html<'a> {
+    b: &'a mut Budget,
+    doc: Document,
+    css: Sheet,
+    conts: Vec<Cont>,
+    frames: Vec<Frame>,
+    cur: Option<Para>,
+    /// Bytes of text in `cur`, and whether it ends with a space.
+    cur_len: usize,
+    space: bool,
+    links: Vec<Link>,
+    next_bookmark: u32,
+    pictures: Vec<mime::Picture>,
+}
+
+pub(crate) fn read(input: &[u8], budget: &mut Budget) -> Result<Document> {
+    budget.alloc(input.len() as u64 * 6)?;
+    // A page saved with its pictures in one MIME message is read from it.
+    let (text, pictures): (Cow<str>, Vec<mime::Picture>) = match mime::parse(input, budget)? {
+        Some(m) => (Cow::Owned(m.html), m.pictures),
+        None => (html::decode(input), vec![]),
+    };
+    let tokens = html::without_downlevel(
+        html::read(&text, &mut budget.tree()).map_err(|_| Error::TooLarge("HTML elements"))?,
+    );
+    if !tokens.iter().any(|t| {
+        matches!(t, Token::Start { name, .. }
+            if matches!(name.as_str(), "html" | "body" | "p" | "div" | "table" | "h1" | "span"))
+    }) {
+        return Err(Error::NotFormat("not an HTML document".into()));
+    }
+    let mut css = Sheet::default();
+    let mut page = None;
+    for (k, t) in tokens.iter().enumerate() {
+        if let Token::Start { name, .. } = t
+            && name == "style"
+            && let Some(Token::Text(c)) = tokens.get(k + 1)
+        {
+            css.add(c);
+            page = page.or_else(|| page_rule(c));
+        }
+    }
+    let mut h = Html {
+        b: budget,
+        doc: Document::default(),
+        css,
+        conts: vec![Cont::Body(vec![])],
+        frames: vec![],
+        cur: None,
+        cur_len: 0,
+        space: true,
+        links: vec![],
+        next_bookmark: 1,
+        pictures,
+    };
+    h.doc.defaults_run.size = Some(24);
+    h.doc.defaults_run.fonts.ascii = Some("Times New Roman".into());
+    h.doc.defaults_run.fonts.hansi = Some("Times New Roman".into());
+    if let Some(s) = page {
+        h.doc.section = s;
+    }
+    let mut root = Frame {
+        name: String::new(),
+        run: RunProps::default(),
+        para: ParaProps::default(),
+        hidden: false,
+        pre: false,
+        list: None,
+    };
+    {
+        // What the style sheet says of the whole page.
+        let mut d = vec![];
+        h.css.lookup("body", &[], &mut d);
+        apply_run(&d, &mut root.run);
+        apply_para(&d, &mut root.para);
+    }
+    h.frames.push(root);
+    for t in &tokens {
+        match t {
+            Token::Start {
+                name,
+                attrs,
+                closed,
+            } => h.start(name, attrs, *closed)?,
+            Token::End(name) => h.end(name)?,
+            Token::Text(s) => h.text(s)?,
+            Token::Comment(_) => {}
+        }
+    }
+    h.finish()?;
+    Ok(h.doc)
+}
+
+impl Html<'_> {
+    fn top(&self) -> &Frame {
+        self.frames.last().expect("the root frame stays")
+    }
+
+    fn hidden(&self) -> bool {
+        self.top().hidden
+    }
+
+    /// The declarations of an element: the style sheet's for its name and
+    /// classes, then its `style` attribute's.
+    fn decls(&self, name: &str, attrs: &[(String, String)]) -> Vec<(String, String)> {
+        let classes: Vec<&str> = get(attrs, "class")
+            .map(|c| c.split_whitespace().collect())
+            .unwrap_or_default();
+        let mut d = vec![];
+        self.css.lookup(name, &classes, &mut d);
+        if let Some(s) = get(attrs, "style") {
+            d.extend(css::declarations(s));
+        }
+        d
+    }
+
+    // ------------------------------------------------------------ paragraphs
+
+    /// The paragraph being built, started with the properties in force.
+    fn para(&mut self) -> &mut Para {
+        if self.cur.is_none() {
+            let top = self.top();
+            self.cur = Some(Para {
+                props: top.para.clone(),
+                mark: RunProps::default(),
+                content: vec![],
+                section: None,
+            });
+            self.cur_len = 0;
+            self.space = true;
+        }
+        self.cur.as_mut().expect("just made")
+    }
+
+    fn add(&mut self, i: Inline) {
+        if self.links.is_empty() {
+            self.para().content.push(i);
+        } else {
+            self.para();
+            if let Some(l) = self.links.last_mut() {
+                l.content.push(i);
+            }
+        }
+    }
+
+    fn text(&mut self, s: &str) -> Result<()> {
+        if self.hidden() {
+            return Ok(());
+        }
+        let pre = self.top().pre;
+        let mut out = String::with_capacity(s.len());
+        if pre {
+            out.push_str(&s.replace("\r\n", "\n").replace('\r', "\n"));
+        } else {
+            // White space runs to one space, and none after another.
+            let mut after_space = self.space;
+            for c in s.chars() {
+                if matches!(c, ' ' | '\t' | '\n' | '\r' | '\x0c') {
+                    if !after_space {
+                        out.push(' ');
+                        after_space = true;
+                    }
+                } else {
+                    out.push(c);
+                    after_space = false;
+                }
+            }
+        }
+        if out.is_empty() {
+            return Ok(());
+        }
+        self.b.alloc(out.len() as u64 * 2)?;
+        self.cur_len += out.len();
+        self.space = out.ends_with(' ') || out.ends_with('\n');
+        let props = self.top().run.clone();
+        if pre {
+            // Lines are breaks in the one paragraph.
+            let mut items = vec![];
+            for (n, line) in out.split('\n').enumerate() {
+                if n > 0 {
+                    items.push(RunItem::Break(BreakKind::Line));
+                }
+                if !line.is_empty() {
+                    items.push(RunItem::Text(line.to_string()));
+                }
+            }
+            self.add(Inline::Run(Run { props, items }));
+        } else {
+            self.add(Inline::Run(Run::text(props, out)));
+        }
+        Ok(())
+    }
+
+    /// Ends the paragraph being built. One with no content is dropped, unless
+    /// `keep` (an element that is a line of its own).
+    fn flush(&mut self, keep: bool) -> Result<()> {
+        while let Some(l) = self.links.pop() {
+            self.link_into(l);
+        }
+        // The next paragraph starts at the start of a line.
+        self.space = true;
+        let Some(mut p) = self.cur.take() else {
+            return Ok(());
+        };
+        // Trailing white space is not shown.
+        if let Some(Inline::Run(r)) = p.content.last_mut()
+            && let Some(RunItem::Text(t)) = r.items.last_mut()
+        {
+            let trimmed = t.trim_end_matches(' ').len();
+            t.truncate(trimmed);
+        }
+        // One with nothing to show (the white space between two blocks) is not
+        // a paragraph.
+        let empty = p.content.iter().all(|i| {
+            matches!(i, Inline::Run(r)
+                if r.items.iter().all(|it| matches!(it, RunItem::Text(t) if t.is_empty())))
+        });
+        if empty && !keep {
+            return Ok(());
+        }
+        self.b.paragraph(self.cur_len)?;
+        self.cur_len = 0;
+        self.push_block(Block::Para(p));
+        Ok(())
+    }
+
+    fn push_block(&mut self, b: Block) {
+        match self.conts.last_mut() {
+            Some(Cont::Body(v)) => v.push(b),
+            Some(Cont::Cell(c)) => c.blocks.push(b),
+            _ => {
+                // Content between rows of a table: the cell after it, or the page.
+                if let Some(Cont::Body(v)) = self.conts.iter_mut().rev().find_map(|c| match c {
+                    Cont::Body(_) | Cont::Cell(_) => Some(c),
+                    Cont::Table(_) => None,
+                }) {
+                    v.push(b);
+                }
+            }
+        }
+    }
+
+    fn link_into(&mut self, l: Link) {
+        let inline = Inline::Hyperlink {
+            target: l.target,
+            anchor: l.anchor,
+            tooltip: l.tooltip,
+            content: l.content,
+        };
+        match self.links.last_mut() {
+            Some(outer) => outer.content.push(inline),
+            None => self.para().content.push(inline),
+        }
+    }
+
+    // -------------------------------------------------------------- elements
+
+    fn push_frame(&mut self, name: &str, attrs: &[(String, String)]) {
+        if self.frames.len() >= MAX_DEPTH {
+            return;
+        }
+        let d = self.decls(name, attrs);
+        let parent = self.top();
+        let mut f = Frame {
+            name: name.to_string(),
+            run: parent.run.clone(),
+            para: parent.para.clone(),
+            hidden: parent.hidden || HIDDEN.contains(&name),
+            pre: parent.pre || matches!(name, "pre" | "listing" | "xmp" | "plaintext"),
+            list: None,
+        };
+        // What the element is, before what the page says of it.
+        match name {
+            "b" | "strong" | "th" => f.run.bold = Some(true),
+            "i" | "em" | "cite" | "dfn" | "var" | "address" => f.run.italic = Some(true),
+            "u" | "ins" => f.run.underline = Some("single"),
+            "s" | "strike" | "del" => f.run.strike = Some(true),
+            "sub" => f.run.vert_align = Some(VertAlign::Subscript),
+            "sup" => f.run.vert_align = Some(VertAlign::Superscript),
+            "small" => f.run.size = Some(f.run.size.unwrap_or(24).saturating_sub(2).max(2)),
+            "big" => f.run.size = Some(f.run.size.unwrap_or(24) + 2),
+            "code" | "tt" | "kbd" | "samp" | "pre" | "listing" | "xmp" | "plaintext" => {
+                f.run.fonts.ascii = Some("Courier New".into());
+                f.run.fonts.hansi = Some("Courier New".into());
+                if name == "pre" {
+                    f.run.size = Some(20);
+                }
+            }
+            "mark" => f.run.highlight = Some("yellow"),
+            // A link that goes somewhere looks like one.
+            "a" if get(attrs, "href").is_some_and(|h| safe_link(h) != (None, None)) => {
+                f.run.color = Some(Color::Rgb(0x0563C1));
+                f.run.underline = Some("single");
+            }
+            "h1" | "h2" | "h3" | "h4" | "h5" | "h6" => {
+                f.run.bold = Some(true);
+                f.run.size = Some(match name {
+                    "h1" => 48,
+                    "h2" => 36,
+                    "h3" => 28,
+                    "h4" => 24,
+                    "h5" => 20,
+                    _ => 16,
+                });
+                f.para.keep_next = Some(true);
+                f.para.space_before = Some(240);
+                f.para.space_after = Some(120);
+                f.para.outline_level = Some(u32::from(name.as_bytes()[1] - b'1'));
+            }
+            "p" | "div" | "dl" | "dt" => {}
+            "blockquote" | "dd" => {
+                f.para.ind_left = Some(f.para.ind_left.unwrap_or(0) + 720);
+            }
+            "center" => f.para.jc = Some(Jc::Center),
+            "font" => {
+                if let Some(c) = get(attrs, "color").and_then(rgb) {
+                    f.run.color = Some(Color::Rgb(c));
+                }
+                if let Some(face) = get(attrs, "face") {
+                    set_font(&mut f.run, face);
+                }
+                if let Some(n) = get(attrs, "size").and_then(|s| s.trim().parse::<i32>().ok()) {
+                    // The seven sizes of the old `size` attribute, in half points.
+                    let table = [14, 20, 24, 28, 36, 48, 72];
+                    f.run.size = Some(table[(n.clamp(1, 7) - 1) as usize]);
+                }
+            }
+            "ul" | "menu" | "dir" => f.list = Some((false, 0)),
+            "ol" => {
+                f.list = Some((
+                    true,
+                    get(attrs, "start")
+                        .and_then(|s| s.parse().ok())
+                        .unwrap_or(1)
+                        - 1,
+                ))
+            }
+            _ => {}
+        }
+        if let Some(a) = get(attrs, "align") {
+            f.para.jc = jc(a).or(f.para.jc);
+        }
+        apply_run(&d, &mut f.run);
+        if BLOCKS.contains(&name) || matches!(name, "td" | "th") {
+            apply_para(&d, &mut f.para);
+            if name == "p" && f.para.space_after.is_none() {
+                f.para.space_after = Some(160);
+            }
+        }
+        if d.iter().any(|(k, v)| {
+            (k == "display" && v.trim().starts_with("none"))
+                || (k == "mso-hide" && v.trim() == "all")
+                || (k == "visibility" && v.trim() == "hidden")
+        }) {
+            f.hidden = true;
+        }
+        self.frames.push(f);
+    }
+
+    fn start(&mut self, name: &str, attrs: &[(String, String)], closed: bool) -> Result<()> {
+        // An element that ends another.
+        match name {
+            "p" => self.close_to("p", &["td", "th", "li", "body", "div", "blockquote"])?,
+            "li" => self.close_to("li", &["ul", "ol", "menu", "dir"])?,
+            "dt" | "dd" => {
+                self.close_to("dt", &["dl"])?;
+                self.close_to("dd", &["dl"])?;
+            }
+            "tr" => {
+                self.close_cell()?;
+                self.close_to("tr", &["table"])?;
+            }
+            "td" | "th" => {
+                self.close_cell()?;
+            }
+            "tbody" | "thead" | "tfoot" => self.close_cell()?,
+            _ => {}
+        }
+        if self.hidden() && !matches!(name, "table") {
+            if !VOID.contains(&name) && !closed {
+                self.push_frame(name, attrs);
+            }
+            return Ok(());
+        }
+        match name {
+            "br" => {
+                self.add(Inline::Run(Run {
+                    props: self.top().run.clone(),
+                    items: vec![RunItem::Break(BreakKind::Line)],
+                }));
+                self.space = true;
+                return Ok(());
+            }
+            "hr" => {
+                self.flush(false)?;
+                let mut p = Para::default();
+                p.props.borders.bottom = Some(Border::single(6, Color::Auto));
+                p.props.space_after = Some(120);
+                self.b.paragraph(0)?;
+                self.push_block(Block::Para(p));
+                return Ok(());
+            }
+            "img" => return self.image(attrs),
+            "wbr" => return Ok(()),
+            _ => {}
+        }
+        if VOID.contains(&name) {
+            return Ok(());
+        }
+        let block = BLOCKS.contains(&name);
+        if block {
+            self.flush(false)?;
+        }
+        match name {
+            "table" => {
+                // Tables nest as deep as elements do, and no deeper.
+                if self.frames.len() >= MAX_DEPTH {
+                    return Ok(());
+                }
+                self.flush(false)?;
+                self.push_frame(name, attrs);
+                let t = table_props(attrs, &self.decls(name, attrs));
+                self.conts.push(Cont::Table(TableB {
+                    props: t,
+                    ..TableB::default()
+                }));
+            }
+            "tr" => {
+                self.push_frame(name, attrs);
+                if let Some(Cont::Table(t)) = self.conts.last_mut() {
+                    if let Some(r) = t.row.take() {
+                        t.rows.push(r);
+                    }
+                    t.row = Some(vec![]);
+                }
+            }
+            "td" | "th" => {
+                // A cell with no row or table around it is not one.
+                if !matches!(self.conts.last(), Some(Cont::Table(_))) {
+                    return Ok(());
+                }
+                if let Some(Cont::Table(t)) = self.conts.last_mut() {
+                    t.row.get_or_insert_with(Vec::new);
+                }
+                self.push_frame(name, attrs);
+                let d = self.decls(name, attrs);
+                let mut props = cell_props(attrs, &d);
+                if name == "th" && props.v_align.is_none() {
+                    props.v_align = Some(VAlign::Center);
+                }
+                if name == "th"
+                    && let Some(f) = self.frames.last_mut()
+                {
+                    f.para.jc = f.para.jc.or(Some(Jc::Center));
+                }
+                self.b.cell()?;
+                let n = |k: &str| get(attrs, k).and_then(|v| v.trim().parse::<u32>().ok());
+                self.conts.push(Cont::Cell(CellB {
+                    blocks: vec![],
+                    colspan: n("colspan").unwrap_or(1).clamp(1, 1000),
+                    rowspan: n("rowspan").unwrap_or(1).clamp(1, 1000),
+                    props,
+                }));
+            }
+            "a" => {
+                // A link does not hold another: it ends where the next begins.
+                if let Some(open) = self.links.pop() {
+                    self.link_into(open);
+                }
+                self.push_frame(name, attrs);
+                if let Some(n) = get(attrs, "name").or_else(|| get(attrs, "id")) {
+                    let id = self.next_bookmark;
+                    self.next_bookmark += 1;
+                    self.add(Inline::BookmarkStart {
+                        id,
+                        name: n.chars().take(40).collect(),
+                    });
+                    self.add(Inline::BookmarkEnd(id));
+                }
+                if let Some(href) = get(attrs, "href") {
+                    let (target, anchor) = safe_link(href);
+                    if target.is_some() || anchor.is_some() {
+                        self.para();
+                        self.links.push(Link {
+                            target,
+                            anchor,
+                            tooltip: get(attrs, "title").map(|t| t.chars().take(200).collect()),
+                            content: vec![],
+                        });
+                    }
+                }
+            }
+            "li" => {
+                self.push_frame(name, attrs);
+                let (ordered, n, depth) = self.list_state();
+                let marker = if ordered {
+                    format!("{n}. ")
+                } else {
+                    format!(
+                        "{} ",
+                        ["\u{2022}", "\u{25E6}", "\u{25AA}"][(depth - 1).min(2)]
+                    )
+                };
+                if let Some(f) = self.frames.last_mut() {
+                    f.para.ind_left = Some(f.para.ind_left.unwrap_or(0) + 360 * depth as i32);
+                    f.para.ind_hanging = Some(360);
+                    f.para.space_after = f.para.space_after.or(Some(40));
+                }
+                self.text_marker(&marker);
+            }
+            _ => self.push_frame(name, attrs),
+        }
+        if closed && !matches!(name, "table" | "tr" | "td" | "th") {
+            self.end(name)?;
+        }
+        Ok(())
+    }
+
+    /// Whether the list around, its count (this item's), and how deep it is.
+    fn list_state(&mut self) -> (bool, u32, usize) {
+        let depth = self.frames.iter().filter(|f| f.list.is_some()).count();
+        for f in self.frames.iter_mut().rev() {
+            if let Some((ordered, n)) = &mut f.list {
+                *n += 1;
+                return (*ordered, *n, depth);
+            }
+        }
+        (false, 0, 1)
+    }
+
+    /// A list item's marker, in the item's own paragraph.
+    fn text_marker(&mut self, m: &str) {
+        let mut props = self.top().run.clone();
+        props.bold = None;
+        props.italic = None;
+        self.cur_len += m.len();
+        self.add(Inline::Run(Run::text(props, m)));
+        self.space = true;
+    }
+
+    /// The picture a page's `src` names among those of its MIME message: by
+    /// content ID (`cid:`), or by the location it was saved at or its file name.
+    fn picture(&self, src: &str) -> Option<&[u8]> {
+        if self.pictures.is_empty() {
+            return None;
+        }
+        let s = src.trim().to_ascii_lowercase();
+        let mut names = vec![];
+        if let Some(id) = s.strip_prefix("cid:") {
+            names.push(id.trim_matches(['<', '>']).to_string());
+        } else {
+            let plain = percent_decode(&s);
+            for n in [s.as_str(), plain.as_str()] {
+                names.push(n.to_string());
+                if let Some(last) = n.rsplit(['/', '\\']).next() {
+                    names.push(last.to_string());
+                }
+            }
+        }
+        self.pictures
+            .iter()
+            .find(|p| p.names.iter().any(|n| names.contains(n)))
+            .map(|p| p.data.as_slice())
+    }
+
+    fn image(&mut self, attrs: &[(String, String)]) -> Result<()> {
+        if self.hidden() {
+            return Ok(());
+        }
+        let src = get(attrs, "src").unwrap_or("");
+        let data = src
+            .strip_prefix("data:")
+            .and_then(|r| r.split_once(','))
+            .filter(|(meta, _)| meta.contains("base64"))
+            .and_then(|(_, b)| base64::decode(b, self.b.limits.max_part as usize))
+            .or_else(|| self.picture(src).map(<[u8]>::to_vec));
+        let media = data.and_then(|d| {
+            let ext = image::ext(&d)?;
+            Some((ext, d))
+        });
+        let Some((ext, d)) = media else {
+            // Nothing to draw: the alternative text, as a browser shows it.
+            let alt = get(attrs, "alt").map(str::trim).unwrap_or("");
+            let text = if alt.is_empty() {
+                "[image]".to_string()
+            } else {
+                format!("[{alt}]")
+            };
+            let mut props = self.top().run.clone();
+            props.italic = Some(true);
+            self.b.alloc(text.len() as u64)?;
+            self.cur_len += text.len();
+            self.add(Inline::Run(Run::text(props, text)));
+            self.space = false;
+            return Ok(());
+        };
+        self.b.alloc(d.len() as u64)?;
+        let natural = image::natural_emu(&d);
+        let dim = |k: &str| {
+            get(attrs, k)
+                .and_then(|v| v.trim().trim_end_matches("px").parse::<f64>().ok())
+                .filter(|v| *v > 0.0)
+                .map(|v| (v * PX_EMU as f64) as i64)
+        };
+        let (mut cx, mut cy) = match (dim("width"), dim("height"), natural) {
+            (Some(w), Some(h), _) => (w, h),
+            (Some(w), None, Some((nw, nh))) if nw > 0 => (w, w * nh / nw),
+            (None, Some(h), Some((nw, nh))) if nh > 0 => (h * nw / nh, h),
+            (_, _, Some(n)) => n,
+            _ => (96 * PX_EMU, 96 * PX_EMU),
+        };
+        if cx > MAX_PICTURE {
+            cy = cy * MAX_PICTURE / cx.max(1);
+            cx = MAX_PICTURE;
+        }
+        let media = self.doc.add_media(ext, d);
+        let drawing = Drawing {
+            anchor: None,
+            cx: cx.max(PX_EMU),
+            cy: cy.max(PX_EMU),
+            name: "Picture".into(),
+            descr: get(attrs, "alt").map(|a| a.chars().take(200).collect()),
+            kind: DrawingKind::Picture {
+                media,
+                crop: Crop::default(),
+            },
+        };
+        self.add(Inline::Run(Run {
+            props: self.top().run.clone(),
+            items: vec![RunItem::Drawing(Box::new(drawing))],
+        }));
+        self.space = false;
+        Ok(())
+    }
+
+    /// Closes the open element `name` if one is open, within the elements that
+    /// stop the search.
+    fn close_to(&mut self, name: &str, stop: &[&str]) -> Result<()> {
+        let mut at = None;
+        for (i, f) in self.frames.iter().enumerate().rev() {
+            if f.name == name {
+                at = Some(i);
+                break;
+            }
+            if stop.contains(&f.name.as_str()) {
+                break;
+            }
+        }
+        if at.is_some() {
+            self.end(name)?;
+        }
+        Ok(())
+    }
+
+    fn end(&mut self, name: &str) -> Result<()> {
+        if VOID.contains(&name) {
+            return Ok(());
+        }
+        let Some(at) = self.frames.iter().rposition(|f| f.name == name) else {
+            return Ok(());
+        };
+        if at == 0 {
+            return Ok(());
+        }
+        // What the elements opened since this one stay open for is closed.
+        while self.frames.len() > at + 1 {
+            let inner = self.top().name.clone();
+            self.end(&inner)?;
+        }
+        match name {
+            "td" | "th" => self.close_cell()?,
+            "tr" => {
+                self.close_cell()?;
+                if let Some(Cont::Table(t)) = self.conts.last_mut()
+                    && let Some(r) = t.row.take()
+                {
+                    t.rows.push(r);
+                }
+            }
+            "table" => {
+                self.close_cell()?;
+                self.flush(false)?;
+                if let Some(Cont::Table(mut t)) = self.conts.pop() {
+                    if let Some(r) = t.row.take() {
+                        t.rows.push(r);
+                    }
+                    if let Some(table) = self.build_table(t)? {
+                        self.push_block(Block::Table(table));
+                    }
+                }
+            }
+            "a" => {
+                if let Some(l) = self.links.pop() {
+                    self.link_into(l);
+                }
+            }
+            _ if BLOCKS.contains(&name) => {
+                let keep = false;
+                self.flush(keep)?;
+            }
+            _ => {}
+        }
+        if self.frames.len() > 1 {
+            self.frames.pop();
+        }
+        Ok(())
+    }
+
+    /// Ends the cell being built, if one is.
+    fn close_cell(&mut self) -> Result<()> {
+        if !matches!(self.conts.last(), Some(Cont::Cell(_))) {
+            return Ok(());
+        }
+        self.flush(false)?;
+        // The frame of the cell goes with it, and what is open inside it.
+        while let Some(f) = self.frames.last() {
+            let name = f.name.clone();
+            if name == "td" || name == "th" {
+                self.frames.pop();
+                break;
+            }
+            if self.frames.len() <= 1 || name == "table" || name == "tr" {
+                break;
+            }
+            self.frames.pop();
+        }
+        if let Some(Cont::Cell(mut c)) = self.conts.pop() {
+            if c.blocks.is_empty() {
+                self.b.paragraph(0)?;
+                c.blocks.push(Block::Para(Para::default()));
+            }
+            if let Some(Cont::Table(t)) = self.conts.last_mut() {
+                t.row.get_or_insert_with(Vec::new).push(c);
+            }
+        }
+        Ok(())
+    }
+
+    fn finish(&mut self) -> Result<()> {
+        // Whatever is left open ends with the document.
+        loop {
+            self.close_cell()?;
+            match self.conts.last() {
+                Some(Cont::Table(_)) => {
+                    self.flush(false)?;
+                    if let Some(Cont::Table(mut t)) = self.conts.pop() {
+                        if let Some(r) = t.row.take() {
+                            t.rows.push(r);
+                        }
+                        if let Some(table) = self.build_table(t)? {
+                            self.push_block(Block::Table(table));
+                        }
+                    }
+                }
+                _ => break,
+            }
+        }
+        self.flush(false)?;
+        let body = match self.conts.pop() {
+            Some(Cont::Body(v)) => v,
+            _ => vec![],
+        };
+        self.doc.body = body;
+        if self.doc.body.is_empty() {
+            self.b.paragraph(0)?;
+            self.doc.body.push(Block::Para(Para::default()));
+        }
+        Ok(())
+    }
+
+    /// The model table of the cells read: the grid, and the cells a row span
+    /// continues into the rows below.
+    fn build_table(&mut self, t: TableB) -> Result<Option<Table>> {
+        let rows: Vec<Vec<CellB>> = t.rows.into_iter().filter(|r| !r.is_empty()).collect();
+        if rows.is_empty() {
+            return Ok(None);
+        }
+        // Columns: the widest row, its row-spanned cells counted.
+        let mut carry: HashMap<usize, (u32, u32)> = HashMap::new();
+        let mut out_rows = vec![];
+        let mut columns = 1usize;
+        for row in rows {
+            let mut cells = vec![];
+            let mut col = 0usize;
+            let mut it = row.into_iter();
+            loop {
+                if let Some(&(left, span)) = carry.get(&col)
+                    && left > 0
+                {
+                    cells.push(self.continued(span)?);
+                    carry.insert(col, (left - 1, span));
+                    col += span as usize;
+                    continue;
+                }
+                let Some(mut c) = it.next() else { break };
+                c.props.grid_span = c.colspan;
+                if c.rowspan > 1 {
+                    c.props.v_merge = VMerge::Restart;
+                    carry.insert(col, (c.rowspan - 1, c.colspan));
+                }
+                col += c.colspan as usize;
+                cells.push(Cell {
+                    props: c.props,
+                    content: c.blocks,
+                });
+            }
+            // A row span that reaches past the last cell of this row.
+            while let Some(&(left, span)) = carry.get(&col) {
+                if left == 0 {
+                    break;
+                }
+                cells.push(self.continued(span)?);
+                carry.insert(col, (left - 1, span));
+                col += span as usize;
+            }
+            columns = columns.max(col);
+            out_rows.push(Row {
+                props: RowProps::default(),
+                cells,
+            });
+        }
+        let columns = columns.min(1000);
+        // The text area of the page, shared evenly.
+        let width =
+            (self.doc.section.width - self.doc.section.left - self.doc.section.right).max(1440);
+        let grid = vec![(width / columns as i32).max(120); columns];
+        Ok(Some(Table {
+            props: t.props,
+            grid,
+            rows: out_rows,
+        }))
+    }
+
+    /// The cell a row span continues into, counted like any other.
+    fn continued(&mut self, span: u32) -> Result<Cell> {
+        self.b.cell()?;
+        self.b.paragraph(0)?;
+        Ok(Cell {
+            props: CellProps {
+                grid_span: span,
+                v_merge: VMerge::Continue,
+                ..CellProps::default()
+            },
+            content: vec![Block::Para(Para::default())],
+        })
+    }
+}
+
+// ------------------------------------------------------------------- values
+
+fn rgb(s: &str) -> Option<u32> {
+    css::color(s).flatten()
+}
+
+fn jc(v: &str) -> Option<Jc> {
+    match v.trim().to_ascii_lowercase().as_str() {
+        "center" | "middle" => Some(Jc::Center),
+        "right" | "end" => Some(Jc::Right),
+        "justify" => Some(Jc::Both),
+        "left" | "start" => Some(Jc::Left),
+        _ => None,
+    }
+}
+
+/// `%20` and the like undone.
+fn percent_decode(s: &str) -> String {
+    let b = s.as_bytes();
+    let mut out = Vec::with_capacity(b.len());
+    let mut i = 0;
+    while i < b.len() {
+        let hex = |x: u8| (x as char).to_digit(16);
+        if b[i] == b'%'
+            && i + 2 < b.len()
+            && let (Some(a), Some(c)) = (hex(b[i + 1]), hex(b[i + 2]))
+        {
+            out.push((a * 16 + c) as u8);
+            i += 3;
+            continue;
+        }
+        out.push(b[i]);
+        i += 1;
+    }
+    String::from_utf8_lossy(&out).into_owned()
+}
+
+/// A length in twips.
+fn twips(v: &str) -> Option<i32> {
+    css::length_pt(v, "pt").map(|p| (p * 20.0).round().clamp(-31_000.0, 31_000.0) as i32)
+}
+
+/// The first family of a `font-family` list that names a font.
+fn set_font(r: &mut RunProps, families: &str) {
+    for f in families.split(',') {
+        let f = f.trim().trim_matches(['"', '\'']).trim();
+        if f.is_empty() {
+            continue;
+        }
+        if matches!(
+            f.to_ascii_lowercase().as_str(),
+            "serif" | "sans-serif" | "monospace" | "cursive" | "fantasy" | "system-ui" | "inherit"
+        ) {
+            if f.eq_ignore_ascii_case("monospace") {
+                r.fonts.ascii = Some("Courier New".into());
+                r.fonts.hansi = Some("Courier New".into());
+            }
+            continue;
+        }
+        r.fonts.ascii = Some(f.chars().take(64).collect());
+        r.fonts.hansi = r.fonts.ascii.clone();
+        return;
+    }
+}
+
+fn apply_run(d: &[(String, String)], r: &mut RunProps) {
+    for (k, v) in d {
+        let v = v.trim();
+        match k.as_str() {
+            "color" => {
+                if let Some(c) = css::color(v) {
+                    r.color = Some(c.map_or(Color::Auto, Color::Rgb));
+                }
+            }
+            "font-family" => set_font(r, v),
+            "font-size" => {
+                let pt = match v.to_ascii_lowercase().as_str() {
+                    "xx-small" => Some(7.0),
+                    "x-small" => Some(7.5),
+                    "small" => Some(10.0),
+                    "medium" => Some(12.0),
+                    "large" => Some(13.5),
+                    "x-large" => Some(18.0),
+                    "xx-large" => Some(24.0),
+                    other => css::length_pt(other, "pt"),
+                };
+                if let Some(pt) = pt.filter(|p: &f64| (1.0..=400.0).contains(p)) {
+                    r.size = Some((pt * 2.0).round() as u32);
+                }
+            }
+            "font-weight" => {
+                let bold = match v {
+                    "bold" | "bolder" => Some(true),
+                    "normal" | "lighter" => Some(false),
+                    n => n.parse::<u32>().ok().map(|n| n >= 600),
+                };
+                if bold.is_some() {
+                    r.bold = bold;
+                }
+            }
+            "font-style" => match v {
+                "italic" | "oblique" => r.italic = Some(true),
+                "normal" => r.italic = Some(false),
+                _ => {}
+            },
+            "font-variant" => {
+                if v.contains("small-caps") {
+                    r.small_caps = Some(true);
+                }
+            }
+            "text-transform" => {
+                if v == "uppercase" {
+                    r.caps = Some(true);
+                }
+            }
+            "text-decoration" | "text-decoration-line" => {
+                if v.contains("underline") {
+                    r.underline = Some("single");
+                }
+                if v.contains("line-through") {
+                    r.strike = Some(true);
+                }
+                if v == "none" {
+                    r.underline = Some("none");
+                    r.strike = Some(false);
+                }
+            }
+            "background" | "background-color" => {
+                let first = v.split_whitespace().next().unwrap_or("");
+                if let Some(Some(c)) = css::color(first) {
+                    r.shading = Some(Shading::fill(Color::Rgb(c)));
+                }
+            }
+            "vertical-align" => match v {
+                "super" => r.vert_align = Some(VertAlign::Superscript),
+                "sub" => r.vert_align = Some(VertAlign::Subscript),
+                "baseline" => r.vert_align = Some(VertAlign::Baseline),
+                _ => {}
+            },
+            _ => {}
+        }
+    }
+}
+
+fn apply_para(d: &[(String, String)], p: &mut ParaProps) {
+    for (k, v) in d {
+        let v = v.trim();
+        match k.as_str() {
+            "text-align" => p.jc = jc(v).or(p.jc),
+            "margin-left" => p.ind_left = twips(v).map(|t| t.max(0)).or(p.ind_left),
+            "margin-right" => p.ind_right = twips(v).map(|t| t.max(0)).or(p.ind_right),
+            "text-indent" => {
+                if let Some(t) = twips(v) {
+                    if t < 0 {
+                        p.ind_hanging = Some(-t);
+                        p.ind_first_line = None;
+                    } else {
+                        p.ind_first_line = Some(t);
+                        p.ind_hanging = None;
+                    }
+                }
+            }
+            "margin-top" => p.space_before = twips(v).map(|t| t.max(0)).or(p.space_before),
+            "margin-bottom" => p.space_after = twips(v).map(|t| t.max(0)).or(p.space_after),
+            "margin" => {
+                // One to four values: top, right, bottom, left.
+                let parts: Vec<Option<i32>> = v.split_whitespace().map(twips).collect();
+                let at = |i: usize| parts.get(i).copied().flatten().map(|t| t.max(0));
+                match parts.len() {
+                    1 => {
+                        p.space_before = at(0).or(p.space_before);
+                        p.space_after = at(0).or(p.space_after);
+                        p.ind_left = at(0).or(p.ind_left);
+                        p.ind_right = at(0).or(p.ind_right);
+                    }
+                    2 => {
+                        p.space_before = at(0).or(p.space_before);
+                        p.space_after = at(0).or(p.space_after);
+                        p.ind_left = at(1).or(p.ind_left);
+                        p.ind_right = at(1).or(p.ind_right);
+                    }
+                    3 | 4 => {
+                        p.space_before = at(0).or(p.space_before);
+                        p.ind_right = at(1).or(p.ind_right);
+                        p.space_after = at(2).or(p.space_after);
+                        p.ind_left = at(if parts.len() == 4 { 3 } else { 1 }).or(p.ind_left);
+                    }
+                    _ => {}
+                }
+            }
+            "page-break-before" | "break-before" => {
+                if matches!(v, "always" | "page" | "left" | "right") {
+                    p.page_break_before = Some(true);
+                }
+            }
+            "background" | "background-color" => {
+                let first = v.split_whitespace().next().unwrap_or("");
+                if let Some(Some(c)) = css::color(first) {
+                    p.shading = Some(Shading::fill(Color::Rgb(c)));
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+/// A CSS border (`1px solid #000`, `.5pt solid windowtext`) as a border.
+fn border(v: &str) -> Option<Border> {
+    let (mut width, mut style, mut color) = (None, None, Color::Auto);
+    for t in v.split_whitespace() {
+        let l = t.to_ascii_lowercase();
+        match l.as_str() {
+            "none" | "hidden" => return None,
+            "solid" | "dashed" | "dotted" | "double" | "groove" | "ridge" | "inset" | "outset"
+            | "hairline" => style = Some(l),
+            "thin" => width = Some(0.75),
+            "medium" => width = Some(1.5),
+            "thick" => width = Some(2.25),
+            _ => {
+                if let Some(w) = css::length_pt(&l, "px") {
+                    width = Some(w);
+                } else if let Some(c) = css::color(&l) {
+                    color = c.map_or(Color::Auto, Color::Rgb);
+                }
+            }
+        }
+    }
+    let style = style?;
+    let w: f64 = width.unwrap_or(0.75);
+    if w <= 0.0 {
+        return None;
+    }
+    Some(Border {
+        style: match style.as_str() {
+            "double" => "double",
+            "dashed" => "dashed",
+            "dotted" => "dotted",
+            _ => "single",
+        },
+        size: (w * 8.0).round().clamp(2.0, 96.0) as u32,
+        space: 0,
+        color,
+        shadow: false,
+    })
+}
+
+fn table_props(attrs: &[(String, String)], d: &[(String, String)]) -> TableProps {
+    let mut t = TableProps::default();
+    let mut width = get(attrs, "width").map(str::to_string);
+    for (k, v) in d {
+        match k.as_str() {
+            "width" => width = Some(v.clone()),
+            "background" | "background-color" => {
+                if let Some(Some(c)) = css::color(v.split_whitespace().next().unwrap_or("")) {
+                    t.shading = Some(Shading::fill(Color::Rgb(c)));
+                }
+            }
+            "margin-left" => t.indent = twips(v),
+            _ => {}
+        }
+    }
+    if let Some(w) = width {
+        let w = w.trim();
+        t.width = match w
+            .strip_suffix('%')
+            .and_then(|p| p.trim().parse::<f64>().ok())
+        {
+            Some(p) if (1.0..=100.0).contains(&p) => Some(Width::Pct((p * 50.0) as i32)),
+            _ => twips(w).filter(|&n| n > 0).map(Width::Twips).or_else(|| {
+                w.parse::<f64>()
+                    .ok()
+                    .filter(|&n| n > 0.0)
+                    .map(|n| Width::Twips((n * PX) as i32))
+            }),
+        };
+    }
+    // `border="1"` draws every line; the style's border, the outside ones.
+    let attr_border = get(attrs, "border")
+        .and_then(|b| b.trim().parse::<f64>().ok())
+        .filter(|&n| n > 0.0);
+    let line =
+        attr_border.map(|n| Border::single((n * 6.0).round().clamp(2.0, 48.0) as u32, Color::Auto));
+    let css_border = d
+        .iter()
+        .rev()
+        .find(|(k, _)| k == "border")
+        .and_then(|(_, v)| border(v));
+    if let Some(b) = line.clone().or(css_border.clone()) {
+        t.borders = TableBorders {
+            top: Some(b.clone()),
+            left: Some(b.clone()),
+            bottom: Some(b.clone()),
+            right: Some(b.clone()),
+            inside_h: line.clone(),
+            inside_v: line,
+        };
+    }
+    if let Some(p) = get(attrs, "cellpadding").and_then(|p| p.trim().parse::<f64>().ok()) {
+        let m = (p.clamp(0.0, 100.0) * PX) as i32;
+        t.cell_margins = Margins {
+            top: Some(m),
+            left: Some(m),
+            bottom: Some(m),
+            right: Some(m),
+        };
+    }
+    if let Some(c) = get(attrs, "bgcolor").and_then(rgb) {
+        t.shading = Some(Shading::fill(Color::Rgb(c)));
+    }
+    t
+}
+
+fn cell_props(attrs: &[(String, String)], d: &[(String, String)]) -> CellProps {
+    let mut c = CellProps::default();
+    let mut width = get(attrs, "width").map(str::to_string);
+    let mut valign = get(attrs, "valign").map(str::to_string);
+    for (k, v) in d {
+        match k.as_str() {
+            "width" => width = Some(v.clone()),
+            "vertical-align" => valign = Some(v.clone()),
+            "background" | "background-color" => {
+                if let Some(Some(rgb)) = css::color(v.split_whitespace().next().unwrap_or("")) {
+                    c.shading = Some(Shading::fill(Color::Rgb(rgb)));
+                }
+            }
+            "border" => {
+                let b = border(v);
+                c.borders = TableBorders {
+                    top: b.clone(),
+                    left: b.clone(),
+                    bottom: b.clone(),
+                    right: b,
+                    ..TableBorders::default()
+                };
+            }
+            "border-top" => c.borders.top = border(v),
+            "border-left" => c.borders.left = border(v),
+            "border-bottom" => c.borders.bottom = border(v),
+            "border-right" => c.borders.right = border(v),
+            "white-space" => c.no_wrap = v.starts_with("nowrap"),
+            _ => {}
+        }
+    }
+    if let Some(color) = get(attrs, "bgcolor").and_then(rgb) {
+        c.shading = Some(Shading::fill(Color::Rgb(color)));
+    }
+    if get(attrs, "nowrap").is_some() {
+        c.no_wrap = true;
+    }
+    if let Some(w) = width {
+        let w = w.trim();
+        c.width = match w
+            .strip_suffix('%')
+            .and_then(|p| p.trim().parse::<f64>().ok())
+        {
+            Some(p) if (1.0..=100.0).contains(&p) => Some(Width::Pct((p * 50.0) as i32)),
+            _ => twips(w).filter(|&n| n > 0).map(Width::Twips).or_else(|| {
+                w.parse::<f64>()
+                    .ok()
+                    .filter(|&n| n > 0.0)
+                    .map(|n| Width::Twips((n * PX) as i32))
+            }),
+        };
+    }
+    c.v_align = valign.and_then(|v| match v.trim() {
+        "top" => Some(VAlign::Top),
+        "middle" | "center" => Some(VAlign::Center),
+        "bottom" => Some(VAlign::Bottom),
+        _ => None,
+    });
+    c
+}
+
+/// Where a link goes: a web, mail, phone or FTP address (its target), or a
+/// place in the page (its anchor). Nothing else: a script, a data address or a
+/// path on the author's computer is not followed.
+fn safe_link(href: &str) -> (Option<String>, Option<String>) {
+    let h = href.trim();
+    if let Some(a) = h.strip_prefix('#') {
+        return (None, (!a.is_empty()).then(|| a.chars().take(40).collect()));
+    }
+    let lower = h.to_ascii_lowercase();
+    if ["http://", "https://", "ftp://", "mailto:", "tel:"]
+        .iter()
+        .any(|p| lower.starts_with(p))
+        && !h.chars().any(|c| c.is_control())
+    {
+        return (Some(h.chars().take(2000).collect()), None);
+    }
+    (None, None)
+}
+
+/// The page size and margins of the first `@page` rule that gives a size
+/// (Word writes one for each section): `size: 595.3pt 841.9pt; margin: 72pt`.
+fn page_rule(css_text: &str) -> Option<Section> {
+    let mut rest = css_text;
+    while let Some(at) = rest.find("@page") {
+        let after = &rest[at + 5..];
+        let open = after.find('{')?;
+        let close = after[open..].find('}').map(|c| open + c)?;
+        let d = css::declarations(&after[open + 1..close]);
+        rest = &after[close..];
+        let Some((_, size)) = d.iter().find(|(k, _)| k == "size") else {
+            continue;
+        };
+        let nums: Vec<i32> = size
+            .split_whitespace()
+            .filter_map(twips)
+            .filter(|&n| n > 0)
+            .collect();
+        let mut s = Section::default();
+        let landscape = size.contains("landscape");
+        match nums.as_slice() {
+            [w, h] => {
+                s.width = *w;
+                s.height = *h;
+            }
+            [w] => {
+                s.width = *w;
+                s.height = *w;
+            }
+            _ => continue,
+        }
+        if landscape && s.width < s.height {
+            std::mem::swap(&mut s.width, &mut s.height);
+        }
+        s.landscape = s.width > s.height;
+        if let Some((_, m)) = d.iter().find(|(k, _)| k == "margin") {
+            let v: Vec<i32> = m.split_whitespace().filter_map(twips).collect();
+            let (t, r, b, l) = match v.as_slice() {
+                [a] => (*a, *a, *a, *a),
+                [a, b] => (*a, *b, *a, *b),
+                [a, b, c] => (*a, *b, *c, *b),
+                [a, b, c, d] => (*a, *b, *c, *d),
+                _ => (1440, 1440, 1440, 1440),
+            };
+            s.top = t.max(0);
+            s.right = r.max(0);
+            s.bottom = b.max(0);
+            s.left = l.max(0);
+        }
+        // A page too small to hold its margins keeps the defaults'.
+        if s.width - s.left - s.right < 720 || s.height - s.top - s.bottom < 720 {
+            continue;
+        }
+        return Some(s);
+    }
+    None
+}
diff --git a/crates/exav-render/src/formats/office/docs/limits.rs b/crates/exav-render/src/formats/office/docs/limits.rs
new file mode 100644
index 00000000..cd3c390c
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/limits.rs
@@ -0,0 +1,139 @@
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::model::{Block, Cell, Inline, inline_bytes};
+
+/// Bounds on the work one conversion may do. A document past one of them is
+/// refused with [`Error::TooLarge`] rather than partly converted.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub struct Limits {
+    /// Bytes of input.
+    pub max_input: u64,
+    /// Memory the model and the output may take, as this module counts it:
+    /// an estimate per paragraph and cell, the bytes of text, each picture
+    /// and decompressed part, and the DOCX written so far.
+    pub max_memory: u64,
+    /// Bytes of one decompressed part of a package or stream.
+    pub max_part: u64,
+    /// Paragraphs over the body, notes, headers and footers.
+    pub max_paragraphs: u64,
+    /// Table cells.
+    pub max_cells: u64,
+}
+
+impl Default for Limits {
+    fn default() -> Self {
+        Limits {
+            max_input: 512 << 20,
+            max_memory: 1 << 30,
+            max_part: 256 << 20,
+            max_paragraphs: 5_000_000,
+            max_cells: 2_000_000,
+        }
+    }
+}
+
+impl Limits {
+    /// Defaults with another memory bound.
+    pub fn with_max_memory(mut self, bytes: u64) -> Self {
+        self.max_memory = bytes;
+        self
+    }
+
+    /// Defaults with another paragraph bound.
+    pub fn with_max_paragraphs(mut self, n: u64) -> Self {
+        self.max_paragraphs = n;
+        self
+    }
+
+    /// Defaults with another cell bound.
+    pub fn with_max_cells(mut self, n: u64) -> Self {
+        self.max_cells = n;
+        self
+    }
+}
+
+/// What a conversion has used of its [`Limits`].
+pub(crate) struct Budget {
+    pub limits: Limits,
+    paragraphs: u64,
+    cells: u64,
+    memory: u64,
+}
+
+/// What one paragraph costs in the model, beyond its text: its slot among the
+/// blocks and the first allocation of its runs (four).
+pub(crate) const PARA_BYTES: u64 = (size_of::<Block>() + 4 * size_of::<Inline>()) as u64;
+/// What one table cell costs in the model, beyond its content: the cell, and
+/// the room its block list has for more than the first paragraph.
+pub(crate) const CELL_BYTES: u64 = (size_of::<Cell>() + 3 * size_of::<Block>()) as u64;
+
+impl Budget {
+    pub fn new(limits: Limits) -> Self {
+        Budget {
+            limits,
+            paragraphs: 0,
+            cells: 0,
+            memory: 0,
+        }
+    }
+
+    /// One more paragraph, and `extra` bytes of its own text.
+    pub fn paragraph(&mut self, extra: usize) -> Result<()> {
+        self.paragraphs += 1;
+        if self.paragraphs > self.limits.max_paragraphs {
+            return Err(Error::TooLarge("paragraphs"));
+        }
+        self.alloc(PARA_BYTES + extra as u64)
+    }
+
+    /// One more table cell.
+    pub fn cell(&mut self) -> Result<()> {
+        self.cells += 1;
+        if self.cells > self.limits.max_cells {
+            return Err(Error::TooLarge("table cells"));
+        }
+        self.alloc(CELL_BYTES)
+    }
+
+    /// `bytes` more held in memory.
+    pub fn alloc(&mut self, bytes: u64) -> Result<()> {
+        self.memory = self.memory.saturating_add(bytes);
+        if self.memory > self.limits.max_memory {
+            return Err(Error::TooLarge("memory"));
+        }
+        Ok(())
+    }
+
+    /// The inlines of a paragraph just built, by what they take.
+    pub fn inlines(&mut self, inlines: &[Inline]) -> Result<()> {
+        self.alloc(inline_bytes(inlines) as u64)
+    }
+
+    /// What `xml::parse` charges the memory of a tree to.
+    pub fn tree(&mut self) -> impl FnMut(u64) -> bool + '_ {
+        |bytes| self.alloc(bytes).is_ok()
+    }
+
+    pub fn used(&self) -> u64 {
+        self.memory
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn paragraphs_cells_and_memory_are_bounded() {
+        let mut b = Budget::new(Limits::default().with_max_paragraphs(2));
+        assert!(b.paragraph(0).is_ok());
+        assert!(b.paragraph(0).is_ok());
+        assert_eq!(b.paragraph(0), Err(Error::TooLarge("paragraphs")));
+        let mut b = Budget::new(Limits::default().with_max_cells(1));
+        assert!(b.cell().is_ok());
+        assert_eq!(b.cell(), Err(Error::TooLarge("table cells")));
+        let mut b = Budget::new(Limits::default().with_max_memory(1000));
+        assert!(b.alloc(999).is_ok());
+        assert_eq!(b.alloc(2), Err(Error::TooLarge("memory")));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/mod.rs b/crates/exav-render/src/formats/office/docs/mod.rs
new file mode 100644
index 00000000..857062a3
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/mod.rs
@@ -0,0 +1,138 @@
+//! Word-processing documents to DOCX: Word 6 to 2003 (DOC), OpenDocument
+//! text (ODT, OTT, FODT), RTF, Word 2003 XML and Apple Pages, converted for a
+//! DOCX renderer to draw ([`convert`]), or read for their text ([`text`]).
+
+mod doc;
+mod docx;
+mod error;
+mod fields;
+mod grid;
+mod html;
+mod limits;
+mod model;
+mod odt;
+mod pages;
+mod rtf;
+mod text;
+mod wml;
+
+pub use error::Error;
+pub use limits::Limits;
+
+/// The formats this module converts.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum Format {
+    /// Word 6 to 2003 documents and templates (.doc, .dot).
+    Doc,
+    /// OpenDocument text and templates (.odt, .ott).
+    Odt,
+    /// Flat OpenDocument text (.fodt).
+    Fodt,
+    /// Rich Text Format (.rtf).
+    Rtf,
+    /// Word 2003 XML (WordprocessingML 2003, .xml).
+    Wml2003,
+    /// Apple Pages documents (.pages).
+    Pages,
+    /// HTML pages: Word's "Save as Web Page" (a `.doc` that is HTML).
+    Html,
+}
+
+impl Format {
+    /// The format of a file extension (without its dot, any case).
+    pub fn from_extension(ext: &str) -> Option<Format> {
+        Some(match ext.to_ascii_lowercase().as_str() {
+            "doc" | "dot" => Format::Doc,
+            "odt" | "ott" => Format::Odt,
+            "fodt" => Format::Fodt,
+            "rtf" => Format::Rtf,
+            "xml" | "wml" | "wml2003" => Format::Wml2003,
+            "pages" => Format::Pages,
+            "html" | "htm" => Format::Html,
+            _ => return None,
+        })
+    }
+
+    pub fn name(self) -> &'static str {
+        match self {
+            Format::Doc => "doc",
+            Format::Odt => "odt",
+            Format::Fodt => "fodt",
+            Format::Rtf => "rtf",
+            Format::Wml2003 => "wml2003",
+            Format::Pages => "pages",
+            Format::Html => "html",
+        }
+    }
+}
+
+/// A converted document.
+#[derive(Debug)]
+pub struct Converted {
+    /// The DOCX package.
+    pub docx: Vec<u8>,
+    /// Paragraphs in the body.
+    pub paragraphs: usize,
+    /// What was left out or could not be read, for diagnostics.
+    pub warnings: Vec<String>,
+}
+
+/// Converts `input`, a document of `format`, to DOCX.
+pub fn convert(input: &[u8], format: Format, limits: &Limits) -> Result<Converted, Error> {
+    let (doc, budget) = read(input, format, limits)?;
+    finish(doc, &budget)
+}
+
+/// The text of `input`, a document of `format`, cut at `cap` bytes: what a
+/// reader sees, taken from the model the converter reads, with the same
+/// limits and refusals as [`convert`]. See [`crate::formats::office::text`].
+pub fn text(
+    input: &[u8],
+    format: Format,
+    limits: &Limits,
+    cap: usize,
+) -> Result<crate::formats::office::text::Text, Error> {
+    let (doc, _) = read(input, format, limits)?;
+    let mut out = crate::formats::office::text::Out::new(cap);
+    text::lines(&doc, &mut out);
+    Ok(out.finish())
+}
+
+/// Reads `input` into the model, within `limits`.
+fn read(
+    input: &[u8],
+    format: Format,
+    limits: &Limits,
+) -> Result<(model::Document, limits::Budget), Error> {
+    if input.len() as u64 > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits);
+    let doc = match format {
+        Format::Doc => doc::read(input, &mut budget)?,
+        Format::Odt => odt::read_odt(
+            crate::formats::office::common::package::Zip::open(input)?,
+            &mut budget,
+        )?,
+        Format::Fodt => odt::read_fodt(input, &mut budget)?,
+        Format::Rtf => rtf::read(input, &mut budget)?,
+        Format::Wml2003 => wml::read(input, &mut budget)?,
+        Format::Pages => pages::read(
+            crate::formats::office::common::package::Zip::open(input)?,
+            &mut budget,
+        )?,
+        Format::Html => html::read(input, &mut budget)?,
+    };
+    Ok((doc, budget))
+}
+
+fn finish(doc: model::Document, budget: &limits::Budget) -> Result<Converted, Error> {
+    let left = budget.limits.max_memory.saturating_sub(budget.used());
+    let docx = docx::write(&doc, left)?;
+    Ok(Converted {
+        docx,
+        paragraphs: doc.body.len(),
+        warnings: doc.warnings,
+    })
+}
diff --git a/crates/exav-render/src/formats/office/docs/model.rs b/crates/exav-render/src/formats/office/docs/model.rs
new file mode 100644
index 00000000..fab0543c
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/model.rs
@@ -0,0 +1,914 @@
+//! The document model every reader fills and the DOCX writer serializes. It
+//! follows WordprocessingML closely: properties are optional, a style is
+//! named by its id, lengths are in twips, font sizes in half points, drawing
+//! sizes in EMU.
+
+pub type Emu = i64;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Color {
+    Auto,
+    Rgb(u32),
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Fonts {
+    pub ascii: Option<String>,
+    pub hansi: Option<String>,
+    pub east_asia: Option<String>,
+    pub cs: Option<String>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Border {
+    /// A ST_Border value: single, double, dotted, dashed, thick, ...
+    pub style: &'static str,
+    /// Eighths of a point.
+    pub size: u32,
+    /// Points between the border and the text.
+    pub space: u32,
+    pub color: Color,
+    pub shadow: bool,
+}
+
+impl Border {
+    pub fn single(size: u32, color: Color) -> Border {
+        Border {
+            style: "single",
+            size,
+            space: 0,
+            color,
+            shadow: false,
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Shading {
+    /// ST_Shd pattern: clear, solid, pct10, horzStripe, ...
+    pub pattern: &'static str,
+    pub fill: Option<Color>,
+    pub color: Option<Color>,
+}
+
+impl Shading {
+    pub fn fill(c: Color) -> Shading {
+        Shading {
+            pattern: "clear",
+            fill: Some(c),
+            color: None,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum VertAlign {
+    Baseline,
+    Superscript,
+    Subscript,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct RunProps {
+    pub style: Option<String>,
+    pub fonts: Fonts,
+    /// Half points.
+    pub size: Option<u32>,
+    pub size_cs: Option<u32>,
+    pub bold: Option<bool>,
+    pub bold_cs: Option<bool>,
+    pub italic: Option<bool>,
+    pub italic_cs: Option<bool>,
+    pub caps: Option<bool>,
+    pub small_caps: Option<bool>,
+    pub strike: Option<bool>,
+    pub dstrike: Option<bool>,
+    pub vanish: Option<bool>,
+    pub outline: Option<bool>,
+    pub shadow: Option<bool>,
+    pub emboss: Option<bool>,
+    pub imprint: Option<bool>,
+    /// ST_Underline: single, double, words, dotted, ...; "none" turns it
+    /// off.
+    pub underline: Option<&'static str>,
+    pub underline_color: Option<Color>,
+    pub color: Option<Color>,
+    /// ST_HighlightColor: yellow, green, ...; "none" turns it off.
+    pub highlight: Option<&'static str>,
+    pub shading: Option<Shading>,
+    pub vert_align: Option<VertAlign>,
+    /// Twips added after each character.
+    pub spacing: Option<i32>,
+    /// Horizontal scale in percent.
+    pub scale: Option<u32>,
+    /// Half points raised (negative: lowered).
+    pub position: Option<i32>,
+    pub kerning: Option<u32>,
+    pub lang: Option<String>,
+    pub lang_east_asia: Option<String>,
+    pub lang_bidi: Option<String>,
+    pub rtl: Option<bool>,
+    pub cs: Option<bool>,
+    pub border: Option<Border>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Jc {
+    Left,
+    Center,
+    Right,
+    Both,
+    Distribute,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum LineRule {
+    Auto,
+    Exact,
+    AtLeast,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum TabKind {
+    Left,
+    Center,
+    Right,
+    Decimal,
+    Bar,
+    Clear,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum TabLeader {
+    None,
+    Dot,
+    Hyphen,
+    Underscore,
+    MiddleDot,
+    Heavy,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct Tab {
+    pub pos: i32,
+    pub kind: TabKind,
+    pub leader: TabLeader,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Borders {
+    pub top: Option<Border>,
+    pub left: Option<Border>,
+    pub bottom: Option<Border>,
+    pub right: Option<Border>,
+    pub between: Option<Border>,
+}
+
+impl Borders {
+    pub fn is_empty(&self) -> bool {
+        self.top.is_none()
+            && self.left.is_none()
+            && self.bottom.is_none()
+            && self.right.is_none()
+            && self.between.is_none()
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct Frame {
+    pub width: Option<i32>,
+    pub height: Option<i32>,
+    pub height_exact: bool,
+    pub x: Option<i32>,
+    pub y: Option<i32>,
+    /// page, margin, text
+    pub h_anchor: Option<&'static str>,
+    pub v_anchor: Option<&'static str>,
+    pub x_align: Option<&'static str>,
+    pub y_align: Option<&'static str>,
+    pub wrap: Option<&'static str>,
+    pub drop_cap: Option<&'static str>,
+    pub lines: Option<u32>,
+    pub h_space: Option<i32>,
+    pub v_space: Option<i32>,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct ParaProps {
+    pub style: Option<String>,
+    pub keep_next: Option<bool>,
+    pub keep_lines: Option<bool>,
+    pub page_break_before: Option<bool>,
+    pub widow_control: Option<bool>,
+    pub num_id: Option<u32>,
+    pub num_level: Option<u32>,
+    pub borders: Borders,
+    pub shading: Option<Shading>,
+    pub tabs: Vec<Tab>,
+    pub suppress_line_numbers: Option<bool>,
+    pub space_before: Option<i32>,
+    pub space_after: Option<i32>,
+    pub before_auto: Option<bool>,
+    pub after_auto: Option<bool>,
+    pub line: Option<i32>,
+    pub line_rule: Option<LineRule>,
+    pub ind_left: Option<i32>,
+    pub ind_right: Option<i32>,
+    pub ind_first_line: Option<i32>,
+    pub ind_hanging: Option<i32>,
+    pub contextual_spacing: Option<bool>,
+    pub bidi: Option<bool>,
+    pub jc: Option<Jc>,
+    pub outline_level: Option<u32>,
+    pub frame: Option<Frame>,
+    pub snap_to_grid: Option<bool>,
+}
+
+/// A table's borders: the edges and the inside lines.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct TableBorders {
+    pub top: Option<Border>,
+    pub left: Option<Border>,
+    pub bottom: Option<Border>,
+    pub right: Option<Border>,
+    pub inside_h: Option<Border>,
+    pub inside_v: Option<Border>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Width {
+    Auto,
+    /// Twips.
+    Twips(i32),
+    /// Fiftieths of a percent.
+    Pct(i32),
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Margins {
+    pub top: Option<i32>,
+    pub left: Option<i32>,
+    pub bottom: Option<i32>,
+    pub right: Option<i32>,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct TableProps {
+    pub style: Option<String>,
+    pub width: Option<Width>,
+    pub jc: Option<Jc>,
+    pub indent: Option<i32>,
+    pub borders: TableBorders,
+    pub shading: Option<Shading>,
+    pub cell_margins: Margins,
+    pub fixed_layout: bool,
+    pub cell_spacing: Option<i32>,
+    pub bidi: bool,
+    /// Table positioned among the text (floating).
+    pub float: Option<Frame>,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct RowProps {
+    /// Twips; `height_exact` makes it exact, else a minimum.
+    pub height: Option<i32>,
+    pub height_exact: bool,
+    pub header: bool,
+    pub cant_split: bool,
+    pub grid_before: u32,
+    pub grid_after: u32,
+    pub width_before: Option<Width>,
+    pub width_after: Option<Width>,
+    pub jc: Option<Jc>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum VMerge {
+    None,
+    Restart,
+    Continue,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum VAlign {
+    Top,
+    Center,
+    Bottom,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct CellProps {
+    pub width: Option<Width>,
+    pub grid_span: u32,
+    pub v_merge: VMerge,
+    pub borders: TableBorders,
+    pub shading: Option<Shading>,
+    pub v_align: Option<VAlign>,
+    pub margins: Margins,
+    pub no_wrap: bool,
+    pub fit_text: bool,
+    /// lrTb, tbRl, btLr
+    pub text_direction: Option<&'static str>,
+}
+
+impl Default for CellProps {
+    fn default() -> Self {
+        CellProps {
+            width: None,
+            grid_span: 1,
+            v_merge: VMerge::None,
+            borders: TableBorders::default(),
+            shading: None,
+            v_align: None,
+            margins: Margins::default(),
+            no_wrap: false,
+            fit_text: false,
+            text_direction: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Cell {
+    pub props: CellProps,
+    pub content: Vec<Block>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Row {
+    pub props: RowProps,
+    pub cells: Vec<Cell>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Table {
+    pub props: TableProps,
+    /// Column widths in twips.
+    pub grid: Vec<i32>,
+    pub rows: Vec<Row>,
+}
+
+/// Blocks are mostly paragraphs; boxing them would cost an allocation each.
+#[derive(Clone, Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum Block {
+    Para(Para),
+    Table(Table),
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum BreakKind {
+    Line,
+    Page,
+    Column,
+}
+
+#[derive(Clone, Debug)]
+pub enum RunItem {
+    Text(String),
+    Tab,
+    Break(BreakKind),
+    NoBreakHyphen,
+    SoftHyphen,
+    Symbol {
+        font: String,
+        ch: u16,
+    },
+    Drawing(Box<Drawing>),
+    FootnoteRef(u32),
+    EndnoteRef(u32),
+    /// The mark inside a footnote or endnote, repeating its number.
+    NoteMark(bool),
+    CommentRef(u32),
+    /// The page number field in its simple form: PAGE, NUMPAGES.
+    PageNumber,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Run {
+    pub props: RunProps,
+    pub items: Vec<RunItem>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum FieldCharKind {
+    Begin,
+    Separate,
+    End,
+}
+
+#[derive(Clone, Debug)]
+pub enum Inline {
+    Run(Run),
+    /// A field mark whose partner is in another paragraph.
+    FieldChar(FieldCharKind),
+    InstrText(String),
+    /// A field with its stored result.
+    Field {
+        instr: String,
+        props: RunProps,
+        result: Vec<Inline>,
+    },
+    Hyperlink {
+        /// An external target, else `anchor`.
+        target: Option<String>,
+        anchor: Option<String>,
+        tooltip: Option<String>,
+        content: Vec<Inline>,
+    },
+    BookmarkStart {
+        id: u32,
+        name: String,
+    },
+    BookmarkEnd(u32),
+    CommentStart(u32),
+    CommentEnd(u32),
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Para {
+    pub props: ParaProps,
+    /// The paragraph mark's character properties.
+    pub mark: RunProps,
+    pub content: Vec<Inline>,
+    /// The section this paragraph ends.
+    pub section: Option<Box<Section>>,
+}
+
+// ---- drawings ----
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Wrap {
+    None,
+    Square,
+    Tight,
+    TopBottom,
+    Through,
+}
+
+#[derive(Clone, Debug)]
+pub struct Anchor {
+    /// page, margin, column, character, paragraph, line, ...
+    pub h_rel: &'static str,
+    pub v_rel: &'static str,
+    /// Offsets in EMU, or an alignment (left, center, right, top, ...).
+    pub h_off: Emu,
+    pub v_off: Emu,
+    pub h_align: Option<&'static str>,
+    pub v_align: Option<&'static str>,
+    pub wrap: Wrap,
+    pub behind: bool,
+    pub z: u32,
+    pub dist: [Emu; 4],
+}
+
+impl Default for Anchor {
+    fn default() -> Self {
+        Anchor {
+            h_rel: "column",
+            v_rel: "paragraph",
+            h_off: 0,
+            v_off: 0,
+            h_align: None,
+            v_align: None,
+            wrap: Wrap::Square,
+            behind: false,
+            z: 0,
+            dist: [0, 0, 0, 0],
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Crop {
+    /// Thousandths of a percent of the picture, each side.
+    pub l: i32,
+    pub t: i32,
+    pub r: i32,
+    pub b: i32,
+}
+
+#[derive(Clone, Debug)]
+pub struct Line {
+    pub color: Color,
+    /// EMU.
+    pub width: Emu,
+    pub dash: &'static str,
+}
+
+#[derive(Clone, Debug)]
+pub enum Fill {
+    None,
+    Solid(u32),
+}
+
+#[derive(Clone, Debug)]
+pub struct Shape {
+    /// DrawingML preset geometry name: rect, ellipse, line, ...
+    pub preset: &'static str,
+    pub fill: Fill,
+    pub line: Option<Line>,
+    /// Text inside the shape.
+    pub text: Vec<Block>,
+    pub rot: i32,
+    pub flip_h: bool,
+    pub flip_v: bool,
+    pub insets: [Emu; 4],
+    pub v_anchor: &'static str,
+}
+
+impl Default for Shape {
+    fn default() -> Self {
+        Shape {
+            preset: "rect",
+            fill: Fill::None,
+            line: None,
+            text: vec![],
+            rot: 0,
+            flip_h: false,
+            flip_v: false,
+            insets: [91_440, 45_720, 91_440, 45_720],
+            v_anchor: "t",
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum DrawingKind {
+    /// An index into `Document::media`.
+    Picture {
+        media: usize,
+        crop: Crop,
+    },
+    Shape(Shape),
+}
+
+#[derive(Clone, Debug)]
+pub struct Drawing {
+    /// `None`: inline in the text.
+    pub anchor: Option<Anchor>,
+    pub cx: Emu,
+    pub cy: Emu,
+    pub name: String,
+    pub descr: Option<String>,
+    pub kind: DrawingKind,
+}
+
+#[derive(Clone, Debug)]
+pub struct Media {
+    pub ext: &'static str,
+    pub data: Vec<u8>,
+}
+
+// ---- styles, numbering, sections ----
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum StyleKind {
+    Paragraph,
+    Character,
+    Table,
+    Numbering,
+}
+
+#[derive(Clone, Debug)]
+pub struct Style {
+    pub id: String,
+    pub name: String,
+    pub kind: StyleKind,
+    pub based_on: Option<String>,
+    pub next: Option<String>,
+    pub link: Option<String>,
+    pub default: bool,
+    pub q_format: bool,
+    pub ui_priority: Option<u32>,
+    pub hidden: bool,
+    pub ppr: ParaProps,
+    pub rpr: RunProps,
+    pub tbl: Option<TableProps>,
+}
+
+impl Style {
+    pub fn new(id: &str, name: &str, kind: StyleKind) -> Style {
+        Style {
+            id: id.to_string(),
+            name: name.to_string(),
+            kind,
+            based_on: None,
+            next: None,
+            link: None,
+            default: false,
+            q_format: false,
+            ui_priority: None,
+            hidden: false,
+            ppr: ParaProps::default(),
+            rpr: RunProps::default(),
+            tbl: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Level {
+    pub start: i64,
+    /// ST_NumberFormat: decimal, bullet, lowerLetter, upperRoman, ...
+    pub fmt: &'static str,
+    /// The text with %1..%9 for the counters.
+    pub text: String,
+    pub jc: Jc,
+    /// tab, space, nothing
+    pub suff: &'static str,
+    pub style: Option<String>,
+    pub ppr: ParaProps,
+    pub rpr: RunProps,
+    pub legal: bool,
+    /// The level whose counter restarts this one: Some(0) never restarts.
+    pub restart: Option<u32>,
+}
+
+impl Default for Level {
+    fn default() -> Self {
+        Level {
+            start: 1,
+            fmt: "decimal",
+            text: String::new(),
+            jc: Jc::Left,
+            suff: "tab",
+            style: None,
+            ppr: ParaProps::default(),
+            rpr: RunProps::default(),
+            legal: false,
+            restart: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct AbstractNum {
+    pub id: u32,
+    pub multi_level: bool,
+    pub levels: Vec<Level>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Num {
+    pub id: u32,
+    pub abstract_id: u32,
+    /// (level, start override, level definition override)
+    pub overrides: Vec<(u32, Option<i64>, Option<Level>)>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Numbering {
+    pub abstracts: Vec<AbstractNum>,
+    pub nums: Vec<Num>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum SectionType {
+    NextPage,
+    Continuous,
+    EvenPage,
+    OddPage,
+    NextColumn,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Columns {
+    pub num: u32,
+    pub space: i32,
+    pub separator: bool,
+    /// (width, space after) per column when unequal.
+    pub widths: Vec<(i32, i32)>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct HeaderFooter {
+    pub default: Option<Vec<Block>>,
+    pub first: Option<Vec<Block>>,
+    pub even: Option<Vec<Block>>,
+}
+
+#[derive(Clone, Debug)]
+pub struct Section {
+    pub kind: SectionType,
+    pub width: i32,
+    pub height: i32,
+    pub landscape: bool,
+    pub top: i32,
+    pub right: i32,
+    pub bottom: i32,
+    pub left: i32,
+    pub header: i32,
+    pub footer: i32,
+    pub gutter: i32,
+    pub columns: Columns,
+    pub title_page: bool,
+    pub page_start: Option<u32>,
+    pub page_fmt: Option<&'static str>,
+    pub v_align: Option<&'static str>,
+    pub rtl_gutter: bool,
+    pub bidi: bool,
+    pub page_borders: Borders,
+    pub headers: HeaderFooter,
+    pub footers: HeaderFooter,
+    pub text_direction: Option<&'static str>,
+    pub line_numbers: Option<(u32, u32, i32)>,
+}
+
+impl Default for Section {
+    fn default() -> Self {
+        Section {
+            kind: SectionType::NextPage,
+            width: 12240,
+            height: 15840,
+            landscape: false,
+            top: 1440,
+            right: 1440,
+            bottom: 1440,
+            left: 1440,
+            header: 720,
+            footer: 720,
+            gutter: 0,
+            columns: Columns::default(),
+            title_page: false,
+            page_start: None,
+            page_fmt: None,
+            v_align: None,
+            rtl_gutter: false,
+            bidi: false,
+            page_borders: Borders::default(),
+            headers: HeaderFooter::default(),
+            footers: HeaderFooter::default(),
+            text_direction: None,
+            line_numbers: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Note {
+    pub id: u32,
+    pub content: Vec<Block>,
+}
+
+#[derive(Clone, Debug)]
+pub struct Comment {
+    pub id: u32,
+    pub author: String,
+    pub initials: String,
+    pub date: Option<String>,
+    pub content: Vec<Block>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Settings {
+    pub default_tab_stop: Option<i32>,
+    pub even_and_odd_headers: bool,
+    pub footnote_pos: Option<&'static str>,
+    pub footnote_fmt: Option<&'static str>,
+    pub footnote_start: Option<u32>,
+    pub footnote_restart: Option<&'static str>,
+    pub endnote_fmt: Option<&'static str>,
+    pub endnote_start: Option<u32>,
+    pub endnote_restart: Option<&'static str>,
+    pub mirror_margins: bool,
+    pub gutter_at_top: bool,
+}
+
+#[derive(Debug, Default)]
+pub struct Document {
+    pub defaults_run: RunProps,
+    pub defaults_para: ParaProps,
+    pub styles: Vec<Style>,
+    pub numbering: Numbering,
+    pub body: Vec<Block>,
+    /// The last section's properties.
+    pub section: Section,
+    pub footnotes: Vec<Note>,
+    pub endnotes: Vec<Note>,
+    pub comments: Vec<Comment>,
+    pub media: Vec<Media>,
+    pub settings: Settings,
+    pub warnings: Vec<String>,
+}
+
+impl Document {
+    /// The index of a picture in `media`, adding it when new (by content).
+    pub fn add_media(&mut self, ext: &'static str, data: Vec<u8>) -> usize {
+        if let Some(i) = self
+            .media
+            .iter()
+            .position(|m| m.ext == ext && m.data == data)
+        {
+            return i;
+        }
+        self.media.push(Media { ext, data });
+        self.media.len() - 1
+    }
+
+    pub fn warn(&mut self, w: impl Into<String>) {
+        if self.warnings.len() < 200 {
+            self.warnings.push(w.into());
+        }
+    }
+}
+
+/// What the inlines of a paragraph take in memory: each one's slot, the room
+/// of the items of a run, and the text and names they own. A reader that
+/// builds a paragraph's content at once charges this, so that what it holds
+/// is counted by what it is and not by a guess per paragraph.
+pub(crate) fn inline_bytes(inlines: &[Inline]) -> usize {
+    inlines
+        .iter()
+        .map(|i| {
+            size_of::<Inline>()
+                + match i {
+                    Inline::Run(r) => {
+                        r.items.len() * size_of::<RunItem>()
+                            + r.items
+                                .iter()
+                                .map(|it| match it {
+                                    RunItem::Text(t) => t.len(),
+                                    RunItem::Symbol { font, .. } => font.len(),
+                                    RunItem::Drawing(_) => size_of::<Drawing>(),
+                                    _ => 0,
+                                })
+                                .sum::<usize>()
+                    }
+                    Inline::InstrText(s) => s.len(),
+                    Inline::Field { instr, result, .. } => instr.len() + inline_bytes(result),
+                    Inline::Hyperlink {
+                        target,
+                        anchor,
+                        tooltip,
+                        content,
+                    } => {
+                        [target, anchor, tooltip]
+                            .iter()
+                            .map(|o| o.as_ref().map_or(0, String::len))
+                            .sum::<usize>()
+                            + inline_bytes(content)
+                    }
+                    Inline::BookmarkStart { name, .. } => name.len(),
+                    _ => 0,
+                }
+        })
+        .sum()
+}
+
+impl Run {
+    pub fn text(props: RunProps, s: impl Into<String>) -> Run {
+        Run {
+            props,
+            items: vec![RunItem::Text(s.into())],
+        }
+    }
+}
+
+fn over<T: Clone>(a: &mut Option<T>, b: &Option<T>) {
+    if b.is_some() {
+        *a = b.clone();
+    }
+}
+
+impl RunProps {
+    /// `o`'s set properties over these.
+    pub fn overlay(&mut self, o: &RunProps) {
+        over(&mut self.style, &o.style);
+        over(&mut self.fonts.ascii, &o.fonts.ascii);
+        over(&mut self.fonts.hansi, &o.fonts.hansi);
+        over(&mut self.fonts.east_asia, &o.fonts.east_asia);
+        over(&mut self.fonts.cs, &o.fonts.cs);
+        over(&mut self.size, &o.size);
+        over(&mut self.size_cs, &o.size_cs);
+        over(&mut self.bold, &o.bold);
+        over(&mut self.bold_cs, &o.bold_cs);
+        over(&mut self.italic, &o.italic);
+        over(&mut self.italic_cs, &o.italic_cs);
+        over(&mut self.caps, &o.caps);
+        over(&mut self.small_caps, &o.small_caps);
+        over(&mut self.strike, &o.strike);
+        over(&mut self.dstrike, &o.dstrike);
+        over(&mut self.vanish, &o.vanish);
+        over(&mut self.outline, &o.outline);
+        over(&mut self.shadow, &o.shadow);
+        over(&mut self.emboss, &o.emboss);
+        over(&mut self.imprint, &o.imprint);
+        over(&mut self.underline, &o.underline);
+        over(&mut self.underline_color, &o.underline_color);
+        over(&mut self.color, &o.color);
+        over(&mut self.highlight, &o.highlight);
+        over(&mut self.shading, &o.shading);
+        over(&mut self.vert_align, &o.vert_align);
+        over(&mut self.spacing, &o.spacing);
+        over(&mut self.scale, &o.scale);
+        over(&mut self.position, &o.position);
+        over(&mut self.kerning, &o.kerning);
+        over(&mut self.lang, &o.lang);
+        over(&mut self.lang_east_asia, &o.lang_east_asia);
+        over(&mut self.lang_bidi, &o.lang_bidi);
+        over(&mut self.rtl, &o.rtl);
+        over(&mut self.cs, &o.cs);
+        over(&mut self.border, &o.border);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/odt/frame.rs b/crates/exav-render/src/formats/office/docs/odt/frame.rs
new file mode 100644
index 00000000..fecc03e2
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/odt/frame.rs
@@ -0,0 +1,294 @@
+//! Frames and shapes: pictures, text boxes and simple drawing shapes.
+
+use super::Odt;
+use crate::formats::office::common::base64;
+use crate::formats::office::common::image;
+use crate::formats::office::common::odf::{self, Props};
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::model::*;
+
+impl Odt<'_> {
+    fn picture_media(&mut self, n: &Node) -> Result<Option<usize>> {
+        let max = self.b.limits.max_part as usize;
+        let data = if let Some(b) = n.child("office:binary-data") {
+            base64::decode(&odf::text_of(b), max)
+        } else if let Some(h) = n.attr("xlink:href") {
+            if let Some(&m) = self.image_cache.get(h) {
+                return Ok(m);
+            }
+            let path = h.trim_start_matches("./");
+            let d = match &mut self.zip {
+                Some(z) if !path.contains("..") && !path.contains("://") => {
+                    z.read(path, max as u64).ok().flatten()
+                }
+                _ => None,
+            };
+            let media = match d {
+                Some(d) => match image::ext(&d) {
+                    Some(ext) => {
+                        self.b.alloc(d.len() as u64)?;
+                        Some(self.doc.add_media(ext, d))
+                    }
+                    None => None,
+                },
+                None => None,
+            };
+            self.image_cache.insert(h.to_string(), media);
+            return Ok(media);
+        } else {
+            None
+        };
+        let Some(d) = data else { return Ok(None) };
+        match image::ext(&d) {
+            Some(ext) => {
+                self.b.alloc(d.len() as u64)?;
+                Ok(Some(self.doc.add_media(ext, d)))
+            }
+            None => Ok(None),
+        }
+    }
+
+    /// A frame or drawing shape as a drawing, if it holds something this
+    /// converter draws.
+    pub(crate) fn drawing(&mut self, n: &Node) -> Result<Option<Drawing>> {
+        if self.depth > 12 {
+            return Ok(None);
+        }
+        let ap = n
+            .attr("draw:style-name")
+            .map(|s| self.apply("graphic", s))
+            .unwrap_or_default();
+        let p: &Props = &ap.props;
+        let anchor_type = n.attr("text:anchor-type").unwrap_or("paragraph");
+        let w = n.attr("svg:width").and_then(odf::emu);
+        let h = n.attr("svg:height").and_then(odf::emu);
+        let x = n.attr("svg:x").and_then(odf::emu).unwrap_or(0);
+        let y = n.attr("svg:y").and_then(odf::emu).unwrap_or(0);
+        let descr = n
+            .child("svg:desc")
+            .map(odf::text_of)
+            .or_else(|| n.child("svg:title").map(odf::text_of))
+            .filter(|s| !s.is_empty());
+
+        // What the frame holds.
+        let mut kind = None;
+        let mut natural = None;
+        let mut frame_node = n;
+        if n.name == "draw:frame" {
+            for c in n.nodes() {
+                match c.name.as_str() {
+                    "draw:image" => {
+                        if let Some(media) = self.picture_media(c)? {
+                            natural = image::natural_emu(&self.doc.media[media].data);
+                            let mut crop = Crop::default();
+                            if let Some(clip) = p.get("graphic/fo:clip") {
+                                // rect(top, right, bottom, left)
+                                let nums: Vec<f64> = clip
+                                    .trim_start_matches("rect(")
+                                    .trim_end_matches(')')
+                                    .split([',', ' '])
+                                    .filter(|s| !s.is_empty())
+                                    .filter_map(odf::pt)
+                                    .collect();
+                                if let (Some((nx, ny)), [t, r, b, l]) = (natural, nums.as_slice()) {
+                                    let (fw, fh) = (nx as f64 / 12_700.0, ny as f64 / 12_700.0);
+                                    if fw > 0.0 && fh > 0.0 {
+                                        crop = Crop {
+                                            t: (t / fh * 100_000.0) as i32,
+                                            r: (r / fw * 100_000.0) as i32,
+                                            b: (b / fh * 100_000.0) as i32,
+                                            l: (l / fw * 100_000.0) as i32,
+                                        };
+                                    }
+                                }
+                            }
+                            kind = Some(DrawingKind::Picture { media, crop });
+                        }
+                        break;
+                    }
+                    "draw:text-box" => {
+                        let blocks = self.blocks(c)?;
+                        let mut sh = Shape {
+                            text: blocks,
+                            ..Shape::default()
+                        };
+                        frame_style(p, &mut sh);
+                        kind = Some(DrawingKind::Shape(sh));
+                        frame_node = c;
+                        break;
+                    }
+                    _ => {}
+                }
+            }
+        } else {
+            // A drawing shape directly in the text.
+            let preset = match n.name.as_str() {
+                "draw:rect" => "rect",
+                "draw:ellipse" => "ellipse",
+                "draw:line" | "draw:connector" => "line",
+                "draw:custom-shape" => "rect",
+                _ => return Ok(None),
+            };
+            let mut sh = Shape {
+                preset,
+                ..Shape::default()
+            };
+            frame_style(p, &mut sh);
+            if n.nodes().any(|c| c.name == "text:p") {
+                self.depth += 1;
+                let blocks = self.blocks(n)?;
+                self.depth -= 1;
+                sh.text = blocks;
+            }
+            kind = Some(DrawingKind::Shape(sh));
+        }
+        let Some(kind) = kind else { return Ok(None) };
+        let _ = frame_node;
+        let (cx, cy) = match (w, h, natural) {
+            (Some(w), Some(h), _) if w > 0 && h > 0 => (w, h),
+            (Some(w), None, Some((nx, ny))) if w > 0 && nx > 0 => (w, w * ny / nx),
+            (None, Some(h), Some((nx, ny))) if h > 0 && ny > 0 => (h * nx / ny, h),
+            (_, _, Some((nx, ny))) => (nx, ny),
+            (Some(w), Some(h), None) => (w.max(1), h.max(1)),
+            _ => (914_400, 914_400),
+        };
+        let anchor = if anchor_type == "as-char" {
+            None
+        } else {
+            let h_rel = match (p.get("graphic/style:horizontal-rel"), anchor_type) {
+                (Some("page" | "page-start-margin" | "page-end-margin"), _) | (None, "page") => {
+                    "page"
+                }
+                (Some("page-content"), _) => "margin",
+                (Some("paragraph" | "paragraph-content"), _) => "column",
+                (Some("char"), _) => "character",
+                (_, "char") => "character",
+                _ => "column",
+            };
+            let v_rel = match (p.get("graphic/style:vertical-rel"), anchor_type) {
+                (Some("page"), _) | (None, "page") => "page",
+                (Some("page-content"), _) => "margin",
+                (Some("paragraph" | "paragraph-content"), _) => "paragraph",
+                (Some("char" | "line" | "text"), _) | (_, "char") => "line",
+                _ => "paragraph",
+            };
+            let mut a = Anchor {
+                h_rel,
+                v_rel,
+                ..Anchor::default()
+            };
+            match p.get("graphic/style:horizontal-pos") {
+                Some("center") => a.h_align = Some("center"),
+                Some("right") => a.h_align = Some("right"),
+                Some("left") => a.h_align = Some("left"),
+                _ => a.h_off = x,
+            }
+            match p.get("graphic/style:vertical-pos") {
+                Some("middle") => a.v_align = Some("center"),
+                Some("bottom") => a.v_align = Some("bottom"),
+                Some("top") => a.v_align = Some("top"),
+                _ => a.v_off = y,
+            }
+            a.wrap = match p.get("graphic/style:wrap") {
+                Some("none") => Wrap::TopBottom,
+                Some("run-through") => Wrap::None,
+                Some("left" | "right" | "parallel" | "dynamic" | "biggest") => Wrap::Square,
+                _ => Wrap::Square,
+            };
+            a.behind = p.get("graphic/style:run-through") == Some("background");
+            a.z = n
+                .attr("draw:z-index")
+                .and_then(|v| v.parse::<u32>().ok())
+                .unwrap_or(0);
+            a.dist = [
+                p.pt("graphic/fo:margin-top")
+                    .map(|v| (v * 12_700.0) as i64)
+                    .unwrap_or(0),
+                p.pt("graphic/fo:margin-bottom")
+                    .map(|v| (v * 12_700.0) as i64)
+                    .unwrap_or(0),
+                p.pt("graphic/fo:margin-left")
+                    .map(|v| (v * 12_700.0) as i64)
+                    .unwrap_or(0),
+                p.pt("graphic/fo:margin-right")
+                    .map(|v| (v * 12_700.0) as i64)
+                    .unwrap_or(0),
+            ];
+            Some(a)
+        };
+        Ok(Some(Drawing {
+            anchor,
+            cx,
+            cy,
+            name: n.attr("draw:name").unwrap_or("Frame").to_string(),
+            descr,
+            kind,
+        }))
+    }
+}
+
+/// Fill and line of a graphic style.
+fn frame_style(p: &Props, sh: &mut Shape) {
+    sh.fill = match p.get("graphic/draw:fill") {
+        Some("solid") => p
+            .get("graphic/draw:fill-color")
+            .and_then(odf::color)
+            .map(Fill::Solid)
+            .unwrap_or(Fill::None),
+        _ => match p.get("graphic/fo:background-color").and_then(odf::color) {
+            Some(c) => Fill::Solid(c),
+            None => Fill::None,
+        },
+    };
+    let stroke = p.get("graphic/draw:stroke");
+    let border = p.get("graphic/fo:border").filter(|b| *b != "none");
+    if stroke == Some("solid") || stroke == Some("dash") || border.is_some() {
+        let (w, c) = match border {
+            Some(b) => {
+                let bd = super::props::border(b, None);
+                (
+                    bd.as_ref()
+                        .map(|b| i64::from(b.size) * 1587)
+                        .unwrap_or(9525),
+                    bd.map(|b| b.color).unwrap_or(Color::Rgb(0)),
+                )
+            }
+            None => (
+                p.pt("graphic/svg:stroke-width")
+                    .map(|v| (v * 12_700.0) as i64)
+                    .unwrap_or(9525),
+                p.get("graphic/svg:stroke-color")
+                    .and_then(odf::color)
+                    .map(Color::Rgb)
+                    .unwrap_or(Color::Rgb(0)),
+            ),
+        };
+        sh.line = Some(Line {
+            color: c,
+            width: w,
+            dash: if stroke == Some("dash") {
+                "dash"
+            } else {
+                "solid"
+            },
+        });
+    }
+    let pad = |k: &str, d: i64| {
+        p.pt(&format!("graphic/fo:padding-{k}"))
+            .or_else(|| p.pt("graphic/fo:padding"))
+            .map(|v| (v * 12_700.0) as i64)
+            .unwrap_or(d)
+    };
+    sh.insets = [
+        pad("left", 0),
+        pad("top", 0),
+        pad("right", 0),
+        pad("bottom", 0),
+    ];
+    sh.v_anchor = match p.get("graphic/draw:textarea-vertical-align") {
+        Some("middle") => "ctr",
+        Some("bottom") => "b",
+        _ => "t",
+    };
+}
diff --git a/crates/exav-render/src/formats/office/docs/odt/list.rs b/crates/exav-render/src/formats/office/docs/odt/list.rs
new file mode 100644
index 00000000..eec7c6ae
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/odt/list.rs
@@ -0,0 +1,232 @@
+//! List styles as numbering definitions.
+
+use super::{Odt, props};
+use crate::formats::office::common::odf::{self, ListDef, Props};
+use crate::formats::office::docs::model::*;
+
+fn num_fmt(f: &str) -> &'static str {
+    match f {
+        "1" => "decimal",
+        "a" => "lowerLetter",
+        "A" => "upperLetter",
+        "i" => "lowerRoman",
+        "I" => "upperRoman",
+        "" => "none",
+        _ => "decimal",
+    }
+}
+
+/// A bullet written in a private-use code point of a symbol font.
+fn bullet_char(c: char) -> String {
+    match c {
+        '\u{E000}'..='\u{F8FF}' => "\u{2022}".to_string(),
+        c => c.to_string(),
+    }
+}
+
+impl Odt<'_> {
+    fn list_def(&self, name: &str) -> Option<ListDef> {
+        let (s, k) = (&self.cs, &self.ms);
+        s.list_names
+            .get(name)
+            .map(|i| s.lists[*i].clone())
+            .or_else(|| k.list_names.get(name).map(|i| k.lists[*i].clone()))
+    }
+
+    fn abstract_of(&mut self, style: &str) -> Option<u32> {
+        if let Some(i) = self.abstracts.get(style) {
+            return Some(*i);
+        }
+        let def = self.list_def(style)?;
+        let mut levels: Vec<Level> = vec![];
+        for lvl in 1..=9usize {
+            let l = def
+                .levels
+                .iter()
+                .rev()
+                .find(|(n, _)| *n == lvl)
+                .map(|x| &x.1);
+            levels.push(match l {
+                Some(x) => self.level_of(x, lvl),
+                None => Level {
+                    fmt: "none",
+                    ..Level::default()
+                },
+            });
+        }
+        let id = self.doc.numbering.abstracts.len() as u32;
+        self.doc.numbering.abstracts.push(AbstractNum {
+            id,
+            multi_level: true,
+            levels,
+        });
+        self.abstracts.insert(style.to_string(), id);
+        Some(id)
+    }
+
+    fn level_of(&self, x: &odf::ListLevel, lvl: usize) -> Level {
+        let mut l = Level {
+            start: x
+                .attr("text:start-value")
+                .and_then(|v| v.parse().ok())
+                .unwrap_or(1),
+            ..Level::default()
+        };
+        let prefix = x.attr("style:num-prefix").unwrap_or("");
+        let suffix = x.attr("style:num-suffix").unwrap_or("");
+        match x.kind {
+            "number" => {
+                l.fmt = num_fmt(x.attr("style:num-format").unwrap_or("1"));
+                let show = x
+                    .attr("text:display-levels")
+                    .and_then(|v| v.parse::<usize>().ok())
+                    .unwrap_or(1)
+                    .clamp(1, lvl);
+                let mut t = String::from(prefix);
+                if l.fmt != "none" {
+                    for k in (lvl - show + 1)..=lvl {
+                        if k > lvl - show + 1 {
+                            t.push('.');
+                        }
+                        t.push_str(&format!("%{k}"));
+                    }
+                    t.push_str(suffix);
+                } else {
+                    t.clear();
+                }
+                l.text = t;
+                l.legal = false;
+            }
+            "bullet" => {
+                l.fmt = "bullet";
+                l.text = x
+                    .attr("text:bullet-char")
+                    .and_then(|s| s.chars().next())
+                    .map(bullet_char)
+                    .unwrap_or_else(|| "\u{2022}".into());
+            }
+            "image" => {
+                l.fmt = "bullet";
+                l.text = "\u{2022}".into();
+            }
+            _ => l.fmt = "none",
+        }
+        // Where the label and the text sit.
+        let p = &x.props;
+        let (left, hanging, tab, suff);
+        if p.get("label-alignment/fo:margin-left").is_some()
+            || p.get("label-alignment/text:label-followed-by").is_some()
+        {
+            left = p.twips("label-alignment/fo:margin-left").unwrap_or(0);
+            let indent = p.twips("label-alignment/fo:text-indent").unwrap_or(0);
+            hanging = -indent;
+            suff = match p.get("label-alignment/text:label-followed-by") {
+                Some("space") => "space",
+                Some("nothing") => "nothing",
+                _ => "tab",
+            };
+            tab = p.twips("label-alignment/text:list-tab-stop-position");
+        } else {
+            let before = p.twips("list-level/text:space-before").unwrap_or(0);
+            let width = p.twips("list-level/text:min-label-width").unwrap_or(0);
+            left = before + width;
+            hanging = width;
+            tab = None;
+            suff = "tab";
+        }
+        l.suff = suff;
+        l.ppr.ind_left = Some(left);
+        if hanging > 0 {
+            l.ppr.ind_hanging = Some(hanging);
+        } else if hanging < 0 {
+            l.ppr.ind_first_line = Some(-hanging);
+        } else {
+            l.ppr.ind_first_line = Some(0);
+        }
+        if let Some(t) = tab.filter(|t| *t > left) {
+            l.ppr.tabs.push(Tab {
+                pos: t,
+                kind: TabKind::Left,
+                leader: TabLeader::None,
+            });
+        }
+        // The label's own character formatting.
+        let mut rpr = props::run_props(&Props(p.0.clone()), &self.cs, 24);
+        if rpr
+            .fonts
+            .ascii
+            .as_deref()
+            .is_some_and(|f| f.eq_ignore_ascii_case("OpenSymbol"))
+        {
+            rpr.fonts = Fonts::default();
+        }
+        l.rpr = rpr;
+        if x.kind == "bullet" {
+            // The text style of a bullet is its own; keep colour and size only.
+            l.rpr.fonts = Fonts::default();
+        }
+        l
+    }
+
+    /// The instance of list style `style` for a list that starts here.
+    pub(crate) fn list_num(&mut self, style: &str, continue_: bool, restart: bool) -> Option<u32> {
+        let abs = self.abstract_of(style)?;
+        if (continue_ || restart)
+            && let Some(n) = self.last_num.get(style)
+            && !restart
+        {
+            return Some(*n);
+        }
+        let id = self.doc.numbering.nums.len() as u32 + 1;
+        let seen = self.last_num.contains_key(style);
+        let mut overrides = vec![];
+        if seen {
+            // A list that does not continue starts again at its first number.
+            let starts: Vec<i64> = self.doc.numbering.abstracts[abs as usize]
+                .levels
+                .iter()
+                .map(|l| l.start)
+                .collect();
+            for (lvl, s) in starts.into_iter().enumerate() {
+                overrides.push((lvl as u32, Some(s), None));
+            }
+        }
+        self.doc.numbering.nums.push(Num {
+            id,
+            abstract_id: abs,
+            overrides,
+        });
+        self.last_num.insert(style.to_string(), id);
+        Some(id)
+    }
+
+    /// The numbering of headings, when the outline style numbers any level.
+    pub(crate) fn outline_num_id(&mut self) -> Option<u32> {
+        if self.outline_num.is_none() {
+            let numbered = self.cs.list_names.get("<outline>").is_some_and(|i| {
+                self.cs.lists[*i].levels.iter().any(|(_, l)| {
+                    l.kind == "number" && !l.attr("style:num-format").unwrap_or("").is_empty()
+                })
+            });
+            self.outline_num = Some(if numbered {
+                self.list_num("<outline>", true, false).unwrap_or(0)
+            } else {
+                0
+            });
+        }
+        self.outline_num.filter(|n| *n > 0)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn formats_and_bullets() {
+        assert_eq!(num_fmt("a"), "lowerLetter");
+        assert_eq!(num_fmt(""), "none");
+        assert_eq!(bullet_char('\u{E00A}'), "\u{2022}");
+        assert_eq!(bullet_char('-'), "-");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/odt/mod.rs b/crates/exav-render/src/formats/office/docs/odt/mod.rs
new file mode 100644
index 00000000..8d81be9a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/odt/mod.rs
@@ -0,0 +1,676 @@
+//! OpenDocument text (ODT, OTT, FODT) to the document model.
+
+mod frame;
+mod list;
+mod props;
+mod table;
+mod text;
+
+use crate::formats::office::common::odf::{Attrs, Props, Styles};
+use crate::formats::office::common::package::Zip;
+use crate::formats::office::common::xml::{self, Node};
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+use std::collections::{HashMap, HashSet};
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub(crate) enum Scope {
+    Content,
+    Master,
+}
+
+/// A style used on a paragraph or run: the named style it refers to and
+/// the properties it adds.
+#[derive(Clone, Debug, Default)]
+pub(crate) struct Applied {
+    pub style: Option<String>,
+    pub rpr: RunProps,
+    pub master: Option<String>,
+    pub list_style: Option<String>,
+    pub tabs: Vec<(String, String, Attrs)>,
+    pub props: Props,
+    pub break_after: bool,
+}
+
+pub(crate) struct Odt<'a> {
+    pub b: &'a mut Budget,
+    pub doc: Document,
+    pub zip: Option<Zip<'a>>,
+    pub cs: Styles,
+    pub ms: Styles,
+    pub styles_root: &'a Node,
+    pub scope: Scope,
+    ids: HashMap<(String, String), String>,
+    used_ids: HashSet<String>,
+    applied: HashMap<(Scope, String, String), Applied>,
+    pub abstracts: HashMap<String, u32>,
+    pub last_num: HashMap<String, u32>,
+    pub list_ids: HashMap<String, (String, u32)>,
+    pub outline_num: Option<u32>,
+    pub next_bookmark: u32,
+    pub bookmark_open: HashMap<String, u32>,
+    pub annotation_ends: HashSet<String>,
+    pub annotation_ids: HashMap<String, u32>,
+    pub cur_master: String,
+    pub pending_break: bool,
+    pub depth: u32,
+    pub image_cache: HashMap<String, Option<usize>>,
+    pub even_odd: bool,
+    pub in_header: bool,
+    /// Notes the one being read is inside of.
+    pub note_level: u32,
+}
+
+pub(crate) fn read_odt(mut zip: Zip<'_>, budget: &mut Budget) -> Result<Document> {
+    let max = budget.limits.max_part;
+    if let Some(m) = zip.read("mimetype", 256)? {
+        let m = String::from_utf8_lossy(&m);
+        if !m
+            .trim()
+            .starts_with("application/vnd.oasis.opendocument.text")
+        {
+            return Err(Error::NotFormat(format!("mimetype {}", m.trim())));
+        }
+    }
+    let content = zip
+        .read("content.xml", max)?
+        .ok_or_else(|| Error::NotFormat("no content.xml".into()))?;
+    budget.alloc(content.len() as u64)?;
+    let styles = zip.read("styles.xml", max)?.unwrap_or_default();
+    budget.alloc(styles.len() as u64)?;
+    if zip.names().iter().any(|n| n == "META-INF/manifest.xml")
+        && let Some(m) = zip.read("META-INF/manifest.xml", 1 << 22)?
+        && find(&m, b"manifest:encryption-data")
+    {
+        return Err(Error::Encrypted);
+    }
+    let content = xml::parse(&content, &mut budget.tree())?;
+    let styles = if styles.is_empty() {
+        Node::default()
+    } else {
+        xml::parse(&styles, &mut budget.tree())?
+    };
+    convert(&styles, &content, Some(zip), budget)
+}
+
+pub(crate) fn read_fodt(input: &[u8], budget: &mut Budget) -> Result<Document> {
+    let root = xml::parse(input, &mut budget.tree())?;
+    if root.name != "office:document" {
+        return Err(Error::NotFormat(format!("root element {}", root.name)));
+    }
+    if let Some(m) = root.attr("office:mimetype")
+        && !m.starts_with("application/vnd.oasis.opendocument.text")
+    {
+        return Err(Error::NotFormat(format!("mimetype {m}")));
+    }
+    // The one tree plays both parts: its styles and its content.
+    convert(&root, &root, None, budget)
+}
+
+fn find(hay: &[u8], needle: &[u8]) -> bool {
+    hay.windows(needle.len()).any(|w| w == needle)
+}
+
+fn convert(
+    styles_root: &Node,
+    content_root: &Node,
+    zip: Option<Zip<'_>>,
+    budget: &mut Budget,
+) -> Result<Document> {
+    let mut o = Odt {
+        b: budget,
+        doc: Document::default(),
+        zip,
+        cs: Styles::default(),
+        ms: Styles::default(),
+        styles_root,
+        scope: Scope::Content,
+        ids: HashMap::new(),
+        used_ids: HashSet::new(),
+        applied: HashMap::new(),
+        abstracts: HashMap::new(),
+        last_num: HashMap::new(),
+        list_ids: HashMap::new(),
+        outline_num: None,
+        next_bookmark: 1,
+        bookmark_open: HashMap::new(),
+        annotation_ends: HashSet::new(),
+        annotation_ids: HashMap::new(),
+        cur_master: String::new(),
+        pending_break: false,
+        depth: 0,
+        image_cache: HashMap::new(),
+        even_odd: false,
+        in_header: false,
+        note_level: 0,
+    };
+    o.load(styles_root, content_root);
+    o.build_styles();
+    let body = content_root
+        .child("office:body")
+        .and_then(|b| b.child("office:text"))
+        .ok_or_else(|| Error::NotFormat("no text body".into()))?;
+    o.collect_annotation_ends(body);
+    o.body(body)?;
+    o.doc.settings.even_and_odd_headers = o.even_odd;
+    Ok(o.doc)
+}
+
+/// ODF names write special characters as `_20_` (their hex code).
+pub(crate) fn decode_name(n: &str) -> String {
+    let mut out = String::new();
+    let b = n.as_bytes();
+    let mut i = 0;
+    while i < b.len() {
+        if b[i] == b'_'
+            && let Some(end) = n[i + 1..].find('_')
+        {
+            let hex = &n[i + 1..i + 1 + end];
+            if (2..=6).contains(&hex.len())
+                && let Some(c) = u32::from_str_radix(hex, 16).ok().and_then(char::from_u32)
+            {
+                out.push(c);
+                i += end + 2;
+                continue;
+            }
+        }
+        let ch = n[i..].chars().next().unwrap_or(' ');
+        out.push(ch);
+        i += ch.len_utf8();
+    }
+    out
+}
+
+impl<'a> Odt<'a> {
+    fn load(&mut self, styles_root: &Node, content_root: &Node) {
+        let mut named = vec![];
+        for n in styles_root.nodes() {
+            match n.name.as_str() {
+                "office:font-face-decls" | "office:styles" => named.push((n, false)),
+                "office:automatic-styles" => {}
+                _ => {}
+            }
+        }
+        for (n, a) in &named {
+            self.cs.add(n, *a);
+            self.ms.add(n, *a);
+        }
+        if let Some(a) = styles_root.child("office:automatic-styles") {
+            self.ms.add(a, true);
+            // Page layouts live in the styles part and are used through it.
+            self.cs.add(a, true);
+        }
+        if let Some(f) = content_root.child("office:font-face-decls") {
+            self.cs.add(f, false);
+        }
+        if let Some(a) = content_root.child("office:automatic-styles") {
+            self.cs.add(a, true);
+        }
+        // Outline numbering.
+        if let Some(os) = styles_root
+            .child("office:styles")
+            .and_then(|s| s.child("text:outline-style"))
+        {
+            let i = self.cs.list(os);
+            self.cs.list_names.insert("<outline>".into(), i);
+        }
+    }
+
+    pub(crate) fn styles(&self) -> &Styles {
+        match self.scope {
+            Scope::Content => &self.cs,
+            Scope::Master => &self.ms,
+        }
+    }
+
+    fn style_id(&mut self, family: &str, name: &str) -> String {
+        if let Some(i) = self.ids.get(&(family.to_string(), name.to_string())) {
+            return i.clone();
+        }
+        let decoded = decode_name(name);
+        let base: String = if decoded == "Standard" && family == "paragraph" {
+            "Standard".into()
+        } else {
+            decoded.chars().filter(|c| c.is_alphanumeric()).collect()
+        };
+        let base = if base.is_empty() {
+            "Style".to_string()
+        } else if base.chars().next().is_some_and(|c| c.is_ascii_digit()) {
+            format!("S{base}")
+        } else {
+            base
+        };
+        let mut id = if family == "text" {
+            format!("{base}Char")
+        } else {
+            base.clone()
+        };
+        let mut k = 2;
+        while !self.used_ids.insert(id.clone()) {
+            id = format!("{base}{k}");
+            k += 1;
+        }
+        self.ids
+            .insert((family.to_string(), name.to_string()), id.clone());
+        id
+    }
+
+    /// The named style a style resolves to, with the properties of the
+    /// automatic styles on the way.
+    pub(crate) fn apply(&mut self, family: &str, name: &str) -> Applied {
+        let key = (self.scope, family.to_string(), name.to_string());
+        if let Some(a) = self.applied.get(&key) {
+            return a.clone();
+        }
+        let mut chain: Vec<String> = vec![];
+        let mut cur = Some(name.to_string());
+        let mut named: Option<String> = None;
+        while let Some(n) = cur.take() {
+            if chain.len() > 32 {
+                break;
+            }
+            let Some(def) = self.styles().get(family, &n) else {
+                break;
+            };
+            if def.automatic {
+                chain.push(n.clone());
+                cur = def.parent.clone();
+            } else {
+                named = Some(n);
+                break;
+            }
+        }
+        let mut a = Applied::default();
+        let mut props = Props::default();
+        let mut tabs = vec![];
+        let mut master = None;
+        let mut list_style = None;
+        for n in chain.iter().rev() {
+            let Some(def) = self.styles().get(family, n) else {
+                continue;
+            };
+            props.overlay(&def.props);
+            tabs.extend(
+                def.children
+                    .iter()
+                    .filter(|c| c.1 == "style:tab-stop")
+                    .cloned(),
+            );
+            if let Some(m) = def.attr("style:master-page-name") {
+                master = Some(m.to_string());
+            }
+            if let Some(l) = def.attr("style:list-style-name") {
+                list_style = Some(l.to_string());
+            }
+        }
+        // A named style can carry a master page or a list too.
+        if let Some(n) = &named {
+            let mut cur = Some(n.clone());
+            let mut depth = 0;
+            while let Some(c) = cur.take() {
+                depth += 1;
+                if depth > 32 {
+                    break;
+                }
+                let Some(def) = self.styles().get(family, &c) else {
+                    break;
+                };
+                if list_style.is_none() {
+                    list_style = def.attr("style:list-style-name").map(str::to_string);
+                }
+                if master.is_none() {
+                    master = def.attr("style:master-page-name").map(str::to_string);
+                }
+                cur = def.parent.clone();
+            }
+        }
+        a.style = named.map(|n| self.style_id(family, &n));
+        a.master = master.filter(|m| !m.is_empty());
+        a.list_style = list_style.filter(|l| !l.is_empty());
+        a.break_after = props.get("paragraph/fo:break-after") == Some("page");
+        let base = self.base_size(family, name);
+        let rpr = props::run_props(&props, self.styles(), base);
+        a.rpr = rpr;
+        a.tabs = tabs;
+        a.props = props;
+        self.applied.insert(key, a.clone());
+        a
+    }
+
+    /// The font size (half points) percentages of `family`'s style refer to.
+    fn base_size(&self, family: &str, name: &str) -> u32 {
+        let p = self.styles().resolve(family, Some(name));
+        p.pt("text/fo:font-size")
+            .map(|v| (v * 2.0) as u32)
+            .filter(|v| *v > 0)
+            .unwrap_or(24)
+    }
+
+    fn build_styles(&mut self) {
+        // Defaults.
+        let dflt = self
+            .cs
+            .defaults
+            .get("paragraph")
+            .cloned()
+            .unwrap_or_default();
+        let dp = Props(dflt);
+        let mut rpr = props::run_props(&dp, &self.cs, 24);
+        if rpr.size.is_none() {
+            rpr.size = Some(24);
+            rpr.size_cs = Some(24);
+        }
+        self.doc.defaults_run = rpr;
+        self.doc.defaults_para = props::para_props(&dp, false);
+        if let Some(t) = dp.twips("paragraph/style:tab-stop-distance")
+            && t > 0
+        {
+            self.doc.settings.default_tab_stop = Some(t);
+        }
+        // Named styles.
+        let order = self.cs.order.clone();
+        let mut out = vec![];
+        for (family, name) in order {
+            if family != "paragraph" && family != "text" {
+                continue;
+            }
+            let Some(def) = self.cs.get(&family, &name) else {
+                continue;
+            };
+            if def.automatic {
+                continue;
+            }
+            let def_attrs = def.attrs.clone();
+            let parent = def.parent.clone();
+            let next = def.next.clone();
+            let children = def.children.clone();
+            let props = Props(def.props.clone());
+            let id = self.style_id(&family, &name);
+            let display = def_attrs
+                .iter()
+                .find(|a| a.0 == "style:display-name")
+                .map(|a| a.1.clone())
+                .unwrap_or_else(|| decode_name(&name));
+            let kind = if family == "paragraph" {
+                StyleKind::Paragraph
+            } else {
+                StyleKind::Character
+            };
+            let heading = display
+                .strip_prefix("Heading ")
+                .and_then(|n| n.parse::<u32>().ok())
+                .filter(|n| (1..=9).contains(n));
+            let mut st = Style::new(
+                &id,
+                &match heading {
+                    Some(n) => format!("heading {n}"),
+                    None => display.clone(),
+                },
+                kind,
+            );
+            st.based_on = parent.map(|p| self.style_id(&family, &p));
+            st.next = next.map(|p| self.style_id(&family, &p));
+            let base = self.base_size(&family, &name);
+            st.rpr = props::run_props(&props, &self.cs, base);
+            if kind == StyleKind::Paragraph {
+                st.ppr = props::para_props(&props, false);
+                let left = props.twips("paragraph/fo:margin-left").unwrap_or(0);
+                st.ppr.tabs = props::tabs(&children, left);
+                if let Some(l) = def_attrs
+                    .iter()
+                    .find(|a| a.0 == "style:default-outline-level")
+                    .and_then(|a| a.1.parse::<u32>().ok())
+                {
+                    st.ppr.outline_level = Some(l.saturating_sub(1).min(9));
+                }
+                if let Some(h) = heading {
+                    st.ppr.outline_level = Some(h - 1);
+                    st.q_format = true;
+                }
+                if display == "Standard" {
+                    st.q_format = true;
+                }
+                // A heading's list style (outline numbering) goes with it.
+                if let Some(ls) = def_attrs
+                    .iter()
+                    .find(|a| a.0 == "style:list-style-name")
+                    .map(|a| a.1.clone())
+                    .filter(|l| !l.is_empty())
+                    && let Some(nid) = self.list_num(&ls, true, false)
+                {
+                    st.ppr.num_id = Some(nid);
+                    st.ppr.num_level = heading.map(|h| h - 1);
+                }
+            }
+            out.push(st);
+        }
+        self.doc.styles = out;
+    }
+
+    // ---- pages and sections ----
+
+    fn collect_annotation_ends(&mut self, n: &Node) {
+        let mut stack = vec![n];
+        while let Some(x) = stack.pop() {
+            if x.name == "office:annotation-end"
+                && let Some(name) = x.attr("office:name")
+            {
+                self.annotation_ends.insert(name.to_string());
+            }
+            stack.extend(x.nodes());
+        }
+    }
+
+    fn default_master(&self) -> String {
+        let masters = self.styles_root.child("office:master-styles");
+        let first = masters.and_then(|m| m.all("style:master-page").next());
+        if let Some(m) = masters.and_then(|m| {
+            m.all("style:master-page")
+                .find(|p| p.attr("style:name") == Some("Standard"))
+        }) {
+            return m.attr("style:name").unwrap_or("Standard").to_string();
+        }
+        first
+            .and_then(|m| m.attr("style:name"))
+            .unwrap_or("Standard")
+            .to_string()
+    }
+
+    /// The section a master page defines.
+    fn section_of(&mut self, master: &str) -> Result<Section> {
+        let mut s = Section {
+            width: 11906,
+            height: 16838,
+            ..Section::default()
+        };
+        let node = self
+            .styles_root
+            .child("office:master-styles")
+            .and_then(|m| {
+                m.all("style:master-page")
+                    .find(|p| p.attr("style:name") == Some(master))
+            })
+            .or_else(|| {
+                self.styles_root
+                    .child("office:master-styles")
+                    .and_then(|m| m.all("style:master-page").next())
+            });
+        let Some(node) = node else { return Ok(s) };
+        let layout = node
+            .attr("style:page-layout-name")
+            .and_then(|l| self.ms.page_layouts.get(l))
+            .cloned()
+            .unwrap_or_default();
+        if let Some(v) = layout.twips("fo:page-width") {
+            s.width = v;
+        }
+        if let Some(v) = layout.twips("fo:page-height") {
+            s.height = v;
+        }
+        s.landscape = layout.get("style:print-orientation") == Some("landscape");
+        for (k, slot) in [
+            ("fo:margin-top", &mut s.top),
+            ("fo:margin-bottom", &mut s.bottom),
+            ("fo:margin-left", &mut s.left),
+            ("fo:margin-right", &mut s.right),
+        ] {
+            if let Some(v) = layout.twips(k) {
+                *slot = v;
+            } else if let Some(v) = layout.twips("fo:margin") {
+                *slot = v;
+            }
+        }
+        if layout
+            .get("style:writing-mode")
+            .is_some_and(|w| w.starts_with("rl"))
+        {
+            s.bidi = true;
+        }
+        if let Some(f) = layout.get("style:num-format") {
+            s.page_fmt = match f {
+                "i" => Some("lowerRoman"),
+                "I" => Some("upperRoman"),
+                "a" => Some("lowerLetter"),
+                "A" => Some("upperLetter"),
+                _ => None,
+            };
+        }
+        if let Some(n) = layout
+            .get("style:first-page-number")
+            .and_then(|v| v.parse::<u32>().ok())
+        {
+            s.page_start = Some(n);
+        }
+        // Page borders.
+        for (name, slot) in [
+            ("top", &mut s.page_borders.top),
+            ("left", &mut s.page_borders.left),
+            ("bottom", &mut s.page_borders.bottom),
+            ("right", &mut s.page_borders.right),
+        ] {
+            let v = layout
+                .get(&format!("fo:border-{name}"))
+                .or_else(|| layout.get("fo:border"));
+            if let Some(v) = v {
+                *slot = props::border(v, None);
+            }
+        }
+        // Headers and footers: the body starts below them.
+        let mut top = s.top;
+        let mut bottom = s.bottom;
+        let mut header_blocks: [Option<Vec<Block>>; 3] = [None, None, None];
+        let mut footer_blocks: [Option<Vec<Block>>; 3] = [None, None, None];
+        self.scope = Scope::Master;
+        self.in_header = true;
+        for (is_header, names) in [
+            (
+                true,
+                ["style:header", "style:header-left", "style:header-first"],
+            ),
+            (
+                false,
+                ["style:footer", "style:footer-left", "style:footer-first"],
+            ),
+        ] {
+            for (k, n) in names.iter().enumerate() {
+                let Some(h) = node.child(n) else { continue };
+                if h.attr("style:display") == Some("false") {
+                    continue;
+                }
+                let blocks = self.blocks(h)?;
+                if is_header {
+                    header_blocks[k] = Some(blocks);
+                } else {
+                    footer_blocks[k] = Some(blocks);
+                }
+            }
+        }
+        self.in_header = false;
+        self.scope = Scope::Content;
+        let height = |prefix: &str| {
+            let h = layout
+                .twips(&format!("{prefix}:fo:min-height"))
+                .unwrap_or(0);
+            let m = layout
+                .twips(&format!("{prefix}:fo:margin-bottom"))
+                .or_else(|| layout.twips(&format!("{prefix}:fo:margin-top")))
+                .unwrap_or(0);
+            (h, m)
+        };
+        if header_blocks.iter().any(|h| h.is_some()) {
+            let (h, m) = height("header");
+            s.header = top;
+            top += h + m;
+        }
+        if footer_blocks.iter().any(|h| h.is_some()) {
+            let (h, m) = height("footer");
+            s.footer = bottom;
+            bottom += h + m;
+        }
+        s.top = top;
+        s.bottom = bottom;
+        let [hd, hl, hf] = header_blocks;
+        let [fd, fl, ff] = footer_blocks;
+        s.headers = HeaderFooter {
+            default: hd,
+            even: hl,
+            first: hf,
+        };
+        s.footers = HeaderFooter {
+            default: fd,
+            even: fl,
+            first: ff,
+        };
+        s.title_page = s.headers.first.is_some() || s.footers.first.is_some();
+        if s.headers.even.is_some() || s.footers.even.is_some() {
+            self.even_odd = true;
+        }
+        Ok(s)
+    }
+
+    fn body(&mut self, body: &Node) -> Result<()> {
+        self.cur_master = String::new();
+        let blocks = self.blocks_top(body)?;
+        self.doc.body = blocks;
+        let m = if self.cur_master.is_empty() {
+            self.default_master()
+        } else {
+            self.cur_master.clone()
+        };
+        self.doc.section = self.section_of(&m)?;
+        Ok(())
+    }
+
+    /// Ends the section in progress on the last paragraph of `out`.
+    pub(crate) fn end_section(&mut self, out: &mut Vec<Block>) -> Result<()> {
+        let m = if self.cur_master.is_empty() {
+            self.default_master()
+        } else {
+            self.cur_master.clone()
+        };
+        let s = self.section_of(&m)?;
+        match out.last_mut() {
+            Some(Block::Para(p)) if p.section.is_none() => p.section = Some(Box::new(s)),
+            _ => out.push(Block::Para(Para {
+                section: Some(Box::new(s)),
+                ..Para::default()
+            })),
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn style_names_are_decoded() {
+        assert_eq!(decode_name("Heading_20_1"), "Heading 1");
+        assert_eq!(decode_name("List_5f_Bullet"), "List_Bullet");
+        assert_eq!(decode_name("plain"), "plain");
+        assert_eq!(decode_name("a_zz_b"), "a_zz_b");
+        assert_eq!(decode_name("_20"), "_20");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/odt/props.rs b/crates/exav-render/src/formats/office/docs/odt/props.rs
new file mode 100644
index 00000000..4fbb69db
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/odt/props.rs
@@ -0,0 +1,417 @@
+//! ODF style properties ([ODF 1.2] 20) as model properties.
+
+use crate::formats::office::common::odf::{self, Props, Styles};
+use crate::formats::office::docs::model::*;
+
+/// "0.06pt solid #000000" and the like. `None` for no border.
+pub fn border(v: &str, pad: Option<f64>) -> Option<Border> {
+    let mut width = None;
+    let mut style = None;
+    let mut color = None;
+    for tok in v.split_whitespace() {
+        if tok == "none" || tok == "hidden" {
+            return None;
+        }
+        if let Some(c) = odf::color(tok) {
+            color = Some(c);
+        } else if let Some(w) = odf::pt(tok) {
+            width = Some(w);
+        } else {
+            style = Some(tok);
+        }
+    }
+    let w = width.unwrap_or(0.75);
+    let style = match style.unwrap_or("solid") {
+        "double" => "double",
+        "dotted" => "dotted",
+        "dashed" => "dashed",
+        "dot-dash" => "dotDash",
+        "dot-dot-dash" => "dotDotDash",
+        "groove" => "threeDEngrave",
+        "ridge" => "threeDEmboss",
+        "inset" => "inset",
+        "outset" => "outset",
+        "fine-dashed" => "dashSmallGap",
+        _ => "single",
+    };
+    Some(Border {
+        style,
+        size: ((w * 8.0).round() as u32).clamp(2, 96),
+        space: pad.map(|p| p.round() as u32).unwrap_or(0).min(31),
+        color: color.map(Color::Rgb).unwrap_or(Color::Auto),
+        shadow: false,
+    })
+}
+
+/// The border of one side: `fo:border-top`, else `fo:border`.
+pub fn side(p: &Props, kind: &str, side: &str) -> Option<Option<Border>> {
+    let v = p
+        .get(&format!("{kind}/fo:border-{side}"))
+        .or_else(|| p.get(&format!("{kind}/fo:border")))?;
+    let pad = p
+        .pt(&format!("{kind}/fo:padding-{side}"))
+        .or_else(|| p.pt(&format!("{kind}/fo:padding")));
+    Some(border(v, pad))
+}
+
+fn size_half_points(v: &str, base_half: u32) -> Option<u32> {
+    if let Some(p) = odf::percent(v) {
+        return Some(((f64::from(base_half) * p).round() as u32).clamp(2, 3276));
+    }
+    odf::pt(v).map(|p| ((p * 2.0).round() as u32).clamp(2, 3276))
+}
+
+fn bold_of(v: &str) -> Option<bool> {
+    match v {
+        "bold" | "bolder" => Some(true),
+        "normal" | "lighter" => Some(false),
+        n => n.parse::<u32>().ok().map(|w| w >= 600),
+    }
+}
+
+fn italic_of(v: &str) -> Option<bool> {
+    match v {
+        "italic" | "oblique" => Some(true),
+        "normal" => Some(false),
+        _ => None,
+    }
+}
+
+fn lang_tag(lang: Option<&str>, country: Option<&str>) -> Option<String> {
+    let l = lang?;
+    if l == "none" || l.is_empty() {
+        return None;
+    }
+    Some(match country {
+        Some(c) if c != "none" && !c.is_empty() => format!("{l}-{c}"),
+        _ => l.to_string(),
+    })
+}
+
+/// Character properties; `base_half` is the size percentages refer to.
+pub fn run_props(p: &Props, st: &Styles, base_half: u32) -> RunProps {
+    let mut r = RunProps::default();
+    let t = |k: &str| p.get(&format!("text/{k}"));
+    if let Some(v) = t("fo:font-weight").and_then(bold_of) {
+        r.bold = Some(v);
+    }
+    if let Some(v) = t("style:font-weight-complex").and_then(bold_of) {
+        r.bold_cs = Some(v);
+    } else if let Some(b) = r.bold {
+        r.bold_cs = Some(b);
+    }
+    if let Some(v) = t("fo:font-style").and_then(italic_of) {
+        r.italic = Some(v);
+    }
+    if let Some(v) = t("style:font-style-complex").and_then(italic_of) {
+        r.italic_cs = Some(v);
+    } else if let Some(b) = r.italic {
+        r.italic_cs = Some(b);
+    }
+    if let Some(sz) = t("fo:font-size").and_then(|v| size_half_points(v, base_half)) {
+        r.size = Some(sz);
+        r.size_cs = Some(sz);
+    }
+    if let Some(sz) = t("style:font-size-complex").and_then(|v| size_half_points(v, base_half)) {
+        r.size_cs = Some(sz);
+    }
+    let family = |name: &str, fam: &str| -> Option<String> {
+        t(name)
+            .map(|n| st.font(n))
+            .or_else(|| t(fam).map(|f| f.trim().trim_matches(['\'', '"']).to_string()))
+            .filter(|s| !s.is_empty())
+    };
+    if let Some(f) = family("style:font-name", "fo:font-family") {
+        r.fonts.ascii = Some(f.clone());
+        r.fonts.hansi = Some(f);
+    }
+    r.fonts.east_asia = family("style:font-name-asian", "style:font-family-asian");
+    r.fonts.cs = family("style:font-name-complex", "style:font-family-complex");
+    if let Some(c) = t("fo:color").and_then(odf::color) {
+        r.color = Some(Color::Rgb(c));
+    }
+    if t("style:use-window-font-color") == Some("true") {
+        r.color = Some(Color::Auto);
+    }
+    if let Some(v) = t("fo:background-color") {
+        r.shading = odf::color(v).map(|c| Shading::fill(Color::Rgb(c)));
+        if v == "transparent" {
+            r.shading = Some(Shading::fill(Color::Auto));
+        }
+    }
+    if let Some(s) = t("style:text-underline-style") {
+        r.underline = Some(match s {
+            "none" => "none",
+            _ => {
+                let double = t("style:text-underline-type") == Some("double");
+                let bold = matches!(t("style:text-underline-width"), Some("bold" | "thick"));
+                match (s, double, bold) {
+                    ("dotted", _, true) => "dottedHeavy",
+                    ("dotted", _, _) => "dotted",
+                    ("dash" | "long-dash", _, true) => "dashedHeavy",
+                    ("dash", _, _) => "dash",
+                    ("long-dash", _, _) => "dashLong",
+                    ("dot-dash", _, true) => "dashDotHeavy",
+                    ("dot-dash", _, _) => "dotDash",
+                    ("dot-dot-dash", _, true) => "dashDotDotHeavy",
+                    ("dot-dot-dash", _, _) => "dotDotDash",
+                    ("wave", true, _) => "wavyDouble",
+                    ("wave", _, true) => "wavyHeavy",
+                    ("wave", _, _) => "wave",
+                    (_, true, _) => "double",
+                    (_, _, true) => "thick",
+                    _ => "single",
+                }
+            }
+        });
+        r.underline_color = t("style:text-underline-color").map(|c| match odf::color(c) {
+            Some(v) => Color::Rgb(v),
+            None => Color::Auto,
+        });
+    }
+    if let Some(s) = t("style:text-line-through-style") {
+        if s == "none" {
+            r.strike = Some(false);
+            r.dstrike = Some(false);
+        } else if t("style:text-line-through-type") == Some("double") {
+            r.dstrike = Some(true);
+        } else {
+            r.strike = Some(true);
+        }
+    }
+    match t("fo:text-transform") {
+        Some("uppercase") => r.caps = Some(true),
+        Some("none" | "lowercase" | "capitalize") => r.caps = Some(false),
+        _ => {}
+    }
+    match t("fo:font-variant") {
+        Some("small-caps") => r.small_caps = Some(true),
+        Some("normal") => r.small_caps = Some(false),
+        _ => {}
+    }
+    if let Some(v) = t("style:text-position") {
+        let mut it = v.split_whitespace();
+        let first = it.next().unwrap_or("0%");
+        let pct = match first {
+            "super" => Some(33.0),
+            "sub" => Some(-33.0),
+            s => s.strip_suffix('%').and_then(|x| x.parse::<f64>().ok()),
+        };
+        if let Some(pct) = pct {
+            if pct.abs() < 0.5 {
+                r.vert_align = Some(VertAlign::Baseline);
+            } else if first == "super" || first == "sub" || pct.abs() >= 20.0 {
+                r.vert_align = Some(if pct > 0.0 {
+                    VertAlign::Superscript
+                } else {
+                    VertAlign::Subscript
+                });
+            } else {
+                let half = f64::from(r.size.unwrap_or(base_half));
+                r.position = Some((pct / 100.0 * half).round() as i32);
+            }
+        }
+    }
+    if let Some(v) = t("fo:letter-spacing")
+        && v != "normal"
+        && let Some(tw) = odf::twips(v)
+    {
+        r.spacing = Some(tw);
+    }
+    if let Some(v) = t("style:text-scale").and_then(odf::percent) {
+        r.scale = Some(((v * 100.0).round() as u32).clamp(1, 600));
+    }
+    if t("text:display") == Some("none") {
+        r.vanish = Some(true);
+    } else if t("text:display") == Some("true") {
+        r.vanish = Some(false);
+    }
+    match t("style:font-relief") {
+        Some("embossed") => r.emboss = Some(true),
+        Some("engraved") => r.imprint = Some(true),
+        _ => {}
+    }
+    if t("style:text-outline") == Some("true") {
+        r.outline = Some(true);
+    }
+    if t("fo:text-shadow").is_some_and(|s| s != "none") {
+        r.shadow = Some(true);
+    }
+    r.lang = lang_tag(t("fo:language"), t("fo:country"));
+    r.lang_east_asia = lang_tag(t("style:language-asian"), t("style:country-asian"));
+    r.lang_bidi = lang_tag(t("style:language-complex"), t("style:country-complex"));
+    r
+}
+
+fn jc_of(v: &str) -> Option<Jc> {
+    Some(match v {
+        "start" | "left" => Jc::Left,
+        "end" | "right" => Jc::Right,
+        "center" => Jc::Center,
+        "justify" => Jc::Both,
+        _ => return None,
+    })
+}
+
+/// Paragraph properties. `kind` is "paragraph".
+pub fn para_props(p: &Props, in_list: bool) -> ParaProps {
+    let mut r = ParaProps::default();
+    let g = |k: &str| p.get(&format!("paragraph/{k}"));
+    if let Some(j) = g("fo:text-align").and_then(jc_of) {
+        r.jc = Some(j);
+    }
+    if g("style:writing-mode").is_some_and(|w| w.starts_with("rl")) {
+        r.bidi = Some(true);
+    }
+    if !in_list {
+        if let Some(v) = g("fo:margin-left").and_then(odf::twips) {
+            r.ind_left = Some(v);
+        }
+        if let Some(v) = g("fo:text-indent").and_then(odf::twips) {
+            if v >= 0 {
+                r.ind_first_line = Some(v);
+            } else {
+                r.ind_hanging = Some(-v);
+            }
+        }
+    }
+    if let Some(v) = g("fo:margin-right").and_then(odf::twips) {
+        r.ind_right = Some(v);
+    }
+    if let Some(v) = g("fo:margin-top").and_then(odf::twips) {
+        r.space_before = Some(v.max(0));
+    }
+    if let Some(v) = g("fo:margin-bottom").and_then(odf::twips) {
+        r.space_after = Some(v.max(0));
+    }
+    if let Some(v) = g("fo:line-height") {
+        if let Some(pc) = odf::percent(v) {
+            r.line = Some((pc * 240.0).round() as i32);
+            r.line_rule = Some(LineRule::Auto);
+        } else if let Some(t) = odf::twips(v)
+            && t > 0
+        {
+            r.line = Some(t);
+            r.line_rule = Some(LineRule::Exact);
+        }
+    }
+    if let Some(t) = g("style:line-height-at-least").and_then(odf::twips) {
+        r.line = Some(t);
+        r.line_rule = Some(LineRule::AtLeast);
+    }
+    match g("fo:keep-together") {
+        Some("always") => r.keep_lines = Some(true),
+        Some("auto") => r.keep_lines = Some(false),
+        _ => {}
+    }
+    match g("fo:keep-with-next") {
+        Some("always") => r.keep_next = Some(true),
+        Some("auto") => r.keep_next = Some(false),
+        _ => {}
+    }
+    if g("fo:break-before") == Some("page") {
+        r.page_break_before = Some(true);
+    }
+    let widows = g("fo:widows").and_then(|v| v.parse::<u32>().ok());
+    let orphans = g("fo:orphans").and_then(|v| v.parse::<u32>().ok());
+    if widows.is_some() || orphans.is_some() {
+        r.widow_control = Some(widows.unwrap_or(0) > 1 || orphans.unwrap_or(0) > 1);
+    }
+    if let Some(v) = g("fo:background-color") {
+        r.shading = odf::color(v).map(|c| Shading::fill(Color::Rgb(c)));
+    }
+    for (name, slot) in [
+        ("top", &mut r.borders.top),
+        ("left", &mut r.borders.left),
+        ("bottom", &mut r.borders.bottom),
+        ("right", &mut r.borders.right),
+    ] {
+        if let Some(b) = side(p, "paragraph", name) {
+            *slot = b;
+        }
+    }
+    if g("style:contextual-spacing") == Some("true") {
+        r.contextual_spacing = Some(true);
+    }
+    r
+}
+
+/// The tab stops of a style, relative to its left margin `left`.
+pub fn tabs(children: &[(String, String, odf::Attrs)], left: i32) -> Vec<Tab> {
+    let mut out = vec![];
+    for (_, name, attrs) in children {
+        if name != "style:tab-stop" {
+            continue;
+        }
+        let get = |k: &str| attrs.iter().find(|a| a.0 == k).map(|a| a.1.as_str());
+        let Some(pos) = get("style:position").and_then(odf::twips) else {
+            continue;
+        };
+        let kind = match get("style:type") {
+            Some("center") => TabKind::Center,
+            Some("right") => TabKind::Right,
+            Some("char") => TabKind::Decimal,
+            _ => TabKind::Left,
+        };
+        let leader = match (get("style:leader-style"), get("style:leader-text")) {
+            (Some("none") | None, None) => TabLeader::None,
+            (_, Some("-")) => TabLeader::Hyphen,
+            (_, Some("_")) => TabLeader::Underscore,
+            (Some("dotted"), _) | (_, Some(".")) => TabLeader::Dot,
+            (Some("solid"), _) => TabLeader::Underscore,
+            (Some("dash" | "long-dash"), _) => TabLeader::Hyphen,
+            _ => TabLeader::Dot,
+        };
+        out.push(Tab {
+            pos: pos + left,
+            kind,
+            leader,
+        });
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn borders() {
+        let b = border("0.5pt solid #ff0000", Some(2.0)).unwrap();
+        assert_eq!(
+            (b.style, b.size, b.space, b.color),
+            ("single", 4, 2, Color::Rgb(0xFF0000))
+        );
+        assert!(border("none", None).is_none());
+        assert_eq!(border("1pt double #000000", None).unwrap().style, "double");
+    }
+
+    #[test]
+    fn run_and_paragraph_properties() {
+        let p = Props(vec![
+            ("text/fo:font-weight".into(), "bold".into()),
+            ("text/fo:font-size".into(), "12pt".into()),
+            ("text/fo:color".into(), "#0000ff".into()),
+            ("text/style:text-position".into(), "super 58%".into()),
+            ("text/style:text-underline-style".into(), "solid".into()),
+            ("paragraph/fo:text-align".into(), "justify".into()),
+            ("paragraph/fo:margin-left".into(), "1cm".into()),
+            ("paragraph/fo:text-indent".into(), "-0.5cm".into()),
+            ("paragraph/fo:line-height".into(), "150%".into()),
+        ]);
+        let st = Styles::default();
+        let r = run_props(&p, &st, 24);
+        assert_eq!(r.bold, Some(true));
+        assert_eq!(r.size, Some(24));
+        assert_eq!(r.color, Some(Color::Rgb(0xFF)));
+        assert_eq!(r.vert_align, Some(VertAlign::Superscript));
+        assert_eq!(r.underline, Some("single"));
+        let q = para_props(&p, false);
+        assert_eq!(q.jc, Some(Jc::Both));
+        assert_eq!(q.ind_left, Some(567));
+        assert_eq!(q.ind_hanging, Some(283));
+        assert_eq!((q.line, q.line_rule), (Some(360), Some(LineRule::Auto)));
+        // In a list the indents come from the list level.
+        assert_eq!(para_props(&p, true).ind_left, None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/odt/table.rs b/crates/exav-render/src/formats/office/docs/odt/table.rs
new file mode 100644
index 00000000..d1001b96
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/odt/table.rs
@@ -0,0 +1,345 @@
+//! Tables ([ODF 1.2] 9): columns, rows, cells and their spans.
+
+use super::{Odt, props};
+use crate::formats::office::common::odf::{self, Props};
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::model::*;
+
+const MAX_COLUMNS: usize = 1024;
+const MAX_REPEAT_ROWS: usize = 1 << 12;
+
+struct Col {
+    width: Option<i32>,
+    rel: Option<f64>,
+    style: Option<String>,
+}
+
+fn collect_rows<'a>(n: &'a Node, header: bool, out: &mut Vec<(&'a Node, bool)>) {
+    for c in n.nodes() {
+        match c.name.as_str() {
+            "table:table-row" => out.push((c, header)),
+            "table:table-header-rows" => collect_rows(c, true, out),
+            "table:table-rows" | "table:table-row-group" => collect_rows(c, header, out),
+            _ => {}
+        }
+    }
+}
+
+fn collect_cols<'a>(n: &'a Node, out: &mut Vec<&'a Node>) {
+    for c in n.nodes() {
+        match c.name.as_str() {
+            "table:table-column" => out.push(c),
+            "table:table-columns" | "table:table-header-columns" | "table:table-column-group" => {
+                collect_cols(c, out)
+            }
+            _ => {}
+        }
+    }
+}
+
+fn repeat(n: &Node, key: &str, max: usize) -> usize {
+    n.attr(key)
+        .and_then(|v| v.parse::<usize>().ok())
+        .unwrap_or(1)
+        .clamp(1, max)
+}
+
+impl Odt<'_> {
+    pub(crate) fn table(&mut self, n: &Node) -> Result<Option<Table>> {
+        if self.depth > 16 {
+            return Ok(None);
+        }
+        let ap = n
+            .attr("table:style-name")
+            .map(|s| self.apply("table", s))
+            .unwrap_or_default();
+        let tp: &Props = &ap.props;
+        // Columns.
+        let mut cols: Vec<Col> = vec![];
+        let mut nodes = vec![];
+        collect_cols(n, &mut nodes);
+        for c in nodes {
+            let r = repeat(c, "table:number-columns-repeated", MAX_COLUMNS);
+            let style = c
+                .attr("table:style-name")
+                .map(|s| self.apply("table-column", s));
+            let width = style
+                .as_ref()
+                .and_then(|s| s.props.twips("table-column/style:column-width"));
+            let rel = style.as_ref().and_then(|s| {
+                s.props
+                    .get("table-column/style:rel-column-width")
+                    .and_then(|v| v.trim_end_matches('*').parse::<f64>().ok())
+            });
+            let default_style = c.attr("table:default-cell-style-name").map(str::to_string);
+            for _ in 0..r {
+                if cols.len() >= MAX_COLUMNS {
+                    break;
+                }
+                cols.push(Col {
+                    width,
+                    rel,
+                    style: default_style.clone(),
+                });
+            }
+        }
+        let table_width = tp.twips("table/style:width").or_else(|| {
+            tp.get("table/style:rel-width")
+                .and_then(odf::percent)
+                .map(|p| (p * 9000.0) as i32)
+        });
+        let total = table_width.unwrap_or(9000);
+        let abs_sum: i32 = cols.iter().filter_map(|c| c.width).sum();
+        let rel_sum: f64 = cols
+            .iter()
+            .filter(|c| c.width.is_none())
+            .filter_map(|c| c.rel)
+            .sum();
+        let unspec = cols
+            .iter()
+            .filter(|c| c.width.is_none() && c.rel.is_none())
+            .count();
+        let mut grid: Vec<i32> = vec![];
+        for c in &cols {
+            let w = match (c.width, c.rel) {
+                (Some(w), _) => w,
+                (None, Some(r)) if rel_sum > 0.0 => {
+                    ((total - abs_sum).max(0) as f64 * r / rel_sum) as i32
+                }
+                _ => ((total - abs_sum).max(0) / unspec.max(1) as i32).max(100),
+            };
+            grid.push(w.max(1));
+        }
+        // Rows.
+        let mut rows = vec![];
+        collect_rows(n, false, &mut rows);
+        let mut table = Table::default();
+        table.props.fixed_layout = true;
+        table.props.width = Some(
+            table_width
+                .map(Width::Twips)
+                .unwrap_or(Width::Twips(grid.iter().sum())),
+        );
+        if let Some(pc) = tp.get("table/style:rel-width").and_then(odf::percent) {
+            table.props.width = Some(Width::Pct((pc * 5000.0) as i32));
+        }
+        table.props.jc = match tp.get("table/table:align") {
+            Some("center") => Some(Jc::Center),
+            Some("right") => Some(Jc::Right),
+            _ => None,
+        };
+        if let Some(l) = tp.twips("table/fo:margin-left") {
+            table.props.indent = Some(l);
+        }
+        if tp
+            .get("table/style:writing-mode")
+            .is_some_and(|w| w.starts_with("rl"))
+        {
+            table.props.bidi = true;
+        }
+        table.props.shading = tp
+            .get("table/fo:background-color")
+            .and_then(odf::color)
+            .map(|c| Shading::fill(Color::Rgb(c)));
+        // Cell margins default to none in ODF: the cells carry their padding.
+        table.props.cell_margins = Margins {
+            top: Some(0),
+            left: Some(0),
+            bottom: Some(0),
+            right: Some(0),
+        };
+        let ncols = grid.len().max(1);
+        table.grid = if grid.is_empty() {
+            vec![9000]
+        } else {
+            grid.clone()
+        };
+        // Spans going down: (rows left, first column, columns).
+        let mut down: Vec<(usize, usize, usize)> = vec![(0, 0, 0); ncols + 1];
+        self.depth += 1;
+        let mut res = Ok(());
+        'rows: for (rn, header) in rows {
+            let times = repeat(rn, "table:number-rows-repeated", MAX_REPEAT_ROWS);
+            let rap = rn
+                .attr("table:style-name")
+                .map(|s| self.apply("table-row", s))
+                .unwrap_or_default();
+            for _ in 0..times {
+                let active = down.clone();
+                let mut row = Row::default();
+                row.props.header = header;
+                if let Some(h) = rap.props.twips("table-row/style:row-height") {
+                    row.props.height = Some(h);
+                    row.props.height_exact = true;
+                } else if let Some(h) = rap.props.twips("table-row/style:min-row-height") {
+                    row.props.height = Some(h);
+                }
+                if rap.props.get("table-row/fo:keep-together") == Some("always") {
+                    row.props.cant_split = true;
+                }
+                let mut col = 0usize;
+                let mut covered_left = 0usize;
+                for cell in rn.nodes() {
+                    let covered = cell.name == "table:covered-table-cell";
+                    if cell.name != "table:table-cell" && !covered {
+                        continue;
+                    }
+                    let rep_cols = repeat(cell, "table:number-columns-repeated", MAX_COLUMNS);
+                    for _ in 0..rep_cols.min(MAX_COLUMNS.saturating_sub(col).max(1)) {
+                        if col >= MAX_COLUMNS {
+                            break;
+                        }
+                        if col + 1 >= down.len() {
+                            down.resize(col + 2, (0, 0, 0));
+                        }
+                        let span = repeat(cell, "table:number-columns-spanned", MAX_COLUMNS);
+                        let rspan = repeat(cell, "table:number-rows-spanned", MAX_REPEAT_ROWS);
+                        if covered_left > 0 {
+                            // Covered by the cell before it in this row.
+                            covered_left -= 1;
+                            col += 1;
+                            continue;
+                        }
+                        if covered {
+                            // Covered by a cell above: the first column of the
+                            // block continues the merge, the others are part of it.
+                            let (left, first, w) = active[col.min(active.len() - 1)];
+                            if left > 0 && first == col {
+                                let mut c = Cell::default();
+                                c.props.v_merge = VMerge::Continue;
+                                c.props.grid_span = w as u32;
+                                c.props.width = Some(Width::Twips(
+                                    (col..col + w).filter_map(|i| table.grid.get(i)).sum(),
+                                ));
+                                c.content = vec![Block::Para(Para::default())];
+                                self.b.cell()?;
+                                row.cells.push(c);
+                            }
+                            col += 1;
+                            continue;
+                        }
+                        self.b.cell()?;
+                        let c = self.cell(cell, &cols, col, span, rspan, &table.grid)?;
+                        covered_left = span - 1;
+                        if rspan > 1 {
+                            for slot in down.iter_mut().skip(col).take(span) {
+                                *slot = (rspan - 1, col, span);
+                            }
+                        }
+                        row.cells.push(c);
+                        col += 1;
+                    }
+                }
+                // The spans that continued through this row are one row nearer
+                // their end.
+                for (i, a) in active.iter().enumerate() {
+                    if a.0 > 0 && i < down.len() {
+                        down[i] = (a.0 - 1, a.1, a.2);
+                    }
+                }
+                if row.cells.is_empty() {
+                    continue;
+                }
+                table.rows.push(row);
+                if table.rows.len() as u64 > self.b.limits.max_cells {
+                    res = Err(crate::formats::office::docs::error::Error::TooLarge(
+                        "table rows",
+                    ));
+                    break 'rows;
+                }
+            }
+        }
+        self.depth -= 1;
+        res?;
+        if table.rows.is_empty() {
+            return Ok(None);
+        }
+        Ok(Some(table))
+    }
+
+    fn cell(
+        &mut self,
+        n: &Node,
+        cols: &[Col],
+        col: usize,
+        span: usize,
+        rspan: usize,
+        grid: &[i32],
+    ) -> Result<Cell> {
+        let style = n
+            .attr("table:style-name")
+            .map(str::to_string)
+            .or_else(|| cols.get(col).and_then(|c| c.style.clone()));
+        let ap = style
+            .as_deref()
+            .map(|s| self.apply("table-cell", s))
+            .unwrap_or_default();
+        let p = &ap.props;
+        let mut cp = CellProps {
+            grid_span: span as u32,
+            v_merge: if rspan > 1 {
+                VMerge::Restart
+            } else {
+                VMerge::None
+            },
+            width: Some(Width::Twips(
+                (col..col + span).filter_map(|i| grid.get(i)).sum(),
+            )),
+            ..CellProps::default()
+        };
+        for (name, slot) in [
+            ("top", &mut cp.borders.top),
+            ("left", &mut cp.borders.left),
+            ("bottom", &mut cp.borders.bottom),
+            ("right", &mut cp.borders.right),
+        ] {
+            if let Some(b) = props::side(p, "table-cell", name) {
+                *slot = Some(b.unwrap_or(Border {
+                    style: "nil",
+                    size: 0,
+                    space: 0,
+                    color: Color::Auto,
+                    shadow: false,
+                }));
+            }
+        }
+        if let Some(c) = p.get("table-cell/fo:background-color").and_then(odf::color) {
+            cp.shading = Some(Shading::fill(Color::Rgb(c)));
+        }
+        cp.v_align = match p.get("table-cell/style:vertical-align") {
+            Some("middle") => Some(VAlign::Center),
+            Some("bottom") => Some(VAlign::Bottom),
+            Some("top") => Some(VAlign::Top),
+            _ => None,
+        };
+        for (side, slot) in [
+            ("top", &mut cp.margins.top),
+            ("left", &mut cp.margins.left),
+            ("bottom", &mut cp.margins.bottom),
+            ("right", &mut cp.margins.right),
+        ] {
+            let v = p
+                .twips(&format!("table-cell/fo:padding-{side}"))
+                .or_else(|| p.twips("table-cell/fo:padding"));
+            *slot = Some(v.unwrap_or(0));
+        }
+        match p.get("table-cell/style:rotation-angle") {
+            Some("90") => cp.text_direction = Some("btLr"),
+            Some("270") => cp.text_direction = Some("tbRl"),
+            _ => {}
+        }
+        if p.get("table-cell/style:writing-mode") == Some("tb-rl") {
+            cp.text_direction = Some("tbRl");
+        }
+        let content = self.blocks(n)?;
+        Ok(Cell {
+            props: cp,
+            content: if content.is_empty() {
+                vec![Block::Para(Para::default())]
+            } else {
+                content
+            },
+        })
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/odt/text.rs b/crates/exav-render/src/formats/office/docs/odt/text.rs
new file mode 100644
index 00000000..7a201617
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/odt/text.rs
@@ -0,0 +1,673 @@
+//! Text content: paragraphs, headings, lists, notes, comments and fields.
+
+use super::{Applied, Odt};
+use crate::formats::office::common::odf::text_of;
+use crate::formats::office::common::xml::{Child, Node};
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::limits::PARA_BYTES;
+use crate::formats::office::docs::model::*;
+
+#[derive(Clone, Debug)]
+pub(crate) struct ListInfo {
+    pub num_id: u32,
+    pub level: u32,
+    pub style: String,
+}
+
+struct Inl {
+    rpr: RunProps,
+    /// The last character written was a space (or the paragraph just began).
+    space: bool,
+}
+
+/// A name a DOCX bookmark can hold.
+pub(crate) fn bm_name(n: &str) -> String {
+    let s: String = n
+        .chars()
+        .map(|c| {
+            if c.is_alphanumeric() || c == '_' {
+                c
+            } else {
+                '_'
+            }
+        })
+        .take(40)
+        .collect();
+    if s.starts_with(|c: char| c.is_ascii_digit()) {
+        format!("_{s}")
+    } else {
+        s
+    }
+}
+
+fn push_item(out: &mut Vec<Inline>, rpr: &RunProps, item: RunItem) {
+    if let Some(Inline::Run(r)) = out.last_mut()
+        && r.props == *rpr
+    {
+        if let (RunItem::Text(t), Some(RunItem::Text(last))) = (&item, r.items.last_mut()) {
+            last.push_str(t);
+            return;
+        }
+        r.items.push(item);
+        return;
+    }
+    out.push(Inline::Run(Run {
+        props: rpr.clone(),
+        items: vec![item],
+    }));
+}
+
+impl Odt<'_> {
+    /// The blocks of the children of `n`.
+    pub(crate) fn blocks(&mut self, n: &Node) -> Result<Vec<Block>> {
+        let mut out = vec![];
+        if self.depth > 24 {
+            return Ok(out);
+        }
+        self.depth += 1;
+        let mut r = Ok(());
+        for c in n.nodes() {
+            r = self.block(c, &mut out, None);
+            if r.is_err() {
+                break;
+            }
+        }
+        self.depth -= 1;
+        r?;
+        Ok(out)
+    }
+
+    /// The blocks of the body: master pages switch sections.
+    pub(crate) fn blocks_top(&mut self, body: &Node) -> Result<Vec<Block>> {
+        let mut out = vec![];
+        for c in body.nodes() {
+            let family = match c.name.as_str() {
+                "text:p" | "text:h" => Some("paragraph"),
+                "table:table" => Some("table"),
+                _ => None,
+            };
+            let master = family.and_then(|f| {
+                let key = if c.name == "table:table" {
+                    "table:style-name"
+                } else {
+                    "text:style-name"
+                };
+                c.attr(key).map(|s| (f, s.to_string()))
+            });
+            let mut first = false;
+            let m = match master {
+                Some((f, s)) => self.apply(f, &s).master,
+                None => None,
+            };
+            if self.cur_master.is_empty() {
+                self.cur_master = m.clone().unwrap_or_else(|| self.default_master());
+                first = true;
+            }
+            if let Some(m) = m {
+                if m != self.cur_master {
+                    if !out.is_empty() {
+                        self.end_section(&mut out)?;
+                    }
+                    self.cur_master = m;
+                } else if !first && !out.is_empty() {
+                    self.pending_break = true;
+                }
+            }
+            let before = out.len();
+            self.block(c, &mut out, None)?;
+            if let Some(Block::Para(_)) = out.get(before) {
+                // A forced break after a paragraph.
+            }
+            if (c.name == "text:p" || c.name == "text:h")
+                && let Some(s) = c.attr("text:style-name")
+                && self.apply("paragraph", s).break_after
+            {
+                self.pending_break = true;
+            }
+        }
+        Ok(out)
+    }
+
+    pub(crate) fn block(
+        &mut self,
+        c: &Node,
+        out: &mut Vec<Block>,
+        list: Option<&ListInfo>,
+    ) -> Result<()> {
+        match c.name.as_str() {
+            "text:p" | "text:h" => {
+                let p = self.paragraph(c, list)?;
+                out.push(Block::Para(p));
+            }
+            "text:list" => self.list(c, list, out)?,
+            "text:numbered-paragraph" => {
+                for k in c.nodes() {
+                    if k.name == "text:p" || k.name == "text:h" {
+                        let p = self.paragraph(k, None)?;
+                        out.push(Block::Para(p));
+                    }
+                }
+            }
+            "table:table" => {
+                if let Some(t) = self.table(c)? {
+                    out.push(Block::Table(t));
+                }
+            }
+            "text:section" => {
+                if c.attr("text:display") != Some("none") && self.depth <= 24 {
+                    self.depth += 1;
+                    let mut r = Ok(());
+                    for k in c.nodes() {
+                        r = self.block(k, out, list);
+                        if r.is_err() {
+                            break;
+                        }
+                    }
+                    self.depth -= 1;
+                    r?;
+                }
+            }
+            "text:table-of-content"
+            | "text:table-index"
+            | "text:illustration-index"
+            | "text:object-index"
+            | "text:user-index"
+            | "text:alphabetical-index"
+            | "text:bibliography"
+            | "text:index-body"
+            | "text:index-title" => {
+                for k in c.nodes() {
+                    if k.name == "text:index-body"
+                        || k.name == "text:index-title"
+                        || k.name == "text:p"
+                        || k.name == "text:h"
+                        || k.name == "table:table"
+                        || k.name == "text:list"
+                    {
+                        self.block(k, out, list)?;
+                    }
+                }
+            }
+            n if n.starts_with("draw:") => {
+                // A frame or shape directly in the body: a paragraph holds it.
+                let mut para = Para::default();
+                let mut ctx = Inl {
+                    rpr: RunProps::default(),
+                    space: true,
+                };
+                self.inline(c, &mut ctx, &mut para.content)?;
+                out.push(Block::Para(para));
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    pub(crate) fn paragraph(&mut self, n: &Node, list: Option<&ListInfo>) -> Result<Para> {
+        self.b.paragraph(PARA_BYTES as usize / 4)?;
+        let style = n.attr("text:style-name").unwrap_or("");
+        let ap: Applied = if style.is_empty() {
+            Applied::default()
+        } else {
+            self.apply("paragraph", style)
+        };
+        let mut ppr = super::props::para_props(&ap.props, list.is_some());
+        ppr.style = ap.style.clone();
+        let left = ap.props.twips("paragraph/fo:margin-left").unwrap_or(0);
+        let mut tabs = super::props::tabs(&ap.tabs, if list.is_some() { 0 } else { left });
+        if !tabs.is_empty() {
+            tabs.sort_by_key(|t| t.pos);
+            ppr.tabs = tabs;
+        }
+        if self.pending_break {
+            self.pending_break = false;
+            ppr.page_break_before = Some(true);
+        }
+        // Numbering.
+        let heading = if n.name == "text:h" {
+            n.attr("text:outline-level")
+                .and_then(|v| v.parse::<u32>().ok())
+                .map(|l| l.clamp(1, 10))
+        } else {
+            None
+        };
+        match list {
+            Some(l) if l.num_id > 0 => {
+                ppr.num_id = Some(l.num_id);
+                ppr.num_level = Some(l.level.min(8));
+            }
+            Some(_) => {
+                // A list header: no number.
+                ppr.num_id = Some(0);
+            }
+            None => {
+                if let Some(h) = heading {
+                    if n.attr("text:is-list-header") != Some("true")
+                        && let Some(id) = self.outline_num_id()
+                    {
+                        ppr.num_id = Some(id);
+                        ppr.num_level = Some((h - 1).min(8));
+                    }
+                    if ppr.outline_level.is_none() {
+                        ppr.outline_level = Some((h - 1).min(8));
+                    }
+                } else if let Some(ls) = &ap.list_style {
+                    // A paragraph style that names a list numbers its paragraphs.
+                    if let Some(id) = self.list_num(ls, true, false) {
+                        ppr.num_id = Some(id);
+                        ppr.num_level = Some(0);
+                    }
+                }
+            }
+        }
+        let mut para = Para {
+            props: ppr,
+            mark: ap.rpr.clone(),
+            content: vec![],
+            section: None,
+        };
+        let mut ctx = Inl {
+            rpr: ap.rpr.clone(),
+            space: true,
+        };
+        self.inline_children(n, &mut ctx, &mut para.content)?;
+        self.b.inlines(&para.content)?;
+        Ok(para)
+    }
+
+    fn inline_children(&mut self, n: &Node, ctx: &mut Inl, out: &mut Vec<Inline>) -> Result<()> {
+        for c in &n.children {
+            match c {
+                Child::Text(t) => self.text(t, ctx, out),
+                Child::Node(k) => self.inline(k, ctx, out)?,
+            }
+        }
+        Ok(())
+    }
+
+    /// Text with the white space ODF collapses.
+    fn text(&mut self, t: &str, ctx: &mut Inl, out: &mut Vec<Inline>) {
+        let mut s = String::with_capacity(t.len());
+        for ch in t.chars() {
+            if matches!(ch, ' ' | '\t' | '\r' | '\n') {
+                if !ctx.space {
+                    s.push(' ');
+                    ctx.space = true;
+                }
+            } else {
+                s.push(ch);
+                ctx.space = false;
+            }
+        }
+        if !s.is_empty() {
+            push_item(out, &ctx.rpr, RunItem::Text(s));
+        }
+    }
+
+    fn inline(&mut self, n: &Node, ctx: &mut Inl, out: &mut Vec<Inline>) -> Result<()> {
+        if self.depth > 48 {
+            return Ok(());
+        }
+        match n.name.as_str() {
+            "text:span" => {
+                let saved = ctx.rpr.clone();
+                if let Some(s) = n.attr("text:style-name") {
+                    let ap = self.apply("text", s);
+                    ctx.rpr.overlay(&ap.rpr);
+                    if ap.style.is_some() {
+                        ctx.rpr.style = ap.style;
+                    }
+                }
+                self.depth += 1;
+                let r = self.inline_children(n, ctx, out);
+                self.depth -= 1;
+                ctx.rpr = saved;
+                r?;
+            }
+            "text:s" => {
+                let c = n
+                    .attr("text:c")
+                    .and_then(|v| v.parse::<usize>().ok())
+                    .unwrap_or(1)
+                    .min(1 << 16);
+                push_item(out, &ctx.rpr, RunItem::Text(" ".repeat(c)));
+                ctx.space = false;
+            }
+            "text:tab" => {
+                push_item(out, &ctx.rpr, RunItem::Tab);
+                ctx.space = true;
+            }
+            "text:line-break" => {
+                push_item(out, &ctx.rpr, RunItem::Break(BreakKind::Line));
+                ctx.space = true;
+            }
+            "text:a" => {
+                let saved = ctx.rpr.clone();
+                if let Some(s) = n.attr("text:style-name") {
+                    let ap = self.apply("text", s);
+                    ctx.rpr.overlay(&ap.rpr);
+                    if ap.style.is_some() {
+                        ctx.rpr.style = ap.style;
+                    }
+                }
+                let mut content = vec![];
+                self.depth += 1;
+                let r = self.inline_children(n, ctx, &mut content);
+                self.depth -= 1;
+                ctx.rpr = saved;
+                r?;
+                let href = n.attr("xlink:href").unwrap_or("");
+                let (target, anchor) = if let Some(a) = href.strip_prefix('#') {
+                    (None, Some(bm_name(a)))
+                } else if href.is_empty()
+                    || !crate::formats::office::docs::fields::safe_target(href)
+                {
+                    (None, None)
+                } else {
+                    (Some(href.to_string()), None)
+                };
+                if target.is_some() || anchor.is_some() {
+                    out.push(Inline::Hyperlink {
+                        target,
+                        anchor,
+                        tooltip: n.attr("office:title").map(str::to_string),
+                        content,
+                    });
+                } else {
+                    out.extend(content);
+                }
+            }
+            "text:bookmark" | "text:reference-mark" => {
+                if let Some(name) = n.attr("text:name") {
+                    let id = self.next_bookmark;
+                    self.next_bookmark += 1;
+                    out.push(Inline::BookmarkStart {
+                        id,
+                        name: bm_name(name),
+                    });
+                    out.push(Inline::BookmarkEnd(id));
+                }
+            }
+            "text:bookmark-start" | "text:reference-mark-start" => {
+                if let Some(name) = n.attr("text:name") {
+                    let id = self.next_bookmark;
+                    self.next_bookmark += 1;
+                    self.bookmark_open.insert(name.to_string(), id);
+                    out.push(Inline::BookmarkStart {
+                        id,
+                        name: bm_name(name),
+                    });
+                }
+            }
+            "text:bookmark-end" | "text:reference-mark-end" => {
+                if let Some(id) = n
+                    .attr("text:name")
+                    .and_then(|nm| self.bookmark_open.remove(nm))
+                {
+                    out.push(Inline::BookmarkEnd(id));
+                }
+            }
+            "text:note" => self.note(n, ctx, out)?,
+            "office:annotation" => self.annotation(n, ctx, out)?,
+            "office:annotation-end" => {
+                if let Some(id) = n
+                    .attr("office:name")
+                    .and_then(|nm| self.annotation_ids.get(nm))
+                {
+                    let id = *id;
+                    out.push(Inline::CommentEnd(id));
+                    push_item(out, &ctx.rpr, RunItem::CommentRef(id));
+                }
+            }
+            "text:page-number" => {
+                let t = text_of(n);
+                self.field(out, ctx, " PAGE ", if t.is_empty() { "1" } else { &t });
+            }
+            "text:page-count" => {
+                let t = text_of(n);
+                self.field(out, ctx, " NUMPAGES ", if t.is_empty() { "1" } else { &t });
+            }
+            "text:bookmark-ref" | "text:reference-ref" => {
+                let t = text_of(n);
+                let name = n.attr("text:ref-name").unwrap_or("");
+                self.field(out, ctx, &format!(" REF {} \\h ", bm_name(name)), &t);
+            }
+            "text:soft-page-break"
+            | "text:tracked-changes"
+            | "text:change"
+            | "text:change-start"
+            | "text:change-end"
+            | "text:alphabetical-index-mark"
+            | "text:alphabetical-index-mark-start"
+            | "text:alphabetical-index-mark-end"
+            | "text:toc-mark"
+            | "text:toc-mark-start"
+            | "text:toc-mark-end"
+            | "text:user-index-mark"
+            | "text:ruby-text"
+            | "office:forms"
+            | "svg:title"
+            | "svg:desc"
+            | "text:note-citation" => {}
+            // A group is drawn as its members, one by one, so that their text
+            // is kept.
+            "draw:g" => {
+                if self.depth <= 12 {
+                    self.depth += 1;
+                    let r = self.inline_children(n, ctx, out);
+                    self.depth -= 1;
+                    r?;
+                }
+            }
+            n2 if n2.starts_with("draw:") => {
+                if let Some(d) = self.drawing(n)? {
+                    push_item(out, &ctx.rpr, RunItem::Drawing(Box::new(d)));
+                }
+            }
+            _ => {
+                // Fields and anything else: their text.
+                self.depth += 1;
+                let r = self.inline_children(n, ctx, out);
+                self.depth -= 1;
+                r?;
+            }
+        }
+        Ok(())
+    }
+
+    fn field(&mut self, out: &mut Vec<Inline>, ctx: &Inl, instr: &str, result: &str) {
+        out.push(Inline::Field {
+            instr: instr.to_string(),
+            props: ctx.rpr.clone(),
+            result: vec![Inline::Run(Run::text(ctx.rpr.clone(), result))],
+        });
+    }
+
+    fn note(&mut self, n: &Node, ctx: &mut Inl, out: &mut Vec<Inline>) -> Result<()> {
+        let endnote = n.attr("text:note-class") == Some("endnote");
+        let id = if endnote {
+            self.doc.endnotes.len() as u32 + 1
+        } else {
+            self.doc.footnotes.len() as u32 + 1
+        };
+        // The note is reserved first so that its own notes number after it.
+        let mut sup = ctx.rpr.clone();
+        sup.vert_align = Some(VertAlign::Superscript);
+        let item = if endnote {
+            RunItem::EndnoteRef(id)
+        } else {
+            RunItem::FootnoteRef(id)
+        };
+        push_item(out, &sup, item);
+        let slot = Note {
+            id,
+            content: vec![],
+        };
+        // Where it is kept: an id is a place in the list plus one.
+        let at = id as usize - 1;
+        if endnote {
+            self.doc.endnotes.push(slot);
+        } else {
+            self.doc.footnotes.push(slot);
+        }
+        let mut content = match n.child("text:note-body") {
+            // A note in a note is read twice over, and never deep in the tree.
+            Some(b) if self.note_level < 3 && self.depth < 40 => {
+                let saved = self.depth;
+                self.depth += 2;
+                self.note_level += 1;
+                let r = self.blocks(b);
+                self.note_level -= 1;
+                self.depth = saved;
+                r?
+            }
+            _ => vec![],
+        };
+        // The mark the note starts with.
+        let mark = Inline::Run(Run {
+            props: RunProps {
+                vert_align: Some(VertAlign::Superscript),
+                ..RunProps::default()
+            },
+            items: vec![RunItem::NoteMark(endnote)],
+        });
+        match content.first_mut() {
+            Some(Block::Para(p)) => {
+                p.content.insert(0, mark);
+                p.content
+                    .insert(1, Inline::Run(Run::text(RunProps::default(), " ")));
+            }
+            _ => content.insert(
+                0,
+                Block::Para(Para {
+                    content: vec![mark],
+                    ..Para::default()
+                }),
+            ),
+        }
+        let list = if endnote {
+            &mut self.doc.endnotes
+        } else {
+            &mut self.doc.footnotes
+        };
+        if let Some(s) = list.get_mut(at) {
+            s.content = content;
+        }
+        Ok(())
+    }
+
+    fn annotation(&mut self, n: &Node, ctx: &mut Inl, out: &mut Vec<Inline>) -> Result<()> {
+        let id = self.doc.comments.len() as u32;
+        let author = n.child("dc:creator").map(text_of).unwrap_or_default();
+        let date = n.child("dc:date").map(text_of).filter(|d| !d.is_empty());
+        let initials: String = author
+            .split_whitespace()
+            .filter_map(|w| w.chars().next())
+            .take(3)
+            .collect();
+        let mut blocks = vec![];
+        self.depth += 2;
+        for c in n.nodes() {
+            if c.name == "text:p" || c.name == "text:list" || c.name == "table:table" {
+                self.block(c, &mut blocks, None)?;
+            }
+        }
+        self.depth -= 2;
+        self.doc.comments.push(Comment {
+            id,
+            author,
+            initials,
+            date,
+            content: blocks,
+        });
+        out.push(Inline::CommentStart(id));
+        match n.attr("office:name") {
+            Some(name) if self.annotation_ends.contains(name) => {
+                self.annotation_ids.insert(name.to_string(), id);
+            }
+            _ => {
+                out.push(Inline::CommentEnd(id));
+                push_item(out, &ctx.rpr, RunItem::CommentRef(id));
+            }
+        }
+        Ok(())
+    }
+
+    // ---- lists ----
+
+    pub(crate) fn list(
+        &mut self,
+        n: &Node,
+        parent: Option<&ListInfo>,
+        out: &mut Vec<Block>,
+    ) -> Result<()> {
+        if self.depth > 24 {
+            return Ok(());
+        }
+        let first_style = || {
+            n.nodes()
+                .flat_map(|i| i.nodes())
+                .find(|p| p.name == "text:p" || p.name == "text:h")
+                .and_then(|p| p.attr("text:style-name"))
+                .map(str::to_string)
+        };
+        let style = n
+            .attr("text:style-name")
+            .map(str::to_string)
+            .or_else(|| parent.map(|p| p.style.clone()))
+            .or_else(|| first_style().and_then(|s| self.apply("paragraph", &s).list_style))
+            .unwrap_or_default();
+        let info = match parent {
+            Some(p) => ListInfo {
+                num_id: p.num_id,
+                level: p.level + 1,
+                style,
+            },
+            None => {
+                let cont = n.attr("text:continue-numbering") == Some("true");
+                let num = match n
+                    .attr("text:continue-list")
+                    .and_then(|id| self.list_ids.get(id))
+                {
+                    Some((_, num)) => Some(*num),
+                    None => self.list_num(&style, cont, false),
+                };
+                if let (Some(id), Some(num)) = (n.attr("xml:id").or(n.attr("text:id")), num) {
+                    self.list_ids.insert(id.to_string(), (style.clone(), num));
+                }
+                ListInfo {
+                    num_id: num.unwrap_or(0),
+                    level: 0,
+                    style,
+                }
+            }
+        };
+        self.depth += 1;
+        let mut r = Ok(());
+        'items: for item in n.nodes() {
+            let header = item.name == "text:list-header";
+            if item.name != "text:list-item" && !header {
+                continue;
+            }
+            let li = if header {
+                ListInfo {
+                    num_id: 0,
+                    ..info.clone()
+                }
+            } else {
+                info.clone()
+            };
+            for c in item.nodes() {
+                r = match c.name.as_str() {
+                    "text:list" => self.list(c, Some(&info), out),
+                    _ => self.block(c, out, Some(&li)),
+                };
+                if r.is_err() {
+                    break 'items;
+                }
+            }
+        }
+        self.depth -= 1;
+        r
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/pages/mod.rs b/crates/exav-render/src/formats/office/docs/pages/mod.rs
new file mode 100644
index 00000000..7c14f761
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/pages/mod.rs
@@ -0,0 +1,543 @@
+//! Apple Pages documents of Pages 5 (2013) and later: a ZIP of
+//! `Index/*.iwa` streams holding protocol buffer archives. Messages are read
+//! by field number; the numbers used are written where they are read, after
+//! what the Keynote reader of the `slides` module (itself after
+//! keynote-parser's message definitions, MIT) uses for the text messages the
+//! two applications share.
+//!
+//! TP.DocumentArchive (type 10000): body storage 4, page width 30, height 31,
+//! margins 32 to 35 (points). TSWP.StorageArchive (2001): text 3,
+//! table_para_style 5, table_para_data 6, table_list_style 7,
+//! table_char_style 8, table_attachment 9. Each table's entries hold a
+//! character index 1 and an object 2.
+
+use crate::formats::office::common::iwa::Store;
+use crate::formats::office::common::iwa::proto::{Msg, Val};
+use crate::formats::office::common::package::Zip;
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+use std::collections::HashMap;
+
+const DOCUMENT: u32 = 10000;
+const STORAGE: u32 = 2001;
+const CHARACTER_STYLE: u32 = 2021;
+const PARAGRAPH_STYLE: u32 = 2022;
+const LIST_STYLE: u32 = 2023;
+
+pub(crate) fn read(mut z: Zip<'_>, budget: &mut Budget) -> Result<Document> {
+    let names = z.names();
+    let max = budget.limits.max_part;
+    let mut store = Store::default();
+    let mut any = false;
+    for n in &names {
+        if n.ends_with(".iwa") {
+            let Some(d) = z.read(n, max)? else { continue };
+            budget.alloc(d.len() as u64)?;
+            let left = budget
+                .limits
+                .max_memory
+                .saturating_sub(budget.used())
+                .min(max) as usize;
+            let used = store.add(&d, left);
+            budget.alloc(used as u64)?;
+            any = true;
+        }
+    }
+    if !any {
+        if names
+            .iter()
+            .any(|n| n == "index.xml" || n == "index.xml.gz")
+        {
+            return Err(Error::Unsupported("Pages '09 and earlier (XML)".into()));
+        }
+        return Err(Error::NotFormat("no Index/*.iwa members".into()));
+    }
+    let doc_id = store
+        .ids_of(DOCUMENT)
+        .first()
+        .copied()
+        .ok_or(Error::Encrypted)?;
+    let Some((_, d)) = store.get(doc_id) else {
+        return Err(Error::Malformed("no document archive".into()));
+    };
+    let mut r = Pages {
+        store: &store,
+        b: budget,
+        doc: Document::default(),
+        nums: HashMap::new(),
+    };
+    r.document(d)?;
+    Ok(r.doc)
+}
+
+/// A table's entries: (character index, object reference).
+fn table(m: Option<Msg>) -> Vec<(u32, Option<u64>)> {
+    m.map(|t| {
+        t.msgs(1)
+            .take(1 << 20)
+            .map(|e| (e.uint(1).unwrap_or(0) as u32, e.reference(2)))
+            .collect()
+    })
+    .unwrap_or_default()
+}
+
+fn data_table(m: Option<Msg>) -> Vec<(u32, u32)> {
+    m.map(|t| {
+        t.msgs(1)
+            .take(1 << 20)
+            .map(|e| (e.uint(1).unwrap_or(0) as u32, e.uint(2).unwrap_or(0) as u32))
+            .collect()
+    })
+    .unwrap_or_default()
+}
+
+/// The entry in force at character `at`. An entry with no object keeps the
+/// one before it.
+fn at(t: &[(u32, Option<u64>)], at: u32) -> Option<u64> {
+    t.iter()
+        .take_while(|e| e.0 <= at)
+        .fold(None, |acc, e| e.1.or(acc))
+}
+
+/// A PostScript font name to a family and its weight and slant.
+fn ps_font(name: &str) -> (String, bool, bool) {
+    let (base, style) = name.split_once('-').unwrap_or((name, ""));
+    // "...PSMT" is TrueType's PostScript name suffix, "...PS" Type 1's.
+    let base = base.trim_end_matches("MT").trim_end_matches("PS");
+    let mut fam = String::new();
+    let chars: Vec<char> = base.chars().collect();
+    for (i, &c) in chars.iter().enumerate() {
+        let next_lower = chars.get(i + 1).is_some_and(|n| n.is_lowercase());
+        let prev_lower = i > 0 && chars[i - 1].is_lowercase();
+        if i > 0 && c.is_uppercase() && (prev_lower || next_lower && chars[i - 1].is_uppercase()) {
+            fam.push(' ');
+        }
+        fam.push(c);
+    }
+    let s = style.to_ascii_lowercase();
+    (
+        fam,
+        s.contains("bold") || s.contains("black") || s.contains("heavy"),
+        s.contains("italic") || s.contains("oblique"),
+    )
+}
+
+fn color(c: Msg) -> Color {
+    let ch = |n: u32| (f64::from(c.float(n).unwrap_or(0.0)).clamp(0.0, 1.0) * 255.0).round() as u32;
+    Color::Rgb(ch(3) << 16 | ch(4) << 8 | ch(5))
+}
+
+struct Pages<'a> {
+    store: &'a Store,
+    b: &'a mut Budget,
+    doc: Document,
+    /// List style object to numbering instance.
+    nums: HashMap<u64, u32>,
+}
+
+impl<'a> Pages<'a> {
+    /// A style and its parents (TSS.StyleArchive parent 3, in the style's
+    /// super 1).
+    fn chain(&self, style: Option<u64>) -> Vec<(u32, Msg<'a>)> {
+        let mut out = vec![];
+        let mut cur = style;
+        while let Some(id) = cur {
+            if out.len() >= 32 {
+                break;
+            }
+            let Some((k, m)) = self.store.get(id) else {
+                break;
+            };
+            out.push((k, m));
+            cur = m.msg(1).and_then(|s| s.reference(3)).filter(|&p| p != id);
+        }
+        out
+    }
+
+    /// The first value `get` finds in the properties message `field` of a
+    /// style or of its nearest parent.
+    fn find<T>(
+        &self,
+        style: Option<u64>,
+        field: u32,
+        get: impl Fn(Msg<'a>) -> Option<T>,
+    ) -> Option<T> {
+        self.chain(style).into_iter().find_map(|(k, m)| {
+            if k != CHARACTER_STYLE && k != PARAGRAPH_STYLE {
+                return None;
+            }
+            m.msg(field).and_then(&get)
+        })
+    }
+
+    fn document(&mut self, d: Msg<'a>) -> Result<()> {
+        let pt = |n: u32| d.float(n).map(|v| (f64::from(v) * 20.0).round() as i32);
+        let s = &mut self.doc.section;
+        if let (Some(w), Some(h)) = (pt(30), pt(31))
+            && w > 100
+            && h > 100
+        {
+            s.width = w;
+            s.height = h;
+        }
+        for (n, slot) in [
+            (32, &mut s.top),
+            (33, &mut s.right),
+            (34, &mut s.bottom),
+            (35, &mut s.left),
+        ] {
+            if let Some(v) = pt(n) {
+                *slot = v.max(0);
+            }
+        }
+        if let Some(v) = pt(36) {
+            s.header = v.max(0);
+        }
+        if let Some(v) = pt(37) {
+            s.footer = v.max(0);
+        }
+        let Some(body) = d.reference(4) else {
+            return Err(Error::Malformed("no body text".into()));
+        };
+        let Some((STORAGE, st)) = self.store.get(body) else {
+            return Err(Error::Malformed("the body is not a text storage".into()));
+        };
+        self.storage(st)?;
+        self.doc
+            .warn("tables, pictures, headers and footers are not converted");
+        Ok(())
+    }
+
+    fn run_props(&self, para: Option<u64>, chr: Option<u64>) -> RunProps {
+        let get = |f: &dyn Fn(Msg<'a>) -> bool| -> Option<Msg<'a>> {
+            self.find(chr, 11, |p| f(p).then_some(p))
+                .or_else(|| self.find(para, 11, |p| f(p).then_some(p)))
+        };
+        let num = |n: u32| get(&|p: Msg| p.get(n).is_some());
+        let mut rp = RunProps::default();
+        if let Some(name) = num(5).and_then(|p| p.string(5)) {
+            let (fam, b, i) = ps_font(&name);
+            rp.fonts = Fonts {
+                ascii: Some(fam.clone()),
+                hansi: Some(fam.clone()),
+                east_asia: Some(fam.clone()),
+                cs: Some(fam),
+            };
+            if b {
+                rp.bold = Some(true);
+            }
+            if i {
+                rp.italic = Some(true);
+            }
+        }
+        if let Some(b) = num(1).and_then(|p| p.boolean(1)) {
+            rp.bold = Some(b || rp.bold == Some(true));
+        }
+        if let Some(i) = num(2).and_then(|p| p.boolean(2)) {
+            rp.italic = Some(i || rp.italic == Some(true));
+        }
+        let size = num(3)
+            .and_then(|p| p.float(3))
+            .map(f64::from)
+            .unwrap_or(12.0)
+            .clamp(1.0, 1600.0);
+        rp.size = Some((size * 2.0).round() as u32);
+        rp.size_cs = rp.size;
+        if let Some(c) = num(7).and_then(|p| p.msg(7)) {
+            rp.color = Some(color(c));
+        }
+        rp.vert_align = match num(10).and_then(|p| p.uint(10)) {
+            Some(1) => Some(VertAlign::Superscript),
+            Some(2) => Some(VertAlign::Subscript),
+            _ => None,
+        };
+        rp.underline = num(11).and_then(|p| p.uint(11)).and_then(|u| match u {
+            0 => None,
+            2 => Some("double"),
+            3 => Some("wave"),
+            _ => Some("single"),
+        });
+        rp.strike = num(12).and_then(|p| p.uint(12)).map(|s| s != 0);
+        rp.caps = match num(13).and_then(|p| p.uint(13)) {
+            Some(1) => Some(true),
+            _ => None,
+        };
+        if let Some(c) = num(26).and_then(|p| p.msg(26)) {
+            rp.shading = Some(Shading::fill(color(c)));
+        }
+        rp
+    }
+
+    fn para_props(&mut self, para: Option<u64>, level: u32, list: Option<u64>) -> ParaProps {
+        let p = |n: u32| self.find(para, 12, |m| m.get(n).is_some().then_some(m));
+        let tw = |v: f32| (f64::from(v) * 20.0).round() as i32;
+        let mut pp = ParaProps {
+            jc: p(1).and_then(|m| m.uint(1)).map(|a| match a {
+                1 => Jc::Right,
+                2 => Jc::Center,
+                3 => Jc::Both,
+                _ => Jc::Left,
+            }),
+            ..ParaProps::default()
+        };
+        let left = p(11).and_then(|m| m.float(11)).map(tw);
+        let first = p(7).and_then(|m| m.float(7)).map(tw);
+        pp.ind_left = left;
+        match first {
+            Some(f) if f >= 0 => pp.ind_first_line = Some(f),
+            Some(f) => pp.ind_hanging = Some(-f),
+            None => {}
+        }
+        pp.space_after = p(20).and_then(|m| m.float(20)).map(tw);
+        pp.space_before = p(21).and_then(|m| m.float(21)).map(tw);
+        if let Some(ls) = p(13).and_then(|m| m.msg(13)) {
+            let amount = f64::from(ls.float(2).unwrap_or(1.0));
+            match ls.uint(1).unwrap_or(0) {
+                0 => {
+                    pp.line = Some((amount * 240.0).round() as i32);
+                    pp.line_rule = Some(LineRule::Auto);
+                }
+                _ => {
+                    pp.line = Some((amount * 20.0).round() as i32);
+                    pp.line_rule = Some(LineRule::AtLeast);
+                }
+            }
+        }
+        if let Some(l) = list
+            && let Some(id) = self.list_num(l)
+        {
+            pp.num_id = Some(id);
+            pp.num_level = Some(level.min(8));
+        }
+        pp
+    }
+
+    /// The numbering of a list style: labels at label_types 11 (1 bullet, 2
+    /// text bullet, 3 number), text_indents 12, indents 13, number_types 15,
+    /// strings 16.
+    fn list_num(&mut self, id: u64) -> Option<u32> {
+        if let Some(n) = self.nums.get(&id) {
+            return Some(*n);
+        }
+        let (LIST_STYLE, l) = self.store.get(id)? else {
+            return None;
+        };
+        let rep_u = |n: u32| -> Vec<u64> {
+            let mut v = vec![];
+            for x in l.all(n) {
+                match x {
+                    Val::Varint(u) => v.push(u),
+                    Val::Bytes(b) => {
+                        let mut p = 0;
+                        while let Some(u) =
+                            crate::formats::office::common::iwa::proto::varint(b, &mut p)
+                        {
+                            v.push(u);
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            v
+        };
+        let rep_f = |n: u32| -> Vec<f32> {
+            let mut v = vec![];
+            for x in l.all(n) {
+                match x {
+                    Val::Fixed32(u) => v.push(f32::from_bits(u)),
+                    Val::Bytes(b) => {
+                        v.extend(b.as_chunks::<4>().0.iter().map(|c| f32::from_le_bytes(*c)))
+                    }
+                    _ => {}
+                }
+            }
+            v
+        };
+        let kinds = rep_u(11);
+        let numbers = rep_u(15);
+        let strings: Vec<String> = l
+            .all(16)
+            .filter_map(|v| match v {
+                Val::Bytes(b) => Some(String::from_utf8_lossy(b).into_owned()),
+                _ => None,
+            })
+            .collect();
+        let indents = rep_f(13);
+        let text_indents = rep_f(12);
+        let mut levels = vec![];
+        for lv in 0..9usize {
+            let kind = kinds.get(lv).or(kinds.last()).copied().unwrap_or(0);
+            let mut level = Level::default();
+            match kind {
+                1 | 2 => {
+                    level.fmt = "bullet";
+                    level.text = strings
+                        .get(lv)
+                        .or(strings.last())
+                        .and_then(|s| s.chars().next())
+                        .filter(|_| kind == 2)
+                        .unwrap_or('\u{2022}')
+                        .to_string();
+                }
+                3 => {
+                    let n = numbers.get(lv).or(numbers.last()).copied().unwrap_or(0);
+                    level.fmt = match n {
+                        3..=5 => "upperRoman",
+                        6..=8 => "lowerRoman",
+                        9..=11 => "upperLetter",
+                        12..=14 => "lowerLetter",
+                        _ => "decimal",
+                    };
+                    level.text = match n {
+                        1 | 4 | 7 | 10 | 13 => format!("(%{})", lv + 1),
+                        2 | 5 | 8 | 11 | 14 => format!("%{})", lv + 1),
+                        _ => format!("%{}.", lv + 1),
+                    };
+                }
+                _ => level.fmt = "none",
+            }
+            if kind != 0 {
+                let ind = f64::from(indents.get(lv).or(indents.last()).copied().unwrap_or(0.0));
+                let txt = f64::from(
+                    text_indents
+                        .get(lv)
+                        .or(text_indents.last())
+                        .copied()
+                        .unwrap_or(20.0),
+                );
+                level.ppr.ind_left = Some(((ind + txt) * 20.0).round() as i32);
+                level.ppr.ind_hanging = Some((txt * 20.0).round() as i32);
+            }
+            levels.push(level);
+        }
+        let abs = self.doc.numbering.abstracts.len() as u32;
+        self.doc.numbering.abstracts.push(AbstractNum {
+            id: abs,
+            multi_level: true,
+            levels,
+        });
+        let num = self.doc.numbering.nums.len() as u32 + 1;
+        self.doc.numbering.nums.push(Num {
+            id: num,
+            abstract_id: abs,
+            overrides: vec![],
+        });
+        self.nums.insert(id, num);
+        Some(num)
+    }
+
+    fn storage(&mut self, st: Msg<'a>) -> Result<()> {
+        let text: String = st
+            .all(3)
+            .filter_map(|v| match v {
+                Val::Bytes(b) => Some(String::from_utf8_lossy(b).into_owned()),
+                _ => None,
+            })
+            .collect();
+        let chars: Vec<char> = text.chars().take(1 << 24).collect();
+        self.b.alloc(chars.len() as u64 * 4)?;
+        let para_styles = table(st.msg(5));
+        let list_styles = table(st.msg(7));
+        let char_styles = table(st.msg(8));
+        let levels = data_table(st.msg(6));
+        let mut start = 0usize;
+        loop {
+            let end = (start..chars.len())
+                .find(|&i| matches!(chars[i], '\n' | '\u{2029}'))
+                .unwrap_or(chars.len());
+            self.b.paragraph(end - start)?;
+            let ps = at(&para_styles, start as u32);
+            let level = levels
+                .iter()
+                .take_while(|e| e.0 <= start as u32)
+                .last()
+                .map(|e| e.1)
+                .unwrap_or(0)
+                .min(8);
+            let list = at(&list_styles, start as u32);
+            let mut para = Para {
+                props: self.para_props(ps, level, list),
+                mark: self.run_props(ps, None),
+                ..Para::default()
+            };
+            let mut text = String::new();
+            let mut cur: Option<(u32, RunProps)> = None;
+            let mut runs: Vec<Inline> = vec![];
+            let flush =
+                |text: &mut String, cur: &Option<(u32, RunProps)>, runs: &mut Vec<Inline>| {
+                    if !text.is_empty()
+                        && let Some((_, rp)) = cur
+                    {
+                        runs.push(Inline::Run(Run::text(rp.clone(), std::mem::take(text))));
+                    }
+                };
+            for (i, &c) in chars.iter().enumerate().take(end).skip(start) {
+                let cs = at(&char_styles, i as u32);
+                let key = cs.map(|c| c as u32).unwrap_or(0);
+                if cur.as_ref().is_none_or(|(k, _)| *k != key) {
+                    flush(&mut text, &cur, &mut runs);
+                    cur = Some((key, self.run_props(ps, cs)));
+                }
+                match c {
+                    '\u{2028}' | '\u{000B}' => {
+                        flush(&mut text, &cur, &mut runs);
+                        if let Some((_, rp)) = &cur {
+                            runs.push(Inline::Run(Run {
+                                props: rp.clone(),
+                                items: vec![RunItem::Break(BreakKind::Line)],
+                            }));
+                        }
+                    }
+                    '\t' => {
+                        flush(&mut text, &cur, &mut runs);
+                        if let Some((_, rp)) = &cur {
+                            runs.push(Inline::Run(Run {
+                                props: rp.clone(),
+                                items: vec![RunItem::Tab],
+                            }));
+                        }
+                    }
+                    '\u{FFFC}' => {}
+                    c if (c as u32) < 0x20 => {}
+                    c => text.push(c),
+                }
+            }
+            flush(&mut text, &cur, &mut runs);
+            para.content = runs;
+            self.doc.body.push(Block::Para(para));
+            if end >= chars.len() {
+                break;
+            }
+            start = end + 1;
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn table_entries_without_an_object_keep_the_style_before() {
+        let t = vec![(0, Some(7)), (5, None), (9, Some(8))];
+        assert_eq!(at(&t, 0), Some(7));
+        assert_eq!(at(&t, 6), Some(7));
+        assert_eq!(at(&t, 9), Some(8));
+        assert_eq!(at(&t, 100), Some(8));
+        assert_eq!(at(&[], 3), None);
+    }
+
+    #[test]
+    fn postscript_names() {
+        assert_eq!(
+            ps_font("HelveticaNeue-Bold"),
+            ("Helvetica Neue".into(), true, false)
+        );
+        assert_eq!(
+            ps_font("TimesNewRomanPSMT"),
+            ("Times New Roman".into(), false, false)
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/rtf/mod.rs b/crates/exav-render/src/formats/office/docs/rtf/mod.rs
new file mode 100644
index 00000000..516e9866
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/rtf/mod.rs
@@ -0,0 +1,1157 @@
+//! Rich Text Format ([RTF 1.9.1]) to the document model.
+
+mod pict;
+mod words;
+
+use crate::formats::office::common::codepage;
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::fields::parse_hyperlink;
+use crate::formats::office::docs::grid::{self, CellIn, RowIn};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+use exav_unpack::rtf::{Lexer, Tok};
+use std::collections::HashMap;
+
+const MAX_DEPTH: usize = 200;
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Target {
+    None,
+    Para(u8),
+    Cell(u8),
+    Row(u8),
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum Dest {
+    Body,
+    Skip,
+    FontTable,
+    FontEntry(i32),
+    ColorTable,
+    StyleSheet,
+    StyleEntry(usize),
+    Pict,
+    FldInst,
+    FldRslt,
+    Field,
+    Note,
+    HeaderFooter(bool, u8),
+    ListTable,
+    List(usize),
+    ListLevel,
+    LevelText,
+    ListOverrideTable,
+    ListOverride,
+    Bookmark(bool),
+    LevelNumbers,
+    Upr,
+}
+
+impl Dest {
+    /// Whether text in this destination is document text.
+    fn is_text(&self) -> bool {
+        matches!(
+            self,
+            Dest::Body | Dest::FldRslt | Dest::Field | Dest::Note | Dest::HeaderFooter(..)
+        )
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct St {
+    pub chp: RunProps,
+    pub pap: ParaProps,
+    pub ls: Option<i32>,
+    pub ilvl: u32,
+    pub intbl: bool,
+    pub dest: Dest,
+    pub uc: u32,
+    pub cp: u16,
+    pub tab_kind: TabKind,
+    pub tab_leader: TabLeader,
+    pub target: Target,
+    pub story_pushed: bool,
+    pub cbpat: Option<usize>,
+    pub cfpat: Option<usize>,
+    pub shading: i32,
+    /// The list level being defined.
+    pub level_tmp: Option<Level>,
+}
+
+impl St {
+    fn new(cp: u16) -> St {
+        St {
+            chp: RunProps::default(),
+            pap: ParaProps::default(),
+            ls: None,
+            ilvl: 0,
+            intbl: false,
+            dest: Dest::Body,
+            uc: 1,
+            cp,
+            tab_kind: TabKind::Left,
+            tab_leader: TabLeader::None,
+            target: Target::None,
+            story_pushed: false,
+            cbpat: None,
+            cfpat: None,
+            shading: 0,
+            level_tmp: None,
+        }
+    }
+}
+
+#[derive(Clone, Default)]
+pub(crate) struct CellDef {
+    pub right: i32,
+    pub borders: [Option<Option<Border>>; 4],
+    pub shading: Option<Shading>,
+    pub vmerge: u8,
+    pub hmerge: u8,
+    pub valign: u8,
+    pub text_flow: u8,
+    pub no_wrap: bool,
+}
+
+#[derive(Clone, Default)]
+pub(crate) struct RowDef {
+    pub left: i32,
+    pub gap: i32,
+    pub height: i32,
+    pub header: bool,
+    pub keep: bool,
+    pub jc: Option<Jc>,
+    pub cells: Vec<CellDef>,
+    pub cur: CellDef,
+    pub borders: TableBorders,
+    pub bidi: bool,
+}
+
+/// A list override: list id, `\ls` id and the (level, start-at) pairs.
+pub(crate) type Override = (i32, i32, Vec<(u32, i64)>);
+
+pub(crate) struct Font {
+    pub name: String,
+    pub cp: u16,
+}
+
+pub(crate) struct RStyle {
+    pub num: i32,
+    pub kind: StyleKind,
+    pub name: String,
+    pub based: Option<i32>,
+    pub next: Option<i32>,
+    pub chp: RunProps,
+    pub pap: ParaProps,
+    pub ls: Option<i32>,
+    pub ilvl: u32,
+}
+
+pub(crate) struct ListLevelDef {
+    pub level: Level,
+    pub text: Vec<u32>,
+    pub numbers: Vec<u8>,
+}
+
+pub(crate) struct ListDef {
+    pub id: i32,
+    pub levels: Vec<ListLevelDef>,
+    pub simple: bool,
+}
+
+struct TblState {
+    rows: Vec<RowIn>,
+    cells: Vec<CellIn>,
+    cur: Vec<Block>,
+    cell_defs: Vec<CellDef>,
+}
+
+#[derive(Default)]
+pub(crate) struct Story {
+    pub blocks: Vec<Block>,
+    pub para: Option<Para>,
+    table: Option<TblState>,
+}
+
+pub(crate) struct FieldFrame {
+    pub instr: String,
+    pub in_result: bool,
+    pub sink: Vec<Inline>,
+    pub props: RunProps,
+    /// The field's marks were written to the paragraph (it spans paragraphs).
+    pub broken: bool,
+}
+
+pub(crate) struct Parser<'a> {
+    pub b: &'a mut Budget,
+    pub doc: Document,
+    pub lex: Lexer<'a>,
+    pub stack: Vec<St>,
+    pub fonts: HashMap<i32, Font>,
+    pub colors: Vec<Color>,
+    pub styles: Vec<RStyle>,
+    pub lists: Vec<ListDef>,
+    pub overrides: Vec<Override>,
+    pub stories: Vec<Story>,
+    pub fields: Vec<FieldFrame>,
+    pub row: RowDef,
+    pub cur_sect: Section,
+    pub defaults: Section,
+    pub buf: String,
+    pub pending: Vec<u8>,
+    pub pending_cp: u16,
+    pub default_cp: u16,
+    pub deff: i32,
+    pub next_bookmark: u32,
+    pub bookmarks: HashMap<String, u32>,
+    pub pict: Option<pict::Pict>,
+    pub note_endnote: bool,
+    pub color_cur: [i32; 3],
+    pub color_any: bool,
+    pub list_ids: Vec<i32>,
+    pub facing: bool,
+    pub list_text: Vec<u32>,
+    pub list_numbers: Vec<u8>,
+    pub tokens: u64,
+    /// The first memory charge that was refused, for the main loop to raise:
+    /// text and runs are added from places that return nothing.
+    pub over: Option<Error>,
+}
+
+pub(crate) fn read(input: &[u8], budget: &mut Budget) -> Result<Document> {
+    let head = input.iter().take(64).copied().collect::<Vec<u8>>();
+    let start = head
+        .windows(5)
+        .position(|w| w == b"{\\rtf")
+        .ok_or_else(|| Error::NotFormat("no {\\rtf header".into()))?;
+    let data = &input[start..];
+    let mut p = Parser {
+        b: budget,
+        doc: Document::default(),
+        lex: Lexer::new(data),
+        stack: vec![],
+        fonts: HashMap::new(),
+        colors: vec![],
+        styles: vec![],
+        lists: vec![],
+        overrides: vec![],
+        stories: vec![Story::default()],
+        fields: vec![],
+        row: RowDef::default(),
+        cur_sect: Section::default(),
+        defaults: Section {
+            width: 12240,
+            height: 15840,
+            left: 1800,
+            right: 1800,
+            top: 1440,
+            bottom: 1440,
+            ..Section::default()
+        },
+        buf: String::new(),
+        pending: vec![],
+        pending_cp: 1252,
+        default_cp: 1252,
+        deff: 0,
+        next_bookmark: 1,
+        bookmarks: HashMap::new(),
+        pict: None,
+        note_endnote: false,
+        color_cur: [0; 3],
+        color_any: false,
+        list_ids: vec![],
+        facing: false,
+        list_text: vec![],
+        list_numbers: vec![],
+        tokens: 0,
+        over: None,
+    };
+    p.cur_sect = p.defaults.clone();
+    p.run()?;
+    if let Some(e) = p.over.take() {
+        return Err(e);
+    }
+    p.finish()
+}
+
+impl Parser<'_> {
+    /// The innermost group's state; a document whose groups were closed
+    /// early has the defaults.
+    fn top(&mut self) -> &mut St {
+        if self.stack.is_empty() {
+            self.stack.push(St::new(self.default_cp));
+        }
+        let n = self.stack.len();
+        &mut self.stack[n - 1]
+    }
+
+    fn run(&mut self) -> Result<()> {
+        let max = self.b.limits.max_part;
+        // The outermost group has been closed: a file with a `}` too many
+        // (html2rtf writes them) goes on, as unrtf reads it, in a group of its
+        // own.
+        let mut closed = false;
+        while let Some(t) = self.lex.next_tok() {
+            self.tokens += 1;
+            if self.tokens > 200_000_000 {
+                return Err(Error::TooLarge("tokens"));
+            }
+            if let Some(e) = self.over.take() {
+                return Err(e);
+            }
+            if closed && !matches!(t, Tok::Close) {
+                closed = false;
+                if matches!(t, Tok::Open | Tok::Word(..) | Tok::Text(_)) {
+                    self.stack.push(St::new(self.default_cp));
+                }
+            }
+            match t {
+                Tok::Open => {
+                    if self.stack.len() >= MAX_DEPTH {
+                        return Err(Error::Malformed("groups nested too deep".into()));
+                    }
+                    self.flush_text();
+                    let st = match self.stack.last() {
+                        Some(s) => {
+                            let mut c = s.clone();
+                            c.story_pushed = false;
+                            c
+                        }
+                        None => St::new(self.default_cp),
+                    };
+                    self.stack.push(st);
+                }
+                Tok::Close => {
+                    self.flush_text();
+                    if self.stack.is_empty() {
+                        continue;
+                    }
+                    self.close_group()?;
+                    closed = self.stack.is_empty();
+                }
+                Tok::Word(w, n) => {
+                    if self.stack.is_empty() {
+                        // Before the first group: only {\rtf starts the document.
+                        continue;
+                    }
+                    // The text so far has the formatting the word will change.
+                    self.flush_text();
+                    self.word(w, n, max)?;
+                }
+                Tok::Hex(b) => {
+                    if self.stack.is_empty() {
+                        continue;
+                    }
+                    self.hex(b);
+                }
+                Tok::Sym(c) => {
+                    if !self.stack.is_empty() {
+                        self.symbol(c);
+                    }
+                }
+                Tok::Text(t) => {
+                    if self.stack.is_empty() {
+                        continue;
+                    }
+                    self.text_bytes(t);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    // ---- text ----
+
+    fn hex(&mut self, b: u8) {
+        let Some(dest) = self.stack.last().map(|s| s.dest.clone()) else {
+            return;
+        };
+        if dest == Dest::LevelNumbers {
+            self.list_numbers.push(b);
+            return;
+        }
+        if dest.is_text()
+            || matches!(
+                dest,
+                Dest::FontEntry(_)
+                    | Dest::StyleEntry(_)
+                    | Dest::Bookmark(_)
+                    | Dest::FldInst
+                    | Dest::LevelText
+            )
+        {
+            let cp = self.stack.last().map(|s| s.cp).unwrap_or(1252);
+            if self.pending_cp != cp {
+                self.flush_text();
+                self.pending_cp = cp;
+            }
+            self.pending.push(b);
+            if dest == Dest::LevelText {
+                self.flush_text();
+            }
+        }
+    }
+
+    fn text_bytes(&mut self, t: &[u8]) {
+        let (dest, cp) = match self.stack.last() {
+            Some(s) => (s.dest.clone(), s.cp),
+            None => return,
+        };
+        match dest {
+            Dest::Pict => self.pict_data(t),
+            Dest::Skip | Dest::ColorTable | Dest::ListTable | Dest::ListOverrideTable => {
+                if dest == Dest::ColorTable {
+                    self.color_text(t);
+                }
+            }
+            _ => {
+                if self.pending_cp != cp {
+                    self.flush_text();
+                    self.pending_cp = cp;
+                }
+                self.pending.extend_from_slice(t);
+            }
+        }
+    }
+
+    fn color_text(&mut self, t: &[u8]) {
+        if t.contains(&b';') {
+            for _ in t.iter().filter(|c| **c == b';') {
+                self.color_end();
+            }
+        }
+    }
+
+    fn color_end(&mut self) {
+        let c = if self.color_any {
+            let [r, g, b] = self.color_cur;
+            Color::Rgb((r as u32 & 0xFF) << 16 | (g as u32 & 0xFF) << 8 | (b as u32 & 0xFF))
+        } else {
+            Color::Auto
+        };
+        if self.colors.len() < 1024 {
+            self.colors.push(c);
+        }
+        self.color_cur = [0; 3];
+        self.color_any = false;
+    }
+
+    /// Writes the pending bytes to wherever the current destination puts text.
+    pub(crate) fn flush_text(&mut self) {
+        if self.pending.is_empty() {
+            return;
+        }
+        let bytes = std::mem::take(&mut self.pending);
+        let s = if bytes.iter().all(|b| *b < 0x80) {
+            String::from_utf8_lossy(&bytes).into_owned()
+        } else {
+            codepage::decode(&bytes, self.pending_cp)
+        };
+        self.put_str(&s);
+    }
+
+    pub(crate) fn put_str(&mut self, s: &str) {
+        let Some(dest) = self.stack.last().map(|s| s.dest.clone()) else {
+            return;
+        };
+        match dest {
+            Dest::FontEntry(n) => {
+                // A name ends at its semicolon, with or without a group around.
+                match s.split_once(';') {
+                    Some((name, _)) => {
+                        self.buf.push_str(name);
+                        let name = self.buf.trim().to_string();
+                        self.buf.clear();
+                        if let Some(f) = self.fonts.get_mut(&n)
+                            && f.name.is_empty()
+                        {
+                            f.name = name;
+                        }
+                        self.top().dest = Dest::FontTable;
+                    }
+                    None => self.buf.push_str(s),
+                }
+            }
+            Dest::StyleEntry(_) | Dest::Bookmark(_) => self.buf.push_str(s),
+            Dest::FldInst => {
+                if let Some(f) = self.fields.last_mut() {
+                    f.instr.push_str(s);
+                }
+            }
+            Dest::LevelText => {
+                for c in s.chars() {
+                    self.list_text.push(c as u32);
+                }
+            }
+            d if d.is_text() => self.emit(s),
+            _ => {}
+        }
+    }
+
+    /// Document text with the formatting in effect.
+    pub(crate) fn emit(&mut self, s: &str) {
+        if s.is_empty() {
+            return;
+        }
+        // Control characters stand for nothing.
+        let s: String = s.chars().filter(|c| *c >= ' ' || *c == '\t').collect();
+        if s.is_empty() {
+            return;
+        }
+        self.add_item(RunItem::Text(s));
+    }
+
+    /// `bytes` more held in the model. A refusal is kept for the main loop.
+    fn charge(&mut self, bytes: usize) {
+        if self.over.is_none()
+            && let Err(e) = self.b.alloc(bytes as u64)
+        {
+            self.over = Some(e);
+        }
+    }
+
+    pub(crate) fn add_item(&mut self, item: RunItem) {
+        let text = match &item {
+            RunItem::Text(t) => t.len(),
+            _ => 0,
+        };
+        self.charge(text);
+        let rp = self.top().chp.clone();
+        let content = self.content_mut();
+        if let Some(Inline::Run(r)) = content.last_mut()
+            && r.props == rp
+        {
+            if let (RunItem::Text(t), Some(RunItem::Text(last))) = (&item, r.items.last_mut()) {
+                last.push_str(t);
+                return;
+            }
+            r.items.push(item);
+            self.charge(size_of::<RunItem>());
+            return;
+        }
+        content.push(Inline::Run(Run {
+            props: rp,
+            items: vec![item],
+        }));
+        self.charge(size_of::<Inline>() + size_of::<RunItem>());
+    }
+
+    fn story(&mut self) -> &mut Story {
+        let n = self.stories.len();
+        &mut self.stories[n - 1]
+    }
+
+    fn ensure_para(&mut self) {
+        if self.story().para.is_none() {
+            self.story().para = Some(Para::default());
+        }
+    }
+
+    pub(crate) fn content_mut(&mut self) -> &mut Vec<Inline> {
+        let in_result = self.fields.last().is_some_and(|f| f.in_result && !f.broken);
+        if in_result {
+            let n = self.fields.len();
+            return &mut self.fields[n - 1].sink;
+        }
+        self.ensure_para();
+        let Some(p) = self.story().para.as_mut() else {
+            unreachable!("a paragraph was just ensured")
+        };
+        &mut p.content
+    }
+
+    fn symbol(&mut self, c: u8) {
+        let dest = self.stack.last().map(|s| s.dest.clone());
+        match c {
+            b'*' => {
+                // An ignorable destination: read the control word that follows.
+                self.flush_text();
+                let save = self.lex.p;
+                match self.lex.next_tok() {
+                    Some(Tok::Word(w, n)) => {
+                        let known = words::star_destination(self, w, n);
+                        if !known {
+                            self.top().dest = Dest::Skip;
+                        }
+                    }
+                    _ => self.lex.p = save,
+                }
+            }
+            b'~' => self.char_item(RunItem::Text("\u{A0}".into()), dest),
+            b'-' => self.char_item(RunItem::SoftHyphen, dest),
+            b'_' => self.char_item(RunItem::NoBreakHyphen, dest),
+            b'\\' | b'{' | b'}' => {
+                let s = (c as char).to_string();
+                self.flush_text();
+                self.put_str(&s);
+            }
+            b':' | b'|' => {}
+            _ => {}
+        }
+    }
+
+    pub(crate) fn char_item(&mut self, item: RunItem, dest: Option<Dest>) {
+        self.flush_text();
+        if dest.is_some_and(|d| d.is_text()) {
+            self.add_item(item);
+        }
+    }
+
+    // ---- groups ----
+
+    fn close_group(&mut self) -> Result<()> {
+        let Some(st) = self.stack.pop() else {
+            return Ok(());
+        };
+        match &st.dest {
+            Dest::FontEntry(n) => {
+                let name = self.buf.trim().trim_end_matches(';').trim().to_string();
+                self.buf.clear();
+                if let Some(f) = self.fonts.get_mut(n)
+                    && f.name.is_empty()
+                {
+                    f.name = name;
+                }
+            }
+            Dest::StyleEntry(i) => {
+                let name = self.buf.trim().trim_end_matches(';').trim().to_string();
+                self.buf.clear();
+                if let Some(s) = self.styles.get_mut(*i) {
+                    s.name = name;
+                    s.chp = st.chp.clone();
+                    s.pap = st.pap.clone();
+                    s.ls = st.ls;
+                    s.ilvl = st.ilvl;
+                }
+            }
+            Dest::Bookmark(start) => {
+                let name = self.buf.trim().to_string();
+                self.buf.clear();
+                if !name.is_empty() {
+                    if *start {
+                        let id = self.next_bookmark;
+                        self.next_bookmark += 1;
+                        self.bookmarks.insert(name.clone(), id);
+                        let n = crate::formats::office::docs::rtf::bm_name(&name);
+                        self.content_mut()
+                            .push(Inline::BookmarkStart { id, name: n });
+                    } else if let Some(id) = self.bookmarks.remove(&name) {
+                        self.content_mut().push(Inline::BookmarkEnd(id));
+                    }
+                }
+            }
+            Dest::Pict => self.finish_pict(&st)?,
+            Dest::Note => self.finish_note(&st)?,
+            Dest::HeaderFooter(header, which) => self.finish_header(*header, *which)?,
+            Dest::FldInst => {}
+            Dest::FldRslt => {
+                if let Some(f) = self.fields.last_mut() {
+                    f.in_result = false;
+                }
+            }
+            Dest::Field => self.finish_field(),
+            Dest::List(_) | Dest::ListTable | Dest::ListOverrideTable | Dest::ListOverride => {}
+            Dest::ListLevel => words::finish_level(self, &st),
+            _ => {}
+        }
+        Ok(())
+    }
+
+    // ---- paragraphs and tables ----
+
+    /// Closes the paragraph being written, if any, with the properties now in
+    /// effect. `force` makes an empty one.
+    pub(crate) fn close_para(&mut self, force: bool) -> Result<()> {
+        // A field that spans the paragraph is written out as marks.
+        self.break_fields();
+        let st = self.top().clone();
+        let has = self.story().para.is_some();
+        if !has && !force {
+            return Ok(());
+        }
+        let mut para = self.story().para.take().unwrap_or_default();
+        self.b.paragraph(8)?;
+        para.props = self.para_props(&st);
+        para.mark = st.chp.clone();
+        self.place(Block::Para(para), st.intbl)
+    }
+
+    fn para_props(&mut self, st: &St) -> ParaProps {
+        let mut p = st.pap.clone();
+        if let Some(ls) = st.ls.filter(|l| *l > 0) {
+            p.num_id = Some(ls as u32);
+            p.num_level = Some(st.ilvl.min(8));
+        }
+        if let Some(c) = st.cbpat.and_then(|i| self.colors.get(i).copied()) {
+            let fore = st.cfpat.and_then(|i| self.colors.get(i).copied());
+            p.shading = match (st.shading, fore) {
+                (s, Some(f)) if s > 0 && s < 10000 => {
+                    crate::formats::office::docs::rtf::blend(f, c, f64::from(s) / 10000.0)
+                }
+                _ => Some(Shading::fill(c)),
+            };
+        }
+        p
+    }
+
+    fn place(&mut self, b: Block, intbl: bool) -> Result<()> {
+        if intbl {
+            let story = self.story();
+            let t = story.table.get_or_insert_with(|| TblState {
+                rows: vec![],
+                cells: vec![],
+                cur: vec![],
+                cell_defs: vec![],
+            });
+            t.cur.push(b);
+            return Ok(());
+        }
+        self.end_table();
+        self.story().blocks.push(b);
+        Ok(())
+    }
+
+    /// Closes the table in progress.
+    pub(crate) fn end_table(&mut self) {
+        let Some(t) = self.story().table.take() else {
+            return;
+        };
+        let mut t = t;
+        if !t.cur.is_empty() || !t.cells.is_empty() {
+            // Cells without a row end: a row of what there is.
+            let cur = std::mem::take(&mut t.cur);
+            if !cur.is_empty() {
+                t.cells.push(CellIn {
+                    props: CellProps::default(),
+                    content: cur,
+                    merged_left: false,
+                });
+            }
+            let cells = std::mem::take(&mut t.cells);
+            if !cells.is_empty() {
+                let edges = (0..=cells.len() as i32).map(|i| i * 1000).collect();
+                t.rows.push(RowIn {
+                    edges,
+                    props: RowProps::default(),
+                    cells,
+                });
+            }
+        }
+        if t.rows.is_empty() {
+            return;
+        }
+        let first = t.cell_defs.first().cloned();
+        let _ = first;
+        let table = grid::build(t.rows, TableProps::default());
+        self.story().blocks.push(Block::Table(table));
+    }
+
+    /// `\cell`.
+    pub(crate) fn end_cell(&mut self) -> Result<()> {
+        // The paragraph ends with the cell.
+        let st = self.top().clone();
+        if self.story().para.is_some() {
+            self.close_para(false)?;
+        } else if self.story().table.as_ref().is_none_or(|t| t.cur.is_empty()) {
+            // An empty cell has an empty paragraph.
+            let mut st2 = st.clone();
+            st2.intbl = true;
+            let n = self.stack.len();
+            self.stack[n - 1] = st2;
+            self.close_para(true)?;
+            self.stack[n - 1] = st;
+        }
+        self.b.cell()?;
+        let story = self.story();
+        let t = story.table.get_or_insert_with(|| TblState {
+            rows: vec![],
+            cells: vec![],
+            cur: vec![],
+            cell_defs: vec![],
+        });
+        let content = std::mem::take(&mut t.cur);
+        t.cells.push(CellIn {
+            props: CellProps::default(),
+            content,
+            merged_left: false,
+        });
+        Ok(())
+    }
+
+    /// `\row`.
+    pub(crate) fn end_row(&mut self) -> Result<()> {
+        if self.story().para.is_some() {
+            self.close_para(false)?;
+        }
+        let def = self.row.clone();
+        let story = self.story();
+        let t = story.table.get_or_insert_with(|| TblState {
+            rows: vec![],
+            cells: vec![],
+            cur: vec![],
+            cell_defs: vec![],
+        });
+        let mut cells = std::mem::take(&mut t.cells);
+        if !t.cur.is_empty() {
+            let content = std::mem::take(&mut t.cur);
+            cells.push(CellIn {
+                props: CellProps::default(),
+                content,
+                merged_left: false,
+            });
+        }
+        let mut edges = vec![def.left];
+        for c in &def.cells {
+            edges.push(c.right);
+        }
+        let n = def.cells.len();
+        let mut row = RowIn {
+            edges,
+            props: RowProps::default(),
+            cells: vec![],
+        };
+        row.props.header = def.header;
+        row.props.cant_split = def.keep;
+        if def.height != 0 {
+            row.props.height = Some(def.height.abs());
+            row.props.height_exact = def.height < 0;
+        }
+        row.props.jc = def.jc;
+        for (k, c) in cells.into_iter().enumerate() {
+            let d = def.cells.get(k.min(n.saturating_sub(1)));
+            let mut cp = CellProps::default();
+            let mut merged = false;
+            if let Some(d) = d.filter(|_| k < n) {
+                cp.shading = d.shading.clone();
+                cp.v_merge = match d.vmerge {
+                    1 => VMerge::Restart,
+                    2 => VMerge::Continue,
+                    _ => VMerge::None,
+                };
+                cp.v_align = match d.valign {
+                    1 => Some(VAlign::Center),
+                    2 => Some(VAlign::Bottom),
+                    _ => None,
+                };
+                cp.no_wrap = d.no_wrap;
+                cp.text_direction = match d.text_flow {
+                    1 => Some("btLr"),
+                    2 => Some("tbRl"),
+                    _ => None,
+                };
+                for (slot, b) in [
+                    (&mut cp.borders.top, &d.borders[0]),
+                    (&mut cp.borders.left, &d.borders[1]),
+                    (&mut cp.borders.bottom, &d.borders[2]),
+                    (&mut cp.borders.right, &d.borders[3]),
+                ] {
+                    *slot = match b {
+                        None => None,
+                        Some(Some(b)) => Some(b.clone()),
+                        Some(None) => Some(Border {
+                            style: "nil",
+                            size: 0,
+                            space: 0,
+                            color: Color::Auto,
+                            shadow: false,
+                        }),
+                    };
+                }
+                merged = d.hmerge == 2;
+            }
+            row.cells.push(CellIn {
+                props: cp,
+                content: c.content,
+                merged_left: merged,
+            });
+        }
+        row.edges.truncate(row.cells.len() + 1);
+        while row.edges.len() < row.cells.len() + 1 {
+            let last = row.edges.last().copied().unwrap_or(0);
+            row.edges.push(last + 1000);
+        }
+        t.cell_defs = def.cells.clone();
+        t.rows.push(row);
+        Ok(())
+    }
+
+    // ---- fields ----
+
+    pub(crate) fn begin_field(&mut self) {
+        let props = self.top().chp.clone();
+        self.fields.push(FieldFrame {
+            instr: String::new(),
+            in_result: false,
+            sink: vec![],
+            props,
+            broken: false,
+        });
+    }
+
+    fn finish_field(&mut self) {
+        let Some(f) = self.fields.pop() else { return };
+        if f.broken {
+            self.content_mut()
+                .push(Inline::FieldChar(FieldCharKind::End));
+            return;
+        }
+        let instr = f.instr.trim().to_string();
+        let word = instr
+            .split_whitespace()
+            .next()
+            .unwrap_or("")
+            .to_ascii_uppercase();
+        let inl = match word.as_str() {
+            "HYPERLINK" => {
+                let (target, anchor, tip) = parse_hyperlink(&instr);
+                if target.is_none() && anchor.is_none() {
+                    f.sink
+                } else {
+                    vec![Inline::Hyperlink {
+                        target,
+                        anchor: anchor.map(|a| crate::formats::office::docs::rtf::bm_name(&a)),
+                        tooltip: tip,
+                        content: f.sink,
+                    }]
+                }
+            }
+            "XE" | "TC" | "TA" | "RD" => vec![],
+            _ => vec![Inline::Field {
+                instr: format!(" {instr} "),
+                props: f.props,
+                result: f.sink,
+            }],
+        };
+        self.content_mut().extend(inl);
+    }
+
+    /// Writes the fields still open as marks, so that a paragraph can end.
+    fn break_fields(&mut self) {
+        if self.fields.is_empty() {
+            return;
+        }
+        let n = self.fields.len();
+        let mut out = vec![];
+        for i in 0..n {
+            if self.fields[i].broken {
+                continue;
+            }
+            let f = &mut self.fields[i];
+            out.push(Inline::FieldChar(FieldCharKind::Begin));
+            out.push(Inline::InstrText(f.instr.clone()));
+            if f.in_result {
+                out.push(Inline::FieldChar(FieldCharKind::Separate));
+            }
+            out.append(&mut f.sink);
+            f.broken = true;
+        }
+        self.ensure_para();
+        if let Some(p) = self.story().para.as_mut() {
+            p.content.extend(out);
+        }
+    }
+
+    // ---- stories ----
+
+    pub(crate) fn push_story(&mut self) {
+        self.stories.push(Story::default());
+        self.top().story_pushed = true;
+    }
+
+    fn pop_story(&mut self) -> Result<Vec<Block>> {
+        if self.stories.len() <= 1 {
+            return Ok(vec![]);
+        }
+        self.close_para_in_story()?;
+        let mut s = self.stories.pop().unwrap_or_default();
+        let _ = &mut s;
+        let mut t = Story {
+            blocks: s.blocks,
+            para: None,
+            table: s.table,
+        };
+        if t.table.is_some() {
+            std::mem::swap(&mut t, self.story());
+            self.end_table();
+            std::mem::swap(&mut t, self.story());
+            let blocks = t.blocks;
+            return Ok(blocks);
+        }
+        Ok(t.blocks)
+    }
+
+    fn close_para_in_story(&mut self) -> Result<()> {
+        if self.story().para.is_some() {
+            let saved = self.stack.last().cloned();
+            self.close_para(false)?;
+            if let (Some(saved), Some(top)) = (saved, self.stack.last_mut()) {
+                *top = saved;
+            }
+        }
+        Ok(())
+    }
+
+    fn finish_note(&mut self, st: &St) -> Result<()> {
+        let endnote = self.note_endnote;
+        self.note_endnote = false;
+        let _ = st;
+        let mut blocks = self.pop_story()?;
+        let list = if endnote {
+            &mut self.doc.endnotes
+        } else {
+            &mut self.doc.footnotes
+        };
+        let id = list.len() as u32 + 1;
+        // The number the note starts with is the mark.
+        let _ = &mut blocks;
+        list.push(Note {
+            id,
+            content: blocks,
+        });
+        let mut sup = self.top().chp.clone();
+        sup.vert_align = Some(VertAlign::Superscript);
+        let content = self.content_mut();
+        content.push(Inline::Run(Run {
+            props: sup,
+            items: vec![if endnote {
+                RunItem::EndnoteRef(id)
+            } else {
+                RunItem::FootnoteRef(id)
+            }],
+        }));
+        Ok(())
+    }
+
+    fn finish_header(&mut self, header: bool, which: u8) -> Result<()> {
+        let blocks = self.pop_story()?;
+        if blocks.is_empty() {
+            return Ok(());
+        }
+        let hf = if header {
+            &mut self.cur_sect.headers
+        } else {
+            &mut self.cur_sect.footers
+        };
+        match which {
+            0 => {
+                hf.default = Some(blocks.clone());
+                hf.even = hf.even.take().or(None);
+            }
+            1 => hf.even = Some(blocks),
+            2 => hf.default = Some(blocks),
+            _ => hf.first = Some(blocks),
+        }
+        Ok(())
+    }
+
+    /// `\sect`.
+    pub(crate) fn end_section(&mut self) -> Result<()> {
+        self.close_para(false)?;
+        self.end_table();
+        let sect = std::mem::replace(&mut self.cur_sect, self.defaults.clone());
+        let mut next = sect.clone();
+        next.headers = HeaderFooter::default();
+        next.footers = HeaderFooter::default();
+        let mut s = sect;
+        if !s.title_page {
+            s.headers.first = None;
+            s.footers.first = None;
+        }
+        self.cur_sect = next;
+        let blocks = &mut self.stories[0].blocks;
+        match blocks.last_mut() {
+            Some(Block::Para(p)) if p.section.is_none() => p.section = Some(Box::new(s)),
+            _ => blocks.push(Block::Para(Para {
+                section: Some(Box::new(s)),
+                ..Para::default()
+            })),
+        }
+        Ok(())
+    }
+
+    fn finish(mut self) -> Result<Document> {
+        self.flush_text();
+        while self.stack.len() > 1 {
+            self.stack.pop();
+        }
+        if self.stack.is_empty() {
+            self.stack.push(St::new(self.default_cp));
+        }
+        self.close_para(false)?;
+        self.end_table();
+        let mut sect = self.cur_sect.clone();
+        if !sect.title_page {
+            sect.headers.first = None;
+            sect.footers.first = None;
+        }
+        if !self.facing {
+            sect.headers.even = None;
+            sect.footers.even = None;
+        }
+        self.doc.section = sect;
+        self.doc.body = std::mem::take(&mut self.stories[0].blocks);
+        self.doc.settings.even_and_odd_headers = self.facing;
+        words::build_styles(&mut self);
+        words::build_lists(&mut self);
+        if let Some(f) = self.fonts.get(&self.deff) {
+            self.doc.defaults_run.fonts = Fonts {
+                ascii: Some(f.name.clone()),
+                hansi: Some(f.name.clone()),
+                east_asia: Some(f.name.clone()),
+                cs: Some(f.name.clone()),
+            };
+        }
+        if self.doc.defaults_run.size.is_none() {
+            self.doc.defaults_run.size = Some(24);
+        }
+        Ok(self.doc)
+    }
+}
+
+/// A bookmark name a DOCX bookmark can hold.
+pub(crate) fn bm_name(n: &str) -> String {
+    let s: String = n
+        .chars()
+        .map(|c| {
+            if c.is_alphanumeric() || c == '_' {
+                c
+            } else {
+                '_'
+            }
+        })
+        .take(40)
+        .collect();
+    if s.starts_with(|c: char| c.is_ascii_digit()) {
+        format!("_{s}")
+    } else {
+        s
+    }
+}
+
+/// `p` of `fore` over `back` as a flat colour.
+pub(crate) fn blend(fore: Color, back: Color, p: f64) -> Option<Shading> {
+    let rgb = |c: Color, auto: u32| match c {
+        Color::Rgb(v) => v,
+        Color::Auto => auto,
+    };
+    let (f, b) = (rgb(fore, 0), rgb(back, 0xFFFFFF));
+    let mix = |s: u32| {
+        let (x, y) = (f64::from((f >> s) & 0xFF), f64::from((b >> s) & 0xFF));
+        (x * p + y * (1.0 - p)).round() as u32
+    };
+    Some(Shading::fill(Color::Rgb(
+        mix(16) << 16 | mix(8) << 8 | mix(0),
+    )))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn bookmark_names() {
+        assert_eq!(bm_name("a b-c"), "a_b_c");
+        assert_eq!(bm_name("1x"), "_1x");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/rtf/pict.rs b/crates/exav-render/src/formats/office/docs/rtf/pict.rs
new file mode 100644
index 00000000..fa350991
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/rtf/pict.rs
@@ -0,0 +1,185 @@
+//! Pictures: `\pict` groups with their hexadecimal or binary data.
+
+use super::{Parser, St};
+use crate::formats::office::common::image;
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::model::*;
+
+#[derive(Default)]
+pub(crate) struct Pict {
+    pub kind: Option<&'static str>,
+    pub picw: i32,
+    pub pich: i32,
+    pub wgoal: i32,
+    pub hgoal: i32,
+    pub scale_x: i32,
+    pub scale_y: i32,
+    pub crop: [i32; 4],
+    pub data: Vec<u8>,
+    pub half: Option<u8>,
+    pub binary: bool,
+    pub over: bool,
+}
+
+impl Parser<'_> {
+    pub(crate) fn pict_word(&mut self, w: &str, n: Option<i32>, _max: u64) -> Result<()> {
+        let v = n.unwrap_or(0);
+        let Some(p) = self.pict.as_mut() else {
+            return Ok(());
+        };
+        match w {
+            "pngblip" => p.kind = Some("png"),
+            "jpegblip" => p.kind = Some("jpeg"),
+            "emfblip" => p.kind = Some("emf"),
+            "wmetafile" => p.kind = Some("wmf"),
+            "dibitmap" => p.kind = Some("dib"),
+            "wbitmap" | "macpict" | "pmmetafile" => p.kind = Some("unsupported"),
+            "picw" => p.picw = v,
+            "pich" => p.pich = v,
+            "picwgoal" => p.wgoal = v,
+            "pichgoal" => p.hgoal = v,
+            "picscalex" => p.scale_x = v,
+            "picscaley" => p.scale_y = v,
+            "piccropl" => p.crop[0] = v,
+            "piccropt" => p.crop[1] = v,
+            "piccropr" => p.crop[2] = v,
+            "piccropb" => p.crop[3] = v,
+            "binary" => {}
+            _ => {}
+        }
+        Ok(())
+    }
+
+    pub(crate) fn pict_data(&mut self, t: &[u8]) {
+        let max = self.b.limits.max_part as usize;
+        let Some(p) = self.pict.as_mut() else { return };
+        if p.over {
+            return;
+        }
+        for &c in t {
+            let d = match c {
+                b'0'..=b'9' => c - b'0',
+                b'a'..=b'f' => c - b'a' + 10,
+                b'A'..=b'F' => c - b'A' + 10,
+                _ => continue,
+            };
+            match p.half.take() {
+                Some(h) => p.data.push(h << 4 | d),
+                None => p.half = Some(d),
+            }
+            if p.data.len() > max {
+                p.over = true;
+                p.data.clear();
+                return;
+            }
+        }
+    }
+
+    pub(crate) fn pict_bin(&mut self, d: &[u8]) {
+        let max = self.b.limits.max_part as usize;
+        if let Some(p) = self.pict.as_mut() {
+            if p.data.len() + d.len() > max {
+                p.over = true;
+                return;
+            }
+            p.data.extend_from_slice(d);
+            p.binary = true;
+        }
+    }
+
+    pub(crate) fn finish_pict(&mut self, st: &St) -> Result<()> {
+        let Some(p) = self.pict.take() else {
+            return Ok(());
+        };
+        let _ = st;
+        if p.over {
+            return Err(Error::TooLarge("a picture"));
+        }
+        if p.data.is_empty() || p.kind == Some("unsupported") {
+            return Ok(());
+        }
+        let mut data = p.data;
+        if p.kind == Some("dib") {
+            data = image::dib_to_bmp(&data);
+        }
+        let Some(ext) = image::ext(&data).or(match p.kind {
+            Some("wmf") => Some("wmf"),
+            _ => None,
+        }) else {
+            return Ok(());
+        };
+        if ext == "wmf" && !data.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A]) && p.picw > 0 && p.pich > 0
+        {
+            // A bare metafile: give it the bounds the group states.
+            let inch = if p.wgoal > 0 {
+                (f64::from(p.picw) / (f64::from(p.wgoal) / 1440.0))
+                    .round()
+                    .clamp(1.0, 65535.0) as u16
+            } else {
+                1440
+            };
+            let mut h = vec![0xD7, 0xCD, 0xC6, 0x9A, 0, 0];
+            for v in [
+                0i16,
+                0,
+                p.picw.clamp(0, 32767) as i16,
+                p.pich.clamp(0, 32767) as i16,
+            ] {
+                h.extend_from_slice(&v.to_le_bytes());
+            }
+            h.extend_from_slice(&inch.to_le_bytes());
+            h.extend_from_slice(&[0, 0, 0, 0]);
+            let mut sum = 0u16;
+            for k in 0..10 {
+                sum ^= u16::from_le_bytes([h[2 * k], h[2 * k + 1]]);
+            }
+            h.extend_from_slice(&sum.to_le_bytes());
+            h.extend_from_slice(&data);
+            data = h;
+        }
+        self.b.alloc(data.len() as u64)?;
+        let natural = image::natural_emu(&data);
+        let sx = if p.scale_x > 0 {
+            i64::from(p.scale_x)
+        } else {
+            100
+        };
+        let sy = if p.scale_y > 0 {
+            i64::from(p.scale_y)
+        } else {
+            100
+        };
+        let (cx, cy) = if p.wgoal > 0 && p.hgoal > 0 {
+            (
+                i64::from(p.wgoal) * 635 * sx / 100,
+                i64::from(p.hgoal) * 635 * sy / 100,
+            )
+        } else if let Some((nx, ny)) = natural {
+            (nx * sx / 100, ny * sy / 100)
+        } else {
+            (
+                i64::from(p.picw.max(1)) * 360,
+                i64::from(p.pich.max(1)) * 360,
+            )
+        };
+        let gw = f64::from(p.wgoal.max(1));
+        let gh = f64::from(p.hgoal.max(1));
+        let crop = |v: i32, g: f64| ((f64::from(v) / g) * 100_000.0) as i32;
+        let crop = Crop {
+            l: crop(p.crop[0], gw),
+            t: crop(p.crop[1], gh),
+            r: crop(p.crop[2], gw),
+            b: crop(p.crop[3], gh),
+        };
+        let media = self.doc.add_media(ext, data);
+        self.add_item(RunItem::Drawing(Box::new(Drawing {
+            anchor: None,
+            cx: cx.max(1),
+            cy: cy.max(1),
+            name: "Picture".into(),
+            descr: None,
+            kind: DrawingKind::Picture { media, crop },
+        })));
+        Ok(())
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/rtf/words.rs b/crates/exav-render/src/formats/office/docs/rtf/words.rs
new file mode 100644
index 00000000..b5c080cb
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/rtf/words.rs
@@ -0,0 +1,1286 @@
+//! Control words: character, paragraph, section and document formatting,
+//! destinations and special characters.
+
+use super::{Dest, Font, ListDef, ListLevelDef, Parser, RStyle, St, Target};
+use crate::formats::office::docs::error::Result;
+use crate::formats::office::docs::model::*;
+
+fn flag(n: Option<i32>) -> bool {
+    n != Some(0)
+}
+
+fn cp_of_charset(c: i32) -> Option<u16> {
+    Some(match c {
+        0 => 1252,
+        1 => 1252,
+        2 => 42,
+        77 => 10000,
+        128 => 932,
+        129 => 949,
+        130 => 1361,
+        134 => 936,
+        136 => 950,
+        161 => 1253,
+        162 => 1254,
+        163 => 1258,
+        177 => 1255,
+        178 => 1256,
+        186 => 1257,
+        204 => 1251,
+        222 => 874,
+        238 => 1250,
+        254 => 437,
+        255 => 850,
+        _ => return None,
+    })
+}
+
+fn border_style(w: &str) -> Option<&'static str> {
+    Some(match w {
+        "brdrs" => "single",
+        "brdrth" => "thick",
+        "brdrsh" => "single",
+        "brdrdb" => "double",
+        "brdrdot" => "dotted",
+        "brdrdash" => "dashed",
+        "brdrhair" => "single",
+        "brdrdashsm" => "dashSmallGap",
+        "brdrdashd" => "dotDash",
+        "brdrdashdd" => "dotDotDash",
+        "brdrtriple" => "triple",
+        "brdrtnthsg" => "thinThickSmallGap",
+        "brdrthtnsg" => "thickThinSmallGap",
+        "brdrtnthtnsg" => "thinThickThinSmallGap",
+        "brdrtnthmg" => "thinThickMediumGap",
+        "brdrthtnmg" => "thickThinMediumGap",
+        "brdrtnthtnmg" => "thinThickThinMediumGap",
+        "brdrtnthlg" => "thinThickLargeGap",
+        "brdrthtnlg" => "thickThinLargeGap",
+        "brdrtnthtnlg" => "thinThickThinLargeGap",
+        "brdrwavy" => "wave",
+        "brdrwavydb" => "doubleWave",
+        "brdrdashdotstr" => "dashDotStroked",
+        "brdremboss" => "threeDEmboss",
+        "brdrengrave" => "threeDEngrave",
+        "brdroutset" => "outset",
+        "brdrinset" => "inset",
+        _ => return None,
+    })
+}
+
+fn underline_of(w: &str) -> Option<&'static str> {
+    Some(match w {
+        "ul" => "single",
+        "uld" => "dotted",
+        "uldash" => "dash",
+        "uldashd" => "dotDash",
+        "uldashdd" => "dotDotDash",
+        "uldb" => "double",
+        "ulth" => "thick",
+        "ulthd" => "dottedHeavy",
+        "ulthdash" => "dashedHeavy",
+        "ulw" => "words",
+        "ulwave" => "wave",
+        "ulhwave" => "wavyHeavy",
+        "ulldash" => "dashLong",
+        "ululdbwave" => "wavyDouble",
+        _ => return None,
+    })
+}
+
+/// A destination written `\*\word`: whether it is one read here.
+pub(crate) fn star_destination(p: &mut Parser<'_>, w: &str, n: Option<i32>) -> bool {
+    match w {
+        "bkmkstart" => {
+            p.buf.clear();
+            p.top().dest = Dest::Bookmark(true);
+            true
+        }
+        "bkmkend" => {
+            p.buf.clear();
+            p.top().dest = Dest::Bookmark(false);
+            true
+        }
+        "fldinst" => {
+            p.top().dest = Dest::FldInst;
+            true
+        }
+        "listtable" => {
+            p.top().dest = Dest::ListTable;
+            true
+        }
+        "listoverridetable" => {
+            p.top().dest = Dest::ListOverrideTable;
+            true
+        }
+        "shppict" => {
+            p.top().dest = Dest::Body;
+            true
+        }
+        "shpinst" => {
+            p.top().dest = Dest::Body;
+            true
+        }
+        "ud" => {
+            p.top().dest = Dest::Body;
+            true
+        }
+        "cs" | "ts" => {
+            style_entry(p, w, n);
+            true
+        }
+        "ftnalt" => {
+            p.note_endnote = true;
+            true
+        }
+        _ => false,
+    }
+}
+
+fn style_entry(p: &mut Parser<'_>, w: &str, n: Option<i32>) {
+    let kind = match w {
+        "cs" => StyleKind::Character,
+        "ts" => StyleKind::Table,
+        _ => StyleKind::Paragraph,
+    };
+    p.buf.clear();
+    p.styles.push(RStyle {
+        num: n.unwrap_or(0),
+        kind,
+        name: String::new(),
+        based: None,
+        next: None,
+        chp: RunProps::default(),
+        pap: ParaProps::default(),
+        ls: None,
+        ilvl: 0,
+    });
+    let i = p.styles.len() - 1;
+    p.top().dest = Dest::StyleEntry(i);
+}
+
+pub(crate) fn finish_level(p: &mut Parser<'_>, st: &St) {
+    let Some(Dest::List(li)) = p.stack.last().map(|s| s.dest.clone()) else {
+        return;
+    };
+    let mut l = st.level_tmp.clone().unwrap_or_default();
+    l.ppr = st.pap.clone();
+    l.ppr.num_id = None;
+    l.ppr.num_level = None;
+    l.ppr.style = None;
+    l.rpr = st.chp.clone();
+    let text = std::mem::take(&mut p.list_text);
+    let numbers = std::mem::take(&mut p.list_numbers);
+    if let Some(def) = p.lists.get_mut(li) {
+        def.levels.push(ListLevelDef {
+            level: l,
+            text,
+            numbers,
+        });
+    }
+}
+
+impl Parser<'_> {
+    /// One control word.
+    pub(crate) fn word(&mut self, w: &str, n: Option<i32>, max: u64) -> Result<()> {
+        let dest = self.top().dest.clone();
+        // Destinations first.
+        match w {
+            "fonttbl" => {
+                self.top().dest = Dest::FontTable;
+                return Ok(());
+            }
+            "colortbl" => {
+                self.top().dest = Dest::ColorTable;
+                self.color_cur = [0; 3];
+                self.color_any = false;
+                return Ok(());
+            }
+            "stylesheet" => {
+                self.top().dest = Dest::StyleSheet;
+                return Ok(());
+            }
+            "info" | "private" | "xmlnstbl" | "rsidtbl" | "generator" | "revtbl" | "themedata"
+            | "colorschememapping" | "datastore" | "latentstyles" | "mmathPr" | "mmath"
+            | "pgptbl" | "protusertbl" | "userprops" | "listtext" | "pntext" | "pn"
+            | "pnseclvl" | "objdata" | "objclass" | "objname" | "falt" | "fldtype"
+            | "nonshppict" | "template" | "passwordhash" | "wgrffmtfilter" | "factoidname"
+            | "background" | "docvar" | "mmathPict" | "oleclsid" | "blipuid" | "picprop"
+            | "formfield" | "datafield" | "ftnsep" | "ftnsepc" | "aftnsep" | "aftnsepc"
+            | "footnotesep" | "txfieldtext" | "fchars" | "lchars" | "nesttableprops"
+            | "nonesttables" | "keycode" | "stylesheetx" | "ffname" | "ffl" | "ffhelptext"
+            | "ffstattext" | "ffentrymcr" | "ffexitmcr" => {
+                if w == "falt" || w == "ffname" {
+                    // Alternate names do not name the font.
+                }
+                self.top().dest = Dest::Skip;
+                return Ok(());
+            }
+            "upr" => {
+                self.top().dest = Dest::Upr;
+                return Ok(());
+            }
+            "pict" => {
+                self.top().dest = Dest::Pict;
+                self.pict = Some(super::pict::Pict::default());
+                return Ok(());
+            }
+            "field" => {
+                self.top().dest = Dest::Field;
+                self.begin_field();
+                return Ok(());
+            }
+            "fldinst" => {
+                self.top().dest = Dest::FldInst;
+                return Ok(());
+            }
+            "fldrslt" => {
+                self.top().dest = Dest::FldRslt;
+                if let Some(f) = self.fields.last_mut() {
+                    f.in_result = true;
+                }
+                return Ok(());
+            }
+            "footnote" => {
+                self.flush_text();
+                self.note_endnote = false;
+                self.push_story();
+                self.top().dest = Dest::Note;
+                return Ok(());
+            }
+            "header" | "headerl" | "headerr" | "headerf" | "footer" | "footerl" | "footerr"
+            | "footerf" => {
+                let which = match w {
+                    "headerl" | "footerl" => 1,
+                    "headerr" | "footerr" => 2,
+                    "headerf" | "footerf" => 3,
+                    _ => 0,
+                };
+                self.push_story();
+                self.top().dest = Dest::HeaderFooter(w.starts_with("header"), which);
+                return Ok(());
+            }
+            // Shapes: their properties are not read, their text and pictures
+            // flow with the text around them.
+            "sp" => {
+                self.top().dest = Dest::Skip;
+                return Ok(());
+            }
+            "listlevel" => {
+                if matches!(dest, Dest::List(_)) {
+                    self.top().dest = Dest::ListLevel;
+                    self.top().level_tmp = Some(Level::default());
+                    // A level inherits nothing: its words start clean.
+                    let st = self.top();
+                    st.pap = ParaProps::default();
+                    st.chp = RunProps::default();
+                    return Ok(());
+                }
+            }
+            "list" => {
+                if matches!(dest, Dest::ListTable) {
+                    self.lists.push(ListDef {
+                        id: 0,
+                        levels: vec![],
+                        simple: false,
+                    });
+                    let i = self.lists.len() - 1;
+                    self.top().dest = Dest::List(i);
+                    return Ok(());
+                }
+            }
+            "listoverride" => {
+                if matches!(dest, Dest::ListOverrideTable) {
+                    self.overrides.push((0, 0, vec![]));
+                    self.top().dest = Dest::ListOverride;
+                    return Ok(());
+                }
+            }
+            "leveltext" => {
+                self.list_text.clear();
+                self.top().dest = Dest::LevelText;
+                return Ok(());
+            }
+            "levelnumbers" => {
+                self.list_numbers.clear();
+                self.top().dest = Dest::LevelNumbers;
+                return Ok(());
+            }
+            _ => {}
+        }
+        // Words of the destination being read.
+        match &dest {
+            Dest::Skip | Dest::Pict if !matches!(w, "bin") => {
+                if dest == Dest::Pict {
+                    return self.pict_word(w, n, max);
+                }
+                return Ok(());
+            }
+            Dest::FontTable | Dest::FontEntry(_) => {
+                return self.font_word(w, n);
+            }
+            Dest::ColorTable => {
+                match w {
+                    "red" => {
+                        self.color_cur[0] = n.unwrap_or(0);
+                        self.color_any = true;
+                    }
+                    "green" => {
+                        self.color_cur[1] = n.unwrap_or(0);
+                        self.color_any = true;
+                    }
+                    "blue" => {
+                        self.color_cur[2] = n.unwrap_or(0);
+                        self.color_any = true;
+                    }
+                    _ => {}
+                }
+                return Ok(());
+            }
+            Dest::StyleSheet => {
+                if matches!(w, "s" | "cs" | "ts") {
+                    style_entry(self, w, n);
+                    return Ok(());
+                }
+            }
+            Dest::StyleEntry(i) => {
+                let i = *i;
+                match w {
+                    "sbasedon" => {
+                        self.styles[i].based = n;
+                        return Ok(());
+                    }
+                    "snext" => {
+                        self.styles[i].next = n;
+                        return Ok(());
+                    }
+                    "s" | "cs" | "ts" => {
+                        self.styles[i].num = n.unwrap_or(0);
+                        return Ok(());
+                    }
+                    "additive" | "sautoupd" | "slink" | "slocked" | "ssemihidden" | "sqformat"
+                    | "spriority" | "styrsid" | "shidden" | "sunhideused" => return Ok(()),
+                    _ => {}
+                }
+            }
+            Dest::ListTable | Dest::ListOverrideTable => return Ok(()),
+            Dest::List(i) => {
+                let i = *i;
+                match w {
+                    "listid" => self.lists[i].id = n.unwrap_or(0),
+                    "listsimple" => self.lists[i].simple = n != Some(0),
+                    _ => {}
+                }
+                return Ok(());
+            }
+            Dest::ListOverride => {
+                if let Some(o) = self.overrides.last_mut() {
+                    match w {
+                        "listid" => o.0 = n.unwrap_or(0),
+                        "ls" => o.1 = n.unwrap_or(0),
+                        "lfolevel" => {}
+                        "listoverridestartat" => {}
+                        "levelstartat" => {
+                            let lvl = o.2.len() as u32;
+                            o.2.push((lvl, i64::from(n.unwrap_or(1))));
+                        }
+                        _ => {}
+                    }
+                }
+                return Ok(());
+            }
+            Dest::ListLevel => {
+                if self.level_word(w, n) {
+                    return Ok(());
+                }
+            }
+            Dest::LevelText | Dest::LevelNumbers => {
+                if w == "u" {
+                    let v = n.unwrap_or(0);
+                    let c = if v < 0 { v + 65536 } else { v } as u32;
+                    if matches!(dest, Dest::LevelText) {
+                        self.list_text.push(c);
+                    }
+                    let uc = self.top().uc;
+                    self.lex.skip_fallback(uc);
+                }
+                return Ok(());
+            }
+            Dest::Bookmark(_) | Dest::FldInst => {
+                if w == "u" {
+                    self.unicode(n);
+                }
+                return Ok(());
+            }
+            _ => {}
+        }
+        self.format_word(w, n, &dest, max)
+    }
+
+    fn unicode(&mut self, n: Option<i32>) {
+        let v = n.unwrap_or(0);
+        let c = if v < 0 { v + 65536 } else { v } as u32;
+        let uc = self.top().uc;
+        self.lex.skip_fallback(uc);
+        self.flush_text();
+        let ch = char::from_u32(c).unwrap_or('\u{FFFD}');
+        let ch = if (0xF020..=0xF0FF).contains(&c) {
+            // Symbol-font code points keep their private-use form.
+            ch
+        } else {
+            ch
+        };
+        let s = ch.to_string();
+        self.put_str_pub(&s);
+    }
+
+    fn font_word(&mut self, w: &str, n: Option<i32>) -> Result<()> {
+        match w {
+            "f" => {
+                let id = n.unwrap_or(0);
+                self.buf.clear();
+                self.fonts.entry(id).or_insert(Font {
+                    name: String::new(),
+                    cp: self.default_cp,
+                });
+                self.top().dest = Dest::FontEntry(id);
+            }
+            "fcharset" => {
+                if let (Dest::FontEntry(id), Some(cp)) =
+                    (self.top().dest.clone(), cp_of_charset(n.unwrap_or(0)))
+                    && let Some(f) = self.fonts.get_mut(&id)
+                {
+                    f.cp = cp;
+                }
+            }
+            "cpg" => {
+                if let Dest::FontEntry(id) = self.top().dest.clone()
+                    && let Some(f) = self.fonts.get_mut(&id)
+                {
+                    f.cp = n.unwrap_or(1252).clamp(0, 65535) as u16;
+                }
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    fn level_word(&mut self, w: &str, n: Option<i32>) -> bool {
+        let st = self.top();
+        let l = st.level_tmp.get_or_insert_with(Level::default);
+        match w {
+            "levelnfc" | "levelnfcn" => {
+                let nfc = n.unwrap_or(0);
+                l.fmt = crate::formats::office::docs::doc::lists::number_format(
+                    nfc.clamp(0, 255) as u8
+                );
+            }
+            "leveljc" | "leveljcn" => {
+                l.jc = match n.unwrap_or(0) {
+                    1 => Jc::Center,
+                    2 => Jc::Right,
+                    _ => Jc::Left,
+                }
+            }
+            "levelfollow" => {
+                l.suff = match n.unwrap_or(0) {
+                    1 => "space",
+                    2 => "nothing",
+                    _ => "tab",
+                }
+            }
+            "levelstartat" => l.start = i64::from(n.unwrap_or(1)),
+            "levelnorestart" => l.restart = Some(0),
+            "levellegal" => l.legal = flag(n),
+            "levelspace" | "levelindent" | "levelold" | "levelprev" | "levelprevspace"
+            | "levelpicture" => {}
+            _ => return false,
+        }
+        true
+    }
+
+    // ---- formatting ----
+
+    fn color_at(&self, i: i32) -> Option<Color> {
+        usize::try_from(i)
+            .ok()
+            .and_then(|i| self.colors.get(i))
+            .copied()
+    }
+
+    fn border_target(&mut self) -> Option<&mut Border> {
+        let t = self.top().target;
+        let new = || Border::single(4, Color::Auto);
+        match t {
+            Target::None => None,
+            Target::Para(s) => {
+                let b = &mut self.stack.last_mut()?.pap.borders;
+                let slot = match s {
+                    0 => &mut b.top,
+                    1 => &mut b.left,
+                    2 => &mut b.bottom,
+                    3 => &mut b.right,
+                    _ => &mut b.between,
+                };
+                Some(slot.get_or_insert_with(new))
+            }
+            Target::Cell(s) => {
+                let c = &mut self.row.cur;
+                let slot = c.borders.get_mut(usize::from(s))?;
+                let inner = slot.get_or_insert(None);
+                Some(inner.get_or_insert_with(new))
+            }
+            Target::Row(s) => {
+                let b = &mut self.row.borders;
+                let slot = match s {
+                    0 => &mut b.top,
+                    1 => &mut b.left,
+                    2 => &mut b.bottom,
+                    3 => &mut b.right,
+                    4 => &mut b.inside_h,
+                    _ => &mut b.inside_v,
+                };
+                Some(slot.get_or_insert_with(new))
+            }
+        }
+    }
+
+    fn format_word(&mut self, w: &str, n: Option<i32>, dest: &Dest, max: u64) -> Result<()> {
+        let _ = max;
+        let v = n.unwrap_or(0);
+        // Borders first: their words are modifiers of the side selected.
+        if let Some(rest) = w.strip_prefix("brdr") {
+            let side = match rest {
+                "t" => Some(Target::Para(0)),
+                "l" => Some(Target::Para(1)),
+                "b" => Some(Target::Para(2)),
+                "r" => Some(Target::Para(3)),
+                "btw" => Some(Target::Para(4)),
+                "bar" | "box" => None,
+                _ => None,
+            };
+            if rest == "box" {
+                // All four sides get the settings that follow.
+                self.top().target = Target::Para(9);
+                for s in 0..4 {
+                    self.top().target = Target::Para(s);
+                    self.border_target();
+                }
+                self.top().target = Target::Para(0);
+                return Ok(());
+            }
+            if let Some(t) = side {
+                self.top().target = t;
+                self.border_target();
+                return Ok(());
+            }
+            if rest == "nil" || rest == "none" {
+                self.clear_border();
+                return Ok(());
+            }
+            if let Some(s) = border_style(w) {
+                if let Some(b) = self.border_target() {
+                    b.style = s;
+                    if w == "brdrth" {
+                        b.size = b.size.max(12);
+                    }
+                }
+                return Ok(());
+            }
+            match w {
+                "brdrw" => {
+                    if let Some(b) = self.border_target() {
+                        b.size = ((v.max(0) as u32 * 8 + 10) / 20).clamp(2, 96);
+                    }
+                    return Ok(());
+                }
+                "brdrcf" => {
+                    let c = self.color_at(v);
+                    if let Some(b) = self.border_target() {
+                        b.color = c.unwrap_or(Color::Auto);
+                    }
+                    return Ok(());
+                }
+                "brdrsh" => return Ok(()),
+                _ => return Ok(()),
+            }
+        }
+        if w == "brsp" {
+            if let Some(b) = self.border_target() {
+                b.space = (v.max(0) as u32 / 20).min(31);
+            }
+            return Ok(());
+        }
+        if let Some(u) = underline_of(w) {
+            self.top().chp.underline = Some(if flag(n) { u } else { "none" });
+            return Ok(());
+        }
+        let is_text =
+            dest.is_text() || matches!(dest, Dest::StyleEntry(_) | Dest::ListLevel | Dest::Upr);
+        let st = self.stack.last_mut().expect("a group is open");
+        match w {
+            // ---- character ----
+            "plain" => {
+                st.chp = RunProps::default();
+            }
+            "b" => st.chp.bold = Some(flag(n)),
+            "i" => st.chp.italic = Some(flag(n)),
+            "ab" => st.chp.bold_cs = Some(flag(n)),
+            "ai" => st.chp.italic_cs = Some(flag(n)),
+            "strike" => st.chp.strike = Some(flag(n)),
+            "striked" => {
+                if flag(n) {
+                    st.chp.dstrike = Some(true);
+                } else {
+                    st.chp.dstrike = Some(false);
+                }
+            }
+            "scaps" => st.chp.small_caps = Some(flag(n)),
+            "caps" => st.chp.caps = Some(flag(n)),
+            "v" => st.chp.vanish = Some(flag(n)),
+            "outl" => st.chp.outline = Some(flag(n)),
+            "shad" => st.chp.shadow = Some(flag(n)),
+            "embo" => st.chp.emboss = Some(flag(n)),
+            "impr" => st.chp.imprint = Some(flag(n)),
+            "ulnone" => st.chp.underline = Some("none"),
+            "ulc" => {
+                let c = self
+                    .colors
+                    .get(usize::try_from(v).unwrap_or(usize::MAX))
+                    .copied();
+                self.top().chp.underline_color = c;
+            }
+            "super" => st.chp.vert_align = Some(VertAlign::Superscript),
+            "sub" => st.chp.vert_align = Some(VertAlign::Subscript),
+            "nosupersub" => st.chp.vert_align = Some(VertAlign::Baseline),
+            "up" => st.chp.position = Some(v),
+            "dn" => st.chp.position = Some(-v),
+            "fs" => {
+                st.chp.size = Some(v.clamp(1, 3277) as u32);
+                st.chp.size_cs = st.chp.size;
+            }
+            "expnd" => st.chp.spacing = Some(v * 5),
+            "expndtw" => st.chp.spacing = Some(v),
+            "charscalex" => st.chp.scale = Some(v.clamp(1, 600) as u32),
+            "kerning" => st.chp.kerning = Some(v.max(0) as u32),
+            "rtlch" => st.chp.rtl = Some(true),
+            "ltrch" => st.chp.rtl = Some(false),
+            "cf" => {
+                let c = self.color_at(v);
+                self.top().chp.color = c;
+            }
+            "highlight" => {
+                let c = self.color_at(v);
+                let st = self.top();
+                st.chp.shading = match c {
+                    Some(Color::Rgb(_)) => c.map(Shading::fill),
+                    _ => None,
+                };
+            }
+            "cb" | "chcbpat" => {
+                let c = self.color_at(v);
+                self.top().chp.shading = match c {
+                    Some(Color::Rgb(_)) => c.map(Shading::fill),
+                    _ => None,
+                };
+            }
+            "f" | "loch" | "hich" | "dbch" | "af" => {
+                // \f selects the font; \af the one for complex scripts.
+                if w == "f" {
+                    self.set_font(v);
+                } else if w == "af" {
+                    let name = self.fonts.get(&v).map(|f| f.name.clone());
+                    self.top().chp.fonts.cs = name;
+                }
+            }
+            "lang" | "langnp" => {
+                self.top().chp.lang = lang_tag(v);
+            }
+            "langfe" | "langfenp" => {
+                self.top().chp.lang_east_asia = lang_tag(v);
+            }
+            "uc" => st.uc = v.max(0) as u32,
+            "u" => {
+                if is_text || matches!(dest, Dest::Field) {
+                    self.unicode(n);
+                }
+            }
+            "cs" => {
+                if let Some(id) = self.style_id_of(v, StyleKind::Character) {
+                    self.top().chp.style = Some(id);
+                }
+            }
+            "ansicpg" => {
+                self.default_cp = v.clamp(0, 65535) as u16;
+                st.cp = self.default_cp;
+            }
+            "deff" => self.deff = v,
+            "deflang" => {}
+            "ansi" | "mac" | "pc" | "pca" => {}
+            // ---- paragraph ----
+            "pard" => {
+                st.pap = ParaProps::default();
+                st.ls = None;
+                st.ilvl = 0;
+                st.intbl = false;
+                st.cbpat = None;
+                st.cfpat = None;
+                st.shading = 0;
+                st.target = Target::None;
+            }
+            "s" => {
+                let id = self.style_id_of(v, StyleKind::Paragraph);
+                self.top().pap.style = id;
+            }
+            "ql" => st.pap.jc = Some(Jc::Left),
+            "qr" => st.pap.jc = Some(Jc::Right),
+            "qc" => st.pap.jc = Some(Jc::Center),
+            "qj" => st.pap.jc = Some(Jc::Both),
+            "qd" | "qt" => st.pap.jc = Some(Jc::Distribute),
+            "li" | "lin" => st.pap.ind_left = Some(v),
+            "ri" | "rin" => st.pap.ind_right = Some(v),
+            "fi" => {
+                if v >= 0 {
+                    st.pap.ind_first_line = Some(v);
+                    st.pap.ind_hanging = None;
+                } else {
+                    st.pap.ind_first_line = None;
+                    st.pap.ind_hanging = Some(-v);
+                }
+            }
+            "sb" => st.pap.space_before = Some(v.max(0)),
+            "sa" => st.pap.space_after = Some(v.max(0)),
+            "sbauto" => st.pap.before_auto = Some(flag(n)),
+            "saauto" => st.pap.after_auto = Some(flag(n)),
+            "sl" => {
+                if v < 0 {
+                    st.pap.line = Some(-v);
+                    st.pap.line_rule = Some(LineRule::Exact);
+                } else if v == 0 {
+                    st.pap.line = None;
+                    st.pap.line_rule = None;
+                } else {
+                    st.pap.line = Some(v);
+                    st.pap.line_rule = Some(LineRule::AtLeast);
+                }
+            }
+            "slmult" => {
+                if v == 1 && st.pap.line_rule == Some(LineRule::AtLeast) {
+                    st.pap.line_rule = Some(LineRule::Auto);
+                }
+            }
+            // A positioned paragraph: its frame.
+            "absw" | "absh" | "posx" | "posy" | "posxc" | "posxr" | "posxi" | "posxo" | "posyt"
+            | "posyc" | "posyb" | "posyin" | "posyout" | "phmrg" | "phpg" | "phcol" | "pvmrg"
+            | "pvpg" | "pvpara" | "dxfrtext" | "dfrmtxtx" | "dfrmtxty" | "nowrap"
+            | "wraparound" => {
+                let f = st.pap.frame.get_or_insert_with(Frame::default);
+                match w {
+                    "absw" if v > 0 => f.width = Some(v),
+                    "absh" if v != 0 => {
+                        f.height = Some(v.abs());
+                        f.height_exact = v < 0;
+                    }
+                    "posx" => f.x = Some(v),
+                    "posy" => f.y = Some(v),
+                    "posxc" => f.x_align = Some("center"),
+                    "posxr" => f.x_align = Some("right"),
+                    "posxi" => f.x_align = Some("inside"),
+                    "posxo" => f.x_align = Some("outside"),
+                    "posyt" => f.y_align = Some("top"),
+                    "posyc" => f.y_align = Some("center"),
+                    "posyb" => f.y_align = Some("bottom"),
+                    "posyin" => f.y_align = Some("inside"),
+                    "posyout" => f.y_align = Some("outside"),
+                    "phmrg" => f.h_anchor = Some("margin"),
+                    "phpg" => f.h_anchor = Some("page"),
+                    "phcol" => f.h_anchor = Some("text"),
+                    "pvmrg" => f.v_anchor = Some("margin"),
+                    "pvpg" => f.v_anchor = Some("page"),
+                    "pvpara" => f.v_anchor = Some("text"),
+                    "dxfrtext" | "dfrmtxtx" => f.h_space = Some(v),
+                    "dfrmtxty" => f.v_space = Some(v),
+                    "nowrap" => f.wrap = Some("notBeside"),
+                    "wraparound" => f.wrap = Some("around"),
+                    _ => {}
+                }
+            }
+            "keep" => st.pap.keep_lines = Some(flag(n)),
+            "keepn" => st.pap.keep_next = Some(flag(n)),
+            "pagebb" => st.pap.page_break_before = Some(flag(n)),
+            "widctlpar" => st.pap.widow_control = Some(true),
+            "nowidctlpar" => st.pap.widow_control = Some(false),
+            "noline" => st.pap.suppress_line_numbers = Some(true),
+            "rtlpar" => st.pap.bidi = Some(true),
+            "ltrpar" => st.pap.bidi = Some(false),
+            "contextualspace" => st.pap.contextual_spacing = Some(true),
+            "outlinelevel" => st.pap.outline_level = Some(v.clamp(0, 9) as u32),
+            "intbl" => st.intbl = true,
+            "itap" => {
+                if v > 0 {
+                    st.intbl = true;
+                }
+            }
+            "ls" => st.ls = Some(v),
+            "ilvl" => st.ilvl = v.clamp(0, 8) as u32,
+            "cbpat" => st.cbpat = usize::try_from(v).ok().filter(|v| *v > 0),
+            "cfpat" => st.cfpat = usize::try_from(v).ok().filter(|v| *v > 0),
+            "shading" => st.shading = v,
+            "tx" | "tb" => {
+                let kind = if w == "tb" { TabKind::Bar } else { st.tab_kind };
+                let t = Tab {
+                    pos: v,
+                    kind,
+                    leader: st.tab_leader,
+                };
+                st.pap.tabs.retain(|x| x.pos != v);
+                st.pap.tabs.push(t);
+                st.pap.tabs.sort_by_key(|t| t.pos);
+                st.tab_kind = TabKind::Left;
+                st.tab_leader = TabLeader::None;
+            }
+            "tqr" => st.tab_kind = TabKind::Right,
+            "tqc" => st.tab_kind = TabKind::Center,
+            "tqdec" => st.tab_kind = TabKind::Decimal,
+            "tldot" => st.tab_leader = TabLeader::Dot,
+            "tlmdot" => st.tab_leader = TabLeader::MiddleDot,
+            "tlhyph" => st.tab_leader = TabLeader::Hyphen,
+            "tlul" => st.tab_leader = TabLeader::Underscore,
+            "tlth" => st.tab_leader = TabLeader::Heavy,
+            "tlnone" => st.tab_leader = TabLeader::None,
+            // ---- special characters ----
+            "par" | "sect" | "row" | "cell" | "nestcell" | "nestrow" | "line" | "tab" | "page"
+            | "column" | "emdash" | "endash" | "emspace" | "enspace" | "qmspace" | "bullet"
+            | "lquote" | "rquote" | "ldblquote" | "rdblquote" | "chpgn" | "chftn" | "zwbo"
+            | "zwnbo" | "zwj" | "zwnj" | "ltrmark" | "rtlmark" | "softline" | "sectd" | "trowd"
+            | "page_" => {
+                return self.special_word(w, n, dest);
+            }
+            // ---- tables ----
+            "trleft" => self.row.left = v,
+            "trgaph" => self.row.gap = v,
+            "trrh" => self.row.height = v,
+            "trhdr" => self.row.header = true,
+            "trkeep" => self.row.keep = true,
+            "trqc" => self.row.jc = Some(Jc::Center),
+            "trqr" => self.row.jc = Some(Jc::Right),
+            "trql" => self.row.jc = Some(Jc::Left),
+            "rtlrow" => self.row.bidi = true,
+            "trbrdrt" => self.top().target = Target::Row(0),
+            "trbrdrl" => self.top().target = Target::Row(1),
+            "trbrdrb" => self.top().target = Target::Row(2),
+            "trbrdrr" => self.top().target = Target::Row(3),
+            "trbrdrh" => self.top().target = Target::Row(4),
+            "trbrdrv" => self.top().target = Target::Row(5),
+            "clbrdrt" => self.top().target = Target::Cell(0),
+            "clbrdrl" => self.top().target = Target::Cell(1),
+            "clbrdrb" => self.top().target = Target::Cell(2),
+            "clbrdrr" => self.top().target = Target::Cell(3),
+            "clcbpat" => {
+                let c = self.color_at(v);
+                self.row.cur.shading = match c {
+                    Some(Color::Rgb(_)) => c.map(Shading::fill),
+                    _ => None,
+                };
+            }
+            "clvmgf" => self.row.cur.vmerge = 1,
+            "clvmrg" => self.row.cur.vmerge = 2,
+            "clmgf" => self.row.cur.hmerge = 1,
+            "clmrg" => self.row.cur.hmerge = 2,
+            "clvertalt" => self.row.cur.valign = 0,
+            "clvertalc" => self.row.cur.valign = 1,
+            "clvertalb" => self.row.cur.valign = 2,
+            "cltxlrtb" => self.row.cur.text_flow = 0,
+            "cltxbtlr" => self.row.cur.text_flow = 1,
+            "cltxtbrl" => self.row.cur.text_flow = 2,
+            "clNoWrap" => self.row.cur.no_wrap = true,
+            "cellx" => {
+                self.row.cur.right = v;
+                let c = std::mem::take(&mut self.row.cur);
+                if self.row.cells.len() < 64 {
+                    self.row.cells.push(c);
+                }
+                self.top().target = Target::None;
+            }
+            // ---- sections and the document ----
+            "sbknone" => self.cur_sect.kind = SectionType::Continuous,
+            "sbkcol" => self.cur_sect.kind = SectionType::NextColumn,
+            "sbkpage" => self.cur_sect.kind = SectionType::NextPage,
+            "sbkeven" => self.cur_sect.kind = SectionType::EvenPage,
+            "sbkodd" => self.cur_sect.kind = SectionType::OddPage,
+            "pgwsxn" => self.cur_sect.width = v,
+            "pghsxn" => self.cur_sect.height = v,
+            "marglsxn" => self.cur_sect.left = v,
+            "margrsxn" => self.cur_sect.right = v,
+            "margtsxn" => self.cur_sect.top = v,
+            "margbsxn" => self.cur_sect.bottom = v,
+            "guttersxn" => self.cur_sect.gutter = v,
+            "headery" => self.cur_sect.header = v,
+            "footery" => self.cur_sect.footer = v,
+            "lndscpsxn" => self.cur_sect.landscape = true,
+            "titlepg" => self.cur_sect.title_page = true,
+            "cols" => self.cur_sect.columns.num = v.max(1) as u32,
+            "colsx" => self.cur_sect.columns.space = v,
+            "linebetcol" => self.cur_sect.columns.separator = true,
+            "pgnstarts" => self.cur_sect.page_start = Some(v.max(0) as u32),
+            "pgnrestart" => {
+                self.cur_sect.page_start.get_or_insert(1);
+            }
+            "pgnlcrm" => self.cur_sect.page_fmt = Some("lowerRoman"),
+            "pgnucrm" => self.cur_sect.page_fmt = Some("upperRoman"),
+            "pgnlcltr" => self.cur_sect.page_fmt = Some("lowerLetter"),
+            "pgnucltr" => self.cur_sect.page_fmt = Some("upperLetter"),
+            "pgndec" => self.cur_sect.page_fmt = Some("decimal"),
+            "vertalc" => self.cur_sect.v_align = Some("center"),
+            "vertalb" => self.cur_sect.v_align = Some("bottom"),
+            "vertalj" => self.cur_sect.v_align = Some("both"),
+            "paperw" => {
+                self.defaults.width = v;
+                self.cur_sect.width = v;
+            }
+            "paperh" => {
+                self.defaults.height = v;
+                self.cur_sect.height = v;
+            }
+            "margl" => {
+                self.defaults.left = v;
+                self.cur_sect.left = v;
+            }
+            "margr" => {
+                self.defaults.right = v;
+                self.cur_sect.right = v;
+            }
+            "margt" => {
+                self.defaults.top = v;
+                self.cur_sect.top = v;
+            }
+            "margb" => {
+                self.defaults.bottom = v;
+                self.cur_sect.bottom = v;
+            }
+            "gutter" => {
+                self.defaults.gutter = v;
+                self.cur_sect.gutter = v;
+            }
+            "landscape" => {
+                self.defaults.landscape = true;
+                self.cur_sect.landscape = true;
+            }
+            "facingp" => self.facing = true,
+            "deftab" => self.doc.settings.default_tab_stop = Some(v.max(1)),
+            "ftnbj" => self.doc.settings.footnote_pos = Some("pageBottom"),
+            "ftntj" => self.doc.settings.footnote_pos = Some("beneathText"),
+            "ftnstart" => self.doc.settings.footnote_start = Some(v.max(0) as u32),
+            "ftnnar" => self.doc.settings.footnote_fmt = Some("decimal"),
+            "ftnnalc" => self.doc.settings.footnote_fmt = Some("lowerLetter"),
+            "ftnnauc" => self.doc.settings.footnote_fmt = Some("upperLetter"),
+            "ftnnrlc" => self.doc.settings.footnote_fmt = Some("lowerRoman"),
+            "ftnnruc" => self.doc.settings.footnote_fmt = Some("upperRoman"),
+            "bin" => {
+                let data = self.lex.take_bin(v.max(0) as usize);
+                if self.top().dest == Dest::Pict {
+                    self.pict_bin(data);
+                }
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    fn style_id_of(&self, num: i32, kind: StyleKind) -> Option<String> {
+        if kind == StyleKind::Paragraph && num == 0 {
+            return None;
+        }
+        Some(style_id(kind, num))
+    }
+
+    fn set_font(&mut self, v: i32) {
+        let (name, cp) = match self.fonts.get(&v) {
+            Some(f) => (f.name.clone(), f.cp),
+            None => (String::new(), self.default_cp),
+        };
+        let st = self.top();
+        st.cp = if cp == 42 { st.cp } else { cp };
+        if !name.is_empty() {
+            st.chp.fonts = Fonts {
+                ascii: Some(name.clone()),
+                hansi: Some(name.clone()),
+                east_asia: Some(name.clone()),
+                cs: st.chp.fonts.cs.take().or(Some(name)),
+            };
+        }
+    }
+
+    fn clear_border(&mut self) {
+        match self.top().target {
+            Target::Para(s) => {
+                let b = &mut self.stack.last_mut().expect("a group is open").pap.borders;
+                match s {
+                    0 => b.top = None,
+                    1 => b.left = None,
+                    2 => b.bottom = None,
+                    3 => b.right = None,
+                    _ => b.between = None,
+                }
+            }
+            Target::Cell(s) => {
+                if let Some(slot) = self.row.cur.borders.get_mut(usize::from(s)) {
+                    *slot = Some(None);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    fn special_word(&mut self, w: &str, n: Option<i32>, dest: &Dest) -> Result<()> {
+        let _ = n;
+        match w {
+            "par" => {
+                if dest.is_text() {
+                    self.flush_text();
+                    self.close_para(true)?;
+                }
+            }
+            "sect" => {
+                self.flush_text();
+                self.end_section()?;
+            }
+            "sectd" => {
+                let keep = std::mem::take(&mut self.cur_sect.headers);
+                let keep_f = std::mem::take(&mut self.cur_sect.footers);
+                self.cur_sect = self.defaults.clone();
+                self.cur_sect.headers = keep;
+                self.cur_sect.footers = keep_f;
+            }
+            "trowd" => {
+                let gap = self.row.gap;
+                self.row = super::RowDef::default();
+                self.row.gap = gap;
+            }
+            "cell" | "nestcell" => {
+                self.flush_text();
+                self.end_cell()?;
+            }
+            "row" | "nestrow" => {
+                self.flush_text();
+                if w == "row" {
+                    self.end_row()?;
+                }
+            }
+            "line" => self.char_item_pub(RunItem::Break(BreakKind::Line), dest),
+            "tab" => self.char_item_pub(RunItem::Tab, dest),
+            "page" => self.char_item_pub(RunItem::Break(BreakKind::Page), dest),
+            "column" => self.char_item_pub(RunItem::Break(BreakKind::Column), dest),
+            "chpgn" => {
+                if dest.is_text() {
+                    self.flush_text();
+                    self.add_item(RunItem::PageNumber);
+                }
+            }
+            "chftn" => {
+                if matches!(dest, Dest::Note) {
+                    self.flush_text();
+                    let endnote = self.note_endnote;
+                    self.add_item(RunItem::NoteMark(endnote));
+                }
+                // In the text the mark is the reference: the note group puts it.
+            }
+            _ => {
+                let s = match w {
+                    "emdash" => "\u{2014}",
+                    "endash" => "\u{2013}",
+                    "emspace" => "\u{2003}",
+                    "enspace" => "\u{2002}",
+                    "qmspace" => "\u{2005}",
+                    "bullet" => "\u{2022}",
+                    "lquote" => "\u{2018}",
+                    "rquote" => "\u{2019}",
+                    "ldblquote" => "\u{201C}",
+                    "rdblquote" => "\u{201D}",
+                    _ => "",
+                };
+                self.flush_text();
+                self.put_str_pub(s);
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) fn char_item_pub(&mut self, item: RunItem, dest: &Dest) {
+        self.char_item(item, Some(dest.clone()));
+    }
+
+    pub(crate) fn put_str_pub(&mut self, s: &str) {
+        self.flush_text();
+        self.put_str(s);
+    }
+}
+
+pub(crate) fn lang_tag(lcid: i32) -> Option<String> {
+    Some(
+        match lcid & 0xFFFF {
+            0x0409 => "en-US",
+            0x0809 => "en-GB",
+            0x0C09 => "en-AU",
+            0x040C => "fr-FR",
+            0x0C0C => "fr-CA",
+            0x0407 => "de-DE",
+            0x0C07 => "de-AT",
+            0x0807 => "de-CH",
+            0x0410 => "it-IT",
+            0x0C0A | 0x040A => "es-ES",
+            0x0416 => "pt-BR",
+            0x0816 => "pt-PT",
+            0x0413 => "nl-NL",
+            0x0419 => "ru-RU",
+            0x0405 => "cs-CZ",
+            0x0415 => "pl-PL",
+            0x040E => "hu-HU",
+            0x041D => "sv-SE",
+            0x0414 => "nb-NO",
+            0x040B => "fi-FI",
+            0x0406 => "da-DK",
+            0x0408 => "el-GR",
+            0x041F => "tr-TR",
+            0x0411 => "ja-JP",
+            0x0412 => "ko-KR",
+            0x0804 => "zh-CN",
+            0x0404 => "zh-TW",
+            0x040D => "he-IL",
+            0x0401 => "ar-SA",
+            0x0422 => "uk-UA",
+            0x0426 => "lv-LV",
+            0x0427 => "lt-LT",
+            0x0425 => "et-EE",
+            _ => return None,
+        }
+        .to_string(),
+    )
+}
+
+pub(crate) fn style_id(kind: StyleKind, num: i32) -> String {
+    match (kind, num) {
+        (StyleKind::Paragraph, 0) => "Normal".into(),
+        (StyleKind::Paragraph, n) => format!("S{n}"),
+        (StyleKind::Character, n) => format!("CS{n}"),
+        (_, n) => format!("TS{n}"),
+    }
+}
+
+/// Styles from the stylesheet.
+pub(crate) fn build_styles(p: &mut Parser<'_>) {
+    let mut out = vec![];
+    let mut has_normal = false;
+    for s in std::mem::take(&mut p.styles) {
+        let id = style_id(s.kind, s.num);
+        let mut st = Style::new(&id, if s.name.is_empty() { &id } else { &s.name }, s.kind);
+        if s.kind == StyleKind::Paragraph && s.num == 0 {
+            st.default = true;
+            has_normal = true;
+            if st.name.is_empty() || st.name == id {
+                st.name = "Normal".into();
+            }
+        }
+        st.based_on = s.based.filter(|b| *b != s.num).map(|b| style_id(s.kind, b));
+        st.next = s
+            .next
+            .filter(|b| *b != s.num && s.kind == StyleKind::Paragraph)
+            .map(|b| style_id(s.kind, b));
+        st.q_format = s.kind == StyleKind::Paragraph;
+        st.rpr = s.chp;
+        st.ppr = s.pap;
+        st.ppr.style = None;
+        st.rpr.style = None;
+        if let Some(ls) = s.ls.filter(|l| *l > 0) {
+            st.ppr.num_id = Some(ls as u32);
+            st.ppr.num_level = Some(s.ilvl);
+        }
+        if s.kind == StyleKind::Table {
+            st.tbl = Some(TableProps::default());
+        }
+        if s.kind == StyleKind::Paragraph
+            && s.name.to_ascii_lowercase().starts_with("heading ")
+            && let Some(n) = s.name[8..]
+                .trim()
+                .parse::<u32>()
+                .ok()
+                .filter(|n| (1..=9).contains(n))
+        {
+            st.name = format!("heading {n}");
+            st.ppr.outline_level = Some(n - 1);
+        }
+        out.push(st);
+    }
+    let _ = has_normal;
+    p.doc.styles = out;
+}
+
+/// Numbering from the list table and its overrides.
+pub(crate) fn build_lists(p: &mut Parser<'_>) {
+    for (i, l) in std::mem::take(&mut p.lists).into_iter().enumerate() {
+        let mut levels = vec![];
+        for d in l.levels.into_iter().take(9) {
+            let mut lv = d.level;
+            // The text: the first element is its length; placeholders are
+            // the level numbers listed in `numbers`.
+            let chars: Vec<u32> = d.text.into_iter().skip(1).collect();
+            if lv.fmt == "bullet" {
+                let c = chars.first().copied().unwrap_or(0x2022);
+                lv.text = bullet(c);
+            } else {
+                let mut s = String::new();
+                for (k, c) in chars.iter().enumerate() {
+                    if *c < 9 && d.numbers.contains(&((k + 1) as u8)) {
+                        s.push_str(&format!("%{}", c + 1));
+                    } else if let Some(ch) = char::from_u32(*c) {
+                        s.push(ch);
+                    }
+                }
+                lv.text = s;
+            }
+            levels.push(lv);
+        }
+        while levels.len() < 9 && !l.simple {
+            levels.push(Level {
+                fmt: "none",
+                ..Level::default()
+            });
+        }
+        p.doc.numbering.abstracts.push(AbstractNum {
+            id: i as u32,
+            multi_level: !l.simple,
+            levels,
+        });
+        p.list_ids.push(l.id);
+    }
+    for (listid, ls, starts) in std::mem::take(&mut p.overrides) {
+        let abs = p
+            .list_ids
+            .iter()
+            .position(|x| *x == listid)
+            .map(|x| x as u32)
+            .unwrap_or(0);
+        p.doc.numbering.nums.push(Num {
+            id: ls.max(0) as u32,
+            abstract_id: abs,
+            overrides: starts
+                .into_iter()
+                .map(|(l, s)| (l, Some(s), None))
+                .collect(),
+        });
+    }
+}
+
+fn bullet(c: u32) -> String {
+    match c {
+        0xF0B7 | 0xB7 => "\u{2022}".into(),
+        0xF0A7 | 0xA7 => "\u{25AA}".into(),
+        0xF076 => "\u{2756}".into(),
+        0xF0D8 => "\u{27A2}".into(),
+        0xF0FC => "\u{2714}".into(),
+        0xE000..=0xF8FF => "\u{2022}".into(),
+        c => char::from_u32(c)
+            .map(|c| c.to_string())
+            .unwrap_or_else(|| "\u{2022}".into()),
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/text.rs b/crates/exav-render/src/formats/office/docs/text.rs
new file mode 100644
index 00000000..eaad866d
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/text.rs
@@ -0,0 +1,1424 @@
+//! The words of a document model, in reading order, for a scanner or a
+//! search. Taken from what the readers made; no DOCX is written.
+//!
+//! Text is what a reader sees: runs, table cells (a row to a line, its cells
+//! separated by a tab), the text of text boxes and shapes, a picture's alt
+//! text, headers and footers, footnotes, endnotes and comments, each of the
+//! last four in a section of its own. It is not list numbering, a bookmark, a
+//! field instruction, a page number, hidden text or a note's own mark.
+
+use super::fields::parse_hyperlink;
+use super::model::*;
+use crate::formats::office::text::Out;
+use std::collections::{HashMap, HashSet};
+
+/// Nesting of tables, shapes and fields followed. Deeper content is left out.
+const MAX_DEPTH: u32 = 64;
+/// Complex fields open at once. Marks past it are counted, not tracked.
+const MAX_FIELDS: usize = 64;
+/// Bytes of a field instruction kept; the first word and a target are in it.
+const MAX_INSTR: usize = 4096;
+/// Links open at once. Out keeps 16; the rest are plain text.
+const MAX_LINKS_OPEN: usize = 8;
+/// Characters of white space held back between words.
+const MAX_WS: usize = 256;
+/// Tab separators held back between cells.
+const MAX_TABS: usize = 4096;
+/// Bytes of a header or footer compared with the ones before it.
+const PROBE_CAP: usize = 1 << 20;
+
+/// Writes the text of `doc` to `out`: the body, then headers and footers,
+/// footnotes, endnotes and comments, each a section.
+pub(crate) fn lines(doc: &Document, out: &mut Out) {
+    let hidden = Hidden::new(doc);
+    let mut w = Walk::new(&hidden, out);
+    w.collect = true;
+    w.blocks(&doc.body);
+    w.end_story();
+    w.collect = false;
+
+    // The last section's properties are the document's.
+    let mut sections = std::mem::take(&mut w.sections);
+    sections.push(&doc.section);
+    if !w.out.full() {
+        w.out.section("headers and footers");
+    }
+    // A header the sections share is read once.
+    let mut seen: HashSet<String> = HashSet::new();
+    for s in sections {
+        for hf in [&s.headers, &s.footers] {
+            for blocks in [&hf.default, &hf.first, &hf.even].into_iter().flatten() {
+                if w.out.full() {
+                    return;
+                }
+                let mut probe = Out::new(PROBE_CAP);
+                Walk::new(&hidden, &mut probe).blocks_story(blocks);
+                let t = probe.finish();
+                if !t.truncated && !seen.insert(t.text) {
+                    continue;
+                }
+                w.blocks_story(blocks);
+            }
+        }
+    }
+
+    for (label, notes) in [("footnotes", &doc.footnotes), ("endnotes", &doc.endnotes)] {
+        if w.out.full() {
+            return;
+        }
+        w.out.section(label);
+        for n in notes {
+            w.blocks_story(&n.content);
+        }
+    }
+    if w.out.full() {
+        return;
+    }
+    w.out.section("comments");
+    for c in &doc.comments {
+        w.blocks_story(&c.content);
+    }
+}
+
+/// Which styles hide their text.
+struct Hidden<'a> {
+    /// Style id to whether the style, or one it is based on, hides.
+    styles: HashMap<&'a str, bool>,
+    default: bool,
+}
+
+impl<'a> Hidden<'a> {
+    fn new(doc: &'a Document) -> Hidden<'a> {
+        let mut styles = HashMap::new();
+        if doc.styles.iter().any(|s| s.rpr.vanish == Some(true)) {
+            let by_id: HashMap<&str, &Style> =
+                doc.styles.iter().map(|s| (s.id.as_str(), s)).collect();
+            for s in &doc.styles {
+                let mut cur = s;
+                for _ in 0..32 {
+                    if let Some(v) = cur.rpr.vanish {
+                        styles.insert(s.id.as_str(), v);
+                        break;
+                    }
+                    match cur.based_on.as_deref().and_then(|b| by_id.get(b)) {
+                        Some(next) => cur = next,
+                        None => break,
+                    }
+                }
+            }
+        }
+        Hidden {
+            styles,
+            default: doc.defaults_run.vanish == Some(true),
+        }
+    }
+
+    /// Whether the paragraph's style hides its text unless a run says
+    /// otherwise.
+    fn para(&self, p: &Para) -> bool {
+        p.props
+            .style
+            .as_deref()
+            .and_then(|s| self.styles.get(s))
+            .copied()
+            .unwrap_or(self.default)
+    }
+
+    /// Whether a run is hidden: its own setting, else its character style's,
+    /// else the paragraph's.
+    fn run(&self, props: &RunProps, para: bool) -> bool {
+        props
+            .vanish
+            .or_else(|| {
+                props
+                    .style
+                    .as_deref()
+                    .and_then(|s| self.styles.get(s))
+                    .copied()
+            })
+            .unwrap_or(para)
+    }
+}
+
+/// What a paragraph leaves for after its own line.
+enum Pending<'a> {
+    Blocks(&'a [Block]),
+    Alt(&'a str),
+}
+
+/// A complex field between its begin and end marks.
+struct Frame {
+    instr: String,
+    /// The separator was met: what follows is the result.
+    result: bool,
+    /// The result is left out (a page number).
+    skip: bool,
+    /// How many links were open before the field's own: it closes down to
+    /// that at its end.
+    link: Option<usize>,
+}
+
+impl Frame {
+    fn hides(&self) -> bool {
+        !self.result || self.skip
+    }
+}
+
+struct Link {
+    target: String,
+    /// Handed to `Out`: it has a label.
+    open: bool,
+}
+
+struct Walk<'a, 'b> {
+    hidden: &'b Hidden<'a>,
+    out: &'b mut Out,
+    depth: u32,
+    /// Table cells being written: their paragraphs share a line.
+    cell: u32,
+    /// Cell separators owed before the next word.
+    tabs: usize,
+    /// A paragraph of this cell wrote text: a space owed before the next.
+    cell_sep: bool,
+    /// Nothing written yet on this line of the paragraph or cell.
+    at_start: bool,
+    /// White space after the last word, written only if a word follows.
+    ws: String,
+    fields: Vec<Frame>,
+    /// Field begin marks past `MAX_FIELDS`, so that their ends pair.
+    extra_fields: u32,
+    /// Frames that hide what is written.
+    hide: u32,
+    links: Vec<Link>,
+    pending: Vec<Pending<'a>>,
+    /// The current paragraph's style hides.
+    para_hidden: bool,
+    /// Collect the sections that paragraphs end.
+    collect: bool,
+    sections: Vec<&'a Section>,
+}
+
+impl<'a, 'b> Walk<'a, 'b> {
+    fn new(hidden: &'b Hidden<'a>, out: &'b mut Out) -> Walk<'a, 'b> {
+        Walk {
+            hidden,
+            out,
+            depth: 0,
+            cell: 0,
+            tabs: 0,
+            cell_sep: false,
+            at_start: true,
+            ws: String::new(),
+            fields: Vec::new(),
+            extra_fields: 0,
+            hide: 0,
+            links: Vec::new(),
+            pending: Vec::new(),
+            para_hidden: false,
+            collect: false,
+            sections: Vec::new(),
+        }
+    }
+
+    /// A header, a note or a comment: blocks that end with the story.
+    fn blocks_story(&mut self, blocks: &'a [Block]) {
+        self.blocks(blocks);
+        self.end_story();
+    }
+
+    /// Ends the story: no field, link or line is left open for the next.
+    fn end_story(&mut self) {
+        self.close_links_to(0);
+        self.fields.clear();
+        self.extra_fields = 0;
+        self.hide = 0;
+        self.cell = 0;
+        self.tabs = 0;
+        self.cell_sep = false;
+        self.new_line();
+    }
+
+    fn new_line(&mut self) {
+        self.out.newline();
+        self.at_start = true;
+        self.ws.clear();
+    }
+
+    fn blocks(&mut self, blocks: &'a [Block]) {
+        for b in blocks {
+            if self.out.full() {
+                return;
+            }
+            match b {
+                Block::Para(p) => self.para(p),
+                Block::Table(t) => self.table(t),
+            }
+        }
+    }
+
+    fn para(&mut self, p: &'a Para) {
+        if self.collect
+            && let Some(s) = p.section.as_deref()
+        {
+            self.sections.push(s);
+        }
+        self.para_hidden = self.hidden.para(p);
+        self.at_start = true;
+        self.ws.clear();
+        self.inlines(&p.content);
+        self.end_para();
+        self.flush_pending();
+    }
+
+    /// Ends a paragraph: a line, or in a cell a space before the next one.
+    fn end_para(&mut self) {
+        if self.cell > 0 {
+            if !self.at_start {
+                self.cell_sep = true;
+            }
+            self.at_start = true;
+            self.ws.clear();
+        } else {
+            self.new_line();
+        }
+    }
+
+    /// The text of the drawings of the paragraph just ended.
+    fn flush_pending(&mut self) {
+        if self.pending.is_empty() {
+            return;
+        }
+        let items = std::mem::take(&mut self.pending);
+        if self.depth >= MAX_DEPTH {
+            return;
+        }
+        self.depth += 1;
+        let collect = std::mem::replace(&mut self.collect, false);
+        for p in items {
+            if self.out.full() {
+                break;
+            }
+            match p {
+                Pending::Blocks(b) => self.blocks(b),
+                Pending::Alt(a) => {
+                    self.at_start = true;
+                    self.put(a);
+                    self.end_para();
+                }
+            }
+        }
+        self.collect = collect;
+        self.depth -= 1;
+    }
+
+    fn table(&mut self, t: &'a Table) {
+        if self.depth >= MAX_DEPTH {
+            return;
+        }
+        self.depth += 1;
+        // A table in a cell takes lines of its own.
+        if self.cell > 0 {
+            self.new_line();
+        }
+        let tabs = self.tabs;
+        for row in &t.rows {
+            if self.out.full() {
+                break;
+            }
+            self.tabs = 0;
+            for (i, c) in row.cells.iter().enumerate() {
+                if i > 0 {
+                    self.tabs = (self.tabs + 1).min(MAX_TABS);
+                }
+                self.cell += 1;
+                self.cell_sep = false;
+                self.at_start = true;
+                self.ws.clear();
+                self.blocks(&c.content);
+                self.cell -= 1;
+            }
+            self.cell_sep = false;
+            self.new_line();
+        }
+        self.tabs = tabs;
+        self.cell_sep = false;
+        self.depth -= 1;
+    }
+
+    fn inlines(&mut self, content: &'a [Inline]) {
+        if self.depth >= MAX_DEPTH {
+            return;
+        }
+        self.depth += 1;
+        for i in content {
+            if self.out.full() {
+                break;
+            }
+            match i {
+                Inline::Run(r) => self.run(r),
+                Inline::FieldChar(k) => self.field_mark(*k),
+                Inline::InstrText(s) => self.instr(s),
+                Inline::Field { instr, result, .. } => {
+                    let word = instr.split_whitespace().next().unwrap_or("");
+                    if is_page_number(word) {
+                        continue;
+                    }
+                    let mark = self.links.len();
+                    if word.eq_ignore_ascii_case("HYPERLINK")
+                        && let (Some(t), _, _) = parse_hyperlink(instr.trim())
+                    {
+                        self.push_link(t);
+                    }
+                    self.inlines(result);
+                    self.close_links_to(mark);
+                }
+                Inline::Hyperlink {
+                    target, content, ..
+                } => {
+                    let mark = self.links.len();
+                    if let Some(t) = target {
+                        self.push_link(t.clone());
+                    }
+                    self.inlines(content);
+                    self.close_links_to(mark);
+                }
+                Inline::BookmarkStart { .. }
+                | Inline::BookmarkEnd(_)
+                | Inline::CommentStart(_)
+                | Inline::CommentEnd(_) => {}
+            }
+        }
+        self.depth -= 1;
+    }
+
+    fn run(&mut self, r: &'a Run) {
+        if self.hide > 0 || self.hidden.run(&r.props, self.para_hidden) {
+            return;
+        }
+        for it in &r.items {
+            match it {
+                RunItem::Text(t) => self.put(t),
+                RunItem::Tab => self.put("\t"),
+                RunItem::Break(_) => {
+                    if self.cell > 0 {
+                        self.put(" ");
+                    } else {
+                        self.new_line();
+                    }
+                }
+                RunItem::NoBreakHyphen => self.put("-"),
+                RunItem::Drawing(d) => match &d.kind {
+                    DrawingKind::Picture { .. } => {
+                        if let Some(a) = d.descr.as_deref().filter(|a| !a.trim().is_empty()) {
+                            self.pending.push(Pending::Alt(a));
+                        }
+                    }
+                    DrawingKind::Shape(s) => {
+                        if !s.text.is_empty() {
+                            self.pending.push(Pending::Blocks(&s.text));
+                        }
+                    }
+                },
+                // A soft hyphen shows only at a line end; a symbol is a glyph
+                // of a font that has no mapping here; the notes' marks and the
+                // page number are not words.
+                RunItem::SoftHyphen
+                | RunItem::Symbol { .. }
+                | RunItem::FootnoteRef(_)
+                | RunItem::EndnoteRef(_)
+                | RunItem::NoteMark(_)
+                | RunItem::CommentRef(_)
+                | RunItem::PageNumber => {}
+            }
+        }
+    }
+
+    // ---- fields ----
+
+    fn instr(&mut self, s: &str) {
+        if self.extra_fields > 0 {
+            return;
+        }
+        if let Some(f) = self.fields.last_mut()
+            && !f.result
+            && f.instr.len() < MAX_INSTR
+        {
+            f.instr.push_str(s);
+        }
+    }
+
+    fn field_mark(&mut self, kind: FieldCharKind) {
+        match kind {
+            FieldCharKind::Begin => {
+                if self.fields.len() >= MAX_FIELDS {
+                    self.extra_fields += 1;
+                    return;
+                }
+                self.fields.push(Frame {
+                    instr: String::new(),
+                    result: false,
+                    skip: false,
+                    link: None,
+                });
+                self.hide += 1;
+            }
+            FieldCharKind::Separate => {
+                if self.extra_fields > 0 {
+                    return;
+                }
+                let Some(f) = self.fields.last_mut() else {
+                    return;
+                };
+                if f.result {
+                    return;
+                }
+                f.result = true;
+                self.hide = self.hide.saturating_sub(1);
+                let instr = std::mem::take(&mut f.instr);
+                let word = instr.split_whitespace().next().unwrap_or("");
+                if is_page_number(word) {
+                    f.skip = true;
+                    self.hide += 1;
+                } else if word.eq_ignore_ascii_case("HYPERLINK")
+                    && let (Some(t), _, _) = parse_hyperlink(instr.trim())
+                {
+                    let mark = self.links.len();
+                    self.push_link(t);
+                    if let Some(f) = self.fields.last_mut() {
+                        f.link = Some(mark);
+                    }
+                }
+            }
+            FieldCharKind::End => {
+                if self.extra_fields > 0 {
+                    self.extra_fields -= 1;
+                    return;
+                }
+                let Some(f) = self.fields.pop() else {
+                    return;
+                };
+                if f.hides() {
+                    self.hide = self.hide.saturating_sub(1);
+                }
+                if let Some(mark) = f.link {
+                    self.close_links_to(mark);
+                }
+            }
+        }
+    }
+
+    // ---- links ----
+
+    fn push_link(&mut self, target: String) {
+        if !target.is_empty() && self.links.len() < MAX_LINKS_OPEN {
+            self.links.push(Link {
+                target,
+                open: false,
+            });
+        }
+    }
+
+    /// Closes the links opened after the first `len`.
+    fn close_links_to(&mut self, len: usize) {
+        while self.links.len() > len {
+            if let Some(l) = self.links.pop()
+                && l.open
+            {
+                self.out.end_link();
+            }
+        }
+    }
+
+    // ---- text ----
+
+    /// Text of a run. White space around words is kept between them only: not
+    /// at the start of a paragraph nor at its end.
+    fn put(&mut self, s: &str) {
+        if s.is_empty() {
+            return;
+        }
+        let flat;
+        let s = if self.cell > 0 && s.contains(is_line_or_tab) {
+            flat = s
+                .chars()
+                .map(|c| if is_line_or_tab(c) { ' ' } else { c })
+                .collect::<String>();
+            flat.as_str()
+        } else {
+            s
+        };
+        let core = s.trim_matches(char::is_whitespace);
+        if core.is_empty() {
+            if !self.at_start {
+                let room = MAX_WS.saturating_sub(self.ws.len());
+                self.ws.extend(s.chars().take(room));
+            }
+            return;
+        }
+        let lead = s.len() - s.trim_start().len();
+        self.lead();
+        if !self.at_start {
+            self.out.push(&s[..lead]);
+        }
+        for l in self.links.iter_mut().filter(|l| !l.open) {
+            self.out.begin_link(&l.target);
+            l.open = true;
+        }
+        self.out.push(core);
+        self.at_start = false;
+        self.ws.clear();
+        self.ws.extend(s[lead + core.len()..].chars().take(MAX_WS));
+    }
+
+    /// Writes what is owed before a word: the cell separators, the space
+    /// after the cell's last paragraph, the white space after the last word.
+    fn lead(&mut self) {
+        if self.tabs > 0 {
+            self.out.push(&"\t".repeat(self.tabs));
+            self.tabs = 0;
+        }
+        if self.cell_sep {
+            self.out.push(" ");
+            self.cell_sep = false;
+        }
+        if !self.at_start {
+            self.out.push(&self.ws);
+        }
+        self.ws.clear();
+    }
+}
+
+fn is_line_or_tab(c: char) -> bool {
+    matches!(
+        c,
+        '\t' | '\n' | '\r' | '\u{b}' | '\u{c}' | '\u{2028}' | '\u{2029}'
+    )
+}
+
+/// A field whose result is a page count or number.
+fn is_page_number(word: &str) -> bool {
+    ["PAGE", "NUMPAGES", "SECTIONPAGES"]
+        .iter()
+        .any(|w| word.eq_ignore_ascii_case(w))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::text::Text;
+
+    fn read_capped(d: &Document, cap: usize) -> Text {
+        let mut out = Out::new(cap);
+        lines(d, &mut out);
+        out.finish()
+    }
+
+    fn read(d: &Document) -> Text {
+        read_capped(d, 1 << 20)
+    }
+
+    fn run(s: &str) -> Inline {
+        Inline::Run(Run::text(RunProps::default(), s))
+    }
+
+    fn run_with(props: RunProps, s: &str) -> Inline {
+        Inline::Run(Run::text(props, s))
+    }
+
+    fn hidden() -> RunProps {
+        RunProps {
+            vanish: Some(true),
+            ..RunProps::default()
+        }
+    }
+
+    fn items(items: Vec<RunItem>) -> Inline {
+        Inline::Run(Run {
+            props: RunProps::default(),
+            items,
+        })
+    }
+
+    fn para(content: Vec<Inline>) -> Block {
+        Block::Para(Para {
+            content,
+            ..Para::default()
+        })
+    }
+
+    fn p(s: &str) -> Block {
+        para(vec![run(s)])
+    }
+
+    fn cell(content: Vec<Block>) -> Cell {
+        Cell {
+            content,
+            ..Cell::default()
+        }
+    }
+
+    fn table(rows: Vec<Vec<Vec<Block>>>) -> Block {
+        Block::Table(Table {
+            rows: rows
+                .into_iter()
+                .map(|r| Row {
+                    cells: r.into_iter().map(cell).collect(),
+                    ..Row::default()
+                })
+                .collect(),
+            ..Table::default()
+        })
+    }
+
+    fn doc(body: Vec<Block>) -> Document {
+        Document {
+            body,
+            ..Document::default()
+        }
+    }
+
+    fn body_text(body: Vec<Block>) -> String {
+        read(&doc(body)).text
+    }
+
+    fn link(target: &str, content: Vec<Inline>) -> Inline {
+        Inline::Hyperlink {
+            target: Some(target.into()),
+            anchor: None,
+            tooltip: None,
+            content,
+        }
+    }
+
+    fn mark(k: FieldCharKind) -> Inline {
+        Inline::FieldChar(k)
+    }
+
+    fn shape(text: Vec<Block>) -> RunItem {
+        RunItem::Drawing(Box::new(Drawing {
+            anchor: None,
+            cx: 1,
+            cy: 1,
+            name: "s".into(),
+            descr: None,
+            kind: DrawingKind::Shape(Shape {
+                text,
+                ..Shape::default()
+            }),
+        }))
+    }
+
+    fn picture(descr: Option<&str>) -> RunItem {
+        RunItem::Drawing(Box::new(Drawing {
+            anchor: None,
+            cx: 1,
+            cy: 1,
+            name: "Picture 1".into(),
+            descr: descr.map(str::to_string),
+            kind: DrawingKind::Picture {
+                media: 0,
+                crop: Crop::default(),
+            },
+        }))
+    }
+
+    #[test]
+    fn runs_tabs_and_breaks_are_text_in_order() {
+        let t = body_text(vec![
+            p("one"),
+            para(vec![items(vec![
+                RunItem::Text("a".into()),
+                RunItem::Tab,
+                RunItem::Text("b".into()),
+                RunItem::Break(BreakKind::Line),
+                RunItem::Text("c".into()),
+                RunItem::Break(BreakKind::Page),
+                RunItem::Text("d".into()),
+            ])]),
+            p("two"),
+        ]);
+        assert_eq!(t, "one\na\tb\nc\nd\ntwo\n");
+    }
+
+    #[test]
+    fn white_space_around_a_paragraph_goes_and_inside_it_stays() {
+        let t = body_text(vec![
+            p("  lead  trail  "),
+            para(vec![run("x"), run("  "), run("y "), run(" z")]),
+            para(vec![run("\t"), run("tabbed"), run("\t"), run("cols")]),
+            p("   "),
+        ]);
+        assert_eq!(t, "lead  trail\nx  y  z\ntabbed\tcols\n");
+    }
+
+    #[test]
+    fn the_hyphens_and_the_marks_of_a_run() {
+        let t = body_text(vec![para(vec![items(vec![
+            RunItem::Text("a".into()),
+            RunItem::SoftHyphen,
+            RunItem::Text("b".into()),
+            RunItem::NoBreakHyphen,
+            RunItem::Text("c".into()),
+            RunItem::Symbol {
+                font: "Wingdings".into(),
+                ch: 0xF0FC,
+            },
+            RunItem::PageNumber,
+            RunItem::FootnoteRef(1),
+            RunItem::EndnoteRef(1),
+            RunItem::NoteMark(false),
+            RunItem::CommentRef(0),
+        ])])]);
+        assert_eq!(t, "ab-c\n");
+    }
+
+    #[test]
+    fn bookmarks_comment_ranges_and_list_numbers_are_not_text() {
+        let mut d = doc(vec![Block::Para(Para {
+            props: ParaProps {
+                num_id: Some(1),
+                num_level: Some(0),
+                ..ParaProps::default()
+            },
+            content: vec![
+                Inline::BookmarkStart {
+                    id: 1,
+                    name: "chapter".into(),
+                },
+                Inline::CommentStart(0),
+                run("item"),
+                Inline::CommentEnd(0),
+                Inline::BookmarkEnd(1),
+            ],
+            ..Para::default()
+        })]);
+        d.numbering.abstracts.push(AbstractNum {
+            id: 0,
+            multi_level: false,
+            levels: vec![Level {
+                text: "%1.".into(),
+                ..Level::default()
+            }],
+        });
+        assert_eq!(read(&d).text, "item\n");
+    }
+
+    #[test]
+    fn a_row_is_a_line_and_its_cells_are_separated_by_a_tab() {
+        let t = body_text(vec![
+            p("before"),
+            table(vec![
+                vec![vec![p("a")], vec![p("b")], vec![p("c")]],
+                vec![vec![p("d")], vec![], vec![p("f")]],
+                vec![vec![], vec![p("h")], vec![]],
+                vec![vec![], vec![], vec![]],
+            ]),
+            p("after"),
+        ]);
+        assert_eq!(t, "before\na\tb\tc\nd\t\tf\n\th\nafter\n");
+    }
+
+    #[test]
+    fn the_paragraphs_of_a_cell_share_its_line() {
+        let t = body_text(vec![table(vec![vec![
+            vec![p("x"), p(""), p("y")],
+            vec![para(vec![items(vec![
+                RunItem::Text("a".into()),
+                RunItem::Tab,
+                RunItem::Text("b".into()),
+                RunItem::Break(BreakKind::Line),
+                RunItem::Text("c\nd".into()),
+            ])])],
+        ]])]);
+        assert_eq!(t, "x y\ta b c d\n");
+    }
+
+    #[test]
+    fn a_table_in_a_cell_takes_lines_of_its_own() {
+        let inner = table(vec![vec![vec![p("x")], vec![p("y")]], vec![vec![p("z")]]]);
+        let t = body_text(vec![
+            table(vec![vec![vec![p("L"), inner], vec![p("R")]]]),
+            p("end"),
+        ]);
+        assert_eq!(t, "L\nx\ty\nz\n\tR\nend\n");
+    }
+
+    #[test]
+    fn tables_nested_past_the_bound_are_cut_without_overflowing() {
+        let mut b = p("deep");
+        for _ in 0..500 {
+            b = table(vec![vec![vec![p("level"), b]]]);
+        }
+        let t = body_text(vec![b]);
+        assert!(t.contains("level"));
+        assert!(!t.contains("deep"));
+    }
+
+    #[test]
+    fn hidden_runs_are_left_out_and_struck_ones_are_not() {
+        let t = body_text(vec![
+            para(vec![
+                run("shown "),
+                run_with(hidden(), "SECRET"),
+                run(" shown"),
+            ]),
+            para(vec![
+                run_with(
+                    RunProps {
+                        strike: Some(true),
+                        dstrike: Some(true),
+                        ..RunProps::default()
+                    },
+                    "struck",
+                ),
+                run_with(
+                    RunProps {
+                        vanish: Some(false),
+                        ..RunProps::default()
+                    },
+                    " not hidden",
+                ),
+            ]),
+            para(vec![run_with(hidden(), "ALL HIDDEN")]),
+        ]);
+        assert_eq!(t, "shown  shown\nstruck not hidden\n");
+    }
+
+    #[test]
+    fn styles_hide_through_the_character_the_paragraph_and_the_defaults() {
+        let style = |id: &str, kind, based_on: Option<&str>, vanish: Option<bool>| {
+            let mut s = Style::new(id, id, kind);
+            s.based_on = based_on.map(str::to_string);
+            s.rpr.vanish = vanish;
+            s
+        };
+        let run_in = |style: Option<&str>, vanish: Option<bool>, s: &str| {
+            run_with(
+                RunProps {
+                    style: style.map(str::to_string),
+                    vanish,
+                    ..RunProps::default()
+                },
+                s,
+            )
+        };
+        let styled = |style: &str, content: Vec<Inline>| {
+            Block::Para(Para {
+                props: ParaProps {
+                    style: Some(style.into()),
+                    ..ParaProps::default()
+                },
+                content,
+                ..Para::default()
+            })
+        };
+        let mut d = doc(vec![
+            para(vec![run_in(Some("Hid"), None, "char style")]),
+            para(vec![run_in(Some("Child"), None, "inherited")]),
+            para(vec![run_in(Some("Shown"), None, "overridden")]),
+            para(vec![run_in(Some("Hid"), Some(false), "direct wins")]),
+            styled("HidPara", vec![run_in(None, None, "paragraph style")]),
+            styled(
+                "HidPara",
+                vec![
+                    run_in(None, Some(false), "kept"),
+                    run_in(Some("Shown"), None, " kept2"),
+                ],
+            ),
+            styled("Plain", vec![run_in(Some("Unknown"), None, "plain")]),
+        ]);
+        d.styles = vec![
+            style("Hid", StyleKind::Character, None, Some(true)),
+            style("Child", StyleKind::Character, Some("Hid"), None),
+            style("Shown", StyleKind::Character, Some("Hid"), Some(false)),
+            style("HidPara", StyleKind::Paragraph, None, Some(true)),
+            style("Plain", StyleKind::Paragraph, None, None),
+            // A loop in the chain ends.
+            style("A", StyleKind::Character, Some("B"), None),
+            style("B", StyleKind::Character, Some("A"), None),
+        ];
+        assert_eq!(
+            read(&d).text,
+            "overridden\ndirect wins\nkept kept2\nplain\n"
+        );
+        // The defaults hide what nothing says otherwise.
+        d.styles.clear();
+        d.defaults_run.vanish = Some(true);
+        let t = read(&d).text;
+        assert_eq!(t, "direct wins\nkept\n");
+    }
+
+    #[test]
+    fn a_page_number_field_has_no_text_and_another_field_has_its_result() {
+        let field = |instr: &str, result: &str| Inline::Field {
+            instr: instr.into(),
+            props: RunProps::default(),
+            result: vec![run(result)],
+        };
+        let t = body_text(vec![para(vec![
+            run("p"),
+            field(" PAGE \\* MERGEFORMAT ", "7"),
+            field(" numpages ", "9"),
+            field("SECTIONPAGES", "2"),
+            field(" REF target \\h ", "see"),
+            field(" DATE ", "today"),
+            items(vec![RunItem::PageNumber]),
+        ])]);
+        assert_eq!(t, "pseetoday\n");
+    }
+
+    #[test]
+    fn complex_fields_show_their_result_and_never_their_instruction() {
+        let begin = || mark(FieldCharKind::Begin);
+        let sep = || mark(FieldCharKind::Separate);
+        let end = || mark(FieldCharKind::End);
+        let t = body_text(vec![
+            // A page number, a nested field, a field with no result.
+            para(vec![
+                run("a "),
+                begin(),
+                Inline::InstrText(" PAGE ".into()),
+                sep(),
+                run("7"),
+                end(),
+                run("b "),
+                begin(),
+                Inline::InstrText(" IF ".into()),
+                begin(),
+                Inline::InstrText(" PAGE ".into()),
+                sep(),
+                run("1"),
+                end(),
+                run("hidden instruction text"),
+                sep(),
+                run("shown"),
+                end(),
+                run(" c"),
+                begin(),
+                Inline::InstrText(" SEQ x ".into()),
+                end(),
+                run(" d"),
+            ]),
+            // A field that ends in another paragraph.
+            para(vec![
+                begin(),
+                Inline::InstrText(" PAGE ".into()),
+                sep(),
+                run("8"),
+            ]),
+            para(vec![run("9"), end(), run("tail")]),
+            // Marks with no partner.
+            para(vec![end(), sep(), Inline::InstrText("x".into()), run("ok")]),
+        ]);
+        assert_eq!(t, "a b shown c d\ntail\nok\n");
+    }
+
+    #[test]
+    fn a_field_left_open_does_not_touch_the_next_story() {
+        // A field left open hides the rest of its story. The next story
+        // starts with no field: its separator has none to take.
+        let mut d = doc(vec![para(vec![
+            mark(FieldCharKind::Begin),
+            Inline::InstrText(" PAGE ".into()),
+            run("lost"),
+        ])]);
+        d.footnotes.push(Note {
+            id: 1,
+            content: vec![para(vec![
+                mark(FieldCharKind::Separate),
+                run("note"),
+                mark(FieldCharKind::End),
+                run(" more"),
+            ])],
+        });
+        assert_eq!(read(&d).text, "note more\n");
+    }
+
+    #[test]
+    fn field_marks_past_the_bound_are_counted() {
+        // A page number whose result holds 200 fields: its end is the 201st
+        // end, not the 65th.
+        let mut content = vec![
+            mark(FieldCharKind::Begin),
+            Inline::InstrText(" PAGE ".into()),
+            mark(FieldCharKind::Separate),
+        ];
+        for _ in 0..200 {
+            content.push(mark(FieldCharKind::Begin));
+            content.push(Inline::InstrText(" X ".into()));
+            content.push(mark(FieldCharKind::Separate));
+        }
+        content.push(run("a"));
+        for _ in 0..200 {
+            content.push(mark(FieldCharKind::End));
+        }
+        content.push(run("b"));
+        content.push(mark(FieldCharKind::End));
+        content.push(run("c"));
+        assert_eq!(body_text(vec![para(content)]), "c\n");
+    }
+
+    #[test]
+    fn instructions_and_white_space_held_back_are_bounded() {
+        let empty = Document::default();
+        let hidden = Hidden::new(&empty);
+        let mut out = Out::new(1 << 20);
+        let mut w = Walk::new(&hidden, &mut out);
+        w.field_mark(FieldCharKind::Begin);
+        for _ in 0..1000 {
+            w.instr(&"x".repeat(1000));
+        }
+        assert!(w.fields[0].instr.len() < MAX_INSTR + 1000);
+        // A hundred thousand spaces between two words are cut.
+        let t = body_text(vec![para(vec![
+            run("a"),
+            run(&" ".repeat(100_000)),
+            run("b"),
+        ])]);
+        assert!(t.len() < 2 * MAX_WS && t.starts_with("a  ") && t.ends_with("b\n"));
+        // And so are the cells between two words.
+        let cells: Vec<Vec<Block>> = (0..5000).map(|_| vec![]).chain([vec![p("x")]]).collect();
+        let t = body_text(vec![table(vec![cells])]);
+        assert_eq!(t, format!("{}x\n", "\t".repeat(MAX_TABS)));
+    }
+
+    #[test]
+    fn the_walk_stops_when_the_cap_is_reached() {
+        let body: Vec<Block> = (0..1000)
+            .map(|_| {
+                Block::Para(Para {
+                    content: vec![run("abcdefghij")],
+                    section: Some(Box::new(Section::default())),
+                    ..Para::default()
+                })
+            })
+            .collect();
+        let empty = Document::default();
+        let hidden = Hidden::new(&empty);
+        let mut out = Out::new(25);
+        let mut w = Walk::new(&hidden, &mut out);
+        w.collect = true;
+        w.blocks(&body);
+        assert!(w.sections.len() <= 3, "{}", w.sections.len());
+        // Nothing after the cap is a link either.
+        let d = doc(vec![
+            para(vec![run(&"x".repeat(100))]),
+            para(vec![link("https://t.test/", vec![run("late")])]),
+        ]);
+        let t = read_capped(&d, 10);
+        assert!(t.truncated && t.links.is_empty());
+    }
+
+    #[test]
+    fn a_link_is_its_label_then_its_target_and_the_pair_is_kept() {
+        let d = doc(vec![para(vec![
+            run("see "),
+            link("https://example.org/x", vec![run("the site")]),
+            run(" and "),
+            link("https://example.org/", vec![run("https://example.org/")]),
+            run(" and "),
+            link("mailto:a@b.test", vec![run("a@b.test")]),
+            run(" and "),
+            Inline::Hyperlink {
+                target: None,
+                anchor: Some("mark".into()),
+                tooltip: Some("tip".into()),
+                content: vec![run("inner")],
+            },
+        ])]);
+        let t = read(&d);
+        assert_eq!(
+            t.text,
+            "see the site (https://example.org/x) and https://example.org/ and a@b.test and inner\n"
+        );
+        assert_eq!(
+            t.links,
+            [("the site".to_string(), "https://example.org/x".to_string())]
+        );
+    }
+
+    #[test]
+    fn a_link_is_labelled_with_the_text_it_encloses_only() {
+        let t = read(&doc(vec![para(vec![
+            run("a "),
+            link(
+                "https://t.test/",
+                vec![run(" b "), run_with(hidden(), "H"), run("c ")],
+            ),
+            run(" d"),
+        ])]));
+        assert_eq!(t.text, "a  b c (https://t.test/)  d\n");
+        assert_eq!(
+            t.links,
+            [("b c".to_string(), "https://t.test/".to_string())]
+        );
+        // No label, no link: nothing to point from.
+        let t = read(&doc(vec![para(vec![
+            run("x"),
+            link("https://t.test/", vec![run_with(hidden(), "H")]),
+            link("https://t.test/", vec![]),
+        ])]));
+        assert_eq!(t.text, "x\n");
+        assert!(t.links.is_empty());
+    }
+
+    #[test]
+    fn fields_make_links_too() {
+        let begin = || mark(FieldCharKind::Begin);
+        let t = read(&doc(vec![
+            para(vec![
+                begin(),
+                Inline::InstrText(" HYPERLINK \"https://one.test/\" ".into()),
+                mark(FieldCharKind::Separate),
+                run("one"),
+                mark(FieldCharKind::End),
+                run(" "),
+                Inline::Field {
+                    instr: " HYPERLINK \"https://two.test/\" ".into(),
+                    props: RunProps::default(),
+                    result: vec![run("two")],
+                },
+                run(" "),
+                // A script is no target; a bookmark alone is none either.
+                Inline::Field {
+                    instr: " HYPERLINK \"javascript:alert(1)\" ".into(),
+                    props: RunProps::default(),
+                    result: vec![run("bad")],
+                },
+                run(" "),
+                Inline::Field {
+                    instr: " HYPERLINK \\l \"_Toc1\" ".into(),
+                    props: RunProps::default(),
+                    result: vec![run("toc")],
+                },
+            ]),
+            // The link ends with the field, across paragraphs too.
+            para(vec![
+                begin(),
+                Inline::InstrText(" HYPERLINK \"https://three.test/\" ".into()),
+                mark(FieldCharKind::Separate),
+                run("three"),
+            ]),
+            para(vec![run("3b"), mark(FieldCharKind::End), run(" after")]),
+        ]));
+        assert_eq!(
+            t.text,
+            "one (https://one.test/) two (https://two.test/) bad toc\nthree\n3b (https://three.test/) after\n"
+        );
+        assert_eq!(t.links.len(), 3);
+        assert_eq!(t.links[2].1, "https://three.test/");
+    }
+
+    #[test]
+    fn links_nested_past_the_bound_are_plain_text() {
+        let mut inner = vec![run("x")];
+        for i in 0..40 {
+            inner = vec![link(&format!("https://t.test/{i}"), inner)];
+        }
+        let t = read(&doc(vec![para(inner)]));
+        // The outer links are kept; the inner ones are text.
+        assert!(
+            t.text
+                .starts_with("x (https://t.test/32) (https://t.test/33)"),
+            "{}",
+            t.text
+        );
+        assert_eq!(t.text.matches(" (https://").count(), MAX_LINKS_OPEN);
+        assert_eq!(t.links.len(), MAX_LINKS_OPEN);
+    }
+
+    #[test]
+    fn a_link_in_a_cell_stays_in_the_cell() {
+        let t = read(&doc(vec![table(vec![vec![
+            vec![para(vec![link("https://t.test/", vec![run("a")])])],
+            vec![p("b")],
+        ]])]));
+        assert_eq!(t.text, "a (https://t.test/)\tb\n");
+    }
+
+    #[test]
+    fn the_text_of_a_shape_follows_its_paragraph() {
+        let t = body_text(vec![
+            para(vec![
+                run("before "),
+                items(vec![shape(vec![p("BOX one"), p("BOX two")])]),
+                run("after"),
+            ]),
+            p("next"),
+        ]);
+        assert_eq!(t, "before after\nBOX one\nBOX two\nnext\n");
+    }
+
+    #[test]
+    fn a_shape_in_a_cell_joins_the_cell() {
+        let t = body_text(vec![table(vec![vec![
+            vec![para(vec![run("a"), items(vec![shape(vec![p("BOX")])])])],
+            vec![p("b")],
+        ]])]);
+        assert_eq!(t, "a BOX\tb\n");
+    }
+
+    #[test]
+    fn shapes_nested_past_the_bound_are_cut_without_overflowing() {
+        let mut b = p("deep");
+        for _ in 0..500 {
+            b = para(vec![run("level"), items(vec![shape(vec![b])])]);
+        }
+        let t = body_text(vec![b]);
+        assert!(t.contains("level"));
+        assert!(!t.contains("deep"));
+    }
+
+    #[test]
+    fn a_picture_has_its_alt_text_and_nothing_else() {
+        let t = body_text(vec![
+            para(vec![run("a"), items(vec![picture(Some("A red kite"))])]),
+            para(vec![items(vec![picture(None)])]),
+            para(vec![items(vec![picture(Some("  "))])]),
+            para(vec![
+                run_with(hidden(), "h"),
+                Inline::Run(Run {
+                    props: hidden(),
+                    items: vec![picture(Some("hidden alt"))],
+                }),
+            ]),
+        ]);
+        assert_eq!(t, "a\nA red kite\n");
+    }
+
+    fn section_with(header: Option<&str>, footer: Option<&str>) -> Section {
+        let mut s = Section::default();
+        s.headers.default = header.map(|h| vec![p(h)]);
+        s.footers.default = footer.map(|h| vec![p(h)]);
+        s
+    }
+
+    fn with_section(text: &str, s: Section) -> Block {
+        Block::Para(Para {
+            content: vec![run(text)],
+            section: Some(Box::new(s)),
+            ..Para::default()
+        })
+    }
+
+    #[test]
+    fn headers_and_footers_follow_the_body_in_a_section_each_header_once() {
+        let mut d = doc(vec![
+            with_section("one", section_with(Some("HEAD"), Some("FOOT"))),
+            with_section("two", section_with(Some("HEAD"), Some("FOOT2"))),
+            p("three"),
+        ]);
+        d.section = section_with(Some("HEAD"), Some("FOOT"));
+        d.section.headers.first = Some(vec![p("FIRST")]);
+        d.section.headers.even = Some(vec![p("EVEN")]);
+        let t = read(&d);
+        assert_eq!(t.text, "one\ntwo\nthree\nHEAD\nFOOT\nFOOT2\nFIRST\nEVEN\n");
+        assert_eq!(t.sections.len(), 1);
+        assert_eq!(t.sections[0].label, "headers and footers");
+        assert_eq!(
+            &t.text[t.sections[0].range.clone()],
+            "HEAD\nFOOT\nFOOT2\nFIRST\nEVEN\n"
+        );
+    }
+
+    #[test]
+    fn only_the_sections_of_the_body_bring_headers() {
+        // A section end inside a text box or a note is not a section of the
+        // document; one in a table cell is.
+        let mut hdr = Section::default();
+        hdr.headers.default = Some(vec![p("IN SHAPE")]);
+        let mut cellsec = Section::default();
+        cellsec.headers.default = Some(vec![p("IN CELL")]);
+        let shaped = Block::Para(Para {
+            content: vec![items(vec![shape(vec![with_section("boxed", hdr)])])],
+            ..Para::default()
+        });
+        let mut d = doc(vec![
+            shaped,
+            table(vec![vec![vec![with_section("c", cellsec)]]]),
+        ]);
+        d.footnotes.push(Note {
+            id: 1,
+            content: vec![with_section("n", section_with(Some("IN NOTE"), None))],
+        });
+        let t = read(&d);
+        assert_eq!(t.text, "boxed\nc\nIN CELL\nn\n");
+    }
+
+    #[test]
+    fn notes_and_comments_have_a_section_each_after_the_headers() {
+        let mut d = doc(vec![p("body")]);
+        d.section = section_with(Some("HEAD"), None);
+        d.footnotes = vec![
+            Note {
+                id: 1,
+                content: vec![para(vec![
+                    items(vec![RunItem::NoteMark(false)]),
+                    run(" first note"),
+                ])],
+            },
+            Note {
+                id: 2,
+                content: vec![p("second note")],
+            },
+        ];
+        d.endnotes = vec![Note {
+            id: 1,
+            content: vec![p("an endnote")],
+        }];
+        d.comments = vec![Comment {
+            id: 0,
+            author: "Ann Lee".into(),
+            initials: "AL".into(),
+            date: None,
+            content: vec![p("a comment")],
+        }];
+        let t = read(&d);
+        assert_eq!(
+            t.text,
+            "body\nHEAD\nfirst note\nsecond note\nan endnote\na comment\n"
+        );
+        let got: Vec<(&str, &str)> = t
+            .sections
+            .iter()
+            .map(|s| (s.label.as_str(), &t.text[s.range.clone()]))
+            .collect();
+        assert_eq!(
+            got,
+            [
+                ("headers and footers", "HEAD\n"),
+                ("footnotes", "first note\nsecond note\n"),
+                ("endnotes", "an endnote\n"),
+                ("comments", "a comment\n"),
+            ]
+        );
+    }
+
+    #[test]
+    fn a_document_without_notes_has_no_such_sections() {
+        let t = read(&doc(vec![p("only the body")]));
+        assert_eq!(t.text, "only the body\n");
+        assert!(t.sections.is_empty());
+    }
+
+    #[test]
+    fn the_cap_cuts_the_text_and_stops_the_walk() {
+        let mut d = doc((0..1000).map(|_| p("abcdefghij")).collect());
+        d.section = section_with(Some("HEAD"), None);
+        d.comments = vec![Comment {
+            id: 0,
+            author: String::new(),
+            initials: String::new(),
+            date: None,
+            content: vec![p("late")],
+        }];
+        let t = read_capped(&d, 25);
+        assert!(t.truncated);
+        assert!(t.text.len() <= 25, "{}", t.text.len());
+        assert_eq!(t.text, "abcdefghij\nabcdefghij\nabc");
+        assert!(t.sections.is_empty());
+        // A cap that fits is not reached.
+        let t = read_capped(&doc(vec![p("abc")]), 4);
+        assert_eq!((t.text.as_str(), t.truncated), ("abc\n", false));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/wml/mod.rs b/crates/exav-render/src/formats/office/docs/wml/mod.rs
new file mode 100644
index 00000000..a1088268
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/wml/mod.rs
@@ -0,0 +1,701 @@
+//! Word 2003 XML (WordprocessingML 2003) to the document model.
+
+mod props;
+
+use crate::formats::office::common::base64;
+use crate::formats::office::common::image;
+use crate::formats::office::common::xml::{self, Node};
+use crate::formats::office::docs::error::{Error, Result};
+use crate::formats::office::docs::limits::Budget;
+use crate::formats::office::docs::model::*;
+use props::*;
+use std::collections::HashMap;
+
+struct Wml<'a> {
+    b: &'a mut Budget,
+    doc: Document,
+    media: HashMap<String, usize>,
+    bin: HashMap<String, Vec<u8>>,
+    next_bookmark: u32,
+    depth: u32,
+    in_note: bool,
+}
+
+/// UTF-16 text (with a byte order mark) as UTF-8; other bytes as they are.
+fn utf8(input: &[u8]) -> std::borrow::Cow<'_, [u8]> {
+    let (le, rest) = match input {
+        [0xFF, 0xFE, rest @ ..] => (true, rest),
+        [0xFE, 0xFF, rest @ ..] => (false, rest),
+        _ => return std::borrow::Cow::Borrowed(input),
+    };
+    let units: Vec<u16> = rest
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|c| {
+            if le {
+                u16::from_le_bytes(*c)
+            } else {
+                u16::from_be_bytes(*c)
+            }
+        })
+        .collect();
+    std::borrow::Cow::Owned(String::from_utf16_lossy(&units).into_bytes())
+}
+
+pub(crate) fn read(input: &[u8], budget: &mut Budget) -> Result<Document> {
+    let bytes = utf8(input);
+    let root = xml::parse(&bytes, &mut budget.tree())?;
+    if root.name != "w:wordDocument" {
+        return Err(Error::NotFormat(format!("root element {}", root.name)));
+    }
+    let mut w = Wml {
+        b: budget,
+        doc: Document::default(),
+        media: HashMap::new(),
+        bin: HashMap::new(),
+        next_bookmark: 1,
+        depth: 0,
+        in_note: false,
+    };
+    w.collect_bin(&root)?;
+    if let Some(s) = root.child("w:styles") {
+        w.styles(s);
+    }
+    if let Some(l) = root.child("w:lists") {
+        w.lists(l);
+    }
+    if let Some(d) = root.child("w:docPr")
+        && let Some(t) = d.child("w:defaultTabStop")
+    {
+        w.doc.settings.default_tab_stop = t.attr("w:val").and_then(|v| v.parse().ok());
+    }
+    let body = root
+        .child("w:body")
+        .ok_or_else(|| Error::NotFormat("no body".into()))?;
+    let mut blocks = vec![];
+    w.body(body, &mut blocks)?;
+    // The section properties of the body end the last section; with none,
+    // the last section end found takes their place.
+    let final_sect = match body.child("w:sectPr") {
+        Some(s) => Some(w.sect_pr(s)?),
+        None => blocks.iter_mut().rev().find_map(|b| match b {
+            Block::Para(p) => p.section.take().map(|s| *s),
+            _ => None,
+        }),
+    };
+    w.doc.body = blocks;
+    w.doc.section = final_sect.unwrap_or_default();
+    Ok(w.doc)
+}
+
+impl Wml<'_> {
+    fn collect_bin(&mut self, n: &Node) -> Result<()> {
+        let max = self.b.limits.max_part as usize;
+        let mut stack = vec![n];
+        while let Some(x) = stack.pop() {
+            if x.name == "w:binData"
+                && let Some(name) = x.attr("w:name")
+            {
+                let text = crate::formats::office::common::odf::text_of(x);
+                if let Some(d) = base64::decode(&text, max) {
+                    self.b.alloc(d.len() as u64)?;
+                    self.bin.insert(name.to_string(), d);
+                }
+            }
+            stack.extend(x.nodes());
+        }
+        Ok(())
+    }
+
+    fn media_of(&mut self, src: &str) -> Result<Option<usize>> {
+        if let Some(m) = self.media.get(src) {
+            return Ok(Some(*m));
+        }
+        let Some(d) = self.bin.get(src).cloned() else {
+            return Ok(None);
+        };
+        let Some(ext) = image::ext(&d) else {
+            return Ok(None);
+        };
+        let i = self.doc.add_media(ext, d);
+        self.media.insert(src.to_string(), i);
+        Ok(Some(i))
+    }
+
+    // ---- styles and lists ----
+
+    fn styles(&mut self, n: &Node) {
+        for s in n.all("w:style") {
+            let kind = match s.attr("w:type") {
+                Some("character") => StyleKind::Character,
+                Some("table") => StyleKind::Table,
+                Some("list") => StyleKind::Numbering,
+                _ => StyleKind::Paragraph,
+            };
+            let Some(id) = s.attr("w:styleId") else {
+                continue;
+            };
+            let name = s
+                .child("w:name")
+                .and_then(|n| n.attr("w:val"))
+                .unwrap_or(id);
+            let mut st = Style::new(id, name, kind);
+            st.default = is_on(s.attr("w:default"));
+            st.based_on = s
+                .child("w:basedOn")
+                .and_then(|n| n.attr("w:val"))
+                .map(str::to_string);
+            st.next = s
+                .child("w:next")
+                .and_then(|n| n.attr("w:val"))
+                .map(str::to_string);
+            st.q_format = s.child("w:qFormat").is_some();
+            if let Some(p) = s.child("w:pPr") {
+                st.ppr = para_props(p);
+            }
+            if let Some(r) = s.child("w:rPr") {
+                st.rpr = run_props(r);
+            }
+            if kind == StyleKind::Table {
+                st.tbl = Some(s.child("w:tblPr").map(table_props).unwrap_or_default());
+            }
+            self.doc.styles.push(st);
+        }
+    }
+
+    fn lists(&mut self, n: &Node) {
+        let mut defs: Vec<String> = vec![];
+        for d in n.all("w:listDef") {
+            let id = d.attr("w:listDefId").unwrap_or("").to_string();
+            let mut levels = vec![];
+            for l in d.all("w:lvl") {
+                let mut lv = Level::default();
+                if let Some(v) = l
+                    .child("w:start")
+                    .and_then(|s| s.attr("w:val"))
+                    .and_then(|v| v.parse().ok())
+                {
+                    lv.start = v;
+                }
+                let nfc = l
+                    .child("w:nfc")
+                    .and_then(|s| s.attr("w:val"))
+                    .and_then(|v| v.parse::<u8>().ok())
+                    .unwrap_or(0);
+                lv.fmt = crate::formats::office::docs::doc::lists::number_format(nfc);
+                lv.text = l
+                    .child("w:lvlText")
+                    .and_then(|s| s.attr("w:val"))
+                    .unwrap_or("")
+                    .to_string();
+                lv.jc = match l.child("w:lvlJc").and_then(|s| s.attr("w:val")) {
+                    Some("center") => Jc::Center,
+                    Some("right") => Jc::Right,
+                    _ => Jc::Left,
+                };
+                lv.suff = match l.child("w:suff").and_then(|s| s.attr("w:val")) {
+                    Some("Space" | "space") => "space",
+                    Some("Nothing" | "nothing") => "nothing",
+                    _ => "tab",
+                };
+                lv.legal = l.child("w:isLgl").is_some();
+                lv.style = l
+                    .child("w:pStyle")
+                    .and_then(|s| s.attr("w:val"))
+                    .map(str::to_string);
+                if let Some(p) = l.child("w:pPr") {
+                    lv.ppr = para_props(p);
+                }
+                if let Some(r) = l.child("w:rPr") {
+                    lv.rpr = run_props(r);
+                }
+                levels.push(lv);
+            }
+            while levels.len() < 9 {
+                levels.push(Level {
+                    fmt: "none",
+                    ..Level::default()
+                });
+            }
+            levels.truncate(9);
+            let aid = self.doc.numbering.abstracts.len() as u32;
+            self.doc.numbering.abstracts.push(AbstractNum {
+                id: aid,
+                multi_level: true,
+                levels,
+            });
+            defs.push(id);
+        }
+        for l in n.all("w:list") {
+            let Some(ilfo) = l.attr("w:ilfo").and_then(|v| v.parse::<u32>().ok()) else {
+                continue;
+            };
+            let abs = l
+                .child("w:ilst")
+                .and_then(|i| i.attr("w:val"))
+                .and_then(|v| defs.iter().position(|d| d == v))
+                .unwrap_or(0) as u32;
+            let mut overrides = vec![];
+            for o in l.all("w:lvlOverride") {
+                let lvl = o.attr("w:ilvl").and_then(|v| v.parse().ok()).unwrap_or(0);
+                let start = o
+                    .child("w:startOverride")
+                    .and_then(|s| s.attr("w:val"))
+                    .and_then(|v| v.parse().ok());
+                overrides.push((lvl, start, None));
+            }
+            self.doc.numbering.nums.push(Num {
+                id: ilfo,
+                abstract_id: abs,
+                overrides,
+            });
+        }
+    }
+
+    // ---- body ----
+
+    fn body(&mut self, n: &Node, out: &mut Vec<Block>) -> Result<()> {
+        if self.depth > 24 {
+            return Ok(());
+        }
+        self.depth += 1;
+        let mut r = Ok(());
+        for c in n.nodes() {
+            r = match c.name.as_str() {
+                "w:p" => self.para(c).map(|p| out.push(Block::Para(p))),
+                "w:tbl" => self.table(c).map(|t| out.push(Block::Table(t))),
+                "wx:sect" | "wx:sub-section" | "wx:pBdrGroup" | "w:customXml" | "w:sdt"
+                | "w:sdtContent" | "wx:borders" => self.body(c, out),
+                "w:sectPr" if n.name != "w:body" => {
+                    // Ends a section: its properties go to the paragraph before.
+                    self.sect_pr(c).map(|s| match out.last_mut() {
+                        Some(Block::Para(p)) if p.section.is_none() => {
+                            p.section = Some(Box::new(s))
+                        }
+                        _ => out.push(Block::Para(Para {
+                            section: Some(Box::new(s)),
+                            ..Para::default()
+                        })),
+                    })
+                }
+                _ => Ok(()),
+            };
+            if r.is_err() {
+                break;
+            }
+        }
+        self.depth -= 1;
+        r
+    }
+
+    fn sect_pr(&mut self, n: &Node) -> Result<Section> {
+        let mut s = Section {
+            width: 12240,
+            height: 15840,
+            ..Section::default()
+        };
+        for c in n.nodes() {
+            let v = c.attr("w:val");
+            let num = |k: &str| c.attr(k).and_then(|x| x.parse::<i32>().ok());
+            match c.name.as_str() {
+                "w:type" => {
+                    s.kind = match v {
+                        Some("continuous") => SectionType::Continuous,
+                        Some("even-page") => SectionType::EvenPage,
+                        Some("odd-page") => SectionType::OddPage,
+                        Some("next-column") => SectionType::NextColumn,
+                        _ => SectionType::NextPage,
+                    }
+                }
+                "w:pgSz" => {
+                    if let Some(w) = num("w:w") {
+                        s.width = w;
+                    }
+                    if let Some(h) = num("w:h") {
+                        s.height = h;
+                    }
+                    s.landscape = c.attr("w:orient") == Some("landscape");
+                }
+                "w:pgMar" => {
+                    for (k, slot) in [
+                        ("w:top", &mut s.top),
+                        ("w:left", &mut s.left),
+                        ("w:bottom", &mut s.bottom),
+                        ("w:right", &mut s.right),
+                        ("w:header", &mut s.header),
+                        ("w:footer", &mut s.footer),
+                        ("w:gutter", &mut s.gutter),
+                    ] {
+                        if let Some(x) = num(k) {
+                            *slot = x;
+                        }
+                    }
+                }
+                "w:cols" => {
+                    s.columns.num = num("w:num").unwrap_or(1).max(1) as u32;
+                    s.columns.space = num("w:space").unwrap_or(720);
+                    s.columns.separator = is_on(c.attr("w:sep"));
+                }
+                "w:titlePg" => s.title_page = is_on(v),
+                "w:pgNumType" => {
+                    s.page_start = num("w:start").map(|x| x.max(0) as u32);
+                    s.page_fmt = match c.attr("w:fmt") {
+                        Some("lower-roman") => Some("lowerRoman"),
+                        Some("upper-roman") => Some("upperRoman"),
+                        Some("lower-letter") => Some("lowerLetter"),
+                        Some("upper-letter") => Some("upperLetter"),
+                        _ => None,
+                    };
+                }
+                "w:hdr" | "w:ftr" => {
+                    let header = c.name == "w:hdr";
+                    let save = self.depth;
+                    self.depth += 4;
+                    let mut blocks = vec![];
+                    self.body(c, &mut blocks)?;
+                    self.depth = save;
+                    let hf = if header {
+                        &mut s.headers
+                    } else {
+                        &mut s.footers
+                    };
+                    match c.attr("w:type") {
+                        Some("even") => {
+                            hf.even = Some(blocks);
+                            self.doc.settings.even_and_odd_headers = true;
+                        }
+                        Some("first") => hf.first = Some(blocks),
+                        _ => hf.default = Some(blocks),
+                    }
+                }
+                _ => {}
+            }
+        }
+        Ok(s)
+    }
+
+    // ---- paragraphs ----
+
+    fn para(&mut self, n: &Node) -> Result<Para> {
+        self.b.paragraph(16)?;
+        let mut p = Para::default();
+        if let Some(pp) = n.child("w:pPr") {
+            p.props = para_props(pp);
+            if let Some(r) = pp.child("w:rPr") {
+                p.mark = run_props(r);
+            }
+            if let Some(s) = pp.child("w:sectPr") {
+                let s = self.sect_pr(s)?;
+                p.section = Some(Box::new(s));
+            }
+        }
+        self.inlines(n, &mut p.content)?;
+        self.b.inlines(&p.content)?;
+        Ok(p)
+    }
+
+    fn inlines(&mut self, n: &Node, out: &mut Vec<Inline>) -> Result<()> {
+        if self.depth > 48 {
+            return Ok(());
+        }
+        self.depth += 1;
+        let mut r = Ok(());
+        for c in n.nodes() {
+            r = self.inline(c, out);
+            if r.is_err() {
+                break;
+            }
+        }
+        self.depth -= 1;
+        r
+    }
+
+    fn inline(&mut self, c: &Node, out: &mut Vec<Inline>) -> Result<()> {
+        match c.name.as_str() {
+            "w:r" => self.run(c, out)?,
+            "w:hlink" => {
+                let mut content = vec![];
+                self.inlines(c, &mut content)?;
+                let target = c
+                    .attr("w:dest")
+                    .map(str::to_string)
+                    .filter(|t| crate::formats::office::docs::fields::safe_target(t));
+                let anchor = c
+                    .attr("w:bookmark")
+                    .map(crate::formats::office::docs::rtf::bm_name);
+                if target.is_some() || anchor.is_some() {
+                    out.push(Inline::Hyperlink {
+                        target,
+                        anchor,
+                        tooltip: c.attr("w:screenTip").map(str::to_string),
+                        content,
+                    });
+                } else {
+                    out.extend(content);
+                }
+            }
+            "w:fldSimple" => {
+                let mut result = vec![];
+                self.inlines(c, &mut result)?;
+                out.push(Inline::Field {
+                    instr: c.attr("w:instr").unwrap_or("").to_string(),
+                    props: RunProps::default(),
+                    result,
+                });
+            }
+            "w:bookmarkStart" => {
+                if let Some(name) = c.attr("w:name") {
+                    let id = c
+                        .attr("w:id")
+                        .and_then(|v| v.parse().ok())
+                        .unwrap_or_else(|| {
+                            let i = self.next_bookmark;
+                            self.next_bookmark += 1;
+                            i
+                        });
+                    out.push(Inline::BookmarkStart {
+                        id,
+                        name: crate::formats::office::docs::rtf::bm_name(name),
+                    });
+                }
+            }
+            "w:bookmarkEnd" => {
+                if let Some(id) = c.attr("w:id").and_then(|v| v.parse().ok()) {
+                    out.push(Inline::BookmarkEnd(id));
+                }
+            }
+            "aml:annotation" => self.annotation(c, out)?,
+            "w:smartTag" | "w:customXml" | "w:ins" | "w:sdt" | "w:sdtContent" => {
+                self.inlines(c, out)?;
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    fn annotation(&mut self, c: &Node, out: &mut Vec<Inline>) -> Result<()> {
+        match c.attr("w:type") {
+            Some("Word.Comment") => {
+                let id = self.doc.comments.len() as u32;
+                let author = c.attr("aml:author").unwrap_or("").to_string();
+                let initials: String = author
+                    .split_whitespace()
+                    .filter_map(|w| w.chars().next())
+                    .take(3)
+                    .collect();
+                let mut blocks = vec![];
+                if let Some(content) = c.child("aml:content") {
+                    self.depth += 2;
+                    self.body(content, &mut blocks)?;
+                    self.depth -= 2;
+                }
+                self.doc.comments.push(Comment {
+                    id,
+                    author,
+                    initials,
+                    date: c.attr("aml:createdate").map(str::to_string),
+                    content: blocks,
+                });
+                out.push(Inline::CommentStart(id));
+                out.push(Inline::CommentEnd(id));
+                out.push(Inline::Run(Run {
+                    props: RunProps::default(),
+                    items: vec![RunItem::CommentRef(id)],
+                }));
+            }
+            Some("Word.Insertion") => {
+                if let Some(content) = c.child("aml:content") {
+                    self.inlines(content, out)?;
+                }
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    fn run(&mut self, n: &Node, out: &mut Vec<Inline>) -> Result<()> {
+        let props = n.child("w:rPr").map(run_props).unwrap_or_default();
+        let mut items: Vec<RunItem> = vec![];
+        let flush = |items: &mut Vec<RunItem>, out: &mut Vec<Inline>| {
+            if !items.is_empty() {
+                out.push(Inline::Run(Run {
+                    props: props.clone(),
+                    items: std::mem::take(items),
+                }));
+            }
+        };
+        for c in n.nodes() {
+            match c.name.as_str() {
+                "w:t" => {
+                    let t = crate::formats::office::common::odf::text_of(c);
+                    if !t.is_empty() {
+                        items.push(RunItem::Text(t));
+                    }
+                }
+                "w:tab" => items.push(RunItem::Tab),
+                "w:br" => items.push(RunItem::Break(match c.attr("w:type") {
+                    Some("page") => BreakKind::Page,
+                    Some("column") => BreakKind::Column,
+                    _ => BreakKind::Line,
+                })),
+                "w:cr" => items.push(RunItem::Break(BreakKind::Line)),
+                "w:noBreakHyphen" => items.push(RunItem::NoBreakHyphen),
+                "w:softHyphen" => items.push(RunItem::SoftHyphen),
+                "w:pgNum" => items.push(RunItem::PageNumber),
+                "w:sym" => {
+                    let ch = c
+                        .attr("w:char")
+                        .and_then(|v| u16::from_str_radix(v, 16).ok());
+                    if let (Some(font), Some(ch)) = (c.attr("w:font"), ch) {
+                        items.push(RunItem::Symbol {
+                            font: font.to_string(),
+                            ch,
+                        });
+                    }
+                }
+                "w:footnoteRef" => items.push(RunItem::NoteMark(false)),
+                "w:annotationRef" => {}
+                "w:instrText" => {
+                    flush(&mut items, out);
+                    out.push(Inline::InstrText(
+                        crate::formats::office::common::odf::text_of(c),
+                    ));
+                }
+                "w:fldChar" => {
+                    flush(&mut items, out);
+                    out.push(Inline::FieldChar(match c.attr("w:fldCharType") {
+                        Some("begin") => FieldCharKind::Begin,
+                        Some("separate") => FieldCharKind::Separate,
+                        _ => FieldCharKind::End,
+                    }));
+                }
+                "w:footnote" => {
+                    let id = self.doc.footnotes.len() as u32 + 1;
+                    self.doc.footnotes.push(Note {
+                        id,
+                        content: vec![],
+                    });
+                    let mut blocks = vec![];
+                    if !self.in_note {
+                        self.in_note = true;
+                        self.depth += 2;
+                        let r = self.body(c, &mut blocks);
+                        self.depth -= 2;
+                        self.in_note = false;
+                        r?;
+                    }
+                    if let Some(f) = self.doc.footnotes.iter_mut().find(|f| f.id == id) {
+                        f.content = blocks;
+                    }
+                    items.push(RunItem::FootnoteRef(id));
+                }
+                "w:pict" => {
+                    if let Some(d) = self.pict(c)? {
+                        items.push(RunItem::Drawing(Box::new(d)));
+                    }
+                }
+                _ => {}
+            }
+        }
+        flush(&mut items, out);
+        Ok(())
+    }
+
+    fn pict(&mut self, n: &Node) -> Result<Option<Drawing>> {
+        // The picture's data is named by the image data of its shape.
+        let Some(shape) = n.find("v:shape").or_else(|| n.find("v:rect")) else {
+            return Ok(None);
+        };
+        let Some(src) = shape.child("v:imagedata").and_then(|i| i.attr("src")) else {
+            return Ok(None);
+        };
+        let Some(media) = self.media_of(src)? else {
+            return Ok(None);
+        };
+        let style = shape.attr("style").unwrap_or("");
+        let dim = |k: &str| {
+            style
+                .split(';')
+                .filter_map(|p| p.split_once(':'))
+                .find(|(a, _)| a.trim() == k)
+                .and_then(|(_, v)| crate::formats::office::common::odf::emu(v.trim()))
+        };
+        let natural = image::natural_emu(&self.doc.media[media].data);
+        let (cx, cy) = match (dim("width"), dim("height"), natural) {
+            (Some(w), Some(h), _) if w > 0 && h > 0 => (w, h),
+            (_, _, Some(n)) => n,
+            _ => (914_400, 914_400),
+        };
+        Ok(Some(Drawing {
+            anchor: None,
+            cx,
+            cy,
+            name: "Picture".into(),
+            descr: None,
+            kind: DrawingKind::Picture {
+                media,
+                crop: Crop::default(),
+            },
+        }))
+    }
+
+    // ---- tables ----
+
+    fn table(&mut self, n: &Node) -> Result<Table> {
+        let mut t = Table {
+            props: n.child("w:tblPr").map(table_props).unwrap_or_default(),
+            ..Table::default()
+        };
+        if let Some(g) = n.child("w:tblGrid") {
+            t.grid = g
+                .all("w:gridCol")
+                .map(|c| c.attr("w:w").and_then(|v| v.parse().ok()).unwrap_or(0))
+                .collect();
+        }
+        for r in n.all("w:tr") {
+            let mut row = Row::default();
+            if let Some(p) = r.child("w:trPr") {
+                row_props(p, &mut row.props);
+            }
+            for c in r.all("w:tc") {
+                self.b.cell()?;
+                let mut cell = Cell::default();
+                // A horizontally merged cell continues the one before it:
+                // its content is dropped.
+                let mut continues = false;
+                if let Some(p) = c.child("w:tcPr") {
+                    cell.props = cell_props(p);
+                    continues = p
+                        .child("w:hmerge")
+                        .is_some_and(|m| m.attr("w:val") == Some("continue"));
+                }
+                if continues && let Some(prev) = row.cells.last_mut() {
+                    prev.props.grid_span += cell.props.grid_span;
+                    continue;
+                }
+                self.depth += 1;
+                let r = self.body(c, &mut cell.content);
+                self.depth -= 1;
+                r?;
+                row.cells.push(cell);
+            }
+            t.rows.push(row);
+        }
+        if t.grid.is_empty() {
+            let n = t
+                .rows
+                .iter()
+                .map(|r| {
+                    r.cells
+                        .iter()
+                        .map(|c| c.props.grid_span as usize)
+                        .sum::<usize>()
+                })
+                .max()
+                .unwrap_or(1);
+            t.grid = vec![9000 / n.max(1) as i32; n.max(1)];
+        }
+        Ok(t)
+    }
+}
diff --git a/crates/exav-render/src/formats/office/docs/wml/props.rs b/crates/exav-render/src/formats/office/docs/wml/props.rs
new file mode 100644
index 00000000..ee1b3677
--- /dev/null
+++ b/crates/exav-render/src/formats/office/docs/wml/props.rs
@@ -0,0 +1,424 @@
+//! Property elements of Word 2003 XML: character, paragraph, table, row and
+//! cell properties.
+
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::docs::model::*;
+
+/// An on/off value: absent or on, true, 1 is on.
+pub fn is_on(v: Option<&str>) -> bool {
+    !matches!(v, Some("off" | "false" | "0" | "none"))
+}
+
+fn val(n: &Node) -> Option<&str> {
+    n.attr("w:val")
+}
+
+fn int(n: &Node, k: &str) -> Option<i32> {
+    n.attr(k).and_then(|v| v.trim().parse::<i32>().ok())
+}
+
+fn color(v: &str) -> Color {
+    let h = v.trim().trim_start_matches('#');
+    if h.len() == 6
+        && let Ok(c) = u32::from_str_radix(h, 16)
+    {
+        return Color::Rgb(c);
+    }
+    Color::Auto
+}
+
+fn border(n: &Node) -> Option<Border> {
+    let style = match val(n)? {
+        "nil" | "none" => return None,
+        "double" => "double",
+        "dotted" => "dotted",
+        "dashed" => "dashed",
+        "dot-dash" => "dotDash",
+        "dot-dot-dash" => "dotDotDash",
+        "triple" => "triple",
+        "thick" => "thick",
+        "wave" => "wave",
+        "thin-thick-small-gap" => "thinThickSmallGap",
+        "thick-thin-small-gap" => "thickThinSmallGap",
+        "inset" => "inset",
+        "outset" => "outset",
+        _ => "single",
+    };
+    Some(Border {
+        style,
+        size: int(n, "w:sz").unwrap_or(4).clamp(2, 96) as u32,
+        space: int(n, "w:space").unwrap_or(0).clamp(0, 31) as u32,
+        color: n.attr("w:color").map(color).unwrap_or(Color::Auto),
+        shadow: n.attr("w:shadow").is_some_and(|s| is_on(Some(s))),
+    })
+}
+
+fn shading(n: &Node) -> Option<Shading> {
+    let fill = n.attr("w:fill").map(color);
+    let fore = n.attr("w:color").map(color);
+    let pat = n.attr("w:val").unwrap_or("clear");
+    match (pat, fill, fore) {
+        ("clear" | "nil", Some(f), _) if f != Color::Auto => Some(Shading::fill(f)),
+        ("solid", _, Some(c)) if c != Color::Auto => Some(Shading::fill(c)),
+        (p, f, c) if p.starts_with("percent-") || p.starts_with("pct") => {
+            let pct: f64 = p
+                .trim_start_matches("percent-")
+                .trim_start_matches("pct")
+                .parse()
+                .unwrap_or(50.0);
+            let rgb = |c: Option<Color>, auto: u32| match c {
+                Some(Color::Rgb(v)) => v,
+                _ => auto,
+            };
+            let (fv, bv) = (rgb(c, 0), rgb(f, 0xFFFFFF));
+            let mix = |s: u32| {
+                let (x, y) = (f64::from((fv >> s) & 0xFF), f64::from((bv >> s) & 0xFF));
+                (x * pct / 100.0 + y * (1.0 - pct / 100.0)).round() as u32
+            };
+            Some(Shading::fill(Color::Rgb(
+                mix(16) << 16 | mix(8) << 8 | mix(0),
+            )))
+        }
+        _ => None,
+    }
+}
+
+fn underline(v: &str) -> &'static str {
+    match v {
+        "none" => "none",
+        "double" => "double",
+        "words" => "words",
+        "dotted" => "dotted",
+        "thick" => "thick",
+        "dash" => "dash",
+        "dot-dash" => "dotDash",
+        "dot-dot-dash" => "dotDotDash",
+        "wave" => "wave",
+        _ => "single",
+    }
+}
+
+fn highlight(v: &str) -> Option<&'static str> {
+    Some(match v {
+        "black" => "black",
+        "blue" => "blue",
+        "cyan" => "cyan",
+        "green" => "green",
+        "magenta" => "magenta",
+        "red" => "red",
+        "yellow" => "yellow",
+        "white" => "white",
+        "dark-blue" => "darkBlue",
+        "dark-cyan" => "darkCyan",
+        "dark-green" => "darkGreen",
+        "dark-magenta" => "darkMagenta",
+        "dark-red" => "darkRed",
+        "dark-yellow" => "darkYellow",
+        "dark-gray" => "darkGray",
+        "light-gray" => "lightGray",
+        "none" => "none",
+        _ => return None,
+    })
+}
+
+pub fn run_props(n: &Node) -> RunProps {
+    let mut r = RunProps::default();
+    for c in n.nodes() {
+        let on = || Some(is_on(val(c)));
+        match c.name.as_str() {
+            "w:rStyle" => r.style = val(c).map(str::to_string),
+            "w:rFonts" => {
+                r.fonts.ascii = c.attr("w:ascii").map(str::to_string);
+                r.fonts.hansi = c.attr("w:h-ansi").or(c.attr("w:ascii")).map(str::to_string);
+                r.fonts.east_asia = c.attr("w:fareast").map(str::to_string);
+                r.fonts.cs = c.attr("w:cs").map(str::to_string);
+            }
+            "w:b" => r.bold = on(),
+            "w:b-cs" => r.bold_cs = on(),
+            "w:i" => r.italic = on(),
+            "w:i-cs" => r.italic_cs = on(),
+            "w:caps" => r.caps = on(),
+            "w:smallCaps" => r.small_caps = on(),
+            "w:strike" => r.strike = on(),
+            "w:dstrike" => r.dstrike = on(),
+            "w:outline" => r.outline = on(),
+            "w:shadow" => r.shadow = on(),
+            "w:emboss" => r.emboss = on(),
+            "w:imprint" => r.imprint = on(),
+            "w:vanish" => r.vanish = on(),
+            "w:color" => r.color = val(c).map(color),
+            "w:spacing" => r.spacing = int(c, "w:val"),
+            "w:w" => r.scale = int(c, "w:val").map(|v| v.clamp(1, 600) as u32),
+            "w:kern" => r.kerning = int(c, "w:val").map(|v| v.max(0) as u32),
+            "w:position" => r.position = int(c, "w:val"),
+            "w:sz" => r.size = int(c, "w:val").map(|v| v.clamp(1, 3277) as u32),
+            "w:sz-cs" => r.size_cs = int(c, "w:val").map(|v| v.clamp(1, 3277) as u32),
+            "w:highlight" => r.highlight = val(c).and_then(highlight),
+            "w:u" => {
+                r.underline = Some(underline(val(c).unwrap_or("single")));
+                r.underline_color = c.attr("w:color").map(color);
+            }
+            "w:bdr" => r.border = border(c),
+            "w:shd" => r.shading = shading(c),
+            "w:vertAlign" => {
+                r.vert_align = match val(c) {
+                    Some("superscript") => Some(VertAlign::Superscript),
+                    Some("subscript") => Some(VertAlign::Subscript),
+                    _ => Some(VertAlign::Baseline),
+                }
+            }
+            "w:rtl" => r.rtl = on(),
+            "w:lang" => {
+                r.lang = val(c).map(str::to_string);
+                r.lang_east_asia = c.attr("w:fareast").map(str::to_string);
+                r.lang_bidi = c.attr("w:bidi").map(str::to_string);
+            }
+            _ => {}
+        }
+    }
+    r
+}
+
+pub fn para_props(n: &Node) -> ParaProps {
+    let mut p = ParaProps::default();
+    for c in n.nodes() {
+        let on = || Some(is_on(val(c)));
+        match c.name.as_str() {
+            "w:pStyle" => p.style = val(c).map(str::to_string),
+            "w:keepNext" => p.keep_next = on(),
+            "w:keepLines" => p.keep_lines = on(),
+            "w:pageBreakBefore" => p.page_break_before = on(),
+            "w:widowControl" => p.widow_control = on(),
+            "w:suppressLineNumbers" => p.suppress_line_numbers = on(),
+            "w:bidi" => p.bidi = on(),
+            "w:contextualSpacing" => p.contextual_spacing = on(),
+            "w:listPr" => {
+                if let Some(l) = c.child("w:ilvl").and_then(|n| int(n, "w:val")) {
+                    p.num_level = Some(l.clamp(0, 8) as u32);
+                }
+                if let Some(l) = c.child("w:ilfo").and_then(|n| int(n, "w:val")) {
+                    p.num_id = Some(l.max(0) as u32);
+                }
+            }
+            "w:pBdr" => {
+                for b in c.nodes() {
+                    let v = border(b);
+                    match b.name.as_str() {
+                        "w:top" => p.borders.top = v,
+                        "w:left" => p.borders.left = v,
+                        "w:bottom" => p.borders.bottom = v,
+                        "w:right" => p.borders.right = v,
+                        "w:between" => p.borders.between = v,
+                        _ => {}
+                    }
+                }
+            }
+            "w:shd" => p.shading = shading(c),
+            "w:tabs" => {
+                for t in c.all("w:tab") {
+                    let Some(pos) = int(t, "w:pos") else { continue };
+                    p.tabs.push(Tab {
+                        pos,
+                        kind: match t.attr("w:val") {
+                            Some("center") => TabKind::Center,
+                            Some("right") => TabKind::Right,
+                            Some("decimal") => TabKind::Decimal,
+                            Some("bar") => TabKind::Bar,
+                            Some("clear") => TabKind::Clear,
+                            _ => TabKind::Left,
+                        },
+                        leader: match t.attr("w:leader") {
+                            Some("dot") => TabLeader::Dot,
+                            Some("hyphen") => TabLeader::Hyphen,
+                            Some("underscore") => TabLeader::Underscore,
+                            Some("heavy") => TabLeader::Heavy,
+                            Some("middle-dot") => TabLeader::MiddleDot,
+                            _ => TabLeader::None,
+                        },
+                    });
+                }
+            }
+            "w:spacing" => {
+                p.space_before = int(c, "w:before");
+                p.space_after = int(c, "w:after");
+                if let Some(l) = int(c, "w:line") {
+                    p.line = Some(l);
+                    p.line_rule = Some(match c.attr("w:line-rule") {
+                        Some("exact") => LineRule::Exact,
+                        Some("at-least") => LineRule::AtLeast,
+                        _ => LineRule::Auto,
+                    });
+                }
+            }
+            "w:ind" => {
+                p.ind_left = int(c, "w:left");
+                p.ind_right = int(c, "w:right");
+                if let Some(h) = int(c, "w:hanging") {
+                    p.ind_hanging = Some(h);
+                } else {
+                    p.ind_first_line = int(c, "w:first-line");
+                }
+            }
+            "w:jc" => {
+                p.jc = match val(c) {
+                    Some("center") => Some(Jc::Center),
+                    Some("right") => Some(Jc::Right),
+                    Some("both") => Some(Jc::Both),
+                    Some("distribute") => Some(Jc::Distribute),
+                    _ => Some(Jc::Left),
+                }
+            }
+            "w:outlineLvl" => p.outline_level = int(c, "w:val").map(|v| v.clamp(0, 9) as u32),
+            _ => {}
+        }
+    }
+    p
+}
+
+fn width(n: &Node) -> Option<Width> {
+    let w = int(n, "w:w")?;
+    Some(match n.attr("w:type") {
+        Some("pct") => Width::Pct(w),
+        Some("auto") => Width::Auto,
+        _ => Width::Twips(w),
+    })
+}
+
+fn margins(n: &Node) -> Margins {
+    let mut m = Margins::default();
+    for c in n.nodes() {
+        let v = int(c, "w:w");
+        match c.name.as_str() {
+            "w:top" => m.top = v,
+            "w:left" => m.left = v,
+            "w:bottom" => m.bottom = v,
+            "w:right" => m.right = v,
+            _ => {}
+        }
+    }
+    m
+}
+
+fn borders(n: &Node) -> TableBorders {
+    let mut b = TableBorders::default();
+    for c in n.nodes() {
+        let v = border(c);
+        match c.name.as_str() {
+            "w:top" => b.top = v,
+            "w:left" => b.left = v,
+            "w:bottom" => b.bottom = v,
+            "w:right" => b.right = v,
+            "w:insideH" => b.inside_h = v,
+            "w:insideV" => b.inside_v = v,
+            _ => {}
+        }
+    }
+    b
+}
+
+pub fn table_props(n: &Node) -> TableProps {
+    let mut t = TableProps::default();
+    for c in n.nodes() {
+        match c.name.as_str() {
+            "w:tblStyle" => t.style = val(c).map(str::to_string),
+            "w:tblW" => t.width = width(c),
+            "w:jc" => {
+                t.jc = match val(c) {
+                    Some("center") => Some(Jc::Center),
+                    Some("right") => Some(Jc::Right),
+                    _ => None,
+                }
+            }
+            "w:tblInd" => t.indent = int(c, "w:w"),
+            "w:tblBorders" => t.borders = borders(c),
+            "w:shd" => t.shading = shading(c),
+            "w:tblCellMar" => t.cell_margins = margins(c),
+            "w:tblLayout" => t.fixed_layout = c.attr("w:type") == Some("fixed"),
+            "w:bidiVisual" => t.bidi = is_on(val(c)),
+            _ => {}
+        }
+    }
+    t
+}
+
+pub fn row_props(n: &Node, r: &mut RowProps) {
+    for c in n.nodes() {
+        match c.name.as_str() {
+            "w:trHeight" => {
+                r.height = int(c, "w:val");
+                r.height_exact = c.attr("w:h-rule") == Some("exact");
+            }
+            "w:cantSplit" => r.cant_split = is_on(val(c)),
+            "w:tblHeader" => r.header = is_on(val(c)),
+            "w:jc" => {
+                r.jc = match val(c) {
+                    Some("center") => Some(Jc::Center),
+                    Some("right") => Some(Jc::Right),
+                    _ => None,
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+pub fn cell_props(n: &Node) -> CellProps {
+    let mut p = CellProps::default();
+    for c in n.nodes() {
+        match c.name.as_str() {
+            "w:tcW" => p.width = width(c),
+            "w:gridSpan" => p.grid_span = int(c, "w:val").unwrap_or(1).clamp(1, 63) as u32,
+            "w:vmerge" => {
+                p.v_merge = if val(c) == Some("restart") {
+                    VMerge::Restart
+                } else {
+                    VMerge::Continue
+                }
+            }
+            "w:tcBorders" => p.borders = borders(c),
+            "w:shd" => p.shading = shading(c),
+            "w:noWrap" => p.no_wrap = is_on(val(c)),
+            "w:tcMar" => p.margins = margins(c),
+            "w:vAlign" => {
+                p.v_align = match val(c) {
+                    Some("center") => Some(VAlign::Center),
+                    Some("bottom") => Some(VAlign::Bottom),
+                    _ => Some(VAlign::Top),
+                }
+            }
+            _ => {}
+        }
+    }
+    p
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::common::xml::{parse, within};
+
+    const NS: &str = "xmlns:w=\"http://schemas.microsoft.com/office/word/2003/wordml\"";
+
+    #[test]
+    fn run_and_paragraph_properties() {
+        let x = format!(
+            "<w:rPr {NS}><w:b/><w:i w:val=\"off\"/><w:rFonts w:ascii=\"Arial\" w:h-ansi=\"Arial\"/><w:color w:val=\"FF0000\"/><w:sz w:val=\"28\"/><w:u w:val=\"double\"/></w:rPr>"
+        );
+        let r = run_props(&parse(x.as_bytes(), &mut within(1 << 20)).unwrap());
+        assert_eq!((r.bold, r.italic), (Some(true), Some(false)));
+        assert_eq!(r.fonts.ascii.as_deref(), Some("Arial"));
+        assert_eq!(r.color, Some(Color::Rgb(0xFF0000)));
+        assert_eq!((r.size, r.underline), (Some(28), Some("double")));
+        let x = format!(
+            "<w:pPr {NS}><w:jc w:val=\"center\"/><w:ind w:left=\"720\" w:hanging=\"360\"/><w:spacing w:before=\"120\" w:line=\"240\" w:line-rule=\"exact\"/><w:listPr><w:ilvl w:val=\"1\"/><w:ilfo w:val=\"3\"/></w:listPr></w:pPr>"
+        );
+        let p = para_props(&parse(x.as_bytes(), &mut within(1 << 20)).unwrap());
+        assert_eq!(p.jc, Some(Jc::Center));
+        assert_eq!((p.ind_left, p.ind_hanging), (Some(720), Some(360)));
+        assert_eq!(
+            (p.space_before, p.line_rule),
+            (Some(120), Some(LineRule::Exact))
+        );
+        assert_eq!((p.num_id, p.num_level), (Some(3), Some(1)));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/mod.rs b/crates/exav-render/src/formats/office/mod.rs
new file mode 100644
index 00000000..c7545405
--- /dev/null
+++ b/crates/exav-render/src/formats/office/mod.rs
@@ -0,0 +1,41 @@
+//! Office documents converted to the Open XML packages an Open XML renderer
+//! draws: spreadsheets to XLSX ([`sheets`]), presentations to PPTX
+//! ([`slides`]) and text documents to DOCX ([`docs`]).
+//!
+//! `common` is what the three share, and is not public. [`text`] is the text
+//! each reads from a document, for a scanner or a search (see
+//! [`crate::text`]).
+
+#[cfg(feature = "_office")]
+pub(crate) mod common;
+#[cfg(feature = "office-docs")]
+pub mod docs;
+#[cfg(feature = "office-sheets")]
+pub mod sheets;
+// Presentations write their ODF charts with the spreadsheets' chart writer;
+// without `office-sheets` the module is private and most of it unused.
+#[cfg(all(feature = "office-slides", not(feature = "office-sheets")))]
+#[allow(dead_code)]
+mod sheets;
+#[cfg(feature = "office-slides")]
+pub mod slides;
+#[cfg(any(
+    feature = "office-sheets",
+    feature = "office-slides",
+    feature = "office-docs"
+))]
+pub mod text;
+#[cfg(feature = "text-office")]
+pub mod visible;
+
+/// What the tests of the converters need from `common`, which they cannot
+/// reach: writers of compound files, packages, protobuf messages and Snappy
+/// blocks.
+#[cfg(feature = "office-test-util")]
+#[doc(hidden)]
+pub mod test_util {
+    pub use super::common::iwa::proto::write::W;
+    pub use super::common::iwa::snappy::literal_block;
+    pub use super::common::package::{PackageWriter, Zip};
+    pub use exav_unpack::cfb::{Compound, build as build_cfb};
+}
diff --git a/crates/exav-render/src/formats/office/sheets/charts.rs b/crates/exav-render/src/formats/office/sheets/charts.rs
new file mode 100644
index 00000000..d56dafd3
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/charts.rs
@@ -0,0 +1,184 @@
+//! Chart caches: the values of the cells a series refers to, written beside
+//! the reference as XLSX readers draw from them.
+
+use crate::formats::office::sheets::model::*;
+
+/// "Sheet1!$A$1:$B$3", "'My sheet'!A1" or "A1:B3" to (sheet, range).
+pub(crate) fn parse_ref(f: &str) -> Option<(Option<String>, Range)> {
+    let f = f.trim().trim_start_matches('=');
+    let (sheet, area) = match f.rfind('!') {
+        Some(i) => {
+            let s = &f[..i];
+            let s = match s.strip_prefix('\'').and_then(|x| x.strip_suffix('\'')) {
+                Some(q) => q.replace("''", "'"),
+                None => s.to_string(),
+            };
+            if s.starts_with('[') {
+                return None;
+            }
+            (Some(s), &f[i + 1..])
+        }
+        None => (None, f),
+    };
+    let mut parts = area.split(':');
+    let a = parse_cell(parts.next()?)?;
+    let b = match parts.next() {
+        Some(p) => parse_cell(p)?,
+        None => a,
+    };
+    if parts.next().is_some() {
+        return None;
+    }
+    Some((
+        sheet,
+        Range {
+            r1: a.0.min(b.0),
+            c1: a.1.min(b.1),
+            r2: a.0.max(b.0),
+            c2: a.1.max(b.1),
+        },
+    ))
+}
+
+/// What a cached value takes written as XML, beside its text: the point, its
+/// index and its value element.
+pub(crate) const XML_PER_POINT: usize = 48;
+
+fn values(wb: &Workbook, here: usize, f: &str) -> Option<Vec<Value>> {
+    let (sheet, r) = parse_ref(f)?;
+    if r.area() > 100_000 {
+        return None;
+    }
+    let sh = match sheet {
+        Some(n) => wb.sheets.iter().find(|s| s.name.eq_ignore_ascii_case(&n))?,
+        None => wb.sheets.get(here)?,
+    };
+    let mut out = Vec::with_capacity(r.area() as usize);
+    for row in r.r1..=r.r2 {
+        for col in r.c1..=r.c2 {
+            out.push(
+                sh.cells
+                    .get(&(row, col))
+                    .map_or(Value::Empty, |c| c.value.clone()),
+            );
+        }
+    }
+    Some(out)
+}
+
+fn nums(v: Vec<Value>) -> Vec<Option<f64>> {
+    v.into_iter()
+        .map(|v| {
+            if let Value::Number(n) = v {
+                Some(n)
+            } else {
+                None
+            }
+        })
+        .collect()
+}
+
+/// Fills the caches of every series that has a reference and no values. Each
+/// series gets a copy of the cells it refers to, however many series refer to
+/// the same ones: what the copies take is told to `charge`, and `false` comes
+/// back when it refuses.
+pub(crate) fn fill(wb: &mut Workbook, charge: &mut dyn FnMut(u64) -> bool) -> bool {
+    let mut updates: Vec<(usize, usize, usize, ChartSeries)> = vec![];
+    for (si, sh) in wb.sheets.iter().enumerate() {
+        for (ci, ch) in sh.charts.iter().enumerate() {
+            for (k, s) in ch.series.iter().enumerate() {
+                let mut s = s.clone();
+                let mut changed = false;
+                let mut held = 0usize;
+                // Values written out as XML, which is `XML_PER_POINT` a point
+                // and the text of each.
+                let mut points = 0usize;
+                let mut text = 0usize;
+                if s.vals.is_empty()
+                    && let Some(v) = s.val_ref.as_deref().and_then(|f| values(wb, si, f))
+                {
+                    s.vals = nums(v);
+                    held += s.vals.len() * size_of::<Option<f64>>();
+                    points += s.vals.len();
+                    changed = true;
+                }
+                if s.sizes.is_empty()
+                    && let Some(v) = s.size_ref.as_deref().and_then(|f| values(wb, si, f))
+                {
+                    s.sizes = nums(v);
+                    held += s.sizes.len() * size_of::<Option<f64>>();
+                    points += s.sizes.len();
+                    changed = true;
+                }
+                let empty_cats =
+                    s.cats.is_empty() && s.cat_nums.as_ref().is_none_or(|c| c.is_empty());
+                if empty_cats && let Some(v) = s.cat_ref.as_deref().and_then(|f| values(wb, si, f))
+                {
+                    let numeric = matches!(ch.kind, ChartKind::Scatter | ChartKind::Bubble)
+                        || s.cat_nums.is_some();
+                    if numeric {
+                        let n = nums(v);
+                        held += n.len() * size_of::<Option<f64>>();
+                        points += n.len();
+                        s.cat_nums = Some(n);
+                    } else {
+                        s.cats = v.into_iter().map(|x| x.display()).collect();
+                        held += s
+                            .cats
+                            .iter()
+                            .map(|c| size_of::<String>() + c.len())
+                            .sum::<usize>();
+                        points += s.cats.len();
+                        text += s.cats.iter().map(String::len).sum::<usize>();
+                    }
+                    changed = true;
+                }
+                if s.name.is_none()
+                    && let Some(v) = s.name_ref.as_deref().and_then(|f| values(wb, si, f))
+                {
+                    let name = v.iter().map(Value::display).collect::<Vec<_>>().join(" ");
+                    held += name.len();
+                    s.name = Some(name);
+                    changed = true;
+                }
+                if changed {
+                    if !charge((held + points * XML_PER_POINT + text) as u64) {
+                        return false;
+                    }
+                    updates.push((si, ci, k, s));
+                }
+            }
+        }
+    }
+    for (si, ci, k, s) in updates {
+        wb.sheets[si].charts[ci].series[k] = s;
+    }
+    true
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn references() {
+        assert_eq!(
+            parse_ref("Sheet1!$B$2:$B$5"),
+            Some((
+                Some("Sheet1".into()),
+                Range {
+                    r1: 1,
+                    c1: 1,
+                    r2: 4,
+                    c2: 1
+                }
+            ))
+        );
+        assert_eq!(
+            parse_ref("'It''s'!A1"),
+            Some((Some("It's".into()), Range::cell(0, 0)))
+        );
+        assert_eq!(parse_ref("[1]S!A1"), None);
+        assert_eq!(parse_ref("(A1,B2)"), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/css.rs b/crates/exav-render/src/formats/office/sheets/css.rs
new file mode 100644
index 00000000..e4220faf
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/css.rs
@@ -0,0 +1,105 @@
+//! CSS as a spreadsheet reads it: the colours, lengths and declarations of
+//! `common::css`, and a border shorthand as an XLSX edge.
+
+pub use crate::formats::office::common::css::{color, declarations, length_pt};
+use crate::formats::office::sheets::model::Edge;
+
+/// A border shorthand (`.5pt solid windowtext`, `1px dashed #000`) as an
+/// XLSX edge.
+pub fn border(s: &str) -> Edge {
+    let mut width = None;
+    let mut style = None;
+    let mut rgb = None;
+    for t in s.split_whitespace() {
+        let l = t.to_ascii_lowercase();
+        match l.as_str() {
+            "none" | "hidden" => return Edge::default(),
+            "solid" | "dashed" | "dotted" | "double" | "groove" | "ridge" | "inset" | "outset"
+            | "hairline" | "dot-dash" | "dot-dot-dash" | "dot-dash-slanted" => style = Some(l),
+            "thin" => width = Some(0.75),
+            "medium" => width = Some(1.5),
+            "thick" => width = Some(2.25),
+            _ => {
+                if let Some(w) = length_pt(&l, "px") {
+                    width = Some(w);
+                } else if let Some(c) = color(&l) {
+                    rgb = c;
+                }
+            }
+        }
+    }
+    let Some(style) = style else {
+        return Edge::default();
+    };
+    let w = width.unwrap_or(0.75);
+    if w <= 0.0 {
+        return Edge::default();
+    }
+    // Excel writes its thin lines .5pt wide, medium 1pt and thick 1.5pt; a
+    // browser's 1px is .75pt.
+    let wide = w >= 1.0;
+    let name = match style.as_str() {
+        "double" => "double",
+        "hairline" => "hair",
+        "dashed" if wide => "mediumDashed",
+        "dashed" => "dashed",
+        "dotted" => "dotted",
+        "dot-dash" if wide => "mediumDashDot",
+        "dot-dash" => "dashDot",
+        "dot-dot-dash" if wide => "mediumDashDotDot",
+        "dot-dot-dash" => "dashDotDot",
+        "dot-dash-slanted" => "slantDashDot",
+        _ if w < 1.0 => "thin",
+        _ if w < 1.5 => "medium",
+        _ => "thick",
+    };
+    Edge {
+        style: Some(name),
+        color: rgb.filter(|&c| c != 0),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn borders() {
+        assert_eq!(
+            border(".5pt solid windowtext"),
+            Edge {
+                style: Some("thin"),
+                color: None
+            }
+        );
+        assert_eq!(
+            border("1.0pt solid windowtext"),
+            Edge {
+                style: Some("medium"),
+                color: None
+            }
+        );
+        assert_eq!(
+            border(".5pt hairline windowtext"),
+            Edge {
+                style: Some("hair"),
+                color: None
+            }
+        );
+        assert_eq!(
+            border(".5pt dashed #FF0000"),
+            Edge {
+                style: Some("dashed"),
+                color: Some(0xFF0000)
+            }
+        );
+        assert_eq!(
+            border("2pt double black"),
+            Edge {
+                style: Some("double"),
+                color: None
+            }
+        );
+        assert_eq!(border("none"), Edge::default());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/error.rs b/crates/exav-render/src/formats/office/sheets/error.rs
new file mode 100644
index 00000000..e358b30a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/error.rs
@@ -0,0 +1,59 @@
+use std::fmt;
+
+/// Why a document was not converted.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum Error {
+    /// The bytes are not a document of the format asked for.
+    NotFormat(String),
+    /// Encrypted with a password other than the default one, or with a
+    /// method this reader does not have.
+    Encrypted,
+    /// A valid document of a version or kind this reader does not convert.
+    Unsupported(String),
+    /// Past one of the [`Limits`](crate::formats::office::sheets::Limits): what it was.
+    TooLarge(&'static str),
+    /// Damaged beyond what this reader recovers from.
+    Malformed(String),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotFormat(why) => write!(f, "not a document of this format: {why}"),
+            Error::Encrypted => f.write_str("encrypted with a password"),
+            Error::Unsupported(what) => write!(f, "unsupported: {what}"),
+            Error::TooLarge(what) => write!(f, "too large: {what}"),
+            Error::Malformed(why) => write!(f, "damaged: {why}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl Error {
+    /// A short machine-readable kind: `not-format`, `encrypted`,
+    /// `unsupported`, `too-large` or `malformed`.
+    pub fn kind(&self) -> &'static str {
+        match self {
+            Error::NotFormat(_) => "not-format",
+            Error::Encrypted => "encrypted",
+            Error::Unsupported(_) => "unsupported",
+            Error::TooLarge(_) => "too-large",
+            Error::Malformed(_) => "malformed",
+        }
+    }
+}
+
+impl From<crate::formats::office::common::xml::Error> for Error {
+    fn from(e: crate::formats::office::common::xml::Error) -> Self {
+        use crate::formats::office::common::xml::Error as X;
+        match e {
+            X::Malformed(why) => Error::Malformed(format!("XML: {why}")),
+            X::TooLarge(what) => Error::TooLarge(what),
+            X::NotFormat(why) => Error::NotFormat(why),
+        }
+    }
+}
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
diff --git a/crates/exav-render/src/formats/office/sheets/fonts.rs b/crates/exav-render/src/formats/office/sheets/fonts.rs
new file mode 100644
index 00000000..6ca17d08
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/fonts.rs
@@ -0,0 +1,27 @@
+//! Font metrics: the width of the digits, which column widths are counted
+//! in. Measured from the metric-compatible fonts (Liberation 2.1, Carlito,
+//! Caladea, DejaVu Sans), which are data, not code.
+
+/// Advance of the digit '0', in em.
+fn digit_em(family: &str) -> f64 {
+    let f = family.to_ascii_lowercase();
+    if f.contains("dejavu") || f.contains("verdana") || f.contains("bitstream vera") {
+        0.63623
+    } else if f.starts_with("times") || f.contains("liberation serif") || f.contains("thorndale") {
+        0.5
+    } else if f.starts_with("courier") || f.contains("liberation mono") || f.contains("cumberland")
+    {
+        0.6001
+    } else if f.starts_with("calibri") || f.starts_with("carlito") {
+        0.50684
+    } else if f.starts_with("cambria") || f.starts_with("caladea") {
+        0.554
+    } else {
+        0.55615
+    }
+}
+
+/// Width of '0' in twips, truncated.
+pub fn digit_twips(family: &str, size_pt: f64) -> f64 {
+    (digit_em(family) * size_pt * 20.0).trunc().max(1.0)
+}
diff --git a/crates/exav-render/src/formats/office/sheets/geom.rs b/crates/exav-render/src/formats/office/sheets/geom.rs
new file mode 100644
index 00000000..191c054a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/geom.rs
@@ -0,0 +1,122 @@
+//! Where cells are on the sheet, in pixels at 96 dpi as an XLSX reader lays
+//! them out: for anchors given in absolute positions (ODS frames, grouped
+//! shapes) and for the absolute positions DrawingML shapes repeat.
+
+use crate::formats::office::sheets::model::*;
+
+pub const EMU_PER_PX: f64 = 9525.0;
+
+/// Column width in characters to pixels, for a maximum digit width of 7
+/// pixels (ECMA-376 part 1, 18.3.1.13).
+pub fn chars_to_px(w: f64) -> f64 {
+    ((256.0 * w + (128.0f64 / 7.0).trunc()) / 256.0 * 7.0)
+        .trunc()
+        .max(0.0)
+}
+
+pub fn col_px(sh: &Sheet, col: u32) -> f64 {
+    match sh.col_info(col) {
+        Some(c) if c.hidden => 0.0,
+        Some(c) => chars_to_px(c.width.or(sh.default_col_width).unwrap_or(8.43)),
+        None => chars_to_px(sh.default_col_width.unwrap_or(8.43)),
+    }
+}
+
+pub fn row_px(sh: &Sheet, row: u32) -> f64 {
+    match sh.rows.get(&row) {
+        Some(r) if r.hidden => 0.0,
+        Some(r) => r.height.unwrap_or(sh.default_row_height) * 96.0 / 72.0,
+        None => sh.default_row_height * 96.0 / 72.0,
+    }
+}
+
+/// Left and top edges of columns and rows, in pixels, up to a bound.
+pub struct Grid {
+    left: Vec<f64>,
+    top: Vec<f64>,
+}
+
+impl Grid {
+    /// Edges up to column `mc` and row `mr` (clipped to the sheet).
+    pub fn new(sh: &Sheet, mc: u32, mr: u32) -> Grid {
+        let mc = mc.min(MAX_COL) + 1;
+        let mr = mr.min(MAX_ROW) + 1;
+        let mut left = Vec::with_capacity(mc as usize + 1);
+        let mut x = 0.0;
+        for c in 0..=mc {
+            left.push(x);
+            x += col_px(sh, c);
+        }
+        let mut top = Vec::with_capacity(mr as usize + 1);
+        let mut y = 0.0;
+        let default = sh.default_row_height * 96.0 / 72.0;
+        let mut it = sh.rows.range(..=mr).peekable();
+        for r in 0..=mr {
+            top.push(y);
+            y += match it.peek() {
+                Some(&(&k, _)) if k == r => {
+                    it.next();
+                    row_px(sh, r)
+                }
+                _ => default,
+            };
+        }
+        Grid { left, top }
+    }
+
+    /// Edges covering the anchors.
+    pub fn for_anchors(sh: &Sheet, anchors: impl Iterator<Item = Anchor>) -> Grid {
+        let (mut mc, mut mr) = (0u32, 0u32);
+        for a in anchors {
+            mc = mc.max(a.from.0).max(a.to.0);
+            mr = mr.max(a.from.1).max(a.to.1);
+        }
+        Grid::new(sh, mc, mr)
+    }
+
+    pub fn x(&self, sh: &Sheet, col: u32, frac: i64) -> f64 {
+        let c = col.min(self.left.len() as u32 - 1);
+        self.left[c as usize] + frac as f64 / 1e6 * col_px(sh, c)
+    }
+
+    pub fn y(&self, sh: &Sheet, row: u32, frac: i64) -> f64 {
+        let r = row.min(self.top.len() as u32 - 1);
+        self.top[r as usize] + frac as f64 / 1e6 * row_px(sh, r)
+    }
+
+    /// The cell holding pixel position (x, y), and the offsets in it.
+    pub fn locate(&self, sh: &Sheet, x: f64, y: f64) -> (u32, u32, i64, i64) {
+        let c = self
+            .left
+            .partition_point(|&l| l <= x)
+            .saturating_sub(1)
+            .min(self.left.len() - 2);
+        let r = self
+            .top
+            .partition_point(|&t| t <= y)
+            .saturating_sub(1)
+            .min(self.top.len() - 2);
+        let frac = |off: f64, size: f64| {
+            if size > 0.0 {
+                ((off / size) * 1e6).clamp(0.0, 1e6) as i64
+            } else {
+                0
+            }
+        };
+        let (c, r) = (c as u32, r as u32);
+        (
+            c,
+            r,
+            frac(x - self.left[c as usize], col_px(sh, c)),
+            frac(y - self.top[r as usize], row_px(sh, r)),
+        )
+    }
+
+    /// The anchor of a rectangle in pixels.
+    pub fn anchor(&self, sh: &Sheet, x0: f64, y0: f64, x1: f64, y1: f64) -> Anchor {
+        Anchor {
+            from: self.locate(sh, x0.min(x1), y0.min(y1)),
+            to: self.locate(sh, x0.max(x1), y0.max(y1)),
+        }
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/html.rs b/crates/exav-render/src/formats/office/sheets/html.rs
new file mode 100644
index 00000000..b6e8151d
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/html.rs
@@ -0,0 +1,1566 @@
+//! HTML tables, as Excel saves a worksheet "as Web Page" (Microsoft Office
+//! HTML and XML Reference, Office 2000) and as other programs export
+//! spreadsheets: each table's cells, with Excel's `x:num`, `x:str`,
+//! `x:bool`, `x:err` and `x:fmla` attributes, the `mso-` CSS properties
+//! and the CSS of `<style>` blocks and `style` attributes, `colspan` and
+//! `rowspan` as merges, `<col>` widths and `<tr>` heights.
+//!
+//! Data only: scripts, frames, images and links to other files are not
+//! followed; nothing is fetched. The tokens are those of
+//! `exav_unpack::html`, charged to the budget as they are made; the nesting
+//! and the text of a cell are bounded here.
+
+use crate::formats::office::common::css::Sheet;
+use crate::formats::office::sheets::css;
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use exav_unpack::html::{self, Token, attr as get};
+use std::collections::HashSet;
+
+const MAX_DEPTH: usize = 256;
+/// Characters of one cell's text.
+const MAX_CELL_TEXT: usize = 32_767;
+
+// ------------------------------------------------------------------ CSS
+
+/// CSS string escapes (`\0022`, `\@`) resolved, its quotes off.
+fn css_string(v: &str) -> String {
+    let v = v.trim();
+    let v = v
+        .strip_prefix('"')
+        .and_then(|x| x.strip_suffix('"'))
+        .or_else(|| v.strip_prefix('\'').and_then(|x| x.strip_suffix('\'')))
+        .unwrap_or(v);
+    let mut out = String::new();
+    let mut chars = v.chars().peekable();
+    while let Some(c) = chars.next() {
+        if c != '\\' {
+            out.push(c);
+            continue;
+        }
+        let mut hex = String::new();
+        while hex.len() < 6 && chars.peek().is_some_and(char::is_ascii_hexdigit) {
+            hex.push(chars.next().unwrap_or('0'));
+        }
+        if hex.is_empty() {
+            if let Some(n) = chars.next() {
+                out.push(n);
+            }
+        } else {
+            if chars.peek() == Some(&' ') {
+                chars.next();
+            }
+            if let Some(ch) = u32::from_str_radix(&hex, 16)
+                .ok()
+                .and_then(char::from_u32)
+                .filter(|c| *c != '\0')
+            {
+                out.push(ch);
+            }
+        }
+    }
+    out
+}
+
+/// A number format from `mso-number-format`: Excel's escapes kept as
+/// format escapes, its named formats resolved.
+fn number_format(v: &str) -> String {
+    let f = css_string(v);
+    if let Some(n) = crate::formats::office::sheets::xmlss::named_format(&f) {
+        return n.to_string();
+    }
+    f.chars().take(255).collect()
+}
+
+/// `mso-pattern`'s pattern names as XLSX's.
+fn mso_pattern(p: &str) -> Option<&'static str> {
+    Some(match p {
+        "gray-75" => "darkGray",
+        "gray-50" => "mediumGray",
+        "gray-25" => "lightGray",
+        "gray-125" => "gray125",
+        "gray-0625" => "gray0625",
+        "horz-stripe" => "darkHorizontal",
+        "vert-stripe" => "darkVertical",
+        "reverse-diag-stripe" => "darkUp",
+        "diag-stripe" => "darkDown",
+        "diag-cross" => "darkGrid",
+        "thick-diag-cross" => "darkTrellis",
+        "thin-horz-stripe" => "lightHorizontal",
+        "thin-vert-stripe" => "lightVertical",
+        "thin-reverse-diag-stripe" => "lightUp",
+        "thin-diag-stripe" => "lightDown",
+        "thin-horz-cross" => "lightGrid",
+        "thin-diag-cross" => "lightTrellis",
+        _ => return None,
+    })
+}
+
+/// What a declaration list says of a cell's style, over `st`.
+fn apply(st: &mut Style, decls: &[(String, String)], ignore: &mut HashSet<String>) {
+    let mut background = None;
+    let mut pattern = None;
+    for (k, v) in decls {
+        let v = v.trim();
+        let low = v.to_ascii_lowercase();
+        match k.as_str() {
+            "mso-number-format" => st.numfmt = number_format(v),
+            "text-align" => {
+                st.align.horizontal = match low.as_str() {
+                    "left" => Some("left"),
+                    "center" => Some("center"),
+                    "right" => Some("right"),
+                    "justify" => Some("justify"),
+                    "fill" => Some("fill"),
+                    "center-across" | "centeracross" => Some("centerContinuous"),
+                    "distributed" => Some("distributed"),
+                    _ => None,
+                };
+            }
+            "vertical-align" => match low.as_str() {
+                "super" => st.font.vert_align = Some("superscript"),
+                "sub" => st.font.vert_align = Some("subscript"),
+                _ => {
+                    st.align.vertical = match low.as_str() {
+                        "top" => Some("top"),
+                        "middle" | "center" => Some("center"),
+                        "justify" => Some("justify"),
+                        "distributed" => Some("distributed"),
+                        _ => None,
+                    };
+                }
+            },
+            "mso-text-control" => match low.as_str() {
+                "shrinktofit" => st.align.shrink = true,
+                "wrap" => st.align.wrap = true,
+                _ => {}
+            },
+            "border-style" => {
+                // Excel's line styles CSS has no name for, after the
+                // shorthand that gave the width and colour.
+                let name = match low.as_str() {
+                    "hairline" => Some("hair"),
+                    "dash-dot" | "dot-dash" => Some("dashDot"),
+                    "dash-dot-dot" | "dot-dot-dash" => Some("dashDotDot"),
+                    "slanted-dash-dot" => Some("slantDashDot"),
+                    _ => None,
+                };
+                if let Some(n) = name {
+                    for e in [
+                        &mut st.border.top,
+                        &mut st.border.right,
+                        &mut st.border.bottom,
+                        &mut st.border.left,
+                    ] {
+                        if let Some(old) = e.style {
+                            let wide = old.starts_with("medium") || old == "thick";
+                            e.style = Some(match (n, wide) {
+                                ("dashDot", true) => "mediumDashDot",
+                                ("dashDotDot", true) => "mediumDashDotDot",
+                                _ => n,
+                            });
+                        }
+                    }
+                }
+            }
+            "white-space" => {
+                st.align.wrap = matches!(low.as_str(), "normal" | "pre-wrap" | "pre-line")
+            }
+            "font-weight" => {
+                st.font.bold =
+                    low == "bold" || low == "bolder" || low.parse::<u32>().is_ok_and(|w| w >= 600)
+            }
+            "font-style" => st.font.italic = low == "italic" || low == "oblique",
+            "font-size" => {
+                if let Some(pt) = css::length_pt(&low, "px").filter(|p| *p > 0.0) {
+                    st.font.size_centipt = (pt * 100.0).round().clamp(100.0, 40_000.0) as u32;
+                }
+            }
+            "font-family" => {
+                let first = v
+                    .split(',')
+                    .map(|f| f.trim().trim_matches(['"', '\'']).trim())
+                    .find(|f| {
+                        !f.is_empty()
+                            && !matches!(
+                                f.to_ascii_lowercase().as_str(),
+                                "sans-serif"
+                                    | "serif"
+                                    | "monospace"
+                                    | "cursive"
+                                    | "fantasy"
+                                    | "system-ui"
+                            )
+                    });
+                if let Some(f) = first {
+                    st.font.name = f.chars().take(64).collect();
+                }
+            }
+            "color" => {
+                if let Some(c) = css::color(v) {
+                    st.font.color = c.filter(|&c| c != 0);
+                }
+            }
+            "text-decoration" | "text-decoration-line" => {
+                st.font.underline = low
+                    .contains("underline")
+                    .then_some(st.font.underline.unwrap_or("single"));
+                st.font.strike = low.contains("line-through");
+            }
+            "text-underline-style" | "mso-text-underline" => {
+                st.font.underline = match low.as_str() {
+                    "double" => Some("double"),
+                    "single-accounting" => Some("singleAccounting"),
+                    "double-accounting" => Some("doubleAccounting"),
+                    "none" => None,
+                    _ => Some("single"),
+                };
+            }
+            "vertical-align-text" | "mso-text-raise" => {}
+            "background" | "background-color" => {
+                if let Some(c) = low.split_whitespace().find_map(css::color) {
+                    background = Some(c);
+                }
+            }
+            "mso-pattern" => pattern = Some(low.clone()),
+            "border" => {
+                let e = css::border(v);
+                st.border.top = e.clone();
+                st.border.right = e.clone();
+                st.border.bottom = e.clone();
+                st.border.left = e;
+            }
+            "border-top" => st.border.top = css::border(v),
+            "border-right" => st.border.right = css::border(v),
+            "border-bottom" => st.border.bottom = css::border(v),
+            "border-left" => st.border.left = css::border(v),
+            "mso-diagonal-down" | "mso-diagonal-up" => {
+                let e = css::border(v);
+                if e.style.is_some() {
+                    if k.ends_with("down") {
+                        st.border.diag_down = true;
+                    } else {
+                        st.border.diag_up = true;
+                    }
+                    st.border.diagonal = e;
+                }
+            }
+            "mso-rotate" => {
+                if let Ok(r) = low.parse::<f64>() {
+                    let r = r.round().clamp(-90.0, 90.0) as i32;
+                    st.align.rotation = if r < 0 { (90 - r) as u8 } else { r as u8 };
+                }
+            }
+            "layout-flow" if low.contains("vertical") => st.align.rotation = 255,
+            "mso-char-indent-count" => {
+                if let Ok(n) = low.parse::<f64>() {
+                    st.align.indent = n.clamp(0.0, 250.0) as u8;
+                }
+            }
+            "mso-protection" => {
+                st.locked = !low.contains("unlocked");
+                st.hidden = low.contains("hidden");
+            }
+            "mso-ignore" => {
+                for w in low.split_whitespace() {
+                    ignore.insert(w.to_string());
+                }
+            }
+            _ => {}
+        }
+    }
+    let pat = pattern
+        .as_deref()
+        .and_then(|p| p.split_whitespace().nth(1))
+        .unwrap_or("none");
+    match (background, pat) {
+        (Some(None), _) => st.fill = Fill::NONE,
+        (Some(Some(bg)), "none" | "solid") => st.fill = Fill::solid(bg),
+        (bg, p) => {
+            if let Some(kind) = mso_pattern(p) {
+                let fg = pattern
+                    .as_deref()
+                    .and_then(|p| p.split_whitespace().next())
+                    .and_then(css::color)
+                    .flatten()
+                    .or(Some(0));
+                st.fill = Fill {
+                    pattern: kind,
+                    fg,
+                    bg: bg.flatten().or(match &st.fill {
+                        f if f.pattern == "solid" => f.fg,
+                        _ => None,
+                    }),
+                };
+            }
+        }
+    }
+}
+
+// --------------------------------------------------------------- tables
+
+/// A cell's text as runs of one font each.
+#[derive(Default)]
+struct Runs {
+    runs: Vec<Run>,
+    len: usize,
+    /// The text's last character is white space (or none was written).
+    space: bool,
+}
+
+impl Runs {
+    fn push(&mut self, t: &str, font: &Font, pre: bool) {
+        for c in t.chars() {
+            if self.len >= MAX_CELL_TEXT {
+                return;
+            }
+            let c = if c == '\u{A0}' { ' ' } else { c };
+            let ws = c.is_whitespace() && !pre;
+            if ws {
+                if self.space {
+                    continue;
+                }
+                self.space = true;
+            } else {
+                self.space = c == '\n';
+            }
+            let c = if ws { ' ' } else { c };
+            match self.runs.last_mut() {
+                Some(r) if r.font.as_ref() == Some(font) => r.text.push(c),
+                _ => self.runs.push(Run {
+                    text: c.to_string(),
+                    font: Some(font.clone()),
+                }),
+            }
+            self.len += 1;
+        }
+    }
+
+    fn newline(&mut self, font: &Font) {
+        if let Some(r) = self.runs.last_mut() {
+            while r.text.ends_with(' ') {
+                r.text.pop();
+            }
+        }
+        if self.len > 0 {
+            self.space = false;
+            self.push("\n", font, true);
+            self.space = true;
+        }
+    }
+
+    fn text(&self) -> String {
+        self.runs
+            .iter()
+            .map(|r| r.text.as_str())
+            .collect::<String>()
+            .trim_matches([' ', '\n'])
+            .to_string()
+    }
+}
+
+struct CellOut {
+    row: u32,
+    col: u32,
+    rows: u32,
+    cols: u32,
+    merge: bool,
+    style: Style,
+    runs: Runs,
+    attrs: Vec<(String, String)>,
+    link: Option<String>,
+    header: bool,
+    /// Text after line breaks that start a new cell, a row down each.
+    below: Vec<Runs>,
+}
+
+/// A table's rows, read from its tokens.
+#[derive(Default)]
+struct Table {
+    cells: Vec<CellOut>,
+    rows: Vec<(u32, Option<f64>, bool)>,
+    cols: Vec<(u32, u32, Option<Width>, bool)>,
+    /// Text cells by default (`x:str` on the table).
+    strings: bool,
+    /// The decimal and thousands separators of cells without `x:num`.
+    seps: (char, char),
+    height: u32,
+    /// The table's `<caption>`, a row above it.
+    caption: Option<Runs>,
+    /// Lines around cells (the `border` attribute).
+    ruled: bool,
+}
+
+/// What a page puts on the sheet, top to bottom: tables, and the text
+/// around them a row each in the first column.
+enum Block {
+    Table(Table),
+    Text(Runs),
+}
+
+/// `mso-displayed-decimal-separator` and its thousands twin, `.` and `,`
+/// unless they say otherwise.
+fn separators(d: &[(String, String)]) -> (char, char) {
+    let one = |k: &str, def: char| {
+        d.iter()
+            .rev()
+            .find(|x| x.0 == k)
+            .and_then(|x| css_string(&x.1).chars().next())
+            .unwrap_or(def)
+    };
+    (
+        one("mso-displayed-decimal-separator", '.'),
+        one("mso-displayed-thousand-separator", ','),
+    )
+}
+
+/// Parses `s` as a number the way a cell's text reads as one: an optional
+/// sign or parentheses, a currency sign, digits with thousands
+/// separators, decimals and a percent sign. The value and the format
+/// that shows it so.
+fn parse_number(s: &str, seps: (char, char)) -> Option<(f64, Option<&'static str>)> {
+    // To "1,234.5" form: other separators than these two are not a number's.
+    let (dec, thou) = seps;
+    if s.chars()
+        .any(|c| matches!(c, '.' | ',') && c != dec && c != thou)
+    {
+        return None;
+    }
+    let mut t: String = s
+        .trim()
+        .chars()
+        .filter(|c| !matches!(c, '\u{A0}' | ' ') || thou == *c)
+        .map(|c| {
+            if c == thou {
+                ','
+            } else if c == dec {
+                '.'
+            } else {
+                c
+            }
+        })
+        .collect();
+    if t.is_empty() || t.len() > 64 {
+        return None;
+    }
+    let mut neg = false;
+    if t.starts_with('(') && t.ends_with(')') {
+        neg = true;
+        t = t[1..t.len() - 1].to_string();
+    }
+    if let Some(r) = t.strip_prefix('-') {
+        neg = !neg;
+        t = r.to_string();
+    } else if let Some(r) = t.strip_prefix('+') {
+        t = r.to_string();
+    }
+    let currency = t.starts_with('$');
+    let t = t.trim_start_matches('$');
+    let percent = t.ends_with('%');
+    let t = t.trim_end_matches('%');
+    let grouped = t.contains(',');
+    if grouped {
+        // Groups of three after the first.
+        let int = t.split('.').next().unwrap_or("");
+        let mut groups = int.split(',');
+        let first = groups.next().unwrap_or("");
+        if first.is_empty() || first.len() > 3 || !groups.all(|g| g.len() == 3) {
+            return None;
+        }
+    }
+    let plain = t.replace(',', "");
+    if plain.is_empty()
+        || !plain
+            .chars()
+            .all(|c| c.is_ascii_digit() || matches!(c, '.' | 'e' | 'E' | '+' | '-'))
+        || !plain.starts_with(|c: char| c.is_ascii_digit() || c == '.')
+    {
+        return None;
+    }
+    let mut v: f64 = plain.parse().ok().filter(|v: &f64| v.is_finite())?;
+    if neg {
+        v = -v;
+    }
+    let decimals = plain
+        .split_once('.')
+        .is_some_and(|(_, d)| !d.is_empty() && d.chars().all(|c| c.is_ascii_digit()));
+    let fmt = match (percent, currency, grouped, decimals) {
+        (true, _, _, true) => Some("0.00%"),
+        (true, _, _, false) => Some("0%"),
+        (_, true, _, _) => Some("\"$\"#,##0.00_);\\(\"$\"#,##0.00\\)"),
+        (_, _, true, true) => Some("#,##0.00"),
+        (_, _, true, false) => Some("#,##0"),
+        _ => None,
+    };
+    if percent {
+        v /= 100.0;
+    }
+    Some((v, fmt))
+}
+
+/// Excel's settings in the `<xml>` of a conditional comment: the sheet's
+/// name, frozen panes, grid lines.
+#[derive(Default)]
+struct Options {
+    names: Vec<String>,
+    freeze: Option<(u32, u32)>,
+    no_grid: bool,
+    sources: bool,
+    date1904: bool,
+}
+
+fn options(c: &str, o: &mut Options) {
+    let text_of = |tag: &str| -> Vec<String> {
+        let open = format!("<{tag}>");
+        let close = format!("</{tag}>");
+        let mut out = vec![];
+        let mut rest = c;
+        while let Some(p) = rest.find(&open) {
+            let v = &rest[p + open.len()..];
+            let e = v.find(&close).unwrap_or(v.len());
+            out.push(html::unescape(v[..e].trim()));
+            rest = &v[e..];
+            if out.len() > 4096 {
+                break;
+            }
+        }
+        out
+    };
+    o.names.extend(text_of("x:Name"));
+    if c.contains("<x:FreezePanes") {
+        let n = |t: &str| {
+            text_of(t)
+                .first()
+                .and_then(|v| v.parse::<u32>().ok())
+                .unwrap_or(0)
+        };
+        let (r, c2) = (
+            n("x:SplitHorizontal").min(MAX_ROW),
+            n("x:SplitVertical").min(MAX_COL),
+        );
+        if r > 0 || c2 > 0 {
+            o.freeze = Some((r, c2));
+        }
+    }
+    o.no_grid |= c.contains("<x:DoNotDisplayGridlines");
+    o.sources |= c.contains("<x:WorksheetSource");
+    o.date1904 |= c.contains("<x:1904Date");
+}
+
+pub(crate) fn read(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    budget.alloc(bytes.len() as u64 * 6)?;
+    let text = html::decode(bytes);
+    let tokens = html::without_downlevel(
+        html::read(&text, &mut budget.tree()).map_err(|_| Error::TooLarge("HTML elements"))?,
+    );
+    if !tokens.iter().any(|t| matches!(t, Token::Start { name, .. } if matches!(name.as_str(), "html" | "table" | "body" | "head" | "td" | "tr"))) {
+        return Err(Error::NotFormat("not an HTML document".into()));
+    }
+
+    // Style sheets and Excel's settings first: they may follow the body.
+    let mut sheet_css = Sheet::default();
+    let mut opts = Options::default();
+    let mut frames = false;
+    for (k, t) in tokens.iter().enumerate() {
+        match t {
+            Token::Start { name, .. } if name == "style" => {
+                if let Some(Token::Text(c)) = tokens.get(k + 1) {
+                    sheet_css.add(c);
+                }
+            }
+            Token::Start { name, .. } if name == "frameset" || name == "frame" => frames = true,
+            Token::Comment(c) if c.trim_start().starts_with("[if") => options(c, &mut opts),
+            _ => {}
+        }
+    }
+
+    // The base style: Excel's `td` and `.style0` rules over its defaults,
+    // a browser's for other pages.
+    let excel = tokens.iter().any(
+        |t| matches!(t, Token::Start { attrs, .. } if attrs.iter().any(|a| a.0.starts_with("x:"))),
+    ) || sheet_css.declarations().any(|d| d.0.starts_with("mso-"));
+    let mut base = Style {
+        font: Font {
+            name: if excel {
+                "Arial".into()
+            } else {
+                "Times New Roman".into()
+            },
+            size_centipt: if excel { 1000 } else { 1200 },
+            ..Font::default()
+        },
+        ..Style::default()
+    };
+    {
+        let mut d = vec![];
+        sheet_css.lookup("body", &[], &mut d);
+        sheet_css.lookup("table", &[], &mut d);
+        sheet_css.lookup("td", &["style0"], &mut d);
+        apply(&mut base, &d, &mut HashSet::new());
+        base.align.wrap = d
+            .iter()
+            .rev()
+            .find(|x| x.0 == "white-space")
+            .is_some_and(|x| matches!(x.1.trim(), "normal" | "pre-wrap"));
+    }
+
+    let blocks = build_tables(&tokens, &sheet_css, &base, budget)?;
+    let tables = blocks
+        .iter()
+        .filter(|b| matches!(b, Block::Table(_)))
+        .count();
+    if tables == 0 {
+        if frames || opts.sources {
+            return Err(Error::Unsupported(
+                "an Excel web page whose sheets are separate files".into(),
+            ));
+        }
+        return Err(Error::NotFormat("an HTML page without tables".into()));
+    }
+
+    let mut wb = Workbook::new(base.clone());
+    wb.date1904 = opts.date1904;
+    // The name Excel stored; a page's title is not a sheet's name.
+    let name = opts
+        .names
+        .first()
+        .cloned()
+        .filter(|n| !n.is_empty())
+        .unwrap_or_else(|| "Sheet1".into());
+    let mut sheet = crate::formats::office::sheets::model::Sheet::new(
+        crate::formats::office::sheets::xlsx::sheet_names(std::iter::once(name.as_str())).remove(0),
+    );
+    if let Some(f) = opts.freeze {
+        sheet.freeze = Some(f);
+    }
+    if opts.no_grid {
+        sheet.show_grid = false;
+    }
+    let digit =
+        (crate::formats::office::sheets::fonts::digit_twips(&base.font.name, base.font.size_pt())
+            / 15.0)
+            .round()
+            .max(1.0);
+    // Tables and text rows one under another, from A1.
+    let mut top = 0u32;
+    for b in &blocks {
+        if top > MAX_ROW {
+            break;
+        }
+        let t = match b {
+            Block::Table(t) => t,
+            Block::Text(runs) => {
+                let text = runs.text();
+                if !text.is_empty() {
+                    let (value, style) = match text_value(runs, &base.font, text) {
+                        Value::Rich(r) if r.len() == 1 => {
+                            let st = Style {
+                                font: r[0].font.clone().unwrap_or_else(|| base.font.clone()),
+                                ..base.clone()
+                            };
+                            (Value::text(r[0].text.clone()), wb.styles.add(st))
+                        }
+                        v => (v, 0),
+                    };
+                    budget.cell(value.text_len())?;
+                    sheet.cells.insert(
+                        (top, 0),
+                        Cell {
+                            value,
+                            formula: None,
+                            style,
+                        },
+                    );
+                    top += 1;
+                }
+                continue;
+            }
+        };
+        if let Some(cap) = &t.caption {
+            let text = cap.text();
+            if !text.is_empty() {
+                budget.cell(text.len())?;
+                sheet.cells.insert(
+                    (top, 0),
+                    Cell {
+                        value: Value::text(text),
+                        formula: None,
+                        style: 0,
+                    },
+                );
+                top = top.saturating_add(1);
+            }
+        }
+        // Text after line breaks that start new cells, where those are free.
+        let mut below: Vec<((u32, u32), Value, u32)> = vec![];
+        for &(first, last, w, hidden) in &t.cols {
+            if !sheet
+                .cols
+                .iter()
+                .any(|c| c.first <= last && first <= c.last)
+            {
+                sheet.cols.push(ColInfo {
+                    first,
+                    last,
+                    width: w.map(|w| w.width(digit)),
+                    hidden,
+                    style: None,
+                    outline: 0,
+                });
+            }
+        }
+        for &(r, h, hidden) in &t.rows {
+            let r = top.saturating_add(r);
+            if r <= MAX_ROW && (h.is_some() || hidden) {
+                sheet.rows.insert(
+                    r,
+                    RowInfo {
+                        height: h.map(|h| h.min(409.0)),
+                        custom_height: h.is_some(),
+                        hidden,
+                        style: None,
+                        outline: 0,
+                    },
+                );
+            }
+        }
+        for c in &t.cells {
+            let r = top.saturating_add(c.row);
+            if r > MAX_ROW || c.col > MAX_COL {
+                continue;
+            }
+            let (value, formula, extra) = cell_value(c, t.strings, t.seps);
+            let mut st = c.style.clone();
+            if let Some(f) = extra
+                && st.numfmt == "General"
+            {
+                st.numfmt = f.to_string();
+            }
+            if c.header {
+                st.font.bold = true;
+                st.align.horizontal = st.align.horizontal.or(Some("center"));
+            }
+            if matches!(&value, Value::Text(t) if t.contains('\n')) {
+                st.align.wrap = true;
+            }
+            let value = match value {
+                // A single run in another font than the cell's: the cell's.
+                Value::Rich(runs) if runs.len() == 1 => {
+                    if let Some(f) = &runs[0].font {
+                        st.font = f.clone();
+                    }
+                    Value::text(runs[0].text.clone())
+                }
+                v => v,
+            };
+            // Spans merge, but for columns Excel marks mso-ignore:colspan.
+            let r2 = r.saturating_add(c.rows - 1).min(MAX_ROW);
+            let c2 = if c.merge {
+                c.col.saturating_add(c.cols - 1).min(MAX_COL)
+            } else {
+                c.col
+            };
+            if r2 > r || c2 > c.col {
+                sheet.merges.push(Range {
+                    r1: r,
+                    c1: c.col,
+                    r2,
+                    c2,
+                });
+            }
+            if let Some(href) = &c.link {
+                let link = Hyperlink {
+                    range: Range::cell(r, c.col),
+                    url: (!href.starts_with('#') && safe_url(href)).then(|| href.clone()),
+                    location: href.strip_prefix('#').map(str::to_string),
+                    tooltip: None,
+                    display: None,
+                };
+                if link.url.is_some() || link.location.is_some() {
+                    sheet.hyperlinks.push(link);
+                }
+            }
+            let style = wb.styles.add(st);
+            for (k, runs) in c.below.iter().enumerate() {
+                let text = runs.text();
+                let rr = r.saturating_add(k as u32 + 1);
+                if !text.is_empty() && rr <= MAX_ROW {
+                    below.push(((rr, c.col), Value::text(text), style));
+                }
+            }
+            // An unmerged run of cells (mso-ignore:colspan): each formatted.
+            if !c.merge && c.cols > 1 && style != 0 {
+                for dc in 1..c.cols.min(MAX_COL - c.col + 1) {
+                    if let std::collections::btree_map::Entry::Vacant(e) =
+                        sheet.cells.entry((r, c.col + dc))
+                    {
+                        budget.cell(0)?;
+                        e.insert(Cell::styled(style));
+                    }
+                }
+            }
+            if matches!(value, Value::Empty) && formula.is_none() && style == 0 {
+                continue;
+            }
+            budget.cell(value.text_len() + formula.as_ref().map_or(0, |f| f.len()))?;
+            sheet.cells.insert(
+                (r, c.col),
+                Cell {
+                    value,
+                    formula,
+                    style,
+                },
+            );
+        }
+        let mut grown = top.saturating_add(t.height);
+        for (at, value, style) in below {
+            if sheet.cells.get(&at).is_none_or(|c| c.value == Value::Empty) {
+                budget.cell(value.text_len())?;
+                sheet.cells.insert(
+                    at,
+                    Cell {
+                        value,
+                        formula: None,
+                        style,
+                    },
+                );
+                grown = grown.max(at.0 + 1);
+            }
+        }
+        top = grown;
+    }
+    if tokens.iter().any(|t| match t {
+        Token::Start { name, .. } => name == "img",
+        // Excel's pictures, in VML for Office alone.
+        Token::Comment(c) => c.contains("v:imagedata"),
+        _ => false,
+    }) {
+        wb.warn("pictures are not converted");
+    }
+    wb.sheets.push(sheet);
+    Ok(wb)
+}
+
+/// A column's width as a page gives it.
+#[derive(Clone, Copy)]
+enum Width {
+    /// `mso-width-alt`: 1/256 of the default font's digit, padding in,
+    /// as XLSX counts widths.
+    Alt(f64),
+    Pt(f64),
+}
+
+impl Width {
+    fn width(self, digit: f64) -> f64 {
+        match self {
+            Width::Alt(w) => (w / 256.0).clamp(0.0, 255.0),
+            Width::Pt(pt) => crate::formats::office::sheets::xmlss::width_chars(pt, digit),
+        }
+    }
+}
+
+/// A cell's value and formula from its text and Excel's attributes, and
+/// the format a number read from its text implies.
+fn cell_value(
+    c: &CellOut,
+    strings: bool,
+    seps: (char, char),
+) -> (Value, Option<Box<str>>, Option<&'static str>) {
+    let text = c.runs.text();
+    let formula = get(&c.attrs, "x:fmla")
+        .map(|f| f.trim().trim_start_matches('=').to_string())
+        .filter(|f| !f.is_empty())
+        .map(String::into_boxed_str);
+    if let Some(b) = get(&c.attrs, "x:bool") {
+        let v = if b.is_empty() { text.as_str() } else { b };
+        return (
+            Value::Bool(v.eq_ignore_ascii_case("true") || v == "1"),
+            formula,
+            None,
+        );
+    }
+    if let Some(e) = get(&c.attrs, "x:err") {
+        let v = if e.is_empty() { text.as_str() } else { e };
+        return (
+            Value::Error(CellError::parse(v).unwrap_or(CellError::Value)),
+            formula,
+            None,
+        );
+    }
+    if let Some(n) = get(&c.attrs, "x:num") {
+        if let Ok(v) = n.trim().parse::<f64>()
+            && v.is_finite()
+        {
+            return (Value::Number(v), formula, None);
+        }
+        if let Some((v, f)) = parse_number(&text, seps) {
+            return (Value::Number(v), formula, f);
+        }
+    }
+    if let Some(s) = get(&c.attrs, "x:str") {
+        if !s.is_empty() {
+            // The value with the apostrophe that forces text in Excel.
+            return (
+                Value::text(s.strip_prefix('\'').unwrap_or(s)),
+                formula,
+                None,
+            );
+        }
+        return (text_value(&c.runs, &c.style.font, text), formula, None);
+    }
+    if text.is_empty() {
+        return (Value::Empty, formula, None);
+    }
+    if !strings
+        && c.style.numfmt != "@"
+        && let Some((v, f)) = parse_number(&text, seps)
+    {
+        return (Value::Number(v), formula, f);
+    }
+    (text_value(&c.runs, &c.style.font, text), formula, None)
+}
+
+fn text_value(r: &Runs, font: &Font, text: String) -> Value {
+    let mut runs: Vec<Run> = r
+        .runs
+        .iter()
+        .filter(|r| !r.text.is_empty())
+        .cloned()
+        .collect();
+    if runs.len() > 1 {
+        // The text trimmed as `text` is.
+        if let Some(f) = runs.first_mut() {
+            f.text = f.text.trim_start_matches([' ', '\n']).to_string();
+        }
+        if let Some(l) = runs.last_mut() {
+            l.text = l.text.trim_end_matches([' ', '\n']).to_string();
+        }
+        runs.retain(|r| !r.text.is_empty());
+        if runs.len() > 1 && runs.array_windows().any(|[a, b]| a.font != b.font) {
+            return Value::Rich(runs.into());
+        }
+    }
+    if runs.len() == 1 && runs[0].font.as_ref() != Some(font) {
+        return Value::Rich(
+            vec![Run {
+                text,
+                font: runs[0].font.clone(),
+            }]
+            .into(),
+        );
+    }
+    Value::text(text)
+}
+
+/// The element names that end a cell, a row or a table when they start.
+const CELL_ENDERS: &[&str] = &["td", "th", "tr", "tbody", "thead", "tfoot"];
+
+struct Open {
+    table: Table,
+    /// Cells taken by row spans: (row, col) to the row they free after.
+    taken: HashSet<(u32, u32)>,
+    row: Option<u32>,
+    next_row: u32,
+    col: u32,
+    row_style: Vec<(String, String)>,
+    cell: Option<CellOut>,
+    /// Columns described so far by `<col>`.
+    col_cursor: u32,
+    /// Inside the table's `<caption>`.
+    in_caption: bool,
+}
+
+/// Elements whose content is not data: scripts, frames, the head's title
+/// and styles (read apart).
+const SKIPPED: &[&str] = &[
+    "script", "noscript", "iframe", "noframes", "noembed", "title", "style", "textarea", "xmp",
+];
+
+/// Elements that start a new line of text.
+const BLOCKS: &[&str] = &[
+    "p",
+    "div",
+    "li",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "ul",
+    "ol",
+    "dl",
+    "dt",
+    "dd",
+    "pre",
+    "blockquote",
+    "hr",
+    "address",
+    "center",
+    "form",
+    "fieldset",
+    "section",
+    "article",
+    "header",
+    "footer",
+    "nav",
+    "aside",
+    "body",
+    "caption",
+];
+
+fn flush_text(loose: &mut Runs, done: &mut Vec<Block>) {
+    if !loose.text().is_empty() && done.len() < 1 << 20 {
+        done.push(Block::Text(std::mem::replace(
+            loose,
+            Runs {
+                space: true,
+                ..Runs::default()
+            },
+        )));
+    } else {
+        *loose = Runs {
+            space: true,
+            ..Runs::default()
+        };
+    }
+}
+
+fn build_tables(
+    tokens: &[Token],
+    css_sheet: &Sheet,
+    base: &Style,
+    budget: &mut Budget,
+) -> Result<Vec<Block>> {
+    let mut done: Vec<Block> = vec![];
+    let mut stack: Vec<Open> = vec![];
+    // The font of inline formatting inside the current cell, or of the
+    // text outside tables.
+    let mut fonts: Vec<(String, Font)> = vec![];
+    let mut loose = Runs {
+        space: true,
+        ..Runs::default()
+    };
+    let mut link: Option<String> = None;
+    let mut pre = 0u32;
+    let mut skip = 0u32;
+    // Excel's comment lists, after the table: `div`s nested in one.
+    let mut comment_divs = 0u32;
+    for t in tokens {
+        match t {
+            Token::Start {
+                name,
+                attrs,
+                closed,
+            } => {
+                let n = name.as_str();
+                // A self-closed one opens too: the tokenizer reads what follows
+                // as the element's content, as a browser does.
+                if SKIPPED.contains(&n) {
+                    skip += 1;
+                    continue;
+                }
+                if skip > 0 {
+                    continue;
+                }
+                if comment_divs > 0 {
+                    if n == "div" && !closed {
+                        comment_divs += 1;
+                    }
+                    continue;
+                }
+                if n == "div"
+                    && get(attrs, "style").is_some_and(|s| s.contains("mso-element:comment"))
+                    && !closed
+                {
+                    comment_divs = 1;
+                    continue;
+                }
+                if stack.is_empty() && BLOCKS.contains(&n) {
+                    flush_text(&mut loose, &mut done);
+                }
+                if stack.is_empty() && n == "br" {
+                    flush_text(&mut loose, &mut done);
+                }
+                if fonts.is_empty() && stack.last().is_none_or(|o| o.cell.is_none()) {
+                    fonts.push((String::new(), base.font.clone()));
+                }
+                match n {
+                    "table" => {
+                        if stack.len() >= MAX_DEPTH {
+                            return Err(Error::Malformed("tables nested too deep".into()));
+                        }
+                        if stack.is_empty() {
+                            flush_text(&mut loose, &mut done);
+                        }
+                        let strings = get(attrs, "x:str").is_some();
+                        let mut d = vec![];
+                        css_sheet.lookup("table", &classes(attrs), &mut d);
+                        if let Some(s) = get(attrs, "style") {
+                            d.extend(css::declarations(s));
+                        }
+                        let seps = separators(&d);
+                        let ruled = get(attrs, "border").is_some_and(|b| {
+                            b.trim().is_empty() || b.trim().parse::<f64>().is_ok_and(|w| w > 0.0)
+                        });
+                        stack.push(Open {
+                            table: Table {
+                                strings,
+                                seps,
+                                ruled,
+                                ..Table::default()
+                            },
+                            taken: HashSet::new(),
+                            row: None,
+                            next_row: 0,
+                            col: 0,
+                            row_style: vec![],
+                            cell: None,
+                            col_cursor: 0,
+                            in_caption: false,
+                        });
+                    }
+                    "caption" => {
+                        if let Some(o) = stack.last_mut() {
+                            finish_cell(o, &mut fonts, &mut link, budget)?;
+                            o.in_caption = true;
+                            o.table.caption.get_or_insert(Runs {
+                                space: true,
+                                ..Runs::default()
+                            });
+                            fonts.push((String::new(), base.font.clone()));
+                        }
+                    }
+                    "col" if stack.last().is_some_and(|o| o.row.is_none()) => {
+                        let o = stack.last_mut().unwrap_or_else(|| unreachable!());
+                        let span = get(attrs, "span")
+                            .and_then(|s| s.trim().parse::<u32>().ok())
+                            .unwrap_or(1)
+                            .clamp(1, MAX_COL + 1);
+                        let mut d = vec![];
+                        if let Some(s) = get(attrs, "style") {
+                            d = css::declarations(s);
+                        }
+                        // Excel's own width unit first, then its `width`
+                        // attribute (whole pixels), then the CSS width
+                        // (those pixels rounded to points).
+                        let alt = d
+                            .iter()
+                            .rev()
+                            .find(|x| x.0 == "mso-width-alt")
+                            .and_then(|x| x.1.trim().parse::<f64>().ok())
+                            .filter(|v| v.is_finite() && *v >= 0.0);
+                        let w = alt.map(Width::Alt).or_else(|| {
+                            get(attrs, "width")
+                                .and_then(|w| css::length_pt(w, "px"))
+                                .or_else(|| {
+                                    d.iter()
+                                        .rev()
+                                        .find(|x| x.0 == "width")
+                                        .and_then(|x| css::length_pt(&x.1, "px"))
+                                })
+                                .filter(|w| *w >= 0.0)
+                                .map(Width::Pt)
+                        });
+                        let hidden = d.iter().any(|x| x.0 == "display" && x.1.trim() == "none");
+                        let first = o.col_cursor.min(MAX_COL);
+                        let last = o.col_cursor.saturating_add(span - 1).min(MAX_COL);
+                        o.col_cursor = last.saturating_add(1);
+                        if (w.is_some() || hidden) && o.table.cols.len() < 1 << 14 {
+                            o.table.cols.push((first, last, w, hidden));
+                        }
+                    }
+                    "tr" => {
+                        let Some(o) = stack.last_mut() else { continue };
+                        finish_cell(o, &mut fonts, &mut link, budget)?;
+                        let r = o.next_row;
+                        o.row = Some(r);
+                        o.col = 0;
+                        let mut d = vec![];
+                        css_sheet.lookup("tr", &classes(attrs), &mut d);
+                        if let Some(s) = get(attrs, "style") {
+                            d.extend(css::declarations(s));
+                        }
+                        // One row for several empty ones, its height theirs.
+                        let n = d
+                            .iter()
+                            .rev()
+                            .find(|x| x.0 == "mso-xlrowspan")
+                            .and_then(|x| x.1.trim().parse::<u32>().ok())
+                            .unwrap_or(1)
+                            .clamp(1, 1 << 20);
+                        o.next_row = r.saturating_add(n);
+                        let h = d
+                            .iter()
+                            .rev()
+                            .find(|x| x.0 == "height")
+                            .and_then(|x| css::length_pt(&x.1, "px"))
+                            .or_else(|| get(attrs, "height").and_then(|h| css::length_pt(h, "px")))
+                            .map(|h| h / f64::from(n));
+                        let hidden = d.iter().any(|x| x.0 == "display" && x.1.trim() == "none");
+                        if (h.is_some() || hidden) && o.table.rows.len() < 1 << 20 {
+                            budget.alloc(32 * u64::from(n))?;
+                            for k in 0..n {
+                                o.table.rows.push((r.saturating_add(k), h, hidden));
+                            }
+                        }
+                        o.table.height = o.table.height.max(o.next_row);
+                        o.row_style = d
+                            .into_iter()
+                            .filter(|x| x.0 != "height" && x.0 != "display")
+                            .collect();
+                        if let Some(a) = get(attrs, "align") {
+                            o.row_style.push(("text-align".into(), a.to_string()));
+                        }
+                        if let Some(a) = get(attrs, "valign") {
+                            o.row_style.push(("vertical-align".into(), a.to_string()));
+                        }
+                    }
+                    "td" | "th" => {
+                        let Some(o) = stack.last_mut() else { continue };
+                        finish_cell(o, &mut fonts, &mut link, budget)?;
+                        let r = match o.row {
+                            Some(r) => r,
+                            None => {
+                                let r = o.next_row;
+                                o.row = Some(r);
+                                o.next_row = r.saturating_add(1);
+                                o.col = 0;
+                                r
+                            }
+                        };
+                        let mut c = o.col;
+                        while o.taken.contains(&(r, c)) && c < MAX_COL {
+                            c += 1;
+                        }
+                        let span = |k: &str| {
+                            get(attrs, k)
+                                .and_then(|s| s.trim().parse::<u32>().ok())
+                                .unwrap_or(1)
+                                .clamp(1, 65_534)
+                        };
+                        let (rows, cols) = (span("rowspan"), span("colspan"));
+                        // The cell's style: the sheet's rules, the row's,
+                        // the element's attributes, its own style.
+                        let mut d = vec![];
+                        css_sheet.lookup(n, &classes(attrs), &mut d);
+                        let mut own = o.row_style.clone();
+                        // Office ignores `bgcolor`.
+                        for (attr, prop) in [("align", "text-align"), ("valign", "vertical-align")]
+                        {
+                            if let Some(v) = get(attrs, attr) {
+                                own.push((prop.into(), v.to_string()));
+                            }
+                        }
+                        if get(attrs, "nowrap").is_some() {
+                            own.push(("white-space".into(), "nowrap".into()));
+                        }
+                        d.splice(0..0, own);
+                        if let Some(s) = get(attrs, "style") {
+                            d.extend(css::declarations(s));
+                        }
+                        let mut st = base.clone();
+                        if o.table.ruled {
+                            let thin = Edge {
+                                style: Some("thin"),
+                                color: None,
+                            };
+                            st.border = Border {
+                                top: thin.clone(),
+                                right: thin.clone(),
+                                bottom: thin.clone(),
+                                left: thin,
+                                ..Border::default()
+                            };
+                        }
+                        let mut ignore = HashSet::new();
+                        apply(&mut st, &d, &mut ignore);
+                        let merge_cols = !ignore.contains("colspan");
+                        let merge_rows = !ignore.contains("rowspan");
+                        let (rows, cols) = (if merge_rows { rows } else { 1 }, cols);
+                        // The columns a row-spanning cell takes below.
+                        if rows > 1 {
+                            budget.alloc(u64::from(rows) * u64::from(cols) * 16)?;
+                            for dr in 1..rows {
+                                for dc in 0..cols {
+                                    o.taken.insert((r.saturating_add(dr), c.saturating_add(dc)));
+                                }
+                            }
+                        }
+                        o.col = c.saturating_add(cols);
+                        o.table.height = o.table.height.max(r.saturating_add(rows));
+                        fonts.clear();
+                        fonts.push((String::new(), st.font.clone()));
+                        o.in_caption = false;
+                        o.cell = Some(CellOut {
+                            row: r,
+                            col: c,
+                            rows,
+                            cols,
+                            merge: merge_cols,
+                            style: st,
+                            runs: Runs {
+                                space: true,
+                                ..Runs::default()
+                            },
+                            attrs: attrs.clone(),
+                            link: None,
+                            header: n == "th" && !excel_cell(attrs),
+                            below: vec![],
+                        });
+                    }
+                    "br" => {
+                        // In the cell (`mso-data-placement:same-cell`, which
+                        // Excel's style sheets set for all), else the start
+                        // of a new cell a row down.
+                        let mut d = vec![];
+                        css_sheet.lookup("br", &classes(attrs), &mut d);
+                        if let Some(s) = get(attrs, "style") {
+                            d.extend(css::declarations(s));
+                        }
+                        let same = d
+                            .iter()
+                            .rev()
+                            .find(|x| x.0 == "mso-data-placement")
+                            .is_some_and(|x| x.1.trim() == "same-cell");
+                        if let (Some(o), Some((_, f))) = (stack.last_mut(), fonts.last())
+                            && let Some(cell) = &mut o.cell
+                        {
+                            if same || cell.below.len() >= 1024 {
+                                cell.runs.newline(f);
+                            } else {
+                                cell.below.push(Runs {
+                                    space: true,
+                                    ..Runs::default()
+                                });
+                            }
+                        }
+                    }
+                    "p" | "div" | "li" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" => {
+                        if let (Some(o), Some((_, f))) = (stack.last_mut(), fonts.last())
+                            && let Some(cell) = &mut o.cell
+                            && cell.runs.len > 0
+                        {
+                            cell.runs.newline(f);
+                        }
+                        if n.starts_with('h') {
+                            push_font(&mut fonts, n, |f| f.bold = true);
+                        }
+                    }
+                    "pre" => pre += 1,
+                    "b" | "strong" => push_font(&mut fonts, n, |f| f.bold = true),
+                    "i" | "em" | "cite" | "var" => push_font(&mut fonts, n, |f| f.italic = true),
+                    "u" | "ins" => push_font(&mut fonts, n, |f| f.underline = Some("single")),
+                    "s" | "strike" | "del" => push_font(&mut fonts, n, |f| f.strike = true),
+                    "sub" => push_font(&mut fonts, n, |f| f.vert_align = Some("subscript")),
+                    "sup" => push_font(&mut fonts, n, |f| f.vert_align = Some("superscript")),
+                    "font" | "span" | "a" => {
+                        let style_decls: Vec<(String, String)> = get(attrs, "style")
+                            .map(css::declarations)
+                            .unwrap_or_default();
+                        let color = get(attrs, "color").map(str::to_string);
+                        let face = get(attrs, "face").map(str::to_string);
+                        let size = get(attrs, "size").and_then(|s| s.trim().parse::<i32>().ok());
+                        let class_decls = {
+                            let mut d = vec![];
+                            css_sheet.lookup(n, &classes(attrs), &mut d);
+                            d
+                        };
+                        if n == "a"
+                            && let Some(h) = get(attrs, "href")
+                        {
+                            link = Some(h.trim().to_string());
+                        }
+                        if !closed {
+                            push_font(&mut fonts, n, |f| {
+                                let mut st = Style {
+                                    font: f.clone(),
+                                    ..Style::default()
+                                };
+                                apply(&mut st, &class_decls, &mut HashSet::new());
+                                apply(&mut st, &style_decls, &mut HashSet::new());
+                                *f = st.font;
+                                if let Some(c) = color.as_deref().and_then(css::color) {
+                                    f.color = c.filter(|&c| c != 0);
+                                }
+                                if let Some(face) = &face
+                                    && let Some(first) = face
+                                        .split(',')
+                                        .next()
+                                        .map(str::trim)
+                                        .filter(|s| !s.is_empty())
+                                {
+                                    f.name = first.chars().take(64).collect();
+                                }
+                                if let Some(s) = size {
+                                    // HTML's font sizes 1 to 7.
+                                    const PT: [u32; 7] = [750, 1000, 1200, 1350, 1800, 2400, 3600];
+                                    f.size_centipt = PT[(s.clamp(1, 7) - 1) as usize];
+                                }
+                            });
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            Token::End(name) => {
+                let n = name.as_str();
+                if SKIPPED.contains(&n) {
+                    skip = skip.saturating_sub(1);
+                    continue;
+                }
+                if skip > 0 {
+                    continue;
+                }
+                if comment_divs > 0 {
+                    if n == "div" {
+                        comment_divs -= 1;
+                    }
+                    continue;
+                }
+                if stack.is_empty() && BLOCKS.contains(&n) {
+                    flush_text(&mut loose, &mut done);
+                }
+                match n {
+                    "table" => {
+                        if let Some(mut o) = stack.pop() {
+                            finish_cell(&mut o, &mut fonts, &mut link, budget)?;
+                            match stack.last_mut().and_then(|p| p.cell.as_mut()) {
+                                // A table in a cell: its text, row by row.
+                                Some(cell) => {
+                                    let f = cell.style.font.clone();
+                                    let mut rows: Vec<&CellOut> = o.table.cells.iter().collect();
+                                    rows.sort_by_key(|c| (c.row, c.col));
+                                    let mut last = None;
+                                    for c in rows {
+                                        if last.is_some() && last != Some(c.row) {
+                                            cell.runs.newline(&f);
+                                        } else if last.is_some() {
+                                            cell.runs.push(" ", &f, false);
+                                        }
+                                        cell.runs.push(&c.runs.text(), &f, false);
+                                        last = Some(c.row);
+                                    }
+                                }
+                                None => done.push(Block::Table(o.table)),
+                            }
+                        }
+                    }
+                    "td" | "th" | "tr" => {
+                        if let Some(o) = stack.last_mut() {
+                            finish_cell(o, &mut fonts, &mut link, budget)?;
+                            if n == "tr" {
+                                o.row = None;
+                            }
+                        }
+                    }
+                    "caption" => {
+                        if let Some(o) = stack.last_mut() {
+                            o.in_caption = false;
+                        }
+                    }
+                    "pre" => pre = pre.saturating_sub(1),
+                    "a" => {
+                        pop_font(&mut fonts, n);
+                    }
+                    "p" | "div" | "li" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "b"
+                    | "strong" | "i" | "em" | "cite" | "var" | "u" | "ins" | "s" | "strike"
+                    | "del" | "sub" | "sup" | "font" | "span" => {
+                        pop_font(&mut fonts, n);
+                    }
+                    _ if CELL_ENDERS.contains(&n) => {}
+                    _ => {}
+                }
+            }
+            Token::Text(s) => {
+                if skip > 0 || comment_divs > 0 {
+                    continue;
+                }
+                if stack.is_empty() {
+                    if fonts.is_empty() {
+                        fonts.push((String::new(), base.font.clone()));
+                    }
+                    if let Some((_, f)) = fonts.last() {
+                        loose.push(s, f, pre > 0);
+                    }
+                    continue;
+                }
+                if let (Some(o), Some((_, f))) = (stack.last_mut(), fonts.last()) {
+                    if let Some(cell) = &mut o.cell {
+                        if let Some(l) = link.take() {
+                            cell.link.get_or_insert(l);
+                        }
+                        match cell.below.last_mut() {
+                            Some(b) => b.push(s, f, pre > 0),
+                            None => cell.runs.push(s, f, pre > 0),
+                        }
+                    } else if o.in_caption
+                        && let Some(c) = &mut o.table.caption
+                    {
+                        c.push(s, f, pre > 0);
+                    }
+                }
+            }
+            Token::Comment(_) => {}
+        }
+    }
+    // Tables left open at the end.
+    while let Some(mut o) = stack.pop() {
+        finish_cell(&mut o, &mut fonts, &mut link, budget)?;
+        if stack.is_empty() {
+            done.push(Block::Table(o.table));
+        }
+    }
+    flush_text(&mut loose, &mut done);
+    Ok(done)
+}
+
+/// Whether a cell carries Excel's attributes: its `th` is then no header.
+fn excel_cell(attrs: &[(String, String)]) -> bool {
+    attrs.iter().any(|a| a.0.starts_with("x:"))
+}
+
+fn classes(attrs: &[(String, String)]) -> Vec<&str> {
+    get(attrs, "class")
+        .map(|c| c.split_whitespace().take(16).collect())
+        .unwrap_or_default()
+}
+
+fn push_font(fonts: &mut Vec<(String, Font)>, tag: &str, f: impl FnOnce(&mut Font)) {
+    if fonts.is_empty() || fonts.len() > MAX_DEPTH {
+        return;
+    }
+    let mut font = fonts.last().map(|x| x.1.clone()).unwrap_or_default();
+    f(&mut font);
+    fonts.push((tag.to_string(), font));
+}
+
+fn pop_font(fonts: &mut Vec<(String, Font)>, tag: &str) {
+    if let Some(p) = fonts.iter().rposition(|x| x.0 == tag)
+        && p > 0
+    {
+        fonts.truncate(p);
+    }
+}
+
+fn finish_cell(
+    o: &mut Open,
+    fonts: &mut Vec<(String, Font)>,
+    link: &mut Option<String>,
+    budget: &mut Budget,
+) -> Result<()> {
+    if let Some(cell) = o.cell.take() {
+        if o.table.cells.len() >= 1 << 22 {
+            return Err(Error::TooLarge("cells"));
+        }
+        budget.alloc(cell.runs.len as u64 + 256)?;
+        o.table.cells.push(cell);
+    }
+    fonts.clear();
+    *link = None;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/exav-render/src/formats/office/sheets/html/tests.rs b/crates/exav-render/src/formats/office/sheets/html/tests.rs
new file mode 100644
index 00000000..dc865a23
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/html/tests.rs
@@ -0,0 +1,393 @@
+use super::*;
+use crate::formats::office::sheets::limits::Limits;
+
+fn read_str(s: &str) -> Workbook {
+    read(s.as_bytes(), &mut Budget::new(Limits::default())).unwrap()
+}
+
+fn value(s: &crate::formats::office::sheets::model::Sheet, r: u32, c: u32) -> &Value {
+    s.cells.get(&(r, c)).map_or(&Value::Empty, |c| &c.value)
+}
+
+fn style<'a>(
+    wb: &'a Workbook,
+    s: &crate::formats::office::sheets::model::Sheet,
+    r: u32,
+    c: u32,
+) -> &'a Style {
+    wb.styles.get(s.cells[&(r, c)].style)
+}
+
+/// A worksheet as Excel saves it as a web page, cut down.
+const EXCEL: &str = r##"<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:x="urn:schemas-microsoft-com:office:excel"
+xmlns="http://www.w3.org/TR/REC-html40">
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Excel.Sheet>
+<style>
+<!--table
+	{mso-displayed-decimal-separator:"\.";
+	mso-displayed-thousand-separator:"\,";}
+.style0
+	{mso-number-format:General;
+	text-align:general;
+	vertical-align:bottom;
+	white-space:nowrap;
+	color:windowtext;
+	font-size:10.0pt;
+	font-weight:400;
+	font-family:Arial;
+	border:none;}
+td
+	{mso-style-parent:style0;
+	padding-top:1px;
+	color:windowtext;
+	font-size:10.0pt;
+	font-family:Arial;
+	mso-number-format:General;
+	white-space:nowrap;}
+.xl24
+	{mso-style-parent:style0;
+	font-weight:700;
+	text-align:center;
+	border-top:none;
+	border-right:none;
+	border-bottom:.5pt solid windowtext;
+	border-left:none;
+	background:yellow;
+	mso-pattern:auto none;}
+.xl25
+	{mso-style-parent:style0;
+	mso-number-format:"\0022$\0022\#\,\#\#0\.00";}
+.xl26
+	{mso-style-parent:style0;
+	mso-number-format:"Short Date";}
+.xl27
+	{mso-style-parent:style0;
+	mso-number-format:"\@";
+	white-space:normal;}
+-->
+</style>
+<!--[if gte mso 9]><xml>
+ <x:ExcelWorkbook>
+  <x:ExcelWorksheets>
+   <x:ExcelWorksheet>
+    <x:Name>Budget &amp; Plan</x:Name>
+    <x:WorksheetOptions>
+     <x:FreezePanes/>
+     <x:SplitHorizontal>1</x:SplitHorizontal>
+     <x:DoNotDisplayGridlines/>
+    </x:WorksheetOptions>
+   </x:ExcelWorksheet>
+  </x:ExcelWorksheets>
+ </x:ExcelWorkbook>
+</xml><![endif]-->
+</head>
+<body link=blue vlink=purple>
+<table x:str border=0 cellpadding=0 cellspacing=0 width=355 style='border-collapse:collapse;table-layout:fixed;width:267pt'>
+ <col width=98 style='mso-width-source:userset;width:74pt'>
+ <col width=64 span=2 style='width:48pt'>
+ <col width=0 style='display:none'>
+ <tr height=34 style='height:25.5pt'>
+  <td height=34 class=xl24 width=98 style='height:25.5pt;width:74pt'>Item</td>
+  <td class=xl24 colspan=2 style='border-left:none'>Amount</td>
+  <td colspan=2 style='mso-ignore:colspan'>overflowing text</td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td height=17>Rent</td>
+  <td class=xl25 align=right x:num="1234.5">$1,234.50</td>
+  <td class=xl26 align=right x:num="40087">10/1/2009</td>
+  <td class=xl27 x:str="0042">0042</td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td rowspan=2 height=34>Total</td>
+  <td align=right x:num x:fmla="=SUM(B2:B2)">1234.5</td>
+  <td x:bool="TRUE">TRUE</td>
+  <td x:err="#DIV/0!" x:fmla="=1/0">#DIV/0!</td>
+ </tr>
+ <tr height=17 style='height:12.75pt;display:none'>
+  <td x:num>1,000</td>
+  <td><a href="https://example.com/">a link</a></td>
+  <td>line<br style='mso-data-placement:same-cell'>two</td>
+ </tr>
+</table>
+</body>
+</html>
+"##;
+
+#[test]
+fn excel_values() {
+    let wb = read_str(EXCEL);
+    let s = &wb.sheets[0];
+    assert_eq!(s.name, "Budget & Plan");
+    assert_eq!(value(s, 0, 0), &Value::text("Item"));
+    assert_eq!(value(s, 0, 1), &Value::text("Amount"));
+    // After a two-column cell, the next is in the fourth column.
+    assert_eq!(value(s, 0, 3), &Value::text("overflowing text"));
+    assert_eq!(value(s, 1, 1), &Value::Number(1234.5));
+    assert_eq!(value(s, 1, 2), &Value::Number(40087.0));
+    // x:str on the table: text, here a number's digits kept.
+    assert_eq!(value(s, 1, 3), &Value::text("0042"));
+    assert_eq!(value(s, 2, 2), &Value::Bool(true));
+    assert_eq!(value(s, 2, 3), &Value::Error(CellError::Div0));
+    // The row span pushes the next row's cells right.
+    assert_eq!(value(s, 3, 1), &Value::Number(1000.0));
+    assert_eq!(value(s, 3, 2), &Value::text("a link"));
+    assert_eq!(value(s, 3, 3), &Value::text("line\ntwo"));
+    let f = |r, c| s.cells[&(r, c)].formula.as_deref().map(str::to_string);
+    assert_eq!(f(2, 1).as_deref(), Some("SUM(B2:B2)"));
+    assert_eq!(f(2, 3).as_deref(), Some("1/0"));
+    assert_eq!(s.hyperlinks[0].url.as_deref(), Some("https://example.com/"));
+}
+
+#[test]
+fn excel_merges_sizes_options() {
+    let wb = read_str(EXCEL);
+    let s = &wb.sheets[0];
+    // A column span merges; one Excel marks mso-ignore:colspan does not.
+    assert_eq!(
+        s.merges,
+        [
+            Range {
+                r1: 0,
+                c1: 1,
+                r2: 0,
+                c2: 2
+            },
+            Range {
+                r1: 2,
+                c1: 0,
+                r2: 3,
+                c2: 0
+            }
+        ]
+    );
+    // 98 pixels: 13.29 characters of 7 pixels after 5 of padding, stored
+    // with the padding.
+    assert_eq!(s.col_info(0).and_then(|c| c.width), Some(3585.0 / 256.0));
+    assert_eq!(s.col_info(2).and_then(|c| c.width), Some(9.140625));
+    assert!(s.col_info(3).unwrap().hidden);
+    assert_eq!(s.rows[&0].height, Some(25.5));
+    assert!(s.rows[&3].hidden);
+    assert_eq!(s.freeze, Some((1, 0)));
+    assert!(!s.show_grid);
+}
+
+#[test]
+fn excel_styles() {
+    let wb = read_str(EXCEL);
+    let s = &wb.sheets[0];
+    assert_eq!(
+        (
+            wb.styles.get(0).font.name.as_str(),
+            wb.styles.get(0).font.size_centipt
+        ),
+        ("Arial", 1000)
+    );
+    let head = style(&wb, s, 0, 0);
+    assert!(head.font.bold);
+    assert_eq!(head.align.horizontal, Some("center"));
+    assert_eq!(head.fill, Fill::solid(0xFFFF00));
+    assert_eq!(head.border.bottom.style, Some("thin"));
+    assert_eq!(head.border.top.style, None);
+    // CSS escapes resolved: Excel's format code.
+    assert_eq!(style(&wb, s, 1, 1).numfmt, "\"$\"#,##0.00");
+    assert_eq!(style(&wb, s, 1, 2).numfmt, "m/d/yyyy");
+    assert_eq!(style(&wb, s, 1, 3).numfmt, "@");
+    assert!(style(&wb, s, 1, 3).align.wrap);
+    assert!(style(&wb, s, 3, 3).align.wrap);
+}
+
+/// What later Excel versions write (no `x:num`, numbers in the text with
+/// the separators the table names), and Excel's other habits.
+#[test]
+fn excel_details() {
+    let page = r##"<html xmlns:x="urn:schemas-microsoft-com:office:excel">
+<head><style>
+table {mso-displayed-decimal-separator:"\,"; mso-displayed-thousand-separator:"\.";}
+.xl70 {mso-style-parent:style0; border:.5pt solid windowtext; background:#DEEBF7; mso-pattern:#CCFFFF none;}
+</style>
+<!--[if gte mso 9]><xml><x:ExcelWorkbook><x:1904Date/></x:ExcelWorkbook></xml><![endif]-->
+</head><body>
+<table border=0 cellpadding=0 cellspacing=0>
+ <col width=98 style='mso-width-source:userset;mso-width-alt:3584;width:74pt'>
+ <tr height=17><td x:str="'Aug-01">Aug-01</td><td>1.234,5</td><td>12,5%</td></tr>
+ <tr height=38 style='height:28.0pt;mso-xlrowspan:2'><td colspan=3 style='mso-ignore:colspan'></td></tr>
+ <tr><td colspan=3 class=xl70 style='mso-ignore:colspan'>&nbsp;</td></tr>
+ <![if supportMisalignedColumns]><tr height=0 style='display:none'><td width=98>phantom</td></tr><![endif]>
+</table>
+<div style='mso-element:comment-list'><div style='mso-element:comment'><p>a comment</p></div></div>
+</body></html>"##;
+    let wb = read_str(page);
+    let s = &wb.sheets[0];
+    assert!(wb.date1904);
+    assert_eq!(value(s, 0, 0), &Value::text("Aug-01"));
+    assert_eq!(value(s, 0, 1), &Value::Number(1234.5));
+    assert_eq!(value(s, 0, 2), &Value::Number(0.125));
+    // One row standing for two empty ones, their height shared.
+    assert_eq!(s.rows[&1].height, Some(14.0));
+    assert_eq!(s.rows[&2].height, Some(14.0));
+    // An unmerged run of formatted cells: each formatted, none merged.
+    assert!(s.merges.is_empty());
+    for c in 0..3 {
+        assert_eq!(style(&wb, s, 3, c).fill, Fill::solid(0xDEEBF7));
+        assert_eq!(style(&wb, s, 3, c).border.left.style, Some("thin"));
+    }
+    // Excel's own width unit, the phantom row and the comments left out.
+    assert_eq!(s.col_info(0).and_then(|c| c.width), Some(14.0));
+    assert_eq!(s.cells.keys().map(|k| k.0).max(), Some(3));
+    assert!(
+        !s.cells
+            .values()
+            .any(|c| c.value == Value::text("a comment"))
+    );
+}
+
+#[test]
+fn several_tables_and_plain_html() {
+    let page = "<!DOCTYPE html><html><head><title>Report</title><style>td.n { text-align: right } .hot { background-color: #f00 }</style></head><body>
+<h1>Heading</h1>
+<table><thead><tr><th>Name<th>Score</thead>
+<tbody><tr><td>Ann<td class=n>12%<tr><td class=hot>Bob<td>(1,234.50)</tbody></table>
+<p>between</p>
+<table><tr><td><b>bold</b> and <i>italic</i></td><td>caf&eacute; &amp; t&#233;a&nbsp;!</td></tr>
+<tr><td><table><tr><td>inner</td><td>cells</td></tr></table></td></tr></table>
+<script>document.write('<table><tr><td>no</td></tr></table>')</script>
+</body></html>";
+    let wb = read_str(page);
+    let s = &wb.sheets[0];
+    assert_eq!(s.name, "Sheet1");
+    // Text around tables, a row each in the first column.
+    assert_eq!(value(s, 0, 0), &Value::text("Heading"));
+    assert!(style(&wb, s, 0, 0).font.bold);
+    assert_eq!(value(s, 1, 0), &Value::text("Name"));
+    let th = style(&wb, s, 1, 0);
+    assert!(th.font.bold && th.align.horizontal == Some("center"));
+    assert_eq!(value(s, 2, 1), &Value::Number(0.12));
+    assert_eq!(style(&wb, s, 2, 1).numfmt, "0%");
+    assert_eq!(style(&wb, s, 2, 1).align.horizontal, Some("right"));
+    assert_eq!(value(s, 3, 1), &Value::Number(-1234.5));
+    assert_eq!(style(&wb, s, 3, 1).numfmt, "#,##0.00");
+    assert_eq!(style(&wb, s, 3, 0).fill, Fill::solid(0xFF0000));
+    assert_eq!(value(s, 4, 0), &Value::text("between"));
+    let Value::Rich(runs) = value(s, 5, 0) else {
+        panic!("{:?}", value(s, 5, 0))
+    };
+    let parts: Vec<(&str, bool, bool)> = runs
+        .iter()
+        .map(|r| {
+            (
+                r.text.as_str(),
+                r.font.as_ref().unwrap().bold,
+                r.font.as_ref().unwrap().italic,
+            )
+        })
+        .collect();
+    assert_eq!(
+        parts,
+        [
+            ("bold", true, false),
+            (" and ", false, false),
+            ("italic", false, true)
+        ]
+    );
+    assert_eq!(value(s, 5, 1), &Value::text("café & téa !"));
+    // A table in a cell: its text.
+    assert_eq!(value(s, 6, 0), &Value::text("inner cells"));
+    // Nothing from the script.
+    assert!(!s.cells.values().any(|c| c.value == Value::text("no")));
+    assert_eq!(wb.styles.get(0).font.name, "Times New Roman");
+}
+
+#[test]
+fn captions_rules_and_breaks() {
+    // No style sheet: a line break starts a cell a row down.
+    let page = "<table border=1><caption>Facts</caption><tr><td rowspan=2>one<br>two</td><td>x</td></tr><tr><td>y</td></tr></table>";
+    let wb = read_str(page);
+    let s = &wb.sheets[0];
+    assert_eq!(value(s, 0, 0), &Value::text("Facts"));
+    assert_eq!(value(s, 1, 0), &Value::text("one"));
+    assert_eq!(value(s, 2, 0), &Value::text("two"));
+    assert_eq!(value(s, 2, 1), &Value::text("y"));
+    assert_eq!(style(&wb, s, 1, 1).border.left.style, Some("thin"));
+    // Excel's style sheet keeps it in the cell.
+    let wb = read_str(
+        "<style>br {mso-data-placement:same-cell;}</style><table><tr><td>one<br>two</td></tr></table>",
+    );
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("one\ntwo"));
+}
+
+#[test]
+fn encodings() {
+    let page = b"<html><meta charset=windows-1251><table><tr><td>\xcf\xf0\xe8\xe2\xe5\xf2</td></tr></table></html>";
+    let wb = read(page, &mut Budget::new(Limits::default())).unwrap();
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("Привет"));
+    let utf16: Vec<u8> = [0xFF, 0xFE]
+        .into_iter()
+        .chain(
+            "<table><tr><td>é</td></tr></table>"
+                .encode_utf16()
+                .flat_map(u16::to_le_bytes),
+        )
+        .collect();
+    let wb = read(&utf16, &mut Budget::new(Limits::default())).unwrap();
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("é"));
+}
+
+#[test]
+fn refusals_and_limits() {
+    let b = || Budget::new(Limits::default());
+    assert!(matches!(
+        read(b"just text, a < b", &mut b()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        read(b"<html><body><p>no table</p></body></html>", &mut b()),
+        Err(Error::NotFormat(_))
+    ));
+    // A workbook's frameset: its sheets are other files, not read.
+    let frames = b"<html><head><meta name=\"Excel Workbook Frameset\"><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>S</x:Name><x:WorksheetSource HRef=\"Book_files/sheet001.htm\"/></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head><frameset rows=\"*,39\"><frame src=\"Book_files/sheet001.htm\"></frameset></html>";
+    assert!(matches!(read(frames, &mut b()), Err(Error::Unsupported(_))));
+    let few = Limits::default().with_max_cells(5);
+    assert_eq!(
+        read(EXCEL.as_bytes(), &mut Budget::new(few)).unwrap_err(),
+        Error::TooLarge("cells")
+    );
+}
+
+#[test]
+fn hostile_pages() {
+    let b = EXCEL.as_bytes();
+    for cut in (0..b.len()).step_by(37) {
+        let _ = read(&b[..cut], &mut Budget::new(Limits::default()));
+    }
+    let deep = "<table><tr><td>".repeat(300);
+    assert!(read(deep.as_bytes(), &mut Budget::new(Limits::default())).is_err());
+    for page in [
+        "<table><tr><td rowspan=65534 colspan=65534>x</td></tr></table>",
+        "<table><col span=99999999 width=1e999><tr><td colspan=-5 rowspan=0>&#0;&#x110000;&#xD800;&bogus;&</td></tr></table>",
+        "<table x:str><tr><td x:num=\"NaN\" x:fmla=\"=\" x:bool x:err>1e999</td><td x:num>1,2,3</td></tr></table>",
+        "<table><tr><td style='mso-number-format:\"\\'; border:99999pt solid'><b><b><b>x</table></td></b>",
+        "<table><style>td{</style><tr><td class=\"a b c\">x<script>",
+        "<<<table <tr <td>>>x</table",
+        // A multi-byte character before a conditional's `>` (found by
+        // fuzzing).
+        "<table><tr><td>a<![if é>b<![endif]></td></tr></table>",
+    ] {
+        let _ = read(page.as_bytes(), &mut Budget::new(Limits::default()));
+    }
+}
+
+/// What Excel writes for browsers between `<![if !vml]>` and `<![endif]>` is
+/// not what Excel reads: the cell it holds is not a cell.
+#[test]
+fn downlevel_conditionals_hide_what_excel_writes_for_browsers() {
+    let wb = read_str(
+        "<table><tr><td>a</td><![if !vml]><td>b</td><![endif]><![if gte x]><td>c</td><![endif]></tr></table>",
+    );
+    let s = &wb.sheets[0];
+    assert_eq!(value(s, 0, 0), &Value::text("a"));
+    assert_eq!(value(s, 0, 1), &Value::text("c"));
+    assert_eq!(value(s, 0, 2), &Value::Empty);
+}
diff --git a/crates/exav-render/src/formats/office/sheets/limits.rs b/crates/exav-render/src/formats/office/sheets/limits.rs
new file mode 100644
index 00000000..7840616b
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/limits.rs
@@ -0,0 +1,142 @@
+use crate::formats::office::sheets::error::{Error, Result};
+
+/// Bounds on the work one conversion may do. A document past one of them is
+/// refused with [`Error::TooLarge`] rather than partly converted.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub struct Limits {
+    /// Bytes of input.
+    pub max_input: u64,
+    /// Cells written, empty styled cells included, over all sheets.
+    pub max_cells: u64,
+    /// Memory the workbook model and the output may take, as this module
+    /// counts it: an estimate per cell and string, the bytes of each picture
+    /// and decompressed part, and the XLSX written so far.
+    pub max_memory: u64,
+    /// Bytes of one decompressed part of an ODS or Numbers package.
+    pub max_part: u64,
+    /// Sheets (Numbers: tables).
+    pub max_sheets: u32,
+}
+
+impl Default for Limits {
+    fn default() -> Self {
+        Limits {
+            max_input: 256 << 20,
+            max_cells: 4_000_000,
+            max_memory: 1 << 30,
+            max_part: 256 << 20,
+            max_sheets: 4096,
+        }
+    }
+}
+
+impl Limits {
+    /// Defaults with another cell bound.
+    pub fn with_max_cells(mut self, n: u64) -> Self {
+        self.max_cells = n;
+        self
+    }
+
+    /// Defaults with another memory bound.
+    pub fn with_max_memory(mut self, bytes: u64) -> Self {
+        self.max_memory = bytes;
+        self
+    }
+}
+
+/// What a conversion has used of its [`Limits`].
+pub(crate) struct Budget {
+    pub limits: Limits,
+    cells: u64,
+    memory: u64,
+    swept: u64,
+    max_swept: u64,
+}
+
+/// What one cell costs in the model, beyond its strings: the cell, its key and
+/// the room a tree of cells has beyond them. Measured: a workbook of cells
+/// that hold one short string each takes about 190 bytes a cell in all, the
+/// string among them (`tests/office_memory.rs` keeps it so).
+pub(crate) const CELL_BYTES: u64 = 160;
+
+/// Columns the formatting of empty cells may be checked over, in all: a
+/// couple of seconds.
+const MAX_SWEPT: u64 = 1 << 26;
+
+impl Budget {
+    pub fn new(limits: Limits) -> Self {
+        Budget {
+            limits,
+            cells: 0,
+            memory: 0,
+            swept: 0,
+            max_swept: MAX_SWEPT,
+        }
+    }
+
+    #[cfg(test)]
+    pub fn with_max_swept(mut self, columns: u64) -> Self {
+        self.max_swept = columns;
+        self
+    }
+
+    /// Whether `columns` more may be checked, counting them if so.
+    pub fn sweep(&mut self, columns: u64) -> bool {
+        let total = self.swept.saturating_add(columns);
+        if total > self.max_swept {
+            return false;
+        }
+        self.swept = total;
+        true
+    }
+
+    /// One more cell, and `extra` bytes of its own text.
+    pub fn cell(&mut self, extra: usize) -> Result<()> {
+        self.cells += 1;
+        if self.cells > self.limits.max_cells {
+            return Err(Error::TooLarge("cells"));
+        }
+        self.alloc(CELL_BYTES + extra as u64)
+    }
+
+    /// `bytes` more held in memory.
+    pub fn alloc(&mut self, bytes: u64) -> Result<()> {
+        self.memory = self.memory.saturating_add(bytes);
+        if self.memory > self.limits.max_memory {
+            return Err(Error::TooLarge("memory"));
+        }
+        Ok(())
+    }
+
+    /// What `xml::parse` charges the memory of a tree to.
+    pub fn tree(&mut self) -> impl FnMut(u64) -> bool + '_ {
+        |bytes| self.alloc(bytes).is_ok()
+    }
+
+    /// Memory counted so far.
+    pub fn used(&self) -> u64 {
+        self.memory
+    }
+
+    /// Whether `n` more cells would still fit, without counting them.
+    pub fn room_for_cells(&self, n: u64) -> bool {
+        self.cells.saturating_add(n) <= self.limits.max_cells
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn cells_and_memory_are_bounded() {
+        let mut b = Budget::new(Limits::default().with_max_cells(2));
+        assert!(b.cell(0).is_ok());
+        assert!(b.cell(0).is_ok());
+        assert_eq!(b.cell(0), Err(Error::TooLarge("cells")));
+        let mut b = Budget::new(Limits::default().with_max_memory(1000));
+        assert!(b.alloc(999).is_ok());
+        assert_eq!(b.alloc(2), Err(Error::TooLarge("memory")));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/mod.rs b/crates/exav-render/src/formats/office/sheets/mod.rs
new file mode 100644
index 00000000..626e71d7
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/mod.rs
@@ -0,0 +1,177 @@
+//! Spreadsheets to XLSX: XLS (BIFF2 to BIFF8), ODS, FODS, OTS, Apple
+//! Numbers, and the text formats Excel opens from a .xls file (XML
+//! Spreadsheet, HTML tables, SYLK), converted for an XLSX renderer to draw, or
+//! read as text ([`text()`]) for a scanner or a search.
+
+mod charts;
+pub(crate) mod css;
+mod error;
+mod fonts;
+mod geom;
+pub(crate) mod html;
+mod limits;
+mod model;
+mod numbers;
+mod numtext;
+mod ods;
+mod r1c1;
+mod sylk;
+mod text;
+pub(crate) mod textenc;
+mod xls;
+mod xlsx;
+mod xmlss;
+
+pub use error::Error;
+pub use limits::Limits;
+
+/// The formats this module converts.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum Format {
+    /// Excel 2.x to 2003 workbooks and templates (.xls, .xlt, .xlw).
+    Xls,
+    /// OpenDocument spreadsheets and templates (.ods, .ots).
+    Ods,
+    /// Flat OpenDocument spreadsheets (.fods).
+    Fods,
+    /// Apple Numbers documents saved as one file (.numbers), Numbers '08
+    /// and later.
+    Numbers,
+    /// Excel 2002 and 2003 XML Spreadsheet (SpreadsheetML, .xml).
+    SpreadsheetMl,
+    /// HTML tables, Excel's "Web Page" among them (.htm, .html).
+    Html,
+    /// Symbolic Link (.slk).
+    Sylk,
+}
+
+impl Format {
+    /// The format of a file extension (without its dot, any case).
+    pub fn from_extension(ext: &str) -> Option<Format> {
+        Some(match ext.to_ascii_lowercase().as_str() {
+            "xls" | "xlt" | "xlw" => Format::Xls,
+            "ods" | "ots" => Format::Ods,
+            "fods" => Format::Fods,
+            "numbers" => Format::Numbers,
+            "xml" => Format::SpreadsheetMl,
+            "html" | "htm" => Format::Html,
+            "slk" | "sylk" => Format::Sylk,
+            _ => return None,
+        })
+    }
+
+    pub fn name(self) -> &'static str {
+        match self {
+            Format::Xls => "xls",
+            Format::Ods => "ods",
+            Format::Fods => "fods",
+            Format::Numbers => "numbers",
+            Format::SpreadsheetMl => "xml",
+            Format::Html => "html",
+            Format::Sylk => "slk",
+        }
+    }
+}
+
+/// A converted document.
+#[derive(Debug)]
+pub struct Converted {
+    /// The XLSX package.
+    pub xlsx: Vec<u8>,
+    /// What was left out or could not be read, for diagnostics.
+    pub warnings: Vec<String>,
+}
+
+/// Converts `input`, a document of `format`, to XLSX.
+pub fn convert(input: &[u8], format: Format, limits: &Limits) -> Result<Converted, Error> {
+    let (wb, used) = read(input, format, limits)?;
+    finish(wb, limits, used)
+}
+
+/// The text of `input`, a workbook of `format`, cut at `cap` bytes: each
+/// sheet's name and cells, its comments and its drawings' text, taken from
+/// what the reader parsed, within the same [`Limits`] and with the same
+/// refusals as [`convert`]. No XLSX is written.
+pub fn text(
+    input: &[u8],
+    format: Format,
+    limits: &Limits,
+    cap: usize,
+) -> Result<crate::formats::office::text::Text, Error> {
+    Ok(text::of(&read(input, format, limits)?.0, cap))
+}
+
+/// Reads `input` into the model, within `limits`, and says how much of the
+/// memory limit the model took.
+fn read(input: &[u8], format: Format, limits: &Limits) -> Result<(model::Workbook, u64), Error> {
+    if input.len() as u64 > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits);
+    let wb = match format {
+        Format::Xls => xls::read(input, &mut budget),
+        Format::Ods => ods::read_ods(input, &mut budget),
+        Format::Fods => ods::read_fods(input, &mut budget),
+        Format::Numbers => numbers::read(input, &mut budget),
+        Format::SpreadsheetMl => xmlss::read(input, &mut budget),
+        Format::Html => html::read(input, &mut budget),
+        Format::Sylk => sylk::read(input, &mut budget),
+    }?;
+    Ok((wb, budget.used()))
+}
+
+/// Converts an Apple Numbers document saved as a package directory, given
+/// as its files: paths relative to the package and contents.
+pub fn convert_numbers_package(
+    files: &[(&str, &[u8])],
+    limits: &Limits,
+) -> Result<Converted, Error> {
+    let total: u64 = files.iter().map(|f| f.1.len() as u64).sum();
+    if total > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits);
+    let wb = numbers::read_package(files, &mut budget)?;
+    finish(wb, limits, budget.used())
+}
+
+/// An ODF chart object's content (an office:chart holding its own data
+/// table, as presentations and drawings embed them) as a DrawingML chart
+/// part, its values written as literals. `None` when it is not a chart.
+pub fn odf_chart_part(content: &[u8]) -> Option<String> {
+    let anchor = model::Anchor {
+        from: (0, 0, 0, 0),
+        to: (0, 0, 0, 0),
+    };
+    let mut chart = ods::chart::read(content, anchor, &[], &mut |_| true).ok()??;
+    for s in &mut chart.series {
+        s.name_ref = None;
+        s.cat_ref = None;
+        s.val_ref = None;
+        s.size_ref = None;
+    }
+    Some(xlsx::chart::chart_xml(&chart))
+}
+
+/// Writes the workbook, in what the model left of the memory limit: the
+/// limit is for the model and the output together.
+fn finish(mut wb: model::Workbook, limits: &Limits, used: u64) -> Result<Converted, Error> {
+    let mut left = limits.max_memory.saturating_sub(used);
+    // The caches charts keep of the cells they draw are copies, one per series.
+    let fits = charts::fill(&mut wb, &mut |bytes| {
+        if bytes > left {
+            return false;
+        }
+        left -= bytes;
+        true
+    });
+    if !fits {
+        return Err(Error::TooLarge("memory"));
+    }
+    let xlsx = xlsx::write(&wb, left)?;
+    Ok(Converted {
+        xlsx,
+        warnings: wb.warnings,
+    })
+}
diff --git a/crates/exav-render/src/formats/office/sheets/model.rs b/crates/exav-render/src/formats/office/sheets/model.rs
new file mode 100644
index 00000000..3891b368
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/model.rs
@@ -0,0 +1,810 @@
+//! The workbook as the readers fill it and the XLSX writer serializes it.
+//! Units are XLSX's: column widths in characters as `<col width>` stores
+//! them, row heights in points, colours as RGB.
+
+use std::collections::{BTreeMap, HashMap};
+use std::rc::Rc;
+
+/// 0xRRGGBB.
+pub type Rgb = u32;
+/// Text shared between cells (an XLS string table entry is one allocation).
+pub type Str = Rc<str>;
+
+/// The error values a cell can hold in XLSX.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub enum CellError {
+    Null,
+    Div0,
+    Value,
+    Ref,
+    Name,
+    Num,
+    NA,
+    GettingData,
+}
+
+impl CellError {
+    pub fn name(self) -> &'static str {
+        match self {
+            CellError::Null => "#NULL!",
+            CellError::Div0 => "#DIV/0!",
+            CellError::Value => "#VALUE!",
+            CellError::Ref => "#REF!",
+            CellError::Name => "#NAME?",
+            CellError::Num => "#NUM!",
+            CellError::NA => "#N/A",
+            CellError::GettingData => "#GETTING_DATA",
+        }
+    }
+
+    /// The BIFF error code ([MS-XLS] 2.5.97 BErr).
+    pub fn from_biff(code: u8) -> Option<CellError> {
+        exav_unpack::biff::error_name(code).and_then(CellError::parse)
+    }
+
+    /// An error as text: one of XLSX's names, case folded.
+    pub fn parse(s: &str) -> Option<CellError> {
+        let t = s.trim();
+        [
+            CellError::Null,
+            CellError::Div0,
+            CellError::Value,
+            CellError::Ref,
+            CellError::Name,
+            CellError::Num,
+            CellError::NA,
+            CellError::GettingData,
+        ]
+        .into_iter()
+        .find(|e| e.name().eq_ignore_ascii_case(t))
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum Value {
+    Empty,
+    Number(f64),
+    Text(Str),
+    Rich(Rc<[Run]>),
+    Bool(bool),
+    Error(CellError),
+}
+
+impl Value {
+    pub fn text(s: impl Into<Str>) -> Value {
+        Value::Text(s.into())
+    }
+
+    /// Bytes of text the value holds, for the memory budget.
+    pub fn text_len(&self) -> usize {
+        match self {
+            Value::Text(t) => t.len(),
+            Value::Rich(r) => r.iter().map(|r| r.text.len() + 64).sum(),
+            _ => 0,
+        }
+    }
+
+    /// The text a chart or a label shows for the value.
+    pub fn display(&self) -> String {
+        match self {
+            Value::Text(t) => t.to_string(),
+            Value::Rich(runs) => runs.iter().map(|r| r.text.as_str()).collect(),
+            Value::Number(n) => crate::formats::office::sheets::numtext::shortest(*n),
+            Value::Bool(b) => if *b { "TRUE" } else { "FALSE" }.into(),
+            Value::Error(e) => e.name().into(),
+            Value::Empty => String::new(),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Run {
+    pub text: String,
+    pub font: Option<Font>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Cell {
+    pub value: Value,
+    /// Excel syntax, without the leading `=`.
+    pub formula: Option<Box<str>>,
+    pub style: u32,
+}
+
+impl Cell {
+    pub fn styled(style: u32) -> Cell {
+        Cell {
+            value: Value::Empty,
+            formula: None,
+            style,
+        }
+    }
+}
+
+/// A rectangle of cells, 0-based and inclusive.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Range {
+    pub r1: u32,
+    pub c1: u32,
+    pub r2: u32,
+    pub c2: u32,
+}
+
+impl Range {
+    pub fn cell(r: u32, c: u32) -> Range {
+        Range {
+            r1: r,
+            c1: c,
+            r2: r,
+            c2: c,
+        }
+    }
+
+    pub fn area(&self) -> u64 {
+        (u64::from(self.r2.saturating_sub(self.r1)) + 1)
+            * (u64::from(self.c2.saturating_sub(self.c1)) + 1)
+    }
+
+    /// Ordered corners, clipped to XLSX's grid; `None` when nothing is left.
+    pub fn clipped(self) -> Option<Range> {
+        let (r1, r2) = (self.r1.min(self.r2), self.r1.max(self.r2));
+        let (c1, c2) = (self.c1.min(self.c2), self.c1.max(self.c2));
+        if r1 > MAX_ROW || c1 > MAX_COL {
+            return None;
+        }
+        Some(Range {
+            r1,
+            c1,
+            r2: r2.min(MAX_ROW),
+            c2: c2.min(MAX_COL),
+        })
+    }
+}
+
+/// XLSX's last row and column, 0-based.
+pub const MAX_ROW: u32 = 1_048_575;
+pub const MAX_COL: u32 = 16_383;
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct Font {
+    pub name: String,
+    /// Points times 100, to keep the type hashable.
+    pub size_centipt: u32,
+    pub bold: bool,
+    pub italic: bool,
+    /// "single", "double", "singleAccounting", "doubleAccounting".
+    pub underline: Option<&'static str>,
+    pub strike: bool,
+    pub color: Option<Rgb>,
+    /// "superscript" or "subscript".
+    pub vert_align: Option<&'static str>,
+    pub family: u8,
+    pub charset: Option<u8>,
+    pub outline: bool,
+    pub shadow: bool,
+}
+
+impl Default for Font {
+    fn default() -> Self {
+        Font {
+            name: "Arial".into(),
+            size_centipt: 1000,
+            bold: false,
+            italic: false,
+            underline: None,
+            strike: false,
+            color: None,
+            vert_align: None,
+            family: 0,
+            charset: None,
+            outline: false,
+            shadow: false,
+        }
+    }
+}
+
+impl Font {
+    pub fn size_pt(&self) -> f64 {
+        f64::from(self.size_centipt) / 100.0
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct Fill {
+    /// XLSX patternType; "none" when empty.
+    pub pattern: &'static str,
+    pub fg: Option<Rgb>,
+    pub bg: Option<Rgb>,
+}
+
+impl Default for Fill {
+    fn default() -> Self {
+        Fill::NONE
+    }
+}
+
+impl Fill {
+    pub const NONE: Fill = Fill {
+        pattern: "none",
+        fg: None,
+        bg: None,
+    };
+
+    pub fn solid(c: Rgb) -> Fill {
+        Fill {
+            pattern: "solid",
+            fg: Some(c),
+            bg: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Default)]
+pub struct Edge {
+    /// XLSX border style name; `None` for no line.
+    pub style: Option<&'static str>,
+    pub color: Option<Rgb>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Default)]
+pub struct Border {
+    pub left: Edge,
+    pub right: Edge,
+    pub top: Edge,
+    pub bottom: Edge,
+    pub diagonal: Edge,
+    pub diag_up: bool,
+    pub diag_down: bool,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Default)]
+pub struct Align {
+    pub horizontal: Option<&'static str>,
+    pub vertical: Option<&'static str>,
+    pub wrap: bool,
+    pub indent: u8,
+    /// XLSX textRotation: 0 to 180, 255 for stacked.
+    pub rotation: u8,
+    pub shrink: bool,
+    pub reading_order: u8,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct Style {
+    pub font: Font,
+    pub fill: Fill,
+    pub border: Border,
+    pub align: Align,
+    pub numfmt: String,
+    pub locked: bool,
+    pub hidden: bool,
+}
+
+impl Default for Style {
+    fn default() -> Self {
+        Style {
+            font: Font::default(),
+            fill: Fill::NONE,
+            border: Border::default(),
+            align: Align::default(),
+            numfmt: "General".into(),
+            locked: true,
+            hidden: false,
+        }
+    }
+}
+
+/// Styles, deduplicated. Index 0 is the default style.
+#[derive(Default, Debug)]
+pub struct Styles {
+    pub list: Vec<Style>,
+    index: HashMap<Style, u32>,
+}
+
+impl Styles {
+    pub fn new(default: Style) -> Self {
+        let mut s = Styles::default();
+        s.add(default);
+        s
+    }
+
+    pub fn add(&mut self, st: Style) -> u32 {
+        if let Some(&i) = self.index.get(&st) {
+            return i;
+        }
+        let i = u32::try_from(self.list.len()).unwrap_or(u32::MAX);
+        self.index.insert(st.clone(), i);
+        self.list.push(st);
+        i
+    }
+
+    pub fn get(&self, i: u32) -> &Style {
+        self.list.get(i as usize).unwrap_or(&self.list[0])
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct ColInfo {
+    pub first: u32,
+    pub last: u32,
+    pub width: Option<f64>,
+    pub hidden: bool,
+    pub style: Option<u32>,
+    pub outline: u8,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct RowInfo {
+    pub height: Option<f64>,
+    pub custom_height: bool,
+    pub hidden: bool,
+    pub style: Option<u32>,
+    pub outline: u8,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
+pub enum SheetState {
+    #[default]
+    Visible,
+    Hidden,
+    VeryHidden,
+}
+
+#[derive(Clone, Debug)]
+pub struct Hyperlink {
+    pub range: Range,
+    pub url: Option<String>,
+    pub location: Option<String>,
+    pub tooltip: Option<String>,
+    pub display: Option<String>,
+}
+
+#[derive(Clone, Debug)]
+pub struct Comment {
+    pub row: u32,
+    pub col: u32,
+    pub author: String,
+    pub text: String,
+    pub visible: bool,
+}
+
+/// A differential format, for conditional formats.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Dxf {
+    pub font_color: Option<Rgb>,
+    pub bold: Option<bool>,
+    pub italic: Option<bool>,
+    pub underline: Option<&'static str>,
+    pub strike: Option<bool>,
+    pub fill: Option<Fill>,
+    pub border: Option<Border>,
+    pub numfmt: Option<String>,
+}
+
+/// A threshold of a colour scale, data bar or icon set.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Cfvo {
+    /// min, max, num, percent, percentile, formula.
+    pub kind: &'static str,
+    pub val: Option<String>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum CfKind {
+    CellIs {
+        operator: &'static str,
+        formulas: Vec<String>,
+    },
+    Expression {
+        formula: String,
+    },
+    ColorScale {
+        cfvos: Vec<Cfvo>,
+        colors: Vec<Rgb>,
+    },
+    DataBar {
+        min: Cfvo,
+        max: Cfvo,
+        color: Rgb,
+    },
+    IconSet {
+        set: String,
+        cfvos: Vec<Cfvo>,
+        reverse: bool,
+        show_value: bool,
+    },
+    /// Any other rule type: its XLSX `type`, attributes and formulas.
+    Other {
+        kind: &'static str,
+        attrs: Vec<(&'static str, String)>,
+        formulas: Vec<String>,
+    },
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct CfRule {
+    pub kind: CfKind,
+    pub dxf: Option<Dxf>,
+    pub stop: bool,
+    /// The file's own priority (lower first); 0 when it has none, and the
+    /// rule takes its place in the order of the sheet's rules.
+    pub priority: u32,
+}
+
+#[derive(Clone, Debug)]
+pub struct CondFormat {
+    pub ranges: Vec<Range>,
+    pub rules: Vec<CfRule>,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Validation {
+    pub ranges: Vec<Range>,
+    pub kind: &'static str,
+    pub operator: &'static str,
+    pub formula1: Option<String>,
+    pub formula2: Option<String>,
+    pub allow_blank: bool,
+    /// XLSX's inverted meaning: true hides the in-cell arrow.
+    pub hide_dropdown: bool,
+    pub show_input: bool,
+    pub show_error: bool,
+    pub error_style: &'static str,
+    pub prompt_title: Option<String>,
+    pub prompt: Option<String>,
+    pub error_title: Option<String>,
+    pub error: Option<String>,
+}
+
+/// Where a drawing sits: a cell and an offset in it, for each corner. The
+/// offsets are millionths of that cell's width or height.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Anchor {
+    /// col, row, col offset, row offset.
+    pub from: (u32, u32, i64, i64),
+    pub to: (u32, u32, i64, i64),
+}
+
+#[derive(Clone, Debug)]
+pub struct Image {
+    pub anchor: Anchor,
+    pub ext: &'static str,
+    pub data: Vec<u8>,
+    pub name: String,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct ChartSeries {
+    pub name_ref: Option<String>,
+    pub name: Option<String>,
+    /// Categories (or the x values of a scatter or bubble chart).
+    pub cat_ref: Option<String>,
+    pub cats: Vec<String>,
+    pub cat_nums: Option<Vec<Option<f64>>>,
+    pub val_ref: Option<String>,
+    pub vals: Vec<Option<f64>>,
+    /// Bubble sizes.
+    pub size_ref: Option<String>,
+    pub sizes: Vec<Option<f64>>,
+    pub color: Option<Rgb>,
+    /// Point colours (a pie's slices), by index.
+    pub point_colors: Vec<(u32, Rgb)>,
+    pub smooth: bool,
+    /// Line and scatter: markers shown.
+    pub marker: bool,
+    /// Line and scatter: the line drawn.
+    pub line: bool,
+    /// Combined charts: the kind this series is drawn as, when it differs.
+    pub kind: Option<ChartKind>,
+    /// On the secondary axis.
+    pub secondary: bool,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ChartKind {
+    Bar,
+    Line,
+    Area,
+    Pie,
+    Doughnut,
+    Scatter,
+    Radar,
+    FilledRadar,
+    Bubble,
+    Stock,
+    Surface,
+}
+
+#[derive(Clone, Debug)]
+pub struct Chart {
+    pub anchor: Anchor,
+    pub kind: ChartKind,
+    pub horizontal: bool,
+    /// standard, clustered, stacked, percentStacked.
+    pub grouping: &'static str,
+    pub three_d: bool,
+    pub title: Option<String>,
+    pub legend: Option<&'static str>,
+    pub series: Vec<ChartSeries>,
+    pub cat_title: Option<String>,
+    pub val_title: Option<String>,
+    /// Colour by point (pies, and charts that ask for it).
+    pub vary_colors: bool,
+    pub gap_width: Option<u32>,
+    pub overlap: Option<i32>,
+    pub hole_size: Option<u32>,
+    pub first_slice: Option<u32>,
+    pub major_grid: bool,
+    pub cat_axis_deleted: bool,
+    pub val_axis_deleted: bool,
+    /// The plot area's fill.
+    pub plot_fill: Option<Rgb>,
+    /// The chart area's fill.
+    pub area_fill: Option<Rgb>,
+}
+
+impl Chart {
+    pub fn new(anchor: Anchor, kind: ChartKind) -> Chart {
+        Chart {
+            anchor,
+            kind,
+            horizontal: false,
+            grouping: "standard",
+            three_d: false,
+            title: None,
+            legend: None,
+            series: vec![],
+            cat_title: None,
+            val_title: None,
+            vary_colors: matches!(kind, ChartKind::Pie | ChartKind::Doughnut),
+            gap_width: None,
+            overlap: None,
+            hole_size: None,
+            first_slice: None,
+            major_grid: true,
+            cat_axis_deleted: false,
+            val_axis_deleted: false,
+            plot_fill: None,
+            area_fill: None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct ShapeText {
+    pub text: String,
+    pub font: Option<Font>,
+    /// "l", "ctr", "r".
+    pub align: Option<&'static str>,
+    /// "t", "ctr", "b".
+    pub anchor: Option<&'static str>,
+}
+
+#[derive(Clone, Debug)]
+pub struct Shape {
+    pub anchor: Anchor,
+    /// DrawingML preset geometry: rect, ellipse, roundRect, line, ...
+    pub geom: &'static str,
+    pub fill: Option<Rgb>,
+    pub line: Option<Rgb>,
+    /// Line width in EMU.
+    pub line_width: Option<i64>,
+    pub line_dash: Option<&'static str>,
+    pub head_arrow: bool,
+    pub tail_arrow: bool,
+    pub text: ShapeText,
+    pub name: String,
+    /// Degrees, clockwise.
+    pub rotation: f64,
+    pub flip_h: bool,
+    pub flip_v: bool,
+}
+
+impl Shape {
+    pub fn new(anchor: Anchor, geom: &'static str) -> Shape {
+        Shape {
+            anchor,
+            geom,
+            fill: None,
+            line: None,
+            line_width: None,
+            line_dash: None,
+            head_arrow: false,
+            tail_arrow: false,
+            text: ShapeText::default(),
+            name: String::new(),
+            rotation: 0.0,
+            flip_h: false,
+            flip_v: false,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Sheet {
+    pub name: String,
+    pub state: SheetState,
+    pub cells: BTreeMap<(u32, u32), Cell>,
+    /// Array formulas: the range each master cell covers.
+    pub arrays: HashMap<(u32, u32), Range>,
+    pub cols: Vec<ColInfo>,
+    pub rows: BTreeMap<u32, RowInfo>,
+    pub default_col_width: Option<f64>,
+    pub base_col_width: Option<u32>,
+    pub default_row_height: f64,
+    pub default_row_custom: bool,
+    pub default_row_hidden: bool,
+    pub merges: Vec<Range>,
+    /// Frozen rows and columns.
+    pub freeze: Option<(u32, u32)>,
+    pub top_left: Option<(u32, u32)>,
+    pub show_grid: bool,
+    pub show_zeros: bool,
+    pub show_headers: bool,
+    pub rtl: bool,
+    pub tab_color: Option<Rgb>,
+    pub zoom: u32,
+    pub cond_formats: Vec<CondFormat>,
+    pub validations: Vec<Validation>,
+    pub hyperlinks: Vec<Hyperlink>,
+    pub comments: Vec<Comment>,
+    pub autofilter: Option<Range>,
+    pub images: Vec<Image>,
+    pub charts: Vec<Chart>,
+    pub shapes: Vec<Shape>,
+    pub protected: bool,
+    pub outline_below: bool,
+    pub outline_right: bool,
+    /// A chart sheet: its one chart fills the sheet.
+    pub chart_sheet: bool,
+}
+
+impl Sheet {
+    pub fn new(name: String) -> Self {
+        Sheet {
+            name,
+            default_row_height: 12.75,
+            show_grid: true,
+            show_zeros: true,
+            show_headers: true,
+            zoom: 100,
+            outline_below: true,
+            outline_right: true,
+            ..Default::default()
+        }
+    }
+
+    pub fn col_info(&self, c: u32) -> Option<&ColInfo> {
+        self.cols.iter().find(|x| c >= x.first && c <= x.last)
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct DefinedName {
+    pub name: String,
+    pub sheet: Option<usize>,
+    pub formula: String,
+    pub hidden: bool,
+}
+
+#[derive(Debug)]
+pub struct Workbook {
+    pub sheets: Vec<Sheet>,
+    pub styles: Styles,
+    pub date1904: bool,
+    pub names: Vec<DefinedName>,
+    pub active: usize,
+    pub first_tab: usize,
+    /// What the reader left out or could not read.
+    pub warnings: Vec<String>,
+}
+
+impl Workbook {
+    pub fn new(default: Style) -> Self {
+        Workbook {
+            sheets: vec![],
+            styles: Styles::new(default),
+            date1904: false,
+            names: vec![],
+            active: 0,
+            first_tab: 0,
+            warnings: vec![],
+        }
+    }
+
+    /// Records a warning, once, and at most a few hundred.
+    pub fn warn(&mut self, w: impl Into<String>) {
+        let w = w.into();
+        if self.warnings.len() < 256 && !self.warnings.contains(&w) {
+            self.warnings.push(w);
+        }
+    }
+}
+
+/// Link targets a reader may follow: not script and not data URLs.
+pub fn safe_url(u: &str) -> bool {
+    let l: String = u
+        .trim_start()
+        .chars()
+        .filter(|c| !c.is_whitespace() && !c.is_control())
+        .take(16)
+        .collect::<String>()
+        .to_ascii_lowercase();
+    !(l.starts_with("javascript:") || l.starts_with("vbscript:") || l.starts_with("data:"))
+}
+
+/// "A1" style column letters for 0-based `col`.
+pub use exav_unpack::biff::formula::col_name;
+
+pub fn cell_ref(row: u32, col: u32) -> String {
+    format!("{}{}", col_name(col), u64::from(row) + 1)
+}
+
+pub fn range_ref(r: &Range) -> String {
+    if r.r1 == r.r2 && r.c1 == r.c2 {
+        cell_ref(r.r1, r.c1)
+    } else {
+        format!("{}:{}", cell_ref(r.r1, r.c1), cell_ref(r.r2, r.c2))
+    }
+}
+
+/// "B12" or "$B$12" to 0-based (row, col).
+pub fn parse_cell(s: &str) -> Option<(u32, u32)> {
+    let s = s.trim();
+    let b = s.as_bytes();
+    let mut i = 0;
+    if b.get(i) == Some(&b'$') {
+        i += 1;
+    }
+    let ls = i;
+    while i < b.len() && b[i].is_ascii_alphabetic() {
+        i += 1;
+    }
+    let letters = &s[ls..i];
+    if b.get(i) == Some(&b'$') {
+        i += 1;
+    }
+    let digits = &s[i..];
+    if letters.is_empty()
+        || letters.len() > 3
+        || digits.is_empty()
+        || digits.len() > 7
+        || !digits.bytes().all(|c| c.is_ascii_digit())
+    {
+        return None;
+    }
+    let mut col = 0u32;
+    for ch in letters.bytes() {
+        col = col * 26 + u32::from(ch.to_ascii_uppercase() - b'A' + 1);
+    }
+    let row: u32 = digits.parse().ok()?;
+    Some((row.checked_sub(1)?, col.checked_sub(1)?))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn references() {
+        assert_eq!(col_name(0), "A");
+        assert_eq!(col_name(25), "Z");
+        assert_eq!(col_name(26), "AA");
+        assert_eq!(col_name(16383), "XFD");
+        assert_eq!(cell_ref(0, 0), "A1");
+        assert_eq!(parse_cell("$XFD$1048576"), Some((1_048_575, 16383)));
+        assert_eq!(parse_cell("b12"), Some((11, 1)));
+        assert_eq!(parse_cell("A0"), None);
+        assert_eq!(parse_cell("ABCD1"), None);
+        assert_eq!(parse_cell("A99999999"), None);
+        assert_eq!(
+            range_ref(&Range {
+                r1: 0,
+                c1: 0,
+                r2: 2,
+                c2: 1
+            }),
+            "A1:B3"
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/cells.rs b/crates/exav-render/src/formats/office/sheets/numbers/cells.rs
new file mode 100644
index 00000000..cca145df
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/cells.rs
@@ -0,0 +1,294 @@
+//! Cell records of table tiles. Since 2019 a record is version 5: a type
+//! byte, a field mask at byte 8, then the fields the mask names in mask
+//! order (as numbers-parser's cell.py reads them, MIT). Older records
+//! (versions 1 to 4) carry a value, a string or rich-text key and a format,
+//! as SheetJS reads them (Apache-2.0); their style keys are not read.
+
+/// Cell types of the type byte (0 is an empty cell).
+pub const NUMBER: u8 = 2;
+pub const TEXT: u8 = 3;
+pub const DATE: u8 = 5;
+pub const BOOL: u8 = 6;
+pub const DURATION: u8 = 7;
+pub const ERROR: u8 = 8;
+pub const RICH: u8 = 9;
+pub const CURRENCY: u8 = 10;
+
+/// One record's fields; keys index the table's data lists.
+#[derive(Debug, Default, Clone, PartialEq)]
+pub struct Raw {
+    pub kind: u8,
+    pub decimal: Option<f64>,
+    pub double: Option<f64>,
+    /// Seconds since 2001-01-01.
+    pub seconds: Option<f64>,
+    pub string: Option<u32>,
+    pub rich: Option<u32>,
+    pub cell_style: Option<u32>,
+    pub text_style: Option<u32>,
+    pub formula: Option<u32>,
+    pub formula_error: Option<u32>,
+    pub number_format: Option<u32>,
+    pub currency_format: Option<u32>,
+    pub date_format: Option<u32>,
+    pub duration_format: Option<u32>,
+    pub text_format: Option<u32>,
+    pub bool_format: Option<u32>,
+    pub comment: Option<u32>,
+}
+
+impl Raw {
+    /// The number the cell shows (dates as seconds, durations as seconds).
+    pub fn number(&self) -> Option<f64> {
+        match self.kind {
+            NUMBER | CURRENCY => self.decimal.or(self.double),
+            DATE => self.seconds,
+            DURATION | BOOL => self.double,
+            _ => None,
+        }
+    }
+
+    /// The format key for the value the cell holds.
+    pub fn format(&self) -> Option<u32> {
+        match self.kind {
+            NUMBER | CURRENCY => self.currency_format.or(self.number_format),
+            DATE => self.date_format.or(self.number_format),
+            DURATION => self.duration_format.or(self.number_format),
+            TEXT | RICH => self.text_format,
+            BOOL => self.bool_format,
+            _ => None,
+        }
+    }
+}
+
+pub fn decode(b: &[u8]) -> Option<Raw> {
+    match *b.first()? {
+        5 => decode_v5(b),
+        v @ 1..=4 => decode_old(b, v),
+        _ => None,
+    }
+}
+
+fn u32_at(b: &[u8], p: usize) -> Option<u32> {
+    Some(u32::from_le_bytes(b.get(p..p + 4)?.try_into().ok()?))
+}
+
+struct Reader<'a> {
+    b: &'a [u8],
+    p: usize,
+}
+
+impl Reader<'_> {
+    fn u32(&mut self) -> Option<u32> {
+        let v = u32_at(self.b, self.p)?;
+        self.p += 4;
+        Some(v)
+    }
+    fn f64(&mut self) -> Option<f64> {
+        let v = self.b.get(self.p..self.p + 8)?;
+        self.p += 8;
+        Some(f64::from_le_bytes(v.try_into().ok()?))
+    }
+    fn skip(&mut self, n: usize) {
+        self.p += n;
+    }
+}
+
+fn decode_v5(b: &[u8]) -> Option<Raw> {
+    let flags = u32_at(b, 8)?;
+    let mut r = Reader { b, p: 12 };
+    let mut c = Raw {
+        kind: *b.get(1)?,
+        ..Raw::default()
+    };
+    if flags & 0x1 != 0 {
+        c.decimal = Some(decimal128(b.get(r.p..r.p + 16)?));
+        r.skip(16);
+    }
+    if flags & 0x2 != 0 {
+        c.double = Some(r.f64()?);
+    }
+    if flags & 0x4 != 0 {
+        c.seconds = Some(r.f64()?);
+    }
+    // The 4-byte keys, in mask order.
+    let keys: [(u32, Option<&mut Option<u32>>); 17] = [
+        (0x8, Some(&mut c.string)),
+        (0x10, Some(&mut c.rich)),
+        (0x20, Some(&mut c.cell_style)),
+        (0x40, Some(&mut c.text_style)),
+        (0x80, None),
+        (0x100, None),
+        (0x200, Some(&mut c.formula)),
+        (0x400, None),
+        (0x800, Some(&mut c.formula_error)),
+        (0x1000, None),
+        (0x2000, Some(&mut c.number_format)),
+        (0x4000, Some(&mut c.currency_format)),
+        (0x8000, Some(&mut c.date_format)),
+        (0x10000, Some(&mut c.duration_format)),
+        (0x20000, Some(&mut c.text_format)),
+        (0x40000, Some(&mut c.bool_format)),
+        (0x80000, Some(&mut c.comment)),
+    ];
+    for (bit, slot) in keys {
+        if flags & bit == 0 {
+            continue;
+        }
+        let v = r.u32()?;
+        if let Some(s) = slot {
+            *s = Some(v);
+        }
+    }
+    Some(c)
+}
+
+fn decode_old(b: &[u8], v: u8) -> Option<Raw> {
+    let flags = u32_at(b, 4)?;
+    let mut r = Reader {
+        b,
+        p: if v > 1 { 12 } else { 8 },
+    };
+    let mut c = Raw {
+        kind: *b.get(if v >= 4 { 1 } else { 2 })?,
+        ..Raw::default()
+    };
+    let mut format = None;
+    if flags & 0x2 != 0 {
+        format = Some(r.u32()?);
+    }
+    r.skip((flags & if v > 1 { 0xD8C } else { 0x18C }).count_ones() as usize * 4);
+    if flags & 0x200 != 0 {
+        c.rich = Some(r.u32()?);
+    }
+    r.skip((flags & if v > 1 { 0x3000 } else { 0x1000 }).count_ones() as usize * 4);
+    if flags & 0x10 != 0 {
+        c.string = Some(r.u32()?);
+    }
+    if flags & 0x20 != 0 {
+        c.double = Some(r.f64()?);
+    }
+    if flags & 0x40 != 0 {
+        c.seconds = Some(r.f64()?);
+    }
+    if v > 1 && (u32_at(b, 8)? >> 16) & 0xFF != 0 && format.is_none() {
+        format = Some(r.u32()?);
+    }
+    c.number_format = format;
+    if c.kind == NUMBER {
+        c.decimal = c.double;
+    }
+    Some(c)
+}
+
+/// An IEEE 754 decimal128 in the binary integer encoding, as Numbers
+/// stores it: a 14-bit exponent biased by 6176 and a 113-bit coefficient.
+/// Parsed through its decimal text, so that the double is the nearest one.
+pub fn decimal128(b: &[u8]) -> f64 {
+    if b.len() < 16 {
+        return 0.0;
+    }
+    let exp = ((i32::from(b[15] & 0x7F) << 7) | i32::from(b[14] >> 1)) - 6176;
+    let mut m: u128 = u128::from(b[14] & 1);
+    for &x in b[..14].iter().rev() {
+        m = (m << 8) | u128::from(x);
+    }
+    let sign = if b[15] & 0x80 != 0 { "-" } else { "" };
+    format!("{sign}{m}e{exp}").parse().unwrap_or(0.0)
+}
+
+/// The column records of one tile row: `offsets` are 16-bit, in units of
+/// 4 bytes when `wide`, negative for an empty column.
+pub fn row_cells<'a>(storage: &'a [u8], offsets: &[u8], wide: bool) -> Vec<(u32, &'a [u8])> {
+    let starts: Vec<Option<usize>> = offsets
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|o| {
+            let v = i16::from_le_bytes(*o);
+            (v >= 0).then(|| v as usize * if wide { 4 } else { 1 })
+        })
+        .collect();
+    let mut out = vec![];
+    for (col, s) in starts.iter().enumerate() {
+        let Some(s) = *s else { continue };
+        let end = starts[col + 1..]
+            .iter()
+            .flatten()
+            .next()
+            .copied()
+            .unwrap_or(storage.len())
+            .min(storage.len());
+        if let Some(rec) = storage.get(s..end.max(s)) {
+            out.push((col as u32, rec));
+        }
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn d128(m: u64, exp: i32, neg: bool) -> [u8; 16] {
+        let mut b = [0u8; 16];
+        b[..8].copy_from_slice(&m.to_le_bytes());
+        let e = (exp + 6176) as u32;
+        b[14] |= ((e & 0x7F) << 1) as u8;
+        b[15] |= (e >> 7) as u8;
+        if neg {
+            b[15] |= 0x80;
+        }
+        b
+    }
+
+    #[test]
+    fn decimals() {
+        assert_eq!(decimal128(&d128(12345, -2, false)), 123.45);
+        assert_eq!(decimal128(&d128(1, 3, true)), -1000.0);
+        assert_eq!(decimal128(&d128(0, 0, false)), 0.0);
+        // 0.1 is the double nearest to 1e-1, not 1 * 0.1 computed.
+        assert_eq!(decimal128(&d128(1, -1, false)), 0.1);
+    }
+
+    #[test]
+    fn v5_fields_in_mask_order() {
+        let mut b = vec![5u8, NUMBER, 0, 0, 0, 0, 0, 0];
+        b.extend_from_slice(&(0x1u32 | 0x20 | 0x200 | 0x2000).to_le_bytes());
+        b.extend_from_slice(&d128(42, 0, false));
+        b.extend_from_slice(&7u32.to_le_bytes());
+        b.extend_from_slice(&9u32.to_le_bytes());
+        b.extend_from_slice(&3u32.to_le_bytes());
+        let c = decode(&b).unwrap();
+        assert_eq!(c.number(), Some(42.0));
+        assert_eq!(
+            (c.cell_style, c.formula, c.number_format),
+            (Some(7), Some(9), Some(3))
+        );
+        assert_eq!(c.format(), Some(3));
+        // Truncated: refused, not misread.
+        assert!(decode(&b[..b.len() - 2]).is_none());
+    }
+
+    #[test]
+    fn offsets() {
+        let storage = b"aaaabbbbbbbbcccc";
+        // Columns 0, 2 and 3; column 1 empty.
+        let offs: Vec<u8> = [0i16, -1, 1, 3]
+            .iter()
+            .flat_map(|v| v.to_le_bytes())
+            .collect();
+        let cells = row_cells(storage, &offs, true);
+        assert_eq!(
+            cells,
+            vec![
+                (0, &storage[0..4]),
+                (2, &storage[4..12]),
+                (3, &storage[12..16])
+            ]
+        );
+        // An offset past the buffer is dropped.
+        let offs: Vec<u8> = [0i16, 100].iter().flat_map(|v| v.to_le_bytes()).collect();
+        assert_eq!(row_cells(storage, &offs, false).len(), 1);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/fonts.rs b/crates/exav-render/src/formats/office/sheets/numbers/fonts.rs
new file mode 100644
index 00000000..b1c3aa0c
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/fonts.rs
@@ -0,0 +1,155 @@
+// Generated by scripts/office/sheets/numbers_fonts.py from numbers-parser's
+// fontmap.py (MIT, Jon Connell). Do not edit.
+
+/// (PostScript name, family), by name.
+#[rustfmt::skip]
+pub(crate) const FAMILIES: &[(&str, &str)] = &[
+    ("AcademyEngravedLetPlain", "Academy Engraved LET"),
+    ("Apple-Chancery", "Apple Chancery"),
+    ("AppleGothic", "AppleGothic"),
+    ("AppleMyungjo", "AppleMyungjo"),
+    ("AppleSDGothicNeo-Bold", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-ExtraBold", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-Heavy", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-Light", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-Medium", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-Regular", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-SemiBold", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-Thin", "Apple SD Gothic Neo"),
+    ("AppleSDGothicNeo-UltraLight", "Apple SD Gothic Neo"),
+    ("Arial-Black", "Arial Black"),
+    ("ArialRoundedMTBold", "Arial Rounded MT Bold"),
+    ("BodoniOrnamentsITCTT", "Bodoni Ornaments"),
+    ("BodoniSvtyTwoITCTT-Bold", "Bodoni 72"),
+    ("BodoniSvtyTwoITCTT-Book", "Bodoni 72"),
+    ("BodoniSvtyTwoITCTT-BookIta", "Bodoni 72"),
+    ("BodoniSvtyTwoOSITCTT-Bold", "Bodoni 72 Oldstyle"),
+    ("BodoniSvtyTwoOSITCTT-Book", "Bodoni 72 Oldstyle"),
+    ("BodoniSvtyTwoOSITCTT-BookIt", "Bodoni 72 Oldstyle"),
+    ("BodoniSvtyTwoSCITCTT-Book", "Bodoni 72 Smallcaps"),
+    ("BradleyHandITCTT-Bold", "Bradley Hand"),
+    ("BrushScriptMT", "Brush Script MT"),
+    ("CourierNewPS-BoldItalicMT", "Courier New"),
+    ("CourierNewPS-BoldMT", "Courier New"),
+    ("CourierNewPS-ItalicMT", "Courier New"),
+    ("DINAlternate-Bold", "DIN Alternate"),
+    ("DINCondensed-Bold", "DIN Condensed"),
+    ("DamascusBold", "Damascus"),
+    ("DamascusLight", "Damascus"),
+    ("DamascusMedium", "Damascus"),
+    ("DamascusSemiBold", "Damascus"),
+    ("DecoTypeNaskh", "DecoType Naskh"),
+    ("DevanagariMT", "Devanagari MT"),
+    ("DevanagariMT-Bold", "Devanagari MT"),
+    ("DiwanMishafi", "Mishafi"),
+    ("DiwanMishafiGold", "Mishafi Gold"),
+    ("FoundersGroteskCond-Bold", "Founders Grotesk Condensed"),
+    ("FoundersGroteskCond-Reg", "Founders Grotesk Condensed"),
+    ("FoundersGroteskCond-SmBd", "Founders Grotesk Condensed"),
+    ("GB18030Bitmap", "GB18030 Bitmap"),
+    ("GujaratiMT", "Gujarati MT"),
+    ("GujaratiMT-Bold", "Gujarati MT"),
+    ("HiraMaruProN-W4", "Hiragino Maru Gothic ProN"),
+    ("HiraMinProN-W3", "Hiragino Mincho ProN"),
+    ("HiraMinProN-W6", "Hiragino Mincho ProN"),
+    ("ITFDevanagari-Bold", "ITF Devanagari"),
+    ("ITFDevanagari-Book", "ITF Devanagari"),
+    ("ITFDevanagari-Demi", "ITF Devanagari"),
+    ("ITFDevanagari-Light", "ITF Devanagari"),
+    ("ITFDevanagari-Medium", "ITF Devanagari"),
+    ("ITFDevanagariMarathi-Bold", "ITF Devanagari Marathi"),
+    ("ITFDevanagariMarathi-Book", "ITF Devanagari Marathi"),
+    ("ITFDevanagariMarathi-Demi", "ITF Devanagari Marathi"),
+    ("ITFDevanagariMarathi-Light", "ITF Devanagari Marathi"),
+    ("ITFDevanagariMarathi-Medium", "ITF Devanagari Marathi"),
+    ("InaiMathi", "InaiMathi"),
+    ("InaiMathi-Bold", "InaiMathi"),
+    ("KufiStandardGK", "KufiStandardGK"),
+    ("MonotypeGurmukhi", "Gurmukhi MT"),
+    ("MshtakanBold", "Mshtakan"),
+    ("MshtakanBoldOblique", "Mshtakan"),
+    ("MshtakanOblique", "Mshtakan"),
+    ("MunaBlack", "Muna"),
+    ("MunaBold", "Muna"),
+    ("NewPeninimMT", "New Peninim MT"),
+    ("NewPeninimMT-Bold", "New Peninim MT"),
+    ("NewPeninimMT-BoldInclined", "New Peninim MT"),
+    ("NewPeninimMT-Inclined", "New Peninim MT"),
+    ("PTMono-Bold", "PT Mono"),
+    ("PTMono-Regular", "PT Mono"),
+    ("PTSans-Bold", "PT Sans"),
+    ("PTSans-BoldItalic", "PT Sans"),
+    ("PTSans-Caption", "PT Sans Caption"),
+    ("PTSans-CaptionBold", "PT Sans Caption"),
+    ("PTSans-Italic", "PT Sans"),
+    ("PTSans-Narrow", "PT Sans Narrow"),
+    ("PTSans-NarrowBold", "PT Sans Narrow"),
+    ("PTSans-Regular", "PT Sans"),
+    ("PTSerif-Bold", "PT Serif"),
+    ("PTSerif-BoldItalic", "PT Serif"),
+    ("PTSerif-Caption", "PT Serif Caption"),
+    ("PTSerif-CaptionItalic", "PT Serif Caption"),
+    ("PTSerif-Italic", "PT Serif"),
+    ("PTSerif-Regular", "PT Serif"),
+    ("PartyLetPlain", "Party LET"),
+    ("PingFangHK-Light", "PingFang HK"),
+    ("PingFangHK-Medium", "PingFang HK"),
+    ("PingFangHK-Regular", "PingFang HK"),
+    ("PingFangHK-Semibold", "PingFang HK"),
+    ("PingFangHK-Thin", "PingFang HK"),
+    ("PingFangHK-Ultralight", "PingFang HK"),
+    ("PingFangMO-Light", "PingFang MO"),
+    ("PingFangMO-Medium", "PingFang MO"),
+    ("PingFangMO-Regular", "PingFang MO"),
+    ("PingFangMO-Semibold", "PingFang MO"),
+    ("PingFangMO-Thin", "PingFang MO"),
+    ("PingFangMO-Ultralight", "PingFang MO"),
+    ("PingFangSC-Light", "PingFang SC"),
+    ("PingFangSC-Medium", "PingFang SC"),
+    ("PingFangSC-Regular", "PingFang SC"),
+    ("PingFangSC-Semibold", "PingFang SC"),
+    ("PingFangSC-Thin", "PingFang SC"),
+    ("PingFangSC-Ultralight", "PingFang SC"),
+    ("PingFangTC-Light", "PingFang TC"),
+    ("PingFangTC-Medium", "PingFang TC"),
+    ("PingFangTC-Regular", "PingFang TC"),
+    ("PingFangTC-Semibold", "PingFang TC"),
+    ("PingFangTC-Thin", "PingFang TC"),
+    ("PingFangTC-Ultralight", "PingFang TC"),
+    ("RaananaBold", "Raanana"),
+    ("STHeitiSC-Light", "Heiti SC"),
+    ("STHeitiSC-Medium", "Heiti SC"),
+    ("STHeitiTC-Light", "Heiti TC"),
+    ("STHeitiTC-Medium", "Heiti TC"),
+    ("STIXTwoMath-Regular", "STIX Two Math"),
+    ("STIXTwoText", "STIX Two Text"),
+    ("STIXTwoText-Italic", "STIX Two Text"),
+    ("STIXTwoText-Italic_Bold-Italic", "STIX Two Text"),
+    ("STIXTwoText-Italic_Medium-Italic", "STIX Two Text"),
+    ("STIXTwoText-Italic_SemiBold-Italic", "STIX Two Text"),
+    ("STIXTwoText_Bold", "STIX Two Text"),
+    ("STIXTwoText_Medium", "STIX Two Text"),
+    ("STIXTwoText_SemiBold", "STIX Two Text"),
+    ("STSongti-SC-Black", "Songti SC"),
+    ("STSongti-SC-Bold", "Songti SC"),
+    ("STSongti-SC-Light", "Songti SC"),
+    ("STSongti-SC-Regular", "Songti SC"),
+    ("STSongti-TC-Bold", "Songti TC"),
+    ("STSongti-TC-Light", "Songti TC"),
+    ("STSongti-TC-Regular", "Songti TC"),
+    ("SavoyeLetPlain", "Savoye LET"),
+    ("ShreeDev0714", "Shree Devanagari 714"),
+    ("ShreeDev0714-Bold", "Shree Devanagari 714"),
+    ("ShreeDev0714-BoldItalic", "Shree Devanagari 714"),
+    ("ShreeDev0714-Italic", "Shree Devanagari 714"),
+    ("SignPainter-HouseScript", "SignPainter"),
+    ("SignPainter-HouseScriptSemibold", "SignPainter"),
+    ("TimesNewRomanPS-BoldItalicMT", "Times New Roman"),
+    ("TimesNewRomanPS-BoldMT", "Times New Roman"),
+    ("TimesNewRomanPS-ItalicMT", "Times New Roman"),
+    ("Trebuchet-BoldItalic", "Trebuchet MS"),
+    ("WaseemLight", "Waseem"),
+    ("Wingdings2", "Wingdings 2"),
+    ("Wingdings3", "Wingdings 3"),
+    ("ZapfDingbatsITC", "Zapf Dingbats"),
+];
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/format.rs b/crates/exav-render/src/formats/office/sheets/numbers/format.rs
new file mode 100644
index 00000000..8d0ff03a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/format.rs
@@ -0,0 +1,586 @@
+//! Numbers cell formats (TSK.FormatStructArchive) to XLSX format codes.
+//!
+//! FormatStructArchive fields: format_type 1, decimal_places 2 (253 for
+//! automatic), currency_code 3, negative_style 4 (0 minus, 1 red, 2
+//! parentheses, 3 red parentheses), show_thousands_separator 5,
+//! use_accounting_style 6, duration_style 7 (0 compact, 1 short, 2 long),
+//! base 8, base_places 9, fraction_accuracy 11, date_time_format 14 (an
+//! ICU pattern),
+//! duration_unit_largest 15 and duration_unit_smallest 16 (1 week, 2 day,
+//! 4 hour, 8 minute, 16 second, 32 millisecond), custom_format_string 18,
+//! scale_factor 19, num_nonspace_integer_digits 29,
+//! num_nonspace_decimal_digits 30, use_automatic_duration_units 40,
+//! custom_uid 41, bool_true_string 44, bool_false_string 45.
+
+use super::proto::Msg;
+
+pub const DECIMAL: u32 = 256;
+pub const CURRENCY: u32 = 257;
+pub const PERCENT: u32 = 258;
+pub const SCIENTIFIC: u32 = 259;
+pub const TEXT: u32 = 260;
+pub const DATE: u32 = 261;
+pub const FRACTION: u32 = 262;
+pub const DURATION: u32 = 268;
+pub const BASE: u32 = 269;
+pub const CUSTOM_NUMBER: u32 = 270;
+pub const CUSTOM_TEXT: u32 = 271;
+pub const CUSTOM_DATE: u32 = 272;
+pub const CUSTOM_CURRENCY: u32 = 274;
+
+const AUTO_DECIMALS: u64 = 253;
+
+/// For a date format without a pattern.
+pub const DEFAULT_DATE: &str = "yyyy-mm-dd hh:mm:ss";
+
+/// A format's XLSX code for a cell holding `value` (automatic decimals
+/// depend on it); `None` for General. Custom formats are resolved by the
+/// caller and passed as `custom`.
+pub fn code(f: Msg, custom: Option<Msg>, value: Option<f64>) -> Option<String> {
+    let kind = f.uint(1).unwrap_or(0) as u32;
+    match kind {
+        DECIMAL if general(f) => None,
+        DECIMAL => Some(decimal(f, value, "")),
+        PERCENT => Some(decimal(f, value.map(|v| v * 100.0), "%")),
+        CURRENCY => {
+            let sym = symbol(&f.string(3).unwrap_or_default());
+            let body = decimal(f, value, "");
+            let lit = format!("\"{}\"", sym.replace('"', ""));
+            if f.boolean(6).unwrap_or(false) {
+                // Accounting: the symbol at the left edge, the number at the right.
+                let pos = body.split(';').next().unwrap_or("0");
+                return Some(format!("{lit}* {pos};{lit}* ({pos})"));
+            }
+            if !body.contains(';') {
+                // A plain minus follows the symbol.
+                return Some(format!("{lit}{body};{lit}-{body}"));
+            }
+            Some(
+                body.split(';')
+                    .map(|s| prefix_number(s, &lit))
+                    .collect::<Vec<_>>()
+                    .join(";"),
+            )
+        }
+        SCIENTIFIC => {
+            let d = f
+                .uint(2)
+                .filter(|&d| d < AUTO_DECIMALS)
+                .unwrap_or(2)
+                .min(15) as usize;
+            Some(format!("0{}E+00", dots(d, '0')))
+        }
+        TEXT => Some("@".into()),
+        DATE => date(&f.string(14).unwrap_or_default()).or_else(|| Some(DEFAULT_DATE.into())),
+        FRACTION => Some(fraction(f.uint(11).unwrap_or(0xFFFF_FFFD) as u32)),
+        // Other bases than 10 have no XLSX code.
+        BASE if f.uint(8) == Some(10) => {
+            Some("0".repeat(f.uint(9).unwrap_or(1).clamp(1, 30) as usize))
+        }
+        DURATION => Some(duration(f, value)),
+        CUSTOM_NUMBER | CUSTOM_CURRENCY => custom_number(custom.unwrap_or(f), f),
+        CUSTOM_DATE => {
+            let c = custom.unwrap_or(f);
+            date(&c.string(18).or_else(|| c.string(14)).unwrap_or_default())
+                .or_else(|| Some(DEFAULT_DATE.into()))
+        }
+        CUSTOM_TEXT => custom_text(&custom.unwrap_or(f).string(18).unwrap_or_default()),
+        _ => None,
+    }
+}
+
+fn dots(n: usize, c: char) -> String {
+    if n == 0 {
+        String::new()
+    } else {
+        format!(".{}", c.to_string().repeat(n))
+    }
+}
+
+/// Decimals a number shows when its format has automatic decimals: those
+/// of its shortest text, at most 10.
+fn auto_decimals(v: f64) -> usize {
+    let s = crate::formats::office::sheets::numtext::shortest(v.abs());
+    if s.contains('e') {
+        return 10;
+    }
+    s.split_once('.').map_or(0, |(_, d)| d.len().min(10))
+}
+
+/// A DECIMAL format that shows numbers as General does: automatic
+/// decimals, no separators, a plain minus.
+fn general(f: Msg) -> bool {
+    f.uint(2).unwrap_or(AUTO_DECIMALS) >= AUTO_DECIMALS
+        && !f.boolean(5).unwrap_or(false)
+        && f.uint(4).unwrap_or(0) == 0
+}
+
+/// DECIMAL, PERCENT and the number of CURRENCY: `suffix` follows each
+/// section.
+fn decimal(f: Msg, value: Option<f64>, suffix: &str) -> String {
+    let places = f.uint(2).unwrap_or(AUTO_DECIMALS);
+    let d = if places >= AUTO_DECIMALS {
+        value.map_or(0, auto_decimals)
+    } else {
+        places.min(30) as usize
+    };
+    let int = if f.boolean(5).unwrap_or(false) {
+        "#,##0"
+    } else {
+        "0"
+    };
+    let pos = format!("{int}{}{suffix}", dots(d, '0'));
+    match f.uint(4).unwrap_or(0) {
+        1 => format!("{pos};[Red]{pos}"),
+        2 => format!("{pos};({pos})"),
+        3 => format!("{pos};[Red]({pos})"),
+        _ => pos,
+    }
+}
+
+/// `lit` before the number of a section, after its colour.
+fn prefix_number(section: &str, lit: &str) -> String {
+    let (color, rest) = match section.strip_prefix("[Red]") {
+        Some(r) => ("[Red]", r),
+        None => ("", section),
+    };
+    match rest.strip_prefix('(') {
+        Some(r) => format!("{color}({lit}{r}"),
+        None => format!("{color}{lit}{rest}"),
+    }
+}
+
+/// The symbol of an ISO 4217 code as English-locale Numbers shows it.
+fn symbol(code: &str) -> String {
+    const SYMBOLS: &[(&str, &str)] = &[
+        ("AUD", "A$"),
+        ("BRL", "R$"),
+        ("CAD", "CA$"),
+        ("CHF", "CHF "),
+        ("CNY", "CN¥"),
+        ("EUR", "€"),
+        ("GBP", "£"),
+        ("HKD", "HK$"),
+        ("ILS", "₪"),
+        ("INR", "₹"),
+        ("JPY", "JP¥"),
+        ("KRW", "₩"),
+        ("MXN", "MX$"),
+        ("NZD", "NZ$"),
+        ("PHP", "₱"),
+        ("THB", "฿"),
+        ("TWD", "NT$"),
+        ("USD", "$"),
+        ("VND", "₫"),
+        ("XAF", "FCFA "),
+        ("XCD", "EC$"),
+        ("XOF", "CFA "),
+    ];
+    match SYMBOLS.iter().find(|s| s.0 == code) {
+        Some(s) => s.1.to_string(),
+        None if code.is_empty() => "$".into(),
+        None => format!("{code} "),
+    }
+}
+
+fn fraction(accuracy: u32) -> String {
+    match accuracy {
+        0xFFFF_FFFF => "# ?/?".into(),
+        0xFFFF_FFFE => "# ??/??".into(),
+        0xFFFF_FFFD => "# ???/???".into(),
+        d @ 1..=99_999 => format!("# ?/{d}"),
+        _ => "# ???/???".into(),
+    }
+}
+
+/// DURATION: the value is converted to days by the caller; the code shows
+/// the units the format names, from the largest down to the smallest.
+fn duration(f: Msg, value: Option<f64>) -> String {
+    let (mut largest, mut smallest) = (
+        f.uint(15).unwrap_or(4) as u32,
+        f.uint(16).unwrap_or(16) as u32,
+    );
+    if f.boolean(40).unwrap_or(false) {
+        (largest, smallest) = auto_units(value.unwrap_or(0.0) * 86_400.0);
+    }
+    let compact = f.uint(7).unwrap_or(0) == 0;
+    let long = f.uint(7) == Some(2);
+    // Excel has no weeks, counts whole days only as a rounded number and
+    // milliseconds only as a fraction of the seconds: weeks show as days,
+    // days followed by smaller units as hours, milliseconds after seconds.
+    let ms = smallest >= 32;
+    let largest = largest.min(16);
+    let smallest = smallest.min(16).max(largest.max(2));
+    let largest = if smallest > 2 { largest.max(4) } else { 2 };
+    // Compact durations pad minutes and seconds to two digits, unless one
+    // unit shows alone.
+    let pad = compact && (smallest > largest || ms);
+    let mut out = String::new();
+    for unit in [2u32, 4, 8, 16] {
+        if unit < largest || unit > smallest {
+            continue;
+        }
+        let first = out.is_empty();
+        let tok = match (unit, first, pad || (unit == 16 && ms)) {
+            (2, _, _) => "0",
+            (4, true, _) => "[h]",
+            (8, true, true) => "[mm]",
+            (8, true, false) => "[m]",
+            (16, true, true) => "[ss]",
+            (16, true, false) => "[s]",
+            (4, false, _) => "h",
+            (8, false, true) => "mm",
+            (8, false, false) => "m",
+            (16, false, true) => "ss",
+            _ => "s",
+        };
+        if !first {
+            out.push(if compact { ':' } else { ' ' });
+        }
+        out.push_str(tok);
+        if unit == 16 && ms {
+            out.push_str(".000");
+        }
+        if !compact {
+            let i = [2, 4, 8, 16].iter().position(|&u| u == unit).unwrap_or(0);
+            out.push_str(if long {
+                ["\" days\"", "\" hours\"", "\" minutes\"", "\" seconds\""][i]
+            } else {
+                ["\"d\"", "\"h\"", "\"m\"", "\"s\""][i]
+            });
+        }
+    }
+    out
+}
+
+/// The units numbers-parser's notes say automatic durations show.
+fn auto_units(secs: f64) -> (u32, u32) {
+    if secs == 0.0 {
+        return (2, 2);
+    }
+    // To the millisecond: the seconds come back from days.
+    let a = (secs.abs() * 1000.0).round() / 1000.0;
+    let largest = if a >= 604_800.0 {
+        1
+    } else if a >= 86_400.0 {
+        2
+    } else if a >= 3600.0 {
+        4
+    } else if a >= 60.0 {
+        8
+    } else if a >= 1.0 {
+        16
+    } else {
+        32
+    };
+    let smallest = if a.fract() != 0.0 {
+        32
+    } else if a % 60.0 != 0.0 {
+        16
+    } else if a % 3600.0 != 0.0 {
+        8
+    } else if a % 86_400.0 != 0.0 {
+        4
+    } else {
+        2
+    };
+    (largest, smallest.max(largest))
+}
+
+/// An ICU date pattern to an XLSX date code.
+pub fn date(p: &str) -> Option<String> {
+    let chars: Vec<char> = p.chars().collect();
+    let mut out = String::new();
+    let mut i = 0;
+    while i < chars.len() {
+        let c = chars[i];
+        if c == '\'' {
+            // 'literal', '' for a quote.
+            if chars.get(i + 1) == Some(&'\'') {
+                out.push_str("\\'");
+                i += 2;
+                continue;
+            }
+            let mut lit = String::new();
+            i += 1;
+            while i < chars.len() {
+                if chars[i] == '\'' {
+                    if chars.get(i + 1) == Some(&'\'') {
+                        lit.push('\'');
+                        i += 2;
+                        continue;
+                    }
+                    i += 1;
+                    break;
+                }
+                lit.push(chars[i]);
+                i += 1;
+            }
+            if !lit.is_empty() {
+                out.push('"');
+                out.push_str(&lit.replace('"', ""));
+                out.push('"');
+            }
+            continue;
+        }
+        if !c.is_ascii_alphabetic() {
+            match c {
+                ' ' | '-' | '/' | ':' | ',' | '.' | '(' | ')' => out.push(c),
+                '"' => {}
+                _ => {
+                    out.push('\\');
+                    out.push(c);
+                }
+            }
+            i += 1;
+            continue;
+        }
+        let mut n = 1;
+        while chars.get(i + n) == Some(&c) {
+            n += 1;
+        }
+        i += n;
+        let tok: &str = match (c, n) {
+            ('y' | 'Y' | 'u', 2) => "yy",
+            ('y' | 'Y' | 'u', _) => "yyyy",
+            ('M' | 'L', 1) => "m",
+            ('M' | 'L', 2) => "mm",
+            ('M' | 'L', 3) => "mmm",
+            ('M' | 'L', 4) => "mmmm",
+            ('M' | 'L', _) => "mmmmm",
+            ('d', 1) => "d",
+            ('d', _) => "dd",
+            ('E' | 'c' | 'e', 1..=3) => "ddd",
+            ('E' | 'c' | 'e', _) => "dddd",
+            ('H' | 'k', 1) => "h",
+            ('H' | 'k', _) => "hh",
+            ('h' | 'K', 1) => "h",
+            ('h' | 'K', _) => "hh",
+            ('m', 1) => "m",
+            ('m', _) => "mm",
+            ('s', 1) => "s",
+            ('s', _) => "ss",
+            ('S', k) => {
+                // Fractions of a second follow the seconds.
+                if !out.ends_with('.') {
+                    out.push('.');
+                }
+                out.push_str(&"0".repeat(k.min(3)));
+                continue;
+            }
+            ('a', _) => "AM/PM",
+            ('G', _) => "\"AD\"",
+            ('Q' | 'q', _) => continue,
+            _ => continue,
+        };
+        out.push_str(tok);
+    }
+    let out = out.trim().to_string();
+    (!out.is_empty()).then_some(out)
+}
+
+/// A custom number format: its pattern with Numbers' digit padding and
+/// quoting, made XLSX's.
+fn custom_number(c: Msg, outer: Msg) -> Option<String> {
+    let pattern = c.string(18)?;
+    let thousands = c.boolean(5).unwrap_or(false);
+    let int_zero = c.uint(29).unwrap_or(0) > 0;
+    let dec_zero = c.uint(30).unwrap_or(0) > 0;
+    let currency = c
+        .string(3)
+        .filter(|s| !s.is_empty())
+        .or_else(|| outer.string(3).filter(|s| !s.is_empty()));
+    let chars: Vec<char> = pattern.chars().collect();
+    let mut out = String::new();
+    let mut i = 0;
+    let mut in_dec = false;
+    let mut first_int: Option<char> = None;
+    let mut first_dec: Option<char> = None;
+    while i < chars.len() {
+        let ch = chars[i];
+        match ch {
+            '\'' => {
+                let mut lit = String::new();
+                i += 1;
+                while i < chars.len() && chars[i] != '\'' {
+                    lit.push(chars[i]);
+                    i += 1;
+                }
+                if lit.is_empty() && chars.get(i) == Some(&'\'') {
+                    lit.push('\'');
+                }
+                out.push('"');
+                out.push_str(&lit.replace('"', ""));
+                out.push('"');
+            }
+            '#' | '0' => {
+                let lead = if in_dec {
+                    *first_dec.get_or_insert(ch)
+                } else {
+                    *first_int.get_or_insert(ch)
+                };
+                let pad = if in_dec { dec_zero } else { int_zero };
+                out.push(match (lead, ch, pad) {
+                    ('#', c, _) => c,
+                    (_, _, true) => '0',
+                    _ => '?',
+                });
+            }
+            '.' => {
+                in_dec = true;
+                out.push('.');
+            }
+            ',' => {
+                if thousands {
+                    out.push(',');
+                }
+            }
+            '%' => out.push('%'),
+            'E' if chars.get(i + 1) == Some(&'+') => {
+                out.push_str("E+");
+                i += 1;
+            }
+            '\u{a4}' => {
+                let s = symbol(currency.as_deref().unwrap_or("USD"));
+                out.push('"');
+                out.push_str(&s.replace('"', ""));
+                out.push('"');
+            }
+            ' ' | '-' | '(' | ')' | '/' | ':' | '$' | '+' => out.push(ch),
+            '"' => {}
+            _ => {
+                out.push('\\');
+                out.push(ch);
+            }
+        }
+        i += 1;
+    }
+    if !out.chars().any(|c| matches!(c, '0' | '#' | '?')) {
+        // A pattern without digits shows the text alone.
+        return Some(format!("{out};{out};{out}"));
+    }
+    if thousands
+        && !out.contains(',')
+        && let Some(p) = out.find(['0', '#', '?'])
+    {
+        out.insert_str(p, "#,##");
+    }
+    Some(out)
+}
+
+/// A custom text format: the text placeholder (U+E421) becomes `@`.
+fn custom_text(p: &str) -> Option<String> {
+    if p.is_empty() {
+        return Some("@".into());
+    }
+    let mut out = String::new();
+    let mut lit = String::new();
+    let flush = |lit: &mut String, out: &mut String| {
+        if !lit.is_empty() {
+            out.push('"');
+            out.push_str(&lit.replace('"', ""));
+            out.push('"');
+            lit.clear();
+        }
+    };
+    for c in p.chars() {
+        if c == '\u{e421}' {
+            flush(&mut lit, &mut out);
+            out.push('@');
+        } else {
+            lit.push(c);
+        }
+    }
+    flush(&mut lit, &mut out);
+    Some(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::proto::Msg;
+    use super::super::proto::write::W;
+    use super::*;
+
+    fn fmt(w: W, v: Option<f64>) -> Option<String> {
+        code(Msg(&w.0), None, v)
+    }
+
+    #[test]
+    fn numbers() {
+        let d = W::default().uint(1, 256);
+        assert_eq!(fmt(d.clone().uint(2, 253), Some(1.5)), None);
+        assert_eq!(
+            fmt(d.clone().uint(2, 2).uint(5, 1), None).as_deref(),
+            Some("#,##0.00")
+        );
+        assert_eq!(
+            fmt(d.clone().uint(2, 1).uint(4, 3), None).as_deref(),
+            Some("0.0;[Red](0.0)")
+        );
+        assert_eq!(
+            fmt(d.clone().uint(2, 253).uint(5, 1), Some(1234.125)).as_deref(),
+            Some("#,##0.000")
+        );
+        let p = W::default().uint(1, 258).uint(2, 253);
+        assert_eq!(fmt(p, Some(0.125)).as_deref(), Some("0.0%"));
+        let c = W::default()
+            .uint(1, 257)
+            .uint(2, 2)
+            .bytes(3, b"EUR")
+            .uint(4, 2);
+        assert_eq!(fmt(c, None).as_deref(), Some("\"€\"0.00;(\"€\"0.00)"));
+        assert_eq!(
+            fmt(W::default().uint(1, 262).uint(11, 4), None).as_deref(),
+            Some("# ?/4")
+        );
+    }
+
+    #[test]
+    fn dates() {
+        assert_eq!(date("dd/MM/yyyy").as_deref(), Some("dd/mm/yyyy"));
+        assert_eq!(
+            date("EEEE, MMMM d, y 'at' h:mm a").as_deref(),
+            Some("dddd, mmmm d, yyyy \"at\" h:mm AM/PM")
+        );
+        assert_eq!(date("HH:mm:ss.SSS").as_deref(), Some("hh:mm:ss.000"));
+    }
+
+    #[test]
+    fn durations() {
+        let f = W::default()
+            .uint(1, 268)
+            .uint(7, 0)
+            .uint(15, 4)
+            .uint(16, 16);
+        assert_eq!(fmt(f, Some(1.0)).as_deref(), Some("[h]:mm:ss"));
+        let f = W::default().uint(1, 268).uint(7, 1).uint(15, 8).uint(16, 8);
+        assert_eq!(fmt(f, None).as_deref(), Some("[m]\"m\""));
+        // Days followed by hours: hours from the start.
+        let f = W::default().uint(1, 268).uint(7, 1).uint(15, 2).uint(16, 4);
+        assert_eq!(fmt(f, None).as_deref(), Some("[h]\"h\""));
+        // Automatic units: 90 seconds (in days) show minutes and seconds.
+        let f = W::default().uint(1, 268).uint(7, 0).uint(40, 1);
+        assert_eq!(fmt(f, Some(90.0 / 86_400.0)).as_deref(), Some("[mm]:ss"));
+        let f = W::default()
+            .uint(1, 268)
+            .uint(7, 2)
+            .uint(15, 16)
+            .uint(16, 32);
+        assert_eq!(fmt(f, None).as_deref(), Some("[ss].000\" seconds\""));
+    }
+
+    #[test]
+    fn custom() {
+        let f = W::default()
+            .uint(1, 270)
+            .bytes(18, "#,##0.00 'units'".as_bytes())
+            .uint(5, 1)
+            .uint(29, 1)
+            .uint(30, 2);
+        assert_eq!(fmt(f, None).as_deref(), Some("#,##0.00 \"units\""));
+        let f = W::default()
+            .uint(1, 271)
+            .bytes(18, "Name: \u{e421}".as_bytes());
+        assert_eq!(fmt(f, None).as_deref(), Some("\"Name: \"@"));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/formula.rs b/crates/exav-render/src/formats/office/sheets/numbers/formula.rs
new file mode 100644
index 00000000..5288f76c
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/formula.rs
@@ -0,0 +1,621 @@
+//! Formulas: TSCE.ASTNodeArrayArchive (AST_node 1), a postfix array of
+//! nodes, to Excel syntax. Node fields: AST_node_type 1,
+//! AST_function_node_index 2, AST_function_node_numArgs 3,
+//! AST_number_node_number 4, AST_boolean_node_boolean 5,
+//! AST_string_node_string 6, AST_date_node_dateNum 7,
+//! AST_duration_node_unitNum 8, AST_duration_node_unit 9,
+//! AST_token_node_boolean 10, AST_array_node_numCol 11 and numRow 12,
+//! AST_list_node_numArgs 13, AST_unknown_function_node_string 17 and
+//! numArgs 18, AST_column 26 (column 1, absolute 2), AST_row 27 (row 1,
+//! absolute 2), AST_cross_table_reference_extra_info 28 (table_id 1),
+//! AST_sticky_bits 33 (begin row 1, begin column 2, end row 3, end column 4
+//! absolute), AST_colon_tract 40 (relative_column 1, relative_row 2,
+//! absolute_column 3, absolute_row 4, each range_begin 1 and range_end 2),
+//! AST_number_node_decimal_low 42 and high 43.
+
+use super::functions::FUNCTIONS;
+use super::proto::Msg;
+use crate::formats::office::sheets::model::col_name;
+use std::collections::HashMap;
+
+/// What a reference needs to know of a table.
+#[derive(Clone, Debug, Default)]
+pub struct TableDims {
+    /// The XLSX sheet name.
+    pub name: String,
+    pub rows: u32,
+    pub cols: u32,
+    pub header_rows: u32,
+    pub header_cols: u32,
+    pub footer_rows: u32,
+}
+
+pub struct Refs<'a> {
+    pub tables: &'a [TableDims],
+    /// Table UUIDs, as cross-table references name them, to tables.
+    pub by_uuid: &'a HashMap<u128, usize>,
+    pub host: usize,
+}
+
+/// A CFUUIDArchive (uuid_w0 2 to uuid_w3 5).
+pub fn cfuuid(m: Msg) -> Option<u128> {
+    let w = |n| m.uint(n).map(|v| u128::from(v as u32));
+    Some(w(5)? << 96 | w(4)? << 64 | w(3)? << 32 | w(2)?)
+}
+
+/// A TSP.UUID (lower 1, upper 2).
+pub fn uuid(m: Msg) -> Option<u128> {
+    Some(u128::from(m.uint(2)?) << 64 | u128::from(m.uint(1)?))
+}
+
+// Excel operator precedence, higher binds tighter.
+const P_CMP: u8 = 1;
+const P_CONCAT: u8 = 2;
+const P_ADD: u8 = 3;
+const P_MUL: u8 = 4;
+const P_POW: u8 = 5;
+const P_PERCENT: u8 = 6;
+const P_NEG: u8 = 7;
+const P_ATOM: u8 = 9;
+
+struct Item {
+    text: String,
+    prec: u8,
+}
+
+const MAX_TEXT: usize = 16_384;
+const MAX_NODES: usize = 1 << 16;
+
+/// The formula of the cell at `row`, `col` of the host table; `None` when
+/// it uses what Excel cannot say.
+pub fn convert(ast: Msg, cx: &Refs, row: u32, col: u32) -> Option<String> {
+    let mut st: Vec<Item> = vec![];
+    for node in ast.msgs(1).take(MAX_NODES) {
+        let kind = node.uint(1)?;
+        match kind {
+            1..=12 => {
+                let (op, p) = match kind {
+                    1 => ("+", P_ADD),
+                    2 => ("-", P_ADD),
+                    3 => ("*", P_MUL),
+                    4 => ("/", P_MUL),
+                    5 => ("^", P_POW),
+                    6 => ("&", P_CONCAT),
+                    7 => (">", P_CMP),
+                    8 => (">=", P_CMP),
+                    9 => ("<", P_CMP),
+                    10 => ("<=", P_CMP),
+                    11 => ("=", P_CMP),
+                    _ => ("<>", P_CMP),
+                };
+                let b = st.pop()?;
+                let a = st.pop()?;
+                let l = wrap(a, p, false);
+                let r = wrap(b, p, true);
+                st.push(Item {
+                    text: format!("{l}{op}{r}"),
+                    prec: p,
+                });
+            }
+            13 => {
+                let a = st.pop()?;
+                st.push(Item {
+                    text: format!("-{}", wrap(a, P_NEG, false)),
+                    prec: P_NEG,
+                });
+            }
+            14 => {
+                let a = st.pop()?;
+                st.push(Item {
+                    text: format!("+{}", wrap(a, P_NEG, false)),
+                    prec: P_NEG,
+                });
+            }
+            15 => {
+                let a = st.pop()?;
+                st.push(Item {
+                    text: format!("{}%", wrap(a, P_PERCENT, false)),
+                    prec: P_PERCENT,
+                });
+            }
+            16 | 31 => {
+                let n = if kind == 16 {
+                    node.uint(3)?
+                } else {
+                    node.uint(18)?
+                } as usize;
+                let name = if kind == 16 {
+                    let idx = node.uint(2)?;
+                    let i = FUNCTIONS
+                        .binary_search_by_key(&idx, |f| u64::from(f.0))
+                        .ok()?;
+                    excel_function(FUNCTIONS[i].1)
+                } else {
+                    node.string(17)?.to_ascii_uppercase()
+                };
+                if n > st.len() {
+                    return None;
+                }
+                let args: Vec<String> = st
+                    .split_off(st.len() - n)
+                    .into_iter()
+                    .map(|a| a.text)
+                    .collect();
+                st.push(Item {
+                    text: format!("{name}({})", args.join(",")),
+                    prec: P_ATOM,
+                });
+            }
+            17 => {
+                let v = number(node)?;
+                st.push(Item {
+                    text: crate::formats::office::sheets::numtext::shortest(v),
+                    prec: if v < 0.0 { P_NEG } else { P_ATOM },
+                });
+            }
+            18 | 23 => {
+                let b = node
+                    .boolean(if kind == 18 { 5 } else { 10 })
+                    .unwrap_or(false);
+                st.push(atom(if b { "TRUE" } else { "FALSE" }.into()));
+            }
+            19 => {
+                let s = node.string(6).unwrap_or_default();
+                st.push(atom(format!("\"{}\"", s.replace('"', "\"\""))));
+            }
+            20 => st.push(atom(date(node.double(7)?))),
+            21 => st.push(atom(crate::formats::office::sheets::numtext::shortest(
+                duration_days(node)?,
+            ))),
+            22 => st.push(atom(String::new())),
+            24 => {
+                let (cols, rows) = (node.uint(11)? as usize, node.uint(12)? as usize);
+                let n = cols.checked_mul(rows)?;
+                if n > st.len() || n == 0 {
+                    return None;
+                }
+                let cells: Vec<String> = st
+                    .split_off(st.len() - n)
+                    .into_iter()
+                    .map(|a| a.text)
+                    .collect();
+                let rows: Vec<String> = cells.chunks(cols).map(|r| r.join(",")).collect();
+                st.push(atom(format!("{{{}}}", rows.join(";"))));
+            }
+            25 => {
+                let n = node.uint(13)? as usize;
+                if n > st.len() {
+                    return None;
+                }
+                let args: Vec<String> = st
+                    .split_off(st.len() - n)
+                    .into_iter()
+                    .map(|a| a.text)
+                    .collect();
+                st.push(atom(format!("({})", args.join(","))));
+            }
+            29 | 45 => {
+                let b = st.pop()?;
+                let a = st.pop()?;
+                st.push(atom(join_range(&a.text, &b.text)));
+            }
+            30 | 46 => st.push(atom("#REF!".into())),
+            32..=35 => {}
+            36 | 67 => st.push(atom(reference(node, cx, row, col)?)),
+            69 => {
+                let b = st.pop()?;
+                let a = st.pop()?;
+                st.push(atom(format!("{} {}", a.text, b.text)));
+            }
+            70 => {
+                let a = st.pop()?;
+                st.push(atom(format!("{}#", a.text)));
+            }
+            _ => return None,
+        }
+        if st.last().is_some_and(|i| i.text.len() > MAX_TEXT) {
+            return None;
+        }
+    }
+    let out = st.pop()?;
+    st.is_empty().then_some(out.text)
+}
+
+fn atom(text: String) -> Item {
+    Item { text, prec: P_ATOM }
+}
+
+/// An operand in parentheses when its operator binds looser than `p` (or
+/// as loose, on the right of a left-associative operator).
+fn wrap(a: Item, p: u8, right: bool) -> String {
+    if a.prec < p || (right && a.prec == p) {
+        format!("({})", a.text)
+    } else {
+        a.text
+    }
+}
+
+fn excel_function(name: &str) -> String {
+    if crate::formats::office::sheets::ods::formula::XLFN.contains(&name) {
+        format!("_xlfn.{name}")
+    } else {
+        name.to_string()
+    }
+}
+
+/// A number node: its decimal when it has one, else its double.
+fn number(node: Msg) -> Option<f64> {
+    match (node.uint(42), node.uint(43)) {
+        (Some(lo), Some(0x3040_0000_0000_0000)) => Some(lo as f64),
+        (Some(lo), Some(hi)) => {
+            let mut b = [0u8; 16];
+            b[..8].copy_from_slice(&lo.to_le_bytes());
+            b[8..].copy_from_slice(&hi.to_le_bytes());
+            Some(super::cells::decimal128(&b))
+        }
+        _ => node.double(4),
+    }
+}
+
+/// A date literal, seconds since 2001-01-01, as DATE (and TIME).
+fn date(secs: f64) -> String {
+    if !secs.is_finite() {
+        return "#VALUE!".into();
+    }
+    let days = (secs / 86_400.0).floor();
+    let (y, m, d) = civil(days as i64 + 11_323);
+    let rest = (secs - days * 86_400.0).round() as i64;
+    if rest == 0 {
+        format!("DATE({y},{m},{d})")
+    } else {
+        format!(
+            "DATE({y},{m},{d})+TIME({},{},{})",
+            rest / 3600,
+            rest / 60 % 60,
+            rest % 60
+        )
+    }
+}
+
+/// Days since 1970-01-01 to a civil date (H. Hinnant's algorithm).
+fn civil(z: i64) -> (i64, i64, i64) {
+    let z = z + 719_468;
+    let era = z.div_euclid(146_097);
+    let doe = z - era * 146_097;
+    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
+    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
+    let mp = (5 * doy + 2) / 153;
+    let d = doy - (153 * mp + 2) / 5 + 1;
+    let m = if mp < 10 { mp + 3 } else { mp - 9 };
+    (yoe + era * 400 + i64::from(m <= 2), m, d)
+}
+
+/// A duration literal in days: unitNum 8 of unit 9 (1 week, 2 day, 4 hour,
+/// 8 minute, 16 second, 32 millisecond).
+fn duration_days(node: Msg) -> Option<f64> {
+    let n = node.double(8)?;
+    let per = match node.int(9)? {
+        1 => 7.0,
+        2 => 1.0,
+        4 => 1.0 / 24.0,
+        8 => 1.0 / 1440.0,
+        16 => 1.0 / 86_400.0,
+        32 => 1.0 / 86_400_000.0,
+        _ => return None,
+    };
+    Some(n * per)
+}
+
+/// `S!A1` and `S!B2` to `S!A1:B2`.
+fn join_range(a: &str, b: &str) -> String {
+    match (a.rsplit_once('!'), b.rsplit_once('!')) {
+        (Some((sa, ra)), Some((sb, rb))) if sa == sb => format!("{sa}!{ra}:{rb}"),
+        _ => format!("{a}:{b}"),
+    }
+}
+
+const WHOLE_ROWS: u64 = 0x7FFF_FFFF;
+const WHOLE_COLS: u64 = 0x7FFF;
+
+/// A cell or range reference node.
+fn reference(node: Msg, cx: &Refs, row: u32, col: u32) -> Option<String> {
+    let target = match node.msg(28) {
+        Some(x) => {
+            let id = cfuuid(x.msg(1)?)?;
+            match cx.by_uuid.get(&id) {
+                Some(&t) => t,
+                None => return Some("#REF!".into()),
+            }
+        }
+        None => cx.host,
+    };
+    let t = cx.tables.get(target)?;
+    let (r0, c0) = (i64::from(row), i64::from(col));
+    // (row1, col1, row2, col2, absolute flags), `None` for a whole row or
+    // column side.
+    let (r1, c1, r2, c2, abs) = if let Some(tract) = node.msg(40) {
+        let sticky = node.msg(33).unwrap_or_default();
+        let ab = [1, 2, 3, 4].map(|n| sticky.boolean(n).unwrap_or(false));
+        let first = |field: u32| tract.msgs(field).next();
+        let side = |abs: bool,
+                    rel_f: u32,
+                    abs_f: u32,
+                    origin: i64,
+                    end: bool,
+                    whole: u64|
+         -> Option<Option<i64>> {
+            let pick = |m: Msg| if end { m.int(2).or(m.int(1)) } else { m.int(1) };
+            if abs {
+                return Some(first(abs_f).and_then(pick).map(|v| v as u32 as i64));
+            }
+            match first(rel_f) {
+                Some(m) => Some(pick(m).map(|v| origin + i64::from(v as i32))),
+                None => match first(abs_f).and_then(pick) {
+                    Some(v) if v as u64 & 0xFFFF_FFFF == whole => Some(None),
+                    Some(v) => Some(Some(v as u32 as i64)),
+                    None => Some(None),
+                },
+            }
+        };
+        let r1 = side(ab[0], 2, 4, r0, false, WHOLE_ROWS)?;
+        let r2 = side(ab[2], 2, 4, r0, true, WHOLE_ROWS)?;
+        let c1 = side(ab[1], 1, 3, c0, false, WHOLE_COLS)?;
+        let c2 = side(ab[3], 1, 3, c0, true, WHOLE_COLS)?;
+        let whole = |v: Option<i64>, w: u64| v.filter(|&x| x as u64 != w);
+        (
+            whole(r1, WHOLE_ROWS),
+            whole(c1, WHOLE_COLS),
+            whole(r2, WHOLE_ROWS),
+            whole(c2, WHOLE_COLS),
+            ab,
+        )
+    } else {
+        let rm = node.msg(27);
+        let cm = node.msg(26);
+        let one = |m: Option<Msg>, origin: i64| -> Option<(Option<i64>, bool)> {
+            match m {
+                None => Some((None, false)),
+                Some(m) => {
+                    let v = m.sint(1).unwrap_or(0);
+                    let a = m.boolean(2).unwrap_or(false);
+                    Some((Some(if a { v } else { origin + v }), a))
+                }
+            }
+        };
+        let (r, ra) = one(rm, r0)?;
+        let (c, ca) = one(cm, c0)?;
+        (r, c, r, c, [ra, ca, ra, ca])
+    };
+    let body_rows = (
+        t.header_rows,
+        t.rows.saturating_sub(t.footer_rows).saturating_sub(1),
+    );
+    let body_cols = (t.header_cols, t.cols.saturating_sub(1));
+    // Whole columns cover the body rows of the table, whole rows its body
+    // columns, as in Numbers.
+    let (r1, r2, rows_abs) = match (r1, r2) {
+        (None, None) if body_rows.0 <= body_rows.1 => {
+            (i64::from(body_rows.0), i64::from(body_rows.1), true)
+        }
+        (None, None) => (0, i64::from(t.rows.saturating_sub(1)), true),
+        (a, b) => (a.or(b)?, b.or(a)?, false),
+    };
+    let (c1, c2, cols_abs) = match (c1, c2) {
+        (None, None) if body_cols.0 <= body_cols.1 => {
+            (i64::from(body_cols.0), i64::from(body_cols.1), true)
+        }
+        (None, None) => (0, i64::from(t.cols.saturating_sub(1)), true),
+        (a, b) => (a.or(b)?, b.or(a)?, false),
+    };
+    let ok = |v: i64, max: u32| (0..=i64::from(max)).contains(&v);
+    if !ok(r1, crate::formats::office::sheets::model::MAX_ROW)
+        || !ok(r2, crate::formats::office::sheets::model::MAX_ROW)
+        || !ok(c1, crate::formats::office::sheets::model::MAX_COL)
+        || !ok(c2, crate::formats::office::sheets::model::MAX_COL)
+    {
+        return Some("#REF!".into());
+    }
+    let cell = |r: i64, c: i64, ra: bool, ca: bool| {
+        format!(
+            "{}{}{}{}",
+            if ca { "$" } else { "" },
+            col_name(c as u32),
+            if ra { "$" } else { "" },
+            r + 1
+        )
+    };
+    let a = cell(r1, c1, abs[0] || rows_abs, abs[1] || cols_abs);
+    let text = if (r1, c1) == (r2, c2) {
+        a
+    } else {
+        format!(
+            "{a}:{}",
+            cell(r2, c2, abs[2] || rows_abs, abs[3] || cols_abs)
+        )
+    };
+    Some(if target == cx.host {
+        text
+    } else {
+        format!(
+            "{}!{text}",
+            crate::formats::office::sheets::xls::formula::quote_sheet(&t.name)
+        )
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::proto::write::W;
+    use super::*;
+
+    fn node(kind: u64) -> W {
+        W::default().uint(1, kind)
+    }
+
+    fn num(v: f64) -> W {
+        node(17).double(4, v)
+    }
+
+    fn cell(r: i64, c: i64, abs: bool) -> W {
+        node(36)
+            .msg(27, W::default().sint(1, r).uint(2, abs as u64))
+            .msg(26, W::default().sint(1, c).uint(2, abs as u64))
+    }
+
+    fn run(
+        nodes: Vec<W>,
+        tables: &[TableDims],
+        by_uuid: &HashMap<u128, usize>,
+        at: (u32, u32),
+    ) -> Option<String> {
+        let mut ast = W::default();
+        for n in nodes {
+            ast = ast.msg(1, n);
+        }
+        convert(
+            Msg(&ast.0),
+            &Refs {
+                tables,
+                by_uuid,
+                host: 0,
+            },
+            at.0,
+            at.1,
+        )
+    }
+
+    fn table(name: &str) -> TableDims {
+        TableDims {
+            name: name.into(),
+            rows: 10,
+            cols: 5,
+            header_rows: 1,
+            header_cols: 1,
+            footer_rows: 0,
+        }
+    }
+
+    #[test]
+    fn operators_keep_their_grouping() {
+        let t = [table("T")];
+        let m = HashMap::new();
+        // (1+2)*3, as postfix 1 2 + 3 *.
+        assert_eq!(
+            run(
+                vec![num(1.0), num(2.0), node(1), num(3.0), node(3)],
+                &t,
+                &m,
+                (0, 0)
+            )
+            .as_deref(),
+            Some("(1+2)*3")
+        );
+        // 1-(2-3).
+        assert_eq!(
+            run(
+                vec![num(1.0), num(2.0), num(3.0), node(2), node(2)],
+                &t,
+                &m,
+                (0, 0)
+            )
+            .as_deref(),
+            Some("1-(2-3)")
+        );
+        // -(2^2) and (-2)^2.
+        assert_eq!(
+            run(vec![num(2.0), num(2.0), node(5), node(13)], &t, &m, (0, 0)).as_deref(),
+            Some("-(2^2)")
+        );
+        assert_eq!(
+            run(vec![num(2.0), node(13), num(2.0), node(5)], &t, &m, (0, 0)).as_deref(),
+            Some("-2^2")
+        );
+        // SUM(1,2): function index 168 is SUM.
+        let sum = FUNCTIONS.iter().find(|f| f.1 == "SUM").unwrap().0;
+        assert_eq!(
+            run(
+                vec![num(1.0), num(2.0), node(16).uint(2, sum.into()).uint(3, 2)],
+                &t,
+                &m,
+                (0, 0)
+            )
+            .as_deref(),
+            Some("SUM(1,2)")
+        );
+        // A stack left with two items is refused.
+        assert_eq!(run(vec![num(1.0), num(2.0)], &t, &m, (0, 0)), None);
+    }
+
+    #[test]
+    fn references() {
+        let t = [table("T"), table("Sheet 2 - T")];
+        let mut m = HashMap::new();
+        m.insert(7u128 << 96 | 1, 1);
+        // Relative to the host cell (2, 1): one row up, same column.
+        assert_eq!(
+            run(vec![cell(-1, 0, false)], &t, &m, (2, 1)).as_deref(),
+            Some("B2")
+        );
+        assert_eq!(
+            run(vec![cell(0, 2, true)], &t, &m, (2, 1)).as_deref(),
+            Some("$C$1")
+        );
+        let xt = W::default().msg(1, W::default().uint(2, 1).uint(3, 0).uint(4, 0).uint(5, 7));
+        assert_eq!(
+            run(vec![cell(3, 3, true).msg(28, xt.clone())], &t, &m, (0, 0)).as_deref(),
+            Some("'Sheet 2 - T'!$D$4")
+        );
+        // An unknown table.
+        let bad = W::default().msg(1, W::default().uint(2, 9).uint(3, 0).uint(4, 0).uint(5, 0));
+        assert_eq!(
+            run(vec![cell(0, 0, true).msg(28, bad)], &t, &m, (0, 0)).as_deref(),
+            Some("#REF!")
+        );
+        // Whole column B of T: its body rows, 2 to 10.
+        let tract = W::default()
+            .msg(3, W::default().uint(1, 1).uint(2, 1))
+            .msg(4, W::default().uint(1, 0x7FFF_FFFF).uint(2, 0x7FFF_FFFF));
+        let sticky = W::default().uint(1, 0).uint(2, 1).uint(3, 0).uint(4, 1);
+        assert_eq!(
+            run(
+                vec![node(67).msg(40, tract).msg(33, sticky)],
+                &t,
+                &m,
+                (0, 0)
+            )
+            .as_deref(),
+            Some("$B$2:$B$10")
+        );
+    }
+
+    #[test]
+    fn literals() {
+        let t = [table("T")];
+        let m = HashMap::new();
+        // 2001-01-02 12:00.
+        assert_eq!(
+            run(
+                vec![node(20).double(7, 86_400.0 + 43_200.0)],
+                &t,
+                &m,
+                (0, 0)
+            )
+            .as_deref(),
+            Some("DATE(2001,1,2)+TIME(12,0,0)")
+        );
+        assert_eq!(
+            run(vec![node(19).bytes(6, b"a\"b")], &t, &m, (0, 0)).as_deref(),
+            Some("\"a\"\"b\"")
+        );
+        assert_eq!(
+            run(
+                vec![node(17).uint(42, 5).uint(43, 0x3040_0000_0000_0000)],
+                &t,
+                &m,
+                (0, 0)
+            )
+            .as_deref(),
+            Some("5")
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/functions.rs b/crates/exav-render/src/formats/office/sheets/numbers/functions.rs
new file mode 100644
index 00000000..07c3aba8
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/functions.rs
@@ -0,0 +1,369 @@
+// Generated by scripts/office/sheets/numbers_functions.py from numbers-parser's
+// functionmap.py (MIT, Jon Connell). Do not edit.
+
+/// (function index, name), by index.
+#[rustfmt::skip]
+pub(crate) const FUNCTIONS: &[(u32, &str)] = &[
+    (1, "ABS"),
+    (2, "ACCRINT"),
+    (3, "ACCRINTM"),
+    (4, "ACOS"),
+    (5, "ACOSH"),
+    (6, "ADDRESS"),
+    (7, "AND"),
+    (8, "AREAS"),
+    (9, "ASIN"),
+    (10, "ASINH"),
+    (11, "ATAN"),
+    (12, "ATAN2"),
+    (13, "ATANH"),
+    (14, "AVEDEV"),
+    (15, "AVERAGE"),
+    (16, "AVERAGEA"),
+    (17, "CEILING"),
+    (18, "CHAR"),
+    (19, "CHOOSE"),
+    (20, "CLEAN"),
+    (21, "CODE"),
+    (22, "COLUMN"),
+    (23, "COLUMNS"),
+    (24, "COMBIN"),
+    (25, "CONCATENATE"),
+    (26, "CONFIDENCE"),
+    (27, "CORREL"),
+    (28, "COS"),
+    (29, "COSH"),
+    (30, "COUNT"),
+    (31, "COUNTA"),
+    (32, "COUNTBLANK"),
+    (33, "COUNTIF"),
+    (34, "COUPDAYBS"),
+    (35, "COUPDAYS"),
+    (36, "COUPDAYSNC"),
+    (37, "COUPNUM"),
+    (38, "COVAR"),
+    (39, "DATE"),
+    (40, "DATEDIF"),
+    (41, "DAY"),
+    (42, "DB"),
+    (43, "DDB"),
+    (44, "DEGREES"),
+    (45, "DISC"),
+    (46, "DOLLAR"),
+    (47, "EDATE"),
+    (48, "EVEN"),
+    (49, "EXACT"),
+    (50, "EXP"),
+    (51, "FACT"),
+    (52, "FALSE"),
+    (53, "FIND"),
+    (54, "FIXED"),
+    (55, "FLOOR"),
+    (56, "FORECAST"),
+    (57, "FV"),
+    (58, "GCD"),
+    (59, "HLOOKUP"),
+    (60, "HOUR"),
+    (61, "HYPERLINK"),
+    (62, "IF"),
+    (63, "INDEX"),
+    (64, "INDIRECT"),
+    (65, "INT"),
+    (66, "INTERCEPT"),
+    (67, "IPMT"),
+    (68, "IRR"),
+    (69, "ISBLANK"),
+    (70, "ISERROR"),
+    (71, "ISEVEN"),
+    (72, "ISODD"),
+    (73, "ISPMT"),
+    (74, "LARGE"),
+    (75, "LCM"),
+    (76, "LEFT"),
+    (77, "LEN"),
+    (78, "LN"),
+    (79, "LOG"),
+    (80, "LOG10"),
+    (81, "LOOKUP"),
+    (82, "LOWER"),
+    (83, "MATCH"),
+    (84, "MAX"),
+    (85, "MAXA"),
+    (86, "MEDIAN"),
+    (87, "MID"),
+    (88, "MIN"),
+    (89, "MINA"),
+    (90, "MINUTE"),
+    (91, "MIRR"),
+    (92, "MOD"),
+    (93, "MODE"),
+    (94, "MONTH"),
+    (95, "MROUND"),
+    (96, "NOT"),
+    (97, "NOW"),
+    (98, "NPER"),
+    (99, "NPV"),
+    (100, "ODD"),
+    (101, "OFFSET"),
+    (102, "OR"),
+    (103, "PERCENTILE"),
+    (104, "PI"),
+    (105, "PMT"),
+    (106, "POISSON"),
+    (107, "POWER"),
+    (108, "PPMT"),
+    (109, "PRICE"),
+    (110, "PRICEDISC"),
+    (111, "PRICEMAT"),
+    (112, "PROB"),
+    (113, "PRODUCT"),
+    (114, "PROPER"),
+    (115, "PV"),
+    (116, "QUOTIENT"),
+    (117, "RADIANS"),
+    (118, "RAND"),
+    (119, "RANDBETWEEN"),
+    (120, "RANK"),
+    (121, "RATE"),
+    (122, "REPLACE"),
+    (123, "REPT"),
+    (124, "RIGHT"),
+    (125, "ROMAN"),
+    (126, "ROUND"),
+    (127, "ROUNDDOWN"),
+    (128, "ROUNDUP"),
+    (129, "ROW"),
+    (130, "ROWS"),
+    (131, "SEARCH"),
+    (132, "SECOND"),
+    (133, "SIGN"),
+    (134, "SIN"),
+    (135, "SINH"),
+    (136, "SLN"),
+    (137, "SLOPE"),
+    (138, "SMALL"),
+    (139, "SQRT"),
+    (140, "STDEV"),
+    (141, "STDEVA"),
+    (142, "STDEVP"),
+    (143, "STDEVPA"),
+    (144, "SUBSTITUTE"),
+    (145, "SUMIF"),
+    (146, "SUMPRODUCT"),
+    (147, "SUMSQ"),
+    (148, "SYD"),
+    (149, "T"),
+    (150, "TAN"),
+    (151, "TANH"),
+    (152, "TIME"),
+    (153, "TIMEVALUE"),
+    (154, "TODAY"),
+    (155, "TRIM"),
+    (156, "TRUE"),
+    (157, "TRUNC"),
+    (158, "UPPER"),
+    (159, "VALUE"),
+    (160, "VAR"),
+    (161, "VARA"),
+    (162, "VARP"),
+    (163, "VARPA"),
+    (164, "VDB"),
+    (165, "VLOOKUP"),
+    (166, "WEEKDAY"),
+    (167, "YEAR"),
+    (168, "SUM"),
+    (185, "EFFECT"),
+    (186, "NOMINAL"),
+    (187, "NORMDIST"),
+    (188, "NORMSDIST"),
+    (189, "NORMINV"),
+    (190, "NORMSINV"),
+    (191, "YIELD"),
+    (192, "YIELDDISC"),
+    (193, "YIELDMAT"),
+    (194, "BONDDURATION"),
+    (195, "BONDMDURATION"),
+    (196, "ERF"),
+    (197, "ERFC"),
+    (198, "STANDARDIZE"),
+    (199, "INTRATE"),
+    (200, "RECEIVED"),
+    (201, "CUMIPMT"),
+    (202, "CUMPRINC"),
+    (203, "EOMONTH"),
+    (204, "WORKDAY"),
+    (205, "MONTHNAME"),
+    (206, "WEEKNUM"),
+    (207, "DUR2HOURS"),
+    (208, "DUR2MINUTES"),
+    (209, "DUR2SECONDS"),
+    (210, "DUR2DAYS"),
+    (211, "DUR2WEEKS"),
+    (212, "DURATION"),
+    (213, "EXPONDIST"),
+    (214, "YEARFRAC"),
+    (215, "ZTEST"),
+    (216, "SUMX2MY2"),
+    (217, "SUMX2PY2"),
+    (218, "SUMXMY2"),
+    (219, "SQRTPI"),
+    (220, "TRANSPOSE"),
+    (221, "DEVSQ"),
+    (222, "FREQUENCY"),
+    (223, "DELTA"),
+    (224, "FACTDOUBLE"),
+    (225, "GESTEP"),
+    (226, "PERCENTRANK"),
+    (227, "GAMMALN"),
+    (228, "DATEVALUE"),
+    (229, "GAMMADIST"),
+    (230, "GAMMAINV"),
+    (231, "SUMIFS"),
+    (232, "AVERAGEIFS"),
+    (233, "COUNTIFS"),
+    (234, "AVERAGEIF"),
+    (235, "IFERROR"),
+    (236, "DAYNAME"),
+    (237, "BESSELJ"),
+    (238, "BESSELY"),
+    (239, "LOGNORMDIST"),
+    (240, "LOGINV"),
+    (241, "TDIST"),
+    (242, "BINOMDIST"),
+    (243, "NEGBINOMDIST"),
+    (244, "FDIST"),
+    (245, "PERMUT"),
+    (246, "CHIDIST"),
+    (247, "CHITEST"),
+    (248, "TTEST"),
+    (249, "QUARTILE"),
+    (250, "MULTINOMIAL"),
+    (251, "CRITBINOM"),
+    (252, "BASETONUM"),
+    (253, "NUMTOBASE"),
+    (254, "TINV"),
+    (255, "CONVERT"),
+    (256, "CHIINV"),
+    (257, "FINV"),
+    (258, "BETADIST"),
+    (259, "BETAINV"),
+    (260, "NETWORKDAYS"),
+    (261, "DAYS360"),
+    (262, "HARMEAN"),
+    (263, "GEOMEAN"),
+    (264, "DEC2HEX"),
+    (265, "DEC2BIN"),
+    (266, "DEC2OCT"),
+    (267, "BIN2HEX"),
+    (268, "BIN2DEC"),
+    (269, "BIN2OCT"),
+    (270, "OCT2BIN"),
+    (271, "OCT2DEC"),
+    (272, "OCT2HEX"),
+    (273, "HEX2BIN"),
+    (274, "HEX2DEC"),
+    (275, "HEX2OCT"),
+    (276, "LINEST"),
+    (277, "DUR2MILLISECONDS"),
+    (278, "STRIPDURATION"),
+    (280, "INTERSECT.RANGES"),
+    (285, "UNION.RANGES"),
+    (286, "SERIESSUM"),
+    (287, "POLYNOMIAL"),
+    (288, "WEIBULL"),
+    (289, "CONFIDENCE.T"),
+    (290, "COVARIANCE.S"),
+    (291, "MODE.MULT"),
+    (292, "PERCENTILE.EXC"),
+    (293, "PERCENTRANK.EXC"),
+    (294, "QUARTILE.EXC"),
+    (295, "RANK.AVG"),
+    (296, "FIND.CASEINSENSITIVE"),
+    (297, "PLAINTEXT"),
+    (298, "STOCK"),
+    (299, "STOCKH"),
+    (300, "CURRENCY"),
+    (301, "CURRENCYH"),
+    (302, "CURRENCYCONVERT"),
+    (303, "CURRENCYCODE"),
+    (304, "ISNUMBER"),
+    (305, "ISTEXT"),
+    (306, "ISDATE"),
+    (309, "MAXIFS"),
+    (310, "MINIFS"),
+    (311, "XIRR"),
+    (312, "XNPV"),
+    (313, "IFS"),
+    (314, "XLOOKUP"),
+    (315, "XMATCH"),
+    (316, "SUBTOTAL"),
+    (317, "COUNTMATCHES"),
+    (318, "TEXTBEFORE"),
+    (319, "TEXTBETWEEN"),
+    (320, "TEXTAFTER"),
+    (321, "REGEX"),
+    (322, "REFERENCE.NAME"),
+    (323, "FORMULATEXT"),
+    (324, "REGEX.EXTRACT"),
+    (325, "GETPIVOTDATA"),
+    (328, "TEXTJOIN"),
+    (329, "CONCAT"),
+    (330, "BITAND"),
+    (331, "BITOR"),
+    (332, "BITXOR"),
+    (333, "BITLSHIFT"),
+    (334, "BITRSHIFT"),
+    (335, "ISOWEEKNUM"),
+    (336, "SWITCH"),
+    (338, "SEQUENCE"),
+    (341, "ARRAYTOTEXT"),
+    (342, "FILTER"),
+    (343, "SORT"),
+    (344, "SORTBY"),
+    (345, "UNIQUE"),
+    (346, "RANDARRAY"),
+    (347, "TEXTSPLIT"),
+    (348, "TOCOL"),
+    (349, "TOROW"),
+    (350, "TAKE"),
+    (351, "DROP"),
+    (352, "EXPAND"),
+    (353, "CHOOSEROWS"),
+    (354, "CHOOSECOLS"),
+    (355, "HSTACK"),
+    (356, "VSTACK"),
+    (357, "WRAPCOLS"),
+    (358, "WRAPROWS"),
+    (359, "MDETERM"),
+    (360, "MINVERSE"),
+    (361, "MMULT"),
+    (362, "MUNIT"),
+    (363, "LET"),
+    (364, "LAMBDA"),
+    (365, "MAKEARRAY"),
+    (366, "MAP"),
+    (367, "REDUCE"),
+    (368, "SCAN"),
+    (369, "BYROW"),
+    (370, "BYCOL"),
+    (371, "ISOMITTED"),
+    (372, "LAMBDA.APPLY"),
+    (373, "ISNUMBERORDATE"),
+    (374, "ACOT"),
+    (375, "ACOTH"),
+    (376, "COT"),
+    (377, "COTH"),
+    (378, "CSC"),
+    (379, "CSCH"),
+    (380, "SEC"),
+    (381, "SECH"),
+    (382, "XOR"),
+    (383, "COMBINA"),
+    (384, "GAMMA"),
+    (386, "FISHER"),
+    (387, "FISHERINV"),
+    (388, "PERMUTATIONA"),
+    (389, "DAYS"),
+    (390, "PEARSON"),
+    (391, "RSQ"),
+];
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/mod.rs b/crates/exav-render/src/formats/office/sheets/numbers/mod.rs
new file mode 100644
index 00000000..0de75960
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/mod.rs
@@ -0,0 +1,469 @@
+//! Apple Numbers documents of Numbers 3 (2013) and later: a ZIP, or a
+//! package directory, of `Index/*.iwa` streams (in older versions inside a
+//! nested `Index.zip`), each a run of Snappy-compressed protobuf archives.
+//! Messages are read by field number; the numbers used are written where
+//! they are read, after the message definitions numbers-parser (MIT, Jon
+//! Connell) extracted from the applications. Each table becomes a sheet.
+//! Numbers '08 and '09 documents, XML, are read by `v09`.
+//!
+//! TN.DocumentArchive (object 1): sheets 1, super 8 (TSA.DocumentArchive:
+//! custom_format_list 12). TN.SheetArchive: name 1, drawable_infos 2,
+//! is_hidden 25. TST.TableInfoArchive: super 1 (TSD.DrawableArchive:
+//! parent 2), tableModel 2. TSD.GroupArchive: children 2.
+
+mod cells;
+mod fonts;
+mod format;
+mod formula;
+mod functions;
+mod style;
+mod table;
+#[cfg(test)]
+mod tests;
+mod v09;
+
+use crate::formats::office::common::iwa::{self, proto};
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use formula::TableDims;
+use iwa::Store;
+use proto::Msg;
+use std::collections::HashMap;
+
+const DOCUMENT: u32 = 1;
+const SHEET: u32 = 2;
+const TABLE_INFO: u32 = 6000;
+const GROUP: u32 = 3008;
+const CHART: u32 = 5021;
+const IMAGE: u32 = 3005;
+const CALC_ENGINE: u32 = 4000;
+const OWNER_DEPS: u32 = 4008;
+const CUSTOM_FORMATS: u32 = 222;
+
+/// Reads a document saved as one file.
+pub(crate) fn read(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let mut z = crate::formats::office::sheets::ods::Zip::open(bytes).map_err(|_| Error::NotFormat("not a ZIP package (a Numbers document saved as a package directory must be read file by file)".into()))?;
+    let names = z.names();
+    check_kind(&names.iter().map(String::as_str).collect::<Vec<_>>())?;
+    let max = budget.limits.max_part;
+    if let Some(n) = xml_index(names.iter().map(String::as_str)) {
+        let data = z.get(n, max, budget)?.unwrap_or_default();
+        return read_xml(&data, budget);
+    }
+    let mut files: Vec<(String, Vec<u8>)> = vec![];
+    if let Some(inner) = names.iter().find(|n| leaf(n) == "index.zip") {
+        let data = z.get(inner, max, budget)?.unwrap_or_default();
+        let mut iz = crate::formats::office::sheets::ods::Zip::open(&data)?;
+        for n in iz.names() {
+            if n.ends_with(".iwa")
+                && let Some(d) = iz.get(&n, max, budget)?
+            {
+                files.push((n, d));
+            }
+        }
+    }
+    for n in &names {
+        if n.ends_with(".iwa")
+            && let Some(d) = z.get(n, max, budget)?
+        {
+            files.push((n.clone(), d));
+        }
+    }
+    read_iwa(
+        files.iter().map(|(n, d)| (n.as_str(), d.as_slice())),
+        budget,
+    )
+}
+
+/// Reads a package directory given as its files: relative paths and
+/// contents.
+pub(crate) fn read_package<'a>(
+    files: &[(&'a str, &'a [u8])],
+    budget: &mut Budget,
+) -> Result<Workbook> {
+    let names: Vec<&str> = files.iter().map(|f| f.0).collect();
+    check_kind(&names)?;
+    if let Some(n) = xml_index(names.iter().copied()) {
+        let data = files.iter().find(|f| f.0 == n).map_or(&[][..], |f| f.1);
+        return read_xml(data, budget);
+    }
+    let mut all: Vec<(String, Vec<u8>)> = vec![];
+    if let Some((_, data)) = files.iter().find(|f| leaf(f.0) == "index.zip") {
+        let max = budget.limits.max_part;
+        let mut iz = crate::formats::office::sheets::ods::Zip::open(data)?;
+        for n in iz.names() {
+            if n.ends_with(".iwa")
+                && let Some(d) = iz.get(&n, max, budget)?
+            {
+                all.push((n, d));
+            }
+        }
+    }
+    let iwa = files
+        .iter()
+        .filter(|f| f.0.ends_with(".iwa"))
+        .map(|f| (f.0, f.1));
+    let nested = all.iter().map(|(n, d)| (n.as_str(), d.as_slice()));
+    read_iwa(iwa.chain(nested), budget)
+}
+
+/// The last component of a package path, folded to lower case: a zipped
+/// package may hold the package directory itself.
+fn leaf(name: &str) -> String {
+    name.rsplit('/').next().unwrap_or(name).to_ascii_lowercase()
+}
+
+/// Refuses encrypted documents: a password verifier, `.iwpv2`, or hint,
+/// `.iwph`.
+fn check_kind(names: &[&str]) -> Result<()> {
+    if names
+        .iter()
+        .any(|n| matches!(leaf(n).as_str(), ".iwpv2" | ".iwph"))
+    {
+        return Err(Error::Encrypted);
+    }
+    Ok(())
+}
+
+/// The XML of a Numbers '08 or '09 document, `index.xml` or
+/// `index.xml.gz`, the one nearest the package root.
+fn xml_index<'a>(names: impl Iterator<Item = &'a str>) -> Option<&'a str> {
+    names
+        .filter(|n| matches!(leaf(n).as_str(), "index.xml" | "index.xml.gz"))
+        .min_by_key(|n| n.matches('/').count())
+}
+
+/// Reads a Numbers '08 or '09 document's XML, gzipped or not.
+fn read_xml(data: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    use std::io::Read;
+    if !data.starts_with(&[0x1F, 0x8B]) {
+        return v09::read(data, budget);
+    }
+    let max = budget.limits.max_part;
+    let mut xml = Vec::new();
+    flate2::read::MultiGzDecoder::new(data)
+        .take(max + 1)
+        .read_to_end(&mut xml)
+        .map_err(|e| Error::Malformed(format!("gzip: {e}")))?;
+    if xml.len() as u64 > max {
+        return Err(Error::TooLarge("a package part"));
+    }
+    budget.alloc(xml.len() as u64)?;
+    v09::read(&xml, budget)
+}
+
+fn read_iwa<'a>(
+    files: impl Iterator<Item = (&'a str, &'a [u8])>,
+    budget: &mut Budget,
+) -> Result<Workbook> {
+    let mut store = Store::default();
+    for (_, data) in files {
+        let left = budget.limits.max_part.min(budget.limits.max_memory) as usize;
+        let used = store.add(data, left);
+        budget.alloc(used as u64 * 2)?;
+    }
+    let doc = store
+        .typed(1, DOCUMENT)
+        .or_else(|| {
+            store
+                .ids_of(DOCUMENT)
+                .first()
+                .and_then(|&i| store.typed(i, DOCUMENT))
+        })
+        .ok_or_else(|| {
+            Error::NotFormat(
+                "no Numbers document object (not a Numbers file, or a damaged one)".into(),
+            )
+        })?;
+    convert(&store, doc, budget)
+}
+
+struct TableRef {
+    model: u64,
+    sheet: usize,
+    name: String,
+}
+
+/// The tables of a drawable, in drawing order: a table, or a group's.
+fn collect_tables(
+    store: &Store,
+    id: u64,
+    out: &mut Vec<u64>,
+    skipped: &mut Vec<&'static str>,
+    depth: u32,
+) {
+    let Some((kind, m)) = store.get(id) else {
+        return;
+    };
+    match kind {
+        TABLE_INFO => {
+            if let Some(t) = m.reference(2) {
+                out.push(t);
+            }
+        }
+        GROUP if depth < 16 => {
+            for c in m.references(2).take(4096) {
+                collect_tables(store, c, out, skipped, depth + 1);
+            }
+        }
+        CHART => skipped.push("charts"),
+        IMAGE => skipped.push("pictures"),
+        _ => {}
+    }
+}
+
+fn convert(store: &Store, doc: Msg, budget: &mut Budget) -> Result<Workbook> {
+    let mut wb = Workbook::new(Style {
+        font: Font {
+            name: "Helvetica Neue".into(),
+            ..Font::default()
+        },
+        align: Align {
+            vertical: Some("top"),
+            wrap: true,
+            ..Align::default()
+        },
+        ..Style::default()
+    });
+    let mut tables: Vec<TableRef> = vec![];
+    let mut sheet_names: Vec<(String, bool)> = vec![];
+    let mut skipped = vec![];
+    for (si, sid) in doc.references(1).take(4096).enumerate() {
+        let Some(sh) = store.typed(sid, SHEET) else {
+            continue;
+        };
+        let name = sh.string(1).unwrap_or_else(|| format!("Sheet {}", si + 1));
+        let mut ids = vec![];
+        for d in sh.references(2).take(1 << 16) {
+            collect_tables(store, d, &mut ids, &mut skipped, 0);
+        }
+        if ids.is_empty() {
+            // Older documents list only some drawables: tables name their sheet.
+            for ti in store.ids_of(TABLE_INFO) {
+                if let Some(m) = store.typed(ti, TABLE_INFO)
+                    && m.msg(1).and_then(|s| s.reference(2)) == Some(sid)
+                {
+                    ids.extend(m.reference(2));
+                }
+            }
+        }
+        let k = sheet_names.len();
+        sheet_names.push((name, sh.boolean(25).unwrap_or(false)));
+        for t in ids {
+            if tables.iter().any(|x| x.model == t) {
+                continue;
+            }
+            let tname = store.get(t).and_then(|m| m.1.string(8)).unwrap_or_default();
+            tables.push(TableRef {
+                model: t,
+                sheet: k,
+                name: tname,
+            });
+        }
+    }
+    skipped.sort_unstable();
+    skipped.dedup();
+    for s in skipped {
+        wb.warn(format!("{s} are not converted"));
+    }
+    if tables.is_empty() {
+        return Err(Error::Unsupported(
+            "a Numbers document without tables".into(),
+        ));
+    }
+    if tables.len() > budget.limits.max_sheets as usize {
+        return Err(Error::TooLarge("sheets"));
+    }
+
+    // A sheet with one table is named after the sheet, others "Sheet -
+    // Table".
+    let raw: Vec<String> = tables
+        .iter()
+        .map(|t| {
+            let (sname, _) = &sheet_names[t.sheet];
+            if tables.iter().filter(|x| x.sheet == t.sheet).count() == 1 {
+                sname.clone()
+            } else {
+                format!("{sname} - {}", t.name)
+            }
+        })
+        .collect();
+    let names = crate::formats::office::sheets::xlsx::sheet_names(raw.iter().map(String::as_str));
+    let dims: Vec<TableDims> = tables
+        .iter()
+        .zip(&names)
+        .map(|(t, n)| {
+            let m = store.get(t.model).map(|m| m.1).unwrap_or_default();
+            let rows = (m.uint(6).unwrap_or(0) as u32).min(MAX_ROW + 1);
+            let cols = (m.uint(7).unwrap_or(0) as u32).min(MAX_COL + 1);
+            TableDims {
+                name: n.clone(),
+                rows,
+                cols,
+                header_rows: (m.uint(9).unwrap_or(0) as u32).min(rows),
+                header_cols: (m.uint(10).unwrap_or(0) as u32).min(cols),
+                footer_rows: (m.uint(11).unwrap_or(0) as u32).min(rows),
+            }
+        })
+        .collect();
+    let by_uuid = table_uuids(store, &tables);
+    let custom_formats = custom_formats(store, doc);
+    let merges = merge_owners(store, &by_uuid);
+    let mut cx = table::Cx {
+        store,
+        tables: dims,
+        by_uuid,
+        custom_formats,
+        merges,
+        cell_props: HashMap::new(),
+        text_props: HashMap::new(),
+    };
+    for (i, t) in tables.iter().enumerate() {
+        let mut sheet = Sheet::new(cx.tables[i].name.clone());
+        sheet.show_grid = false;
+        if sheet_names[t.sheet].1 {
+            sheet.state = SheetState::Hidden;
+        }
+        if let Some((_, m)) = store.get(t.model) {
+            table::read_table(&mut cx, i, m, &mut sheet, &mut wb, budget)?;
+        }
+        wb.sheets.push(sheet);
+    }
+    if wb.sheets.iter().all(|s| s.state != SheetState::Visible)
+        && let Some(s) = wb.sheets.first_mut()
+    {
+        s.state = SheetState::Visible;
+    }
+    wb.active = wb
+        .sheets
+        .iter()
+        .position(|s| s.state == SheetState::Visible)
+        .unwrap_or(0);
+    Ok(wb)
+}
+
+/// The UUIDs cross-table references name tables by. A table's formula
+/// owner (TSCE.FormulaOwnerDependenciesArchive: formula_owner_uid 1,
+/// owner_kind 3, formula_owner 11, base_owner_uid 12) of kind 1 names the
+/// table model; one of kind 35 (a "haunted" owner) maps the table's
+/// haunted_owner UUID to the base UUID references use.
+fn table_uuids(store: &Store, tables: &[TableRef]) -> HashMap<u128, usize> {
+    let index: HashMap<u64, usize> = tables
+        .iter()
+        .enumerate()
+        .map(|(i, t)| (t.model, i))
+        .collect();
+    let mut haunted: HashMap<u128, u128> = HashMap::new();
+    let mut out = HashMap::new();
+    for id in store.ids_of(OWNER_DEPS) {
+        let Some(m) = store.typed(id, OWNER_DEPS) else {
+            continue;
+        };
+        let Some(uid) = m.msg(1).and_then(formula::uuid) else {
+            continue;
+        };
+        match m.uint(3).unwrap_or(0) {
+            1 => {
+                if let Some(&t) = m.reference(11).and_then(|o| index.get(&o)) {
+                    out.insert(uid, t);
+                }
+            }
+            35 => {
+                if let Some(base) = m.msg(12).and_then(formula::uuid) {
+                    haunted.insert(uid, base);
+                }
+            }
+            _ => {}
+        }
+    }
+    for (i, t) in tables.iter().enumerate() {
+        let owner = store
+            .get(t.model)
+            .and_then(|m| m.1.msg(84))
+            .and_then(|h| h.msg(1))
+            .and_then(formula::uuid);
+        if let Some(base) = owner.and_then(|o| haunted.get(&o)) {
+            out.insert(*base, i);
+        }
+    }
+    out
+}
+
+/// Merged ranges as some documents record them: a formula owner of kind 5
+/// whose range_dependencies 5 hold back_dependency 2 entries, each an
+/// internal_range_reference 4 (owner_id 1, range 2: top_left_column 1,
+/// top_left_row 2, bottom_right_column 3, bottom_right_row 4). The owner
+/// id is an index into the calculation engine's map (TSCE.
+/// CalculationEngineArchive: dependency_tracker 2, owner_id_map 3,
+/// map_entry 1: internal_owner_id 1, owner_id 2) of table UUIDs.
+fn merge_owners(
+    store: &Store,
+    by_uuid: &HashMap<u128, usize>,
+) -> HashMap<usize, Vec<(u32, u32, u32, u32)>> {
+    let mut out: HashMap<usize, Vec<(u32, u32, u32, u32)>> = HashMap::new();
+    let mut owners: HashMap<u64, u128> = HashMap::new();
+    for ce in store.ids_of(CALC_ENGINE) {
+        let Some(m) = store.typed(ce, CALC_ENGINE) else {
+            continue;
+        };
+        for e in m
+            .msg(2)
+            .and_then(|t| t.msg(3))
+            .into_iter()
+            .flat_map(|o| o.msgs(1))
+        {
+            if let (Some(i), Some(u)) = (e.uint(1), e.msg(2).and_then(formula::cfuuid)) {
+                owners.insert(i, u);
+            }
+        }
+    }
+    for id in store.ids_of(OWNER_DEPS) {
+        let Some(m) = store.typed(id, OWNER_DEPS) else {
+            continue;
+        };
+        if m.uint(3) != Some(5) {
+            continue;
+        }
+        for dep in m.msg(5).into_iter().flat_map(|r| r.msgs(2)).take(1 << 16) {
+            let Some(rr) = dep.msg(4) else { continue };
+            let Some(&t) = rr
+                .uint(1)
+                .and_then(|o| owners.get(&o))
+                .and_then(|u| by_uuid.get(u))
+            else {
+                continue;
+            };
+            let Some(r) = rr.msg(2) else { continue };
+            let v = |n| r.uint(n).map(|x| x as u32);
+            if let (Some(c1), Some(r1), Some(c2), Some(r2)) = (v(1), v(2), v(3), v(4)) {
+                out.entry(t).or_default().push((r1, c1, r2, c2));
+            }
+        }
+    }
+    out
+}
+
+/// TSK.CustomFormatListArchive (uuids 1, custom_formats 2): UUID to format.
+fn custom_formats<'a>(store: &'a Store, doc: Msg<'a>) -> HashMap<u128, Msg<'a>> {
+    let mut out = HashMap::new();
+    let list = doc
+        .msg(8)
+        .and_then(|s| s.reference(12))
+        .and_then(|i| store.get(i))
+        .map(|o| o.1)
+        .or_else(|| {
+            store
+                .ids_of(CUSTOM_FORMATS)
+                .first()
+                .and_then(|&i| store.typed(i, CUSTOM_FORMATS))
+        });
+    if let Some(l) = list {
+        for (u, f) in l.msgs(1).zip(l.msgs(2)) {
+            if let Some(u) = formula::uuid(u) {
+                out.insert(u, f);
+            }
+        }
+    }
+    out
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/style.rs b/crates/exav-render/src/formats/office/sheets/numbers/style.rs
new file mode 100644
index 00000000..bcb5a271
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/style.rs
@@ -0,0 +1,305 @@
+//! Cell and text styles. A style holds the properties it sets and names its
+//! parent (TSS.StyleArchive: name 1, parent 3, in field 1 of each style);
+//! a property comes from the first style up the chain that sets it.
+//!
+//! TST.CellStyleArchive: cell_properties 11, with cell_fill 1 (TSD.FillArchive:
+//! color 1, gradient 2 with stops 2 holding color 1), text_wrap 3 and
+//! vertical_alignment 8 (0 top, 1 middle, 2 bottom).
+//! TSWP.ParagraphStyleArchive and CharacterStyleArchive: char_properties 11
+//! (bold 1, italic 2, font_size 3, font_name 5, font_color 7, underline 11,
+//! strikethru 12) and, for paragraphs, para_properties 12 (alignment 1: 0
+//! left, 1 right, 2 center, 3 justified, 4 natural).
+//! TSP.Color: model 1 (1 RGB, 2 CMYK, 3 white), r 3, g 4, b 5, alpha 6,
+//! c 7, m 8, y 9, k 10, w 11, all in 0 to 1.
+
+use super::iwa::Store;
+use super::proto::Msg;
+use crate::formats::office::sheets::model::{Edge, Font, Rgb};
+
+const MAX_CHAIN: usize = 32;
+
+/// A colour, `None` when transparent.
+pub fn color(c: Msg) -> Option<Rgb> {
+    if c.float(6).unwrap_or(1.0) < 0.01 {
+        return None;
+    }
+    let f = |n| f64::from(c.float(n).unwrap_or(0.0)).clamp(0.0, 1.0);
+    let (r, g, b) = match c.uint(1).unwrap_or(1) {
+        2 => {
+            let k = 1.0 - f(10);
+            ((1.0 - f(7)) * k, (1.0 - f(8)) * k, (1.0 - f(9)) * k)
+        }
+        3 => (f(11), f(11), f(11)),
+        _ => (f(3), f(4), f(5)),
+    };
+    let q = |v: f64| (v * 255.0).round() as u32;
+    Some(q(r) << 16 | q(g) << 8 | q(b))
+}
+
+/// A fill's colour: its colour, or its gradient's first stop.
+pub fn fill_color(f: Msg) -> Option<Rgb> {
+    if let Some(c) = f.msg(1) {
+        return color(c);
+    }
+    let stop = f.msg(2)?.msgs(2).next()?;
+    color(stop.msg(1)?)
+}
+
+/// The properties of cell styles that the XLSX style takes.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct CellProps {
+    pub fill: Option<Option<Rgb>>,
+    pub wrap: Option<bool>,
+    pub valign: Option<u64>,
+}
+
+impl CellProps {
+    /// Fills what is unset from `o`.
+    pub fn under(&mut self, o: &CellProps) {
+        self.fill = self.fill.or(o.fill);
+        self.wrap = self.wrap.or(o.wrap);
+        self.valign = self.valign.or(o.valign);
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct TextProps {
+    pub bold: Option<bool>,
+    pub italic: Option<bool>,
+    pub size: Option<f32>,
+    pub font: Option<String>,
+    pub color: Option<Option<Rgb>>,
+    pub underline: Option<u64>,
+    pub strike: Option<u64>,
+    pub align: Option<u64>,
+}
+
+impl TextProps {
+    pub fn under(&mut self, o: &TextProps) {
+        self.bold = self.bold.or(o.bold);
+        self.italic = self.italic.or(o.italic);
+        self.size = self.size.or(o.size);
+        if self.font.is_none() {
+            self.font.clone_from(&o.font);
+        }
+        self.color = self.color.or(o.color);
+        self.underline = self.underline.or(o.underline);
+        self.strike = self.strike.or(o.strike);
+        self.align = self.align.or(o.align);
+    }
+
+    /// The character properties of a style's field `n`.
+    fn chars(&mut self, cp: Msg) {
+        let t = TextProps {
+            bold: cp.boolean(1),
+            italic: cp.boolean(2),
+            size: cp.float(3).filter(|s| s.is_finite() && *s > 0.0),
+            font: cp.string(5).filter(|s| !s.is_empty()),
+            color: if cp.boolean(6).unwrap_or(false) {
+                None
+            } else {
+                cp.msg(7).map(color)
+            },
+            underline: cp.uint(11),
+            strike: cp.uint(12),
+            align: None,
+        };
+        self.under(&t);
+    }
+
+    pub fn font(&self) -> Font {
+        let (name, bold, italic) = family(self.font.as_deref().unwrap_or("HelveticaNeue"));
+        Font {
+            name,
+            size_centipt: (f64::from(self.size.unwrap_or(10.0)) * 100.0)
+                .round()
+                .clamp(100.0, 40_000.0) as u32,
+            bold: self.bold.unwrap_or(bold),
+            italic: self.italic.unwrap_or(italic),
+            underline: match self.underline {
+                Some(1 | 3) => Some("single"),
+                Some(2) => Some("double"),
+                _ => None,
+            },
+            strike: self.strike.is_some_and(|s| s > 0),
+            color: self.color.flatten().filter(|&c| c != 0),
+            ..Font::default()
+        }
+    }
+}
+
+/// The parent of a style.
+fn parent(m: Msg) -> Option<u64> {
+    m.msg(1)?.reference(3)
+}
+
+pub fn cell_props(store: &Store, id: u64) -> CellProps {
+    let mut out = CellProps::default();
+    let mut cur = Some(id);
+    for _ in 0..MAX_CHAIN {
+        let Some((_, m)) = cur.and_then(|i| store.get(i)) else {
+            break;
+        };
+        if let Some(cp) = m.msg(11) {
+            let p = CellProps {
+                fill: cp.msg(1).map(fill_color),
+                wrap: cp.boolean(3),
+                valign: cp.uint(8),
+            };
+            out.under(&p);
+        }
+        cur = parent(m);
+    }
+    out
+}
+
+pub fn text_props(store: &Store, id: u64) -> TextProps {
+    let mut out = TextProps::default();
+    let mut cur = Some(id);
+    for _ in 0..MAX_CHAIN {
+        let Some((_, m)) = cur.and_then(|i| store.get(i)) else {
+            break;
+        };
+        if let Some(cp) = m.msg(11) {
+            out.chars(cp);
+        }
+        if out.align.is_none() {
+            out.align = m.msg(12).and_then(|pp| pp.uint(1));
+        }
+        cur = parent(m);
+    }
+    out
+}
+
+/// A PostScript font name ("HelveticaNeue-Bold", "ArialMT") to its family
+/// and the weight and slant its name says: from the names of macOS fonts
+/// the rule below misses, else by the rule.
+pub fn family(ps: &str) -> (String, bool, bool) {
+    let (base, face) = ps.split_once('-').unwrap_or((ps, ""));
+    let f = face.to_ascii_lowercase();
+    let bold = f.contains("bold");
+    let italic = f.contains("italic") || f.contains("oblique");
+    if let Ok(i) = super::fonts::FAMILIES.binary_search_by_key(&ps, |f| f.0) {
+        return (super::fonts::FAMILIES[i].1.to_string(), bold, italic);
+    }
+    if base.starts_with(".SF") {
+        // The system font.
+        return ("SF Pro".into(), bold, italic);
+    }
+    let base = base
+        .strip_suffix("PSMT")
+        .or_else(|| base.strip_suffix("MT"))
+        .unwrap_or(base);
+    // "HelveticaNeue" to "Helvetica Neue": a space before a capital that
+    // follows a lower-case letter.
+    let mut name = String::new();
+    let mut prev_lower = false;
+    for c in base.chars() {
+        if c.is_uppercase() && prev_lower {
+            name.push(' ');
+        }
+        prev_lower = c.is_lowercase();
+        name.push(c);
+    }
+    if name.is_empty() {
+        name = "Helvetica Neue".into();
+    }
+    (name, bold, italic)
+}
+
+/// A TSD.StrokeArchive (color 1, width 2, pattern 6: type 1 with 0 dashes,
+/// 1 solid, 2 none, and the dash lengths 4) as an XLSX edge; an edge
+/// without style when the stroke draws nothing.
+pub fn stroke_edge(s: Msg) -> Edge {
+    let pattern = s.msg(6);
+    let kind = pattern.and_then(|p| p.uint(1)).unwrap_or(1);
+    let width = f64::from(s.float(2).unwrap_or(1.0));
+    let color = s.msg(1).and_then(color);
+    if kind == 2 || width <= 0.0 || color.is_none() {
+        return Edge::default();
+    }
+    let dash = pattern.and_then(|p| match p.get(4) {
+        Some(super::proto::Val::Fixed32(v)) => Some(f32::from_bits(v)),
+        Some(super::proto::Val::Bytes(b)) if b.len() >= 4 => {
+            Some(f32::from_le_bytes([b[0], b[1], b[2], b[3]]))
+        }
+        _ => None,
+    });
+    let style = match (kind, width) {
+        (0, w) if dash.is_some_and(|d| d < 1.0) => {
+            if w >= 1.5 {
+                "mediumDashDotDot"
+            } else {
+                "dotted"
+            }
+        }
+        (0, w) if w >= 1.5 => "mediumDashed",
+        (0, _) => "dashed",
+        (_, w) if w >= 2.5 => "thick",
+        (_, w) if w >= 1.5 => "medium",
+        _ => "thin",
+    };
+    Edge {
+        style: Some(style),
+        color: color.filter(|&c| c != 0),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::proto::write::W;
+    use super::*;
+
+    #[test]
+    fn families() {
+        assert_eq!(
+            family("HelveticaNeue-Bold"),
+            ("Helvetica Neue".into(), true, false)
+        );
+        assert_eq!(family("ArialMT"), ("Arial".into(), false, false));
+        assert_eq!(family("Georgia-BoldItalic"), ("Georgia".into(), true, true));
+        assert_eq!(
+            family("TimesNewRomanPSMT"),
+            ("Times New Roman".into(), false, false)
+        );
+        assert_eq!(family("Arial-Black"), ("Arial Black".into(), false, false));
+        assert_eq!(
+            family("BodoniSvtyTwoITCTT-Book"),
+            ("Bodoni 72".into(), false, false)
+        );
+    }
+
+    #[test]
+    fn colors() {
+        let c = W::default()
+            .uint(1, 1)
+            .float(3, 1.0)
+            .float(4, 0.5)
+            .float(5, 0.0);
+        assert_eq!(color(Msg(&c.0)), Some(0xFF8000));
+        let c = W::default().uint(1, 3).float(11, 1.0);
+        assert_eq!(color(Msg(&c.0)), Some(0xFFFFFF));
+        let c = W::default().uint(1, 1).float(3, 1.0).float(6, 0.0);
+        assert_eq!(color(Msg(&c.0)), None);
+    }
+
+    #[test]
+    fn strokes() {
+        let black = W::default().uint(1, 1).float(3, 0.0);
+        let solid = W::default()
+            .msg(1, black.clone())
+            .float(2, 0.35)
+            .msg(6, W::default().uint(1, 1));
+        assert_eq!(stroke_edge(Msg(&solid.0)).style, Some("thin"));
+        let none = W::default()
+            .msg(1, black.clone())
+            .float(2, 1.0)
+            .msg(6, W::default().uint(1, 2));
+        assert_eq!(stroke_edge(Msg(&none.0)).style, None);
+        let dots = W::default()
+            .msg(1, black)
+            .float(2, 1.0)
+            .msg(6, W::default().uint(1, 0).float(4, 0.1).float(4, 2.0));
+        assert_eq!(stroke_edge(Msg(&dots.0)).style, Some("dotted"));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/table.rs b/crates/exav-render/src/formats/office/sheets/numbers/table.rs
new file mode 100644
index 00000000..c0f170a2
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/table.rs
@@ -0,0 +1,950 @@
+//! One table (TST.TableModelArchive) to one sheet.
+//!
+//! TableModelArchive fields: table_style 3, base_data_store 4,
+//! number_of_rows 6, number_of_columns 7, table_name 8, header rows 9,
+//! header columns 10, footer rows 11, header_rows_frozen 12,
+//! header_columns_frozen 13, default_row_height 16, default_column_width
+//! 17, region cell styles 18 (body), 19 (header row), 20 (header column),
+//! 21 (footer), region text styles 24 to 27 in the same order,
+//! merge_owner 47 (formula_store 2: formulas 3, each formula 2),
+//! stroke_sidecar 49, haunted_owner 84 (owner_uid 1).
+//!
+//! DataStore fields: rowHeaders 1 (buckets 2), columnHeaders 2 (a bucket),
+//! tiles 3 (tiles 1: tileid 1, tile 2; tile_size 2), stringTable 4,
+//! styleTable 5, formula_table 6, format_table_pre_bnc 11,
+//! formulaErrorTable 12, merge_region_map 13, rich_text_table 17,
+//! commentStorageTable 19, format_table 22. A data list (TST.TableDataList)
+//! holds entries 3 (key 1, string 3, reference 4, formula 5, format 6,
+//! rich_text_payload 9, comment_storage 10) and segments 4 holding more.
+
+use super::cells::{self, Raw};
+use super::format;
+use super::formula::{self, Refs, TableDims};
+use super::iwa::Store;
+use super::proto::Msg;
+use super::style::{self, CellProps, TextProps};
+use crate::formats::office::sheets::error::Result;
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+/// Days from 1899-12-30, the 1900 date system's day 0, to 2001-01-01.
+const EPOCH_DAYS: f64 = 36_892.0;
+
+/// What tables share: the object store, the tables as references see
+/// them, custom formats and resolved styles.
+pub struct Cx<'a> {
+    pub store: &'a Store,
+    pub tables: Vec<TableDims>,
+    pub by_uuid: HashMap<u128, usize>,
+    /// Custom format UUIDs to their CustomFormatArchive.
+    pub custom_formats: HashMap<u128, Msg<'a>>,
+    /// Merged ranges the calculation engine records, by table: (first
+    /// row, first column, last row, last column).
+    pub merges: HashMap<usize, Vec<(u32, u32, u32, u32)>>,
+    pub cell_props: HashMap<u64, CellProps>,
+    pub text_props: HashMap<u64, TextProps>,
+}
+
+impl Cx<'_> {
+    fn cell_props(&mut self, id: Option<u64>) -> CellProps {
+        let Some(id) = id else {
+            return CellProps::default();
+        };
+        if let Some(p) = self.cell_props.get(&id) {
+            return p.clone();
+        }
+        let p = style::cell_props(self.store, id);
+        self.cell_props.insert(id, p.clone());
+        p
+    }
+
+    fn text_props(&mut self, id: Option<u64>) -> TextProps {
+        let Some(id) = id else {
+            return TextProps::default();
+        };
+        if let Some(p) = self.text_props.get(&id) {
+            return p.clone();
+        }
+        let p = style::text_props(self.store, id);
+        self.text_props.insert(id, p.clone());
+        p
+    }
+}
+
+/// A data list's entries by key.
+fn data_list<'a>(store: &'a Store, id: Option<u64>) -> HashMap<u32, Msg<'a>> {
+    let mut out = HashMap::new();
+    let Some((_, m)) = id.and_then(|i| store.get(i)) else {
+        return out;
+    };
+    let mut add = |list: Msg<'a>| {
+        for e in list.msgs(3) {
+            if let Some(k) = e.uint(1) {
+                out.insert(k as u32, e);
+            }
+        }
+    };
+    add(m);
+    for seg in m.references(4).take(1 << 16) {
+        if let Some((_, s)) = store.get(seg) {
+            add(s);
+        }
+    }
+    out
+}
+
+/// Row or column headers: index to (size, hidden, cell style, text style).
+type Headers = HashMap<u32, (f32, bool, Option<u64>, Option<u64>)>;
+
+fn headers(store: &Store, buckets: impl Iterator<Item = u64>, max: u32) -> Headers {
+    let mut out = HashMap::new();
+    for b in buckets.take(4096) {
+        let Some((_, m)) = store.get(b) else { continue };
+        for h in m.msgs(2) {
+            let Some(i) = h.uint(1).map(|i| i as u32).filter(|&i| i < max) else {
+                continue;
+            };
+            let size = h
+                .float(2)
+                .filter(|s| s.is_finite() && *s > 0.0)
+                .unwrap_or(0.0);
+            out.insert(
+                i,
+                (
+                    size,
+                    h.uint(3).unwrap_or(0) != 0,
+                    h.reference(5),
+                    h.reference(6),
+                ),
+            );
+        }
+    }
+    out
+}
+
+/// Which part of the table a cell is in: 0 body, 1 header row, 2 header
+/// column, 3 footer. Header rows take their corner with header columns,
+/// header columns theirs with footer rows.
+pub(super) fn region(d: &TableDims, r: u32, c: u32) -> usize {
+    if r < d.header_rows {
+        1
+    } else if c < d.header_cols {
+        2
+    } else if d.footer_rows > 0 && r >= d.rows.saturating_sub(d.footer_rows) {
+        3
+    } else {
+        0
+    }
+}
+
+#[derive(Clone, PartialEq, Eq, Hash)]
+struct StyleKey {
+    region: usize,
+    cell: [Option<u64>; 3],
+    text: [Option<u64>; 3],
+    numfmt: Option<String>,
+    border: [Option<Edge>; 4],
+}
+
+pub fn read_table(
+    cx: &mut Cx,
+    idx: usize,
+    model: Msg,
+    sheet: &mut Sheet,
+    wb: &mut Workbook,
+    budget: &mut Budget,
+) -> Result<()> {
+    let store = cx.store;
+    let d = cx.tables[idx].clone();
+    let ds = model.msg(4).unwrap_or_default();
+    let strings = data_list(store, ds.reference(4));
+    let styles = data_list(store, ds.reference(5));
+    let formulas = data_list(store, ds.reference(6));
+    let formats = data_list(store, ds.reference(22).or_else(|| ds.reference(11)));
+    let rich = data_list(store, ds.reference(17));
+    let comments = data_list(store, ds.reference(19));
+    let style_ref = |k: Option<u32>| k.and_then(|k| styles.get(&k)).and_then(|e| e.reference(4));
+
+    // Sizes.
+    let def_h = model
+        .double(16)
+        .filter(|h| h.is_finite() && *h > 0.0)
+        .unwrap_or(20.0);
+    sheet.default_row_height = def_h.min(409.0);
+    sheet.default_row_custom = true;
+    let def_w = model
+        .double(17)
+        .filter(|w| w.is_finite() && *w > 0.0)
+        .unwrap_or(98.0);
+    sheet.default_col_width = Some(width_chars(def_w));
+    let rows_h = headers(store, ds.msg(1).unwrap_or_default().references(2), d.rows);
+    let cols_h = headers(store, ds.reference(2).into_iter(), d.cols);
+    let mut col_keys: Vec<&u32> = cols_h.keys().collect();
+    col_keys.sort_unstable();
+    for &c in col_keys {
+        let (size, hidden, _, _) = cols_h[&c];
+        if c > MAX_COL || (size <= 0.0 && !hidden) {
+            continue;
+        }
+        let width = (size > 0.0).then(|| width_chars(f64::from(size)));
+        sheet.cols.push(ColInfo {
+            first: c,
+            last: c,
+            width,
+            hidden,
+            style: None,
+            outline: 0,
+        });
+    }
+    for (&r, &(size, hidden, _, _)) in &rows_h {
+        if r > MAX_ROW || (size <= 0.0 && !hidden) {
+            continue;
+        }
+        let height = (size > 0.0).then(|| f64::from(size).min(409.0));
+        sheet.rows.insert(
+            r,
+            RowInfo {
+                height,
+                custom_height: height.is_some(),
+                hidden,
+                style: None,
+                outline: 0,
+            },
+        );
+    }
+
+    // Merges: from the merge owner's formulas, else the calculation
+    // engine's, else the region map.
+    for pair in model
+        .msg(47)
+        .and_then(|m| m.msg(2))
+        .into_iter()
+        .flat_map(|s| s.msgs(3))
+        .take(1 << 16)
+    {
+        let Some(node) = pair
+            .msg(2)
+            .and_then(|f| f.msg(1))
+            .and_then(|a| a.msgs(1).next())
+        else {
+            continue;
+        };
+        if node.uint(1) != Some(67) {
+            continue;
+        }
+        let Some(t) = node.msg(40) else { continue };
+        let span = |m: Option<Msg>| {
+            m.and_then(|m| Some((m.uint(1)? as u32, m.uint(2).or(m.uint(1))? as u32)))
+        };
+        if let (Some((r1, r2)), Some((c1, c2))) = (span(t.msgs(4).next()), span(t.msgs(3).next())) {
+            push_merge(sheet, &d, r1, c1, r2, c2);
+        }
+    }
+    if sheet.merges.is_empty() {
+        for &(r1, c1, r2, c2) in cx.merges.get(&idx).into_iter().flatten() {
+            push_merge(sheet, &d, r1, c1, r2, c2);
+        }
+    }
+    if sheet.merges.is_empty()
+        && let Some((_, m)) = ds.reference(13).and_then(|i| store.get(i))
+    {
+        for cr in m.msgs(1).take(1 << 16) {
+            let packed = |f: u32| cr.msg(f).and_then(|x| x.uint(1)).map(|v| v as u32);
+            let (Some(o), Some(s)) = (packed(1), packed(2)) else {
+                continue;
+            };
+            let (c1, r1) = (o >> 16, o & 0xFFFF);
+            let (nc, nr) = (s >> 16, s & 0xFFFF);
+            if nc > 0 && nr > 0 {
+                push_merge(sheet, &d, r1, c1, r1 + nr - 1, c1 + nc - 1);
+            }
+        }
+    }
+
+    // Borders.
+    let borders = strokes(store, model, &d, budget)?;
+
+    // Cells.
+    let region_cell = [18, 19, 20, 21].map(|f| model.reference(f));
+    let region_text = [24, 25, 26, 27].map(|f| model.reference(f));
+    let mut style_cache: HashMap<StyleKey, u32> = HashMap::new();
+    let refs_tables = std::mem::take(&mut cx.tables);
+    let refs_uuid = std::mem::take(&mut cx.by_uuid);
+    let mut bad_formulas = 0usize;
+    let tiles = ds.msg(3).unwrap_or_default();
+    let tile_size = tiles.uint(2).filter(|&s| s > 0).unwrap_or(256);
+    let mut result = Ok(());
+    'tiles: for t in tiles.msgs(1).take(1 << 16) {
+        let (Some(tid), Some((_, tile))) = (t.uint(1), t.reference(2).and_then(|r| store.get(r)))
+        else {
+            continue;
+        };
+        let bnc = tile.boolean(7).unwrap_or(false);
+        for ri in tile.msgs(5) {
+            let Some(row) = tid
+                .checked_mul(tile_size)
+                .and_then(|b| b.checked_add(ri.uint(1).unwrap_or(0)))
+            else {
+                continue;
+            };
+            if row >= u64::from(d.rows) || row > u64::from(MAX_ROW) {
+                continue;
+            }
+            let row = row as u32;
+            let wide = ri.boolean(8).unwrap_or(false);
+            // The current storage when there is one: writers set the "saved
+            // in BNC" flag of the tile inconsistently.
+            let (storage, offsets) = match (ri.bytes(6), ri.bytes(7)) {
+                (Some(s), Some(o)) if bnc || !o.is_empty() => (s, o),
+                _ => (
+                    ri.bytes(3).unwrap_or_default(),
+                    ri.bytes(4).unwrap_or_default(),
+                ),
+            };
+            for (col, rec) in cells::row_cells(storage, offsets, wide) {
+                if col >= d.cols || col > MAX_COL {
+                    continue;
+                }
+                let Some(raw) = cells::decode(rec) else {
+                    continue;
+                };
+                let rh = rows_h.get(&row);
+                let ch = cols_h.get(&col);
+                let reg = region(&d, row, col);
+                let numfmt = cell_format(cx, &formats, &raw);
+                let key = StyleKey {
+                    region: reg,
+                    cell: [
+                        style_ref(raw.cell_style),
+                        rh.and_then(|h| h.2),
+                        ch.and_then(|h| h.2),
+                    ],
+                    text: [
+                        style_ref(raw.text_style),
+                        rh.and_then(|h| h.3),
+                        ch.and_then(|h| h.3),
+                    ],
+                    numfmt,
+                    border: borders.get(&(row, col)).cloned().unwrap_or_default(),
+                };
+                let sid = style_for(
+                    cx,
+                    wb,
+                    &mut style_cache,
+                    key,
+                    region_cell[reg],
+                    region_text[reg],
+                );
+                let (value, link) =
+                    cell_value(store, &strings, &rich, &raw, wb, &mut cx.text_props);
+                let mut cell = Cell {
+                    value,
+                    formula: None,
+                    style: sid,
+                };
+                if let Some(f) = raw
+                    .formula
+                    .and_then(|k| formulas.get(&k))
+                    .and_then(|e| e.msg(5))
+                    .and_then(|f| f.msg(1))
+                {
+                    let refs = Refs {
+                        tables: &refs_tables,
+                        by_uuid: &refs_uuid,
+                        host: idx,
+                    };
+                    match formula::convert(f, &refs, row, col) {
+                        Some(text) => cell.formula = Some(text.into()),
+                        None => bad_formulas += 1,
+                    }
+                }
+                if let Some(url) = link.filter(|u| safe_url(u)) {
+                    sheet.hyperlinks.push(Hyperlink {
+                        range: Range::cell(row, col),
+                        url: Some(url),
+                        location: None,
+                        tooltip: None,
+                        display: None,
+                    });
+                }
+                if let Some((_, c)) = raw
+                    .comment
+                    .and_then(|k| comments.get(&k))
+                    .and_then(|e| e.reference(10))
+                    .and_then(|r| store.get(r))
+                {
+                    // TSD.CommentStorageArchive: text 1, author 3
+                    // (TSK.AnnotationAuthorArchive: name 1), replies 4.
+                    let author_of = |m: Msg| {
+                        m.reference(3)
+                            .and_then(|a| store.get(a))
+                            .and_then(|a| a.1.string(1))
+                            .unwrap_or_default()
+                    };
+                    let mut text = c.string(1).unwrap_or_default();
+                    for r in c.references(4).take(256).filter_map(|r| store.get(r)) {
+                        let t = r.1.string(1).unwrap_or_default();
+                        if !t.is_empty() {
+                            text.push_str(&format!("\n{}: {t}", author_of(r.1)));
+                        }
+                    }
+                    if !text.is_empty() {
+                        sheet.comments.push(Comment {
+                            row,
+                            col,
+                            author: author_of(c),
+                            text,
+                            visible: false,
+                        });
+                    }
+                }
+                let extra = cell.value.text_len() + cell.formula.as_ref().map_or(0, |f| f.len());
+                if let Err(e) = budget.cell(extra) {
+                    result = Err(e);
+                    break 'tiles;
+                }
+                sheet.cells.insert((row, col), cell);
+            }
+        }
+    }
+    cx.tables = refs_tables;
+    cx.by_uuid = refs_uuid;
+    result?;
+    if bad_formulas > 0 {
+        wb.warn(format!(
+            "{}: {bad_formulas} formulas Excel cannot express were left as their values",
+            sheet.name
+        ));
+    }
+
+    // Empty cells that show a fill or a border.
+    let area = u64::from(d.rows) * u64::from(d.cols);
+    let all = area <= 1 << 20 && budget.room_for_cells(area);
+    if !all {
+        wb.warn(format!(
+            "{}: fills of empty cells left out, the table is too large",
+            sheet.name
+        ));
+    }
+    let mut todo: Vec<(u32, u32)> = vec![];
+    if all {
+        for r in 0..d.rows.min(MAX_ROW + 1) {
+            for c in 0..d.cols.min(MAX_COL + 1) {
+                if !sheet.cells.contains_key(&(r, c)) {
+                    todo.push((r, c));
+                }
+            }
+        }
+    } else {
+        todo.extend(borders.keys().filter(|k| !sheet.cells.contains_key(k)));
+        todo.sort_unstable();
+    }
+    for (r, c) in todo {
+        let rh = rows_h.get(&r);
+        let ch = cols_h.get(&c);
+        let reg = region(&d, r, c);
+        let key = StyleKey {
+            region: reg,
+            cell: [None, rh.and_then(|h| h.2), ch.and_then(|h| h.2)],
+            text: [None, rh.and_then(|h| h.3), ch.and_then(|h| h.3)],
+            numfmt: None,
+            border: borders.get(&(r, c)).cloned().unwrap_or_default(),
+        };
+        let sid = style_for(
+            cx,
+            wb,
+            &mut style_cache,
+            key,
+            region_cell[reg],
+            region_text[reg],
+        );
+        let st = wb.styles.get(sid);
+        if st.fill.pattern == "none" && st.border == Border::default() {
+            continue;
+        }
+        budget.cell(0)?;
+        sheet.cells.insert((r, c), Cell::styled(sid));
+    }
+
+    // Frozen headers.
+    let fr = if model.boolean(12).unwrap_or(false) {
+        d.header_rows
+    } else {
+        0
+    };
+    let fc = if model.boolean(13).unwrap_or(false) {
+        d.header_cols
+    } else {
+        0
+    };
+    if fr > 0 || fc > 0 {
+        sheet.freeze = Some((fr.min(d.rows), fc.min(d.cols)));
+    }
+    Ok(())
+}
+
+/// A width in points as an XLSX column width: pixels at 96 dpi over the
+/// 7-pixel maximum digit width of the default font (10-point Helvetica
+/// Neue, or the sans-serif face that stands in for it).
+pub(super) fn width_chars(pt: f64) -> f64 {
+    ((pt * 96.0 / 72.0 / 7.0 * 256.0).round() / 256.0).min(255.0)
+}
+
+pub(super) fn push_merge(sheet: &mut Sheet, d: &TableDims, r1: u32, c1: u32, r2: u32, c2: u32) {
+    if r1 > r2 || c1 > c2 || r2 >= d.rows || c2 >= d.cols || (r1 == r2 && c1 == c2) {
+        return;
+    }
+    let m = Range { r1, c1, r2, c2 };
+    if !sheet
+        .merges
+        .iter()
+        .any(|x| x.r1 <= m.r2 && m.r1 <= x.r2 && x.c1 <= m.c2 && m.c1 <= x.c2)
+    {
+        sheet.merges.push(m);
+    }
+}
+
+/// The XLSX code of a cell's format, `None` for General.
+fn cell_format(cx: &Cx, formats: &HashMap<u32, Msg>, raw: &Raw) -> Option<String> {
+    let f = raw
+        .format()
+        .and_then(|k| formats.get(&k))
+        .and_then(|e| e.msg(6));
+    let value = match raw.kind {
+        cells::DURATION => raw.number().map(|s| s / 86_400.0),
+        _ => raw.number(),
+    };
+    let Some(f) = f else {
+        return match raw.kind {
+            cells::DATE => Some(if raw.seconds.unwrap_or(0.0).rem_euclid(86_400.0) == 0.0 {
+                "yyyy-mm-dd".into()
+            } else {
+                format::DEFAULT_DATE.into()
+            }),
+            cells::DURATION => Some("[h]:mm:ss".into()),
+            _ => None,
+        };
+    };
+    let custom = f
+        .msg(41)
+        .and_then(formula::uuid)
+        .and_then(|u| cx.custom_formats.get(&u))
+        .and_then(|c| c.msg(3));
+    format::code(f, custom, value)
+}
+
+fn style_for(
+    cx: &mut Cx,
+    wb: &mut Workbook,
+    cache: &mut HashMap<StyleKey, u32>,
+    key: StyleKey,
+    reg_cell: Option<u64>,
+    reg_text: Option<u64>,
+) -> u32 {
+    if let Some(&s) = cache.get(&key) {
+        return s;
+    }
+    let mut cp = CellProps::default();
+    for id in key.cell.iter().copied().chain([reg_cell]) {
+        cp.under(&cx.cell_props(id));
+    }
+    let mut tp = TextProps::default();
+    for id in key.text.iter().copied().chain([reg_text]) {
+        tp.under(&cx.text_props(id));
+    }
+    let mut st = Style {
+        font: tp.font(),
+        ..Style::default()
+    };
+    if let Some(Some(c)) = cp.fill {
+        st.fill = Fill::solid(c);
+    }
+    st.align.wrap = cp.wrap.unwrap_or(true);
+    st.align.vertical = match cp.valign.unwrap_or(0) {
+        1 => Some("center"),
+        2 => None,
+        _ => Some("top"),
+    };
+    st.align.horizontal = match tp.align {
+        Some(0) => Some("left"),
+        Some(1) => Some("right"),
+        Some(2) => Some("center"),
+        Some(3) => Some("justify"),
+        _ => None,
+    };
+    if let Some(f) = &key.numfmt {
+        st.numfmt.clone_from(f);
+    }
+    let [top, right, bottom, left] = key.border.clone();
+    st.border = Border {
+        top: top.unwrap_or_default(),
+        right: right.unwrap_or_default(),
+        bottom: bottom.unwrap_or_default(),
+        left: left.unwrap_or_default(),
+        ..Border::default()
+    };
+    let id = wb.styles.add(st);
+    cache.insert(key, id);
+    id
+}
+
+/// Seconds since 2001-01-01 as a 1900 date system serial, which counts a
+/// 29 February 1900 that was not: days of 1900 before March are one less.
+/// Earlier dates, which the system cannot show, are left as they count.
+pub(super) fn serial(secs: f64) -> f64 {
+    let v = EPOCH_DAYS + secs / 86_400.0;
+    if (2.0..61.0).contains(&v) { v - 1.0 } else { v }
+}
+
+/// A cell's value, and the link of a rich text cell that holds one.
+fn cell_value(
+    store: &Store,
+    strings: &HashMap<u32, Msg>,
+    rich: &HashMap<u32, Msg>,
+    raw: &Raw,
+    wb: &Workbook,
+    text_props: &mut HashMap<u64, TextProps>,
+) -> (Value, Option<String>) {
+    let v = match raw.kind {
+        cells::NUMBER | cells::CURRENCY => raw
+            .number()
+            .filter(|v| v.is_finite())
+            .map_or(Value::Empty, Value::Number),
+        // An empty string is kept only as a formula's result.
+        cells::TEXT => raw
+            .string
+            .and_then(|k| strings.get(&k))
+            .and_then(|e| e.string(3))
+            .filter(|s| !s.is_empty() || raw.formula.is_some())
+            .map_or(Value::Empty, Value::text),
+        cells::DATE => raw
+            .seconds
+            .filter(|s| s.is_finite())
+            .map_or(Value::Empty, |s| Value::Number(serial(s))),
+        cells::DURATION => raw
+            .double
+            .filter(|s| s.is_finite())
+            .map_or(Value::Empty, |s| Value::Number(s / 86_400.0)),
+        cells::BOOL => Value::Bool(raw.double.unwrap_or(0.0) > 0.0),
+        cells::ERROR => Value::Error(CellError::Value),
+        cells::RICH => {
+            let storage = raw
+                .rich
+                .and_then(|k| rich.get(&k))
+                .and_then(|e| e.reference(9))
+                .and_then(|p| store.get(p))
+                .and_then(|p| p.1.reference(1))
+                .and_then(|s| store.get(s));
+            return match storage {
+                Some((_, s)) => rich_text(store, s, wb, text_props),
+                None => (Value::Empty, None),
+            };
+        }
+        _ => Value::Empty,
+    };
+    (v, None)
+}
+
+/// A TSWP.StorageArchive: text 3, table_char_style 8 and table_smartfield
+/// 11 (entries 1: character_index 1, object 2). Character indexes count
+/// UTF-16 units.
+fn rich_text(
+    store: &Store,
+    s: Msg,
+    wb: &Workbook,
+    text_props: &mut HashMap<u64, TextProps>,
+) -> (Value, Option<String>) {
+    let text: String = s
+        .all(3)
+        .filter_map(|v| {
+            if let super::proto::Val::Bytes(b) = v {
+                Some(String::from_utf8_lossy(b).into_owned())
+            } else {
+                None
+            }
+        })
+        .collect();
+    let mut link = None;
+    for e in s.msg(11).into_iter().flat_map(|t| t.msgs(1)) {
+        if let Some((_, h)) = e.reference(2).and_then(|o| store.get(o))
+            && let Some(u) = h.string(2).filter(|u| !u.is_empty())
+        {
+            link.get_or_insert(u);
+        }
+    }
+    let runs: Vec<(usize, Option<u64>)> = s
+        .msg(8)
+        .into_iter()
+        .flat_map(|t| t.msgs(1))
+        .filter_map(|e| Some((e.uint(1)? as usize, e.reference(2))))
+        .take(4096)
+        .collect();
+    if runs.iter().all(|r| r.1.is_none()) {
+        return (Value::text(text), link);
+    }
+    let units: Vec<u16> = text.encode_utf16().collect();
+    let base = wb.styles.get(0).font.clone();
+    let mut out: Vec<Run> = vec![];
+    for (i, &(start, sty)) in runs.iter().enumerate() {
+        let end = runs
+            .get(i + 1)
+            .map_or(units.len(), |r| r.0)
+            .min(units.len());
+        let start = start.min(end);
+        if start == end {
+            continue;
+        }
+        let t = String::from_utf16_lossy(&units[start..end]);
+        let font = sty.map(|id| {
+            let p = text_props
+                .entry(id)
+                .or_insert_with(|| style::text_props(store, id))
+                .clone();
+            let mut f = p.font();
+            if p.font.is_none() {
+                f.name.clone_from(&base.name);
+            }
+            f
+        });
+        out.push(Run { text: t, font });
+    }
+    if let Some(first) = runs.first().filter(|r| r.0 > 0) {
+        let head = String::from_utf16_lossy(&units[..first.0.min(units.len())]);
+        out.insert(
+            0,
+            Run {
+                text: head,
+                font: None,
+            },
+        );
+    }
+    if out.is_empty() {
+        return (Value::text(text), link);
+    }
+    (Value::Rich(Rc::from(out)), link)
+}
+
+/// The borders strokes draw: TST.StrokeSidecarArchive (left 4, right 5,
+/// top 6 and bottom 7 column or row stroke layers), each layer a
+/// TST.StrokeLayerArchive (row_column_index 1, stroke_runs 2: origin 1,
+/// length 2, stroke 3, order 4), over the table style's lines. A run of a
+/// higher order draws over a lower one. Each line is set on both cells it
+/// separates.
+fn strokes(store: &Store, model: Msg, d: &TableDims, budget: &mut Budget) -> Result<Borders> {
+    let mut out: Borders = HashMap::new();
+    // (order, side, line index, from, to, edge); side 0 top, 1 right,
+    // 2 bottom, 3 left. The table style's lines come first, under all.
+    let mut runs = if u64::from(d.rows) * u64::from(d.cols) <= 1 << 20 {
+        style_lines(store, model, d)
+    } else {
+        vec![]
+    };
+    let sidecar = model
+        .reference(49)
+        .and_then(|r| store.get(r))
+        .map(|o| o.1)
+        .unwrap_or_default();
+    for (field, side) in [(6u32, 0usize), (5, 1), (7, 2), (4, 3)] {
+        for layer in sidecar.references(field).take(1 << 16) {
+            let Some((_, l)) = store.get(layer) else {
+                continue;
+            };
+            let idx = l.uint(1).unwrap_or(0) as u32;
+            for run in l.msgs(2) {
+                let origin = run.int(1).unwrap_or(0).max(0) as u32;
+                let len = run.uint(2).unwrap_or(0) as u32;
+                let Some(s) = run.msg(3) else { continue };
+                runs.push((
+                    run.uint(4).unwrap_or(0) as i64,
+                    side,
+                    idx,
+                    origin,
+                    origin.saturating_add(len),
+                    style::stroke_edge(s),
+                ));
+            }
+        }
+    }
+    runs.sort_by_key(|r| r.0);
+    let horizontal = |side: usize| side == 0 || side == 2;
+    let mut set = |r: u32, c: u32, side: usize, e: &Edge, out: &mut Borders| -> Result<()> {
+        if r >= d.rows || c >= d.cols {
+            return Ok(());
+        }
+        let slot = match out.get_mut(&(r, c)) {
+            Some(s) => s,
+            None => {
+                budget.alloc(64)?;
+                out.entry((r, c)).or_default()
+            }
+        };
+        slot[side] = Some(e.clone());
+        Ok(())
+    };
+    for (_, side, idx, from, to, edge) in runs {
+        let (from, to) = if horizontal(side) {
+            (from, to.min(d.cols))
+        } else {
+            (from, to.min(d.rows))
+        };
+        for k in from..to {
+            let (r, c) = if horizontal(side) { (idx, k) } else { (k, idx) };
+            set(r, c, side, &edge, &mut out)?;
+            // The neighbour across the line.
+            match side {
+                0 if r > 0 => set(r - 1, c, 2, &edge, &mut out)?,
+                2 => set(r + 1, c, 0, &edge, &mut out)?,
+                3 if c > 0 => set(r, c - 1, 1, &edge, &mut out)?,
+                1 => set(r, c + 1, 3, &edge, &mut out)?,
+                _ => {}
+            }
+        }
+    }
+    // A cleared edge is no edge.
+    for v in out.values_mut() {
+        for e in v.iter_mut() {
+            if e.as_ref().is_some_and(|e| e.style.is_none()) {
+                *e = None;
+            }
+        }
+    }
+    out.retain(|_, v| v.iter().any(Option::is_some));
+    Ok(out)
+}
+
+/// (order, side, line index, from, to, edge).
+type Line = (i64, usize, u32, u32, u32, Edge);
+
+/// Each cell's top, right, bottom and left edges.
+type Borders = HashMap<(u32, u32), [Option<Edge>; 4]>;
+
+/// The lines a table style draws (TST.TableStyleArchive: table_properties
+/// 11, the style's parent in field 1). TableStylePropertiesArchive: which
+/// lines show, v_strokes_visible 33, h_strokes_visible 34,
+/// hr_separator_visible 35, hc_separator_visible 36,
+/// footer_separator_visible 37, table_border_visible 38; and the strokes:
+/// header rows 46 (separator), 47 (border), 48 (horizontal), 49
+/// (vertical); header columns 50 (border), 51 (separator), 52, 53;
+/// footer rows 54 (separator), 55 (border), 56, 57; body 58 (horizontal
+/// border), 59 (vertical border), 60 (horizontal), 61 (vertical).
+fn style_lines(store: &Store, model: Msg, d: &TableDims) -> Vec<Line> {
+    let mut chain = vec![];
+    let mut cur = model.reference(3);
+    for _ in 0..16 {
+        let Some((_, m)) = cur.and_then(|i| store.get(i)) else {
+            break;
+        };
+        if let Some(p) = m.msg(11) {
+            chain.push(p);
+        }
+        cur = m.msg(1).and_then(|s| s.reference(3));
+    }
+    if chain.is_empty() {
+        return vec![];
+    }
+    let flag = |n: u32| chain.iter().find_map(|p| p.boolean(n)).unwrap_or(false);
+    let stroke = |n: u32, shown: bool| -> Option<Edge> {
+        if !shown {
+            return None;
+        }
+        let e = style::stroke_edge(chain.iter().find_map(|p| p.msg(n))?);
+        e.style.is_some().then_some(e)
+    };
+    let (v_in, h_in, hr_sep, hc_sep, ft_sep, border) =
+        (flag(33), flag(34), flag(35), flag(36), flag(37), flag(38));
+    let (rows, cols, hr, hc) = (d.rows, d.cols, d.header_rows, d.header_cols);
+    let fr_start = rows.saturating_sub(d.footer_rows).max(hr);
+    let mut runs: Vec<Line> = vec![];
+    let mut push = |side: usize, idx: u32, from: u32, to: u32, e: Option<Edge>| {
+        if let Some(e) = e.filter(|_| from < to) {
+            runs.push((-1, side, idx, from, to, e));
+        }
+    };
+    // Horizontal lines: line y is above row y.
+    for y in 0..=rows {
+        let footer = d.footer_rows > 0 && y >= fr_start;
+        for (from, to, in_hc) in [(0, hc.min(cols), true), (hc.min(cols), cols, false)] {
+            let e = if y == 0 || y == rows {
+                let edge_row = if y == 0 { 0 } else { rows - 1 };
+                if edge_row < hr {
+                    stroke(47, border)
+                } else if d.footer_rows > 0 && edge_row >= fr_start {
+                    stroke(55, border)
+                } else if in_hc {
+                    stroke(50, border)
+                } else {
+                    stroke(58, border)
+                }
+            } else if hr > 0 && y == hr {
+                stroke(46, hr_sep)
+            } else if d.footer_rows > 0 && y == fr_start {
+                stroke(54, ft_sep)
+            } else if y < hr {
+                stroke(48, h_in)
+            } else if footer {
+                stroke(56, h_in)
+            } else if in_hc {
+                stroke(52, h_in)
+            } else {
+                stroke(60, h_in)
+            };
+            let (side, idx) = if y < rows {
+                (0, y)
+            } else {
+                (2, rows.saturating_sub(1))
+            };
+            push(side, idx, from, to, e);
+        }
+    }
+    // Vertical lines: line x is left of column x.
+    for x in 0..=cols {
+        for (from, to, part) in [
+            (0, hr.min(rows), 1),
+            (hr.min(rows), fr_start.min(rows), 0),
+            (fr_start.min(rows), rows, 3),
+        ] {
+            let e = if x == 0 || x == cols {
+                match part {
+                    1 => stroke(47, border),
+                    3 => stroke(55, border),
+                    _ if x == 0 && hc > 0 => stroke(50, border),
+                    _ => stroke(59, border),
+                }
+            } else if hc > 0 && x == hc && part == 0 {
+                stroke(51, hc_sep)
+            } else {
+                match part {
+                    1 => stroke(49, v_in),
+                    3 => stroke(57, v_in),
+                    _ if x < hc => stroke(53, v_in),
+                    _ => stroke(61, v_in),
+                }
+            };
+            let (side, idx) = if x < cols {
+                (3, x)
+            } else {
+                (1, cols.saturating_sub(1))
+            };
+            push(side, idx, from, to, e);
+        }
+    }
+    runs
+}
+
+#[cfg(test)]
+mod tests {
+    use super::serial;
+
+    #[test]
+    fn serials_count_the_leap_day_1900_had_not() {
+        let day = 86_400.0;
+        // 1900-01-01 is serial 1, 1900-03-01 serial 61, 2001-01-01 36892.
+        assert_eq!(serial(-36_890.0 * day), 1.0);
+        assert_eq!(serial(-36_831.0 * day), 61.0);
+        assert_eq!(serial(0.0), 36_892.0);
+        // 1899-12-31 has no serial: left as it counts.
+        assert_eq!(serial(-36_891.0 * day), 1.0);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/tests.rs b/crates/exav-render/src/formats/office/sheets/numbers/tests.rs
new file mode 100644
index 00000000..01f595b5
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/tests.rs
@@ -0,0 +1,319 @@
+//! Documents built here, object by object, with the protobuf writer and
+//! literal-only Snappy blocks.
+
+use super::proto::write::W;
+use crate::formats::office::common::iwa::snappy::literal_block;
+use crate::formats::office::sheets::error::Error;
+use crate::formats::office::sheets::limits::{Budget, Limits};
+use crate::formats::office::sheets::model::*;
+use std::io::Write;
+
+/// One IWA stream holding `objects` (identifier, message type, payload).
+fn iwa(objects: &[(u64, u32, W)]) -> Vec<u8> {
+    let mut raw = vec![];
+    for (id, kind, m) in objects {
+        let info = W::default().uint(1, *id).msg(
+            2,
+            W::default()
+                .uint(1, u64::from(*kind))
+                .uint(3, m.0.len() as u64),
+        );
+        raw.extend(W::varint_len(info.0.len() as u64));
+        raw.extend(&info.0);
+        raw.extend(&m.0);
+    }
+    let block = literal_block(&raw);
+    let mut out = vec![
+        0u8,
+        block.len() as u8,
+        (block.len() >> 8) as u8,
+        (block.len() >> 16) as u8,
+    ];
+    out.extend(block);
+    out
+}
+
+fn zip(files: &[(&str, &[u8])]) -> Vec<u8> {
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(vec![]));
+    for (name, data) in files {
+        z.start_file(*name, zip::write::SimpleFileOptions::default())
+            .unwrap();
+        z.write_all(data).unwrap();
+    }
+    z.finish().unwrap().into_inner()
+}
+
+/// A v5 cell record: `kind`, then the fields of `flags` from `fields`.
+fn cell(kind: u8, flags: u32, fields: &[u8]) -> Vec<u8> {
+    let mut b = vec![5, kind, 0, 0, 0, 0, 0, 0];
+    b.extend(flags.to_le_bytes());
+    b.extend(fields);
+    b
+}
+
+fn decimal(m: u64) -> Vec<u8> {
+    let mut b = vec![0u8; 16];
+    b[..8].copy_from_slice(&m.to_le_bytes());
+    let e = 6176u32;
+    b[14] |= ((e & 0x7F) << 1) as u8;
+    b[15] |= (e >> 7) as u8;
+    b
+}
+
+/// A tile row: records for columns 0.., wide offsets.
+fn row(index: u64, cells: &[Option<Vec<u8>>]) -> W {
+    let mut storage = vec![];
+    let mut offsets = vec![];
+    for c in cells {
+        match c {
+            Some(rec) => {
+                offsets.extend(((storage.len() / 4) as i16).to_le_bytes());
+                storage.extend(rec);
+                while storage.len() % 4 != 0 {
+                    storage.push(0);
+                }
+            }
+            None => offsets.extend((-1i16).to_le_bytes()),
+        }
+    }
+    W::default()
+        .uint(1, index)
+        .uint(2, cells.iter().flatten().count() as u64)
+        .bytes(6, &storage)
+        .bytes(7, &offsets)
+        .uint(8, 1)
+}
+
+fn entry(key: u64) -> W {
+    W::default().uint(1, key).uint(2, 1)
+}
+
+/// A document with two tables on one sheet: T1 (3 rows, 2 columns, one
+/// header row) and T2, which a formula of T1 refers to.
+fn document() -> Vec<u8> {
+    let num = |v: u64| cell(2, 0x1, &decimal(v));
+    let text = |k: u32| cell(3, 0x8, &k.to_le_bytes());
+    // B3 = A3 + T2::A1, as postfix: A3, T2::A1, +.
+    let rel = |r: i64, c: i64| {
+        W::default()
+            .uint(1, 36)
+            .msg(27, W::default().sint(1, r))
+            .msg(26, W::default().sint(1, c))
+    };
+    let t2_uuid = W::default()
+        .uint(2, 0x11)
+        .uint(3, 0x22)
+        .uint(4, 0x33)
+        .uint(5, 0x44);
+    let cross = W::default()
+        .uint(1, 36)
+        .msg(27, W::default().sint(1, 0).uint(2, 1))
+        .msg(26, W::default().sint(1, 0).uint(2, 1))
+        .msg(28, W::default().msg(1, t2_uuid));
+    let ast = W::default()
+        .msg(1, rel(0, -1))
+        .msg(1, cross)
+        .msg(1, W::default().uint(1, 1));
+    let formula_cell = {
+        let mut f = decimal(15);
+        f.extend(1u32.to_le_bytes());
+        cell(2, 0x1 | 0x200, &f)
+    };
+    let tile = W::default()
+        .msg(5, row(0, &[Some(text(1)), Some(text(2))]))
+        .msg(5, row(1, &[Some(num(4)), Some(num(5))]))
+        .msg(5, row(2, &[Some(num(6)), Some(formula_cell)]))
+        .uint(7, 1);
+    let strings = W::default()
+        .uint(1, 1)
+        .msg(3, entry(1).bytes(3, b"Name"))
+        .msg(3, entry(2).bytes(3, b"Value"));
+    let formulas = W::default()
+        .uint(1, 3)
+        .msg(3, entry(1).msg(5, W::default().msg(1, ast)));
+    let cols = W::default().uint(1, 1).msg(
+        2,
+        W::default()
+            .uint(1, 1)
+            .float(2, 140.0)
+            .uint(3, 0)
+            .uint(4, 3),
+    );
+    let merge = W::default().msg(
+        1,
+        W::default()
+            .msg(1, W::default().fixed32(1, 0))
+            .msg(2, W::default().fixed32(1, (2 << 16) | 1)),
+    );
+    let store = W::default()
+        .msg(1, W::default().uint(1, 1))
+        .reference(2, 31)
+        .msg(
+            3,
+            W::default()
+                .msg(1, W::default().uint(1, 0).reference(2, 20))
+                .uint(2, 256),
+        )
+        .reference(4, 21)
+        .reference(6, 22)
+        .reference(13, 23);
+    let t1 = W::default()
+        .bytes(1, b"t1")
+        .msg(4, store)
+        .uint(6, 3)
+        .uint(7, 2)
+        .bytes(8, b"T1")
+        .uint(9, 1)
+        .uint(10, 0)
+        .uint(12, 1)
+        .double(16, 18.0)
+        .double(17, 98.0)
+        .msg(84, W::default().msg(1, W::default().uint(1, 7).uint(2, 0)));
+    let t2_tile = W::default().msg(5, row(0, &[Some(num(10))])).uint(7, 1);
+    let t2 = W::default()
+        .bytes(1, b"t2")
+        .msg(
+            4,
+            W::default().msg(
+                3,
+                W::default()
+                    .msg(1, W::default().uint(1, 0).reference(2, 40))
+                    .uint(2, 256),
+            ),
+        )
+        .uint(6, 1)
+        .uint(7, 1)
+        .bytes(8, b"T2")
+        .double(16, 20.0)
+        .double(17, 98.0)
+        .msg(84, W::default().msg(1, W::default().uint(1, 8).uint(2, 0)));
+    // T2's haunted owner (owner_uid 8) maps to the base UUID references use.
+    let base = W::default()
+        .uint(1, 0x22 << 32 | 0x11)
+        .uint(2, 0x44 << 32 | 0x33);
+    let owner = W::default()
+        .msg(1, W::default().uint(1, 8).uint(2, 0))
+        .uint(2, 1)
+        .uint(3, 35)
+        .msg(12, base);
+    let objects = vec![
+        (1, 1, W::default().reference(1, 2)),
+        (
+            2,
+            2,
+            W::default()
+                .bytes(1, b"Sheet 1")
+                .reference(2, 3)
+                .reference(2, 4),
+        ),
+        (3, 6000, W::default().reference(2, 10)),
+        (4, 6000, W::default().reference(2, 11)),
+        (10, 6001, t1),
+        (11, 6001, t2),
+        (20, 6002, tile),
+        (21, 6005, strings),
+        (22, 6005, formulas),
+        (23, 6144, merge),
+        (31, 6006, cols),
+        (40, 6002, t2_tile),
+        (50, 4008, owner),
+    ];
+    let doc = iwa(&objects);
+    zip(&[("Index/Document.iwa", &doc)])
+}
+
+fn read(bytes: &[u8]) -> Result<Workbook, Error> {
+    super::read(bytes, &mut Budget::new(Limits::default()))
+}
+
+#[test]
+fn tables_become_sheets() {
+    let wb = read(&document()).unwrap();
+    let names: Vec<&str> = wb.sheets.iter().map(|s| s.name.as_str()).collect();
+    assert_eq!(names, ["Sheet 1 - T1", "Sheet 1 - T2"]);
+    let s = &wb.sheets[0];
+    assert_eq!(s.cells[&(0, 0)].value, Value::text("Name"));
+    assert_eq!(s.cells[&(1, 1)].value, Value::Number(5.0));
+    // The formula, with the reference to the other table by its sheet.
+    let f = &s.cells[&(2, 1)];
+    assert_eq!(f.formula.as_deref(), Some("A3+'Sheet 1 - T2'!$A$1"));
+    assert_eq!(f.value, Value::Number(15.0));
+    // Header row frozen, the merge, the column width, the row height.
+    assert_eq!(s.freeze, Some((1, 0)));
+    assert_eq!(
+        s.merges,
+        [Range {
+            r1: 0,
+            c1: 0,
+            r2: 0,
+            c2: 1
+        }]
+    );
+    assert_eq!(
+        s.col_info(1).and_then(|c| c.width),
+        Some((140.0f64 * 96.0 / 72.0 / 7.0 * 256.0).round() / 256.0)
+    );
+    assert_eq!(s.default_row_height, 18.0);
+    assert!(!s.show_grid);
+}
+
+#[test]
+fn the_text_of_the_tables() {
+    let wb = read(&document()).unwrap();
+    let t = crate::formats::office::sheets::text::of(&wb, 1000);
+    // The formula's cached value, not its source.
+    assert_eq!(
+        t.text,
+        "Sheet 1 - T1\nName\tValue\n4\t5\n6\t15\nSheet 1 - T2\n10\n"
+    );
+    assert!(!t.truncated);
+}
+
+#[test]
+fn refusals() {
+    let enc = zip(&[("Index/Document.iwa", b"x"), (".iwpv2", b"x")]);
+    assert_eq!(read(&enc).unwrap_err(), Error::Encrypted);
+    // Numbers '09: its XML is read, here not XML at all.
+    let old = zip(&[("index.xml.gz", b"x")]);
+    assert!(matches!(read(&old), Err(Error::NotFormat(_))));
+    let empty = zip(&[("Index/Document.iwa", &iwa(&[(9, 2, W::default())]))]);
+    assert!(matches!(read(&empty), Err(Error::NotFormat(_))));
+    assert!(matches!(read(b"not a zip"), Err(Error::NotFormat(_))));
+}
+
+#[test]
+fn nested_index_zip() {
+    let doc = document();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(&doc[..])).unwrap();
+    let mut iwa = vec![];
+    std::io::Read::read_to_end(&mut z.by_name("Index/Document.iwa").unwrap(), &mut iwa).unwrap();
+    let inner = zip(&[("Index/Document.iwa", &iwa)]);
+    let outer = zip(&[("Doc.numbers/Index.zip", &inner)]);
+    assert_eq!(read(&outer).unwrap().sheets.len(), 2);
+}
+
+#[test]
+fn damaged_documents_do_not_panic() {
+    let doc = document();
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(&doc[..])).unwrap();
+    let mut iwa = vec![];
+    std::io::Read::read_to_end(&mut z.by_name("Index/Document.iwa").unwrap(), &mut iwa).unwrap();
+    // Every truncation, and bytes flipped one at a time.
+    for n in (0..iwa.len()).step_by(7) {
+        let _ = read(&zip(&[("Index/Document.iwa", &iwa[..n])]));
+    }
+    for i in (4..iwa.len()).step_by(3) {
+        let mut d = iwa.clone();
+        d[i] ^= 0xA5;
+        let _ = read(&zip(&[("Index/Document.iwa", &d)]));
+    }
+}
+
+#[test]
+fn cells_are_counted() {
+    let r = super::read(
+        &document(),
+        &mut Budget::new(Limits::default().with_max_cells(3)),
+    );
+    assert_eq!(r.unwrap_err(), Error::TooLarge("cells"));
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/v09.rs b/crates/exav-render/src/formats/office/sheets/numbers/v09.rs
new file mode 100644
index 00000000..9ae2e91f
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/v09.rs
@@ -0,0 +1,1162 @@
+//! Numbers '08 and '09 documents: one XML file, `index.xml` (gzipped in
+//! packages), in Apple's "sf", "sfa" and "ls" namespaces. No description
+//! of the format was published; what is read here was learnt from sample
+//! files, the converter's output on them checked against another
+//! application's.
+//!
+//! What the samples show:
+//! - `ls:workspace` elements are the sheets (`ls:workspace-name`); their
+//!   `sf:tabular-model` elements the tables (`sf:name`, `sf:id`,
+//!   `sf:num-header-rows`, `sf:num-header-columns`, `sf:num-footer-rows`,
+//!   `sf:header-rows-frozen`, `sf:header-columns-frozen`). Tables under
+//!   `ls:tabular-prototypes` are templates, not content.
+//! - `sf:grid` gives `sf:numrows` and `sf:numcols`, then `sf:columns`
+//!   (`sf:grid-column sf:width`, points), `sf:rows` (`sf:grid-row
+//!   sf:height`), the gridline styles and `sf:datasource`.
+//! - The data source lists cells in order. A cell's position is its row
+//!   times 256 plus its column; `sf:ct` is its distance from the previous
+//!   cell's (the first
+//!   cell's position), 1 when absent. Cells: `g` empty, `t` text (an
+//!   `sf:ct` child's `sfa:s`), `n` number (`sf:v`), `d` date
+//!   (`sf:cell-date`, seconds since 2001-01-01), `cb` check box, `f`
+//!   formula (`sf:fo sf:fs`, its result in `sf:r`), `pm` pop-up menu (the
+//!   choice `sf:proxied-cell-ref` names), `s` a cell a merge covers.
+//!   `sf:col-span` and `sf:row-span` merge; `sf:s` names the cell style.
+//! - Styles reference each other by `sfa:ID` / `sfa:IDREF`, and inherit by
+//!   `sf:parent-ident` / `sf:ident`; a property is set when its element in
+//!   `sf:property-map` has content (`sf:null` sets it empty).
+//! - Formulas are text, with tables named `SFTGlobalID_<sf:id> ::`.
+
+use super::format;
+use super::formula::TableDims;
+use super::proto::Msg;
+use super::style::TextProps;
+use super::table::{push_merge, region, serial, width_chars};
+use crate::formats::office::common::xml::{self as dom, Node};
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use std::collections::HashMap;
+
+const MAX_CHAIN: usize = 32;
+/// Columns a row holds: positions count 256 to a row.
+const ROW_STRIDE: i64 = 256;
+const MAX_FORMULA: usize = 16_384;
+
+struct Doc<'a> {
+    ids: HashMap<&'a str, &'a Node>,
+    idents: HashMap<&'a str, &'a Node>,
+}
+
+impl<'a> Doc<'a> {
+    /// Style idents repeat: each table prototype and the printing
+    /// stylesheet carry their own copies. The document's are taken first.
+    fn index(root: &'a Node) -> Doc<'a> {
+        let mut doc = Doc {
+            ids: HashMap::new(),
+            idents: HashMap::new(),
+        };
+        for all in [false, true] {
+            let mut stack = vec![root];
+            while let Some(n) = stack.pop() {
+                if !all && matches!(n.name.as_str(), "ls:tabular-prototypes" | "ls:printingss") {
+                    continue;
+                }
+                if let Some(id) = n.attr("sfa:ID") {
+                    doc.ids.entry(id).or_insert(n);
+                }
+                if let Some(id) = n.attr("sf:ident") {
+                    doc.idents.entry(id).or_insert(n);
+                }
+                stack.extend(n.nodes());
+            }
+        }
+        doc
+    }
+
+    /// `n`, or what its `sfa:IDREF` names.
+    fn deref(&self, n: &'a Node) -> &'a Node {
+        match n.attr("sfa:IDREF").and_then(|r| self.ids.get(r)) {
+            Some(t) => t,
+            None => n,
+        }
+    }
+
+    /// The first child of `n` that is not `sf:null`, dereferenced.
+    fn value_of(&self, n: &'a Node) -> Option<&'a Node> {
+        let v = n.nodes().next()?;
+        (v.name != "sf:null").then(|| self.deref(v))
+    }
+
+    /// Property `name` of `style` or of the first style up its chain that
+    /// sets it: the property element, `None` when no style sets it.
+    fn prop(&self, style: &'a Node, name: &str) -> Option<&'a Node> {
+        let mut cur = Some(style);
+        for _ in 0..MAX_CHAIN {
+            let s = cur?;
+            if let Some(p) = s.child("sf:property-map").and_then(|m| m.child(name))
+                && p.nodes().next().is_some()
+            {
+                return Some(p);
+            }
+            cur = s
+                .attr("sf:parent-ident")
+                .and_then(|i| self.idents.get(i))
+                .copied();
+        }
+        None
+    }
+
+    fn number(&self, style: &'a Node, name: &str) -> Option<f64> {
+        self.value_of(self.prop(style, name)?)?
+            .attr("sfa:number")?
+            .parse()
+            .ok()
+    }
+}
+
+fn num(n: &Node, a: &str) -> Option<f64> {
+    n.attr(a)
+        .and_then(|v| v.trim().parse::<f64>().ok())
+        .filter(|v| v.is_finite())
+}
+
+/// An `sf:color`: RGB or grey, `None` when transparent.
+fn color(c: &Node) -> Option<Rgb> {
+    rgba(c, false)
+}
+
+/// A colour as RGB, `None` when transparent; `on_white`: a translucent
+/// colour as it shows over white.
+fn rgba(c: &Node, on_white: bool) -> Option<Rgb> {
+    let a = num(c, "sfa:a").unwrap_or(1.0).clamp(0.0, 1.0);
+    if a < 0.01 {
+        return None;
+    }
+    let f = |n| num(c, n).unwrap_or(0.0).clamp(0.0, 1.0);
+    let (r, g, b) = match c.attr("sfa:w") {
+        Some(_) => (f("sfa:w"), f("sfa:w"), f("sfa:w")),
+        None => (f("sfa:r"), f("sfa:g"), f("sfa:b")),
+    };
+    let q = |v: f64| {
+        let v = if on_white { v * a + (1.0 - a) } else { v };
+        (v * 255.0).round() as u32
+    };
+    Some(q(r) << 16 | q(g) << 8 | q(b))
+}
+
+/// The colour a fill shows over the white page: its colour, or a
+/// gradient's first stop. Table styles fill with translucent colours.
+fn fill_color(n: &Node) -> Option<Rgb> {
+    if n.name == "sf:color" {
+        return rgba(n, true);
+    }
+    rgba(n.find("sf:color")?, true)
+}
+
+/// A protobuf TSK.FormatStructArchive of the fields `format::code` reads.
+struct FormatFields {
+    kind: u32,
+    decimals: Option<u64>,
+    currency: Option<String>,
+    negative: Option<u64>,
+    thousands: Option<bool>,
+    accounting: Option<bool>,
+    fraction: Option<u64>,
+    date: Option<String>,
+}
+
+impl FormatFields {
+    fn encode(&self) -> Vec<u8> {
+        fn varint(out: &mut Vec<u8>, mut v: u64) {
+            loop {
+                let b = (v & 0x7F) as u8;
+                v >>= 7;
+                if v == 0 {
+                    out.push(b);
+                    return;
+                }
+                out.push(b | 0x80);
+            }
+        }
+        let mut out = vec![];
+        let mut field = |n: u32, v: u64| {
+            varint(&mut out, u64::from(n) << 3);
+            varint(&mut out, v);
+        };
+        field(1, u64::from(self.kind));
+        if let Some(d) = self.decimals {
+            field(2, d);
+        }
+        if let Some(n) = self.negative {
+            field(4, n);
+        }
+        if let Some(t) = self.thousands {
+            field(5, u64::from(t));
+        }
+        if let Some(a) = self.accounting {
+            field(6, u64::from(a));
+        }
+        if let Some(f) = self.fraction {
+            field(11, f);
+        }
+        for (n, s) in [(3u32, &self.currency), (14, &self.date)] {
+            if let Some(s) = s {
+                varint(&mut out, u64::from(n) << 3 | 2);
+                varint(&mut out, s.len() as u64);
+                out.extend_from_slice(s.as_bytes());
+            }
+        }
+        out
+    }
+}
+
+/// A cell's format code: its own computed format (`sf:cf`), else its
+/// style's; `None` for General.
+fn format_code(
+    doc: &Doc,
+    cell: &Node,
+    style: Option<&Node>,
+    value: Option<f64>,
+    is_date: bool,
+) -> Option<String> {
+    let cf = cell
+        .nodes()
+        .find(|n| n.name == "sf:cf" || n.name == "sf:cf-ref")
+        .map(|n| doc.deref(n));
+    let number_format = cf.and_then(|c| c.child("sf:number-format")).or_else(|| {
+        style
+            .and_then(|s| doc.prop(s, "sf:SFTCellStylePropertyNumberFormat"))
+            .and_then(|p| doc.value_of(p))
+    });
+    let date_format = cf
+        .and_then(|c| {
+            c.nodes()
+                .find(|n| n.name == "sf:date-format" || n.name == "sf:date-format-ref")
+        })
+        .map(|n| doc.deref(n))
+        .or_else(|| {
+            style
+                .and_then(|s| doc.prop(s, "sf:SFTCellStylePropertyDateTimeFormat"))
+                .and_then(|p| doc.value_of(p))
+        });
+    let declared = style
+        .and_then(|s| doc.number(s, "sf:SFTCellStylePropertyFormatType"))
+        .map(|v| v as u32)
+        .filter(|&t| t != 255);
+    let implicit = cf
+        .and_then(|c| num(c, "sf:implicit-format-type"))
+        .map(|v| v as u32)
+        .or_else(|| {
+            style
+                .and_then(|s| doc.number(s, "sf:SFTCellStylePropertyImplicitFormatType"))
+                .map(|v| v as u32)
+        })
+        .filter(|&t| t != 255);
+    // Automatic (255) shows numbers as General does; an implicit type is
+    // the format Numbers chose for an automatic cell, its decimals those
+    // the value was typed with.
+    let kind = if is_date {
+        format::DATE
+    } else {
+        declared.or(implicit)?
+    };
+    let fields = match kind {
+        format::DATE => FormatFields {
+            kind,
+            decimals: None,
+            currency: None,
+            negative: None,
+            thousands: None,
+            accounting: None,
+            fraction: None,
+            date: date_format
+                .and_then(|d| d.attr("sf:fmt"))
+                .map(str::to_string),
+        },
+        format::DECIMAL
+        | format::CURRENCY
+        | format::PERCENT
+        | format::SCIENTIFIC
+        | format::FRACTION => {
+            let n = number_format?;
+            // 65534 in the samples: as many as the value needs, which the
+            // format code reads as 253.
+            let decimals = num(n, "sf:format-decimal-places").map(|d| d.clamp(0.0, 253.0) as u64);
+            FormatFields {
+                kind,
+                decimals,
+                currency: n.attr("sf:format-currency-code").map(str::to_string),
+                negative: num(n, "sf:format-negative-style").map(|v| v.max(0.0) as u64),
+                thousands: n
+                    .attr("sf:format-show-thousands-separator")
+                    .map(|v| v == "true"),
+                accounting: n
+                    .attr("sf:format-use-accounting-style")
+                    .map(|v| v == "true"),
+                fraction: num(n, "sf:format-fraction-accuracy")
+                    .map(|v| (v as i64 as i32) as u32 as u64),
+                date: None,
+            }
+        }
+        format::TEXT => return Some("@".into()),
+        _ => return None,
+    };
+    let bytes = fields.encode();
+    format::code(Msg(&bytes), None, value)
+}
+
+/// The paragraph style a cell style draws its text with.
+fn paragraph_style<'a>(doc: &Doc<'a>, style: &'a Node) -> Option<&'a Node> {
+    if let Some(p) = doc
+        .prop(style, "sf:SFTCellStylePropertyParagraphStyle")
+        .and_then(|p| doc.value_of(p))
+    {
+        return Some(p);
+    }
+    let layout = doc
+        .prop(style, "sf:SFTCellStylePropertyLayoutStyle")
+        .and_then(|p| doc.value_of(p))?;
+    doc.prop(layout, "sf:layoutParagraphStyle")
+        .and_then(|p| doc.value_of(p))
+}
+
+/// A paragraph style's character properties. Weight and slant are those
+/// `sf:bold` and `sf:italic` set, whatever face `sf:fontName` names: a
+/// sample's body cells in "Cochin-Bold" without `sf:bold` show regular.
+fn text_props(doc: &Doc, para: &Node) -> TextProps {
+    let n = |name: &str| doc.number(para, name);
+    TextProps {
+        bold: Some(n("sf:bold").is_some_and(|v| v != 0.0)),
+        italic: Some(n("sf:italic").is_some_and(|v| v != 0.0)),
+        size: n("sf:fontSize").map(|v| v as f32).filter(|v| *v > 0.0),
+        font: doc
+            .prop(para, "sf:fontName")
+            .and_then(|p| doc.value_of(p))
+            .and_then(|s| s.attr("sfa:string"))
+            .map(str::to_string),
+        color: doc
+            .prop(para, "sf:fontColor")
+            .map(|p| doc.value_of(p).and_then(color)),
+        underline: n("sf:underline").map(|v| v as u64),
+        strike: n("sf:strikethru").map(|v| v as u64),
+        align: n("sf:alignment").map(|v| v as u64),
+    }
+}
+
+/// A stroke as an edge: no line when its pattern is empty.
+fn stroke_edge(doc: &Doc, vector_style: &Node) -> Option<Edge> {
+    let p = doc.prop(vector_style, "sf:SFTStrokeProperty")?;
+    let s = doc.value_of(p)?;
+    let pattern = s.child("sf:pattern").map(|p| doc.deref(p));
+    let kind = pattern.and_then(|p| p.attr("sf:type")).unwrap_or("solid");
+    let width = num(s, "sf:width").unwrap_or(1.0);
+    let rgb = s.child("sf:color").and_then(color);
+    if matches!(kind, "empty" | "none") || width <= 0.0 || rgb.is_none() {
+        return Some(Edge::default());
+    }
+    let style = match (kind, width) {
+        ("pattern", _) => "dashed",
+        (_, w) if w >= 2.5 => "thick",
+        (_, w) if w >= 1.5 => "medium",
+        _ => "thin",
+    };
+    Some(Edge {
+        style: Some(style),
+        color: rgb.filter(|&c| c != 0),
+    })
+}
+
+/// Formula text of Numbers '09 to Excel syntax; `None` for what Excel
+/// cannot say.
+fn convert_formula(
+    fs: &str,
+    host: usize,
+    tables: &[TableDims],
+    by_id: &HashMap<String, usize>,
+) -> Option<String> {
+    let src: Vec<char> = fs.trim().trim_start_matches('=').chars().collect();
+    let mut out = String::new();
+    let mut i = 0;
+    let mut table: Option<usize> = None;
+    while i < src.len() {
+        let c = src[i];
+        if c == '"' {
+            let start = i;
+            i += 1;
+            while i < src.len() {
+                if src[i] == '"' {
+                    if src.get(i + 1) == Some(&'"') {
+                        i += 2;
+                        continue;
+                    }
+                    break;
+                }
+                i += 1;
+            }
+            i = (i + 1).min(src.len());
+            out.extend(&src[start..i]);
+            continue;
+        }
+        if c.is_ascii_alphabetic() || c == '_' || c == '$' {
+            let start = i;
+            while i < src.len()
+                && (src[i].is_ascii_alphanumeric() || matches!(src[i], '_' | '$' | '.'))
+            {
+                i += 1;
+            }
+            let word: String = src[start..i].iter().collect();
+            let mut j = i;
+            while j < src.len() && src[j] == ' ' {
+                j += 1;
+            }
+            if let Some(id) = word.strip_prefix("SFTGlobalID_") {
+                // A table: what follows "::" is in it.
+                if src.get(j) == Some(&':') && src.get(j + 1) == Some(&':') {
+                    table = Some(*by_id.get(&id.to_ascii_uppercase())?);
+                    i = j + 2;
+                    while i < src.len() && src[i] == ' ' {
+                        i += 1;
+                    }
+                    continue;
+                }
+                return None;
+            }
+            if src.get(j) == Some(&'(') {
+                if word.starts_with("__") {
+                    return None;
+                }
+                let up = word.to_ascii_uppercase();
+                if crate::formats::office::sheets::ods::formula::XLFN.contains(&up.as_str()) {
+                    out.push_str("_xlfn.");
+                }
+                out.push_str(&up);
+                continue;
+            }
+            // A reference, alone or the start of a range.
+            let first = parse_ref(&word);
+            let mut second = None;
+            if first.is_some() && src.get(i) == Some(&':') {
+                let s = i + 1;
+                let mut e = s;
+                while e < src.len() && (src[e].is_ascii_alphanumeric() || src[e] == '$') {
+                    e += 1;
+                }
+                let w: String = src[s..e].iter().collect();
+                if let Some(r) = parse_ref(&w) {
+                    second = Some(r);
+                    i = e;
+                }
+            }
+            match first {
+                Some(a) => {
+                    let t = table.take().unwrap_or(host);
+                    out.push_str(&ref_text(a, second.unwrap_or(a), t, host, tables)?);
+                }
+                None => {
+                    if table.is_some() {
+                        return None;
+                    }
+                    out.push_str(&word);
+                }
+            }
+            continue;
+        }
+        match c {
+            '×' => out.push('*'),
+            '÷' => out.push('/'),
+            '≠' => out.push_str("<>"),
+            '≤' => out.push_str("<="),
+            '≥' => out.push_str(">="),
+            _ => out.push(c),
+        }
+        i += 1;
+        if out.len() > MAX_FORMULA {
+            return None;
+        }
+    }
+    (!out.contains("::") && !out.trim().is_empty() && table.is_none()).then_some(out)
+}
+
+/// A reference token: (column, column absolute, row, row absolute), the
+/// row `None` for a whole column.
+type Ref = (u32, bool, Option<u32>, bool);
+
+fn parse_ref(w: &str) -> Option<Ref> {
+    let b = w.as_bytes();
+    let mut i = 0;
+    let col_abs = b.first() == Some(&b'$');
+    if col_abs {
+        i += 1;
+    }
+    let cs = i;
+    while i < b.len() && b[i].is_ascii_uppercase() {
+        i += 1;
+    }
+    if i == cs || i - cs > 3 {
+        return None;
+    }
+    let col = b[cs..i]
+        .iter()
+        .fold(0u32, |a, &x| a * 26 + u32::from(x - b'A' + 1))
+        - 1;
+    if i == b.len() {
+        if matches!(w, "TRUE" | "FALSE") {
+            return None;
+        }
+        return (col <= MAX_COL).then_some((col, col_abs, None, false));
+    }
+    let row_abs = b[i] == b'$';
+    if row_abs {
+        i += 1;
+    }
+    let row: u32 = std::str::from_utf8(&b[i..]).ok()?.parse().ok()?;
+    (row >= 1 && row - 1 <= MAX_ROW && col <= MAX_COL).then_some((
+        col,
+        col_abs,
+        Some(row - 1),
+        row_abs,
+    ))
+}
+
+fn ref_text(a: Ref, b: Ref, t: usize, host: usize, tables: &[TableDims]) -> Option<String> {
+    let d = tables.get(t)?;
+    let cell = |c: u32, ca: bool, r: u32, ra: bool| {
+        format!(
+            "{}{}{}{}",
+            if ca { "$" } else { "" },
+            col_name(c),
+            if ra { "$" } else { "" },
+            r + 1
+        )
+    };
+    let text = match (a.2, b.2) {
+        (Some(r1), Some(r2)) if (a.0, r1) == (b.0, r2) => cell(a.0, a.1, r1, a.3),
+        (Some(r1), Some(r2)) => format!("{}:{}", cell(a.0, a.1, r1, a.3), cell(b.0, b.1, r2, b.3)),
+        _ => {
+            // A whole column: its body rows, as in Numbers.
+            let first = d.header_rows;
+            let last = d.rows.saturating_sub(d.footer_rows).saturating_sub(1);
+            let (first, last) = if first <= last {
+                (first, last)
+            } else {
+                (0, d.rows.saturating_sub(1))
+            };
+            format!(
+                "{}:{}",
+                cell(a.0, a.1, first, true),
+                cell(b.0, b.1, last, true)
+            )
+        }
+    };
+    Some(if t == host {
+        text
+    } else {
+        format!(
+            "{}!{text}",
+            crate::formats::office::sheets::xls::formula::quote_sheet(&d.name)
+        )
+    })
+}
+
+struct TableRef<'a> {
+    model: &'a Node,
+    sheet: usize,
+}
+
+/// The tables of a sheet, in document order, prototypes left out.
+fn tables_in<'a>(n: &'a Node, out: &mut Vec<&'a Node>, depth: u32) {
+    for c in n.nodes() {
+        if c.name == "sf:tabular-model" {
+            out.push(c);
+        } else if depth < 32 && c.name != "ls:tabular-prototypes" {
+            tables_in(c, out, depth + 1);
+        }
+    }
+}
+
+#[derive(Clone, PartialEq, Eq, Hash)]
+struct StyleKey {
+    style: Option<String>,
+    numfmt: Option<String>,
+    border: [Option<Edge>; 4],
+    band: Option<Rgb>,
+}
+
+pub(crate) fn read(xml: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let root = dom::parse(xml, &mut budget.tree())?;
+    if root.name != "ls:document" {
+        return Err(Error::NotFormat("not a Numbers '08 or '09 document".into()));
+    }
+    let doc = Doc::index(&root);
+    let mut wb = Workbook::new(Style {
+        font: Font {
+            name: "Helvetica".into(),
+            ..Font::default()
+        },
+        align: Align {
+            vertical: Some("top"),
+            wrap: true,
+            ..Align::default()
+        },
+        ..Style::default()
+    });
+
+    let mut sheets: Vec<String> = vec![];
+    let mut refs: Vec<TableRef> = vec![];
+    for (k, ws) in root
+        .child("ls:workspace-array")
+        .into_iter()
+        .flat_map(|a| a.all("ls:workspace"))
+        .take(4096)
+        .enumerate()
+    {
+        sheets.push(
+            ws.attr("ls:workspace-name")
+                .map_or_else(|| format!("Sheet {}", k + 1), str::to_string),
+        );
+        let mut found = vec![];
+        tables_in(ws, &mut found, 0);
+        refs.extend(found.into_iter().map(|model| TableRef { model, sheet: k }));
+    }
+    if refs.is_empty() {
+        return Err(Error::Unsupported(
+            "a Numbers document without tables".into(),
+        ));
+    }
+    if refs.len() > budget.limits.max_sheets as usize {
+        return Err(Error::TooLarge("sheets"));
+    }
+    let raw: Vec<String> = refs
+        .iter()
+        .map(|t| {
+            let name = t.model.attr("sf:name").unwrap_or("Table");
+            if refs.iter().filter(|x| x.sheet == t.sheet).count() == 1 {
+                sheets[t.sheet].clone()
+            } else {
+                format!("{} - {name}", sheets[t.sheet])
+            }
+        })
+        .collect();
+    let names = crate::formats::office::sheets::xlsx::sheet_names(raw.iter().map(String::as_str));
+    let count = |m: &Node, a: &str, max: u32| {
+        m.attr(a)
+            .and_then(|v| v.parse::<u32>().ok())
+            .unwrap_or(0)
+            .min(max)
+    };
+    let dims: Vec<TableDims> = refs
+        .iter()
+        .zip(&names)
+        .map(|(t, n)| {
+            let grid = t.model.child("sf:grid");
+            let rows = grid.map_or(0, |g| count(g, "sf:numrows", MAX_ROW + 1));
+            let cols = grid.map_or(0, |g| count(g, "sf:numcols", 256));
+            TableDims {
+                name: n.clone(),
+                rows,
+                cols,
+                header_rows: count(t.model, "sf:num-header-rows", rows),
+                header_cols: count(t.model, "sf:num-header-columns", cols),
+                footer_rows: count(t.model, "sf:num-footer-rows", rows),
+            }
+        })
+        .collect();
+    let by_id: HashMap<String, usize> = refs
+        .iter()
+        .enumerate()
+        .filter_map(|(i, t)| Some((t.model.attr("sf:id")?.to_ascii_uppercase(), i)))
+        .collect();
+
+    let mut bad_formulas = 0usize;
+    for (i, t) in refs.iter().enumerate() {
+        let mut sheet = Sheet::new(dims[i].name.clone());
+        sheet.show_grid = false;
+        read_table(
+            &doc,
+            t.model,
+            i,
+            &dims,
+            &by_id,
+            &mut sheet,
+            &mut wb,
+            budget,
+            &mut bad_formulas,
+        )?;
+        wb.sheets.push(sheet);
+    }
+    if bad_formulas > 0 {
+        wb.warn(format!(
+            "{bad_formulas} formulas Excel cannot express were left as their values"
+        ));
+    }
+    if root.find("sf:chart-info").is_some() {
+        wb.warn("charts are not converted");
+    }
+    Ok(wb)
+}
+
+#[allow(clippy::too_many_arguments)]
+fn read_table(
+    doc: &Doc,
+    model: &Node,
+    idx: usize,
+    dims: &[TableDims],
+    by_id: &HashMap<String, usize>,
+    sheet: &mut Sheet,
+    wb: &mut Workbook,
+    budget: &mut Budget,
+    bad_formulas: &mut usize,
+) -> Result<()> {
+    let d = &dims[idx];
+    let Some(grid) = model.child("sf:grid") else {
+        return Ok(());
+    };
+
+    // Sizes.
+    sheet.default_row_height = 18.0;
+    sheet.default_row_custom = true;
+    sheet.default_col_width = Some(width_chars(72.0));
+    for (c, col) in grid
+        .child("sf:columns")
+        .into_iter()
+        .flat_map(|n| n.all("sf:grid-column"))
+        .take(d.cols as usize)
+        .enumerate()
+    {
+        if let Some(w) = num(col, "sf:width").filter(|w| *w >= 0.0) {
+            sheet.cols.push(ColInfo {
+                first: c as u32,
+                last: c as u32,
+                width: Some(width_chars(w)),
+                hidden: w == 0.0,
+                style: None,
+                outline: 0,
+            });
+        }
+    }
+    for (r, row) in grid
+        .child("sf:rows")
+        .into_iter()
+        .flat_map(|n| n.all("sf:grid-row"))
+        .take(d.rows as usize)
+        .enumerate()
+    {
+        if let Some(h) = num(row, "sf:height").filter(|h| *h >= 0.0) {
+            sheet.rows.insert(
+                r as u32,
+                RowInfo {
+                    height: Some(h.min(409.0)),
+                    custom_height: true,
+                    hidden: h == 0.0,
+                    style: None,
+                    outline: 0,
+                },
+            );
+        }
+    }
+
+    // Borders: the gridlines' style runs, else the table style's.
+    let borders = gridlines(doc, model, grid, d, budget)?;
+
+    // Region styles, for cells the data source leaves out.
+    let table_style = model.child("sf:tabular-style-ref").map(|n| doc.deref(n));
+    let region_style = |reg: usize| -> Option<&Node> {
+        let name = [
+            "sf:SFTDefaultBodyCellStyleProperty",
+            "sf:SFTDefaultHeaderRowCellStyleProperty",
+            "sf:SFTDefaultHeaderColumnCellStyleProperty",
+            "sf:SFTDefaultFooterRowCellStyleProperty",
+        ][reg];
+        table_style
+            .and_then(|t| doc.prop(t, name))
+            .and_then(|p| doc.value_of(p))
+    };
+
+    // Banded rows: every second body row, from the second, takes the band
+    // fill where its cells have none.
+    let band_fill = table_style
+        .filter(|t| {
+            doc.number(t, "sf:SFTTableBandedRowsProperty")
+                .is_some_and(|v| v != 0.0)
+        })
+        .and_then(|t| doc.prop(t, "sf:SFTTableBandedCellFillProperty"))
+        .and_then(|p| doc.value_of(p))
+        .and_then(fill_color);
+    let band =
+        |r: u32, c: u32| band_fill.filter(|_| region(d, r, c) == 0 && (r - d.header_rows) % 2 == 1);
+
+    let mut cache: HashMap<StyleKey, u32> = HashMap::new();
+    let mut style_of = |wb: &mut Workbook,
+                        style: Option<&Node>,
+                        numfmt: Option<String>,
+                        border: [Option<Edge>; 4],
+                        band: Option<Rgb>|
+     -> u32 {
+        let key = StyleKey {
+            style: style.and_then(|s| s.attr("sfa:ID")).map(str::to_string),
+            numfmt,
+            border,
+            band,
+        };
+        if let Some(&s) = cache.get(&key) {
+            return s;
+        }
+        let mut st = Style::default();
+        let mut tp = TextProps::default();
+        if let Some(s) = style {
+            if let Some(p) = paragraph_style(doc, s) {
+                tp = text_props(doc, p);
+            }
+            if let Some(f) = doc.prop(s, "sf:fill")
+                && let Some(c) = doc.value_of(f).and_then(fill_color)
+            {
+                st.fill = Fill::solid(c);
+            }
+            st.align.wrap = doc
+                .number(s, "sf:SFTCellTextWrapProperty")
+                .is_none_or(|v| v != 0.0);
+            let valign = doc.number(s, "sf:verticalAlignment").or_else(|| {
+                let layout = doc
+                    .prop(s, "sf:SFTCellStylePropertyLayoutStyle")
+                    .and_then(|p| doc.value_of(p))?;
+                doc.number(layout, "sf:verticalAlignment")
+            });
+            st.align.vertical = match valign.map(|v| v as u32) {
+                Some(1) => Some("center"),
+                Some(2) => None,
+                _ => Some("top"),
+            };
+        } else {
+            st.align.vertical = Some("top");
+            st.align.wrap = true;
+        }
+        if let (Some(c), "none") = (key.band, st.fill.pattern) {
+            st.fill = Fill::solid(c);
+        }
+        if tp.font.is_none() {
+            tp.font = Some("Helvetica".into());
+        }
+        st.font = tp.font();
+        st.align.horizontal = match tp.align {
+            Some(0) => Some("left"),
+            Some(1) => Some("right"),
+            Some(2) => Some("center"),
+            Some(3) => Some("justify"),
+            _ => None,
+        };
+        if let Some(f) = &key.numfmt {
+            st.numfmt.clone_from(f);
+        }
+        let [top, right, bottom, left] = key.border.clone();
+        st.border = Border {
+            top: top.unwrap_or_default(),
+            right: right.unwrap_or_default(),
+            bottom: bottom.unwrap_or_default(),
+            left: left.unwrap_or_default(),
+            ..Border::default()
+        };
+        let id = wb.styles.add(st);
+        cache.insert(key, id);
+        id
+    };
+
+    // Cells.
+    let mut pos: i64 = 0;
+    let mut first = true;
+    let source = grid.child("sf:datasource");
+    for cell in source.into_iter().flat_map(|s| s.nodes()) {
+        let step = cell
+            .attr("sf:ct")
+            .and_then(|v| v.trim().parse::<i64>().ok());
+        pos = if first {
+            step.unwrap_or(0)
+        } else {
+            pos.saturating_add(step.unwrap_or(1))
+        };
+        first = false;
+        if pos < 0 {
+            break;
+        }
+        let (r, c) = ((pos / ROW_STRIDE) as u64, (pos % ROW_STRIDE) as u32);
+        if r >= u64::from(d.rows) {
+            break;
+        }
+        let r = r as u32;
+        if c >= d.cols {
+            continue;
+        }
+        let style = cell.attr("sf:s").and_then(|s| doc.ids.get(s)).copied();
+        let mut formula = None;
+        let (value, fmt) = match cell.name.as_str() {
+            "sf:t" => (
+                text_of(cell).map_or(Value::Empty, Value::text),
+                format_code(doc, cell, style, None, false).filter(|f| f == "@"),
+            ),
+            "sf:n" => {
+                let v = num(cell, "sf:v");
+                (
+                    v.map_or(Value::Empty, Value::Number),
+                    format_code(doc, cell, style, v, false),
+                )
+            }
+            "sf:d" => {
+                let v = num(cell, "sf:cell-date").map(serial);
+                (
+                    v.map_or(Value::Empty, Value::Number),
+                    format_code(doc, cell, style, v, true)
+                        .or_else(|| Some(format::DEFAULT_DATE.into())),
+                )
+            }
+            "sf:cb" => (
+                Value::Bool(num(cell, "sf:v").is_some_and(|v| v != 0.0)),
+                None,
+            ),
+            "sf:pm" => {
+                let choice = cell.find("sf:proxied-cell-ref").map(|n| doc.deref(n));
+                let v = match choice {
+                    Some(ch) if ch.name == "sf:n" => {
+                        num(ch, "sf:v").map_or(Value::Empty, Value::Number)
+                    }
+                    Some(ch) => text_of(ch).map_or(Value::Empty, Value::text),
+                    None => Value::Empty,
+                };
+                (v, None)
+            }
+            "sf:f" => {
+                if let Some(fs) = cell
+                    .child("sf:fo")
+                    .map(|n| doc.deref(n))
+                    .and_then(|f| f.attr("sf:fs"))
+                {
+                    match convert_formula(fs, idx, dims, by_id) {
+                        Some(f) => formula = Some(f.into_boxed_str()),
+                        None => *bad_formulas += 1,
+                    }
+                }
+                let result = cell.child("sf:r").and_then(|r| r.nodes().next());
+                match result {
+                    Some(res) if res.name == "sf:rn" => {
+                        let v = num(res, "sf:v").unwrap_or(0.0);
+                        (
+                            Value::Number(v),
+                            format_code(doc, res, style, Some(v), false),
+                        )
+                    }
+                    Some(res) if res.name == "sf:rd" => {
+                        let v = num(res, "sf:cell-date").map(serial);
+                        (
+                            v.map_or(Value::Empty, Value::Number),
+                            Some(format::DEFAULT_DATE.into()),
+                        )
+                    }
+                    Some(res) if res.name == "sf:rb" => (
+                        Value::Bool(num(res, "sf:v").is_some_and(|v| v != 0.0)),
+                        None,
+                    ),
+                    Some(res) => (text_of(res).map_or(Value::Empty, Value::text), None),
+                    None => (Value::Empty, None),
+                }
+            }
+            _ => (Value::Empty, None),
+        };
+        // Merges.
+        let span = |a: &str| {
+            cell.attr(a)
+                .and_then(|v| v.parse::<u32>().ok())
+                .filter(|&n| n > 1)
+        };
+        let (cs, rs) = (span("sf:col-span"), span("sf:row-span"));
+        if cs.is_some() || rs.is_some() {
+            let last = |at: u32, n: Option<u32>| at.saturating_add(n.unwrap_or(1) - 1);
+            push_merge(sheet, d, r, c, last(r, rs), last(c, cs));
+        }
+        let border = borders.get(&(r, c)).cloned().unwrap_or_default();
+        let sid = style_of(wb, style, fmt, border, band(r, c));
+        let extra = value.text_len() + formula.as_ref().map_or(0, |f| f.len());
+        budget.cell(extra)?;
+        sheet.cells.insert(
+            (r, c),
+            Cell {
+                value,
+                formula,
+                style: sid,
+            },
+        );
+    }
+
+    // Cells the data source leaves out that show a fill or a border.
+    let area = u64::from(d.rows) * u64::from(d.cols);
+    if area <= 1 << 20 && budget.room_for_cells(area) {
+        for r in 0..d.rows {
+            for c in 0..d.cols {
+                if sheet.cells.contains_key(&(r, c)) {
+                    continue;
+                }
+                let border = borders.get(&(r, c)).cloned().unwrap_or_default();
+                let sid = style_of(wb, region_style(region(d, r, c)), None, border, band(r, c));
+                let st = wb.styles.get(sid);
+                if st.fill.pattern != "none" || st.border != Border::default() {
+                    budget.cell(0)?;
+                    sheet.cells.insert((r, c), Cell::styled(sid));
+                }
+            }
+        }
+    }
+
+    let fr = if model.attr("sf:header-rows-frozen") == Some("true") {
+        d.header_rows
+    } else {
+        0
+    };
+    let fc = if model.attr("sf:header-columns-frozen") == Some("true") {
+        d.header_cols
+    } else {
+        0
+    };
+    if fr > 0 || fc > 0 {
+        sheet.freeze = Some((fr, fc));
+    }
+    Ok(())
+}
+
+/// A text cell's text: its `sf:ct` child's, else the paragraphs it holds.
+fn text_of(n: &Node) -> Option<String> {
+    if let Some(s) = n.child("sf:ct").and_then(|c| c.attr("sfa:s")) {
+        return Some(s.to_string());
+    }
+    let mut out = vec![];
+    let mut stack = vec![n];
+    while let Some(x) = stack.pop() {
+        if x.name == "sf:p" {
+            out.push(x.own_text());
+            continue;
+        }
+        let mut kids: Vec<&Node> = x.nodes().collect();
+        kids.reverse();
+        stack.extend(kids);
+        if out.len() > 4096 {
+            break;
+        }
+    }
+    (!out.is_empty()).then(|| out.join("\n"))
+}
+
+/// Each cell's top, right, bottom and left edges.
+type Borders = HashMap<(u32, u32), [Option<Edge>; 4]>;
+
+/// The table's lines: `sf:vertical-gridline-styles` (line `i` left of
+/// column `i`, its runs over rows) and `sf:horizontal-gridline-styles`
+/// (line `i` above row `i`, its runs over columns), each run an
+/// `sf:vector-style-ref` from `sf:start-index` to `sf:stop-index`. With
+/// none, the table style's: body lines inside, the border around, the
+/// header and footer separators.
+fn gridlines(
+    doc: &Doc,
+    model: &Node,
+    grid: &Node,
+    d: &TableDims,
+    budget: &mut Budget,
+) -> Result<Borders> {
+    let mut out: Borders = HashMap::new();
+    if u64::from(d.rows) * u64::from(d.cols) > 1 << 20 {
+        return Ok(out);
+    }
+    // (vertical, line, from, to, edge).
+    let mut lines: Vec<(bool, u32, u32, u32, Edge)> = vec![];
+    for (vertical, name) in [
+        (true, "sf:vertical-gridline-styles"),
+        (false, "sf:horizontal-gridline-styles"),
+    ] {
+        for run in grid
+            .child(name)
+            .into_iter()
+            .flat_map(|g| g.all("sf:style-run"))
+            .take(1 << 16)
+        {
+            let Some(line) = num(run, "sf:gridline-index").map(|v| v.max(0.0) as u32) else {
+                continue;
+            };
+            for vs in run.all("sf:vector-style-ref").take(1 << 16) {
+                let from = num(vs, "sf:start-index").unwrap_or(0.0).max(0.0) as u32;
+                let to = num(vs, "sf:stop-index").unwrap_or(0.0).max(0.0) as u32;
+                if let Some(e) = stroke_edge(doc, doc.deref(vs)) {
+                    lines.push((vertical, line, from, to, e));
+                }
+            }
+        }
+    }
+    if lines.is_empty() {
+        let table_style = model.child("sf:tabular-style-ref").map(|n| doc.deref(n));
+        let edge = |name: &str| -> Option<Edge> {
+            let vs = table_style
+                .and_then(|t| doc.prop(t, name))
+                .and_then(|p| doc.value_of(p))?;
+            stroke_edge(doc, vs).filter(|e| e.style.is_some())
+        };
+        let body = edge("sf:SFTDefaultBodyVectorStyleProperty");
+        let border = edge("sf:SFTDefaultBorderVectorStyleProperty");
+        let header_sep = edge("sf:SFTDefaultHeaderSeparatorVectorStyleProperty").or(body.clone());
+        let footer_sep = edge("sf:SFTDefaultFooterSeparatorVectorStyleProperty").or(body.clone());
+        let fr_start = d.rows.saturating_sub(d.footer_rows);
+        for y in 0..=d.rows {
+            let e = if y == 0 || y == d.rows {
+                border.clone()
+            } else if d.header_rows > 0 && y == d.header_rows {
+                header_sep.clone()
+            } else if d.footer_rows > 0 && y == fr_start {
+                footer_sep.clone()
+            } else {
+                body.clone()
+            };
+            if let Some(e) = e {
+                lines.push((false, y, 0, d.cols, e));
+            }
+        }
+        for x in 0..=d.cols {
+            let e = if x == 0 || x == d.cols {
+                border.clone()
+            } else if d.header_cols > 0 && x == d.header_cols {
+                header_sep.clone()
+            } else {
+                body.clone()
+            };
+            if let Some(e) = e {
+                lines.push((true, x, 0, d.rows, e));
+            }
+        }
+    }
+    // Runs may repeat: past a few passes over the table, the rest is
+    // dropped.
+    let mut work = 4 * (u64::from(d.rows) + 1) * (u64::from(d.cols) + 1);
+    for (vertical, line, from, to, e) in lines {
+        let to = to.min(if vertical { d.rows } else { d.cols });
+        let Some(left) = work.checked_sub(u64::from(to.saturating_sub(from))) else {
+            break;
+        };
+        work = left;
+        for k in from..to {
+            // The cell after the line and the one before it.
+            let (after, before, sa, sb) = if vertical {
+                ((k, line), line.checked_sub(1).map(|c| (k, c)), 3, 1)
+            } else {
+                ((line, k), line.checked_sub(1).map(|r| (r, k)), 0, 2)
+            };
+            for (cell, side) in [(Some(after), sa), (before, sb)] {
+                let Some((r, c)) = cell else { continue };
+                if r >= d.rows || c >= d.cols {
+                    continue;
+                }
+                if !out.contains_key(&(r, c)) {
+                    budget.alloc(64)?;
+                }
+                out.entry((r, c)).or_default()[side] = e.style.is_some().then(|| e.clone());
+            }
+        }
+    }
+    out.retain(|_, v| v.iter().any(Option::is_some));
+    Ok(out)
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/exav-render/src/formats/office/sheets/numbers/v09/tests.rs b/crates/exav-render/src/formats/office/sheets/numbers/v09/tests.rs
new file mode 100644
index 00000000..4dd6bb24
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numbers/v09/tests.rs
@@ -0,0 +1,413 @@
+//! Documents written here in the shape the samples have.
+
+use super::*;
+use crate::formats::office::sheets::limits::Limits;
+
+const T1: &str = "0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A0A";
+const T2: &str = "0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B0B";
+
+/// A document: the stylesheet's styles, then the workspaces' XML.
+fn doc(styles: &str, workspaces: &str) -> String {
+    format!(
+        r#"<?xml version="1.0"?>
+<ls:document xmlns:ls="http://developer.apple.com/namespaces/ls" xmlns:sf="http://developer.apple.com/namespaces/sf" xmlns:sfa="http://developer.apple.com/namespaces/sfa" ls:version="92008102400">
+<ls:stylesheet sfa:ID="ss-0"><sf:styles>{styles}</sf:styles></ls:stylesheet>
+<ls:workspace-array>{workspaces}</ls:workspace-array>
+<ls:tabular-prototypes><sf:tabular-info><sf:tabular-model sf:name="Unnamed Table" sf:id="FFFF"><sf:grid sf:numcols="1" sf:numrows="1"><sf:datasource><sf:t><sf:ct sfa:s="prototype"/></sf:t></sf:datasource></sf:grid></sf:tabular-model></sf:tabular-info>
+<sf:paragraphstyle sfa:ID="proto-para" sf:ident="para-body"><sf:property-map><sf:fontName><sf:string sfa:string="Zapfino"/></sf:fontName></sf:property-map></sf:paragraphstyle>
+</ls:tabular-prototypes>
+</ls:document>"#
+    )
+}
+
+fn workspace(name: &str, tables: &str) -> String {
+    format!(
+        r#"<ls:workspace ls:workspace-name="{name}"><ls:page-info><sf:layers><sf:layer><sf:drawables>{tables}</sf:drawables></sf:layer></sf:layers></ls:page-info></ls:workspace>"#
+    )
+}
+
+/// A table: `attrs` on the model, `grid` the grid's children.
+fn table(attrs: &str, rows: u32, cols: u32, grid: &str) -> String {
+    format!(
+        r#"<sf:tabular-info><sf:tabular-model {attrs}><sf:grid sf:numcols="{cols}" sf:numrows="{rows}">{grid}</sf:grid></sf:tabular-model></sf:tabular-info>"#
+    )
+}
+
+fn read_str(xml: &str) -> Workbook {
+    read(xml.as_bytes(), &mut Budget::new(Limits::default())).unwrap()
+}
+
+fn value(s: &Sheet, r: u32, c: u32) -> &Value {
+    s.cells.get(&(r, c)).map_or(&Value::Empty, |c| &c.value)
+}
+
+fn style<'a>(wb: &'a Workbook, s: &Sheet, r: u32, c: u32) -> &'a Style {
+    wb.styles.get(s.cells[&(r, c)].style)
+}
+
+const NUMBER_STYLES: &str = r##"
+<sf:cell-style sfa:ID="cur"><sf:property-map>
+  <sf:SFTCellStylePropertyFormatType><sf:number sfa:number="257" sfa:type="i"/></sf:SFTCellStylePropertyFormatType>
+  <sf:SFTCellStylePropertyNumberFormat><sf:number-format sf:format-type="1" sf:format-string="&#xA4;#,##0.00;(&#xA4;#,##0.00)" sf:format-decimal-places="2" sf:format-currency-code="EUR" sf:format-negative-style="0" sf:format-show-thousands-separator="true" sf:format-fraction-accuracy="-1" sf:format-use-accounting-style="true"/></sf:SFTCellStylePropertyNumberFormat>
+</sf:property-map></sf:cell-style>
+<sf:cell-style sfa:ID="auto"><sf:property-map>
+  <sf:SFTCellStylePropertyFormatType><sf:number sfa:number="255" sfa:type="i"/></sf:SFTCellStylePropertyFormatType>
+  <sf:SFTCellStylePropertyNumberFormat><sf:number-format sf:format-type="0" sf:format-string="#,##0.###;-#,##0.###" sf:format-decimal-places="0" sf:format-show-thousands-separator="true"/></sf:SFTCellStylePropertyNumberFormat>
+  <sf:SFTCellStylePropertyDateTimeFormat><sf:date-format sfa:ID="df" sf:fmt="M/d/yy"/></sf:SFTCellStylePropertyDateTimeFormat>
+</sf:property-map></sf:cell-style>"##;
+
+/// Sheet 1, table T1 (5 rows, 3 columns, a header row and a footer row),
+/// and T2, one cell.
+fn budget_doc() -> String {
+    let t1 = table(
+        &format!(
+            r#"sf:name="T1" sf:id="{T1}" sf:num-header-rows="1" sf:num-header-columns="0" sf:num-footer-rows="1" sf:header-rows-frozen="true" sf:header-columns-frozen="false""#
+        ),
+        5,
+        3,
+        r#"<sf:columns><sf:grid-column sf:width="72"/><sf:grid-column sf:width="144"/><sf:grid-column sf:width="0"/></sf:columns>
+<sf:rows><sf:grid-row sf:height="20"/><sf:grid-row sf:height="30"/></sf:rows>
+<sf:datasource>
+<sf:t sf:ct="0" sf:col-span="2"><sf:ct sfa:s="Head"/></sf:t>
+<sf:s sf:ho="1"/>
+<sf:g/>
+<sf:n sf:ct="254" sf:s="cur" sf:v="1.5"/>
+<sf:d sf:s="auto" sf:cell-date="276048000"/>
+<sf:cb sf:f="0"/>
+<sf:pm sf:ct="254"><sf:menu-choices><sf:t sfa:ID="ch1"><sf:ct sfa:s="Home"/></sf:t><sf:n sfa:ID="ch2" sf:v="7"/></sf:menu-choices><sf:proxied-cell-ref sfa:IDREF="ch2"/></sf:pm>
+<sf:n sf:s="auto" sf:v="1234.5"/>
+<sf:n sf:ct="255" sf:s="auto" sf:v="0.5"><sf:cf sf:implicit-format-type="256"><sf:number-format sf:format-type="0" sf:format-decimal-places="1" sf:format-show-thousands-separator="false"/></sf:cf></sf:n>
+<sf:f sf:ct="256"><sf:fo sf:fs="=SUM(A)" sf:ht="0A" sf:hc="1024"/><sf:r><sf:rn sf:v="5"/></sf:r></sf:f>
+<sf:f><sf:fo sf:fs="=A2×2≠3"/><sf:r><sf:rn sf:v="1"/></sf:r></sf:f>
+<sf:f><sf:fo sf:fs="=__CHART(A1)"/><sf:r><sf:rs><sf:ct sfa:s="kept"/></sf:rs></sf:r></sf:f>
+</sf:datasource>"#,
+    );
+    let t2 = table(
+        &format!(r#"sf:name="T2" sf:id="{T2}""#),
+        1,
+        2,
+        &format!(
+            r#"<sf:datasource><sf:f><sf:fo sf:fs="=SUM(SFTGlobalID_{T1} :: B)+SFTGlobalID_{T1}::$A$2"/><sf:r><sf:rn sf:v="9"/></sf:r></sf:f><sf:f><sf:fo sf:fs="=ifs(B1,1)"/><sf:r><sf:rn sf:v="1"/></sf:r></sf:f></sf:datasource>"#
+        ),
+    );
+    doc(
+        NUMBER_STYLES,
+        &(workspace("Budget", &(t1 + &t2))
+            + &workspace("Notes", &table(r#"sf:name="Table 1" sf:id="0C""#, 1, 1, ""))),
+    )
+}
+
+#[test]
+fn tables_become_sheets() {
+    let wb = read_str(&budget_doc());
+    let names: Vec<&str> = wb.sheets.iter().map(|s| s.name.as_str()).collect();
+    // A sheet's only table takes the sheet's name; prototypes are left out.
+    assert_eq!(names, ["Budget - T1", "Budget - T2", "Notes"]);
+}
+
+#[test]
+fn cells_and_positions() {
+    let wb = read_str(&budget_doc());
+    let s = &wb.sheets[0];
+    assert_eq!(value(s, 0, 0), &Value::text("Head"));
+    assert_eq!(value(s, 1, 0), &Value::Number(1.5));
+    // 2009-10-01.
+    assert_eq!(value(s, 1, 1), &Value::Number(40087.0));
+    assert_eq!(value(s, 1, 2), &Value::Bool(false));
+    // The pop-up menu's chosen item.
+    assert_eq!(value(s, 2, 0), &Value::Number(7.0));
+    assert_eq!(value(s, 2, 1), &Value::Number(1234.5));
+    assert_eq!(value(s, 3, 0), &Value::Number(0.5));
+    assert_eq!(value(s, 4, 0), &Value::Number(5.0));
+    assert_eq!(value(s, 4, 2), &Value::text("kept"));
+    assert_eq!(
+        s.merges,
+        [Range {
+            r1: 0,
+            c1: 0,
+            r2: 0,
+            c2: 1
+        }]
+    );
+}
+
+#[test]
+fn number_formats() {
+    let wb = read_str(&budget_doc());
+    let s = &wb.sheets[0];
+    assert_eq!(
+        style(&wb, s, 1, 0).numfmt,
+        "\"€\"* #,##0.00;\"€\"* (#,##0.00)"
+    );
+    assert_eq!(style(&wb, s, 1, 1).numfmt, "m/d/yy");
+    // Automatic: General, whatever number format the style keeps.
+    assert_eq!(style(&wb, s, 2, 1).numfmt, Style::default().numfmt);
+    // The format Numbers chose for an automatic cell.
+    assert_eq!(style(&wb, s, 3, 0).numfmt, "0.0");
+}
+
+#[test]
+fn formulas() {
+    let wb = read_str(&budget_doc());
+    let f = |s: usize, r, c| {
+        wb.sheets[s].cells[&(r, c)]
+            .formula
+            .as_deref()
+            .map(str::to_string)
+    };
+    // A whole column is its body rows.
+    assert_eq!(f(0, 4, 0).as_deref(), Some("SUM(A$2:A$4)"));
+    assert_eq!(f(0, 4, 1).as_deref(), Some("A2*2<>3"));
+    // A chart's formula has no Excel form: its value stays.
+    assert_eq!(f(0, 4, 2), None);
+    assert_eq!(
+        f(1, 0, 0).as_deref(),
+        Some("SUM('Budget - T1'!B$2:B$4)+'Budget - T1'!$A$2")
+    );
+    assert_eq!(f(1, 0, 1).as_deref(), Some("_xlfn.IFS(B1,1)"));
+    assert!(wb.warnings.iter().any(|w| w.starts_with("1 formulas")));
+}
+
+#[test]
+fn sizes_and_panes() {
+    let wb = read_str(&budget_doc());
+    let s = &wb.sheets[0];
+    assert_eq!(
+        s.col_info(1).and_then(|c| c.width),
+        Some(width_chars(144.0))
+    );
+    assert!(s.col_info(2).unwrap().hidden);
+    assert_eq!(s.rows[&1].height, Some(30.0));
+    assert_eq!(s.freeze, Some((1, 0)));
+    assert_eq!(wb.sheets[1].freeze, None);
+}
+
+/// A table of one row of `cells` (each `<sf:t sf:s=...>`) in a document of
+/// `styles`, with `extra` in the model.
+fn styled(styles: &str, extra: &str, rows: u32, cols: u32, cells: &str) -> Workbook {
+    let t = format!(
+        r#"<sf:tabular-info><sf:tabular-model sf:name="T" sf:id="0D" sf:num-header-rows="1">{extra}<sf:grid sf:numcols="{cols}" sf:numrows="{rows}"><sf:datasource>{cells}</sf:datasource></sf:grid></sf:tabular-model></sf:tabular-info>"#
+    );
+    read_str(&doc(styles, &workspace("S", &t)))
+}
+
+const CELL_STYLES: &str = r#"
+<sf:paragraphstyle sfa:ID="p-body" sf:ident="para-body"><sf:property-map>
+  <sf:fontName><sf:string sfa:string="Cochin-Bold"/></sf:fontName>
+  <sf:fontSize><sf:number sfa:number="11" sfa:type="i"/></sf:fontSize>
+  <sf:alignment><sf:number sfa:number="2" sfa:type="i"/></sf:alignment>
+</sf:property-map></sf:paragraphstyle>
+<sf:cell-style sfa:ID="c-base" sf:ident="cell-body"><sf:property-map>
+  <sf:fill><sf:color xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="sfa:calibrated-rgb-color-type" sfa:r="1" sfa:g="0" sfa:b="0" sfa:a="0.5"/></sf:fill>
+  <sf:SFTCellTextWrapProperty><sf:number sfa:number="0" sfa:type="c"/></sf:SFTCellTextWrapProperty>
+  <sf:SFTCellStylePropertyParagraphStyle><sf:paragraphstyle-ref sfa:IDREF="p-body"/></sf:SFTCellStylePropertyParagraphStyle>
+</sf:property-map></sf:cell-style>
+<sf:cell-style sfa:ID="c-none" sf:parent-ident="cell-body"><sf:property-map><sf:fill><sf:null/></sf:fill></sf:property-map></sf:cell-style>
+<sf:cell-style sfa:ID="c-inherit" sf:parent-ident="cell-body"><sf:property-map><sf:fill/>
+  <sf:SFTCellStylePropertyParagraphStyle><sf:paragraphstyle sf:parent-ident="para-body"><sf:property-map><sf:bold><sf:number sfa:number="1" sfa:type="i"/></sf:bold><sf:fontColor><sf:color sfa:w="0.5" sfa:a="1"/></sf:fontColor></sf:property-map></sf:paragraphstyle></sf:SFTCellStylePropertyParagraphStyle>
+</sf:property-map></sf:cell-style>"#;
+
+#[test]
+fn cell_styles() {
+    let wb = styled(
+        CELL_STYLES,
+        "",
+        1,
+        3,
+        r#"<sf:t sf:s="c-base"><sf:ct sfa:s="a"/></sf:t><sf:t sf:s="c-none"><sf:ct sfa:s="b"/></sf:t><sf:t sf:s="c-inherit"><sf:ct sfa:s="c"/></sf:t>"#,
+    );
+    let s = &wb.sheets[0];
+    let base = style(&wb, s, 0, 0);
+    // Half-transparent red over white.
+    assert_eq!(base.fill, Fill::solid(0xFF8080));
+    assert!(!base.align.wrap);
+    assert_eq!(base.align.horizontal, Some("center"));
+    // The face the name says, the weight `sf:bold` says; the document's
+    // style, not the prototype's of the same ident.
+    assert_eq!(
+        (
+            base.font.name.as_str(),
+            base.font.bold,
+            base.font.size_centipt
+        ),
+        ("Cochin", false, 1100)
+    );
+    // An explicit null clears the fill; an empty property inherits it.
+    assert_eq!(style(&wb, s, 0, 1).fill, Fill::default());
+    let inherit = style(&wb, s, 0, 2);
+    assert_eq!(inherit.fill, Fill::solid(0xFF8080));
+    assert!(inherit.font.bold);
+    assert_eq!(inherit.font.name, "Cochin");
+    assert_eq!(inherit.font.color, Some(0x808080));
+}
+
+const TABLE_STYLE: &str = r#"
+<sf:vector-style sfa:ID="thin-grey" sf:ident="v-body"><sf:property-map><sf:SFTStrokeProperty><sf:stroke sf:width="1"><sf:pattern sf:type="solid"/><sf:color sfa:r="0.8" sfa:g="0.8" sfa:b="0.8" sfa:a="1"/></sf:stroke></sf:SFTStrokeProperty></sf:property-map></sf:vector-style>
+<sf:vector-style sfa:ID="thick-red"><sf:property-map><sf:SFTStrokeProperty><sf:stroke sf:width="3"><sf:pattern sf:type="solid"/><sf:color sfa:r="1" sfa:g="0" sfa:b="0" sfa:a="1"/></sf:stroke></sf:SFTStrokeProperty></sf:property-map></sf:vector-style>
+<sf:vector-style sfa:ID="none"><sf:property-map><sf:SFTStrokeProperty><sf:stroke sf:width="1"><sf:pattern sf:type="empty"/><sf:color sfa:r="0" sfa:g="0" sfa:b="0" sfa:a="1"/></sf:stroke></sf:SFTStrokeProperty></sf:property-map></sf:vector-style>
+<sf:tabular-style sfa:ID="ts"><sf:property-map>
+  <sf:SFTTableBandedRowsProperty><sf:number sfa:number="1" sfa:type="c"/></sf:SFTTableBandedRowsProperty>
+  <sf:SFTTableBandedCellFillProperty><sf:color sfa:r="0" sfa:g="0" sfa:b="1" sfa:a="1"/></sf:SFTTableBandedCellFillProperty>
+  <sf:SFTDefaultBodyVectorStyleProperty><sf:vector-style-ref sfa:IDREF="thin-grey"/></sf:SFTDefaultBodyVectorStyleProperty>
+  <sf:SFTDefaultBorderVectorStyleProperty><sf:vector-style-ref sfa:IDREF="thick-red"/></sf:SFTDefaultBorderVectorStyleProperty>
+  <sf:SFTDefaultHeaderRowCellStyleProperty><sf:cell-style><sf:property-map><sf:fill><sf:color sfa:r="0" sfa:g="1" sfa:b="0" sfa:a="1"/></sf:fill></sf:property-map></sf:cell-style></sf:SFTDefaultHeaderRowCellStyleProperty>
+</sf:property-map></sf:tabular-style>"#;
+
+#[test]
+fn table_style_lines_bands_and_regions() {
+    // 4 rows (a header row), 2 columns; the data source lists one cell.
+    let wb = styled(
+        TABLE_STYLE,
+        r#"<sf:tabular-style-ref sfa:IDREF="ts"/>"#,
+        4,
+        2,
+        r#"<sf:n sf:ct="257" sf:v="1"/>"#,
+    );
+    let s = &wb.sheets[0];
+    let grey = Edge {
+        style: Some("thin"),
+        color: Some(0xCCCCCC),
+    };
+    let red = Edge {
+        style: Some("thick"),
+        color: Some(0xFF0000),
+    };
+    // (1, 1): body; the border on its right, body lines elsewhere.
+    let b = &style(&wb, s, 1, 1).border;
+    assert_eq!(
+        (&b.top, &b.right, &b.bottom, &b.left),
+        (&grey, &red, &grey, &grey)
+    );
+    // Cells the data source leaves out take their region's style.
+    assert_eq!(style(&wb, s, 0, 0).fill, Fill::solid(0x00FF00));
+    assert_eq!(style(&wb, s, 0, 0).border.top, red);
+    // Bands: the second body row and every second after it.
+    assert_eq!(style(&wb, s, 1, 1).fill, Fill::default());
+    assert_eq!(style(&wb, s, 2, 0).fill, Fill::solid(0x0000FF));
+    assert_eq!(style(&wb, s, 3, 0).fill, Fill::default());
+}
+
+#[test]
+fn gridline_runs_override_the_table_style() {
+    // A thick red line left of column 1 on row 0 only, and an empty line
+    // above row 1 over both columns.
+    let grid = r#"<sf:vertical-gridline-styles><sf:style-run sf:gridline-index="1"><sf:vector-style-ref sfa:IDREF="thick-red" sf:start-index="0" sf:stop-index="1"/></sf:style-run></sf:vertical-gridline-styles>
+<sf:horizontal-gridline-styles><sf:style-run sf:gridline-index="1"><sf:vector-style-ref sfa:IDREF="none" sf:start-index="0" sf:stop-index="2"/></sf:style-run></sf:horizontal-gridline-styles>"#;
+    let t = format!(
+        r#"<sf:tabular-info><sf:tabular-model sf:name="T" sf:id="0D"><sf:tabular-style-ref sfa:IDREF="ts"/><sf:grid sf:numcols="2" sf:numrows="2">{grid}<sf:datasource><sf:n sf:v="1"/><sf:n sf:v="2"/><sf:n sf:ct="255" sf:v="3"/><sf:n sf:v="4"/></sf:datasource></sf:grid></sf:tabular-model></sf:tabular-info>"#
+    );
+    let wb = read_str(&doc(TABLE_STYLE, &workspace("S", &t)));
+    let s = &wb.sheets[0];
+    let red = Edge {
+        style: Some("thick"),
+        color: Some(0xFF0000),
+    };
+    assert_eq!(style(&wb, s, 0, 0).border.right, red);
+    assert_eq!(style(&wb, s, 0, 1).border.left, red);
+    assert_eq!(style(&wb, s, 1, 0).border.right, Edge::default());
+    assert_eq!(style(&wb, s, 0, 0).border.bottom, Edge::default());
+    // No table style line where runs are given.
+    assert_eq!(style(&wb, s, 0, 0).border.top, Edge::default());
+}
+
+#[test]
+fn packages() {
+    use std::io::Write;
+    let xml = budget_doc();
+    let mut gz = flate2::write::GzEncoder::new(vec![], flate2::Compression::fast());
+    gz.write_all(xml.as_bytes()).unwrap();
+    let gz = gz.finish().unwrap();
+    let zip = |files: &[(&str, &[u8])]| {
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(vec![]));
+        for (n, d) in files {
+            z.start_file(*n, zip::write::SimpleFileOptions::default())
+                .unwrap();
+            z.write_all(d).unwrap();
+        }
+        z.finish().unwrap().into_inner()
+    };
+    let b = || Budget::new(Limits::default());
+    for z in [
+        zip(&[("index.xml", xml.as_bytes())]),
+        zip(&[
+            ("Doc.numbers/Contents/index.xml", b"<x/>"),
+            ("Doc.numbers/index.xml.gz", &gz),
+        ]),
+    ] {
+        assert_eq!(super::super::read(&z, &mut b()).unwrap().sheets.len(), 3);
+    }
+    let dir: &[(&str, &[u8])] = &[("QuickLook/Thumbnail.jpg", b"x"), ("index.xml.gz", &gz)];
+    assert_eq!(
+        super::super::read_package(dir, &mut b())
+            .unwrap()
+            .sheets
+            .len(),
+        3
+    );
+    // Gzip that inflates past the part limit.
+    let small = Limits {
+        max_part: (gz.len() + xml.len()) as u64 / 2,
+        ..Limits::default()
+    };
+    assert_eq!(
+        super::super::read(&zip(&[("index.xml.gz", &gz)]), &mut Budget::new(small)).unwrap_err(),
+        Error::TooLarge("a package part")
+    );
+}
+
+#[test]
+fn refusals_and_limits() {
+    let b = || Budget::new(Limits::default());
+    assert!(matches!(
+        read(b"<plist/>", &mut b()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        read(doc("", "").as_bytes(), &mut b()),
+        Err(Error::Unsupported(_))
+    ));
+    let few = Limits::default().with_max_cells(5);
+    assert_eq!(
+        read(budget_doc().as_bytes(), &mut Budget::new(few)).unwrap_err(),
+        Error::TooLarge("cells")
+    );
+}
+
+#[test]
+fn damaged_documents_do_not_panic() {
+    let xml = budget_doc();
+    let b = xml.as_bytes();
+    for cut in (0..b.len()).step_by(97) {
+        let _ = read(&b[..cut], &mut Budget::new(Limits::default()));
+    }
+    // Hostile numbers and references.
+    for cells in [
+        r#"<sf:n sf:ct="-5" sf:v="1"/>"#,
+        r#"<sf:n sf:ct="99999999999999999999" sf:v="1"/>"#,
+        r#"<sf:t sf:col-span="4294967295" sf:row-span="4294967295"><sf:ct sfa:s="x"/></sf:t>"#,
+        r#"<sf:f><sf:fo sf:fs="=SFTGlobalID_DEAD :: A1+ZZZZ9999999999+&quot;"/></sf:f>"#,
+        r#"<sf:pm><sf:proxied-cell-ref sfa:IDREF="nowhere"/></sf:pm>"#,
+        r#"<sf:d sf:cell-date="1e308"/><sf:n sf:v="NaN"/>"#,
+    ] {
+        let t = table(
+            r#"sf:name="T" sf:id="0D""#,
+            3,
+            3,
+            &format!("<sf:datasource>{cells}</sf:datasource>"),
+        );
+        let _ = read(
+            doc("", &workspace("S", &t)).as_bytes(),
+            &mut Budget::new(Limits::default()),
+        );
+    }
+    // A style that is its own parent.
+    let loop_styles = r#"<sf:cell-style sfa:ID="l" sf:ident="l" sf:parent-ident="l"><sf:property-map><sf:fill/></sf:property-map></sf:cell-style>"#;
+    let wb = styled(
+        loop_styles,
+        "",
+        1,
+        1,
+        r#"<sf:t sf:s="l"><sf:ct sfa:s="x"/></sf:t>"#,
+    );
+    assert_eq!(wb.sheets[0].cells.len(), 1);
+}
diff --git a/crates/exav-render/src/formats/office/sheets/numtext.rs b/crates/exav-render/src/formats/office/sheets/numtext.rs
new file mode 100644
index 00000000..9f3bb357
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/numtext.rs
@@ -0,0 +1,29 @@
+//! Numbers as text.
+
+/// The shortest text that reads back as `v`, as `<v>` holds it: Rust's
+/// round-trip formatting, with an `E` exponent. Infinities and NaN, which
+/// XLSX cannot hold, are 0.
+pub fn xml(v: f64) -> String {
+    if !v.is_finite() {
+        return "0".into();
+    }
+    let s = format!("{v}");
+    if s.len() > 20 { format!("{v:E}") } else { s }
+}
+
+/// At most 15 significant digits, as spreadsheets show a number and write it
+/// in a formula.
+pub use exav_unpack::biff::formula::number as shortest;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn numbers() {
+        assert_eq!(xml(1.5), "1.5");
+        assert_eq!(xml(f64::NAN), "0");
+        assert_eq!(xml(1e300), "1E300");
+        assert_eq!(xml(1.25e-300), "1.25E-300");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/cf.rs b/crates/exav-render/src/formats/office/sheets/ods/cf.rs
new file mode 100644
index 00000000..6b1a7f51
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/cf.rs
@@ -0,0 +1,687 @@
+//! Conditional formats (calcext:conditional-formats, and the style:map of
+//! older documents) and content validations.
+
+use super::formula::Converter;
+use super::styles::parse_color;
+use super::{Doc, parse_addr, parse_range_addr, text_of};
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::sheets::model::*;
+use std::collections::HashMap;
+
+pub(crate) fn split_args(s: &str) -> Vec<String> {
+    let mut out = vec![];
+    let mut cur = String::new();
+    let mut depth = 0i32;
+    let mut q = false;
+    for c in s.chars() {
+        match c {
+            '"' => {
+                q = !q;
+                cur.push(c)
+            }
+            '(' | '[' if !q => {
+                depth += 1;
+                cur.push(c)
+            }
+            ')' | ']' if !q => {
+                depth -= 1;
+                cur.push(c)
+            }
+            ';' | ',' if !q && depth == 0 => out.push(std::mem::take(&mut cur).trim().to_string()),
+            _ => cur.push(c),
+        }
+        if out.len() > 4096 {
+            break;
+        }
+    }
+    if !cur.trim().is_empty() {
+        out.push(cur.trim().to_string());
+    }
+    out
+}
+
+fn split_op(r: &str) -> (&'static str, &str) {
+    let r = r.trim();
+    for (p, op) in [
+        (">=", "greaterThanOrEqual"),
+        ("<=", "lessThanOrEqual"),
+        ("!=", "notEqual"),
+        ("<>", "notEqual"),
+        (">", "greaterThan"),
+        ("<", "lessThan"),
+        ("=", "equal"),
+    ] {
+        if let Some(v) = r.strip_prefix(p) {
+            return (op, v.trim());
+        }
+    }
+    ("equal", r)
+}
+
+fn conv(fc: &mut Converter, s: &str) -> Option<String> {
+    fc.convert(&format!("of:={}", s.trim()))
+}
+
+fn list_formula(inner: &str, fc: &mut Converter) -> Option<String> {
+    let items = split_args(inner);
+    if !items.is_empty() && items.iter().all(|i| i.starts_with('"')) {
+        let vals: Vec<String> = items
+            .iter()
+            .map(|i| i.trim_matches('"').replace("\"\"", "\""))
+            .collect();
+        Some(format!("\"{}\"", vals.join(",")))
+    } else {
+        conv(fc, inner)
+    }
+}
+
+pub(crate) fn read_validation(v: &Node, fc: &mut Converter) -> Option<Validation> {
+    let cond = v.attr("table:condition")?;
+    let cond = cond
+        .strip_prefix("of:")
+        .or(cond.strip_prefix("oooc:"))
+        .unwrap_or(cond);
+    let message = |n: &Node| -> Option<String> {
+        Some(
+            n.all("text:p")
+                .map(|p| {
+                    let mut s = String::new();
+                    text_of(p, &mut s);
+                    s
+                })
+                .collect::<Vec<_>>()
+                .join("\n"),
+        )
+        .filter(|s| !s.is_empty())
+    };
+    let mut val = Validation {
+        allow_blank: v.attr("table:allow-empty-cell") != Some("false"),
+        hide_dropdown: v.attr("table:display-list") == Some("none"),
+        error_style: "stop",
+        operator: "between",
+        ..Default::default()
+    };
+    if let Some(h) = v.child("table:help-message") {
+        val.show_input = h.attr("table:display") == Some("true");
+        val.prompt_title = h.attr("table:title").map(str::to_string);
+        val.prompt = message(h);
+    }
+    if let Some(e) = v.child("table:error-message") {
+        val.show_error = e.attr("table:display") == Some("true");
+        val.error_title = e.attr("table:title").map(str::to_string);
+        val.error = message(e);
+        val.error_style = match e.attr("table:message-type") {
+            Some("warning") => "warning",
+            Some("information") => "information",
+            _ => "stop",
+        };
+    }
+    let (kind, rest) = if let Some(r) = cond.strip_prefix("cell-content-is-whole-number() and ") {
+        ("whole", r)
+    } else if let Some(r) = cond.strip_prefix("cell-content-is-decimal-number() and ") {
+        ("decimal", r)
+    } else if let Some(r) = cond.strip_prefix("cell-content-is-date() and ") {
+        ("date", r)
+    } else if let Some(r) = cond.strip_prefix("cell-content-is-time() and ") {
+        ("time", r)
+    } else if let Some(r) = cond.strip_prefix("cell-content-is-in-list(") {
+        val.kind = "list";
+        val.formula1 = list_formula(r.strip_suffix(')').unwrap_or(r), fc);
+        return Some(val);
+    } else if let Some(r) = cond.strip_prefix("cell-content-text-length") {
+        ("textLength", r)
+    } else {
+        let r = cond.strip_prefix("is-true-formula(")?;
+        val.kind = "custom";
+        val.formula1 = conv(fc, r.strip_suffix(')').unwrap_or(r));
+        return Some(val);
+    };
+    val.kind = kind;
+    let rest = rest.trim();
+    let mut args = |s: &str| -> Vec<String> {
+        split_args(s)
+            .into_iter()
+            .filter_map(|a| conv(fc, &a))
+            .collect()
+    };
+    if let Some(r) = rest
+        .strip_prefix("cell-content-is-between(")
+        .or(rest.strip_prefix("()-is-between("))
+        .or(rest.strip_prefix("-is-between("))
+    {
+        let a = args(r.strip_suffix(')').unwrap_or(r));
+        val.formula1 = a.first().cloned();
+        val.formula2 = a.get(1).cloned();
+    } else if let Some(r) = rest
+        .strip_prefix("cell-content-is-not-between(")
+        .or(rest.strip_prefix("()-is-not-between("))
+        .or(rest.strip_prefix("-is-not-between("))
+    {
+        val.operator = "notBetween";
+        let a = args(r.strip_suffix(')').unwrap_or(r));
+        val.formula1 = a.first().cloned();
+        val.formula2 = a.get(1).cloned();
+    } else {
+        let r = rest
+            .strip_prefix("cell-content()")
+            .or(rest.strip_prefix("()"))
+            .unwrap_or(rest);
+        let (op, v) = split_op(r);
+        val.operator = op;
+        val.formula1 = conv(fc, v);
+    }
+    Some(val)
+}
+
+/// A formula relative to `base` (A1 when absent) made relative to `target`,
+/// the top left cell of the range, where XLSX evaluates it.
+fn rebase(f: &str, base: Option<(u32, u32)>, target: (u32, u32)) -> String {
+    let base = base.unwrap_or((0, 0));
+    let dr = i64::from(target.0) - i64::from(base.0);
+    let dc = i64::from(target.1) - i64::from(base.1);
+    if dr == 0 && dc == 0 {
+        return f.to_string();
+    }
+    shift_refs(f, dr, dc)
+}
+
+/// Moves the relative parts of the A1 references in `f` by (dr, dc).
+pub(crate) fn shift_refs(f: &str, dr: i64, dc: i64) -> String {
+    let ch: Vec<char> = f.chars().collect();
+    let mut out = String::new();
+    let mut i = 0;
+    while i < ch.len() {
+        let c = ch[i];
+        if c == '"' || c == '\'' {
+            // A string or a quoted sheet name, copied as it is.
+            let q = c;
+            out.push(c);
+            i += 1;
+            while i < ch.len() {
+                out.push(ch[i]);
+                if ch[i] == q {
+                    if i + 1 < ch.len() && ch[i + 1] == q {
+                        out.push(q);
+                        i += 2;
+                        continue;
+                    }
+                    i += 1;
+                    break;
+                }
+                i += 1;
+            }
+            continue;
+        }
+        let prev_word =
+            i > 0 && (ch[i - 1].is_alphanumeric() || ch[i - 1] == '_' || ch[i - 1] == '.');
+        if (c == '$' || c.is_ascii_alphabetic()) && !prev_word {
+            let mut j = i;
+            let cabs = ch[j] == '$';
+            if cabs {
+                j += 1;
+            }
+            let cs = j;
+            while j < ch.len() && ch[j].is_ascii_alphabetic() {
+                j += 1;
+            }
+            let col: String = ch[cs..j].iter().collect();
+            let rabs = j < ch.len() && ch[j] == '$';
+            if rabs {
+                j += 1;
+            }
+            let rs = j;
+            while j < ch.len() && ch[j].is_ascii_digit() {
+                j += 1;
+            }
+            let row: String = ch[rs..j].iter().collect();
+            let next_word = j < ch.len()
+                && (ch[j].is_alphanumeric() || ch[j] == '_' || ch[j] == '(' || ch[j] == '.');
+            if (1..=3).contains(&col.len())
+                && !row.is_empty()
+                && !next_word
+                && let Some((r, cc)) = parse_cell(&format!("{col}{row}"))
+            {
+                let r2 = if rabs {
+                    i64::from(r)
+                } else {
+                    (i64::from(r) + dr).rem_euclid(i64::from(MAX_ROW) + 1)
+                };
+                let c2 = if cabs {
+                    i64::from(cc)
+                } else {
+                    (i64::from(cc) + dc).rem_euclid(i64::from(MAX_COL) + 1)
+                };
+                out += &format!(
+                    "{}{}{}{}",
+                    if cabs { "$" } else { "" },
+                    col_name(c2 as u32),
+                    if rabs { "$" } else { "" },
+                    r2 + 1
+                );
+                i = j;
+                continue;
+            }
+            let mut k = i;
+            while k < ch.len()
+                && (ch[k].is_alphanumeric() || ch[k] == '_' || ch[k] == '$' || ch[k] == '.')
+            {
+                out.push(ch[k]);
+                k += 1;
+            }
+            i = k.max(i + 1);
+            continue;
+        }
+        out.push(c);
+        i += 1;
+    }
+    out
+}
+
+fn cfvo(e: &Node, fc: &mut Converter, tl: (u32, u32)) -> Cfvo {
+    let kind = match e.attr("calcext:type").unwrap_or("number") {
+        "minimum" | "auto-minimum" => "min",
+        "maximum" | "auto-maximum" => "max",
+        "percentile" => "percentile",
+        "percent" => "percent",
+        "formula" => "formula",
+        _ => "num",
+    };
+    let v = e
+        .attr("calcext:value")
+        .map(str::to_string)
+        .filter(|_| kind != "min" && kind != "max");
+    let val = match (kind, v) {
+        ("formula", Some(f)) => fc
+            .convert(&format!(
+                "of:{}",
+                if f.starts_with('=') {
+                    f
+                } else {
+                    format!("={f}")
+                }
+            ))
+            .map(|f| rebase(&f, None, tl)),
+        (_, v) => v,
+    };
+    Cfvo { kind, val }
+}
+
+fn rule(kind: CfKind, dxf: Option<Dxf>) -> CfRule {
+    CfRule {
+        kind,
+        dxf,
+        stop: false,
+        priority: 0,
+    }
+}
+
+fn condition_rule(v: &str, dxf: Dxf, fc: &mut Converter, tl: (u32, u32)) -> Option<CfRule> {
+    let call = |name: &str| -> Option<Vec<String>> {
+        let r = v.strip_prefix(name)?.strip_prefix('(')?;
+        Some(split_args(r.strip_suffix(')')?))
+    };
+    if let Some(a) = call("between") {
+        return Some(rule(
+            CfKind::CellIs {
+                operator: "between",
+                formulas: a.iter().filter_map(|x| conv(fc, x)).collect(),
+            },
+            Some(dxf),
+        ));
+    }
+    if let Some(a) = call("not-between") {
+        return Some(rule(
+            CfKind::CellIs {
+                operator: "notBetween",
+                formulas: a.iter().filter_map(|x| conv(fc, x)).collect(),
+            },
+            Some(dxf),
+        ));
+    }
+    if let Some(a) = call("formula-is") {
+        return Some(rule(
+            CfKind::Expression {
+                formula: conv(fc, a.first()?)?,
+            },
+            Some(dxf),
+        ));
+    }
+    let other = |kind: &'static str,
+                 attrs: Vec<(&'static str, String)>,
+                 formulas: Vec<String>,
+                 dxf: Dxf| {
+        Some(rule(
+            CfKind::Other {
+                kind,
+                attrs,
+                formulas,
+            },
+            Some(dxf),
+        ))
+    };
+    match v.trim_end_matches("()").trim_end_matches('(') {
+        "duplicate" => return other("duplicateValues", vec![], vec![], dxf),
+        "unique" => return other("uniqueValues", vec![], vec![], dxf),
+        "above-average" => return other("aboveAverage", vec![], vec![], dxf),
+        "below-average" => {
+            return other(
+                "aboveAverage",
+                vec![("aboveAverage", "0".into())],
+                vec![],
+                dxf,
+            );
+        }
+        "above-equal-average" => {
+            return other(
+                "aboveAverage",
+                vec![("equalAverage", "1".into())],
+                vec![],
+                dxf,
+            );
+        }
+        "below-equal-average" => {
+            return other(
+                "aboveAverage",
+                vec![("aboveAverage", "0".into()), ("equalAverage", "1".into())],
+                vec![],
+                dxf,
+            );
+        }
+        "is-error" => {
+            return other(
+                "containsErrors",
+                vec![],
+                vec![format!("ISERROR({})", cell_ref(tl.0, tl.1))],
+                dxf,
+            );
+        }
+        "is-no-error" => {
+            return other(
+                "notContainsErrors",
+                vec![],
+                vec![format!("NOT(ISERROR({}))", cell_ref(tl.0, tl.1))],
+                dxf,
+            );
+        }
+        _ => {}
+    }
+    for (name, top, pct) in [
+        ("top-elements", true, false),
+        ("bottom-elements", false, false),
+        ("top-percent", true, true),
+        ("bottom-percent", false, true),
+    ] {
+        if let Some(a) = call(name) {
+            let mut attrs = vec![("rank", a.first().cloned().unwrap_or_else(|| "10".into()))];
+            if !top {
+                attrs.push(("bottom", "1".into()));
+            }
+            if pct {
+                attrs.push(("percent", "1".into()));
+            }
+            return other("top10", attrs, vec![], dxf);
+        }
+    }
+    for (name, kind, op) in [
+        ("begins-with", "beginsWith", "beginsWith"),
+        ("ends-with", "endsWith", "endsWith"),
+        ("contains-text", "containsText", "containsText"),
+        ("not-contains-text", "notContainsText", "notContains"),
+    ] {
+        if let Some(a) = call(name) {
+            let lit = a.first()?.clone();
+            let text = lit.trim_matches('"').replace("\"\"", "\"");
+            let cell = cell_ref(tl.0, tl.1);
+            let f = match kind {
+                "beginsWith" => format!("LEFT({cell},LEN({lit}))={lit}"),
+                "endsWith" => format!("RIGHT({cell},LEN({lit}))={lit}"),
+                "containsText" => format!("NOT(ISERROR(SEARCH({lit},{cell})))"),
+                _ => format!("ISERROR(SEARCH({lit},{cell}))"),
+            };
+            return other(
+                kind,
+                vec![("operator", op.into()), ("text", text)],
+                vec![f],
+                dxf,
+            );
+        }
+    }
+    let (op, val) = split_op(v);
+    if val.is_empty() {
+        return None;
+    }
+    Some(rule(
+        CfKind::CellIs {
+            operator: op,
+            formulas: vec![conv(fc, val)?],
+        },
+        Some(dxf),
+    ))
+}
+
+fn read_cond_format(cf: &Node, doc: &mut Doc) -> Option<CondFormat> {
+    let addr = cf.attr("calcext:target-range-address")?;
+    let ranges: Vec<Range> = super::split_ranges(addr)
+        .take(1024)
+        .filter_map(|a| parse_range_addr(a).map(|x| x.1))
+        .collect();
+    let tl = ranges.iter().map(|r| (r.r1, r.c1)).min()?;
+    let mut rules = vec![];
+    for c in cf.nodes().take(1024) {
+        match c.name.as_str() {
+            "calcext:condition" => {
+                let v = c.attr("calcext:value").unwrap_or("");
+                let dxf = c
+                    .attr("calcext:apply-style-name")
+                    .map(|s| doc.st.dxf(s, false))
+                    .unwrap_or_default();
+                if let Some(r) = condition_rule(v, dxf, &mut doc.fc, tl) {
+                    rules.push(r);
+                }
+            }
+            "calcext:color-scale" => {
+                let mut cfvos = vec![];
+                let mut colors = vec![];
+                for e in c.all("calcext:color-scale-entry").take(3) {
+                    cfvos.push(cfvo(e, &mut doc.fc, tl));
+                    colors.push(
+                        e.attr("calcext:color")
+                            .and_then(parse_color)
+                            .flatten()
+                            .unwrap_or(0),
+                    );
+                }
+                if cfvos.len() >= 2 {
+                    rules.push(rule(CfKind::ColorScale { cfvos, colors }, None));
+                }
+            }
+            "calcext:data-bar" => {
+                let entries: Vec<&Node> = c.all("calcext:formatting-entry").collect();
+                let min = entries.first().map_or(
+                    Cfvo {
+                        kind: "min",
+                        val: None,
+                    },
+                    |e| cfvo(e, &mut doc.fc, tl),
+                );
+                let max = entries.get(1).map_or(
+                    Cfvo {
+                        kind: "max",
+                        val: None,
+                    },
+                    |e| cfvo(e, &mut doc.fc, tl),
+                );
+                let color = c
+                    .attr("calcext:positive-color")
+                    .and_then(parse_color)
+                    .flatten()
+                    .unwrap_or(0x638EC6);
+                rules.push(rule(CfKind::DataBar { min, max, color }, None));
+            }
+            "calcext:date-is" => {
+                let dxf = c
+                    .attr("calcext:style")
+                    .map(|s| doc.st.dxf(s, false))
+                    .unwrap_or_default();
+                let period = match c.attr("calcext:date").unwrap_or("today") {
+                    "yesterday" => "yesterday",
+                    "tomorrow" => "tomorrow",
+                    "last-7-days" => "last7Days",
+                    "this-week" => "thisWeek",
+                    "last-week" => "lastWeek",
+                    "next-week" => "nextWeek",
+                    "this-month" => "thisMonth",
+                    "last-month" => "lastMonth",
+                    "next-month" => "nextMonth",
+                    _ => "today",
+                };
+                rules.push(rule(
+                    CfKind::Other {
+                        kind: "timePeriod",
+                        attrs: vec![("timePeriod", period.into())],
+                        formulas: vec![],
+                    },
+                    Some(dxf),
+                ));
+            }
+            "calcext:icon-set" => {
+                let set = c
+                    .attr("calcext:icon-set-type")
+                    .unwrap_or("3Arrows")
+                    .to_string();
+                let cfvos = c
+                    .all("calcext:formatting-entry")
+                    .take(5)
+                    .map(|e| cfvo(e, &mut doc.fc, tl))
+                    .collect();
+                rules.push(rule(
+                    CfKind::IconSet {
+                        set,
+                        cfvos,
+                        reverse: false,
+                        show_value: c.attr("calcext:show-value") != Some("false"),
+                    },
+                    None,
+                ));
+            }
+            _ => {}
+        }
+    }
+    (!rules.is_empty()).then_some(CondFormat { ranges, rules })
+}
+
+/// Older documents' conditions on cell styles: each style with maps is a
+/// conditional format over the cells that have it.
+/// Conditions of cell styles (style:map), over the cells of each style the
+/// table reader noted (`Doc::note_maps`).
+fn read_style_maps(sheet: &mut Sheet, doc: &mut Doc, by_style: HashMap<String, Vec<(u32, u32)>>) {
+    let mut names: Vec<String> = by_style.keys().cloned().collect();
+    names.sort();
+    for name in names {
+        let maps = doc
+            .st
+            .defs
+            .get(&name)
+            .map(|d| d.maps.clone())
+            .unwrap_or_default();
+        let cells = &by_style[&name];
+        let ranges = column_runs(cells);
+        let tl = ranges.iter().map(|r| (r.r1, r.c1)).min().unwrap_or((0, 0));
+        let mut rules = vec![];
+        for (cond, apply, base) in maps {
+            let dxf = doc.st.dxf(&apply, true);
+            let base = base.as_deref().and_then(parse_addr).map(|a| (a.1, a.2));
+            let c = cond.trim();
+            let between = |r: &str, fc: &mut Converter| -> Vec<String> {
+                split_args(r.strip_suffix(')').unwrap_or(r))
+                    .iter()
+                    .filter_map(|x| conv(fc, x))
+                    .map(|f| rebase(&f, base, tl))
+                    .collect()
+            };
+            let kind = if let Some(r) = c.strip_prefix("cell-content-is-between(") {
+                Some(CfKind::CellIs {
+                    operator: "between",
+                    formulas: between(r, &mut doc.fc),
+                })
+            } else if let Some(r) = c.strip_prefix("cell-content-is-not-between(") {
+                Some(CfKind::CellIs {
+                    operator: "notBetween",
+                    formulas: between(r, &mut doc.fc),
+                })
+            } else if let Some(r) = c.strip_prefix("is-true-formula(") {
+                conv(&mut doc.fc, r.strip_suffix(')').unwrap_or(r)).map(|f| CfKind::Expression {
+                    formula: rebase(&f, base, tl),
+                })
+            } else if let Some(r) = c.strip_prefix("cell-content()") {
+                let (op, v) = split_op(r);
+                conv(&mut doc.fc, v).map(|f| CfKind::CellIs {
+                    operator: op,
+                    formulas: vec![rebase(&f, base, tl)],
+                })
+            } else {
+                None
+            };
+            if let Some(k) = kind {
+                rules.push(rule(k, Some(dxf)));
+            }
+        }
+        if !rules.is_empty() {
+            sheet.cond_formats.push(CondFormat { ranges, rules });
+        }
+    }
+}
+
+/// Single cells joined into column runs.
+fn column_runs(cells: &[(u32, u32)]) -> Vec<Range> {
+    let mut v: Vec<(u32, u32)> = cells.to_vec();
+    v.sort_by_key(|&(r, c)| (c, r));
+    let mut out: Vec<Range> = vec![];
+    for (r, c) in v {
+        if let Some(l) = out.last_mut()
+            && l.c1 == c
+            && l.r2 + 1 == r
+        {
+            l.r2 = r;
+            continue;
+        }
+        out.push(Range::cell(r, c));
+    }
+    out
+}
+
+pub(crate) fn read_table_cfs(t: &Node, doc: &mut Doc, _wb: &mut Workbook, sheet: &mut Sheet) {
+    let mapped = std::mem::take(&mut doc.map_cells);
+    match t.child("calcext:conditional-formats") {
+        Some(cfs) => {
+            for cf in cfs.all("calcext:conditional-format").take(4096) {
+                if let Some(c) = read_cond_format(cf, doc) {
+                    // The same rules over the same cells again change nothing.
+                    if !sheet
+                        .cond_formats
+                        .iter()
+                        .any(|x| x.ranges == c.ranges && x.rules == c.rules)
+                    {
+                        sheet.cond_formats.push(c);
+                    }
+                }
+            }
+        }
+        None => read_style_maps(sheet, doc, mapped),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn shifting_references() {
+        assert_eq!(
+            shift_refs("A1+$B$2+B$3+\"A1\"+'S A1'!C4", 1, 2),
+            "C2+$B$2+D$3+\"A1\"+'S A1'!E5"
+        );
+        assert_eq!(shift_refs("SUM(A1)", 0, 1), "SUM(B1)");
+        assert_eq!(shift_refs("LOG10(A1)", 1, 0), "LOG10(A2)");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/chart.rs b/crates/exav-render/src/formats/office/sheets/ods/chart.rs
new file mode 100644
index 00000000..6f94c2dd
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/chart.rs
@@ -0,0 +1,394 @@
+//! ODF charts (an embedded object's office:chart) to the chart model.
+
+use crate::formats::office::common::xml::{self, Node};
+use crate::formats::office::sheets::charts::XML_PER_POINT;
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::model::*;
+use std::cell::{Cell, RefCell};
+use std::collections::HashMap;
+
+fn text(n: &Node) -> String {
+    let mut s = String::new();
+    for (k, p) in n.all("text:p").enumerate() {
+        if k > 0 {
+            s.push('\n');
+        }
+        super::text_of(p, &mut s);
+    }
+    s
+}
+
+/// The first range of a cell range address.
+fn range(addr: &str) -> Option<(String, Range)> {
+    super::parse_range_addr(super::split_ranges(addr).next()?)
+}
+
+fn excel_ref(sheet: &str, r: &Range) -> String {
+    let q = crate::formats::office::sheets::xls::formula::quote_sheet(sheet);
+    let a = |row: u32, col: u32| format!("${}${}", col_name(col), u64::from(row) + 1);
+    if r.r1 == r.r2 && r.c1 == r.c2 {
+        format!("{q}!{}", a(r.r1, r.c1))
+    } else {
+        format!("{q}!{}:{}", a(r.r1, r.c1), a(r.r2, r.c2))
+    }
+}
+
+/// Values of a range, from the workbook or the chart's own table.
+struct Data<'a> {
+    sheets: &'a [Sheet],
+    local: HashMap<(u32, u32), Value>,
+    /// Tells the workbook's memory budget what a series copied out of the
+    /// cells: every series gets its own copy of its range, and a chart may
+    /// have a few hundred of them over the same hundred thousand cells.
+    charge: RefCell<&'a mut dyn FnMut(u64) -> bool>,
+    /// A copy was refused: the conversion is.
+    refused: Cell<bool>,
+}
+
+impl Data<'_> {
+    /// Whether `bytes` more may be held; a refusal is remembered.
+    fn afford(&self, bytes: usize) -> bool {
+        if (self.charge.borrow_mut())(bytes as u64) {
+            return true;
+        }
+        self.refused.set(true);
+        false
+    }
+
+    fn cells(&self, sheet: &str, r: &Range) -> Vec<Value> {
+        if r.area() > 100_000 {
+            return vec![];
+        }
+        let local = sheet == "local-table";
+        let sh = self.sheets.iter().find(|s| s.name == sheet);
+        let mut out = vec![];
+        for row in r.r1..=r.r2 {
+            for col in r.c1..=r.c2 {
+                let v = if local {
+                    self.local.get(&(row, col)).cloned()
+                } else {
+                    sh.and_then(|s| s.cells.get(&(row, col)))
+                        .map(|c| c.value.clone())
+                };
+                out.push(v.unwrap_or(Value::Empty));
+            }
+        }
+        out
+    }
+
+    fn nums(&self, sheet: &str, r: &Range) -> Vec<Option<f64>> {
+        let out: Vec<Option<f64>> = self
+            .cells(sheet, r)
+            .into_iter()
+            .map(|v| {
+                if let Value::Number(n) = v {
+                    Some(n)
+                } else {
+                    None
+                }
+            })
+            .collect();
+        // The values, and the XML they are written as.
+        if self.afford(out.len() * (size_of::<Option<f64>>() + XML_PER_POINT)) {
+            out
+        } else {
+            vec![]
+        }
+    }
+
+    fn strs(&self, sheet: &str, r: &Range) -> Vec<String> {
+        let out: Vec<String> = self
+            .cells(sheet, r)
+            .into_iter()
+            .map(|v| v.display())
+            .collect();
+        let bytes = out
+            .iter()
+            .map(|s| size_of::<String>() + 2 * s.len() + XML_PER_POINT)
+            .sum();
+        if self.afford(bytes) { out } else { vec![] }
+    }
+}
+
+fn local_table(doc: &Node) -> HashMap<(u32, u32), Value> {
+    let mut out = HashMap::new();
+    let Some(t) = doc.find("table:table") else {
+        return out;
+    };
+    let mut rows: Vec<&Node> = vec![];
+    fn gather<'a>(n: &'a Node, out: &mut Vec<&'a Node>, depth: u32) {
+        for c in n.nodes() {
+            match c.name.as_str() {
+                "table:table-row" => out.push(c),
+                "table:table-header-rows" | "table:table-rows" | "table:table-row-group"
+                    if depth < 8 =>
+                {
+                    gather(c, out, depth + 1)
+                }
+                _ => {}
+            }
+        }
+    }
+    gather(t, &mut rows, 0);
+    for (r, row) in rows.iter().enumerate().take(10_000) {
+        let mut c = 0u32;
+        for cell in row.all("table:table-cell").take(1000) {
+            let v = match cell.attr("office:value-type") {
+                Some("float" | "percentage" | "currency") => cell
+                    .attr("office:value")
+                    .and_then(|v| v.parse().ok())
+                    .map_or(Value::Empty, Value::Number),
+                Some("string") => Value::text(text(cell)),
+                _ => Value::Empty,
+            };
+            out.insert((r as u32, c), v);
+            c = c.saturating_add(
+                cell.attr("table:number-columns-repeated")
+                    .and_then(|v| v.parse::<u32>().ok())
+                    .unwrap_or(1)
+                    .min(1000),
+            );
+        }
+    }
+    out
+}
+
+/// What the tree of one chart may take; it is dropped once the chart is read.
+const CHART_TREE_BYTES: u64 = 64 << 20;
+
+/// The chart of an embedded object, or `None` when it is not one. What its
+/// series copy out of `sheets` is told to `charge`, and a chart that cannot be
+/// afforded fails the conversion.
+pub(crate) fn read(
+    xml: &[u8],
+    anchor: Anchor,
+    sheets: &[Sheet],
+    charge: &mut dyn FnMut(u64) -> bool,
+) -> Result<Option<Chart>> {
+    let refused = Cell::new(false);
+    let chart = read_in(xml, anchor, sheets, charge, &refused);
+    if refused.get() {
+        return Err(Error::TooLarge("memory"));
+    }
+    Ok(chart)
+}
+
+fn read_in(
+    xml: &[u8],
+    anchor: Anchor,
+    sheets: &[Sheet],
+    charge: &mut dyn FnMut(u64) -> bool,
+    refused: &Cell<bool>,
+) -> Option<Chart> {
+    let doc = xml::parse(xml, &mut xml::within(CHART_TREE_BYTES)).ok()?;
+    let ch = doc.find("chart:chart")?;
+    let mut styles: HashMap<String, &Node> = HashMap::new();
+    if let Some(a) = doc.child("office:automatic-styles") {
+        for s in a.all("style:style") {
+            if let Some(n) = s.attr("style:name") {
+                styles.insert(n.to_string(), s);
+            }
+        }
+    }
+    let props = |name: Option<&str>| {
+        name.and_then(|n| styles.get(n))
+            .and_then(|s| s.child("style:chart-properties"))
+    };
+    let graphic = |name: Option<&str>| {
+        name.and_then(|n| styles.get(n))
+            .and_then(|s| s.child("style:graphic-properties"))
+    };
+    let class = ch.attr("chart:class").unwrap_or("chart:bar");
+    let kind_of = |c: &str| match c {
+        "chart:line" => ChartKind::Line,
+        "chart:area" => ChartKind::Area,
+        "chart:circle" => ChartKind::Pie,
+        "chart:ring" => ChartKind::Doughnut,
+        "chart:scatter" => ChartKind::Scatter,
+        "chart:radar" => ChartKind::Radar,
+        "chart:filled-radar" => ChartKind::FilledRadar,
+        "chart:bubble" => ChartKind::Bubble,
+        "chart:stock" => ChartKind::Stock,
+        "chart:surface" => ChartKind::Surface,
+        _ => ChartKind::Bar,
+    };
+    let mut kind = kind_of(class);
+    let plot = ch.child("chart:plot-area")?;
+    let pp = props(plot.attr("chart:style-name"));
+    let flag = |k: &str| pp.and_then(|p| p.attr(k)) == Some("true");
+    let three_d = flag("chart:three-dimensional");
+    if kind == ChartKind::Doughnut && three_d {
+        kind = ChartKind::Pie;
+    }
+    let mut c = Chart::new(anchor, kind);
+    c.horizontal = flag("chart:vertical");
+    c.grouping = if flag("chart:percentage") {
+        "percentStacked"
+    } else if flag("chart:stacked") {
+        "stacked"
+    } else if kind == ChartKind::Bar {
+        "clustered"
+    } else {
+        "standard"
+    };
+    c.three_d = three_d;
+    if let Some(gw) = pp
+        .and_then(|p| p.attr("chart:gap-width"))
+        .and_then(|v| v.parse::<i64>().ok())
+    {
+        c.gap_width = Some(gw.clamp(0, 500) as u32);
+    }
+    if let Some(ov) = pp
+        .and_then(|p| p.attr("chart:overlap"))
+        .and_then(|v| v.parse::<i64>().ok())
+    {
+        c.overlap = Some(ov.clamp(-100, 100) as i32);
+    }
+    c.title = ch.child("chart:title").map(text).filter(|t| !t.is_empty());
+    c.legend =
+        ch.child("chart:legend")
+            .map(|l| match l.attr("chart:legend-position").unwrap_or("end") {
+                "start" => "l",
+                "top" => "t",
+                "bottom" => "b",
+                "top-end" => "tr",
+                _ => "r",
+            });
+    let data = Data {
+        sheets,
+        local: local_table(&doc),
+        charge: RefCell::new(charge),
+        refused: Cell::new(false),
+    };
+    let mut cat_range = None;
+    for ax in plot.all("chart:axis") {
+        let t = ax.child("chart:title").map(text).filter(|t| !t.is_empty());
+        match ax.attr("chart:dimension") {
+            Some("x") if ax.attr("chart:name").is_none_or(|n| n == "primary-x") => {
+                c.cat_title = t;
+                cat_range = ax
+                    .child("chart:categories")
+                    .and_then(|k| k.attr("table:cell-range-address"))
+                    .and_then(range);
+            }
+            Some("y") if ax.attr("chart:name").is_none_or(|n| n == "primary-y") => {
+                c.val_title = t;
+                c.major_grid = ax.child("chart:grid").is_some();
+            }
+            _ => {}
+        }
+    }
+    for s in plot.all("chart:series").take(256) {
+        if data.refused.get() {
+            break;
+        }
+        let mut cs = ChartSeries {
+            line: true,
+            ..Default::default()
+        };
+        // A series drawn otherwise than the chart: the bars and lines of a
+        // combined chart (a ring's series say they are circles).
+        let combinable =
+            |k: ChartKind| matches!(k, ChartKind::Bar | ChartKind::Line | ChartKind::Area);
+        let skind = s
+            .attr("chart:class")
+            .map(kind_of)
+            .filter(|k| *k != kind && combinable(*k) && combinable(kind));
+        let this_kind = skind.unwrap_or(kind);
+        cs.kind = skind;
+        cs.secondary = s
+            .attr("chart:attached-axis")
+            .is_some_and(|a| a.contains("secondary"));
+        if let Some((sh, r)) = s.attr("chart:values-cell-range-address").and_then(range) {
+            cs.vals = data.nums(&sh, &r);
+            if sh != "local-table" {
+                cs.val_ref = Some(excel_ref(&sh, &r));
+            }
+        }
+        if let Some((sh, r)) = s.attr("chart:label-cell-address").and_then(range) {
+            cs.name = data.strs(&sh, &r).into_iter().next();
+            if sh != "local-table" {
+                cs.name_ref = Some(excel_ref(&sh, &r));
+            }
+        }
+        let domains: Vec<(String, Range)> = s
+            .all("chart:domain")
+            .filter_map(|d| d.attr("table:cell-range-address"))
+            .filter_map(range)
+            .collect();
+        if matches!(this_kind, ChartKind::Scatter | ChartKind::Bubble) {
+            // A bubble series' values are its sizes, its first domain its y
+            // values and its second its x values; a scatter series' first
+            // domain is its x values.
+            let xs = if this_kind == ChartKind::Bubble {
+                domains.get(1).or(domains.first())
+            } else {
+                domains.first()
+            };
+            if let Some((sh, r)) = xs.cloned().or(cat_range.clone()) {
+                cs.cat_nums = Some(data.nums(&sh, &r));
+                if sh != "local-table" {
+                    cs.cat_ref = Some(excel_ref(&sh, &r));
+                }
+            }
+            if this_kind == ChartKind::Bubble
+                && let Some((sh, r)) = domains.first()
+            {
+                cs.sizes = std::mem::take(&mut cs.vals);
+                cs.size_ref = cs.val_ref.take();
+                cs.vals = data.nums(sh, r);
+                if sh != "local-table" {
+                    cs.val_ref = Some(excel_ref(sh, r));
+                }
+            }
+        } else if let Some((sh, r)) = &cat_range {
+            cs.cats = data.strs(sh, r);
+            if sh != "local-table" {
+                cs.cat_ref = Some(excel_ref(sh, r));
+            }
+        }
+        let sp = props(s.attr("chart:style-name"));
+        if let Some(g) = graphic(s.attr("chart:style-name")) {
+            let lined = matches!(
+                this_kind,
+                ChartKind::Line | ChartKind::Scatter | ChartKind::Radar
+            );
+            let key = if lined {
+                "svg:stroke-color"
+            } else {
+                "draw:fill-color"
+            };
+            cs.color = g
+                .attr(key)
+                .and_then(|v| super::styles::parse_color(v).flatten());
+            if lined && g.attr("draw:stroke") == Some("none") {
+                cs.line = false;
+            }
+        }
+        if let Some(sp) = sp {
+            cs.marker = sp.attr("chart:symbol-type").is_some_and(|t| t != "none");
+            cs.smooth = sp.attr("chart:interpolation").is_some_and(|i| i != "none");
+        }
+        // Points with their own colour (a pie's slices).
+        let mut idx = 0u32;
+        for p in s.all("chart:data-point").take(4096) {
+            let n = p
+                .attr("chart:repeated")
+                .and_then(|v| v.parse::<u32>().ok())
+                .unwrap_or(1)
+                .clamp(1, 4096);
+            if let Some(col) = graphic(p.attr("chart:style-name"))
+                .and_then(|g| g.attr("draw:fill-color"))
+                .and_then(|v| super::styles::parse_color(v).flatten())
+            {
+                for k in 0..n {
+                    cs.point_colors.push((idx + k, col));
+                }
+            }
+            idx = idx.saturating_add(n);
+        }
+        c.series.push(cs);
+    }
+    refused.set(data.refused.get());
+    Some(c)
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/draw.rs b/crates/exav-render/src/formats/office/sheets/ods/draw.rs
new file mode 100644
index 00000000..e2cd75a0
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/draw.rs
@@ -0,0 +1,488 @@
+//! Drawings of a table: pictures, charts (embedded objects), text boxes and
+//! shapes, anchored to a cell or to the page.
+
+use super::styles::{parse_color, parse_len_pt};
+use super::{Doc, paragraphs, parse_addr};
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::sheets::error::Result;
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+
+/// Column and row edges in points, as the document lays them out.
+struct PtGrid {
+    left: Vec<f64>,
+    top: Vec<f64>,
+    widths: Vec<f64>,
+    heights: Vec<f64>,
+}
+
+impl PtGrid {
+    fn new(sheet: &Sheet, digit_twips: f64, mc: u32, mr: u32) -> PtGrid {
+        let col_pt = |c: u32| -> f64 {
+            match sheet.col_info(c) {
+                Some(ci) if ci.hidden => 0.0,
+                Some(ci) => {
+                    ci.width.or(sheet.default_col_width).unwrap_or(10.0) * digit_twips / 20.0
+                }
+                None => sheet.default_col_width.unwrap_or(10.0) * digit_twips / 20.0,
+            }
+        };
+        let row_pt = |r: u32| -> f64 {
+            match sheet.rows.get(&r) {
+                Some(ri) if ri.hidden => 0.0,
+                Some(ri) => ri.height.unwrap_or(sheet.default_row_height),
+                None => sheet.default_row_height,
+            }
+        };
+        let (mut left, mut widths, mut x) = (vec![], vec![], 0.0);
+        for c in 0..=mc.min(MAX_COL) {
+            let w = col_pt(c);
+            left.push(x);
+            widths.push(w);
+            x += w;
+        }
+        let (mut top, mut heights, mut y) = (vec![], vec![], 0.0);
+        for r in 0..=mr.min(MAX_ROW) {
+            let h = row_pt(r);
+            top.push(y);
+            heights.push(h);
+            y += h;
+        }
+        PtGrid {
+            left,
+            top,
+            widths,
+            heights,
+        }
+    }
+
+    /// Edges past cell `far` (row, col) and past points (x, y).
+    fn covering(sheet: &Sheet, digit_twips: f64, far: (u32, u32), x: f64, y: f64) -> PtGrid {
+        let mut mc = far.1.saturating_add(2).min(MAX_COL);
+        let mut mr = far.0.saturating_add(2).min(MAX_ROW);
+        loop {
+            let g = PtGrid::new(sheet, digit_twips, mc, mr);
+            let wide =
+                g.left.last().copied().unwrap_or(0.0) + g.widths.last().copied().unwrap_or(0.0) > x
+                    || mc == MAX_COL;
+            let tall =
+                g.top.last().copied().unwrap_or(0.0) + g.heights.last().copied().unwrap_or(0.0) > y
+                    || mr == MAX_ROW;
+            if wide && tall {
+                return g;
+            }
+            if !wide {
+                mc = mc.saturating_mul(2).saturating_add(16).min(MAX_COL);
+            }
+            if !tall {
+                mr = mr.saturating_mul(2).saturating_add(64).min(MAX_ROW);
+            }
+        }
+    }
+
+    fn cell(&self, r: u32, c: u32) -> (f64, f64) {
+        let ci = (c as usize).min(self.left.len() - 1);
+        let ri = (r as usize).min(self.top.len() - 1);
+        (self.left[ci], self.top[ri])
+    }
+
+    /// The cell holding (x, y) and the offsets in it, in millionths.
+    fn locate(&self, x: f64, y: f64) -> (u32, u32, i64, i64) {
+        let c = self.left.partition_point(|&l| l <= x).saturating_sub(1);
+        let r = self.top.partition_point(|&t| t <= y).saturating_sub(1);
+        let frac = |off: f64, size: f64| {
+            if size > 0.0 {
+                ((off / size) * 1e6).clamp(0.0, 1e6) as i64
+            } else {
+                0
+            }
+        };
+        (
+            c as u32,
+            r as u32,
+            frac(x - self.left[c], self.widths[c]),
+            frac(y - self.top[r], self.heights[r]),
+        )
+    }
+}
+
+fn len(n: &Node, k: &str) -> f64 {
+    n.attr(k)
+        .and_then(parse_len_pt)
+        .unwrap_or(0.0)
+        .clamp(-1e7, 1e7)
+}
+
+/// A frame's or shape's corners in points from the sheet's origin.
+fn corners(f: &Node, cell: Option<(u32, u32)>, g: &PtGrid) -> (f64, f64, f64, f64) {
+    let (x, y, w, h) = (
+        len(f, "svg:x"),
+        len(f, "svg:y"),
+        len(f, "svg:width"),
+        len(f, "svg:height"),
+    );
+    let (ox, oy) = cell.map_or((0.0, 0.0), |(r, c)| g.cell(r, c));
+    let (x0, y0) = (ox + x, oy + y);
+    let (x1, y1) = match f.attr("table:end-cell-address").and_then(parse_addr) {
+        Some((_, r, c)) => {
+            let (ex, ey) = g.cell(r, c);
+            (ex + len(f, "table:end-x"), ey + len(f, "table:end-y"))
+        }
+        None => (x0 + w, y0 + h),
+    };
+    (x0, y0, x1, y1)
+}
+
+fn anchor(c: (f64, f64, f64, f64), g: &PtGrid) -> Anchor {
+    let (x0, y0, x1, y1) = c;
+    Anchor {
+        from: g.locate(x0.min(x1).max(0.0), y0.min(y1).max(0.0)),
+        to: g.locate(x0.max(x1).max(0.0), y0.max(y1).max(0.0)),
+    }
+}
+
+fn image_ext(href: &str) -> &'static str {
+    match href
+        .rsplit('.')
+        .next()
+        .map(str::to_ascii_lowercase)
+        .as_deref()
+    {
+        Some("png") => "png",
+        Some("jpg" | "jpeg") => "jpeg",
+        Some("gif") => "gif",
+        Some("svg") => "svg",
+        Some("emf") => "emf",
+        Some("wmf") => "wmf",
+        Some("bmp") => "bmp",
+        Some("tif" | "tiff") => "tiff",
+        _ => "png",
+    }
+}
+
+/// Sniffs a picture without an extension.
+fn sniff(d: &[u8]) -> Option<&'static str> {
+    Some(match d {
+        [0x89, b'P', b'N', b'G', ..] => "png",
+        [0xFF, 0xD8, ..] => "jpeg",
+        [b'G', b'I', b'F', ..] => "gif",
+        [b'B', b'M', ..] => "bmp",
+        [0xD7, 0xCD, 0xC6, 0x9A, ..] => "wmf",
+        [1, 0, 0, 0, ..] if d.get(40..44) == Some(b" EMF") => "emf",
+        _ => return None,
+    })
+}
+
+fn geometry(n: &Node) -> Option<&'static str> {
+    Some(match n.name.as_str() {
+        "draw:rect" => "rect",
+        "draw:ellipse" | "draw:circle" => "ellipse",
+        "draw:line" | "draw:connector" => "line",
+        "draw:polygon" | "draw:polyline" | "draw:path" | "draw:g" | "draw:frame" => "rect",
+        "draw:custom-shape" => match n
+            .child("draw:enhanced-geometry")
+            .and_then(|g| g.attr("draw:type"))
+            .unwrap_or("rectangle")
+        {
+            "ellipse" | "circle" => "ellipse",
+            "round-rectangle" | "round-square" => "roundRect",
+            "isosceles-triangle" => "triangle",
+            "right-triangle" => "rtTriangle",
+            "diamond" => "diamond",
+            "hexagon" => "hexagon",
+            "octagon" => "octagon",
+            "parallelogram" => "parallelogram",
+            "trapezoid" => "trapezoid",
+            "pentagon" => "pentagon",
+            "right-arrow" => "rightArrow",
+            "left-arrow" => "leftArrow",
+            "up-arrow" => "upArrow",
+            "down-arrow" => "downArrow",
+            "left-right-arrow" => "leftRightArrow",
+            "star5" => "star5",
+            "star4" => "star4",
+            "star8" => "star8",
+            "smiley" => "smileyFace",
+            "can" => "can",
+            "cube" => "cube",
+            "heart" => "heart",
+            "sun" => "sun",
+            "moon" => "moon",
+            "cloud-callout" | "cloud" => "cloud",
+            "flowchart-process" => "flowChartProcess",
+            "flowchart-decision" => "flowChartDecision",
+            "flowchart-terminator" => "flowChartTerminator",
+            "ring" => "donut",
+            "cross" => "plus",
+            _ => "rect",
+        },
+        _ => return None,
+    })
+}
+
+/// The rotation of `draw:transform`'s rotate(), in degrees clockwise.
+fn rotation(n: &Node) -> f64 {
+    let Some(t) = n.attr("draw:transform") else {
+        return 0.0;
+    };
+    let Some(i) = t.find("rotate") else {
+        return 0.0;
+    };
+    let rest = &t[i + 6..];
+    let inner = rest
+        .trim_start()
+        .strip_prefix('(')
+        .and_then(|r| r.split(')').next())
+        .unwrap_or("");
+    let rad: f64 = inner.trim().parse().unwrap_or(0.0);
+    if !rad.is_finite() {
+        return 0.0;
+    }
+    // ODF rotates counterclockwise.
+    (-rad.to_degrees()).rem_euclid(360.0)
+}
+
+fn shape(n: &Node, cell: Option<(u32, u32)>, g: &PtGrid, doc: &Doc, depth: u32) -> Vec<Shape> {
+    let Some(geom) = geometry(n) else {
+        return vec![];
+    };
+    if n.name == "draw:g" {
+        if depth > 16 {
+            return vec![];
+        }
+        return n
+            .nodes()
+            .take(4096)
+            .flat_map(|c| shape(c, cell, g, doc, depth + 1))
+            .collect();
+    }
+    // Where the application put the bottom right of the shape's bounding
+    // box, when it says.
+    let end = n
+        .attr("table:end-cell-address")
+        .and_then(parse_addr)
+        .map(|(_, r, c)| {
+            let (ex, ey) = g.cell(r, c);
+            (ex + len(n, "table:end-x"), ey + len(n, "table:end-y"))
+        });
+    let rot = rotation(n);
+    let c = if n.attr("svg:x1").is_some() {
+        let (ox, oy) = cell.map_or((0.0, 0.0), |(r, c)| g.cell(r, c));
+        let (x1, y1, x2, y2) = (
+            ox + len(n, "svg:x1"),
+            oy + len(n, "svg:y1"),
+            ox + len(n, "svg:x2"),
+            oy + len(n, "svg:y2"),
+        );
+        match end {
+            Some((ex, ey)) => {
+                let (dx, dy) = (ex - x1.max(x2), ey - y1.max(y2));
+                (x1 + dx, y1 + dy, x2 + dx, y2 + dy)
+            }
+            None => (x1, y1, x2, y2),
+        }
+    } else if let (Some((ex, ey)), true) = (end, n.attr("draw:transform").is_some()) {
+        // The unrotated box around the rotated one's center.
+        let (w, h) = (len(n, "svg:width"), len(n, "svg:height"));
+        let a = rot.to_radians();
+        let (bw, bh) = (
+            (w * a.cos()).abs() + (h * a.sin()).abs(),
+            (w * a.sin()).abs() + (h * a.cos()).abs(),
+        );
+        let (cx, cy) = (ex - bw / 2.0, ey - bh / 2.0);
+        (cx - w / 2.0, cy - h / 2.0, cx + w / 2.0, cy + h / 2.0)
+    } else if n.attr("draw:transform").is_some() && n.attr("svg:x").is_none() {
+        // A transformed shape: placed by the translate() of its transform.
+        let t = n.attr("draw:transform").unwrap_or("");
+        let tr = t
+            .find("translate")
+            .and_then(|i| t[i + 9..].trim_start().strip_prefix('('))
+            .and_then(|r| r.split(')').next())
+            .unwrap_or("");
+        let mut it = tr
+            .split([' ', ','])
+            .filter(|s| !s.is_empty())
+            .map(|s| parse_len_pt(s).unwrap_or(0.0));
+        let (tx, ty) = (it.next().unwrap_or(0.0), it.next().unwrap_or(0.0));
+        let (ox, oy) = cell.map_or((0.0, 0.0), |(r, c)| g.cell(r, c));
+        let (w, h) = (len(n, "svg:width"), len(n, "svg:height"));
+        // The translation moves the rotated top left corner; unrotate it to
+        // the bounding box the anchor wants.
+        let (x0, y0) = if rot != 0.0 {
+            let a = -rot.to_radians();
+            let (cx, cy) = (
+                tx + (w * a.cos() - h * a.sin()) / 2.0,
+                ty + (w * a.sin() + h * a.cos()) / 2.0,
+            );
+            (cx - w / 2.0, cy - h / 2.0)
+        } else {
+            (tx, ty)
+        };
+        (ox + x0, oy + y0, ox + x0 + w, oy + y0 + h)
+    } else {
+        corners(n, cell, g)
+    };
+    let mut shp = Shape::new(anchor(c, g), geom);
+    if geom == "line" {
+        shp.flip_h = c.2 < c.0;
+        shp.flip_v = c.3 < c.1;
+    }
+    shp.rotation = rot;
+    let gp = n
+        .attr("draw:style-name")
+        .and_then(|sn| doc.st.other("graphic", sn))
+        .and_then(|s| s.child("style:graphic-properties"));
+    let parent_gp = n
+        .attr("draw:style-name")
+        .and_then(|sn| doc.st.other("graphic", sn))
+        .and_then(|s| s.attr("style:parent-style-name"))
+        .and_then(|p| doc.st.other("graphic", p))
+        .and_then(|s| s.child("style:graphic-properties"));
+    let prop = |k: &str| {
+        gp.and_then(|g| g.attr(k))
+            .or_else(|| parent_gp.and_then(|g| g.attr(k)))
+    };
+    let filled = prop("draw:fill").is_none_or(|f| f != "none");
+    if filled && geom != "line" {
+        // The default fill of a shape is light blue in the application.
+        shp.fill = Some(
+            prop("draw:fill-color")
+                .and_then(parse_color)
+                .flatten()
+                .unwrap_or(0x729FCF),
+        );
+    }
+    if prop("draw:stroke") != Some("none") {
+        shp.line = Some(
+            prop("svg:stroke-color")
+                .and_then(parse_color)
+                .flatten()
+                .unwrap_or(0x3465A4),
+        );
+        shp.line_width = prop("svg:stroke-width")
+            .and_then(parse_len_pt)
+            .map(|w| (w * 12700.0) as i64)
+            .filter(|&w| w > 0);
+        if prop("draw:stroke") == Some("dash") {
+            shp.line_dash = Some("dash");
+        }
+        shp.head_arrow = prop("draw:marker-start").is_some();
+        shp.tail_arrow = prop("draw:marker-end").is_some();
+    }
+    shp.text.text = paragraphs(n);
+    if let Some(tb) = n.child("draw:text-box") {
+        shp.text.text = paragraphs(tb);
+    }
+    shp.text.anchor = match prop("draw:textarea-vertical-align") {
+        Some("middle") => Some("ctr"),
+        Some("bottom") => Some("b"),
+        Some("top") => Some("t"),
+        _ => None,
+    };
+    shp.name = n.attr("draw:name").unwrap_or("").to_string();
+    vec![shp]
+}
+
+pub(crate) fn read_drawings(
+    t: &Node,
+    doc: &mut Doc,
+    wb: &mut Workbook,
+    budget: &mut Budget,
+    sheet: &mut Sheet,
+    anchored: &[(u32, u32, &Node)],
+    charts_out: &mut Vec<super::PendingChart>,
+) -> Result<()> {
+    let mut items: Vec<(Option<(u32, u32)>, &Node)> = anchored
+        .iter()
+        .map(|&(r, c, f)| (Some((r, c)), f))
+        .collect();
+    if let Some(shapes) = t.child("table:shapes") {
+        items.extend(shapes.nodes().take(1 << 16).map(|n| (None, n)));
+    }
+    if items.is_empty() {
+        return Ok(());
+    }
+    let f0 = wb.styles.get(0).font.clone();
+    let digit = crate::formats::office::sheets::fonts::digit_twips(&f0.name, f0.size_pt());
+    // Edges as far as the drawings reach (positions in points).
+    let mut far = (0u32, 0u32);
+    for (cell, n) in &items {
+        if let Some((r, c)) = cell {
+            far = (far.0.max(*r), far.1.max(*c));
+        }
+        if let Some((_, r, c)) = n.attr("table:end-cell-address").and_then(parse_addr) {
+            far = (far.0.max(r), far.1.max(c));
+        }
+    }
+    // Then as far as their extents reach.
+    let probe = PtGrid::new(sheet, digit, far.1 + 1, far.0 + 1);
+    let (mut max_x, mut max_y) = (0.0f64, 0.0f64);
+    for (cell, n) in &items {
+        let (ox, oy) = cell.map_or((0.0, 0.0), |(r, c)| probe.cell(r, c));
+        max_x = max_x.max(ox + len(n, "svg:x").max(len(n, "svg:x2")) + len(n, "svg:width"));
+        max_y = max_y.max(oy + len(n, "svg:y").max(len(n, "svg:y2")) + len(n, "svg:height"));
+    }
+    let g = PtGrid::covering(sheet, digit, far, max_x, max_y);
+    for (cell, f) in items {
+        if f.name != "draw:frame" {
+            for s in shape(f, cell, &g, doc, 0) {
+                if sheet.shapes.len() < 1 << 16 {
+                    sheet.shapes.push(s);
+                }
+            }
+            continue;
+        }
+        let a = anchor(corners(f, cell, &g), &g);
+        // An embedded object's frame also has its replacement picture.
+        if let Some(href) = f.child("draw:object").and_then(|o| o.attr("xlink:href")) {
+            // Shown as its replacement picture when it is not a chart, where
+            // that picture is in a format a reader draws.
+            let fallback = f
+                .child("draw:image")
+                .and_then(|i| i.attr("xlink:href"))
+                .and_then(|h| doc.parts.get(h.trim_start_matches("./")))
+                .and_then(|d| {
+                    let ext = sniff(d)?;
+                    Some(Image {
+                        anchor: a,
+                        ext,
+                        data: d.clone(),
+                        name: f.attr("draw:name").unwrap_or("Object").to_string(),
+                    })
+                });
+            charts_out.push((
+                a,
+                href.trim_start_matches("./")
+                    .trim_end_matches('/')
+                    .to_string(),
+                fallback,
+            ));
+        } else if let Some(img) = f.child("draw:image") {
+            let Some(href) = img.attr("xlink:href").map(|h| h.trim_start_matches("./")) else {
+                continue;
+            };
+            let Some(data) = doc.parts.get(href) else {
+                continue;
+            };
+            let ext = if href.contains('.') {
+                image_ext(href)
+            } else {
+                sniff(data).unwrap_or("png")
+            };
+            budget.alloc(data.len() as u64)?;
+            sheet.images.push(Image {
+                anchor: a,
+                ext,
+                data: data.clone(),
+                name: f.attr("draw:name").unwrap_or("Picture").to_string(),
+            });
+        } else if f.child("draw:text-box").is_some() {
+            let mut s = shape(f, cell, &g, doc, 0);
+            for x in &mut s {
+                x.geom = "rect";
+            }
+            sheet.shapes.extend(s);
+        }
+    }
+    Ok(())
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/formula.rs b/crates/exav-render/src/formats/office/sheets/ods/formula.rs
new file mode 100644
index 00000000..15c515de
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/formula.rs
@@ -0,0 +1,606 @@
+//! OpenFormula (ODF 1.2 part 2) to Excel A1 formula syntax.
+//!
+//! References `[.A1]`, `[$Sheet2.A1:.B2]`, `['My sheet'.A1]` become `A1`,
+//! `Sheet2!A1:B2`, `'My sheet'!A1`; `;` separates arguments, `~` is the
+//! union operator and `!` the intersection; array constants use `;` and `|`.
+
+use crate::formats::office::sheets::xls::formula::{quote_external, quote_sheet};
+
+/// Function names that differ between OpenFormula and Excel.
+const RENAME: &[(&str, &str)] = &[
+    ("CEILING.XCL", "CEILING"),
+    ("FLOOR.XCL", "FLOOR"),
+    ("COM.MICROSOFT.CEILING.MATH", "_xlfn.CEILING.MATH"),
+    ("COM.MICROSOFT.FLOOR.MATH", "_xlfn.FLOOR.MATH"),
+    ("CHISQDIST", "_xlfn.CHISQ.DIST"),
+    ("CHISQINV", "_xlfn.CHISQ.INV"),
+    ("LEGACY.CHIDIST", "CHIDIST"),
+    ("LEGACY.CHIINV", "CHIINV"),
+    ("LEGACY.CHITEST", "CHITEST"),
+    ("LEGACY.FDIST", "FDIST"),
+    ("LEGACY.FINV", "FINV"),
+    ("LEGACY.FTEST", "FTEST"),
+    ("LEGACY.NORMSDIST", "NORMSDIST"),
+    ("LEGACY.NORMSINV", "NORMSINV"),
+    ("LEGACY.TDIST", "TDIST"),
+    ("LEGACY.TINV", "TINV"),
+    ("MULTIPLE.OPERATIONS", "TABLE"),
+    ("FORMULA", "_xlfn.FORMULATEXT"),
+];
+
+/// Functions Excel 2010 and later added: `_xlfn.` in XLSX. OpenFormula
+/// files name them with `COM.MICROSOFT.` or plainly.
+pub(crate) const XLFN: &[&str] = &[
+    "AGGREGATE",
+    "BETA.DIST",
+    "BETA.INV",
+    "BINOM.DIST",
+    "BINOM.INV",
+    "BINOM.DIST.RANGE",
+    "BITAND",
+    "BITLSHIFT",
+    "BITOR",
+    "BITRSHIFT",
+    "BITXOR",
+    "CEILING.MATH",
+    "CEILING.PRECISE",
+    "CHISQ.DIST",
+    "CHISQ.DIST.RT",
+    "CHISQ.INV",
+    "CHISQ.INV.RT",
+    "CHISQ.TEST",
+    "COMBINA",
+    "CONCAT",
+    "CONFIDENCE.NORM",
+    "CONFIDENCE.T",
+    "COT",
+    "COTH",
+    "COVARIANCE.P",
+    "COVARIANCE.S",
+    "CSC",
+    "CSCH",
+    "DAYS",
+    "DECIMAL",
+    "ERF.PRECISE",
+    "ERFC.PRECISE",
+    "EXPON.DIST",
+    "F.DIST",
+    "F.DIST.RT",
+    "F.INV",
+    "F.INV.RT",
+    "F.TEST",
+    "FILTERXML",
+    "FLOOR.MATH",
+    "FLOOR.PRECISE",
+    "FORECAST.ETS",
+    "FORECAST.ETS.CONFINT",
+    "FORECAST.ETS.SEASONALITY",
+    "FORECAST.ETS.STAT",
+    "FORECAST.LINEAR",
+    "FORMULATEXT",
+    "GAMMA",
+    "GAMMA.DIST",
+    "GAMMA.INV",
+    "GAMMALN.PRECISE",
+    "GAUSS",
+    "HYPGEOM.DIST",
+    "IFNA",
+    "IFS",
+    "IMCOSH",
+    "IMCOT",
+    "IMCSC",
+    "IMCSCH",
+    "IMSEC",
+    "IMSECH",
+    "IMSINH",
+    "IMTAN",
+    "ISFORMULA",
+    "ISOWEEKNUM",
+    "LOGNORM.DIST",
+    "LOGNORM.INV",
+    "MAXIFS",
+    "MINIFS",
+    "MODE.MULT",
+    "MODE.SNGL",
+    "MUNIT",
+    "NEGBINOM.DIST",
+    "NETWORKDAYS.INTL",
+    "NORM.DIST",
+    "NORM.INV",
+    "NORM.S.DIST",
+    "NORM.S.INV",
+    "NUMBERVALUE",
+    "PDURATION",
+    "PERCENTILE.EXC",
+    "PERCENTILE.INC",
+    "PERCENTRANK.EXC",
+    "PERCENTRANK.INC",
+    "PERMUTATIONA",
+    "PHI",
+    "POISSON.DIST",
+    "QUARTILE.EXC",
+    "QUARTILE.INC",
+    "RANK.AVG",
+    "RANK.EQ",
+    "RRI",
+    "SEC",
+    "SECH",
+    "SHEET",
+    "SHEETS",
+    "SKEW.P",
+    "STDEV.P",
+    "STDEV.S",
+    "SWITCH",
+    "T.DIST",
+    "T.DIST.2T",
+    "T.DIST.RT",
+    "T.INV",
+    "T.INV.2T",
+    "T.TEST",
+    "TEXTJOIN",
+    "UNICHAR",
+    "UNICODE",
+    "VAR.P",
+    "VAR.S",
+    "WEBSERVICE",
+    "WEIBULL.DIST",
+    "WORKDAY.INTL",
+    "XOR",
+    "Z.TEST",
+    "ACOT",
+    "ACOTH",
+    "ARABIC",
+    "BASE",
+    "ENCODEURL",
+    "XLOOKUP",
+    "XMATCH",
+    "SORT",
+    "SORTBY",
+    "FILTER",
+    "UNIQUE",
+    "SEQUENCE",
+    "RANDARRAY",
+    "LET",
+];
+
+/// Formula text past this length is not converted.
+const MAX_LEN: usize = 65_536;
+
+/// Converts formulas, numbering the external documents they name as
+/// externalLink parts are numbered.
+#[derive(Default)]
+pub struct Converter {
+    external: Vec<String>,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+enum T {
+    Ref(String),
+    Str(String),
+    Num(String),
+    Func(String),
+    Name(String),
+    Op(String),
+    Open,
+    Close,
+    Sep,
+    ArrOpen,
+    ArrClose,
+    ArrCol,
+    ArrRow,
+    Space,
+}
+
+/// One part of a reference: its sheet, if any, and its cell, column or row.
+fn ref_part(s: &str) -> (Option<String>, String) {
+    let s = s.trim();
+    if let Some(rest) = s.strip_prefix('.') {
+        return (None, rest.to_string());
+    }
+    let t = s.strip_prefix('$').unwrap_or(s);
+    if let Some(q) = t.strip_prefix('\'') {
+        // Quoted: up to the closing quote that is not doubled.
+        let mut name = String::new();
+        let mut it = q.char_indices().peekable();
+        let mut end = q.len();
+        while let Some((i, c)) = it.next() {
+            if c == '\'' {
+                if it.peek().map(|x| x.1) == Some('\'') {
+                    it.next();
+                    name.push('\'');
+                    continue;
+                }
+                end = i + 1;
+                break;
+            }
+            name.push(c);
+        }
+        let rest = &q[end.min(q.len())..];
+        return match rest
+            .strip_prefix('#')
+            .and_then(|r| r.rfind('.').map(|d| (r, d)))
+        {
+            // 'document'#$Sheet.A1: another document's sheet.
+            Some((r, d)) => (Some(format!("{name}#{}", &r[..d])), r[d + 1..].to_string()),
+            None => (Some(name), rest.trim_start_matches('.').to_string()),
+        };
+    }
+    match t.rfind('.') {
+        Some(dot) => (Some(t[..dot].to_string()), t[dot + 1..].to_string()),
+        None => (None, t.to_string()),
+    }
+}
+
+impl Converter {
+    fn external_index(&mut self, doc: &str) -> usize {
+        match self.external.iter().position(|d| d == doc) {
+            Some(i) => i + 1,
+            None => {
+                self.external.push(doc.to_string());
+                self.external.len()
+            }
+        }
+    }
+
+    /// `[...]` reference contents to Excel text.
+    fn convert_ref(&mut self, inner: &str) -> String {
+        let inner = inner.trim();
+        if inner.contains("#REF!") {
+            return "#REF!".into();
+        }
+        let mut parts = vec![];
+        let mut cur = String::new();
+        let mut q = false;
+        for c in inner.chars() {
+            match c {
+                '\'' => {
+                    q = !q;
+                    cur.push(c);
+                }
+                ':' if !q => parts.push(std::mem::take(&mut cur)),
+                _ => cur.push(c),
+            }
+        }
+        parts.push(cur);
+        let conv: Vec<(Option<String>, String)> =
+            parts.iter().take(2).map(|p| ref_part(p)).collect();
+        let (s1, c1) = &conv[0];
+        let mut out = String::new();
+        if let Some(s) = s1 {
+            if let Some((doc, sheet)) = s.split_once('#') {
+                let sheet = sheet.trim_start_matches('$');
+                let n = self.external_index(doc.trim_matches('\''));
+                out += &format!("{}!{c1}", quote_external(n, sheet));
+                if let Some((_, c2)) = conv.get(1) {
+                    out.push(':');
+                    out += c2;
+                }
+                return out;
+            }
+            out += &quote_sheet(s);
+            if let Some((Some(s2), _)) = conv.get(1)
+                && s2 != s
+            {
+                // Sheet1:Sheet3!A1, quoted whole when either name needs it.
+                out = if quote_sheet(s) == *s && quote_sheet(s2) == *s2 {
+                    format!("{s}:{s2}")
+                } else {
+                    format!("'{}:{}'", s.replace('\'', "''"), s2.replace('\'', "''"))
+                };
+            }
+            out.push('!');
+        }
+        out += c1;
+        if let Some((_, c2)) = conv.get(1) {
+            out.push(':');
+            out += c2;
+        }
+        out
+    }
+
+    fn tokenize(&mut self, f: &str) -> Option<Vec<T>> {
+        let ch: Vec<char> = f.chars().collect();
+        let mut i = 0;
+        let mut out = vec![];
+        while i < ch.len() {
+            let c = ch[i];
+            match c {
+                ' ' | '\n' | '\r' | '\t' => {
+                    out.push(T::Space);
+                    i += 1;
+                }
+                '"' => {
+                    let mut s = String::new();
+                    i += 1;
+                    loop {
+                        if i >= ch.len() {
+                            return None;
+                        }
+                        if ch[i] == '"' {
+                            if i + 1 < ch.len() && ch[i + 1] == '"' {
+                                s.push('"');
+                                i += 2;
+                                continue;
+                            }
+                            i += 1;
+                            break;
+                        }
+                        s.push(ch[i]);
+                        i += 1;
+                    }
+                    out.push(T::Str(s));
+                }
+                '[' => {
+                    let mut depth = 0;
+                    let mut s = String::new();
+                    i += 1;
+                    let mut q = false;
+                    while i < ch.len() {
+                        let d = ch[i];
+                        if d == '\'' {
+                            q = !q;
+                        }
+                        if !q && d == '[' {
+                            depth += 1;
+                        }
+                        if !q && d == ']' {
+                            if depth == 0 {
+                                break;
+                            }
+                            depth -= 1;
+                        }
+                        s.push(d);
+                        i += 1;
+                    }
+                    i += 1;
+                    out.push(T::Ref(self.convert_ref(&s)));
+                }
+                '(' => {
+                    out.push(T::Open);
+                    i += 1;
+                }
+                ')' => {
+                    out.push(T::Close);
+                    i += 1;
+                }
+                ';' => {
+                    out.push(if in_array(&out) { T::ArrCol } else { T::Sep });
+                    i += 1;
+                }
+                '|' => {
+                    out.push(T::ArrRow);
+                    i += 1;
+                }
+                '{' => {
+                    out.push(T::ArrOpen);
+                    i += 1;
+                }
+                '}' => {
+                    out.push(T::ArrClose);
+                    i += 1;
+                }
+                '~' => {
+                    out.push(T::Op(",".into()));
+                    i += 1;
+                }
+                '!' => {
+                    out.push(T::Op(" ".into()));
+                    i += 1;
+                }
+                '<' | '>' | '=' => {
+                    let mut s = c.to_string();
+                    if i + 1 < ch.len() && (ch[i + 1] == '=' || (c == '<' && ch[i + 1] == '>')) {
+                        s.push(ch[i + 1]);
+                        i += 1;
+                    }
+                    out.push(T::Op(s));
+                    i += 1;
+                }
+                '+' | '-' | '*' | '/' | '^' | '&' | '%' => {
+                    out.push(T::Op(c.to_string()));
+                    i += 1;
+                }
+                '#' => {
+                    let mut s = String::new();
+                    while i < ch.len() && !matches!(ch[i], ';' | ')' | ' ' | ',' | '}' | '|') {
+                        s.push(ch[i]);
+                        i += 1;
+                        if s.ends_with('!') || s.ends_with('?') || s == "#N/A" {
+                            break;
+                        }
+                    }
+                    out.push(T::Name(s));
+                }
+                c if c.is_ascii_digit()
+                    || (c == '.' && i + 1 < ch.len() && ch[i + 1].is_ascii_digit()) =>
+                {
+                    let mut s = String::new();
+                    while i < ch.len() && (ch[i].is_ascii_digit() || ch[i] == '.') {
+                        s.push(ch[i]);
+                        i += 1;
+                    }
+                    if i + 1 < ch.len()
+                        && (ch[i] == 'E' || ch[i] == 'e')
+                        && (ch[i + 1].is_ascii_digit() || ch[i + 1] == '+' || ch[i + 1] == '-')
+                    {
+                        s.push('E');
+                        i += 1;
+                        if ch[i] == '+' || ch[i] == '-' {
+                            s.push(ch[i]);
+                            i += 1;
+                        }
+                        while i < ch.len() && ch[i].is_ascii_digit() {
+                            s.push(ch[i]);
+                            i += 1;
+                        }
+                    }
+                    out.push(T::Num(s));
+                }
+                '\'' => {
+                    let mut s = String::from("'");
+                    i += 1;
+                    while i < ch.len() {
+                        s.push(ch[i]);
+                        i += 1;
+                        if ch[i - 1] == '\'' {
+                            break;
+                        }
+                    }
+                    out.push(T::Name(s));
+                }
+                c if c.is_alphanumeric() || c == '_' || c == '$' || c == '\\' => {
+                    let mut s = String::new();
+                    while i < ch.len()
+                        && (ch[i].is_alphanumeric() || matches!(ch[i], '_' | '.' | '$' | '\\'))
+                    {
+                        s.push(ch[i]);
+                        i += 1;
+                    }
+                    let mut j = i;
+                    while j < ch.len() && ch[j] == ' ' {
+                        j += 1;
+                    }
+                    if j < ch.len() && ch[j] == '(' {
+                        out.push(T::Func(s));
+                        i = j;
+                    } else {
+                        out.push(T::Name(s));
+                    }
+                }
+                _ => {
+                    out.push(T::Name(c.to_string()));
+                    i += 1;
+                }
+            }
+        }
+        Some(out)
+    }
+
+    /// Converts `f` (with or without its `of:=` prefix). `None` for a
+    /// formula in another syntax this does not read.
+    pub fn convert(&mut self, f: &str) -> Option<String> {
+        if f.len() > MAX_LEN {
+            return None;
+        }
+        let body = if let Some(b) = f.strip_prefix("of:") {
+            b
+        } else if let Some(b) = f.strip_prefix("oooc:") {
+            b
+        } else if let Some(b) = f.strip_prefix("msoxl:") {
+            return Some(b.trim_start_matches('=').to_string());
+        } else if f
+            .find(':')
+            .is_some_and(|c| f.find('=').is_none_or(|e| c < e))
+        {
+            return None;
+        } else {
+            f
+        };
+        let body = body.trim_start();
+        let body = body.strip_prefix('=').unwrap_or(body);
+        let toks = self.tokenize(body)?;
+        let mut out = String::new();
+        for (k, t) in toks.iter().enumerate() {
+            match t {
+                T::Ref(r) => out += r,
+                T::Str(s) => {
+                    out.push('"');
+                    out += &s.replace('"', "\"\"");
+                    out.push('"');
+                }
+                T::Num(n) => out += n,
+                T::Func(n) => out += &func_name(n),
+                T::Name(n) => out += n,
+                T::Op(o) => out += o,
+                T::Open => out.push('('),
+                T::Close => out.push(')'),
+                T::Sep | T::ArrCol => out.push(','),
+                T::ArrOpen => out.push('{'),
+                T::ArrClose => out.push('}'),
+                T::ArrRow => out.push(';'),
+                T::Space => {
+                    // A space between two operands is an intersection in Excel's
+                    // syntax: kept only there.
+                    let prev = toks[..k].iter().rev().find(|t| **t != T::Space);
+                    let next = toks[k + 1..].iter().find(|t| **t != T::Space);
+                    if matches!(prev, Some(T::Ref(_) | T::Name(_)))
+                        && matches!(next, Some(T::Ref(_) | T::Name(_)))
+                    {
+                        out.push(' ');
+                    }
+                }
+            }
+        }
+        Some(out)
+    }
+}
+
+fn in_array(toks: &[T]) -> bool {
+    let mut depth = 0i32;
+    for t in toks.iter().rev() {
+        match t {
+            T::ArrClose => depth += 1,
+            T::ArrOpen => {
+                if depth == 0 {
+                    return true;
+                }
+                depth -= 1;
+            }
+            _ => {}
+        }
+    }
+    false
+}
+
+fn func_name(n: &str) -> String {
+    let up = n.to_ascii_uppercase();
+    if let Some(&(_, to)) = RENAME.iter().find(|(f, _)| *f == up) {
+        return to.to_string();
+    }
+    let bare = up.strip_prefix("COM.MICROSOFT.").unwrap_or(&up);
+    if XLFN.contains(&bare) {
+        return format!("_xlfn.{bare}");
+    }
+    // The application's own functions keep their names, as future functions.
+    if up.starts_with("ORG.OPENOFFICE.") || up.starts_with("ORG.LIBREOFFICE.") {
+        return format!("_xlfn.{up}");
+    }
+    if up.starts_with("COM.SUN.STAR.") {
+        return n.to_string();
+    }
+    bare.to_string()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Converter;
+
+    #[test]
+    fn refs() {
+        let mut c = Converter::default();
+        assert_eq!(c.convert("of:=SUM([.A1:.B2])").unwrap(), "SUM(A1:B2)");
+        assert_eq!(c.convert("of:=[$Sheet2.$A$1]+1").unwrap(), "Sheet2!$A$1+1");
+        assert_eq!(c.convert("of:=['My sheet'.A1];").unwrap(), "'My sheet'!A1,");
+        assert_eq!(
+            c.convert("of:=IF([.A1]>1;\"a\";\"b\")").unwrap(),
+            "IF(A1>1,\"a\",\"b\")"
+        );
+        assert_eq!(c.convert("of:={1;2|3;4}").unwrap(), "{1,2;3,4}");
+        assert_eq!(c.convert("of:=[.A1:.A3]~[.C1]").unwrap(), "A1:A3,C1");
+        assert_eq!(
+            c.convert("of:=[Sheet1.A1:Sheet3.B2]").unwrap(),
+            "Sheet1:Sheet3!A1:B2"
+        );
+        assert_eq!(c.convert("of:=TRUE()").unwrap(), "TRUE()");
+        assert_eq!(
+            c.convert("of:=['file:///a.ods'#$Sheet1.A1]").unwrap(),
+            "[1]Sheet1!A1"
+        );
+        assert_eq!(
+            c.convert("of:=['file:///b.ods'#$Sheet1.A1]+['file:///a.ods'#$S.B2]")
+                .unwrap(),
+            "[2]Sheet1!A1+[1]S!B2"
+        );
+        assert!(c.convert("of:=\"unterminated").is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/mod.rs b/crates/exav-render/src/formats/office/sheets/ods/mod.rs
new file mode 100644
index 00000000..69ab0956
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/mod.rs
@@ -0,0 +1,734 @@
+//! ODS, OTS and flat ODS (FODS) reader (ODF 1.2 and 1.3, with the
+//! calcext extensions some producers write).
+
+mod cf;
+pub(crate) mod chart;
+mod draw;
+pub(crate) mod formula;
+mod numfmt;
+mod styles;
+mod table;
+
+use crate::formats::office::common::xml::{self, Child, Node};
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use std::collections::HashMap;
+use std::io::Read;
+use styles::{Props, Styles};
+
+/// A ZIP package's members, read within the limits.
+pub(crate) struct Zip<'a> {
+    z: zip::ZipArchive<std::io::Cursor<&'a [u8]>>,
+}
+
+impl<'a> Zip<'a> {
+    pub fn open(bytes: &'a [u8]) -> Result<Zip<'a>> {
+        let z = zip::ZipArchive::new(std::io::Cursor::new(bytes))
+            .map_err(|e| Error::NotFormat(format!("not a ZIP package: {e}")))?;
+        Ok(Zip { z })
+    }
+
+    pub fn names(&self) -> Vec<String> {
+        self.z
+            .file_names()
+            .take(1 << 16)
+            .filter_map(|s| s.ok().map(|s| s.to_string()))
+            .collect()
+    }
+
+    /// A member, `None` when absent or unreadable; past `max` bytes, an
+    /// error.
+    pub fn get(&mut self, name: &str, max: u64, budget: &mut Budget) -> Result<Option<Vec<u8>>> {
+        let Ok(f) = self.z.by_name(name) else {
+            return Ok(None);
+        };
+        if f.encrypted() {
+            return Err(Error::Encrypted);
+        }
+        let mut v = Vec::new();
+        let n = f.take(max + 1).read_to_end(&mut v);
+        if n.is_err() {
+            return Ok(None);
+        }
+        if v.len() as u64 > max {
+            return Err(Error::TooLarge("a package part"));
+        }
+        budget.alloc(v.len() as u64)?;
+        Ok(Some(v))
+    }
+}
+
+pub(crate) fn read_ods(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let mut z = Zip::open(bytes)?;
+    let max = budget.limits.max_part;
+    if let Some(m) = z.get("mimetype", 256, budget)? {
+        let m = String::from_utf8_lossy(&m);
+        if !m.contains("spreadsheet") {
+            return Err(Error::NotFormat(format!(
+                "an OpenDocument file of type {}",
+                m.trim()
+            )));
+        }
+    }
+    // Encrypted when content.xml is (a password on Basic libraries alone
+    // encrypts only those).
+    if let Some(m) = z.get("META-INF/manifest.xml", 16 << 20, budget)? {
+        let m = String::from_utf8_lossy(&m);
+        if let Some(i) = m.find("manifest:full-path=\"content.xml\"") {
+            let entry = &m[i..];
+            let end = entry
+                .find("</manifest:file-entry>")
+                .or_else(|| entry.find("/>"))
+                .unwrap_or(entry.len());
+            if entry[..end].contains("encryption-data") {
+                return Err(Error::Encrypted);
+            }
+        }
+    }
+    let content = z
+        .get("content.xml", max, budget)?
+        .ok_or_else(|| Error::NotFormat("no content.xml".into()))?;
+    let styles = z.get("styles.xml", max, budget)?;
+    let settings = z.get("settings.xml", max, budget)?;
+    let content = xml::parse(&content, &mut budget.tree())?;
+    let styles = match styles {
+        Some(s) => xml::parse(&s, &mut budget.tree()).ok(),
+        None => None,
+    };
+    let settings = settings.and_then(|s| xml::parse(&s, &mut budget.tree()).ok());
+    let mut parts: HashMap<String, Vec<u8>> = HashMap::new();
+    for n in z.names() {
+        let name = n.trim_start_matches("./").to_string();
+        let object = name.starts_with("Object ") && name.ends_with("/content.xml");
+        let picture = name.starts_with("Pictures/")
+            || name.starts_with("media/")
+            || name.starts_with("ObjectReplacements/");
+        if (object || picture)
+            && let Some(v) = z.get(&n, 64 << 20, budget)?
+        {
+            parts.insert(name, v);
+        }
+    }
+    read_doc(&content, styles.as_ref(), settings.as_ref(), &parts, budget)
+}
+
+pub(crate) fn read_fods(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let doc = xml::parse(bytes, &mut budget.tree())?;
+    if doc.name != "office:document" {
+        return Err(Error::NotFormat(format!(
+            "not a flat ODF document: {}",
+            doc.name
+        )));
+    }
+    if let Some(m) = doc.attr("office:mimetype")
+        && !m.contains("spreadsheet")
+    {
+        return Err(Error::NotFormat(format!(
+            "a flat OpenDocument file of type {m}"
+        )));
+    }
+    let settings = doc.child("office:settings");
+    read_doc(&doc, None, settings, &HashMap::new(), budget)
+}
+
+// ------------------------------------------------------------ text helpers
+
+/// The text of a node, spaces, tabs and line breaks included, notes not.
+pub(crate) fn text_of(n: &Node, out: &mut String) {
+    for c in &n.children {
+        if out.len() > 1 << 20 {
+            return;
+        }
+        match c {
+            Child::Text(t) => out.push_str(t),
+            Child::Node(x) => match x.name.as_str() {
+                "text:s" => {
+                    let k = x
+                        .attr("text:c")
+                        .and_then(|v| v.parse::<usize>().ok())
+                        .unwrap_or(1)
+                        .min(1000);
+                    out.push_str(&" ".repeat(k));
+                }
+                "text:tab" => out.push('\t'),
+                "text:line-break" => out.push('\n'),
+                "office:annotation" | "text:note" | "office:annotation-end" => {}
+                _ => text_of(x, out),
+            },
+        }
+    }
+}
+
+/// The paragraphs of a node, joined by line feeds.
+pub(crate) fn paragraphs(n: &Node) -> String {
+    let mut out = String::new();
+    let mut first = true;
+    for p in n.nodes() {
+        if matches!(p.name.as_str(), "text:p" | "text:h" | "text:list") {
+            if !first {
+                out.push('\n');
+            }
+            first = false;
+            text_of(p, &mut out);
+        }
+    }
+    out
+}
+
+pub(crate) fn days_from_civil(y: i64, m: i64, d: i64) -> i64 {
+    let y = if m <= 2 { y - 1 } else { y };
+    let era = if y >= 0 { y } else { y - 399 } / 400;
+    let yoe = y - era * 400;
+    let mp = (m + 9) % 12;
+    let doy = (153 * mp + 2) / 5 + d - 1;
+    let doe = yoe * 365 + yoe / 4 - yoe / 100 + doy;
+    era * 146097 + doe - 719468
+}
+
+/// An xsd:dateTime to a serial date counted from `null`.
+pub(crate) fn parse_date(s: &str, null: (i64, i64, i64)) -> Option<f64> {
+    let (date, time) = match s.find('T') {
+        Some(i) => (&s[..i], Some(&s[i + 1..])),
+        None => (s, None),
+    };
+    let neg = date.starts_with('-');
+    let mut it = date.trim_start_matches('-').split('-');
+    let mut y: i64 = it.next()?.parse().ok()?;
+    if neg {
+        y = -y;
+    }
+    let m: i64 = it.next()?.parse().ok()?;
+    let d: i64 = it.next().unwrap_or("1").parse().ok()?;
+    if !(1..=12).contains(&m) || !(1..=31).contains(&d) || y.abs() > 100_000 {
+        return None;
+    }
+    let days = days_from_civil(y, m, d) - days_from_civil(null.0, null.1, null.2);
+    let mut frac = 0.0;
+    if let Some(t) = time {
+        let t = t.trim_end_matches('Z');
+        let mut p = t.split(':');
+        let h: f64 = p.next().and_then(|v| v.parse().ok()).unwrap_or(0.0);
+        let mi: f64 = p.next().and_then(|v| v.parse().ok()).unwrap_or(0.0);
+        let se: f64 = p
+            .next()
+            .and_then(|v| v.split(['+', '-']).next()?.parse().ok())
+            .unwrap_or(0.0);
+        frac = (h * 3600.0 + mi * 60.0 + se) / 86400.0;
+    }
+    Some(days as f64 + frac)
+}
+
+/// "PT12H30M15S" or "P1DT2H" to a fraction of days.
+pub(crate) fn parse_duration(s: &str) -> Option<f64> {
+    let neg = s.starts_with('-');
+    let s = s.trim_start_matches('-').strip_prefix('P')?;
+    let mut days = 0.0;
+    let mut num = String::new();
+    let mut in_time = false;
+    for c in s.chars() {
+        match c {
+            'T' => in_time = true,
+            '0'..='9' | '.' => num.push(c),
+            'D' | 'H' | 'S' | 'M' if !num.is_empty() => {
+                let v: f64 = num.parse().ok()?;
+                num.clear();
+                days += match c {
+                    'D' => v,
+                    'H' => v / 24.0,
+                    'M' if in_time => v / 1440.0,
+                    'M' => v * 30.0,
+                    _ => v / 86400.0,
+                };
+            }
+            'Y' if !num.is_empty() => {
+                days += num.parse::<f64>().ok()? * 365.0;
+                num.clear();
+            }
+            _ => return None,
+        }
+    }
+    Some(if neg { -days } else { days })
+}
+
+/// "Sheet1.A1" or "$Sheet1.$A$1" to (sheet, row, col).
+pub(crate) fn parse_addr(s: &str) -> Option<(String, u32, u32)> {
+    let s = s.trim();
+    let dot = s.rfind('.')?;
+    let sheet = s[..dot]
+        .trim_start_matches('$')
+        .trim_matches('\'')
+        .replace("''", "'");
+    let (r, c) = parse_cell(&s[dot + 1..])?;
+    Some((sheet, r, c))
+}
+
+/// "Sheet1.A1:Sheet1.B2", "Sheet1.A1:.B2" or "Sheet1.A1" to (sheet, range).
+pub(crate) fn parse_range_addr(s: &str) -> Option<(String, Range)> {
+    let s = s.trim();
+    let mut parts = s.splitn(2, ':');
+    let a = parse_addr(parts.next()?)?;
+    let b = match parts.next() {
+        Some(p) if p.starts_with('.') => {
+            let (r, c) = parse_cell(&p[1..])?;
+            (a.0.clone(), r, c)
+        }
+        Some(p) => parse_addr(p)?,
+        None => a.clone(),
+    };
+    Some((
+        a.0,
+        Range {
+            r1: a.1.min(b.1),
+            c1: a.2.min(b.2),
+            r2: a.1.max(b.1),
+            c2: a.2.max(b.2),
+        },
+    ))
+}
+
+struct Settings {
+    active: Option<String>,
+    per_table: HashMap<String, HashMap<String, String>>,
+    global: HashMap<String, String>,
+}
+
+fn read_settings(s: Option<&Node>) -> Settings {
+    let mut out = Settings {
+        active: None,
+        per_table: HashMap::new(),
+        global: HashMap::new(),
+    };
+    let Some(s) = s else { return out };
+    fn items(n: &Node, into: &mut HashMap<String, String>) {
+        for i in n.all("config:config-item") {
+            if let Some(k) = i.attr("config:name") {
+                into.insert(k.to_string(), i.own_text());
+            }
+        }
+    }
+    fn walk(n: &Node, out: &mut Settings, depth: u32) {
+        if depth > 32 {
+            return;
+        }
+        for c in n.nodes() {
+            if c.name == "config:config-item-map-named" && c.attr("config:name") == Some("Tables") {
+                for e in c.all("config:config-item-map-entry") {
+                    if let Some(name) = e.attr("config:name") {
+                        let mut m = HashMap::new();
+                        items(e, &mut m);
+                        out.per_table.insert(name.to_string(), m);
+                    }
+                }
+                continue;
+            }
+            if c.name == "config:config-item-map-entry" && out.global.is_empty() {
+                items(c, &mut out.global);
+            }
+            walk(c, out, depth + 1);
+        }
+    }
+    walk(s, &mut out, 0);
+    out.active = out.global.get("ActiveTable").cloned();
+    out
+}
+
+/// An embedded object to read once every sheet is: where it is, its
+/// directory in the package, and the picture that stands for it.
+pub(crate) type PendingChart = (Anchor, String, Option<Image>);
+
+/// What reading a table needs from the document.
+pub(crate) struct Doc<'a> {
+    pub st: Styles,
+    pub fc: formula::Converter,
+    pub null: (i64, i64, i64),
+    pub text_styles: HashMap<String, Props>,
+    pub parts: &'a HashMap<String, Vec<u8>>,
+    pub validations: HashMap<String, Validation>,
+    pub style_ids: HashMap<String, u32>,
+    /// The cells of the table being read whose style has conditions
+    /// (style:map), by style: model styles do not tell them apart.
+    pub map_cells: HashMap<String, Vec<(u32, u32)>>,
+}
+
+impl Doc<'_> {
+    /// Notes the cell at `r`, `c` when its style `name` has conditions.
+    pub fn note_maps(&mut self, name: Option<&str>, r: u32, c: u32) {
+        let name = name.unwrap_or("Default");
+        if self.st.defs.get(name).is_some_and(|d| !d.maps.is_empty()) {
+            self.map_cells
+                .entry(name.to_string())
+                .or_default()
+                .push((r, c));
+        }
+    }
+
+    /// The model style of a cell style, interned.
+    pub fn sid(&mut self, wb: &mut Workbook, name: Option<&str>) -> u32 {
+        let name = name.unwrap_or("Default");
+        if let Some(&i) = self.style_ids.get(name) {
+            return i;
+        }
+        let p = self.st.resolve(name);
+        let i = wb.styles.add(self.st.to_style(&p));
+        if self.style_ids.len() < 1 << 16 {
+            self.style_ids.insert(name.to_string(), i);
+        }
+        i
+    }
+}
+
+fn read_doc(
+    content: &Node,
+    styles_doc: Option<&Node>,
+    settings: Option<&Node>,
+    parts: &HashMap<String, Vec<u8>>,
+    budget: &mut Budget,
+) -> Result<Workbook> {
+    let mut roots: Vec<&Node> = vec![];
+    if let Some(s) = styles_doc {
+        roots.push(s);
+    }
+    roots.push(content);
+    let mut st = Styles::collect(&roots);
+    let body = content
+        .child("office:body")
+        .ok_or_else(|| Error::NotFormat("no office:body".into()))?;
+    let ss = body
+        .child("office:spreadsheet")
+        .ok_or_else(|| Error::NotFormat("not a spreadsheet".into()))?;
+    let settings = read_settings(settings);
+    let default_style = {
+        let p = if st.defs.contains_key("Default") {
+            st.resolve("Default")
+        } else {
+            st.default.clone()
+        };
+        st.to_style(&p)
+    };
+    let mut wb = Workbook::new(default_style);
+
+    let mut null = (1899, 12, 30);
+    if let Some(v) = ss
+        .child("table:calculation-settings")
+        .and_then(|cs| cs.child("table:null-date"))
+        .and_then(|nd| nd.attr("table:date-value"))
+    {
+        let p: Vec<i64> = v.split('-').filter_map(|x| x.parse().ok()).collect();
+        if p.len() == 3
+            && (1..=12).contains(&p[1])
+            && (1..=31).contains(&p[2])
+            && p[0].abs() < 10_000
+        {
+            null = (p[0], p[1], p[2]);
+        }
+    }
+    if null == (1904, 1, 1) {
+        wb.date1904 = true;
+    }
+    let mut text_styles: HashMap<String, Props> = HashMap::new();
+    for ((fam, name), node) in &st.other {
+        if fam == "text" {
+            let mut p = Props::default();
+            if let Some(tp) = node.child("style:text-properties") {
+                styles::text_props(tp, &st.fonts, &mut p);
+            }
+            text_styles.insert(name.clone(), p);
+        }
+    }
+    let mut doc = Doc {
+        st,
+        fc: formula::Converter::default(),
+        null,
+        text_styles,
+        parts,
+        validations: HashMap::new(),
+        style_ids: HashMap::new(),
+        map_cells: HashMap::new(),
+    };
+    if let Some(cv) = ss.child("table:content-validations") {
+        for v in cv.all("table:content-validation") {
+            if let (Some(name), Some(val)) =
+                (v.attr("table:name"), cf::read_validation(v, &mut doc.fc))
+            {
+                doc.validations.insert(name.to_string(), val);
+            }
+        }
+    }
+
+    // The cached copies of other documents' sheets that external references
+    // read from are not sheets of this one (the application does not show
+    // them); a sheet linked to another document is.
+    let tables: Vec<&Node> = ss
+        .all("table:table")
+        .filter(|t| {
+            !(t.child("table:table-source").is_some()
+                && t.attr("table:name")
+                    .is_some_and(|n| n.starts_with('\'') && n.contains("'#")))
+        })
+        .collect();
+    if tables.len() > budget.limits.max_sheets as usize {
+        return Err(Error::TooLarge("sheets"));
+    }
+    let sheet_names: Vec<String> = tables
+        .iter()
+        .map(|t| t.attr("table:name").unwrap_or("Sheet").to_string())
+        .collect();
+    let mut pending_charts: Vec<Vec<PendingChart>> = vec![];
+    for (ti, t) in tables.iter().enumerate() {
+        let mut sheet = Sheet::new(sheet_names[ti].clone());
+        sheet.default_row_height = 12.8;
+        if let Some(tp) = t
+            .attr("table:style-name")
+            .and_then(|sn| doc.st.other("table", sn))
+            .and_then(|ts| ts.child("style:table-properties"))
+        {
+            if tp.attr("table:display") == Some("false") {
+                sheet.state = SheetState::Hidden;
+            }
+            if let Some(c) = tp.attr("tableooo:tab-color").or(tp.attr("table:tab-color")) {
+                sheet.tab_color = styles::parse_color(c).flatten();
+            }
+            if tp.attr("style:writing-mode") == Some("rl-tb") {
+                sheet.rtl = true;
+            }
+        }
+        let mut charts = vec![];
+        table::read_table(t, &mut doc, &mut wb, budget, &mut sheet, &mut charts)?;
+        pending_charts.push(charts);
+        if let Some(m) = settings.per_table.get(&sheet.name) {
+            let g = |k: &str| m.get(k).and_then(|v| v.parse::<u32>().ok());
+            let (hm, hp, vm, vp) = (
+                g("HorizontalSplitMode"),
+                g("HorizontalSplitPosition"),
+                g("VerticalSplitMode"),
+                g("VerticalSplitPosition"),
+            );
+            let cols = if hm == Some(2) { hp.unwrap_or(0) } else { 0 };
+            let rows = if vm == Some(2) { vp.unwrap_or(0) } else { 0 };
+            if rows > 0 || cols > 0 {
+                sheet.freeze = Some((rows, cols));
+            }
+            if let Some(v) = m.get("ShowGrid") {
+                sheet.show_grid = v == "true";
+            }
+            if let Some(z) = g("ZoomValue") {
+                sheet.zoom = z;
+            }
+            if let Some(c) = m.get("TabColor").and_then(|v| v.parse::<i64>().ok())
+                && (0..0x100_0000).contains(&c)
+                && sheet.tab_color.is_none()
+            {
+                sheet.tab_color = Some(c as u32);
+            }
+        }
+        if settings
+            .per_table
+            .get(&sheet.name)
+            .and_then(|m| m.get("ShowGrid"))
+            .is_none()
+            && let Some(v) = settings.global.get("ShowGrid")
+        {
+            sheet.show_grid = v == "true";
+        }
+        if let Some(v) = settings.global.get("ShowZeroValues") {
+            sheet.show_zeros = v == "true";
+        }
+        if settings.active.as_deref() == Some(sheet.name.as_str()) {
+            wb.active = ti;
+        }
+        wb.sheets.push(sheet);
+    }
+    if wb.sheets.is_empty() {
+        return Err(Error::Malformed("no sheets".into()));
+    }
+    // Charts, once every sheet's values are known.
+    for (i, list) in pending_charts.into_iter().enumerate() {
+        for (anchor, href, fallback) in list {
+            let chart = match parts.get(&format!("{href}/content.xml")) {
+                Some(xml) => chart::read(xml, anchor, &wb.sheets, &mut budget.tree())?,
+                None => None,
+            };
+            match chart {
+                Some(c) => wb.sheets[i].charts.push(c),
+                None => wb.sheets[i].images.extend(fallback),
+            }
+        }
+    }
+    // Named ranges and expressions.
+    let add_names = |ne: &Node,
+                     scope: Option<usize>,
+                     wb: &mut Workbook,
+                     fc: &mut formula::Converter| {
+        for n in ne.nodes() {
+            let Some(name) = n.attr("table:name") else {
+                continue;
+            };
+            let f = match n.name.as_str() {
+                "table:named-range" => n
+                    .attr("table:cell-range-address")
+                    .map(|a| range_list(a, fc)),
+                "table:named-expression" => n.attr("table:expression").and_then(|e| fc.convert(e)),
+                _ => None,
+            };
+            if let Some(f) = f.filter(|f| !f.is_empty())
+                && wb.names.len() < 1 << 16
+            {
+                wb.names.push(DefinedName {
+                    name: name.to_string(),
+                    sheet: scope,
+                    formula: f,
+                    hidden: false,
+                });
+            }
+        }
+    };
+    if let Some(ne) = ss.child("table:named-expressions") {
+        add_names(ne, None, &mut wb, &mut doc.fc);
+    }
+    for (ti, t) in tables.iter().enumerate() {
+        if let Some(ne) = t.child("table:named-expressions") {
+            add_names(ne, Some(ti), &mut wb, &mut doc.fc);
+        }
+    }
+    if let Some(dr) = ss.child("table:database-ranges") {
+        for d in dr.all("table:database-range") {
+            if d.attr("table:display-filter-buttons") != Some("true") {
+                continue;
+            }
+            if let Some((sheet, r)) = d
+                .attr("table:target-range-address")
+                .and_then(parse_range_addr)
+                && let Some(s) = wb.sheets.iter_mut().find(|s| s.name == sheet)
+            {
+                s.autofilter = Some(r);
+            }
+        }
+    }
+    Ok(wb)
+}
+
+/// The addresses of a list separated by spaces; a quoted sheet name may
+/// hold spaces ("'My sheet'.A1:'My sheet'.B2 Other.C3").
+pub(crate) fn split_ranges(s: &str) -> impl Iterator<Item = &str> {
+    let mut rest = s;
+    std::iter::from_fn(move || {
+        rest = rest.trim_start();
+        if rest.is_empty() {
+            return None;
+        }
+        let mut quoted = false;
+        let end = rest
+            .char_indices()
+            .find(|&(_, c)| {
+                if c == '\'' {
+                    quoted = !quoted;
+                }
+                c.is_whitespace() && !quoted
+            })
+            .map_or(rest.len(), |(i, _)| i);
+        let (a, b) = rest.split_at(end);
+        rest = b;
+        Some(a)
+    })
+}
+
+/// "$Sheet1.$A$1:.$B$2 $Sheet1.C3" to "Sheet1!$A$1:$B$2,Sheet1!C3".
+fn range_list(s: &str, fc: &mut formula::Converter) -> String {
+    split_ranges(s)
+        .take(256)
+        .filter_map(|r| fc.convert(&format!("of:=[{r}]")))
+        .collect::<Vec<_>>()
+        .join(",")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn range_lists_keep_quoted_spaces() {
+        let v: Vec<&str> = split_ranges(" 'My sheet'.A1:'My sheet'.B2  Other.C3 ").collect();
+        assert_eq!(v, ["'My sheet'.A1:'My sheet'.B2", "Other.C3"]);
+        assert_eq!(
+            parse_range_addr(v[0]).map(|x| x.0).as_deref(),
+            Some("My sheet")
+        );
+    }
+
+    #[test]
+    fn style_conditions_cover_their_style_alone() {
+        // ce1 has a condition, ce2 looks the same and has none.
+        let fods = r##"<?xml version="1.0"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+<office:styles><style:style style:name="Hot" style:family="table-cell"><style:table-cell-properties fo:background-color="#ff0000"/></style:style></office:styles>
+<office:automatic-styles>
+<style:style style:name="ce1" style:family="table-cell"><style:map style:condition="cell-content()&gt;5" style:apply-style-name="Hot" style:base-cell-address="S.A1"/></style:style>
+<style:style style:name="ce2" style:family="table-cell"/>
+</office:automatic-styles>
+<office:body><office:spreadsheet><table:table table:name="S">
+<table:table-row><table:table-cell table:style-name="ce1" office:value-type="float" office:value="9"/><table:table-cell table:style-name="ce2" office:value-type="float" office:value="9"/></table:table-row>
+</table:table></office:spreadsheet></office:body></office:document>"##;
+        let wb = read_fods(
+            fods.as_bytes(),
+            &mut Budget::new(crate::formats::office::sheets::limits::Limits::default()),
+        )
+        .unwrap();
+        let cfs = &wb.sheets[0].cond_formats;
+        assert_eq!(cfs.len(), 1);
+        assert_eq!(cfs[0].ranges, [Range::cell(0, 0)]);
+    }
+
+    /// Checking what a styled empty cell shows along its width costs the
+    /// width for each row, so it is bounded over a workbook; past the bound
+    /// the formatting of the area is left out, with a warning.
+    #[test]
+    fn the_width_swept_for_styled_empty_cells_is_bounded() {
+        let row = r#"<table:table-row table:number-rows-repeated="1025"><table:table-cell table:style-name="ce1" table:number-columns-repeated="1048576"/></table:table-row>"#;
+        let fods = format!(
+            r##"<?xml version="1.0"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+<office:automatic-styles><style:style style:name="ce1" style:family="table-cell"/></office:automatic-styles>
+<office:body><office:spreadsheet><table:table table:name="S">{}<table:table-row><table:table-cell office:value-type="string"><text:p>end</text:p></table:table-cell></table:table-row></table:table></office:spreadsheet></office:body></office:document>"##,
+            row.repeat(6)
+        );
+        let read = |sweeps: u64| {
+            let limits = crate::formats::office::sheets::limits::Limits::default();
+            let mut budget = Budget::new(limits).with_max_swept(sweeps << 14);
+            read_fods(fods.as_bytes(), &mut budget).unwrap().warnings
+        };
+        assert!(read(6).is_empty());
+        let warnings = read(3);
+        assert_eq!(warnings.len(), 1, "{warnings:?}");
+        assert!(warnings[0].contains("formatting"), "{warnings:?}");
+    }
+
+    #[test]
+    fn dates_and_durations() {
+        assert_eq!(parse_date("1900-01-01", (1899, 12, 30)), Some(2.0));
+        assert_eq!(
+            parse_date("2024-02-29T12:00:00", (1899, 12, 30)),
+            Some(45351.5)
+        );
+        assert_eq!(parse_date("2024-13-01", (1899, 12, 30)), None);
+        assert_eq!(parse_duration("PT12H30M"), Some(0.5208333333333334));
+        assert_eq!(parse_duration("-P1DT6H"), Some(-1.25));
+        assert_eq!(parse_duration("PTxH"), None);
+    }
+
+    #[test]
+    fn addresses() {
+        assert_eq!(
+            parse_range_addr("$'A b'.$B$2:.C3"),
+            Some((
+                "A b".into(),
+                Range {
+                    r1: 1,
+                    c1: 1,
+                    r2: 2,
+                    c2: 2
+                }
+            ))
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/numfmt.rs b/crates/exav-render/src/formats/office/sheets/ods/numfmt.rs
new file mode 100644
index 00000000..26718072
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/numfmt.rs
@@ -0,0 +1,410 @@
+//! ODF data styles (number:*-style) to Excel number format codes.
+
+use crate::formats::office::common::xml::Node;
+use std::collections::HashMap;
+
+/// Windows language identifiers of currency symbols' locales, as Excel
+/// writes them in `[$€-407]`.
+fn lcid(lang: Option<&str>, country: Option<&str>) -> Option<u32> {
+    let l = lang?.to_ascii_lowercase();
+    let c = country.unwrap_or("").to_ascii_uppercase();
+    Some(match (l.as_str(), c.as_str()) {
+        ("en", "US") => 0x409,
+        ("en", "GB") => 0x809,
+        ("en", "AU") => 0xC09,
+        ("en", "CA") => 0x1009,
+        ("en", "IN") => 0x4009,
+        ("en", "IE") => 0x1809,
+        ("de", "DE") => 0x407,
+        ("de", "AT") => 0xC07,
+        ("de", "CH") => 0x807,
+        ("fr", "FR") => 0x40C,
+        ("fr", "BE") => 0x80C,
+        ("fr", "CH") => 0x100C,
+        ("fr", "CA") => 0xC0C,
+        ("es", "ES") => 0xC0A,
+        ("es", "MX") => 0x80A,
+        ("it", "IT") => 0x410,
+        ("nl", "NL") => 0x413,
+        ("nl", "BE") => 0x813,
+        ("pt", "BR") => 0x416,
+        ("pt", "PT") => 0x816,
+        ("pl", "PL") => 0x415,
+        ("cs", "CZ") => 0x405,
+        ("hu", "HU") => 0x40E,
+        ("sk", "SK") => 0x41B,
+        ("sl", "SI") => 0x424,
+        ("ru", "RU") => 0x419,
+        ("ja", "JP") => 0x411,
+        ("zh", "CN") => 0x804,
+        ("zh", "TW") => 0x404,
+        ("ko", "KR") => 0x412,
+        ("sv", "SE") => 0x41D,
+        ("da", "DK") => 0x406,
+        ("fi", "FI") => 0x40B,
+        ("nb", "NO") | ("no", "NO") => 0x414,
+        ("tr", "TR") => 0x41F,
+        ("el", "GR") => 0x408,
+        ("ga", "IE") => 0x83C,
+        _ => return None,
+    })
+}
+
+/// A literal in a format code: single safe characters bare or escaped,
+/// others quoted.
+fn lit(s: &str) -> String {
+    if s.is_empty() {
+        return String::new();
+    }
+    if s.chars()
+        .all(|c| matches!(c, '-' | '/' | ':' | '.' | ' ' | '(' | ')' | '$' | '+'))
+    {
+        return s
+            .chars()
+            .map(|c| {
+                if c == ' ' || c == '-' {
+                    format!("\\{c}")
+                } else {
+                    c.to_string()
+                }
+            })
+            .collect();
+    }
+    if s.chars().count() == 1 {
+        return format!("\\{s}");
+    }
+    format!("\"{}\"", s.replace('"', "\\\""))
+}
+
+fn usize_attr(n: &Node, k: &str) -> Option<usize> {
+    n.attr(k)
+        .and_then(|v| v.trim().parse::<usize>().ok())
+        .map(|v| v.min(30))
+}
+
+fn number_part(n: &Node, fraction: bool) -> String {
+    let dec = usize_attr(n, "number:decimal-places").unwrap_or(0);
+    let min_dec = usize_attr(n, "number:min-decimal-places")
+        .or_else(|| usize_attr(n, "loext:min-decimal-places"))
+        .unwrap_or(dec);
+    let min_int =
+        usize_attr(n, "number:min-integer-digits").unwrap_or(if fraction { 0 } else { 1 });
+    let grouping = n.attr("number:grouping") == Some("true");
+    let mut s = if grouping {
+        let width = min_int.max(4);
+        let mut s = String::new();
+        for i in 0..width {
+            if i > 0 && (width - i).is_multiple_of(3) {
+                s.push(',');
+            }
+            s.push(if i >= width - min_int { '0' } else { '#' });
+        }
+        s
+    } else if min_int == 0 {
+        "#".to_string()
+    } else {
+        "0".repeat(min_int)
+    };
+    if dec > 0 {
+        s.push('.');
+        s += &"0".repeat(min_dec.min(dec));
+        s += &"#".repeat(dec.saturating_sub(min_dec));
+    }
+    if let Some(f) = n
+        .attr("number:display-factor")
+        .and_then(|v| v.parse::<f64>().ok())
+    {
+        let mut k = f;
+        let mut guard = 0;
+        while k >= 1000.0 && guard < 10 {
+            s.push(',');
+            k /= 1000.0;
+            guard += 1;
+        }
+    }
+    s
+}
+
+fn text(n: &Node) -> String {
+    n.own_text()
+}
+
+/// The format code of a data style's own section, without its maps.
+fn section(st: &Node) -> String {
+    let mut out = String::new();
+    if let Some(c) = st
+        .child("style:text-properties")
+        .and_then(|tp| tp.attr("fo:color"))
+    {
+        out += match c.to_ascii_lowercase().as_str() {
+            "#ff0000" => "[RED]",
+            "#0000ff" => "[BLUE]",
+            "#00ff00" => "[GREEN]",
+            "#000000" => "[BLACK]",
+            "#ffffff" => "[WHITE]",
+            "#ffff00" => "[YELLOW]",
+            "#ff00ff" => "[MAGENTA]",
+            "#00ffff" => "[CYAN]",
+            _ => "",
+        };
+    }
+    let kind = st.name.as_str();
+    let is_time = kind == "number:time-style";
+    let overflow = st.attr("number:truncate-on-overflow") == Some("false");
+    let mut first_time_unit = true;
+    let parts = st
+        .nodes()
+        .filter(|x| x.name != "style:text-properties" && x.name != "style:map")
+        .count();
+    for n in st.nodes() {
+        match n.name.as_str() {
+            // A bare number without decimals is General.
+            "number:number"
+                if kind == "number:number-style"
+                    && n.attr("number:decimal-places").is_none()
+                    && n.attr("number:grouping") != Some("true")
+                    && n.attr("number:min-integer-digits").is_none_or(|v| v == "1")
+                    && parts == 1 =>
+            {
+                out += "General"
+            }
+            "number:number" => out += &number_part(n, false),
+            "number:scientific-number" => {
+                out += &number_part(n, false);
+                out += "E+";
+                out += &"0".repeat(usize_attr(n, "number:min-exponent-digits").unwrap_or(2));
+            }
+            "number:fraction" => {
+                let num = usize_attr(n, "number:min-numerator-digits").unwrap_or(1);
+                let den = usize_attr(n, "number:min-denominator-digits").unwrap_or(1);
+                if let Some(m) = usize_attr(n, "number:min-integer-digits") {
+                    out += if m == 0 { "#" } else { "0" };
+                    out.push(' ');
+                }
+                out += &"?".repeat(num);
+                out.push('/');
+                match n.attr("number:denominator-value") {
+                    Some(d) if d.chars().all(|c| c.is_ascii_digit()) && d.len() < 10 => out += d,
+                    _ => out += &"?".repeat(den),
+                }
+            }
+            "number:currency-symbol" => {
+                let sym = text(n);
+                match lcid(n.attr("number:language"), n.attr("number:country")) {
+                    Some(id) => out += &format!("[${}-{:X}]", sym, id),
+                    None => out += &lit(&sym),
+                }
+            }
+            "number:text" | "loext:text" => {
+                let t = text(n);
+                // A percentage's sign scales the value: it stays bare.
+                if kind == "number:percentage-style" && t.contains('%') {
+                    let (a, b) = t.split_once('%').unwrap_or((&t, ""));
+                    out += &lit(a);
+                    out.push('%');
+                    out += &lit(b);
+                } else {
+                    out += &lit(&t);
+                }
+            }
+            "number:text-content" => out.push('@'),
+            "number:fill-character" | "loext:fill-character" => {
+                out.push('*');
+                out.push(text(n).chars().next().unwrap_or(' '));
+            }
+            "number:day" => {
+                out += if n.attr("number:style") == Some("long") {
+                    "dd"
+                } else {
+                    "d"
+                }
+            }
+            "number:month" => {
+                let long = n.attr("number:style") == Some("long");
+                out += match (n.attr("number:textual") == Some("true"), long) {
+                    (true, true) => "mmmm",
+                    (true, false) => "mmm",
+                    (false, true) => "mm",
+                    _ => "m",
+                }
+            }
+            "number:year" => {
+                out += if n.attr("number:style") == Some("long") {
+                    "yyyy"
+                } else {
+                    "yy"
+                }
+            }
+            "number:day-of-week" => {
+                out += if n.attr("number:style") == Some("long") {
+                    "dddd"
+                } else {
+                    "ddd"
+                }
+            }
+            "number:era" => {
+                out += if n.attr("number:style") == Some("long") {
+                    "gggg"
+                } else {
+                    "g"
+                }
+            }
+            "number:quarter" => {
+                out += if n.attr("number:style") == Some("long") {
+                    "\"Q\"Q"
+                } else {
+                    "Q"
+                }
+            }
+            "number:week-of-year" => out += "WW",
+            "number:hours" | "number:minutes" => {
+                let long = n.attr("number:style") == Some("long");
+                let unit = match (n.name.as_str(), long) {
+                    ("number:hours", true) => "hh",
+                    ("number:hours", false) => "h",
+                    (_, true) => "mm",
+                    _ => "m",
+                };
+                if is_time && overflow && first_time_unit {
+                    out += &format!("[{unit}]");
+                } else {
+                    out += unit;
+                }
+                first_time_unit = false;
+            }
+            "number:seconds" => {
+                out += if n.attr("number:style") == Some("long") {
+                    "ss"
+                } else {
+                    "s"
+                };
+                let d = usize_attr(n, "number:decimal-places").unwrap_or(0);
+                if d > 0 {
+                    out.push('.');
+                    out += &"0".repeat(d);
+                }
+                first_time_unit = false;
+            }
+            "number:am-pm" => out += "AM/PM",
+            "number:boolean" => out += "\"TRUE\";\"TRUE\";\"FALSE\"",
+            _ => {}
+        }
+    }
+    if kind == "number:percentage-style" && !out.contains('%') {
+        out.push('%');
+    }
+    if kind == "number:text-style" && !out.contains('@') {
+        out.push('@');
+    }
+    out
+}
+
+/// Every data style of a document, by name, as a format code.
+pub fn collect(roots: &[&Node]) -> HashMap<String, String> {
+    let mut raw: HashMap<String, &Node> = HashMap::new();
+    for r in roots {
+        for n in r.nodes() {
+            if n.name.starts_with("number:")
+                && n.name.ends_with("-style")
+                && let Some(name) = n.attr("style:name")
+            {
+                raw.insert(name.to_string(), n);
+            }
+        }
+    }
+    raw.iter()
+        .map(|(name, n)| (name.clone(), code(n, &raw, 0)))
+        .collect()
+}
+
+fn code(n: &Node, raw: &HashMap<String, &Node>, depth: u32) -> String {
+    let own = section(n);
+    let own = if own.is_empty() {
+        "General".to_string()
+    } else {
+        own
+    };
+    let maps: Vec<(&str, &str)> = n
+        .all("style:map")
+        .filter_map(|m| {
+            Some((
+                m.attr("style:condition")?,
+                m.attr("style:apply-style-name")?,
+            ))
+        })
+        .collect();
+    if maps.is_empty() || depth > 3 {
+        return own;
+    }
+    // Maps on the sign are Excel's positive, negative and zero sections;
+    // other conditions keep their brackets.
+    let (mut pos, mut neg, mut zero, mut custom) = (None, None, None, vec![]);
+    for (cond, target) in maps.iter().take(3) {
+        let Some(t) = raw.get(*target) else { continue };
+        let c = code(t, raw, depth + 1);
+        match cond.replace("value()", "").replace(' ', "").as_str() {
+            ">0" | ">=0" => pos = Some(c),
+            "<0" => neg = Some(c),
+            "=0" => zero = Some(c),
+            other => custom.push(format!("[{other}]{c}")),
+        }
+    }
+    let mut parts: Vec<String> = Vec::new();
+    if custom.is_empty() {
+        match (pos, neg, zero) {
+            (Some(p), Some(n), Some(z)) => parts.extend([p, n, z, own]),
+            (Some(p), Some(n), None) => parts.extend([p, n, own]),
+            (Some(p), None, Some(z)) => parts.extend([p, own.clone(), z]),
+            (Some(p), None, None) => parts.extend([p, own]),
+            (None, Some(n), z) => {
+                parts.extend([own.clone(), n]);
+                parts.extend(z);
+            }
+            (None, None, Some(z)) => parts.extend([own.clone(), own, z]),
+            (None, None, None) => parts.push(own),
+        }
+    } else {
+        parts.extend(custom);
+        parts.push(own);
+    }
+    parts.join(";")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::common::xml::{parse, within};
+
+    fn fmt(xml: &str) -> String {
+        let doc = parse(format!(r#"<office:styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0">{xml}</office:styles>"#).as_bytes(), &mut within(1 << 20)).unwrap();
+        collect(&[&doc]).remove("N1").unwrap()
+    }
+
+    #[test]
+    fn formats() {
+        assert_eq!(
+            fmt(
+                r#"<number:number-style style:name="N1"><number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:number-style>"#
+            ),
+            "#,##0.00"
+        );
+        assert_eq!(
+            fmt(
+                r#"<number:date-style style:name="N1"><number:day number:style="long"/><number:text>.</number:text><number:month number:style="long"/><number:text>.</number:text><number:year/></number:date-style>"#
+            ),
+            "dd.mm.yy"
+        );
+        assert_eq!(
+            fmt(
+                r#"<number:time-style style:name="N1" number:truncate-on-overflow="false"><number:hours/><number:text>:</number:text><number:minutes number:style="long"/></number:time-style>"#
+            ),
+            "[h]:mm"
+        );
+        assert_eq!(
+            fmt(
+                r#"<number:percentage-style style:name="N1"><number:number number:decimal-places="1" number:min-integer-digits="1"/><number:text>%</number:text></number:percentage-style>"#
+            ),
+            "0.0%"
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/styles.rs b/crates/exav-render/src/formats/office/sheets/ods/styles.rs
new file mode 100644
index 00000000..a6295cd1
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/styles.rs
@@ -0,0 +1,614 @@
+//! ODF styles: cell styles with their parent chain resolved, to the model's
+//! styles and differential formats.
+
+use super::numfmt;
+use crate::formats::office::common::xml::{Child, Node};
+use crate::formats::office::sheets::model::*;
+use std::collections::HashMap;
+
+#[derive(Clone, Default, Debug, PartialEq)]
+pub(crate) struct Props {
+    pub font: Option<String>,
+    pub size: Option<f64>,
+    pub bold: Option<bool>,
+    pub italic: Option<bool>,
+    pub underline: Option<Option<&'static str>>,
+    pub strike: Option<bool>,
+    pub color: Option<Option<Rgb>>,
+    pub vert: Option<Option<&'static str>>,
+    pub outline: Option<bool>,
+    pub shadow: Option<bool>,
+    pub bg: Option<Option<Rgb>>,
+    pub left: Option<Edge>,
+    pub right: Option<Edge>,
+    pub top: Option<Edge>,
+    pub bottom: Option<Edge>,
+    pub diag_up: Option<Edge>,
+    pub diag_down: Option<Edge>,
+    pub halign: Option<Option<&'static str>>,
+    pub valign: Option<Option<&'static str>>,
+    pub wrap: Option<bool>,
+    pub rotation: Option<u8>,
+    pub shrink: Option<bool>,
+    pub indent: Option<u8>,
+    pub data_style: Option<String>,
+    pub locked: Option<bool>,
+    pub hidden: Option<bool>,
+    /// The style has text properties at all.
+    pub text: bool,
+}
+
+macro_rules! over {
+    ($a:ident, $b:ident, $($f:ident),*) => { $( if $b.$f.is_some() { $a.$f = $b.$f.clone(); } )* };
+}
+
+impl Props {
+    pub fn overlay(&mut self, o: &Props) {
+        self.text |= o.text;
+        over!(
+            self, o, font, size, bold, italic, underline, strike, color, vert, outline, shadow, bg,
+            left, right, top, bottom, diag_up, diag_down, halign, valign, wrap, rotation, shrink,
+            indent, data_style, locked, hidden
+        );
+    }
+}
+
+pub(crate) struct StyleDef {
+    pub parent: Option<String>,
+    pub props: Props,
+    /// style:map: (condition, applied style, base cell).
+    pub maps: Vec<(String, String, Option<String>)>,
+}
+
+/// A length to points.
+pub(crate) fn parse_len_pt(s: &str) -> Option<f64> {
+    let s = s.trim();
+    let (num, unit) = s.split_at(
+        s.find(|c: char| c.is_ascii_alphabetic() || c == '%')
+            .unwrap_or(s.len()),
+    );
+    let v: f64 = num.trim().parse().ok()?;
+    if !v.is_finite() {
+        return None;
+    }
+    Some(match unit {
+        "pt" | "" => v,
+        "in" => v * 72.0,
+        "cm" => v * 72.0 / 2.54,
+        "mm" => v * 72.0 / 25.4,
+        "pc" => v * 12.0,
+        "px" => v * 0.75,
+        _ => return None,
+    })
+}
+
+/// "#RRGGBB" or "transparent" (Some(None)).
+pub(crate) fn parse_color(s: &str) -> Option<Option<Rgb>> {
+    if s == "transparent" {
+        return Some(None);
+    }
+    let h = s.strip_prefix('#')?;
+    if h.len() != 6 {
+        return None;
+    }
+    u32::from_str_radix(h, 16).ok().map(Some)
+}
+
+/// "0.74pt solid #000000" to an XLSX border edge.
+pub(crate) fn parse_border(s: &str) -> Edge {
+    let s = s.trim();
+    if s == "none" || s.is_empty() || s == "hidden" {
+        return Edge::default();
+    }
+    let mut width = 0.75;
+    let mut style = "solid";
+    let mut color = Some(0);
+    for t in s.split_whitespace() {
+        if let Some(w) = parse_len_pt(t) {
+            width = w;
+        } else if t.starts_with('#') {
+            color = parse_color(t).flatten();
+        } else {
+            match t {
+                "thin" => width = 0.75,
+                "medium" => width = 1.75,
+                "thick" => width = 2.5,
+                "solid" | "double" | "dotted" | "dashed" | "dash-dot" | "dash-dot-dot"
+                | "fine-dashed" | "double-thin" | "groove" | "ridge" | "inset" | "outset" => {
+                    style = t
+                }
+                _ => {}
+            }
+        }
+    }
+    let wide = width > 1.2;
+    let x = match style {
+        "double" | "double-thin" => "double",
+        "dotted" => {
+            if wide {
+                "mediumDashDotDot"
+            } else {
+                "dotted"
+            }
+        }
+        "dashed" => {
+            if wide {
+                "mediumDashed"
+            } else {
+                "dashed"
+            }
+        }
+        "fine-dashed" => "hair",
+        "dash-dot" => {
+            if wide {
+                "mediumDashDot"
+            } else {
+                "dashDot"
+            }
+        }
+        "dash-dot-dot" => {
+            if wide {
+                "mediumDashDotDot"
+            } else {
+                "dashDotDot"
+            }
+        }
+        _ => {
+            if width < 0.6 {
+                "hair"
+            } else if width <= 1.1 {
+                "thin"
+            } else if width <= 2.25 {
+                "medium"
+            } else {
+                "thick"
+            }
+        }
+    };
+    Edge {
+        style: Some(x),
+        color,
+    }
+}
+
+fn pct(v: &str) -> Option<f64> {
+    v.trim_end_matches('%').parse::<f64>().ok()
+}
+
+pub(crate) fn text_props(tp: &Node, fonts: &HashMap<String, String>, p: &mut Props) {
+    // A declared font face, else the family named directly; a face that is
+    // not declared is ignored.
+    match tp.attr("style:font-name").and_then(|f| fonts.get(f)) {
+        Some(fam) => p.font = Some(fam.clone()),
+        None => {
+            if let Some(f) = tp.attr("fo:font-family") {
+                p.font = Some(f.trim().trim_matches('\'').trim_matches('"').to_string());
+            }
+        }
+    }
+    p.text = true;
+    if let Some(v) = tp.attr("fo:font-size")
+        && !v.ends_with('%')
+        && let Some(pt) = parse_len_pt(v)
+    {
+        p.size = Some(pt.clamp(1.0, 409.0));
+    }
+    if let Some(v) = tp.attr("fo:font-weight") {
+        p.bold = Some(v == "bold" || v.parse::<u32>().is_ok_and(|w| w >= 600));
+    }
+    if let Some(v) = tp.attr("fo:font-style") {
+        p.italic = Some(v == "italic" || v == "oblique");
+    }
+    if let Some(v) = tp.attr("style:text-underline-style") {
+        p.underline = Some(if v == "none" {
+            None
+        } else if tp.attr("style:text-underline-type") == Some("double") {
+            Some("double")
+        } else {
+            Some("single")
+        });
+    }
+    if let Some(v) = tp.attr("style:text-line-through-style") {
+        p.strike = Some(v != "none");
+    }
+    if let Some(c) = tp.attr("fo:color").and_then(parse_color) {
+        p.color = Some(c);
+    }
+    if tp.attr("style:use-window-font-color") == Some("true") {
+        p.color = Some(None);
+    }
+    if let Some(v) = tp.attr("style:text-position") {
+        let first = v.split_whitespace().next().unwrap_or("");
+        p.vert = Some(if first == "super" || pct(first).is_some_and(|x| x > 0.0) {
+            Some("superscript")
+        } else if first == "sub" || pct(first).is_some_and(|x| x < 0.0) {
+            Some("subscript")
+        } else {
+            None
+        });
+    }
+    if let Some(v) = tp.attr("style:text-outline") {
+        p.outline = Some(v == "true");
+    }
+    if let Some(v) = tp.attr("fo:text-shadow") {
+        p.shadow = Some(v != "none");
+    }
+}
+
+pub(crate) fn style_props(st: &Node, fonts: &HashMap<String, String>) -> Props {
+    let mut p = Props::default();
+    if let Some(d) = st.attr("style:data-style-name") {
+        p.data_style = Some(d.to_string());
+    }
+    if let Some(tc) = st.child("style:table-cell-properties") {
+        if let Some(c) = tc.attr("fo:background-color").and_then(parse_color) {
+            p.bg = Some(c);
+        }
+        if let Some(v) = tc.attr("fo:border") {
+            let e = parse_border(v);
+            p.left = Some(e.clone());
+            p.right = Some(e.clone());
+            p.top = Some(e.clone());
+            p.bottom = Some(e);
+        }
+        for (k, f) in [
+            ("fo:border-left", 0),
+            ("fo:border-right", 1),
+            ("fo:border-top", 2),
+            ("fo:border-bottom", 3),
+        ] {
+            if let Some(v) = tc.attr(k) {
+                let e = parse_border(v);
+                match f {
+                    0 => p.left = Some(e),
+                    1 => p.right = Some(e),
+                    2 => p.top = Some(e),
+                    _ => p.bottom = Some(e),
+                }
+            }
+        }
+        if let Some(v) = tc.attr("style:diagonal-bl-tr") {
+            p.diag_up = Some(parse_border(v));
+        }
+        if let Some(v) = tc.attr("style:diagonal-tl-br") {
+            p.diag_down = Some(parse_border(v));
+        }
+        if let Some(v) = tc.attr("style:vertical-align") {
+            p.valign = Some(match v {
+                "top" => Some("top"),
+                "middle" => Some("center"),
+                _ => None,
+            });
+        }
+        if let Some(v) = tc.attr("fo:wrap-option") {
+            p.wrap = Some(v == "wrap");
+        }
+        if let Some(v) = tc.attr("style:rotation-angle") {
+            let a = v
+                .trim_end_matches("deg")
+                .trim()
+                .parse::<f64>()
+                .unwrap_or(0.0);
+            let a = if a.is_finite() {
+                (a.round() as i64).rem_euclid(360)
+            } else {
+                0
+            };
+            p.rotation = Some(if a == 0 {
+                0
+            } else if a <= 90 {
+                a as u8
+            } else if a >= 270 {
+                (90 + 360 - a) as u8
+            } else if a <= 180 {
+                // Upside-down angles have no XLSX equivalent: the nearest.
+                90
+            } else {
+                180
+            });
+        }
+        if tc.attr("style:direction") == Some("ttb") {
+            p.rotation = Some(255);
+        }
+        if let Some(v) = tc.attr("style:shrink-to-fit") {
+            p.shrink = Some(v == "true");
+        }
+        if let Some(v) = tc.attr("style:cell-protect") {
+            p.locked = Some(v.contains("protected") && !v.contains("none"));
+            p.hidden = Some(v.contains("formula-hidden") || v.contains("hidden-and-protected"));
+        }
+    }
+    if let Some(pp) = st.child("style:paragraph-properties") {
+        let fixed = st
+            .child("style:table-cell-properties")
+            .and_then(|t| t.attr("style:text-align-source"))
+            != Some("value-type");
+        if let Some(v) = pp.attr("fo:text-align")
+            && fixed
+        {
+            p.halign = Some(match v {
+                "start" | "left" => Some("left"),
+                "center" => Some("center"),
+                "end" | "right" => Some("right"),
+                "justify" => Some("justify"),
+                _ => None,
+            });
+        }
+        if let Some(pt) = pp.attr("fo:margin-left").and_then(parse_len_pt) {
+            p.indent = Some((pt / 10.0).round().clamp(0.0, 15.0) as u8);
+        }
+    }
+    if let Some(tp) = st.child("style:text-properties") {
+        text_props(tp, fonts, &mut p);
+    }
+    p
+}
+
+pub(crate) struct Styles {
+    pub defs: HashMap<String, StyleDef>,
+    pub display: HashMap<String, String>,
+    pub default: Props,
+    pub data: HashMap<String, String>,
+    pub fonts: HashMap<String, String>,
+    /// Other families' styles: (family, name).
+    pub other: HashMap<(String, String), Node>,
+    cache: HashMap<String, Props>,
+}
+
+fn clone_node(n: &Node) -> Node {
+    Node {
+        name: n.name.clone(),
+        attrs: n.attrs.clone(),
+        children: n
+            .children
+            .iter()
+            .map(|c| match c {
+                Child::Node(x) => Child::Node(clone_node(x)),
+                Child::Text(t) => Child::Text(t.clone()),
+            })
+            .collect(),
+    }
+}
+
+impl Styles {
+    pub fn collect(roots: &[&Node]) -> Styles {
+        let mut fonts = HashMap::new();
+        for r in roots {
+            if let Some(ff) = r.child("office:font-face-decls") {
+                for f in ff.all("style:font-face") {
+                    if let Some(n) = f.attr("style:name") {
+                        let fam = f
+                            .attr("svg:font-family")
+                            .unwrap_or(n)
+                            .trim()
+                            .trim_matches('\'')
+                            .trim_matches('"')
+                            .to_string();
+                        fonts.insert(n.to_string(), fam);
+                    }
+                }
+            }
+        }
+        let mut style_roots: Vec<&Node> = vec![];
+        for r in roots {
+            for k in [
+                "office:styles",
+                "office:automatic-styles",
+                "office:master-styles",
+            ] {
+                if let Some(s) = r.child(k) {
+                    style_roots.push(s);
+                }
+            }
+        }
+        let data = numfmt::collect(&style_roots);
+        let mut defs = HashMap::new();
+        let mut display = HashMap::new();
+        let mut default = Props::default();
+        let mut other = HashMap::new();
+        for sr in &style_roots {
+            for st in sr.nodes() {
+                match st.name.as_str() {
+                    "style:default-style" if st.attr("style:family") == Some("table-cell") => {
+                        default = style_props(st, &fonts)
+                    }
+                    "style:style" => {
+                        let fam = st.attr("style:family").unwrap_or("");
+                        let Some(name) = st.attr("style:name") else {
+                            continue;
+                        };
+                        if fam == "table-cell" {
+                            if let Some(d) = st.attr("style:display-name") {
+                                display.insert(d.to_string(), name.to_string());
+                            }
+                            let maps = st
+                                .all("style:map")
+                                .take(64)
+                                .filter_map(|m| {
+                                    Some((
+                                        m.attr("style:condition")?.to_string(),
+                                        m.attr("style:apply-style-name")?.to_string(),
+                                        m.attr("style:base-cell-address").map(str::to_string),
+                                    ))
+                                })
+                                .collect();
+                            defs.insert(
+                                name.to_string(),
+                                StyleDef {
+                                    parent: st.attr("style:parent-style-name").map(str::to_string),
+                                    props: style_props(st, &fonts),
+                                    maps,
+                                },
+                            );
+                        } else {
+                            other.insert((fam.to_string(), name.to_string()), clone_node(st));
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+        Styles {
+            defs,
+            display,
+            default,
+            data,
+            fonts,
+            other,
+            cache: HashMap::new(),
+        }
+    }
+
+    fn chain(&self, name: &str) -> Vec<String> {
+        let mut chain = vec![];
+        let mut cur = Some(name.to_string());
+        while let Some(n) = cur {
+            if chain.contains(&n) || chain.len() > 32 {
+                break;
+            }
+            let parent = self.defs.get(&n).and_then(|d| d.parent.clone());
+            chain.push(n);
+            cur = parent;
+        }
+        chain
+    }
+
+    /// A style's properties with its parents' under them.
+    pub fn resolve(&mut self, name: &str) -> Props {
+        if let Some(p) = self.cache.get(name) {
+            return p.clone();
+        }
+        let mut p = self.default.clone();
+        for n in self.chain(name).iter().rev() {
+            if let Some(d) = self.defs.get(n) {
+                p.overlay(&d.props);
+            }
+        }
+        if self.cache.len() < 1 << 16 {
+            self.cache.insert(name.to_string(), p.clone());
+        }
+        p
+    }
+
+    pub fn other(&self, family: &str, name: &str) -> Option<&Node> {
+        self.other.get(&(family.to_string(), name.to_string()))
+    }
+
+    pub fn to_style(&self, p: &Props) -> Style {
+        let font = Font {
+            name: p.font.clone().unwrap_or_else(|| "Liberation Sans".into()),
+            size_centipt: (p.size.unwrap_or(10.0) * 100.0).round() as u32,
+            bold: p.bold.unwrap_or(false),
+            italic: p.italic.unwrap_or(false),
+            underline: p.underline.flatten(),
+            strike: p.strike.unwrap_or(false),
+            color: p.color.flatten(),
+            vert_align: p.vert.flatten(),
+            family: 0,
+            charset: None,
+            outline: p.outline.unwrap_or(false),
+            shadow: p.shadow.unwrap_or(false),
+        };
+        let fill = match p.bg.flatten() {
+            Some(c) => Fill::solid(c),
+            None => Fill::NONE,
+        };
+        let du = p.diag_up.clone().unwrap_or_default();
+        let dd = p.diag_down.clone().unwrap_or_default();
+        let diag = if du.style.is_some() {
+            du.clone()
+        } else {
+            dd.clone()
+        };
+        let numfmt = p
+            .data_style
+            .as_ref()
+            .and_then(|d| self.data.get(d).cloned())
+            .unwrap_or_else(|| "General".into());
+        Style {
+            font,
+            fill,
+            border: Border {
+                left: p.left.clone().unwrap_or_default(),
+                right: p.right.clone().unwrap_or_default(),
+                top: p.top.clone().unwrap_or_default(),
+                bottom: p.bottom.clone().unwrap_or_default(),
+                diagonal: diag,
+                diag_up: du.style.is_some(),
+                diag_down: dd.style.is_some(),
+            },
+            align: Align {
+                horizontal: p.halign.flatten(),
+                vertical: p.valign.flatten(),
+                wrap: p.wrap.unwrap_or(false),
+                indent: p.indent.unwrap_or(0),
+                rotation: p.rotation.unwrap_or(0),
+                shrink: p.shrink.unwrap_or(false),
+                reading_order: 0,
+            },
+            numfmt,
+            locked: p.locked.unwrap_or(true),
+            hidden: p.hidden.unwrap_or(false),
+        }
+    }
+
+    /// The differential format of a conditional style. A conditional
+    /// format may name its style by its display name. In the application
+    /// the conditional style replaces the cell's, so its font is written
+    /// whole when it or its parents set any font property (`always_font`
+    /// for style:map conditions).
+    pub fn dxf(&mut self, name: &str, always_font: bool) -> Dxf {
+        let name = if self.defs.contains_key(name) {
+            name.to_string()
+        } else {
+            self.display
+                .get(name)
+                .cloned()
+                .unwrap_or_else(|| name.to_string())
+        };
+        let mut p = Props::default();
+        for n in self.chain(&name).iter().rev() {
+            if n == "Default" {
+                continue;
+            }
+            if let Some(d) = self.defs.get(n) {
+                p.overlay(&d.props);
+            }
+        }
+        let full = self.resolve(&name);
+        let mut with_default = self
+            .defs
+            .get("Default")
+            .map(|d| d.props.clone())
+            .unwrap_or_default();
+        with_default.overlay(&p);
+        if always_font || with_default.text {
+            p.color = Some(Some(full.color.flatten().unwrap_or(0)));
+            p.bold = Some(full.bold.unwrap_or(false));
+            p.italic = Some(full.italic.unwrap_or(false));
+            p.strike = Some(full.strike.unwrap_or(false));
+            p.underline = Some(full.underline.flatten());
+        }
+        let any_border =
+            p.left.is_some() || p.right.is_some() || p.top.is_some() || p.bottom.is_some();
+        Dxf {
+            font_color: p.color.flatten(),
+            bold: p.bold,
+            italic: p.italic,
+            underline: p.underline.map(|u| u.unwrap_or("none")),
+            strike: p.strike,
+            fill: p.bg.flatten().map(Fill::solid),
+            border: any_border.then(|| Border {
+                left: p.left.clone().unwrap_or_default(),
+                right: p.right.clone().unwrap_or_default(),
+                top: p.top.clone().unwrap_or_default(),
+                bottom: p.bottom.clone().unwrap_or_default(),
+                ..Default::default()
+            }),
+            numfmt: p
+                .data_style
+                .as_ref()
+                .and_then(|d| self.data.get(d).cloned()),
+        }
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/ods/table.rs b/crates/exav-render/src/formats/office/sheets/ods/table.rs
new file mode 100644
index 00000000..7fb6445f
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/ods/table.rs
@@ -0,0 +1,852 @@
+//! A table:table to a sheet: columns, rows, cells, merges, notes, links,
+//! validation, conditional formats and drawings.
+
+use super::styles::Props;
+use super::{Doc, cf, draw, paragraphs, parse_date, parse_duration, parse_range_addr, text_of};
+use crate::formats::office::common::xml::{Child, Node};
+use crate::formats::office::sheets::error::Result;
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use std::collections::HashMap;
+
+/// Empty rows repeated more than this are not read one by one.
+const BIG_BLOCK: u32 = 1024;
+
+fn repeat(n: &Node, k: &str) -> u32 {
+    n.attr(k)
+        .and_then(|v| v.trim().parse::<u32>().ok())
+        .unwrap_or(1)
+        .max(1)
+}
+
+/// Column width in points to XLSX characters of the default font's digit.
+pub(crate) fn width_chars(pt: f64, digit_twips: f64) -> f64 {
+    ((pt * 20.0).round() / digit_twips * 256.0).round() / 256.0
+}
+
+fn gather<'a>(n: &'a Node, leaf: &str, groups: &[&str], out: &mut Vec<&'a Node>, depth: u32) {
+    for c in n.nodes() {
+        if c.name == leaf {
+            out.push(c);
+        } else if depth < 32 && groups.contains(&c.name.as_str()) {
+            gather(c, leaf, groups, out, depth + 1);
+        }
+    }
+}
+
+fn row_has_content(row: &Node) -> bool {
+    row.nodes().any(|c| {
+        c.attr("office:value-type").is_some()
+            || c.attr("table:formula").is_some()
+            || c.attr("table:number-columns-spanned").is_some()
+            || c.attr("table:number-rows-spanned").is_some()
+            || c.attr("table:content-validation-name").is_some()
+            || c.nodes().any(|x| {
+                x.name == "office:annotation"
+                    || x.name.starts_with("draw:")
+                    || (x.name == "text:p" && !x.children.is_empty())
+            })
+    })
+}
+
+/// Empty cells of a run that extends to the end of the sheet, styled.
+struct Tail {
+    c1: u32,
+    c2: u32,
+    style: Option<String>,
+    from_row: u32,
+}
+
+pub(crate) fn read_table(
+    t: &Node,
+    doc: &mut Doc,
+    wb: &mut Workbook,
+    budget: &mut Budget,
+    sheet: &mut Sheet,
+    charts_out: &mut Vec<super::PendingChart>,
+) -> Result<()> {
+    // Columns: widths, styles and visibility.
+    let f0 = wb.styles.get(0).font.clone();
+    let digit = crate::formats::office::sheets::fonts::digit_twips(&f0.name, f0.size_pt());
+    // A column without a style is 0.889 inch wide.
+    sheet.default_col_width = Some(width_chars(64.0, digit));
+    let mut cols: Vec<&Node> = vec![];
+    gather(
+        t,
+        "table:table-column",
+        &[
+            "table:table-column-group",
+            "table:table-header-columns",
+            "table:table-columns",
+        ],
+        &mut cols,
+        0,
+    );
+    let mut col = 0u32;
+    let mut col_style: Vec<(u32, u32, Option<String>)> = vec![];
+    for c in cols {
+        let n = repeat(c, "table:number-columns-repeated");
+        let first = col;
+        col = col.saturating_add(n);
+        if first > MAX_COL {
+            break;
+        }
+        let last = col.saturating_sub(1).min(MAX_COL);
+        let mut info = ColInfo {
+            first,
+            last,
+            ..Default::default()
+        };
+        if let Some(w) = c
+            .attr("table:style-name")
+            .and_then(|sn| doc.st.other("table-column", sn))
+            .and_then(|cs| cs.child("style:table-column-properties"))
+            .and_then(|p| p.attr("style:column-width"))
+            .and_then(super::styles::parse_len_pt)
+        {
+            info.width = Some(width_chars(w.clamp(0.0, 4000.0), digit));
+        }
+        info.hidden = matches!(c.attr("table:visibility"), Some("collapse" | "filter"));
+        let ds = c.attr("table:default-cell-style-name").map(str::to_string);
+        if let Some(d) = ds.as_deref().filter(|d| *d != "Default") {
+            info.style = Some(doc.sid(wb, Some(d)));
+        }
+        col_style.push((first, last, ds));
+        sheet.cols.push(info);
+    }
+    let col_style_name = |c: u32| -> Option<&str> { style_at(&col_style, c) };
+
+    let mut rows: Vec<&Node> = vec![];
+    gather(
+        t,
+        "table:table-row",
+        &[
+            "table:table-row-group",
+            "table:table-header-rows",
+            "table:table-rows",
+        ],
+        &mut rows,
+        0,
+    );
+
+    // Row heights: the most common one is the default.
+    let row_info = |doc: &Doc, row: &Node| -> RowInfo {
+        let mut info = RowInfo::default();
+        if let Some(p) = row
+            .attr("table:style-name")
+            .and_then(|sn| doc.st.other("table-row", sn))
+            .and_then(|rs| rs.child("style:table-row-properties"))
+        {
+            if let Some(h) = p
+                .attr("style:row-height")
+                .and_then(super::styles::parse_len_pt)
+            {
+                // Heights are whole twips.
+                info.height = Some(((h * 20.0).round() / 20.0).clamp(0.0, 409.5));
+            }
+            info.custom_height = p.attr("style:use-optimal-row-height") != Some("true");
+        }
+        info.hidden = matches!(row.attr("table:visibility"), Some("collapse" | "filter"));
+        info
+    };
+    let mut heights: HashMap<u64, u64> = HashMap::new();
+    {
+        let mut r = 0u64;
+        for row in &rows {
+            let n = u64::from(repeat(row, "table:number-rows-repeated"));
+            let rep = n.min(u64::from(MAX_ROW) + 1 - r.min(u64::from(MAX_ROW) + 1));
+            if let Some(h) = row_info(doc, row).height {
+                *heights.entry((h * 100.0).round() as u64).or_default() += rep;
+            }
+            r = r.saturating_add(n);
+        }
+    }
+    if let Some((h, _)) = heights
+        .iter()
+        .max_by_key(|e| (*e.1, std::cmp::Reverse(*e.0)))
+    {
+        sheet.default_row_height = *h as f64 / 100.0;
+    }
+    let default_h = sheet.default_row_height;
+
+    // The rows after the last one with content, when they reach the end of
+    // the sheet: their look becomes the sheet's or the columns' default
+    // instead of being written row by row.
+    let tail_start = rows
+        .iter()
+        .rposition(|r| row_has_content(r))
+        .map_or(0, |i| i + 1);
+    let tail_rows: u64 = rows[tail_start..]
+        .iter()
+        .map(|r| u64::from(repeat(r, "table:number-rows-repeated")))
+        .sum();
+    let head_rows: u64 = rows[..tail_start]
+        .iter()
+        .map(|r| u64::from(repeat(r, "table:number-rows-repeated")))
+        .sum();
+    let has_tail = tail_rows > u64::from(BIG_BLOCK)
+        && head_rows + tail_rows + 4 * u64::from(BIG_BLOCK) > u64::from(MAX_ROW);
+    let last_big = (tail_start..rows.len())
+        .rev()
+        .find(|&i| repeat(rows[i], "table:number-rows-repeated") > BIG_BLOCK);
+    // Rows hidden or resized to the end: the longest run of empty rows at
+    // the end that are all alike.
+    let mut row_tail_start = rows.len();
+    if let Some(last) = rows.last().map(|r| row_info(doc, r)) {
+        while row_tail_start > tail_start && row_info(doc, rows[row_tail_start - 1]) == last {
+            row_tail_start -= 1;
+        }
+    }
+    let row_tail_rows: u64 = rows[row_tail_start..]
+        .iter()
+        .map(|r| u64::from(repeat(r, "table:number-rows-repeated")))
+        .sum();
+    let all_rows = head_rows + tail_rows;
+    // The rows the document does not list after it, when there are few,
+    // are written as rows of the old default.
+    let after_tail = (u64::from(MAX_ROW) + 1).saturating_sub(all_rows);
+    // The rows above it are then written one by one: worth it while they
+    // are fewer than those it saves.
+    let rows_above = all_rows.saturating_sub(row_tail_rows);
+    let uniform_tail = row_tail_rows > u64::from(BIG_BLOCK)
+        && after_tail <= 4 * u64::from(BIG_BLOCK)
+        && rows_above < row_tail_rows.min(65_536);
+    // What an empty cell shows: its fill and borders.
+    let visible = |doc: &mut Doc, wb: &mut Workbook, name: Option<&str>| -> (Fill, Border) {
+        let id = doc.sid(wb, name);
+        let s = wb.styles.get(id);
+        (s.fill.clone(), s.border.clone())
+    };
+    let mut r = 0u32;
+    let mut anchored: Vec<(u32, u32, &Node)> = vec![];
+    let mut tails: Vec<Tail> = vec![];
+    let mut row_tail: Option<(u32, RowInfo)> = None;
+    let mut skipped_format = false;
+    for (idx, row) in rows.iter().enumerate() {
+        if r > MAX_ROW {
+            break;
+        }
+        let n = repeat(row, "table:number-rows-repeated");
+        let rep = n.min(MAX_ROW - r + 1);
+        let content = row_has_content(row);
+        let big_empty = !content && rep > BIG_BLOCK;
+        // Only the last large block becomes the columns' default; the rows
+        // around it are read as rows.
+        let trailing = has_tail && Some(idx) == last_big;
+        let info = row_info(doc, row);
+        let notable = info.hidden || info.height.is_some_and(|h| (h - default_h).abs() > 1e-9);
+        if notable {
+            if uniform_tail && idx >= row_tail_start {
+                if row_tail.is_none() {
+                    row_tail = Some((r, info.clone()));
+                }
+            } else if big_empty && !budget.room_for_cells(u64::from(rep)) {
+                skipped_format = true;
+            } else {
+                budget.alloc(u64::from(rep) * 48)?;
+                for k in 0..rep {
+                    sheet.rows.insert(r + k, info.clone());
+                }
+            }
+        }
+        let row_default = row.attr("table:default-cell-style-name");
+        let mut c = 0u32;
+        for cell in row.nodes() {
+            let is_cell = cell.name == "table:table-cell";
+            if !is_cell && cell.name != "table:covered-table-cell" {
+                continue;
+            }
+            let cn = repeat(cell, "table:number-columns-repeated");
+            if c > MAX_COL {
+                break;
+            }
+            let crep = cn.min(MAX_COL - c + 1);
+            let own_style = cell.attr("table:style-name").or(row_default);
+            let style_name = own_style.or_else(|| col_style_name(c));
+            let parsed = if is_cell {
+                parse_cell(cell, doc, style_name, budget)?
+            } else {
+                None
+            };
+            if let Some((value, formula)) = parsed {
+                let s = doc.sid(wb, style_name);
+                let extra = value.text_len() + formula.as_ref().map_or(0, |f| f.len());
+                for k in 0..rep {
+                    for j in 0..crep {
+                        // Each column may have its own default style.
+                        let (s, name) = if own_style.is_none() && j > 0 {
+                            (doc.sid(wb, col_style_name(c + j)), col_style_name(c + j))
+                        } else {
+                            (s, style_name)
+                        };
+                        doc.note_maps(name, r + k, c + j);
+                        sheet.cells.insert(
+                            (r + k, c + j),
+                            Cell {
+                                value: value.clone(),
+                                formula: formula.clone(),
+                                style: s,
+                            },
+                        );
+                        budget.cell(extra)?;
+                    }
+                }
+            } else if let Some(name) = own_style {
+                // An empty styled run: a cell where it shows otherwise than
+                // its column would; to the last column, the row's style.
+                let to_end = c.saturating_add(cn) > MAX_COL && c > 0;
+                let look = visible(doc, wb, Some(name));
+                if trailing {
+                    if look != visible(doc, wb, col_style_name(c))
+                        || look != visible(doc, wb, col_style_name(c + crep - 1))
+                    {
+                        tails.push(Tail {
+                            c1: c,
+                            c2: c + crep - 1,
+                            style: Some(name.to_string()),
+                            from_row: r,
+                        });
+                    }
+                } else if to_end {
+                    if look == (Fill::NONE, Border::default()) {
+                        // Shows nothing.
+                    } else if big_empty && !budget.room_for_cells(u64::from(rep)) {
+                        skipped_format = true;
+                    } else {
+                        let id = doc.sid(wb, Some(name));
+                        budget.alloc(u64::from(rep) * 48)?;
+                        for k in 0..rep {
+                            sheet
+                                .rows
+                                .entry(r + k)
+                                .or_insert_with(|| RowInfo {
+                                    height: info.height,
+                                    custom_height: info.custom_height,
+                                    ..Default::default()
+                                })
+                                .style = Some(id);
+                        }
+                    }
+                } else if !budget.sweep(u64::from(crep)) {
+                    skipped_format = true;
+                } else {
+                    let differ: Vec<u32> = (0..crep)
+                        .filter(|&j| {
+                            col_style_name(c + j) != Some(name)
+                                && visible(doc, wb, col_style_name(c + j)) != look
+                        })
+                        .collect();
+                    let need = differ.len() as u64 * u64::from(rep);
+                    if need > 0 && big_empty && !budget.room_for_cells(need) {
+                        skipped_format = true;
+                    } else if need > 0 {
+                        let s = doc.sid(wb, Some(name));
+                        for k in 0..rep {
+                            for &j in &differ {
+                                sheet.cells.insert((r + k, c + j), Cell::styled(s));
+                                doc.note_maps(Some(name), r + k, c + j);
+                                budget.cell(0)?;
+                            }
+                        }
+                    }
+                }
+            }
+            if is_cell {
+                first_copy(cell, doc, sheet, (r, c), rep, crep, &mut anchored);
+            }
+            c = c.saturating_add(cn);
+        }
+        r = r.saturating_add(n);
+    }
+    if skipped_format {
+        wb.warn(format!(
+            "{}: the formatting of large unused areas was left out",
+            sheet.name
+        ));
+    }
+    promote_tails(doc, wb, budget, sheet, tails, &col_style)?;
+    if let Some((from, info)) = row_tail {
+        // Rows from here to the end are hidden or of another height: the
+        // sheet's default, and every row above keeps its own.
+        budget.alloc((u64::from(from) + after_tail) * 48)?;
+        // Written as rows of their own height, the default changing.
+        let own = RowInfo {
+            height: Some(default_h),
+            custom_height: true,
+            ..Default::default()
+        };
+        for k in (0..from).chain((all_rows.min(u64::from(MAX_ROW) + 1) as u32)..=MAX_ROW) {
+            sheet.rows.entry(k).or_insert_with(|| own.clone());
+        }
+        if info.hidden {
+            sheet.default_row_hidden = true;
+        }
+        if let Some(h) = info.height {
+            sheet.default_row_height = h;
+            sheet.default_row_custom = info.custom_height;
+        }
+    }
+    // Every cell of a merged range has its first cell's style: the
+    // application draws the range with that cell's attributes.
+    for m in sheet.merges.clone() {
+        if m.area() > 100_000 {
+            continue;
+        }
+        // The first cell's style, written or its column's.
+        let s = sheet
+            .cells
+            .get(&(m.r1, m.c1))
+            .map(|c| c.style)
+            .or_else(|| sheet.col_info(m.c1).and_then(|c| c.style))
+            .unwrap_or(0);
+        for rr in m.r1..=m.r2 {
+            for cc in m.c1..=m.c2 {
+                if let std::collections::btree_map::Entry::Vacant(e) = sheet.cells.entry((rr, cc)) {
+                    e.insert(Cell::styled(s));
+                    budget.cell(0)?;
+                } else if let Some(x) = sheet.cells.get_mut(&(rr, cc)) {
+                    x.style = s;
+                }
+            }
+        }
+    }
+    cf::read_table_cfs(t, doc, wb, sheet);
+    draw::read_drawings(t, doc, wb, budget, sheet, &anchored, charts_out)?;
+    Ok(())
+}
+
+/// Columns whose empty cells keep a style to the end of the sheet take it
+/// as their column style; the rows above keep what they showed.
+/// The default cell style of column `c`.
+fn style_at(cols: &[(u32, u32, Option<String>)], c: u32) -> Option<&str> {
+    let i = cols.partition_point(|x| x.0 <= c);
+    cols.get(i.wrapping_sub(1))
+        .filter(|x| c <= x.1)
+        .and_then(|x| x.2.as_deref())
+}
+
+fn promote_tails(
+    doc: &mut Doc,
+    wb: &mut Workbook,
+    budget: &mut Budget,
+    sheet: &mut Sheet,
+    tails: Vec<Tail>,
+    cols: &[(u32, u32, Option<String>)],
+) -> Result<()> {
+    let col_style_name = |c: u32| style_at(cols, c);
+    for tail in tails {
+        let ncols = u64::from(tail.c2 - tail.c1 + 1);
+        let above = u64::from(tail.from_row);
+        let used_cols: Vec<u32> = (tail.c1..=tail.c2)
+            .filter(|&c| col_style_name(c) != tail.style.as_deref())
+            .collect();
+        if used_cols.is_empty() {
+            continue;
+        }
+        let new = doc.sid(wb, tail.style.as_deref());
+        // A run to the last column covers what no row reaches: columns past
+        // the used ones keep their cells only where rows have some.
+        let last_used = sheet.cells.keys().map(|k| k.1).max().unwrap_or(0).max(
+            sheet
+                .cols
+                .iter()
+                .map(|c| c.last)
+                .filter(|&l| l < MAX_COL)
+                .max()
+                .unwrap_or(0),
+        );
+        let cols_needing_cells = used_cols
+            .iter()
+            .filter(|&&c| c <= last_used.saturating_add(1))
+            .count() as u64;
+        if !budget.room_for_cells(above * cols_needing_cells.min(ncols)) {
+            wb.warn(format!(
+                "{}: the formatting of large unused areas was left out",
+                sheet.name
+            ));
+            continue;
+        }
+        for &c in &used_cols {
+            let old = doc.sid(wb, col_style_name(c));
+            if c <= last_used.saturating_add(1) {
+                for r in 0..tail.from_row {
+                    if let std::collections::btree_map::Entry::Vacant(e) = sheet.cells.entry((r, c))
+                    {
+                        e.insert(Cell::styled(old));
+                        budget.cell(0)?;
+                    }
+                }
+            }
+        }
+        set_col_style(sheet, &used_cols, new);
+    }
+    Ok(())
+}
+
+/// Sets the style of columns, splitting the column records they are in.
+fn set_col_style(sheet: &mut Sheet, cols: &[u32], style: u32) {
+    // Runs of consecutive columns.
+    let mut runs: Vec<(u32, u32)> = vec![];
+    for &c in cols {
+        match runs.last_mut() {
+            Some(l) if l.1 + 1 == c => l.1 = c,
+            _ => runs.push((c, c)),
+        }
+    }
+    for (a, b) in runs {
+        let mut out: Vec<ColInfo> = vec![];
+        let mut covered: Vec<(u32, u32)> = vec![];
+        for ci in sheet.cols.drain(..) {
+            if ci.last < a || ci.first > b {
+                out.push(ci);
+                continue;
+            }
+            if ci.first < a {
+                out.push(ColInfo {
+                    last: a - 1,
+                    ..ci.clone()
+                });
+            }
+            if ci.last > b {
+                out.push(ColInfo {
+                    first: b + 1,
+                    ..ci.clone()
+                });
+            }
+            let (f, l) = (ci.first.max(a), ci.last.min(b));
+            covered.push((f, l));
+            out.push(ColInfo {
+                first: f,
+                last: l,
+                style: Some(style).filter(|&s| s != 0),
+                ..ci
+            });
+        }
+        // Columns no record described.
+        covered.sort_unstable();
+        let mut next = a;
+        for (f, l) in covered {
+            if f > next {
+                out.push(ColInfo {
+                    first: next,
+                    last: f - 1,
+                    style: Some(style).filter(|&s| s != 0),
+                    ..Default::default()
+                });
+            }
+            next = l.saturating_add(1);
+        }
+        if next <= b {
+            out.push(ColInfo {
+                first: next,
+                last: b,
+                style: Some(style).filter(|&s| s != 0),
+                ..Default::default()
+            });
+        }
+        out.sort_by_key(|c| c.first);
+        sheet.cols = out;
+    }
+}
+
+/// Merges, array ranges, notes, links, validation and drawings of a cell:
+/// on its first copy only.
+fn first_copy<'a>(
+    cell: &'a Node,
+    doc: &mut Doc,
+    sheet: &mut Sheet,
+    (r, c): (u32, u32),
+    rep: u32,
+    crep: u32,
+    anchored: &mut Vec<(u32, u32, &'a Node)>,
+) {
+    let cs = repeat(cell, "table:number-columns-spanned");
+    let rs = repeat(cell, "table:number-rows-spanned");
+    if (cs > 1 || rs > 1)
+        && sheet.merges.len() < 1 << 20
+        && let Some(m) = (Range {
+            r1: r,
+            c1: c,
+            r2: r.saturating_add(rs - 1),
+            c2: c.saturating_add(cs - 1),
+        })
+        .clipped()
+    {
+        sheet.merges.push(m);
+    }
+    let mc = cell
+        .attr("table:number-matrix-columns-spanned")
+        .and_then(|v| v.parse::<u32>().ok());
+    let mr = cell
+        .attr("table:number-matrix-rows-spanned")
+        .and_then(|v| v.parse::<u32>().ok());
+    if let (Some(mc), Some(mr)) = (mc, mr)
+        && mc > 0
+        && mr > 0
+        && sheet
+            .cells
+            .get(&(r, c))
+            .is_some_and(|x| x.formula.is_some())
+        && let Some(a) = (Range {
+            r1: r,
+            c1: c,
+            r2: r.saturating_add(mr - 1),
+            c2: c.saturating_add(mc - 1),
+        })
+        .clipped()
+    {
+        sheet.arrays.insert((r, c), a);
+    }
+    if let Some(a) = cell.child("office:annotation") {
+        let mut text = String::new();
+        for (k, p) in a.all("text:p").enumerate() {
+            if k > 0 {
+                text.push('\n');
+            }
+            text_of(p, &mut text);
+        }
+        let author = a.child("dc:creator").map(|n| {
+            let mut s = String::new();
+            text_of(n, &mut s);
+            s
+        });
+        if sheet.comments.len() < 1 << 16 {
+            sheet.comments.push(Comment {
+                row: r,
+                col: c,
+                author: author.unwrap_or_default(),
+                text,
+                visible: a.attr("office:display") == Some("true"),
+            });
+        }
+    }
+    if let Some(link) = find_link(cell, 0) {
+        let (url, location) = match link.strip_prefix('#') {
+            Some(l) => (None, Some(location_to_excel(l))),
+            None => (Some(link.clone()).filter(|u| safe_url(u)), None),
+        };
+        if (url.is_some() || location.is_some()) && sheet.hyperlinks.len() < 1 << 16 {
+            sheet.hyperlinks.push(Hyperlink {
+                range: Range::cell(r, c),
+                url,
+                location,
+                tooltip: None,
+                display: None,
+            });
+        }
+    }
+    if let Some(vn) = cell.attr("table:content-validation-name")
+        && let Some(v) = doc.validations.get(vn)
+    {
+        let rng = Range {
+            r1: r,
+            c1: c,
+            r2: r + rep - 1,
+            c2: c + crep - 1,
+        };
+        match sheet.validations.iter_mut().find(|x| {
+            x.prompt == v.prompt
+                && x.formula1 == v.formula1
+                && x.kind == v.kind
+                && x.operator == v.operator
+                && x.formula2 == v.formula2
+                && x.error == v.error
+        }) {
+            Some(existing) => {
+                if existing.ranges.len() < 1024 {
+                    existing.ranges.push(rng);
+                }
+            }
+            None => {
+                if sheet.validations.len() < 1 << 12 {
+                    let mut v = v.clone();
+                    v.ranges = vec![rng];
+                    sheet.validations.push(v);
+                }
+            }
+        }
+    }
+    for f in cell.nodes() {
+        if f.name.starts_with("draw:") && anchored.len() < 1 << 16 {
+            anchored.push((r, c, f));
+        }
+    }
+}
+
+fn find_link(n: &Node, depth: u32) -> Option<String> {
+    if depth > 16 {
+        return None;
+    }
+    for c in n.nodes() {
+        if c.name == "text:a" {
+            return c.attr("xlink:href").map(str::to_string);
+        }
+        if c.name != "office:annotation"
+            && !c.name.starts_with("draw:")
+            && let Some(x) = find_link(c, depth + 1)
+        {
+            return Some(x);
+        }
+    }
+    None
+}
+
+fn location_to_excel(l: &str) -> String {
+    match parse_range_addr(l) {
+        Some((sheet, r)) => format!(
+            "{}!{}",
+            crate::formats::office::sheets::xls::formula::quote_sheet(&sheet),
+            range_ref(&r)
+        ),
+        None => l.to_string(),
+    }
+}
+
+/// A cell's value and formula, `None` when it has neither.
+fn parse_cell(
+    cell: &Node,
+    doc: &mut Doc,
+    style_name: Option<&str>,
+    budget: &mut Budget,
+) -> Result<Option<(Value, Option<Box<str>>)>> {
+    let vt = cell
+        .attr("office:value-type")
+        .or(cell.attr("calcext:value-type"));
+    let formula = cell.attr("table:formula").and_then(|f| doc.fc.convert(f));
+    let num = |k: &str| {
+        cell.attr(k)
+            .and_then(|v| v.trim().parse::<f64>().ok())
+            .filter(|v| v.is_finite())
+    };
+    let error_text = |cell: &Node| -> Value {
+        let t = paragraphs(cell);
+        // The application's own codes have no XLSX error: #VALUE!.
+        Value::Error(CellError::parse(&t).unwrap_or(CellError::Value))
+    };
+    let mut value = match vt {
+        _ if cell.attr("calcext:value-type") == Some("error") => error_text(cell),
+        Some("float" | "percentage" | "currency") => {
+            Value::Number(num("office:value").unwrap_or(0.0))
+        }
+        Some("date") => cell
+            .attr("office:date-value")
+            .and_then(|v| parse_date(v, doc.null))
+            .map_or(Value::Empty, Value::Number),
+        Some("time") => cell
+            .attr("office:time-value")
+            .and_then(parse_duration)
+            .map_or(Value::Empty, Value::Number),
+        Some("boolean") => Value::Bool(matches!(
+            cell.attr("office:boolean-value").map(str::trim),
+            Some("true" | "1")
+        )),
+        Some("string") => {
+            let base = doc.st.resolve(style_name.unwrap_or("Default"));
+            match cell_runs(cell, &base, &doc.text_styles) {
+                Some(runs) => rich(runs, doc),
+                None => Value::text(
+                    cell.attr("office:string-value")
+                        .map(str::to_string)
+                        .unwrap_or_else(|| paragraphs(cell)),
+                ),
+            }
+        }
+        _ if cell.child("text:p").is_some() && formula.is_none() => Value::text(paragraphs(cell)),
+        _ => Value::Empty,
+    };
+    // A formula whose result is an error, in documents that do not type it.
+    if value == Value::Empty && formula.is_some() {
+        let t = paragraphs(cell);
+        if t.starts_with('#') || t.starts_with("Err:") {
+            value = Value::Error(CellError::parse(&t).unwrap_or(CellError::Value));
+        }
+    }
+    if value == Value::Empty && formula.is_none() {
+        return Ok(None);
+    }
+    budget.alloc(value.text_len() as u64)?;
+    Ok(Some((value, formula.map(String::into_boxed_str))))
+}
+
+/// The runs of a cell's text where spans change the font, or `None` when
+/// none does.
+fn cell_runs(
+    cell: &Node,
+    base: &Props,
+    text_styles: &HashMap<String, Props>,
+) -> Option<Vec<(String, Props)>> {
+    fn walk(
+        n: &Node,
+        cur: &Props,
+        ts: &HashMap<String, Props>,
+        runs: &mut Vec<(String, Props)>,
+        any: &mut bool,
+        depth: u32,
+    ) {
+        if depth > 32 || runs.len() > 4096 {
+            return;
+        }
+        for c in &n.children {
+            match c {
+                Child::Text(t) => runs.push((t.clone(), cur.clone())),
+                Child::Node(x) => match x.name.as_str() {
+                    "text:span" => {
+                        let mut p = cur.clone();
+                        if let Some(sp) = x.attr("text:style-name").and_then(|sn| ts.get(sn)) {
+                            p.overlay(sp);
+                            *any = true;
+                        }
+                        walk(x, &p, ts, runs, any, depth + 1);
+                    }
+                    "text:s" => {
+                        let k = x
+                            .attr("text:c")
+                            .and_then(|v| v.parse::<usize>().ok())
+                            .unwrap_or(1)
+                            .min(1000);
+                        runs.push((" ".repeat(k), cur.clone()));
+                    }
+                    "text:tab" => runs.push(("\t".into(), cur.clone())),
+                    "text:line-break" => runs.push(("\n".into(), cur.clone())),
+                    "office:annotation" => {}
+                    _ => walk(x, cur, ts, runs, any, depth + 1),
+                },
+            }
+        }
+    }
+    let mut runs: Vec<(String, Props)> = vec![];
+    let mut any = false;
+    let mut first = true;
+    for p in cell.nodes().filter(|p| p.name == "text:p") {
+        if !first {
+            let last = runs.last().map_or_else(|| base.clone(), |r| r.1.clone());
+            runs.push(("\n".into(), last));
+        }
+        first = false;
+        walk(p, base, text_styles, &mut runs, &mut any, 0);
+    }
+    any.then_some(runs)
+}
+
+fn rich(runs: Vec<(String, Props)>, doc: &Doc) -> Value {
+    let mut out: Vec<Run> = vec![];
+    for (text, p) in runs {
+        let font = doc.st.to_style(&p).font;
+        if let Some(last) = out.last_mut()
+            && last.font.as_ref() == Some(&font)
+        {
+            last.text.push_str(&text);
+            continue;
+        }
+        out.push(Run {
+            text,
+            font: Some(font),
+        });
+    }
+    out.retain(|r| !r.text.is_empty());
+    if out.len() <= 1 {
+        Value::text(out.into_iter().map(|r| r.text).collect::<String>())
+    } else {
+        Value::Rich(out.into())
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/r1c1.rs b/crates/exav-render/src/formats/office/sheets/r1c1.rs
new file mode 100644
index 00000000..9b0958a2
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/r1c1.rs
@@ -0,0 +1,274 @@
+//! R1C1 formulas, as SpreadsheetML and SYLK store them, to A1 syntax.
+//!
+//! `R2C3` is row 2, column 3; `R[-1]C[2]` is relative to the cell holding
+//! the formula; a missing number (`RC`) is the cell's own row or column.
+//! `R2` alone is a whole row, `C3` a whole column. Relative references
+//! past the sheet's edge wrap around, as Excel's do.
+
+use crate::formats::office::sheets::model::{MAX_COL, MAX_ROW, col_name};
+
+const MAX_LEN: usize = 16_384;
+
+/// One axis of a reference: absolute (0-based) or an offset.
+#[derive(Clone, Copy, PartialEq, Debug)]
+enum Part {
+    Abs(u32),
+    Rel(i64),
+}
+
+impl Part {
+    fn resolve(self, at: u32, max: u32) -> (u32, bool) {
+        match self {
+            Part::Abs(n) => (n, true),
+            Part::Rel(d) => {
+                let span = i64::from(max) + 1;
+                ((i64::from(at) + d).rem_euclid(span) as u32, false)
+            }
+        }
+    }
+}
+
+/// A parsed `R..C..`, `R..` or `C..`.
+#[derive(Clone, Copy, PartialEq, Debug)]
+struct Ref {
+    row: Option<Part>,
+    col: Option<Part>,
+}
+
+/// Reads an axis after its letter: `5`, `[-2]` or nothing (offset 0).
+fn axis(s: &[char], i: &mut usize, max: u32) -> Option<Part> {
+    if s.get(*i) == Some(&'[') {
+        let start = *i + 1;
+        let mut j = start;
+        if s.get(j) == Some(&'-') || s.get(j) == Some(&'+') {
+            j += 1;
+        }
+        while j < s.len() && s[j].is_ascii_digit() {
+            j += 1;
+        }
+        if s.get(j) != Some(&']') || j == start || j - start > 9 {
+            return None;
+        }
+        let v: i64 = s[start..j].iter().collect::<String>().parse().ok()?;
+        *i = j + 1;
+        return Some(Part::Rel(v));
+    }
+    let start = *i;
+    while *i < s.len() && s[*i].is_ascii_digit() {
+        *i += 1;
+    }
+    if *i == start {
+        return Some(Part::Rel(0));
+    }
+    if *i - start > 9 {
+        return None;
+    }
+    let v: u32 = s[start..*i].iter().collect::<String>().parse().ok()?;
+    (v >= 1 && v - 1 <= max).then(|| Part::Abs(v - 1))
+}
+
+/// A reference at `s[*i..]`, case-insensitive, not followed by a name
+/// character; `*i` moves past it.
+fn reference(s: &[char], i: &mut usize) -> Option<Ref> {
+    let mut j = *i;
+    let mut r = Ref {
+        row: None,
+        col: None,
+    };
+    if matches!(s.get(j), Some('R' | 'r')) {
+        j += 1;
+        r.row = Some(axis(s, &mut j, MAX_ROW)?);
+    }
+    if matches!(s.get(j), Some('C' | 'c')) {
+        j += 1;
+        r.col = Some(axis(s, &mut j, MAX_COL)?);
+    }
+    if r.row.is_none() && r.col.is_none() {
+        return None;
+    }
+    if s.get(j)
+        .is_some_and(|&c| c.is_alphanumeric() || matches!(c, '_' | '.' | '(' | '\\'))
+    {
+        return None;
+    }
+    *i = j;
+    Some(r)
+}
+
+fn cell_text(row: Part, col: Part, at: (u32, u32)) -> String {
+    let (r, ra) = row.resolve(at.0, MAX_ROW);
+    let (c, ca) = col.resolve(at.1, MAX_COL);
+    format!(
+        "{}{}{}{}",
+        if ca { "$" } else { "" },
+        col_name(c),
+        if ra { "$" } else { "" },
+        u64::from(r) + 1
+    )
+}
+
+fn row_text(p: Part, at: u32) -> String {
+    let (r, a) = p.resolve(at, MAX_ROW);
+    format!("{}{}", if a { "$" } else { "" }, u64::from(r) + 1)
+}
+
+fn col_text(p: Part, at: u32) -> String {
+    let (c, a) = p.resolve(at, MAX_COL);
+    format!("{}{}", if a { "$" } else { "" }, col_name(c))
+}
+
+/// `a` alone, or `a:b`, in A1 syntax; `None` when they do not pair.
+fn ref_text(a: Ref, b: Option<Ref>, at: (u32, u32)) -> Option<String> {
+    let single = b.is_none();
+    let b = b.unwrap_or(a);
+    Some(match (a.row, a.col, b.row, b.col) {
+        (Some(r1), Some(c1), Some(r2), Some(c2)) => {
+            let one = cell_text(r1, c1, at);
+            if single {
+                one
+            } else {
+                format!("{one}:{}", cell_text(r2, c2, at))
+            }
+        }
+        (Some(r1), None, Some(r2), None) => {
+            format!("{}:{}", row_text(r1, at.0), row_text(r2, at.0))
+        }
+        (None, Some(c1), None, Some(c2)) => {
+            format!("{}:{}", col_text(c1, at.1), col_text(c2, at.1))
+        }
+        _ => return None,
+    })
+}
+
+/// `formula` (with or without its `=`) in A1 syntax, for the cell at
+/// 0-based `at` (row, column); `None` when it cannot be read.
+pub fn to_a1(formula: &str, at: (u32, u32)) -> Option<String> {
+    let f = formula.trim();
+    let f = f.strip_prefix('=').unwrap_or(f);
+    let s: Vec<char> = f.chars().take(MAX_LEN + 1).collect();
+    if s.len() > MAX_LEN {
+        return None;
+    }
+    let mut out = String::with_capacity(f.len() + 8);
+    let mut i = 0;
+    while i < s.len() {
+        let c = s[i];
+        match c {
+            '"' | '\'' => {
+                // A string, or a quoted sheet name: copied as is.
+                let start = i;
+                i += 1;
+                while i < s.len() {
+                    if s[i] == c {
+                        if s.get(i + 1) == Some(&c) {
+                            i += 2;
+                            continue;
+                        }
+                        break;
+                    }
+                    i += 1;
+                }
+                i = (i + 1).min(s.len());
+                out.extend(&s[start..i]);
+            }
+            '[' => {
+                // An external workbook's name.
+                let start = i;
+                while i < s.len() && s[i] != ']' {
+                    i += 1;
+                }
+                i = (i + 1).min(s.len());
+                out.extend(&s[start..i]);
+            }
+            _ if c.is_alphabetic() || c == '_' || c == '\\' => {
+                // A name or a reference: references only where a name
+                // could not continue one already begun.
+                let mut j = i;
+                if let Some(a) = reference(&s, &mut j) {
+                    let mut b = None;
+                    if s.get(j) == Some(&':') {
+                        let mut k = j + 1;
+                        if let Some(r) = reference(&s, &mut k) {
+                            b = Some(r);
+                            j = k;
+                        }
+                    }
+                    out.push_str(&ref_text(a, b, at)?);
+                    i = j;
+                    continue;
+                }
+                while i < s.len()
+                    && (s[i].is_alphanumeric() || matches!(s[i], '_' | '.' | '\\' | '?'))
+                {
+                    out.push(s[i]);
+                    i += 1;
+                }
+            }
+            _ if c.is_ascii_digit() => {
+                // A number, with its exponent; also keeps "1E5" from
+                // reading as a name.
+                while i < s.len() && (s[i].is_ascii_alphanumeric() || s[i] == '.') {
+                    let e = matches!(s[i], 'e' | 'E');
+                    out.push(s[i]);
+                    i += 1;
+                    if e && matches!(s.get(i), Some('+' | '-')) {
+                        out.push(s[i]);
+                        i += 1;
+                    }
+                }
+            }
+            _ => {
+                out.push(c);
+                i += 1;
+            }
+        }
+    }
+    (!out.trim().is_empty()).then_some(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::to_a1;
+
+    #[test]
+    fn references() {
+        let at = (4, 2); // C5
+        assert_eq!(to_a1("=R1C1", at).as_deref(), Some("$A$1"));
+        assert_eq!(to_a1("=RC", at).as_deref(), Some("C5"));
+        assert_eq!(to_a1("=R[-1]C[2]+R2C[-1]", at).as_deref(), Some("E4+B$2"));
+        assert_eq!(
+            to_a1("=SUM(R1C1:R[-1]C)", at).as_deref(),
+            Some("SUM($A$1:C4)")
+        );
+        // Whole rows and columns.
+        assert_eq!(to_a1("=SUM(R2:R[1])", at).as_deref(), Some("SUM($2:6)"));
+        assert_eq!(
+            to_a1("=SUM(C[-1])+C3", at).as_deref(),
+            Some("SUM(B:B)+$C:$C")
+        );
+        // Lower case, and wrapping past the edge.
+        assert_eq!(to_a1("=r[-6]c[-3]", at).as_deref(), Some("XFD1048575"));
+    }
+
+    #[test]
+    fn what_is_not_a_reference() {
+        let at = (0, 0);
+        assert_eq!(
+            to_a1("=ROUND(Rate*R1C2,2)&\"R1C1\"&'R2 C2'!R1C1", at).as_deref(),
+            Some("ROUND(Rate*$B$1,2)&\"R1C1\"&'R2 C2'!$A$1")
+        );
+        assert_eq!(to_a1("=RC2", at).as_deref(), Some("$B1"));
+        assert_eq!(to_a1("=R1C1E", at).as_deref(), Some("R1C1E"));
+        assert_eq!(
+            to_a1("=1E+5+COUNT(C1R)", at).as_deref(),
+            Some("1E+5+COUNT(C1R)")
+        );
+        assert_eq!(
+            to_a1("=[Book1.xls]Sheet1!R1C1", at).as_deref(),
+            Some("[Book1.xls]Sheet1!$A$1")
+        );
+        // No row 0: a name, which Excel will not find.
+        assert_eq!(to_a1("=R0C1", at).as_deref(), Some("R0C1"));
+        assert_eq!(to_a1("=", at), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/sylk.rs b/crates/exav-render/src/formats/office/sheets/sylk.rs
new file mode 100644
index 00000000..c0a14569
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/sylk.rs
@@ -0,0 +1,790 @@
+//! SYLK (Symbolic Link), Multiplan's and Excel's text interchange format,
+//! after Microsoft's "SYLK summary" (sylksum.doc, 1986) and knowledge base
+//! article Q64338: one record a line, fields after `;` (`;;` a literal
+//! semicolon), a current cell that `X` and `Y` fields move. `C` records
+//! hold values and R1C1 expressions, `F` records formats, column widths
+//! and row heights, `P` records the number format and font tables, `NN`
+//! names. Text is in the writer's ANSI code page, with `ESC N` sequences
+//! (ISO 6937) for accented letters.
+
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use crate::formats::office::sheets::r1c1;
+use std::collections::{BTreeMap, HashMap};
+
+const ESC: u8 = 0x1B;
+/// Fields read in a record, and characters in a field.
+const MAX_FIELDS: usize = 256;
+
+/// ISO 6937's non-spacing accents (`ESC N` 0x41 to 0x4F), as the
+/// combining mark each stands for and the letters it composes with.
+fn accent(designator: u8, base: char) -> Option<char> {
+    let (from, to, spacing): (&str, &str, char) = match designator {
+        0x41 => ("AEIOUaeiou", "ÀÈÌÒÙàèìòù", '`'),
+        0x42 => ("AEIOUYaeiouyCcNnSsZz", "ÁÉÍÓÚÝáéíóúýĆćŃńŚśŹź", '´'),
+        0x43 => ("AEIOUaeiou", "ÂÊÎÔÛâêîôû", '^'),
+        0x44 => ("ANOano", "ÃÑÕãñõ", '~'),
+        0x45 => ("AEIOUaeiou", "ĀĒĪŌŪāēīōū", '¯'),
+        0x46 => ("AGUagu", "ĂĞŬăğŭ", '˘'),
+        0x47 => ("CEGIZcegz", "ĊĖĠİŻċėġż", '˙'),
+        0x48 => ("AEIOUaeiouy", "ÄËÏÖÜäëïöüÿ", '¨'),
+        0x4A => ("AUau", "ÅŮåů", '˚'),
+        0x4B => ("CGKLNRSTcklnrst", "ÇĢĶĻŅŖŞŢçķļņŗşţ", '¸'),
+        0x4D => ("OUou", "ŐŰőű", '˝'),
+        0x4E => ("AEIUaeiu", "ĄĘĮŲąęįų", '˛'),
+        0x4F => ("CDENRSTZcdenrstz", "ČĎĚŇŘŠŤŽčďěňřšťž", 'ˇ'),
+        _ => return None,
+    };
+    if base == ' ' {
+        return Some(spacing);
+    }
+    from.chars()
+        .position(|c| c == base)
+        .and_then(|i| to.chars().nth(i))
+        .or(Some(base))
+}
+
+/// ISO 6937's other characters (`ESC N` and one byte).
+fn special(b: u8) -> Option<char> {
+    const LOW: &str = "¡¢£$¥#§¤‘“«←↑→↓°±²³×µ¶·÷’”»¼½¾¿";
+    const HIGH: &str = "―¹®©™♪¬¦\u{0}\u{0}\u{0}\u{0}⅛⅜⅝⅞ΩÆĐªĦ\u{0}IJĿŁØŒºÞŦŊʼnĸæđðħıijŀłøœßþŧŋ";
+    let c = match b {
+        0x21..=0x3F => LOW.chars().nth(usize::from(b - 0x21)),
+        0x50..=0x7E => HIGH.chars().nth(usize::from(b - 0x50)),
+        _ => None,
+    }?;
+    (c != '\0').then_some(c)
+}
+
+/// A line's text: escape sequences resolved, the rest decoded as `cp`.
+fn decode(line: &[u8], cp: &'static encoding_rs::Encoding) -> String {
+    let mut out = String::new();
+    let mut raw: Vec<u8> = vec![];
+    let flush = |raw: &mut Vec<u8>, out: &mut String| {
+        if !raw.is_empty() {
+            out.push_str(&cp.decode_without_bom_handling(raw).0);
+            raw.clear();
+        }
+    };
+    let mut i = 0;
+    while i < line.len() {
+        let b = line[i];
+        if b != ESC {
+            raw.push(b);
+            i += 1;
+            continue;
+        }
+        match (line.get(i + 1).copied(), line.get(i + 2).copied()) {
+            (Some(b'N'), Some(d @ 0x41..=0x4F)) => {
+                let base = line.get(i + 3).map_or(' ', |&c| char::from(c));
+                if let Some(c) = accent(d, base) {
+                    flush(&mut raw, &mut out);
+                    out.push(c);
+                    i += 4;
+                    continue;
+                }
+                i += 3;
+            }
+            (Some(b'N'), Some(s)) => {
+                flush(&mut raw, &mut out);
+                if let Some(c) = special(s) {
+                    out.push(c);
+                }
+                i += 3;
+            }
+            (Some(c1 @ 0x20..=0x2F), Some(c2 @ 0x30..=0x3F)) => {
+                raw.push(((c1 - 0x20) << 4) | (c2 - 0x30));
+                i += 3;
+            }
+            _ => i += 1,
+        }
+    }
+    flush(&mut raw, &mut out);
+    out
+}
+
+/// A record's fields after its type: `;;` is a semicolon within one. A
+/// quoted value (`K"..."`) also keeps the single semicolons some writers
+/// leave in it.
+fn fields(rest: &str) -> Vec<String> {
+    let mut out = vec![];
+    let mut cur = String::new();
+    let last_quote = rest.rfind('"').unwrap_or(0);
+    let mut chars = rest.char_indices().peekable();
+    while let Some((i, c)) = chars.next() {
+        if c == ';' {
+            if chars.peek().map(|p| p.1) == Some(';') {
+                chars.next();
+                cur.push(';');
+                continue;
+            }
+            let quoted =
+                cur.starts_with("K\"") && (cur.len() == 2 || !cur.ends_with('"')) && i < last_quote;
+            if quoted {
+                cur.push(';');
+                continue;
+            }
+            out.push(std::mem::take(&mut cur));
+            if out.len() >= MAX_FIELDS {
+                return out;
+            }
+        } else {
+            cur.push(c);
+        }
+    }
+    out.push(cur);
+    out
+}
+
+/// One of the formats an `F` record gives a cell, row or column.
+#[derive(Clone, Default, PartialEq)]
+struct Fmt {
+    numfmt: Option<String>,
+    align: Option<&'static str>,
+    bold: bool,
+    italic: bool,
+    shade: bool,
+    borders: [bool; 4],
+    font: Option<usize>,
+}
+
+impl Fmt {
+    fn is_empty(&self) -> bool {
+        *self == Fmt::default()
+    }
+
+    /// Over `under`: what this one leaves unset, `under` gives.
+    fn over(&self, under: &Fmt) -> Fmt {
+        Fmt {
+            numfmt: self.numfmt.clone().or_else(|| under.numfmt.clone()),
+            align: self.align.or(under.align),
+            bold: self.bold || under.bold,
+            italic: self.italic || under.italic,
+            shade: self.shade || under.shade,
+            borders: std::array::from_fn(|i| self.borders[i] || under.borders[i]),
+            font: self.font.or(under.font),
+        }
+    }
+}
+
+/// `F<type><digits><align>`: General (G, D, C), fixed (F), exponential
+/// (E), dollar ($), percent (%), bar graph (*, left General).
+fn simple(s: &str) -> (Option<String>, Option<&'static str>) {
+    let b: Vec<char> = s.chars().collect();
+    let Some(&kind) = b.first() else {
+        return (None, None);
+    };
+    let digits: String = b
+        .iter()
+        .skip(1)
+        .take_while(|c| c.is_ascii_digit())
+        .collect();
+    let d: usize = digits.parse::<usize>().unwrap_or(0).min(30);
+    let align = match b.get(1 + digits.len()) {
+        Some('L') => Some("left"),
+        Some('C') => Some("center"),
+        Some('R') => Some("right"),
+        Some('X') => Some("fill"),
+        _ => None,
+    };
+    let dec = if d > 0 {
+        format!(".{}", "0".repeat(d))
+    } else {
+        String::new()
+    };
+    let numfmt = match kind {
+        'F' => Some(format!("0{dec}")),
+        'E' => Some(format!("0{dec}E+00")),
+        '$' => Some(format!("\"$\"#,##0{dec}_);\\(\"$\"#,##0{dec}\\)")),
+        '%' => Some(format!("0{dec}%")),
+        'I' => Some("0".into()),
+        _ => None,
+    };
+    (numfmt, align)
+}
+
+/// A `K` value: a quoted string, TRUE or FALSE, an error, or a number.
+fn value(k: &str) -> Value {
+    let k = k.trim_end();
+    if let Some(s) = k.strip_prefix('"') {
+        return Value::text(s.strip_suffix('"').unwrap_or(s));
+    }
+    match k {
+        "TRUE" => return Value::Bool(true),
+        "FALSE" => return Value::Bool(false),
+        _ => {}
+    }
+    if k.starts_with('#')
+        && let Some(e) = CellError::parse(k)
+    {
+        return Value::Error(e);
+    }
+    match k.trim().parse::<f64>() {
+        Ok(v) if v.is_finite() => Value::Number(v),
+        _ if k.is_empty() => Value::Empty,
+        _ => Value::text(k),
+    }
+}
+
+struct Font {
+    name: String,
+    size: f64,
+    bold: bool,
+    italic: bool,
+    underline: bool,
+    strike: bool,
+}
+
+struct CellData {
+    value: Value,
+    expr: Option<String>,
+    /// The cell whose expression or value this one shares.
+    shared: Option<(u32, u32)>,
+    array: Option<(u32, u32)>,
+    note: Option<String>,
+}
+
+impl Default for CellData {
+    fn default() -> Self {
+        CellData {
+            value: Value::Empty,
+            expr: None,
+            shared: None,
+            array: None,
+            note: None,
+        }
+    }
+}
+
+pub(crate) fn read(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let bytes = bytes.strip_prefix(b"\xEF\xBB\xBF").unwrap_or(bytes);
+    if !bytes.starts_with(b"ID") {
+        return Err(Error::NotFormat("not a SYLK file (no ID record)".into()));
+    }
+    budget.alloc(bytes.len() as u64 * 2)?;
+    // UTF-8 when the file is; else the writer's ANSI code page: Mac Roman
+    // for "XL" (Excel for the Macintosh, sylksum's producer list; Windows
+    // Excel writes "WXL"), Windows-1252 otherwise.
+    let id = bytes
+        .split(|&b| b == b'\n' || b == b'\r')
+        .next()
+        .unwrap_or_default();
+    let cp = if std::str::from_utf8(bytes).is_ok() {
+        encoding_rs::UTF_8
+    } else if id.split(|&b| b == b';').any(|f| f == b"PXL") {
+        encoding_rs::MACINTOSH
+    } else {
+        encoding_rs::WINDOWS_1252
+    };
+
+    let mut numfmts: Vec<String> = vec![];
+    let mut fonts: Vec<Font> = vec![];
+    let mut cells: BTreeMap<(u32, u32), CellData> = BTreeMap::new();
+    let mut cell_fmts: HashMap<(u32, u32), Fmt> = HashMap::new();
+    let mut row_fmts: HashMap<u32, Fmt> = HashMap::new();
+    let mut col_fmts: HashMap<u32, Fmt> = HashMap::new();
+    let mut default_fmt = Fmt::default();
+    let mut widths: Vec<(u32, u32, f64)> = vec![];
+    let mut heights: BTreeMap<u32, f64> = BTreeMap::new();
+    let mut default_height = None;
+    let mut default_width = None;
+    let mut names: Vec<(String, String)> = vec![];
+    let mut date1904 = false;
+    let mut show_grid = true;
+    let mut show_headers = true;
+    let (mut x, mut y) = (0u32, 0u32);
+    let coord = |v: &str, max: u32| {
+        v.trim()
+            .parse::<u64>()
+            .ok()
+            .filter(|&n| n >= 1 && n - 1 <= u64::from(max))
+            .map(|n| (n - 1) as u32)
+    };
+
+    for raw in bytes
+        .split(|&b| b == b'\n' || b == b'\r')
+        .filter(|l| !l.is_empty())
+    {
+        let line = decode(raw, cp);
+        let (kind, rest) = line.split_once(';').unwrap_or((&line, ""));
+        let f = fields(rest);
+        match kind {
+            "C" => {
+                let mut data = CellData::default();
+                let (mut sr, mut sc) = (None, None);
+                let mut share = false;
+                for fl in &f {
+                    let (k, v) = fl.split_at(fl.chars().next().map_or(0, char::len_utf8));
+                    match k {
+                        "X" => x = coord(v, MAX_COL).unwrap_or(x),
+                        "Y" => y = coord(v, MAX_ROW).unwrap_or(y),
+                        "K" => data.value = value(v),
+                        "E" => data.expr = Some(v.to_string()),
+                        "M" => data.expr = Some(v.to_string()),
+                        "S" => share = true,
+                        "R" => sr = coord(v, MAX_ROW),
+                        "C" => sc = coord(v, MAX_COL),
+                        "A" => data.note = Some(v.to_string()),
+                        _ => {}
+                    }
+                }
+                if let (Some(r), Some(c)) = (sr, sc) {
+                    if share {
+                        data.shared = Some((r, c));
+                    } else if f.iter().any(|fl| fl.starts_with('M')) {
+                        data.array = Some((r, c));
+                    }
+                }
+                if !cells.contains_key(&(y, x)) {
+                    budget
+                        .cell(data.value.text_len() + data.expr.as_ref().map_or(0, String::len))?;
+                }
+                cells.insert((y, x), data);
+            }
+            "F" => {
+                let mut fmt = Fmt::default();
+                let (mut row, mut col) = (None, None);
+                let mut is_default = false;
+                for fl in &f {
+                    let (k, v) = fl.split_at(fl.chars().next().map_or(0, char::len_utf8));
+                    match k {
+                        "X" => x = coord(v, MAX_COL).unwrap_or(x),
+                        "Y" => y = coord(v, MAX_ROW).unwrap_or(y),
+                        "F" => {
+                            let (n, a) = simple(v);
+                            fmt.numfmt = fmt.numfmt.or(n);
+                            fmt.align = a;
+                        }
+                        "D" => {
+                            is_default = true;
+                            let (n, a) = simple(v);
+                            fmt.numfmt = fmt.numfmt.or(n);
+                            fmt.align = a;
+                            // The default column width follows the format.
+                            let w: String = v
+                                .chars()
+                                .skip(1)
+                                .skip_while(char::is_ascii_digit)
+                                .skip(1)
+                                .collect();
+                            default_width = w
+                                .trim()
+                                .parse::<f64>()
+                                .ok()
+                                .filter(|w| (0.0..=255.0).contains(w))
+                                .or(default_width);
+                        }
+                        "P" => {
+                            if let Some(n) =
+                                v.trim().parse::<usize>().ok().and_then(|i| numfmts.get(i))
+                            {
+                                fmt.numfmt = Some(n.clone());
+                            }
+                        }
+                        "S" => {
+                            let mut chars = v.chars().peekable();
+                            while let Some(c) = chars.next() {
+                                match c {
+                                    'D' => fmt.bold = true,
+                                    'I' => fmt.italic = true,
+                                    'S' => fmt.shade = true,
+                                    'T' => fmt.borders[0] = true,
+                                    'R' => fmt.borders[1] = true,
+                                    'B' => fmt.borders[2] = true,
+                                    'L' => fmt.borders[3] = true,
+                                    'M' => {
+                                        let mut n = String::new();
+                                        while let Some(d) = chars.next_if(char::is_ascii_digit) {
+                                            n.push(d);
+                                        }
+                                        fmt.font = n.parse().ok();
+                                    }
+                                    _ => {}
+                                }
+                            }
+                        }
+                        "W" => {
+                            let p: Vec<f64> = v
+                                .split_whitespace()
+                                .filter_map(|n| n.parse().ok())
+                                .collect();
+                            if let [a, b, w] = p[..]
+                                && a >= 1.0
+                                && b >= a
+                                && (0.0..=255.0).contains(&w)
+                                && widths.len() < 4096
+                            {
+                                widths.push((
+                                    (a - 1.0).min(f64::from(MAX_COL)) as u32,
+                                    (b - 1.0).min(f64::from(MAX_COL)) as u32,
+                                    w,
+                                ));
+                            }
+                        }
+                        "R" => row = coord(v, MAX_ROW),
+                        "C" => col = coord(v, MAX_COL),
+                        "M" => {
+                            if let Ok(t) = v.trim().parse::<f64>() {
+                                let h = (t / 20.0).clamp(0.0, 409.0);
+                                match row {
+                                    Some(r) => {
+                                        heights.insert(r, h);
+                                    }
+                                    None => default_height = Some(h),
+                                }
+                            }
+                        }
+                        "G" => show_grid = false,
+                        "H" => show_headers = false,
+                        _ => {}
+                    }
+                }
+                if is_default {
+                    default_fmt = fmt.over(&default_fmt);
+                } else if let Some(r) = row {
+                    if !fmt.is_empty() {
+                        budget.alloc(96)?;
+                        row_fmts.insert(r, fmt);
+                    }
+                } else if let Some(c) = col {
+                    if !fmt.is_empty() && col_fmts.len() < 4096 {
+                        col_fmts.insert(c, fmt);
+                    }
+                } else if !fmt.is_empty() {
+                    // The cell it names, or else the current one.
+                    if !cell_fmts.contains_key(&(y, x)) {
+                        budget.alloc(96)?;
+                    }
+                    cell_fmts.insert((y, x), fmt);
+                }
+            }
+            "P" => {
+                for fl in &f {
+                    let (k, v) = fl.split_at(fl.chars().next().map_or(0, char::len_utf8));
+                    match k {
+                        "P" if numfmts.len() < 4096 => numfmts.push(v.chars().take(255).collect()),
+                        "F" | "E" if fonts.len() < 4096 => {
+                            let mut font = Font {
+                                name: v.chars().take(64).collect(),
+                                size: 10.0,
+                                bold: false,
+                                italic: false,
+                                underline: false,
+                                strike: false,
+                            };
+                            for g in &f {
+                                if let Some(s) = g.strip_prefix('M') {
+                                    font.size = s
+                                        .trim()
+                                        .parse::<f64>()
+                                        .map_or(10.0, |t| (t / 20.0).clamp(1.0, 409.0));
+                                } else if let Some(s) = g.strip_prefix('S') {
+                                    font.bold = s.contains('B');
+                                    font.italic = s.contains('I');
+                                    font.underline = s.contains('U');
+                                    font.strike = s.contains('S');
+                                }
+                            }
+                            fonts.push(font);
+                            break;
+                        }
+                        _ => {}
+                    }
+                }
+            }
+            "O" => {
+                for fl in &f {
+                    if let Some(v) = fl.strip_prefix('V') {
+                        date1904 = v.trim().parse::<u32>().is_ok_and(|v| v != 0);
+                    }
+                }
+            }
+            "NN" if names.len() < 1 << 14 => {
+                let name = f.iter().find_map(|fl| fl.strip_prefix('N'));
+                let expr = f.iter().find_map(|fl| fl.strip_prefix('E'));
+                if let (Some(n), Some(e)) = (name, expr) {
+                    names.push((n.to_string(), e.to_string()));
+                }
+            }
+            "E" => break,
+            _ => {}
+        }
+    }
+
+    // The workbook.
+    let font_of = |i: Option<usize>| -> crate::formats::office::sheets::model::Font {
+        match i.and_then(|i| fonts.get(i)).or(fonts.first()) {
+            Some(f) => crate::formats::office::sheets::model::Font {
+                name: if f.name.is_empty() {
+                    "Arial".into()
+                } else {
+                    f.name.clone()
+                },
+                size_centipt: (f.size * 100.0).round() as u32,
+                bold: f.bold,
+                italic: f.italic,
+                underline: f.underline.then_some("single"),
+                strike: f.strike,
+                ..crate::formats::office::sheets::model::Font::default()
+            },
+            None => crate::formats::office::sheets::model::Font {
+                name: "Arial".into(),
+                size_centipt: 1000,
+                ..crate::formats::office::sheets::model::Font::default()
+            },
+        }
+    };
+    let style_of = |fmt: &Fmt| -> Style {
+        let mut st = Style {
+            font: font_of(fmt.font),
+            ..Style::default()
+        };
+        if let Some(n) = &fmt.numfmt {
+            st.numfmt.clone_from(n);
+        }
+        st.align.horizontal = fmt.align;
+        st.font.bold |= fmt.bold;
+        st.font.italic |= fmt.italic;
+        if fmt.shade {
+            st.fill = Fill {
+                pattern: "gray125",
+                fg: None,
+                bg: None,
+            };
+        }
+        let thin = Edge {
+            style: Some("thin"),
+            color: None,
+        };
+        let [t, r, b, l] = fmt.borders;
+        st.border = Border {
+            top: if t { thin.clone() } else { Edge::default() },
+            right: if r { thin.clone() } else { Edge::default() },
+            bottom: if b { thin.clone() } else { Edge::default() },
+            left: if l { thin.clone() } else { Edge::default() },
+            ..Border::default()
+        };
+        st
+    };
+    let mut wb = Workbook::new(style_of(&default_fmt));
+    wb.date1904 = date1904;
+    let mut sheet = Sheet::new("Sheet1".into());
+    sheet.show_grid = show_grid;
+    sheet.show_headers = show_headers;
+    if let Some(h) = default_height {
+        sheet.default_row_height = h;
+        sheet.default_row_custom = true;
+    }
+    if let Some(w) = default_width {
+        sheet.base_col_width = Some(w.round() as u32);
+    }
+    // Columns: later records win where they overlap earlier ones.
+    let mut cols: Vec<ColInfo> = vec![];
+    // Widths count characters of the default font's digit; XLSX adds the
+    // 5 pixels of padding (ECMA-376 part 1, 18.3.1.13).
+    let f0 = font_of(None);
+    let digit = (crate::formats::office::sheets::fonts::digit_twips(&f0.name, f0.size_pt()) / 15.0)
+        .round()
+        .max(1.0);
+    for (first, last, w) in widths {
+        let width = ((w * digit + 5.0) / digit * 256.0).trunc() / 256.0;
+        set_cols(&mut cols, first, last, |ci| {
+            ci.width = (w > 0.0).then_some(width.min(255.0));
+            ci.hidden = w == 0.0;
+        });
+    }
+    let mut cache: Vec<(Fmt, u32)> = vec![];
+    let mut style_id = |wb: &mut Workbook, fmt: &Fmt| -> u32 {
+        if fmt.is_empty() {
+            return 0;
+        }
+        if let Some((_, s)) = cache.iter().find(|(f, _)| f == fmt) {
+            return *s;
+        }
+        let s = wb.styles.add(style_of(&fmt.over(&default_fmt)));
+        if cache.len() < 4096 {
+            cache.push((fmt.clone(), s));
+        }
+        s
+    };
+    for (r, h) in heights {
+        sheet.rows.insert(
+            r,
+            RowInfo {
+                height: Some(h),
+                custom_height: true,
+                hidden: h == 0.0,
+                style: None,
+                outline: 0,
+            },
+        );
+    }
+    for (&r, fmt) in &row_fmts {
+        let s = style_id(&mut wb, fmt);
+        sheet.rows.entry(r).or_default().style = Some(s);
+    }
+    for (&c, fmt) in &col_fmts {
+        let s = style_id(&mut wb, fmt);
+        set_cols(&mut cols, c, c, |ci| ci.style = Some(s));
+    }
+    sheet.cols = cols;
+    let mut bad_formulas = 0usize;
+    let keys: Vec<(u32, u32)> = cells
+        .keys()
+        .copied()
+        .chain(cell_fmts.keys().copied())
+        .collect();
+    for (r, c) in keys {
+        if sheet.cells.contains_key(&(r, c)) {
+            continue;
+        }
+        let data = cells.get(&(r, c));
+        let fmt = cell_fmts.get(&(r, c)).cloned().unwrap_or_default();
+        let fmt = fmt.over(
+            row_fmts
+                .get(&r)
+                .or_else(|| col_fmts.get(&c))
+                .unwrap_or(&Fmt::default()),
+        );
+        let style = style_id(&mut wb, &fmt);
+        let Some(d) = data else {
+            budget.cell(0)?;
+            sheet.cells.insert((r, c), Cell::styled(style));
+            continue;
+        };
+        // A shared expression or value: the base cell's, from here.
+        let base = d.shared.and_then(|at| cells.get(&at));
+        let expr = d
+            .expr
+            .as_deref()
+            .or_else(|| base.and_then(|b| b.expr.as_deref()));
+        let value = match (&d.value, base) {
+            (Value::Empty, Some(b)) if b.expr.is_none() => b.value.clone(),
+            (v, _) => v.clone(),
+        };
+        let mut formula = None;
+        if let Some(e) = expr {
+            match r1c1::to_a1(e, (r, c)) {
+                Some(a1) => formula = Some(a1.into_boxed_str()),
+                None => bad_formulas += 1,
+            }
+        }
+        if let (Some((r2, c2)), true) = (d.array, formula.is_some()) {
+            sheet.arrays.insert(
+                (r, c),
+                Range {
+                    r1: r,
+                    c1: c,
+                    r2: r2.max(r),
+                    c2: c2.max(c),
+                },
+            );
+        }
+        if let Some(n) = &d.note {
+            sheet.comments.push(Comment {
+                row: r,
+                col: c,
+                author: String::new(),
+                text: n.chars().take(32_767).collect(),
+                visible: false,
+            });
+        }
+        sheet.cells.insert(
+            (r, c),
+            Cell {
+                value,
+                formula,
+                style,
+            },
+        );
+    }
+    for (name, expr) in names {
+        if let Some(formula) = r1c1::to_a1(&expr, (0, 0)) {
+            wb.names.push(DefinedName {
+                name,
+                sheet: None,
+                formula,
+                hidden: false,
+            });
+        }
+    }
+    if bad_formulas > 0 {
+        wb.warn(format!(
+            "{bad_formulas} formulas could not be read and were left as their values"
+        ));
+    }
+    if sheet.cells.is_empty() && cells.is_empty() && widths_empty(&sheet) {
+        wb.warn("the SYLK file holds no cells");
+    }
+    wb.sheets.push(sheet);
+    Ok(wb)
+}
+
+fn widths_empty(s: &Sheet) -> bool {
+    s.cols.is_empty()
+}
+
+/// Applies `f` to columns `first..=last` of `cols`, a sorted list of
+/// ranges that do not overlap, splitting the ranges it cuts.
+fn set_cols(cols: &mut Vec<ColInfo>, first: u32, last: u32, f: impl Fn(&mut ColInfo)) {
+    let mut out = Vec::with_capacity(cols.len() + 2);
+    let mut covered = first;
+    for ci in cols.drain(..) {
+        if ci.last < first || ci.first > last {
+            out.push(ci);
+            continue;
+        }
+        if ci.first < first {
+            out.push(ColInfo {
+                last: first - 1,
+                ..ci.clone()
+            });
+        }
+        // The gap before this range, then the part inside.
+        let (a, b) = (ci.first.max(first), ci.last.min(last));
+        if covered < a {
+            let mut gap = ColInfo {
+                first: covered,
+                last: a - 1,
+                width: None,
+                hidden: false,
+                style: None,
+                outline: 0,
+            };
+            f(&mut gap);
+            out.push(gap);
+        }
+        let mut mid = ColInfo {
+            first: a,
+            last: b,
+            ..ci.clone()
+        };
+        f(&mut mid);
+        out.push(mid);
+        covered = b.saturating_add(1);
+        if ci.last > last {
+            out.push(ColInfo {
+                first: last + 1,
+                ..ci
+            });
+        }
+    }
+    if covered <= last {
+        let mut rest = ColInfo {
+            first: covered,
+            last,
+            width: None,
+            hidden: false,
+            style: None,
+            outline: 0,
+        };
+        f(&mut rest);
+        out.push(rest);
+    }
+    out.sort_by_key(|c| c.first);
+    *cols = out;
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/exav-render/src/formats/office/sheets/sylk/tests.rs b/crates/exav-render/src/formats/office/sheets/sylk/tests.rs
new file mode 100644
index 00000000..c6acb93b
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/sylk/tests.rs
@@ -0,0 +1,173 @@
+use super::*;
+use crate::formats::office::sheets::limits::Limits;
+
+fn read_bytes(b: &[u8]) -> Workbook {
+    read(b, &mut Budget::new(Limits::default())).unwrap()
+}
+
+fn value(s: &Sheet, r: u32, c: u32) -> &Value {
+    s.cells.get(&(r, c)).map_or(&Value::Empty, |c| &c.value)
+}
+
+/// What Excel writes, cut down: the format and font tables, the default
+/// format, bounds, options, widths, then cells and their formats.
+const SAMPLE: &str = "ID;PWXL;N;E\r
+P;PGeneral\r
+P;P0.00\r
+P;P#,##0;;[Red]\\-#,##0\r
+P;Pdd/mm/yyyy\r
+P;FCalibri;M220;L9\r
+P;ECalibri;M220;SB;L9\r
+P;ECourier New;M200;SI\r
+F;P0;DG0G8;M300\r
+B;Y5;X4;D0 0 4 3\r
+O;L;D;V0;K47;G100 0.001\r
+F;W1 1 17\r
+F;W2 16384 9\r
+F;W4 4 0\r
+F;R2;SDM1;M400\r
+NN;NTotal;ER3C2\r
+C;Y1;X1;K\"Month;;s\"\r
+F;Y1;X1;FG0C;SDTB\r
+C;X2;K\"Units\"\r
+C;Y2;X1;K40087\r
+F;P3;Y2;X1\r
+C;X2;K118\r
+C;Y3;X2;K236;ESUM(R[-1]C:R[-1]C)\r
+F;X2;Y3;F$2R\r
+C;Y4;X2;K1;ER[-2]C/R[-2]C;D\r
+C;Y5;X2;K1;S;R4;C2\r
+C;Y4;X3;KTRUE;AA note\x1b :second line\r
+C;X4;K#N/A\r
+F;Y5;X3;P2;SM2\r
+C;Y5;X1;K\"Caf\x1bNBe \x1bN#5\"\r
+E\r
+C;Y9;X9;K\"after the end\"\r
+";
+
+#[test]
+fn values_and_positions() {
+    let wb = read_bytes(SAMPLE.as_bytes());
+    let s = &wb.sheets[0];
+    assert_eq!(value(s, 0, 0), &Value::text("Month;s"));
+    // X stays when only Y moves, and the other way round.
+    assert_eq!(value(s, 0, 1), &Value::text("Units"));
+    assert_eq!(value(s, 1, 0), &Value::Number(40087.0));
+    assert_eq!(value(s, 1, 1), &Value::Number(118.0));
+    assert_eq!(value(s, 3, 2), &Value::Bool(true));
+    assert_eq!(value(s, 3, 3), &Value::Error(CellError::NA));
+    assert_eq!(value(s, 4, 0), &Value::text("Café £5"));
+    assert!(!s.cells.contains_key(&(8, 8)));
+    assert_eq!(s.comments[0].text, "A note\nsecond line");
+}
+
+#[test]
+fn formulas_and_names() {
+    let wb = read_bytes(SAMPLE.as_bytes());
+    let s = &wb.sheets[0];
+    let f = |r, c| s.cells[&(r, c)].formula.as_deref().map(str::to_string);
+    assert_eq!(f(2, 1).as_deref(), Some("SUM(B2:B2)"));
+    assert_eq!(f(3, 1).as_deref(), Some("B2/B2"));
+    // A shared expression, from the cell that uses it.
+    assert_eq!(f(4, 1).as_deref(), Some("B3/B3"));
+    assert_eq!(value(s, 2, 1), &Value::Number(236.0));
+    assert_eq!(
+        (wb.names[0].name.as_str(), wb.names[0].formula.as_str()),
+        ("Total", "$B$3")
+    );
+}
+
+#[test]
+fn formats_widths_heights() {
+    let wb = read_bytes(SAMPLE.as_bytes());
+    let s = &wb.sheets[0];
+    let st = |r, c| wb.styles.get(s.cells[&(r, c)].style);
+    // The first font is the default.
+    assert_eq!(
+        (
+            wb.styles.get(0).font.name.as_str(),
+            wb.styles.get(0).font.size_centipt
+        ),
+        ("Calibri", 1100)
+    );
+    let head = st(0, 0);
+    assert_eq!(head.align.horizontal, Some("center"));
+    assert!(head.font.bold);
+    assert_eq!(
+        (
+            head.border.top.style,
+            head.border.bottom.style,
+            head.border.left.style
+        ),
+        (Some("thin"), Some("thin"), None)
+    );
+    assert_eq!(st(1, 0).numfmt, "dd/mm/yyyy");
+    assert_eq!(st(2, 1).numfmt, "\"$\"#,##0.00_);\\(\"$\"#,##0.00\\)");
+    assert_eq!(st(2, 1).align.horizontal, Some("right"));
+    let p = st(4, 2);
+    assert_eq!(p.numfmt, "#,##0;[Red]\\-#,##0");
+    assert_eq!(
+        (p.font.name.as_str(), p.font.italic, p.font.size_centipt),
+        ("Courier New", true, 1000)
+    );
+    // Row 2's format: bold, its font.
+    assert!(st(1, 1).font.bold);
+    assert_eq!(s.rows[&1].height, Some(20.0));
+    assert_eq!(s.default_row_height, 15.0);
+    // 17 and 9 characters of Calibri 11's 7-pixel digit, padding in.
+    assert_eq!(s.col_info(0).and_then(|c| c.width), Some(17.7109375));
+    assert_eq!(s.col_info(5).and_then(|c| c.width), Some(9.7109375));
+    assert!(s.col_info(3).unwrap().hidden);
+}
+
+#[test]
+fn line_endings_and_encodings() {
+    // Carriage returns alone, Windows-1252 text.
+    let wb = read_bytes(b"ID;PWXL\rC;Y1;X1;K\"Caf\xe9\"\rC;X2;K2\r");
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("Café"));
+    assert_eq!(value(&wb.sheets[0], 0, 1), &Value::Number(2.0));
+    // Excel for the Macintosh: Mac Roman.
+    let wb = read_bytes(b"ID;PXL;N;E\rC;Y1;X1;K\"\xd1 Caf\x8e\"\r");
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("— Café"));
+    // A semicolon left alone in a quoted value.
+    let wb = read_bytes(b"ID;PWXL\nC;Y1;X1;K\"a;b\";ER1C2\n");
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("a;b"));
+    assert_eq!(wb.sheets[0].cells[&(0, 0)].formula.as_deref(), Some("$B$1"));
+    // UTF-8 when it is.
+    let wb = read_bytes("ID;P\nC;Y1;X1;K\"Café\"\n".as_bytes());
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("Café"));
+    // The 1904 date system.
+    assert!(read_bytes(b"ID;P\nO;V4\n").date1904);
+}
+
+#[test]
+fn refusals_and_limits() {
+    assert!(matches!(
+        read(b"id;P", &mut Budget::new(Limits::default())),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        read(b"<html>", &mut Budget::new(Limits::default())),
+        Err(Error::NotFormat(_))
+    ));
+    let few = Limits::default().with_max_cells(5);
+    assert_eq!(
+        read(SAMPLE.as_bytes(), &mut Budget::new(few)).unwrap_err(),
+        Error::TooLarge("cells")
+    );
+}
+
+#[test]
+fn hostile_files() {
+    let b = SAMPLE.as_bytes();
+    for cut in 0..b.len() {
+        let _ = read(&b[..cut], &mut Budget::new(Limits::default()));
+    }
+    for s in [
+        "ID\nC;Y99999999999;X0;K1\nC;Y1048576;X16384;K\"x\";ER[-9999999]C[99999]\nF;W0 99999 999\nF;W5 2 1\nF;R0;M-5\nF;SM99999999999999999999\n",
+        "ID\nC;Y2;X2;S;R2;C2\nC;Y3;X3;M;R1;C1\nC;Y1;X1;S;R9;C9\n\x1bN\x1b\x1b \x1bNH",
+        "ID\nP;P\nP;F\nF;P99\nNN;N\nNN;E\nC;K\"\n",
+    ] {
+        let _ = read(s.as_bytes(), &mut Budget::new(Limits::default()));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/text.rs b/crates/exav-render/src/formats/office/sheets/text.rs
new file mode 100644
index 00000000..858804c7
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/text.rs
@@ -0,0 +1,490 @@
+//! The text of a workbook, read from the model the readers fill (no XLSX is
+//! written): a section for each sheet with its name and its cells row by row,
+//! then its notes and its drawings' text.
+//!
+//! Left out: formula sources, defined names, styles, pictures, and number
+//! formats: the model holds no displayed text, so a number is written as a
+//! decimal of at most 15 significant digits (a date is its serial).
+
+use crate::formats::office::sheets::model::*;
+use crate::formats::office::sheets::numtext;
+use crate::formats::office::text::{Out, Text};
+use std::collections::HashSet;
+
+/// Characters kept of a validation title or message: Excel's own limit for
+/// the longest of them.
+const NOTE_CHARS: usize = 255;
+
+/// The text of `wb`, cut at `cap` bytes.
+pub(super) fn of(wb: &Workbook, cap: usize) -> Text {
+    let mut out = Out::new(cap);
+    for sh in &wb.sheets {
+        if out.full() {
+            break;
+        }
+        let hidden = if sh.state == SheetState::Visible {
+            ""
+        } else {
+            "hidden "
+        };
+        out.section(format!("{hidden}sheet \"{}\"", sh.name));
+        out.line(&sh.name);
+        cells(sh, &mut out);
+        notes(sh, hidden, &mut out);
+        drawings(sh, hidden, &mut out);
+    }
+    out.finish()
+}
+
+/// Where the cells of a row are written: a line to a row, a tab between
+/// cells that have text.
+struct Rows {
+    row: Option<u32>,
+    started: bool,
+}
+
+impl Rows {
+    /// Starts the next cell, on a new line when `row` is not the current one.
+    fn next(&mut self, out: &mut Out, row: u32) {
+        if self.row != Some(row) {
+            out.newline();
+            self.row = Some(row);
+            self.started = false;
+        }
+        if self.started {
+            out.push("\t");
+        }
+        self.started = true;
+    }
+}
+
+fn cells(sh: &Sheet, out: &mut Out) {
+    // A link belongs to the first cell of its range. Stable: links on one
+    // cell keep their order.
+    let mut links: Vec<((u32, u32), &Hyperlink)> = sh
+        .hyperlinks
+        .iter()
+        .filter_map(|h| {
+            let r = h.range.clipped()?;
+            Some(((r.r1, r.c1), h))
+        })
+        .collect();
+    links.sort_by_key(|l| l.0);
+    let mut links = links.into_iter().peekable();
+    let mut rows = Rows {
+        row: None,
+        started: false,
+    };
+    for (&key, cell) in &sh.cells {
+        // Links on cells the sheet has no value for come in their place.
+        while let Some((at, h)) = links.next_if(|l| l.0 < key) {
+            item(out, &mut rows, at, None, Some(h));
+        }
+        let link = links.next_if(|l| l.0 == key).map(|l| l.1);
+        item(out, &mut rows, key, Some(cell), link);
+        if out.full() {
+            return;
+        }
+    }
+    for (at, h) in links {
+        item(out, &mut rows, at, None, Some(h));
+        if out.full() {
+            return;
+        }
+    }
+}
+
+/// One cell: its value, or the link's display when there is no value, with
+/// the link's target after it. Nothing when it has neither text nor target.
+fn item(
+    out: &mut Out,
+    rows: &mut Rows,
+    at: (u32, u32),
+    cell: Option<&Cell>,
+    link: Option<&Hyperlink>,
+) {
+    let value = cell.map(|c| &c.value).filter(|v| has_text(v));
+    let target = link.map(target).filter(|t| !t.is_empty());
+    let display = link
+        .and_then(|h| h.display.as_deref())
+        .filter(|d| !d.trim().is_empty());
+    if value.is_none() && target.is_none() {
+        return;
+    }
+    rows.next(out, at.0);
+    if let Some(t) = &target {
+        out.begin_link(t);
+    }
+    match (value, display) {
+        (Some(v), _) => push_value(out, v),
+        (None, Some(d)) if target.is_some() => out.push(d),
+        _ => {}
+    }
+    if target.is_some() {
+        out.end_link();
+    }
+}
+
+/// Where a link leads: its address, with the place in it after a `#`.
+fn target(h: &Hyperlink) -> String {
+    let url = h.url.as_deref().unwrap_or("").trim();
+    let place = h.location.as_deref().unwrap_or("").trim();
+    match (url.is_empty(), place.is_empty()) {
+        (false, false) => format!("{url}#{place}"),
+        (false, true) => url.to_string(),
+        (true, false) => format!("#{place}"),
+        (true, true) => String::new(),
+    }
+}
+
+fn has_text(v: &Value) -> bool {
+    match v {
+        Value::Empty => false,
+        Value::Text(t) => !t.trim().is_empty(),
+        Value::Rich(runs) => runs.iter().any(|r| !r.text.trim().is_empty()),
+        _ => true,
+    }
+}
+
+fn push_value(out: &mut Out, v: &Value) {
+    match v {
+        Value::Empty => {}
+        Value::Text(t) => out.push(t),
+        Value::Rich(runs) => {
+            for r in runs.iter() {
+                out.push(&r.text);
+            }
+        }
+        Value::Number(n) => out.push(&numtext::shortest(*n)),
+        Value::Bool(b) => out.push(if *b { "TRUE" } else { "FALSE" }),
+        Value::Error(e) => out.push(e.name()),
+    }
+}
+
+/// Cell comments, then the prompts and messages of data validations, which a
+/// person can see on selecting or filling a cell, whether or not the file
+/// asks for them to be shown.
+fn notes(sh: &Sheet, hidden: &str, out: &mut Out) {
+    if sh.comments.is_empty() && sh.validations.is_empty() {
+        return;
+    }
+    out.section(format!("{hidden}sheet \"{}\" comments", sh.name));
+    for c in &sh.comments {
+        out.line(&c.text);
+        if out.full() {
+            return;
+        }
+    }
+    let mut seen = HashSet::new();
+    for v in &sh.validations {
+        let texts = [&v.prompt_title, &v.prompt, &v.error_title, &v.error];
+        for t in texts.into_iter().flatten() {
+            let t = t.trim();
+            if t.is_empty() || !seen.insert(t) {
+                continue;
+            }
+            let end = t.char_indices().nth(NOTE_CHARS).map_or(t.len(), |i| i.0);
+            out.line(&t[..end]);
+            if out.full() {
+                return;
+            }
+        }
+    }
+}
+
+/// The text of shapes, and the titles and series names of charts.
+fn drawings(sh: &Sheet, hidden: &str, out: &mut Out) {
+    if sh.shapes.is_empty() && sh.charts.is_empty() {
+        return;
+    }
+    out.section(format!("{hidden}sheet \"{}\" drawings", sh.name));
+    for s in &sh.shapes {
+        out.line(&s.text.text);
+    }
+    for c in &sh.charts {
+        let titles = [&c.title, &c.cat_title, &c.val_title];
+        for t in titles.into_iter().flatten() {
+            out.line(t);
+        }
+        for s in c.series.iter().filter_map(|s| s.name.as_deref()) {
+            out.line(s);
+        }
+        if out.full() {
+            return;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::rc::Rc;
+
+    fn book(sheets: Vec<Sheet>) -> Workbook {
+        let mut wb = Workbook::new(Style::default());
+        wb.sheets = sheets;
+        wb
+    }
+
+    fn put(sh: &mut Sheet, r: u32, c: u32, value: Value) {
+        sh.cells.insert(
+            (r, c),
+            Cell {
+                value,
+                formula: None,
+                style: 0,
+            },
+        );
+    }
+
+    fn link(r: u32, c: u32, url: Option<&str>, display: Option<&str>) -> Hyperlink {
+        Hyperlink {
+            range: Range::cell(r, c),
+            url: url.map(Into::into),
+            location: None,
+            tooltip: None,
+            display: display.map(Into::into),
+        }
+    }
+
+    fn labels(t: &Text) -> Vec<&str> {
+        t.sections.iter().map(|s| s.label.as_str()).collect()
+    }
+
+    #[test]
+    fn rows_are_lines_and_cells_are_tab_separated() {
+        let mut s = Sheet::new("Data".into());
+        put(&mut s, 0, 0, Value::text("Item"));
+        put(&mut s, 0, 3, Value::text("Amount"));
+        put(&mut s, 0, 4, Value::Empty);
+        put(&mut s, 1, 1, Value::text("  "));
+        put(&mut s, 2, 0, Value::text("Rent"));
+        put(&mut s, 2, 1, Value::text(" "));
+        put(&mut s, 2, 2, Value::Number(1635.49));
+        put(&mut s, 2, 5, Value::Number(-0.5));
+        let t = of(&book(vec![s]), 1000);
+        assert_eq!(t.text, "Data\nItem\tAmount\nRent\t1635.49\t-0.5\n");
+        assert_eq!(labels(&t), ["sheet \"Data\""]);
+        assert!(!t.truncated);
+    }
+
+    #[test]
+    fn values_are_written_as_a_reader_reads_them() {
+        let mut s = Sheet::new("V".into());
+        put(&mut s, 0, 0, Value::Bool(true));
+        put(&mut s, 0, 1, Value::Bool(false));
+        put(&mut s, 0, 2, Value::Error(CellError::Div0));
+        put(&mut s, 0, 3, Value::Error(CellError::NA));
+        let runs = vec![
+            Run {
+                text: "Hel".into(),
+                font: None,
+            },
+            Run {
+                text: "lo".into(),
+                font: None,
+            },
+        ];
+        put(&mut s, 0, 4, Value::Rich(Rc::from(runs)));
+        put(&mut s, 0, 5, Value::Number(0.1 + 0.2));
+        put(&mut s, 0, 6, Value::Number(1e20));
+        let t = of(&book(vec![s]), 1000);
+        assert_eq!(t.text, "V\nTRUE\tFALSE\t#DIV/0!\t#N/A\tHello\t0.3\t1E+20\n");
+    }
+
+    #[test]
+    fn a_formula_is_its_cached_value() {
+        let mut s = Sheet::new("F".into());
+        s.cells.insert(
+            (0, 0),
+            Cell {
+                value: Value::Number(1635.49),
+                formula: Some("SUM(B2:B4)".into()),
+                style: 0,
+            },
+        );
+        s.cells.insert(
+            (0, 1),
+            Cell {
+                value: Value::Empty,
+                formula: Some("HYPERLINK(\"http://x.test\")".into()),
+                style: 0,
+            },
+        );
+        let mut wb = book(vec![s]);
+        wb.names.push(DefinedName {
+            name: "Auto_Open".into(),
+            sheet: None,
+            formula: "EXEC(\"calc.exe\")".into(),
+            hidden: false,
+        });
+        let t = of(&wb, 1000);
+        assert_eq!(t.text, "F\n1635.49\n");
+    }
+
+    #[test]
+    fn a_hidden_sheet_is_text_labelled_as_hidden() {
+        let mut v = Sheet::new("Shown".into());
+        put(&mut v, 0, 0, Value::text("a"));
+        let mut h = Sheet::new("Secret".into());
+        h.state = SheetState::Hidden;
+        put(&mut h, 0, 0, Value::text("b"));
+        let mut vh = Sheet::new("Deeper".into());
+        vh.state = SheetState::VeryHidden;
+        put(&mut vh, 0, 0, Value::text("c"));
+        vh.comments.push(Comment {
+            row: 0,
+            col: 0,
+            author: String::new(),
+            text: "note".into(),
+            visible: false,
+        });
+        let t = of(&book(vec![v, h, vh]), 1000);
+        assert_eq!(
+            labels(&t),
+            [
+                "sheet \"Shown\"",
+                "hidden sheet \"Secret\"",
+                "hidden sheet \"Deeper\"",
+                "hidden sheet \"Deeper\" comments",
+            ]
+        );
+        assert_eq!(t.text, "Shown\na\nSecret\nb\nDeeper\nc\nnote\n");
+        let s = &t.sections[1];
+        assert_eq!(&t.text[s.range.clone()], "Secret\nb\n");
+    }
+
+    #[test]
+    fn a_sheet_without_cells_is_its_name() {
+        let t = of(&book(vec![Sheet::new("Empty".into())]), 1000);
+        assert_eq!(t.text, "Empty\n");
+    }
+
+    #[test]
+    fn hyperlinks_follow_the_text_of_their_first_cell() {
+        let mut s = Sheet::new("L".into());
+        put(&mut s, 0, 0, Value::text("Docs"));
+        put(&mut s, 1, 0, Value::text("https://same.test/"));
+        put(&mut s, 2, 1, Value::text("B3"));
+        s.hyperlinks.push(Hyperlink {
+            range: Range {
+                r1: 0,
+                c1: 0,
+                r2: 3,
+                c2: 0,
+            },
+            ..link(0, 0, Some("https://docs.test/x"), None)
+        });
+        s.hyperlinks
+            .push(link(1, 0, Some("https://same.test/"), None));
+        // A cell with no value takes the link's display.
+        s.hyperlinks
+            .push(link(2, 0, Some("mailto:a@b.test"), Some("Mail me")));
+        // Nothing to show and nothing to follow.
+        s.hyperlinks.push(link(4, 0, None, Some("lost")));
+        // A place in the sheet.
+        s.hyperlinks.push(Hyperlink {
+            location: Some("Other!A1".into()),
+            ..link(2, 1, None, None)
+        });
+        let t = of(&book(vec![s]), 1000);
+        assert_eq!(
+            t.text,
+            "L\nDocs (https://docs.test/x)\nhttps://same.test/\n\
+             Mail me (mailto:a@b.test)\tB3 (#Other!A1)\n"
+        );
+        assert_eq!(
+            t.links,
+            [
+                ("Docs".to_string(), "https://docs.test/x".to_string()),
+                ("Mail me".to_string(), "mailto:a@b.test".to_string()),
+                ("B3".to_string(), "#Other!A1".to_string()),
+            ]
+        );
+    }
+
+    #[test]
+    fn a_second_link_on_a_cell_is_not_lost() {
+        let mut s = Sheet::new("L".into());
+        put(&mut s, 0, 0, Value::text("Go"));
+        s.hyperlinks
+            .push(link(0, 0, Some("https://one.test/"), None));
+        s.hyperlinks
+            .push(link(0, 0, Some("https://two.test/"), None));
+        let t = of(&book(vec![s]), 1000);
+        assert_eq!(t.text, "L\nGo (https://one.test/)\t (https://two.test/)\n");
+        assert_eq!(t.links.len(), 2);
+    }
+
+    #[test]
+    fn comments_validations_and_drawings_are_their_own_sections() {
+        let mut s = Sheet::new("N".into());
+        put(&mut s, 0, 0, Value::text("cell"));
+        s.comments.push(Comment {
+            row: 0,
+            col: 0,
+            author: "Someone".into(),
+            text: "first\nsecond".into(),
+            visible: true,
+        });
+        let msg = |p: &str| Validation {
+            prompt_title: Some("Title".into()),
+            prompt: Some(p.into()),
+            error_title: None,
+            error: Some("x".repeat(400)),
+            ..Default::default()
+        };
+        s.validations.push(msg("Pick one"));
+        s.validations.push(msg("Pick one"));
+        let anchor = Anchor {
+            from: (0, 0, 0, 0),
+            to: (1, 1, 0, 0),
+        };
+        let mut sh = Shape::new(anchor, "rect");
+        sh.text.text = "In a box".into();
+        s.shapes.push(sh);
+        let mut ch = Chart::new(anchor, ChartKind::Bar);
+        ch.title = Some("Sales".into());
+        ch.val_title = Some("Euros".into());
+        ch.series.push(ChartSeries {
+            name: Some("Q1".into()),
+            name_ref: Some("N!A1".into()),
+            ..Default::default()
+        });
+        ch.series.push(ChartSeries::default());
+        s.charts.push(ch);
+        let t = of(&book(vec![s]), 10_000);
+        assert_eq!(
+            labels(&t),
+            [
+                "sheet \"N\"",
+                "sheet \"N\" comments",
+                "sheet \"N\" drawings"
+            ]
+        );
+        let want = format!(
+            "N\ncell\nfirst\nsecond\nTitle\nPick one\n{}\nIn a box\nSales\nEuros\nQ1\n",
+            "x".repeat(255)
+        );
+        assert_eq!(t.text, want);
+    }
+
+    #[test]
+    fn the_cap_cuts_the_text_and_stops_the_walk() {
+        let mut s = Sheet::new("Big".into());
+        for r in 0..1000 {
+            put(&mut s, r, 0, Value::text("0123456789"));
+        }
+        let t = of(&book(vec![s, Sheet::new("Never".into())]), 100);
+        assert!(t.truncated);
+        assert!(t.text.len() <= 100, "{}", t.text.len());
+        assert!(!t.text.contains("Never"));
+        assert_eq!(labels(&t), ["sheet \"Big\""]);
+        // A cap that fits it all does not truncate.
+        let mut s = Sheet::new("S".into());
+        put(&mut s, 0, 0, Value::text("ab"));
+        let t = of(&book(vec![s]), 5);
+        assert_eq!(t.text, "S\nab\n");
+        assert!(!t.truncated);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/textenc.rs b/crates/exav-render/src/formats/office/sheets/textenc.rs
new file mode 100644
index 00000000..01842715
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/textenc.rs
@@ -0,0 +1,115 @@
+//! Text documents in other encodings than UTF-8, to UTF-8: SpreadsheetML in
+//! the encoding its XML declaration names (HTML is `exav_unpack::html::decode`).
+
+use std::borrow::Cow;
+
+/// How far into a document its encoding is looked for.
+const HEAD: usize = 1024;
+
+/// UTF-16 by its byte order mark, or by the `<` of a document without one.
+fn utf16(b: &[u8]) -> Option<&'static encoding_rs::Encoding> {
+    match b {
+        [0xFF, 0xFE, ..] | [b'<', 0, b'?' | b'!' | b'h' | b'H', 0, ..] => {
+            Some(encoding_rs::UTF_16LE)
+        }
+        [0xFE, 0xFF, ..] | [0, b'<', 0, b'?' | b'!' | b'h' | b'H', ..] => {
+            Some(encoding_rs::UTF_16BE)
+        }
+        _ => None,
+    }
+}
+
+/// UTF-16 cut after an odd byte: the half unit dropped.
+fn even<'a>(b: &'a [u8], enc: &'static encoding_rs::Encoding) -> &'a [u8] {
+    if (enc == encoding_rs::UTF_16LE || enc == encoding_rs::UTF_16BE) && b.len() % 2 == 1 {
+        &b[..b.len() - 1]
+    } else {
+        b
+    }
+}
+
+fn decode<'a>(b: &'a [u8], enc: &'static encoding_rs::Encoding) -> Cow<'a, [u8]> {
+    let b = even(b, enc);
+    match enc.decode_with_bom_removal(b).0 {
+        Cow::Borrowed(s) => Cow::Borrowed(s.as_bytes()),
+        Cow::Owned(s) => Cow::Owned(s.into_bytes()),
+    }
+}
+
+/// The value of `name="..."` (or `'...'`, or bare) in `head`, any case.
+fn attr_value(head: &str, name: &str) -> Option<String> {
+    let lower = head.to_ascii_lowercase();
+    let mut from = 0;
+    while let Some(p) = lower[from..].find(name) {
+        let mut i = from + p + name.len();
+        from = i;
+        let b = lower.as_bytes();
+        while i < b.len() && b[i] == b' ' {
+            i += 1;
+        }
+        if b.get(i) != Some(&b'=') {
+            continue;
+        }
+        i += 1;
+        while i < b.len() && b[i] == b' ' {
+            i += 1;
+        }
+        let quote = b.get(i).copied().filter(|q| matches!(q, b'"' | b'\''));
+        if quote.is_some() {
+            i += 1;
+        }
+        let start = i;
+        while i < b.len() && !matches!(b[i], b'"' | b'\'' | b' ' | b'>' | b';' | b'/') {
+            i += 1;
+        }
+        if i > start {
+            return Some(lower[start..i].to_string());
+        }
+    }
+    None
+}
+
+/// An XML document as UTF-8: its BOM's encoding, else its declaration's.
+pub fn xml_utf8(b: &[u8]) -> Cow<'_, [u8]> {
+    if let Some(enc) = utf16(b) {
+        return decode(b, enc);
+    }
+    if let Some(rest) = b.strip_prefix(b"\xEF\xBB\xBF") {
+        return Cow::Borrowed(rest);
+    }
+    let head = String::from_utf8_lossy(&b[..b.len().min(HEAD)]);
+    let decl = head
+        .split("?>")
+        .next()
+        .filter(|_| head.starts_with("<?xml"))
+        .unwrap_or("");
+    match attr_value(decl, "encoding").and_then(|l| encoding_rs::Encoding::for_label(l.as_bytes()))
+    {
+        Some(enc) if enc != encoding_rs::UTF_8 => decode(b, enc),
+        _ => Cow::Borrowed(b),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn xml() {
+        let latin = b"<?xml version=\"1.0\" encoding=\"windows-1251\"?><a>\xC0</a>";
+        assert_eq!(
+            std::str::from_utf8(&xml_utf8(latin)).unwrap(),
+            "<?xml version=\"1.0\" encoding=\"windows-1251\"?><a>\u{410}</a>"
+        );
+        let utf16: Vec<u8> = [0xFF, 0xFE]
+            .into_iter()
+            .chain("<a>é</a>".encode_utf16().flat_map(u16::to_le_bytes))
+            .collect();
+        assert_eq!(&*xml_utf8(&utf16), "<a>é</a>".as_bytes());
+        assert_eq!(&*xml_utf8(b"\xEF\xBB\xBF<a/>"), b"<a/>");
+        assert_eq!(
+            &*xml_utf8(b"<a encoding='latin1'>\xE9</a>"),
+            b"<a encoding='latin1'>\xE9</a>"
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/cf.rs b/crates/exav-render/src/formats/office/sheets/xls/cf.rs
new file mode 100644
index 00000000..1c37e205
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/cf.rs
@@ -0,0 +1,722 @@
+//! Conditional formats (CFHEADER and CF; CONDFMT12 and CF12; CFEX) and
+//! data validation (DV) of a sheet ([MS-XLS] 2.4.42 to 2.4.57, 2.4.105).
+
+use super::formula::{self, Ctx};
+use super::stream::Rec;
+use super::{BORDER_STYLES, Globals, PATTERNS, SplitReader};
+use crate::formats::office::common::bytes::Cur;
+use crate::formats::office::sheets::model::*;
+
+/// A CFHEADER or CONDFMT12 and the rules read after it.
+pub(crate) struct Pending {
+    id: u16,
+    ranges: Vec<Range>,
+    /// CF12 rules expected, or CF.
+    twelve: bool,
+    rules: Vec<(CfRule, u16)>,
+}
+
+fn ranges(c: &mut Cur) -> Vec<Range> {
+    let n = c.u16() as usize;
+    let mut out = vec![];
+    for _ in 0..n.min(1026) {
+        let r1 = c.u16() as u32;
+        let r2 = c.u16() as u32;
+        let c1 = c.u16() as u32;
+        let c2 = c.u16() as u32;
+        if c.short {
+            break;
+        }
+        if r2 >= r1 && c2 >= c1 {
+            out.push(Range { r1, c1, r2, c2 });
+        }
+    }
+    out
+}
+
+/// CFHEADER (0x01B0) or CONDFMT12 (0x0879), whose 12-byte future record
+/// header comes first.
+pub(crate) fn header(d: &[u8], twelve: bool) -> Option<Pending> {
+    let mut c = Cur::new(d);
+    if twelve {
+        c.skip(12);
+    }
+    c.u16();
+    let id = c.u16() >> 1;
+    c.skip(8);
+    let ranges = ranges(&mut c);
+    (!ranges.is_empty()).then_some(Pending {
+        id,
+        ranges,
+        twelve,
+        rules: vec![],
+    })
+}
+
+/// The colours of the default Office theme, for theme colour references.
+fn theme(i: u32, tint: f64) -> Option<Rgb> {
+    const T: [u32; 12] = [
+        0xFFFFFF, 0x000000, 0xEEECE1, 0x1F497D, 0x4F81BD, 0xC0504D, 0x9BBB59, 0x8064A2, 0x4BACC6,
+        0xF79646, 0x0000FF, 0x800080,
+    ];
+    let c = *T.get(i as usize)?;
+    if tint == 0.0 {
+        return Some(c);
+    }
+    let ch = |s: u32| -> u32 {
+        let v = f64::from((c >> s) & 0xFF);
+        let v = if tint < 0.0 {
+            v * (1.0 + tint)
+        } else {
+            v + (255.0 - v) * tint
+        };
+        (v.round().clamp(0.0, 255.0) as u32) << s
+    };
+    Some(ch(16) | ch(8) | ch(0))
+}
+
+/// A CFColor (16 bytes) or FullColorExt's colour.
+fn full_color(g: &Globals, kind: u32, value: u32, tint: f64) -> Option<Rgb> {
+    match kind {
+        1 => g.color(value as u16),
+        2 => Some((value & 0xFF) << 16 | (value & 0xFF00) | (value >> 16) & 0xFF),
+        3 => theme(value, tint),
+        _ => None,
+    }
+}
+
+fn cf_color(g: &Globals, c: &mut Cur) -> Option<Rgb> {
+    let kind = c.u32();
+    let value = c.u32();
+    let tint = c.f64();
+    full_color(g, kind, value, tint)
+}
+
+/// DXFN ([MS-XLS] 2.5.95).
+fn read_dxfn(g: &Globals, c: &mut Cur) -> Dxf {
+    let f1 = c.u32();
+    let f2 = c.u16();
+    let mut d = Dxf::default();
+    if f1 & (1 << 25) != 0 {
+        if f2 & 1 != 0 {
+            let cb = c.u16() as usize;
+            let mut c2 = Cur::at(c.d, c.p);
+            let n = c2.u16() as usize;
+            let fl = c2.u8();
+            if f1 & (1 << 19) == 0 {
+                d.numfmt = Some(formula::read_chars(&mut c2, n, fl & 1 != 0));
+            }
+            c.skip(cb.saturating_sub(2));
+        } else {
+            c.u8();
+            let id = u16::from(c.u8());
+            if f1 & (1 << 19) == 0 {
+                d.numfmt = Some(g.numfmt(id));
+            }
+        }
+    }
+    if f1 & (1 << 26) != 0 {
+        let start = c.p;
+        c.skip(64);
+        let _height = c.i32();
+        let ts = c.u32();
+        let bls = c.u16();
+        let _sss = c.u16();
+        let uls = c.u8();
+        c.skip(3);
+        let icv = c.i32();
+        c.u32();
+        let ts_ninch = c.u32();
+        let _sss_ninch = c.u32();
+        let uls_ninch = c.u32();
+        let bls_ninch = c.u32();
+        c.p = start + 118;
+        if icv != -1 && icv != 0x7FFF {
+            d.font_color = g.color(icv as u16);
+        }
+        if bls_ninch == 0 && bls != 0xFFFF {
+            d.bold = Some(bls >= 600);
+        }
+        if ts_ninch & 2 == 0 {
+            d.italic = Some(ts & 2 != 0);
+        }
+        if ts_ninch & 0x80 == 0 {
+            d.strike = Some(ts & 0x80 != 0);
+        }
+        if uls_ninch == 0 && uls != 0xFF {
+            d.underline = Some(match uls {
+                1 => "single",
+                2 => "double",
+                0x21 => "singleAccounting",
+                0x22 => "doubleAccounting",
+                _ => "none",
+            });
+        }
+    }
+    if f1 & (1 << 27) != 0 {
+        c.skip(8);
+    }
+    if f1 & (1 << 28) != 0 {
+        let b1 = c.u32();
+        let b2 = c.u32();
+        let e = |st: u32, col: u32, ninch: bool| -> Edge {
+            if ninch {
+                return Edge::default();
+            }
+            let s = BORDER_STYLES.get(st as usize).copied().flatten();
+            Edge {
+                style: s,
+                color: if s.is_some() {
+                    g.color(col as u16).or(Some(0))
+                } else {
+                    None
+                },
+            }
+        };
+        d.border = Some(Border {
+            left: e(b1 & 15, (b1 >> 16) & 0x7F, f1 & (1 << 10) != 0),
+            right: e((b1 >> 4) & 15, (b1 >> 23) & 0x7F, f1 & (1 << 11) != 0),
+            top: e((b1 >> 8) & 15, b2 & 0x7F, f1 & (1 << 12) != 0),
+            bottom: e((b1 >> 12) & 15, (b2 >> 7) & 0x7F, f1 & (1 << 13) != 0),
+            ..Default::default()
+        });
+    }
+    if f1 & (1 << 29) != 0 {
+        let p = c.u32();
+        let fls = ((p >> 10) & 0x3F) as usize;
+        let fg = ((p >> 16) & 0x7F) as u16;
+        let bg = ((p >> 23) & 0x7F) as u16;
+        let pattern = if f1 & (1 << 16) != 0 {
+            "solid"
+        } else {
+            PATTERNS.get(fls).copied().unwrap_or("none")
+        };
+        let fg = if f1 & (1 << 17) == 0 {
+            g.color(fg)
+        } else {
+            None
+        };
+        let bg = if f1 & (1 << 18) == 0 {
+            g.color(bg)
+        } else {
+            None
+        };
+        if pattern == "solid" {
+            // A conditional format's solid fill is its background colour.
+            if let Some(c) = bg.or(fg) {
+                d.fill = Some(Fill::solid(c));
+            }
+        } else if pattern != "none" {
+            d.fill = Some(Fill { pattern, fg, bg });
+        }
+    }
+    if f1 & (1 << 30) != 0 {
+        c.skip(2);
+    }
+    d
+}
+
+/// XFExtNoFRT after a DXFN in a DXFN12: full colours over the indexed ones.
+fn read_xfext(g: &Globals, c: &mut Cur, end: usize, d: &mut Dxf) {
+    c.skip(6);
+    let n = c.u16();
+    for _ in 0..n.min(64) {
+        if c.p + 4 > end {
+            break;
+        }
+        let start = c.p;
+        let kind = c.u16();
+        let cb = c.u16() as usize;
+        if cb < 4 {
+            break;
+        }
+        let xtype = u32::from(c.u16());
+        let tint = f64::from(c.i16()) / 32767.0;
+        let value = c.u32();
+        let col = full_color(g, xtype, value, tint);
+        match (kind, col) {
+            // A solid fill shows its background colour (read_dxfn), kept in `fg`.
+            (4, Some(rgb)) => {
+                if let Some(f) = d.fill.as_mut().filter(|f| f.pattern != "solid") {
+                    f.fg = Some(rgb);
+                }
+            }
+            (5, Some(rgb)) => {
+                if let Some(f) = d.fill.as_mut() {
+                    if f.pattern == "solid" {
+                        f.fg = Some(rgb);
+                    } else {
+                        f.bg = Some(rgb);
+                    }
+                }
+            }
+            (13, Some(rgb)) => d.font_color = Some(rgb),
+            (7..=10, Some(rgb)) => {
+                if let Some(b) = d.border.as_mut() {
+                    let e = match kind {
+                        7 => &mut b.top,
+                        8 => &mut b.bottom,
+                        9 => &mut b.left,
+                        _ => &mut b.right,
+                    };
+                    if e.style.is_some() {
+                        e.color = Some(rgb);
+                    }
+                }
+            }
+            _ => {}
+        }
+        c.p = start + cb;
+    }
+}
+
+/// DXFN12: a DXFN and its extension, or nothing.
+fn read_dxfn12(g: &Globals, c: &mut Cur) -> Option<Dxf> {
+    let cb = c.u32() as usize;
+    if cb == 0 {
+        c.skip(2);
+        return None;
+    }
+    let end = c.p.saturating_add(cb).min(c.d.len());
+    let mut d = read_dxfn(g, c);
+    if c.p + 8 <= end {
+        read_xfext(g, c, end, &mut d);
+    }
+    c.p = end;
+    Some(d)
+}
+
+fn operator(cp: u8) -> Option<&'static str> {
+    Some(match cp {
+        1 => "between",
+        2 => "notBetween",
+        3 => "equal",
+        4 => "notEqual",
+        5 => "greaterThan",
+        6 => "lessThan",
+        7 => "greaterThanOrEqual",
+        8 => "lessThanOrEqual",
+        _ => return None,
+    })
+}
+
+fn cfvo(ctx: &Ctx, c: &mut Cur, anchor: (u32, u32)) -> Cfvo {
+    let t = c.u8();
+    let cce = c.u16() as usize;
+    let rgce = c.bytes(cce).to_vec();
+    let num = if cce == 0 && !matches!(t, 2 | 3) {
+        Some(c.f64())
+    } else {
+        None
+    };
+    let kind = match t {
+        2 => "min",
+        3 => "max",
+        4 => "percent",
+        5 => "percentile",
+        7 => "formula",
+        _ => "num",
+    };
+    let val = if cce > 0 {
+        formula::decode_relative(ctx, &rgce, anchor.0, anchor.1)
+            .ok()
+            .map(|d| d.text)
+    } else {
+        num.map(crate::formats::office::sheets::numtext::shortest)
+    };
+    let kind = if kind == "num" && cce > 0 {
+        "formula"
+    } else {
+        kind
+    };
+    Cfvo { kind, val }
+}
+
+const ICON_SETS: [&str; 17] = [
+    "3Arrows",
+    "3ArrowsGray",
+    "3Flags",
+    "3TrafficLights1",
+    "3TrafficLights2",
+    "3Signs",
+    "3Symbols",
+    "3Symbols2",
+    "4Arrows",
+    "4ArrowsGray",
+    "4RedToBlack",
+    "4Rating",
+    "4TrafficLights",
+    "5Arrows",
+    "5ArrowsGray",
+    "5Rating",
+    "5Quarters",
+];
+
+/// A CF, CF12 or CFEX record, added to the last pending header.
+pub(crate) fn rule(g: &Globals, ctx: &Ctx, r: &Rec, cfs: &mut [Pending]) {
+    if r.id == 0x087B {
+        extend(g, &r.data, cfs);
+        return;
+    }
+    let Some(p) = cfs.last_mut() else { return };
+    let anchor = p
+        .ranges
+        .iter()
+        .map(|r| (r.r1, r.c1))
+        .min()
+        .unwrap_or((0, 0));
+    let mut c = Cur::new(&r.data);
+    let twelve = r.id == 0x087A;
+    if twelve {
+        c.skip(12);
+    }
+    let ct = c.u8();
+    let cp = c.u8();
+    let cce1 = c.u16() as usize;
+    let cce2 = c.u16() as usize;
+    let dxf = if twelve {
+        read_dxfn12(g, &mut c)
+    } else {
+        Some(read_dxfn(g, &mut c))
+    };
+    let r1 = c.bytes(cce1).to_vec();
+    let r2 = c.bytes(cce2).to_vec();
+    let dec = |r: &[u8]| -> Option<String> {
+        if r.is_empty() {
+            return None;
+        }
+        formula::decode_relative(ctx, r, anchor.0, anchor.1)
+            .ok()
+            .map(|d| d.text)
+    };
+    let (mut stop, mut priority, mut template, mut params) = (false, 0u16, 0u16, [0u8; 16]);
+    if twelve {
+        let n = c.u16() as usize;
+        c.skip(n);
+        let flags = c.u8();
+        stop = flags & 2 != 0;
+        priority = c.u16();
+        template = c.u16();
+        let cb = c.u8() as usize;
+        let b = c.bytes(cb.min(16));
+        params[..b.len()].copy_from_slice(b);
+        c.skip(cb.saturating_sub(16));
+    }
+    let kind = match ct {
+        1 => {
+            let Some(op) = operator(cp) else { return };
+            let Some(f1) = dec(&r1) else { return };
+            let mut formulas = vec![f1];
+            if matches!(cp, 1 | 2) {
+                formulas.extend(dec(&r2));
+            }
+            CfKind::CellIs {
+                operator: op,
+                formulas,
+            }
+        }
+        2 => {
+            let Some(f) = dec(&r1) else { return };
+            template_kind(template, &params, f, anchor)
+        }
+        3 => {
+            c.skip(3);
+            let n = c.u8() as usize;
+            let m = c.u8() as usize;
+            c.u8();
+            let mut cfvos = vec![];
+            for _ in 0..n.min(3) {
+                cfvos.push(cfvo(ctx, &mut c, anchor));
+                c.f64();
+            }
+            let mut colors = vec![];
+            for _ in 0..m.min(3) {
+                c.f64();
+                colors.push(cf_color(g, &mut c).unwrap_or(0));
+            }
+            if cfvos.len() < 2 || cfvos.len() != colors.len() {
+                return;
+            }
+            CfKind::ColorScale { cfvos, colors }
+        }
+        4 => {
+            c.skip(3);
+            c.u8();
+            c.skip(2);
+            let color = cf_color(g, &mut c).unwrap_or(0x638EC6);
+            let min = cfvo(ctx, &mut c, anchor);
+            let max = cfvo(ctx, &mut c, anchor);
+            CfKind::DataBar { min, max, color }
+        }
+        5 => {
+            c.skip(3);
+            let flags = c.u8();
+            let n = c.u16();
+            let mut attrs = vec![("rank", n.to_string())];
+            if flags & 1 == 0 {
+                attrs.push(("bottom", "1".into()));
+            }
+            if flags & 2 != 0 {
+                attrs.push(("percent", "1".into()));
+            }
+            CfKind::Other {
+                kind: "top10",
+                attrs,
+                formulas: vec![],
+            }
+        }
+        6 => {
+            c.skip(3);
+            let n = c.u8() as usize;
+            let set = c.u8() as usize;
+            let flags = c.u8();
+            let mut cfvos = vec![];
+            for _ in 0..n.min(5) {
+                cfvos.push(cfvo(ctx, &mut c, anchor));
+                c.u8();
+                c.u32();
+            }
+            let Some(&name) = ICON_SETS.get(set) else {
+                return;
+            };
+            CfKind::IconSet {
+                set: name.to_string(),
+                cfvos,
+                reverse: flags & 4 != 0,
+                show_value: flags & 1 == 0,
+            }
+        }
+        _ => return,
+    };
+    if c.short && !twelve {
+        return;
+    }
+    let dxf = if matches!(
+        kind,
+        CfKind::ColorScale { .. } | CfKind::DataBar { .. } | CfKind::IconSet { .. }
+    ) {
+        None
+    } else {
+        dxf
+    };
+    if p.rules.len() < 1024 {
+        p.rules.push((
+            CfRule {
+                kind,
+                dxf,
+                stop,
+                priority: u32::from(priority),
+            },
+            priority,
+        ));
+    }
+}
+
+/// An expression rule as the template it was made from, where XLSX has a
+/// rule type for it; the formula stays, as Excel writes it.
+fn template_kind(template: u16, params: &[u8; 16], f: String, anchor: (u32, u32)) -> CfKind {
+    let _ = anchor;
+    let period = match template {
+        0x0F => Some("today"),
+        0x10 => Some("tomorrow"),
+        0x11 => Some("yesterday"),
+        0x12 => Some("last7Days"),
+        0x13 => Some("lastMonth"),
+        0x14 => Some("nextMonth"),
+        0x15 => Some("thisWeek"),
+        0x16 => Some("nextWeek"),
+        0x17 => Some("lastWeek"),
+        0x18 => Some("thisMonth"),
+        _ => None,
+    };
+    if let Some(p) = period {
+        return CfKind::Other {
+            kind: "timePeriod",
+            attrs: vec![("timePeriod", p.into())],
+            formulas: vec![f],
+        };
+    }
+    match template {
+        0x09 => CfKind::Other {
+            kind: "containsBlanks",
+            attrs: vec![],
+            formulas: vec![f],
+        },
+        0x0A => CfKind::Other {
+            kind: "notContainsBlanks",
+            attrs: vec![],
+            formulas: vec![f],
+        },
+        0x0B => CfKind::Other {
+            kind: "containsErrors",
+            attrs: vec![],
+            formulas: vec![f],
+        },
+        0x0C => CfKind::Other {
+            kind: "notContainsErrors",
+            attrs: vec![],
+            formulas: vec![f],
+        },
+        0x08 => {
+            let (kind, op) = match u16::from_le_bytes([params[0], params[1]]) {
+                1 => ("notContainsText", "notContains"),
+                2 => ("beginsWith", "beginsWith"),
+                3 => ("endsWith", "endsWith"),
+                _ => ("containsText", "containsText"),
+            };
+            CfKind::Other {
+                kind,
+                attrs: vec![("operator", op.into())],
+                formulas: vec![f],
+            }
+        }
+        _ => CfKind::Expression { formula: f },
+    }
+}
+
+/// CFEX: priority, stop flag and full colours of a CF rule.
+fn extend(g: &Globals, d: &[u8], cfs: &mut [Pending]) {
+    let mut c = Cur::new(d);
+    c.skip(12);
+    let is12 = c.u32() != 0;
+    let id = c.u16();
+    if is12 {
+        return;
+    }
+    let icf = c.u16() as usize;
+    let _cp = c.u8();
+    let _template = c.u8();
+    let priority = c.u16();
+    let flags = c.u8();
+    c.u8();
+    let has_dxf = c.u8() != 0;
+    let dxf = if has_dxf {
+        read_dxfn12(g, &mut c)
+    } else {
+        None
+    };
+    let Some(p) = cfs.iter_mut().rev().find(|p| p.id == id && !p.twelve) else {
+        return;
+    };
+    if let Some((rule, prio)) = p.rules.get_mut(icf) {
+        rule.stop = flags & 2 != 0;
+        rule.priority = u32::from(priority);
+        *prio = priority;
+        if let (Some(new), Some(old)) = (dxf, rule.dxf.as_mut()) {
+            if new.font_color.is_some() {
+                old.font_color = new.font_color;
+            }
+            if let (Some(nf), Some(of)) = (new.fill, old.fill.as_mut()) {
+                of.fg = nf.fg.or(of.fg);
+                of.bg = nf.bg.or(of.bg);
+            }
+        }
+    }
+}
+
+pub(crate) fn finish(cfs: Vec<Pending>) -> Vec<CondFormat> {
+    cfs.into_iter()
+        .filter(|p| !p.rules.is_empty())
+        .map(|p| CondFormat {
+            ranges: p.ranges,
+            rules: p.rules.into_iter().map(|r| r.0).collect(),
+        })
+        .collect()
+}
+
+/// DV ([MS-XLS] 2.4.105).
+pub(crate) fn validation(ctx: &Ctx, d: &[u8], breaks: &[usize]) -> Option<Validation> {
+    let mut c = Cur::new(d);
+    let flags = c.u32();
+    let mut strs: Vec<String> = Vec::with_capacity(4);
+    for _ in 0..4 {
+        let mut sr = SplitReader { d, breaks, p: c.p };
+        let n = sr.u16() as usize;
+        let f = sr.u8();
+        let s = sr.chars(n, f & 1 != 0);
+        c.p = sr.p.min(d.len());
+        strs.push(if s == "\0" { String::new() } else { s });
+    }
+    let cce1 = c.u16() as usize;
+    c.u16();
+    let f1 = c.bytes(cce1).to_vec();
+    let cce2 = c.u16() as usize;
+    c.u16();
+    let f2 = c.bytes(cce2).to_vec();
+    let ranges = ranges(&mut c);
+    if ranges.is_empty() {
+        return None;
+    }
+    let anchor = ranges.iter().map(|r| (r.r1, r.c1)).min().unwrap_or((0, 0));
+    let kind = match flags & 15 {
+        1 => "whole",
+        2 => "decimal",
+        3 => "list",
+        4 => "date",
+        5 => "time",
+        6 => "textLength",
+        7 => "custom",
+        _ => "none",
+    };
+    let dec = |r: &[u8]| -> Option<String> {
+        if r.is_empty() {
+            return None;
+        }
+        formula::decode_relative(ctx, r, anchor.0, anchor.1)
+            .ok()
+            .map(|d| d.text)
+    };
+    let mut formula1 = dec(&f1);
+    if kind == "list" && flags & 0x80 != 0 {
+        // An explicit list: a string with its items separated by NUL.
+        formula1 = formula1.map(|f| f.replace('\0', ","));
+    }
+    let operator = match (flags >> 20) & 15 {
+        1 => "notBetween",
+        2 => "equal",
+        3 => "notEqual",
+        4 => "greaterThan",
+        5 => "lessThan",
+        6 => "greaterThanOrEqual",
+        7 => "lessThanOrEqual",
+        _ => "between",
+    };
+    let opt = |s: &String| if s.is_empty() { None } else { Some(s.clone()) };
+    Some(Validation {
+        ranges,
+        kind,
+        operator,
+        formula1,
+        formula2: dec(&f2),
+        allow_blank: flags & 0x100 != 0,
+        hide_dropdown: flags & 0x200 != 0,
+        show_input: flags & 0x40000 != 0,
+        show_error: flags & 0x80000 != 0,
+        error_style: match (flags >> 4) & 7 {
+            1 => "warning",
+            2 => "information",
+            _ => "stop",
+        },
+        prompt_title: opt(&strs[0]),
+        error_title: opt(&strs[1]),
+        prompt: opt(&strs[2]),
+        error: opt(&strs[3]),
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_solid_fill_shows_its_background_colour() {
+        // DXFN with a pattern block: solid, foreground 60 (#993300),
+        // background 10 (red).
+        let mut d = (1u32 << 29).to_le_bytes().to_vec();
+        d.extend(0u16.to_le_bytes());
+        d.extend(((1u32 << 10) | (60 << 16) | (10 << 23)).to_le_bytes());
+        let g = Globals::new(8);
+        let dxf = read_dxfn(&g, &mut Cur::new(&d));
+        assert_eq!(dxf.fill, Some(Fill::solid(0xFF0000)));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/chart.rs b/crates/exav-render/src/formats/office/sheets/xls/chart.rs
new file mode 100644
index 00000000..e4040339
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/chart.rs
@@ -0,0 +1,454 @@
+//! BIFF chart substreams ([MS-XLS] 2.2.3, 2.4.3 to 2.4.324): an embedded
+//! chart's or a chart sheet's records to the chart model. The values are
+//! references to cells, read once the workbook is (`charts::fill`), or the
+//! chart's own cached data where it has some.
+
+use super::Globals;
+use super::formula;
+use super::stream::Rec;
+use crate::formats::office::common::bytes::{Cur, u16_at};
+use crate::formats::office::sheets::model::*;
+
+/// What a Begin/End block is about.
+#[derive(Clone, Copy, PartialEq, Debug)]
+enum Ctx {
+    Chart,
+    Series(usize),
+    /// A text: what it is attached to, and its flags.
+    Text(Option<u16>, u16),
+    AxisParent(bool),
+    Axis(u16),
+    ChartFormat(usize),
+    Frame(bool),
+    Legend,
+    DataFormat(Option<usize>, Option<u32>),
+    Other,
+}
+
+#[derive(Default)]
+struct Group {
+    kind: Option<ChartKind>,
+    horizontal: bool,
+    grouping: &'static str,
+    three_d: bool,
+    vary: bool,
+    gap: Option<u32>,
+    overlap: Option<i32>,
+    hole: Option<u32>,
+    first_slice: Option<u32>,
+    secondary: bool,
+    legend: Option<&'static str>,
+}
+
+/// A LongRGB: red, green, blue, reserved.
+fn rgb(d: &[u8], at: usize) -> Rgb {
+    let b = |i: usize| u32::from(d.get(at + i).copied().unwrap_or(0));
+    b(0) << 16 | b(1) << 8 | b(2)
+}
+
+fn short_string(d: &[u8], at: usize) -> String {
+    let mut c = Cur::at(d, at);
+    let n = c.u8() as usize;
+    let f = c.u8();
+    formula::read_chars(&mut c, n, f & 1 != 0)
+}
+
+/// The chart of a chart substream; `anchor` places an embedded one.
+pub(crate) fn read_chart(
+    g: &Globals,
+    recs: &[Rec],
+    anchor: Option<Anchor>,
+    wb: &mut Workbook,
+) -> Option<Chart> {
+    let ctx = g.book.ctx(&[]);
+    let mut stack: Vec<Ctx> = vec![];
+    let mut last = Ctx::Other;
+    let mut series: Vec<ChartSeries> = vec![];
+    let mut ser_group: Vec<usize> = vec![];
+    let mut groups: Vec<Group> = vec![];
+    let mut secondary = false;
+    let mut title: Option<String> = None;
+    let mut auto_title = false;
+    let mut cat_title: Option<String> = None;
+    let mut val_title: Option<String> = None;
+    let mut text_string: Option<String> = None;
+    let mut major_grid = false;
+    let mut legend: Option<&'static str> = None;
+    let mut plot_fill: Option<Rgb> = None;
+    let mut area_fill: Option<Rgb> = None;
+    // Cached data: (kind, point, series) values after SIINDEX records.
+    let mut cache_kind = 0u16;
+    let mut cached_vals: Vec<(u16, u32, u32, Value)> = vec![];
+    let mut depth = 0;
+    let mut plot_next = false;
+    let mut axis_line: Option<u16> = None;
+    for r in recs.iter().take(1 << 20) {
+        let d = &r.data;
+        match r.id {
+            id if super::stream::BOF_IDS.contains(&id) => depth += 1,
+            0x000A => depth -= 1,
+            _ => {}
+        }
+        if depth > 1 {
+            continue;
+        }
+        let top = stack.last().copied().unwrap_or(Ctx::Other);
+        match r.id {
+            0x1033 => {
+                stack.push(last);
+                if stack.len() > 64 {
+                    return None;
+                }
+            }
+            0x1034 => {
+                if let Some(Ctx::Text(link, flags)) = stack.pop() {
+                    let t = text_string.take();
+                    // fDeleted: not shown; fAutoText without a string: the
+                    // text the application makes.
+                    let deleted = flags & 0x40 != 0;
+                    match (link, t) {
+                        (Some(1), Some(t)) if !deleted => title = Some(t),
+                        (Some(1), None) if !deleted && flags & 0x10 != 0 => auto_title = true,
+                        (Some(2), Some(t)) if !deleted => val_title = Some(t),
+                        (Some(3), Some(t)) if !deleted => cat_title = Some(t),
+                        _ => {}
+                    }
+                }
+                last = Ctx::Other;
+            }
+            0x1002 => last = Ctx::Chart,
+            0x1003 => {
+                if series.len() >= 256 {
+                    last = Ctx::Other;
+                    continue;
+                }
+                series.push(ChartSeries {
+                    line: true,
+                    ..Default::default()
+                });
+                ser_group.push(0);
+                // Numeric or text categories.
+                if u16_at(d, 0) == 1
+                    && let Some(s) = series.last_mut()
+                {
+                    s.cat_nums = Some(vec![]);
+                }
+                last = Ctx::Series(series.len() - 1);
+            }
+            0x1051 => {
+                let Ctx::Series(i) = top else { continue };
+                let id = d.first().copied().unwrap_or(0);
+                let rt = d.get(1).copied().unwrap_or(0);
+                let cce = u16_at(d, 6) as usize;
+                let rgce = d.get(8..8 + cce).unwrap_or(&[]);
+                let text = if rt == 2 && !rgce.is_empty() {
+                    formula::decode(&ctx, rgce, &[], 0, 0).ok().map(|x| x.text)
+                } else {
+                    None
+                };
+                if let (Some(s), Some(f)) = (series.get_mut(i), text) {
+                    match id {
+                        0 => s.name_ref = Some(f),
+                        1 => s.val_ref = Some(f),
+                        2 => s.cat_ref = Some(f),
+                        3 => s.size_ref = Some(f),
+                        _ => {}
+                    }
+                }
+            }
+            0x100D => {
+                let t = short_string(d, 2);
+                match top {
+                    Ctx::Series(i) => {
+                        if let Some(s) = series.get_mut(i) {
+                            s.name = Some(t);
+                        }
+                    }
+                    Ctx::Text(..) => text_string = Some(t),
+                    _ => {}
+                }
+            }
+            0x1045 => {
+                if let Ctx::Series(i) = top
+                    && let Some(x) = ser_group.get_mut(i)
+                {
+                    *x = u16_at(d, 0) as usize;
+                }
+            }
+            0x1006 => {
+                let xi = u16_at(d, 0);
+                let yi = u16_at(d, 2) as usize;
+                let point = (xi != 0xFFFF).then_some(u32::from(xi));
+                last = Ctx::DataFormat(
+                    Some(yi).filter(|&y| y < series.len()).or(match top {
+                        Ctx::Series(i) => Some(i),
+                        _ => None,
+                    }),
+                    point,
+                );
+            }
+            0x100A => {
+                let auto = u16_at(d, 10) & 1 != 0;
+                let fls = u16_at(d, 8);
+                let color = if auto {
+                    g.color(u16_at(d, 12)).unwrap_or_else(|| rgb(d, 0))
+                } else {
+                    rgb(d, 0)
+                };
+                match top {
+                    Ctx::DataFormat(Some(i), point) => {
+                        if let Some(s) = series.get_mut(i)
+                            && fls != 0
+                        {
+                            match point {
+                                Some(p) => s.point_colors.push((p, color)),
+                                None if !auto => s.color = Some(color),
+                                None => {}
+                            }
+                        }
+                    }
+                    Ctx::Frame(true) if fls != 0 && !auto => plot_fill = Some(color),
+                    Ctx::Frame(false) if fls != 0 && !auto => area_fill = Some(color),
+                    _ => {}
+                }
+            }
+            0x1007 => {
+                let lns = u16_at(d, 4);
+                let auto = u16_at(d, 8) & 1 != 0;
+                if let Ctx::DataFormat(Some(i), None) = top
+                    && let Some(s) = series.get_mut(i)
+                {
+                    if lns == 5 {
+                        s.line = false;
+                    } else if !auto && s.color.is_none() {
+                        s.color = Some(rgb(d, 0));
+                    }
+                }
+                if top == Ctx::Axis(1) && axis_line == Some(1) && lns != 5 {
+                    major_grid = true;
+                }
+            }
+            0x1009 => {
+                if let Ctx::DataFormat(Some(i), None) = top
+                    && let Some(s) = series.get_mut(i)
+                {
+                    s.marker = u16_at(d, 8) != 0;
+                }
+            }
+            0x1032 => {
+                last = Ctx::Frame(plot_next);
+                plot_next = false;
+            }
+            // The next Frame is the plot area's.
+            0x1035 => plot_next = true,
+            0x1041 => {
+                secondary = u16_at(d, 0) == 1;
+                last = Ctx::AxisParent(secondary);
+            }
+            0x101D => last = Ctx::Axis(u16_at(d, 0)),
+            0x1014 => {
+                groups.push(Group {
+                    grouping: "standard",
+                    secondary,
+                    vary: u16_at(d, 16) & 1 != 0,
+                    ..Default::default()
+                });
+                last = Ctx::ChartFormat(groups.len() - 1);
+            }
+            0x1017 | 0x1018 | 0x1019 | 0x101A | 0x101B | 0x103E | 0x103F | 0x1040 | 0x1061 => {
+                let Ctx::ChartFormat(gi) = top else { continue };
+                let Some(gr) = groups.get_mut(gi) else {
+                    continue;
+                };
+                let f = |at: usize| u16_at(d, at);
+                match r.id {
+                    0x1017 => {
+                        let flags = f(4);
+                        gr.kind = Some(ChartKind::Bar);
+                        gr.overlap = Some(i32::from(f(0) as i16));
+                        gr.gap = Some(u32::from(f(2)));
+                        gr.horizontal = flags & 1 != 0;
+                        gr.grouping = if flags & 4 != 0 {
+                            "percentStacked"
+                        } else if flags & 2 != 0 {
+                            "stacked"
+                        } else {
+                            "clustered"
+                        };
+                    }
+                    0x1018 | 0x101A => {
+                        let flags = f(0);
+                        gr.kind = Some(if r.id == 0x1018 {
+                            ChartKind::Line
+                        } else {
+                            ChartKind::Area
+                        });
+                        gr.grouping = if flags & 2 != 0 {
+                            "percentStacked"
+                        } else if flags & 1 != 0 {
+                            "stacked"
+                        } else {
+                            "standard"
+                        };
+                    }
+                    0x1019 | 0x1061 => {
+                        let hole = f(2);
+                        gr.kind = Some(if hole > 0 && r.id == 0x1019 {
+                            ChartKind::Doughnut
+                        } else {
+                            ChartKind::Pie
+                        });
+                        gr.first_slice = Some(u32::from(f(0)).min(360));
+                        gr.hole = (hole > 0).then_some(u32::from(hole));
+                    }
+                    0x101B => {
+                        gr.kind = Some(if f(4) & 1 != 0 {
+                            ChartKind::Bubble
+                        } else {
+                            ChartKind::Scatter
+                        })
+                    }
+                    0x103E => gr.kind = Some(ChartKind::Radar),
+                    0x1040 => gr.kind = Some(ChartKind::FilledRadar),
+                    _ => gr.kind = Some(ChartKind::Surface),
+                }
+            }
+            0x103A => {
+                if let Ctx::ChartFormat(gi) = top
+                    && let Some(gr) = groups.get_mut(gi)
+                {
+                    gr.three_d = true;
+                }
+            }
+            0x1015 => {
+                let pos = match d.get(16).copied().unwrap_or(3) {
+                    0 => "b",
+                    1 => "tr",
+                    2 => "t",
+                    4 => "l",
+                    _ => "r",
+                };
+                if let Ctx::ChartFormat(gi) = top
+                    && let Some(gr) = groups.get_mut(gi)
+                {
+                    gr.legend = Some(pos);
+                }
+                legend = legend.or(Some(pos));
+                last = Ctx::Legend;
+            }
+            0x1025 => last = Ctx::Text(None, u16_at(d, 24)),
+            0x1027 => {
+                if let Some(Ctx::Text(link, _)) = stack.last_mut() {
+                    *link = Some(u16_at(d, 0));
+                }
+            }
+            0x1065 => cache_kind = u16_at(d, 0),
+            0x0203 | 0x0204 | 0x0205 | 0x027E if cache_kind != 0 && cached_vals.len() < 1 << 20 => {
+                let point = u32::from(u16_at(d, 0));
+                let ser = u32::from(u16_at(d, 2));
+                let mut c = Cur::at(d, 6);
+                let v = match r.id {
+                    0x0203 => Value::Number(c.f64()),
+                    0x0204 => Value::text(g.book.string(&mut c, 2)),
+                    0x027E => Value::Number(super::sheet::rk(c.u32())),
+                    _ => Value::Empty,
+                };
+                cached_vals.push((cache_kind, point, ser, v));
+            }
+            0x1021 => {}
+            _ => last = Ctx::Other,
+        }
+        axis_line = (r.id == 0x1021).then(|| u16_at(d, 0));
+    }
+    // The chart's kind is its first group's; series of other groups are
+    // drawn as theirs.
+    let first = groups.iter().find(|g| g.kind.is_some())?;
+    let kind = first.kind?;
+    let mut chart = Chart::new(
+        anchor.unwrap_or(Anchor {
+            from: (0, 0, 0, 0),
+            to: (10, 20, 0, 0),
+        }),
+        kind,
+    );
+    chart.horizontal = first.horizontal;
+    chart.grouping = first.grouping;
+    chart.three_d = first.three_d;
+    chart.vary_colors = first.vary || matches!(kind, ChartKind::Pie | ChartKind::Doughnut);
+    chart.gap_width = first.gap;
+    chart.overlap = first.overlap;
+    chart.hole_size = first.hole;
+    chart.first_slice = first.first_slice;
+    chart.legend = legend;
+    // A series without data is not drawn.
+    let keep: Vec<bool> = series
+        .iter()
+        .enumerate()
+        .map(|(i, s)| {
+            s.val_ref.is_some() || cached_vals.iter().any(|c| c.0 == 1 && c.2 as usize == i)
+        })
+        .collect();
+    if auto_title && title.is_none() {
+        let named: Vec<&ChartSeries> = series
+            .iter()
+            .zip(&keep)
+            .filter(|x| *x.1)
+            .map(|x| x.0)
+            .collect();
+        title = Some(match named.as_slice() {
+            [one] => one.name.clone().unwrap_or_else(|| "Chart Title".into()),
+            _ => "Chart Title".into(),
+        });
+    }
+    chart.title = title;
+    chart.cat_title = cat_title;
+    chart.val_title = val_title;
+    chart.major_grid = major_grid;
+    chart.plot_fill = plot_fill;
+    chart.area_fill = area_fill;
+    for (i, mut s) in series.into_iter().enumerate() {
+        if !keep[i] {
+            continue;
+        }
+        let gi = ser_group.get(i).copied().unwrap_or(0);
+        if let Some(gr) = groups.get(gi).filter(|g| g.kind.is_some() && gi != 0) {
+            if gr.kind != Some(kind) {
+                s.kind = gr.kind;
+            }
+            s.secondary = gr.secondary;
+        }
+        // The chart's own copy of its data.
+        for (k, point, ser, v) in cached_vals.iter().filter(|c| c.2 as usize == i) {
+            let p = *point as usize;
+            if p > 65_535 {
+                continue;
+            }
+            let _ = ser;
+            match (k, v) {
+                (1, Value::Number(n)) => put(&mut s.vals, p, Some(*n), None),
+                (2, Value::Number(n)) => match s.cat_nums.as_mut() {
+                    Some(c) => put(c, p, Some(*n), None),
+                    None => put(
+                        &mut s.cats,
+                        p,
+                        crate::formats::office::sheets::numtext::shortest(*n),
+                        String::new(),
+                    ),
+                },
+                (2, v) => put(&mut s.cats, p, v.display(), String::new()),
+                (3, Value::Number(n)) => put(&mut s.sizes, p, Some(*n), None),
+                _ => {}
+            }
+        }
+        chart.series.push(s);
+    }
+    let _ = wb;
+    Some(chart)
+}
+
+fn put<T: Clone>(v: &mut Vec<T>, at: usize, x: T, fill: T) {
+    if v.len() <= at {
+        v.resize(at + 1, fill);
+    }
+    v[at] = x;
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/escher.rs b/crates/exav-render/src/formats/office/sheets/xls/escher.rs
new file mode 100644
index 00000000..c31c0427
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/escher.rs
@@ -0,0 +1,553 @@
+//! Office Drawing ([MS-ODRAW]) in XLS: the workbook's picture store
+//! (MSODRAWINGGROUP) and each sheet's shapes (MSODRAWING), matched with the
+//! OBJ records that follow them, as pictures, charts and shapes.
+
+use super::sheet::{Obj, biff_anchor};
+use super::stream::Rec;
+use super::{Globals, chart};
+use crate::formats::office::common::bytes::Cur;
+use crate::formats::office::sheets::error::Result;
+use crate::formats::office::sheets::geom::Grid;
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use std::io::Read;
+
+pub(crate) struct Blip {
+    pub ext: &'static str,
+    pub data: Vec<u8>,
+}
+
+struct Rh {
+    inst: u16,
+    typ: u16,
+    len: usize,
+}
+
+fn header(c: &mut Cur) -> Option<Rh> {
+    if c.left() < 8 {
+        return None;
+    }
+    let vi = c.u16();
+    let typ = c.u16();
+    let len = c.u32() as usize;
+    Some(Rh {
+        inst: vi >> 4,
+        typ,
+        len,
+    })
+}
+
+/// The records directly in `d`: header and body.
+fn children(d: &[u8]) -> Vec<(Rh, &[u8])> {
+    let mut out = vec![];
+    let mut c = Cur::new(d);
+    while let Some(rh) = header(&mut c) {
+        let end = c.p.saturating_add(rh.len).min(d.len());
+        out.push((rh, &d[c.p..end]));
+        c.p = end;
+        if out.len() > 1 << 16 {
+            break;
+        }
+    }
+    out
+}
+
+/// Pictures of the store, in order (a shape's `pib` is 1-based in it).
+pub(crate) fn blips(d: &[u8]) -> Vec<Blip> {
+    let mut out = Vec::new();
+    // DggContainer > BStoreContainer > BSE records.
+    for (rh, body) in children(d) {
+        if rh.typ != 0xF000 {
+            continue;
+        }
+        for (rh, body) in children(body) {
+            if rh.typ != 0xF001 {
+                continue;
+            }
+            for (rh, bse) in children(body) {
+                if rh.typ != 0xF007 {
+                    continue;
+                }
+                let name_len = bse.get(33).copied().unwrap_or(0) as usize;
+                let rest = bse.get(36 + name_len..).unwrap_or(&[]);
+                let blip = children(rest)
+                    .into_iter()
+                    .next()
+                    .and_then(|(bh, data)| blip(&bh, data));
+                out.push(blip.unwrap_or(Blip {
+                    ext: "bin",
+                    data: vec![],
+                }));
+                if out.len() >= 1 << 16 {
+                    return out;
+                }
+            }
+        }
+    }
+    out
+}
+
+/// Metafiles past this size inflated are dropped.
+const MAX_METAFILE: u64 = 64 << 20;
+
+fn blip(h: &Rh, d: &[u8]) -> Option<Blip> {
+    // An instance with its low bit set has a second 16-byte id.
+    let two = |base: u16| if h.inst == base + 1 { 32 } else { 16 };
+    let (ext, skip, meta) = match h.typ {
+        0xF01A => ("emf", two(0x3D4), true),
+        0xF01B => ("wmf", two(0x216), true),
+        0xF01C => ("pict", two(0x542), true),
+        0xF01D | 0xF02A => (
+            "jpeg",
+            if h.inst == 0x46B || h.inst == 0x6E3 {
+                33
+            } else {
+                17
+            },
+            false,
+        ),
+        0xF01E => ("png", two(0x6E0) + 1, false),
+        0xF01F => ("dib", two(0x7A8) + 1, false),
+        0xF029 => ("tiff", two(0x6E4) + 1, false),
+        _ => return None,
+    };
+    if !meta {
+        let data = d.get(skip..)?.to_vec();
+        if ext == "dib" {
+            return Some(Blip {
+                ext: "bmp",
+                data: dib_to_bmp(&data),
+            });
+        }
+        return Some(Blip { ext, data });
+    }
+    let hdr = d.get(skip..skip + 34)?;
+    let body = d.get(skip + 34..)?;
+    let data = if hdr[32] == 0 {
+        let mut out = Vec::new();
+        flate2::read::ZlibDecoder::new(body)
+            .take(MAX_METAFILE)
+            .read_to_end(&mut out)
+            .ok()?;
+        out
+    } else {
+        body.to_vec()
+    };
+    let data = if ext == "wmf" && !data.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A]) {
+        placeable_wmf(&data, hdr)
+    } else {
+        data
+    };
+    Some(Blip { ext, data })
+}
+
+/// A WMF without its placeable header gets one, from the blip's bounds.
+fn placeable_wmf(data: &[u8], hdr: &[u8]) -> Vec<u8> {
+    let mut c = Cur::at(hdr, 4);
+    let mut h = vec![0xD7, 0xCD, 0xC6, 0x9A, 0, 0];
+    for _ in 0..4 {
+        h.extend_from_slice(&(c.i32() as i16).to_le_bytes());
+    }
+    h.extend_from_slice(&1440u16.to_le_bytes());
+    h.extend_from_slice(&[0, 0, 0, 0]);
+    let mut sum = 0u16;
+    for k in 0..10 {
+        sum ^= u16::from_le_bytes([h[2 * k], h[2 * k + 1]]);
+    }
+    h.extend_from_slice(&sum.to_le_bytes());
+    h.extend_from_slice(data);
+    h
+}
+
+fn dib_to_bmp(dib: &[u8]) -> Vec<u8> {
+    let hsize = Cur::at(dib, 0).u32() as usize;
+    let bits = Cur::at(dib, 14).u16() as u32;
+    let used = Cur::at(dib, 32).u32();
+    let colors = if bits <= 8 && bits > 0 {
+        if used > 0 { used.min(256) } else { 1 << bits }
+    } else {
+        used.min(256)
+    };
+    let off = 14 + hsize.min(1 << 16) + colors as usize * 4;
+    let mut out = Vec::with_capacity(dib.len() + 14);
+    out.extend_from_slice(b"BM");
+    out.extend_from_slice(&((dib.len() + 14) as u32).to_le_bytes());
+    out.extend_from_slice(&[0, 0, 0, 0]);
+    out.extend_from_slice(&(off as u32).to_le_bytes());
+    out.extend_from_slice(dib);
+    out
+}
+
+/// One shape of a sheet's drawing.
+pub(crate) struct EShape {
+    spt: u16,
+    flags: u32,
+    /// Has client data: an OBJ record follows it.
+    client: bool,
+    anchor: Option<[u16; 8]>,
+    /// In its group's coordinates.
+    child: Option<[i32; 4]>,
+    /// A group's own coordinate system.
+    group_rect: Option<[i32; 4]>,
+    props: Vec<(u16, u32)>,
+    /// The group shape this one belongs to.
+    parent: Option<usize>,
+}
+
+impl EShape {
+    fn prop(&self, id: u16) -> Option<u32> {
+        self.props.iter().find(|p| p.0 & 0x3FFF == id).map(|p| p.1)
+    }
+
+    fn bool_prop(&self, id: u16, bit: u32) -> Option<bool> {
+        let v = self.prop(id)?;
+        (v & (1 << (bit + 16)) != 0).then_some(v & (1 << bit) != 0)
+    }
+}
+
+fn shape(body: &[u8], parent: Option<usize>) -> EShape {
+    let mut s = EShape {
+        spt: 0,
+        flags: 0,
+        client: false,
+        anchor: None,
+        child: None,
+        group_rect: None,
+        props: vec![],
+        parent,
+    };
+    for (rh, b) in children(body) {
+        let mut c = Cur::new(b);
+        match rh.typ {
+            0xF00A => {
+                s.spt = rh.inst;
+                c.u32();
+                s.flags = c.u32();
+            }
+            0xF009 => s.group_rect = Some([c.i32(), c.i32(), c.i32(), c.i32()]),
+            0xF00F => s.child = Some([c.i32(), c.i32(), c.i32(), c.i32()]),
+            0xF010 => {
+                c.u16();
+                let mut v = [0u16; 8];
+                for x in &mut v {
+                    *x = c.u16();
+                }
+                if !c.short {
+                    s.anchor = Some(v);
+                }
+            }
+            0xF011 => s.client = true,
+            0xF00B | 0xF122 => {
+                for _ in 0..rh.inst.min(512) {
+                    let id = c.u16();
+                    let v = c.u32();
+                    if c.short {
+                        break;
+                    }
+                    s.props.push((id, v));
+                }
+            }
+            _ => {}
+        }
+    }
+    s
+}
+
+fn walk_group(d: &[u8], parent: Option<usize>, out: &mut Vec<EShape>, depth: u32) {
+    let mut me = parent;
+    let mut first = true;
+    for (rh, body) in children(d) {
+        if out.len() >= 1 << 16 {
+            return;
+        }
+        match rh.typ {
+            0xF004 => {
+                out.push(shape(body, if first { parent } else { me }));
+                if first {
+                    // A group's first shape is the group itself.
+                    me = Some(out.len() - 1);
+                }
+                first = false;
+            }
+            0xF003 if depth < 32 => {
+                walk_group(body, me, out, depth + 1);
+                first = false;
+            }
+            _ => {}
+        }
+    }
+}
+
+/// The shapes of a sheet's drawing, in order.
+pub(crate) fn shapes(d: &[u8]) -> Vec<EShape> {
+    let mut out = vec![];
+    for (rh, body) in children(d) {
+        if rh.typ == 0xF002 {
+            for (rh, b) in children(body) {
+                if rh.typ == 0xF003 {
+                    walk_group(b, None, &mut out, 0);
+                }
+            }
+        } else if rh.typ == 0xF003 {
+            walk_group(body, None, &mut out, 0);
+        } else if rh.typ == 0xF004 {
+            out.push(shape(body, None));
+        }
+    }
+    out
+}
+
+/// An OfficeArtCOLORREF: RGB, or an index into the workbook's palette.
+fn colorref(g: &Globals, v: u32) -> Option<Rgb> {
+    let flags = (v >> 24) as u8;
+    if flags & 0x08 != 0 {
+        return g.color((v & 0xFF) as u16);
+    }
+    if flags & 0x10 != 0 {
+        return None;
+    }
+    Some((v & 0xFF) << 16 | (v & 0xFF00) | (v >> 16) & 0xFF)
+}
+
+fn preset(spt: u16, obj: u16) -> Option<&'static str> {
+    Some(match spt {
+        1 | 202 | 75 | 109 => "rect",
+        2 => "roundRect",
+        3 => "ellipse",
+        4 | 110 => "diamond",
+        5 => "triangle",
+        6 => "rtTriangle",
+        7 => "parallelogram",
+        8 => "trapezoid",
+        9 => "hexagon",
+        10 => "octagon",
+        11 => "plus",
+        12 => "star5",
+        13 => "rightArrow",
+        15 => "homePlate",
+        16 => "cube",
+        19 => "arc",
+        20 => "line",
+        22 => "can",
+        23 => "donut",
+        32 => "straightConnector1",
+        56 => "flowChartTerminator",
+        66 => "leftArrow",
+        67 => "downArrow",
+        68 => "upArrow",
+        96 => "smileyFace",
+        _ => match obj {
+            1 => "line",
+            2 | 6 => "rect",
+            3 => "ellipse",
+            4 => "arc",
+            _ => "rect",
+        },
+    })
+}
+
+/// Pictures, charts and shapes of a sheet, from its drawing's shapes and
+/// the OBJ records matched to them in order.
+pub(crate) fn place(
+    g: &mut Globals,
+    wb: &mut Workbook,
+    sheet: &mut Sheet,
+    budget: &mut Budget,
+    shapes: &[EShape],
+    objs: &[Obj],
+    recs: &[Rec],
+) -> Result<()> {
+    if g.book.ver < 8 {
+        // BIFF5: no drawing; the objects carry their anchors.
+        for o in objs {
+            let Some(a) = o.anchor else { continue };
+            if matches!(o.kind, 1..=4 | 6) {
+                let mut s = Shape::new(a, preset(0, o.kind).unwrap_or("rect"));
+                s.fill = (o.kind != 1).then_some(0xFFFFFF);
+                s.line = Some(0);
+                s.text.text = o.text.clone().unwrap_or_default();
+                s.name = format!("Shape {}", o.id);
+                sheet.shapes.push(s);
+            }
+        }
+        return Ok(());
+    }
+    let client: Vec<usize> = (0..shapes.len()).filter(|&i| shapes[i].client).collect();
+    // Group shapes in pixels, for their children.
+    let grid = Grid::for_anchors(
+        sheet,
+        shapes.iter().filter_map(|s| s.anchor.map(biff_anchor)),
+    );
+    let anchors: Vec<Option<Anchor>> = client
+        .iter()
+        .map(|&si| match (shapes[si].anchor, shapes[si].parent) {
+            (Some(a), _) => Some(biff_anchor(a)),
+            (None, Some(_)) => rect(sheet, &grid, shapes, si, 0)
+                .map(|(x0, y0, x1, y1)| grid.anchor(sheet, x0, y0, x1, y1)),
+            _ => None,
+        })
+        .collect();
+    for (k, &si) in client.iter().enumerate() {
+        let Some(o) = objs.get(k) else { break };
+        let s = &shapes[si];
+        let Some(anchor) = anchors[k] else { continue };
+        match o.kind {
+            8 => {
+                let Some(pib) = s.prop(0x0104) else { continue };
+                let Some(b) = g.blips.get((pib as usize).wrapping_sub(1)) else {
+                    continue;
+                };
+                if b.data.is_empty() {
+                    continue;
+                }
+                budget.alloc(b.data.len() as u64)?;
+                sheet.images.push(Image {
+                    anchor,
+                    ext: b.ext,
+                    data: b.data.clone(),
+                    name: format!("Picture {}", sheet.images.len() + 1),
+                });
+            }
+            5 => {
+                if let Some((a, b)) = o.chart
+                    && let Some(ch) = chart::read_chart(g, &recs[a..b], Some(anchor), wb)
+                {
+                    sheet.charts.push(ch);
+                }
+            }
+            1 | 2 | 3 | 4 | 6 | 9 | 30 => {
+                if s.flags & 0x08 != 0 {
+                    continue;
+                }
+                let geom = preset(s.spt, o.kind).unwrap_or("rect");
+                let mut shp = Shape::new(anchor, geom);
+                let filled = s.bool_prop(0x01BF, 4).unwrap_or(true);
+                let lined = s.bool_prop(0x01FF, 3).unwrap_or(true);
+                if filled && geom != "line" {
+                    shp.fill = Some(
+                        s.prop(0x0181)
+                            .map_or(Some(0xFFFFFF), |v| colorref(g, v))
+                            .unwrap_or(0xFFFFFF),
+                    );
+                }
+                if lined {
+                    shp.line = Some(
+                        s.prop(0x01C0)
+                            .map_or(Some(0), |v| colorref(g, v))
+                            .unwrap_or(0),
+                    );
+                    shp.line_width = s.prop(0x01CB).map(i64::from);
+                }
+                shp.line_dash = match s.prop(0x01CE) {
+                    Some(1) => Some("dash"),
+                    Some(2) => Some("dot"),
+                    Some(3) => Some("dashDot"),
+                    Some(4) => Some("lgDashDotDot"),
+                    Some(5..=10) => Some("sysDash"),
+                    _ => None,
+                };
+                shp.head_arrow = s.prop(0x01D0).is_some_and(|v| v != 0);
+                shp.tail_arrow = s.prop(0x01D1).is_some_and(|v| v != 0);
+                shp.rotation = s
+                    .prop(0x0004)
+                    .map_or(0.0, |v| f64::from(v as i32) / 65536.0);
+                shp.flip_h = s.flags & 0x40 != 0;
+                shp.flip_v = s.flags & 0x80 != 0;
+                shp.text.text = o.text.clone().unwrap_or_default();
+                shp.name = format!("Shape {}", o.id);
+                sheet.shapes.push(shp);
+            }
+            _ => {}
+        }
+    }
+    Ok(())
+}
+
+/// A shape's rectangle in pixels: its anchor, or its place in its group.
+fn rect(
+    sheet: &Sheet,
+    grid: &Grid,
+    shapes: &[EShape],
+    i: usize,
+    depth: u32,
+) -> Option<(f64, f64, f64, f64)> {
+    let s = shapes.get(i)?;
+    if let Some(a) = s.anchor {
+        let a = biff_anchor(a);
+        return Some((
+            grid.x(sheet, a.from.0, a.from.2),
+            grid.y(sheet, a.from.1, a.from.3),
+            grid.x(sheet, a.to.0, a.to.2),
+            grid.y(sheet, a.to.1, a.to.3),
+        ));
+    }
+    if depth > 32 {
+        return None;
+    }
+    let p = s.parent?;
+    let (gx0, gy0, gx1, gy1) = rect(sheet, grid, shapes, p, depth + 1)?;
+    let g = shapes[p].group_rect?;
+    let c = s.child?;
+    let (w, h) = (
+        f64::from(g[2]) - f64::from(g[0]),
+        f64::from(g[3]) - f64::from(g[1]),
+    );
+    if w <= 0.0 || h <= 0.0 {
+        return None;
+    }
+    let fx = |v: i32| gx0 + (f64::from(v) - f64::from(g[0])) / w * (gx1 - gx0);
+    let fy = |v: i32| gy0 + (f64::from(v) - f64::from(g[1])) / h * (gy1 - gy0);
+    Some((fx(c[0]), fy(c[1]), fx(c[2]), fy(c[3])))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn rec(ver: u16, inst: u16, typ: u16, body: &[u8]) -> Vec<u8> {
+        let mut v = ((inst << 4) | ver).to_le_bytes().to_vec();
+        v.extend_from_slice(&typ.to_le_bytes());
+        v.extend_from_slice(&(body.len() as u32).to_le_bytes());
+        v.extend_from_slice(body);
+        v
+    }
+
+    #[test]
+    fn grouped_shapes_have_parents_and_child_anchors() {
+        let mut grp = rec(
+            1,
+            0,
+            0xF009,
+            &[0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 100, 0, 0, 0],
+        );
+        grp.extend(rec(2, 0, 0xF00A, &[1, 4, 0, 0, 1, 0, 0, 0]));
+        grp.extend(rec(0, 0, 0xF010, &[0; 18]));
+        grp.extend(rec(0, 0, 0xF011, &[]));
+        let mut child = rec(2, 3, 0xF00A, &[2, 4, 0, 0, 2, 0, 0, 0]);
+        child.extend(rec(
+            0,
+            0,
+            0xF00F,
+            &[10, 0, 0, 0, 10, 0, 0, 0, 50, 0, 0, 0, 50, 0, 0, 0],
+        ));
+        child.extend(rec(0, 0, 0xF011, &[]));
+        let mut group = rec(15, 0, 0xF004, &grp);
+        group.extend(rec(15, 0, 0xF004, &child));
+        let d = rec(15, 0, 0xF003, &group);
+        let s = shapes(&d);
+        assert_eq!(s.len(), 2);
+        assert_eq!(s[1].parent, Some(0));
+        assert_eq!(s[1].spt, 3);
+        assert_eq!(s[1].child, Some([10, 10, 50, 50]));
+        assert!(s[0].group_rect.is_some() && s[0].client && s[1].client);
+    }
+
+    #[test]
+    fn hostile_drawings_do_not_panic() {
+        let mut d = rec(15, 0, 0xF003, &[]);
+        d.extend_from_slice(&[0xFF; 40]);
+        let _ = shapes(&d);
+        let _ = blips(&[0x0F, 0, 0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF]);
+        assert_eq!(dib_to_bmp(&[]).len(), 14);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/mod.rs b/crates/exav-render/src/formats/office/sheets/xls/mod.rs
new file mode 100644
index 00000000..47a94b58
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/mod.rs
@@ -0,0 +1,1096 @@
+//! XLS reader: Excel 2.x to 2003 (BIFF2 to BIFF8), worksheets and
+//! workbooks, the BIFF4 workbook kind included. BIFF8 follows [MS-XLS];
+//! BIFF2 to BIFF5 follow OpenOffice.org's documentation of the Excel file
+//! format.
+
+mod cf;
+mod chart;
+mod escher;
+mod sheet;
+pub(crate) mod stream;
+#[cfg(test)]
+mod tests;
+
+use crate::formats::office::common::bytes::{Cur, u16_at, u32_at};
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use exav_unpack::biff::Book;
+pub(crate) use exav_unpack::biff::formula;
+use exav_unpack::offcrypto::{DEFAULT_PASSWORDS, Decryptor, Refused};
+use std::collections::HashMap;
+use stream::Rec;
+
+const DEFAULT_PALETTE: [u32; 56] = [
+    0x000000, 0xFFFFFF, 0xFF0000, 0x00FF00, 0x0000FF, 0xFFFF00, 0xFF00FF, 0x00FFFF, 0x800000,
+    0x008000, 0x000080, 0x808000, 0x800080, 0x008080, 0xC0C0C0, 0x808080, 0x9999FF, 0x993366,
+    0xFFFFCC, 0xCCFFFF, 0x660066, 0xFF8080, 0x0066CC, 0xCCCCFF, 0x000080, 0xFF00FF, 0xFFFF00,
+    0x00FFFF, 0x800080, 0x800000, 0x008080, 0x0000FF, 0x00CCFF, 0xCCFFFF, 0xCCFFCC, 0xFFFF99,
+    0x99CCFF, 0xFF99CC, 0xCC99FF, 0xFFCC99, 0x3366FF, 0x33CCCC, 0x99CC00, 0xFFCC00, 0xFF9900,
+    0xFF6600, 0x666699, 0x969696, 0x003366, 0x339966, 0x003300, 0x333300, 0x993300, 0x993366,
+    0x333399, 0x333333,
+];
+const BIFF34_PALETTE: [u32; 8] = [
+    0x800000, 0x008000, 0x000080, 0x808000, 0x800080, 0x008080, 0xC0C0C0, 0x808080,
+];
+const EGA: [u32; 8] = [
+    0x000000, 0xFFFFFF, 0xFF0000, 0x00FF00, 0x0000FF, 0xFFFF00, 0xFF00FF, 0x00FFFF,
+];
+
+pub(crate) const BUILTIN_FMT: &[(u16, &str)] = &[
+    (0, "General"),
+    (1, "0"),
+    (2, "0.00"),
+    (3, "#,##0"),
+    (4, "#,##0.00"),
+    (5, "\"$\"#,##0_);\\(\"$\"#,##0\\)"),
+    (6, "\"$\"#,##0_);[Red]\\(\"$\"#,##0\\)"),
+    (7, "\"$\"#,##0.00_);\\(\"$\"#,##0.00\\)"),
+    (8, "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)"),
+    (9, "0%"),
+    (10, "0.00%"),
+    (11, "0.00E+00"),
+    (12, "# ?/?"),
+    (13, "# ??/??"),
+    (14, "m/d/yyyy"),
+    (15, "d-mmm-yy"),
+    (16, "d-mmm"),
+    (17, "mmm-yy"),
+    (18, "h:mm AM/PM"),
+    (19, "h:mm:ss AM/PM"),
+    (20, "h:mm"),
+    (21, "h:mm:ss"),
+    (22, "m/d/yyyy h:mm"),
+    (37, "#,##0_);\\(#,##0\\)"),
+    (38, "#,##0_);[Red]\\(#,##0\\)"),
+    (39, "#,##0.00_);\\(#,##0.00\\)"),
+    (40, "#,##0.00_);[Red]\\(#,##0.00\\)"),
+    (41, "_(* #,##0_);_(* \\(#,##0\\);_(* \"-\"_);_(@_)"),
+    (
+        42,
+        "_(\"$\"* #,##0_);_(\"$\"* \\(#,##0\\);_(\"$\"* \"-\"_);_(@_)",
+    ),
+    (43, "_(* #,##0.00_);_(* \\(#,##0.00\\);_(* \"-\"??_);_(@_)"),
+    (
+        44,
+        "_(\"$\"* #,##0.00_);_(\"$\"* \\(#,##0.00\\);_(\"$\"* \"-\"??_);_(@_)",
+    ),
+    (45, "mm:ss"),
+    (46, "[h]:mm:ss"),
+    (47, "mm:ss.0"),
+    (48, "##0.0E+0"),
+    (49, "@"),
+];
+
+pub(crate) const BORDER_STYLES: [Option<&str>; 14] = [
+    None,
+    Some("thin"),
+    Some("medium"),
+    Some("dashed"),
+    Some("dotted"),
+    Some("thick"),
+    Some("double"),
+    Some("hair"),
+    Some("mediumDashed"),
+    Some("dashDot"),
+    Some("mediumDashDot"),
+    Some("dashDotDot"),
+    Some("mediumDashDotDot"),
+    Some("slantDashDot"),
+];
+pub(crate) const PATTERNS: [&str; 19] = [
+    "none",
+    "solid",
+    "mediumGray",
+    "darkGray",
+    "lightGray",
+    "darkHorizontal",
+    "darkVertical",
+    "darkDown",
+    "darkUp",
+    "darkGrid",
+    "darkTrellis",
+    "lightHorizontal",
+    "lightVertical",
+    "lightDown",
+    "lightUp",
+    "lightGrid",
+    "lightTrellis",
+    "gray125",
+    "gray0625",
+];
+const HALIGN: [Option<&str>; 8] = [
+    None,
+    Some("left"),
+    Some("center"),
+    Some("right"),
+    Some("fill"),
+    Some("justify"),
+    Some("centerContinuous"),
+    Some("distributed"),
+];
+const VALIGN: [Option<&str>; 5] = [
+    Some("top"),
+    Some("center"),
+    None,
+    Some("justify"),
+    Some("distributed"),
+];
+
+#[derive(Clone, Default)]
+pub(crate) struct FontRec {
+    height: u16,
+    italic: bool,
+    strike: bool,
+    outline: bool,
+    shadow: bool,
+    color: u16,
+    bold: bool,
+    script: u16,
+    underline: u8,
+    family: u8,
+    charset: u8,
+    name: String,
+}
+
+#[derive(Clone, Default)]
+pub(crate) struct XfRec {
+    font: u16,
+    fmt: u16,
+    locked: bool,
+    hidden: bool,
+    halign: u8,
+    valign: u8,
+    wrap: bool,
+    rot: u8,
+    indent: u8,
+    shrink: bool,
+    reading: u8,
+    /// left, right, top, bottom.
+    border_style: [u8; 4],
+    border_color: [u16; 4],
+    diag_style: u8,
+    diag_color: u16,
+    diag_up: bool,
+    diag_down: bool,
+    pattern: u8,
+    fore: u16,
+    back: u16,
+    is_style: bool,
+    parent: u16,
+    /// Attribute groups a cell XF sets itself (number format, font,
+    /// alignment, border, fill, protection as bits 0 to 5); it takes the
+    /// others from its parent style.
+    used: u8,
+}
+
+pub(crate) struct Globals {
+    /// What formulas need: version, code page, sheets, names, references.
+    pub book: Book,
+    date1904: bool,
+    fonts: Vec<FontRec>,
+    formats: HashMap<u16, String>,
+    fmt_index: u16,
+    xfs: Vec<XfRec>,
+    palette: Vec<u32>,
+    sst: Vec<Value>,
+    blips: Vec<escher::Blip>,
+    xf_style: HashMap<u32, u32>,
+    active: usize,
+    first_tab: usize,
+}
+
+impl Globals {
+    fn new(ver: u8) -> Globals {
+        Globals {
+            book: Book::new(ver),
+            date1904: false,
+            fonts: vec![],
+            formats: HashMap::new(),
+            fmt_index: 0,
+            xfs: vec![],
+            palette: if ver >= 5 {
+                DEFAULT_PALETTE.to_vec()
+            } else {
+                BIFF34_PALETTE.to_vec()
+            },
+            sst: vec![],
+            blips: vec![],
+            xf_style: HashMap::new(),
+            active: 0,
+            first_tab: 0,
+        }
+    }
+
+    pub fn color(&self, icv: u16) -> Option<Rgb> {
+        match icv {
+            0..=7 => Some(EGA[icv as usize]),
+            8..=63 => self.palette.get(icv as usize - 8).copied().or(Some(0)),
+            0x41 => Some(0xFFFFFF),
+            _ => None,
+        }
+    }
+
+    pub fn font(&self, idx: u16) -> Font {
+        // There is no font 4: indexes from 5 on are one past the list.
+        let i = if idx >= 4 {
+            idx as usize - 1
+        } else {
+            idx as usize
+        };
+        let Some(f) = self.fonts.get(i).or_else(|| self.fonts.first()) else {
+            return Font::default();
+        };
+        Font {
+            name: f.name.clone(),
+            size_centipt: u32::from(f.height) * 5,
+            bold: f.bold,
+            italic: f.italic,
+            underline: match f.underline {
+                1 => Some("single"),
+                2 => Some("double"),
+                0x21 => Some("singleAccounting"),
+                0x22 => Some("doubleAccounting"),
+                _ => None,
+            },
+            strike: f.strike,
+            color: self.color(f.color),
+            vert_align: match f.script {
+                1 => Some("superscript"),
+                2 => Some("subscript"),
+                _ => None,
+            },
+            family: f.family,
+            charset: if f.charset > 1 { Some(f.charset) } else { None },
+            outline: f.outline,
+            shadow: f.shadow,
+        }
+    }
+
+    pub fn numfmt(&self, id: u16) -> String {
+        if let Some(s) = self.formats.get(&id) {
+            return s.clone();
+        }
+        if self.book.ver <= 4 {
+            return "General".into();
+        }
+        BUILTIN_FMT
+            .iter()
+            .find(|e| e.0 == id)
+            .map(|e| e.1.to_string())
+            .unwrap_or_else(|| "General".into())
+    }
+
+    fn style_of_xf(&self, x: &XfRec) -> Style {
+        let edge = |k: usize| -> Edge {
+            let s = BORDER_STYLES
+                .get(x.border_style[k] as usize)
+                .copied()
+                .flatten();
+            Edge {
+                style: s,
+                color: if s.is_some() {
+                    self.color(x.border_color[k]).or(Some(0))
+                } else {
+                    None
+                },
+            }
+        };
+        let diag_style = BORDER_STYLES
+            .get(x.diag_style as usize)
+            .copied()
+            .flatten()
+            .filter(|_| x.diag_up || x.diag_down);
+        let pattern = PATTERNS.get(x.pattern as usize).copied().unwrap_or("none");
+        let fill = if pattern == "none" {
+            Fill::NONE
+        } else {
+            Fill {
+                pattern,
+                fg: self.color(x.fore).or(Some(0)),
+                bg: self.color(x.back).or(Some(0xFFFFFF)),
+            }
+        };
+        Style {
+            font: self.font(x.font),
+            fill,
+            border: Border {
+                left: edge(0),
+                right: edge(1),
+                top: edge(2),
+                bottom: edge(3),
+                diagonal: Edge {
+                    style: diag_style,
+                    color: diag_style.map(|_| self.color(x.diag_color).unwrap_or(0)),
+                },
+                diag_up: x.diag_up && diag_style.is_some(),
+                diag_down: x.diag_down && diag_style.is_some(),
+            },
+            align: Align {
+                horizontal: HALIGN.get(x.halign as usize).copied().flatten(),
+                vertical: VALIGN.get(x.valign as usize).copied().flatten(),
+                // Justified and distributed text is wrapped, as Excel lays it out.
+                wrap: x.wrap || matches!(x.valign, 3 | 4),
+                indent: x.indent,
+                rotation: x.rot,
+                shrink: x.shrink,
+                reading_order: x.reading.min(2),
+            },
+            numfmt: self.numfmt(x.fmt),
+            locked: x.locked,
+            hidden: x.hidden,
+        }
+    }
+
+    /// A cell XF with the attribute groups it does not set taken from its
+    /// parent style. From BIFF5 on a cell XF holds every attribute itself,
+    /// the flags saying only what follows the style when it is edited
+    /// ([MS-XLS] 2.5.20 CellXF); BIFF3 and BIFF4 cell XFs take the groups whose
+    /// flag is clear from the style.
+    fn resolve_xf(&self, x: &XfRec) -> XfRec {
+        let mut r = x.clone();
+        if x.is_style || self.book.ver >= 5 {
+            return r;
+        }
+        let Some(p) = self.xfs.get(x.parent as usize).filter(|p| p.is_style) else {
+            return r;
+        };
+        if x.used & 1 == 0 {
+            r.fmt = p.fmt;
+        }
+        if x.used & 2 == 0 {
+            r.font = p.font;
+        }
+        if x.used & 4 == 0 {
+            (
+                r.halign, r.valign, r.wrap, r.rot, r.indent, r.shrink, r.reading,
+            ) = (
+                p.halign, p.valign, p.wrap, p.rot, p.indent, p.shrink, p.reading,
+            );
+        }
+        if x.used & 8 == 0 {
+            (
+                r.border_style,
+                r.border_color,
+                r.diag_style,
+                r.diag_color,
+                r.diag_up,
+                r.diag_down,
+            ) = (
+                p.border_style,
+                p.border_color,
+                p.diag_style,
+                p.diag_color,
+                p.diag_up,
+                p.diag_down,
+            );
+        }
+        if x.used & 16 == 0 {
+            (r.pattern, r.fore, r.back) = (p.pattern, p.fore, p.back);
+        }
+        if x.used & 32 == 0 {
+            (r.locked, r.hidden) = (p.locked, p.hidden);
+        }
+        r
+    }
+
+    fn default_xf(&self) -> usize {
+        if self.book.ver >= 5 && self.xfs.len() > 15 {
+            15
+        } else {
+            0
+        }
+    }
+
+    /// The model style of XF `xf`, interned.
+    pub fn style_id(&mut self, wb: &mut Workbook, xf: u16) -> u32 {
+        let key = u32::from(xf);
+        if let Some(&s) = self.xf_style.get(&key) {
+            return s;
+        }
+        let id = match self.xfs.get(xf as usize) {
+            Some(x) => {
+                let st = self.style_of_xf(&self.resolve_xf(x));
+                wb.styles.add(st)
+            }
+            None => 0,
+        };
+        self.xf_style.insert(key, id);
+        id
+    }
+
+    /// BIFF2: the style of a cell's 3-byte attributes, through its XF when
+    /// the file has XF records, from the attributes otherwise.
+    pub fn style_of_attrs(&mut self, wb: &mut Workbook, attrs: [u8; 3], xf: u16) -> u32 {
+        if !self.xfs.is_empty() {
+            return self.style_id(wb, xf);
+        }
+        let key = 0x8000_0000
+            | u32::from(attrs[1]) << 8
+            | u32::from(attrs[2])
+            | u32::from(attrs[0] & 0xC0) << 16;
+        if let Some(&s) = self.xf_style.get(&key) {
+            return s;
+        }
+        let mut x = XfRec {
+            font: u16::from(attrs[1] >> 6),
+            fmt: u16::from(attrs[1] & 0x3F),
+            locked: attrs[0] & 0x40 != 0,
+            hidden: attrs[0] & 0x80 != 0,
+            valign: 2,
+            ..Default::default()
+        };
+        biff2_look(&mut x, attrs[2]);
+        let id = wb.styles.add(self.style_of_xf(&x));
+        self.xf_style.insert(key, id);
+        id
+    }
+}
+
+/// BIFF2's alignment, border and shading byte.
+fn biff2_look(x: &mut XfRec, a: u8) {
+    x.halign = a & 7;
+    for (k, bit) in [(0usize, 8u8), (1, 16), (2, 32), (3, 64)] {
+        if a & bit != 0 {
+            x.border_style[k] = 1;
+            x.border_color[k] = 0;
+        }
+    }
+    if a & 0x80 != 0 {
+        x.pattern = 17;
+        x.fore = 0;
+        x.back = 1;
+    }
+}
+
+/// Reads an XLS file.
+pub(crate) fn read(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let mut data = stream::open(bytes)?;
+    budget.alloc(data.len() as u64 * 2)?;
+    let mut found = exav_unpack::biff::records(&data);
+    let first = found
+        .next()
+        .ok_or_else(|| Error::Malformed("empty stream".into()))?;
+    let ver = stream::bof_version(&first);
+    if ver == 0 {
+        return Err(Error::NotFormat("no BOF record".into()));
+    }
+    let filepass = found
+        .find(|r| r.id == 0x002F)
+        .map(|r| (r.pos, r.data.into_owned()));
+    if let Some((pos, body)) = filepass {
+        let dec =
+            Decryptor::from_filepass(&body, ver >= 8, DEFAULT_PASSWORDS).map_err(|e| match e {
+                Refused::Password => Error::Encrypted,
+                Refused::Method => Error::Unsupported("encryption method".into()),
+            })?;
+        dec.decrypt_stream(&mut data, pos);
+    }
+    let recs = stream::records(&data);
+    let mut wb = Workbook::new(Style::default());
+    if ver <= 4 && stream::bof_type(&recs[0]) == 0x0100 {
+        read_biff4w(&recs, &mut wb, budget)?;
+    } else if ver <= 4 {
+        // A worksheet file: globals and cells in one substream.
+        let mut g = Globals::new(ver);
+        for r in &recs {
+            globals_record(&mut g, r);
+        }
+        finish_globals(&mut g, &mut wb);
+        g.book.sheet_names = vec!["Sheet1".into()];
+        let mut sheet = Sheet::new("Sheet1".into());
+        if stream::bof_type(&recs[0]) == 0x20 {
+            wb.warn("a chart file");
+        }
+        let filter = sheet::read_sheet(&mut g, &mut wb, budget, &recs, &mut sheet)?;
+        wb.sheets.push(sheet);
+        finish_names(&g, &mut wb, &[filter], &[Some(0)]);
+    } else {
+        read_workbook(ver, &recs, &mut wb, budget)?;
+    }
+    if wb.sheets.is_empty() {
+        return Err(Error::Malformed("no sheets".into()));
+    }
+    Ok(wb)
+}
+
+/// BIFF4W: a workspace whose sheets are each a BIFF4 worksheet stream after
+/// a SHEETHDR record.
+fn read_biff4w(recs: &[Rec], wb: &mut Workbook, budget: &mut Budget) -> Result<()> {
+    let mut g0 = Globals::new(4);
+    let mut i = 1;
+    let mut names = vec![];
+    while i < recs.len() {
+        let r = &recs[i];
+        if r.id == 0x008F {
+            let mut c = Cur::new(&r.data);
+            c.u32();
+            names.push(g0.book.string(&mut c, 1));
+        } else if stream::BOF_IDS.contains(&r.id) {
+            let start = i;
+            let end = substream_end(recs, start);
+            if wb.sheets.len() >= budget.limits.max_sheets as usize {
+                return Err(Error::TooLarge("sheets"));
+            }
+            let mut g = Globals::new(4);
+            g.book.codepage = g0.book.codepage;
+            for r in &recs[start..end] {
+                globals_record(&mut g, r);
+            }
+            if wb.sheets.is_empty() {
+                finish_globals(&mut g, wb);
+            }
+            let name = names
+                .get(wb.sheets.len())
+                .cloned()
+                .unwrap_or_else(|| format!("Sheet{}", wb.sheets.len() + 1));
+            g.book.sheet_names = names.clone();
+            let mut sheet = Sheet::new(name);
+            sheet::read_sheet(&mut g, wb, budget, &recs[start..end], &mut sheet)?;
+            wb.sheets.push(sheet);
+            i = end;
+            continue;
+        } else {
+            globals_record(&mut g0, r);
+        }
+        i += 1;
+    }
+    Ok(())
+}
+
+/// The index one past the EOF that closes the substream at `start`.
+fn substream_end(recs: &[Rec], start: usize) -> usize {
+    let mut depth = 0i32;
+    for (j, r) in recs.iter().enumerate().skip(start) {
+        if stream::BOF_IDS.contains(&r.id) {
+            depth += 1;
+        } else if r.id == 0x000A {
+            depth -= 1;
+            if depth <= 0 {
+                return j + 1;
+            }
+        }
+    }
+    recs.len()
+}
+
+fn read_workbook(ver: u8, recs: &[Rec], wb: &mut Workbook, budget: &mut Budget) -> Result<()> {
+    let mut g = Globals::new(ver);
+    let mut i = 1;
+    while i < recs.len() && recs[i].id != 0x000A {
+        globals_record(&mut g, &recs[i]);
+        i += 1;
+    }
+    finish_globals(&mut g, wb);
+    if g.book.sheets.len() > budget.limits.max_sheets as usize {
+        return Err(Error::TooLarge("sheets"));
+    }
+    g.book.finish();
+    budget.alloc(g.sst.iter().map(|v| v.text_len() as u64 + 32).sum())?;
+
+    // Substreams, matched to BOUNDSHEET by their position, else by order.
+    let by_pos: HashMap<usize, usize> = g
+        .book
+        .sheets
+        .iter()
+        .enumerate()
+        .map(|(k, s)| (s.pos, k))
+        .collect();
+    let mut subs: Vec<(usize, usize, usize)> = vec![];
+    let mut order = 0usize;
+    i += 1;
+    while i < recs.len() {
+        if stream::BOF_IDS.contains(&recs[i].id) {
+            let start = i;
+            let end = substream_end(recs, start);
+            let k = by_pos.get(&recs[start].pos).copied().unwrap_or_else(|| {
+                while order < g.book.sheets.len() && g.book.sheets[order].kind == 6 {
+                    order += 1;
+                }
+                order
+            });
+            order = k + 1;
+            subs.push((k, start, end));
+            i = end;
+        } else {
+            i += 1;
+        }
+    }
+    let mut built: Vec<Option<Sheet>> = (0..g.book.sheets.len()).map(|_| None).collect();
+    let mut filter = vec![false; g.book.sheets.len()];
+    for (k, start, end) in subs {
+        if k >= g.book.sheets.len() || built[k].is_some() {
+            continue;
+        }
+        let mut sheet = Sheet::new(g.book.sheets[k].name.clone());
+        sheet.state = match g.book.sheets[k].state & 3 {
+            1 => SheetState::Hidden,
+            2 => SheetState::VeryHidden,
+            _ => SheetState::Visible,
+        };
+        let kind = g.book.sheets[k].kind;
+        if kind == 2 || stream::bof_type(&recs[start]) == 0x20 {
+            sheet.chart_sheet = true;
+            if let Some(ch) = chart::read_chart(&g, &recs[start..end], None, wb) {
+                sheet.charts.push(ch);
+            }
+        } else if kind != 6 {
+            filter[k] = sheet::read_sheet(&mut g, wb, budget, &recs[start..end], &mut sheet)?;
+        }
+        built[k] = Some(sheet);
+    }
+    // Where each BOUNDSHEET ends up, VB modules left out.
+    let mut index: Vec<Option<usize>> = vec![];
+    let mut filters = vec![];
+    for (k, s) in built.into_iter().enumerate() {
+        if g.book.sheets[k].kind == 6 {
+            index.push(None);
+            continue;
+        }
+        index.push(Some(wb.sheets.len()));
+        filters.push(filter[k]);
+        let mut s = s.unwrap_or_else(|| Sheet::new(g.book.sheets[k].name.clone()));
+        // A chart sheet whose chart could not be read stays a worksheet.
+        if s.chart_sheet && s.charts.is_empty() {
+            s.chart_sheet = false;
+        }
+        wb.sheets.push(s);
+    }
+    // The active tab counts the VB modules left out.
+    let skipped = g
+        .book
+        .sheets
+        .iter()
+        .take(wb.active)
+        .filter(|s| s.kind == 6)
+        .count();
+    wb.active = wb.active.saturating_sub(skipped);
+    finish_names(&g, wb, &filters, &index);
+    Ok(())
+}
+
+/// Defined names, now that the sheets are known. `filters`: whether each
+/// sheet of the model has filter buttons; `index`: each BOUNDSHEET's sheet
+/// in the model.
+fn finish_names(g: &Globals, wb: &mut Workbook, filters: &[bool], index: &[Option<usize>]) {
+    for n in &g.book.names {
+        if n.rgce.is_empty() || n.name.starts_with("_xlfn.") {
+            continue;
+        }
+        let Ok(d) = formula::decode(&g.book.ctx(&g.book.ext5), &n.rgce, &n.extra, 0, 0) else {
+            continue;
+        };
+        if d.text.is_empty() || d.text.contains("#NAME?") {
+            continue;
+        }
+        let scope = match n.sheet {
+            0 => None,
+            s => match index.get(s as usize - 1).copied().flatten() {
+                Some(i) => Some(i),
+                None => continue,
+            },
+        };
+        if n.name == "_xlnm._FilterDatabase" {
+            if let Some(s) = scope
+                && let Some(sh) = wb
+                    .sheets
+                    .get_mut(s)
+                    .filter(|_| filters.get(s) == Some(&true))
+                && sh.autofilter.is_none()
+            {
+                sh.autofilter = parse_area(&d.text);
+            }
+            continue;
+        }
+        wb.names.push(DefinedName {
+            name: n.name.clone(),
+            sheet: scope,
+            formula: d.text,
+            hidden: n.hidden,
+        });
+    }
+}
+
+/// "Sheet1!$A$1:$C$9" (or without a sheet) to a range.
+fn parse_area(s: &str) -> Option<Range> {
+    let s = s.rsplit('!').next()?;
+    let mut parts = s.split(':');
+    let a = parse_cell(parts.next()?)?;
+    let b = parts.next().map(parse_cell).unwrap_or(Some(a))?;
+    Some(Range {
+        r1: a.0,
+        c1: a.1,
+        r2: b.0,
+        c2: b.1,
+    })
+}
+
+/// Reads an XLUnicodeRichExtendedString across CONTINUE boundaries, where
+/// the character width flag is repeated.
+pub(crate) struct SplitReader<'a> {
+    pub d: &'a [u8],
+    pub breaks: &'a [usize],
+    pub p: usize,
+}
+
+impl SplitReader<'_> {
+    fn next_break(&self) -> usize {
+        self.breaks
+            .iter()
+            .copied()
+            .find(|&b| b > self.p)
+            .unwrap_or(self.d.len())
+    }
+
+    pub fn u8(&mut self) -> u8 {
+        let v = self.d.get(self.p).copied().unwrap_or(0);
+        self.p = self.p.saturating_add(1);
+        v
+    }
+
+    pub fn u16(&mut self) -> u16 {
+        u16::from(self.u8()) | u16::from(self.u8()) << 8
+    }
+
+    fn u32(&mut self) -> u32 {
+        u32::from(self.u16()) | u32::from(self.u16()) << 16
+    }
+
+    pub fn chars(&mut self, mut n: usize, mut wide: bool) -> String {
+        let mut units: Vec<u16> = Vec::with_capacity(n.min(self.d.len()));
+        // The header of the string ended with its record: the CONTINUE that
+        // holds the characters starts with the width flag.
+        if n > 0 && self.breaks.contains(&self.p) && self.p < self.d.len() {
+            wide = self.u8() & 1 != 0;
+        }
+        while n > 0 && self.p < self.d.len() {
+            let end = self.next_break();
+            let w = if wide { 2 } else { 1 };
+            let take = ((end - self.p) / w).min(n);
+            for _ in 0..take {
+                units.push(if wide {
+                    self.u16()
+                } else {
+                    u16::from(self.u8())
+                });
+            }
+            n -= take;
+            if n > 0 {
+                // A CONTINUE starts here, with the width flag again.
+                self.p = end;
+                if self.p >= self.d.len() {
+                    break;
+                }
+                wide = self.u8() & 1 != 0;
+            }
+        }
+        String::from_utf16_lossy(&units)
+    }
+
+    fn rich(&mut self) -> (String, Vec<(u16, u16)>) {
+        let n = self.u16() as usize;
+        let f = self.u8();
+        let runs_n = if f & 8 != 0 { self.u16() as usize } else { 0 };
+        let ext = if f & 4 != 0 { self.u32() as usize } else { 0 };
+        let s = self.chars(n, f & 1 != 0);
+        let mut runs = Vec::new();
+        for _ in 0..runs_n {
+            if self.p >= self.d.len() {
+                break;
+            }
+            let ich = self.u16();
+            let ifnt = self.u16();
+            runs.push((ich, ifnt));
+        }
+        self.p = self.p.saturating_add(ext);
+        (s, runs)
+    }
+}
+
+/// Text split into runs at UTF-16 positions, each run in a font.
+pub(crate) fn rich_value(g: &Globals, s: String, runs: &[(u16, u16)]) -> Value {
+    let units: Vec<u16> = s.encode_utf16().collect();
+    let mut bounds: Vec<(usize, Option<u16>)> = vec![(0, None)];
+    for &(ich, ifnt) in runs {
+        let ich = (ich as usize).min(units.len());
+        if ich == 0 {
+            bounds[0].1 = Some(ifnt);
+        } else if bounds.last().is_some_and(|b| ich > b.0) {
+            bounds.push((ich, Some(ifnt)));
+        }
+    }
+    let mut out = Vec::new();
+    for k in 0..bounds.len() {
+        let a = bounds[k].0;
+        let b = bounds.get(k + 1).map_or(units.len(), |x| x.0);
+        if a >= b {
+            continue;
+        }
+        out.push(Run {
+            text: String::from_utf16_lossy(&units[a..b]),
+            font: bounds[k].1.map(|f| g.font(f)),
+        });
+    }
+    if out.len() <= 1 {
+        Value::text(s)
+    } else {
+        Value::Rich(out.into())
+    }
+}
+
+fn globals_record(g: &mut Globals, r: &Rec) {
+    if g.book.record(r) {
+        return;
+    }
+    let ver = g.book.ver;
+    let mut c = Cur::new(&r.data);
+    match r.id {
+        0x0022 => g.date1904 = c.u16() == 1,
+        0x0031 | 0x0231 => {
+            let mut f = FontRec {
+                height: c.u16(),
+                ..Default::default()
+            };
+            let grbit = c.u16();
+            f.italic = grbit & 2 != 0;
+            f.strike = grbit & 8 != 0;
+            f.outline = grbit & 0x10 != 0;
+            f.shadow = grbit & 0x20 != 0;
+            if ver <= 4 {
+                f.color = if ver == 2 { 0x7FFF } else { c.u16() };
+                f.bold = grbit & 1 != 0;
+                f.underline = u8::from(grbit & 4 != 0);
+            } else {
+                f.color = c.u16();
+                f.bold = c.u16() >= 600;
+                f.script = c.u16();
+                f.underline = c.u8();
+                f.family = c.u8();
+                f.charset = c.u8();
+                c.u8();
+            }
+            f.name = g.book.string(&mut c, 1);
+            g.fonts.push(f);
+        }
+        0x0045 => {
+            if let Some(f) = g.fonts.last_mut() {
+                f.color = c.u16();
+            }
+        }
+        0x041E if ver >= 5 => {
+            let id = c.u16();
+            let s = g.book.string(&mut c, if ver >= 8 { 2 } else { 1 });
+            g.formats.insert(id, s);
+        }
+        0x041E | 0x001E => {
+            if r.id == 0x041E {
+                c.u16();
+            }
+            let s = g.book.string(&mut c, 1);
+            g.formats.insert(g.fmt_index, s);
+            g.fmt_index = g.fmt_index.saturating_add(1);
+        }
+        0x00E0 if ver >= 5 => {
+            let mut x = XfRec {
+                font: c.u16(),
+                fmt: c.u16(),
+                ..Default::default()
+            };
+            let t = c.u16();
+            x.locked = t & 1 != 0;
+            x.hidden = t & 2 != 0;
+            x.is_style = t & 4 != 0;
+            x.parent = t >> 4;
+            let al = c.u8();
+            x.halign = al & 7;
+            x.wrap = al & 8 != 0;
+            x.valign = (al >> 4) & 7;
+            if ver >= 8 {
+                x.rot = c.u8();
+                let b = c.u8();
+                x.indent = b & 15;
+                x.shrink = b & 16 != 0;
+                x.reading = (b >> 6) & 3;
+                x.used = c.u8() >> 2;
+                let b1 = c.u32();
+                let b2 = c.u32();
+                let b3 = c.u16();
+                x.border_style = [
+                    (b1 & 15) as u8,
+                    ((b1 >> 4) & 15) as u8,
+                    ((b1 >> 8) & 15) as u8,
+                    ((b1 >> 12) & 15) as u8,
+                ];
+                x.border_color = [
+                    ((b1 >> 16) & 0x7F) as u16,
+                    ((b1 >> 23) & 0x7F) as u16,
+                    (b2 & 0x7F) as u16,
+                    ((b2 >> 7) & 0x7F) as u16,
+                ];
+                x.diag_down = b1 & (1 << 30) != 0;
+                x.diag_up = b1 & (1 << 31) != 0;
+                x.diag_color = ((b2 >> 14) & 0x7F) as u16;
+                x.diag_style = ((b2 >> 21) & 15) as u8;
+                x.pattern = ((b2 >> 26) & 0x3F) as u8;
+                x.fore = b3 & 0x7F;
+                x.back = (b3 >> 7) & 0x7F;
+            } else {
+                let o = c.u8();
+                x.used = o >> 2;
+                x.rot = orientation(o & 3);
+                let a = c.u32();
+                let b = c.u32();
+                x.fore = (a & 0x7F) as u16;
+                x.back = ((a >> 7) & 0x7F) as u16;
+                x.pattern = ((a >> 16) & 0x3F) as u8;
+                x.border_style[3] = ((a >> 22) & 7) as u8;
+                x.border_color[3] = ((a >> 25) & 0x7F) as u16;
+                x.border_style[2] = (b & 7) as u8;
+                x.border_style[0] = ((b >> 3) & 7) as u8;
+                x.border_style[1] = ((b >> 6) & 7) as u8;
+                x.border_color[2] = ((b >> 9) & 0x7F) as u16;
+                x.border_color[0] = ((b >> 16) & 0x7F) as u16;
+                x.border_color[1] = ((b >> 23) & 0x7F) as u16;
+            }
+            g.xfs.push(x);
+        }
+        0x0443 | 0x0243 => {
+            let mut x = XfRec {
+                font: u16::from(c.u8()),
+                fmt: u16::from(c.u8()),
+                ..Default::default()
+            };
+            if r.id == 0x0443 {
+                let t = c.u16();
+                x.locked = t & 1 != 0;
+                x.hidden = t & 2 != 0;
+                x.is_style = t & 4 != 0;
+                x.parent = t >> 4;
+                let al = c.u8();
+                x.halign = al & 7;
+                x.wrap = al & 8 != 0;
+                x.valign = (al >> 4) & 3;
+                x.rot = orientation((al >> 6) & 3);
+                x.used = c.u8() >> 2;
+            } else {
+                let t = c.u8();
+                x.locked = t & 1 != 0;
+                x.hidden = t & 2 != 0;
+                x.is_style = t & 4 != 0;
+                x.used = c.u8() >> 2;
+                let al = c.u16();
+                x.halign = (al & 7) as u8;
+                x.wrap = al & 8 != 0;
+                x.valign = 2;
+                x.parent = al >> 4;
+            }
+            let area = c.u16();
+            x.pattern = (area & 0x3F) as u8;
+            x.fore = (area >> 6) & 0x1F;
+            x.back = (area >> 11) & 0x1F;
+            let b = c.u32();
+            x.border_style[2] = (b & 7) as u8;
+            x.border_color[2] = ((b >> 3) & 0x1F) as u16;
+            x.border_style[0] = ((b >> 8) & 7) as u8;
+            x.border_color[0] = ((b >> 11) & 0x1F) as u16;
+            x.border_style[3] = ((b >> 16) & 7) as u8;
+            x.border_color[3] = ((b >> 19) & 0x1F) as u16;
+            x.border_style[1] = ((b >> 24) & 7) as u8;
+            x.border_color[1] = ((b >> 27) & 0x1F) as u16;
+            g.xfs.push(x);
+        }
+        0x0043 => {
+            let mut x = XfRec {
+                font: u16::from(c.u8()),
+                used: 0x3F,
+                parent: 0xFFF,
+                valign: 2,
+                ..Default::default()
+            };
+            c.u8();
+            let f = c.u8();
+            x.fmt = u16::from(f & 0x3F);
+            x.locked = f & 0x40 != 0;
+            x.hidden = f & 0x80 != 0;
+            biff2_look(&mut x, c.u8());
+            g.xfs.push(x);
+        }
+        0x0092 => {
+            let n = c.u16() as usize;
+            for k in 0..n.min(56) {
+                let b = c.bytes(4);
+                if b.len() < 4 {
+                    break;
+                }
+                let v = u32::from(b[0]) << 16 | u32::from(b[1]) << 8 | u32::from(b[2]);
+                if k < g.palette.len() {
+                    g.palette[k] = v;
+                } else {
+                    g.palette.push(v);
+                }
+            }
+        }
+        0x00FC => {
+            let mut sr = SplitReader {
+                d: &r.data,
+                breaks: &r.breaks,
+                p: 8,
+            };
+            let unique = u32_at(&r.data, 4) as usize;
+            for _ in 0..unique.min(r.data.len()) {
+                if sr.p >= r.data.len() {
+                    break;
+                }
+                let (s, runs) = sr.rich();
+                let v = if runs.is_empty() {
+                    Value::text(s)
+                } else {
+                    rich_value(g, s, &runs)
+                };
+                g.sst.push(v);
+            }
+        }
+        0x00EB => g.blips.extend(escher::blips(&r.data)),
+        // WINDOW1: the active tab (BIFF5 on).
+        0x003D if ver >= 5 => {
+            g.active = u16_at(&r.data, 10) as usize;
+            g.first_tab = u16_at(&r.data, 12) as usize;
+        }
+        _ => {}
+    }
+}
+
+/// BIFF4 and BIFF5 text orientation to an XLSX rotation.
+fn orientation(o: u8) -> u8 {
+    match o {
+        1 => 255,
+        2 => 90,
+        3 => 180,
+        _ => 0,
+    }
+}
+
+fn finish_globals(g: &mut Globals, wb: &mut Workbook) {
+    wb.date1904 = g.date1904;
+    if !crate::formats::office::common::codepage::known(g.book.codepage) {
+        wb.warn(format!(
+            "code page {} read as Windows 1252",
+            g.book.codepage
+        ));
+    }
+    wb.active = g.active;
+    wb.first_tab = g.first_tab;
+    let d = g.default_xf();
+    let st = match g.xfs.get(d) {
+        Some(x) => g.style_of_xf(&g.resolve_xf(x)),
+        None => {
+            let mut s = Style::default();
+            if !g.fonts.is_empty() {
+                s.font = g.font(0);
+            }
+            s
+        }
+    };
+    wb.styles = Styles::new(st);
+    g.xf_style.insert(d as u32, 0);
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/sheet.rs b/crates/exav-render/src/formats/office/sheets/xls/sheet.rs
new file mode 100644
index 00000000..4c31d778
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/sheet.rs
@@ -0,0 +1,960 @@
+//! A worksheet substream's records to a sheet of the model.
+
+use super::formula;
+use super::stream::{self, Rec};
+use super::{Globals, SplitReader, cf, chart, escher, rich_value};
+use crate::formats::office::common::bytes::{Cur, u16_at};
+use crate::formats::office::sheets::error::Result;
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use exav_unpack::biff::ExtSheet5;
+use std::collections::HashMap;
+
+/// A shared, array or table formula, by the cell its range starts at.
+struct Shared {
+    range: Range,
+    rgce: Vec<u8>,
+    extra: Vec<u8>,
+    array: bool,
+}
+
+/// A drawing object (OBJ record) and what follows it.
+pub(crate) struct Obj {
+    pub id: u16,
+    pub kind: u16,
+    /// A text box's or note's text (TXO).
+    pub text: Option<String>,
+    /// An embedded chart's substream, as indexes into the records.
+    pub chart: Option<(usize, usize)>,
+    /// BIFF5 keeps the anchor in the OBJ record.
+    pub anchor: Option<Anchor>,
+}
+
+/// BIFF2 to BIFF5 OBJ anchor: columns with 1/1024 and rows with 1/256
+/// offsets.
+pub(crate) fn biff_anchor(v: [u16; 8]) -> Anchor {
+    let fx = |d: u16| i64::from(d.min(1024)) * 1_000_000 / 1024;
+    let fy = |d: u16| i64::from(d.min(256)) * 1_000_000 / 256;
+    let mut to = (u32::from(v[4]), u32::from(v[6]), fx(v[5]), fy(v[7]));
+    // An end at the top of a row is the bottom of the row above.
+    if to.3 == 0 && to.1 > 0 {
+        to.1 -= 1;
+        to.3 = 1_000_000;
+    }
+    Anchor {
+        from: (u32::from(v[0]), u32::from(v[2]), fx(v[1]), fy(v[3])),
+        to,
+    }
+}
+
+fn put(sheet: &mut Sheet, budget: &mut Budget, row: u32, col: u32, cell: Cell) -> Result<()> {
+    if row > MAX_ROW || col > MAX_COL {
+        return Ok(());
+    }
+    let extra = cell.value.text_len() + cell.formula.as_ref().map_or(0, |f| f.len());
+    if sheet.cells.insert((row, col), cell).is_none() {
+        budget.cell(extra)?;
+    } else {
+        budget.alloc(extra as u64)?;
+    }
+    Ok(())
+}
+
+/// An RK number ([MS-XLS] 2.5.217).
+pub(crate) fn rk(v: u32) -> f64 {
+    let x = if v & 2 != 0 {
+        f64::from((v as i32) >> 2)
+    } else {
+        f64::from_bits(u64::from(v & 0xFFFF_FFFC) << 32)
+    };
+    if v & 1 != 0 { x / 100.0 } else { x }
+}
+
+/// Reads the sheet; returns whether it has filter buttons (AUTOFILTERINFO),
+/// which the _FilterDatabase name alone does not draw.
+pub(crate) fn read_sheet(
+    g: &mut Globals,
+    wb: &mut Workbook,
+    budget: &mut Budget,
+    recs: &[Rec],
+    sheet: &mut Sheet,
+) -> Result<bool> {
+    let ver = g.book.ver;
+    // Shared and array formulas first: a cell's PtgExp may come before.
+    let mut shared: HashMap<(u32, u32), Shared> = HashMap::new();
+    let mut ext5: Vec<ExtSheet5> = vec![];
+    let mut depth = 0;
+    for r in recs {
+        match r.id {
+            id if stream::BOF_IDS.contains(&id) => depth += 1,
+            0x000A => depth -= 1,
+            0x04BC | 0x0221 | 0x0021 if depth == 1 => {
+                let mut c = Cur::new(&r.data);
+                let r1 = c.u16() as u32;
+                let r2 = c.u16() as u32;
+                let c1 = c.u8() as u32;
+                let c2 = c.u8() as u32;
+                let array = r.id != 0x04BC;
+                if array {
+                    c.skip(match ver {
+                        5.. => 6,
+                        3 | 4 => 2,
+                        _ => 1,
+                    });
+                } else {
+                    c.u16();
+                }
+                let cce = if ver >= 3 {
+                    c.u16() as usize
+                } else {
+                    c.u8() as usize
+                };
+                let rgce = c.bytes(cce).to_vec();
+                let extra = r.data[c.p.min(r.data.len())..].to_vec();
+                if shared.len() < 1 << 20 {
+                    shared.insert(
+                        (r1, c1),
+                        Shared {
+                            range: Range { r1, c1, r2, c2 },
+                            rgce,
+                            extra,
+                            array,
+                        },
+                    );
+                }
+            }
+            0x0017 if depth == 1 && ver <= 5 => {
+                let e = g.book.ext_sheet5(&r.data);
+                ext5.push(e);
+            }
+            0x0023 if depth == 1 && ver <= 5 => {
+                let mut c = Cur::at(&r.data, 6);
+                let n = c.u8() as usize;
+                let name =
+                    crate::formats::office::common::codepage::decode(c.bytes(n), g.book.codepage);
+                if let Some(ExtSheet5::Names(v)) = ext5.last_mut() {
+                    v.push(name);
+                }
+            }
+            _ => {}
+        }
+    }
+    // Shared ranges by their first row, to find the one holding a cell:
+    // (first row, last row, first column, last column, key in `shared`).
+    let mut by_row: Vec<(u32, u32, u32, u32, _)> = shared
+        .iter()
+        .map(|(k, s)| (s.range.r1, s.range.r2, s.range.c1, s.range.c2, *k))
+        .collect();
+    by_row.sort_unstable();
+
+    let mut pending_string: Option<(u32, u32)> = None;
+    let mut ixfe: Option<u16> = None;
+    let mut objs: Vec<Obj> = vec![];
+    let mut notes: Vec<(u32, u32, Option<u16>, String, bool)> = vec![];
+    let mut cfs: Vec<cf::Pending> = vec![];
+    let mut drawing: Vec<u8> = vec![];
+    let mut defcolwidth: Option<u16> = None;
+    let mut stdwidth: Option<u16> = None;
+    let mut window_seen = false;
+    let mut depth = 0;
+    let mut has_autofilter = false;
+    let mut i = 0;
+    while i < recs.len() {
+        let r = &recs[i];
+        i += 1;
+        if stream::BOF_IDS.contains(&r.id) {
+            depth += 1;
+            if depth == 2 {
+                // An embedded chart: its substream belongs to the last object.
+                let end = super::substream_end(recs, i - 1);
+                if let Some(o) = objs.last_mut().filter(|o| o.chart.is_none()) {
+                    o.chart = Some((i - 1, end));
+                }
+                i = end;
+                depth = 1;
+            }
+            continue;
+        }
+        if r.id == 0x000A {
+            depth -= 1;
+            continue;
+        }
+        if depth != 1 {
+            continue;
+        }
+        let mut c = Cur::new(&r.data);
+        // A cell's style: BIFF2's 3 attribute bytes (XF 63: IXFE before),
+        // a 2-byte XF index from BIFF3 on.
+        macro_rules! cell_style {
+            () => {
+                if ver == 2 {
+                    let a = c.bytes(3);
+                    let attrs = [
+                        a.first().copied().unwrap_or(0),
+                        a.get(1).copied().unwrap_or(0),
+                        a.get(2).copied().unwrap_or(0),
+                    ];
+                    let x = u16::from(attrs[0] & 0x3F);
+                    let x = if x == 63 { ixfe.take().unwrap_or(0) } else { x };
+                    g.style_of_attrs(wb, attrs, x)
+                } else {
+                    let x = c.u16();
+                    g.style_id(wb, x)
+                }
+            };
+        }
+        match r.id {
+            0x0044 => ixfe = Some(c.u16()),
+            0x0201 | 0x0001 => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                let s = cell_style!();
+                put(sheet, budget, row, col, Cell::styled(s))?;
+            }
+            0x00BE => {
+                let row = c.u16() as u32;
+                let first = c.u16() as u32;
+                let n = r.data.len().saturating_sub(6) / 2;
+                for k in 0..n as u32 {
+                    let x = c.u16();
+                    let s = g.style_id(wb, x);
+                    put(sheet, budget, row, first + k, Cell::styled(s))?;
+                }
+            }
+            0x0203 | 0x0003 | 0x0002 | 0x027E | 0x007E => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                let s = cell_style!();
+                let v = match r.id {
+                    0x0002 => f64::from(c.u16()),
+                    0x027E | 0x007E => rk(c.u32()),
+                    _ => c.f64(),
+                };
+                put(
+                    sheet,
+                    budget,
+                    row,
+                    col,
+                    Cell {
+                        value: Value::Number(v),
+                        formula: None,
+                        style: s,
+                    },
+                )?;
+            }
+            0x00BD => {
+                let row = c.u16() as u32;
+                let first = c.u16() as u32;
+                let n = r.data.len().saturating_sub(6) / 6;
+                for k in 0..n as u32 {
+                    let x = c.u16();
+                    let v = rk(c.u32());
+                    let s = g.style_id(wb, x);
+                    put(
+                        sheet,
+                        budget,
+                        row,
+                        first + k,
+                        Cell {
+                            value: Value::Number(v),
+                            formula: None,
+                            style: s,
+                        },
+                    )?;
+                }
+            }
+            0x0204 | 0x0004 | 0x00D6 => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                let s = cell_style!();
+                let text = if ver == 2 {
+                    g.book.string(&mut c, 1)
+                } else if ver >= 8 {
+                    let mut sr = SplitReader {
+                        d: &r.data,
+                        breaks: &r.breaks,
+                        p: c.p,
+                    };
+                    let n = sr.u16() as usize;
+                    let f = sr.u8();
+                    let t = sr.chars(n, f & 1 != 0);
+                    c.p = sr.p;
+                    t
+                } else {
+                    g.book.string(&mut c, 2)
+                };
+                let value = if r.id == 0x00D6 {
+                    let n = if ver >= 8 {
+                        c.u16() as usize
+                    } else {
+                        c.u8() as usize
+                    };
+                    let mut runs = vec![];
+                    for _ in 0..n {
+                        if c.left() == 0 {
+                            break;
+                        }
+                        runs.push(if ver >= 8 {
+                            (c.u16(), c.u16())
+                        } else {
+                            (u16::from(c.u8()), u16::from(c.u8()))
+                        });
+                    }
+                    rich_value(g, text, &runs)
+                } else {
+                    Value::text(text)
+                };
+                put(
+                    sheet,
+                    budget,
+                    row,
+                    col,
+                    Cell {
+                        value,
+                        formula: None,
+                        style: s,
+                    },
+                )?;
+            }
+            0x00FD => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                let x = c.u16();
+                let i = c.u32() as usize;
+                let value = g.sst.get(i).cloned().unwrap_or(Value::Empty);
+                let s = g.style_id(wb, x);
+                put(
+                    sheet,
+                    budget,
+                    row,
+                    col,
+                    Cell {
+                        value,
+                        formula: None,
+                        style: s,
+                    },
+                )?;
+            }
+            0x0205 | 0x0005 => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                let s = cell_style!();
+                let v = c.u8();
+                let e = c.u8();
+                let value = if e != 0 {
+                    Value::Error(CellError::from_biff(v).unwrap_or(CellError::NA))
+                } else {
+                    Value::Bool(v != 0)
+                };
+                put(
+                    sheet,
+                    budget,
+                    row,
+                    col,
+                    Cell {
+                        value,
+                        formula: None,
+                        style: s,
+                    },
+                )?;
+            }
+            0x0006 | 0x0206 | 0x0406 => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                let s = cell_style!();
+                let res = c.bytes(8).to_vec();
+                let cce = if ver == 2 {
+                    c.u8();
+                    c.u8() as usize
+                } else {
+                    c.u16();
+                    if ver >= 5 {
+                        c.u32();
+                    }
+                    c.u16() as usize
+                };
+                let rgce = c.bytes(cce).to_vec();
+                let extra = r.data[c.p.min(r.data.len())..].to_vec();
+                let value = if res.len() < 8 {
+                    Value::Empty
+                } else if res[6] == 0xFF && res[7] == 0xFF {
+                    match res[0] {
+                        0 => {
+                            pending_string = Some((row, col));
+                            Value::Empty
+                        }
+                        1 => Value::Bool(res[2] != 0),
+                        2 => Value::Error(CellError::from_biff(res[2]).unwrap_or(CellError::NA)),
+                        // An empty string.
+                        3 => Value::text(""),
+                        _ => Value::Empty,
+                    }
+                } else {
+                    let mut b = [0u8; 8];
+                    b.copy_from_slice(&res);
+                    Value::Number(f64::from_le_bytes(b))
+                };
+                let ctx = g.book.ctx(&ext5);
+                let mut f = None;
+                match formula::decode(&ctx, &rgce, &extra, row, col) {
+                    Ok(d) if let Some((ar, ac)) = d.exp => {
+                        // The record at the cell the token names, else one whose
+                        // range holds the cell (some writers start it elsewhere).
+                        let found = shared.get(&(ar, ac)).or_else(|| {
+                            let end = by_row.partition_point(|e| e.0 <= row);
+                            by_row[..end]
+                                .iter()
+                                .rev()
+                                .take(64)
+                                .find(|e| e.1 >= row && e.2 <= col && e.3 >= col)
+                                .and_then(|e| shared.get(&e.4))
+                        });
+                        if let Some(sh) = found {
+                            if sh.array {
+                                if (row, col) == (sh.range.r1, sh.range.c1)
+                                    && let Ok(dd) =
+                                        formula::decode(&ctx, &sh.rgce, &sh.extra, row, col)
+                                {
+                                    f = Some(dd.text);
+                                    sheet.arrays.insert((row, col), sh.range);
+                                }
+                            } else if let Ok(dd) =
+                                formula::decode(&ctx, &sh.rgce, &sh.extra, row, col)
+                            {
+                                f = Some(dd.text);
+                            }
+                        }
+                    }
+                    Ok(d) if d.table => {}
+                    Ok(d) => f = Some(d.text),
+                    Err(e) => wb.warn(format!("formula at {}: {e}", cell_ref(row, col))),
+                }
+                put(
+                    sheet,
+                    budget,
+                    row,
+                    col,
+                    Cell {
+                        value,
+                        formula: f.map(String::into_boxed_str),
+                        style: s,
+                    },
+                )?;
+            }
+            0x0207 | 0x0007 => {
+                if let Some(at) = pending_string.take() {
+                    let s = if ver == 2 {
+                        g.book.string(&mut c, 1)
+                    } else if ver >= 8 {
+                        let mut sr = SplitReader {
+                            d: &r.data,
+                            breaks: &r.breaks,
+                            p: 0,
+                        };
+                        let n = sr.u16() as usize;
+                        let f = sr.u8();
+                        sr.chars(n, f & 1 != 0)
+                    } else {
+                        g.book.string(&mut c, 2)
+                    };
+                    budget.alloc(s.len() as u64)?;
+                    if let Some(cell) = sheet.cells.get_mut(&at) {
+                        cell.value = Value::text(s);
+                    }
+                }
+            }
+            0x0208 | 0x0008 => {
+                let row = c.u16() as u32;
+                c.skip(4);
+                let h = c.u16();
+                let mut info = RowInfo {
+                    height: Some(f64::from(h & 0x7FFF) / 20.0),
+                    ..Default::default()
+                };
+                if ver == 2 {
+                    info.custom_height = h & 0x8000 == 0;
+                    c.skip(2);
+                    if c.u8() == 1 {
+                        c.skip(5);
+                        let x = c.u16();
+                        info.style = Some(g.style_id(wb, x)).filter(|&s| s != 0);
+                    }
+                } else {
+                    c.skip(4);
+                    let flags = c.u16();
+                    let x = c.u16();
+                    info.outline = (flags & 7) as u8;
+                    info.hidden = flags & 0x20 != 0;
+                    info.custom_height = flags & 0x40 != 0;
+                    if flags & 0x80 != 0 {
+                        let x = if ver >= 8 { x & 0xFFF } else { x };
+                        info.style = Some(g.style_id(wb, x));
+                    }
+                }
+                if row <= MAX_ROW {
+                    budget.alloc(48)?;
+                    sheet.rows.insert(row, info);
+                }
+            }
+            0x007D => {
+                let first = c.u16() as u32;
+                let last = c.u16() as u32;
+                let w = c.u16();
+                let x = c.u16();
+                let flags = c.u16();
+                let st = g.style_id(wb, x);
+                if first <= MAX_COL && sheet.cols.len() < 1 << 16 {
+                    sheet.cols.push(ColInfo {
+                        first,
+                        last: last.clamp(first, MAX_COL),
+                        width: Some(f64::from(w) / 256.0),
+                        hidden: flags & 1 != 0,
+                        style: Some(st).filter(|&s| s != 0),
+                        outline: ((flags >> 8) & 7) as u8,
+                    });
+                }
+            }
+            0x0024 => {
+                let first = c.u8() as u32;
+                let last = c.u8() as u32;
+                let w = c.u16();
+                sheet.cols.push(ColInfo {
+                    first,
+                    last: last.max(first),
+                    width: Some(f64::from(w) / 256.0),
+                    ..Default::default()
+                });
+            }
+            0x0020 => {
+                // BIFF2 COLUMNDEFAULT: a style per column.
+                let first = c.u16() as u32;
+                let last = c.u16() as u32;
+                for col in first..last.min(first + 256) {
+                    let a = c.bytes(3);
+                    if a.len() < 3 {
+                        break;
+                    }
+                    let attrs = [a[0], a[1], a[2]];
+                    let s = g.style_of_attrs(wb, attrs, u16::from(a[0] & 0x3F));
+                    if s != 0 {
+                        match sheet
+                            .cols
+                            .iter_mut()
+                            .find(|x| x.first == col && x.last == col)
+                        {
+                            Some(ci) => ci.style = Some(s),
+                            None => sheet.cols.push(ColInfo {
+                                first: col,
+                                last: col,
+                                style: Some(s),
+                                ..Default::default()
+                            }),
+                        }
+                    }
+                }
+            }
+            0x0055 => defcolwidth = Some(c.u16()),
+            0x0099 => stdwidth = Some(c.u16()),
+            0x0225 => {
+                let flags = c.u16();
+                let h = c.u16();
+                sheet.default_row_height = f64::from(h) / 20.0;
+                sheet.default_row_custom = flags & 1 != 0;
+                sheet.default_row_hidden = flags & 2 != 0;
+            }
+            0x0025 => {
+                let h = c.u16();
+                sheet.default_row_height = f64::from(h & 0x7FFF) / 20.0;
+            }
+            0x00E5 => {
+                let n = c.u16() as usize;
+                for _ in 0..n {
+                    let r1 = c.u16() as u32;
+                    let r2 = c.u16() as u32;
+                    let c1 = c.u16() as u32;
+                    let c2 = c.u16() as u32;
+                    if c.short {
+                        break;
+                    }
+                    if r2 >= r1 && c2 >= c1 && (r2 > r1 || c2 > c1) && sheet.merges.len() < 1 << 20
+                    {
+                        sheet.merges.push(Range { r1, c1, r2, c2 });
+                    }
+                }
+            }
+            0x023E if !window_seen => {
+                window_seen = true;
+                let f = c.u16();
+                let top = c.u16() as u32;
+                let left = c.u16() as u32;
+                sheet.show_grid = f & 2 != 0;
+                sheet.show_headers = f & 4 != 0;
+                sheet.show_zeros = f & 0x10 != 0;
+                sheet.rtl = f & 0x40 != 0;
+                if f & 8 != 0 {
+                    sheet.freeze = Some((0, 0));
+                }
+                if top > 0 || left > 0 {
+                    sheet.top_left = Some((top, left));
+                }
+                if ver >= 8 && r.data.len() >= 14 {
+                    let normal = u16_at(&r.data, 12);
+                    if normal != 0 {
+                        sheet.zoom = u32::from(normal);
+                    }
+                }
+            }
+            0x003E if !window_seen => {
+                window_seen = true;
+                c.u8();
+                sheet.show_grid = c.u8() != 0;
+                sheet.show_headers = c.u8() != 0;
+                let frozen = c.u8() != 0;
+                sheet.show_zeros = c.u8() != 0;
+                if frozen {
+                    sheet.freeze = Some((0, 0));
+                }
+            }
+            0x0041 => {
+                let x = c.u16() as u32;
+                let y = c.u16() as u32;
+                if sheet.freeze.is_some() {
+                    sheet.freeze = Some((y, x));
+                }
+            }
+            0x00A0 => {
+                let num = c.u16() as u32;
+                let den = c.u16() as u32;
+                if let Some(z) = (num * 100).checked_div(den) {
+                    sheet.zoom = z;
+                }
+            }
+            0x0081 => {
+                let f = c.u16();
+                sheet.outline_below = f & 0x40 != 0;
+                sheet.outline_right = f & 0x80 != 0;
+            }
+            0x0862 if ver >= 8 => {
+                // SHEETEXT: the tab colour.
+                c.skip(12);
+                let cb = c.u32();
+                let icv = c.u32() & 0x7F;
+                if cb >= 20 || icv != 0x7F {
+                    sheet.tab_color = g.color(icv as u16);
+                }
+            }
+            0x0012 => sheet.protected = c.u16() != 0,
+            0x009D => has_autofilter = true,
+            0x01B8 => {
+                if let Some(h) = read_hlink(&r.data)
+                    && sheet.hyperlinks.len() < 1 << 16
+                {
+                    sheet.hyperlinks.push(h);
+                }
+            }
+            0x0800 => {
+                c.skip(2);
+                let r1 = c.u16() as u32;
+                c.u16();
+                let c1 = c.u16() as u32;
+                c.u16();
+                let n = r.data.len().saturating_sub(10) / 2;
+                let t = formula::read_chars(&mut c, n, true);
+                if let Some(h) = sheet
+                    .hyperlinks
+                    .iter_mut()
+                    .rev()
+                    .find(|h| h.range.r1 == r1 && h.range.c1 == c1)
+                {
+                    h.tooltip = Some(t.trim_end_matches('\0').to_string());
+                }
+            }
+            0x00EC => {
+                budget.alloc(r.data.len() as u64)?;
+                drawing.extend_from_slice(&r.data);
+            }
+            0x005D => {
+                if objs.len() >= 1 << 16 {
+                    continue;
+                }
+                if ver >= 8 {
+                    // The first subrecord, ftCmo, has the type and id.
+                    c.skip(4);
+                    let kind = c.u16();
+                    let id = c.u16();
+                    objs.push(Obj {
+                        id,
+                        kind,
+                        text: None,
+                        chart: None,
+                        anchor: None,
+                    });
+                } else {
+                    c.u32();
+                    let kind = c.u16();
+                    let id = c.u16();
+                    c.u16();
+                    let mut v = [0u16; 8];
+                    for x in &mut v {
+                        *x = c.u16();
+                    }
+                    let anchor = (!c.short).then(|| biff_anchor(v));
+                    objs.push(Obj {
+                        id,
+                        kind,
+                        text: None,
+                        chart: None,
+                        anchor,
+                    });
+                }
+            }
+            0x01B6 => {
+                if let Some(o) = objs.last_mut() {
+                    o.text = Some(read_txo(&r.data, &r.breaks));
+                }
+            }
+            0x001C => {
+                let row = c.u16() as u32;
+                let col = c.u16() as u32;
+                if ver >= 8 {
+                    let flags = c.u16();
+                    let id = c.u16();
+                    let author = g.book.string(&mut c, 2);
+                    notes.push((row, col, Some(id), author, flags & 2 != 0));
+                } else {
+                    let n = c.u16() as usize;
+                    let text = crate::formats::office::common::codepage::decode(
+                        c.bytes(n.min(2048)),
+                        g.book.codepage,
+                    );
+                    if row == 0xFFFF {
+                        if let Some(last) = notes.last_mut()
+                            && last.3.len() < 1 << 20
+                        {
+                            last.3.push_str(&text);
+                        }
+                    } else if notes.len() < 1 << 16 {
+                        notes.push((row, col, None, text, false));
+                    }
+                }
+            }
+            0x01B0 | 0x0879 => {
+                if let Some(p) = cf::header(&r.data, r.id == 0x0879) {
+                    cfs.push(p);
+                }
+            }
+            0x01B1 | 0x087A | 0x087B => {
+                let ctx = g.book.ctx(&ext5);
+                cf::rule(g, &ctx, r, &mut cfs);
+            }
+            0x01BE => {
+                let ctx = g.book.ctx(&ext5);
+                if let Some(v) = cf::validation(&ctx, &r.data, &r.breaks)
+                    && sheet.validations.len() < 1 << 16
+                {
+                    sheet.validations.push(v);
+                }
+            }
+            _ => {}
+        }
+    }
+    sheet.cond_formats = cf::finish(cfs);
+    for (row, col, id, text_or_author, visible) in notes {
+        let (author, text) = match id {
+            None => (String::new(), text_or_author),
+            Some(id) => (
+                text_or_author,
+                objs.iter()
+                    .find(|o| o.id == id)
+                    .and_then(|o| o.text.clone())
+                    .unwrap_or_default(),
+            ),
+        };
+        sheet.comments.push(Comment {
+            row,
+            col,
+            author,
+            text,
+            visible,
+        });
+    }
+    default_widths(sheet, wb, stdwidth, defcolwidth);
+    row_styles(sheet, budget)?;
+    for cell in sheet.cells.values_mut() {
+        // A first run without a font has the cell's.
+        if let Value::Rich(runs) = &cell.value
+            && runs.first().is_some_and(|r| r.font.is_none())
+        {
+            let mut v: Vec<Run> = runs.to_vec();
+            v[0].font = Some(wb.styles.get(cell.style).font.clone());
+            cell.value = Value::Rich(v.into());
+        }
+    }
+    let shapes = if drawing.is_empty() {
+        vec![]
+    } else {
+        escher::shapes(&drawing)
+    };
+    escher::place(g, wb, sheet, budget, &shapes, &objs, recs)?;
+    for o in &objs {
+        // BIFF5 charts, anchored by their OBJ record.
+        if ver < 8
+            && o.kind == 5
+            && let (Some((a, b)), Some(anchor)) = (o.chart, o.anchor)
+            && let Some(ch) = chart::read_chart(g, &recs[a..b], Some(anchor), wb)
+        {
+            sheet.charts.push(ch);
+        }
+    }
+    Ok(has_autofilter)
+}
+
+/// A row's default format shows in its cells that have no record. XLSX
+/// readers that draw only cells and column formats would leave them
+/// blank, so they are written as cells, over the 256 columns of an XLS
+/// sheet, or up to the last used column when that would be too many.
+fn row_styles(sheet: &mut Sheet, budget: &mut Budget) -> Result<()> {
+    let styled: Vec<(u32, u32)> = sheet
+        .rows
+        .iter()
+        .filter_map(|(&r, i)| i.style.map(|s| (r, s)))
+        .collect();
+    if styled.is_empty() {
+        return Ok(());
+    }
+    let mut ncols = 256u32;
+    if styled.len() as u64 * 256 > 1_000_000 || !budget.room_for_cells(styled.len() as u64 * 256) {
+        ncols = sheet
+            .cells
+            .keys()
+            .map(|k| k.1 + 1)
+            .max()
+            .unwrap_or(0)
+            .min(256);
+    }
+    for (r, s) in styled {
+        for c in 0..ncols {
+            if let std::collections::btree_map::Entry::Vacant(e) = sheet.cells.entry((r, c)) {
+                if !budget.room_for_cells(1) {
+                    return Ok(());
+                }
+                e.insert(Cell::styled(s));
+                budget.cell(0)?;
+            }
+        }
+    }
+    Ok(())
+}
+
+/// The default column width: STANDARDWIDTH, else DEFCOLWIDTH characters
+/// and the padding a column has around its text.
+fn default_widths(
+    sheet: &mut Sheet,
+    wb: &Workbook,
+    stdwidth: Option<u16>,
+    defcolwidth: Option<u16>,
+) {
+    let font_pt = wb.styles.get(0).font.size_pt();
+    match stdwidth {
+        Some(w) => sheet.default_col_width = Some(f64::from(w) / 256.0),
+        None => {
+            let base = f64::from(defcolwidth.unwrap_or(8));
+            sheet.default_col_width = Some(base + 10.546875 / font_pt.max(1.0));
+        }
+    }
+    if let Some(w) = defcolwidth {
+        sheet.base_col_width = Some(u32::from(w));
+    }
+}
+
+fn read_txo(d: &[u8], breaks: &[usize]) -> String {
+    let cch = u16_at(d, 10) as usize;
+    let Some(&start) = breaks.first() else {
+        return String::new();
+    };
+    let mut sr = SplitReader {
+        d,
+        breaks,
+        p: start,
+    };
+    let wide = sr.u8() & 1 != 0;
+    sr.chars(cch, wide)
+}
+
+fn hl_string(c: &mut Cur) -> String {
+    let n = c.u32() as usize;
+    let m = n.min(c.left() / 2);
+    formula::read_chars(c, m, true)
+        .trim_end_matches('\0')
+        .to_string()
+}
+
+fn read_hlink(d: &[u8]) -> Option<Hyperlink> {
+    let mut c = Cur::new(d);
+    let r1 = c.u16() as u32;
+    let r2 = c.u16() as u32;
+    let c1 = c.u16() as u32;
+    let c2 = c.u16() as u32;
+    c.skip(16);
+    c.u32();
+    let flags = c.u32();
+    let mut h = Hyperlink {
+        range: Range { r1, c1, r2, c2 },
+        url: None,
+        location: None,
+        tooltip: None,
+        display: None,
+    };
+    if flags & 0x14 != 0 {
+        h.display = Some(hl_string(&mut c));
+    }
+    if flags & 0x80 != 0 {
+        hl_string(&mut c);
+    }
+    if flags & 0x1 != 0 {
+        if flags & 0x100 != 0 {
+            h.url = Some(hl_string(&mut c));
+        } else {
+            let clsid = c.bytes(16).to_vec();
+            const URL: [u8; 16] = [
+                0xE0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B,
+                0xA9, 0x0B,
+            ];
+            const FILE: [u8; 16] = [0x03, 0x03, 0, 0, 0, 0, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0, 0x46];
+            if clsid == URL {
+                let n = c.u32() as usize;
+                let m = (n / 2).min(c.left() / 2);
+                let s = formula::read_chars(&mut c, m, true);
+                h.url = Some(s.split('\0').next().unwrap_or("").to_string());
+            } else if clsid == FILE {
+                let up = c.u16();
+                let n = c.u32() as usize;
+                let ansi = c.bytes(n);
+                let mut path: String = ansi
+                    .iter()
+                    .take_while(|&&b| b != 0)
+                    .map(|&b| b as char)
+                    .collect();
+                c.skip(24);
+                if c.u32() > 0 {
+                    let nb = c.u32() as usize;
+                    c.u16();
+                    path = formula::read_chars(&mut c, nb / 2, true);
+                }
+                h.url = Some(format!("{}{path}", "../".repeat(usize::from(up.min(64)))));
+            } else {
+                return None;
+            }
+        }
+    }
+    if flags & 0x8 != 0 {
+        h.location = Some(hl_string(&mut c));
+    }
+    if h.url.as_deref().is_some_and(|u| !safe_url(u)) {
+        h.url = None;
+    }
+    if h.url.is_none() && h.location.is_none() {
+        return None;
+    }
+    Some(h)
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/stream.rs b/crates/exav-render/src/formats/office/sheets/xls/stream.rs
new file mode 100644
index 00000000..8e2da16b
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/stream.rs
@@ -0,0 +1,37 @@
+//! The BIFF record stream: a compound file's "Workbook" or "Book" stream, or
+//! a bare BIFF stream, read as records by `exav_unpack::biff`.
+
+use crate::formats::office::common::bytes::u16_at;
+use crate::formats::office::sheets::error::{Error, Result};
+use exav_unpack::cfb::{Compound, SIGNATURE};
+
+pub(crate) use exav_unpack::biff::{BOF_IDS, Rec, bof_type, bof_version};
+
+/// The workbook stream.
+pub(crate) fn open(bytes: &[u8]) -> Result<Vec<u8>> {
+    if bytes.starts_with(&SIGNATURE) {
+        let c = Compound::open(bytes)
+            .ok_or_else(|| Error::Malformed("unreadable compound file".into()))?;
+        return match c.stream(&["Workbook", "Book"]) {
+            Some(s) if s.len() >= 4 => Ok(s),
+            _ => {
+                if c.names()
+                    .any(|n| n.eq_ignore_ascii_case("EncryptedPackage"))
+                {
+                    return Err(Error::NotFormat("an encrypted OOXML file".into()));
+                }
+                Err(Error::NotFormat("no Workbook stream".into()))
+            }
+        };
+    }
+    if bytes.len() >= 8 && BOF_IDS.contains(&u16_at(bytes, 0)) && u16_at(bytes, 2) as usize >= 4 {
+        return Ok(bytes.to_vec());
+    }
+    Err(Error::NotFormat(
+        "not a compound file nor a BIFF stream".into(),
+    ))
+}
+
+pub(crate) fn records(stream: &[u8]) -> Vec<Rec<'_>> {
+    exav_unpack::biff::records(stream).collect()
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xls/tests.rs b/crates/exav-render/src/formats/office/sheets/xls/tests.rs
new file mode 100644
index 00000000..e9219e30
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xls/tests.rs
@@ -0,0 +1,277 @@
+//! Whole workbooks: the fixture as Excel 97 saved it, encrypted here with
+//! the default password; and BIFF2 to BIFF5 files built record by record.
+
+use crate::formats::office::sheets::error::Error;
+use crate::formats::office::sheets::limits::{Budget, Limits};
+use crate::formats::office::sheets::model::*;
+use exav_unpack::cfb::Compound;
+use exav_unpack::offcrypto::encrypt;
+
+const SAMPLE: &[u8] = include_bytes!(concat!(
+    env!("CARGO_MANIFEST_DIR"),
+    "/tests/fixtures/office/sheets/sample.xls"
+));
+
+fn read(bytes: &[u8]) -> Result<Workbook, Error> {
+    super::read(bytes, &mut Budget::new(Limits::default()))
+}
+
+fn rec(id: u16, body: &[u8]) -> Vec<u8> {
+    let mut r = id.to_le_bytes().to_vec();
+    r.extend((body.len() as u16).to_le_bytes());
+    r.extend(body);
+    r
+}
+
+fn text(v: &Value) -> String {
+    v.display()
+}
+
+/// The fixture's Workbook stream.
+fn workbook_stream() -> Vec<u8> {
+    Compound::open(SAMPLE)
+        .unwrap()
+        .stream(&["Workbook"])
+        .unwrap()
+}
+
+/// `stream` with a FILEPASS for `method` after its BOF, the sheet positions
+/// moved accordingly, then encrypted.
+fn encrypted(method: &str) -> Vec<u8> {
+    let s = workbook_stream();
+    let bof_len = 4 + u16::from_le_bytes([s[2], s[3]]) as usize;
+    let fp = rec(0x002F, &encrypt::filepass(method, true));
+    let mut out = s[..bof_len].to_vec();
+    out.extend(&fp);
+    out.extend(&s[bof_len..]);
+    // BOUNDSHEET: the substream's position, now further.
+    let mut p = 0;
+    while p + 4 <= out.len() {
+        let id = u16::from_le_bytes([out[p], out[p + 1]]);
+        let len = u16::from_le_bytes([out[p + 2], out[p + 3]]) as usize;
+        if id == 0x0085 {
+            let pos = u32::from_le_bytes(out[p + 4..p + 8].try_into().unwrap()) + fp.len() as u32;
+            out[p + 4..p + 8].copy_from_slice(&pos.to_le_bytes());
+        }
+        p += 4 + len;
+    }
+    encrypt::encrypt_stream(method, &mut out, bof_len);
+    out
+}
+
+/// What the fixture holds, read from any of its forms.
+fn sample_content(wb: &Workbook) {
+    let names: Vec<&str> = wb.sheets.iter().map(|s| s.name.as_str()).collect();
+    assert_eq!(names, ["Budget", "Notes"]);
+    let s = &wb.sheets[0];
+    assert_eq!(text(&s.cells[&(1, 0)].value), "Rent");
+    assert_eq!(s.cells[&(2, 1)].value, Value::Number(345.5));
+    assert_eq!(s.cells[&(4, 1)].formula.as_deref(), Some("SUM(B2:B4)"));
+    assert_eq!(
+        s.merges,
+        [Range {
+            r1: 5,
+            c1: 0,
+            r2: 5,
+            c2: 2
+        }]
+    );
+    let head = wb.styles.get(s.cells[&(0, 0)].style);
+    assert!(head.font.bold);
+    assert_eq!(head.fill.fg, Some(0x4472C4));
+    assert_eq!(
+        wb.styles.get(s.cells[&(1, 2)].style).numfmt,
+        "yyyy\\-mm\\-dd"
+    );
+}
+
+#[test]
+fn the_fixture() {
+    sample_content(&read(SAMPLE).unwrap());
+    // The bare Workbook stream reads the same.
+    sample_content(&read(&workbook_stream()).unwrap());
+}
+
+#[test]
+fn encrypted_with_the_default_password() {
+    for method in ["xor", "rc4", "cryptoapi40", "cryptoapi128"] {
+        let data = encrypted(method);
+        // Encrypted: the plain text is gone.
+        assert!(!data.windows(4).any(|w| w == b"Rent"), "{method}");
+        sample_content(&read(&data).unwrap_or_else(|e| panic!("{method}: {e}")));
+    }
+}
+
+#[test]
+fn another_password_is_refused() {
+    let mut data = encrypted("rc4");
+    // The verifier's hash, damaged: the password does not match.
+    let fp = 4 + u16::from_le_bytes([data[2], data[3]]) as usize;
+    data[fp + 4 + 6 + 16 + 3] ^= 0x55;
+    assert_eq!(read(&data).unwrap_err(), Error::Encrypted);
+}
+
+/// A BIFF5 workbook: globals with two BOUNDSHEETs (8-bit names), then the
+/// sheets' substreams.
+fn biff5() -> Vec<u8> {
+    let bof = |dt: u16| rec(0x0809, &[0x00, 0x05, dt as u8, (dt >> 8) as u8, 0, 0, 0, 0]);
+    let eof = rec(0x000A, &[]);
+    let sheet_a = {
+        let mut s = bof(0x10);
+        // LABEL A1 "Hello" (byte string), NUMBER B1 2.5, RK A2 10, FORMULA B2 = A2*B1.
+        let mut label = vec![0, 0, 0, 0, 0x0F, 0, 5, 0];
+        label.extend(b"Hello");
+        s.extend(rec(0x0204, &label));
+        let mut num = vec![0, 0, 1, 0, 0x0F, 0];
+        num.extend(2.5f64.to_le_bytes());
+        s.extend(rec(0x0203, &num));
+        // RK 10: an integer, shifted left 2, flag 2.
+        let mut rk = vec![1, 0, 0, 0, 0x0F, 0];
+        rk.extend(((10u32 << 2) | 2).to_le_bytes());
+        s.extend(rec(0x027E, &rk));
+        // ptgRef A2 (BIFF5: row word with relative flags, column byte),
+        // ptgRef B1, ptgMul.
+        let rgce = [0x24, 0x01, 0xC0, 0x00, 0x24, 0x00, 0xC0, 0x01, 0x05];
+        let mut f = vec![1, 0, 1, 0, 0x0F, 0];
+        f.extend(25.0f64.to_le_bytes());
+        f.extend([0, 0, 0, 0, 0, 0]);
+        f.extend((rgce.len() as u16).to_le_bytes());
+        f.extend(rgce);
+        s.extend(rec(0x0006, &f));
+        s.extend(&eof);
+        s
+    };
+    let sheet_b = {
+        let mut s = bof(0x10);
+        let mut label = vec![0, 0, 0, 0, 0x0F, 0, 3, 0];
+        label.extend(b"\xe9t\xe9");
+        s.extend(rec(0x0204, &label));
+        s.extend(&eof);
+        s
+    };
+    let boundsheet = |pos: u32, name: &[u8]| {
+        let mut b = pos.to_le_bytes().to_vec();
+        b.extend([0, 0, name.len() as u8]);
+        b.extend(name);
+        rec(0x0085, &b)
+    };
+    // Code page 1252, then the BOUNDSHEETs at their final positions.
+    let head_len = bof(5).len()
+        + rec(0x0042, &[0, 0]).len()
+        + boundsheet(0, b"First").len()
+        + boundsheet(0, b"Second").len()
+        + eof.len();
+    let mut g = bof(5);
+    g.extend(rec(0x0042, &1252u16.to_le_bytes()));
+    g.extend(boundsheet(head_len as u32, b"First"));
+    g.extend(boundsheet((head_len + sheet_a.len()) as u32, b"Second"));
+    g.extend(&eof);
+    assert_eq!(g.len(), head_len);
+    g.extend(sheet_a);
+    g.extend(sheet_b);
+    g
+}
+
+#[test]
+fn biff5_workbook() {
+    let wb = read(&biff5()).unwrap();
+    assert_eq!(
+        wb.sheets
+            .iter()
+            .map(|s| s.name.as_str())
+            .collect::<Vec<_>>(),
+        ["First", "Second"]
+    );
+    let s = &wb.sheets[0];
+    assert_eq!(s.cells[&(0, 0)].value, Value::text("Hello"));
+    assert_eq!(s.cells[&(0, 1)].value, Value::Number(2.5));
+    assert_eq!(s.cells[&(1, 0)].value, Value::Number(10.0));
+    assert_eq!(s.cells[&(1, 1)].formula.as_deref(), Some("A2*B1"));
+    assert_eq!(s.cells[&(1, 1)].value, Value::Number(25.0));
+    // Windows-1252 text.
+    assert_eq!(wb.sheets[1].cells[&(0, 0)].value, Value::text("été"));
+}
+
+#[test]
+fn biff2_to_biff4_worksheets() {
+    // BIFF2: LABEL with 3 attribute bytes and an 8-bit length, INTEGER,
+    // NUMBER; BIFF3 and BIFF4: LABEL and NUMBER with an XF index.
+    let mut b2 = rec(0x0009, &[2, 0, 0x10, 0]);
+    let mut label = vec![0, 0, 0, 0, 0, 0, 0, 2];
+    label.extend(b"Hi");
+    b2.extend(rec(0x0004, &label));
+    b2.extend(rec(0x0002, &[1, 0, 0, 0, 0, 0, 0, 42, 0]));
+    let mut num = vec![2, 0, 0, 0, 0, 0, 0];
+    num.extend(0.5f64.to_le_bytes());
+    b2.extend(rec(0x0003, &num));
+    b2.extend(rec(0x000A, &[]));
+    let wb = read(&b2).unwrap();
+    let s = &wb.sheets[0];
+    assert_eq!(s.cells[&(0, 0)].value, Value::text("Hi"));
+    assert_eq!(s.cells[&(1, 0)].value, Value::Number(42.0));
+    assert_eq!(s.cells[&(2, 0)].value, Value::Number(0.5));
+    for bof in [0x0209u16, 0x0409] {
+        let mut b = rec(bof, &[0, 3, 0x10, 0, 0, 0]);
+        let mut label = vec![0, 0, 1, 0, 0, 0, 3, 0];
+        label.extend(b"abc");
+        b.extend(rec(0x0204, &label));
+        let mut num = vec![1, 0, 1, 0, 0, 0];
+        num.extend(7.25f64.to_le_bytes());
+        b.extend(rec(0x0203, &num));
+        b.extend(rec(0x000A, &[]));
+        let wb = read(&b).unwrap();
+        assert_eq!(
+            wb.sheets[0].cells[&(0, 1)].value,
+            Value::text("abc"),
+            "{bof:x}"
+        );
+        assert_eq!(
+            wb.sheets[0].cells[&(1, 1)].value,
+            Value::Number(7.25),
+            "{bof:x}"
+        );
+    }
+}
+
+#[test]
+fn damaged_compound_files_are_read_leniently() {
+    // The fixture cut short of its last sector, and with garbage where the
+    // header's mini stream cutoff is: still read.
+    let mut d = SAMPLE.to_vec();
+    d[56..60].copy_from_slice(&0xDEAD_BEEFu32.to_le_bytes());
+    sample_content(&read(&d).unwrap());
+    let short = &SAMPLE[..SAMPLE.len() - 100];
+    let _ = read(short);
+    // Bytes flipped one at a time across the file: never a panic.
+    for i in (0..SAMPLE.len()).step_by(13) {
+        let mut d = SAMPLE.to_vec();
+        d[i] ^= 0xFF;
+        let _ = read(&d);
+    }
+}
+
+/// A shared string whose header ends with its record: the CONTINUE that holds
+/// the characters starts with the width flag, which may differ from the
+/// header's. Strings after it were read as 8-bit when they were 16-bit.
+#[test]
+fn a_string_whose_header_ends_its_record_takes_the_width_of_the_next() {
+    use super::SplitReader;
+    // 3 characters, flags 0 (8-bit) in the first record; the second says 16-bit.
+    let mut d = vec![3, 0, 0];
+    d.extend([1, b'x', 0, b'y', 0, b'z', 0]);
+    let mut r = SplitReader {
+        d: &d,
+        breaks: &[3],
+        p: 0,
+    };
+    assert_eq!(r.rich().0, "xyz");
+    // The same string with the flag byte first in the record when 8-bit stays so.
+    let mut d = vec![3, 0, 0];
+    d.extend([0, b'a', b'b', b'c']);
+    let mut r = SplitReader {
+        d: &d,
+        breaks: &[3],
+        p: 0,
+    };
+    assert_eq!(r.rich().0, "abc");
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xlsx/chart.rs b/crates/exav-render/src/formats/office/sheets/xlsx/chart.rs
new file mode 100644
index 00000000..9d00d964
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xlsx/chart.rs
@@ -0,0 +1,387 @@
+//! Charts of the model to DrawingML chart parts (ECMA-376 part 1, 21.2).
+
+use super::xml::{esc, rgb};
+use crate::formats::office::sheets::model::{Chart, ChartKind, ChartSeries};
+use crate::formats::office::sheets::numtext;
+use std::fmt::Write as _;
+
+fn rich(text: &str) -> String {
+    let paras: String = text
+        .split('\n')
+        .map(|p| format!("<a:p><a:r><a:t>{}</a:t></a:r></a:p>", esc(p)))
+        .collect();
+    format!("<c:tx><c:rich><a:bodyPr/><a:lstStyle/>{paras}</c:rich></c:tx><c:overlay val=\"0\"/>")
+}
+
+fn str_cache(f: &Option<String>, vals: &[String]) -> String {
+    let mut s = format!("<c:ptCount val=\"{}\"/>", vals.len());
+    for (i, v) in vals.iter().enumerate() {
+        let _ = write!(s, "<c:pt idx=\"{i}\"><c:v>{}</c:v></c:pt>", esc(v));
+    }
+    match f {
+        Some(f) => format!(
+            "<c:strRef><c:f>{}</c:f><c:strCache>{s}</c:strCache></c:strRef>",
+            esc(f)
+        ),
+        None => format!("<c:strLit>{s}</c:strLit>"),
+    }
+}
+
+fn num_cache(f: &Option<String>, vals: &[Option<f64>]) -> String {
+    let mut s = String::from("<c:formatCode>General</c:formatCode>");
+    let _ = write!(s, "<c:ptCount val=\"{}\"/>", vals.len());
+    for (i, v) in vals.iter().enumerate() {
+        if let Some(v) = v {
+            let _ = write!(
+                s,
+                "<c:pt idx=\"{i}\"><c:v>{}</c:v></c:pt>",
+                numtext::xml(*v)
+            );
+        }
+    }
+    match f {
+        Some(f) => format!(
+            "<c:numRef><c:f>{}</c:f><c:numCache>{s}</c:numCache></c:numRef>",
+            esc(f)
+        ),
+        None => format!("<c:numLit>{s}</c:numLit>"),
+    }
+}
+
+fn solid(c: u32) -> String {
+    format!("<a:solidFill><a:srgbClr val=\"{}\"/></a:solidFill>", rgb(c))
+}
+
+fn lined(kind: ChartKind) -> bool {
+    matches!(
+        kind,
+        ChartKind::Line | ChartKind::Scatter | ChartKind::Radar | ChartKind::Stock
+    )
+}
+
+fn series(k: usize, s: &ChartSeries, kind: ChartKind) -> String {
+    let mut x = format!("<c:ser><c:idx val=\"{k}\"/><c:order val=\"{k}\"/>");
+    if s.name.is_some() || s.name_ref.is_some() {
+        let _ = write!(
+            x,
+            "<c:tx>{}</c:tx>",
+            str_cache(&s.name_ref, &[s.name.clone().unwrap_or_default()])
+        );
+    }
+    if lined(kind) {
+        let ln = match (s.line, s.color) {
+            (false, _) => "<a:ln><a:noFill/></a:ln>".to_string(),
+            (true, Some(c)) => format!("<a:ln w=\"28575\">{}</a:ln>", solid(c)),
+            (true, None) => String::new(),
+        };
+        if !ln.is_empty() {
+            let _ = write!(x, "<c:spPr>{ln}</c:spPr>");
+        }
+        if s.marker {
+            match s.color {
+                Some(c) => {
+                    let _ = write!(
+                        x,
+                        "<c:marker><c:symbol val=\"circle\"/><c:size val=\"5\"/><c:spPr>{}</c:spPr></c:marker>",
+                        solid(c)
+                    );
+                }
+                None => {
+                    x.push_str("<c:marker><c:symbol val=\"circle\"/><c:size val=\"5\"/></c:marker>")
+                }
+            }
+        } else {
+            x.push_str("<c:marker><c:symbol val=\"none\"/></c:marker>");
+        }
+    } else if let Some(c) = s.color {
+        let _ = write!(x, "<c:spPr>{}</c:spPr>", solid(c));
+    }
+    for (i, c) in &s.point_colors {
+        let _ = write!(
+            x,
+            "<c:dPt><c:idx val=\"{i}\"/><c:bubble3D val=\"0\"/><c:spPr>{}</c:spPr></c:dPt>",
+            solid(*c)
+        );
+    }
+    let cats = |tag: &str| -> String {
+        match &s.cat_nums {
+            Some(n) => format!("<c:{tag}>{}</c:{tag}>", num_cache(&s.cat_ref, n)),
+            None if !s.cats.is_empty() || s.cat_ref.is_some() => {
+                format!("<c:{tag}>{}</c:{tag}>", str_cache(&s.cat_ref, &s.cats))
+            }
+            None => String::new(),
+        }
+    };
+    if matches!(kind, ChartKind::Scatter | ChartKind::Bubble) {
+        x += &cats("xVal");
+        let _ = write!(x, "<c:yVal>{}</c:yVal>", num_cache(&s.val_ref, &s.vals));
+        if kind == ChartKind::Bubble {
+            let sizes = if s.sizes.is_empty() {
+                vec![Some(1.0); s.vals.len()]
+            } else {
+                s.sizes.clone()
+            };
+            let _ = write!(
+                x,
+                "<c:bubbleSize>{}</c:bubbleSize><c:bubble3D val=\"0\"/>",
+                num_cache(&s.size_ref, &sizes)
+            );
+        } else {
+            let _ = write!(x, "<c:smooth val=\"{}\"/>", u8::from(s.smooth));
+        }
+    } else {
+        x += &cats("cat");
+        let _ = write!(x, "<c:val>{}</c:val>", num_cache(&s.val_ref, &s.vals));
+        if kind == ChartKind::Line {
+            let _ = write!(x, "<c:smooth val=\"{}\"/>", u8::from(s.smooth));
+        }
+    }
+    x.push_str("</c:ser>");
+    x
+}
+
+struct AxisIds {
+    cat: u32,
+    val: u32,
+}
+
+fn axes(chart: &Chart, ids: &AxisIds, two_values: bool, secondary: bool) -> String {
+    let title = |t: &Option<String>| {
+        if secondary {
+            String::new()
+        } else {
+            t.as_ref()
+                .map(|t| format!("<c:title>{}</c:title>", rich(t)))
+                .unwrap_or_default()
+        }
+    };
+    let (mut cat_pos, mut val_pos) = if chart.horizontal {
+        ("l", "b")
+    } else {
+        ("b", "l")
+    };
+    if secondary {
+        (cat_pos, val_pos) = if chart.horizontal {
+            ("r", "t")
+        } else {
+            ("t", "r")
+        };
+    }
+    let first = if two_values { "valAx" } else { "catAx" };
+    let cat_del = u8::from(chart.cat_axis_deleted || secondary);
+    let val_del = u8::from(chart.val_axis_deleted);
+    let grid = if chart.major_grid && !secondary {
+        "<c:majorGridlines/>"
+    } else {
+        ""
+    };
+    let crosses = if secondary {
+        "<c:crosses val=\"max\"/>"
+    } else {
+        "<c:crosses val=\"autoZero\"/>"
+    };
+    format!(
+        "<c:{first}><c:axId val=\"{c}\"/><c:scaling><c:orientation val=\"minMax\"/></c:scaling><c:delete val=\"{cat_del}\"/><c:axPos val=\"{cat_pos}\"/>{}<c:numFmt formatCode=\"General\" sourceLinked=\"1\"/><c:majorTickMark val=\"out\"/><c:minorTickMark val=\"none\"/><c:tickLblPos val=\"nextTo\"/><c:crossAx val=\"{v}\"/><c:crosses val=\"autoZero\"/></c:{first}>\
+         <c:valAx><c:axId val=\"{v}\"/><c:scaling><c:orientation val=\"minMax\"/></c:scaling><c:delete val=\"{val_del}\"/><c:axPos val=\"{val_pos}\"/>{grid}{}<c:numFmt formatCode=\"General\" sourceLinked=\"1\"/><c:majorTickMark val=\"out\"/><c:minorTickMark val=\"none\"/><c:tickLblPos val=\"nextTo\"/><c:crossAx val=\"{c}\"/>{crosses}<c:crossBetween val=\"between\"/></c:valAx>",
+        title(&chart.cat_title),
+        title(&chart.val_title),
+        c = ids.cat,
+        v = ids.val,
+    )
+}
+
+/// One chart group (`c:barChart`, `c:lineChart`...) of `sers`.
+fn group(chart: &Chart, kind: ChartKind, sers: &str, ids: &AxisIds) -> (String, bool) {
+    let d3 = chart.three_d;
+    let ax = format!("<c:axId val=\"{}\"/><c:axId val=\"{}\"/>", ids.cat, ids.val);
+    let vary = u8::from(chart.vary_colors);
+    match kind {
+        ChartKind::Pie => {
+            let tag = if d3 { "pie3DChart" } else { "pieChart" };
+            let slice = if d3 {
+                String::new()
+            } else {
+                format!(
+                    "<c:firstSliceAng val=\"{}\"/>",
+                    chart.first_slice.unwrap_or(0).min(360)
+                )
+            };
+            (
+                format!("<c:{tag}><c:varyColors val=\"{vary}\"/>{sers}{slice}</c:{tag}>"),
+                false,
+            )
+        }
+        ChartKind::Doughnut => (
+            format!(
+                "<c:doughnutChart><c:varyColors val=\"{vary}\"/>{sers}<c:firstSliceAng val=\"{}\"/><c:holeSize val=\"{}\"/></c:doughnutChart>",
+                chart.first_slice.unwrap_or(0).min(360),
+                chart.hole_size.unwrap_or(50).clamp(10, 90)
+            ),
+            false,
+        ),
+        ChartKind::Scatter => (
+            format!(
+                "<c:scatterChart><c:scatterStyle val=\"lineMarker\"/><c:varyColors val=\"{vary}\"/>{sers}{ax}</c:scatterChart>"
+            ),
+            true,
+        ),
+        ChartKind::Bubble => (
+            format!("<c:bubbleChart><c:varyColors val=\"{vary}\"/>{sers}{ax}</c:bubbleChart>"),
+            true,
+        ),
+        ChartKind::Radar | ChartKind::FilledRadar => {
+            let style = if kind == ChartKind::FilledRadar {
+                "filled"
+            } else {
+                "marker"
+            };
+            (
+                format!(
+                    "<c:radarChart><c:radarStyle val=\"{style}\"/><c:varyColors val=\"{vary}\"/>{sers}{ax}</c:radarChart>"
+                ),
+                false,
+            )
+        }
+        ChartKind::Surface => (
+            format!(
+                "<c:surfaceChart><c:wireframe val=\"0\"/>{sers}{ax}<c:axId val=\"{}\"/></c:surfaceChart>",
+                ids.val + 1
+            ),
+            false,
+        ),
+        ChartKind::Stock => (
+            format!("<c:stockChart>{sers}<c:hiLowLines/>{ax}</c:stockChart>"),
+            false,
+        ),
+        ChartKind::Line | ChartKind::Area => {
+            let base = if kind == ChartKind::Area {
+                "area"
+            } else {
+                "line"
+            };
+            let tag = format!("{base}{}Chart", if d3 { "3D" } else { "" });
+            let grouping = if chart.grouping == "clustered" {
+                "standard"
+            } else {
+                chart.grouping
+            };
+            let extra = if base == "line" && !d3 {
+                "<c:marker val=\"1\"/>"
+            } else {
+                ""
+            };
+            (
+                format!(
+                    "<c:{tag}><c:grouping val=\"{grouping}\"/><c:varyColors val=\"{vary}\"/>{sers}{extra}{ax}</c:{tag}>"
+                ),
+                false,
+            )
+        }
+        ChartKind::Bar => {
+            let tag = if d3 { "bar3DChart" } else { "barChart" };
+            let grouping = if chart.grouping == "standard" {
+                "clustered"
+            } else {
+                chart.grouping
+            };
+            let overlap = match chart.overlap {
+                Some(o) => format!("<c:overlap val=\"{}\"/>", o.clamp(-100, 100)),
+                None if grouping == "stacked" || grouping == "percentStacked" => {
+                    "<c:overlap val=\"100\"/>".into()
+                }
+                None => String::new(),
+            };
+            (
+                format!(
+                    "<c:{tag}><c:barDir val=\"{}\"/><c:grouping val=\"{grouping}\"/><c:varyColors val=\"{vary}\"/>{sers}<c:gapWidth val=\"{}\"/>{overlap}{ax}</c:{tag}>",
+                    if chart.horizontal { "bar" } else { "col" },
+                    chart.gap_width.unwrap_or(150).min(500)
+                ),
+                false,
+            )
+        }
+    }
+}
+
+pub fn chart_xml(chart: &Chart) -> String {
+    let mut x = String::from(concat!(
+        r#"<?xml version="1.0" encoding="UTF-8" standalone="yes"?>"#,
+        "\n",
+        r#"<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><c:roundedCorners val="0"/><c:chart>"#
+    ));
+    match &chart.title {
+        Some(t) => {
+            let _ = write!(
+                x,
+                "<c:title>{}</c:title><c:autoTitleDeleted val=\"0\"/>",
+                rich(t)
+            );
+        }
+        None => x.push_str("<c:autoTitleDeleted val=\"1\"/>"),
+    }
+    if chart.three_d {
+        x.push_str(
+            "<c:view3D><c:rotX val=\"15\"/><c:rotY val=\"20\"/><c:rAngAx val=\"1\"/></c:view3D>",
+        );
+    }
+    x.push_str("<c:plotArea><c:layout/>");
+    // Series grouped by the kind they are drawn as and their axis, in order
+    // of first appearance.
+    let mut groups: Vec<((ChartKind, bool), Vec<usize>)> = vec![];
+    for (i, s) in chart.series.iter().enumerate() {
+        let k = (s.kind.unwrap_or(chart.kind), s.secondary);
+        match groups.iter_mut().find(|g| g.0 == k) {
+            Some(g) => g.1.push(i),
+            None => groups.push((k, vec![i])),
+        }
+    }
+    if groups.is_empty() {
+        groups.push(((chart.kind, false), vec![]));
+    }
+    let mut axes_xml = String::new();
+    let mut have_primary = false;
+    let mut have_secondary = false;
+    for ((kind, secondary), idx) in &groups {
+        let sers: String = idx
+            .iter()
+            .map(|&i| series(i, &chart.series[i], *kind))
+            .collect();
+        let ids = if *secondary {
+            AxisIds { cat: 3, val: 4 }
+        } else {
+            AxisIds { cat: 1, val: 2 }
+        };
+        let (g, two_values) = group(chart, *kind, &sers, &ids);
+        x.push_str(&g);
+        if matches!(kind, ChartKind::Pie | ChartKind::Doughnut) {
+            continue;
+        }
+        if *secondary && !have_secondary {
+            have_secondary = true;
+            axes_xml.push_str(&axes(chart, &ids, two_values, true));
+        } else if !*secondary && !have_primary {
+            have_primary = true;
+            axes_xml.push_str(&axes(chart, &ids, two_values, false));
+            if *kind == ChartKind::Surface {
+                axes_xml.push_str("<c:serAx><c:axId val=\"3\"/><c:scaling><c:orientation val=\"minMax\"/></c:scaling><c:delete val=\"0\"/><c:axPos val=\"b\"/><c:tickLblPos val=\"nextTo\"/><c:crossAx val=\"2\"/></c:serAx>");
+            }
+        }
+    }
+    x.push_str(&axes_xml);
+    if let Some(c) = chart.plot_fill {
+        let _ = write!(x, "<c:spPr>{}</c:spPr>", solid(c));
+    }
+    x.push_str("</c:plotArea>");
+    if let Some(pos) = chart.legend {
+        let _ = write!(
+            x,
+            "<c:legend><c:legendPos val=\"{pos}\"/><c:overlay val=\"0\"/></c:legend>"
+        );
+    }
+    x.push_str("<c:plotVisOnly val=\"1\"/><c:dispBlanksAs val=\"gap\"/></c:chart>");
+    if let Some(c) = chart.area_fill {
+        let _ = write!(x, "<c:spPr>{}</c:spPr>", solid(c));
+    }
+    x.push_str("</c:chartSpace>");
+    x
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xlsx/drawing.rs b/crates/exav-render/src/formats/office/sheets/xlsx/drawing.rs
new file mode 100644
index 00000000..3fa2f31a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xlsx/drawing.rs
@@ -0,0 +1,312 @@
+//! A sheet's drawing part: pictures, charts and shapes, anchored to cells.
+
+use super::xml::{esc, esc_into, rgb};
+use super::{Numbers, Package, Rels, XML_HEAD};
+use crate::formats::office::sheets::error::Result;
+use crate::formats::office::sheets::model::*;
+use std::fmt::Write as _;
+
+const NS_XDR: &str = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
+const NS_A: &str = "http://schemas.openxmlformats.org/drawingml/2006/main";
+const NS_C: &str = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+const NS_R: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+use crate::formats::office::sheets::geom::{EMU_PER_PX, Grid, col_px, row_px};
+
+fn off(frac: i64, px: f64) -> i64 {
+    (frac.clamp(0, 1_000_000) as f64 / 1e6 * px * EMU_PER_PX).round() as i64
+}
+
+fn anchor_xml(d: &mut String, sh: &Sheet, a: &Anchor, edit_as: &str) {
+    let (fc, fr, fdx, fdy) = a.from;
+    let (tc, tr, tdx, tdy) = a.to;
+    let (fc, fr, tc, tr) = (
+        fc.min(MAX_COL),
+        fr.min(MAX_ROW),
+        tc.min(MAX_COL),
+        tr.min(MAX_ROW),
+    );
+    let _ = write!(
+        d,
+        "<xdr:twoCellAnchor editAs=\"{edit_as}\"><xdr:from><xdr:col>{fc}</xdr:col><xdr:colOff>{}</xdr:colOff><xdr:row>{fr}</xdr:row><xdr:rowOff>{}</xdr:rowOff></xdr:from><xdr:to><xdr:col>{tc}</xdr:col><xdr:colOff>{}</xdr:colOff><xdr:row>{tr}</xdr:row><xdr:rowOff>{}</xdr:rowOff></xdr:to>",
+        off(fdx, col_px(sh, fc)),
+        off(fdy, row_px(sh, fr)),
+        off(tdx, col_px(sh, tc)),
+        off(tdy, row_px(sh, tr))
+    );
+}
+
+fn mime(ext: &str) -> &'static str {
+    match ext {
+        "png" => "image/png",
+        "jpeg" => "image/jpeg",
+        "emf" => "image/x-emf",
+        "wmf" => "image/x-wmf",
+        "bmp" => "image/bmp",
+        "tiff" => "image/tiff",
+        "gif" => "image/gif",
+        "svg" => "image/svg+xml",
+        "pict" => "image/pict",
+        _ => "application/octet-stream",
+    }
+}
+
+fn chart_frame(d: &mut String, id: usize, name: &str, rid: &str) {
+    let _ = write!(
+        d,
+        "<xdr:graphicFrame macro=\"\"><xdr:nvGraphicFramePr><xdr:cNvPr id=\"{id}\" name=\"{}\"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"0\" cy=\"0\"/></xdr:xfrm><a:graphic><a:graphicData uri=\"{NS_C}\"><c:chart xmlns:c=\"{NS_C}\" r:id=\"{rid}\"/></a:graphicData></a:graphic></xdr:graphicFrame>",
+        esc(name)
+    );
+}
+
+fn shape_xml(d: &mut String, sh: &Sheet, grid: &Grid, shp: &Shape, id: usize) {
+    anchor_xml(d, sh, &shp.anchor, "absolute");
+    let a = &shp.anchor;
+    let emu = |px: f64| (px * EMU_PER_PX) as i64;
+    let (x0, y0) = (
+        emu(grid.x(sh, a.from.0, a.from.2)),
+        emu(grid.y(sh, a.from.1, a.from.3)),
+    );
+    let (x1, y1) = (
+        emu(grid.x(sh, a.to.0, a.to.2)),
+        emu(grid.y(sh, a.to.1, a.to.3)),
+    );
+    // Lines are shapes too (not connection shapes), which readers draw.
+    let line = shp.geom == "line" || shp.geom == "straightConnector1";
+    let tag = "sp";
+    let _ = write!(
+        d,
+        "<xdr:sp macro=\"\" textlink=\"\"><xdr:nvSpPr><xdr:cNvPr id=\"{id}\" name=\""
+    );
+    esc_into(d, &shp.name);
+    d.push_str("\"/><xdr:cNvSpPr/></xdr:nvSpPr><xdr:spPr><a:xfrm");
+    if shp.rotation != 0.0 {
+        let _ = write!(
+            d,
+            " rot=\"{}\"",
+            (shp.rotation.rem_euclid(360.0) * 60000.0).round() as i64
+        );
+    }
+    if shp.flip_h {
+        d.push_str(" flipH=\"1\"");
+    }
+    if shp.flip_v {
+        d.push_str(" flipV=\"1\"");
+    }
+    let _ = write!(
+        d,
+        "><a:off x=\"{}\" y=\"{}\"/><a:ext cx=\"{}\" cy=\"{}\"/></a:xfrm>",
+        x0.min(x1),
+        y0.min(y1),
+        (x1 - x0).abs(),
+        (y1 - y0).abs()
+    );
+    let _ = write!(
+        d,
+        "<a:prstGeom prst=\"{}\"><a:avLst/></a:prstGeom>",
+        shp.geom
+    );
+    if !line {
+        match shp.fill {
+            Some(c) => {
+                let _ = write!(
+                    d,
+                    "<a:solidFill><a:srgbClr val=\"{}\"/></a:solidFill>",
+                    rgb(c)
+                );
+            }
+            None => d.push_str("<a:noFill/>"),
+        }
+    }
+    match shp.line {
+        Some(c) => {
+            d.push_str("<a:ln");
+            if let Some(w) = shp.line_width {
+                let _ = write!(d, " w=\"{}\"", w.clamp(0, 20_116_800));
+            }
+            let _ = write!(
+                d,
+                "><a:solidFill><a:srgbClr val=\"{}\"/></a:solidFill>",
+                rgb(c)
+            );
+            if let Some(dash) = shp.line_dash {
+                let _ = write!(d, "<a:prstDash val=\"{dash}\"/>");
+            }
+            if shp.head_arrow {
+                d.push_str("<a:headEnd type=\"triangle\"/>");
+            }
+            if shp.tail_arrow {
+                d.push_str("<a:tailEnd type=\"triangle\"/>");
+            }
+            d.push_str("</a:ln>");
+        }
+        None => d.push_str("<a:ln><a:noFill/></a:ln>"),
+    }
+    d.push_str("</xdr:spPr>");
+    if !line && !shp.text.text.is_empty() {
+        let t = &shp.text;
+        d.push_str("<xdr:txBody><a:bodyPr");
+        if let Some(an) = t.anchor {
+            let _ = write!(d, " anchor=\"{an}\"");
+        }
+        d.push_str("/><a:lstStyle/>");
+        for p in t.text.split('\n') {
+            d.push_str("<a:p>");
+            if let Some(al) = t.align {
+                let _ = write!(d, "<a:pPr algn=\"{al}\"/>");
+            }
+            if !p.is_empty() {
+                d.push_str("<a:r>");
+                if let Some(f) = &t.font {
+                    let _ = write!(
+                        d,
+                        "<a:rPr lang=\"en-US\" sz=\"{}\" b=\"{}\" i=\"{}\"",
+                        (f.size_centipt).clamp(100, 400_000),
+                        u8::from(f.bold),
+                        u8::from(f.italic)
+                    );
+                    if f.underline.is_some() {
+                        d.push_str(" u=\"sng\"");
+                    }
+                    d.push('>');
+                    if let Some(c) = f.color {
+                        let _ = write!(
+                            d,
+                            "<a:solidFill><a:srgbClr val=\"{}\"/></a:solidFill>",
+                            rgb(c)
+                        );
+                    }
+                    let _ = write!(
+                        d,
+                        "<a:latin typeface=\"{}\"/></a:rPr>",
+                        esc(super::ms_font_name(&f.name))
+                    );
+                }
+                d.push_str("<a:t>");
+                esc_into(d, p);
+                d.push_str("</a:t></a:r>");
+            }
+            d.push_str("</a:p>");
+        }
+        d.push_str("</xdr:txBody>");
+    }
+    let _ = write!(d, "</xdr:{tag}><xdr:clientData/></xdr:twoCellAnchor>");
+}
+
+/// Writes the sheet's drawing, its pictures and charts; returns the
+/// relationship id the worksheet names it by.
+pub(crate) fn drawing(
+    pkg: &mut Package,
+    sh: &Sheet,
+    rels: &mut Rels,
+    n: &mut Numbers,
+) -> Result<Option<String>> {
+    if sh.images.is_empty() && sh.charts.is_empty() && sh.shapes.is_empty() {
+        return Ok(None);
+    }
+    n.drawing += 1;
+    let k = n.drawing;
+    let mut d = format!(
+        "{XML_HEAD}<xdr:wsDr xmlns:xdr=\"{NS_XDR}\" xmlns:a=\"{NS_A}\" xmlns:r=\"{NS_R}\">"
+    );
+    let mut drels = Rels::default();
+    let mut id = 1usize;
+    for img in &sh.images {
+        n.image += 1;
+        let ext = img.ext;
+        pkg.put(&format!("xl/media/image{}.{ext}", n.image), &img.data)?;
+        pkg.default_type(ext, mime(ext));
+        let rid = drels.add("image", format!("../media/image{}.{ext}", n.image), false);
+        anchor_xml(&mut d, sh, &img.anchor, "oneCell");
+        id += 1;
+        let _ = write!(
+            d,
+            "<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"{id}\" name=\"{}\"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill><a:blip r:embed=\"{rid}\"/><a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/></xdr:twoCellAnchor>",
+            esc(&img.name)
+        );
+    }
+    for (i, ch) in sh.charts.iter().enumerate() {
+        n.chart += 1;
+        pkg.part(
+            &format!("xl/charts/chart{}.xml", n.chart),
+            super::chart::chart_xml(ch).as_bytes(),
+            "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
+        )?;
+        let rid = drels.add("chart", format!("../charts/chart{}.xml", n.chart), false);
+        anchor_xml(&mut d, sh, &ch.anchor, "oneCell");
+        id += 1;
+        chart_frame(&mut d, id, &format!("Chart {}", i + 1), &rid);
+        d.push_str("<xdr:clientData/></xdr:twoCellAnchor>");
+    }
+    if !sh.shapes.is_empty() {
+        let grid = Grid::for_anchors(sh, sh.shapes.iter().map(|s| s.anchor));
+        for shp in &sh.shapes {
+            id += 1;
+            shape_xml(&mut d, sh, &grid, shp, id);
+        }
+    }
+    d.push_str("</xdr:wsDr>");
+    pkg.part(
+        &format!("xl/drawings/drawing{k}.xml"),
+        d.as_bytes(),
+        "application/vnd.openxmlformats-officedocument.drawing+xml",
+    )?;
+    pkg.put(
+        &format!("xl/drawings/_rels/drawing{k}.xml.rels"),
+        drels.xml().as_bytes(),
+    )?;
+    Ok(Some(rels.add(
+        "drawing",
+        format!("../drawings/drawing{k}.xml"),
+        false,
+    )))
+}
+
+/// A chart sheet: its first chart over the whole sheet.
+pub(crate) fn chartsheet(
+    pkg: &mut Package,
+    wb: &Workbook,
+    si: usize,
+    n: &mut Numbers,
+) -> Result<Rels> {
+    let sh = &wb.sheets[si];
+    let mut rels = Rels::default();
+    n.drawing += 1;
+    n.chart += 1;
+    let k = n.drawing;
+    pkg.part(
+        &format!("xl/charts/chart{}.xml", n.chart),
+        super::chart::chart_xml(&sh.charts[0]).as_bytes(),
+        "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
+    )?;
+    let mut drels = Rels::default();
+    let rid = drels.add("chart", format!("../charts/chart{}.xml", n.chart), false);
+    let mut d = format!(
+        "{XML_HEAD}<xdr:wsDr xmlns:xdr=\"{NS_XDR}\" xmlns:a=\"{NS_A}\" xmlns:r=\"{NS_R}\"><xdr:absoluteAnchor><xdr:pos x=\"0\" y=\"0\"/><xdr:ext cx=\"9293679\" cy=\"6068786\"/>"
+    );
+    chart_frame(&mut d, 2, "Chart 1", &rid);
+    d.push_str("<xdr:clientData/></xdr:absoluteAnchor></xdr:wsDr>");
+    pkg.part(
+        &format!("xl/drawings/drawing{k}.xml"),
+        d.as_bytes(),
+        "application/vnd.openxmlformats-officedocument.drawing+xml",
+    )?;
+    pkg.put(
+        &format!("xl/drawings/_rels/drawing{k}.xml.rels"),
+        drels.xml().as_bytes(),
+    )?;
+    let drid = rels.add("drawing", format!("../drawings/drawing{k}.xml"), false);
+    let x = format!(
+        "{XML_HEAD}<chartsheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"{NS_R}\"><sheetPr/><sheetViews><sheetView{} workbookViewId=\"0\"/></sheetViews><pageMargins left=\"0.75\" right=\"0.75\" top=\"1\" bottom=\"1\" header=\"0.5\" footer=\"0.5\"/><drawing r:id=\"{drid}\"/></chartsheet>",
+        if si == wb.active {
+            " tabSelected=\"1\""
+        } else {
+            ""
+        }
+    );
+    pkg.part(
+        &format!("xl/chartsheets/sheet{}.xml", si + 1),
+        x.as_bytes(),
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml",
+    )?;
+    Ok(rels)
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xlsx/mod.rs b/crates/exav-render/src/formats/office/sheets/xlsx/mod.rs
new file mode 100644
index 00000000..4a6293a8
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xlsx/mod.rs
@@ -0,0 +1,1050 @@
+//! The workbook model to an XLSX package (ECMA-376 SpreadsheetML). Each
+//! worksheet is written into the ZIP as it is serialized, a buffer at a
+//! time; the shared strings and styles, known only once every sheet is
+//! written, follow them.
+
+pub(crate) mod chart;
+mod drawing;
+mod styles;
+pub(crate) mod xml;
+
+use crate::formats::office::common::package::{Lift, Out};
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::model::*;
+use crate::formats::office::sheets::numtext;
+use std::collections::HashMap;
+use std::fmt::Write as _;
+use std::io::Write;
+use xml::{argb, esc, esc_into};
+
+pub(crate) use styles::ms_font_name;
+
+const NS_MAIN: &str = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+const NS_R: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+const REL: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+const XML_HEAD: &str = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+
+struct Package {
+    // Dropped first: see `Lift`.
+    _lift: Lift,
+    z: zip::ZipWriter<Out>,
+    content_types: Vec<(String, &'static str)>,
+    defaults: Vec<(&'static str, &'static str)>,
+}
+
+fn zip_err(e: impl std::fmt::Display) -> Error {
+    let s = e.to_string();
+    if s.contains("too large") {
+        Error::TooLarge("output")
+    } else {
+        Error::Malformed(format!("writing the package: {s}"))
+    }
+}
+
+impl Package {
+    fn start(&mut self, name: &str) -> Result<()> {
+        let opt = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Deflated)
+            .compression_level(Some(6))
+            .last_modified_time(zip::DateTime::default());
+        self.z.start_file(name, opt).map_err(zip_err)
+    }
+
+    fn write(&mut self, data: &[u8]) -> Result<()> {
+        self.z.write_all(data).map_err(zip_err)
+    }
+
+    fn put(&mut self, name: &str, data: &[u8]) -> Result<()> {
+        self.start(name)?;
+        self.write(data)
+    }
+
+    fn part(&mut self, name: &str, data: &[u8], content_type: &'static str) -> Result<()> {
+        self.content_types.push((format!("/{name}"), content_type));
+        self.put(name, data)
+    }
+
+    fn default_type(&mut self, ext: &'static str, mime: &'static str) {
+        if !self.defaults.iter().any(|(e, _)| *e == ext) {
+            self.defaults.push((ext, mime));
+        }
+    }
+}
+
+/// A sheet's relationships: (type, target, external).
+#[derive(Default)]
+pub(crate) struct Rels(Vec<(&'static str, String, bool)>);
+
+impl Rels {
+    pub fn add(&mut self, kind: &'static str, target: String, external: bool) -> String {
+        self.0.push((kind, target, external));
+        format!("rId{}", self.0.len())
+    }
+
+    fn xml(&self) -> String {
+        let mut r = format!(
+            "{XML_HEAD}<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
+        );
+        for (i, (kind, target, ext)) in self.0.iter().enumerate() {
+            let _ = write!(
+                r,
+                "<Relationship Id=\"rId{}\" Type=\"{REL}/{kind}\" Target=\"{}\"",
+                i + 1,
+                esc(target)
+            );
+            if *ext {
+                r.push_str(" TargetMode=\"External\"");
+            }
+            r.push_str("/>");
+        }
+        r.push_str("</Relationships>");
+        r
+    }
+}
+
+/// The shared string table, filled as cells are written.
+struct Sst {
+    list: Vec<String>,
+    plain: HashMap<Str, u32>,
+    rich: HashMap<String, u32>,
+    count: u64,
+}
+
+impl Sst {
+    fn index(&mut self, v: &Value) -> u32 {
+        self.count += 1;
+        match v {
+            Value::Text(t) => {
+                if let Some(&i) = self.plain.get(t) {
+                    return i;
+                }
+                let mut x = String::from("<t xml:space=\"preserve\">");
+                esc_into(&mut x, t);
+                x.push_str("</t>");
+                let i = self.list.len() as u32;
+                self.list.push(x);
+                self.plain.insert(t.clone(), i);
+                i
+            }
+            Value::Rich(runs) => {
+                let mut x = String::new();
+                for r in runs.iter() {
+                    x.push_str("<r>");
+                    if let Some(f) = &r.font {
+                        styles::font_xml(&mut x, f, "rPr");
+                    }
+                    x.push_str("<t xml:space=\"preserve\">");
+                    esc_into(&mut x, &r.text);
+                    x.push_str("</t></r>");
+                }
+                if let Some(&i) = self.rich.get(&x) {
+                    return i;
+                }
+                let i = self.list.len() as u32;
+                self.rich.insert(x.clone(), i);
+                self.list.push(x);
+                i
+            }
+            _ => 0,
+        }
+    }
+}
+
+/// Counters for part names, across sheets.
+#[derive(Default)]
+pub(crate) struct Numbers {
+    pub image: usize,
+    pub chart: usize,
+    pub drawing: usize,
+    pub comments: usize,
+}
+
+const FLUSH: usize = 1 << 16;
+
+fn sheet_view(x: &mut String, sh: &Sheet, active: bool) {
+    let mut view = String::from("<sheetView");
+    if !sh.show_grid {
+        view.push_str(" showGridLines=\"0\"");
+    }
+    if !sh.show_zeros {
+        view.push_str(" showZeros=\"0\"");
+    }
+    if !sh.show_headers {
+        view.push_str(" showRowColHeaders=\"0\"");
+    }
+    if sh.rtl {
+        view.push_str(" rightToLeft=\"1\"");
+    }
+    if active {
+        view.push_str(" tabSelected=\"1\"");
+    }
+    if sh.zoom != 100 && (10..=400).contains(&sh.zoom) {
+        let _ = write!(view, " zoomScale=\"{}\"", sh.zoom);
+    }
+    if let Some((r, c)) = sh.top_left
+        && sh.freeze.is_none()
+        && r <= MAX_ROW
+        && c <= MAX_COL
+    {
+        let _ = write!(view, " topLeftCell=\"{}\"", cell_ref(r, c));
+    }
+    view.push_str(" workbookViewId=\"0\">");
+    if let Some((rows, cols)) = sh.freeze
+        && (rows > 0 || cols > 0)
+        && rows <= MAX_ROW
+        && cols <= MAX_COL
+    {
+        let pane = match (rows > 0, cols > 0) {
+            (true, true) => "bottomRight",
+            (true, false) => "bottomLeft",
+            _ => "topRight",
+        };
+        view.push_str("<pane");
+        if cols > 0 {
+            let _ = write!(view, " xSplit=\"{cols}\"");
+        }
+        if rows > 0 {
+            let _ = write!(view, " ySplit=\"{rows}\"");
+        }
+        let _ = write!(
+            view,
+            " topLeftCell=\"{}\" activePane=\"{pane}\" state=\"frozen\"/>",
+            cell_ref(rows, cols)
+        );
+    }
+    view.push_str("</sheetView>");
+    let _ = write!(x, "<sheetViews>{view}</sheetViews>");
+}
+
+fn cols_xml(x: &mut String, sh: &Sheet) {
+    let mut cols = sh.cols.clone();
+    cols.sort_by_key(|c| c.first);
+    let mut cx = String::new();
+    let mut next = 0u32;
+    for c in &cols {
+        let first = c.first.max(next);
+        if first > c.last || first > MAX_COL {
+            continue;
+        }
+        let last = c.last.min(MAX_COL);
+        next = last + 1;
+        let width = c.width.or(sh.default_col_width).unwrap_or(8.7109375);
+        let _ = write!(
+            cx,
+            "<col min=\"{}\" max=\"{}\" width=\"{}\"",
+            first + 1,
+            last + 1,
+            numtext::xml(width)
+        );
+        if let Some(s) = c.style {
+            let _ = write!(cx, " style=\"{s}\"");
+        }
+        if c.hidden {
+            cx.push_str(" hidden=\"1\"");
+        }
+        if c.width.is_some() {
+            cx.push_str(" customWidth=\"1\"");
+        }
+        if c.outline > 0 {
+            let _ = write!(cx, " outlineLevel=\"{}\"", c.outline.min(7));
+        }
+        cx.push_str("/>");
+    }
+    if !cx.is_empty() {
+        let _ = write!(x, "<cols>{cx}</cols>");
+    }
+}
+
+fn cell_xml(x: &mut String, sst: &mut Sst, sh: &Sheet, (r, c): (u32, u32), cell: &Cell) {
+    x.push_str("<c r=\"");
+    x.push_str(&cell_ref(r, c));
+    x.push('"');
+    if cell.style != 0 {
+        let _ = write!(x, " s=\"{}\"", cell.style);
+    }
+    let mut f = String::new();
+    if let Some(text) = &cell.formula {
+        match sh.arrays.get(&(r, c)) {
+            Some(a) => {
+                let _ = write!(f, "<f t=\"array\" ref=\"{}\">", range_ref(a));
+            }
+            None => f.push_str("<f>"),
+        }
+        esc_into(&mut f, text);
+        f.push_str("</f>");
+    }
+    match &cell.value {
+        Value::Empty if f.is_empty() => x.push_str("/>"),
+        Value::Empty => {
+            let _ = write!(x, ">{f}</c>");
+        }
+        Value::Number(v) => {
+            let _ = write!(x, ">{f}<v>{}</v></c>", numtext::xml(*v));
+        }
+        Value::Bool(b) => {
+            let _ = write!(x, " t=\"b\">{f}<v>{}</v></c>", u8::from(*b));
+        }
+        Value::Error(e) => {
+            let _ = write!(x, " t=\"e\">{f}<v>{}</v></c>", e.name());
+        }
+        Value::Text(t) if !f.is_empty() => {
+            let _ = write!(x, " t=\"str\">{f}<v>");
+            esc_into(x, t);
+            x.push_str("</v></c>");
+        }
+        v @ Value::Rich(runs) if !f.is_empty() => {
+            let _ = v;
+            let t: String = runs.iter().map(|r| r.text.as_str()).collect();
+            let _ = write!(x, " t=\"str\">{f}<v>");
+            esc_into(x, &t);
+            x.push_str("</v></c>");
+        }
+        v => {
+            let i = sst.index(v);
+            let _ = write!(x, " t=\"s\"><v>{i}</v></c>");
+        }
+    }
+}
+
+fn row_open(x: &mut String, sh: &Sheet, r: u32) {
+    let _ = write!(x, "<row r=\"{}\"", r + 1);
+    if let Some(i) = sh.rows.get(&r) {
+        if let Some(h) = i.height
+            && (i.custom_height || (h - sh.default_row_height).abs() > 1e-9)
+        {
+            let _ = write!(
+                x,
+                " ht=\"{}\" customHeight=\"1\"",
+                numtext::xml(h.clamp(0.0, 409.5))
+            );
+        }
+        if i.hidden {
+            x.push_str(" hidden=\"1\"");
+        }
+        if let Some(s) = i.style {
+            let _ = write!(x, " s=\"{s}\" customFormat=\"1\"");
+        }
+        if i.outline > 0 {
+            let _ = write!(x, " outlineLevel=\"{}\"", i.outline.min(7));
+        }
+    }
+    x.push('>');
+}
+
+/// The rows of a sheet, streamed into its part.
+fn sheet_data(pkg: &mut Package, x: &mut String, sst: &mut Sst, sh: &Sheet) -> Result<()> {
+    x.push_str("<sheetData>");
+    let mut cells = sh.cells.range(..).peekable();
+    let mut infos = sh
+        .rows
+        .iter()
+        .filter(|(_, i)| {
+            i.hidden
+                || i.style.is_some()
+                || i.outline > 0
+                || i.height
+                    .is_some_and(|h| i.custom_height || (h - sh.default_row_height).abs() > 1e-9)
+        })
+        .map(|(k, _)| *k)
+        .peekable();
+    loop {
+        let next_cell = cells.peek().map(|(k, _)| k.0);
+        let next_info = infos.peek().copied();
+        let r = match (next_cell, next_info) {
+            (None, None) => break,
+            (Some(a), Some(b)) => a.min(b),
+            (Some(a), None) => a,
+            (None, Some(b)) => b,
+        };
+        if r > MAX_ROW {
+            break;
+        }
+        if next_info == Some(r) {
+            infos.next();
+        }
+        row_open(x, sh, r);
+        while let Some((&(cr, cc), cell)) = cells.next_if(|(k, _)| k.0 == r) {
+            if cc <= MAX_COL {
+                cell_xml(x, sst, sh, (cr, cc), cell);
+            }
+        }
+        x.push_str("</row>");
+        if x.len() > FLUSH {
+            pkg.write(x.as_bytes())?;
+            x.clear();
+        }
+    }
+    x.push_str("</sheetData>");
+    Ok(())
+}
+
+fn cfvo(x: &mut String, v: &Cfvo) {
+    match &v.val {
+        Some(val) => {
+            let _ = write!(x, "<cfvo type=\"{}\" val=\"{}\"/>", v.kind, esc(val));
+        }
+        None => {
+            let _ = write!(x, "<cfvo type=\"{}\"/>", v.kind);
+        }
+    }
+}
+
+fn cond_formats(x: &mut String, sh: &Sheet, dxfs: &mut Vec<Dxf>) {
+    // Rules without a priority of their own come after those with one, in
+    // order.
+    let explicit = sh
+        .cond_formats
+        .iter()
+        .flat_map(|c| &c.rules)
+        .map(|r| r.priority)
+        .max()
+        .unwrap_or(0);
+    let mut next = explicit + 1;
+    for cf in &sh.cond_formats {
+        let sq: Vec<String> = cf
+            .ranges
+            .iter()
+            .filter_map(|r| r.clipped())
+            .map(|r| range_ref(&r))
+            .collect();
+        if sq.is_empty() || cf.rules.is_empty() {
+            continue;
+        }
+        let _ = write!(x, "<conditionalFormatting sqref=\"{}\">", sq.join(" "));
+        for rule in &cf.rules {
+            let kind = match &rule.kind {
+                CfKind::CellIs { .. } => "cellIs",
+                CfKind::Expression { .. } => "expression",
+                CfKind::ColorScale { .. } => "colorScale",
+                CfKind::DataBar { .. } => "dataBar",
+                CfKind::IconSet { .. } => "iconSet",
+                CfKind::Other { kind, .. } => kind,
+            };
+            let _ = write!(x, "<cfRule type=\"{kind}\"");
+            if let Some(d) = &rule.dxf {
+                dxfs.push(d.clone());
+                let _ = write!(x, " dxfId=\"{}\"", dxfs.len() - 1);
+            }
+            let prio = if rule.priority > 0 {
+                rule.priority
+            } else {
+                next += 1;
+                next - 1
+            };
+            let _ = write!(x, " priority=\"{prio}\"");
+            if rule.stop {
+                x.push_str(" stopIfTrue=\"1\"");
+            }
+            match &rule.kind {
+                CfKind::CellIs { operator, formulas } => {
+                    let _ = write!(x, " operator=\"{operator}\">");
+                    for f in formulas {
+                        let _ = write!(x, "<formula>{}</formula>", esc(f));
+                    }
+                }
+                CfKind::Expression { formula } => {
+                    let _ = write!(x, "><formula>{}</formula>", esc(formula));
+                }
+                CfKind::ColorScale { cfvos, colors } => {
+                    x.push_str("><colorScale>");
+                    for c in cfvos {
+                        cfvo(x, c);
+                    }
+                    for c in colors {
+                        let _ = write!(x, "<color rgb=\"{}\"/>", argb(*c));
+                    }
+                    x.push_str("</colorScale>");
+                }
+                CfKind::DataBar { min, max, color } => {
+                    x.push_str("><dataBar>");
+                    cfvo(x, min);
+                    cfvo(x, max);
+                    let _ = write!(x, "<color rgb=\"{}\"/></dataBar>", argb(*color));
+                }
+                CfKind::IconSet {
+                    set,
+                    cfvos,
+                    reverse,
+                    show_value,
+                } => {
+                    let _ = write!(x, "><iconSet iconSet=\"{}\"", esc(set));
+                    if *reverse {
+                        x.push_str(" reverse=\"1\"");
+                    }
+                    if !*show_value {
+                        x.push_str(" showValue=\"0\"");
+                    }
+                    x.push('>');
+                    for c in cfvos {
+                        cfvo(x, c);
+                    }
+                    x.push_str("</iconSet>");
+                }
+                CfKind::Other {
+                    attrs, formulas, ..
+                } => {
+                    for (k, v) in attrs {
+                        let _ = write!(x, " {k}=\"{}\"", esc(v));
+                    }
+                    x.push('>');
+                    for f in formulas {
+                        let _ = write!(x, "<formula>{}</formula>", esc(f));
+                    }
+                }
+            }
+            x.push_str("</cfRule>");
+        }
+        x.push_str("</conditionalFormatting>");
+    }
+}
+
+fn validations(x: &mut String, sh: &Sheet) {
+    let list: Vec<&Validation> = sh
+        .validations
+        .iter()
+        .filter(|v| v.ranges.iter().any(|r| r.clipped().is_some()))
+        .collect();
+    if list.is_empty() {
+        return;
+    }
+    let _ = write!(x, "<dataValidations count=\"{}\">", list.len());
+    for v in list {
+        let sq: Vec<String> = v
+            .ranges
+            .iter()
+            .filter_map(|r| r.clipped())
+            .map(|r| range_ref(&r))
+            .collect();
+        let _ = write!(x, "<dataValidation type=\"{}\"", v.kind);
+        if v.operator != "between" {
+            let _ = write!(x, " operator=\"{}\"", v.operator);
+        }
+        if v.error_style != "stop" {
+            let _ = write!(x, " errorStyle=\"{}\"", v.error_style);
+        }
+        if v.allow_blank {
+            x.push_str(" allowBlank=\"1\"");
+        }
+        if v.hide_dropdown {
+            x.push_str(" showDropDown=\"1\"");
+        }
+        if v.show_input {
+            x.push_str(" showInputMessage=\"1\"");
+        }
+        if v.show_error {
+            x.push_str(" showErrorMessage=\"1\"");
+        }
+        for (k, val) in [
+            ("promptTitle", &v.prompt_title),
+            ("prompt", &v.prompt),
+            ("errorTitle", &v.error_title),
+            ("error", &v.error),
+        ] {
+            if let Some(s) = val {
+                let _ = write!(x, " {k}=\"{}\"", esc(s));
+            }
+        }
+        let _ = write!(x, " sqref=\"{}\">", sq.join(" "));
+        if let Some(f) = &v.formula1 {
+            let _ = write!(x, "<formula1>{}</formula1>", esc(f));
+        }
+        if let Some(f) = &v.formula2 {
+            let _ = write!(x, "<formula2>{}</formula2>", esc(f));
+        }
+        x.push_str("</dataValidation>");
+    }
+    x.push_str("</dataValidations>");
+}
+
+fn hyperlinks(x: &mut String, sh: &Sheet, rels: &mut Rels) {
+    let list: Vec<(&Hyperlink, Range)> = sh
+        .hyperlinks
+        .iter()
+        .filter_map(|h| Some((h, h.range.clipped()?)))
+        .collect();
+    if list.is_empty() {
+        return;
+    }
+    x.push_str("<hyperlinks>");
+    for (h, range) in list {
+        let _ = write!(x, "<hyperlink ref=\"{}\"", range_ref(&range));
+        if let Some(u) = &h.url {
+            let id = rels.add("hyperlink", u.clone(), true);
+            let _ = write!(x, " r:id=\"{id}\"");
+        }
+        if let Some(l) = &h.location {
+            let _ = write!(x, " location=\"{}\"", esc(l));
+        }
+        if let Some(t) = &h.tooltip {
+            let _ = write!(x, " tooltip=\"{}\"", esc(t));
+        }
+        if let Some(d) = &h.display {
+            let _ = write!(x, " display=\"{}\"", esc(d));
+        }
+        x.push_str("/>");
+    }
+    x.push_str("</hyperlinks>");
+}
+
+fn comments(
+    pkg: &mut Package,
+    sh: &Sheet,
+    rels: &mut Rels,
+    n: &mut Numbers,
+) -> Result<Option<String>> {
+    if sh.comments.is_empty() {
+        return Ok(None);
+    }
+    n.comments += 1;
+    let k = n.comments;
+    let mut authors: Vec<&str> = vec![];
+    let mut list = String::new();
+    for c in &sh.comments {
+        let ai = match authors.iter().position(|a| *a == c.author) {
+            Some(i) => i,
+            None => {
+                authors.push(&c.author);
+                authors.len() - 1
+            }
+        };
+        let _ = write!(
+            list,
+            "<comment ref=\"{}\" authorId=\"{ai}\"><text><r><t xml:space=\"preserve\">",
+            cell_ref(c.row, c.col)
+        );
+        esc_into(&mut list, &c.text);
+        list.push_str("</t></r></text></comment>");
+    }
+    let mut cx = format!("{XML_HEAD}<comments xmlns=\"{NS_MAIN}\"><authors>");
+    for a in &authors {
+        let _ = write!(cx, "<author>{}</author>", esc(a));
+    }
+    let _ = write!(cx, "</authors><commentList>{list}</commentList></comments>");
+    pkg.part(
+        &format!("xl/comments{k}.xml"),
+        cx.as_bytes(),
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml",
+    )?;
+    // The note shapes, which Excel needs to show the comments.
+    let mut v = String::from(concat!(
+        r#"<xml xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel">"#,
+        r#"<o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="1"/></o:shapelayout>"#,
+        r#"<v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter"/><v:path gradientshapeok="t" o:connecttype="rect"/></v:shapetype>"#
+    ));
+    for (i, c) in sh.comments.iter().enumerate() {
+        let _ = write!(
+            v,
+            "<v:shape id=\"_x0000_s{}\" type=\"#_x0000_t202\" style=\"position:absolute;margin-left:59.25pt;margin-top:1.5pt;width:108pt;height:59.25pt;z-index:{};visibility:{}\" fillcolor=\"#ffffe1\" o:insetmode=\"auto\"><v:fill color2=\"#ffffe1\"/><v:shadow on=\"t\" color=\"black\" obscured=\"t\"/><v:path o:connecttype=\"none\"/><v:textbox style=\"mso-direction-alt:auto\"><div style=\"text-align:left\"></div></v:textbox><x:ClientData ObjectType=\"Note\"><x:MoveWithCells/><x:SizeWithCells/><x:AutoFill>False</x:AutoFill><x:Row>{}</x:Row><x:Column>{}</x:Column>{}</x:ClientData></v:shape>",
+            1025 + i,
+            i + 1,
+            if c.visible { "visible" } else { "hidden" },
+            c.row,
+            c.col,
+            if c.visible { "<x:Visible/>" } else { "" }
+        );
+    }
+    v.push_str("</xml>");
+    pkg.put(&format!("xl/drawings/vmlDrawing{k}.vml"), v.as_bytes())?;
+    pkg.default_type(
+        "vml",
+        "application/vnd.openxmlformats-officedocument.vmlDrawing",
+    );
+    let id = rels.add(
+        "vmlDrawing",
+        format!("../drawings/vmlDrawing{k}.vml"),
+        false,
+    );
+    rels.add("comments", format!("../comments{k}.xml"), false);
+    Ok(Some(id))
+}
+
+fn worksheet(
+    pkg: &mut Package,
+    wb: &Workbook,
+    si: usize,
+    sst: &mut Sst,
+    dxfs: &mut Vec<Dxf>,
+    n: &mut Numbers,
+) -> Result<Rels> {
+    let sh = &wb.sheets[si];
+    let mut rels = Rels::default();
+    // Their parts first: the sheet's is then written in one go.
+    let drawing_id = drawing::drawing(pkg, sh, &mut rels, n)?;
+    let legacy_id = comments(pkg, sh, &mut rels, n)?;
+    pkg.start(&format!("xl/worksheets/sheet{}.xml", si + 1))?;
+    pkg.content_types.push((
+        format!("/xl/worksheets/sheet{}.xml", si + 1),
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
+    ));
+    let mut x = String::with_capacity(FLUSH + 4096);
+    let _ = write!(
+        x,
+        "{XML_HEAD}<worksheet xmlns=\"{NS_MAIN}\" xmlns:r=\"{NS_R}\">"
+    );
+    let mut pr = String::new();
+    if let Some(c) = sh.tab_color {
+        let _ = write!(pr, "<tabColor rgb=\"{}\"/>", argb(c));
+    }
+    if !sh.outline_below || !sh.outline_right {
+        let _ = write!(
+            pr,
+            "<outlinePr summaryBelow=\"{}\" summaryRight=\"{}\"/>",
+            u8::from(sh.outline_below),
+            u8::from(sh.outline_right)
+        );
+    }
+    if !pr.is_empty() {
+        let _ = write!(x, "<sheetPr>{pr}</sheetPr>");
+    }
+    if let (Some(first), Some(last)) = (sh.cells.keys().next(), sh.cells.keys().next_back()) {
+        let (mut c1, mut c2) = (u32::MAX, 0);
+        for &(_, c) in sh.cells.keys() {
+            c1 = c1.min(c);
+            c2 = c2.max(c);
+        }
+        if let Some(d) = (Range {
+            r1: first.0,
+            c1,
+            r2: last.0,
+            c2,
+        })
+        .clipped()
+        {
+            let _ = write!(x, "<dimension ref=\"{}\"/>", range_ref(&d));
+        }
+    }
+    sheet_view(&mut x, sh, si == wb.active);
+    let _ = write!(
+        x,
+        "<sheetFormatPr defaultRowHeight=\"{}\"",
+        numtext::xml(sh.default_row_height)
+    );
+    if let Some(w) = sh.default_col_width {
+        let _ = write!(x, " defaultColWidth=\"{}\"", numtext::xml(w));
+    }
+    if let Some(b) = sh.base_col_width {
+        let _ = write!(x, " baseColWidth=\"{}\"", b.min(255));
+    }
+    if sh.default_row_custom {
+        x.push_str(" customHeight=\"1\"");
+    }
+    if sh.default_row_hidden {
+        x.push_str(" zeroHeight=\"1\"");
+    }
+    x.push_str("/>");
+    cols_xml(&mut x, sh);
+    sheet_data(pkg, &mut x, sst, sh)?;
+    if sh.protected {
+        x.push_str("<sheetProtection sheet=\"1\" objects=\"1\" scenarios=\"1\"/>");
+    }
+    if let Some(a) = sh.autofilter.and_then(Range::clipped) {
+        let _ = write!(x, "<autoFilter ref=\"{}\"/>", range_ref(&a));
+    }
+    let merges: Vec<Range> = sh.merges.iter().filter_map(|m| m.clipped()).collect();
+    if !merges.is_empty() {
+        let _ = write!(x, "<mergeCells count=\"{}\">", merges.len());
+        for m in &merges {
+            let _ = write!(x, "<mergeCell ref=\"{}\"/>", range_ref(m));
+        }
+        x.push_str("</mergeCells>");
+    }
+    cond_formats(&mut x, sh, dxfs);
+    validations(&mut x, sh);
+    hyperlinks(&mut x, sh, &mut rels);
+    x.push_str("<pageMargins left=\"0.75\" right=\"0.75\" top=\"1\" bottom=\"1\" header=\"0.5\" footer=\"0.5\"/>");
+    if let Some(id) = drawing_id {
+        let _ = write!(x, "<drawing r:id=\"{id}\"/>");
+    }
+    if let Some(id) = legacy_id {
+        let _ = write!(x, "<legacyDrawing r:id=\"{id}\"/>");
+    }
+    x.push_str("</worksheet>");
+    pkg.write(x.as_bytes())?;
+    Ok(rels)
+}
+
+/// Sheet names XLSX accepts, unique ignoring case. Names already valid and
+/// unique are kept, so that readers can name sheets in formulas first.
+pub(crate) fn sheet_names<'a>(names: impl Iterator<Item = &'a str>) -> Vec<String> {
+    let mut used: Vec<String> = vec![];
+    for (i, n) in names.enumerate() {
+        let base = sanitize_sheet_name(n, i);
+        let mut name = base.clone();
+        let mut k = i + 1;
+        while used.iter().any(|u| u.to_lowercase() == name.to_lowercase()) {
+            name = format!("{}_{k}", base.chars().take(24).collect::<String>());
+            k += 1;
+        }
+        used.push(name);
+    }
+    used
+}
+
+fn sanitize_sheet_name(name: &str, i: usize) -> String {
+    let s: String = name
+        .chars()
+        .map(|c| {
+            if "[]:*?/\\".contains(c) || c.is_control() {
+                '_'
+            } else {
+                c
+            }
+        })
+        .take(31)
+        .collect();
+    let s = s.trim_matches('\'').to_string();
+    if s.is_empty() {
+        format!("Sheet{}", i + 1)
+    } else {
+        s
+    }
+}
+
+/// A defined name XLSX accepts: letters, digits, `_`, `.` and `\`, not a
+/// cell reference.
+fn valid_name(n: &str) -> bool {
+    let mut ch = n.chars();
+    let Some(first) = ch.next() else { return false };
+    (first.is_alphabetic() || first == '_' || first == '\\')
+        && n.chars()
+            .all(|c| c.is_alphanumeric() || matches!(c, '_' | '.' | '\\'))
+        && parse_cell(n).is_none()
+        && !matches!(
+            n.to_ascii_uppercase().as_str(),
+            "R" | "C" | "TRUE" | "FALSE"
+        )
+}
+
+fn workbook_xml(wb: &Workbook, chart_sheets: &[bool]) -> String {
+    let mut w = format!("{XML_HEAD}<workbook xmlns=\"{NS_MAIN}\" xmlns:r=\"{NS_R}\">");
+    let _ = write!(
+        w,
+        "<workbookPr{}/>",
+        if wb.date1904 { " date1904=\"1\"" } else { "" }
+    );
+    let active = wb.active.min(wb.sheets.len().saturating_sub(1));
+    let first = wb.first_tab.min(wb.sheets.len().saturating_sub(1));
+    let _ = write!(
+        w,
+        "<bookViews><workbookView activeTab=\"{active}\" firstSheet=\"{first}\"/></bookViews><sheets>"
+    );
+    let sheet_list = sheet_names(wb.sheets.iter().map(|s| s.name.as_str()));
+    for (i, (sh, name)) in wb.sheets.iter().zip(&sheet_list).enumerate() {
+        let state = match sh.state {
+            SheetState::Visible => "",
+            SheetState::Hidden => " state=\"hidden\"",
+            SheetState::VeryHidden => " state=\"veryHidden\"",
+        };
+        let _ = write!(
+            w,
+            "<sheet name=\"{}\" sheetId=\"{}\"{state} r:id=\"rId{}\"/>",
+            esc(name),
+            i + 1,
+            i + 1
+        );
+    }
+    w.push_str("</sheets>");
+    let _ = chart_sheets;
+    let mut seen = std::collections::HashSet::new();
+    let mut names = String::new();
+    for n in &wb.names {
+        if n.formula.is_empty()
+            || !valid_name(&n.name)
+            || n.sheet.is_some_and(|s| s >= wb.sheets.len())
+        {
+            continue;
+        }
+        if !seen.insert((n.name.to_lowercase(), n.sheet)) {
+            continue;
+        }
+        let _ = write!(names, "<definedName name=\"{}\"", esc(&n.name));
+        if let Some(s) = n.sheet {
+            let _ = write!(names, " localSheetId=\"{s}\"");
+        }
+        if n.hidden {
+            names.push_str(" hidden=\"1\"");
+        }
+        let _ = write!(names, ">{}</definedName>", esc(&n.formula));
+    }
+    // A filter's range, as Excel names it beside the filter.
+    for (i, sh) in wb.sheets.iter().enumerate() {
+        let Some(a) = sh.autofilter.and_then(Range::clipped) else {
+            continue;
+        };
+        if !seen.insert(("_xlnm._filterdatabase".into(), Some(i))) {
+            continue;
+        }
+        let abs = |r: u32, c: u32| format!("${}${}", col_name(c), u64::from(r) + 1);
+        let _ = write!(
+            names,
+            "<definedName name=\"_xlnm._FilterDatabase\" localSheetId=\"{i}\" hidden=\"1\">{}!{}:{}</definedName>",
+            esc(&crate::formats::office::sheets::xls::formula::quote_sheet(
+                &sheet_list[i]
+            )),
+            abs(a.r1, a.c1),
+            abs(a.r2, a.c2)
+        );
+    }
+    if !names.is_empty() {
+        let _ = write!(w, "<definedNames>{names}</definedNames>");
+    }
+    w.push_str("<calcPr calcId=\"0\"/></workbook>");
+    w
+}
+
+/// Serializes `wb`; the output may take at most `max_bytes`.
+pub(crate) fn write(wb: &Workbook, max_bytes: u64) -> Result<Vec<u8>> {
+    if wb.sheets.is_empty() {
+        return Err(Error::Malformed("no sheets".into()));
+    }
+    let (out, lift) = Out::new(0, max_bytes);
+    let mut pkg = Package {
+        _lift: lift,
+        z: zip::ZipWriter::new(out),
+        content_types: vec![],
+        defaults: vec![
+            (
+                "rels",
+                "application/vnd.openxmlformats-package.relationships+xml",
+            ),
+            ("xml", "application/xml"),
+        ],
+    };
+    let mut sst = Sst {
+        list: vec![],
+        plain: HashMap::new(),
+        rich: HashMap::new(),
+        count: 0,
+    };
+    let mut dxfs: Vec<Dxf> = vec![];
+    let mut nums = Numbers::default();
+    let mut chart_sheets = vec![];
+    for si in 0..wb.sheets.len() {
+        let sh = &wb.sheets[si];
+        let rels = if sh.chart_sheet && !sh.charts.is_empty() {
+            chart_sheets.push(true);
+            drawing::chartsheet(&mut pkg, wb, si, &mut nums)?
+        } else {
+            chart_sheets.push(false);
+            worksheet(&mut pkg, wb, si, &mut sst, &mut dxfs, &mut nums)?
+        };
+        if !rels.0.is_empty() {
+            let dir = if chart_sheets[si] {
+                "chartsheets"
+            } else {
+                "worksheets"
+            };
+            pkg.put(
+                &format!("xl/{dir}/_rels/sheet{}.xml.rels", si + 1),
+                rels.xml().as_bytes(),
+            )?;
+        }
+    }
+
+    pkg.part(
+        "xl/workbook.xml",
+        workbook_xml(wb, &chart_sheets).as_bytes(),
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
+    )?;
+    let mut wrels = Rels::default();
+    for (i, &cs) in chart_sheets.iter().enumerate() {
+        if cs {
+            wrels.add(
+                "chartsheet",
+                format!("chartsheets/sheet{}.xml", i + 1),
+                false,
+            );
+        } else {
+            wrels.add("worksheet", format!("worksheets/sheet{}.xml", i + 1), false);
+        }
+    }
+    wrels.add("styles", "styles.xml".into(), false);
+    if !sst.list.is_empty() {
+        wrels.add("sharedStrings", "sharedStrings.xml".into(), false);
+    }
+    pkg.put("xl/_rels/workbook.xml.rels", wrels.xml().as_bytes())?;
+    pkg.part(
+        "xl/styles.xml",
+        styles::styles_xml(&wb.styles, &dxfs).as_bytes(),
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
+    )?;
+    if !sst.list.is_empty() {
+        pkg.content_types.push((
+            "/xl/sharedStrings.xml".into(),
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
+        ));
+        pkg.start("xl/sharedStrings.xml")?;
+        let mut s = format!(
+            "{XML_HEAD}<sst xmlns=\"{NS_MAIN}\" count=\"{}\" uniqueCount=\"{}\">",
+            sst.count,
+            sst.list.len()
+        );
+        for e in &sst.list {
+            s.push_str("<si>");
+            s.push_str(e);
+            s.push_str("</si>");
+            if s.len() > FLUSH {
+                pkg.write(s.as_bytes())?;
+                s.clear();
+            }
+        }
+        s.push_str("</sst>");
+        pkg.write(s.as_bytes())?;
+    }
+    pkg.put(
+        "_rels/.rels",
+        format!("{XML_HEAD}<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"{REL}/officeDocument\" Target=\"xl/workbook.xml\"/></Relationships>").as_bytes(),
+    )?;
+    let mut ct = format!(
+        "{XML_HEAD}<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"
+    );
+    for (e, m) in &pkg.defaults {
+        let _ = write!(ct, "<Default Extension=\"{e}\" ContentType=\"{m}\"/>");
+    }
+    for (p, t) in &pkg.content_types {
+        let _ = write!(ct, "<Override PartName=\"{p}\" ContentType=\"{t}\"/>");
+    }
+    ct.push_str("</Types>");
+    pkg.put("[Content_Types].xml", ct.as_bytes())?;
+    pkg._lift.lift();
+    let out = pkg.z.finish().map_err(zip_err)?;
+    Ok(out.into_inner())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn sheet_names_are_valid_and_unique() {
+        let long = "x".repeat(40);
+        let names = sheet_names(["a:b", "", "A:B", &long, &long, &long].into_iter());
+        assert_eq!(names[0], "a_b");
+        assert_eq!(names[1], "Sheet2");
+        assert_eq!(names[2], "A_B_3");
+        assert_eq!(names[3].len(), 31);
+        assert_eq!(names[4], format!("{}_5", "x".repeat(24)));
+        assert_eq!(names[5], format!("{}_6", "x".repeat(24)));
+        // Many duplicates end, each its own name.
+        let many = sheet_names(std::iter::repeat_n(long.as_str(), 300));
+        let unique: std::collections::HashSet<String> =
+            many.iter().map(|n| n.to_lowercase()).collect();
+        assert_eq!(unique.len(), 300);
+        assert!(many.iter().all(|n| n.chars().count() <= 31));
+    }
+
+    #[test]
+    fn a_filter_is_named() {
+        let mut wb = Workbook::new(Style::default());
+        let mut sh = Sheet::new("My data".into());
+        sh.autofilter = Some(Range {
+            r1: 0,
+            c1: 0,
+            r2: 5,
+            c2: 3,
+        });
+        wb.sheets.push(sh);
+        let x = workbook_xml(&wb, &[false]);
+        assert!(x.contains(r#"<definedName name="_xlnm._FilterDatabase" localSheetId="0" hidden="1">'My data'!$A$1:$D$6</definedName>"#), "{x}");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xlsx/styles.rs b/crates/exav-render/src/formats/office/sheets/xlsx/styles.rs
new file mode 100644
index 00000000..addae01c
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xlsx/styles.rs
@@ -0,0 +1,351 @@
+//! styles.xml: fonts, fills, borders, number formats, cell formats and the
+//! differential formats of conditional formats.
+
+use super::xml::{argb, esc, esc_into};
+use crate::formats::office::sheets::model::*;
+use crate::formats::office::sheets::numtext;
+use std::collections::HashMap;
+use std::fmt::Write as _;
+
+struct Interner<T: std::hash::Hash + Eq + Clone> {
+    list: Vec<T>,
+    map: HashMap<T, usize>,
+}
+
+impl<T: std::hash::Hash + Eq + Clone> Interner<T> {
+    fn new() -> Self {
+        Interner {
+            list: vec![],
+            map: HashMap::new(),
+        }
+    }
+
+    fn get(&mut self, v: &T) -> usize {
+        if let Some(&i) = self.map.get(v) {
+            return i;
+        }
+        let i = self.list.len();
+        self.list.push(v.clone());
+        self.map.insert(v.clone(), i);
+        i
+    }
+}
+
+/// Metric-compatible fonts under the names of the fonts they stand in for,
+/// which an XLSX reader is more likely to have or map.
+pub fn ms_font_name(name: &str) -> &str {
+    match name {
+        "Liberation Sans" => "Arial",
+        "Liberation Serif" => "Times New Roman",
+        "Liberation Mono" => "Courier New",
+        "Liberation Sans Narrow" => "Arial Narrow",
+        "Carlito" => "Calibri",
+        "Caladea" => "Cambria",
+        _ => name,
+    }
+}
+
+/// A font as `<font>` (cell formats) or `<rPr>` (rich text runs).
+pub fn font_xml(o: &mut String, f: &Font, tag: &str) {
+    let _ = write!(o, "<{tag}>");
+    if f.bold {
+        o.push_str("<b/>");
+    }
+    if f.italic {
+        o.push_str("<i/>");
+    }
+    if f.strike {
+        o.push_str("<strike/>");
+    }
+    if f.outline {
+        o.push_str("<outline/>");
+    }
+    if f.shadow {
+        o.push_str("<shadow/>");
+    }
+    match f.underline {
+        Some("single") => o.push_str("<u/>"),
+        Some(u) => {
+            let _ = write!(o, "<u val=\"{u}\"/>");
+        }
+        None => {}
+    }
+    if let Some(v) = f.vert_align {
+        let _ = write!(o, "<vertAlign val=\"{v}\"/>");
+    }
+    let _ = write!(o, "<sz val=\"{}\"/>", numtext::xml(f.size_pt()));
+    if let Some(c) = f.color {
+        let _ = write!(o, "<color rgb=\"{}\"/>", argb(c));
+    }
+    let name_tag = if tag == "rPr" { "rFont" } else { "name" };
+    let _ = write!(o, "<{name_tag} val=\"");
+    esc_into(o, ms_font_name(&f.name));
+    o.push_str("\"/>");
+    if (1..=5).contains(&f.family) {
+        let _ = write!(o, "<family val=\"{}\"/>", f.family);
+    }
+    if let Some(cs) = f.charset {
+        let _ = write!(o, "<charset val=\"{cs}\"/>");
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+fn fill_xml(o: &mut String, f: &Fill, dxf: bool) {
+    if f.pattern == "none" {
+        o.push_str("<fill><patternFill patternType=\"none\"/></fill>");
+        return;
+    }
+    o.push_str("<fill><patternFill");
+    if !(dxf && f.pattern == "solid") {
+        let _ = write!(o, " patternType=\"{}\"", f.pattern);
+    }
+    o.push('>');
+    if dxf && f.pattern == "solid" {
+        // In a differential format a solid fill's colour is its background.
+        if let Some(c) = f.fg.or(f.bg) {
+            let _ = write!(o, "<bgColor rgb=\"{}\"/>", argb(c));
+        }
+    } else {
+        if let Some(c) = f.fg {
+            let _ = write!(o, "<fgColor rgb=\"{}\"/>", argb(c));
+        }
+        if let Some(c) = f.bg {
+            let _ = write!(o, "<bgColor rgb=\"{}\"/>", argb(c));
+        }
+    }
+    o.push_str("</patternFill></fill>");
+}
+
+fn edge_xml(o: &mut String, tag: &str, e: &Edge) {
+    match e.style {
+        None => {
+            let _ = write!(o, "<{tag}/>");
+        }
+        Some(st) => match e.color {
+            Some(c) => {
+                let _ = write!(
+                    o,
+                    "<{tag} style=\"{st}\"><color rgb=\"{}\"/></{tag}>",
+                    argb(c)
+                );
+            }
+            None => {
+                let _ = write!(o, "<{tag} style=\"{st}\"><color auto=\"1\"/></{tag}>");
+            }
+        },
+    }
+}
+
+fn border_xml(o: &mut String, b: &Border) {
+    o.push_str("<border");
+    if b.diag_up {
+        o.push_str(" diagonalUp=\"1\"");
+    }
+    if b.diag_down {
+        o.push_str(" diagonalDown=\"1\"");
+    }
+    o.push('>');
+    edge_xml(o, "left", &b.left);
+    edge_xml(o, "right", &b.right);
+    edge_xml(o, "top", &b.top);
+    edge_xml(o, "bottom", &b.bottom);
+    edge_xml(o, "diagonal", &b.diagonal);
+    o.push_str("</border>");
+}
+
+fn align_xml(a: &Align) -> String {
+    let mut s = String::new();
+    if let Some(h) = a.horizontal {
+        let _ = write!(s, " horizontal=\"{h}\"");
+    }
+    if let Some(v) = a.vertical {
+        let _ = write!(s, " vertical=\"{v}\"");
+    }
+    if a.wrap {
+        s.push_str(" wrapText=\"1\"");
+    }
+    if a.indent > 0 {
+        let _ = write!(s, " indent=\"{}\"", a.indent);
+    }
+    if a.rotation > 0 {
+        let _ = write!(s, " textRotation=\"{}\"", a.rotation);
+    }
+    if a.shrink {
+        s.push_str(" shrinkToFit=\"1\"");
+    }
+    if a.reading_order > 0 {
+        let _ = write!(s, " readingOrder=\"{}\"", a.reading_order);
+    }
+    if s.is_empty() {
+        s
+    } else {
+        format!("<alignment{s}/>")
+    }
+}
+
+/// Format codes Excel numbers itself, written by their id.
+const BUILTIN_IDS: &[(&str, u32)] = &[
+    ("General", 0),
+    ("0", 1),
+    ("0.00", 2),
+    ("#,##0", 3),
+    ("#,##0.00", 4),
+    ("0%", 9),
+    ("0.00%", 10),
+    ("0.00E+00", 11),
+    ("# ?/?", 12),
+    ("# ??/??", 13),
+    ("@", 49),
+];
+
+struct Formats {
+    custom: Vec<(u32, String)>,
+    map: HashMap<String, u32>,
+}
+
+impl Formats {
+    fn id(&mut self, code: &str) -> u32 {
+        if let Some(&(_, id)) = BUILTIN_IDS.iter().find(|(c, _)| *c == code) {
+            return id;
+        }
+        if let Some(&id) = self.map.get(code) {
+            return id;
+        }
+        let id = 164 + self.custom.len() as u32;
+        self.map.insert(code.to_string(), id);
+        self.custom.push((id, code.to_string()));
+        id
+    }
+}
+
+fn dxf_xml(o: &mut String, d: &Dxf, fmts: &mut Formats) {
+    o.push_str("<dxf>");
+    if d.font_color.is_some()
+        || d.bold.is_some()
+        || d.italic.is_some()
+        || d.underline.is_some()
+        || d.strike.is_some()
+    {
+        o.push_str("<font>");
+        if let Some(b) = d.bold {
+            o.push_str(if b { "<b/>" } else { "<b val=\"0\"/>" });
+        }
+        if let Some(i) = d.italic {
+            o.push_str(if i { "<i/>" } else { "<i val=\"0\"/>" });
+        }
+        if let Some(st) = d.strike {
+            o.push_str(if st {
+                "<strike/>"
+            } else {
+                "<strike val=\"0\"/>"
+            });
+        }
+        if let Some(u) = d.underline {
+            let _ = write!(o, "<u val=\"{u}\"/>");
+        }
+        if let Some(c) = d.font_color {
+            let _ = write!(o, "<color rgb=\"{}\"/>", argb(c));
+        }
+        o.push_str("</font>");
+    }
+    if let Some(n) = &d.numfmt {
+        let id = fmts.id(n);
+        let _ = write!(o, "<numFmt numFmtId=\"{id}\" formatCode=\"{}\"/>", esc(n));
+    }
+    if let Some(f) = &d.fill {
+        fill_xml(o, f, true);
+    }
+    if let Some(b) = &d.border {
+        border_xml(o, b);
+    }
+    o.push_str("</dxf>");
+}
+
+pub fn styles_xml(styles: &Styles, dxfs: &[Dxf]) -> String {
+    let mut fonts = Interner::new();
+    let mut fills = Interner::new();
+    fills.get(&Fill::NONE);
+    fills.get(&Fill {
+        pattern: "gray125",
+        fg: None,
+        bg: None,
+    });
+    let mut borders = Interner::new();
+    borders.get(&Border::default());
+    let mut fmts = Formats {
+        custom: vec![],
+        map: HashMap::new(),
+    };
+    let mut xfs = String::new();
+    fonts.get(&styles.list[0].font);
+    for st in &styles.list {
+        let f = fonts.get(&st.font);
+        let fi = fills.get(&st.fill);
+        let b = borders.get(&st.border);
+        let n = fmts.id(&st.numfmt);
+        let al = align_xml(&st.align);
+        let prot = if !st.locked || st.hidden {
+            format!(
+                "<protection locked=\"{}\" hidden=\"{}\"/>",
+                u8::from(st.locked),
+                u8::from(st.hidden)
+            )
+        } else {
+            String::new()
+        };
+        let _ = write!(
+            xfs,
+            "<xf numFmtId=\"{n}\" fontId=\"{f}\" fillId=\"{fi}\" borderId=\"{b}\" xfId=\"0\" applyNumberFormat=\"1\" applyFont=\"1\" applyFill=\"1\" applyBorder=\"1\" applyAlignment=\"1\" applyProtection=\"1\""
+        );
+        if al.is_empty() && prot.is_empty() {
+            xfs.push_str("/>");
+        } else {
+            let _ = write!(xfs, ">{al}{prot}</xf>");
+        }
+    }
+    let mut dx = String::new();
+    for d in dxfs {
+        dxf_xml(&mut dx, d, &mut fmts);
+    }
+    let mut s = String::from(concat!(
+        r#"<?xml version="1.0" encoding="UTF-8" standalone="yes"?>"#,
+        "\n",
+        r#"<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">"#
+    ));
+    if !fmts.custom.is_empty() {
+        let _ = write!(s, "<numFmts count=\"{}\">", fmts.custom.len());
+        for (id, code) in &fmts.custom {
+            let _ = write!(
+                s,
+                "<numFmt numFmtId=\"{id}\" formatCode=\"{}\"/>",
+                esc(code)
+            );
+        }
+        s.push_str("</numFmts>");
+    }
+    let _ = write!(s, "<fonts count=\"{}\">", fonts.list.len());
+    for f in &fonts.list {
+        font_xml(&mut s, f, "font");
+    }
+    s.push_str("</fonts>");
+    let _ = write!(s, "<fills count=\"{}\">", fills.list.len());
+    for f in &fills.list {
+        fill_xml(&mut s, f, false);
+    }
+    s.push_str("</fills>");
+    let _ = write!(s, "<borders count=\"{}\">", borders.list.len());
+    for b in &borders.list {
+        border_xml(&mut s, b);
+    }
+    s.push_str("</borders>");
+    s.push_str("<cellStyleXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/></cellStyleXfs>");
+    let _ = write!(
+        s,
+        "<cellXfs count=\"{}\">{xfs}</cellXfs>",
+        styles.list.len()
+    );
+    s.push_str("<cellStyles count=\"1\"><cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/></cellStyles>");
+    let _ = write!(s, "<dxfs count=\"{}\">{dx}</dxfs>", dxfs.len());
+    s.push_str("</styleSheet>");
+    s
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xlsx/xml.rs b/crates/exav-render/src/formats/office/sheets/xlsx/xml.rs
new file mode 100644
index 00000000..ef124529
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xlsx/xml.rs
@@ -0,0 +1,72 @@
+//! XML text helpers.
+
+use crate::formats::office::sheets::model::Rgb;
+use std::fmt::Write as _;
+
+/// Appends `s` escaped for XML text or an attribute value. Characters XML
+/// 1.0 cannot hold are written as SpreadsheetML's `_xHHHH_` escapes, and a
+/// literal `_xHHHH_` has its underscore escaped so that it reads back as
+/// written. Lone surrogates cannot occur in a `str`.
+pub fn esc_into(o: &mut String, s: &str) {
+    let b = s.as_bytes();
+    let mut start = 0;
+    for (at, c) in s.char_indices() {
+        let rep: Option<&str> = match c {
+            '&' => Some("&amp;"),
+            '<' => Some("&lt;"),
+            '>' => Some("&gt;"),
+            '"' => Some("&quot;"),
+            '\t' | '\n' | '\r' => None,
+            '_' if b.len() >= at + 7
+                && b[at + 1] == b'x'
+                && b[at + 2..at + 6].iter().all(u8::is_ascii_hexdigit)
+                && b[at + 6] == b'_' =>
+            {
+                Some("_x005F_")
+            }
+            c if (c as u32) < 0x20 || c == '\u{FFFE}' || c == '\u{FFFF}' => {
+                o.push_str(&s[start..at]);
+                let _ = write!(o, "_x{:04X}_", c as u32);
+                start = at + c.len_utf8();
+                continue;
+            }
+            _ => None,
+        };
+        if let Some(r) = rep {
+            o.push_str(&s[start..at]);
+            o.push_str(r);
+            start = at + c.len_utf8();
+        }
+    }
+    o.push_str(&s[start..]);
+}
+
+pub fn esc(s: &str) -> String {
+    let mut o = String::with_capacity(s.len());
+    esc_into(&mut o, s);
+    o
+}
+
+/// ARGB as SpreadsheetML writes it.
+pub fn argb(c: Rgb) -> String {
+    format!("FF{:06X}", c & 0xFF_FFFF)
+}
+
+/// RGB as DrawingML writes it.
+pub fn rgb(c: Rgb) -> String {
+    format!("{:06X}", c & 0xFF_FFFF)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::esc;
+
+    #[test]
+    fn escapes() {
+        assert_eq!(esc("a<b & \"c\""), "a&lt;b &amp; &quot;c&quot;");
+        assert_eq!(esc("x\u{1}y"), "x_x0001_y");
+        assert_eq!(esc("_x0041_"), "_x005F_x0041_");
+        assert_eq!(esc("tab\tok_x"), "tab\tok_x");
+        assert_eq!(esc("été"), "été");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/sheets/xmlss.rs b/crates/exav-render/src/formats/office/sheets/xmlss.rs
new file mode 100644
index 00000000..255aa982
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xmlss.rs
@@ -0,0 +1,872 @@
+//! Excel 2002 and 2003 XML Spreadsheet ("SpreadsheetML", namespace
+//! `urn:schemas-microsoft-com:office:spreadsheet`), after Microsoft's XML
+//! Spreadsheet Reference (Office XP, 2001): worksheets, their tables,
+//! columns, rows and cells (`ss:Index` gaps, `ss:Span`), typed values and
+//! rich text, R1C1 formulas, styles and their parents, merges, sizes,
+//! names, links, comments, filters and the Excel worksheet options.
+
+use crate::formats::office::common::xml::{self as dom, Node};
+use crate::formats::office::sheets::css;
+use crate::formats::office::sheets::error::{Error, Result};
+use crate::formats::office::sheets::limits::Budget;
+use crate::formats::office::sheets::model::*;
+use crate::formats::office::sheets::r1c1;
+use std::collections::HashMap;
+
+const MAX_CHAIN: usize = 32;
+
+/// An attribute in the SpreadsheetML namespace, or without one: other
+/// writers than Excel leave the prefix out.
+fn attr<'a>(n: &'a Node, name: &str) -> Option<&'a str> {
+    n.attrs
+        .iter()
+        .find(|(k, _)| {
+            k.strip_prefix("ss:")
+                .or_else(|| k.strip_prefix("x:"))
+                .unwrap_or(k)
+                == name
+        })
+        .map(|(_, v)| v.as_str())
+}
+
+fn flag(n: &Node, name: &str) -> Option<bool> {
+    attr(n, name).map(|v| matches!(v.trim(), "1" | "true" | "True" | "TRUE"))
+}
+
+fn num(n: &Node, name: &str) -> Option<f64> {
+    attr(n, name)
+        .and_then(|v| v.trim().parse::<f64>().ok())
+        .filter(|v| v.is_finite())
+}
+
+/// A 1-based index attribute as 0-based, within `max`.
+fn index(n: &Node, name: &str, max: u32) -> Option<u32> {
+    attr(n, name)
+        .and_then(|v| v.trim().parse::<u64>().ok())
+        .filter(|&v| v >= 1 && v - 1 <= u64::from(max))
+        .map(|v| (v - 1) as u32)
+}
+
+fn count(n: &Node, name: &str) -> u32 {
+    attr(n, name)
+        .and_then(|v| v.trim().parse::<u32>().ok())
+        .unwrap_or(0)
+}
+
+/// An element, by its local name, in the SpreadsheetML or Excel
+/// namespace or none.
+fn is(n: &Node, local: &str) -> bool {
+    n.name
+        .strip_prefix("ss:")
+        .or_else(|| n.name.strip_prefix("x:"))
+        .unwrap_or(&n.name)
+        == local
+}
+
+fn children<'a>(n: &'a Node, local: &'a str) -> impl Iterator<Item = &'a Node> + 'a {
+    n.nodes().filter(move |c| is(c, local))
+}
+
+fn child<'a>(n: &'a Node, local: &str) -> Option<&'a Node> {
+    n.nodes().find(|c| is(c, local))
+}
+
+/// The named number formats of the reference ("the same as the HTML
+/// number formats").
+pub(crate) fn named_format(f: &str) -> Option<&'static str> {
+    Some(match f.trim().to_ascii_lowercase().as_str() {
+        "general" | "general number" => "General",
+        "general date" => "m/d/yyyy h:mm",
+        "long date" => "dddd, mmmm dd, yyyy",
+        "medium date" => "dd-mmm-yy",
+        "short date" => "m/d/yyyy",
+        "long time" => "h:mm:ss AM/PM",
+        "medium time" => "h:mm AM/PM",
+        "short time" => "h:mm",
+        "currency" => "\"$\"#,##0.00_);[Red]\\(\"$\"#,##0.00\\)",
+        "euro currency" => "[$€-2]\\ #,##0.00_);[Red]\\([$€-2]\\ #,##0.00\\)",
+        "fixed" => "0.00",
+        "standard" => "#,##0.00",
+        "percent" => "0.00%",
+        "scientific" => "0.00E+00",
+        "yes/no" => "\"Yes\";\"Yes\";\"No\"",
+        "true/false" => "\"True\";\"True\";\"False\"",
+        "on/off" => "\"On\";\"On\";\"Off\"",
+        _ => return None,
+    })
+}
+
+/// `ss:LineStyle` and `ss:Weight` (0 hairline, 1 thin, 2 medium, 3 thick)
+/// as an XLSX border style.
+fn line(style: &str, weight: f64) -> Option<&'static str> {
+    let w = weight.round() as i64;
+    Some(match style {
+        "Continuous" => match w {
+            i64::MIN..=0 => "hair",
+            1 => "thin",
+            2 => "medium",
+            _ => "thick",
+        },
+        "Dash" if w >= 2 => "mediumDashed",
+        "Dash" => "dashed",
+        "Dot" => "dotted",
+        "DashDot" if w >= 2 => "mediumDashDot",
+        "DashDot" => "dashDot",
+        "DashDotDot" if w >= 2 => "mediumDashDotDot",
+        "DashDotDot" => "dashDotDot",
+        "SlantDashDot" => "slantDashDot",
+        "Double" => "double",
+        _ => return None,
+    })
+}
+
+fn rgb(s: Option<&str>) -> Option<Option<Rgb>> {
+    css::color(s?)
+}
+
+/// `ss:Pattern` as an XLSX patternType.
+fn pattern(p: &str) -> Option<&'static str> {
+    Some(match p {
+        "Solid" => "solid",
+        "Gray75" => "darkGray",
+        "Gray50" => "mediumGray",
+        "Gray25" => "lightGray",
+        "Gray125" => "gray125",
+        "Gray0625" => "gray0625",
+        "HorzStripe" => "darkHorizontal",
+        "VertStripe" => "darkVertical",
+        "ReverseDiagStripe" => "darkUp",
+        "DiagStripe" => "darkDown",
+        "DiagCross" => "darkGrid",
+        "ThickDiagCross" => "darkTrellis",
+        "ThinHorzStripe" => "lightHorizontal",
+        "ThinVertStripe" => "lightVertical",
+        "ThinReverseDiagStripe" => "lightUp",
+        "ThinDiagStripe" => "lightDown",
+        "ThinHorzCross" => "lightGrid",
+        "ThinDiagCross" => "lightTrellis",
+        _ => return None,
+    })
+}
+
+/// A style's properties applied over `st`: each attribute given overrides.
+fn apply(st: &mut Style, s: &Node) {
+    for p in s.nodes() {
+        let name = p.name.strip_prefix("ss:").unwrap_or(&p.name);
+        match name {
+            "Alignment" => {
+                if let Some(h) = attr(p, "Horizontal") {
+                    st.align.horizontal = match h {
+                        "Left" => Some("left"),
+                        "Center" => Some("center"),
+                        "Right" => Some("right"),
+                        "Fill" => Some("fill"),
+                        "Justify" => Some("justify"),
+                        "CenterAcrossSelection" => Some("centerContinuous"),
+                        "Distributed" | "JustifyDistributed" => Some("distributed"),
+                        _ => None,
+                    };
+                }
+                if let Some(v) = attr(p, "Vertical") {
+                    st.align.vertical = match v {
+                        "Top" => Some("top"),
+                        "Center" => Some("center"),
+                        "Justify" => Some("justify"),
+                        "Distributed" | "JustifyDistributed" => Some("distributed"),
+                        _ => None,
+                    };
+                }
+                if let Some(w) = flag(p, "WrapText") {
+                    st.align.wrap = w;
+                }
+                if let Some(s) = flag(p, "ShrinkToFit") {
+                    st.align.shrink = s;
+                }
+                if let Some(i) = num(p, "Indent") {
+                    st.align.indent = i.clamp(0.0, 250.0) as u8;
+                }
+                if let Some(r) = num(p, "Rotate") {
+                    let r = r.round().clamp(-90.0, 90.0) as i32;
+                    st.align.rotation = if r < 0 { (90 - r) as u8 } else { r as u8 };
+                }
+                if flag(p, "VerticalText") == Some(true) {
+                    st.align.rotation = 255;
+                }
+                if let Some(o) = attr(p, "ReadingOrder") {
+                    st.align.reading_order = match o {
+                        "LeftToRight" => 1,
+                        "RightToLeft" => 2,
+                        _ => 0,
+                    };
+                }
+            }
+            "Borders" => {
+                for b in children(p, "Border") {
+                    let style = line(
+                        attr(b, "LineStyle").unwrap_or("None"),
+                        num(b, "Weight").unwrap_or(0.0),
+                    );
+                    let edge = Edge {
+                        style,
+                        color: style
+                            .and(rgb(attr(b, "Color")).flatten())
+                            .filter(|&c| c != 0),
+                    };
+                    match attr(b, "Position") {
+                        Some("Left") => st.border.left = edge,
+                        Some("Right") => st.border.right = edge,
+                        Some("Top") => st.border.top = edge,
+                        Some("Bottom") => st.border.bottom = edge,
+                        Some("DiagonalLeft") => {
+                            st.border.diag_down = edge.style.is_some();
+                            st.border.diagonal = edge;
+                        }
+                        Some("DiagonalRight") => {
+                            st.border.diag_up = edge.style.is_some();
+                            st.border.diagonal = edge;
+                        }
+                        _ => {}
+                    }
+                }
+            }
+            "Font" => {
+                let f = &mut st.font;
+                if let Some(n) = attr(p, "FontName").filter(|n| !n.trim().is_empty()) {
+                    f.name = n.trim().chars().take(64).collect();
+                }
+                if let Some(s) = num(p, "Size").filter(|s| *s > 0.0) {
+                    f.size_centipt = (s * 100.0).round().clamp(100.0, 40_000.0) as u32;
+                }
+                if let Some(b) = flag(p, "Bold") {
+                    f.bold = b;
+                }
+                if let Some(i) = flag(p, "Italic") {
+                    f.italic = i;
+                }
+                if let Some(s) = flag(p, "StrikeThrough") {
+                    f.strike = s;
+                }
+                if let Some(o) = flag(p, "Outline") {
+                    f.outline = o;
+                }
+                if let Some(s) = flag(p, "Shadow") {
+                    f.shadow = s;
+                }
+                if let Some(u) = attr(p, "Underline") {
+                    f.underline = match u {
+                        "Single" => Some("single"),
+                        "Double" => Some("double"),
+                        "SingleAccounting" => Some("singleAccounting"),
+                        "DoubleAccounting" => Some("doubleAccounting"),
+                        _ => None,
+                    };
+                }
+                if let Some(v) = attr(p, "VerticalAlign") {
+                    f.vert_align = match v {
+                        "Superscript" => Some("superscript"),
+                        "Subscript" => Some("subscript"),
+                        _ => None,
+                    };
+                }
+                if let Some(c) = rgb(attr(p, "Color")) {
+                    f.color = c.filter(|&c| c != 0);
+                }
+            }
+            "Interior" => {
+                let color = rgb(attr(p, "Color")).flatten();
+                let kind = attr(p, "Pattern").map(pattern);
+                match kind {
+                    Some(Some("solid")) => st.fill = color.map_or(Fill::NONE, Fill::solid),
+                    Some(Some(k)) => {
+                        st.fill = Fill {
+                            pattern: k,
+                            fg: rgb(attr(p, "PatternColor")).flatten().or(Some(0)),
+                            bg: color,
+                        };
+                    }
+                    Some(None) => st.fill = Fill::NONE,
+                    // A colour without a pattern: Excel reads a solid fill.
+                    None if let Some(c) = color => st.fill = Fill::solid(c),
+                    None => {}
+                }
+            }
+            "NumberFormat" => {
+                if let Some(f) = attr(p, "Format") {
+                    st.numfmt = named_format(f)
+                        .map_or_else(|| f.chars().take(255).collect(), str::to_string);
+                }
+            }
+            "Protection" => {
+                if let Some(l) = flag(p, "Protected") {
+                    st.locked = l;
+                }
+                if let Some(h) = flag(p, "HideFormula") {
+                    st.hidden = h;
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+/// The workbook's styles, resolved through their parents (`Default` when
+/// none is named).
+fn styles(root: &Node, base: &Style) -> HashMap<String, Style> {
+    let defs: HashMap<&str, &Node> = child(root, "Styles")
+        .into_iter()
+        .flat_map(|s| children(s, "Style"))
+        .filter_map(|s| Some((attr(s, "ID")?, s)))
+        .take(1 << 16)
+        .collect();
+    let mut out: HashMap<String, Style> = HashMap::new();
+    for &id in defs.keys() {
+        // The chain from the style up, then applied from the top down.
+        let mut chain = vec![];
+        let mut cur = Some(id);
+        while let Some(c) = cur {
+            let Some(n) = defs.get(c) else { break };
+            if chain.len() >= MAX_CHAIN || chain.contains(&c) {
+                break;
+            }
+            chain.push(c);
+            cur = attr(n, "Parent").or((c != "Default").then_some("Default"));
+        }
+        let mut st = base.clone();
+        for c in chain.iter().rev() {
+            apply(&mut st, defs[c]);
+        }
+        out.insert(id.to_string(), st);
+    }
+    out
+}
+
+/// An xsd:dateTime as a 1900 date system serial: Excel's times sit on
+/// 1899-12-31, day 0, and its serials count a 29 February 1900.
+fn serial(s: &str) -> Option<f64> {
+    let v = crate::formats::office::sheets::ods::parse_date(s.trim(), (1899, 12, 30))?;
+    Some(if v < 61.0 { v - 1.0 } else { v })
+}
+
+/// A cell's rich text: the HTML formatting tags Excel writes in `ss:Data`.
+fn rich(data: &Node, base: &Font) -> Option<Value> {
+    data.nodes().next()?;
+    fn walk(n: &Node, font: &Font, out: &mut Vec<Run>, depth: u32) {
+        for c in &n.children {
+            match c {
+                dom::Child::Text(t) => {
+                    // The indentation of a pretty-printed document between
+                    // the tags is not text.
+                    let lead = t.len() - t.trim_start().len();
+                    let t = if t[..lead].contains('\n') {
+                        &t[lead..]
+                    } else {
+                        t.as_str()
+                    };
+                    let end = t.trim_end().len();
+                    let t = if t[end..].contains('\n') {
+                        &t[..end]
+                    } else {
+                        t
+                    };
+                    if t.is_empty() {
+                        continue;
+                    }
+                    match out.last_mut() {
+                        Some(last) if last.font.as_ref() == Some(font) => last.text.push_str(t),
+                        _ => out.push(Run {
+                            text: t.to_string(),
+                            font: Some(font.clone()),
+                        }),
+                    }
+                }
+                dom::Child::Node(x) if depth < 32 => {
+                    let mut f = font.clone();
+                    match x.name.rsplit(':').next().unwrap_or("") {
+                        "B" => f.bold = true,
+                        "I" => f.italic = true,
+                        "U" => {
+                            f.underline =
+                                Some(if attr(x, "Style").is_some_and(|s| s.contains("double")) {
+                                    "double"
+                                } else {
+                                    "single"
+                                })
+                        }
+                        "S" => f.strike = true,
+                        "Sub" => f.vert_align = Some("subscript"),
+                        "Sup" => f.vert_align = Some("superscript"),
+                        "Font" => {
+                            for (k, v) in &x.attrs {
+                                match k.rsplit(':').next().unwrap_or("") {
+                                    "Color" => {
+                                        if let Some(c) = css::color(v) {
+                                            f.color = c.filter(|&c| c != 0);
+                                        }
+                                    }
+                                    "Face" => f.name = v.chars().take(64).collect(),
+                                    "Size" => {
+                                        if let Ok(s) = v.trim().parse::<f64>()
+                                            && s.is_finite()
+                                            && s > 0.0
+                                        {
+                                            f.size_centipt =
+                                                (s * 100.0).round().clamp(100.0, 40_000.0) as u32;
+                                        }
+                                    }
+                                    _ => {}
+                                }
+                            }
+                        }
+                        _ => {}
+                    }
+                    walk(x, &f, out, depth + 1);
+                }
+                dom::Child::Node(_) => {}
+            }
+            if out.len() > 4096 {
+                return;
+            }
+        }
+    }
+    let mut out = vec![];
+    walk(data, base, &mut out, 0);
+    out.retain(|r| !r.text.is_empty());
+    Some(if out.len() <= 1 {
+        Value::text(out.into_iter().map(|r| r.text).collect::<String>())
+    } else {
+        Value::Rich(out.into())
+    })
+}
+
+/// Text of a node and its descendants.
+fn text(n: &Node) -> String {
+    fn all(n: &Node, out: &mut String, depth: u32) {
+        for c in &n.children {
+            match c {
+                dom::Child::Text(t) => out.push_str(t),
+                dom::Child::Node(x) if depth < 32 => all(x, out, depth + 1),
+                dom::Child::Node(_) => {}
+            }
+            if out.len() > 1 << 20 {
+                return;
+            }
+        }
+    }
+    let mut s = String::new();
+    all(n, &mut s, 0);
+    s
+}
+
+/// A width in points, at 96 dpi, as the XLSX width of a column whose font
+/// has digits `digit` pixels wide (ECMA-376 part 1, 18.3.1.13): the
+/// characters Excel shows, 5 pixels of padding off and to the hundredth,
+/// then the stored width, padding back in and to 1/256.
+pub(crate) fn width_chars(pt: f64, digit: f64) -> f64 {
+    let px = (pt * 96.0 / 72.0).round();
+    if px <= 0.0 {
+        return 0.0;
+    }
+    let chars = (((px - 5.0) / digit * 100.0 + 0.5).trunc() / 100.0).max(0.0);
+    (((chars * digit + 5.0) / digit * 256.0).trunc() / 256.0).clamp(0.0, 255.0)
+}
+
+/// An R1C1 range (`R1C1:R10C3`, `R2`, `C1:C3`) as a range, relative to A1.
+fn range_r1c1(s: &str) -> Option<Range> {
+    let a1 = r1c1::to_a1(s, (0, 0))?;
+    let a1 = a1.rsplit('!').next()?.replace('$', "");
+    let (a, b) = a1.split_once(':').unwrap_or((&a1, &a1));
+    let (r1, c1) = parse_cell(a)?;
+    let (r2, c2) = parse_cell(b)?;
+    Some(Range {
+        r1: r1.min(r2),
+        c1: c1.min(c2),
+        r2: r1.max(r2),
+        c2: c1.max(c2),
+    })
+}
+
+pub(crate) fn read(bytes: &[u8], budget: &mut Budget) -> Result<Workbook> {
+    let xml = crate::formats::office::sheets::textenc::xml_utf8(bytes);
+    let root = dom::parse(&xml, &mut budget.tree())?;
+    if root.name != "ss:Workbook" {
+        return Err(Error::NotFormat(format!(
+            "not an XML Spreadsheet: {}",
+            root.name
+        )));
+    }
+    let base = Style {
+        font: Font {
+            name: "Arial".into(),
+            size_centipt: 1000,
+            ..Font::default()
+        },
+        ..Style::default()
+    };
+    let styles = styles(&root, &base);
+    let default = styles.get("Default").cloned().unwrap_or(base);
+    let digit = (crate::formats::office::sheets::fonts::digit_twips(
+        &default.font.name,
+        default.font.size_pt(),
+    ) / 15.0)
+        .round()
+        .max(1.0);
+    let mut wb = Workbook::new(default.clone());
+    let mut ids: HashMap<String, u32> = HashMap::new();
+    let mut style_id = |wb: &mut Workbook, id: Option<&str>| -> Option<u32> {
+        let id = id?;
+        if let Some(&s) = ids.get(id) {
+            return Some(s);
+        }
+        let s = wb.styles.add(styles.get(id)?.clone());
+        ids.insert(id.to_string(), s);
+        Some(s)
+    };
+
+    let sheets: Vec<&Node> = children(&root, "Worksheet").collect();
+    if sheets.is_empty() {
+        return Err(Error::Unsupported(
+            "an XML Spreadsheet without worksheets".into(),
+        ));
+    }
+    if sheets.len() > budget.limits.max_sheets as usize {
+        return Err(Error::TooLarge("sheets"));
+    }
+    let names = crate::formats::office::sheets::xlsx::sheet_names(
+        sheets
+            .iter()
+            .enumerate()
+            .map(|(i, s)| attr(s, "Name").unwrap_or(if i == 0 { "Sheet1" } else { "Sheet" })),
+    );
+    let mut bad_formulas = 0usize;
+    let mut skipped: Vec<&str> = vec![];
+    for (k, ws) in sheets.iter().enumerate() {
+        let mut sheet = Sheet::new(names[k].clone());
+        if flag(ws, "RightToLeft") == Some(true) {
+            sheet.rtl = true;
+        }
+        if let Some(t) = child(ws, "Table") {
+            read_table(
+                t,
+                &mut sheet,
+                &mut wb,
+                &mut style_id,
+                digit,
+                budget,
+                &mut bad_formulas,
+            )?;
+        }
+        if let Some(o) = child(ws, "WorksheetOptions")
+            .filter(|o| o.name.starts_with("x:") || !o.name.contains(':'))
+        {
+            options(o, &mut sheet, &mut wb, k);
+        }
+        if let Some(f) = child(ws, "AutoFilter")
+            .and_then(|f| attr(f, "Range"))
+            .and_then(range_r1c1)
+        {
+            sheet.autofilter = Some(f);
+        }
+        for (what, el) in [
+            ("conditional formats", "ConditionalFormatting"),
+            ("validations", "DataValidation"),
+            ("pivot tables", "PivotTable"),
+        ] {
+            if child(ws, el).is_some() && !skipped.contains(&what) {
+                skipped.push(what);
+            }
+        }
+        wb.sheets.push(sheet);
+    }
+    // Names, the workbook's then each sheet's.
+    let scopes = std::iter::once((None, child(&root, "Names"))).chain(
+        sheets
+            .iter()
+            .enumerate()
+            .map(|(i, s)| (Some(i), child(s, "Names"))),
+    );
+    for (scope, names) in scopes {
+        for n in names
+            .into_iter()
+            .flat_map(|n| children(n, "NamedRange"))
+            .take(1 << 14)
+        {
+            let (Some(name), Some(refers)) = (attr(n, "Name"), attr(n, "RefersTo")) else {
+                continue;
+            };
+            let name = match name {
+                "_FilterDatabase" => continue,
+                "Print_Area" | "Print_Titles" | "Criteria" | "Extract" | "Consolidate_Area"
+                | "Sheet_Title" => format!("_xlnm.{name}"),
+                n => n.to_string(),
+            };
+            let Some(formula) = r1c1::to_a1(refers, (0, 0)) else {
+                continue;
+            };
+            // A print area or titles of a sheet name its cells with the sheet in
+            // XLSX; some writers leave the sheet out (`=R1`), which readers refuse.
+            let formula = match scope.and_then(|i| wb.sheets.get(i)) {
+                Some(sheet) if name.starts_with("_xlnm.") && !formula.contains('!') => {
+                    format!(
+                        "{}!{formula}",
+                        super::xls::formula::quote_sheet(&sheet.name)
+                    )
+                }
+                _ => formula,
+            };
+            wb.names.push(DefinedName {
+                name,
+                sheet: scope,
+                formula,
+                hidden: flag(n, "Hidden") == Some(true),
+            });
+        }
+    }
+    if bad_formulas > 0 {
+        wb.warn(format!(
+            "{bad_formulas} formulas could not be read and were left as their values"
+        ));
+    }
+    for s in skipped {
+        wb.warn(format!("{s} are not converted"));
+    }
+    Ok(wb)
+}
+
+fn read_table(
+    t: &Node,
+    sheet: &mut Sheet,
+    wb: &mut Workbook,
+    style_id: &mut impl FnMut(&mut Workbook, Option<&str>) -> Option<u32>,
+    digit: f64,
+    budget: &mut Budget,
+    bad_formulas: &mut usize,
+) -> Result<()> {
+    if let Some(w) = num(t, "DefaultColumnWidth").filter(|w| *w >= 0.0) {
+        sheet.default_col_width = Some(width_chars(w, digit));
+    }
+    if let Some(h) = num(t, "DefaultRowHeight").filter(|h| *h >= 0.0) {
+        sheet.default_row_height = h.min(409.0);
+    }
+    let table_style = style_id(wb, attr(t, "StyleID"));
+    // Columns.
+    let mut next = 0u32;
+    let mut col_styles: Vec<(u32, u32, u32)> = vec![];
+    for c in children(t, "Column").take(MAX_COL as usize + 1) {
+        let first = index(c, "Index", MAX_COL).unwrap_or(next);
+        let last = first.saturating_add(count(c, "Span")).min(MAX_COL);
+        next = last.saturating_add(1);
+        let style = style_id(wb, attr(c, "StyleID"));
+        let width = num(c, "Width")
+            .filter(|w| *w >= 0.0)
+            .map(|w| width_chars(w, digit));
+        let hidden = flag(c, "Hidden") == Some(true);
+        if width.is_some() || hidden || style.is_some() {
+            sheet.cols.push(ColInfo {
+                first,
+                last,
+                width,
+                hidden,
+                style,
+                outline: 0,
+            });
+        }
+        if let Some(s) = style {
+            col_styles.push((first, last, s));
+        }
+        if next > MAX_COL {
+            break;
+        }
+    }
+    // Rows and cells.
+    let mut r_next = 0u32;
+    for row in children(t, "Row") {
+        let Some(r) = index(row, "Index", MAX_ROW).or((r_next <= MAX_ROW).then_some(r_next)) else {
+            break;
+        };
+        let span = count(row, "Span");
+        r_next = r.saturating_add(span).saturating_add(1);
+        let row_style = style_id(wb, attr(row, "StyleID"));
+        let height = num(row, "Height")
+            .filter(|h| *h >= 0.0)
+            .map(|h| h.min(409.0));
+        let hidden = flag(row, "Hidden") == Some(true);
+        if height.is_some() || hidden || row_style.is_some() {
+            let last = r.saturating_add(span).min(MAX_ROW).min(r + 65_536);
+            budget.alloc(64 * u64::from(last - r + 1))?;
+            for rr in r..=last {
+                sheet.rows.insert(
+                    rr,
+                    RowInfo {
+                        height,
+                        custom_height: height.is_some(),
+                        hidden,
+                        style: row_style,
+                        outline: 0,
+                    },
+                );
+            }
+        }
+        let mut c_next = 0u32;
+        for cell in children(row, "Cell") {
+            let Some(c) = index(cell, "Index", MAX_COL).or((c_next <= MAX_COL).then_some(c_next))
+            else {
+                break;
+            };
+            let across = count(cell, "MergeAcross").min(MAX_COL - c);
+            let down = count(cell, "MergeDown").min(MAX_ROW - r);
+            c_next = c.saturating_add(across).saturating_add(1);
+            if across > 0 || down > 0 {
+                sheet.merges.push(Range {
+                    r1: r,
+                    c1: c,
+                    r2: r + down,
+                    c2: c + across,
+                });
+            }
+            let style = style_id(wb, attr(cell, "StyleID"))
+                .or(row_style)
+                .or_else(|| {
+                    col_styles
+                        .iter()
+                        .find(|s| s.0 <= c && c <= s.1)
+                        .map(|s| s.2)
+                })
+                .or(table_style)
+                .unwrap_or(0);
+            let font = wb.styles.get(style).font.clone();
+            let data = child(cell, "Data");
+            let value = match data {
+                Some(d) => match attr(d, "Type").unwrap_or("String") {
+                    "Number" => text(d)
+                        .trim()
+                        .parse::<f64>()
+                        .ok()
+                        .filter(|v| v.is_finite())
+                        .map_or(Value::Empty, Value::Number),
+                    "DateTime" => {
+                        serial(&text(d)).map_or_else(|| Value::text(text(d)), Value::Number)
+                    }
+                    "Boolean" => {
+                        Value::Bool(matches!(text(d).trim(), "1" | "TRUE" | "True" | "true"))
+                    }
+                    "Error" => CellError::parse(&text(d))
+                        .map_or(Value::Error(CellError::Value), Value::Error),
+                    _ => {
+                        let v = rich(d, &font).unwrap_or_else(|| Value::text(text(d)));
+                        match v {
+                            Value::Text(t) if t.is_empty() => Value::Empty,
+                            Value::Text(t) if flag(d, "Ticked") == Some(true) => {
+                                Value::text(format!("'{t}"))
+                            }
+                            v => v,
+                        }
+                    }
+                },
+                None => Value::Empty,
+            };
+            let mut formula = None;
+            if let Some(f) = attr(cell, "Formula") {
+                match r1c1::to_a1(f, (r, c)) {
+                    Some(a1) => formula = Some(a1.into_boxed_str()),
+                    None => *bad_formulas += 1,
+                }
+            }
+            if let (Some(a), true) = (attr(cell, "ArrayRange"), formula.is_some())
+                && let Some(a1) = r1c1::to_a1(a, (r, c))
+            {
+                let a1 = a1.replace('$', "");
+                let (x, y) = a1.split_once(':').unwrap_or((&a1, &a1));
+                if let (Some((r1, c1)), Some((r2, c2))) = (parse_cell(x), parse_cell(y)) {
+                    sheet.arrays.insert(
+                        (r, c),
+                        Range {
+                            r1: r1.min(r2),
+                            c1: c1.min(c2),
+                            r2: r1.max(r2),
+                            c2: c1.max(c2),
+                        },
+                    );
+                }
+            }
+            if let Some(href) = attr(cell, "HRef") {
+                let link = Hyperlink {
+                    range: Range::cell(r, c),
+                    url: (!href.starts_with('#') && safe_url(href)).then(|| href.to_string()),
+                    location: href.strip_prefix('#').map(str::to_string),
+                    tooltip: attr(cell, "HRefScreenTip").map(str::to_string),
+                    display: None,
+                };
+                if link.url.is_some() || link.location.is_some() {
+                    sheet.hyperlinks.push(link);
+                }
+            }
+            if let Some(note) = child(cell, "Comment") {
+                let body = child(note, "Data").map(text).unwrap_or_default();
+                sheet.comments.push(Comment {
+                    row: r,
+                    col: c,
+                    author: attr(note, "Author").unwrap_or("").to_string(),
+                    text: body.chars().take(32_767).collect(),
+                    visible: flag(note, "ShowAlways") == Some(true),
+                });
+            }
+            if matches!(value, Value::Empty) && formula.is_none() && style == 0 {
+                continue;
+            }
+            budget.cell(value.text_len() + formula.as_ref().map_or(0, |f| f.len()))?;
+            sheet.cells.insert(
+                (r, c),
+                Cell {
+                    value,
+                    formula,
+                    style,
+                },
+            );
+            if c_next > MAX_COL {
+                break;
+            }
+        }
+        if r_next > MAX_ROW {
+            break;
+        }
+    }
+    Ok(())
+}
+
+/// Excel's worksheet options: panes, grid lines, visibility, zoom.
+fn options(o: &Node, sheet: &mut Sheet, wb: &mut Workbook, k: usize) {
+    let int = |name: &str| child(o, name).and_then(|n| n.own_text().trim().parse::<u32>().ok());
+    if child(o, "FreezePanes").is_some() {
+        let rows = int("SplitHorizontal").unwrap_or(0).min(MAX_ROW);
+        let cols = int("SplitVertical").unwrap_or(0).min(MAX_COL);
+        if rows > 0 || cols > 0 {
+            sheet.freeze = Some((rows, cols));
+        }
+    }
+    if child(o, "DoNotDisplayGridlines").is_some() {
+        sheet.show_grid = false;
+    }
+    if child(o, "DoNotDisplayZeros").is_some() {
+        sheet.show_zeros = false;
+    }
+    if child(o, "DoNotDisplayHeadings").is_some() {
+        sheet.show_headers = false;
+    }
+    if child(o, "DisplayRightToLeft").is_some() {
+        sheet.rtl = true;
+    }
+    match child(o, "Visible").map(|v| v.own_text()) {
+        Some(v) if v.trim() == "SheetHidden" => sheet.state = SheetState::Hidden,
+        Some(v) if v.trim() == "SheetVeryHidden" => sheet.state = SheetState::VeryHidden,
+        _ => {}
+    }
+    if let Some(z) = int("Zoom").filter(|z| (10..=400).contains(z)) {
+        sheet.zoom = z;
+    }
+    if child(o, "Selected").is_some() {
+        wb.active = k;
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/exav-render/src/formats/office/sheets/xmlss/tests.rs b/crates/exav-render/src/formats/office/sheets/xmlss/tests.rs
new file mode 100644
index 00000000..49d1ba00
--- /dev/null
+++ b/crates/exav-render/src/formats/office/sheets/xmlss/tests.rs
@@ -0,0 +1,309 @@
+use super::*;
+use crate::formats::office::sheets::limits::Limits;
+
+fn book(styles: &str, sheets: &str) -> String {
+    format!(
+        r#"<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40">
+<Styles>{styles}</Styles>
+{sheets}
+</Workbook>"#
+    )
+}
+
+fn read_str(xml: &str) -> Workbook {
+    read(xml.as_bytes(), &mut Budget::new(Limits::default())).unwrap()
+}
+
+fn value(s: &Sheet, r: u32, c: u32) -> &Value {
+    s.cells.get(&(r, c)).map_or(&Value::Empty, |c| &c.value)
+}
+
+fn style<'a>(wb: &'a Workbook, s: &Sheet, r: u32, c: u32) -> &'a Style {
+    wb.styles.get(s.cells[&(r, c)].style)
+}
+
+const STYLES: &str = r##"
+<Style ss:ID="Default" ss:Name="Normal"><Alignment ss:Vertical="Bottom"/><Font ss:FontName="Calibri" ss:Size="11" ss:Color="#000000"/></Style>
+<Style ss:ID="bold"><Font ss:Bold="1"/><Borders><Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#FF0000"/><Border ss:Position="Left" ss:LineStyle="Dash" ss:Weight="1"/></Borders></Style>
+<Style ss:ID="pct" ss:Parent="bold"><Interior ss:Color="#FFFF00" ss:Pattern="Solid"/><NumberFormat ss:Format="Percent"/><Alignment ss:Horizontal="Center" ss:WrapText="1" ss:Rotate="-45"/></Style>
+<Style ss:ID="date"><NumberFormat ss:Format="yyyy\-mm\-dd"/></Style>
+<Style ss:ID="unbold" ss:Parent="pct"><Font ss:Bold="0" ss:Italic="1" ss:Underline="Double"/></Style>"##;
+
+fn sample() -> String {
+    book(
+        STYLES,
+        r##"<Worksheet ss:Name="Data">
+<Names><NamedRange ss:Name="Print_Area" ss:RefersTo="=Data!R1C1:R4C3"/></Names>
+<Table ss:DefaultColumnWidth="60" ss:DefaultRowHeight="15">
+ <Column ss:Width="48"/>
+ <Column ss:Index="3" ss:Width="96" ss:Span="1"/>
+ <Column ss:Hidden="1"/>
+ <Row ss:Height="30">
+  <Cell ss:StyleID="bold" ss:MergeAcross="1"><Data ss:Type="String">Head</Data></Cell>
+  <Cell><Data ss:Type="Number">2.5</Data></Cell>
+  <Cell ss:Index="5" ss:StyleID="pct"><Data ss:Type="Number">0.25</Data></Cell>
+ </Row>
+ <Row ss:Index="3">
+  <Cell ss:StyleID="date"><Data ss:Type="DateTime">2009-10-01T00:00:00.000</Data></Cell>
+  <Cell><Data ss:Type="DateTime">1899-12-31T12:00:00.000</Data></Cell>
+  <Cell><Data ss:Type="Boolean">1</Data></Cell>
+  <Cell ss:Formula="=1/0"><Data ss:Type="Error">#DIV/0!</Data></Cell>
+  <Cell ss:StyleID="unbold"><Data ss:Type="String" x:Ticked="1">007</Data></Cell>
+ </Row>
+ <Row>
+  <Cell ss:Formula="=SUM(R[-3]C[1]:R[-1]C[1])+RC[2]"><Data ss:Type="Number">2.5</Data></Cell>
+  <Cell ss:MergeDown="1" ss:HRef="https://example.com/" x:HRefScreenTip="tip"><Data ss:Type="String">link</Data><Comment ss:Author="Ann"><ss:Data>a <B>note</B></ss:Data></Comment></Cell>
+  <Cell><ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">plain <B>bold <I>both</I></B><Font html:Color="#FF0000">red</Font></ss:Data></Cell>
+ </Row>
+ <Row ss:Index="10" ss:Span="2" ss:Height="5" ss:Hidden="1"/>
+ <Row ss:Index="13"><Cell ss:ArrayRange="RC:R[1]C" ss:Formula="={1;2}"><Data ss:Type="Number">1</Data></Cell></Row>
+</Table>
+<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+ <FreezePanes/><FrozenNoSplit/><SplitHorizontal>1</SplitHorizontal><TopRowBottomPane>1</TopRowBottomPane>
+ <DoNotDisplayGridlines/><Zoom>85</Zoom>
+</WorksheetOptions>
+<AutoFilter x:Range="R1C1:R4C3" xmlns="urn:schemas-microsoft-com:office:excel"/>
+</Worksheet>
+<Worksheet ss:Name="Hidden">
+ <Table><Row><Cell><Data ss:Type="String">x</Data></Cell></Row></Table>
+ <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"><Visible>SheetHidden</Visible><Selected/></WorksheetOptions>
+</Worksheet>"##,
+    )
+}
+
+/// Some writers leave the sheet out of a print area or print titles
+/// (`=R1`); XLSX needs it (`'My data'!$1:$1`) and readers refuse the file
+/// without.
+#[test]
+fn a_print_area_without_its_sheet_is_given_it() {
+    let wb = read_str(&book(
+        "",
+        r#"<Worksheet ss:Name="My data"><Names>
+<NamedRange ss:Name="Print_Titles" ss:RefersTo="=R1"/>
+<NamedRange ss:Name="Print_Area" ss:RefersTo="='My data'!R1C1:R2C2"/>
+<NamedRange ss:Name="mine" ss:RefersTo="=R3C3"/>
+</Names><Table><Row><Cell><Data ss:Type="String">a</Data></Cell></Row></Table></Worksheet>"#,
+    ));
+    let names: Vec<(&str, &str)> = wb
+        .names
+        .iter()
+        .map(|n| (n.name.as_str(), n.formula.as_str()))
+        .collect();
+    assert_eq!(
+        names,
+        [
+            ("_xlnm.Print_Titles", "'My data'!$1:$1"),
+            ("_xlnm.Print_Area", "'My data'!$A$1:$B$2"),
+            ("mine", "$C$3"),
+        ]
+    );
+}
+
+#[test]
+fn cells_indexes_and_types() {
+    let wb = read_str(&sample());
+    let s = &wb.sheets[0];
+    assert_eq!(value(s, 0, 0), &Value::text("Head"));
+    // After a merge across two cells, the next cell is the third.
+    assert_eq!(value(s, 0, 2), &Value::Number(2.5));
+    assert_eq!(value(s, 0, 4), &Value::Number(0.25));
+    assert_eq!(value(s, 2, 0), &Value::Number(40087.0));
+    // A time alone sits on day 0.
+    assert_eq!(value(s, 2, 1), &Value::Number(0.5));
+    assert_eq!(value(s, 2, 2), &Value::Bool(true));
+    assert_eq!(value(s, 2, 3), &Value::Error(CellError::Div0));
+    assert_eq!(value(s, 2, 4), &Value::text("'007"));
+    assert_eq!(
+        s.merges,
+        [
+            Range {
+                r1: 0,
+                c1: 0,
+                r2: 0,
+                c2: 1
+            },
+            Range {
+                r1: 3,
+                c1: 1,
+                r2: 4,
+                c2: 1
+            }
+        ]
+    );
+    let Value::Rich(runs) = value(s, 3, 2) else {
+        panic!("{:?}", value(s, 3, 2))
+    };
+    let plain: Vec<(&str, bool, bool, Option<Rgb>)> = runs
+        .iter()
+        .map(|r| {
+            (
+                r.text.as_str(),
+                r.font.as_ref().unwrap().bold,
+                r.font.as_ref().unwrap().italic,
+                r.font.as_ref().unwrap().color,
+            )
+        })
+        .collect();
+    assert_eq!(
+        plain,
+        [
+            ("plain ", false, false, None),
+            ("bold ", true, false, None),
+            ("both", true, true, None),
+            ("red", false, false, Some(0xFF0000))
+        ]
+    );
+}
+
+#[test]
+fn formulas_names_links_notes() {
+    let wb = read_str(&sample());
+    let s = &wb.sheets[0];
+    let f = |r, c| s.cells[&(r, c)].formula.as_deref().map(str::to_string);
+    assert_eq!(f(3, 0).as_deref(), Some("SUM(B1:B3)+C4"));
+    assert_eq!(f(2, 3).as_deref(), Some("1/0"));
+    assert_eq!(f(12, 0).as_deref(), Some("{1;2}"));
+    assert_eq!(
+        s.arrays.get(&(12, 0)),
+        Some(&Range {
+            r1: 12,
+            c1: 0,
+            r2: 13,
+            c2: 0
+        })
+    );
+    assert_eq!(wb.names.len(), 1);
+    assert_eq!(
+        (
+            wb.names[0].name.as_str(),
+            wb.names[0].sheet,
+            wb.names[0].formula.as_str()
+        ),
+        ("_xlnm.Print_Area", Some(0), "Data!$A$1:$C$4")
+    );
+    assert_eq!(s.hyperlinks[0].url.as_deref(), Some("https://example.com/"));
+    assert_eq!(s.hyperlinks[0].tooltip.as_deref(), Some("tip"));
+    assert_eq!(
+        (s.comments[0].author.as_str(), s.comments[0].text.as_str()),
+        ("Ann", "a note")
+    );
+    assert_eq!(
+        s.autofilter,
+        Some(Range {
+            r1: 0,
+            c1: 0,
+            r2: 3,
+            c2: 2
+        })
+    );
+}
+
+#[test]
+fn styles_and_parents() {
+    let wb = read_str(&sample());
+    let s = &wb.sheets[0];
+    assert_eq!(wb.styles.get(0).font.name, "Calibri");
+    let bold = style(&wb, s, 0, 0);
+    assert!(bold.font.bold);
+    assert_eq!(
+        bold.border.bottom,
+        Edge {
+            style: Some("medium"),
+            color: Some(0xFF0000)
+        }
+    );
+    assert_eq!(bold.border.left.style, Some("dashed"));
+    let pct = style(&wb, s, 0, 4);
+    // Its parent's bold and borders, its own fill, format and alignment.
+    assert!(pct.font.bold && pct.border.bottom.style == Some("medium"));
+    assert_eq!(pct.fill, Fill::solid(0xFFFF00));
+    assert_eq!(pct.numfmt, "0.00%");
+    assert_eq!(
+        (pct.align.horizontal, pct.align.wrap, pct.align.rotation),
+        (Some("center"), true, 135)
+    );
+    let unbold = style(&wb, s, 2, 4);
+    assert!(!unbold.font.bold && unbold.font.italic && unbold.font.underline == Some("double"));
+    assert_eq!(unbold.fill, Fill::solid(0xFFFF00));
+    assert_eq!(style(&wb, s, 2, 0).numfmt, "yyyy\\-mm\\-dd");
+    // Unstyled cells take the default style.
+    assert_eq!(s.cells[&(0, 2)].style, 0);
+}
+
+#[test]
+fn sizes_and_options() {
+    let wb = read_str(&sample());
+    let s = &wb.sheets[0];
+    // 48pt is 64 pixels: 8.43 characters of a 7-pixel digit, stored with
+    // the padding as 9.140625, as Excel stores its default width.
+    assert_eq!(s.col_info(0).and_then(|c| c.width), Some(9.140625));
+    assert_eq!(s.col_info(1).and_then(|c| c.width), None);
+    assert_eq!(s.col_info(3).and_then(|c| c.width), Some(18.28125));
+    assert!(s.col_info(4).unwrap().hidden);
+    assert_eq!(s.default_col_width, Some(11.421875));
+    assert_eq!(s.default_row_height, 15.0);
+    assert_eq!(s.rows[&0].height, Some(30.0));
+    assert!((9..=11).all(|r| s.rows[&r].hidden));
+    assert!(!s.rows.contains_key(&12) || !s.rows[&12].hidden);
+    assert_eq!(s.freeze, Some((1, 0)));
+    assert!(!s.show_grid);
+    assert_eq!(s.zoom, 85);
+    assert_eq!(wb.sheets[1].state, SheetState::Hidden);
+    assert_eq!(wb.active, 1);
+}
+
+#[test]
+fn encodings() {
+    let xml = book(
+        "",
+        r#"<Worksheet ss:Name="Лист"><Table><Row><Cell><Data ss:Type="String">Привет</Data></Cell></Row></Table></Worksheet>"#,
+    );
+    let declared = xml.replacen(
+        "<?xml version=\"1.0\"?>",
+        "<?xml version=\"1.0\" encoding=\"windows-1251\"?>",
+        1,
+    );
+    let (cp, _, _) = encoding_rs::WINDOWS_1251.encode(&declared);
+    let wb = read(&cp, &mut Budget::new(Limits::default())).unwrap();
+    assert_eq!(wb.sheets[0].name, "Лист");
+    assert_eq!(value(&wb.sheets[0], 0, 0), &Value::text("Привет"));
+}
+
+#[test]
+fn refusals_and_limits() {
+    let b = || Budget::new(Limits::default());
+    assert!(matches!(
+        read(b"<html/>", &mut b()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        read(book("", "").as_bytes(), &mut b()),
+        Err(Error::Unsupported(_))
+    ));
+    let few = Limits::default().with_max_cells(5);
+    assert_eq!(
+        read(sample().as_bytes(), &mut Budget::new(few)).unwrap_err(),
+        Error::TooLarge("cells")
+    );
+}
+
+#[test]
+fn hostile_documents() {
+    let xml = sample();
+    for cut in (0..xml.len()).step_by(61) {
+        let _ = read(&xml.as_bytes()[..cut], &mut Budget::new(Limits::default()));
+    }
+    for table in [
+        r#"<Row ss:Index="1048576"><Cell ss:Index="16384" ss:MergeAcross="99" ss:MergeDown="4000000000"><Data ss:Type="Number">1</Data></Cell><Cell><Data ss:Type="Number">2</Data></Cell></Row><Row><Cell/></Row>"#,
+        r#"<Row ss:Span="4294967295" ss:Height="1e308"/><Column ss:Span="4294967295" ss:Width="-1"/>"#,
+        r#"<Row><Cell ss:Formula="=R[-99999999999]C+&quot;" ss:ArrayRange="R0C0"><Data ss:Type="DateTime">-0001-99-99</Data></Cell></Row>"#,
+    ] {
+        let doc = book(
+            r#"<Style ss:ID="a" ss:Parent="b"/><Style ss:ID="b" ss:Parent="a"><Font ss:Size="-1"/></Style>"#,
+            &format!(r#"<Worksheet ss:Name="S"><Table ss:StyleID="a">{table}</Table></Worksheet>"#),
+        );
+        let _ = read(doc.as_bytes(), &mut Budget::new(Limits::default()));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/error.rs b/crates/exav-render/src/formats/office/slides/error.rs
new file mode 100644
index 00000000..0d3e5310
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/error.rs
@@ -0,0 +1,58 @@
+use std::fmt;
+
+/// Why a document was not converted.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum Error {
+    /// The bytes are not a document of the format asked for.
+    NotFormat(String),
+    /// Encrypted with a password.
+    Encrypted,
+    /// A valid document of a version or kind this reader does not convert.
+    Unsupported(String),
+    /// Past one of the [`Limits`](crate::formats::office::slides::Limits): what it was.
+    TooLarge(&'static str),
+    /// Damaged beyond what this reader recovers from.
+    Malformed(String),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotFormat(why) => write!(f, "not a document of this format: {why}"),
+            Error::Encrypted => f.write_str("encrypted with a password"),
+            Error::Unsupported(what) => write!(f, "unsupported: {what}"),
+            Error::TooLarge(what) => write!(f, "too large: {what}"),
+            Error::Malformed(why) => write!(f, "damaged: {why}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl Error {
+    /// A short machine-readable kind: `not-format`, `encrypted`,
+    /// `unsupported`, `too-large` or `malformed`.
+    pub fn kind(&self) -> &'static str {
+        match self {
+            Error::NotFormat(_) => "not-format",
+            Error::Encrypted => "encrypted",
+            Error::Unsupported(_) => "unsupported",
+            Error::TooLarge(_) => "too-large",
+            Error::Malformed(_) => "malformed",
+        }
+    }
+}
+
+impl From<crate::formats::office::common::xml::Error> for Error {
+    fn from(e: crate::formats::office::common::xml::Error) -> Self {
+        use crate::formats::office::common::xml::Error as X;
+        match e {
+            X::Malformed(why) => Error::Malformed(format!("XML: {why}")),
+            X::TooLarge(what) => Error::TooLarge(what),
+            X::NotFormat(why) => Error::NotFormat(why),
+        }
+    }
+}
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
diff --git a/crates/exav-render/src/formats/office/slides/keynote/apxl.rs b/crates/exav-render/src/formats/office/slides/keynote/apxl.rs
new file mode 100644
index 00000000..aa8ed412
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/apxl.rs
@@ -0,0 +1,1304 @@
+//! Keynote 2 to 5 (2003 to 2012) documents: one XML file, `index.apxl`
+//! (gzipped in some packages), in Apple's "key", "sf" and "sfa" namespaces,
+//! with the pictures beside it. No description of this format was
+//! published (Apple published only the Keynote 1 schema, see `apxl1`); what
+//! is read here was learnt from sample documents.
+//!
+//! What the samples show:
+//! - `key:size` is the slide size in points. `key:slide-list` holds the
+//!   `key:slide` elements in order, each naming its master (`key:master-ref`)
+//!   and slide style (`key:style-ref`, whose `sf:fill` is the background).
+//! - A slide's `key:page` has `sf:layers`: a background layer, a proxy of
+//!   the master's layer (the master's `BGMasterSlideLayer`, whose drawables
+//!   show on every slide; its prototype layer does not), and a foreground
+//!   layer. A layer's `sf:drawables` holds the objects, inline or as `-ref`
+//!   elements naming an object by `sfa:ID`.
+//! - Styles live in a `key:stylesheet` of the theme, of each master and of
+//!   each slide, each naming its parent (`sf:parent-ref`). A style names its
+//!   parent by `sf:parent-ident`, looked up in the stylesheet it is in and
+//!   then in its parents, never as itself. Its `sf:property-map` sets a
+//!   property when the element has content; `sf:null` sets it to nothing.
+//! - A placeholder's position and size are those of its placeholder style
+//!   (`sf:geometry` property); its own `sf:geometry` is a stub.
+//! - Text is `sf:text-storage` / `sf:text-body` / `sf:p` (`sf:style`, and
+//!   `sf:list-level` from 1 for bullets), `sf:span` for character styles and
+//!   `sf:br` at the end of a paragraph. Colours are `sfa:r`, `sfa:g`, `sfa:b`
+//!   or `sfa:w` with `sfa:a`; font names are PostScript names.
+//! - A list style's `listLabelTypes` has an entry per level from 0, the
+//!   label indents and text indents likewise.
+//! - Keynote 2 and 3 keep a slide's text in `key:bullets`, a `key:headline`
+//!   for each paragraph (`key:depth`, 0 for the title) when the
+//!   placeholders have none.
+
+use super::text::ps_font;
+use crate::formats::office::common::xml::{Child, Node};
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+use crate::formats::office::slides::package::Zip;
+use std::collections::HashMap;
+
+const PT: f64 = 12700.0;
+/// No stylesheet.
+const NONE: usize = usize::MAX;
+/// Hops up a chain of styles or stylesheets.
+const MAX_CHAIN: usize = 32;
+
+/// Where pictures are read from: the package's members, paths relative to
+/// the directory holding the XML (`base`, empty or ending in "/"), else to
+/// the package's root.
+pub(crate) enum Pkg<'a> {
+    None,
+    Zip(Zip<'a>, String),
+    Files(&'a [(&'a str, &'a [u8])], String),
+}
+
+impl Pkg<'_> {
+    pub(super) fn get(&mut self, path: &str) -> Result<Option<Vec<u8>>> {
+        let path = path.trim_start_matches("./");
+        match self {
+            Pkg::None => Ok(None),
+            Pkg::Zip(z, base) => {
+                if !base.is_empty()
+                    && let Some(d) = z.read(&format!("{base}{path}"), 64 << 20)?
+                {
+                    return Ok(Some(d));
+                }
+                z.read(path, 64 << 20)
+            }
+            Pkg::Files(f, base) => {
+                let find = |p: &str| f.iter().find(|x| x.0 == p).map(|x| x.1.to_vec());
+                Ok(find(&format!("{base}{path}")).or_else(|| find(path)))
+            }
+        }
+    }
+}
+
+struct Sheet<'a> {
+    node: &'a Node,
+    parent: Option<usize>,
+    idents: HashMap<&'a str, &'a Node>,
+}
+
+/// A style and the stylesheet it is in.
+#[derive(Clone, Copy)]
+struct Sty<'a> {
+    node: &'a Node,
+    sheet: usize,
+}
+
+struct Reader<'a> {
+    ids: HashMap<&'a str, (&'a Node, usize)>,
+    sheets: Vec<Sheet<'a>>,
+    sheet_ids: HashMap<&'a str, usize>,
+    pkg: Pkg<'a>,
+    /// Pictures by path: their media index.
+    media: HashMap<String, Option<usize>>,
+    /// A picture the package could not give within the limits, raised
+    /// after the slide that wanted it.
+    failed: Option<Error>,
+    /// Bytes of pictures read and not yet charged to the budget.
+    pending: u64,
+    masters: HashMap<&'a str, usize>,
+    p: Presentation,
+}
+
+pub(crate) fn read<'a>(root: &'a Node, pkg: Pkg<'a>, budget: &mut Budget) -> Result<Presentation> {
+    if root.name != "key:presentation" {
+        return Err(Error::NotFormat("not a Keynote document".into()));
+    }
+    let mut r = Reader {
+        ids: HashMap::new(),
+        sheets: vec![],
+        sheet_ids: HashMap::new(),
+        pkg,
+        media: HashMap::new(),
+        failed: None,
+        pending: 0,
+        masters: HashMap::new(),
+        p: Presentation::default(),
+    };
+    r.index(root, NONE, 0);
+    // Parents, once every stylesheet is known.
+    for i in 0..r.sheets.len() {
+        let parent = r.sheets[i]
+            .node
+            .child("sf:parent-ref")
+            .and_then(|p| p.attr("sfa:IDREF"))
+            .and_then(|id| r.sheet_ids.get(id))
+            .copied()
+            .filter(|&p| p != i);
+        r.sheets[i].parent = parent;
+    }
+    r.convert(root, budget)?;
+    Ok(r.p)
+}
+
+impl<'a> Reader<'a> {
+    /// Records the identifiers and style names under `n`, in stylesheet
+    /// `sheet`.
+    fn index(&mut self, n: &'a Node, sheet: usize, depth: u32) {
+        if depth > 250 {
+            return;
+        }
+        let mut sheet = sheet;
+        // The objects of a theme, a master or a slide use its stylesheet.
+        let own = match n.name.as_str() {
+            "key:stylesheet" => Some(n),
+            "key:theme" | "key:master-slide" | "key:slide" => n.child("key:stylesheet"),
+            _ => None,
+        };
+        if let Some(ss) = own {
+            sheet = match ss.attr("sfa:ID").and_then(|id| self.sheet_ids.get(id)) {
+                Some(&i) => i,
+                None => {
+                    let i = self.sheets.len();
+                    self.sheets.push(Sheet {
+                        node: ss,
+                        parent: None,
+                        idents: HashMap::new(),
+                    });
+                    if let Some(id) = ss.attr("sfa:ID") {
+                        self.sheet_ids.insert(id, i);
+                    }
+                    i
+                }
+            };
+        }
+        if let Some(id) = n.attr("sfa:ID") {
+            self.ids.entry(id).or_insert((n, sheet));
+        }
+        if sheet != NONE
+            && let Some(ident) = n.attr("sf:ident")
+        {
+            self.sheets[sheet].idents.entry(ident).or_insert(n);
+        }
+        for c in n.nodes() {
+            self.index(c, sheet, depth + 1);
+        }
+    }
+
+    /// `n`, or what its `sfa:IDREF` names.
+    fn deref(&self, n: &'a Node, sheet: usize) -> (&'a Node, usize) {
+        match n.attr("sfa:IDREF").and_then(|r| self.ids.get(r)) {
+            Some(&(t, s)) => (t, s),
+            None => (n, sheet),
+        }
+    }
+
+    fn by_ident(&self, ident: &str, sheet: usize, not: Option<&Node>) -> Option<Sty<'a>> {
+        let mut cur = sheet;
+        for _ in 0..MAX_CHAIN {
+            if cur == NONE {
+                return None;
+            }
+            let s = &self.sheets[cur];
+            if let Some(&node) = s.idents.get(ident)
+                && not.is_none_or(|x| !std::ptr::eq(x, node))
+            {
+                return Some(Sty { node, sheet: cur });
+            }
+            cur = s.parent.unwrap_or(NONE);
+        }
+        None
+    }
+
+    /// A style by identifier or by name, as a reference in `sheet` gives it.
+    fn style(&self, name: &str, sheet: usize) -> Option<Sty<'a>> {
+        if let Some(&(node, s)) = self.ids.get(name) {
+            return Some(Sty { node, sheet: s });
+        }
+        self.by_ident(name, sheet, None)
+    }
+
+    fn parent(&self, s: Sty<'a>) -> Option<Sty<'a>> {
+        self.by_ident(s.node.attr("sf:parent-ident")?, s.sheet, Some(s.node))
+    }
+
+    /// The value of property `name` in `style` or its nearest parent that
+    /// sets it, and the stylesheet it is in. `sf:null` is no value.
+    fn prop(&self, style: Option<Sty<'a>>, name: &str) -> Option<(&'a Node, usize)> {
+        let mut cur = style;
+        for _ in 0..MAX_CHAIN {
+            let s = cur?;
+            if let Some(p) = s.node.child("sf:property-map").and_then(|m| m.child(name))
+                && let Some(v) = p.nodes().next()
+            {
+                if v.name == "sf:null" {
+                    return None;
+                }
+                return Some(self.deref(v, s.sheet));
+            }
+            cur = self.parent(s);
+        }
+        None
+    }
+
+    fn prop_num(&self, style: Option<Sty<'a>>, name: &str) -> Option<f64> {
+        self.prop(style, name).and_then(|(v, _)| num(v))
+    }
+
+    fn prop_style(&self, style: Option<Sty<'a>>, name: &str) -> Option<Sty<'a>> {
+        self.prop(style, name)
+            .map(|(node, sheet)| Sty { node, sheet })
+    }
+
+    /// A style referenced by an element's `sfa:IDREF`, as a child of `n`.
+    fn style_child(&self, n: &'a Node, name: &str, sheet: usize) -> Option<Sty<'a>> {
+        let c = n.child(name)?.nodes().next()?;
+        let (node, sheet) = self.deref(c, sheet);
+        Some(Sty { node, sheet })
+    }
+
+    fn convert(&mut self, root: &'a Node, budget: &mut Budget) -> Result<()> {
+        let size = root
+            .child("key:size")
+            .or_else(|| root.child("key:theme-list")?.find("key:size"));
+        let (w, h) = size.map_or((1024.0, 768.0), |s| {
+            (
+                attr_f(s, "sfa:w").unwrap_or(1024.0),
+                attr_f(s, "sfa:h").unwrap_or(768.0),
+            )
+        });
+        self.p.width = (w.clamp(16.0, 20_000.0) * PT).round() as Emu;
+        self.p.height = (h.clamp(16.0, 20_000.0) * PT).round() as Emu;
+        let Some(list) = root.child("key:slide-list") else {
+            return Err(Error::NotFormat("no slides".into()));
+        };
+        let mut n = 0usize;
+        for s in list.all("key:slide") {
+            budget.slide(n)?;
+            n += 1;
+            self.p.total_slides = n;
+            if !budget.wants(n - 1) {
+                continue;
+            }
+            let slide = self.slide(s, budget)?;
+            self.p.slides.push(slide);
+            if let Some(e) = self.failed.take() {
+                return Err(e);
+            }
+        }
+        if self.p.masters.is_empty() {
+            self.p.masters.push(Master::default());
+        }
+        Ok(())
+    }
+
+    /// A slide or master's background from its slide style.
+    fn background(&mut self, style: Option<Sty<'a>>) -> Option<Fill> {
+        let (v, sheet) = self.prop(style, "sf:fill")?;
+        Some(self.fill(v, sheet))
+    }
+
+    fn master(&mut self, m: &'a Node, budget: &mut Budget) -> Result<usize> {
+        let key = m.attr("sfa:ID").unwrap_or("");
+        if let Some(&i) = self.masters.get(key) {
+            return Ok(i);
+        }
+        let sheet = m
+            .child("key:stylesheet")
+            .and_then(|s| s.attr("sfa:ID"))
+            .and_then(|id| self.sheet_ids.get(id))
+            .copied()
+            .unwrap_or(NONE);
+        let style = self.style_ref(m, "key:style-ref", sheet);
+        let mut out = Master {
+            name: m.attr("key:name").unwrap_or("Master").to_string(),
+            layouts: vec![Layout {
+                name: "Blank".into(),
+                kind: "blank",
+                show_master_shapes: true,
+                ..Layout::default()
+            }],
+            ..Master::default()
+        };
+        out.background = self
+            .background(style)
+            .or(Some(Fill::Solid(Color::rgb(0xFFFFFF))));
+        if let Some(layers) = m.child("key:page").and_then(|p| p.child("sf:layers")) {
+            for layer in layers.all("sf:layer") {
+                // The prototype layer holds objects to copy, not to show.
+                if layer_name(layer) == Some("BGMasterSlidePrototypeLayer") {
+                    continue;
+                }
+                if let Some(d) = layer.child("sf:drawables") {
+                    self.drawables(d, sheet, 0, &mut out.shapes, None, budget, 0)?;
+                }
+            }
+        }
+        let i = self.p.masters.len();
+        self.p.masters.push(out);
+        self.masters.insert(key, i);
+        Ok(i)
+    }
+
+    fn slide(&mut self, s: &'a Node, budget: &mut Budget) -> Result<Slide> {
+        let sheet = s
+            .child("key:stylesheet")
+            .and_then(|s| s.attr("sfa:ID"))
+            .and_then(|id| self.sheet_ids.get(id))
+            .copied()
+            .unwrap_or(NONE);
+        let mi = match s
+            .child("key:master-ref")
+            .map(|r| self.deref(r, sheet).0)
+            .filter(|m| m.name == "key:master-slide")
+        {
+            Some(m) => self.master(m, budget)?,
+            None => {
+                if self.p.masters.is_empty() {
+                    self.p.masters.push(Master::default());
+                }
+                0
+            }
+        };
+        let style = self.style_ref(s, "key:style-ref", sheet);
+        let background = self.background(style);
+        let number = self.p.slides.len() + 1;
+        let mut shapes = vec![];
+        let headlines = Headlines::of(s);
+        if let Some(layers) = s.child("key:page").and_then(|p| p.child("sf:layers")) {
+            for layer in layers.all("sf:layer") {
+                if let Some(d) = layer.child("sf:drawables") {
+                    self.drawables(d, sheet, number, &mut shapes, Some(&headlines), budget, 0)?;
+                }
+            }
+        }
+        Ok(Slide {
+            name: None,
+            master: mi,
+            layout: 0,
+            background,
+            shapes,
+            hidden: false,
+            show_master_shapes: true,
+        })
+    }
+
+    /// The style a reference element child of `n` (`key:style-ref`) names.
+    fn style_ref(&self, n: &'a Node, name: &str, sheet: usize) -> Option<Sty<'a>> {
+        let c = n.child(name)?;
+        c.attr("sfa:IDREF")?;
+        let (node, sheet) = self.deref(c, sheet);
+        Some(Sty { node, sheet })
+    }
+
+    /// The objects of a layer, in drawing order. `slide` is the text kept
+    /// in the headlines of a slide's bullets; `None` in a master, where
+    /// placeholders are not shown.
+    #[allow(clippy::too_many_arguments)]
+    fn drawables(
+        &mut self,
+        list: &'a Node,
+        sheet: usize,
+        number: usize,
+        out: &mut Vec<Shape>,
+        slide: Option<&Headlines<'a>>,
+        budget: &mut Budget,
+        depth: u32,
+    ) -> Result<()> {
+        if depth > 16 {
+            return Ok(());
+        }
+        for c in list.nodes().take(10_000) {
+            let (n, ns) = self.deref(c, sheet);
+            let local = n.name.split_once(':').map_or(n.name.as_str(), |x| x.1);
+            let shape = match local {
+                "title-placeholder" | "body-placeholder" | "slide-number-placeholder" => {
+                    match slide {
+                        Some(h) => self.placeholder(n, local, ns, number, h, budget)?,
+                        None => None,
+                    }
+                }
+                "shape" | "line" | "connection-line" => {
+                    budget.shape(0)?;
+                    self.shape(n, ns, number, budget)?
+                }
+                "media" => {
+                    budget.shape(0)?;
+                    self.media_shape(n, ns)?
+                }
+                "group" => self.group(n, ns, number, slide, budget, depth)?,
+                "tabular-info" | "table-info" => {
+                    self.p.warn("tables");
+                    None
+                }
+                "chart-info" | "chart" => {
+                    self.p.warn("charts");
+                    None
+                }
+                "movie-media" => {
+                    self.p.warn("movies and sounds");
+                    None
+                }
+                _ => None,
+            };
+            out.extend(shape);
+            budget.alloc(std::mem::take(&mut self.pending))?;
+        }
+        Ok(())
+    }
+
+    fn group(
+        &mut self,
+        n: &'a Node,
+        sheet: usize,
+        number: usize,
+        slide: Option<&Headlines<'a>>,
+        budget: &mut Budget,
+        depth: u32,
+    ) -> Result<Option<Shape>> {
+        let Some((xf, _, _)) = geometry(n.child("sf:geometry")) else {
+            return Ok(None);
+        };
+        let mut kids = vec![];
+        if let Some(d) = n.child("sf:drawables") {
+            self.drawables(d, sheet, number, &mut kids, slide, budget, depth + 1)?;
+        }
+        if kids.is_empty() {
+            return Ok(None);
+        }
+        let child = Xfrm {
+            x: 0,
+            y: 0,
+            w: xf.w.max(1),
+            h: xf.h.max(1),
+            ..Xfrm::default()
+        };
+        Ok(Some(Shape::new(
+            ShapeKind::Group(Box::new(Group {
+                child,
+                shapes: kids,
+            })),
+            xf,
+        )))
+    }
+
+    /// A title or body placeholder with its text.
+    fn placeholder(
+        &mut self,
+        n: &'a Node,
+        local: &str,
+        sheet: usize,
+        number: usize,
+        headlines: &Headlines<'a>,
+        budget: &mut Budget,
+    ) -> Result<Option<Shape>> {
+        let own = n.child("key:text").or_else(|| n.child("sf:text"));
+        let frames: Vec<(&Node, u32)> = match (own, local) {
+            (Some(f), _) => vec![(f, 0)],
+            (None, "title-placeholder") => headlines.title.clone(),
+            (None, "body-placeholder") => headlines.body.clone(),
+            _ => vec![],
+        };
+        if frames.is_empty() {
+            return Ok(None);
+        }
+        let style = self.style_child(n, "sf:style", sheet);
+        // The placeholder's own geometry is a stub: its style gives the box.
+        let geom = self
+            .prop(style, "sf:geometry")
+            .and_then(|(g, _)| geometry(g.child("sf:geometry").or(Some(g))))
+            .or_else(|| geometry(n.child("sf:geometry")));
+        let Some((xf, _, _)) = geom else {
+            return Ok(None);
+        };
+        let Some(text) = self.text(&frames, style, sheet, number, budget)? else {
+            return Ok(None);
+        };
+        budget.shape(0)?;
+        let mut sp = self.sp_props(style);
+        sp.text = Some(text);
+        let mut s = Shape::new(ShapeKind::Sp(Box::new(sp)), xf);
+        s.placeholder = match local {
+            "title-placeholder" => Some(Placeholder {
+                kind: "title",
+                idx: None,
+            }),
+            "body-placeholder" => Some(Placeholder {
+                kind: "body",
+                idx: Some(1),
+            }),
+            _ => None,
+        };
+        Ok(Some(s))
+    }
+
+    /// Fill, line and shadow of a style.
+    fn sp_props(&mut self, style: Option<Sty<'a>>) -> Sp {
+        let opacity = self.prop_num(style, "sf:opacity");
+        let fill = match self.prop(style, "sf:fill") {
+            Some((v, sheet)) => match self.fill(v, sheet) {
+                Fill::Solid(c) => Fill::Solid(with_opacity(c, opacity)),
+                f => f,
+            },
+            None => Fill::None,
+        };
+        let line = self
+            .prop(style, "sf:stroke")
+            .and_then(|(s, _)| stroke(s, opacity))
+            .unwrap_or_default();
+        let shadow = self.prop(style, "sf:shadow").and_then(|(s, _)| shadow(s));
+        Sp {
+            fill,
+            line,
+            shadow,
+            ..Sp::default()
+        }
+    }
+
+    fn shape(
+        &mut self,
+        n: &'a Node,
+        sheet: usize,
+        number: usize,
+        budget: &mut Budget,
+    ) -> Result<Option<Shape>> {
+        let Some((xf, w, h)) = geometry(n.child("sf:geometry")) else {
+            return Ok(None);
+        };
+        let natural = n
+            .child("sf:geometry")
+            .and_then(|g| g.child("sf:naturalSize"))
+            .map(|s| {
+                (
+                    attr_f(s, "sfa:w").unwrap_or(w),
+                    attr_f(s, "sfa:h").unwrap_or(h),
+                )
+            })
+            .filter(|s| s.0 > 0.0 && s.1 > 0.0)
+            .unwrap_or((w.max(1.0), h.max(1.0)));
+        let style = n
+            .child("sf:style")
+            .and_then(|s| s.nodes().next())
+            .map(|c| self.deref(c, sheet))
+            .map(|(node, sheet)| Sty { node, sheet });
+        let mut sp = self.sp_props(style);
+        sp.geom = n
+            .child("sf:path")
+            .and_then(|p| path_of(p, natural))
+            .unwrap_or_default();
+        if let Some(frame) = n.child("sf:text") {
+            sp.text = self.text(&[(frame, 0)], style, sheet, number, budget)?;
+        }
+        Ok(Some(Shape::new(ShapeKind::Sp(Box::new(sp)), xf)))
+    }
+
+    /// A picture: the image frame, cropped to the crop frame.
+    fn media_shape(&mut self, n: &'a Node, sheet: usize) -> Result<Option<Shape>> {
+        // A placeholder for a picture the user did not add.
+        if n.attr("sf:placeholder") == Some("true") {
+            return Ok(None);
+        }
+        let Some((frame, ..)) = geometry(n.child("sf:geometry")) else {
+            return Ok(None);
+        };
+        let Some(content) = n.child("sf:content") else {
+            return Ok(None);
+        };
+        let Some(data) = content.nodes().find_map(|m| self.image_data(m)) else {
+            if content.find("sf:movie-media").is_some() || content.find("sf:movie").is_some() {
+                self.p.warn("videos and sounds, drawn as boxes");
+                let sp = ShapeKind::media_placeholder(frame.w, frame.h, true);
+                return Ok(Some(Shape::new(sp, frame)));
+            }
+            return Ok(None);
+        };
+        let Some(media) = self.image(&data) else {
+            self.p.warn("pictures whose data is missing");
+            return Ok(None);
+        };
+        let style = n
+            .child("sf:style")
+            .and_then(|s| s.nodes().next())
+            .map(|c| self.deref(c, sheet))
+            .map(|(node, sheet)| Sty { node, sheet });
+        let opacity = self.prop_num(style, "sf:opacity");
+        let line = self
+            .prop(style, "sf:stroke")
+            .and_then(|(s, _)| stroke(s, opacity))
+            .unwrap_or_default();
+        let shadow = self.prop(style, "sf:shadow").and_then(|(s, _)| shadow(s));
+        // The visible window, in the same space as the image frame.
+        let (xf, crop) = match geometry(n.child("sf:crop-geometry")) {
+            Some((win, ..)) if frame.w > 0 && frame.h > 0 => {
+                let f = |v: Emu, total: Emu| ((v as f64 / total as f64) * 100_000.0).round() as i32;
+                let crop = [
+                    f(win.x - frame.x, frame.w).clamp(0, 99_000),
+                    f(win.y - frame.y, frame.h).clamp(0, 99_000),
+                    f(frame.x + frame.w - (win.x + win.w), frame.w).clamp(0, 99_000),
+                    f(frame.y + frame.h - (win.y + win.h), frame.h).clamp(0, 99_000),
+                ];
+                (win, crop)
+            }
+            _ => (frame, [0; 4]),
+        };
+        Ok(Some(Shape::new(
+            ShapeKind::Pic(Box::new(Pic {
+                media,
+                crop,
+                geom: Geometry::default(),
+                line,
+                shadow,
+                alpha: opacity
+                    .filter(|&o| o < 1.0)
+                    .map(|o| (o.clamp(0.0, 1.0) * 100_000.0).round() as u32),
+            })),
+            xf,
+        )))
+    }
+
+    /// The package paths of the picture `n` (a media content or a textured
+    /// fill) holds: the filtered image if it has one, else the original.
+    fn image_data(&self, n: &'a Node) -> Option<Vec<String>> {
+        let fi = n.child("sf:filtered-image")?;
+        let mut out = vec![];
+        for part in ["sf:filtered", "sf:unfiltered"] {
+            let Some(p) = fi.child(part) else { continue };
+            let (p, _) = self.deref(p, NONE);
+            if let Some(d) = p.child("sf:data") {
+                let (d, _) = self.deref(d, NONE);
+                out.extend(
+                    ["sf:path", "sf:displayname"]
+                        .iter()
+                        .filter_map(|a| d.attr(a))
+                        .map(str::to_string),
+                );
+            }
+        }
+        (!out.is_empty()).then_some(out)
+    }
+
+    /// A picture's media index, trying each path in turn. Its bytes are
+    /// charged to the budget by the caller (`pending`).
+    fn image(&mut self, paths: &[String]) -> Option<usize> {
+        for path in paths {
+            if let Some(&m) = self.media.get(path) {
+                if m.is_some() {
+                    return m;
+                }
+                continue;
+            }
+            let bytes = match self.pkg.get(path) {
+                Ok(b) => b,
+                Err(e) => {
+                    self.failed.get_or_insert(e);
+                    None
+                }
+            };
+            let m = bytes.and_then(|d| {
+                let ext = crate::formats::office::slides::package::image_ext(&d)?;
+                self.pending += d.len() as u64;
+                Some(self.p.add_media(ext, d))
+            });
+            self.media.insert(path.clone(), m);
+            if m.is_some() {
+                return m;
+            }
+        }
+        None
+    }
+
+    fn fill(&mut self, v: &'a Node, sheet: usize) -> Fill {
+        let (v, _) = self.deref(v, sheet);
+        match v.name.as_str() {
+            "sf:color" => color(v).map_or(Fill::None, Fill::Solid),
+            "sf:angle-gradient" | "sf:gradient" => gradient(v).unwrap_or(Fill::None),
+            "sf:textured-fill" => {
+                let tile = v.attr("sf:technique") == Some("tile");
+                match self.image_data(v).and_then(|paths| self.image(&paths)) {
+                    Some(media) => Fill::Picture { media, tile },
+                    None => Fill::None,
+                }
+            }
+            _ => Fill::None,
+        }
+    }
+}
+
+/// The text of a slide that keeps it in `key:bullets` (Keynote 2 and 3): a
+/// `key:headline` for each paragraph, at its depth, 0 for the title.
+#[derive(Default)]
+struct Headlines<'a> {
+    title: Vec<(&'a Node, u32)>,
+    body: Vec<(&'a Node, u32)>,
+}
+
+impl<'a> Headlines<'a> {
+    fn of(slide: &'a Node) -> Self {
+        let mut h = Headlines::default();
+        let Some(bullets) = slide.child("key:bullets") else {
+            return h;
+        };
+        for headline in bullets.all("key:headline").take(1 << 16) {
+            let Some(frame) = headline.child("key:text") else {
+                continue;
+            };
+            let depth = headline
+                .attr("key:depth")
+                .and_then(|d| d.trim().parse::<u32>().ok())
+                .unwrap_or(0);
+            if depth == 0 {
+                h.title.push((frame, 0));
+            } else {
+                h.body.push((frame, depth));
+            }
+        }
+        h
+    }
+}
+
+fn layer_name(layer: &Node) -> Option<&str> {
+    layer
+        .child("sf:type")?
+        .child("sf:string")?
+        .attr("sfa:string")
+}
+
+fn attr_f(n: &Node, a: &str) -> Option<f64> {
+    n.attr(a)
+        .and_then(|v| v.trim().parse::<f64>().ok())
+        .filter(|v| v.is_finite())
+}
+
+/// The value of an `sf:number` or `sf:decimal-number`.
+fn num(v: &Node) -> Option<f64> {
+    attr_f(v, "sfa:number")
+}
+
+/// A frame (`sf:geometry`, `sf:crop-geometry`): the box in EMU, and its
+/// width and height in points.
+fn geometry(g: Option<&Node>) -> Option<(Xfrm, f64, f64)> {
+    let g = g?;
+    let size = g.child("sf:size")?;
+    let pos = g.child("sf:position");
+    let f = |n: Option<&Node>, a: &str| n.and_then(|n| attr_f(n, a)).unwrap_or(0.0);
+    let (w, h) = (
+        f(Some(size), "sfa:w").max(0.0),
+        f(Some(size), "sfa:h").max(0.0),
+    );
+    let clamp = |v: f64| v.clamp(-1e6, 1e6);
+    Some((
+        Xfrm {
+            x: (clamp(f(pos, "sfa:x")) * PT).round() as Emu,
+            y: (clamp(f(pos, "sfa:y")) * PT).round() as Emu,
+            w: (clamp(w) * PT).round() as Emu,
+            h: (clamp(h) * PT).round() as Emu,
+            ..Xfrm::default()
+        },
+        w,
+        h,
+    ))
+}
+
+fn channel(v: f64) -> u32 {
+    (v.clamp(0.0, 1.0) * 255.0).round() as u32
+}
+
+/// An `sf:color`: RGB, grey or CMYK with alpha.
+fn color(c: &Node) -> Option<Color> {
+    let a = attr_f(c, "sfa:a").unwrap_or(1.0).clamp(0.0, 1.0);
+    let f = |n: &str| attr_f(c, n);
+    let rgb = if let Some(w) = f("sfa:w") {
+        let g = channel(w);
+        g << 16 | g << 8 | g
+    } else if let Some(cy) = f("sfa:c") {
+        let (m, y, k) = (
+            f("sfa:m").unwrap_or(0.0),
+            f("sfa:y").unwrap_or(0.0),
+            f("sfa:k").unwrap_or(0.0),
+        );
+        let ch = |v: f64| channel((1.0 - v.clamp(0.0, 1.0)) * (1.0 - k.clamp(0.0, 1.0)));
+        ch(cy) << 16 | ch(m) << 8 | ch(y)
+    } else {
+        channel(f("sfa:r").unwrap_or(0.0)) << 16
+            | channel(f("sfa:g").unwrap_or(0.0)) << 8
+            | channel(f("sfa:b").unwrap_or(0.0))
+    };
+    Some(Color {
+        rgb,
+        alpha: (a < 1.0).then(|| (a * 100_000.0).round() as u32),
+    })
+}
+
+fn with_opacity(mut c: Color, o: Option<f64>) -> Color {
+    if let Some(o) = o.filter(|&o| o < 1.0) {
+        let a = f64::from(c.alpha.unwrap_or(100_000)) * o.clamp(0.0, 1.0);
+        c.alpha = Some(a.round() as u32);
+    }
+    c
+}
+
+/// An `sf:angle-gradient`: stops with fractions and colours; the angle in
+/// radians, counterclockwise.
+fn gradient(g: &Node) -> Option<Fill> {
+    let stops: Vec<(u32, Color)> = g
+        .child("sf:stops")?
+        .all("sf:gradient-stop")
+        .take(64)
+        .filter_map(|s| {
+            let c = color(s.child("sf:color")?)?;
+            let pos = attr_f(s, "sf:fraction").unwrap_or(0.0).clamp(0.0, 1.0);
+            Some(((pos * 100_000.0).round() as u32, c))
+        })
+        .collect();
+    if stops.is_empty() {
+        return None;
+    }
+    let kind = if g.attr("sf:type") == Some("radial") {
+        GradientKind::Path("circle", [50_000; 4])
+    } else {
+        let a = attr_f(g, "sf:angle").unwrap_or(0.0).to_degrees();
+        GradientKind::Linear((-a).rem_euclid(360.0))
+    };
+    Some(Fill::Gradient(Gradient { stops, kind }))
+}
+
+/// An `sf:stroke`; `None` when it draws nothing.
+fn stroke(s: &Node, opacity: Option<f64>) -> Option<Line> {
+    let kind = s.child("sf:pattern").and_then(|p| p.attr("sf:type"));
+    if matches!(kind, Some("none" | "empty")) {
+        return None;
+    }
+    let width = attr_f(s, "sf:width").unwrap_or(1.0).clamp(0.0, 1000.0);
+    let c = s.child("sf:color").and_then(color)?;
+    Some(Line {
+        fill: Fill::Solid(with_opacity(c, opacity)),
+        width: (width * PT).round() as Emu,
+        dash: kind.filter(|k| *k != "solid").map(|_| "dash"),
+        cap: match s.attr("sf:cap") {
+            Some("round") => Some("rnd"),
+            Some("square") => Some("sq"),
+            _ => None,
+        },
+        join: match s.attr("sf:join") {
+            Some("round") => Some("round"),
+            Some("bevel") => Some("bevel"),
+            Some("miter") => Some("miter"),
+            _ => None,
+        },
+        ..Line::default()
+    })
+}
+
+/// An `sf:shadow`: angle in degrees clockwise, offset and radius in
+/// points.
+fn shadow(s: &Node) -> Option<Shadow> {
+    if s.attr("sf:is-null") == Some("true") {
+        return None;
+    }
+    let c = s.child("sf:color").and_then(color).unwrap_or(Color::rgb(0));
+    let c = with_opacity(c, attr_f(s, "sf:opacity"));
+    let offset = attr_f(s, "sf:offset").unwrap_or(0.0).abs();
+    if offset == 0.0 && c.alpha == Some(0) {
+        return None;
+    }
+    Some(Shadow {
+        color: c,
+        blur: (attr_f(s, "sf:radius").unwrap_or(0.0).clamp(0.0, 1000.0) * PT).round() as Emu,
+        dist: (offset.min(1000.0) * PT).round() as Emu,
+        dir: attr_f(s, "sf:angle").unwrap_or(0.0).rem_euclid(360.0),
+    })
+}
+
+/// A shape's path: `sf:bezier` elements holding SVG-like commands in the
+/// shape's natural size.
+fn path_of(p: &Node, natural: (f64, f64)) -> Option<Geometry> {
+    let b = p
+        .child("sf:bezier-path")
+        .and_then(|b| b.child("sf:bezier"))
+        .or_else(|| p.child("sf:bezier"))?;
+    path(b.attr("sfa:path")?, natural)
+}
+
+/// Commands `M x y`, `L x y`, `C x1 y1 x2 y2 x y`, `Z`.
+fn path(d: &str, natural: (f64, f64)) -> Option<Geometry> {
+    let s = 100.0;
+    let mut out = Path {
+        w: (natural.0 * s).round().max(1.0) as i64,
+        h: (natural.1 * s).round().max(1.0) as i64,
+        fill: true,
+        stroke: true,
+        cmds: vec![],
+    };
+    let toks: Vec<&str> = d.split_ascii_whitespace().take(1 << 16).collect();
+    let mut i = 0;
+    let mut started = false;
+    let pts = |i: &mut usize, n: usize| -> Option<Vec<i64>> {
+        let v: Vec<i64> = toks
+            .get(*i + 1..*i + 1 + n)?
+            .iter()
+            .map(|t| t.parse::<f64>().ok().map(|v| (v * s).round() as i64))
+            .collect::<Option<_>>()?;
+        *i += 1 + n;
+        Some(v)
+    };
+    while i < toks.len() {
+        match toks[i] {
+            "M" => {
+                let v = pts(&mut i, 2)?;
+                out.cmds.push(PathCmd::Move(v[0], v[1]));
+                started = true;
+            }
+            "L" if started => {
+                let v = pts(&mut i, 2)?;
+                out.cmds.push(PathCmd::Line(v[0], v[1]));
+            }
+            "C" if started => {
+                let v = pts(&mut i, 6)?;
+                out.cmds
+                    .push(PathCmd::Cubic(v[0], v[1], v[2], v[3], v[4], v[5]));
+            }
+            "Z" => {
+                out.cmds.push(PathCmd::Close);
+                i += 1;
+            }
+            _ => return None,
+        }
+    }
+    // A trailing lone move draws nothing.
+    if matches!(out.cmds.last(), Some(PathCmd::Move(..))) {
+        out.cmds.pop();
+    }
+    (!out.cmds.is_empty()).then(|| Geometry::Custom(vec![out]))
+}
+
+// Text.
+
+impl<'a> Reader<'a> {
+    /// The text frames (`key:text`, `sf:text`) of a shape in `shape_style`,
+    /// each with the list level its paragraphs are given when they name
+    /// none, as a text body; `None` when they hold no text.
+    fn text(
+        &mut self,
+        frames: &[(&'a Node, u32)],
+        shape_style: Option<Sty<'a>>,
+        sheet: usize,
+        number: usize,
+        budget: &mut Budget,
+    ) -> Result<Option<TextBody>> {
+        let mut paras = vec![];
+        let mut layout = None;
+        for &(frame, forced) in frames {
+            let Some(storage) = frame.child("sf:text-storage") else {
+                continue;
+            };
+            let sheet = storage
+                .child("sf:stylesheet-ref")
+                .and_then(|r| r.attr("sfa:IDREF"))
+                .and_then(|id| self.sheet_ids.get(id))
+                .copied()
+                .unwrap_or(sheet);
+            let Some(body) = storage.child("sf:text-body") else {
+                continue;
+            };
+            let frame_layout = frame
+                .attr("sf:layoutstyle")
+                .and_then(|l| self.style(l, sheet))
+                .or_else(|| self.prop_style(shape_style, "sf:layoutStyle"));
+            layout = layout.or(frame_layout);
+            let default_para = self
+                .prop_style(frame_layout, "sf:layoutParagraphStyle")
+                .or_else(|| self.prop_style(shape_style, "sf:layoutParagraphStyle"));
+            let mut stack: Vec<&Node> = body.nodes().collect();
+            stack.reverse();
+            // Paragraphs may sit in `sf:layout` elements.
+            while let Some(n) = stack.pop() {
+                match n.name.as_str() {
+                    "sf:p" => {
+                        if paras.len() >= 1 << 16 {
+                            break;
+                        }
+                        paras.push(self.paragraph(
+                            n,
+                            default_para,
+                            forced,
+                            sheet,
+                            number,
+                            budget,
+                        )?);
+                    }
+                    "sf:layout" => {
+                        let mut kids: Vec<&Node> = n.nodes().collect();
+                        kids.reverse();
+                        stack.extend(kids);
+                    }
+                    _ => {}
+                }
+            }
+        }
+        if paras.iter().all(|p| {
+            p.runs
+                .iter()
+                .all(|r| matches!(&r.kind, RunKind::Text(t) if t.is_empty()))
+        }) {
+            return Ok(None);
+        }
+        let pad = self.prop(layout, "sf:padding").map(|(p, _)| p);
+        let ins = |a: &str| {
+            pad.and_then(|p| attr_f(p, a))
+                .map(|v| (v.clamp(0.0, 1000.0) * PT).round() as Emu)
+                .unwrap_or(0)
+        };
+        let valign = self.prop_num(layout, "sf:verticalAlignment").unwrap_or(0.0);
+        let shrink = self
+            .prop_num(layout, "sf:shrinkTextToFit")
+            .is_some_and(|v| v != 0.0);
+        let cols = self
+            .prop(layout, "sf:columns")
+            .and_then(|(c, _)| attr_f(c, "sf:count"))
+            .map_or(1, |c| c.clamp(1.0, 16.0) as u32);
+        Ok(Some(TextBody {
+            body: BodyProps {
+                insets: [
+                    ins("sf:left"),
+                    ins("sf:top"),
+                    ins("sf:right"),
+                    ins("sf:bottom"),
+                ],
+                anchor: match valign as i32 {
+                    1 => "ctr",
+                    2 => "b",
+                    _ => "t",
+                },
+                autofit: if shrink {
+                    Autofit::Normal(100_000, 0)
+                } else {
+                    Autofit::None
+                },
+                columns: cols,
+                ..BodyProps::default()
+            },
+            paras,
+            levels: ListStyle::default(),
+        }))
+    }
+
+    /// A paragraph. A paragraph that names no list level takes `forced`.
+    fn paragraph(
+        &mut self,
+        p: &'a Node,
+        default_para: Option<Sty<'a>>,
+        forced: u32,
+        sheet: usize,
+        number: usize,
+        budget: &mut Budget,
+    ) -> Result<Paragraph> {
+        let pstyle = p
+            .attr("sf:style")
+            .and_then(|s| self.style(s, sheet))
+            .or(default_para);
+        let level = p
+            .attr("sf:list-level")
+            .and_then(|l| l.trim().parse::<u32>().ok())
+            .unwrap_or(forced)
+            .min(8);
+        let base = self.run_props(pstyle, None);
+        let props = self.para_props(pstyle, level, base.color);
+        let mut runs: Vec<Run> = vec![];
+        let last = p.nodes().count();
+        let mut seen = 0;
+        for c in &p.children {
+            budget.alloc(64)?;
+            let (kind, rp) = match c {
+                Child::Text(t) => (RunKind::Text(self.cased(t, pstyle, None)), base.clone()),
+                Child::Node(n) => {
+                    seen += 1;
+                    match n.name.as_str() {
+                        "sf:span" | "sf:link" => {
+                            let cstyle = n.attr("sf:style").and_then(|s| self.style(s, sheet));
+                            let mut rp = self.run_props(pstyle, cstyle);
+                            if n.name == "sf:link" {
+                                rp.link = n.attr("href").and_then(Link::url);
+                            }
+                            (RunKind::Text(self.cased(&n.own_text(), pstyle, cstyle)), rp)
+                        }
+                        // The last one ends the paragraph; any other breaks the line.
+                        "sf:br" if seen == last => continue,
+                        "sf:br" | "sf:lnbr" => (RunKind::Break, base.clone()),
+                        "sf:tab" => (RunKind::Text("\t".into()), base.clone()),
+                        "sf:page-number" | "sf:slide-number" => {
+                            (RunKind::Field("slidenum", number.to_string()), base.clone())
+                        }
+                        _ => continue,
+                    }
+                }
+            };
+            match (&kind, runs.last_mut()) {
+                (RunKind::Text(t), _) if t.is_empty() => {}
+                (
+                    RunKind::Text(t),
+                    Some(Run {
+                        kind: RunKind::Text(prev),
+                        props,
+                    }),
+                ) if *props == rp => prev.push_str(t),
+                _ => runs.push(Run { kind, props: rp }),
+            }
+        }
+        Ok(Paragraph {
+            props,
+            runs,
+            end: base,
+        })
+    }
+
+    /// `text` with the capitalization of its styles (3 is each word's first
+    /// letter in capitals; all caps and small caps are the renderer's).
+    fn cased(&self, text: &str, para: Option<Sty<'a>>, chr: Option<Sty<'a>>) -> String {
+        let cap = self
+            .prop_num(chr, "sf:capitalization")
+            .or_else(|| self.prop_num(para, "sf:capitalization"));
+        if cap == Some(3.0) {
+            title_case(text)
+        } else {
+            text.to_string()
+        }
+    }
+
+    fn run_props(&self, para: Option<Sty<'a>>, chr: Option<Sty<'a>>) -> RunProps {
+        let get = |name: &str| {
+            self.prop(chr, name)
+                .or_else(|| self.prop(para, name))
+                .map(|(v, _)| v)
+        };
+        let mut rp = RunProps::default();
+        if let Some(name) = get("sf:fontName").and_then(|v| v.attr("sfa:string")) {
+            let (fam, b, i) = ps_font(name);
+            rp.font = Some(fam);
+            if b {
+                rp.bold = Some(true);
+            }
+            if i {
+                rp.italic = Some(true);
+            }
+        }
+        if let Some(b) = get("sf:bold").and_then(num) {
+            rp.bold = Some(b != 0.0 || rp.bold == Some(true));
+        }
+        if let Some(i) = get("sf:italic").and_then(num) {
+            rp.italic = Some(i != 0.0 || rp.italic == Some(true));
+        }
+        let size = get("sf:fontSize")
+            .and_then(num)
+            .unwrap_or(24.0)
+            .clamp(1.0, 4000.0);
+        rp.size = Some((size * 100.0).round() as u32);
+        rp.color = Some(
+            get("sf:fontColor")
+                .filter(|v| v.name == "sf:color")
+                .and_then(color)
+                .unwrap_or(Color::rgb(0)),
+        );
+        rp.baseline = match get("sf:superscript").and_then(num) {
+            Some(1.0) => Some(30_000),
+            Some(2.0) => Some(-25_000),
+            _ => None,
+        };
+        rp.underline = get("sf:underline").and_then(num).map(|u| {
+            if u == 0.0 {
+                "none"
+            } else if u == 2.0 {
+                "dbl"
+            } else {
+                "sng"
+            }
+        });
+        rp.strike = get("sf:strikethru")
+            .and_then(num)
+            .map(|u| if u == 0.0 { "noStrike" } else { "sngStrike" });
+        rp.caps = match get("sf:capitalization").and_then(num) {
+            Some(1.0) => Some("all"),
+            Some(2.0) => Some("small"),
+            _ => None,
+        };
+        rp.shadow = get("sf:textShadow").and_then(shadow);
+        rp
+    }
+
+    fn para_props(&self, para: Option<Sty<'a>>, level: u32, color: Option<Color>) -> ParaProps {
+        let n = |name: &str| self.prop_num(para, name);
+        let pts = |v: f64| (v.clamp(-10_000.0, 10_000.0) * PT).round() as Emu;
+        let mut pp = ParaProps {
+            level: level.min(8) as u8,
+            align: n("sf:alignment").map(|a| match a as i32 {
+                1 => "r",
+                2 => "ctr",
+                3 => "just",
+                _ => "l",
+            }),
+            margin: n("sf:leftIndent").map(pts),
+            indent: n("sf:firstLineIndent").map(pts),
+            space_after: n("sf:spaceAfter").map(|v| Spacing::Pts((v * 100.0).round() as i32)),
+            space_before: n("sf:spaceBefore").map(|v| Spacing::Pts((v * 100.0).round() as i32)),
+            default_tab: n("sf:defaultTabStops").filter(|&v| v > 0.0).map(pts),
+            bullet: Some(Bullet::None),
+            ..ParaProps::default()
+        };
+        let list = self.prop_style(para, "sf:listStyle");
+        if level > 0 {
+            let lv = level as usize;
+            let entry = |name: &str| -> Option<&'a Node> {
+                let (arr, _) = self.prop(list, name)?;
+                arr.nodes().nth(lv).map(|e| self.deref(e, NONE).0)
+            };
+            let bullet = entry("sf:listLabelTypes").and_then(|t| label(t, color));
+            if let Some(b) = bullet {
+                let label_at = entry("sf:listLabelIndents").and_then(num).unwrap_or(0.0);
+                let text_at = entry("sf:listTextIndents").and_then(num).unwrap_or(20.0);
+                pp.bullet = Some(b);
+                pp.margin = Some(pts(label_at + text_at) + pp.margin.unwrap_or(0));
+                pp.indent = Some(pts(-text_at));
+            }
+        }
+        pp
+    }
+}
+
+/// A list label type (`sf:list-label-typeinfo`) as a bullet.
+fn label(t: &Node, color: Option<Color>) -> Option<Bullet> {
+    if t.attr("sf:type") != Some("text") {
+        return None;
+    }
+    let l = t.child("sf:text-label")?;
+    let format = l.attr("sf:format").unwrap_or("\u{2022}");
+    match l.attr("sf:type") {
+        Some("bullet") | None => Some(Bullet::Char {
+            ch: format.chars().next().unwrap_or('\u{2022}'),
+            font: None,
+            color,
+            size: None,
+        }),
+        Some(kind) => {
+            let scheme = match kind {
+                "upper-roman" | "roman-upper" => "romanUcPeriod",
+                "lower-roman" | "roman-lower" => "romanLcPeriod",
+                "upper-alpha" | "alpha-upper" => "alphaUcPeriod",
+                "lower-alpha" | "alpha-lower" => "alphaLcPeriod",
+                _ => "arabicPeriod",
+            };
+            Some(Bullet::AutoNum {
+                scheme,
+                start: 1,
+                font: None,
+                color,
+                size: None,
+            })
+        }
+    }
+}
+
+fn title_case(s: &str) -> String {
+    let mut out = String::with_capacity(s.len());
+    let mut start = true;
+    for c in s.chars() {
+        if start && c.is_alphabetic() {
+            out.extend(c.to_uppercase());
+        } else {
+            out.push(c);
+        }
+        start = !c.is_alphanumeric() && c != '\'';
+    }
+    out
+}
diff --git a/crates/exav-render/src/formats/office/slides/keynote/apxl1.rs b/crates/exav-render/src/formats/office/slides/keynote/apxl1.rs
new file mode 100644
index 00000000..2fbea2c7
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/apxl1.rs
@@ -0,0 +1,914 @@
+//! Keynote 1 documents (2003): one XML file, `presentation.apxl`, whose
+//! schema Apple published in technical notes TN2067 and TN2073 (the APXL
+//! schema), with the pictures beside it. Read here: the theme's slide size
+//! and prototype objects (the defaults of shapes, lines, pictures and text
+//! boxes), the master slides (placeholders, objects, background, bullet
+//! prototypes) and the slides (objects, bullets, background).
+//!
+//! Colours are "r g b" (0 to 1), "r g b a", or "g" followed by a grey
+//! level. Transformations are "m11 m12 m21 m22 tx ty". Objects are drawn
+//! bottom to top in document order. The first bullet of a slide, at level
+//! 0, is its title; the others fill the body, one paragraph each.
+
+use super::apxl::Pkg;
+use super::text::ps_font;
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+use std::collections::HashMap;
+
+const PT: f64 = 12700.0;
+
+struct Reader<'a> {
+    pkg: Pkg<'a>,
+    media: HashMap<String, Option<usize>>,
+    failed: Option<Error>,
+    pending: u64,
+    p: Presentation,
+    /// The theme's prototype object of each kind.
+    protos: HashMap<&'static str, &'a Node>,
+}
+
+pub(crate) fn read<'a>(root: &'a Node, pkg: Pkg<'a>, budget: &mut Budget) -> Result<Presentation> {
+    if root.name != "presentation" {
+        return Err(Error::NotFormat("not a Keynote document".into()));
+    }
+    let Some(theme) = root.child("theme") else {
+        return Err(Error::NotFormat("no theme".into()));
+    };
+    let mut r = Reader {
+        pkg,
+        media: HashMap::new(),
+        failed: None,
+        pending: 0,
+        p: Presentation::default(),
+        protos: HashMap::new(),
+    };
+    let size = theme.attr("slide-size").map(nums).unwrap_or_default();
+    let (w, h) = (
+        size.first().copied().unwrap_or(1024.0),
+        size.get(1).copied().unwrap_or(768.0),
+    );
+    r.p.width = (w.clamp(16.0, 20_000.0) * PT).round() as Emu;
+    r.p.height = (h.clamp(16.0, 20_000.0) * PT).round() as Emu;
+    if let Some(d) = theme.child("prototype-drawables") {
+        for n in d.nodes() {
+            let kind = match n.name.as_str() {
+                "shape" => "shape",
+                "line" => "line",
+                "image" => "image",
+                "textbox" => "textbox",
+                _ => continue,
+            };
+            r.protos.entry(kind).or_insert(n);
+        }
+    }
+    let mut masters: HashMap<&str, (usize, &Node)> = HashMap::new();
+    if let Some(list) = theme.child("master-slides") {
+        for m in list.all("master-slide").take(4096) {
+            let id = m.attr("id").unwrap_or("");
+            let mi = r.master(m, budget)?;
+            masters.entry(id).or_insert((mi, m));
+        }
+    }
+    let Some(list) = root.child("slide-list") else {
+        return Err(Error::NotFormat("no slides".into()));
+    };
+    let mut n = 0usize;
+    for s in list.all("slide") {
+        budget.slide(n)?;
+        n += 1;
+        r.p.total_slides = n;
+        if !budget.wants(n - 1) {
+            continue;
+        }
+        let (mi, master) = s
+            .attr("master-slide-id")
+            .and_then(|id| masters.get(id).copied())
+            .unwrap_or((0, s));
+        let slide = r.slide(s, mi, master, budget)?;
+        r.p.slides.push(slide);
+        if let Some(e) = r.failed.take() {
+            return Err(e);
+        }
+    }
+    if r.p.masters.is_empty() {
+        r.p.masters.push(Master::default());
+    }
+    Ok(r.p)
+}
+
+fn nums(s: &str) -> Vec<f64> {
+    s.split(|c: char| c.is_whitespace() || c == ',')
+        .filter_map(|t| t.parse::<f64>().ok())
+        .filter(|v| v.is_finite())
+        .collect()
+}
+
+fn channel(v: f64) -> u32 {
+    (v.clamp(0.0, 1.0) * 255.0).round() as u32
+}
+
+/// A colour attribute.
+fn color(s: &str) -> Option<Color> {
+    let s = s.trim();
+    if let Some(g) = s.strip_prefix('g') {
+        let v = channel(g.trim().parse::<f64>().ok()?);
+        return Some(Color::rgb(v << 16 | v << 8 | v));
+    }
+    let v = nums(s);
+    match v.as_slice() {
+        [r, g, b, rest @ ..] => {
+            let a = rest.first().copied().unwrap_or(1.0).clamp(0.0, 1.0);
+            Some(Color {
+                rgb: channel(*r) << 16 | channel(*g) << 8 | channel(*b),
+                alpha: (a < 1.0).then(|| (a * 100_000.0).round() as u32),
+            })
+        }
+        [g] => {
+            let v = channel(*g);
+            Some(Color::rgb(v << 16 | v << 8 | v))
+        }
+        _ => None,
+    }
+}
+
+fn with_opacity(mut c: Color, o: Option<f64>) -> Color {
+    if let Some(o) = o.filter(|&o| o < 1.0) {
+        let a = f64::from(c.alpha.unwrap_or(100_000)) * o.clamp(0.0, 1.0);
+        c.alpha = Some(a.round() as u32);
+    }
+    c
+}
+
+/// The attribute of `n`, else of its prototype.
+fn attr<'n>(n: &'n Node, proto: Option<&'n Node>, a: &str) -> Option<&'n str> {
+    n.attr(a).or_else(|| proto.and_then(|p| p.attr(a)))
+}
+
+/// The style element `name` of `n`, else of its prototype.
+fn style<'n>(n: &'n Node, proto: Option<&'n Node>, name: &str) -> Option<&'n Node> {
+    n.child("styles")
+        .and_then(|s| s.child(name))
+        .or_else(|| proto?.child("styles")?.child(name))
+}
+
+/// Path commands `M`, `L`, `C`, `Z` as absolute commands.
+enum Seg {
+    Move(f64, f64),
+    Line(f64, f64),
+    Cubic([f64; 6]),
+    Close,
+}
+
+fn parse_path(d: &str) -> Option<Vec<Seg>> {
+    let toks: Vec<&str> = d.split_ascii_whitespace().take(1 << 16).collect();
+    let mut out = vec![];
+    let mut i = 0;
+    let take = |i: usize, n: usize| -> Option<Vec<f64>> {
+        toks.get(i + 1..i + 1 + n)?
+            .iter()
+            .map(|t| t.parse::<f64>().ok().filter(|v| v.is_finite()))
+            .collect()
+    };
+    while i < toks.len() {
+        match toks[i] {
+            "M" => {
+                let v = take(i, 2)?;
+                out.push(Seg::Move(v[0], v[1]));
+                i += 3;
+            }
+            "L" => {
+                let v = take(i, 2)?;
+                out.push(Seg::Line(v[0], v[1]));
+                i += 3;
+            }
+            "C" => {
+                let v = take(i, 6)?;
+                out.push(Seg::Cubic([v[0], v[1], v[2], v[3], v[4], v[5]]));
+                i += 7;
+            }
+            "Z" => {
+                out.push(Seg::Close);
+                i += 1;
+            }
+            _ => return None,
+        }
+    }
+    Some(out)
+}
+
+/// The bounds of a path, curves included: (min x, min y, max x, max y).
+fn bounds(segs: &[Seg]) -> Option<(f64, f64, f64, f64)> {
+    let mut b: Option<(f64, f64, f64, f64)> = None;
+    let mut add = |x: f64, y: f64| {
+        b = Some(match b {
+            None => (x, y, x, y),
+            Some((a, c, d, e)) => (a.min(x), c.min(y), d.max(x), e.max(y)),
+        });
+    };
+    let mut cur = (0.0, 0.0);
+    for s in segs {
+        match s {
+            Seg::Move(x, y) | Seg::Line(x, y) => {
+                add(*x, *y);
+                cur = (*x, *y);
+            }
+            Seg::Cubic(c) => {
+                add(c[4], c[5]);
+                // The extremes between the end points: roots of the derivative.
+                for axis in 0..2 {
+                    let p0 = if axis == 0 { cur.0 } else { cur.1 };
+                    let (p1, p2, p3) = (c[axis], c[2 + axis], c[4 + axis]);
+                    let a = -p0 + 3.0 * p1 - 3.0 * p2 + p3;
+                    let bq = 2.0 * (p0 - 2.0 * p1 + p2);
+                    let cq = p1 - p0;
+                    let mut ts = vec![];
+                    if a.abs() < 1e-9 {
+                        if bq.abs() > 1e-9 {
+                            ts.push(-cq / bq);
+                        }
+                    } else {
+                        let disc = bq * bq - 4.0 * a * cq;
+                        if disc >= 0.0 {
+                            let sq = disc.sqrt();
+                            ts.push((-bq + sq) / (2.0 * a));
+                            ts.push((-bq - sq) / (2.0 * a));
+                        }
+                    }
+                    for t in ts.into_iter().filter(|t| *t > 0.0 && *t < 1.0) {
+                        let u = 1.0 - t;
+                        let v = u * u * u * p0
+                            + 3.0 * u * u * t * p1
+                            + 3.0 * u * t * t * p2
+                            + t * t * t * p3;
+                        if axis == 0 {
+                            add(v, cur.1);
+                        } else {
+                            add(cur.0, v);
+                        }
+                    }
+                }
+                cur = (c[4], c[5]);
+            }
+            Seg::Close => {}
+        }
+    }
+    b
+}
+
+/// The box of an object whose local box is (x0, y0, w, h) under the
+/// transformation `m`, as a position, size and rotation.
+fn place(m: &[f64], x0: f64, y0: f64, w: f64, h: f64) -> Xfrm {
+    let m = if m.len() == 6 {
+        m
+    } else {
+        &[1.0, 0.0, 0.0, 1.0, 0.0, 0.0]
+    };
+    let (cx, cy) = (x0 + w / 2.0, y0 + h / 2.0);
+    let center = (m[0] * cx + m[2] * cy + m[4], m[1] * cx + m[3] * cy + m[5]);
+    let sx = m[0].hypot(m[1]);
+    let sy = m[2].hypot(m[3]);
+    let (bw, bh) = (w * sx, h * sy);
+    let clamp = |v: f64| v.clamp(-1e6, 1e6);
+    Xfrm {
+        x: (clamp(center.0 - bw / 2.0) * PT).round() as Emu,
+        y: (clamp(center.1 - bh / 2.0) * PT).round() as Emu,
+        w: (clamp(bw) * PT).round() as Emu,
+        h: (clamp(bh) * PT).round() as Emu,
+        rot: m[1].atan2(m[0]).to_degrees().rem_euclid(360.0),
+        flip_h: m[0] * m[3] - m[1] * m[2] < 0.0,
+        flip_v: false,
+    }
+}
+
+impl<'a> Reader<'a> {
+    fn image(&mut self, name: &str) -> Option<usize> {
+        if let Some(&m) = self.media.get(name) {
+            return m;
+        }
+        let bytes = match self.pkg.get(name) {
+            Ok(b) => b,
+            Err(e) => {
+                self.failed.get_or_insert(e);
+                None
+            }
+        };
+        let m = bytes.and_then(|d| {
+            let ext = crate::formats::office::slides::package::image_ext(&d)?;
+            self.pending += d.len() as u64;
+            Some(self.p.add_media(ext, d))
+        });
+        self.media.insert(name.to_string(), m);
+        m
+    }
+
+    /// A `fill-style` or `background-fill-style`.
+    fn fill(&mut self, f: &Node) -> Fill {
+        match f.attr("fill-type") {
+            Some("color") => f
+                .attr("fill-color")
+                .and_then(color)
+                .map_or(Fill::None, Fill::Solid),
+            Some("gradient") => {
+                let g = f.child("gradient");
+                let c = |a: &str| g.and_then(|g| g.attr(a)).and_then(color);
+                let (Some(s), Some(e)) = (c("start-color"), c("end-color")) else {
+                    return Fill::None;
+                };
+                let angle = g
+                    .and_then(|g| g.attr("gradient-angle"))
+                    .and_then(|a| a.trim().parse::<f64>().ok())
+                    .unwrap_or(270.0);
+                Fill::Gradient(Gradient {
+                    stops: vec![(0, s), (100_000, e)],
+                    kind: GradientKind::Linear((-angle).rem_euclid(360.0)),
+                })
+            }
+            Some("image") => {
+                let tile = f.attr("image-scale") == Some("tile");
+                match f.attr("image-data").and_then(|n| self.image(n)) {
+                    Some(media) => Fill::Picture { media, tile },
+                    None => Fill::None,
+                }
+            }
+            _ => Fill::None,
+        }
+    }
+
+    fn master(&mut self, m: &'a Node, budget: &mut Budget) -> Result<usize> {
+        let mut out = Master {
+            name: m.attr("name").unwrap_or("Master").to_string(),
+            layouts: vec![Layout {
+                name: "Blank".into(),
+                kind: "blank",
+                show_master_shapes: true,
+                ..Layout::default()
+            }],
+            ..Master::default()
+        };
+        out.background = Some(
+            m.child("background-fill-style")
+                .map(|f| self.fill(f))
+                .filter(|f| *f != Fill::None)
+                .unwrap_or(Fill::Solid(Color::rgb(0xFFFFFF))),
+        );
+        if let Some(d) = m.child("drawables") {
+            self.drawables(d, None, None, &mut out.shapes, budget)?;
+        }
+        budget.alloc(std::mem::take(&mut self.pending))?;
+        let i = self.p.masters.len();
+        self.p.masters.push(out);
+        Ok(i)
+    }
+
+    fn slide(
+        &mut self,
+        s: &'a Node,
+        mi: usize,
+        master: &'a Node,
+        budget: &mut Budget,
+    ) -> Result<Slide> {
+        let background = s
+            .child("background-fill-style")
+            .map(|f| self.fill(f))
+            .filter(|f| *f != Fill::None);
+        let mut shapes = vec![];
+        if let Some(d) = s.child("drawables") {
+            self.drawables(d, Some(s), Some(master), &mut shapes, budget)?;
+        }
+        budget.alloc(std::mem::take(&mut self.pending))?;
+        Ok(Slide {
+            name: None,
+            master: mi,
+            layout: 0,
+            background,
+            shapes,
+            hidden: s.attr("hidden") == Some("true"),
+            show_master_shapes: true,
+        })
+    }
+
+    /// The objects of a `drawables` list. In a slide, the title and body
+    /// placeholders get the text of the slide's bullets, placed as the
+    /// master's placeholders are.
+    fn drawables(
+        &mut self,
+        list: &'a Node,
+        slide: Option<&'a Node>,
+        master: Option<&'a Node>,
+        out: &mut Vec<Shape>,
+        budget: &mut Budget,
+    ) -> Result<()> {
+        for n in list.nodes().take(10_000) {
+            let shape = match n.name.as_str() {
+                "title" | "body" => match slide {
+                    Some(s) => self.placeholder(n, s, master, budget)?,
+                    None => None,
+                },
+                "shape" => {
+                    budget.shape(0)?;
+                    self.shape(n)
+                }
+                "line" => {
+                    budget.shape(0)?;
+                    self.line(n)
+                }
+                "image" => {
+                    budget.shape(0)?;
+                    self.picture(n)
+                }
+                "textbox" => {
+                    budget.shape(0)?;
+                    self.textbox(n, budget)?
+                }
+                "plugin" => {
+                    self.p.warn("tables and charts");
+                    None
+                }
+                _ => None,
+            };
+            out.extend(shape);
+            budget.alloc(std::mem::take(&mut self.pending))?;
+        }
+        Ok(())
+    }
+
+    /// Fill, line and shadow of an object, with its prototype's defaults.
+    fn sp_props(&mut self, n: &'a Node, proto: Option<&'a Node>) -> Sp {
+        let opacity = attr(n, proto, "opacity").and_then(|o| o.trim().parse::<f64>().ok());
+        let fill = match style(n, proto, "fill-style") {
+            Some(f) => match self.fill(f) {
+                Fill::Solid(c) => Fill::Solid(with_opacity(c, opacity)),
+                f => f,
+            },
+            None => Fill::None,
+        };
+        let dash = style(n, proto, "dash-style").and_then(|d| d.attr("pattern"));
+        let line = match (dash, attr(n, proto, "stroke-color").and_then(color)) {
+            (Some("none"), _) | (None, None) | (_, None) => Line::default(),
+            (dash, Some(c)) => Line {
+                fill: Fill::Solid(with_opacity(c, opacity)),
+                width: (attr(n, proto, "stroke-width")
+                    .and_then(|w| w.trim().parse::<f64>().ok())
+                    .unwrap_or(1.0)
+                    .clamp(0.0, 1000.0)
+                    * PT)
+                    .round() as Emu,
+                dash: dash.filter(|d| *d != "solid").map(|_| "dash"),
+                ..Line::default()
+            },
+        };
+        let shadow = style(n, proto, "shadow-style").and_then(|s| {
+            let o = s
+                .attr("opacity")
+                .and_then(|o| o.trim().parse::<f64>().ok())
+                .unwrap_or(0.0);
+            if o <= 0.0 {
+                return None;
+            }
+            let f = |a: &str, d: f64| {
+                s.attr(a)
+                    .and_then(|v| v.trim().parse::<f64>().ok())
+                    .unwrap_or(d)
+            };
+            let c = s.attr("color").and_then(color).unwrap_or(Color::rgb(0));
+            Some(Shadow {
+                color: with_opacity(c, Some(o)),
+                blur: (f("radius", 0.0).clamp(0.0, 1000.0) * PT).round() as Emu,
+                dist: (f("offset", 0.0).abs().min(1000.0) * PT).round() as Emu,
+                // Counterclockwise degrees, to DrawingML's clockwise.
+                dir: (-f("angle", 315.0)).rem_euclid(360.0),
+            })
+        });
+        Sp {
+            fill,
+            line,
+            shadow,
+            ..Sp::default()
+        }
+    }
+
+    fn shape(&mut self, n: &'a Node) -> Option<Shape> {
+        let proto = self.protos.get("shape").copied();
+        let segs = parse_path(n.attr("path")?)?;
+        let (x0, y0, x1, y1) = bounds(&segs)?;
+        let (w, h) = ((x1 - x0).max(0.01), (y1 - y0).max(0.01));
+        let m = nums(n.attr("transformation").unwrap_or(""));
+        let xf = place(&m, x0, y0, w, h);
+        let s = 100.0;
+        let p = |x: f64, y: f64| (((x - x0) * s).round() as i64, ((y - y0) * s).round() as i64);
+        let mut path = Path {
+            w: (w * s).round().max(1.0) as i64,
+            h: (h * s).round().max(1.0) as i64,
+            fill: true,
+            stroke: true,
+            cmds: vec![],
+        };
+        for seg in &segs {
+            path.cmds.push(match seg {
+                Seg::Move(x, y) => {
+                    let q = p(*x, *y);
+                    PathCmd::Move(q.0, q.1)
+                }
+                Seg::Line(x, y) => {
+                    let q = p(*x, *y);
+                    PathCmd::Line(q.0, q.1)
+                }
+                Seg::Cubic(c) => {
+                    let (a, b, d) = (p(c[0], c[1]), p(c[2], c[3]), p(c[4], c[5]));
+                    PathCmd::Cubic(a.0, a.1, b.0, b.1, d.0, d.1)
+                }
+                Seg::Close => PathCmd::Close,
+            });
+        }
+        if matches!(path.cmds.last(), Some(PathCmd::Move(..))) {
+            path.cmds.pop();
+        }
+        let mut sp = self.sp_props(n, proto);
+        sp.geom = Geometry::Custom(vec![path]);
+        Some(Shape::new(ShapeKind::Sp(Box::new(sp)), xf))
+    }
+
+    fn line(&mut self, n: &'a Node) -> Option<Shape> {
+        let proto = self.protos.get("line").copied();
+        let t = nums(n.attr("tail")?);
+        let h = nums(n.attr("head")?);
+        let (tx, ty, hx, hy) = (*t.first()?, *t.get(1)?, *h.first()?, *h.get(1)?);
+        let (x0, y0) = (tx.min(hx), ty.min(hy));
+        let (w, hh) = ((tx - hx).abs(), (ty - hy).abs());
+        let s = 100.0;
+        let p = |x: f64, y: f64| (((x - x0) * s).round() as i64, ((y - y0) * s).round() as i64);
+        let (a, b) = (p(tx, ty), p(hx, hy));
+        let path = Path {
+            w: (w * s).round().max(1.0) as i64,
+            h: (hh * s).round().max(1.0) as i64,
+            fill: false,
+            stroke: true,
+            cmds: vec![PathCmd::Move(a.0, a.1), PathCmd::Line(b.0, b.1)],
+        };
+        let xf = place(&[1.0, 0.0, 0.0, 1.0, 0.0, 0.0], x0, y0, w, hh);
+        let mut sp = self.sp_props(n, proto);
+        sp.fill = Fill::None;
+        sp.geom = Geometry::Custom(vec![path]);
+        Some(Shape::new(ShapeKind::Sp(Box::new(sp)), xf))
+    }
+
+    fn picture(&mut self, n: &'a Node) -> Option<Shape> {
+        let proto = self.protos.get("image").copied();
+        let media = self.image(n.attr("image-data")?)?;
+        let size = nums(n.attr("natural-size")?);
+        let (w, h) = (*size.first()?, *size.get(1)?);
+        let m = nums(attr(n, proto, "transformation").unwrap_or(""));
+        let xf = place(&m, 0.0, 0.0, w.max(1.0), h.max(1.0));
+        let sp = self.sp_props(n, proto);
+        Some(Shape::new(
+            ShapeKind::Pic(Box::new(Pic {
+                media,
+                crop: [0; 4],
+                geom: Geometry::default(),
+                line: sp.line,
+                shadow: sp.shadow,
+                alpha: None,
+            })),
+            xf,
+        ))
+    }
+
+    fn textbox(&mut self, n: &'a Node, budget: &mut Budget) -> Result<Option<Shape>> {
+        let proto = self.protos.get("textbox").copied();
+        let Some(content) = n.child("content") else {
+            return Ok(None);
+        };
+        let size = nums(n.attr("size").unwrap_or(""));
+        let m = nums(attr(n, proto, "transformation").unwrap_or(""));
+        let w = size.first().copied().unwrap_or(200.0).max(1.0);
+        let h = size.get(1).copied().unwrap_or(50.0).max(1.0);
+        let xf = place(&m, 0.0, 0.0, w, h);
+        let defaults = proto.and_then(|p| p.child("content"));
+        let Some(text) = self.text(&[(content, 0)], defaults, Marker::default(), budget)? else {
+            return Ok(None);
+        };
+        let mut sp = self.sp_props(n, proto);
+        sp.text = Some(text);
+        Ok(Some(Shape::new(ShapeKind::Sp(Box::new(sp)), xf)))
+    }
+
+    /// A title or body placeholder with the slide's bullets as its text.
+    fn placeholder(
+        &mut self,
+        ph: &'a Node,
+        slide: &'a Node,
+        master: Option<&'a Node>,
+        budget: &mut Budget,
+    ) -> Result<Option<Shape>> {
+        let title = ph.name == "title";
+        if ph.attr("visibility") == Some("hidden") {
+            return Ok(None);
+        }
+        // The master's placeholder places it unless the slide's does.
+        let from_master = master
+            .and_then(|m| m.child("drawables"))
+            .and_then(|d| d.child(&ph.name));
+        let geo = |a: &str| ph.attr(a).or_else(|| from_master.and_then(|m| m.attr(a)));
+        let (Some(size), Some(loc)) = (geo("size").map(nums), geo("location").map(nums)) else {
+            return Ok(None);
+        };
+        let (Some(&w), Some(&h), Some(&x), Some(&y)) =
+            (size.first(), size.get(1), loc.first(), loc.get(1))
+        else {
+            return Ok(None);
+        };
+        let Some(bullets) = slide.child("bullets") else {
+            return Ok(None);
+        };
+        let protos = master.and_then(|m| m.child("prototype-bullets"));
+        let indents = geo("bullet-indentation").map(nums).unwrap_or_default();
+        let mut frames: Vec<(&Node, u32, &Node)> = vec![];
+        for b in bullets.all("bullet").take(1 << 16) {
+            let level = b
+                .attr("level")
+                .and_then(|l| l.trim().parse::<u32>().ok())
+                .unwrap_or(0);
+            if (level == 0) != title {
+                continue;
+            }
+            if let Some(c) = b.child("content") {
+                frames.push((c, level, b));
+            }
+        }
+        if frames.is_empty() {
+            return Ok(None);
+        }
+        let mut valign = geo("vertical-alignment").unwrap_or("top");
+        if valign == "tracks-master" {
+            valign = from_master
+                .and_then(|m| m.attr("vertical-alignment"))
+                .unwrap_or("top");
+        }
+        let mut body = None;
+        for &(frame, level, own) in &frames {
+            let proto = protos.and_then(|p| {
+                p.all("bullet").find(|p| {
+                    p.attr("level").and_then(|l| l.trim().parse::<u32>().ok()) == Some(level)
+                })
+            });
+            let one = self.text(
+                &[(frame, level)],
+                proto.and_then(|p| p.child("content")),
+                Marker {
+                    own: Some(own),
+                    proto,
+                    indent: indents.get(level as usize).copied(),
+                },
+                budget,
+            )?;
+            match (&mut body, one) {
+                (None, one) => body = one,
+                (Some(TextBody { paras, .. }), Some(more)) => paras.extend(more.paras),
+                _ => {}
+            }
+        }
+        let Some(mut text) = body else {
+            return Ok(None);
+        };
+        text.body.anchor = match valign {
+            "middle" => "ctr",
+            "bottom" => "b",
+            _ => "t",
+        };
+        let xf = place(&[1.0, 0.0, 0.0, 1.0, 0.0, 0.0], x, y, w, h);
+        let sp = Sp {
+            text: Some(text),
+            ..Sp::default()
+        };
+        let mut s = Shape::new(ShapeKind::Sp(Box::new(sp)), xf);
+        s.placeholder = Some(if title {
+            Placeholder {
+                kind: "title",
+                idx: None,
+            }
+        } else {
+            Placeholder {
+                kind: "body",
+                idx: Some(1),
+            }
+        });
+        Ok(Some(s))
+    }
+
+    /// The `content` elements as a text body, one paragraph per line;
+    /// `defaults` gives the attributes a content does not set, `bullet` the
+    /// prototype bullet of its level.
+    fn text(
+        &mut self,
+        frames: &[(&'a Node, u32)],
+        defaults: Option<&'a Node>,
+        marker: Marker<'a>,
+        budget: &mut Budget,
+    ) -> Result<Option<TextBody>> {
+        use crate::formats::office::common::xml::Child;
+        let mut paras = vec![];
+        for &(c, level) in frames {
+            let chain: Vec<&Node> = [Some(c), defaults].into_iter().flatten().collect();
+            let bp = self.para_props(&chain, &marker, level);
+            let base = self.run_props(&chain);
+            let mut cur = Paragraph {
+                props: bp.clone(),
+                runs: vec![],
+                end: base.clone(),
+            };
+            // Text, and spans that change the character attributes; a new
+            // line starts a paragraph.
+            let mut pieces: Vec<(String, RunProps)> = vec![];
+            for k in &c.children {
+                match k {
+                    Child::Text(t) => pieces.push((t.clone(), base.clone())),
+                    Child::Node(n) if n.name == "span" => {
+                        let mut sc = vec![n];
+                        sc.extend(&chain);
+                        pieces.push((flat_text(n), self.run_props(&sc)));
+                    }
+                    _ => {}
+                }
+            }
+            budget.alloc(pieces.iter().map(|p| p.0.len() as u64).sum::<u64>() * 16)?;
+            for (text, rp) in pieces {
+                let mut lines = text.split('\n');
+                if let Some(first) = lines.next() {
+                    push_text(&mut cur.runs, first, &rp);
+                }
+                for line in lines {
+                    paras.push(std::mem::replace(
+                        &mut cur,
+                        Paragraph {
+                            props: bp.clone(),
+                            runs: vec![],
+                            end: base.clone(),
+                        },
+                    ));
+                    push_text(&mut cur.runs, line, &rp);
+                }
+            }
+            paras.push(cur);
+        }
+        if paras.iter().all(|p| p.runs.is_empty()) {
+            return Ok(None);
+        }
+        Ok(Some(TextBody {
+            body: BodyProps::default(),
+            paras,
+            levels: ListStyle::default(),
+        }))
+    }
+
+    /// Run properties from attributes: the first node of `chain` that has
+    /// one gives it.
+    fn run_props(&self, chain: &[&Node]) -> RunProps {
+        let a = |n: &str| chain.iter().find_map(|c| c.attr(n));
+        let mut rp = RunProps::default();
+        if let Some(name) = a("font-name") {
+            let (fam, b, i) = ps_font(name);
+            rp.font = Some(fam);
+            if b {
+                rp.bold = Some(true);
+            }
+            if i {
+                rp.italic = Some(true);
+            }
+        }
+        let size = a("font-size")
+            .and_then(|s| s.trim().parse::<f64>().ok())
+            .unwrap_or(24.0)
+            .clamp(1.0, 4000.0);
+        rp.size = Some((size * 100.0).round() as u32);
+        rp.color = Some(a("font-color").and_then(color).unwrap_or(Color::rgb(0)));
+        rp
+    }
+
+    fn para_props(&self, chain: &[&Node], marker: &Marker, level: u32) -> ParaProps {
+        let a = |n: &str| chain.iter().find_map(|c| c.attr(n));
+        let pts = |v: f64| (v.clamp(-10_000.0, 10_000.0) * PT).round() as Emu;
+        let f = |n: &str| a(n).and_then(|v| v.trim().parse::<f64>().ok());
+        let mut pp = ParaProps {
+            level: level.min(8) as u8,
+            align: a("paragraph-alignment").map(|v| match v {
+                "right" => "r",
+                "center" => "ctr",
+                "justify" | "justified" => "just",
+                _ => "l",
+            }),
+            margin: f("paragraph-head-indent").map(pts),
+            indent: f("paragraph-first-line-indent")
+                .map(|fl| pts(fl - f("paragraph-head-indent").unwrap_or(0.0))),
+            bullet: Some(Bullet::None),
+            ..ParaProps::default()
+        };
+        if level == 0 {
+            return pp;
+        }
+        // The slide's bullet says how it is marked, "inherited" meaning as
+        // the master's prototype for its level.
+        let kind = match marker.own.and_then(|b| b.attr("marker-type")) {
+            Some(k) if k != "inherited" => Some(k),
+            _ => marker.proto.and_then(|b| b.attr("marker-type")),
+        };
+        let spec = marker
+            .own
+            .and_then(|b| b.child("character-bullet-style"))
+            .or_else(|| marker.proto.and_then(|b| b.child("character-bullet-style")));
+        let glyph = spec.and_then(|s| s.child("bullet-characters"));
+        let ch = glyph
+            .map(|c| c.own_text())
+            .and_then(|t| t.trim().chars().next())
+            .unwrap_or('\u{2022}');
+        // The bullet's size is relative to the text's.
+        let size = spec
+            .and_then(|s| s.attr("size"))
+            .and_then(|s| s.trim().parse::<f64>().ok())
+            .zip(
+                glyph
+                    .and_then(|g| g.attr("font-size"))
+                    .and_then(|s| s.trim().parse::<f64>().ok()),
+            )
+            .zip(f("font-size"))
+            .map(|((rel, bs), fs)| {
+                ((rel * bs / fs.max(1.0)) * 100_000.0).clamp(25_000.0, 400_000.0) as u32
+            });
+        let color = glyph
+            .and_then(|g| g.attr("font-color"))
+            .and_then(color)
+            .or_else(|| a("font-color").and_then(color));
+        pp.space_before = marker
+            .own
+            .and_then(|b| b.attr("spacing"))
+            .or_else(|| marker.proto.and_then(|b| b.attr("spacing")))
+            .and_then(|s| s.trim().parse::<f64>().ok())
+            .filter(|s| *s > 0.0)
+            .map(|s| Spacing::Pts((s.min(1000.0) * 100.0).round() as i32));
+        pp.bullet = match kind {
+            Some("character" | "image") => Some(Bullet::Char {
+                ch,
+                font: None,
+                color,
+                size,
+            }),
+            Some("sequence") => Some(Bullet::AutoNum {
+                scheme: "arabicPeriod",
+                start: 1,
+                font: None,
+                color,
+                size,
+            }),
+            _ => Some(Bullet::None),
+        };
+        if pp.bullet != Some(Bullet::None) {
+            // The bullet is at the level's indentation plus the first line
+            // indent; the text follows it.
+            let at = marker.indent.unwrap_or(0.0) + f("paragraph-first-line-indent").unwrap_or(0.0);
+            pp.margin = Some(pts(at + 25.0));
+            pp.indent = Some(pts(-25.0));
+        }
+        pp
+    }
+}
+
+/// How a bullet is marked: the slide's own bullet, the master's prototype
+/// for its level and the level's indentation in the placeholder.
+#[derive(Default)]
+struct Marker<'a> {
+    own: Option<&'a Node>,
+    proto: Option<&'a Node>,
+    indent: Option<f64>,
+}
+
+fn push_text(runs: &mut Vec<Run>, text: &str, props: &RunProps) {
+    if text.is_empty() {
+        return;
+    }
+    match runs.last_mut() {
+        Some(Run {
+            kind: RunKind::Text(prev),
+            props: p,
+        }) if p == props => prev.push_str(text),
+        _ => runs.push(Run {
+            kind: RunKind::Text(text.to_string()),
+            props: props.clone(),
+        }),
+    }
+}
+
+/// The text of a `span`.
+fn flat_text(c: &Node) -> String {
+    use crate::formats::office::common::xml::Child;
+    let mut out = String::new();
+    for k in &c.children {
+        match k {
+            Child::Text(t) => out.push_str(t),
+            Child::Node(n) if n.name == "span" => out.push_str(&flat_text(n)),
+            _ => {}
+        }
+    }
+    out
+}
diff --git a/crates/exav-render/src/formats/office/slides/keynote/chart.rs b/crates/exav-render/src/formats/office/slides/keynote/chart.rs
new file mode 100644
index 00000000..1be9ea74
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/chart.rs
@@ -0,0 +1,249 @@
+//! Keynote charts (TSCH.ChartDrawableArchive) as DrawingML charts, through
+//! an ODF chart object holding the chart's data, which the sheets module
+//! converts. The chart's type and data are read; its
+//! colours, titles and axis settings are not, and the chart is drawn in
+//! the renderer's own style.
+//!
+//! TSCH.ChartDrawableArchive: drawable 1, chart (TSCH.ChartArchive, an
+//! extension) 10000. ChartArchive: chart_type 1 (TSCH.ChartType),
+//! series_direction 5 (1 by row, 2 by column), grid 7. ChartGridArchive:
+//! row_name 1, column_name 2, grid_row 3 (value 1: numeric_value 1).
+//! The numbers are those of the message definitions keynote-parser (MIT)
+//! extracted from the application.
+
+use super::Reader;
+use crate::formats::office::common::iwa::proto::Msg;
+use crate::formats::office::slides::error::Result;
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+
+/// Rows and columns of data a chart is converted from.
+const MAX_CELLS: usize = 1 << 16;
+
+/// The ODF chart class and options of a TSCH.ChartType: the class, whether
+/// bars lie down, whether series stack.
+fn class(chart_type: u64) -> (&'static str, bool, bool) {
+    match chart_type {
+        2 | 13 => ("chart:bar", true, false),
+        3 | 14 => ("chart:line", false, false),
+        4 | 15 => ("chart:area", false, false),
+        5 | 16 => ("chart:circle", false, false),
+        6 | 17 => ("chart:bar", false, true),
+        7 | 18 => ("chart:bar", true, true),
+        8 | 19 => ("chart:area", false, true),
+        9 | 23 => ("chart:scatter", false, false),
+        22 | 24 => ("chart:bubble", false, false),
+        25 | 26 => ("chart:ring", false, false),
+        27 => ("chart:radar", false, false),
+        21 => ("chart:bar", true, false),
+        _ => ("chart:bar", false, false),
+    }
+}
+
+fn esc(s: &str) -> String {
+    let mut out = String::with_capacity(s.len());
+    for c in s.chars() {
+        match c {
+            '&' => out.push_str("&amp;"),
+            '<' => out.push_str("&lt;"),
+            '>' => out.push_str("&gt;"),
+            '"' => out.push_str("&quot;"),
+            c if (c as u32) < 0x20 => {}
+            c => out.push(c),
+        }
+    }
+    out
+}
+
+/// The ODF chart object for a type and its data: `series` are columns of
+/// the table, `names` their names, `categories` the row labels.
+fn odf(
+    chart_type: u64,
+    names: &[String],
+    categories: &[String],
+    series: &[Vec<Option<f64>>],
+) -> String {
+    let (class, horizontal, stacked) = class(chart_type);
+    let rows = categories.len();
+    let cols = series.len();
+    let mut t = String::new();
+    t.push_str("<table:table-header-rows><table:table-row><table:table-cell office:value-type=\"string\"><text:p></text:p></table:table-cell>");
+    for n in names {
+        t.push_str(&format!(
+            "<table:table-cell office:value-type=\"string\"><text:p>{}</text:p></table:table-cell>",
+            esc(n)
+        ));
+    }
+    t.push_str("</table:table-row></table:table-header-rows><table:table-rows>");
+    for (r, cat) in categories.iter().enumerate() {
+        t.push_str(&format!(
+            "<table:table-row><table:table-cell office:value-type=\"string\"><text:p>{}</text:p></table:table-cell>",
+            esc(cat)
+        ));
+        for s in series {
+            match s.get(r).copied().flatten() {
+                Some(v) => t.push_str(&format!(
+                    "<table:table-cell office:value-type=\"float\" office:value=\"{v}\"><text:p>{v}</text:p></table:table-cell>"
+                )),
+                None => t.push_str("<table:table-cell/>"),
+            }
+        }
+        t.push_str("</table:table-row>");
+    }
+    t.push_str("</table:table-rows>");
+    let col_letter = |c: usize| {
+        let mut s = String::new();
+        let mut n = c + 1;
+        while n > 0 {
+            s.insert(0, (b'A' + ((n - 1) % 26) as u8) as char);
+            n = (n - 1) / 26;
+        }
+        s
+    };
+    let mut ser = String::new();
+    for c in 0..cols {
+        let l = col_letter(c + 1);
+        ser.push_str(&format!(
+            "<chart:series chart:values-cell-range-address=\"local-table.${l}$2:.${l}${}\" chart:label-cell-address=\"local-table.${l}$1\" chart:class=\"{class}\"/>",
+            rows + 1
+        ));
+    }
+    let last = col_letter(cols);
+    format!(
+        concat!(
+            r#"<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" "#,
+            r#"xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" "#,
+            r#"xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" "#,
+            r#"xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" "#,
+            r#"xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0">"#,
+            r#"<office:automatic-styles><style:style style:name="plot" style:family="chart">"#,
+            r#"<style:chart-properties chart:vertical="{v}" chart:stacked="{s}"/></style:style></office:automatic-styles>"#,
+            r#"<office:body><office:chart><chart:chart chart:class="{class}">"#,
+            r#"<chart:legend chart:legend-position="end"/>"#,
+            r#"<chart:plot-area chart:style-name="plot" table:cell-range-address="local-table.$A$1:.${last}${rows1}" chart:data-source-has-labels="both">"#,
+            r#"<chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="local-table.$A$2:.$A${rows1}"/></chart:axis>"#,
+            r#"<chart:axis chart:dimension="y" chart:name="primary-y"/>{ser}</chart:plot-area>"#,
+            r#"<table:table table:name="local-table">{t}</table:table></chart:chart></office:chart></office:body></office:document-content>"#
+        ),
+        v = horizontal,
+        s = stacked,
+        class = class,
+        last = last,
+        rows1 = rows + 1,
+        ser = ser,
+        t = t
+    )
+}
+
+/// A chart as a shape. `None` when its data is missing or cannot be
+/// converted.
+pub fn chart(r: &mut Reader, m: Msg, budget: &mut Budget) -> Result<Option<Shape>> {
+    let Some(d) = m.msg(1) else { return Ok(None) };
+    let Some(ch) = m.msg(10000) else {
+        return Ok(None);
+    };
+    let Some(grid) = ch.msg(7) else {
+        return Ok(None);
+    };
+    let by_row = ch.uint(5) != Some(2);
+    let row_names: Vec<String> = grid
+        .all(1)
+        .filter_map(|v| match v {
+            crate::formats::office::common::iwa::proto::Val::Bytes(b) => {
+                Some(String::from_utf8_lossy(b).into_owned())
+            }
+            _ => None,
+        })
+        .take(MAX_CELLS)
+        .collect();
+    let col_names: Vec<String> = grid
+        .all(2)
+        .filter_map(|v| match v {
+            crate::formats::office::common::iwa::proto::Val::Bytes(b) => {
+                Some(String::from_utf8_lossy(b).into_owned())
+            }
+            _ => None,
+        })
+        .take(MAX_CELLS)
+        .collect();
+    let values: Vec<Vec<Option<f64>>> = grid
+        .msgs(3)
+        .take(MAX_CELLS)
+        .map(|row| {
+            row.msgs(1)
+                .take(MAX_CELLS)
+                .map(|v| v.double(1).filter(|x| x.is_finite()))
+                .collect()
+        })
+        .collect();
+    let cells: usize = values.iter().map(Vec::len).sum();
+    if values.is_empty() || cells == 0 || cells > MAX_CELLS {
+        return Ok(None);
+    }
+    // The table's columns are the series: those of the grid when its rows
+    // are the series' categories (series by column), else its rows.
+    let width = values.iter().map(Vec::len).max().unwrap_or(0);
+    let (names, categories, series): (Vec<String>, Vec<String>, Vec<Vec<Option<f64>>>) = if by_row {
+        // Each row is a series; the columns are the categories.
+        let cats: Vec<String> = (0..width)
+            .map(|c| col_names.get(c).cloned().unwrap_or_default())
+            .collect();
+        let names = (0..values.len())
+            .map(|i| row_names.get(i).cloned().unwrap_or_default())
+            .collect();
+        (names, cats, values)
+    } else {
+        let cats: Vec<String> = (0..values.len())
+            .map(|i| row_names.get(i).cloned().unwrap_or_default())
+            .collect();
+        let names = (0..width)
+            .map(|c| col_names.get(c).cloned().unwrap_or_default())
+            .collect();
+        let series = (0..width)
+            .map(|c| {
+                values
+                    .iter()
+                    .map(|row| row.get(c).copied().flatten())
+                    .collect()
+            })
+            .collect();
+        (names, cats, series)
+    };
+    let (xf, _, _) = super::shapes::xfrm(d);
+    budget.shape(0)?;
+    let xml = odf(ch.uint(1).unwrap_or(1), &names, &categories, &series);
+    budget.alloc(xml.len() as u64 * 4)?;
+    match crate::formats::office::sheets::odf_chart_part(xml.as_bytes()) {
+        Some(part) => return Ok(Some(Shape::new(ShapeKind::Chart(part), xf))),
+        None => r.p.warn("charts that could not be converted"),
+    }
+    Ok(None)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn types_map_to_classes() {
+        assert_eq!(class(1), ("chart:bar", false, false));
+        assert_eq!(class(2), ("chart:bar", true, false));
+        assert_eq!(class(7), ("chart:bar", true, true));
+        assert_eq!(class(5), ("chart:circle", false, false));
+        assert_eq!(class(0), ("chart:bar", false, false));
+    }
+
+    #[test]
+    fn the_data_table_has_a_header_and_a_column_of_labels() {
+        let x = odf(
+            1,
+            &["A & B".into()],
+            &["Q1".into(), "Q2".into()],
+            &[vec![Some(1.5), None]],
+        );
+        assert!(x.contains("<text:p>A &amp; B</text:p>"));
+        assert!(x.contains(r#"office:value="1.5""#));
+        assert!(x.contains("local-table.$B$2:.$B$3"));
+        assert!(x.contains("<table:table-cell/>"));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/keynote/mod.rs b/crates/exav-render/src/formats/office/slides/keynote/mod.rs
new file mode 100644
index 00000000..d089d347
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/mod.rs
@@ -0,0 +1,608 @@
+//! Apple Keynote documents of Keynote 6 (2013) and later: a ZIP, or a
+//! package directory, of `Index/*.iwa` streams (in Keynote 6, inside a
+//! nested `Index.zip`) holding protocol buffer archives, and of `Data/`
+//! files for pictures. Messages are read by field number; the numbers used
+//! are written where they are read, after the message definitions
+//! keynote-parser (MIT, Peter Sobot) extracted from the application.
+//!
+//! KN.DocumentArchive (object 1): show 2. KN.ShowArchive: slideTree 3,
+//! size 4, slideNumbersVisible 6. KN.SlideTreeArchive: rootSlideNode 1,
+//! slides 2. KN.SlideNodeArchive: children 1, slide 2, isSkipped 4.
+//! KN.SlideArchive: style 1, titlePlaceholder 5, bodyPlaceholder 6,
+//! owned_drawables 7, template_slide 17, slideNumberPlaceholder 20,
+//! drawables_z_order 42.
+
+mod apxl;
+mod apxl1;
+mod chart;
+mod shapes;
+mod table;
+mod text;
+
+use crate::formats::office::common::iwa::Store;
+use crate::formats::office::common::iwa::proto::Msg;
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+use crate::formats::office::slides::package::Zip;
+use std::collections::HashMap;
+
+/// Message types ([keynote-parser]'s registry).
+pub(crate) mod ty {
+    pub const DOCUMENT: u32 = 1;
+    pub const SHOW: u32 = 2;
+    pub const SLIDE_NODE: u32 = 4;
+    pub const SLIDE: u32 = 5;
+    pub const PLACEHOLDER: u32 = 7;
+    pub const SLIDE_STYLE: u32 = 9;
+    pub const STORAGE: u32 = 2001;
+    pub const STORAGE_2: u32 = 2005;
+    pub const SHAPE_INFO: u32 = 2011;
+    pub const CHARACTER_STYLE: u32 = 2021;
+    pub const PARAGRAPH_STYLE: u32 = 2022;
+    pub const LIST_STYLE: u32 = 2023;
+    pub const TEXT_SHAPE_STYLE: u32 = 2025;
+    pub const SHAPE: u32 = 3004;
+    pub const IMAGE: u32 = 3005;
+    pub const MOVIE: u32 = 3007;
+    pub const GROUP: u32 = 3008;
+    pub const CONNECTION_LINE: u32 = 3009;
+    pub const SHAPE_STYLE: u32 = 3015;
+    pub const MEDIA_STYLE: u32 = 3016;
+    pub const TABLE_INFO: u32 = 6000;
+    pub const CHART: u32 = 5021;
+    pub const PACKAGE_METADATA: u32 = 11006;
+}
+
+/// Reads a document saved as one file.
+pub(crate) fn read(z: Result<Zip>, budget: &mut Budget) -> Result<Presentation> {
+    let mut z = z.map_err(|_| {
+        Error::NotFormat("not a ZIP package (a Keynote document saved as a package directory must be read file by file)".into())
+    })?;
+    let names = z.names();
+    check_kind(&names.iter().map(String::as_str).collect::<Vec<_>>())?;
+    if let Some(name) = xml_member(names.iter().map(String::as_str)) {
+        let name = name.to_string();
+        let max = budget.limits.max_part;
+        let data = z.get(&name, max, budget)?.unwrap_or_default();
+        let xml = unzip_xml(&name, data, budget)?;
+        return read_xml(&xml, apxl::Pkg::Zip(z, base_of(&name)), budget);
+    }
+    let max = budget.limits.max_part;
+    let mut files: Vec<(String, Vec<u8>)> = vec![];
+    if let Some(inner) = names.iter().find(|n| leaf(n) == "index.zip") {
+        let data = z.get(inner, max, budget)?.unwrap_or_default();
+        let mut iz = Zip::open(&data)?;
+        for n in iz.names() {
+            if n.ends_with(".iwa")
+                && let Some(d) = iz.get(&n, max, budget)?
+            {
+                files.push((n, d));
+            }
+        }
+    }
+    for n in &names {
+        if n.ends_with(".iwa")
+            && let Some(d) = z.get(n, max, budget)?
+        {
+            files.push((n.clone(), d));
+        }
+    }
+    let refs: Vec<(&str, &[u8])> = files
+        .iter()
+        .map(|(n, d)| (n.as_str(), d.as_slice()))
+        .collect();
+    // Pictures are read when a slide uses them.
+    let members: Vec<&str> = names
+        .iter()
+        .filter(|n| n.contains("Data/") && !n.ends_with('/'))
+        .map(String::as_str)
+        .collect();
+    read_files(&refs, &members, Some(z), budget)
+}
+
+/// Whether `input` is a Keynote 1 to 5 XML document on its own (an
+/// `.apxl` file), gzipped or not, rather than a package.
+pub(crate) fn is_bare_xml(input: &[u8]) -> bool {
+    let head = input.strip_prefix(&[0xEF, 0xBB, 0xBF]).unwrap_or(input);
+    input.starts_with(&[0x1F, 0x8B])
+        || head.iter().find(|b| !b.is_ascii_whitespace()) == Some(&b'<')
+}
+
+/// Reads an `.apxl` file.
+pub(crate) fn read_bare(input: &[u8], budget: &mut Budget) -> Result<Presentation> {
+    budget.alloc(input.len() as u64)?;
+    let xml = unzip_xml("", input.to_vec(), budget)?;
+    read_xml(&xml, apxl::Pkg::None, budget)
+}
+
+/// Reads a package directory given as its files.
+pub(crate) fn read_package(files: &[(&str, &[u8])], budget: &mut Budget) -> Result<Presentation> {
+    let names: Vec<&str> = files.iter().map(|f| f.0).collect();
+    check_kind(&names)?;
+    if let Some(name) = xml_member(names.iter().copied()) {
+        let data = files
+            .iter()
+            .find(|f| f.0 == name)
+            .map(|f| f.1.to_vec())
+            .unwrap_or_default();
+        budget.alloc(data.len() as u64)?;
+        let xml = unzip_xml(name, data, budget)?;
+        return read_xml(&xml, apxl::Pkg::Files(files, base_of(name)), budget);
+    }
+    let mut all: Vec<(String, Vec<u8>)> = vec![];
+    if let Some((_, data)) = files.iter().find(|f| leaf(f.0) == "index.zip") {
+        let max = budget.limits.max_part;
+        let mut iz = Zip::open(data)?;
+        for n in iz.names() {
+            if n.ends_with(".iwa")
+                && let Some(d) = iz.get(&n, max, budget)?
+            {
+                all.push((n, d));
+            }
+        }
+    }
+    let mut refs: Vec<(&str, &[u8])> = files.to_vec();
+    refs.extend(all.iter().map(|(n, d)| (n.as_str(), d.as_slice())));
+    read_files(&refs, &[], None, budget)
+}
+
+/// The directory of a package member, with its trailing "/".
+fn base_of(name: &str) -> String {
+    name.rfind('/')
+        .map_or(String::new(), |i| name[..=i].to_string())
+}
+
+fn leaf(name: &str) -> String {
+    name.rsplit('/').next().unwrap_or(name).to_ascii_lowercase()
+}
+
+fn check_kind(names: &[&str]) -> Result<()> {
+    if names
+        .iter()
+        .any(|n| matches!(leaf(n).as_str(), ".iwpv2" | ".iwph"))
+    {
+        return Err(Error::Encrypted);
+    }
+    Ok(())
+}
+
+/// The XML document of a Keynote 1 to 5 package: `index.apxl` or
+/// `presentation.apxl`, gzipped or not, the one nearest the root.
+fn xml_member<'n>(names: impl Iterator<Item = &'n str>) -> Option<&'n str> {
+    names
+        .filter(|n| {
+            matches!(
+                leaf(n).as_str(),
+                "index.apxl" | "index.apxl.gz" | "presentation.apxl" | "presentation.apxl.gz"
+            )
+        })
+        .min_by_key(|n| n.matches('/').count())
+}
+
+/// The XML of a member: gunzipped when it is, within `max_part`.
+fn unzip_xml(name: &str, data: Vec<u8>, budget: &mut Budget) -> Result<Vec<u8>> {
+    if !(name.ends_with(".gz") || data.starts_with(&[0x1F, 0x8B])) {
+        return Ok(data);
+    }
+    use std::io::Read;
+    let max = budget.limits.max_part;
+    let mut out = vec![];
+    let n = flate2::read::MultiGzDecoder::new(&data[..])
+        .take(max + 1)
+        .read_to_end(&mut out)
+        .map_err(|e| Error::Malformed(format!("gzip: {e}")))?;
+    if n as u64 > max {
+        return Err(Error::TooLarge("a package part"));
+    }
+    budget.alloc(n as u64)?;
+    Ok(out)
+}
+
+/// Reads a Keynote 1 to 5 document from its XML.
+pub(crate) fn read_xml<'a>(
+    xml: &[u8],
+    pkg: apxl::Pkg<'a>,
+    budget: &mut Budget,
+) -> Result<Presentation> {
+    let root = crate::formats::office::common::xml::parse(xml, &mut budget.tree())?;
+    match root.name.as_str() {
+        "key:presentation" => apxl::read(&root, pkg, budget),
+        "presentation" => apxl1::read(&root, pkg, budget),
+        _ => Err(Error::NotFormat("not a Keynote document".into())),
+    }
+}
+
+/// A file of `Data/`: its bytes, or its name in the package, read when a
+/// slide uses it.
+#[derive(Clone, Copy)]
+pub(crate) enum DataFile<'a> {
+    Bytes(&'a [u8]),
+    Member(&'a str),
+}
+
+/// Reads the `.iwa` streams and `Data/` files of `files`, and the `Data/`
+/// files `members` names in `zip`.
+fn read_files<'a>(
+    files: &[(&'a str, &'a [u8])],
+    members: &[&'a str],
+    zip: Option<Zip<'a>>,
+    budget: &mut Budget,
+) -> Result<Presentation> {
+    let mut store = Store::default();
+    let mut data: HashMap<String, DataFile<'a>> = HashMap::new();
+    for &(name, d) in files {
+        if name.ends_with(".iwa") {
+            let left = budget.limits.max_part.min(budget.limits.max_memory) as usize;
+            let used = store.add(d, left);
+            budget.alloc(used as u64 * 2)?;
+        } else if let Some(i) = name.find("Data/") {
+            data.insert(name[i + 5..].to_string(), DataFile::Bytes(d));
+        }
+    }
+    for &name in members {
+        if let Some(i) = name.find("Data/") {
+            data.insert(name[i + 5..].to_string(), DataFile::Member(name));
+        }
+    }
+    let doc = store
+        .typed(1, ty::DOCUMENT)
+        .or_else(|| {
+            store
+                .ids_of(ty::DOCUMENT)
+                .first()
+                .and_then(|&i| store.typed(i, ty::DOCUMENT))
+        })
+        .ok_or_else(|| {
+            Error::NotFormat(
+                "no Keynote document object (not a Keynote file, or a damaged one)".into(),
+            )
+        })?;
+    let mut r = Reader {
+        store: &store,
+        data: datas(&store, &data),
+        zip,
+        failed: None,
+        media: HashMap::new(),
+        p: Presentation::default(),
+        masters: HashMap::new(),
+    };
+    r.convert(doc, budget)?;
+    Ok(r.p)
+}
+
+/// Data identifiers to their files, from the package metadata.
+fn datas<'a>(store: &Store, files: &HashMap<String, DataFile<'a>>) -> HashMap<u64, DataFile<'a>> {
+    let mut out = HashMap::new();
+    for id in store.ids_of(ty::PACKAGE_METADATA) {
+        let Some(m) = store.typed(id, ty::PACKAGE_METADATA) else {
+            continue;
+        };
+        for d in m.msgs(4).take(1 << 16) {
+            let Some(ident) = d.uint(1) else { continue };
+            let names = [d.string(4), d.string(3)];
+            for n in names.into_iter().flatten() {
+                if let Some(f) = files.get(&n) {
+                    out.insert(ident, *f);
+                    break;
+                }
+                // Files are saved as "name-<identifier>.ext".
+                let (stem, ext) = n.rsplit_once('.').unwrap_or((&n, ""));
+                let alt = if ext.is_empty() {
+                    format!("{stem}-{ident}")
+                } else {
+                    format!("{stem}-{ident}.{ext}")
+                };
+                if let Some(f) = files.get(&alt) {
+                    out.insert(ident, *f);
+                    break;
+                }
+            }
+        }
+    }
+    out
+}
+
+/// Which properties message of a style.
+#[derive(Clone, Copy)]
+pub(crate) enum Props {
+    /// TSD.ShapeStylePropertiesArchive: fill 1, stroke 2, opacity 3,
+    /// shadow 4 (TSD.MediaStylePropertiesArchive: stroke 1, opacity 2,
+    /// shadow 3).
+    Shape,
+    Media,
+    /// TSWP.ShapeStylePropertiesArchive: shrink_to_fit 1,
+    /// vertical_alignment 2, padding 6, paragraph_style 10.
+    Text,
+    /// KN.SlideStylePropertiesArchive.
+    Slide,
+    /// TSWP.CharacterStylePropertiesArchive of a character or paragraph
+    /// style.
+    Char,
+    /// TSWP.ParagraphStylePropertiesArchive.
+    Para,
+}
+
+impl Props {
+    fn of<'a>(self, kind: u32, m: Msg<'a>) -> Option<Msg<'a>> {
+        match (self, kind) {
+            (Props::Shape, ty::SHAPE_STYLE) => m.msg(11),
+            (Props::Shape, ty::TEXT_SHAPE_STYLE) => m.msg(1)?.msg(11),
+            (Props::Media, ty::MEDIA_STYLE) => m.msg(11),
+            (Props::Text, ty::TEXT_SHAPE_STYLE) => m.msg(11),
+            (Props::Slide, ty::SLIDE_STYLE) => m.msg(11),
+            (Props::Char, ty::CHARACTER_STYLE | ty::PARAGRAPH_STYLE) => m.msg(11),
+            (Props::Para, ty::PARAGRAPH_STYLE) => m.msg(12),
+            _ => None,
+        }
+    }
+}
+
+pub(crate) struct Reader<'a> {
+    pub store: &'a Store,
+    pub data: HashMap<u64, DataFile<'a>>,
+    /// The package the `Data/` members are read from.
+    zip: Option<Zip<'a>>,
+    /// A picture the package could not give within the limits, raised
+    /// after the slide that wanted it.
+    failed: Option<Error>,
+    pub media: HashMap<u64, Option<usize>>,
+    pub p: Presentation,
+    /// Template slides to their master's index.
+    masters: HashMap<u64, usize>,
+}
+
+impl<'a> Reader<'a> {
+    /// An image's media index, by data identifier.
+    pub fn image(&mut self, id: u64) -> Option<usize> {
+        if let Some(&m) = self.media.get(&id) {
+            return m;
+        }
+        let bytes = match self.data.get(&id).copied() {
+            Some(DataFile::Bytes(d)) => Some(d.to_vec()),
+            Some(DataFile::Member(name)) => {
+                let read = self.zip.as_mut().map(|z| z.read(name, 64 << 20));
+                match read {
+                    Some(Ok(d)) => d,
+                    Some(Err(e)) => {
+                        self.failed.get_or_insert(e);
+                        None
+                    }
+                    None => None,
+                }
+            }
+            None => None,
+        };
+        let m = bytes.and_then(|d| {
+            let ext = crate::formats::office::slides::package::image_ext(&d)?;
+            Some(self.p.add_media(ext, d))
+        });
+        self.media.insert(id, m);
+        m
+    }
+
+    fn convert(&mut self, doc: Msg<'a>, budget: &mut Budget) -> Result<()> {
+        let show = doc
+            .reference(2)
+            .and_then(|id| self.store.typed(id, ty::SHOW))
+            .ok_or_else(|| Error::Malformed("no show".into()))?;
+        let (w, h) = show
+            .msg(4)
+            .map(|s| (s.float(1).unwrap_or(1024.0), s.float(2).unwrap_or(768.0)))
+            .unwrap_or((1024.0, 768.0));
+        self.p.width = (f64::from(w) * 12700.0).round() as Emu;
+        self.p.height = (f64::from(h) * 12700.0).round() as Emu;
+        let numbers = show.boolean(6).unwrap_or(false);
+        // The slides in order: the tree's list, else its root's children.
+        let mut nodes: Vec<u64> = vec![];
+        if let Some(tree) = show.msg(3) {
+            nodes.extend(tree.references(2).take(100_000));
+            if nodes.is_empty()
+                && let Some(root) = tree.reference(1)
+            {
+                self.walk_nodes(root, &mut nodes, 0);
+            }
+        }
+        let mut n = 0usize;
+        for node_id in nodes {
+            let Some(node) = self.store.typed(node_id, ty::SLIDE_NODE) else {
+                continue;
+            };
+            let Some(slide_id) = node.reference(2) else {
+                continue;
+            };
+            let Some((kind, slide)) = self.store.get(slide_id) else {
+                continue;
+            };
+            if kind != ty::SLIDE {
+                continue;
+            }
+            budget.slide(n)?;
+            n += 1;
+            self.p.total_slides = n;
+            if !budget.wants(n - 1) {
+                continue;
+            }
+            let skipped = node.boolean(4).unwrap_or(false);
+            let s = self.slide(slide, n, numbers, skipped, budget)?;
+            self.p.slides.push(s);
+            if let Some(e) = self.failed.take() {
+                return Err(e);
+            }
+        }
+        if let Some(e) = self.failed.take() {
+            return Err(e);
+        }
+        if self.p.masters.is_empty() {
+            self.p.masters.push(Master::default());
+        }
+        Ok(())
+    }
+
+    fn walk_nodes(&self, id: u64, out: &mut Vec<u64>, depth: u32) {
+        if depth > 64 || out.len() > 100_000 {
+            return;
+        }
+        let Some(node) = self.store.typed(id, ty::SLIDE_NODE) else {
+            return;
+        };
+        for c in node.references(1) {
+            out.push(c);
+            self.walk_nodes(c, out, depth + 1);
+        }
+    }
+
+    /// A slide's background, through its style's parents.
+    fn background(&mut self, style: Option<u64>) -> Option<Fill> {
+        let props = self.find(style, Props::Slide, |p| p.msg(1))?;
+        Some(shapes::fill(self, props))
+    }
+
+    /// A style and its parents (TSS.StyleArchive parent 3, in the style's
+    /// super, which a text shape style nests one level deeper).
+    pub fn chain(&self, style: Option<u64>) -> Vec<(u32, Msg<'a>)> {
+        let mut out = vec![];
+        let mut cur = style;
+        while let Some(id) = cur {
+            if out.len() >= 32 {
+                break;
+            }
+            let Some((k, m)) = self.store.get(id) else {
+                break;
+            };
+            out.push((k, m));
+            let tss = if k == ty::TEXT_SHAPE_STYLE {
+                m.msg(1).and_then(|s| s.msg(1))
+            } else {
+                m.msg(1)
+            };
+            cur = tss.and_then(|s| s.reference(3)).filter(|&p| p != id);
+        }
+        out
+    }
+
+    /// The first value `get` finds in the properties `which` of a style or
+    /// of its nearest parent.
+    pub fn find<T>(
+        &self,
+        style: Option<u64>,
+        which: Props,
+        get: impl Fn(Msg<'a>) -> Option<T>,
+    ) -> Option<T> {
+        self.chain(style)
+            .into_iter()
+            .find_map(|(k, m)| which.of(k, m).and_then(&get))
+    }
+
+    fn slide_flag(&self, style: Option<u64>, field: u32) -> Option<bool> {
+        self.find(style, Props::Slide, |p| p.boolean(field))
+    }
+
+    fn master(&mut self, template: u64, budget: &mut Budget) -> Result<usize> {
+        if let Some(&i) = self.masters.get(&template) {
+            return Ok(i);
+        }
+        let mut m = Master {
+            name: "Master".into(),
+            layouts: vec![Layout {
+                name: "Blank".into(),
+                kind: "blank",
+                show_master_shapes: true,
+                ..Layout::default()
+            }],
+            ..Master::default()
+        };
+        if let Some((_, t)) = self.store.get(template) {
+            m.background = self
+                .background(t.reference(1))
+                .or(Some(Fill::Solid(Color::rgb(0xFFFFFF))));
+            m.name = t.string(10).unwrap_or_else(|| "Master".into());
+            let placeholders: Vec<u64> = [5u32, 6, 20, 30]
+                .iter()
+                .filter_map(|&f| t.reference(f))
+                .collect();
+            let order: Vec<u64> = {
+                let z: Vec<u64> = t.references(42).collect();
+                if z.is_empty() {
+                    t.references(7).collect()
+                } else {
+                    z
+                }
+            };
+            for id in order.into_iter().take(10_000) {
+                if placeholders.contains(&id) {
+                    continue;
+                }
+                if let Some(s) = shapes::drawable(self, id, 1, budget, 0)? {
+                    m.shapes.push(s);
+                }
+            }
+        }
+        let i = self.p.masters.len();
+        self.p.masters.push(m);
+        self.masters.insert(template, i);
+        Ok(i)
+    }
+
+    fn slide(
+        &mut self,
+        s: Msg<'a>,
+        number: usize,
+        numbers: bool,
+        skipped: bool,
+        budget: &mut Budget,
+    ) -> Result<Slide> {
+        let style = s.reference(1);
+        let mi = match s.reference(17) {
+            Some(t) => self.master(t, budget)?,
+            None => {
+                if self.p.masters.is_empty() {
+                    self.p.masters.push(Master::default());
+                }
+                0
+            }
+        };
+        let background = self.background(style);
+        let title_visible = self.slide_flag(style, 4).unwrap_or(true);
+        let body_visible = self.slide_flag(style, 5).unwrap_or(true);
+        let number_visible = self.slide_flag(style, 6).unwrap_or(numbers);
+        let (title, body, num) = (s.reference(5), s.reference(6), s.reference(20));
+        let mut order: Vec<u64> = s.references(42).collect();
+        if order.is_empty() {
+            order = s.references(7).collect();
+            // Placeholders first, under the slide's own drawables.
+            for p in [num, body, title].into_iter().flatten() {
+                if !order.contains(&p) {
+                    order.insert(0, p);
+                }
+            }
+        }
+        let mut out = vec![];
+        for id in order.into_iter().take(10_000) {
+            let visible = if Some(id) == title {
+                title_visible
+            } else if Some(id) == body {
+                body_visible
+            } else if Some(id) == num {
+                number_visible
+            } else {
+                true
+            };
+            if !visible {
+                continue;
+            }
+            if let Some(sh) = shapes::drawable(self, id, number, budget, 0)? {
+                out.push(sh);
+            }
+        }
+        Ok(Slide {
+            name: None,
+            master: mi,
+            layout: 0,
+            background,
+            shapes: out,
+            hidden: skipped,
+            show_master_shapes: true,
+        })
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/keynote/shapes.rs b/crates/exav-render/src/formats/office/slides/keynote/shapes.rs
new file mode 100644
index 00000000..b597cfd3
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/shapes.rs
@@ -0,0 +1,600 @@
+//! Keynote drawables to the model: shapes and their path sources, text
+//! boxes, pictures and groups, with fills, strokes and shadows from their
+//! styles.
+//!
+//! TSD.DrawableArchive: geometry 1 (position 1, size 2, angle 4).
+//! TSD.ShapeArchive: super 1, style 2, pathsource 3, head_line_end 4,
+//! tail_line_end 5. TSWP.ShapeInfoArchive: super 1, deprecated_storage 2,
+//! owned_storage 4. TSD.ImageArchive: super 1, style 3, data 11,
+//! originalData 13. TSD.GroupArchive: super 1, children 2.
+
+use super::{Props, Reader, text, ty};
+use crate::formats::office::common::iwa::proto::Msg;
+use crate::formats::office::slides::error::Result;
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+
+const PT: f64 = 12700.0;
+
+/// A TSP.Color (r 3, g 4, b 5, a 6 in 0 to 1) as a colour.
+pub fn color(c: Msg) -> Color {
+    let ch = |n: u32| (f64::from(c.float(n).unwrap_or(0.0)).clamp(0.0, 1.0) * 255.0).round() as u32;
+    let a = f64::from(c.float(6).unwrap_or(1.0)).clamp(0.0, 1.0);
+    Color {
+        rgb: ch(3) << 16 | ch(4) << 8 | ch(5),
+        alpha: (a < 1.0).then(|| (a * 100_000.0).round() as u32),
+    }
+}
+
+fn with_opacity(mut c: Color, o: Option<f64>) -> Color {
+    if let Some(o) = o.filter(|&o| o < 1.0) {
+        let a = f64::from(c.alpha.unwrap_or(100_000)) * o.clamp(0.0, 1.0);
+        c.alpha = Some(a.round() as u32);
+    }
+    c
+}
+
+/// A TSD.FillArchive: color 1, gradient 2 (type 1, stops 2 (color 1,
+/// fraction 2), anglegradient 5 (gradientangle 2)), image 3 (technique 2,
+/// imagedata 6).
+pub fn fill(r: &mut Reader, f: Msg) -> Fill {
+    if let Some(c) = f.msg(1) {
+        return Fill::Solid(color(c));
+    }
+    if let Some(g) = f.msg(2) {
+        let stops: Vec<(u32, Color)> = g
+            .msgs(2)
+            .take(64)
+            .map(|s| {
+                let pos = (f64::from(s.float(2).unwrap_or(0.0)).clamp(0.0, 1.0) * 100_000.0).round()
+                    as u32;
+                (pos, s.msg(1).map(color).unwrap_or(Color::rgb(0)))
+            })
+            .collect();
+        if stops.is_empty() {
+            return Fill::None;
+        }
+        let kind = if g.uint(1) == Some(1) {
+            GradientKind::Path("circle", [50_000; 4])
+        } else {
+            // Counterclockwise degrees from left to right.
+            let a = g
+                .msg(5)
+                .and_then(|a| a.float(2))
+                .map(f64::from)
+                .unwrap_or(0.0);
+            GradientKind::Linear((-a).rem_euclid(360.0))
+        };
+        return Fill::Gradient(Gradient { stops, kind });
+    }
+    if let Some(i) = f.msg(3) {
+        let id = i.msg(6).or_else(|| i.msg(7)).and_then(|d| d.uint(1));
+        if let Some(media) = id.and_then(|id| r.image(id)) {
+            return Fill::Picture {
+                media,
+                tile: i.uint(2) == Some(2),
+            };
+        }
+    }
+    Fill::None
+}
+
+/// A TSD.StrokeArchive: color 1, width 2, cap 3, join 4, pattern 6 (type
+/// 1: 0 dashed, 1 solid, 2 none; pattern 4).
+pub fn stroke(s: Msg, opacity: Option<f64>) -> Line {
+    let kind = s.msg(6).and_then(|p| p.uint(1)).unwrap_or(1);
+    if kind == 2 {
+        return Line::default();
+    }
+    let width = f64::from(s.float(2).unwrap_or(1.0)).max(0.0);
+    let dash = (kind == 0).then(|| {
+        let p: Vec<f32> = s
+            .msg(6)
+            .map(|p| {
+                p.all(4)
+                    .filter_map(|v| match v {
+                        crate::formats::office::common::iwa::proto::Val::Fixed32(x) => {
+                            Some(f32::from_bits(x))
+                        }
+                        _ => None,
+                    })
+                    .collect()
+            })
+            .unwrap_or_default();
+        match p.first() {
+            Some(&d) if d <= 1.5 => "sysDot",
+            Some(&d) if d >= 4.0 => "lgDash",
+            _ => "dash",
+        }
+    });
+    Line {
+        fill: Fill::Solid(with_opacity(
+            s.msg(1).map(color).unwrap_or(Color::rgb(0)),
+            opacity,
+        )),
+        width: (width * PT).round() as Emu,
+        dash,
+        cap: match s.uint(3) {
+            Some(1) => Some("rnd"),
+            Some(2) => Some("sq"),
+            _ => None,
+        },
+        join: match s.uint(4) {
+            Some(1) => Some("round"),
+            Some(2) => Some("bevel"),
+            Some(0) => Some("miter"),
+            _ => None,
+        },
+        ..Line::default()
+    }
+}
+
+/// A TSD.ShadowArchive: color 1, angle 2, offset 3, radius 4, opacity 5,
+/// is_enabled 6.
+pub fn shadow(s: Msg) -> Option<Shadow> {
+    if s.boolean(6) == Some(false) {
+        return None;
+    }
+    let mut c = s.msg(1).map(color).unwrap_or(Color::rgb(0));
+    c = with_opacity(c, s.float(5).map(f64::from));
+    Some(Shadow {
+        color: c,
+        blur: (f64::from(s.int(4).unwrap_or(0).clamp(0, 1000) as i32) * PT).round() as Emu,
+        dist: (f64::from(s.float(3).unwrap_or(0.0)).abs() * PT).round() as Emu,
+        // Counterclockwise from the right, to DrawingML's clockwise.
+        dir: (-f64::from(s.float(2).unwrap_or(315.0))).rem_euclid(360.0),
+    })
+}
+
+fn arrow(end: Option<Msg>) -> Option<Arrow> {
+    let id = end?.string(5)?.to_ascii_lowercase();
+    let kind = if id.contains("circle") {
+        "oval"
+    } else if id.contains("diamond") || id.contains("square") {
+        "diamond"
+    } else if id.contains("open") || id.contains("simple") || id == "line" {
+        "arrow"
+    } else if id.contains("arrow") {
+        "triangle"
+    } else {
+        return None;
+    };
+    Some(Arrow {
+        kind,
+        w: "med",
+        len: "med",
+    })
+}
+
+/// Points of a TSP.Path (elements 1: type 1, points 2) in a box of
+/// `natural` size, as a path.
+fn path(p: Msg, natural: (f64, f64)) -> Option<Geometry> {
+    // Path units: points times 100.
+    let s = 100.0;
+    let pt = |m: Msg| {
+        (
+            (f64::from(m.float(1).unwrap_or(0.0)) * s).round() as i64,
+            (f64::from(m.float(2).unwrap_or(0.0)) * s).round() as i64,
+        )
+    };
+    let mut out = Path {
+        w: (natural.0 * s).round().max(1.0) as i64,
+        h: (natural.1 * s).round().max(1.0) as i64,
+        fill: true,
+        stroke: true,
+        cmds: vec![],
+    };
+    let mut started = false;
+    for e in p.msgs(1).take(1 << 16) {
+        let pts: Vec<(i64, i64)> = e.msgs(2).map(pt).collect();
+        match (e.uint(1).unwrap_or(0), pts.as_slice()) {
+            (1, [a, ..]) => {
+                out.cmds.push(PathCmd::Move(a.0, a.1));
+                started = true;
+            }
+            (2, [a, ..]) if started => out.cmds.push(PathCmd::Line(a.0, a.1)),
+            (3, [a, b, ..]) if started => out.cmds.push(PathCmd::Quad(a.0, a.1, b.0, b.1)),
+            (4, [a, b, c, ..]) if started => {
+                out.cmds.push(PathCmd::Cubic(a.0, a.1, b.0, b.1, c.0, c.1))
+            }
+            (5, _) if started => out.cmds.push(PathCmd::Close),
+            _ => {}
+        }
+    }
+    // A trailing lone move draws nothing.
+    if matches!(out.cmds.last(), Some(PathCmd::Move(..))) {
+        out.cmds.pop();
+    }
+    (!out.cmds.is_empty()).then(|| Geometry::Custom(vec![out]))
+}
+
+fn size_of(m: Option<Msg>, w: f64, h: f64) -> (f64, f64) {
+    m.map(|s| {
+        (
+            f64::from(s.float(1).unwrap_or(w as f32)),
+            f64::from(s.float(2).unwrap_or(h as f32)),
+        )
+    })
+    .filter(|s| s.0 > 0.0 && s.1 > 0.0)
+    .unwrap_or((w.max(1.0), h.max(1.0)))
+}
+
+/// A TSD.PathSourceArchive (horizontalFlip 1, verticalFlip 2, point 3,
+/// scalar 4, bezier 5, callout 6, connection line 7, editable bezier 8).
+fn geometry(ps: Msg, w: f64, h: f64) -> Geometry {
+    if let Some(s) = ps.msg(4) {
+        // Scalar: rounded rectangle 0 (radius), regular polygon 1 (sides),
+        // chevron 2.
+        let (nw, nh) = size_of(s.msg(3), w, h);
+        let v = f64::from(s.float(2).unwrap_or(0.0));
+        return match s.uint(1).unwrap_or(0) {
+            0 if v > 0.0 => Geometry::Preset {
+                name: "roundRect",
+                adj: vec![(
+                    "adj",
+                    ((v / nw.min(nh)) * 100_000.0).round().clamp(0.0, 50_000.0) as i64,
+                )],
+            },
+            0 => Geometry::default(),
+            1 => {
+                let n = (v.round() as usize).clamp(3, 64);
+                let mut p = Path {
+                    w: 100_000,
+                    h: 100_000,
+                    fill: true,
+                    stroke: true,
+                    cmds: vec![],
+                };
+                for i in 0..n {
+                    let a =
+                        -std::f64::consts::FRAC_PI_2 + i as f64 * std::f64::consts::TAU / n as f64;
+                    let (x, y) = (
+                        (50_000.0 + 50_000.0 * a.cos()) as i64,
+                        (50_000.0 + 50_000.0 * a.sin()) as i64,
+                    );
+                    p.cmds.push(if i == 0 {
+                        PathCmd::Move(x, y)
+                    } else {
+                        PathCmd::Line(x, y)
+                    });
+                }
+                p.cmds.push(PathCmd::Close);
+                Geometry::Custom(vec![p])
+            }
+            _ => Geometry::preset("chevron"),
+        };
+    }
+    if let Some(p) = ps.msg(3) {
+        return Geometry::preset(match p.uint(1).unwrap_or(1) {
+            0 => "leftArrow",
+            10 => "leftRightArrow",
+            100 => match p
+                .msg(2)
+                .and_then(|pt| pt.float(1))
+                .map(|v| v.round() as i32)
+            {
+                Some(4) => "star4",
+                Some(6) => "star6",
+                Some(7) => "star7",
+                Some(8) => "star8",
+                Some(10) => "star10",
+                Some(12) => "star12",
+                _ => "star5",
+            },
+            200 => "plus",
+            _ => "rightArrow",
+        });
+    }
+    let bezier = ps.msg(5).or_else(|| ps.msg(7).and_then(|c| c.msg(1)));
+    if let Some(b) = bezier {
+        let natural = size_of(b.msg(2), w, h);
+        if let Some(g) = b.msg(3).and_then(|p| path(p, natural)) {
+            return g;
+        }
+    }
+    if let Some(e) = ps.msg(8) {
+        let natural = size_of(e.msg(2), w, h);
+        let s = 100.0;
+        let pt = |m: Option<Msg>| {
+            m.map(|m| {
+                (
+                    (f64::from(m.float(1).unwrap_or(0.0)) * s).round() as i64,
+                    (f64::from(m.float(2).unwrap_or(0.0)) * s).round() as i64,
+                )
+            })
+            .unwrap_or((0, 0))
+        };
+        let mut out = Path {
+            w: (natural.0 * s).round().max(1.0) as i64,
+            h: (natural.1 * s).round().max(1.0) as i64,
+            fill: true,
+            stroke: true,
+            cmds: vec![],
+        };
+        for sub in e.msgs(1).take(4096) {
+            let nodes: Vec<Msg> = sub.msgs(1).take(1 << 16).collect();
+            let Some(first) = nodes.first() else { continue };
+            let p0 = pt(first.msg(2));
+            out.cmds.push(PathCmd::Move(p0.0, p0.1));
+            let closed = sub.boolean(2).unwrap_or(false);
+            let mut segs: Vec<(Msg, Msg)> = nodes.array_windows().map(|&[a, b]| (a, b)).collect();
+            if closed && nodes.len() > 1 {
+                segs.push((nodes[nodes.len() - 1], nodes[0]));
+            }
+            for (a, b) in segs {
+                let (c1, c2, p) = (pt(a.msg(3)), pt(b.msg(1)), pt(b.msg(2)));
+                out.cmds
+                    .push(PathCmd::Cubic(c1.0, c1.1, c2.0, c2.1, p.0, p.1));
+            }
+            if closed {
+                out.cmds.push(PathCmd::Close);
+            }
+        }
+        if !out.cmds.is_empty() {
+            return Geometry::Custom(vec![out]);
+        }
+    }
+    if ps.msg(6).is_some() {
+        return Geometry::preset("wedgeRoundRectCallout");
+    }
+    Geometry::default()
+}
+
+/// The box of a drawable (DrawableArchive geometry 1), in EMU.
+pub(super) fn xfrm(d: Msg) -> (Xfrm, f64, f64) {
+    let g = d.msg(1);
+    let pos = g.and_then(|g| g.msg(1));
+    let size = g.and_then(|g| g.msg(2));
+    let f = |m: Option<Msg>, n: u32| f64::from(m.and_then(|m| m.float(n)).unwrap_or(0.0));
+    let (w, h) = (f(size, 1).max(0.0), f(size, 2).max(0.0));
+    let angle = f64::from(g.and_then(|g| g.float(4)).unwrap_or(0.0));
+    (
+        Xfrm {
+            x: (f(pos, 1) * PT).round() as Emu,
+            y: (f(pos, 2) * PT).round() as Emu,
+            w: (w * PT).round() as Emu,
+            h: (h * PT).round() as Emu,
+            // Counterclockwise degrees, to clockwise.
+            rot: (-angle).rem_euclid(360.0),
+            ..Xfrm::default()
+        },
+        w,
+        h,
+    )
+}
+
+/// A drawable by identifier, or `None` when it is not one this converts.
+pub fn drawable(
+    r: &mut Reader,
+    id: u64,
+    number: usize,
+    budget: &mut Budget,
+    depth: u32,
+) -> Result<Option<Shape>> {
+    if depth > 32 {
+        return Ok(None);
+    }
+    let Some((kind, m)) = r.store.get(id) else {
+        return Ok(None);
+    };
+    match kind {
+        ty::PLACEHOLDER => {
+            let Some(info) = m.msg(1) else {
+                return Ok(None);
+            };
+            let mut s = shape_info(r, info, number, budget)?;
+            if let Some(s) = &mut s {
+                s.placeholder = match m.uint(2) {
+                    Some(2) => Some(Placeholder {
+                        kind: "title",
+                        idx: None,
+                    }),
+                    Some(3) => Some(Placeholder {
+                        kind: "body",
+                        idx: Some(1),
+                    }),
+                    Some(1) => Some(Placeholder {
+                        kind: "sldNum",
+                        idx: Some(12),
+                    }),
+                    _ => None,
+                };
+            }
+            Ok(s)
+        }
+        ty::SHAPE_INFO => shape_info(r, m, number, budget),
+        ty::SHAPE | ty::CONNECTION_LINE => {
+            let shape = if kind == ty::CONNECTION_LINE {
+                m.msg(1)
+            } else {
+                Some(m)
+            };
+            match shape {
+                Some(sh) => {
+                    budget.shape(0)?;
+                    Ok(Some(plain(r, sh, None)))
+                }
+                None => Ok(None),
+            }
+        }
+        ty::IMAGE => {
+            budget.shape(0)?;
+            let Some(d) = m.msg(1) else { return Ok(None) };
+            let data = m.msg(11).or_else(|| m.msg(13)).and_then(|d| d.uint(1));
+            let Some(media) = data.and_then(|id| r.image(id)) else {
+                r.p.warn("pictures whose data is missing");
+                return Ok(None);
+            };
+            budget.alloc(r.p.media[media].data.len() as u64)?;
+            let style = m.reference(3);
+            let opacity = r.find(style, Props::Media, |p| p.float(2)).map(f64::from);
+            let line = r
+                .find(style, Props::Media, |p| p.msg(1))
+                .map(|s| stroke(s, opacity))
+                .unwrap_or_default();
+            let shadow = r.find(style, Props::Media, |p| p.msg(3)).and_then(shadow);
+            let (xf, _, _) = xfrm(d);
+            let mut s = Shape::new(
+                ShapeKind::Pic(Box::new(Pic {
+                    media,
+                    crop: [0; 4],
+                    geom: Geometry::default(),
+                    line,
+                    shadow,
+                    alpha: opacity
+                        .filter(|&o| o < 1.0)
+                        .map(|o| (o * 100_000.0).round() as u32),
+                })),
+                xf,
+            );
+            s.descr = d.string(8).unwrap_or_default();
+            Ok(Some(s))
+        }
+        ty::GROUP => {
+            let Some(d) = m.msg(1) else { return Ok(None) };
+            let (xf, w, h) = xfrm(d);
+            let mut kids = vec![];
+            for c in m.references(2).take(10_000) {
+                if let Some(s) = drawable(r, c, number, budget, depth + 1)? {
+                    kids.push(s);
+                }
+            }
+            if kids.is_empty() {
+                return Ok(None);
+            }
+            // Children are placed in the group's own space.
+            let child = Xfrm {
+                x: 0,
+                y: 0,
+                w: ((w * PT).round() as Emu).max(1),
+                h: ((h * PT).round() as Emu).max(1),
+                ..Xfrm::default()
+            };
+            Ok(Some(Shape::new(
+                ShapeKind::Group(Box::new(Group {
+                    child,
+                    shapes: kids,
+                })),
+                xf,
+            )))
+        }
+        ty::TABLE_INFO => super::table::table(r, m, number, budget),
+        ty::CHART => super::chart::chart(r, m, budget),
+        ty::MOVIE => {
+            budget.shape(0)?;
+            let Some(d) = m.msg(1) else { return Ok(None) };
+            Ok(Some(movie(r, m, d, budget)?))
+        }
+        _ => Ok(None),
+    }
+}
+
+/// A TSD.MovieArchive (poster image 15, audio only image 16, style 19):
+/// its poster frame, else a dark box with a play triangle, as a movie
+/// cannot play in the PPTX.
+fn movie(r: &mut Reader, m: Msg, d: Msg, budget: &mut Budget) -> Result<Shape> {
+    let (xf, _, _) = xfrm(d);
+    let poster = m
+        .msg(15)
+        .or_else(|| m.msg(16))
+        .and_then(|p| p.uint(1))
+        .and_then(|id| r.image(id));
+    if let Some(media) = poster {
+        budget.alloc(r.p.media[media].data.len() as u64)?;
+        let style = m.reference(19);
+        let opacity = r.find(style, Props::Media, |p| p.float(2)).map(f64::from);
+        let line = r
+            .find(style, Props::Media, |p| p.msg(1))
+            .map(|s| stroke(s, opacity))
+            .unwrap_or_default();
+        let shadow = r.find(style, Props::Media, |p| p.msg(3)).and_then(shadow);
+        return Ok(Shape::new(
+            ShapeKind::Pic(Box::new(Pic {
+                media,
+                crop: [0; 4],
+                geom: Geometry::default(),
+                line,
+                shadow,
+                alpha: None,
+            })),
+            xf,
+        ));
+    }
+    r.p.warn("movies without a poster frame, drawn as a box");
+    let kind = ShapeKind::media_placeholder(xf.w, xf.h, m.boolean(9) != Some(true));
+    Ok(Shape::new(kind, xf))
+}
+
+/// A TSD.ShapeArchive (no text) with its style.
+fn plain(r: &mut Reader, sh: Msg, text: Option<TextBody>) -> Shape {
+    let d = sh.msg(1);
+    let (mut xf, w, h) = d.map(xfrm).unwrap_or_default();
+    let style = sh.reference(2);
+    let opacity = r.find(style, Props::Shape, |p| p.float(3)).map(f64::from);
+    let fill = match r.find(style, Props::Shape, |p| p.msg(1)) {
+        Some(f) => match fill(r, f) {
+            Fill::Solid(c) => Fill::Solid(with_opacity(c, opacity)),
+            f => f,
+        },
+        None => Fill::None,
+    };
+    let mut line = r
+        .find(style, Props::Shape, |p| p.msg(2))
+        .map(|s| stroke(s, opacity))
+        .unwrap_or_default();
+    if line.fill != Fill::None {
+        line.head = arrow(
+            sh.msg(4)
+                .or_else(|| r.find(style, Props::Shape, |p| p.msg(6))),
+        );
+        line.tail = arrow(
+            sh.msg(5)
+                .or_else(|| r.find(style, Props::Shape, |p| p.msg(7))),
+        );
+    }
+    let shadow = r.find(style, Props::Shape, |p| p.msg(4)).and_then(shadow);
+    let geom = match sh.msg(3) {
+        Some(ps) => {
+            xf.flip_h = ps.boolean(1).unwrap_or(false);
+            xf.flip_v = ps.boolean(2).unwrap_or(false);
+            geometry(ps, w, h)
+        }
+        None => Geometry::default(),
+    };
+    let mut s = Shape::new(
+        ShapeKind::Sp(Box::new(Sp {
+            geom,
+            fill,
+            line,
+            shadow,
+            text,
+            ..Sp::default()
+        })),
+        xf,
+    );
+    if let Some(url) = d.and_then(|d| d.string(4)).and_then(|u| Link::url(&u)) {
+        s.link = Some(url);
+    }
+    s.descr = d.and_then(|d| d.string(8)).unwrap_or_default();
+    s
+}
+
+/// A TSWP.ShapeInfoArchive: a shape with text.
+fn shape_info(
+    r: &mut Reader,
+    info: Msg,
+    number: usize,
+    budget: &mut Budget,
+) -> Result<Option<Shape>> {
+    let Some(sh) = info.msg(1) else {
+        return Ok(None);
+    };
+    budget.shape(0)?;
+    let style = sh.reference(2);
+    let storage = info.reference(4).or_else(|| info.reference(2));
+    let text = match storage.and_then(|id| r.store.get(id)) {
+        Some((ty::STORAGE | ty::STORAGE_2, st)) => text::body(r, st, style, number, budget)?,
+        _ => None,
+    };
+    Ok(Some(plain(r, sh, text)))
+}
diff --git a/crates/exav-render/src/formats/office/slides/keynote/table.rs b/crates/exav-render/src/formats/office/slides/keynote/table.rs
new file mode 100644
index 00000000..37514d27
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/table.rs
@@ -0,0 +1,812 @@
+//! Keynote tables (TST.TableInfoArchive) to the model's tables: sizes,
+//! cell text, region and cell fills, borders and merged cells. Messages are
+//! read by field number, as the sheets reader does for Numbers (the layout
+//! is the table model both applications share); the numbers are those of
+//! the message definitions keynote-parser (MIT, Peter Sobot) extracted from
+//! the application, and of numbers-parser (MIT, Jon Connell) for the cell
+//! records.
+//!
+//! TST.TableInfoArchive: drawable 1, table_model 2. TST.TableModelArchive:
+//! table_style 3, base_data_store 4, number_of_rows 6, number_of_columns 7,
+//! header rows 9, header columns 10, footer rows 11, default_row_height 16,
+//! default_column_width 17, region cell styles 18 (body), 19 (header row),
+//! 20 (header column), 21 (footer), region text styles 24 to 27, merge_owner
+//! 47, stroke_sidecar 49. TST.DataStore: rowHeaders 1 (buckets 2),
+//! columnHeaders 2, tiles 3 (tiles 1: tileid 1, tile 2; tile_size 2),
+//! stringTable 4, styleTable 5, rich_text_table 17. A data list holds
+//! entries 3 (key 1, string 3, reference 4, rich_text_payload 9) and
+//! segments 4.
+
+use super::{Reader, text, ty};
+use crate::formats::office::common::iwa::Store;
+use crate::formats::office::common::iwa::proto::Msg;
+use crate::formats::office::slides::error::Result;
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+use std::collections::HashMap;
+
+const PT: f64 = 12700.0;
+const MAX_CHAIN: usize = 32;
+/// Rows and columns a table may have.
+const MAX_ROWS: u32 = 10_000;
+const MAX_COLS: u32 = 1_000;
+
+/// A TSP.Color as RGB; `None` when transparent.
+fn color(c: Msg) -> Option<Color> {
+    let col = super::shapes::color(c);
+    (col.alpha != Some(0)).then_some(col)
+}
+
+/// A fill's colour: its colour, or its gradient's first stop.
+fn fill_color(f: Msg) -> Option<Color> {
+    if let Some(c) = f.msg(1) {
+        return color(c);
+    }
+    color(f.msg(2)?.msgs(2).next()?.msg(1)?)
+}
+
+/// A data list's entries by key.
+fn data_list<'a>(store: &'a Store, id: Option<u64>) -> HashMap<u32, Msg<'a>> {
+    let mut out = HashMap::new();
+    let Some((_, m)) = id.and_then(|i| store.get(i)) else {
+        return out;
+    };
+    let mut add = |list: Msg<'a>| {
+        for e in list.msgs(3).take(1 << 20) {
+            if let Some(k) = e.uint(1) {
+                out.insert(k as u32, e);
+            }
+        }
+    };
+    add(m);
+    for seg in m.references(4).take(1 << 12) {
+        if let Some((_, s)) = store.get(seg) {
+            add(s);
+        }
+    }
+    out
+}
+
+/// Row or column headers: index to size and cell style.
+type Headers = HashMap<u32, (f32, Option<u64>)>;
+
+fn headers(store: &Store, buckets: impl Iterator<Item = u64>, max: u32) -> Headers {
+    let mut out = HashMap::new();
+    for b in buckets.take(4096) {
+        let Some((_, m)) = store.get(b) else { continue };
+        for h in m.msgs(2).take(1 << 16) {
+            let Some(i) = h.uint(1).map(|i| i as u32).filter(|&i| i < max) else {
+                continue;
+            };
+            let size = h
+                .float(2)
+                .filter(|s| s.is_finite() && *s > 0.0)
+                .unwrap_or(0.0);
+            out.insert(i, (size, h.reference(5)));
+        }
+    }
+    out
+}
+
+/// What a cell record holds: its type byte (2 number, 3 text, 5 date, 6
+/// boolean, 7 duration, 8 error, 9 rich text, 10 currency), its value and
+/// the keys into the data lists.
+#[derive(Default)]
+struct Raw {
+    kind: u8,
+    decimal: Option<f64>,
+    double: Option<f64>,
+    seconds: Option<f64>,
+    string: Option<u32>,
+    rich: Option<u32>,
+    cell_style: Option<u32>,
+    text_style: Option<u32>,
+}
+
+fn u32_at(b: &[u8], p: usize) -> Option<u32> {
+    Some(u32::from_le_bytes(b.get(p..p + 4)?.try_into().ok()?))
+}
+
+fn f64_at(b: &[u8], p: usize) -> Option<f64> {
+    Some(f64::from_le_bytes(b.get(p..p + 8)?.try_into().ok()?))
+}
+
+/// An IEEE 754 decimal128 in the binary integer encoding: a 14-bit
+/// exponent biased by 6176 and a 113-bit coefficient.
+fn decimal128(b: &[u8]) -> f64 {
+    if b.len() < 16 {
+        return 0.0;
+    }
+    let exp = ((i32::from(b[15] & 0x7F) << 7) | i32::from(b[14] >> 1)) - 6176;
+    let mut m: u128 = u128::from(b[14] & 1);
+    for &x in b[..14].iter().rev() {
+        m = (m << 8) | u128::from(x);
+    }
+    let sign = if b[15] & 0x80 != 0 { "-" } else { "" };
+    format!("{sign}{m}e{exp}").parse().unwrap_or(0.0)
+}
+
+/// A cell record: version 5 has a type byte, a field mask at byte 8 and
+/// the fields the mask names in mask order; versions 1 to 4 differ.
+fn decode(b: &[u8]) -> Option<Raw> {
+    match *b.first()? {
+        5 => {
+            let flags = u32_at(b, 8)?;
+            let mut p = 12usize;
+            let mut c = Raw {
+                kind: *b.get(1)?,
+                ..Raw::default()
+            };
+            if flags & 0x1 != 0 {
+                c.decimal = Some(decimal128(b.get(p..p + 16)?));
+                p += 16;
+            }
+            if flags & 0x2 != 0 {
+                c.double = Some(f64_at(b, p)?);
+                p += 8;
+            }
+            if flags & 0x4 != 0 {
+                c.seconds = Some(f64_at(b, p)?);
+                p += 8;
+            }
+            // The 4-byte keys, in mask order; those not read are skipped.
+            for bit in [
+                0x8u32, 0x10, 0x20, 0x40, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000,
+                0x8000, 0x10000, 0x20000, 0x40000, 0x80000,
+            ] {
+                if flags & bit == 0 {
+                    continue;
+                }
+                let v = u32_at(b, p)?;
+                p += 4;
+                match bit {
+                    0x8 => c.string = Some(v),
+                    0x10 => c.rich = Some(v),
+                    0x20 => c.cell_style = Some(v),
+                    0x40 => c.text_style = Some(v),
+                    _ => {}
+                }
+            }
+            Some(c)
+        }
+        v @ 1..=4 => {
+            let flags = u32_at(b, 4)?;
+            let mut p = if v > 1 { 12 } else { 8 };
+            let mut c = Raw {
+                kind: *b.get(if v >= 4 { 1 } else { 2 })?,
+                ..Raw::default()
+            };
+            if flags & 0x2 != 0 {
+                p += 4;
+            }
+            p += (flags & if v > 1 { 0xD8C } else { 0x18C }).count_ones() as usize * 4;
+            if flags & 0x200 != 0 {
+                c.rich = Some(u32_at(b, p)?);
+                p += 4;
+            }
+            p += (flags & if v > 1 { 0x3000 } else { 0x1000 }).count_ones() as usize * 4;
+            if flags & 0x10 != 0 {
+                c.string = Some(u32_at(b, p)?);
+                p += 4;
+            }
+            if flags & 0x20 != 0 {
+                c.double = Some(f64_at(b, p)?);
+                p += 8;
+            }
+            if flags & 0x40 != 0 {
+                c.seconds = Some(f64_at(b, p)?);
+            }
+            if c.kind == 2 {
+                c.decimal = c.double;
+            }
+            Some(c)
+        }
+        _ => None,
+    }
+}
+
+/// The column records of one tile row: `offsets` are 16-bit, in units of 4
+/// bytes when `wide`, negative for an empty column.
+fn row_cells<'a>(storage: &'a [u8], offsets: &[u8], wide: bool) -> Vec<(u32, &'a [u8])> {
+    let starts: Vec<Option<usize>> = offsets
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|o| {
+            let v = i16::from_le_bytes(*o);
+            (v >= 0).then(|| v as usize * if wide { 4 } else { 1 })
+        })
+        .collect();
+    let mut out = vec![];
+    for (col, s) in starts.iter().enumerate() {
+        let Some(s) = *s else { continue };
+        let end = starts[col + 1..]
+            .iter()
+            .flatten()
+            .next()
+            .copied()
+            .unwrap_or(storage.len())
+            .min(storage.len());
+        if let Some(rec) = storage.get(s..end.max(s)) {
+            out.push((col as u32, rec));
+        }
+    }
+    out
+}
+
+/// The number as the cell shows it without a format: no trailing zeros.
+fn plain_number(v: f64) -> String {
+    if v.fract() == 0.0 && v.abs() < 1e15 {
+        return format!("{}", v as i64);
+    }
+    let s = format!("{v:.10}");
+    s.trim_end_matches('0').trim_end_matches('.').to_string()
+}
+
+/// A date as ISO text, from seconds since 2001-01-01.
+fn date_text(seconds: f64) -> String {
+    let days = (seconds / 86_400.0).floor();
+    // Days from 1970-01-01 to 2001-01-01 are 11323; civil from days.
+    let z = days as i64 + 11_323 + 719_468;
+    let era = z.div_euclid(146_097);
+    let doe = z.rem_euclid(146_097);
+    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
+    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
+    let mp = (5 * doy + 2) / 153;
+    let d = doy - (153 * mp + 2) / 5 + 1;
+    let m = if mp < 10 { mp + 3 } else { mp - 9 };
+    let y = yoe + era * 400 + i64::from(m <= 2);
+    format!("{y:04}-{m:02}-{d:02}")
+}
+
+/// A style's cell properties (TST.CellStyleArchive: cell_properties 11,
+/// cell_fill 1), through its parents.
+fn cell_fill(store: &Store, id: Option<u64>) -> Option<Option<Color>> {
+    let mut cur = id;
+    for _ in 0..MAX_CHAIN {
+        let (_, m) = store.get(cur?)?;
+        if let Some(f) = m.msg(11).and_then(|cp| cp.msg(1)) {
+            return Some(fill_color(f));
+        }
+        cur = m.msg(1).and_then(|s| s.reference(3));
+    }
+    None
+}
+
+/// A TSD.StrokeArchive as a line; `None` when it draws nothing.
+fn edge(s: Msg) -> Option<Line> {
+    let l = super::shapes::stroke(s, None);
+    (l.fill != Fill::None && l.width > 0).then_some(l)
+}
+
+/// Each cell's left, right, top and bottom edges.
+type Borders = HashMap<(u32, u32), [Option<Line>; 4]>;
+
+struct Dims {
+    rows: u32,
+    cols: u32,
+    header_rows: u32,
+    header_cols: u32,
+    footer_rows: u32,
+}
+
+/// The lines a table style draws (TST.TableStyleArchive: table_properties
+/// 11, parent in field 1). TableStylePropertiesArchive: v_strokes_visible
+/// 33, h_strokes_visible 34, hr_separator_visible 35, hc_separator_visible
+/// 36, footer_separator_visible 37, table_border_visible 38; strokes: header
+/// rows 46 (separator), 47 (border), 48 (horizontal), 49 (vertical); header
+/// columns 50 (border), 51 (separator), 52, 53; footer rows 54 (separator),
+/// 55 (border), 56, 57; body 58 (horizontal border), 59 (vertical border),
+/// 60 (horizontal), 61 (vertical).
+fn style_borders(store: &Store, model: Msg, d: &Dims, out: &mut Borders) {
+    let mut chain = vec![];
+    let mut cur = model.reference(3);
+    for _ in 0..16 {
+        let Some((_, m)) = cur.and_then(|i| store.get(i)) else {
+            break;
+        };
+        if let Some(p) = m.msg(11) {
+            chain.push(p);
+        }
+        cur = m.msg(1).and_then(|s| s.reference(3));
+    }
+    if chain.is_empty() {
+        return;
+    }
+    let flag = |n: u32| chain.iter().find_map(|p| p.boolean(n)).unwrap_or(false);
+    let stroke = |n: u32, shown: bool| -> Option<Line> {
+        if !shown {
+            return None;
+        }
+        edge(chain.iter().find_map(|p| p.msg(n))?)
+    };
+    let (v_in, h_in, hr_sep, hc_sep, ft_sep, border) =
+        (flag(33), flag(34), flag(35), flag(36), flag(37), flag(38));
+    let (rows, cols, hr, hc) = (d.rows, d.cols, d.header_rows, d.header_cols);
+    let fr_start = rows.saturating_sub(d.footer_rows).max(hr);
+    let mut put = |r: u32, c: u32, side: usize, e: &Line| {
+        if r < rows && c < cols {
+            out.entry((r, c)).or_default()[side] = Some(e.clone());
+        }
+    };
+    // Horizontal lines: line y is above row y, below the last row at `rows`.
+    for y in 0..=rows {
+        let footer = d.footer_rows > 0 && y >= fr_start;
+        for (from, to, in_hc) in [(0, hc.min(cols), true), (hc.min(cols), cols, false)] {
+            let e = if y == 0 || y == rows {
+                let edge_row = if y == 0 { 0 } else { rows - 1 };
+                if edge_row < hr {
+                    stroke(47, border)
+                } else if d.footer_rows > 0 && edge_row >= fr_start {
+                    stroke(55, border)
+                } else if in_hc {
+                    stroke(50, border)
+                } else {
+                    stroke(58, border)
+                }
+            } else if hr > 0 && y == hr {
+                stroke(46, hr_sep)
+            } else if d.footer_rows > 0 && y == fr_start {
+                stroke(54, ft_sep)
+            } else if y < hr {
+                stroke(48, h_in)
+            } else if footer {
+                stroke(56, h_in)
+            } else if in_hc {
+                stroke(52, h_in)
+            } else {
+                stroke(60, h_in)
+            };
+            let Some(e) = e else { continue };
+            for c in from..to {
+                if y < rows {
+                    put(y, c, 2, &e);
+                }
+                if y > 0 {
+                    put(y - 1, c, 3, &e);
+                }
+            }
+        }
+    }
+    // Vertical lines: line x is left of column x.
+    for x in 0..=cols {
+        for (from, to, part) in [
+            (0, hr.min(rows), 1),
+            (hr.min(rows), fr_start.min(rows), 0),
+            (fr_start.min(rows), rows, 3),
+        ] {
+            let e = if x == 0 || x == cols {
+                match part {
+                    1 => stroke(47, border),
+                    3 => stroke(55, border),
+                    _ if x == 0 && hc > 0 => stroke(50, border),
+                    _ => stroke(59, border),
+                }
+            } else if hc > 0 && x == hc && part == 0 {
+                stroke(51, hc_sep)
+            } else {
+                match part {
+                    1 => stroke(49, v_in),
+                    3 => stroke(57, v_in),
+                    _ if x < hc => stroke(53, v_in),
+                    _ => stroke(61, v_in),
+                }
+            };
+            let Some(e) = e else { continue };
+            for r in from..to {
+                if x < cols {
+                    put(r, x, 0, &e);
+                }
+                if x > 0 {
+                    put(r, x - 1, 1, &e);
+                }
+            }
+        }
+    }
+}
+
+/// The fill of every second body row, when the table style bands rows
+/// (TableStylePropertiesArchive: banded_rows 1, banded_fill 2).
+fn banding(store: &Store, model: Msg) -> Option<Color> {
+    let mut cur = model.reference(3);
+    let mut banded = None;
+    let mut fill = None;
+    for _ in 0..16 {
+        let Some((_, m)) = cur.and_then(|i| store.get(i)) else {
+            break;
+        };
+        if let Some(p) = m.msg(11) {
+            banded = banded.or_else(|| p.boolean(1));
+            fill = fill.or_else(|| p.msg(2));
+        }
+        cur = m.msg(1).and_then(|s| s.reference(3));
+    }
+    banded.filter(|&b| b).and(fill).and_then(fill_color)
+}
+
+/// The borders strokes draw over the style's: TST.StrokeSidecarArchive
+/// (left 4, right 5, top 6 and bottom 7 column or row stroke layers), each a
+/// TST.StrokeLayerArchive (row_column_index 1, stroke_runs 2: origin 1,
+/// length 2, stroke 3, order 4). A run of a higher order draws over a lower
+/// one.
+fn sidecar_borders(store: &Store, model: Msg, d: &Dims, out: &mut Borders) {
+    let Some((_, side)) = model.reference(49).and_then(|r| store.get(r)) else {
+        return;
+    };
+    // (order, side 0 left 1 right 2 top 3 bottom, line index, from, to, edge)
+    let mut runs: Vec<(i64, usize, u32, u32, u32, Option<Line>)> = vec![];
+    for (field, s) in [(4u32, 0usize), (5, 1), (6, 2), (7, 3)] {
+        for layer in side.references(field).take(1 << 14) {
+            let Some((_, l)) = store.get(layer) else {
+                continue;
+            };
+            let idx = l.uint(1).unwrap_or(0) as u32;
+            for run in l.msgs(2).take(1 << 14) {
+                let origin = run.int(1).unwrap_or(0).max(0) as u32;
+                let len = run.uint(2).unwrap_or(0) as u32;
+                let Some(st) = run.msg(3) else { continue };
+                runs.push((
+                    run.int(4).unwrap_or(0),
+                    s,
+                    idx,
+                    origin,
+                    origin.saturating_add(len),
+                    edge(st),
+                ));
+            }
+        }
+    }
+    runs.sort_by_key(|r| r.0);
+    for (_, s, idx, from, to, e) in runs {
+        let horizontal = s >= 2;
+        let to = if horizontal {
+            to.min(d.cols)
+        } else {
+            to.min(d.rows)
+        };
+        for k in from..to {
+            let (r, c) = if horizontal { (idx, k) } else { (k, idx) };
+            if r >= d.rows || c >= d.cols {
+                continue;
+            }
+            out.entry((r, c)).or_default()[s] = e.clone();
+            // The cell across the line.
+            let (nr, nc, ns) = match s {
+                0 => (r, c.wrapping_sub(1), 1),
+                1 => (r, c + 1, 0),
+                2 => (r.wrapping_sub(1), c, 3),
+                _ => (r + 1, c, 2),
+            };
+            if nr < d.rows && nc < d.cols {
+                out.entry((nr, nc)).or_default()[ns] = e.clone();
+            }
+        }
+    }
+}
+
+/// Merged ranges (first row, first column, last row, last column), from the
+/// merge owner's formulas: a node of type 67 holding the row and column
+/// spans in its field 40 (rows 4, columns 3, each from 1 and to 2).
+fn merges(model: Msg) -> Vec<(u32, u32, u32, u32)> {
+    let mut out = vec![];
+    for pair in model
+        .msg(47)
+        .and_then(|m| m.msg(2))
+        .into_iter()
+        .flat_map(|s| s.msgs(3))
+        .take(1 << 16)
+    {
+        let Some(node) = pair
+            .msg(2)
+            .and_then(|f| f.msg(1))
+            .and_then(|a| a.msgs(1).next())
+        else {
+            continue;
+        };
+        if node.uint(1) != Some(67) {
+            continue;
+        }
+        let Some(t) = node.msg(40) else { continue };
+        let span = |m: Option<Msg>| {
+            m.and_then(|m| Some((m.uint(1)? as u32, m.uint(2).or(m.uint(1))? as u32)))
+        };
+        if let (Some((r1, r2)), Some((c1, c2))) = (span(t.msgs(4).next()), span(t.msgs(3).next())) {
+            out.push((r1, c1, r2, c2));
+        }
+    }
+    out
+}
+
+/// The text of a TSWP storage as a text body, in the table's text style.
+fn storage_text(
+    r: &mut Reader,
+    store: &Store,
+    storage: u64,
+    number: usize,
+    budget: &mut Budget,
+) -> Result<Option<TextBody>> {
+    match store.get(storage) {
+        Some((ty::STORAGE | ty::STORAGE_2, st)) => text::body(r, st, None, number, budget),
+        _ => Ok(None),
+    }
+}
+
+/// A table as a shape, `None` when it has no cells or is too large.
+pub fn table(
+    r: &mut Reader,
+    info: Msg,
+    number: usize,
+    budget: &mut Budget,
+) -> Result<Option<Shape>> {
+    let store = r.store;
+    let Some(model) = info.reference(2).and_then(|i| store.typed(i, 6001)) else {
+        return Ok(None);
+    };
+    let d = Dims {
+        rows: model.uint(6).unwrap_or(0).min(u64::from(u32::MAX)) as u32,
+        cols: model.uint(7).unwrap_or(0).min(u64::from(u32::MAX)) as u32,
+        header_rows: model.uint(9).unwrap_or(0) as u32,
+        header_cols: model.uint(10).unwrap_or(0) as u32,
+        footer_rows: model.uint(11).unwrap_or(0) as u32,
+    };
+    if d.rows == 0 || d.cols == 0 {
+        return Ok(None);
+    }
+    if d.rows > MAX_ROWS || d.cols > MAX_COLS || u64::from(d.rows) * u64::from(d.cols) > 1 << 18 {
+        r.p.warn("tables too large to convert");
+        return Ok(None);
+    }
+    let Some(drawable) = info.msg(1) else {
+        return Ok(None);
+    };
+    let (xf, _, _) = super::shapes::xfrm(drawable);
+    budget.shape(0)?;
+    let ds = model.msg(4).unwrap_or_default();
+    let strings = data_list(store, ds.reference(4));
+    let styles = data_list(store, ds.reference(5));
+    let rich = data_list(store, ds.reference(17));
+    let style_ref = |k: Option<u32>| k.and_then(|k| styles.get(&k)).and_then(|e| e.reference(4));
+    let def_h = model
+        .double(16)
+        .filter(|h| h.is_finite() && *h > 0.0)
+        .unwrap_or(20.0);
+    let def_w = model
+        .double(17)
+        .filter(|w| w.is_finite() && *w > 0.0)
+        .unwrap_or(98.0);
+    let rows_h = headers(store, ds.msg(1).unwrap_or_default().references(2), d.rows);
+    let cols_h = headers(store, ds.reference(2).into_iter(), d.cols);
+    let to_emu = |v: f64| (v.clamp(1.0, 20_000.0) * PT).round() as Emu;
+    let mut table = Table {
+        cols: (0..d.cols)
+            .map(|c| {
+                to_emu(
+                    cols_h
+                        .get(&c)
+                        .map_or(def_w, |h| if h.0 > 0.0 { f64::from(h.0) } else { def_w }),
+                )
+            })
+            .collect(),
+        rows: (0..d.rows)
+            .map(|rw| Row {
+                h: to_emu(
+                    rows_h
+                        .get(&rw)
+                        .map_or(def_h, |h| if h.0 > 0.0 { f64::from(h.0) } else { def_h }),
+                ),
+                cells: vec![Cell::default(); d.cols as usize],
+            })
+            .collect(),
+    };
+    budget.alloc(u64::from(d.rows) * u64::from(d.cols) * 256)?;
+    let region = |row: u32, col: u32| {
+        if row < d.header_rows {
+            1
+        } else if col < d.header_cols {
+            2
+        } else if d.footer_rows > 0 && row >= d.rows.saturating_sub(d.footer_rows) {
+            3
+        } else {
+            0
+        }
+    };
+    let region_cell = [18u32, 19, 20, 21].map(|f| model.reference(f));
+    let region_text = [24u32, 25, 26, 27].map(|f| model.reference(f));
+
+    let band = banding(store, model);
+
+    // Borders.
+    let mut borders: Borders = HashMap::new();
+    style_borders(store, model, &d, &mut borders);
+    sidecar_borders(store, model, &d, &mut borders);
+
+    // Cells.
+    let mut raws: HashMap<(u32, u32), Raw> = HashMap::new();
+    let tiles = ds.msg(3).unwrap_or_default();
+    let tile_size = tiles.uint(2).filter(|&s| s > 0).unwrap_or(256);
+    for t in tiles.msgs(1).take(1 << 16) {
+        let (Some(tid), Some((_, tile))) = (t.uint(1), t.reference(2).and_then(|x| store.get(x)))
+        else {
+            continue;
+        };
+        let bnc = tile.boolean(7).unwrap_or(false);
+        for ri in tile.msgs(5).take(1 << 16) {
+            let Some(row) = tid
+                .checked_mul(tile_size)
+                .and_then(|b| b.checked_add(ri.uint(1).unwrap_or(0)))
+                .filter(|&x| x < u64::from(d.rows))
+            else {
+                continue;
+            };
+            let wide = ri.boolean(8).unwrap_or(false);
+            let (storage, offsets) = match (ri.bytes(6), ri.bytes(7)) {
+                (Some(s), Some(o)) if bnc || !o.is_empty() => (s, o),
+                _ => (
+                    ri.bytes(3).unwrap_or_default(),
+                    ri.bytes(4).unwrap_or_default(),
+                ),
+            };
+            for (col, rec) in row_cells(storage, offsets, wide) {
+                if col >= d.cols {
+                    continue;
+                }
+                if let Some(raw) = decode(rec) {
+                    raws.insert((row as u32, col), raw);
+                }
+            }
+        }
+    }
+    for rw in 0..d.rows {
+        for col in 0..d.cols {
+            let raw = raws.get(&(rw, col));
+            let reg = region(rw, col);
+            let cell = &mut table.rows[rw as usize].cells[col as usize];
+            // Fill: the cell's style, its row's or column's, the region's.
+            let fill = [
+                style_ref(raw.and_then(|c| c.cell_style)),
+                rows_h.get(&rw).and_then(|h| h.1),
+                cols_h.get(&col).and_then(|h| h.1),
+                region_cell[reg],
+            ]
+            .into_iter()
+            .find_map(|s| cell_fill(store, s));
+            if let Some(Some(c)) = fill {
+                cell.fill = Fill::Solid(c);
+            }
+            // Every second body row, from the second, over cells that set
+            // no fill of their own.
+            let own = raw.is_some_and(|c| c.cell_style.is_some());
+            if let Some(band) = band.filter(|_| reg == 0 && !own)
+                && (rw - d.header_rows) % 2 == 1
+            {
+                cell.fill = Fill::Solid(band);
+            }
+            if let Some(b) = borders.get(&(rw, col)) {
+                cell.borders = [
+                    b[0].clone().unwrap_or_default(),
+                    b[1].clone().unwrap_or_default(),
+                    b[2].clone().unwrap_or_default(),
+                    b[3].clone().unwrap_or_default(),
+                ];
+            }
+            let Some(raw) = raw else { continue };
+            let text_style = style_ref(raw.text_style).or(region_text[reg]);
+            let plain = match raw.kind {
+                2 | 10 => raw
+                    .decimal
+                    .or(raw.double)
+                    .filter(|v| v.is_finite())
+                    .map(plain_number),
+                3 => raw
+                    .string
+                    .and_then(|k| strings.get(&k))
+                    .and_then(|e| e.string(3)),
+                5 => raw.seconds.filter(|s| s.is_finite()).map(date_text),
+                6 => raw
+                    .double
+                    .map(|v| if v > 0.0 { "TRUE" } else { "FALSE" }.to_string()),
+                7 => raw.double.filter(|v| v.is_finite()).map(plain_number),
+                8 => Some("#ERROR".to_string()),
+                _ => None,
+            };
+            if let Some(t) = plain.filter(|t| !t.is_empty()) {
+                budget.alloc(t.len() as u64 * 16)?;
+                let rp = text::run_props(r, text_style, None);
+                let mut pp = text::para_props(r, text_style, 0, None, rp.color);
+                // Numbers are at the right, as Keynote shows them.
+                if pp.align.is_none() && matches!(raw.kind, 2 | 5 | 7 | 10) {
+                    pp.align = Some("r");
+                }
+                cell.text = TextBody {
+                    body: BodyProps {
+                        insets: [91_440, 45_720, 91_440, 45_720],
+                        anchor: "ctr",
+                        ..BodyProps::default()
+                    },
+                    paras: vec![Paragraph {
+                        props: pp,
+                        runs: vec![Run {
+                            kind: RunKind::Text(t),
+                            props: rp.clone(),
+                        }],
+                        end: rp,
+                    }],
+                    levels: ListStyle::default(),
+                };
+            } else if raw.kind == 9 {
+                let storage = raw
+                    .rich
+                    .and_then(|k| rich.get(&k))
+                    .and_then(|e| e.reference(9))
+                    .and_then(|p| store.get(p))
+                    .and_then(|p| p.1.reference(1));
+                if let Some(mut t) = match storage {
+                    Some(s) => storage_text(r, store, s, number, budget)?,
+                    None => None,
+                } {
+                    t.body.insets = [91_440, 45_720, 91_440, 45_720];
+                    t.body.anchor = "ctr";
+                    cell.text = t;
+                }
+            }
+        }
+    }
+    // Merged cells: the first cell spans, the others are covered.
+    for (r1, c1, r2, c2) in merges(model).into_iter().take(1 << 14) {
+        if r1 > r2 || c1 > c2 || r2 >= d.rows || c2 >= d.cols {
+            continue;
+        }
+        for rw in r1..=r2 {
+            for col in c1..=c2 {
+                let cell = &mut table.rows[rw as usize].cells[col as usize];
+                if rw == r1 && col == c1 {
+                    cell.grid_span = c2 - c1 + 1;
+                    cell.row_span = r2 - r1 + 1;
+                } else {
+                    cell.h_merge = col > c1;
+                    cell.v_merge = rw > r1;
+                }
+            }
+        }
+    }
+    Ok(Some(Shape::new(ShapeKind::Table(Box::new(table)), xf)))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn dates_count_from_2001() {
+        assert_eq!(date_text(0.0), "2001-01-01");
+        assert_eq!(date_text(86_400.0 * 365.0), "2002-01-01");
+        // 2004 is a leap year: 2004-03-01 is 1155 days after 2001-01-01.
+        assert_eq!(date_text(86_400.0 * 1155.0), "2004-03-01");
+    }
+
+    #[test]
+    fn numbers_without_a_format() {
+        assert_eq!(plain_number(42.0), "42");
+        assert_eq!(plain_number(0.1), "0.1");
+        assert_eq!(plain_number(-1234.5678), "-1234.5678");
+    }
+
+    #[test]
+    fn offsets_of_a_row() {
+        let storage = b"aaaabbbbbbbbcccc";
+        // Columns 0, 2 and 3; column 1 empty.
+        let offs: Vec<u8> = [0i16, -1, 1, 3]
+            .iter()
+            .flat_map(|v| v.to_le_bytes())
+            .collect();
+        let cells = row_cells(storage, &offs, true);
+        assert_eq!(
+            cells,
+            vec![
+                (0, &storage[0..4]),
+                (2, &storage[4..12]),
+                (3, &storage[12..16])
+            ]
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/keynote/text.rs b/crates/exav-render/src/formats/office/slides/keynote/text.rs
new file mode 100644
index 00000000..e699b240
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/keynote/text.rs
@@ -0,0 +1,437 @@
+//! Keynote text (TSWP.StorageArchive) to paragraphs: the text with its
+//! paragraph, character and list style runs and paragraph levels, every
+//! property resolved through the styles' parents.
+//!
+//! TSWP.StorageArchive: text 3, table_para_style 5, table_para_data 6,
+//! table_list_style 7, table_char_style 8, table_attachment 9,
+//! table_smartfield 11; each table's entries 1 hold a character index 1
+//! and an object 2 (or, for paragraph data, first 2 and second 3).
+
+use super::shapes::{color, shadow};
+use super::{Props, Reader, ty};
+use crate::formats::office::common::iwa::proto::Msg;
+use crate::formats::office::slides::error::Result;
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+
+const PT: f64 = 12700.0;
+
+/// A table's entries: (character index, object reference).
+fn table(m: Option<Msg>) -> Vec<(u32, Option<u64>)> {
+    m.map(|t| {
+        t.msgs(1)
+            .take(1 << 20)
+            .map(|e| (e.uint(1).unwrap_or(0) as u32, e.reference(2)))
+            .collect()
+    })
+    .unwrap_or_default()
+}
+
+fn data_table(m: Option<Msg>) -> Vec<(u32, u32)> {
+    m.map(|t| {
+        t.msgs(1)
+            .take(1 << 20)
+            .map(|e| (e.uint(1).unwrap_or(0) as u32, e.uint(2).unwrap_or(0) as u32))
+            .collect()
+    })
+    .unwrap_or_default()
+}
+
+/// The entry in force at character `at`.
+fn at<T: Copy>(t: &[(u32, T)], at: u32) -> Option<T> {
+    t.iter().take_while(|e| e.0 <= at).last().map(|e| e.1)
+}
+
+/// A PostScript font name to a family and its weight and slant:
+/// "HelveticaNeue-Bold" is Helvetica Neue, bold.
+pub fn ps_font(name: &str) -> (String, bool, bool) {
+    let (base, style) = name.split_once('-').unwrap_or((name, ""));
+    let base = base
+        .trim_end_matches("PSMT")
+        .trim_end_matches("MT")
+        .trim_end_matches("PS");
+    let mut fam = String::new();
+    let chars: Vec<char> = base.chars().collect();
+    for (i, &c) in chars.iter().enumerate() {
+        let next_lower = chars.get(i + 1).is_some_and(|n| n.is_lowercase());
+        let prev_lower = i > 0 && chars[i - 1].is_lowercase();
+        if i > 0 && c.is_uppercase() && (prev_lower || next_lower && chars[i - 1].is_uppercase()) {
+            fam.push(' ');
+        }
+        fam.push(c);
+    }
+    let s = style.to_ascii_lowercase();
+    let bold = s.contains("bold") || s.contains("black") || s.contains("heavy");
+    let italic = s.contains("italic") || s.contains("oblique");
+    for w in [
+        "Light",
+        "Thin",
+        "Medium",
+        "UltraLight",
+        "Condensed",
+        "Semibold",
+    ] {
+        if style.contains(w) && !fam.ends_with(w) {
+            fam.push(' ');
+            fam.push_str(w);
+            break;
+        }
+    }
+    (fam, bold, italic)
+}
+
+/// Run properties from a character style over a paragraph style.
+pub(super) fn run_props(r: &Reader, para: Option<u64>, chr: Option<u64>) -> RunProps {
+    let get = |f: &dyn Fn(Msg) -> bool| -> Option<Msg> {
+        r.find(chr, Props::Char, |p| f(p).then_some(p))
+            .or_else(|| r.find(para, Props::Char, |p| f(p).then_some(p)))
+    };
+    let num = |n: u32| get(&|p: Msg| p.get(n).is_some());
+    let mut rp = RunProps::default();
+    if let Some(name) = num(5).and_then(|p| p.string(5)) {
+        let (fam, b, i) = ps_font(&name);
+        rp.font = Some(fam);
+        if b {
+            rp.bold = Some(true);
+        }
+        if i {
+            rp.italic = Some(true);
+        }
+    }
+    if let Some(b) = num(1).and_then(|p| p.boolean(1)) {
+        rp.bold = Some(b || rp.bold == Some(true));
+    }
+    if let Some(i) = num(2).and_then(|p| p.boolean(2)) {
+        rp.italic = Some(i || rp.italic == Some(true));
+    }
+    let size = num(3)
+        .and_then(|p| p.float(3))
+        .map(f64::from)
+        .unwrap_or(24.0)
+        .clamp(1.0, 4000.0);
+    rp.size = Some((size * 100.0).round() as u32);
+    rp.color = Some(
+        num(7)
+            .and_then(|p| p.msg(7))
+            .map(color)
+            .unwrap_or(Color::rgb(0)),
+    );
+    rp.baseline = match num(10).and_then(|p| p.uint(10)) {
+        Some(1) => Some(30_000),
+        Some(2) => Some(-25_000),
+        _ => None,
+    };
+    rp.underline = num(11).and_then(|p| p.uint(11)).map(|u| match u {
+        1 => "sng",
+        2 => "dbl",
+        3 => "wavy",
+        _ => "none",
+    });
+    rp.strike = num(12).and_then(|p| p.uint(12)).map(|s| match s {
+        0 => "noStrike",
+        2 | 3 => "dblStrike",
+        _ => "sngStrike",
+    });
+    rp.caps = match num(13).and_then(|p| p.uint(13)) {
+        Some(1) => Some("all"),
+        Some(2) => Some("small"),
+        _ => None,
+    };
+    if let Some(t) = num(27).and_then(|p| p.float(27)) {
+        // Tracking: thousandths of an em.
+        rp.spacing = Some((f64::from(t) * size / 10.0).round() as i32).filter(|&s| s != 0);
+    }
+    rp.shadow = num(21).and_then(|p| p.msg(21)).and_then(shadow);
+    rp.highlight = num(26).and_then(|p| p.msg(26)).map(color);
+    rp
+}
+
+pub(super) fn para_props(
+    r: &Reader,
+    para: Option<u64>,
+    level: u32,
+    list: Option<u64>,
+    color: Option<Color>,
+) -> ParaProps {
+    let p = |n: u32| r.find(para, Props::Para, |m| m.get(n).is_some().then_some(m));
+    let pts = |v: f32| (f64::from(v) * PT).round() as Emu;
+    let mut pp = ParaProps {
+        level: level.min(8) as u8,
+        align: p(1).and_then(|m| m.uint(1)).map(|a| match a {
+            1 => "r",
+            2 => "ctr",
+            3 => "just",
+            _ => "l",
+        }),
+        margin: p(11).and_then(|m| m.float(11)).map(pts),
+        indent: p(7).and_then(|m| m.float(7)).map(pts),
+        space_after: p(20)
+            .and_then(|m| m.float(20))
+            .map(|v| Spacing::Pts((f64::from(v) * 100.0).round() as i32)),
+        space_before: p(21)
+            .and_then(|m| m.float(21))
+            .map(|v| Spacing::Pts((f64::from(v) * 100.0).round() as i32)),
+        line_spacing: p(13).and_then(|m| m.msg(13)).map(|ls| {
+            let amount = f64::from(ls.float(2).unwrap_or(1.0));
+            match ls.uint(1).unwrap_or(0) {
+                0 => Spacing::Pct((amount * 100_000.0).round() as i32),
+                _ => Spacing::Pts((amount * 100.0).round() as i32),
+            }
+        }),
+        default_tab: p(4).and_then(|m| m.float(4)).map(pts),
+        bullet: Some(Bullet::None),
+        ..ParaProps::default()
+    };
+    // The list style's label at this level: label_types 11, text_indents 12,
+    // indents 13, number_types 15, strings 16, font_color 21.
+    if let Some((ty::LIST_STYLE, l)) = list.and_then(|id| r.store.get(id)) {
+        let lv = level as usize;
+        let rep_u = |n: u32| -> Vec<u64> {
+            let mut v = vec![];
+            for x in l.all(n) {
+                match x {
+                    crate::formats::office::common::iwa::proto::Val::Varint(u) => v.push(u),
+                    crate::formats::office::common::iwa::proto::Val::Bytes(b) => {
+                        let mut p = 0;
+                        while let Some(u) =
+                            crate::formats::office::common::iwa::proto::varint(b, &mut p)
+                        {
+                            v.push(u);
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            v
+        };
+        let rep_f = |n: u32| -> Vec<f32> {
+            let mut v = vec![];
+            for x in l.all(n) {
+                match x {
+                    crate::formats::office::common::iwa::proto::Val::Fixed32(u) => {
+                        v.push(f32::from_bits(u))
+                    }
+                    crate::formats::office::common::iwa::proto::Val::Bytes(b) => {
+                        v.extend(b.as_chunks::<4>().0.iter().map(|c| f32::from_le_bytes(*c)))
+                    }
+                    _ => {}
+                }
+            }
+            v
+        };
+        let types = rep_u(11);
+        let kind = types.get(lv).or(types.last()).copied().unwrap_or(0);
+        let strings: Vec<String> = l
+            .all(16)
+            .filter_map(|v| match v {
+                crate::formats::office::common::iwa::proto::Val::Bytes(b) => {
+                    Some(String::from_utf8_lossy(b).into_owned())
+                }
+                _ => None,
+            })
+            .collect();
+        let lcolor = l.msg(21).map(super::shapes::color).or(color);
+        pp.bullet = Some(match kind {
+            2 => Bullet::Char {
+                ch: strings
+                    .get(lv)
+                    .or(strings.last())
+                    .and_then(|s| s.chars().next())
+                    .unwrap_or('\u{2022}'),
+                font: None,
+                color: lcolor,
+                size: None,
+            },
+            1 => Bullet::Char {
+                ch: '\u{2022}',
+                font: None,
+                color: lcolor,
+                size: None,
+            },
+            3 => {
+                let nt = rep_u(15);
+                let n = nt.get(lv).or(nt.last()).copied().unwrap_or(0);
+                Bullet::AutoNum {
+                    scheme: match n {
+                        1 => "arabicParenBoth",
+                        2 => "arabicParenR",
+                        3 => "romanUcPeriod",
+                        4 => "romanUcParenBoth",
+                        5 => "romanUcParenR",
+                        6 => "romanLcPeriod",
+                        7 => "romanLcParenBoth",
+                        8 => "romanLcParenR",
+                        9 => "alphaUcPeriod",
+                        10 => "alphaUcParenBoth",
+                        11 => "alphaUcParenR",
+                        12 => "alphaLcPeriod",
+                        13 => "alphaLcParenBoth",
+                        14 => "alphaLcParenR",
+                        _ => "arabicPeriod",
+                    },
+                    start: 1,
+                    font: None,
+                    color: lcolor,
+                    size: None,
+                }
+            }
+            _ => Bullet::None,
+        });
+        if kind != 0 {
+            let indents = rep_f(13);
+            let text_indents = rep_f(12);
+            let ind = f64::from(indents.get(lv).or(indents.last()).copied().unwrap_or(0.0));
+            let txt = f64::from(
+                text_indents
+                    .get(lv)
+                    .or(text_indents.last())
+                    .copied()
+                    .unwrap_or(20.0),
+            );
+            pp.margin = Some(((ind + txt) * PT).round() as Emu + pp.margin.unwrap_or(0));
+            pp.indent = Some((-txt * PT).round() as Emu);
+        }
+    }
+    pp
+}
+
+/// A storage's text as a text body, in a shape of style `shape_style`.
+pub fn body(
+    r: &mut Reader,
+    st: Msg,
+    shape_style: Option<u64>,
+    number: usize,
+    budget: &mut Budget,
+) -> Result<Option<TextBody>> {
+    let text: String = st
+        .all(3)
+        .filter_map(|v| match v {
+            crate::formats::office::common::iwa::proto::Val::Bytes(b) => {
+                Some(String::from_utf8_lossy(b).into_owned())
+            }
+            _ => None,
+        })
+        .collect();
+    let chars: Vec<char> = text.chars().take(1 << 20).collect();
+    budget.alloc(chars.len() as u64 * 16)?;
+    let para_styles = table(st.msg(5));
+    let list_styles = table(st.msg(7));
+    let char_styles = table(st.msg(8));
+    let attachments = table(st.msg(9));
+    let fields = table(st.msg(11));
+    let levels = data_table(st.msg(6));
+    let default_para = r.find(shape_style, Props::Text, |p| p.reference(10));
+
+    let mut paras = vec![];
+    let mut start = 0usize;
+    loop {
+        let end = (start..chars.len())
+            .find(|&i| matches!(chars[i], '\n' | '\u{2029}'))
+            .unwrap_or(chars.len());
+        let ps = at(&para_styles, start as u32).flatten().or(default_para);
+        let level = at(&levels, start as u32).unwrap_or(0).min(8);
+        let list = at(&list_styles, start as u32).flatten();
+        let base = run_props(r, ps, None);
+        let props = para_props(r, ps, level, list, base.color);
+        let mut runs: Vec<Run> = vec![];
+        let mut i = start;
+        while i < end {
+            let cs = at(&char_styles, i as u32).flatten();
+            let mut rp = run_props(r, ps, cs);
+            let link = at(&fields, i as u32)
+                .flatten()
+                .and_then(|id| match r.store.get(id) {
+                    Some((2032, f)) => f.string(2).and_then(|u| Link::url(&u)),
+                    _ => None,
+                });
+            if link.is_some() {
+                rp.link = link;
+            }
+            let c = chars[i];
+            let kind = match c {
+                '\u{2028}' | '\u{000B}' => RunKind::Break,
+                '\u{FFFC}' => match at(&attachments, i as u32)
+                    .flatten()
+                    .and_then(|id| r.store.get(id))
+                {
+                    Some((22, _)) => RunKind::Field("slidenum", number.to_string()),
+                    _ => RunKind::Text(String::new()),
+                },
+                '\t' => RunKind::Text("\t".into()),
+                c if (c as u32) < 0x20 => RunKind::Text(String::new()),
+                c => RunKind::Text(c.to_string()),
+            };
+            match (&kind, runs.last_mut()) {
+                (
+                    RunKind::Text(t),
+                    Some(Run {
+                        kind: RunKind::Text(prev),
+                        props,
+                    }),
+                ) if *props == rp => prev.push_str(t),
+                _ => runs.push(Run { kind, props: rp }),
+            }
+            i += 1;
+        }
+        paras.push(Paragraph {
+            props,
+            runs,
+            end: base,
+        });
+        if end >= chars.len() || paras.len() >= 1 << 16 {
+            break;
+        }
+        start = end + 1;
+    }
+    let pad = r.find(shape_style, Props::Text, |p| p.msg(6));
+    let ins = |n: u32| {
+        pad.and_then(|p| p.float(n))
+            .map(|v| (f64::from(v) * PT).round() as Emu)
+            .unwrap_or(0)
+            .max(0)
+    };
+    let valign = r.find(shape_style, Props::Text, |p| p.uint(2)).unwrap_or(0);
+    let shrink = r
+        .find(shape_style, Props::Text, |p| p.boolean(1))
+        .unwrap_or(false);
+    Ok(Some(TextBody {
+        body: BodyProps {
+            insets: [ins(1), ins(2), ins(3), ins(4)],
+            anchor: match valign {
+                1 => "ctr",
+                2 => "b",
+                _ => "t",
+            },
+            autofit: if shrink {
+                Autofit::Normal(100_000, 0)
+            } else {
+                Autofit::None
+            },
+            ..BodyProps::default()
+        },
+        paras,
+        levels: ListStyle::default(),
+    }))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::ps_font;
+
+    #[test]
+    fn postscript_names() {
+        assert_eq!(
+            ps_font("HelveticaNeue-Bold"),
+            ("Helvetica Neue".into(), true, false)
+        );
+        assert_eq!(
+            ps_font("TimesNewRomanPSMT"),
+            ("Times New Roman".into(), false, false)
+        );
+        assert_eq!(
+            ps_font("GillSans-LightItalic"),
+            ("Gill Sans Light".into(), false, true)
+        );
+        assert_eq!(ps_font("Arial"), ("Arial".into(), false, false));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/limits.rs b/crates/exav-render/src/formats/office/slides/limits.rs
new file mode 100644
index 00000000..e3a11f2f
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/limits.rs
@@ -0,0 +1,155 @@
+use super::error::{Error, Result};
+use super::model::{Paragraph, Run, RunKind, Shape, Sp, TextBody};
+
+/// Bounds on the work one conversion may do. A document past one of them is
+/// refused with [`Error::TooLarge`] rather than partly converted.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub struct Limits {
+    /// Bytes of input.
+    pub max_input: u64,
+    /// Memory the model and the output may take, as this module counts it:
+    /// an estimate per shape and paragraph, the bytes of each picture and
+    /// decompressed part, and the PPTX written so far.
+    pub max_memory: u64,
+    /// Bytes of one decompressed part of a package or stream.
+    pub max_part: u64,
+    /// Slides.
+    pub max_slides: u32,
+    /// Shapes over all slides, masters and layouts, group members included.
+    pub max_shapes: u64,
+}
+
+impl Default for Limits {
+    fn default() -> Self {
+        Limits {
+            max_input: 512 << 20,
+            max_memory: 1 << 30,
+            max_part: 256 << 20,
+            max_slides: 10_000,
+            max_shapes: 1_000_000,
+        }
+    }
+}
+
+impl Limits {
+    /// Defaults with another memory bound.
+    pub fn with_max_memory(mut self, bytes: u64) -> Self {
+        self.max_memory = bytes;
+        self
+    }
+
+    /// Defaults with another shape bound.
+    pub fn with_max_shapes(mut self, n: u64) -> Self {
+        self.max_shapes = n;
+        self
+    }
+}
+
+/// What a conversion has used of its [`Limits`].
+pub(crate) struct Budget {
+    pub limits: Limits,
+    shapes: u64,
+    memory: u64,
+    /// The slides to convert, by index; the others are counted only.
+    wanted: std::ops::Range<usize>,
+}
+
+/// What one shape costs in the model, beyond its text and pictures: the shape
+/// and the largest of what it holds.
+pub(crate) const SHAPE_BYTES: u64 = (size_of::<Shape>() + size_of::<Sp>()) as u64;
+
+/// What the paragraphs and runs of a text body take in the model: each one's
+/// size, as it is held, and the text of the runs.
+pub(crate) fn text_bytes(text: &TextBody) -> u64 {
+    text.paras
+        .iter()
+        .map(|p| {
+            let runs: usize = p
+                .runs
+                .iter()
+                .map(|r| {
+                    size_of::<Run>()
+                        + match &r.kind {
+                            RunKind::Text(s) | RunKind::Field(_, s) => s.len(),
+                            RunKind::Break => 0,
+                        }
+                })
+                .sum();
+            (size_of::<Paragraph>() + runs) as u64
+        })
+        .sum()
+}
+
+impl Budget {
+    pub fn new(limits: Limits) -> Self {
+        Budget {
+            limits,
+            shapes: 0,
+            memory: 0,
+            wanted: 0..usize::MAX,
+        }
+    }
+
+    /// Converts only the slides of `range`.
+    pub fn only(mut self, range: std::ops::Range<usize>) -> Self {
+        self.wanted = range;
+        self
+    }
+
+    /// Whether slide `index` is converted.
+    pub fn wants(&self, index: usize) -> bool {
+        self.wanted.contains(&index)
+    }
+
+    /// One more shape, and `extra` bytes of its own text.
+    pub fn shape(&mut self, extra: usize) -> Result<()> {
+        self.shapes += 1;
+        if self.shapes > self.limits.max_shapes {
+            return Err(Error::TooLarge("shapes"));
+        }
+        self.alloc(SHAPE_BYTES + extra as u64)
+    }
+
+    /// `bytes` more held in memory.
+    pub fn alloc(&mut self, bytes: u64) -> Result<()> {
+        self.memory = self.memory.saturating_add(bytes);
+        if self.memory > self.limits.max_memory {
+            return Err(Error::TooLarge("memory"));
+        }
+        Ok(())
+    }
+
+    /// What `xml::parse` charges the memory of a tree to.
+    pub fn tree(&mut self) -> impl FnMut(u64) -> bool + '_ {
+        |bytes| self.alloc(bytes).is_ok()
+    }
+
+    /// One more slide, `count` being those read so far.
+    pub fn slide(&self, count: usize) -> Result<()> {
+        if count as u64 >= u64::from(self.limits.max_slides) {
+            return Err(Error::TooLarge("slides"));
+        }
+        Ok(())
+    }
+
+    pub fn used(&self) -> u64 {
+        self.memory
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn shapes_and_memory_are_bounded() {
+        let mut b = Budget::new(Limits::default().with_max_shapes(2));
+        assert!(b.shape(0).is_ok());
+        assert!(b.shape(0).is_ok());
+        assert_eq!(b.shape(0), Err(Error::TooLarge("shapes")));
+        let mut b = Budget::new(Limits::default().with_max_memory(1000));
+        assert!(b.alloc(999).is_ok());
+        assert_eq!(b.alloc(2), Err(Error::TooLarge("memory")));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/mod.rs b/crates/exav-render/src/formats/office/slides/mod.rs
new file mode 100644
index 00000000..fd0ceb5d
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/mod.rs
@@ -0,0 +1,205 @@
+//! Presentations to PPTX: PowerPoint 95 and 97 to 2003 (PPT, PPS, POT; 2 to
+//! 4 are recognised and reported as unsupported), OpenDocument (ODP, OTP,
+//! FODP) and Apple Keynote (every version), converted for a PPTX renderer to
+//! draw. OpenDocument drawings (ODG, OTG, FODG) and Visio drawings (VSDX,
+//! VSDM, VSTX, VSTM) too: each page is a slide, named as the page is.
+
+mod error;
+mod keynote;
+mod limits;
+mod model;
+mod odp;
+mod package;
+mod ppt;
+mod pptx;
+mod text;
+mod vsdx;
+
+pub use error::Error;
+pub use limits::Limits;
+pub use package::Source;
+
+/// The formats this module converts.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum Format {
+    /// PowerPoint presentations, shows and templates (.ppt, .pps, .pot):
+    /// 95 and 97 to 2003 are read, 2 to 4 refused as unsupported.
+    Ppt,
+    /// OpenDocument presentations and templates (.odp, .otp).
+    Odp,
+    /// Flat OpenDocument presentations (.fodp).
+    Fodp,
+    /// Apple Keynote documents (.key), as one file, a package directory
+    /// given file by file, or the XML of Keynote 1 to 5 alone.
+    Keynote,
+    /// OpenDocument drawings and templates (.odg, .otg): each page a slide,
+    /// the pages' largest size the PPTX's.
+    Odg,
+    /// Flat OpenDocument drawings (.fodg).
+    Fodg,
+    /// Visio 2013 and later drawings and templates (.vsdx, .vsdm, .vstx,
+    /// .vstm): each page a slide, the pages' largest size the PPTX's.
+    Vsdx,
+}
+
+impl Format {
+    /// The format of a file extension (without its dot, any case).
+    pub fn from_extension(ext: &str) -> Option<Format> {
+        Some(match ext.to_ascii_lowercase().as_str() {
+            "ppt" | "pps" | "pot" => Format::Ppt,
+            "odp" | "otp" => Format::Odp,
+            "fodp" => Format::Fodp,
+            "key" | "keynote" => Format::Keynote,
+            "odg" | "otg" => Format::Odg,
+            "fodg" => Format::Fodg,
+            "vsdx" | "vsdm" | "vstx" | "vstm" => Format::Vsdx,
+            _ => return None,
+        })
+    }
+
+    pub fn name(self) -> &'static str {
+        match self {
+            Format::Ppt => "ppt",
+            Format::Odp => "odp",
+            Format::Fodp => "fodp",
+            Format::Keynote => "key",
+            Format::Odg => "odg",
+            Format::Fodg => "fodg",
+            Format::Vsdx => "vsdx",
+        }
+    }
+}
+
+/// A converted document.
+#[derive(Debug)]
+pub struct Converted {
+    /// The PPTX package.
+    pub pptx: Vec<u8>,
+    /// Slides in the PPTX.
+    pub slides: usize,
+    /// Slides in the document: more than `slides` from [`convert_first`].
+    pub total_slides: usize,
+    /// What was left out or could not be read, for diagnostics.
+    pub warnings: Vec<String>,
+}
+
+/// Converts `input`, a document of `format`, to PPTX.
+pub fn convert(input: &[u8], format: Format, limits: &Limits) -> Result<Converted, Error> {
+    convert_first(input, format, limits, usize::MAX)
+}
+
+/// Converts the masters and the first `n` slides of `input` only, to show
+/// them while the whole document converts. The pictures and parts of the
+/// other slides are not read. Links to slides past `n` are dropped.
+pub fn convert_first(
+    input: &[u8],
+    format: Format,
+    limits: &Limits,
+    n: usize,
+) -> Result<Converted, Error> {
+    if input.len() as u64 > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits).only(0..n);
+    let p = read(input, format, &mut budget)?;
+    finish(p, &budget)
+}
+
+/// `input` read into the model, whatever its format.
+fn read(
+    input: &[u8],
+    format: Format,
+    budget: &mut limits::Budget,
+) -> Result<model::Presentation, Error> {
+    Ok(match format {
+        Format::Ppt => ppt::read(input, budget)?,
+        Format::Odp => odp::read_odp(package::Zip::open(input)?, budget)?,
+        Format::Fodp => odp::read_fodp(input, budget)?,
+        Format::Odg => odp::read_odg(package::Zip::open(input)?, budget)?,
+        Format::Fodg => odp::read_fodg(input, budget)?,
+        Format::Vsdx => vsdx::read_bytes(input, budget)?,
+        Format::Keynote if keynote::is_bare_xml(input) => keynote::read_bare(input, budget)?,
+        Format::Keynote => keynote::read(package::Zip::open(input), budget)?,
+    })
+}
+
+/// The text of `input`, a document of `format`, cut at `cap` bytes: a section
+/// to a slide, from the model the reader fills and not from a PPTX written
+/// and read back. Refuses what [`convert`] refuses.
+pub fn text(
+    input: &[u8],
+    format: Format,
+    limits: &Limits,
+    cap: usize,
+) -> Result<crate::formats::office::text::Text, Error> {
+    if input.len() as u64 > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits);
+    let p = read(input, format, &mut budget)?;
+    let mut out = crate::formats::office::text::Out::new(cap);
+    text::lines(&p, &mut out);
+    Ok(out.finish())
+}
+
+/// As [`convert_first`], reading the document from `source`. An ODP or
+/// Keynote package is read part by part, as the conversion asks for them:
+/// its directory, its content and styles, and the pictures of the slides
+/// converted, so that a source that fetches byte ranges fetches only those.
+/// A PPT or FODP is read whole.
+pub fn convert_first_from<S: Source>(
+    mut source: S,
+    format: Format,
+    limits: &Limits,
+    n: usize,
+) -> Result<Converted, Error> {
+    let size = source
+        .seek(std::io::SeekFrom::End(0))
+        .map_err(|e| Error::Malformed(format!("the source: {e}")))?;
+    if size > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits).only(0..n);
+    let p = match format {
+        Format::Odp => odp::read_odp(package::Zip::from_source(Box::new(source))?, &mut budget)?,
+        Format::Odg => odp::read_odg(package::Zip::from_source(Box::new(source))?, &mut budget)?,
+        Format::Vsdx => vsdx::read_source(Box::new(source), &mut budget)?,
+        Format::Keynote => keynote::read(package::Zip::from_source(Box::new(source)), &mut budget)?,
+        Format::Ppt | Format::Fodp | Format::Fodg => {
+            let mut bytes = vec![];
+            source
+                .seek(std::io::SeekFrom::Start(0))
+                .and_then(|_| source.read_to_end(&mut bytes))
+                .map_err(|e| Error::Malformed(format!("the source: {e}")))?;
+            return convert_first(&bytes, format, limits, n);
+        }
+    };
+    finish(p, &budget)
+}
+
+/// Converts an Apple Keynote document saved as a package directory, given
+/// as its files: paths relative to the package and contents.
+pub fn convert_keynote_package(
+    files: &[(&str, &[u8])],
+    limits: &Limits,
+) -> Result<Converted, Error> {
+    let total: u64 = files.iter().map(|f| f.1.len() as u64).sum();
+    if total > limits.max_input {
+        return Err(Error::TooLarge("input"));
+    }
+    let mut budget = limits::Budget::new(*limits);
+    let p = keynote::read_package(files, &mut budget)?;
+    finish(p, &budget)
+}
+
+fn finish(mut p: model::Presentation, budget: &limits::Budget) -> Result<Converted, Error> {
+    let left = budget.limits.max_memory.saturating_sub(budget.used());
+    let pptx = pptx::write(&mut p, left)?;
+    Ok(Converted {
+        pptx,
+        slides: p.slides.len(),
+        total_slides: p.total_slides.max(p.slides.len()),
+        warnings: p.warnings,
+    })
+}
diff --git a/crates/exav-render/src/formats/office/slides/model.rs b/crates/exav-render/src/formats/office/slides/model.rs
new file mode 100644
index 00000000..7d9705ba
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/model.rs
@@ -0,0 +1,597 @@
+//! The presentation model the readers fill and the PPTX writer serializes.
+//! It follows DrawingML closely, with every property resolved by the
+//! reader: colours are RGB, text carries its own sizes and fonts, and
+//! shapes their own geometry, so that the PPTX does not depend on how a
+//! renderer resolves inheritance.
+
+/// English Metric Units: 914400 per inch, 12700 per point.
+pub type Emu = i64;
+
+/// 0xRRGGBB.
+pub type Rgb = u32;
+
+#[derive(Debug, Default)]
+pub struct Presentation {
+    /// Slide size.
+    pub width: Emu,
+    pub height: Emu,
+    pub masters: Vec<Master>,
+    pub slides: Vec<Slide>,
+    /// Slides in the document, those not converted included.
+    pub total_slides: usize,
+    pub media: Vec<Media>,
+    pub warnings: Vec<String>,
+}
+
+impl Presentation {
+    /// Adds a picture, returning its index; identical bytes are kept once.
+    pub fn add_media(&mut self, ext: &'static str, data: Vec<u8>) -> usize {
+        if let Some(i) = self
+            .media
+            .iter()
+            .position(|m| m.ext == ext && m.data == data)
+        {
+            return i;
+        }
+        self.media.push(Media { ext, data });
+        self.media.len() - 1
+    }
+
+    pub fn warn(&mut self, w: impl Into<String>) {
+        let w = w.into();
+        if !self.warnings.contains(&w) && self.warnings.len() < 100 {
+            self.warnings.push(w);
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Media {
+    /// png, jpeg, gif, bmp, tiff, emf, wmf, svg.
+    pub ext: &'static str,
+    pub data: Vec<u8>,
+}
+
+#[derive(Debug, Clone)]
+pub struct Theme {
+    pub name: String,
+    /// dk1, lt1, dk2, lt2, accent1 to accent6, hlink, folHlink.
+    pub colors: [Rgb; 12],
+    pub major_font: String,
+    pub minor_font: String,
+}
+
+impl Default for Theme {
+    fn default() -> Self {
+        Theme {
+            name: "Office".into(),
+            colors: [
+                0x000000, 0xFFFFFF, 0x44546A, 0xE7E6E6, 0x4472C4, 0xED7D31, 0xA5A5A5, 0xFFC000,
+                0x5B9BD5, 0x70AD47, 0x0563C1, 0x954F72,
+            ],
+            major_font: "Arial".into(),
+            minor_font: "Arial".into(),
+        }
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct Master {
+    pub name: String,
+    pub theme: Theme,
+    pub background: Option<Fill>,
+    pub shapes: Vec<Shape>,
+    pub title_style: ListStyle,
+    pub body_style: ListStyle,
+    pub other_style: ListStyle,
+    /// At least one is written, a blank one when empty.
+    pub layouts: Vec<Layout>,
+}
+
+#[derive(Debug, Default)]
+pub struct Layout {
+    pub name: String,
+    /// ST_SlideLayoutType: title, obj, blank, titleOnly, twoObj...
+    pub kind: &'static str,
+    pub background: Option<Fill>,
+    pub shapes: Vec<Shape>,
+    pub show_master_shapes: bool,
+}
+
+#[derive(Debug, Default)]
+pub struct Slide {
+    /// The page's name in a drawing; presentations leave it out.
+    pub name: Option<String>,
+    pub master: usize,
+    pub layout: usize,
+    pub background: Option<Fill>,
+    pub shapes: Vec<Shape>,
+    pub hidden: bool,
+    pub show_master_shapes: bool,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Xfrm {
+    pub x: Emu,
+    pub y: Emu,
+    pub w: Emu,
+    pub h: Emu,
+    /// Degrees, clockwise.
+    pub rot: f64,
+    pub flip_h: bool,
+    pub flip_v: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct Shape {
+    pub name: String,
+    pub descr: String,
+    pub xfrm: Xfrm,
+    pub kind: ShapeKind,
+    pub placeholder: Option<Placeholder>,
+    pub link: Option<Link>,
+    pub hidden: bool,
+}
+
+impl Shape {
+    pub fn new(kind: ShapeKind, xfrm: Xfrm) -> Shape {
+        Shape {
+            name: String::new(),
+            descr: String::new(),
+            xfrm,
+            kind,
+            placeholder: None,
+            link: None,
+            hidden: false,
+        }
+    }
+}
+
+impl ShapeKind {
+    /// What stands for a movie that cannot play, with no poster frame, in a
+    /// box of `w` by `h`: a dark box with a white play triangle (`video`),
+    /// or a pale box with a grey one (a sound).
+    pub fn media_placeholder(w: Emu, h: Emu, video: bool) -> ShapeKind {
+        let (w, h) = (w.max(1), h.max(1));
+        let (back, mark) = if video {
+            (0x202020, 0xFFFFFF)
+        } else {
+            (0xE8E8E8, 0x808080)
+        };
+        let side = (w.min(h) as f64 * 0.3).max(1.0);
+        let (tw, th) = (side * 0.87, side);
+        let triangle = Shape::new(
+            ShapeKind::Sp(Box::new(Sp {
+                geom: Geometry::preset("triangle"),
+                fill: Fill::Solid(Color::rgb(mark)),
+                ..Sp::default()
+            })),
+            Xfrm {
+                x: ((w as f64 - tw) / 2.0).round() as Emu,
+                y: ((h as f64 - th) / 2.0).round() as Emu,
+                w: tw.round() as Emu,
+                h: th.round() as Emu,
+                // Pointing right.
+                rot: 90.0,
+                ..Xfrm::default()
+            },
+        );
+        let back = Shape::new(
+            ShapeKind::Sp(Box::new(Sp {
+                fill: Fill::Solid(Color::rgb(back)),
+                ..Sp::default()
+            })),
+            Xfrm {
+                x: 0,
+                y: 0,
+                w,
+                h,
+                ..Xfrm::default()
+            },
+        );
+        let child = Xfrm {
+            x: 0,
+            y: 0,
+            w,
+            h,
+            ..Xfrm::default()
+        };
+        ShapeKind::Group(Box::new(Group {
+            child,
+            shapes: vec![back, triangle],
+        }))
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Placeholder {
+    /// ST_PlaceholderType: title, body, ctrTitle, subTitle, dt, ftr,
+    /// sldNum, obj, pic, tbl, chart...
+    pub kind: &'static str,
+    pub idx: Option<u32>,
+}
+
+impl Link {
+    /// A link to `href`, unless empty, internal (#...), or of a scheme
+    /// that runs code (javascript:, vbscript:, data:).
+    pub fn url(href: &str) -> Option<Link> {
+        let t = href.trim();
+        let l = t.to_ascii_lowercase();
+        if t.is_empty()
+            || t.starts_with('#')
+            || l.starts_with("javascript:")
+            || l.starts_with("vbscript:")
+            || l.starts_with("data:")
+        {
+            return None;
+        }
+        Some(Link::Url(t.to_string()))
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Link {
+    Url(String),
+    /// A slide of this presentation, 0-based.
+    Slide(usize),
+    NextSlide,
+    PrevSlide,
+    FirstSlide,
+    LastSlide,
+}
+
+#[derive(Debug, Clone)]
+pub enum ShapeKind {
+    Sp(Box<Sp>),
+    Pic(Box<Pic>),
+    Group(Box<Group>),
+    Table(Box<Table>),
+    /// A DrawingML chart part's XML (c:chartSpace).
+    Chart(String),
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Sp {
+    pub geom: Geometry,
+    pub fill: Fill,
+    pub line: Line,
+    pub shadow: Option<Shadow>,
+    pub text: Option<TextBody>,
+    /// Written as a connector (p:cxnSp), which holds no text.
+    pub connector: bool,
+    /// Where the text goes in a custom geometry, as fractions of the
+    /// shape (left, top, right, bottom); the whole shape when `None`.
+    pub text_rect: Option<[f64; 4]>,
+}
+
+#[derive(Debug, Clone)]
+pub struct Pic {
+    pub media: usize,
+    /// Fractions of the picture cut from the left, top, right, bottom,
+    /// in 1/100000.
+    pub crop: [i32; 4],
+    pub geom: Geometry,
+    pub line: Line,
+    pub shadow: Option<Shadow>,
+    /// 0 to 100000.
+    pub alpha: Option<u32>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Group {
+    /// The children's coordinate space.
+    pub child: Xfrm,
+    pub shapes: Vec<Shape>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Table {
+    pub cols: Vec<Emu>,
+    pub rows: Vec<Row>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Row {
+    pub h: Emu,
+    pub cells: Vec<Cell>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Cell {
+    pub text: TextBody,
+    pub fill: Fill,
+    /// Left, right, top, bottom.
+    pub borders: [Line; 4],
+    pub grid_span: u32,
+    pub row_span: u32,
+    /// Covered by a cell to its left or above.
+    pub h_merge: bool,
+    pub v_merge: bool,
+}
+
+#[derive(Debug, Clone)]
+pub enum Geometry {
+    Preset {
+        name: &'static str,
+        /// Adjust values by guide name (adj, adj1...).
+        adj: Vec<(&'static str, i64)>,
+    },
+    Custom(Vec<Path>),
+}
+
+impl Default for Geometry {
+    fn default() -> Self {
+        Geometry::Preset {
+            name: "rect",
+            adj: vec![],
+        }
+    }
+}
+
+impl Geometry {
+    pub fn preset(name: &'static str) -> Geometry {
+        Geometry::Preset { name, adj: vec![] }
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Path {
+    pub w: i64,
+    pub h: i64,
+    pub fill: bool,
+    pub stroke: bool,
+    pub cmds: Vec<PathCmd>,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum PathCmd {
+    Move(i64, i64),
+    Line(i64, i64),
+    Cubic(i64, i64, i64, i64, i64, i64),
+    Quad(i64, i64, i64, i64),
+    Close,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Color {
+    pub rgb: Rgb,
+    /// 0 to 100000; `None` is opaque.
+    pub alpha: Option<u32>,
+}
+
+impl Color {
+    pub fn rgb(rgb: Rgb) -> Color {
+        Color {
+            rgb: rgb & 0xFF_FFFF,
+            alpha: None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Default, PartialEq)]
+pub enum Fill {
+    #[default]
+    None,
+    Solid(Color),
+    Gradient(Gradient),
+    Picture {
+        media: usize,
+        tile: bool,
+    },
+    Pattern {
+        preset: &'static str,
+        fg: Color,
+        bg: Color,
+    },
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Gradient {
+    /// Position (0 to 100000) and colour.
+    pub stops: Vec<(u32, Color)>,
+    pub kind: GradientKind,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum GradientKind {
+    /// Angle in degrees, clockwise from left to right.
+    Linear(f64),
+    /// circle, rect or shape, with the focus rectangle (l, t, r, b) in
+    /// 1/100000 of the shape.
+    Path(&'static str, [i32; 4]),
+}
+
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct Line {
+    pub fill: Fill,
+    pub width: Emu,
+    /// ST_PresetLineDashVal, `None` for solid.
+    pub dash: Option<&'static str>,
+    pub cap: Option<&'static str>,
+    pub join: Option<&'static str>,
+    pub compound: Option<&'static str>,
+    pub head: Option<Arrow>,
+    pub tail: Option<Arrow>,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Arrow {
+    /// triangle, stealth, diamond, oval, arrow.
+    pub kind: &'static str,
+    /// sm, med, lg.
+    pub w: &'static str,
+    pub len: &'static str,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Shadow {
+    pub color: Color,
+    pub blur: Emu,
+    pub dist: Emu,
+    /// Degrees.
+    pub dir: f64,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct TextBody {
+    pub body: BodyProps,
+    pub paras: Vec<Paragraph>,
+    /// Per-level defaults, written as the body's list style.
+    pub levels: ListStyle,
+}
+
+#[derive(Debug, Clone)]
+pub struct BodyProps {
+    /// Left, top, right, bottom.
+    pub insets: [Emu; 4],
+    /// t, ctr, b.
+    pub anchor: &'static str,
+    pub anchor_ctr: bool,
+    pub wrap: bool,
+    /// vert, vert270, eaVert...
+    pub vert: Option<&'static str>,
+    pub autofit: Autofit,
+    /// Text rotation in degrees.
+    pub rot: f64,
+    pub columns: u32,
+}
+
+impl Default for BodyProps {
+    fn default() -> Self {
+        BodyProps {
+            insets: [91440, 45720, 91440, 45720],
+            anchor: "t",
+            anchor_ctr: false,
+            wrap: true,
+            vert: None,
+            autofit: Autofit::None,
+            rot: 0.0,
+            columns: 1,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Autofit {
+    None,
+    /// The shape grows with its text.
+    Shape,
+    /// The text shrinks: font scale and line spacing reduction, 1/1000 %.
+    Normal(u32, u32),
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Paragraph {
+    pub props: ParaProps,
+    pub runs: Vec<Run>,
+    /// The paragraph mark's properties (an empty paragraph's height).
+    pub end: RunProps,
+}
+
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct ParaProps {
+    pub level: u8,
+    /// l, ctr, r, just, dist.
+    pub align: Option<&'static str>,
+    pub margin: Option<Emu>,
+    pub indent: Option<Emu>,
+    pub line_spacing: Option<Spacing>,
+    pub space_before: Option<Spacing>,
+    pub space_after: Option<Spacing>,
+    pub bullet: Option<Bullet>,
+    pub tabs: Vec<(Emu, &'static str)>,
+    pub default_tab: Option<Emu>,
+    pub rtl: bool,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Spacing {
+    /// 1/1000 of a percent of the line: 100000 is single.
+    Pct(i32),
+    /// 1/100 of a point.
+    Pts(i32),
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Bullet {
+    None,
+    Char {
+        ch: char,
+        font: Option<String>,
+        color: Option<Color>,
+        /// 1/1000 of a percent of the text size.
+        size: Option<u32>,
+    },
+    AutoNum {
+        /// ST_TextAutonumberScheme.
+        scheme: &'static str,
+        start: u32,
+        font: Option<String>,
+        color: Option<Color>,
+        size: Option<u32>,
+    },
+    /// A picture, by media index.
+    Picture {
+        media: usize,
+        /// 1/1000 of a percent of the text size.
+        size: Option<u32>,
+    },
+}
+
+#[derive(Debug, Clone)]
+pub struct Run {
+    pub kind: RunKind,
+    pub props: RunProps,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum RunKind {
+    Text(String),
+    /// A line break within the paragraph.
+    Break,
+    /// A field: slidenum, datetime, datetime1... with its current text.
+    Field(&'static str, String),
+}
+
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct RunProps {
+    /// 1/100 of a point.
+    pub size: Option<u32>,
+    pub bold: Option<bool>,
+    pub italic: Option<bool>,
+    /// ST_TextUnderlineType: sng, dbl, none...
+    pub underline: Option<&'static str>,
+    /// sngStrike, dblStrike, noStrike.
+    pub strike: Option<&'static str>,
+    pub color: Option<Color>,
+    pub font: Option<String>,
+    pub ea_font: Option<String>,
+    pub cs_font: Option<String>,
+    pub sym_font: Option<String>,
+    /// Superscript (positive) or subscript, 1/1000 of a percent.
+    pub baseline: Option<i32>,
+    /// all, small.
+    pub caps: Option<&'static str>,
+    /// Character spacing, 1/100 of a point.
+    pub spacing: Option<i32>,
+    pub shadow: Option<Shadow>,
+    pub outline: Option<Line>,
+    pub highlight: Option<Color>,
+    pub link: Option<Link>,
+    pub lang: Option<String>,
+}
+
+/// Paragraph and run defaults for each of the nine outline levels.
+#[derive(Debug, Clone, Default)]
+pub struct ListStyle {
+    /// Up to nine, none until one is set. Nine inline are 6 KB, which every
+    /// `TextBody` and `Sp` would take, on the stack of each function that
+    /// builds a shape and again in the memory of each shape.
+    pub levels: Vec<Option<(ParaProps, RunProps)>>,
+}
+
+impl ListStyle {
+    pub fn is_empty(&self) -> bool {
+        self.levels.iter().all(Option::is_none)
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/odp/geom.rs b/crates/exav-render/src/formats/office/slides/odp/geom.rs
new file mode 100644
index 00000000..7f35ee80
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/odp/geom.rs
@@ -0,0 +1,1035 @@
+//! Drawing geometry of ODF shapes as DrawingML paths: SVG path data
+//! (svg:d, [SVG 1.1] 8.3, which ODF uses for draw:path and draw:polygon),
+//! and enhanced geometry ([ODF 1.2] part 1, 19.145 and 19.171: draw:equation
+//! formulas, modifiers and draw:enhanced-path commands), evaluated here into
+//! absolute points.
+
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::slides::model::{Geometry, Path, PathCmd};
+use std::f64::consts::PI;
+
+/// Path units per view box unit, so that small view boxes keep precision.
+fn scale_for(w: f64, h: f64) -> f64 {
+    let m = w.abs().max(h.abs());
+    if m <= 0.0 || !m.is_finite() {
+        1.0
+    } else if m < 100_000.0 {
+        100_000.0 / m
+    } else {
+        1.0
+    }
+}
+
+/// Builds paths, converting points to path units.
+struct Builder {
+    s: f64,
+    ox: f64,
+    oy: f64,
+    paths: Vec<Path>,
+    cur: Path,
+    pos: (f64, f64),
+    start: (f64, f64),
+    open: bool,
+}
+
+impl Builder {
+    fn new(vb: [f64; 4]) -> Builder {
+        let s = scale_for(vb[2], vb[3]);
+        Builder {
+            s,
+            ox: vb[0],
+            oy: vb[1],
+            paths: vec![],
+            cur: Path {
+                w: (vb[2] * s).round().max(1.0) as i64,
+                h: (vb[3] * s).round().max(1.0) as i64,
+                fill: true,
+                stroke: true,
+                cmds: vec![],
+            },
+            pos: (0.0, 0.0),
+            start: (0.0, 0.0),
+            open: false,
+        }
+    }
+
+    fn p(&self, x: f64, y: f64) -> (i64, i64) {
+        let f = |v: f64| {
+            if v.is_finite() {
+                v.clamp(-1e12, 1e12).round() as i64
+            } else {
+                0
+            }
+        };
+        (f((x - self.ox) * self.s), f((y - self.oy) * self.s))
+    }
+
+    fn move_to(&mut self, x: f64, y: f64) {
+        let (a, b) = self.p(x, y);
+        self.cur.cmds.push(PathCmd::Move(a, b));
+        self.pos = (x, y);
+        self.start = (x, y);
+        self.open = true;
+    }
+
+    fn line_to(&mut self, x: f64, y: f64) {
+        if !self.open {
+            // A path that starts with a line starts at its point.
+            if self.cur.cmds.is_empty() && self.paths.is_empty() {
+                self.move_to(x, y);
+                return;
+            }
+            self.move_to(self.pos.0, self.pos.1);
+        }
+        let (a, b) = self.p(x, y);
+        self.cur.cmds.push(PathCmd::Line(a, b));
+        self.pos = (x, y);
+    }
+
+    fn cubic(&mut self, x1: f64, y1: f64, x2: f64, y2: f64, x: f64, y: f64) {
+        if !self.open {
+            self.move_to(self.pos.0, self.pos.1);
+        }
+        let (a, b) = self.p(x1, y1);
+        let (c, d) = self.p(x2, y2);
+        let (e, f) = self.p(x, y);
+        self.cur.cmds.push(PathCmd::Cubic(a, b, c, d, e, f));
+        self.pos = (x, y);
+    }
+
+    fn quad(&mut self, x1: f64, y1: f64, x: f64, y: f64) {
+        let (p0x, p0y) = self.pos;
+        self.cubic(
+            p0x + 2.0 / 3.0 * (x1 - p0x),
+            p0y + 2.0 / 3.0 * (y1 - p0y),
+            x + 2.0 / 3.0 * (x1 - x),
+            y + 2.0 / 3.0 * (y1 - y),
+            x,
+            y,
+        );
+    }
+
+    fn close(&mut self) {
+        if self.open {
+            self.cur.cmds.push(PathCmd::Close);
+            self.pos = self.start;
+        }
+    }
+
+    /// An elliptical arc from angle `a0` sweeping `sweep` (radians, in the
+    /// y-down plane), as cubics; a line or move to its start first.
+    #[allow(clippy::too_many_arguments)]
+    fn arc(&mut self, cx: f64, cy: f64, rx: f64, ry: f64, a0: f64, sweep: f64, mv: bool) {
+        let sx = cx + rx * a0.cos();
+        let sy = cy + ry * a0.sin();
+        if mv || !self.open {
+            self.move_to(sx, sy);
+        } else {
+            self.line_to(sx, sy);
+        }
+        if sweep == 0.0 || !sweep.is_finite() {
+            return;
+        }
+        let n = (sweep.abs() / (PI / 2.0)).ceil().clamp(1.0, 64.0) as usize;
+        let step = sweep / n as f64;
+        let k = 4.0 / 3.0 * (step / 4.0).tan();
+        let mut a = a0;
+        for _ in 0..n {
+            let b = a + step;
+            let (ca, sa, cb, sb) = (a.cos(), a.sin(), b.cos(), b.sin());
+            self.cubic(
+                cx + rx * (ca - k * sa),
+                cy + ry * (sa + k * ca),
+                cx + rx * (cb + k * sb),
+                cy + ry * (sb - k * cb),
+                cx + rx * cb,
+                cy + ry * sb,
+            );
+            a = b;
+        }
+    }
+
+    /// Ends the current subpath group (N): later commands start a new path.
+    fn end(&mut self) {
+        if !self.cur.cmds.is_empty() {
+            let next = Path {
+                w: self.cur.w,
+                h: self.cur.h,
+                fill: true,
+                stroke: true,
+                cmds: vec![],
+            };
+            self.paths.push(std::mem::replace(&mut self.cur, next));
+        }
+        self.open = false;
+    }
+
+    fn finish(mut self) -> Option<Geometry> {
+        self.end();
+        if self.paths.is_empty() || self.paths.len() > 4096 {
+            return None;
+        }
+        for p in &mut self.paths {
+            even_odd(p);
+        }
+        Some(Geometry::Custom(self.paths))
+    }
+}
+
+/// One subpath's commands with its bounds and signed area (of the polygon
+/// through its points).
+struct Sub {
+    cmds: Vec<PathCmd>,
+    bounds: [i64; 4],
+    area: f64,
+}
+
+fn points_of(c: &PathCmd) -> Vec<(i64, i64)> {
+    match *c {
+        PathCmd::Move(x, y) | PathCmd::Line(x, y) => vec![(x, y)],
+        PathCmd::Cubic(a, b, c, d, e, f) => vec![(a, b), (c, d), (e, f)],
+        PathCmd::Quad(a, b, c, d) => vec![(a, b), (c, d)],
+        PathCmd::Close => vec![],
+    }
+}
+
+/// The end point of a command, if it has one.
+fn end_of(c: &PathCmd) -> Option<(i64, i64)> {
+    match *c {
+        PathCmd::Move(x, y) | PathCmd::Line(x, y) => Some((x, y)),
+        PathCmd::Cubic(.., x, y) | PathCmd::Quad(_, _, x, y) => Some((x, y)),
+        PathCmd::Close => None,
+    }
+}
+
+/// `cmds` traversed backwards: the same outline in the other direction.
+fn reversed(cmds: &[PathCmd]) -> Vec<PathCmd> {
+    let closed = matches!(cmds.last(), Some(PathCmd::Close));
+    let body = &cmds[..cmds.len() - usize::from(closed)];
+    // The points the outline passes through, with the segments between.
+    let mut start = (0, 0);
+    let mut segs: Vec<((i64, i64), &PathCmd)> = vec![];
+    let mut cur = (0, 0);
+    for c in body {
+        match c {
+            PathCmd::Move(x, y) => {
+                start = (*x, *y);
+                cur = start;
+            }
+            c => {
+                segs.push((cur, c));
+                cur = end_of(c).unwrap_or(cur);
+            }
+        }
+    }
+    let mut out = vec![PathCmd::Move(cur.0, cur.1)];
+    for (from, c) in segs.into_iter().rev() {
+        out.push(match *c {
+            PathCmd::Line(..) => PathCmd::Line(from.0, from.1),
+            PathCmd::Cubic(a, b, c, d, ..) => PathCmd::Cubic(c, d, a, b, from.0, from.1),
+            PathCmd::Quad(a, b, ..) => PathCmd::Quad(a, b, from.0, from.1),
+            _ => continue,
+        });
+    }
+    let _ = start;
+    if closed {
+        out.push(PathCmd::Close);
+    }
+    out
+}
+
+/// Fills a path with the even-odd rule, as ODF's renderers do and DrawingML
+/// does not: a subpath inside an odd number of others is drawn in the
+/// direction opposite to the first one's, so that the nonzero rule leaves
+/// it a hole. Nesting is told by the subpaths' bounds.
+fn even_odd(p: &mut Path) {
+    if !p.fill {
+        return;
+    }
+    let mut subs: Vec<Sub> = vec![];
+    for c in &p.cmds {
+        if matches!(c, PathCmd::Move(..)) || subs.is_empty() {
+            subs.push(Sub {
+                cmds: vec![],
+                bounds: [i64::MAX, i64::MAX, i64::MIN, i64::MIN],
+                area: 0.0,
+            });
+        }
+        let s = subs.last_mut().expect("pushed above");
+        s.cmds.push(*c);
+        for (x, y) in points_of(c) {
+            s.bounds = [
+                s.bounds[0].min(x),
+                s.bounds[1].min(y),
+                s.bounds[2].max(x),
+                s.bounds[3].max(y),
+            ];
+        }
+    }
+    if subs.len() < 2 || subs.len() > 64 {
+        return;
+    }
+    for s in &mut subs {
+        let pts: Vec<(i64, i64)> = s.cmds.iter().filter_map(end_of).collect();
+        let mut a = 0.0;
+        for i in 0..pts.len() {
+            let (x0, y0) = pts[i];
+            let (x1, y1) = pts[(i + 1) % pts.len()];
+            a += x0 as f64 * y1 as f64 - x1 as f64 * y0 as f64;
+        }
+        s.area = a;
+    }
+    let inside = |inner: &[i64; 4], outer: &[i64; 4]| {
+        inner[0] >= outer[0]
+            && inner[1] >= outer[1]
+            && inner[2] <= outer[2]
+            && inner[3] <= outer[3]
+            && inner != outer
+    };
+    let first_sign = subs[0].area.signum();
+    let mut changed = false;
+    for i in 1..subs.len() {
+        let depth = (0..i)
+            .filter(|&j| inside(&subs[i].bounds, &subs[j].bounds))
+            .count();
+        let want = if depth % 2 == 1 {
+            -first_sign
+        } else {
+            first_sign
+        };
+        if subs[i].area != 0.0 && subs[i].area.signum() != want {
+            subs[i].cmds = reversed(&subs[i].cmds);
+            changed = true;
+        }
+    }
+    if changed {
+        p.cmds = subs.into_iter().flat_map(|s| s.cmds).collect();
+    }
+}
+
+/// Parses a view box ("x y w h").
+pub fn view_box(s: Option<&str>) -> Option<[f64; 4]> {
+    let v: Vec<f64> = s?
+        .split([' ', ','])
+        .filter(|t| !t.is_empty())
+        .filter_map(|t| t.parse().ok())
+        .collect();
+    (v.len() == 4 && v[2] > 0.0 && v[3] > 0.0).then(|| [v[0], v[1], v[2], v[3]])
+}
+
+/// Tokens of SVG path data: commands and numbers.
+fn svg_tokens(d: &str) -> Vec<Result<char, f64>> {
+    let mut out = vec![];
+    let b = d.as_bytes();
+    let mut i = 0;
+    while i < b.len() && out.len() < 1 << 20 {
+        let c = b[i] as char;
+        if c.is_ascii_alphabetic() && c != 'e' && c != 'E' {
+            out.push(Ok(c));
+            i += 1;
+        } else if c == '-' || c == '+' || c == '.' || c.is_ascii_digit() {
+            let start = i;
+            i += 1;
+            let mut dot = c == '.';
+            while i < b.len() {
+                let d = b[i] as char;
+                if d.is_ascii_digit() {
+                    i += 1;
+                } else if d == '.' && !dot {
+                    dot = true;
+                    i += 1;
+                } else if (d == 'e' || d == 'E') && i + 1 < b.len() {
+                    i += 1;
+                    if b[i] == b'-' || b[i] == b'+' {
+                        i += 1;
+                    }
+                } else {
+                    break;
+                }
+            }
+            if let Ok(v) = d[start..i].parse::<f64>() {
+                out.push(Err(v));
+            }
+        } else {
+            i += 1;
+        }
+    }
+    out
+}
+
+/// SVG arc in endpoint form to the builder ([SVG 1.1] F.6.5). The x-axis
+/// rotation is left out: ODF writers emit unrotated arcs.
+fn svg_arc(b: &mut Builder, (rx, ry): (f64, f64), large: bool, sweep: bool, x: f64, y: f64) {
+    let (x1, y1) = b.pos;
+    let (mut rx, mut ry) = (rx.abs(), ry.abs());
+    if rx == 0.0 || ry == 0.0 || (x1 == x && y1 == y) {
+        b.line_to(x, y);
+        return;
+    }
+    let dx = (x1 - x) / 2.0;
+    let dy = (y1 - y) / 2.0;
+    let l = (dx * dx) / (rx * rx) + (dy * dy) / (ry * ry);
+    if l > 1.0 {
+        rx *= l.sqrt();
+        ry *= l.sqrt();
+    }
+    let num = rx * rx * ry * ry - rx * rx * dy * dy - ry * ry * dx * dx;
+    let den = rx * rx * dy * dy + ry * ry * dx * dx;
+    let mut co = if den == 0.0 {
+        0.0
+    } else {
+        (num / den).max(0.0).sqrt()
+    };
+    if large == sweep {
+        co = -co;
+    }
+    let cxp = co * rx * dy / ry;
+    let cyp = -co * ry * dx / rx;
+    let cx = cxp + (x1 + x) / 2.0;
+    let cy = cyp + (y1 + y) / 2.0;
+    let a0 = ((y1 - cy) / ry).atan2((x1 - cx) / rx);
+    let a1 = ((y - cy) / ry).atan2((x - cx) / rx);
+    let mut d = a1 - a0;
+    if sweep && d < 0.0 {
+        d += 2.0 * PI;
+    } else if !sweep && d > 0.0 {
+        d -= 2.0 * PI;
+    }
+    b.arc(cx, cy, rx, ry, a0, d, false);
+}
+
+/// SVG path data in view box `vb` as a custom geometry.
+pub fn svg_path(d: &str, vb: [f64; 4], closed: bool) -> Option<Geometry> {
+    let t = svg_tokens(d);
+    let mut b = Builder::new(vb);
+    if !closed {
+        b.cur.fill = false;
+    }
+    let mut i = 0;
+    let mut cmd = 'M';
+    let mut last_ctrl: Option<(f64, f64)> = None;
+    let num = |i: &mut usize| -> Option<f64> {
+        match t.get(*i) {
+            Some(Err(v)) => {
+                *i += 1;
+                Some(*v)
+            }
+            _ => None,
+        }
+    };
+    while i < t.len() {
+        if let Ok(c) = t[i] {
+            cmd = c;
+            i += 1;
+            if matches!(c, 'Z' | 'z') {
+                b.close();
+                last_ctrl = None;
+                continue;
+            }
+        }
+        let rel = cmd.is_ascii_lowercase();
+        let (px, py) = b.pos;
+        let o = |x: f64, y: f64| if rel { (px + x, py + y) } else { (x, y) };
+        let before = i;
+        match cmd.to_ascii_uppercase() {
+            'M' => {
+                let (Some(x), Some(y)) = (num(&mut i), num(&mut i)) else {
+                    break;
+                };
+                let (x, y) = o(x, y);
+                b.move_to(x, y);
+                cmd = if rel { 'l' } else { 'L' };
+                last_ctrl = None;
+            }
+            'L' => {
+                let (Some(x), Some(y)) = (num(&mut i), num(&mut i)) else {
+                    break;
+                };
+                let (x, y) = o(x, y);
+                b.line_to(x, y);
+                last_ctrl = None;
+            }
+            'H' => {
+                let Some(x) = num(&mut i) else { break };
+                b.line_to(if rel { px + x } else { x }, py);
+                last_ctrl = None;
+            }
+            'V' => {
+                let Some(y) = num(&mut i) else { break };
+                b.line_to(px, if rel { py + y } else { y });
+                last_ctrl = None;
+            }
+            'C' => {
+                let v: Vec<f64> = (0..6).filter_map(|_| num(&mut i)).collect();
+                if v.len() < 6 {
+                    break;
+                }
+                let (a, bb) = o(v[0], v[1]);
+                let (c, d) = o(v[2], v[3]);
+                let (e, f) = o(v[4], v[5]);
+                b.cubic(a, bb, c, d, e, f);
+                last_ctrl = Some((c, d));
+            }
+            'S' => {
+                let v: Vec<f64> = (0..4).filter_map(|_| num(&mut i)).collect();
+                if v.len() < 4 {
+                    break;
+                }
+                let (a, bb) = last_ctrl
+                    .map(|(cx, cy)| (2.0 * px - cx, 2.0 * py - cy))
+                    .unwrap_or((px, py));
+                let (c, d) = o(v[0], v[1]);
+                let (e, f) = o(v[2], v[3]);
+                b.cubic(a, bb, c, d, e, f);
+                last_ctrl = Some((c, d));
+            }
+            'Q' => {
+                let v: Vec<f64> = (0..4).filter_map(|_| num(&mut i)).collect();
+                if v.len() < 4 {
+                    break;
+                }
+                let (a, bb) = o(v[0], v[1]);
+                let (e, f) = o(v[2], v[3]);
+                b.quad(a, bb, e, f);
+                last_ctrl = Some((a, bb));
+            }
+            'T' => {
+                let v: Vec<f64> = (0..2).filter_map(|_| num(&mut i)).collect();
+                if v.len() < 2 {
+                    break;
+                }
+                let (a, bb) = last_ctrl
+                    .map(|(cx, cy)| (2.0 * px - cx, 2.0 * py - cy))
+                    .unwrap_or((px, py));
+                let (e, f) = o(v[0], v[1]);
+                b.quad(a, bb, e, f);
+                last_ctrl = Some((a, bb));
+            }
+            'A' => {
+                let v: Vec<f64> = (0..7).filter_map(|_| num(&mut i)).collect();
+                if v.len() < 7 {
+                    break;
+                }
+                let (x, y) = o(v[5], v[6]);
+                svg_arc(&mut b, (v[0], v[1]), v[3] != 0.0, v[4] != 0.0, x, y);
+                last_ctrl = None;
+            }
+            _ => {
+                i += 1;
+            }
+        }
+        if i == before {
+            i += 1;
+        }
+    }
+    b.finish()
+}
+
+/// svg:points ("x,y x,y ...") as a polyline or polygon path.
+pub fn points(s: &str, vb: [f64; 4], closed: bool) -> Option<Geometry> {
+    let v: Vec<f64> = s
+        .split([' ', ',', '\n', '\t'])
+        .filter(|t| !t.is_empty())
+        .filter_map(|t| t.parse().ok())
+        .take(1 << 20)
+        .collect();
+    if v.len() < 4 {
+        return None;
+    }
+    let mut b = Builder::new(vb);
+    b.cur.fill = closed;
+    b.move_to(v[0], v[1]);
+    for [x, y] in v[2..].as_chunks::<2>().0 {
+        b.line_to(*x, *y);
+    }
+    if closed {
+        b.close();
+    }
+    b.finish()
+}
+
+// ------------------------------------------------------------ enhanced geometry
+
+/// What enhanced-geometry formulas see.
+struct Env<'a> {
+    vb: [f64; 4],
+    /// The shape's size in 1/100 mm (logwidth, logheight).
+    log: (f64, f64),
+    modifiers: Vec<f64>,
+    equations: &'a [(String, String)],
+    values: Vec<Option<f64>>,
+    depth: u32,
+}
+
+impl Env<'_> {
+    fn equation(&mut self, name: &str) -> f64 {
+        let Some(i) = self.equations.iter().position(|e| e.0 == name) else {
+            return 0.0;
+        };
+        if let Some(v) = self.values[i] {
+            return v;
+        }
+        if self.depth > 64 {
+            return 0.0;
+        }
+        self.depth += 1;
+        // A cycle reads as zero.
+        self.values[i] = Some(0.0);
+        let f = self.equations[i].1.clone();
+        let v = self.eval(&f);
+        self.values[i] = Some(v);
+        self.depth -= 1;
+        v
+    }
+
+    fn eval(&mut self, s: &str) -> f64 {
+        let toks = tokens(s);
+        let mut p = Parser {
+            t: &toks,
+            i: 0,
+            env: self,
+        };
+        let v = p.expr(0);
+        if v.is_finite() { v } else { 0.0 }
+    }
+
+    /// A path parameter: number, ?equation, $modifier or keyword.
+    fn param(&mut self, s: &str) -> f64 {
+        if let Ok(v) = s.parse::<f64>() {
+            return v;
+        }
+        if let Some(n) = s.strip_prefix('?') {
+            return self.equation(n);
+        }
+        if let Some(n) = s.strip_prefix('$') {
+            return n
+                .parse::<usize>()
+                .ok()
+                .and_then(|i| self.modifiers.get(i).copied())
+                .unwrap_or(0.0);
+        }
+        self.keyword(s)
+    }
+
+    fn keyword(&self, s: &str) -> f64 {
+        match s {
+            "pi" => PI,
+            "left" => self.vb[0],
+            "top" => self.vb[1],
+            "right" => self.vb[0] + self.vb[2],
+            "bottom" => self.vb[1] + self.vb[3],
+            "width" => self.vb[2],
+            "height" => self.vb[3],
+            "logwidth" => self.log.0,
+            "logheight" => self.log.1,
+            "xstretch" | "ystretch" => 0.0,
+            "hasstroke" | "hasfill" => 1.0,
+            _ => 0.0,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+enum Tok {
+    Num(f64),
+    Ident(String),
+    Op(char),
+}
+
+fn tokens(s: &str) -> Vec<Tok> {
+    let mut out = vec![];
+    let c: Vec<char> = s.chars().collect();
+    let mut i = 0;
+    while i < c.len() && out.len() < 4096 {
+        let ch = c[i];
+        if ch.is_whitespace() {
+            i += 1;
+        } else if ch.is_ascii_digit() || ch == '.' {
+            let st = i;
+            while i < c.len() && (c[i].is_ascii_digit() || c[i] == '.') {
+                i += 1;
+            }
+            let t: String = c[st..i].iter().collect();
+            out.push(Tok::Num(t.parse().unwrap_or(0.0)));
+        } else if ch.is_alphabetic() || ch == '?' || ch == '$' || ch == '_' {
+            let st = i;
+            i += 1;
+            while i < c.len() && (c[i].is_alphanumeric() || c[i] == '_') {
+                i += 1;
+            }
+            out.push(Tok::Ident(c[st..i].iter().collect()));
+        } else {
+            out.push(Tok::Op(ch));
+            i += 1;
+        }
+    }
+    out
+}
+
+struct Parser<'t, 'e, 'a> {
+    t: &'t [Tok],
+    i: usize,
+    env: &'e mut Env<'a>,
+}
+
+impl Parser<'_, '_, '_> {
+    fn expr(&mut self, depth: u32) -> f64 {
+        if depth > 64 {
+            return 0.0;
+        }
+        let mut v = self.term(depth);
+        while let Some(Tok::Op(o @ ('+' | '-'))) = self.t.get(self.i) {
+            let o = *o;
+            self.i += 1;
+            let r = self.term(depth);
+            v = if o == '+' { v + r } else { v - r };
+        }
+        v
+    }
+
+    fn term(&mut self, depth: u32) -> f64 {
+        let mut v = self.unary(depth);
+        while let Some(Tok::Op(o @ ('*' | '/'))) = self.t.get(self.i) {
+            let o = *o;
+            self.i += 1;
+            let r = self.unary(depth);
+            v = if o == '*' {
+                v * r
+            } else if r == 0.0 {
+                0.0
+            } else {
+                v / r
+            };
+        }
+        v
+    }
+
+    fn unary(&mut self, depth: u32) -> f64 {
+        match self.t.get(self.i) {
+            Some(Tok::Op('-')) => {
+                self.i += 1;
+                -self.unary(depth + 1)
+            }
+            Some(Tok::Op('+')) => {
+                self.i += 1;
+                self.unary(depth + 1)
+            }
+            _ => self.atom(depth),
+        }
+    }
+
+    fn args(&mut self, depth: u32) -> Vec<f64> {
+        let mut v = vec![];
+        if let Some(Tok::Op('(')) = self.t.get(self.i) {
+            self.i += 1;
+            loop {
+                if let Some(Tok::Op(')')) = self.t.get(self.i) {
+                    self.i += 1;
+                    break;
+                }
+                v.push(self.expr(depth + 1));
+                match self.t.get(self.i) {
+                    Some(Tok::Op(',')) => self.i += 1,
+                    Some(Tok::Op(')')) => {
+                        self.i += 1;
+                        break;
+                    }
+                    _ => break,
+                }
+                if v.len() > 8 {
+                    break;
+                }
+            }
+        }
+        v
+    }
+
+    fn atom(&mut self, depth: u32) -> f64 {
+        let Some(t) = self.t.get(self.i).cloned() else {
+            return 0.0;
+        };
+        self.i += 1;
+        match t {
+            Tok::Num(v) => v,
+            Tok::Op('(') => {
+                let v = self.expr(depth + 1);
+                if let Some(Tok::Op(')')) = self.t.get(self.i) {
+                    self.i += 1;
+                }
+                v
+            }
+            Tok::Op(_) => 0.0,
+            Tok::Ident(id) => {
+                let a = |v: &Vec<f64>, k: usize| v.get(k).copied().unwrap_or(0.0);
+                match id.as_str() {
+                    "abs" | "sqrt" | "sin" | "cos" | "tan" | "atan" | "atan2" | "min" | "max"
+                    | "if" => {
+                        let v = self.args(depth);
+                        match id.as_str() {
+                            "abs" => a(&v, 0).abs(),
+                            "sqrt" => a(&v, 0).max(0.0).sqrt(),
+                            "sin" => a(&v, 0).sin(),
+                            "cos" => a(&v, 0).cos(),
+                            "tan" => a(&v, 0).tan(),
+                            "atan" => a(&v, 0).atan(),
+                            "atan2" => a(&v, 0).atan2(a(&v, 1)),
+                            "min" => a(&v, 0).min(a(&v, 1)),
+                            "max" => a(&v, 0).max(a(&v, 1)),
+                            _ => {
+                                if a(&v, 0) > 0.0 {
+                                    a(&v, 1)
+                                } else {
+                                    a(&v, 2)
+                                }
+                            }
+                        }
+                    }
+                    s => self.env.param(s),
+                }
+            }
+        }
+    }
+}
+
+/// A draw:custom-shape's geometry from its draw:enhanced-geometry, or
+/// `None` when it has no path.
+/// A custom shape's geometry, whether it is mirrored horizontally and
+/// vertically, and its text area (see below).
+pub type Enhanced = (Geometry, bool, bool, Option<[f64; 4]>);
+
+pub fn enhanced(eg: &Node, w_emu: i64, h_emu: i64) -> Option<Enhanced> {
+    // The extended path (with OOXML arcs) where its writer gave one.
+    let path = eg
+        .attr("drawooo:enhanced-path")
+        .or(eg.attr("draw:enhanced-path"))?;
+    let log = (w_emu as f64 / 360.0, h_emu as f64 / 360.0);
+    // An empty view box means the shape's own size in 1/100 mm.
+    let vb = match eg.attr("svg:viewBox") {
+        None => [0.0, 0.0, 21600.0, 21600.0],
+        Some(v) => view_box(Some(v)).unwrap_or([0.0, 0.0, log.0.max(1.0), log.1.max(1.0)]),
+    };
+    let equations: Vec<(String, String)> = eg
+        .all("draw:equation")
+        .take(4096)
+        .filter_map(|e| {
+            Some((
+                e.attr("draw:name")?.to_string(),
+                e.attr("draw:formula")?.to_string(),
+            ))
+        })
+        .collect();
+    let modifiers = eg
+        .attr("draw:modifiers")
+        .map(|m| {
+            m.split_whitespace()
+                .filter_map(|t| t.parse().ok())
+                .take(64)
+                .collect()
+        })
+        .unwrap_or_default();
+    let mut env = Env {
+        vb,
+        log,
+        modifiers,
+        values: vec![None; equations.len()],
+        equations: &equations,
+        depth: 0,
+    };
+    let mut b = Builder::new(vb);
+    let toks: Vec<&str> = path
+        .split([' ', ',', '\n', '\t'])
+        .filter(|t| !t.is_empty())
+        .take(1 << 18)
+        .collect();
+    // Commands may be glued to their first parameter ("M0 0").
+    let mut items: Vec<String> = vec![];
+    for t in toks {
+        let first = t.chars().next().unwrap_or(' ');
+        if first.is_ascii_uppercase()
+            && t.len() > 1
+            && !t[1..].starts_with(|c: char| c.is_ascii_alphabetic())
+        {
+            items.push(first.to_string());
+            items.push(t[1..].to_string());
+        } else {
+            items.push(t.to_string());
+        }
+    }
+    let is_cmd = |s: &str| s.len() == 1 && s.chars().all(|c| c.is_ascii_uppercase());
+    let mut i = 0;
+    let mut cmd = "M".to_string();
+    while i < items.len() {
+        if is_cmd(&items[i]) {
+            cmd = items[i].clone();
+            i += 1;
+        }
+        let need = match cmd.as_str() {
+            "M" | "L" | "X" | "Y" => 2,
+            "C" => 6,
+            "Q" => 4,
+            "T" | "U" => 6,
+            "A" | "B" | "W" | "V" => 8,
+            "G" => 4,
+            _ => 0,
+        };
+        if need == 0 {
+            match cmd.as_str() {
+                "Z" => b.close(),
+                "N" => b.end(),
+                "F" => b.cur.fill = false,
+                "S" => b.cur.stroke = false,
+                _ => {}
+            }
+            if !is_cmd(items.get(i).map(String::as_str).unwrap_or("M")) {
+                i += 1;
+            }
+            cmd = String::new();
+            continue;
+        }
+        if i + need > items.len() {
+            break;
+        }
+        let v: Vec<f64> = items[i..i + need].iter().map(|s| env.param(s)).collect();
+        i += need;
+        match cmd.as_str() {
+            "M" => b.move_to(v[0], v[1]),
+            "L" => b.line_to(v[0], v[1]),
+            "C" => b.cubic(v[0], v[1], v[2], v[3], v[4], v[5]),
+            "Q" => b.quad(v[0], v[1], v[2], v[3]),
+            "T" | "U" => {
+                // Centre, radii, start and end angles in degrees, turning
+                // clockwise on screen from the start to the end.
+                let (rx, ry) = (v[2], v[3]);
+                // The angles are those of the line from the centre, not
+                // the ellipse's own parameter.
+                let param = |deg: f64| {
+                    let a = deg.to_radians();
+                    (rx * a.sin()).atan2(ry * a.cos())
+                };
+                let a0 = param(v[4]);
+                let mut a1 = param(v[5]);
+                while a1 <= a0 {
+                    a1 += 2.0 * PI;
+                }
+                b.arc(v[0], v[1], rx, ry, a0, a1 - a0, cmd == "U");
+            }
+            "A" | "B" | "W" | "V" => {
+                let (cx, cy) = ((v[0] + v[2]) / 2.0, (v[1] + v[3]) / 2.0);
+                let (rx, ry) = (((v[2] - v[0]) / 2.0).abs(), ((v[3] - v[1]) / 2.0).abs());
+                if rx < 1e-9 || ry < 1e-9 {
+                    b.line_to(v[6], v[7]);
+                    continue;
+                }
+                let ang = |x: f64, y: f64| ((y - cy) / ry).atan2((x - cx) / rx);
+                let a0 = ang(v[4], v[5]);
+                let a1 = ang(v[6], v[7]);
+                let cw = cmd == "W" || cmd == "V";
+                let mut d = a1 - a0;
+                if cw {
+                    if d <= 0.0 {
+                        d += 2.0 * PI;
+                    }
+                } else if d >= 0.0 {
+                    d -= 2.0 * PI;
+                }
+                b.arc(cx, cy, rx, ry, a0, d, cmd == "B" || cmd == "V");
+            }
+            "X" | "Y" => {
+                // A quarter ellipse, first along x (X) or y (Y).
+                let (x0, y0) = b.pos;
+                let (x, y) = (v[0], v[1]);
+                let k = 0.552_284_75;
+                if cmd == "X" {
+                    b.cubic(x0 + (x - x0) * k, y0, x, y - (y - y0) * k, x, y);
+                    cmd = "Y".into();
+                } else {
+                    b.cubic(x0, y0 + (y - y0) * k, x - (x - x0) * k, y, x, y);
+                    cmd = "X".into();
+                }
+            }
+            "G" => {
+                // Width and height radii, start angle and swing (degrees,
+                // clockwise), from the current point.
+                let (wr, hr, st, sw) = (v[0], v[1], v[2].to_radians(), v[3].to_radians());
+                let (x0, y0) = b.pos;
+                let cx = x0 - wr * st.cos();
+                let cy = y0 - hr * st.sin();
+                b.arc(cx, cy, wr, hr, st, sw, false);
+            }
+            _ => {}
+        }
+    }
+    let mh = eg.attr("draw:mirror-horizontal") == Some("true");
+    let mv = eg.attr("draw:mirror-vertical") == Some("true");
+    // The text area: left, top, right, bottom in the view box, as the
+    // fractions of it they cover.
+    let text_area = eg.attr("draw:text-areas").and_then(|t| {
+        let v: Vec<f64> = t.split_whitespace().take(4).map(|s| env.param(s)).collect();
+        let [l, tp, r, bt] = v[..] else { return None };
+        let f = |x: f64, o: f64, d: f64| ((x - o) / d).clamp(0.0, 1.0);
+        let a = [
+            f(l, vb[0], vb[2]),
+            f(tp, vb[1], vb[3]),
+            f(r, vb[0], vb[2]),
+            f(bt, vb[1], vb[3]),
+        ];
+        (vb[2] > 0.0 && vb[3] > 0.0 && a[0] < a[2] && a[1] < a[3]).then_some(a)
+    });
+    b.finish().map(|g| (g, mh, mv, text_area))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn cmds(g: &Geometry) -> Vec<String> {
+        match g {
+            Geometry::Custom(p) => p[0].cmds.iter().map(|c| format!("{c:?}")).collect(),
+            _ => vec![],
+        }
+    }
+
+    #[test]
+    fn svg_paths_absolute_and_relative() {
+        let g = svg_path(
+            "M0 0 l100 0 V50 h-100z",
+            [0.0, 0.0, 100_000.0, 100_000.0],
+            true,
+        )
+        .unwrap();
+        assert_eq!(
+            cmds(&g),
+            vec![
+                "Move(0, 0)",
+                "Line(100, 0)",
+                "Line(100, 50)",
+                "Line(0, 50)",
+                "Close"
+            ]
+        );
+        // Small view boxes are scaled up.
+        let g = svg_path("M1 1L2 2", [1.0, 1.0, 10.0, 10.0], false).unwrap();
+        assert_eq!(cmds(&g), vec!["Move(0, 0)", "Line(10000, 10000)"]);
+    }
+
+    #[test]
+    fn enhanced_paths_with_equations_and_modifiers() {
+        let x = br#"<draw:enhanced-geometry xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:viewBox="0 0 21600 21600" draw:modifiers="5400" draw:enhanced-path="M $0 0 L right ?f0 ?f1 bottom Z N"><draw:equation draw:name="f0" draw:formula="$0 * 2"/><draw:equation draw:name="f1" draw:formula="if(-1, 3, max(?f0, 7) - 10800)"/></draw:enhanced-geometry>"#;
+        let n = crate::formats::office::common::xml::parse(
+            x,
+            &mut crate::formats::office::common::xml::within(1 << 20),
+        )
+        .unwrap();
+        let (g, _, _, _) = enhanced(&n, 100, 100).unwrap();
+        // In path units: the 21600 view box scaled to 100000.
+        assert_eq!(
+            cmds(&g),
+            vec![
+                "Move(25000, 0)",
+                "Line(100000, 50000)",
+                "Line(0, 100000)",
+                "Close"
+            ]
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/odp/mod.rs b/crates/exav-render/src/formats/office/slides/odp/mod.rs
new file mode 100644
index 00000000..bbb100f6
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/odp/mod.rs
@@ -0,0 +1,1858 @@
+//! OpenDocument presentations ([ODF 1.2] part 1, 9 and 10): ODP and OTP
+//! packages and flat FODP documents. Each master page becomes a slide
+//! master with its background and drawings; each draw:page a slide, its
+//! shapes and text resolved through their styles into explicit properties.
+
+mod geom;
+mod styles;
+mod text;
+
+use crate::formats::office::common::base64;
+use crate::formats::office::common::xml::{self, Node};
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::{Budget, text_bytes};
+use crate::formats::office::slides::model::*;
+use crate::formats::office::slides::package::{Zip, image_ext};
+use std::collections::HashMap;
+use styles::{Props, Styles, color, len, percent};
+
+/// What a document holds: slides, or the pages of a drawing, each of which
+/// becomes a slide of its own size.
+#[derive(Clone, Copy, PartialEq)]
+pub(crate) enum Kind {
+    Presentation,
+    Drawing,
+}
+
+impl Kind {
+    /// Whether a media type is this kind's: OpenDocument says "graphics" for
+    /// a drawing, OpenOffice 1.x said "drawing".
+    fn is_type(self, media_type: &str) -> bool {
+        match self {
+            Kind::Presentation => media_type.contains("presentation"),
+            Kind::Drawing => media_type.contains("graphics") || media_type.contains("drawing"),
+        }
+    }
+
+    fn body(self) -> &'static str {
+        match self {
+            Kind::Presentation => "office:presentation",
+            Kind::Drawing => "office:drawing",
+        }
+    }
+}
+
+pub(crate) fn read_odp(z: Zip, budget: &mut Budget) -> Result<Presentation> {
+    read_package(z, budget, Kind::Presentation)
+}
+
+pub(crate) fn read_odg(z: Zip, budget: &mut Budget) -> Result<Presentation> {
+    read_package(z, budget, Kind::Drawing)
+}
+
+fn read_package(mut z: Zip, budget: &mut Budget, kind: Kind) -> Result<Presentation> {
+    let max = budget.limits.max_part;
+    if let Some(m) = z.get("mimetype", 256, budget)? {
+        let m = String::from_utf8_lossy(&m);
+        if !kind.is_type(&m) {
+            return Err(Error::NotFormat(format!(
+                "an OpenDocument file of type {}",
+                m.trim()
+            )));
+        }
+    }
+    if let Some(m) = z.get("META-INF/manifest.xml", 16 << 20, budget)? {
+        let m = String::from_utf8_lossy(&m);
+        if let Some(i) = m.find("manifest:full-path=\"content.xml\"") {
+            let e = &m[i..];
+            let end = e
+                .find("</manifest:file-entry>")
+                .or_else(|| e.find("/>"))
+                .unwrap_or(e.len());
+            if e[..end].contains("encryption-data") {
+                return Err(Error::Encrypted);
+            }
+        }
+    }
+    let content = z
+        .get("content.xml", max, budget)?
+        .ok_or_else(|| Error::NotFormat("no content.xml".into()))?;
+    let styles_xml = z.get("styles.xml", max, budget)?;
+    let content = xml::parse(&content, &mut budget.tree())?;
+    let styles_doc = match styles_xml {
+        Some(s) => xml::parse(&s, &mut budget.tree()).ok(),
+        None => None,
+    };
+    // Pictures and objects are read when a slide uses them.
+    let r = Reader::new(&content, styles_doc.as_ref(), Some(z), kind);
+    r.read(budget)
+}
+
+pub(crate) fn read_fodp(bytes: &[u8], budget: &mut Budget) -> Result<Presentation> {
+    read_flat(bytes, budget, Kind::Presentation)
+}
+
+pub(crate) fn read_fodg(bytes: &[u8], budget: &mut Budget) -> Result<Presentation> {
+    read_flat(bytes, budget, Kind::Drawing)
+}
+
+fn read_flat(bytes: &[u8], budget: &mut Budget, kind: Kind) -> Result<Presentation> {
+    let doc = xml::parse(bytes, &mut budget.tree())?;
+    if doc.name != "office:document" {
+        return Err(Error::NotFormat(format!(
+            "not a flat ODF document: {}",
+            doc.name
+        )));
+    }
+    if let Some(m) = doc.attr("office:mimetype")
+        && !kind.is_type(m)
+    {
+        return Err(Error::NotFormat(format!(
+            "a flat OpenDocument file of type {m}"
+        )));
+    }
+    let r = Reader::new(&doc, None, None, kind);
+    r.read(budget)
+}
+
+/// The most an inline picture may decode to, as for a picture in the package.
+const INLINE_PICTURE_MAX: usize = 64 << 20;
+
+/// A position and size, and the transform of an ODF shape.
+fn transform(n: &Node) -> Xfrm {
+    let g = |k: &str| n.attr(k).and_then(len).unwrap_or(0);
+    let (x, y, w, h) = (
+        g("svg:x"),
+        g("svg:y"),
+        g("svg:width").max(0),
+        g("svg:height").max(0),
+    );
+    let mut xf = Xfrm {
+        x,
+        y,
+        w,
+        h,
+        ..Xfrm::default()
+    };
+    let Some(t) = n.attr("draw:transform") else {
+        return xf;
+    };
+    // rotate(a) then translate(x y), applied to the box at the origin.
+    let mut rot = 0.0f64;
+    let mut tx = 0.0f64;
+    let mut ty = 0.0f64;
+    let mut translated = false;
+    let mut rest = t;
+    while let Some(open) = rest.find('(') {
+        let name = rest[..open].trim().trim_start_matches(',').trim();
+        let Some(close) = rest[open..].find(')') else {
+            break;
+        };
+        let args: Vec<&str> = rest[open + 1..open + close]
+            .split([' ', ','])
+            .filter(|s| !s.is_empty())
+            .collect();
+        match name {
+            "rotate" => {
+                rot += args
+                    .first()
+                    .and_then(|a| a.parse::<f64>().ok())
+                    .unwrap_or(0.0)
+            }
+            "translate" => {
+                tx += args.first().and_then(|a| len(a)).unwrap_or(0) as f64;
+                ty += args.get(1).and_then(|a| len(a)).unwrap_or(0) as f64;
+                translated = true;
+            }
+            _ => {}
+        }
+        rest = &rest[open + close + 1..];
+    }
+    if !translated {
+        tx = x as f64;
+        ty = y as f64;
+    }
+    let (hw, hh) = (w as f64 / 2.0, h as f64 / 2.0);
+    // Counterclockwise on screen, about the origin.
+    let cx = hw * rot.cos() + hh * rot.sin() + tx;
+    let cy = -hw * rot.sin() + hh * rot.cos() + ty;
+    xf.x = (cx - hw).round() as Emu;
+    xf.y = (cy - hh).round() as Emu;
+    xf.rot = (-rot.to_degrees()).rem_euclid(360.0);
+    xf
+}
+
+/// Which styles a shape's attributes name, in which scope.
+#[derive(Clone, Copy, PartialEq)]
+enum Scope {
+    Content,
+    Master,
+}
+
+struct Reader<'d> {
+    kind: Kind,
+    /// The layers of a drawing that are not displayed.
+    hidden_layers: Vec<String>,
+    content: &'d Node,
+    styles_doc: Option<&'d Node>,
+    master: Styles,
+    body: Styles,
+    /// The package, for the pictures and objects slides use.
+    zip: Option<Zip<'d>>,
+    /// A part the package could not give within the limits, raised after
+    /// the slide that wanted it.
+    failed: Option<Error>,
+    media: HashMap<String, Option<usize>>,
+    media_bytes: u64,
+    /// The text area of the custom shape `geometry` last read.
+    text_area: std::cell::Cell<Option<[f64; 4]>>,
+    p: Presentation,
+}
+
+/// Per page context for fields.
+struct PageCtx {
+    number: usize,
+    footer: String,
+    date: String,
+    header: String,
+    auto_color: Rgb,
+}
+
+/// The automatic font colour on a background: white on a dark one.
+fn auto_color(bg: Option<&Fill>) -> Rgb {
+    let c = match bg {
+        Some(Fill::Solid(c)) => c.rgb,
+        Some(Fill::Gradient(g)) => g.stops.first().map(|s| s.1.rgb).unwrap_or(0xFFFFFF),
+        _ => 0xFFFFFF,
+    };
+    let l = ((c >> 16) & 0xFF) * 299 + ((c >> 8) & 0xFF) * 587 + (c & 0xFF) * 114;
+    if l < 128_000 { 0xFFFFFF } else { 0x000000 }
+}
+
+impl<'d> Reader<'d> {
+    fn new(
+        content: &'d Node,
+        styles_doc: Option<&'d Node>,
+        zip: Option<Zip<'d>>,
+        kind: Kind,
+    ) -> Reader<'d> {
+        let sources: Vec<&Node> = styles_doc
+            .into_iter()
+            .chain(std::iter::once(content))
+            .collect();
+        let mut master = Styles::default();
+        let mut body = Styles::default();
+        for s in [&mut master, &mut body] {
+            for d in &sources {
+                for k in ["office:font-face-decls", "office:styles"] {
+                    if let Some(n) = d.child(k) {
+                        s.add(n);
+                    }
+                }
+            }
+        }
+        // A flat document has one set of automatic styles for both.
+        if let Some(sd) = styles_doc {
+            if let Some(a) = sd.child("office:automatic-styles") {
+                master.add(a);
+            }
+        } else if let Some(a) = content.child("office:automatic-styles") {
+            master.add(a);
+        }
+        if let Some(a) = content.child("office:automatic-styles") {
+            body.add(a);
+        }
+        Reader {
+            kind,
+            hidden_layers: vec![],
+            content,
+            styles_doc,
+            master,
+            body,
+            zip,
+            failed: None,
+            media: HashMap::new(),
+            media_bytes: 0,
+            text_area: std::cell::Cell::new(None),
+            p: Presentation::default(),
+        }
+    }
+
+    fn styles(&self, s: Scope) -> &Styles {
+        match s {
+            Scope::Content => &self.body,
+            Scope::Master => &self.master,
+        }
+    }
+
+    fn masters_node(&self) -> Option<&'d Node> {
+        self.styles_doc
+            .and_then(|s| s.child("office:master-styles"))
+            .or_else(|| self.content.child("office:master-styles"))
+    }
+
+    fn read(mut self, budget: &mut Budget) -> Result<Presentation> {
+        let pres = self
+            .content
+            .child("office:body")
+            .and_then(|b| b.child(self.kind.body()))
+            .ok_or_else(|| Error::NotFormat(format!("no {} body", self.kind.body())))?;
+        let masters: Vec<&Node> = self
+            .masters_node()
+            .map(|m| m.all("style:master-page").take(1024).collect())
+            .unwrap_or_default();
+        let pages: Vec<&Node> = pres.all("draw:page").collect();
+        let (w, h) = match self.kind {
+            // Slide size from the first master's page layout; without one,
+            // the 28 by 15.75 cm of a new presentation.
+            Kind::Presentation => {
+                let new = (10_080_000, 5_670_000);
+                self.page_size(masters.first().copied(), new).unwrap_or(new)
+            }
+            // A PPTX has one size: the largest of the pages', each page
+            // drawn from its top left corner. Without any, A4 landscape.
+            Kind::Drawing => {
+                let a4 = (10_692_000, 7_560_000);
+                pages
+                    .iter()
+                    .filter_map(|p| {
+                        let name = p.attr("draw:master-page-name")?;
+                        let m = masters.iter().find(|m| m.attr("style:name") == Some(name));
+                        self.page_size(m.copied(), a4)
+                    })
+                    .reduce(|a, b| (a.0.max(b.0), a.1.max(b.1)))
+                    .or_else(|| self.page_size(masters.first().copied(), a4))
+                    .unwrap_or(a4)
+            }
+        };
+        self.p.width = w;
+        self.p.height = h;
+        if self.kind == Kind::Drawing {
+            self.hidden_layers = self
+                .masters_node()
+                .into_iter()
+                .flat_map(|m| m.all("draw:layer-set"))
+                .flat_map(|s| s.all("draw:layer"))
+                .filter(|l| l.attr("draw:display") == Some("none"))
+                .filter_map(|l| l.attr("draw:name").map(str::to_string))
+                .collect();
+        }
+
+        let mut master_index: HashMap<String, usize> = HashMap::new();
+        for m in &masters {
+            let name = m.attr("style:name").unwrap_or("").to_string();
+            let master = self.master(m, budget)?;
+            master_index.insert(name, self.p.masters.len());
+            self.p.masters.push(master);
+        }
+        if self.p.masters.is_empty() {
+            self.p.masters.push(Master::default());
+        }
+        let decls = self.decls(pres);
+        self.p.total_slides = pages.len();
+        for (i, page) in pages.iter().enumerate() {
+            if let Some(e) = self.failed.take() {
+                return Err(e);
+            }
+            budget.slide(i)?;
+            if !budget.wants(i) {
+                continue;
+            }
+            let mname = page.attr("draw:master-page-name").unwrap_or("");
+            let mi = master_index.get(mname).copied().unwrap_or(0);
+            let mnode = masters
+                .iter()
+                .find(|m| m.attr("style:name") == Some(mname))
+                .copied()
+                .or(masters.first().copied());
+            let slide = self.slide(page, i + 1, mi, mnode, &decls, budget)?;
+            self.p.slides.push(slide);
+            budget.alloc(std::mem::take(&mut self.media_bytes))?;
+        }
+        if let Some(e) = self.failed.take() {
+            return Err(e);
+        }
+        budget.alloc(self.media_bytes)?;
+        Ok(self.p)
+    }
+
+    /// The size of the page a master page's layout gives, a side it leaves
+    /// out taken from `default`; `None` without a layout.
+    fn page_size(&self, master: Option<&Node>, default: (Emu, Emu)) -> Option<(Emu, Emu)> {
+        let pl = self
+            .master
+            .page_layouts
+            .get(master?.attr("style:page-layout-name")?)?;
+        Some((
+            pl.len("fo:page-width").unwrap_or(default.0),
+            pl.len("fo:page-height").unwrap_or(default.1),
+        ))
+    }
+
+    /// Footer and date declarations of the presentation, by name.
+    fn decls(&self, pres: &Node) -> HashMap<(String, String), String> {
+        let mut out = HashMap::new();
+        for (tag, kind) in [
+            ("presentation:footer-decl", "footer"),
+            ("presentation:header-decl", "header"),
+            ("presentation:date-time-decl", "date"),
+        ] {
+            for d in pres.all(tag) {
+                if let Some(n) = d.attr("presentation:name") {
+                    let fixed = d.attr("presentation:source") != Some("current-date");
+                    let t = if fixed {
+                        styles::text_of(d)
+                    } else {
+                        String::new()
+                    };
+                    out.insert((kind.to_string(), n.to_string()), t);
+                }
+            }
+        }
+        out
+    }
+
+    fn page_fill(&mut self, props: &Props, scope: Scope) -> Option<Fill> {
+        match props.get("draw:fill") {
+            None | Some("none") => None,
+            _ => Some(self.fill(props, scope)),
+        }
+    }
+
+    fn master(&mut self, m: &Node, budget: &mut Budget) -> Result<Master> {
+        let dp = self
+            .master
+            .resolve("drawing-page", m.attr("draw:style-name"));
+        let bg = self
+            .page_fill(&dp, Scope::Master)
+            .or(Some(Fill::Solid(Color::rgb(0xFFFFFF))));
+        let ctx = PageCtx {
+            number: 1,
+            footer: String::new(),
+            date: String::new(),
+            header: String::new(),
+            auto_color: auto_color(bg.as_ref()),
+        };
+        let mut shapes = vec![];
+        for n in m.nodes() {
+            if n.attr("presentation:class").is_some() {
+                continue;
+            }
+            if let Some(s) = self.shape(n, Scope::Master, &ctx, None, budget, 0)? {
+                shapes.push(s);
+            }
+        }
+        Ok(Master {
+            name: m
+                .attr("style:display-name")
+                .or(m.attr("style:name"))
+                .unwrap_or("")
+                .to_string(),
+            background: bg,
+            shapes,
+            layouts: vec![Layout {
+                name: "Blank".into(),
+                kind: "blank",
+                show_master_shapes: true,
+                ..Layout::default()
+            }],
+            ..Master::default()
+        })
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn slide(
+        &mut self,
+        page: &Node,
+        number: usize,
+        mi: usize,
+        master: Option<&Node>,
+        decls: &HashMap<(String, String), String>,
+        budget: &mut Budget,
+    ) -> Result<Slide> {
+        let dp = self
+            .body
+            .resolve("drawing-page", page.attr("draw:style-name"));
+        let background = if dp.is("presentation:background-visible", "false") {
+            Some(Fill::Solid(Color::rgb(0xFFFFFF)))
+        } else {
+            self.page_fill(&dp, Scope::Content)
+        };
+        let decl = |kind: &str, attr: &str| {
+            page.attr(attr)
+                .and_then(|n| decls.get(&(kind.to_string(), n.to_string())))
+                .cloned()
+                .unwrap_or_default()
+        };
+        let shown_bg =
+            background
+                .as_ref()
+                .or(self.p.masters.get(mi).and_then(|m| m.background.as_ref()));
+        let ctx = PageCtx {
+            number,
+            footer: decl("footer", "presentation:use-footer-name"),
+            date: decl("date", "presentation:use-date-time-name"),
+            header: decl("header", "presentation:use-header-name"),
+            auto_color: auto_color(shown_bg),
+        };
+        let mut shapes = vec![];
+        for n in page.nodes() {
+            if n.attr("draw:layer")
+                .is_some_and(|l| self.hidden_layers.iter().any(|h| h == l))
+            {
+                continue;
+            }
+            if let Some(s) = self.shape(n, Scope::Content, &ctx, None, budget, 0)? {
+                shapes.push(s);
+            }
+        }
+        // The master's footer, slide number and date, as the page shows them.
+        if let Some(m) = master {
+            let show = |k: &str, default: bool| dp.get(k).map(|v| v == "true").unwrap_or(default);
+            for n in m.nodes() {
+                let wanted = match n.attr("presentation:class") {
+                    Some("footer") => {
+                        show("presentation:display-footer", true) && !ctx.footer.is_empty()
+                    }
+                    Some("page-number") => show("presentation:display-page-number", false),
+                    Some("date-time") => {
+                        show("presentation:display-date-time", true) && !ctx.date.is_empty()
+                    }
+                    _ => false,
+                };
+                if wanted && let Some(s) = self.shape(n, Scope::Master, &ctx, None, budget, 0)? {
+                    shapes.push(s);
+                }
+            }
+        }
+        let name = match self.kind {
+            Kind::Drawing => page.attr("draw:name").map(str::to_string),
+            Kind::Presentation => None,
+        };
+        Ok(Slide {
+            name,
+            master: mi,
+            layout: 0,
+            background,
+            shapes,
+            hidden: dp.is("presentation:visibility", "hidden")
+                || page.attr("presentation:visibility") == Some("hidden"),
+            show_master_shapes: !dp.is("presentation:background-objects-visible", "false"),
+        })
+    }
+
+    /// The bytes of a picture by its href, once, as a media index. Their
+    /// memory is charged when the reading ends.
+    /// A picture by its package path, or "data:" and its base64 text (a
+    /// flat file's inline picture).
+    fn image(&mut self, href: &str) -> Option<usize> {
+        if let Some(b64) = href.strip_prefix("data:") {
+            let d = base64::decode(b64, INLINE_PICTURE_MAX)?;
+            let ext = image_ext(&d)?;
+            self.media_bytes += d.len() as u64;
+            return Some(self.p.add_media(ext, d));
+        }
+        let key = href.trim_start_matches("./").to_string();
+        if let Some(&m) = self.media.get(&key) {
+            return m;
+        }
+        let m = self.part(&key).and_then(|d| Some((image_ext(&d)?, d)));
+        let m = m.map(|(ext, d)| {
+            self.media_bytes += d.len() as u64;
+            self.p.add_media(ext, d)
+        });
+        self.media.insert(key, m);
+        m
+    }
+
+    /// A member of the package by its path (with or without "./"), at most
+    /// 64 MiB; a larger one fails the conversion after the slide.
+    fn part(&mut self, path: &str) -> Option<Vec<u8>> {
+        let zip = self.zip.as_mut()?;
+        let path = path.trim_start_matches("./");
+        let found = match zip.read(path, 64 << 20) {
+            Ok(None) => zip.read(&format!("./{path}"), 64 << 20),
+            r => r,
+        };
+        found.unwrap_or_else(|e| {
+            self.failed.get_or_insert(e);
+            None
+        })
+    }
+
+    fn inline_image(&mut self, n: &Node) -> Option<usize> {
+        if let Some(h) = n.attr("xlink:href") {
+            return self.image(h);
+        }
+        let d = base64::decode(
+            &n.child("office:binary-data")?.own_text(),
+            INLINE_PICTURE_MAX,
+        )?;
+        let ext = image_ext(&d)?;
+        self.media_bytes += d.len() as u64;
+        Some(self.p.add_media(ext, d))
+    }
+
+    fn fill(&mut self, p: &Props, scope: Scope) -> Fill {
+        let alpha = p
+            .get("draw:opacity")
+            .and_then(percent)
+            .map(|f| (f * 100_000.0).round().clamp(0.0, 100_000.0) as u32)
+            .filter(|&a| a < 100_000);
+        let c = |rgb: Rgb| Color { rgb, alpha };
+        // Unstyled shapes are filled, as their usual writer's default
+        // style is (pages say otherwise in `page_fill`).
+        match p.get("draw:fill").unwrap_or("solid") {
+            "solid" => Fill::Solid(c(p.color("draw:fill-color").unwrap_or(0x729FCF))),
+            "gradient" => {
+                let st = self.styles(scope);
+                let g = p
+                    .get("draw:fill-gradient-name")
+                    .and_then(|n| st.object("draw:gradient", n))
+                    .cloned();
+                match g {
+                    Some(g) => gradient(&g, alpha),
+                    None => Fill::Solid(c(p.color("draw:fill-color").unwrap_or(0x729FCF))),
+                }
+            }
+            "bitmap" => {
+                let href = p
+                    .get("draw:fill-image-name")
+                    .and_then(|n| self.styles(scope).object("draw:fill-image", n))
+                    .and_then(|o| o.get("xlink:href"))
+                    .map(str::to_string);
+                // ODF's default is to repeat.
+                // A tile as large as the shape is the shape stretched.
+                let whole = |k: &str| p.get(k).and_then(percent).is_some_and(|f| f >= 0.99);
+                let tile = !matches!(p.get("style:repeat"), Some("stretch" | "no-repeat"))
+                    && !(whole("draw:fill-image-width") && whole("draw:fill-image-height"));
+                match href.and_then(|h| self.image(&h)) {
+                    Some(media) => Fill::Picture { media, tile },
+                    None => Fill::Solid(c(p.color("draw:fill-color").unwrap_or(0xCCCCCC))),
+                }
+            }
+            "hatch" => {
+                let h = p
+                    .get("draw:fill-hatch-name")
+                    .and_then(|n| self.styles(scope).object("draw:hatch", n));
+                let fg = h.and_then(|h| h.color("draw:color")).unwrap_or(0);
+                let rot = h
+                    .and_then(|h| h.get("draw:rotation"))
+                    .map(angle_tenths)
+                    .unwrap_or(0.0)
+                    .rem_euclid(180.0);
+                let double = h.is_some_and(|h| h.get("draw:style") != Some("single"));
+                let preset = match (double, rot) {
+                    (true, r) if (r - 45.0).abs() < 22.5 || (r - 135.0).abs() < 22.5 => "diagCross",
+                    (true, _) => "cross",
+                    (false, r) if (r - 90.0).abs() < 22.5 => "vert",
+                    (false, r) if (r - 45.0).abs() < 22.5 => "upDiag",
+                    (false, r) if (r - 135.0).abs() < 22.5 => "dnDiag",
+                    _ => "horz",
+                };
+                let bg = if p.is("draw:fill-hatch-solid", "true") {
+                    c(p.color("draw:fill-color").unwrap_or(0xFFFFFF))
+                } else {
+                    Color {
+                        rgb: 0xFFFFFF,
+                        alpha: Some(0),
+                    }
+                };
+                Fill::Pattern {
+                    preset,
+                    fg: c(fg),
+                    bg,
+                }
+            }
+            _ => Fill::None,
+        }
+    }
+
+    fn line(&self, p: &Props, scope: Scope) -> Line {
+        let stroke = p.get("draw:stroke").unwrap_or("solid");
+        if stroke == "none" {
+            return Line::default();
+        }
+        let alpha = p
+            .get("svg:stroke-opacity")
+            .and_then(|v| percent(v).or_else(|| v.parse::<f64>().ok()))
+            .map(|f| (f * 100_000.0).round().clamp(0.0, 100_000.0) as u32)
+            .filter(|&a| a < 100_000);
+        // A width with no unit is in hundredths of a millimetre, as a drawing
+        // counts them.
+        let width = p
+            .get("svg:stroke-width")
+            .and_then(|v| v.trim().parse::<f64>().ok())
+            .filter(|v| v.is_finite())
+            .map(|v| (v * 360.0).clamp(-1e13, 1e13).round() as Emu)
+            .or_else(|| p.len("svg:stroke-width"))
+            .unwrap_or(0)
+            .max(0);
+        let dash = if stroke == "dash" {
+            let d = p
+                .get("draw:stroke-dash")
+                .and_then(|n| self.styles(scope).object("draw:stroke-dash", n));
+            Some(dash_preset(d))
+        } else {
+            None
+        };
+        let marker = |which: &str| -> Option<Arrow> {
+            let name = p.get(&format!("draw:marker-{which}"))?;
+            if name.is_empty() {
+                return None;
+            }
+            let lname = name.to_ascii_lowercase();
+            let kind = if lname.contains("circle") {
+                "oval"
+            } else if lname.contains("square") || lname.contains("diamond") {
+                "diamond"
+            } else if lname.contains("line") || lname.contains("concave") {
+                "stealth"
+            } else {
+                "triangle"
+            };
+            let mw = p
+                .len(&format!("draw:marker-{which}-width"))
+                .unwrap_or(width * 3);
+            let ratio = if width > 0 {
+                mw as f64 / width as f64
+            } else {
+                mw as f64 / 12_700.0
+            };
+            let size = if ratio < 2.5 {
+                "sm"
+            } else if ratio < 5.0 {
+                "med"
+            } else {
+                "lg"
+            };
+            Some(Arrow {
+                kind,
+                w: size,
+                len: size,
+            })
+        };
+        Line {
+            fill: Fill::Solid(Color {
+                rgb: p.color("svg:stroke-color").unwrap_or(0x3465A4),
+                alpha,
+            }),
+            width: if width == 0 { 9525 } else { width },
+            dash,
+            cap: match p.get("svg:stroke-linecap") {
+                Some("round") => Some("rnd"),
+                Some("square") => Some("sq"),
+                _ => None,
+            },
+            join: match p.get("draw:stroke-linejoin") {
+                Some("round") => Some("round"),
+                Some("bevel") => Some("bevel"),
+                Some("miter") => Some("miter"),
+                _ => None,
+            },
+            compound: None,
+            head: marker("start"),
+            tail: marker("end"),
+        }
+    }
+
+    fn shadow(&self, p: &Props) -> Option<Shadow> {
+        if !p.is("draw:shadow", "visible") {
+            return None;
+        }
+        let dx = p.len("draw:shadow-offset-x").unwrap_or(0) as f64;
+        let dy = p.len("draw:shadow-offset-y").unwrap_or(0) as f64;
+        let alpha = p
+            .get("draw:shadow-opacity")
+            .and_then(percent)
+            .map(|f| (f * 100_000.0).round().clamp(0.0, 100_000.0) as u32);
+        Some(Shadow {
+            color: Color {
+                rgb: p.color("draw:shadow-color").unwrap_or(0x808080),
+                alpha,
+            },
+            blur: p.len("loext:shadow-blur").unwrap_or(0).max(0),
+            dist: dx.hypot(dy).round() as Emu,
+            dir: dy.atan2(dx).to_degrees(),
+        })
+    }
+
+    fn style_of(&self, n: &Node, scope: Scope) -> (Props, Option<String>) {
+        let st = self.styles(scope);
+        if let Some(ps) = n.attr("presentation:style-name") {
+            let mut p = st.resolve("presentation", Some(ps));
+            if let Some(gs) = n.attr("draw:style-name") {
+                p.overlay(&st.chain("graphic", Some(gs)).0);
+            }
+            return (p, Some(ps.to_string()));
+        }
+        (st.resolve("graphic", n.attr("draw:style-name")), None)
+    }
+
+    fn body_props(&self, p: &Props, frame: bool) -> BodyProps {
+        let pad = |k: &str, d: Emu| p.len(k).or_else(|| p.len("fo:padding")).unwrap_or(d).max(0);
+        // Unsaid, a drawing shape's text sits in its middle, a frame's at
+        // its top.
+        let anchor = match p.get("draw:textarea-vertical-align") {
+            Some("middle") => "ctr",
+            Some("bottom") => "b",
+            Some(_) => "t",
+            None if frame => "t",
+            None => "ctr",
+        };
+        let wrap = if frame {
+            !p.is("draw:auto-grow-width", "true")
+        } else {
+            !p.is("fo:wrap-option", "no-wrap")
+        };
+        let autofit = if p.is("draw:fit-to-size", "true")
+            || p.is("draw:fit-to-size", "shrink-to-fit")
+            || p.is("style:shrink-to-fit", "true")
+        {
+            Autofit::Normal(100_000, 0)
+        } else if p.is("draw:auto-grow-height", "true") && frame {
+            Autofit::Shape
+        } else {
+            Autofit::None
+        };
+        BodyProps {
+            insets: [
+                pad("fo:padding-left", 0),
+                pad("fo:padding-top", 0),
+                pad("fo:padding-right", 0),
+                pad("fo:padding-bottom", 0),
+            ],
+            anchor,
+            anchor_ctr: !wrap && p.is("draw:textarea-horizontal-align", "center"),
+            wrap,
+            vert: match p.get("style:writing-mode") {
+                Some("tb-rl") | Some("tb") => Some("eaVert"),
+                Some("tb-rl90") => Some("vert"),
+                Some("bt-lr") => Some("vert270"),
+                _ => None,
+            },
+            autofit,
+            rot: 0.0,
+            columns: p
+                .get("fo:column-count")
+                .and_then(|v| v.parse().ok())
+                .unwrap_or(1)
+                .clamp(1, 16),
+        }
+    }
+
+    /// Text of `n` (a text box or a shape) with `props` as the shape's
+    /// style.
+    #[allow(clippy::too_many_arguments)]
+    fn text(
+        &mut self,
+        n: &Node,
+        props: &Props,
+        pres_style: Option<&str>,
+        scope: Scope,
+        ctx: &PageCtx,
+        frame: bool,
+        budget: &mut Budget,
+    ) -> Result<Option<TextBody>> {
+        let has = n
+            .nodes()
+            .any(|c| matches!(c.name.as_str(), "text:p" | "text:list" | "text:h"));
+        if !has {
+            return Ok(None);
+        }
+        // Outline levels: the presentation style's "-outline1" ancestor
+        // names the others.
+        let st = self.styles(scope);
+        let mut outline_base: Option<String> = None;
+        let mut cur = pres_style.map(str::to_string);
+        let mut guard = 0;
+        while let Some(s) = cur.take() {
+            guard += 1;
+            if guard > 32 {
+                break;
+            }
+            if let Some(b) = s.strip_suffix("-outline1") {
+                outline_base = Some(b.to_string());
+                break;
+            }
+            cur = st.get("presentation", &s).and_then(|d| d.parent.clone());
+        }
+        let list = pres_style
+            .and_then(|s| st.list_of("presentation", Some(s)))
+            .or_else(|| st.list_of("graphic", n.attr("draw:style-name")))
+            .cloned();
+        let levels = |lv: usize| -> Option<Props> {
+            let b = outline_base.as_ref()?;
+            (lv > 1).then(|| st.chain("presentation", Some(&format!("{b}-outline{lv}"))))
+        };
+        let mut tctx = text::TextCtx {
+            styles: st,
+            base: props,
+            levels: &levels,
+            list: list.as_ref(),
+            slide_number: ctx.number,
+            footer: &ctx.footer,
+            date: &ctx.date,
+            header: &ctx.header,
+            // Over the shape's own solid fill, else over the page.
+            auto_color: match (props.get("draw:fill"), props.color("draw:fill-color")) {
+                (Some("solid"), Some(c)) => auto_color(Some(&Fill::Solid(Color::rgb(c)))),
+                _ => ctx.auto_color,
+            },
+            pictures: vec![],
+        };
+        let mut paras = text::paragraphs(n, &mut tctx);
+        let pictures = std::mem::take(&mut tctx.pictures);
+        if !pictures.is_empty() {
+            // Picture bullets name their picture by its place in the list;
+            // one that cannot be read is a round bullet.
+            let media: Vec<Option<usize>> = pictures.iter().map(|href| self.image(href)).collect();
+            for p in &mut paras {
+                if let Some(Bullet::Picture { media: i, size }) = p.props.bullet.clone() {
+                    p.props.bullet = Some(match media.get(i).copied().flatten() {
+                        Some(media) => Bullet::Picture { media, size },
+                        None => Bullet::Char {
+                            ch: '\u{2022}',
+                            font: None,
+                            color: None,
+                            size,
+                        },
+                    });
+                }
+            }
+        }
+        // A drawing shape's text block is centred unless said otherwise.
+        if !frame
+            && props
+                .get("draw:textarea-horizontal-align")
+                .is_none_or(|a| a == "center")
+        {
+            for p in &mut paras {
+                p.props.align.get_or_insert("ctr");
+            }
+        }
+        let text = TextBody {
+            body: self.body_props(props, frame),
+            paras,
+            levels: ListStyle::default(),
+        };
+        budget.alloc(text_bytes(&text))?;
+        Ok(Some(text))
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn shape(
+        &mut self,
+        n: &Node,
+        scope: Scope,
+        ctx: &PageCtx,
+        _parent: Option<&Xfrm>,
+        budget: &mut Budget,
+        depth: u32,
+    ) -> Result<Option<Shape>> {
+        if depth > 32 {
+            return Ok(None);
+        }
+        let kind = n.name.as_str();
+        if !matches!(
+            kind,
+            "draw:frame"
+                | "draw:rect"
+                | "draw:ellipse"
+                | "draw:circle"
+                | "draw:line"
+                | "draw:polyline"
+                | "draw:polygon"
+                | "draw:path"
+                | "draw:custom-shape"
+                | "draw:connector"
+                | "draw:g"
+                | "draw:measure"
+                | "draw:caption"
+                | "draw:regular-polygon"
+        ) {
+            return Ok(None);
+        }
+        budget.shape(0)?;
+        let class = n.attr("presentation:class");
+        if matches!(class, Some("notes" | "handout" | "page")) {
+            return Ok(None);
+        }
+        let (props, pres_style) = self.style_of(n, scope);
+        let mut xf = transform(n);
+        let fill = self.fill(&props, scope);
+        let line = self.line(&props, scope);
+        // An empty placeholder shows only while editing, but for the fill
+        // and line it has.
+        if n.attr("presentation:placeholder") == Some("true")
+            && fill == Fill::None
+            && line.fill == Fill::None
+        {
+            return Ok(None);
+        }
+        let shadow = self.shadow(&props);
+        let mut shape_kind: Option<ShapeKind> = None;
+        match kind {
+            "draw:frame" => {
+                // A picture, a table, an object's replacement or a text box.
+                if let Some(t) = n.child("table:table") {
+                    shape_kind = self
+                        .table(t, &xf, scope, ctx, budget)?
+                        .map(|t| ShapeKind::Table(Box::new(t)));
+                }
+                // A chart object, as a chart.
+                if let Some(obj) = n.child("draw:object") {
+                    // In a package, a part named by a link; in a flat file,
+                    // the object's document inside it.
+                    let content = match (obj.attr("xlink:href"), obj.child("office:document")) {
+                        (_, Some(doc)) => {
+                            let x = doc.to_xml();
+                            budget.alloc(x.len() as u64)?;
+                            Some(x.into_bytes())
+                        }
+                        (Some(href), None) => self.part(&format!(
+                            "{}/content.xml",
+                            href.trim_start_matches("./").trim_end_matches('/')
+                        )),
+                        _ => None,
+                    };
+                    if let Some(xml) =
+                        content.and_then(|c| crate::formats::office::sheets::odf_chart_part(&c))
+                    {
+                        budget.alloc(xml.len() as u64)?;
+                        shape_kind = Some(ShapeKind::Chart(xml));
+                    }
+                }
+                if shape_kind.is_none() {
+                    // A raster picture or metafile first, an SVG last (a
+                    // frame may hold both).
+                    let mut pic = None;
+                    let mut svg = None;
+                    for img in n.all("draw:image") {
+                        if let Some(m) = self.inline_image(img) {
+                            if self.p.media[m].ext == "svg" {
+                                svg.get_or_insert(m);
+                            } else {
+                                pic = Some(m);
+                                break;
+                            }
+                        }
+                    }
+                    let pic = pic.or(svg);
+                    if pic.is_none()
+                        && (n.child("draw:object").is_some()
+                            || n.child("draw:object-ole").is_some())
+                    {
+                        self.p
+                            .warn("embedded objects without a replacement picture it can draw");
+                    }
+                    if let Some(media) = pic {
+                        shape_kind = Some(ShapeKind::Pic(Box::new(Pic {
+                            media,
+                            crop: [0; 4],
+                            geom: Geometry::default(),
+                            line: line.clone(),
+                            shadow: shadow.clone(),
+                            alpha: props
+                                .get("draw:image-opacity")
+                                .and_then(percent)
+                                .map(|f| (f * 100_000.0).round() as u32),
+                        })));
+                    }
+                }
+                // A video or sound that cannot play: a box in its place.
+                if let (None, Some(plugin)) = (&shape_kind, n.child("draw:plugin")) {
+                    let href = plugin.attr("xlink:href").unwrap_or("").to_ascii_lowercase();
+                    let audio = [
+                        ".mp3", ".wav", ".ogg", ".oga", ".m4a", ".aac", ".flac", ".wma",
+                    ]
+                    .iter()
+                    .any(|e| href.ends_with(e));
+                    self.p.warn("videos and sounds, drawn as boxes");
+                    shape_kind = Some(ShapeKind::media_placeholder(xf.w, xf.h, !audio));
+                }
+                if shape_kind.is_none() {
+                    let tb = n.child("draw:text-box");
+                    let text = match tb {
+                        Some(tb) => {
+                            self.text(tb, &props, pres_style.as_deref(), scope, ctx, true, budget)?
+                        }
+                        None => None,
+                    };
+                    if text.is_none() && tb.is_none() {
+                        return Ok(None);
+                    }
+                    shape_kind = Some(ShapeKind::Sp(Box::new(Sp {
+                        geom: Geometry::default(),
+                        fill: fill.clone(),
+                        line: line.clone(),
+                        shadow: shadow.clone(),
+                        text,
+                        ..Sp::default()
+                    })));
+                }
+            }
+            "draw:g" => {
+                let mut kids = vec![];
+                for c in n.nodes() {
+                    if let Some(s) = self.shape(c, scope, ctx, None, budget, depth + 1)? {
+                        kids.push(s);
+                    }
+                }
+                if kids.is_empty() {
+                    return Ok(None);
+                }
+                let bbox = bounds(&kids);
+                let mut s = Shape::new(
+                    ShapeKind::Group(Box::new(Group {
+                        child: bbox.clone(),
+                        shapes: kids,
+                    })),
+                    bbox,
+                );
+                s.name = n.attr("draw:name").unwrap_or("").to_string();
+                return Ok(Some(s));
+            }
+            _ => {
+                let eg = n.child("draw:enhanced-geometry");
+                let fontwork = eg.is_some_and(|e| {
+                    e.attr("draw:text-path") == Some("true")
+                        || e.attr("draw:type")
+                            .is_some_and(|t| t.starts_with("fontwork"))
+                });
+                if fontwork {
+                    // Fontwork: its text in its fill, filling the shape.
+                    let mut text =
+                        self.text(n, &props, pres_style.as_deref(), scope, ctx, false, budget)?;
+                    if let Some(t) = &mut text {
+                        let lines = t.paras.len().max(1) as f64;
+                        let size = ((xf.h as f64 / 12_700.0 / lines * 0.75).clamp(1.0, 400.0)
+                            * 100.0) as u32;
+                        let color = match &fill {
+                            Fill::Solid(c) => Some(*c),
+                            Fill::Gradient(g) => g.stops.first().map(|s| s.1),
+                            _ => None,
+                        };
+                        for p in &mut t.paras {
+                            p.props.align = Some("ctr");
+                            for r in &mut p.runs {
+                                r.props.size = Some(size);
+                                if color.is_some() {
+                                    r.props.color = color;
+                                }
+                            }
+                        }
+                        t.body.anchor = "ctr";
+                        t.body.wrap = false;
+                        t.body.insets = [0; 4];
+                    }
+                    let sp = Sp {
+                        geom: Geometry::default(),
+                        fill: Fill::None,
+                        line: Line::default(),
+                        shadow,
+                        text,
+                        ..Sp::default()
+                    };
+                    let mut s = Shape::new(ShapeKind::Sp(Box::new(sp)), xf);
+                    s.name = n.attr("draw:name").unwrap_or("").to_string();
+                    return Ok(Some(s));
+                }
+                self.text_area.set(None);
+                let (geom, connector) = self.geometry(n, &mut xf);
+                let text_rect = self.text_area.take();
+                let Some(geom) = geom else {
+                    return Ok(None);
+                };
+                let text =
+                    self.text(n, &props, pres_style.as_deref(), scope, ctx, false, budget)?;
+                let open = matches!(
+                    kind,
+                    "draw:line" | "draw:polyline" | "draw:connector" | "draw:measure"
+                );
+                shape_kind = Some(ShapeKind::Sp(Box::new(Sp {
+                    geom,
+                    fill: if open { Fill::None } else { fill },
+                    line,
+                    shadow,
+                    text,
+                    connector: connector && n.child("text:p").is_none(),
+                    text_rect,
+                })));
+            }
+        }
+        let Some(k) = shape_kind else { return Ok(None) };
+        let mut s = Shape::new(k, xf);
+        s.name = n.attr("draw:name").unwrap_or("").to_string();
+        s.descr = n
+            .child("svg:desc")
+            .or_else(|| n.child("svg:title"))
+            .map(styles::text_of)
+            .unwrap_or_default();
+        s.placeholder = class.and_then(|c| {
+            Some(Placeholder {
+                kind: match c {
+                    "title" => "title",
+                    "outline" => "body",
+                    "subtitle" => "subTitle",
+                    "footer" => "ftr",
+                    "page-number" => "sldNum",
+                    "date-time" => "dt",
+                    "header" => return None,
+                    _ => "obj",
+                },
+                idx: match c {
+                    "title" => None,
+                    "outline" => Some(1),
+                    "subtitle" => Some(1),
+                    "footer" => Some(11),
+                    "page-number" => Some(12),
+                    "date-time" => Some(10),
+                    _ => Some(2),
+                },
+            })
+        });
+        Ok(Some(s))
+    }
+
+    /// Geometry of a drawing shape, and whether it is a line.
+    fn geometry(&self, n: &Node, xf: &mut Xfrm) -> (Option<Geometry>, bool) {
+        let vb = |n: &Node| geom::view_box(n.attr("svg:viewBox"));
+        match n.name.as_str() {
+            "draw:rect" | "draw:caption" => {
+                let r = n.attr("draw:corner-radius").and_then(len).unwrap_or(0);
+                let ss = xf.w.min(xf.h).max(1);
+                if r > 0 {
+                    let adj = ((r as f64 / ss as f64) * 100_000.0)
+                        .round()
+                        .clamp(0.0, 50_000.0) as i64;
+                    (
+                        Some(Geometry::Preset {
+                            name: "roundRect",
+                            adj: vec![("adj", adj)],
+                        }),
+                        false,
+                    )
+                } else {
+                    (Some(Geometry::default()), false)
+                }
+            }
+            "draw:ellipse" | "draw:circle" => {
+                let kind = n.attr("draw:kind").unwrap_or("full");
+                if kind == "full" {
+                    return (Some(Geometry::preset("ellipse")), false);
+                }
+                let st = n.attr("draw:start-angle").map(angle_deg).unwrap_or(0.0);
+                let en = n.attr("draw:end-angle").map(angle_deg).unwrap_or(360.0);
+                // Counterclockwise degrees to DrawingML's clockwise ones.
+                let a = |d: f64| ((360.0 - d).rem_euclid(360.0) * 60000.0).round() as i64;
+                let name = match kind {
+                    "arc" => "arc",
+                    "cut" => "chord",
+                    _ => "pie",
+                };
+                // The swept part runs counterclockwise from start to end:
+                // clockwise from end to start.
+                (
+                    Some(Geometry::Preset {
+                        name,
+                        adj: vec![("adj1", a(en)), ("adj2", a(st))],
+                    }),
+                    false,
+                )
+            }
+            "draw:line" | "draw:measure" | "draw:connector" => {
+                let g = |k: &str| n.attr(k).and_then(len).unwrap_or(0);
+                let (x1, y1, x2, y2) = (g("svg:x1"), g("svg:y1"), g("svg:x2"), g("svg:y2"));
+                if n.name == "draw:connector"
+                    && let (Some(d), Some(v)) = (n.attr("svg:d"), vb(n))
+                {
+                    // The path's box is the view box, in 1/100 mm.
+                    let bx = (v[0] * 360.0).round() as Emu;
+                    let by = (v[1] * 360.0).round() as Emu;
+                    let bw = (v[2] * 360.0).round() as Emu;
+                    let bh = (v[3] * 360.0).round() as Emu;
+                    *xf = Xfrm {
+                        x: bx,
+                        y: by,
+                        w: bw.max(1),
+                        h: bh.max(1),
+                        ..Xfrm::default()
+                    };
+                    return (geom::svg_path(d, v, false), true);
+                }
+                *xf = Xfrm {
+                    x: x1.min(x2),
+                    y: y1.min(y2),
+                    w: (x2 - x1).abs(),
+                    h: (y2 - y1).abs(),
+                    flip_h: x2 < x1,
+                    flip_v: y2 < y1,
+                    ..Xfrm::default()
+                };
+                (Some(Geometry::preset("line")), true)
+            }
+            "draw:polyline" | "draw:polygon" => {
+                let v = vb(n).unwrap_or([0.0, 0.0, xf.w.max(1) as f64, xf.h.max(1) as f64]);
+                (
+                    n.attr("draw:points")
+                        .and_then(|p| geom::points(p, v, n.name == "draw:polygon")),
+                    n.name == "draw:polyline",
+                )
+            }
+            "draw:path" => {
+                let v = vb(n).unwrap_or([0.0, 0.0, xf.w.max(1) as f64, xf.h.max(1) as f64]);
+                (
+                    n.attr("svg:d").and_then(|d| geom::svg_path(d, v, true)),
+                    false,
+                )
+            }
+            "draw:regular-polygon" => {
+                let k = n
+                    .attr("draw:corners")
+                    .and_then(|c| c.parse::<usize>().ok())
+                    .unwrap_or(5)
+                    .clamp(3, 64);
+                let concave = n.attr("draw:concave") == Some("true");
+                let sharp = n.attr("draw:sharpness").and_then(percent).unwrap_or(0.5);
+                let mut pts = String::new();
+                let total = if concave { k * 2 } else { k };
+                for i in 0..total {
+                    let a = -std::f64::consts::FRAC_PI_2
+                        + i as f64 * std::f64::consts::TAU / total as f64;
+                    let r = if concave && i % 2 == 1 {
+                        1.0 - sharp
+                    } else {
+                        1.0
+                    };
+                    pts.push_str(&format!(
+                        "{},{} ",
+                        500.0 + 500.0 * r * a.cos(),
+                        500.0 + 500.0 * r * a.sin()
+                    ));
+                }
+                (geom::points(&pts, [0.0, 0.0, 1000.0, 1000.0], true), false)
+            }
+            "draw:custom-shape" => {
+                let Some(eg) = n.child("draw:enhanced-geometry") else {
+                    return (Some(Geometry::default()), false);
+                };
+                if let Some((g, mh, mv, area)) = geom::enhanced(eg, xf.w, xf.h) {
+                    self.text_area.set(area);
+                    if mh {
+                        xf.flip_h = !xf.flip_h;
+                    }
+                    if mv {
+                        xf.flip_v = !xf.flip_v;
+                    }
+                    return (Some(g), false);
+                }
+                let preset = match eg.attr("draw:type").unwrap_or("rectangle") {
+                    "ellipse" => "ellipse",
+                    "round-rectangle" => "roundRect",
+                    "isosceles-triangle" => "triangle",
+                    "right-triangle" => "rtTriangle",
+                    "diamond" => "diamond",
+                    "parallelogram" => "parallelogram",
+                    "trapezoid" => "trapezoid",
+                    "hexagon" => "hexagon",
+                    "octagon" => "octagon",
+                    "pentagon" => "pentagon",
+                    "cross" => "plus",
+                    "star5" => "star5",
+                    "right-arrow" => "rightArrow",
+                    "left-arrow" => "leftArrow",
+                    "up-arrow" => "upArrow",
+                    "down-arrow" => "downArrow",
+                    "heart" => "heart",
+                    "smiley" => "smileyFace",
+                    "can" => "can",
+                    "cube" => "cube",
+                    t if t.starts_with("ooxml-") => {
+                        // The preset itself; unknown names fall back to a rectangle.
+                        return (Some(Geometry::preset(ooxml_preset(&t[6..]))), false);
+                    }
+                    _ => "rect",
+                };
+                (Some(Geometry::preset(preset)), false)
+            }
+            _ => (None, false),
+        }
+    }
+
+    fn table(
+        &mut self,
+        t: &Node,
+        xf: &Xfrm,
+        scope: Scope,
+        ctx: &PageCtx,
+        budget: &mut Budget,
+    ) -> Result<Option<Table>> {
+        let st = self.styles(scope);
+        let mut cols: Vec<Emu> = vec![];
+        for c in t.all("table:table-column").take(1000) {
+            let w = st
+                .resolve("table-column", c.attr("table:style-name"))
+                .len("style:column-width")
+                .unwrap_or(0);
+            let rep = c
+                .attr("table:number-columns-repeated")
+                .and_then(|v| v.parse::<usize>().ok())
+                .unwrap_or(1)
+                .min(1000);
+            for _ in 0..rep {
+                cols.push(w);
+            }
+        }
+        let rows_nodes: Vec<&Node> = t
+            .nodes()
+            .flat_map(|n| {
+                if n.name == "table:table-row" {
+                    vec![n]
+                } else if n.name.starts_with("table:table-header-rows")
+                    || n.name == "table:table-rows"
+                {
+                    n.all("table:table-row").collect()
+                } else {
+                    vec![]
+                }
+            })
+            .take(1000)
+            .collect();
+        let parts: Vec<(String, String)> = t
+            .attr("table:template-name")
+            .and_then(|n| self.styles(scope).table_templates.get(n))
+            .cloned()
+            .unwrap_or_default();
+        let flag = |k: &str| t.attr(k) == Some("true");
+        let (first_row, last_row, first_col, last_col, band_rows, band_cols) = (
+            flag("table:use-first-row-styles"),
+            flag("table:use-last-row-styles"),
+            flag("table:use-first-column-styles"),
+            flag("table:use-last-column-styles"),
+            flag("table:use-banding-rows-styles"),
+            flag("table:use-banding-columns-styles"),
+        );
+        let nrows = rows_nodes.len();
+        let part = |name: &str| parts.iter().find(|p| p.0 == name).map(|p| p.1.clone());
+        // The template's cell style for a cell: first and last rows and
+        // columns over banding over the body.
+        let template = |ri: usize, ci: usize, ncols: usize| -> Option<String> {
+            if parts.is_empty() {
+                return None;
+            }
+            let mut s = part("body");
+            if band_cols && ci % 2 == 1 {
+                s = part("odd-columns").or(s);
+            }
+            if band_rows && ri % 2 == 1 {
+                s = part("odd-rows").or(s);
+            }
+            if first_col && ci == 0 {
+                s = part("first-column").or(s);
+            }
+            if last_col && ci + 1 == ncols {
+                s = part("last-column").or(s);
+            }
+            if first_row && ri == 0 {
+                s = part("first-row").or(s);
+            }
+            if last_row && ri + 1 == nrows {
+                s = part("last-row").or(s);
+            }
+            s
+        };
+        let mut rows = vec![];
+        for (ri, r) in rows_nodes.into_iter().enumerate() {
+            let ncols = r
+                .nodes()
+                .filter(|c| c.name == "table:table-cell" || c.name == "table:covered-table-cell")
+                .count();
+            let h = self
+                .styles(scope)
+                .resolve("table-row", r.attr("table:style-name"))
+                .len("style:row-height")
+                .unwrap_or(0);
+            let mut cells = vec![];
+            let cell_nodes = r
+                .nodes()
+                .filter(|c| c.name == "table:table-cell" || c.name == "table:covered-table-cell");
+            for (ci, c) in cell_nodes.take(1000).enumerate() {
+                let covered = c.name == "table:covered-table-cell";
+                let mut cp = self
+                    .styles(scope)
+                    .resolve("table-cell", template(ri, ci, ncols).as_deref());
+                cp.overlay(
+                    &self
+                        .styles(scope)
+                        .chain("table-cell", c.attr("table:style-name"))
+                        .0,
+                );
+                let fill = match cp.get("fo:background-color") {
+                    Some(v) if v != "transparent" => color(v)
+                        .map(|rgb| Fill::Solid(Color::rgb(rgb)))
+                        .unwrap_or_default(),
+                    _ => match cp.get("draw:fill") {
+                        Some("solid") | Some("gradient") | Some("bitmap") => self.fill(&cp, scope),
+                        _ => Fill::None,
+                    },
+                };
+                let border = |k: &str| -> Line {
+                    let v = cp.get(k).or_else(|| cp.get("fo:border")).unwrap_or("none");
+                    border_line(v)
+                };
+                let mut text = self
+                    .text(c, &cp, None, scope, ctx, true, budget)?
+                    .unwrap_or_default();
+                let pad = |k: &str| {
+                    cp.len(k)
+                        .or_else(|| cp.len("fo:padding"))
+                        .unwrap_or(91440 / 2)
+                        .max(0)
+                };
+                text.body.insets = [
+                    pad("fo:padding-left"),
+                    pad("fo:padding-top"),
+                    pad("fo:padding-right"),
+                    pad("fo:padding-bottom"),
+                ];
+                text.body.anchor = match cp.get("style:vertical-align") {
+                    Some("middle") => "ctr",
+                    Some("bottom") => "b",
+                    _ => "t",
+                };
+                let span = |k: &str| {
+                    c.attr(k)
+                        .and_then(|v| v.parse::<u32>().ok())
+                        .unwrap_or(1)
+                        .clamp(1, 1000)
+                };
+                cells.push(Cell {
+                    text,
+                    fill,
+                    borders: [
+                        border("fo:border-left"),
+                        border("fo:border-right"),
+                        border("fo:border-top"),
+                        border("fo:border-bottom"),
+                    ],
+                    grid_span: span("table:number-columns-spanned"),
+                    row_span: span("table:number-rows-spanned"),
+                    h_merge: covered,
+                    v_merge: false,
+                });
+            }
+            rows.push(Row { h, cells });
+        }
+        if rows.is_empty() {
+            return Ok(None);
+        }
+        let n = rows
+            .iter()
+            .map(|r| r.cells.len())
+            .max()
+            .unwrap_or(0)
+            .max(cols.len());
+        if cols.len() < n {
+            cols.resize(n, 0);
+        }
+        // Widths and heights left out share the frame's.
+        let known: Emu = cols.iter().sum();
+        let unknown = cols.iter().filter(|&&w| w == 0).count() as Emu;
+        if unknown > 0 {
+            let each = ((xf.w - known).max(0) / unknown).max(91440);
+            for w in &mut cols {
+                if *w == 0 {
+                    *w = each;
+                }
+            }
+        }
+        let nrows = rows.len() as Emu;
+        for r in &mut rows {
+            if r.h == 0 {
+                r.h = (xf.h / nrows).max(91440);
+            }
+        }
+        // A covered cell below a spanning one merges vertically.
+        let spans: Vec<Vec<(u32, u32)>> = rows
+            .iter()
+            .map(|r| r.cells.iter().map(|c| (c.grid_span, c.row_span)).collect())
+            .collect();
+        for (ri, row) in spans.iter().enumerate() {
+            for (ci, &(_, rs)) in row.iter().enumerate() {
+                for k in 1..rs as usize {
+                    if let Some(c) = rows.get_mut(ri + k).and_then(|r| r.cells.get_mut(ci)) {
+                        c.v_merge = true;
+                        c.h_merge = false;
+                    }
+                }
+            }
+        }
+        Ok(Some(Table { cols, rows }))
+    }
+}
+
+/// An ODF angle with or without its unit, in degrees.
+fn angle_deg(s: &str) -> f64 {
+    let s = s.trim();
+    let v = |t: &str| t.trim().parse::<f64>().unwrap_or(0.0);
+    if let Some(r) = s.strip_suffix("rad") {
+        v(r).to_degrees()
+    } else if let Some(g) = s.strip_suffix("grad") {
+        v(g) * 0.9
+    } else {
+        v(s.trim_end_matches("deg"))
+    }
+}
+
+/// Gradient and hatch angles: tenths of a degree without a unit.
+fn angle_tenths(s: &str) -> f64 {
+    let t = s.trim();
+    if t.ends_with("deg") || t.ends_with("rad") || t.ends_with("grad") {
+        angle_deg(t)
+    } else {
+        t.parse::<f64>().unwrap_or(0.0) / 10.0
+    }
+}
+
+fn gradient(g: &Props, alpha: Option<u32>) -> Fill {
+    let intensity = |c: Rgb, k: &str| {
+        let f = g.get(k).and_then(percent).unwrap_or(1.0).clamp(0.0, 1.0);
+        let ch = |s: u32| (((c >> s) & 0xFF) as f64 * f).round() as u32;
+        ch(16) << 16 | ch(8) << 8 | ch(0)
+    };
+    let start = Color {
+        rgb: intensity(
+            g.color("draw:start-color").unwrap_or(0),
+            "draw:start-intensity",
+        ),
+        alpha,
+    };
+    let end = Color {
+        rgb: intensity(
+            g.color("draw:end-color").unwrap_or(0xFFFFFF),
+            "draw:end-intensity",
+        ),
+        alpha,
+    };
+    let border = (g
+        .get("draw:border")
+        .and_then(percent)
+        .unwrap_or(0.0)
+        .clamp(0.0, 1.0)
+        * 100_000.0) as u32;
+    let angle = g.get("draw:angle").map(angle_tenths).unwrap_or(0.0);
+    let cx = g
+        .get("draw:cx")
+        .and_then(percent)
+        .unwrap_or(0.5)
+        .clamp(0.0, 1.0);
+    let cy = g
+        .get("draw:cy")
+        .and_then(percent)
+        .unwrap_or(0.5)
+        .clamp(0.0, 1.0);
+    let focus = [
+        (cx * 100_000.0) as i32,
+        (cy * 100_000.0) as i32,
+        ((1.0 - cx) * 100_000.0) as i32,
+        ((1.0 - cy) * 100_000.0) as i32,
+    ];
+    let (stops, kind) = match g.get("draw:style").unwrap_or("linear") {
+        "axial" => (
+            vec![
+                (0, end),
+                (border / 2, end),
+                (50_000, start),
+                (100_000 - border / 2, end),
+                (100_000, end),
+            ],
+            GradientKind::Linear((90.0 - angle).rem_euclid(360.0)),
+        ),
+        "radial" | "ellipsoid" => (
+            vec![(0, end), (100_000 - border, start), (100_000, start)],
+            GradientKind::Path("circle", focus),
+        ),
+        "square" | "rectangular" => (
+            vec![(0, end), (100_000 - border, start), (100_000, start)],
+            GradientKind::Path("rect", focus),
+        ),
+        _ => (
+            vec![(0, start), (border, start), (100_000, end)],
+            GradientKind::Linear((90.0 - angle).rem_euclid(360.0)),
+        ),
+    };
+    let mut stops = stops;
+    stops.dedup_by(|a, b| a.0 == b.0 && a.1 == b.1);
+    Fill::Gradient(Gradient { stops, kind })
+}
+
+fn dash_preset(d: Option<&Props>) -> &'static str {
+    let Some(d) = d else { return "dash" };
+    let n = |k: &str| d.get(k).and_then(|v| v.parse::<u32>().ok()).unwrap_or(0);
+    let l = |k: &str| {
+        d.get(k)
+            .map(|v| {
+                percent(v)
+                    .map(|f| f * 100.0)
+                    .unwrap_or_else(|| len(v).unwrap_or(0) as f64 / 3600.0)
+            })
+            .unwrap_or(0.0)
+    };
+    let (d1, d2) = (n("draw:dots1"), n("draw:dots2"));
+    let (l1, l2) = (l("draw:dots1-length"), l("draw:dots2-length"));
+    let short = |v: f64| v <= 0.0 || v < 60.0;
+    match (d1 > 0, d2 > 0) {
+        (true, true) if short(l1) != short(l2) => {
+            if d1.max(d2) > 1 {
+                "sysDashDotDot"
+            } else {
+                "dashDot"
+            }
+        }
+        (true, true) | (true, false) | (false, true) => {
+            let lenv = l1.max(l2);
+            if short(lenv) {
+                "sysDot"
+            } else if lenv > 300.0 {
+                "lgDash"
+            } else {
+                "dash"
+            }
+        }
+        _ => "dash",
+    }
+}
+
+/// A table cell border ("0.5pt solid #000000").
+fn border_line(v: &str) -> Line {
+    let v = v.trim();
+    if v == "none" || v.is_empty() || v == "hidden" {
+        return Line::default();
+    }
+    let mut width = 9525;
+    let mut rgb = 0;
+    let mut dash = None;
+    for t in v.split_whitespace() {
+        if let Some(w) = len(t) {
+            width = w.max(0);
+        } else if let Some(c) = color(t) {
+            rgb = c;
+        } else if t == "dashed" {
+            dash = Some("dash");
+        } else if t == "dotted" {
+            dash = Some("sysDot");
+        }
+    }
+    Line {
+        fill: Fill::Solid(Color::rgb(rgb)),
+        width,
+        dash,
+        ..Line::default()
+    }
+}
+
+fn ooxml_preset(name: &str) -> &'static str {
+    const NAMES: &[&str] = &[
+        "rect",
+        "roundRect",
+        "ellipse",
+        "triangle",
+        "rtTriangle",
+        "diamond",
+        "parallelogram",
+        "trapezoid",
+        "pentagon",
+        "hexagon",
+        "heptagon",
+        "octagon",
+        "decagon",
+        "dodecagon",
+        "star4",
+        "star5",
+        "star6",
+        "star7",
+        "star8",
+        "star10",
+        "star12",
+        "star16",
+        "star24",
+        "star32",
+        "rightArrow",
+        "leftArrow",
+        "upArrow",
+        "downArrow",
+        "leftRightArrow",
+        "upDownArrow",
+        "chevron",
+        "homePlate",
+        "plus",
+        "can",
+        "cube",
+        "donut",
+        "heart",
+        "smileyFace",
+        "sun",
+        "moon",
+        "cloud",
+        "frame",
+        "plaque",
+        "bevel",
+        "foldedCorner",
+        "flowChartProcess",
+        "flowChartDecision",
+        "flowChartTerminator",
+        "wave",
+        "doubleWave",
+        "snip1Rect",
+        "snip2SameRect",
+        "round1Rect",
+        "round2SameRect",
+        "teardrop",
+        "pie",
+        "chord",
+        "arc",
+        "blockArc",
+        "lightningBolt",
+        "noSmoking",
+    ];
+    NAMES.iter().copied().find(|n| *n == name).unwrap_or("rect")
+}
+
+/// The box around shapes.
+fn bounds(shapes: &[Shape]) -> Xfrm {
+    let mut x0 = i64::MAX;
+    let mut y0 = i64::MAX;
+    let mut x1 = i64::MIN;
+    let mut y1 = i64::MIN;
+    for s in shapes {
+        x0 = x0.min(s.xfrm.x);
+        y0 = y0.min(s.xfrm.y);
+        x1 = x1.max(s.xfrm.x + s.xfrm.w);
+        y1 = y1.max(s.xfrm.y + s.xfrm.h);
+    }
+    Xfrm {
+        x: x0,
+        y: y0,
+        w: (x1 - x0).max(1),
+        h: (y1 - y0).max(1),
+        ..Xfrm::default()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn rotation_transform_to_box_and_angle() {
+        let x = br#"<draw:rect xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="2cm" svg:height="1cm" draw:transform="rotate (1.5707963267949) translate (5cm 5cm)"/>"#;
+        let n = xml::parse(x, &mut xml::within(1 << 20)).unwrap();
+        let xf = transform(&n);
+        // Turned a quarter counterclockwise about its top left at (5, 5):
+        // it covers x 5..6, y 3..5 (cm); its own box is centred there.
+        assert_eq!((xf.w, xf.h), (720_000, 360_000));
+        assert!((xf.rot - 270.0).abs() < 1e-6);
+        assert_eq!((xf.x + xf.w / 2, xf.y + xf.h / 2), (1_980_000, 1_440_000));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/odp/styles.rs b/crates/exav-render/src/formats/office/slides/odp/styles.rs
new file mode 100644
index 00000000..4a1d6912
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/odp/styles.rs
@@ -0,0 +1,382 @@
+//! ODF styles ([ODF 1.2] part 1, 16): named and automatic styles with
+//! their parent chains, default styles, gradients, hatches, images and dash
+//! definitions, and the length and colour values of their properties.
+
+use crate::formats::office::common::xml::Node;
+use crate::formats::office::slides::model::{Emu, Rgb};
+use std::collections::HashMap;
+
+/// A length to EMU: cm, mm, in, pt, pc, px; a bare number is taken as cm
+/// (the unit drawings use when none is given).
+pub fn len(s: &str) -> Option<Emu> {
+    let s = s.trim();
+    let at = s
+        .find(|c: char| c.is_ascii_alphabetic() || c == '%')
+        .unwrap_or(s.len());
+    let (num, unit) = s.split_at(at);
+    let v: f64 = num.trim().parse().ok()?;
+    if !v.is_finite() {
+        return None;
+    }
+    let emu = match unit {
+        "cm" | "" => v * 360_000.0,
+        "mm" => v * 36_000.0,
+        "in" | "inch" => v * 914_400.0,
+        "pt" => v * 12_700.0,
+        "pc" => v * 152_400.0,
+        "px" => v * 9_525.0,
+        _ => return None,
+    };
+    Some(emu.clamp(-1e13, 1e13).round() as Emu)
+}
+
+// "#RRGGBB" as an `Rgb`, "50%" as 0.5, and the text of a node and its
+// descendants, as the other ODF readers have them.
+pub use crate::formats::office::common::odf::{color, percent, text_of};
+
+/// One style: its parent and every property of its property elements,
+/// keyed by qualified name.
+#[derive(Clone, Debug, Default)]
+pub struct StyleDef {
+    pub parent: Option<String>,
+    pub props: Vec<(String, String)>,
+    /// A list style the style carries (graphic and presentation styles).
+    pub list: Option<usize>,
+}
+
+/// Resolved properties: the last value of a key wins.
+#[derive(Clone, Debug, Default)]
+pub struct Props(pub Vec<(String, String)>);
+
+impl Props {
+    pub fn get(&self, k: &str) -> Option<&str> {
+        self.0.iter().rev().find(|p| p.0 == k).map(|p| p.1.as_str())
+    }
+
+    pub fn overlay(&mut self, o: &[(String, String)]) {
+        self.0.extend(o.iter().cloned());
+    }
+
+    pub fn len(&self, k: &str) -> Option<Emu> {
+        self.get(k).and_then(len)
+    }
+
+    pub fn color(&self, k: &str) -> Option<Rgb> {
+        self.get(k).and_then(color)
+    }
+
+    pub fn is(&self, k: &str, v: &str) -> bool {
+        self.get(k) == Some(v)
+    }
+}
+
+/// A list style's levels: (level 1 to 10, element).
+#[derive(Clone, Debug, Default)]
+pub struct ListDef {
+    pub levels: Vec<(usize, ListLevel)>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct ListLevel {
+    /// bullet, number, image or none.
+    pub kind: &'static str,
+    pub bullet: Option<char>,
+    pub num_format: String,
+    pub num_suffix: String,
+    pub start: u32,
+    /// The picture of an image bullet: its package path, or "data:" and
+    /// its base64 text.
+    pub image: Option<String>,
+    pub props: Props,
+}
+
+/// The styles of one scope (a document's content, or its masters).
+#[derive(Default)]
+pub struct Styles {
+    /// (family, name) to style, automatic styles before common ones.
+    pub styles: HashMap<(String, String), StyleDef>,
+    pub defaults: HashMap<String, Vec<(String, String)>>,
+    pub lists: Vec<ListDef>,
+    pub list_names: HashMap<String, usize>,
+    /// draw:gradient, draw:hatch, draw:fill-image, draw:stroke-dash,
+    /// draw:marker, draw:opacity, by name.
+    pub objects: HashMap<(String, String), Props>,
+    /// Font face name to family.
+    pub fonts: HashMap<String, String>,
+    /// Page layouts' properties, by name.
+    pub page_layouts: HashMap<String, Props>,
+    /// Table templates: name to (part, cell style) pairs (first-row,
+    /// body, odd-rows...).
+    pub table_templates: HashMap<String, Vec<(String, String)>>,
+}
+
+fn props_of(n: &Node, out: &mut Vec<(String, String)>) {
+    for (k, v) in &n.attrs {
+        out.push((k.clone(), v.clone()));
+    }
+}
+
+impl Styles {
+    /// Reads the style elements under `n` (office:styles,
+    /// office:automatic-styles, office:font-face-decls), later ones
+    /// replacing earlier ones of the same name.
+    pub fn add(&mut self, n: &Node) {
+        for c in n.nodes() {
+            match c.name.as_str() {
+                "style:style" => {
+                    let family = c.attr("style:family").unwrap_or("").to_string();
+                    let name = c.attr("style:name").unwrap_or("").to_string();
+                    let mut def = StyleDef {
+                        parent: c.attr("style:parent-style-name").map(str::to_string),
+                        ..StyleDef::default()
+                    };
+                    for p in c.nodes() {
+                        if p.name.ends_with("-properties") {
+                            props_of(p, &mut def.props);
+                            if let Some(l) = p.child("text:list-style") {
+                                def.list = Some(self.list(l));
+                            }
+                        }
+                    }
+                    self.styles.insert((family, name), def);
+                }
+                "table:table-template" => {
+                    let name = c
+                        .attr("text:style-name")
+                        .or(c.attr("style:name"))
+                        .or(c.attr("table:name"))
+                        .unwrap_or("");
+                    let parts = c
+                        .nodes()
+                        .filter_map(|p| {
+                            let part = p.name.strip_prefix("table:")?;
+                            Some((part.to_string(), p.attr("table:style-name")?.to_string()))
+                        })
+                        .collect();
+                    self.table_templates.insert(name.to_string(), parts);
+                }
+                "style:page-layout" => {
+                    let mut v = vec![];
+                    for p in c.nodes() {
+                        props_of(p, &mut v);
+                    }
+                    if let Some(name) = c.attr("style:name") {
+                        self.page_layouts.insert(name.to_string(), Props(v));
+                    }
+                }
+                "style:default-style" => {
+                    let family = c.attr("style:family").unwrap_or("").to_string();
+                    let mut v = vec![];
+                    for p in c.nodes() {
+                        if p.name.ends_with("-properties") {
+                            props_of(p, &mut v);
+                        }
+                    }
+                    self.defaults.insert(family, v);
+                }
+                "text:list-style" => {
+                    let i = self.list(c);
+                    if let Some(name) = c.attr("style:name") {
+                        self.list_names.insert(name.to_string(), i);
+                    }
+                }
+                "draw:gradient" | "draw:hatch" | "draw:fill-image" | "draw:stroke-dash"
+                | "draw:marker" | "draw:opacity" => {
+                    if let Some(name) = c.attr("draw:name") {
+                        let mut p = vec![];
+                        props_of(c, &mut p);
+                        // A flat file holds the picture inline.
+                        if let Some(b) = c.child("office:binary-data") {
+                            p.push(("xlink:href".into(), format!("data:{}", b.own_text())));
+                        }
+                        self.objects
+                            .insert((c.name.clone(), name.to_string()), Props(p));
+                    }
+                }
+                "style:font-face" => {
+                    if let (Some(name), Some(fam)) =
+                        (c.attr("style:name"), c.attr("svg:font-family"))
+                    {
+                        let fam = fam.trim().trim_matches(['\'', '"']).to_string();
+                        self.fonts.insert(name.to_string(), fam);
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    fn list(&mut self, l: &Node) -> usize {
+        let mut def = ListDef::default();
+        for lv in l.nodes() {
+            let level = lv
+                .attr("text:level")
+                .and_then(|v| v.parse::<usize>().ok())
+                .unwrap_or(1)
+                .clamp(1, 10);
+            let mut x = ListLevel {
+                kind: match lv.name.as_str() {
+                    "text:list-level-style-bullet" => "bullet",
+                    "text:list-level-style-number" => "number",
+                    "text:list-level-style-image" => "image",
+                    _ => "none",
+                },
+                bullet: lv.attr("text:bullet-char").and_then(|s| s.chars().next()),
+                num_format: lv.attr("style:num-format").unwrap_or("").to_string(),
+                num_suffix: lv.attr("style:num-suffix").unwrap_or("").to_string(),
+                start: lv
+                    .attr("text:start-value")
+                    .and_then(|v| v.parse().ok())
+                    .unwrap_or(1),
+                image: lv.attr("xlink:href").map(str::to_string).or_else(|| {
+                    lv.child("office:binary-data")
+                        .map(|b| format!("data:{}", b.own_text()))
+                }),
+                ..ListLevel::default()
+            };
+            let mut p = vec![];
+            for c in lv.nodes() {
+                props_of(c, &mut p);
+                for g in c.nodes() {
+                    props_of(g, &mut p);
+                }
+            }
+            x.props = Props(p);
+            def.levels.push((level, x));
+        }
+        self.lists.push(def);
+        self.lists.len() - 1
+    }
+
+    pub fn get(&self, family: &str, name: &str) -> Option<&StyleDef> {
+        self.styles.get(&(family.to_string(), name.to_string()))
+    }
+
+    /// The style's properties over its parents', without a default.
+    pub fn chain(&self, family: &str, name: Option<&str>) -> Props {
+        let mut chain = vec![];
+        let mut cur = name.map(str::to_string);
+        while let Some(n) = cur.take() {
+            if chain.len() > 32 {
+                break;
+            }
+            if let Some(s) = self.get(family, &n) {
+                chain.push(s);
+                cur = s.parent.clone();
+            }
+        }
+        let mut out = Props::default();
+        for s in chain.iter().rev() {
+            out.overlay(&s.props);
+        }
+        out
+    }
+
+    /// The style's properties over its parents' and its family's default.
+    pub fn resolve(&self, family: &str, name: Option<&str>) -> Props {
+        let mut chain = vec![];
+        // A drawing object with no style has the style called "standard".
+        let name = name.or((family == "graphic").then_some("standard"));
+        let mut cur = name.map(str::to_string);
+        // Presentation styles fall back to graphic ones of the same name.
+        while let Some(n) = cur.take() {
+            if chain.len() > 32 {
+                break;
+            }
+            let s = self.get(family, &n).or_else(|| {
+                if family == "presentation" {
+                    self.get("graphic", &n)
+                } else {
+                    None
+                }
+            });
+            if let Some(s) = s {
+                chain.push(s);
+                cur = s.parent.clone();
+            }
+        }
+        let mut out = Props::default();
+        let def_family = if family == "presentation" {
+            "graphic"
+        } else {
+            family
+        };
+        if let Some(d) = self.defaults.get(def_family) {
+            out.overlay(d);
+        }
+        for s in chain.iter().rev() {
+            out.overlay(&s.props);
+        }
+        out
+    }
+
+    /// The list style a style or its parents carry.
+    pub fn list_of(&self, family: &str, name: Option<&str>) -> Option<&ListDef> {
+        let mut cur = name.map(str::to_string);
+        let mut n = 0;
+        while let Some(s) = cur.take() {
+            n += 1;
+            if n > 32 {
+                break;
+            }
+            let st = self.get(family, &s).or_else(|| self.get("graphic", &s))?;
+            if let Some(i) = st.list {
+                return self.lists.get(i);
+            }
+            cur = st.parent.clone();
+        }
+        None
+    }
+
+    pub fn object(&self, kind: &str, name: &str) -> Option<&Props> {
+        self.objects.get(&(kind.to_string(), name.to_string()))
+    }
+
+    pub fn font(&self, name: &str) -> String {
+        self.fonts
+            .get(name)
+            .cloned()
+            .unwrap_or_else(|| name.trim_matches(['\'', '"']).to_string())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn lengths_and_colours() {
+        assert_eq!(len("2.54cm"), Some(914_400));
+        assert_eq!(len("1in"), Some(914_400));
+        assert_eq!(len("10pt"), Some(127_000));
+        assert_eq!(len("x"), None);
+        assert_eq!(color("#3465a4"), Some(0x3465A4));
+        assert_eq!(color("#fff"), Some(0xFFFFFF));
+        assert_eq!(percent("50%"), Some(0.5));
+    }
+
+    #[test]
+    fn styles_resolve_through_parents_and_defaults() {
+        let x = br##"<office:styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"><style:default-style style:family="graphic"><style:graphic-properties draw:fill-color="#729fcf" draw:stroke="solid"/></style:default-style><style:style style:name="a" style:family="graphic"><style:graphic-properties draw:fill="solid"/></style:style><style:style style:name="b" style:family="graphic" style:parent-style-name="a"><style:graphic-properties draw:fill-color="#ff0000"/></style:style></office:styles>"##;
+        let n = crate::formats::office::common::xml::parse(
+            x,
+            &mut crate::formats::office::common::xml::within(1 << 20),
+        )
+        .unwrap();
+        let mut s = Styles::default();
+        s.add(&n);
+        let p = s.resolve("graphic", Some("b"));
+        assert_eq!(p.get("draw:fill"), Some("solid"));
+        assert_eq!(p.color("draw:fill-color"), Some(0xFF0000));
+        assert_eq!(p.get("draw:stroke"), Some("solid"));
+        // A presentation style falls back to a graphic one.
+        assert_eq!(
+            s.resolve("presentation", Some("a")).get("draw:fill"),
+            Some("solid")
+        );
+        // `chain` leaves the default out.
+        let p = s.chain("graphic", Some("b"));
+        assert_eq!(p.get("draw:fill"), Some("solid"));
+        assert_eq!(p.get("draw:stroke"), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/odp/text.rs b/crates/exav-render/src/formats/office/slides/odp/text.rs
new file mode 100644
index 00000000..50ece3fa
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/odp/text.rs
@@ -0,0 +1,565 @@
+//! ODF text in drawing shapes ([ODF 1.2] part 1, 5 and 6): paragraphs,
+//! spans, lists and fields, with paragraph, text and list styles resolved
+//! into explicit DrawingML properties.
+
+use super::styles::{ListDef, ListLevel, Props, Styles, len, percent};
+use crate::formats::office::common::xml::{Child, Node};
+use crate::formats::office::slides::model::*;
+
+/// What a shape's text is resolved against.
+pub struct TextCtx<'a> {
+    pub styles: &'a Styles,
+    /// The shape's own style, text and paragraph properties included.
+    pub base: &'a Props,
+    /// Per outline level (1-based) presentation styles, for outlines.
+    pub levels: &'a dyn Fn(usize) -> Option<Props>,
+    /// The shape style's list style.
+    pub list: Option<&'a ListDef>,
+    pub slide_number: usize,
+    pub footer: &'a str,
+    pub date: &'a str,
+    pub header: &'a str,
+    /// The automatic font colour: black, or white on a dark background.
+    pub auto_color: Rgb,
+    /// The pictures of the image bullets the paragraphs use, in the order
+    /// their `Bullet::Picture` indexes name; the caller reads them.
+    pub pictures: Vec<String>,
+}
+
+fn font_size(p: &Props, inherited: f64) -> f64 {
+    let mut size = inherited;
+    // Each property set once per level, so the last value is the one.
+    if let Some(v) = p.get("fo:font-size") {
+        if let Some(f) = percent(v) {
+            size *= f;
+        } else if let Some(e) = len(v) {
+            size = e as f64 / 12_700.0;
+        }
+    }
+    size.clamp(1.0, 4000.0)
+}
+
+/// Text properties as run properties, `size` already resolved.
+pub fn run_props(p: &Props, size: f64, styles: &Styles, auto_color: Rgb) -> RunProps {
+    let font = p
+        .get("style:font-name")
+        .map(|n| styles.font(n))
+        .or_else(|| {
+            p.get("fo:font-family")
+                .map(|f| f.trim_matches(['\'', '"']).to_string())
+        });
+    let bold = p.get("fo:font-weight").map(|w| match w {
+        "bold" => true,
+        "normal" => false,
+        n => n.parse::<u32>().map(|v| v >= 600).unwrap_or(false),
+    });
+    let italic = p
+        .get("fo:font-style")
+        .map(|s| s == "italic" || s == "oblique");
+    let underline = p.get("style:text-underline-style").map(|u| {
+        let double = p.is("style:text-underline-type", "double");
+        match (u, double) {
+            ("none", _) => "none",
+            (_, true) => "dbl",
+            ("dotted", _) => "dotted",
+            ("dash", _) => "dash",
+            ("long-dash", _) => "dashLong",
+            ("dot-dash", _) => "dotDash",
+            ("dot-dot-dash", _) => "dotDotDash",
+            ("wave", _) => "wavy",
+            _ => "sng",
+        }
+    });
+    let strike = p.get("style:text-line-through-style").map(|s| {
+        if s == "none" {
+            "noStrike"
+        } else if p.is("style:text-line-through-type", "double") {
+            "dblStrike"
+        } else {
+            "sngStrike"
+        }
+    });
+    let auto = p.is("style:use-window-font-color", "true");
+    let color = p
+        .color("fo:color")
+        .filter(|_| !auto || p.get("fo:color").is_some())
+        .map(Color::rgb)
+        .or(auto.then(|| Color::rgb(auto_color)));
+    let baseline = p.get("style:text-position").and_then(|t| {
+        let first = t.split_whitespace().next()?;
+        match first {
+            "super" => Some(33_000),
+            "sub" => Some(-33_000),
+            v => percent(v)
+                .map(|f| (f * 100_000.0).round() as i32)
+                .filter(|&b| b != 0),
+        }
+    });
+    let caps = if p.is("fo:font-variant", "small-caps") {
+        Some("small")
+    } else if p.is("fo:text-transform", "uppercase") {
+        Some("all")
+    } else {
+        None
+    };
+    let shadow = p
+        .get("fo:text-shadow")
+        .filter(|s| *s != "none")
+        .map(|_| Shadow {
+            color: Color {
+                rgb: 0,
+                alpha: Some(50_000),
+            },
+            blur: 0,
+            dist: 25400,
+            dir: 45.0,
+        });
+    RunProps {
+        size: Some((size * 100.0).round() as u32),
+        bold,
+        italic,
+        underline,
+        strike,
+        color,
+        font,
+        ea_font: p.get("style:font-name-asian").map(|n| styles.font(n)),
+        cs_font: p.get("style:font-name-complex").map(|n| styles.font(n)),
+        baseline,
+        caps,
+        spacing: p
+            .get("fo:letter-spacing")
+            .filter(|s| *s != "normal")
+            .and_then(len)
+            .map(|e| (e as f64 / 127.0).round() as i32),
+        shadow,
+        highlight: p
+            .get("fo:background-color")
+            .filter(|c| *c != "transparent")
+            .and_then(super::styles::color)
+            .map(Color::rgb),
+        ..RunProps::default()
+    }
+}
+
+fn spacing_of(p: &Props, k: &str) -> Option<Spacing> {
+    let e = p.len(k)?;
+    Some(Spacing::Pts((e as f64 / 127.0).round().max(0.0) as i32))
+}
+
+/// Paragraph properties without list properties.
+pub fn para_props(p: &Props) -> ParaProps {
+    let line = p.get("fo:line-height").and_then(|v| {
+        if v == "normal" {
+            Some(Spacing::Pct(100_000))
+        } else if let Some(f) = percent(v) {
+            Some(Spacing::Pct((f * 100_000.0).round() as i32))
+        } else {
+            len(v).map(|e| Spacing::Pts((e as f64 / 127.0).round() as i32))
+        }
+    });
+    let line = line.or_else(|| {
+        p.len("style:line-height-at-least")
+            .map(|e| Spacing::Pts((e as f64 / 127.0).round() as i32))
+    });
+    ParaProps {
+        align: p.get("fo:text-align").map(|a| match a {
+            "center" => "ctr",
+            "end" | "right" => "r",
+            "justify" => "just",
+            _ => "l",
+        }),
+        margin: p.len("fo:margin-left"),
+        indent: p.len("fo:text-indent"),
+        line_spacing: line,
+        space_before: spacing_of(p, "fo:margin-top"),
+        space_after: spacing_of(p, "fo:margin-bottom"),
+        rtl: p
+            .get("style:writing-mode")
+            .is_some_and(|m| m.starts_with("rl")),
+        ..ParaProps::default()
+    }
+}
+
+fn scheme(fmt: &str, suffix: &str, prefix_paren: bool) -> &'static str {
+    let paren = suffix == ")";
+    let both = paren && prefix_paren;
+    match (fmt, both, paren) {
+        ("a", true, _) => "alphaLcParenBoth",
+        ("a", _, true) => "alphaLcParenR",
+        ("a", _, _) => "alphaLcPeriod",
+        ("A", true, _) => "alphaUcParenBoth",
+        ("A", _, true) => "alphaUcParenR",
+        ("A", _, _) => "alphaUcPeriod",
+        ("i", true, _) => "romanLcParenBoth",
+        ("i", _, true) => "romanLcParenR",
+        ("i", _, _) => "romanLcPeriod",
+        ("I", true, _) => "romanUcParenBoth",
+        ("I", _, true) => "romanUcParenR",
+        ("I", _, _) => "romanUcPeriod",
+        (_, true, _) => "arabicParenBoth",
+        (_, _, true) => "arabicParenR",
+        (_, _, _) => {
+            if suffix.is_empty() {
+                "arabicPlain"
+            } else {
+                "arabicPeriod"
+            }
+        }
+    }
+}
+
+/// A list level's bullet and the margins it sets.
+fn bullet(lv: &ListLevel, styles: &Styles) -> (Option<Bullet>, Option<Emu>, Option<Emu>) {
+    let p = &lv.props;
+    let font = p
+        .get("style:font-name")
+        .map(|n| styles.font(n))
+        .or_else(|| {
+            p.get("fo:font-family")
+                .map(|f| f.trim_matches(['\'', '"']).to_string())
+        });
+    let color = p
+        .color("fo:color")
+        .filter(|_| !p.is("style:use-window-font-color", "true"))
+        .map(Color::rgb);
+    let size = p
+        .get("fo:font-size")
+        .and_then(percent)
+        .map(|f| (f * 100_000.0).round().clamp(25_000.0, 400_000.0) as u32);
+    let b = match lv.kind {
+        "bullet" => Some(Bullet::Char {
+            ch: lv.bullet.filter(|c| !c.is_control()).unwrap_or('\u{2022}'),
+            font,
+            color,
+            size,
+        }),
+        "number" if !lv.num_format.is_empty() => Some(Bullet::AutoNum {
+            scheme: scheme(
+                &lv.num_format,
+                &lv.num_suffix,
+                p.is("style:num-prefix", "("),
+            ),
+            start: lv.start.max(1),
+            font,
+            color,
+            size,
+        }),
+        // A picture bullet whose picture is missing is a round one.
+        "image" => Some(Bullet::Char {
+            ch: '\u{2022}',
+            font: None,
+            color,
+            size,
+        }),
+        _ => Some(Bullet::None),
+    };
+    // Label width and position, or label alignment.
+    let (margin, indent) = if let Some(m) = p
+        .len("fo:margin-left")
+        .filter(|_| p.get("text:list-level-position-and-space-mode") == Some("label-alignment"))
+    {
+        (Some(m), p.len("fo:text-indent"))
+    } else {
+        let before = p.len("text:space-before").unwrap_or(0);
+        let width = p.len("text:min-label-width").unwrap_or(0);
+        if p.get("text:space-before").is_some() || p.get("text:min-label-width").is_some() {
+            (Some(before + width), Some(-width))
+        } else {
+            (None, None)
+        }
+    };
+    (b, margin, indent)
+}
+
+/// Collapses runs of white space ([ODF 1.2] 6.1.2).
+fn collapse(s: &str, at_start: bool) -> String {
+    let mut out = String::with_capacity(s.len());
+    let mut space = at_start;
+    for c in s.chars() {
+        if matches!(c, ' ' | '\t' | '\n' | '\r') {
+            if !space {
+                out.push(' ');
+                space = true;
+            }
+        } else {
+            out.push(c);
+            space = false;
+        }
+    }
+    out
+}
+
+struct Inline<'c, 'a> {
+    ctx: &'c mut TextCtx<'a>,
+    runs: Vec<Run>,
+    at_start: bool,
+    /// The next text starts a run of its own: a link's label, which is given
+    /// its link after it is read, is not merged into the run before it.
+    fresh: bool,
+}
+
+impl Inline<'_, '_> {
+    fn text(&mut self, s: String, props: &RunProps) {
+        if s.is_empty() {
+            return;
+        }
+        self.at_start = s.ends_with(' ');
+        let fresh = std::mem::take(&mut self.fresh);
+        if let Some(Run {
+            kind: RunKind::Text(t),
+            props: p,
+        }) = self.runs.last_mut()
+            && !fresh
+            && p == props
+        {
+            t.push_str(&s);
+            return;
+        }
+        self.runs.push(Run {
+            kind: RunKind::Text(s),
+            props: props.clone(),
+        });
+    }
+
+    fn walk(&mut self, n: &Node, props: &Props, size: f64, depth: u32) {
+        if depth > 32 {
+            return;
+        }
+        let rp = run_props(props, size, self.ctx.styles, self.ctx.auto_color);
+        for c in &n.children {
+            match c {
+                Child::Text(t) => {
+                    let s = collapse(t, self.at_start);
+                    self.text(s, &rp);
+                }
+                Child::Node(k) => match k.name.as_str() {
+                    "text:s" => {
+                        let n = k
+                            .attr("text:c")
+                            .and_then(|v| v.parse::<usize>().ok())
+                            .unwrap_or(1)
+                            .min(1000);
+                        self.text(" ".repeat(n), &rp);
+                        self.at_start = false;
+                    }
+                    "text:tab" => {
+                        self.text("\t".into(), &rp);
+                        self.at_start = false;
+                    }
+                    "text:line-break" => {
+                        self.runs.push(Run {
+                            kind: RunKind::Break,
+                            props: rp.clone(),
+                        });
+                        self.at_start = true;
+                    }
+                    "text:span" => {
+                        let mut p = props.clone();
+                        let sp = self.ctx.styles.chain("text", k.attr("text:style-name"));
+                        p.overlay(&sp.0);
+                        let size = font_size(&sp, size);
+                        self.walk(k, &p, size, depth + 1);
+                    }
+                    "text:a" => {
+                        let start = self.runs.len();
+                        self.fresh = true;
+                        self.walk(k, props, size, depth + 1);
+                        if let Some(link) = k.attr("xlink:href").and_then(Link::url) {
+                            for r in &mut self.runs[start..] {
+                                r.props.link = Some(link.clone());
+                            }
+                        }
+                    }
+                    "text:page-number" => {
+                        let n = self.ctx.slide_number.to_string();
+                        self.runs.push(Run {
+                            kind: RunKind::Field("slidenum", n),
+                            props: rp.clone(),
+                        });
+                        self.at_start = false;
+                    }
+                    "text:date" | "text:time" | "presentation:date-time" => {
+                        let t = if k.name == "presentation:date-time" {
+                            self.ctx.date.to_string()
+                        } else {
+                            super::styles::text_of(k)
+                        };
+                        self.text(t, &rp);
+                    }
+                    "presentation:footer" => {
+                        let t = self.ctx.footer.to_string();
+                        self.text(t, &rp);
+                    }
+                    "presentation:header" => {
+                        let t = self.ctx.header.to_string();
+                        self.text(t, &rp);
+                    }
+                    "text:note" | "office:annotation" | "text:soft-page-break" | "draw:frame" => {}
+                    _ => self.walk(k, props, size, depth + 1),
+                },
+            }
+        }
+    }
+}
+
+/// The text of a shape node (a text box, or a shape holding text:p and
+/// text:list directly) as paragraphs.
+pub fn paragraphs(n: &Node, ctx: &mut TextCtx) -> Vec<Paragraph> {
+    let mut out = vec![];
+    collect(n, ctx, 0, None, &mut out, 0);
+    out
+}
+
+fn collect(
+    n: &Node,
+    ctx: &mut TextCtx,
+    level: usize,
+    list: Option<&ListDef>,
+    out: &mut Vec<Paragraph>,
+    depth: u32,
+) {
+    for c in n.nodes() {
+        collect_one(c, ctx, level, list, out, depth);
+    }
+}
+
+fn collect_one(
+    c: &Node,
+    ctx: &mut TextCtx,
+    level: usize,
+    list: Option<&ListDef>,
+    out: &mut Vec<Paragraph>,
+    depth: u32,
+) {
+    if depth > 32 || out.len() > 1 << 16 {
+        return;
+    }
+    match c.name.as_str() {
+        "text:p" | "text:h" => out.push(paragraph(c, ctx, level, list)),
+        "text:list" => {
+            let own_list = c
+                .attr("text:style-name")
+                .and_then(|s| ctx.styles.list_names.get(s))
+                .and_then(|&i| ctx.styles.lists.get(i));
+            // A list's style holds for its nested lists too.
+            let l = own_list.or(list).or(ctx.list);
+            for item in c.nodes() {
+                if item.name == "text:list-header" {
+                    // The header's own paragraphs have no bullet; the lists
+                    // nested in it do.
+                    for k in item.nodes() {
+                        let before = out.len();
+                        collect_one(k, ctx, level + 1, l, out, depth + 1);
+                        if matches!(k.name.as_str(), "text:p" | "text:h") {
+                            for p in &mut out[before..] {
+                                p.props.bullet = Some(Bullet::None);
+                            }
+                        }
+                    }
+                } else if item.name == "text:list-item" {
+                    collect(item, ctx, level + 1, l, out, depth + 1);
+                }
+            }
+        }
+        "draw:text-box" => collect(c, ctx, level, list, out, depth + 1),
+        _ => {}
+    }
+}
+
+fn paragraph(p: &Node, ctx: &mut TextCtx, list_level: usize, list: Option<&ListDef>) -> Paragraph {
+    let lv = list_level.max(1);
+    // Shape style, outline level style, then the paragraph's own style.
+    let mut props = ctx.base.clone();
+    if list_level > 0
+        && let Some(l) = (ctx.levels)(lv)
+    {
+        props.overlay(&l.0);
+    }
+    let ps = ctx.styles.chain("paragraph", p.attr("text:style-name"));
+    props.overlay(&ps.0);
+    let mut size = font_size(ctx.base, 18.0);
+    if list_level > 0
+        && let Some(l) = (ctx.levels)(lv)
+    {
+        size = font_size(&l, size);
+    }
+    size = font_size(&ps, size);
+    let mut pp = para_props(&props);
+    pp.level = (lv - 1).min(8) as u8;
+    if list_level > 0 {
+        let level = list.and_then(|l| {
+            l.levels
+                .iter()
+                .find(|x| x.0 == lv)
+                .or_else(|| l.levels.iter().rev().find(|x| x.0 < lv))
+        });
+        match level {
+            Some((_, lvl)) => {
+                let (mut b, margin, indent) = bullet(lvl, ctx.styles);
+                if let (Some(img), "image") = (&lvl.image, lvl.kind) {
+                    let size = match &b {
+                        Some(Bullet::Char { size, .. }) => *size,
+                        _ => None,
+                    };
+                    ctx.pictures.push(img.clone());
+                    b = Some(Bullet::Picture {
+                        media: ctx.pictures.len() - 1,
+                        size,
+                    });
+                }
+                pp.bullet = b;
+                let base_margin = pp.margin.unwrap_or(0);
+                if let Some(m) = margin {
+                    pp.margin = Some(base_margin + m);
+                    pp.indent = indent;
+                }
+            }
+            None => pp.bullet = Some(Bullet::None),
+        }
+    } else {
+        pp.bullet = Some(Bullet::None);
+    }
+    let end = run_props(&props, size, ctx.styles, ctx.auto_color);
+    let mut il = Inline {
+        ctx,
+        runs: vec![],
+        at_start: true,
+        fresh: false,
+    };
+    il.walk(p, &props, size, 0);
+    let mut runs = il.runs;
+    // Trailing collapsed space at the paragraph's end is dropped.
+    if let Some(Run {
+        kind: RunKind::Text(t),
+        ..
+    }) = runs.last_mut()
+    {
+        let trimmed = t.trim_end_matches(' ').len();
+        if trimmed > 0 {
+            t.truncate(trimmed);
+        }
+    }
+    Paragraph {
+        props: pp,
+        runs,
+        end,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn white_space_collapses() {
+        assert_eq!(collapse("  a \n  b ", true), "a b ");
+        assert_eq!(collapse(" a", false), " a");
+    }
+
+    #[test]
+    fn number_schemes() {
+        assert_eq!(scheme("1", ".", false), "arabicPeriod");
+        assert_eq!(scheme("a", ")", true), "alphaLcParenBoth");
+        assert_eq!(scheme("I", ".", false), "romanUcPeriod");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/package.rs b/crates/exav-render/src/formats/office/slides/package.rs
new file mode 100644
index 00000000..85340574
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/package.rs
@@ -0,0 +1,102 @@
+//! ZIP packages (ODP, Keynote) read within the limits.
+
+use crate::formats::office::common::package::open_zip;
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::Budget;
+use std::io::{Read, Seek};
+
+/// What a package is read from: its bytes, or a reader that fetches the
+/// parts asked for.
+pub trait Source: Read + Seek {}
+impl<T: Read + Seek> Source for T {}
+
+pub struct Zip<'a> {
+    z: zip::ZipArchive<Box<dyn Source + 'a>>,
+}
+
+impl<'a> Zip<'a> {
+    pub fn open(bytes: &'a [u8]) -> Result<Zip<'a>> {
+        Zip::from_source(Box::new(std::io::Cursor::new(bytes)))
+    }
+
+    pub fn from_source(source: Box<dyn Source + 'a>) -> Result<Zip<'a>> {
+        let z =
+            open_zip(source).map_err(|e| Error::NotFormat(format!("not a ZIP package: {e}")))?;
+        Ok(Zip { z })
+    }
+
+    pub fn names(&self) -> Vec<String> {
+        self.z
+            .file_names()
+            .take(1 << 16)
+            .filter_map(|s| s.ok().map(|s| s.to_string()))
+            .collect()
+    }
+
+    /// A member, `None` when absent or unreadable; past `max` bytes, an
+    /// error. Its bytes are charged to the budget.
+    pub fn get(&mut self, name: &str, max: u64, budget: &mut Budget) -> Result<Option<Vec<u8>>> {
+        let v = self.read(name, max)?;
+        if let Some(v) = &v {
+            budget.alloc(v.len() as u64)?;
+        }
+        Ok(v)
+    }
+
+    /// As `get`, the caller charging the bytes.
+    pub fn read(&mut self, name: &str, max: u64) -> Result<Option<Vec<u8>>> {
+        let Ok(f) = self.z.by_name(name) else {
+            return Ok(None);
+        };
+        if f.encrypted() {
+            return Err(Error::Encrypted);
+        }
+        let mut v = Vec::new();
+        if f.take(max + 1).read_to_end(&mut v).is_err() {
+            return Ok(None);
+        }
+        if v.len() as u64 > max {
+            return Err(Error::TooLarge("a package part"));
+        }
+        Ok(Some(v))
+    }
+}
+
+/// Text in Windows 1252.
+pub fn latin1(b: &[u8]) -> String {
+    crate::formats::office::common::codepage::decode(b, 1252)
+}
+
+/// A picture's format, by its first bytes.
+pub fn image_ext(d: &[u8]) -> Option<&'static str> {
+    Some(match d {
+        [0x89, b'P', b'N', b'G', ..] => "png",
+        [0xFF, 0xD8, ..] => "jpeg",
+        [b'G', b'I', b'F', ..] => "gif",
+        [b'B', b'M', ..] => "bmp",
+        [b'I', b'I', 42, 0, ..] | [b'M', b'M', 0, 42, ..] => "tiff",
+        [1, 0, 0, 0, _, _, _, _, ..] if d.len() > 44 && &d[40..44] == b" EMF" => "emf",
+        [0xD7, 0xCD, 0xC6, 0x9A, ..] | [1, 0, 9, 0, ..] | [2, 0, 9, 0, ..] => "wmf",
+        _ => {
+            let head = String::from_utf8_lossy(&d[..d.len().min(512)]);
+            if head.contains("<svg") {
+                "svg"
+            } else {
+                return None;
+            }
+        }
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::image_ext;
+
+    #[test]
+    fn picture_formats_by_their_bytes() {
+        assert_eq!(image_ext(b"\x89PNG\r\n"), Some("png"));
+        assert_eq!(image_ext(&[0xFF, 0xD8, 0xFF]), Some("jpeg"));
+        assert_eq!(image_ext(b"<?xml version='1.0'?><svg>"), Some("svg"));
+        assert_eq!(image_ext(b"VCLMTF"), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/escher.rs b/crates/exav-render/src/formats/office/slides/ppt/escher.rs
new file mode 100644
index 00000000..1b7b6a35
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/escher.rs
@@ -0,0 +1,510 @@
+//! OfficeArt drawings ([MS-ODRAW]) as PPT stores them: a slide's
+//! OfficeArtDgContainer holds a tree of shapes, each with its type, flags,
+//! property table, anchor and the client records PowerPoint adds (text,
+//! placeholder, links). The picture store (BStore) is read here too.
+
+use super::records::{Rec, read_at};
+use crate::formats::office::common::bytes::Cur;
+use std::io::Read;
+
+pub const DG_CONTAINER: u16 = 0xF002;
+pub const SPGR_CONTAINER: u16 = 0xF003;
+pub const SP_CONTAINER: u16 = 0xF004;
+const FSPGR: u16 = 0xF009;
+const FSP: u16 = 0xF00A;
+const FOPT: u16 = 0xF00B;
+const SECONDARY_FOPT: u16 = 0xF121;
+const TERTIARY_FOPT: u16 = 0xF122;
+pub const CLIENT_TEXTBOX: u16 = 0xF00D;
+const CHILD_ANCHOR: u16 = 0xF00F;
+const CLIENT_ANCHOR: u16 = 0xF010;
+const CLIENT_DATA: u16 = 0xF011;
+
+pub const F_GROUP: u32 = 0x1;
+pub const F_DELETED: u32 = 0x8;
+pub const F_OLE: u32 = 0x10;
+pub const F_HAVE_MASTER: u32 = 0x20;
+pub const F_FLIP_H: u32 = 0x40;
+pub const F_FLIP_V: u32 = 0x80;
+pub const F_CONNECTOR: u32 = 0x100;
+pub const F_BACKGROUND: u32 = 0x400;
+
+/// One entry of a property table: id (without its flags), value, and for
+/// a complex property its data.
+#[derive(Clone, Debug)]
+pub struct Prop<'a> {
+    pub id: u16,
+    pub value: u32,
+    pub complex: Option<&'a [u8]>,
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct Props<'a>(pub Vec<Prop<'a>>);
+
+impl<'a> Props<'a> {
+    pub fn get(&self, id: u16) -> Option<u32> {
+        self.0.iter().rev().find(|p| p.id == id).map(|p| p.value)
+    }
+
+    pub fn int(&self, id: u16) -> Option<i32> {
+        self.get(id).map(|v| v as i32)
+    }
+
+    pub fn complex(&self, id: u16) -> Option<&'a [u8]> {
+        self.0
+            .iter()
+            .rev()
+            .find(|p| p.id == id)
+            .and_then(|p| p.complex)
+    }
+
+    /// A boolean of a set (its property id `set`): bit `bit` (0 for the
+    /// last of the set's 16 values) when its "use" bit (bit + 16) is set.
+    pub fn flag(&self, set: u16, bit: u32) -> Option<bool> {
+        let v = self.get(set)?;
+        (v & (1 << (bit + 16)) != 0).then_some(v & (1 << bit) != 0)
+    }
+
+    /// `o`'s properties over these.
+    pub fn overlay(&mut self, o: &Props<'a>) {
+        for p in &o.0 {
+            if let Some(q) = self.0.iter_mut().find(|q| q.id == p.id) {
+                // Boolean sets merge bit by bit: each "use" bit of `o` wins.
+                if p.id & 0x3F == 0x3F && p.complex.is_none() {
+                    let used = p.value >> 16;
+                    q.value = (q.value & !(used | used << 16)) | (p.value & (used | used << 16));
+                } else {
+                    *q = p.clone();
+                }
+            } else {
+                self.0.push(p.clone());
+            }
+        }
+    }
+}
+
+/// Reads a property table: `n` entries, then the complex data in order.
+pub fn read_props(d: &[u8], n: u16) -> Props<'_> {
+    let mut c = Cur::new(d);
+    let mut entries = vec![];
+    for _ in 0..n.min(1024) {
+        let opid = c.u16();
+        let value = c.u32();
+        if c.short {
+            break;
+        }
+        entries.push((opid, value));
+    }
+    let mut p = c.p;
+    let mut out = Vec::with_capacity(entries.len());
+    for (opid, value) in entries {
+        let complex = opid & 0x8000 != 0;
+        let id = opid & 0x3FFF;
+        if complex {
+            let len = value as usize;
+            let end = p.saturating_add(len).min(d.len());
+            out.push(Prop {
+                id,
+                value,
+                complex: Some(&d[p.min(end)..end]),
+            });
+            p = end;
+        } else {
+            out.push(Prop {
+                id,
+                value,
+                complex: None,
+            });
+        }
+    }
+    Props(out)
+}
+
+/// The elements of an IMsoArray ([MS-ODRAW] 2.2.51): count, allocated
+/// count, element size, then the elements. Element size 0xFFF0 means
+/// 4-byte elements holding two 16-bit halves.
+pub fn array(d: &[u8]) -> Vec<&[u8]> {
+    let mut c = Cur::new(d);
+    let n = c.u16() as usize;
+    let _alloc = c.u16();
+    let mut size = c.u16() as usize;
+    if size == 0xFFF0 {
+        size = 4;
+    }
+    if size == 0 || c.short {
+        return vec![];
+    }
+    let body = &d[6.min(d.len())..];
+    body.chunks_exact(size).take(n.min(1 << 20)).collect()
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct OShape<'a> {
+    pub spt: u16,
+    pub spid: u32,
+    pub flags: u32,
+    pub props: Props<'a>,
+    /// Left, top, right, bottom in master units (ClientAnchor).
+    pub anchor: Option<[i32; 4]>,
+    /// Left, top, right, bottom in the group's coordinates.
+    pub child: Option<[i32; 4]>,
+    /// A group's own coordinate space.
+    pub group: Option<[i32; 4]>,
+    pub client_data: Option<Rec<'a>>,
+    pub textbox: Option<Rec<'a>>,
+    pub children: Vec<OShape<'a>>,
+}
+
+impl<'a> OShape<'a> {
+    pub fn is_group(&self) -> bool {
+        self.flags & F_GROUP != 0
+    }
+}
+
+fn sp_container<'a>(r: &Rec<'a>) -> OShape<'a> {
+    let mut s = OShape::default();
+    for k in r.children() {
+        let mut c = k.cur();
+        match k.typ {
+            FSP => {
+                s.spt = k.inst;
+                s.spid = c.u32();
+                s.flags = c.u32();
+            }
+            FSPGR => s.group = Some([c.i32(), c.i32(), c.i32(), c.i32()]),
+            CHILD_ANCHOR => s.child = Some([c.i32(), c.i32(), c.i32(), c.i32()]),
+            CLIENT_ANCHOR => {
+                s.anchor = if k.data.len() >= 16 {
+                    // RectStruct: top, left, right, bottom.
+                    let (t, l, r, b) = (c.i32(), c.i32(), c.i32(), c.i32());
+                    Some([l, t, r, b])
+                } else if k.data.len() >= 8 {
+                    let (t, l, r, b) = (c.i16(), c.i16(), c.i16(), c.i16());
+                    Some([l.into(), t.into(), r.into(), b.into()])
+                } else {
+                    None
+                };
+            }
+            FOPT | SECONDARY_FOPT | TERTIARY_FOPT => {
+                let p = read_props(k.data, k.inst);
+                s.props.overlay(&p);
+            }
+            CLIENT_DATA => s.client_data = Some(k),
+            CLIENT_TEXTBOX => s.textbox = Some(k),
+            _ => {}
+        }
+    }
+    s
+}
+
+fn group<'a>(r: &Rec<'a>, depth: u32) -> OShape<'a> {
+    let mut kids = r.children();
+    let mut g = match kids.next() {
+        Some(k) if k.typ == SP_CONTAINER => sp_container(&k),
+        _ => OShape {
+            flags: F_GROUP,
+            ..OShape::default()
+        },
+    };
+    g.flags |= F_GROUP;
+    for k in kids {
+        match k.typ {
+            SP_CONTAINER => g.children.push(sp_container(&k)),
+            SPGR_CONTAINER if depth < 32 => g.children.push(group(&k, depth + 1)),
+            _ => {}
+        }
+        if g.children.len() >= 1 << 16 {
+            break;
+        }
+    }
+    g
+}
+
+/// A drawing's shapes (the top group's members) and background shape.
+pub struct Drawing<'a> {
+    pub shapes: Vec<OShape<'a>>,
+    pub background: Option<OShape<'a>>,
+}
+
+/// Reads an OfficeArtDgContainer's body.
+pub fn drawing<'a>(dg: &Rec<'a>) -> Drawing<'a> {
+    let mut out = Drawing {
+        shapes: vec![],
+        background: None,
+    };
+    for k in dg.children() {
+        match k.typ {
+            SPGR_CONTAINER => {
+                let g = group(&k, 0);
+                out.shapes.extend(g.children);
+            }
+            SP_CONTAINER => {
+                let s = sp_container(&k);
+                if s.flags & F_BACKGROUND != 0 {
+                    out.background = Some(s);
+                }
+            }
+            _ => {}
+        }
+    }
+    out
+}
+
+pub struct Blip {
+    pub ext: &'static str,
+    pub data: Vec<u8>,
+}
+
+/// Metafiles past this size inflated are dropped.
+const MAX_METAFILE: u64 = 64 << 20;
+
+/// The picture records of the store (OfficeArtDggContainer's BStore), in
+/// order: a shape's `pib` is 1-based in it. A BSE whose picture is in the
+/// Pictures stream (delay) is read from there at the BSE's offset. Each
+/// decodes with [`blip`].
+pub fn blip_records<'a>(dgg: &Rec<'a>, pictures: &'a [u8]) -> Vec<Option<Rec<'a>>> {
+    let mut out = vec![];
+    let Some(store) = dgg.child(0xF001) else {
+        return out;
+    };
+    for bse in store.children() {
+        if out.len() >= 1 << 16 {
+            break;
+        }
+        if bse.typ != 0xF007 {
+            out.push(None);
+            continue;
+        }
+        let d = bse.data;
+        let size = Cur::at(d, 20).u32() as usize;
+        let delay = Cur::at(d, 28).u32() as usize;
+        let name_len = d.get(33).copied().unwrap_or(0) as usize;
+        let inline = d.get(36 + name_len..).filter(|r| r.len() >= 8);
+        let rec = match inline {
+            Some(rest) => read_at(rest, 0),
+            None if size > 0 => read_at(pictures, delay),
+            None => None,
+        };
+        out.push(rec);
+    }
+    out
+}
+
+/// A picture record's image: its bytes, with metafiles inflated.
+pub fn blip(r: &Rec) -> Option<Blip> {
+    // An instance with its low bit set has a second 16-byte id.
+    let two = |base: u16| if r.inst == base + 1 { 32 } else { 16 };
+    let (ext, skip, meta) = match r.typ {
+        0xF01A => ("emf", two(0x3D4), true),
+        0xF01B => ("wmf", two(0x216), true),
+        0xF01C => ("pict", two(0x542), true),
+        0xF01D | 0xF02A => (
+            "jpeg",
+            if r.inst == 0x46B || r.inst == 0x6E3 {
+                33
+            } else {
+                17
+            },
+            false,
+        ),
+        0xF01E => ("png", two(0x6E0) + 1, false),
+        0xF01F => ("bmp", two(0x7A8) + 1, false),
+        0xF029 => ("tiff", two(0x6E4) + 1, false),
+        _ => return None,
+    };
+    let d = r.data;
+    if !meta {
+        let data = d.get(skip..)?.to_vec();
+        if ext == "bmp" {
+            return Some(Blip {
+                ext,
+                data: dib_to_bmp(&data),
+            });
+        }
+        return Some(Blip { ext, data });
+    }
+    let hdr = d.get(skip..skip + 34)?;
+    let body = d.get(skip + 34..)?;
+    let data = if hdr[32] == 0 {
+        let mut out = Vec::new();
+        flate2::read::ZlibDecoder::new(body)
+            .take(MAX_METAFILE + 1)
+            .read_to_end(&mut out)
+            .ok()?;
+        if out.len() as u64 > MAX_METAFILE {
+            return None;
+        }
+        out
+    } else {
+        body.to_vec()
+    };
+    let data = if ext == "wmf" && !data.starts_with(&[0xD7, 0xCD, 0xC6, 0x9A]) {
+        placeable_wmf(&data, hdr)
+    } else {
+        data
+    };
+    Some(Blip { ext, data })
+}
+
+/// A WMF without its placeable header gets one, from the blip's bounds.
+fn placeable_wmf(data: &[u8], hdr: &[u8]) -> Vec<u8> {
+    let mut c = Cur::at(hdr, 4);
+    let mut h = vec![0xD7, 0xCD, 0xC6, 0x9A, 0, 0];
+    for _ in 0..4 {
+        h.extend_from_slice(&(c.i32() as i16).to_le_bytes());
+    }
+    h.extend_from_slice(&1440u16.to_le_bytes());
+    h.extend_from_slice(&[0, 0, 0, 0]);
+    let mut sum = 0u16;
+    for k in 0..10 {
+        sum ^= u16::from_le_bytes([h[2 * k], h[2 * k + 1]]);
+    }
+    h.extend_from_slice(&sum.to_le_bytes());
+    h.extend_from_slice(data);
+    h
+}
+
+/// A device-independent bitmap with the file header it lacks.
+fn dib_to_bmp(dib: &[u8]) -> Vec<u8> {
+    let hsize = Cur::at(dib, 0).u32() as usize;
+    let bits = Cur::at(dib, 14).u16() as u32;
+    let used = Cur::at(dib, 32).u32();
+    let colors = if bits <= 8 && bits > 0 {
+        if used > 0 { used.min(256) } else { 1 << bits }
+    } else {
+        used.min(256)
+    };
+    let off = 14 + hsize.min(1 << 16) + colors as usize * 4;
+    let mut out = Vec::with_capacity(dib.len() + 14);
+    out.extend_from_slice(b"BM");
+    out.extend_from_slice(&((dib.len() + 14) as u32).to_le_bytes());
+    out.extend_from_slice(&[0, 0, 0, 0]);
+    out.extend_from_slice(&(off as u32).to_le_bytes());
+    out.extend_from_slice(dib);
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::ppt::records::build::*;
+
+    fn fopte(id: u16, v: u32) -> Vec<u8> {
+        let mut b = id.to_le_bytes().to_vec();
+        b.extend_from_slice(&v.to_le_bytes());
+        b
+    }
+
+    /// An EMF picture record whose metafile of `n` bytes is deflated.
+    fn compressed_emf(n: usize) -> Vec<u8> {
+        use std::io::Write;
+        let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::fast());
+        let chunk = vec![0u8; 1 << 20];
+        let mut left = n;
+        while left > 0 {
+            let k = left.min(chunk.len());
+            z.write_all(&chunk[..k]).unwrap();
+            left -= k;
+        }
+        // 16 bytes of identifier, then the 34-byte header: sizes, bounds,
+        // compression (0 is deflate) and filter at its end.
+        let mut body = vec![0u8; 16 + 34];
+        body[16 + 32] = 0;
+        body[16 + 33] = 0xFE;
+        body.extend(z.finish().unwrap());
+        rec(0, 0x3D4, 0xF01A, &body)
+    }
+
+    #[test]
+    fn deflated_metafiles_past_the_bound_are_dropped() {
+        let r = compressed_emf(1000);
+        let b =
+            blip(&crate::formats::office::slides::ppt::records::read_at(&r, 0).unwrap()).unwrap();
+        assert_eq!((b.ext, b.data.len()), ("emf", 1000));
+        let r = compressed_emf(MAX_METAFILE as usize);
+        let b =
+            blip(&crate::formats::office::slides::ppt::records::read_at(&r, 0).unwrap()).unwrap();
+        assert_eq!(b.data.len() as u64, MAX_METAFILE);
+        let r = compressed_emf(MAX_METAFILE as usize + 1);
+        assert!(
+            blip(&crate::formats::office::slides::ppt::records::read_at(&r, 0).unwrap()).is_none()
+        );
+    }
+
+    #[test]
+    fn property_tables_with_complex_data() {
+        let mut body = fopte(0x0181, 0x00FF_0000);
+        body.extend(fopte(0x8145, 6 + 8));
+        body.extend(fopte(0x01BF, 0x0010_0010));
+        body.extend(fopte(0xC380, 4));
+        body.extend([2, 0, 2, 0, 4, 0, 1, 0, 2, 0, 3, 0, 4, 0]);
+        body.extend(b"N\0a\0");
+        let p = read_props(&body, 4);
+        assert_eq!(p.get(0x0181), Some(0x00FF_0000));
+        let pts = array(p.complex(0x0145).unwrap());
+        assert_eq!(pts, vec![&[1, 0, 2, 0][..], &[3, 0, 4, 0][..]]);
+        // The second complex value follows the first.
+        assert_eq!(p.complex(0x0380), Some(&b"N\0a\0"[..]));
+        assert_eq!(p.flag(0x01BF, 4), Some(true));
+        assert_eq!(p.flag(0x01BF, 3), None);
+    }
+
+    #[test]
+    fn boolean_sets_merge_by_bit() {
+        let mut a = Props(vec![Prop {
+            id: 0x01BF,
+            value: 0x0018_0010,
+            complex: None,
+        }]);
+        let b = Props(vec![Prop {
+            id: 0x01BF,
+            value: 0x0010_0000,
+            complex: None,
+        }]);
+        a.overlay(&b);
+        assert_eq!(a.flag(0x01BF, 4), Some(false));
+        assert_eq!(a.flag(0x01BF, 3), Some(false));
+    }
+
+    #[test]
+    fn groups_and_anchors() {
+        let fsp = |spt: u16, flags: u32| {
+            let mut b = 1024u32.to_le_bytes().to_vec();
+            b.extend_from_slice(&flags.to_le_bytes());
+            rec(2, spt, FSP, &b)
+        };
+        let anchor = rec(0, 0, CLIENT_ANCHOR, &[10, 0, 20, 0, 120, 0, 60, 0]);
+        let child = container(
+            SP_CONTAINER,
+            0,
+            &[fsp(1, 2), rec(0, 0, CHILD_ANCHOR, &[0; 16])],
+        );
+        let g = container(
+            SPGR_CONTAINER,
+            0,
+            &[
+                container(
+                    SP_CONTAINER,
+                    0,
+                    &[fsp(0, 1 | 4), rec(1, 0, FSPGR, &[0; 16])],
+                ),
+                container(
+                    SPGR_CONTAINER,
+                    0,
+                    &[
+                        container(SP_CONTAINER, 0, &[fsp(0, 1), anchor.clone()]),
+                        child,
+                    ],
+                ),
+                container(SP_CONTAINER, 0, &[fsp(3, 0), anchor]),
+            ],
+        );
+        let dg = container(DG_CONTAINER, 0, &[g]);
+        let d = drawing(&read_at(&dg, 0).unwrap());
+        assert_eq!(d.shapes.len(), 2);
+        assert!(d.shapes[0].is_group());
+        assert_eq!(d.shapes[0].children.len(), 1);
+        assert_eq!(d.shapes[1].spt, 3);
+        assert_eq!(d.shapes[1].anchor, Some([20, 10, 120, 60]));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/mod.rs b/crates/exav-render/src/formats/office/slides/ppt/mod.rs
new file mode 100644
index 00000000..ee7f2e73
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/mod.rs
@@ -0,0 +1,1375 @@
+//! PowerPoint 97 to 2003 presentations ([MS-PPT]): a compound file whose
+//! "PowerPoint Document" stream holds the persist objects (document,
+//! masters, slides, notes) located through the user edit chain, and whose
+//! "Pictures" stream holds the pictures. Each main master becomes a slide
+//! master, each title master a layout of its main master, and each slide a
+//! slide with its shapes and text resolved against them. PowerPoint 95 has
+//! records of its own (`ppt95`); PowerPoint 2 to 4 are only recognised
+//! (`old`).
+
+mod escher;
+mod old;
+mod ole;
+mod pp9;
+mod ppt95;
+mod presets;
+mod records;
+mod shapes;
+mod text;
+
+use crate::formats::office::common::bytes::{Cur, u32_at};
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::{Budget, SHAPE_BYTES, text_bytes};
+use crate::formats::office::slides::model::*;
+use escher::{OShape, Props};
+use exav_unpack::cfb::Compound;
+use records::{Children, Rec, read_at};
+use std::borrow::Cow;
+use std::collections::HashMap;
+use text::{Cf, Levels, Pf, RawText, TColor, TextCtx};
+
+/// Record types ([MS-PPT] 2.13.24).
+pub(crate) mod rt {
+    pub const DOCUMENT: u16 = 0x03E8;
+    pub const DOCUMENT_ATOM: u16 = 0x03E9;
+    pub const SLIDE: u16 = 0x03EE;
+    pub const SLIDE_ATOM: u16 = 0x03EF;
+    pub const ENVIRONMENT: u16 = 0x03F2;
+    pub const SLIDE_PERSIST_ATOM: u16 = 0x03F3;
+    pub const MAIN_MASTER: u16 = 0x03F8;
+    pub const SLIDE_SHOW_SLIDE_INFO: u16 = 0x03F9;
+    pub const EX_OBJ_LIST: u16 = 0x0409;
+    pub const DRAWING_GROUP: u16 = 0x040B;
+    pub const DRAWING: u16 = 0x040C;
+    pub const FONT_COLLECTION: u16 = 0x07D5;
+    pub const COLOR_SCHEME: u16 = 0x07F0;
+    pub const EX_OBJ_REF_ATOM: u16 = 0x0BC1;
+    pub const PLACEHOLDER_ATOM: u16 = 0x0BC3;
+    pub const EX_OLE_OBJ_ATOM: u16 = 0x0FC3;
+    pub const EX_EMBED: u16 = 0x0FCC;
+    pub const EX_OLE_OBJ_STG: u16 = 0x1011;
+    pub const OUTLINE_TEXT_REF: u16 = 0x0F9E;
+    pub const TEXT_HEADER: u16 = 0x0F9F;
+    pub const TEXT_CHARS: u16 = 0x0FA0;
+    pub const STYLE_TEXT_PROP: u16 = 0x0FA1;
+    pub const MASTER_TEXT_PROP: u16 = 0x0FA2;
+    pub const TEXT_MASTER_STYLE: u16 = 0x0FA3;
+    pub const TEXT_CF_EXCEPTION: u16 = 0x0FA4;
+    pub const TEXT_PF_EXCEPTION: u16 = 0x0FA5;
+    pub const TEXT_RULER: u16 = 0x0FA6;
+    pub const TEXT_BYTES: u16 = 0x0FA8;
+    pub const FONT_ENTITY: u16 = 0x0FB7;
+    pub const CSTRING: u16 = 0x0FBA;
+    pub const EX_HYPERLINK_ATOM: u16 = 0x0FD3;
+    pub const EX_HYPERLINK: u16 = 0x0FD7;
+    pub const SLIDE_NUMBER_MC: u16 = 0x0FD8;
+    pub const HEADERS_FOOTERS: u16 = 0x0FD9;
+    pub const HEADERS_FOOTERS_ATOM: u16 = 0x0FDA;
+    pub const TEXT_INTERACTIVE_INFO: u16 = 0x0FDF;
+    pub const SLIDE_LIST_WITH_TEXT: u16 = 0x0FF0;
+    pub const INTERACTIVE_INFO: u16 = 0x0FF2;
+    pub const INTERACTIVE_INFO_ATOM: u16 = 0x0FF3;
+    pub const USER_EDIT_ATOM: u16 = 0x0FF5;
+    pub const CURRENT_USER_ATOM: u16 = 0x0FF6;
+    pub const DATE_TIME_MC: u16 = 0x0FF7;
+    pub const GENERIC_DATE_MC: u16 = 0x0FF8;
+    pub const HEADER_MC: u16 = 0x0FF9;
+    pub const FOOTER_MC: u16 = 0x0FFA;
+    pub const RTF_DATE_TIME_MC: u16 = 0x1015;
+    pub const PERSIST_DIRECTORY_ATOM: u16 = 0x1772;
+    pub const CRYPT_SESSION: u16 = 0x2F14;
+}
+
+/// Placeholder types ([MS-PPT] 2.13.21).
+mod pt {
+    pub const MASTER_TITLE: u8 = 0x01;
+    pub const MASTER_BODY: u8 = 0x02;
+    pub const MASTER_CENTER_TITLE: u8 = 0x03;
+    pub const MASTER_SUBTITLE: u8 = 0x04;
+    pub const MASTER_DATE: u8 = 0x07;
+    pub const MASTER_SLIDE_NUMBER: u8 = 0x08;
+    pub const MASTER_FOOTER: u8 = 0x09;
+    pub const MASTER_HEADER: u8 = 0x0A;
+    pub const TITLE: u8 = 0x0D;
+    pub const BODY: u8 = 0x0E;
+    pub const CENTER_TITLE: u8 = 0x0F;
+    pub const SUBTITLE: u8 = 0x10;
+    pub const VERTICAL_TITLE: u8 = 0x11;
+    pub const VERTICAL_BODY: u8 = 0x12;
+}
+
+/// The persist object directory: identifier to stream offset.
+fn persist_directory(stream: &[u8], current_edit: Option<usize>) -> HashMap<u32, usize> {
+    let mut edits = vec![];
+    let mut seen = vec![];
+    let mut at = current_edit;
+    // The chain, newest first; bounded and cycle-free.
+    while let Some(off) = at {
+        if seen.contains(&off) || seen.len() > 4096 {
+            break;
+        }
+        seen.push(off);
+        let Some(r) = read_at(stream, off).filter(|r| r.typ == rt::USER_EDIT_ATOM) else {
+            break;
+        };
+        let mut c = r.cur();
+        c.skip(8);
+        let last = c.u32() as usize;
+        let dir = c.u32() as usize;
+        c.skip(4);
+        // persistIdSeed: no identifier is larger.
+        let seed = c.u32();
+        edits.push((dir, (!c.short).then_some(seed)));
+        at = (last != 0 && last < off).then_some(last);
+    }
+    if edits.is_empty() {
+        // No usable chain: every persist directory in the stream, in order.
+        for r in Children::new(stream) {
+            if r.typ == rt::PERSIST_DIRECTORY_ATOM {
+                edits.insert(0, (r.at, None));
+            }
+        }
+    }
+    let mut map = HashMap::new();
+    for &(dir, seed) in edits.iter().rev() {
+        let Some(r) = read_at(stream, dir).filter(|r| r.typ == rt::PERSIST_DIRECTORY_ATOM) else {
+            continue;
+        };
+        let words = r.data.len() / 4;
+        let word = |i: usize| u32_at(r.data, i * 4);
+        // An entry header whose identifiers are all within the seed.
+        let plausible = |h: u32, seed: u32| {
+            let n = h >> 20;
+            n > 0 && (h & 0xF_FFFF) + n - 1 <= seed
+        };
+        let mut p = 0;
+        while p < words {
+            let h = word(p);
+            let id = h & 0xF_FFFF;
+            let mut n = (h >> 20) as usize;
+            // Some writers store a count past 4095 in the entry's 12 bits,
+            // keeping the low ones: while what follows the entry cannot be
+            // another, it is taken to be 4096 offsets longer.
+            if let Some(seed) = seed {
+                while p + 1 + n < words
+                    && !plausible(word(p + 1 + n), seed)
+                    && p + 1 + n + 4096 <= words
+                {
+                    n += 4096;
+                }
+            }
+            for k in 0..n.min(words - p - 1) {
+                map.insert(id + k as u32, word(p + 1 + k) as usize);
+            }
+            p += 1 + n;
+            if map.len() > 1 << 20 {
+                break;
+            }
+        }
+    }
+    map
+}
+
+/// Headers and footers settings ([MS-PPT] 2.4.15).
+#[derive(Clone, Default)]
+struct HeadersFooters {
+    date: bool,
+    user_date: bool,
+    slide_number: bool,
+    footer: bool,
+    footer_text: String,
+    date_text: String,
+}
+
+fn headers_footers(r: &Rec) -> HeadersFooters {
+    let mut hf = HeadersFooters::default();
+    for k in r.children() {
+        match k.typ {
+            rt::HEADERS_FOOTERS_ATOM => {
+                let f = Cur::at(k.data, 2).u16();
+                hf.date = f & 1 != 0;
+                hf.user_date = f & 4 != 0;
+                hf.slide_number = f & 8 != 0;
+                hf.footer = f & 0x20 != 0;
+            }
+            rt::CSTRING if k.inst == 2 => hf.footer_text = utf16(k.data),
+            rt::CSTRING if k.inst == 0 => hf.date_text = utf16(k.data),
+            _ => {}
+        }
+    }
+    hf
+}
+
+fn utf16(d: &[u8]) -> String {
+    let u: Vec<u16> = d
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|b| u16::from_le_bytes(*b))
+        .take(1 << 16)
+        .collect();
+    let end = u.iter().position(|&c| c == 0).unwrap_or(u.len());
+    String::from_utf16_lossy(&u[..end])
+}
+
+fn scheme_of(r: &Rec) -> Option<[Rgb; 8]> {
+    let s = r
+        .children()
+        .find(|k| k.typ == rt::COLOR_SCHEME && k.inst == 1)?;
+    let mut c = s.cur();
+    let mut out = [0u32; 8];
+    for x in &mut out {
+        let (r, g, b, _) = (c.u8(), c.u8(), c.u8(), c.u8());
+        *x = u32::from(r) << 16 | u32::from(g) << 8 | u32::from(b);
+    }
+    (!c.short).then_some(out)
+}
+
+const DEFAULT_SCHEME: [Rgb; 8] = [
+    0xFFFFFF, 0x000000, 0x808080, 0x000000, 0x00CC99, 0x3333CC, 0xCCCCFF, 0xB2B2B2,
+];
+
+/// A main or title master as read.
+struct MasterSlide<'a> {
+    id: u32,
+    title: bool,
+    /// The main master a title master follows.
+    follows: u32,
+    flags: u16,
+    scheme: [Rgb; 8],
+    /// Text styles by text type (0 to 8), five levels each.
+    styles: Vec<Option<Levels>>,
+    shapes: Vec<OShape<'a>>,
+    background: Option<OShape<'a>>,
+    hf: Option<HeadersFooters>,
+}
+
+struct Reader<'a> {
+    stream: &'a [u8],
+    persist: HashMap<u32, usize>,
+    fonts: Vec<String>,
+    doc_pf: Pf,
+    doc_cf: Cf,
+    doc_style: Option<Levels>,
+    /// The blip store's pictures, decoded when a shape uses them.
+    blip_recs: Vec<Option<Rec<'a>>>,
+    /// Their media indexes, once decoded.
+    blips: Vec<Option<usize>>,
+    /// Bytes of pictures decoded and not yet charged to the budget.
+    pending: u64,
+    defaults: Props<'a>,
+    links: HashMap<u32, Link>,
+    /// The persist identifier of each embedded object's storage, by the
+    /// object's identifier.
+    objects: HashMap<u32, u32>,
+    slide_ids: Vec<u32>,
+    /// Masters' shapes by identifier, for shapes that name one as theirs
+    /// (hspMaster).
+    master_props: HashMap<u32, Props<'a>>,
+    /// The media index of each picture bullet, by its index.
+    bullet_media: Vec<Option<usize>>,
+    /// The document's PP9 master styles: text type, level, extension.
+    doc9: Vec<(u16, usize, pp9::Pf9)>,
+    p: Presentation,
+}
+
+pub(crate) fn read(input: &[u8], budget: &mut Budget) -> Result<Presentation> {
+    if let Some(old) = old::open(input) {
+        return old::read(&old);
+    }
+    let cf = Compound::open(input)
+        .ok_or_else(|| Error::NotFormat("not an OLE2 compound file".into()))?;
+    if let Some(old) = cf.stream(&["PP40"]).and_then(|s| old::parse(&s)) {
+        return old::read(&old);
+    }
+    let max = budget.limits.max_part as usize;
+    // Borrowed from the input when its sectors follow each other, as they
+    // usually do; only a copy is charged.
+    let stream = cf.stream_ref(&["PowerPoint Document"]).ok_or_else(|| {
+        if cf.stream(&["PP97_DUALSTORAGE"]).is_some() || cf.names().any(|n| n.starts_with("PP")) {
+            Error::Unsupported("PowerPoint 95 or earlier".into())
+        } else {
+            Error::NotFormat("no PowerPoint Document stream".into())
+        }
+    })?;
+    let pictures = cf.stream_ref(&["Pictures"]).unwrap_or_default();
+    for s in [&stream, &pictures] {
+        if s.len() > max {
+            return Err(Error::TooLarge("a stream"));
+        }
+        if let Cow::Owned(v) = s {
+            budget.alloc(v.len() as u64)?;
+        }
+    }
+    if cf.stream(&["EncryptedSummary"]).is_some() {
+        return Err(Error::Encrypted);
+    }
+    // PowerPoint 95 has its own records.
+    if ppt95::is95(&stream) {
+        return ppt95::read(&stream, budget);
+    }
+
+    let mut current_edit = None;
+    let current_user = cf.stream(&["Current User"]);
+    if let Some(cu) = current_user
+        && let Some(r) = read_at(&cu, 0).filter(|r| r.typ == rt::CURRENT_USER_ATOM)
+    {
+        let mut c = r.cur();
+        c.skip(4);
+        let token = c.u32();
+        if token == 0xF3D1_C4DF {
+            return Err(Error::Encrypted);
+        }
+        current_edit = Some(c.u32() as usize);
+        c.skip(2);
+        let version = c.u16();
+        if version != 0x03F4 && version != 0 {
+            return Err(Error::Unsupported(format!(
+                "PowerPoint file version {version:#x}"
+            )));
+        }
+    }
+    let persist = persist_directory(&stream, current_edit);
+    // The newest user edit's document, or the first document found.
+    let doc_offset = current_edit
+        .and_then(|off| read_at(&stream, off))
+        .filter(|r| r.typ == rt::USER_EDIT_ATOM)
+        .and_then(|r| {
+            let c = Cur::at(r.data, 16);
+            let id = c.clone().u32();
+            if r.data.len() >= 32 && Cur::at(r.data, 28).u32() != 0 {
+                return Some(Err(Error::Encrypted));
+            }
+            persist.get(&id).copied().map(Ok)
+        })
+        .transpose()?
+        .or_else(|| persist.get(&1).copied())
+        .filter(|&o| read_at(&stream, o).is_some_and(|r| r.typ == rt::DOCUMENT))
+        .or_else(|| {
+            Children::new(&stream)
+                .filter(|r| r.typ == rt::DOCUMENT)
+                .map(|r| r.at)
+                .last()
+        })
+        .ok_or_else(|| Error::Malformed("no document record".into()))?;
+    let doc = read_at(&stream, doc_offset)
+        .ok_or_else(|| Error::Malformed("no document record".into()))?;
+    if doc.children().any(|r| r.typ == rt::CRYPT_SESSION) {
+        return Err(Error::Encrypted);
+    }
+
+    let mut r = Reader {
+        stream: &stream,
+        persist,
+        fonts: vec![],
+        doc_pf: Pf::default(),
+        doc_cf: Cf::default(),
+        doc_style: None,
+        blip_recs: vec![],
+        blips: vec![],
+        pending: 0,
+        defaults: Props::default(),
+        links: HashMap::new(),
+        objects: HashMap::new(),
+        slide_ids: vec![],
+        master_props: HashMap::new(),
+        bullet_media: vec![],
+        doc9: vec![],
+        p: Presentation::default(),
+    };
+    r.document(&doc, &pictures, budget)?;
+    Ok(r.p)
+}
+
+impl<'a> Reader<'a> {
+    /// Decodes the pictures `props` names (the shape's and its fill's), once
+    /// each: those of slides not converted are never read.
+    fn want_blips(&mut self, props: &Props) {
+        for id in [0x0104, 0x0186] {
+            let Some(i) = props.get(id).and_then(|i| (i as usize).checked_sub(1)) else {
+                continue;
+            };
+            if i >= self.blip_recs.len() || self.blips[i].is_some() {
+                continue;
+            }
+            let decoded = self.blip_recs[i]
+                .take()
+                .and_then(|r| escher::blip(&r))
+                .filter(|b| !b.data.is_empty());
+            if let Some(b) = decoded {
+                self.pending += b.data.len() as u64;
+                self.blips[i] = Some(self.p.add_media(b.ext, b.data));
+            }
+        }
+    }
+
+    fn object(&self, id: u32) -> Option<Rec<'a>> {
+        let off = *self.persist.get(&id)?;
+        read_at(self.stream, off)
+    }
+
+    fn document(&mut self, doc: &Rec<'a>, pictures: &'a [u8], budget: &mut Budget) -> Result<()> {
+        // Slide size, in master units.
+        let mut size = (5760, 4320);
+        let mut omit_title_footers = false;
+        if let Some(a) = doc.child(rt::DOCUMENT_ATOM) {
+            let mut c = a.cur();
+            size = (c.i32(), c.i32());
+            omit_title_footers = a.data.get(37).is_some_and(|&b| b != 0);
+        }
+        let to_emu = |v: i32| (f64::from(v.clamp(576, 1_000_000)) * 1587.5).round() as Emu;
+        self.p.width = to_emu(size.0);
+        self.p.height = to_emu(size.1);
+
+        if let Some(env) = doc.child(rt::ENVIRONMENT) {
+            for k in env.children() {
+                match k.typ {
+                    rt::FONT_COLLECTION => {
+                        for f in k.children().filter(|f| f.typ == rt::FONT_ENTITY) {
+                            let name = utf16(f.data.get(..64).unwrap_or(f.data));
+                            let i = usize::from(f.inst);
+                            if i < 4096 {
+                                if self.fonts.len() <= i {
+                                    self.fonts.resize(i + 1, String::new());
+                                }
+                                self.fonts[i] = name;
+                            }
+                        }
+                    }
+                    rt::TEXT_CF_EXCEPTION => self.doc_cf = text::read_cf(&mut k.cur()),
+                    rt::TEXT_PF_EXCEPTION => {
+                        let mut c = k.cur();
+                        c.skip(2);
+                        self.doc_pf = text::read_pf(&mut c);
+                    }
+                    rt::TEXT_MASTER_STYLE => self.doc_style = Some(text::read_master_style(&k)),
+                    _ => {}
+                }
+            }
+        }
+        // The PowerPoint 2000 text extension: master styles with numbering
+        // and picture bullets, and the pictures.
+        if let Some(tags) = doc.child(pp9::PROG_TAGS) {
+            for k in pp9::tag_records(&tags) {
+                match k.typ {
+                    pp9::TEXT_MASTER_STYLE9 => {
+                        for (level, pf) in pp9::master_style9(&k) {
+                            self.doc9.push((k.inst, level, pf));
+                        }
+                    }
+                    pp9::BLIP_COLLECTION9 => {
+                        for (i, rec) in pp9::bullet_pictures(&k) {
+                            let i = usize::from(i);
+                            if i >= 256 {
+                                continue;
+                            }
+                            if self.bullet_media.len() <= i {
+                                self.bullet_media.resize(i + 1, None);
+                            }
+                            if let Some(b) = escher::blip(&rec).filter(|b| !b.data.is_empty()) {
+                                self.pending += b.data.len() as u64;
+                                self.bullet_media[i] = Some(self.p.add_media(b.ext, b.data));
+                            }
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+        if let Some(dg) = doc.child(rt::DRAWING_GROUP)
+            && let Some(dgg) = dg.child(0xF000)
+        {
+            self.blip_recs = escher::blip_records(&dgg, pictures);
+            self.blips = vec![None; self.blip_recs.len()];
+            if let Some(opt) = dgg.child(0xF00B) {
+                self.defaults = escher::read_props(opt.data, opt.inst);
+            }
+        }
+        if let Some(list) = doc.child(rt::EX_OBJ_LIST) {
+            for h in list.children().filter(|h| h.typ == rt::EX_HYPERLINK) {
+                let id = h
+                    .child(rt::EX_HYPERLINK_ATOM)
+                    .map(|a| Cur::new(a.data).u32());
+                let target = h
+                    .children()
+                    .find(|s| s.typ == rt::CSTRING && s.inst == 1)
+                    .map(|s| utf16(s.data));
+                let location = h
+                    .children()
+                    .find(|s| s.typ == rt::CSTRING && s.inst == 3)
+                    .map(|s| utf16(s.data));
+                let link = match (target.as_deref().and_then(Link::url), location) {
+                    (Some(u), _) => Some(u),
+                    (None, Some(loc)) => loc
+                        .split(',')
+                        .nth(1)
+                        .and_then(|n| n.trim().parse::<usize>().ok())
+                        .filter(|&n| n > 0)
+                        .map(|n| Link::Slide(n - 1)),
+                    _ => None,
+                };
+                if let (Some(id), Some(link)) = (id, link) {
+                    self.links.insert(id, link);
+                }
+            }
+            // ExOleObjAtom: aspect, type, object id, subtype, persist id.
+            for e in list.children().filter(|e| e.typ == rt::EX_EMBED) {
+                if let Some(a) = e.child(rt::EX_OLE_OBJ_ATOM).filter(|a| a.data.len() >= 20) {
+                    let mut c = a.cur();
+                    c.skip(8);
+                    let id = c.u32();
+                    c.skip(4);
+                    self.objects.insert(id, c.u32());
+                }
+            }
+        }
+        let doc_hf = doc
+            .children()
+            .find(|k| k.typ == rt::HEADERS_FOOTERS && k.inst == 3)
+            .map(|k| headers_footers(&k))
+            .unwrap_or_default();
+
+        // Masters, main and title.
+        let mut masters: Vec<MasterSlide> = vec![];
+        let lists: Vec<Rec> = doc
+            .children()
+            .filter(|k| k.typ == rt::SLIDE_LIST_WITH_TEXT)
+            .collect();
+        for list in lists.iter().filter(|l| l.inst == 1) {
+            for a in list.children().filter(|a| a.typ == rt::SLIDE_PERSIST_ATOM) {
+                let mut c = a.cur();
+                let pid = c.u32();
+                c.skip(8);
+                let id = c.u32();
+                if let Some(m) = self.object(pid)
+                    && let Some(ms) = self.master(&m, id, budget)?
+                {
+                    masters.push(ms);
+                }
+                if masters.len() > 1024 {
+                    break;
+                }
+            }
+        }
+        fn index<'a>(shapes: &[OShape<'a>], out: &mut HashMap<u32, Props<'a>>, depth: u32) {
+            for s in shapes {
+                out.entry(s.spid).or_insert_with(|| s.props.clone());
+                if depth < 32 {
+                    index(&s.children, out, depth + 1);
+                }
+            }
+        }
+        for m in &masters {
+            index(&m.shapes, &mut self.master_props, 0);
+        }
+        // Title masters' styles are their main master's.
+        for i in 0..masters.len() {
+            if masters[i].title
+                && let Some(main) = masters
+                    .iter()
+                    .find(|m| !m.title && m.id == masters[i].follows)
+            {
+                let styles = main.styles.clone();
+                masters[i].styles = styles;
+            }
+        }
+        let mut model_of: HashMap<u32, (usize, usize)> = HashMap::new();
+        for m in masters.iter().filter(|m| !m.title) {
+            let mi = self.p.masters.len();
+            let master = self.model_master(m, budget)?;
+            self.p.masters.push(master);
+            model_of.insert(m.id, (mi, 0));
+        }
+        for m in masters.iter().filter(|m| m.title) {
+            let Some(&(mi, _)) = model_of
+                .get(&m.follows)
+                .or_else(|| model_of.values().next())
+            else {
+                continue;
+            };
+            let layout = self.title_layout(m, budget)?;
+            let li = self.p.masters[mi].layouts.len();
+            self.p.masters[mi].layouts.push(layout);
+            model_of.insert(m.id, (mi, li));
+        }
+        if self.p.masters.is_empty() {
+            self.p.masters.push(Master {
+                layouts: vec![blank_layout()],
+                ..Master::default()
+            });
+        }
+
+        // Slides, with their outline text.
+        let mut slides: Vec<(Rec<'a>, Vec<RawText>, u32)> = vec![];
+        for list in lists.iter().filter(|l| l.inst == 0) {
+            let kids: Vec<Rec> = list.children().collect();
+            let mut i = 0;
+            while i < kids.len() {
+                let a = kids[i];
+                i += 1;
+                if a.typ != rt::SLIDE_PERSIST_ATOM {
+                    continue;
+                }
+                let start = i;
+                while i < kids.len() && kids[i].typ != rt::SLIDE_PERSIST_ATOM {
+                    i += 1;
+                }
+                let bodies = text::read_bodies(kids[start..i].iter().copied());
+                let mut c = a.cur();
+                let pid = c.u32();
+                c.skip(8);
+                let slide_id = c.u32();
+                if let Some(s) = self.object(pid).filter(|s| s.typ == rt::SLIDE) {
+                    budget.slide(slides.len())?;
+                    slides.push((s, bodies, slide_id));
+                }
+            }
+        }
+        if slides.is_empty() {
+            // No usable slide list: the slides among the persist objects, in
+            // identifier order, title masters left out.
+            let master_offsets: Vec<usize> = lists
+                .iter()
+                .filter(|l| l.inst == 1)
+                .flat_map(|l| l.children().filter(|a| a.typ == rt::SLIDE_PERSIST_ATOM))
+                .filter_map(|a| self.persist.get(&Cur::new(a.data).u32()).copied())
+                .collect();
+            let mut ids: Vec<(u32, usize)> = self.persist.iter().map(|(&k, &v)| (k, v)).collect();
+            ids.sort_unstable();
+            for (_, off) in ids {
+                if master_offsets.contains(&off) {
+                    continue;
+                }
+                if let Some(s) = read_at(self.stream, off).filter(|s| s.typ == rt::SLIDE) {
+                    budget.slide(slides.len())?;
+                    slides.push((s, vec![], 0));
+                }
+            }
+        }
+        self.slide_ids = slides.iter().map(|s| s.2).collect();
+        self.p.total_slides = slides.len();
+        for (n, (s, outline, _)) in slides.iter().enumerate() {
+            budget.alloc(std::mem::take(&mut self.pending))?;
+            if !budget.wants(n) {
+                continue;
+            }
+            let slide = self.slide(
+                s,
+                outline,
+                n + 1,
+                &masters,
+                &model_of,
+                &doc_hf,
+                omit_title_footers,
+                budget,
+            )?;
+            self.p.slides.push(slide);
+        }
+        budget.alloc(std::mem::take(&mut self.pending))?;
+        Ok(())
+    }
+
+    fn master(
+        &mut self,
+        m: &Rec<'a>,
+        id: u32,
+        budget: &mut Budget,
+    ) -> Result<Option<MasterSlide<'a>>> {
+        let title = match m.typ {
+            rt::MAIN_MASTER => false,
+            rt::SLIDE => true,
+            _ => return Ok(None),
+        };
+        // SlideAtom: layout, placeholder types, master, notes, flags.
+        let (follows, flags) = match m.child(rt::SLIDE_ATOM) {
+            Some(a) => (Cur::at(a.data, 12).u32(), Cur::at(a.data, 20).u16()),
+            None => (0, 0),
+        };
+        let mut styles: Vec<Option<Levels>> = vec![None; 9];
+        for k in m.children().filter(|k| k.typ == rt::TEXT_MASTER_STYLE) {
+            if let Some(slot) = styles.get_mut(usize::from(k.inst)) {
+                *slot = Some(text::read_master_style(&k));
+            }
+        }
+        // Numbering and picture bullets of the PP9 extension, the master's
+        // own over the document's.
+        let own9: Vec<(u16, usize, pp9::Pf9)> = m
+            .child(pp9::PROG_TAGS)
+            .map(|t| {
+                pp9::tag_records(&t)
+                    .iter()
+                    .filter(|k| k.typ == pp9::TEXT_MASTER_STYLE9)
+                    .flat_map(|k| {
+                        pp9::master_style9(k)
+                            .into_iter()
+                            .map(|(l, pf)| (k.inst, l, pf))
+                            .collect::<Vec<_>>()
+                    })
+                    .collect()
+            })
+            .unwrap_or_default();
+        for &(text_type, level, pf) in self.doc9.iter().chain(own9.iter()) {
+            let slot = styles
+                .get_mut(usize::from(text_type))
+                .and_then(|s| s.get_or_insert_with(Levels::default).0.get_mut(level));
+            if let Some(slot) = slot {
+                slot.0.overlay9(&pf);
+            }
+        }
+        let (shapes, background) = match m
+            .child(rt::DRAWING)
+            .and_then(|d| d.child(escher::DG_CONTAINER))
+        {
+            Some(dg) => {
+                let d = escher::drawing(&dg);
+                (d.shapes, d.background)
+            }
+            None => (vec![], None),
+        };
+        budget.alloc(SHAPE_BYTES * shapes.len() as u64)?;
+        let hf = m
+            .children()
+            .find(|k| k.typ == rt::HEADERS_FOOTERS)
+            .map(|k| headers_footers(&k));
+        Ok(Some(MasterSlide {
+            id,
+            title,
+            follows,
+            flags,
+            scheme: scheme_of(m).unwrap_or(DEFAULT_SCHEME),
+            styles,
+            shapes,
+            background,
+            hf,
+        }))
+    }
+
+    /// The five levels of a text type, every property resolved.
+    fn levels(&self, styles: &[Option<Levels>], text_type: u32) -> [(Pf, Cf); 5] {
+        let mut pf = Pf {
+            has_bullet: Some(false),
+            align: Some(0),
+            line_spacing: Some(100),
+            space_before: Some(0),
+            space_after: Some(0),
+            margin: Some(0),
+            indent: Some(0),
+            ..Pf::default()
+        };
+        pf.overlay(&self.doc_pf);
+        let mut cf = Cf {
+            bold: Some(false),
+            italic: Some(false),
+            underline: Some(false),
+            font: Some(0),
+            size: Some(18),
+            color: Some(TColor::Scheme(1)),
+            ..Cf::default()
+        };
+        cf.overlay(&self.doc_cf);
+        let mut out: [(Pf, Cf); 5] = std::array::from_fn(|_| (pf.clone(), cf.clone()));
+        let apply = |out: &mut [(Pf, Cf); 5], l: &Levels| {
+            // Each level of a style inherits the one above it.
+            let mut prev: Option<(Pf, Cf)> = None;
+            for (i, (lp, lc)) in l.0.iter().enumerate() {
+                let (mut p, mut c) = prev.clone().unwrap_or_default();
+                p.overlay(lp);
+                c.overlay(lc);
+                out[i].0.overlay(&p);
+                out[i].1.overlay(&c);
+                prev = Some((p, c));
+            }
+        };
+        if let Some(d) = &self.doc_style {
+            apply(&mut out, d);
+        }
+        // The body's text type picks the master style, placeholder or not
+        // (a text box that took a placeholder's place keeps its type).
+        let chain: &[u32] = match text_type {
+            0 => &[0],
+            6 => &[0, 6],
+            1 => &[1],
+            5 | 7 | 8 => &[1, text_type],
+            2 => &[2],
+            _ => &[4],
+        };
+        for &t in chain {
+            if let Some(Some(l)) = styles.get(t as usize) {
+                apply(&mut out, l);
+            }
+        }
+        out
+    }
+
+    fn model_master(&mut self, m: &MasterSlide<'a>, budget: &mut Budget) -> Result<Master> {
+        let bg = m
+            .background
+            .as_ref()
+            .map(|b| self.background_fill(b, &m.scheme));
+        let mut shapes = vec![];
+        for s in &m.shapes {
+            if master_placeholder_of(s).is_some() {
+                continue;
+            }
+            if let Some(x) = self.shape(s, &SlideCtx::master(m), false, budget)? {
+                shapes.push(x);
+            }
+        }
+        let font = |i: Option<u16>| {
+            i.and_then(|i| self.fonts.get(usize::from(i)).cloned())
+                .filter(|f| !f.is_empty())
+        };
+        let title_font =
+            font(self.levels(&m.styles, 0)[0].1.font).unwrap_or_else(|| "Arial".into());
+        let body_font =
+            font(self.levels(&m.styles, 1)[0].1.font).unwrap_or_else(|| title_font.clone());
+        let s = &m.scheme;
+        Ok(Master {
+            name: "Master".into(),
+            theme: Theme {
+                name: "Office Theme".into(),
+                colors: [
+                    s[1], s[0], s[2], s[4], s[4], s[5], s[6], s[7], 0x5B9BD5, 0x70AD47, s[6], s[7],
+                ],
+                major_font: title_font,
+                minor_font: body_font,
+            },
+            background: bg,
+            shapes,
+            layouts: vec![Layout {
+                name: "Title and Content".into(),
+                kind: "obj",
+                show_master_shapes: true,
+                ..Layout::default()
+            }],
+            ..Master::default()
+        })
+    }
+
+    fn title_layout(&mut self, m: &MasterSlide<'a>, budget: &mut Budget) -> Result<Layout> {
+        let master_bg = m.flags & 4 != 0;
+        let bg = if master_bg {
+            None
+        } else {
+            m.background
+                .as_ref()
+                .map(|b| self.background_fill(b, &m.scheme))
+        };
+        let mut shapes = vec![];
+        for s in &m.shapes {
+            if master_placeholder_of(s).is_some() {
+                continue;
+            }
+            if let Some(x) = self.shape(s, &SlideCtx::master(m), false, budget)? {
+                shapes.push(x);
+            }
+        }
+        Ok(Layout {
+            name: "Title Slide".into(),
+            kind: "title",
+            background: bg,
+            shapes,
+            show_master_shapes: m.flags & 1 != 0,
+        })
+    }
+
+    /// A background shape's fill. The drawing's default properties are not
+    /// its own: a colour it leaves out is the scheme's background.
+    fn background_fill(&mut self, b: &OShape, scheme: &[Rgb; 8]) -> Fill {
+        let mut props = Props(vec![escher::Prop {
+            id: 0x0181,
+            value: 0x0800_0000,
+            complex: None,
+        }]);
+        props.overlay(&b.props);
+        self.want_blips(&props);
+        let refs = shapes::refs(&props, scheme);
+        let ctx = shapes::Ctx {
+            scheme,
+            blips: &self.blips,
+        };
+        match shapes::fill(&props, &ctx, &refs) {
+            Fill::None => Fill::Solid(Color::rgb(0xFFFFFF)),
+            f => f,
+        }
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn slide(
+        &mut self,
+        s: &Rec<'a>,
+        outline: &[RawText],
+        number: usize,
+        masters: &[MasterSlide<'a>],
+        model_of: &HashMap<u32, (usize, usize)>,
+        doc_hf: &HeadersFooters,
+        omit_title_footers: bool,
+        budget: &mut Budget,
+    ) -> Result<Slide> {
+        let atom = s.child(rt::SLIDE_ATOM);
+        let master_id = atom.map(|a| Cur::at(a.data, 12).u32()).unwrap_or(0);
+        let flags = atom.map(|a| Cur::at(a.data, 20).u16()).unwrap_or(7);
+        let master = masters
+            .iter()
+            .find(|m| m.id == master_id)
+            .or_else(|| masters.iter().find(|m| !m.title));
+        let main = master.and_then(|m| {
+            if m.title {
+                masters.iter().find(|x| !x.title && x.id == m.follows)
+            } else {
+                Some(m)
+            }
+        });
+        let (mi, li) = master
+            .and_then(|m| model_of.get(&m.id).copied())
+            .unwrap_or((0, 0));
+        let scheme = if flags & 2 != 0 {
+            master.map(|m| m.scheme).unwrap_or(DEFAULT_SCHEME)
+        } else {
+            scheme_of(s)
+                .or(master.map(|m| m.scheme))
+                .unwrap_or(DEFAULT_SCHEME)
+        };
+        let styles: Vec<Option<Levels>> = main
+            .map(|m| m.styles.clone())
+            .unwrap_or_else(|| vec![None; 9]);
+        let hidden = s
+            .child(rt::SLIDE_SHOW_SLIDE_INFO)
+            .is_some_and(|a| a.data.get(10).is_some_and(|f| f & 4 != 0));
+        let hf = s
+            .children()
+            .find(|k| k.typ == rt::HEADERS_FOOTERS)
+            .map(|k| headers_footers(&k))
+            .or_else(|| master.and_then(|m| m.hf.clone()))
+            .unwrap_or_else(|| doc_hf.clone());
+
+        let (oshapes, bg) = match s
+            .child(rt::DRAWING)
+            .and_then(|d| d.child(escher::DG_CONTAINER))
+        {
+            Some(dg) => {
+                let d = escher::drawing(&dg);
+                (d.shapes, d.background)
+            }
+            None => (vec![], None),
+        };
+        let background = if flags & 4 != 0 {
+            None
+        } else {
+            bg.as_ref().map(|b| self.background_fill(b, &scheme))
+        };
+        let ctx = SlideCtx {
+            scheme,
+            styles: &styles,
+            master,
+            outline,
+            number,
+            hf: &hf,
+        };
+        let mut out = vec![];
+        for o in &oshapes {
+            if let Some(x) = self.shape(o, &ctx, false, budget)? {
+                out.push(x);
+            }
+        }
+        // The master's date, footer and slide number shown on this slide.
+        let title_slide = master.is_some_and(|m| m.title);
+        if let Some(m) = master.filter(|_| !(title_slide && omit_title_footers)) {
+            for o in &m.shapes {
+                let Some(ph) = master_placeholder_of(o) else {
+                    continue;
+                };
+                let show = match ph {
+                    pt::MASTER_DATE => hf.date,
+                    pt::MASTER_SLIDE_NUMBER => hf.slide_number,
+                    pt::MASTER_FOOTER => hf.footer,
+                    _ => false,
+                };
+                if show && let Some(x) = self.shape(o, &ctx, false, budget)? {
+                    out.push(x);
+                }
+            }
+        }
+        Ok(Slide {
+            name: None,
+            master: mi,
+            layout: li,
+            background,
+            shapes: out,
+            hidden,
+            show_master_shapes: flags & 1 != 0,
+        })
+    }
+
+    /// The master placeholder a slide placeholder of type `ph` takes its
+    /// position and properties from.
+    fn master_placeholder<'m>(&self, ctx: &'m SlideCtx<'a, '_>, ph: u8) -> Option<&'m OShape<'a>> {
+        let m = ctx.master?;
+        let want: &[u8] = match ph {
+            pt::TITLE | pt::VERTICAL_TITLE => &[pt::MASTER_TITLE, pt::MASTER_CENTER_TITLE],
+            pt::CENTER_TITLE => &[pt::MASTER_CENTER_TITLE, pt::MASTER_TITLE],
+            pt::SUBTITLE => &[pt::MASTER_SUBTITLE, pt::MASTER_BODY],
+            pt::BODY | pt::VERTICAL_BODY => &[pt::MASTER_BODY, pt::MASTER_SUBTITLE],
+            _ => &[],
+        };
+        want.iter().find_map(|w| {
+            m.shapes
+                .iter()
+                .find(|s| master_placeholder_of(s) == Some(*w))
+        })
+    }
+
+    fn shape(
+        &mut self,
+        o: &OShape<'a>,
+        ctx: &SlideCtx<'a, '_>,
+        in_group: bool,
+        budget: &mut Budget,
+    ) -> Result<Option<Shape>> {
+        if o.flags & escher::F_DELETED != 0 {
+            return Ok(None);
+        }
+        budget.shape(0)?;
+        // A master's date, footer and slide number shown on a slide stay
+        // placeholders there.
+        let ph = placeholder_of(o).or_else(|| {
+            master_placeholder_of(o).filter(|p| {
+                matches!(
+                    *p,
+                    pt::MASTER_DATE | pt::MASTER_SLIDE_NUMBER | pt::MASTER_FOOTER
+                )
+            })
+        });
+        let master_ph = ph.and_then(|p| self.master_placeholder(ctx, p));
+        let mut props = self.defaults.clone();
+        if let Some(m) = master_ph {
+            props.overlay(&m.props);
+        }
+        // The master shape it names as its own.
+        let hsp = o
+            .props
+            .get(0x0301)
+            .filter(|_| o.flags & escher::F_HAVE_MASTER != 0);
+        if let Some(mp) = hsp.and_then(|id| self.master_props.get(&id)) {
+            props.overlay(mp);
+        }
+        props.overlay(&o.props);
+        let mut xf =
+            shapes::xfrm(o, in_group).or_else(|| master_ph.and_then(|m| shapes::xfrm(m, false)));
+        if o.is_group() {
+            let Some(xf) = xf else { return Ok(None) };
+            let g = o.group.unwrap_or([0, 0, 1, 1]);
+            let mut kids = vec![];
+            for c in &o.children {
+                if let Some(x) = self.shape(c, ctx, true, budget)? {
+                    kids.push(x);
+                }
+            }
+            let child = Xfrm {
+                x: g[0].into(),
+                y: g[1].into(),
+                w: i64::from(g[2].saturating_sub(g[0])).max(1),
+                h: i64::from(g[3].saturating_sub(g[1])).max(1),
+                ..Xfrm::default()
+            };
+            let mut s = Shape::new(
+                ShapeKind::Group(Box::new(Group {
+                    child,
+                    shapes: kids,
+                })),
+                xf,
+            );
+            s.hidden = props.flag(0x03BF, 1) == Some(true);
+            return Ok(Some(s));
+        }
+        let Some(xf) = xf.take() else { return Ok(None) };
+        self.want_blips(&props);
+        let sctx = shapes::Ctx {
+            scheme: &ctx.scheme,
+            blips: &self.blips,
+        };
+        let refs = shapes::refs(&props, &ctx.scheme);
+        let line = shapes::line(&props, &refs);
+        let shadow = shapes::shadow(&props, &refs);
+        let pib = props.get(0x0104);
+        let picture = pib.and_then(|i| {
+            self.blips
+                .get((i as usize).checked_sub(1)?)
+                .copied()
+                .flatten()
+        });
+        let chart = if o.flags & escher::F_OLE != 0 {
+            self.ole_chart(o, budget)?
+        } else {
+            None
+        };
+        let kind = if let Some(xml) = chart {
+            ShapeKind::Chart(xml)
+        } else if let (Some(media), true) = (
+            picture,
+            o.spt == 75 || o.flags & escher::F_OLE != 0 || o.textbox.is_none(),
+        ) {
+            ShapeKind::Pic(Box::new(Pic {
+                media,
+                crop: shapes::crop(&props),
+                geom: if o.spt == 75 || o.spt == 1 || o.spt == 0 {
+                    Geometry::default()
+                } else {
+                    shapes::geometry(o, xf.w, xf.h)
+                },
+                line,
+                shadow,
+                alpha: None,
+            }))
+        } else if let Some(t) = props.complex(0x00C0).map(utf16).filter(|t| !t.is_empty()) {
+            // WordArt: its text in its fill, filling the shape.
+            ShapeKind::Sp(Box::new(Sp {
+                geom: Geometry::default(),
+                fill: Fill::None,
+                line: Line::default(),
+                shadow: None,
+                text: Some(shapes::word_art(&props, &t, &refs, &sctx, xf.h)),
+                ..Sp::default()
+            }))
+        } else {
+            let connector = shapes::is_connector(o);
+            let geom = shapes::geometry(o, xf.w, xf.h);
+            let text = self.text_body(o, &props, ctx, master_ph);
+            if let Some(t) = &text {
+                budget.alloc(text_bytes(t))?;
+            }
+            ShapeKind::Sp(Box::new(Sp {
+                geom,
+                fill: if connector {
+                    Fill::None
+                } else {
+                    shapes::fill(&props, &sctx, &refs)
+                },
+                line,
+                shadow,
+                text: if connector { None } else { text },
+                connector: connector && o.textbox.is_none(),
+                ..Sp::default()
+            }))
+        };
+        let mut s = Shape::new(kind, xf);
+        s.hidden = props.flag(0x03BF, 1) == Some(true);
+        s.placeholder = ph.and_then(placeholder_kind);
+        s.link = o.client_data.and_then(|cd| self.shape_link(&cd));
+        Ok(Some(s))
+    }
+
+    /// The chart an OLE object shape holds, when it holds one.
+    fn ole_chart(&self, o: &OShape<'a>, budget: &mut Budget) -> Result<Option<String>> {
+        let stg = o
+            .client_data
+            .and_then(|cd| cd.child(rt::EX_OBJ_REF_ATOM))
+            .filter(|a| a.data.len() >= 4)
+            .and_then(|a| self.objects.get(&Cur::new(a.data).u32()))
+            .and_then(|pid| self.object(*pid))
+            .filter(|s| s.typ == rt::EX_OLE_OBJ_STG);
+        match stg {
+            Some(s) => ole::chart(&s, budget),
+            None => Ok(None),
+        }
+    }
+
+    fn shape_link(&self, cd: &Rec) -> Option<Link> {
+        let info = cd
+            .children()
+            .find(|k| k.typ == rt::INTERACTIVE_INFO && k.inst == 0)?;
+        let a = info.child(rt::INTERACTIVE_INFO_ATOM)?;
+        let mut b = [0u8; 16];
+        b.copy_from_slice(a.data.get(..16)?);
+        self.link_of(&b)
+    }
+
+    fn link_of(&self, info: &[u8; 16]) -> Option<Link> {
+        let id = u32::from_le_bytes([info[4], info[5], info[6], info[7]]);
+        match info[8] {
+            4 => self.links.get(&id).cloned(),
+            3 => match info[10] {
+                1 => Some(Link::NextSlide),
+                2 => Some(Link::PrevSlide),
+                3 => Some(Link::FirstSlide),
+                4 => Some(Link::LastSlide),
+                _ => None,
+            },
+            _ => None,
+        }
+    }
+
+    fn text_body(
+        &self,
+        o: &OShape<'a>,
+        props: &Props,
+        ctx: &SlideCtx<'a, '_>,
+        master_ph: Option<&OShape<'a>>,
+    ) -> Option<TextBody> {
+        let tb = o.textbox?;
+        let mut bodies = text::read_bodies(tb.children());
+        let ruler = tb.child(rt::TEXT_RULER).map(|r| text::read_ruler(r.data));
+        let body = if let Some(r) = tb.child(rt::OUTLINE_TEXT_REF) {
+            let i = Cur::new(r.data).u32() as usize;
+            let mut b = ctx.outline.get(i)?.clone();
+            if ruler.is_some() {
+                b.ruler = ruler;
+            }
+            b
+        } else {
+            bodies.drain(..).next()?
+        };
+        let mut levels = self.levels(ctx.styles, body.text_type);
+        // A placeholder's text follows its master placeholder's own
+        // formatting (a title master's, chiefly) over the master styles.
+        if let Some(mb) = master_ph
+            .and_then(|m| m.textbox)
+            .and_then(|tb| text::read_bodies(tb.children()).into_iter().next())
+        {
+            text::overlay_levels(&mut levels, &mb);
+        }
+        let links = |info: &[u8; 16]| self.link_of(info);
+        let mut body = body;
+        if let Some(tags) = o.client_data.and_then(|c| c.child(pp9::PROG_TAGS))
+            && let Some(k) = pp9::tag_records(&tags)
+                .iter()
+                .find(|k| k.typ == pp9::STYLE_TEXT_PROP9)
+        {
+            body.pp9 = pp9::style_text_prop9(k.data);
+        }
+        let tctx = TextCtx {
+            bullet_media: &self.bullet_media,
+            fonts: &self.fonts,
+            scheme: &ctx.scheme,
+            base: &levels,
+            slide_number: ctx.number,
+            footer: &ctx.hf.footer_text,
+            date: if ctx.hf.user_date {
+                &ctx.hf.date_text
+            } else {
+                ""
+            },
+            links: &links,
+        };
+        let paras = text::paragraphs(&body, &tctx);
+        Some(TextBody {
+            body: shapes::body_props(props),
+            paras,
+            levels: ListStyle::default(),
+        })
+    }
+}
+
+/// What a slide's shapes are converted against.
+struct SlideCtx<'a, 'b> {
+    scheme: [Rgb; 8],
+    styles: &'b [Option<Levels>],
+    master: Option<&'b MasterSlide<'a>>,
+    outline: &'b [RawText],
+    number: usize,
+    hf: &'b HeadersFooters,
+}
+
+static NO_HF: std::sync::LazyLock<HeadersFooters> =
+    std::sync::LazyLock::new(HeadersFooters::default);
+
+impl<'a, 'b> SlideCtx<'a, 'b> {
+    fn master(m: &'b MasterSlide<'a>) -> SlideCtx<'a, 'b> {
+        SlideCtx {
+            scheme: m.scheme,
+            styles: &m.styles,
+            master: None,
+            outline: &[],
+            number: 1,
+            hf: &NO_HF,
+        }
+    }
+}
+
+/// A slide shape's placeholder type: a position of -1 says it is none
+/// ([MS-PPT] 2.7.8).
+fn placeholder_of(s: &OShape) -> Option<u8> {
+    let cd = s.client_data?;
+    let a = cd.child(rt::PLACEHOLDER_ATOM)?;
+    let pos = Cur::new(a.data).i32();
+    let id = *a.data.get(4)?;
+    (pos != -1 && id != 0).then_some(id)
+}
+
+/// A master shape's placeholder type, whatever its position: masters'
+/// placeholders are written with -1 too.
+fn master_placeholder_of(s: &OShape) -> Option<u8> {
+    let a = s.client_data?.child(rt::PLACEHOLDER_ATOM)?;
+    let id = *a.data.get(4)?;
+    (id != 0).then_some(id)
+}
+
+fn placeholder_kind(ph: u8) -> Option<Placeholder> {
+    let kind = match ph {
+        pt::TITLE | pt::VERTICAL_TITLE | pt::MASTER_TITLE => "title",
+        pt::CENTER_TITLE | pt::MASTER_CENTER_TITLE => "ctrTitle",
+        pt::SUBTITLE | pt::MASTER_SUBTITLE => "subTitle",
+        pt::BODY | pt::VERTICAL_BODY | pt::MASTER_BODY => "body",
+        pt::MASTER_DATE => "dt",
+        pt::MASTER_FOOTER => "ftr",
+        pt::MASTER_SLIDE_NUMBER => "sldNum",
+        pt::MASTER_HEADER => return None,
+        _ => "obj",
+    };
+    Some(Placeholder {
+        kind,
+        idx: match kind {
+            "title" | "ctrTitle" => None,
+            "dt" => Some(10),
+            "ftr" => Some(11),
+            "sldNum" => Some(12),
+            _ => Some(u32::from(ph)),
+        },
+    })
+}
+
+fn blank_layout() -> Layout {
+    Layout {
+        name: "Blank".into(),
+        kind: "blank",
+        show_master_shapes: true,
+        ..Layout::default()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::records::build::rec;
+    use super::*;
+
+    /// A persist directory of one entry of `count` offsets (100, 101...),
+    /// its header holding the count's low 12 bits, then a user edit naming
+    /// it with `seed`.
+    fn stream(count: u32, seed: u32) -> (Vec<u8>, usize) {
+        let mut body = (1 | (count & 0xFFF) << 20).to_le_bytes().to_vec();
+        for k in 0..count {
+            body.extend((100 + k).to_le_bytes());
+        }
+        let mut s = rec(0, 0, rt::PERSIST_DIRECTORY_ATOM, &body);
+        let edit_at = s.len();
+        let mut edit = vec![0; 8];
+        edit.extend(0u32.to_le_bytes()); // no earlier edit
+        edit.extend(0u32.to_le_bytes()); // the directory, at 0
+        edit.extend(1u32.to_le_bytes());
+        edit.extend(seed.to_le_bytes());
+        s.extend(rec(0, 0, rt::USER_EDIT_ATOM, &edit));
+        (s, edit_at)
+    }
+
+    #[test]
+    fn persist_counts_past_4095_as_some_writers_store_them() {
+        let (s, at) = stream(6003, 6003);
+        let map = persist_directory(&s, Some(at));
+        assert_eq!(map.len(), 6003);
+        assert_eq!(map.get(&6003), Some(&(100 + 6002)));
+        // A sound directory is read as it is.
+        let (s, at) = stream(300, 300);
+        let map = persist_directory(&s, Some(at));
+        assert_eq!((map.len(), map.get(&300)), (300, Some(&399)));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/old.rs b/crates/exav-render/src/formats/office/slides/ppt/old.rs
new file mode 100644
index 00000000..4c9d5155
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/old.rs
@@ -0,0 +1,163 @@
+//! PowerPoint 2, 3 and 4 presentations: a file that starts with 0xED 0xDE
+//! 0xAD 0x0B (Windows, little endian) or 0x0B 0xAD 0xDE 0xED (Macintosh,
+//! big endian) and a version number, as one file (2 and 3), as the "PP40"
+//! stream of a compound file (4), or as the data fork of a Macintosh file in
+//! BinHex 4.0 text. Microsoft published no specification of them: they are
+//! recognised and refused as unsupported, so that the caller can tell them
+//! from a file that is not a presentation.
+
+use crate::formats::office::slides::error::{Error, Result};
+
+/// What an old presentation is: its version and its byte order.
+pub struct Old {
+    pub version: u32,
+    pub big_endian: bool,
+}
+
+const MAGIC_LE: [u8; 4] = [0xED, 0xDE, 0xAD, 0x0B];
+const MAGIC_BE: [u8; 4] = [0x0B, 0xAD, 0xDE, 0xED];
+
+/// The presentation `d` holds, when it is the stream of one: starting with
+/// the magic number.
+pub fn parse(d: &[u8]) -> Option<Old> {
+    let big_endian = match d.get(..4)? {
+        m if m == MAGIC_LE => false,
+        m if m == MAGIC_BE => true,
+        _ => return None,
+    };
+    let v: [u8; 4] = d.get(4..8)?.try_into().ok()?;
+    let version = if big_endian {
+        u32::from_be_bytes(v)
+    } else {
+        u32::from_le_bytes(v)
+    };
+    (2..=4).contains(&version).then_some(Old {
+        version,
+        big_endian,
+    })
+}
+
+/// The data fork of a BinHex 4.0 file (RFC 1741): text of 64 characters,
+/// after a line saying it must be converted and a colon, ending at another;
+/// a header (name, version, type, creator, flags, fork lengths, checksum),
+/// the data fork and its checksum, run-length coded with 0x90.
+pub fn binhex(text: &[u8]) -> Option<Vec<u8>> {
+    const ALPHABET: &[u8; 64] =
+        b"!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr";
+    if !text.starts_with(b"(This file must be converted with BinHex") {
+        return None;
+    }
+    let start = text.iter().position(|&c| c == b':')? + 1;
+    let mut bits = 0u32;
+    let mut n = 0u32;
+    let mut raw: Vec<u8> = vec![];
+    for &c in &text[start..] {
+        if c == b':' {
+            break;
+        }
+        if matches!(c, b'\r' | b'\n' | b' ' | b'\t') {
+            continue;
+        }
+        let v = ALPHABET.iter().position(|&a| a == c)? as u32;
+        bits = (bits << 6 | v) & 0xFFFF;
+        n += 6;
+        if n >= 8 {
+            n -= 8;
+            raw.push((bits >> n) as u8);
+            if raw.len() > 64 << 20 {
+                return None;
+            }
+        }
+    }
+    // Run-length decoding: 0x90 then a count; 0 is a 0x90 itself.
+    let mut out: Vec<u8> = Vec::with_capacity(raw.len());
+    let mut i = 0;
+    while i < raw.len() {
+        let b = raw[i];
+        if b == 0x90 {
+            let count = *raw.get(i + 1)? as usize;
+            if count == 0 {
+                out.push(0x90);
+            } else {
+                let last = *out.last()?;
+                out.extend(std::iter::repeat_n(last, count - 1));
+            }
+            i += 2;
+        } else {
+            out.push(b);
+            i += 1;
+        }
+        if out.len() > 64 << 20 {
+            return None;
+        }
+    }
+    let name = usize::from(*out.first()?);
+    let p = 1 + name;
+    // Version, type, creator, flags, then the data fork's length.
+    let len = u32::from_be_bytes(out.get(p + 11..p + 15)?.try_into().ok()?) as usize;
+    let data = out.get(p + 21..p + 21 + len)?;
+    Some(data.to_vec())
+}
+
+/// Whether `input` is an old presentation on its own (not in a compound
+/// file): its bytes, or its BinHex text's data fork.
+pub fn open(input: &[u8]) -> Option<Old> {
+    parse(input).or_else(|| binhex(input).and_then(|d| parse(&d)))
+}
+
+pub fn read(old: &Old) -> Result<crate::formats::office::slides::model::Presentation> {
+    Err(Error::Unsupported(format!(
+        "PowerPoint {}{}",
+        old.version,
+        if old.big_endian { " for Macintosh" } else { "" }
+    )))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn versions_and_byte_orders() {
+        let le = [0xED, 0xDE, 0xAD, 0x0B, 3, 0, 0, 0, 1];
+        let o = parse(&le).unwrap();
+        assert_eq!((o.version, o.big_endian), (3, false));
+        let be = [0x0B, 0xAD, 0xDE, 0xED, 0, 0, 0, 2, 1];
+        let o = parse(&be).unwrap();
+        assert_eq!((o.version, o.big_endian), (2, true));
+        // Not a version of PowerPoint's.
+        assert!(parse(&[0xED, 0xDE, 0xAD, 0x0B, 9, 0, 0, 0]).is_none());
+        assert!(parse(b"hello world").is_none());
+    }
+
+    #[test]
+    fn binhex_data_fork() {
+        // A file "a", version 0, type "SLDS", creator "PPNT", flags 0, a data
+        // fork of 4 bytes (the magic) and an empty resource fork.
+        let mut raw: Vec<u8> = vec![1, b'a', 0];
+        raw.extend(b"SLDSPPNT");
+        raw.extend([0, 0]);
+        raw.extend(4u32.to_be_bytes());
+        raw.extend(0u32.to_be_bytes());
+        raw.extend([0, 0]); // header checksum
+        raw.extend(MAGIC_BE);
+        raw.extend([0, 0]); // data checksum
+        let alphabet = b"!\"#$%&'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr";
+        let mut text = b"(This file must be converted with BinHex 4.0)\r\r:".to_vec();
+        let (mut bits, mut n) = (0u32, 0u32);
+        for &b in &raw {
+            bits = bits << 8 | u32::from(b);
+            n += 8;
+            while n >= 6 {
+                n -= 6;
+                text.push(alphabet[(bits >> n & 63) as usize]);
+            }
+        }
+        if n > 0 {
+            text.push(alphabet[(bits << (6 - n) & 63) as usize]);
+        }
+        text.push(b':');
+        assert_eq!(binhex(&text).unwrap(), MAGIC_BE);
+        assert!(binhex(b"not binhex").is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/ole.rs b/crates/exav-render/src/formats/office/slides/ppt/ole.rs
new file mode 100644
index 00000000..45b0d3ba
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/ole.rs
@@ -0,0 +1,136 @@
+//! Charts held by OLE objects ([MS-PPT] 2.10.34 ExOleObjStg): the object's
+//! compound file, zlib-compressed when the record's instance is 1. A chart
+//! stored as an ODF package is in its "package_stream"; the shape's picture
+//! is shown for any other object.
+
+use super::records::Rec;
+use crate::formats::office::slides::error::Result;
+use crate::formats::office::slides::limits::Budget;
+
+/// The object's compound file.
+fn storage(stg: &Rec, budget: &mut Budget) -> Result<Vec<u8>> {
+    use crate::formats::office::slides::error::Error;
+    use std::io::Read;
+    let max = budget.limits.max_part;
+    let out = if stg.inst == 1 {
+        let body = stg.data.get(4..).unwrap_or_default();
+        let mut out = Vec::new();
+        let n = flate2::read::ZlibDecoder::new(body)
+            .take(max + 1)
+            .read_to_end(&mut out);
+        if n.is_err() {
+            return Ok(vec![]);
+        }
+        if out.len() as u64 > max {
+            return Err(Error::TooLarge("an embedded object"));
+        }
+        out
+    } else {
+        stg.data.to_vec()
+    };
+    budget.alloc(out.len() as u64)?;
+    Ok(out)
+}
+
+/// The chart of an ExOleObjStg record as a DrawingML chart part. `None`
+/// when the object is not a chart.
+pub(super) fn chart(stg: &Rec, budget: &mut Budget) -> Result<Option<String>> {
+    use exav_unpack::cfb::Compound;
+    let bytes = storage(stg, budget)?;
+    let Some(cf) = Compound::open(&bytes) else {
+        return Ok(None);
+    };
+    let Some(pkg) = cf.stream(&["package_stream"]) else {
+        return Ok(None);
+    };
+    let Ok(mut zip) = crate::formats::office::slides::package::Zip::open(&pkg) else {
+        return Ok(None);
+    };
+    let Some(content) = zip.get("content.xml", budget.limits.max_part, budget)? else {
+        return Ok(None);
+    };
+    budget.alloc(content.len() as u64 * 4)?;
+    Ok(crate::formats::office::sheets::odf_chart_part(&content))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::error::Error;
+    use crate::formats::office::slides::ppt::records::build::rec;
+    use crate::formats::office::slides::ppt::records::read_at;
+    use exav_unpack::cfb::build;
+    use std::io::Write;
+
+    const CHART: &str = r#"<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"><office:body><office:chart><chart:chart chart:class="chart:bar" svg:width="8cm" svg:height="6cm"><chart:plot-area table:cell-range-address="local-table.$A$1:.$B$2" chart:data-source-has-labels="both"><chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="local-table.$A$2:.$A$2"/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y"/><chart:series chart:values-cell-range-address="local-table.$B$2:.$B$2" chart:label-cell-address="local-table.$B$1" chart:class="chart:bar"/></chart:plot-area><table:table table:name="local-table"><table:table-header-rows><table:table-row><table:table-cell/><table:table-cell office:value-type="string"><text:p>Sales</text:p></table:table-cell></table:table-row></table:table-header-rows><table:table-rows><table:table-row><table:table-cell office:value-type="string"><text:p>Q1</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="42"><text:p>42</text:p></table:table-cell></table:table-row></table:table-rows></table:table></chart:chart></office:chart></office:body></office:document-content>"#;
+
+    fn package(content: &str) -> Vec<u8> {
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        let opts = zip::write::SimpleFileOptions::default();
+        z.start_file("content.xml", opts).unwrap();
+        z.write_all(content.as_bytes()).unwrap();
+        z.finish().unwrap().into_inner()
+    }
+
+    /// An ExOleObjStg record of `storage`, compressed or not.
+    fn stg(storage: &[u8], compressed: bool) -> Vec<u8> {
+        if !compressed {
+            return rec(0, 0, 0x1011, storage);
+        }
+        let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::fast());
+        z.write_all(storage).unwrap();
+        let mut body = (storage.len() as u32).to_le_bytes().to_vec();
+        body.extend(z.finish().unwrap());
+        rec(0, 1, 0x1011, &body)
+    }
+
+    fn chart_of(record: &[u8], budget: &mut Budget) -> Result<Option<String>> {
+        chart(&read_at(record, 0).unwrap(), budget)
+    }
+
+    #[test]
+    fn an_odf_package_in_the_object_is_a_chart() {
+        let cf = build(&[("package_stream", &package(CHART))]);
+        for compressed in [true, false] {
+            let mut b = Budget::new(Default::default());
+            let c = chart_of(&stg(&cf, compressed), &mut b).unwrap().unwrap();
+            assert!(c.contains("<c:barChart>") && c.contains("Sales"), "{c}");
+        }
+    }
+
+    #[test]
+    fn other_objects_and_damaged_ones_are_not_charts() {
+        let mut b = Budget::new(Default::default());
+        let other = build(&[("Workbook", b"BIFF")]);
+        assert_eq!(chart_of(&stg(&other, true), &mut b).unwrap(), None);
+        assert_eq!(
+            chart_of(&stg(b"not a compound file", true), &mut b).unwrap(),
+            None
+        );
+        let bad = rec(0, 1, 0x1011, &[9, 9, 9, 9, 1, 2, 3]);
+        assert_eq!(chart_of(&bad, &mut b).unwrap(), None);
+        let text = build(&[("package_stream", &package("<a/>"))]);
+        assert_eq!(chart_of(&stg(&text, true), &mut b).unwrap(), None);
+    }
+
+    #[test]
+    fn an_object_past_the_part_limit_is_refused() {
+        let cf = build(&[("package_stream", &package(CHART))]);
+        let limits = crate::formats::office::slides::Limits {
+            max_part: 1024,
+            ..Default::default()
+        };
+        let mut b = Budget::new(limits);
+        let big = build(&[("package_stream", &vec![0u8; 4096])]);
+        assert!(matches!(
+            chart_of(&stg(&big, true), &mut b),
+            Err(Error::TooLarge(_))
+        ));
+        // A compact object within the limit is read.
+        assert!(
+            chart_of(&stg(&cf, true), &mut Budget::new(Default::default()))
+                .unwrap()
+                .is_some()
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/pp9.rs b/crates/exav-render/src/formats/office/slides/ppt/pp9.rs
new file mode 100644
index 00000000..0f74488a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/pp9.rs
@@ -0,0 +1,220 @@
+//! The PowerPoint 2000 text extension, kept in programmable tags named
+//! "___PPT9" ([MS-PPT] 2.9.26 TextPFException9, 2.9.37 and 2.9.38
+//! TextMasterStyle9, 2.9.67 and 2.9.68 StyleTextProp9, 2.9.72 and 2.9.73
+//! the picture bullets): automatic numbering and picture bullets, which
+//! the base paragraph formatting has no fields for.
+
+use super::escher;
+use super::records::{Children, Rec, read_at};
+use crate::formats::office::common::bytes::Cur;
+
+pub const PROG_TAGS: u16 = 0x1388;
+const PROG_BINARY_TAG: u16 = 0x138A;
+const BINARY_TAG_DATA: u16 = 0x138B;
+const CSTRING: u16 = 0x0FBA;
+pub const STYLE_TEXT_PROP9: u16 = 0x0FAC;
+pub const TEXT_MASTER_STYLE9: u16 = 0x0FAD;
+pub const BLIP_COLLECTION9: u16 = 0x07F8;
+const BLIP_ENTITY9: u16 = 0x07F9;
+
+/// What a TextPFException9 adds to a paragraph.
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct Pf9 {
+    /// The picture bullet, an index into the picture bullets.
+    pub blip: Option<u16>,
+    /// Numbering scheme and first number; a scheme of `NO_NUMBERING` says
+    /// the paragraph is not numbered.
+    pub autonum: Option<(u16, u16)>,
+}
+
+pub const NO_NUMBERING: u16 = 0xFFFF;
+
+/// A TextPFException9: its masks, then the optional picture reference,
+/// the has-numbering flag and the scheme, in that order.
+fn read_pf9(c: &mut Cur) -> Pf9 {
+    let m = c.u32();
+    let blip = (m & (1 << 23) != 0).then(|| c.u16());
+    let has_scheme = (m & (1 << 25) != 0).then(|| c.u16());
+    let scheme = (m & (1 << 24) != 0).then(|| (c.u16(), c.u16()));
+    Pf9 {
+        blip: blip.filter(|&b| b != 0xFFFF),
+        autonum: match (has_scheme, scheme) {
+            (Some(0), _) => Some((NO_NUMBERING, 0)),
+            (_, s) => s,
+        },
+    }
+}
+
+/// A TextCFException9: its masks, and four more bytes when the PowerPoint
+/// 2002 extension bit is set.
+fn skip_cf9(c: &mut Cur) {
+    let m = c.u32();
+    if m & (1 << 20) != 0 {
+        c.u32();
+    }
+}
+
+/// A TextSIException, as far as its length is known: `false` with smart
+/// tags, which have none.
+fn skip_si(c: &mut Cur) -> bool {
+    let m = c.u32();
+    for bit in [0, 1, 2, 6] {
+        if m & (1 << bit) != 0 {
+            c.u16();
+        }
+    }
+    if m & (1 << 5) != 0 {
+        c.u32();
+    }
+    m & (1 << 9) == 0
+}
+
+/// The items of a StyleTextProp9Atom, one for each run of text that shares
+/// a paragraph extension.
+pub fn style_text_prop9(data: &[u8]) -> Vec<Pf9> {
+    let mut c = Cur::new(data);
+    let mut out = vec![];
+    while c.left() >= 12 && out.len() < 1 << 16 {
+        let pf = read_pf9(&mut c);
+        skip_cf9(&mut c);
+        let ok = skip_si(&mut c);
+        if c.short {
+            break;
+        }
+        out.push(pf);
+        if !ok {
+            break;
+        }
+    }
+    out
+}
+
+/// A TextMasterStyle9Atom's levels (its type in the record's instance).
+pub fn master_style9(r: &Rec) -> Vec<(usize, Pf9)> {
+    let mut c = r.cur();
+    let n = c.u16().min(5);
+    let mut out = vec![];
+    for level in 0..usize::from(n) {
+        let pf = read_pf9(&mut c);
+        skip_cf9(&mut c);
+        if c.short {
+            break;
+        }
+        out.push((level, pf));
+    }
+    out
+}
+
+/// The records of the "___PPT9" tag of a ProgTags container.
+pub fn tag_records<'a>(prog_tags: &Rec<'a>) -> Vec<Rec<'a>> {
+    for tag in prog_tags.children().filter(|t| t.typ == PROG_BINARY_TAG) {
+        let mut kids = tag.children();
+        let name_ok = kids.next().is_some_and(|n| {
+            n.typ == CSTRING
+                && n.data
+                    .as_chunks::<2>()
+                    .0
+                    .iter()
+                    .map(|b| u16::from_le_bytes(*b))
+                    .take_while(|&u| u != 0)
+                    .eq("___PPT9".encode_utf16())
+        });
+        if !name_ok {
+            continue;
+        }
+        if let Some(blob) = kids.find(|k| k.typ == BINARY_TAG_DATA) {
+            return Children::new(blob.data).collect();
+        }
+    }
+    vec![]
+}
+
+/// The picture bullets of a BlipCollection9Container, each with its index.
+pub fn bullet_pictures<'a>(coll: &Rec<'a>) -> Vec<(u16, Rec<'a>)> {
+    let mut out = vec![];
+    for e in coll.children().filter(|e| e.typ == BLIP_ENTITY9).take(256) {
+        // The type and an unused byte, then a picture or a BSE holding it.
+        let Some(block) = e.data.get(2..).and_then(|d| read_at(d, 0)) else {
+            continue;
+        };
+        let rec = if block.typ == 0xF007 {
+            let name_len = block.data.get(33).copied().unwrap_or(0) as usize;
+            match block
+                .data
+                .get(36 + name_len..)
+                .filter(|r| r.len() >= 8)
+                .and_then(|r| read_at(r, 0))
+            {
+                Some(r) => r,
+                None => continue,
+            }
+        } else {
+            block
+        };
+        if escher::blip(&rec).is_some() {
+            out.push((e.inst, rec));
+        }
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn le16(v: u16) -> [u8; 2] {
+        v.to_le_bytes()
+    }
+
+    fn le32(v: u32) -> [u8; 4] {
+        v.to_le_bytes()
+    }
+
+    #[test]
+    fn paragraph_extensions_are_read_in_order() {
+        // Item 1: a picture bullet (index 2). Item 2: numbering scheme 3 from 5.
+        let mut d = vec![];
+        d.extend(le32(1 << 23));
+        d.extend(le16(2));
+        d.extend(le32(0)); // cf9
+        d.extend(le32(0)); // si
+        d.extend(le32((1 << 24) | (1 << 25)));
+        d.extend(le16(1));
+        d.extend(le16(3));
+        d.extend(le16(5));
+        d.extend(le32(1 << 20)); // cf9 with the pp10 extension
+        d.extend(le32(0));
+        d.extend(le32(1 << 1)); // si with a language
+        d.extend(le16(0x409));
+        let items = style_text_prop9(&d);
+        assert_eq!(
+            items,
+            vec![
+                Pf9 {
+                    blip: Some(2),
+                    autonum: None
+                },
+                Pf9 {
+                    blip: None,
+                    autonum: Some((3, 5))
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn numbering_can_be_turned_off() {
+        let mut d = vec![];
+        d.extend(le32(1 << 25));
+        d.extend(le16(0));
+        d.extend(le32(0));
+        d.extend(le32(0));
+        assert_eq!(
+            style_text_prop9(&d),
+            vec![Pf9 {
+                blip: None,
+                autonum: Some((NO_NUMBERING, 0))
+            }]
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/ppt95.rs b/crates/exav-render/src/formats/office/slides/ppt/ppt95.rs
new file mode 100644
index 00000000..2a248aec
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/ppt95.rs
@@ -0,0 +1,768 @@
+//! PowerPoint 95 (version 7) presentations: a compound file whose
+//! "PowerPoint Document" stream is one tree of records with a 16-byte
+//! header (type, 0xFFFF for a container, length, an identifier), and
+//! pictures and text in the same stream. Microsoft published no
+//! specification of it; what is read here was learnt from sample documents
+//! and from another application's output on them, used as a black box.
+//!
+//! What the samples show:
+//! - The document (3, then 0x03E8) holds the document atom (0x03E9: slide
+//!   size in master units, 1/576 inch), the environment (0x03F2, with the
+//!   font entities 0x0FB7: a name at byte 28), and the slides (0x03EE) and
+//!   masters (0x03F8) in containers 0x07D0. A slide's colour scheme is
+//!   0x03F4 / 0x07EF: a count, then red, green, blue, 0 for each colour.
+//! - A slide's own 0x0BC0 is its background; its objects are the children of
+//!   0x0BB8 (a group, 0x0BB9, holds another). Coordinates have their origin
+//!   at the slide's centre. Objects: 0x0BC0 a shape, 0x0BC2 a placeholder
+//!   with text (0x0BC3: its type), 0x0BC6 a line (0x0BC7: x1 y1 x2 y2, 0x0BBF:
+//!   head and tail arrow styles), 0x0BC8 a freeform, 0x0BCA an arc.
+//! - 0x0BC1 (40 bytes) is a shape's bounds: its geometry code (-3 rectangle,
+//!   -2 rounded rectangle with its adjustment next, -1 ellipse, 3 burst, 4
+//!   parallelogram, 5 hexagon, 9 right arrow, 14 trapezoid; 0x4000 and 0x2000
+//!   flip it), the adjustment, flags, then left, top, right, bottom and the
+//!   rotation (see `rotation`).
+//! - 0x0BBD (56 bytes) is its look. Byte 0: 0xFF for no line, else the line's
+//!   dash (byte 1) and width (byte 3, an index into `WIDTHS`); 4 to 7 the line
+//!   colour; byte 12 0xFF for no fill; byte 13 the kind of fill (1 solid, 2
+//!   the background, 3 half transparent, 4 and 6 a pattern, 5 a gradient, 7 a
+//!   picture), 20 to 23 the fill colour and 24 to 27 the second colour. A
+//!   colour is red, green, blue and an index: 0xFE for the RGB, else a
+//!   scheme colour.
+//! - Text (0x0FA1 / 0x0FA2 / 0x0FE0): the characters, in Windows 1252, in a
+//!   0x07EE atom (identifier 53); character runs (0x0FE2) and paragraph runs
+//!   (0x0FE3) in 0x07EC containers, each run a count of characters, its type,
+//!   a size and a pointer, then its properties. Character properties: font
+//!   (2 bytes), size in points (at 4), flags at 8 (1 bold, 2 italic, 4
+//!   underline, 0x400 superscript, 0x800 subscript), colour at 10, the
+//!   position in percent at 16. Paragraph properties: bullet flags (at 0, 1
+//!   for a bullet), bullet colour (2), character (6), font (8), size in
+//!   percent (12), alignment (28: 0 left, 1 centre, 2 right, 3 justified),
+//!   line spacing (32), space before (36) and after (40): positive is a
+//!   percent of the text, negative is points.
+
+use crate::formats::office::common::bytes::Cur;
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+
+/// Whether `stream` is a PowerPoint 95 document stream.
+pub(crate) fn is95(stream: &[u8]) -> bool {
+    stream.len() >= 16 && Cur::new(stream).u32() == 3 && Cur::at(stream, 4).u32() == 0xFFFF
+}
+
+const MASTER_UNIT: f64 = 1587.5;
+
+/// Line widths in points, by the width index.
+const WIDTHS: [f64; 10] = [1.0, 2.0, 3.0, 6.0, 8.0, 10.0, 3.0, 4.0, 4.0, 6.0];
+
+const DEFAULT_SCHEME: [Rgb; 8] = [
+    0xFFFFFF, 0x000000, 0x808080, 0x000000, 0x00CC99, 0x3333CC, 0xCCCCFF, 0xB2B2B2,
+];
+
+#[derive(Clone, Copy)]
+struct Rec<'a> {
+    typ: u32,
+    flag: u32,
+    /// The header's fourth field: for a text atom, what it holds.
+    id: u32,
+    data: &'a [u8],
+}
+
+struct Recs<'a> {
+    d: &'a [u8],
+    p: usize,
+    n: usize,
+}
+
+fn recs(d: &[u8]) -> Recs<'_> {
+    Recs { d, p: 0, n: 0 }
+}
+
+impl<'a> Iterator for Recs<'a> {
+    type Item = Rec<'a>;
+
+    fn next(&mut self) -> Option<Rec<'a>> {
+        if self.p + 16 > self.d.len() || self.n >= 1 << 20 {
+            return None;
+        }
+        let mut c = Cur::at(self.d, self.p);
+        let typ = c.u32();
+        let flag = c.u32();
+        let len = c.u32() as usize;
+        let id = c.u32();
+        let start = self.p + 16;
+        let end = start.saturating_add(len).min(self.d.len());
+        self.p = end;
+        self.n += 1;
+        Some(Rec {
+            typ,
+            flag,
+            id,
+            data: &self.d[start..end],
+        })
+    }
+}
+
+impl<'a> Rec<'a> {
+    fn kids(&self) -> Recs<'a> {
+        recs(self.data)
+    }
+
+    fn child(&self, typ: u32) -> Option<Rec<'a>> {
+        self.kids().find(|r| r.typ == typ)
+    }
+
+    fn container(&self) -> bool {
+        self.flag == 0xFFFF
+    }
+}
+
+/// Records of type `typ` anywhere under `r`, in order.
+fn find_all<'a>(r: &Rec<'a>, typ: u32, depth: u32, out: &mut Vec<Rec<'a>>) {
+    for k in r.kids() {
+        if k.typ == typ {
+            out.push(k);
+        }
+        // A string is a record with the container flag but holds text.
+        if k.container() && k.typ != 0x0FBA && depth < 16 && out.len() < 4096 {
+            find_all(&k, typ, depth + 1, out);
+        }
+    }
+}
+
+struct Reader<'a> {
+    fonts: Vec<String>,
+    width: i64,
+    height: i64,
+    p: Presentation,
+    _marker: std::marker::PhantomData<&'a ()>,
+}
+
+pub(crate) fn read(stream: &[u8], budget: &mut Budget) -> Result<Presentation> {
+    let root = recs(stream)
+        .next()
+        .filter(|r| r.typ == 3)
+        .ok_or_else(|| Error::Malformed("no file record".into()))?;
+    let doc = root
+        .child(0x03E8)
+        .ok_or_else(|| Error::Malformed("no document record".into()))?;
+    let (w, h) = doc
+        .child(0x03E9)
+        .map(|a| (Cur::new(a.data).i32(), Cur::at(a.data, 4).i32()))
+        .unwrap_or((5760, 4320));
+    let (w, h) = (
+        i64::from(w.clamp(576, 100_000)),
+        i64::from(h.clamp(576, 100_000)),
+    );
+    let mut r = Reader {
+        fonts: vec![],
+        width: w,
+        height: h,
+        p: Presentation::default(),
+        _marker: std::marker::PhantomData,
+    };
+    r.p.width = (w as f64 * MASTER_UNIT).round() as Emu;
+    r.p.height = (h as f64 * MASTER_UNIT).round() as Emu;
+    // The fonts, in the order the runs name them.
+    let mut ents = vec![];
+    find_all(&doc, 0x0FB7, 0, &mut ents);
+    for e in ents.iter().take(4096) {
+        let name = e.data.get(28..60).unwrap_or(&[]);
+        let end = name.iter().position(|&b| b == 0).unwrap_or(name.len());
+        r.fonts
+            .push(crate::formats::office::slides::package::latin1(
+                &name[..end],
+            ));
+    }
+    let mut slides: Vec<Rec> = vec![];
+    let mut masters: Vec<Rec> = vec![];
+    for k in doc.kids().filter(|k| k.typ == 0x07D0) {
+        for s in k.kids() {
+            match s.typ {
+                0x03EE => slides.push(s),
+                0x03F8 => masters.push(s),
+                _ => {}
+            }
+        }
+    }
+    // One master; a slide's own scheme and shapes come over it.
+    let mut master = Master {
+        name: "Master".into(),
+        layouts: vec![Layout {
+            name: "Blank".into(),
+            kind: "blank",
+            show_master_shapes: true,
+            ..Layout::default()
+        }],
+        background: Some(Fill::Solid(Color::rgb(0xFFFFFF))),
+        ..Master::default()
+    };
+    if let Some(m) = masters.first() {
+        let scheme = scheme_of(m);
+        if let Some(bg) = m.child(0x0BC0).and_then(|b| r.background(&b, &scheme)) {
+            master.background = Some(bg);
+        }
+        if let Some(list) = m.child(0x0BB8) {
+            r.shapes(&list, &scheme, true, &mut master.shapes, budget, 0)?;
+        }
+    }
+    r.p.masters.push(master);
+    let mut n = 0usize;
+    for s in slides {
+        budget.slide(n)?;
+        n += 1;
+        r.p.total_slides = n;
+        if !budget.wants(n - 1) {
+            continue;
+        }
+        let scheme = scheme_of(&s);
+        let background = s.child(0x0BC0).and_then(|b| r.background(&b, &scheme));
+        let mut shapes = vec![];
+        if let Some(list) = s.child(0x0BB8) {
+            r.shapes(&list, &scheme, false, &mut shapes, budget, 0)?;
+        }
+        r.p.slides.push(Slide {
+            name: None,
+            master: 0,
+            layout: 0,
+            background,
+            shapes,
+            hidden: false,
+            show_master_shapes: true,
+        });
+    }
+    Ok(r.p)
+}
+
+/// A slide's or master's colour scheme.
+fn scheme_of(r: &Rec) -> [Rgb; 8] {
+    let Some(a) = r.child(0x03F4).and_then(|s| s.child(0x07EF)) else {
+        return DEFAULT_SCHEME;
+    };
+    let mut out = DEFAULT_SCHEME;
+    let mut c = Cur::at(a.data, 4);
+    for slot in &mut out {
+        let (rr, g, b, _) = (c.u8(), c.u8(), c.u8(), c.u8());
+        if c.short {
+            return DEFAULT_SCHEME;
+        }
+        *slot = u32::from(rr) << 16 | u32::from(g) << 8 | u32::from(b);
+    }
+    out
+}
+
+/// A colour: red, green, blue and an index (0xFE: the RGB; 0 to 7: the
+/// scheme's).
+fn color_at(d: &[u8], at: usize, scheme: &[Rgb; 8]) -> Option<Rgb> {
+    let b = d.get(at..at + 4)?;
+    match b[3] {
+        0xFE => Some(u32::from(b[0]) << 16 | u32::from(b[1]) << 8 | u32::from(b[2])),
+        i if i < 8 => Some(scheme[usize::from(i)]),
+        _ => None,
+    }
+}
+
+impl Reader<'_> {
+    fn emu_x(&self, x: i32) -> Emu {
+        ((f64::from(x) + self.width as f64 / 2.0) * MASTER_UNIT).round() as Emu
+    }
+
+    fn emu_y(&self, y: i32) -> Emu {
+        ((f64::from(y) + self.height as f64 / 2.0) * MASTER_UNIT).round() as Emu
+    }
+
+    /// A slide's background from its own shape: a solid fill.
+    fn background(&self, b: &Rec, scheme: &[Rgb; 8]) -> Option<Fill> {
+        let look = b.child(0x0BBD)?;
+        match fill_of(look.data, scheme) {
+            f @ Fill::Solid(_) => Some(f),
+            _ => None,
+        }
+    }
+
+    /// The objects of a 0x0BB8 list.
+    fn shapes(
+        &mut self,
+        list: &Rec,
+        scheme: &[Rgb; 8],
+        master: bool,
+        out: &mut Vec<Shape>,
+        budget: &mut Budget,
+        depth: u32,
+    ) -> Result<()> {
+        for k in list.kids().take(1 << 16) {
+            match k.typ {
+                0x0BB9 if depth < 16 => {
+                    if let Some(inner) = k.child(0x0BB8) {
+                        self.shapes(&inner, scheme, master, out, budget, depth + 1)?;
+                    }
+                }
+                0x0BC0 | 0x0BC2 | 0x0BC4 => {
+                    budget.shape(0)?;
+                    out.extend(self.boxed(&k, scheme, master, budget)?);
+                }
+                0x0BC6 => {
+                    budget.shape(0)?;
+                    out.extend(self.line(&k, scheme));
+                }
+                0x0BC8 | 0x0BCA => self.p.warn("freeform shapes and arcs"),
+                _ => {}
+            }
+        }
+        Ok(())
+    }
+
+    /// A shape with a geometry code, and its text.
+    fn boxed(
+        &mut self,
+        k: &Rec,
+        scheme: &[Rgb; 8],
+        master: bool,
+        budget: &mut Budget,
+    ) -> Result<Option<Shape>> {
+        let (Some(b), Some(look)) = (k.child(0x0BC1), k.child(0x0BBD)) else {
+            return Ok(None);
+        };
+        let mut c = Cur::new(b.data);
+        let code = c.i32();
+        let adj = c.i32();
+        c.skip(4);
+        let (l, t, r, bt) = (c.i32(), c.i32(), c.i32(), c.i32());
+        let rot = c.i32();
+        if c.short {
+            return Ok(None);
+        }
+        let xf = Xfrm {
+            x: self.emu_x(l.min(r)),
+            y: self.emu_y(t.min(bt)),
+            w: ((f64::from(r) - f64::from(l)).abs() * MASTER_UNIT).round() as Emu,
+            h: ((f64::from(bt) - f64::from(t)).abs() * MASTER_UNIT).round() as Emu,
+            rot: rotation(rot),
+            flip_h: code & 0x4000 != 0 && code > 0,
+            flip_v: code & 0x2000 != 0 && code > 0,
+        };
+        let kind = if code > 0 { code & 0x1FFF } else { code };
+        let geom = geometry(kind, adj);
+        let fill = fill_of(look.data, scheme);
+        let line = line_of(look.data, scheme);
+        let ph = k
+            .child(0x0BC3)
+            .map(|p| Cur::new(p.data).u32() & 0xFF)
+            .filter(|_| k.typ == 0x0BC2);
+        let text = match k.child(0x0FA1) {
+            Some(t) => self.text(&t, scheme, ph, budget)?,
+            None => None,
+        };
+        // A placeholder shows only its own text and look; a master's shows
+        // its prompt on the master and nothing on the slides.
+        if (master && ph.is_some())
+            || (ph.is_some() && text.is_none() && fill == Fill::None && line.fill == Fill::None)
+        {
+            return Ok(None);
+        }
+        if text.is_none() && fill == Fill::None && line.fill == Fill::None {
+            return Ok(None);
+        }
+        let mut s = Shape::new(
+            ShapeKind::Sp(Box::new(Sp {
+                geom,
+                fill,
+                line,
+                text,
+                ..Sp::default()
+            })),
+            xf,
+        );
+        s.placeholder = ph.map(|id| match id {
+            0x0D => Placeholder {
+                kind: "title",
+                idx: None,
+            },
+            0x0F => Placeholder {
+                kind: "ctrTitle",
+                idx: None,
+            },
+            0x10 => Placeholder {
+                kind: "subTitle",
+                idx: Some(1),
+            },
+            _ => Placeholder {
+                kind: "body",
+                idx: Some(1),
+            },
+        });
+        Ok(Some(s))
+    }
+
+    fn line(&mut self, k: &Rec, scheme: &[Rgb; 8]) -> Option<Shape> {
+        let (pts, look) = (k.child(0x0BC7)?, k.child(0x0BBD)?);
+        let mut c = Cur::new(pts.data);
+        let (x1, y1, x2, y2) = (c.i32(), c.i32(), c.i32(), c.i32());
+        if c.short {
+            return None;
+        }
+        let xf = Xfrm {
+            x: self.emu_x(x1.min(x2)),
+            y: self.emu_y(y1.min(y2)),
+            w: ((f64::from(x1) - f64::from(x2)).abs() * MASTER_UNIT).round() as Emu,
+            h: ((f64::from(y1) - f64::from(y2)).abs() * MASTER_UNIT).round() as Emu,
+            ..Xfrm::default()
+        };
+        let (a, b) = (
+            (
+                (x1 - x1.min(x2)) as i64 * 100,
+                (y1 - y1.min(y2)) as i64 * 100,
+            ),
+            (
+                (x2 - x1.min(x2)) as i64 * 100,
+                (y2 - y1.min(y2)) as i64 * 100,
+            ),
+        );
+        let path = Path {
+            w: (i64::from((x1 - x2).abs()) * 100).max(1),
+            h: (i64::from((y1 - y2).abs()) * 100).max(1),
+            fill: false,
+            stroke: true,
+            cmds: vec![PathCmd::Move(a.0, a.1), PathCmd::Line(b.0, b.1)],
+        };
+        let mut line = line_of(look.data, scheme);
+        if let Some(arrows) = k.child(0x0BBF) {
+            // The head grows with the line's width: a thick line's is small.
+            let size = if line.width >= 38_100 { "sm" } else { "med" };
+            let tri = Arrow {
+                kind: "triangle",
+                w: size,
+                len: size,
+            };
+            if arrows.data.first().is_some_and(|&v| v != 0) {
+                line.head = Some(tri.clone());
+            }
+            if arrows.data.get(1).is_some_and(|&v| v != 0) {
+                line.tail = Some(tri);
+            }
+        }
+        if line.fill == Fill::None {
+            return None;
+        }
+        Some(Shape::new(
+            ShapeKind::Sp(Box::new(Sp {
+                geom: Geometry::Custom(vec![path]),
+                fill: Fill::None,
+                line,
+                ..Sp::default()
+            })),
+            xf,
+        ))
+    }
+
+    /// A text object's paragraphs, with the formatting of its runs.
+    fn text(
+        &mut self,
+        t: &Rec,
+        scheme: &[Rgb; 8],
+        ph: Option<u32>,
+        budget: &mut Budget,
+    ) -> Result<Option<TextBody>> {
+        let Some(body) = t.child(0x0FA2).and_then(|b| b.child(0x0FE0)) else {
+            return Ok(None);
+        };
+        let Some(chars) = body
+            .kids()
+            .find(|k| k.typ == 0x07EE && k.id == 53)
+            .map(|k| k.data)
+        else {
+            return Ok(None);
+        };
+        let mut char_runs: Vec<(usize, &[u8])> = vec![];
+        let mut para_runs: Vec<(usize, &[u8])> = vec![];
+        for rc in body.kids().filter(|k| k.typ == 0x07EC) {
+            for atom in rc.kids().filter(|a| a.typ == 0x07EE) {
+                let d = atom.data;
+                let mut p = 0usize;
+                // A count of characters, the run's type, 4 bytes, the
+                // properties' size, a pointer, the properties.
+                while p + 20 <= d.len() && char_runs.len() + para_runs.len() < 1 << 16 {
+                    let mut c = Cur::at(d, p);
+                    let count = c.u32() as usize;
+                    let typ = c.u32();
+                    c.skip(4);
+                    let size = c.u32() as usize;
+                    let Some(props) = d.get(p + 20..p + 20 + size) else {
+                        break;
+                    };
+                    match typ {
+                        0x0FE2 => char_runs.push((count, props)),
+                        0x0FE3 => para_runs.push((count, props)),
+                        _ => {}
+                    }
+                    p += 20 + size;
+                }
+            }
+        }
+        budget.alloc(chars.len() as u64 * 16)?;
+        let text: Vec<u8> = chars.iter().take(1 << 20).copied().collect();
+        if text.iter().all(|&b| b == b'\r' || b == 0) {
+            return Ok(None);
+        }
+        let mut paras = vec![];
+        let mut start = 0usize;
+        loop {
+            let end = text[start..]
+                .iter()
+                .position(|&b| b == b'\r')
+                .map_or(text.len(), |i| start + i);
+            let pp = run_at(&para_runs, start);
+            let first = run_at(&char_runs, start).map(|p| self.run_props(p, scheme));
+            let size = first.as_ref().and_then(|r| r.size).unwrap_or(1800);
+            let props = self.para_props(pp, size, scheme);
+            let mut runs: Vec<Run> = vec![];
+            let mut i = start;
+            while i < end {
+                let (n, cp) = run_span(&char_runs, i);
+                let stop = (i + n.max(1)).min(end);
+                let rp = cp.map(|p| self.run_props(p, scheme)).unwrap_or_default();
+                let s = crate::formats::office::slides::package::latin1(&text[i..stop]);
+                match runs.last_mut() {
+                    Some(Run {
+                        kind: RunKind::Text(prev),
+                        props,
+                    }) if *props == rp => prev.push_str(&s),
+                    _ => runs.push(Run {
+                        kind: RunKind::Text(s),
+                        props: rp,
+                    }),
+                }
+                i = stop;
+            }
+            paras.push(Paragraph {
+                props,
+                runs,
+                end: first.unwrap_or_default(),
+            });
+            if end >= text.len() || paras.len() >= 1 << 16 {
+                break;
+            }
+            start = end + 1;
+        }
+        Ok(Some(TextBody {
+            body: BodyProps {
+                anchor: if matches!(ph, Some(0x0D | 0x0F)) {
+                    "ctr"
+                } else {
+                    "t"
+                },
+                // A text box fits its text: one line is not wrapped.
+                wrap: ph.is_some() || paras.len() > 1,
+                ..BodyProps::default()
+            },
+            paras,
+            levels: ListStyle::default(),
+        }))
+    }
+
+    /// Character properties: font at 0, size at 4, flags at 8, colour at
+    /// 10, position at 16.
+    fn run_props(&self, p: &[u8], scheme: &[Rgb; 8]) -> RunProps {
+        let mut c = Cur::new(p);
+        let font = usize::from(c.u16());
+        c.skip(2);
+        let size = c.u16();
+        c.skip(2);
+        let flags = c.u16();
+        let color = color_at(p, 10, scheme).unwrap_or(0);
+        let pos = Cur::at(p, 16).i32();
+        RunProps {
+            size: Some(u32::from(size.clamp(1, 4000)) * 100),
+            bold: Some(flags & 1 != 0),
+            italic: Some(flags & 2 != 0),
+            underline: (flags & 4 != 0).then_some("sng"),
+            color: Some(Color::rgb(color)),
+            font: self.fonts.get(font).filter(|f| !f.is_empty()).cloned(),
+            baseline: if flags & 0x400 != 0 {
+                Some(pos.clamp(-100, 100) * 1000)
+            } else if flags & 0x800 != 0 {
+                Some(-pos.abs().clamp(0, 100) * 1000)
+            } else {
+                None
+            },
+            ..RunProps::default()
+        }
+    }
+
+    /// Paragraph properties: bullet flags at 0, bullet colour at 2,
+    /// character at 6, font at 8, size at 12, alignment at 28, line
+    /// spacing at 32, space before at 36 and after at 40.
+    fn para_props(&self, p: Option<&[u8]>, size: u32, scheme: &[Rgb; 8]) -> ParaProps {
+        let Some(p) = p else {
+            return ParaProps {
+                bullet: Some(Bullet::None),
+                ..ParaProps::default()
+            };
+        };
+        let mut c = Cur::new(p);
+        let bullet_flags = c.u16();
+        let font = Cur::at(p, 8).u16();
+        let ch = Cur::at(p, 6).u16();
+        let bsize = Cur::at(p, 12).u32();
+        let align = Cur::at(p, 28).u32();
+        let line = Cur::at(p, 32).i32();
+        let before = Cur::at(p, 36).i32();
+        let after = Cur::at(p, 40).i32();
+        // Positive spacing is a percent of the text's size; negative, points.
+        let space = |v: i32| -> Option<Spacing> {
+            match v {
+                0 => None,
+                v if v > 0 => Some(Spacing::Pts(
+                    (f64::from(size) * f64::from(v.min(1000)) / 100.0).round() as i32,
+                )),
+                v => Some(Spacing::Pts(v.saturating_abs().min(1584) * 100)),
+            }
+        };
+        let bullet = if bullet_flags & 1 != 0 {
+            let name = self.fonts.get(usize::from(font)).map(String::as_str);
+            let symbol = name.is_some_and(|n| {
+                let l = n.to_ascii_lowercase();
+                l.contains("sorts") || l.contains("wingdings") || l.contains("symbol")
+            });
+            let c = if symbol {
+                '\u{2022}'
+            } else {
+                char::from_u32(
+                    crate::formats::office::slides::package::latin1(&[ch as u8])
+                        .chars()
+                        .next()
+                        .map_or(0x2022, |c| c as u32),
+                )
+                .filter(|c| !c.is_control())
+                .unwrap_or('\u{2022}')
+            };
+            Bullet::Char {
+                ch: c,
+                font: None,
+                color: color_at(p, 2, scheme).map(Color::rgb),
+                size: Some(bsize)
+                    .filter(|s| (25..=400).contains(s))
+                    .map(|s| s * 1000),
+            }
+        } else {
+            Bullet::None
+        };
+        let bulleted = bullet != Bullet::None;
+        ParaProps {
+            align: match align {
+                1 => Some("ctr"),
+                2 => Some("r"),
+                3 => Some("just"),
+                _ => None,
+            },
+            line_spacing: match line {
+                0 => None,
+                v if v > 0 => Some(Spacing::Pct(v.min(1000) * 1000)),
+                v => Some(Spacing::Pts(v.saturating_abs().min(1584) * 100)),
+            },
+            space_before: space(before),
+            space_after: space(after),
+            margin: bulleted.then_some(228_600),
+            indent: bulleted.then_some(-228_600),
+            bullet: Some(bullet),
+            ..ParaProps::default()
+        }
+    }
+}
+
+/// The run of `runs` (counts of characters) covering character `at`.
+fn run_at<'a>(runs: &[(usize, &'a [u8])], at: usize) -> Option<&'a [u8]> {
+    let mut start = 0usize;
+    for (n, p) in runs {
+        if at < start.saturating_add(*n) {
+            return Some(p);
+        }
+        start = start.saturating_add(*n);
+    }
+    runs.last().map(|r| r.1)
+}
+
+/// The characters left in the run covering `at`, and its properties.
+fn run_span<'a>(runs: &[(usize, &'a [u8])], at: usize) -> (usize, Option<&'a [u8]>) {
+    let mut start = 0usize;
+    for (n, p) in runs {
+        if at < start.saturating_add(*n) {
+            return (start + n - at, Some(p));
+        }
+        start = start.saturating_add(*n);
+    }
+    (usize::MAX / 2, runs.last().map(|r| r.1))
+}
+
+/// A shape's geometry from its code.
+fn geometry(code: i32, adj: i32) -> Geometry {
+    match code {
+        -2 | 13 => Geometry::Preset {
+            name: "roundRect",
+            adj: vec![("adj", (f64::from(adj.clamp(0, 8100)) * 6.17).round() as i64)],
+        },
+        -1 => Geometry::preset("ellipse"),
+        3 => Geometry::preset("irregularSeal1"),
+        4 => Geometry::preset("parallelogram"),
+        5 => Geometry::preset("hexagon"),
+        9 => Geometry::preset("rightArrow"),
+        14 => Geometry::preset("trapezoid"),
+        _ => Geometry::default(),
+    }
+}
+
+/// A shape's rotation in degrees: its value is in 1/14.93 of a degree.
+fn rotation(v: i32) -> f64 {
+    (f64::from(v) * 360.0 / 5376.0).rem_euclid(360.0)
+}
+
+/// A shape's line: bytes 0 (0xFF for none), 1 (dash), 3 (width index) and
+/// the colour at 4.
+fn line_of(d: &[u8], scheme: &[Rgb; 8]) -> Line {
+    if d.first().is_none_or(|&b| b == 0xFF) {
+        return Line::default();
+    }
+    let dash = match d.get(1) {
+        Some(1) => Some("sysDot"),
+        Some(2) => Some("dash"),
+        Some(3) => Some("lgDash"),
+        Some(4) => Some("dashDot"),
+        _ => None,
+    };
+    let width = WIDTHS[usize::from(d.get(3).copied().unwrap_or(0)).min(WIDTHS.len() - 1)];
+    Line {
+        fill: Fill::Solid(Color::rgb(color_at(d, 4, scheme).unwrap_or(0))),
+        width: (width * 12_700.0).round() as Emu,
+        dash,
+        ..Line::default()
+    }
+}
+
+/// A shape's fill: byte 12 (0xFF for none), byte 13 (the kind), the
+/// colours at 20 and 24.
+fn fill_of(d: &[u8], scheme: &[Rgb; 8]) -> Fill {
+    if d.get(12).is_none_or(|&b| b == 0xFF) {
+        return Fill::None;
+    }
+    let fg = color_at(d, 20, scheme).unwrap_or(0xCBCBCB);
+    let bg = color_at(d, 24, scheme).unwrap_or(0xFFFFFF);
+    match d.get(13) {
+        Some(1) => Fill::Solid(Color::rgb(fg)),
+        Some(2) => Fill::Solid(Color::rgb(scheme[0])),
+        Some(3) => Fill::Solid(Color {
+            rgb: fg,
+            alpha: Some(50_000),
+        }),
+        Some(4 | 6) => Fill::Pattern {
+            preset: "pct50",
+            fg: Color::rgb(fg),
+            bg: Color::rgb(bg),
+        },
+        Some(5) => Fill::Gradient(Gradient {
+            stops: vec![(0, Color::rgb(fg)), (100_000, Color::rgb(bg))],
+            kind: GradientKind::Linear(if d.get(16) == Some(&1) { 0.0 } else { 90.0 }),
+        }),
+        // A picture: not read.
+        _ => Fill::None,
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/presets.rs b/crates/exav-render/src/formats/office/slides/ppt/presets.rs
new file mode 100644
index 00000000..cb721515
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/presets.rs
@@ -0,0 +1,309 @@
+//! OfficeArt shape types ([MS-ODRAW] 2.4.24, MSOSPT) to DrawingML preset
+//! geometries (ECMA-376 presetShapeDefinitions), with the adjust values
+//! whose meaning carries over. OfficeArt adjusts are in the shape's 21600
+//! unit square; DrawingML's in 1/100000 of a side or of the shorter side.
+
+use super::escher::Props;
+use crate::formats::office::slides::model::{Emu, Geometry};
+
+pub fn name(spt: u16) -> Option<&'static str> {
+    Some(match spt {
+        1 | 202 | 24 | 136 => "rect",
+        2 => "roundRect",
+        3 => "ellipse",
+        4 => "diamond",
+        5 => "triangle",
+        6 => "rtTriangle",
+        7 => "parallelogram",
+        8 => "trapezoid",
+        9 => "hexagon",
+        10 => "octagon",
+        11 => "plus",
+        12 => "star5",
+        13 | 14 => "rightArrow",
+        15 => "homePlate",
+        16 => "cube",
+        17 => "wedgeRoundRectCallout",
+        18 => "star16",
+        19 => "arc",
+        20 => "line",
+        21 => "plaque",
+        22 => "can",
+        23 => "donut",
+        32 => "straightConnector1",
+        33 => "bentConnector2",
+        34 => "bentConnector3",
+        35 => "bentConnector4",
+        36 => "bentConnector5",
+        37 => "curvedConnector2",
+        38 => "curvedConnector3",
+        39 => "curvedConnector4",
+        40 => "curvedConnector5",
+        41 => "callout1",
+        42 => "callout2",
+        43 => "callout3",
+        44 => "accentCallout1",
+        45 => "accentCallout2",
+        46 => "accentCallout3",
+        47 => "borderCallout1",
+        48 => "borderCallout2",
+        49 => "borderCallout3",
+        50 => "accentBorderCallout1",
+        51 => "accentBorderCallout2",
+        52 => "accentBorderCallout3",
+        53 => "ribbon",
+        54 => "ribbon2",
+        55 => "chevron",
+        56 => "pentagon",
+        57 => "noSmoking",
+        58 => "star8",
+        59 => "star16",
+        60 => "star32",
+        61 => "wedgeRectCallout",
+        62 => "wedgeRoundRectCallout",
+        63 => "wedgeEllipseCallout",
+        64 => "wave",
+        65 => "foldedCorner",
+        66 => "leftArrow",
+        67 => "downArrow",
+        68 => "upArrow",
+        69 => "leftRightArrow",
+        70 => "upDownArrow",
+        71 => "irregularSeal1",
+        72 => "irregularSeal2",
+        73 => "lightningBolt",
+        74 => "heart",
+        75 => "frame",
+        76 => "quadArrow",
+        77 => "leftArrowCallout",
+        78 => "rightArrowCallout",
+        79 => "upArrowCallout",
+        80 => "downArrowCallout",
+        81 => "leftRightArrowCallout",
+        82 => "upDownArrowCallout",
+        83 => "quadArrowCallout",
+        84 => "bevel",
+        85 => "leftBracket",
+        86 => "rightBracket",
+        87 => "leftBrace",
+        88 => "rightBrace",
+        89 => "leftUpArrow",
+        90 => "bentUpArrow",
+        91 => "bentArrow",
+        92 => "star24",
+        93 => "stripedRightArrow",
+        94 => "notchedRightArrow",
+        95 => "blockArc",
+        96 => "smileyFace",
+        97 => "verticalScroll",
+        98 => "horizontalScroll",
+        99 | 100 => "circularArrow",
+        101 => "uturnArrow",
+        102 => "curvedRightArrow",
+        103 => "curvedLeftArrow",
+        104 => "curvedUpArrow",
+        105 => "curvedDownArrow",
+        106 => "cloudCallout",
+        107 => "ellipseRibbon",
+        108 => "ellipseRibbon2",
+        109 => "flowChartProcess",
+        110 => "flowChartDecision",
+        111 => "flowChartInputOutput",
+        112 => "flowChartPredefinedProcess",
+        113 => "flowChartInternalStorage",
+        114 => "flowChartDocument",
+        115 => "flowChartMultidocument",
+        116 => "flowChartTerminator",
+        117 => "flowChartPreparation",
+        118 => "flowChartManualInput",
+        119 => "flowChartManualOperation",
+        120 => "flowChartConnector",
+        121 => "flowChartPunchedCard",
+        122 => "flowChartPunchedTape",
+        123 => "flowChartSummingJunction",
+        124 => "flowChartOr",
+        125 => "flowChartCollate",
+        126 => "flowChartSort",
+        127 => "flowChartExtract",
+        128 => "flowChartMerge",
+        129 => "flowChartOfflineStorage",
+        130 => "flowChartOnlineStorage",
+        131 => "flowChartMagneticTape",
+        132 => "flowChartMagneticDisk",
+        133 => "flowChartMagneticDrum",
+        134 => "flowChartDisplay",
+        135 => "flowChartDelay",
+        176 => "flowChartAlternateProcess",
+        177 => "flowChartOffpageConnector",
+        178 => "callout1",
+        179 => "accentCallout1",
+        180 => "borderCallout1",
+        181 => "accentBorderCallout1",
+        182 => "leftRightUpArrow",
+        183 => "sun",
+        184 => "moon",
+        185 => "bracketPair",
+        186 => "bracePair",
+        187 => "star4",
+        188 => "doubleWave",
+        189 => "actionButtonBlank",
+        190 => "actionButtonHome",
+        191 => "actionButtonHelp",
+        192 => "actionButtonInformation",
+        193 => "actionButtonForwardNext",
+        194 => "actionButtonBackPrevious",
+        195 => "actionButtonEnd",
+        196 => "actionButtonBeginning",
+        197 => "actionButtonReturn",
+        198 => "actionButtonDocument",
+        199 => "actionButtonSound",
+        200 => "actionButtonMovie",
+        // WordArt (text effects) draws its text in a plain box.
+        25..=31 | 137..=175 => "rect",
+        _ => return None,
+    })
+}
+
+/// Adjust values of `spt` from the shape's properties, for a shape `w` by
+/// `h`. Only those whose meaning is the same in both systems are given.
+pub fn adjusts(spt: u16, p: &Props, w: Emu, h: Emu) -> Vec<(&'static str, i64)> {
+    let a = |i: u16| p.int(0x0147 + i).map(i64::from);
+    let ss = w.min(h).max(1) as f64;
+    // A fraction of the 21600 square to 1/100000.
+    let frac = |v: i64| (v as f64 / 21600.0 * 100_000.0).round() as i64;
+    // A horizontal length (in 21600 of the width) relative to the shorter side.
+    let horiz = |v: i64| (v as f64 / 21600.0 * w as f64 / ss * 100_000.0).round() as i64;
+    let vert = |v: i64| (v as f64 / 21600.0 * h as f64 / ss * 100_000.0).round() as i64;
+    let mut out = vec![];
+    match spt {
+        2 | 11 | 16 | 22 | 23 | 84 => {
+            if let Some(v) = a(0) {
+                out.push(("adj", frac(v).clamp(0, 50_000)));
+            }
+        }
+        5 => {
+            if let Some(v) = a(0) {
+                out.push(("adj", frac(v).clamp(0, 100_000)));
+            }
+        }
+        7..=9 => {
+            if let Some(v) = a(0) {
+                out.push(("adj", horiz(v).max(0)));
+            }
+        }
+        10 => {
+            if let Some(v) = a(0) {
+                out.push(("adj", frac(v).clamp(0, 50_000)));
+            }
+        }
+        15 | 55 => {
+            if let Some(v) = a(0) {
+                out.push(("adj", horiz(21600 - v).max(0)));
+            }
+        }
+        65 => {
+            if let Some(v) = a(0) {
+                out.push(("adj", frac(21600 - v).clamp(0, 50_000)));
+            }
+        }
+        13 | 14 | 66 | 69 => {
+            let head = a(0);
+            let shaft = a(1);
+            if let Some(s) = shaft {
+                out.push(("adj1", frac(21600 - 2 * s).clamp(0, 100_000)));
+            }
+            if let Some(hd) = head {
+                let len = match spt {
+                    66 | 69 => hd,
+                    _ => 21600 - hd,
+                };
+                out.push(("adj2", horiz(len).max(0)));
+            }
+        }
+        67 | 68 | 70 => {
+            if let Some(s) = a(1) {
+                out.push(("adj1", frac(21600 - 2 * s).clamp(0, 100_000)));
+            }
+            if let Some(hd) = a(0) {
+                let len = if spt == 67 { 21600 - hd } else { hd };
+                out.push(("adj2", vert(len).max(0)));
+            }
+        }
+        61..=63 => {
+            if let Some(x) = a(0) {
+                out.push(("adj1", frac(x - 10800)));
+            }
+            if let Some(y) = a(1) {
+                out.push(("adj2", frac(y - 10800)));
+            }
+        }
+        // Start and end angles (16.16 degrees, clockwise, as DrawingML's).
+        19 => {
+            let deg = |v: i64| ((v as i32) as f64 / 65536.0).rem_euclid(360.0);
+            out.push((
+                "adj1",
+                (deg(a(0).unwrap_or(270 << 16)) * 60000.0).round() as i64,
+            ));
+            out.push(("adj2", (deg(a(1).unwrap_or(0)) * 60000.0).round() as i64));
+        }
+        // Connectors: each adjust a position along the box, in 21600 of
+        // its side, as in DrawingML (in 1/100000).
+        34..=36 | 38..=40 => {
+            let n = match spt {
+                34 | 38 => 1,
+                35 | 39 => 2,
+                _ => 3,
+            };
+            for (i, name) in ["adj1", "adj2", "adj3"].into_iter().enumerate().take(n) {
+                if let Some(v) = a(i as u16).filter(|v| v.abs() <= 216_000) {
+                    out.push((name, frac(v)));
+                }
+            }
+        }
+        _ => {}
+    }
+    out
+}
+
+pub fn geometry(spt: u16, p: &Props, w: Emu, h: Emu) -> Option<Geometry> {
+    let name = name(spt)?;
+    Some(Geometry::Preset {
+        name,
+        adj: adjusts(spt, p, w, h),
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::ppt::escher::Prop;
+
+    #[test]
+    fn rounded_rectangle_and_arrow_adjusts() {
+        let p = Props(vec![Prop {
+            id: 0x0147,
+            value: 3600,
+            complex: None,
+        }]);
+        assert_eq!(adjusts(2, &p, 100, 100), vec![("adj", 16667)]);
+        // A right arrow, twice as wide as high: head at 16200, shaft at 5400.
+        let p = Props(vec![
+            Prop {
+                id: 0x0147,
+                value: 16200,
+                complex: None,
+            },
+            Prop {
+                id: 0x0148,
+                value: 5400,
+                complex: None,
+            },
+        ]);
+        assert_eq!(
+            adjusts(13, &p, 200, 100),
+            vec![("adj1", 50000), ("adj2", 50000)]
+        );
+        assert_eq!(name(202), Some("rect"));
+        assert_eq!(name(0), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/records.rs b/crates/exav-render/src/formats/office/slides/ppt/records.rs
new file mode 100644
index 00000000..c6b953cc
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/records.rs
@@ -0,0 +1,125 @@
+//! Records of the PowerPoint Document stream and of OfficeArt ([MS-PPT]
+//! 2.3.1, [MS-ODRAW] 2.2.1): an 8-byte header (version and instance, type,
+//! length) and the body. A container's children are read within its body;
+//! a length past the end is cut to what is there.
+
+use crate::formats::office::common::bytes::Cur;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Rec<'a> {
+    pub inst: u16,
+    pub typ: u16,
+    pub data: &'a [u8],
+    /// Offset of the header in the slice it was read from.
+    pub at: usize,
+}
+
+impl<'a> Rec<'a> {
+    pub fn children(&self) -> Children<'a> {
+        Children::new(self.data)
+    }
+
+    /// The first child of type `typ`.
+    pub fn child(&self, typ: u16) -> Option<Rec<'a>> {
+        self.children().find(|r| r.typ == typ)
+    }
+
+    pub fn cur(&self) -> Cur<'a> {
+        Cur::new(self.data)
+    }
+}
+
+/// The record at `at` in `d`.
+pub fn read_at(d: &[u8], at: usize) -> Option<Rec<'_>> {
+    let mut c = Cur::at(d, at);
+    if c.left() < 8 {
+        return None;
+    }
+    let vi = c.u16();
+    let typ = c.u16();
+    let len = c.u32() as usize;
+    let start = at + 8;
+    let end = start.saturating_add(len).min(d.len());
+    Some(Rec {
+        inst: vi >> 4,
+        typ,
+        data: &d[start..end],
+        at,
+    })
+}
+
+/// The records one after another in a container's body.
+pub struct Children<'a> {
+    d: &'a [u8],
+    p: usize,
+    n: usize,
+}
+
+impl<'a> Children<'a> {
+    pub fn new(d: &'a [u8]) -> Self {
+        Children { d, p: 0, n: 0 }
+    }
+}
+
+/// Records read from one container at most: a bound on hostile files.
+const MAX_CHILDREN: usize = 1 << 18;
+
+impl<'a> Iterator for Children<'a> {
+    type Item = Rec<'a>;
+
+    fn next(&mut self) -> Option<Rec<'a>> {
+        if self.n >= MAX_CHILDREN {
+            return None;
+        }
+        let r = read_at(self.d, self.p)?;
+        self.p = self.p + 8 + r.data.len();
+        self.n += 1;
+        Some(r)
+    }
+}
+
+#[cfg(test)]
+pub mod build {
+    //! Records written for tests.
+
+    pub fn rec(ver: u8, inst: u16, typ: u16, body: &[u8]) -> Vec<u8> {
+        let mut v = Vec::with_capacity(body.len() + 8);
+        v.extend_from_slice(&(u16::from(ver & 0xF) | inst << 4).to_le_bytes());
+        v.extend_from_slice(&typ.to_le_bytes());
+        v.extend_from_slice(&(body.len() as u32).to_le_bytes());
+        v.extend_from_slice(body);
+        v
+    }
+
+    pub fn container(typ: u16, inst: u16, children: &[Vec<u8>]) -> Vec<u8> {
+        rec(0xF, inst, typ, &children.concat())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::build::*;
+    use super::*;
+
+    #[test]
+    fn children_and_truncation() {
+        let c = container(
+            0x03E8,
+            0,
+            &[rec(0, 1, 0x03E9, &[1, 2]), rec(0, 0, 0x0FA0, b"hi")],
+        );
+        let r = read_at(&c, 0).unwrap();
+        let kids: Vec<_> = r
+            .children()
+            .map(|k| (k.typ, k.inst, k.data.to_vec()))
+            .collect();
+        assert_eq!(
+            kids,
+            vec![(0x03E9, 1, vec![1, 2]), (0x0FA0, 0, b"hi".to_vec())]
+        );
+        // Cut short: the last child is what is there.
+        let r = read_at(&c[..c.len() - 1], 0).unwrap();
+        assert_eq!(r.children().last().unwrap().data, b"h");
+        assert!(read_at(&c, c.len() - 4).is_none());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/shapes.rs b/crates/exav-render/src/formats/office/slides/ppt/shapes.rs
new file mode 100644
index 00000000..8234f62a
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/shapes.rs
@@ -0,0 +1,785 @@
+//! OfficeArt shapes to the model: anchors, geometry (preset and custom
+//! paths), fills, lines, shadows and pictures ([MS-ODRAW] 2.3).
+
+use super::escher::{F_CONNECTOR, F_FLIP_H, F_FLIP_V, OShape, Props, array};
+use super::presets;
+use crate::formats::office::common::bytes::Cur;
+use crate::formats::office::slides::model::*;
+
+/// What converting a slide's shapes needs.
+pub struct Ctx<'a> {
+    pub scheme: &'a [Rgb; 8],
+    /// A picture store entry (1-based `pib`) to the model's media index.
+    pub blips: &'a [Option<usize>],
+}
+
+/// A 16.16 fixed-point value.
+fn fixed(v: u32) -> f64 {
+    f64::from(v as i32) / 65536.0
+}
+
+fn alpha(v: Option<u32>) -> Option<u32> {
+    v.map(|o| ((f64::from(o.min(65536)) / 65536.0) * 100_000.0).round() as u32)
+        .filter(|&a| a < 100_000)
+}
+
+/// Applies a procedural colour change ([MS-ODRAW] 2.2.2) to `c`.
+fn modify(c: Rgb, op: u32, p: u32) -> Rgb {
+    let ch = |c: Rgb, s: u32| (c >> s) & 0xFF;
+    let mut v = [ch(c, 16), ch(c, 8), ch(c, 0)];
+    if op & 0x8000 != 0 {
+        let g = (v[0] * 77 + v[1] * 151 + v[2] * 28) >> 8;
+        v = [g, g, g];
+    }
+    for x in &mut v {
+        *x = match op & 0x0F00 {
+            0x0100 => *x * p / 255,
+            0x0200 => 255 - (255 - *x) * p / 255,
+            0x0300 => (*x + p).min(255),
+            0x0400 => x.saturating_sub(p),
+            0x0500 => p.saturating_sub(*x),
+            0x0600 => {
+                if *x < p {
+                    0
+                } else {
+                    255
+                }
+            }
+            _ => *x,
+        };
+        if op & 0x2000 != 0 {
+            *x = 255 - *x;
+        }
+        if op & 0x4000 != 0 {
+            *x ^= 0x80;
+        }
+    }
+    v[0] << 16 | v[1] << 8 | v[2]
+}
+
+/// The colours a system index can refer to.
+#[derive(Clone, Copy, Default)]
+pub struct Refs {
+    pub fill: Rgb,
+    pub line: Rgb,
+    pub fill_back: Rgb,
+    pub line_back: Rgb,
+    pub shadow: Rgb,
+}
+
+/// An OfficeArtCOLORREF as RGB.
+pub fn color(v: u32, scheme: &[Rgb; 8], refs: &Refs) -> Rgb {
+    let flags = v >> 24;
+    if flags & 0x08 != 0 {
+        return scheme[(v & 7) as usize];
+    }
+    if flags & 0x10 != 0 {
+        let idx = v & 0xFFFF;
+        let base = match idx & 0xFF {
+            0xF0 => refs.fill,
+            0xF1 => refs.line,
+            0xF2 => refs.line,
+            0xF3 => refs.shadow,
+            0xF5 => refs.fill_back,
+            0xF6 => refs.line_back,
+            0xF7 => refs.fill,
+            // Windows system colours: window text black, window white...
+            5 => 0xFFFFFF,
+            _ => 0x000000,
+        };
+        return modify(base, idx & 0xFF00, (v >> 16) & 0xFF);
+    }
+    (v & 0xFF) << 16 | (v & 0xFF00) | (v >> 16) & 0xFF
+}
+
+/// The shape's colours, resolved in the order they depend on each other.
+pub fn refs(p: &Props, scheme: &[Rgb; 8]) -> Refs {
+    let mut r = Refs {
+        fill: 0xFFFFFF,
+        line: 0x000000,
+        fill_back: 0xFFFFFF,
+        line_back: 0xFFFFFF,
+        shadow: 0x808080,
+    };
+    r.fill = color(p.get(0x0181).unwrap_or(0xFFFFFF), scheme, &r);
+    r.line = color(p.get(0x01C0).unwrap_or(0), scheme, &r);
+    r.fill_back = color(p.get(0x0183).unwrap_or(0xFFFFFF), scheme, &r);
+    r.line_back = color(p.get(0x01C2).unwrap_or(0xFFFFFF), scheme, &r);
+    r.shadow = color(p.get(0x0201).unwrap_or(0x808080), scheme, &r);
+    r
+}
+
+pub fn fill(p: &Props, ctx: &Ctx, refs: &Refs) -> Fill {
+    if p.flag(0x01BF, 4) == Some(false) {
+        return Fill::None;
+    }
+    let a = alpha(p.get(0x0182));
+    let back_a = alpha(p.get(0x0184));
+    let fg = Color {
+        rgb: refs.fill,
+        alpha: a,
+    };
+    let bg = Color {
+        rgb: refs.fill_back,
+        alpha: back_a,
+    };
+    match p.get(0x0180).unwrap_or(0) {
+        1 => {
+            // A two-colour pattern bitmap: its colours blended.
+            let mix = |s: u32| (((refs.fill >> s) & 0xFF) + ((refs.fill_back >> s) & 0xFF)) / 2;
+            Fill::Solid(Color {
+                rgb: mix(16) << 16 | mix(8) << 8 | mix(0),
+                alpha: a,
+            })
+        }
+        k @ (2 | 3) => match picture(p.get(0x0186), ctx) {
+            Some(media) => Fill::Picture {
+                media,
+                tile: k == 2,
+            },
+            None => Fill::Solid(fg),
+        },
+        k @ 4..=8 => gradient(p, k, fg, bg, ctx, refs),
+        9 => Fill::None,
+        _ => Fill::Solid(fg),
+    }
+}
+
+fn picture(pib: Option<u32>, ctx: &Ctx) -> Option<usize> {
+    let i = pib? as usize;
+    ctx.blips.get(i.checked_sub(1)?).copied().flatten()
+}
+
+fn gradient(p: &Props, kind: u32, fg: Color, bg: Color, ctx: &Ctx, refs: &Refs) -> Fill {
+    let mut stops: Vec<(u32, Color)> = vec![];
+    if let Some(d) = p.complex(0x0197) {
+        for e in array(d) {
+            let mut c = Cur::new(e);
+            let col = c.u32();
+            let pos = fixed(c.u32()).clamp(0.0, 1.0);
+            stops.push((
+                (pos * 100_000.0).round() as u32,
+                Color {
+                    rgb: color(col, ctx.scheme, refs),
+                    alpha: fg.alpha,
+                },
+            ));
+        }
+    }
+    let focus = p.int(0x018C).unwrap_or(0).clamp(-100, 100);
+    if stops.len() < 2 {
+        // fillColor is the first colour, fillBackColor the last; focus
+        // places the last: 100 at the end, 0 at the start, 50 in the middle
+        // with the first at both ends. Negative values mirror it.
+        stops = match focus.abs() {
+            0 => vec![(0, bg), (100_000, fg)],
+            100 => vec![(0, fg), (100_000, bg)],
+            f => vec![(0, fg), (f as u32 * 1000, bg), (100_000, fg)],
+        };
+        if focus < 0 && focus > -100 {
+            stops = vec![(0, bg), ((100 + focus) as u32 * 1000, fg), (100_000, bg)];
+        }
+    } else if focus != 0 && focus.abs() != 100 {
+        // The colours run to the focus and back.
+        let f = focus.unsigned_abs() * 1000;
+        let mut v: Vec<(u32, Color)> = stops
+            .iter()
+            .map(|(pos, c)| ((*pos as u64 * f as u64 / 100_000) as u32, *c))
+            .collect();
+        v.extend(stops.iter().rev().map(|(pos, c)| {
+            (
+                f + ((100_000 - *pos) as u64 * (100_000 - f) as u64 / 100_000) as u32,
+                *c,
+            )
+        }));
+        stops = v;
+    } else if focus == 0 {
+        stops = stops
+            .iter()
+            .rev()
+            .map(|(pos, c)| (100_000 - pos, *c))
+            .collect();
+    }
+    let kind = match kind {
+        4 | 7 => {
+            // Zero degrees runs from the bottom up; DrawingML's from the left.
+            let a = fixed(p.get(0x018B).unwrap_or(0));
+            GradientKind::Linear((270.0 - a).rem_euclid(360.0))
+        }
+        5 | 8 => {
+            let r = |id: u16| {
+                (fixed(p.get(id).unwrap_or(0)).clamp(0.0, 1.0) * 100_000.0).round() as i32
+            };
+            let (l, t, rr, b) = (r(0x018D), r(0x018E), r(0x018F), r(0x0190));
+            stops = stops
+                .iter()
+                .rev()
+                .map(|(pos, c)| (100_000 - pos, *c))
+                .collect();
+            GradientKind::Path("rect", [l, t, 100_000 - rr, 100_000 - b])
+        }
+        _ => {
+            stops = stops
+                .iter()
+                .rev()
+                .map(|(pos, c)| (100_000 - pos, *c))
+                .collect();
+            GradientKind::Path("shape", [50_000, 50_000, 50_000, 50_000])
+        }
+    };
+    stops.sort_by_key(|s| s.0);
+    Fill::Gradient(Gradient { stops, kind })
+}
+
+fn arrow(kind: Option<u32>, w: Option<u32>, l: Option<u32>) -> Option<Arrow> {
+    let kind = match kind? {
+        1 => "triangle",
+        2 => "stealth",
+        3 => "diamond",
+        4 => "oval",
+        5..=7 => "arrow",
+        _ => return None,
+    };
+    let size = |v: Option<u32>| match v.unwrap_or(1) {
+        0 => "sm",
+        2 => "lg",
+        _ => "med",
+    };
+    Some(Arrow {
+        kind,
+        w: size(w),
+        len: size(l),
+    })
+}
+
+pub fn line(p: &Props, refs: &Refs) -> Line {
+    if p.flag(0x01FF, 3) == Some(false) {
+        return Line::default();
+    }
+    let width = p
+        .get(0x01CB)
+        .map(|w| i64::from(w as i32))
+        .unwrap_or(9525)
+        .max(0);
+    Line {
+        fill: Fill::Solid(Color {
+            rgb: refs.line,
+            alpha: alpha(p.get(0x01C1)),
+        }),
+        width,
+        dash: match p.get(0x01CE).unwrap_or(0) {
+            1 | 6 => Some("dash"),
+            2 => Some("sysDot"),
+            3 | 8 => Some("dashDot"),
+            4 => Some("sysDashDotDot"),
+            5 => Some("dot"),
+            7 => Some("lgDash"),
+            9 => Some("lgDashDot"),
+            10 => Some("lgDashDotDot"),
+            _ => None,
+        },
+        cap: match p.get(0x01D7) {
+            Some(0) => Some("rnd"),
+            Some(1) => Some("sq"),
+            Some(2) => Some("flat"),
+            _ => None,
+        },
+        join: match p.get(0x01D6) {
+            Some(0) => Some("bevel"),
+            Some(1) => Some("miter"),
+            Some(2) => Some("round"),
+            _ => None,
+        },
+        compound: match p.get(0x01CD).unwrap_or(0) {
+            1 => Some("dbl"),
+            2 => Some("thickThin"),
+            3 => Some("thinThick"),
+            4 => Some("tri"),
+            _ => None,
+        },
+        head: arrow(p.get(0x01D0), p.get(0x01D2), p.get(0x01D3)),
+        tail: arrow(p.get(0x01D1), p.get(0x01D4), p.get(0x01D5)),
+    }
+}
+
+pub fn shadow(p: &Props, refs: &Refs) -> Option<Shadow> {
+    if p.flag(0x023F, 1) != Some(true) {
+        return None;
+    }
+    let dx = p.int(0x0205).unwrap_or(25400) as f64;
+    let dy = p.int(0x0206).unwrap_or(25400) as f64;
+    Some(Shadow {
+        color: Color {
+            rgb: refs.shadow,
+            alpha: alpha(p.get(0x0204)),
+        },
+        blur: 0,
+        dist: dx.hypot(dy).round() as Emu,
+        dir: dy.atan2(dx).to_degrees(),
+    })
+}
+
+/// Points along an elliptical arc as cubic Béziers: centre, radii, start
+/// angle and sweep in radians.
+fn arc_cubics(cx: f64, cy: f64, rx: f64, ry: f64, start: f64, sweep: f64, out: &mut Vec<PathCmd>) {
+    let n = (sweep.abs() / std::f64::consts::FRAC_PI_2)
+        .ceil()
+        .clamp(1.0, 16.0) as usize;
+    let step = sweep / n as f64;
+    let k = 4.0 / 3.0 * (step / 4.0).tan();
+    let mut a = start;
+    for _ in 0..n {
+        let b = a + step;
+        let (ca, sa, cb, sb) = (a.cos(), a.sin(), b.cos(), b.sin());
+        let p1 = (cx + rx * (ca - k * sa), cy + ry * (sa + k * ca));
+        let p2 = (cx + rx * (cb + k * sb), cy + ry * (sb - k * cb));
+        let p3 = (cx + rx * cb, cy + ry * sb);
+        out.push(PathCmd::Cubic(
+            p1.0.round() as i64,
+            p1.1.round() as i64,
+            p2.0.round() as i64,
+            p2.1.round() as i64,
+            p3.0.round() as i64,
+            p3.1.round() as i64,
+        ));
+        a = b;
+    }
+}
+
+/// A custom geometry from pVertices and pSegmentInfo, or `None`.
+pub fn custom(p: &Props) -> Option<Geometry> {
+    let verts = array(p.complex(0x0145)?);
+    if verts.is_empty() {
+        return None;
+    }
+    let pts: Vec<(i64, i64)> = verts
+        .iter()
+        .map(|e| {
+            let mut c = Cur::new(e);
+            if e.len() >= 8 {
+                (c.i32().into(), c.i32().into())
+            } else {
+                (c.i16().into(), c.i16().into())
+            }
+        })
+        .collect();
+    let left = i64::from(p.int(0x0140).unwrap_or(0));
+    let top = i64::from(p.int(0x0141).unwrap_or(0));
+    let right = i64::from(p.int(0x0142).unwrap_or(21600));
+    let bottom = i64::from(p.int(0x0143).unwrap_or(21600));
+    let fill_ok = p.flag(0x017F, 0) != Some(false);
+    let line_ok = p.flag(0x017F, 3) != Some(false);
+    let mut path = Path {
+        w: (right - left).max(1),
+        h: (bottom - top).max(1),
+        fill: fill_ok,
+        stroke: line_ok,
+        cmds: vec![],
+    };
+    let at = |i: usize| pts.get(i).map(|&(x, y)| (x - left, y - top));
+    let mut k = 0usize;
+    let segs: Vec<u16> = p
+        .complex(0x0146)
+        .map(|d| array(d).iter().map(|e| Cur::new(e).u16()).collect())
+        .unwrap_or_default();
+    if segs.is_empty() {
+        let mut first = true;
+        for i in 0..pts.len() {
+            let (x, y) = at(i)?;
+            path.cmds.push(if first {
+                PathCmd::Move(x, y)
+            } else {
+                PathCmd::Line(x, y)
+            });
+            first = false;
+        }
+        return Some(Geometry::Custom(vec![path]));
+    }
+    let mut started = false;
+    for s in segs.iter().take(1 << 16) {
+        let typ = s >> 13;
+        let n = usize::from(s & 0x1FFF);
+        match typ {
+            0 => {
+                for _ in 0..n.max(1) {
+                    let Some((x, y)) = at(k) else { break };
+                    k += 1;
+                    path.cmds.push(if started {
+                        PathCmd::Line(x, y)
+                    } else {
+                        PathCmd::Move(x, y)
+                    });
+                    started = true;
+                }
+            }
+            1 => {
+                for _ in 0..n.max(1) {
+                    let (Some(a), Some(b), Some(c)) = (at(k), at(k + 1), at(k + 2)) else {
+                        break;
+                    };
+                    k += 3;
+                    if !started {
+                        path.cmds.push(PathCmd::Move(a.0, a.1));
+                        started = true;
+                    }
+                    path.cmds.push(PathCmd::Cubic(a.0, a.1, b.0, b.1, c.0, c.1));
+                }
+            }
+            2 => {
+                if let Some((x, y)) = at(k) {
+                    path.cmds.push(PathCmd::Move(x, y));
+                    started = true;
+                }
+                k += 1;
+            }
+            3 => path.cmds.push(PathCmd::Close),
+            4 => started = false,
+            5 | 6 => {
+                let esc = (s >> 8) & 0x1F;
+                let n = usize::from(s & 0xFF);
+                match esc {
+                    // Arcs: bounding box corners, then the start and end radial points.
+                    3..=6 => {
+                        for _ in 0..(n / 4).max(1) {
+                            let (Some(a), Some(b), Some(st), Some(en)) =
+                                (at(k), at(k + 1), at(k + 2), at(k + 3))
+                            else {
+                                break;
+                            };
+                            k += 4;
+                            let (cx, cy) = ((a.0 + b.0) as f64 / 2.0, (a.1 + b.1) as f64 / 2.0);
+                            let (rx, ry) = (
+                                ((b.0 - a.0) as f64 / 2.0).abs(),
+                                ((b.1 - a.1) as f64 / 2.0).abs(),
+                            );
+                            if rx < 1.0 || ry < 1.0 {
+                                continue;
+                            }
+                            let ang = |p: (i64, i64)| {
+                                ((p.1 as f64 - cy) / ry).atan2((p.0 as f64 - cx) / rx)
+                            };
+                            let (a0, a1) = (ang(st), ang(en));
+                            let clockwise = esc == 5 || esc == 6;
+                            let mut sweep = a1 - a0;
+                            let tau = std::f64::consts::TAU;
+                            if clockwise {
+                                if sweep <= 0.0 {
+                                    sweep += tau;
+                                }
+                            } else if sweep >= 0.0 {
+                                sweep -= tau;
+                            }
+                            let sx = cx + rx * a0.cos();
+                            let sy = cy + ry * a0.sin();
+                            let (sx, sy) = (sx.round() as i64, sy.round() as i64);
+                            if started && (esc == 3 || esc == 5) {
+                                path.cmds.push(PathCmd::Line(sx, sy));
+                            } else {
+                                path.cmds.push(PathCmd::Move(sx, sy));
+                            }
+                            started = true;
+                            arc_cubics(cx, cy, rx, ry, a0, sweep, &mut path.cmds);
+                        }
+                    }
+                    // Quadrants: an elliptical quarter to the next point.
+                    7 | 8 => {
+                        for i in 0..n.max(1) {
+                            let Some(end) = at(k) else { break };
+                            k += 1;
+                            let cur = last_point(&path.cmds).unwrap_or(end);
+                            let x_first = (esc == 7) == (i % 2 == 0);
+                            let ctrl = if x_first {
+                                (end.0, cur.1)
+                            } else {
+                                (cur.0, end.1)
+                            };
+                            let kk = 0.5523;
+                            let c1 = (
+                                cur.0 + ((ctrl.0 - cur.0) as f64 * kk) as i64,
+                                cur.1 + ((ctrl.1 - cur.1) as f64 * kk) as i64,
+                            );
+                            let c2 = (
+                                end.0 + ((ctrl.0 - end.0) as f64 * kk) as i64,
+                                end.1 + ((ctrl.1 - end.1) as f64 * kk) as i64,
+                            );
+                            if !started {
+                                path.cmds.push(PathCmd::Move(cur.0, cur.1));
+                                started = true;
+                            }
+                            path.cmds
+                                .push(PathCmd::Cubic(c1.0, c1.1, c2.0, c2.1, end.0, end.1));
+                        }
+                    }
+                    // No fill, no line.
+                    0xA => path.fill = false,
+                    0xB => path.stroke = false,
+                    // Angle ellipses: centre, radii, then start angle and
+                    // sweep (16.16 degrees, counterclockwise).
+                    1 | 2 => {
+                        for _ in 0..(n / 3).max(1) {
+                            let (Some(c), Some(r), Some(a)) =
+                                (at(k), pts.get(k + 1).copied(), pts.get(k + 2).copied())
+                            else {
+                                break;
+                            };
+                            k += 3;
+                            let (cx, cy) = (c.0 as f64, c.1 as f64);
+                            let (rx, ry) = (r.0 as f64, r.1 as f64);
+                            let st = -(a.0 as f64 / 65536.0).to_radians();
+                            let sw = -(a.1 as f64 / 65536.0).to_radians();
+                            let sx = (cx + rx * st.cos()).round() as i64;
+                            let sy = (cy + ry * st.sin()).round() as i64;
+                            if esc == 1 && started {
+                                path.cmds.push(PathCmd::Line(sx, sy));
+                            } else {
+                                path.cmds.push(PathCmd::Move(sx, sy));
+                            }
+                            started = true;
+                            arc_cubics(cx, cy, rx.abs(), ry.abs(), st, sw, &mut path.cmds);
+                        }
+                    }
+                    _ => k += n,
+                }
+            }
+            _ => {}
+        }
+    }
+    if path.cmds.is_empty() {
+        return None;
+    }
+    Some(Geometry::Custom(vec![path]))
+}
+
+fn last_point(cmds: &[PathCmd]) -> Option<(i64, i64)> {
+    cmds.iter().rev().find_map(|c| match *c {
+        PathCmd::Move(x, y) | PathCmd::Line(x, y) => Some((x, y)),
+        PathCmd::Cubic(_, _, _, _, x, y) => Some((x, y)),
+        PathCmd::Quad(_, _, x, y) => Some((x, y)),
+        _ => None,
+    })
+}
+
+/// The shape's position: from its client anchor (master units) or, in a
+/// group, its child anchor (the group's units). A shape turned by 45 to 135
+/// degrees (or 225 to 315) stores the box it covers turned: its own box is
+/// that one with width and height swapped about the centre.
+pub fn xfrm(s: &OShape, in_group: bool) -> Option<Xfrm> {
+    let (r, scale): ([i32; 4], f64) = if in_group {
+        (s.child.or(s.anchor)?, 1.0)
+    } else {
+        (s.anchor.or(s.child)?, 1587.5)
+    };
+    let mut x = (f64::from(r[0]) * scale).round() as Emu;
+    let mut y = (f64::from(r[1]) * scale).round() as Emu;
+    let mut w = (f64::from(r[2].saturating_sub(r[0])) * scale).round() as Emu;
+    let mut h = (f64::from(r[3].saturating_sub(r[1])) * scale).round() as Emu;
+    let rot = s.props.get(0x0004).map(fixed).unwrap_or(0.0);
+    let norm = rot.rem_euclid(360.0);
+    if (45.0..135.0).contains(&norm) || (225.0..315.0).contains(&norm) {
+        let (cx, cy) = (x + w / 2, y + h / 2);
+        std::mem::swap(&mut w, &mut h);
+        x = cx - w / 2;
+        y = cy - h / 2;
+    }
+    Some(Xfrm {
+        x,
+        y,
+        w: w.max(0),
+        h: h.max(0),
+        rot,
+        flip_h: s.flags & F_FLIP_H != 0,
+        flip_v: s.flags & F_FLIP_V != 0,
+    })
+}
+
+/// Geometry of a non-group shape: its own path when it has one (vertices
+/// and segments, or vertices alone without a known type), whatever its
+/// type says, else its type's preset.
+pub fn geometry(s: &OShape, w: Emu, h: Emu) -> Geometry {
+    let own = s.props.complex(0x0146).is_some() || presets::name(s.spt).is_none();
+    if let Some(g) = custom(&s.props).filter(|_| own) {
+        return g;
+    }
+    presets::geometry(s.spt, &s.props, w, h).unwrap_or_default()
+}
+
+/// Text insets, anchor and wrap of a shape's text body.
+pub fn body_props(p: &Props) -> BodyProps {
+    let ins = |id: u16, d: i32| Emu::from(p.int(id).unwrap_or(d).max(0));
+    let (anchor, ctr) = match p.get(0x0087).unwrap_or(0) {
+        1 | 4 => ("ctr", false),
+        2 | 5 | 7 | 9 => ("b", false),
+        _ => ("t", false),
+    };
+    let ctr = ctr || matches!(p.get(0x0087), Some(3 | 4 | 5 | 8 | 9));
+    BodyProps {
+        insets: [
+            ins(0x0081, 91440),
+            ins(0x0082, 45720),
+            ins(0x0083, 91440),
+            ins(0x0084, 45720),
+        ],
+        anchor,
+        anchor_ctr: ctr,
+        wrap: p.get(0x0085).unwrap_or(0) != 2,
+        vert: match p.get(0x0088).unwrap_or(0) {
+            1 | 5 => Some("vert"),
+            2 => Some("vert270"),
+            3 => Some("eaVert"),
+            _ => None,
+        },
+        autofit: if p.flag(0x00BF, 1) == Some(true) {
+            Autofit::Shape
+        } else {
+            Autofit::None
+        },
+        rot: 0.0,
+        columns: 1,
+    }
+}
+
+/// A WordArt shape's text: one centred paragraph per line, in the shape's
+/// fill colour, its font size the given one or the shape's height.
+pub fn word_art(p: &Props, text: &str, refs: &Refs, ctx: &Ctx, h: Emu) -> TextBody {
+    let color = match fill(p, ctx, refs) {
+        Fill::Solid(c) => c,
+        Fill::Gradient(g) => g.stops.first().map(|s| s.1).unwrap_or(Color::rgb(0)),
+        _ => Color::rgb(refs.fill),
+    };
+    let lines: Vec<&str> = text.split(['\n', '\r']).filter(|l| !l.is_empty()).collect();
+    let n = lines.len().max(1) as f64;
+    let fit = (h as f64 / 12700.0 / n * 0.75).clamp(1.0, 400.0);
+    let size = p
+        .get(0x00C3)
+        .map(fixed)
+        .filter(|&s| s > 0.0 && p.flag(0x00FF, 8) != Some(true))
+        .unwrap_or(fit);
+    let props = RunProps {
+        size: Some((size.min(fit.max(1.0)) * 100.0).round() as u32),
+        bold: p.flag(0x00FF, 5),
+        italic: p.flag(0x00FF, 4),
+        color: Some(color),
+        font: p.complex(0x00C5).map(utf16).filter(|f| !f.is_empty()),
+        ..RunProps::default()
+    };
+    TextBody {
+        body: BodyProps {
+            insets: [0; 4],
+            anchor: "ctr",
+            wrap: false,
+            ..BodyProps::default()
+        },
+        paras: lines
+            .iter()
+            .map(|l| Paragraph {
+                props: ParaProps {
+                    align: Some("ctr"),
+                    bullet: Some(Bullet::None),
+                    ..ParaProps::default()
+                },
+                runs: vec![Run {
+                    kind: RunKind::Text(l.to_string()),
+                    props: props.clone(),
+                }],
+                end: props.clone(),
+            })
+            .collect(),
+        levels: ListStyle::default(),
+    }
+}
+
+fn utf16(d: &[u8]) -> String {
+    let u: Vec<u16> = d
+        .as_chunks::<2>()
+        .0
+        .iter()
+        .map(|b| u16::from_le_bytes(*b))
+        .take(1 << 16)
+        .collect();
+    let end = u.iter().position(|&c| c == 0).unwrap_or(u.len());
+    String::from_utf16_lossy(&u[..end])
+}
+
+/// A picture's crop, in 1/100000 of each side.
+pub fn crop(p: &Props) -> [i32; 4] {
+    let f = |id: u16| {
+        (fixed(p.get(id).unwrap_or(0)) * 100_000.0)
+            .round()
+            .clamp(-1e7, 1e7) as i32
+    };
+    [f(0x0102), f(0x0100), f(0x0103), f(0x0101)]
+}
+
+pub fn is_connector(s: &OShape) -> bool {
+    s.flags & F_CONNECTOR != 0 || matches!(s.spt, 20 | 32..=40)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::ppt::escher::Prop;
+
+    #[test]
+    fn colours_scheme_rgb_and_system() {
+        let scheme = [0x111111, 0x222222, 0, 0, 0x555555, 0, 0, 0];
+        let refs = Refs {
+            fill: 0x808080,
+            ..Refs::default()
+        };
+        assert_eq!(color(0x0033_2211, &scheme, &refs), 0x112233);
+        assert_eq!(color(0x0800_0004, &scheme, &refs), 0x555555);
+        // The fill colour darkened to half.
+        assert_eq!(color(0x1080_01F0, &scheme, &refs), 0x404040);
+    }
+
+    #[test]
+    fn rotated_anchor_is_swapped() {
+        let s = OShape {
+            anchor: Some([0, 0, 576, 288]),
+            props: Props(vec![Prop {
+                id: 4,
+                value: 90 << 16,
+                complex: None,
+            }]),
+            ..OShape::default()
+        };
+        let x = xfrm(&s, false).unwrap();
+        assert_eq!((x.w, x.h), (457_200, 914_400));
+        assert_eq!((x.x, x.y), (228_600, -228_600));
+        assert_eq!(x.rot, 90.0);
+    }
+
+    #[test]
+    fn freeform_path_from_vertices_and_segments() {
+        // Three points, moveTo, lineTo 2, close, end.
+        let mut v = vec![3, 0, 3, 0, 4, 0];
+        for (x, y) in [(0i16, 0i16), (100, 0), (100, 50)] {
+            v.extend(x.to_le_bytes());
+            v.extend(y.to_le_bytes());
+        }
+        let mut s = vec![4, 0, 4, 0, 2, 0];
+        for seg in [0x4000u16, 0x0002, 0x6001, 0x8000] {
+            s.extend(seg.to_le_bytes());
+        }
+        let p = Props(vec![
+            Prop {
+                id: 0x0145,
+                value: 0,
+                complex: Some(&v),
+            },
+            Prop {
+                id: 0x0146,
+                value: 0,
+                complex: Some(&s),
+            },
+        ]);
+        let Some(Geometry::Custom(paths)) = custom(&p) else {
+            panic!("no path")
+        };
+        let cmds: Vec<String> = paths[0].cmds.iter().map(|c| format!("{c:?}")).collect();
+        assert_eq!(
+            cmds,
+            vec!["Move(0, 0)", "Line(100, 0)", "Line(100, 50)", "Close"]
+        );
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/ppt/text.rs b/crates/exav-render/src/formats/office/slides/ppt/text.rs
new file mode 100644
index 00000000..4f2e9bbc
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/ppt/text.rs
@@ -0,0 +1,1020 @@
+//! PPT text ([MS-PPT] 2.9): character and paragraph exceptions (CF, PF),
+//! master text styles, a text body's atoms, and their resolution into the
+//! model's paragraphs and runs with every property explicit.
+
+use super::pp9::{NO_NUMBERING, Pf9};
+use super::records::Rec;
+use super::rt;
+use crate::formats::office::common::bytes::Cur;
+use crate::formats::office::slides::model::*;
+
+/// Master units (576 per inch) to EMU.
+pub fn mu(v: i32) -> Emu {
+    (f64::from(v) * 1587.5).round() as Emu
+}
+
+/// A colour of text: a scheme index (0 to 7) or RGB.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum TColor {
+    Scheme(u8),
+    Rgb(Rgb),
+}
+
+fn color_index(c: &mut Cur) -> Option<TColor> {
+    let (r, g, b, i) = (c.u8(), c.u8(), c.u8(), c.u8());
+    match i {
+        0xFE => Some(TColor::Rgb(
+            u32::from(r) << 16 | u32::from(g) << 8 | u32::from(b),
+        )),
+        0..=7 => Some(TColor::Scheme(i)),
+        _ => None,
+    }
+}
+
+/// Character exception ([MS-PPT] 2.9.14).
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Cf {
+    pub bold: Option<bool>,
+    pub italic: Option<bool>,
+    pub underline: Option<bool>,
+    pub shadow: Option<bool>,
+    pub emboss: Option<bool>,
+    pub font: Option<u16>,
+    pub ea_font: Option<u16>,
+    pub sym_font: Option<u16>,
+    pub size: Option<u16>,
+    pub color: Option<TColor>,
+    pub position: Option<i16>,
+    /// The run grouping of the PP9 extension's items (CFStyle.pp9rt).
+    pub pp9rt: Option<u8>,
+}
+
+impl Cf {
+    pub fn overlay(&mut self, o: &Cf) {
+        macro_rules! over {
+            ($($f:ident),*) => { $( if o.$f.is_some() { self.$f = o.$f; } )* };
+        }
+        over!(
+            bold, italic, underline, shadow, emboss, font, ea_font, sym_font, size, color,
+            position, pp9rt
+        );
+    }
+}
+
+pub fn read_cf(c: &mut Cur) -> Cf {
+    let m = c.u32();
+    let mut cf = Cf::default();
+    let bit = |n: u32| m & (1 << n) != 0;
+    // bold, italic, underline, shadow, fehint, kumi, emboss, fHasStyle.
+    if m & 0x0000_3EF7 != 0 {
+        let s = c.u16();
+        let get = |n: u32| s & (1 << n) != 0;
+        if bit(0) {
+            cf.bold = Some(get(0));
+        }
+        if bit(1) {
+            cf.italic = Some(get(1));
+        }
+        if bit(2) {
+            cf.underline = Some(get(2));
+        }
+        if bit(4) {
+            cf.shadow = Some(get(4));
+        }
+        if bit(9) {
+            cf.emboss = Some(get(9));
+        }
+        // The style bits' own field holds the run grouping.
+        if m & 0x0000_3C00 != 0 {
+            cf.pp9rt = Some(((s >> 10) & 0xF) as u8);
+        }
+    }
+    if bit(16) {
+        cf.font = Some(c.u16());
+    }
+    if bit(21) {
+        cf.ea_font = Some(c.u16());
+    }
+    if bit(22) {
+        // The ANSI font: read past it.
+        c.u16();
+    }
+    if bit(23) {
+        cf.sym_font = Some(c.u16());
+    }
+    if bit(17) {
+        cf.size = Some(c.u16());
+    }
+    if bit(18) {
+        cf.color = color_index(c);
+    }
+    if bit(19) {
+        cf.position = Some(c.i16());
+    }
+    cf
+}
+
+/// Paragraph exception ([MS-PPT] 2.9.20).
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Pf {
+    pub has_bullet: Option<bool>,
+    pub bullet_has_font: Option<bool>,
+    pub bullet_has_color: Option<bool>,
+    pub bullet_has_size: Option<bool>,
+    pub bullet_char: Option<u16>,
+    pub bullet_font: Option<u16>,
+    pub bullet_size: Option<i16>,
+    pub bullet_color: Option<TColor>,
+    pub align: Option<u16>,
+    pub line_spacing: Option<i16>,
+    pub space_before: Option<i16>,
+    pub space_after: Option<i16>,
+    pub margin: Option<i16>,
+    pub indent: Option<i16>,
+    pub default_tab: Option<u16>,
+    pub tabs: Option<Vec<(i16, u16)>>,
+    pub rtl: Option<bool>,
+    /// From the PP9 extension: an automatic numbering scheme and start.
+    pub autonum: Option<(u16, u16)>,
+    /// From the PP9 extension: the index of a picture bullet.
+    pub bullet_blip: Option<u16>,
+}
+
+impl Pf {
+    pub fn overlay(&mut self, o: &Pf) {
+        macro_rules! over {
+            ($($f:ident),*) => { $( if o.$f.is_some() { self.$f = o.$f.clone(); } )* };
+        }
+        over!(
+            has_bullet,
+            bullet_has_font,
+            bullet_has_color,
+            bullet_has_size,
+            bullet_char,
+            bullet_font,
+            bullet_size,
+            bullet_color,
+            align,
+            line_spacing,
+            space_before,
+            space_after,
+            margin,
+            indent,
+            default_tab,
+            tabs,
+            rtl,
+            autonum,
+            bullet_blip
+        );
+    }
+
+    /// Takes what a PP9 paragraph extension sets.
+    pub fn overlay9(&mut self, p: &Pf9) {
+        if p.blip.is_some() {
+            self.bullet_blip = p.blip;
+        }
+        if let Some((scheme, start)) = p.autonum {
+            self.autonum = (scheme != NO_NUMBERING).then_some((scheme, start));
+            // Numbering turned off leaves any picture bullet alone.
+        }
+    }
+}
+
+fn tab_stops(c: &mut Cur) -> Vec<(i16, u16)> {
+    let n = c.u16().min(64);
+    let mut v = Vec::with_capacity(n.into());
+    for _ in 0..n {
+        let pos = c.i16();
+        let t = c.u16();
+        v.push((pos, t));
+    }
+    v
+}
+
+pub fn read_pf(c: &mut Cur) -> Pf {
+    let m = c.u32();
+    let bit = |n: u32| m & (1 << n) != 0;
+    let mut pf = Pf::default();
+    if m & 0xF != 0 {
+        let f = c.u16();
+        let get = |n: u32| f & (1 << n) != 0;
+        if bit(0) {
+            pf.has_bullet = Some(get(0));
+        }
+        if bit(1) {
+            pf.bullet_has_font = Some(get(1));
+        }
+        if bit(2) {
+            pf.bullet_has_color = Some(get(2));
+        }
+        if bit(3) {
+            pf.bullet_has_size = Some(get(3));
+        }
+    }
+    if bit(7) {
+        pf.bullet_char = Some(c.u16());
+    }
+    if bit(4) {
+        pf.bullet_font = Some(c.u16());
+    }
+    if bit(6) {
+        pf.bullet_size = Some(c.i16());
+    }
+    if bit(5) {
+        pf.bullet_color = color_index(c);
+    }
+    if bit(11) {
+        pf.align = Some(c.u16());
+    }
+    if bit(12) {
+        pf.line_spacing = Some(c.i16());
+    }
+    if bit(13) {
+        pf.space_before = Some(c.i16());
+    }
+    if bit(14) {
+        pf.space_after = Some(c.i16());
+    }
+    if bit(8) {
+        pf.margin = Some(c.i16());
+    }
+    if bit(10) {
+        pf.indent = Some(c.i16());
+    }
+    if bit(15) {
+        pf.default_tab = Some(c.u16());
+    }
+    if bit(20) {
+        pf.tabs = Some(tab_stops(c));
+    }
+    if bit(16) {
+        c.u16(); // font alignment
+    }
+    if m & (7 << 17) != 0 {
+        c.u16(); // wrap flags
+    }
+    if bit(21) {
+        pf.rtl = Some(c.u16() == 1);
+    }
+    pf
+}
+
+/// A master's text style for one text type: five levels.
+#[derive(Clone, Debug, Default)]
+pub struct Levels(pub [(Pf, Cf); 5]);
+
+/// A TextMasterStyleAtom.
+pub fn read_master_style(r: &Rec) -> Levels {
+    let mut c = r.cur();
+    let n = c.u16().min(5);
+    let mut out = Levels::default();
+    for i in 0..n as usize {
+        let level = if r.inst >= 5 { c.u16() as usize } else { i };
+        let pf = read_pf(&mut c);
+        let cf = read_cf(&mut c);
+        if c.short {
+            break;
+        }
+        if let Some(slot) = out.0.get_mut(level) {
+            *slot = (pf, cf);
+        }
+    }
+    out
+}
+
+/// A tab stop type to DrawingML.
+fn tab_kind(t: u16) -> &'static str {
+    match t {
+        1 => "ctr",
+        2 => "r",
+        3 => "dec",
+        _ => "l",
+    }
+}
+
+/// A text ruler ([MS-PPT] 2.9.30): margins and indents per level, tabs.
+#[derive(Clone, Debug, Default)]
+pub struct Ruler {
+    pub default_tab: Option<u16>,
+    pub tabs: Option<Vec<(i16, u16)>>,
+    pub margin: [Option<i16>; 5],
+    pub indent: [Option<i16>; 5],
+}
+
+pub fn read_ruler(d: &[u8]) -> Ruler {
+    let mut c = Cur::new(d);
+    let m = c.u32();
+    let bit = |n: u32| m & (1 << n) != 0;
+    let mut r = Ruler::default();
+    if bit(1) {
+        c.u16(); // levels
+    }
+    if bit(0) {
+        r.default_tab = Some(c.u16());
+    }
+    if bit(2) {
+        r.tabs = Some(tab_stops(&mut c));
+    }
+    for k in 0..5 {
+        if bit(3 + k) {
+            r.margin[k as usize] = Some(c.i16());
+        }
+        if bit(8 + k) {
+            r.indent[k as usize] = Some(c.i16());
+        }
+    }
+    r
+}
+
+#[derive(Clone, Debug)]
+pub enum Meta {
+    SlideNumber,
+    DateTime,
+    Footer,
+    Header,
+}
+
+/// A text body's atoms, as read.
+#[derive(Clone, Debug, Default)]
+pub struct RawText {
+    pub text_type: u32,
+    pub chars: Vec<u16>,
+    pub pf_runs: Vec<(u32, u16, Pf)>,
+    pub cf_runs: Vec<(u32, Cf)>,
+    pub ruler: Option<Ruler>,
+    /// Indent levels of a master's text without a style atom.
+    pub master_levels: Vec<(u32, u16)>,
+    pub meta: Vec<(u32, Meta)>,
+    /// Character ranges and the InteractiveInfoAtom of their links.
+    pub link_info: Vec<(u32, u32, [u8; 16])>,
+    /// The PP9 paragraph extensions of the shape this text is in.
+    pub pp9: Vec<Pf9>,
+}
+
+/// Groups `records` (a SlideListWithText's or a client textbox's) into text
+/// bodies, each starting at a TextHeaderAtom.
+pub fn read_bodies<'a>(records: impl Iterator<Item = Rec<'a>>) -> Vec<RawText> {
+    let mut out: Vec<RawText> = vec![];
+    let mut pending_link: Option<[u8; 16]> = None;
+    for r in records {
+        if r.typ == rt::TEXT_HEADER {
+            out.push(RawText {
+                text_type: Cur::new(r.data).u32(),
+                ..RawText::default()
+            });
+            continue;
+        }
+        if r.typ == rt::TEXT_RULER {
+            // A ruler may come before the header (an outline reference's).
+            if let Some(t) = out.last_mut() {
+                t.ruler = Some(read_ruler(r.data));
+            }
+            continue;
+        }
+        let Some(t) = out.last_mut() else {
+            continue;
+        };
+        match r.typ {
+            rt::TEXT_CHARS => {
+                t.chars = r
+                    .data
+                    .as_chunks::<2>()
+                    .0
+                    .iter()
+                    .map(|b| u16::from_le_bytes(*b))
+                    .take(1 << 20)
+                    .collect()
+            }
+            rt::TEXT_BYTES => {
+                t.chars = r.data.iter().take(1 << 20).map(|&b| u16::from(b)).collect()
+            }
+            rt::STYLE_TEXT_PROP => {
+                let total = t.chars.len() as u32 + 1;
+                let mut c = r.cur();
+                let mut seen = 0u32;
+                while seen < total && !c.short && t.pf_runs.len() < 1 << 16 {
+                    let n = c.u32();
+                    let level = c.u16();
+                    let pf = read_pf(&mut c);
+                    if c.short || n == 0 {
+                        break;
+                    }
+                    seen = seen.saturating_add(n);
+                    t.pf_runs.push((n, level.min(4), pf));
+                }
+                let mut seen = 0u32;
+                while seen < total && !c.short && t.cf_runs.len() < 1 << 16 {
+                    let n = c.u32();
+                    let cf = read_cf(&mut c);
+                    if c.short || n == 0 {
+                        break;
+                    }
+                    seen = seen.saturating_add(n);
+                    t.cf_runs.push((n, cf));
+                }
+            }
+            rt::MASTER_TEXT_PROP => {
+                let mut c = r.cur();
+                while c.left() >= 6 && t.master_levels.len() < 1 << 16 {
+                    let n = c.u32();
+                    let level = c.u16();
+                    t.master_levels.push((n, level.min(4)));
+                }
+            }
+            rt::SLIDE_NUMBER_MC => t.meta.push((Cur::new(r.data).u32(), Meta::SlideNumber)),
+            rt::DATE_TIME_MC | rt::GENERIC_DATE_MC | rt::RTF_DATE_TIME_MC => {
+                t.meta.push((Cur::new(r.data).u32(), Meta::DateTime))
+            }
+            rt::FOOTER_MC => t.meta.push((Cur::new(r.data).u32(), Meta::Footer)),
+            rt::HEADER_MC => t.meta.push((Cur::new(r.data).u32(), Meta::Header)),
+            rt::INTERACTIVE_INFO => {
+                pending_link = r
+                    .child(rt::INTERACTIVE_INFO_ATOM)
+                    .and_then(|a| a.data.get(..16))
+                    .map(|b| {
+                        let mut x = [0u8; 16];
+                        x.copy_from_slice(b);
+                        x
+                    });
+            }
+            rt::TEXT_INTERACTIVE_INFO => {
+                let mut c = r.cur();
+                let (a, b) = (c.u32(), c.u32());
+                if let Some(info) = pending_link.take()
+                    && r.inst == 0
+                {
+                    t.link_info.push((a, b, info));
+                }
+            }
+            _ => {}
+        }
+    }
+    out
+}
+
+/// What resolving a body needs from its slide and document.
+pub struct TextCtx<'a> {
+    pub fonts: &'a [String],
+    pub scheme: &'a [Rgb; 8],
+    /// Resolved style of each level before the body's own exceptions.
+    pub base: &'a [(Pf, Cf); 5],
+    /// The slide's number, for slide number fields.
+    pub slide_number: usize,
+    pub footer: &'a str,
+    pub date: &'a str,
+    pub links: &'a dyn Fn(&[u8; 16]) -> Option<Link>,
+    /// The media index of each picture bullet, by its index.
+    pub bullet_media: &'a [Option<usize>],
+}
+
+fn rgb_of(c: TColor, scheme: &[Rgb; 8]) -> Rgb {
+    match c {
+        TColor::Rgb(v) => v,
+        TColor::Scheme(i) => scheme[usize::from(i) & 7],
+    }
+}
+
+fn font_name(fonts: &[String], i: u16) -> Option<String> {
+    fonts.get(usize::from(i)).filter(|s| !s.is_empty()).cloned()
+}
+
+/// A resolved CF as run properties.
+pub fn run_props(cf: &Cf, ctx: &TextCtx) -> RunProps {
+    RunProps {
+        size: cf.size.map(|s| u32::from(s.clamp(1, 4000)) * 100),
+        bold: cf.bold,
+        italic: cf.italic,
+        underline: cf.underline.map(|u| if u { "sng" } else { "none" }),
+        color: cf.color.map(|c| Color::rgb(rgb_of(c, ctx.scheme))),
+        font: cf.font.and_then(|f| font_name(ctx.fonts, f)),
+        ea_font: cf.ea_font.and_then(|f| font_name(ctx.fonts, f)),
+        sym_font: cf.sym_font.and_then(|f| font_name(ctx.fonts, f)),
+        baseline: cf
+            .position
+            .filter(|&p| p != 0)
+            .map(|p| i32::from(p.clamp(-100, 100)) * 1000),
+        shadow: cf.shadow.filter(|&s| s).map(|_| Shadow {
+            color: Color {
+                rgb: 0,
+                alpha: Some(40_000),
+            },
+            blur: 0,
+            dist: 19050,
+            dir: 45.0,
+        }),
+        ..RunProps::default()
+    }
+}
+
+fn spacing(v: i16) -> Spacing {
+    if v >= 0 {
+        Spacing::Pct(i32::from(v.min(13200)) * 1000)
+    } else {
+        // Master units: 8 per point.
+        Spacing::Pts((-i32::from(v)) * 100 / 8)
+    }
+}
+
+fn autonum_scheme(s: u16) -> &'static str {
+    match s {
+        0 => "alphaLcPeriod",
+        1 => "alphaUcPeriod",
+        2 => "arabicParenR",
+        3 => "arabicPeriod",
+        4 => "romanLcParenBoth",
+        5 => "romanLcParenR",
+        6 => "romanLcPeriod",
+        7 => "romanUcPeriod",
+        8 => "alphaLcParenBoth",
+        9 => "alphaLcParenR",
+        10 => "alphaUcParenBoth",
+        11 => "alphaUcParenR",
+        12 => "arabicParenBoth",
+        13 => "arabicPlain",
+        14 => "romanUcParenBoth",
+        15 => "romanUcParenR",
+        _ => "arabicPeriod",
+    }
+}
+
+/// A resolved PF as paragraph properties, with the ruler's margins.
+pub fn para_props(pf: &Pf, cf: &Cf, level: u16, ruler: Option<&Ruler>, ctx: &TextCtx) -> ParaProps {
+    let lv = usize::from(level.min(4));
+    let margin = ruler.and_then(|r| r.margin[lv]).or(pf.margin);
+    let indent = ruler.and_then(|r| r.indent[lv]).or(pf.indent);
+    let bullet = if pf.has_bullet == Some(true) {
+        let color = if pf.bullet_has_color == Some(true) {
+            pf.bullet_color.map(|c| Color::rgb(rgb_of(c, ctx.scheme)))
+        } else {
+            cf.color.map(|c| Color::rgb(rgb_of(c, ctx.scheme)))
+        };
+        let size = if pf.bullet_has_size == Some(true) {
+            pf.bullet_size
+                .filter(|&s| (25..=400).contains(&s))
+                .map(|s| u32::try_from(s).unwrap_or(100) * 1000)
+        } else {
+            None
+        };
+        let font = if pf.bullet_has_font == Some(true) {
+            pf.bullet_font.and_then(|f| font_name(ctx.fonts, f))
+        } else {
+            None
+        };
+        let picture = pf
+            .bullet_blip
+            .and_then(|b| ctx.bullet_media.get(usize::from(b)).copied().flatten());
+        match pf.autonum {
+            _ if let Some(media) = picture => Some(Bullet::Picture { media, size }),
+            Some((scheme, start)) => Some(Bullet::AutoNum {
+                scheme: autonum_scheme(scheme),
+                start: u32::from(start.max(1)),
+                font,
+                color,
+                size,
+            }),
+            None => {
+                let ch = pf
+                    .bullet_char
+                    .and_then(|c| char::from_u32(u32::from(c)))
+                    .filter(|c| !c.is_control())
+                    .unwrap_or('\u{2022}');
+                Some(Bullet::Char {
+                    ch,
+                    font,
+                    color,
+                    size,
+                })
+            }
+        }
+    } else {
+        Some(Bullet::None)
+    };
+    ParaProps {
+        level: level.min(4) as u8,
+        align: pf.align.map(|a| match a {
+            1 => "ctr",
+            2 => "r",
+            3 | 6 => "just",
+            4 | 5 => "dist",
+            _ => "l",
+        }),
+        margin: margin.map(|m| mu(m.into())),
+        indent: match (margin, indent) {
+            (Some(m), Some(i)) => Some(mu(i32::from(i) - i32::from(m))),
+            (None, Some(i)) => Some(mu(i.into())),
+            _ => None,
+        },
+        line_spacing: pf.line_spacing.map(spacing),
+        space_before: pf.space_before.map(spacing),
+        space_after: pf.space_after.map(spacing),
+        bullet,
+        tabs: ruler
+            .and_then(|r| r.tabs.as_ref())
+            .or(pf.tabs.as_ref())
+            .map(|t| {
+                t.iter()
+                    .map(|&(p, k)| (mu(p.into()), tab_kind(k)))
+                    .collect()
+            })
+            .unwrap_or_default(),
+        default_tab: ruler
+            .and_then(|r| r.default_tab)
+            .or(pf.default_tab)
+            .map(|t| mu(t.into())),
+        rtl: pf.rtl == Some(true),
+    }
+}
+
+/// Overlays on `levels` the formatting a master placeholder's own text
+/// carries: for each level, its first paragraph's exceptions and its first
+/// character's.
+pub fn overlay_levels(levels: &mut [(Pf, Cf); 5], t: &RawText) {
+    let mut done = [false; 5];
+    let mut start = 0u32;
+    let n = t.chars.len() as u32;
+    loop {
+        let end = (start..n)
+            .find(|&i| t.chars[i as usize] == 0x0D)
+            .unwrap_or(n);
+        if let Some((_, (level, pf))) = run_at_pf(&t.pf_runs, start) {
+            let lv = usize::from((*level).min(4));
+            if !done[lv] {
+                done[lv] = true;
+                levels[lv].0.overlay(pf);
+                if let Some(cf) = run_at(&t.cf_runs, start) {
+                    levels[lv].1.overlay(cf);
+                }
+            }
+        }
+        if end >= n {
+            break;
+        }
+        start = end + 1;
+    }
+}
+
+fn run_at_pf(runs: &[(u32, u16, Pf)], at: u32) -> Option<(u32, (&u16, &Pf))> {
+    let mut start = 0u32;
+    for (n, l, p) in runs {
+        if at < start.saturating_add(*n) {
+            return Some((*n, (l, p)));
+        }
+        start = start.saturating_add(*n);
+    }
+    None
+}
+
+/// The run of `runs` (counts) covering character `at`.
+fn run_at<T>(runs: &[(u32, T)], at: u32) -> Option<&T> {
+    let mut start = 0u32;
+    for (n, v) in runs {
+        if at < start.saturating_add(*n) {
+            return Some(v);
+        }
+        start = start.saturating_add(*n);
+    }
+    runs.last().map(|r| &r.1)
+}
+
+/// The body's paragraphs, every property resolved.
+pub fn paragraphs(t: &RawText, ctx: &TextCtx) -> Vec<Paragraph> {
+    let pf_runs: Vec<(u32, (u16, Pf))> = if t.pf_runs.is_empty() {
+        t.master_levels
+            .iter()
+            .map(|&(n, l)| (n, (l, Pf::default())))
+            .collect()
+    } else {
+        t.pf_runs
+            .iter()
+            .map(|(n, l, p)| (*n, (*l, p.clone())))
+            .collect()
+    };
+    let cf_runs: Vec<(u32, Cf)> = t.cf_runs.clone();
+    // For each character run, its sequence among those that share a PP9
+    // grouping, and the grouping.
+    let mut pp9_seq: Vec<(usize, u8)> = vec![];
+    for (i, (_, cf)) in cf_runs.iter().enumerate() {
+        let g = cf.pp9rt.unwrap_or(0);
+        let k = match pp9_seq.last() {
+            None => 0,
+            Some(&(k, prev)) if prev == g && i > 0 => k,
+            Some(&(k, _)) => k + 1,
+        };
+        pp9_seq.push((k, g));
+    }
+    let links: Vec<(u32, u32, Option<Link>)> = t
+        .link_info
+        .iter()
+        .map(|(a, b, i)| (*a, *b, (ctx.links)(i)))
+        .collect();
+
+    let mut out = vec![];
+    let n = t.chars.len() as u32;
+    let mut start = 0u32;
+    loop {
+        // The paragraph ends at a CR or the end of the text.
+        let end = (start..n)
+            .find(|&i| t.chars[i as usize] == 0x0D)
+            .unwrap_or(n);
+        let empty = (0u16, Pf::default());
+        let (level, own_pf) = run_at(&pf_runs, start).unwrap_or(&empty);
+        let lv = usize::from((*level).min(4));
+        let mut pf = ctx.base[lv].0.clone();
+        pf.overlay(own_pf);
+        // The PP9 item of the run of text this paragraph starts in. The
+        // items count runs that share a grouping; one whose number does not
+        // match its grouping is ignored.
+        if let Some(item) = pp9_seq
+            .get(run_index(&cf_runs, start))
+            .and_then(|&(k, rt9)| (k % 16 == usize::from(rt9)).then(|| t.pp9.get(k)).flatten())
+        {
+            pf.overlay9(item);
+        }
+        let mut first_cf = ctx.base[lv].1.clone();
+        if let Some(c) = run_at(&cf_runs, start) {
+            first_cf.overlay(c);
+        }
+        let props = para_props(&pf, &first_cf, *level, t.ruler.as_ref(), ctx);
+        let mut runs: Vec<Run> = vec![];
+        let mut i = start;
+        while i < end {
+            let mut cf = ctx.base[lv].1.clone();
+            if let Some(c) = run_at(&cf_runs, i) {
+                cf.overlay(c);
+            }
+            let mut rp = run_props(&cf, ctx);
+            rp.link = links
+                .iter()
+                .find(|(a, b, _)| i >= *a && i < *b)
+                .and_then(|l| l.2.clone());
+            if rp.link.is_some() {
+                rp.underline = Some("sng");
+            }
+            // Up to the next format change, special character or link edge.
+            let mut j = i;
+            let mut s = String::new();
+            let mut kind = None;
+            while j < end {
+                let ch = t.chars[j as usize];
+                if j > i
+                    && (run_index(&cf_runs, j) != run_index(&cf_runs, i)
+                        || link_index(&links, j) != link_index(&links, i))
+                {
+                    break;
+                }
+                if let Some(m) = t.meta.iter().find(|m| m.0 == j) {
+                    if j > i {
+                        break;
+                    }
+                    kind = Some(match m.1 {
+                        Meta::SlideNumber => {
+                            RunKind::Field("slidenum", ctx.slide_number.to_string())
+                        }
+                        Meta::DateTime => RunKind::Field("datetime", ctx.date.to_string()),
+                        Meta::Footer => RunKind::Text(ctx.footer.to_string()),
+                        Meta::Header => RunKind::Text(String::new()),
+                    });
+                    j += 1;
+                    break;
+                }
+                if ch == 0x0B {
+                    if j > i {
+                        break;
+                    }
+                    kind = Some(RunKind::Break);
+                    j += 1;
+                    break;
+                }
+                s.push_str(&decode_unit(&t.chars, j as usize));
+                if (0xD800..0xDC00).contains(&ch) && j + 1 < end {
+                    j += 1;
+                }
+                j += 1;
+            }
+            let kind = kind.unwrap_or(RunKind::Text(s));
+            runs.push(Run { kind, props: rp });
+            i = j.max(i + 1);
+        }
+        let mut end_cf = ctx.base[lv].1.clone();
+        if let Some(c) = run_at(&cf_runs, end) {
+            end_cf.overlay(c);
+        }
+        out.push(Paragraph {
+            props,
+            runs,
+            end: run_props(&end_cf, ctx),
+        });
+        if end >= n || out.len() >= 1 << 16 {
+            break;
+        }
+        start = end + 1;
+    }
+    out
+}
+
+fn run_index<T>(runs: &[(u32, T)], at: u32) -> usize {
+    let mut start = 0u32;
+    for (k, (n, _)) in runs.iter().enumerate() {
+        if at < start.saturating_add(*n) {
+            return k;
+        }
+        start = start.saturating_add(*n);
+    }
+    runs.len()
+}
+
+fn link_index(links: &[(u32, u32, Option<Link>)], at: u32) -> Option<usize> {
+    links.iter().position(|(a, b, _)| at >= *a && at < *b)
+}
+
+/// Character `i`, a surrogate pair joined; tabs kept, other controls
+/// dropped.
+fn decode_unit(chars: &[u16], i: usize) -> String {
+    let c = chars[i];
+    if (0xD800..0xDC00).contains(&c)
+        && let Some(&lo) = chars.get(i + 1)
+    {
+        return String::from_utf16_lossy(&[c, lo]);
+    }
+    match c {
+        0x09 => "\t".into(),
+        0..=0x1F => String::new(),
+        _ => String::from_utf16_lossy(&[c]),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn le32(v: u32) -> [u8; 4] {
+        v.to_le_bytes()
+    }
+
+    #[test]
+    fn cf_fields_in_order() {
+        // bold+italic valid, typeface, size, color (scheme 3).
+        let mut d = le32(1 | 2 | 1 << 16 | 1 << 17 | 1 << 18).to_vec();
+        d.extend([0x01, 0x00]); // style: bold on, italic off
+        d.extend(2u16.to_le_bytes()); // font 2
+        d.extend(24u16.to_le_bytes()); // 24 pt
+        d.extend([0, 0, 0, 3]);
+        let cf = read_cf(&mut Cur::new(&d));
+        assert_eq!(cf.bold, Some(true));
+        assert_eq!(cf.italic, Some(false));
+        assert_eq!(cf.font, Some(2));
+        assert_eq!(cf.size, Some(24));
+        assert_eq!(cf.color, Some(TColor::Scheme(3)));
+    }
+
+    #[test]
+    fn pf_fields_in_order() {
+        // hasBullet, bulletChar, align, leftMargin, indent.
+        let mut d = le32(1 | 1 << 7 | 1 << 11 | 1 << 8 | 1 << 10).to_vec();
+        d.extend(1u16.to_le_bytes()); // bullet flags: has bullet
+        d.extend(0x2013u16.to_le_bytes());
+        d.extend(1u16.to_le_bytes()); // centre
+        d.extend(576i16.to_le_bytes()); // margin 1 inch
+        d.extend(288i16.to_le_bytes()); // indent half an inch
+        let pf = read_pf(&mut Cur::new(&d));
+        assert_eq!(pf.has_bullet, Some(true));
+        assert_eq!(pf.bullet_char, Some(0x2013));
+        assert_eq!(pf.align, Some(1));
+        assert_eq!((pf.margin, pf.indent), (Some(576), Some(288)));
+        let fonts = vec!["Arial".to_string()];
+        let scheme = [0u32; 8];
+        let base = <[(Pf, Cf); 5]>::default();
+        let ctx = TextCtx {
+            fonts: &fonts,
+            scheme: &scheme,
+            base: &base,
+            slide_number: 1,
+            footer: "",
+            date: "",
+            links: &|_| None,
+            bullet_media: &[],
+        };
+        let p = para_props(&pf, &Cf::default(), 0, None, &ctx);
+        assert_eq!(p.margin, Some(914_400));
+        assert_eq!(p.indent, Some(-457_200));
+        assert_eq!(p.align, Some("ctr"));
+        assert!(matches!(
+            p.bullet,
+            Some(Bullet::Char { ch: '\u{2013}', .. })
+        ));
+    }
+
+    #[test]
+    fn pp9_items_give_picture_bullets_and_numbering() {
+        // Two paragraphs, each in a run of its own grouping: the first takes
+        // the first item (picture bullet 0), the second the second (a
+        // numbering scheme).
+        let t = RawText {
+            chars: "A\rB".encode_utf16().collect(),
+            cf_runs: vec![
+                (
+                    2,
+                    Cf {
+                        pp9rt: Some(0),
+                        ..Cf::default()
+                    },
+                ),
+                (
+                    1,
+                    Cf {
+                        pp9rt: Some(1),
+                        ..Cf::default()
+                    },
+                ),
+            ],
+            pp9: vec![
+                Pf9 {
+                    blip: Some(0),
+                    autonum: None,
+                },
+                Pf9 {
+                    blip: None,
+                    autonum: Some((3, 5)),
+                },
+            ],
+            ..RawText::default()
+        };
+        let fonts = vec![];
+        let scheme = [0u32; 8];
+        let mut base = <[(Pf, Cf); 5]>::default();
+        base[0].0.has_bullet = Some(true);
+        let ctx = TextCtx {
+            fonts: &fonts,
+            scheme: &scheme,
+            base: &base,
+            slide_number: 1,
+            footer: "",
+            date: "",
+            links: &|_| None,
+            bullet_media: &[Some(9)],
+        };
+        let p = paragraphs(&t, &ctx);
+        assert!(matches!(
+            p[0].props.bullet,
+            Some(Bullet::Picture { media: 9, .. })
+        ));
+        assert!(matches!(
+            p[1].props.bullet,
+            Some(Bullet::AutoNum { start: 5, .. })
+        ));
+        // A picture bullet that could not be decoded is an ordinary bullet.
+        let ctx = TextCtx {
+            bullet_media: &[None],
+            ..ctx
+        };
+        let p = paragraphs(&t, &ctx);
+        assert!(matches!(p[0].props.bullet, Some(Bullet::Char { .. })));
+    }
+
+    #[test]
+    fn paragraphs_runs_breaks_and_fields() {
+        let chars: Vec<u16> = "Ab\u{b}c\r*".encode_utf16().collect();
+        let t = RawText {
+            chars,
+            cf_runs: vec![
+                (
+                    1,
+                    Cf {
+                        bold: Some(true),
+                        ..Cf::default()
+                    },
+                ),
+                (6, Cf::default()),
+            ],
+            meta: vec![(5, Meta::SlideNumber)],
+            ..RawText::default()
+        };
+        let fonts = vec![];
+        let scheme = [0u32; 8];
+        let base = <[(Pf, Cf); 5]>::default();
+        let ctx = TextCtx {
+            fonts: &fonts,
+            scheme: &scheme,
+            base: &base,
+            slide_number: 7,
+            footer: "",
+            date: "",
+            links: &|_| None,
+            bullet_media: &[],
+        };
+        let p = paragraphs(&t, &ctx);
+        assert_eq!(p.len(), 2);
+        let kinds: Vec<_> = p[0].runs.iter().map(|r| r.kind.clone()).collect();
+        assert_eq!(
+            kinds,
+            vec![
+                RunKind::Text("A".into()),
+                RunKind::Text("b".into()),
+                RunKind::Break,
+                RunKind::Text("c".into())
+            ]
+        );
+        assert_eq!(p[0].runs[0].props.bold, Some(true));
+        assert_eq!(p[1].runs[0].kind, RunKind::Field("slidenum", "7".into()));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/pptx/draw.rs b/crates/exav-render/src/formats/office/slides/pptx/draw.rs
new file mode 100644
index 00000000..1cff2cee
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/pptx/draw.rs
@@ -0,0 +1,715 @@
+//! Shapes, fills, lines and geometry as PresentationML and DrawingML.
+
+use super::text::write_text_body;
+use super::xml::{esc, hex};
+use crate::formats::office::slides::model::*;
+use std::fmt::Write as _;
+
+pub const REL: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+
+/// A part's relationships: (type, target, external), deduplicated.
+#[derive(Default)]
+pub struct Rels(pub Vec<(&'static str, String, bool)>);
+
+impl Rels {
+    pub fn add(&mut self, kind: &'static str, target: String, external: bool) -> String {
+        if let Some(i) = self
+            .0
+            .iter()
+            .position(|r| r.0 == kind && r.1 == target && r.2 == external)
+        {
+            return format!("rId{}", i + 1);
+        }
+        self.0.push((kind, target, external));
+        format!("rId{}", self.0.len())
+    }
+
+    pub fn xml(&self) -> String {
+        let mut r = format!(
+            "{}<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">",
+            super::xml::XML_HEAD
+        );
+        for (i, (kind, target, ext)) in self.0.iter().enumerate() {
+            // A full type, or one of the office document's.
+            let ty = if kind.starts_with("http") {
+                kind.to_string()
+            } else {
+                format!("{REL}/{kind}")
+            };
+            let _ = write!(
+                r,
+                "<Relationship Id=\"rId{}\" Type=\"{ty}\" Target=\"{}\"",
+                i + 1,
+                esc(target)
+            );
+            if *ext {
+                r.push_str(" TargetMode=\"External\"");
+            }
+            r.push_str("/>");
+        }
+        r.push_str("</Relationships>");
+        r
+    }
+}
+
+/// What a part's shapes refer to.
+pub struct Ctx<'a> {
+    pub rels: Rels,
+    pub next_id: u32,
+    /// Each picture's name in ppt/media.
+    pub media: &'a [String],
+    /// Each picture's tile scale, 100000 being 100%: its size at its own
+    /// resolution over its size at 96 dpi, which a renderer takes.
+    pub scales: &'a [(u32, u32)],
+    /// Each slide's part name, in ppt/slides.
+    pub slides: &'a [String],
+    /// The pictures this part uses.
+    pub used: Vec<usize>,
+    /// The number of the last chart part, and the charts this part adds.
+    pub chart_no: usize,
+    pub charts: Vec<(usize, String)>,
+    /// The most bytes of XML the part may reach, and whether it did: the
+    /// shapes after that are not written.
+    pub limit: usize,
+    pub over: bool,
+}
+
+impl<'a> Ctx<'a> {
+    pub fn new(
+        media: &'a [String],
+        scales: &'a [(u32, u32)],
+        slides: &'a [String],
+        chart_no: usize,
+    ) -> Ctx<'a> {
+        Ctx {
+            rels: Rels::default(),
+            next_id: 2,
+            media,
+            scales,
+            slides,
+            used: vec![],
+            chart_no,
+            charts: vec![],
+            limit: usize::MAX,
+            over: false,
+        }
+    }
+
+    pub fn image(&mut self, media: usize) -> Option<String> {
+        let name = self.media.get(media)?;
+        if !self.used.contains(&media) {
+            self.used.push(media);
+        }
+        Some(self.rels.add("image", format!("../media/{name}"), false))
+    }
+
+    fn id(&mut self) -> u32 {
+        let id = self.next_id;
+        self.next_id += 1;
+        id
+    }
+
+    /// The attributes and relationship of a hyperlink: ` r:id=".." action=".."`.
+    pub fn link_attrs(&mut self, link: &Link) -> Option<String> {
+        let jump = |j: &str| format!(" r:id=\"\" action=\"ppaction://hlinkshowjump?jump={j}\"");
+        Some(match link {
+            Link::Url(u) => {
+                let id = self.rels.add("hyperlink", u.clone(), true);
+                format!(" r:id=\"{id}\"")
+            }
+            Link::Slide(i) => {
+                let name = self.slides.get(*i)?;
+                let id = self.rels.add("slide", name.clone(), false);
+                format!(" r:id=\"{id}\" action=\"ppaction://hlinksldjump\"")
+            }
+            Link::NextSlide => jump("nextslide"),
+            Link::PrevSlide => jump("previousslide"),
+            Link::FirstSlide => jump("firstslide"),
+            Link::LastSlide => jump("lastslide"),
+        })
+    }
+}
+
+fn emu(v: Emu) -> Emu {
+    v.clamp(-27_273_042_316_900, 27_273_042_316_900)
+}
+
+fn size(v: Emu) -> Emu {
+    v.clamp(0, 27_273_042_316_900)
+}
+
+/// Degrees to 1/60000 degree in [0, 360).
+pub fn angle(deg: f64) -> i64 {
+    if !deg.is_finite() {
+        return 0;
+    }
+    ((deg.rem_euclid(360.0)) * 60000.0).round() as i64 % 21_600_000
+}
+
+pub fn color(o: &mut String, c: &Color) {
+    match c.alpha {
+        Some(a) if a < 100_000 => {
+            let _ = write!(
+                o,
+                "<a:srgbClr val=\"{}\"><a:alpha val=\"{}\"/></a:srgbClr>",
+                hex(c.rgb),
+                a
+            );
+        }
+        _ => {
+            let _ = write!(o, "<a:srgbClr val=\"{}\"/>", hex(c.rgb));
+        }
+    }
+}
+
+pub fn solid(o: &mut String, c: &Color) {
+    o.push_str("<a:solidFill>");
+    color(o, c);
+    o.push_str("</a:solidFill>");
+}
+
+pub fn fill(o: &mut String, f: &Fill, ctx: &mut Ctx) {
+    match f {
+        Fill::None => o.push_str("<a:noFill/>"),
+        Fill::Solid(c) => solid(o, c),
+        Fill::Gradient(g) => gradient(o, g),
+        Fill::Picture { media, tile } => match ctx.image(*media) {
+            Some(id) => {
+                let _ = write!(
+                    o,
+                    "<a:blipFill rotWithShape=\"1\"><a:blip r:embed=\"{id}\"/>"
+                );
+                if *tile {
+                    let (sx, sy) = ctx
+                        .scales
+                        .get(*media)
+                        .copied()
+                        .unwrap_or((100_000, 100_000));
+                    let _ = write!(
+                        o,
+                        "<a:tile tx=\"0\" ty=\"0\" sx=\"{sx}\" sy=\"{sy}\" flip=\"none\" algn=\"tl\"/>"
+                    );
+                } else {
+                    o.push_str("<a:stretch><a:fillRect/></a:stretch>");
+                }
+                o.push_str("</a:blipFill>");
+            }
+            None => o.push_str("<a:noFill/>"),
+        },
+        Fill::Pattern { preset, fg, bg } => {
+            let _ = write!(o, "<a:pattFill prst=\"{preset}\"><a:fgClr>");
+            color(o, fg);
+            o.push_str("</a:fgClr><a:bgClr>");
+            color(o, bg);
+            o.push_str("</a:bgClr></a:pattFill>");
+        }
+    }
+}
+
+fn gradient(o: &mut String, g: &Gradient) {
+    o.push_str("<a:gradFill rotWithShape=\"1\"><a:gsLst>");
+    let mut stops = g.stops.clone();
+    if stops.is_empty() {
+        stops.push((0, Color::rgb(0xFFFFFF)));
+    }
+    if stops.len() == 1 {
+        stops.push((100_000, stops[0].1));
+    }
+    for (pos, c) in &stops {
+        let _ = write!(o, "<a:gs pos=\"{}\">", (*pos).min(100_000));
+        color(o, c);
+        o.push_str("</a:gs>");
+    }
+    o.push_str("</a:gsLst>");
+    match &g.kind {
+        GradientKind::Linear(a) => {
+            let _ = write!(o, "<a:lin ang=\"{}\" scaled=\"0\"/>", angle(*a));
+        }
+        GradientKind::Path(path, r) => {
+            let _ = write!(
+                o,
+                "<a:path path=\"{path}\"><a:fillToRect l=\"{}\" t=\"{}\" r=\"{}\" b=\"{}\"/></a:path>",
+                r[0], r[1], r[2], r[3]
+            );
+        }
+    }
+    o.push_str("</a:gradFill>");
+}
+
+pub fn line(o: &mut String, l: &Line, ctx: &mut Ctx) {
+    line_as(o, "a:ln", l, ctx)
+}
+
+/// A line under `tag`: `a:ln`, or a table cell's `a:lnL`...
+fn line_as(o: &mut String, tag: &str, l: &Line, ctx: &mut Ctx) {
+    if l.fill == Fill::None {
+        let _ = write!(o, "<{tag}><a:noFill/></{tag}>");
+        return;
+    }
+    let _ = write!(o, "<{tag} w=\"{}\"", size(l.width).min(20_116_800));
+    if let Some(c) = l.cap {
+        let _ = write!(o, " cap=\"{c}\"");
+    }
+    if let Some(c) = l.compound {
+        let _ = write!(o, " cmpd=\"{c}\"");
+    }
+    o.push('>');
+    fill(o, &l.fill, ctx);
+    if let Some(d) = l.dash {
+        let _ = write!(o, "<a:prstDash val=\"{d}\"/>");
+    }
+    match l.join {
+        Some("round") => o.push_str("<a:round/>"),
+        Some("bevel") => o.push_str("<a:bevel/>"),
+        Some("miter") => o.push_str("<a:miter lim=\"800000\"/>"),
+        _ => {}
+    }
+    for (tag, a) in [("headEnd", &l.head), ("tailEnd", &l.tail)] {
+        if let Some(a) = a {
+            let _ = write!(
+                o,
+                "<a:{tag} type=\"{}\" w=\"{}\" len=\"{}\"/>",
+                a.kind, a.w, a.len
+            );
+        }
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+pub fn shadow(o: &mut String, s: &Option<Shadow>) {
+    match s {
+        Some(s) => {
+            let _ = write!(
+                o,
+                "<a:effectLst><a:outerShdw blurRad=\"{}\" dist=\"{}\" dir=\"{}\" algn=\"ctr\" rotWithShape=\"0\">",
+                size(s.blur).min(20_116_800),
+                size(s.dist).min(20_116_800),
+                angle(s.dir)
+            );
+            color(o, &s.color);
+            o.push_str("</a:outerShdw></a:effectLst>");
+        }
+        None => o.push_str("<a:effectLst/>"),
+    }
+}
+
+pub fn geometry(o: &mut String, g: &Geometry) {
+    match g {
+        Geometry::Preset { name, adj } => {
+            let _ = write!(o, "<a:prstGeom prst=\"{name}\"><a:avLst>");
+            for (n, v) in adj {
+                let _ = write!(o, "<a:gd name=\"{n}\" fmla=\"val {v}\"/>");
+            }
+            o.push_str("</a:avLst></a:prstGeom>");
+        }
+        Geometry::Custom(paths) => {
+            o.push_str("<a:custGeom><a:avLst/><a:gdLst/><a:ahLst/><a:cxnLst/><a:rect l=\"0\" t=\"0\" r=\"r\" b=\"b\"/><a:pathLst>");
+            for p in paths {
+                let _ = write!(o, "<a:path w=\"{}\" h=\"{}\"", p.w.max(0), p.h.max(0));
+                if !p.fill {
+                    o.push_str(" fill=\"none\"");
+                }
+                if !p.stroke {
+                    o.push_str(" stroke=\"0\"");
+                }
+                o.push('>');
+                let pt = |o: &mut String, x: i64, y: i64| {
+                    let _ = write!(o, "<a:pt x=\"{x}\" y=\"{y}\"/>");
+                };
+                for c in &p.cmds {
+                    match *c {
+                        PathCmd::Move(x, y) => {
+                            o.push_str("<a:moveTo>");
+                            pt(o, x, y);
+                            o.push_str("</a:moveTo>");
+                        }
+                        PathCmd::Line(x, y) => {
+                            o.push_str("<a:lnTo>");
+                            pt(o, x, y);
+                            o.push_str("</a:lnTo>");
+                        }
+                        PathCmd::Cubic(a, b, c, d, e, f) => {
+                            o.push_str("<a:cubicBezTo>");
+                            pt(o, a, b);
+                            pt(o, c, d);
+                            pt(o, e, f);
+                            o.push_str("</a:cubicBezTo>");
+                        }
+                        PathCmd::Quad(a, b, c, d) => {
+                            o.push_str("<a:quadBezTo>");
+                            pt(o, a, b);
+                            pt(o, c, d);
+                            o.push_str("</a:quadBezTo>");
+                        }
+                        PathCmd::Close => o.push_str("<a:close/>"),
+                    }
+                }
+                o.push_str("</a:path>");
+            }
+            o.push_str("</a:pathLst></a:custGeom>");
+        }
+    }
+}
+
+fn xfrm(o: &mut String, tag: &str, x: &Xfrm, child: Option<&Xfrm>) {
+    let _ = write!(o, "<{tag}");
+    let rot = angle(x.rot);
+    if rot != 0 {
+        let _ = write!(o, " rot=\"{rot}\"");
+    }
+    if x.flip_h {
+        o.push_str(" flipH=\"1\"");
+    }
+    if x.flip_v {
+        o.push_str(" flipV=\"1\"");
+    }
+    let _ = write!(
+        o,
+        "><a:off x=\"{}\" y=\"{}\"/><a:ext cx=\"{}\" cy=\"{}\"/>",
+        emu(x.x),
+        emu(x.y),
+        size(x.w),
+        size(x.h)
+    );
+    if let Some(c) = child {
+        let _ = write!(
+            o,
+            "<a:chOff x=\"{}\" y=\"{}\"/><a:chExt cx=\"{}\" cy=\"{}\"/>",
+            emu(c.x),
+            emu(c.y),
+            size(c.w),
+            size(c.h)
+        );
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+/// `<p:cNvPr .../>` with the shape's id, name, description and link.
+fn cnvpr(o: &mut String, s: &Shape, ctx: &mut Ctx, default: &str) {
+    let id = ctx.id();
+    let name = if s.name.is_empty() {
+        format!("{default} {}", id - 1)
+    } else {
+        s.name.clone()
+    };
+    let _ = write!(o, "<p:cNvPr id=\"{id}\" name=\"{}\"", esc(&name));
+    if !s.descr.is_empty() {
+        let _ = write!(o, " descr=\"{}\"", esc(&s.descr));
+    }
+    if s.hidden {
+        o.push_str(" hidden=\"1\"");
+    }
+    let link = s.link.as_ref().and_then(|l| ctx.link_attrs(l));
+    match link {
+        Some(attrs) => {
+            let _ = write!(o, "><a:hlinkClick{attrs}/></p:cNvPr>");
+        }
+        None => o.push_str("/>"),
+    }
+}
+
+fn nvpr(o: &mut String, s: &Shape) {
+    match &s.placeholder {
+        Some(ph) => {
+            o.push_str("<p:nvPr><p:ph");
+            if ph.kind != "obj" {
+                let _ = write!(o, " type=\"{}\"", ph.kind);
+            }
+            if let Some(i) = ph.idx {
+                let _ = write!(o, " idx=\"{i}\"");
+            }
+            o.push_str("/></p:nvPr>");
+        }
+        None => o.push_str("<p:nvPr/>"),
+    }
+}
+
+/// The shapes of a tree, in order.
+pub fn shapes(o: &mut String, list: &[Shape], ctx: &mut Ctx) {
+    for s in list {
+        if o.len() > ctx.limit {
+            ctx.over = true;
+            return;
+        }
+        shape(o, s, ctx);
+    }
+}
+
+pub fn shape(o: &mut String, s: &Shape, ctx: &mut Ctx) {
+    if let ShapeKind::Sp(sp) = &s.kind {
+        // Paths that are only filled or only stroked: PowerPoint honours
+        // each path's flags, the renderers this is written for do not, so
+        // one shape is written for each kind of path.
+        if let Geometry::Custom(paths) = &sp.geom {
+            let kind = |p: &Path| (p.fill, p.stroke);
+            let mixed = paths.iter().any(|p| kind(p) != kind(&paths[0]));
+            if mixed && !sp.connector {
+                let mut kinds: Vec<(bool, bool)> = vec![];
+                for p in paths {
+                    if !kinds.contains(&kind(p)) {
+                        kinds.push(kind(p));
+                    }
+                }
+                for (i, &(f, st)) in kinds.iter().enumerate() {
+                    let mut part = s.clone();
+                    if i > 0 {
+                        part.placeholder = None;
+                    }
+                    if let ShapeKind::Sp(sub) = &mut part.kind {
+                        sub.geom = Geometry::Custom(
+                            paths
+                                .iter()
+                                .filter(|p| kind(p) == (f, st))
+                                .cloned()
+                                .map(|mut p| {
+                                    p.fill = true;
+                                    p.stroke = true;
+                                    p
+                                })
+                                .collect(),
+                        );
+                        if !f {
+                            sub.fill = Fill::None;
+                        }
+                        if !st {
+                            sub.line = Line::default();
+                        }
+                        if i > 0 {
+                            sub.text = None;
+                            sub.shadow = None;
+                        }
+                    }
+                    shape(o, &part, ctx);
+                }
+                return;
+            }
+        }
+    }
+    match &s.kind {
+        ShapeKind::Sp(sp) if sp.connector => {
+            o.push_str("<p:cxnSp><p:nvCxnSpPr>");
+            cnvpr(o, s, ctx, "Connector");
+            o.push_str("<p:cNvCxnSpPr/>");
+            nvpr(o, s);
+            o.push_str("</p:nvCxnSpPr><p:spPr>");
+            xfrm(o, "a:xfrm", &s.xfrm, None);
+            geometry(o, &sp.geom);
+            fill(o, &sp.fill, ctx);
+            line(o, &sp.line, ctx);
+            shadow(o, &sp.shadow);
+            o.push_str("</p:spPr></p:cxnSp>");
+        }
+        ShapeKind::Sp(sp) => {
+            o.push_str("<p:sp><p:nvSpPr>");
+            cnvpr(o, s, ctx, "Shape");
+            if sp.text.is_some()
+                && s.placeholder.is_none()
+                && sp.fill == Fill::None
+                && sp.line.fill == Fill::None
+            {
+                o.push_str("<p:cNvSpPr txBox=\"1\"/>");
+            } else {
+                o.push_str("<p:cNvSpPr/>");
+            }
+            nvpr(o, s);
+            o.push_str("</p:nvSpPr><p:spPr>");
+            xfrm(o, "a:xfrm", &s.xfrm, None);
+            geometry(o, &sp.geom);
+            fill(o, &sp.fill, ctx);
+            line(o, &sp.line, ctx);
+            shadow(o, &sp.shadow);
+            o.push_str("</p:spPr>");
+            match &sp.text {
+                // The text area is the insets: a renderer need not honour
+                // a custom geometry's own text rectangle.
+                Some(t) if let Some(a) = sp.text_rect => {
+                    let mut t = t.clone();
+                    let (w, h) = (s.xfrm.w.max(0) as f64, s.xfrm.h.max(0) as f64);
+                    let [l, tp, r, b] = &mut t.body.insets;
+                    *l += (a[0] * w).round() as Emu;
+                    *tp += (a[1] * h).round() as Emu;
+                    *r += ((1.0 - a[2]) * w).round() as Emu;
+                    *b += ((1.0 - a[3]) * h).round() as Emu;
+                    write_text_body(o, "p:txBody", &t, ctx)
+                }
+                Some(t) => write_text_body(o, "p:txBody", t, ctx),
+                None if s.placeholder.is_some() => {
+                    write_text_body(o, "p:txBody", &TextBody::default(), ctx)
+                }
+                None => {}
+            }
+            o.push_str("</p:sp>");
+        }
+        ShapeKind::Pic(p) => {
+            let Some(rid) = ctx.image(p.media) else {
+                return;
+            };
+            o.push_str("<p:pic><p:nvPicPr>");
+            cnvpr(o, s, ctx, "Picture");
+            o.push_str("<p:cNvPicPr><a:picLocks noChangeAspect=\"1\"/></p:cNvPicPr>");
+            nvpr(o, s);
+            let _ = write!(o, "</p:nvPicPr><p:blipFill><a:blip r:embed=\"{rid}\"");
+            match p.alpha {
+                Some(a) if a < 100_000 => {
+                    let _ = write!(o, "><a:alphaModFix amt=\"{a}\"/></a:blip>");
+                }
+                _ => o.push_str("/>"),
+            }
+            if p.crop.iter().any(|&c| c != 0) {
+                let _ = write!(
+                    o,
+                    "<a:srcRect l=\"{}\" t=\"{}\" r=\"{}\" b=\"{}\"/>",
+                    p.crop[0], p.crop[1], p.crop[2], p.crop[3]
+                );
+            }
+            o.push_str("<a:stretch><a:fillRect/></a:stretch></p:blipFill><p:spPr>");
+            xfrm(o, "a:xfrm", &s.xfrm, None);
+            geometry(o, &p.geom);
+            o.push_str("<a:noFill/>");
+            line(o, &p.line, ctx);
+            shadow(o, &p.shadow);
+            o.push_str("</p:spPr></p:pic>");
+        }
+        ShapeKind::Group(g) => {
+            o.push_str("<p:grpSp><p:nvGrpSpPr>");
+            cnvpr(o, s, ctx, "Group");
+            o.push_str("<p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr>");
+            xfrm(o, "a:xfrm", &s.xfrm, Some(&g.child));
+            o.push_str("</p:grpSpPr>");
+            shapes(o, &g.shapes, ctx);
+            o.push_str("</p:grpSp>");
+        }
+        ShapeKind::Table(t) => table(o, s, t, ctx),
+        ShapeKind::Chart(xml) => {
+            ctx.chart_no += 1;
+            let n = ctx.chart_no;
+            ctx.charts.push((n, xml.clone()));
+            let rid = ctx
+                .rels
+                .add("chart", format!("../charts/chart{n}.xml"), false);
+            o.push_str("<p:graphicFrame><p:nvGraphicFramePr>");
+            cnvpr(o, s, ctx, "Chart");
+            o.push_str("<p:cNvGraphicFramePr/>");
+            nvpr(o, s);
+            o.push_str("</p:nvGraphicFramePr>");
+            xfrm(o, "p:xfrm", &s.xfrm, None);
+            let _ = write!(
+                o,
+                "<a:graphic><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"><c:chart xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" r:id=\"{rid}\"/></a:graphicData></a:graphic></p:graphicFrame>"
+            );
+        }
+    }
+}
+
+/// Charts in a shape list, groups included.
+pub fn count_charts(list: &[Shape]) -> usize {
+    list.iter()
+        .map(|s| match &s.kind {
+            ShapeKind::Chart(_) => 1,
+            ShapeKind::Group(g) => count_charts(&g.shapes),
+            _ => 0,
+        })
+        .sum()
+}
+
+fn table(o: &mut String, s: &Shape, t: &Table, ctx: &mut Ctx) {
+    if t.cols.is_empty() || t.rows.is_empty() {
+        return;
+    }
+    o.push_str("<p:graphicFrame><p:nvGraphicFramePr>");
+    cnvpr(o, s, ctx, "Table");
+    o.push_str("<p:cNvGraphicFramePr><a:graphicFrameLocks noGrp=\"1\"/></p:cNvGraphicFramePr>");
+    nvpr(o, s);
+    o.push_str("</p:nvGraphicFramePr>");
+    xfrm(o, "p:xfrm", &s.xfrm, None);
+    o.push_str("<a:graphic><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/table\"><a:tbl><a:tblPr/><a:tblGrid>");
+    for w in &t.cols {
+        let _ = write!(o, "<a:gridCol w=\"{}\"/>", size(*w));
+    }
+    o.push_str("</a:tblGrid>");
+    let ncols = t.cols.len();
+    for row in &t.rows {
+        let _ = write!(o, "<a:tr h=\"{}\">", size(row.h));
+        for k in 0..ncols {
+            let empty = Cell::default();
+            let c = row.cells.get(k).unwrap_or(&empty);
+            o.push_str("<a:tc");
+            if c.grid_span > 1 {
+                let _ = write!(o, " gridSpan=\"{}\"", c.grid_span);
+            }
+            if c.row_span > 1 {
+                let _ = write!(o, " rowSpan=\"{}\"", c.row_span);
+            }
+            if c.h_merge {
+                o.push_str(" hMerge=\"1\"");
+            }
+            if c.v_merge {
+                o.push_str(" vMerge=\"1\"");
+            }
+            o.push('>');
+            write_text_body(o, "a:txBody", &c.text, ctx);
+            let b = &c.text.body;
+            let _ = write!(
+                o,
+                "<a:tcPr marL=\"{}\" marR=\"{}\" marT=\"{}\" marB=\"{}\" anchor=\"{}\">",
+                size(b.insets[0]),
+                size(b.insets[2]),
+                size(b.insets[1]),
+                size(b.insets[3]),
+                b.anchor
+            );
+            for (tag, l) in ["a:lnL", "a:lnR", "a:lnT", "a:lnB"].iter().zip(&c.borders) {
+                line_as(o, tag, l, ctx);
+            }
+            fill(o, &c.fill, ctx);
+            o.push_str("</a:tcPr></a:tc>");
+        }
+        o.push_str("</a:tr>");
+    }
+    o.push_str("</a:tbl></a:graphicData></a:graphic></p:graphicFrame>");
+}
+
+/// `<p:bg>` for a background fill.
+pub fn background(o: &mut String, f: &Option<Fill>, ctx: &mut Ctx) {
+    if let Some(f) = f {
+        o.push_str("<p:bg><p:bgPr>");
+        fill(o, f, ctx);
+        o.push_str("<a:effectLst/></p:bgPr></p:bg>");
+    }
+}
+
+/// The group properties every shape tree starts with.
+pub const TREE_HEAD: &str = "<p:nvGrpSpPr><p:cNvPr id=\"1\" name=\"\"/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"0\" cy=\"0\"/><a:chOff x=\"0\" y=\"0\"/><a:chExt cx=\"0\" cy=\"0\"/></a:xfrm></p:grpSpPr>";
+
+pub fn tree(o: &mut String, list: &[Shape], ctx: &mut Ctx) {
+    o.push_str("<p:spTree>");
+    o.push_str(TREE_HEAD);
+    shapes(o, list, ctx);
+    o.push_str("</p:spTree>");
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn angles_wrap_into_a_turn() {
+        assert_eq!(angle(90.0), 5_400_000);
+        assert_eq!(angle(-90.0), 16_200_000);
+        assert_eq!(angle(360.0), 0);
+        assert_eq!(angle(f64::NAN), 0);
+    }
+
+    #[test]
+    fn relationships_are_shared() {
+        let mut r = Rels::default();
+        let a = r.add("image", "../media/image1.png".into(), false);
+        let b = r.add("image", "../media/image1.png".into(), false);
+        let c = r.add("hyperlink", "https://example.org/".into(), true);
+        assert_eq!(
+            (a.as_str(), b.as_str(), c.as_str()),
+            ("rId1", "rId1", "rId2")
+        );
+        assert!(r.xml().contains("TargetMode=\"External\""));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/pptx/mod.rs b/crates/exav-render/src/formats/office/slides/pptx/mod.rs
new file mode 100644
index 00000000..1cc9c715
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/pptx/mod.rs
@@ -0,0 +1,518 @@
+//! The presentation model to a PPTX package (ECMA-376 PresentationML).
+//! Parts are written in reading order: the package's own parts, the
+//! presentation, themes, masters and layouts, then each slide followed by
+//! the pictures it is the first to use, so that a reader of the ZIP from its
+//! start meets the first slide early.
+
+mod draw;
+mod text;
+pub(crate) mod xml;
+
+use crate::formats::office::common::package::{Lift, Out};
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::model::*;
+use draw::{Ctx, Rels};
+use std::fmt::Write as _;
+use std::io::Write;
+use xml::{XML_HEAD, esc, hex, ns_decl};
+
+fn zip_err(e: impl std::fmt::Display) -> Error {
+    let s = e.to_string();
+    if s.contains("too large") {
+        Error::TooLarge("output")
+    } else {
+        Error::Malformed(format!("writing the package: {s}"))
+    }
+}
+
+struct Package {
+    // Dropped first: see `Lift`.
+    _lift: Lift,
+    z: zip::ZipWriter<Out>,
+}
+
+impl Package {
+    fn put(&mut self, name: &str, data: &[u8], compress: bool) -> Result<()> {
+        let method = if compress {
+            zip::CompressionMethod::Deflated
+        } else {
+            zip::CompressionMethod::Stored
+        };
+        let opt = zip::write::SimpleFileOptions::default()
+            .compression_method(method)
+            .compression_level(compress.then_some(6))
+            .last_modified_time(zip::DateTime::default());
+        self.z.start_file(name, opt).map_err(zip_err)?;
+        self.z.write_all(data).map_err(zip_err)
+    }
+}
+
+const CT_MAIN: &str = "application/vnd.openxmlformats-officedocument.presentationml";
+
+fn mime(ext: &str) -> &'static str {
+    match ext {
+        "png" => "image/png",
+        "jpeg" => "image/jpeg",
+        "gif" => "image/gif",
+        "bmp" => "image/bmp",
+        "tiff" => "image/tiff",
+        "emf" => "image/x-emf",
+        "wmf" => "image/x-wmf",
+        "svg" => "image/svg+xml",
+        "pict" => "image/pict",
+        _ => "application/octet-stream",
+    }
+}
+
+/// Writes `p` as a PPTX, failing past `limit` bytes of output.
+/// The pictures' bytes are moved out of `p` and dropped once written.
+pub(crate) fn write(p: &mut Presentation, limit: u64) -> Result<Vec<u8>> {
+    let scales: Vec<(u32, u32)> = p.media.iter().map(tile_scale).collect();
+    let mut data: Vec<Option<Vec<u8>>> = p
+        .media
+        .iter_mut()
+        .map(|m| Some(std::mem::take(&mut m.data)))
+        .collect();
+    let p = &*p;
+    // Sized for the pictures, which are most of a large deck, so that the
+    // buffer is not grown to twice its size on the way.
+    let media: u64 = data.iter().flatten().map(|d| d.len() as u64).sum();
+    let guess = media + (64 << 10) + p.slides.len() as u64 * (8 << 10);
+    let (out, lift) = Out::new(guess.min(limit) as usize, limit);
+    let mut pkg = Package {
+        _lift: lift,
+        z: zip::ZipWriter::new(out),
+    };
+    let width = p.width.clamp(914_400, 51_206_400);
+    let height = p.height.clamp(914_400, 51_206_400);
+
+    // Masters, each with at least one layout.
+    let mut layouts: Vec<(usize, usize)> = vec![];
+    for (mi, m) in p.masters.iter().enumerate() {
+        for li in 0..m.layouts.len().max(1) {
+            layouts.push((mi, li));
+        }
+    }
+    let masters = p.masters.len().max(1);
+    let media_names: Vec<String> = p
+        .media
+        .iter()
+        .enumerate()
+        .map(|(i, m)| format!("image{}.{}", i + 1, m.ext))
+        .collect();
+    let slide_names: Vec<String> = (1..=p.slides.len())
+        .map(|i| format!("slide{i}.xml"))
+        .collect();
+
+    // [Content_Types].xml
+    let mut ct = format!(
+        "{XML_HEAD}<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/>"
+    );
+    let mut exts: Vec<&str> = p.media.iter().map(|m| m.ext).collect();
+    exts.sort_unstable();
+    exts.dedup();
+    for e in exts {
+        let _ = write!(
+            ct,
+            "<Default Extension=\"{e}\" ContentType=\"{}\"/>",
+            mime(e)
+        );
+    }
+    let mut over = |name: &str, t: &str| {
+        let _ = write!(ct, "<Override PartName=\"/{name}\" ContentType=\"{t}\"/>");
+    };
+    over(
+        "ppt/presentation.xml",
+        &format!("{CT_MAIN}.presentation.main+xml"),
+    );
+    over("ppt/presProps.xml", &format!("{CT_MAIN}.presProps+xml"));
+    over("ppt/viewProps.xml", &format!("{CT_MAIN}.viewProps+xml"));
+    over("ppt/tableStyles.xml", &format!("{CT_MAIN}.tableStyles+xml"));
+    over(
+        "docProps/core.xml",
+        "application/vnd.openxmlformats-package.core-properties+xml",
+    );
+    over(
+        "docProps/app.xml",
+        "application/vnd.openxmlformats-officedocument.extended-properties+xml",
+    );
+    for i in 1..=masters {
+        over(
+            &format!("ppt/theme/theme{i}.xml"),
+            "application/vnd.openxmlformats-officedocument.theme+xml",
+        );
+        over(
+            &format!("ppt/slideMasters/slideMaster{i}.xml"),
+            &format!("{CT_MAIN}.slideMaster+xml"),
+        );
+    }
+    for i in 1..=layouts.len().max(1) {
+        over(
+            &format!("ppt/slideLayouts/slideLayout{i}.xml"),
+            &format!("{CT_MAIN}.slideLayout+xml"),
+        );
+    }
+    for n in &slide_names {
+        over(&format!("ppt/slides/{n}"), &format!("{CT_MAIN}.slide+xml"));
+    }
+    let charts: usize = p
+        .masters
+        .iter()
+        .map(|m| {
+            draw::count_charts(&m.shapes)
+                + m.layouts
+                    .iter()
+                    .map(|l| draw::count_charts(&l.shapes))
+                    .sum::<usize>()
+        })
+        .sum::<usize>()
+        + p.slides
+            .iter()
+            .map(|s| draw::count_charts(&s.shapes))
+            .sum::<usize>();
+    for i in 1..=charts {
+        over(
+            &format!("ppt/charts/chart{i}.xml"),
+            "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
+        );
+    }
+    ct.push_str("</Types>");
+    pkg.put("[Content_Types].xml", ct.as_bytes(), true)?;
+
+    let mut root = Rels::default();
+    root.add("officeDocument", "ppt/presentation.xml".into(), false);
+    root.add(
+        "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties",
+        "docProps/core.xml".into(),
+        false,
+    );
+    root.add("extended-properties", "docProps/app.xml".into(), false);
+    pkg.put("_rels/.rels", root.xml().as_bytes(), true)?;
+    pkg.put("docProps/core.xml", format!("{XML_HEAD}<cp:coreProperties xmlns:cp=\"http://schemas.openxmlformats.org/package/2006/metadata/core-properties\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\"/>").as_bytes(), true)?;
+    pkg.put("docProps/app.xml", format!("{XML_HEAD}<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\"><Application>exav-render</Application><Slides>{}</Slides></Properties>", p.slides.len()).as_bytes(), true)?;
+
+    // The presentation.
+    let mut prels = Rels::default();
+    let mut pres = format!(
+        "{XML_HEAD}<p:presentation {} saveSubsetFonts=\"1\"><p:sldMasterIdLst>",
+        ns_decl()
+    );
+    for i in 1..=masters {
+        let id = prels.add(
+            "slideMaster",
+            format!("slideMasters/slideMaster{i}.xml"),
+            false,
+        );
+        let _ = write!(
+            pres,
+            "<p:sldMasterId id=\"{}\" r:id=\"{id}\"/>",
+            2_147_483_647 + i * 100
+        );
+    }
+    pres.push_str("</p:sldMasterIdLst>");
+    if !slide_names.is_empty() {
+        pres.push_str("<p:sldIdLst>");
+        for (i, n) in slide_names.iter().enumerate() {
+            let id = prels.add("slide", format!("slides/{n}"), false);
+            let _ = write!(pres, "<p:sldId id=\"{}\" r:id=\"{id}\"/>", 256 + i);
+        }
+        pres.push_str("</p:sldIdLst>");
+    }
+    let _ = write!(
+        pres,
+        "<p:sldSz cx=\"{width}\" cy=\"{height}\"/><p:notesSz cx=\"6858000\" cy=\"9144000\"/>"
+    );
+    pres.push_str("<p:defaultTextStyle><a:defPPr><a:defRPr lang=\"en-US\"/></a:defPPr></p:defaultTextStyle></p:presentation>");
+    for i in 1..=masters {
+        prels.add("theme", format!("theme/theme{i}.xml"), false);
+    }
+    prels.add("presProps", "presProps.xml".into(), false);
+    prels.add("viewProps", "viewProps.xml".into(), false);
+    prels.add("tableStyles", "tableStyles.xml".into(), false);
+    pkg.put("ppt/presentation.xml", pres.as_bytes(), true)?;
+    pkg.put(
+        "ppt/_rels/presentation.xml.rels",
+        prels.xml().as_bytes(),
+        true,
+    )?;
+    let ns = ns_decl();
+    pkg.put(
+        "ppt/presProps.xml",
+        format!("{XML_HEAD}<p:presentationPr {ns}/>").as_bytes(),
+        true,
+    )?;
+    pkg.put("ppt/viewProps.xml", format!("{XML_HEAD}<p:viewPr {ns}><p:normalViewPr><p:restoredLeft sz=\"15620\"/><p:restoredTop sz=\"94660\"/></p:normalViewPr><p:gridSpacing cx=\"76200\" cy=\"76200\"/></p:viewPr>").as_bytes(), true)?;
+    pkg.put("ppt/tableStyles.xml", format!("{XML_HEAD}<a:tblStyleLst xmlns:a=\"{}\" def=\"{{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}}\"/>", xml::NS_A).as_bytes(), true)?;
+
+    let mut charts_done = 0usize;
+    let fallback = Master::default();
+    // Themes and masters.
+    let mut layout_no = 0usize;
+    for mi in 0..masters {
+        let m = p.masters.get(mi).unwrap_or(&fallback);
+        pkg.put(
+            &format!("ppt/theme/theme{}.xml", mi + 1),
+            theme(&m.theme).as_bytes(),
+            true,
+        )?;
+        let mut ctx = Ctx::new(&media_names, &scales, &slide_names, charts_done);
+        let mut x = format!("{XML_HEAD}<p:sldMaster {ns}><p:cSld>");
+        let bg = m
+            .background
+            .clone()
+            .or(Some(Fill::Solid(Color::rgb(0xFFFFFF))));
+        draw::background(&mut x, &bg, &mut ctx);
+        draw::tree(&mut x, &m.shapes, &mut ctx);
+        x.push_str("</p:cSld><p:clrMap bg1=\"lt1\" tx1=\"dk1\" bg2=\"lt2\" tx2=\"dk2\" accent1=\"accent1\" accent2=\"accent2\" accent3=\"accent3\" accent4=\"accent4\" accent5=\"accent5\" accent6=\"accent6\" hlink=\"hlink\" folHlink=\"folHlink\"/><p:sldLayoutIdLst>");
+        let n_layouts = m.layouts.len().max(1);
+        let mut lrels = vec![];
+        for k in 0..n_layouts {
+            let id = ctx.rels.add(
+                "slideLayout",
+                format!("../slideLayouts/slideLayout{}.xml", layout_no + k + 1),
+                false,
+            );
+            let _ = write!(
+                x,
+                "<p:sldLayoutId id=\"{}\" r:id=\"{id}\"/>",
+                2_147_483_648 + mi * 100 + k + 1
+            );
+            lrels.push(id);
+        }
+        x.push_str("</p:sldLayoutIdLst><p:txStyles>");
+        text::list_style(&mut x, "p:titleStyle", &m.title_style, &mut ctx);
+        text::list_style(&mut x, "p:bodyStyle", &m.body_style, &mut ctx);
+        text::list_style(&mut x, "p:otherStyle", &m.other_style, &mut ctx);
+        x.push_str("</p:txStyles></p:sldMaster>");
+        ctx.rels
+            .add("theme", format!("../theme/theme{}.xml", mi + 1), false);
+        pkg.put(
+            &format!("ppt/slideMasters/slideMaster{}.xml", mi + 1),
+            x.as_bytes(),
+            true,
+        )?;
+        pkg.put(
+            &format!("ppt/slideMasters/_rels/slideMaster{}.xml.rels", mi + 1),
+            ctx.rels.xml().as_bytes(),
+            true,
+        )?;
+        put_media(&mut pkg, p, &media_names, &ctx.used, &mut data)?;
+        charts_done = put_charts(&mut pkg, &ctx)?;
+
+        let blank = Layout {
+            name: "Blank".into(),
+            kind: "blank",
+            show_master_shapes: true,
+            ..Layout::default()
+        };
+        for k in 0..n_layouts {
+            layout_no += 1;
+            let l = m.layouts.get(k).unwrap_or(&blank);
+            let mut ctx = Ctx::new(&media_names, &scales, &slide_names, charts_done);
+            let kind = if l.kind.is_empty() { "blank" } else { l.kind };
+            let mut x = format!("{XML_HEAD}<p:sldLayout {ns} type=\"{kind}\" preserve=\"1\"");
+            if !l.show_master_shapes {
+                x.push_str(" showMasterSp=\"0\"");
+            }
+            let name = if l.name.is_empty() { "Layout" } else { &l.name };
+            let _ = write!(x, "><p:cSld name=\"{}\">", esc(name));
+            draw::background(&mut x, &l.background, &mut ctx);
+            draw::tree(&mut x, &l.shapes, &mut ctx);
+            x.push_str("</p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>");
+            ctx.rels.add(
+                "slideMaster",
+                format!("../slideMasters/slideMaster{}.xml", mi + 1),
+                false,
+            );
+            pkg.put(
+                &format!("ppt/slideLayouts/slideLayout{layout_no}.xml"),
+                x.as_bytes(),
+                true,
+            )?;
+            pkg.put(
+                &format!("ppt/slideLayouts/_rels/slideLayout{layout_no}.xml.rels"),
+                ctx.rels.xml().as_bytes(),
+                true,
+            )?;
+            put_media(&mut pkg, p, &media_names, &ctx.used, &mut data)?;
+            charts_done = put_charts(&mut pkg, &ctx)?;
+        }
+    }
+
+    // Slides.
+    for (i, s) in p.slides.iter().enumerate() {
+        let mut ctx = Ctx::new(&media_names, &scales, &slide_names, charts_done);
+        // The layout first: rId1, as PowerPoint writes it.
+        let li = layouts
+            .iter()
+            .position(|&(m, l)| m == s.master.min(masters - 1) && l == s.layout)
+            .or_else(|| {
+                layouts
+                    .iter()
+                    .position(|&(m, _)| m == s.master.min(masters - 1))
+            })
+            .unwrap_or(0);
+        ctx.rels.add(
+            "slideLayout",
+            format!("../slideLayouts/slideLayout{}.xml", li + 1),
+            false,
+        );
+        let mut x = format!("{XML_HEAD}<p:sld {ns}");
+        if s.hidden {
+            x.push_str(" show=\"0\"");
+        }
+        if !s.show_master_shapes {
+            x.push_str(" showMasterSp=\"0\"");
+        }
+        match &s.name {
+            Some(name) => {
+                let _ = write!(x, "><p:cSld name=\"{}\">", esc(name));
+            }
+            None => x.push_str("><p:cSld>"),
+        }
+        draw::background(&mut x, &s.background, &mut ctx);
+        // A slide's XML is held whole: it is bound by what the conversion
+        // has left, as its output is.
+        ctx.limit = usize::try_from(limit).unwrap_or(usize::MAX);
+        draw::tree(&mut x, &s.shapes, &mut ctx);
+        if ctx.over {
+            return Err(Error::TooLarge("memory"));
+        }
+        x.push_str("</p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sld>");
+        pkg.put(
+            &format!("ppt/slides/{}", slide_names[i]),
+            x.as_bytes(),
+            true,
+        )?;
+        pkg.put(
+            &format!("ppt/slides/_rels/{}.rels", slide_names[i]),
+            ctx.rels.xml().as_bytes(),
+            true,
+        )?;
+        put_media(&mut pkg, p, &media_names, &ctx.used, &mut data)?;
+        charts_done = put_charts(&mut pkg, &ctx)?;
+    }
+
+    pkg._lift.lift();
+    let out = pkg.z.finish().map_err(zip_err)?;
+    Ok(out.into_inner())
+}
+
+/// Writes the pictures of `used` not yet written, dropping their bytes.
+/// A picture's tile scale: 100% unless its resolution is not 96 dpi.
+fn tile_scale(m: &Media) -> (u32, u32) {
+    use crate::formats::office::common::image::{natural_emu, pixel_size};
+    let scale = |natural: i64, pixels: u32| {
+        if pixels == 0 {
+            return 100_000;
+        }
+        (natural as f64 / (f64::from(pixels) * 9525.0) * 100_000.0).clamp(100.0, 10_000_000.0)
+            as u32
+    };
+    match (natural_emu(&m.data), pixel_size(&m.data)) {
+        (Some((w, h)), Some((pw, ph))) if matches!(m.ext, "png" | "jpeg") => {
+            (scale(w, pw), scale(h, ph))
+        }
+        _ => (100_000, 100_000),
+    }
+}
+
+fn put_media(
+    pkg: &mut Package,
+    p: &Presentation,
+    names: &[String],
+    used: &[usize],
+    data: &mut [Option<Vec<u8>>],
+) -> Result<()> {
+    for &m in used {
+        if let Some(d) = data[m].take() {
+            let compress = matches!(
+                p.media[m].ext,
+                "emf" | "wmf" | "bmp" | "tiff" | "svg" | "pict"
+            );
+            pkg.put(&format!("ppt/media/{}", names[m]), &d, compress)?;
+        }
+    }
+    Ok(())
+}
+
+/// The chart parts a part added; the number of the last one.
+fn put_charts(pkg: &mut Package, ctx: &Ctx) -> Result<usize> {
+    for (n, xml) in &ctx.charts {
+        pkg.put(&format!("ppt/charts/chart{n}.xml"), xml.as_bytes(), true)?;
+    }
+    Ok(ctx.chart_no)
+}
+
+fn theme(t: &Theme) -> String {
+    let names = [
+        "dk1", "lt1", "dk2", "lt2", "accent1", "accent2", "accent3", "accent4", "accent5",
+        "accent6", "hlink", "folHlink",
+    ];
+    let mut x = format!(
+        "{XML_HEAD}<a:theme xmlns:a=\"{}\" name=\"{}\"><a:themeElements><a:clrScheme name=\"{}\">",
+        xml::NS_A,
+        esc(&t.name),
+        esc(&t.name)
+    );
+    for (n, c) in names.iter().zip(t.colors.iter()) {
+        let _ = write!(x, "<a:{n}><a:srgbClr val=\"{}\"/></a:{n}>", hex(*c));
+    }
+    let _ = write!(
+        x,
+        "</a:clrScheme><a:fontScheme name=\"{}\"><a:majorFont><a:latin typeface=\"{}\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/></a:majorFont><a:minorFont><a:latin typeface=\"{}\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/></a:minorFont></a:fontScheme>",
+        esc(&t.name),
+        esc(&t.major_font),
+        esc(&t.minor_font)
+    );
+    x.push_str("<a:fmtScheme name=\"Office\"><a:fillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></a:fillStyleLst><a:lnStyleLst><a:ln w=\"6350\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></a:ln><a:ln w=\"12700\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></a:ln><a:ln w=\"19050\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle><a:effectStyle><a:effectLst/></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>");
+    x
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// A PNG's header with a resolution in dots per metre.
+    fn png(w: u32, h: u32, dpm: u32) -> Vec<u8> {
+        let mut v = b"\x89PNG\r\n\x1a\n".to_vec();
+        v.extend_from_slice(&13u32.to_be_bytes());
+        v.extend_from_slice(b"IHDR");
+        v.extend_from_slice(&w.to_be_bytes());
+        v.extend_from_slice(&h.to_be_bytes());
+        v.extend_from_slice(&[8, 2, 0, 0, 0, 0, 0, 0, 0]);
+        v.extend_from_slice(&9u32.to_be_bytes());
+        v.extend_from_slice(b"pHYs");
+        v.extend_from_slice(&dpm.to_be_bytes());
+        v.extend_from_slice(&dpm.to_be_bytes());
+        v.push(1);
+        v.extend_from_slice(&[0; 4]);
+        v.extend_from_slice(&[0, 0, 0, 0]);
+        v.extend_from_slice(b"IDAT");
+        v
+    }
+
+    #[test]
+    fn tiles_are_scaled_to_the_pictures_resolution() {
+        // 96 dpi is 3780 dots per metre: no scaling.
+        let m = Media {
+            ext: "png",
+            data: png(100, 50, 3780),
+        };
+        let (sx, sy) = tile_scale(&m);
+        assert!((99_900..=100_100).contains(&sx) && sx == sy, "{sx} {sy}");
+        // Twice the resolution: half the size.
+        let m = Media {
+            ext: "png",
+            data: png(100, 50, 7559),
+        };
+        let (sx, _) = tile_scale(&m);
+        assert!((49_900..=50_100).contains(&sx), "{sx}");
+        // Not a picture of a known resolution.
+        let m = Media {
+            ext: "svg",
+            data: b"<svg/>".to_vec(),
+        };
+        assert_eq!(tile_scale(&m), (100_000, 100_000));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/pptx/text.rs b/crates/exav-render/src/formats/office/slides/pptx/text.rs
new file mode 100644
index 00000000..9aeed1e5
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/pptx/text.rs
@@ -0,0 +1,315 @@
+//! Text bodies, paragraphs and runs as DrawingML.
+
+use super::draw::{Ctx, angle, color, line, solid};
+use super::xml::{esc, esc_into};
+use crate::formats::office::slides::model::*;
+use std::fmt::Write as _;
+
+pub fn write_text_body(o: &mut String, tag: &str, t: &TextBody, ctx: &mut Ctx) {
+    let _ = write!(o, "<{tag}>");
+    body_pr(o, &t.body);
+    list_style(o, "a:lstStyle", &t.levels, ctx);
+    if t.paras.is_empty() {
+        o.push_str("<a:p><a:endParaRPr lang=\"en-US\"/></a:p>");
+    }
+    for p in &t.paras {
+        paragraph(o, p, ctx);
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+fn body_pr(o: &mut String, b: &BodyProps) {
+    o.push_str("<a:bodyPr");
+    let rot = angle(b.rot);
+    if rot != 0 {
+        let _ = write!(o, " rot=\"{rot}\"");
+    }
+    if let Some(v) = b.vert {
+        let _ = write!(o, " vert=\"{v}\"");
+    }
+    let _ = write!(
+        o,
+        " wrap=\"{}\" lIns=\"{}\" tIns=\"{}\" rIns=\"{}\" bIns=\"{}\"",
+        if b.wrap { "square" } else { "none" },
+        b.insets[0].max(0),
+        b.insets[1].max(0),
+        b.insets[2].max(0),
+        b.insets[3].max(0)
+    );
+    if b.columns > 1 {
+        let _ = write!(o, " numCol=\"{}\"", b.columns.min(16));
+    }
+    let _ = write!(o, " anchor=\"{}\"", b.anchor);
+    if b.anchor_ctr {
+        o.push_str(" anchorCtr=\"1\"");
+    }
+    o.push_str(" rtlCol=\"0\">");
+    match b.autofit {
+        Autofit::None => o.push_str("<a:noAutofit/>"),
+        Autofit::Shape => o.push_str("<a:spAutoFit/>"),
+        Autofit::Normal(scale, reduce) => {
+            o.push_str("<a:normAutofit");
+            if scale < 100_000 {
+                let _ = write!(o, " fontScale=\"{}\"", scale.max(1000));
+            }
+            if reduce > 0 {
+                let _ = write!(o, " lnSpcReduction=\"{}\"", reduce.min(100_000));
+            }
+            o.push_str("/>");
+        }
+    }
+    o.push_str("</a:bodyPr>");
+}
+
+/// A list style: `a:lstStyle`, or a master's `p:titleStyle`...
+pub fn list_style(o: &mut String, tag: &str, l: &ListStyle, ctx: &mut Ctx) {
+    if l.is_empty() {
+        if tag == "a:lstStyle" {
+            o.push_str("<a:lstStyle/>");
+        } else {
+            let _ = write!(o, "<{tag}/>");
+        }
+        return;
+    }
+    let _ = write!(o, "<{tag}>");
+    for (i, lvl) in l.levels.iter().enumerate() {
+        if let Some((p, r)) = lvl {
+            para_pr(o, &format!("a:lvl{}pPr", i + 1), p, Some(r), false, ctx);
+        }
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+fn spacing(o: &mut String, tag: &str, s: &Option<Spacing>) {
+    match s {
+        Some(Spacing::Pct(v)) => {
+            let _ = write!(
+                o,
+                "<a:{tag}><a:spcPct val=\"{}\"/></a:{tag}>",
+                v.clamp(&0, &13_200_000)
+            );
+        }
+        Some(Spacing::Pts(v)) => {
+            let _ = write!(
+                o,
+                "<a:{tag}><a:spcPts val=\"{}\"/></a:{tag}>",
+                v.clamp(&0, &158_400)
+            );
+        }
+        None => {}
+    }
+}
+
+/// `a:pPr` or a level's `a:lvlNpPr`; `with_level` writes `lvl`.
+fn para_pr(
+    o: &mut String,
+    tag: &str,
+    p: &ParaProps,
+    def: Option<&RunProps>,
+    with_level: bool,
+    ctx: &mut Ctx,
+) {
+    let _ = write!(o, "<{tag}");
+    if let Some(m) = p.margin {
+        let _ = write!(o, " marL=\"{}\"", m.clamp(0, 51_206_400));
+    }
+    if let Some(i) = p.indent {
+        let _ = write!(o, " indent=\"{}\"", i.clamp(-51_206_400, 51_206_400));
+    }
+    if with_level && p.level > 0 {
+        let _ = write!(o, " lvl=\"{}\"", p.level.min(8));
+    }
+    if let Some(a) = p.align {
+        let _ = write!(o, " algn=\"{a}\"");
+    }
+    if let Some(t) = p.default_tab {
+        let _ = write!(o, " defTabSz=\"{}\"", t.clamp(0, 51_206_400));
+    }
+    if p.rtl {
+        o.push_str(" rtl=\"1\"");
+    }
+    o.push('>');
+    spacing(o, "lnSpc", &p.line_spacing);
+    spacing(o, "spcBef", &p.space_before);
+    spacing(o, "spcAft", &p.space_after);
+    match &p.bullet {
+        Some(Bullet::None) => o.push_str("<a:buNone/>"),
+        Some(Bullet::Char {
+            ch,
+            font,
+            color: c,
+            size,
+        }) => {
+            bullet_style(o, c, size, font);
+            let _ = write!(o, "<a:buChar char=\"{}\"/>", esc(&ch.to_string()));
+        }
+        Some(Bullet::AutoNum {
+            scheme,
+            start,
+            font,
+            color: c,
+            size,
+        }) => {
+            bullet_style(o, c, size, font);
+            let _ = write!(o, "<a:buAutoNum type=\"{scheme}\"");
+            if *start > 1 {
+                let _ = write!(o, " startAt=\"{}\"", start.min(&32767));
+            }
+            o.push_str("/>");
+        }
+        Some(Bullet::Picture { media, size }) => match ctx.image(*media) {
+            Some(rid) => {
+                bullet_style(o, &None, size, &None);
+                let _ = write!(o, "<a:buBlip><a:blip r:embed=\"{rid}\"/></a:buBlip>");
+            }
+            None => o.push_str("<a:buChar char=\"&#8226;\"/>"),
+        },
+        None => {}
+    }
+    if !p.tabs.is_empty() {
+        o.push_str("<a:tabLst>");
+        for (pos, algn) in p.tabs.iter().take(32) {
+            let _ = write!(
+                o,
+                "<a:tab pos=\"{}\" algn=\"{algn}\"/>",
+                pos.clamp(&0, &51_206_400)
+            );
+        }
+        o.push_str("</a:tabLst>");
+    }
+    if let Some(r) = def {
+        run_pr(o, "a:defRPr", r, ctx);
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+fn bullet_style(o: &mut String, c: &Option<Color>, size: &Option<u32>, font: &Option<String>) {
+    if let Some(c) = c {
+        o.push_str("<a:buClr>");
+        color(o, c);
+        o.push_str("</a:buClr>");
+    }
+    if let Some(s) = size {
+        let _ = write!(o, "<a:buSzPct val=\"{}\"/>", (*s).clamp(25_000, 400_000));
+    }
+    if let Some(f) = font {
+        let _ = write!(o, "<a:buFont typeface=\"{}\"/>", esc(f));
+    }
+}
+
+pub fn run_pr(o: &mut String, tag: &str, r: &RunProps, ctx: &mut Ctx) {
+    let _ = write!(o, "<{tag}");
+    match &r.lang {
+        Some(l) => {
+            let _ = write!(o, " lang=\"{}\"", esc(l));
+        }
+        None if tag != "a:defRPr" => o.push_str(" lang=\"en-US\""),
+        None => {}
+    }
+    if let Some(s) = r.size {
+        let _ = write!(o, " sz=\"{}\"", s.clamp(100, 400_000));
+    }
+    if let Some(b) = r.bold {
+        let _ = write!(o, " b=\"{}\"", u8::from(b));
+    }
+    if let Some(i) = r.italic {
+        let _ = write!(o, " i=\"{}\"", u8::from(i));
+    }
+    if let Some(u) = r.underline {
+        let _ = write!(o, " u=\"{u}\"");
+    }
+    if let Some(s) = r.strike {
+        let _ = write!(o, " strike=\"{s}\"");
+    }
+    if let Some(c) = r.caps {
+        let _ = write!(o, " cap=\"{c}\"");
+    }
+    if let Some(s) = r.spacing {
+        let _ = write!(o, " spc=\"{}\"", s.clamp(-400_000, 400_000));
+    }
+    if let Some(b) = r.baseline
+        && b != 0
+    {
+        let _ = write!(o, " baseline=\"{}\"", b.clamp(-1_000_000, 1_000_000));
+    }
+    o.push('>');
+    if let Some(l) = &r.outline {
+        line(o, l, ctx);
+    }
+    if let Some(c) = &r.color {
+        solid(o, c);
+    }
+    if let Some(s) = &r.shadow {
+        let _ = write!(
+            o,
+            "<a:effectLst><a:outerShdw blurRad=\"{}\" dist=\"{}\" dir=\"{}\" algn=\"ctr\" rotWithShape=\"0\">",
+            s.blur.max(0),
+            s.dist.max(0),
+            angle(s.dir)
+        );
+        color(o, &s.color);
+        o.push_str("</a:outerShdw></a:effectLst>");
+    }
+    if let Some(h) = &r.highlight {
+        o.push_str("<a:highlight>");
+        color(o, h);
+        o.push_str("</a:highlight>");
+    }
+    for (t, f) in [
+        ("latin", &r.font),
+        ("ea", &r.ea_font),
+        ("cs", &r.cs_font),
+        ("sym", &r.sym_font),
+    ] {
+        if let Some(f) = f {
+            let _ = write!(o, "<a:{t} typeface=\"{}\"/>", esc(f));
+        }
+    }
+    if let Some(l) = &r.link
+        && let Some(attrs) = ctx.link_attrs(l)
+    {
+        let _ = write!(o, "<a:hlinkClick{attrs}/>");
+    }
+    let _ = write!(o, "</{tag}>");
+}
+
+fn paragraph(o: &mut String, p: &Paragraph, ctx: &mut Ctx) {
+    o.push_str("<a:p>");
+    if p.props != ParaProps::default() {
+        para_pr(o, "a:pPr", &p.props, None, true, ctx);
+    }
+    let mut field = 0u32;
+    for r in &p.runs {
+        match &r.kind {
+            RunKind::Text(t) => {
+                if t.is_empty() {
+                    continue;
+                }
+                o.push_str("<a:r>");
+                run_pr(o, "a:rPr", &r.props, ctx);
+                o.push_str("<a:t>");
+                esc_into(o, t);
+                o.push_str("</a:t></a:r>");
+            }
+            RunKind::Break => {
+                o.push_str("<a:br>");
+                run_pr(o, "a:rPr", &r.props, ctx);
+                o.push_str("</a:br>");
+            }
+            RunKind::Field(kind, text) => {
+                field += 1;
+                let _ = write!(
+                    o,
+                    "<a:fld id=\"{{B6F15528-21DE-4FAA-801E-634DDDAF4B{:02X}}}\" type=\"{kind}\">",
+                    field.min(255)
+                );
+                run_pr(o, "a:rPr", &r.props, ctx);
+                o.push_str("<a:t>");
+                esc_into(o, text);
+                o.push_str("</a:t></a:fld>");
+            }
+        }
+    }
+    run_pr(o, "a:endParaRPr", &p.end, ctx);
+    o.push_str("</a:p>");
+}
diff --git a/crates/exav-render/src/formats/office/slides/pptx/xml.rs b/crates/exav-render/src/formats/office/slides/pptx/xml.rs
new file mode 100644
index 00000000..bd0ff6cc
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/pptx/xml.rs
@@ -0,0 +1,51 @@
+//! XML text helpers for the parts written.
+
+/// Appends `s` escaped for XML text or an attribute value. Characters XML
+/// 1.0 cannot hold are dropped (DrawingML has no escape for them).
+pub fn esc_into(o: &mut String, s: &str) {
+    for c in s.chars() {
+        match c {
+            '&' => o.push_str("&amp;"),
+            '<' => o.push_str("&lt;"),
+            '>' => o.push_str("&gt;"),
+            '"' => o.push_str("&quot;"),
+            '\t' | '\n' | '\r' => o.push(c),
+            c if (c as u32) < 0x20 || c == '\u{FFFE}' || c == '\u{FFFF}' => {}
+            c => o.push(c),
+        }
+    }
+}
+
+pub fn esc(s: &str) -> String {
+    let mut o = String::with_capacity(s.len());
+    esc_into(&mut o, s);
+    o
+}
+
+/// RGB as DrawingML writes it.
+pub fn hex(c: u32) -> String {
+    format!("{:06X}", c & 0xFF_FFFF)
+}
+
+pub const XML_HEAD: &str = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+pub const NS_A: &str = "http://schemas.openxmlformats.org/drawingml/2006/main";
+pub const NS_R: &str = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+pub const NS_P: &str = "http://schemas.openxmlformats.org/presentationml/2006/main";
+
+/// The namespace declarations of a PresentationML root element.
+pub fn ns_decl() -> String {
+    format!("xmlns:a=\"{NS_A}\" xmlns:r=\"{NS_R}\" xmlns:p=\"{NS_P}\"")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn escapes_and_drops_what_xml_cannot_hold() {
+        assert_eq!(esc("a<b & \"c\""), "a&lt;b &amp; &quot;c&quot;");
+        assert_eq!(esc("x\u{1}y\u{FFFF}"), "xy");
+        assert_eq!(esc("tab\tok"), "tab\tok");
+        assert_eq!(hex(0x12ABCDEF), "ABCDEF");
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/text.rs b/crates/exav-render/src/formats/office/slides/text.rs
new file mode 100644
index 00000000..fdea715d
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/text.rs
@@ -0,0 +1,178 @@
+//! The text of a presentation as a reader sees it, from the model the
+//! readers fill: each slide's shapes in order (groups, tables, charts' text),
+//! then the masters' own text where it is not a placeholder.
+
+use crate::formats::office::slides::model::*;
+use crate::formats::office::text::Out;
+
+/// Writes the text of `p`: a section to a slide, named by its page where it
+/// has one, `slide 3`, `hidden slide 4`.
+pub(crate) fn lines(p: &Presentation, out: &mut Out) {
+    for (i, slide) in p.slides.iter().enumerate() {
+        if out.full() {
+            return;
+        }
+        let n = i + 1;
+        let kind = if slide.hidden {
+            "hidden slide"
+        } else {
+            "slide"
+        };
+        match &slide.name {
+            Some(name) if !name.is_empty() => out.section(format!("{kind} {n} \"{name}\"")),
+            _ => out.section(format!("{kind} {n}")),
+        }
+        shapes(&slide.shapes, out);
+    }
+    // Text a master draws on every slide that is not a placeholder: a
+    // footer or a notice repeated on each of them.
+    for (i, master) in p.masters.iter().enumerate() {
+        if out.full() {
+            return;
+        }
+        let shown: Vec<&Shape> = master
+            .shapes
+            .iter()
+            .filter(|s| s.placeholder.is_none())
+            .collect();
+        if shown.iter().any(|s| has_text(s)) {
+            let name = if master.name.is_empty() {
+                format!("master {}", i + 1)
+            } else {
+                format!("master \"{}\"", master.name)
+            };
+            out.section(name);
+            for s in shown {
+                shape(s, out);
+            }
+        }
+    }
+}
+
+fn has_text(s: &Shape) -> bool {
+    match &s.kind {
+        ShapeKind::Sp(sp) => sp
+            .text
+            .as_ref()
+            .is_some_and(|t| t.paras.iter().any(|p| !p.runs.is_empty())),
+        ShapeKind::Group(g) => g.shapes.iter().any(has_text),
+        ShapeKind::Table(_) => true,
+        _ => false,
+    }
+}
+
+fn shapes(list: &[Shape], out: &mut Out) {
+    for s in list {
+        if out.full() {
+            return;
+        }
+        shape(s, out);
+    }
+}
+
+fn shape(s: &Shape, out: &mut Out) {
+    // A hidden shape is read as a hidden slide is: a person can show it, and
+    // hiding is where content goes that is meant not to be noticed.
+    // A shape's link is where its text goes when its runs have none.
+    let link = match &s.link {
+        Some(Link::Url(u)) => Some(u.as_str()),
+        _ => None,
+    };
+    match &s.kind {
+        ShapeKind::Sp(sp) => {
+            if let Some(t) = &sp.text {
+                body(t, link, out);
+            }
+        }
+        ShapeKind::Group(g) => shapes(&g.shapes, out),
+        ShapeKind::Table(t) => {
+            for row in &t.rows {
+                for (i, cell) in row.cells.iter().enumerate() {
+                    if cell.h_merge || cell.v_merge {
+                        continue;
+                    }
+                    if i > 0 {
+                        out.push("\t");
+                    }
+                    for (j, para) in cell.text.paras.iter().enumerate() {
+                        if j > 0 {
+                            out.push(" ");
+                        }
+                        paragraph(para, link, out);
+                    }
+                }
+                out.newline();
+            }
+        }
+        ShapeKind::Chart(xml) => chart(xml, out),
+        ShapeKind::Pic(_) => {}
+    }
+    // What a picture or shape says when it cannot be seen.
+    if !s.descr.trim().is_empty() {
+        out.line(&s.descr);
+    }
+}
+
+fn body(t: &TextBody, link: Option<&str>, out: &mut Out) {
+    for para in &t.paras {
+        paragraph(para, link, out);
+        out.newline();
+    }
+}
+
+fn paragraph(p: &Paragraph, shape_link: Option<&str>, out: &mut Out) {
+    for run in &p.runs {
+        // A run's link, else the shape's.
+        let target = match &run.props.link {
+            Some(Link::Url(u)) => Some(u.as_str()),
+            _ => shape_link,
+        };
+        match &run.kind {
+            RunKind::Text(s) => {
+                if let Some(t) = target {
+                    out.begin_link(t);
+                    out.push(s);
+                    out.end_link();
+                } else {
+                    out.push(s);
+                }
+            }
+            RunKind::Break => out.newline(),
+            // The slide number and the date are noise.
+            RunKind::Field(kind, text) => {
+                if !kind.starts_with("slidenum") && !kind.starts_with("datetime") {
+                    out.push(text);
+                }
+            }
+        }
+    }
+}
+
+/// The text a chart part's XML holds: titles, series names, categories
+/// (`a:t`, `c:v`), in order.
+fn chart(xml: &str, out: &mut Out) {
+    for tag in ["a:t", "c:v"] {
+        let open = format!("<{tag}>");
+        let close = format!("</{tag}>");
+        let mut rest = xml;
+        while let Some(i) = rest.find(&open) {
+            let from = i + open.len();
+            let Some(j) = rest[from..].find(&close) else {
+                break;
+            };
+            out.line(&unescape(&rest[from..from + j]));
+            rest = &rest[from + j + close.len()..];
+            if out.full() {
+                return;
+            }
+        }
+    }
+}
+
+fn unescape(s: &str) -> String {
+    s.replace("&lt;", "<")
+        .replace("&gt;", ">")
+        .replace("&quot;", "\"")
+        .replace("&apos;", "'")
+        .replace("&amp;", "&")
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/convert.rs b/crates/exav-render/src/formats/office/slides/vsdx/convert.rs
new file mode 100644
index 00000000..f8b70c51
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/convert.rs
@@ -0,0 +1,506 @@
+//! The shapes of a page as model shapes. A shape's transform is the one of
+//! [MS-VSDX] 2.2.3.2.1: subtract the local pin, mirror, turn
+//! counterclockwise, add the pin; the page and its groups have the Y axis
+//! pointing up and a PPTX has it pointing down.
+
+use super::format;
+use super::geom::{self, GPath, Seg};
+use super::resolve::Tree;
+use super::text;
+use crate::formats::office::common::image;
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::{Budget, text_bytes};
+use crate::formats::office::slides::model::*;
+use crate::formats::office::slides::package::Zip;
+use std::collections::HashMap;
+
+const EMU_PER_INCH: f64 = 914_400.0;
+
+/// Path segments of one shape.
+const MAX_SEGS: usize = 200_000;
+/// The most a picture part may be.
+const MAX_PICTURE: u64 = 64 << 20;
+
+/// A length in inches, scaled by `k`, in EMU.
+fn emu(v: f64, k: f64) -> Emu {
+    if v.is_finite() {
+        (v * k * EMU_PER_INCH).clamp(-1e13, 1e13).round() as Emu
+    } else {
+        0
+    }
+}
+
+/// The box a shape's coordinates are in: the page, or a group's local box.
+/// Its lower left corner is (`x0`, `y0`) and it is `h` high, in inches of
+/// the drawing; `k` is the paper inches to each, where the drawing is
+/// scaled ([MS-VSDX] 2.2.2.3).
+#[derive(Clone, Copy)]
+pub struct Frame {
+    pub x0: f64,
+    pub y0: f64,
+    pub h: f64,
+    pub k: f64,
+}
+
+impl Frame {
+    fn x(&self, x: f64) -> f64 {
+        (x - self.x0) * EMU_PER_INCH * self.k
+    }
+
+    fn y(&self, y: f64) -> f64 {
+        (self.y0 + self.h - y) * EMU_PER_INCH * self.k
+    }
+
+    fn pt(&self, x: f64, y: f64) -> (i64, i64) {
+        let c = |v: f64| {
+            if v.is_finite() {
+                v.clamp(-1e13, 1e13).round() as i64
+            } else {
+                0
+            }
+        };
+        (c(self.x(x)), c(self.y(y)))
+    }
+}
+
+/// A shape's own transform.
+struct Xf {
+    w: f64,
+    h: f64,
+    pin: (f64, f64),
+    loc: (f64, f64),
+    angle: f64,
+    flip: (bool, bool),
+}
+
+impl Xf {
+    /// A vector from the local pin, mirrored and turned.
+    fn turn(&self, v: (f64, f64)) -> (f64, f64) {
+        let (x, y) = (
+            if self.flip.0 { -v.0 } else { v.0 },
+            if self.flip.1 { -v.1 } else { v.1 },
+        );
+        let (s, c) = self.angle.sin_cos();
+        (x * c - y * s, x * s + y * c)
+    }
+
+    /// A point of the shape in its parent's coordinates.
+    fn to_parent(&self, p: (f64, f64)) -> (f64, f64) {
+        let v = self.turn((p.0 - self.loc.0, p.1 - self.loc.1));
+        (self.pin.0 + v.0, self.pin.1 + v.1)
+    }
+
+    /// The box of the shape in its parent's frame: the unturned box, its
+    /// turn and its mirrors.
+    fn xfrm(&self, f: Frame, ws: f64, hs: f64) -> Xfrm {
+        let (cx, cy) = self.to_parent((self.w / 2.0, self.h / 2.0));
+        Xfrm {
+            x: (f.x(cx) - ws * f.k * EMU_PER_INCH / 2.0).round() as Emu,
+            y: (f.y(cy) - hs * f.k * EMU_PER_INCH / 2.0).round() as Emu,
+            w: emu(ws, f.k),
+            h: emu(hs, f.k),
+            rot: (-self.angle.to_degrees()).rem_euclid(360.0),
+            flip_h: self.flip.0,
+            flip_v: self.flip.1,
+        }
+    }
+}
+
+pub struct Conv<'c, 'a, 'z> {
+    pub t: &'c Tree<'a>,
+    pub p: &'c mut Presentation,
+    pub budget: &'c mut Budget,
+    pub zip: &'c mut Zip<'z>,
+    pub media: &'c mut HashMap<String, Option<usize>>,
+    /// The layers of the page and whether they show, by index.
+    pub layers: &'c [(u32, bool)],
+    /// The names of the slides, for links to pages.
+    pub slide_names: &'c [String],
+    /// A picture past its limit, raised when the page is done.
+    pub failed: Option<Error>,
+}
+
+impl Conv<'_, '_, '_> {
+    /// The top-level shapes of a page `h` inches high, `k` inches of paper
+    /// to each of the drawing.
+    pub fn page(&mut self, h: f64, k: f64) -> Result<Vec<Shape>> {
+        let f = Frame {
+            x0: 0.0,
+            y0: 0.0,
+            h,
+            k,
+        };
+        let mut out = vec![];
+        for &r in &self.t.roots {
+            out.extend(self.shape(r, f)?);
+        }
+        if let Some(e) = self.failed.take() {
+            return Err(e);
+        }
+        Ok(out)
+    }
+
+    fn hidden_by_layer(&self, n: usize) -> bool {
+        let members: Vec<i64> = match self.t.val(n, "LayerMember") {
+            Some(super::formula::Val::Num(x)) => vec![x as i64],
+            Some(super::formula::Val::Str(s)) => {
+                s.split(';').filter_map(|m| m.trim().parse().ok()).collect()
+            }
+            _ => vec![],
+        };
+        members.iter().any(|m| {
+            self.layers
+                .iter()
+                .any(|(ix, shown)| i64::from(*ix) == *m && !shown)
+        })
+    }
+
+    fn picture(&mut self, path: &str) -> Option<usize> {
+        if let Some(m) = self.media.get(path) {
+            return *m;
+        }
+        let m = match self.zip.read(path, MAX_PICTURE) {
+            Ok(Some(d)) => match image::ext(&d) {
+                Some(ext) => {
+                    if let Err(e) = self.budget.alloc(d.len() as u64) {
+                        self.failed.get_or_insert(e);
+                        None
+                    } else {
+                        Some(self.p.add_media(ext, d))
+                    }
+                }
+                None => None,
+            },
+            Ok(None) => None,
+            Err(e) => {
+                self.failed.get_or_insert(e);
+                None
+            }
+        };
+        self.media.insert(path.to_string(), m);
+        m
+    }
+
+    fn link(&self, n: usize) -> (Option<Link>, String) {
+        for (key, _) in self.t.rows(n, "Hyperlink", None) {
+            let s = |c: &str| match self.t.row_val(n, "Hyperlink", None, &key, c) {
+                Some(super::formula::Val::Str(s)) => s,
+                _ => String::new(),
+            };
+            let (address, sub, descr) = (s("Address"), s("SubAddress"), s("Description"));
+            if let Some(l) = Link::url(&address) {
+                return (Some(l), descr);
+            }
+            // A page of this drawing, by its name (a shape of it after "!").
+            let page = sub.split('!').next().unwrap_or("");
+            if address.is_empty()
+                && !page.is_empty()
+                && let Some(i) = self.slide_names.iter().position(|n| n == page)
+            {
+                return (Some(Link::Slide(i)), descr);
+            }
+        }
+        (None, String::new())
+    }
+
+    fn shape(&mut self, n: usize, f: Frame) -> Result<Vec<Shape>> {
+        let t = self.t;
+        let kind = t.kind(n);
+        if t.deleted(n) || kind == "Guide" || self.hidden_by_layer(n) {
+            return Ok(vec![]);
+        }
+        let g = |name: &str| {
+            t.num(n, name)
+                .filter(|v| v.is_finite())
+                .map_or(0.0, |v| v.clamp(-1e6, 1e6))
+        };
+        let xf = Xf {
+            w: g("Width"),
+            h: g("Height"),
+            pin: (g("PinX"), g("PinY")),
+            loc: (g("LocPinX"), g("LocPinY")),
+            angle: g("Angle"),
+            flip: (g("FlipX") != 0.0, g("FlipY") != 0.0),
+        };
+        let (ws, hs) = (xf.w.abs(), xf.h.abs());
+        let own = Frame {
+            x0: xf.w.min(0.0),
+            y0: xf.h.min(0.0),
+            h: hs,
+            k: f.k,
+        };
+        let xfrm = xf.xfrm(f, ws, hs);
+        let (link, descr) = self.link(n);
+        let name = t.name(n).to_string();
+        let mut out: Vec<Shape> = vec![];
+        let finish = |mut s: Shape, link: &Option<Link>| {
+            s.name = name.clone();
+            s.descr = descr.clone();
+            s.link = link.clone();
+            s
+        };
+
+        // A picture.
+        if kind == "Foreign"
+            && let Some(fd) = t.foreign(n)
+        {
+            match fd.target.as_deref().and_then(|p| self.picture(p)) {
+                Some(media) => {
+                    let (iw, ih) = (g("ImgWidth"), g("ImgHeight"));
+                    let crop = if iw > 0.0 && ih > 0.0 {
+                        let (ox, oy) = (g("ImgOffsetX"), g("ImgOffsetY"));
+                        let c = |v: f64| (v * 100_000.0).clamp(-1e6, 1e6).round() as i32;
+                        [
+                            c(-ox / iw),
+                            c((oy + ih - xf.h) / ih),
+                            c(1.0 - (xf.w - ox) / iw),
+                            c(-oy / ih),
+                        ]
+                    } else {
+                        [0; 4]
+                    };
+                    let tr = g("Transparency").clamp(0.0, 1.0);
+                    let pic = Pic {
+                        media,
+                        crop,
+                        geom: Geometry::default(),
+                        line: Line::default(),
+                        shadow: None,
+                        alpha: (tr > 0.0).then(|| ((1.0 - tr) * 100_000.0).round() as u32),
+                    };
+                    out.push(finish(
+                        Shape::new(ShapeKind::Pic(Box::new(pic)), xfrm.clone()),
+                        &link,
+                    ));
+                    return Ok(out);
+                }
+                None => self
+                    .p
+                    .warn("embedded objects without a picture it can draw"),
+            }
+        }
+
+        if format::has_effects(t, n) {
+            self.p
+                .warn("shadows, glows, bevels, reflections and soft edges are not drawn");
+        }
+        let paths = geom::paths(t, n, xf.w, xf.h, MAX_SEGS)?;
+        let body = text::build(t, n, f.k);
+        let children: Vec<usize> = t.nodes[n].children.clone();
+
+        // The shape's own geometry and text.
+        if !paths.is_empty() || body.is_some() {
+            let mut sp = Sp::default();
+            let mut separate: Option<(Xfrm, TextBody)> = None;
+            if !paths.is_empty() {
+                let cmds: usize = paths.iter().map(|p| p.segs.len()).sum();
+                self.budget.alloc(cmds as u64 * 32)?;
+                sp.geom = Geometry::Custom(model_paths(&paths, own, ws, hs));
+                sp.fill = format::fill(t, n);
+                sp.line = format::line(t, n);
+            }
+            if let Some(mut b) = body {
+                self.budget.alloc(text_bytes(&b))?;
+                match text_block(t, n, &xf, own, ws, hs) {
+                    Block::Whole => sp.text = Some(b),
+                    Block::Inside(r) => {
+                        sp.text_rect = Some(r);
+                        sp.text = Some(b);
+                    }
+                    Block::Free {
+                        cx,
+                        cy,
+                        w,
+                        h,
+                        angle,
+                    } => {
+                        if w * f.k < 0.05 {
+                            b.body.wrap = false;
+                            b.body.anchor_ctr = true;
+                        }
+                        // Its centre is where the shape's transform moves the
+                        // block's centre to.
+                        let tx = Xf {
+                            w,
+                            h,
+                            pin: xf.to_parent((cx, cy)),
+                            loc: (w / 2.0, h / 2.0),
+                            angle: xf.angle + angle,
+                            flip: (false, false),
+                        };
+                        separate = Some((tx.xfrm(f, w.max(0.01 / f.k), h.max(0.2 / f.k)), b));
+                    }
+                }
+            }
+            if !paths.is_empty() || sp.text.is_some() {
+                if paths.is_empty() {
+                    sp.fill = Fill::None;
+                    sp.line = Line::default();
+                }
+                out.push(finish(
+                    Shape::new(ShapeKind::Sp(Box::new(sp)), xfrm.clone()),
+                    &link,
+                ));
+            }
+            if let Some((tx, b)) = separate {
+                let sp = Sp {
+                    text: Some(b),
+                    ..Sp::default()
+                };
+                out.push(Shape::new(ShapeKind::Sp(Box::new(sp)), tx));
+            }
+        }
+
+        // Its subshapes, in a group with the shape's box.
+        if !children.is_empty() {
+            let mut kids = vec![];
+            for c in children {
+                kids.extend(self.shape(c, own)?);
+            }
+            if !kids.is_empty() {
+                let g = Group {
+                    child: Xfrm {
+                        x: 0,
+                        y: 0,
+                        w: emu(ws, f.k),
+                        h: emu(hs, f.k),
+                        ..Xfrm::default()
+                    },
+                    shapes: kids,
+                };
+                out.push(finish(
+                    Shape::new(ShapeKind::Group(Box::new(g)), xfrm.clone()),
+                    &None,
+                ));
+            }
+        }
+        Ok(out)
+    }
+}
+
+fn model_paths(paths: &[GPath], f: Frame, ws: f64, hs: f64) -> Vec<Path> {
+    let (pw, ph) = (emu(ws, f.k).max(1), emu(hs, f.k).max(1));
+    paths
+        .iter()
+        .map(|g| {
+            let mut cmds = Vec::with_capacity(g.segs.len());
+            for s in &g.segs {
+                cmds.push(match *s {
+                    Seg::Move(x, y) => {
+                        let p = f.pt(x, y);
+                        PathCmd::Move(p.0, p.1)
+                    }
+                    Seg::Line(x, y) => {
+                        let p = f.pt(x, y);
+                        PathCmd::Line(p.0, p.1)
+                    }
+                    Seg::Cubic(c) => {
+                        let (a, b, e) = (f.pt(c[0], c[1]), f.pt(c[2], c[3]), f.pt(c[4], c[5]));
+                        PathCmd::Cubic(a.0, a.1, b.0, b.1, e.0, e.1)
+                    }
+                    Seg::Close => PathCmd::Close,
+                });
+            }
+            Path {
+                w: pw,
+                h: ph,
+                fill: g.fill,
+                stroke: g.stroke,
+                cmds,
+            }
+        })
+        .collect()
+}
+
+/// Where the text block of a shape is.
+enum Block {
+    /// The box of the shape.
+    Whole,
+    /// A part of the box, as fractions (left, top, right, bottom).
+    Inside([f64; 4]),
+    /// Elsewhere: its centre in the shape's coordinates, its size and its
+    /// turn relative to the shape.
+    Free {
+        cx: f64,
+        cy: f64,
+        w: f64,
+        h: f64,
+        angle: f64,
+    },
+}
+
+/// The text block of a shape ([MS-VSDX] 2.2.8.5.1): its own pin, size and
+/// angle, in the shape's coordinates.
+fn text_block(t: &Tree, n: usize, xf: &Xf, own: Frame, ws: f64, hs: f64) -> Block {
+    let g = |name: &str| {
+        t.num(n, name)
+            .filter(|v| v.is_finite())
+            .map_or(0.0, |v| v.clamp(-1e6, 1e6))
+    };
+    if t.val(n, "TxtWidth").is_none() && t.val(n, "TxtHeight").is_none() {
+        return Block::Whole;
+    }
+    let (tw, th) = (g("TxtWidth").abs(), g("TxtHeight").abs());
+    let angle = g("TxtAngle");
+    let bx = Xf {
+        w: tw,
+        h: th,
+        pin: (g("TxtPinX"), g("TxtPinY")),
+        loc: (g("TxtLocPinX"), g("TxtLocPinY")),
+        angle,
+        flip: xf.flip,
+    };
+    let (cx, cy) = bx.to_parent((tw / 2.0, th / 2.0));
+    let turned = angle.rem_euclid(std::f64::consts::TAU);
+    let upright = turned < 1e-3 || std::f64::consts::TAU - turned < 1e-3;
+    if upright && ws > 1e-6 && hs > 1e-6 {
+        let r = [
+            (cx - tw / 2.0 - own.x0) / ws,
+            (own.y0 + hs - (cy + th / 2.0)) / hs,
+            (cx + tw / 2.0 - own.x0) / ws,
+            (own.y0 + hs - (cy - th / 2.0)) / hs,
+        ];
+        let tol = 1e-3;
+        if r.iter().all(|v| (-tol..=1.0 + tol).contains(v)) {
+            let whole = r[0].abs() < tol
+                && r[1].abs() < tol
+                && (r[2] - 1.0).abs() < tol
+                && (r[3] - 1.0).abs() < tol;
+            return if whole {
+                Block::Whole
+            } else {
+                Block::Inside([
+                    r[0].clamp(0.0, 1.0),
+                    r[1].clamp(0.0, 1.0),
+                    r[2].clamp(0.0, 1.0),
+                    r[3].clamp(0.0, 1.0),
+                ])
+            };
+        }
+    }
+    Block::Free {
+        cx,
+        cy,
+        w: tw,
+        h: th,
+        angle,
+    }
+}
+
+/// The layers of a page sheet: the index of each and whether it shows.
+pub fn layers(page_sheet: &super::sheet::Sheet) -> Vec<(u32, bool)> {
+    let mut out = vec![];
+    for s in page_sheet.sections.iter().filter(|s| s.name == "Layer") {
+        for (i, r) in s.rows.iter().enumerate() {
+            let ix = r.ix.unwrap_or(i as u32);
+            let shown = r
+                .cells
+                .get("Visible")
+                .and_then(|c| c.v.as_deref())
+                .and_then(super::formula::parse_number)
+                .is_none_or(|v| v != 0.0);
+            out.push((ix, shown));
+        }
+    }
+    out
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/format.rs b/crates/exav-render/src/formats/office/slides/vsdx/format.rs
new file mode 100644
index 00000000..c6176f04
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/format.rs
@@ -0,0 +1,423 @@
+//! Fill and line properties ([MS-VSDX] 2.2.7.1 and 2.2.7.2) as the model's
+//! fills and lines.
+
+use super::resolve::Tree;
+use crate::formats::office::slides::model::{Arrow, Color, Fill, Gradient, GradientKind, Line};
+
+const EMU_PER_INCH: f64 = 914_400.0;
+
+/// A colour cell with its transparency cell (0 opaque to 1 transparent).
+fn color(t: &Tree, n: usize, cell: &str, trans: &str) -> Color {
+    let rgb = t.color(n, cell).unwrap_or(0);
+    let tr = t.num(n, trans).unwrap_or(0.0).clamp(0.0, 1.0);
+    Color {
+        rgb,
+        alpha: (tr > 0.0).then(|| ((1.0 - tr) * 100_000.0).round() as u32),
+    }
+}
+
+/// A pattern cell: 0 without the cell, solid (1) for a themed one that
+/// nothing resolves.
+fn pattern(t: &Tree, n: usize, cell: &str) -> i64 {
+    match t.val(n, cell) {
+        Some(v) => v.num().map_or(1, |p| p as i64),
+        None if t.find(n, cell).is_some() => 1,
+        None => 0,
+    }
+}
+
+/// The fill of shape `n`.
+pub fn fill(t: &Tree, n: usize) -> Fill {
+    // A pattern the cell does not give as a number (a themed one) is solid.
+    let pattern = pattern(t, n, "FillPattern");
+    if pattern == 0 {
+        return Fill::None;
+    }
+    let fg = color(t, n, "FillForegnd", "FillForegndTrans");
+    let bg = color(t, n, "FillBkgnd", "FillBkgndTrans");
+    if t.num(n, "FillGradientEnabled") == Some(1.0)
+        && let Some(g) = gradient(t, n)
+    {
+        return Fill::Gradient(g);
+    }
+    match pattern {
+        1 => Fill::Solid(fg),
+        2..=24 => Fill::Pattern {
+            preset: PATTERNS[(pattern - 2) as usize],
+            fg,
+            bg,
+        },
+        25..=40 => Fill::Gradient(old_gradient(pattern, fg, bg)),
+        _ => Fill::Solid(fg),
+    }
+}
+
+/// The hatches 2 to 24, as the closest presets.
+const PATTERNS: [&str; 23] = [
+    "ltUpDiag",
+    "smGrid",
+    "diagCross",
+    "ltDnDiag",
+    "horz",
+    "vert",
+    "pct75",
+    "pct50",
+    "pct25",
+    "pct10",
+    "pct5",
+    "dkHorz",
+    "dkVert",
+    "dkDnDiag",
+    "dkUpDiag",
+    "pct60",
+    "pct90",
+    "ltHorz",
+    "ltVert",
+    "dkDnDiag",
+    "ltUpDiag",
+    "smGrid",
+    "smCheck",
+];
+
+/// The gradient patterns 25 to 40, blending the foreground into the
+/// background: close, not exact.
+fn old_gradient(pattern: i64, fg: Color, bg: Color) -> Gradient {
+    let two = |a: Color, b: Color| vec![(0, a), (100_000, b)];
+    let three = |a: Color, b: Color| vec![(0, a), (50_000, b), (100_000, a)];
+    let (stops, kind) = match pattern {
+        25 => (two(fg, bg), GradientKind::Linear(0.0)),
+        26 => (three(bg, fg), GradientKind::Linear(0.0)),
+        27 => (two(bg, fg), GradientKind::Linear(0.0)),
+        28 => (two(fg, bg), GradientKind::Linear(90.0)),
+        29 => (three(bg, fg), GradientKind::Linear(90.0)),
+        30 => (two(bg, fg), GradientKind::Linear(90.0)),
+        31 => (two(fg, bg), GradientKind::Linear(20.0)),
+        32 => (two(bg, fg), GradientKind::Linear(340.0)),
+        33 => (two(fg, bg), GradientKind::Linear(70.0)),
+        34 => (two(bg, fg), GradientKind::Linear(110.0)),
+        35 => (two(fg, bg), GradientKind::Path("rect", [50_000; 4])),
+        36 => (
+            two(fg, bg),
+            GradientKind::Path("circle", [0, 0, 100_000, 100_000]),
+        ),
+        37 => (
+            two(fg, bg),
+            GradientKind::Path("circle", [100_000, 0, 0, 100_000]),
+        ),
+        38 => (
+            two(fg, bg),
+            GradientKind::Path("circle", [0, 100_000, 100_000, 0]),
+        ),
+        39 => (
+            two(fg, bg),
+            GradientKind::Path("circle", [100_000, 100_000, 0, 0]),
+        ),
+        _ => (two(fg, bg), GradientKind::Path("circle", [50_000; 4])),
+    };
+    Gradient { stops, kind }
+}
+
+/// The gradient of the FillGradient section and the direction cells.
+fn gradient(t: &Tree, n: usize) -> Option<Gradient> {
+    let mut stops: Vec<(u32, Color)> = vec![];
+    for (key, _) in t.rows(n, "FillGradient", None) {
+        let rgb = t
+            .row_val(n, "FillGradient", None, &key, "GradientStopColor")
+            .and_then(|v| t.to_color(&v))?;
+        let tr = t
+            .row_num(n, "FillGradient", None, &key, "GradientStopColorTrans")
+            .unwrap_or(0.0)
+            .clamp(0.0, 1.0);
+        let pos = t
+            .row_num(n, "FillGradient", None, &key, "GradientStopPosition")
+            .unwrap_or(0.0)
+            .clamp(0.0, 1.0);
+        stops.push((
+            (pos * 100_000.0).round() as u32,
+            Color {
+                rgb,
+                alpha: (tr > 0.0).then(|| ((1.0 - tr) * 100_000.0).round() as u32),
+            },
+        ));
+        if stops.len() >= 64 {
+            break;
+        }
+    }
+    if stops.len() < 2 {
+        return None;
+    }
+    stops.sort_by_key(|s| s.0);
+    let dir = t.num(n, "FillGradientDir").unwrap_or(0.0) as i64;
+    let kind = match dir {
+        0 => {
+            let a = t.num(n, "FillGradientAngle").unwrap_or(0.0).to_degrees();
+            // Counterclockwise from the x axis to clockwise on the screen.
+            GradientKind::Linear((-a).rem_euclid(360.0))
+        }
+        1..=7 => GradientKind::Path("circle", origin(dir)),
+        8..=12 => GradientKind::Path("rect", origin(dir)),
+        _ => GradientKind::Path("shape", [50_000; 4]),
+    };
+    Some(Gradient { stops, kind })
+}
+
+/// Where a radial or rectangular gradient starts, as the focus rectangle of
+/// a path gradient (left, top, right, bottom in 1/100000 of the shape).
+fn origin(dir: i64) -> [i32; 4] {
+    match dir {
+        1 | 8 => [100_000, 100_000, 0, 0],
+        2 | 9 => [0, 100_000, 100_000, 0],
+        4 => [50_000, 100_000, 50_000, 0],
+        5 => [50_000, 0, 50_000, 100_000],
+        6 | 11 => [100_000, 0, 0, 100_000],
+        7 | 12 => [0, 0, 100_000, 100_000],
+        _ => [50_000; 4],
+    }
+}
+
+/// The line of shape `n`; no fill for a transparent line.
+pub fn line(t: &Tree, n: usize) -> Line {
+    let pattern = pattern(t, n, "LinePattern");
+    if pattern == 0 {
+        return Line::default();
+    }
+    let weight = t.num(n, "LineWeight").unwrap_or(0.0).clamp(0.0, 100.0);
+    // A weight of zero is the thinnest line there is.
+    let width = if weight == 0.0 {
+        6350
+    } else {
+        (weight * EMU_PER_INCH).round().max(1.0) as i64
+    };
+    let arrow = |cell: &str, size: &str| {
+        let kind = t.num(n, cell).map_or(0, |v| v as i64);
+        let kind = *ARROWS.get(usize::try_from(kind).ok()?)?;
+        let size = match t.num(n, size).map_or(2, |v| v as i64) {
+            ..=1 => "sm",
+            2 => "med",
+            _ => "lg",
+        };
+        (!kind.is_empty()).then_some(Arrow {
+            kind,
+            w: size,
+            len: size,
+        })
+    };
+    Line {
+        fill: Fill::Solid(color(t, n, "LineColor", "LineColorTrans")),
+        width,
+        dash: dash(pattern),
+        cap: match t.num(n, "LineCap").map(|c| c as i64) {
+            Some(0) => Some("rnd"),
+            Some(2) => Some("sq"),
+            _ => None,
+        },
+        join: None,
+        compound: None,
+        head: arrow("BeginArrow", "BeginArrowSize"),
+        tail: arrow("EndArrow", "EndArrowSize"),
+    }
+}
+
+/// The dash preset closest to a line pattern; `None` is solid.
+fn dash(p: i64) -> Option<&'static str> {
+    Some(match p {
+        2 | 8 => "dash",
+        3 | 10 | 17 => "sysDot",
+        4 | 6 | 11 | 18 => "dashDot",
+        5 | 12 | 15 | 19 | 20 => "lgDashDotDot",
+        7 | 14 | 16 | 21 | 22 => "lgDash",
+        9 | 23 => "sysDash",
+        13 => "sysDashDot",
+        _ => return None,
+    })
+}
+
+/// The line ends 1 to 45 as the closest of the model's ends; none for the
+/// ones without one (bars and slashes).
+const ARROWS: [&str; 46] = [
+    "", "arrow", "stealth", "arrow", "triangle", "triangle", "triangle", "arrow", "stealth", "",
+    "oval", "diamond", "arrow", "stealth", "triangle", "triangle", "triangle", "triangle",
+    "triangle", "stealth", "oval", "diamond", "diamond", "", "", "", "", "arrow", "arrow", "oval",
+    "oval", "oval", "oval", "oval", "diamond", "oval", "oval", "oval", "diamond", "triangle",
+    "triangle", "oval", "oval", "arrow", "arrow", "arrow",
+];
+
+/// Whether shape `n` has effects that are not drawn: shadow, glow, bevel,
+/// reflection or soft edges.
+pub fn has_effects(t: &Tree, n: usize) -> bool {
+    let on = |c: &str| t.num(n, c).is_some_and(|v| v > 0.0);
+    on("ShapeShdwType")
+        || on("GlowSize")
+        || on("BevelTopType")
+        || on("ReflectionSize")
+        || on("SoftEdgesSize")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::limits::{Budget, Limits};
+    use crate::formats::office::slides::vsdx::resolve::{Doc, Master, tests::shapes};
+    use std::collections::HashMap;
+
+    fn with<R>(styles: &str, shape: &str, f: impl Fn(&Tree, usize) -> R) -> R {
+        let mut d = Doc::default();
+        d.colors.insert(30, 0x112233);
+        for s in shapes(&format!("<S>{styles}</S>")) {
+            d.styles.insert(s.id, s);
+        }
+        let page = shapes(&format!("<S>{shape}</S>"));
+        let m: HashMap<u32, Master> = HashMap::new();
+        let t = Tree::build(&d, &m, &page, &mut Budget::new(Limits::default())).unwrap();
+        f(&t, t.roots[0])
+    }
+
+    #[test]
+    fn solid_fills_take_the_colour_and_transparency() {
+        let f = with(
+            "",
+            "<Shape ID='1'><Cell N='FillPattern' V='1'/><Cell N='FillForegnd' V='#ff0000'/><Cell N='FillForegndTrans' V='0.25'/></Shape>",
+            fill,
+        );
+        assert_eq!(
+            f,
+            Fill::Solid(Color {
+                rgb: 0xFF0000,
+                alpha: Some(75_000)
+            })
+        );
+        // The colour table, and a pattern of 0.
+        let f = with(
+            "",
+            "<Shape ID='1'><Cell N='FillPattern' V='1'/><Cell N='FillForegnd' V='30'/></Shape>",
+            fill,
+        );
+        assert_eq!(f, Fill::Solid(Color::rgb(0x112233)));
+        assert_eq!(
+            with(
+                "",
+                "<Shape ID='1'><Cell N='FillPattern' V='0'/></Shape>",
+                fill
+            ),
+            Fill::None
+        );
+        // Without a pattern cell there is no fill, and a themed one is solid.
+        assert_eq!(with("", "<Shape ID='1'/>", fill), Fill::None);
+        assert_eq!(
+            with(
+                "",
+                "<Shape ID='1'><Cell N='FillPattern' V='Themed'/><Cell N='FillForegnd' V='2'/></Shape>",
+                fill
+            ),
+            Fill::Solid(Color::rgb(0xFF0000))
+        );
+    }
+
+    #[test]
+    fn a_style_gives_what_the_shape_leaves_out() {
+        let f = with(
+            "<Shape ID='3'><Cell N='FillPattern' V='1'/><Cell N='FillForegnd' V='#00ff00'/></Shape>",
+            "<Shape ID='1' FillStyle='3'><Cell N='FillForegnd' V='#0000ff'/></Shape>",
+            fill,
+        );
+        assert_eq!(f, Fill::Solid(Color::rgb(0x0000FF)));
+    }
+
+    #[test]
+    fn hatches_and_old_gradients() {
+        let f = with(
+            "",
+            "<Shape ID='1'><Cell N='FillPattern' V='9'/><Cell N='FillForegnd' V='#000000'/><Cell N='FillBkgnd' V='#ffffff'/></Shape>",
+            fill,
+        );
+        assert!(
+            matches!(
+                f,
+                Fill::Pattern {
+                    preset: "pct50",
+                    ..
+                }
+            ),
+            "{f:?}"
+        );
+        let f = with(
+            "",
+            "<Shape ID='1'><Cell N='FillPattern' V='27'/><Cell N='FillForegnd' V='#000000'/><Cell N='FillBkgnd' V='#ffffff'/></Shape>",
+            fill,
+        );
+        let Fill::Gradient(g) = f else { panic!() };
+        assert_eq!(g.stops[0].1.rgb, 0xFFFFFF);
+        assert_eq!(g.stops[1].1.rgb, 0x000000);
+    }
+
+    #[test]
+    fn a_gradient_of_stops_and_its_direction() {
+        let shape = |dir: &str| {
+            format!(
+                "<Shape ID='1'><Cell N='FillPattern' V='1'/><Cell N='FillGradientEnabled' V='1'/>
+                 <Cell N='FillGradientDir' V='{dir}'/><Cell N='FillGradientAngle' V='1.5707963267948966'/>
+                 <Section N='FillGradient'>
+                  <Row IX='1'><Cell N='GradientStopColor' V='#ff0000'/><Cell N='GradientStopColorTrans' V='0'/><Cell N='GradientStopPosition' V='1'/></Row>
+                  <Row IX='0'><Cell N='GradientStopColor' V='#0000ff'/><Cell N='GradientStopColorTrans' V='0.5'/><Cell N='GradientStopPosition' V='0'/></Row>
+                 </Section></Shape>"
+            )
+        };
+        let Fill::Gradient(g) = with("", &shape("0"), fill) else {
+            panic!()
+        };
+        // Stops by position; a quarter turn counterclockwise is three
+        // quarters clockwise.
+        assert_eq!(g.stops[0].0, 0);
+        assert_eq!(g.stops[0].1.alpha, Some(50_000));
+        assert_eq!(g.stops[1].1.rgb, 0xFF0000);
+        assert_eq!(g.kind, GradientKind::Linear(270.0));
+        let Fill::Gradient(g) = with("", &shape("3"), fill) else {
+            panic!()
+        };
+        assert_eq!(g.kind, GradientKind::Path("circle", [50_000; 4]));
+        let Fill::Gradient(g) = with("", &shape("12"), fill) else {
+            panic!()
+        };
+        assert_eq!(g.kind, GradientKind::Path("rect", [0, 0, 100_000, 100_000]));
+    }
+
+    #[test]
+    fn lines_have_weight_colour_dashes_and_ends() {
+        let l = with(
+            "",
+            "<Shape ID='1'><Cell N='LinePattern' V='2'/><Cell N='LineWeight' V='0.0208333333'/><Cell N='LineColor' V='#102030'/>
+             <Cell N='EndArrow' V='4'/><Cell N='EndArrowSize' V='3'/><Cell N='BeginArrow' V='10'/><Cell N='BeginArrowSize' V='0'/><Cell N='LineCap' V='0'/></Shape>",
+            line,
+        );
+        assert_eq!(l.fill, Fill::Solid(Color::rgb(0x102030)));
+        assert_eq!(l.width, 19_050);
+        assert_eq!(l.dash, Some("dash"));
+        assert_eq!(l.cap, Some("rnd"));
+        let tail = l.tail.unwrap();
+        assert_eq!((tail.kind, tail.w), ("triangle", "lg"));
+        let head = l.head.unwrap();
+        assert_eq!((head.kind, head.w), ("oval", "sm"));
+        // No pattern, no line; weight 0 is thin; unknown ends are none.
+        assert_eq!(with("", "<Shape ID='1'/>", line), Line::default());
+        let l = with(
+            "",
+            "<Shape ID='1'><Cell N='LinePattern' V='1'/><Cell N='LineWeight' V='0'/><Cell N='EndArrow' V='99'/><Cell N='BeginArrow' V='24'/></Shape>",
+            line,
+        );
+        assert_eq!((l.width, l.dash, l.tail, l.head), (6350, None, None, None));
+    }
+
+    #[test]
+    fn effects_are_noticed() {
+        assert!(with(
+            "",
+            "<Shape ID='1'><Cell N='ShapeShdwType' V='1'/></Shape>",
+            has_effects
+        ));
+        assert!(!with(
+            "",
+            "<Shape ID='1'><Cell N='ShapeShdwType' V='0'/></Shape>",
+            has_effects
+        ));
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/formula.rs b/crates/exav-render/src/formats/office/slides/vsdx/formula.rs
new file mode 100644
index 00000000..734baa28
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/formula.rs
@@ -0,0 +1,682 @@
+//! Values and formulas of ShapeSheet cells ([MS-VSDX] 2.2.11 and 2.5). A V
+//! attribute holds a value in internal units (inches, radians), and an F
+//! attribute the formula it came from. A shape's own cells are read by value;
+//! the formulas of the cells it inherits from its master are evaluated again,
+//! as they may depend on the shape's own size (`Width*0.5`).
+
+use std::f64::consts::PI;
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum Val {
+    Num(f64),
+    Str(String),
+    /// 0xRRGGBB.
+    Color(u32),
+}
+
+impl Val {
+    pub fn num(&self) -> Option<f64> {
+        match self {
+            Val::Num(n) if n.is_finite() => Some(*n),
+            Val::Num(_) => None,
+            Val::Str(s) => parse_number(s),
+            Val::Color(c) => Some(f64::from(*c)),
+        }
+    }
+
+    fn truthy(&self) -> bool {
+        match self {
+            Val::Num(n) => *n != 0.0,
+            Val::Str(s) => !s.is_empty(),
+            Val::Color(c) => *c != 0,
+        }
+    }
+
+    fn text(&self) -> String {
+        match self {
+            Val::Num(n) => format!("{n}"),
+            Val::Str(s) => s.clone(),
+            Val::Color(c) => format!("#{c:06X}"),
+        }
+    }
+}
+
+/// Internal units per unit word: inches for lengths, radians for angles.
+fn unit_factor(u: &str) -> Option<f64> {
+    Some(match u.to_ascii_lowercase().as_str() {
+        "in" | "inch" | "inches" | "\"" | "dl" => 1.0,
+        "ft" => 12.0,
+        "yd" => 36.0,
+        "mi" => 63_360.0,
+        "mm" => 1.0 / 25.4,
+        "cm" => 1.0 / 2.54,
+        "m" => 1.0 / 0.0254,
+        "km" => 1.0 / 0.000_025_4,
+        "pt" => 1.0 / 72.0,
+        "deg" | "d" => PI / 180.0,
+        "rad" => 1.0,
+        "%" => 0.01,
+        _ => return None,
+    })
+}
+
+/// The longest number at the start of `s` (sign, digits, fraction,
+/// exponent): its value and the bytes it takes.
+fn scan_number(s: &[u8]) -> Option<(f64, usize)> {
+    let mut i = 0;
+    if matches!(s.first(), Some(b'+' | b'-')) {
+        i += 1;
+    }
+    let digits = |s: &[u8], mut i: usize| {
+        while s.get(i).is_some_and(u8::is_ascii_digit) {
+            i += 1;
+        }
+        i
+    };
+    let a = digits(s, i);
+    let mut end = a;
+    let mut any = a > i;
+    if s.get(end) == Some(&b'.') {
+        let b = digits(s, end + 1);
+        any |= b > end + 1;
+        end = b;
+    }
+    if !any {
+        return None;
+    }
+    if matches!(s.get(end), Some(b'e' | b'E')) {
+        let mut j = end + 1;
+        if matches!(s.get(j), Some(b'+' | b'-')) {
+            j += 1;
+        }
+        let k = digits(s, j);
+        if k > j {
+            end = k;
+        }
+    }
+    let t = std::str::from_utf8(&s[..end]).ok()?;
+    let v: f64 = t.parse().ok()?;
+    v.is_finite().then_some((v, end))
+}
+
+/// A number as a cell holds it: plain, TRUE or FALSE, or followed by a unit
+/// (`2 in`, `45 deg`), in internal units.
+pub fn parse_number(s: &str) -> Option<f64> {
+    let t = s.trim();
+    if t.eq_ignore_ascii_case("true") {
+        return Some(1.0);
+    }
+    if t.eq_ignore_ascii_case("false") {
+        return Some(0.0);
+    }
+    let (v, n) = scan_number(t.as_bytes())?;
+    let rest = t[n..].trim();
+    if rest.is_empty() {
+        return Some(v);
+    }
+    unit_factor(rest).map(|f| v * f)
+}
+
+/// What a formula refers to.
+pub trait Env {
+    /// The cell `path` (`Width`, `Geometry1.X2`, `User.Name`), of the shape
+    /// `Sheet.N` names or of the shape the formula is in.
+    fn cell(&mut self, sheet: Option<u32>, path: &str) -> Option<Val>;
+    fn themeval(&mut self, args: &[Val]) -> Option<Val>;
+}
+
+/// Evaluates `f`; `None` for what is not supported or fails.
+pub fn eval(f: &str, env: &mut dyn Env) -> Option<Val> {
+    let mut p = Parser {
+        s: f.as_bytes(),
+        i: 0,
+        env,
+        steps: 0,
+    };
+    let v = p.expr(0)?;
+    p.ws();
+    (p.i == p.s.len()).then_some(v)
+}
+
+/// More tokens than any real formula has.
+const MAX_STEPS: u32 = 4000;
+const MAX_DEPTH: u32 = 48;
+
+struct Parser<'a> {
+    s: &'a [u8],
+    i: usize,
+    env: &'a mut dyn Env,
+    steps: u32,
+}
+
+impl Parser<'_> {
+    fn ws(&mut self) {
+        while self.s.get(self.i).is_some_and(u8::is_ascii_whitespace) {
+            self.i += 1;
+        }
+    }
+
+    fn eat(&mut self, t: &str) -> bool {
+        self.ws();
+        if self.s[self.i.min(self.s.len())..].starts_with(t.as_bytes()) {
+            self.i += t.len();
+            true
+        } else {
+            false
+        }
+    }
+
+    fn peek_is(&mut self, t: &str) -> bool {
+        self.ws();
+        self.s[self.i.min(self.s.len())..].starts_with(t.as_bytes())
+    }
+
+    /// Comparison and arithmetic from the loosest operators to the tightest.
+    fn expr(&mut self, depth: u32) -> Option<Val> {
+        if depth > MAX_DEPTH {
+            return None;
+        }
+        self.binary(0, depth)
+    }
+
+    fn binary(&mut self, level: usize, depth: u32) -> Option<Val> {
+        const LEVELS: [&[&str]; 5] = [
+            &["<>", "="],
+            &["<=", ">=", "<", ">"],
+            &["&"],
+            &["+", "-"],
+            &["*", "/"],
+        ];
+        if level == LEVELS.len() {
+            return self.power(depth);
+        }
+        let mut left = self.binary(level + 1, depth)?;
+        'outer: loop {
+            for op in LEVELS[level] {
+                // "<" and ">" must not take the front of "<>" and "<=".
+                if self.peek_is(op) && !(level == 1 && self.peek_is("<>")) {
+                    self.eat(op);
+                    self.steps += 1;
+                    if self.steps > MAX_STEPS {
+                        return None;
+                    }
+                    let right = self.binary(level + 1, depth)?;
+                    left = apply(op, left, right)?;
+                    continue 'outer;
+                }
+            }
+            return Some(left);
+        }
+    }
+
+    fn power(&mut self, depth: u32) -> Option<Val> {
+        let mut v = self.unary(depth)?;
+        while self.eat("^") {
+            let r = self.unary(depth)?;
+            v = Val::Num(v.num()?.powf(r.num()?));
+        }
+        Some(v)
+    }
+
+    /// The signs in front of an operand, taken in a loop: a recursion per
+    /// sign is a frame of the stack for each byte of a formula.
+    fn unary(&mut self, depth: u32) -> Option<Val> {
+        let mut minus = 0u32;
+        loop {
+            if self.eat("-") {
+                minus += 1;
+            } else if !self.eat("+") {
+                break;
+            }
+            self.steps += 1;
+            if self.steps > MAX_STEPS {
+                return None;
+            }
+        }
+        let v = self.primary(depth)?;
+        if minus == 0 {
+            return Some(v);
+        }
+        let n = v.num()?;
+        Some(Val::Num(if minus % 2 == 1 { -n } else { n }))
+    }
+
+    fn primary(&mut self, depth: u32) -> Option<Val> {
+        self.ws();
+        self.steps += 1;
+        if self.steps > MAX_STEPS || depth > MAX_DEPTH {
+            return None;
+        }
+        let c = *self.s.get(self.i)?;
+        if c == b'(' {
+            self.i += 1;
+            let v = self.expr(depth + 1)?;
+            return self.eat(")").then_some(v);
+        }
+        if c == b'"' {
+            return self.string();
+        }
+        if c == b'#' {
+            let h = self.s.get(self.i + 1..self.i + 7)?;
+            let t = std::str::from_utf8(h).ok()?;
+            let v = u32::from_str_radix(t, 16).ok()?;
+            self.i += 7;
+            return Some(Val::Color(v));
+        }
+        if c.is_ascii_digit() || c == b'.' {
+            let (v, n) = scan_number(&self.s[self.i..])?;
+            self.i += n;
+            // A unit word right after the number, with or without a space.
+            let save = self.i;
+            self.ws();
+            let start = self.i;
+            if self.s.get(start) == Some(&b'"') {
+                // A quote after a number is the inch sign.
+                self.i += 1;
+                return Some(Val::Num(v));
+            }
+            while self
+                .s
+                .get(self.i)
+                .is_some_and(|b| b.is_ascii_alphabetic() || *b == b'%')
+            {
+                self.i += 1;
+            }
+            let word = std::str::from_utf8(&self.s[start..self.i]).ok()?;
+            let next = self.s.get(self.i).copied();
+            if !word.is_empty()
+                && !matches!(next, Some(b'(' | b'.' | b'!'))
+                && let Some(f) = unit_factor(word)
+            {
+                return Some(Val::Num(v * f));
+            }
+            self.i = save;
+            return Some(Val::Num(v));
+        }
+        if c.is_ascii_alphabetic() || c == b'_' {
+            return self.name(depth);
+        }
+        None
+    }
+
+    fn string(&mut self) -> Option<Val> {
+        self.i += 1;
+        let mut out = Vec::new();
+        loop {
+            let c = *self.s.get(self.i)?;
+            self.i += 1;
+            if c == b'"' {
+                if self.s.get(self.i) == Some(&b'"') {
+                    out.push(b'"');
+                    self.i += 1;
+                    continue;
+                }
+                return Some(Val::Str(String::from_utf8_lossy(&out).into_owned()));
+            }
+            out.push(c);
+        }
+    }
+
+    fn name(&mut self, depth: u32) -> Option<Val> {
+        let start = self.i;
+        while self.s.get(self.i).is_some_and(|b| {
+            b.is_ascii_alphanumeric() || matches!(b, b'_' | b'.' | b'!' | b'[' | b']')
+        }) {
+            self.i += 1;
+        }
+        let name = std::str::from_utf8(&self.s[start..self.i]).ok()?;
+        if self.s.get(self.i) == Some(&b'(') {
+            self.i += 1;
+            let mut args: Vec<Option<Val>> = vec![];
+            if !self.eat(")") {
+                loop {
+                    args.push(self.expr(depth + 1));
+                    // An argument that failed is kept as `None`: IF and
+                    // IFERROR may not need it. Resume at its end.
+                    if args.last().is_some_and(Option::is_none) && !self.skip_arg() {
+                        return None;
+                    }
+                    if self.eat(",") {
+                        continue;
+                    }
+                    if self.eat(")") {
+                        break;
+                    }
+                    return None;
+                }
+            }
+            return self.call(&name.to_ascii_uppercase(), args);
+        }
+        let low = name.to_ascii_lowercase();
+        match low.as_str() {
+            "true" => return Some(Val::Num(1.0)),
+            "false" => return Some(Val::Num(0.0)),
+            _ => {}
+        }
+        if let Some(rest) = low.strip_prefix("sheet.") {
+            let bang = rest.find('!')?;
+            let id: u32 = rest[..bang].parse().ok()?;
+            let path = &name[6 + bang + 1..];
+            if path.contains('!') || path.is_empty() {
+                return None;
+            }
+            return self.env.cell(Some(id), path);
+        }
+        if name.contains('!') {
+            return None;
+        }
+        self.env.cell(None, name)
+    }
+
+    /// Moves past the argument that did not evaluate: to the next comma or
+    /// closing parenthesis at its own nesting level.
+    fn skip_arg(&mut self) -> bool {
+        let mut depth = 0u32;
+        let mut quoted = false;
+        while let Some(&c) = self.s.get(self.i) {
+            match c {
+                b'"' => quoted = !quoted,
+                b'(' if !quoted => depth += 1,
+                b')' if !quoted => {
+                    if depth == 0 {
+                        return true;
+                    }
+                    depth -= 1;
+                }
+                b',' if !quoted && depth == 0 => return true,
+                _ => {}
+            }
+            self.i += 1;
+        }
+        false
+    }
+
+    fn call(&mut self, f: &str, args: Vec<Option<Val>>) -> Option<Val> {
+        let n = |i: usize| args.get(i).and_then(|a| a.as_ref()).and_then(Val::num);
+        let all = || -> Option<Vec<f64>> {
+            args.iter()
+                .map(|a| a.as_ref().and_then(Val::num))
+                .collect::<Option<Vec<f64>>>()
+        };
+        let num = |v: f64| v.is_finite().then_some(Val::Num(v));
+        match f {
+            "IF" => {
+                let c = args.first()?.as_ref()?.truthy();
+                args.get(if c { 1 } else { 2 })?.clone()
+            }
+            "IFERROR" => match args.first()? {
+                Some(v) => Some(v.clone()),
+                None => args.get(1)?.clone(),
+            },
+            "GUARD" | "UPLUS" => args.first()?.clone(),
+            "AND" => Some(Val::Num(
+                args.iter().all(|a| a.as_ref().is_some_and(Val::truthy)) as u8 as f64,
+            )),
+            "OR" => Some(Val::Num(
+                args.iter().any(|a| a.as_ref().is_some_and(Val::truthy)) as u8 as f64,
+            )),
+            "NOT" => Some(Val::Num(!args.first()?.as_ref()?.truthy() as u8 as f64)),
+            "ABS" => num(n(0)?.abs()),
+            "SQRT" => {
+                let v = n(0)?;
+                (v >= 0.0).then(|| Val::Num(v.sqrt()))
+            }
+            "SIN" => num(n(0)?.sin()),
+            "COS" => num(n(0)?.cos()),
+            "TAN" => num(n(0)?.tan()),
+            "ASIN" => num(n(0)?.asin()),
+            "ACOS" => num(n(0)?.acos()),
+            "ATAN" => num(n(0)?.atan()),
+            "ATAN2" => num(n(0)?.atan2(n(1)?)),
+            "POW" => num(n(0)?.powf(n(1)?)),
+            "LN" => num(n(0)?.ln()),
+            "LOG10" => num(n(0)?.log10()),
+            "INT" | "FLOOR" if args.len() == 1 => num(n(0)?.floor()),
+            "FLOOR" => {
+                let (x, s) = (n(0)?, n(1)?);
+                (s != 0.0).then(|| Val::Num((x / s).floor() * s))
+            }
+            "CEILING" => {
+                let (x, s) = (n(0)?, n(1).unwrap_or(1.0));
+                (s != 0.0).then(|| Val::Num((x / s).ceil() * s))
+            }
+            "TRUNC" => num(n(0)?.trunc()),
+            "ROUND" => {
+                let p = 10f64.powi(n(1).unwrap_or(0.0).clamp(-15.0, 15.0) as i32);
+                num((n(0)? * p).round() / p)
+            }
+            "SIGN" => num(n(0)?.signum() * (n(0)? != 0.0) as u8 as f64),
+            "MOD" => {
+                let (x, d) = (n(0)?, n(1)?);
+                (d != 0.0).then(|| Val::Num(x - d * (x / d).floor()))
+            }
+            "PI" => Some(Val::Num(PI)),
+            "DEG" => num(n(0)? * PI / 180.0),
+            "RAD" => num(n(0)?),
+            "MAX" => all()?.into_iter().reduce(f64::max).map(Val::Num),
+            "MIN" => all()?.into_iter().reduce(f64::min).map(Val::Num),
+            "SUM" => num(all()?.into_iter().sum()),
+            "DEPENDSON" => Some(Val::Num(0.0)),
+            "CAT" => Some(Val::Str(
+                args.iter()
+                    .map(|a| a.as_ref().map(Val::text))
+                    .collect::<Option<Vec<_>>>()?
+                    .concat(),
+            )),
+            "RGB" => {
+                let c = |i: usize| n(i).map(|v| v.round().clamp(0.0, 255.0) as u32);
+                Some(Val::Color((c(0)? << 16) | (c(1)? << 8) | c(2)?))
+            }
+            "THEMEVAL" => {
+                let vals: Vec<Val> = args.into_iter().flatten().collect();
+                self.env.themeval(&vals)
+            }
+            _ => None,
+        }
+    }
+}
+
+fn apply(op: &str, a: Val, b: Val) -> Option<Val> {
+    if op == "&" {
+        return Some(Val::Str(a.text() + &b.text()));
+    }
+    if matches!(op, "=" | "<>" | "<" | ">" | "<=" | ">=") {
+        let ord = match (&a, &b) {
+            (Val::Str(x), Val::Str(y)) => x.to_lowercase().cmp(&y.to_lowercase()),
+            _ => {
+                let (x, y) = (a.num()?, b.num()?);
+                // Equal to the precision cells are stored at.
+                if (x - y).abs() < 1e-9 * x.abs().max(y.abs()).max(1.0) {
+                    std::cmp::Ordering::Equal
+                } else {
+                    x.partial_cmp(&y)?
+                }
+            }
+        };
+        use std::cmp::Ordering::*;
+        let r = match op {
+            "=" => ord == Equal,
+            "<>" => ord != Equal,
+            "<" => ord == Less,
+            ">" => ord == Greater,
+            "<=" => ord != Greater,
+            _ => ord != Less,
+        };
+        return Some(Val::Num(r as u8 as f64));
+    }
+    let (x, y) = (a.num()?, b.num()?);
+    let r = match op {
+        "+" => x + y,
+        "-" => x - y,
+        "*" => x * y,
+        _ => {
+            if y == 0.0 {
+                return None;
+            }
+            x / y
+        }
+    };
+    r.is_finite().then_some(Val::Num(r))
+}
+
+/// A colour as a V attribute holds it: `#RRGGBB`, or an index of the colour
+/// table (`table` answers for the indexes past 23).
+pub fn parse_color(v: &str, table: &dyn Fn(u32) -> Option<u32>) -> Option<u32> {
+    let t = v.trim();
+    if let Some(h) = t.strip_prefix('#') {
+        if h.len() == 6 {
+            return u32::from_str_radix(h, 16).ok();
+        }
+        return None;
+    }
+    let n = parse_number(t)?;
+    if !(0.0..=16_777_215.0).contains(&n) {
+        return None;
+    }
+    let ix = n as u32;
+    // Custom colours ("RGB(r,g,b)" read as numbers) are past the table.
+    if ix <= 23 {
+        return Some(DEFAULT_COLORS[ix as usize]);
+    }
+    table(ix)
+}
+
+/// The colour table's first 24 entries ([MS-VSDX] 2.2.7.6).
+pub const DEFAULT_COLORS: [u32; 24] = [
+    0x000000, 0xFFFFFF, 0xFF0000, 0x00FF00, 0x0000FF, 0xFFFF00, 0xFF00FF, 0x00FFFF, 0x800000,
+    0x008000, 0x000080, 0x808000, 0x800080, 0x008080, 0xC0C0C0, 0xE6E6E6, 0xCDCDCD, 0xB3B3B3,
+    0x9A9A9A, 0x808080, 0x666666, 0x4D4D4D, 0x333333, 0x1A1A1A,
+];
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    struct Cells;
+
+    impl Env for Cells {
+        fn cell(&mut self, sheet: Option<u32>, path: &str) -> Option<Val> {
+            match (sheet, path) {
+                (None, "Width") => Some(Val::Num(4.0)),
+                (None, "Height") => Some(Val::Num(2.0)),
+                (Some(5), "Width") => Some(Val::Num(10.0)),
+                (None, "User.Name") => Some(Val::Str("a".into())),
+                _ => None,
+            }
+        }
+
+        fn themeval(&mut self, args: &[Val]) -> Option<Val> {
+            args.get(1).cloned()
+        }
+    }
+
+    fn num(f: &str) -> Option<f64> {
+        eval(f, &mut Cells).and_then(|v| v.num())
+    }
+
+    #[test]
+    fn plain_numbers_and_units() {
+        assert_eq!(parse_number("0.25"), Some(0.25));
+        assert_eq!(parse_number(" -1.5E-1 "), Some(-0.15));
+        assert_eq!(parse_number("TRUE"), Some(1.0));
+        assert!((parse_number("25.4 mm").unwrap() - 1.0).abs() < 1e-12);
+        assert_eq!(parse_number("72 pt"), Some(1.0));
+        assert!((parse_number("180 deg").unwrap() - PI).abs() < 1e-12);
+        assert_eq!(parse_number("12 ft"), Some(144.0));
+        assert_eq!(parse_number("Themed"), None);
+        assert_eq!(parse_number("1 parsec"), None);
+        assert_eq!(parse_number(""), None);
+        assert_eq!(parse_number("inf"), None);
+    }
+
+    #[test]
+    fn arithmetic_follows_the_order_of_operations() {
+        assert_eq!(num("Width*0.5"), Some(2.0));
+        assert_eq!(num("1+2*3"), Some(7.0));
+        assert_eq!(num("(1+2)*3"), Some(9.0));
+        assert_eq!(num("-2^2"), Some(4.0));
+        assert_eq!(num("2^3^2"), Some(64.0));
+        assert_eq!(num("Width/Height*0.5"), Some(1.0));
+        assert_eq!(num("Width-1-1"), Some(2.0));
+        assert_eq!(num("1/0"), None);
+    }
+
+    #[test]
+    fn signs_in_front_of_an_operand() {
+        assert_eq!(num("--3"), Some(3.0));
+        assert_eq!(num("-+-3"), Some(3.0));
+        assert_eq!(num("-+3"), Some(-3.0));
+        assert_eq!(num("+-Width"), Some(-4.0));
+        assert_eq!(eval("+User.Name", &mut Cells), Some(Val::Str("a".into())));
+        assert_eq!(eval("-User.Name", &mut Cells), None);
+        assert_eq!(eval("--User.Name", &mut Cells), None);
+    }
+
+    /// 200,000 signs on a 256 KB stack: a recursion per sign overflows it.
+    #[test]
+    fn a_formula_of_signs_is_refused_not_recursed_into() {
+        let f = format!("{}1", "-".repeat(200_000));
+        std::thread::Builder::new()
+            .stack_size(256 * 1024)
+            .spawn(move || assert_eq!(eval(&f, &mut Cells), None))
+            .unwrap()
+            .join()
+            .unwrap();
+    }
+
+    #[test]
+    fn functions_and_comparisons() {
+        assert_eq!(num("IF(Width>3,10,20)"), Some(10.0));
+        assert_eq!(num("IF(Width<>4,10,20)"), Some(20.0));
+        assert_eq!(num("IF(Width<=4,1,2)"), Some(1.0));
+        assert_eq!(num("MAX(Height,3)*2"), Some(6.0));
+        assert_eq!(num("SQRT(Width)"), Some(2.0));
+        assert_eq!(num("AND(1,Width=4)"), Some(1.0));
+        assert_eq!(num("NOT(OR(0,0))"), Some(1.0));
+        assert_eq!(num("GUARD(Width*2)"), Some(8.0));
+        assert_eq!(num("IFERROR(Nope,7)"), Some(7.0));
+        // The branch not taken may fail.
+        assert_eq!(num("IF(1,5,Nope)"), Some(5.0));
+        assert_eq!(num("IF(0,5,Nope)"), None);
+        assert_eq!(num("THEMEVAL(\"LineWeight\",3)"), Some(3.0));
+    }
+
+    #[test]
+    fn units_in_formulas_and_references_to_other_shapes() {
+        assert_eq!(num("Sheet.5!Width*2"), Some(20.0));
+        assert_eq!(num("0.19685039370079DL"), Some(0.19685039370079));
+        assert!((num("25.4 mm+1").unwrap() - 2.0).abs() < 1e-12);
+        assert!((num("DEG(180)").unwrap() - PI).abs() < 1e-12);
+        assert_eq!(num("thePage!PageWidth"), None);
+        assert_eq!(num("Sheet.5!"), None);
+    }
+
+    #[test]
+    fn strings_colors_and_garbage() {
+        assert_eq!(eval("\"a\"&\"b\"", &mut Cells), Some(Val::Str("ab".into())));
+        assert_eq!(
+            eval("RGB(255,0,16)", &mut Cells),
+            Some(Val::Color(0xFF0010))
+        );
+        assert_eq!(eval("#00ff7f", &mut Cells), Some(Val::Color(0x00FF7F)));
+        assert_eq!(eval("User.Name=\"A\"", &mut Cells), Some(Val::Num(1.0)));
+        for bad in ["", "(", "1+", "*2", "ABS(", "\"x", "#12", "1 2"] {
+            assert_eq!(eval(bad, &mut Cells), None, "{bad:?}");
+        }
+        let deep = "(".repeat(5000) + "1" + &")".repeat(5000);
+        assert_eq!(eval(&deep, &mut Cells), None);
+        let long = "1+".repeat(10_000) + "1";
+        assert_eq!(eval(&long, &mut Cells), None);
+    }
+
+    #[test]
+    fn colors_by_table_and_by_value() {
+        let table = |i: u32| (i == 30).then_some(0x112233);
+        assert_eq!(parse_color("#FF8800", &table), Some(0xFF8800));
+        assert_eq!(parse_color("2", &table), Some(0xFF0000));
+        assert_eq!(parse_color("30", &table), Some(0x112233));
+        assert_eq!(parse_color("31", &table), None);
+        assert_eq!(parse_color("Themed", &table), None);
+        assert_eq!(parse_color("#12", &table), None);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/geom.rs b/crates/exav-render/src/formats/office/slides/vsdx/geom.rs
new file mode 100644
index 00000000..cf6efde6
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/geom.rs
@@ -0,0 +1,1146 @@
+//! Geometry sections ([MS-VSDX] 2.2.3.2 and 2.4.2) as paths of lines and
+//! cubic curves, in the shape's local coordinates in inches. One section is
+//! one path; its rows are the vertices and segments of it.
+
+use super::formula::parse_number;
+use super::resolve::Tree;
+use crate::formats::office::slides::error::{Error, Result};
+use std::f64::consts::{FRAC_PI_2, PI, TAU};
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Seg {
+    Move(f64, f64),
+    Line(f64, f64),
+    Cubic([f64; 6]),
+    Close,
+}
+
+#[derive(Debug, Default)]
+pub struct GPath {
+    pub fill: bool,
+    pub stroke: bool,
+    pub segs: Vec<Seg>,
+}
+
+/// Which side of the chord the arc of an ArcTo row bulges to for a positive
+/// bow, looking from its start to its end: 1 is the left, -1 the right.
+const BOW_SIDE: f64 = -1.0;
+
+/// Coordinates past this are not drawings.
+const LIMIT: f64 = 1.0e7;
+
+struct Builder {
+    segs: Vec<Seg>,
+    cur: (f64, f64),
+    start: (f64, f64),
+    open: bool,
+    /// Segments left to the shape.
+    room: usize,
+    eps: f64,
+}
+
+impl Builder {
+    fn push(&mut self, s: Seg) -> Result<()> {
+        if self.room == 0 {
+            return Err(Error::TooLarge("geometry segments"));
+        }
+        self.room -= 1;
+        self.segs.push(s);
+        Ok(())
+    }
+
+    /// Ends the subpath: closed when it came back to where it started.
+    fn finish(&mut self) -> Result<()> {
+        if self.open
+            && self.segs.len() > 2
+            && (self.cur.0 - self.start.0).abs() <= self.eps
+            && (self.cur.1 - self.start.1).abs() <= self.eps
+        {
+            self.push(Seg::Close)?;
+        }
+        self.open = false;
+        Ok(())
+    }
+
+    fn move_to(&mut self, x: f64, y: f64) -> Result<()> {
+        self.finish()?;
+        self.push(Seg::Move(x, y))?;
+        self.cur = (x, y);
+        self.start = (x, y);
+        self.open = true;
+        Ok(())
+    }
+
+    fn ensure_open(&mut self) -> Result<()> {
+        if !self.open {
+            let (x, y) = self.cur;
+            self.move_to(x, y)?;
+        }
+        Ok(())
+    }
+
+    fn line_to(&mut self, x: f64, y: f64) -> Result<()> {
+        self.ensure_open()?;
+        self.push(Seg::Line(x, y))?;
+        self.cur = (x, y);
+        Ok(())
+    }
+
+    fn cubic(&mut self, c: [f64; 6]) -> Result<()> {
+        self.ensure_open()?;
+        self.push(Seg::Cubic(c))?;
+        self.cur = (c[4], c[5]);
+        Ok(())
+    }
+
+    fn quad(&mut self, x1: f64, y1: f64, x: f64, y: f64) -> Result<()> {
+        let (x0, y0) = self.cur;
+        self.cubic([
+            x0 + 2.0 / 3.0 * (x1 - x0),
+            y0 + 2.0 / 3.0 * (y1 - y0),
+            x + 2.0 / 3.0 * (x1 - x),
+            y + 2.0 / 3.0 * (y1 - y),
+            x,
+            y,
+        ])
+    }
+
+    /// An arc through the current point, `ctrl` and `end` on the ellipse
+    /// whose major axis is turned by `ang` and whose axes are as `ratio`.
+    fn arc_to(&mut self, end: (f64, f64), ctrl: (f64, f64), ang: f64, ratio: f64) -> Result<()> {
+        let ratio = if ratio.is_finite() && ratio > 0.0 && ratio <= 1000.0 {
+            ratio
+        } else {
+            1.0
+        };
+        let (s, c) = ang.sin_cos();
+        // The ellipse as a circle: along its axes, the minor one stretched.
+        let fwd = |p: (f64, f64)| (p.0 * c + p.1 * s, (-p.0 * s + p.1 * c) * ratio);
+        let inv = |q: (f64, f64)| {
+            let y = q.1 / ratio;
+            (q.0 * c - y * s, q.0 * s + y * c)
+        };
+        let (q0, qc, q1) = (fwd(self.cur), fwd(ctrl), fwd(end));
+        let Some((cx, cy, r)) = circumcircle(q0, qc, q1) else {
+            return self.line_to(end.0, end.1);
+        };
+        if !(r.is_finite() && r < LIMIT) {
+            return self.line_to(end.0, end.1);
+        }
+        let ang_of = |q: (f64, f64)| (q.1 - cy).atan2(q.0 - cx);
+        let (a0, ac, a1) = (ang_of(q0), ang_of(qc), ang_of(q1));
+        let ccw_end = (a1 - a0).rem_euclid(TAU);
+        let ccw_ctrl = (ac - a0).rem_euclid(TAU);
+        let sweep = if ccw_ctrl < ccw_end {
+            ccw_end
+        } else {
+            ccw_end - TAU
+        };
+        let pieces = ((sweep.abs() / FRAC_PI_2).ceil() as usize).clamp(1, 4);
+        let step = sweep / pieces as f64;
+        let k = 4.0 / 3.0 * (step / 4.0).tan();
+        self.ensure_open()?;
+        let mut a = a0;
+        for i in 0..pieces {
+            let b = a + step;
+            let p0 = (cx + r * a.cos(), cy + r * a.sin());
+            let p3 = (cx + r * b.cos(), cy + r * b.sin());
+            let p1 = (p0.0 - k * r * a.sin(), p0.1 + k * r * a.cos());
+            let p2 = (p3.0 + k * r * b.sin(), p3.1 - k * r * b.cos());
+            let (m1, m2) = (inv(p1), inv(p2));
+            // The last piece ends exactly where the row says.
+            let m3 = if i + 1 == pieces { end } else { inv(p3) };
+            self.cubic([m1.0, m1.1, m2.0, m2.1, m3.0, m3.1])?;
+            a = b;
+        }
+        Ok(())
+    }
+
+    /// A B-spline through the current point as its first control point,
+    /// the `ctrl` points after it, the knots one to a control point and
+    /// `last` closing the knot vector.
+    fn spline(
+        &mut self,
+        ctrl: &[(f64, f64)],
+        knots: &[f64],
+        weights: &[f64],
+        last: f64,
+        degree: usize,
+    ) -> Result<()> {
+        let samples = nurbs(ctrl, knots, weights, last, degree);
+        let end = *ctrl.last().unwrap_or(&self.cur);
+        for p in samples {
+            self.line_to(p.0, p.1)?;
+        }
+        if self.cur != end {
+            self.line_to(end.0, end.1)?;
+        }
+        Ok(())
+    }
+}
+
+/// Centre and radius of the circle through three points.
+fn circumcircle(a: (f64, f64), b: (f64, f64), c: (f64, f64)) -> Option<(f64, f64, f64)> {
+    let d = 2.0 * (a.0 * (b.1 - c.1) + b.0 * (c.1 - a.1) + c.0 * (a.1 - b.1));
+    let scale =
+        a.0.abs()
+            .max(a.1.abs())
+            .max(b.0.abs())
+            .max(b.1.abs())
+            .max(1e-9);
+    if !d.is_finite() || d.abs() < 1e-12 * scale * scale {
+        return None;
+    }
+    let (a2, b2, c2) = (
+        a.0 * a.0 + a.1 * a.1,
+        b.0 * b.0 + b.1 * b.1,
+        c.0 * c.0 + c.1 * c.1,
+    );
+    let ux = (a2 * (b.1 - c.1) + b2 * (c.1 - a.1) + c2 * (a.1 - b.1)) / d;
+    let uy = (a2 * (c.0 - b.0) + b2 * (a.0 - c.0) + c2 * (b.0 - a.0)) / d;
+    let r = ((a.0 - ux).powi(2) + (a.1 - uy).powi(2)).sqrt();
+    (ux.is_finite() && uy.is_finite()).then_some((ux, uy, r))
+}
+
+/// The basis functions of degree `p` at `u` in knot span `span`.
+fn basis(span: usize, u: f64, p: usize, knots: &[f64]) -> Vec<f64> {
+    let mut n = vec![0.0; p + 1];
+    let mut left = vec![0.0; p + 1];
+    let mut right = vec![0.0; p + 1];
+    n[0] = 1.0;
+    for j in 1..=p {
+        left[j] = u - knots[span + 1 - j];
+        right[j] = knots[span + j] - u;
+        let mut saved = 0.0;
+        for r in 0..j {
+            let d = right[r + 1] + left[j - r];
+            let t = if d == 0.0 { 0.0 } else { n[r] / d };
+            n[r] = saved + right[r + 1] * t;
+            saved = left[j - r] * t;
+        }
+        n[j] = saved;
+    }
+    n
+}
+
+/// Points along a NURBS, after its first control point and up to its last,
+/// as a polyline fine enough to look like the curve. Without a valid knot
+/// vector, the control polygon.
+fn nurbs(
+    ctrl: &[(f64, f64)],
+    knots: &[f64],
+    weights: &[f64],
+    last: f64,
+    degree: usize,
+) -> Vec<(f64, f64)> {
+    let count = ctrl.len();
+    let polygon = || ctrl.iter().skip(1).copied().collect::<Vec<_>>();
+    if count < 2 || degree == 0 || degree >= count || knots.len() != count || weights.len() != count
+    {
+        return polygon();
+    }
+    let n = count - 1;
+    let mut u: Vec<f64> = knots.to_vec();
+    u.extend(std::iter::repeat_n(last, degree + 1));
+    if u.iter().any(|k| !k.is_finite()) || u.array_windows().any(|[a, b]| b < a) {
+        return polygon();
+    }
+    let (lo, hi) = (u[degree], u[n + 1]);
+    if hi <= lo {
+        return polygon();
+    }
+    // Eight points on each span between distinct knots.
+    let mut cuts: Vec<f64> = vec![lo];
+    for &k in &u[degree..=n + 1] {
+        if k > *cuts.last().unwrap_or(&lo) {
+            cuts.push(k);
+        }
+    }
+    let per = 8usize;
+    let mut out = vec![];
+    for [a, b] in cuts.array_windows() {
+        for i in 1..=per {
+            let t = a + (b - a) * i as f64 / per as f64;
+            if out.len() >= 4096 {
+                return polygon();
+            }
+            if t >= hi {
+                break;
+            }
+            let span = (degree..=n)
+                .rev()
+                .find(|&s| u[s] <= t && t < u[s + 1])
+                .unwrap_or(n);
+            let b = basis(span, t, degree, &u);
+            let (mut x, mut y, mut sum) = (0.0, 0.0, 0.0);
+            for (j, nb) in b.iter().enumerate() {
+                let i = span - degree + j;
+                let wt = nb * weights[i];
+                x += wt * ctrl[i].0;
+                y += wt * ctrl[i].1;
+                sum += wt;
+            }
+            if sum == 0.0 {
+                return polygon();
+            }
+            out.push((x / sum, y / sum));
+        }
+    }
+    out.push(ctrl[n]);
+    out
+}
+
+/// The numbers in the arguments of `NURBS(...)` or `POLYLINE(...)`.
+fn arguments(f: &str) -> Vec<f64> {
+    let inner = match (f.find('('), f.rfind(')')) {
+        (Some(a), Some(b)) if a < b => &f[a + 1..b],
+        _ => return vec![],
+    };
+    inner
+        .split(',')
+        .map(|s| parse_number(s).unwrap_or(0.0))
+        .take(60_000)
+        .collect()
+}
+
+/// The paths of the geometry sections of shape `n`, `w` by `h` inches, at
+/// most `max_segs` segments in all.
+pub fn paths(t: &Tree, n: usize, w: f64, h: f64, max_segs: usize) -> Result<Vec<GPath>> {
+    let mut out = vec![];
+    let mut room = max_segs;
+    let eps = 1e-6 * (1.0 + w.abs().max(h.abs()));
+    let round = t
+        .num(n, "Rounding")
+        .filter(|r| r.is_finite())
+        .map_or(0.0, |r| r.max(0.0));
+    for six in t.sections(n, "Geometry") {
+        let flag = |name: &str| {
+            t.section_val(n, "Geometry", six, name)
+                .and_then(|v| v.num())
+                .is_some_and(|v| v != 0.0)
+        };
+        if flag("NoShow") {
+            continue;
+        }
+        let mut b = Builder {
+            segs: vec![],
+            cur: (0.0, 0.0),
+            start: (0.0, 0.0),
+            open: false,
+            room,
+            eps,
+        };
+        rows(t, n, six, w, h, &mut b)?;
+        b.finish()?;
+        room = b.room;
+        let mut segs = b.segs;
+        if round > 0.0 {
+            let rounded = round_corners(&segs, round.min(LIMIT));
+            // Each corner is one segment more.
+            let extra = rounded.len().saturating_sub(segs.len());
+            room = room
+                .checked_sub(extra)
+                .ok_or(Error::TooLarge("geometry segments"))?;
+            segs = rounded;
+        }
+        if !segs.is_empty() {
+            out.push(GPath {
+                fill: !flag("NoFill"),
+                stroke: !flag("NoLine"),
+                segs,
+            });
+        }
+    }
+    Ok(out)
+}
+
+/// The two ends of a corner's arc and its two handles.
+type Arc = ((f64, f64), (f64, f64), (f64, f64), (f64, f64));
+
+/// The subpaths of straight segments with their corners rounded by arcs of
+/// radius `r` ([MS-VSDX] 2.4.4.298 Rounding): an arc is as long as the
+/// shorter side leaves room for, half of it at most. Subpaths with curves
+/// are left as they are.
+fn round_corners(segs: &[Seg], r: f64) -> Vec<Seg> {
+    let mut out = Vec::with_capacity(segs.len() + segs.len() / 2);
+    let mut i = 0;
+    while i < segs.len() {
+        // One subpath: from a Move to the next Move.
+        let mut j = i + 1;
+        while j < segs.len() && !matches!(segs[j], Seg::Move(..)) {
+            j += 1;
+        }
+        let sub = &segs[i..j];
+        i = j;
+        let straight = sub.iter().all(|s| !matches!(s, Seg::Cubic(_)));
+        let (Seg::Move(x0, y0), true) = (sub[0], straight) else {
+            out.extend_from_slice(sub);
+            continue;
+        };
+        let closed = sub.last() == Some(&Seg::Close);
+        let mut pts = vec![(x0, y0)];
+        for s in &sub[1..] {
+            if let Seg::Line(x, y) = s {
+                pts.push((*x, *y));
+            }
+        }
+        if closed && pts.len() > 1 && pts.first() == pts.last() {
+            pts.pop();
+        }
+        let n = pts.len();
+        if n < 3 {
+            out.extend_from_slice(sub);
+            continue;
+        }
+        // The two points of the arc at corner `k`, with its handles; `None`
+        // where the corner is not one (a straight angle, or an end).
+        let corner = |k: usize| -> Option<Arc> {
+            if !closed && (k == 0 || k == n - 1) {
+                return None;
+            }
+            let (a, b, c) = (pts[(k + n - 1) % n], pts[k], pts[(k + 1) % n]);
+            let (u, v) = ((a.0 - b.0, a.1 - b.1), (c.0 - b.0, c.1 - b.1));
+            let (lu, lv) = (u.0.hypot(u.1), v.0.hypot(v.1));
+            if lu < 1e-12 || lv < 1e-12 {
+                return None;
+            }
+            let (u, v) = ((u.0 / lu, u.1 / lu), (v.0 / lv, v.1 / lv));
+            // The angle between the sides; its tangent length for radius r.
+            let cos = (u.0 * v.0 + u.1 * v.1).clamp(-1.0, 1.0);
+            let phi = cos.acos();
+            if phi > PI - 1e-6 || phi < 1e-6 {
+                return None;
+            }
+            let t = (r / (phi / 2.0).tan()).min(lu / 2.0).min(lv / 2.0);
+            let radius = t * (phi / 2.0).tan();
+            // The handle along the tangent for the arc that turns by
+            // pi - phi.
+            let turn = PI - phi;
+            let handle = 4.0 / 3.0 * (turn / 4.0).tan() * radius;
+            let p0 = (b.0 + u.0 * t, b.1 + u.1 * t);
+            let p3 = (b.0 + v.0 * t, b.1 + v.1 * t);
+            let p1 = (p0.0 - u.0 * handle, p0.1 - u.1 * handle);
+            let p2 = (p3.0 - v.0 * handle, p3.1 - v.1 * handle);
+            Some((p0, p1, p2, p3))
+        };
+        let corners: Vec<_> = (0..n).map(corner).collect();
+        // Start where the first side ends: at the first corner's arc end,
+        // or the first point.
+        let start = match corners[0] {
+            Some((_, _, _, p3)) if closed => p3,
+            _ => pts[0],
+        };
+        out.push(Seg::Move(start.0, start.1));
+        let order: Vec<usize> = if closed {
+            (1..n).chain(std::iter::once(0)).collect()
+        } else {
+            (1..n).collect()
+        };
+        for k in order {
+            match corners[k] {
+                Some((p0, p1, p2, p3)) => {
+                    out.push(Seg::Line(p0.0, p0.1));
+                    out.push(Seg::Cubic([p1.0, p1.1, p2.0, p2.1, p3.0, p3.1]));
+                }
+                None => out.push(Seg::Line(pts[k].0, pts[k].1)),
+            }
+        }
+        if closed {
+            out.push(Seg::Close);
+        }
+    }
+    out
+}
+
+fn rows(t: &Tree, n: usize, six: u32, w: f64, h: f64, b: &mut Builder) -> Result<()> {
+    // A spline being collected: control points, knots, weights, last knot
+    // and degree.
+    type Spline = (Vec<(f64, f64)>, Vec<f64>, Vec<f64>, f64, usize);
+    let mut spline: Option<Spline> = None;
+    for (key, ty) in t.rows(n, "Geometry", Some(six)) {
+        let v = |c: &str| {
+            t.row_num(n, "Geometry", Some(six), &key, c)
+                .filter(|v| v.is_finite())
+                .map_or(0.0, |v| v.clamp(-LIMIT, LIMIT))
+        };
+        let ty = ty.unwrap_or("");
+        if ty != "SplineKnot"
+            && let Some((c, k, wt, last, d)) = spline.take()
+        {
+            b.spline(&c, &k, &wt, last, d)?;
+        }
+        match ty {
+            "MoveTo" => b.move_to(v("X"), v("Y"))?,
+            "RelMoveTo" => b.move_to(v("X") * w, v("Y") * h)?,
+            "LineTo" => b.line_to(v("X"), v("Y"))?,
+            "RelLineTo" => b.line_to(v("X") * w, v("Y") * h)?,
+            "ArcTo" => {
+                let (p0, p1) = (b.cur, (v("X"), v("Y")));
+                let (dx, dy) = (p1.0 - p0.0, p1.1 - p0.1);
+                let chord = dx.hypot(dy);
+                let bow = v("A");
+                if chord < 1e-9 || bow.abs() < 1e-9 {
+                    b.line_to(p1.0, p1.1)?;
+                } else {
+                    let m = (
+                        (p0.0 + p1.0) / 2.0 - dy / chord * bow * BOW_SIDE,
+                        (p0.1 + p1.1) / 2.0 + dx / chord * bow * BOW_SIDE,
+                    );
+                    b.arc_to(p1, m, 0.0, 1.0)?;
+                }
+            }
+            "EllipticalArcTo" => {
+                b.arc_to((v("X"), v("Y")), (v("A"), v("B")), v("C"), v("D"))?;
+            }
+            "RelEllipticalArcTo" => {
+                b.arc_to(
+                    (v("X") * w, v("Y") * h),
+                    (v("A") * w, v("B") * h),
+                    v("C"),
+                    v("D"),
+                )?;
+            }
+            "Ellipse" => {
+                let (cx, cy) = (v("X"), v("Y"));
+                let (ux, uy) = (v("A") - cx, v("B") - cy);
+                let (vx, vy) = (v("C") - cx, v("D") - cy);
+                let pt = |t: f64| {
+                    (
+                        cx + ux * t.cos() + vx * t.sin(),
+                        cy + uy * t.cos() + vy * t.sin(),
+                    )
+                };
+                let d = |t: f64| (-ux * t.sin() + vx * t.cos(), -uy * t.sin() + vy * t.cos());
+                let k = 4.0 / 3.0 * (PI / 8.0).tan();
+                let p = pt(0.0);
+                b.move_to(p.0, p.1)?;
+                for i in 0..4 {
+                    let (t0, t1) = (i as f64 * FRAC_PI_2, (i + 1) as f64 * FRAC_PI_2);
+                    let (a, e) = (pt(t0), pt(t1));
+                    let (da, de) = (d(t0), d(t1));
+                    b.cubic([
+                        a.0 + k * da.0,
+                        a.1 + k * da.1,
+                        e.0 - k * de.0,
+                        e.1 - k * de.1,
+                        e.0,
+                        e.1,
+                    ])?;
+                }
+                b.cur = b.start;
+            }
+            "InfiniteLine" => {
+                let (p, q) = ((v("X"), v("Y")), (v("A"), v("B")));
+                if let Some((a, e)) = clip_line(p, q, w, h) {
+                    b.move_to(a.0, a.1)?;
+                    b.line_to(e.0, e.1)?;
+                }
+            }
+            "PolylineTo" => {
+                let text = match t.row_val(n, "Geometry", Some(six), &key, "A") {
+                    Some(super::formula::Val::Str(s)) => s,
+                    _ => String::new(),
+                };
+                let a = arguments(&text);
+                if a.len() >= 2 {
+                    let (xs, ys) = (
+                        if a[0] == 0.0 { w } else { 1.0 },
+                        if a[1] == 0.0 { h } else { 1.0 },
+                    );
+                    for p in a[2..].as_chunks::<2>().0 {
+                        b.line_to(
+                            p[0].clamp(-LIMIT, LIMIT) * xs,
+                            p[1].clamp(-LIMIT, LIMIT) * ys,
+                        )?;
+                    }
+                }
+                b.line_to(v("X"), v("Y"))?;
+            }
+            "NURBSTo" => {
+                let text = match t.row_val(n, "Geometry", Some(six), &key, "E") {
+                    Some(super::formula::Val::Str(s)) => s,
+                    _ => String::new(),
+                };
+                let a = arguments(&text);
+                let mut ctrl = vec![b.cur];
+                let mut knots = vec![v("C")];
+                let mut weights = vec![v("D")];
+                let (last, degree) = (
+                    a.first().copied().unwrap_or(1.0),
+                    a.get(1).copied().unwrap_or(3.0),
+                );
+                if a.len() >= 4 {
+                    let (xs, ys) = (
+                        if a[2] == 0.0 { w } else { 1.0 },
+                        if a[3] == 0.0 { h } else { 1.0 },
+                    );
+                    for p in a[4..].as_chunks::<4>().0 {
+                        ctrl.push((
+                            p[0].clamp(-LIMIT, LIMIT) * xs,
+                            p[1].clamp(-LIMIT, LIMIT) * ys,
+                        ));
+                        knots.push(p[2]);
+                        weights.push(p[3]);
+                    }
+                }
+                ctrl.push((v("X"), v("Y")));
+                knots.push(v("A"));
+                weights.push(v("B"));
+                b.spline(
+                    &ctrl,
+                    &knots,
+                    &weights,
+                    last,
+                    degree.clamp(0.0, 25.0) as usize,
+                )?;
+            }
+            "SplineStart" => {
+                let ctrl = vec![b.cur, (v("X"), v("Y"))];
+                spline = Some((
+                    ctrl,
+                    vec![v("B"), v("A")],
+                    vec![1.0, 1.0],
+                    v("C"),
+                    v("D").clamp(0.0, 25.0) as usize,
+                ));
+            }
+            "SplineKnot" => {
+                if let Some((c, k, wt, _, _)) = spline.as_mut() {
+                    c.push((v("X"), v("Y")));
+                    k.push(v("A"));
+                    wt.push(1.0);
+                }
+            }
+            "RelCubBezTo" => b.cubic([
+                v("A") * w,
+                v("B") * h,
+                v("C") * w,
+                v("D") * h,
+                v("X") * w,
+                v("Y") * h,
+            ])?,
+            "RelQuadBezTo" => b.quad(v("A") * w, v("B") * h, v("X") * w, v("Y") * h)?,
+            _ => {}
+        }
+    }
+    if let Some((c, k, wt, last, d)) = spline.take() {
+        b.spline(&c, &k, &wt, last, d)?;
+    }
+    Ok(())
+}
+
+/// The part of the line through `p` and `q` inside the box from the
+/// origin to (`w`, `h`), either way round.
+fn clip_line(p: (f64, f64), q: (f64, f64), w: f64, h: f64) -> Option<((f64, f64), (f64, f64))> {
+    let d = (q.0 - p.0, q.1 - p.1);
+    if d.0.abs() < 1e-12 && d.1.abs() < 1e-12 {
+        return None;
+    }
+    let (mut lo, mut hi) = (f64::NEG_INFINITY, f64::INFINITY);
+    for (p0, d0, a, b) in [
+        (p.0, d.0, 0.0f64.min(w), 0.0f64.max(w)),
+        (p.1, d.1, 0.0f64.min(h), 0.0f64.max(h)),
+    ] {
+        if d0.abs() < 1e-12 {
+            if p0 < a || p0 > b {
+                return None;
+            }
+        } else {
+            let (t1, t2) = ((a - p0) / d0, (b - p0) / d0);
+            lo = lo.max(t1.min(t2));
+            hi = hi.min(t1.max(t2));
+        }
+    }
+    (lo.is_finite() && hi.is_finite() && lo <= hi).then_some((
+        (p.0 + lo * d.0, p.1 + lo * d.1),
+        (p.0 + hi * d.0, p.1 + hi * d.1),
+    ))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::limits::{Budget, Limits};
+    use crate::formats::office::slides::vsdx::resolve::{Doc, Master, tests::shapes};
+    use std::collections::HashMap;
+
+    fn geometry(rows: &str, w: f64, h: f64, max: usize) -> Result<Vec<GPath>> {
+        let page = shapes(&format!(
+            "<S><Shape ID='1'><Section N='Geometry' IX='0'><Cell N='NoFill' V='0'/>{rows}</Section></Shape></S>"
+        ));
+        let d = Doc::default();
+        let m: HashMap<u32, Master> = HashMap::new();
+        let t = Tree::build(&d, &m, &page, &mut Budget::new(Limits::default())).unwrap();
+        paths(&t, t.roots[0], w, h, max)
+    }
+
+    fn row(i: u32, t: &str, cells: &[(&str, &str)]) -> String {
+        let c: String = cells
+            .iter()
+            .map(|(n, v)| format!("<Cell N='{n}' V='{v}'/>"))
+            .collect();
+        format!("<Row T='{t}' IX='{i}'>{c}</Row>")
+    }
+
+    fn near(a: f64, b: f64) -> bool {
+        (a - b).abs() < 1e-6
+    }
+
+    #[test]
+    fn lines_and_relative_lines_close_where_they_start() {
+        let rows = [
+            row(1, "MoveTo", &[("X", "0"), ("Y", "0")]),
+            row(2, "LineTo", &[("X", "2"), ("Y", "0")]),
+            row(3, "RelLineTo", &[("X", "1"), ("Y", "1")]),
+            row(4, "LineTo", &[("X", "0"), ("Y", "1")]),
+            row(5, "RelLineTo", &[("X", "0"), ("Y", "0")]),
+        ]
+        .concat();
+        let p = geometry(&rows, 2.0, 1.0, 100).unwrap();
+        assert_eq!(p.len(), 1);
+        assert!(p[0].fill && p[0].stroke);
+        assert_eq!(
+            p[0].segs,
+            vec![
+                Seg::Move(0.0, 0.0),
+                Seg::Line(2.0, 0.0),
+                Seg::Line(2.0, 1.0),
+                Seg::Line(0.0, 1.0),
+                Seg::Line(0.0, 0.0),
+                Seg::Close
+            ]
+        );
+    }
+
+    #[test]
+    fn an_open_path_is_not_closed_and_move_to_starts_another_subpath() {
+        let rows = [
+            row(1, "MoveTo", &[("X", "0"), ("Y", "0")]),
+            row(2, "LineTo", &[("X", "1"), ("Y", "0")]),
+            row(3, "MoveTo", &[("X", "5"), ("Y", "5")]),
+            row(4, "LineTo", &[("X", "6"), ("Y", "5")]),
+        ]
+        .concat();
+        let p = geometry(&rows, 1.0, 1.0, 100).unwrap();
+        assert!(!p[0].segs.contains(&Seg::Close));
+        assert_eq!(
+            p[0].segs
+                .iter()
+                .filter(|s| matches!(s, Seg::Move(..)))
+                .count(),
+            2
+        );
+    }
+
+    #[test]
+    fn flags_hide_a_path_or_its_fill_and_line() {
+        let page = shapes(
+            "<S><Shape ID='1'>
+              <Section N='Geometry' IX='0'><Cell N='NoFill' V='1'/><Cell N='NoLine' V='0'/>
+                <Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row>
+                <Row T='LineTo' IX='2'><Cell N='X' V='1'/><Cell N='Y' V='1'/></Row></Section>
+              <Section N='Geometry' IX='1'><Cell N='NoShow' V='1'/>
+                <Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row></Section>
+              <Section N='Geometry' IX='2'><Cell N='NoLine' V='1'/>
+                <Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row></Section></Shape></S>",
+        );
+        let d = Doc::default();
+        let m = HashMap::new();
+        let t = Tree::build(&d, &m, &page, &mut Budget::new(Limits::default())).unwrap();
+        let p = paths(&t, 0, 1.0, 1.0, 100).unwrap();
+        assert_eq!(p.len(), 2);
+        assert_eq!((p[0].fill, p[0].stroke), (false, true));
+        assert_eq!((p[1].fill, p[1].stroke), (true, false));
+    }
+
+    #[test]
+    fn an_elliptical_arc_passes_through_its_points_and_ends_where_it_says() {
+        // A half circle of radius 1 about (1, 0) from (0, 0) to (2, 0) over
+        // the top: the control point is the top of it.
+        let rows = [
+            row(1, "MoveTo", &[("X", "0"), ("Y", "0")]),
+            row(
+                2,
+                "EllipticalArcTo",
+                &[
+                    ("X", "2"),
+                    ("Y", "0"),
+                    ("A", "1"),
+                    ("B", "1"),
+                    ("C", "0"),
+                    ("D", "1"),
+                ],
+            ),
+        ]
+        .concat();
+        let p = geometry(&rows, 2.0, 1.0, 100).unwrap();
+        let cubics: Vec<[f64; 6]> = p[0]
+            .segs
+            .iter()
+            .filter_map(|s| {
+                if let Seg::Cubic(c) = s {
+                    Some(*c)
+                } else {
+                    None
+                }
+            })
+            .collect();
+        assert_eq!(cubics.len(), 2);
+        // The middle of the arc is the control point.
+        assert!(near(cubics[0][4], 1.0) && near(cubics[0][5], 1.0));
+        let last = cubics[1];
+        assert_eq!((last[4], last[5]), (2.0, 0.0));
+        // Every control point stays within the circle's bounding box.
+        for c in &cubics {
+            for p in c.chunks(2) {
+                assert!(
+                    p[0] > -0.01 && p[0] < 2.01 && p[1] > -0.01 && p[1] < 1.01,
+                    "{p:?}"
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn an_arc_with_a_bow_bulges_by_the_bow_to_the_right_of_its_direction() {
+        let arc = |bow: &str| {
+            let rows = [
+                row(1, "MoveTo", &[("X", "0"), ("Y", "0")]),
+                row(2, "ArcTo", &[("X", "2"), ("Y", "0"), ("A", bow)]),
+            ]
+            .concat();
+            let p = geometry(&rows, 2.0, 1.0, 100).unwrap();
+            let cubics: Vec<[f64; 6]> = p[0]
+                .segs
+                .iter()
+                .filter_map(|s| {
+                    if let Seg::Cubic(c) = s {
+                        Some(*c)
+                    } else {
+                        None
+                    }
+                })
+                .collect();
+            assert_eq!(cubics.len(), 2);
+            (cubics[0], cubics[1])
+        };
+        // From the left to the right with a positive bow the arc dips: its
+        // middle is half a unit below the middle of the chord.
+        let (first, last) = arc("0.5");
+        assert!(near(first[4], 1.0) && near(first[5], -0.5), "{first:?}");
+        assert_eq!((last[4], last[5]), (2.0, 0.0));
+        let (first, _) = arc("-0.5");
+        assert!(near(first[4], 1.0) && near(first[5], 0.5), "{first:?}");
+    }
+
+    #[test]
+    fn an_ellipse_row_is_a_closed_ellipse_through_its_points() {
+        let rows = row(
+            1,
+            "Ellipse",
+            &[
+                ("X", "1"),
+                ("Y", "1"),
+                ("A", "2"),
+                ("B", "1"),
+                ("C", "1"),
+                ("D", "2"),
+            ],
+        );
+        let p = geometry(&rows, 2.0, 2.0, 100).unwrap();
+        let c: Vec<[f64; 6]> = p[0]
+            .segs
+            .iter()
+            .filter_map(|s| {
+                if let Seg::Cubic(c) = s {
+                    Some(*c)
+                } else {
+                    None
+                }
+            })
+            .collect();
+        assert_eq!(c.len(), 4);
+        assert!(near(c[0][4], 1.0) && near(c[0][5], 2.0));
+        // A circle of radius 1: the handle of the first quarter is 0.5523
+        // along the tangent at (2, 1).
+        assert!(
+            near(c[0][0], 2.0) && near(c[0][1], 1.0 + 0.5522847498),
+            "{:?}",
+            c[0]
+        );
+        assert!(near(c[3][4], 2.0) && near(c[3][5], 1.0));
+        assert_eq!(p[0].segs.last(), Some(&Seg::Close));
+    }
+
+    #[test]
+    fn a_polyline_row_is_lines_relative_or_local() {
+        let page = shapes(
+            "<S><Shape ID='1'><Section N='Geometry' IX='0'>
+              <Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row>
+              <Row T='PolylineTo' IX='2'><Cell N='X' V='2'/><Cell N='Y' V='1'/><Cell N='A' V='POLYLINE(0, 0, 0.5, 0.5, 1, 0)'/></Row>
+              </Section></Shape></S>",
+        );
+        let d = Doc::default();
+        let m = HashMap::new();
+        let t = Tree::build(&d, &m, &page, &mut Budget::new(Limits::default())).unwrap();
+        let p = paths(&t, 0, 4.0, 2.0, 100).unwrap();
+        assert_eq!(
+            p[0].segs,
+            vec![
+                Seg::Move(0.0, 0.0),
+                Seg::Line(2.0, 1.0),
+                Seg::Line(4.0, 0.0),
+                Seg::Line(2.0, 1.0)
+            ]
+        );
+    }
+
+    #[test]
+    fn a_nurbs_follows_its_control_points_and_ends_at_the_last() {
+        // A cubic Bezier: four control points, knots 0 0 0 0 | 1 1 1 1.
+        let rows = [
+            row(1, "MoveTo", &[("X", "0"), ("Y", "0")]),
+            row(
+                2,
+                "NURBSTo",
+                &[
+                    ("X", "3"),
+                    ("Y", "0"),
+                    ("A", "0"),
+                    ("B", "1"),
+                    ("C", "0"),
+                    ("D", "1"),
+                    ("E", "NURBS(1, 3, 1, 1, 1,2,0,1, 2,2,0,1)"),
+                ],
+            ),
+        ]
+        .concat();
+        let p = geometry(&rows, 3.0, 2.0, 1000).unwrap();
+        let pts: Vec<(f64, f64)> = p[0]
+            .segs
+            .iter()
+            .filter_map(|s| {
+                if let Seg::Line(x, y) = s {
+                    Some((*x, *y))
+                } else {
+                    None
+                }
+            })
+            .collect();
+        assert_eq!(*pts.last().unwrap(), (3.0, 0.0));
+        assert!(pts.len() > 4);
+        // The middle of the Bezier (0,0) (1,2) (2,2) (3,0) is (1.5, 1.5).
+        let mid = pts
+            .iter()
+            .find(|p| near(p.0, 1.5))
+            .expect("a point at x = 1.5");
+        assert!(near(mid.1, 1.5), "{mid:?}");
+        assert!(pts.iter().all(|p| p.1 <= 1.5 + 1e-9 && p.1 >= -1e-9));
+    }
+
+    #[test]
+    fn a_nurbs_without_a_valid_knot_vector_is_its_control_polygon() {
+        let rows = [
+            row(1, "MoveTo", &[("X", "0"), ("Y", "0")]),
+            row(
+                2,
+                "NURBSTo",
+                &[
+                    ("X", "3"),
+                    ("Y", "0"),
+                    ("A", "9"),
+                    ("B", "1"),
+                    ("C", "5"),
+                    ("D", "1"),
+                    ("E", "NURBS(1, 3, 1, 1, 1,2,0,1)"),
+                ],
+            ),
+        ]
+        .concat();
+        let p = geometry(&rows, 3.0, 2.0, 1000).unwrap();
+        assert_eq!(
+            p[0].segs,
+            vec![
+                Seg::Move(0.0, 0.0),
+                Seg::Line(1.0, 2.0),
+                Seg::Line(3.0, 0.0)
+            ]
+        );
+    }
+
+    #[test]
+    fn an_infinite_line_is_cut_at_the_box() {
+        let rows = row(
+            1,
+            "InfiniteLine",
+            &[("X", "0"), ("Y", "0"), ("A", "1"), ("B", "1")],
+        );
+        let p = geometry(&rows, 4.0, 2.0, 100).unwrap();
+        assert_eq!(p[0].segs, vec![Seg::Move(0.0, 0.0), Seg::Line(2.0, 2.0)]);
+        // A line that misses the box is not drawn.
+        let rows = row(
+            1,
+            "InfiniteLine",
+            &[("X", "9"), ("Y", "0"), ("A", "9"), ("B", "1")],
+        );
+        assert!(geometry(&rows, 4.0, 2.0, 100).unwrap().is_empty());
+    }
+
+    #[test]
+    fn relative_bezier_rows_scale_with_the_shape() {
+        let rows = [
+            row(1, "RelMoveTo", &[("X", "0"), ("Y", "0")]),
+            row(
+                2,
+                "RelCubBezTo",
+                &[
+                    ("X", "1"),
+                    ("Y", "1"),
+                    ("A", "0.25"),
+                    ("B", "0"),
+                    ("C", "1"),
+                    ("D", "0.5"),
+                ],
+            ),
+            row(
+                3,
+                "RelQuadBezTo",
+                &[("X", "0"), ("Y", "0"), ("A", "1"), ("B", "1")],
+            ),
+        ]
+        .concat();
+        let p = geometry(&rows, 4.0, 2.0, 100).unwrap();
+        assert_eq!(p[0].segs[1], Seg::Cubic([1.0, 0.0, 4.0, 1.0, 4.0, 2.0]));
+        assert!(matches!(p[0].segs[2], Seg::Cubic(_)));
+    }
+
+    fn square() -> Vec<Seg> {
+        vec![
+            Seg::Move(0.0, 0.0),
+            Seg::Line(1.0, 0.0),
+            Seg::Line(1.0, 1.0),
+            Seg::Line(0.0, 1.0),
+            Seg::Line(0.0, 0.0),
+            Seg::Close,
+        ]
+    }
+
+    #[test]
+    fn rounding_replaces_each_corner_of_a_closed_path_by_an_arc() {
+        let p = round_corners(&square(), 0.25);
+        assert_eq!(p.len(), 10);
+        let at = |s: Seg, x: f64, y: f64| match s {
+            Seg::Move(a, b) | Seg::Line(a, b) => near(a, x) && near(b, y),
+            _ => false,
+        };
+        assert!(at(p[0], 0.25, 0.0) && at(p[1], 0.75, 0.0), "{p:?}");
+        // The arc at (1, 0) leaves along the side and turns up; its handles
+        // are 4/3 tan(pi/8) of the radius along the sides.
+        let Seg::Cubic(c) = p[2] else { panic!("{p:?}") };
+        let h = 4.0 / 3.0 * (std::f64::consts::PI / 8.0).tan() * 0.25;
+        assert!(near(c[0], 0.75 + h) && near(c[1], 0.0), "{c:?}");
+        assert!(near(c[2], 1.0) && near(c[3], 0.25 - h), "{c:?}");
+        assert!(near(c[4], 1.0) && near(c[5], 0.25), "{c:?}");
+        assert_eq!(p[9], Seg::Close);
+        // Where the sides are short the arc is half of them at most.
+        let big = round_corners(&square(), 10.0);
+        assert!(at(big[0], 0.5, 0.0) && at(big[1], 0.5, 0.0), "{big:?}");
+    }
+
+    #[test]
+    fn rounding_leaves_the_ends_of_an_open_path_and_paths_with_curves() {
+        let open = vec![
+            Seg::Move(0.0, 0.0),
+            Seg::Line(1.0, 0.0),
+            Seg::Line(1.0, 1.0),
+        ];
+        let p = round_corners(&open, 0.25);
+        assert_eq!(p[0], Seg::Move(0.0, 0.0));
+        assert!(
+            matches!(p[1], Seg::Line(x, y) if near(x, 0.75) && near(y, 0.0)),
+            "{p:?}"
+        );
+        assert_eq!(p.last(), Some(&Seg::Line(1.0, 1.0)));
+        assert_eq!(p.len(), 4);
+        let curved = vec![
+            Seg::Move(0.0, 0.0),
+            Seg::Cubic([0.0, 1.0, 1.0, 1.0, 1.0, 0.0]),
+            Seg::Line(1.0, -1.0),
+            Seg::Line(0.0, 0.0),
+            Seg::Close,
+        ];
+        assert_eq!(round_corners(&curved, 0.25), curved);
+        // A straight angle is not a corner; a point or a line is no polygon.
+        let flat = vec![
+            Seg::Move(0.0, 0.0),
+            Seg::Line(1.0, 0.0),
+            Seg::Line(2.0, 0.0),
+        ];
+        assert_eq!(round_corners(&flat, 0.25), flat);
+        let two = vec![Seg::Move(0.0, 0.0), Seg::Line(1.0, 0.0)];
+        assert_eq!(round_corners(&two, 0.25), two);
+    }
+
+    #[test]
+    fn the_rounding_cell_rounds_the_shapes_paths() {
+        let page = shapes(
+            "<S><Shape ID='1'><Cell N='Rounding' V='0.25'/>
+              <Section N='Geometry' IX='0'>
+                <Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row>
+                <Row T='LineTo' IX='2'><Cell N='X' V='1'/><Cell N='Y' V='0'/></Row>
+                <Row T='LineTo' IX='3'><Cell N='X' V='1'/><Cell N='Y' V='1'/></Row>
+                <Row T='LineTo' IX='4'><Cell N='X' V='0'/><Cell N='Y' V='1'/></Row>
+                <Row T='LineTo' IX='5'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row></Section></Shape></S>",
+        );
+        let d = Doc::default();
+        let m: HashMap<u32, Master> = HashMap::new();
+        let t = Tree::build(&d, &m, &page, &mut Budget::new(Limits::default())).unwrap();
+        let p = paths(&t, 0, 1.0, 1.0, 100).unwrap();
+        assert_eq!(p[0].segs.len(), 10);
+        // The segments it adds count against the shape's.
+        assert!(paths(&t, 0, 1.0, 1.0, 8).is_err());
+    }
+
+    #[test]
+    fn segments_are_bounded() {
+        let mut rows = row(1, "MoveTo", &[("X", "0"), ("Y", "0")]);
+        for i in 2..50 {
+            rows.push_str(&row(i, "LineTo", &[("X", "1"), ("Y", "1")]));
+        }
+        assert!(geometry(&rows, 1.0, 1.0, 100).is_ok());
+        assert_eq!(
+            geometry(&rows, 1.0, 1.0, 20).err(),
+            Some(Error::TooLarge("geometry segments"))
+        );
+    }
+
+    #[test]
+    fn hostile_numbers_do_not_panic() {
+        let rows = [
+            row(1, "MoveTo", &[("X", "1e308"), ("Y", "-1e308")]),
+            row(
+                2,
+                "EllipticalArcTo",
+                &[
+                    ("X", "NaN"),
+                    ("Y", "0"),
+                    ("A", "1e300"),
+                    ("B", "1"),
+                    ("C", "1e300"),
+                    ("D", "0"),
+                ],
+            ),
+            row(
+                3,
+                "ArcTo",
+                &[("X", "1e300"), ("Y", "1e-300"), ("A", "1e300")],
+            ),
+            row(4, "NURBSTo", &[("E", "NURBS(")]),
+            row(5, "PolylineTo", &[("A", "POLYLINE(1)")]),
+            row(6, "SplineStart", &[("D", "99")]),
+            row(7, "SplineKnot", &[]),
+        ]
+        .concat();
+        let _ = geometry(&rows, 1.0, 1.0, 10_000);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/mod.rs b/crates/exav-render/src/formats/office/slides/vsdx/mod.rs
new file mode 100644
index 00000000..b64efa84
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/mod.rs
@@ -0,0 +1,613 @@
+//! Visio drawings (.vsdx, .vsdm, .vstx, .vstm): an Open Packaging
+//! Conventions package of XML parts ([MS-VSDX], and the Visio file format
+//! reference). Each foreground page becomes a slide named as the page is, in
+//! the pages' largest size; a background page becomes the master of the
+//! pages that use it. Written from those specifications and sample files.
+
+mod convert;
+mod format;
+mod formula;
+mod geom;
+mod resolve;
+mod sheet;
+mod text;
+
+use crate::formats::office::common::xml::{self, Node};
+use crate::formats::office::slides::error::{Error, Result};
+use crate::formats::office::slides::limits::Budget;
+use crate::formats::office::slides::model::*;
+use crate::formats::office::slides::package::{Source, Zip};
+use exav_unpack::cfb::Compound;
+use resolve::{Doc, Master as MasterPart};
+use sheet::{Rels, Sheet, local};
+use std::collections::HashMap;
+use std::io::{Read, Seek, SeekFrom};
+
+const CFB_SIGNATURE: [u8; 8] = [0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1];
+
+/// The size of a page that does not give one: letter, landscape.
+const DEFAULT_PAGE: (f64, f64) = (11.0, 8.5);
+
+/// A package read from bytes. A compound file is a password protected
+/// package (or a binary drawing, which is not read).
+pub(crate) fn read_bytes(input: &[u8], budget: &mut Budget) -> Result<Presentation> {
+    if input.starts_with(&CFB_SIGNATURE) {
+        return Err(compound(input));
+    }
+    read(Zip::open(input)?, budget)
+}
+
+/// A package read part by part from `source`.
+pub(crate) fn read_source(
+    mut source: Box<dyn Source + '_>,
+    budget: &mut Budget,
+) -> Result<Presentation> {
+    let mut head = [0u8; 8];
+    let got = source
+        .seek(SeekFrom::Start(0))
+        .and_then(|_| source.read(&mut head))
+        .map_err(|e| Error::Malformed(format!("the source: {e}")))?;
+    if got == 8 && head == CFB_SIGNATURE {
+        let mut bytes = vec![];
+        source
+            .seek(SeekFrom::Start(0))
+            .and_then(|_| source.read_to_end(&mut bytes))
+            .map_err(|e| Error::Malformed(format!("the source: {e}")))?;
+        return Err(compound(&bytes));
+    }
+    read(Zip::from_source(source)?, budget)
+}
+
+fn compound(bytes: &[u8]) -> Error {
+    let encrypted = Compound::open(bytes).is_some_and(|c| {
+        c.names()
+            .any(|n| n.eq_ignore_ascii_case("EncryptedPackage"))
+    });
+    if encrypted {
+        Error::Encrypted
+    } else {
+        Error::NotFormat("a compound file, not a Visio package (binary .vsd is not read)".into())
+    }
+}
+
+/// A relationship of a part: its type and the part it leads to.
+struct Rel {
+    id: String,
+    kind: String,
+    target: String,
+}
+
+/// The package path `target` names from the part in directory `dir`.
+fn resolve(dir: &str, target: &str) -> String {
+    let target = target.split('#').next().unwrap_or("");
+    let mut parts: Vec<&str> = if target.starts_with('/') {
+        vec![]
+    } else {
+        dir.split('/').filter(|s| !s.is_empty()).collect()
+    };
+    for seg in target.split('/') {
+        match seg {
+            "" | "." => {}
+            ".." => {
+                parts.pop();
+            }
+            s => parts.push(s),
+        }
+    }
+    parts.join("/")
+}
+
+fn dir_of(part: &str) -> &str {
+    part.rsplit_once('/').map_or("", |(d, _)| d)
+}
+
+fn parse_part(bytes: &[u8], budget: &mut Budget) -> Result<Node> {
+    Ok(xml::parse(bytes, &mut budget.tree())?)
+}
+
+/// The relationships of `part` ("" for the package).
+fn rels_of(z: &mut Zip, part: &str, budget: &mut Budget) -> Result<Vec<Rel>> {
+    let path = if part.is_empty() {
+        "_rels/.rels".to_string()
+    } else {
+        let (d, n) = part.rsplit_once('/').unwrap_or(("", part));
+        if d.is_empty() {
+            format!("_rels/{n}.rels")
+        } else {
+            format!("{d}/_rels/{n}.rels")
+        }
+    };
+    let max = budget.limits.max_part;
+    let Some(bytes) = z.get(&path, max, budget)? else {
+        // A member the archive lists and cannot give is encrypted.
+        if z.names().contains(&path) {
+            return Err(Error::Encrypted);
+        }
+        return Ok(vec![]);
+    };
+    let n = parse_part(&bytes, budget)?;
+    let dir = dir_of(part);
+    Ok(n.nodes()
+        .filter(|r| local(&r.name) == "Relationship" && r.attr("TargetMode") != Some("External"))
+        .take(1 << 16)
+        .filter_map(|r| {
+            Some(Rel {
+                id: r.attr("Id")?.to_string(),
+                kind: r.attr("Type").unwrap_or("").to_string(),
+                target: resolve(dir, r.attr("Target")?),
+            })
+        })
+        .collect())
+}
+
+fn by_id(rels: &[Rel]) -> HashMap<String, String> {
+    rels.iter()
+        .map(|r| (r.id.clone(), r.target.clone()))
+        .collect()
+}
+
+fn of_kind<'a>(rels: &'a [Rel], suffix: &str) -> Option<&'a str> {
+    rels.iter()
+        .find(|r| r.kind.ends_with(suffix))
+        .map(|r| r.target.as_str())
+}
+
+fn find_local<'a>(n: &'a Node, name: &str) -> Option<&'a Node> {
+    let mut stack = vec![n];
+    let mut seen = 0usize;
+    while let Some(c) = stack.pop() {
+        seen += 1;
+        if seen > 100_000 {
+            return None;
+        }
+        if local(&c.name) == name {
+            return Some(c);
+        }
+        stack.extend(c.nodes());
+    }
+    None
+}
+
+/// The colour a theme element holds: its first child's `val`, or `lastClr`
+/// of a system colour.
+fn theme_rgb(n: &Node) -> Option<u32> {
+    let c = n.nodes().next()?;
+    let v = c.attr("val").or(c.attr("lastClr"))?;
+    u32::from_str_radix(v.trim(), 16).ok()
+}
+
+/// The fonts and colours of a theme part.
+fn read_theme(n: &Node, doc: &mut Doc) {
+    let face = |kind: &str| {
+        find_local(n, kind)
+            .and_then(|f| f.nodes().find(|l| local(&l.name) == "latin"))
+            .and_then(|l| l.attr("typeface"))
+            .filter(|t| !t.is_empty())
+            .map(str::to_string)
+    };
+    doc.major_font = face("majorFont");
+    doc.minor_font = face("minorFont");
+    if let Some(cs) = find_local(n, "clrScheme") {
+        for name in [
+            "dk1", "lt1", "accent1", "accent2", "accent3", "accent4", "accent5", "accent6",
+        ] {
+            let c = cs
+                .nodes()
+                .find(|c| local(&c.name) == name)
+                .and_then(theme_rgb)
+                .unwrap_or(0);
+            doc.theme.scheme.push(c);
+        }
+    }
+    doc.theme.background = find_local(n, "bkgnd").and_then(theme_rgb);
+    if let Some(list) = find_local(n, "variationClrSchemeLst") {
+        for v in list
+            .nodes()
+            .filter(|v| local(&v.name) == "variationClrScheme")
+            .take(64)
+        {
+            doc.theme
+                .variations
+                .push(v.nodes().filter_map(theme_rgb).collect());
+        }
+    }
+}
+
+fn read_doc(n: &Node, budget: &mut Budget) -> Result<Doc> {
+    let mut d = Doc::default();
+    let empty = HashMap::new();
+    let mut count = 0usize;
+    for c in n.nodes() {
+        match local(&c.name) {
+            "Colors" => {
+                for e in c.nodes().filter(|e| local(&e.name) == "ColorEntry") {
+                    let ix = e.attr("IX").and_then(|v| v.trim().parse::<u32>().ok());
+                    let rgb = e
+                        .attr("RGB")
+                        .and_then(|v| v.trim().strip_prefix('#'))
+                        .and_then(|h| u32::from_str_radix(h, 16).ok());
+                    if let (Some(ix), Some(rgb)) = (ix, rgb) {
+                        d.colors.insert(ix, rgb);
+                    }
+                }
+            }
+            "FaceNames" => {
+                for f in c
+                    .nodes()
+                    .filter(|f| local(&f.name) == "FaceName")
+                    .take(65_536)
+                {
+                    d.faces
+                        .push(f.attr("NameU").or(f.attr("Name")).unwrap_or("").to_string());
+                }
+            }
+            "StyleSheets" => {
+                for s in c.nodes().filter(|s| local(&s.name) == "StyleSheet") {
+                    let sheet = sheet::parse(s, &Rels(&empty), &mut count, 0);
+                    d.styles.insert(sheet.id, sheet);
+                }
+            }
+            _ => {}
+        }
+    }
+    budget.alloc(count as u64 * 512)?;
+    Ok(d)
+}
+
+struct PageInfo {
+    id: u32,
+    name: String,
+    background: bool,
+    back_page: Option<u32>,
+    sheet: Sheet,
+    part: Option<String>,
+    /// Width and height in inches of the drawing.
+    size: (f64, f64),
+    /// Inches of paper to each inch of the drawing.
+    k: f64,
+}
+
+/// The longest side of a PPTX slide, in inches.
+const MAX_SLIDE: f64 = 55.0;
+
+/// Paper inches to each inch of a drawing: the page scale over the drawing
+/// scale ([MS-VSDX] 2.2.2.3), made smaller where the paper would not fit a
+/// slide.
+fn paper_scale(sheet: &Sheet, size: (f64, f64)) -> f64 {
+    let k = match (
+        cell_num(sheet, "PageScale"),
+        cell_num(sheet, "DrawingScale"),
+    ) {
+        (Some(p), Some(d)) => (p / d).clamp(1e-6, 1e6),
+        _ => 1.0,
+    };
+    let longest = size.0.max(size.1) * k;
+    if longest > MAX_SLIDE {
+        k * MAX_SLIDE / longest
+    } else {
+        k
+    }
+}
+
+fn cell_num(s: &Sheet, name: &str) -> Option<f64> {
+    s.cells
+        .get(name)
+        .and_then(|c| c.v.as_deref())
+        .and_then(formula::parse_number)
+        .filter(|v| v.is_finite() && *v > 0.0)
+}
+
+fn read_pages(
+    z: &mut Zip,
+    part: &str,
+    budget: &mut Budget,
+    p: &mut Presentation,
+) -> Result<Vec<PageInfo>> {
+    let max = budget.limits.max_part;
+    let Some(bytes) = z.get(part, max, budget)? else {
+        p.warn("the pages part is missing");
+        return Ok(vec![]);
+    };
+    let n = parse_part(&bytes, budget)?;
+    let rels = by_id(&rels_of(z, part, budget)?);
+    let mut out = vec![];
+    let mut count = 0usize;
+    for pg in n.nodes().filter(|c| local(&c.name) == "Page") {
+        let sheet = pg
+            .nodes()
+            .find(|c| local(&c.name) == "PageSheet")
+            .map(|s| sheet::parse(s, &Rels(&rels), &mut count, 0))
+            .unwrap_or_default();
+        let rel = pg
+            .nodes()
+            .find(|c| local(&c.name) == "Rel")
+            .and_then(|r| r.attr("r:id").or(r.attr("id")));
+        let size = (
+            cell_num(&sheet, "PageWidth").unwrap_or(DEFAULT_PAGE.0),
+            cell_num(&sheet, "PageHeight").unwrap_or(DEFAULT_PAGE.1),
+        );
+        out.push(PageInfo {
+            k: paper_scale(&sheet, size),
+            size,
+            id: pg
+                .attr("ID")
+                .and_then(|v| v.trim().parse().ok())
+                .unwrap_or(0),
+            name: pg
+                .attr("Name")
+                .or(pg.attr("NameU"))
+                .unwrap_or("")
+                .to_string(),
+            background: matches!(pg.attr("Background"), Some("1" | "true")),
+            back_page: pg.attr("BackPage").and_then(|v| v.trim().parse().ok()),
+            part: rel.and_then(|r| rels.get(r).cloned()),
+            sheet,
+        });
+        if out.len() >= 1 << 20 {
+            break;
+        }
+    }
+    budget.alloc(count as u64 * 512)?;
+    Ok(out)
+}
+
+/// The master parts of a Masters part, by master id.
+fn read_master_parts(z: &mut Zip, part: &str, budget: &mut Budget) -> Result<HashMap<u32, String>> {
+    let max = budget.limits.max_part;
+    let Some(bytes) = z.get(part, max, budget)? else {
+        return Ok(HashMap::new());
+    };
+    let n = parse_part(&bytes, budget)?;
+    let rels = by_id(&rels_of(z, part, budget)?);
+    let mut out = HashMap::new();
+    for m in n.nodes().filter(|c| local(&c.name) == "Master") {
+        let id = m.attr("ID").and_then(|v| v.trim().parse::<u32>().ok());
+        let rel = m
+            .nodes()
+            .find(|c| local(&c.name) == "Rel")
+            .and_then(|r| r.attr("r:id").or(r.attr("id")));
+        if let (Some(id), Some(t)) = (id, rel.and_then(|r| rels.get(r))) {
+            out.insert(id, t.clone());
+        }
+    }
+    Ok(out)
+}
+
+/// The shapes of a page or master part (`root` is the name of its root
+/// element), their relationships read.
+fn read_shapes(
+    z: &mut Zip,
+    part: &str,
+    root: &str,
+    budget: &mut Budget,
+    p: &mut Presentation,
+) -> Result<Vec<Sheet>> {
+    let max = budget.limits.max_part;
+    let Some(bytes) = z.get(part, max, budget)? else {
+        p.warn("a page or master part is missing");
+        return Ok(vec![]);
+    };
+    let n = parse_part(&bytes, budget)?;
+    if local(&n.name) != root {
+        p.warn("a page or master part is not what its relationship says");
+        return Ok(vec![]);
+    }
+    let rels = by_id(&rels_of(z, part, budget)?);
+    let mut count = 0usize;
+    let shapes: Vec<Sheet> = n
+        .nodes()
+        .filter(|c| local(&c.name) == "Shapes")
+        .flat_map(|s| s.nodes())
+        .filter(|s| local(&s.name) == "Shape")
+        .map(|s| sheet::parse(s, &Rels(&rels), &mut count, 0))
+        .collect();
+    budget.alloc(count as u64 * 512)?;
+    Ok(shapes)
+}
+
+fn collect_masters(shapes: &[Sheet], ids: &mut Vec<u32>, depth: u32) {
+    if depth > 64 {
+        return;
+    }
+    for s in shapes {
+        if let Some(m) = s.master
+            && !ids.contains(&m)
+            && ids.len() < 4096
+        {
+            ids.push(m);
+        }
+        collect_masters(&s.shapes, ids, depth + 1);
+    }
+}
+
+/// Loads the masters the shapes use, and those these use.
+fn load_masters(
+    z: &mut Zip,
+    parts: &HashMap<u32, String>,
+    shapes: &[Sheet],
+    masters: &mut HashMap<u32, MasterPart>,
+    budget: &mut Budget,
+    p: &mut Presentation,
+) -> Result<()> {
+    let mut want: Vec<u32> = vec![];
+    collect_masters(shapes, &mut want, 0);
+    let mut i = 0;
+    while i < want.len() {
+        let id = want[i];
+        i += 1;
+        if masters.contains_key(&id) {
+            continue;
+        }
+        let Some(part) = parts.get(&id) else {
+            continue;
+        };
+        let shapes = read_shapes(z, part, "MasterContents", budget, p)?;
+        collect_masters(&shapes, &mut want, 0);
+        masters.insert(id, MasterPart { shapes });
+    }
+    Ok(())
+}
+
+fn blank_master(name: &str, shapes: Vec<Shape>) -> Master {
+    Master {
+        name: name.to_string(),
+        background: Some(Fill::Solid(Color::rgb(0xFFFFFF))),
+        shapes,
+        layouts: vec![Layout {
+            name: "Blank".into(),
+            kind: "blank",
+            show_master_shapes: true,
+            ..Layout::default()
+        }],
+        ..Master::default()
+    }
+}
+
+pub(crate) fn read(mut z: Zip, budget: &mut Budget) -> Result<Presentation> {
+    let max = budget.limits.max_part;
+    let mut p = Presentation::default();
+
+    let root = rels_of(&mut z, "", budget)?;
+    let doc_part = match of_kind(&root, "/document") {
+        Some(t) => t.to_string(),
+        None => "visio/document.xml".to_string(),
+    };
+    let bytes = z
+        .get(&doc_part, max, budget)?
+        .ok_or_else(|| Error::NotFormat("no Visio document part".into()))?;
+    let docx = parse_part(&bytes, budget)?;
+    drop(bytes);
+    if local(&docx.name) != "VisioDocument" {
+        return Err(Error::NotFormat(format!(
+            "not a Visio document: {}",
+            local(&docx.name)
+        )));
+    }
+    let mut doc = read_doc(&docx, budget)?;
+    drop(docx);
+    let doc_rels = rels_of(&mut z, &doc_part, budget)?;
+    if let Some(theme) = of_kind(&doc_rels, "/theme")
+        && let Some(b) = z.get(theme, max, budget)?
+        && let Ok(n) = parse_part(&b, budget)
+    {
+        read_theme(&n, &mut doc);
+    }
+    let pages = match of_kind(&doc_rels, "/pages") {
+        Some(part) => read_pages(&mut z, part, budget, &mut p)?,
+        None => {
+            p.warn("the document has no pages part");
+            vec![]
+        }
+    };
+    let master_parts = match of_kind(&doc_rels, "/masters") {
+        Some(part) => read_master_parts(&mut z, part, budget)?,
+        None => HashMap::new(),
+    };
+
+    let foreground: Vec<&PageInfo> = pages.iter().filter(|pg| !pg.background).collect();
+    // The slide is the largest page.
+    let (w, h) = foreground
+        .iter()
+        .map(|pg| (pg.size.0 * pg.k, pg.size.1 * pg.k))
+        .reduce(|a, b| (a.0.max(b.0), a.1.max(b.1)))
+        .unwrap_or(DEFAULT_PAGE);
+    p.width = (w.min(MAX_SLIDE) * 914_400.0) as Emu;
+    p.height = (h.min(MAX_SLIDE) * 914_400.0) as Emu;
+    p.total_slides = foreground.len();
+    p.masters.push(blank_master("Visio", vec![]));
+    if foreground.is_empty() {
+        p.warn("the drawing has no pages");
+    }
+    let names: Vec<String> = foreground.iter().map(|pg| pg.name.clone()).collect();
+
+    let mut masters: HashMap<u32, MasterPart> = HashMap::new();
+    let mut media: HashMap<String, Option<usize>> = HashMap::new();
+    // A background page becomes a master, by the id of the page.
+    let mut backgrounds: HashMap<u32, usize> = HashMap::new();
+    for (i, page) in foreground.iter().enumerate() {
+        budget.slide(i)?;
+        if !budget.wants(i) {
+            continue;
+        }
+        let mut master = 0usize;
+        if let Some(bg) = page
+            .back_page
+            .and_then(|id| pages.iter().find(|b| b.id == id && b.background))
+        {
+            master = match backgrounds.get(&bg.id) {
+                Some(&m) => m,
+                None => {
+                    let shapes = page_shapes(
+                        &mut z,
+                        bg,
+                        &master_parts,
+                        &doc,
+                        &mut masters,
+                        &mut media,
+                        &names,
+                        budget,
+                        &mut p,
+                    )?;
+                    p.masters.push(blank_master(&bg.name, shapes));
+                    backgrounds.insert(bg.id, p.masters.len() - 1);
+                    p.masters.len() - 1
+                }
+            };
+        }
+        let shapes = page_shapes(
+            &mut z,
+            page,
+            &master_parts,
+            &doc,
+            &mut masters,
+            &mut media,
+            &names,
+            budget,
+            &mut p,
+        )?;
+        p.slides.push(Slide {
+            name: Some(page.name.clone()),
+            master,
+            layout: 0,
+            background: None,
+            shapes,
+            hidden: false,
+            show_master_shapes: true,
+        });
+    }
+    Ok(p)
+}
+
+/// The model shapes of a page.
+#[allow(clippy::too_many_arguments)]
+fn page_shapes(
+    z: &mut Zip,
+    page: &PageInfo,
+    master_parts: &HashMap<u32, String>,
+    doc: &Doc,
+    masters: &mut HashMap<u32, MasterPart>,
+    media: &mut HashMap<String, Option<usize>>,
+    names: &[String],
+    budget: &mut Budget,
+    p: &mut Presentation,
+) -> Result<Vec<Shape>> {
+    let Some(part) = page.part.as_deref() else {
+        p.warn("a page has no part");
+        return Ok(vec![]);
+    };
+    let tops = read_shapes(z, part, "PageContents", budget, p)?;
+    load_masters(z, master_parts, &tops, masters, budget, p)?;
+    let tree = resolve::Tree::build(doc, masters, &tops, budget)?;
+    let layers = convert::layers(&page.sheet);
+    let mut conv = convert::Conv {
+        t: &tree,
+        p,
+        budget,
+        zip: z,
+        media,
+        layers: &layers,
+        slide_names: names,
+        failed: None,
+    };
+    conv.page(page.size.1, page.k)
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/resolve.rs b/crates/exav-render/src/formats/office/slides/vsdx/resolve.rs
new file mode 100644
index 00000000..8f063290
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/resolve.rs
@@ -0,0 +1,983 @@
+//! The shapes of a page with what they inherit ([MS-VSDX] 2.2.5.4): from
+//! the master shape they instantiate, and from style sheets. A cell is
+//! looked up in the shape itself, then in its master shape, then in the
+//! style sheet of its kind (line, fill or text) and the styles that one
+//! inherits from. A cell found in a master is evaluated again from its
+//! formula, as the shape that inherits it may have another size.
+
+use super::formula::{self, Env, Val};
+use super::sheet::{Cell, Sheet};
+use crate::formats::office::slides::error::Result;
+use crate::formats::office::slides::limits::Budget;
+use std::cell::{Cell as StdCell, RefCell};
+use std::collections::HashMap;
+
+/// What the document part holds.
+#[derive(Default)]
+pub struct Doc {
+    /// The colour table past the 24 fixed entries.
+    pub colors: HashMap<u32, u32>,
+    /// The font table, by position.
+    pub faces: Vec<String>,
+    pub styles: HashMap<u32, Sheet>,
+    /// The theme's heading and body fonts.
+    pub major_font: Option<String>,
+    pub minor_font: Option<String>,
+    pub theme: Theme,
+}
+
+/// The colours of the document's theme ([MS-VSDX] 2.2.7.4).
+#[derive(Default)]
+pub struct Theme {
+    /// dk1, lt1, accent1 to accent6: what quick style colours 0 to 7 name.
+    pub scheme: Vec<u32>,
+    pub background: Option<u32>,
+    /// The seven colours of each variation, which quick style colours 100
+    /// to 106 name.
+    pub variations: Vec<Vec<u32>>,
+}
+
+/// A master: its top-level shapes.
+pub struct Master {
+    pub shapes: Vec<Sheet>,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum Origin {
+    /// In the shape of the page.
+    Local,
+    /// In its master shape: evaluated again for this shape.
+    Master,
+    /// In a style sheet.
+    Style,
+}
+
+#[derive(Clone, Copy, PartialEq)]
+enum Kind {
+    Line,
+    Fill,
+    Text,
+}
+
+/// The style a cell is inherited from, by its name.
+fn kind_of(name: &str) -> Option<Kind> {
+    Some(match name {
+        "LineWeight"
+        | "LineColor"
+        | "LinePattern"
+        | "Rounding"
+        | "EndArrowSize"
+        | "BeginArrow"
+        | "EndArrow"
+        | "LineCap"
+        | "BeginArrowSize"
+        | "LineColorTrans"
+        | "CompoundType"
+        | "LineGradientEnabled"
+        | "LineGradientDir"
+        | "LineGradientAngle" => Kind::Line,
+        "FillForegnd"
+        | "FillBkgnd"
+        | "FillPattern"
+        | "ShdwForegnd"
+        | "ShdwPattern"
+        | "FillForegndTrans"
+        | "FillBkgndTrans"
+        | "ShdwForegndTrans"
+        | "FillGradientEnabled"
+        | "FillGradientDir"
+        | "FillGradientAngle"
+        | "RotateGradientWithShape"
+        | "UseGroupGradient"
+        | "ShapeShdwType"
+        | "ShapeShdwOffsetX"
+        | "ShapeShdwOffsetY"
+        | "ShapeShdwObliqueAngle"
+        | "ShapeShdwScaleFactor"
+        | "ShapeShdwBlur"
+        | "ShapeShdwShow"
+        | "GlowSize"
+        | "BevelTopType"
+        | "ReflectionSize"
+        | "SoftEdgesSize"
+        | "QuickStyleFillColor"
+        | "QuickStyleShadowColor"
+        | "VariationColorIndex" => Kind::Fill,
+        "QuickStyleLineColor" => Kind::Line,
+        "QuickStyleFontColor" => Kind::Text,
+        "LeftMargin" | "RightMargin" | "TopMargin" | "BottomMargin" | "VerticalAlign"
+        | "TextBkgnd" | "TextBkgndTrans" | "DefaultTabStop" | "TextDirection" | "HideText" => {
+            Kind::Text
+        }
+        _ => return None,
+    })
+}
+
+fn section_kind(sec: &str) -> Option<Kind> {
+    match sec {
+        "Character" | "Paragraph" | "Tabs" => Some(Kind::Text),
+        "FillGradient" => Some(Kind::Fill),
+        "LineGradient" => Some(Kind::Line),
+        _ => None,
+    }
+}
+
+pub use super::sheet::RowKey;
+
+pub struct Node<'a> {
+    /// The shape of the page, then its master shape.
+    pub layers: Vec<&'a Sheet>,
+    /// Whether the first layer is a shape of the page and not a master's.
+    pub inst: bool,
+    /// The master the master layer is of.
+    pub master: Option<u32>,
+    pub children: Vec<usize>,
+}
+
+pub struct Tree<'a> {
+    doc: &'a Doc,
+    masters: &'a HashMap<u32, Master>,
+    pub nodes: Vec<Node<'a>>,
+    pub roots: Vec<usize>,
+    /// The node of a master shape, by master and shape id: what `Sheet.N!`
+    /// in the formula of an inherited cell names.
+    by_master: HashMap<(u32, u32), usize>,
+    memo: RefCell<HashMap<(usize, String), Option<Val>>>,
+    steps: StdCell<u32>,
+    depth: StdCell<u32>,
+}
+
+/// Formula evaluations for one page.
+const MAX_EVALS: u32 = 2_000_000;
+/// Nesting of groups and of masters instantiated in masters.
+const MAX_NESTING: u32 = 48;
+
+fn find_shape(shapes: &[Sheet], id: u32, depth: u32) -> Option<&Sheet> {
+    if depth > MAX_NESTING {
+        return None;
+    }
+    shapes.iter().find_map(|s| {
+        if s.id == id {
+            Some(s)
+        } else {
+            find_shape(&s.shapes, id, depth + 1)
+        }
+    })
+}
+
+impl<'a> Tree<'a> {
+    /// The tree of `tops`, the top-level shapes of a page. Each node is
+    /// charged to the budget as a shape.
+    pub fn build(
+        doc: &'a Doc,
+        masters: &'a HashMap<u32, Master>,
+        tops: &'a [Sheet],
+        budget: &mut Budget,
+    ) -> Result<Tree<'a>> {
+        let mut t = Tree {
+            doc,
+            masters,
+            nodes: vec![],
+            roots: vec![],
+            by_master: HashMap::new(),
+            memo: RefCell::new(HashMap::new()),
+            steps: StdCell::new(0),
+            depth: StdCell::new(0),
+        };
+        for s in tops {
+            let i = t.add(Some(s), None, None, budget, 0)?;
+            t.roots.push(i);
+        }
+        Ok(t)
+    }
+
+    fn add(
+        &mut self,
+        inst: Option<&'a Sheet>,
+        mshape: Option<&'a Sheet>,
+        master: Option<u32>,
+        budget: &mut Budget,
+        depth: u32,
+    ) -> Result<usize> {
+        budget.shape(0)?;
+        let masters: &'a HashMap<u32, Master> = self.masters;
+        let (mut mshape, mut master) = (mshape, master);
+        let mut inherited: &'a [Sheet] = &[];
+        if let Some(m) = inst
+            .and_then(|s| s.master)
+            .filter(|m| masters.contains_key(m))
+        {
+            let shapes: &'a [Sheet] = &masters[&m].shapes;
+            master = Some(m);
+            if shapes.len() == 1 {
+                mshape = Some(&shapes[0]);
+            } else {
+                mshape = None;
+                inherited = shapes;
+            }
+        }
+        if let Some(ms) = mshape {
+            inherited = &ms.shapes;
+        }
+        let idx = self.nodes.len();
+        self.nodes.push(Node {
+            layers: inst.into_iter().chain(mshape).collect(),
+            inst: inst.is_some(),
+            master,
+            children: vec![],
+        });
+        if let (Some(m), Some(ms)) = (master, mshape) {
+            self.by_master.entry((m, ms.id)).or_insert(idx);
+        }
+        if depth >= MAX_NESTING {
+            return Ok(idx);
+        }
+        let own: &'a [Sheet] = inst.map(|s| &s.shapes[..]).unwrap_or(&[]);
+        let mut used = vec![false; own.len()];
+        let mut kids = vec![];
+        for mc in inherited {
+            let pos = own
+                .iter()
+                .position(|c| c.master_shape == Some(mc.id) && c.master.is_none());
+            kids.push(match pos {
+                Some(p) => {
+                    used[p] = true;
+                    self.add(Some(&own[p]), Some(mc), master, budget, depth + 1)?
+                }
+                None => self.add(None, Some(mc), master, budget, depth + 1)?,
+            });
+        }
+        for (i, c) in own.iter().enumerate() {
+            if used[i] {
+                continue;
+            }
+            // A MasterShape that is not a direct child of the master shape.
+            let ms = match (c.master, c.master_shape, master) {
+                (None, Some(id), Some(m)) => find_shape(&masters[&m].shapes, id, 0),
+                _ => None,
+            };
+            kids.push(self.add(Some(c), ms, master, budget, depth + 1)?);
+        }
+        self.nodes[idx].children = kids;
+        Ok(idx)
+    }
+
+    /// The first layer's answer to `f` that has one.
+    fn first<T>(&self, n: usize, f: impl Fn(&'a Sheet) -> Option<T>) -> Option<T> {
+        self.nodes[n].layers.iter().find_map(|l| f(l))
+    }
+
+    pub fn kind(&self, n: usize) -> &'a str {
+        let node = &self.nodes[n];
+        // The shape's own kind, else its master shape's.
+        let inst = node.layers.first().filter(|_| node.inst);
+        match (inst, node.layers.last()) {
+            (Some(i), Some(m)) if i.kind == "Shape" && !std::ptr::eq(*i, *m) => &m.kind,
+            (Some(i), _) => &i.kind,
+            (None, Some(m)) => &m.kind,
+            _ => "Shape",
+        }
+    }
+
+    pub fn name(&self, n: usize) -> &'a str {
+        self.first(n, |l| (!l.name.is_empty()).then_some(l.name.as_str()))
+            .unwrap_or("")
+    }
+
+    pub fn deleted(&self, n: usize) -> bool {
+        let node = &self.nodes[n];
+        node.inst && node.layers.first().is_some_and(|l| l.del)
+    }
+
+    pub fn pieces(&self, n: usize) -> Option<&'a [super::sheet::Piece]> {
+        self.first(n, |l| l.text.as_deref())
+    }
+
+    pub fn foreign(&self, n: usize) -> Option<&'a super::sheet::Foreign> {
+        self.first(n, |l| l.foreign.as_ref())
+    }
+
+    fn style_id(&self, n: usize, k: Kind) -> Option<u32> {
+        self.first(n, |l| match k {
+            Kind::Line => l.line_style,
+            Kind::Fill => l.fill_style,
+            Kind::Text => l.text_style,
+        })
+    }
+
+    /// The style sheets `n` inherits from for `k`: its own, then its parents.
+    fn styles(&self, n: usize, k: Kind) -> Vec<&'a Sheet> {
+        let mut out = vec![];
+        let mut id = self.style_id(n, k);
+        while let Some(i) = id {
+            let Some(s) = self.doc.styles.get(&i) else {
+                break;
+            };
+            if out.len() >= 16 || out.iter().any(|o: &&Sheet| std::ptr::eq(*o, s)) {
+                break;
+            }
+            out.push(s);
+            id = match k {
+                Kind::Line => s.line_style,
+                Kind::Fill => s.fill_style,
+                Kind::Text => s.text_style,
+            };
+        }
+        out
+    }
+
+    /// A cell by name: in the shape, its master shape, its styles.
+    pub fn find(&self, n: usize, name: &str) -> Option<(&'a Cell, Origin)> {
+        let node = &self.nodes[n];
+        for (i, l) in node.layers.iter().enumerate() {
+            if let Some(c) = l.cells.get(name)
+                && (c.v.is_some() || c.formula().is_some())
+            {
+                let o = if i == 0 && node.inst {
+                    Origin::Local
+                } else {
+                    Origin::Master
+                };
+                return Some((c, o));
+            }
+        }
+        let k = kind_of(name)?;
+        self.styles(n, k)
+            .into_iter()
+            .find_map(|s| s.cells.get(name).filter(|c| c.v.is_some()))
+            .map(|c| (c, Origin::Style))
+    }
+
+    pub fn val(&self, n: usize, name: &str) -> Option<Val> {
+        let (c, o) = self.find(n, name)?;
+        match self.cell_val(n, name, c, o)? {
+            Val::Str(s) if s == "Themed" => self.themed(n, name),
+            v => Some(v),
+        }
+    }
+
+    /// The colour a quick style cell (`QuickStyleFillColor`...) names in
+    /// the theme.
+    fn theme_color(&self, n: usize, quick: &str) -> Option<u32> {
+        let th = &self.doc.theme;
+        // Only a shape or master that sets the quick style uses the theme;
+        // the style sheets' own value is the one for "not set".
+        let (c, o) = self.find(n, quick)?;
+        if o == Origin::Style {
+            return None;
+        }
+        let q = self.cell_val(n, quick, c, o)?.num()?;
+        match q as i64 {
+            i @ 0..=7 => th.scheme.get(i as usize).copied(),
+            8 => th.background.or(th.scheme.get(1).copied()),
+            // 200 to 206 are in files written by Visio 2013; the
+            // specification names 100 to 106 only. Their colours are the
+            // same variation colours.
+            i @ (100..=106 | 200..=206) => {
+                // An index the theme does not have (65534 is the one a
+                // document without a variation gives) is the first.
+                let v = self.num(n, "VariationColorIndex").unwrap_or(0.0).max(0.0) as usize;
+                let v = th.variations.get(v).or(th.variations.first())?;
+                v.get((i % 100) as usize).copied()
+            }
+            _ => None,
+        }
+    }
+
+    /// What a cell the theme gives (`Themed`) is: the theme's colour for
+    /// the quick style colours, the root style sheet's value otherwise.
+    fn themed(&self, n: usize, name: &str) -> Option<Val> {
+        let quick = match name {
+            "FillForegnd" => "QuickStyleFillColor",
+            "LineColor" => "QuickStyleLineColor",
+            "ShdwForegnd" => "QuickStyleShadowColor",
+            _ => "",
+        };
+        if let Some(c) = self.theme_color(n, quick) {
+            return Some(Val::Color(c));
+        }
+        let c = self.doc.styles.get(&0)?.cells.get(name)?;
+        Some(parse_val(c.v.as_deref()?)).filter(|v| *v != Val::Str("Themed".into()))
+    }
+
+    fn themed_row(&self, n: usize, cell: &str) -> Option<Val> {
+        match cell {
+            "Color" => self.theme_color(n, "QuickStyleFontColor").map(Val::Color),
+            "Style" => Some(Val::Num(0.0)),
+            "Font" => self.doc.minor_font.clone().map(Val::Str),
+            _ => None,
+        }
+    }
+
+    pub fn num(&self, n: usize, name: &str) -> Option<f64> {
+        self.val(n, name).and_then(|v| v.num())
+    }
+
+    /// The colour of a cell: a `#RRGGBB` value, an RGB formula or an index
+    /// of the colour table.
+    pub fn color(&self, n: usize, name: &str) -> Option<u32> {
+        self.to_color(&self.val(n, name)?)
+    }
+
+    pub fn to_color(&self, v: &Val) -> Option<u32> {
+        match v {
+            Val::Color(c) => Some(*c),
+            Val::Num(x) => {
+                formula::parse_color(&format!("{x}"), &|i| self.doc.colors.get(&i).copied())
+            }
+            Val::Str(s) => formula::parse_color(s, &|i| self.doc.colors.get(&i).copied()),
+        }
+    }
+
+    /// The font a cell names: by its index in the font table, or by name.
+    pub fn font(&self, v: &Val) -> Option<String> {
+        let s = match v {
+            Val::Str(s) => s.trim().to_string(),
+            Val::Num(x) => format!("{x}"),
+            Val::Color(_) => return None,
+        };
+        if s.is_empty() {
+            return None;
+        }
+        if s == "Themed" {
+            return self.doc.minor_font.clone();
+        }
+        match s.parse::<usize>() {
+            Ok(i) => self.doc.faces.get(i).cloned(),
+            Err(_) => Some(s),
+        }
+    }
+
+    fn cell_val(&self, n: usize, key: &str, c: &Cell, o: Origin) -> Option<Val> {
+        if o == Origin::Master
+            && let Some(v) = c.formula().and_then(|f| self.eval(n, key, f))
+        {
+            return Some(v);
+        }
+        match c.v.as_deref() {
+            Some(v) => Some(parse_val(v)),
+            None => c.formula().and_then(|f| self.eval(n, key, f)),
+        }
+    }
+
+    fn eval(&self, n: usize, key: &str, f: &str) -> Option<Val> {
+        let k = (n, key.to_string());
+        if let Some(v) = self.memo.borrow().get(&k) {
+            return v.clone();
+        }
+        let steps = self.steps.get();
+        if steps >= MAX_EVALS || self.depth.get() >= 32 {
+            return None;
+        }
+        self.steps.set(steps + 1);
+        // A formula that depends on itself finds this and fails.
+        self.memo.borrow_mut().insert(k.clone(), None);
+        self.depth.set(self.depth.get() + 1);
+        let v = formula::eval(f, &mut NodeEnv { t: self, node: n });
+        self.depth.set(self.depth.get() - 1);
+        self.memo.borrow_mut().insert(k, v.clone());
+        v
+    }
+
+    /// The ids of the sections named `sec`, ascending.
+    pub fn sections(&self, n: usize, sec: &str) -> Vec<u32> {
+        let mut out: Vec<u32> = self.nodes[n]
+            .layers
+            .iter()
+            .flat_map(|l| l.sections.iter())
+            .filter(|s| s.name == sec && !s.del)
+            .map(|s| s.ix.unwrap_or(0))
+            .collect();
+        out.sort_unstable();
+        out.dedup();
+        out
+    }
+
+    /// The rows of a section with their types, merged over the master
+    /// shape: by index in ascending order, or by name in the order of the
+    /// master. A row the shape deletes is left out.
+    pub fn rows(&self, n: usize, sec: &str, six: Option<u32>) -> Vec<(RowKey, Option<&'a str>)> {
+        // The rows in order, with `None` where one was deleted, and where
+        // each key is.
+        let mut order: Vec<Option<RowKey>> = vec![];
+        let mut at: HashMap<RowKey, usize> = HashMap::new();
+        for l in self.nodes[n].layers.iter().rev() {
+            for s in l.sections.iter().filter(|s| matches_section(s, sec, six)) {
+                for r in &s.rows {
+                    let key = match (r.ix, &r.n) {
+                        (Some(i), _) => RowKey::Ix(i),
+                        (None, Some(name)) => RowKey::Name(name.clone()),
+                        _ => continue,
+                    };
+                    match (r.del, at.get(&key).copied()) {
+                        (true, Some(p)) => {
+                            order[p] = None;
+                            at.remove(&key);
+                        }
+                        (false, None) => {
+                            at.insert(key.clone(), order.len());
+                            order.push(Some(key));
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+        let mut keys: Vec<RowKey> = order.into_iter().flatten().collect();
+        if keys.iter().all(|k| matches!(k, RowKey::Ix(_))) {
+            keys.sort_by_key(|k| match k {
+                RowKey::Ix(i) => *i,
+                RowKey::Name(_) => 0,
+            });
+        }
+        keys.into_iter()
+            .map(|k| {
+                let t = self.nodes[n].layers.iter().find_map(|l| {
+                    l.sections
+                        .iter()
+                        .filter(|s| matches_section(s, sec, six))
+                        .find_map(|s| s.find_row(&k))
+                        .and_then(|r| r.t.as_deref())
+                });
+                (k, t)
+            })
+            .collect()
+    }
+
+    /// A cell of a row, wherever the layers have it.
+    fn row_cell(
+        &self,
+        n: usize,
+        sec: &str,
+        six: Option<u32>,
+        key: &RowKey,
+        cell: &str,
+    ) -> Option<(&'a Cell, Origin)> {
+        let node = &self.nodes[n];
+        for (i, l) in node.layers.iter().enumerate() {
+            for s in l.sections.iter().filter(|s| matches_section(s, sec, six)) {
+                if let Some(r) = s.find_row(key) {
+                    if r.del {
+                        return None;
+                    }
+                    if let Some(c) = r.cells.get(cell)
+                        && (c.v.is_some() || c.formula().is_some())
+                    {
+                        let o = if i == 0 && node.inst {
+                            Origin::Local
+                        } else {
+                            Origin::Master
+                        };
+                        return Some((c, o));
+                    }
+                }
+            }
+        }
+        let k = section_kind(sec)?;
+        self.styles(n, k).into_iter().find_map(|st| {
+            st.sections
+                .iter()
+                .filter(|s| matches_section(s, sec, six))
+                .filter_map(|s| s.find_row(key))
+                .find_map(|r| r.cells.get(cell).filter(|c| c.v.is_some()))
+                .map(|c| (c, Origin::Style))
+        })
+    }
+
+    pub fn row_val(
+        &self,
+        n: usize,
+        sec: &str,
+        six: Option<u32>,
+        key: &RowKey,
+        cell: &str,
+    ) -> Option<Val> {
+        let (c, o) = self.row_cell(n, sec, six, key, cell)?;
+        let id = match key {
+            RowKey::Ix(i) => i.to_string(),
+            RowKey::Name(s) => s.clone(),
+        };
+        let k = format!("{sec}{}.{id}.{cell}", six.unwrap_or(0));
+        match self.cell_val(n, &k, c, o)? {
+            Val::Str(s) if s == "Themed" => self.themed_row(n, cell),
+            v => Some(v),
+        }
+    }
+
+    pub fn row_num(
+        &self,
+        n: usize,
+        sec: &str,
+        six: Option<u32>,
+        key: &RowKey,
+        cell: &str,
+    ) -> Option<f64> {
+        self.row_val(n, sec, six, key, cell).and_then(|v| v.num())
+    }
+
+    /// A cell of the section itself (NoFill, NoLine, NoShow).
+    pub fn section_val(&self, n: usize, sec: &str, six: u32, cell: &str) -> Option<Val> {
+        let node = &self.nodes[n];
+        for (i, l) in node.layers.iter().enumerate() {
+            for s in l
+                .sections
+                .iter()
+                .filter(|s| s.name == sec && s.ix.unwrap_or(0) == six)
+            {
+                if let Some(c) = s.cells.get(cell)
+                    && (c.v.is_some() || c.formula().is_some())
+                {
+                    let o = if i == 0 && node.inst {
+                        Origin::Local
+                    } else {
+                        Origin::Master
+                    };
+                    let k = format!("{sec}{six}.{cell}");
+                    return self.cell_val(n, &k, c, o);
+                }
+            }
+        }
+        None
+    }
+
+    /// A cell a formula names by path: `Geometry1.X2`, `User.Name`,
+    /// `Scratch.A1`, `Controls.Row_1.Y`, `Char.Size`; a name alone is a cell
+    /// of the shape.
+    fn path_val(&self, n: usize, path: &str) -> Option<Val> {
+        let Some((first, rest)) = path.split_once('.') else {
+            return self.val(n, path);
+        };
+        let lower = first.to_ascii_lowercase();
+        if let Some(id) = lower.strip_prefix("geometry") {
+            let six = id.parse::<u32>().ok()?.checked_sub(1)?;
+            return match split_digits(rest) {
+                Some((cell, row)) => self.row_val(n, "Geometry", Some(six), &RowKey::Ix(row), cell),
+                None => self.section_val(n, "Geometry", six, rest),
+            };
+        }
+        let (name, cell) = match rest.split_once('.') {
+            Some((a, b)) => (a, Some(b)),
+            None => (rest, None),
+        };
+        match lower.as_str() {
+            "user" | "prop" | "actions" | "controls" | "hyperlink" => {
+                let sec = match lower.as_str() {
+                    "user" => "User",
+                    "prop" => "Property",
+                    "actions" => "Actions",
+                    "controls" => "Control",
+                    _ => "Hyperlink",
+                };
+                let default = match lower.as_str() {
+                    "actions" => "Menu",
+                    "controls" => "X",
+                    "hyperlink" => "Description",
+                    _ => "Value",
+                };
+                self.row_val(
+                    n,
+                    sec,
+                    None,
+                    &RowKey::Name(name.to_string()),
+                    cell.unwrap_or(default),
+                )
+            }
+            "scratch" | "connections" => {
+                let sec = if lower == "scratch" {
+                    "Scratch"
+                } else {
+                    "Connection"
+                };
+                let (cell, id) = split_digits(rest).unwrap_or((rest, 1));
+                self.row_val(n, sec, None, &RowKey::Ix(id.checked_sub(1)?), cell)
+            }
+            "char" | "para" => {
+                let sec = if lower == "char" {
+                    "Character"
+                } else {
+                    "Paragraph"
+                };
+                let (cell, id) = match rest.split_once('[') {
+                    Some((c, i)) => (c, i.trim_end_matches(']').parse::<u32>().ok()?),
+                    None => (rest, 1),
+                };
+                self.row_val(n, sec, None, &RowKey::Ix(id.checked_sub(1)?), cell)
+            }
+            _ => None,
+        }
+    }
+}
+
+fn matches_section(s: &super::sheet::Section, name: &str, six: Option<u32>) -> bool {
+    s.name == name && !s.del && six.is_none_or(|i| s.ix.unwrap_or(0) == i)
+}
+
+/// `X12` as ("X", 12).
+fn split_digits(s: &str) -> Option<(&str, u32)> {
+    let at = s.find(|c: char| c.is_ascii_digit())?;
+    if at == 0 {
+        return None;
+    }
+    Some((&s[..at], s[at..].parse().ok()?))
+}
+
+/// A V attribute as a value.
+pub fn parse_val(v: &str) -> Val {
+    let t = v.trim();
+    if let Some(h) = t.strip_prefix('#')
+        && h.len() == 6
+        && let Ok(c) = u32::from_str_radix(h, 16)
+    {
+        return Val::Color(c);
+    }
+    match formula::parse_number(t) {
+        Some(n) => Val::Num(n),
+        None => Val::Str(v.to_string()),
+    }
+}
+
+struct NodeEnv<'t, 'a> {
+    t: &'t Tree<'a>,
+    node: usize,
+}
+
+impl Env for NodeEnv<'_, '_> {
+    fn cell(&mut self, sheet: Option<u32>, path: &str) -> Option<Val> {
+        let target = match sheet {
+            None => self.node,
+            Some(id) => {
+                let m = self.t.nodes[self.node].master?;
+                *self.t.by_master.get(&(m, id))?
+            }
+        };
+        self.t.path_val(target, path)
+    }
+
+    fn themeval(&mut self, args: &[Val]) -> Option<Val> {
+        let Some(Val::Str(name)) = args.first() else {
+            return None;
+        };
+        match name.as_str() {
+            "LatinFont" => self.t.doc.minor_font.clone().map(Val::Str),
+            _ => None,
+        }
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::formats::office::common::xml;
+    use crate::formats::office::slides::limits::Limits;
+    use crate::formats::office::slides::vsdx::sheet::{Rels, parse};
+
+    pub fn shapes(x: &str) -> Vec<Sheet> {
+        let n = xml::parse(x.as_bytes(), &mut xml::within(1 << 24)).unwrap();
+        let rels = HashMap::new();
+        n.nodes()
+            .map(|s| parse(s, &Rels(&rels), &mut 0, 0))
+            .collect()
+    }
+
+    fn doc(styles: &str) -> Doc {
+        let mut d = Doc::default();
+        for s in shapes(&format!("<S>{styles}</S>")) {
+            d.styles.insert(s.id, s);
+        }
+        d
+    }
+
+    fn tree<'a>(d: &'a Doc, m: &'a HashMap<u32, Master>, page: &'a [Sheet]) -> Tree<'a> {
+        let mut b = Budget::new(Limits::default());
+        Tree::build(d, m, page, &mut b).unwrap()
+    }
+
+    #[test]
+    fn a_cell_is_found_in_the_shape_then_the_master_then_the_styles() {
+        let d = doc(
+            "<Shape ID='0'><Cell N='LineWeight' V='0.5'/><Cell N='LinePattern' V='1'/></Shape>
+             <Shape ID='1' LineStyle='0'><Cell N='LineWeight' V='0.25'/></Shape>",
+        );
+        let masters: HashMap<u32, Master> = [(
+            7,
+            Master {
+                shapes: shapes(
+                    "<S><Shape ID='2' LineStyle='1'><Cell N='Width' V='3'/><Cell N='LineColor' V='#ff0000'/></Shape></S>",
+                ),
+            },
+        )]
+        .into();
+        let page = shapes(
+            "<S><Shape ID='9' Master='7'><Cell N='Width' V='8'/><Cell N='Height' V='1'/></Shape></S>",
+        );
+        let t = tree(&d, &masters, &page);
+        let n = t.roots[0];
+        assert_eq!(t.num(n, "Width"), Some(8.0));
+        assert_eq!(t.num(n, "Height"), Some(1.0));
+        assert_eq!(t.color(n, "LineColor"), Some(0xFF0000));
+        // The master shape's style, then the style's parent.
+        assert_eq!(t.num(n, "LineWeight"), Some(0.25));
+        assert_eq!(t.num(n, "LinePattern"), Some(1.0));
+        assert_eq!(t.num(n, "FillPattern"), None);
+        assert_eq!(t.num(n, "Nothing"), None);
+    }
+
+    #[test]
+    fn a_formula_of_the_master_is_evaluated_for_the_size_of_the_instance() {
+        let d = Doc::default();
+        let masters: HashMap<u32, Master> = [(
+            1,
+            Master {
+                shapes: shapes(
+                    "<S><Shape ID='1'><Cell N='Width' V='2'/><Cell N='Height' V='1'/>
+                      <Cell N='LocPinX' V='1' F='Width*0.5'/>
+                      <Section N='User'><Row N='Gap'><Cell N='Value' V='0.25'/></Row></Section>
+                      <Section N='Geometry' IX='0'><Cell N='NoFill' V='0' F='User.Gap&gt;1'/>
+                       <Row T='LineTo' IX='1'><Cell N='X' V='2' F='Width-User.Gap'/><Cell N='Y' V='0'/></Row>
+                       <Row T='LineTo' IX='2'><Cell N='X' V='2' F='Geometry1.X1'/><Cell N='Y' V='1' F='Height'/></Row>
+                      </Section></Shape></S>",
+                ),
+            },
+        )]
+        .into();
+        let page = shapes(
+            "<S><Shape ID='5' Master='1'><Cell N='Width' V='10'/>
+              <Section N='Geometry' IX='0'><Row T='LineTo' IX='2'><Cell N='Y' V='7'/></Row></Section></Shape></S>",
+        );
+        let t = tree(&d, &masters, &page);
+        let n = t.roots[0];
+        assert_eq!(t.num(n, "LocPinX"), Some(5.0));
+        let rows = t.rows(n, "Geometry", Some(0));
+        assert_eq!(rows.len(), 2);
+        assert_eq!(rows[0].1, Some("LineTo"));
+        let x = |r: usize| t.row_num(n, "Geometry", Some(0), &rows[r].0, "X");
+        let y = |r: usize| t.row_num(n, "Geometry", Some(0), &rows[r].0, "Y");
+        assert_eq!(x(0), Some(9.75));
+        // A cell that follows another row's cell.
+        assert_eq!(x(1), Some(9.75));
+        // The instance's own cell, and a formula that reads the instance.
+        assert_eq!(y(1), Some(7.0));
+        assert_eq!(
+            t.section_val(n, "Geometry", 0, "NoFill"),
+            Some(Val::Num(0.0))
+        );
+    }
+
+    #[test]
+    fn a_master_with_one_shape_gives_its_children_to_the_instance() {
+        let d = Doc::default();
+        let masters: HashMap<u32, Master> = [(
+            3,
+            Master {
+                shapes: shapes(
+                    "<S><Shape ID='1' Type='Group'><Cell N='Width' V='4'/><Shapes>
+                       <Shape ID='2'><Cell N='PinX' V='1' F='Sheet.1!Width*0.25'/><Cell N='Width' V='1'/></Shape>
+                       <Shape ID='3'><Cell N='PinX' V='3'/></Shape></Shapes></Shape></S>",
+                ),
+            },
+        )]
+        .into();
+        // The instance is twice as wide and changes the second child.
+        let page = shapes(
+            "<S><Shape ID='10' Type='Group' Master='3'><Cell N='Width' V='8'/><Shapes>
+               <Shape ID='12' MasterShape='3'><Cell N='PinX' V='6'/></Shape>
+               <Shape ID='13'/></Shapes></Shape></S>",
+        );
+        let t = tree(&d, &masters, &page);
+        let g = t.roots[0];
+        assert_eq!(t.kind(g), "Group");
+        let kids = &t.nodes[g].children;
+        // Master order, the child the instance overrides in place, then the
+        // instance's own.
+        assert_eq!(kids.len(), 3);
+        assert_eq!(t.num(kids[0], "PinX"), Some(2.0));
+        assert_eq!(t.num(kids[1], "PinX"), Some(6.0));
+        assert!(t.nodes[kids[2]].layers.len() == 1);
+        assert!(!t.deleted(kids[0]));
+    }
+
+    #[test]
+    fn a_master_with_several_shapes_gives_them_as_subshapes() {
+        let d = Doc::default();
+        let masters: HashMap<u32, Master> = [(
+            3,
+            Master {
+                shapes: shapes("<S><Shape ID='1'/><Shape ID='2'/></S>"),
+            },
+        )]
+        .into();
+        let page = shapes("<S><Shape ID='10' Master='3'/><Shape ID='11' Master='99'/></S>");
+        let t = tree(&d, &masters, &page);
+        assert_eq!(t.nodes[t.roots[0]].children.len(), 2);
+        // A master that is not there is no master.
+        assert!(t.nodes[t.roots[1]].children.is_empty());
+    }
+
+    #[test]
+    fn formulas_that_loop_or_run_away_give_the_stored_value() {
+        let d = Doc::default();
+        let masters: HashMap<u32, Master> = [(
+            1,
+            Master {
+                shapes: shapes(
+                    "<S><Shape ID='1'><Cell N='Width' V='2' F='Height'/><Cell N='Height' V='3' F='Width'/></Shape></S>",
+                ),
+            },
+        )]
+        .into();
+        let page = shapes("<S><Shape ID='5' Master='1'/></S>");
+        let t = tree(&d, &masters, &page);
+        let n = t.roots[0];
+        // The loop is cut where it closes, with the value the cell holds.
+        assert_eq!(t.num(n, "Width"), Some(2.0));
+        assert_eq!(t.num(n, "Height"), Some(2.0));
+    }
+
+    #[test]
+    fn rows_a_shape_deletes_are_left_out_and_fonts_resolve() {
+        let d = Doc {
+            faces: vec!["Arial".into(), "Calibri".into()],
+            minor_font: Some("Segoe UI".into()),
+            ..Doc::default()
+        };
+        let masters: HashMap<u32, Master> = [(
+            1,
+            Master {
+                shapes: shapes(
+                    "<S><Shape ID='1'><Section N='Geometry' IX='0'>
+                      <Row T='MoveTo' IX='1'/><Row T='LineTo' IX='2'/><Row T='LineTo' IX='3'/></Section></Shape></S>",
+                ),
+            },
+        )]
+        .into();
+        let page = shapes(
+            "<S><Shape ID='5' Master='1'><Section N='Geometry' IX='0'><Row IX='2' Del='1'/></Section></Shape></S>",
+        );
+        let t = tree(&d, &masters, &page);
+        let rows = t.rows(t.roots[0], "Geometry", Some(0));
+        assert_eq!(
+            rows.iter().map(|r| r.0.clone()).collect::<Vec<_>>(),
+            vec![RowKey::Ix(1), RowKey::Ix(3)]
+        );
+        assert_eq!(t.font(&Val::Str("1".into())).as_deref(), Some("Calibri"));
+        assert_eq!(t.font(&Val::Num(0.0)).as_deref(), Some("Arial"));
+        assert_eq!(
+            t.font(&Val::Str("Themed".into())).as_deref(),
+            Some("Segoe UI")
+        );
+        assert_eq!(
+            t.font(&Val::Str("Verdana".into())).as_deref(),
+            Some("Verdana")
+        );
+        assert_eq!(t.font(&Val::Num(9.0)), None);
+    }
+
+    #[test]
+    fn nodes_are_charged_to_the_budget() {
+        let d = Doc::default();
+        let masters = HashMap::new();
+        let page = shapes("<S><Shape ID='1'/><Shape ID='2'/><Shape ID='3'/></S>");
+        let mut b = Budget::new(Limits::default().with_max_shapes(2));
+        assert!(Tree::build(&d, &masters, &page, &mut b).is_err());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/sheet.rs b/crates/exav-render/src/formats/office/slides/vsdx/sheet.rs
new file mode 100644
index 00000000..a2b9831f
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/sheet.rs
@@ -0,0 +1,339 @@
+//! Sheets, sections, rows and cells ([MS-VSDX] 2.2.5), read from the XML
+//! parts of a drawing: a shape, a style sheet or a page sheet is a `Sheet`.
+
+use crate::formats::office::common::xml::{Child, Node};
+use std::collections::HashMap;
+
+/// The name of an element or attribute without its namespace prefix.
+pub fn local(name: &str) -> &str {
+    name.rsplit([':', '}']).next().unwrap_or(name)
+}
+
+/// A cell: its value as the V attribute holds it, and its formula.
+#[derive(Debug, Clone, Default)]
+pub struct Cell {
+    pub v: Option<String>,
+    pub f: Option<String>,
+}
+
+impl Cell {
+    /// The formula to evaluate: not "Inh" (inherited) nor "No Formula".
+    pub fn formula(&self) -> Option<&str> {
+        self.f
+            .as_deref()
+            .filter(|f| !f.is_empty() && *f != "Inh" && *f != "No Formula")
+    }
+}
+
+pub type Cells = HashMap<String, Cell>;
+
+#[derive(Debug, Default)]
+pub struct Row {
+    /// The row type of a geometry row (MoveTo, LineTo...).
+    pub t: Option<String>,
+    pub ix: Option<u32>,
+    pub n: Option<String>,
+    pub del: bool,
+    pub cells: Cells,
+}
+
+/// A row of a section, by its index or its name.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub enum RowKey {
+    Ix(u32),
+    Name(String),
+}
+
+#[derive(Debug, Default)]
+pub struct Section {
+    pub name: String,
+    pub ix: Option<u32>,
+    pub del: bool,
+    /// The cells of the section itself (NoFill, NoLine, NoShow of a path).
+    pub cells: Cells,
+    pub rows: Vec<Row>,
+    /// Where each row is, by key; the first of rows with the same key.
+    index: HashMap<RowKey, usize>,
+}
+
+impl Section {
+    /// The row `k` names.
+    pub fn find_row(&self, k: &RowKey) -> Option<&Row> {
+        self.index.get(k).and_then(|i| self.rows.get(*i))
+    }
+
+    fn add_row(&mut self, row: Row) {
+        let key = match (row.ix, &row.n) {
+            (Some(i), _) => Some(RowKey::Ix(i)),
+            (None, Some(n)) => Some(RowKey::Name(n.clone())),
+            _ => None,
+        };
+        if let Some(k) = key {
+            self.index.entry(k).or_insert(self.rows.len());
+        }
+        self.rows.push(row);
+    }
+}
+
+/// What a Text element holds, in order.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Piece {
+    Text(String),
+    /// The start of a run with the properties of a Character row.
+    Cp(u32),
+    Pp(u32),
+    Tp(u32),
+    /// A field of the Field section, with the text it was saved with.
+    Fld(u32, String),
+}
+
+#[derive(Debug, Default)]
+pub struct Foreign {
+    /// The part the image is in, as a path of the package.
+    pub target: Option<String>,
+}
+
+#[derive(Debug, Default)]
+pub struct Sheet {
+    pub id: u32,
+    pub name: String,
+    /// Shape, Group, Foreign or Guide.
+    pub kind: String,
+    pub del: bool,
+    pub master: Option<u32>,
+    pub master_shape: Option<u32>,
+    pub line_style: Option<u32>,
+    pub fill_style: Option<u32>,
+    pub text_style: Option<u32>,
+    pub cells: Cells,
+    pub sections: Vec<Section>,
+    pub text: Option<Vec<Piece>>,
+    pub foreign: Option<Foreign>,
+    pub shapes: Vec<Sheet>,
+}
+
+fn flag(n: &Node, k: &str) -> bool {
+    matches!(n.attr(k), Some("1" | "true"))
+}
+
+fn uint(n: &Node, k: &str) -> Option<u32> {
+    n.attr(k).and_then(|v| v.trim().parse().ok())
+}
+
+fn cell(n: &Node) -> Cell {
+    Cell {
+        v: n.attr("V").map(str::to_string),
+        f: n.attr("F").map(str::to_string),
+    }
+}
+
+fn cells_of(n: &Node, into: &mut Cells) {
+    for c in n.nodes().filter(|c| local(&c.name) == "Cell") {
+        if let Some(name) = c.attr("N") {
+            into.insert(name.to_string(), cell(c));
+        }
+    }
+}
+
+/// Shapes nested deeper than this are left out.
+const MAX_NESTING: u32 = 64;
+
+/// Sections of one sheet past this are left out: a sheet is searched
+/// section by section.
+const MAX_SECTIONS: usize = 1024;
+
+/// What `parse` needs of the part: where its relationships lead, by id.
+pub struct Rels<'a>(pub &'a HashMap<String, String>);
+
+/// The sheet of a Shape, StyleSheet or PageSheet element, and the shapes in
+/// it. `count` is incremented for each sheet read.
+pub fn parse(n: &Node, rels: &Rels, count: &mut usize, depth: u32) -> Sheet {
+    *count += 1;
+    let mut s = Sheet {
+        id: uint(n, "ID").unwrap_or(0),
+        name: n.attr("NameU").or(n.attr("Name")).unwrap_or("").to_string(),
+        kind: n.attr("Type").unwrap_or("Shape").to_string(),
+        del: flag(n, "Del"),
+        master: uint(n, "Master"),
+        master_shape: uint(n, "MasterShape"),
+        line_style: uint(n, "LineStyle"),
+        fill_style: uint(n, "FillStyle"),
+        text_style: uint(n, "TextStyle"),
+        ..Sheet::default()
+    };
+    cells_of(n, &mut s.cells);
+    for c in n.nodes() {
+        match local(&c.name) {
+            "Section" => {
+                let mut sec = Section {
+                    name: c.attr("N").unwrap_or("").to_string(),
+                    ix: uint(c, "IX"),
+                    del: flag(c, "Del"),
+                    ..Section::default()
+                };
+                cells_of(c, &mut sec.cells);
+                for r in c.nodes().filter(|r| local(&r.name) == "Row") {
+                    let mut row = Row {
+                        t: r.attr("T").map(str::to_string),
+                        ix: uint(r, "IX"),
+                        n: r.attr("N").map(str::to_string),
+                        del: flag(r, "Del"),
+                        ..Row::default()
+                    };
+                    cells_of(r, &mut row.cells);
+                    sec.add_row(row);
+                }
+                if s.sections.len() < MAX_SECTIONS {
+                    s.sections.push(sec);
+                }
+            }
+            "Text" => s.text = Some(pieces(c)),
+            "ForeignData" => {
+                let rel = c
+                    .nodes()
+                    .find(|r| local(&r.name) == "Rel")
+                    .and_then(|r| r.attr("r:id").or(r.attr("id")));
+                s.foreign = Some(Foreign {
+                    target: rel.and_then(|id| rels.0.get(id).cloned()),
+                });
+            }
+            "Shapes" if depth < MAX_NESTING => {
+                for k in c.nodes().filter(|k| local(&k.name) == "Shape") {
+                    s.shapes.push(parse(k, rels, count, depth + 1));
+                }
+            }
+            _ => {}
+        }
+    }
+    s
+}
+
+fn pieces(n: &Node) -> Vec<Piece> {
+    let mut out: Vec<Piece> = vec![];
+    for c in &n.children {
+        match c {
+            Child::Text(t) => match out.last_mut() {
+                Some(Piece::Text(p)) => p.push_str(t),
+                _ => out.push(Piece::Text(t.clone())),
+            },
+            Child::Node(e) => {
+                let ix = uint(e, "IX").unwrap_or(0);
+                match local(&e.name) {
+                    "cp" => out.push(Piece::Cp(ix)),
+                    "pp" => out.push(Piece::Pp(ix)),
+                    "tp" => out.push(Piece::Tp(ix)),
+                    "fld" => out.push(Piece::Fld(ix, e.own_text())),
+                    _ => {}
+                }
+            }
+        }
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::common::xml;
+
+    fn sheet(x: &str) -> Sheet {
+        let n = xml::parse(x.as_bytes(), &mut xml::within(1 << 24)).unwrap();
+        let rels: HashMap<String, String> =
+            [("rId1".to_string(), "visio/media/image1.png".to_string())].into();
+        parse(&n, &Rels(&rels), &mut 0, 0)
+    }
+
+    #[test]
+    fn cells_sections_rows_text_and_children() {
+        let s = sheet(
+            r#"<Shape xmlns="http://schemas.microsoft.com/office/visio/2012/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" ID="3" NameU="Box" Type="Group" Master="4" MasterShape="9" LineStyle="1" FillStyle="2" TextStyle="3">
+              <Cell N="Width" V="2.5" F="Inh"/>
+              <Section N="Geometry" IX="0"><Cell N="NoFill" V="1"/>
+                <Row T="MoveTo" IX="1"><Cell N="X" V="0" F="Width*0"/></Row></Section>
+              <Text>a<cp IX="1"/>b<fld IX="0">p1</fld>c<pp IX="2"/><tp IX="1"/></Text>
+              <ForeignData ForeignType="Bitmap"><Rel r:id="rId1"/></ForeignData>
+              <Shapes><Shape ID="4"/></Shapes></Shape>"#,
+        );
+        assert_eq!(
+            (s.id, s.name.as_str(), s.kind.as_str()),
+            (3, "Box", "Group")
+        );
+        assert_eq!((s.master, s.master_shape), (Some(4), Some(9)));
+        assert_eq!(
+            (s.line_style, s.fill_style, s.text_style),
+            (Some(1), Some(2), Some(3))
+        );
+        assert_eq!(s.cells["Width"].v.as_deref(), Some("2.5"));
+        assert_eq!(s.cells["Width"].formula(), None);
+        let g = &s.sections[0];
+        assert_eq!((g.name.as_str(), g.ix), ("Geometry", Some(0)));
+        assert_eq!(g.cells["NoFill"].v.as_deref(), Some("1"));
+        assert_eq!(g.rows[0].t.as_deref(), Some("MoveTo"));
+        assert_eq!(g.rows[0].cells["X"].formula(), Some("Width*0"));
+        assert_eq!(
+            s.text.unwrap(),
+            vec![
+                Piece::Text("a".into()),
+                Piece::Cp(1),
+                Piece::Text("b".into()),
+                Piece::Fld(0, "p1".into()),
+                Piece::Text("c".into()),
+                Piece::Pp(2),
+                Piece::Tp(1)
+            ]
+        );
+        let f = s.foreign.unwrap();
+        assert_eq!(f.target.as_deref(), Some("visio/media/image1.png"));
+        assert_eq!(s.shapes[0].id, 4);
+    }
+
+    #[test]
+    fn a_shape_without_attributes_is_a_plain_shape_and_unprefixed_names_read() {
+        let s = sheet("<Shape/>");
+        assert_eq!((s.id, s.kind.as_str(), s.del), (0, "Shape", false));
+        assert!(s.text.is_none() && s.foreign.is_none() && s.shapes.is_empty());
+    }
+
+    #[test]
+    fn rows_are_found_by_index_or_name_the_first_of_a_key_winning() {
+        let s = sheet(
+            "<Shape><Section N='Geometry' IX='0'><Row IX='1' T='MoveTo'/><Row IX='2' T='LineTo'/><Row IX='2' T='ArcTo'/>\
+             <Row N='a' T='Named'/><Row/></Section></Shape>",
+        );
+        let g = &s.sections[0];
+        assert_eq!(g.rows.len(), 5);
+        let t = |k: RowKey| g.find_row(&k).and_then(|r| r.t.clone());
+        assert_eq!(t(RowKey::Ix(2)).as_deref(), Some("LineTo"));
+        assert_eq!(t(RowKey::Name("a".into())).as_deref(), Some("Named"));
+        assert_eq!(t(RowKey::Ix(9)), None);
+    }
+
+    #[test]
+    fn sections_past_the_bound_are_left_out() {
+        let x = format!(
+            "<Shape>{}</Shape>",
+            "<Section N='User'/>".repeat(MAX_SECTIONS + 10)
+        );
+        assert_eq!(sheet(&x).sections.len(), MAX_SECTIONS);
+    }
+
+    #[test]
+    fn shapes_nested_past_the_bound_are_left_out() {
+        let mut x = String::from("<Shape ID='1'>");
+        for _ in 0..100 {
+            x.push_str("<Shapes><Shape ID='2'>");
+        }
+        for _ in 0..100 {
+            x.push_str("</Shape></Shapes>");
+        }
+        x.push_str("</Shape>");
+        let s = sheet(&x);
+        let mut depth = 0;
+        let mut cur = &s;
+        while let Some(c) = cur.shapes.first() {
+            depth += 1;
+            cur = c;
+        }
+        assert_eq!(depth, MAX_NESTING);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/slides/vsdx/text.rs b/crates/exav-render/src/formats/office/slides/vsdx/text.rs
new file mode 100644
index 00000000..485d1bf2
--- /dev/null
+++ b/crates/exav-render/src/formats/office/slides/vsdx/text.rs
@@ -0,0 +1,362 @@
+//! The text of a shape ([MS-VSDX] 2.2.8): runs formatted by the rows of the
+//! Character section, paragraphs by those of Paragraph, in a text block
+//! with margins and a vertical alignment.
+
+use super::resolve::{RowKey, Tree};
+use super::sheet::Piece;
+use crate::formats::office::slides::model::{
+    BodyProps, Bullet, Color, ParaProps, Paragraph, Run, RunKind, RunProps, Spacing, TextBody,
+};
+
+const EMU_PER_INCH: f64 = 914_400.0;
+/// Hundredths of a point per inch.
+const CPT_PER_INCH: f64 = 7_200.0;
+
+fn emu(v: f64) -> i64 {
+    (v.clamp(-1e5, 1e5) * EMU_PER_INCH).round() as i64
+}
+
+/// The text of shape `n`, or `None` when it has none or hides it. `k` is
+/// the paper inches to each of a scaled drawing, which the margins are in.
+pub fn build(t: &Tree, n: usize, k: f64) -> Option<TextBody> {
+    if t.num(n, "HideText") == Some(1.0) {
+        return None;
+    }
+    let pieces = t.pieces(n)?;
+    let mut paras: Vec<Paragraph> = vec![];
+    let (mut cp, mut pp) = (0u32, 0u32);
+    let mut cur: Vec<Run> = vec![];
+    let mut cur_pp = 0u32;
+    let mut cur_cp = 0u32;
+    let mut buf = String::new();
+    let mut text = false;
+    macro_rules! push_text {
+        () => {
+            if !buf.is_empty() {
+                cur.push(Run {
+                    kind: RunKind::Text(std::mem::take(&mut buf)),
+                    props: run_props(t, n, cp),
+                });
+                cur_cp = cp;
+            }
+        };
+    }
+    macro_rules! end_para {
+        () => {
+            paras.push(Paragraph {
+                props: para_props(t, n, cur_pp),
+                runs: std::mem::take(&mut cur),
+                end: run_props(t, n, cur_cp),
+            });
+            cur_pp = pp;
+            cur_cp = cp;
+        };
+    }
+    for piece in pieces {
+        match piece {
+            Piece::Cp(i) => {
+                push_text!();
+                cp = *i;
+                if cur.is_empty() {
+                    cur_cp = cp;
+                }
+            }
+            Piece::Pp(i) => {
+                push_text!();
+                pp = *i;
+                if cur.is_empty() {
+                    cur_pp = pp;
+                }
+            }
+            Piece::Tp(_) => {}
+            Piece::Fld(_, s) => {
+                for c in s.chars().filter(|c| !c.is_control()) {
+                    buf.push(c);
+                }
+                text |= !buf.is_empty();
+                push_text!();
+            }
+            Piece::Text(s) => {
+                let mut chars = s.chars().peekable();
+                while let Some(c) = chars.next() {
+                    match c {
+                        '\r' if chars.peek() == Some(&'\n') => {}
+                        '\n' | '\r' => {
+                            push_text!();
+                            end_para!();
+                        }
+                        '\u{2028}' | '\u{b}' => {
+                            push_text!();
+                            cur.push(Run {
+                                kind: RunKind::Break,
+                                props: run_props(t, n, cp),
+                            });
+                        }
+                        c if c.is_control() && c != '\t' => {}
+                        c => {
+                            buf.push(c);
+                            text = true;
+                        }
+                    }
+                }
+                push_text!();
+            }
+        }
+    }
+    push_text!();
+    if !cur.is_empty() || paras.is_empty() {
+        paras.push(Paragraph {
+            props: para_props(t, n, cur_pp),
+            runs: cur,
+            end: run_props(t, n, cur_cp),
+        });
+    }
+    if !text {
+        return None;
+    }
+    let side = |name: &str| emu(t.num(n, name).unwrap_or(0.0).max(0.0) * k);
+    Some(TextBody {
+        body: BodyProps {
+            insets: [
+                side("LeftMargin"),
+                side("TopMargin"),
+                side("RightMargin"),
+                side("BottomMargin"),
+            ],
+            anchor: match t.num(n, "VerticalAlign").map(|v| v as i64) {
+                Some(1) => "ctr",
+                Some(2) => "b",
+                _ => "t",
+            },
+            ..BodyProps::default()
+        },
+        paras,
+        ..TextBody::default()
+    })
+}
+
+/// A Character cell of row `cp`, else of row 0, which is what the rows
+/// after it start from.
+fn char_val(t: &Tree, n: usize, cp: u32, cell: &str) -> Option<super::formula::Val> {
+    t.row_val(n, "Character", None, &RowKey::Ix(cp), cell)
+        .or_else(|| t.row_val(n, "Character", None, &RowKey::Ix(0), cell))
+}
+
+fn run_props(t: &Tree, n: usize, cp: u32) -> RunProps {
+    let num = |cell: &str| char_val(t, n, cp, cell).and_then(|v| v.num());
+    let style = num("Style").map_or(0, |v| v as i64);
+    let size = num("Size")
+        .filter(|v| *v > 0.0)
+        .map_or(1000, |v| (v.min(100.0) * CPT_PER_INCH).round() as u32);
+    let color = char_val(t, n, cp, "Color")
+        .and_then(|v| t.to_color(&v))
+        .map(|rgb| {
+            let tr = num("ColorTrans").unwrap_or(0.0).clamp(0.0, 1.0);
+            Color {
+                rgb,
+                alpha: (tr > 0.0).then(|| ((1.0 - tr) * 100_000.0).round() as u32),
+            }
+        });
+    RunProps {
+        size: Some(size.clamp(100, 400_000)),
+        bold: Some(style & 1 != 0),
+        italic: Some(style & 2 != 0),
+        underline: if num("DblUnderline").unwrap_or(0.0) != 0.0 {
+            Some("dbl")
+        } else if style & 4 != 0 {
+            Some("sng")
+        } else {
+            None
+        },
+        strike: if num("DoubleStrikethrough").unwrap_or(0.0) != 0.0 {
+            Some("dblStrike")
+        } else if num("Strikethru").unwrap_or(0.0) != 0.0 {
+            Some("sngStrike")
+        } else {
+            None
+        },
+        color,
+        font: char_val(t, n, cp, "Font").and_then(|v| t.font(&v)),
+        baseline: match num("Pos").map(|v| v as i64) {
+            Some(1) => Some(30_000),
+            Some(2) => Some(-25_000),
+            _ => None,
+        },
+        caps: match (num("Case").map(|v| v as i64), style & 8 != 0) {
+            (Some(1), _) => Some("all"),
+            (_, true) => Some("small"),
+            _ => None,
+        },
+        spacing: num("Letterspace")
+            .filter(|v| *v != 0.0)
+            .map(|v| (v.clamp(-10.0, 10.0) * CPT_PER_INCH).round() as i32),
+        ..RunProps::default()
+    }
+}
+
+fn para_props(t: &Tree, n: usize, pp: u32) -> ParaProps {
+    let val = |cell: &str| {
+        t.row_val(n, "Paragraph", None, &RowKey::Ix(pp), cell)
+            .or_else(|| t.row_val(n, "Paragraph", None, &RowKey::Ix(0), cell))
+    };
+    let num = |cell: &str| val(cell).and_then(|v| v.num());
+    let space =
+        |v: f64| (v > 0.0).then(|| Spacing::Pts((v.min(100.0) * CPT_PER_INCH).round() as i32));
+    let bullet = if num("Bullet").is_some_and(|b| b > 0.0) {
+        let ch = match val("BulletStr") {
+            Some(super::formula::Val::Str(s)) => s.chars().next(),
+            _ => None,
+        };
+        Bullet::Char {
+            ch: ch.unwrap_or('\u{2022}'),
+            font: None,
+            color: None,
+            size: None,
+        }
+    } else {
+        Bullet::None
+    };
+    ParaProps {
+        align: Some(match num("HorzAlign").map(|v| v as i64) {
+            Some(1) => "ctr",
+            Some(2) => "r",
+            Some(3) => "just",
+            Some(4) => "dist",
+            _ => "l",
+        }),
+        margin: Some(emu(num("IndLeft").unwrap_or(0.0).max(0.0))),
+        indent: Some(emu(num("IndFirst").unwrap_or(0.0))),
+        // A negative spacing is a multiple of the line, a positive one a
+        // distance.
+        line_spacing: num("SpLine").and_then(|v| {
+            if v < 0.0 {
+                Some(Spacing::Pct(
+                    (-v * 100_000.0).clamp(1000.0, 1_000_000.0) as i32
+                ))
+            } else {
+                space(v)
+            }
+        }),
+        space_before: num("SpBefore").and_then(space),
+        space_after: num("SpAfter").and_then(space),
+        bullet: Some(bullet),
+        ..ParaProps::default()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::formats::office::slides::limits::{Budget, Limits};
+    use crate::formats::office::slides::vsdx::resolve::{Doc, Master, tests::shapes};
+    use std::collections::HashMap;
+
+    fn body(shape: &str) -> Option<TextBody> {
+        let d = Doc {
+            faces: vec!["Arial".into(), "Calibri".into()],
+            ..Doc::default()
+        };
+        let page = shapes(&format!("<S>{shape}</S>"));
+        let m: HashMap<u32, Master> = HashMap::new();
+        let t = Tree::build(&d, &m, &page, &mut Budget::new(Limits::default())).unwrap();
+        build(&t, t.roots[0], 1.0)
+    }
+
+    fn texts(p: &Paragraph) -> Vec<String> {
+        p.runs
+            .iter()
+            .map(|r| match &r.kind {
+                RunKind::Text(s) => s.clone(),
+                RunKind::Break => "<br>".into(),
+                RunKind::Field(_, s) => s.clone(),
+            })
+            .collect()
+    }
+
+    const CHARS: &str = "<Section N='Character'>
+        <Row IX='0'><Cell N='Size' V='0.1666666667'/><Cell N='Font' V='1'/><Cell N='Color' V='#ff0000'/><Cell N='Style' V='0'/></Row>
+        <Row IX='1'><Cell N='Size' V='0.25'/><Cell N='Style' V='7'/><Cell N='Pos' V='1'/><Cell N='Case' V='1'/></Row></Section>";
+
+    #[test]
+    fn runs_take_the_properties_of_their_character_rows() {
+        let b = body(&format!(
+            "<Shape ID='1'>{CHARS}<Text><cp IX='0'/>plain <cp IX='1'/>loud</Text></Shape>"
+        ))
+        .unwrap();
+        assert_eq!(b.paras.len(), 1);
+        let p = &b.paras[0];
+        assert_eq!(texts(p), vec!["plain ", "loud"]);
+        let (a, l) = (&p.runs[0].props, &p.runs[1].props);
+        assert_eq!(a.size, Some(1200));
+        assert_eq!(a.font.as_deref(), Some("Calibri"));
+        assert_eq!(a.color, Some(Color::rgb(0xFF0000)));
+        assert_eq!(
+            (a.bold, a.italic, a.underline),
+            (Some(false), Some(false), None)
+        );
+        assert_eq!(l.size, Some(1800));
+        assert_eq!(
+            (l.bold, l.italic, l.underline),
+            (Some(true), Some(true), Some("sng"))
+        );
+        assert_eq!((l.baseline, l.caps), (Some(30_000), Some("all")));
+        // Row 1 has no colour: row 0's.
+        assert_eq!(l.color, Some(Color::rgb(0xFF0000)));
+    }
+
+    #[test]
+    fn newlines_start_paragraphs_with_their_properties() {
+        let b = body(
+            "<Shape ID='1'>
+              <Section N='Paragraph'>
+               <Row IX='0'><Cell N='HorzAlign' V='1'/><Cell N='SpLine' V='-1.2'/><Cell N='IndLeft' V='0.5'/></Row>
+               <Row IX='1'><Cell N='HorzAlign' V='2'/><Cell N='SpAfter' V='0.0833333333'/><Cell N='Bullet' V='1'/><Cell N='BulletStr' V='-'/></Row></Section>
+              <Text><pp IX='0'/><cp IX='0'/>one
+<pp IX='1'/><cp IX='0'/>two<cp IX='0'/>
+x&#8232;y</Text></Shape>",
+        )
+        .unwrap();
+        assert_eq!(b.paras.len(), 3);
+        assert_eq!(texts(&b.paras[0]), vec!["one"]);
+        assert_eq!(b.paras[0].props.align, Some("ctr"));
+        assert_eq!(b.paras[0].props.line_spacing, Some(Spacing::Pct(120_000)));
+        assert_eq!(b.paras[0].props.margin, Some(457_200));
+        assert_eq!(texts(&b.paras[1]), vec!["two"]);
+        assert_eq!(b.paras[1].props.align, Some("r"));
+        assert_eq!(b.paras[1].props.space_after, Some(Spacing::Pts(600)));
+        assert!(matches!(
+            b.paras[1].props.bullet,
+            Some(Bullet::Char { ch: '-', .. })
+        ));
+        // The third keeps the last paragraph row; a line break is a break.
+        assert_eq!(texts(&b.paras[2]), vec!["x", "<br>", "y"]);
+        assert_eq!(b.paras[2].props.align, Some("r"));
+    }
+
+    #[test]
+    fn fields_are_their_saved_text_and_blank_text_is_none() {
+        let b = body("<Shape ID='1'><Text>Page <fld IX='0'>3</fld></Text></Shape>").unwrap();
+        assert_eq!(texts(&b.paras[0]), vec!["Page ", "3"]);
+        assert!(body("<Shape ID='1'><Text><cp IX='0'/></Text></Shape>").is_none());
+        assert!(body("<Shape ID='1'/>").is_none());
+        assert!(body("<Shape ID='1'><Cell N='HideText' V='1'/><Text>x</Text></Shape>").is_none());
+    }
+
+    #[test]
+    fn margins_and_the_vertical_alignment_make_the_text_block() {
+        let b = body(
+            "<Shape ID='1'><Cell N='LeftMargin' V='0.1'/><Cell N='TopMargin' V='0.05'/><Cell N='VerticalAlign' V='1'/><Text>x</Text></Shape>",
+        )
+        .unwrap();
+        assert_eq!(b.body.insets, [91_440, 45_720, 0, 0]);
+        assert_eq!(b.body.anchor, "ctr");
+    }
+
+    #[test]
+    fn a_carriage_return_and_a_newline_are_one_paragraph_break() {
+        let b = body("<Shape ID='1'><Text>a&#13;&#10;b&#13;c</Text></Shape>").unwrap();
+        assert_eq!(b.paras.len(), 3);
+        assert_eq!(texts(&b.paras[0]), vec!["a"]);
+        assert_eq!(texts(&b.paras[2]), vec!["c"]);
+    }
+}
diff --git a/crates/exav-render/src/formats/office/text.rs b/crates/exav-render/src/formats/office/text.rs
new file mode 100644
index 00000000..3928f2c6
--- /dev/null
+++ b/crates/exav-render/src/formats/office/text.rs
@@ -0,0 +1,230 @@
+//! The text of an office document as a reader sees it, taken from what the
+//! converters read (`sheets`, `slides`, `docs`), for a scanner or a search:
+//! the words, one block to a line, and where a link leads written after its
+//! label as `label (target)`. What a reader never sees (a macro, a formula's
+//! source, a style) is left out. Nothing is written back out as OOXML first.
+//!
+//! The text is cut at the cap given, which [`Text::truncated`] says, and is in
+//! sections (a sheet, a slide, a page's header), so that a match can say where
+//! it is.
+
+/// Links kept in [`Text::links`].
+pub const MAX_LINKS: usize = 4096;
+/// Characters of a link's label or target kept in [`Text::links`].
+const LINK_CHARS: usize = 2048;
+
+/// What a text extraction made.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Text {
+    /// The text, in UTF-8, one block to a line.
+    pub text: String,
+    /// The cap was reached: the rest of the document is not here.
+    pub truncated: bool,
+    /// Each link whose label is not its target, as `(label, target)`. At most
+    /// [`MAX_LINKS`].
+    pub links: Vec<(String, String)>,
+    /// The parts of the text, in order: a sheet, a slide, a header. Empty
+    /// when the document is one block.
+    pub sections: Vec<Section>,
+}
+
+/// A part of a [`Text`].
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Section {
+    /// What the part is: `sheet "Budget"`, `slide 3`, `footnotes`.
+    pub label: String,
+    /// Its bytes in [`Text::text`].
+    pub range: std::ops::Range<usize>,
+}
+
+/// Builds a [`Text`] within a cap.
+pub(crate) struct Out {
+    text: String,
+    cap: usize,
+    truncated: bool,
+    links: Vec<(String, String)>,
+    /// Where each open link's label starts, and its target.
+    open: Vec<(usize, String)>,
+    sections: Vec<(String, usize)>,
+}
+
+impl Out {
+    pub(crate) fn new(cap: usize) -> Out {
+        Out {
+            text: String::new(),
+            cap,
+            truncated: false,
+            links: Vec::new(),
+            open: Vec::new(),
+            sections: Vec::new(),
+        }
+    }
+
+    /// Whether the cap is reached: a reader may stop.
+    pub(crate) fn full(&self) -> bool {
+        self.truncated
+    }
+
+    /// Starts a section. An empty one is dropped when the next starts.
+    pub(crate) fn section(&mut self, label: impl Into<String>) {
+        self.newline();
+        self.sections.push((label.into(), self.text.len()));
+    }
+
+    /// Appends text to the current line, its control characters turned into
+    /// spaces; a line break in it ends the line.
+    pub(crate) fn push(&mut self, s: &str) {
+        for c in s.chars() {
+            if self.truncated {
+                return;
+            }
+            if self.text.len() + c.len_utf8() > self.cap {
+                self.truncated = true;
+                return;
+            }
+            match c {
+                '\n' | '\r' | '\u{b}' | '\u{c}' | '\u{2028}' | '\u{2029}' => self.newline(),
+                c if c.is_control() && c != '\t' => self.text.push(' '),
+                c => self.text.push(c),
+            }
+        }
+    }
+
+    /// Ends the line, unless it is empty.
+    pub(crate) fn newline(&mut self) {
+        let start = self.text.rfind('\n').map_or(0, |i| i + 1);
+        let line = &self.text[start..];
+        if line.trim().is_empty() {
+            self.text.truncate(start);
+        } else if self.text.len() < self.cap {
+            self.text.push('\n');
+        } else {
+            self.truncated = true;
+        }
+    }
+
+    /// One line: `s` and a line break. Some readers write whole lines, some
+    /// push runs: a build with only the others leaves this one unused.
+    #[allow(dead_code)]
+    pub(crate) fn line(&mut self, s: &str) {
+        self.push(s);
+        self.newline();
+    }
+
+    /// Opens a link to `target`: the text pushed until [`Out::end_link`] is
+    /// its label.
+    pub(crate) fn begin_link(&mut self, target: &str) {
+        if self.open.len() < 16 {
+            self.open.push((self.text.len(), target.to_string()));
+        }
+    }
+
+    /// Closes the last open link: its target follows its label in the text,
+    /// `label (target)`, and the pair is kept when they differ.
+    pub(crate) fn end_link(&mut self) {
+        let Some((start, target)) = self.open.pop() else {
+            return;
+        };
+        let label = self.text.get(start..).unwrap_or("");
+        let bare = target.strip_prefix("mailto:").unwrap_or(&target);
+        if label == target || label == bare || target.is_empty() {
+            return;
+        }
+        let pair = (
+            label.trim().chars().take(LINK_CHARS).collect::<String>(),
+            target.chars().take(LINK_CHARS).collect::<String>(),
+        );
+        if self.links.len() < MAX_LINKS {
+            self.links.push(pair);
+        }
+        self.push(" (");
+        self.push(&target);
+        self.push(")");
+    }
+
+    pub(crate) fn finish(mut self) -> Text {
+        while !self.open.is_empty() {
+            self.end_link();
+        }
+        self.newline();
+        let end = self.text.len();
+        let mut sections = Vec::new();
+        for (i, (label, start)) in self.sections.iter().enumerate() {
+            let to = self.sections.get(i + 1).map_or(end, |s| s.1);
+            if *start < to {
+                sections.push(Section {
+                    label: label.clone(),
+                    range: *start..to,
+                });
+            }
+        }
+        Text {
+            text: self.text,
+            truncated: self.truncated,
+            links: self.links,
+            sections,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn lines_sections_and_links() {
+        let mut o = Out::new(1000);
+        o.section("sheet \"A\"");
+        o.push("one ");
+        o.push("two\nthree\r\n");
+        o.begin_link("https://example.com/x");
+        o.push("here");
+        o.end_link();
+        o.newline();
+        o.begin_link("https://example.com/");
+        o.push("https://example.com/");
+        o.end_link();
+        o.line("");
+        o.section("empty");
+        o.section("slide 2");
+        o.line("end");
+        let t = o.finish();
+        assert_eq!(
+            t.text,
+            "one two\nthree\nhere (https://example.com/x)\nhttps://example.com/\nend\n"
+        );
+        assert_eq!(
+            t.links,
+            [("here".to_string(), "https://example.com/x".to_string())]
+        );
+        let labels: Vec<_> = t.sections.iter().map(|s| s.label.as_str()).collect();
+        assert_eq!(labels, ["sheet \"A\"", "slide 2"]);
+        assert_eq!(&t.text[t.sections[1].range.clone()], "end\n");
+        assert!(!t.truncated);
+    }
+
+    #[test]
+    fn the_cap_cuts_the_text_and_says_so() {
+        let mut o = Out::new(10);
+        o.line("abcdef");
+        o.line("ghijkl");
+        o.line("more");
+        assert!(o.full());
+        let t = o.finish();
+        assert!(t.text.len() <= 10);
+        assert!(t.truncated);
+    }
+
+    #[test]
+    fn control_characters_are_spaces_and_a_mailto_label_is_its_address() {
+        let mut o = Out::new(100);
+        o.push("a\u{1}b");
+        o.newline();
+        o.begin_link("mailto:x@y.test");
+        o.push("x@y.test");
+        o.end_link();
+        let t = o.finish();
+        assert_eq!(t.text, "a b\nx@y.test\n");
+        assert!(t.links.is_empty());
+    }
+}
diff --git a/crates/exav-render/src/formats/office/visible.rs b/crates/exav-render/src/formats/office/visible.rs
new file mode 100644
index 00000000..140ff571
--- /dev/null
+++ b/crates/exav-render/src/formats/office/visible.rs
@@ -0,0 +1,246 @@
+//! Which office document a file is, by its bytes and its name, and its text:
+//! the legacy and flat formats the XML parts of `exav_unpack::text` do not
+//! reach (DOC, XLS, PPT, RTF, Word 2003 XML, SpreadsheetML 2003, SYLK, the
+//! flat OpenDocument files, Numbers, Pages, Keynote). For [`crate::text`].
+
+use super::text::Text;
+use super::{docs, sheets, slides};
+use exav_unpack::cfb::Compound;
+
+/// What a file is, among what is read here.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum Doc {
+    Docs(docs::Format),
+    Sheets(sheets::Format),
+    Slides(slides::Format),
+}
+
+/// Extensions of the compound files read here: another compound file (an
+/// installer, a message) is not, and is not read whole to find out.
+const COMPOUND_EXTENSIONS: &[&str] = &[
+    ".doc", ".dot", ".xls", ".xlt", ".xlw", ".ppt", ".pps", ".pot",
+];
+/// Extensions of a bare BIFF worksheet, whose first bytes are a weak sign.
+const BIFF_EXTENSIONS: &[&str] = &[".xls", ".xlt", ".xlw"];
+/// Extensions of the flat and iWork files read here.
+const NAMED_EXTENSIONS: &[&str] = &[
+    ".fodt", ".fods", ".fodp", ".fodg", ".slk", ".sylk", ".pages", ".key", ".keynote", ".numbers",
+];
+
+const OLE2: [u8; 8] = [0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1];
+
+/// The start of a text document as ASCII, lower case: UTF-16 by its byte
+/// order mark read a byte in two, a UTF-8 mark and leading white space
+/// skipped. At most `n` characters.
+fn ascii_head(data: &[u8], n: usize) -> String {
+    let (step, from) = match data {
+        [0xFF, 0xFE, ..] => (2, 2),
+        [0xFE, 0xFF, ..] => (2, 3),
+        [0xEF, 0xBB, 0xBF, ..] => (1, 3),
+        _ => (1, 0),
+    };
+    data.iter()
+        .skip(from)
+        .step_by(step)
+        .take(n)
+        .map(|&b| {
+            if b < 0x80 {
+                b.to_ascii_lowercase() as char
+            } else {
+                '?'
+            }
+        })
+        .collect::<String>()
+        .trim_start()
+        .to_string()
+}
+
+fn has_extension(name: &str, list: &[&str]) -> bool {
+    let lower = name.to_ascii_lowercase();
+    list.iter().any(|e| lower.ends_with(e))
+}
+
+fn is_rtf(head: &[u8]) -> bool {
+    let h = head.strip_prefix(b"\xEF\xBB\xBF").unwrap_or(head);
+    let at = h
+        .iter()
+        .take(16)
+        .take_while(|b| b.is_ascii_whitespace())
+        .count();
+    h[at..].starts_with(b"{\\rtf")
+}
+
+/// The XML a flat file's first bytes say it is.
+fn xml_kind(head: &str) -> Option<Doc> {
+    if head.contains("urn:schemas-microsoft-com:office:spreadsheet")
+        && head.contains("workbook")
+        && !head.contains("<html")
+    {
+        return Some(Doc::Sheets(sheets::Format::SpreadsheetMl));
+    }
+    if head.contains("w:worddocument") || head.contains("schemas-microsoft-com:office:word") {
+        return Some(Doc::Docs(docs::Format::Wml2003));
+    }
+    if head.contains("office:document") {
+        for (marker, doc) in [
+            ("opendocument.text", Doc::Docs(docs::Format::Fodt)),
+            (
+                "opendocument.spreadsheet",
+                Doc::Sheets(sheets::Format::Fods),
+            ),
+            (
+                "opendocument.presentation",
+                Doc::Slides(slides::Format::Fodp),
+            ),
+            ("opendocument.graphics", Doc::Slides(slides::Format::Fodg)),
+            ("opendocument.drawing", Doc::Slides(slides::Format::Fodg)),
+        ] {
+            if head.contains(marker) {
+                return Some(doc);
+            }
+        }
+    }
+    None
+}
+
+/// Whether a file or member called `name`, starting with `head` (a kilobyte
+/// is enough), may be an office document read here. Cheap: nothing is
+/// parsed, and a compound file or an archive is told by its name.
+pub fn wants(name: &str, head: &[u8]) -> bool {
+    if is_rtf(head) {
+        return true;
+    }
+    if head.starts_with(&OLE2) {
+        return has_extension(name, COMPOUND_EXTENSIONS);
+    }
+    if is_biff(head) && has_extension(name, BIFF_EXTENSIONS) {
+        return true;
+    }
+    if has_extension(name, NAMED_EXTENSIONS) {
+        return true;
+    }
+    let utf16 = head.starts_with(&[0xFF, 0xFE]) || head.starts_with(&[0xFE, 0xFF]);
+    if !(utf16 || exav_unpack::text::looks_text(head)) {
+        return false;
+    }
+    let text = ascii_head(&head[..head.len().min(1024)], 1024);
+    text.starts_with("id;") || xml_kind(&text).is_some()
+}
+
+/// What kind of document `data` is, when it is one read here.
+fn kind(name: &str, data: &[u8]) -> Option<Doc> {
+    let head = &data[..data.len().min(4096)];
+    if is_rtf(head) {
+        return Some(Doc::Docs(docs::Format::Rtf));
+    }
+    if head.starts_with(&OLE2) {
+        if !has_extension(name, COMPOUND_EXTENSIONS) {
+            return None;
+        }
+        let c = Compound::open(data)?;
+        let has = |n: &str| c.names().any(|s| s.eq_ignore_ascii_case(n));
+        return if has("WordDocument") {
+            Some(Doc::Docs(docs::Format::Doc))
+        } else if has("Workbook") || has("Book") {
+            Some(Doc::Sheets(sheets::Format::Xls))
+        } else if has("PowerPoint Document") || has("PP40") {
+            Some(Doc::Slides(slides::Format::Ppt))
+        } else {
+            None
+        };
+    }
+    if head.starts_with(b"PK") {
+        return iwork(name);
+    }
+    // A bare BIFF2 to BIFF4 worksheet: a weak signature, so the name asks too.
+    if is_biff(head) && has_extension(name, BIFF_EXTENSIONS) {
+        return Some(Doc::Sheets(sheets::Format::Xls));
+    }
+    // The first kilobyte, as `wants` reads it; a flat OpenDocument file's
+    // root element, which declares many namespaces before it says what it is,
+    // may need more, and its name has asked for it.
+    let first = &head[..head.len().min(1024)];
+    // Text, as `wants` asks first: a binary file with a marker among its bytes
+    // is not a document of that kind.
+    let utf16 = first.starts_with(&[0xFF, 0xFE]) || first.starts_with(&[0xFE, 0xFF]);
+    let sniffable = utf16 || exav_unpack::text::looks_text(first);
+    let text = ascii_head(first, 1024);
+    if sniffable && text.starts_with("id;") {
+        return Some(Doc::Sheets(sheets::Format::Sylk));
+    }
+    sniffable.then(|| xml_kind(&text)).flatten().or_else(|| {
+        has_extension(name, &[".fodt", ".fods", ".fodp", ".fodg"])
+            .then(|| xml_kind(&ascii_head(head, 4096)))
+            .flatten()
+    })
+}
+
+/// Numbers, Pages or Keynote, by the name of the package (a ZIP of members
+/// whose names tell the three apart only with the iWork versions in mind): the
+/// converters refuse what is not theirs.
+fn iwork(name: &str) -> Option<Doc> {
+    if has_extension(name, &[".key", ".keynote"]) {
+        Some(Doc::Slides(slides::Format::Keynote))
+    } else if has_extension(name, &[".numbers"]) {
+        Some(Doc::Sheets(sheets::Format::Numbers))
+    } else if has_extension(name, &[".pages"]) {
+        Some(Doc::Docs(docs::Format::Pages))
+    } else {
+        None
+    }
+}
+
+/// A BIFF2 to BIFF4 worksheet's first record (BOF).
+fn is_biff(head: &[u8]) -> bool {
+    matches!(head, [0x09, 0 | 2 | 4, b, 0, ..] if *b < 0x20)
+}
+
+/// What reading an office document's text gave.
+#[derive(Debug)]
+pub enum Read {
+    /// The text.
+    Text(Text),
+    /// The document is one read here, and its text could not be read: why
+    /// (encrypted, past a limit, damaged).
+    Unreadable(String),
+}
+
+/// The text of `data`, a file called `name`, when it is an office document
+/// read here (`None` when it is not). `cap` bounds the text, `limits` the
+/// work.
+pub fn read(name: &str, data: &[u8], cap: usize, limits: &exav_unpack::Limits) -> Option<Read> {
+    let doc = kind(name, data)?;
+    let memory = limits.max_buffer_bytes;
+    let made = match doc {
+        Doc::Docs(f) => docs::text(
+            data,
+            f,
+            &docs::Limits::default()
+                .with_max_memory(memory.min(docs::Limits::default().max_memory)),
+            cap,
+        )
+        .map_err(|e| (e.kind(), e.to_string())),
+        Doc::Sheets(f) => sheets::text(
+            data,
+            f,
+            &sheets::Limits::default()
+                .with_max_memory(memory.min(sheets::Limits::default().max_memory)),
+            cap,
+        )
+        .map_err(|e| (e.kind(), e.to_string())),
+        Doc::Slides(f) => slides::text(
+            data,
+            f,
+            &slides::Limits::default()
+                .with_max_memory(memory.min(slides::Limits::default().max_memory)),
+            cap,
+        )
+        .map_err(|e| (e.kind(), e.to_string())),
+    };
+    match made {
+        Ok(t) => Some(Read::Text(t)),
+        // Not that kind of file after all: nothing to say.
+        Err(("not-format", _)) => None,
+        Err((kind, why)) => Some(Read::Unreadable(format!("{kind}: {why}"))),
+    }
+}
diff --git a/crates/exav-render/src/formats/pdf_image/ccitt.rs b/crates/exav-render/src/formats/pdf_image/ccitt.rs
index bbc85c6c..6e011dee 100644
--- a/crates/exav-render/src/formats/pdf_image/ccitt.rs
+++ b/crates/exav-render/src/formats/pdf_image/ccitt.rs
@@ -1,8 +1,8 @@
 //! CCITTFaxDecode (T.4 and T.6), through hayro-ccitt.
 
-use hayro_ccitt::{decode, DecodeSettings, Decoder, DecoderContext, EncodingMode};
+use hayro_ccitt::{DecodeSettings, Decoder, DecoderContext, EncodingMode, decode};
 
-use super::{row_bytes, Error};
+use super::{Error, row_bytes};
 
 /// The stream's `/DecodeParms`, and the image dictionary's size.
 #[derive(Clone, Copy, Debug)]
diff --git a/crates/exav-render/src/formats/pdf_image/jbig2.rs b/crates/exav-render/src/formats/pdf_image/jbig2.rs
index 5ec5e241..6f6be9b0 100644
--- a/crates/exav-render/src/formats/pdf_image/jbig2.rs
+++ b/crates/exav-render/src/formats/pdf_image/jbig2.rs
@@ -3,7 +3,7 @@
 
 use hayro_jbig2::{DecodeError, Decoder, FormatError, Image};
 
-use super::{row_bytes, Error};
+use super::{Error, row_bytes};
 
 /// The page as `height` rows of `width` bits (the image dictionary's size),
 /// 1 for white, each row padded to a byte with 1s. A page of another size is
@@ -36,7 +36,7 @@ pub fn decode_jbig2(
     let image = match Image::new_embedded(data, globals) {
         Ok(image) => image,
         Err(DecodeError::Format(FormatError::MissingPageInfo)) => {
-            return Ok(vec![0xFF; out_len as usize])
+            return Ok(vec![0xFF; out_len as usize]);
         }
         Err(_) => return Err(failed()),
     };
@@ -44,8 +44,10 @@ pub fn decode_jbig2(
     let regions =
         region_pixels(data, false).saturating_add(globals.map_or(0, |g| region_pixels(g, false)));
     // Decoding a region costs time per pixel, whatever the memory its bitmap
-    // takes, so the declared pixels are charged at a byte each as well.
-    if regions > max_alloc {
+    // takes, so the declared pixels are charged at a byte each as well. The
+    // budget may be a gigabyte (the viewer's), but the time is bounded as it
+    // is for a file: by `DECODE_MAX`.
+    if regions > max_alloc.min(crate::formats::DECODE_MAX) {
         return Err(Error::new("Image too large"));
     }
     // The page and region bitmaps, the page's rows as the decoder emits
@@ -101,10 +103,37 @@ fn clip_last_segment(data: &[u8]) -> Option<Vec<u8>> {
 /// The pixels of the bitmaps the region segments of `segments` declare
 /// (T.88 7.4.1: text, halftone, generic and refinement regions), which
 /// hayro-jbig2 decodes at their declared size, up to 65,535 by 65,535,
-/// wherever they lie on the page. `random_access`: every header comes
+/// wherever they lie on the page. A symbol dictionary that declares more
+/// new symbols than its length can hold counts as `u64::MAX`: the decoder
+/// goes on decoding symbols from what is left of the stream, and 243 bytes
+/// took it two minutes and 7 GB. `random_access`: every header comes
 /// first, up to an end of file segment, then every data part (Annex D.2);
 /// otherwise each header is followed by its data.
 pub(crate) fn region_pixels(segments: &[u8], random_access: bool) -> u64 {
+    // T.88 7.4.2.1: flags, the adaptive template pixels (none for Huffman
+    // coding), the refinement ones, then the numbers of exported and new
+    // symbols. A real symbol takes more than a byte of the stream.
+    let too_many_symbols = |data_at: usize, length: u32| {
+        let be = |at: usize, n: usize| {
+            let b = segments.get(at..at.checked_add(n)?)?;
+            Some(b.iter().fold(0u64, |v, &x| v << 8 | u64::from(x)))
+        };
+        let Some(flags) = be(data_at, 2) else {
+            return false;
+        };
+        let (huffman, aggregate) = (flags & 1 != 0, flags & 2 != 0);
+        let template = flags >> 10 & 3;
+        let refinement_template = flags >> 12 & 1;
+        let mut at = data_at + 2;
+        if !huffman {
+            at += if template == 0 { 8 } else { 2 };
+        }
+        if aggregate && refinement_template == 0 {
+            at += 4;
+        }
+        be(at + 4, 4)
+            .is_some_and(|new| new > u64::from(length).saturating_mul(8).saturating_add(64))
+    };
     let size = |data_at: usize| {
         let be32 = |at: usize| {
             Some(u64::from(u32::from_be_bytes(
@@ -135,6 +164,8 @@ pub(crate) fn region_pixels(segments: &[u8], random_access: bool) -> u64 {
         }
         if is_region(flags) {
             total = total.saturating_add(size(h).unwrap_or(0));
+        } else if flags & 0x3F == 0 && too_many_symbols(h, length) {
+            return u64::MAX;
         }
         match h.checked_add(length as usize) {
             Some(end) if length != u32::MAX => at = end,
@@ -144,6 +175,8 @@ pub(crate) fn region_pixels(segments: &[u8], random_access: bool) -> u64 {
     for (flags, length) in headers {
         if is_region(flags) {
             total = total.saturating_add(size(at).unwrap_or(0));
+        } else if flags & 0x3F == 0 && too_many_symbols(at, length) {
+            return u64::MAX;
         }
         match at.checked_add(length as usize) {
             Some(end) if length != u32::MAX => at = end,
diff --git a/crates/exav-render/src/formats/pdf_image/jpx.rs b/crates/exav-render/src/formats/pdf_image/jpx.rs
index a69fb9f9..68ede8bd 100644
--- a/crates/exav-render/src/formats/pdf_image/jpx.rs
+++ b/crates/exav-render/src/formats/pdf_image/jpx.rs
@@ -58,6 +58,9 @@ pub fn decode_jpx(
         return Err(Error::new("Unknown format"));
     };
     let siz = read_siz(codestream)?;
+    if crate::formats::jp2_tiles::has_too_many_tiles(codestream) {
+        return Err(Error::new("Too many tiles"));
+    }
     check_tile_parts(codestream)?;
 
     if params.reduce_power > 0 && !siz.reducible(params.reduce_power) {
@@ -665,6 +668,25 @@ impl<'a> Iterator for BoxIter<'a> {
 mod tests {
     use super::*;
 
+    /// Tiles of one sample over a grid of 2^32: the header alone is refused,
+    /// before the decoder starts on them.
+    #[test]
+    fn a_header_with_more_tiles_than_a_file_can_name_is_refused() {
+        let mut cs = vec![0xFF, 0x4F, 0xFF, 0x51, 0, 41, 0, 0];
+        for n in [u32::MAX, u32::MAX, 0, 0, 1, 1, 0, 0] {
+            cs.extend_from_slice(&n.to_be_bytes());
+        }
+        cs.extend_from_slice(&[0, 1, 7, 1, 1]);
+        let params = JpxParams {
+            num_components: 1,
+            indexed: false,
+            smask_in_data: false,
+            reduce_power: 0,
+        };
+        let err = decode_jpx(&cs, params, 1 << 30).unwrap_err();
+        assert_eq!(err.to_string(), "Too many tiles");
+    }
+
     /// Each entry of the component mapping box is a plane of its own, so a
     /// few kilobytes of boxes asked for planes without end.
     #[test]
diff --git a/crates/exav-render/src/formats/pdf_image/mod.rs b/crates/exav-render/src/formats/pdf_image/mod.rs
index f306e18c..216b9082 100644
--- a/crates/exav-render/src/formats/pdf_image/mod.rs
+++ b/crates/exav-render/src/formats/pdf_image/mod.rs
@@ -15,13 +15,13 @@ mod jbig2;
 mod jpx;
 
 #[cfg(feature = "ccitt")]
-pub use ccitt::{decode_ccitt, CcittParams};
+pub use ccitt::{CcittParams, decode_ccitt};
 #[cfg(feature = "jbig2")]
 pub use jbig2::decode_jbig2;
 #[cfg(all(feature = "jbig2", feature = "image"))]
 pub(crate) use jbig2::region_pixels;
 #[cfg(feature = "jp2")]
-pub use jpx::{decode_jpx, JpxImage, JpxParams};
+pub use jpx::{JpxImage, JpxParams, decode_jpx};
 
 /// Why a stream has no pixels. The message is what pdf.js reports.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/crates/exav-render/src/formats/ply.rs b/crates/exav-render/src/formats/ply.rs
new file mode 100644
index 00000000..406d1b73
--- /dev/null
+++ b/crates/exav-render/src/formats/ply.rs
@@ -0,0 +1,528 @@
+//! Stanford PLY into a [`Scene`] of one element, ASCII or binary in either
+//! byte order.
+//!
+//! Read: the `vertex` element's `x y z` (`z` is 0 when absent), `nx ny nz`
+//! and colours (`red green blue`, or `r g b`; alpha is ignored), and the
+//! `face` element's list of vertex indices (`vertex_indices` or
+//! `vertex_index`) of any count and index type, triangulated as [`Soup`]
+//! does. Every other element and
+//! property is skipped by its declared type. A byte colour is used as is; a
+//! 16-bit one is scaled down; a float one is taken as 0..1.
+//!
+//! A file without faces is a point cloud, which the scene cannot hold: it is
+//! an [`Error::Unsupported`]. A face with an index past the vertices is
+//! dropped and counted in `warnings.invalid`. Counts the data does not hold
+//! are cut to what it holds, with `warnings.damaged`.
+//!
+//! The file has no up axis: coordinates are returned as written.
+
+use std::fmt;
+
+use super::mesh::Scene;
+use super::soup::{Corner, Soup, number};
+
+/// Why a file was not read.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Error {
+    /// No PLY header.
+    NotPly,
+    /// A PLY file this reader does not draw: a point cloud, or a format
+    /// other than ascii and binary.
+    Unsupported(&'static str),
+    /// A header or a mesh that cannot be read.
+    Invalid(&'static str),
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotPly => f.write_str("not a PLY file"),
+            Error::Unsupported(what) => write!(f, "unsupported PLY file: {what}"),
+            Error::Invalid(what) => write!(f, "invalid PLY file: {what}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+/// A header longer than this is not one.
+const MAX_HEADER: usize = 64 * 1024;
+const MAX_ELEMENTS: usize = 32;
+const MAX_PROPS: usize = 64;
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Ty {
+    I8,
+    U8,
+    I16,
+    U16,
+    I32,
+    U32,
+    F32,
+    F64,
+}
+
+impl Ty {
+    fn parse(name: &str) -> Option<Ty> {
+        Some(match name {
+            "char" | "int8" => Ty::I8,
+            "uchar" | "uint8" => Ty::U8,
+            "short" | "int16" => Ty::I16,
+            "ushort" | "uint16" => Ty::U16,
+            "int" | "int32" => Ty::I32,
+            "uint" | "uint32" => Ty::U32,
+            "float" | "float32" => Ty::F32,
+            "double" | "float64" => Ty::F64,
+            _ => return None,
+        })
+    }
+
+    fn size(self) -> usize {
+        match self {
+            Ty::I8 | Ty::U8 => 1,
+            Ty::I16 | Ty::U16 => 2,
+            Ty::I32 | Ty::U32 | Ty::F32 => 4,
+            Ty::F64 => 8,
+        }
+    }
+
+    /// A colour value as a byte.
+    fn byte(self, v: f64) -> u8 {
+        let scaled = match self {
+            Ty::F32 | Ty::F64 => v * 255.0,
+            Ty::I16 | Ty::U16 => v / 257.0,
+            _ => v,
+        };
+        scaled.clamp(0.0, 255.0).round() as u8
+    }
+}
+
+struct Prop {
+    name: String,
+    ty: Ty,
+    /// The type of the count, for a list.
+    count: Option<Ty>,
+}
+
+struct Element {
+    name: String,
+    count: u64,
+    props: Vec<Prop>,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Format {
+    Ascii,
+    Little,
+    Big,
+}
+
+struct Header {
+    format: Format,
+    elements: Vec<Element>,
+    /// Where the data starts.
+    body: usize,
+}
+
+fn header(bytes: &[u8]) -> Result<Header, Error> {
+    if !bytes.starts_with(b"ply\n") && !bytes.starts_with(b"ply\r\n") {
+        return Err(Error::NotPly);
+    }
+    let window = &bytes[..bytes.len().min(MAX_HEADER)];
+    let mut format = None;
+    let mut elements: Vec<Element> = Vec::new();
+    let mut at = 0;
+    for line in window.split_inclusive(|&b| b == b'\n') {
+        at += line.len();
+        if !line.ends_with(b"\n") {
+            return Err(Error::NotPly);
+        }
+        let text = std::str::from_utf8(line).map_err(|_| Error::NotPly)?;
+        // The `{ ... }` remarks of the format's own example are not words.
+        let text = match (text.find('{'), text.rfind('}')) {
+            (Some(a), Some(b)) if a < b => format!("{} {}", &text[..a], &text[b + 1..]),
+            _ => text.to_string(),
+        };
+        let words: Vec<&str> = text.split_ascii_whitespace().collect();
+        match words.as_slice() {
+            ["ply"] | ["comment", ..] | ["obj_info", ..] | [] => {}
+            ["format", name, _version] => {
+                format = Some(match *name {
+                    "ascii" => Format::Ascii,
+                    "binary_little_endian" => Format::Little,
+                    "binary_big_endian" => Format::Big,
+                    _ => return Err(Error::Unsupported("format")),
+                });
+            }
+            ["element", name, count] => {
+                if elements.len() >= MAX_ELEMENTS {
+                    return Err(Error::Invalid("too many elements"));
+                }
+                elements.push(Element {
+                    name: (*name).to_string(),
+                    count: count.parse().map_err(|_| Error::Invalid("element count"))?,
+                    props: Vec::new(),
+                });
+            }
+            ["property", "list", count, ty, name] => {
+                let el = elements
+                    .last_mut()
+                    .ok_or(Error::Invalid("property before element"))?;
+                if el.props.len() >= MAX_PROPS {
+                    return Err(Error::Invalid("too many properties"));
+                }
+                el.props.push(Prop {
+                    name: (*name).to_string(),
+                    ty: Ty::parse(ty).ok_or(Error::Invalid("property type"))?,
+                    count: Some(Ty::parse(count).ok_or(Error::Invalid("property type"))?),
+                });
+            }
+            ["property", ty, name] => {
+                let el = elements
+                    .last_mut()
+                    .ok_or(Error::Invalid("property before element"))?;
+                if el.props.len() >= MAX_PROPS {
+                    return Err(Error::Invalid("too many properties"));
+                }
+                el.props.push(Prop {
+                    name: (*name).to_string(),
+                    ty: Ty::parse(ty).ok_or(Error::Invalid("property type"))?,
+                    count: None,
+                });
+            }
+            ["end_header"] => {
+                return Ok(Header {
+                    format: format.ok_or(Error::Invalid("no format line"))?,
+                    elements,
+                    body: at,
+                });
+            }
+            // A line of text of a writer's own: Blender 2.4 wrote one, and
+            // some converters leave no space after `comment`.
+            [first, ..] if !matches!(*first, "format" | "element" | "property" | "end_header") => {}
+            _ => return Err(Error::Invalid("header line")),
+        }
+    }
+    Err(Error::NotPly)
+}
+
+struct Cursor<'a> {
+    data: &'a [u8],
+    pos: usize,
+    format: Format,
+    /// An ASCII record is a line: values past what the header declares, up to
+    /// the end of the line, are left out.
+    by_line: bool,
+}
+
+impl Cursor<'_> {
+    /// The end of a record.
+    fn end_record(&mut self) {
+        if self.by_line && self.format == Format::Ascii {
+            let rest = &self.data[self.pos..];
+            self.pos += rest
+                .iter()
+                .position(|&b| b == b'\n')
+                .map_or(rest.len(), |n| n + 1);
+        }
+    }
+
+    fn scalar(&mut self, ty: Ty) -> Option<f64> {
+        if self.format == Format::Ascii {
+            let rest = &self.data[self.pos..];
+            let start = rest.iter().position(|b| !b.is_ascii_whitespace())?;
+            let len = rest[start..]
+                .iter()
+                .position(|b| b.is_ascii_whitespace())
+                .unwrap_or(rest.len() - start);
+            self.pos += start + len;
+            return number(&rest[start..start + len]);
+        }
+        let end = self.pos.checked_add(ty.size())?;
+        let b = self.data.get(self.pos..end)?;
+        self.pos = end;
+        let big = self.format == Format::Big;
+        macro_rules! num {
+            ($t:ty) => {{
+                let a = b.try_into().ok()?;
+                f64::from(if big {
+                    <$t>::from_be_bytes(a)
+                } else {
+                    <$t>::from_le_bytes(a)
+                })
+            }};
+        }
+        Some(match ty {
+            Ty::I8 => f64::from(b[0] as i8),
+            Ty::U8 => f64::from(b[0]),
+            Ty::I16 => num!(i16),
+            Ty::U16 => num!(u16),
+            Ty::I32 => num!(i32),
+            Ty::U32 => num!(u32),
+            Ty::F32 => num!(f32),
+            Ty::F64 => num!(f64),
+        })
+    }
+
+    /// Values of this type the data may still hold.
+    fn left(&self, ty: Ty) -> usize {
+        let rest = self.data.len() - self.pos;
+        if self.format == Format::Ascii {
+            rest
+        } else {
+            rest / ty.size()
+        }
+    }
+}
+
+/// Reads one record of `el`: its scalars into `values` (by property), and
+/// the items of the list `keep` into `list`. False when the data ends or a
+/// count is not one.
+fn record(
+    cur: &mut Cursor,
+    el: &Element,
+    values: &mut [f64],
+    keep: Option<usize>,
+    list: &mut Vec<f64>,
+) -> bool {
+    for (i, p) in el.props.iter().enumerate() {
+        let Some(count) = p.count else {
+            let Some(v) = cur.scalar(p.ty) else {
+                return false;
+            };
+            values[i] = v;
+            continue;
+        };
+        let Some(n) = cur.scalar(count) else {
+            return false;
+        };
+        if !(n >= 0.0 && n.fract() == 0.0 && n <= cur.left(p.ty) as f64) {
+            return false;
+        }
+        if keep == Some(i) {
+            list.clear();
+        }
+        for _ in 0..n as usize {
+            let Some(v) = cur.scalar(p.ty) else {
+                return false;
+            };
+            if keep == Some(i) {
+                list.push(v);
+            }
+        }
+    }
+    cur.end_record();
+    true
+}
+
+/// How many records of `el` the data can hold, and whether it holds fewer
+/// than declared.
+fn records(cur: &Cursor, el: &Element) -> (usize, bool) {
+    let each: usize = if cur.format == Format::Ascii {
+        el.props.len()
+    } else {
+        el.props
+            .iter()
+            .map(|p| p.count.map_or(p.ty.size(), Ty::size))
+            .sum()
+    };
+    let room = (cur.data.len() - cur.pos) / each.max(1);
+    let declared = usize::try_from(el.count).unwrap_or(usize::MAX);
+    (declared.min(room), declared > room)
+}
+
+/// Reads at most `max_triangles`; past them the rest is left out and
+/// `warnings.truncated` is 1.
+///
+/// An ASCII file is a stream of values, and a record can run over lines. A
+/// file that reads as damaged or with faces past the vertices may instead have
+/// lines with more values than its header declares (a writer's extra
+/// columns); it is read again a line to a record, and that is kept if it is
+/// the better reading.
+pub fn read(bytes: &[u8], max_triangles: usize) -> Result<Scene, Error> {
+    let first = read_records(bytes, max_triangles, false);
+    let dirty = match &first {
+        Ok(scene) => scene.warnings.damaged || scene.warnings.invalid > 0,
+        Err(error) => matches!(error, Error::Invalid(_)),
+    };
+    if dirty
+        && header(bytes).is_ok_and(|h| h.format == Format::Ascii)
+        && let Ok(lines) = read_records(bytes, max_triangles, true)
+    {
+        let clean = !lines.warnings.damaged && lines.warnings.invalid == 0;
+        let better = match &first {
+            Err(_) => true,
+            Ok(f) => clean || lines.triangles() > f.triangles(),
+        };
+        if better {
+            return Ok(lines);
+        }
+    }
+    first
+}
+
+fn read_records(bytes: &[u8], max_triangles: usize, by_line: bool) -> Result<Scene, Error> {
+    let head = header(bytes)?;
+    let mut cur = Cursor {
+        data: bytes,
+        pos: head.body,
+        format: head.format,
+        by_line,
+    };
+    let mut damaged = false;
+    let mut vertices: Option<Vertices> = None;
+    let mut soup = Soup::new(max_triangles);
+    let mut had_faces = false;
+    let mut unsupported = std::collections::BTreeMap::<String, u32>::new();
+
+    for el in &head.elements {
+        if el.props.is_empty() {
+            continue;
+        }
+        let (count, short) = records(&cur, el);
+        damaged |= short;
+        match el.name.as_str() {
+            "vertex" if vertices.is_none() => {
+                let v = vertex_data(&mut cur, el, count)?;
+                damaged |= v.short;
+                vertices = Some(v);
+            }
+            // An empty list of faces may come first.
+            "face" if vertices.is_none() && count == 0 => {}
+            "face" => {
+                let Some(v) = &vertices else {
+                    return Err(Error::Invalid("faces before vertices"));
+                };
+                had_faces |= count > 0;
+                damaged |= faces(&mut cur, el, count, v, &mut soup);
+                break;
+            }
+            name => {
+                if name.starts_with("tristrips") {
+                    unsupported.insert(name.to_string(), 1);
+                }
+                let mut values = vec![0.0; el.props.len()];
+                let mut scratch = Vec::new();
+                for _ in 0..count {
+                    if !record(&mut cur, el, &mut values, None, &mut scratch) {
+                        damaged = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    if vertices.is_none() {
+        return Err(Error::Invalid("no vertex element"));
+    }
+    if soup.triangles() == 0 && !soup.truncated {
+        return Err(if had_faces || soup.invalid > 0 {
+            Error::Invalid("no face can be drawn")
+        } else {
+            Error::Unsupported("a point cloud has no faces to draw")
+        });
+    }
+    let mut scene = soup.finish();
+    scene.warnings.damaged = damaged;
+    scene.warnings.unsupported = unsupported;
+    Ok(scene)
+}
+
+struct Vertices {
+    positions: Vec<[f32; 3]>,
+    normals: Option<Vec<[f32; 3]>>,
+    colors: Option<Vec<[u8; 3]>>,
+    short: bool,
+}
+
+fn vertex_data(cur: &mut Cursor, el: &Element, count: usize) -> Result<Vertices, Error> {
+    let find = |names: &[&str]| {
+        el.props
+            .iter()
+            .position(|p| p.count.is_none() && names.contains(&p.name.as_str()))
+    };
+    // A flat drawing has no z.
+    let (Some(x), Some(y), z) = (find(&["x"]), find(&["y"]), find(&["z"])) else {
+        return Err(Error::Invalid("vertices without x and y"));
+    };
+    let normal = match (find(&["nx"]), find(&["ny"]), find(&["nz"])) {
+        (Some(a), Some(b), Some(c)) => Some([a, b, c]),
+        _ => None,
+    };
+    let color = match (
+        find(&["red", "r", "diffuse_red"]),
+        find(&["green", "g", "diffuse_green"]),
+        find(&["blue", "b", "diffuse_blue"]),
+    ) {
+        (Some(a), Some(b), Some(c)) => Some([a, b, c]),
+        _ => None,
+    };
+    // The count is bounded by the data, but a vertex can be one byte of it.
+    let room = count.min(1 << 16);
+    let mut out = Vertices {
+        positions: Vec::with_capacity(room),
+        normals: normal.map(|_| Vec::with_capacity(room)),
+        colors: color.map(|_| Vec::with_capacity(room)),
+        short: false,
+    };
+    let mut values = vec![0.0; el.props.len()];
+    let mut scratch = Vec::new();
+    for _ in 0..count {
+        if !record(cur, el, &mut values, None, &mut scratch) {
+            out.short = true;
+            break;
+        }
+        // `as f32` makes infinity of what is too large: dropped later.
+        out.positions.push([
+            values[x] as f32,
+            values[y] as f32,
+            z.map_or(0.0, |z| values[z] as f32),
+        ]);
+        if let (Some([a, b, c]), Some(n)) = (normal, out.normals.as_mut()) {
+            n.push([values[a] as f32, values[b] as f32, values[c] as f32]);
+        }
+        if let (Some(k), Some(col)) = (color, out.colors.as_mut()) {
+            col.push(k.map(|i| el.props[i].ty.byte(values[i])));
+        }
+    }
+    Ok(out)
+}
+
+/// Triangulates the faces into `soup`; true when the data ended early.
+fn faces(cur: &mut Cursor, el: &Element, count: usize, v: &Vertices, soup: &mut Soup) -> bool {
+    let Some(keep) = el.props.iter().position(|p| {
+        p.count.is_some() && (p.name == "vertex_indices" || p.name == "vertex_index")
+    }) else {
+        soup.invalid = soup.invalid.saturating_add(1);
+        return false;
+    };
+    let mut values = vec![0.0; el.props.len()];
+    let mut list: Vec<f64> = Vec::new();
+    let mut corners: Vec<Corner> = Vec::new();
+    for _ in 0..count {
+        if !record(cur, el, &mut values, Some(keep), &mut list) {
+            return true;
+        }
+        corners.clear();
+        let mut valid = true;
+        for &i in &list {
+            let at = (i >= 0.0 && i.fract() == 0.0 && i < v.positions.len() as f64)
+                .then_some(i as usize);
+            let Some(at) = at else {
+                valid = false;
+                break;
+            };
+            corners.push(Corner {
+                p: v.positions[at],
+                n: v.normals.as_ref().map(|n| n[at]),
+                c: v.colors.as_ref().map(|c| c[at]),
+            });
+        }
+        if !valid {
+            soup.invalid = soup.invalid.saturating_add(1);
+        } else if !soup.polygon(&corners) {
+            return false;
+        }
+    }
+    false
+}
diff --git a/crates/exav-render/src/formats/soup.rs b/crates/exav-render/src/formats/soup.rs
new file mode 100644
index 00000000..c9e2eefd
--- /dev/null
+++ b/crates/exav-render/src/formats/soup.rs
@@ -0,0 +1,284 @@
+//! What the OBJ, PLY and glTF readers build their [`Scene`] with: polygons
+//! in, one batch of flat or file-shaded triangles out, one [`Element`] per
+//! group, object or node.
+//!
+//! The triangles are not welded: each has three vertices of its own, as in
+//! the STL reader, so that a hostile file cannot make the reader do more than
+//! linear work in the triangles it emits.
+
+// Each reader uses some of the helpers.
+#![allow(dead_code)]
+
+use super::mesh::{Batch, Element, Range, Scene, cross, dot, sub};
+
+/// Elements a scene may hold. Past them the triangles join the last one:
+/// a file of a million one-face groups would otherwise hold a million names.
+pub(crate) const MAX_ELEMENTS: usize = 10_000;
+
+/// Characters of an element's name kept.
+pub(crate) const MAX_NAME: usize = 128;
+
+/// Largest coordinate kept. A vertex beyond it, or not a number, drops the
+/// triangles it is in: one of them would send the viewer's camera to
+/// infinity.
+pub(crate) const MAX_COORD: f64 = 1e12;
+
+/// Polygons of at most this many corners are ear-clipped; larger ones are
+/// fanned from their first corner, which is linear.
+const EAR_MAX: usize = 64;
+
+/// Steps of ear-clipping a scene may spend. A polygon needs about its
+/// corners squared, so the polygons of a file cost at most this much in
+/// all; after it every polygon is fanned.
+const EAR_WORK: u64 = 20_000_000;
+
+/// The colour of a triangle without one, among coloured ones.
+const NO_COLOR: [u8; 3] = [200, 200, 200];
+
+/// One corner of a polygon, as the file gives it.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct Corner {
+    pub p: [f32; 3],
+    /// Not necessarily of unit length, or finite; those are not used.
+    pub n: Option<[f32; 3]>,
+    pub c: Option<[u8; 3]>,
+}
+
+/// Collects triangles within a budget.
+pub(crate) struct Soup {
+    batch: Batch,
+    colors: Vec<u8>,
+    elements: Vec<Element>,
+    /// The name of the element the next triangle starts, if one is due.
+    pending: Option<String>,
+    max: usize,
+    triangles: usize,
+    work: u64,
+    pub truncated: bool,
+    /// Polygons with a corner out of range, and indices out of range, as the
+    /// caller reports them.
+    pub invalid: u32,
+}
+
+impl Soup {
+    pub fn new(max_triangles: usize) -> Self {
+        // Indices are `u32`: three vertices per triangle.
+        let max = max_triangles.min(u32::MAX as usize / 3 - 1);
+        Self {
+            batch: Batch::default(),
+            colors: Vec::new(),
+            elements: Vec::new(),
+            pending: Some(String::new()),
+            max,
+            triangles: 0,
+            work: 0,
+            truncated: false,
+            invalid: 0,
+        }
+    }
+
+    /// The next triangles belong to a new element called `name`; nothing is
+    /// made of it if none follow.
+    pub fn begin(&mut self, name: &str) {
+        self.pending = Some(name.chars().take(MAX_NAME).collect());
+    }
+
+    pub fn triangles(&self) -> usize {
+        self.triangles
+    }
+
+    pub fn full(&self) -> bool {
+        self.triangles >= self.max
+    }
+
+    /// Adds the polygon as triangles. False once the budget is spent, which
+    /// the caller takes as the end of the file.
+    pub fn polygon(&mut self, corners: &[Corner]) -> bool {
+        if corners.len() < 3 {
+            return true;
+        }
+        if !corners.iter().all(|c| usable(c.p)) {
+            self.invalid = self.invalid.saturating_add(1);
+            return true;
+        }
+        if corners.len() == 3 {
+            return self.emit(&corners[0], &corners[1], &corners[2]);
+        }
+        if corners.len() <= EAR_MAX
+            && self.work < EAR_WORK
+            && let Some(order) = self.ears(corners)
+        {
+            for t in order {
+                if !self.emit(&corners[t[0]], &corners[t[1]], &corners[t[2]]) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        for k in 1..corners.len() - 1 {
+            if !self.emit(&corners[0], &corners[k], &corners[k + 1]) {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Triangles that cover a simple polygon, or `None` for a polygon that
+    /// has no area or that ear-clipping cannot finish (self-intersecting).
+    fn ears(&mut self, c: &[Corner]) -> Option<Vec<[usize; 3]>> {
+        let p: Vec<[f64; 3]> = c.iter().map(|c| c.p.map(f64::from)).collect();
+        // Newell's normal: the plane to flatten the polygon into.
+        let mut n = [0.0f64; 3];
+        for i in 0..p.len() {
+            let (a, b) = (p[i], p[(i + 1) % p.len()]);
+            n[0] += (a[1] - b[1]) * (a[2] + b[2]);
+            n[1] += (a[2] - b[2]) * (a[0] + b[0]);
+            n[2] += (a[0] - b[0]) * (a[1] + b[1]);
+        }
+        let axis = (0..3)
+            .max_by(|&i, &j| n[i].abs().total_cmp(&n[j].abs()))
+            .unwrap_or(2);
+        if !n[axis].is_finite() || n[axis] == 0.0 {
+            return None;
+        }
+        let (u, v) = ((axis + 1) % 3, (axis + 2) % 3);
+        let flip = if n[axis] < 0.0 { -1.0 } else { 1.0 };
+        let q: Vec<[f64; 2]> = p.iter().map(|p| [p[u] * flip, p[v]]).collect();
+        // Twice the signed area of a, b, c: positive when counterclockwise.
+        let area = |a: [f64; 2], b: [f64; 2], c: [f64; 2]| {
+            (b[0] - a[0]) * (c[1] - a[1]) - (b[1] - a[1]) * (c[0] - a[0])
+        };
+        let mut ring: Vec<usize> = (0..q.len()).collect();
+        let mut out = Vec::with_capacity(q.len() - 2);
+        while ring.len() > 3 {
+            let m = ring.len();
+            let mut clipped = false;
+            for i in 0..m {
+                self.work = self.work.saturating_add(m as u64);
+                if self.work >= EAR_WORK {
+                    return None;
+                }
+                let (a, b, c) = (ring[(i + m - 1) % m], ring[i], ring[(i + 1) % m]);
+                if area(q[a], q[b], q[c]) <= 0.0 {
+                    continue;
+                }
+                let inside = ring.iter().any(|&o| {
+                    if o == a || o == b || o == c || q[o] == q[a] || q[o] == q[b] || q[o] == q[c] {
+                        return false;
+                    }
+                    area(q[a], q[b], q[o]) >= 0.0
+                        && area(q[b], q[c], q[o]) >= 0.0
+                        && area(q[c], q[a], q[o]) >= 0.0
+                });
+                if !inside {
+                    out.push([a, b, c]);
+                    ring.remove(i);
+                    clipped = true;
+                    break;
+                }
+            }
+            if !clipped {
+                return None;
+            }
+        }
+        out.push([ring[0], ring[1], ring[2]]);
+        Some(out)
+    }
+
+    /// One triangle. False once the budget is spent; a triangle with no
+    /// area is dropped without a word.
+    fn emit(&mut self, a: &Corner, b: &Corner, c: &Corner) -> bool {
+        if self.triangles >= self.max {
+            self.truncated = true;
+            return false;
+        }
+        let p = [a, b, c].map(|c| c.p.map(f64::from));
+        let flat = cross(sub(p[1], p[0]), sub(p[2], p[0]));
+        let len = dot(flat, flat).sqrt();
+        if !len.is_finite() || len <= 0.0 {
+            return true;
+        }
+        let flat = flat.map(|v| v / len);
+        if self.pending.is_some() {
+            self.open();
+        }
+        let base = (self.batch.positions.len() / 3) as u32;
+        let any_color = [a, b, c].iter().any(|c| c.c.is_some());
+        if any_color && self.colors.is_empty() {
+            // The vertices before this one had none.
+            for _ in 0..self.batch.positions.len() / 3 {
+                self.colors.extend_from_slice(&NO_COLOR);
+            }
+        }
+        for corner in [a, b, c] {
+            self.batch.positions.extend_from_slice(&corner.p);
+            let n = corner.n.and_then(unit).unwrap_or(flat.map(|v| v as f32));
+            self.batch.normals.extend_from_slice(&n);
+            if any_color || !self.colors.is_empty() {
+                self.colors.extend_from_slice(&corner.c.unwrap_or(NO_COLOR));
+            }
+        }
+        self.batch
+            .indices
+            .extend_from_slice(&[base, base + 1, base + 2]);
+        self.triangles += 1;
+        if let Some(r) = self.elements.last_mut().and_then(|e| e.ranges.first_mut()) {
+            r.count += 3;
+        }
+        true
+    }
+
+    fn open(&mut self) {
+        let name = self.pending.take().unwrap_or_default();
+        if self.elements.len() >= MAX_ELEMENTS {
+            return;
+        }
+        self.elements.push(Element {
+            name,
+            ranges: vec![Range {
+                batch: 0,
+                first: self.batch.indices.len() as u32,
+                count: 0,
+            }],
+            ..Element::default()
+        });
+    }
+
+    pub fn finish(mut self) -> Scene {
+        let mut scene = Scene::default();
+        if self.triangles > 0 {
+            if !self.colors.is_empty() {
+                self.batch.colors = Some(self.colors);
+            }
+            super::mesh::grow(&mut scene.bounds, &self.batch.positions);
+            scene.batches.push(self.batch);
+            scene.elements = self.elements;
+        }
+        scene.warnings.truncated = u32::from(self.truncated);
+        scene.warnings.invalid = self.invalid;
+        scene
+    }
+}
+
+/// A coordinate that is a number of a size a camera can frame.
+pub(crate) fn usable(p: [f32; 3]) -> bool {
+    p.iter()
+        .all(|&v| v.is_finite() && f64::from(v).abs() <= MAX_COORD)
+}
+
+/// The vector at unit length, or `None` for one that is zero or not finite.
+fn unit(n: [f32; 3]) -> Option<[f32; 3]> {
+    let n = n.map(f64::from);
+    let len = dot(n, n).sqrt();
+    (len.is_finite() && len > 1e-12).then(|| n.map(|v| (v / len) as f32))
+}
+
+/// A decimal number as text, or `None`.
+pub(crate) fn number(token: &[u8]) -> Option<f64> {
+    std::str::from_utf8(token).ok()?.parse().ok()
+}
+
+/// A colour component in 0..1 as a byte, clamped.
+pub(crate) fn unit_byte(v: f64) -> u8 {
+    (v.clamp(0.0, 1.0) * 255.0).round() as u8
+}
diff --git a/crates/exav-render/src/formats/stl.rs b/crates/exav-render/src/formats/stl.rs
index 7b402bf1..2760ba2c 100644
--- a/crates/exav-render/src/formats/stl.rs
+++ b/crates/exav-render/src/formats/stl.rs
@@ -6,7 +6,8 @@
 //! vertex x y z .. endloop endfacet` records, then `endsolid`. Binary
 //! headers often start with "solid" too, so a file is read as ASCII only
 //! when its size is not that of the binary file its count declares and its
-//! start is text.
+//! start is text: `solid`, after a byte-order mark and lines of comment
+//! (`#` or `;`) if there are any.
 //!
 //! The facet normals are not used: some writers leave them zero. Each facet
 //! is shaded flat with the normal its corners give.
@@ -20,7 +21,7 @@
 
 use std::fmt;
 
-use super::mesh::{cross, dot, sub, Batch, Element, Range, Scene};
+use super::mesh::{Batch, Element, Range, Scene, cross, dot, sub};
 
 /// Why a file was not read.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -71,11 +72,19 @@ pub fn read(bytes: &[u8], max_triangles: usize) -> Result<Scene, Error> {
 }
 
 fn looks_ascii(bytes: &[u8]) -> bool {
-    let start = bytes
-        .iter()
-        .position(|b| !b.is_ascii_whitespace())
-        .unwrap_or(bytes.len());
-    let rest = &bytes[start..];
+    // A byte-order mark, and lines of comment (`#` or `;`), may come first.
+    let mut rest = bytes.strip_prefix(b"\xEF\xBB\xBF").unwrap_or(bytes);
+    loop {
+        let start = rest
+            .iter()
+            .position(|b| !b.is_ascii_whitespace())
+            .unwrap_or(rest.len());
+        rest = &rest[start..];
+        if !matches!(rest.first(), Some(b'#' | b';')) {
+            break;
+        }
+        rest = &rest[rest.iter().position(|&b| b == b'\n').unwrap_or(rest.len())..];
+    }
     rest.len() >= 5
         && rest[..5].eq_ignore_ascii_case(b"solid")
         && rest[..rest.len().min(4096)]
@@ -259,6 +268,17 @@ mod tests {
         assert_eq!(s.triangles(), 2);
     }
 
+    #[test]
+    fn ascii_after_a_byte_order_mark_or_lines_of_comment_is_ascii() {
+        let body = "solid q\nfacet normal 0 0 1\nouter loop\nvertex 0 0 0\nvertex 1 0 0\nvertex 1 1 0\nendloop\nendfacet\nendsolid q\n";
+        for head in ["\u{feff}", "# a\n;; b\n\n", "\u{feff}#x\n"] {
+            let s = read(format!("{head}{body}").as_bytes(), 100).unwrap();
+            assert_eq!(s.triangles(), 1, "{head:?}");
+        }
+        // Comments and nothing else are not a solid.
+        assert_eq!(read(b"# a\n# b\n# c\n", 10).unwrap_err(), Error::NotStl);
+    }
+
     #[test]
     fn the_budget_stops_reading() {
         let s = read(&binary(b"x", &[(T, 0); 5], None), 3).unwrap();
diff --git a/crates/exav-render/src/formats/text.rs b/crates/exav-render/src/formats/text.rs
new file mode 100644
index 00000000..99be5da6
--- /dev/null
+++ b/crates/exav-render/src/formats/text.rs
@@ -0,0 +1,219 @@
+//! The text a reader sees in a document, for a scanner or a search: one entry
+//! for every kind of document that has some.
+//!
+//! - Markdown (`.md`, `.markdown`): [`markdown::visible_text`].
+//! - HTML, the XML parts of Office and OpenDocument files, PDF:
+//!   `exav_unpack::text`, over html5gum's tokenizer, quick-xml and hayro.
+//! - AutoCAD drawings (DXF and DWG): what the drawing model holds as text:
+//!   TEXT and MTEXT, attributes with their tags and prompts, dimension
+//!   overrides, multileaders' text, block and layer names.
+//! - Office documents the XML parts do not reach (feature `text-office`):
+//!   DOC, XLS, PPT, RTF, Word 2003 XML, SpreadsheetML 2003, SYLK, the flat
+//!   OpenDocument files, Numbers, Pages and Keynote, from what the
+//!   converters of `exav_render::sheets`, `slides` and `docs` read, without
+//!   writing an Open XML package. The text has sections (a sheet, a slide).
+//!   One of those formats whose text could not be read (encrypted, past a
+//!   limit, damaged) says so in [`Visible::unreadable`]: it is never an
+//!   empty text.
+//!
+//! A document is known by its bytes where they say what it is (PDF, HTML,
+//! drawings, the office formats) and by its name where they do not (Markdown,
+//! the parts of a package, a compound file). The text is one block to a line
+//! and cut at `cap`, which [`Visible::truncated`] says.
+
+use super::cad::{self, Drawing, Entity, EntityKind};
+use super::dwg::mtext_lines;
+use super::markdown;
+pub use super::markdown::Visible;
+
+/// A Markdown file is known by its name, and by being text.
+fn is_markdown(name: &str, head: &[u8]) -> bool {
+    let lower = name.to_ascii_lowercase();
+    (lower.ends_with(".md") || lower.ends_with(".markdown")) && exav_unpack::text::looks_text(head)
+}
+
+/// Whether a file or member called `name`, starting with `head` (a kilobyte is
+/// enough), is a kind of document [`visible_text`] reads. Cheap: nothing is
+/// parsed.
+pub fn wants(name: &str, head: &[u8]) -> bool {
+    is_markdown(name, head)
+        || exav_unpack::text::kind(name, head).is_some()
+        || cad::looks_like_dwg(head)
+        || cad::looks_like_dxf(head)
+        || office_wants(name, head)
+}
+
+#[cfg(feature = "text-office")]
+fn office_wants(name: &str, head: &[u8]) -> bool {
+    super::office::visible::wants(name, head)
+}
+
+#[cfg(not(feature = "text-office"))]
+fn office_wants(_: &str, _: &[u8]) -> bool {
+    false
+}
+
+/// The text of `data`, a file or archive member called `name`, when it is a
+/// kind of document that has some. `limits` bound what a PDF's streams
+/// decompress to.
+pub fn visible_text(
+    name: &str,
+    data: &[u8],
+    cap: usize,
+    limits: &exav_unpack::Limits,
+) -> Option<Visible> {
+    let head = &data[..data.len().min(1024)];
+    if is_markdown(name, head) {
+        return Some(markdown::visible_text(&String::from_utf8_lossy(data), cap));
+    }
+    if let Some(kind) = exav_unpack::text::kind(name, head) {
+        let e = exav_unpack::text::extract(kind, data, cap, limits);
+        return Some(Visible {
+            text: e.text,
+            truncated: e.truncated,
+            links: e.links,
+            sections: Vec::new(),
+            unreadable: None,
+        });
+    }
+    if let Some(v) = drawing(data, head, cap, limits) {
+        return Some(v);
+    }
+    #[cfg(feature = "text-office")]
+    return office(name, data, cap, limits);
+    #[cfg(not(feature = "text-office"))]
+    None
+}
+
+/// An office document the XML parts above do not reach: the legacy and flat
+/// formats and iWork's, read by exav-render's `sheets`, `slides` and `docs`.
+#[cfg(feature = "text-office")]
+fn office(name: &str, data: &[u8], cap: usize, limits: &exav_unpack::Limits) -> Option<Visible> {
+    use super::office::visible::{Read, read};
+    Some(match read(name, data, cap, limits)? {
+        Read::Text(t) => Visible {
+            text: t.text,
+            truncated: t.truncated,
+            links: t.links,
+            sections: t.sections.into_iter().map(|s| (s.label, s.range)).collect(),
+            unreadable: None,
+        },
+        Read::Unreadable(why) => Visible {
+            text: String::new(),
+            truncated: false,
+            links: Vec::new(),
+            sections: Vec::new(),
+            unreadable: Some(why),
+        },
+    })
+}
+
+/// A drawing's text; the drawing may take what the caller's `limits` allow
+/// of memory, and the text is `truncated` when it did not fit.
+fn drawing(data: &[u8], head: &[u8], cap: usize, limits: &exav_unpack::Limits) -> Option<Visible> {
+    let within = cad::limits_within(limits.max_buffer_bytes);
+    let read = if cad::looks_like_dwg(head) {
+        cad::read_dwg_with(data, &within)
+    } else if cad::looks_like_dxf(head) {
+        cad::read_dxf_with(data, &within)
+    } else {
+        return None;
+    };
+    let drawing = match read {
+        Ok(d) => d,
+        Err(cad::Error::LimitExceeded(why)) => {
+            return Some(Visible {
+                text: String::new(),
+                truncated: false,
+                links: Vec::new(),
+                sections: Vec::new(),
+                unreadable: Some(format!("too-large: {why}")),
+            });
+        }
+        Err(_) => return None,
+    };
+    let cut = drawing
+        .warnings
+        .iter()
+        .any(|w| w.kind == cad::WarningKind::LimitReached);
+    let mut lines = Lines {
+        text: String::new(),
+        cap,
+        truncated: false,
+    };
+    drawing_lines(&drawing, &mut lines);
+    Some(Visible {
+        text: lines.text,
+        truncated: lines.truncated || cut,
+        links: Vec::new(),
+        sections: Vec::new(),
+        unreadable: None,
+    })
+}
+
+struct Lines {
+    text: String,
+    cap: usize,
+    truncated: bool,
+}
+
+impl Lines {
+    /// One line: its white space collapsed, empty ones left out.
+    fn line(&mut self, s: &str) {
+        let line = s.split_whitespace().collect::<Vec<_>>().join(" ");
+        if line.is_empty() || self.truncated {
+            return;
+        }
+        if self.text.len() + line.len() + 1 > self.cap {
+            self.truncated = true;
+            return;
+        }
+        self.text.push_str(&line);
+        self.text.push('\n');
+    }
+
+    fn mtext(&mut self, raw: &str) {
+        for l in mtext_lines(raw) {
+            self.line(&l);
+        }
+    }
+}
+
+fn drawing_lines(d: &Drawing, out: &mut Lines) {
+    for layer in &d.layers {
+        out.line(&layer.name);
+    }
+    for block in &d.blocks {
+        if !block.name.starts_with('*') {
+            out.line(&block.name);
+        }
+        out.line(&block.description);
+        for e in &block.entities {
+            entity_lines(e, out);
+        }
+    }
+}
+
+fn entity_lines(e: &Entity, out: &mut Lines) {
+    match &e.kind {
+        EntityKind::Text(t) => out.line(&t.value),
+        EntityKind::MText(m) => out.mtext(&m.text),
+        EntityKind::Attribute(a) | EntityKind::AttributeDefinition(a) => {
+            out.line(&a.tag);
+            out.line(&a.prompt);
+            match &a.mtext {
+                Some(m) => out.mtext(&m.text),
+                None => out.line(&a.text.value),
+            }
+        }
+        EntityKind::Dimension(d) if d.text != "<>" => out.mtext(&d.text),
+        EntityKind::MultiLeader(m) => out.mtext(&m.context.text),
+        EntityKind::Insert(i) => {
+            out.line(&i.block_name);
+            for a in &i.attributes {
+                entity_lines(a, out);
+            }
+        }
+        _ => {}
+    }
+}
diff --git a/crates/exav-render/src/image_codecs/README.md b/crates/exav-render/src/image_codecs/README.md
index 0c3708e7..c3f934f8 100644
--- a/crates/exav-render/src/image_codecs/README.md
+++ b/crates/exav-render/src/image_codecs/README.md
@@ -7,6 +7,18 @@ for JPEG-compressed TIFF, `image` and `tiff` decode with zune-jpeg 0.5.8 and
 code (IDCT, upsampling and colour conversion for AVX2 and NEON), all of its
 `unsafe`, chosen at run time. Nothing downstream can turn those features off.
 
+The JPEG path here runs zune-jpeg **0.5.15**, not 0.5.8: ClamAV is not a
+reference to track version by version, and 0.5.8 panics on damaged files
+(sampling factors that do not nest, in its upsampler) that 0.5.15 decodes. On
+532 JPEGs (every chroma subsampling, quality 10 to 100, progressive, restart
+markers, odd sizes, grey, and the fixtures and wild files) the two give the same
+hash for all but the files below. Where they differ, 0.5.8 gives
+`8000000000000000`, the hash of a flat image: a baseline JPEG with a scan for
+each component instead of one for all (libjxl's `*_non_interleaved` and
+`*_partially_interleaved` samples; `tests/fixtures/images/make.py` writes
+one), which 0.5.15 decodes, so the hash is its pixels' and no longer what
+`sigtool --fuzzy-img` gives. The 0.4.21 of JPEG-compressed TIFF is unchanged.
+
 So `image` is built without its `jpeg` and `tiff` features, and this module
 holds what it would have run, over zune-jpeg built with `std` only, where it
 applies `forbid(unsafe_code)`:
@@ -33,14 +45,59 @@ or orientation accessors, which `ImageReader::decode` does not call), turn
 
 - `lib.rs` is `mod.rs`, and `crate::` is `crate::image_codecs::tiff::`.
 - The features are fixed at what `image` enables: `deflate`, `fax`, `jpeg` and
-  `lzw` are `true`, `zstd` is `false`.
+  `lzw` are `true`, `zstd` is `false`: Zstandard strips are read through
+  ruzstd only inside `decoder::with_viewer_codecs`, which `tiff_view.rs`
+  (`decode_any`) sets, so that `decode`, and what is hashed, refuses them as
+  ClamAV's decoder does.
 - zune-jpeg 0.4 is the dependency `zune-jpeg-04`, so `zune_jpeg::` is
   `zune_jpeg_04::`.
 - `bytecast.rs` casts through `bytemuck` instead of two `unsafe` slice casts,
-  which this crate forbids, and `f16` through `half`'s view of its bits.
+  which this crate forbids.
+- `half::f16` is `u16`, its bits (`decoder/mod.rs`), which drops `half` and
+  the `zerocopy` it pulls. `tiff_image.rs` only accepts 32-bit floats, so no
+  f16 sample is ever converted.
 - `decoder/image.rs`: `samples.into()` is `usize::from(samples)`, which type
   inference cannot find ambiguous whatever else the dependency graph holds.
 
+- `decoder/image.rs`: a one-sample `RGBPalette` is `ColorType::Palette`, not an
+  error, as in later versions of `tiff`. `tiff_image.rs` refuses a palette
+  either way, so what `image` decodes, and what is hashed, is unchanged.
+  `formats/image/tiff_view.rs` reads such files, and signed, wide and
+  floating-point grey ones, for `decode_any` (the viewer) only.
+- `decoder/image.rs`, each for `with_viewer_codecs` only so that what is
+  hashed is unchanged: a palette with an alpha sample, CMYK with 6 to 8
+  samples and 8-bit CIELab are `Multiband`; a file with TileWidth,
+  TileLength and no TileOffsets is read as tiles named by StripOffsets and
+  StripByteCounts (libtiff keeps both in one field); strips with no
+  StripByteCounts run to the end of the file; YCbCr that is not JPEG and has
+  its chroma sampled less than its luma (`Image::ycbcr_subsampling`, read from
+  tag 530) is expanded to one Y, Cb, Cr to a pixel (`stream::YcbcrUnits`);
+  Deflate strips are not checked
+  against their Adler-32; a link back to a directory
+  already read ends the chain; a three-sample JPEG
+  chunk is decoded to RGB when zune-jpeg 0.4 takes it for CMYK; LZMA strips
+  (34925: an xz stream of one LZMA2 block, behind a delta filter when
+  predicted; `stream::xz_lzma2`, through `lzma-rust2`) and ThunderScan
+  (32809, `stream::thunder_scan`) are read; old-style JPEG (compression 6) is
+  read by making a JPEG of each strip or tile from the tags 512 to 521 or the
+  stream `JPEGInterchangeFormat` points to (`decoder/ojpeg.rs`); a missing
+  PhotometricInterpretation is BlackIsZero (RGB for three samples) and
+  BitsPerSample entries past SamplesPerPixel are ignored, as libtiff does;
+  grey of 9 to 15 bits is left packed in the buffer, with no byte order and no
+  inversion, for `tiff_view.rs` to unpack.
+- `decoder/stream.rs`: the LZW reader does not assert when `weezl` 0.1.12 says
+  `NoProgress`. It returns the output of that call when there is some (the
+  last bytes of a tile whose end code is still to be read: the padding of a
+  tile that overhangs the image reads past them) and asks again when only
+  input was taken; upstream panics in both cases, and in a build that aborts
+  on panic, such as WebAssembly, that ends the decoder. Inside
+  `with_viewer_codecs` it also decodes a block of 64 KiB at a time and hands
+  that out: asked for a row's data and then its padding, a few bytes each,
+  `weezl` (0.1.10 as well as 0.1.12) can end a valid stream short, and the
+  hash must keep ClamAV's reading of such a tile, which is none. In the same
+  reader, a stream that starts 0x00 and an odd byte is old-style LZW (least
+  significant bit first, a code late) and is read as such.
+
 `tiff/` skips rustfmt and the lints.
 
 Checked: over 9,751 JPEGs and 372 TIFFs in 31 encodings (none, LZW, Deflate
diff --git a/crates/exav-render/src/image_codecs/jpeg.rs b/crates/exav-render/src/image_codecs/jpeg.rs
index f7e2500d..e24818a4 100644
--- a/crates/exav-render/src/image_codecs/jpeg.rs
+++ b/crates/exav-render/src/image_codecs/jpeg.rs
@@ -1,5 +1,5 @@
 //! `image` 0.25.9's JPEG decoder (`src/codecs/jpeg/decoder.rs`), over
-//! zune-jpeg 0.5.8 built without its SIMD code: see `README.md`. Only what
+//! zune-jpeg 0.5.15 built without its SIMD code: see `README.md`. Only what
 //! decoding uses is kept, and the input is borrowed where upstream copies it.
 
 use image::error::{
diff --git a/crates/exav-render/src/image_codecs/mod.rs b/crates/exav-render/src/image_codecs/mod.rs
index e4c7c2d1..02cced9d 100644
--- a/crates/exav-render/src/image_codecs/mod.rs
+++ b/crates/exav-render/src/image_codecs/mod.rs
@@ -4,7 +4,7 @@
 pub(crate) mod jpeg;
 #[allow(dead_code, unused_imports, clippy::all)]
 #[rustfmt::skip]
-mod tiff;
+pub(crate) mod tiff;
 // As upstream wrote it.
 #[allow(clippy::chunks_exact_to_as_chunks, clippy::manual_is_multiple_of)]
 pub(crate) mod tiff_image;
diff --git a/crates/exav-render/src/image_codecs/tiff/bytecast.rs b/crates/exav-render/src/image_codecs/tiff/bytecast.rs
index 4df91072..3862ab9a 100644
--- a/crates/exav-render/src/image_codecs/tiff/bytecast.rs
+++ b/crates/exav-render/src/image_codecs/tiff/bytecast.rs
@@ -2,12 +2,10 @@
 //!
 //! exav: through `bytemuck` instead of upstream's `unsafe` slice casts, which
 //! exav-core forbids. The same casts, of fixed-size numbers to their bytes;
-//! `f16` goes through its bits, as `half` gives them.
+//! `f16` samples are held as their `u16` bits.
 // Until we implement predictors for f16, we don't need f16_as_ne_bytes. (Due to the macro we do
 // not apply this directly to the functions). And rust-version is not new enough for `expect`.
 #![allow(dead_code)]
-use half::f16;
-use half::slice::HalfFloatSliceExt;
 
 macro_rules! integral_slice_as_bytes{($int:ty, $const:ident $(,$mut:ident)*) => {
     pub(crate) fn $const(slice: &[$int]) -> &[u8] {
@@ -26,10 +24,5 @@ integral_slice_as_bytes!(i32, i32_as_ne_bytes, i32_as_ne_mut_bytes);
 integral_slice_as_bytes!(u64, u64_as_ne_bytes, u64_as_ne_mut_bytes);
 integral_slice_as_bytes!(i64, i64_as_ne_bytes, i64_as_ne_mut_bytes);
 integral_slice_as_bytes!(f32, f32_as_ne_bytes, f32_as_ne_mut_bytes);
-pub(crate) fn f16_as_ne_bytes(slice: &[f16]) -> &[u8] {
-    bytemuck::cast_slice(slice.reinterpret_cast())
-}
-pub(crate) fn f16_as_ne_mut_bytes(slice: &mut [f16]) -> &mut [u8] {
-    bytemuck::cast_slice_mut(slice.reinterpret_cast_mut())
-}
+integral_slice_as_bytes!(u16, f16_as_ne_bytes, f16_as_ne_mut_bytes);
 integral_slice_as_bytes!(f64, f64_as_ne_bytes, f64_as_ne_mut_bytes);
diff --git a/crates/exav-render/src/image_codecs/tiff/decoder/image.rs b/crates/exav-render/src/image_codecs/tiff/decoder/image.rs
index eb978dfb..c37d26d8 100644
--- a/crates/exav-render/src/image_codecs/tiff/decoder/image.rs
+++ b/crates/exav-render/src/image_codecs/tiff/decoder/image.rs
@@ -80,6 +80,13 @@ pub(crate) struct Image {
     pub tile_attributes: Option<TileAttributes>,
     pub chunk_offsets: Vec<u64>,
     pub chunk_bytes: Vec<u64>,
+    /// exav: YCbCrSubSampling (horizontal, vertical) of a YCbCr image.
+    pub ycbcr_subsampling: (u16, u16),
+    /// exav: where the header of the JPEG stream of an old-style JPEG file
+    /// ends in the file, 0 for none (see `ojpeg`).
+    pub ojpeg_header_end: u64,
+    /// And where that stream ends.
+    pub ojpeg_stream_end: u64,
 }
 
 impl Image {
@@ -97,12 +104,10 @@ impl Image {
             )));
         }
 
-        let photometric_interpretation = tag_reader
+        let photometric_tag = tag_reader
             .find_tag(Tag::PhotometricInterpretation)?
             .map(Value::into_u16)
-            .transpose()?
-            .and_then(PhotometricInterpretation::from_u16)
-            .ok_or(TiffUnsupportedError::UnknownInterpretation)?;
+            .transpose()?;
 
         // Try to parse both the compression method and the number, format, and bits of the included samples.
         // If they are not explicitly specified, those tags are reset to their default values and not carried from previous images.
@@ -133,11 +138,43 @@ impl Image {
             .find_tag(Tag::SamplesPerPixel)?
             .map(Value::into_u16)
             .transpose()?
-            .unwrap_or(1);
+            // exav: libtiff finds three in an old-style JPEG file that does not
+            // say (for the viewer's reader only).
+            .unwrap_or(if super::viewer_codecs() && compression_method == CompressionMethod::JPEG {
+                3
+            } else {
+                1
+            });
         if samples == 0 {
             return Err(TiffFormatError::SamplesPerPixelIsZero.into());
         }
 
+        let photometric_interpretation = match photometric_tag {
+            Some(p) => PhotometricInterpretation::from_u16(p)
+                .ok_or(TiffUnsupportedError::UnknownInterpretation)?,
+            // exav: a file with no photometric interpretation (a raster some
+            // GIS program wrote) is grey, or RGB with three samples, for the
+            // viewer's reader only (see `with_viewer_codecs`).
+            None if super::viewer_codecs() => {
+                if samples == 3 {
+                    PhotometricInterpretation::RGB
+                } else {
+                    PhotometricInterpretation::BlackIsZero
+                }
+            }
+            None => return Err(TiffUnsupportedError::UnknownInterpretation.into()),
+        };
+        // exav: libtiff reads old-style JPEG of three samples as YCbCr whatever
+        // the photometric interpretation says; so does the viewer's reader.
+        let photometric_interpretation = if super::viewer_codecs()
+            && compression_method == CompressionMethod::JPEG
+            && photometric_interpretation == PhotometricInterpretation::RGB
+        {
+            PhotometricInterpretation::YCbCr
+        } else {
+            photometric_interpretation
+        };
+
         let sample_format = match tag_reader.find_tag_uint_vec(Tag::SampleFormat)? {
             Some(vals) => {
                 let sample_format: Vec<_> = vals
@@ -146,7 +183,7 @@ impl Image {
                     .collect();
 
                 // TODO: for now, only homogenous formats across samples are supported.
-                if !sample_format.windows(2).all(|s| s[0] == s[1]) {
+                if !sample_format.array_windows().all(|[a, b]| a == b) {
                     return Err(TiffUnsupportedError::UnsupportedSampleFormat(sample_format).into());
                 }
 
@@ -159,9 +196,14 @@ impl Image {
             None => SampleFormat::Uint,
         };
 
-        let bits_per_sample: Vec<u8> = tag_reader
+        let mut bits_per_sample: Vec<u8> = tag_reader
             .find_tag_uint_vec(Tag::BitsPerSample)?
             .unwrap_or_else(|| vec![1]);
+        // exav: libtiff ignores the entries past the samples a pixel has; so
+        // does the viewer's reader (see `with_viewer_codecs`).
+        if super::viewer_codecs() && bits_per_sample.len() > usize::from(samples) {
+            bits_per_sample.truncate(usize::from(samples));
+        }
 
         // Technically bits_per_sample.len() should be *equal* to samples, but libtiff also allows
         // it to be a single value that applies to all samples.
@@ -210,23 +252,46 @@ impl Image {
         let chunk_bytes;
         let strip_decoder;
         let tile_attributes;
+        // exav: libtiff keeps the offsets of tiles and of strips in one field, so
+        // a tiled file may name them with the strip tags. For the viewer's
+        // reader only (see `with_viewer_codecs`).
+        let tiles_by_strip_tags = super::viewer_codecs()
+            && !ifd.contains(Tag::TileOffsets)
+            && ifd.contains(Tag::TileWidth)
+            && ifd.contains(Tag::TileLength);
         match (
             ifd.contains(Tag::StripByteCounts),
             ifd.contains(Tag::StripOffsets),
             ifd.contains(Tag::TileByteCounts),
             ifd.contains(Tag::TileOffsets),
         ) {
-            (true, true, false, false) => {
+            // exav: for the viewer's reader, strips with no byte counts
+            // (libtiff reads them) run to the end of the file.
+            (counts, true, false, false)
+                if !tiles_by_strip_tags && (counts || super::viewer_codecs()) =>
+            {
                 chunk_type = ChunkType::Strip;
 
                 chunk_offsets = tag_reader
                     .find_tag(Tag::StripOffsets)?
                     .unwrap()
                     .into_u64_vec()?;
-                chunk_bytes = tag_reader
-                    .find_tag(Tag::StripByteCounts)?
-                    .unwrap()
-                    .into_u64_vec()?;
+                chunk_bytes = if counts {
+                    tag_reader
+                        .find_tag(Tag::StripByteCounts)?
+                        .unwrap()
+                        .into_u64_vec()?
+                } else {
+                    let end = tag_reader
+                        .decoder
+                        .reader
+                        .inner()
+                        .seek(io::SeekFrom::End(0))?;
+                    chunk_offsets
+                        .iter()
+                        .map(|&o| end.saturating_sub(o))
+                        .collect()
+                };
                 let rows_per_strip = tag_reader
                     .find_tag(Tag::RowsPerStrip)?
                     .map(Value::into_u32)
@@ -246,8 +311,13 @@ impl Image {
                     ));
                 }
             }
-            (false, false, true, true) => {
+            (false, false, true, true) | (true, true, false, false) => {
                 chunk_type = ChunkType::Tile;
+                let (offsets_tag, bytes_tag) = if tiles_by_strip_tags {
+                    (Tag::StripOffsets, Tag::StripByteCounts)
+                } else {
+                    (Tag::TileOffsets, Tag::TileByteCounts)
+                };
 
                 let tile_width =
                     usize::try_from(tag_reader.require_tag(Tag::TileWidth)?.into_u32()?)?;
@@ -268,11 +338,11 @@ impl Image {
                     tile_length,
                 });
                 chunk_offsets = tag_reader
-                    .find_tag(Tag::TileOffsets)?
+                    .find_tag(offsets_tag)?
                     .unwrap()
                     .into_u64_vec()?;
                 chunk_bytes = tag_reader
-                    .find_tag(Tag::TileByteCounts)?
+                    .find_tag(bytes_tag)?
                     .unwrap()
                     .into_u64_vec()?;
 
@@ -296,6 +366,68 @@ impl Image {
             }
         };
 
+        // exav: the sampling of the chroma, 2 by 2 when the file does not say.
+        let ycbcr_subsampling = if photometric_interpretation == PhotometricInterpretation::YCbCr {
+            match tag_reader
+                .find_tag(Tag::from_u16_exhaustive(530))
+                .ok()
+                .flatten()
+                .and_then(|v| v.into_u16_vec().ok())
+            {
+                Some(v) if v.len() == 2 => (v[0], v[1]),
+                _ => (2, 2),
+            }
+        } else {
+            (1, 1)
+        };
+
+        // exav: the header of an old-style JPEG, made from its tags, in place of
+        // the tables a modern one has (see `ojpeg`).
+        let (mut ojpeg_header_end, mut ojpeg_stream_end) = (0, 0);
+        let jpeg_tables = if super::viewer_codecs() && compression_method == CompressionMethod::JPEG
+        {
+            let mut tag = |n: u16| tag_reader.find_tag(Tag::from_u16_exhaustive(n)).ok().flatten();
+            let tags = super::ojpeg::Tags {
+                interchange: tag(513)
+                    .and_then(|v| v.into_u64().ok())
+                    .zip(tag(514).and_then(|v| v.into_u64().ok())),
+                q: tag(519).and_then(|v| v.into_u64_vec().ok()).unwrap_or_default(),
+                dc: tag(520).and_then(|v| v.into_u64_vec().ok()).unwrap_or_default(),
+                ac: tag(521).and_then(|v| v.into_u64_vec().ok()).unwrap_or_default(),
+                restart: tag(515).and_then(|v| v.into_u16().ok()).unwrap_or(0),
+                subsampling: ycbcr_subsampling,
+            };
+            // The frame is a strip or a tile, whole, whatever the image's own size.
+            let (frame_width, frame_rows) = match &tile_attributes {
+                Some(t) => (t.tile_width as u32, t.tile_length as u32),
+                None => (
+                    width,
+                    match tag_reader.find_tag(Tag::RowsPerStrip)?.map(Value::into_u32) {
+                        Some(Ok(rows)) if rows > 0 => rows.min(height),
+                        _ => height,
+                    },
+                ),
+            };
+            // No tables to make a header of: each strip is a JPEG of its own.
+            Some(Arc::new(
+                super::ojpeg::header(
+                    tag_reader.decoder.reader.inner(),
+                    &tags,
+                    frame_width,
+                    frame_rows,
+                    samples,
+                )
+                .map(|(header, header_end, stream_end)| {
+                    ojpeg_header_end = header_end;
+                    ojpeg_stream_end = stream_end;
+                    header
+                })
+                .unwrap_or_default(),
+            ))
+        } else {
+            jpeg_tables
+        };
+
         Ok(Image {
             ifd: Some(ifd),
             width,
@@ -313,6 +445,9 @@ impl Image {
             tile_attributes,
             chunk_offsets,
             chunk_bytes,
+            ycbcr_subsampling,
+            ojpeg_header_end,
+            ojpeg_stream_end,
         })
     }
 
@@ -336,6 +471,12 @@ impl Image {
             PhotometricInterpretation::CMYK => match self.samples {
                 4 => Ok(ColorType::CMYK(self.bits_per_sample)),
                 5 => Ok(ColorType::CMYKA(self.bits_per_sample)),
+                // exav: Photoshop's spot or alpha channels after the four inks,
+                // for the viewer's reader only (see `with_viewer_codecs`).
+                6..=8 if super::viewer_codecs() => Ok(ColorType::Multiband {
+                    bit_depth: self.bits_per_sample,
+                    num_samples: self.samples,
+                }),
                 _ => Err(TiffError::UnsupportedError(
                     TiffUnsupportedError::InterpretationWithBits(
                         self.photometric_interpretation,
@@ -364,6 +505,30 @@ impl Image {
                     }),
                 }
             }
+            // exav: a palette is a colour type, as in later versions of `tiff`.
+            // `tiff_image` refuses it all the same, so what `image` decodes is as before.
+            PhotometricInterpretation::RGBPalette if self.samples == 1 => {
+                Ok(ColorType::Palette(self.bits_per_sample))
+            }
+            // exav: indices and an alpha, for the viewer's reader only (see
+            // `with_viewer_codecs`); what is hashed is refused, as ClamAV's is.
+            PhotometricInterpretation::RGBPalette
+                if self.samples == 2 && super::viewer_codecs() =>
+            {
+                Ok(ColorType::Multiband {
+                    bit_depth: self.bits_per_sample,
+                    num_samples: 2,
+                })
+            }
+            // exav: three bytes of L*a*b*, for the viewer's reader only.
+            PhotometricInterpretation::CIELab
+                if self.samples == 3 && self.bits_per_sample == 8 && super::viewer_codecs() =>
+            {
+                Ok(ColorType::Multiband {
+                    bit_depth: 8,
+                    num_samples: 3,
+                })
+            }
             // TODO: this is bad we should not fail at this point
             PhotometricInterpretation::RGBPalette
             | PhotometricInterpretation::TransparencyMask
@@ -392,6 +557,38 @@ impl Image {
             .and_then(NonZeroUsize::new)
     }
 
+    /// JPEG data decoded to the samples it holds, in the colour space it holds
+    /// them.
+    fn decode_jpeg(jpeg_data: Vec<u8>, samples: usize) -> TiffResult<Box<dyn Read>> {
+        use zune_jpeg_04::zune_core;
+
+        let mut decoder = zune_jpeg_04::JpegDecoder::new(jpeg_data);
+        let mut options: zune_core::options::DecoderOptions = Default::default();
+
+        // Disable color conversion by setting the output colorspace to the input
+        // colorspace.
+        decoder.decode_headers()?;
+        if let Some(colorspace) = decoder.get_input_colorspace() {
+            // exav, for the viewer's reader only (see `with_viewer_codecs`):
+            // zune-jpeg 0.4 takes three components with an Adobe marker
+            // for CMYK and then fails to read them, so the file's own
+            // count wins.
+            let colorspace =
+                if super::viewer_codecs() && samples == 3 && colorspace.num_components() == 4 {
+                    zune_core::colorspace::ColorSpace::RGB
+                } else {
+                    colorspace
+                };
+            options = options.jpeg_set_out_colorspace(colorspace);
+        }
+
+        decoder.set_options(options);
+
+        let data = decoder.decode()?;
+
+        Ok(Box::new(Cursor::new(data)))
+    }
+
     fn create_reader<'r, R: 'r + Read>(
         reader: R,
         compression_method: CompressionMethod,
@@ -399,6 +596,10 @@ impl Image {
         // FIXME: these should be `expect` attributes or we choose another way of passing them.
         #[cfg_attr(not(true), allow(unused_variables))] jpeg_tables: Option<&[u8]>,
         #[cfg_attr(not(true), allow(unused_variables))] dimensions: (u32, u32),
+        // exav: the samples to a pixel of the chunk.
+        samples: usize,
+        // exav: the bytes of an old-style JPEG strip that are its stream's header.
+        ojpeg_skip: u64,
     ) -> TiffResult<Box<dyn Read + 'r>> {
         Ok(match compression_method {
             CompressionMethod::None => Box::new(reader),
@@ -407,12 +608,36 @@ impl Image {
                 reader,
                 usize::try_from(compressed_length)?,
             )),
-            #[cfg(false)]
-            CompressionMethod::ZSTD => Box::new(zstd::Decoder::new(reader)?),
+            // exav: through ruzstd, and only for the viewer's reader.
+            CompressionMethod::ZSTD if super::viewer_codecs() => Box::new(
+                ruzstd::decoding::StreamingDecoder::new(reader.take(compressed_length))
+                    .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e.to_string()))?,
+            ),
+            // exav: the viewer's reader only.
+            CompressionMethod::LZMA if super::viewer_codecs() => {
+                let window = u64::from(dimensions.0) * u64::from(dimensions.1) * samples as u64 * 2;
+                super::stream::xz_lzma2(
+                    reader.take(compressed_length),
+                    window.clamp(4096, 64 << 20) as u32,
+                )?
+            }
+            CompressionMethod::ThunderScan if super::viewer_codecs() => {
+                let mut data = Vec::new();
+                reader.take(compressed_length).read_to_end(&mut data)?;
+                Box::new(Cursor::new(super::stream::thunder_scan(
+                    &data,
+                    dimensions.0 as usize,
+                    dimensions.1 as usize,
+                )))
+            }
             CompressionMethod::PackBits => Box::new(PackBitsReader::new(reader, compressed_length)),
             #[cfg(true)]
             CompressionMethod::Deflate | CompressionMethod::OldDeflate => {
-                Box::new(super::stream::DeflateReader::new(reader))
+                if super::viewer_codecs() {
+                    super::stream::lenient_zlib(reader)?
+                } else {
+                    Box::new(super::stream::DeflateReader::new(reader))
+                }
             }
             #[cfg(true)]
             CompressionMethod::ModernJPEG => {
@@ -450,21 +675,20 @@ impl Image {
                 let mut jpeg_data = Vec::new();
                 jpeg_reader.read_to_end(&mut jpeg_data)?;
 
-                let mut decoder = zune_jpeg_04::JpegDecoder::new(jpeg_data);
-                let mut options: zune_core::options::DecoderOptions = Default::default();
-
-                // Disable color conversion by setting the output colorspace to the input
-                // colorspace.
-                decoder.decode_headers()?;
-                if let Some(colorspace) = decoder.get_input_colorspace() {
-                    options = options.jpeg_set_out_colorspace(colorspace);
-                }
-
-                decoder.set_options(options);
-
-                let data = decoder.decode()?;
-
-                Box::new(Cursor::new(data))
+                Self::decode_jpeg(jpeg_data, samples)?
+            }
+            // exav: old-style JPEG, for the viewer's reader only: the header was
+            // made from the tags (`ojpeg`), and each strip is a JPEG with it.
+            CompressionMethod::JPEG if super::viewer_codecs() && let Some(tables) = jpeg_tables => {
+                let mut strip = Vec::new();
+                reader.take(compressed_length).read_to_end(&mut strip)?;
+                let jpeg = super::ojpeg::strip_jpeg(
+                    tables,
+                    strip,
+                    dimensions.1,
+                    ojpeg_skip,
+                );
+                Self::decode_jpeg(jpeg, samples)?
             }
             #[cfg(true)]
             CompressionMethod::Fax4 => Box::new(super::stream::Group4Reader::new(
@@ -593,11 +817,13 @@ impl Image {
             | ColorType::CMYKA(n)
             | ColorType::YCbCr(n)
             | ColorType::Gray(n)
+            | ColorType::Palette(n)
             | ColorType::Multiband {
                 bit_depth: n,
                 num_samples: _,
             } if n == 8 || n == 16 || n == 32 || n == 64 => {}
             ColorType::Gray(n)
+            | ColorType::Palette(n)
             | ColorType::Multiband {
                 bit_depth: n,
                 num_samples: _,
@@ -614,12 +840,21 @@ impl Image {
                     ));
                 }
             },
+            // exav: grey of 9 to 15 bits, the bits packed one after another (12 is
+            // the usual), read as they lie for the viewer's reader only (see
+            // `with_viewer_codecs`); `tiff_view` unpacks them.
+            ColorType::Gray(n)
+                if super::viewer_codecs()
+                    && (9..=15).contains(&n)
+                    && self.predictor == Predictor::None
+                    && self.sample_format == SampleFormat::Uint => {}
             type_ => {
                 return Err(TiffError::UnsupportedError(
                     TiffUnsupportedError::UnsupportedColorType(type_),
                 ));
             }
         }
+        let packed = super::viewer_codecs() && matches!(color_type, ColorType::Gray(9..=15));
 
         // Validate that the predictor is supported for the sample type.
         match (self.predictor, self.sample_format) {
@@ -673,13 +908,50 @@ impl Image {
         assert!(output_row_stride >= data_row_bytes);
         assert!(buf.len() >= output_row_stride * (data_dims.1 as usize - 1) + data_row_bytes);
 
+        let offset = self.chunk_offsets[chunk_index as usize];
+        // exav: a strip of old-style JPEG that lies in the JPEG stream the file
+        // points to runs to the end of that stream, as libtiff reads it,
+        // whatever its byte count says.
+        let compressed_bytes = if self.ojpeg_header_end > 0 && offset < self.ojpeg_stream_end {
+            (*compressed_bytes).max(self.ojpeg_stream_end - offset)
+        } else {
+            *compressed_bytes
+        };
         let mut reader = Self::create_reader(
             reader,
             compression_method,
-            *compressed_bytes,
+            compressed_bytes,
             self.jpeg_tables.as_deref().map(|a| &**a),
             chunk_dims,
+            samples,
+            self.ojpeg_header_end.saturating_sub(offset),
         )?;
+        // exav: for the viewer's reader, chroma sampled less than luma is
+        // stored in units (see `YcbcrUnits`) and drawn here as one value for
+        // each pixel. JPEG data is decoded to pixels by its own decoder.
+        let (h, v) = self.ycbcr_subsampling;
+        if super::viewer_codecs()
+            && photometric_interpretation == PhotometricInterpretation::YCbCr
+            && (h, v) != (1, 1)
+            && matches!((h, v), (1 | 2 | 4, 1 | 2 | 4))
+            && samples == 3
+            && self.bits_per_sample == 8
+            && !matches!(
+                compression_method,
+                CompressionMethod::ModernJPEG | CompressionMethod::JPEG
+            )
+        {
+            if chunk_row_bytes > limits.decoding_buffer_size {
+                return Err(TiffError::LimitsExceeded);
+            }
+            reader = Box::new(super::stream::YcbcrUnits::new(
+                reader,
+                chunk_dims.0 as usize,
+                data_dims.1 as usize,
+                usize::from(h),
+                usize::from(v),
+            ));
+        }
 
         if output_row_stride == chunk_row_bytes {
             let tile = &mut buf[..chunk_row_bytes * data_dims.1 as usize];
@@ -688,13 +960,14 @@ impl Image {
             for row in tile.chunks_mut(chunk_row_bytes) {
                 super::fix_endianness_and_predict(
                     row,
-                    color_type.bit_depth(),
+                    // exav: packed samples have no byte order.
+                    if packed { 8 } else { color_type.bit_depth() },
                     samples,
                     byte_order,
                     predictor,
                 );
             }
-            if photometric_interpretation == PhotometricInterpretation::WhiteIsZero {
+            if photometric_interpretation == PhotometricInterpretation::WhiteIsZero && !packed {
                 super::invert_colors(tile, color_type, self.sample_format)?;
             }
         } else if chunk_row_bytes > data_row_bytes && self.predictor == Predictor::FloatingPoint {
@@ -733,12 +1006,12 @@ impl Image {
 
                 super::fix_endianness_and_predict(
                     row,
-                    color_type.bit_depth(),
+                    if packed { 8 } else { color_type.bit_depth() },
                     samples,
                     byte_order,
                     predictor,
                 );
-                if photometric_interpretation == PhotometricInterpretation::WhiteIsZero {
+                if photometric_interpretation == PhotometricInterpretation::WhiteIsZero && !packed {
                     super::invert_colors(row, color_type, self.sample_format)?;
                 }
             }
diff --git a/crates/exav-render/src/image_codecs/tiff/decoder/mod.rs b/crates/exav-render/src/image_codecs/tiff/decoder/mod.rs
index 7a13a8bd..6a777715 100644
--- a/crates/exav-render/src/image_codecs/tiff/decoder/mod.rs
+++ b/crates/exav-render/src/image_codecs/tiff/decoder/mod.rs
@@ -11,7 +11,9 @@ use crate::image_codecs::tiff::{
     bytecast, ColorType, Directory, TiffError, TiffFormatError, TiffResult, TiffUnsupportedError,
     UsageError,
 };
-use half::f16;
+// exav: an f16 sample's bits, in place of `half::f16`.
+#[allow(non_camel_case_types)]
+type f16 = u16;
 
 use self::image::Image;
 use self::stream::{ByteOrder, EndianReader};
@@ -19,9 +21,30 @@ use self::stream::{ByteOrder, EndianReader};
 mod cycles;
 pub mod ifd;
 mod image;
+mod ojpeg;
 mod stream;
 mod tag_reader;
 
+// exav: codecs that only the viewer's reader turns on. What is hashed is what
+// ClamAV's `tiff` reads, which has no Zstandard.
+thread_local!(static VIEWER_CODECS: std::cell::Cell<bool> = const { std::cell::Cell::new(false) });
+
+/// Runs `f` with the viewer's codecs (Zstandard) on, for this thread.
+pub fn with_viewer_codecs<T>(f: impl FnOnce() -> T) -> T {
+    struct Reset(bool);
+    impl Drop for Reset {
+        fn drop(&mut self) {
+            VIEWER_CODECS.with(|c| c.set(self.0));
+        }
+    }
+    let _reset = Reset(VIEWER_CODECS.with(|c| c.replace(true)));
+    f()
+}
+
+fn viewer_codecs() -> bool {
+    VIEWER_CODECS.with(std::cell::Cell::get)
+}
+
 /// Result of a decoding process
 #[derive(Debug)]
 pub enum DecodingResult {
@@ -102,7 +125,7 @@ impl DecodingResult {
         if size > limits.decoding_buffer_size / std::mem::size_of::<u16>() {
             Err(TiffError::LimitsExceeded)
         } else {
-            Ok(DecodingResult::F16(vec![f16::ZERO; size]))
+            Ok(DecodingResult::F16(vec![0; size]))
         }
     }
 
@@ -184,7 +207,7 @@ pub enum DecodingBuffer<'a> {
 impl<'a> DecodingBuffer<'a> {
     fn as_bytes_mut(&mut self) -> &mut [u8] {
         match self {
-            DecodingBuffer::U8(ref mut buf) => buf,
+            DecodingBuffer::U8(buf) => buf,
             DecodingBuffer::I8(buf) => bytecast::i8_as_ne_mut_bytes(buf),
             DecodingBuffer::U16(buf) => bytecast::u16_as_ne_mut_bytes(buf),
             DecodingBuffer::I16(buf) => bytecast::i16_as_ne_mut_bytes(buf),
@@ -639,6 +662,9 @@ impl<R: Read + Seek> Decoder<R> {
                 tile_attributes: None,
                 chunk_offsets: Vec::new(),
                 chunk_bytes: Vec::new(),
+                ycbcr_subsampling: (1, 1),
+                ojpeg_header_end: 0,
+                ojpeg_stream_end: 0,
             },
         };
         decoder.next_image()?;
@@ -719,7 +745,15 @@ impl<R: Read + Seek> Decoder<R> {
         let ifd = self.value_reader.read_directory(next_ifd)?;
 
         // Ensure this walk does not get us into a cycle.
-        self.seen_ifds.insert_next(next_ifd, ifd.next())?;
+        // exav: the viewer's reader draws the directory it has and takes the
+        // link back as the end of the chain (libtiff does the same).
+        let mut next = ifd.next();
+        if let Err(e) = self.seen_ifds.insert_next(next_ifd, next) {
+            if !viewer_codecs() {
+                return Err(e);
+            }
+            next = None;
+        }
 
         // Extend the list of known IFD offsets in this chain, if needed.
         if self.ifd_offsets.last().copied() == self.current_ifd {
@@ -727,7 +761,7 @@ impl<R: Read + Seek> Decoder<R> {
         }
 
         self.current_ifd = Some(next_ifd);
-        self.next_ifd = ifd.next();
+        self.next_ifd = next;
 
         Ok(ifd)
     }
diff --git a/crates/exav-render/src/image_codecs/tiff/decoder/ojpeg.rs b/crates/exav-render/src/image_codecs/tiff/decoder/ojpeg.rs
new file mode 100644
index 00000000..b91551df
--- /dev/null
+++ b/crates/exav-render/src/image_codecs/tiff/decoder/ojpeg.rs
@@ -0,0 +1,228 @@
+//! exav: old-style JPEG (compression 6, TIFF 6.0's first JPEG), for the viewer's
+//! reader only (see `with_viewer_codecs`). A strip holds the entropy-coded
+//! scan of a JPEG and nothing else, or a whole JPEG; the tables and the frame
+//! are in tags (512 to 521), or in a JPEG stream the file points to
+//! (`JPEGInterchangeFormat`). The header is built once from them, and each
+//! strip decoded as a JPEG of its own: the header, with its frame as high as
+//! the strip, then the strip's bytes. libtiff's `tif_ojpeg.c` is the reference.
+
+use std::io::{self, Read, Seek, SeekFrom};
+
+/// The tags of old-style JPEG that a header is made from. (A first strip that
+/// the stream the file points to holds, and whose byte count stops short of the
+/// stream's end, runs to it, as libtiff reads it: `header` says where.)
+pub(super) struct Tags {
+    /// `JPEGInterchangeFormat`: where a JPEG stream starts, and how long it is.
+    pub interchange: Option<(u64, u64)>,
+    /// `JPEGQTables`, `JPEGDCTables`, `JPEGACTables`: where each component's table is.
+    pub q: Vec<u64>,
+    pub dc: Vec<u64>,
+    pub ac: Vec<u64>,
+    /// `JPEGRestartInterval`.
+    pub restart: u16,
+    /// `YCbCrSubSampling` of a three-sample image.
+    pub subsampling: (u16, u16),
+}
+
+/// The most of a JPEG stream looked at for its headers.
+const MAX_STREAM: u64 = 1 << 20;
+
+fn bad(what: &str) -> io::Error {
+    io::Error::new(io::ErrorKind::InvalidData, format!("ojpeg: {what}"))
+}
+
+fn read_at<R: Read + Seek>(r: &mut R, at: u64, n: usize) -> io::Result<Vec<u8>> {
+    let mut out = vec![0u8; n];
+    r.seek(SeekFrom::Start(at))?;
+    r.read_exact(&mut out)?;
+    Ok(out)
+}
+
+fn segment(out: &mut Vec<u8>, marker: u8, body: &[u8]) {
+    out.extend_from_slice(&[0xFF, marker]);
+    out.extend_from_slice(&((body.len() + 2) as u16).to_be_bytes());
+    out.extend_from_slice(body);
+}
+
+/// The JPEG up to and including the header of its scan, for a frame `width`
+/// wide and of `samples` components. Where the stream the file points to has
+/// a table, a frame or a scan header, it is used; the rest comes from the tags.
+pub(super) fn header<R: Read + Seek>(
+    r: &mut R,
+    tags: &Tags,
+    width: u32,
+    rows: u32,
+    samples: u16,
+) -> io::Result<(Vec<u8>, u64, u64)> {
+    let samples = usize::from(samples);
+    if samples != 1 && samples != 3 {
+        return Err(bad("components"));
+    }
+    // What the stream has, as its segments up to the scan header, and where in
+    // the file that header ends.
+    let (mut kept, mut scan, mut scan_end, mut stream_end) = (Vec::new(), None, 0, 0);
+    let (mut has_q, mut has_dc_ac, mut has_frame, mut has_restart) = (false, false, false, false);
+    if let Some((at, len)) = tags.interchange {
+        let len = len.min(MAX_STREAM);
+        let mut stream = Vec::new();
+        r.seek(SeekFrom::Start(at))?;
+        r.by_ref().take(len).read_to_end(&mut stream)?;
+        stream_end = at + stream.len() as u64;
+        let mut p = 2;
+        if !stream.starts_with(&[0xFF, 0xD8]) {
+            p = stream.len();
+        }
+        while p + 4 <= stream.len() {
+            if stream[p] != 0xFF {
+                break;
+            }
+            let marker = stream[p + 1];
+            if marker == 0xFF {
+                p += 1;
+                continue;
+            }
+            let size = usize::from(u16::from_be_bytes([stream[p + 2], stream[p + 3]]));
+            let Some(end) = p.checked_add(2 + size).filter(|&e| size >= 2 && e <= stream.len())
+            else {
+                break;
+            };
+            let body = &stream[p..end];
+            match marker {
+                0xDA => {
+                    scan = Some(body.to_vec());
+                    scan_end = at + end as u64;
+                    break;
+                }
+                0xDB => has_q = true,
+                0xC4 => has_dc_ac = true,
+                0xC0..=0xC3 => has_frame = true,
+                0xDD => has_restart = true,
+                _ => {}
+            }
+            kept.extend_from_slice(body);
+            p = end;
+        }
+    }
+
+    let mut out = vec![0xFF, 0xD8];
+    out.extend_from_slice(&kept);
+    // The tables each component uses: where each is, and its number among the
+    // distinct ones (components that name one table share it). Without tags,
+    // the first component has table 0 and the others table 1.
+    let q = distinct(&tags.q, samples);
+    let dc = distinct(&tags.dc, samples);
+    let ac = distinct(&tags.ac, samples);
+    if !has_q {
+        for (id, &at) in q.0.iter().enumerate() {
+            let mut body = vec![id as u8];
+            body.extend_from_slice(&read_at(r, at, 64)?);
+            segment(&mut out, 0xDB, &body);
+        }
+        if q.0.is_empty() {
+            return Err(bad("quantisation tables"));
+        }
+    }
+    if !has_dc_ac {
+        for (class, tables) in [(0u8, &dc.0), (1, &ac.0)] {
+            if tables.is_empty() {
+                return Err(bad("Huffman tables"));
+            }
+            for (id, &at) in tables.iter().enumerate() {
+                let counts = read_at(r, at, 16)?;
+                let n: usize = counts.iter().map(|&c| usize::from(c)).sum();
+                if n > 256 {
+                    return Err(bad("Huffman table"));
+                }
+                let mut body = vec![class << 4 | id as u8];
+                body.extend_from_slice(&counts);
+                body.extend_from_slice(&read_at(r, at + 16, n)?);
+                segment(&mut out, 0xC4, &body);
+            }
+        }
+    }
+    if !has_restart && tags.restart > 0 {
+        segment(&mut out, 0xDD, &tags.restart.to_be_bytes());
+    }
+    if !has_frame {
+        let (h, v) = if samples == 3 { tags.subsampling } else { (1, 1) };
+        if !(1..=4).contains(&h) || !(1..=4).contains(&v) {
+            return Err(bad("subsampling"));
+        }
+        let mut body = vec![8];
+        body.extend_from_slice(&(rows.min(0xFFFF) as u16).to_be_bytes());
+        body.extend_from_slice(&(width.min(0xFFFF) as u16).to_be_bytes());
+        body.push(samples as u8);
+        for i in 0..samples {
+            let hv = if i == 0 { (h << 4 | v) as u8 } else { 0x11 };
+            body.extend_from_slice(&[i as u8 + 1, hv, q.1[i]]);
+        }
+        segment(&mut out, 0xC0, &body);
+    }
+    match scan {
+        Some(scan) => out.extend_from_slice(&scan),
+        None => {
+            let mut body = vec![samples as u8];
+            for i in 0..samples {
+                body.extend_from_slice(&[i as u8 + 1, dc.1[i] << 4 | ac.1[i]]);
+            }
+            body.extend_from_slice(&[0, 63, 0]);
+            segment(&mut out, 0xDA, &body);
+        }
+    }
+    Ok((out, scan_end, stream_end))
+}
+
+/// The distinct tables a tag names for `samples` components (the last one
+/// serves the components after it), in order of first use, and each
+/// component's index among them.
+fn distinct(list: &[u64], samples: usize) -> (Vec<u64>, Vec<u8>) {
+    let mut tables: Vec<u64> = Vec::new();
+    let mut ids = Vec::new();
+    for i in 0..samples {
+        let Some(&at) = list.get(i).or(list.last()) else {
+            // No tag: the usual numbering, luminance and then chrominance.
+            ids.push(u8::from(i > 0));
+            continue;
+        };
+        let id = tables.iter().position(|&t| t == at).unwrap_or_else(|| {
+            tables.push(at);
+            tables.len() - 1
+        });
+        ids.push(id as u8);
+    }
+    (tables, ids)
+}
+
+/// The JPEG of one strip: `header` with its frame `rows` high, then the strip's
+/// bytes and an end marker. A strip that is a whole JPEG itself (it starts with
+/// the start-of-image marker) is that JPEG. A first strip may be named from
+/// inside the stream's own header (from `skip` bytes before its end), and those
+/// bytes are not scan data.
+pub(super) fn strip_jpeg(header: &[u8], mut strip: Vec<u8>, rows: u32, skip: u64) -> Vec<u8> {
+    if strip.starts_with(&[0xFF, 0xD8]) {
+        return strip;
+    }
+    strip.drain(..usize::try_from(skip).unwrap_or(usize::MAX).min(strip.len()));
+    // Or the strip starts with the scan header, which the header ends with.
+    if strip.starts_with(&[0xFF, 0xDA]) && strip.len() >= 4 {
+        let n = 2 + usize::from(u16::from_be_bytes([strip[2], strip[3]]));
+        strip.drain(..n.min(strip.len()));
+    }
+    let mut jpeg = header.to_vec();
+    // The frame's height sits after its marker (FFC0 to FFC3), length and precision.
+    let mut p = 2;
+    while p + 4 <= jpeg.len() && jpeg[p] == 0xFF {
+        let marker = jpeg[p + 1];
+        let size = usize::from(u16::from_be_bytes([jpeg[p + 2], jpeg[p + 3]]));
+        if (0xC0..=0xC3).contains(&marker) && p + 9 <= jpeg.len() {
+            jpeg[p + 5..p + 7].copy_from_slice(&(rows.min(0xFFFF) as u16).to_be_bytes());
+            break;
+        }
+        p += 2 + size;
+    }
+    jpeg.extend_from_slice(&strip);
+    if !jpeg.ends_with(&[0xFF, 0xD9]) {
+        jpeg.extend_from_slice(&[0xFF, 0xD9]);
+    }
+    jpeg
+}
diff --git a/crates/exav-render/src/image_codecs/tiff/decoder/stream.rs b/crates/exav-render/src/image_codecs/tiff/decoder/stream.rs
index 7a60fe25..26f8697d 100644
--- a/crates/exav-render/src/image_codecs/tiff/decoder/stream.rs
+++ b/crates/exav-render/src/image_codecs/tiff/decoder/stream.rs
@@ -142,6 +142,290 @@ impl<R: Read> EndianReader<R> {
 #[cfg(true)]
 pub type DeflateReader<R> = flate2::read::ZlibDecoder<R>;
 
+/// exav: YCbCr stored with the chroma sampled `h` by `v` times less often than
+/// the luma, as TIFF 6.0 lays it out: in units of `h` by `v` pixels, each its
+/// `h * v` luma values (row by row) then one Cb and one Cr, the units in raster
+/// order. The unit rows are read and given back as `width` pixels of
+/// Y, Cb, Cr to a row, `rows` of them, the chroma repeated over its unit.
+pub struct YcbcrUnits<R: Read> {
+    inner: R,
+    width: usize,
+    rows: usize,
+    h: usize,
+    v: usize,
+    pixels: Vec<u8>,
+    at: usize,
+    given: usize,
+}
+
+impl<R: Read> YcbcrUnits<R> {
+    pub fn new(inner: R, width: usize, rows: usize, h: usize, v: usize) -> Self {
+        Self {
+            inner,
+            width,
+            rows,
+            h,
+            v,
+            pixels: Vec::new(),
+            at: 0,
+            given: 0,
+        }
+    }
+}
+
+impl<R: Read> Read for YcbcrUnits<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        if self.at == self.pixels.len() {
+            if self.given >= self.rows {
+                return Ok(0);
+            }
+            let unit = self.h * self.v + 2;
+            let mut raw = vec![0u8; self.width.div_ceil(self.h) * unit];
+            self.inner.read_exact(&mut raw)?;
+            self.pixels.clear();
+            self.at = 0;
+            for r in 0..self.v {
+                for x in 0..self.width {
+                    let u = &raw[x / self.h * unit..][..unit];
+                    self.pixels
+                        .extend_from_slice(&[u[r * self.h + x % self.h], u[unit - 2], u[unit - 1]]);
+                }
+            }
+            self.given += self.v;
+        }
+        let n = buf.len().min(self.pixels.len() - self.at);
+        buf[..n].copy_from_slice(&self.pixels[self.at..self.at + n]);
+        self.at += n;
+        Ok(n)
+    }
+}
+
+/// exav: a zlib stream read for the viewer, which does not check the Adler-32
+/// of what it has decoded: libtiff's readers go on past a wrong one, and some
+/// writers got it wrong (OpenCV's `multipage.tif`). A stream that does not
+/// start as zlib does is left to the zlib reader.
+#[cfg(true)]
+pub fn lenient_zlib<'r, R: Read + 'r>(mut reader: R) -> io::Result<Box<dyn Read + 'r>> {
+    let mut head = [0u8; 2];
+    reader.read_exact(&mut head)?;
+    let check = u16::from_be_bytes(head);
+    // Deflate, a window of 32 KiB at most, no preset dictionary, a valid check.
+    if head[0] & 0x0f == 8 && head[0] >> 4 <= 7 && head[1] & 0x20 == 0 && check % 31 == 0 {
+        Ok(Box::new(flate2::read::DeflateDecoder::new(reader)))
+    } else {
+        Ok(Box::new(DeflateReader::new(io::Cursor::new(head).chain(reader))))
+    }
+}
+
+/// exav: the LZMA2 data of an `.xz` stream with one block, as libtiff writes
+/// `LZMA` (34925) strips: `lzma_stream_encoder` with the LZMA2 filter and, by
+/// default, no check. Only the stream header and the block header are read;
+/// the data run to LZMA2's own end marker. `window` bounds the dictionary
+/// that is allocated: no more than the strip decodes to is ever looked back
+/// on. For the viewer's reader only.
+pub fn xz_lzma2<'r, R: Read + 'r>(mut reader: R, window: u32) -> io::Result<Box<dyn Read + 'r>> {
+    let bad = |what| io::Error::new(io::ErrorKind::InvalidData, what);
+    let mut head = [0u8; 13];
+    reader.read_exact(&mut head)?;
+    if head[..6] != [0xFD, b'7', b'z', b'X', b'Z', 0] || head[12] == 0 {
+        return Err(bad("lzma: not an xz stream"));
+    }
+    // The block header: its size, its flags, optional sizes, then the filters.
+    let mut block = vec![0u8; usize::from(head[12]) * 4 + 3];
+    reader.read_exact(&mut block)?;
+    let flags = block[0];
+    let mut at = 1;
+    for bit in [0x40, 0x80] {
+        if flags & bit != 0 {
+            while *block.get(at).ok_or_else(|| bad("lzma: bad block header"))? & 0x80 != 0 {
+                at += 1;
+            }
+            at += 1;
+        }
+    }
+    // The filters: LZMA2 (0x21) with one byte of properties, behind a delta
+    // filter (0x03, one byte: the distance less one) that libtiff puts in for a
+    // horizontal predictor.
+    let mut delta = None;
+    let mut dict = None;
+    for i in 0..=(flags & 3) {
+        let Some(&[id, 1, p]) = block.get(at..at + 3).and_then(|b| <&[u8; 3]>::try_from(b).ok())
+        else {
+            return Err(bad("lzma: unknown filter"));
+        };
+        at += 3;
+        match (id, i == flags & 3) {
+            (0x03, false) if delta.is_none() => delta = Some(usize::from(p) + 1),
+            (0x21, true) if p <= 40 => dict = Some(u64::from(2 | (p & 1)) << (p / 2 + 11)),
+            _ => return Err(bad("lzma: unknown filter")),
+        }
+    }
+    let dict = dict.ok_or_else(|| bad("lzma: no LZMA2 filter"))?.min(u64::from(window)) as u32;
+    let lzma = Lzma2Reader::new(reader, dict);
+    Ok(match delta {
+        Some(distance) => Box::new(DeltaReader::new(lzma, distance)),
+        None => Box::new(lzma),
+    })
+}
+
+/// exav: the xz delta filter undone: each byte is a difference from the one
+/// `distance` bytes before it.
+pub struct DeltaReader<R: Read> {
+    inner: R,
+    history: Vec<u8>,
+    at: usize,
+}
+
+impl<R: Read> DeltaReader<R> {
+    fn new(inner: R, distance: usize) -> Self {
+        Self {
+            inner,
+            history: vec![0; distance],
+            at: 0,
+        }
+    }
+}
+
+impl<R: Read> Read for DeltaReader<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let n = self.inner.read(buf)?;
+        for b in &mut buf[..n] {
+            *b = b.wrapping_add(self.history[self.at]);
+            self.history[self.at] = *b;
+            self.at = (self.at + 1) % self.history.len();
+        }
+        Ok(n)
+    }
+}
+
+/// exav: raw LZMA2 data, for the viewer's reader only.
+pub struct Lzma2Reader<R: Read> {
+    inner: R,
+    stream: lzma_rust2::Lzma2Stream,
+    input: Box<[u8]>,
+    start: usize,
+    end: usize,
+    ended: bool,
+    done: bool,
+}
+
+impl<R: Read> Lzma2Reader<R> {
+    /// `dict` is the window the decoder keeps: no more than the strip decodes to
+    /// is ever looked back on.
+    pub fn new(inner: R, dict: u32) -> Self {
+        Self {
+            inner,
+            stream: lzma_rust2::Lzma2Stream::new(dict.max(4096)),
+            input: vec![0; 4096].into_boxed_slice(),
+            start: 0,
+            end: 0,
+            ended: false,
+            done: false,
+        }
+    }
+}
+
+impl<R: Read> Read for Lzma2Reader<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        use lzma_rust2::{Action, Status};
+        if buf.is_empty() || self.done {
+            return Ok(0);
+        }
+        loop {
+            if self.start == self.end && !self.ended {
+                self.start = 0;
+                self.end = self.inner.read(&mut self.input)?;
+                self.ended = self.end == 0;
+            }
+            let action = if self.ended {
+                Action::Finish
+            } else {
+                Action::Run
+            };
+            let r = self
+                .stream
+                .process(&self.input[self.start..self.end], buf, action)?;
+            self.start += r.bytes_consumed;
+            if r.status == Status::StreamEnd {
+                self.done = true;
+                return Ok(r.bytes_produced);
+            }
+            if r.bytes_produced > 0 {
+                return Ok(r.bytes_produced);
+            }
+            if self.ended {
+                // Cut short: what was decoded is all there is.
+                self.done = true;
+                return Ok(0);
+            }
+            if r.bytes_consumed == 0 && self.start < self.end {
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    "lzma: decoder made no progress",
+                ));
+            }
+        }
+    }
+}
+
+/// exav: ThunderScan (`ThunderScan`, 32809), 4-bit samples as runs, deltas and
+/// raw values, for the viewer's reader only. `rows` rows of `width` pixels, each
+/// padded to a byte; a row the data ends in, and the rows after it, keep the
+/// pixels decoded and are black. libtiff's `tif_thunder.c` is the reference.
+pub fn thunder_scan(data: &[u8], width: usize, rows: usize) -> Vec<u8> {
+    const TWO_BIT: [i32; 4] = [0, 1, 0, -1];
+    const THREE_BIT: [i32; 8] = [0, 1, 2, 3, 0, -3, -2, -1];
+    let stride = width.div_ceil(2);
+    let mut out = vec![0u8; stride.saturating_mul(rows)];
+    let mut input = data.iter();
+    for row in out.chunks_exact_mut(stride.max(1)) {
+        let mut put = |at: usize, v: u32| {
+            row[at / 2] |= if at % 2 == 0 { (v as u8) << 4 } else { v as u8 };
+        };
+        let (mut pixels, mut last) = (0usize, 0u32);
+        while pixels < width {
+            let Some(&n) = input.next() else {
+                return out;
+            };
+            let n = u32::from(n);
+            match n & 0xC0 {
+                0x00 => {
+                    for _ in 0..(n & 0x3F).min((width - pixels) as u32) {
+                        put(pixels, last);
+                        pixels += 1;
+                    }
+                }
+                0x40 => {
+                    for (shift, skip) in [(4, 2), (2, 2), (0, 2)] {
+                        let code = ((n >> shift) & 3) as usize;
+                        if code != skip && pixels < width {
+                            last = (last as i32 + TWO_BIT[code]) as u32 & 0xF;
+                            put(pixels, last);
+                            pixels += 1;
+                        }
+                    }
+                }
+                0x80 => {
+                    for shift in [3, 0] {
+                        let code = ((n >> shift) & 7) as usize;
+                        if code != 4 && pixels < width {
+                            last = (last as i32 + THREE_BIT[code]) as u32 & 0xF;
+                            put(pixels, last);
+                            pixels += 1;
+                        }
+                    }
+                }
+                _ => {
+                    last = n & 0xF;
+                    put(pixels, last);
+                    pixels += 1;
+                }
+            }
+        }
+    }
+    out
+}
+
 //
 // ## LZW Reader
 //
@@ -151,6 +435,13 @@ pub type DeflateReader<R> = flate2::read::ZlibDecoder<R>;
 pub struct LZWReader<R: Read> {
     reader: BufReader<Take<R>>,
     decoder: weezl::decode::Decoder,
+    // exav: in the viewer's reader, output is decoded a block at a time and
+    // handed out from there. A caller asking for a few bytes at a time (a tile
+    // row, then its padding) can make `weezl` end a valid stream short.
+    block: Option<(Vec<u8>, usize, usize)>,
+    // exav: whether the start of the stream was looked at for the old-style
+    // LZW that libtiff reads (only done in the viewer's reader).
+    probed: bool,
 }
 
 #[cfg(true)]
@@ -166,6 +457,8 @@ impl<R: Read> LZWReader<R> {
                 reader.take(u64::try_from(compressed_length).unwrap()),
             ),
             decoder: configuration.build(),
+            block: super::viewer_codecs().then(|| (vec![0; 64 * 1024], 0, 0)),
+            probed: !super::viewer_codecs(),
         }
     }
 }
@@ -173,6 +466,38 @@ impl<R: Read> LZWReader<R> {
 #[cfg(true)]
 impl<R: Read> Read for LZWReader<R> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        if !self.probed {
+            self.probed = true;
+            // Old-style LZW (TIFF 5.0) starts 0x00 and an odd byte: its codes
+            // are least significant bit first and grow a code late, as in GIF.
+            let head = self.reader.fill_buf()?;
+            if head.len() >= 2 && head[0] == 0 && head[1] & 1 == 1 {
+                self.decoder = weezl::decode::Configuration::new(weezl::BitOrder::Lsb, 8)
+                    .with_yield_on_full_buffer(true)
+                    .build();
+            }
+        }
+        let Some((mut block, mut at, mut end)) = self.block.take() else {
+            return self.decode_into(buf);
+        };
+        if at == end {
+            let n = self.decode_into(&mut block);
+            (at, end) = (0, *n.as_ref().unwrap_or(&0));
+            if let Err(e) = n {
+                self.block = Some((block, at, end));
+                return Err(e);
+            }
+        }
+        let n = buf.len().min(end - at);
+        buf[..n].copy_from_slice(&block[at..at + n]);
+        self.block = Some((block, at + n, end));
+        Ok(n)
+    }
+}
+
+#[cfg(true)]
+impl<R: Read> LZWReader<R> {
+    fn decode_into(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         loop {
             let result = self.decoder.decode_bytes(self.reader.fill_buf()?, buf);
             self.reader.consume(result.consumed_in);
@@ -186,8 +511,18 @@ impl<R: Read> Read for LZWReader<R> {
                     }
                 }
                 Ok(weezl::LzwStatus::NoProgress) => {
-                    assert_eq!(result.consumed_in, 0);
-                    assert_eq!(result.consumed_out, 0);
+                    // exav: weezl can give the last bytes of output and
+                    // say `NoProgress` in the same call, when the input is all
+                    // taken and the end code is still to be read; and it can
+                    // take the last input bytes and give nothing. Neither is a
+                    // panic: the first is data, the second asks again, and the
+                    // call after it gives the error below.
+                    if result.consumed_out > 0 {
+                        return Ok(result.consumed_out);
+                    }
+                    if result.consumed_in > 0 {
+                        continue;
+                    }
                     assert!(self.reader.buffer().is_empty());
                     return Err(io::Error::new(
                         io::ErrorKind::UnexpectedEof,
diff --git a/crates/exav-render/src/image_codecs/tiff/tags.rs b/crates/exav-render/src/image_codecs/tiff/tags.rs
index bbb39fbc..2fd5ea2e 100644
--- a/crates/exav-render/src/image_codecs/tiff/tags.rs
+++ b/crates/exav-render/src/image_codecs/tiff/tags.rs
@@ -4,7 +4,7 @@ macro_rules! tags {
         $( #[$enum_attr:meta] )*
         $vis:vis enum $name:ident($ty:tt) $(unknown(#[$unknown_meta:meta] $unknown_doc:ident))* {
             // Each of the `Name = Val,` permitting documentation.
-            $($(#[$ident_attr:meta])* $tag:ident = $val:expr,)*
+            $($(#[$ident_attr:meta])* $tag:ident = $val:expr_2021,)*
         }
     } => {
         $( #[$enum_attr] )*
@@ -214,6 +214,9 @@ pub enum CompressionMethod(u16) unknown(
 
     // Self-assigned by libtiff
     ZSTD = 0xC350,
+    // exav: read for the viewer only (`with_viewer_codecs`).
+    ThunderScan = 32809,
+    LZMA = 34925,
 }
 }
 
diff --git a/crates/exav-render/src/image_codecs/tiff_image.rs b/crates/exav-render/src/image_codecs/tiff_image.rs
index 284e675b..c3c02b4f 100644
--- a/crates/exav-render/src/image_codecs/tiff_image.rs
+++ b/crates/exav-render/src/image_codecs/tiff_image.rs
@@ -78,13 +78,13 @@ where
             tiff::ColorType::RGBA(32) => ColorType::Rgba32F,
 
             tiff::ColorType::Palette(n) | tiff::ColorType::Gray(n) => {
-                return Err(err_unknown_color_type(n))
+                return Err(err_unknown_color_type(n));
             }
             tiff::ColorType::GrayA(n) => return Err(err_unknown_color_type(n.saturating_mul(2))),
             tiff::ColorType::RGB(n) => return Err(err_unknown_color_type(n.saturating_mul(3))),
             tiff::ColorType::YCbCr(n) => return Err(err_unknown_color_type(n.saturating_mul(3))),
             tiff::ColorType::RGBA(n) | tiff::ColorType::CMYK(n) => {
-                return Err(err_unknown_color_type(n.saturating_mul(4)))
+                return Err(err_unknown_color_type(n.saturating_mul(4)));
             }
             tiff::ColorType::Multiband {
                 bit_depth,
@@ -92,7 +92,7 @@ where
             } => {
                 return Err(err_unknown_color_type(
                     bit_depth.saturating_mul(num_samples.min(255) as u8),
-                ))
+                ));
             }
             _ => return Err(err_unknown_color_type(0)),
         };
@@ -127,7 +127,7 @@ where
 }
 
 fn check_sample_format(sample_format: u16, color_type: tiff::ColorType) -> Result<(), ImageError> {
-    use tiff::{tags::SampleFormat, ColorType};
+    use tiff::{ColorType, tags::SampleFormat};
     let num_bits = match color_type {
         ColorType::CMYK(k) => k,
         ColorType::Gray(k) => k,
@@ -142,7 +142,7 @@ fn check_sample_format(sample_format: u16, color_type: tiff::ColorType) -> Resul
                         "Unhandled TIFF color type {color_type:?} for {k} bits",
                     )),
                 ),
-            ))
+            ));
         }
         _ => {
             return Err(ImageError::Unsupported(
@@ -152,7 +152,7 @@ fn check_sample_format(sample_format: u16, color_type: tiff::ColorType) -> Resul
                         "Unhandled TIFF color type {color_type:?}",
                     )),
                 ),
-            ))
+            ));
         }
     };
 
diff --git a/crates/exav-render/src/lib.rs b/crates/exav-render/src/lib.rs
index c1cb09a5..156eec41 100644
--- a/crates/exav-render/src/lib.rs
+++ b/crates/exav-render/src/lib.rs
@@ -13,8 +13,22 @@
 //! - [`cad`]: DXF drawings into a drawing model, read from the pairs
 //!   `exav_unpack::dxf` gives, and DWG (R13 to 2018) from the
 //!   objects `exav_unpack::dwg` reads. Feature `dwg`.
-//! - [`ifc`] and [`stl`]: IFC models (IFC2X3, IFC4, IFC4X3) and STL meshes
-//!   into the triangle batches of a [`mesh::Scene`]. Features `ifc`, `stl`.
+//! - [`ifc`], [`stl`], [`obj`], [`ply`] and [`gltf`]: IFC models (IFC2X3,
+//!   IFC4, IFC4X3), STL, Wavefront OBJ, Stanford PLY and glTF 2.0 (GLB too)
+//!   meshes into the triangle batches of a [`mesh::Scene`]. Features `ifc`,
+//!   `stl`, `obj`, `ply`, `gltf`.
+//! - [`markdown`]: Markdown into a tree of blocks and inlines, as data. Raw
+//!   HTML is text, links are limited to http, https and mailto. Feature
+//!   `markdown`.
+//! - [`sheets`], [`slides`] and [`docs`]: spreadsheets (Excel 2 to 2003,
+//!   ODS, FODS, Numbers, XML Spreadsheet 2003, HTML tables, SYLK) to XLSX,
+//!   presentations (PowerPoint 95 to 2003, ODP, FODP, Keynote) to PPTX, and
+//!   text documents (Word 6 to 2003, ODT, FODT, RTF, Word 2003 XML, Pages) to
+//!   DOCX, for an Open XML renderer to draw. Features `office-sheets`,
+//!   `office-slides`, `office-docs` (`office` for all three).
+//! - [`text`]: the text a reader sees in a document, for a scanner or a
+//!   search: Markdown, HTML, Office and OpenDocument XML parts, PDF, and
+//!   AutoCAD drawings. Feature `text`.
 //!
 //! Every decoder is safe Rust: this crate is `forbid(unsafe_code)`, so are
 //! exav-unpack's DXF and DWG readers and the hayro decoders, and
@@ -29,16 +43,38 @@ pub mod formats;
 pub use formats::cad;
 #[cfg(feature = "dwg")]
 pub use formats::dwg;
+#[cfg(feature = "gltf")]
+pub use formats::gltf;
 #[cfg(feature = "ifc")]
 pub use formats::ifc;
 #[cfg(feature = "image")]
 pub use formats::image;
-#[cfg(any(feature = "ifc", feature = "stl"))]
+#[cfg(feature = "markdown")]
+pub use formats::markdown;
+#[cfg(any(
+    feature = "ifc",
+    feature = "stl",
+    feature = "obj",
+    feature = "ply",
+    feature = "gltf"
+))]
 pub use formats::mesh;
+#[cfg(feature = "obj")]
+pub use formats::obj;
+#[cfg(feature = "office-docs")]
+pub use formats::office::docs;
+#[cfg(feature = "office-sheets")]
+pub use formats::office::sheets;
+#[cfg(feature = "office-slides")]
+pub use formats::office::slides;
 #[cfg(any(feature = "jp2", feature = "jbig2", feature = "ccitt"))]
 pub use formats::pdf_image;
+#[cfg(feature = "ply")]
+pub use formats::ply;
 #[cfg(feature = "stl")]
 pub use formats::stl;
+#[cfg(feature = "text")]
+pub use formats::text;
 
 #[cfg(feature = "image")]
 mod image_codecs;
diff --git a/crates/exav-render/tests/cad_common/compare.rs b/crates/exav-render/tests/cad_common/compare.rs
index 36e76b69..9f38bce8 100644
--- a/crates/exav-render/tests/cad_common/compare.rs
+++ b/crates/exav-render/tests/cad_common/compare.rs
@@ -329,11 +329,7 @@ fn note(kind: &str, k: &str, e: &Value, t: &Value, repair: &[String]) -> &'stati
         ("HATCH", "paths") => {
             let mut d = Vec::new();
             compare(&canonical_paths(&e[k]), &canonical_paths(&t[k]), "", &mut d);
-            if d.is_empty() {
-                " (same boundary)"
-            } else {
-                ""
-            }
+            if d.is_empty() { " (same boundary)" } else { "" }
         }
         ("DIMENSION", _) if e["style"] == "" && t["style"] != "" => " (regenerated)",
         ("VIEWPORT", "id") if number(&e[k]) > 0.0 && number(&t[k]) > 0.0 => " (stacking)",
@@ -615,10 +611,11 @@ fn dictionary_families(d: &Value) -> BTreeMap<String, &'static str> {
         if names.iter().any(|n| n.eq_ignore_ascii_case("CEPSNTYPE")) {
             todo.push((own.clone(), " (roundtrip)"));
         }
-        if let Some(first) = names.first().map(|n| entry_family(n)) {
-            if !first.is_empty() && names.iter().all(|n| !entry_family(n).is_empty()) {
-                todo.push((own, first));
-            }
+        if let Some(first) = names.first().map(|n| entry_family(n))
+            && !first.is_empty()
+            && names.iter().all(|n| !entry_family(n).is_empty())
+        {
+            todo.push((own, first));
         }
         for e in x["entries"].as_array().into_iter().flatten() {
             let f = entry_family(e[0].as_str().unwrap_or(""));
@@ -693,11 +690,11 @@ fn pairs_diff(
     if sa == sb {
         let null = ra.len() != la.len() || rb.len() != lb.len();
         let sorted = if kind == "dictionaries" {
-            rb.windows(2)
-                .all(|w| w[0].0.to_ascii_lowercase() <= w[1].0.to_ascii_lowercase())
+            rb.array_windows()
+                .all(|[a, b]| a.0.to_ascii_lowercase() <= b.0.to_ascii_lowercase())
         } else {
-            rb.windows(2)
-                .all(|w| hex(&Value::from(w[0].0.as_str())) <= hex(&Value::from(w[1].0.as_str())))
+            rb.array_windows()
+                .all(|[a, b]| hex(&Value::from(a.0.as_str())) <= hex(&Value::from(b.0.as_str())))
         };
         let note = match (null, sorted, ra == rb) {
             (true, _, true) => " (null entity)",
@@ -843,10 +840,10 @@ pub fn object_differences(dwg: &Value, dxf: &Value, seed: u64) -> Vec<ObjectDiff
         let theirs = by_handle(&dxf[kind]);
         let mut remade: BTreeMap<String, Vec<&str>> = BTreeMap::new();
         for (h, b) in theirs.iter().filter(|(h, _)| !ours.contains_key(*h)) {
-            if hex(&Value::from(h.as_str())) >= seed {
-                if let Some(id) = identity(kind, b) {
-                    remade.entry(id).or_default().push(h.as_str());
-                }
+            if hex(&Value::from(h.as_str())) >= seed
+                && let Some(id) = identity(kind, b)
+            {
+                remade.entry(id).or_default().push(h.as_str());
             }
         }
         let mut paired: Vec<&str> = Vec::new();
diff --git a/crates/exav-render/tests/cad_dwg.rs b/crates/exav-render/tests/cad_dwg.rs
index a0f253a0..61a5c21b 100644
--- a/crates/exav-render/tests/cad_dwg.rs
+++ b/crates/exav-render/tests/cad_dwg.rs
@@ -12,7 +12,7 @@ use std::time::{Duration, Instant};
 
 use common::compare::{entity_diffs, object_differences};
 use common::{entity_by_handle, expected, resolve, same, same_name};
-use exav_render::cad::{read_dwg, read_dwg_with, Error, Limits, WarningKind};
+use exav_render::cad::{Error, Limits, WarningKind, read_dwg, read_dwg_with};
 use serde_json::Value;
 
 const VERSIONS: [&str; 8] = [
@@ -453,10 +453,11 @@ fn the_entity_limit_holds() {
     let d = read_dwg_with(&dwg("R2000", "all"), &limits).expect("reads");
     let n: usize = d.blocks.iter().map(|b| b.entities.len()).sum();
     assert_eq!(n, 3);
-    assert!(d
-        .warnings
-        .iter()
-        .any(|w| w.kind == WarningKind::LimitReached));
+    assert!(
+        d.warnings
+            .iter()
+            .any(|w| w.kind == WarningKind::LimitReached)
+    );
 }
 
 /// exav-unpack's preview fixtures: the converter made the bitmap its
diff --git a/crates/exav-render/tests/cad_dwg_oracle.rs b/crates/exav-render/tests/cad_dwg_oracle.rs
index d6f96ea1..9baedd55 100644
--- a/crates/exav-render/tests/cad_dwg_oracle.rs
+++ b/crates/exav-render/tests/cad_dwg_oracle.rs
@@ -365,6 +365,12 @@ const EXPLAINED: &[(&[&str], &str, &str, &str)] = &[
         NO_SOURCES,
     ),
     (&["*"], "linetypes.elements[].flags (bit 8)", "", LTYPE_BIT8),
+    (
+        &["ACAD13", "ACAD14", "orig-R13", "orig-R14"],
+        "dim_styles.dimadec",
+        "",
+        R14_DIMADEC,
+    ),
     (&["*"], "entity:", ".block_name (renumbered)", RENUMBERED),
     (&["*"], "blocks.name (renumbered)", "", RENUMBERED),
     (
@@ -454,13 +460,11 @@ const AUDIT: &str = "the converter's audit renames an entry whose name it reject
 const R13_HATCH: &str = "an INSERT with R14_HATCH_DATA extended data, a hatch as R13 keeps it, \
     in AutoCAD 2007 files (2948f53e's 61D4, 258c843b, 330bfec2, 511ba870): the converter's DXF \
     has a HATCH rebuilt from that data under the INSERT's handle; the DWG reader reads the INSERT";
-const FIRST_STYLE: &str =
-    "the converter leaves out group 7 of a text on the drawing's first STYLE \
+const FIRST_STYLE: &str = "the converter leaves out group 7 of a text on the drawing's first STYLE \
     entry whatever its name, which DXF then reads as STANDARD: 69c08825's SIMPLEX (C, the drawing \
     has no STANDARD, the converter adds one), 7802a3cc's ROMANS (154, beside a STANDARD 161), \
     5aba4fe9's ROMANS (R13)";
-const MTEXT_FORMATTING: &str =
-    "the converter writes an MTEXT's spacing and paragraph codes again: \
+const MTEXT_FORMATTING: &str = "the converter writes an MTEXT's spacing and paragraph codes again: \
     the same text once spaces, braces and \\p codes are left out (d744670f's 1101A: 'Notes:      \
     Component' as 'Notes: Component'; 8c78010e's 7B800 indents)";
 const X_DEFAULT: &str = "an MTEXT direction within 1e-12 of (1, 0, 0) (79428019's 1C3: (1, \
@@ -495,8 +499,7 @@ const NO_SOURCES: &str = "an associative HATCH with no source object (7447f770's
     converter's audit makes it not associative";
 const LTYPE_BIT8: &str = "a linetype text element's undocumented 8 bit (08fe5efe's A4: 10), which \
     the converter's DXF leaves out (2)";
-const LAST_HEIGHT: &str =
-    "the converter writes a STYLE's last height 0 as the drawing's text size \
+const LAST_HEIGHT: &str = "the converter writes a STYLE's last height 0 as the drawing's text size \
     (26c068d2: every style 0 in the DWG, 2.5 = $TEXTSIZE in the DXF)";
 const LEADER_HOOK_DIRECTION: &str = "the converter writes the hookline direction (74) of a LEADER \
     from where its annotation lies, not the DWG's bit (499033fa's F2FF: 1 in the DWG, no 74 with \
@@ -600,8 +603,7 @@ const ROUNDTRIP: &str = "data the converter keeps for a round trip through an ol
 const DATA_STORAGE: &str = "the index of R2013's data storage section (AcDsRecords, AcDsSchemas, \
     AcDsDecomposeData, and dictionaries below them whose names are numbers: orig-R2000/\
     02f62c86's 229 and 22A), which AutoCAD writes and the converter leaves out of DXF";
-const MATERIAL_MAP: &str =
-    "the map entries (BUMPTILE, DIFFUSETILE, OPACITYTILE, REFLECTIONTILE...) \
+const MATERIAL_MAP: &str = "the map entries (BUMPTILE, DIFFUSETILE, OPACITYTILE, REFLECTIONTILE...) \
     of the materials' extension dictionaries of AutoCAD's files (orig-R2000/22852ead's 110), \
     which the converter leaves out of DXF";
 const POLYSOLID: &str = "the polysolid variables PSOLWIDTH and PSOLHEIGHT (DICTIONARYVAR 566 and \
@@ -647,6 +649,9 @@ const HAS_ATTRIBUTES: &str = "AutoCAD set the has-attributes flag (2) of two blo
 const R13_CODE_PAGE: &str = "the converter writes R13 DXF's $DWGCODEPAGE in lower case";
 const R13_MEASUREMENT: &str = "R13 DXF has no $MEASUREMENT: the DXF reader gives 0, the DWG's \
     own section (spec 22) says";
+const R14_DIMADEC: &str = "an R13 or R14 DWG's DIMSTYLE has no DIMADEC (spec 20.4.68): the DWG \
+    reader gives 0, the converter's DXF of the same version the style's angular precision from \
+    the drawing it was made from (854c8ebe's 242: 2)";
 const DASH_SCALE: &str = "the converter writes group 46 only for a dash with a shape or text (74 \
     not 0): the DXF reader gives 1 for the others, the DWG holds the stored scale (0.1, 0)";
 const TEMP_REC: &str = "a shape file's STYLE entry of an R11 drawing: the converter names it \
diff --git a/crates/exav-render/tests/cad_fixtures.rs b/crates/exav-render/tests/cad_fixtures.rs
index 9044780c..90146a63 100644
--- a/crates/exav-render/tests/cad_fixtures.rs
+++ b/crates/exav-render/tests/cad_fixtures.rs
@@ -90,7 +90,7 @@ fn check(file: &str, version: &str, source: &str, d: &Value) -> (usize, Vec<Stri
                         || ty == "VIEWPORT"
                         || fields.get("paper_space") == Some(&Value::Bool(true))) =>
                 {
-                    continue
+                    continue;
                 }
                 Some(e) => {
                     failed.push(format!("{file}: {ty} {handle} read as {}", e["type"]));
diff --git a/crates/exav-render/tests/cad_oracle.rs b/crates/exav-render/tests/cad_oracle.rs
index 59e2e10c..b1659545 100644
--- a/crates/exav-render/tests/cad_oracle.rs
+++ b/crates/exav-render/tests/cad_oracle.rs
@@ -53,6 +53,10 @@ const EXPLAINED: &[(&str, &str, &str)] = &[
     ("pre-2000 dictionaries.hard_owner", "", HARD_OWNER),
     ("dictionaries.hard_owner", "", HARD_OWNER),
     ("dim_styles.dim", "", DIMSTYLE_DEFAULTS),
+    ("entity:MULTILEADER.arrowhead_size", "", MLEADER_ARROW),
+    ("entity:", " (caret)", CARET),
+    ("pre-2000 dim_styles.dimadec", "", R14_DIMSTYLE),
+    ("pre-2000 dim_styles.dimdsep", "", R14_DIMSTYLE),
     ("entity:LEADER.hook", "", LEADER_DEFAULTS),
     ("entity:LEADER.text_", "", LEADER_DEFAULTS),
     ("pre-2000 entity:LEADER.hook", "", LEADER_DEFAULTS),
@@ -86,11 +90,9 @@ const FROZEN_341: &str = "a 2000 file lists a VIEWPORT's frozen layers in group
 
 const R12_HANDLES: &str = "R12 table entries and blocks have no handle and R12 entities no \
      owner group: both readers number them, differently";
-const NO_LAYOUTS: &str =
-    "LAYOUT objects came with 2000: exav-render makes Model and Layout1 from the \
+const NO_LAYOUTS: &str = "LAYOUT objects came with 2000: exav-render makes Model and Layout1 from the \
      header's limits and extents, ezdxf from its own template (an A3 page setup)";
-const EZDXF_UPGRADE: &str =
-    "ezdxf upgrades a pre-2000 drawing to its 2000 structure on load, adding \
+const EZDXF_UPGRADE: &str = "ezdxf upgrades a pre-2000 drawing to its 2000 structure on load, adding \
      dictionaries, styles, plot styles, BYBLOCK/BYLAYER linetypes and arrow blocks";
 const EZDXF_MATERIAL: &str = "ezdxf adds the MATERIAL objects (2007) a drawing lacks, with their \
      dictionary, and points layers without group 347 at them";
@@ -98,15 +100,20 @@ const DEFPOINTS: &str = "ezdxf adds the Defpoints layer when missing and forces
      (pre-2000 layers have no group 290)";
 const MVIEW: &str = "before 2000 a VIEWPORT keeps its view in ACAD extended data after 1000 MVIEW \
      (the AcDbViewport class has only 10, 40, 41, 68, 69); ezdxf leaves its defaults";
-const SCALABLE: &str =
-    "group 281 of BLOCK_RECORD is absent before 2007; exav-render reads absent as \
+const SCALABLE: &str = "group 281 of BLOCK_RECORD is absent before 2007; exav-render reads absent as \
      scalable, ezdxf as 0";
-const HARD_OWNER: &str =
-    "group 280 of DICTIONARY is absent; the reference gives no default, ezdxf \
+const HARD_OWNER: &str = "group 280 of DICTIONARY is absent; the reference gives no default, ezdxf \
      assumes 1 (its source says so: undocumented)";
 const DIMSTYLE_DEFAULTS: &str = "the converter omits DIMSTYLE groups equal to AutoCAD's imperial \
      defaults (DIMASZ 0.18, DIMTXT 0.18, DIMEXO 0.0625, DIMEXE 0.18, DIMGAP 0.09): the header's \
      values for the current style agree in 696 of 702 corpus records; ezdxf fills metric defaults";
+const CARET: &str = "ezdxf keeps DXF's caret notation as written (`^I`); the DXF reader decodes \
+     it to the control character it stands for (a tab), as the DWG holds it";
+const MLEADER_ARROW: &str = "group 42 absent: the converter leaves it out where the DWG holds 0 \
+     (0e74f0aa's multileaders, which the DWG oracle reads as 0 too), which the DXF reader gives; \
+     ezdxf assumes 4";
+const R14_DIMSTYLE: &str = "DIMADEC (179) and DIMDSEP (278) came with R2000: an R13 or R14 file \
+     has neither, the DXF reader gives AutoCAD's defaults (0, '.'), ezdxf its metric ones (2, ',')";
 const LEADER_DEFAULTS: &str = "LEADER groups 74, 75, 40 and 41 are absent; the reference gives no \
      default, ezdxf assumes 1";
 const STANDARD: &str = "group 7 absent: the reference's default is STANDARD, ezdxf's is Standard \
@@ -144,6 +151,27 @@ fn close(a: f64, b: f64) -> bool {
     a == b || (a - b).abs() <= 1e-9 * a.abs().max(b.abs()).max(1.0)
 }
 
+/// DXF's caret notation decoded: `^I` a tab, `^J` a line feed..., `^ ` a
+/// caret.
+fn uncaret(s: &str) -> String {
+    let mut out = String::with_capacity(s.len());
+    let mut chars = s.chars().peekable();
+    while let Some(c) = chars.next() {
+        match (c, chars.peek().copied()) {
+            ('^', Some(' ')) => {
+                chars.next();
+                out.push('^');
+            }
+            ('^', Some(n @ '@'..='_')) => {
+                chars.next();
+                out.push(char::from(n as u8 - b'@'));
+            }
+            _ => out.push(c),
+        }
+    }
+    out
+}
+
 /// Compare two values; push one difference per differing leaf.
 fn compare(a: &Value, b: &Value, path: &str, pattern: &str, found: &mut Vec<(String, String)>) {
     match (a, b) {
@@ -196,6 +224,9 @@ fn compare(a: &Value, b: &Value, path: &str, pattern: &str, found: &mut Vec<(Str
         (Value::String(x), Value::String(y)) if x.eq_ignore_ascii_case(y) => {
             found.push((format!("{pattern} (case)"), format!("{path}: {a} vs {b}")));
         }
+        (Value::String(x), Value::String(y)) if *x == uncaret(y) => {
+            found.push((format!("{pattern} (caret)"), path.to_string()));
+        }
         (Value::Null, Value::Array(y)) if *y == [1.0, 0.0, 0.0] => {
             found.push((
                 format!("{pattern} (absent)"),
diff --git a/crates/exav-render/tests/cad_oracle/ezdxf_dump.py b/crates/exav-render/tests/cad_oracle/ezdxf_dump.py
index ee924ce0..95e58380 100644
--- a/crates/exav-render/tests/cad_oracle/ezdxf_dump.py
+++ b/crates/exav-render/tests/cad_oracle/ezdxf_dump.py
@@ -18,6 +18,7 @@
 import sys
 
 import ezdxf
+from ezdxf import xclip
 from ezdxf.lldxf.const import DXFValueError
 
 UNICODE = re.compile(r"\\[Uu]\+([0-9A-Fa-f]{4})")
@@ -221,6 +222,7 @@ def hv(name, default):
         "lwdisplay": bool(hv("$LWDISPLAY", 0)),
         "fillmode": bool(hv("$FILLMODE", 1)),
         "mirrtext": bool(hv("$MIRRTEXT", 0)),
+        "xclipframe": int(hv("$XCLIPFRAME", 2)),
     }
 
 
@@ -351,6 +353,12 @@ def hh(name):
         "dimtsz": num(get(d, "dimtsz", 0.0)),
         "dimtxt": num(get(d, "dimtxt", 0.18)),
         "dimgap": num(get(d, "dimgap", 0.09)),
+        "dimtad": int(get(d, "dimtad", 0)),
+        "dimzin": int(get(d, "dimzin", 0)),
+        "dimlfac": num(get(d, "dimlfac", 1.0)),
+        "dimdec": int(get(d, "dimdec", 4)),
+        "dimadec": int(get(d, "dimadec", 0)),
+        "dimdsep": int(get(d, "dimdsep", 46)),
         "dimclrd": aci_color(get(d, "dimclrd", 0)),
         "dimclre": aci_color(get(d, "dimclre", 0)),
         "dimclrt": aci_color(get(d, "dimclrt", 0)),
@@ -504,27 +512,37 @@ def spline_fields(s):
 ]
 
 
+def stored_angles(edge):
+    """The angles as the file has them: ezdxf loads a clockwise arc or
+    ellipse edge's as (360 - end, 360 - start)."""
+    if edge.ccw:
+        return edge.start_angle, edge.end_angle
+    return 360.0 - edge.end_angle, 360.0 - edge.start_angle
+
+
 def edge_json(edge):
     t = edge.type.name.lower() if hasattr(edge.type, "name") else str(edge.type)
     if t == "line":
         return {"type": "line", "start": v2(edge.start), "end": v2(edge.end)}
     if t == "arc":
+        start, end = stored_angles(edge)
         return {
             "type": "arc",
             "center": v2(edge.center),
             "radius": num(edge.radius),
-            "start_angle": rad(edge.start_angle),
-            "end_angle": rad(edge.end_angle),
+            "start_angle": rad(start),
+            "end_angle": rad(end),
             "counter_clockwise": bool(edge.ccw),
         }
     if t == "ellipse":
+        start, end = stored_angles(edge)
         return {
             "type": "ellipse",
             "center": v2(edge.center),
             "major_axis": v2(edge.major_axis),
             "ratio": num(edge.ratio),
-            "start_angle": rad(edge.start_angle),
-            "end_angle": rad(edge.end_angle),
+            "start_angle": rad(start),
+            "end_angle": rad(end),
             "counter_clockwise": bool(edge.ccw),
         }
     weights = [num(w) for w in edge.weights]
@@ -719,7 +737,7 @@ def image_fields(e):
         "reactor": h(get(e, "image_def_reactor_handle", None)),
         "clip_type": int(get(e, "clipping_boundary_type", 1)),
         "clip_vertices": [v2(p) for p in e.boundary_path],
-        "clip_inside": bool(get(e, "clip_mode", 0)),
+        "clip_inverted": bool(get(e, "clip_mode", 0)),
     }
 
 
@@ -797,6 +815,20 @@ def kind_fields(e, doc):
             out["invisible_edges"] = int(get(e, "invisible_edges", 0))
         else:
             plane(e, out)
+    elif t == "MESH":
+        n = len(e.vertices)
+        out = {
+            "vertices": [v3(p) for p in e.vertices],
+            "faces": [list(f) for f in e.faces if len(f) >= 2 and all(0 <= i < n for i in f)],
+        }
+    elif t == "TOLERANCE":
+        out = {
+            "insertion": v3(get(e, "insert", (0, 0, 0))),
+            "x_direction": v3(get(e, "x_axis_vector", (1, 0, 0))),
+            "extrusion": v3(get(e, "extrusion", (0, 0, 1))),
+            "text": unescape(get(e, "content", "")),
+            "dimstyle": unescape(get(e, "dimstyle", "")),
+        }
     elif t == "TEXT":
         out = text_fields(e)
     elif t in ("ATTRIB", "ATTDEF"):
@@ -817,6 +849,7 @@ def kind_fields(e, doc):
             "row_spacing": num(get(e, "row_spacing", 0.0)),
             "extrusion": v3(get(e, "extrusion", (0, 0, 1))),
             "attributes": [entity_json(a, doc) for a in e.attribs],
+            "clip": insert_clip(e),
         }
     elif t == "MTEXT":
         out = mtext_fields(e)
@@ -1010,6 +1043,19 @@ def kind_fields(e, doc):
 }
 
 
+def insert_clip(e):
+    """The XCLIP boundary in block coordinates, as ezdxf's
+    `XClip.get_block_clipping_path` has it before closing a rectangle."""
+    f = xclip.get_spatial_filter(e)
+    if f is None or len(f.boundary_vertices) < 2:
+        return None
+    m = f.inverse_insert_matrix
+    return {
+        "boundary": [v2(p) for p in m.transform_vertices(f.boundary_vertices)],
+        "enabled": bool(f.dxf.is_clipping_enabled),
+    }
+
+
 def entity_json(e, doc):
     t = e.dxftype()
     t = TYPE_NAMES.get(t, t)
diff --git a/crates/exav-render/tests/cad_proxy.rs b/crates/exav-render/tests/cad_proxy.rs
index 5f188996..6b67e1fe 100644
--- a/crates/exav-render/tests/cad_proxy.rs
+++ b/crates/exav-render/tests/cad_proxy.rs
@@ -18,7 +18,7 @@ use std::time::{Duration, Instant};
 
 use cad_common::fixture;
 use exav_render::cad::{Drawing, EntityKind, ProxyItem};
-use exav_render::dwg::{Document, Tessellator};
+use exav_render::dwg::{Document, FILL_EDGE, Tessellator};
 
 /// make.py's CASES, in order, then the record of the class's own type.
 const CASES: [&str; 18] = [
@@ -84,15 +84,31 @@ fn stats(t: &mut Tessellator<'_>, e: &exav_render::cad::Entity) -> Stats {
             s.bounds[3].max(y),
         ];
     };
+    // An arc stroke's curve, not its chord.
     for k in &t.scene.strokes {
-        point(k.x0, k.y0);
-        point(k.x1, k.y1);
+        for [a, b] in k.flatten(64) {
+            point(a[0], a[1]);
+            point(b[0], b[1]);
+        }
     }
     for f in &t.scene.fills {
         point(f.x, f.y);
     }
-    for k in &t.scene.strokes {
-        let len = (k.x1 - k.x0).hypot(k.y1 - k.y0);
+    // Not a fill's edges, which only anti-alias it and follow how it was
+    // cut into triangles.
+    for k in t
+        .scene
+        .strokes
+        .iter()
+        .filter(|k| (k.attr >> 16) as u8 != FILL_EDGE)
+    {
+        let chord = (k.x1 - k.x0).hypot(k.y1 - k.y0);
+        let sweep = 4.0 * f64::from(k.bulge).atan();
+        let len = if k.bulge == 0.0 {
+            chord
+        } else {
+            chord * (sweep / 2.0) / (sweep / 2.0).sin()
+        };
         s.length += len;
         let layer = t.layers[(k.attr & 0xffff) as usize].name.clone();
         *s.by
@@ -191,14 +207,16 @@ fn every_release_draws_the_streams_as_the_source_does() {
             };
             let diff = differences(w, g);
             // The converter's R13 to R2000 DWGs have no LWPOLYLINE chunk: it
-            // writes the wide segment's outline and fill, which an
-            // LWPOLYLINE's widths are not drawn as. (Its R13 DXF keeps the
-            // stream as it was.)
+            // writes the wide segment as its fill, and the arc as chords, a
+            // little shorter. (Its R13 DXF keeps the stream as it was.)
             if *name == "lwpolyline"
                 && path.ends_with(".dwg")
                 && matches!(v, "R13" | "R14" | "R2000")
             {
-                assert!(w.area == 0.0 && g.area > 7.0, "{path}: {w:?} {g:?}");
+                assert!(
+                    close(w.area, g.area) && close_to(g.length, w.length, 1e-3),
+                    "{path}: {w:?} {g:?}"
+                );
                 continue;
             }
             assert!(diff.is_empty(), "{path} {name}: {diff:?}");
@@ -266,8 +284,8 @@ fn the_converters_r12_entities_draw_what_the_streams_draw() {
     let (ours, theirs) = get("mesh");
     assert!(close_to(ours.length, 35.0, 1e-9), "{ours:?}");
     assert!(
-        theirs.is_some_and(|t| t.length == 0.0),
-        "R12's mesh is not drawn"
+        theirs.is_some_and(|t| close_to(t.length, 35.0, 1e-9)),
+        "R12's polygon mesh draws the same grid: {theirs:?}"
     );
     // The true colour is red, ACI 1 in R12; xline and ray wait for the
     // drawing's extents, so neither box has them.
@@ -279,15 +297,18 @@ fn the_converters_r12_entities_draw_what_the_streams_draw() {
             .sum::<f64>()
     };
     assert!(close_to(red(ours), 4.0, 1e-9) && theirs.is_some_and(|t| red(t) == red(ours)));
-    // Widths are not drawn: the centre lines (the converter: R12 faces).
+    // The segment with widths 1 to 2 over 5 is its band; the others their
+    // centre lines (the converter: R12 faces).
     let (ours, _) = get("lwpolyline");
     let bulge = 0.5f64;
     let chord = 10.0;
     let radius = chord / 2.0 / (2.0 * bulge.atan()).sin();
     let arc = radius * 4.0 * bulge.atan();
-    assert!(close_to(ours.length, 30.0 + arc + 15.0, 0.002), "{ours:?}");
+    assert!(close_to(ours.length, 30.0 + arc + 10.0, 0.002), "{ours:?}");
+    assert!(close_to(ours.area, 7.5, 1e-9), "{ours:?}");
     // Traits: a layer the stream names is that layer, ByBlock the block
-    // the entity is in (colour 7 here), the lineweight the stream's.
+    // the entity is in (colour 7 here), the lineweight the stream's, else
+    // the default 0.25 mm.
     let (ours, _) = get("traits");
     let on = |layer: &str, lw: u32| -> f64 {
         ours.by
@@ -297,7 +318,7 @@ fn the_converters_r12_entities_draw_what_the_streams_draw() {
             .sum()
     };
     assert!(
-        on("L1", 50) > 0.0 && on("0", 0) > 0.0 && on("L2", 0) > 0.0,
+        on("L1", 50) > 0.0 && on("0", 25) > 0.0 && on("L2", 25) > 0.0,
         "{ours:?}"
     );
 }
diff --git a/crates/exav-render/tests/cad_robust.rs b/crates/exav-render/tests/cad_robust.rs
index f97788fb..09b2dbb8 100644
--- a/crates/exav-render/tests/cad_robust.rs
+++ b/crates/exav-render/tests/cad_robust.rs
@@ -6,7 +6,7 @@ mod common;
 
 use std::time::{Duration, Instant};
 
-use exav_render::cad::{read_dxf, read_dxf_with, EntityKind, Error, Limits, WarningKind};
+use exav_render::cad::{EntityKind, Error, Limits, WarningKind, read_dxf, read_dxf_with};
 
 fn samples() -> [Vec<u8>; 3] {
     [
@@ -173,10 +173,11 @@ fn limits_bound_what_is_kept() {
     let points = "0\nPOINT\n8\n0\n".repeat(50);
     let d = read_dxf_with(&dxf(&points), &limits).expect("reads");
     assert_eq!(d.model_space().map(|b| b.entities.len()), Some(10));
-    assert!(d
-        .warnings
-        .iter()
-        .any(|w| w.kind == WarningKind::LimitReached));
+    assert!(
+        d.warnings
+            .iter()
+            .any(|w| w.kind == WarningKind::LimitReached)
+    );
 
     let lw = "0\nLWPOLYLINE\n8\n0\n".to_string() + &"10\n1\n20\n2\n".repeat(100);
     let d = read_dxf_with(&dxf(&lw), &limits).expect("reads");
diff --git a/crates/exav-render/tests/dwg.rs b/crates/exav-render/tests/dwg.rs
index 8973c785..2aec6a4e 100644
--- a/crates/exav-render/tests/dwg.rs
+++ b/crates/exav-render/tests/dwg.rs
@@ -9,7 +9,7 @@
 
 mod cad_common;
 
-use exav_render::dwg::{Document, Drawing, ParseError, FILL_BYTES, STROKE_BYTES};
+use exav_render::dwg::{Document, Drawing, FILL_BYTES, ParseError, STROKE_BYTES};
 
 /// A drawing of `tests/fixtures/dwg`, by file name without `.gz`.
 fn fixture(name: &str) -> Vec<u8> {
@@ -84,16 +84,13 @@ fn a_drawing_comes_back_as_it_was_written_in_dwg_and_dxf() {
                 && near(p[3], 0.0)),
             "{what}: the wall is one stroke from (0,0) to (100,0)"
         );
-        // The column, flattened: every point of its strokes on the circle.
+        // The column, as arc strokes of a quarter turn: their ends on the
+        // circle.
         let on_circle: Vec<_> = s
             .iter()
             .filter(|(p, l)| l == "WALLS" && !(near(p[1], 0.0) && near(p[3], 0.0)))
             .collect();
-        assert!(
-            on_circle.len() >= 16,
-            "{what}: {} column strokes",
-            on_circle.len()
-        );
+        assert_eq!(on_circle.len(), 4, "{what}: column strokes");
         for (p, _) in &on_circle {
             for (x, y) in [(p[0], p[1]), (p[2], p[3])] {
                 let r = ((x - 50.0).powi(2) + (y - 50.0).powi(2)).sqrt();
@@ -163,6 +160,136 @@ fn a_hatch_edge_on_an_ellipse_spans_its_angles() {
     }
 }
 
+/// A BLOCK control whose bit size is the whole record (as one writer's are)
+/// has handles that cannot be found; the block records are then the objects of
+/// their type, and the drawing is what it was.
+#[test]
+fn a_block_control_that_cannot_be_read_does_not_blank_the_drawing() {
+    let good = fixture("plan-R2000.dwg");
+    let whole = Document::parse(&good).unwrap().tessellate(None, None);
+    assert!(whole.stroke_count() > 0);
+
+    let dwg = exav_unpack::dwg::Dwg::open(&good).unwrap();
+    // The BLOCK control is the object of type 48.
+    let at = dwg
+        .object_map()
+        .iter()
+        .find(|(_, at)| dwg.type_at(*at) == Ok(48))
+        .expect("a BLOCK control")
+        .1;
+    // The record's size is a 2-byte modular short here; its bits start after
+    // it, with the object type (a BS of 10 bits for 48), then the bit size.
+    let size = usize::from(u16::from_le_bytes([good[at], good[at + 1]]));
+    assert!(size < 0x8000);
+    let bit_size_at = (at + 2) * 8 + 10;
+    let read = |bytes: &[u8]| {
+        (0..32).fold(0u64, |v, i| {
+            let p = bit_size_at + i;
+            v << 1 | u64::from(bytes[p / 8] >> (7 - p % 8) & 1)
+        })
+    };
+    let bit_size = u32::from_le_bytes(read(&good).to_be_bytes()[4..].try_into().unwrap());
+    assert!(
+        u64::from(bit_size) < size as u64 * 8,
+        "the position of the bit size: {bit_size}"
+    );
+    let mut bad = good.clone();
+    for (n, byte) in (size as u32 * 8).to_le_bytes().iter().enumerate() {
+        for bit in 0..8 {
+            let p = bit_size_at + n * 8 + bit;
+            let on = byte >> (7 - bit) & 1 == 1;
+            bad[p / 8] = bad[p / 8] & !(0x80 >> (p % 8)) | if on { 0x80 >> (p % 8) } else { 0 };
+        }
+    }
+    let doc = Document::parse(&bad).unwrap();
+    let d = doc.tessellate(None, None);
+    assert_eq!(d.stroke_count(), whole.stroke_count());
+    assert!(
+        doc.drawing()
+            .warnings
+            .iter()
+            .any(|w| w.message.contains("object map"))
+    );
+}
+
+/// An ELLIPSE is in world coordinates, and its extrusion says which way its
+/// parameter runs: a quarter from the end of the major axis goes up with +Z
+/// and down with -Z, and in a plane tilted about the x axis the minor axis
+/// (5 long) is seen from above 4 long.
+#[test]
+fn an_ellipse_is_drawn_in_the_plane_of_its_extrusion() {
+    let dxf = |extrusion: &str, end: &str| {
+        format!(
+            "0\nSECTION\n2\nENTITIES\n0\nELLIPSE\n8\n0\n10\n0.0\n20\n0.0\n30\n0.0\n11\n10.0\n21\n0.0\n\
+             31\n0.0\n{extrusion}40\n0.5\n41\n0.0\n42\n{end}\n0\nENDSEC\n0\nEOF\n"
+        )
+    };
+    let y_range = |text: String| {
+        let doc = Document::parse(text.as_bytes()).expect("parses");
+        let d = doc.tessellate(None, None);
+        let ys: Vec<f64> = strokes(&d).iter().flat_map(|(s, _)| [s[1], s[3]]).collect();
+        assert!(!ys.is_empty());
+        (
+            ys.iter().copied().fold(f64::INFINITY, f64::min),
+            ys.iter().copied().fold(f64::NEG_INFINITY, f64::max),
+        )
+    };
+    let quarter = "1.5707963267948966";
+    let (lo, hi) = y_range(dxf("210\n0.0\n220\n0.0\n230\n1.0\n", quarter));
+    assert!(lo > -1e-4 && (hi - 5.0).abs() < 1e-3, "{lo} {hi}");
+    let (lo, hi) = y_range(dxf("210\n0.0\n220\n0.0\n230\n-1.0\n", quarter));
+    assert!(hi < 1e-4 && (lo + 5.0).abs() < 1e-3, "{lo} {hi}");
+    let (lo, hi) = y_range(dxf("210\n0.0\n220\n-0.6\n230\n0.8\n", "6.283185307179586"));
+    assert!(
+        (lo + 4.0).abs() < 1e-3 && (hi - 4.0).abs() < 1e-3,
+        "{lo} {hi}"
+    );
+}
+
+/// An MTEXT's insertion point is in world coordinates, not in OCS like a
+/// TEXT's: with an extrusion of -Z and a text direction of -X it stays at
+/// (100, 50) and the text runs to its left; in a tilted plane it is not moved
+/// by the plane's frame either (it was drawn at x = -100, and at y = 40).
+#[test]
+fn an_mtext_insertion_is_in_world_coordinates() {
+    let dxf = |extrusion: &str, direction: &str| {
+        format!(
+            "0\nSECTION\n2\nENTITIES\n0\nMTEXT\n8\n0\n10\n100.0\n20\n50.0\n30\n0.0\n40\n2.0\n71\n1\n\
+             1\nHELLO\n{extrusion}{direction}0\nENDSEC\n0\nEOF\n"
+        )
+    };
+    let range = |text: String| {
+        let doc = Document::parse(text.as_bytes()).expect("parses");
+        let d = doc.tessellate(None, None);
+        let s = strokes(&d);
+        assert!(!s.is_empty());
+        let fold = |f: &dyn Fn(&[f64; 4]) -> [f64; 2]| {
+            let v: Vec<f64> = s.iter().flat_map(|(c, _)| f(c)).collect();
+            (
+                v.iter().copied().fold(f64::INFINITY, f64::min),
+                v.iter().copied().fold(f64::NEG_INFINITY, f64::max),
+            )
+        };
+        (fold(&|c| [c[0], c[2]]), fold(&|c| [c[1], c[3]]))
+    };
+    let ((x0, x1), (y0, y1)) = range(dxf(
+        "210\n0.0\n220\n0.0\n230\n-1.0\n",
+        "11\n-1.0\n21\n0.0\n31\n0.0\n",
+    ));
+    assert!(
+        x0 > 92.0 && x1 < 100.5 && y0 > 47.5 && y1 < 50.5,
+        "{x0} {x1} {y0} {y1}"
+    );
+    let ((x0, x1), (y0, y1)) = range(dxf(
+        "210\n0.0\n220\n-0.6\n230\n0.8\n",
+        "11\n1.0\n21\n0.0\n31\n0.0\n",
+    ));
+    assert!(
+        x0 > 99.5 && x1 < 108.0 && y0 > 47.5 && y1 < 50.5,
+        "{x0} {x1} {y0} {y1}"
+    );
+}
+
 #[test]
 fn an_unknown_layout_draws_model_space() {
     let parsed = Document::parse(&fixture("plan.dwg")).unwrap();
@@ -524,3 +651,30 @@ fn a_corpus_of_real_drawings_reads_cleanly() {
     }
     eprintln!("{read} read, {refused} refused, of {}", files.len());
 }
+
+/// Entities a reader drops at its limit are part of the drawing left out, and
+/// the drawing says so with the warning of a scene cut short: a viewer that
+/// capped the entities without saying would show a plan missing rooms.
+#[test]
+fn a_drawing_cut_at_the_entity_limit_says_so() {
+    let mut dxf = String::from("  0\nSECTION\n  2\nENTITIES\n");
+    for i in 0..10 {
+        dxf.push_str(&format!("  0\nLINE\n 10\n{i}\n 20\n0\n 11\n{i}\n 21\n1\n"));
+    }
+    dxf.push_str("  0\nENDSEC\n  0\nEOF\n");
+    let whole = Document::parse(dxf.as_bytes())
+        .unwrap()
+        .tessellate(None, None);
+    assert_eq!(whole.strokes.len() / STROKE_BYTES, 10);
+    assert_eq!(whole.warnings.scene_truncated, 0);
+
+    let limits = exav_render::cad::Limits {
+        max_entities: 4,
+        ..exav_render::cad::Limits::default()
+    };
+    let cut = Document::parse_with(dxf.as_bytes(), &limits)
+        .unwrap()
+        .tessellate(None, None);
+    assert_eq!(cut.strokes.len() / STROKE_BYTES, 4);
+    assert!(cut.warnings.scene_truncated > 0);
+}
diff --git a/crates/exav-render/tests/dwg_fidelity.rs b/crates/exav-render/tests/dwg_fidelity.rs
new file mode 100644
index 00000000..717e8a6a
--- /dev/null
+++ b/crates/exav-render/tests/dwg_fidelity.rs
@@ -0,0 +1,831 @@
+//! What drawings show beyond their lines: widths, sheets, clipping, the
+//! entities AutoCAD draws its own way. Each on a drawing of
+//! `tests/fixtures/dwg/make.py` built to show it, checked against the
+//! geometry the script put in.
+
+#![cfg(feature = "dwg")]
+
+mod cad_common;
+
+use exav_render::dwg::{Document, Drawing, FILL_BYTES, FILL_EDGE, STROKE_BYTES};
+
+fn fixture(name: &str) -> Document {
+    let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("tests/fixtures/dwg")
+        .join(format!("{name}.gz"));
+    let gz = std::fs::read(&path).unwrap_or_else(|e| panic!("{}: {e}", path.display()));
+    Document::parse(&cad_common::gunzip(&gz)).unwrap_or_else(|e| panic!("{name}: {e}"))
+}
+
+fn fixture_bytes(name: &str) -> Vec<u8> {
+    let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("tests/fixtures/dwg")
+        .join(format!("{name}.gz"));
+    cad_common::gunzip(&std::fs::read(&path).unwrap_or_else(|e| panic!("{}: {e}", path.display())))
+}
+
+fn f32_at(b: &[u8], i: usize) -> f64 {
+    f64::from(f32::from_le_bytes(b[i..i + 4].try_into().unwrap()))
+}
+
+/// Every stroke as world-space endpoints and its lineweight.
+fn strokes(d: &Drawing) -> Vec<([f64; 4], u8)> {
+    d.strokes
+        .as_chunks::<STROKE_BYTES>()
+        .0
+        .iter()
+        .map(|s| {
+            let (ox, oy) = (d.origin[0], d.origin[1]);
+            let attr = u32::from_le_bytes(s[20..24].try_into().unwrap());
+            (
+                [
+                    f32_at(s, 0) + ox,
+                    f32_at(s, 4) + oy,
+                    f32_at(s, 8) + ox,
+                    f32_at(s, 12) + oy,
+                ],
+                (attr >> 16) as u8,
+            )
+        })
+        .collect()
+}
+
+/// Every fill triangle, in world coordinates.
+fn triangles(d: &Drawing) -> Vec<[[f64; 2]; 3]> {
+    d.fills
+        .as_chunks::<{ FILL_BYTES * 3 }>()
+        .0
+        .iter()
+        .map(|t| {
+            let p = |v: usize| {
+                let at = v * FILL_BYTES;
+                [f32_at(t, at) + d.origin[0], f32_at(t, at + 4) + d.origin[1]]
+            };
+            [p(0), p(1), p(2)]
+        })
+        .collect()
+}
+
+fn area(tris: &[[[f64; 2]; 3]]) -> f64 {
+    tris.iter()
+        .map(|[a, b, c]| {
+            ((b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1])).abs() / 2.0
+        })
+        .sum()
+}
+
+/// A polyline with width is a filled band: the 10 by 2 band, the donut's
+/// annulus, the taper's triangle, each where the script drew it.
+#[test]
+fn wide_polylines_fill_their_bands() {
+    let d = fixture("wide.dxf").tessellate(None, None);
+    let tris = triangles(&d);
+    let within = |x0: f64, x1: f64, y0: f64, y1: f64| -> Vec<[[f64; 2]; 3]> {
+        tris.iter()
+            .copied()
+            .filter(|t| {
+                t.iter()
+                    .all(|p| p[0] >= x0 && p[0] <= x1 && p[1] >= y0 && p[1] <= y1)
+            })
+            .collect()
+    };
+    let band = area(&within(-0.1, 10.1, -1.1, 1.1));
+    assert!((band - 20.0).abs() < 1e-3, "band {band}");
+    let donut = area(&within(43.9, 56.1, -6.1, 6.1));
+    // Radius 4, width 2: from 3 to 5.
+    let annulus = std::f64::consts::PI * (25.0 - 9.0);
+    assert!(
+        (donut / annulus - 1.0).abs() < 0.01,
+        "donut {donut} vs {annulus}"
+    );
+    let taper = area(&within(-0.1, 10.1, 17.9, 22.1));
+    assert!((taper - 20.0).abs() < 1e-3, "taper {taper}");
+    // Not drawn as lines too: the only strokes are the edges that
+    // anti-alias the bands.
+    assert!(
+        strokes(&d).iter().all(|(_, lw)| *lw == FILL_EDGE),
+        "the bands are not also drawn as lines"
+    );
+}
+
+/// A layout's lineweight is a width on its sheet: the renderer needs the
+/// sheet's millimetres per unit, 25.4 for one set up in inches.
+#[test]
+fn a_sheet_says_what_its_units_are_in_millimetres() {
+    let doc = fixture("sheets.dxf");
+    assert_eq!(doc.tessellate(Some("Metric"), None).sheet.mm_per_unit, 1.0);
+    assert_eq!(
+        doc.tessellate(Some("Imperial"), None).sheet.mm_per_unit,
+        25.4
+    );
+    assert_eq!(doc.tessellate(None, None).sheet.mm_per_unit, 0.0);
+    let json: serde_json::Value =
+        serde_json::from_str(&doc.tessellate(Some("Imperial"), None).sheet_json()).unwrap();
+    assert_eq!(json["mmPerUnit"], 25.4);
+    // The paper: the layout's limits, an A4 sheet in landscape.
+    let metric = doc.tessellate(Some("Metric"), None);
+    assert_eq!(metric.sheet.paper, Some([0.0, 0.0, 297.0, 210.0]));
+    assert_eq!(doc.tessellate(None, None).sheet.paper, None);
+    // The 2.11 mm line is there to measure it by.
+    let d = doc.tessellate(Some("Imperial"), None);
+    assert!(strokes(&d).iter().any(|(_, lw)| *lw == 211));
+}
+
+/// The text records, as (string, clip region).
+fn texts(d: &Drawing) -> Vec<(String, u16)> {
+    d.texts
+        .chunks(exav_render::dwg::TEXT_RECORD_BYTES)
+        .map(|r| {
+            let at = u32::from_le_bytes(r[32..36].try_into().unwrap()) as usize;
+            let len = u16::from_le_bytes(r[36..38].try_into().unwrap()) as usize;
+            let s = String::from_utf8_lossy(&d.text_strings[at..at + len]).into_owned();
+            (s, u16::from_le_bytes(r[46..48].try_into().unwrap()))
+        })
+        .collect()
+}
+
+/// A text crossing a viewport's edge is kept and drawn through the
+/// viewport's window as a clip region; one wholly outside is left out.
+#[test]
+fn a_text_crossing_a_viewports_edge_is_clipped_to_its_window() {
+    let d = fixture("viewport_text.dxf").tessellate(Some("Sheet"), None);
+    let t = texts(&d);
+    let crossing = t
+        .iter()
+        .find(|(s, _)| s == "CLIPPED TEXT RUNS ON")
+        .expect("kept");
+    assert!(crossing.1 > 0, "{t:?}");
+    assert!(!t.iter().any(|(s, _)| s == "OUTSIDE"), "{t:?}");
+    // The region: the viewport's window on the sheet, 80 to 120 by 90 to 110.
+    let r = regions(&d);
+    assert_eq!(r.len(), 1);
+    assert_eq!(bounds(&r[0]), [80.0, 90.0, 120.0, 110.0]);
+}
+
+/// Each clip region's triangle corners, in world coordinates.
+fn regions(d: &Drawing) -> Vec<Vec<[f64; 2]>> {
+    let mut out = Vec::new();
+    let mut at = 0;
+    while at + 4 <= d.clips.len() {
+        let count = u32::from_le_bytes(d.clips[at..at + 4].try_into().unwrap()) as usize;
+        at += 4;
+        let corners = (0..count * 3)
+            .map(|i| {
+                let p = at + i * 8;
+                [
+                    f32_at(&d.clips, p) + d.origin[0],
+                    f32_at(&d.clips, p + 4) + d.origin[1],
+                ]
+            })
+            .collect();
+        at += count * 24;
+        out.push(corners);
+    }
+    out
+}
+
+/// Bounds of points, rounded to 1e-3.
+fn bounds(ps: &[[f64; 2]]) -> [f64; 4] {
+    let lo = |i: usize| ps.iter().map(|p| p[i]).fold(f64::INFINITY, f64::min);
+    let hi = |i: usize| ps.iter().map(|p| p[i]).fold(f64::NEG_INFINITY, f64::max);
+    [lo(0), lo(1), hi(0), hi(1)].map(|v| (v * 1000.0).round() / 1000.0)
+}
+
+/// An XCLIPped insert shows only what is inside its boundary: lines cut at
+/// it, its xlines ending at it, its texts drawn through it. The boundary is
+/// in block coordinates (A), or in world coordinates with the inverse insert
+/// matrix (B); with clipping off (C) the block is whole.
+#[test]
+fn an_xclipped_insert_shows_only_what_is_inside_its_boundary() {
+    for name in ["xclip.dxf", "xclip.dwg", "xclip-R2000.dwg"] {
+        eprintln!("{name}");
+        xclipped(name);
+    }
+}
+
+fn xclipped(name: &str) {
+    let d = fixture(name).tessellate(None, None);
+    let all = strokes(&d);
+    let near = |a: [f64; 2], b: [f64; 2]| (a[0] - b[0]).abs() < 1e-3 && (a[1] - b[1]).abs() < 1e-3;
+    let has = |a: [f64; 2], b: [f64; 2]| {
+        all.iter().any(|(s, _)| {
+            let (p, q) = ([s[0], s[1]], [s[2], s[3]]);
+            (near(p, a) && near(q, b)) || (near(p, b) && near(q, a))
+        })
+    };
+    let around = |x0: f64, x1: f64| -> Vec<[f64; 2]> {
+        all.iter()
+            .filter(|(s, _)| s[0] > x0 && s[0] < x1)
+            .flat_map(|(s, _)| [[s[0], s[1]], [s[2], s[3]]])
+            .collect()
+    };
+
+    // A: the rectangle 80..100 by 0..20, and its frame.
+    assert_eq!(bounds(&around(60.0, 120.0)), [80.0, 0.0, 100.0, 20.0]);
+    assert!(has([100.0, 0.0], [80.0, 20.0]), "the diagonal, cut");
+    assert!(has([90.0, 0.0], [90.0, 20.0]), "the xline, cut");
+    assert!(has([80.0, 0.0], [80.0, 20.0]), "the frame");
+
+    // B: the triangle (280,0) (300,0) (300,20).
+    let b = around(260.0, 320.0);
+    let inside =
+        |p: &[f64; 2]| p[0] <= 300.0 + 1e-3 && p[1] >= -1e-3 && p[1] <= p[0] - 280.0 + 1e-3;
+    assert!(b.iter().all(inside), "{b:?}");
+    assert!(has([300.0, 0.0], [290.0, 10.0]), "the diagonal, cut");
+    assert!(has([290.0, 0.0], [290.0, 10.0]), "the xline, cut");
+
+    // C: whole.
+    assert!(has([510.0, -10.0], [470.0, 30.0]), "the diagonal");
+    let xline = all
+        .iter()
+        .find(|(s, _)| (s[0] - 490.0).abs() < 1e-3 && (s[2] - 490.0).abs() < 1e-3);
+    let xline = xline.expect("the xline").0;
+    assert!((xline[3] - xline[1]).abs() > 40.0, "{xline:?}");
+
+    // The texts: A's and B's through their boundaries, C's as it is.
+    let t: Vec<u16> = texts(&d).into_iter().map(|(_, clip)| clip).collect();
+    assert_eq!(t.len(), 3, "{t:?}");
+    let r = regions(&d);
+    let mut clipped: Vec<[f64; 4]> = t
+        .iter()
+        .filter(|&&c| c > 0)
+        .map(|&c| bounds(&r[c as usize - 1]))
+        .collect();
+    clipped.sort_by(|a, b| a[0].total_cmp(&b[0]));
+    assert_eq!(
+        clipped,
+        [[80.0, 0.0, 100.0, 20.0], [280.0, 0.0, 300.0, 20.0]]
+    );
+    assert_eq!(t.iter().filter(|&&c| c == 0).count(), 1);
+}
+
+/// An entity's transparency holds whatever its colour: the line in its
+/// layer's grey is at half opacity.
+#[test]
+fn transparency_holds_for_a_bylayer_colour() {
+    for name in ["transparency.dxf", "transparency.dwg"] {
+        let d = fixture(name).tessellate(None, None);
+        let grey = d
+            .strokes
+            .as_chunks::<STROKE_BYTES>()
+            .0
+            .iter()
+            .find(|s| (f32_at(s.as_slice(), 4) + d.origin[1] + 40.0).abs() < 1e-3)
+            .unwrap_or_else(|| panic!("{name}: the grey line"));
+        let rgba = u32::from_le_bytes(grey[16..20].try_into().unwrap());
+        assert_eq!(rgba.to_le_bytes(), [65, 65, 65, 127], "{name}");
+    }
+}
+
+/// What is not drawn is said by type, and the files external references
+/// name; an xref shows its path where it is inserted.
+#[test]
+fn what_is_not_drawn_is_said() {
+    for name in ["not_drawn.dxf", "not_drawn.dwg"] {
+        eprintln!("{name}");
+        not_drawn(name);
+    }
+}
+
+fn not_drawn(name: &str) {
+    let d = fixture(name).tessellate(None, None);
+    let w: serde_json::Value = serde_json::from_str(&d.warnings_json()).unwrap();
+    assert_eq!(w["unknownEntities"], 3);
+    assert_eq!(
+        w["notDrawn"],
+        serde_json::json!({"3DSOLID": 2, "REGION": 1})
+    );
+    assert_eq!(w["externalReferences"], 3);
+    assert_eq!(
+        w["externalFiles"],
+        serde_json::json!(["photo.png", "walls.dwg"])
+    );
+    // In the STANDARD style's stroke font, 2.5 high: a row of strokes from
+    // each insertion point.
+    let all = strokes(&d);
+    for x in [10.0, 50.0] {
+        let glyphs: Vec<[f64; 4]> = all
+            .iter()
+            .map(|(s, _)| *s)
+            .filter(|s| [s[0], s[2]].iter().all(|v| (x - 0.1..x + 30.0).contains(v)))
+            .filter(|s| [s[1], s[3]].iter().all(|v| (9.9..13.0).contains(v)))
+            .collect();
+        assert!(glyphs.len() > 20, "at {x}: {glyphs:?}");
+    }
+}
+
+/// A title block that is a scaled xref, as on every sheet of a real set,
+/// leaves its path where it is inserted: at $TEXTSIZE times the scale in model
+/// space, but on a sheet no taller than a hundredth of the paper.
+#[test]
+fn the_path_of_a_missing_xref_fits_the_sheet() {
+    let doc = fixture("xref_sheet.dxf");
+    let top = |d: &Drawing| {
+        let ys = strokes(d).into_iter().flat_map(|(s, _)| [s[1], s[3]]);
+        ys.fold(f64::MIN, f64::max)
+    };
+    // 40 high at (10,10): its capitals reach well past y 40.
+    let model = doc.tessellate(None, None);
+    assert!(top(&model) > 40.0, "model space: {}", top(&model));
+    // The sheet is 210 high: 2.1 at most, from y 1.
+    let sheet = doc.tessellate(Some("Sheet"), None);
+    let t = top(&sheet);
+    assert!((2.0..4.0).contains(&t), "sheet: {t}");
+}
+
+/// The frame drawn for an image that cannot be loaded is its crop, not the
+/// whole picture: pixels count from the top left, y down.
+#[test]
+fn an_image_frame_follows_its_crop() {
+    let d = fixture("image_crops.dxf").tessellate(None, None);
+    let all = strokes(&d);
+    let bounds = |left: bool| {
+        let pts: Vec<[f64; 2]> = all
+            .iter()
+            .filter(|(s, _)| (s[0] < 150.0) == left)
+            .flat_map(|(s, _)| [[s[0], s[1]], [s[2], s[3]]])
+            .collect();
+        let fold =
+            |f: fn(f64, f64) -> f64, i: usize, init: f64| pts.iter().fold(init, |m, p| f(m, p[i]));
+        (
+            [fold(f64::min, 0, f64::MAX), fold(f64::min, 1, f64::MAX)],
+            [fold(f64::max, 0, f64::MIN), fold(f64::max, 1, f64::MIN)],
+            pts.len() / 2,
+        )
+    };
+    // Pixels 10..60 by 20..70 of a 100 by 200 picture, centres on 0.5.
+    assert_eq!(bounds(true), ([10.5, 129.5], [60.5, 179.5], 4));
+    // The triangle (10,20) (60,20) (60,70), three edges, at x + 200.
+    assert_eq!(bounds(false), ([210.5, 129.5], [260.5, 179.5], 3));
+}
+
+/// A reference the host has the file of is drawn where it is inserted, in the
+/// names AutoCAD gives what it brings, and the references it makes are asked
+/// for in turn.
+#[test]
+fn a_bound_xref_is_drawn_where_it_is_inserted() {
+    let limits = exav_render::cad::Limits::default();
+    let mut doc = fixture("xref_sheet.dxf");
+    assert_eq!(doc.xref_paths(), ["title.dwg"]);
+    let bottoms = |d: &Drawing| {
+        strokes(d)
+            .into_iter()
+            .filter(|(s, _)| {
+                [s[1], s[3]] == [10.0, 10.0]
+                    && (s[0] - 10.0).abs() < 1e-3
+                    && (s[2] - 110.0).abs() < 1e-3
+            })
+            .count()
+    };
+    assert_eq!(bottoms(&doc.tessellate(None, None)), 0, "nothing bound yet");
+
+    // Not a name any reference has, and then the one that is, in any case.
+    let title = fixture_bytes("xref_title.dxf");
+    assert_eq!(doc.attach_xref("other.dwg", &title, &limits).unwrap(), 0);
+    assert_eq!(doc.attach_xref("TITLE.DWG", &title, &limits).unwrap(), 1);
+    assert_eq!(doc.xref_paths(), ["part.dwg"]);
+
+    // The frame, 100 by 50 from (10,10), on the layer the host calls
+    // TITLE|FRAME, which is red.
+    let d = doc.tessellate(None, None);
+    assert_eq!(bottoms(&d), 1, "its bottom edge");
+    let right = strokes(&d).into_iter().any(|(s, _)| {
+        (s[0] - 110.0).abs() < 1e-3 && (s[1] - 10.0).abs() < 1e-3 && (s[3] - 60.0).abs() < 1e-3
+    });
+    assert!(right, "its right edge");
+    let layer = d
+        .layers
+        .iter()
+        .find(|l| l.name == "TITLE|FRAME")
+        .expect("the layer");
+    assert_eq!(layer.rgba.to_le_bytes(), [255, 0, 0, 255]);
+    // The block MARK, a circle of radius 2 at (60,35).
+    let circle = strokes(&d)
+        .iter()
+        .any(|(s, _)| ((s[0] - 60.0).hypot(s[1] - 35.0) - 2.0).abs() < 1e-2);
+    assert!(circle, "the circle of MARK");
+
+    // The part it refers to, a line from (30,30) to (37,37) in green.
+    assert_eq!(
+        doc.attach_xref("part.dwg", &fixture_bytes("xref_part.dxf"), &limits)
+            .unwrap(),
+        1
+    );
+    assert!(doc.xref_paths().is_empty());
+    let d = doc.tessellate(None, None);
+    let line = strokes(&d)
+        .into_iter()
+        .any(|(s, _)| (s[0] - 30.0).abs() < 1e-3 && (s[3] - 37.0).abs() < 1e-3);
+    assert!(line, "the part");
+    assert!(d.layers.iter().any(|l| l.name == "TITLE|PART|PARTLINE"));
+
+    // On the sheet it is at the insert's scale of 10, from (1,1).
+    let sheet = doc.tessellate(Some("Sheet"), None);
+    let wide = strokes(&sheet)
+        .into_iter()
+        .any(|(s, _)| (s[0] - 1.0).abs() < 1e-3 && (s[2] - 1001.0).abs() < 1e-3);
+    assert!(wide, "its edge, 1000 wide");
+}
+
+/// Files that name each other are bound down to a depth and no further.
+#[test]
+fn references_in_a_loop_stop_at_a_depth() {
+    let limits = exav_render::cad::Limits::default();
+    let mut doc = fixture("xref_sheet.dxf");
+    // title.dwg names part.dwg, and here part.dwg is title.dwg again.
+    let title = fixture_bytes("xref_title.dxf");
+    let mut rounds = 0;
+    while let Some(path) = doc.xref_paths().first().cloned() {
+        assert_eq!(doc.attach_xref(&path, &title, &limits).unwrap(), 1);
+        rounds += 1;
+        assert!(rounds < 30, "it does not stop");
+    }
+    assert_eq!(rounds, 8);
+}
+
+/// A wipeout's boundary counts pixels of a 1 by 1 image from the top left, y
+/// down: the triangle with its right angle at the bottom left stays so.
+#[test]
+fn a_wipeout_is_not_mirrored() {
+    let d = fixture("wipeout_triangle.dxf").tessellate(None, None);
+    // The closing vertex a file repeats leaves a degenerate triangle: only
+    // the corners matter.
+    let mut corners: Vec<[f64; 2]> = triangles(&d).into_iter().flatten().collect();
+    corners.sort_by(|a, b| a.partial_cmp(b).unwrap());
+    corners.dedup();
+    let want = [[100.0, 200.0], [100.0, 210.0], [140.0, 200.0]];
+    assert_eq!(corners.len(), 3, "{corners:?}");
+    for (c, w) in corners.iter().zip(want) {
+        assert!(
+            (c[0] - w[0]).abs() < 1e-3 && (c[1] - w[1]).abs() < 1e-3,
+            "{corners:?}"
+        );
+    }
+}
+
+/// A pattern too dense to draw line by line is its region in a half tone,
+/// not some lines and a gap; one spaced under a unit still records its
+/// spacing, so the renderer fades its lines once they crowd a pixel.
+#[test]
+fn dense_hatches_keep_their_tone() {
+    let d = fixture("dense_hatch.dxf").tessellate(None, None);
+    let red: Vec<[[f64; 2]; 3]> = triangles(&d)
+        .into_iter()
+        .zip(d.fills.as_chunks::<{ FILL_BYTES * 3 }>().0)
+        .filter(|(_, t)| t[8..12] == [255, 0, 0, 128])
+        .map(|(t, _)| t)
+        .collect();
+    assert!((area(&red) - 1_000_000.0).abs() < 1.0, "{}", area(&red));
+    assert!(
+        strokes(&d).iter().all(|(s, _)| s[0] >= 1999.0),
+        "no red lines"
+    );
+    let flags: Vec<u8> = d
+        .strokes
+        .as_chunks::<STROKE_BYTES>()
+        .0
+        .iter()
+        .map(|s| s[23])
+        .collect();
+    assert!(
+        !flags.is_empty() && flags.iter().all(|f| f & 0x7F != 0),
+        "{flags:?}"
+    );
+}
+
+/// The strokes inside a box, as segments.
+fn segments_in(d: &Drawing, min: [f64; 2], max: [f64; 2]) -> Vec<[f64; 4]> {
+    let inside = |x: f64, y: f64| x >= min[0] && x <= max[0] && y >= min[1] && y <= max[1];
+    strokes(d)
+        .into_iter()
+        .map(|(s, _)| s)
+        .filter(|s| inside(s[0], s[1]) && inside(s[2], s[3]))
+        .collect()
+}
+
+/// What used to be left out or drawn plain: a 3DFACE's hidden edges, point
+/// styles, meshes, feature control frames, leader arrows.
+#[test]
+fn faces_points_meshes_tolerances_and_arrows_are_drawn() {
+    for name in ["gaps.dxf", "gaps.dwg"] {
+        eprintln!("{name}");
+        gaps(name);
+    }
+}
+
+fn gaps(name: &str) {
+    let d = fixture(name).tessellate(None, None);
+    let near = |a: f64, b: f64| (a - b).abs() < 1e-3;
+    let has = |segs: &[[f64; 4]], s: [f64; 4]| {
+        segs.iter().any(|t| {
+            (near(t[0], s[0]) && near(t[1], s[1]) && near(t[2], s[2]) && near(t[3], s[3]))
+                || (near(t[0], s[2]) && near(t[1], s[3]) && near(t[2], s[0]) && near(t[3], s[1]))
+        })
+    };
+
+    // The face: its second and fourth edges only.
+    let face = segments_in(&d, [-1.0, -1.0], [11.0, 11.0]);
+    assert_eq!(face.len(), 2, "{face:?}");
+    assert!(has(&face, [10.0, 0.0, 10.0, 10.0]) && has(&face, [0.0, 10.0, 0.0, 0.0]));
+
+    // The point: a cross and a circle, 2 across.
+    let point = segments_in(&d, [98.0, -2.0], [102.0, 2.0]);
+    assert!(has(&point, [99.0, -1.0, 101.0, 1.0]) && has(&point, [99.0, 1.0, 101.0, -1.0]));
+    assert!(point.len() > 10, "the circle");
+
+    // Each cube's twelve edges (seen from above they overlap in pairs and
+    // fours, which are still twelve segments), the grid's twelve.
+    for x in [200.0, 400.0] {
+        let cube = segments_in(&d, [x - 1.0, -1.0], [x + 2.0, 2.0]);
+        assert_eq!(cube.len(), 12, "at {x}: {cube:?}");
+    }
+    assert_eq!(segments_in(&d, [299.0, -1.0], [303.0, 3.0]).len(), 12);
+
+    // The frame: three boxes 3 high (2 and a gap of 0.5 each side) about
+    // y 0 from x 500.
+    let frame = segments_in(&d, [499.0, -2.0], [540.0, 2.0]);
+    let tops = frame
+        .iter()
+        .filter(|s| near(s[1], 1.5) && near(s[3], 1.5))
+        .count();
+    assert_eq!(tops, 3, "{frame:?}");
+    assert!(frame.iter().any(|s| near(s[0], 500.0) && near(s[2], 500.0)));
+
+    // The leader's dot about its tip, not a triangle down the leader.
+    let tris = triangles(&d);
+    let dot: Vec<[f64; 2]> = tris
+        .iter()
+        .flatten()
+        .copied()
+        .filter(|p| (p[0] - 600.0).abs() < 3.0 && p[1].abs() < 3.0)
+        .collect();
+    let lo = |i: usize| dot.iter().map(|p| p[i]).fold(f64::INFINITY, f64::min);
+    let hi = |i: usize| dot.iter().map(|p| p[i]).fold(f64::NEG_INFINITY, f64::max);
+    assert!(
+        !dot.is_empty() && near(lo(0) + hi(0), 1200.0) && near(lo(1) + hi(1), 0.0),
+        "{dot:?}"
+    );
+    // The multileader's arrow, 3 long, at its tip.
+    let arrow: Vec<[f64; 2]> = tris
+        .iter()
+        .flatten()
+        .copied()
+        .filter(|p| (p[0] - 701.5).abs() < 2.0 && p[1].abs() < 2.0)
+        .collect();
+    assert!(
+        arrow.iter().any(|p| near(p[0], 700.0) && near(p[1], 0.0)),
+        "{arrow:?}"
+    );
+}
+
+/// A line left at the origin of a plan in national grid coordinates no
+/// longer pulls the f32 origin and the fitted view halfway to it: the plan
+/// keeps its precision (a circle 0.5 across stays one) and fills the view;
+/// the stray is still drawn.
+#[test]
+fn a_stray_far_off_does_not_cost_the_drawing_its_precision() {
+    let d = fixture("stray.dxf").tessellate(None, None);
+    let (x0, y0) = (38_985_257.0, 5_800_000.0);
+    assert!(
+        (d.origin[0] - x0).abs() < 200.0 && (d.origin[1] - y0).abs() < 200.0,
+        "{:?}",
+        d.origin
+    );
+    let e = d.extents;
+    assert!(e[2] - e[0] < 200.0 && e[3] - e[1] < 200.0, "{e:?}");
+    let centre = [x0 + 50.25, y0 + 50.25];
+    let ring: Vec<f64> = strokes(&d)
+        .iter()
+        .flat_map(|(s, _)| [[s[0], s[1]], [s[2], s[3]]])
+        .map(|p| (p[0] - centre[0]).hypot(p[1] - centre[1]))
+        .filter(|r| (*r - 0.5).abs() < 0.2)
+        .collect();
+    // Four quarter arcs, their eight ends on the circle.
+    assert!(
+        ring.len() == 8 && ring.iter().all(|r| (r - 0.5).abs() < 1e-3),
+        "{ring:?}"
+    );
+    // The stray keeps a f32's precision 39 million units off: a few units.
+    assert!(
+        strokes(&d)
+            .iter()
+            .any(|(s, _)| s[0].abs() < 8.0 && s[1].abs() < 8.0),
+        "the stray"
+    );
+}
+
+/// PLINEGEN carries a polyline's dashes on across its vertices; without
+/// it, each segment starts its pattern with a dash.
+#[test]
+fn plinegen_says_whether_dashes_run_on_across_vertices() {
+    for name in ["plinegen.dxf", "plinegen.dwg"] {
+        let d = fixture(name).tessellate(None, None);
+        // The lowest dash up the second segment, from its corner.
+        let first_up = |y: f64| {
+            strokes(&d)
+                .iter()
+                .map(|(s, _)| *s)
+                .filter(|s| {
+                    (s[0] - 10.75).abs() < 1e-3
+                        && (s[2] - 10.75).abs() < 1e-3
+                        && s[1].min(s[3]) >= y - 1e-3
+                })
+                .map(|s| s[1].min(s[3]) - y)
+                .fold(f64::INFINITY, f64::min)
+        };
+        assert!(
+            (first_up(0.0) - 0.25).abs() < 1e-3,
+            "{name} carried on: {}",
+            first_up(0.0)
+        );
+        assert!(
+            first_up(20.0).abs() < 1e-3,
+            "{name} afresh: {}",
+            first_up(20.0)
+        );
+    }
+}
+
+/// AutoCAD's complex linetypes stamp ltypeshp.shx's shapes, and their text,
+/// at the end of the element carrying them, shifted by its offset.
+#[test]
+fn complex_linetypes_stamp_their_shapes_and_text() {
+    for name in ["complex_linetypes.dxf", "complex_linetypes.dwg"] {
+        eprintln!("{name}");
+        complex_linetypes(name);
+    }
+}
+
+fn complex_linetypes(name: &str) {
+    let d = fixture(name).tessellate(None, None);
+    let all: Vec<[f64; 4]> = strokes(&d).into_iter().map(|(s, _)| s).collect();
+    let near = |a: f64, b: f64| (a - b).abs() < 1e-4;
+    let has = |a: [f64; 2], b: [f64; 2]| {
+        all.iter().any(|t| {
+            (near(t[0], a[0]) && near(t[1], a[1]) && near(t[2], b[0]) && near(t[3], b[1]))
+                || (near(t[0], b[0]) && near(t[1], b[1]) && near(t[2], a[0]) && near(t[3], a[1]))
+        })
+    };
+
+    // FENCELINE2: a square 0.2 across over each gap of 0.2, at x 0.25 and 1.7.
+    for x in [0.25, 1.7] {
+        assert!(
+            has([x, -0.1], [x + 0.2, -0.1]) && has([x + 0.2, -0.1], [x + 0.2, 0.1]),
+            "box at {x}"
+        );
+        assert!(
+            has([x + 0.2, 0.1], [x, 0.1]) && has([x, 0.1], [x, -0.1]),
+            "box at {x}"
+        );
+    }
+    assert!(!has([3.15, -0.1], [3.35, -0.1]), "none past the line's end");
+
+    // FENCELINE1: a circle 0.2 across in the gap, as four quarter arcs.
+    for x in [0.35, 1.8] {
+        let ends = all
+            .iter()
+            .filter(|t| {
+                [[t[0], t[1]], [t[2], t[3]]]
+                    .iter()
+                    .all(|p| near((p[0] - x).hypot(p[1] - 10.0), 0.1))
+            })
+            .count();
+        assert_eq!(ends, 4, "circle at {x}");
+    }
+
+    // TRACKS: a tie 0.5 long every 0.3, from 0.15.
+    let ties = all
+        .iter()
+        .filter(|t| near(t[0], t[2]) && near(t[1].min(t[3]), 19.75) && near(t[1].max(t[3]), 20.25));
+    let mut xs: Vec<f64> = ties.map(|t| t[0]).collect();
+    xs.sort_by(f64::total_cmp);
+    assert_eq!(xs.len(), 10, "{xs:?}");
+    assert!(near(xs[0], 0.15) && near(xs[9], 2.85), "{xs:?}");
+
+    // ZIGZAG: a tooth 0.4 wide up, then one down, turned half a turn.
+    assert!(
+        has([0.0001, 30.0], [0.2001, 30.2]) && has([0.2001, 30.2], [0.4001, 30.0]),
+        "up"
+    );
+    assert!(
+        has([0.8001, 30.0], [0.6001, 29.8]) && has([0.6001, 29.8], [0.4001, 30.0]),
+        "down"
+    );
+
+    // BATTING: an arch on its two legs above the line, then one below.
+    assert!(
+        has([0.0001, 40.0], [-0.0999, 40.2]) && has([0.3001, 40.2], [0.2001, 40.0]),
+        "above"
+    );
+    assert!(
+        has([0.4001, 40.0], [0.5001, 39.8]) && has([0.1001, 39.8], [0.2001, 40.0]),
+        "below"
+    );
+
+    // GAS_LINE: its text 0.1 back from the end of the gap after each dash,
+    // 0.05 below the line.
+    let gas: Vec<[f64; 2]> = d
+        .texts
+        .chunks(exav_render::dwg::TEXT_RECORD_BYTES)
+        .map(|r| [f32_at(r, 0) + d.origin[0], f32_at(r, 4) + d.origin[1]])
+        .collect();
+    assert!(
+        gas.iter().any(|p| near(p[0], 0.6) && near(p[1], 49.95)),
+        "{gas:?}"
+    );
+    assert!(
+        gas.iter().any(|p| near(p[0], 1.55) && near(p[1], 49.95)),
+        "{gas:?}"
+    );
+}
+
+/// A dimension saved without its block is drawn from its definition points
+/// and style: extension and dimension lines, arrowheads or ticks, arcs, and
+/// its measurement written as the style says.
+#[test]
+fn a_dimension_without_its_block_is_drawn_from_its_definition() {
+    let d = fixture("dimensions.dxf").tessellate(None, None);
+    let w: serde_json::Value = serde_json::from_str(&d.warnings_json()).unwrap();
+    assert_eq!(w["missingBlocks"], 0);
+    let all: Vec<[f64; 4]> = strokes(&d).into_iter().map(|(s, _)| s).collect();
+    let near = |a: f64, b: f64| (a - b).abs() < 1e-3;
+    let has = |a: [f64; 2], b: [f64; 2]| {
+        all.iter().any(|t| {
+            (near(t[0], a[0]) && near(t[1], a[1]) && near(t[2], b[0]) && near(t[3], b[1]))
+                || (near(t[0], b[0]) && near(t[1], b[1]) && near(t[2], a[0]) && near(t[3], a[1]))
+        })
+    };
+
+    // The texts: two places, trailing zeros off, a comma; R and the
+    // diameter sign before a radius and a diameter; halves rounded up.
+    let mut t: Vec<String> = texts(&d).into_iter().map(|(s, _)| s).collect();
+    t.sort();
+    assert_eq!(
+        t,
+        [
+            "100",
+            "101",
+            "112,25 mm",
+            "45,00°",
+            "50",
+            "800",
+            "90,00°",
+            "R30",
+            "Ø50"
+        ]
+    );
+
+    // Linear: extension lines from 0.625 off the points to 1.25 past the
+    // dimension line on y 20, which is whole, its text above it.
+    assert!(has([0.0, 0.625], [0.0, 21.25]) && has([100.0, 0.625], [100.0, 21.25]));
+    assert!(has([0.0, 20.0], [100.0, 20.0]));
+    let tips = |x: f64, y: f64| {
+        triangles(&d)
+            .iter()
+            .flatten()
+            .any(|p| near(p[0], x) && near(p[1], y))
+    };
+    assert!(tips(0.0, 20.0) && tips(100.0, 20.0), "arrowheads");
+
+    // Ticks: no arrowheads, 45 degree strokes 1.5 across, the line run 1.25
+    // past them and broken about its text.
+    assert!(!tips(0.0, -30.0));
+    assert!(has([-0.75, -30.75], [0.75, -29.25]) && has([99.75, -30.75], [101.25, -29.25]));
+    let line: Vec<&[f64; 4]> = all
+        .iter()
+        .filter(|s| near(s[1], -30.0) && near(s[3], -30.0))
+        .collect();
+    assert_eq!(line.len(), 2, "{line:?}");
+    let ends: Vec<f64> = line.iter().flat_map(|s| [s[0], s[2]]).collect();
+    assert!(
+        ends.iter().any(|x| near(*x, -1.25)) && ends.iter().any(|x| near(*x, 101.75)),
+        "{ends:?}"
+    );
+    assert!(
+        ends.iter().all(|x| (x - 50.25).abs() > 2.0),
+        "the gap about the text: {ends:?}"
+    );
+
+    // Angles: an arc about the vertex through the point given, from leg to
+    // leg: a quarter turn, then an eighth.
+    let r = 800f64.sqrt();
+    assert!(has([600.0 + r, 0.0], [600.0, r]), "90 degrees");
+    let r = 725f64.sqrt();
+    let h = std::f64::consts::FRAC_1_SQRT_2 * r;
+    assert!(has([700.0 + r, 0.0], [700.0 + h, h]), "45 degrees");
+
+    // The ordinate's line from 0.625 above the feature to 1.25 past its end.
+    assert!(has([800.0, 10.625], [800.0, 41.25]));
+}
+
+/// `$LWDISPLAY` says whether the drawing is shown with its lineweights.
+#[test]
+fn a_drawing_says_whether_its_lineweights_are_shown() {
+    assert!(
+        fixture("sheets.dxf")
+            .tessellate(None, None)
+            .sheet
+            .lineweights
+    );
+    assert!(!fixture("wide.dxf").tessellate(None, None).sheet.lineweights);
+}
diff --git a/crates/exav-render/tests/dwg_memory.rs b/crates/exav-render/tests/dwg_memory.rs
new file mode 100644
index 00000000..66bda5a9
--- /dev/null
+++ b/crates/exav-render/tests/dwg_memory.rs
@@ -0,0 +1,88 @@
+//! How much memory tessellating a drawing takes at its peak, per stroke, on
+//! a drawing of 100,000 lines made here: the scene's lists, the buffers it
+//! hands over, and what building those takes, but not a copy of the lists.
+
+#![cfg(feature = "dwg")]
+
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use exav_render::dwg::{Document, STROKE_BYTES};
+
+struct Counting;
+
+static NOW: AtomicUsize = AtomicUsize::new(0);
+static PEAK: AtomicUsize = AtomicUsize::new(0);
+
+unsafe impl GlobalAlloc for Counting {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        let p = unsafe { System.alloc(layout) };
+        if !p.is_null() {
+            let now = NOW.fetch_add(layout.size(), Ordering::Relaxed) + layout.size();
+            PEAK.fetch_max(now, Ordering::Relaxed);
+        }
+        p
+    }
+
+    unsafe fn dealloc(&self, p: *mut u8, layout: Layout) {
+        unsafe { System.dealloc(p, layout) };
+        NOW.fetch_sub(layout.size(), Ordering::Relaxed);
+    }
+}
+
+#[global_allocator]
+static ALLOCATOR: Counting = Counting;
+
+/// The counters are the process's: one test measures at a time.
+static ONE_AT_A_TIME: std::sync::Mutex<()> = std::sync::Mutex::new(());
+
+#[test]
+fn an_entity_takes_what_the_limits_count() {
+    let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+    let mut dxf = String::from("  0\nSECTION\n  2\nENTITIES\n");
+    for _ in 0..100_000 {
+        dxf.push_str("  0\nLINE\n 10\n0\n 20\n0\n 11\n1\n 21\n1\n");
+    }
+    dxf.push_str("  0\nENDSEC\n  0\nEOF\n");
+    let before = NOW.load(Ordering::Relaxed);
+    let drawing = exav_render::cad::read_dxf(dxf.as_bytes()).unwrap();
+    let held = NOW.load(Ordering::Relaxed) - before;
+    // The allocator rounds each of an entity's strings up to a grain of its
+    // own, which the counter does not see.
+    let per_entity = held as u64 / 100_000 + 3 * 24;
+    assert!(
+        per_entity <= exav_render::cad::ENTITY_BYTES,
+        "{per_entity} bytes per entity held"
+    );
+    drop(drawing);
+}
+
+#[test]
+fn tessellating_takes_no_copy_of_the_scene() {
+    let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+    let mut dxf = String::from("  0\nSECTION\n  2\nENTITIES\n");
+    for i in 0..100_000 {
+        let (x, y) = ((i % 1000) as f64, (i / 1000) as f64);
+        dxf.push_str(&format!(
+            "  0\nLINE\n  8\n0\n 10\n{x}\n 20\n{y}\n 11\n{}\n 21\n{}\n",
+            x + 0.5,
+            y + 0.5
+        ));
+    }
+    dxf.push_str("  0\nENDSEC\n  0\nEOF\n");
+    let doc = Document::parse(dxf.as_bytes()).unwrap();
+    drop(dxf);
+
+    let before = NOW.load(Ordering::Relaxed);
+    PEAK.store(before, Ordering::Relaxed);
+    let d = doc.tessellate(None, None);
+    let strokes = d.strokes.len() / STROKE_BYTES;
+    assert_eq!(strokes, 100_000);
+    let per_stroke = (PEAK.load(Ordering::Relaxed) - before) / strokes;
+    // The scene's stroke (48 bytes, and a list's spare room), its encoding
+    // (28) and an index or two; a copy of the strokes would add 48.
+    assert!(
+        per_stroke < 125,
+        "{per_stroke} bytes per stroke at the peak"
+    );
+}
diff --git a/crates/exav-render/tests/dwg_text.rs b/crates/exav-render/tests/dwg_text.rs
new file mode 100644
index 00000000..d96ce2c2
--- /dev/null
+++ b/crates/exav-render/tests/dwg_text.rs
@@ -0,0 +1,294 @@
+//! How text is placed: frames that carry mirroring and stretching, the
+//! alignments, MTEXT's formatting. On drawings of
+//! `tests/fixtures/dwg/make.py`, checked against what the script put in.
+
+#![cfg(feature = "dwg")]
+
+mod cad_common;
+
+use exav_render::dwg::{Document, Drawing, STROKE_BYTES, TEXT_RECORD_BYTES};
+
+fn fixture(name: &str) -> Document {
+    let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("tests/fixtures/dwg")
+        .join(format!("{name}.gz"));
+    let gz = std::fs::read(&path).unwrap_or_else(|e| panic!("{}: {e}", path.display()));
+    Document::parse(&cad_common::gunzip(&gz)).unwrap_or_else(|e| panic!("{name}: {e}"))
+}
+
+fn f32_at(b: &[u8], i: usize) -> f64 {
+    f64::from(f32::from_le_bytes(b[i..i + 4].try_into().unwrap()))
+}
+
+/// A text record as the renderer gets it, in world coordinates.
+#[derive(Debug)]
+struct Run {
+    text: String,
+    at: [f64; 2],
+    u: [f64; 2],
+    v: [f64; 2],
+    h_align: u8,
+    v_align: u8,
+}
+
+fn runs(d: &Drawing) -> Vec<Run> {
+    d.texts
+        .chunks(TEXT_RECORD_BYTES)
+        .map(|r| {
+            let at = u32::from_le_bytes(r[32..36].try_into().unwrap()) as usize;
+            let len = u16::from_le_bytes(r[36..38].try_into().unwrap()) as usize;
+            Run {
+                text: String::from_utf8_lossy(&d.text_strings[at..at + len]).into_owned(),
+                at: [f32_at(r, 0) + d.origin[0], f32_at(r, 4) + d.origin[1]],
+                u: [f32_at(r, 8), f32_at(r, 12)],
+                v: [f32_at(r, 16), f32_at(r, 20)],
+                h_align: r[38],
+                v_align: r[39],
+            }
+        })
+        .collect()
+}
+
+fn run<'a>(all: &'a [Run], text: &str, near: [f64; 2]) -> &'a Run {
+    all.iter()
+        .filter(|r| r.text == text)
+        .min_by(|a, b| {
+            let d = |r: &Run| (r.at[0] - near[0]).hypot(r.at[1] - near[1]);
+            d(a).total_cmp(&d(b))
+        })
+        .unwrap_or_else(|| panic!("no {text:?} in {all:?}"))
+}
+
+/// Endpoints of the strokes inside a box.
+fn ink(d: &Drawing, min: [f64; 2], max: [f64; 2]) -> Vec<[f64; 2]> {
+    d.strokes
+        .as_chunks::<STROKE_BYTES>()
+        .0
+        .iter()
+        .flat_map(|s| {
+            let (ox, oy) = (d.origin[0], d.origin[1]);
+            [
+                [f32_at(s, 0) + ox, f32_at(s, 4) + oy],
+                [f32_at(s, 8) + ox, f32_at(s, 12) + oy],
+            ]
+        })
+        .filter(|p| p[0] >= min[0] && p[0] <= max[0] && p[1] >= min[1] && p[1] <= max[1])
+        .collect()
+}
+
+fn bounds(ps: &[[f64; 2]]) -> [f64; 4] {
+    let lo = |i: usize| ps.iter().map(|p| p[i]).fold(f64::INFINITY, f64::min);
+    let hi = |i: usize| ps.iter().map(|p| p[i]).fold(f64::NEG_INFINITY, f64::max);
+    [lo(0), lo(1), hi(0), hi(1)]
+}
+
+fn close(a: [f64; 2], b: [f64; 2]) -> bool {
+    (a[0] - b[0]).abs() < 1e-4 && (a[1] - b[1]).abs() < 1e-4
+}
+
+/// A block inserted mirrored mirrors its text; one stretched in x stretches
+/// it along the baseline only.
+#[test]
+fn a_blocks_scale_mirrors_and_stretches_its_text() {
+    let d = fixture("text_frames.dxf").tessellate(None, None);
+    let all = runs(&d);
+    let mirrored = run(&all, "LABEL", [100.0, 0.0]);
+    assert!(close(mirrored.at, [100.0, 0.0]), "{mirrored:?}");
+    assert!(
+        close(mirrored.u, [-2.5, 0.0]) && close(mirrored.v, [0.0, 2.5]),
+        "{mirrored:?}"
+    );
+    let stretched = run(&all, "LABEL", [100.0, 20.0]);
+    assert!(
+        close(stretched.u, [5.0, 0.0]) && close(stretched.v, [0.0, 2.5]),
+        "{stretched:?}"
+    );
+    // The stroke font's copy, drawn here: leftwards from the insertion.
+    let b = bounds(&ink(&d, [80.0, -6.0], [120.0, -1.0]));
+    assert!(b[2] <= 100.0 + 1e-6 && b[0] < 90.0, "{b:?}");
+}
+
+/// TEXT's generation flags: 2 backward, 4 upside down.
+#[test]
+fn backward_and_upside_down_text_is_mirrored() {
+    let d = fixture("text_frames.dxf").tessellate(None, None);
+    let all = runs(&d);
+    let back = run(&all, "BACKWARD", [150.0, 0.0]);
+    assert!(
+        close(back.u, [-2.5, 0.0]) && close(back.v, [0.0, 2.5]),
+        "{back:?}"
+    );
+    let upside = run(&all, "UPSIDE", [150.0, 10.0]);
+    assert!(
+        close(upside.u, [2.5, 0.0]) && close(upside.v, [0.0, -2.5]),
+        "{upside:?}"
+    );
+    let b = bounds(&ink(&d, [130.0, 19.0], [170.0, 24.0]));
+    assert!(b[2] <= 150.0 + 1e-6 && b[0] < 145.0, "{b:?}");
+}
+
+/// Bottom puts the descenders on the anchor: the baseline a third of the
+/// height above it in the stroke font. TEXT's MIDDLE centres capitals and
+/// descenders together. An outline run says Bottom; its renderer places it.
+#[test]
+fn bottom_and_middle_text_sit_where_autocad_puts_them() {
+    let d = fixture("text_frames.dxf").tessellate(None, None);
+    let low = bounds(&ink(&d, [199.0, 9.0], [215.0, 15.0]));
+    assert!((low[1] - 11.0).abs() < 0.05, "{low:?}");
+    // 3 high, descent 1: from 19 (baseline) to 22 (capitals).
+    let middle = bounds(&ink(&d, [190.0, 17.0], [215.0, 23.0]));
+    assert!(
+        (middle[1] - 19.0).abs() < 0.05 && (middle[3] - 22.0).abs() < 0.1,
+        "{middle:?}"
+    );
+    let all = runs(&d);
+    let bottom = run(&all, "BOTTOM", [200.0, 0.0]);
+    assert_eq!((bottom.h_align, bottom.v_align), (0, 1));
+}
+
+/// A symbol font's letters are the symbols they draw; text the stroke font
+/// cannot draw (Chinese in an SHX style) goes to an outline face; `%%nnn` is
+/// a character; a constant ATTDEF is drawn unless it is invisible.
+#[test]
+fn symbols_and_characters_the_stroke_font_lacks() {
+    let d = fixture("text_symbols.dxf").tessellate(None, None);
+    let all = runs(&d);
+    let texts: Vec<&str> = all.iter().map(|r| r.text.as_str()).collect();
+    assert!(
+        texts.contains(&"中文标注") && texts.contains(&"αβγ"),
+        "{texts:?}"
+    );
+    assert!(!texts.contains(&"abg"), "{texts:?}");
+    // "AB" in the stroke font, 2.5 high: about two capitals wide.
+    let ab = bounds(&ink(&d, [-1.0, 39.0], [20.0, 43.0]));
+    assert!(ab[2] > 2.5 && ab[2] < 6.0, "{ab:?}");
+    assert!(
+        !ink(&d, [-1.0, 59.0], [30.0, 63.0]).is_empty(),
+        "the constant ATTDEF"
+    );
+    assert!(
+        ink(&d, [-1.0, 54.0], [30.0, 58.0]).is_empty(),
+        "the invisible one"
+    );
+}
+
+fn order(r: &[u8], at: usize) -> u32 {
+    u32::from_le_bytes(r[at..at + 4].try_into().unwrap())
+}
+
+/// MTEXT takes its style's width factor and slant, `\W` `\Q` `\T` per run,
+/// `\pqc` centres a paragraph in the box, a stack is drawn small above and
+/// below a bar, and a multiline ATTRIB and a MULTILEADER's text are MTEXT.
+#[test]
+fn mtext_formatting_is_drawn() {
+    let d = fixture("text_mtext.dxf").tessellate(None, None);
+    let all = runs(&d);
+    let near = |a: f64, b: f64| (a - b).abs() < 1e-3;
+    let wide = run(&all, "WIDE MTEXT", [0.0, 0.0]);
+    assert!(
+        close(wide.u, [5.0, 0.0]) && close(wide.v, [0.0, 2.5]),
+        "{wide:?}"
+    );
+    let slanted = run(&all, "OBL MTEXT", [0.0, 10.0]);
+    assert!(
+        near(slanted.v[0], 2.5 * 30f64.to_radians().tan()),
+        "{slanted:?}"
+    );
+    let half = run(&all, "half", [0.0, 20.0]);
+    assert!(close(half.u, [1.25, 0.0]), "{half:?}");
+    let slant = run(&all, "slant", [0.0, 20.0]);
+    assert!(
+        near(slant.v[0], 2.5 * 20f64.to_radians().tan()),
+        "{slant:?}"
+    );
+    // Tracking 2: each letter its own run, twice its advance from the last.
+    let (t, r) = (run(&all, "t", [0.0, 20.0]), run(&all, "r", [0.0, 20.0]));
+    assert!(t.at[0] < r.at[0] && r.at[0] - t.at[0] > 2.0, "{t:?} {r:?}");
+
+    // The paragraph centred in its box 50 wide.
+    for line in ["centred", "a longer second line"] {
+        let l = run(&all, line, [25.0, 45.0]);
+        assert!(near(l.at[0], 25.0) && l.h_align == 1, "{l:?}");
+    }
+
+    // The stack (MTEXT hangs from its top: baseline 57.5): 0.7 of the
+    // height, about the capitals' middle (58.75).
+    let small: Vec<&Run> = all.iter().filter(|r| near(r.v[1], 1.75)).collect();
+    let y = |s: &str| small.iter().find(|r| r.text == s).unwrap().at[1];
+    assert!(
+        near(y("1"), 58.75 + 0.35) && near(y("2"), 58.75 - 0.35 - 1.75),
+        "{small:?}"
+    );
+    assert!(!ink(&d, [0.0, 58.7], [10.0, 58.8]).is_empty(), "the bar");
+
+    let multi = run(&all, "MULTI", [100.0, 55.0]);
+    let second = run(&all, "LINE ATTR", [100.0, 55.0]);
+    assert!(
+        near(multi.at[0], second.at[0]) && second.at[1] < multi.at[1],
+        "{multi:?} {second:?}"
+    );
+
+    let red = d
+        .texts
+        .chunks(TEXT_RECORD_BYTES)
+        .zip(&all)
+        .find(|(_, r)| r.text == "red");
+    assert_eq!(&red.unwrap().0[24..28], [255, 0, 0, 255]);
+}
+
+/// A masked MTEXT covers what is under it with its colour, or the drawing's
+/// background, a border of half its height around it, drawn just before
+/// its text; a framed one has the frame on top.
+#[test]
+fn an_mtext_mask_is_under_its_text_only() {
+    let d = fixture("text_mtext.dxf").tessellate(None, None);
+    let tris: Vec<&[u8]> = d.fills.chunks(exav_render::dwg::FILL_BYTES).collect();
+    let yellow: Vec<[f64; 2]> = tris
+        .iter()
+        .filter(|v| v[8..12] == [255, 255, 0, 255])
+        .map(|v| [f32_at(v, 0) + d.origin[0], f32_at(v, 4) + d.origin[1]])
+        .collect();
+    // From the baseline (27.5) to the capitals (30), and 1.25 around.
+    let b = bounds(&yellow);
+    assert!(
+        (b[0] + 1.25).abs() < 1e-3 && (b[1] - 26.25).abs() < 1e-3 && (b[3] - 31.25).abs() < 1e-3,
+        "{b:?}"
+    );
+    let masked = d
+        .texts
+        .chunks(TEXT_RECORD_BYTES)
+        .zip(runs(&d))
+        .find(|(_, r)| r.text == "MASKED")
+        .unwrap()
+        .0;
+    let mask = tris
+        .iter()
+        .find(|v| v[8..12] == [255, 255, 0, 255])
+        .unwrap();
+    assert_eq!(order(masked, 40), order(mask, 16) + 1);
+    // The framed one: the background (fill flag 1) and four sides.
+    assert!(
+        tris.iter()
+            .any(|v| v[15] == 1 && f32_at(v, 0) + d.origin[0] > 40.0)
+    );
+    let frame = bounds(&ink(&d, [45.0, 25.0], [80.0, 36.0]));
+    assert!(
+        (frame[0] - 48.75).abs() < 1e-3 && (frame[3] - 31.25).abs() < 1e-3,
+        "{frame:?}"
+    );
+}
+
+/// Aligned keeps the style's width factor and scales the height to the two
+/// points.
+#[test]
+fn aligned_text_keeps_its_width_factor() {
+    let d = fixture("text_frames.dxf").tessellate(None, None);
+    let all = runs(&d);
+    let wide = run(&all, "WIDE", [250.0, 0.0]);
+    let (u, v) = (wide.u[0].hypot(wide.u[1]), wide.v[0].hypot(wide.v[1]));
+    assert!((u / v - 2.0).abs() < 1e-4, "{wide:?}");
+    assert!(
+        close(wide.at, [250.0, 0.0]) && wide.h_align == 0,
+        "{wide:?}"
+    );
+}
diff --git a/crates/exav-render/tests/fixtures/dwg/circle.dxf.gz b/crates/exav-render/tests/fixtures/dwg/circle.dxf.gz
new file mode 100644
index 00000000..e8225960
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/circle.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/colours.dxf.gz b/crates/exav-render/tests/fixtures/dwg/colours.dxf.gz
new file mode 100644
index 00000000..5971d72f
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/colours.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/complex_linetypes.dwg.gz b/crates/exav-render/tests/fixtures/dwg/complex_linetypes.dwg.gz
new file mode 100644
index 00000000..9c8dd8d1
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/complex_linetypes.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/complex_linetypes.dxf.gz b/crates/exav-render/tests/fixtures/dwg/complex_linetypes.dxf.gz
new file mode 100644
index 00000000..86a6aa6d
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/complex_linetypes.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/dense_hatch.dxf.gz b/crates/exav-render/tests/fixtures/dwg/dense_hatch.dxf.gz
new file mode 100644
index 00000000..17609202
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/dense_hatch.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/dimensions.dxf.gz b/crates/exav-render/tests/fixtures/dwg/dimensions.dxf.gz
new file mode 100644
index 00000000..bf28e558
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/dimensions.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/gaps.dwg.gz b/crates/exav-render/tests/fixtures/dwg/gaps.dwg.gz
new file mode 100644
index 00000000..ee74c212
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/gaps.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/gaps.dxf.gz b/crates/exav-render/tests/fixtures/dwg/gaps.dxf.gz
new file mode 100644
index 00000000..e0d12854
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/gaps.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/halo.dxf.gz b/crates/exav-render/tests/fixtures/dwg/halo.dxf.gz
new file mode 100644
index 00000000..ac1de706
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/halo.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/image_crops.dxf.gz b/crates/exav-render/tests/fixtures/dwg/image_crops.dxf.gz
new file mode 100644
index 00000000..d6b9d306
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/image_crops.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/make.py b/crates/exav-render/tests/fixtures/dwg/make.py
index 9fec3441..212cd61e 100644
--- a/crates/exav-render/tests/fixtures/dwg/make.py
+++ b/crates/exav-render/tests/fixtures/dwg/make.py
@@ -23,6 +23,86 @@
   with DIMASZ 2.5 and DIMSCALE 2.
 - layouts: a line in model space and two layouts "A" and "B", each with one
   viewport onto it.
+- wide: LWPOLYLINEs with width: a 10 by 2 band, a donut and a taper.
+- sheets: layouts "Metric" (millimetres) and "Imperial" (inches), each with a
+  square an inch across and a line 2.11 mm wide.
+- viewport_text: a layout "Sheet" whose viewport (40 by 20 at 100,100)
+  shows model x -10 to 30 of a text running from 0 to about 60, and not a
+  second text at x 200.
+- xclip: a block TILE (base 5,5: a diagonal line, an xline, a text)
+  inserted at 2x and 90 degrees at x 100, 300 and 500, clipped to world
+  80..100 by 0..20, to a triangle (280,0) (300,0) (300,20), and with
+  clipping off.
+- transparency: at half opacity, a red hatch over a green line (x 40..60),
+  a blue V (150..250), a cyan hatch over magenta text (290..410), and a
+  line on layer GREY in its layer's colour (y -40); lineweights shown.
+- not_drawn: a line, two inserts of the xref WALLS (walls.dwg) at (10,10)
+  and (50,10), an image of photo.png, two 3DSOLIDs and a REGION.
+- image_crops: a 100 by 200 image at the origin cropped to the pixels
+  (10,20) (60,70), and one at x 200 cropped to a triangle.
+- xref_title, xref_part: the files xref_sheet's reference TITLE names
+  (title.dwg), and the one it refers to in turn (part.dwg, a line on layer
+  PARTLINE). title.dwg is a 100 by 50 frame on layer FRAME, a block MARK
+  (a circle of radius 2) at (50,25), a text in style LABELS and PART at
+  (20,20).
+- wipeout_triangle: a WIPEOUT over the triangle (100,200) (140,200) (100,210).
+- solid_only: one 3DSOLID, and an 8 by 8 red thumbnail.
+- text_frames: a block LABEL (an Arial "LABEL" and a stroke "STROKE" 5
+  below) inserted mirrored at x 100 and stretched twice in x at (100,20);
+  TEXT backward and upside down, 2.5 high, at (150,0) and (150,10), a
+  backward stroke "BACK" at (150,20); Bottom Left at (200,0) in Arial and
+  (200,10) in the stroke font, MIDDLE at (200,20), 3 high; "WIDE", 1 high,
+  width factor 2, Aligned from (250,0) to (270,0).
+- text_symbols: TEXT 2.5 high at x 0: Chinese in txt.shx with a bigfont (y
+  0), "abg" in greeks.shx (10) and in symbol.ttf (20), "n0.05" in gdt.shx
+  (30), "%%065%%066" (40); a block TAG at (0,60) with a constant ATTDEF
+  "CONSTANT" and a constant invisible one "SECRET" 5 below.
+- text_mtext: MTEXT 2.5 high in Arial at x 0: in a style of width factor 2
+  (y 0), one slanted 30 degrees (10), tracked, half-width and slanted runs
+  (20), masked in yellow at scale 1.5 (30; framed, in the drawing's
+  background, at x 50), a centred paragraph in a box 50 wide (50), "1" and a
+  stacked 1/2 (60); a multiline ATTRIB "MULTI" / "LINE ATTR" at (100,55); a
+  MULTILEADER whose text has a red "red".
+- text_many: every Latin, Greek and Cyrillic character in each of the
+  twelve bundled faces, centred at y +-1000 and beyond, and "HE" 10 high
+  centred on the origin.
+- dense_hatch: ANSI31 at scale 0.001 over a red square 1000 across, and at
+  0.01 over a blue square 1 across at x 2000.
+- gaps: a 3DFACE 10 square with its first and third edges hidden (x 0); a
+  POINT in $PDMODE 35 (a cross in a circle), $PDSIZE 2 (100); a unit cube as
+  a polyface mesh (200); a 3 by 3 polygon mesh (300); a unit cube MESH (400);
+  a TOLERANCE in a style 2 high with a gap of 0.5, "position | 0.05 | A"
+  (500); a LEADER whose style's leader arrow is _DOT, size 2, tip (600,0);
+  a MULTILEADER with an arrow of 3, tip (700,0).
+- halo: a red line 2.11 mm wide from (0,50) to (100,50), then a thin dark
+  grey (ACI 250) line across it from (50,-100) to (50,60); lineweights
+  shown.
+- stray: a 100 by 100 grid of lines from (38985257, 5800000), a circle of
+  radius 0.5 at its (50.25, 50.25), and a line from (0,0) to (1,1).
+- circle: a circle of radius 100 about the origin.
+- complex_linetypes: lines from x 0 to 2.9 at y 0, 10... 50 in acad.lin's
+  FENCELINE2, FENCELINE1, TRACKS, ZIGZAG, BATTING (ltypeshp.shx shapes) and
+  GAS_LINE (its text in Arial).
+- dimensions: dimensions saved without their block or text position, their
+  text in Arial, in a style ISO (text above, 2 places, trailing zeros off,
+  comma) unless said:
+  linear (0,0)-(100,0) on y 20; aligned (200,0)-(230,40) 10 off; radius 30
+  about (400,0) at 45 degrees; diameter 50 about (500,0); 90 degrees about
+  (600,0) by three points; 45 degrees between two lines from (700,0); an X
+  ordinate of (800,10) out to y 40; in a style TICKS (ticks, text on the
+  line, no places) (0,-50)-(100.5,-50) on y -30; "<> mm" for
+  (900,0)-(1012.25,0).
+- plinegen: an LWPOLYLINE from (0,0) to (10.75,0) to (10.75,10) in a
+  linetype of dashes and gaps of 0.5, with PLINEGEN; the same at y 20
+  without it.
+- colours: a yellow line (y 0) and a red one (y 20), 2.11 mm wide, and a
+  cyan fill from y 40 to 60; lineweights shown.
+- xref_sheet: $TEXTSIZE 40 and an xref TITLE (title.dwg) in model space at
+  (10,10) and, at scale 10 at (1,1), on a 297 by 210 layout "Sheet".
+
+ezdxf orders some objects by Python's string hashes: a run without
+PYTHONHASHSEED set rewrites the other files with their objects shuffled, the
+drawings the same.
 """
 
 import gzip
@@ -42,7 +122,14 @@
     "hatch7": ["ACAD2018"],
     "attribs": ["ACAD2018", "ACAD2000"],
     "layouts": ["ACAD2018"],
+    "xclip": ["ACAD2018", "ACAD2000"],
+    "transparency": ["ACAD2018"],
+    "not_drawn": ["ACAD2018"],
+    "gaps": ["ACAD2018"],
+    "plinegen": ["ACAD2018"],
+    "complex_linetypes": ["ACAD2018"],
 }
+# Not converted: dimensions, which the converter gives blocks.
 
 
 def new():
@@ -123,6 +210,444 @@ def layouts():
     return doc
 
 
+def wide():
+    doc = new()
+    msp = doc.modelspace()
+    # A 10 by 2 band, a DONUT (inside 6, outside 10, at 50,0) and an arrow
+    # tapering from 4 to 0 over 10.
+    msp.add_lwpolyline([(0, 0), (10, 0)], dxfattribs={"const_width": 2})
+    msp.add_lwpolyline([(46, 0, 2, 2, 1), (54, 0, 2, 2, 1)], format="xyseb", close=True)
+    msp.add_lwpolyline([(0, 20, 4, 0), (10, 20, 0, 0)], format="xyse")
+    return doc
+
+
+def sheets():
+    doc = new()
+    doc.header["$LWDISPLAY"] = 1
+    doc.modelspace().add_line((0, 0), (1, 1))
+    # A square of one inch, on a sheet in millimetres and on one in inches,
+    # beside a line 2.11 mm wide.
+    for name, units, side in (("Metric", "mm", 25.4), ("Imperial", "inch", 1.0)):
+        layout = doc.layouts.new(name)
+        size = (297, 210) if units == "mm" else (11, 8.5)
+        layout.page_setup(size=size, margins=(0, 0, 0, 0), units=units)
+        layout.add_lwpolyline([(0, 0), (side, 0), (side, side), (0, side)], close=True)
+        layout.add_line((0, -side), (side, -side), dxfattribs={"lineweight": 211})
+    return doc
+
+
+def viewport_text():
+    doc = new()
+    doc.styles.add("LABELS", font="arial.ttf")
+    msp = doc.modelspace()
+    # Text from x 0 to about 60, a viewport onto x -10 to 30 of it, and a
+    # second text wholly outside the window.
+    msp.add_text("CLIPPED TEXT RUNS ON", height=5, dxfattribs={"insert": (0, 0), "style": "LABELS"})
+    msp.add_text("OUTSIDE", height=5, dxfattribs={"insert": (200, 0), "style": "LABELS"})
+    layout = doc.layouts.new("Sheet")
+    layout.page_setup(size=(297, 210), margins=(0, 0, 0, 0), units="mm")
+    layout.add_viewport(center=(100, 100), size=(40, 20), view_center_point=(10, 2), view_height=20)
+    return doc
+
+
+def xclip():
+    from ezdxf.xclip import XClip
+
+    doc = new()
+    doc.styles.add("LABELS", font="arial.ttf")
+    tile = doc.blocks.new("TILE", base_point=(5, 5))
+    tile.add_line((0, 0), (20, 20))
+    tile.add_xline((10, 10), (1, 0))
+    tile.add_text("TILE TEXT RUNS ACROSS", height=2, dxfattribs={"insert": (6, 9), "style": "LABELS"})
+    msp = doc.modelspace()
+    attribs = {"xscale": 2, "yscale": 2, "rotation": 90}
+    a, b, c = (msp.add_blockref("TILE", (x, 0), dxfattribs=attribs) for x in (100, 300, 500))
+    # A: a rectangle in block coordinates, as ezdxf writes it.
+    XClip(a).set_block_clipping_path([(5, 5), (15, 15)])
+    # B: a triangle in world coordinates with the inverse insert matrix, as
+    # AutoCAD writes it.
+    XClip(b).set_block_clipping_path([(5, 5), (15, 15)])
+    f = XClip(b).get_spatial_filter()
+    f.set_boundary_vertices([(280, 0), (300, 0), (300, 20)])
+    m = b.matrix44()
+    m.inverse()
+    f.set_inverse_insert_matrix(m)
+    # C: clipping turned off.
+    XClip(c).set_block_clipping_path([(5, 5), (15, 15)])
+    XClip(c).disable_clipping()
+    return doc
+
+
+def transparency():
+    doc = new()
+    doc.header["$LWDISPLAY"] = 1
+    doc.styles.add("LABELS", font="arial.ttf")
+    doc.layers.add("GREY", color=8)
+    msp = doc.modelspace()
+    wide = {"lineweight": 211}
+    # A green line under a red hatch at half opacity, drawn after it.
+    msp.add_line((0, 0), (100, 0), dxfattribs={"color": 3, **wide})
+    red = msp.add_hatch(color=1)
+    red.paths.add_polyline_path([(40, -20), (60, -20), (60, 20), (40, 20)])
+    red.transparency = 0.5
+    # A blue V at half opacity, whose segments meet at (200,-20).
+    v = msp.add_lwpolyline([(150, 20), (200, -20), (250, 20)], dxfattribs={"color": 5, **wide})
+    v.transparency = 0.5
+    # Magenta text under a cyan hatch at half opacity.
+    msp.add_text("MMMM", height=20, dxfattribs={"insert": (300, -10), "style": "LABELS", "color": 6})
+    cyan = msp.add_hatch(color=4)
+    cyan.paths.add_polyline_path([(290, -20), (410, -20), (410, 20), (290, 20)])
+    cyan.transparency = 0.5
+    # A ByLayer colour at half opacity.
+    grey = msp.add_line((0, -40), (100, -40), dxfattribs={"layer": "GREY"})
+    grey.transparency = 0.5
+    return doc
+
+
+def not_drawn():
+    doc = new()
+    msp = doc.modelspace()
+    msp.add_line((0, 0), (100, 0))
+    doc.add_xref_def("walls.dwg", "WALLS")
+    msp.add_blockref("WALLS", (10, 10))
+    msp.add_blockref("WALLS", (50, 10))
+    photo = doc.add_image_def(filename="photo.png", size_in_pixel=(640, 360))
+    msp.add_image(photo, insert=(0, 20), size_in_units=(64, 36))
+    for body in (msp.add_3dsolid(), msp.add_3dsolid(), msp.add_region()):
+        acis(body)
+    return doc
+
+
+def xref_sheet():
+    doc = new()
+    doc.header["$TEXTSIZE"] = 40
+    doc.add_xref_def("title.dwg", "TITLE")
+    doc.modelspace().add_blockref("TITLE", (10, 10))
+    layout = doc.layouts.new("Sheet")
+    layout.page_setup(size=(297, 210), margins=(0, 0, 0, 0), units="mm")
+    layout.add_blockref("TITLE", (1, 1), dxfattribs={"xscale": 10, "yscale": 10, "zscale": 10})
+    return doc
+
+
+def image_crops():
+    doc = new()
+    msp = doc.modelspace()
+    photo = doc.add_image_def(filename="photo.png", size_in_pixel=(100, 200))
+    rect = msp.add_image(photo, insert=(0, 0), size_in_units=(100, 200))
+    rect.set_boundary_path([(10, 20), (60, 70)])
+    tri = msp.add_image(photo, insert=(200, 0), size_in_units=(100, 200))
+    tri.set_boundary_path([(10, 20), (60, 20), (60, 70)])
+    return doc
+
+
+def xref_title():
+    doc = new()
+    doc.layers.add("FRAME", color=1)
+    doc.styles.add("LABELS", font="arial.ttf")
+    mark = doc.blocks.new("MARK")
+    mark.add_circle((0, 0), 2)
+    msp = doc.modelspace()
+    msp.add_lwpolyline([(0, 0), (100, 0), (100, 50), (0, 50)], close=True, dxfattribs={"layer": "FRAME"})
+    msp.add_blockref("MARK", (50, 25))
+    msp.add_text("TITLE", height=5, dxfattribs={"style": "LABELS", "insert": (5, 5)})
+    doc.add_xref_def("part.dwg", "PART")
+    msp.add_blockref("PART", (20, 20))
+    return doc
+
+
+def xref_part():
+    doc = new()
+    doc.layers.add("PARTLINE", color=3)
+    doc.modelspace().add_line((0, 0), (7, 7), dxfattribs={"layer": "PARTLINE"})
+    return doc
+
+
+def wipeout_triangle():
+    doc = new()
+    msp = doc.modelspace()
+    msp.add_wipeout([(100, 200), (140, 200), (100, 210)])
+    return doc
+
+
+def acis(body):
+    # A unit cube: ezdxf leaves out a body without ACIS data, and the ODA
+    # converter refuses one that is not a real body.
+    from ezdxf.acis import api
+    from ezdxf.render import forms
+
+    api.export_dxf(body, [api.body_from_mesh(forms.cube())])
+
+
+def solid_only():
+    doc = new()
+    acis(doc.modelspace().add_3dsolid())
+    return doc
+
+
+def text_frames():
+    from ezdxf.enums import TextEntityAlignment
+
+    doc = new()
+    doc.styles.add("LABELS", font="arial.ttf")
+    doc.styles.add("WIDE", font="arial.ttf").dxf.width = 2.0
+    msp = doc.modelspace()
+    label = doc.blocks.new("LABEL")
+    label.add_text("LABEL", height=2.5, dxfattribs={"style": "LABELS", "insert": (0, 0)})
+    label.add_text("STROKE", height=2.5, dxfattribs={"insert": (0, -5)})
+    msp.add_blockref("LABEL", (100, 0), dxfattribs={"xscale": -1})
+    msp.add_blockref("LABEL", (100, 20), dxfattribs={"xscale": 2})
+    msp.add_text("BACKWARD", height=2.5, dxfattribs={"style": "LABELS", "insert": (150, 0), "text_generation_flag": 2})
+    msp.add_text("UPSIDE", height=2.5, dxfattribs={"style": "LABELS", "insert": (150, 10), "text_generation_flag": 4})
+    msp.add_text("BACK", height=3, dxfattribs={"insert": (150, 20), "text_generation_flag": 2})
+    msp.add_text("BOTTOM", height=3, dxfattribs={"style": "LABELS"}).set_placement(
+        (200, 0), align=TextEntityAlignment.BOTTOM_LEFT
+    )
+    msp.add_text("LOW", height=3).set_placement((200, 10), align=TextEntityAlignment.BOTTOM_LEFT)
+    msp.add_text("MIDDLE", height=3).set_placement((200, 20), align=TextEntityAlignment.MIDDLE)
+    msp.add_text("WIDE", height=1, dxfattribs={"style": "WIDE", "width": 2.0}).set_placement(
+        (250, 0), (270, 0), align=TextEntityAlignment.ALIGNED
+    )
+    return doc
+
+
+def text_symbols():
+    doc = new()
+    doc.styles.add("CN", font="txt.shx").dxf.bigfont = "gbcbig.shx"
+    doc.styles.add("GREEK", font="greeks.shx")
+    doc.styles.add("SYMB", font="symbol.ttf")
+    doc.styles.add("GDT", font="gdt.shx")
+    msp = doc.modelspace()
+    msp.add_text("中文标注", height=2.5, dxfattribs={"style": "CN", "insert": (0, 0)})
+    msp.add_text("abg", height=2.5, dxfattribs={"style": "GREEK", "insert": (0, 10)})
+    msp.add_text("abg", height=2.5, dxfattribs={"style": "SYMB", "insert": (0, 20)})
+    msp.add_text("n0.05", height=2.5, dxfattribs={"style": "GDT", "insert": (0, 30)})
+    msp.add_text("%%065%%066", height=2.5, dxfattribs={"insert": (0, 40)})
+    tag = doc.blocks.new("TAG")
+    tag.add_attdef("SHOWN", (0, 0), "CONSTANT", dxfattribs={"height": 2.5, "flags": 2})
+    tag.add_attdef("HIDDEN", (0, -5), "SECRET", dxfattribs={"height": 2.5, "flags": 3})
+    msp.add_blockref("TAG", (0, 60))
+    return doc
+
+
+def text_mtext():
+    from ezdxf.math import Vec2
+    from ezdxf.render import mleader
+
+    doc = new()
+    doc.styles.add("LABELS", font="arial.ttf")
+    doc.styles.add("WIDE", font="arial.ttf").dxf.width = 2.0
+    doc.styles.add("OBL", font="arial.ttf").dxf.oblique = 30
+    msp = doc.modelspace()
+
+    def mtext(s, at, **attribs):
+        return msp.add_mtext(s, dxfattribs={"insert": at, "char_height": 2.5, "style": "LABELS", **attribs})
+
+    mtext("WIDE MTEXT", (0, 0), style="WIDE")
+    mtext("OBL MTEXT", (0, 10), style="OBL")
+    mtext(r"{\T2;tracked} {\W0.5;half} {\Q20;slant}", (0, 20))
+    mtext("MASKED", (0, 30)).set_bg_color(2, scale=1.5)
+    mtext("FRAMED", (50, 30)).set_bg_color("canvas", scale=1.5, text_frame=True)
+    mtext(r"\pxqc;centred\Pa longer second line", (0, 50), width=50)
+    mtext(r"1\S1/2;", (0, 60))
+    label = doc.blocks.new("LBL")
+    label.add_attdef("TAG", (0, 0), dxfattribs={"height": 2.5, "style": "LABELS"})
+    insert = msp.add_blockref("LBL", (100, 60))
+    attrib = insert.add_attrib("TAG", "x", insert=(100, 55), dxfattribs={"height": 2.5, "style": "LABELS"})
+    embedded = ezdxf.entities.MText.new(dxfattribs={"insert": (100, 55), "char_height": 2.5, "style": "LABELS"})
+    embedded.text = r"MULTI\PLINE ATTR"
+    attrib.embed_mtext(embedded)
+    leader = msp.add_multileader_mtext("Standard")
+    leader.set_content(r"ML {\C1;red} text", char_height=2.5, style="LABELS")
+    leader.add_leader_line(mleader.ConnectionSide.left, [Vec2(200, 10), Vec2(195, 5)])
+    leader.build(insert=Vec2(205, 15))
+    return doc
+
+
+def text_many():
+    doc = new()
+    msp = doc.modelspace()
+    # Every Latin, Greek and Cyrillic character in each of the twelve
+    # bundled faces, far above and below: more cells than the atlas budget
+    # affords at a large em.
+    chars = "".join(chr(c) for c in [*range(0x21, 0x250), *range(0x391, 0x3CA), *range(0x410, 0x450)])
+    fonts = [
+        "arial.ttf", "arialbd.ttf", "ariali.ttf", "arialbi.ttf",
+        "times.ttf", "timesbd.ttf", "timesi.ttf", "timesbi.ttf",
+        "cour.ttf", "courbd.ttf", "couri.ttf", "courbi.ttf",
+    ]
+    for i, font in enumerate(fonts):
+        doc.styles.add(f"F{i}", font=font)
+        for y in (1000 + i * 10, -1000 - i * 10):
+            msp.add_text(chars, height=1, dxfattribs={"style": f"F{i}"}).set_placement(
+                (0, y), align=ezdxf.enums.TextEntityAlignment.CENTER
+            )
+    msp.add_text("HE", height=10, dxfattribs={"style": "F0"}).set_placement(
+        (0, 0), align=ezdxf.enums.TextEntityAlignment.MIDDLE_CENTER
+    )
+    return doc
+
+
+def dense_hatch():
+    doc = new()
+    msp = doc.modelspace()
+    # ANSI31 at a thousandth over 1000 units: millions of lines.
+    dense = msp.add_hatch()
+    dense.set_pattern_fill("ANSI31", color=1, scale=0.001)
+    dense.paths.add_polyline_path([(0, 0), (1000, 0), (1000, 1000), (0, 1000)])
+    # At a hundredth over one unit: lines 0.03 apart, some forty of them.
+    fine = msp.add_hatch()
+    fine.set_pattern_fill("ANSI31", color=5, scale=0.01)
+    fine.paths.add_polyline_path([(2000, 0), (2001, 0), (2001, 1), (2000, 1)])
+    return doc
+
+
+def gaps():
+    from ezdxf.math import Vec2
+    from ezdxf.render import forms, mleader
+
+    doc = new()
+    doc.header["$PDMODE"] = 35
+    doc.header["$PDSIZE"] = 2
+    msp = doc.modelspace()
+    # A square face with its first and third edges hidden.
+    msp.add_3dface([(0, 0), (10, 0), (10, 10), (0, 10)], dxfattribs={"invisible_edges": 5})
+    # A point as a cross in a circle, 2 across.
+    msp.add_point((100, 0))
+    # A unit cube as a polyface mesh, a 3 by 3 polygon mesh and a MESH.
+    cube = forms.cube().translate(200, 0, 0)
+    face = msp.add_polyface()
+    face.append_faces([[cube.vertices[i] for i in f] for f in cube.faces])
+    grid = msp.add_polymesh((3, 3))
+    for i in range(3):
+        for j in range(3):
+            grid.set_mesh_vertex((i, j), (300 + j, i, 0))
+    mesh = msp.add_mesh()
+    with mesh.edit_data() as data:
+        data.vertices = [(x + 400, y, z) for x, y, z in forms.cube().vertices]
+        data.faces = list(forms.cube().faces)
+    # A feature control frame: position, 0.05, datum A.
+    doc.dimstyles.new("TOL", dxfattribs={"dimtxt": 2, "dimgap": 0.5, "dimscale": 1})
+    msp.new_entity("TOLERANCE", {"insert": (500, 0), "dimstyle": "TOL", "content": r"{\Fgdt;j}%%v0.05%%vA"})
+    # A leader whose style draws a dot.
+    doc.dimstyles.new("DOTS", dxfattribs={"dimasz": 2})
+    doc.dimstyles.get("DOTS").set_arrows(ldrblk="DOT")
+    msp.add_leader([(600, 0), (610, 10), (620, 10)], dimstyle="DOTS")
+    leader = msp.add_multileader_mtext("Standard")
+    leader.set_content("NOTE", char_height=2.5)
+    leader.set_arrow_properties(size=3)
+    leader.add_leader_line(mleader.ConnectionSide.left, [Vec2(700, 0)])
+    leader.build(insert=Vec2(710, 10))
+    return doc
+
+
+def halo():
+    doc = new()
+    doc.header["$LWDISPLAY"] = 1
+    msp = doc.modelspace()
+    # A wide red line, then a thin black one across it whose middle, lower
+    # down, puts it in an earlier spatial bucket: drawn first, behind.
+    msp.add_line((0, 50), (100, 50), dxfattribs={"color": 1, "lineweight": 211})
+    msp.add_line((50, -100), (50, 60), dxfattribs={"color": 250})
+    return doc
+
+
+def stray():
+    doc = new()
+    msp = doc.modelspace()
+    # A plan in national grid coordinates, a circle 0.5 across in it, and
+    # one line forgotten at the origin.
+    x0, y0 = 38_985_257.0, 5_800_000.0
+    for i in range(100):
+        msp.add_line((x0 + i, y0), (x0 + i, y0 + 99))
+        msp.add_line((x0, y0 + i), (x0 + 99, y0 + i))
+    msp.add_circle((x0 + 50.25, y0 + 50.25), 0.5)
+    msp.add_line((0, 0), (1, 1))
+    return doc
+
+
+def plinegen():
+    doc = new()
+    doc.linetypes.add("HALF", pattern=[1.0, 0.5, -0.5])
+    msp = doc.modelspace()
+    # The pattern reaches the corner in a gap: carried on (PLINEGEN, at
+    # y 0), the second segment starts with it; started afresh (y 20), with a
+    # dash.
+    for y, flags in ((0, 128), (20, 0)):
+        lw = msp.add_lwpolyline([(0, y), (10.75, y), (10.75, y + 10)], dxfattribs={"linetype": "HALF"})
+        lw.dxf.flags = flags
+    return doc
+
+
+def colours():
+    doc = new()
+    doc.header["$LWDISPLAY"] = 1
+    msp = doc.modelspace()
+    # A yellow line and a red one, wide enough to measure, and a cyan fill.
+    msp.add_line((0, 0), (100, 0), dxfattribs={"color": 2, "lineweight": 211})
+    msp.add_line((0, 20), (100, 20), dxfattribs={"color": 1, "lineweight": 211})
+    fill = msp.add_hatch(color=4)
+    fill.paths.add_polyline_path([(0, 40), (100, 40), (100, 60), (0, 60)])
+    return doc
+
+
+def circle():
+    doc = new()
+    doc.modelspace().add_circle((0, 0), 100)
+    return doc
+
+
+def dimensions():
+    doc = new()
+    doc.styles.add("DIMS", font="arial.ttf")
+    common = {"dimasz": 2.5, "dimtxt": 2.5, "dimexo": 0.625, "dimexe": 1.25, "dimgap": 0.625, "dimtxsty": "DIMS"}
+    doc.dimstyles.new("ISO", dxfattribs={**common, "dimtad": 1, "dimdec": 2, "dimzin": 8, "dimdsep": 44})
+    doc.dimstyles.new("TICKS", dxfattribs={**common, "dimtad": 0, "dimdec": 0, "dimtsz": 1.5, "dimdle": 1.25})
+    msp = doc.modelspace()
+    # Not rendered: no block, no text position, as some generators write them.
+    iso = {"dimstyle": "ISO"}
+    msp.add_linear_dim(base=(50, 20), p1=(0, 0), p2=(100, 0), **iso)
+    msp.add_aligned_dim(p1=(200, 0), p2=(230, 40), distance=10, **iso)
+    msp.add_radius_dim(center=(400, 0), radius=30, angle=45, **iso)
+    msp.add_diameter_dim(center=(500, 0), radius=25, angle=0, **iso)
+    msp.add_angular_dim_3p(base=(620, 20), center=(600, 0), p1=(650, 0), p2=(600, 50), **iso)
+    msp.add_angular_dim_2l(base=(725, 10), line1=((700, 0), (760, 0)), line2=((700, 0), (742.4264, 42.4264)), **iso)
+    msp.add_ordinate_x_dim(feature_location=(800, 10), offset=(0, 30), **iso)
+    msp.add_linear_dim(base=(50, -30), p1=(0, -50), p2=(100.5, -50), dimstyle="TICKS")
+    mm = msp.add_linear_dim(base=(950, 20), p1=(900, 0), p2=(1012.25, 0), **iso).dimension
+    mm.dxf.text = "<> mm"
+    return doc
+
+
+def complex_linetypes():
+    doc = new()
+    doc.styles.add("LABELS", font="arial.ttf")
+    msp = doc.modelspace()
+    # acad.lin's definitions, with ltypeshp.shx's shape numbers for names.
+    types = [
+        ("FENCELINE2", "A,.25,-.1,[132,ltypeshp.shx,x=-.1,s=.1],-.1,1", 1.45),
+        ("FENCELINE1", "A,.25,-.1,[133,ltypeshp.shx,x=-.1,s=.1],-.1,1", 1.45),
+        ("TRACKS", "A,.15,[130,ltypeshp.shx,s=.25],.15", 0.3),
+        ("ZIGZAG", "A,.0001,-.2,[131,ltypeshp.shx,x=-.2,s=.2],-.4,[131,ltypeshp.shx,r=180,x=.2,s=.2],-.2", 0.8001),
+        ("BATTING", "A,.0001,-.1,[134,ltypeshp.shx,x=-.1,s=.1],-.2,[134,ltypeshp.shx,r=180,x=.1,s=.1],-.1", 0.4001),
+        ("GAS_LINE", 'A,.5,-.2,["GAS",LABELS,S=.1,R=0.0,X=-0.1,Y=-.05],-.25', 0.95),
+    ]
+    for i, (name, pattern, length) in enumerate(types):
+        doc.linetypes.add(name, pattern=pattern, length=length, description=name)
+        msp.add_line((0, 10 * i), (2.9, 10 * i), dxfattribs={"linetype": name})
+    return doc
+
+
+def thumbnail(data):
+    """A THUMBNAILIMAGE section before EOF: an 8 by 8 red bitmap."""
+    w = h = 8
+    header = (40).to_bytes(4, "little") + w.to_bytes(4, "little") + h.to_bytes(4, "little")
+    header += (1).to_bytes(2, "little") + (24).to_bytes(2, "little") + bytes(24)
+    dib = header + bytes([0, 0, 255]) * (w * h)
+    section = f"  0\nSECTION\n  2\nTHUMBNAILIMAGE\n 90\n{len(dib)}\n310\n{dib.hex().upper()}\n  0\nENDSEC\n"
+    at = data.rindex(b"  0\nEOF")
+    return data[:at] + section.encode() + data[at:]
+
+
 DRAWINGS = {
     "plan": plan,
     "hostile": hostile,
@@ -131,6 +656,31 @@ def layouts():
     "attribs": attribs,
     "leader": leader,
     "layouts": layouts,
+    "wide": wide,
+    "sheets": sheets,
+    "viewport_text": viewport_text,
+    "xclip": xclip,
+    "transparency": transparency,
+    "not_drawn": not_drawn,
+    "xref_sheet": xref_sheet,
+    "image_crops": image_crops,
+    "xref_title": xref_title,
+    "xref_part": xref_part,
+    "wipeout_triangle": wipeout_triangle,
+    "solid_only": solid_only,
+    "text_frames": text_frames,
+    "text_symbols": text_symbols,
+    "text_mtext": text_mtext,
+    "text_many": text_many,
+    "dense_hatch": dense_hatch,
+    "gaps": gaps,
+    "halo": halo,
+    "stray": stray,
+    "circle": circle,
+    "complex_linetypes": complex_linetypes,
+    "dimensions": dimensions,
+    "plinegen": plinegen,
+    "colours": colours,
 }
 
 
@@ -172,6 +722,8 @@ def convert(sources):
         data = dxf_bytes(make())
         if name == "hostile":
             data = data.replace(b"HOSTILENAME", b'Q"\\\t\x01')
+        if name == "solid_only":
+            data = thumbnail(data)
         sources[name] = data
         write_gz(os.path.join(HERE, name + ".dxf.gz"), data)
     if "--convert" in sys.argv:
diff --git a/crates/exav-render/tests/fixtures/dwg/not_drawn.dwg.gz b/crates/exav-render/tests/fixtures/dwg/not_drawn.dwg.gz
new file mode 100644
index 00000000..c1aecc52
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/not_drawn.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/not_drawn.dxf.gz b/crates/exav-render/tests/fixtures/dwg/not_drawn.dxf.gz
new file mode 100644
index 00000000..66762dea
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/not_drawn.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/plinegen.dwg.gz b/crates/exav-render/tests/fixtures/dwg/plinegen.dwg.gz
new file mode 100644
index 00000000..5c16f06b
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/plinegen.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/plinegen.dxf.gz b/crates/exav-render/tests/fixtures/dwg/plinegen.dxf.gz
new file mode 100644
index 00000000..e7b93c1a
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/plinegen.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/sheets.dxf.gz b/crates/exav-render/tests/fixtures/dwg/sheets.dxf.gz
new file mode 100644
index 00000000..688842bd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/sheets.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/solid_only.dxf.gz b/crates/exav-render/tests/fixtures/dwg/solid_only.dxf.gz
new file mode 100644
index 00000000..87ea5716
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/solid_only.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/stray.dxf.gz b/crates/exav-render/tests/fixtures/dwg/stray.dxf.gz
new file mode 100644
index 00000000..d2a49014
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/stray.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/text_frames.dxf.gz b/crates/exav-render/tests/fixtures/dwg/text_frames.dxf.gz
new file mode 100644
index 00000000..29fb2ea7
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/text_frames.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/text_many.dxf.gz b/crates/exav-render/tests/fixtures/dwg/text_many.dxf.gz
new file mode 100644
index 00000000..247f9696
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/text_many.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/text_mtext.dxf.gz b/crates/exav-render/tests/fixtures/dwg/text_mtext.dxf.gz
new file mode 100644
index 00000000..07bbc612
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/text_mtext.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/text_symbols.dxf.gz b/crates/exav-render/tests/fixtures/dwg/text_symbols.dxf.gz
new file mode 100644
index 00000000..16ff05aa
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/text_symbols.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/transparency.dwg.gz b/crates/exav-render/tests/fixtures/dwg/transparency.dwg.gz
new file mode 100644
index 00000000..5789e152
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/transparency.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/transparency.dxf.gz b/crates/exav-render/tests/fixtures/dwg/transparency.dxf.gz
new file mode 100644
index 00000000..606305af
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/transparency.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/viewport_text.dxf.gz b/crates/exav-render/tests/fixtures/dwg/viewport_text.dxf.gz
new file mode 100644
index 00000000..7015b764
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/viewport_text.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/wide.dxf.gz b/crates/exav-render/tests/fixtures/dwg/wide.dxf.gz
new file mode 100644
index 00000000..1866abd2
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/wide.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/wipeout_triangle.dxf.gz b/crates/exav-render/tests/fixtures/dwg/wipeout_triangle.dxf.gz
new file mode 100644
index 00000000..3546df04
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/wipeout_triangle.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/xclip-R2000.dwg.gz b/crates/exav-render/tests/fixtures/dwg/xclip-R2000.dwg.gz
new file mode 100644
index 00000000..a6061cba
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/xclip-R2000.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/xclip.dwg.gz b/crates/exav-render/tests/fixtures/dwg/xclip.dwg.gz
new file mode 100644
index 00000000..4959caa8
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/xclip.dwg.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/xclip.dxf.gz b/crates/exav-render/tests/fixtures/dwg/xclip.dxf.gz
new file mode 100644
index 00000000..6b44f9b9
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/xclip.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/xref_part.dxf.gz b/crates/exav-render/tests/fixtures/dwg/xref_part.dxf.gz
new file mode 100644
index 00000000..fdd67547
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/xref_part.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/xref_sheet.dxf.gz b/crates/exav-render/tests/fixtures/dwg/xref_sheet.dxf.gz
new file mode 100644
index 00000000..002adf0a
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/xref_sheet.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/dwg/xref_title.dxf.gz b/crates/exav-render/tests/fixtures/dwg/xref_title.dxf.gz
new file mode 100644
index 00000000..1ad41888
Binary files /dev/null and b/crates/exav-render/tests/fixtures/dwg/xref_title.dxf.gz differ
diff --git a/crates/exav-render/tests/fixtures/fuzz/jpeg-sampling-factors-that-do-not-nest.jpg b/crates/exav-render/tests/fixtures/fuzz/jpeg-sampling-factors-that-do-not-nest.jpg
new file mode 100644
index 00000000..7b7964ef
Binary files /dev/null and b/crates/exav-render/tests/fixtures/fuzz/jpeg-sampling-factors-that-do-not-nest.jpg differ
diff --git a/crates/exav-render/tests/fixtures/ifc/alignment.ifc b/crates/exav-render/tests/fixtures/ifc/alignment.ifc
new file mode 100644
index 00000000..269b27b9
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ifc/alignment.ifc
@@ -0,0 +1,117 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('fixture','2026-01-01T00:00:00',(''),(''),'make.py','exav','');
+FILE_SCHEMA(('IFC4X3_ADD2'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#2=IFCDIRECTION((0.0,0.0,1.0));
+#3=IFCDIRECTION((1.0,0.0,0.0));
+#4=IFCAXIS2PLACEMENT3D(#1,#2,#3);
+#5=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#4,$);
+#6=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#7=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#8=IFCUNITASSIGNMENT((#6,#7));
+#9=IFCPROJECT('0000000000000000000001',$,'Fixtures',$,$,$,$,(#5),#8);
+#10=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#11=IFCAXIS2PLACEMENT3D(#10,$,$);
+#12=IFCLOCALPLACEMENT($,#11);
+#13=IFCSITE('0000000000000000000002',$,'Site',$,$,#12,$,$,.ELEMENT.,$,$,$,$,$);
+#14=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#15=IFCAXIS2PLACEMENT3D(#14,$,$);
+#16=IFCLOCALPLACEMENT(#12,#15);
+#17=IFCBUILDING('0000000000000000000003',$,'Building',$,$,#16,$,$,.ELEMENT.,$,$,$);
+#18=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#19=IFCAXIS2PLACEMENT3D(#18,$,$);
+#20=IFCLOCALPLACEMENT(#16,#19);
+#21=IFCBUILDINGSTOREY('0000000000000000000004',$,'Level 0',$,$,#20,$,$,.ELEMENT.,0.);
+#22=IFCRELAGGREGATES('0000000000000000000005',$,$,$,#9,(#13));
+#23=IFCRELAGGREGATES('0000000000000000000006',$,$,$,#13,(#17));
+#24=IFCRELAGGREGATES('0000000000000000000007',$,$,$,#17,(#21));
+#25=IFCCARTESIANPOINT((0.0,0.0));
+#26=IFCDIRECTION((1.0,0.0));
+#27=IFCVECTOR(#26,1.);
+#28=IFCLINE(#25,#27);
+#29=IFCCARTESIANPOINT((0.0,0.0));
+#30=IFCDIRECTION((1.0,0.0));
+#31=IFCAXIS2PLACEMENT2D(#29,#30);
+#32=IFCCLOTHOID(#31,134.16407864998737);
+#33=IFCCIRCLE(#31,300.0);
+#34=IFCCIRCLE(#31,200.0);
+#35=IFCCARTESIANPOINT((0.0,0.0));
+#36=IFCDIRECTION((1.0,0.0));
+#37=IFCAXIS2PLACEMENT2D(#35,#36);
+#38=IFCCURVESEGMENT(.CONTINUOUS.,#37,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(100.0),#28);
+#39=IFCCARTESIANPOINT((100.0,0.0));
+#40=IFCDIRECTION((1.0,0.0));
+#41=IFCAXIS2PLACEMENT2D(#39,#40);
+#42=IFCCURVESEGMENT(.CONTINUOUS.,#41,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(60.0),#32);
+#43=IFCCARTESIANPOINT((159.94002777136836,1.9985718830375176));
+#44=IFCDIRECTION((0.9950041652780257,0.09983341664682817));
+#45=IFCAXIS2PLACEMENT2D(#43,#44);
+#46=IFCCURVESEGMENT(.CONTINUOUS.,#45,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(120.0),#33);
+#47=IFCCARTESIANPOINT((273.8176643585808,37.225052899333406));
+#48=IFCDIRECTION((0.8775825618903728,0.479425538604203));
+#49=IFCAXIS2PLACEMENT2D(#47,#48);
+#50=IFCCURVESEGMENT(.CONTINUOUS.,#49,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(-100.0),#34);
+#51=IFCCARTESIANPOINT((369.70277207942144,61.708540521258854));
+#52=IFCDIRECTION((1.0,0.0));
+#53=IFCAXIS2PLACEMENT2D(#51,#52);
+#54=IFCCURVESEGMENT(.CONTINUOUS.,#53,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(50.0),#28);
+#55=IFCCOMPOSITECURVE((#38,#42,#46,#50,#54),.F.);
+#56=IFCCARTESIANPOINT((0.0,10.0));
+#57=IFCDIRECTION((1.0,0.02));
+#58=IFCAXIS2PLACEMENT2D(#56,#57);
+#59=IFCCURVESEGMENT(.CONTINUOUS.,#58,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(200.0399960007998),#28);
+#60=IFCCARTESIANPOINT((200.0,14.0));
+#61=IFCDIRECTION((1.0,-0.01));
+#62=IFCAXIS2PLACEMENT2D(#60,#61);
+#63=IFCCURVESEGMENT(.CONTINUOUS.,#62,IFCLENGTHMEASURE(0.0),IFCLENGTHMEASURE(230.01149971251436),#28);
+#64=IFCGRADIENTCURVE((#59,#63),.F.,#55,$);
+#65=IFCSHAPEREPRESENTATION(#5,'Axis','Curve3D',(#64));
+#66=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#67=IFCAXIS2PLACEMENT3D(#66,$,$);
+#68=IFCLOCALPLACEMENT($,#67);
+#69=IFCPRODUCTDEFINITIONSHAPE($,$,(#65));
+#70=IFCALIGNMENT('0000000000000000000008',$,'Alignment',$,$,#68,#69,$);
+#71=IFCSWEPTDISKSOLID(#64,0.5,$,$,$);
+#72=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#73=IFCAXIS2PLACEMENT3D(#72,$,$);
+#74=IFCLOCALPLACEMENT(#20,#73);
+#75=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#71));
+#76=IFCPRODUCTDEFINITIONSHAPE($,$,(#75));
+#77=IFCPIPESEGMENT('0000000000000000000009',$,'tube whole',$,$,#74,#76,$,$);
+#78=IFCSWEPTDISKSOLID(#64,0.5,$,100.,280.);
+#79=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#80=IFCAXIS2PLACEMENT3D(#79,$,$);
+#81=IFCLOCALPLACEMENT(#20,#80);
+#82=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#78));
+#83=IFCPRODUCTDEFINITIONSHAPE($,$,(#82));
+#84=IFCPIPESEGMENT('0000000000000000000010',$,'tube 100 to 280',$,$,#81,#83,$,$);
+#85=IFCPOINTBYDISTANCEEXPRESSION(IFCLENGTHMEASURE(250.0),3.0,$,$,#64);
+#86=IFCAXIS2PLACEMENTLINEAR(#85,$,$);
+#87=IFCLINEARPLACEMENT($,#86,$);
+#88=IFCCARTESIANPOINT((0.0,0.0));
+#89=IFCAXIS2PLACEMENT2D(#88,$);
+#90=IFCRECTANGLEPROFILEDEF(.AREA.,$,#89,2.0,1.0);
+#91=IFCDIRECTION((0.0,0.0,1.0));
+#92=IFCEXTRUDEDAREASOLID(#90,$,#91,4.0);
+#93=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#92));
+#94=IFCPRODUCTDEFINITIONSHAPE($,$,(#93));
+#95=IFCCOLUMN('0000000000000000000011',$,'column on the alignment',$,$,#87,#94,$,$);
+#96=IFCCARTESIANPOINT((5.0,5.0,0.0));
+#97=IFCAXIS2PLACEMENT3D(#96,$,$);
+#98=IFCAXIS2PLACEMENTLINEAR(#85,$,$);
+#99=IFCLINEARPLACEMENT($,#98,#97);
+#100=IFCCARTESIANPOINT((0.0,0.0));
+#101=IFCAXIS2PLACEMENT2D(#100,$);
+#102=IFCRECTANGLEPROFILEDEF(.AREA.,$,#101,1.0,1.0);
+#103=IFCDIRECTION((0.0,0.0,1.0));
+#104=IFCEXTRUDEDAREASOLID(#102,$,#103,1.0);
+#105=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#104));
+#106=IFCPRODUCTDEFINITIONSHAPE($,$,(#105));
+#107=IFCCOLUMN('0000000000000000000012',$,'column with its Cartesian position',$,$,#99,#106,$,$);
+#108=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000013',$,$,$,(#77,#84,#95,#107),#21);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-render/tests/fixtures/ifc/curved_faces.ifc b/crates/exav-render/tests/fixtures/ifc/curved_faces.ifc
new file mode 100644
index 00000000..9a4aea41
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ifc/curved_faces.ifc
@@ -0,0 +1,384 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('fixture','2026-01-01T00:00:00',(''),(''),'make.py','exav','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#2=IFCDIRECTION((0.0,0.0,1.0));
+#3=IFCDIRECTION((1.0,0.0,0.0));
+#4=IFCAXIS2PLACEMENT3D(#1,#2,#3);
+#5=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#4,$);
+#6=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#7=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#8=IFCUNITASSIGNMENT((#6,#7));
+#9=IFCPROJECT('0000000000000000000001',$,'Fixtures',$,$,$,$,(#5),#8);
+#10=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#11=IFCAXIS2PLACEMENT3D(#10,$,$);
+#12=IFCLOCALPLACEMENT($,#11);
+#13=IFCSITE('0000000000000000000002',$,'Site',$,$,#12,$,$,.ELEMENT.,$,$,$,$,$);
+#14=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#15=IFCAXIS2PLACEMENT3D(#14,$,$);
+#16=IFCLOCALPLACEMENT(#12,#15);
+#17=IFCBUILDING('0000000000000000000003',$,'Building',$,$,#16,$,$,.ELEMENT.,$,$,$);
+#18=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#19=IFCAXIS2PLACEMENT3D(#18,$,$);
+#20=IFCLOCALPLACEMENT(#16,#19);
+#21=IFCBUILDINGSTOREY('0000000000000000000004',$,'Level 0',$,$,#20,$,$,.ELEMENT.,0.);
+#22=IFCRELAGGREGATES('0000000000000000000005',$,$,$,#9,(#13));
+#23=IFCRELAGGREGATES('0000000000000000000006',$,$,$,#13,(#17));
+#24=IFCRELAGGREGATES('0000000000000000000007',$,$,$,#17,(#21));
+#25=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#26=IFCAXIS2PLACEMENT3D(#25,$,$);
+#27=IFCSPHERICALSURFACE(#26,2.0);
+#28=IFCDIRECTION((0.0,0.0,1.0));
+#29=IFCDIRECTION((1.0,0.0,0.0));
+#30=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#31=IFCAXIS2PLACEMENT3D(#30,#28,#29);
+#32=IFCCIRCLE(#31,2.0);
+#33=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#34=IFCVERTEXPOINT(#33);
+#35=IFCEDGECURVE(#34,#34,#32,.T.);
+#36=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#37=IFCAXIS2PLACEMENT3D(#36,$,$);
+#38=IFCPLANE(#37);
+#39=IFCORIENTEDEDGE(*,*,#35,.T.);
+#40=IFCEDGELOOP((#39));
+#41=IFCFACEOUTERBOUND(#40,.T.);
+#42=IFCADVANCEDFACE((#41),#27,.T.);
+#43=IFCORIENTEDEDGE(*,*,#35,.F.);
+#44=IFCEDGELOOP((#43));
+#45=IFCFACEOUTERBOUND(#44,.T.);
+#46=IFCADVANCEDFACE((#45),#38,.T.);
+#47=IFCCLOSEDSHELL((#42,#46));
+#48=IFCADVANCEDBREP(#47);
+#49=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#50=IFCAXIS2PLACEMENT3D(#49,$,$);
+#51=IFCLOCALPLACEMENT(#20,#50);
+#52=IFCSHAPEREPRESENTATION(#5,'Body','AdvancedBrep',(#48));
+#53=IFCPRODUCTDEFINITIONSHAPE($,$,(#52));
+#54=IFCBUILDINGELEMENTPROXY('0000000000000000000008',$,'hemisphere',$,$,#51,#53,$,$);
+#55=IFCORIENTEDEDGE(*,*,#35,.F.);
+#56=IFCEDGELOOP((#55));
+#57=IFCFACEOUTERBOUND(#56,.T.);
+#58=IFCADVANCEDFACE((#57),#27,.T.);
+#59=IFCORIENTEDEDGE(*,*,#35,.T.);
+#60=IFCEDGELOOP((#59));
+#61=IFCFACEOUTERBOUND(#60,.T.);
+#62=IFCADVANCEDFACE((#61),#38,.T.);
+#63=IFCCLOSEDSHELL((#58,#62));
+#64=IFCADVANCEDBREP(#63);
+#65=IFCCARTESIANPOINT((10.0,0.0,0.0));
+#66=IFCAXIS2PLACEMENT3D(#65,$,$);
+#67=IFCLOCALPLACEMENT(#20,#66);
+#68=IFCSHAPEREPRESENTATION(#5,'Body','AdvancedBrep',(#64));
+#69=IFCPRODUCTDEFINITIONSHAPE($,$,(#68));
+#70=IFCBUILDINGELEMENTPROXY('0000000000000000000009',$,'bowl',$,$,#67,#69,$,$);
+#71=IFCCARTESIANPOINT((1.910672978251212,0.0,0.5910404133226791));
+#72=IFCVERTEXPOINT(#71);
+#73=IFCCARTESIANPOINT((1.1699497735163436E-16,1.910672978251212,0.5910404133226791));
+#74=IFCVERTEXPOINT(#73);
+#75=IFCCARTESIANPOINT((7.61252657960757E-17,1.2432199365413288,1.5666538192549668));
+#76=IFCVERTEXPOINT(#75);
+#77=IFCCARTESIANPOINT((1.2432199365413288,0.0,1.5666538192549668));
+#78=IFCVERTEXPOINT(#77);
+#79=IFCDIRECTION((0.0,0.0,1.0));
+#80=IFCDIRECTION((1.0,0.0,0.0));
+#81=IFCCARTESIANPOINT((0.0,0.0,0.5910404133226791));
+#82=IFCAXIS2PLACEMENT3D(#81,#79,#80);
+#83=IFCCIRCLE(#82,1.910672978251212);
+#84=IFCTRIMMEDCURVE(#83,(IFCPARAMETERVALUE(0.0)),(IFCPARAMETERVALUE(1.5707963267948966)),.T.,.PARAMETER.);
+#85=IFCEDGECURVE(#72,#74,#84,.T.);
+#86=IFCDIRECTION((0.0,0.0,1.0));
+#87=IFCDIRECTION((1.0,0.0,0.0));
+#88=IFCCARTESIANPOINT((0.0,0.0,1.5666538192549668));
+#89=IFCAXIS2PLACEMENT3D(#88,#86,#87);
+#90=IFCCIRCLE(#89,1.2432199365413288);
+#91=IFCTRIMMEDCURVE(#90,(IFCPARAMETERVALUE(0.0)),(IFCPARAMETERVALUE(1.5707963267948966)),.T.,.PARAMETER.);
+#92=IFCEDGECURVE(#78,#76,#91,.T.);
+#93=IFCDIRECTION((1.0,0.0,0.0));
+#94=IFCDIRECTION((0.0,1.0,0.0));
+#95=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#96=IFCAXIS2PLACEMENT3D(#95,#93,#94);
+#97=IFCCIRCLE(#96,2.0);
+#98=IFCTRIMMEDCURVE(#97,(IFCPARAMETERVALUE(0.3)),(IFCPARAMETERVALUE(0.9)),.T.,.PARAMETER.);
+#99=IFCEDGECURVE(#74,#76,#98,.T.);
+#100=IFCDIRECTION((0.0,-1.0,0.0));
+#101=IFCDIRECTION((1.0,0.0,0.0));
+#102=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#103=IFCAXIS2PLACEMENT3D(#102,#100,#101);
+#104=IFCCIRCLE(#103,2.0);
+#105=IFCTRIMMEDCURVE(#104,(IFCPARAMETERVALUE(0.3)),(IFCPARAMETERVALUE(0.9)),.T.,.PARAMETER.);
+#106=IFCEDGECURVE(#72,#78,#105,.T.);
+#107=IFCORIENTEDEDGE(*,*,#85,.T.);
+#108=IFCORIENTEDEDGE(*,*,#99,.T.);
+#109=IFCORIENTEDEDGE(*,*,#92,.F.);
+#110=IFCORIENTEDEDGE(*,*,#106,.F.);
+#111=IFCEDGELOOP((#107,#108,#109,#110));
+#112=IFCFACEOUTERBOUND(#111,.T.);
+#113=IFCADVANCEDFACE((#112),#27,.T.);
+#114=IFCOPENSHELL((#113));
+#115=IFCSHELLBASEDSURFACEMODEL((#114));
+#116=IFCCARTESIANPOINT((20.0,0.0,0.0));
+#117=IFCAXIS2PLACEMENT3D(#116,$,$);
+#118=IFCLOCALPLACEMENT(#20,#117);
+#119=IFCSHAPEREPRESENTATION(#5,'Body','SurfaceModel',(#115));
+#120=IFCPRODUCTDEFINITIONSHAPE($,$,(#119));
+#121=IFCCOVERING('0000000000000000000010',$,'sphere patch',$,$,#118,#120,$,$);
+#122=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#123=IFCAXIS2PLACEMENT3D(#122,$,$);
+#124=IFCTOROIDALSURFACE(#123,3.0,1.0);
+#125=IFCCARTESIANPOINT((4.0,0.0,0.0));
+#126=IFCVERTEXPOINT(#125);
+#127=IFCCARTESIANPOINT((0.0,4.0,0.0));
+#128=IFCVERTEXPOINT(#127);
+#129=IFCDIRECTION((0.0,-1.0,0.0));
+#130=IFCDIRECTION((1.0,0.0,0.0));
+#131=IFCCARTESIANPOINT((3.0,0.0,0.0));
+#132=IFCAXIS2PLACEMENT3D(#131,#129,#130);
+#133=IFCCIRCLE(#132,1.0);
+#134=IFCDIRECTION((1.0,0.0,0.0));
+#135=IFCDIRECTION((0.0,1.0,0.0));
+#136=IFCCARTESIANPOINT((0.0,3.0,0.0));
+#137=IFCAXIS2PLACEMENT3D(#136,#134,#135);
+#138=IFCCIRCLE(#137,1.0);
+#139=IFCEDGECURVE(#126,#126,#133,.T.);
+#140=IFCEDGECURVE(#128,#128,#138,.T.);
+#141=IFCDIRECTION((0.0,0.0,1.0));
+#142=IFCDIRECTION((1.0,0.0,0.0));
+#143=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#144=IFCAXIS2PLACEMENT3D(#143,#141,#142);
+#145=IFCCIRCLE(#144,4.0);
+#146=IFCTRIMMEDCURVE(#145,(IFCPARAMETERVALUE(0.0)),(IFCPARAMETERVALUE(1.5707963267948966)),.T.,.PARAMETER.);
+#147=IFCEDGECURVE(#126,#128,#146,.T.);
+#148=IFCORIENTEDEDGE(*,*,#139,.T.);
+#149=IFCORIENTEDEDGE(*,*,#147,.T.);
+#150=IFCORIENTEDEDGE(*,*,#140,.F.);
+#151=IFCORIENTEDEDGE(*,*,#147,.F.);
+#152=IFCEDGELOOP((#148,#149,#150,#151));
+#153=IFCFACEOUTERBOUND(#152,.T.);
+#154=IFCADVANCEDFACE((#153),#124,.T.);
+#155=IFCORIENTEDEDGE(*,*,#139,.T.);
+#156=IFCEDGELOOP((#155));
+#157=IFCDIRECTION((0.0,1.0,0.0));
+#158=IFCDIRECTION((1.0,0.0,0.0));
+#159=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#160=IFCAXIS2PLACEMENT3D(#159,#157,#158);
+#161=IFCPLANE(#160);
+#162=IFCFACEOUTERBOUND(#156,.T.);
+#163=IFCADVANCEDFACE((#162),#161,.T.);
+#164=IFCORIENTEDEDGE(*,*,#140,.F.);
+#165=IFCEDGELOOP((#164));
+#166=IFCDIRECTION((1.0,0.0,0.0));
+#167=IFCDIRECTION((0.0,1.0,0.0));
+#168=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#169=IFCAXIS2PLACEMENT3D(#168,#166,#167);
+#170=IFCPLANE(#169);
+#171=IFCFACEOUTERBOUND(#165,.T.);
+#172=IFCADVANCEDFACE((#171),#170,.T.);
+#173=IFCCLOSEDSHELL((#154,#163,#172));
+#174=IFCADVANCEDBREP(#173);
+#175=IFCCARTESIANPOINT((30.0,0.0,0.0));
+#176=IFCAXIS2PLACEMENT3D(#175,$,$);
+#177=IFCLOCALPLACEMENT(#20,#176);
+#178=IFCSHAPEREPRESENTATION(#5,'Body','AdvancedBrep',(#174));
+#179=IFCPRODUCTDEFINITIONSHAPE($,$,(#178));
+#180=IFCBUILDINGELEMENTPROXY('0000000000000000000011',$,'torus elbow',$,$,#177,#179,$,$);
+#181=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#182=IFCAXIS2PLACEMENT3D(#181,$,$);
+#183=IFCCYLINDRICALSURFACE(#182,1.5);
+#184=IFCDIRECTION((0.0,0.0,1.0));
+#185=IFCDIRECTION((1.0,0.0,0.0));
+#186=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#187=IFCAXIS2PLACEMENT3D(#186,#184,#185);
+#188=IFCCIRCLE(#187,1.5);
+#189=IFCDIRECTION((0.0,0.0,1.0));
+#190=IFCDIRECTION((1.0,0.0,0.0));
+#191=IFCCARTESIANPOINT((0.0,0.0,4.0));
+#192=IFCAXIS2PLACEMENT3D(#191,#189,#190);
+#193=IFCCIRCLE(#192,1.5);
+#194=IFCCARTESIANPOINT((1.5,0.0,0.0));
+#195=IFCVERTEXPOINT(#194);
+#196=IFCCARTESIANPOINT((1.5,0.0,4.0));
+#197=IFCVERTEXPOINT(#196);
+#198=IFCEDGECURVE(#195,#195,#188,.T.);
+#199=IFCEDGECURVE(#197,#197,#193,.T.);
+#200=IFCORIENTEDEDGE(*,*,#198,.T.);
+#201=IFCEDGELOOP((#200));
+#202=IFCORIENTEDEDGE(*,*,#199,.T.);
+#203=IFCEDGELOOP((#202));
+#204=IFCFACEBOUND(#201,.T.);
+#205=IFCFACEBOUND(#203,.T.);
+#206=IFCADVANCEDFACE((#204,#205),#183,.T.);
+#207=IFCORIENTEDEDGE(*,*,#198,.F.);
+#208=IFCEDGELOOP((#207));
+#209=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#210=IFCAXIS2PLACEMENT3D(#209,$,$);
+#211=IFCPLANE(#210);
+#212=IFCFACEOUTERBOUND(#208,.T.);
+#213=IFCADVANCEDFACE((#212),#211,.T.);
+#214=IFCORIENTEDEDGE(*,*,#199,.T.);
+#215=IFCEDGELOOP((#214));
+#216=IFCCARTESIANPOINT((0.0,0.0,4.0));
+#217=IFCAXIS2PLACEMENT3D(#216,$,$);
+#218=IFCPLANE(#217);
+#219=IFCFACEOUTERBOUND(#215,.T.);
+#220=IFCADVANCEDFACE((#219),#218,.T.);
+#221=IFCCLOSEDSHELL((#206,#213,#220));
+#222=IFCADVANCEDBREP(#221);
+#223=IFCCARTESIANPOINT((40.0,0.0,0.0));
+#224=IFCAXIS2PLACEMENT3D(#223,$,$);
+#225=IFCLOCALPLACEMENT(#20,#224);
+#226=IFCSHAPEREPRESENTATION(#5,'Body','AdvancedBrep',(#222));
+#227=IFCPRODUCTDEFINITIONSHAPE($,$,(#226));
+#228=IFCBUILDINGELEMENTPROXY('0000000000000000000012',$,'tube without seam',$,$,#225,#227,$,$);
+#229=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#230=IFCCARTESIANPOINT((2.0,0.0,5.0));
+#231=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#232=IFCCARTESIANPOINT((2.0,2.0,5.0));
+#233=IFCCARTESIANPOINT((0.0,2.0,0.0));
+#234=IFCCARTESIANPOINT((0.0,2.0,5.0));
+#235=IFCRATIONALBSPLINESURFACEWITHKNOTS(2,1,((#229,#230),(#231,#232),(#233,#234)),.UNSPECIFIED.,.F.,.F.,.F.,(3,3),(2,2),(0.,1.),(0.,1.),.UNSPECIFIED.,((1.,1.),(0.7071067811865476,0.7071067811865476),(1.,1.)));
+#236=IFCCARTESIANPOINT((1.9318516525781366,0.5176380902050415,1.0));
+#237=IFCVERTEXPOINT(#236);
+#238=IFCCARTESIANPOINT((0.5176380902050415,1.9318516525781366,1.0));
+#239=IFCVERTEXPOINT(#238);
+#240=IFCCARTESIANPOINT((0.5176380902050415,1.9318516525781366,4.0));
+#241=IFCVERTEXPOINT(#240);
+#242=IFCCARTESIANPOINT((1.9318516525781366,0.5176380902050415,4.0));
+#243=IFCVERTEXPOINT(#242);
+#244=IFCCARTESIANPOINT((1.9318516525781366,0.5176380902050415,1.0));
+#245=IFCCARTESIANPOINT((0.5176380902050415,1.9318516525781366,1.0));
+#246=IFCPOLYLINE((#244,#245));
+#247=IFCEDGECURVE(#237,#239,#246,.T.);
+#248=IFCCARTESIANPOINT((0.5176380902050415,1.9318516525781366,1.0));
+#249=IFCCARTESIANPOINT((0.5176380902050415,1.9318516525781366,4.0));
+#250=IFCPOLYLINE((#248,#249));
+#251=IFCEDGECURVE(#239,#241,#250,.T.);
+#252=IFCCARTESIANPOINT((0.5176380902050415,1.9318516525781366,4.0));
+#253=IFCCARTESIANPOINT((1.9318516525781366,0.5176380902050415,4.0));
+#254=IFCPOLYLINE((#252,#253));
+#255=IFCEDGECURVE(#241,#243,#254,.T.);
+#256=IFCCARTESIANPOINT((1.9318516525781366,0.5176380902050415,4.0));
+#257=IFCCARTESIANPOINT((1.9318516525781366,0.5176380902050415,1.0));
+#258=IFCPOLYLINE((#256,#257));
+#259=IFCEDGECURVE(#243,#237,#258,.T.);
+#260=IFCORIENTEDEDGE(*,*,#247,.T.);
+#261=IFCORIENTEDEDGE(*,*,#251,.T.);
+#262=IFCORIENTEDEDGE(*,*,#255,.T.);
+#263=IFCORIENTEDEDGE(*,*,#259,.T.);
+#264=IFCEDGELOOP((#260,#261,#262,#263));
+#265=IFCFACEOUTERBOUND(#264,.T.);
+#266=IFCADVANCEDFACE((#265),#235,.T.);
+#267=IFCOPENSHELL((#266));
+#268=IFCSHELLBASEDSURFACEMODEL((#267));
+#269=IFCCARTESIANPOINT((50.0,0.0,0.0));
+#270=IFCAXIS2PLACEMENT3D(#269,$,$);
+#271=IFCLOCALPLACEMENT(#20,#270);
+#272=IFCSHAPEREPRESENTATION(#5,'Body','SurfaceModel',(#268));
+#273=IFCPRODUCTDEFINITIONSHAPE($,$,(#272));
+#274=IFCCOVERING('0000000000000000000013',$,'spline patch',$,$,#271,#273,$,$);
+#275=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#276=IFCCARTESIANPOINT((0.0,2.0,0.0));
+#277=IFCCARTESIANPOINT((0.0,4.0,0.0));
+#278=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#279=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#280=IFCCARTESIANPOINT((2.0,4.0,0.0));
+#281=IFCCARTESIANPOINT((4.0,0.0,0.0));
+#282=IFCCARTESIANPOINT((4.0,2.0,0.0));
+#283=IFCCARTESIANPOINT((4.0,4.0,0.0));
+#284=IFCBSPLINESURFACEWITHKNOTS(2,2,((#275,#276,#277),(#278,#279,#280),(#281,#282,#283)),.UNSPECIFIED.,.F.,.F.,.F.,(3,3),(3,3),(0.,1.),(0.,1.),.UNSPECIFIED.);
+#285=IFCCARTESIANPOINT((0.5,0.5,0.0));
+#286=IFCVERTEXPOINT(#285);
+#287=IFCCARTESIANPOINT((3.5,0.5,0.0));
+#288=IFCVERTEXPOINT(#287);
+#289=IFCCARTESIANPOINT((3.5,3.5,0.0));
+#290=IFCVERTEXPOINT(#289);
+#291=IFCCARTESIANPOINT((0.5,3.5,0.0));
+#292=IFCVERTEXPOINT(#291);
+#293=IFCCARTESIANPOINT((0.5,0.5,0.0));
+#294=IFCCARTESIANPOINT((3.5,0.5,0.0));
+#295=IFCPOLYLINE((#293,#294));
+#296=IFCEDGECURVE(#286,#288,#295,.T.);
+#297=IFCCARTESIANPOINT((3.5,0.5,0.0));
+#298=IFCCARTESIANPOINT((3.5,3.5,0.0));
+#299=IFCPOLYLINE((#297,#298));
+#300=IFCEDGECURVE(#288,#290,#299,.T.);
+#301=IFCCARTESIANPOINT((3.5,3.5,0.0));
+#302=IFCCARTESIANPOINT((0.5,3.5,0.0));
+#303=IFCPOLYLINE((#301,#302));
+#304=IFCEDGECURVE(#290,#292,#303,.T.);
+#305=IFCCARTESIANPOINT((0.5,3.5,0.0));
+#306=IFCCARTESIANPOINT((0.5,0.5,0.0));
+#307=IFCPOLYLINE((#305,#306));
+#308=IFCEDGECURVE(#292,#286,#307,.T.);
+#309=IFCDIRECTION((0.0,0.0,1.0));
+#310=IFCDIRECTION((1.0,0.0,0.0));
+#311=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#312=IFCAXIS2PLACEMENT3D(#311,#309,#310);
+#313=IFCCIRCLE(#312,1.0);
+#314=IFCCARTESIANPOINT((3.0,2.0,0.0));
+#315=IFCVERTEXPOINT(#314);
+#316=IFCEDGECURVE(#315,#315,#313,.T.);
+#317=IFCORIENTEDEDGE(*,*,#296,.T.);
+#318=IFCORIENTEDEDGE(*,*,#300,.T.);
+#319=IFCORIENTEDEDGE(*,*,#304,.T.);
+#320=IFCORIENTEDEDGE(*,*,#308,.T.);
+#321=IFCEDGELOOP((#317,#318,#319,#320));
+#322=IFCORIENTEDEDGE(*,*,#316,.F.);
+#323=IFCEDGELOOP((#322));
+#324=IFCFACEOUTERBOUND(#321,.T.);
+#325=IFCFACEBOUND(#323,.T.);
+#326=IFCADVANCEDFACE((#324,#325),#284,.T.);
+#327=IFCOPENSHELL((#326));
+#328=IFCSHELLBASEDSURFACEMODEL((#327));
+#329=IFCCARTESIANPOINT((60.0,0.0,0.0));
+#330=IFCAXIS2PLACEMENT3D(#329,$,$);
+#331=IFCLOCALPLACEMENT(#20,#330);
+#332=IFCSHAPEREPRESENTATION(#5,'Body','SurfaceModel',(#328));
+#333=IFCPRODUCTDEFINITIONSHAPE($,$,(#332));
+#334=IFCCOVERING('0000000000000000000014',$,'plate with hole',$,$,#331,#333,$,$);
+#335=IFCDIRECTION((0.7071067811865476,0.0,0.7071067811865476));
+#336=IFCDIRECTION((0.0,1.0,0.0));
+#337=IFCCARTESIANPOINT((1.2727922061357857,0.0,1.2727922061357857));
+#338=IFCAXIS2PLACEMENT3D(#337,#335,#336);
+#339=IFCCIRCLE(#338,0.8717797887081346);
+#340=IFCCARTESIANPOINT((1.2727922061357857,0.8717797887081346,1.2727922061357857));
+#341=IFCVERTEXPOINT(#340);
+#342=IFCEDGECURVE(#341,#341,#339,.T.);
+#343=IFCORIENTEDEDGE(*,*,#342,.T.);
+#344=IFCEDGELOOP((#343));
+#345=IFCFACEOUTERBOUND(#344,.T.);
+#346=IFCADVANCEDFACE((#345),#27,.T.);
+#347=IFCOPENSHELL((#346));
+#348=IFCSHELLBASEDSURFACEMODEL((#347));
+#349=IFCCARTESIANPOINT((70.0,0.0,0.0));
+#350=IFCAXIS2PLACEMENT3D(#349,$,$);
+#351=IFCLOCALPLACEMENT(#20,#350);
+#352=IFCSHAPEREPRESENTATION(#5,'Body','SurfaceModel',(#348));
+#353=IFCPRODUCTDEFINITIONSHAPE($,$,(#352));
+#354=IFCCOVERING('0000000000000000000015',$,'tilted cap',$,$,#351,#353,$,$);
+#355=IFCDIRECTION((0.7071067811865476,0.0,0.7071067811865476));
+#356=IFCDIRECTION((0.0,1.0,0.0));
+#357=IFCCARTESIANPOINT((0.848528137423857,0.0,0.848528137423857));
+#358=IFCAXIS2PLACEMENT3D(#357,#355,#356);
+#359=IFCCIRCLE(#358,1.6);
+#360=IFCCARTESIANPOINT((0.848528137423857,1.6,0.848528137423857));
+#361=IFCVERTEXPOINT(#360);
+#362=IFCEDGECURVE(#361,#361,#359,.T.);
+#363=IFCORIENTEDEDGE(*,*,#362,.T.);
+#364=IFCEDGELOOP((#363));
+#365=IFCFACEOUTERBOUND(#364,.T.);
+#366=IFCADVANCEDFACE((#365),#27,.T.);
+#367=IFCOPENSHELL((#366));
+#368=IFCSHELLBASEDSURFACEMODEL((#367));
+#369=IFCCARTESIANPOINT((80.0,0.0,0.0));
+#370=IFCAXIS2PLACEMENT3D(#369,$,$);
+#371=IFCLOCALPLACEMENT(#20,#370);
+#372=IFCSHAPEREPRESENTATION(#5,'Body','SurfaceModel',(#368));
+#373=IFCPRODUCTDEFINITIONSHAPE($,$,(#372));
+#374=IFCCOVERING('0000000000000000000016',$,'tilted cap with the pole',$,$,#371,#373,$,$);
+#375=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000017',$,$,$,(#54,#70,#121,#180,#228,#274,#334,#354,#374),#21);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-render/tests/fixtures/ifc/expected.json b/crates/exav-render/tests/fixtures/ifc/expected.json
index e63b2abd..092de29c 100644
--- a/crates/exav-render/tests/fixtures/ifc/expected.json
+++ b/crates/exav-render/tests/fixtures/ifc/expected.json
@@ -1,4 +1,83 @@
 {
+ "alignment.ifc": {
+  "elements": {
+   "column on the alignment": {
+    "tol": 1e-06,
+    "volume": 8.0
+   },
+   "column with its Cartesian position": {
+    "max": [
+     5.5,
+     5.5,
+     1
+    ],
+    "min": [
+     4.5,
+     4.5,
+     0
+    ],
+    "tol": 1e-06,
+    "volume": 1.0
+   },
+   "tube 100 to 280": {
+    "tol": 0.03,
+    "volume": 141.39051731844407
+   },
+   "tube whole": {
+    "tol": 0.03,
+    "volume": 337.76165489956253
+   }
+  },
+  "stations": {
+   "clothoid_end": [
+    159.94002777136836,
+    1.9985718830375176
+   ],
+   "column_at": [
+    245.64725044298913,
+    26.944706247588353,
+    13.5
+   ],
+   "column_half": [
+    1.1157701651572103,
+    0.8499488393100931
+   ],
+   "end": [
+    419.70277207942144,
+    61.708540521258854
+   ],
+   "heading": [
+    0.0,
+    0.10000000000000002,
+    0.5,
+    0.0,
+    0.0
+   ],
+   "heights": [
+    10.0,
+    12.0,
+    14.0,
+    11.7
+   ],
+   "left_arc_end": [
+    273.8176643585808,
+    37.225052899333406
+   ],
+   "line_end": [
+    100.0,
+    0.0
+   ],
+   "right_arc_end": [
+    369.70277207942144,
+    61.708540521258854
+   ],
+   "right_arc_mid": [
+    320.2219802285168,
+    55.4910248633878
+   ]
+  },
+  "tube_radius": 0.5
+ },
  "booleans.ifc": {
   "absent": [
    "window opening",
@@ -63,6 +142,120 @@
    }
   }
  },
+ "curved_faces.ifc": {
+  "elements": {
+   "bowl": {
+    "area": 37.69911184307752,
+    "max": [
+     12.0,
+     2.0,
+     0
+    ],
+    "min": [
+     8.0,
+     -2.0,
+     -2.0
+    ],
+    "tol": 0.03,
+    "volume": 16.755160819145562
+   },
+   "hemisphere": {
+    "area": 37.69911184307752,
+    "max": [
+     2.0,
+     2.0,
+     2.0
+    ],
+    "min": [
+     -2.0,
+     -2.0,
+     0
+    ],
+    "tol": 0.03,
+    "volume": 16.755160819145562
+   },
+   "plate with hole": {
+    "area": 5.878554847741948,
+    "max": [
+     63.5,
+     3.5,
+     0
+    ],
+    "min": [
+     60.5,
+     0.5,
+     0
+    ],
+    "tol": 0.0001
+   },
+   "sphere patch": {
+    "area": 3.064979908820592,
+    "max": [
+     21.910672978251213,
+     1.910672978251212,
+     1.5666538192549668
+    ],
+    "min": [
+     20,
+     0,
+     0.5910404133226791
+    ],
+    "tol": 0.02
+   },
+   "spline patch": {
+    "area": 6.283185307179587,
+    "max": [
+     51.93185165257814,
+     1.9318516525781366,
+     4.0
+    ],
+    "min": [
+     50.51763809020504,
+     0.5176380902050415,
+     1.0
+    ],
+    "tol": 0.02
+   },
+   "tilted cap": {
+    "area": 2.513274122871834,
+    "tol": 0.03
+   },
+   "tilted cap with the pole": {
+    "area": 10.053096491487338,
+    "tol": 0.03
+   },
+   "torus elbow": {
+    "area": 35.891998510447664,
+    "max": [
+     34.0,
+     4.0,
+     1.0
+    ],
+    "min": [
+     30,
+     0,
+     -1.0
+    ],
+    "tol": 0.03,
+    "volume": 14.804406601634037
+   },
+   "tube without seam": {
+    "area": 51.83627878423159,
+    "max": [
+     41.5,
+     1.5,
+     4.0
+    ],
+    "min": [
+     38.5,
+     -1.5,
+     0
+    ],
+    "tol": 0.02,
+    "volume": 28.274333882308138
+   }
+  }
+ },
  "damaged.ifc": {
   "absent": [
    "placement loop",
@@ -89,6 +282,98 @@
    }
   }
  },
+ "grid.ifc": {
+  "elements": {
+   "along a direction": {
+    "max": [
+     101.0,
+     50.5,
+     3.0
+    ],
+    "min": [
+     99.0,
+     49.5,
+     0.0
+    ],
+    "tol": 1e-06,
+    "volume": 6.0
+   },
+   "at an intersection": {
+    "max": [
+     100.5,
+     59.0,
+     3.0
+    ],
+    "min": [
+     99.5,
+     57.0,
+     0.0
+    ],
+    "tol": 1e-06,
+    "volume": 6.0
+   },
+   "on a reversed axis": {
+    "max": [
+     95.0,
+     59.0,
+     3.0
+    ],
+    "min": [
+     94.0,
+     57.0,
+     0.0
+    ],
+    "tol": 1e-06,
+    "volume": 6.0
+   },
+   "towards an intersection": {
+    "max": [
+     101.0,
+     51.1,
+     3.0
+    ],
+    "min": [
+     99.0,
+     48.9,
+     0.0
+    ],
+    "tol": 1e-06,
+    "volume": 6.0
+   },
+   "with offsets": {
+    "max": [
+     94.0,
+     60.0,
+     5.0
+    ],
+    "min": [
+     93.0,
+     58.0,
+     2.0
+    ],
+    "tol": 1e-06,
+    "volume": 6.0
+   }
+  }
+ },
+ "grid_ifc4x3.ifc": {
+  "elements": {
+   "at an intersection": {
+    "max": [
+     100.5,
+     59.0,
+     3
+    ],
+    "min": [
+     99.5,
+     57.0,
+     0
+    ],
+    "tol": 1e-06,
+    "volume": 6.0
+   }
+  }
+ },
  "ifc2x3_feet.ifc": {
   "elements": {
    "feet wall": {
@@ -638,6 +923,119 @@
    }
   }
  },
+ "storeys.ifc": {
+  "membership": {
+   "shed": null,
+   "table": "Level 1",
+   "wall Level 0": "Level 0",
+   "wall Level 1": "Level 1",
+   "wall Level 2": "Level 2"
+  },
+  "storeys": [
+   [
+    "Level 0",
+    0.0
+   ],
+   [
+    "Level 1",
+    3.0
+   ],
+   [
+    "Level 2",
+    6.0
+   ]
+  ]
+ },
+ "sweep_params.ifc": {
+  "elements": {
+   "disk on circle": {
+    "tol": 0.03,
+    "volume": 0.09869604401089359
+   },
+   "disk on composite": {
+    "max": [
+     22.1,
+     1,
+     0.1
+    ],
+    "min": [
+     21,
+     -0.1,
+     -0.1
+    ],
+    "tol": 0.03,
+    "volume": 0.06283185307179587
+   },
+   "disk on polyline": {
+    "max": [
+     2.1,
+     1,
+     0.1
+    ],
+    "min": [
+     1,
+     -0.1,
+     -0.1
+    ],
+    "tol": 0.03,
+    "volume": 0.06283185307179587
+   },
+   "disk on polyline reversed": {
+    "max": [
+     12.1,
+     1,
+     0.1
+    ],
+    "min": [
+     11,
+     -0.1,
+     -0.1
+    ],
+    "tol": 0.03,
+    "volume": 0.06283185307179587
+   },
+   "disk on trimmed circle": {
+    "tol": 0.03,
+    "volume": 0.09869604401089359
+   },
+   "disk past the ends": {
+    "tol": 0.03,
+    "volume": 0.12566370614359174
+   },
+   "disk whole": {
+    "tol": 0.03,
+    "volume": 0.12566370614359174
+   },
+   "fixed reference on a line": {
+    "max": [
+     60.1,
+     3,
+     0.2
+    ],
+    "min": [
+     59.9,
+     1,
+     -0.2
+    ],
+    "tol": 1e-06,
+    "volume": 0.16
+   },
+   "surface curve swept": {
+    "max": [
+     50.2,
+     3,
+     0.1
+    ],
+    "min": [
+     49.8,
+     1,
+     -0.1
+    ],
+    "tol": 1e-06,
+    "volume": 0.16
+   }
+  }
+ },
  "tessellated.ifc": {
   "elements": {
    "brep": {
diff --git a/crates/exav-render/tests/fixtures/ifc/grid.ifc b/crates/exav-render/tests/fixtures/ifc/grid.ifc
new file mode 100644
index 00000000..d45a12de
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ifc/grid.ifc
@@ -0,0 +1,112 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('fixture','2026-01-01T00:00:00',(''),(''),'make.py','exav','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#2=IFCDIRECTION((0.0,0.0,1.0));
+#3=IFCDIRECTION((1.0,0.0,0.0));
+#4=IFCAXIS2PLACEMENT3D(#1,#2,#3);
+#5=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#4,$);
+#6=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#7=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#8=IFCUNITASSIGNMENT((#6,#7));
+#9=IFCPROJECT('0000000000000000000001',$,'Fixtures',$,$,$,$,(#5),#8);
+#10=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#11=IFCAXIS2PLACEMENT3D(#10,$,$);
+#12=IFCLOCALPLACEMENT($,#11);
+#13=IFCSITE('0000000000000000000002',$,'Site',$,$,#12,$,$,.ELEMENT.,$,$,$,$,$);
+#14=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#15=IFCAXIS2PLACEMENT3D(#14,$,$);
+#16=IFCLOCALPLACEMENT(#12,#15);
+#17=IFCBUILDING('0000000000000000000003',$,'Building',$,$,#16,$,$,.ELEMENT.,$,$,$);
+#18=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#19=IFCAXIS2PLACEMENT3D(#18,$,$);
+#20=IFCLOCALPLACEMENT(#16,#19);
+#21=IFCBUILDINGSTOREY('0000000000000000000004',$,'Level 0',$,$,#20,$,$,.ELEMENT.,0.);
+#22=IFCRELAGGREGATES('0000000000000000000005',$,$,$,#9,(#13));
+#23=IFCRELAGGREGATES('0000000000000000000006',$,$,$,#13,(#17));
+#24=IFCRELAGGREGATES('0000000000000000000007',$,$,$,#17,(#21));
+#25=IFCDIRECTION((0.0,0.0,1.0));
+#26=IFCDIRECTION((0.0,1.0,0.0));
+#27=IFCCARTESIANPOINT((100.0,50.0,0.0));
+#28=IFCAXIS2PLACEMENT3D(#27,#25,#26);
+#29=IFCLOCALPLACEMENT(#20,#28);
+#30=IFCCARTESIANPOINT((0.0,0.0));
+#31=IFCCARTESIANPOINT((20.0,0.0));
+#32=IFCPOLYLINE((#30,#31));
+#33=IFCGRIDAXIS('1',#32,.T.);
+#34=IFCCARTESIANPOINT((0.0,6.0));
+#35=IFCCARTESIANPOINT((20.0,6.0));
+#36=IFCPOLYLINE((#34,#35));
+#37=IFCGRIDAXIS('2',#36,.T.);
+#38=IFCDIRECTION((0.0,1.0));
+#39=IFCVECTOR(#38,1.);
+#40=IFCCARTESIANPOINT((0.0,0.0));
+#41=IFCLINE(#40,#39);
+#42=IFCGRIDAXIS('A',#41,.T.);
+#43=IFCCARTESIANPOINT((8.0,0.0));
+#44=IFCLINE(#43,#39);
+#45=IFCGRIDAXIS('B',#44,.T.);
+#46=IFCCARTESIANPOINT((0.0,6.0));
+#47=IFCCARTESIANPOINT((20.0,6.0));
+#48=IFCPOLYLINE((#46,#47));
+#49=IFCGRIDAXIS('2r',#48,.F.);
+#50=IFCGRID('0000000000000000000008',$,'Grid',$,$,#29,$,(#33,#37,#49),(#42,#45),$,$);
+#51=IFCVIRTUALGRIDINTERSECTION((#33,#45),(0.0,0.0,0.0));
+#52=IFCCARTESIANPOINT((0.0,0.0));
+#53=IFCAXIS2PLACEMENT2D(#52,$);
+#54=IFCRECTANGLEPROFILEDEF(.AREA.,$,#53,2.0,1.0);
+#55=IFCDIRECTION((0.0,0.0,1.0));
+#56=IFCEXTRUDEDAREASOLID(#54,$,#55,3.0);
+#57=IFCGRIDPLACEMENT(#51,$);
+#58=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#56));
+#59=IFCPRODUCTDEFINITIONSHAPE($,$,(#58));
+#60=IFCCOLUMN('0000000000000000000009',$,'at an intersection',$,$,#57,#59,$,$);
+#61=IFCVIRTUALGRIDINTERSECTION((#37,#45),(0.5,-1.0,2.0));
+#62=IFCCARTESIANPOINT((0.0,0.0));
+#63=IFCAXIS2PLACEMENT2D(#62,$);
+#64=IFCRECTANGLEPROFILEDEF(.AREA.,$,#63,2.0,1.0);
+#65=IFCDIRECTION((0.0,0.0,1.0));
+#66=IFCEXTRUDEDAREASOLID(#64,$,#65,3.0);
+#67=IFCGRIDPLACEMENT(#61,$);
+#68=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#66));
+#69=IFCPRODUCTDEFINITIONSHAPE($,$,(#68));
+#70=IFCCOLUMN('0000000000000000000010',$,'with offsets',$,$,#67,#69,$,$);
+#71=IFCVIRTUALGRIDINTERSECTION((#49,#45),(0.5,0.0));
+#72=IFCCARTESIANPOINT((0.0,0.0));
+#73=IFCAXIS2PLACEMENT2D(#72,$);
+#74=IFCRECTANGLEPROFILEDEF(.AREA.,$,#73,2.0,1.0);
+#75=IFCDIRECTION((0.0,0.0,1.0));
+#76=IFCEXTRUDEDAREASOLID(#74,$,#75,3.0);
+#77=IFCGRIDPLACEMENT(#71,$);
+#78=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#76));
+#79=IFCPRODUCTDEFINITIONSHAPE($,$,(#78));
+#80=IFCCOLUMN('0000000000000000000011',$,'on a reversed axis',$,$,#77,#79,$,$);
+#81=IFCVIRTUALGRIDINTERSECTION((#33,#42),(0.0,0.0));
+#82=IFCDIRECTION((0.0,1.0));
+#83=IFCCARTESIANPOINT((0.0,0.0));
+#84=IFCAXIS2PLACEMENT2D(#83,$);
+#85=IFCRECTANGLEPROFILEDEF(.AREA.,$,#84,2.0,1.0);
+#86=IFCDIRECTION((0.0,0.0,1.0));
+#87=IFCEXTRUDEDAREASOLID(#85,$,#86,3.0);
+#88=IFCGRIDPLACEMENT(#81,#82);
+#89=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#87));
+#90=IFCPRODUCTDEFINITIONSHAPE($,$,(#89));
+#91=IFCCOLUMN('0000000000000000000012',$,'along a direction',$,$,#88,#90,$,$);
+#92=IFCVIRTUALGRIDINTERSECTION((#33,#42),(0.0,0.0));
+#93=IFCVIRTUALGRIDINTERSECTION((#37,#45),(0.0,0.0));
+#94=IFCCARTESIANPOINT((0.0,0.0));
+#95=IFCAXIS2PLACEMENT2D(#94,$);
+#96=IFCRECTANGLEPROFILEDEF(.AREA.,$,#95,2.0,1.0);
+#97=IFCDIRECTION((0.0,0.0,1.0));
+#98=IFCEXTRUDEDAREASOLID(#96,$,#97,3.0);
+#99=IFCGRIDPLACEMENT(#92,#93);
+#100=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#98));
+#101=IFCPRODUCTDEFINITIONSHAPE($,$,(#100));
+#102=IFCCOLUMN('0000000000000000000013',$,'towards an intersection',$,$,#99,#101,$,$);
+#103=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000014',$,$,$,(#60,#70,#80,#91,#102),#21);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-render/tests/fixtures/ifc/grid_ifc4x3.ifc b/crates/exav-render/tests/fixtures/ifc/grid_ifc4x3.ifc
new file mode 100644
index 00000000..49cbc51b
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ifc/grid_ifc4x3.ifc
@@ -0,0 +1,58 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('fixture','2026-01-01T00:00:00',(''),(''),'make.py','exav','');
+FILE_SCHEMA(('IFC4X3_ADD2'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#2=IFCDIRECTION((0.0,0.0,1.0));
+#3=IFCDIRECTION((1.0,0.0,0.0));
+#4=IFCAXIS2PLACEMENT3D(#1,#2,#3);
+#5=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#4,$);
+#6=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#7=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#8=IFCUNITASSIGNMENT((#6,#7));
+#9=IFCPROJECT('0000000000000000000001',$,'Fixtures',$,$,$,$,(#5),#8);
+#10=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#11=IFCAXIS2PLACEMENT3D(#10,$,$);
+#12=IFCLOCALPLACEMENT($,#11);
+#13=IFCSITE('0000000000000000000002',$,'Site',$,$,#12,$,$,.ELEMENT.,$,$,$,$,$);
+#14=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#15=IFCAXIS2PLACEMENT3D(#14,$,$);
+#16=IFCLOCALPLACEMENT(#12,#15);
+#17=IFCBUILDING('0000000000000000000003',$,'Building',$,$,#16,$,$,.ELEMENT.,$,$,$);
+#18=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#19=IFCAXIS2PLACEMENT3D(#18,$,$);
+#20=IFCLOCALPLACEMENT(#16,#19);
+#21=IFCBUILDINGSTOREY('0000000000000000000004',$,'Level 0',$,$,#20,$,$,.ELEMENT.,0.);
+#22=IFCRELAGGREGATES('0000000000000000000005',$,$,$,#9,(#13));
+#23=IFCRELAGGREGATES('0000000000000000000006',$,$,$,#13,(#17));
+#24=IFCRELAGGREGATES('0000000000000000000007',$,$,$,#17,(#21));
+#25=IFCDIRECTION((0.0,0.0,1.0));
+#26=IFCDIRECTION((0.0,1.0,0.0));
+#27=IFCCARTESIANPOINT((100.0,50.0,0.0));
+#28=IFCAXIS2PLACEMENT3D(#27,#25,#26);
+#29=IFCLOCALPLACEMENT(#20,#28);
+#30=IFCCARTESIANPOINT((0.0,0.0));
+#31=IFCCARTESIANPOINT((20.0,0.0));
+#32=IFCPOLYLINE((#30,#31));
+#33=IFCGRIDAXIS('1',#32,.T.);
+#34=IFCCARTESIANPOINT((8.0,-1.0));
+#35=IFCCARTESIANPOINT((8.0,9.0));
+#36=IFCPOLYLINE((#34,#35));
+#37=IFCGRIDAXIS('A',#36,.T.);
+#38=IFCGRID('0000000000000000000008',$,'Grid',$,$,#29,$,(#33),(#37),$,$);
+#39=IFCVIRTUALGRIDINTERSECTION((#33,#37),(0.,0.,0.));
+#40=IFCCARTESIANPOINT((0.0,0.0));
+#41=IFCAXIS2PLACEMENT2D(#40,$);
+#42=IFCRECTANGLEPROFILEDEF(.AREA.,$,#41,2.0,1.0);
+#43=IFCDIRECTION((0.0,0.0,1.0));
+#44=IFCEXTRUDEDAREASOLID(#42,$,#43,3.0);
+#45=IFCGRIDPLACEMENT(#29,#39,$);
+#46=IFCSHAPEREPRESENTATION(#5,'Body','SweptSolid',(#44));
+#47=IFCPRODUCTDEFINITIONSHAPE($,$,(#46));
+#48=IFCCOLUMN('0000000000000000000009',$,'at an intersection',$,$,#45,#47,$,$);
+#49=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000010',$,$,$,(#48),#21);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-render/tests/fixtures/ifc/make.py b/crates/exav-render/tests/fixtures/ifc/make.py
index cbfea623..5c51f060 100644
--- a/crates/exav-render/tests/fixtures/ifc/make.py
+++ b/crates/exav-render/tests/fixtures/ifc/make.py
@@ -101,9 +101,9 @@ def shape(self, items, kind="SweptSolid", ident="Body"):
         rep = s.e(f"IFCSHAPEREPRESENTATION({self.ctx},'{ident}','{kind}',({','.join(items)}))")
         return s.e(f"IFCPRODUCTDEFINITIONSHAPE($,$,({rep}))")
 
-    def element(self, cls, name, items, at=(0, 0, 0), kind="SweptSolid", rel=None, extra=None, contained=True, **pl):
+    def element(self, cls, name, items, at=(0, 0, 0), kind="SweptSolid", rel=None, extra=None, contained=True, placement=None, **pl):
         s = self.s
-        place = self.place(rel or self.storey_pl, *at, **pl)
+        place = placement or self.place(rel or self.storey_pl, *at, **pl)
         shape = self.shape(items, kind)
         # Tag, and in IFC4 PredefinedType.
         tail = extra if extra is not None else (",$" if s.schema == "IFC2X3" else ",$,$")
@@ -122,7 +122,8 @@ def extrude(self, profile, depth, direction=(0.0, 0.0, 1.0), position="$"):
 
     def write(self, name, expect):
         s = self.s
-        s.e(f"IFCRELCONTAINEDINSPATIALSTRUCTURE({s.guid()},{self.owner},$,$,({','.join(self.elements)}),{self.storey})")
+        if self.elements:
+            s.e(f"IFCRELCONTAINEDINSPATIALSTRUCTURE({s.guid()},{self.owner},$,$,({','.join(self.elements)}),{self.storey})")
         with open(os.path.join(HERE, name), "w") as f:
             f.write(s.text())
         EXPECTED[name] = expect
@@ -503,6 +504,461 @@ def damaged():
     m.write("damaged.ifc", {"elements": {"good": box(0, 0, 0, 1, 1, 1)}, "absent": ["placement loop", "mapped loop", "boolean loop", "missing", "broken"], "damaged": True})
 
 
+def circle(m, cx, cy, cz, r, axis, ref):
+    """An IfcCircle at (cx, cy, cz), its z axis `axis` and x axis `ref`."""
+    return m.s.e(f"IFCCIRCLE({m.axis(cx, cy, cz, zdir=axis, xdir=ref)},{fnum(r)})")
+
+
+def trimmed(s, curve, a, b):
+    """An arc of `curve` from parameter a to b (radians)."""
+    return s.e(f"IFCTRIMMEDCURVE({curve},(IFCPARAMETERVALUE({fnum(a)})),(IFCPARAMETERVALUE({fnum(b)})),.T.,.PARAMETER.)")
+
+
+def vertex(s, p):
+    return s.e(f"IFCVERTEXPOINT({pt(s, *p)})")
+
+
+def edge(s, a, b, geometry):
+    return s.e(f"IFCEDGECURVE({a},{b},{geometry},.T.)")
+
+
+def oriented(s, e, forward=True):
+    return s.e(f"IFCORIENTEDEDGE(*,*,{e},{'.T.' if forward else '.F.'})")
+
+
+def loop(s, *edges):
+    """An edge loop of (edge, forward) pairs."""
+    return s.e("IFCEDGELOOP((" + ",".join(oriented(s, e, f) for e, f in edges) + "))")
+
+
+def face(s, loops, surface, outer_bound=True):
+    """An advanced face; `outer_bound` False writes every bound as a plain
+    IfcFaceBound, as some writers do for a tube."""
+    bounds = [s.e(f"IFCFACEOUTERBOUND({l},.T.)" if i == 0 and outer_bound else f"IFCFACEBOUND({l},.T.)") for i, l in enumerate(loops)]
+    return s.e(f"IFCADVANCEDFACE(({','.join(bounds)}),{surface},.T.)")
+
+
+def curved_faces():
+    """Faces of B-reps on spheres, tori, cylinders and B-spline surfaces,
+    each with a closed form for its volume or area. tests/ifc_geometry.rs
+    also checks that every point lies on the surface."""
+    m = Model()
+    s = m.s
+    exp = {}
+    R = 2.0
+    sphere = s.e(f"IFCSPHERICALSURFACE({m.axis()},{fnum(R)})")
+    equator = circle(m, 0, 0, 0, R, (0, 0, 1), (1, 0, 0))
+    v0 = vertex(s, (R, 0, 0))
+    e_eq = edge(s, v0, v0, equator)
+    floor = s.e(f"IFCPLANE({m.axis()})")
+    # A hemisphere: its cap has the equator for its only edge, so the pole
+    # is inside the face. The loop runs counter-clockwise seen from +z: the
+    # face is the northern cap.
+    cap = face(s, [loop(s, (e_eq, True))], sphere)
+    disk = face(s, [loop(s, (e_eq, False))], floor)
+    shell = s.e(f"IFCCLOSEDSHELL(({cap},{disk}))")
+    m.element("IFCBUILDINGELEMENTPROXY", "hemisphere", [s.e(f"IFCADVANCEDBREP({shell})")], at=(0, 0, 0), kind="AdvancedBrep")
+    exp["hemisphere"] = dict(volume=2 / 3 * math.pi * R**3, area=3 * math.pi * R**2, min=[-R, -R, 0], max=[R, R, R], tol=0.03)
+    # The same turned over: the loop runs the other way, the face is the
+    # southern cap.
+    cap = face(s, [loop(s, (e_eq, False))], sphere)
+    disk = face(s, [loop(s, (e_eq, True))], floor)
+    shell = s.e(f"IFCCLOSEDSHELL(({cap},{disk}))")
+    m.element("IFCBUILDINGELEMENTPROXY", "bowl", [s.e(f"IFCADVANCEDBREP({shell})")], at=(10, 0, 0), kind="AdvancedBrep")
+    exp["bowl"] = dict(volume=2 / 3 * math.pi * R**3, area=3 * math.pi * R**2, min=[10 - R, -R, -R], max=[10 + R, R, 0], tol=0.03)
+
+    # A patch of a sphere between two parallels and two meridians, an open
+    # surface: lon 0..90 degrees, lat 0.3..0.9 radians.
+    lat0, lat1, lon1 = 0.3, 0.9, math.pi / 2
+    c = lambda lat, lon: (R * math.cos(lat) * math.cos(lon), R * math.cos(lat) * math.sin(lon), R * math.sin(lat))
+    a, b, cc, d = (vertex(s, c(lat0, 0)), vertex(s, c(lat0, lon1)), vertex(s, c(lat1, lon1)), vertex(s, c(lat1, 0)))
+    parallel = lambda lat: circle(m, 0, 0, R * math.sin(lat), R * math.cos(lat), (0, 0, 1), (1, 0, 0))
+    e_ab = edge(s, a, b, trimmed(s, parallel(lat0), 0, lon1))
+    e_dc = edge(s, d, cc, trimmed(s, parallel(lat1), 0, lon1))
+    # Meridians: circles through the poles, parametrised by latitude.
+    e_bc = edge(s, b, cc, trimmed(s, circle(m, 0, 0, 0, R, (1, 0, 0), (0, 1, 0)), lat0, lat1))
+    e_ad = edge(s, a, d, trimmed(s, circle(m, 0, 0, 0, R, (0, -1, 0), (1, 0, 0)), lat0, lat1))
+    patch = face(s, [loop(s, (e_ab, True), (e_bc, True), (e_dc, False), (e_ad, False))], sphere)
+    model = s.e(f"IFCSHELLBASEDSURFACEMODEL(({s.e(f'IFCOPENSHELL(({patch}))')}))")
+    m.element("IFCCOVERING", "sphere patch", [model], at=(20, 0, 0), kind="SurfaceModel")
+    exp["sphere patch"] = dict(
+        area=R * R * lon1 * (math.sin(lat1) - math.sin(lat0)),
+        min=[20, 0, R * math.sin(lat0)],
+        max=[20 + R * math.cos(lat0), R * math.cos(lat0), R * math.sin(lat1)],
+        tol=0.02,
+    )
+
+    # A quarter of a torus (major radius 3, minor 1) turned about z from the
+    # x axis to the y axis, a face with a seam, and two flat ends.
+    big, small = 3.0, 1.0
+    torus = s.e(f"IFCTOROIDALSURFACE({m.axis()},{fnum(big)},{fnum(small)})")
+    va, vb = vertex(s, (big + small, 0, 0)), vertex(s, (0, big + small, 0))
+    c1 = circle(m, big, 0, 0, small, (0, -1, 0), (1, 0, 0))
+    c2 = circle(m, 0, big, 0, small, (1, 0, 0), (0, 1, 0))
+    e1, e2 = edge(s, va, va, c1), edge(s, vb, vb, c2)
+    seam = edge(s, va, vb, trimmed(s, circle(m, 0, 0, 0, big + small, (0, 0, 1), (1, 0, 0)), 0, math.pi / 2))
+    lateral = face(s, [loop(s, (e1, True), (seam, True), (e2, False), (seam, False))], torus)
+    # The ends face out of the solid: -y at the first, -x at the second; the
+    # circles turn about -y and +x.
+    end1 = face(s, [loop(s, (e1, True))], s.e(f"IFCPLANE({m.axis(0, 0, 0, zdir=(0, 1, 0), xdir=(1, 0, 0))})"))
+    end2 = face(s, [loop(s, (e2, False))], s.e(f"IFCPLANE({m.axis(0, 0, 0, zdir=(1, 0, 0), xdir=(0, 1, 0))})"))
+    shell = s.e(f"IFCCLOSEDSHELL(({lateral},{end1},{end2}))")
+    m.element("IFCBUILDINGELEMENTPROXY", "torus elbow", [s.e(f"IFCADVANCEDBREP({shell})")], at=(30, 0, 0), kind="AdvancedBrep")
+    exp["torus elbow"] = dict(
+        volume=math.pi * small**2 * big * math.pi / 2,
+        area=2 * math.pi * small * big * math.pi / 2 + 2 * math.pi * small**2,
+        min=[30, 0, -small],
+        max=[30 + big + small, big + small, small],
+        tol=0.03,
+    )
+
+    # A cylinder whose side has two circles for bounds and no seam between
+    # them (written as two plain face bounds), closed by two disks.
+    r, h = 1.5, 4.0
+    cyl = s.e(f"IFCCYLINDRICALSURFACE({m.axis()},{fnum(r)})")
+    cb = circle(m, 0, 0, 0, r, (0, 0, 1), (1, 0, 0))
+    ct = circle(m, 0, 0, h, r, (0, 0, 1), (1, 0, 0))
+    vb0, vt0 = vertex(s, (r, 0, 0)), vertex(s, (r, 0, h))
+    eb, et = edge(s, vb0, vb0, cb), edge(s, vt0, vt0, ct)
+    side = face(s, [loop(s, (eb, True)), loop(s, (et, True))], cyl, outer_bound=False)
+    bottom = face(s, [loop(s, (eb, False))], s.e(f"IFCPLANE({m.axis()})"))
+    top = face(s, [loop(s, (et, True))], s.e(f"IFCPLANE({m.axis(0, 0, h)})"))
+    shell = s.e(f"IFCCLOSEDSHELL(({side},{bottom},{top}))")
+    m.element("IFCBUILDINGELEMENTPROXY", "tube without seam", [s.e(f"IFCADVANCEDBREP({shell})")], at=(40, 0, 0), kind="AdvancedBrep")
+    exp["tube without seam"] = dict(
+        volume=math.pi * r * r * h,
+        area=2 * math.pi * r * h + 2 * math.pi * r * r,
+        min=[40 - r, -r, 0],
+        max=[40 + r, r, h],
+        tol=0.02,
+    )
+
+    # A quarter of a cylinder as a rational B-spline surface (radius 2,
+    # height 5), cut to 15..75 degrees and 1..4 high by four straight
+    # edges: the face is the part of the surface inside them.
+    r, h, w = 2.0, 5.0, math.sqrt(2) / 2
+    p3 = lambda x, y, z: pt(s, x, y, z)
+    rows = ",".join(f"({p3(x, y, 0)},{p3(x, y, h)})" for x, y in [(r, 0), (r, r), (0, r)])
+    spline = s.e(f"IFCRATIONALBSPLINESURFACEWITHKNOTS(2,1,({rows}),.UNSPECIFIED.,.F.,.F.,.F.,(3,3),(2,2),(0.,1.),(0.,1.),.UNSPECIFIED.,((1.,1.),({fnum(w)},{fnum(w)}),(1.,1.)))")
+    t0, t1, z0, z1 = math.radians(15), math.radians(75), 1.0, 4.0
+    corner = lambda t, z: vertex(s, (r * math.cos(t), r * math.sin(t), z))
+    k = [corner(t0, z0), corner(t1, z0), corner(t1, z1), corner(t0, z1)]
+    straight = lambda i, j: edge(s, k[i], k[j], s.e("IFCPOLYLINE((" + ",".join(s.e(f"IFCCARTESIANPOINT(({','.join(fnum(v) for v in p)}))") for p in [pos[i], pos[j]]) + "))"))
+    pos = [(r * math.cos(t0), r * math.sin(t0), z0), (r * math.cos(t1), r * math.sin(t1), z0), (r * math.cos(t1), r * math.sin(t1), z1), (r * math.cos(t0), r * math.sin(t0), z1)]
+    patch = face(s, [loop(s, (straight(0, 1), True), (straight(1, 2), True), (straight(2, 3), True), (straight(3, 0), True))], spline)
+    model = s.e(f"IFCSHELLBASEDSURFACEMODEL(({s.e(f'IFCOPENSHELL(({patch}))')}))")
+    m.element("IFCCOVERING", "spline patch", [model], at=(50, 0, 0), kind="SurfaceModel")
+    exp["spline patch"] = dict(
+        area=r * (t1 - t0) * (z1 - z0),
+        min=[50 + r * math.cos(t1), r * math.sin(t0), z0],
+        max=[50 + r * math.cos(t0), r * math.sin(t1), z1],
+        tol=0.02,
+    )
+
+    # A flat B-spline square (4 x 4, degree 2) cut to the square from 0.5 to
+    # 3.5 with a round hole of radius 1 at its middle.
+    rows = ",".join("(" + ",".join(p3(2.0 * i, 2.0 * j, 0) for j in range(3)) + ")" for i in range(3))
+    plate = s.e(f"IFCBSPLINESURFACEWITHKNOTS(2,2,({rows}),.UNSPECIFIED.,.F.,.F.,.F.,(3,3),(3,3),(0.,1.),(0.,1.),.UNSPECIFIED.)")
+    q = [(0.5, 0.5), (3.5, 0.5), (3.5, 3.5), (0.5, 3.5)]
+    qv = [vertex(s, (x, y, 0)) for x, y in q]
+    sides = []
+    for i in range(4):
+        x0, y0 = q[i]
+        x1, y1 = q[(i + 1) % 4]
+        line = s.e("IFCPOLYLINE((" + pt(s, x0, y0, 0) + "," + pt(s, x1, y1, 0) + "))")
+        sides.append((edge(s, qv[i], qv[(i + 1) % 4], line), True))
+    hole_c = circle(m, 2, 2, 0, 1.0, (0, 0, 1), (1, 0, 0))
+    vh = vertex(s, (3, 2, 0))
+    hole = edge(s, vh, vh, hole_c)
+    cut = face(s, [loop(s, *sides), loop(s, (hole, False))], plate)
+    model = s.e(f"IFCSHELLBASEDSURFACEMODEL(({s.e(f'IFCOPENSHELL(({cut}))')}))")
+    m.element("IFCCOVERING", "plate with hole", [model], at=(60, 0, 0), kind="SurfaceModel")
+    # The hole is the 32-gon the circle is sampled with.
+    exp["plate with hole"] = dict(area=9.0 - 16 * math.sin(2 * math.pi / 32), min=[60.5, 0.5, 0], max=[63.5, 3.5, 0], tol=1e-4)
+    # Caps cut by a circle in a tilted plane (axis 45 degrees up), so that
+    # their parameters make no rectangle: one that stays clear of the pole
+    # (angular radius 25.8 degrees), one that holds it (53.1 degrees). The
+    # area of a cap is 2 pi R^2 (1 - cos of its angular radius).
+    nx = nz = math.sqrt(0.5)
+    for k, (name, h) in enumerate([("tilted cap", 1.8), ("tilted cap with the pole", 1.2)]):
+        rho = math.sqrt(R * R - h * h)
+        rim = circle(m, h * nx, 0, h * nz, rho, (nx, 0, nz), (0, 1, 0))
+        vr = vertex(s, (h * nx, rho, h * nz))
+        er = edge(s, vr, vr, rim)
+        cap = face(s, [loop(s, (er, True))], sphere)
+        model = s.e(f"IFCSHELLBASEDSURFACEMODEL(({s.e(f'IFCOPENSHELL(({cap}))')}))")
+        m.element("IFCCOVERING", name, [model], at=(70 + 10 * k, 0, 0), kind="SurfaceModel")
+        exp[name] = dict(area=2 * math.pi * R * R * (1 - h / R), tol=0.03)
+    m.write("curved_faces.ifc", {"elements": exp})
+
+
+def sweep_params():
+    """Sweeps between a start and an end parameter, along each kind of
+    directrix that publishes one. The angle unit is the degree."""
+
+    def units(s):
+        metre = s.e("IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.)")
+        rad = s.e("IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.)")
+        measure = s.e(f"IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453292519943295),{rad})")
+        deg = s.e(f"IFCCONVERSIONBASEDUNIT({s.e('IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0)')},.PLANEANGLEUNIT.,'DEGREE',{measure})")
+        return metre, deg
+
+    m = Model(units=units)
+    s = m.s
+    exp = {}
+    rad = 0.1
+    tube = math.pi * rad * rad
+    poly = lambda *ps: s.e("IFCPOLYLINE((" + ",".join(pt(s, *p) for p in ps) + "))")
+    L = (0, 0, 0), (2, 0, 0), (2, 2, 0)
+    # Index parameters of a polyline: 0.5 is half way along the first side,
+    # 1.5 half way along the second: a path of 1 + 1.
+    m.element("IFCPIPESEGMENT", "disk on polyline", [s.e(f"IFCSWEPTDISKSOLID({poly(*L)},{fnum(rad)},$,0.5,1.5)")], at=(0, 0, 0))
+    exp["disk on polyline"] = dict(volume=tube * 2.0, min=[1, -rad, -rad], max=[2 + rad, 1, rad], tol=0.03)
+    # The same path asked for from the far end: the same solid.
+    m.element("IFCPIPESEGMENT", "disk on polyline reversed", [s.e(f"IFCSWEPTDISKSOLID({poly(*L)},{fnum(rad)},$,1.5,0.5)")], at=(10, 0, 0))
+    exp["disk on polyline reversed"] = dict(volume=tube * 2.0, min=[11, -rad, -rad], max=[12 + rad, 1, rad], tol=0.03)
+    # Parameters beyond the ends are the ends.
+    m.element("IFCPIPESEGMENT", "disk past the ends", [s.e(f"IFCSWEPTDISKSOLID({poly(*L)},{fnum(rad)},$,-3.,9.)")], at=(15, 0, 0))
+    exp["disk past the ends"] = dict(volume=tube * 4.0, tol=0.03)
+    # A composite curve of two polylines is parametrised by the sum of its
+    # segments' parametric lengths: 0..1 and 1..2.
+    segs = [s.e(f"IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,{poly(L[0], L[1])})"), s.e(f"IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,{poly(L[1], L[2])})")]
+    cc = s.e(f"IFCCOMPOSITECURVE(({','.join(segs)}),.F.)")
+    m.element("IFCPIPESEGMENT", "disk on composite", [s.e(f"IFCSWEPTDISKSOLID({cc},{fnum(rad)},$,0.5,1.5)")], at=(20, 0, 0))
+    exp["disk on composite"] = dict(volume=tube * 2.0, min=[21, -rad, -rad], max=[22 + rad, 1, rad], tol=0.03)
+    # A circle of radius 2 swept from 0 to 90 degrees (the file's unit).
+    circ = circle(m, 0, 0, 0, 2.0, (0, 0, 1), (1, 0, 0))
+    m.element("IFCPIPESEGMENT", "disk on circle", [s.e(f"IFCSWEPTDISKSOLID({circ},{fnum(rad)},$,0.,90.)")], at=(30, 0, 0))
+    # The end caps are square to the last chord of the arc, not to the arc:
+    # the extents are those of the arc, a hundredth of a metre either way.
+    exp["disk on circle"] = dict(volume=tube * math.pi, tol=0.03)
+    # A trimmed circle: the parameters are those of the basis circle, so the
+    # whole half circle from 90 to 270 degrees is swept from 135 to 225.
+    half = s.e(f"IFCTRIMMEDCURVE({circ},(IFCPARAMETERVALUE(90.)),(IFCPARAMETERVALUE(270.)),.T.,.PARAMETER.)")
+    m.element("IFCPIPESEGMENT", "disk on trimmed circle", [s.e(f"IFCSWEPTDISKSOLID({half},{fnum(rad)},$,135.,225.)")], at=(40, 0, 0))
+    exp["disk on trimmed circle"] = dict(volume=tube * math.pi, tol=0.03)
+    # Surface curve swept and fixed reference sweeps (the profile 0.2 x 0.4).
+    plane = s.e(f"IFCPLANE({m.axis()})")
+    line3 = poly((0, 0, 0), (0, 1, 0), (0, 3, 0))
+    sw = s.e(f"IFCSURFACECURVESWEPTAREASOLID({m.rect(0.2, 0.4)},$,{line3},1.,2.,{plane})")
+    m.element("IFCBEAM", "surface curve swept", [sw], at=(50, 0, 0))
+    exp["surface curve swept"] = dict(volume=0.08 * 2.0, min=[49.8, 1, -0.1], max=[50.2, 3, 0.1], tol=1e-6)
+    # An unbounded line is parametrised by multiples of its vector.
+    unbounded = s.e(f"IFCLINE({pt(s, 0., 0., 0.)},{s.e(f'IFCVECTOR({dr(s, 0., 1., 0.)},2.)')})")
+    fr = s.e(f"IFCFIXEDREFERENCESWEPTAREASOLID({m.rect(0.2, 0.4)},$,{unbounded},0.5,1.5,{dr(s, 1., 0., 0.)})")
+    m.element("IFCBEAM", "fixed reference on a line", [fr], at=(60, 0, 0))
+    exp["fixed reference on a line"] = dict(volume=0.08 * 2.0, min=[59.9, 1, -0.2], max=[60.1, 3, 0.2], tol=1e-6)
+    # No parameters at all: the whole directrix, as before.
+    m.element("IFCPIPESEGMENT", "disk whole", [s.e(f"IFCSWEPTDISKSOLID({poly(*L)},{fnum(rad)},$,$,$)")], at=(70, 0, 0))
+    exp["disk whole"] = dict(volume=tube * 4.0, tol=0.03)
+    m.write("sweep_params.ifc", {"elements": exp})
+
+
+def alignment():
+    """An IFC4X3 alignment: a plan of a line, a clothoid, a left arc, a
+    right arc (a negative segment length) and a line, and a profile of two
+    gradients, as `IfcCurveSegment`s of an `IfcGradientCurve`. Stations and
+    heights below are integrated here, apart from the reader."""
+    m = Model(schema="IFC4X3_ADD2")
+    s = m.s
+    exp = {}
+    P = lambda x, y: pt(s, x, y)
+    D = lambda x, y: dr(s, x, y)
+    seg = lambda x, y, hx, hy, start, length, parent: s.e(
+        f"IFCCURVESEGMENT(.CONTINUOUS.,{s.e(f'IFCAXIS2PLACEMENT2D({P(x, y)},{D(hx, hy)})')},IFCLENGTHMEASURE({fnum(start)}),IFCLENGTHMEASURE({fnum(length)}),{parent})"
+    )
+    line = s.e(f"IFCLINE({P(0., 0.)},{s.e(f'IFCVECTOR({D(1., 0.)},1.)')})")
+    origin2 = s.e(f"IFCAXIS2PLACEMENT2D({P(0., 0.)},{D(1., 0.)})")
+    R3, R4, L2, L3, L4 = 300.0, 200.0, 60.0, 120.0, 100.0
+    A = math.sqrt(R3 * L2)
+    clothoid = s.e(f"IFCCLOTHOID({origin2},{fnum(A)})")
+    arc3 = s.e(f"IFCCIRCLE({origin2},{fnum(R3)})")
+    arc4 = s.e(f"IFCCIRCLE({origin2},{fnum(R4)})")
+
+    def fresnel(a, s_end, n=20000):
+        """The integral of cos and sin of s^2 / (2 A^2) from 0 to s_end
+        (Simpson)."""
+        h = s_end / n
+        cx = sy = 0.0
+        for i in range(n + 1):
+            wgt = 1 if i in (0, n) else (4 if i % 2 else 2)
+            th = (i * h) ** 2 / (2 * a * a)
+            cx += wgt * math.cos(th)
+            sy += wgt * math.sin(th)
+        return cx * h / 3, sy * h / 3
+
+    p1 = (100.0, 0.0)
+    fx, fy = fresnel(A, L2)
+    p2 = (p1[0] + fx, p1[1] + fy)
+    th2 = L2 * L2 / (2 * A * A)
+    th3 = th2 + L3 / R3
+    p3 = (p2[0] + R3 * (math.sin(th3) - math.sin(th2)), p2[1] + R3 * (math.cos(th2) - math.cos(th3)))
+    th4 = th3 - L4 / R4
+    p4 = (p3[0] + R4 * (math.sin(th3) - math.sin(th4)), p3[1] + R4 * (math.cos(th4) - math.cos(th3)))
+    th_mid = th3 - 50.0 / R4
+    p_mid = (p3[0] + R4 * (math.sin(th3) - math.sin(th_mid)), p3[1] + R4 * (math.cos(th_mid) - math.cos(th3)))
+    p5 = (p4[0] + 50 * math.cos(th4), p4[1] + 50 * math.sin(th4))
+    plan_segments = [
+        seg(0, 0, 1, 0, 0, 100, line),
+        seg(p1[0], p1[1], 1, 0, 0, L2, clothoid),
+        seg(p2[0], p2[1], math.cos(th2), math.sin(th2), 0, L3, arc3),
+        # Right turn: the circle's start, travelled the other way.
+        seg(p3[0], p3[1], math.cos(th3), math.sin(th3), 0, -L4, arc4),
+        seg(p4[0], p4[1], math.cos(th4), math.sin(th4), 0, 50, line),
+    ]
+    plan = s.e(f"IFCCOMPOSITECURVE(({','.join(plan_segments)}),.F.)")
+    g1, g2 = 0.02, -0.01
+    vseg = lambda x, z, grad, run, parent=line: seg(x, z, 1, grad, 0, run * math.sqrt(1 + grad * grad), parent)
+    vertical = [vseg(0, 10, g1, 200), vseg(200, 10 + g1 * 200, g2, 230)]
+    gradient = s.e(f"IFCGRADIENTCURVE(({','.join(vertical)}),.F.,{plan},$)")
+    height = lambda x: 10 + g1 * x if x <= 200 else 10 + g1 * 200 + g2 * (x - 200)
+    # The alignment itself: an axis curve, which is not drawn.
+    axis_rep = s.e(f"IFCSHAPEREPRESENTATION({m.ctx},'Axis','Curve3D',({gradient}))")
+    s.e(f"IFCALIGNMENT({s.guid()},$,'Alignment',$,$,{m.place(None)},{s.e(f'IFCPRODUCTDEFINITIONSHAPE($,$,({axis_rep}))')},$)")
+    # Tubes along it, whole and between 100 and 280 (distances along).
+    rad = 0.5
+    slant = lambda a, b: sum(max(0.0, min(b, hi) - max(a, lo)) * math.sqrt(1 + g * g) for lo, hi, g in [(0, 200, g1), (200, 430, g2)])
+    m.element("IFCPIPESEGMENT", "tube whole", [s.e(f"IFCSWEPTDISKSOLID({gradient},{fnum(rad)},$,$,$)")], at=(0, 0, 0))
+    # The disk is a 16-gon: 2.5% less area than the circle.
+    exp["tube whole"] = dict(volume=math.pi * rad * rad * slant(0, 430), tol=0.03)
+    m.element("IFCPIPESEGMENT", "tube 100 to 280", [s.e(f"IFCSWEPTDISKSOLID({gradient},{fnum(rad)},$,100.,280.)")], at=(0, 0, 0))
+    exp["tube 100 to 280"] = dict(volume=math.pi * rad * rad * slant(100, 280), tol=0.03)
+    # A column 250 along it and 3 to the left. The linear placement has no
+    # Cartesian equivalent: it is worked out along the curve.
+    d, lateral = 250.0, 3.0
+    th = th2 + (d - 160.0) / R3
+    px = p2[0] + R3 * (math.sin(th) - math.sin(th2))
+    py = p2[1] + R3 * (math.cos(th2) - math.cos(th))
+    lx, ly = -math.sin(th), math.cos(th)
+    at_point = (px + lateral * lx, py + lateral * ly, height(d))
+    expr = s.e(f"IFCPOINTBYDISTANCEEXPRESSION(IFCLENGTHMEASURE({fnum(d)}),{fnum(lateral)},$,$,{gradient})")
+    linear = s.e(f"IFCLINEARPLACEMENT($,{s.e(f'IFCAXIS2PLACEMENTLINEAR({expr},$,$)')},$)")
+    m.element("IFCCOLUMN", "column on the alignment", [m.extrude(m.rect(2.0, 1.0), 4.0)], placement=linear)
+    hx, hy = abs(math.cos(th)) + 0.5 * abs(math.sin(th)), abs(math.sin(th)) + 0.5 * abs(math.cos(th))
+    # Its position is checked in tests/ifc_geometry.rs.
+    exp["column on the alignment"] = dict(volume=8.0, tol=1e-6)
+    stations_extra = dict(column_at=at_point, column_half=[hx, hy])
+    # With the writer's Cartesian position too: that one is used.
+    cart = m.axis(5.0, 5.0, 0.0)
+    linear2 = s.e(f"IFCLINEARPLACEMENT($,{s.e(f'IFCAXIS2PLACEMENTLINEAR({expr},$,$)')},{cart})")
+    m.element("IFCCOLUMN", "column with its Cartesian position", [m.extrude(m.rect(1.0, 1.0), 1.0)], placement=linear2)
+    exp["column with its Cartesian position"] = box(4.5, 4.5, 0, 5.5, 5.5, 1)
+    stations = dict(
+        line_end=p1,
+        clothoid_end=p2,
+        left_arc_end=p3,
+        right_arc_mid=p_mid,
+        right_arc_end=p4,
+        end=p5,
+        heading=[0.0, th2, th3, th4, th4],
+        heights=[height(0), height(100), height(200), height(430)],
+        **stations_extra,
+    )
+    m.write("alignment.ifc", {"elements": exp, "stations": stations, "tube_radius": rad})
+
+
+def grid():
+    """Placements at the intersections of a grid's axes, IFC4 and IFC4X3."""
+    m = Model()
+    s = m.s
+    exp = {}
+    # The grid: placed at (100, 50), turned a quarter (its x along world y).
+    gpl = m.place(m.storey_pl, 100.0, 50.0, 0.0, zdir=(0, 0, 1), xdir=(0, 1, 0))
+    poly = lambda *ps: s.e("IFCPOLYLINE((" + ",".join(pt(s, *p) for p in ps) + "))")
+    u1 = s.e(f"IFCGRIDAXIS('1',{poly((0.0, 0.0), (20.0, 0.0))},.T.)")
+    u2 = s.e(f"IFCGRIDAXIS('2',{poly((0.0, 6.0), (20.0, 6.0))},.T.)")
+    # Unbounded lines, one of them the other way round.
+    vector = s.e(f"IFCVECTOR({dr(s, 0., 1.)},1.)")
+    v1 = s.e(f"IFCGRIDAXIS('A',{s.e(f'IFCLINE({pt(s, 0., 0.)},{vector})')},.T.)")
+    v2 = s.e(f"IFCGRIDAXIS('B',{s.e(f'IFCLINE({pt(s, 8., 0.)},{vector})')},.T.)")
+    u2_back = s.e(f"IFCGRIDAXIS('2r',{poly((0.0, 6.0), (20.0, 6.0))},.F.)")
+    s.e(f"IFCGRID({s.guid()},$,'Grid',$,$,{gpl},$,({u1},{u2},{u2_back}),({v1},{v2}),$,$)")
+    cross = lambda a, b, off: s.e(f"IFCVIRTUALGRIDINTERSECTION(({a},{b}),({','.join(fnum(o) for o in off)}))")
+    to_world = lambda x, y: (100.0 - y, 50.0 + x)
+
+    def column(name, location, refdir, size, at_grid, z=0.0, dirw=None):
+        e, _ = m.element("IFCCOLUMN", name, [m.extrude(m.rect(*size), 3.0)], placement=s.e(f"IFCGRIDPLACEMENT({location},{refdir})"))
+        wx, wy = to_world(*at_grid)
+        # The box, 3 high, with its x along `dirw` (default: grid x, which
+        # is world y).
+        dx, dy = dirw or (0.0, 1.0)
+        hx = abs(dx) * size[0] / 2 + abs(dy) * size[1] / 2
+        hy = abs(dy) * size[0] / 2 + abs(dx) * size[1] / 2
+        exp[name] = dict(volume=size[0] * size[1] * 3.0, min=[wx - hx, wy - hy, z], max=[wx + hx, wy + hy, z + 3.0], tol=1e-6)
+
+    # At the intersection of axes 1 and B: (8, 0) in the grid, its x along
+    # the first axis, which is the grid's x.
+    column("at an intersection", cross(u1, v2, (0.0, 0.0, 0.0)), "$", (2.0, 1.0), (8.0, 0.0))
+    # With offsets: 0.5 to the left of axis 2 (which runs +x: y = 6.5), 1 to
+    # the left of B (which runs +y: x = 7, so -1 is x = 9), and 2 up.
+    column("with offsets", cross(u2, v2, (0.5, -1.0, 2.0)), "$", (2.0, 1.0), (9.0, 6.5), z=2.0)
+    # The axis the other way: left of it is the other side.
+    column("on a reversed axis", cross(u2_back, v2, (0.5, 0.0)), "$", (2.0, 1.0), (8.0, 5.5), dirw=(0.0, -1.0))
+    # Its x along a given direction (the grid's y).
+    column("along a direction", cross(u1, v1, (0.0, 0.0)), dr(s, 0.0, 1.0), (2.0, 1.0), (0.0, 0.0), dirw=(-1.0, 0.0))
+    # Its x towards another intersection: (8, 6) from (0, 0), 10 long.
+    column("towards an intersection", cross(u1, v1, (0.0, 0.0)), cross(u2, v2, (0.0, 0.0)), (2.0, 1.0), (0.0, 0.0), dirw=to_world_dir((8.0, 6.0)))
+    m.write("grid.ifc", {"elements": exp})
+
+    # IFC4X3: the placement names the grid's own placement first.
+    m = Model(schema="IFC4X3_ADD2")
+    s = m.s
+    exp = {}
+    gpl = m.place(m.storey_pl, 100.0, 50.0, 0.0, zdir=(0, 0, 1), xdir=(0, 1, 0))
+    a = s.e(f"IFCGRIDAXIS('1',{s.e('IFCPOLYLINE((' + pt(s, 0., 0.) + ',' + pt(s, 20., 0.) + '))')},.T.)")
+    b = s.e(f"IFCGRIDAXIS('A',{s.e('IFCPOLYLINE((' + pt(s, 8., -1.) + ',' + pt(s, 8., 9.) + '))')},.T.)")
+    s.e(f"IFCGRID({s.guid()},$,'Grid',$,$,{gpl},$,({a}),({b}),$,$)")
+    where = s.e(f"IFCVIRTUALGRIDINTERSECTION(({a},{b}),(0.,0.,0.))")
+    m.element("IFCCOLUMN", "at an intersection", [m.extrude(m.rect(2.0, 1.0), 3.0)], placement=s.e(f"IFCGRIDPLACEMENT({gpl},{where},$)"))
+    exp["at an intersection"] = dict(volume=6.0, min=[99.5, 57.0, 0], max=[100.5, 59.0, 3], tol=1e-6)
+    m.write("grid_ifc4x3.ifc", {"elements": exp})
+
+
+def to_world_dir(d):
+    """The grid's direction `d` in the world, for the grid turned a quarter."""
+    n = math.hypot(*d)
+    return (-d[1] / n, d[0] / n)
+
+
+def storeys():
+    """Three storeys in millimetres with their elevations, an element in
+    each, a room with a table in it, and an element in the building itself."""
+
+    def units(s):
+        return s.e("IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.)"), None
+
+    m = Model(units=units)
+    s = m.s
+    storeys = [("Level 0", 0.0, m.storey, m.storey_pl)]
+    building_pl = m.place(None, 0, 0, 0)
+    for k, (name, z) in enumerate([("Level 1", 3000.0), ("Level 2", 6000.0)]):
+        pl = m.place(building_pl, 0, 0, z)
+        st = s.e(f"IFCBUILDINGSTOREY({s.guid()},$,'{name}',$,$,{pl},$,$,.ELEMENT.,{fnum(z)})")
+        s.e(f"IFCRELAGGREGATES({s.guid()},$,$,$,{m.building},({st}))")
+        storeys.append((name, z, st, pl))
+    per = {}
+    for name, z, st, pl in storeys:
+        e, _ = m.element("IFCWALL", f"wall {name}", [m.extrude(m.rect(1000.0, 100.0), 2500.0)], placement=pl, contained=False)
+        per.setdefault(st, []).append(e)
+    # A room on level 1 with a table in it.
+    room = s.e(f"IFCSPACE({s.guid()},$,'Room',$,$,{storeys[1][3]},$,$,.ELEMENT.,.INTERNAL.,$)")
+    s.e(f"IFCRELAGGREGATES({s.guid()},$,$,$,{storeys[1][2]},({room}))")
+    table, _ = m.element("IFCFURNISHINGELEMENT", "table", [m.extrude(m.rect(800.0, 800.0), 700.0)], placement=storeys[1][3], contained=False)
+    s.e(f"IFCRELCONTAINEDINSPATIALSTRUCTURE({s.guid()},$,$,$,({table}),{room})")
+    # Not in a storey: in the building.
+    shed, _ = m.element("IFCBUILDINGELEMENTPROXY", "shed", [m.extrude(m.rect(500.0, 500.0), 500.0)], at=(20000.0, 0, 0), contained=False)
+    s.e(f"IFCRELCONTAINEDINSPATIALSTRUCTURE({s.guid()},$,$,$,({shed}),{m.building})")
+    for st, es in per.items():
+        s.e(f"IFCRELCONTAINEDINSPATIALSTRUCTURE({s.guid()},$,$,$,({','.join(es)}),{st})")
+    m.write(
+        "storeys.ifc",
+        {
+            "storeys": [["Level 0", 0.0], ["Level 1", 3.0], ["Level 2", 6.0]],
+            "membership": {"wall Level 0": "Level 0", "wall Level 1": "Level 1", "wall Level 2": "Level 2", "table": "Level 1", "shed": None},
+        },
+    )
+
+
 profiles()
 solids()
 tessellated()
@@ -510,6 +966,11 @@ def damaged():
 mapped_and_units()
 ifc2x3_and_feet()
 damaged()
+curved_faces()
+sweep_params()
+alignment()
+grid()
+storeys()
 with open(os.path.join(HERE, "expected.json"), "w") as f:
     json.dump(EXPECTED, f, indent=1, sort_keys=True)
     f.write("\n")
diff --git a/crates/exav-render/tests/fixtures/ifc/storeys.ifc b/crates/exav-render/tests/fixtures/ifc/storeys.ifc
new file mode 100644
index 00000000..72ce3733
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ifc/storeys.ifc
@@ -0,0 +1,96 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('fixture','2026-01-01T00:00:00',(''),(''),'make.py','exav','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCSIUNIT(*,.LENGTHUNIT.,.MILLI.,.METRE.);
+#2=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#3=IFCDIRECTION((0.0,0.0,1.0));
+#4=IFCDIRECTION((1.0,0.0,0.0));
+#5=IFCAXIS2PLACEMENT3D(#2,#3,#4);
+#6=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#5,$);
+#7=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#8=IFCUNITASSIGNMENT((#1,#7));
+#9=IFCPROJECT('0000000000000000000001',$,'Fixtures',$,$,$,$,(#6),#8);
+#10=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#11=IFCAXIS2PLACEMENT3D(#10,$,$);
+#12=IFCLOCALPLACEMENT($,#11);
+#13=IFCSITE('0000000000000000000002',$,'Site',$,$,#12,$,$,.ELEMENT.,$,$,$,$,$);
+#14=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#15=IFCAXIS2PLACEMENT3D(#14,$,$);
+#16=IFCLOCALPLACEMENT(#12,#15);
+#17=IFCBUILDING('0000000000000000000003',$,'Building',$,$,#16,$,$,.ELEMENT.,$,$,$);
+#18=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#19=IFCAXIS2PLACEMENT3D(#18,$,$);
+#20=IFCLOCALPLACEMENT(#16,#19);
+#21=IFCBUILDINGSTOREY('0000000000000000000004',$,'Level 0',$,$,#20,$,$,.ELEMENT.,0.);
+#22=IFCRELAGGREGATES('0000000000000000000005',$,$,$,#9,(#13));
+#23=IFCRELAGGREGATES('0000000000000000000006',$,$,$,#13,(#17));
+#24=IFCRELAGGREGATES('0000000000000000000007',$,$,$,#17,(#21));
+#25=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#26=IFCAXIS2PLACEMENT3D(#25,$,$);
+#27=IFCLOCALPLACEMENT($,#26);
+#28=IFCCARTESIANPOINT((0.0,0.0,3000.0));
+#29=IFCAXIS2PLACEMENT3D(#28,$,$);
+#30=IFCLOCALPLACEMENT(#27,#29);
+#31=IFCBUILDINGSTOREY('0000000000000000000008',$,'Level 1',$,$,#30,$,$,.ELEMENT.,3000.0);
+#32=IFCRELAGGREGATES('0000000000000000000009',$,$,$,#17,(#31));
+#33=IFCCARTESIANPOINT((0.0,0.0,6000.0));
+#34=IFCAXIS2PLACEMENT3D(#33,$,$);
+#35=IFCLOCALPLACEMENT(#27,#34);
+#36=IFCBUILDINGSTOREY('0000000000000000000010',$,'Level 2',$,$,#35,$,$,.ELEMENT.,6000.0);
+#37=IFCRELAGGREGATES('0000000000000000000011',$,$,$,#17,(#36));
+#38=IFCCARTESIANPOINT((0.0,0.0));
+#39=IFCAXIS2PLACEMENT2D(#38,$);
+#40=IFCRECTANGLEPROFILEDEF(.AREA.,$,#39,1000.0,100.0);
+#41=IFCDIRECTION((0.0,0.0,1.0));
+#42=IFCEXTRUDEDAREASOLID(#40,$,#41,2500.0);
+#43=IFCSHAPEREPRESENTATION(#6,'Body','SweptSolid',(#42));
+#44=IFCPRODUCTDEFINITIONSHAPE($,$,(#43));
+#45=IFCWALL('0000000000000000000012',$,'wall Level 0',$,$,#20,#44,$,$);
+#46=IFCCARTESIANPOINT((0.0,0.0));
+#47=IFCAXIS2PLACEMENT2D(#46,$);
+#48=IFCRECTANGLEPROFILEDEF(.AREA.,$,#47,1000.0,100.0);
+#49=IFCDIRECTION((0.0,0.0,1.0));
+#50=IFCEXTRUDEDAREASOLID(#48,$,#49,2500.0);
+#51=IFCSHAPEREPRESENTATION(#6,'Body','SweptSolid',(#50));
+#52=IFCPRODUCTDEFINITIONSHAPE($,$,(#51));
+#53=IFCWALL('0000000000000000000013',$,'wall Level 1',$,$,#30,#52,$,$);
+#54=IFCCARTESIANPOINT((0.0,0.0));
+#55=IFCAXIS2PLACEMENT2D(#54,$);
+#56=IFCRECTANGLEPROFILEDEF(.AREA.,$,#55,1000.0,100.0);
+#57=IFCDIRECTION((0.0,0.0,1.0));
+#58=IFCEXTRUDEDAREASOLID(#56,$,#57,2500.0);
+#59=IFCSHAPEREPRESENTATION(#6,'Body','SweptSolid',(#58));
+#60=IFCPRODUCTDEFINITIONSHAPE($,$,(#59));
+#61=IFCWALL('0000000000000000000014',$,'wall Level 2',$,$,#35,#60,$,$);
+#62=IFCSPACE('0000000000000000000015',$,'Room',$,$,#30,$,$,.ELEMENT.,.INTERNAL.,$);
+#63=IFCRELAGGREGATES('0000000000000000000016',$,$,$,#31,(#62));
+#64=IFCCARTESIANPOINT((0.0,0.0));
+#65=IFCAXIS2PLACEMENT2D(#64,$);
+#66=IFCRECTANGLEPROFILEDEF(.AREA.,$,#65,800.0,800.0);
+#67=IFCDIRECTION((0.0,0.0,1.0));
+#68=IFCEXTRUDEDAREASOLID(#66,$,#67,700.0);
+#69=IFCSHAPEREPRESENTATION(#6,'Body','SweptSolid',(#68));
+#70=IFCPRODUCTDEFINITIONSHAPE($,$,(#69));
+#71=IFCFURNISHINGELEMENT('0000000000000000000017',$,'table',$,$,#30,#70,$,$);
+#72=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000018',$,$,$,(#71),#62);
+#73=IFCCARTESIANPOINT((0.0,0.0));
+#74=IFCAXIS2PLACEMENT2D(#73,$);
+#75=IFCRECTANGLEPROFILEDEF(.AREA.,$,#74,500.0,500.0);
+#76=IFCDIRECTION((0.0,0.0,1.0));
+#77=IFCEXTRUDEDAREASOLID(#75,$,#76,500.0);
+#78=IFCCARTESIANPOINT((20000.0,0.0,0.0));
+#79=IFCAXIS2PLACEMENT3D(#78,$,$);
+#80=IFCLOCALPLACEMENT(#20,#79);
+#81=IFCSHAPEREPRESENTATION(#6,'Body','SweptSolid',(#77));
+#82=IFCPRODUCTDEFINITIONSHAPE($,$,(#81));
+#83=IFCBUILDINGELEMENTPROXY('0000000000000000000019',$,'shed',$,$,#80,#82,$,$);
+#84=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000020',$,$,$,(#83),#17);
+#85=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000021',$,$,$,(#45),#21);
+#86=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000022',$,$,$,(#53),#31);
+#87=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000023',$,$,$,(#61),#36);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-render/tests/fixtures/ifc/sweep_params.ifc b/crates/exav-render/tests/fixtures/ifc/sweep_params.ifc
new file mode 100644
index 00000000..1e7337ec
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ifc/sweep_params.ifc
@@ -0,0 +1,149 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [ReferenceView]'),'2;1');
+FILE_NAME('fixture','2026-01-01T00:00:00',(''),(''),'make.py','exav','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#2=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#3=IFCMEASUREWITHUNIT(IFCPLANEANGLEMEASURE(0.017453292519943295),#2);
+#4=IFCDIMENSIONALEXPONENTS(0,0,0,0,0,0,0);
+#5=IFCCONVERSIONBASEDUNIT(#4,.PLANEANGLEUNIT.,'DEGREE',#3);
+#6=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#7=IFCDIRECTION((0.0,0.0,1.0));
+#8=IFCDIRECTION((1.0,0.0,0.0));
+#9=IFCAXIS2PLACEMENT3D(#6,#7,#8);
+#10=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#9,$);
+#11=IFCUNITASSIGNMENT((#1,#5));
+#12=IFCPROJECT('0000000000000000000001',$,'Fixtures',$,$,$,$,(#10),#11);
+#13=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#14=IFCAXIS2PLACEMENT3D(#13,$,$);
+#15=IFCLOCALPLACEMENT($,#14);
+#16=IFCSITE('0000000000000000000002',$,'Site',$,$,#15,$,$,.ELEMENT.,$,$,$,$,$);
+#17=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#18=IFCAXIS2PLACEMENT3D(#17,$,$);
+#19=IFCLOCALPLACEMENT(#15,#18);
+#20=IFCBUILDING('0000000000000000000003',$,'Building',$,$,#19,$,$,.ELEMENT.,$,$,$);
+#21=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#22=IFCAXIS2PLACEMENT3D(#21,$,$);
+#23=IFCLOCALPLACEMENT(#19,#22);
+#24=IFCBUILDINGSTOREY('0000000000000000000004',$,'Level 0',$,$,#23,$,$,.ELEMENT.,0.);
+#25=IFCRELAGGREGATES('0000000000000000000005',$,$,$,#12,(#16));
+#26=IFCRELAGGREGATES('0000000000000000000006',$,$,$,#16,(#20));
+#27=IFCRELAGGREGATES('0000000000000000000007',$,$,$,#20,(#24));
+#28=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#29=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#30=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#31=IFCPOLYLINE((#28,#29,#30));
+#32=IFCSWEPTDISKSOLID(#31,0.1,$,0.5,1.5);
+#33=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#34=IFCAXIS2PLACEMENT3D(#33,$,$);
+#35=IFCLOCALPLACEMENT(#23,#34);
+#36=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#32));
+#37=IFCPRODUCTDEFINITIONSHAPE($,$,(#36));
+#38=IFCPIPESEGMENT('0000000000000000000008',$,'disk on polyline',$,$,#35,#37,$,$);
+#39=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#40=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#41=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#42=IFCPOLYLINE((#39,#40,#41));
+#43=IFCSWEPTDISKSOLID(#42,0.1,$,1.5,0.5);
+#44=IFCCARTESIANPOINT((10.0,0.0,0.0));
+#45=IFCAXIS2PLACEMENT3D(#44,$,$);
+#46=IFCLOCALPLACEMENT(#23,#45);
+#47=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#43));
+#48=IFCPRODUCTDEFINITIONSHAPE($,$,(#47));
+#49=IFCPIPESEGMENT('0000000000000000000009',$,'disk on polyline reversed',$,$,#46,#48,$,$);
+#50=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#51=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#52=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#53=IFCPOLYLINE((#50,#51,#52));
+#54=IFCSWEPTDISKSOLID(#53,0.1,$,-3.,9.);
+#55=IFCCARTESIANPOINT((15.0,0.0,0.0));
+#56=IFCAXIS2PLACEMENT3D(#55,$,$);
+#57=IFCLOCALPLACEMENT(#23,#56);
+#58=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#54));
+#59=IFCPRODUCTDEFINITIONSHAPE($,$,(#58));
+#60=IFCPIPESEGMENT('0000000000000000000010',$,'disk past the ends',$,$,#57,#59,$,$);
+#61=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#62=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#63=IFCPOLYLINE((#61,#62));
+#64=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#63);
+#65=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#66=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#67=IFCPOLYLINE((#65,#66));
+#68=IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,#67);
+#69=IFCCOMPOSITECURVE((#64,#68),.F.);
+#70=IFCSWEPTDISKSOLID(#69,0.1,$,0.5,1.5);
+#71=IFCCARTESIANPOINT((20.0,0.0,0.0));
+#72=IFCAXIS2PLACEMENT3D(#71,$,$);
+#73=IFCLOCALPLACEMENT(#23,#72);
+#74=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#70));
+#75=IFCPRODUCTDEFINITIONSHAPE($,$,(#74));
+#76=IFCPIPESEGMENT('0000000000000000000011',$,'disk on composite',$,$,#73,#75,$,$);
+#77=IFCDIRECTION((0.0,0.0,1.0));
+#78=IFCDIRECTION((1.0,0.0,0.0));
+#79=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#80=IFCAXIS2PLACEMENT3D(#79,#77,#78);
+#81=IFCCIRCLE(#80,2.0);
+#82=IFCSWEPTDISKSOLID(#81,0.1,$,0.,90.);
+#83=IFCCARTESIANPOINT((30.0,0.0,0.0));
+#84=IFCAXIS2PLACEMENT3D(#83,$,$);
+#85=IFCLOCALPLACEMENT(#23,#84);
+#86=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#82));
+#87=IFCPRODUCTDEFINITIONSHAPE($,$,(#86));
+#88=IFCPIPESEGMENT('0000000000000000000012',$,'disk on circle',$,$,#85,#87,$,$);
+#89=IFCTRIMMEDCURVE(#81,(IFCPARAMETERVALUE(90.)),(IFCPARAMETERVALUE(270.)),.T.,.PARAMETER.);
+#90=IFCSWEPTDISKSOLID(#89,0.1,$,135.,225.);
+#91=IFCCARTESIANPOINT((40.0,0.0,0.0));
+#92=IFCAXIS2PLACEMENT3D(#91,$,$);
+#93=IFCLOCALPLACEMENT(#23,#92);
+#94=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#90));
+#95=IFCPRODUCTDEFINITIONSHAPE($,$,(#94));
+#96=IFCPIPESEGMENT('0000000000000000000013',$,'disk on trimmed circle',$,$,#93,#95,$,$);
+#97=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#98=IFCAXIS2PLACEMENT3D(#97,$,$);
+#99=IFCPLANE(#98);
+#100=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#101=IFCCARTESIANPOINT((0.0,1.0,0.0));
+#102=IFCCARTESIANPOINT((0.0,3.0,0.0));
+#103=IFCPOLYLINE((#100,#101,#102));
+#104=IFCCARTESIANPOINT((0.0,0.0));
+#105=IFCAXIS2PLACEMENT2D(#104,$);
+#106=IFCRECTANGLEPROFILEDEF(.AREA.,$,#105,0.2,0.4);
+#107=IFCSURFACECURVESWEPTAREASOLID(#106,$,#103,1.,2.,#99);
+#108=IFCCARTESIANPOINT((50.0,0.0,0.0));
+#109=IFCAXIS2PLACEMENT3D(#108,$,$);
+#110=IFCLOCALPLACEMENT(#23,#109);
+#111=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#107));
+#112=IFCPRODUCTDEFINITIONSHAPE($,$,(#111));
+#113=IFCBEAM('0000000000000000000014',$,'surface curve swept',$,$,#110,#112,$,$);
+#114=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#115=IFCDIRECTION((0.0,1.0,0.0));
+#116=IFCVECTOR(#115,2.);
+#117=IFCLINE(#114,#116);
+#118=IFCCARTESIANPOINT((0.0,0.0));
+#119=IFCAXIS2PLACEMENT2D(#118,$);
+#120=IFCRECTANGLEPROFILEDEF(.AREA.,$,#119,0.2,0.4);
+#121=IFCDIRECTION((1.0,0.0,0.0));
+#122=IFCFIXEDREFERENCESWEPTAREASOLID(#120,$,#117,0.5,1.5,#121);
+#123=IFCCARTESIANPOINT((60.0,0.0,0.0));
+#124=IFCAXIS2PLACEMENT3D(#123,$,$);
+#125=IFCLOCALPLACEMENT(#23,#124);
+#126=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#122));
+#127=IFCPRODUCTDEFINITIONSHAPE($,$,(#126));
+#128=IFCBEAM('0000000000000000000015',$,'fixed reference on a line',$,$,#125,#127,$,$);
+#129=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#130=IFCCARTESIANPOINT((2.0,0.0,0.0));
+#131=IFCCARTESIANPOINT((2.0,2.0,0.0));
+#132=IFCPOLYLINE((#129,#130,#131));
+#133=IFCSWEPTDISKSOLID(#132,0.1,$,$,$);
+#134=IFCCARTESIANPOINT((70.0,0.0,0.0));
+#135=IFCAXIS2PLACEMENT3D(#134,$,$);
+#136=IFCLOCALPLACEMENT(#23,#135);
+#137=IFCSHAPEREPRESENTATION(#10,'Body','SweptSolid',(#133));
+#138=IFCPRODUCTDEFINITIONSHAPE($,$,(#137));
+#139=IFCPIPESEGMENT('0000000000000000000016',$,'disk whole',$,$,#136,#138,$,$);
+#140=IFCRELCONTAINEDINSPATIALSTRUCTURE('0000000000000000000017',$,$,$,(#38,#49,#60,#76,#88,#96,#113,#128,#139),#24);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-render/tests/fixtures/images/jxl/big-flat.jxl b/crates/exav-render/tests/fixtures/images/jxl/big-flat.jxl
new file mode 100644
index 00000000..06c4d1d3
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/big-flat.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/grey-lossless.jxl b/crates/exav-render/tests/fixtures/images/jxl/grey-lossless.jxl
new file mode 100644
index 00000000..316f1582
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/grey-lossless.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/mid-grey.jxl b/crates/exav-render/tests/fixtures/images/jxl/mid-grey.jxl
new file mode 100644
index 00000000..be7db3e5
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/mid-grey.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgb-container.jxl b/crates/exav-render/tests/fixtures/images/jxl/rgb-container.jxl
new file mode 100644
index 00000000..d1b5e047
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgb-container.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgb-lossless.jxl b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossless.jxl
new file mode 100644
index 00000000..b1f2e150
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossless.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy-e3.jxl b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy-e3.jxl
new file mode 100644
index 00000000..7dd6c3e9
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy-e3.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy-e3.ref.ppm b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy-e3.ref.ppm
new file mode 100644
index 00000000..aef8885f
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy-e3.ref.ppm differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy.jxl b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy.jxl
new file mode 100644
index 00000000..3482a797
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy.ref.ppm b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy.ref.ppm
new file mode 100644
index 00000000..3ec976d8
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgb-lossy.ref.ppm differ
diff --git a/crates/exav-render/tests/fixtures/images/jxl/rgba-lossless.jxl b/crates/exav-render/tests/fixtures/images/jxl/rgba-lossless.jxl
new file mode 100644
index 00000000..dfbbfbfd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/jxl/rgba-lossless.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/make.py b/crates/exav-render/tests/fixtures/images/make.py
index ecdc21bb..6a0a5033 100644
--- a/crates/exav-render/tests/fixtures/images/make.py
+++ b/crates/exav-render/tests/fixtures/images/make.py
@@ -141,6 +141,24 @@ def strip(tif):
     f.write(strip(tmp))
 os.remove(tmp)
 
+# A baseline JPEG of one picture twice (libjpeg's cjpeg, Debian's
+# libjpeg-turbo-progs): with its three components in one scan, and with a scan
+# for each. zune-jpeg 0.5.8 draws the second flat.
+ppm = out("jpeg-source.ppm")
+jpeg_source = Image.new("RGB", (48, 40))
+for y in range(40):
+    for x in range(48):
+        jpeg_source.putpixel((x, y), ((x * 5) % 256, (y * 6) % 256, (x * y) % 256 if (x // 8 + y // 8) % 2 else 40))
+jpeg_source.save(ppm)
+scans = out("jpeg-scans.txt")
+with open(scans, "w") as f:
+    f.write("0: 0 63 0 0;\n1: 0 63 0 0;\n2: 0 63 0 0;\n")
+sampling = ["-quality", "85", "-sample", "1x1,1x1,1x1"]
+subprocess.run(["cjpeg", *sampling, "-outfile", out("sequential-interleaved.jpg"), ppm], check=True)
+subprocess.run(["cjpeg", *sampling, "-scans", scans, "-outfile", out("sequential-non-interleaved.jpg"), ppm], check=True)
+os.remove(ppm)
+os.remove(scans)
+
 for name in os.listdir(WORK):
     shutil.copy(out(name), os.path.join(HERE, name))
 shutil.rmtree(WORK)
diff --git a/crates/exav-render/tests/fixtures/images/rgb.jxl b/crates/exav-render/tests/fixtures/images/rgb.jxl
new file mode 100644
index 00000000..f31391df
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/rgb.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/rgba.jxl b/crates/exav-render/tests/fixtures/images/rgba.jxl
new file mode 100644
index 00000000..63b76c9b
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/rgba.jxl differ
diff --git a/crates/exav-render/tests/fixtures/images/sequential-interleaved.jpg b/crates/exav-render/tests/fixtures/images/sequential-interleaved.jpg
new file mode 100644
index 00000000..80b2e9b4
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/sequential-interleaved.jpg differ
diff --git a/crates/exav-render/tests/fixtures/images/sequential-non-interleaved.jpg b/crates/exav-render/tests/fixtures/images/sequential-non-interleaved.jpg
new file mode 100644
index 00000000..4ceac836
Binary files /dev/null and b/crates/exav-render/tests/fixtures/images/sequential-non-interleaved.jpg differ
diff --git a/crates/exav-render/tests/fixtures/office/docs/make.py b/crates/exav-render/tests/fixtures/office/docs/make.py
new file mode 100644
index 00000000..6184083e
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/docs/make.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+"""Writes sample.odt, sample.fodt and sample.rtf: a heading, a paragraph with
+bold and italic words, a bulleted list and a table. The text is ours (CC0).
+sample.doc is the ODT converted to DOC by an office application, as a black
+box; see README.md.
+"""
+import zipfile, pathlib
+
+HERE = pathlib.Path(__file__).parent
+
+NS = (
+    'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
+    'xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" '
+    'xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" '
+    'xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" '
+    'xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" '
+    'xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"'
+)
+
+STYLES = """<office:font-face-decls><style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'"/></office:font-face-decls>
+<office:styles>
+<style:default-style style:family="paragraph"><style:text-properties style:font-name="Liberation Serif" fo:font-size="12pt"/></style:default-style>
+<style:style style:name="Standard" style:family="paragraph"/>
+<style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Standard" style:default-outline-level="1"><style:paragraph-properties fo:margin-top="0.4cm" fo:margin-bottom="0.2cm"/><style:text-properties fo:font-size="18pt" fo:font-weight="bold"/></style:style>
+<text:list-style style:name="Bullets"><text:list-level-style-bullet text:level="1" text:bullet-char="&#8226;"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" fo:text-indent="-0.5cm" fo:margin-left="1cm"/></style:list-level-properties></text:list-level-style-bullet></text:list-style>
+</office:styles>
+<office:automatic-styles>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="21cm" fo:page-height="29.7cm" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm"/></style:page-layout>
+</office:automatic-styles>
+<office:master-styles><style:master-page style:name="Standard" style:page-layout-name="pm1"/></office:master-styles>"""
+
+BODY = """<office:body><office:text>
+<text:h text:style-name="Heading_20_1" text:outline-level="1">Quarterly summary</text:h>
+<text:p text:style-name="Standard">Revenue grew by <text:span text:style-name="B">twelve percent</text:span> over the quarter, while costs stayed <text:span text:style-name="I">flat</text:span>.</text:p>
+<text:list text:style-name="Bullets"><text:list-item><text:p text:style-name="Standard">First item</text:p></text:list-item><text:list-item><text:p text:style-name="Standard">Second item</text:p></text:list-item></text:list>
+<table:table table:name="T1" table:style-name="T1"><table:table-column table:style-name="C1" table:number-columns-repeated="2"/>
+<table:table-row><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">Region</text:p></table:table-cell><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">Sales</text:p></table:table-cell></table:table-row>
+<table:table-row><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">North</text:p></table:table-cell><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">120</text:p></table:table-cell></table:table-row>
+</table:table>
+<text:p text:style-name="Standard">End of the summary.</text:p>
+</office:text></office:body>"""
+
+AUTO = """<office:automatic-styles>
+<style:style style:name="B" style:family="text"><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="I" style:family="text"><style:text-properties fo:font-style="italic"/></style:style>
+<style:style style:name="T1" style:family="table"><style:table-properties style:width="12cm"/></style:style>
+<style:style style:name="C1" style:family="table-column"><style:table-column-properties style:column-width="6cm"/></style:style>
+<style:style style:name="Cell" style:family="table-cell"><style:table-cell-properties fo:border="0.5pt solid #000000" fo:padding="0.1cm"/></style:style>
+</office:automatic-styles>"""
+
+MIME = "application/vnd.oasis.opendocument.text"
+
+
+def odt():
+    content = f'<?xml version="1.0" encoding="UTF-8"?><office:document-content {NS} office:version="1.2">{AUTO}{BODY}</office:document-content>'
+    styles = f'<?xml version="1.0" encoding="UTF-8"?><office:document-styles {NS} office:version="1.2">{STYLES}</office:document-styles>'
+    manifest = (
+        '<?xml version="1.0" encoding="UTF-8"?><manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2">'
+        f'<manifest:file-entry manifest:full-path="/" manifest:media-type="{MIME}"/>'
+        '<manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>'
+        '<manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>'
+        "</manifest:manifest>"
+    )
+    with zipfile.ZipFile(HERE / "sample.odt", "w") as z:
+        z.writestr(zipfile.ZipInfo("mimetype", (2020, 1, 1, 0, 0, 0)), MIME)
+        for name, data in (("content.xml", content), ("styles.xml", styles), ("META-INF/manifest.xml", manifest)):
+            z.writestr(zipfile.ZipInfo(name, (2020, 1, 1, 0, 0, 0)), data, zipfile.ZIP_DEFLATED)
+
+
+def fodt():
+    styles = STYLES.replace("<office:automatic-styles>", "<office:automatic-styles>", 1)
+    # One tree: styles, then the content's automatic styles with the body.
+    auto = AUTO.replace("<office:automatic-styles>", "").replace("</office:automatic-styles>", "")
+    styles = styles.replace("</office:automatic-styles>", auto + "</office:automatic-styles>")
+    doc = f'<?xml version="1.0" encoding="UTF-8"?><office:document {NS} office:version="1.2" office:mimetype="{MIME}">{styles}{BODY}</office:document>'
+    (HERE / "sample.fodt").write_text(doc, encoding="utf-8")
+
+
+RTF = r"""{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\froman\fcharset0 Liberation Serif;}}
+{\colortbl;\red0\green0\blue0;\red192\green0\blue0;}
+\paperw11906\paperh16838\margl1134\margr1134\margt1134\margb1134
+\pard\sa120\b\fs36 Quarterly summary\par
+\pard\plain\f0\fs24 Revenue grew by \b twelve percent\b0  over the quarter, while costs stayed \i flat\i0 .\par
+\pard\fi-283\li567 \bullet\tab First item\par
+\pard\fi-283\li567 \bullet\tab Second item\par
+\pard\trowd\trgaph108\cellx3000\cellx6000
+\intbl Region\cell Sales\cell\row
+\trowd\trgaph108\cellx3000\cellx6000
+\intbl North\cell 120\cell\row
+\pard End of the summary.\par
+}
+"""
+
+
+odt()
+fodt()
+(HERE / "sample.rtf").write_text(RTF, encoding="ascii")
diff --git a/crates/exav-render/tests/fixtures/office/docs/sample-2003.xml b/crates/exav-render/tests/fixtures/office/docs/sample-2003.xml
new file mode 100644
index 00000000..affdfcb6
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/docs/sample-2003.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<w:styles><w:style w:type="paragraph" w:default="on" w:styleId="Normal"><w:name w:val="Normal"/></w:style><w:style w:type="paragraph" w:styleId="H1"><w:name w:val="heading 1"/><w:basedOn w:val="Normal"/><w:rPr><w:b/><w:sz w:val="32"/></w:rPr></w:style></w:styles>
+<w:body><wx:sect><wx:sub-section>
+<w:p><w:pPr><w:pStyle w:val="H1"/><w:jc w:val="center"/></w:pPr><w:r><w:t>Title</w:t></w:r></w:p>
+<w:p><w:r><w:rPr><w:i/><w:color w:val="0000FF"/></w:rPr><w:t>blue italic </w:t></w:r><w:hlink w:dest="https://example.org/"><w:r><w:t>link</w:t></w:r></w:hlink></w:p>
+<w:tbl><w:tblPr><w:tblW w:w="5000" w:type="dxa"/></w:tblPr><w:tblGrid><w:gridCol w:w="2500"/><w:gridCol w:w="2500"/></w:tblGrid><w:tr><w:tc><w:tcPr><w:tcW w:w="2500" w:type="dxa"/></w:tcPr><w:p><w:r><w:t>c1</w:t></w:r></w:p></w:tc><w:tc><w:tcPr><w:tcW w:w="2500" w:type="dxa"/></w:tcPr><w:p><w:r><w:t>c2</w:t></w:r></w:p></w:tc></w:tr></w:tbl>
+<w:sectPr><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1000" w:left="1200" w:bottom="1000" w:right="1200" w:header="500" w:footer="500"/></w:sectPr>
+</wx:sub-section></wx:sect></w:body></w:wordDocument>
diff --git a/crates/exav-render/tests/fixtures/office/docs/sample.doc b/crates/exav-render/tests/fixtures/office/docs/sample.doc
new file mode 100644
index 00000000..041b67cd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/docs/sample.doc differ
diff --git a/crates/exav-render/tests/fixtures/office/docs/sample.fodt b/crates/exav-render/tests/fixtures/office/docs/sample.fodt
new file mode 100644
index 00000000..90267035
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/docs/sample.fodt
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?><office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"><office:font-face-decls><style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'"/></office:font-face-decls>
+<office:styles>
+<style:default-style style:family="paragraph"><style:text-properties style:font-name="Liberation Serif" fo:font-size="12pt"/></style:default-style>
+<style:style style:name="Standard" style:family="paragraph"/>
+<style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Standard" style:default-outline-level="1"><style:paragraph-properties fo:margin-top="0.4cm" fo:margin-bottom="0.2cm"/><style:text-properties fo:font-size="18pt" fo:font-weight="bold"/></style:style>
+<text:list-style style:name="Bullets"><text:list-level-style-bullet text:level="1" text:bullet-char="&#8226;"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" fo:text-indent="-0.5cm" fo:margin-left="1cm"/></style:list-level-properties></text:list-level-style-bullet></text:list-style>
+</office:styles>
+<office:automatic-styles>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="21cm" fo:page-height="29.7cm" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm"/></style:page-layout>
+
+<style:style style:name="B" style:family="text"><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="I" style:family="text"><style:text-properties fo:font-style="italic"/></style:style>
+<style:style style:name="T1" style:family="table"><style:table-properties style:width="12cm"/></style:style>
+<style:style style:name="C1" style:family="table-column"><style:table-column-properties style:column-width="6cm"/></style:style>
+<style:style style:name="Cell" style:family="table-cell"><style:table-cell-properties fo:border="0.5pt solid #000000" fo:padding="0.1cm"/></style:style>
+</office:automatic-styles>
+<office:master-styles><style:master-page style:name="Standard" style:page-layout-name="pm1"/></office:master-styles><office:body><office:text>
+<text:h text:style-name="Heading_20_1" text:outline-level="1">Quarterly summary</text:h>
+<text:p text:style-name="Standard">Revenue grew by <text:span text:style-name="B">twelve percent</text:span> over the quarter, while costs stayed <text:span text:style-name="I">flat</text:span>.</text:p>
+<text:list text:style-name="Bullets"><text:list-item><text:p text:style-name="Standard">First item</text:p></text:list-item><text:list-item><text:p text:style-name="Standard">Second item</text:p></text:list-item></text:list>
+<table:table table:name="T1" table:style-name="T1"><table:table-column table:style-name="C1" table:number-columns-repeated="2"/>
+<table:table-row><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">Region</text:p></table:table-cell><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">Sales</text:p></table:table-cell></table:table-row>
+<table:table-row><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">North</text:p></table:table-cell><table:table-cell table:style-name="Cell"><text:p text:style-name="Standard">120</text:p></table:table-cell></table:table-row>
+</table:table>
+<text:p text:style-name="Standard">End of the summary.</text:p>
+</office:text></office:body></office:document>
\ No newline at end of file
diff --git a/crates/exav-render/tests/fixtures/office/docs/sample.html b/crates/exav-render/tests/fixtures/office/docs/sample.html
new file mode 100644
index 00000000..32490272
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/docs/sample.html
@@ -0,0 +1,20 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40">
+<head><meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<title>Quarterly summary</title>
+<style><!--
+p.MsoNormal {margin:0cm; font-size:11.0pt; font-family:"Calibri"}
+span.red {color:#FF0000}
+@page WordSection1 {size:595.3pt 841.9pt; margin:72.0pt 54.0pt 72.0pt 54.0pt}
+div.WordSection1 {page:WordSection1}
+--></style></head>
+<body lang=EN-US><div class=WordSection1>
+<h1>Quarterly <i>summary</i></h1>
+<p class=MsoNormal>Revenue grew by <b>twelve percent</b>&nbsp;in <span class=red>May</span> &amp; June.<o:p></o:p></p>
+<ul><li>First<li>Second<ol><li>Nested</ol></ul>
+<table border=1><tr><th>Region<th colspan=2>Sales
+<tr><td rowspan=2>North<td>12<td>14
+<tr><td>9<td>11</table>
+<p><a href="https://example.org/a">a web link</a> and <a name=top>an anchor</a>.</p>
+<img src="data:image/png;base64,iVBORw0KGgo=">
+</div></body></html>
diff --git a/crates/exav-render/tests/fixtures/office/docs/sample.odt b/crates/exav-render/tests/fixtures/office/docs/sample.odt
new file mode 100644
index 00000000..0bc4ac9c
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/docs/sample.odt differ
diff --git a/crates/exav-render/tests/fixtures/office/docs/sample.rtf b/crates/exav-render/tests/fixtures/office/docs/sample.rtf
new file mode 100644
index 00000000..86a95647
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/docs/sample.rtf
@@ -0,0 +1,13 @@
+{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\froman\fcharset0 Liberation Serif;}}
+{\colortbl;\red0\green0\blue0;\red192\green0\blue0;}
+\paperw11906\paperh16838\margl1134\margr1134\margt1134\margb1134
+\pard\sa120\b\fs36 Quarterly summary\par
+\pard\plain\f0\fs24 Revenue grew by \b twelve percent\b0  over the quarter, while costs stayed \i flat\i0 .\par
+\pard\fi-283\li567 \bullet\tab First item\par
+\pard\fi-283\li567 \bullet\tab Second item\par
+\pard\trowd\trgaph108\cellx3000\cellx6000
+\intbl Region\cell Sales\cell\row
+\trowd\trgaph108\cellx3000\cellx6000
+\intbl North\cell 120\cell\row
+\pard End of the summary.\par
+}
diff --git a/crates/exav-render/tests/fixtures/office/draw/README.md b/crates/exav-render/tests/fixtures/office/draw/README.md
new file mode 100644
index 00000000..1c886500
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/draw/README.md
@@ -0,0 +1,22 @@
+# Fixtures
+
+- `sample.fodg`, `sample.odg`: OpenDocument drawings (two pages, a hidden
+  layer, a master page with a frame).
+- `sample.vsdx`, `themed.vsdx`: Visio drawings, written by `make_vsdx.py`
+  (`python3 make_vsdx.py <output directory>`) for these tests, from the Visio
+  file format reference and [MS-VSDX]; no Visio file is in them. CC0-1.0.
+  - `sample.vsdx`: three pages. "Plan" (11 by 8.5 inches) has two instances
+    of a master (one wider than it, with text, bold at 18 points and a link;
+    one turned 30 degrees, mirrored, with its own fill), a dashed connector
+    with an arrow, a shape on a layer that does not show, a group of a
+    square and an ellipse, text in a text block off to one side, and the
+    background page "Back". "Detail" (5.8 by 8.2) has a 4 by 3 pixel PNG
+    and a shape linking to "Plan". The style sheets give the first master
+    its fill and line through the colour table.
+  - `themed.vsdx`: one page of five boxes with the theme's `Themed` values:
+    the root style sheet's colours, accent 1 and 2 of the colour scheme,
+    a variation colour, a variation that does not exist (65534), and the
+    background colour.
+
+Other Visio files were used as inputs, and another application's renderings
+of them as a black box, while writing the reader (see the crate's NOTICE).
diff --git a/crates/exav-render/tests/fixtures/office/draw/make_vsdx.py b/crates/exav-render/tests/fixtures/office/draw/make_vsdx.py
new file mode 100644
index 00000000..56aff642
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/draw/make_vsdx.py
@@ -0,0 +1,450 @@
+#!/usr/bin/env python3
+"""Writes sample.vsdx and themed.vsdx, the Visio drawings the tests read.
+
+usage: python3 make_vsdx.py <output directory>
+
+The text and the shapes are written for this crate (CC0). The part layout
+follows the Visio file format reference and [MS-VSDX]; no other file is used.
+"""
+import struct
+import sys
+import zlib
+import zipfile
+
+NS = (
+    "xmlns='http://schemas.microsoft.com/office/visio/2012/main' "
+    "xmlns:r='http://schemas.openxmlformats.org/officeDocument/2006/relationships'"
+)
+REL = "http://schemas.microsoft.com/visio/2010/relationships"
+OPC = "http://schemas.openxmlformats.org/package/2006/relationships"
+
+
+def rels(items):
+    body = "".join(
+        f'<Relationship Id="{i}" Type="{t}" Target="{g}"/>' for i, t, g in items
+    )
+    return f'<?xml version="1.0" encoding="UTF-8"?><Relationships xmlns="{OPC}">{body}</Relationships>'
+
+
+def cell(n, v, f=None):
+    return f"<Cell N='{n}' V='{v}'" + (f" F='{f}'" if f else "") + "/>"
+
+
+def row(i, t, **c):
+    cells = "".join(cell(k, v) for k, v in c.items())
+    return f"<Row T='{t}' IX='{i}'>{cells}</Row>"
+
+
+def rowf(i, t, cells):
+    """A row whose cells are (name, value, formula)."""
+    body = "".join(cell(n, v, f) for n, v, f in cells)
+    return f"<Row T='{t}' IX='{i}'>{body}</Row>"
+
+
+def rect(w, h, rel=False):
+    t = ("RelMoveTo", "RelLineTo") if rel else ("MoveTo", "LineTo")
+    return (
+        row(1, t[0], X=0, Y=0)
+        + row(2, t[1], X=w, Y=0)
+        + row(3, t[1], X=w, Y=h)
+        + row(4, t[1], X=0, Y=h)
+        + row(5, t[1], X=0, Y=0)
+    )
+
+
+def geometry(rows, flags=""):
+    return f"<Section N='Geometry' IX='0'>{flags}{rows}</Section>"
+
+
+def png(w, h, rgb):
+    raw = b"".join(b"\x00" + bytes(rgb) * w for _ in range(h))
+
+    def chunk(t, d):
+        c = struct.pack(">I", len(d)) + t + d
+        return c + struct.pack(">I", zlib.crc32(t + d) & 0xFFFFFFFF)
+
+    return (
+        b"\x89PNG\r\n\x1a\n"
+        + chunk(b"IHDR", struct.pack(">IIBBBBB", w, h, 8, 2, 0, 0, 0))
+        + chunk(b"IDAT", zlib.compress(raw))
+        + chunk(b"IEND", b"")
+    )
+
+
+def package(path, parts):
+    z = zipfile.ZipFile(path, "w", zipfile.ZIP_DEFLATED)
+    z.writestr(
+        "[Content_Types].xml",
+        '<?xml version="1.0" encoding="UTF-8"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">'
+        '<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>'
+        '<Default Extension="xml" ContentType="application/xml"/>'
+        '<Default Extension="png" ContentType="image/png"/>'
+        '<Override PartName="/visio/document.xml" ContentType="application/vnd.ms-visio.drawing.main+xml"/>'
+        "</Types>",
+    )
+    z.writestr("_rels/.rels", rels([("rId1", REL + "/document", "visio/document.xml")]))
+    for name, data in parts.items():
+        z.writestr(name, data)
+    z.close()
+
+
+STYLES = """
+<StyleSheets>
+ <StyleSheet ID='0' NameU='No Style'>
+  <Cell N='LineWeight' V='0.01'/><Cell N='LineColor' V='0'/><Cell N='LinePattern' V='1'/>
+  <Cell N='FillForegnd' V='1'/><Cell N='FillBkgnd' V='0'/><Cell N='FillPattern' V='1'/>
+  <Cell N='LeftMargin' V='0.05'/><Cell N='RightMargin' V='0.05'/><Cell N='TopMargin' V='0.05'/><Cell N='BottomMargin' V='0.05'/>
+  <Cell N='VerticalAlign' V='1'/>
+  <Section N='Character'><Row IX='0'><Cell N='Size' V='0.1666666667'/><Cell N='Font' V='0'/><Cell N='Color' V='0'/></Row></Section>
+  <Section N='Paragraph'><Row IX='0'><Cell N='HorzAlign' V='1'/></Row></Section>
+ </StyleSheet>
+ <StyleSheet ID='1' NameU='Blue' LineStyle='0' FillStyle='0' TextStyle='0'>
+  <Cell N='FillForegnd' V='24'/><Cell N='LineColor' V='25'/><Cell N='LineWeight' V='0.02'/>
+ </StyleSheet>
+</StyleSheets>"""
+
+LAYERS = """<Section N='Layer'>
+ <Row IX='0'><Cell N='Name' V='Shown'/><Cell N='Visible' V='1'/></Row>
+ <Row IX='1'><Cell N='Name' V='Hidden'/><Cell N='Visible' V='0'/></Row></Section>"""
+
+
+def sample(path):
+    document = (
+        f"<VisioDocument {NS}><Colors><ColorEntry IX='24' RGB='#336699'/><ColorEntry IX='25' RGB='#CC6600'/></Colors>"
+        f"<FaceNames><FaceName NameU='Calibri'/><FaceName NameU='Arial'/></FaceNames>{STYLES}</VisioDocument>"
+    )
+    box = (
+        "<Shape ID='1' Type='Shape' LineStyle='1' FillStyle='1' TextStyle='0'>"
+        + cell("PinX", 1)
+        + cell("PinY", 0.5)
+        + cell("Width", 2, "User.Wide")
+        + cell("Height", 1)
+        + cell("LocPinX", 1, "Width*0.5")
+        + cell("LocPinY", 0.5, "Height*0.5")
+        + cell("TxtPinX", 1, "Width*0.5")
+        + cell("TxtPinY", 0.5, "Height*0.5")
+        + cell("TxtWidth", 2, "Width*1")
+        + cell("TxtHeight", 1, "Height*1")
+        + cell("TxtLocPinX", 1, "TxtWidth*0.5")
+        + cell("TxtLocPinY", 0.5, "TxtHeight*0.5")
+        + "<Section N='User'><Row N='Wide'>"
+        + cell("Value", 2)
+        + "</Row></Section>"
+        + geometry(
+            rowf(1, "MoveTo", [("X", 0, "Width*0"), ("Y", 0, "Height*0")])
+            + rowf(2, "LineTo", [("X", 2, "Width*1"), ("Y", 0, "Height*0")])
+            + rowf(3, "LineTo", [("X", 2, "Width*1"), ("Y", 1, "Height*1")])
+            + rowf(4, "LineTo", [("X", 0, "Width*0"), ("Y", 1, "Height*1")])
+            + rowf(5, "LineTo", [("X", 0, "Geometry1.X1"), ("Y", 0, "Geometry1.Y1")])
+        )
+        + "</Shape>"
+    )
+    masters = (
+        f"<Masters {NS}><Master ID='5' NameU='Box' Name='Box'><Rel r:id='rId1'/></Master></Masters>"
+    )
+    pages = (
+        f"<Pages {NS}>"
+        f"<Page ID='0' Name='Plan' NameU='Plan' BackPage='2'><PageSheet>{cell('PageWidth', 11)}{cell('PageHeight', 8.5)}{LAYERS}</PageSheet><Rel r:id='rId1'/></Page>"
+        f"<Page ID='1' Name='Detail' NameU='Detail'><PageSheet>{cell('PageWidth', 5.8)}{cell('PageHeight', 8.2)}</PageSheet><Rel r:id='rId2'/></Page>"
+        f"<Page ID='2' Name='Back' NameU='Back' Background='1'><PageSheet>{cell('PageWidth', 11)}{cell('PageHeight', 8.5)}</PageSheet><Rel r:id='rId3'/></Page>"
+        "</Pages>"
+    )
+
+    def sh(id, extra, body="", attrs="Type='Shape'"):
+        return f"<Shape ID='{id}' {attrs}>{extra}{body}</Shape>"
+
+    plan = [
+        # An instance of the master, wider than it, with text and a link.
+        sh(
+            1,
+            cell("PinX", 3)
+            + cell("PinY", 7)
+            + cell("Width", 4)
+            + "<Section N='Hyperlink'><Row N='Link'>"
+            + cell("Address", "https://example.org/")
+            + cell("Description", "Example")
+            + "</Row></Section>"
+            + "<Section N='Character'><Row IX='0'>"
+            + cell("Style", 1)
+            + cell("Size", 0.25)
+            + "</Row></Section>"
+            + "<Section N='Geometry' IX='0'><Row T='LineTo' IX='3'>"
+            + cell("X", 4)
+            + "</Row></Section>",
+            "<Text><cp IX='0'/>Wide box</Text>",
+            "Type='Shape' Master='5'",
+        ),
+        # Another one, turned and mirrored, with its own colour.
+        sh(
+            2,
+            cell("PinX", 8)
+            + cell("PinY", 7)
+            + cell("Angle", 0.5235987756)
+            + cell("FlipX", 1)
+            + cell("FillForegnd", "#00FF00"),
+            "",
+            "Type='Shape' Master='5'",
+        ),
+        # A dashed connector with an arrow, drawn from its begin to its end.
+        sh(
+            3,
+            cell("PinX", 2)
+            + cell("PinY", 5)
+            + cell("Width", 3)
+            + cell("Height", 0)
+            + cell("LocPinX", 0)
+            + cell("LocPinY", 0)
+            + cell("LinePattern", 2)
+            + cell("LineWeight", 0.02)
+            + cell("LineColor", "#FF0000")
+            + cell("EndArrow", 4)
+            + cell("EndArrowSize", 3),
+            geometry(
+                row(1, "MoveTo", X=0, Y=0) + row(2, "LineTo", X=3, Y=0),
+                cell("NoFill", 1),
+            ),
+        ),
+        # On a layer that does not show.
+        sh(
+            4,
+            cell("PinX", 5)
+            + cell("PinY", 4)
+            + cell("Width", 1)
+            + cell("Height", 1)
+            + cell("LayerMember", "1")
+            + cell("FillPattern", 1)
+            + cell("FillForegnd", "#123456"),
+            geometry(rect(1, 1)) + "<Text>Hidden note</Text>",
+        ),
+        # A group with two members, in the group's own coordinates.
+        "<Shape ID='5' Type='Group'>"
+        + cell("PinX", 3)
+        + cell("PinY", 2)
+        + cell("Width", 2)
+        + cell("Height", 1)
+        + cell("LocPinX", 1)
+        + cell("LocPinY", 0.5)
+        + "<Shapes>"
+        + sh(
+            6,
+            cell("PinX", 0.5)
+            + cell("PinY", 0.5)
+            + cell("Width", 1)
+            + cell("Height", 1)
+            + cell("LocPinX", 0.5)
+            + cell("LocPinY", 0.5)
+            + cell("LinePattern", 1)
+            + cell("LineColor", "#000000")
+            + cell("FillPattern", 1)
+            + cell("FillForegnd", "#FF0000"),
+            geometry(rect(1, 1)),
+        )
+        + sh(
+            7,
+            cell("PinX", 1.5)
+            + cell("PinY", 0.5)
+            + cell("Width", 1)
+            + cell("Height", 1)
+            + cell("LocPinX", 0.5)
+            + cell("LocPinY", 0.5)
+            + cell("FillPattern", 1)
+            + cell("FillForegnd", "#0000FF"),
+            geometry(
+                row(1, "Ellipse", X=0.5, Y=0.5, A=1, B=0.5, C=0.5, D=1)
+            ),
+        )
+        + "</Shapes></Shape>",
+        # Text with no geometry, in a text block off to one side.
+        sh(
+            8,
+            cell("PinX", 8)
+            + cell("PinY", 3)
+            + cell("Width", 2)
+            + cell("Height", 1)
+            + cell("LocPinX", 1)
+            + cell("LocPinY", 0.5)
+            + cell("TxtPinX", 1.5)
+            + cell("TxtPinY", 0.5)
+            + cell("TxtWidth", 1)
+            + cell("TxtHeight", 1)
+            + cell("TxtLocPinX", 0.5)
+            + cell("TxtLocPinY", 0.5)
+            + "<Section N='Paragraph'><Row IX='0'>"
+            + cell("HorzAlign", 2)
+            + "</Row></Section>",
+            "<Text><cp IX='0'/>First line\nSecond line</Text>",
+        ),
+    ]
+    detail = [
+        # A picture of the package.
+        sh(
+            1,
+            cell("PinX", 2)
+            + cell("PinY", 5)
+            + cell("Width", 2)
+            + cell("Height", 1.5)
+            + cell("LocPinX", 1)
+            + cell("LocPinY", 0.75)
+            + cell("ImgWidth", 2)
+            + cell("ImgHeight", 1.5),
+            "<ForeignData ForeignType='Bitmap'><Rel r:id='rId1'/></ForeignData>",
+            "Type='Foreign'",
+        ),
+        # A link to the first page.
+        sh(
+            2,
+            cell("PinX", 2)
+            + cell("PinY", 2)
+            + cell("Width", 1.5)
+            + cell("Height", 0.5)
+            + cell("LocPinX", 0.75)
+            + cell("LocPinY", 0.25)
+            + cell("FillPattern", 0)
+            + cell("LinePattern", 1)
+            + "<Section N='Hyperlink'><Row N='Back'>"
+            + cell("SubAddress", "Plan")
+            + "</Row></Section>",
+            geometry(rect(1.5, 0.5)),
+        ),
+    ]
+    back = [
+        sh(
+            1,
+            cell("PinX", 5.5)
+            + cell("PinY", 0.25)
+            + cell("Width", 11)
+            + cell("Height", 0.5)
+            + cell("LocPinX", 5.5)
+            + cell("LocPinY", 0.25)
+            + cell("FillPattern", 1)
+            + cell("FillForegnd", "#CCCCCC"),
+            geometry(rect(11, 0.5)),
+        )
+    ]
+    contents = lambda shapes: f"<PageContents {NS}><Shapes>{''.join(shapes)}</Shapes></PageContents>"
+    package(
+        path,
+        {
+            "visio/document.xml": document,
+            "visio/_rels/document.xml.rels": rels(
+                [
+                    ("rId1", REL + "/masters", "masters/masters.xml"),
+                    ("rId2", REL + "/pages", "pages/pages.xml"),
+                ]
+            ),
+            "visio/masters/masters.xml": masters,
+            "visio/masters/_rels/masters.xml.rels": rels(
+                [("rId1", REL + "/master", "master1.xml")]
+            ),
+            "visio/masters/master1.xml": f"<MasterContents {NS}><Shapes>{box}</Shapes></MasterContents>",
+            "visio/pages/pages.xml": pages,
+            "visio/pages/_rels/pages.xml.rels": rels(
+                [
+                    ("rId1", REL + "/page", "page1.xml"),
+                    ("rId2", REL + "/page", "page2.xml"),
+                    ("rId3", REL + "/page", "page3.xml"),
+                ]
+            ),
+            "visio/pages/page1.xml": contents(plan),
+            "visio/pages/page2.xml": contents(detail),
+            "visio/pages/_rels/page2.xml.rels": rels(
+                [
+                    (
+                        "rId1",
+                        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+                        "../media/image1.png",
+                    )
+                ]
+            ),
+            "visio/media/image1.png": png(4, 3, (200, 40, 40)),
+            "visio/pages/page3.xml": contents(back),
+        },
+    )
+
+
+THEME = """<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office"><a:themeElements>
+<a:clrScheme name="Office"><a:dk1><a:srgbClr val="000000"/></a:dk1><a:lt1><a:srgbClr val="FFFFFF"/></a:lt1>
+<a:dk2><a:srgbClr val="44546A"/></a:dk2><a:lt2><a:srgbClr val="E7E6E6"/></a:lt2>
+<a:accent1><a:srgbClr val="4472C4"/></a:accent1><a:accent2><a:srgbClr val="ED7D31"/></a:accent2>
+<a:accent3><a:srgbClr val="A5A5A5"/></a:accent3><a:accent4><a:srgbClr val="FFC000"/></a:accent4>
+<a:accent5><a:srgbClr val="5B9BD5"/></a:accent5><a:accent6><a:srgbClr val="70AD47"/></a:accent6>
+<a:hlink><a:srgbClr val="0563C1"/></a:hlink><a:folHlink><a:srgbClr val="954F72"/></a:folHlink>
+<a:extLst><a:ext uri="{093E89EA-6996-430E-BFF9-83A9FAAAAB73}"><vt:bkgnd xmlns:vt="http://schemas.microsoft.com/office/visio/2012/theme"><a:srgbClr val="F0F0F0"/></vt:bkgnd></a:ext>
+<a:ext uri="{DDD2D869-C2EF-471E-B8FA-914AFA308C9F}"><vt:variationClrSchemeLst xmlns:vt="http://schemas.microsoft.com/office/visio/2012/theme">
+<vt:variationClrScheme><vt:varColor1><a:srgbClr val="111111"/></vt:varColor1><vt:varColor2><a:srgbClr val="222222"/></vt:varColor2></vt:variationClrScheme>
+<vt:variationClrScheme><vt:varColor1><a:srgbClr val="AA0000"/></vt:varColor1><vt:varColor2><a:srgbClr val="00AA00"/></vt:varColor2></vt:variationClrScheme>
+</vt:variationClrSchemeLst></a:ext></a:extLst></a:clrScheme>
+<a:fontScheme name="Office"><a:majorFont><a:latin typeface="Georgia"/></a:majorFont><a:minorFont><a:latin typeface="Verdana"/></a:minorFont></a:fontScheme>
+</a:themeElements></a:theme>"""
+
+
+def themed(path):
+    themed_cells = "".join(
+        f"<Cell N='{n}' V='Themed' F='THEMEVAL()'/>"
+        for n in ("LineColor", "FillForegnd", "FillPattern", "LinePattern")
+    )
+    document = (
+        f"<VisioDocument {NS}><StyleSheets>"
+        "<StyleSheet ID='0' NameU='No Style'><Cell N='LineWeight' V='0.01'/><Cell N='LineColor' V='0'/><Cell N='LinePattern' V='1'/>"
+        "<Cell N='FillForegnd' V='1'/><Cell N='FillPattern' V='1'/>"
+        "<Section N='Character'><Row IX='0'><Cell N='Size' V='0.1666666667'/><Cell N='Color' V='0'/></Row></Section></StyleSheet>"
+        f"<StyleSheet ID='6' NameU='Theme' LineStyle='0' FillStyle='0' TextStyle='0'>{themed_cells}"
+        "<Cell N='QuickStyleFillColor' V='100'/><Cell N='QuickStyleLineColor' V='100'/>"
+        "<Section N='Character'><Row IX='0'><Cell N='Font' V='Themed' F='THEMEVAL()'/><Cell N='Color' V='Themed' F='THEMEVAL()'/></Row></Section></StyleSheet>"
+        "<StyleSheet ID='7' NameU='Flow' LineStyle='6' FillStyle='6' TextStyle='6'/>"
+        "</StyleSheets></VisioDocument>"
+    )
+
+    def box(id, x, quick):
+        return (
+            f"<Shape ID='{id}' Type='Shape' LineStyle='7' FillStyle='7' TextStyle='7'>"
+            + cell("PinX", x)
+            + cell("PinY", 1)
+            + cell("Width", 1)
+            + cell("Height", 1)
+            + cell("LocPinX", 0.5)
+            + cell("LocPinY", 0.5)
+            + quick
+            + geometry(rect(1, 1))
+            + "<Text>Themed</Text></Shape>"
+        )
+
+    shapes = [
+        # No quick style of its own: the root style sheet's colours.
+        box(1, 1, ""),
+        # Accent 1 of the theme.
+        box(2, 3, cell("QuickStyleFillColor", 2) + cell("QuickStyleLineColor", 3)),
+        # The second colour of the second variation.
+        box(3, 5, cell("QuickStyleFillColor", 101) + cell("VariationColorIndex", 1)),
+        # A variation that is not there: the first, and the background colour.
+        box(4, 7, cell("QuickStyleFillColor", 201) + cell("VariationColorIndex", 65534)),
+        box(5, 9, cell("QuickStyleFillColor", 8)),
+    ]
+    package(
+        path,
+        {
+            "visio/document.xml": document,
+            "visio/_rels/document.xml.rels": rels(
+                [
+                    ("rId2", REL + "/pages", "pages/pages.xml"),
+                    (
+                        "rId4",
+                        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",
+                        "theme/theme1.xml",
+                    ),
+                ]
+            ),
+            "visio/theme/theme1.xml": THEME,
+            "visio/pages/pages.xml": (
+                f"<Pages {NS}><Page ID='0' Name='Themed' NameU='Themed'><PageSheet>{cell('PageWidth', 11)}{cell('PageHeight', 4)}</PageSheet><Rel r:id='rId1'/></Page></Pages>"
+            ),
+            "visio/pages/_rels/pages.xml.rels": rels([("rId1", REL + "/page", "page1.xml")]),
+            "visio/pages/page1.xml": f"<PageContents {NS}><Shapes>{''.join(shapes)}</Shapes></PageContents>",
+        },
+    )
+
+
+if __name__ == "__main__":
+    out = sys.argv[1]
+    sample(out + "/sample.vsdx")
+    themed(out + "/themed.vsdx")
diff --git a/crates/exav-render/tests/fixtures/office/draw/sample.fodg b/crates/exav-render/tests/fixtures/office/draw/sample.fodg
new file mode 100644
index 00000000..bc270ca2
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/draw/sample.fodg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.graphics">
+ <office:styles>
+  <style:style style:name="standard" style:family="graphic">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#000000" svg:stroke-width="0.05cm" draw:fill="none"/>
+   <style:text-properties fo:font-size="14pt"/>
+  </style:style>
+ </office:styles>
+ <office:automatic-styles>
+  <style:page-layout style:name="PLarge">
+   <style:page-layout-properties fo:page-width="21cm" fo:page-height="14.8cm" fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm"/>
+  </style:page-layout>
+  <style:page-layout style:name="PSmall">
+   <style:page-layout-properties fo:page-width="10cm" fo:page-height="10cm" fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm"/>
+  </style:page-layout>
+  <style:style style:name="red" style:family="graphic" style:parent-style-name="standard">
+   <style:graphic-properties draw:fill="solid" draw:fill-color="#cc2222"/>
+  </style:style>
+  <style:style style:name="blue" style:family="graphic" style:parent-style-name="standard">
+   <style:graphic-properties draw:fill="solid" draw:fill-color="#2244cc" draw:stroke="none"/>
+  </style:style>
+  <style:style style:name="pagebg" style:family="drawing-page">
+   <style:drawing-page-properties draw:fill="solid" draw:fill-color="#f4f0d8"/>
+  </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+  <draw:layer-set>
+   <draw:layer draw:name="layout"/>
+   <draw:layer draw:name="notes" draw:display="none"/>
+  </draw:layer-set>
+  <style:master-page style:name="Large" style:page-layout-name="PLarge">
+   <draw:rect draw:style-name="standard" draw:layer="backgroundobjects" svg:x="0.5cm" svg:y="0.5cm" svg:width="20cm" svg:height="13.8cm"/>
+  </style:master-page>
+  <style:master-page style:name="Small" style:page-layout-name="PSmall"/>
+ </office:master-styles>
+ <office:body>
+  <office:drawing>
+   <draw:page draw:name="Plan" draw:style-name="pagebg" draw:master-page-name="Large">
+    <draw:rect draw:style-name="red" draw:layer="layout" svg:x="2cm" svg:y="2cm" svg:width="6cm" svg:height="4cm">
+     <text:p>Red box</text:p>
+    </draw:rect>
+    <draw:ellipse draw:style-name="blue" draw:layer="layout" svg:x="10cm" svg:y="3cm" svg:width="5cm" svg:height="5cm"/>
+    <draw:line draw:style-name="standard" draw:layer="layout" svg:x1="2cm" svg:y1="10cm" svg:x2="18cm" svg:y2="12cm"/>
+    <draw:rect draw:style-name="red" draw:layer="notes" svg:x="14cm" svg:y="9cm" svg:width="4cm" svg:height="2cm">
+     <text:p>Hidden note</text:p>
+    </draw:rect>
+   </draw:page>
+   <draw:page draw:name="Detail" draw:master-page-name="Small">
+    <draw:custom-shape draw:style-name="blue" draw:layer="layout" svg:x="1cm" svg:y="1cm" svg:width="8cm" svg:height="4cm">
+     <text:p>Detail</text:p>
+     <draw:enhanced-geometry draw:type="round-rectangle" draw:enhanced-path="M 3600 0 X 0 3600 L 0 18000 Y 3600 21600 L 18000 21600 X 21600 18000 L 21600 3600 Y 18000 0 Z N"/>
+    </draw:custom-shape>
+   </draw:page>
+  </office:drawing>
+ </office:body>
+</office:document>
diff --git a/crates/exav-render/tests/fixtures/office/draw/sample.odg b/crates/exav-render/tests/fixtures/office/draw/sample.odg
new file mode 100644
index 00000000..4fea8b45
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/draw/sample.odg differ
diff --git a/crates/exav-render/tests/fixtures/office/draw/sample.vsdx b/crates/exav-render/tests/fixtures/office/draw/sample.vsdx
new file mode 100644
index 00000000..f3e0ed31
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/draw/sample.vsdx differ
diff --git a/crates/exav-render/tests/fixtures/office/draw/themed.vsdx b/crates/exav-render/tests/fixtures/office/draw/themed.vsdx
new file mode 100644
index 00000000..39995e20
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/draw/themed.vsdx differ
diff --git a/crates/exav-render/tests/fixtures/office/sheets/README.md b/crates/exav-render/tests/fixtures/office/sheets/README.md
new file mode 100644
index 00000000..26840583
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/sheets/README.md
@@ -0,0 +1,23 @@
+# Test fixtures
+
+- `sample.fods`: written by hand for these tests (a small budget table and a
+  second sheet). Public domain (CC0-1.0).
+- `sample.ods`, `sample.xls`: `sample.fods` saved by an office application as
+  ODS and as Excel 97. CC0-1.0, as their source.
+- `sample.numbers`: `tests/data/issue-18.numbers` from numbers-parser
+  (https://github.com/masaccio/numbers-parser), MIT, Copyright 2021 Jon
+  Connell. A Numbers document written by SheetJS: one table with a merged
+  range, in the layout without formula owner records.
+- `sample-2003.xml`, `sample.html`, `sample.slk`: the budget table of
+  `sample.fods` written by hand for these tests as Excel writes an XML
+  Spreadsheet, a worksheet saved as a web page and a SYLK file. CC0-1.0.
+- `numbers09.numbers`: `testNumbers.numbers` from Apache Tika's test
+  documents
+  (https://github.com/apache/tika, `tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/`),
+  Apache License 2.0, unmodified. A Numbers '09 document (`index.xml` in a
+  ZIP): two sheets, three tables, formulas across tables, a chart.
+
+Files the tests need in other versions (BIFF2 to BIFF5 workbooks, encrypted
+workbooks, damaged compound files, Numbers documents with formulas across
+tables) are built by the tests themselves: no current application writes
+BIFF5, and no permissively licensed samples of them were found.
diff --git a/crates/exav-render/tests/fixtures/office/sheets/numbers09.numbers b/crates/exav-render/tests/fixtures/office/sheets/numbers09.numbers
new file mode 100644
index 00000000..51360e01
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/sheets/numbers09.numbers differ
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample-2003.xml b/crates/exav-render/tests/fixtures/office/sheets/sample-2003.xml
new file mode 100644
index 00000000..36f74a49
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/sheets/sample-2003.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Font ss:FontName="Arial" ss:Size="10"/>
+  </Style>
+  <Style ss:ID="head">
+   <Font ss:Bold="1"/>
+   <Interior ss:Color="#4472C4" ss:Pattern="Solid"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="money"><NumberFormat ss:Format="#,##0.00"/></Style>
+  <Style ss:ID="date"><NumberFormat ss:Format="yyyy\-mm\-dd"/></Style>
+ </Styles>
+ <Worksheet ss:Name="Budget">
+  <Table>
+   <Column ss:Width="96"/>
+   <Column ss:Width="72"/>
+   <Row>
+    <Cell ss:StyleID="head"><Data ss:Type="String">Item</Data></Cell>
+    <Cell ss:StyleID="head"><Data ss:Type="String">Amount</Data></Cell>
+    <Cell ss:StyleID="head"><Data ss:Type="String">Date</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="String">Rent</Data></Cell>
+    <Cell ss:StyleID="money"><Data ss:Type="Number">1200</Data></Cell>
+    <Cell ss:StyleID="date"><Data ss:Type="DateTime">2024-01-06T00:00:00.000</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="String">Food</Data></Cell>
+    <Cell ss:StyleID="money"><Data ss:Type="Number">345.5</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="String">Travel</Data></Cell>
+    <Cell ss:StyleID="money"><Data ss:Type="Number">89.99</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="String">Total</Data></Cell>
+    <Cell ss:StyleID="money" ss:Formula="=SUM(R[-3]C:R[-1]C)"><Data ss:Type="Number">1635.49</Data></Cell>
+   </Row>
+   <Row ss:Index="7" ss:Height="24">
+    <Cell ss:MergeAcross="2"><Data ss:Type="String">Merged note across three columns</Data></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <FreezePanes/><SplitHorizontal>1</SplitHorizontal><TopRowBottomPane>1</TopRowBottomPane>
+  </WorksheetOptions>
+ </Worksheet>
+ <Worksheet ss:Name="Notes">
+  <Table>
+   <Row><Cell><Data ss:Type="String">Second sheet</Data></Cell><Cell><Data ss:Type="Boolean">1</Data></Cell></Row>
+  </Table>
+ </Worksheet>
+</Workbook>
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample.fods b/crates/exav-render/tests/fixtures/office/sheets/sample.fods
new file mode 100644
index 00000000..53324caf
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/sheets/sample.fods
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ <office:automatic-styles>
+  <number:date-style style:name="N1"><number:year number:style="long"/><number:text>-</number:text><number:month number:style="long"/><number:text>-</number:text><number:day number:style="long"/></number:date-style>
+  <number:number-style style:name="N2"><number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
+  <style:style style:name="co1" style:family="table-column"><style:table-column-properties style:column-width="1.2in"/></style:style>
+  <style:style style:name="co2" style:family="table-column"><style:table-column-properties style:column-width="0.9in"/></style:style>
+  <style:style style:name="head" style:family="table-cell"><style:table-cell-properties fo:background-color="#4472c4" fo:border="0.5pt solid #000000"/><style:text-properties fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+  <style:style style:name="money" style:family="table-cell" style:data-style-name="N2"/>
+  <style:style style:name="day" style:family="table-cell" style:data-style-name="N1"/>
+  <style:style style:name="total" style:family="table-cell" style:data-style-name="N2"><style:table-cell-properties fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+ </office:automatic-styles>
+ <office:body>
+  <office:spreadsheet>
+   <table:table table:name="Budget">
+    <table:table-column table:style-name="co1"/>
+    <table:table-column table:style-name="co2" table:number-columns-repeated="2"/>
+    <table:table-row>
+     <table:table-cell table:style-name="head" office:value-type="string"><text:p>Item</text:p></table:table-cell>
+     <table:table-cell table:style-name="head" office:value-type="string"><text:p>Amount</text:p></table:table-cell>
+     <table:table-cell table:style-name="head" office:value-type="string"><text:p>Date</text:p></table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell office:value-type="string"><text:p>Rent</text:p></table:table-cell>
+     <table:table-cell table:style-name="money" office:value-type="float" office:value="1200"><text:p>1,200.00</text:p></table:table-cell>
+     <table:table-cell table:style-name="day" office:value-type="date" office:date-value="2024-01-05"><text:p>2024-01-05</text:p></table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell office:value-type="string"><text:p>Food</text:p></table:table-cell>
+     <table:table-cell table:style-name="money" office:value-type="float" office:value="345.5"><text:p>345.50</text:p></table:table-cell>
+     <table:table-cell table:style-name="day" office:value-type="date" office:date-value="2024-01-12"><text:p>2024-01-12</text:p></table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell office:value-type="string"><text:p>Travel</text:p></table:table-cell>
+     <table:table-cell table:style-name="money" office:value-type="float" office:value="89.99"><text:p>89.99</text:p></table:table-cell>
+     <table:table-cell table:style-name="day" office:value-type="date" office:date-value="2024-02-01"><text:p>2024-02-01</text:p></table:table-cell>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell table:style-name="total" office:value-type="string"><text:p>Total</text:p></table:table-cell>
+     <table:table-cell table:style-name="total" table:formula="of:=SUM([.B2:.B4])" office:value-type="float" office:value="1635.49"><text:p>1,635.49</text:p></table:table-cell>
+     <table:table-cell table:style-name="total"/>
+    </table:table-row>
+    <table:table-row>
+     <table:table-cell office:value-type="string" table:number-columns-spanned="3"><text:p>Merged note across three columns</text:p></table:table-cell>
+     <table:covered-table-cell table:number-columns-repeated="2"/>
+    </table:table-row>
+   </table:table>
+   <table:table table:name="Notes">
+    <table:table-row>
+     <table:table-cell office:value-type="string"><text:p>Second sheet</text:p></table:table-cell>
+     <table:table-cell office:value-type="boolean" office:boolean-value="true"><text:p>TRUE</text:p></table:table-cell>
+    </table:table-row>
+   </table:table>
+  </office:spreadsheet>
+ </office:body>
+</office:document>
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample.html b/crates/exav-render/tests/fixtures/office/sheets/sample.html
new file mode 100644
index 00000000..ca168d6e
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/sheets/sample.html
@@ -0,0 +1,93 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:x="urn:schemas-microsoft-com:office:excel"
+xmlns="http://www.w3.org/TR/REC-html40">
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=utf-8">
+<meta name=ProgId content=Excel.Sheet>
+<style>
+<!--table
+	{mso-displayed-decimal-separator:"\.";
+	mso-displayed-thousand-separator:"\,";}
+br
+	{mso-data-placement:same-cell;}
+.style0
+	{mso-number-format:General;
+	text-align:general;
+	vertical-align:bottom;
+	white-space:nowrap;
+	color:windowtext;
+	font-size:10.0pt;
+	font-weight:400;
+	font-family:Arial;}
+td
+	{mso-style-parent:style0;
+	font-size:10.0pt;
+	font-family:Arial;
+	mso-number-format:General;
+	white-space:nowrap;}
+.xl65
+	{mso-style-parent:style0;
+	font-weight:700;
+	border-bottom:.5pt solid windowtext;
+	background:#4472C4;
+	mso-pattern:auto none;}
+.xl66
+	{mso-style-parent:style0;
+	mso-number-format:"\#\,\#\#0\.00";}
+.xl67
+	{mso-style-parent:style0;
+	mso-number-format:"yyyy\\-mm\\-dd";}
+-->
+</style>
+<!--[if gte mso 9]><xml>
+ <x:ExcelWorkbook>
+  <x:ExcelWorksheets>
+   <x:ExcelWorksheet>
+    <x:Name>Budget</x:Name>
+    <x:WorksheetOptions>
+     <x:FreezePanes/>
+     <x:SplitHorizontal>1</x:SplitHorizontal>
+    </x:WorksheetOptions>
+   </x:ExcelWorksheet>
+  </x:ExcelWorksheets>
+ </x:ExcelWorkbook>
+</xml><![endif]-->
+</head>
+<body>
+<table x:str border=0 cellpadding=0 cellspacing=0>
+ <col width=128 style='width:96pt'>
+ <col width=96 span=2 style='width:72pt'>
+ <tr height=17 style='height:12.75pt'>
+  <td class=xl65>Item</td>
+  <td class=xl65>Amount</td>
+  <td class=xl65>Date</td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td>Rent</td>
+  <td class=xl66 align=right x:num="1200">1,200.00</td>
+  <td class=xl67 align=right x:num="45297">2024-01-06</td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td>Food</td>
+  <td class=xl66 align=right x:num="345.5">345.50</td>
+  <td></td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td>Travel</td>
+  <td class=xl66 align=right x:num="89.99">89.99</td>
+  <td></td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td>Total</td>
+  <td class=xl66 align=right x:num="1635.49" x:fmla="=SUM(B2:B4)">1,635.49</td>
+  <td></td>
+ </tr>
+ <tr height=17 style='height:12.75pt'>
+  <td colspan=3 style='mso-ignore:colspan'></td>
+ </tr>
+ <tr height=32 style='height:24.0pt'>
+  <td colspan=3>Merged note across three columns</td>
+ </tr>
+</table>
+</body>
+</html>
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample.numbers b/crates/exav-render/tests/fixtures/office/sheets/sample.numbers
new file mode 100644
index 00000000..f79ba152
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/sheets/sample.numbers differ
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample.ods b/crates/exav-render/tests/fixtures/office/sheets/sample.ods
new file mode 100644
index 00000000..6c61e739
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/sheets/sample.ods differ
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample.slk b/crates/exav-render/tests/fixtures/office/sheets/sample.slk
new file mode 100644
index 00000000..50f3dde0
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/sheets/sample.slk
@@ -0,0 +1,33 @@
+ID;PWXL;N;E
+P;PGeneral
+P;P#,##0.00
+P;Pyyyy\-mm\-dd
+P;FArial;M200
+P;FArial;M200;SB
+F;P0;DG0G8;M255
+B;Y7;X3;D0 0 6 2
+O;L;D;V0;K47;G100 0.001
+F;W1 1 13
+F;W2 3 10
+C;Y1;X1;K"Item"
+F;SDM1
+C;X2;K"Amount"
+F;SDM1
+C;X3;K"Date"
+F;SDM1
+C;Y2;X1;K"Rent"
+C;X2;K1200
+F;P1;FG0R
+C;X3;K45297
+F;P2
+C;Y3;X1;K"Food"
+C;X2;K345.5
+F;P1;FG0R
+C;Y4;X1;K"Travel"
+C;X2;K89.99
+F;P1;FG0R
+C;Y5;X1;K"Total"
+C;X2;K1635.49;ESUM(R[-3]C:R[-1]C)
+F;P1;FG0R
+C;Y7;X1;K"Merged note across three columns"
+E
diff --git a/crates/exav-render/tests/fixtures/office/sheets/sample.xls b/crates/exav-render/tests/fixtures/office/sheets/sample.xls
new file mode 100644
index 00000000..bb0bf34e
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/sheets/sample.xls differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/README.md b/crates/exav-render/tests/fixtures/office/slides/README.md
new file mode 100644
index 00000000..74e326fd
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/slides/README.md
@@ -0,0 +1,30 @@
+# Fixtures
+
+- `sample.fodp`: written by hand for these tests (two slides: a title, a
+  bulleted list, a filled rectangle with text and an ellipse; a title and a
+  text box).
+- `sample.odp` and `sample.ppt`: `sample.fodp` saved as ODP and as
+  PowerPoint 97 by an office application.
+- `sample.key`: keynote-parser's `tests/data/simple-oneslide.key`
+  (https://github.com/psobot/keynote-parser, MIT, Copyright 2019-2025 Peter
+  Sobot): one slide with a title and a subtitle, saved by Keynote.
+- `chart.odp`, `chart.fodp`, `chart.ppt`: written by hand for these tests
+  (one slide holding a bar chart of three quarters' sales, as an ODF chart
+  object in a package, inline in a flat file); `chart.ppt` is `chart.odp`
+  saved as PowerPoint 97 by an office application, which stores the chart as
+  an OLE object holding its ODF package. CC0-1.0.
+- `pictures.odp`, `pictures.ppt`: written by hand for these tests (two
+  slides, each with one picture: a 64 by 48 pixel red PNG, then 250 by 250
+  pixels of noise that does not compress); `pictures.ppt` is `pictures.odp`
+  saved as PowerPoint 97 by an office application. CC0-1.0.
+- `table.key`: keynote-parser's `tests/data/table.key` (MIT, as `sample.key`):
+  one slide with a table of four columns and five rows, without text.
+
+`chart.ppt` and `pictures.ppt` are those files without their
+`SummaryInformation` stream, which holds a 440 KB thumbnail (the other
+streams are as the application wrote them, in a compound file rewritten by
+`exav_render::formats::office::test_util::build_cfb`).
+
+The tests of PowerPoint 95 (tests/office_slides_old_ppt.rs) and of Keynote 1 to 5
+(tests/office_slides_keynote_xml.rs) build their documents themselves: no permissively
+licensed samples of those formats were found.
diff --git a/crates/exav-render/tests/fixtures/office/slides/chart.fodp b/crates/exav-render/tests/fixtures/office/slides/chart.fodp
new file mode 100644
index 00000000..c13603cf
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/slides/chart.fodp
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.presentation">
+ <office:body>
+  <office:presentation>
+   <draw:page draw:name="Chart">
+    <draw:frame svg:x="2cm" svg:y="2cm" svg:width="16cm" svg:height="10cm">
+     <draw:object>
+      <office:document office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart">
+       <office:body>
+        <office:chart>
+         <chart:chart chart:class="chart:bar" svg:width="16cm" svg:height="10cm">
+          <chart:title><text:p>Quarterly sales</text:p></chart:title>
+          <chart:plot-area table:cell-range-address="local-table.$A$1:.$B$4" chart:data-source-has-labels="both">
+           <chart:axis chart:dimension="x" chart:name="primary-x">
+            <chart:categories table:cell-range-address="local-table.$A$2:.$A$4"/>
+           </chart:axis>
+           <chart:axis chart:dimension="y" chart:name="primary-y"/>
+           <chart:series chart:values-cell-range-address="local-table.$B$2:.$B$4" chart:label-cell-address="local-table.$B$1" chart:class="chart:bar"/>
+          </chart:plot-area>
+          <table:table table:name="local-table">
+           <table:table-header-columns><table:table-column/></table:table-header-columns>
+           <table:table-columns><table:table-column/></table:table-columns>
+           <table:table-header-rows>
+            <table:table-row>
+             <table:table-cell><text:p/></table:table-cell>
+             <table:table-cell office:value-type="string"><text:p>Sales</text:p></table:table-cell>
+            </table:table-row>
+           </table:table-header-rows>
+           <table:table-rows>
+            <table:table-row>
+             <table:table-cell office:value-type="string"><text:p>Q1</text:p></table:table-cell>
+             <table:table-cell office:value-type="float" office:value="10"><text:p>10</text:p></table:table-cell>
+            </table:table-row>
+            <table:table-row>
+             <table:table-cell office:value-type="string"><text:p>Q2</text:p></table:table-cell>
+             <table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell>
+            </table:table-row>
+            <table:table-row>
+             <table:table-cell office:value-type="string"><text:p>Q3</text:p></table:table-cell>
+             <table:table-cell office:value-type="float" office:value="17"><text:p>17</text:p></table:table-cell>
+            </table:table-row>
+           </table:table-rows>
+          </table:table>
+         </chart:chart>
+        </office:chart>
+       </office:body>
+      </office:document>
+     </draw:object>
+    </draw:frame>
+   </draw:page>
+  </office:presentation>
+ </office:body>
+</office:document>
diff --git a/crates/exav-render/tests/fixtures/office/slides/chart.odp b/crates/exav-render/tests/fixtures/office/slides/chart.odp
new file mode 100644
index 00000000..9f70d128
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/chart.odp differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/chart.ppt b/crates/exav-render/tests/fixtures/office/slides/chart.ppt
new file mode 100644
index 00000000..8b643d90
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/chart.ppt differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/pictures.odp b/crates/exav-render/tests/fixtures/office/slides/pictures.odp
new file mode 100644
index 00000000..591f2fa8
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/pictures.odp differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/pictures.ppt b/crates/exav-render/tests/fixtures/office/slides/pictures.ppt
new file mode 100644
index 00000000..d5206e7c
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/pictures.ppt differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/sample.fodp b/crates/exav-render/tests/fixtures/office/slides/sample.fodp
new file mode 100644
index 00000000..0ec8f101
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/office/slides/sample.fodp
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.presentation">
+ <office:styles>
+  <style:style style:name="Box" style:family="graphic"><style:graphic-properties draw:fill="solid" draw:fill-color="#2a6099" draw:stroke="none"/><style:text-properties fo:color="#ffffff" fo:font-size="20pt"/></style:style>
+  <style:style style:name="Plain" style:family="graphic"><style:graphic-properties draw:fill="none" draw:stroke="none"/><style:text-properties fo:font-size="18pt" fo:color="#000000"/></style:style>
+  <style:style style:name="Title" style:family="graphic"><style:graphic-properties draw:fill="none" draw:stroke="none"/><style:text-properties fo:font-size="36pt" fo:font-weight="bold" fo:color="#1c1c1c"/></style:style>
+ </office:styles>
+ <office:automatic-styles>
+  <style:page-layout style:name="PM1"><style:page-layout-properties fo:page-width="28cm" fo:page-height="15.75cm"/></style:page-layout>
+  <style:style style:name="dp1" style:family="drawing-page"><style:drawing-page-properties draw:fill="solid" draw:fill-color="#ffffff"/></style:style>
+  <style:style style:name="Ell" style:family="graphic" style:parent-style-name="Box"><style:graphic-properties draw:fill-color="#e8a202" draw:stroke="solid" svg:stroke-color="#000000" svg:stroke-width="0.05cm"/></style:style>
+  <text:list-style style:name="L1"><text:list-level-style-bullet text:level="1" text:bullet-char="•"><style:list-level-properties text:space-before="0cm" text:min-label-width="0.6cm"/></text:list-level-style-bullet></text:list-style>
+ </office:automatic-styles>
+ <office:master-styles>
+  <style:master-page style:name="Default" style:page-layout-name="PM1" draw:style-name="dp1"/>
+ </office:master-styles>
+ <office:body>
+  <office:presentation>
+   <draw:page draw:name="One" draw:master-page-name="Default">
+    <draw:frame draw:style-name="Title" svg:x="1cm" svg:y="0.8cm" svg:width="26cm" svg:height="2cm" presentation:class="title"><draw:text-box><text:p>Quarterly budget</text:p></draw:text-box></draw:frame>
+    <draw:frame draw:style-name="Plain" svg:x="1cm" svg:y="3.5cm" svg:width="14cm" svg:height="8cm"><draw:text-box><text:list text:style-name="L1"><text:list-item><text:p>Revenue up 12%</text:p></text:list-item><text:list-item><text:p>Costs flat</text:p></text:list-item></text:list></draw:text-box></draw:frame>
+    <draw:rect draw:style-name="Box" svg:x="16cm" svg:y="3.5cm" svg:width="10cm" svg:height="4cm"><text:p>Plan</text:p></draw:rect>
+    <draw:ellipse draw:style-name="Ell" svg:x="17cm" svg:y="9cm" svg:width="6cm" svg:height="4cm"/>
+   </draw:page>
+   <draw:page draw:name="Two" draw:master-page-name="Default">
+    <draw:frame draw:style-name="Title" svg:x="1cm" svg:y="0.8cm" svg:width="26cm" svg:height="2cm" presentation:class="title"><draw:text-box><text:p>Notes</text:p></draw:text-box></draw:frame>
+    <draw:frame draw:style-name="Plain" svg:x="1cm" svg:y="3.5cm" svg:width="26cm" svg:height="4cm"><draw:text-box><text:p>Second slide text</text:p></draw:text-box></draw:frame>
+   </draw:page>
+  </office:presentation>
+ </office:body>
+</office:document>
diff --git a/crates/exav-render/tests/fixtures/office/slides/sample.key b/crates/exav-render/tests/fixtures/office/slides/sample.key
new file mode 100644
index 00000000..374cf42f
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/sample.key differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/sample.odp b/crates/exav-render/tests/fixtures/office/slides/sample.odp
new file mode 100644
index 00000000..56d3fe05
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/sample.odp differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/sample.ppt b/crates/exav-render/tests/fixtures/office/slides/sample.ppt
new file mode 100644
index 00000000..9a70b5ba
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/sample.ppt differ
diff --git a/crates/exav-render/tests/fixtures/office/slides/table.key b/crates/exav-render/tests/fixtures/office/slides/table.key
new file mode 100755
index 00000000..213747dd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/office/slides/table.key differ
diff --git a/crates/exav-render/tests/fixtures/ojpeg/interchange.tif b/crates/exav-render/tests/fixtures/ojpeg/interchange.tif
new file mode 100644
index 00000000..377333cf
Binary files /dev/null and b/crates/exav-render/tests/fixtures/ojpeg/interchange.tif differ
diff --git a/crates/exav-render/tests/fixtures/ojpeg/make.py b/crates/exav-render/tests/fixtures/ojpeg/make.py
new file mode 100644
index 00000000..5ebb4a1f
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/ojpeg/make.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""Old-style JPEG TIFFs (compression 6): python3 make.py (needs Pillow).
+
+The picture is 16 by 16: red on the left half, blue on the right. Three files,
+each a way old-style JPEG is laid out, as libtiff reads them:
+
+whole.tif       the strip is a whole JPEG file (Kofax's); JPEGInterchangeFormat
+                names it
+tables.tif      the strip holds the scan alone; the tables are elsewhere in the
+                file and the tags JPEGQTables, JPEGDCTables and JPEGACTables
+                say where; the frame comes from the image's own tags
+interchange.tif a JPEG stream the file points to holds the headers and the
+                scan; the strip is named from three bytes before the end of its
+                scan header, and its byte count stops short of the stream's end
+scanheader.tif the stream the file points to stops before the scan header, which
+                starts the strip
+"""
+import io
+import struct
+
+from PIL import Image
+
+im = Image.new("RGB", (16, 16))
+for y in range(16):
+    for x in range(16):
+        im.putpixel((x, y), (200, 30, 30) if x < 8 else (30, 30, 200))
+buf = io.BytesIO()
+im.save(buf, "JPEG", quality=90, subsampling=2)
+jpeg = buf.getvalue()
+
+
+def segments(data):
+    """(marker, offset, length) of each segment up to the scan header, and where the scan data start."""
+    p, out = 2, []
+    while True:
+        marker = data[p + 1]
+        n = struct.unpack(">H", data[p + 2 : p + 4])[0]
+        out.append((marker, p, n + 2))
+        p += 2 + n
+        if marker == 0xDA:
+            return out, p
+
+
+segs, scan_at = segments(jpeg)
+scan = jpeg[scan_at:-2]
+
+
+class File:
+    """A little-endian TIFF: data after the 8-byte header, then the directory."""
+
+    def __init__(self):
+        self.data = b""
+        self.entries = []
+
+    def put(self, blob):
+        at = 8 + len(self.data)
+        self.data += blob
+        return at
+
+    def tag(self, tag, kind, count, value):
+        self.entries.append((tag, kind, count, value))
+
+    def array(self, tag, kind, values):
+        fmt = "<H" if kind == 3 else "<I"
+        blob = b"".join(struct.pack(fmt, v) for v in values)
+        # Four bytes or fewer sit in the entry itself.
+        self.tag(tag, kind, len(values), blob.ljust(4, b"\0") if len(blob) <= 4 else self.put(blob))
+
+    def finish(self, strip_at, strip_len):
+        for tag, kind, value in (
+            (256, 3, 16),
+            (257, 3, 16),
+            (259, 3, 6),
+            (262, 3, 6),
+            (273, 4, strip_at),
+            (277, 3, 3),
+            (278, 3, 16),
+            (279, 4, strip_len),
+        ):
+            self.tag(tag, kind, 1, value)
+        self.array(258, 3, [8, 8, 8])
+        out = b"II*\0" + struct.pack("<I", 8 + len(self.data)) + self.data
+        out += struct.pack("<H", len(self.entries))
+        for tag, kind, count, value in sorted(self.entries):
+            if isinstance(value, bytes):
+                v = value
+            elif kind == 3 and count == 1:
+                v = struct.pack("<H", value) + b"\0\0"
+            else:
+                v = struct.pack("<I", value)
+            out += struct.pack("<HHI", tag, kind, count) + v
+        return out + struct.pack("<I", 0)
+
+
+# whole: the JPEG is the strip.
+f = File()
+at = f.put(jpeg)
+f.tag(513, 4, 1, at)
+open("whole.tif", "wb").write(f.finish(at, len(jpeg)))
+
+# tables: the scan, then the tables, which the tags point to. Pillow's file has
+# two of each: component 0 uses the first, the others the second.
+f = File()
+at = f.put(scan)
+q = [f.put(jpeg[o + 5 : o + n]) for m, o, n in segs if m == 0xDB]
+dht = [(jpeg[o + 4], jpeg[o + 5 : o + n]) for m, o, n in segs if m == 0xC4]
+dc = [f.put(t) for tc, t in dht if tc >> 4 == 0]
+ac = [f.put(t) for tc, t in dht if tc >> 4 == 1]
+f.tag(512, 3, 1, 1)
+f.array(519, 4, [q[0], q[1], q[1]])
+f.array(520, 4, [dc[0], dc[1], dc[1]])
+f.array(521, 4, [ac[0], ac[1], ac[1]])
+f.array(530, 3, [2, 2])
+open("tables.tif", "wb").write(f.finish(at, len(scan)))
+
+# interchange: the strip starts 3 bytes before the end of the scan header and
+# is 5 bytes short of the stream's end.
+f = File()
+at = f.put(jpeg)
+f.tag(512, 3, 1, 1)
+f.tag(513, 4, 1, at)
+f.tag(514, 4, 1, len(jpeg))
+open("interchange.tif", "wb").write(f.finish(at + scan_at - 3, len(jpeg) - scan_at + 3 - 5))
+
+# scanheader: the stream the file points to stops before the scan header, which
+# starts the strip (a file with several strips has it in the first).
+sos_at = [o for m, o, n in segs if m == 0xDA][0]
+f = File()
+at = f.put(jpeg[:sos_at])
+f.tag(512, 3, 1, 1)
+f.tag(513, 4, 1, at)
+f.tag(514, 4, 1, sos_at)
+strip_at = f.put(jpeg[sos_at:-2])
+open("scanheader.tif", "wb").write(f.finish(strip_at, len(jpeg) - 2 - sos_at))
diff --git a/crates/exav-render/tests/fixtures/ojpeg/scanheader.tif b/crates/exav-render/tests/fixtures/ojpeg/scanheader.tif
new file mode 100644
index 00000000..fbaaac10
Binary files /dev/null and b/crates/exav-render/tests/fixtures/ojpeg/scanheader.tif differ
diff --git a/crates/exav-render/tests/fixtures/ojpeg/tables.tif b/crates/exav-render/tests/fixtures/ojpeg/tables.tif
new file mode 100644
index 00000000..ac76f0f1
Binary files /dev/null and b/crates/exav-render/tests/fixtures/ojpeg/tables.tif differ
diff --git a/crates/exav-render/tests/fixtures/ojpeg/whole.tif b/crates/exav-render/tests/fixtures/ojpeg/whole.tif
new file mode 100644
index 00000000..0c438353
Binary files /dev/null and b/crates/exav-render/tests/fixtures/ojpeg/whole.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/camera-structure-no-preview.tif b/crates/exav-render/tests/fixtures/raw/camera-structure-no-preview.tif
new file mode 100644
index 00000000..c7d89882
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/camera-structure-no-preview.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/canon-heif.cr3 b/crates/exav-render/tests/fixtures/raw/canon-heif.cr3
new file mode 100644
index 00000000..3b030042
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/canon-heif.cr3 differ
diff --git a/crates/exav-render/tests/fixtures/raw/canon-o1.cr3 b/crates/exav-render/tests/fixtures/raw/canon-o1.cr3
new file mode 100644
index 00000000..0434979e
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/canon-o1.cr3 differ
diff --git a/crates/exav-render/tests/fixtures/raw/canon-o8.cr3 b/crates/exav-render/tests/fixtures/raw/canon-o8.cr3
new file mode 100644
index 00000000..7ac7b136
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/canon-o8.cr3 differ
diff --git a/crates/exav-render/tests/fixtures/raw/canon.cr2 b/crates/exav-render/tests/fixtures/raw/canon.cr2
new file mode 100644
index 00000000..912776ca
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/canon.cr2 differ
diff --git a/crates/exav-render/tests/fixtures/raw/canon.crw b/crates/exav-render/tests/fixtures/raw/canon.crw
new file mode 100644
index 00000000..a1ec1f89
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/canon.crw differ
diff --git a/crates/exav-render/tests/fixtures/raw/cfa-tags-only.tif b/crates/exav-render/tests/fixtures/raw/cfa-tags-only.tif
new file mode 100644
index 00000000..fef614bd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/cfa-tags-only.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-32767.tif b/crates/exav-render/tests/fixtures/raw/compression-32767.tif
new file mode 100644
index 00000000..2e498dac
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-32767.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-32769.tif b/crates/exav-render/tests/fixtures/raw/compression-32769.tif
new file mode 100644
index 00000000..49fbed1f
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-32769.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-32772.tif b/crates/exav-render/tests/fixtures/raw/compression-32772.tif
new file mode 100644
index 00000000..4e354d6c
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-32772.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-34713.tif b/crates/exav-render/tests/fixtures/raw/compression-34713.tif
new file mode 100644
index 00000000..19ee0f7a
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-34713.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-65000.tif b/crates/exav-render/tests/fixtures/raw/compression-65000.tif
new file mode 100644
index 00000000..973cbe0d
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-65000.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-65535.tif b/crates/exav-render/tests/fixtures/raw/compression-65535.tif
new file mode 100644
index 00000000..3d2a47cd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-65535.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/compression-99.tif b/crates/exav-render/tests/fixtures/raw/compression-99.tif
new file mode 100644
index 00000000..b9203d1a
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/compression-99.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o1.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o1.raf
new file mode 100644
index 00000000..c3891997
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o1.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o2.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o2.raf
new file mode 100644
index 00000000..580c6baa
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o2.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o3.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o3.raf
new file mode 100644
index 00000000..ac1edc1d
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o3.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o4.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o4.raf
new file mode 100644
index 00000000..dbccdc50
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o4.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o5.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o5.raf
new file mode 100644
index 00000000..5751386b
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o5.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o6.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o6.raf
new file mode 100644
index 00000000..23a7085a
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o6.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o7.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o7.raf
new file mode 100644
index 00000000..55dedfde
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o7.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/fujifilm-o8.raf b/crates/exav-render/tests/fixtures/raw/fujifilm-o8.raf
new file mode 100644
index 00000000..ce6faeec
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/fujifilm-o8.raf differ
diff --git a/crates/exav-render/tests/fixtures/raw/hasselblad.3fr b/crates/exav-render/tests/fixtures/raw/hasselblad.3fr
new file mode 100644
index 00000000..d08bc48e
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/hasselblad.3fr differ
diff --git a/crates/exav-render/tests/fixtures/raw/kodak16-be.dcr b/crates/exav-render/tests/fixtures/raw/kodak16-be.dcr
new file mode 100644
index 00000000..993ee270
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/kodak16-be.dcr differ
diff --git a/crates/exav-render/tests/fixtures/raw/kodak16-le.dcr b/crates/exav-render/tests/fixtures/raw/kodak16-le.dcr
new file mode 100644
index 00000000..2ac1306d
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/kodak16-le.dcr differ
diff --git a/crates/exav-render/tests/fixtures/raw/lossy-linear.dng b/crates/exav-render/tests/fixtures/raw/lossy-linear.dng
new file mode 100644
index 00000000..06c02ed7
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/lossy-linear.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/make.py b/crates/exav-render/tests/fixtures/raw/make.py
new file mode 100644
index 00000000..feee5c37
--- /dev/null
+++ b/crates/exav-render/tests/fixtures/raw/make.py
@@ -0,0 +1,465 @@
+#!/usr/bin/env python3
+"""Writes the synthetic camera RAW files of tests/raw.rs.
+
+No camera file is involved: each is a container of one family laid out as
+that family's files are (TIFF 6.0 directories for DNG, CR2, NEF, ARW, PEF and
+the other TIFF/EP files, an ISO base media file for CR3, a header and a JPEG
+for RAF, and so on), holding small JPEG previews that Pillow encodes, a block
+of bytes standing for the sensor data, and sometimes a lossless JPEG stream
+(what real sensor data is compressed with). Every preview is four colour
+quadrants, so that the tests can tell how a decoder turned it.
+
+    python3 crates/exav-render/tests/fixtures/raw/make.py
+"""
+import io
+import os
+import struct
+
+from PIL import Image
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+RED, GREEN, BLUE, YELLOW = (255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 0)
+
+# TIFF field types.
+BYTE, ASCII, SHORT, LONG, UNDEFINED, IFD = 1, 2, 3, 4, 7, 13
+
+
+def quadrants(w, h):
+    """Top left red, top right green, bottom left blue, bottom right yellow."""
+    im = Image.new("RGB", (w, h))
+    for y in range(h):
+        for x in range(w):
+            im.putpixel((x, y), [[RED, GREEN], [BLUE, YELLOW]][y * 2 // h][x * 2 // w])
+    return im
+
+
+def jpeg(w, h, orientation=None, grey=False):
+    """A baseline JPEG of the four quadrants (4:4:4), with its own Exif
+    orientation when one is given."""
+    im = quadrants(w, h)
+    if grey:
+        im = im.convert("L")
+    kw = {"quality": 95, "subsampling": 0} if not grey else {"quality": 95}
+    if orientation:
+        exif = Image.Exif()
+        exif[0x112] = orientation
+        kw["exif"] = exif.tobytes()
+    out = io.BytesIO()
+    im.save(out, "JPEG", **kw)
+    return out.getvalue()
+
+
+def progressive_jpeg(w, h):
+    out = io.BytesIO()
+    quadrants(w, h).save(out, "JPEG", quality=95, subsampling=0, progressive=True)
+    return out.getvalue()
+
+
+def rgb_samples(w, h, wide=None):
+    """The quadrants as interleaved 8-bit RGB, or 16-bit (`wide` is the byte
+    order) with the sample in the high byte."""
+    im = quadrants(w, h)
+    raw = im.tobytes()
+    if wide is None:
+        return raw
+    out = bytearray()
+    for v in raw:
+        out += struct.pack(wide + "H", v << 8 | 0x33)
+    return bytes(out)
+
+
+def lossless_jpeg(w, h):
+    """A lossless JPEG stream (SOF3), as the sensor data of a DNG or a CR2
+    is: well formed up to its scan, which no decoder of previews reads."""
+    return (
+        b"\xff\xd8\xff\xc3\x00\x0b\x08" + struct.pack(">HH", h, w) + b"\x01\x01\x11\x00"
+        + b"\xff\xc4\x00\x15\x00" + bytes([0, 1] + [0] * 14) + b"\x00\x01"
+        + b"\xff\xda\x00\x08\x01\x01\x00\x01\x00\x00"
+        + bytes((i * 37) % 251 for i in range(300)).replace(b"\xff", b"\xfe")
+        + b"\xff\xd9"
+    )
+
+
+class Buf:
+    """A TIFF being laid out: the header, then whatever is allocated."""
+
+    def __init__(self, le, magic=42, header=b""):
+        self.e = "<" if le else ">"
+        self.data = bytearray(b"II" if le else b"MM")
+        self.data += struct.pack(self.e + "H", magic) + b"\0\0\0\0" + header
+
+    def alloc(self, payload, align=2):
+        while len(self.data) % align:
+            self.data.append(0)
+        at = len(self.data)
+        self.data += payload
+        return at
+
+    def entry(self, tag, typ, values):
+        e = self.e
+        if typ in (ASCII, UNDEFINED, BYTE):
+            payload = bytes(values) if not isinstance(values, str) else values.encode() + b"\0"
+            count = len(payload)
+        else:
+            fmt = {SHORT: "H", LONG: "L", IFD: "L"}[typ]
+            values = values if isinstance(values, (list, tuple)) else [values]
+            payload = b"".join(struct.pack(e + fmt, v) for v in values)
+            count = len(values)
+        return (tag, typ, count, payload)
+
+    def ifd(self, entries, next_ifd=0):
+        e = self.e
+        entries = sorted(entries, key=lambda t: t[0])
+        out = struct.pack(e + "H", len(entries))
+        for tag, typ, count, payload in entries:
+            if len(payload) <= 4:
+                field = payload.ljust(4, b"\0")
+            else:
+                field = struct.pack(e + "L", self.alloc(payload))
+            out += struct.pack(e + "HHL", tag, typ, count) + field
+        out += struct.pack(e + "L", next_ifd)
+        return self.alloc(out)
+
+    def finish(self, first_ifd):
+        self.data[4:8] = struct.pack(self.e + "L", first_ifd)
+        return bytes(self.data)
+
+
+def picture(b, w, h, strips=None, samples=None, bits=8, orientation=None, subfile=None, compression=1, extra=()):
+    """The entries of a directory that holds a picture: JPEG (`strips` is the
+    JPEG bytes, one strip, compression 7) or `samples` (uncompressed unless
+    `compression` says another, which makes them bytes no reader here
+    understands)."""
+    t = b.entry
+    es = [t(0x100, LONG, w), t(0x101, LONG, h)]
+    if orientation is not None:
+        es.append(t(0x112, SHORT, orientation))
+    if subfile is not None:
+        es.append(t(0xFE, LONG, subfile))
+    if strips is not None:
+        at = b.alloc(strips)
+        es += [t(0x103, SHORT, 7), t(0x106, SHORT, 6), t(0x111, LONG, at), t(0x117, LONG, len(strips)),
+               t(0x115, SHORT, 3), t(0x116, LONG, h)]
+    else:
+        at = b.alloc(samples)
+        es += [t(0x103, SHORT, compression), t(0x106, SHORT, 2), t(0x111, LONG, at),
+               t(0x117, LONG, len(samples)), t(0x115, SHORT, 3), t(0x102, SHORT, [bits] * 3),
+               t(0x116, LONG, h), t(0x11C, SHORT, 1)]
+    return es + list(extra)
+
+
+def sensor(b, w, h, compression=1, photometric=32803, data=None, cfa=True, extra=()):
+    """The entries of a directory of sensor data: a colour filter array
+    (photometric 32803 and the CFA tags) or, without `cfa`, only what the
+    other arguments say."""
+    t = b.entry
+    data = data if data is not None else bytes((i * 7) % 253 for i in range(2000))
+    at = b.alloc(data)
+    es = [t(0xFE, LONG, 0), t(0x100, LONG, w), t(0x101, LONG, h), t(0x102, SHORT, 16),
+          t(0x103, SHORT, compression), t(0x111, LONG, at), t(0x117, LONG, len(data)), t(0x115, SHORT, 1)]
+    if photometric is not None:
+        es.append(t(0x106, SHORT, photometric))
+    if cfa:
+        es += [t(0x828D, SHORT, [2, 2]), t(0x828E, BYTE, [0, 1, 1, 2])]
+    return es + list(extra)
+
+
+def write(name, data):
+    with open(os.path.join(HERE, name), "wb") as f:
+        f.write(data)
+
+
+# Adobe DNG: the first directory a small uncompressed preview, a SubIFD of
+# sensor data (lossless JPEG) and a SubIFD of a JPEG preview.
+b = Buf(True)
+t = b.entry
+raw = sensor(b, 64, 48, compression=7, data=lossless_jpeg(64, 48))
+sub_raw = b.ifd(raw)
+sub_jpeg = b.ifd(picture(b, 64, 48, strips=jpeg(64, 48), subfile=1))
+ifd0 = b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=1, extra=[
+    t(0xC612, BYTE, [1, 4, 0, 0]), t(0x14A, IFD, [sub_raw, sub_jpeg]), t(0x10F, ASCII, "Exav")]))
+write("preview-jpeg.dng", b.finish(ifd0))
+
+# A DNG whose only previews are uncompressed RGB (the first directory's, 16
+# by 12, and a SubIFD's, 32 by 24), turned by orientation 6.
+b = Buf(False)
+t = b.entry
+sub_raw = b.ifd(sensor(b, 64, 48))
+sub_rgb = b.ifd(picture(b, 32, 24, samples=rgb_samples(32, 24), subfile=1, orientation=6))
+ifd0 = b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=1, orientation=6, extra=[
+    t(0xC612, BYTE, [1, 4, 0, 0]), t(0x14A, IFD, [sub_raw, sub_rgb])]))
+write("preview-rgb.dng", b.finish(ifd0))
+
+# A DNG (grey preview, 8-bit): the picture of a monochrome camera.
+b = Buf(True)
+t = b.entry
+grey = quadrants(16, 12).convert("L").tobytes()
+es = [t(0x100, LONG, 16), t(0x101, LONG, 12), t(0xFE, LONG, 1), t(0x103, SHORT, 1), t(0x106, SHORT, 1),
+      t(0x102, SHORT, 8), t(0x115, SHORT, 1), t(0x111, LONG, b.alloc(grey)), t(0x117, LONG, len(grey)),
+      t(0xC612, BYTE, [1, 4, 0, 0])]
+write("preview-grey.dng", b.finish(b.ifd(es)))
+
+# A DNG with no preview: the first directory is the sensor data.
+b = Buf(True)
+t = b.entry
+write("no-preview.dng", b.finish(b.ifd(sensor(b, 64, 48, extra=[t(0xC612, BYTE, [1, 4, 0, 0])]))))
+
+# A lossy DNG: its sensor data is a baseline JPEG, larger than the preview,
+# in a directory of linear raw (photometric 34892).
+b = Buf(True)
+t = b.entry
+lossy = b.ifd(sensor(b, 128, 96, compression=34892, photometric=34892, data=jpeg(128, 96)))
+ifd0 = b.ifd(picture(b, 48, 32, strips=jpeg(48, 32), subfile=1, extra=[
+    t(0xC612, BYTE, [1, 4, 0, 0]), t(0x14A, IFD, [lossy])]))
+write("lossy-linear.dng", b.finish(ifd0))
+
+# A DNG whose preview is progressive.
+b = Buf(True)
+t = b.entry
+ifd0 = b.ifd(picture(b, 48, 32, strips=progressive_jpeg(48, 32), subfile=1, extra=[
+    t(0xC612, BYTE, [1, 4, 0, 0]), t(0x14A, IFD, [b.ifd(sensor(b, 64, 48))])]))
+write("progressive.dng", b.finish(ifd0))
+
+# A DNG with an orientation on its first directory and another on its JPEG.
+b = Buf(True)
+t = b.entry
+ifd0 = b.ifd(picture(b, 48, 32, strips=jpeg(48, 32, orientation=6), subfile=1, orientation=3, extra=[
+    t(0xC612, BYTE, [1, 4, 0, 0]), t(0x14A, IFD, [b.ifd(sensor(b, 64, 48))])]))
+write("orientation-own.dng", b.finish(ifd0))
+
+# Canon CR2: "CR" and the version after the header, IFD0 the full-size JPEG
+# in a strip, IFD1 the thumbnail (JPEGInterchangeFormat), IFD2 uncompressed
+# RGB, IFD3 the sensor data as a lossless JPEG.
+b = Buf(True, header=b"CR\x02\x00" + b"\0\0\0\0")
+t = b.entry
+raw = lossless_jpeg(64, 48)
+ifd3 = b.ifd([t(0x103, SHORT, 6), t(0x111, LONG, b.alloc(raw)), t(0x117, LONG, len(raw))])
+rgb = rgb_samples(32, 24)
+ifd2 = b.ifd(picture(b, 32, 24, samples=rgb), next_ifd=ifd3)
+thumb = jpeg(16, 12)
+at = b.alloc(thumb)
+ifd1 = b.ifd([t(0x103, SHORT, 6), t(0x201, LONG, at), t(0x202, LONG, len(thumb))], next_ifd=ifd2)
+big = jpeg(96, 64)
+at = b.alloc(big)
+ifd0 = b.ifd([t(0x100, LONG, 96), t(0x101, LONG, 64), t(0x103, SHORT, 6), t(0x111, LONG, at),
+              t(0x117, LONG, len(big)), t(0x112, SHORT, 1), t(0x10F, ASCII, "Canon")], next_ifd=ifd1)
+write("canon.cr2", b.finish(ifd0))
+
+# Nikon NEF (big-endian): IFD0 a small RGB preview, a SubIFD of JPEG
+# (JPEGInterchangeFormat), a SubIFD of sensor data in Nikon's compression.
+b = Buf(False)
+t = b.entry
+nef_raw = b.ifd(sensor(b, 64, 48, compression=34713))
+jp = jpeg(80, 48)
+at = b.alloc(jp)
+nef_jpeg = b.ifd([t(0xFE, LONG, 1), t(0x103, SHORT, 6), t(0x201, LONG, at), t(0x202, LONG, len(jp)),
+                  t(0x100, LONG, 80), t(0x101, LONG, 48)])
+ifd0 = b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=1, extra=[
+    t(0x14A, IFD, [nef_jpeg, nef_raw]), t(0x10F, ASCII, "NIKON CORPORATION")]))
+write("nikon.nef", b.finish(ifd0))
+
+# Sony ARW: IFD0 holds its JPEG as JPEGInterchangeFormat (the preview), the
+# DNGPrivateData tag Sony writes, and a SubIFD of sensor data (compression
+# 32767), laid out little-endian.
+b = Buf(True)
+t = b.entry
+sub = b.ifd(sensor(b, 64, 48, compression=32767))
+jp = jpeg(72, 48)
+at = b.alloc(jp)
+ifd0 = b.ifd([t(0x103, SHORT, 6), t(0x201, LONG, at), t(0x202, LONG, len(jp)), t(0x14A, IFD, [sub]),
+              t(0xC634, BYTE, [1, 2, 3, 4]), t(0x10F, ASCII, "SONY")])
+write("sony.arw", b.finish(ifd0))
+
+# Pentax PEF (big-endian): sensor data in Pentax's compression, and the
+# preview only where the maker keeps it, in the Exif directory's maker note,
+# which no tag of a TIFF points at.
+b = Buf(False)
+t = b.entry
+note = b"PENTAX \0MM" + b"\0" * 20 + jpeg(88, 56) + b"\0" * 8
+exif = b.ifd([t(0x927C, UNDEFINED, note)])
+sub = b.ifd(sensor(b, 64, 48, compression=65535))
+ifd0 = b.ifd([t(0x14A, IFD, [sub]), t(0x8769, LONG, exif), t(0x10F, ASCII, "PENTAX Corporation")])
+write("pentax.pef", b.finish(ifd0))
+
+# Samsung SRW: a JPEG as a strip of a SubIFD, a SubIFD of sensor data (Samsung's
+# compression, 32772).
+b = Buf(True)
+t = b.entry
+sub_raw = b.ifd(sensor(b, 64, 48, compression=32772))
+sub_jpeg = b.ifd(picture(b, 56, 40, strips=jpeg(56, 40), subfile=1))
+ifd0 = b.ifd([t(0x14A, IFD, [sub_jpeg, sub_raw]), t(0x10F, ASCII, "SAMSUNG")])
+write("samsung.srw", b.finish(ifd0))
+
+# A TIFF/EP file that only a camera maker's name and its structure show (no
+# colour filter array: a Hasselblad 3FR): a SubIFD of uncompressed RGB.
+b = Buf(True)
+t = b.entry
+sub = b.ifd(picture(b, 32, 24, samples=rgb_samples(32, 24), subfile=0))
+ifd0 = b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=1, extra=[
+    t(0x14A, IFD, [sub]), t(0x10F, ASCII, "Hasselblad")]))
+write("hasselblad.3fr", b.finish(ifd0))
+
+# A Sony file of the old kind: a maker's name, and a JPEG thumbnail in the
+# directory that follows the first (no SubIFD, no sensor data in the TIFF).
+b = Buf(True)
+t = b.entry
+thumb = jpeg(24, 16)
+at = b.alloc(thumb)
+ifd1 = b.ifd([t(0x103, SHORT, 6), t(0x201, LONG, at), t(0x202, LONG, len(thumb))])
+ifd0 = b.ifd([t(0x10F, ASCII, "SONY"), t(0x110, ASCII, "DSC-F828")], next_ifd=ifd1)
+write("sony-thumbnail.srf", b.finish(ifd0))
+
+# A DNG whose JPEG preview comes after 600 start markers that lead nowhere:
+# only the directory finds it.
+b = Buf(True)
+t = b.entry
+b.alloc(b"\xff\xd8\xff\xfe\x00\x02" * 600)
+ifd0 = b.ifd(picture(b, 64, 48, strips=jpeg(64, 48), subfile=1, extra=[t(0xC612, BYTE, [1, 4, 0, 0])]))
+write("many-markers.dng", b.finish(ifd0))
+
+# Kodak DCR with 16-bit RGB previews, in either byte order.
+for name, le in (("kodak16-be.dcr", False), ("kodak16-le.dcr", True)):
+    b = Buf(le)
+    t = b.entry
+    sub = b.ifd(sensor(b, 64, 48, compression=65000))
+    write(name, b.finish(b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12, wide=b.e), bits=16, subfile=1, extra=[
+        t(0x14A, IFD, [sub]), t(0x10F, ASCII, "EASTMAN KODAK COMPANY")]))))
+
+# TIFF-structured files with no maker's name, that only their sensor data shows
+# to be RAW: each compression the makers number (Leaf, Sony, Epson, Samsung,
+# Nikon, Kodak, Pentax), photometric 32803 alone, the CFA tags alone, and the
+# DNGPrivateData tag alone. The first directory is a 16 by 12 RGB preview.
+def generic(name, le, sensor_args=None, ifd0_extra=()):
+    b = Buf(le)
+    t = b.entry
+    extra = list(ifd0_extra)
+    if sensor_args is not None:
+        extra.append(t(0x14A, IFD, [b.ifd(sensor(b, 64, 48, **sensor_args))]))
+    write(name, b.finish(b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=1, extra=extra))))
+
+
+for c in (99, 32767, 32769, 32772, 34713, 65000, 65535):
+    generic(f"compression-{c}.tif", c % 2 == 0, dict(compression=c, photometric=None, cfa=False))
+generic("photometric-cfa-only.tif", True, dict(cfa=False))
+generic("cfa-tags-only.tif", False, dict(photometric=None))
+generic("private-data-only.tif", True, None, [t for t in [Buf(True).entry(0xC634, BYTE, [1, 2, 3, 4])]])
+
+# A plain TIFF: uncompressed RGB, no maker.
+b = Buf(True)
+write("plain.tif", b.finish(b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=0))))
+
+# What a program saves a camera photo as: the maker's name in a plain TIFF.
+b = Buf(True)
+t = b.entry
+write("plain-with-make.tif", b.finish(b.ifd(picture(b, 16, 12, samples=rgb_samples(16, 12), subfile=0, extra=[
+    t(0x10F, ASCII, "NIKON CORPORATION")]))))
+
+# The same with a camera's structure (a SubIFD) but no preview a reader
+# takes (LZW strips): it is still a TIFF.
+b = Buf(True)
+t = b.entry
+sub = b.ifd(picture(b, 8, 8, samples=bytes(100), subfile=0, compression=5))
+big = picture(b, 16, 12, samples=bytes(200), subfile=0, compression=5, extra=[
+    t(0x10F, ASCII, "NIKON CORPORATION"), t(0x14A, IFD, [sub])])
+write("camera-structure-no-preview.tif", b.finish(b.ifd(big)))
+
+# Olympus ORF: "IIRO", a first directory with a JPEG thumbnail, and the
+# larger JPEG in the maker note.
+for name, le, magic in (("olympus.orf", True, 0x4F52), ("olympus-rs.orf", True, 0x5352), ("olympus-be.orf", False, 0x4F52)):
+    b = Buf(le, magic=magic)
+    t = b.entry
+    note = b"OLYMPUS\0II\x03\0" + b"\0" * 16 + jpeg(104, 72) + b"\0" * 4
+    exif = b.ifd([t(0x927C, UNDEFINED, note)])
+    thumb = jpeg(16, 12)
+    at = b.alloc(thumb)
+    ifd1 = b.ifd([t(0x103, SHORT, 6), t(0x201, LONG, at), t(0x202, LONG, len(thumb))])
+    ifd0 = b.ifd([t(0x8769, LONG, exif), t(0x112, SHORT, 1)], next_ifd=ifd1)
+    write(name, b.finish(ifd0))
+
+# Panasonic RW2: "IIU\0", sensor data, and the JPEG in a tag of the first
+# directory that no TIFF reader knows.
+b = Buf(True, magic=0x55)
+t = b.entry
+ifd0 = b.ifd([t(0x2E, UNDEFINED, jpeg(112, 64)), t(0x112, SHORT, 1), t(0x10F, ASCII, "Panasonic")])
+write("panasonic.rw2", b.finish(ifd0))
+
+# A Panasonic file with no preview at all.
+b = Buf(True, magic=0x55)
+write("panasonic-no-preview.rw2", b.finish(b.ifd([b.entry(0x112, SHORT, 1)])))
+
+# Phase One IIQ: a TIFF header, "IIII" after it, and the first directory
+# after the sensor data.
+b = Buf(True, header=b"IIII")
+t = b.entry
+b.alloc(bytes((i * 11) % 251 for i in range(500)))
+write("phaseone.iiq", b.finish(b.ifd(picture(b, 24, 16, samples=rgb_samples(24, 16), subfile=0))))
+
+# Fujifilm RAF: the header, the offset and length of the JPEG at 84, the JPEG.
+for o in range(1, 9):
+    jp = jpeg(64, 48, orientation=o)
+    head = b"FUJIFILMCCD-RAW " + b"0201" + b"FF129504" + b"X-TEST".ljust(32, b"\0") + b"0100" + b"\0" * 20
+    head += struct.pack(">LLLLLL", 160, len(jp), 160 + len(jp), 64, 160 + len(jp) + 64, 2000)
+    head = head.ljust(160, b"\0")
+    write(f"fujifilm-o{o}.raf", head + jp + b"\0" * 64 + bytes((i * 3) % 250 for i in range(2000)))
+
+# Canon CR3: an ISO base media file (ISO/IEC 14496-12) laid out as the CC0
+# samples of raw.pixls.us are. `ftyp` has the major brand `crx `. `moov`
+# starts with a `uuid` box whose content is boxes: CMT1 (the Exif TIFF
+# structure of the first directory, with the orientation) and THMB (a 16-byte
+# header, then a JPEG). Another `uuid` box holds XMP, a third a PRVW box (a
+# 16-byte header, then a JPEG). `mdat`, with a 64-bit size, begins with the
+# full-size JPEG. None of the JPEGs has Exif of its own. In the "heif" file
+# bytes that are not a JPEG stand where the JPEGs are (HEVC, in the samples
+# of the newest cameras).
+def box(kind, body, wide=False):
+    if wide:
+        return struct.pack(">I", 1) + kind + struct.pack(">Q", 16 + len(body)) + body
+    return struct.pack(">I", 8 + len(body)) + kind + body
+
+
+def cmt1(o):
+    b = Buf(True)
+    return b.finish(
+        b.ifd([b.entry(0x10F, ASCII, "Canon"), b.entry(0x110, ASCII, "Canon EOS Test"), b.entry(0x112, SHORT, o)])
+    )
+
+
+def cr3(o, heif=False):
+    def thumb(w, h, j):
+        return struct.pack(">IHHIHH", 0, w, h, len(j), 1, 0) + j
+
+    def preview(w, h, j):
+        return struct.pack(">IHHHHI", 0, 1, w, h, 1, len(j)) + j
+
+    opaque = bytes((i * 5) % 249 for i in range(1500))
+    small, mid, full = (jpeg(16, 12), jpeg(96, 64), jpeg(128, 96)) if not heif else (opaque[:300],) * 3
+    meta = box(b"CNCV", b"CanonCR3_001") + box(b"CMT1", cmt1(o)) + box(b"THMB", thumb(16, 12, small))
+    uuid_meta = box(b"uuid", bytes.fromhex("85c0b687820f11e08111f4ce462b6a48") + meta)
+    moov = box(b"moov", uuid_meta + box(b"mvhd", b"\0" * 100))
+    xmp = box(b"uuid", bytes.fromhex("be7acfcb97a942e89c71999491e3afac") + b'<?xpacket begin="" id="test"?>')
+    prvw = box(b"PRVW", preview(96, 64, mid))
+    uuid_prvw = box(b"uuid", bytes.fromhex("eaf42b5e1c984b88b9fbb7dc406e4d16") + struct.pack(">II", 0, 1) + prvw)
+    mdat = box(b"mdat", full + opaque, wide=True)
+    ftyp = box(b"ftyp", b"crx \0\0\0\1crx isom")
+    return ftyp + moov + xmp + uuid_prvw + box(b"free", b"\0" * 16) + mdat
+
+
+for o in (1, 8):
+    write(f"canon-o{o}.cr3", cr3(o))
+write("canon-heif.cr3", cr3(6, heif=True))
+
+# Sigma X3F: "FOVb", then sections; the JPEGs are in the image sections.
+body = b"FOVb\x02\x00\x02\x00" + b"\0" * 48 + b"SECi" + b"\0" * 12 + jpeg(32, 24) + b"SECi" + b"\0" * 12 + jpeg(80, 56)
+write("sigma.x3f", body + bytes((i * 9) % 247 for i in range(1000)))
+
+# Canon CRW (CIFF): "II", the heap offset (26), "HEAPCCDR", and the JPEG in
+# the heap.
+body = b"II" + struct.pack("<L", 26) + b"HEAPCCDR" + b"\x00\x01\x00\x00\x00" + b"\0" * 30
+write("canon.crw", body + jpeg(72, 48) + b"\0" * 12 + bytes((i * 13) % 241 for i in range(600)))
+
+# Minolta MRW: its blocks, with no JPEG.
+prd = b"\0PRD" + struct.pack(">L", 24) + b"21810002" + b"\0" * 16
+ttw = b"\0TTW" + struct.pack(">L", 8) + b"MM\0*\0\0\0\x08"
+mrw_data = prd + ttw
+write("minolta.mrw", b"\0MRM" + struct.pack(">L", len(mrw_data)) + mrw_data + bytes(500))
diff --git a/crates/exav-render/tests/fixtures/raw/many-markers.dng b/crates/exav-render/tests/fixtures/raw/many-markers.dng
new file mode 100644
index 00000000..fa00e15a
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/many-markers.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/minolta.mrw b/crates/exav-render/tests/fixtures/raw/minolta.mrw
new file mode 100644
index 00000000..136b8adb
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/minolta.mrw differ
diff --git a/crates/exav-render/tests/fixtures/raw/nikon.nef b/crates/exav-render/tests/fixtures/raw/nikon.nef
new file mode 100644
index 00000000..da821165
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/nikon.nef differ
diff --git a/crates/exav-render/tests/fixtures/raw/no-preview.dng b/crates/exav-render/tests/fixtures/raw/no-preview.dng
new file mode 100644
index 00000000..b761dc00
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/no-preview.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/olympus-be.orf b/crates/exav-render/tests/fixtures/raw/olympus-be.orf
new file mode 100644
index 00000000..7ff5862d
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/olympus-be.orf differ
diff --git a/crates/exav-render/tests/fixtures/raw/olympus-rs.orf b/crates/exav-render/tests/fixtures/raw/olympus-rs.orf
new file mode 100644
index 00000000..d8fa9955
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/olympus-rs.orf differ
diff --git a/crates/exav-render/tests/fixtures/raw/olympus.orf b/crates/exav-render/tests/fixtures/raw/olympus.orf
new file mode 100644
index 00000000..69a7b4be
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/olympus.orf differ
diff --git a/crates/exav-render/tests/fixtures/raw/orientation-own.dng b/crates/exav-render/tests/fixtures/raw/orientation-own.dng
new file mode 100644
index 00000000..fe423588
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/orientation-own.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/panasonic-no-preview.rw2 b/crates/exav-render/tests/fixtures/raw/panasonic-no-preview.rw2
new file mode 100644
index 00000000..7e6f9289
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/panasonic-no-preview.rw2 differ
diff --git a/crates/exav-render/tests/fixtures/raw/panasonic.rw2 b/crates/exav-render/tests/fixtures/raw/panasonic.rw2
new file mode 100644
index 00000000..5079dccf
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/panasonic.rw2 differ
diff --git a/crates/exav-render/tests/fixtures/raw/pentax.pef b/crates/exav-render/tests/fixtures/raw/pentax.pef
new file mode 100644
index 00000000..2e4fc13e
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/pentax.pef differ
diff --git a/crates/exav-render/tests/fixtures/raw/phaseone.iiq b/crates/exav-render/tests/fixtures/raw/phaseone.iiq
new file mode 100644
index 00000000..4743a215
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/phaseone.iiq differ
diff --git a/crates/exav-render/tests/fixtures/raw/photometric-cfa-only.tif b/crates/exav-render/tests/fixtures/raw/photometric-cfa-only.tif
new file mode 100644
index 00000000..704b00bf
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/photometric-cfa-only.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/plain-with-make.tif b/crates/exav-render/tests/fixtures/raw/plain-with-make.tif
new file mode 100644
index 00000000..178345b6
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/plain-with-make.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/plain.tif b/crates/exav-render/tests/fixtures/raw/plain.tif
new file mode 100644
index 00000000..e84bb1ef
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/plain.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/preview-grey.dng b/crates/exav-render/tests/fixtures/raw/preview-grey.dng
new file mode 100644
index 00000000..7a5a273f
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/preview-grey.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/preview-jpeg.dng b/crates/exav-render/tests/fixtures/raw/preview-jpeg.dng
new file mode 100644
index 00000000..ec54b338
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/preview-jpeg.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/preview-rgb.dng b/crates/exav-render/tests/fixtures/raw/preview-rgb.dng
new file mode 100644
index 00000000..2dd20129
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/preview-rgb.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/private-data-only.tif b/crates/exav-render/tests/fixtures/raw/private-data-only.tif
new file mode 100644
index 00000000..76b74864
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/private-data-only.tif differ
diff --git a/crates/exav-render/tests/fixtures/raw/progressive.dng b/crates/exav-render/tests/fixtures/raw/progressive.dng
new file mode 100644
index 00000000..d2ca2fb0
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/progressive.dng differ
diff --git a/crates/exav-render/tests/fixtures/raw/samsung.srw b/crates/exav-render/tests/fixtures/raw/samsung.srw
new file mode 100644
index 00000000..32aa2818
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/samsung.srw differ
diff --git a/crates/exav-render/tests/fixtures/raw/sigma.x3f b/crates/exav-render/tests/fixtures/raw/sigma.x3f
new file mode 100644
index 00000000..91ae7e96
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/sigma.x3f differ
diff --git a/crates/exav-render/tests/fixtures/raw/sony-thumbnail.srf b/crates/exav-render/tests/fixtures/raw/sony-thumbnail.srf
new file mode 100644
index 00000000..9cf3a2dd
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/sony-thumbnail.srf differ
diff --git a/crates/exav-render/tests/fixtures/raw/sony.arw b/crates/exav-render/tests/fixtures/raw/sony.arw
new file mode 100644
index 00000000..7fb52a0d
Binary files /dev/null and b/crates/exav-render/tests/fixtures/raw/sony.arw differ
diff --git a/crates/exav-render/tests/gltf.rs b/crates/exav-render/tests/gltf.rs
new file mode 100644
index 00000000..4645ca73
--- /dev/null
+++ b/crates/exav-render/tests/gltf.rs
@@ -0,0 +1,1111 @@
+//! The glTF reader on documents and GLB files written here from known
+//! geometry: transforms against hand-worked bounds and volumes, colours,
+//! normals, accessor layouts; and on hostile files.
+
+mod mesh_common;
+
+use std::fmt::Write as _;
+use std::time::Duration;
+
+use exav_render::gltf::{Error, MAX_DEPTH, external_buffers, read, read_with};
+use exav_render::mesh::Scene;
+use mesh_common::*;
+
+const TABLE: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+fn base64(data: &[u8]) -> String {
+    let mut out = String::new();
+    for chunk in data.chunks(3) {
+        let n = chunk
+            .iter()
+            .enumerate()
+            .fold(0u32, |n, (i, &b)| n | u32::from(b) << (16 - 8 * i));
+        for k in 0..=chunk.len() {
+            out.push(TABLE[(n >> (18 - 6 * k) & 63) as usize] as char);
+        }
+        for _ in chunk.len()..3 {
+            out.push('=');
+        }
+    }
+    out
+}
+
+fn floats(values: &[f64]) -> Vec<u8> {
+    values
+        .iter()
+        .flat_map(|&v| (v as f32).to_le_bytes())
+        .collect()
+}
+
+fn pad(mut v: Vec<u8>) -> Vec<u8> {
+    while !v.len().is_multiple_of(4) {
+        v.push(0);
+    }
+    v
+}
+
+/// The cube's 36 indices, from its quads.
+fn cube_indices() -> Vec<u32> {
+    CUBE_QUADS
+        .iter()
+        .flat_map(|q| [q[0], q[1], q[2], q[0], q[2], q[3]])
+        .map(|i| i as u32)
+        .collect()
+}
+
+fn encode(indices: &[u32], ty: &str) -> Vec<u8> {
+    indices
+        .iter()
+        .flat_map(|&i| match ty {
+            "u8" => vec![i as u8],
+            "u16" => (i as u16).to_le_bytes().to_vec(),
+            _ => i.to_le_bytes().to_vec(),
+        })
+        .collect()
+}
+
+fn component(ty: &str) -> u32 {
+    match ty {
+        "u8" => 5121,
+        "u16" => 5123,
+        _ => 5125,
+    }
+}
+
+/// The cube's data: positions, then indices of type `ty`.
+fn cube_data(ty: &str) -> Vec<u8> {
+    let mut data = floats(&CUBE.iter().flatten().copied().collect::<Vec<_>>());
+    data.extend(pad(encode(&cube_indices(), ty)));
+    data
+}
+
+/// A document with the cube as mesh 0 (accessor 0 positions, 1 indices) and
+/// whatever `rest` adds at the top level (nodes, scenes, materials...).
+fn cube_doc(ty: &str, rest: &str) -> String {
+    let data = cube_data(ty);
+    document(
+        &format!(
+            "\"uri\":\"data:application/octet-stream;base64,{}\"",
+            base64(&data)
+        ),
+        data.len(),
+        &format!(
+            "\"bufferViews\":[{{\"buffer\":0,\"byteOffset\":0,\"byteLength\":96}},{{\"buffer\":0,\"byteOffset\":96,\"byteLength\":{}}}],\
+             \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"VEC3\"}},{{\"bufferView\":1,\"componentType\":{},\"count\":36,\"type\":\"SCALAR\"}}],\
+             \"meshes\":[{{\"name\":\"cube\",\"primitives\":[{{\"attributes\":{{\"POSITION\":0}},\"indices\":1}}]}}]",
+            data.len() - 96,
+            component(ty)
+        ),
+        rest,
+    )
+}
+
+fn document(buffer_uri: &str, length: usize, parts: &str, rest: &str) -> String {
+    let comma = if rest.is_empty() { "" } else { "," };
+    let uri = if buffer_uri.is_empty() {
+        String::new()
+    } else {
+        format!("{buffer_uri},")
+    };
+    format!(
+        "{{\"asset\":{{\"version\":\"2.0\"}},\"buffers\":[{{{uri}\"byteLength\":{length}}}],{parts}{comma}{rest}}}"
+    )
+}
+
+fn glb(json: &str, bin: &[u8]) -> Vec<u8> {
+    let mut json = json.as_bytes().to_vec();
+    while !json.len().is_multiple_of(4) {
+        json.push(b' ');
+    }
+    let bin = pad(bin.to_vec());
+    let total = 12 + 8 + json.len() + if bin.is_empty() { 0 } else { 8 + bin.len() };
+    let mut out = b"glTF".to_vec();
+    out.extend(2u32.to_le_bytes());
+    out.extend((total as u32).to_le_bytes());
+    out.extend((json.len() as u32).to_le_bytes());
+    out.extend(0x4E4F534Au32.to_le_bytes());
+    out.extend(json);
+    if !bin.is_empty() {
+        out.extend((bin.len() as u32).to_le_bytes());
+        out.extend(0x004E4942u32.to_le_bytes());
+        out.extend(bin);
+    }
+    out
+}
+
+fn node(extra: &str) -> String {
+    format!(
+        "{{\"mesh\":0{}{extra}}}",
+        if extra.is_empty() { "" } else { "," }
+    )
+}
+
+fn parse(text: &str) -> Scene {
+    read(text.as_bytes(), usize::MAX).unwrap()
+}
+
+fn with_nodes(nodes: &[String]) -> String {
+    let list: Vec<String> = (0..nodes.len()).map(|i| i.to_string()).collect();
+    format!(
+        "\"nodes\":[{}],\"scenes\":[{{\"nodes\":[{}]}}]",
+        nodes.join(","),
+        list.join(",")
+    )
+}
+
+fn bounds_of(s: &Scene) -> [[f64; 3]; 2] {
+    extent(s)
+}
+
+#[test]
+fn a_cube_is_twelve_triangles_enclosing_one_with_indices_of_every_size() {
+    for ty in ["u8", "u16", "u32"] {
+        let s = parse(&cube_doc(ty, &with_nodes(&[node("")])));
+        assert_eq!(s.triangles(), 12, "{ty}");
+        assert_near(volume(&s), 1.0, ty);
+        assert_near(area(&s), 6.0, ty);
+        assert_eq!(bounds_of(&s), [[0.; 3], [1.; 3]]);
+        assert_eq!(s.warnings, Default::default());
+        assert_sound(&s);
+        assert!(s.batches[0].colors.is_none());
+    }
+}
+
+#[test]
+fn a_glb_holds_the_same_cube() {
+    for ty in ["u8", "u16", "u32"] {
+        let data = cube_data(ty);
+        let json = document(
+            "",
+            data.len(),
+            &format!(
+                "\"bufferViews\":[{{\"buffer\":0,\"byteLength\":96}},{{\"buffer\":0,\"byteOffset\":96,\"byteLength\":{}}}],\
+                 \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"VEC3\"}},{{\"bufferView\":1,\"componentType\":{},\"count\":36,\"type\":\"SCALAR\"}}],\
+                 \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0}},\"indices\":1}}]}}]",
+                data.len() - 96,
+                component(ty)
+            ),
+            &with_nodes(&[node("")]),
+        );
+        let file = glb(&json, &data);
+        let s = read(&file, usize::MAX).unwrap();
+        assert_eq!(s.triangles(), 12, "{ty}");
+        assert_near(volume(&s), 1.0, ty);
+        assert_eq!(bounds_of(&s), [[0.; 3], [1.; 3]]);
+    }
+}
+
+/// A GLB of the cube whose JSON chunk is 2 bytes over a multiple of 4: its
+/// length counts the padding (`counted`) or not, and the padding is in the
+/// file (`present`) or not. Only the first is valid; the others are what some
+/// writers made.
+fn glb_of_cube_with_json_padding(counted: bool, present: bool) -> Vec<u8> {
+    let data = cube_data("u16");
+    let mut json = document(
+        "",
+        data.len(),
+        &format!(
+            "\"bufferViews\":[{{\"buffer\":0,\"byteLength\":96}},{{\"buffer\":0,\"byteOffset\":96,\"byteLength\":{}}}],\
+             \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"VEC3\"}},{{\"bufferView\":1,\"componentType\":{},\"count\":36,\"type\":\"SCALAR\"}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0}},\"indices\":1}}]}}]",
+            data.len() - 96,
+            component("u16")
+        ),
+        &with_nodes(&[node("")]),
+    )
+    .into_bytes();
+    while json.len() % 4 != 2 {
+        json.push(b' ');
+    }
+    let bin = pad(data);
+    let padding = if present { 2 } else { 0 };
+    let mut out = b"glTF".to_vec();
+    out.extend(2u32.to_le_bytes());
+    out.extend(((12 + 8 + json.len() + padding + 8 + bin.len()) as u32).to_le_bytes());
+    out.extend(((json.len() + if counted { 2 } else { 0 }) as u32).to_le_bytes());
+    out.extend(0x4E4F534Au32.to_le_bytes());
+    out.extend(json);
+    out.extend(vec![b' '; padding]);
+    out.extend((bin.len() as u32).to_le_bytes());
+    out.extend(0x004E4942u32.to_le_bytes());
+    out.extend(bin);
+    out
+}
+
+#[test]
+fn a_glb_whose_json_chunk_is_not_padded_as_it_says_is_read() {
+    for (counted, present) in [(true, true), (false, true), (false, false)] {
+        let file = glb_of_cube_with_json_padding(counted, present);
+        let s = read(&file, usize::MAX).unwrap_or_else(|e| panic!("{counted} {present}: {e:?}"));
+        assert_eq!(s.triangles(), 12, "{counted} {present}");
+    }
+}
+
+#[test]
+fn a_mesh_without_indices_is_read_three_vertices_to_a_triangle() {
+    let data = floats(&[0., 0., 0., 1., 0., 0., 0., 1., 0., 5., 5., 5.]);
+    let json = document(
+        &format!("\"uri\":\"data:;base64,{}\"", base64(&data)),
+        data.len(),
+        "\"bufferViews\":[{\"buffer\":0,\"byteLength\":48}],\
+         \"accessors\":[{\"bufferView\":0,\"componentType\":5126,\"count\":4,\"type\":\"VEC3\"}],\
+         \"meshes\":[{\"primitives\":[{\"attributes\":{\"POSITION\":0}}]}]",
+        "\"nodes\":[{\"mesh\":0}]",
+    );
+    // No scenes: every node that is nobody's child is drawn.
+    let s = parse(&json);
+    assert_eq!(s.triangles(), 1);
+    assert_eq!(triangles(&s)[0], [[0., 0., 0.], [1., 0., 0.], [0., 1., 0.]]);
+}
+
+/// The cube's corners as three shorts each, padded to 8 bytes a vertex,
+/// scaled by `scale`; then its indices as u16.
+fn quantized_cube(scale: f64) -> Vec<u8> {
+    let mut data = Vec::new();
+    for p in CUBE {
+        for v in p {
+            data.extend(((v * scale).round() as i16).to_le_bytes());
+        }
+        data.extend([0, 0]);
+    }
+    data.extend(pad(encode(&cube_indices(), "u16")));
+    data
+}
+
+fn quantized_doc(data: &[u8], accessor_extra: &str, rest: &str) -> String {
+    document(
+        &format!(
+            "\"uri\":\"data:application/octet-stream;base64,{}\"",
+            base64(data)
+        ),
+        data.len(),
+        &format!(
+            "\"bufferViews\":[{{\"buffer\":0,\"byteOffset\":0,\"byteLength\":64,\"byteStride\":8}},{{\"buffer\":0,\"byteOffset\":64,\"byteLength\":{}}}],\
+             \"accessors\":[{{\"bufferView\":0,\"componentType\":5122,\"count\":8,\"type\":\"VEC3\"{accessor_extra}}},{{\"bufferView\":1,\"componentType\":5123,\"count\":36,\"type\":\"SCALAR\"}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0}},\"indices\":1}}]}}],\
+             \"extensionsUsed\":[\"KHR_mesh_quantization\"],\"extensionsRequired\":[\"KHR_mesh_quantization\"]",
+            data.len() - 64
+        ),
+        rest,
+    )
+}
+
+#[test]
+fn a_cube_of_shorts_is_the_cube_the_node_scale_restores() {
+    // Normalized: -1..1 of the type's range, so 32767 is 1, and the node
+    // scales the unit cube up to 4 across.
+    let s = parse(&quantized_doc(
+        &quantized_cube(32767.0),
+        ",\"normalized\":true",
+        &with_nodes(&[node("\"scale\":[4,4,4]")]),
+    ));
+    assert_eq!(s.triangles(), 12);
+    let b = bounds_of(&s);
+    for k in 0..3 {
+        assert!(
+            (b[0][k]).abs() < 1e-4 && (b[1][k] - 4.0).abs() < 1e-3,
+            "{b:?}"
+        );
+    }
+    // Not normalized: the shorts are the coordinates, scaled by the node.
+    let s = parse(&quantized_doc(
+        &quantized_cube(1000.0),
+        "",
+        &with_nodes(&[node("\"scale\":[0.001,0.001,0.001]")]),
+    ));
+    assert_eq!(s.triangles(), 12);
+    assert_near(volume(&s), 1.0, "volume");
+    assert_sound(&s);
+}
+
+#[test]
+fn a_translation_and_a_scale_move_and_grow_the_cube() {
+    let s = parse(&cube_doc(
+        "u16",
+        &with_nodes(&[node("\"translation\":[10,-2,3],\"scale\":[2,3,4]")]),
+    ));
+    assert_eq!(bounds_of(&s), [[10., -2., 3.], [12., 1., 7.]]);
+    assert_near(volume(&s), 24.0, "volume");
+    assert_sound(&s);
+}
+
+#[test]
+fn a_rotation_turns_the_cube_and_a_matrix_says_the_same() {
+    let h = std::f64::consts::FRAC_1_SQRT_2;
+    // 90 degrees about z, scaled by 2, then moved: x becomes -y.
+    let trs = format!("\"translation\":[10,0,0],\"rotation\":[0,0,{h},{h}],\"scale\":[2,2,2]");
+    let a = parse(&cube_doc("u8", &with_nodes(&[node(&trs)])));
+    let [lo, hi] = bounds_of(&a);
+    for (got, want) in lo.iter().chain(&hi).zip([8., 0., 0., 10., 2., 2.]) {
+        assert_near(*got, want, "bounds");
+    }
+    assert_near(volume(&a), 8.0, "volume");
+    // Column-major: the x axis goes to (0,2,0), the y axis to (-2,0,0).
+    let m = "\"matrix\":[0,2,0,0,-2,0,0,0,0,0,2,0,10,0,0,1]";
+    let b = parse(&cube_doc("u8", &with_nodes(&[node(m)])));
+    let (ta, tb) = (triangles(&a), triangles(&b));
+    assert_eq!(ta.len(), tb.len());
+    for (x, y) in ta.iter().zip(&tb) {
+        for (p, q) in x.iter().zip(y) {
+            for k in 0..3 {
+                assert_near(p[k], q[k], "matrix against TRS");
+            }
+        }
+    }
+}
+
+#[test]
+fn a_rotation_of_all_zeros_is_no_rotation() {
+    let s = parse(&cube_doc(
+        "u16",
+        &with_nodes(&[node("\"rotation\":[0,0,0,0],\"translation\":[10,0,0]")]),
+    ));
+    assert_eq!(bounds_of(&s), [[10., 0., 0.], [11., 1., 1.]]);
+    assert_sound(&s);
+}
+
+#[test]
+fn child_nodes_compose_with_their_parents() {
+    let doc = cube_doc(
+        "u16",
+        "\"nodes\":[{\"translation\":[0,5,0],\"children\":[1]},{\"scale\":[3,3,3],\"translation\":[1,0,0],\"mesh\":0}],\"scenes\":[{\"nodes\":[0]}]",
+    );
+    let s = parse(&doc);
+    // The child's scale and offset first, the parent's offset after.
+    assert_eq!(bounds_of(&s), [[1., 5., 0.], [4., 8., 3.]]);
+    assert_near(volume(&s), 27.0, "volume");
+}
+
+#[test]
+fn a_mirror_keeps_the_cube_outward() {
+    let s = parse(&cube_doc("u16", &with_nodes(&[node("\"scale\":[-1,1,1]")])));
+    assert_eq!(bounds_of(&s), [[-1., 0., 0.], [0., 1., 1.]]);
+    // A mirror turns triangles inside out unless they are turned back.
+    assert_near(volume(&s), 1.0, "volume");
+    let b = &s.batches[0];
+    for (p, n) in b.positions.chunks(3).zip(b.normals.chunks(3)) {
+        let out = (f64::from(p[0]) + 0.5) * f64::from(n[0])
+            + (f64::from(p[1]) - 0.5) * f64::from(n[1])
+            + (f64::from(p[2]) - 0.5) * f64::from(n[2]);
+        assert!(out > 0.0);
+    }
+    // Scaled to nothing: nothing to draw, and nothing wrong.
+    let s = parse(&cube_doc("u16", &with_nodes(&[node("\"scale\":[0,1,1]")])));
+    assert_eq!(s.triangles(), 0);
+}
+
+#[test]
+fn each_node_with_a_mesh_is_an_element_and_a_mesh_can_be_used_twice() {
+    let nodes = [
+        node("\"name\":\"left\""),
+        node("\"name\":\"right\",\"translation\":[5,0,0]"),
+        node("\"translation\":[0,5,0]"),
+    ];
+    let s = parse(&cube_doc("u16", &with_nodes(&nodes)));
+    assert_eq!(s.triangles(), 36);
+    let names: Vec<_> = s.elements.iter().map(|e| e.name.as_str()).collect();
+    // The third has no name of its own: the mesh's.
+    assert_eq!(names, ["left", "right", "cube"]);
+    let b = &s.batches[0];
+    for (e, (x, y)) in s.elements.iter().zip([(0.0, 0.0), (5.0, 0.0), (0.0, 5.0)]) {
+        assert_eq!(e.ranges.len(), 1);
+        assert_eq!(e.ranges[0].count, 36);
+        let first = e.ranges[0].first as usize;
+        for &i in &b.indices[first..first + 36] {
+            let p = &b.positions[i as usize * 3..];
+            assert!((x..=x + 1.0).contains(&f64::from(p[0])));
+            assert!((y..=y + 1.0).contains(&f64::from(p[1])));
+        }
+    }
+}
+
+#[test]
+fn a_material_colours_the_mesh_in_srgb() {
+    let with = |material: &str| {
+        let d = cube_doc(
+            "u16",
+            &format!("{},\"materials\":[{material}]", with_nodes(&[node("")])),
+        );
+        parse(&d.replace("\"indices\":1}", "\"indices\":1,\"material\":0}"))
+    };
+    let red = with("{\"pbrMetallicRoughness\":{\"baseColorFactor\":[1,0,0,1]}}");
+    let c = red.batches[0].colors.as_ref().unwrap();
+    assert_eq!(c.len(), 36 * 3);
+    assert!(c.chunks(3).all(|v| v == [255, 0, 0]));
+    // Linear one half is 188 of 255 in sRGB.
+    let grey = with("{\"pbrMetallicRoughness\":{\"baseColorFactor\":[0.5,0.5,0.5,0.1]}}");
+    assert!(
+        grey.batches[0]
+            .colors
+            .as_ref()
+            .unwrap()
+            .chunks(3)
+            .all(|v| v == [188, 188, 188])
+    );
+    // No colour factor, or white: the renderer's colour.
+    assert!(with("{}").batches[0].colors.is_none());
+    assert!(
+        with("{\"pbrMetallicRoughness\":{\"baseColorFactor\":[1,1,1,1]}}").batches[0]
+            .colors
+            .is_none()
+    );
+}
+
+#[test]
+fn vertex_colours_multiply_the_material() {
+    // Triangle, COLOR_0 as float VEC3, VEC4 normalized bytes, material 0.5.
+    let positions = floats(&[0., 0., 0., 1., 0., 0., 0., 1., 0.]);
+    let float_colors = floats(&[1., 0.5, 0., 1., 0.5, 0., 1., 0.5, 0.]);
+    let byte_colors: Vec<u8> = vec![255, 0, 0, 255, 255, 0, 0, 255, 255, 0, 0, 255];
+    let mut data = positions;
+    data.extend(&float_colors);
+    data.extend(&byte_colors);
+    let doc = |color: usize| {
+        format!(
+            "{{\"asset\":{{\"version\":\"2.0\"}},\"buffers\":[{{\"uri\":\"data:;base64,{}\",\"byteLength\":{}}}],\
+             \"bufferViews\":[{{\"buffer\":0,\"byteLength\":36}},{{\"buffer\":0,\"byteOffset\":36,\"byteLength\":36}},{{\"buffer\":0,\"byteOffset\":72,\"byteLength\":12}}],\
+             \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}},\
+             {{\"bufferView\":1,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}},\
+             {{\"bufferView\":2,\"componentType\":5121,\"normalized\":true,\"count\":3,\"type\":\"VEC4\"}}],\
+             \"materials\":[{{\"pbrMetallicRoughness\":{{\"baseColorFactor\":[0.5,1,1,1]}}}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0,\"COLOR_0\":{color}}},\"material\":0}}]}}],\
+             \"nodes\":[{{\"mesh\":0}}]}}",
+            base64(&data),
+            data.len()
+        )
+    };
+    // (0.5, 0.5, 0) linear: 188, 188, 0.
+    let s = parse(&doc(1));
+    let c = s.batches[0].colors.as_ref().unwrap();
+    assert!(c.chunks(3).all(|v| v == [188, 188, 0]), "{c:?}");
+    // Bytes 255, 0, 0 times (0.5, 1, 1): 188, 0, 0.
+    let s = parse(&doc(2));
+    let c = s.batches[0].colors.as_ref().unwrap();
+    assert!(c.chunks(3).all(|v| v == [188, 0, 0]), "{c:?}");
+}
+
+#[test]
+fn normals_follow_the_inverse_transpose_of_the_transform() {
+    // A triangle in the plane whose normal is (0,1,1), stretched in y: the
+    // normal must stay the new triangle's normal.
+    let h = std::f64::consts::FRAC_1_SQRT_2;
+    let rows = [
+        [0., 0., 0.],
+        [1., 0., 0.],
+        [0., 1., -1.],
+        [0., h, h],
+        [0., h, h],
+        [0., h, h],
+    ];
+    let data = floats(&rows.concat());
+    let doc = |transform: &str| {
+        format!(
+            "{{\"asset\":{{\"version\":\"2.0\"}},\"buffers\":[{{\"uri\":\"data:;base64,{}\",\"byteLength\":{}}}],\
+             \"bufferViews\":[{{\"buffer\":0,\"byteLength\":36}},{{\"buffer\":0,\"byteOffset\":36,\"byteLength\":36}}],\
+             \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}},{{\"bufferView\":1,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0,\"NORMAL\":1}}}}]}}],\
+             \"nodes\":[{{\"mesh\":0{transform}}}]}}",
+            base64(&data),
+            data.len()
+        )
+    };
+    for transform in [
+        "",
+        ",\"scale\":[1,2,1]",
+        ",\"scale\":[3,0.5,2]",
+        ",\"scale\":[-1,2,1]",
+    ] {
+        let s = parse(&doc(transform));
+        assert_eq!(s.triangles(), 1);
+        let t = triangles(&s)[0];
+        let n = {
+            let (a, b) = (
+                [t[1][0] - t[0][0], t[1][1] - t[0][1], t[1][2] - t[0][2]],
+                [t[2][0] - t[0][0], t[2][1] - t[0][1], t[2][2] - t[0][2]],
+            );
+            let c = [
+                a[1] * b[2] - a[2] * b[1],
+                a[2] * b[0] - a[0] * b[2],
+                a[0] * b[1] - a[1] * b[0],
+            ];
+            let l = (c[0] * c[0] + c[1] * c[1] + c[2] * c[2]).sqrt();
+            c.map(|v| v / l)
+        };
+        for v in s.batches[0].normals.chunks(3) {
+            // The file's normal and the triangle's agree on a side: the
+            // mirror turned the triangle back, so they agree after it too.
+            for k in 0..3 {
+                assert!(
+                    (f64::from(v[k]) - n[k]).abs() < 1e-5,
+                    "{transform}: {v:?} against {n:?}"
+                );
+            }
+        }
+    }
+}
+
+#[test]
+fn sparse_accessors_replace_elements_and_zero_the_rest() {
+    // Three vertices that are all zero but for a sparse list of three.
+    let mut data = vec![0u8, 1, 2, 0];
+    data.extend(floats(&[0., 0., 0., 1., 0., 0., 0., 2., 0.]));
+    let doc = |count: usize, bad_index: u8| {
+        let mut d = data.clone();
+        d[2] = bad_index;
+        format!(
+            "{{\"asset\":{{\"version\":\"2.0\"}},\"buffers\":[{{\"uri\":\"data:;base64,{}\",\"byteLength\":{}}}],\
+             \"bufferViews\":[{{\"buffer\":0,\"byteLength\":3}},{{\"buffer\":0,\"byteOffset\":4,\"byteLength\":36}}],\
+             \"accessors\":[{{\"componentType\":5126,\"count\":{count},\"type\":\"VEC3\",\
+             \"sparse\":{{\"count\":3,\"indices\":{{\"bufferView\":0,\"componentType\":5121}},\"values\":{{\"bufferView\":1}}}}}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0}}}}]}}],\
+             \"nodes\":[{{\"mesh\":0}}]}}",
+            base64(&d),
+            d.len()
+        )
+    };
+    let s = parse(&doc(3, 2));
+    assert_eq!(triangles(&s)[0], [[0., 0., 0.], [1., 0., 0.], [0., 2., 0.]]);
+    // The same list over a longer accessor: the extra vertices are the
+    // origin, and make a triangle with no area.
+    let s = parse(&doc(6, 2));
+    assert_eq!(s.triangles(), 1);
+    // A sparse index past the end is damage.
+    assert!(read(doc(3, 3).as_bytes(), 100).is_err());
+    assert!(read(doc(3, 255).as_bytes(), 100).is_err());
+}
+
+#[test]
+fn interleaved_attributes_are_read_through_the_stride() {
+    // Position and normal of each of three vertices, 24 bytes apart.
+    let data = floats(&[
+        0., 0., 0., 0., 0., 7., //
+        1., 0., 0., 0., 0., 7., //
+        0., 1., 0., 0., 0., 7.,
+    ]);
+    let doc = format!(
+        "{{\"asset\":{{\"version\":\"2.0\"}},\"buffers\":[{{\"uri\":\"data:;base64,{}\",\"byteLength\":{}}}],\
+         \"bufferViews\":[{{\"buffer\":0,\"byteLength\":72,\"byteStride\":24}}],\
+         \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}},{{\"bufferView\":0,\"byteOffset\":12,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}}],\
+         \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0,\"NORMAL\":1}}}}]}}],\
+         \"nodes\":[{{\"mesh\":0}}]}}",
+        base64(&data),
+        data.len()
+    );
+    let s = parse(&doc);
+    assert_eq!(triangles(&s)[0], [[0., 0., 0.], [1., 0., 0.], [0., 1., 0.]]);
+    assert_eq!(&s.batches[0].normals[..3], &[0., 0., 1.]);
+}
+
+#[test]
+fn what_is_not_drawn_is_counted() {
+    let d = cube_doc("u16", &with_nodes(&[node("")]));
+    let lines = d.replace("\"indices\":1}", "\"indices\":1,\"mode\":1}");
+    let s = parse(&lines);
+    assert_eq!(s.triangles(), 0);
+    assert_eq!(s.warnings.unsupported["lines"], 1);
+    let strip = d.replace("\"indices\":1}", "\"indices\":1,\"mode\":5}");
+    assert_eq!(parse(&strip).warnings.unsupported["triangle strips"], 1);
+    let draco = d.replace(
+        "\"indices\":1}",
+        "\"indices\":1,\"extensions\":{\"KHR_draco_mesh_compression\":{}}}",
+    );
+    assert_eq!(
+        parse(&draco).warnings.unsupported["KHR_draco_mesh_compression"],
+        1
+    );
+    let meshopt = d.replace(
+        "\"byteLength\":96}",
+        "\"byteLength\":96,\"extensions\":{\"EXT_meshopt_compression\":{}}}",
+    );
+    let s = parse(&meshopt);
+    assert_eq!(s.warnings.unsupported["EXT_meshopt_compression"], 1);
+    assert_eq!(s.warnings.invalid, 0);
+}
+
+#[test]
+fn textures_animations_and_cameras_are_ignored_and_nothing_is_fetched() {
+    let rest = format!(
+        "{},\"images\":[{{\"uri\":\"http://example.com/a.png\"}},{{\"uri\":\"textures/b.png\"}}],\"textures\":[{{\"source\":0}}],\
+         \"animations\":[{{\"channels\":[],\"samplers\":[]}}],\"cameras\":[{{\"type\":\"perspective\"}}],\"extensionsUsed\":[\"KHR_lights_punctual\"]",
+        with_nodes(&[node("")])
+    );
+    let s = parse(&cube_doc("u16", &rest));
+    assert_eq!(s.triangles(), 12);
+    assert_eq!(s.warnings, Default::default());
+}
+
+/// A buffer in a file next to the document is read from the bytes the caller
+/// gives for its URI, named as the document writes it.
+#[test]
+fn a_buffer_in_another_file_is_read_from_what_it_is_given() {
+    let d = cube_doc("u16", &with_nodes(&[node("")]));
+    let uri_start = d.find("data:application").unwrap();
+    let uri_end = uri_start + d[uri_start..].find('"').unwrap();
+    let doc = format!("{}cube%20one.bin{}", &d[..uri_start], &d[uri_end..]);
+    assert_eq!(
+        external_buffers(doc.as_bytes()).unwrap(),
+        ["cube%20one.bin"]
+    );
+    assert_eq!(read(doc.as_bytes(), 100).unwrap_err(), Error::External);
+    let bin = cube_data("u16");
+    let s = read_with(doc.as_bytes(), 100, &[("cube%20one.bin", &bin)]).unwrap();
+    assert_eq!(s.triangles(), 12);
+    assert_eq!(bounds_of(&s), [[0.; 3], [1.; 3]]);
+    // Another name is not this buffer; one too short is refused.
+    assert_eq!(
+        read_with(doc.as_bytes(), 100, &[("other.bin", &bin)]).unwrap_err(),
+        Error::External
+    );
+    assert!(matches!(
+        read_with(doc.as_bytes(), 100, &[("cube%20one.bin", &bin[..40])]),
+        Err(Error::Invalid(_))
+    ));
+    // A document whose buffers are all inside it names no file.
+    assert!(external_buffers(d.as_bytes()).unwrap().is_empty());
+    assert_eq!(external_buffers(b"not gltf").unwrap_err(), Error::NotGltf);
+}
+
+#[test]
+fn buffers_in_other_files_are_refused_not_fetched() {
+    let d = cube_doc("u16", &with_nodes(&[node("")]));
+    let uri_start = d.find("data:application").unwrap();
+    let uri_end = uri_start + d[uri_start..].find('"').unwrap();
+    for uri in [
+        "cube.bin",
+        "../cube.bin",
+        "http://example.com/cube.bin",
+        "https://example.com/cube.bin",
+        "file:///etc/passwd",
+        "//host/cube.bin",
+        "ftp://x/y",
+        "",
+    ] {
+        let doc = format!("{}{uri}{}", &d[..uri_start], &d[uri_end..]);
+        assert_eq!(
+            read(doc.as_bytes(), 100).unwrap_err(),
+            Error::External,
+            "{uri}"
+        );
+    }
+    assert!(Error::External.to_string().contains("external files"));
+    // A GLB whose buffer has neither a URI nor a binary chunk.
+    let json = d.replace(&d[uri_start - 7..uri_end + 2], "");
+    assert_eq!(read(&glb(&json, &[]), 100).unwrap_err(), Error::External);
+    // A buffer nothing draws from is no reason to refuse the file.
+    let doc = d.replacen(
+        "}],\"bufferViews\"",
+        "},{\"uri\":\"unused.bin\",\"byteLength\":4}],\"bufferViews\"",
+        1,
+    );
+    assert_ne!(doc, d);
+    assert_eq!(read(doc.as_bytes(), 100).unwrap().triangles(), 12);
+}
+
+#[test]
+fn documents_that_are_not_gltf_are_refused() {
+    for bad in [
+        &b""[..],
+        b"hello",
+        b"{",
+        b"{}",
+        b"[]",
+        b"{\"asset\":{}}",
+        b"{\"asset\":{\"version\":2}}",
+        b"\x89PNG\r\n",
+    ] {
+        assert_eq!(read(bad, 10).unwrap_err(), Error::NotGltf, "{bad:?}");
+    }
+    let v1 = b"{\"asset\":{\"version\":\"1.0\"}}";
+    assert!(matches!(read(v1, 10).unwrap_err(), Error::Unsupported(_)));
+    // A document with nothing in it draws nothing.
+    let s = read(b"{\"asset\":{\"version\":\"2.0\"}}", 10).unwrap();
+    assert_eq!(s.triangles(), 0);
+    // A byte-order mark and trailing zeros are fine.
+    let mut d = b"\xEF\xBB\xBF".to_vec();
+    d.extend(b"{\"asset\":{\"version\":\"2.0\"}}\0\0");
+    assert!(read(&d, 10).is_ok());
+}
+
+#[test]
+fn a_glb_with_a_broken_container_is_refused() {
+    let good = glb(&cube_doc("u16", &with_nodes(&[node("")])), &[]);
+    // A chunk longer than the file, a file shorter than it says, a version.
+    let mut b = good.clone();
+    b[12..16].copy_from_slice(&u32::MAX.to_le_bytes());
+    assert!(matches!(read(&b, 10).unwrap_err(), Error::Invalid(_)));
+    let mut b = good.clone();
+    b[8..12].copy_from_slice(&u32::MAX.to_le_bytes());
+    assert!(matches!(read(&b, 10).unwrap_err(), Error::Invalid(_)));
+    let mut b = good.clone();
+    b[4] = 1;
+    assert!(matches!(read(&b, 10).unwrap_err(), Error::Unsupported(_)));
+    let mut b = good.clone();
+    b[8..12].copy_from_slice(&4u32.to_le_bytes());
+    assert!(read(&b, 10).is_err());
+    assert!(read(&good[..11], 10).is_err());
+    assert!(read(b"glTF", 10).is_err());
+    // The length is what ends the file: bytes after it are not read.
+    let mut b = good;
+    b.extend_from_slice(&[0xff; 100]);
+    assert_eq!(read(&b, 100).unwrap().triangles(), 12);
+}
+
+#[test]
+fn the_budget_stops_the_reading() {
+    let d = cube_doc(
+        "u16",
+        &with_nodes(&[node(""), node("\"translation\":[2,0,0]")]),
+    );
+    let s = read(d.as_bytes(), 15).unwrap();
+    assert_eq!(s.triangles(), 15);
+    assert_eq!(s.warnings.truncated, 1);
+    let s = read(d.as_bytes(), 24).unwrap();
+    assert_eq!(s.triangles(), 24);
+    assert_eq!(s.warnings.truncated, 0);
+}
+
+fn must_fail_quickly(doc: &str, what: &str) {
+    let r = within(Duration::from_secs(10), what, || {
+        read(doc.as_bytes(), 200_000)
+    });
+    assert!(r.is_err(), "{what}: {:?}", r.map(|s| s.triangles()));
+}
+
+#[test]
+fn accessors_that_do_not_fit_their_buffers_are_errors() {
+    let d = cube_doc("u16", &with_nodes(&[node("")]));
+    let acc0 = "\"bufferView\":0,\"componentType\":5126,\"count\":8";
+    let acc1 = "\"bufferView\":1,\"componentType\":5123,\"count\":36";
+    let cases = [
+        // Counts of billions over a few hundred bytes.
+        (
+            acc0,
+            "\"bufferView\":0,\"componentType\":5126,\"count\":4294967295",
+        ),
+        (
+            acc1,
+            "\"bufferView\":1,\"componentType\":5123,\"count\":4294967295",
+        ),
+        (
+            acc0,
+            "\"bufferView\":0,\"componentType\":5126,\"count\":9007199254740992",
+        ),
+        (
+            acc1,
+            "\"bufferView\":1,\"componentType\":5123,\"count\":1e300",
+        ),
+        // Offsets past, or wrapping around, the end.
+        (
+            acc0,
+            "\"bufferView\":0,\"byteOffset\":9007199254740992,\"componentType\":5126,\"count\":8",
+        ),
+        (
+            acc0,
+            "\"bufferView\":0,\"byteOffset\":18446744073709551615,\"componentType\":5126,\"count\":8",
+        ),
+        (
+            acc1,
+            "\"bufferView\":1,\"byteOffset\":-4,\"componentType\":5123,\"count\":36",
+        ),
+        (
+            acc0,
+            "\"bufferView\":0,\"byteOffset\":1,\"componentType\":5126,\"count\":8",
+        ),
+        // A view that is not there, or wrong.
+        (acc0, "\"bufferView\":99,\"componentType\":5126,\"count\":8"),
+        (acc0, "\"bufferView\":-1,\"componentType\":5126,\"count\":8"),
+        (
+            acc0,
+            "\"bufferView\":0.5,\"componentType\":5126,\"count\":8",
+        ),
+        // Types that are not positions (a 16-bit one is a quantized position).
+        (acc0, "\"bufferView\":0,\"componentType\":9999,\"count\":8"),
+        (
+            acc0,
+            "\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"MAT4\"",
+        ),
+        // No view and a count of a billion: zeros are not made.
+        (acc0, "\"componentType\":5126,\"count\":1000000000"),
+    ];
+    for (from, to) in cases {
+        let doc = d.replacen(from, to, 1);
+        assert_ne!(doc, d);
+        must_fail_quickly(&doc, to);
+    }
+    // The same on views and buffers.
+    let views = [
+        (
+            "\"byteOffset\":96,\"byteLength\":72",
+            "\"byteOffset\":96,\"byteLength\":4294967296",
+        ),
+        (
+            "\"byteOffset\":96,\"byteLength\":72",
+            "\"byteOffset\":9007199254740992,\"byteLength\":9007199254740992",
+        ),
+        (
+            "\"byteLength\":96}",
+            "\"byteLength\":96,\"byteStride\":9007199254740992}",
+        ),
+        ("\"byteLength\":96}", "\"byteLength\":96,\"byteStride\":4}"),
+        (
+            "\"byteLength\":96}",
+            "\"byteLength\":96,\"byteStride\":\"x\"}",
+        ),
+        (
+            "\"buffer\":0,\"byteOffset\":0",
+            "\"buffer\":7,\"byteOffset\":0",
+        ),
+    ];
+    for (from, to) in views {
+        let doc = d.replacen(from, to, 1);
+        assert_ne!(doc, d, "{from}");
+        must_fail_quickly(&doc, to);
+    }
+    // A stride and a count whose product wraps a 64-bit number.
+    let doc = d
+        .replacen(
+            "\"byteLength\":96}",
+            "\"byteLength\":96,\"byteStride\":9007199254740992}",
+            1,
+        )
+        .replacen(
+            acc0,
+            "\"bufferView\":0,\"componentType\":5126,\"count\":9007199254740992",
+            1,
+        );
+    must_fail_quickly(&doc, "wrapping product");
+    // 100 MB declared, a few bytes held.
+    let held = cube_data("u16").len();
+    let doc = d.replacen(
+        &format!("\"byteLength\":{held}}}"),
+        "\"byteLength\":100000000}",
+        1,
+    );
+    assert_ne!(doc, d);
+    must_fail_quickly(&doc, "a declared buffer of 100 MB");
+}
+
+#[test]
+fn sparse_accessors_with_hostile_numbers_are_errors() {
+    let base = |sparse: &str| {
+        format!(
+            "{{\"asset\":{{\"version\":\"2.0\"}},\"buffers\":[{{\"uri\":\"data:;base64,{}\",\"byteLength\":48}}],\
+             \"bufferViews\":[{{\"buffer\":0,\"byteLength\":12}},{{\"buffer\":0,\"byteOffset\":12,\"byteLength\":36}}],\
+             \"accessors\":[{{\"componentType\":5126,\"count\":3,\"type\":\"VEC3\",\"sparse\":{sparse}}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0}}}}]}}],\"nodes\":[{{\"mesh\":0}}]}}",
+            base64(&[0u8; 48])
+        )
+    };
+    for sparse in [
+        "{\"count\":4294967295,\"indices\":{\"bufferView\":0,\"componentType\":5125},\"values\":{\"bufferView\":1}}",
+        "{\"count\":4,\"indices\":{\"bufferView\":0,\"componentType\":5125},\"values\":{\"bufferView\":1}}",
+        "{\"count\":2,\"indices\":{\"bufferView\":0,\"byteOffset\":9007199254740992,\"componentType\":5125},\"values\":{\"bufferView\":1}}",
+        "{\"count\":2,\"indices\":{\"bufferView\":0,\"componentType\":5126},\"values\":{\"bufferView\":1}}",
+        "{\"count\":2,\"indices\":{\"bufferView\":9,\"componentType\":5125},\"values\":{\"bufferView\":1}}",
+        "{\"count\":2,\"indices\":{\"bufferView\":0,\"componentType\":5125},\"values\":{\"bufferView\":1,\"byteOffset\":30}}",
+        "{\"count\":-1,\"indices\":{\"bufferView\":0,\"componentType\":5125},\"values\":{\"bufferView\":1}}",
+        "{\"count\":1}",
+        "7",
+    ] {
+        must_fail_quickly(&base(sparse), sparse);
+    }
+}
+
+#[test]
+fn nodes_that_loop_or_share_a_child_are_refused() {
+    let cyc = |nodes: &str| format!("{{\"asset\":{{\"version\":\"2.0\"}},{nodes}}}");
+    for nodes in [
+        "\"nodes\":[{\"children\":[1]},{\"children\":[0]}],\"scenes\":[{\"nodes\":[0]}]",
+        "\"nodes\":[{\"children\":[0]}],\"scenes\":[{\"nodes\":[0]}]",
+        "\"nodes\":[{\"children\":[1,1]},{}],\"scenes\":[{\"nodes\":[0]}]",
+        "\"nodes\":[{\"children\":[2]},{\"children\":[2]},{}],\"scenes\":[{\"nodes\":[0,1]}]",
+        "\"nodes\":[{},{}],\"scenes\":[{\"nodes\":[0,0]}]",
+        "\"nodes\":[{\"children\":[1]},{\"children\":[2]},{\"children\":[0]}],\"scenes\":[{\"nodes\":[0]}]",
+        "\"nodes\":[{\"children\":[7]}],\"scenes\":[{\"nodes\":[0]}]",
+        "\"nodes\":[{\"children\":[-1]}],\"scenes\":[{\"nodes\":[0]}]",
+        "\"nodes\":[{}],\"scenes\":[{\"nodes\":[3]}]",
+        "\"nodes\":[{}],\"scenes\":[{\"nodes\":[0]}],\"scene\":5",
+    ] {
+        let r = read(cyc(nodes).as_bytes(), 10);
+        assert!(
+            matches!(r, Err(Error::Invalid(_))),
+            "{nodes}: {:?}",
+            r.map(|s| s.triangles())
+        );
+    }
+    // A diamond that doubles at every level would be 2^60 visits.
+    let mut nodes = String::from("\"nodes\":[");
+    for k in 0..60 {
+        write!(nodes, "{{\"children\":[{},{}]}},", k + 1, k + 1).unwrap();
+    }
+    nodes.push_str("{}],\"scenes\":[{\"nodes\":[0]}]");
+    let r = within(Duration::from_secs(5), "the diamonds", || {
+        read(cyc(&nodes).as_bytes(), 10)
+    });
+    assert!(r.is_err());
+}
+
+fn chain(depth: usize) -> String {
+    let mut nodes = String::new();
+    for k in 0..depth {
+        if k > 0 {
+            nodes.push(',');
+        }
+        if k + 1 < depth {
+            write!(nodes, "{{\"children\":[{}]}}", k + 1).unwrap();
+        } else {
+            nodes.push_str("{\"mesh\":0}");
+        }
+    }
+    cube_doc(
+        "u16",
+        &format!("\"nodes\":[{nodes}],\"scenes\":[{{\"nodes\":[0]}}]"),
+    )
+}
+
+#[test]
+fn a_tree_nested_too_deep_is_refused_and_one_at_the_limit_is_drawn() {
+    let s = read(chain(MAX_DEPTH).as_bytes(), 100).unwrap();
+    assert_eq!(s.triangles(), 12);
+    let r = read(chain(MAX_DEPTH + 1).as_bytes(), 100);
+    assert!(matches!(r, Err(Error::Invalid(_))));
+    let r = within(Duration::from_secs(10), "a chain of 200,000 nodes", || {
+        read(chain(200_000).as_bytes(), 100)
+    });
+    assert!(matches!(r, Err(Error::Invalid(_))));
+}
+
+#[test]
+fn json_nested_or_sized_without_limit_is_refused() {
+    let deep = format!(
+        "{{\"asset\":{{\"version\":\"2.0\"}},\"extras\":{}",
+        "[".repeat(200_000)
+    );
+    assert_eq!(read(deep.as_bytes(), 10).unwrap_err(), Error::NotGltf);
+    let deep = format!(
+        "{{\"asset\":{{\"version\":\"2.0\"}},\"extras\":{}{}}}",
+        "{\"a\":".repeat(100_000),
+        "1}".repeat(100_000)
+    );
+    assert_eq!(read(deep.as_bytes(), 10).unwrap_err(), Error::NotGltf);
+    let wide = format!(
+        "{{\"asset\":{{\"version\":\"2.0\"}},\"extras\":[{}1]}}",
+        "1,".repeat(3_000_000)
+    );
+    let r = within(Duration::from_secs(20), "three million values", || {
+        read(wide.as_bytes(), 10)
+    });
+    assert_eq!(r.unwrap_err(), Error::NotGltf);
+}
+
+#[test]
+fn instancing_a_mesh_of_nothing_many_times_costs_a_bounded_amount() {
+    // A million zero-area triangles (three equal indices), used by 20,000
+    // nodes: twenty billion triangles looked at, if nothing stopped it.
+    let n = 1_000_000usize;
+    let data = {
+        let mut d = floats(&[0., 0., 0., 1., 0., 0., 0., 1., 0.]);
+        d.extend(vec![0u8; n]);
+        d
+    };
+    let nodes: Vec<String> = (0..20_000).map(|_| node("")).collect();
+    let doc = document(
+        &format!("\"uri\":\"data:;base64,{}\"", base64(&data)),
+        data.len(),
+        &format!(
+            "\"bufferViews\":[{{\"buffer\":0,\"byteLength\":36}},{{\"buffer\":0,\"byteOffset\":36,\"byteLength\":{n}}}],\
+             \"accessors\":[{{\"bufferView\":0,\"componentType\":5126,\"count\":3,\"type\":\"VEC3\"}},{{\"bufferView\":1,\"componentType\":5121,\"count\":{},\"type\":\"SCALAR\"}}],\
+             \"meshes\":[{{\"primitives\":[{{\"attributes\":{{\"POSITION\":0}},\"indices\":1}}]}}]",
+            n / 3 * 3
+        ),
+        &with_nodes(&nodes),
+    );
+    let s = within(Duration::from_secs(20), "the instances", || {
+        read(doc.as_bytes(), 200_000).unwrap()
+    });
+    assert_eq!(s.triangles(), 0);
+    assert_eq!(s.warnings.truncated, 1);
+}
+
+#[test]
+fn triangles_with_indices_past_the_vertices_are_dropped() {
+    let mut idx = cube_indices();
+    idx[0] = 8;
+    idx[10] = 4_000_000;
+    let mut data = floats(&CUBE.iter().flatten().copied().collect::<Vec<_>>());
+    data.extend(pad(idx.iter().flat_map(|i| i.to_le_bytes()).collect()));
+    let doc = document(
+        &format!("\"uri\":\"data:;base64,{}\"", base64(&data)),
+        data.len(),
+        "\"bufferViews\":[{\"buffer\":0,\"byteLength\":96},{\"buffer\":0,\"byteOffset\":96,\"byteLength\":144}],\
+         \"accessors\":[{\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"VEC3\"},{\"bufferView\":1,\"componentType\":5125,\"count\":36,\"type\":\"SCALAR\"}],\
+         \"meshes\":[{\"primitives\":[{\"attributes\":{\"POSITION\":0},\"indices\":1}]}]",
+        &with_nodes(&[node("")]),
+    );
+    let s = parse(&doc);
+    assert_eq!(s.triangles(), 10);
+    assert_eq!(s.warnings.invalid, 2);
+    assert_sound(&s);
+}
+
+#[test]
+fn coordinates_that_are_not_numbers_or_not_sizes_drop_their_triangles() {
+    for bad in [f64::NAN, f64::INFINITY, 1e30, -1e13] {
+        let mut points: Vec<f64> = CUBE.iter().flatten().copied().collect();
+        points[18] = bad;
+        let mut data = floats(&points);
+        data.extend(pad(encode(&cube_indices(), "u16")));
+        let doc = document(
+            &format!("\"uri\":\"data:;base64,{}\"", base64(&data)),
+            data.len(),
+            "\"bufferViews\":[{\"buffer\":0,\"byteLength\":96},{\"buffer\":0,\"byteOffset\":96,\"byteLength\":72}],\
+             \"accessors\":[{\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"VEC3\"},{\"bufferView\":1,\"componentType\":5123,\"count\":36,\"type\":\"SCALAR\"}],\
+             \"meshes\":[{\"primitives\":[{\"attributes\":{\"POSITION\":0},\"indices\":1}]}]",
+            &with_nodes(&[node("")]),
+        );
+        let s = parse(&doc);
+        // Corner 6 is in five of the twelve triangles.
+        assert_eq!(s.triangles(), 7, "{bad}");
+        assert_eq!(s.warnings.invalid, 5, "{bad}");
+        assert_sound(&s);
+    }
+    // A transform that sends the cube beyond what a camera can frame.
+    let r = read(
+        cube_doc("u16", &with_nodes(&[node("\"scale\":[1e300,1e300,1e300]")])).as_bytes(),
+        100,
+    );
+    assert!(matches!(r, Err(Error::Invalid(_))));
+}
+
+#[test]
+fn transforms_that_are_not_valid_are_errors() {
+    for transform in [
+        "\"rotation\":[0,0,0]",
+        "\"scale\":[1,1]",
+        "\"translation\":\"x\"",
+        "\"matrix\":[1,2,3]",
+        "\"matrix\":[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,\"1\"]",
+    ] {
+        let r = read(
+            cube_doc("u16", &with_nodes(&[node(transform)])).as_bytes(),
+            100,
+        );
+        assert!(matches!(r, Err(Error::Invalid(_))), "{transform}");
+    }
+}
+
+#[test]
+fn a_file_cut_anywhere_or_changed_anywhere_is_read_soundly() {
+    let doc = cube_doc("u16", &with_nodes(&[node("\"scale\":[2,2,2]")]));
+    sweep(doc.as_bytes(), |b| read(b, 1000).ok());
+    let data = cube_data("u16");
+    let json = document(
+        "",
+        data.len(),
+        "\"bufferViews\":[{\"buffer\":0,\"byteLength\":96},{\"buffer\":0,\"byteOffset\":96,\"byteLength\":72}],\
+         \"accessors\":[{\"bufferView\":0,\"componentType\":5126,\"count\":8,\"type\":\"VEC3\"},{\"bufferView\":1,\"componentType\":5123,\"count\":36,\"type\":\"SCALAR\"}],\
+         \"meshes\":[{\"primitives\":[{\"attributes\":{\"POSITION\":0},\"indices\":1}]}]",
+        &with_nodes(&[node("")]),
+    );
+    sweep(&glb(&json, &data), |b| read(b, 1000).ok());
+}
diff --git a/crates/exav-render/tests/ifc.rs b/crates/exav-render/tests/ifc.rs
index 65e9bcec..3230ad49 100644
--- a/crates/exav-render/tests/ifc.rs
+++ b/crates/exav-render/tests/ifc.rs
@@ -6,7 +6,7 @@
 use std::collections::HashMap;
 use std::path::Path;
 
-use exav_render::ifc::{read, Limits};
+use exav_render::ifc::{Limits, read};
 use exav_render::mesh::Scene;
 use serde_json::Value;
 
@@ -112,7 +112,13 @@ fn every_fixture_matches_its_closed_form() {
     for (file, exp) in expected() {
         let scene = load(&file);
         let got = stats(&scene);
-        for (name, e) in exp["elements"].as_object().unwrap() {
+        // A fixture that is checked by other tests has no elements here.
+        for (name, e) in exp
+            .get("elements")
+            .and_then(Value::as_object)
+            .into_iter()
+            .flatten()
+        {
             let Some(g) = got.get(name) else {
                 failures.push(format!("{file} {name}: not drawn"));
                 continue;
diff --git a/crates/exav-render/tests/ifc_geometry.rs b/crates/exav-render/tests/ifc_geometry.rs
new file mode 100644
index 00000000..76c026c9
--- /dev/null
+++ b/crates/exav-render/tests/ifc_geometry.rs
@@ -0,0 +1,415 @@
+//! Curved B-rep faces, sweep parameters, alignments, grid placements and
+//! storeys of the IFC reader, against the fixtures `tests/fixtures/ifc/make.py`
+//! writes. Their volumes, areas and extents are in `expected.json` and
+//! checked by `tests/ifc.rs`; here, where the points of each mesh lie.
+//! Hostile files are in `tests/ifc_hostile.rs`.
+
+use std::path::Path;
+
+use exav_render::ifc::{Limits, read};
+use exav_render::mesh::Scene;
+use serde_json::Value;
+
+const DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/fixtures/ifc");
+
+type P = [f64; 3];
+
+fn load(name: &str) -> Scene {
+    let bytes = std::fs::read(Path::new(DIR).join(name)).unwrap();
+    read(&bytes, &Limits::default()).unwrap_or_else(|e| panic!("{name}: {e}"))
+}
+
+fn expected(file: &str) -> Value {
+    let text = std::fs::read_to_string(Path::new(DIR).join("expected.json")).unwrap();
+    serde_json::from_str::<Value>(&text).unwrap()[file].clone()
+}
+
+/// The vertices of the element called `name`, in model coordinates.
+fn vertices(s: &Scene, name: &str) -> Vec<P> {
+    let e = s
+        .elements
+        .iter()
+        .find(|e| e.name == name)
+        .unwrap_or_else(|| panic!("{name} is not drawn"));
+    let mut out = Vec::new();
+    for r in &e.ranges {
+        let b = &s.batches[r.batch as usize];
+        for &i in &b.indices[r.first as usize..(r.first + r.count) as usize] {
+            let k = i as usize * 3;
+            out.push([
+                f64::from(b.positions[k]) + s.origin[0],
+                f64::from(b.positions[k + 1]) + s.origin[1],
+                f64::from(b.positions[k + 2]) + s.origin[2],
+            ]);
+        }
+    }
+    out
+}
+
+fn dist(a: P, b: P) -> f64 {
+    ((a[0] - b[0]).powi(2) + (a[1] - b[1]).powi(2) + (a[2] - b[2]).powi(2)).sqrt()
+}
+
+/// How many distinct values `f` takes over the points, to a thousandth.
+fn distinct(pts: &[P], f: impl Fn(P) -> f64) -> usize {
+    let mut v: Vec<i64> = pts
+        .iter()
+        .map(|p| (f(*p) * 1000.0).round() as i64)
+        .collect();
+    v.sort_unstable();
+    v.dedup();
+    v.len()
+}
+
+#[test]
+fn the_caps_of_a_sphere_have_every_vertex_on_it_at_many_latitudes() {
+    let s = load("curved_faces.ifc");
+    for (name, centre, sign) in [
+        ("hemisphere", [0.0; 3], 1.0),
+        ("bowl", [10.0, 0.0, 0.0], -1.0),
+    ] {
+        let pts = vertices(&s, name);
+        for p in &pts {
+            // f32 positions: a millionth of the radius.
+            assert!((dist(*p, centre) - 2.0).abs() < 1e-5, "{name}: {p:?}");
+            assert!(sign * p[2] >= -1e-5, "{name}: {p:?} on the wrong side");
+        }
+        // A flat disk would have one latitude, a cap has a ring each 11 degrees.
+        assert!(distinct(&pts, |p| p[2]) >= 8, "{name}");
+        // And the pole itself.
+        assert!(
+            pts.iter().any(|p| (p[2] - sign * 2.0).abs() < 1e-5),
+            "{name}: no pole"
+        );
+    }
+}
+
+#[test]
+fn a_patch_of_a_sphere_lies_on_it_between_its_parallels_and_meridians() {
+    let s = load("curved_faces.ifc");
+    let pts = vertices(&s, "sphere patch");
+    let c = [20.0, 0.0, 0.0];
+    for p in &pts {
+        assert!((dist(*p, c) - 2.0).abs() < 1e-5, "{p:?}");
+        let (x, y) = (p[0] - 20.0, p[1]);
+        assert!(x >= -1e-5 && y >= -1e-5, "{p:?} outside the meridians");
+        let lat = (p[2] / 2.0).asin();
+        assert!(
+            (0.3 - 1e-5..=0.9 + 1e-5).contains(&lat),
+            "{p:?} latitude {lat}"
+        );
+    }
+    assert!(distinct(&pts, |p| p[2]) >= 4);
+}
+
+#[test]
+fn a_cap_cut_by_a_tilted_circle_is_bent_over_the_sphere_not_a_flat_polygon() {
+    let s = load("curved_faces.ifc");
+    for (name, x, cos_alpha) in [
+        ("tilted cap", 70.0, 0.9),
+        ("tilted cap with the pole", 80.0, 0.6),
+    ] {
+        let pts = vertices(&s, name);
+        for p in &pts {
+            assert!(
+                (dist(*p, [x, 0.0, 0.0]) - 2.0).abs() < 1e-5,
+                "{name}: {p:?}"
+            );
+            // Inside the circle: nearer than its edge to its axis.
+            let n = 0.5f64.sqrt();
+            let along = ((p[0] - x) * n + p[2] * n) / 2.0;
+            // Points added along the rim are on the sphere between two of
+            // its 32 samples (straight in the parameters, which bends near
+            // a pole): up to a hundredth of the radius off the circle.
+            assert!(
+                along >= cos_alpha - 3e-2,
+                "{name}: {p:?} outside the circle ({along})"
+            );
+        }
+        // A flat polygon through the rim would have no vertex above it.
+        let top = pts
+            .iter()
+            .map(|p| ((p[0] - x) * 0.5f64.sqrt() + p[2] * 0.5f64.sqrt()) / 2.0)
+            .fold(0.0, f64::max);
+        assert!(
+            top > 0.999,
+            "{name}: the middle of the cap is missing ({top})"
+        );
+    }
+}
+
+#[test]
+fn a_quarter_torus_has_every_vertex_on_the_torus() {
+    let s = load("curved_faces.ifc");
+    let pts = vertices(&s, "torus elbow");
+    for p in &pts {
+        let rho = ((p[0] - 30.0).powi(2) + p[1].powi(2)).sqrt();
+        let off = ((rho - 3.0).powi(2) + p[2].powi(2)).sqrt();
+        assert!(
+            (off - 1.0).abs() < 1e-5,
+            "{p:?} is {off} from the axis circle"
+        );
+        assert!(
+            p[0] >= 30.0 - 1e-5 && p[1] >= -1e-5,
+            "{p:?} outside the quarter"
+        );
+    }
+    // Round the tube, not along a chord through it.
+    assert!(distinct(&pts, |p| p[2]) >= 16);
+}
+
+#[test]
+fn a_tube_bounded_by_two_circles_is_a_cylinder() {
+    let s = load("curved_faces.ifc");
+    let pts = vertices(&s, "tube without seam");
+    for p in &pts {
+        let r = ((p[0] - 40.0).powi(2) + p[1].powi(2)).sqrt();
+        assert!(
+            (r - 1.5).abs() < 1e-5,
+            "{p:?}: the disks only use their rims"
+        );
+    }
+    assert!(pts.iter().any(|p| (p[2] - 4.0).abs() < 1e-5));
+}
+
+#[test]
+fn a_trimmed_spline_face_is_the_part_inside_its_edges() {
+    let s = load("curved_faces.ifc");
+    let pts = vertices(&s, "spline patch");
+    for p in &pts {
+        let (x, y) = (p[0] - 50.0, p[1]);
+        assert!(
+            ((x * x + y * y).sqrt() - 2.0).abs() < 1e-5,
+            "{p:?} is off the cylinder"
+        );
+        let deg = y.atan2(x).to_degrees();
+        assert!(
+            (15.0 - 1e-3..=75.0 + 1e-3).contains(&deg),
+            "{p:?} at {deg} degrees"
+        );
+        assert!((1.0 - 1e-5..=4.0 + 1e-5).contains(&p[2]), "{p:?}");
+    }
+    assert!(pts.iter().any(|p| (p[2] - 1.0).abs() < 1e-5));
+}
+
+#[test]
+fn a_spline_face_with_a_hole_has_no_vertex_inside_it() {
+    let s = load("curved_faces.ifc");
+    let pts = vertices(&s, "plate with hole");
+    let from_centre = |p: &P| ((p[0] - 62.0).powi(2) + (p[1] - 2.0).powi(2)).sqrt();
+    for p in &pts {
+        assert!(from_centre(p) >= 1.0 - 1e-5, "{p:?} is inside the hole");
+        assert!((0.5 - 1e-5..=3.5 + 1e-5).contains(&p[1]), "{p:?}");
+    }
+    // Some are on the hole's rim.
+    assert!(pts.iter().any(|p| from_centre(p) < 1.0 + 1e-5));
+}
+
+#[test]
+fn the_curved_faces_are_all_drawn_curved() {
+    // Nothing fell back to the flat polygon through the edges.
+    let s = load("curved_faces.ifc");
+    assert!(s.warnings.unsupported.is_empty(), "{:?}", s.warnings);
+}
+
+/// The height of the fixture's profile at distance `x`.
+fn height(x: f64) -> f64 {
+    if x <= 200.0 {
+        10.0 + 0.02 * x
+    } else {
+        14.0 - 0.01 * (x - 200.0)
+    }
+}
+
+#[test]
+fn an_alignment_passes_through_its_stations() {
+    let s = load("alignment.ifc");
+    let exp = expected("alignment.ifc");
+    let st = &exp["stations"];
+    let at = |k: &str| (st[k][0].as_f64().unwrap(), st[k][1].as_f64().unwrap());
+    let pts = vertices(&s, "tube whole");
+    let radius = exp["tube_radius"].as_f64().unwrap();
+    // The curve's points are the centres of rings of points a radius off:
+    // each station is a distance along, so its height is known.
+    for (key, along) in [
+        ("line_end", 100.0),
+        ("clothoid_end", 160.0),
+        ("left_arc_end", 280.0),
+        // Half way round the right turn, a negative segment length.
+        ("right_arc_mid", 330.0),
+        ("right_arc_end", 380.0),
+        ("end", 430.0),
+    ] {
+        let (x, y) = at(key);
+        let c = [x, y, height(along)];
+        let ring = pts
+            .iter()
+            .filter(|p| (dist(**p, c) - radius).abs() < 0.01)
+            .count();
+        assert!(ring >= 14, "{key} {c:?}: {ring} points a radius from it");
+        // The last line runs along x again after the right turn: the end
+        // of the tube is a disk square to it.
+        if key == "end" {
+            let cap: Vec<&P> = pts
+                .iter()
+                .filter(|p| (dist(**p, c) - radius).abs() < 0.01)
+                .collect();
+            assert!(cap.iter().all(|p| (p[0] - x).abs() < 0.01), "{cap:?}");
+        }
+        // The station is on the axis: the tube is never nearer than its radius.
+        let nearest = pts
+            .iter()
+            .map(|p| dist(*p, c))
+            .fold(f64::INFINITY, f64::min);
+        assert!(
+            nearest >= radius - 0.01,
+            "{key} {c:?}: the tube comes within {nearest}"
+        );
+    }
+}
+
+#[test]
+fn the_clothoid_ends_at_the_heading_the_arc_after_it_starts_with() {
+    // A^2 = 300 * 60: the heading at its end is 60 / (2 * 300) = 0.1 radian,
+    // so the ring of the tube there is square to a direction 0.1 off x.
+    let s = load("alignment.ifc");
+    let st = expected("alignment.ifc")["stations"].clone();
+    let c = [
+        st["clothoid_end"][0].as_f64().unwrap(),
+        st["clothoid_end"][1].as_f64().unwrap(),
+        height(160.0),
+    ];
+    let ring: Vec<P> = vertices(&s, "tube whole")
+        .into_iter()
+        .filter(|p| (dist(*p, c) - 0.5).abs() < 0.01)
+        .collect();
+    assert!(ring.len() >= 8);
+    for p in &ring {
+        let (dx, dy) = (p[0] - c[0], p[1] - c[1]);
+        let along = dx * 0.1f64.cos() + dy * 0.1f64.sin();
+        assert!(along.abs() < 0.03, "{p:?}: {along} along the heading");
+    }
+}
+
+#[test]
+fn a_linear_placement_without_a_cartesian_position_is_worked_out() {
+    let s = load("alignment.ifc");
+    let st = expected("alignment.ifc")["stations"].clone();
+    let list = |k: &str| -> Vec<f64> {
+        st[k]
+            .as_array()
+            .unwrap()
+            .iter()
+            .map(|v| v.as_f64().unwrap())
+            .collect()
+    };
+    let (at, half) = (list("column_at"), list("column_half"));
+    let pts = vertices(&s, "column on the alignment");
+    let (mut lo, mut hi) = ([f64::INFINITY; 3], [f64::NEG_INFINITY; 3]);
+    for p in &pts {
+        for k in 0..3 {
+            lo[k] = lo[k].min(p[k]);
+            hi[k] = hi[k].max(p[k]);
+        }
+    }
+    // The curve is sampled finely for a placement: within a centimetre of
+    // the arc.
+    for k in 0..2 {
+        assert!(
+            ((lo[k] + hi[k]) / 2.0 - at[k]).abs() < 0.01,
+            "{k}: {lo:?} {hi:?} {at:?}"
+        );
+        assert!(
+            ((hi[k] - lo[k]) / 2.0 - half[k]).abs() < 0.01,
+            "{k}: {lo:?} {hi:?} {half:?}"
+        );
+    }
+    // Upright whatever the gradient.
+    assert!((lo[2] - at[2]).abs() < 1e-3 && (hi[2] - at[2] - 4.0).abs() < 1e-3);
+    assert!(s.warnings.unsupported.is_empty(), "{:?}", s.warnings);
+}
+
+#[test]
+fn storeys_have_their_names_and_elevations_and_their_elements() {
+    let s = load("storeys.ifc");
+    let exp = expected("storeys.ifc");
+    let storeys: Vec<(String, f64)> = s
+        .nodes
+        .iter()
+        .filter(|n| n.class == "IFCBUILDINGSTOREY")
+        .map(|n| {
+            (
+                n.name.clone(),
+                n.elevation.expect("a storey has an elevation"),
+            )
+        })
+        .collect();
+    let want: Vec<(String, f64)> = exp["storeys"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|v| (v[0].as_str().unwrap().to_string(), v[1].as_f64().unwrap()))
+        .collect();
+    assert_eq!(storeys.len(), want.len());
+    for (name, z) in &want {
+        let got = storeys
+            .iter()
+            .find(|(n, _)| n == name)
+            .unwrap_or_else(|| panic!("{name}"));
+        // Millimetres in the file, metres out.
+        assert!((got.1 - z).abs() < 1e-9, "{name}: {}", got.1);
+    }
+    // Only storeys have one.
+    assert!(
+        s.nodes
+            .iter()
+            .filter(|n| n.class != "IFCBUILDINGSTOREY")
+            .all(|n| n.elevation.is_none())
+    );
+    for (name, storey) in exp["membership"].as_object().unwrap() {
+        let e = s
+            .elements
+            .iter()
+            .find(|e| &e.name == name)
+            .unwrap_or_else(|| panic!("{name}"));
+        match storey.as_str() {
+            Some(w) => {
+                let k = e.storey.unwrap_or_else(|| panic!("{name} has no storey"));
+                assert_eq!(s.nodes[k as usize].name, w, "{name}");
+                assert_eq!(s.nodes[k as usize].class, "IFCBUILDINGSTOREY");
+            }
+            None => assert_eq!(e.storey, None, "{name}"),
+        }
+    }
+    // The table is in the room, which is in level 1.
+    let table = s.elements.iter().find(|e| e.name == "table").unwrap();
+    assert_eq!(s.nodes[table.node.unwrap() as usize].class, "IFCSPACE");
+}
+
+#[test]
+fn a_batch_holds_the_elements_of_one_storey() {
+    // So that hiding a storey hides batches, edges included.
+    let s = load("storeys.ifc");
+    for e in &s.elements {
+        for r in &e.ranges {
+            assert_eq!(s.batches[r.batch as usize].storey, e.storey, "{}", e.name);
+        }
+    }
+    // The three walls are one class and colour in three storeys.
+    let walls: Vec<_> = s.batches.iter().filter(|b| b.class == "IFCWALL").collect();
+    assert_eq!(walls.len(), 3);
+}
+
+#[test]
+fn elements_contained_in_a_storey_have_it() {
+    let s = load("solids.ifc");
+    assert!(s.elements.iter().all(|e| e.storey == e.node));
+    let bytes = std::fs::read(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/tests/fixtures/viewer/house.ifc"
+    ))
+    .unwrap();
+    let h = read(&bytes, &Limits::default()).unwrap();
+    assert!(h.nodes.iter().any(|n| n.class == "IFCBUILDINGSTOREY"));
+    assert!(h.elements.iter().all(|e| e.storey.is_some()));
+}
diff --git a/crates/exav-render/tests/ifc_hostile.rs b/crates/exav-render/tests/ifc_hostile.rs
new file mode 100644
index 00000000..d6ef1c12
--- /dev/null
+++ b/crates/exav-render/tests/ifc_hostile.rs
@@ -0,0 +1,583 @@
+//! IFC files written to make the reader work too hard or loop: curved faces
+//! with degenerate radii and broken knot vectors, boundaries that are huge
+//! or off their surface, placements that refer to each other, and sweeps
+//! with absurd parameters. The reader must finish quickly, stay inside its
+//! triangle budget, and say what it did not draw.
+
+use std::time::{Duration, Instant};
+
+use exav_render::ifc::{Limits, read};
+use exav_render::mesh::Scene;
+
+/// Instances numbered from #100 under a context, a placement (#5) and a
+/// point (#1), a direction (#2, #3) and an axis (#4).
+struct File {
+    schema: &'static str,
+    lines: Vec<String>,
+}
+
+impl File {
+    fn new() -> Self {
+        File {
+            schema: "IFC4X3_ADD2",
+            lines: Vec::new(),
+        }
+    }
+
+    /// The number the next instance will have.
+    fn next(&self) -> String {
+        format!("#{}", 100 + self.lines.len())
+    }
+
+    /// Adds an instance, and says its number.
+    fn add(&mut self, text: impl AsRef<str>) -> String {
+        let n = self.next();
+        self.lines.push(text.as_ref().to_string());
+        n
+    }
+
+    /// A product whose body is the items `items`, placed at `placement`.
+    fn product(&mut self, items: &str, placement: &str) {
+        let rep = self.add(format!(
+            "IFCSHAPEREPRESENTATION(#6,'Body','Brep',({items}))"
+        ));
+        let shape = self.add(format!("IFCPRODUCTDEFINITIONSHAPE($,$,({rep}))"));
+        self.add(format!(
+            "IFCBUILDINGELEMENTPROXY('0000000000000000000001',$,'x',$,$,{placement},{shape},$,$)"
+        ));
+    }
+
+    fn bytes(&self) -> Vec<u8> {
+        let mut s = format!(
+            "ISO-10303-21;\nHEADER;\nFILE_SCHEMA(('{}'));\nENDSEC;\nDATA;\n\
+             #1=IFCCARTESIANPOINT((0.,0.,0.));\n#2=IFCDIRECTION((0.,0.,1.));\n#3=IFCDIRECTION((1.,0.,0.));\n\
+             #4=IFCAXIS2PLACEMENT3D(#1,#2,#3);\n#5=IFCLOCALPLACEMENT($,#4);\n\
+             #6=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#4,$);\n",
+            self.schema
+        );
+        for (i, l) in self.lines.iter().enumerate() {
+            s.push_str(&format!("#{}={};\n", 100 + i, l));
+        }
+        s.push_str("ENDSEC;\nEND-ISO-10303-21;\n");
+        s.into_bytes()
+    }
+
+    /// Reads it, which must take no longer than a moment and stay inside
+    /// the budget.
+    fn read(&self, what: &str) -> Scene {
+        let bytes = self.bytes();
+        let started = Instant::now();
+        let scene = read(
+            &bytes,
+            &Limits {
+                max_triangles: 200_000,
+            },
+        )
+        .unwrap();
+        let took = started.elapsed();
+        assert!(took < Duration::from_secs(20), "{what}: {took:?}");
+        assert!(scene.triangles() <= 200_000, "{what}");
+        scene
+    }
+}
+
+/// A face on `surface` bounded by one circle (an edge loop), a shell-based
+/// surface model of it, as a product.
+fn circle_face(f: &mut File, surface: &str) {
+    let circle = f.add("IFCCIRCLE(#4,1.)");
+    let at = f.add("IFCCARTESIANPOINT((1.,0.,0.))");
+    let v = f.add(format!("IFCVERTEXPOINT({at})"));
+    let e = f.add(format!("IFCEDGECURVE({v},{v},{circle},.T.)"));
+    let oe = f.add(format!("IFCORIENTEDEDGE(*,*,{e},.T.)"));
+    let lp = f.add(format!("IFCEDGELOOP(({oe}))"));
+    let b = f.add(format!("IFCFACEOUTERBOUND({lp},.T.)"));
+    let face = f.add(format!("IFCADVANCEDFACE(({b}),{surface},.T.)"));
+    let shell = f.add(format!("IFCOPENSHELL(({face}))"));
+    let model = f.add(format!("IFCSHELLBASEDSURFACEMODEL(({shell}))"));
+    f.product(&model, "#5");
+}
+
+#[test]
+fn spheres_of_no_radius_are_counted() {
+    for radius in ["0.", "-3."] {
+        let mut f = File::new();
+        let sphere = f.add(format!("IFCSPHERICALSURFACE(#4,{radius})"));
+        circle_face(&mut f, &sphere);
+        let s = f.read(radius);
+        assert_eq!(
+            s.warnings.unsupported.get("IFCSPHERICALSURFACE"),
+            Some(&1),
+            "{radius}: {:?}",
+            s.warnings
+        );
+    }
+}
+
+#[test]
+fn spheres_and_tori_of_absurd_radii_stay_inside_their_bounds() {
+    for radius in ["1.E-300", "1.E300", "1.E-12", "1.E12", "1.E999"] {
+        let mut f = File::new();
+        let sphere = f.add(format!("IFCSPHERICALSURFACE(#4,{radius})"));
+        circle_face(&mut f, &sphere);
+        f.read(radius);
+        let mut f = File::new();
+        let torus = f.add(format!("IFCTOROIDALSURFACE(#4,{radius},{radius})"));
+        circle_face(&mut f, &torus);
+        f.read(radius);
+        let mut f = File::new();
+        let cylinder = f.add(format!("IFCCYLINDRICALSURFACE(#4,{radius})"));
+        circle_face(&mut f, &cylinder);
+        f.read(radius);
+    }
+}
+
+#[test]
+fn a_torus_whose_minor_radius_is_not_smaller_is_counted() {
+    let mut f = File::new();
+    let torus = f.add("IFCTOROIDALSURFACE(#4,1.,2.)");
+    circle_face(&mut f, &torus);
+    let s = f.read("torus");
+    assert_eq!(s.warnings.unsupported.get("IFCTOROIDALSURFACE"), Some(&1));
+}
+
+/// A B-spline surface over a 2 x 2 net with `mults` and `values` for both
+/// knot vectors, as a face bounded by a triangle `height` above the net.
+fn spline_face(mults: &str, values: &str, degree: usize, height: f64) -> File {
+    let mut f = File::new();
+    let net: Vec<String> = (0..4)
+        .map(|i| f.add(format!("IFCCARTESIANPOINT(({}.,{}.,0.))", i / 2, i % 2)))
+        .collect();
+    let surface = f.add(format!(
+        "IFCBSPLINESURFACEWITHKNOTS({degree},{degree},(({},{}),({},{})),.UNSPECIFIED.,.F.,.F.,.F.,({mults}),({mults}),({values}),({values}),.UNSPECIFIED.)",
+        net[0], net[1], net[2], net[3]
+    ));
+    let tri: Vec<String> = [(0.2, 0.2), (0.8, 0.2), (0.5, 0.8)]
+        .iter()
+        .map(|(x, y)| f.add(format!("IFCCARTESIANPOINT(({x},{y},{height}))")))
+        .collect();
+    let lp = f.add(format!("IFCPOLYLOOP(({}))", tri.join(",")));
+    let b = f.add(format!("IFCFACEOUTERBOUND({lp},.T.)"));
+    let face = f.add(format!("IFCADVANCEDFACE(({b}),{surface},.T.)"));
+    let shell = f.add(format!("IFCOPENSHELL(({face}))"));
+    let model = f.add(format!("IFCSHELLBASEDSURFACEMODEL(({shell}))"));
+    f.product(&model, "#5");
+    f
+}
+
+#[test]
+fn spline_surfaces_with_huge_or_broken_knot_vectors_are_refused_without_allocating() {
+    for (mults, values, degree) in [
+        ("1000000000", "0.", 1),
+        ("2,2", "1.,0.", 1),
+        ("2,2,2,2,2,2,2,2", "0.,1.", 1),
+        ("4611686018427387904,4611686018427387904", "0.,1.", 1),
+        ("17,17", "0.,1.", 16),
+        ("3,3", "0.,1.", 2),
+        ("2,2", "0.,0.", 1),
+    ] {
+        let s = spline_face(mults, values, degree, 0.0).read(mults);
+        // The surface is unusable: the face is the triangle through its
+        // points, counted as what it is.
+        assert_eq!(
+            s.warnings.unsupported.get("IFCBSPLINESURFACEWITHKNOTS"),
+            Some(&1),
+            "{mults} {values}: {:?}",
+            s.warnings
+        );
+    }
+}
+
+#[test]
+fn a_spline_face_whose_bounds_are_on_another_surface_is_drawn_whole_and_counted() {
+    let s = spline_face("2,2", "0.,1.", 1, 5.0).read("off the surface");
+    assert_eq!(
+        s.warnings.unsupported.get("IFCBSPLINESURFACEWITHKNOTS"),
+        Some(&1)
+    );
+    // The whole net: a square of 1 x 1.
+    assert!(s.triangles() >= 2);
+    let b = s.bounds.unwrap();
+    assert!((b[1][0] - b[0][0] - 1.0).abs() < 1e-5);
+}
+
+#[test]
+fn a_spline_face_whose_bounds_are_on_it_is_cut() {
+    let s = spline_face("2,2", "0.,1.", 1, 0.0).read("on the surface");
+    assert!(s.warnings.unsupported.is_empty(), "{:?}", s.warnings);
+    // The triangle (0.2, 0.2), (0.8, 0.2), (0.5, 0.8) of the unit square.
+    let b = s.bounds.unwrap();
+    assert!((b[1][0] - b[0][0] - 0.6).abs() < 1e-5 && (b[1][1] - b[0][1] - 0.6).abs() < 1e-5);
+}
+
+#[test]
+fn a_loop_that_lists_one_edge_a_great_many_times_is_given_up() {
+    let mut f = spline_face("2,2", "0.,1.", 1, 0.0);
+    f.lines.truncate(5);
+    let surface = "#104";
+    let p1 = f.add("IFCCARTESIANPOINT((0.5,0.5,0.))");
+    let p2 = f.add("IFCCARTESIANPOINT((0.6,0.5,0.))");
+    let line = f.add(format!("IFCPOLYLINE(({p1},{p2}))"));
+    let v1 = f.add(format!("IFCVERTEXPOINT({p1})"));
+    let v2 = f.add(format!("IFCVERTEXPOINT({p2})"));
+    let e = f.add(format!("IFCEDGECURVE({v1},{v2},{line},.T.)"));
+    let oe = f.add(format!("IFCORIENTEDEDGE(*,*,{e},.T.)"));
+    let lp = f.add(format!("IFCEDGELOOP(({}))", vec![oe; 400_000].join(",")));
+    let b = f.add(format!("IFCFACEOUTERBOUND({lp},.T.)"));
+    let face = f.add(format!("IFCADVANCEDFACE(({b}),{surface},.T.)"));
+    let shell = f.add(format!("IFCOPENSHELL(({face}))"));
+    let model = f.add(format!("IFCSHELLBASEDSURFACEMODEL(({shell}))"));
+    f.product(&model, "#5");
+    let s = f.read("long loop");
+    // The loop was not read, and said so; the points it cost are what is
+    // left of the budget for the rest of the file.
+    assert!(
+        s.warnings.unsupported.get("IFCBSPLINESURFACEWITHKNOTS") >= Some(&1),
+        "{:?}",
+        s.warnings
+    );
+    // The points were charged until the evaluation budget of a file this
+    // small was gone, and the face that followed was left out, counted.
+    assert!(s.warnings.invalid >= 1, "{:?}", s.warnings);
+}
+
+/// A grid with one axis each way, and a placement `at` (a number ahead of
+/// the instance that needs it).
+fn grid(f: &mut File, placement: &str) -> String {
+    let a = f.add("IFCCARTESIANPOINT((0.,0.))");
+    let b = f.add("IFCCARTESIANPOINT((5.,0.))");
+    let c = f.add("IFCCARTESIANPOINT((2.,-1.))");
+    let d = f.add("IFCCARTESIANPOINT((2.,1.))");
+    let u = f.add(format!("IFCPOLYLINE(({a},{b}))"));
+    let v = f.add(format!("IFCPOLYLINE(({c},{d}))"));
+    let ua = f.add(format!("IFCGRIDAXIS('a',{u},.T.)"));
+    let va = f.add(format!("IFCGRIDAXIS('b',{v},.T.)"));
+    f.add(format!(
+        "IFCGRID('0000000000000000000002',$,'g',$,$,{placement},$,({ua}),({va}),$,$)"
+    ));
+    f.add(format!(
+        "IFCVIRTUALGRIDINTERSECTION(({ua},{va}),(0.,0.,0.))"
+    ))
+}
+
+fn block_product(f: &mut File, placement: &str) {
+    let block = f.add("IFCBLOCK(#4,1.,1.,1.)");
+    let solid = f.add(format!("IFCCSGSOLID({block})"));
+    f.product(&solid, placement);
+}
+
+#[test]
+fn a_grid_placed_by_a_placement_of_its_own_grid_does_not_loop() {
+    for schema in ["IFC4X3_ADD2", "IFC4"] {
+        let mut f = File::new();
+        f.schema = schema;
+        // The grid is placed by the grid placement that sits on it: its
+        // number is the next but one.
+        let own = format!("#{}", 100 + 9 + 1);
+        let at = grid(&mut f, &own);
+        let placement = if schema == "IFC4X3_ADD2" {
+            f.add(format!("IFCGRIDPLACEMENT({own},{at},$)"))
+        } else {
+            f.add(format!("IFCGRIDPLACEMENT({at},$)"))
+        };
+        assert_eq!(placement, own);
+        block_product(&mut f, &placement);
+        let s = f.read(schema);
+        assert!(s.elements.is_empty(), "{schema}");
+        assert!(s.warnings.invalid >= 1, "{schema}: {:?}", s.warnings);
+    }
+}
+
+#[test]
+fn linear_placements_relative_to_each_other_do_not_loop() {
+    let mut f = File::new();
+    let rel = f.add("IFCAXIS2PLACEMENTLINEAR($,$,$)");
+    f.add(format!("IFCLINEARPLACEMENT(#102,{rel},$)"));
+    f.add(format!("IFCLINEARPLACEMENT(#101,{rel},$)"));
+    block_product(&mut f, "#101");
+    let s = f.read("linear loop");
+    assert!(s.elements.is_empty());
+    assert!(s.warnings.invalid >= 1);
+    assert!(s.warnings.unsupported.contains_key("IFCLINEARPLACEMENT"));
+}
+
+#[test]
+fn a_grid_placement_whose_axes_do_not_cross_is_counted() {
+    // Two parallel axes.
+    let mut f = File::new();
+    let a = f.add("IFCCARTESIANPOINT((0.,0.))");
+    let b = f.add("IFCCARTESIANPOINT((5.,0.))");
+    let c = f.add("IFCCARTESIANPOINT((0.,1.))");
+    let d = f.add("IFCCARTESIANPOINT((5.,1.))");
+    let u = f.add(format!("IFCPOLYLINE(({a},{b}))"));
+    let v = f.add(format!("IFCPOLYLINE(({c},{d}))"));
+    let ua = f.add(format!("IFCGRIDAXIS('a',{u},.T.)"));
+    let va = f.add(format!("IFCGRIDAXIS('b',{v},.T.)"));
+    f.add(format!(
+        "IFCGRID('0000000000000000000002',$,'g',$,$,#5,$,({ua}),({va}),$,$)"
+    ));
+    let at = f.add(format!(
+        "IFCVIRTUALGRIDINTERSECTION(({ua},{va}),(0.,0.,0.))"
+    ));
+    let p = f.add(format!("IFCGRIDPLACEMENT($,{at},$)"));
+    block_product(&mut f, &p);
+    let s = f.read("parallel");
+    assert!(s.warnings.unsupported.contains_key("IFCGRIDPLACEMENT"));
+}
+
+#[test]
+fn polylines_of_a_great_many_segments_cross_within_the_budget() {
+    // Two axes of 3000 segments each: nine million pairs, past the bound
+    // that is tried; the placement is counted, not worked out, though they
+    // do cross, at the very last pair.
+    let mut f = File::new();
+    let n = 3000;
+    let ids: Vec<String> = (0..=n)
+        .map(|i| f.add(format!("IFCCARTESIANPOINT(({i}.,0.))")))
+        .collect();
+    let u = f.add(format!("IFCPOLYLINE(({}))", ids.join(",")));
+    let mut ids: Vec<String> = (0..n)
+        .map(|i| f.add(format!("IFCCARTESIANPOINT(({i}.,5.))")))
+        .collect();
+    ids.push(f.add(format!("IFCCARTESIANPOINT(({n}.,-5.))")));
+    let v = f.add(format!("IFCPOLYLINE(({}))", ids.join(",")));
+    let ua = f.add(format!("IFCGRIDAXIS('a',{u},.T.)"));
+    let va = f.add(format!("IFCGRIDAXIS('b',{v},.T.)"));
+    f.add(format!(
+        "IFCGRID('0000000000000000000002',$,'g',$,$,#5,$,({ua}),({va}),$,$)"
+    ));
+    let at = f.add(format!(
+        "IFCVIRTUALGRIDINTERSECTION(({ua},{va}),(0.,0.,0.))"
+    ));
+    let p = f.add(format!("IFCGRIDPLACEMENT($,{at},$)"));
+    block_product(&mut f, &p);
+    let s = f.read("many pairs");
+    assert!(
+        s.warnings.unsupported.contains_key("IFCGRIDPLACEMENT"),
+        "{:?}",
+        s.warnings
+    );
+}
+
+#[test]
+fn huge_sweep_ranges_do_not_run_away() {
+    for (start, end) in [
+        ("-1.E300", "1.E300"),
+        ("0.", "1.E999"),
+        ("1.E-300", "1.E-299"),
+        ("5.", "5."),
+        ("4611686018427387904.", "-4611686018427387904."),
+    ] {
+        let mut f = File::new();
+        let a = f.add("IFCCARTESIANPOINT((0.,0.,0.))");
+        let b = f.add("IFCCARTESIANPOINT((2.,0.,0.))");
+        let c = f.add("IFCCARTESIANPOINT((2.,2.,0.))");
+        let line = f.add(format!("IFCPOLYLINE(({a},{b},{c}))"));
+        let d1 = f.add(format!("IFCSWEPTDISKSOLID({line},0.1,$,{start},{end})"));
+        let circle = f.add("IFCCIRCLE(#4,2.)");
+        let d2 = f.add(format!("IFCSWEPTDISKSOLID({circle},0.1,$,{start},{end})"));
+        f.product(&format!("{d1},{d2}"), "#5");
+        f.read(&format!("{start} {end}"));
+    }
+}
+
+#[test]
+fn a_range_of_0_to_1_on_a_polyline_of_many_points_is_the_whole_polyline() {
+    // Allplan writes it for bent bars. A two-point polyline is cut as written.
+    let extent = |points: &[&str], end: &str| {
+        let mut f = File::new();
+        let ids: Vec<String> = points
+            .iter()
+            .map(|p| f.add(format!("IFCCARTESIANPOINT(({p}))")))
+            .collect();
+        let line = f.add(format!("IFCPOLYLINE(({}))", ids.join(",")));
+        let d = f.add(format!("IFCSWEPTDISKSOLID({line},0.1,$,0.,{end})"));
+        f.product(&d, "#5");
+        let b = f.read("0 to 1").bounds.unwrap();
+        b[1][1] - b[0][1]
+    };
+    let bent = ["0.,0.,0.", "2.,0.,0.", "2.,2.,0."];
+    // Along y: the second segment is 2 long, and the first leaves 0.2 of disk.
+    assert!(extent(&bent, "1.") > 1.9);
+    assert!(extent(&bent, "1.5") < 1.5);
+    assert!(extent(&["0.,0.,0.", "2.,0.,0."], "1.") < 0.5);
+}
+
+#[test]
+fn an_alignment_is_counted_as_not_drawn() {
+    let mut f = File::new();
+    let a = f.add("IFCCARTESIANPOINT((0.,0.,0.))");
+    let b = f.add("IFCCARTESIANPOINT((10.,0.,0.))");
+    let line = f.add(format!("IFCPOLYLINE(({a},{b}))"));
+    let rep = f.add(format!(
+        "IFCSHAPEREPRESENTATION(#6,'Axis','Curve3D',({line}))"
+    ));
+    let shape = f.add(format!("IFCPRODUCTDEFINITIONSHAPE($,$,({rep}))"));
+    f.add(format!(
+        "IFCALIGNMENT('0000000000000000000003',$,'a',$,$,#5,{shape},$)"
+    ));
+    let s = f.read("alignment");
+    assert!(s.elements.is_empty());
+    assert_eq!(s.warnings.unsupported.get("IFCALIGNMENT"), Some(&1));
+}
+
+#[test]
+fn a_product_with_no_global_id_is_drawn() {
+    // web-ifc writes `$`, which the schema does not allow.
+    let mut f = File::new();
+    let profile = f.add("IFCRECTANGLEPROFILEDEF(.AREA.,$,$,2.,1.)");
+    let solid = f.add(format!("IFCEXTRUDEDAREASOLID({profile},#4,#2,3.)"));
+    let rep = f.add(format!(
+        "IFCSHAPEREPRESENTATION(#6,'Body','SweptSolid',({solid}))"
+    ));
+    let shape = f.add(format!("IFCPRODUCTDEFINITIONSHAPE($,$,({rep}))"));
+    f.add(format!("IFCWALLSTANDARDCASE($,$,'w',$,$,#5,{shape},$,$)"));
+    let s = f.read("null global id");
+    assert_eq!(s.elements.len(), 1);
+    assert!(s.triangles() > 0);
+}
+
+#[test]
+fn an_end_that_counts_each_polyline_of_a_composite_curve_once_is_the_whole_curve() {
+    // Revit: two polylines of three points are 2 long, not 4.
+    let extent = |end: &str| {
+        let mut f = File::new();
+        let mut segment = |points: [&str; 3]| {
+            let ids: Vec<String> = points
+                .iter()
+                .map(|p| f.add(format!("IFCCARTESIANPOINT(({p}))")))
+                .collect();
+            let line = f.add(format!("IFCPOLYLINE(({}))", ids.join(",")));
+            f.add(format!("IFCCOMPOSITECURVESEGMENT(.CONTINUOUS.,.T.,{line})"))
+        };
+        let a = segment(["0.,0.,0.", "2.,0.,0.", "4.,0.,0."]);
+        let b = segment(["4.,0.,0.", "4.,2.,0.", "4.,4.,0."]);
+        let curve = f.add(format!("IFCCOMPOSITECURVE(({a},{b}),.F.)"));
+        let d = f.add(format!("IFCSWEPTDISKSOLID({curve},0.1,$,0.,{end})"));
+        f.product(&d, "#5");
+        let b = f.read(end).bounds.unwrap();
+        b[1][1] - b[0][1]
+    };
+    assert!(extent("2.") > 3.9);
+    assert!(extent("4.") > 3.9);
+    // Neither count: cut as the usual count says, 3 is half way up.
+    assert!((1.9..2.5).contains(&extent("3.")));
+}
+
+#[test]
+fn a_sweep_with_a_parameter_that_is_no_number_is_counted_invalid() {
+    let mut f = File::new();
+    let a = f.add("IFCCARTESIANPOINT((0.,0.,0.))");
+    let b = f.add("IFCCARTESIANPOINT((2.,0.,0.))");
+    let line = f.add(format!("IFCPOLYLINE(({a},{b}))"));
+    let d = f.add(format!("IFCSWEPTDISKSOLID({line},0.1,$,'text',1.)"));
+    f.product(&d, "#5");
+    let s = f.read("text parameter");
+    assert!(s.elements.is_empty());
+    assert!(s.warnings.invalid >= 1);
+}
+
+#[test]
+fn a_sweep_along_a_curve_whose_parameters_are_unknown_is_whole_and_counted() {
+    // A composite curve of an indexed poly curve with an arc has no
+    // published parameter: the sweep takes it whole and says so.
+    let mut f = File::new();
+    let list = f.add("IFCCARTESIANPOINTLIST3D(((0.,0.,0.),(1.,1.,0.),(2.,0.,0.)))");
+    let curve = f.add(format!(
+        "IFCINDEXEDPOLYCURVE({list},(IFCARCINDEX((1,2,3))),$)"
+    ));
+    let d = f.add(format!("IFCSWEPTDISKSOLID({curve},0.1,$,0.,1.)"));
+    f.product(&d, "#5");
+    let s = f.read("arc");
+    assert_eq!(
+        s.warnings.unsupported.get("IFCINDEXEDPOLYCURVE"),
+        Some(&1),
+        "{:?}",
+        s.warnings
+    );
+    assert_eq!(s.elements.len(), 1);
+}
+
+#[test]
+fn curve_segments_of_absurd_length_and_start_stay_bounded() {
+    for (start, length) in [
+        ("0.", "1.E300"),
+        ("1.E300", "10."),
+        ("0.", "-1.E300"),
+        ("1.E15", "1.E15"),
+        ("0.", "0."),
+    ] {
+        for parent in [
+            "IFCCLOTHOID(#7,100.)",
+            "IFCCIRCLE(#7,50.)",
+            "IFCCLOTHOID(#7,1.E-300)",
+            "IFCCIRCLE(#7,1.E-300)",
+            "IFCLINE(#1,#8)",
+        ] {
+            let mut f = File::new();
+            // #100..: a placement, a vector, then the parent; the numbers
+            // #7 and #8 are the placement and the vector.
+            f.lines.clear();
+            let place = f.add("IFCAXIS2PLACEMENT2D(#1,$)");
+            let dir = f.add("IFCDIRECTION((1.,0.))");
+            let vector = f.add(format!("IFCVECTOR({dir},1.)"));
+            let parent = parent.replace("#7", &place).replace("#8", &vector);
+            let parent = f.add(parent);
+            let segment = f.add(format!(
+                "IFCCURVESEGMENT(.CONTINUOUS.,{place},IFCLENGTHMEASURE({start}),IFCLENGTHMEASURE({length}),{parent})"
+            ));
+            let composite = f.add(format!(
+                "IFCCOMPOSITECURVE(({segment},{segment},{segment},{segment}),.F.)"
+            ));
+            let d = f.add(format!("IFCSWEPTDISKSOLID({composite},0.1,$,$,$)"));
+            f.product(&d, "#5");
+            f.read(&format!("{parent} {start} {length}"));
+        }
+    }
+}
+
+#[test]
+fn a_composite_curve_of_a_great_many_segments_is_refused() {
+    let mut f = File::new();
+    let place = f.add("IFCAXIS2PLACEMENT2D(#1,$)");
+    let circle = f.add(format!("IFCCIRCLE({place},50.)"));
+    let segment = f.add(format!(
+        "IFCCURVESEGMENT(.CONTINUOUS.,{place},IFCLENGTHMEASURE(0.),IFCLENGTHMEASURE(10.),{circle})"
+    ));
+    let composite = f.add(format!(
+        "IFCCOMPOSITECURVE(({}),.F.)",
+        vec![segment; 20_000].join(",")
+    ));
+    let d = f.add(format!("IFCSWEPTDISKSOLID({composite},0.1,$,$,$)"));
+    f.product(&d, "#5");
+    let s = f.read("many segments");
+    assert!(s.elements.is_empty());
+    assert!(s.warnings.invalid >= 1);
+}
+
+#[test]
+fn a_gradient_curve_that_runs_backwards_is_refused() {
+    let mut f = File::new();
+    let place = f.add("IFCAXIS2PLACEMENT2D(#1,$)");
+    let dir = f.add("IFCDIRECTION((1.,0.))");
+    let vector = f.add(format!("IFCVECTOR({dir},1.)"));
+    let line = f.add(format!("IFCLINE(#1,{vector})"));
+    let seg = |f: &mut File, x: f64, len: f64| {
+        let at = f.add(format!("IFCCARTESIANPOINT(({x},0.))"));
+        let p = f.add(format!("IFCAXIS2PLACEMENT2D({at},{dir})"));
+        f.add(format!(
+            "IFCCURVESEGMENT(.CONTINUOUS.,{p},IFCLENGTHMEASURE(0.),IFCLENGTHMEASURE({len}),{line})"
+        ))
+    };
+    let plan_segment = f.add(format!(
+        "IFCCURVESEGMENT(.CONTINUOUS.,{place},IFCLENGTHMEASURE(0.),IFCLENGTHMEASURE(10.),{line})"
+    ));
+    let plan = f.add(format!("IFCCOMPOSITECURVE(({plan_segment}),.F.)"));
+    // A profile that starts at 10 and goes back to 0 for 10 (a negative run).
+    let first = seg(&mut f, 10.0, 5.0);
+    let second = seg(&mut f, 0.0, 5.0);
+    let gradient = f.add(format!("IFCGRADIENTCURVE(({first},{second}),.F.,{plan},$)"));
+    let d = f.add(format!("IFCSWEPTDISKSOLID({gradient},0.1,$,$,$)"));
+    f.product(&d, "#5");
+    let s = f.read("backwards profile");
+    assert!(s.elements.is_empty());
+}
diff --git a/crates/exav-render/tests/ifc_oracle.rs b/crates/exav-render/tests/ifc_oracle.rs
index ed44095b..b9c71e3b 100644
--- a/crates/exav-render/tests/ifc_oracle.rs
+++ b/crates/exav-render/tests/ifc_oracle.rs
@@ -17,21 +17,57 @@ use std::collections::{HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-use exav_render::ifc::{read, Limits};
+use exav_render::ifc::{Limits, read};
 use serde_json::Value;
 
 /// (fixture, element name, why web-ifc 0.0.77 differs). Each of these
 /// elements matches its closed form in tests/ifc.rs.
 const EXPLAINED: &[(&str, &str, &str)] = &[
-    ("profiles.ifc", "rectangle hollow", "web-ifc's section is 0.0136 m2, the definition's 0.4 x 0.3 minus 0.36 x 0.26 is 0.0264"),
-    ("profiles.ifc", "t shape", "web-ifc's section is 0.0044 m2, flange plus web is 0.0063"),
-    ("profiles.ifc", "z shape", "web-ifc draws it 0.1 wide; the figure's flanges are each FlangeWidth wide with the web, 0.19 overall"),
-    ("profiles.ifc", "rounded rectangle", "web-ifc ignores RoundingRadius: square corners"),
-    ("solids.ifc", "tapered", "web-ifc ignores EndSweptArea: a straight prism"),
-    ("solids.ifc", "swept disk", "web-ifc ignores InnerRadius: no inner surface"),
-    ("solids.ifc", "surface curve swept", "web-ifc's solid is 0.16 m3 for a 0.2 x 0.4 section along 3 m"),
-    ("solids.ifc", "fixed reference swept", "web-ifc's solid is flat (no volume)"),
-    ("mapped_units.ifc", "revolved degrees", "web-ifc's quarter tube is 0.272 m3; Pappus gives 0.346"),
+    (
+        "profiles.ifc",
+        "rectangle hollow",
+        "web-ifc's section is 0.0136 m2, the definition's 0.4 x 0.3 minus 0.36 x 0.26 is 0.0264",
+    ),
+    (
+        "profiles.ifc",
+        "t shape",
+        "web-ifc's section is 0.0044 m2, flange plus web is 0.0063",
+    ),
+    (
+        "profiles.ifc",
+        "z shape",
+        "web-ifc draws it 0.1 wide; the figure's flanges are each FlangeWidth wide with the web, 0.19 overall",
+    ),
+    (
+        "profiles.ifc",
+        "rounded rectangle",
+        "web-ifc ignores RoundingRadius: square corners",
+    ),
+    (
+        "solids.ifc",
+        "tapered",
+        "web-ifc ignores EndSweptArea: a straight prism",
+    ),
+    (
+        "solids.ifc",
+        "swept disk",
+        "web-ifc ignores InnerRadius: no inner surface",
+    ),
+    (
+        "solids.ifc",
+        "surface curve swept",
+        "web-ifc's solid is 0.16 m3 for a 0.2 x 0.4 section along 3 m",
+    ),
+    (
+        "solids.ifc",
+        "fixed reference swept",
+        "web-ifc's solid is flat (no volume)",
+    ),
+    (
+        "mapped_units.ifc",
+        "revolved degrees",
+        "web-ifc's quarter tube is 0.272 m3; Pappus gives 0.346",
+    ),
 ];
 
 struct Stat {
@@ -257,7 +293,9 @@ fn elements_agree_with_web_ifc() {
         agree += a;
         total += n;
     }
-    eprintln!("total: {agree}/{total} elements agree; {only_ours} drawn only by exav, {only_theirs} only by web-ifc");
+    eprintln!(
+        "total: {agree}/{total} elements agree; {only_ours} drawn only by exav, {only_theirs} only by web-ifc"
+    );
     assert!(
         failures.is_empty(),
         "unexplained differences in the fixtures:\n{}",
diff --git a/crates/exav-render/tests/jpeg2000_jbig2.rs b/crates/exav-render/tests/jpeg2000_jbig2.rs
index 146689bd..234f1991 100644
--- a/crates/exav-render/tests/jpeg2000_jbig2.rs
+++ b/crates/exav-render/tests/jpeg2000_jbig2.rs
@@ -11,9 +11,9 @@ use std::cell::Cell;
 use std::sync::Once;
 
 use exav_render::image::{
-    decode, decode_any, Channels, Error, Format, Pixels, Samples, DECODE_MAX,
+    Channels, DECODE_MAX, Error, Format, Pixels, Samples, decode, decode_any,
 };
-use exav_render::pdf_image::{decode_ccitt, decode_jbig2, decode_jpx, CcittParams, JpxParams};
+use exav_render::pdf_image::{CcittParams, JpxParams, decode_ccitt, decode_jbig2, decode_jpx};
 
 fn fixture(name: &str) -> Vec<u8> {
     let path = format!(
@@ -560,6 +560,55 @@ fn a_jbig2_region_larger_than_the_budget_is_refused() {
     );
 }
 
+/// A region's pixels cost time, a few seconds for the half billion that
+/// [`DECODE_MAX`] allows a file and as many again for each further half: the
+/// bound is the same through the PDF decoder, whatever memory it is given
+/// (the viewer gives it a gigabyte).
+#[test]
+fn a_jbig2_stream_declaring_more_region_pixels_than_a_file_may_is_refused_at_any_budget() {
+    // 23,171 squared is just over 2^29.
+    let embedded: Vec<u8> = page_with_a_region(23_171)
+        .iter()
+        .flat_map(|(h, d)| [&h[..], &d[..]].concat())
+        .collect();
+    let start = std::time::Instant::now();
+    assert_eq!(
+        decode_jbig2(&embedded, 120, 64, None, 1 << 40).map_err(|e| e.message()),
+        Err("Image too large")
+    );
+    assert!(start.elapsed() < std::time::Duration::from_millis(500));
+    // Just under it is decoded.
+    let embedded: Vec<u8> = page_with_a_region(1024)
+        .iter()
+        .flat_map(|(h, d)| [&h[..], &d[..]].concat())
+        .collect();
+    assert!(decode_jbig2(&embedded, 120, 64, None, 1 << 40).is_ok());
+}
+
+/// A JBIG2 file of 243 bytes whose symbol dictionary says it has 50,044 new
+/// symbols (a sample's 12 with two bytes changed): hayro-jbig2 went on
+/// decoding symbols from what was left of the stream, for two minutes and
+/// 7 GB. A dictionary cannot hold more symbols than its length allows.
+#[test]
+fn a_jbig2_symbol_dictionary_with_far_more_symbols_than_its_bytes_is_refused_at_once() {
+    const FILE: &str = "\
+         974a42320d0a1a0a01000000010000000000010000000071000003fffdff02fefefe0000000c0000\
+         c37c06f1cc488c06ba0000001601030001000000001000001701040001000000140000001a010500\
+         01000000e20100001b01050001000000ea010000a276087fff7fff76313cd54eee9ca11f0a8e7f95\
+         7f2da4b136d84b29412bd2fb179115ffac00007f0130000100000013000000530000002500000000\
+         00000000000000000000020622000100000035000000530000002500000000000000000000000000\
+         00139fd47be658ea8ffbdaa32383a44e98d95f322818ddce8e89d1caacc8ffac0000000331000100\
+         000000";
+    let data: Vec<u8> = (0..FILE.len())
+        .step_by(2)
+        .map(|i| u8::from_str_radix(&FILE[i..i + 2], 16).unwrap())
+        .collect();
+    assert_eq!(data.len(), 243);
+    let started = std::time::Instant::now();
+    assert_eq!(decode_any(&data, DECODE_MAX), Err(Error::Undecodable));
+    assert!(started.elapsed().as_secs() < 5);
+}
+
 #[test]
 fn every_ccitt_mode_gives_back_the_encoded_picture() {
     let want = bilevel();
diff --git a/crates/exav-render/tests/jxl.rs b/crates/exav-render/tests/jxl.rs
new file mode 100644
index 00000000..a59c228f
--- /dev/null
+++ b/crates/exav-render/tests/jxl.rs
@@ -0,0 +1,300 @@
+//! JPEG XL, through zenjxl-decoder.
+//!
+//! The oracles are not the decoder's own output. The lossless files were made
+//! by libjxl's `cjxl` from pixels this file computes (`source`), so a correct
+//! decode gives those pixels back exactly. The lossy ones carry the pixels
+//! libjxl's own `djxl` decodes them to, which a second implementation must match
+//! to within the rounding of its arithmetic.
+//!
+//! Regenerate with `cjxl` and `djxl` 0.11 from the PPM, PAM and PGM that
+//! `source` describes: `cjxl x.ppm rgb-lossless.jxl -d 0 -e 7`, `-d 1 -e 5`
+//! for `rgb-lossy`, `-d 2 -e 3` for `rgb-lossy-e3`, `--container=1` for
+//! `rgb-container`, `djxl x.jxl x.ref.ppm` for the references.
+
+use std::cell::Cell;
+use std::sync::Once;
+
+use exav_render::image::{
+    Channels, DECODE_MAX, Error, Format, Pixels, Samples, decode, decode_any,
+};
+
+const W: usize = 64;
+const H: usize = 48;
+
+fn fixture(name: &str) -> Vec<u8> {
+    let path = format!(
+        "{}/tests/fixtures/images/jxl/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&path).unwrap_or_else(|e| panic!("{path}: {e}"))
+}
+
+/// The pixel the files were made from.
+fn source(x: usize, y: usize) -> [u8; 3] {
+    let (r, g, b) = ((x * 4) % 256, (y * 5) % 256, ((x * y) / 3) % 256);
+    let [r, g, b] = [r as u8, g as u8, b as u8];
+    if (x / 8 + y / 8).is_multiple_of(2) {
+        [255 - r, 255 - g, 255 - b]
+    } else {
+        [r, g, b]
+    }
+}
+
+fn u8s(p: &Pixels) -> &[u8] {
+    match &p.samples {
+        Samples::U8(v) => v,
+        other => panic!("8-bit samples expected, got {other:?}"),
+    }
+}
+
+/// The samples of a binary PPM (P6), after its header.
+fn ppm(name: &str) -> Vec<u8> {
+    let data = fixture(name);
+    let mut fields = 0;
+    let mut at = 0;
+    while fields < 4 {
+        while data[at].is_ascii_whitespace() {
+            at += 1;
+        }
+        while !data[at].is_ascii_whitespace() {
+            at += 1;
+        }
+        fields += 1;
+    }
+    data[at + 1..].to_vec()
+}
+
+thread_local!(static PANICKED: Cell<bool> = const { Cell::new(false) });
+
+/// Records a panic on this thread, which `decode` would otherwise turn into
+/// `Undecodable` without a trace.
+fn watch_panics() {
+    static HOOK: Once = Once::new();
+    HOOK.call_once(|| {
+        let previous = std::panic::take_hook();
+        std::panic::set_hook(Box::new(move |info| {
+            PANICKED.with(|p| p.set(true));
+            previous(info);
+        }));
+    });
+    PANICKED.with(|p| p.set(false));
+}
+
+fn panicked() -> bool {
+    PANICKED.with(|p| p.get())
+}
+
+#[test]
+fn a_codestream_and_a_container_are_known_by_their_first_bytes() {
+    assert_eq!(
+        Format::detect(&fixture("rgb-lossless.jxl")),
+        Some(Format::Jxl)
+    );
+    assert_eq!(
+        Format::detect(&fixture("rgb-container.jxl")),
+        Some(Format::Jxl)
+    );
+    assert!(Format::ALL.contains(&Format::Jxl));
+    assert_eq!(Format::Jxl.name(), "jxl");
+    assert_eq!(Format::detect(b"\xFF\xD8\xFF\xE0"), Some(Format::Jpeg));
+    assert_eq!(Format::detect(b"\xFF\x0B"), None);
+}
+
+#[test]
+fn lossless_files_decode_to_the_pixels_they_were_made_from() {
+    for file in ["rgb-lossless.jxl", "rgb-container.jxl"] {
+        let p = decode_any(&fixture(file), DECODE_MAX).unwrap();
+        assert_eq!(
+            (p.width as usize, p.height as usize, p.channels),
+            (W, H, Channels::Rgba),
+            "{file}"
+        );
+        let samples = u8s(&p);
+        for y in 0..H {
+            for x in 0..W {
+                let at = (y * W + x) * 4;
+                let [r, g, b] = source(x, y);
+                assert_eq!(samples[at..at + 4], [r, g, b, 255], "{file} at {x},{y}");
+            }
+        }
+    }
+}
+
+#[test]
+fn an_alpha_channel_comes_through_as_straight_alpha() {
+    let p = decode_any(&fixture("rgba-lossless.jxl"), DECODE_MAX).unwrap();
+    assert_eq!(
+        (p.width as usize, p.height as usize, p.channels),
+        (W, H, Channels::Rgba)
+    );
+    let samples = u8s(&p);
+    for y in 0..H {
+        for x in 0..W {
+            let at = (y * W + x) * 4;
+            let alpha = ((x * 255) / (W - 1)) as u8;
+            assert_eq!(samples[at + 3], alpha, "alpha at {x},{y}");
+            // Under an alpha of 0 an encoder may keep or clear the colour.
+            if alpha > 0 {
+                assert_eq!(samples[at..at + 3], source(x, y), "colour at {x},{y}");
+            }
+        }
+    }
+}
+
+#[test]
+fn a_grey_image_is_grey_with_alpha() {
+    let p = decode_any(&fixture("grey-lossless.jxl"), DECODE_MAX).unwrap();
+    assert_eq!(
+        (p.width as usize, p.height as usize, p.channels),
+        (W, H, Channels::LumaAlpha)
+    );
+    let samples = u8s(&p);
+    for y in 0..H {
+        for x in 0..W {
+            let [r, g, b] = source(x, y);
+            let grey =
+                ((u32::from(r) * 299 + u32::from(g) * 587 + u32::from(b) * 114) / 1000) as u8;
+            let at = (y * W + x) * 2;
+            assert_eq!(samples[at..at + 2], [grey, 255], "at {x},{y}");
+        }
+    }
+    // What a page draws: grey in all three colour channels.
+    let rgba = p.to_rgba8();
+    assert_eq!(rgba[..4], [u8s(&p)[0], u8s(&p)[0], u8s(&p)[0], 255]);
+}
+
+/// The PNGs of the JPEG 2000 and JBIG2 tests, encoded losslessly by `cjxl`
+/// (`cjxl x.png x.jxl -d 0 -e 7`): the PNG is the oracle.
+#[test]
+fn a_lossless_file_gives_back_the_png_it_was_encoded_from() {
+    let images = |name: &str| {
+        std::fs::read(format!(
+            "{}/tests/fixtures/images/{name}",
+            env!("CARGO_MANIFEST_DIR")
+        ))
+        .unwrap()
+    };
+    for (jxl, png) in [("rgb.jxl", "rgb.png"), ("rgba.jxl", "rgba.png")] {
+        let got = decode_any(&images(jxl), DECODE_MAX).unwrap();
+        let want = decode_any(&images(png), DECODE_MAX).unwrap().to_rgba8();
+        assert_eq!(got.channels, Channels::Rgba, "{jxl}");
+        let got = u8s(&got);
+        assert_eq!(got.len(), want.len(), "{jxl}");
+        for (i, (g, w)) in got
+            .as_chunks::<4>()
+            .0
+            .iter()
+            .zip(want.as_chunks::<4>().0)
+            .enumerate()
+        {
+            // Under an alpha of 0 the colour is not kept.
+            let same = if w[3] == 0 { g[3] == 0 } else { g == w };
+            assert!(same, "{jxl}: pixel {i} is {g:?}, the PNG's is {w:?}");
+        }
+    }
+}
+
+/// A lossy file is decoded by two implementations to the same picture, give
+/// or take the rounding of their arithmetic: libjxl's `djxl` made the
+/// reference.
+#[test]
+fn lossy_files_decode_as_libjxl_decodes_them() {
+    for (file, reference) in [
+        ("rgb-lossy.jxl", "rgb-lossy.ref.ppm"),
+        ("rgb-lossy-e3.jxl", "rgb-lossy-e3.ref.ppm"),
+    ] {
+        let p = decode_any(&fixture(file), DECODE_MAX).unwrap();
+        let want = ppm(reference);
+        let got = u8s(&p);
+        assert_eq!(got.len() / 4 * 3, want.len(), "{file}");
+        let mut worst = 0u8;
+        let mut off = 0usize;
+        for (i, px) in got.as_chunks::<4>().0.iter().enumerate() {
+            assert_eq!(px[3], 255);
+            for c in 0..3 {
+                let d = px[c].abs_diff(want[i * 3 + c]);
+                worst = worst.max(d);
+                off += usize::from(d > 0);
+            }
+        }
+        assert!(
+            worst <= 2,
+            "{file}: a sample is {worst} levels from libjxl's ({off} differ)"
+        );
+    }
+}
+
+/// The limit is the caller's: a file declaring 121 million pixels is refused
+/// from its header, before anything is allocated for them.
+#[test]
+fn an_image_over_the_budget_is_refused_from_its_header() {
+    let data = fixture("big-flat.jxl");
+    let start = std::time::Instant::now();
+    assert_eq!(
+        decode(&data, Format::Jxl, 64 << 20).map(|_| ()),
+        Err(Error::TooLarge)
+    );
+    assert!(
+        start.elapsed() < std::time::Duration::from_secs(1),
+        "{:?}",
+        start.elapsed()
+    );
+    // At the budget of every decoder here, the file is still not decoded to
+    // gigabytes of floats.
+    let result = decode(&data, Format::Jxl, DECODE_MAX);
+    assert!(result.is_err() || result.is_ok_and(|p| u8s(&p).len() <= 4 * 121_000_000));
+}
+
+/// 9 million pixels, under every limit the decoder has of its own: only the
+/// caller's budget refuses it, from the size its header declares.
+#[test]
+fn the_callers_budget_is_the_decoders_limit() {
+    let data = fixture("mid-grey.jxl");
+    // Four bytes a pixel as RGBA: 36 MB.
+    assert_eq!(
+        decode(&data, Format::Jxl, 16 << 20).map(|_| ()),
+        Err(Error::TooLarge)
+    );
+    let p = decode(&data, Format::Jxl, 256 << 20).unwrap();
+    assert_eq!(
+        (p.width, p.height, p.channels),
+        (3000, 3000, Channels::LumaAlpha)
+    );
+    for (x, y) in [(0usize, 0usize), (1, 0), (0, 1), (2999, 2999), (1234, 2345)] {
+        assert_eq!(
+            u8s(&p)[(y * 3000 + x) * 2],
+            ((x * 7 + y * 3) % 256) as u8,
+            "at {x},{y}"
+        );
+    }
+}
+
+/// A decoder this size on hostile bytes: cut short and damaged at many places,
+/// every file ends in a pixel result or an error, with no panic (which
+/// `decode` would report as `Undecodable`, so the hook watches for one).
+#[test]
+fn damaged_files_are_errors_not_panics() {
+    watch_panics();
+    for file in [
+        "rgb-lossless.jxl",
+        "rgb-lossy.jxl",
+        "rgb-lossy-e3.jxl",
+        "rgba-lossless.jxl",
+        "grey-lossless.jxl",
+        "rgb-container.jxl",
+    ] {
+        let data = fixture(file);
+        for cut in (0..data.len()).step_by(7) {
+            let _ = decode_any(&data[..cut], 64 << 20);
+            assert!(!panicked(), "{file} cut at {cut}");
+        }
+        for at in (0..data.len()).step_by(3) {
+            for flip in [0x01u8, 0x80, 0xFF] {
+                let mut d = data.clone();
+                d[at] ^= flip;
+                let _ = decode_any(&d, 64 << 20);
+                assert!(!panicked(), "{file}: byte {at} xor {flip:#x}");
+            }
+        }
+    }
+}
diff --git a/crates/exav-render/tests/markdown.rs b/crates/exav-render/tests/markdown.rs
new file mode 100644
index 00000000..3c72fb47
--- /dev/null
+++ b/crates/exav-render/tests/markdown.rs
@@ -0,0 +1,939 @@
+//! Markdown into blocks and inlines: what a document shows, what a link may
+//! be, that raw HTML is only ever text, and that hostile input is bounded in
+//! time, stack and size.
+
+use exav_render::markdown::{
+    Align, Block, Document, Inline, MAX_BLOCK_DEPTH, MAX_COLUMNS, MAX_INLINE_DEPTH, MAX_NODES,
+    MAX_TARGET, parse,
+};
+
+fn doc(md: &str) -> Document {
+    parse(md)
+}
+
+/// The text of inlines, as read: no marks, links as their labels, images as their alt.
+fn text(c: &[Inline]) -> String {
+    let mut s = String::new();
+    for n in c {
+        match n {
+            Inline::Text(t) | Inline::Code(t) => s.push_str(t),
+            Inline::Br => {}
+            Inline::Em(c) | Inline::Strong(c) | Inline::Del(c) => s.push_str(&text(c)),
+            Inline::Link { children, .. } => s.push_str(&text(children)),
+            Inline::Image { alt } => s.push_str(alt),
+        }
+    }
+    s
+}
+
+/// Every inline of the document, depth first.
+fn inlines(blocks: &[Block], out: &mut Vec<Inline>) {
+    fn inl(c: &[Inline], out: &mut Vec<Inline>) {
+        for n in c {
+            out.push(n.clone());
+            match n {
+                Inline::Em(c)
+                | Inline::Strong(c)
+                | Inline::Del(c)
+                | Inline::Link { children: c, .. } => inl(c, out),
+                _ => {}
+            }
+        }
+    }
+    for b in blocks {
+        match b {
+            Block::Para(c) | Block::Heading { children: c, .. } => inl(c, out),
+            Block::Quote(c) => inlines(c, out),
+            Block::List { items, .. } => items.iter().for_each(|i| inlines(i, out)),
+            Block::Table { head, rows, .. } => {
+                head.iter().for_each(|c| inl(c, out));
+                rows.iter().flatten().for_each(|c| inl(c, out));
+            }
+            Block::Code(_) | Block::Rule | Block::Raw(_) => {}
+        }
+    }
+}
+
+fn all_inlines(d: &Document) -> Vec<Inline> {
+    let mut v = Vec::new();
+    inlines(&d.blocks, &mut v);
+    v
+}
+
+fn links(d: &Document) -> Vec<(String, String)> {
+    all_inlines(d)
+        .into_iter()
+        .filter_map(|n| match n {
+            Inline::Link { url, children } => Some((url, text(&children))),
+            _ => None,
+        })
+        .collect()
+}
+
+fn paras(blocks: &[Block]) -> Vec<String> {
+    blocks
+        .iter()
+        .filter_map(|b| match b {
+            Block::Para(c) => Some(text(c)),
+            _ => None,
+        })
+        .collect()
+}
+
+fn heading(d: &Document, level: u8) -> Vec<String> {
+    d.blocks
+        .iter()
+        .filter_map(|b| match b {
+            Block::Heading { level: l, children } if *l == level => Some(text(children)),
+            _ => None,
+        })
+        .collect()
+}
+
+fn marks(d: &Document, f: fn(&Inline) -> Option<&Vec<Inline>>) -> Vec<String> {
+    all_inlines(d)
+        .iter()
+        .filter_map(|n| f(n).map(|c| text(c)))
+        .collect()
+}
+
+fn em(n: &Inline) -> Option<&Vec<Inline>> {
+    if let Inline::Em(c) = n { Some(c) } else { None }
+}
+fn strong(n: &Inline) -> Option<&Vec<Inline>> {
+    if let Inline::Strong(c) = n {
+        Some(c)
+    } else {
+        None
+    }
+}
+fn del(n: &Inline) -> Option<&Vec<Inline>> {
+    if let Inline::Del(c) = n {
+        Some(c)
+    } else {
+        None
+    }
+}
+
+// ── blocks ───────────────────────────────────────────────────────────────────
+
+#[test]
+fn headings_atx_and_setext_with_closing_hashes_dropped() {
+    let d = doc("# One #\n\n## Two\n\nThree\n=====\n\nFour\n----\n\n####### seven\n\n#nospace");
+    assert_eq!(heading(&d, 1), ["One", "Three"]);
+    assert_eq!(heading(&d, 2), ["Two", "Four"]);
+    assert_eq!(paras(&d.blocks), ["####### seven", "#nospace"]);
+}
+
+#[test]
+fn emphasis_strong_strike_and_code_spans() {
+    let d = doc(
+        "a *em* and **strong** and ~~gone~~ and `co*de*` and _under_ and __bold__ and ***both***",
+    );
+    assert_eq!(marks(&d, em), ["em", "under", "both"]);
+    assert_eq!(marks(&d, strong), ["strong", "bold", "both"]);
+    assert_eq!(marks(&d, del), ["gone"]);
+    let codes: Vec<_> = all_inlines(&d)
+        .into_iter()
+        .filter_map(|n| {
+            if let Inline::Code(s) = n {
+                Some(s)
+            } else {
+                None
+            }
+        })
+        .collect();
+    assert_eq!(codes, ["co*de*"]);
+    assert_eq!(
+        paras(&d.blocks),
+        ["a em and strong and gone and co*de* and under and bold and both"]
+    );
+}
+
+#[test]
+fn snake_case_and_a_lone_star_are_not_emphasis() {
+    let d = doc("snake_case_name and 2 * 3 * 4 and a*b");
+    assert!(marks(&d, em).is_empty());
+    assert_eq!(paras(&d.blocks), ["snake_case_name and 2 * 3 * 4 and a*b"]);
+}
+
+#[test]
+fn code_is_opaque() {
+    let d = doc("```js\n# not a heading\n<b>x</b>\n```\n\n    indented *code*\n\n~~~\ntilde\n~~~");
+    let codes: Vec<_> = d
+        .blocks
+        .iter()
+        .filter_map(|b| {
+            if let Block::Code(s) = b {
+                Some(s.as_str())
+            } else {
+                None
+            }
+        })
+        .collect();
+    assert_eq!(
+        codes,
+        ["# not a heading\n<b>x</b>", "indented *code*", "tilde"]
+    );
+    assert_eq!(d.blocks.len(), 3);
+}
+
+#[test]
+fn an_unclosed_fence_runs_to_the_end() {
+    assert_eq!(
+        doc("```\nopen\nstill code").blocks,
+        [Block::Code("open\nstill code".into())]
+    );
+}
+
+#[test]
+fn block_quotes_nest_and_continue_lazily() {
+    let d = doc("> quoted\ncontinued\n>\n> > inner\n\nafter");
+    let Block::Quote(outer) = &d.blocks[0] else {
+        panic!("{:?}", d.blocks)
+    };
+    assert_eq!(
+        text(match &outer[0] {
+            Block::Para(c) => c,
+            b => panic!("{b:?}"),
+        }),
+        "quoted\ncontinued"
+    );
+    let Block::Quote(inner) = &outer[1] else {
+        panic!("{outer:?}")
+    };
+    assert_eq!(paras(inner), ["inner"]);
+    assert_eq!(paras(&d.blocks), ["after"]);
+}
+
+#[test]
+fn lists_nest_and_ordered_ones_keep_their_start() {
+    let d = doc("- a\n- b\n  - b1\n  - b2\n- c\n\n3. three\n4. four\n   1. sub");
+    let Block::List {
+        ordered: false,
+        items,
+        tight: true,
+        ..
+    } = &d.blocks[0]
+    else {
+        panic!("{:?}", d.blocks[0])
+    };
+    assert_eq!(items.len(), 3);
+    assert_eq!(paras(&items[0]), ["a"]);
+    let Block::List { items: sub, .. } = &items[1][1] else {
+        panic!("{:?}", items[1])
+    };
+    assert_eq!(
+        sub.iter().map(|i| paras(i)[0].clone()).collect::<Vec<_>>(),
+        ["b1", "b2"]
+    );
+    let Block::List {
+        ordered: true,
+        start: 3,
+        items,
+        ..
+    } = &d.blocks[1]
+    else {
+        panic!("{:?}", d.blocks[1])
+    };
+    assert_eq!(paras(&items[0]), ["three"]);
+    assert!(matches!(
+        &items[1][1],
+        Block::List {
+            ordered: true,
+            start: 1,
+            ..
+        }
+    ));
+}
+
+#[test]
+fn a_list_is_tight_unless_an_item_has_paragraphs_of_its_own() {
+    assert!(matches!(
+        doc("- a\n- b").blocks[0],
+        Block::List { tight: true, .. }
+    ));
+    assert!(matches!(
+        doc("- a\n\n- b").blocks[0],
+        Block::List { tight: false, .. }
+    ));
+    assert!(matches!(
+        doc("- a\n- b\n\n  more").blocks[0],
+        Block::List { tight: false, .. }
+    ));
+}
+
+#[test]
+fn a_number_in_the_middle_of_a_paragraph_starts_no_list() {
+    let d = doc("the year\n2024. was long");
+    assert_eq!(paras(&d.blocks), ["the year\n2024. was long"]);
+    assert_eq!(d.blocks.len(), 1);
+}
+
+#[test]
+fn rules() {
+    let d = doc("a\n\n---\n\n***\n\n___\n\n- - -");
+    assert_eq!(d.blocks.iter().filter(|b| **b == Block::Rule).count(), 4);
+}
+
+#[test]
+fn tables_keep_alignment_and_pad_short_rows() {
+    let d = doc("| Name | Qty | Note |\n|:-----|----:|:----:|\n| a | 1 | x \\| y |\n| b | 22 |\n");
+    let Block::Table { align, head, rows } = &d.blocks[0] else {
+        panic!("{:?}", d.blocks)
+    };
+    assert_eq!(
+        align,
+        &[Some(Align::Left), Some(Align::Right), Some(Align::Center)]
+    );
+    assert_eq!(
+        head.iter().map(|c| text(c)).collect::<Vec<_>>(),
+        ["Name", "Qty", "Note"]
+    );
+    let rows: Vec<Vec<String>> = rows
+        .iter()
+        .map(|r| r.iter().map(|c| text(c)).collect())
+        .collect();
+    assert_eq!(rows, [["a", "1", "x | y"], ["b", "22", ""]]);
+}
+
+#[test]
+fn hard_and_soft_breaks() {
+    let d = doc("one  \ntwo\\\nthree\nfour");
+    assert_eq!(
+        all_inlines(&d).iter().filter(|n| **n == Inline::Br).count(),
+        2
+    );
+    assert_eq!(paras(&d.blocks), ["onetwothree\nfour"]);
+}
+
+#[test]
+fn entities_are_decoded_to_text() {
+    assert_eq!(
+        paras(&doc("fish &amp; chips &lt;b&gt; &hearts; &#x41;").blocks),
+        ["fish & chips <b> \u{2665} A"]
+    );
+}
+
+// ── links ────────────────────────────────────────────────────────────────────
+
+fn one(md: &str) -> Vec<(String, String)> {
+    links(&doc(md))
+}
+
+fn pair(a: &str, b: &str) -> (String, String) {
+    (a.to_string(), b.to_string())
+}
+
+#[test]
+fn http_https_and_mailto_targets_are_kept() {
+    assert_eq!(
+        one("[docs](https://example.com/a?b=1)"),
+        [pair("https://example.com/a?b=1", "docs")]
+    );
+    assert_eq!(
+        one("[site](HTTP://example.com)"),
+        [pair("HTTP://example.com", "site")]
+    );
+    assert_eq!(
+        one("[write](mailto:me@example.com)"),
+        [pair("mailto:me@example.com", "write")]
+    );
+    assert_eq!(
+        one("<https://example.com/x>"),
+        [pair("https://example.com/x", "https://example.com/x")]
+    );
+    assert_eq!(
+        one("<me@example.com>"),
+        [pair("mailto:me@example.com", "me@example.com")]
+    );
+    // An @ after the host is not a credential.
+    assert_eq!(
+        one("[q](https://example.com?next=a@b)"),
+        [pair("https://example.com?next=a@b", "q")]
+    );
+    assert_eq!(
+        one("[q](https://example.com/a@b)"),
+        [pair("https://example.com/a@b", "q")]
+    );
+}
+
+#[test]
+fn a_link_reference_is_resolved() {
+    assert_eq!(
+        one("[ref][1] and [two]\n\n[1]: https://example.com/one\n[two]: https://example.com/two"),
+        [
+            pair("https://example.com/one", "ref"),
+            pair("https://example.com/two", "two"),
+        ]
+    );
+    // Through a reference too, only the label is kept of a refused target.
+    let d = doc("[ref][1]\n\n[1]: javascript:alert(1)");
+    assert!(links(&d).is_empty());
+}
+
+#[test]
+fn any_other_target_is_its_label_alone() {
+    let long = "x".repeat(3000);
+    let refused = [
+        "javascript:alert(1)",
+        "JaVaScRiPt:alert(1)",
+        "  javascript:alert(1)",
+        "java\nscript:alert(1)",
+        "java\tscript:alert(1)",
+        "&#106;avascript:alert(1)",
+        "data:text/html,<script>alert(1)</script>",
+        "vbscript:msgbox(1)",
+        "file:///etc/passwd",
+        "ftp://example.com/x",
+        "blob:https://example.com/1",
+        "about:blank",
+        "/relative/path",
+        "../up",
+        "page.html",
+        "#anchor",
+        "//evil.example/x",
+        "https://user:pass@example.com/",
+        "https://google.com@evil.example/",
+        "https://google.com\\@evil.example/",
+        "https://",
+        "https:///x",
+        "http://?x",
+        "mailto:",
+        "tel:+123",
+        "https://exa\u{202e}mple.com/",
+        "https://example.com/a\u{2028}b",
+        "https://example.com/a\u{85}b",
+        "https://example.com/a b",
+        "https://example.com/\u{7f}",
+        &long,
+    ];
+    for target in refused {
+        // In angle brackets, which allow spaces, and bare, for a target with none.
+        let inside = target.replace(['<', '>', '\n'], " ");
+        let mut forms = vec![format!("[click me](<{inside}>)")];
+        if !target
+            .contains(|c: char| c.is_whitespace() || c == '(' || c == ')' || c == '<' || c == '>')
+        {
+            forms.push(format!("[click me]({target})"));
+        }
+        for md in forms {
+            let d = doc(&md);
+            assert!(links(&d).is_empty(), "{md:?} -> {:?}", d.blocks);
+            assert!(paras(&d.blocks).concat().contains("click me"), "{md:?}");
+        }
+    }
+}
+
+#[test]
+fn a_target_of_the_longest_size_is_kept_and_one_byte_more_is_not() {
+    let base = "https://example.com/";
+    let fits = format!("{base}{}", "a".repeat(MAX_TARGET - base.len()));
+    assert_eq!(one(&format!("[x](<{fits}>)")).len(), 1);
+    assert!(one(&format!("[x](<{fits}a>)")).is_empty());
+}
+
+#[test]
+fn an_image_is_its_alt_text_and_loads_nothing() {
+    let d = doc(
+        "![a diagram](https://example.com/d.png) ![](https://example.com/e.png) ![x *y* `z`](data:image/png;base64,AAAA)",
+    );
+    let alts: Vec<_> = all_inlines(&d)
+        .into_iter()
+        .filter_map(|n| {
+            if let Inline::Image { alt } = n {
+                Some(alt)
+            } else {
+                None
+            }
+        })
+        .collect();
+    assert_eq!(alts, ["a diagram", "", "x y z"]);
+    assert!(links(&d).is_empty());
+    let json = d.to_json();
+    assert!(
+        !json.contains("example.com") && !json.contains("base64"),
+        "{json}"
+    );
+}
+
+#[test]
+fn an_image_inside_a_link_keeps_the_link() {
+    let d = doc("[![logo](https://example.com/l.png)](https://example.com/home)");
+    assert_eq!(links(&d), [pair("https://example.com/home", "logo")]);
+}
+
+// ── raw HTML ─────────────────────────────────────────────────────────────────
+
+const HOSTILE_HTML: &[&str] = &[
+    "<script>alert(1)</script>",
+    "<img src=x onerror=alert(1)>",
+    "<svg onload=alert(1)><script>1</script></svg>",
+    "<iframe src=javascript:alert(1)></iframe>",
+    "<a href=\"javascript:alert(1)\">x</a>",
+    "<style>*{background:url(https://evil.example/x)}</style>",
+    "<form action=https://evil.example><input name=p></form>",
+    "<details open ontoggle=alert(1)>",
+    "<!-- comment --><b>bold</b>",
+    "<math><mi xlink:href=data:x,alert(1)>",
+    "<meta http-equiv=refresh content='0;url=https://evil.example'>",
+    "<link rel=stylesheet href=https://evil.example/x.css>",
+    "<base href=https://evil.example/>",
+    "</p><script>alert(1)</script>",
+];
+
+#[test]
+fn raw_html_is_text_exactly_as_written() {
+    for html in HOSTILE_HTML {
+        let d = doc(html);
+        // A block of HTML, or a paragraph that has tags in it: the characters are all there is.
+        let shown = match d.blocks.as_slice() {
+            [Block::Raw(s)] => s.clone(),
+            [Block::Para(c)] => text(c),
+            other => panic!("{html}: {other:?}"),
+        };
+        assert_eq!(shown, *html);
+        assert!(
+            all_inlines(&d).iter().all(|n| matches!(n, Inline::Text(_))),
+            "{html}"
+        );
+    }
+}
+
+#[test]
+fn raw_html_is_text_inside_every_construct() {
+    let html = "<img src=x onerror=alert(1)>";
+    let wrapped = [
+        format!("# {html}"),
+        format!("> {html}"),
+        format!("- {html}"),
+        format!("1. {html}"),
+        format!("*{html}*"),
+        format!("**{html}**"),
+        format!("[{html}](https://example.com)"),
+        format!("![{html}](https://example.com/i.png)"),
+        format!("| {html} |\n|---|\n| {html} |"),
+        format!("`{html}`"),
+        format!("```\n{html}\n```"),
+        format!("    {html}"),
+        format!("a {html} b"),
+    ];
+    for md in wrapped {
+        let d = doc(&md);
+        // Whatever the shape, the tag's characters are somewhere as text,
+        // and nothing but the node kinds of this tree exists.
+        let json = d.to_json();
+        assert!(
+            json.contains("<img src=x onerror=alert(1)>") || json.contains("<img"),
+            "{md}: {json}"
+        );
+        let v: serde_json::Value = serde_json::from_str(&json).unwrap();
+        assert_kinds(&v);
+    }
+}
+
+/// Only the node kinds the page draws, and only the keys it reads.
+fn assert_kinds(v: &serde_json::Value) {
+    const KINDS: &[&str] = &[
+        "text", "code", "br", "em", "strong", "del", "link", "image", "p", "h", "hr", "quote",
+        "list", "table", "raw",
+    ];
+    const KEYS: &[&str] = &[
+        "t", "s", "c", "url", "alt", "level", "ordered", "start", "tight", "items", "align",
+        "head", "rows",
+    ];
+    match v {
+        serde_json::Value::Object(m) => {
+            if let Some(t) = m.get("t") {
+                assert!(KINDS.contains(&t.as_str().unwrap()), "{t}");
+                assert!(m.keys().all(|k| KEYS.contains(&k.as_str())), "{m:?}");
+            }
+            m.values().for_each(assert_kinds);
+        }
+        serde_json::Value::Array(a) => a.iter().for_each(assert_kinds),
+        _ => {}
+    }
+}
+
+// ── the JSON the page reads ──────────────────────────────────────────────────
+
+#[test]
+fn the_json_is_valid_and_has_the_shape_the_page_reads() {
+    let d = doc(
+        "# H\n\ntext **b** [l](https://example.com/\"q\")\n\n- a\n- b\n\n| x | y |\n|:-|-:|\n| 1 | 2 |\n\n> q\n\n```\ncode\n```\n\n---\n\n<div>raw</div>\n",
+    );
+    let v: serde_json::Value = serde_json::from_str(&d.to_json()).unwrap();
+    assert_eq!(v["truncated"], false);
+    let kinds: Vec<_> = v["blocks"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .map(|b| b["t"].as_str().unwrap())
+        .collect();
+    assert_eq!(
+        kinds,
+        ["h", "p", "list", "table", "quote", "code", "hr", "raw"]
+    );
+    assert_eq!(
+        v["blocks"][0],
+        serde_json::json!({"t": "h", "level": 1, "c": [{"t": "text", "s": "H"}]})
+    );
+    assert_eq!(v["blocks"][2]["tight"], true);
+    assert_eq!(v["blocks"][2]["start"], 1);
+    assert_eq!(
+        v["blocks"][3]["align"],
+        serde_json::json!(["left", "right"])
+    );
+    assert_eq!(v["blocks"][3]["head"][0][0]["s"], "x");
+    // The quotes in the target are the link's own, not a break out of the string.
+    assert_eq!(v["blocks"][1]["c"][3]["url"], "https://example.com/\"q\"");
+    assert_eq!(v["blocks"][7]["s"], "<div>raw</div>");
+    assert_kinds(&v);
+}
+
+#[test]
+fn strings_survive_the_json() {
+    let nasty =
+        "quote \" slash \\ tab \t nul \u{0} bell \u{7} sep \u{2028} emoji \u{1F600} close ]}";
+    let d = doc(&format!("```\n{nasty}\n```"));
+    let v: serde_json::Value = serde_json::from_str(&d.to_json()).unwrap();
+    assert_eq!(v["blocks"][0]["s"], nasty);
+}
+
+// ── limits ───────────────────────────────────────────────────────────────────
+
+fn depth(blocks: &[Block]) -> usize {
+    blocks
+        .iter()
+        .map(|b| match b {
+            Block::Quote(c) => 1 + depth(c),
+            Block::List { items, .. } => 1 + items.iter().map(|i| depth(i)).max().unwrap_or(0),
+            _ => 0,
+        })
+        .max()
+        .unwrap_or(0)
+}
+
+fn inline_depth(c: &[Inline]) -> usize {
+    c.iter()
+        .map(|n| match n {
+            Inline::Em(c)
+            | Inline::Strong(c)
+            | Inline::Del(c)
+            | Inline::Link { children: c, .. } => 1 + inline_depth(c),
+            _ => 0,
+        })
+        .max()
+        .unwrap_or(0)
+}
+
+fn raws(blocks: &[Block], out: &mut String) {
+    for b in blocks {
+        match b {
+            Block::Raw(s) => out.push_str(s),
+            Block::Quote(c) => raws(c, out),
+            Block::List { items, .. } => items.iter().for_each(|i| raws(i, out)),
+            _ => {}
+        }
+    }
+}
+
+#[test]
+fn quotes_stop_nesting_at_the_limit_and_the_rest_is_text() {
+    let d = doc(&format!("{}deep text", "> ".repeat(50)));
+    assert_eq!(depth(&d.blocks), MAX_BLOCK_DEPTH);
+    let mut raw = String::new();
+    raws(&d.blocks, &mut raw);
+    assert!(raw.contains("deep text"), "{:?}", d.blocks);
+}
+
+#[test]
+fn lists_stop_nesting_at_the_limit_and_the_rest_is_text() {
+    let md: Vec<String> = (0..50)
+        .map(|i| format!("{}- level{i}", "  ".repeat(i)))
+        .collect();
+    let d = doc(&md.join("\n"));
+    assert_eq!(depth(&d.blocks), MAX_BLOCK_DEPTH);
+    let mut raw = String::new();
+    raws(&d.blocks, &mut raw);
+    assert!(raw.contains("level49"), "{raw:?}");
+    assert!(
+        raw.contains("level10") && !raw.contains("level9"),
+        "{raw:?}"
+    );
+}
+
+#[test]
+fn quotes_and_lists_count_toward_one_limit() {
+    let d = doc(&format!("{}x", "> - ".repeat(30)));
+    assert_eq!(depth(&d.blocks), MAX_BLOCK_DEPTH);
+}
+
+#[test]
+fn inlines_stop_nesting_at_the_limit_and_keep_their_text() {
+    let d = doc(&format!("{}x{}", "*a **b ".repeat(60), "** b* ".repeat(60)));
+    let Block::Para(c) = &d.blocks[0] else {
+        panic!("{:?}", d.blocks)
+    };
+    assert!(inline_depth(c) <= MAX_INLINE_DEPTH, "{}", inline_depth(c));
+    assert!(text(c).contains('x'));
+    // And links nested in emphasis nested in links.
+    let d = doc(&format!(
+        "{}x{}",
+        "*[a ".repeat(100),
+        "](https://example.com)*".repeat(100)
+    ));
+    let Block::Para(c) = &d.blocks[0] else {
+        panic!("{:?}", d.blocks)
+    };
+    assert!(inline_depth(c) <= MAX_INLINE_DEPTH);
+}
+
+#[test]
+fn a_document_stops_at_the_node_limit_and_says_so() {
+    let d = doc(&"x *y*\n\n".repeat(150_000));
+    assert!(d.truncated);
+    assert!(d.blocks.len() < 150_000 && d.blocks.len() > 1000);
+    assert!(d.to_json().ends_with("\"truncated\":true}"));
+    assert!(!doc("# small").truncated);
+}
+
+#[test]
+fn what_was_open_at_the_node_limit_is_kept() {
+    let d = doc(&"- a *b*\n".repeat(200_000));
+    assert!(d.truncated);
+    let Block::List { items, .. } = &d.blocks[0] else {
+        panic!("{} blocks", d.blocks.len())
+    };
+    assert!(
+        items.len() > 1000 && items.len() < 200_000,
+        "{}",
+        items.len()
+    );
+}
+
+#[test]
+fn the_node_limit_counts_table_cells_and_the_padding_of_short_rows() {
+    let head = format!(
+        "|{}\n|{}\n",
+        "a|".repeat(MAX_COLUMNS),
+        "-|".repeat(MAX_COLUMNS)
+    );
+    let d = doc(&format!("{head}{}", "|1|\n".repeat(20_000)));
+    assert!(d.truncated);
+    let Block::Table { rows, .. } = &d.blocks[0] else {
+        panic!("{:?}", d.blocks.len())
+    };
+    assert!(
+        rows.len() * MAX_COLUMNS <= MAX_NODES + MAX_COLUMNS,
+        "{}",
+        rows.len()
+    );
+}
+
+#[test]
+fn a_table_keeps_at_most_the_column_limit() {
+    let n = MAX_COLUMNS + 40;
+    let md = format!(
+        "|{}\n|{}\n|{}\n",
+        "a|".repeat(n),
+        "-|".repeat(n),
+        "b|".repeat(n)
+    );
+    let d = doc(&md);
+    let Block::Table { align, head, rows } = &d.blocks[0] else {
+        panic!("{:?}", d.blocks)
+    };
+    assert_eq!(
+        (align.len(), head.len(), rows[0].len()),
+        (MAX_COLUMNS, MAX_COLUMNS, MAX_COLUMNS)
+    );
+}
+
+#[test]
+fn a_list_start_is_nine_digits_at_most() {
+    let d = doc("999999999. a\n\n1234567890. b");
+    assert!(matches!(
+        d.blocks[0],
+        Block::List {
+            start: 999_999_999,
+            ..
+        }
+    ));
+    assert!(
+        d.blocks
+            .iter()
+            .all(|b| !matches!(b, Block::List { start, .. } if *start > 999_999_999))
+    );
+}
+
+fn rep(n: usize, s: &str) -> String {
+    s.repeat(n)
+}
+
+fn hostile() -> Vec<(&'static str, String)> {
+    let lines =
+        |n: usize, f: &dyn Fn(usize) -> String| (0..n).map(f).collect::<Vec<_>>().join("\n");
+    vec![
+        ("100k stars", rep(100_000, "*")),
+        ("100k stars and letters", rep(50_000, "*a ")),
+        ("100k underscores", rep(100_000, "_")),
+        ("closers only", rep(40, &format!("{}\n", rep(3000, "a* ")))),
+        (
+            "closers that fail the rule of three",
+            rep(40, &format!("{}\n", rep(1500, "a** b* "))),
+        ),
+        (
+            "underscore closers",
+            rep(40, &format!("{}\n", rep(3000, "a_ "))),
+        ),
+        ("alternating emphasis", rep(50_000, "*a_b")),
+        ("100k open brackets", rep(100_000, "[")),
+        ("100k link openers", rep(100_000, "[](")),
+        (
+            "link openers filling the limit",
+            rep(200, &format!("{}\n", rep(3333, "[]("))),
+        ),
+        ("100k image openers", rep(100_000, "![")),
+        (
+            "brackets then parens",
+            rep(50_000, "[a]") + &rep(50_000, "("),
+        ),
+        ("nested links", rep(20_000, "[a](") + &rep(20_000, ")")),
+        ("100k backticks", rep(100_000, "`")),
+        (
+            "ascending backtick runs",
+            (0..1500)
+                .map(|i| "`".repeat(i + 1))
+                .collect::<Vec<_>>()
+                .join(" "),
+        ),
+        ("100k angle brackets", rep(100_000, "<")),
+        ("autolink openers", rep(30_000, "<http://a")),
+        ("100k backslashes", rep(100_000, "\\")),
+        ("100k tildes", rep(100_000, "~~a")),
+        ("one 1 MB line", rep(1_000_000, "a")),
+        ("one 1 MB line of words", rep(200_000, "word ")),
+        ("100k quote markers", rep(100_000, ">")),
+        ("10k nested quotes", rep(10_000, "> ") + "deep"),
+        (
+            "quote staircase",
+            lines(2000, &|i| format!("{}x", "> ".repeat(i % 40))),
+        ),
+        ("nested list on one line", rep(10_000, "- ") + "deep"),
+        (
+            "list staircase",
+            lines(3000, &|i| format!("{}- item", " ".repeat(2 * (i % 60)))),
+        ),
+        (
+            "ordered list staircase",
+            lines(3000, &|i| format!("{}1. item", " ".repeat(3 * (i % 60)))),
+        ),
+        ("20k tiny items", rep(20_000, "- a\n")),
+        ("20k blank-separated items", rep(20_000, "- a\n\n")),
+        ("50k headings", rep(50_000, "# h\n")),
+        ("50k hr", rep(50_000, "---\n")),
+        (
+            "wide table",
+            format!(
+                "|{}\n|{}\n{}",
+                rep(5000, "a|"),
+                rep(5000, "-|"),
+                rep(2000, &format!("|{}\n", rep(100, "x|")))
+            ),
+        ),
+        (
+            "long table",
+            format!("|a|b|\n|-|-|\n{}", rep(50_000, "|1|2|\n")),
+        ),
+        ("fence storms", rep(30_000, "```\n")),
+        ("setext storms", rep(30_000, "a\n===\n")),
+        ("html storm", rep(30_000, "<div><script>")),
+        (
+            "emphasis inside a link inside a quote",
+            rep(5000, "> [*a **b ") + &rep(5000, "](x)"),
+        ),
+        (
+            "reference definitions used many times",
+            format!("[a]: https://example.com\n\n{}", rep(100_000, "[a] ")),
+        ),
+        ("entities", rep(100_000, "&amp;&#x41;&bogus;")),
+    ]
+}
+
+#[test]
+fn hostile_input_is_bounded_in_time_in_stack_and_in_size() {
+    for (name, md) in hostile() {
+        // The thread's stack is half the 1 MiB a wasm instance has.
+        let started = std::time::Instant::now();
+        let d = std::thread::Builder::new()
+            .stack_size(512 * 1024)
+            .spawn(move || {
+                let d = parse(&md);
+                (depth(&d.blocks), d.to_json().len(), d)
+            })
+            .unwrap()
+            .join()
+            .unwrap_or_else(|_| panic!("{name}: panicked or overflowed the stack"));
+        let elapsed = started.elapsed();
+        assert!(elapsed.as_secs() < 20, "{name}: {elapsed:?}");
+        assert!(d.0 <= MAX_BLOCK_DEPTH, "{name}: {}", d.0);
+        // The tree, as JSON, stays proportionate to the 1 MB inputs.
+        assert!(d.1 < 64 << 20, "{name}: {} bytes", d.1);
+        let mut v = Vec::new();
+        inlines(&d.2.blocks, &mut v);
+        assert!(v.len() <= MAX_NODES + 1, "{name}: {} inlines", v.len());
+    }
+}
+
+#[test]
+fn every_inline_nests_within_the_limit_whatever_the_input() {
+    for (name, md) in hostile() {
+        let d = parse(&md);
+        fn check(blocks: &[Block], name: &str) {
+            for b in blocks {
+                match b {
+                    Block::Para(c) | Block::Heading { children: c, .. } => {
+                        assert!(inline_depth(c) <= MAX_INLINE_DEPTH, "{name}")
+                    }
+                    Block::Quote(c) => check(c, name),
+                    Block::List { items, .. } => items.iter().for_each(|i| check(i, name)),
+                    Block::Table { head, rows, .. } => head
+                        .iter()
+                        .chain(rows.iter().flatten())
+                        .for_each(|c| assert!(inline_depth(c) <= MAX_INLINE_DEPTH, "{name}")),
+                    _ => {}
+                }
+            }
+        }
+        check(&d.blocks, name);
+    }
+}
+
+#[test]
+fn nothing_panics_on_odd_bytes_and_shapes() {
+    for md in [
+        "",
+        "\n",
+        "\0",
+        "\u{FEFF}# bom",
+        "\r\n\r\n",
+        "\r",
+        "a\r\nb\rc\nd",
+        "|",
+        "|a|\n|-|",
+        "> ",
+        "- ",
+        "1.",
+        "```",
+        "[",
+        "![",
+        "<",
+        "&",
+        "\\",
+        "\u{1F600}".repeat(1000).as_str(),
+    ] {
+        let d = parse(md);
+        let _ = d.to_json();
+    }
+}
diff --git a/crates/exav-render/tests/markdown_text.rs b/crates/exav-render/tests/markdown_text.rs
new file mode 100644
index 00000000..8e24ee77
--- /dev/null
+++ b/crates/exav-render/tests/markdown_text.rs
@@ -0,0 +1,148 @@
+//! The text of a Markdown document as a reader sees it, for the scanner and
+//! for search: `markdown::visible_text`.
+
+use exav_render::markdown::visible_text;
+
+fn text(md: &str) -> String {
+    visible_text(md, 1 << 20).text
+}
+
+#[test]
+fn blocks_are_lines_and_marks_are_gone() {
+    assert_eq!(
+        text(
+            "# Title\n\nSome *em* and **strong** and ~~gone~~ and `code`.\n\n> quoted\n\n- one\n- two\n\n3. three\n\n---\n\nend\n"
+        ),
+        "Title\nSome em and strong and gone and code.\nquoted\none\ntwo\nthree\nend\n"
+    );
+}
+
+#[test]
+fn code_and_raw_html_are_text_as_written() {
+    assert_eq!(text("```\nlet x = <b>1</b>;\n```\n"), "let x = <b>1</b>;\n");
+    assert_eq!(
+        text("<div onclick=\"x()\">hello</div>\n"),
+        "<div onclick=\"x()\">hello</div>\n"
+    );
+    assert_eq!(text("a <i>b</i> c"), "a <i>b</i> c\n");
+}
+
+#[test]
+fn entities_are_decoded_and_breaks_are_lines() {
+    assert_eq!(
+        text("fish &amp; chips &hearts;\nsecond  \nthird"),
+        "fish & chips \u{2665}\nsecond\nthird\n"
+    );
+}
+
+#[test]
+fn a_table_row_is_a_line_with_its_cells_apart_by_tabs() {
+    assert_eq!(
+        text("| A | B |\n|---|---|\n| 1 | 2 |\n| 3 |\n"),
+        "A\tB\n1\t2\n3\t\n"
+    );
+}
+
+#[test]
+fn a_link_shows_its_label_and_where_it_goes() {
+    assert_eq!(
+        text("[docs](https://example.com/a)"),
+        "docs (https://example.com/a)\n"
+    );
+    // A label that is the address says it once.
+    assert_eq!(text("<https://example.com/x>"), "https://example.com/x\n");
+    assert_eq!(text("<me@example.com>"), "me@example.com\n");
+    // Whatever the target is: a scanner looks for where the reader is led.
+    assert_eq!(
+        text("[click](javascript:alert(1)) [bank](https://bank.example@evil.example/)"),
+        "click (javascript:alert(1)) bank (https://bank.example@evil.example/)\n"
+    );
+    assert_eq!(
+        text("[ref][1]\n\n[1]: https://example.com/r"),
+        "ref (https://example.com/r)\n"
+    );
+}
+
+#[test]
+fn a_label_that_names_one_site_over_another_is_there_to_see() {
+    let t = text("[https://www.paypal.com/login](https://evil.example/steal)");
+    assert!(
+        t.contains("https://www.paypal.com/login") && t.contains("(https://evil.example/steal)"),
+        "{t}"
+    );
+}
+
+#[test]
+fn an_image_is_its_alt_text() {
+    assert_eq!(
+        text("![a *diagram*](https://example.com/d.png)"),
+        "a diagram\n"
+    );
+}
+
+#[test]
+fn the_text_is_cut_at_the_limit_on_a_character_boundary() {
+    let v = visible_text(&"\u{e9}".repeat(1000), 101);
+    assert!(v.truncated);
+    assert_eq!(v.text.len(), 100);
+    assert!(!visible_text("short", 100).truncated);
+}
+
+#[test]
+fn a_reference_used_many_times_cannot_make_more_than_the_limit() {
+    let md = format!(
+        "[a]: https://example.com/{}\n\n{}",
+        "x".repeat(1000),
+        "[a] ".repeat(50_000)
+    );
+    let v = visible_text(&md, 64 * 1024);
+    assert!(v.truncated);
+    assert!(v.text.len() <= 64 * 1024);
+}
+
+#[test]
+fn hostile_input_is_bounded_in_time_and_stack() {
+    let inputs = [
+        "> ".repeat(100_000) + "x",
+        "- ".repeat(50_000) + "x",
+        "[".repeat(100_000),
+        "*a ".repeat(100_000),
+        "<".repeat(100_000),
+        "|a".repeat(50_000) + "|\n" + &"|-".repeat(50_000) + "|\n" + &"|x".repeat(50_000),
+    ];
+    for md in inputs {
+        let started = std::time::Instant::now();
+        std::thread::Builder::new()
+            .stack_size(512 * 1024)
+            .spawn(move || visible_text(&md, 1 << 22).text.len())
+            .unwrap()
+            .join()
+            .expect("no panic, no stack overflow");
+        assert!(started.elapsed().as_secs() < 20, "{:?}", started.elapsed());
+    }
+}
+
+#[test]
+fn nothing_panics_on_odd_input() {
+    for md in [
+        "",
+        "\n",
+        "\0",
+        "\r\n\r\n",
+        "|",
+        "|a|\n|-|",
+        "> ",
+        "- ",
+        "[",
+        "![",
+        "<",
+        "&",
+        "\\",
+        "[a]()",
+        "[](x)",
+        "[a](b",
+        "\u{1F600}".repeat(100).as_str(),
+    ] {
+        let _ = visible_text(md, 1 << 20);
+    }
+}
diff --git a/crates/exav-render/tests/mesh_common/mod.rs b/crates/exav-render/tests/mesh_common/mod.rs
new file mode 100644
index 00000000..a318b7fd
--- /dev/null
+++ b/crates/exav-render/tests/mesh_common/mod.rs
@@ -0,0 +1,190 @@
+//! Shared by the OBJ, PLY and glTF tests: the shapes they are built from,
+//! and what is measured on a [`Scene`] to check it. The measures are
+//! computed here from the output's triangles, not from anything a reader
+//! reports.
+#![allow(dead_code)]
+
+use std::time::{Duration, Instant};
+
+use exav_render::mesh::Scene;
+
+pub type P = [f64; 3];
+
+/// The unit cube's corners, and its six faces as quads, counterclockwise
+/// seen from outside.
+pub const CUBE: [P; 8] = [
+    [0., 0., 0.],
+    [1., 0., 0.],
+    [1., 1., 0.],
+    [0., 1., 0.],
+    [0., 0., 1.],
+    [1., 0., 1.],
+    [1., 1., 1.],
+    [0., 1., 1.],
+];
+pub const CUBE_QUADS: [[usize; 4]; 6] = [
+    [0, 3, 2, 1],
+    [4, 5, 6, 7],
+    [0, 1, 5, 4],
+    [1, 2, 6, 5],
+    [2, 3, 7, 6],
+    [3, 0, 4, 7],
+];
+
+/// A tetrahedron of volume 1/6 and its four faces, outward.
+pub const TETRA: [P; 4] = [[0., 0., 0.], [1., 0., 0.], [0., 1., 0.], [0., 0., 1.]];
+pub const TETRA_FACES: [[usize; 3]; 4] = [[0, 2, 1], [0, 1, 3], [0, 3, 2], [1, 2, 3]];
+
+/// Every triangle of the scene, from its corners.
+pub fn triangles(s: &Scene) -> Vec<[P; 3]> {
+    let mut out = Vec::new();
+    for b in &s.batches {
+        let p = |i: u32| {
+            let k = i as usize * 3;
+            [
+                f64::from(b.positions[k]),
+                f64::from(b.positions[k + 1]),
+                f64::from(b.positions[k + 2]),
+            ]
+        };
+        for t in b.indices.chunks(3) {
+            out.push([p(t[0]), p(t[1]), p(t[2])]);
+        }
+    }
+    out
+}
+
+fn cross(a: P, b: P) -> P {
+    [
+        a[1] * b[2] - a[2] * b[1],
+        a[2] * b[0] - a[0] * b[2],
+        a[0] * b[1] - a[1] * b[0],
+    ]
+}
+
+fn sub(a: P, b: P) -> P {
+    [a[0] - b[0], a[1] - b[1], a[2] - b[2]]
+}
+
+/// The volume a closed, outward-wound mesh encloses.
+pub fn volume(s: &Scene) -> f64 {
+    triangles(s)
+        .iter()
+        .map(|t| {
+            let c = cross(t[1], t[2]);
+            (t[0][0] * c[0] + t[0][1] * c[1] + t[0][2] * c[2]) / 6.0
+        })
+        .sum()
+}
+
+/// The sum of the triangles' areas.
+pub fn area(s: &Scene) -> f64 {
+    triangles(s)
+        .iter()
+        .map(|t| {
+            let n = cross(sub(t[1], t[0]), sub(t[2], t[0]));
+            (n[0] * n[0] + n[1] * n[1] + n[2] * n[2]).sqrt() / 2.0
+        })
+        .sum()
+}
+
+/// Smallest and largest corner, from the triangles.
+pub fn extent(s: &Scene) -> [P; 2] {
+    let mut lo = [f64::INFINITY; 3];
+    let mut hi = [f64::NEG_INFINITY; 3];
+    for t in triangles(s) {
+        for p in t {
+            for k in 0..3 {
+                lo[k] = lo[k].min(p[k]);
+                hi[k] = hi[k].max(p[k]);
+            }
+        }
+    }
+    [lo, hi]
+}
+
+pub fn near(a: f64, b: f64) -> bool {
+    (a - b).abs() < 1e-5
+}
+
+pub fn assert_near(a: f64, b: f64, what: &str) {
+    assert!(near(a, b), "{what}: {a} against {b}");
+}
+
+/// What a scene must always satisfy, however hostile the input: indices in
+/// range, everything finite, bounds that match the triangles, normals of
+/// unit length, elements inside the batch.
+pub fn assert_sound(s: &Scene) {
+    for b in &s.batches {
+        assert_eq!(b.positions.len(), b.normals.len());
+        assert_eq!(b.indices.len() % 3, 0);
+        let vertices = (b.positions.len() / 3) as u32;
+        assert!(b.indices.iter().all(|&i| i < vertices));
+        assert!(b.positions.iter().all(|v| v.is_finite()));
+        for n in b.normals.chunks(3) {
+            let len = n.iter().map(|v| v * v).sum::<f32>().sqrt();
+            assert!((len - 1.0).abs() < 1e-3, "normal {n:?}");
+        }
+        if let Some(c) = &b.colors {
+            assert_eq!(c.len(), b.positions.len());
+        }
+    }
+    for e in &s.elements {
+        for r in &e.ranges {
+            let b = &s.batches[r.batch as usize];
+            assert!((r.first + r.count) as usize <= b.indices.len());
+            assert_eq!(r.first % 3, 0);
+            assert_eq!(r.count % 3, 0);
+        }
+    }
+    if let Some(b) = s.bounds {
+        assert!(b.iter().flatten().all(|v| v.is_finite()));
+    }
+    if s.triangles() > 0 {
+        let [lo, hi] = extent(s);
+        let b = s.bounds.expect("bounds");
+        for k in 0..3 {
+            assert_eq!(f64::from(b[0][k]), lo[k]);
+            assert_eq!(f64::from(b[1][k]), hi[k]);
+        }
+    }
+}
+
+/// Runs `f` and fails if it takes longer than `limit`. Debug builds are
+/// slow: the limits are for hanging, not for speed.
+pub fn within<T>(limit: Duration, what: &str, f: impl FnOnce() -> T) -> T {
+    let start = Instant::now();
+    let out = f();
+    let took = start.elapsed();
+    assert!(took < limit, "{what} took {took:?}");
+    out
+}
+
+/// Feeds `read` the file cut at every length, and with every byte, and
+/// every aligned four bytes, set to extreme values. A reader that panics
+/// fails the test; what it answers is checked to be sound.
+pub fn sweep(bytes: &[u8], read: impl Fn(&[u8]) -> Option<Scene>) {
+    let check = |data: &[u8]| {
+        if let Some(s) = read(data) {
+            assert_sound(&s);
+        }
+    };
+    for len in 0..bytes.len() {
+        check(&bytes[..len]);
+    }
+    let mut copy = bytes.to_vec();
+    for i in 0..bytes.len() {
+        for v in [0x00, 0xff, 0x7f, 0x80] {
+            copy[i] = v;
+            check(&copy);
+        }
+        copy[i] = bytes[i];
+    }
+    for i in 0..bytes.len().saturating_sub(3) {
+        for v in [0xff, 0x7f] {
+            copy[i..i + 4].fill(v);
+            check(&copy);
+        }
+        copy[i..i + 4].copy_from_slice(&bytes[i..i + 4]);
+    }
+}
diff --git a/crates/exav-render/tests/nesting.rs b/crates/exav-render/tests/nesting.rs
new file mode 100644
index 00000000..fc012eb6
--- /dev/null
+++ b/crates/exav-render/tests/nesting.rs
@@ -0,0 +1,852 @@
+//! Documents nested as deep as their parsers allow, and deeper.
+//!
+//! The converters walk a tree with a call per level. The XML parser stops a
+//! tree at `MAX_DEPTH` levels, and RTF and HTML have limits of their own, so
+//! the walk is as deep as that and no deeper: the question is whether each
+//! converter's frames, times that depth, fit the stack of the thread it runs
+//! on (a viewer's worker, a WebAssembly host's one megabyte). Each format is
+//! converted here on a stack of a quarter of that, with the elements that nest
+//! in it repeated to well past the limit and, for a flat file, to a depth the
+//! parser would let through if it let anything. The tests run at the test
+//! profile's `opt-level = 1`; `make stack-frames` reads the frames of release
+//! builds.
+//!
+//! `EXAV_DEBUG_NESTING=<part of a case name>` runs the cases with it in their
+//! name and says which; `EXAV_DEBUG_NESTING_DEPTHS=40,80` and
+//! `EXAV_DEBUG_NESTING_STACK_KB=128` take other depths and stacks: how deep a
+//! case can go on how small a stack is a bisection with them.
+
+#![cfg(all(
+    feature = "office-docs",
+    feature = "office-slides",
+    feature = "office-sheets"
+))]
+
+use std::io::Write;
+use std::time::{Duration, Instant};
+
+/// A quarter of the stack of a WebAssembly host's only thread, the smallest the
+/// converters run on.
+const STACK: usize = 256 * 1024;
+const MEMORY: u64 = 64 << 20;
+
+/// A kind of nesting: its name, and the body nested to a depth.
+type Case = (&'static str, Box<dyn Fn(usize) -> String>);
+
+/// What a conversion came to, under `EXAV_DEBUG_NESTING`.
+fn said(r: Result<(), String>) {
+    if std::env::var_os("EXAV_DEBUG_NESTING").is_some() {
+        eprintln!("  {r:?}");
+    }
+}
+
+fn docs(f: exav_render::docs::Format) -> impl Fn(&[u8]) + Send + Clone + 'static {
+    move |d| {
+        let l = exav_render::docs::Limits::default().with_max_memory(MEMORY);
+        let r = exav_render::docs::convert(d, f, &l);
+        said(r.map(|_| ()).map_err(|e| e.to_string()));
+    }
+}
+
+fn sheets(f: exav_render::sheets::Format) -> impl Fn(&[u8]) + Send + Clone + 'static {
+    move |d| {
+        let l = exav_render::sheets::Limits::default().with_max_memory(MEMORY);
+        let r = exav_render::sheets::convert(d, f, &l);
+        said(r.map(|_| ()).map_err(|e| e.to_string()));
+    }
+}
+
+fn slides(f: exav_render::slides::Format) -> impl Fn(&[u8]) + Send + Clone + 'static {
+    move |d| {
+        let l = exav_render::slides::Limits::default().with_max_memory(MEMORY);
+        let r = exav_render::slides::convert(d, f, &l);
+        said(r.map(|_| ()).map_err(|e| e.to_string()));
+    }
+}
+
+fn on_small_stack(
+    name: String,
+    convert: impl Fn(&[u8]) + Send + 'static,
+    data: Vec<u8>,
+) -> Option<String> {
+    // `EXAV_DEBUG_NESTING=<part of a case name>` runs the cases whose name has
+    // it, and says which, since a stack overflow aborts the process.
+    if let Ok(only) = std::env::var("EXAV_DEBUG_NESTING") {
+        if !name.contains(&only) {
+            return None;
+        }
+        eprintln!("{name}");
+    }
+    let stack = std::env::var("EXAV_DEBUG_NESTING_STACK_KB")
+        .ok()
+        .and_then(|v| v.parse::<usize>().ok())
+        .map_or(STACK, |kb| kb << 10);
+    let started = Instant::now();
+    let r = std::thread::Builder::new()
+        .stack_size(stack)
+        .spawn(move || convert(&data))
+        .unwrap()
+        .join();
+    match r {
+        Err(_) => Some(format!("{name}: overflowed its stack or panicked")),
+        Ok(()) if started.elapsed() > Duration::from_secs(20) => Some(format!(
+            "{name}: took {:.1} s",
+            started.elapsed().as_secs_f64()
+        )),
+        Ok(()) => None,
+    }
+}
+
+fn assert_all(findings: Vec<Option<String>>) {
+    let findings: Vec<String> = findings.into_iter().flatten().collect();
+    assert!(findings.is_empty(), "\n{}", findings.join("\n"));
+}
+
+const ODF_NS: &str = "xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" \
+    xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" \
+    xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\" \
+    xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\" \
+    xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\" \
+    xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\" \
+    xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\" \
+    xmlns:xlink=\"http://www.w3.org/1999/xlink\" \
+    xmlns:presentation=\"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0\" \
+    xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\" \
+    xmlns:dc=\"http://purl.org/dc/elements/1.1/\" office:version=\"1.2\"";
+
+/// `open` repeated `depth` times, then `inner`, then the matching `close`.
+fn nest(open: &str, close: &str, inner: &str, depth: usize) -> String {
+    format!("{}{inner}{}", open.repeat(depth), close.repeat(depth))
+}
+
+/// A zipped ODF package of one `content.xml`.
+fn odf_zip(mime: &str, content: &str) -> Vec<u8> {
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    let stored =
+        zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    z.start_file("mimetype", stored).unwrap();
+    z.write_all(mime.as_bytes()).unwrap();
+    z.start_file("content.xml", zip::write::SimpleFileOptions::default())
+        .unwrap();
+    z.write_all(content.as_bytes()).unwrap();
+    z.finish().unwrap().into_inner()
+}
+
+/// The documents of an ODF body kind (`text`, `spreadsheet`, `presentation`,
+/// `drawing`) with `body_of(depth)` as the body, as flat and as packaged.
+fn odf(kind: &str, body: String) -> (String, String) {
+    let flat = format!(
+        "<?xml version=\"1.0\"?><office:document {ODF_NS} office:mimetype=\"application/vnd.oasis.opendocument.{kind}\">\
+         <office:body><office:{kind}>{body}</office:{kind}></office:body></office:document>"
+    );
+    let content = format!(
+        "<?xml version=\"1.0\"?><office:document-content {ODF_NS}>\
+         <office:body><office:{kind}>{body}</office:{kind}></office:body></office:document-content>"
+    );
+    (flat, content)
+}
+
+/// The depths tried: inside the limit, at it, and past it.
+/// `EXAV_DEBUG_NESTING_DEPTHS=40,80` takes others.
+fn depths() -> Vec<usize> {
+    match std::env::var("EXAV_DEBUG_NESTING_DEPTHS") {
+        Ok(v) => v.split(',').filter_map(|d| d.parse().ok()).collect(),
+        Err(_) => vec![120, 250, 5_000],
+    }
+}
+
+#[test]
+fn odf_text() {
+    let shapes: Vec<Case> = vec![
+        (
+            "lists",
+            Box::new(|d| {
+                nest(
+                    "<text:list><text:list-item>",
+                    "</text:list-item></text:list>",
+                    "<text:p>x</text:p>",
+                    d,
+                )
+            }),
+        ),
+        (
+            "tables",
+            Box::new(|d| {
+                nest(
+                    "<table:table><table:table-row><table:table-cell>",
+                    "</table:table-cell></table:table-row></table:table>",
+                    "<text:p>x</text:p>",
+                    d,
+                )
+            }),
+        ),
+        (
+            "spans",
+            Box::new(|d| {
+                format!(
+                    "<text:p>{}</text:p>",
+                    nest("<text:span>", "</text:span>", "x", d)
+                )
+            }),
+        ),
+        (
+            "links",
+            Box::new(|d| {
+                format!(
+                    "<text:p>{}</text:p>",
+                    nest("<text:a xlink:href=\"http://a\">", "</text:a>", "x", d)
+                )
+            }),
+        ),
+        (
+            "sections",
+            Box::new(|d| nest("<text:section>", "</text:section>", "<text:p>x</text:p>", d)),
+        ),
+        (
+            "text boxes",
+            Box::new(|d| {
+                format!(
+                    "<text:p>{}</text:p>",
+                    nest(
+                        "<draw:frame><draw:text-box>",
+                        "</draw:text-box></draw:frame>",
+                        "<text:p>x</text:p>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "notes",
+            Box::new(|d| {
+                format!(
+                    "<text:p>{}</text:p>",
+                    nest(
+                        "<text:note><text:note-body><text:p>",
+                        "</text:p></text:note-body></text:note>",
+                        "x",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "groups",
+            Box::new(|d| {
+                format!(
+                    "<text:p>{}</text:p>",
+                    nest(
+                        "<draw:g>",
+                        "</draw:g>",
+                        "<draw:rect svg:width=\"1cm\" svg:height=\"1cm\"/>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "tracked changes",
+            Box::new(|d| {
+                nest(
+                    "<text:tracked-changes><text:changed-region>",
+                    "</text:changed-region></text:tracked-changes>",
+                    "",
+                    d,
+                )
+            }),
+        ),
+        (
+            "headings",
+            Box::new(|d| nest("<text:h>", "</text:h>", "x", d)),
+        ),
+    ];
+    let mut findings = vec![];
+    for (name, body) in &shapes {
+        for depth in depths() {
+            let (flat, content) = odf("text", body(depth));
+            let label = |k: &str| format!("{k} {name} x{depth}");
+            findings.push(on_small_stack(
+                label("fodt"),
+                docs(exav_render::docs::Format::Fodt),
+                flat.into_bytes(),
+            ));
+            findings.push(on_small_stack(
+                label("odt"),
+                docs(exav_render::docs::Format::Odt),
+                odf_zip("application/vnd.oasis.opendocument.text", &content),
+            ));
+        }
+    }
+    assert_all(findings);
+}
+
+#[test]
+fn odf_spreadsheets() {
+    let cell = |inner: &str| {
+        format!("<table:table-row><table:table-cell>{inner}</table:table-cell></table:table-row>")
+    };
+    let shapes: Vec<Case> = vec![
+        (
+            "tables",
+            Box::new(move |d| {
+                format!(
+                    "<table:table>{}</table:table>",
+                    nest(
+                        "<table:table-row><table:table-cell><table:table>",
+                        "</table:table></table:table-cell></table:table-row>",
+                        "",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "groups",
+            Box::new(move |d| {
+                format!(
+                    "<table:table>{}</table:table>",
+                    cell(&nest(
+                        "<draw:g>",
+                        "</draw:g>",
+                        "<draw:rect svg:width=\"1cm\" svg:height=\"1cm\"/>",
+                        d
+                    ))
+                )
+            }),
+        ),
+        (
+            "frames",
+            Box::new(move |d| {
+                format!(
+                    "<table:table>{}</table:table>",
+                    cell(&nest(
+                        "<draw:frame><draw:text-box>",
+                        "</draw:text-box></draw:frame>",
+                        "<text:p>x</text:p>",
+                        d
+                    ))
+                )
+            }),
+        ),
+        (
+            "row groups",
+            Box::new(|d| {
+                format!(
+                    "<table:table>{}</table:table>",
+                    nest(
+                        "<table:table-row-group>",
+                        "</table:table-row-group>",
+                        "<table:table-row><table:table-cell/></table:table-row>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "column groups",
+            Box::new(|d| {
+                format!(
+                    "<table:table>{}</table:table>",
+                    nest(
+                        "<table:table-header-columns>",
+                        "</table:table-header-columns>",
+                        "<table:table-column/>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "spans",
+            Box::new(move |d| {
+                format!(
+                    "<table:table>{}</table:table>",
+                    cell(&format!(
+                        "<text:p>{}</text:p>",
+                        nest("<text:span>", "</text:span>", "x", d)
+                    ))
+                )
+            }),
+        ),
+        (
+            "sub-tables",
+            Box::new(|d| {
+                nest(
+                    "<table:table><table:sub-table>",
+                    "</table:sub-table></table:table>",
+                    "",
+                    d,
+                )
+            }),
+        ),
+    ];
+    let mut findings = vec![];
+    for (name, body) in &shapes {
+        for depth in depths() {
+            let (flat, content) = odf("spreadsheet", body(depth));
+            let label = |k: &str| format!("{k} {name} x{depth}");
+            findings.push(on_small_stack(
+                label("fods"),
+                sheets(exav_render::sheets::Format::Fods),
+                flat.into_bytes(),
+            ));
+            findings.push(on_small_stack(
+                label("ods"),
+                sheets(exav_render::sheets::Format::Ods),
+                odf_zip("application/vnd.oasis.opendocument.spreadsheet", &content),
+            ));
+        }
+    }
+    assert_all(findings);
+}
+
+#[test]
+fn odf_drawings_and_presentations() {
+    let page = |inner: &str| format!("<draw:page draw:name=\"p\">{inner}</draw:page>");
+    let shapes: Vec<Case> = vec![
+        (
+            "groups",
+            Box::new(move |d| {
+                page(&nest(
+                    "<draw:g>",
+                    "</draw:g>",
+                    "<draw:rect svg:width=\"1cm\" svg:height=\"1cm\"/>",
+                    d,
+                ))
+            }),
+        ),
+        (
+            "frames",
+            Box::new(move |d| {
+                page(&nest(
+                    "<draw:frame svg:width=\"1cm\" svg:height=\"1cm\"><draw:text-box>",
+                    "</draw:text-box></draw:frame>",
+                    "<text:p>x</text:p>",
+                    d,
+                ))
+            }),
+        ),
+        (
+            "lists",
+            Box::new(move |d| {
+                page(&format!(
+                    "<draw:frame svg:width=\"1cm\" svg:height=\"1cm\"><draw:text-box>{}</draw:text-box></draw:frame>",
+                    nest(
+                        "<text:list><text:list-item>",
+                        "</text:list-item></text:list>",
+                        "<text:p>x</text:p>",
+                        d
+                    )
+                ))
+            }),
+        ),
+        (
+            "spans",
+            Box::new(move |d| {
+                page(&format!(
+                    "<draw:frame svg:width=\"1cm\" svg:height=\"1cm\"><draw:text-box><text:p>{}</text:p></draw:text-box></draw:frame>",
+                    nest("<text:span>", "</text:span>", "x", d)
+                ))
+            }),
+        ),
+        (
+            "connectors",
+            Box::new(move |d| {
+                page(&nest(
+                    "<draw:connector svg:x1=\"0\" svg:y1=\"0\" svg:x2=\"1cm\" svg:y2=\"1cm\">",
+                    "</draw:connector>",
+                    "",
+                    d,
+                ))
+            }),
+        ),
+        (
+            "custom shapes",
+            Box::new(move |d| {
+                page(&nest(
+                    "<draw:custom-shape>",
+                    "</draw:custom-shape>",
+                    "<draw:enhanced-geometry draw:enhanced-path=\"M 0 0 L 1 1 N\"/>",
+                    d,
+                ))
+            }),
+        ),
+        (
+            "a formula",
+            Box::new(move |d| {
+                page(&format!(
+                    "<draw:custom-shape><draw:enhanced-geometry draw:enhanced-path=\"M 0 0 L $0 1 N\" draw:equations=\"\"><draw:equation draw:name=\"f0\" draw:formula=\"{}1{}\"/></draw:enhanced-geometry></draw:custom-shape>",
+                    "(".repeat(d),
+                    ")".repeat(d)
+                ))
+            }),
+        ),
+        (
+            "a unary formula",
+            Box::new(move |d| {
+                page(&format!(
+                    "<draw:custom-shape><draw:enhanced-geometry draw:enhanced-path=\"M 0 0 L $0 1 N\"><draw:equation draw:name=\"f0\" draw:formula=\"{}1\"/></draw:enhanced-geometry></draw:custom-shape>",
+                    "-".repeat(d)
+                ))
+            }),
+        ),
+        (
+            "pages",
+            Box::new(move |d| nest("<draw:page draw:name=\"p\">", "</draw:page>", "", d)),
+        ),
+    ];
+    let mut findings = vec![];
+    for (name, body) in &shapes {
+        for depth in depths() {
+            for (kind, flat_f, zip_f) in [
+                (
+                    "presentation",
+                    exav_render::slides::Format::Fodp,
+                    exav_render::slides::Format::Odp,
+                ),
+                (
+                    "drawing",
+                    exav_render::slides::Format::Fodg,
+                    exav_render::slides::Format::Odg,
+                ),
+            ] {
+                let (flat, content) = odf(kind, body(depth));
+                let label = |k: &str| format!("{k} {kind} {name} x{depth}");
+                findings.push(on_small_stack(
+                    label("flat"),
+                    slides(flat_f),
+                    flat.into_bytes(),
+                ));
+                findings.push(on_small_stack(
+                    label("zip"),
+                    slides(zip_f),
+                    odf_zip(
+                        &format!("application/vnd.oasis.opendocument.{kind}"),
+                        &content,
+                    ),
+                ));
+            }
+        }
+    }
+    assert_all(findings);
+}
+
+#[test]
+fn word_2003_xml() {
+    let head = "<?xml version=\"1.0\"?><w:wordDocument xmlns:w=\"http://schemas.microsoft.com/office/word/2003/wordml\" \
+        xmlns:wx=\"http://schemas.microsoft.com/office/word/2003/auxHint\" xmlns:v=\"urn:schemas-microsoft-com:vml\">";
+    let shapes: Vec<Case> = vec![
+        (
+            "sections",
+            Box::new(|d| {
+                nest(
+                    "<wx:sect>",
+                    "</wx:sect>",
+                    "<w:p><w:r><w:t>x</w:t></w:r></w:p>",
+                    d,
+                )
+            }),
+        ),
+        (
+            "tables",
+            Box::new(|d| nest("<w:tbl><w:tr><w:tc>", "</w:tc></w:tr></w:tbl>", "<w:p/>", d)),
+        ),
+        (
+            "hyperlinks",
+            Box::new(|d| {
+                format!(
+                    "<w:p>{}</w:p>",
+                    nest(
+                        "<w:hlink w:dest=\"http://a\">",
+                        "</w:hlink>",
+                        "<w:r><w:t>x</w:t></w:r>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "runs",
+            Box::new(|d| format!("<w:p>{}</w:p>", nest("<w:r>", "</w:r>", "<w:t>x</w:t>", d))),
+        ),
+        (
+            "sub-documents",
+            Box::new(|d| nest("<wx:sub-section>", "</wx:sub-section>", "<w:p/>", d)),
+        ),
+        (
+            "text boxes",
+            Box::new(|d| {
+                format!(
+                    "<w:p><w:r>{}</w:r></w:p>",
+                    nest(
+                        "<w:pict><v:shape><v:textbox><w:txbxContent>",
+                        "</w:txbxContent></v:textbox></v:shape></w:pict>",
+                        "<w:p/>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "insertions",
+            Box::new(|d| {
+                format!(
+                    "<w:p>{}</w:p>",
+                    nest(
+                        "<aml:annotation xmlns:aml=\"http://schemas.microsoft.com/aml/2001/core\">",
+                        "</aml:annotation>",
+                        "",
+                        d
+                    )
+                )
+            }),
+        ),
+    ];
+    let mut findings = vec![];
+    for (name, body) in &shapes {
+        for depth in depths() {
+            let xml = format!("{head}<w:body>{}</w:body></w:wordDocument>", body(depth));
+            findings.push(on_small_stack(
+                format!("wml2003 {name} x{depth}"),
+                docs(exav_render::docs::Format::Wml2003),
+                xml.into_bytes(),
+            ));
+        }
+    }
+    assert_all(findings);
+}
+
+#[test]
+fn spreadsheetml_2003() {
+    let head = "<?xml version=\"1.0\"?><Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" \
+        xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:html=\"http://www.w3.org/TR/REC-html40\">";
+    let shapes: Vec<Case> = vec![
+        (
+            "rich text",
+            Box::new(|d| {
+                format!(
+                    "<Worksheet><Table><Row><Cell><ss:Data ss:Type=\"String\">{}</ss:Data></Cell></Row></Table></Worksheet>",
+                    nest("<html:B>", "</html:B>", "x", d)
+                )
+            }),
+        ),
+        (
+            "worksheets",
+            Box::new(|d| {
+                nest(
+                    "<Worksheet><Table><Row><Cell>",
+                    "</Cell></Row></Table></Worksheet>",
+                    "",
+                    d,
+                )
+            }),
+        ),
+        (
+            "names",
+            Box::new(|d| {
+                format!(
+                    "<Names>{}</Names>",
+                    nest("<NamedRange>", "</NamedRange>", "", d)
+                )
+            }),
+        ),
+        (
+            "comments",
+            Box::new(|d| {
+                format!(
+                    "<Worksheet><Table><Row><Cell><Comment>{}</Comment></Cell></Row></Table></Worksheet>",
+                    nest("<ss:Data>", "</ss:Data>", "x", d)
+                )
+            }),
+        ),
+        (
+            "styles",
+            Box::new(|d| format!("<Styles>{}</Styles>", nest("<Style>", "</Style>", "", d))),
+        ),
+    ];
+    let mut findings = vec![];
+    for (name, body) in &shapes {
+        for depth in depths() {
+            let xml = format!("{head}{}</Workbook>", body(depth));
+            findings.push(on_small_stack(
+                format!("xmlss {name} x{depth}"),
+                sheets(exav_render::sheets::Format::SpreadsheetMl),
+                xml.into_bytes(),
+            ));
+        }
+    }
+    assert_all(findings);
+}
+
+#[test]
+fn html_and_rtf_and_sylk() {
+    let n = 100_000;
+    let docs_html = docs(exav_render::docs::Format::Html);
+    let sheets_html = sheets(exav_render::sheets::Format::Html);
+    let rtf = docs(exav_render::docs::Format::Rtf);
+    let sylk = sheets(exav_render::sheets::Format::Sylk);
+    let mut findings = vec![];
+    let html_shapes = [
+        ("tables", "<table><tr><td>"),
+        ("lists", "<ul><li>"),
+        ("divs", "<div>"),
+        ("spans", "<span><b><i>"),
+        ("frames", "<frameset><frame>"),
+        ("blockquotes", "<blockquote>"),
+        ("fonts", "<font>"),
+        ("anchors", "<a href=\"http://a\">"),
+        ("unclosed tags", "<"),
+        ("entities", "&amp;&#x41;&"),
+    ];
+    for (name, open) in html_shapes {
+        let doc = format!("<html><body>{}x</body></html>", open.repeat(n));
+        findings.push(on_small_stack(
+            format!("docs html {name}"),
+            docs_html.clone(),
+            doc.clone().into_bytes(),
+        ));
+        findings.push(on_small_stack(
+            format!("sheets html {name}"),
+            sheets_html.clone(),
+            doc.into_bytes(),
+        ));
+    }
+    let rtf_shapes = [
+        ("groups", "{"),
+        ("destinations", "{\\*\\x "),
+        ("tables", "\\trowd{\\intbl "),
+        ("fields", "{\\field{\\*\\fldinst "),
+        ("pictures", "{\\pict "),
+        ("shapes", "{\\shp{\\*\\shpinst "),
+        ("fonts", "{\\fonttbl{\\f0 "),
+        ("lists", "{\\listtable{\\list "),
+        ("footnotes", "{\\footnote "),
+    ];
+    for (name, open) in rtf_shapes {
+        let doc = format!("{{\\rtf1\\ansi {}x}}", open.repeat(n));
+        findings.push(on_small_stack(
+            format!("rtf {name}"),
+            rtf.clone(),
+            doc.into_bytes(),
+        ));
+    }
+    let sylk_doc = format!("ID;P\n{}E\n", "C;X1;Y1;K\"x\";E".repeat(n) + "\n");
+    findings.push(on_small_stack(
+        "sylk cells".into(),
+        sylk.clone(),
+        sylk_doc.into_bytes(),
+    ));
+    let sylk_formula = format!("ID;P\nC;X1;Y1;E{}1\nE\n", "-(".repeat(n));
+    findings.push(on_small_stack(
+        "sylk formula".into(),
+        sylk,
+        sylk_formula.into_bytes(),
+    ));
+    assert_all(findings);
+}
+
+#[test]
+fn visio_pages() {
+    let ns = "xmlns=\"http://schemas.microsoft.com/office/visio/2012/main\" \
+        xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"";
+    let shapes: Vec<Case> = vec![
+        (
+            "sub-shapes",
+            Box::new(|d| {
+                format!(
+                    "<Shapes>{}</Shapes>",
+                    nest(
+                        "<Shape ID=\"1\" Type=\"Group\"><Shapes>",
+                        "</Shapes></Shape>",
+                        "<Shape ID=\"2\"><Text>x</Text></Shape>",
+                        d
+                    )
+                )
+            }),
+        ),
+        (
+            "a master chain",
+            Box::new(|d| {
+                format!(
+                    "<Shapes><Shape ID=\"1\" Master=\"1\">{}</Shape></Shapes>",
+                    nest("<Section N=\"Geometry\"><Row>", "</Row></Section>", "", d)
+                )
+            }),
+        ),
+        (
+            "a formula",
+            Box::new(|d| {
+                format!(
+                    "<Shapes><Shape ID=\"1\"><Cell N=\"PinX\" F=\"{}1{}\"/></Shape></Shapes>",
+                    "(".repeat(d),
+                    ")".repeat(d)
+                )
+            }),
+        ),
+        (
+            "a unary formula",
+            Box::new(|d| {
+                format!(
+                    "<Shapes><Shape ID=\"1\"><Cell N=\"PinX\" F=\"{}1\"/></Shape></Shapes>",
+                    "-".repeat(d)
+                )
+            }),
+        ),
+        (
+            "a binary formula",
+            Box::new(|d| {
+                format!(
+                    "<Shapes><Shape ID=\"1\"><Cell N=\"PinX\" F=\"{}1\"/></Shape></Shapes>",
+                    "1+".repeat(d)
+                )
+            }),
+        ),
+        (
+            "a reference chain",
+            Box::new(|d| {
+                format!(
+                    "<Shapes><Shape ID=\"1\"><Cell N=\"PinX\" V=\"1\" F=\"Sheet.1!PinX\"/></Shape>{}</Shapes>",
+                    (2..d)
+                        .map(|i| format!(
+                            "<Shape ID=\"{i}\"><Cell N=\"PinX\" F=\"Sheet.{}!PinX\"/></Shape>",
+                            i - 1
+                        ))
+                        .collect::<String>()
+                )
+            }),
+        ),
+    ];
+    let mut findings = vec![];
+    for (name, body) in &shapes {
+        for depth in depths() {
+            let page = format!(
+                "<?xml version=\"1.0\"?><PageContents {ns}>{}</PageContents>",
+                body(depth)
+            );
+            let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+            let o = zip::write::SimpleFileOptions::default();
+            z.start_file("[Content_Types].xml", o).unwrap();
+            z.write_all(b"<?xml version=\"1.0\"?><Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Override PartName=\"/visio/document.xml\" ContentType=\"application/vnd.ms-visio.drawing.main+xml\"/></Types>").unwrap();
+            z.start_file("_rels/.rels", o).unwrap();
+            z.write_all(b"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.microsoft.com/visio/2010/relationships/document\" Target=\"visio/document.xml\"/></Relationships>").unwrap();
+            z.start_file("visio/document.xml", o).unwrap();
+            z.write_all(format!("<?xml version=\"1.0\"?><VisioDocument {ns}/>").as_bytes())
+                .unwrap();
+            z.start_file("visio/_rels/document.xml.rels", o).unwrap();
+            z.write_all(b"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.microsoft.com/visio/2010/relationships/pages\" Target=\"pages/pages.xml\"/></Relationships>").unwrap();
+            z.start_file("visio/pages/pages.xml", o).unwrap();
+            z.write_all(format!("<?xml version=\"1.0\"?><Pages {ns}><Page ID=\"0\" Name=\"p\"><Rel r:id=\"rId1\"/></Page></Pages>").as_bytes()).unwrap();
+            z.start_file("visio/pages/_rels/pages.xml.rels", o).unwrap();
+            z.write_all(b"<?xml version=\"1.0\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.microsoft.com/visio/2010/relationships/page\" Target=\"page1.xml\"/></Relationships>").unwrap();
+            z.start_file("visio/pages/page1.xml", o).unwrap();
+            z.write_all(page.as_bytes()).unwrap();
+            let data = z.finish().unwrap().into_inner();
+            findings.push(on_small_stack(
+                format!("vsdx {name} x{depth}"),
+                slides(exav_render::slides::Format::Vsdx),
+                data,
+            ));
+        }
+    }
+    assert_all(findings);
+}
diff --git a/crates/exav-render/tests/nesting_models.rs b/crates/exav-render/tests/nesting_models.rs
new file mode 100644
index 00000000..0c56d15c
--- /dev/null
+++ b/crates/exav-render/tests/nesting_models.rs
@@ -0,0 +1,182 @@
+//! The 3D and CAD readers on files nested as deep as the file is long.
+//!
+//! glTF is JSON, IFC nests parentheses and refers from instance to instance,
+//! DXF refers from block to block. Each has a depth limit, and each is read here
+//! on a 512 KB stack with nesting well past it: the reader may refuse, but it has
+//! to end, in seconds, without a panic.
+
+#![cfg(any(feature = "gltf", feature = "ifc", feature = "dwg"))]
+
+use std::time::{Duration, Instant};
+
+const STACK: usize = 512 * 1024;
+const N: usize = 100_000;
+
+fn on_small_stack(name: &str, f: impl FnOnce() + Send + 'static) -> Option<String> {
+    let started = Instant::now();
+    let r = std::thread::Builder::new()
+        .stack_size(STACK)
+        .spawn(f)
+        .unwrap()
+        .join();
+    match r {
+        Err(_) => Some(format!("{name}: overflowed its stack or panicked")),
+        Ok(()) if started.elapsed() > Duration::from_secs(20) => Some(format!(
+            "{name}: took {:.1} s",
+            started.elapsed().as_secs_f64()
+        )),
+        Ok(()) => None,
+    }
+}
+
+fn assert_all(findings: Vec<Option<String>>) {
+    let findings: Vec<String> = findings.into_iter().flatten().collect();
+    assert!(findings.is_empty(), "\n{}", findings.join("\n"));
+}
+
+#[cfg(feature = "gltf")]
+#[test]
+fn gltf_json() {
+    let head = "{\"asset\":{\"version\":\"2.0\"},\"extras\":";
+    let cases: Vec<(&str, String)> = vec![
+        ("arrays", format!("{head}{}{}}}", "[".repeat(N), "]".repeat(N))),
+        ("objects", format!("{head}{}1{}}}", "{\"a\":".repeat(N), "}".repeat(N))),
+        ("mixed", format!("{head}{}1{}}}", "[{\"a\":".repeat(N), "}]".repeat(N))),
+        ("unclosed", format!("{head}{}", "[".repeat(N))),
+        ("strings", format!("{head}\"{}\"}}", "\\u0041\\\"".repeat(N))),
+        ("scenes", format!("{{\"asset\":{{\"version\":\"2.0\"}},\"nodes\":[{}],\"scenes\":[{{\"nodes\":[0]}}]}}", (0..N).map(|i| format!("{{\"children\":[{}]}}", i + 1)).collect::<Vec<_>>().join(","))),
+        ("node cycle", "{\"asset\":{\"version\":\"2.0\"},\"nodes\":[{\"children\":[1]},{\"children\":[0]}],\"scenes\":[{\"nodes\":[0]}]}".to_string()),
+    ];
+    assert_all(
+        cases
+            .into_iter()
+            .map(|(name, doc)| {
+                on_small_stack(&format!("gltf {name}"), move || {
+                    let _ = exav_render::gltf::read(doc.as_bytes(), 1 << 20);
+                })
+            })
+            .collect(),
+    );
+}
+
+#[cfg(feature = "ifc")]
+#[test]
+fn ifc_instances() {
+    let step = |data: String| {
+        format!(
+            "ISO-10303-21;\nHEADER;\nFILE_SCHEMA(('IFC4X3_ADD2'));\nENDSEC;\nDATA;\n{data}ENDSEC;\nEND-ISO-10303-21;\n"
+        )
+    };
+    let chain = |f: &dyn Fn(usize) -> String| {
+        (1..N)
+            .map(|i| format!("#{i}={};\n", f(i)))
+            .collect::<String>()
+    };
+    let cases: Vec<(&str, String)> = vec![
+        ("aggregates", step(format!("#1=IFCWALL({}{});\n", "(".repeat(N), ")".repeat(N)))),
+        ("lists", step(format!("#1=IFCWALL({}$;\n", "(".repeat(N)))),
+        ("typed values", step(format!("#1=IFCWALL({}1.{});\n", "IFCLABEL(".repeat(N), ")".repeat(N)))),
+        ("strings", step(format!("#1=IFCWALL('{}');\n", "''".repeat(N)))),
+        ("placements", step(chain(&|i| format!("IFCLOCALPLACEMENT(#{},#{})", i + 1, i + 1)))),
+        ("curves", step(chain(&|i| format!("IFCTRIMMEDCURVE(#{},(#{}),(#{}),.T.,.CARTESIAN.)", i + 1, i + 1, i + 1)))),
+        ("profiles", step(chain(&|i| format!("IFCDERIVEDPROFILEDEF(.AREA.,$,#{},#{},$)", i + 1, i + 1)))),
+        ("items", step(chain(&|i| format!("IFCMAPPEDITEM(#{},#{})", i + 1, i + 1)))),
+        ("booleans", step(chain(&|i| format!("IFCBOOLEANRESULT(.DIFFERENCE.,#{},#{})", i + 1, i + 1)))),
+        ("units", step(chain(&|i| format!("IFCCONVERSIONBASEDUNIT(#{},.LENGTHUNIT.,'x',#{})", i + 1, i + 1)))),
+        ("styles", step(chain(&|i| format!("IFCSTYLEDITEM(#{},(#{}),$)", i + 1, i + 1)))),
+        ("cycle", step("#1=IFCLOCALPLACEMENT(#2,#3);\n#2=IFCLOCALPLACEMENT(#1,#3);\n#3=IFCAXIS2PLACEMENT3D($,$,$);\n".to_string())),
+    ];
+    assert_all(
+        cases
+            .into_iter()
+            .map(|(name, doc)| {
+                on_small_stack(&format!("ifc {name}"), move || {
+                    let _ = exav_render::ifc::read(
+                        doc.as_bytes(),
+                        &exav_render::ifc::Limits::default(),
+                    );
+                })
+            })
+            .collect(),
+    );
+}
+
+#[cfg(feature = "dwg")]
+#[test]
+fn dxf_blocks() {
+    let pair = |code: u32, v: &str| format!("{code}\n{v}\n");
+    let sections = |blocks: String, entities: String| {
+        format!(
+            "{}{}{blocks}{}{}{}{entities}{}{}",
+            pair(0, "SECTION"),
+            pair(2, "BLOCKS"),
+            pair(0, "ENDSEC"),
+            pair(0, "SECTION"),
+            pair(2, "ENTITIES"),
+            pair(0, "ENDSEC"),
+            pair(0, "EOF"),
+        )
+    };
+    let block = |name: String, inner: String| {
+        format!(
+            "{}{}{}{inner}{}",
+            pair(0, "BLOCK"),
+            pair(2, &name),
+            pair(8, "0"),
+            pair(0, "ENDBLK")
+        )
+    };
+    let insert = |name: String| {
+        format!(
+            "{}{}{}{}",
+            pair(0, "INSERT"),
+            pair(2, &name),
+            pair(10, "0"),
+            pair(20, "0")
+        )
+    };
+    let chain: String = (0..N / 10)
+        .map(|i| block(format!("B{i}"), insert(format!("B{}", i + 1))))
+        .collect();
+    let cycle = block("A".into(), insert("B".into())) + &block("B".into(), insert("A".into()));
+    let cases: Vec<(&str, String)> = vec![
+        ("an insert chain", sections(chain, insert("B0".into()))),
+        ("an insert cycle", sections(cycle, insert("A".into()))),
+        (
+            "a self insert",
+            sections(block("A".into(), insert("A".into())), insert("A".into())),
+        ),
+        (
+            "many inserts",
+            sections(
+                block("A".into(), "".into()),
+                insert("A".into()).repeat(N / 10),
+            ),
+        ),
+        (
+            "polylines",
+            sections(
+                String::new(),
+                format!(
+                    "{}{}",
+                    pair(0, "POLYLINE"),
+                    format!("{}{}", pair(0, "VERTEX"), pair(10, "1")).repeat(N)
+                ),
+            ),
+        ),
+        (
+            "groups",
+            format!("{}{}", pair(0, "SECTION"), "0\nSECTION\n".repeat(N)),
+        ),
+    ];
+    assert_all(
+        cases
+            .into_iter()
+            .map(|(name, doc)| {
+                on_small_stack(&format!("dxf {name}"), move || {
+                    let _ = exav_render::cad::read_dxf(doc.as_bytes());
+                })
+            })
+            .collect(),
+    );
+}
diff --git a/crates/exav-render/tests/obj.rs b/crates/exav-render/tests/obj.rs
new file mode 100644
index 00000000..40b937fa
--- /dev/null
+++ b/crates/exav-render/tests/obj.rs
@@ -0,0 +1,477 @@
+//! The OBJ reader on shapes built here from known geometry: triangle
+//! counts, enclosed volume, extents, colours, normals, groups; and on
+//! hostile files.
+
+mod mesh_common;
+
+use std::fmt::Write;
+use std::time::Duration;
+
+use exav_render::mesh::Scene;
+use exav_render::obj::{Error, read};
+use mesh_common::*;
+
+fn parse(text: &str) -> Scene {
+    read(text.as_bytes(), usize::MAX).unwrap()
+}
+
+fn vertices(out: &mut String, points: &[P]) {
+    for p in points {
+        writeln!(out, "v {} {} {}", p[0], p[1], p[2]).unwrap();
+    }
+}
+
+fn cube(prefix: &str) -> String {
+    let mut s = String::from(prefix);
+    vertices(&mut s, &CUBE);
+    for q in CUBE_QUADS {
+        writeln!(s, "f {} {} {} {}", q[0] + 1, q[1] + 1, q[2] + 1, q[3] + 1).unwrap();
+    }
+    s
+}
+
+#[test]
+fn a_cube_of_quads_is_twelve_triangles_enclosing_one() {
+    let s = parse(&cube("# a cube\nmtllib cube.mtl\nusemtl wood\n"));
+    assert_eq!(s.triangles(), 12);
+    assert_near(volume(&s), 1.0, "volume");
+    assert_near(area(&s), 6.0, "area");
+    assert_eq!(extent(&s), [[0.; 3], [1.; 3]]);
+    assert_eq!(s.bounds, Some([[0.; 3], [1.; 3]]));
+    assert_eq!(s.warnings, Default::default());
+    assert_sound(&s);
+    // No vertex colours, and so none in the batch.
+    assert!(s.batches[0].colors.is_none());
+    // Flat faces: every normal is the face's own, pointing out.
+    for t in s.batches[0].indices.chunks(3) {
+        let k = t[0] as usize * 3;
+        let (p, n) = (&s.batches[0].positions, &s.batches[0].normals);
+        let out = (f64::from(p[k]) - 0.5) * f64::from(n[k])
+            + (f64::from(p[k + 1]) - 0.5) * f64::from(n[k + 1])
+            + (f64::from(p[k + 2]) - 0.5) * f64::from(n[k + 2]);
+        assert!(out > 0.0);
+    }
+}
+
+#[test]
+fn indices_count_back_from_the_vertices_read_so_far() {
+    let mut text = String::new();
+    vertices(&mut text, &TETRA);
+    for f in TETRA_FACES {
+        writeln!(
+            text,
+            "f {} {} {}",
+            f[0] as i32 - 4,
+            f[1] as i32 - 4,
+            f[2] as i32 - 4
+        )
+        .unwrap();
+    }
+    let s = parse(&text);
+    assert_eq!(s.triangles(), 4);
+    assert_near(volume(&s), 1.0 / 6.0, "volume");
+    // A relative index depends on where the face is: a second tetrahedron
+    // after eight more vertices is the same shape at the same place.
+    let mut text = String::new();
+    vertices(&mut text, &TETRA);
+    vertices(&mut text, &TETRA.map(|p| [p[0] + 5.0, p[1], p[2]]));
+    for f in TETRA_FACES {
+        writeln!(
+            text,
+            "f {} {} {}",
+            f[0] as i32 - 4,
+            f[1] as i32 - 4,
+            f[2] as i32 - 4
+        )
+        .unwrap();
+    }
+    let s = parse(&text);
+    assert_eq!(s.triangles(), 4);
+    assert_eq!(extent(&s), [[5., 0., 0.], [6., 1., 1.]]);
+}
+
+#[test]
+fn the_face_forms_all_name_the_same_corners() {
+    let forms = [
+        "f 1 2 3",
+        "f 1/1 2/2 3/3",
+        "f 1//1 2//1 3//1",
+        "f 1/1/1 2/2/1 3/3/1",
+        "f -3 -2 -1",
+        "f -3/-3/-1 -2/-2/-1 -1/-1/-1",
+    ];
+    for f in forms {
+        let s = parse(&format!(
+            "v 0 0 0\nv 1 0 0\nv 0 1 0\nvt 0 0\nvt 1 0\nvt 0 1\nvn 0 0 1\n{f}\n"
+        ));
+        assert_eq!(s.triangles(), 1, "{f}");
+        assert_eq!(
+            triangles(&s)[0],
+            [[0., 0., 0.], [1., 0., 0.], [0., 1., 0.]],
+            "{f}"
+        );
+        assert!(s.warnings.invalid == 0, "{f}");
+    }
+}
+
+#[test]
+fn a_quad_is_two_triangles_and_a_pentagon_three() {
+    let quad = parse("v 0 0 0\nv 1 0 0\nv 1 1 0\nv 0 1 0\nf 1 2 3 4\n");
+    assert_eq!(quad.triangles(), 2);
+    assert_near(area(&quad), 1.0, "quad area");
+    let mut text = String::new();
+    let pentagon: Vec<P> = (0..5)
+        .map(|k| {
+            let a = f64::from(k) * std::f64::consts::TAU / 5.0;
+            [a.cos(), a.sin(), 0.0]
+        })
+        .collect();
+    vertices(&mut text, &pentagon);
+    text.push_str("f 1 2 3 4 5\n");
+    let s = parse(&text);
+    assert_eq!(s.triangles(), 3);
+    // The area of a regular pentagon of circumradius 1.
+    assert_near(
+        area(&s),
+        2.5 * (std::f64::consts::TAU / 5.0).sin(),
+        "pentagon",
+    );
+}
+
+#[test]
+fn a_concave_polygon_is_covered_without_overlap() {
+    // A U, area 5: a fan from its first corner would cover part of the
+    // notch.
+    let u: [P; 8] = [
+        [0., 0., 0.],
+        [3., 0., 0.],
+        [3., 2., 0.],
+        [2., 2., 0.],
+        [2., 1., 0.],
+        [1., 1., 0.],
+        [1., 2., 0.],
+        [0., 2., 0.],
+    ];
+    let mut text = String::new();
+    vertices(&mut text, &u);
+    text.push_str("f 1 2 3 4 5 6 7 8\n");
+    let s = parse(&text);
+    assert_eq!(s.triangles(), 6);
+    assert_near(area(&s), 5.0, "area");
+    // Every triangle faces the same way as the polygon.
+    for t in triangles(&s) {
+        let z =
+            (t[1][0] - t[0][0]) * (t[2][1] - t[0][1]) - (t[1][1] - t[0][1]) * (t[2][0] - t[0][0]);
+        assert!(z > 0.0);
+    }
+}
+
+#[test]
+fn groups_and_objects_are_elements() {
+    let mut text = String::new();
+    vertices(&mut text, &TETRA);
+    vertices(&mut text, &TETRA.map(|p| [p[0] + 3.0, p[1], p[2]]));
+    text.push_str("o first\ng left\n");
+    for f in TETRA_FACES {
+        writeln!(text, "f {} {} {}", f[0] + 1, f[1] + 1, f[2] + 1).unwrap();
+    }
+    text.push_str("g\ng empty one\ng right side\n");
+    for f in TETRA_FACES {
+        writeln!(text, "f {} {} {}", f[0] + 5, f[1] + 5, f[2] + 5).unwrap();
+    }
+    let s = parse(&text);
+    let names: Vec<_> = s.elements.iter().map(|e| e.name.as_str()).collect();
+    assert_eq!(names, ["left", "right side"]);
+    for (e, x) in s.elements.iter().zip([0.0, 3.0]) {
+        assert_eq!(e.ranges.len(), 1);
+        assert_eq!(e.ranges[0].count, 12);
+        let b = &s.batches[0];
+        let (first, count) = (e.ranges[0].first as usize, e.ranges[0].count as usize);
+        for &i in &b.indices[first..first + count] {
+            let px = f64::from(b.positions[i as usize * 3]);
+            assert!((x..=x + 1.0).contains(&px), "{} at {px}", e.name);
+        }
+    }
+    // Faces before any group belong to an unnamed element.
+    let s = parse("v 0 0 0\nv 1 0 0\nv 0 1 0\nf 1 2 3\ng later\n");
+    assert_eq!(s.elements.len(), 1);
+    assert_eq!(s.elements[0].name, "");
+}
+
+#[test]
+fn vertex_colours_colour_the_faces_and_a_fourth_number_is_a_weight() {
+    let s = parse("v 0 0 0 1 0 0\nv 1 0 0 0 1 0\nv 0 1 0 0 0 0.5\nf 1 2 3\n");
+    let c = s.batches[0].colors.as_ref().unwrap();
+    assert_eq!(c.len(), 9);
+    assert_eq!(&c[..], &[255, 0, 0, 0, 255, 0, 0, 0, 128]);
+    // x y z w: no colour.
+    let s = parse("v 0 0 0 2\nv 1 0 0 2\nv 0 1 0 2\nf 1 2 3\n");
+    assert!(s.batches[0].colors.is_none());
+    assert_eq!(triangles(&s)[0], [[0., 0., 0.], [1., 0., 0.], [0., 1., 0.]]);
+    // Some vertices coloured: the others get a default, none are left out.
+    let s = parse("v 0 0 0\nv 1 0 0\nv 0 1 0 0 0 1\nf 1 2 3\n");
+    let c = s.batches[0].colors.as_ref().unwrap();
+    assert_eq!(c.len(), 9);
+    assert_eq!(&c[6..], &[0, 0, 255]);
+}
+
+#[test]
+fn normals_are_used_when_given_and_computed_when_not() {
+    let given =
+        parse("v 0 0 0\nv 1 0 0\nv 0 1 0\nvn 0 0 2\nvn 0 0 2\nvn 0 0 2\nf 1//1 2//2 3//3\n");
+    for n in given.batches[0].normals.chunks(3) {
+        assert_eq!(n, [0.0, 0.0, 1.0]);
+    }
+    // Pointing the other way than the winding says: the file is believed.
+    let flipped = parse("v 0 0 0\nv 1 0 0\nv 0 1 0\nvn 0 0 -1\nf 1//1 2//1 3//1\n");
+    assert_eq!(&flipped.batches[0].normals[..3], &[0.0, 0.0, -1.0]);
+    // None given, a zero one and one that does not exist: the face's.
+    for f in ["f 1 2 3", "f 1//1 2//1 3//1", "f 1//9 2//9 3//9"] {
+        let s = parse(&format!("v 0 0 0\nv 1 0 0\nv 0 1 0\nvn 0 0 0\n{f}\n"));
+        assert_eq!(&s.batches[0].normals[..3], &[0.0, 0.0, 1.0], "{f}");
+    }
+}
+
+#[test]
+fn continuation_lines_and_crlf_are_read() {
+    let s = parse("v 0 0 0\r\nv 1 0 0\r\nv 1 1 0\r\nv 0 1 0\r\nf 1 2 \\\r\n 3 4\r\n");
+    assert_eq!(s.triangles(), 2);
+}
+
+#[test]
+fn lines_points_and_curves_are_counted_not_drawn() {
+    let s = parse("v 0 0 0\nv 1 0 0\nv 0 1 0\nl 1 2\nl 2 3\np 1\ncurv 0 1 1 2\nf 1 2 3\n");
+    assert_eq!(s.triangles(), 1);
+    assert_eq!(s.warnings.unsupported["l"], 2);
+    assert_eq!(s.warnings.unsupported["p"], 1);
+    assert_eq!(s.warnings.unsupported["curv"], 1);
+    // Vertices only: nothing to show, and no error.
+    let s = parse("v 0 0 0\nv 1 0 0\n");
+    assert_eq!(s.triangles(), 0);
+    assert!(s.bounds.is_none());
+}
+
+#[test]
+fn what_is_not_an_obj_file_is_refused() {
+    assert_eq!(read(b"", 10).unwrap_err(), Error::NotObj);
+    assert_eq!(read(b"hello world\n", 10).unwrap_err(), Error::NotObj);
+    assert_eq!(read(b"# only a comment\n", 10).unwrap_err(), Error::NotObj);
+    assert_eq!(read(b"v 0 0 0\0\0\0\n", 10).unwrap_err(), Error::NotObj);
+    assert_eq!(
+        read(b"\x7fELF\x02\x01\x01\0\0\0\0\0\0\0\0\0", 10).unwrap_err(),
+        Error::NotObj
+    );
+    assert_eq!(
+        read(b"v 0 0 0\nv 1 0 0\nv 0 1 0\nf 1 2 9\nf 0 1 2\n", 10).unwrap_err(),
+        Error::NoValidFaces
+    );
+}
+
+#[test]
+fn faces_that_cannot_be_drawn_are_dropped_and_counted() {
+    let s =
+        parse("v 0 0 0\nv 1 0 0\nv 0 1 0\nf 1 2 3\nf 1 2 4\nf 0 1 2\nf -9 1 2\nf 1 2\nf 1 2 x\n");
+    assert_eq!(s.triangles(), 1);
+    assert_eq!(s.warnings.invalid, 5);
+}
+
+#[test]
+fn coordinates_that_are_not_numbers_or_not_sizes_drop_their_faces() {
+    for bad in ["nan", "inf", "-inf", "1e999", "1e300", "-1e13"] {
+        let s = parse(&format!(
+            "v 0 0 0\nv 1 0 0\nv 0 1 0\nv {bad} 0 0\nf 1 2 3\nf 1 2 4\n"
+        ));
+        assert_eq!(s.triangles(), 1, "{bad}");
+        assert_eq!(s.warnings.invalid, 1, "{bad}");
+        assert_eq!(s.bounds, Some([[0.; 3], [1., 1., 0.]]), "{bad}");
+        assert_sound(&s);
+    }
+    // A vertex line with a missing coordinate keeps the numbering.
+    let s = parse("v 0 0 0\nv 1 0\nv 1 0 0\nv 0 1 0\nf 1 3 4\nf 1 2 3\n");
+    assert_eq!(s.triangles(), 1);
+    assert!(s.warnings.damaged);
+}
+
+#[test]
+fn the_budget_stops_the_reading() {
+    let mut text = String::new();
+    vertices(&mut text, &CUBE);
+    for _ in 0..10 {
+        for q in CUBE_QUADS {
+            writeln!(
+                text,
+                "f {} {} {} {}",
+                q[0] + 1,
+                q[1] + 1,
+                q[2] + 1,
+                q[3] + 1
+            )
+            .unwrap();
+        }
+    }
+    let s = read(text.as_bytes(), 5).unwrap();
+    assert_eq!(s.triangles(), 5);
+    assert_eq!(s.warnings.truncated, 1);
+    let s = read(text.as_bytes(), 0).unwrap();
+    assert_eq!(s.triangles(), 0);
+    let s = read(text.as_bytes(), 120).unwrap();
+    assert_eq!(s.triangles(), 120);
+    assert_eq!(s.warnings.truncated, 0);
+}
+
+#[test]
+fn a_polygon_of_a_million_corners_is_cut_at_the_budget_in_linear_time() {
+    let n = 1_000_000;
+    let mut text = String::new();
+    // A zigzag: every triangle of the fan has an area.
+    for k in 0..n {
+        writeln!(text, "v {k} {} 0", k % 2).unwrap();
+    }
+    text.push('f');
+    for k in 1..=n {
+        write!(text, " {k}").unwrap();
+    }
+    text.push('\n');
+    let s = within(Duration::from_secs(20), "the million-gon", || {
+        read(text.as_bytes(), 200_000).unwrap()
+    });
+    assert_eq!(s.triangles(), 200_000);
+    assert_eq!(s.warnings.truncated, 1);
+    assert_sound(&s);
+    // Without a cap on the budget the polygon is fanned whole.
+    let s = within(Duration::from_secs(20), "the million-gon, whole", || {
+        read(text.as_bytes(), usize::MAX).unwrap()
+    });
+    assert_eq!(s.triangles(), n as usize - 2);
+}
+
+#[test]
+fn polygons_past_the_triangulation_work_limit_are_fanned() {
+    // A U of area 5, 300,000 times: ear-clipping them all is more work than
+    // one file may ask for. The first is covered exactly; the last is fanned
+    // from its first corner, which overlaps itself over the notch.
+    let mut text = String::new();
+    for (x, y) in [
+        (0, 0),
+        (3, 0),
+        (3, 2),
+        (2, 2),
+        (2, 1),
+        (1, 1),
+        (1, 2),
+        (0, 2),
+    ] {
+        writeln!(text, "v {x} {y} 0").unwrap();
+    }
+    for _ in 0..300_000 {
+        text.push_str("f 1 2 3 4 5 6 7 8\n");
+    }
+    let s = within(Duration::from_secs(20), "300,000 U polygons", || {
+        parse(&text)
+    });
+    assert_eq!(s.triangles(), 300_000 * 6);
+    let all = triangles(&s);
+    let signed = |t: &[P; 3]| {
+        (t[1][0] - t[0][0]) * (t[2][1] - t[0][1]) - (t[1][1] - t[0][1]) * (t[2][0] - t[0][0])
+    };
+    let polygon = |k: usize| {
+        all[k * 6..k * 6 + 6]
+            .iter()
+            .map(|t| signed(t).abs() / 2.0)
+            .sum::<f64>()
+    };
+    assert_near(polygon(0), 5.0, "the first polygon");
+    assert!(
+        polygon(299_999) > 5.5,
+        "the last polygon: {}",
+        polygon(299_999)
+    );
+}
+
+#[test]
+fn many_polygons_cost_a_bounded_amount_of_triangulation() {
+    // Thousands of 64-gons with a notch: each would be ear-clipped, and in
+    // all they would take far longer than the limit allows.
+    let mut text = String::new();
+    for k in 0..64 {
+        let a = f64::from(k) * std::f64::consts::TAU / 64.0;
+        let r = if k % 2 == 0 { 1.0 } else { 0.6 };
+        writeln!(text, "v {} {} 0", r * a.cos(), r * a.sin()).unwrap();
+    }
+    for _ in 0..4000 {
+        text.push('f');
+        for k in 1..=64 {
+            write!(text, " {k}").unwrap();
+        }
+        text.push('\n');
+    }
+    let s = within(Duration::from_secs(20), "4000 star polygons", || {
+        read(text.as_bytes(), usize::MAX).unwrap()
+    });
+    assert_eq!(s.triangles(), 4000 * 62);
+    assert_sound(&s);
+}
+
+#[test]
+fn extreme_numbers_in_faces_are_errors_not_panics() {
+    let mut text = String::from("v 0 0 0\nv 1 0 0\nv 0 1 0\n");
+    for token in [
+        "9223372036854775807",
+        "-9223372036854775808",
+        "99999999999999999999999",
+        "-99999999999999999999999",
+        "4294967296",
+        "-4294967297",
+        "1/",
+        "//",
+        "///",
+        "1/2/3/4",
+        "+1",
+        "-",
+        "1e5",
+        "0x1",
+    ] {
+        writeln!(text, "f 1 2 {token}").unwrap();
+        writeln!(text, "f {token} {token} {token}").unwrap();
+        writeln!(text, "f 1//{token} 2//{token} 3//{token}").unwrap();
+    }
+    let s = parse(&text);
+    assert_sound(&s);
+    // Only the `1//n` faces are whole: a normal that cannot be found is
+    // the face's own.
+    assert_eq!(s.triangles(), 14);
+}
+
+#[test]
+fn a_file_cut_anywhere_or_changed_anywhere_is_read_soundly() {
+    let bytes = cube("# c\ng cube\nvn 0 0 1\nvt 0 0\n").into_bytes();
+    sweep(&bytes, |b| read(b, 1000).ok());
+}
+
+#[test]
+fn a_hundred_thousand_groups_make_a_bounded_number_of_elements() {
+    let mut text = String::from("v 0 0 0\nv 1 0 0\nv 0 1 0\n");
+    for k in 0..100_000 {
+        writeln!(text, "g group number {k}\nf 1 2 3").unwrap();
+    }
+    let s = within(Duration::from_secs(20), "the groups", || parse(&text));
+    assert_eq!(s.triangles(), 100_000);
+    assert!(s.elements.len() <= 10_000);
+    // The triangles past the last element's own belong to it.
+    let covered: u32 = s
+        .elements
+        .iter()
+        .flat_map(|e| &e.ranges)
+        .map(|r| r.count)
+        .sum();
+    assert_eq!(covered as usize, 3 * s.triangles());
+}
+
+#[test]
+fn a_long_name_is_cut() {
+    let s = parse(&format!(
+        "v 0 0 0\nv 1 0 0\nv 0 1 0\ng {}\nf 1 2 3\n",
+        "n".repeat(100_000)
+    ));
+    assert_eq!(s.elements[0].name.len(), 128);
+}
diff --git a/crates/exav-render/tests/office_common/mod.rs b/crates/exav-render/tests/office_common/mod.rs
new file mode 100644
index 00000000..55fc9fc0
--- /dev/null
+++ b/crates/exav-render/tests/office_common/mod.rs
@@ -0,0 +1,487 @@
+//! Helpers of the integration tests: a DOCX read back, and a Word 97 file
+//! written from its structures.
+
+// Each test crate uses some of these.
+#![allow(dead_code)]
+
+use exav_render::formats::office::test_util::Zip;
+use exav_render::formats::office::test_util::build_cfb as cfb;
+
+/// A part of a DOCX.
+pub fn part(docx: &[u8], name: &str) -> String {
+    let mut z = Zip::open(docx).expect("a ZIP package");
+    let d = z.read(name, 1 << 28).expect("readable").unwrap_or_default();
+    String::from_utf8(d).expect("UTF-8")
+}
+
+pub fn has_part(docx: &[u8], name: &str) -> bool {
+    Zip::open(docx)
+        .expect("a ZIP package")
+        .names()
+        .iter()
+        .any(|n| n == name)
+}
+
+fn put16(v: &mut [u8], at: usize, x: u16) {
+    v[at..at + 2].copy_from_slice(&x.to_le_bytes());
+}
+
+fn put32(v: &mut [u8], at: usize, x: u32) {
+    v[at..at + 4].copy_from_slice(&x.to_le_bytes());
+}
+
+/// One paragraph: its text (8-bit, ending with the paragraph mark), the
+/// character runs (start, end, grpprl) and the paragraph's grpprl.
+pub struct Para {
+    pub text: Vec<u8>,
+    pub runs: Vec<(usize, usize, Vec<u8>)>,
+    pub grpprl: Vec<u8>,
+}
+
+/// A Word 97 document of paragraphs, as the file a writer would make: FIB,
+/// piece table with one compressed piece, one character and one paragraph
+/// FKP, a stylesheet with no styles, one font and one section.
+pub struct Options {
+    pub encrypted: bool,
+    pub fib_version: u16,
+    /// The character positions of the header story table (PlcfHdd).
+    pub hdd: Vec<u32>,
+    /// Text of the header stories, after the main text.
+    pub header: Vec<u8>,
+    /// A first section of no text, then the section of the paragraphs.
+    pub empty_first_section: bool,
+    /// The `Data` stream, when not empty.
+    pub data: Vec<u8>,
+    /// The text of each footnote, ending with its paragraph mark, and the
+    /// character positions in the main text of the marks that refer to them.
+    pub footnotes: Vec<Vec<u8>>,
+    pub footnote_refs: Vec<u32>,
+    /// The same for comments.
+    pub comments: Vec<Vec<u8>>,
+    pub comment_refs: Vec<u32>,
+}
+
+impl Default for Options {
+    fn default() -> Options {
+        Options {
+            encrypted: false,
+            fib_version: 0x00C1,
+            hdd: vec![],
+            header: vec![],
+            empty_first_section: false,
+            data: vec![],
+            footnotes: vec![],
+            footnote_refs: vec![],
+            comments: vec![],
+            comment_refs: vec![],
+        }
+    }
+}
+
+pub fn doc(paras: &[Para], opt: &Options) -> Vec<u8> {
+    const TEXT_AT: usize = 0x400;
+    let mut text = vec![];
+    let mut starts = vec![];
+    for p in paras {
+        starts.push(text.len());
+        text.extend_from_slice(&p.text);
+    }
+    let n = text.len();
+    // The footnotes, the header stories and the comments follow the main text,
+    // in that order.
+    let ftn = opt.footnotes.concat();
+    let atn = opt.comments.concat();
+    text.extend_from_slice(&ftn);
+    text.extend_from_slice(&opt.header);
+    text.extend_from_slice(&atn);
+    let total = text.len();
+    // WordDocument: FIB, text, character FKP, paragraph FKP.
+    let mut wd = vec![0u8; 0x1000];
+    wd[TEXT_AT..TEXT_AT + total].copy_from_slice(&text);
+    // The character FKP is page 4 (0x800), the paragraph FKP page 5 (0xA00).
+    let chpx_pn = (0x800 / 512) as u32;
+    let papx_pn = (0xA00 / 512) as u32;
+    // Character runs, with gaps filled by runs without properties.
+    let mut edges = vec![0usize];
+    let mut props: Vec<Vec<u8>> = vec![];
+    let mut cur = 0usize;
+    let mut all: Vec<(usize, usize, Vec<u8>)> = vec![];
+    for (p, s) in paras.iter().zip(&starts) {
+        for (a, b, g) in &p.runs {
+            all.push((s + a, s + b, g.clone()));
+        }
+    }
+    all.sort_by_key(|r| r.0);
+    for (a, b, g) in all {
+        if a > cur {
+            edges.push(a);
+            props.push(vec![]);
+        }
+        edges.push(b);
+        props.push(g);
+        cur = b;
+    }
+    if cur < n {
+        edges.push(n);
+        props.push(vec![]);
+    }
+    let crun = props.len();
+    let page = 0x800;
+    for (i, e) in edges.iter().enumerate() {
+        put32(&mut wd, page + 4 * i, (TEXT_AT + e) as u32);
+    }
+    let mut tail = page + 4 * (crun + 1) + crun;
+    for (i, g) in props.iter().enumerate() {
+        if g.is_empty() {
+            wd[page + 4 * (crun + 1) + i] = 0;
+            continue;
+        }
+        if tail % 2 == 1 {
+            tail += 1;
+        }
+        wd[page + 4 * (crun + 1) + i] = ((tail - page) / 2) as u8;
+        wd[tail] = g.len() as u8;
+        wd[tail + 1..tail + 1 + g.len()].copy_from_slice(g);
+        tail += 1 + g.len();
+    }
+    wd[page + 511] = crun as u8;
+    // Paragraph FKP.
+    let page = 0xA00;
+    let cpara = paras.len();
+    for (i, s) in starts.iter().enumerate() {
+        put32(&mut wd, page + 4 * i, (TEXT_AT + s) as u32);
+    }
+    put32(&mut wd, page + 4 * cpara, (TEXT_AT + n) as u32);
+    let mut tail = page + 4 * (cpara + 1) + 13 * cpara;
+    for (i, p) in paras.iter().enumerate() {
+        if tail % 2 == 1 {
+            tail += 1;
+        }
+        // istd 0 and the modifiers, to an even size.
+        let mut body = vec![0u8, 0];
+        body.extend_from_slice(&p.grpprl);
+        if body.len() % 2 == 0 {
+            body.push(0);
+        }
+        wd[page + 4 * (cpara + 1) + 13 * i] = ((tail - page) / 2) as u8;
+        wd[tail] = body.len().div_ceil(2) as u8;
+        wd[tail + 1..tail + 1 + body.len()].copy_from_slice(&body);
+        tail += 1 + body.len();
+    }
+    wd[page + 511] = cpara as u8;
+
+    // Table stream.
+    let mut tbl: Vec<u8> = vec![];
+    let place = |data: &[u8], tbl: &mut Vec<u8>| -> (u32, u32) {
+        let at = tbl.len();
+        tbl.extend_from_slice(data);
+        (at as u32, data.len() as u32)
+    };
+    // Piece table.
+    let mut plc = vec![];
+    for cp in [0u32, total as u32] {
+        plc.extend_from_slice(&cp.to_le_bytes());
+    }
+    plc.extend_from_slice(&[0, 0]);
+    plc.extend_from_slice(&(((TEXT_AT as u32) * 2) | 0x4000_0000).to_le_bytes());
+    plc.extend_from_slice(&[0, 0]);
+    let mut clx = vec![2u8];
+    clx.extend_from_slice(&(plc.len() as u32).to_le_bytes());
+    clx.extend_from_slice(&plc);
+    let clx_at = place(&clx, &mut tbl);
+    let bte = |fkp_pn: u32| {
+        let mut v = vec![];
+        for fc in [TEXT_AT as u32, (TEXT_AT + n) as u32] {
+            v.extend_from_slice(&fc.to_le_bytes());
+        }
+        v.extend_from_slice(&fkp_pn.to_le_bytes());
+        v
+    };
+    let chpx_at = place(&bte(chpx_pn), &mut tbl);
+    let papx_at = place(&bte(papx_pn), &mut tbl);
+    // A stylesheet: 18 bytes of general information, no styles.
+    let mut stsh = vec![];
+    let mut stshi = vec![0u8; 18];
+    put16(&mut stshi, 2, 10);
+    stsh.extend_from_slice(&18u16.to_le_bytes());
+    stsh.extend_from_slice(&stshi);
+    let stsh_at = place(&stsh, &mut tbl);
+    // One font: cData, cbExtra, then the FFN.
+    let name: Vec<u8> = "Arial\0"
+        .encode_utf16()
+        .flat_map(|u| u.to_le_bytes())
+        .collect();
+    let mut ffn = vec![(39 + name.len()) as u8];
+    ffn.extend_from_slice(&[0u8; 39]);
+    ffn.extend_from_slice(&name);
+    let mut fonts = vec![1, 0, 0, 0];
+    fonts.extend_from_slice(&ffn);
+    let fonts_at = place(&fonts, &mut tbl);
+    // One section with no properties, or two when the first has no text.
+    let mut sed = vec![];
+    let cps: &[u32] = if opt.empty_first_section {
+        &[0, 0, n as u32]
+    } else {
+        &[0, n as u32]
+    };
+    for cp in cps {
+        sed.extend_from_slice(&cp.to_le_bytes());
+    }
+    for _ in 1..cps.len() {
+        sed.extend_from_slice(&[0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF]);
+    }
+    let sed_at = place(&sed, &mut tbl);
+
+    // The FIB.
+    put16(&mut wd, 0, 0xA5EC);
+    put16(&mut wd, 2, opt.fib_version);
+    let flags = 0x0200 | if opt.encrypted { 0x0100 } else { 0 };
+    put16(&mut wd, 10, flags);
+    put16(&mut wd, 32, 14);
+    put16(&mut wd, 62, 22);
+    put32(&mut wd, 64 + 12, n as u32);
+    put16(&mut wd, 152, 93);
+    let pair = |i: usize, v: (u32, u32), wd: &mut Vec<u8>| {
+        put32(wd, 154 + 8 * i, v.0);
+        put32(wd, 154 + 8 * i + 4, v.1);
+    };
+    pair(1, stsh_at, &mut wd);
+    pair(6, sed_at, &mut wd);
+    pair(12, chpx_at, &mut wd);
+    pair(13, papx_at, &mut wd);
+    pair(15, fonts_at, &mut wd);
+    pair(33, clx_at, &mut wd);
+    if let Some(&last) = opt.hdd.last() {
+        let plc: Vec<u8> = opt.hdd.iter().flat_map(|c| c.to_le_bytes()).collect();
+        let at = tbl.len() as u32;
+        tbl.extend_from_slice(&plc);
+        pair(11, (at, plc.len() as u32), &mut wd);
+        put32(&mut wd, 64 + 20, last);
+    }
+    // Footnotes (pairs 2 and 3) and comments (4 and 5): the marks' positions
+    // and a record each, and the positions of the texts in their story.
+    let ends = |stories: &[Vec<u8>]| -> Vec<u8> {
+        let mut at = 0u32;
+        let mut v = vec![0u8; 4];
+        for s in stories {
+            at += s.len() as u32;
+            v.extend_from_slice(&at.to_le_bytes());
+        }
+        v
+    };
+    for (refs, stories, size, first) in [
+        (&opt.footnote_refs, &opt.footnotes, 2usize, 2usize),
+        (&opt.comment_refs, &opt.comments, 30, 4),
+    ] {
+        if stories.is_empty() {
+            continue;
+        }
+        let mut plc: Vec<u8> = refs
+            .iter()
+            .copied()
+            .chain([n as u32])
+            .flat_map(u32::to_le_bytes)
+            .collect();
+        plc.extend(std::iter::repeat_n(0u8, size * refs.len()));
+        let at = tbl.len() as u32;
+        tbl.extend_from_slice(&plc);
+        pair(first, (at, plc.len() as u32), &mut wd);
+        let txt = ends(stories);
+        let at = tbl.len() as u32;
+        tbl.extend_from_slice(&txt);
+        pair(first + 1, (at, txt.len() as u32), &mut wd);
+    }
+    put32(&mut wd, 64 + 16, ftn.len() as u32);
+    put32(&mut wd, 64 + 28, atn.len() as u32);
+    if opt.data.is_empty() {
+        cfb(&[("WordDocument", &wd), ("1Table", &tbl)])
+    } else {
+        cfb(&[("WordDocument", &wd), ("1Table", &tbl), ("Data", &opt.data)])
+    }
+}
+
+/// What a Word 6 document has besides its paragraphs.
+#[derive(Default)]
+pub struct Six {
+    /// The text of one default header, with its extra paragraph mark.
+    pub header: Option<Vec<u8>>,
+    /// The FIB's flags.
+    pub flags: u16,
+    /// Bytes to put in the stream, such as a picture, by offset.
+    pub extra: Vec<(usize, Vec<u8>)>,
+    /// Facing pages (the document properties).
+    pub facing: bool,
+}
+
+/// A Word 6 document of paragraphs: one stream with the FIB, the text, a
+/// character and a paragraph FKP, and the tables behind them, with the
+/// modifiers in Word 6's form (one-byte opcodes).
+pub fn doc6(paras: &[Para], six: &Six) -> Vec<u8> {
+    let (header, flags, extra) = (six.header.as_deref(), six.flags, &six.extra);
+    const TEXT_AT: usize = 0x400;
+    let mut text = vec![];
+    let mut starts = vec![];
+    for p in paras {
+        starts.push(text.len());
+        text.extend_from_slice(&p.text);
+    }
+    let n = text.len();
+    if let Some(h) = header {
+        text.extend_from_slice(h);
+    }
+    let mut wd = vec![0u8; 0x1000];
+    wd[TEXT_AT..TEXT_AT + text.len()].copy_from_slice(&text);
+    for (at, bytes) in extra {
+        wd[*at..*at + bytes.len()].copy_from_slice(bytes);
+    }
+    // Character runs, with the gaps between them filled.
+    let mut all: Vec<(usize, usize, Vec<u8>)> = vec![];
+    for (p, s) in paras.iter().zip(&starts) {
+        for (a, b, g) in &p.runs {
+            all.push((s + a, s + b, g.clone()));
+        }
+    }
+    all.sort_by_key(|r| r.0);
+    let (mut edges, mut props, mut cur) = (vec![0usize], vec![] as Vec<Vec<u8>>, 0usize);
+    for (a, b, g) in all {
+        if a > cur {
+            edges.push(a);
+            props.push(vec![]);
+        }
+        edges.push(b);
+        props.push(g);
+        cur = b;
+    }
+    if cur < n {
+        edges.push(n);
+        props.push(vec![]);
+    }
+    let page = 0x800;
+    let crun = props.len();
+    for (i, e) in edges.iter().enumerate() {
+        put32(&mut wd, page + 4 * i, (TEXT_AT + e) as u32);
+    }
+    let mut tail = page + 4 * (crun + 1) + crun;
+    for (i, g) in props.iter().enumerate() {
+        if g.is_empty() {
+            continue;
+        }
+        tail += tail % 2;
+        wd[page + 4 * (crun + 1) + i] = ((tail - page) / 2) as u8;
+        wd[tail] = g.len() as u8;
+        wd[tail + 1..tail + 1 + g.len()].copy_from_slice(g);
+        tail += 1 + g.len();
+    }
+    wd[page + 511] = crun as u8;
+    // Paragraphs: seven-byte entries; the PAPX is a count of words, the
+    // style code and the modifiers.
+    let page = 0xA00;
+    let cpara = paras.len();
+    for (i, s) in starts.iter().enumerate() {
+        put32(&mut wd, page + 4 * i, (TEXT_AT + s) as u32);
+    }
+    put32(&mut wd, page + 4 * cpara, (TEXT_AT + n) as u32);
+    let mut tail = page + 4 * (cpara + 1) + 7 * cpara;
+    for (i, p) in paras.iter().enumerate() {
+        tail += tail % 2;
+        let mut body = vec![0u8, 0];
+        body.extend_from_slice(&p.grpprl);
+        if body.len() % 2 == 0 {
+            body.push(0);
+        }
+        wd[page + 4 * (cpara + 1) + 7 * i] = ((tail - page) / 2) as u8;
+        wd[tail] = body.len().div_ceil(2) as u8;
+        wd[tail + 1..tail + 1 + body.len()].copy_from_slice(&body);
+        tail += 1 + body.len();
+    }
+    wd[page + 511] = cpara as u8;
+
+    // The tables, after the pages.
+    let mut at = 0xC00usize;
+    let mut place = |data: &[u8], wd: &mut Vec<u8>| -> (u32, u32) {
+        let o = at;
+        if wd.len() < o + data.len() {
+            wd.resize(o + data.len(), 0);
+        }
+        wd[o..o + data.len()].copy_from_slice(data);
+        at += data.len() + data.len() % 2;
+        (o as u32, data.len() as u32)
+    };
+    let bte = |pn: u16| {
+        let mut v = vec![];
+        for fc in [TEXT_AT as u32, (TEXT_AT + n) as u32] {
+            v.extend_from_slice(&fc.to_le_bytes());
+        }
+        v.extend_from_slice(&pn.to_le_bytes());
+        v
+    };
+    let chpx_at = place(&bte(4), &mut wd);
+    let papx_at = place(&bte(5), &mut wd);
+    // The stylesheet: 14 bytes of general information, one paragraph style
+    // "Normal" with an empty paragraph and character UPX.
+    let mut stshi = vec![0u8; 14];
+    stshi[0] = 1;
+    stshi[2] = 8;
+    let mut std = vec![0u8; 8];
+    std[0..2].copy_from_slice(&0x1000u16.to_le_bytes());
+    std[2..4].copy_from_slice(&(0x0FFFu16 | 2 << 12).to_le_bytes());
+    std.extend_from_slice(&[6, b'N', b'o', b'r', b'm', b'a', b'l', 0]);
+    std.extend_from_slice(&2u16.to_le_bytes());
+    std.extend_from_slice(&[0, 0]);
+    std.extend_from_slice(&0u16.to_le_bytes());
+    let mut stsh = (stshi.len() as u16).to_le_bytes().to_vec();
+    stsh.extend_from_slice(&stshi);
+    stsh.extend_from_slice(&(std.len() as u16).to_le_bytes());
+    stsh.extend_from_slice(&std);
+    let stsh_at = place(&stsh, &mut wd);
+    // One font, its table starting with its own size.
+    let mut ffn = vec![5 + 6, 0x16, 0x90, 0x01, 0, 0];
+    ffn.extend_from_slice(b"Arial\0");
+    let mut fonts = ((ffn.len() + 2) as u16).to_le_bytes().to_vec();
+    fonts.extend_from_slice(&ffn);
+    let fonts_at = place(&fonts, &mut wd);
+    // One section; and a header story's text, when there is one.
+    let mut sed = vec![];
+    for cp in [0u32, n as u32] {
+        sed.extend_from_slice(&cp.to_le_bytes());
+    }
+    sed.extend_from_slice(&[0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF]);
+    let sed_at = place(&sed, &mut wd);
+    let mut dop = [0u8; 84];
+    dop[0] = u8::from(six.facing);
+    let dop_at = place(&dop, &mut wd);
+    if let Some(h) = header {
+        // The header's section bits: an odd-page (default) header.
+        let sepx = [1u8 + 1, 153, 0x40];
+        let sepx_at = place(&sepx, &mut wd);
+        let sed_fc = sepx_at.0.to_le_bytes();
+        let sed_pos = sed_at.0 as usize + 8 + 2;
+        wd[sed_pos..sed_pos + 4].copy_from_slice(&sed_fc);
+        let hdd: Vec<u8> = [0u32, h.len() as u32]
+            .iter()
+            .flat_map(|c| c.to_le_bytes())
+            .collect();
+        let hdd_at = place(&hdd, &mut wd);
+        put32(&mut wd, 176, hdd_at.0);
+        put32(&mut wd, 180, hdd_at.1);
+        put32(&mut wd, 60, h.len() as u32);
+    }
+    put16(&mut wd, 0, 0xA5DC);
+    put16(&mut wd, 2, 101);
+    put16(&mut wd, 10, flags);
+    put32(&mut wd, 24, TEXT_AT as u32);
+    put32(&mut wd, 28, (TEXT_AT + text.len()) as u32);
+    put32(&mut wd, 52, n as u32);
+    for (pos, v) in [
+        (96, stsh_at),
+        (136, sed_at),
+        (184, chpx_at),
+        (192, papx_at),
+        (208, fonts_at),
+        (336, dop_at),
+    ] {
+        put32(&mut wd, pos, v.0);
+        put32(&mut wd, pos + 4, v.1);
+    }
+    cfb(&[("WordDocument", &wd)])
+}
diff --git a/crates/exav-render/tests/office_docs_doc.rs b/crates/exav-render/tests/office_docs_doc.rs
new file mode 100644
index 00000000..7ae44c31
--- /dev/null
+++ b/crates/exav-render/tests/office_docs_doc.rs
@@ -0,0 +1,467 @@
+//! Word 97 documents built from their structures, converted.
+
+#[path = "office_common/mod.rs"]
+mod common;
+
+use common::*;
+use exav_render::docs::{Error, Format, Limits, convert};
+
+fn bold(a: usize, b: usize) -> (usize, usize, Vec<u8>) {
+    (a, b, vec![0x35, 0x08, 1])
+}
+
+fn sample() -> Vec<u8> {
+    doc(
+        &[
+            Para {
+                text: b"Plain bold words\r".to_vec(),
+                // "bold" is characters 6 to 10.
+                runs: vec![
+                    bold(6, 10),
+                    (11, 16, vec![0x43, 0x4A, 48, 0, 0x3E, 0x2A, 1]),
+                ],
+                // Centered, 360 twips of space after.
+                grpprl: vec![0x61, 0x24, 1, 0x14, 0xA4, 0x68, 0x01],
+            },
+            Para {
+                text: b"Second\x09tab and\x0Bbreak\r".to_vec(),
+                runs: vec![],
+                grpprl: vec![],
+            },
+        ],
+        &Options::default(),
+    )
+}
+
+#[test]
+fn text_runs_and_paragraph_properties_come_through() {
+    let c = convert(&sample(), Format::Doc, &Limits::default()).unwrap();
+    assert_eq!(c.paragraphs, 2);
+    let d = part(&c.docx, "word/document.xml");
+    assert!(d.contains("<w:jc w:val=\"center\"/>"), "{d}");
+    assert!(d.contains("<w:spacing w:after=\"360\"/>"), "{d}");
+    // The bold run is "bold", the underlined 24 pt run "words".
+    assert!(
+        d.contains("<w:rPr><w:b/></w:rPr><w:t xml:space=\"preserve\">bold</w:t>"),
+        "{d}"
+    );
+    assert!(
+        d.contains("<w:rPr><w:sz w:val=\"48\"/><w:u w:val=\"single\"/></w:rPr><w:t xml:space=\"preserve\">words</w:t>"),
+        "{d}"
+    );
+    assert!(d.contains(">Plain </w:t>"), "{d}");
+    // A tab and a line break in the second paragraph.
+    assert!(
+        d.contains("Second</w:t><w:tab/><w:t xml:space=\"preserve\">tab and</w:t><w:br/><w:t xml:space=\"preserve\">break</w:t>"),
+        "{d}"
+    );
+    // The default page, since the section has no properties of its own.
+    assert!(d.contains("<w:pgSz w:w=\"12240\" w:h=\"15840\"/>"), "{d}");
+}
+
+#[test]
+fn the_package_has_the_parts_a_reader_needs() {
+    let c = convert(&sample(), Format::Doc, &Limits::default()).unwrap();
+    for p in [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "word/document.xml",
+        "word/_rels/document.xml.rels",
+        "word/styles.xml",
+        "word/settings.xml",
+    ] {
+        assert!(has_part(&c.docx, p), "{p}");
+    }
+    let styles = part(&c.docx, "word/styles.xml");
+    assert!(styles.contains("w:styleId=\"Normal\""));
+}
+
+#[test]
+fn encrypted_and_old_files_are_refused_with_their_kinds() {
+    let enc = doc(
+        &[Para {
+            text: b"x\r".to_vec(),
+            runs: vec![],
+            grpprl: vec![],
+        }],
+        &Options {
+            encrypted: true,
+            ..Options::default()
+        },
+    );
+    assert_eq!(
+        convert(&enc, Format::Doc, &Limits::default()).unwrap_err(),
+        Error::Encrypted
+    );
+    let old = doc(
+        &[Para {
+            text: b"x\r".to_vec(),
+            runs: vec![],
+            grpprl: vec![],
+        }],
+        &Options {
+            fib_version: 0x0065,
+            ..Options::default()
+        },
+    );
+    assert_eq!(
+        convert(&old, Format::Doc, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "unsupported"
+    );
+    assert_eq!(
+        convert(b"not a compound file", Format::Doc, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "not-format"
+    );
+}
+
+#[test]
+fn header_story_positions_at_the_end_of_the_range_are_ignored() {
+    // Found by fuzzing: the first header story starts at 0xFFFFFFFF.
+    let p = Para {
+        text: b"x\r".to_vec(),
+        runs: vec![],
+        grpprl: vec![],
+    };
+    let d = doc(
+        &[p],
+        &Options {
+            hdd: vec![0, 0, 0, 0, 0, 0, u32::MAX, u32::MAX],
+            ..Options::default()
+        },
+    );
+    let c = convert(&d, Format::Doc, &Limits::default()).unwrap();
+    assert_eq!(c.paragraphs, 1);
+}
+
+#[test]
+fn a_section_without_text_gives_its_headers_to_the_next() {
+    let p = Para {
+        text: b"body\r".to_vec(),
+        runs: vec![],
+        grpprl: vec![],
+    };
+    // The first section's default header (story 1) is "head\r" and the
+    // extra paragraph mark every story ends with; the second has none.
+    // Stories 0 to 5 are the note separators.
+    let mut hdd = vec![0u32; 8];
+    hdd.extend([6; 6]);
+    hdd.extend([6; 7]);
+    let d = doc(
+        &[p],
+        &Options {
+            hdd,
+            header: b"head\r\r".to_vec(),
+            empty_first_section: true,
+            ..Options::default()
+        },
+    );
+    let c = convert(&d, Format::Doc, &Limits::default()).unwrap();
+    assert!(part(&c.docx, "word/header1.xml").contains("head"));
+    let b = part(&c.docx, "word/document.xml");
+    assert_eq!(b.matches("<w:headerReference").count(), 1, "{b}");
+}
+
+#[test]
+fn tracked_changes_are_drawn_as_marked_text() {
+    let p = Para {
+        text: b"gone new kept\r".to_vec(),
+        // sprmCFRMarkDel on "gone", sprmCFRMark (inserted) on "new".
+        runs: vec![(0, 4, vec![0x00, 0x08, 1]), (5, 8, vec![0x01, 0x08, 1])],
+        grpprl: vec![],
+    };
+    let d = doc(&[p], &Options::default());
+    let c = convert(&d, Format::Doc, &Limits::default()).unwrap();
+    let b = part(&c.docx, "word/document.xml");
+    assert!(
+        b.contains("<w:color w:val=\"C00000\"/></w:rPr><w:t xml:space=\"preserve\">gone</w:t>")
+            && b.contains("<w:strike/>"),
+        "{b}"
+    );
+    assert!(
+        b.contains("<w:u w:val=\"single\"/></w:rPr><w:t xml:space=\"preserve\">new</w:t>"),
+        "{b}"
+    );
+    assert!(b.contains("<w:t xml:space=\"preserve\"> kept</w:t>"), "{b}");
+}
+
+fn sample6(six: &Six) -> Vec<u8> {
+    doc6(
+        &[
+            Para {
+                text: b"Plain bold words\r".to_vec(),
+                // Bold on "bold" (sprmCFBold), 12 pt on "words" (sprmCHps).
+                runs: vec![(6, 10, vec![85, 1]), (11, 16, vec![99, 24])],
+                // Centered (sprmPJc), 360 twips of space after (sprmPDyaAfter).
+                grpprl: vec![5, 1, 22, 0x68, 0x01],
+            },
+            Para {
+                text: b"Second\x09tab and\x0Bbreak\r".to_vec(),
+                // The first font of the table (sprmCFtc), whose name is Arial.
+                runs: vec![(0, 6, vec![93, 0, 0])],
+                grpprl: vec![],
+            },
+        ],
+        six,
+    )
+}
+
+#[test]
+fn word_6_text_and_formatting_come_through() {
+    let c = convert(&sample6(&Six::default()), Format::Doc, &Limits::default()).unwrap();
+    assert_eq!(c.paragraphs, 2);
+    let d = part(&c.docx, "word/document.xml");
+    assert!(d.contains("<w:jc w:val=\"center\"/>"), "{d}");
+    assert!(d.contains("<w:spacing w:after=\"360\"/>"), "{d}");
+    assert!(
+        d.contains("<w:rPr><w:b/></w:rPr><w:t xml:space=\"preserve\">bold</w:t>"),
+        "{d}"
+    );
+    assert!(
+        d.contains("<w:rPr><w:sz w:val=\"24\"/></w:rPr><w:t xml:space=\"preserve\">words</w:t>"),
+        "{d}"
+    );
+    assert!(
+        d.contains("<w:rFonts w:ascii=\"Arial\" w:hAnsi=\"Arial\"/></w:rPr><w:t xml:space=\"preserve\">Second</w:t></w:r>"),
+        "{d}"
+    );
+    assert!(
+        d.contains("<w:tab/><w:t xml:space=\"preserve\">tab and</w:t><w:br/>"),
+        "{d}"
+    );
+}
+
+#[test]
+fn word_6_headers_are_the_stories_the_section_says_it_has() {
+    let six = Six {
+        header: Some(b"head\r\r".to_vec()),
+        ..Six::default()
+    };
+    let c = convert(&sample6(&six), Format::Doc, &Limits::default()).unwrap();
+    assert!(part(&c.docx, "word/header1.xml").contains("head"));
+    assert!(!part(&c.docx, "word/settings.xml").contains("evenAndOddHeaders"));
+    // The document's facing pages setting is the file's.
+    let six = Six {
+        facing: true,
+        ..six
+    };
+    let c = convert(&sample6(&six), Format::Doc, &Limits::default()).unwrap();
+    assert!(part(&c.docx, "word/settings.xml").contains("evenAndOddHeaders"));
+}
+
+#[test]
+fn a_word_6_picture_is_its_metafile_at_the_size_its_header_gives() {
+    // The picture character, with sprmCPicLocation to the PIC at 0x600: a
+    // 58-byte header (mm 8 or the TIFF file name's 98, 1440 x 720 twips,
+    // scaled to `scale` of a thousand) and a metafile.
+    let wmf = [1u8, 0, 9, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+    let with = |mm: u16, scale: u16| {
+        let mut pic = vec![0u8; 58];
+        pic[..4].copy_from_slice(&(58 + wmf.len() as u32).to_le_bytes());
+        pic[4..6].copy_from_slice(&58u16.to_le_bytes());
+        pic[6..8].copy_from_slice(&mm.to_le_bytes());
+        pic[28..30].copy_from_slice(&1440u16.to_le_bytes());
+        pic[30..32].copy_from_slice(&720u16.to_le_bytes());
+        pic[32..34].copy_from_slice(&scale.to_le_bytes());
+        pic[34..36].copy_from_slice(&scale.to_le_bytes());
+        pic.extend_from_slice(&wmf);
+        let p = Para {
+            text: b"a\x01b\r".to_vec(),
+            runs: vec![(1, 2, vec![68, 4, 0x00, 0x06, 0, 0])],
+            grpprl: vec![],
+        };
+        let six = Six {
+            extra: vec![(0x600, pic)],
+            ..Six::default()
+        };
+        convert(&doc6(&[p], &six), Format::Doc, &Limits::default()).unwrap()
+    };
+    let c = with(8, 1000);
+    assert!(has_part(&c.docx, "word/media/image1.wmf"));
+    let b = part(&c.docx, "word/document.xml");
+    assert!(
+        b.contains("<wp:extent cx=\"914400\" cy=\"457200\"/>"),
+        "{b}"
+    );
+    // At half the size.
+    let b = part(&with(8, 500).docx, "word/document.xml");
+    assert!(
+        b.contains("<wp:extent cx=\"457200\" cy=\"228600\"/>"),
+        "{b}"
+    );
+    // A TIFF file's name is no picture.
+    assert!(!has_part(&with(98, 1000).docx, "word/media/image1.wmf"));
+}
+
+#[test]
+fn story_lengths_that_add_up_past_what_a_position_holds_are_cut() {
+    // Found by fuzzing: footnote, annotation and endnote stories of 2^31 - 1
+    // characters and a macro story of 2^32 - 1 overflowed the base of the
+    // endnote text.
+    let big = |v: u32| v.to_le_bytes().to_vec();
+    let six = Six {
+        extra: vec![
+            (56, big(0x7FFF_FFFF)),
+            (64, big(u32::MAX)),
+            (68, big(0x7FFF_FFFF)),
+            (72, big(0x7FFF_FFFF)),
+        ],
+        ..Six::default()
+    };
+    let _ = convert(&sample6(&six), Format::Doc, &Limits::default());
+}
+
+#[test]
+fn word_6_files_that_are_encrypted_or_damaged_are_told_so() {
+    let six = Six {
+        flags: 0x0100,
+        ..Six::default()
+    };
+    let e = convert(&sample6(&six), Format::Doc, &Limits::default()).unwrap_err();
+    assert_eq!(e, Error::Encrypted);
+    let six = Six {
+        header: Some(b"head\r\r".to_vec()),
+        ..Six::default()
+    };
+    let d = sample6(&six);
+    for cut in [100usize, 600, 1500, 3000] {
+        let _ = convert(&d[..cut.min(d.len())], Format::Doc, &Limits::default());
+    }
+    let mut m = d.clone();
+    for i in (0..m.len()).step_by(7) {
+        let was = m[i];
+        m[i] ^= 0xFF;
+        let _ = convert(&m, Format::Doc, &Limits::default());
+        m[i] = was;
+    }
+}
+
+#[test]
+fn check_boxes_show_their_state_from_the_form_field_data() {
+    // Two FORMCHECKBOX fields; the begin mark of each has sprmCFData and
+    // sprmCPicLocation to an FFData in the data stream: version, then the
+    // bits (type 1, state 1 or 0).
+    let field = |at: u32| {
+        let mut g = vec![0x06, 0x08, 1, 0x03, 0x6A];
+        g.extend_from_slice(&at.to_le_bytes());
+        g
+    };
+    // A checked and an unchecked check box, then a text box (type 0) whose
+    // state bits say 1, then a check box begin mark that has the location
+    // but not the data flag.
+    let mut data = vec![];
+    for (kind, state) in [(1u16, 1u16), (1, 0), (0, 1)] {
+        data.extend_from_slice(&0xFFFF_FFFFu32.to_le_bytes());
+        data.extend_from_slice(&(kind | state << 2).to_le_bytes());
+        data.extend_from_slice(&[0; 10]);
+    }
+    let unit = b"\x13 FORMCHECKBOX \x15 ";
+    let mut text = unit.repeat(4);
+    text.push(b'\r');
+    let p = Para {
+        text,
+        runs: vec![
+            (0, 1, field(0)),
+            (17, 18, field(16)),
+            (34, 35, field(32)),
+            (51, 52, vec![0x03, 0x6A, 0, 0, 0, 0]),
+        ],
+        grpprl: vec![],
+    };
+    let d = doc(
+        &[p],
+        &Options {
+            data,
+            ..Options::default()
+        },
+    );
+    let c = convert(&d, Format::Doc, &Limits::default()).unwrap();
+    let b = part(&c.docx, "word/document.xml");
+    assert!(
+        b.matches('\u{2612}').count() == 1 && b.matches('\u{2610}').count() == 3,
+        "{b}"
+    );
+    assert!(b.find('\u{2612}') < b.find('\u{2610}'), "{b}");
+}
+
+#[test]
+fn cells_of_a_table_whose_row_never_ends_are_paragraphs() {
+    // sprmPFInTable on three paragraphs, the second ending a cell, and no
+    // row mark: a table with no row is not a table (a DOCX needs a row in
+    // it), the text stays, in order.
+    let p = |t: &[u8]| Para {
+        text: t.to_vec(),
+        runs: vec![],
+        grpprl: vec![0x16, 0x24, 1],
+    };
+    let d = doc(
+        &[p(b"one\x07"), p(b"two\r"), p(b"three\r")],
+        &Options::default(),
+    );
+    let c = convert(&d, Format::Doc, &Limits::default()).unwrap();
+    let b = part(&c.docx, "word/document.xml");
+    assert!(!b.contains("<w:tbl>"), "{b}");
+    let at = |s: &str| b.find(s).unwrap_or_else(|| panic!("{s}: {b}"));
+    assert!(
+        at(">one<") < at(">two<") && at(">two<") < at(">three<"),
+        "{b}"
+    );
+}
+
+#[test]
+fn table_depth_is_bounded() {
+    // Found by fuzzing: sprmPTableDepth (a four-byte operand) of 2^31
+    // opened that many table builders.
+    let p = Para {
+        text: b"x\r".to_vec(),
+        runs: vec![],
+        grpprl: vec![0x49, 0x66, 0, 0, 0, 0x80],
+    };
+    let d = doc(&[p], &Options::default());
+    let c = convert(
+        &d,
+        Format::Doc,
+        &Limits::default().with_max_memory(64 << 20),
+    )
+    .unwrap();
+    // Word nests tables 15 deep; the reader stops at 63.
+    let tables = part(&c.docx, "word/document.xml")
+        .matches("<w:tbl>")
+        .count();
+    assert!(tables <= 63, "{tables}");
+    assert!(part(&c.docx, "word/document.xml").contains(">x</w:t>"));
+}
+
+#[test]
+fn damaged_files_fail_without_panicking() {
+    let d = sample();
+    for cut in [0, 100, 512, 1500, 3000, d.len() / 2] {
+        let _ = convert(&d[..cut.min(d.len())], Format::Doc, &Limits::default());
+    }
+    // Every byte of the file flipped in turn: an answer, never a panic.
+    let mut m = d.clone();
+    for i in (0..m.len()).step_by(37) {
+        let was = m[i];
+        m[i] ^= 0xFF;
+        let _ = convert(&m, Format::Doc, &Limits::default());
+        m[i] = was;
+    }
+}
+
+#[test]
+fn the_limits_bound_the_conversion() {
+    let d = sample();
+    let e = convert(&d, Format::Doc, &Limits::default().with_max_paragraphs(1)).unwrap_err();
+    assert_eq!(e, Error::TooLarge("paragraphs"));
+    let e = convert(&d, Format::Doc, &Limits::default().with_max_memory(100)).unwrap_err();
+    assert_eq!(e.kind(), "too-large");
+    let mut small = Limits::default();
+    small.max_input = 10;
+    assert_eq!(
+        convert(&d, Format::Doc, &small).unwrap_err(),
+        Error::TooLarge("input")
+    );
+}
diff --git a/crates/exav-render/tests/office_docs_formats.rs b/crates/exav-render/tests/office_docs_formats.rs
new file mode 100644
index 00000000..83d4029b
--- /dev/null
+++ b/crates/exav-render/tests/office_docs_formats.rs
@@ -0,0 +1,593 @@
+//! The other formats, converted: the fixtures, and short documents written
+//! for what each case needs.
+
+#[path = "office_common/mod.rs"]
+mod common;
+
+use common::*;
+use exav_render::docs::{Error, Format, Limits, convert};
+use exav_render::formats::office::test_util::{PackageWriter, W, literal_block};
+
+fn fixture(name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/office/docs/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("{p}: {e}"))
+}
+
+fn run(input: &[u8], f: Format) -> Vec<u8> {
+    convert(input, f, &Limits::default()).unwrap().docx
+}
+
+fn body(docx: &[u8]) -> String {
+    part(docx, "word/document.xml")
+}
+
+/// The run (from its `<w:r>`) that holds `text`.
+fn run_of<'a>(d: &'a str, text: &str) -> &'a str {
+    let at = d
+        .find(text)
+        .unwrap_or_else(|| panic!("{text} is not in the document"));
+    let start = d[..at].rfind("<w:r>").unwrap_or(0);
+    &d[start..at]
+}
+
+#[test]
+fn every_fixture_has_the_same_content() {
+    for (name, f) in [
+        ("sample.doc", Format::Doc),
+        ("sample.odt", Format::Odt),
+        ("sample.fodt", Format::Fodt),
+        ("sample.rtf", Format::Rtf),
+    ] {
+        let docx = run(&fixture(name), f);
+        // ODF bolds the complex script too.
+        let d = body(&docx).replace("<w:bCs/>", "");
+        assert!(d.contains("Quarterly summary"), "{name}");
+        assert!(d.contains("twelve percent"), "{name}");
+        assert!(
+            d.contains("<w:tbl>") && d.matches("<w:tr>").count() == 2,
+            "{name}: {d}"
+        );
+        // The bold run is "twelve percent" and nothing around it.
+        assert!(
+            run_of(&d, "twelve percent").contains("<w:b/>"),
+            "{name}: {d}"
+        );
+        assert!(
+            !run_of(&d, "Revenue grew by").contains("<w:b/>"),
+            "{name}: {d}"
+        );
+        assert!(
+            !run_of(&d, "over the quarter").contains("<w:b/>"),
+            "{name}: {d}"
+        );
+        assert!(d.contains("Second item"), "{name}");
+    }
+}
+
+/// A flat ODT around `content`, with `extra` in the styles.
+fn fodt(styles: &str, content: &str) -> Vec<u8> {
+    format!(
+        r#"<?xml version="1.0"?><office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" office:mimetype="application/vnd.oasis.opendocument.text">{styles}<office:body><office:text>{content}</office:text></office:body></office:document>"#
+    )
+    .into_bytes()
+}
+
+#[test]
+fn odt_collapses_white_space_as_the_format_says() {
+    let d = body(&run(
+        &fodt(
+            "",
+            r#"<text:p>  a   b <text:s text:c="2"/>c<text:line-break/> d<text:tab/>e</text:p>"#,
+        ),
+        Format::Fodt,
+    ));
+    // Leading white space goes, runs collapse, text:s counts, a space after a
+    // break goes.
+    assert!(d.contains(">a b   c<"), "{d}");
+    assert!(
+        d.contains(
+            "<w:br/><w:t xml:space=\"preserve\">d</w:t><w:tab/><w:t xml:space=\"preserve\">e</w:t>"
+        ),
+        "{d}"
+    );
+}
+
+#[test]
+fn odt_master_pages_become_sections_with_headers() {
+    let styles = r#"<office:automatic-styles>
+<style:page-layout style:name="L1"><style:page-layout-properties fo:page-width="20cm" fo:page-height="30cm" fo:margin-top="1cm" fo:margin-bottom="1cm" fo:margin-left="2cm" fo:margin-right="2cm"/><style:header-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-bottom="0.2cm"/></style:header-style></style:page-layout>
+<style:page-layout style:name="L2"><style:page-layout-properties fo:page-width="29.7cm" fo:page-height="21cm" style:print-orientation="landscape" fo:margin-top="1cm" fo:margin-bottom="1cm" fo:margin-left="1cm" fo:margin-right="1cm"/></style:page-layout>
+<style:style style:name="Wide" style:family="paragraph" style:master-page-name="Landscape"/>
+</office:automatic-styles>
+<office:master-styles><style:master-page style:name="Standard" style:page-layout-name="L1"><style:header><text:p>Top of page</text:p></style:header></style:master-page><style:master-page style:name="Landscape" style:page-layout-name="L2"/></office:master-styles>"#;
+    let d = run(
+        &fodt(
+            styles,
+            r#"<text:p>one</text:p><text:p text:style-name="Wide">two</text:p>"#,
+        ),
+        Format::Fodt,
+    );
+    let b = body(&d);
+    assert_eq!(b.matches("<w:sectPr>").count(), 2, "{b}");
+    assert!(b.contains("<w:pgSz w:w=\"11339\" w:h=\"17008\"/>"), "{b}");
+    assert!(b.contains("w:orient=\"landscape\""), "{b}");
+    assert!(b.contains("<w:headerReference w:type=\"default\""), "{b}");
+    assert!(part(&d, "word/header1.xml").contains("Top of page"));
+    // The body starts below the header: 1 cm + 0.5 cm + 0.2 cm.
+    assert!(
+        b.contains("w:top=\"963\"") && b.contains("w:header=\"567\""),
+        "{b}"
+    );
+}
+
+#[test]
+fn odt_tables_keep_their_spans() {
+    let c = r#"<table:table><table:table-column table:number-columns-repeated="3"/>
+<table:table-row><table:table-cell table:number-columns-spanned="2" table:number-rows-spanned="2"><text:p>A</text:p></table:table-cell><table:covered-table-cell/><table:table-cell><text:p>B</text:p></table:table-cell></table:table-row>
+<table:table-row><table:covered-table-cell/><table:covered-table-cell/><table:table-cell><text:p>C</text:p></table:table-cell></table:table-row></table:table>"#;
+    let b = body(&run(&fodt("", c), Format::Fodt));
+    assert!(
+        b.contains("<w:gridSpan w:val=\"2\"/><w:vMerge w:val=\"restart\"/>"),
+        "{b}"
+    );
+    // The second row's first cell continues the merge, spanning two columns.
+    assert!(b.contains("<w:gridSpan w:val=\"2\"/><w:vMerge/>"), "{b}");
+    assert_eq!(b.matches("<w:tc>").count(), 4, "{b}");
+}
+
+#[test]
+fn odt_notes_comments_links_and_lists() {
+    let styles = r#"<office:styles><text:list-style style:name="N"><text:list-level-style-number text:level="1" style:num-format="1" style:num-suffix="."/></text:list-style></office:styles>"#;
+    let c = r##"<text:p>See<text:note text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p>The note</text:p></text:note-body></text:note> <text:a xlink:href="https://example.org/">site</text:a> <text:a xlink:href="javascript:alert(1)">bad</text:a> <text:a xlink:href="#mark">inner</text:a><office:annotation><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Ann Lee</dc:creator><text:p>Remark</text:p></office:annotation></text:p>
+<text:list text:style-name="N"><text:list-item><text:p>x</text:p></text:list-item></text:list>
+<text:list text:style-name="N"><text:list-item><text:p>y</text:p></text:list-item></text:list>
+<text:list text:style-name="N" text:continue-numbering="true"><text:list-item><text:p>z</text:p></text:list-item></text:list>"##;
+    let d = run(&fodt(styles, c), Format::Fodt);
+    let b = body(&d);
+    assert!(b.contains("<w:footnoteReference w:id=\"1\"/>"), "{b}");
+    assert!(part(&d, "word/footnotes.xml").contains("The note"));
+    assert!(b.contains("<w:hyperlink r:id=\"rId"), "{b}");
+    assert!(part(&d, "word/_rels/document.xml.rels").contains("https://example.org/"));
+    assert!(!part(&d, "word/_rels/document.xml.rels").contains("javascript"));
+    assert!(b.contains("w:anchor=\"mark\""), "{b}");
+    assert!(b.contains("<w:commentReference w:id=\"0\"/>"), "{b}");
+    assert!(part(&d, "word/comments.xml").contains("Ann Lee"));
+    // The second list starts over, the third continues the second.
+    let n = part(&d, "word/numbering.xml");
+    assert_eq!(n.matches("<w:num ").count(), 2, "{n}");
+    assert!(n.contains("<w:startOverride w:val=\"1\"/>"), "{n}");
+    assert_eq!(b.matches("<w:numId w:val=\"2\"/>").count(), 2, "{b}");
+}
+
+#[test]
+fn odt_pictures_come_from_the_package_and_the_flat_form() {
+    let png = [
+        0x89, b'P', b'N', b'G', 0x0D, 0x0A, 0x1A, 0x0A, 0, 0, 0, 13, b'I', b'H', b'D', b'R', 0, 0,
+        0, 2, 0, 0, 0, 3, 8, 2, 0, 0, 0,
+    ];
+    let frame = |inner: &str| {
+        format!(
+            r#"<text:p><draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" text:anchor-type="as-char" svg:width="2cm" svg:height="3cm">{inner}</draw:frame></text:p>"#
+        )
+    };
+    // Flat: base64 data.
+    let b64 = "iVBORw0KGgoAAAANSUhEUgAAAAIAAAADCAIAAAA=";
+    let d = run(
+        &fodt(
+            "",
+            &frame(&format!(
+                "<draw:image><office:binary-data>{b64}</office:binary-data></draw:image>"
+            )),
+        ),
+        Format::Fodt,
+    );
+    assert!(has_part(&d, "word/media/image1.png"));
+    assert!(
+        body(&d).contains("<wp:extent cx=\"720000\" cy=\"1080000\"/>"),
+        "{}",
+        body(&d)
+    );
+    // Package: a member named by xlink:href.
+    let content = format!(
+        r#"<?xml version="1.0"?><office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"><office:body><office:text>{}</office:text></office:body></office:document-content>"#,
+        frame(r#"<draw:image xlink:href="Pictures/a.png"/>"#)
+    );
+    let mut z = PackageWriter::new(1 << 20);
+    z.put(
+        "mimetype",
+        b"application/vnd.oasis.opendocument.text",
+        false,
+    )
+    .unwrap();
+    z.put("content.xml", content.as_bytes(), true).unwrap();
+    z.put("Pictures/a.png", &png, true).unwrap();
+    let d = run(&z.finish().unwrap(), Format::Odt);
+    assert!(has_part(&d, "word/media/image1.png"));
+}
+
+#[test]
+fn odt_refuses_what_is_not_text_and_what_is_encrypted() {
+    let mut z = PackageWriter::new(1 << 20);
+    z.put(
+        "mimetype",
+        b"application/vnd.oasis.opendocument.spreadsheet",
+        false,
+    )
+    .unwrap();
+    // A spreadsheet's mimetype over a content part that reads as a text.
+    z.put(
+        "content.xml",
+        br#"<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"><office:body><office:text><text:p>x</text:p></office:text></office:body></office:document-content>"#,
+        true,
+    )
+    .unwrap();
+    let e = convert(&z.finish().unwrap(), Format::Odt, &Limits::default()).unwrap_err();
+    assert_eq!(e.kind(), "not-format");
+    let mut z = PackageWriter::new(1 << 20);
+    z.put(
+        "mimetype",
+        b"application/vnd.oasis.opendocument.text",
+        false,
+    )
+    .unwrap();
+    z.put("content.xml", b"<a/>", true).unwrap();
+    z.put(
+        "META-INF/manifest.xml",
+        b"<m><manifest:encryption-data xmlns:manifest=\"x\"/></m>",
+        true,
+    )
+    .unwrap();
+    assert_eq!(
+        convert(&z.finish().unwrap(), Format::Odt, &Limits::default()).unwrap_err(),
+        Error::Encrypted
+    );
+    assert_eq!(
+        convert(b"not a zip", Format::Odt, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "not-format"
+    );
+    assert_eq!(
+        convert(b"<a/>", Format::Fodt, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "not-format"
+    );
+}
+
+#[test]
+fn odt_is_bounded() {
+    let paras: String = (0..50).map(|_| "<text:p>x</text:p>").collect();
+    let e = convert(
+        &fodt("", &paras),
+        Format::Fodt,
+        &Limits::default().with_max_paragraphs(10),
+    )
+    .unwrap_err();
+    assert_eq!(e, Error::TooLarge("paragraphs"));
+    // Deeply nested lists end, whatever they hold.
+    let mut s = String::new();
+    for _ in 0..200 {
+        s.push_str("<text:list><text:list-item>");
+    }
+    s.push_str("<text:p>deep</text:p>");
+    for _ in 0..200 {
+        s.push_str("</text:list-item></text:list>");
+    }
+    let _ = convert(&fodt("", &s), Format::Fodt, &Limits::default());
+}
+
+fn rtf(s: &str) -> String {
+    body(&run(s.as_bytes(), Format::Rtf))
+}
+
+#[test]
+fn rtf_text_has_the_formatting_in_effect_when_it_was_written() {
+    // The text before a control word has the formatting before it.
+    let d = rtf(
+        r"{\rtf1\ansi\deff0{\fonttbl{\f0 Times New Roman;}{\f1 Arial;}}{\colortbl;\red255\green0\blue0;}\pard a \b bold\b0  b {\i italic} c {\cf1 red} d {\f1\fs40 big}\par}",
+    );
+    assert!(d.contains("<w:r><w:t xml:space=\"preserve\">a </w:t></w:r><w:r><w:rPr><w:b/></w:rPr><w:t xml:space=\"preserve\">bold</w:t></w:r>"), "{d}");
+    // \b0 stays in force: the groups that follow are not bold either.
+    assert!(
+        d.contains(
+            "<w:rPr><w:b w:val=\"0\"/><w:i/></w:rPr><w:t xml:space=\"preserve\">italic</w:t>"
+        ),
+        "{d}"
+    );
+    assert!(d.contains("<w:rPr><w:b w:val=\"0\"/><w:color w:val=\"FF0000\"/></w:rPr><w:t xml:space=\"preserve\">red</w:t>"), "{d}");
+    assert!(d.contains("<w:rFonts w:ascii=\"Arial\" w:hAnsi=\"Arial\" w:eastAsia=\"Arial\" w:cs=\"Arial\"/><w:b w:val=\"0\"/><w:sz w:val=\"40\"/><w:szCs w:val=\"40\"/></w:rPr><w:t xml:space=\"preserve\">big</w:t>"), "{d}");
+}
+
+#[test]
+fn rtf_groups_closed_more_than_they_were_opened_are_ignored() {
+    // Found by fuzzing: a footnote that ends the document's only group, and a
+    // second closing brace.
+    let d = convert(
+        b"{\\rtf1\\ansi text.\xfb\\footnote footnote}}\n",
+        Format::Rtf,
+        &Limits::default(),
+    );
+    assert!(d.is_ok() || d.is_err());
+    let d = convert(b"{\\rtf1 a}}}} b\\par}", Format::Rtf, &Limits::default());
+    assert!(d.is_ok() || d.is_err());
+}
+
+#[test]
+fn rtf_positioned_paragraphs_are_frames() {
+    let d = rtf(
+        r"{\rtf1\ansi\pard\pvpg\phpg\posx1143\posy4743\absw9615\absh-2922\dfrmtxtx72\dfrmtxty36\nowrap Hello\par\pard\phmrg\posxc\pvpara\posyb\absh300 More\par}",
+    );
+    assert!(
+        d.contains("<w:framePr w:w=\"9615\" w:h=\"2922\" w:hRule=\"exact\" w:hSpace=\"72\" w:vSpace=\"36\" w:wrap=\"notBeside\" w:hAnchor=\"page\" w:vAnchor=\"page\" w:x=\"1143\" w:y=\"4743\"/>"),
+        "{d}"
+    );
+    assert!(
+        d.contains("<w:framePr w:h=\"300\" w:hRule=\"atLeast\" w:hAnchor=\"margin\" w:vAnchor=\"text\" w:xAlign=\"center\" w:yAlign=\"bottom\"/>"),
+        "{d}"
+    );
+}
+
+#[test]
+fn rtf_characters_in_every_encoding() {
+    // \'e9 in the code page, \u with its fallback skipped, Cyrillic by font charset.
+    let d = rtf(
+        "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0 A;}{\\f1\\fcharset204 B;}}caf\\'e9 \\u8364?x \\uc0\\u233 y {\\f1\\'cf\\'f0\\'e8}\\par}",
+    );
+    assert!(d.contains("café €x éy"), "{d}");
+    assert!(d.contains("При"), "{d}");
+}
+
+#[test]
+fn rtf_tables_lists_sections_and_notes() {
+    let d = run(
+        b"{\\rtf1\\ansi{\\*\\listtable{\\list\\listid1{\\listlevel\\levelnfc23\\levelstartat1{\\leveltext\\'01\\u8226 ?;}{\\levelnumbers;}\\fi-360\\li720}}}{\\*\\listoverridetable{\\listoverride\\listid1\\ls1}}\n\\paperw11906\\paperh16838\\margl1000\\margr1000\\margt1000\\margb1000\n\\pard\\ls1\\ilvl0 item\\par\n\\trowd\\trgaph108\\cellx2000\\cellx5000\\pard\\intbl a\\cell b\\cell\\row\n\\trowd\\trgaph108\\cellx2000\\cellx5000\\pard\\intbl c\\cell d\\cell\\row\n\\pard after\\chftn{\\footnote\\pard\\chftn  text of note}\\par\n{\\header\\pard head\\par}\\sect\\sectd\\landscape\\pgwsxn16838\\pghsxn11906 second\\par}",
+        Format::Rtf,
+    );
+    let b = body(&d);
+    assert!(b.contains("<w:numId w:val=\"1\"/>"), "{b}");
+    assert!(part(&d, "word/numbering.xml").contains("<w:numFmt w:val=\"bullet\"/>"));
+    assert_eq!(b.matches("<w:tr>").count(), 2, "{b}");
+    assert!(
+        b.contains("<w:gridCol w:w=\"2000\"/><w:gridCol w:w=\"3000\"/>"),
+        "{b}"
+    );
+    assert!(b.contains("<w:footnoteReference w:id=\"1\"/>"), "{b}");
+    assert!(part(&d, "word/footnotes.xml").contains("text of note"));
+    assert_eq!(b.matches("<w:sectPr>").count(), 2, "{b}");
+    assert!(b.contains("<w:pgSz w:w=\"11906\" w:h=\"16838\"/>"), "{b}");
+    // The second section's own size, landscape.
+    assert!(
+        b.contains("<w:pgSz w:w=\"16838\" w:h=\"11906\" w:orient=\"landscape\"/>"),
+        "{b}"
+    );
+    assert!(part(&d, "word/header1.xml").contains("head"));
+    // The mark in the note is the note's own.
+    assert!(
+        part(&d, "word/footnotes.xml").contains("<w:footnoteRef/>"),
+        "{}",
+        part(&d, "word/footnotes.xml")
+    );
+}
+
+#[test]
+fn rtf_pictures_and_links() {
+    let d = run(
+        br#"{\rtf1 {\pict\pngblip\picwgoal1440\pichgoal720 89504e470d0a1a0a0000000d49484452000000020000000308020000000000}
+{\field{\*\fldinst HYPERLINK "https://example.org/"}{\fldrslt link}} {\field{\*\fldinst HYPERLINK "javascript:x"}{\fldrslt bad}}\par}"#,
+        Format::Rtf,
+    );
+    assert!(has_part(&d, "word/media/image1.png"));
+    let b = body(&d);
+    assert!(
+        b.contains("<wp:extent cx=\"914400\" cy=\"457200\"/>"),
+        "{b}"
+    );
+    assert!(b.contains("<w:hyperlink r:id="), "{b}");
+    assert!(!part(&d, "word/_rels/document.xml.rels").contains("javascript"));
+}
+
+#[test]
+fn rtf_is_refused_when_it_is_not_and_bounded_when_it_is() {
+    assert_eq!(
+        convert(b"plain text", Format::Rtf, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "not-format"
+    );
+    // Groups nested past the bound.
+    let deep = format!("{{\\rtf1 {}x{}}}", "{".repeat(500), "}".repeat(500));
+    assert_eq!(
+        convert(deep.as_bytes(), Format::Rtf, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "malformed"
+    );
+    // Huge parameters do not overflow.
+    let _ = convert(
+        b"{\\rtf1 \\fs-2147483648 \\li2147483647 \\expnd99999999999 x\\par}",
+        Format::Rtf,
+        &Limits::default(),
+    );
+    let many: String = (0..100).map(|_| "x\\par ").collect();
+    let e = convert(
+        format!("{{\\rtf1 {many}}}").as_bytes(),
+        Format::Rtf,
+        &Limits::default().with_max_paragraphs(5),
+    )
+    .unwrap_err();
+    assert_eq!(e, Error::TooLarge("paragraphs"));
+}
+
+#[test]
+fn word_2003_xml() {
+    let x = String::from_utf8(fixture("sample-2003.xml")).unwrap();
+    let d = run(x.as_bytes(), Format::Wml2003);
+    let b = body(&d);
+    assert!(
+        b.contains("<w:pStyle w:val=\"H1\"/><w:jc w:val=\"center\"/>"),
+        "{b}"
+    );
+    assert!(b.contains("<w:i/><w:color w:val=\"0000FF\"/>"), "{b}");
+    assert!(b.contains("<w:hyperlink r:id="), "{b}");
+    assert!(
+        b.contains("<w:gridCol w:w=\"2500\"/>") && b.contains(">c2<"),
+        "{b}"
+    );
+    // The last section's properties are the document's.
+    assert!(
+        b.contains("<w:pgSz w:w=\"11906\" w:h=\"16838\"/>") && b.contains("w:left=\"1200\""),
+        "{b}"
+    );
+    assert_eq!(b.matches("<w:sectPr>").count(), 1, "{b}");
+    assert!(part(&d, "word/styles.xml").contains("w:styleId=\"H1\""));
+    // UTF-16 text works as well.
+    let mut u16: Vec<u8> = vec![0xFF, 0xFE];
+    u16.extend(x.encode_utf16().flat_map(|c| c.to_le_bytes()));
+    assert!(body(&run(&u16, Format::Wml2003)).contains(">Title<"));
+    assert_eq!(
+        convert(b"<a/>", Format::Wml2003, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "not-format"
+    );
+}
+
+/// An IWA stream of objects: (id, type, message).
+fn iwa(objects: &[(u64, u32, W)]) -> Vec<u8> {
+    let mut raw = vec![];
+    for (id, ty, m) in objects {
+        let info = W::default().uint(1, *id).msg(
+            2,
+            W::default()
+                .uint(1, u64::from(*ty))
+                .uint(3, m.0.len() as u64),
+        );
+        raw.extend(W::varint_len(info.0.len() as u64));
+        raw.extend(&info.0);
+        raw.extend(&m.0);
+    }
+    let block = literal_block(&raw);
+    let mut out = vec![
+        0,
+        block.len() as u8,
+        (block.len() >> 8) as u8,
+        (block.len() >> 16) as u8,
+    ];
+    out.extend(block);
+    out
+}
+
+#[test]
+fn pages_text_with_its_styles_and_page() {
+    let table = |entries: &[(u64, Option<u64>)]| {
+        let mut t = W::default();
+        for (i, o) in entries {
+            let mut e = W::default().uint(1, *i);
+            if let Some(o) = o {
+                e = e.reference(2, *o);
+            }
+            t = t.msg(1, e);
+        }
+        t
+    };
+    let text = "Title\nBody words here";
+    let storage = W::default()
+        .bytes(3, text.as_bytes())
+        .msg(5, table(&[(0, Some(3)), (6, Some(4))]))
+        .msg(8, table(&[(0, Some(6)), (11, Some(5)), (16, Some(6))]));
+    // A bold 20 pt centered paragraph style, a plain one, an italic character
+    // style and an empty one.
+    let pstyle = |bold: bool, size: f32, align: u64| {
+        let mut chars = W::default();
+        if bold {
+            chars = chars.uint(1, 1);
+        }
+        chars = chars.float(3, size);
+        W::default()
+            .msg(11, chars)
+            .msg(12, W::default().uint(1, align))
+    };
+    let doc = W::default()
+        .reference(4, 2)
+        .float(30, 595.0)
+        .float(31, 842.0)
+        .float(32, 72.0)
+        .float(33, 36.0)
+        .float(34, 72.0)
+        .float(35, 36.0);
+    let objects = [
+        (1, 10000, doc),
+        (2, 2001, storage),
+        (3, 2022, pstyle(true, 20.0, 2)),
+        (4, 2022, pstyle(false, 12.0, 0)),
+        (5, 2021, W::default().msg(11, W::default().uint(2, 1))),
+        (6, 2021, W::default().msg(11, W::default())),
+    ];
+    let mut z = PackageWriter::new(1 << 20);
+    z.put("Index/Document.iwa", &iwa(&objects), true).unwrap();
+    let d = run(&z.finish().unwrap(), Format::Pages);
+    let b = body(&d);
+    assert!(b.contains("<w:jc w:val=\"center\"/>"), "{b}");
+    assert!(b.contains("<w:b/><w:sz w:val=\"40\"/><w:szCs w:val=\"40\"/></w:rPr><w:t xml:space=\"preserve\">Title</w:t>"), "{b}");
+    assert!(b.contains("<w:i/><w:sz w:val=\"24\"/><w:szCs w:val=\"24\"/></w:rPr><w:t xml:space=\"preserve\">words</w:t>"), "{b}");
+    assert!(b.contains("<w:pgSz w:w=\"11900\" w:h=\"16840\"/>"), "{b}");
+    assert!(
+        b.contains("w:top=\"1440\"") && b.contains("w:left=\"720\""),
+        "{b}"
+    );
+    // No archives at all: not a Pages document; XML Pages are told apart.
+    let mut z = PackageWriter::new(1 << 20);
+    z.put("index.xml", b"<a/>", true).unwrap();
+    assert_eq!(
+        convert(&z.finish().unwrap(), Format::Pages, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "unsupported"
+    );
+    let mut z = PackageWriter::new(1 << 20);
+    z.put("other", b"x", true).unwrap();
+    assert_eq!(
+        convert(&z.finish().unwrap(), Format::Pages, &Limits::default())
+            .unwrap_err()
+            .kind(),
+        "not-format"
+    );
+}
+
+/// The memory bound counts what the model takes, which is a few kilobytes
+/// for a table cell and for a paragraph: 20,000 cells, or 100,000 paragraphs,
+/// hold some 100 and 270 MB.
+#[test]
+fn rtf_cells_and_paragraphs_are_counted_at_what_they_take() {
+    let cells = format!(
+        "{{\\rtf1 {}}}",
+        "\\trowd\\cellx100\\cell\\row".repeat(20_000)
+    );
+    let paras = format!("{{\\rtf1 {}}}", "x\\par ".repeat(100_000));
+    for rtf in [cells, paras] {
+        let within = |mib: u64| {
+            let limits = Limits::default().with_max_memory(mib << 20);
+            convert(rtf.as_bytes(), Format::Rtf, &limits)
+        };
+        assert_eq!(within(64).unwrap_err(), Error::TooLarge("memory"));
+        assert!(within(512).is_ok());
+    }
+}
+
+#[test]
+fn a_tree_of_elements_nothing_reads_is_charged_for() {
+    let x = format!(
+        "<w:wordDocument xmlns:w=\"http://schemas.microsoft.com/office/word/2003/wordml\"><w:body>{}</w:body></w:wordDocument>",
+        "<w:x/>".repeat(100_000)
+    );
+    let small = Limits::default().with_max_memory(8 << 20);
+    assert_eq!(
+        convert(x.as_bytes(), Format::Wml2003, &small).unwrap_err(),
+        Error::TooLarge("memory")
+    );
+    assert!(convert(x.as_bytes(), Format::Wml2003, &Limits::default()).is_ok());
+}
diff --git a/crates/exav-render/tests/office_docs_html.rs b/crates/exav-render/tests/office_docs_html.rs
new file mode 100644
index 00000000..6869e4f2
--- /dev/null
+++ b/crates/exav-render/tests/office_docs_html.rs
@@ -0,0 +1,303 @@
+//! HTML pages read as documents: Word's "Save as Web Page" (a `.doc` that is
+//! HTML), alone or in its MIME message, and other pages.
+
+#[path = "office_common/mod.rs"]
+mod common;
+
+use common::*;
+use exav_render::docs::{Error, Format, Limits, convert, text};
+
+fn run(html: &str) -> Vec<u8> {
+    convert(html.as_bytes(), Format::Html, &Limits::default())
+        .unwrap()
+        .docx
+}
+
+fn body(docx: &[u8]) -> String {
+    part(docx, "word/document.xml")
+}
+
+/// What Word writes: Office namespaces, an `xml` block and conditional
+/// comments in the head, a style sheet of `Mso` classes with a page, and
+/// paragraphs of `o:p`.
+const WORD: &str = r##"<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40">
+<head><meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<title>The title is not text of the page</title>
+<!--[if gte mso 9]><xml><w:WordDocument><w:View>Print</w:View></w:WordDocument></xml><![endif]-->
+<style><!--
+p.MsoNormal {margin:0cm; font-size:11.0pt; font-family:"Calibri"}
+span.red {color:#FF0000}
+@page WordSection1 {size:595.3pt 841.9pt; margin:72.0pt 54.0pt 72.0pt 54.0pt}
+div.WordSection1 {page:WordSection1}
+--></style><script>var hidden = "script text";</script></head>
+<body lang=EN-US><div class=WordSection1>
+<h1>Quarterly <i>summary</i></h1>
+<p class=MsoNormal>Revenue grew by <b>twelve percent</b>&nbsp;in <span class=red>May</span> &amp; June.<o:p></o:p></p>
+<p class=MsoNormal style='text-align:center'>Centered
+and  <u>underlined</u></p>
+<p><a href="https://example.org/a">a web link</a>, <a href="javascript:alert(1)">a script link</a>,
+<a href="file:///C:/secret.txt">a file link</a>, <a href="#top">a place</a> and <a name=top>an anchor</a>.</p>
+<ul><li>first<li>second<ol><li>nested one</ol></ul>
+<table border=1 cellpadding=2><tr><th>Head</th><td colspan=2>wide</td></tr>
+<tr><td rowspan=2>tall</td><td>b</td><td>c</td></tr><tr><td>d</td><td>e</td></tr></table>
+<p style="display:none">not shown</p>
+<pre>line one
+  line two</pre>
+</div></body></html>"##;
+
+#[test]
+fn a_word_page_is_read() {
+    let docx = run(WORD);
+    let d = body(&docx);
+    for shown in [
+        "Quarterly",
+        "twelve percent",
+        "May",
+        "&amp; June",
+        "a web link",
+        "nested one",
+    ] {
+        assert!(d.contains(shown), "{shown}: {d}");
+    }
+    for hidden in [
+        "not shown",
+        "script text",
+        "title is not text",
+        "WordDocument",
+    ] {
+        assert!(!d.contains(hidden), "{hidden}");
+    }
+    // The bold run is the bold words; the page's style gave the colour.
+    let at = d.find("twelve percent").unwrap();
+    assert!(
+        d[..at]
+            .rfind("<w:r>")
+            .map(|s| d[s..at].contains("<w:b/>"))
+            .unwrap_or(false),
+        "{d}"
+    );
+    let at = d.find(">May<").unwrap();
+    assert!(
+        d[..at]
+            .rfind("<w:r>")
+            .map(|s| d[s..at].contains("w:val=\"FF0000\""))
+            .unwrap_or(false),
+        "{d}"
+    );
+    // The heading, the centred paragraph, the page of the style sheet.
+    assert!(d.contains("<w:outlineLvl w:val=\"0\"/>"), "{d}");
+    assert!(d.contains("<w:jc w:val=\"center\"/>"), "{d}");
+    assert!(d.contains("<w:pgSz w:w=\"11906\" w:h=\"16838\"/>"), "{d}");
+    assert!(
+        d.contains("w:left=\"1080\"") && d.contains("w:top=\"1440\""),
+        "{d}"
+    );
+    // A table with its spans, and a line break of `pre` that stays.
+    assert!(
+        d.contains("<w:tbl>")
+            && d.contains("w:gridSpan w:val=\"2\"")
+            && d.contains("<w:vMerge w:val=\"restart\"/>"),
+        "{d}"
+    );
+    assert!(
+        d.matches("<w:vMerge/>").count() + d.matches("<w:vMerge w:val=\"continue\"/>").count() >= 1,
+        "{d}"
+    );
+    assert!(d.contains("<w:br/>") && d.contains("  line two"), "{d}");
+    // The list marks, in a paragraph of the item's own.
+    let t = text(WORD.as_bytes(), Format::Html, &Limits::default(), 1 << 20)
+        .unwrap()
+        .text;
+    assert!(
+        t.contains("\u{2022} first\n\u{2022} second\n1. nested one\n"),
+        "{t}"
+    );
+    // No paragraph for the white space between blocks.
+    assert!(!d.contains("<w:t xml:space=\"preserve\"></w:t>"), "{d}");
+}
+
+/// A link goes to a web, mail, phone or FTP address or to a place in the page,
+/// and nowhere else: a script, a file on the author's computer or a data
+/// address is text.
+#[test]
+fn only_safe_links_are_kept() {
+    let docx = run(WORD);
+    let d = body(&docx);
+    assert_eq!(d.matches("<w:hyperlink ").count(), 2, "{d}");
+    let rels = part(&docx, "word/_rels/document.xml.rels");
+    assert!(rels.contains("https://example.org/a"), "{rels}");
+    for refused in ["javascript", "secret.txt"] {
+        assert!(
+            !rels.contains(refused) && !d.contains(&format!("w:anchor=\"{refused}")),
+            "{refused}"
+        );
+    }
+    assert!(
+        d.contains("a script link") && d.contains("a file link"),
+        "{d}"
+    );
+    let more = run(
+        r#"<p><a href="data:text/html;base64,PHNjcmlwdD4=">d</a> <a href="MAILTO:a@b.c">m</a>
+        <a href="vbscript:x">v</a> <a href="relative.html">r</a> <a href="tel:+123">t</a></p>"#,
+    );
+    let m = body(&more);
+    assert_eq!(m.matches("<w:hyperlink ").count(), 2, "{m}");
+}
+
+/// The page, its pictures and its encodings in one MIME message (Word's
+/// "Single File Web Page", often named `.doc`).
+#[test]
+fn a_mime_wrapped_page_is_read_with_its_picture() {
+    // A 1x1 PNG.
+    let png = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGP4z8DwHwAFAAH/q842iQAAAABJRU5ErkJggg==";
+    let message = format!(
+        "MIME-Version: 1.0\r\nContent-Type: multipart/related; boundary=\"----=_NextPart_01\"; type=\"text/html\"\r\n\r\n\
+         This is a multi-part message in MIME format.\r\n\r\n------=_NextPart_01\r\n\
+         Content-Type: text/html; charset=\"utf-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\n\
+         Content-Location: file:///C:/Temp/page.html\r\n\r\n\
+         <html xmlns:w=3D\"urn:schemas-microsoft-com:office:word\"><body><p>Caf=C3=A9 =\r\nau lait</p>\
+         <p><img src=3D\"page_files/image001.png\" width=3D32 height=3D16 alt=3D\"logo\"></p>\
+         <p><img src=3D\"missing.png\" alt=3D\"gone\"></p></body></html>\r\n\
+         ------=_NextPart_01\r\nContent-Location: file:///C:/Temp/page_files/image001.png\r\n\
+         Content-Transfer-Encoding: base64\r\nContent-Type: image/png\r\n\r\n{png}\r\n\
+         ------=_NextPart_01--\r\n"
+    );
+    let docx = convert(message.as_bytes(), Format::Html, &Limits::default())
+        .unwrap()
+        .docx;
+    let d = body(&docx);
+    assert!(d.contains("Café au lait"), "{d}");
+    assert!(
+        d.contains("<w:drawing>") && d.contains("cx=\"304800\" cy=\"152400\""),
+        "{d}"
+    );
+    assert!(
+        d.contains("[gone]"),
+        "the picture that is not there is told by its text: {d}"
+    );
+    assert!(
+        !d.contains("MIME-Version") && !d.contains("NextPart"),
+        "{d}"
+    );
+    assert!(has_part(&docx, "word/media/image1.png"));
+    let t = text(
+        message.as_bytes(),
+        Format::Html,
+        &Limits::default(),
+        1 << 20,
+    )
+    .unwrap();
+    assert!(t.text.contains("Café au lait"), "{}", t.text);
+}
+
+#[test]
+fn a_picture_in_a_data_address_is_embedded() {
+    let png = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGP4z8DwHwAFAAH/q842iQAAAABJRU5ErkJggg==";
+    let d = body(&run(&format!(
+        r#"<p>x<img src="data:image/png;base64,{png}" width=10 height=10></p>"#
+    )));
+    assert!(d.contains("<w:drawing>"), "{d}");
+}
+
+#[test]
+fn what_is_not_html_is_refused_and_hostile_pages_are_bounded() {
+    let e = convert(b"just some text", Format::Html, &Limits::default()).unwrap_err();
+    assert_eq!(e.kind(), "not-format");
+    // Many paragraphs.
+    let many = "<p>x".repeat(200);
+    let e = convert(
+        many.as_bytes(),
+        Format::Html,
+        &Limits::default().with_max_paragraphs(5),
+    )
+    .unwrap_err();
+    assert_eq!(e, Error::TooLarge("paragraphs"));
+    // Elements nested far past what is kept, and tables in tables.
+    let deep = format!(
+        "<html><body>{}text{}</body></html>",
+        "<div>".repeat(50_000),
+        "</div>".repeat(50_000)
+    );
+    assert!(body(&run(&deep)).contains("text"));
+    let tables = format!(
+        "<html><body>{}cell{}</body></html>",
+        "<table><tr><td>".repeat(5_000),
+        "</td></tr></table>".repeat(5_000)
+    );
+    assert!(convert(tables.as_bytes(), Format::Html, &Limits::default()).is_ok());
+    // Cells past the bound.
+    let cells = format!("<table><tr>{}</tr></table>", "<td>c".repeat(100));
+    let e = convert(
+        cells.as_bytes(),
+        Format::Html,
+        &Limits::default().with_max_cells(10),
+    )
+    .unwrap_err();
+    assert_eq!(e, Error::TooLarge("table cells"));
+}
+
+/// The text a scanner or a search reads: what the page shows.
+#[test]
+fn the_text_of_a_page_is_what_it_shows() {
+    let t = text(WORD.as_bytes(), Format::Html, &Limits::default(), 1 << 20).unwrap();
+    assert!(t.text.contains("Quarterly summary"), "{}", t.text);
+    assert!(
+        t.text
+            .contains("Revenue grew by twelve percent\u{a0}in May & June."),
+        "{}",
+        t.text
+    );
+    assert!(!t.text.contains("script text") && !t.text.contains("not shown"));
+}
+
+/// Tables left open and nested a hundred thousand deep are read to the
+/// depth elements nest to; the model they make is not as deep as the page.
+#[test]
+fn tables_nested_without_end_do_not_exhaust_the_stack() {
+    let page = format!("<body>{}cell</body>", "<table><tr><td>".repeat(100_000));
+    let docx = convert(page.as_bytes(), Format::Html, &Limits::default())
+        .unwrap()
+        .docx;
+    assert!(body(&docx).contains("cell"));
+}
+
+/// The cells a row span continues into are cells of the model, and are
+/// counted: 5,000 rows each spanning 1,000 rows made some 5 million of them.
+#[test]
+fn the_cells_a_row_span_continues_into_are_counted() {
+    let page = format!(
+        "<body><table>{}</table></body>",
+        "<tr><td rowspan=1000>x".repeat(5_000)
+    );
+    let limits = Limits::default().with_max_memory(256 << 20);
+    let e = convert(page.as_bytes(), Format::Html, &limits).unwrap_err();
+    assert!(matches!(e, Error::TooLarge(_)), "{e:?}");
+}
+
+/// Raw text elements are found by their end tag without a copy of the rest of
+/// the page for each: 200,000 of them are a page of a few MB, not a minute.
+#[test]
+fn many_raw_text_elements_are_linear() {
+    let page = format!(
+        "<body>{}</body>",
+        "<script></script><style></style>".repeat(100_000)
+    );
+    let start = std::time::Instant::now();
+    assert!(convert(page.as_bytes(), Format::Html, &Limits::default()).is_ok());
+    assert!(start.elapsed().as_secs() < 5, "{:?}", start.elapsed());
+}
+
+/// A link opened inside a link ends the first, as in HTML: links left open
+/// by the thousand do not nest into a model as deep.
+#[test]
+fn links_left_open_do_not_nest() {
+    let page = format!("<body>{}end</body>", "<a href='http://x/'>l".repeat(50_000));
+    let docx = convert(page.as_bytes(), Format::Html, &Limits::default())
+        .unwrap()
+        .docx;
+    assert!(body(&docx).contains("end"));
+    // Every link is a link of its own, none within another.
+    let d = body(&docx);
+    assert!(d.matches("<w:hyperlink").count() >= 40_000);
+}
diff --git a/crates/exav-render/tests/office_memory.rs b/crates/exav-render/tests/office_memory.rs
new file mode 100644
index 00000000..2328e38d
--- /dev/null
+++ b/crates/exav-render/tests/office_memory.rs
@@ -0,0 +1,550 @@
+//! What a converter holds, against what its limits say it holds.
+//!
+//! `Limits::max_memory` is an estimate the converter keeps as it builds its
+//! model: so much a paragraph, a shape, a cell, a tree node. An estimate that
+//! drifts from what the model really takes turns the limit into a number that
+//! protects nothing, and the scanner's own memory bound (the scan's budget is
+//! handed to these limits) with it. Each test here makes a document of one
+//! kind of unit, as many as the limit admits, and counts what the conversion
+//! allocated at its peak. The peak has to be within a small factor of the
+//! limit: the factor is the estimate's slack (the allocator's rounding, the
+//! output beside the model), not an excuse for ten times.
+
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+struct Counting;
+
+static NOW: AtomicUsize = AtomicUsize::new(0);
+static PEAK: AtomicUsize = AtomicUsize::new(0);
+
+unsafe impl GlobalAlloc for Counting {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        let p = unsafe { System.alloc(layout) };
+        if !p.is_null() {
+            let now = NOW.fetch_add(layout.size(), Ordering::Relaxed) + layout.size();
+            PEAK.fetch_max(now, Ordering::Relaxed);
+        }
+        p
+    }
+
+    unsafe fn dealloc(&self, p: *mut u8, layout: Layout) {
+        unsafe { System.dealloc(p, layout) };
+        NOW.fetch_sub(layout.size(), Ordering::Relaxed);
+    }
+
+    unsafe fn realloc(&self, p: *mut u8, layout: Layout, new: usize) -> *mut u8 {
+        let q = unsafe { System.realloc(p, layout, new) };
+        if !q.is_null() {
+            if new >= layout.size() {
+                let now =
+                    NOW.fetch_add(new - layout.size(), Ordering::Relaxed) + new - layout.size();
+                PEAK.fetch_max(now, Ordering::Relaxed);
+            } else {
+                NOW.fetch_sub(layout.size() - new, Ordering::Relaxed);
+            }
+        }
+        q
+    }
+}
+
+#[global_allocator]
+static ALLOCATOR: Counting = Counting;
+
+/// The counters are the process's: one test measures at a time.
+static ONE_AT_A_TIME: std::sync::Mutex<()> = std::sync::Mutex::new(());
+
+/// What `f` allocated at its peak, beyond what was held when it began. What it
+/// returns is kept alive until the measure is taken.
+fn peak_of<T>(f: impl FnOnce() -> T) -> (usize, T) {
+    let before = NOW.load(Ordering::Relaxed);
+    PEAK.store(before, Ordering::Relaxed);
+    let out = f();
+    (PEAK.load(Ordering::Relaxed).saturating_sub(before), out)
+}
+
+/// The most the limit may be exceeded by in practice.
+const SLACK: f64 = 2.0;
+
+/// Makes the document of `n` units, converts it under `limit` bytes of
+/// memory, and says what the conversion allocated at its peak, or `None` when
+/// it was refused.
+type Probe = dyn Fn(usize, u64) -> Option<usize>;
+
+/// The largest `n` in `1..=max` the probe admits, by bisection (admitting is
+/// monotone in `n`), and the peak of that conversion.
+fn largest(probe: &Probe, max: usize, limit: u64) -> (usize, usize) {
+    let (mut lo, mut hi) = (1usize, max);
+    let mut best = (0, 0);
+    while lo <= hi {
+        let mid = lo + (hi - lo) / 2;
+        match probe(mid, limit) {
+            Some(peak) => {
+                best = (mid, peak);
+                lo = mid + 1;
+            }
+            None => hi = mid - 1,
+        }
+    }
+    best
+}
+
+/// A conversion admitted at the limit must stay within [`SLACK`] times it.
+fn within_the_limit(what: &str, probe: &Probe, max: usize) {
+    within_the_limit_of(what, probe, max, 32 << 20);
+}
+
+/// As [`within_the_limit`], under `limit` bytes: for a unit so small that the
+/// largest document the test can build is under the usual limit.
+fn within_the_limit_of(what: &str, probe: &Probe, max: usize, limit: u64) {
+    let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+    let (n, peak) = largest(probe, max, limit);
+    eprintln!(
+        "{what}: {n} units admitted at {} MiB, peak {:.1} MiB ({:.2}x)",
+        limit >> 20,
+        peak as f64 / (1 << 20) as f64,
+        peak as f64 / limit as f64
+    );
+    assert!(n > 0, "{what}: not even one unit was admitted");
+    assert!(
+        (peak as f64) <= SLACK * limit as f64,
+        "{what}: the limit is {limit} bytes and the conversion held {peak} at {n} units"
+    );
+}
+
+mod docs {
+    use super::*;
+    use exav_render::docs::{Error, Format, Limits, convert};
+
+    fn at(input: &[u8], format: Format, limit: u64) -> Option<usize> {
+        let limits = Limits::default().with_max_memory(limit);
+        let (peak, out) = peak_of(|| convert(input, format, &limits));
+        match out {
+            Ok(_) => Some(peak),
+            Err(Error::TooLarge(_)) => None,
+            Err(e) => panic!("the document was not read: {e}"),
+        }
+    }
+
+    #[test]
+    fn a_flat_odt_of_paragraphs() {
+        within_the_limit(
+            "fodt paragraphs",
+            &|n, limit| {
+                let mut s = String::from(
+                    "<?xml version=\"1.0\"?><office:document \
+                     xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" \
+                     xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" \
+                     office:mimetype=\"application/vnd.oasis.opendocument.text\">\
+                     <office:body><office:text>",
+                );
+                for _ in 0..n {
+                    s.push_str("<text:p>a</text:p>");
+                }
+                s.push_str("</office:text></office:body></office:document>");
+                at(s.as_bytes(), Format::Fodt, limit)
+            },
+            2_000_000,
+        );
+    }
+
+    #[test]
+    fn a_flat_odt_of_text() {
+        within_the_limit(
+            "fodt text",
+            &|n, limit| {
+                let mut s = String::from(
+                    "<?xml version=\"1.0\"?><office:document \
+                     xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" \
+                     xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" \
+                     office:mimetype=\"application/vnd.oasis.opendocument.text\">\
+                     <office:body><office:text>",
+                );
+                let line = "a".repeat(20_000);
+                for _ in 0..n {
+                    s.push_str("<text:p>");
+                    s.push_str(&line);
+                    s.push_str("</text:p>");
+                }
+                s.push_str("</office:text></office:body></office:document>");
+                at(s.as_bytes(), Format::Fodt, limit)
+            },
+            4_000,
+        );
+    }
+
+    #[test]
+    fn an_rtf_of_paragraphs() {
+        within_the_limit(
+            "rtf paragraphs",
+            &|n, limit| {
+                let mut s = String::from("{\\rtf1\\ansi ");
+                for _ in 0..n {
+                    s.push_str("a\\par ");
+                }
+                s.push('}');
+                at(s.as_bytes(), Format::Rtf, limit)
+            },
+            4_000_000,
+        );
+    }
+
+    #[test]
+    fn an_rtf_of_text() {
+        within_the_limit(
+            "rtf text",
+            &|n, limit| {
+                let line = "a".repeat(20_000);
+                let mut s = String::from("{\\rtf1\\ansi ");
+                for _ in 0..n {
+                    s.push_str(&line);
+                    s.push_str("\\par ");
+                }
+                s.push('}');
+                at(s.as_bytes(), Format::Rtf, limit)
+            },
+            4_000,
+        );
+    }
+
+    #[test]
+    fn a_word_2003_xml_of_paragraphs() {
+        within_the_limit(
+            "wml paragraphs",
+            &|n, limit| {
+                let mut s = String::from(
+                    "<w:wordDocument xmlns:w=\"http://schemas.microsoft.com/office/word/2003/wordml\">\
+                     <w:body>",
+                );
+                for _ in 0..n {
+                    s.push_str("<w:p><w:r><w:t>a</w:t></w:r></w:p>");
+                }
+                s.push_str("</w:body></w:wordDocument>");
+                at(s.as_bytes(), Format::Wml2003, limit)
+            },
+            2_000_000,
+        );
+    }
+
+    #[test]
+    fn a_word_2003_xml_of_text() {
+        within_the_limit(
+            "wml text",
+            &|n, limit| {
+                let line = "a".repeat(20_000);
+                let mut s = String::from(
+                    "<w:wordDocument xmlns:w=\"http://schemas.microsoft.com/office/word/2003/wordml\">\
+                     <w:body>",
+                );
+                for _ in 0..n {
+                    s.push_str("<w:p><w:r><w:t>");
+                    s.push_str(&line);
+                    s.push_str("</w:t></w:r></w:p>");
+                }
+                s.push_str("</w:body></w:wordDocument>");
+                at(s.as_bytes(), Format::Wml2003, limit)
+            },
+            4_000,
+        );
+    }
+}
+
+mod word6 {
+    use super::*;
+    use exav_render::docs::{Error, Format, Limits, convert};
+    use exav_render::formats::office::test_util::build_cfb;
+
+    /// A Word 6 document of `n` one-letter paragraphs, its text in one piece.
+    fn doc6(n: usize) -> Vec<u8> {
+        let text = b"X\r".repeat(n);
+        let mut wd = vec![0u8; 512];
+        wd[0..2].copy_from_slice(&0xA5DBu16.to_le_bytes());
+        wd[2..4].copy_from_slice(&0x0065u16.to_le_bytes());
+        // Complex, not encrypted.
+        wd[10..12].copy_from_slice(&0x0004u16.to_le_bytes());
+        wd[28..32].copy_from_slice(&(text.len() as u32).to_le_bytes());
+        wd[52..56].copy_from_slice(&((n * 2) as i32).to_le_bytes());
+        let mut plc = vec![0u8, 0];
+        plc.extend(531u32.to_le_bytes());
+        plc.extend([0u8, 0]);
+        let mut clx = vec![2u8];
+        clx.extend((plc.len() as u16).to_le_bytes());
+        clx.extend(plc);
+        wd[352..356].copy_from_slice(&512u32.to_le_bytes());
+        wd[356..360].copy_from_slice(&(clx.len() as u32).to_le_bytes());
+        wd.extend(clx);
+        wd.extend(text);
+        build_cfb(&[("WordDocument", &wd)])
+    }
+
+    #[test]
+    fn paragraphs() {
+        within_the_limit(
+            "doc (Word 6) paragraphs",
+            &|n, limit| {
+                let input = doc6(n);
+                let limits = Limits::default().with_max_memory(limit);
+                let (peak, out) = peak_of(|| convert(&input, Format::Doc, &limits));
+                match out {
+                    Ok(_) => Some(peak),
+                    Err(Error::TooLarge(_)) => None,
+                    Err(e) => panic!("the document was not read: {e}"),
+                }
+            },
+            400_000,
+        );
+    }
+}
+
+mod slides {
+    use super::*;
+    use exav_render::formats::office::test_util::build_cfb;
+    use exav_render::slides::{Error, Format, Limits, convert};
+
+    fn rec(typ: u32, flag: u32, id: u32, body: &[u8]) -> Vec<u8> {
+        let mut v = vec![];
+        for x in [typ, flag, body.len() as u32, id] {
+            v.extend(x.to_le_bytes());
+        }
+        v.extend(body);
+        v
+    }
+
+    fn container(typ: u32, kids: &[Vec<u8>]) -> Vec<u8> {
+        rec(typ, 0xFFFF, 0, &kids.concat())
+    }
+
+    fn i32s(v: &[i32]) -> Vec<u8> {
+        v.iter().flat_map(|x| x.to_le_bytes()).collect()
+    }
+
+    /// A PowerPoint 95 stream of one slide holding `n` filled hexagons.
+    fn stream(n: usize) -> Vec<u8> {
+        let mut look = vec![0u8; 56];
+        look[12] = 0;
+        look[13] = 1;
+        let shape = container(
+            0x0BC0,
+            &[
+                rec(0x0BC1, 0, 0, &i32s(&[5, 0, 0, 0, 0, 100, 100, 0, 0, 0])),
+                rec(0x0BBD, 0, 0, &look),
+            ],
+        );
+        let shapes: Vec<Vec<u8>> = (0..n).map(|_| shape.clone()).collect();
+        let atom = rec(0x03E9, 0, 0, &i32s(&[5760, 4320]));
+        let slide = container(0x03EE, &[container(0x0BB8, &shapes)]);
+        let doc = container(0x03E8, &[atom, container(0x07D0, &[slide])]);
+        container(3, &[doc])
+    }
+
+    #[test]
+    fn shapes() {
+        // A shape is 150 bytes of file and well over 400 of memory, so the
+        // limit is one the largest file the builder writes (7 MB: past it the
+        // compound file needs a DIFAT) goes past.
+        within_the_limit_of(
+            "ppt (95) shapes",
+            &|n, limit| {
+                let input = build_cfb(&[("PowerPoint Document", &stream(n))]);
+                let limits = Limits::default().with_max_memory(limit);
+                let (peak, out) = peak_of(|| convert(&input, Format::Ppt, &limits));
+                match out {
+                    Ok(_) => Some(peak),
+                    Err(Error::TooLarge(_)) => None,
+                    Err(e) => panic!("the presentation was not read: {e}"),
+                }
+            },
+            45_000,
+            8 << 20,
+        );
+    }
+}
+
+mod sheets {
+    use super::*;
+    use exav_render::sheets::{Error, Format, Limits, convert};
+
+    fn record(id: u16, body: &[u8]) -> Vec<u8> {
+        let mut v = id.to_le_bytes().to_vec();
+        v.extend((body.len() as u16).to_le_bytes());
+        v.extend(body);
+        v
+    }
+
+    /// A BIFF8 workbook of one sheet of `n` shared-string cells.
+    fn workbook(n: usize) -> Vec<u8> {
+        let bof = |dt: u16| {
+            let mut b = vec![];
+            b.extend(0x0600u16.to_le_bytes());
+            b.extend(dt.to_le_bytes());
+            b.extend([0u8; 12]);
+            record(0x0809, &b)
+        };
+        let mut sst = vec![];
+        sst.extend(1u32.to_le_bytes());
+        sst.extend(1u32.to_le_bytes());
+        sst.extend([1, 0, 0, b'a']);
+        // The globals, with the sheet's BOF where the BOUNDSHEET says: the
+        // length of the globals does not depend on the offset.
+        let globals = |at: usize| {
+            let mut out = bof(0x0005);
+            out.extend(record(0x00FC, &sst));
+            let mut bound = vec![];
+            bound.extend((at as u32).to_le_bytes());
+            bound.extend([0, 0, 1, 0, b'S']);
+            out.extend(record(0x0085, &bound));
+            out.extend(record(0x000A, &[]));
+            out
+        };
+        let mut out = globals(globals(0).len());
+        out.extend(bof(0x0010));
+        for i in 0..n {
+            let mut c = vec![];
+            c.extend(((i / 200) as u16).to_le_bytes());
+            c.extend(((i % 200) as u16).to_le_bytes());
+            c.extend(0u16.to_le_bytes());
+            c.extend(0u32.to_le_bytes());
+            out.extend(record(0x00FD, &c));
+        }
+        out.extend(record(0x000A, &[]));
+        out
+    }
+
+    /// The spreadsheet name of column `n` (1 is `A`, 27 is `AA`).
+    fn column_name(mut n: usize) -> String {
+        let mut name = Vec::new();
+        while n > 0 {
+            n -= 1;
+            name.push(b'A' + (n % 26) as u8);
+            n /= 26;
+        }
+        name.reverse();
+        String::from_utf8(name).unwrap()
+    }
+
+    /// An ODS of 10,000 text cells and a chart of `n` series over all of them.
+    fn chart_ods(n: usize) -> Vec<u8> {
+        chart_ods_of(n, 20, 500)
+    }
+
+    /// An ODS of `cols` by `rows` text cells and a chart of `n` series over
+    /// all of them.
+    fn chart_ods_of(n: usize, cols: usize, rows: usize) -> Vec<u8> {
+        use std::io::Write as _;
+        let range = format!("Sheet.A1:.{}{rows}", column_name(cols));
+        let ns = "xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" \
+                  xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\" \
+                  xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" \
+                  xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\" \
+                  xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\" \
+                  xmlns:xlink=\"http://www.w3.org/1999/xlink\"";
+        let cell = format!(
+            "<table:table-cell office:value-type=\"string\"><text:p>{}</text:p></table:table-cell>",
+            "A".repeat(40)
+        );
+        let mut content = format!(
+            "<?xml version=\"1.0\"?><office:document-content {ns}><office:body><office:spreadsheet>\
+             <table:table table:name=\"Sheet\"><table:table-column table:number-columns-repeated=\"{cols}\"/>"
+        );
+        for r in 0..rows {
+            content.push_str("<table:table-row>");
+            content.push_str(&cell.repeat(cols));
+            if r == 0 {
+                content.push_str(
+                    "<table:table-cell><draw:frame draw:name=\"c1\"><draw:object xlink:href=\"./Object 1\"/>\
+                     </draw:frame></table:table-cell>",
+                );
+            }
+            content.push_str("</table:table-row>");
+        }
+        content.push_str(
+            "</table:table></office:spreadsheet></office:body></office:document-content>",
+        );
+        let series = format!(
+            "<chart:series chart:values-cell-range-address=\"{range}\" \
+             chart:label-cell-address=\"Sheet.A1\"/>"
+        )
+        .repeat(n);
+        let chart = format!(
+            "<?xml version=\"1.0\"?><office:document-content {ns}><office:body><office:chart>\
+             <chart:chart chart:class=\"chart:bar\"><chart:plot-area><chart:axis chart:dimension=\"x\">\
+             <chart:categories table:cell-range-address=\"{range}\"/></chart:axis>{series}\
+             </chart:plot-area></chart:chart></office:chart></office:body></office:document-content>"
+        );
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        let stored = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        z.start_file("mimetype", stored).unwrap();
+        z.write_all(b"application/vnd.oasis.opendocument.spreadsheet")
+            .unwrap();
+        let deflated = zip::write::SimpleFileOptions::default();
+        z.start_file("content.xml", deflated).unwrap();
+        z.write_all(content.as_bytes()).unwrap();
+        z.start_file("Object 1/content.xml", deflated).unwrap();
+        z.write_all(chart.as_bytes()).unwrap();
+        z.finish().unwrap().into_inner()
+    }
+
+    /// Every series of a chart gets its own copy of the cells it draws.
+    #[test]
+    fn chart_series_over_the_same_cells() {
+        within_the_limit(
+            "ods chart series",
+            &|n, limit| {
+                let input = chart_ods(n);
+                let limits = Limits::default().with_max_memory(limit);
+                let (peak, out) = peak_of(|| convert(&input, Format::Ods, &limits));
+                match out {
+                    Ok(_) => Some(peak),
+                    Err(Error::TooLarge(_)) => None,
+                    Err(e) => panic!("the workbook was not read: {e}"),
+                }
+            },
+            256,
+        );
+    }
+
+    /// The same at a hundred thousand cells, where a copy of the cells per
+    /// series is megabytes a series.
+    #[test]
+    fn chart_series_over_a_large_range() {
+        let _one = ONE_AT_A_TIME.lock().unwrap_or_else(|e| e.into_inner());
+        for (series, limit) in [(256, 256u64 << 20), (1024, 256 << 20), (1024, 1 << 30)] {
+            let input = chart_ods_of(series, 100, 1000);
+            let limits = Limits::default().with_max_memory(limit);
+            let (peak, out) = peak_of(|| convert(&input, Format::Ods, &limits));
+            let verdict = match &out {
+                Ok(_) => "converted",
+                Err(Error::TooLarge(_)) => "refused",
+                Err(e) => panic!("the workbook was not read: {e}"),
+            };
+            eprintln!(
+                "{series} series over 100,000 cells, limit {} MiB: {verdict}, peak {:.1} MiB",
+                limit >> 20,
+                peak as f64 / (1 << 20) as f64
+            );
+            assert!(
+                peak as f64 <= SLACK * limit as f64,
+                "the limit is {limit} bytes and the conversion held {peak} at {series} series"
+            );
+        }
+    }
+
+    #[test]
+    fn cells() {
+        within_the_limit(
+            "xls (BIFF8) cells",
+            &|n, limit| {
+                let input = workbook(n);
+                let limits = Limits::default().with_max_memory(limit);
+                let (peak, out) = peak_of(|| convert(&input, Format::Xls, &limits));
+                match out {
+                    Ok(_) => Some(peak),
+                    Err(Error::TooLarge(_)) => None,
+                    Err(e) => panic!("the workbook was not read: {e}"),
+                }
+            },
+            1_000_000,
+        );
+    }
+}
diff --git a/crates/exav-render/tests/office_sheets.rs b/crates/exav-render/tests/office_sheets.rs
new file mode 100644
index 00000000..4e67f4b1
--- /dev/null
+++ b/crates/exav-render/tests/office_sheets.rs
@@ -0,0 +1,294 @@
+//! The fixtures converted through the public API, the XLSX read back.
+
+use exav_render::sheets::{Error, Format, Limits, convert};
+use std::io::Read;
+
+fn fixture(name: &str) -> Vec<u8> {
+    std::fs::read(format!(
+        "{}/tests/fixtures/office/sheets/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    ))
+    .unwrap()
+}
+
+/// The XLSX's parts as text.
+struct Xlsx(zip::ZipArchive<std::io::Cursor<Vec<u8>>>);
+
+impl Xlsx {
+    fn of(name: &str, format: Format) -> Xlsx {
+        let c = convert(&fixture(name), format, &Limits::default()).unwrap();
+        Xlsx(zip::ZipArchive::new(std::io::Cursor::new(c.xlsx)).unwrap())
+    }
+
+    fn part(&mut self, name: &str) -> String {
+        let mut s = String::new();
+        self.0
+            .by_name(name)
+            .unwrap()
+            .read_to_string(&mut s)
+            .unwrap();
+        s
+    }
+}
+
+/// What every conversion of sample.fods shows, whatever it went through.
+fn budget(x: &mut Xlsx) {
+    let wb = x.part("xl/workbook.xml");
+    assert!(
+        wb.contains(r#"<sheet name="Budget""#) && wb.contains(r#"<sheet name="Notes""#),
+        "{wb}"
+    );
+    let sst = x.part("xl/sharedStrings.xml");
+    for s in [
+        "Item",
+        "Rent",
+        "Travel",
+        "Merged note across three columns",
+        "Second sheet",
+    ] {
+        assert!(sst.contains(s), "{s} in {sst}");
+    }
+    let s1 = x.part("xl/worksheets/sheet1.xml");
+    assert!(s1.contains("<f>SUM(B2:B4)</f><v>1635.49</v>"), "{s1}");
+    assert!(s1.contains(r#"<mergeCell ref="A6:C6"/>"#), "{s1}");
+    // The amount, a number; the date, a serial.
+    assert!(
+        s1.contains("<v>345.5</v>") && s1.contains("<v>45296</v>"),
+        "{s1}"
+    );
+    let st = x.part("xl/styles.xml");
+    assert!(st.contains("FF4472C4"), "the header's fill: {st}");
+    // #,##0.00, Excel's built-in format 4.
+    assert!(
+        st.contains(r#"<xf numFmtId="4""#),
+        "the amounts' format: {st}"
+    );
+    // TRUE, which the source's producer saved again as the number 1 (no boolean
+    // format in the source).
+    let s2 = x.part("xl/worksheets/sheet2.xml");
+    assert!(s2.contains("<v>1</v>"), "{s2}");
+}
+
+#[test]
+fn ods() {
+    budget(&mut Xlsx::of("sample.ods", Format::Ods));
+}
+
+#[test]
+fn fods() {
+    let mut x = Xlsx::of("sample.fods", Format::Fods);
+    budget(&mut x);
+    assert!(
+        x.part("xl/worksheets/sheet2.xml")
+            .contains(r#"t="b"><v>1</v>"#)
+    );
+}
+
+#[test]
+fn xls() {
+    budget(&mut Xlsx::of("sample.xls", Format::Xls));
+}
+
+#[test]
+fn numbers() {
+    let mut x = Xlsx::of("sample.numbers", Format::Numbers);
+    assert!(
+        x.part("xl/workbook.xml")
+            .contains(r#"<sheet name="Sheet 1""#)
+    );
+    let sst = x.part("xl/sharedStrings.xml");
+    assert!(sst.contains("SheetJS") && sst.contains("B3:D3"), "{sst}");
+    let s1 = x.part("xl/worksheets/sheet1.xml");
+    assert!(s1.contains(r#"<mergeCell ref="B3:D3"/>"#), "{s1}");
+    assert!(s1.contains(r#"showGridLines="0""#), "{s1}");
+}
+
+#[test]
+fn numbers_09() {
+    let mut x = Xlsx::of("numbers09.numbers", Format::Numbers);
+    let wb = x.part("xl/workbook.xml");
+    for name in [
+        "Checking - Account Categories",
+        "Checking - Transactions",
+        "Second sheet",
+    ] {
+        assert!(wb.contains(&format!(r#"<sheet name="{name}""#)), "{wb}");
+    }
+    let sst = x.part("xl/sharedStrings.xml");
+    assert!(
+        sst.contains("Beginning Balance") && sst.contains("Fill up SUV for camping trip"),
+        "{sst}"
+    );
+    // A formula on another table, its whole columns as their body rows.
+    let s1 = x.part("xl/worksheets/sheet1.xml");
+    assert!(
+        s1.contains("<f>SUMIF('Checking - Transactions'!$D$3:$D$14,A2,'Checking - Transactions'!E$3:E$14)</f>"),
+        "{s1}"
+    );
+    let s2 = x.part("xl/worksheets/sheet2.xml");
+    assert!(s2.contains(r#"<mergeCell ref="A1:B1"/>"#), "{s2}");
+    assert!(s2.contains(r#"ySplit="2""#), "the frozen header rows: {s2}");
+    // 2009-10-01.
+    assert!(s2.contains("<v>40087</v>"), "{s2}");
+    let st = x.part("xl/styles.xml");
+    assert!(
+        st.contains(r#"formatCode="&quot;€&quot;* #,##0.00;&quot;€&quot;* (#,##0.00)""#),
+        "the accounting format: {st}"
+    );
+    assert!(st.contains(r#"<name val="Cochin"/>"#), "{st}");
+}
+
+/// What each conversion of the text formats' budget table shows.
+fn text_budget(x: &mut Xlsx, merged: bool) {
+    let sst = x.part("xl/sharedStrings.xml");
+    for s in ["Item", "Rent", "Travel", "Merged note across three columns"] {
+        assert!(sst.contains(s), "{s} in {sst}");
+    }
+    let s1 = x.part("xl/worksheets/sheet1.xml");
+    assert!(s1.contains("<f>SUM(B2:B4)</f><v>1635.49</v>"), "{s1}");
+    assert!(
+        s1.contains("<v>345.5</v>") && s1.contains("<v>45297</v>"),
+        "{s1}"
+    );
+    assert_eq!(s1.contains(r#"<mergeCell ref="A7:C7"/>"#), merged, "{s1}");
+    let st = x.part("xl/styles.xml");
+    assert!(
+        st.contains(r#"<xf numFmtId="4""#),
+        "the amounts' format: {st}"
+    );
+    assert!(
+        st.contains(r#"formatCode="yyyy\-mm\-dd""#),
+        "the date's format: {st}"
+    );
+}
+
+#[test]
+fn xml_spreadsheet() {
+    let mut x = Xlsx::of("sample-2003.xml", Format::SpreadsheetMl);
+    let wb = x.part("xl/workbook.xml");
+    assert!(
+        wb.contains(r#"<sheet name="Budget""#) && wb.contains(r#"<sheet name="Notes""#),
+        "{wb}"
+    );
+    text_budget(&mut x, true);
+    assert!(x.part("xl/styles.xml").contains("FF4472C4"));
+    assert!(x.part("xl/worksheets/sheet1.xml").contains(r#"ySplit="1""#));
+    assert!(
+        x.part("xl/worksheets/sheet2.xml")
+            .contains(r#"t="b"><v>1</v>"#)
+    );
+}
+
+#[test]
+fn html_table() {
+    let mut x = Xlsx::of("sample.html", Format::Html);
+    assert!(
+        x.part("xl/workbook.xml")
+            .contains(r#"<sheet name="Budget""#)
+    );
+    text_budget(&mut x, true);
+    assert!(x.part("xl/styles.xml").contains("FF4472C4"));
+    assert!(x.part("xl/worksheets/sheet1.xml").contains(r#"ySplit="1""#));
+}
+
+#[test]
+fn sylk() {
+    let mut x = Xlsx::of("sample.slk", Format::Sylk);
+    text_budget(&mut x, false);
+}
+
+#[test]
+fn the_wrong_format_is_refused() {
+    let xls = fixture("sample.xls");
+    assert!(matches!(
+        convert(&xls, Format::Ods, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(&xls, Format::Numbers, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    let ods = fixture("sample.ods");
+    assert!(matches!(
+        convert(&ods, Format::Xls, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(&ods, Format::Numbers, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(b"", Format::Fods, &Limits::default()),
+        Err(Error::NotFormat(_) | Error::Malformed(_))
+    ));
+}
+
+#[test]
+fn limits_are_kept() {
+    for (name, format) in [
+        ("sample.xls", Format::Xls),
+        ("sample.ods", Format::Ods),
+        ("sample.numbers", Format::Numbers),
+        ("numbers09.numbers", Format::Numbers),
+        ("sample-2003.xml", Format::SpreadsheetMl),
+        ("sample.html", Format::Html),
+        ("sample.slk", Format::Sylk),
+    ] {
+        let data = fixture(name);
+        assert_eq!(
+            convert(&data, format, &Limits::default().with_max_cells(5)).unwrap_err(),
+            Error::TooLarge("cells"),
+            "{name}"
+        );
+        assert_eq!(
+            convert(&data, format, &Limits::default().with_max_memory(2000)).unwrap_err(),
+            Error::TooLarge("memory"),
+            "{name}"
+        );
+        let mut small = Limits::default();
+        small.max_input = 100;
+        assert_eq!(
+            convert(&data, format, &small).unwrap_err(),
+            Error::TooLarge("input"),
+            "{name}"
+        );
+    }
+}
+
+/// Every truncation of each fixture is refused or converted, never a panic.
+#[test]
+fn truncated_files() {
+    for (name, format) in [
+        ("sample.xls", Format::Xls),
+        ("sample.ods", Format::Ods),
+        ("sample.fods", Format::Fods),
+        ("sample.numbers", Format::Numbers),
+        ("numbers09.numbers", Format::Numbers),
+        ("sample-2003.xml", Format::SpreadsheetMl),
+        ("sample.html", Format::Html),
+        ("sample.slk", Format::Sylk),
+    ] {
+        let data = fixture(name);
+        let step = (data.len() / 200).max(1);
+        for n in (0..data.len()).step_by(step) {
+            let _ = convert(&data[..n], format, &Limits::default());
+        }
+    }
+}
+
+#[test]
+fn a_tree_of_elements_nothing_reads_is_charged_for() {
+    let x = format!(
+        "<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\">{}</Workbook>",
+        "<x/>".repeat(100_000)
+    );
+    let small = Limits::default().with_max_memory(8 << 20);
+    assert_eq!(
+        convert(x.as_bytes(), Format::SpreadsheetMl, &small).unwrap_err(),
+        Error::TooLarge("memory")
+    );
+    // Within the default bound the tree is read; a workbook of no sheet is
+    // what is refused then.
+    let e = convert(x.as_bytes(), Format::SpreadsheetMl, &Limits::default()).unwrap_err();
+    assert_ne!(e, Error::TooLarge("memory"));
+}
diff --git a/crates/exav-render/tests/office_slides.rs b/crates/exav-render/tests/office_slides.rs
new file mode 100644
index 00000000..c9e0252b
--- /dev/null
+++ b/crates/exav-render/tests/office_slides.rs
@@ -0,0 +1,543 @@
+//! The public API over the fixtures (see fixtures/office/slides/README.md).
+
+use exav_render::formats::office::test_util::Compound;
+use exav_render::formats::office::test_util::build_cfb as build;
+use exav_render::slides::{
+    Error, Format, Limits, convert, convert_first, convert_first_from, convert_keynote_package,
+};
+use std::io::Read;
+
+fn fixture(name: &str) -> Vec<u8> {
+    std::fs::read(format!(
+        "{}/tests/fixtures/office/slides/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    ))
+    .unwrap()
+}
+
+/// A part of a PPTX, as text.
+fn part(pptx: &[u8], name: &str) -> String {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    let mut s = String::new();
+    z.by_name(name).unwrap().read_to_string(&mut s).unwrap();
+    s
+}
+
+/// An ODP of one slide holding a bar chart object, written per ODF 1.3,
+/// whose series takes its values from `table`.
+fn chart_odp(table: &str) -> Vec<u8> {
+    use std::io::Write;
+    const NS: &str = r#"xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0""#;
+    let content = format!(
+        r#"<office:document-content {NS}><office:body><office:presentation><draw:page draw:name="p1"><draw:frame svg:x="1cm" svg:y="1cm" svg:width="8cm" svg:height="6cm"><draw:object xlink:href="./Object 1"/></draw:frame></draw:page></office:presentation></office:body></office:document-content>"#
+    );
+    let cell = |v: &str| match v.parse::<f64>() {
+        Ok(_) => format!(
+            r#"<table:table-cell office:value-type="float" office:value="{v}"><text:p>{v}</text:p></table:table-cell>"#
+        ),
+        Err(_) => format!(
+            r#"<table:table-cell office:value-type="string"><text:p>{v}</text:p></table:table-cell>"#
+        ),
+    };
+    let row =
+        |a: &str, b: &str| format!("<table:table-row>{}{}</table:table-row>", cell(a), cell(b));
+    let chart = format!(
+        r#"<office:document-content {NS}><office:body><office:chart><chart:chart chart:class="chart:bar" svg:width="8cm" svg:height="6cm"><chart:plot-area table:cell-range-address="local-table.$A$1:.$B$3" chart:data-source-has-labels="both"><chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="local-table.$A$2:.$A$3"/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y"/><chart:series chart:values-cell-range-address="{table}.$B$2:.$B$3" chart:label-cell-address="local-table.$B$1" chart:class="chart:bar"/></chart:plot-area><table:table table:name="local-table"><table:table-header-rows>{}</table:table-header-rows><table:table-rows>{}{}</table:table-rows></table:table></chart:chart></office:chart></office:body></office:document-content>"#,
+        row("", "Sales"),
+        row("Q1", "10"),
+        row("Q2", "20")
+    );
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    let opts = zip::write::SimpleFileOptions::default();
+    for (name, data) in [
+        (
+            "mimetype",
+            "application/vnd.oasis.opendocument.presentation",
+        ),
+        ("content.xml", content.as_str()),
+        ("Object 1/content.xml", chart.as_str()),
+    ] {
+        z.start_file(name, opts).unwrap();
+        z.write_all(data.as_bytes()).unwrap();
+    }
+    z.finish().unwrap().into_inner()
+}
+
+#[test]
+fn chart_objects_become_charts() {
+    let c = convert(&chart_odp("local-table"), Format::Odp, &Limits::default()).unwrap();
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(s1.contains("<c:chart "), "{s1}");
+    let chart = part(&c.pptx, "ppt/charts/chart1.xml");
+    assert!(chart.contains("<c:barChart>"), "{chart}");
+    assert!(chart.contains("Sales") && chart.contains("Q2") && chart.contains("<c:v>20</c:v>"));
+    assert!(part(&c.pptx, "[Content_Types].xml").contains("/ppt/charts/chart1.xml"));
+    // A range in another table: no reference, as there is no workbook for
+    // it to name.
+    let c = convert(&chart_odp("Table1"), Format::Odp, &Limits::default()).unwrap();
+    let chart = part(&c.pptx, "ppt/charts/chart1.xml");
+    assert!(
+        chart.contains("<c:barChart>") && !chart.contains("<c:f>"),
+        "{chart}"
+    );
+}
+
+fn names(pptx: &[u8]) -> Vec<String> {
+    let z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    z.file_names()
+        .filter_map(|n| n.ok().map(|n| n.to_string()))
+        .collect()
+}
+
+/// The PPTX's own structure: a presentation naming its slides, which name
+/// their layouts, which name their masters.
+fn check_package(pptx: &[u8], slides: usize) {
+    let n = names(pptx);
+    for p in [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "ppt/presentation.xml",
+        "ppt/slideMasters/slideMaster1.xml",
+        "ppt/slideLayouts/slideLayout1.xml",
+        "ppt/theme/theme1.xml",
+    ] {
+        assert!(n.iter().any(|x| x == p), "{p} missing");
+    }
+    let pres = part(pptx, "ppt/presentation.xml");
+    assert_eq!(pres.matches("<p:sldId ").count(), slides);
+    let types = part(pptx, "[Content_Types].xml");
+    for i in 1..=slides {
+        assert!(types.contains(&format!("/ppt/slides/slide{i}.xml")));
+        let rels = part(pptx, &format!("ppt/slides/_rels/slide{i}.xml.rels"));
+        assert!(rels.contains("slideLayout"));
+    }
+}
+
+#[test]
+fn flat_opendocument() {
+    let c = convert(&fixture("sample.fodp"), Format::Fodp, &Limits::default()).unwrap();
+    assert_eq!(c.slides, 2);
+    check_package(&c.pptx, 2);
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(s1.contains("Quarterly budget"));
+    assert!(s1.contains("<p:ph type=\"title\""));
+    // The list's bullets, the box's fill, the ellipse.
+    assert!(s1.contains("<a:buChar char=\"•\"/>"));
+    assert!(s1.contains("<a:srgbClr val=\"2A6099\"/>"));
+    assert!(s1.contains("prst=\"ellipse\""));
+    // The page size: 28 by 15.75 cm.
+    assert!(
+        part(&c.pptx, "ppt/presentation.xml").contains("<p:sldSz cx=\"10080000\" cy=\"5670000\"/>")
+    );
+    assert!(part(&c.pptx, "ppt/slides/slide2.xml").contains("Second slide text"));
+}
+
+#[test]
+fn opendocument_package() {
+    let c = convert(&fixture("sample.odp"), Format::Odp, &Limits::default()).unwrap();
+    assert_eq!(c.slides, 2);
+    check_package(&c.pptx, 2);
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(s1.contains("Revenue up 12%") && s1.contains("Costs flat"));
+    assert!(s1.contains("2A6099"));
+}
+
+#[test]
+fn powerpoint_97() {
+    let c = convert(&fixture("sample.ppt"), Format::Ppt, &Limits::default()).unwrap();
+    assert_eq!(c.slides, 2);
+    check_package(&c.pptx, 2);
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(s1.contains("Quarterly budget"));
+    assert!(s1.contains("Revenue up 12%"));
+    assert!(s1.contains("2A6099"), "the box's fill");
+    assert!(s1.contains("prst=\"ellipse\""));
+    assert!(part(&c.pptx, "ppt/slides/slide2.xml").contains("Second slide text"));
+}
+
+/// The chart of `chart.fodp`: a bar chart of three quarters' sales.
+fn check_sales_chart(pptx: &[u8]) {
+    assert!(part(pptx, "ppt/slides/slide1.xml").contains("<c:chart "));
+    let chart = part(pptx, "ppt/charts/chart1.xml");
+    assert!(chart.contains("<c:barChart>"), "{chart}");
+    for v in ["Sales", "Q1", "Q3", "<c:v>25</c:v>"] {
+        assert!(chart.contains(v), "{v} in {chart}");
+    }
+}
+
+#[test]
+fn charts_in_every_format_that_holds_them() {
+    for (name, format) in [
+        ("chart.ppt", Format::Ppt),
+        ("chart.odp", Format::Odp),
+        ("chart.fodp", Format::Fodp),
+    ] {
+        let c = convert(&fixture(name), format, &Limits::default()).unwrap();
+        check_sales_chart(&c.pptx);
+    }
+}
+
+#[test]
+fn keynote() {
+    let c = convert(&fixture("sample.key"), Format::Keynote, &Limits::default()).unwrap();
+    assert_eq!(c.slides, 1);
+    check_package(&c.pptx, 1);
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(s1.contains("Example Presentation"));
+    assert!(s1.contains("This is a subtitle."));
+    // The same document as a package directory, given file by file.
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(fixture("sample.key"))).unwrap();
+    let mut files = vec![];
+    for i in 0..z.len() {
+        let mut f = z.by_index(i).unwrap();
+        if f.is_dir() {
+            continue;
+        }
+        let mut v = vec![];
+        f.read_to_end(&mut v).unwrap();
+        files.push((f.name().map(|n| n.to_string()).unwrap_or_default(), v));
+    }
+    let refs: Vec<(&str, &[u8])> = files
+        .iter()
+        .map(|(n, d)| (n.as_str(), d.as_slice()))
+        .collect();
+    let p = convert_keynote_package(&refs, &Limits::default()).unwrap();
+    assert!(part(&p.pptx, "ppt/slides/slide1.xml").contains("Example Presentation"));
+}
+
+#[test]
+fn keynote_tables() {
+    let c = convert(&fixture("table.key"), Format::Keynote, &Limits::default()).unwrap();
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    // Four columns of 413.5 points, five rows of 160, and the style's
+    // banding on the body's every second row.
+    assert_eq!(s1.matches("<a:gridCol w=\"5251450\"/>").count(), 4, "{s1}");
+    assert_eq!(s1.matches("<a:tr h=\"2032000\">").count(), 5, "{s1}");
+    assert_eq!(s1.matches("E3E5E8").count(), 8, "{s1}");
+    assert!(!c.warnings.iter().any(|w| w.contains("tables")));
+}
+
+#[test]
+fn first_slides_only() {
+    for (name, format, total) in [
+        ("sample.ppt", Format::Ppt, 2),
+        ("sample.odp", Format::Odp, 2),
+        ("sample.fodp", Format::Fodp, 2),
+        ("sample.key", Format::Keynote, 1),
+    ] {
+        let c = convert_first(&fixture(name), format, &Limits::default(), 1).unwrap();
+        assert_eq!((c.slides, c.total_slides), (1, total), "{name}");
+        check_package(&c.pptx, 1);
+        assert!(!names(&c.pptx).iter().any(|n| n == "ppt/slides/slide2.xml"));
+        let all = convert(&fixture(name), format, &Limits::default()).unwrap();
+        assert_eq!((all.slides, all.total_slides), (total, total));
+    }
+}
+
+/// An ODP of two slides, the second showing a picture of `size` bytes.
+fn odp_with_picture(size: usize) -> Vec<u8> {
+    use std::io::Write;
+    let ns = r#"xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink""#;
+    let content = format!(
+        r#"<office:document-content {ns}><office:body><office:presentation><draw:page/><draw:page><draw:frame svg:width="8cm" svg:height="6cm"><draw:image xlink:href="Pictures/a.png"/></draw:frame></draw:page></office:presentation></office:body></office:document-content>"#
+    );
+    let mut png = b"\x89PNG\r\n\x1a\n".to_vec();
+    png.resize(size, 7);
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    // Stored, as pictures are: the package is as large as they are.
+    let opts =
+        zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored);
+    for (name, data) in [
+        (
+            "mimetype",
+            &b"application/vnd.oasis.opendocument.presentation"[..],
+        ),
+        ("content.xml", content.as_bytes()),
+        ("Pictures/a.png", &png),
+    ] {
+        z.start_file(name, opts).unwrap();
+        z.write_all(data).unwrap();
+    }
+    z.finish().unwrap().into_inner()
+}
+
+#[test]
+fn pictures_are_read_when_a_slide_shows_them() {
+    let odp = odp_with_picture(2 << 20);
+    let all = convert(&odp, Format::Odp, &Limits::default()).unwrap();
+    assert!(names(&all.pptx).iter().any(|n| n == "ppt/media/image1.png"));
+    // Within a memory bound the picture is past, the first slide converts
+    // alone: the picture is never read.
+    let small = Limits::default().with_max_memory(1 << 20);
+    assert_eq!(
+        convert(&odp, Format::Odp, &small).unwrap_err(),
+        Error::TooLarge("memory")
+    );
+    let first = convert_first(&odp, Format::Odp, &small, 1).unwrap();
+    assert!(
+        !names(&first.pptx)
+            .iter()
+            .any(|n| n.starts_with("ppt/media/"))
+    );
+}
+
+fn base64(d: &[u8]) -> String {
+    const A: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    let mut s = String::new();
+    for c in d.chunks(3) {
+        let n = c
+            .iter()
+            .enumerate()
+            .fold(0u32, |n, (i, b)| n | u32::from(*b) << (16 - 8 * i));
+        for k in 0..=c.len() {
+            s.push(A[(n >> (18 - 6 * k) & 63) as usize] as char);
+        }
+    }
+    while !s.len().is_multiple_of(4) {
+        s.push('=');
+    }
+    s
+}
+
+#[test]
+fn tiled_backgrounds_are_scaled_to_the_pictures_resolution() {
+    // A 100 by 50 PNG at 144 dpi (5669 dots per metre): two thirds of its 96 dpi size.
+    let mut png = b"\x89PNG\r\n\x1a\n".to_vec();
+    png.extend_from_slice(&13u32.to_be_bytes());
+    png.extend_from_slice(b"IHDR");
+    png.extend_from_slice(&100u32.to_be_bytes());
+    png.extend_from_slice(&50u32.to_be_bytes());
+    png.extend_from_slice(&[8, 2, 0, 0, 0, 0, 0, 0, 0]);
+    png.extend_from_slice(&9u32.to_be_bytes());
+    png.extend_from_slice(b"pHYs");
+    png.extend_from_slice(&5669u32.to_be_bytes());
+    png.extend_from_slice(&5669u32.to_be_bytes());
+    png.push(1);
+    png.extend_from_slice(&[0; 4]);
+    png.extend_from_slice(&[0, 0, 0, 0]);
+    png.extend_from_slice(b"IDAT");
+    let slide = |size: &str| {
+        let fodp = format!(
+            r#"<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" office:mimetype="application/vnd.oasis.opendocument.presentation"><office:styles><draw:fill-image draw:name="tile"><office:binary-data>{}</office:binary-data></draw:fill-image></office:styles><office:automatic-styles><style:style style:name="dp1" style:family="drawing-page"><style:drawing-page-properties draw:fill="bitmap" draw:fill-image-name="tile" style:repeat="repeat"{size}/></style:style></office:automatic-styles><office:body><office:presentation><draw:page draw:style-name="dp1"/></office:presentation></office:body></office:document>"#,
+            base64(&png)
+        );
+        let c = convert(fodp.as_bytes(), Format::Fodp, &Limits::default()).unwrap();
+        part(&c.pptx, "ppt/slides/slide1.xml")
+    };
+    let s1 = slide("");
+    // Two thirds, within what the resolution's rounding gives.
+    let sx: u32 = s1
+        .split_once(r#"<a:tile tx="0" ty="0" sx=""#)
+        .and_then(|(_, r)| r.split_once('"'))
+        .and_then(|(n, _)| n.parse().ok())
+        .unwrap_or_else(|| panic!("{s1}"));
+    assert!((66_600..=66_700).contains(&sx), "{sx}");
+    // A tile as large as the page is the picture stretched.
+    let s1 = slide(r#" draw:fill-image-width="100%" draw:fill-image-height="100%""#);
+    assert!(
+        s1.contains("<a:stretch>") && !s1.contains("<a:tile"),
+        "{s1}"
+    );
+}
+
+#[test]
+fn pictures_of_slides_not_converted_are_not_decoded() {
+    // The second slide's picture is 190 KB of noise: decoding it would pass
+    // a memory bound (100 KB) that the first slide alone, at about 12 KB,
+    // is well within.
+    for (name, format) in [("pictures.ppt", Format::Ppt), ("pictures.odp", Format::Odp)] {
+        let small = Limits::default().with_max_memory(100 << 10);
+        let media = |n: usize, limits: &Limits| {
+            let c = convert_first(&fixture(name), format, limits, n).unwrap();
+            let pics = names(&c.pptx)
+                .into_iter()
+                .filter(|n| n.starts_with("ppt/media/"))
+                .count();
+            (c.slides, c.total_slides, pics)
+        };
+        assert_eq!(media(1, &small), (1, 2, 1), "{name}");
+        assert_eq!(media(2, &Limits::default()), (2, 2, 2), "{name}");
+        let err = convert_first(&fixture(name), format, &small, 2).unwrap_err();
+        assert!(matches!(err, Error::TooLarge(_)), "{name}: {err:?}");
+    }
+}
+
+#[test]
+fn a_picture_past_64_mib_fails_the_conversion_that_reads_it() {
+    let odp = odp_with_picture((64 << 20) + 1);
+    assert_eq!(
+        convert(&odp, Format::Odp, &Limits::default()).unwrap_err(),
+        Error::TooLarge("a package part")
+    );
+    // At the bound it is read.
+    let odp = odp_with_picture(64 << 20);
+    let ok = convert(&odp, Format::Odp, &Limits::default()).unwrap();
+    assert!(names(&ok.pptx).iter().any(|n| n == "ppt/media/image1.png"));
+    // The first slide alone never reads it.
+    let odp = odp_with_picture((64 << 20) + 1);
+    assert!(convert_first(&odp, Format::Odp, &Limits::default(), 1).is_ok());
+}
+
+#[test]
+fn a_package_with_bytes_before_it_is_still_opened() {
+    // Something ahead of the archive (a self-extractor's stub) moves every offset.
+    let mut odp = vec![b'M'; 1000];
+    odp.extend(odp_with_picture(1 << 10));
+    let c = convert_first(&odp, Format::Odp, &Limits::default(), 1).unwrap();
+    assert_eq!((c.slides, c.total_slides), (1, 2));
+}
+
+/// A source that counts the bytes read from it.
+struct Counting<'a> {
+    c: std::io::Cursor<&'a [u8]>,
+    read: usize,
+}
+
+impl Read for Counting<'_> {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        let n = self.c.read(buf)?;
+        self.read += n;
+        Ok(n)
+    }
+}
+
+impl std::io::Seek for Counting<'_> {
+    fn seek(&mut self, to: std::io::SeekFrom) -> std::io::Result<u64> {
+        self.c.seek(to)
+    }
+}
+
+#[test]
+fn packages_are_read_part_by_part_from_a_source() {
+    let odp = odp_with_picture(2 << 20);
+    let mut src = Counting {
+        c: std::io::Cursor::new(&odp),
+        read: 0,
+    };
+    let c = convert_first_from(&mut src, Format::Odp, &Limits::default(), 1).unwrap();
+    assert_eq!((c.slides, c.total_slides), (1, 2));
+    assert!(src.read < 64 << 10, "{} bytes read", src.read);
+    // The whole document, through the same source: the picture is read.
+    let mut src = Counting {
+        c: std::io::Cursor::new(&odp),
+        read: 0,
+    };
+    let c = convert_first_from(&mut src, Format::Odp, &Limits::default(), 2).unwrap();
+    assert!(names(&c.pptx).iter().any(|n| n == "ppt/media/image1.png"));
+    assert!(src.read > 2 << 20);
+}
+
+#[test]
+fn wrong_formats_are_refused() {
+    let ppt = fixture("sample.ppt");
+    assert!(matches!(
+        convert(&ppt, Format::Odp, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(b"hello", Format::Ppt, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(&fixture("sample.odp"), Format::Keynote, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(b"<a/>", Format::Fodp, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+}
+
+#[test]
+fn limits_are_kept() {
+    let odp = fixture("sample.odp");
+    let few = Limits::default().with_max_shapes(2);
+    assert_eq!(
+        convert(&odp, Format::Odp, &few).unwrap_err(),
+        Error::TooLarge("shapes")
+    );
+    let small = Limits::default().with_max_memory(10_000);
+    assert_eq!(
+        convert(&odp, Format::Odp, &small).unwrap_err().kind(),
+        "too-large"
+    );
+    let mut tiny = Limits::default();
+    tiny.max_input = 100;
+    assert_eq!(
+        convert(&odp, Format::Odp, &tiny).unwrap_err(),
+        Error::TooLarge("input")
+    );
+}
+
+#[test]
+fn damaged_files_do_not_panic() {
+    for (name, format) in [
+        ("sample.ppt", Format::Ppt),
+        ("sample.odp", Format::Odp),
+        ("sample.fodp", Format::Fodp),
+        ("sample.key", Format::Keynote),
+    ] {
+        let data = fixture(name);
+        for cut in [10, data.len() / 3, data.len() / 2, data.len() - 1] {
+            let _ = convert(&data[..cut], format, &Limits::default());
+        }
+        let mut flipped = data.clone();
+        for i in (0..flipped.len()).step_by(97) {
+            flipped[i] ^= 0x5A;
+        }
+        let _ = convert(&flipped, format, &Limits::default());
+    }
+    // The PPT's records damaged in a sound compound file, which damage to
+    // the file around them mostly hides.
+    let ppt = fixture("sample.ppt");
+    let stream = Compound::open(&ppt)
+        .unwrap()
+        .stream(&["PowerPoint Document"])
+        .unwrap();
+    let cuts = (1..16).map(|k| stream.len() * k / 16);
+    for s in cuts
+        .map(|cut| stream[..cut].to_vec())
+        .chain((0..8).map(|k| {
+            let mut s = stream.clone();
+            for i in (k * 13..s.len()).step_by(211) {
+                s[i] ^= 0xA5;
+            }
+            s
+        }))
+    {
+        let _ = convert(
+            &build(&[("PowerPoint Document", &s)]),
+            Format::Ppt,
+            &Limits::default(),
+        );
+    }
+}
+
+/// The memory bound counts what a shape takes in the model, some 7 kB:
+/// 20,000 text boxes hold more than 100 MB.
+#[test]
+fn shapes_are_counted_at_what_they_take() {
+    let fodp = format!(
+        r#"<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:mimetype="application/vnd.oasis.opendocument.presentation"><office:body><office:presentation><draw:page>{}</draw:page></office:presentation></office:body></office:document>"#,
+        "<draw:frame><draw:text-box><text:p>x</text:p></draw:text-box></draw:frame>".repeat(20_000)
+    );
+    let within = |mib: u64| {
+        let limits = Limits::default().with_max_memory(mib << 20);
+        convert(fodp.as_bytes(), Format::Fodp, &limits)
+    };
+    assert_eq!(within(64).unwrap_err(), Error::TooLarge("memory"));
+    assert!(within(512).is_ok());
+}
+
+#[test]
+fn a_tree_of_elements_nothing_reads_is_charged_for() {
+    let x = format!(
+        "<office:document xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" office:mimetype=\"application/vnd.oasis.opendocument.presentation\">{}</office:document>",
+        "<office:x/>".repeat(100_000)
+    );
+    let small = Limits::default().with_max_memory(8 << 20);
+    assert_eq!(
+        convert(x.as_bytes(), Format::Fodp, &small).unwrap_err(),
+        Error::TooLarge("memory")
+    );
+}
diff --git a/crates/exav-render/tests/office_slides_draw.rs b/crates/exav-render/tests/office_slides_draw.rs
new file mode 100644
index 00000000..1f97462f
--- /dev/null
+++ b/crates/exav-render/tests/office_slides_draw.rs
@@ -0,0 +1,143 @@
+//! OpenDocument drawings (ODG, OTG, FODG) as slides: one slide to a page,
+//! named as the page is, in the pages' largest size.
+
+use exav_render::slides::{Error, Format, Limits, convert};
+use std::io::Read;
+
+fn fixture(name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/office/draw/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("{p}: {e}"))
+}
+
+fn part(pptx: &[u8], name: &str) -> String {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    let mut s = String::new();
+    z.by_name(name).unwrap().read_to_string(&mut s).unwrap();
+    s
+}
+
+#[test]
+fn each_page_is_a_slide_named_as_the_page_is() {
+    let c = convert(&fixture("sample.fodg"), Format::Fodg, &Limits::default()).unwrap();
+    assert_eq!((c.slides, c.total_slides), (2, 2));
+    assert!(part(&c.pptx, "ppt/slides/slide1.xml").contains(r#"<p:cSld name="Plan">"#));
+    assert!(part(&c.pptx, "ppt/slides/slide2.xml").contains(r#"<p:cSld name="Detail">"#));
+}
+
+#[test]
+fn the_presentation_has_the_largest_page_size() {
+    let c = convert(&fixture("sample.fodg"), Format::Fodg, &Limits::default()).unwrap();
+    // 21 by 14.8 cm, the other page being 10 by 10.
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="7560000" cy="5328000""#));
+}
+
+#[test]
+fn the_largest_page_is_found_wherever_it_is() {
+    // The first page now has the small master page, the second the large one.
+    let doc = String::from_utf8(fixture("sample.fodg"))
+        .unwrap()
+        .replace(r#"master-page-name="Large""#, "master-page-name=\"X\"")
+        .replace(r#"master-page-name="Small""#, r#"master-page-name="Large""#)
+        .replace("master-page-name=\"X\"", r#"master-page-name="Small""#);
+    let c = convert(doc.as_bytes(), Format::Fodg, &Limits::default()).unwrap();
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="7560000" cy="5328000""#));
+}
+
+#[test]
+fn a_layer_that_is_not_displayed_leaves_its_shapes_out() {
+    let c = convert(&fixture("sample.fodg"), Format::Fodg, &Limits::default()).unwrap();
+    let one = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(one.contains("Red box"));
+    assert!(!one.contains("Hidden note"));
+    assert!(part(&c.pptx, "ppt/slides/slide2.xml").contains("Detail"));
+}
+
+#[test]
+fn the_page_background_and_master_shapes_are_kept() {
+    let c = convert(&fixture("sample.fodg"), Format::Fodg, &Limits::default()).unwrap();
+    assert!(part(&c.pptx, "ppt/slides/slide1.xml").contains(r#"<a:srgbClr val="F4F0D8"/>"#));
+    // The master page of the first drawing holds a frame.
+    let master = part(&c.pptx, "ppt/slideMasters/slideMaster1.xml");
+    assert!(master.contains("<p:sp>"));
+}
+
+#[test]
+fn a_package_and_a_flat_file_give_the_same_pages() {
+    let flat = convert(&fixture("sample.fodg"), Format::Fodg, &Limits::default()).unwrap();
+    let zipped = convert(&fixture("sample.odg"), Format::Odg, &Limits::default()).unwrap();
+    assert_eq!(zipped.slides, flat.slides);
+    for n in 1..=2 {
+        let name = format!("ppt/slides/slide{n}.xml");
+        let a = part(&flat.pptx, &name);
+        let b = part(&zipped.pptx, &name);
+        let title = |s: &str| {
+            s.split("<p:cSld name=\"")
+                .nth(1)
+                .map(|t| t[..t.find('"').unwrap()].to_string())
+        };
+        assert_eq!(title(&a), title(&b));
+    }
+}
+
+#[test]
+fn extensions_name_the_drawing_formats() {
+    for (ext, format) in [
+        ("odg", Format::Odg),
+        ("otg", Format::Odg),
+        ("fodg", Format::Fodg),
+    ] {
+        assert_eq!(Format::from_extension(ext), Some(format));
+    }
+}
+
+#[test]
+fn a_presentation_is_not_a_drawing_and_a_drawing_is_not_a_presentation() {
+    let odp = std::fs::read(format!(
+        "{}/tests/fixtures/office/slides/sample.odp",
+        env!("CARGO_MANIFEST_DIR")
+    ))
+    .unwrap();
+    assert!(matches!(
+        convert(&odp, Format::Odg, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(&fixture("sample.odg"), Format::Odp, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        convert(&fixture("sample.fodg"), Format::Fodp, &Limits::default()),
+        Err(Error::NotFormat(_))
+    ));
+}
+
+#[test]
+fn the_old_media_type_of_a_drawing_is_read() {
+    let doc = String::from_utf8(fixture("sample.fodg"))
+        .unwrap()
+        .replace("opendocument.graphics", "opendocument.drawing");
+    assert!(convert(doc.as_bytes(), Format::Fodg, &Limits::default()).is_ok());
+}
+
+#[test]
+fn a_stroke_width_without_a_unit_is_in_hundredths_of_a_millimetre() {
+    let doc = String::from_utf8(fixture("sample.fodg"))
+        .unwrap()
+        .replace(r#"svg:stroke-width="0.05cm""#, r#"svg:stroke-width="5""#);
+    let c = convert(doc.as_bytes(), Format::Fodg, &Limits::default()).unwrap();
+    // 5 hundredths of a millimetre: 1800 EMU.
+    assert!(part(&c.pptx, "ppt/slides/slide1.xml").contains(r#"<a:ln w="1800">"#));
+}
+
+#[test]
+fn a_page_limit_applies_to_drawings_as_to_slides() {
+    let mut limits = Limits::default();
+    limits.max_slides = 1;
+    assert!(matches!(
+        convert(&fixture("sample.fodg"), Format::Fodg, &limits),
+        Err(Error::TooLarge(_))
+    ));
+}
diff --git a/crates/exav-render/tests/office_slides_keynote_xml.rs b/crates/exav-render/tests/office_slides_keynote_xml.rs
new file mode 100644
index 00000000..9b02a4ec
--- /dev/null
+++ b/crates/exav-render/tests/office_slides_keynote_xml.rs
@@ -0,0 +1,436 @@
+//! Keynote 1 to 5 documents (XML), over documents written here.
+
+use exav_render::slides::{Error, Format, Limits, convert, convert_keynote_package};
+use std::io::{Read, Write};
+
+fn part(pptx: &[u8], name: &str) -> String {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    let mut s = String::new();
+    z.by_name(name).unwrap().read_to_string(&mut s).unwrap();
+    s
+}
+
+fn zip_of(files: &[(&str, &[u8])]) -> Vec<u8> {
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+    let opts = zip::write::SimpleFileOptions::default();
+    for (name, data) in files {
+        z.start_file(*name, opts).unwrap();
+        z.write_all(data).unwrap();
+    }
+    z.finish().unwrap().into_inner()
+}
+
+fn gzip(d: &[u8]) -> Vec<u8> {
+    let mut g = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::fast());
+    g.write_all(d).unwrap();
+    g.finish().unwrap()
+}
+
+/// The header of a 2 by 2 pixel PNG: enough to be a picture.
+const PNG: &[u8] = b"\x89PNG\r\n\x1a\n\0\0\0\rIHDR\0\0\0\x02\0\0\0\x02\x08\x02\0\0\0";
+
+fn color(r: f64, g: f64, b: f64) -> String {
+    format!(r#"<sf:color sfa:r="{r}" sfa:g="{g}" sfa:b="{b}" sfa:a="1"/>"#)
+}
+
+fn geometry(x: f64, y: f64, w: f64, h: f64) -> String {
+    format!(
+        r#"<sf:geometry><sf:size sfa:w="{w}" sfa:h="{h}"/><sf:position sfa:x="{x}" sfa:y="{y}"/></sf:geometry>"#
+    )
+}
+
+/// A text frame holding one paragraph per entry: its style and its text.
+fn frame(paras: &[(&str, &str)]) -> String {
+    let ps: String = paras
+        .iter()
+        .map(|(style, text)| format!(r#"<sf:p sf:style="{style}">{text}<sf:br/></sf:p>"#))
+        .collect();
+    format!(
+        r#"<sf:text-storage><sf:stylesheet-ref sfa:IDREF="ss1"/><sf:text-body>{ps}</sf:text-body></sf:text-storage>"#
+    )
+}
+
+const NS: &str = r#"xmlns:key="http://developer.apple.com/namespaces/keynote2" xmlns:sf="http://developer.apple.com/namespaces/sf" xmlns:sfa="http://developer.apple.com/namespaces/sfa" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance""#;
+
+/// A Keynote 2 to 5 document of two slides: a master with a shape of its
+/// own, a title placeholder and a body, styles that inherit one another,
+/// and on the first slide a shape with text, a cropped picture and a movie.
+fn document() -> String {
+    let green = color(0.0, 1.0, 0.0);
+    let blue = color(0.0, 0.0, 1.0);
+    let red = color(1.0, 0.0, 0.0);
+    let grey = color(0.5, 0.5, 0.5);
+    let white = color(1.0, 1.0, 1.0);
+    let title = frame(&[("child", "Slide <sf:span sf:style=\"base\">title</sf:span>")]);
+    let body_frame = frame(&[("child", "Body text")]);
+    let hello = frame(&[
+        (
+            "child",
+            "Hello<sf:br/>again<sf:span sf:style=\"nullc\">spanned</sf:span>",
+        ),
+        ("plain", "Plain"),
+    ]);
+    let pos = geometry(100.0, 150.0, 300.0, 80.0);
+    let stub = r#"<sf:geometry><sf:size sfa:w="1" sfa:h="1"/><sf:position sfa:x="0" sfa:y="0"/></sf:geometry>"#;
+    let ph_geom = geometry(40.0, 20.0, 720.0, 90.0);
+    let frame_geom = geometry(300.0, 300.0, 200.0, 100.0);
+    let window = r#"<sf:size sfa:w="100" sfa:h="50"/><sf:position sfa:x="350" sfa:y="325"/>"#;
+    format!(
+        r#"<?xml version="1.0" encoding="UTF-8"?>
+<key:presentation {NS}>
+ <key:size sfa:w="800" sfa:h="600"/>
+ <key:theme-list><key:theme sfa:ID="th1">
+  <key:stylesheet sfa:ID="ss1"><sf:styles>
+   <sf:paragraphstyle sfa:ID="ps1" sf:ident="base"><sf:property-map>
+    <sf:fontName><sf:string sfa:string="Helvetica-Bold"/></sf:fontName>
+    <sf:fontSize><sf:number sfa:number="30"/></sf:fontSize>
+    <sf:fontColor>{red}</sf:fontColor>
+    <sf:alignment><sf:number sfa:number="2"/></sf:alignment>
+   </sf:property-map></sf:paragraphstyle>
+   <sf:paragraphstyle sfa:ID="ps2" sf:ident="child" sf:parent-ident="base"><sf:property-map>
+    <sf:fontSize><sf:number sfa:number="20"/></sf:fontSize>
+   </sf:property-map></sf:paragraphstyle>
+   <sf:characterstyle sfa:ID="cs1" sf:ident="nullc"><sf:property-map>
+    <sf:fontColor><sf:null/></sf:fontColor>
+   </sf:property-map></sf:characterstyle>
+   <sf:paragraphstyle sfa:ID="ps3" sf:ident="plain" sf:parent-ident="child"><sf:property-map>
+    <sf:fontColor><sf:null/></sf:fontColor>
+   </sf:property-map></sf:paragraphstyle>
+   <sf:shape-style sfa:ID="sh1" sf:ident="shape1"><sf:property-map>
+    <sf:fill>{green}</sf:fill>
+    <sf:stroke><sf:stroke sf:width="2" sf:cap="round">{blue}<sf:pattern sf:type="solid"/></sf:stroke></sf:stroke>
+   </sf:property-map></sf:shape-style>
+   <sf:placeholder-style sfa:ID="ph1"><sf:property-map><sf:geometry>{ph_geom}</sf:geometry></sf:property-map></sf:placeholder-style>
+  </sf:styles></key:stylesheet>
+ </key:theme></key:theme-list>
+ <key:master-slide-list>
+  <key:master-slide sfa:ID="m1" key:name="Plain">
+   <key:stylesheet sfa:ID="ssm1"><sf:parent-ref sfa:IDREF="ss1"/><sf:styles>
+    <sf:slide-style sfa:ID="bgm"><sf:property-map><sf:fill>{grey}</sf:fill></sf:property-map></sf:slide-style>
+   </sf:styles></key:stylesheet>
+   <key:style-ref sfa:IDREF="bgm"/>
+   <key:page><sf:layers>
+    <sf:layer><sf:type><sf:string sfa:string="BGMasterSlideLayer"/></sf:type><sf:drawables>
+     <sf:shape sfa:ID="mshape">{pos}<sf:style><sf:shape-style-ref sfa:IDREF="sh1"/></sf:style></sf:shape>
+     <sf:title-placeholder sfa:ID="mtp">{stub}<sf:style><sf:placeholder-style-ref sfa:IDREF="ph1"/></sf:style><sf:text>{title}</sf:text></sf:title-placeholder>
+    </sf:drawables></sf:layer>
+    <sf:layer><sf:type><sf:string sfa:string="BGMasterSlidePrototypeLayer"/></sf:type><sf:drawables>
+     <sf:shape sfa:ID="mproto">{geom}<sf:style><sf:shape-style-ref sfa:IDREF="sh1"/></sf:style></sf:shape>
+    </sf:drawables></sf:layer>
+   </sf:layers></key:page>
+  </key:master-slide>
+ </key:master-slide-list>
+ <key:slide-list>
+  <key:slide sfa:ID="s1">
+   <key:stylesheet sfa:ID="sss1"><sf:parent-ref sfa:IDREF="ssm1"/><sf:styles>
+    <sf:slide-style sfa:ID="bgs1"><sf:property-map><sf:fill>{white}</sf:fill></sf:property-map></sf:slide-style>
+   </sf:styles></key:stylesheet>
+   <key:master-ref sfa:IDREF="m1"/>
+   <key:style-ref sfa:IDREF="bgs1"/>
+   <key:bullets>
+    <key:headline key:depth="0"><key:text>{title}</key:text></key:headline>
+    <key:headline key:depth="1"><key:text>{body_frame}</key:text></key:headline>
+   </key:bullets>
+   <key:page><sf:layers><sf:layer><sf:drawables>
+    <sf:title-placeholder sfa:ID="tp1">{stub}<sf:style><sf:placeholder-style-ref sfa:IDREF="ph1"/></sf:style></sf:title-placeholder>
+    <sf:shape sfa:ID="a">{pos}<sf:style><sf:shape-style-ref sfa:IDREF="sh1"/></sf:style><sf:path><sf:bezier-path><sf:bezier sfa:path="M 0 0 L 300 0 L 300 80 Z"/></sf:bezier-path></sf:path><sf:text>{hello}</sf:text></sf:shape>
+    <sf:media sfa:ID="pic">{frame_geom}<sf:crop-geometry>{window}</sf:crop-geometry><sf:content><sf:image-media><sf:filtered-image><sf:unfiltered><sf:data sf:path="Data/pic.png"/></sf:unfiltered></sf:filtered-image></sf:image-media></sf:content></sf:media>
+    <sf:media sfa:ID="mov">{frame_geom2}<sf:content><sf:movie-media/></sf:content></sf:media>
+   </sf:drawables></sf:layer></sf:layers></key:page>
+  </key:slide>
+  <key:slide sfa:ID="s2">
+   <key:master-ref sfa:IDREF="m1"/>
+   <key:bullets><key:headline key:depth="0"><key:text>{second}</key:text></key:headline></key:bullets>
+   <key:page><sf:layers><sf:layer><sf:drawables>
+    <sf:title-placeholder sfa:ID="tp2">{stub}<sf:style><sf:placeholder-style-ref sfa:IDREF="ph1"/></sf:style></sf:title-placeholder>
+   </sf:drawables></sf:layer></sf:layers></key:page>
+  </key:slide>
+ </key:slide-list>
+</key:presentation>"#,
+        geom = geometry(0.0, 0.0, 10.0, 10.0),
+        frame_geom2 = geometry(500.0, 300.0, 100.0, 60.0),
+        second = frame(&[("child", "Second slide")]),
+    )
+}
+
+/// The properties of the run holding `text`, and the run itself up to it.
+fn run_before<'a>(x: &'a str, text: &str) -> &'a str {
+    let to = &x[..x.find(text).unwrap_or_else(|| panic!("{text} in {x}"))];
+    &to[to.rfind("<a:r>").unwrap()..]
+}
+
+/// The shape that holds `text`.
+fn shape_of<'a>(x: &'a str, text: &str) -> &'a str {
+    let to = &x[..x.find(text).unwrap_or_else(|| panic!("{text} in {x}"))];
+    &to[to.rfind("<p:sp>").unwrap()..]
+}
+
+fn slide(pptx: &[u8], n: usize) -> String {
+    part(pptx, &format!("ppt/slides/slide{n}.xml"))
+}
+
+#[test]
+fn styles_inherit_and_shapes_have_their_fill_line_and_text() {
+    let c = convert(
+        &zip_of(&[("index.apxl", document().as_bytes()), ("Data/pic.png", PNG)]),
+        Format::Keynote,
+        &Limits::default(),
+    )
+    .unwrap();
+    assert_eq!((c.slides, c.total_slides), (2, 2));
+    let x = slide(&c.pptx, 1);
+    // Slide size in points.
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="10160000" cy="7620000""#));
+    // The shape: green fill, a blue 2 point round line, its path.
+    assert!(x.contains(r#"<a:srgbClr val="00FF00"/>"#), "{x}");
+    assert!(
+        x.contains(r#"w="25400""#) && x.contains(r#"<a:srgbClr val="0000FF"/>"#),
+        "{x}"
+    );
+    assert!(
+        x.contains(r#"<a:off x="1270000" y="1905000"/><a:ext cx="3810000" cy="1016000"/>"#),
+        "{x}"
+    );
+    assert!(x.contains("<a:custGeom>"), "{x}");
+    // The text: the child style's 20 points over the parent's bold, red,
+    // centred text; a span of the parent's 30 points.
+    assert!(x.contains(">Hello<") && x.contains(">againspanned<"), "{x}");
+    // A break inside a paragraph is a line break; the last one ends it.
+    assert_eq!(x.matches("<a:br>").count(), 1, "{x}");
+    // `sf:null` in a paragraph style unsets what its parents give: black.
+    // In a character style it sets nothing: the span keeps the paragraph's
+    // look and so joins its run (">againspanned<" above).
+    assert!(run_before(&x, ">Plain<").contains(r#"<a:srgbClr val="000000"/>"#));
+    assert!(
+        x.contains(r#"sz="2000""#) && x.contains(r#"sz="3000""#),
+        "{x}"
+    );
+    assert!(
+        x.contains(r#"b="1""#) && x.contains(r#"<a:srgbClr val="FF0000"/>"#),
+        "{x}"
+    );
+    assert!(x.contains(r#"algn="ctr""#), "{x}");
+    // The title is in the slide's headlines, placed by its placeholder's
+    // style; the body has no placeholder in the slide's layer: hidden.
+    assert!(x.contains(">title<") && x.contains(">Slide <"), "{x}");
+    assert!(
+        x.contains(r#"<a:off x="508000" y="254000"/><a:ext cx="9144000" cy="1143000"/>"#),
+        "{x}"
+    );
+    assert!(!x.contains("Body text"), "{x}");
+    // The slide's own background; the second slide has the master's.
+    assert!(
+        x.contains(r#"<p:bg><p:bgPr><a:solidFill><a:srgbClr val="FFFFFF"/>"#),
+        "{x}"
+    );
+    let x2 = slide(&c.pptx, 2);
+    assert!(!x2.contains("<p:bg>"), "{x2}");
+    assert!(x2.contains("Second slide"), "{x2}");
+    let m = part(&c.pptx, "ppt/slideMasters/slideMaster1.xml");
+    assert!(
+        m.contains(r#"<p:bg><p:bgPr><a:solidFill><a:srgbClr val="808080"/>"#),
+        "{m}"
+    );
+}
+
+#[test]
+fn masters_show_their_objects_and_not_their_prototypes() {
+    let c = convert(
+        &zip_of(&[("index.apxl", document().as_bytes()), ("Data/pic.png", PNG)]),
+        Format::Keynote,
+        &Limits::default(),
+    )
+    .unwrap();
+    let m = part(&c.pptx, "ppt/slideMasters/slideMaster1.xml");
+    // The master's shape is there once, as is its green; the prototype
+    // layer's 10 by 10 point shape (127000 EMU) is not, nor is its
+    // placeholder's text.
+    assert_eq!(m.matches("<p:sp>").count(), 1, "{m}");
+    assert!(!m.contains(r#"cx="127000""#), "{m}");
+    assert!(!m.contains("Slide "), "{m}");
+}
+
+#[test]
+fn pictures_are_cropped_and_movies_are_boxes() {
+    let c = convert(
+        &zip_of(&[("index.apxl", document().as_bytes()), ("Data/pic.png", PNG)]),
+        Format::Keynote,
+        &Limits::default(),
+    )
+    .unwrap();
+    let x = slide(&c.pptx, 1);
+    // The window is the middle half of the frame each way.
+    assert!(
+        x.contains(r#"<a:srcRect l="25000" t="25000" r="25000" b="25000"/>"#),
+        "{x}"
+    );
+    assert!(
+        x.contains(r#"<a:off x="4445000" y="4127500"/><a:ext cx="1270000" cy="635000"/>"#),
+        "{x}"
+    );
+    // The movie: a dark box with a triangle.
+    assert!(x.contains(r#"prst="triangle""#), "{x}");
+    assert!(
+        c.warnings.iter().any(|w| w.contains("videos and sounds")),
+        "{:?}",
+        c.warnings
+    );
+    // Without the picture's file the shape is left out.
+    let c = convert(
+        &zip_of(&[("index.apxl", document().as_bytes())]),
+        Format::Keynote,
+        &Limits::default(),
+    )
+    .unwrap();
+    assert!(!slide(&c.pptx, 1).contains("srcRect"));
+}
+
+#[test]
+fn every_way_a_package_holds_the_xml() {
+    let doc = document();
+    let want = |pptx: &[u8]| {
+        let x = slide(pptx, 1);
+        assert!(x.contains(">Hello<") && x.contains("srcRect"), "{x}");
+    };
+    let gz = gzip(doc.as_bytes());
+    for files in [
+        vec![("index.apxl", doc.as_bytes()), ("Data/pic.png", PNG)],
+        vec![("index.apxl.gz", &gz[..]), ("Data/pic.png", PNG)],
+        // In a package directory, one level down.
+        vec![
+            ("Doc.key/index.apxl", doc.as_bytes()),
+            ("Doc.key/Data/pic.png", PNG),
+        ],
+    ] {
+        let c = convert(&zip_of(&files), Format::Keynote, &Limits::default()).unwrap();
+        want(&c.pptx);
+    }
+    // As a directory's files.
+    let c = convert_keynote_package(
+        &[("index.apxl.gz", &gz[..]), ("Data/pic.png", PNG)],
+        &Limits::default(),
+    )
+    .unwrap();
+    want(&c.pptx);
+    // As the XML alone, plain or gzipped: no pictures.
+    let c = convert(doc.as_bytes(), Format::Keynote, &Limits::default()).unwrap();
+    assert!(slide(&c.pptx, 1).contains(">Hello<"));
+    let c = convert(&gz, Format::Keynote, &Limits::default()).unwrap();
+    assert!(slide(&c.pptx, 1).contains(">Hello<"));
+}
+
+#[test]
+fn headlines_are_the_text_of_slides_of_keynote_2_and_3() {
+    // The same document without the placeholder's own text: the slide's
+    // headlines give it, each at its depth, the title first.
+    let c = convert(document().as_bytes(), Format::Keynote, &Limits::default()).unwrap();
+    assert!(slide(&c.pptx, 1).contains("Slide "));
+    let no_headlines = document()
+        .replace("<key:headline", "<key:other")
+        .replace("</key:headline>", "</key:other>");
+    let c = convert(no_headlines.as_bytes(), Format::Keynote, &Limits::default()).unwrap();
+    assert!(!slide(&c.pptx, 1).contains("Slide "));
+}
+
+/// A Keynote 1 document: the theme's slide size and prototypes, one master
+/// with title and body placeholders and a slide with a title, a bullet, a
+/// text box and a rotated shape.
+fn keynote1() -> String {
+    r#"<?xml version="1.0" encoding="UTF-8"?>
+<presentation>
+ <theme slide-size="800 600">
+  <prototype-drawables>
+   <shape stroke-color="0 0 1" stroke-width="3"><styles><fill-style fill-type="color" fill-color="0 1 0"/></styles></shape>
+   <textbox transformation="1 0 0 1 0 0"><content font-name="Helvetica" font-size="18" font-color="g 0"/></textbox>
+  </prototype-drawables>
+  <master-slides>
+   <master-slide id="m1" name="Plain">
+    <background-fill-style fill-type="color" fill-color="0.5 0.5 0.5"/>
+    <drawables>
+     <title size="700 80" location="50 30" vertical-alignment="middle"/>
+     <body size="700 400" location="50 130" bullet-indentation="0 30"/>
+    </drawables>
+    <prototype-bullets>
+     <bullet level="1" marker-type="character"><character-bullet-style size="1"><bullet-characters font-size="20">*</bullet-characters></character-bullet-style><content font-size="20"/></bullet>
+    </prototype-bullets>
+   </master-slide>
+  </master-slides>
+ </theme>
+ <slide-list>
+  <slide master-slide-id="m1">
+   <bullets>
+    <bullet level="0"><content font-size="40" font-color="1 0 0">Title one</content></bullet>
+    <bullet level="1" marker-type="inherited"><content>First point</content></bullet>
+   </bullets>
+   <drawables>
+    <title/>
+    <body/>
+    <textbox size="200 50" transformation="1 0 0 1 100 500"><content>Free <span font-size="30">text</span></content></textbox>
+    <shape path="M 0 0 L 100 0 L 100 50 Z" transformation="0 1 -1 0 300 300"/>
+   </drawables>
+  </slide>
+  <slide master-slide-id="m1">
+   <bullets><bullet level="0"><content>Second title</content></bullet></bullets>
+   <drawables><title visibility="hidden"/></drawables>
+  </slide>
+ </slide-list>
+</presentation>"#
+        .to_string()
+}
+
+#[test]
+fn keynote_1_documents() {
+    let c = convert(keynote1().as_bytes(), Format::Keynote, &Limits::default()).unwrap();
+    assert_eq!((c.slides, c.total_slides), (2, 2));
+    let x = slide(&c.pptx, 1);
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="10160000" cy="7620000""#));
+    // The title and the bullet fill the master's placeholders.
+    assert!(x.contains("Title one") && x.contains("First point"), "{x}");
+    assert!(shape_of(&x, "Title one").contains(r#"<p:ph type="title"/>"#));
+    assert!(shape_of(&x, "First point").contains(r#"<p:ph type="body""#));
+    // A placeholder the slide hides shows nothing.
+    assert!(!slide(&c.pptx, 2).contains("Second title"));
+    assert!(
+        x.contains(r#"sz="4000""#) && x.contains(r#"<a:srgbClr val="FF0000"/>"#),
+        "{x}"
+    );
+    assert!(x.contains(r#"<a:buChar char="*""#), "{x}");
+    assert!(x.contains(r#"anchor="ctr""#), "{x}");
+    // The text box takes its prototype's size and a span's own.
+    assert!(x.contains(">Free <") && x.contains(">text<"), "{x}");
+    assert!(
+        x.contains(r#"sz="1800""#) && x.contains(r#"sz="3000""#),
+        "{x}"
+    );
+    // The shape takes its prototype's green fill and 3 point blue line, and
+    // is turned a quarter.
+    assert!(x.contains(r#"<a:srgbClr val="00FF00"/>"#), "{x}");
+    assert!(x.contains(r#"w="38100""#), "{x}");
+    assert!(x.contains(r#"rot="5400000""#), "{x}");
+    let m = part(&c.pptx, "ppt/slideMasters/slideMaster1.xml");
+    assert!(m.contains(r#"<a:srgbClr val="808080"/>"#), "{m}");
+}
+
+#[test]
+fn xml_that_is_not_a_keynote_document_is_refused() {
+    for xml in [
+        "<other/>",
+        "<key:presentation xmlns:key=\"http://developer.apple.com/namespaces/keynote2\"/>",
+        "<presentation/>",
+    ] {
+        let e = convert(xml.as_bytes(), Format::Keynote, &Limits::default()).unwrap_err();
+        assert!(matches!(e, Error::NotFormat(_)), "{xml}: {e:?}");
+    }
+}
+
+#[test]
+fn a_damaged_document_does_not_panic() {
+    let doc = document();
+    for n in (0..doc.len()).step_by(97) {
+        let _ = convert(&doc.as_bytes()[..n], Format::Keynote, &Limits::default());
+    }
+    let one = keynote1();
+    for n in (0..one.len()).step_by(31) {
+        let _ = convert(&one.as_bytes()[..n], Format::Keynote, &Limits::default());
+    }
+}
diff --git a/crates/exav-render/tests/office_slides_odp_features.rs b/crates/exav-render/tests/office_slides_odp_features.rs
new file mode 100644
index 00000000..1c271c05
--- /dev/null
+++ b/crates/exav-render/tests/office_slides_odp_features.rs
@@ -0,0 +1,267 @@
+//! OpenDocument features, over flat documents written here.
+
+use exav_render::slides::{Format, Limits, convert};
+use std::io::Read;
+
+fn part(pptx: &[u8], name: &str) -> String {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    let mut s = String::new();
+    z.by_name(name).unwrap().read_to_string(&mut s).unwrap();
+    s
+}
+
+fn names(pptx: &[u8]) -> Vec<String> {
+    let z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    z.file_names()
+        .filter_map(|n| n.ok().map(|n| n.to_string()))
+        .collect()
+}
+
+const NS: &str = r#"xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:xlink="http://www.w3.org/1999/xlink""#;
+
+/// A flat presentation with `styles` in its common styles, `auto` in its
+/// automatic styles and one page holding `page`.
+fn fodp(styles: &str, auto: &str, page: &str) -> String {
+    format!(
+        r#"<office:document {NS} office:mimetype="application/vnd.oasis.opendocument.presentation"><office:styles>{styles}</office:styles><office:automatic-styles>{auto}</office:automatic-styles><office:body><office:presentation><draw:page>{page}</draw:page></office:presentation></office:body></office:document>"#
+    )
+}
+
+fn slide1(doc: &str) -> String {
+    let c = convert(doc.as_bytes(), Format::Fodp, &Limits::default()).unwrap();
+    part(&c.pptx, "ppt/slides/slide1.xml")
+}
+
+/// A custom shape of 10 by 10 cm with an enhanced path in a 100 by 100
+/// view box.
+fn custom(path: &str, extra: &str) -> String {
+    format!(
+        r#"<draw:custom-shape svg:x="0cm" svg:y="0cm" svg:width="10cm" svg:height="10cm"><text:p>T</text:p><draw:enhanced-geometry svg:viewBox="0 0 100 100" draw:enhanced-path="{path}" {extra}/></draw:custom-shape>"#
+    )
+}
+
+fn base64(d: &[u8]) -> String {
+    const A: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    let mut s = String::new();
+    for c in d.chunks(3) {
+        let n = c
+            .iter()
+            .enumerate()
+            .fold(0u32, |n, (i, b)| n | u32::from(*b) << (16 - 8 * i));
+        for k in 0..=c.len() {
+            s.push(A[(n >> (18 - 6 * k) & 63) as usize] as char);
+        }
+    }
+    while !s.len().is_multiple_of(4) {
+        s.push('=');
+    }
+    s
+}
+
+/// The header of a 2 by 2 pixel PNG: enough to be a picture.
+const PNG: &[u8] = b"\x89PNG\r\n\x1a\n\0\0\0\rIHDR\0\0\0\x02\0\0\0\x02\x08\x02\0\0\0";
+
+#[test]
+fn the_page_has_the_size_odf_defaults_to() {
+    // No page layout: 28 by 15.75 cm.
+    let c = convert(
+        fodp("", "", "").as_bytes(),
+        Format::Fodp,
+        &Limits::default(),
+    )
+    .unwrap();
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="10080000" cy="5670000""#));
+}
+
+#[test]
+fn shapes_without_a_style_have_the_style_called_standard() {
+    let rect = r#"<draw:rect svg:x="0cm" svg:y="0cm" svg:width="2cm" svg:height="2cm"/>"#;
+    // Without it: filled blue.
+    let x = slide1(&fodp("", "", rect));
+    assert!(x.contains(r#"<a:srgbClr val="729FCF"/>"#), "{x}");
+    // With it: what it says, here nothing to draw.
+    let std = r#"<style:style style:name="standard" style:family="graphic"><style:graphic-properties draw:fill="none" draw:stroke="none"/></style:style>"#;
+    let x = slide1(&fodp(std, "", rect));
+    assert!(
+        !x.contains("729FCF") && x.contains("<a:noFill/><a:ln><a:noFill/></a:ln>"),
+        "{x}"
+    );
+}
+
+#[test]
+fn empty_placeholders_show_only_what_they_fill_and_draw() {
+    let auto = r##"<style:style style:name="red" style:family="graphic"><style:graphic-properties draw:fill="solid" draw:fill-color="#ff0000" draw:stroke="none"/></style:style><style:style style:name="none" style:family="graphic"><style:graphic-properties draw:fill="none" draw:stroke="none"/></style:style>"##;
+    let frame = |style: &str, x: u32| {
+        format!(
+            r#"<draw:frame draw:style-name="{style}" presentation:class="outline" presentation:placeholder="true" svg:x="{x}cm" svg:y="0cm" svg:width="4cm" svg:height="2cm"><draw:text-box/></draw:frame>"#
+        )
+    };
+    let x = slide1(&fodp("", auto, &(frame("red", 0) + &frame("none", 5))));
+    assert_eq!(x.matches("<p:sp>").count(), 1, "{x}");
+    assert!(x.contains(r#"<a:srgbClr val="FF0000"/>"#), "{x}");
+}
+
+/// The paragraph of `x` that holds `text`, up to the text.
+fn paragraph<'a>(x: &'a str, text: &str) -> &'a str {
+    let to = x.find(text).unwrap_or_else(|| panic!("{text} in {x}"));
+    &x[x[..to].rfind("<a:p>").unwrap()..to]
+}
+
+#[test]
+fn list_headers_are_not_bulleted_and_items_are() {
+    let auto = r#"<text:list-style style:name="L1"><text:list-level-style-bullet text:level="1" text:bullet-char="*"/></text:list-style>"#;
+    let page = r#"<draw:frame svg:x="0cm" svg:y="0cm" svg:width="8cm" svg:height="4cm"><draw:text-box><text:list text:style-name="L1"><text:list-header><text:p>Head</text:p></text:list-header><text:list-item><text:p>Item</text:p></text:list-item></text:list></draw:text-box></draw:frame>"#;
+    let x = slide1(&fodp("", auto, page));
+    assert!(!paragraph(&x, ">Head<").contains("buChar"), "{x}");
+    assert!(
+        paragraph(&x, ">Item<").contains(r#"<a:buChar char="*""#),
+        "{x}"
+    );
+}
+
+#[test]
+fn picture_bullets_are_pictures() {
+    let auto = format!(
+        r#"<text:list-style style:name="L1"><text:list-level-style-image text:level="1"><office:binary-data>{}</office:binary-data></text:list-level-style-image></text:list-style>"#,
+        base64(PNG)
+    );
+    let page = r#"<draw:frame svg:x="0cm" svg:y="0cm" svg:width="8cm" svg:height="4cm"><draw:text-box><text:list text:style-name="L1"><text:list-item><text:p>Item</text:p></text:list-item></text:list></draw:text-box></draw:frame>"#;
+    let c = convert(
+        fodp("", &auto, page).as_bytes(),
+        Format::Fodp,
+        &Limits::default(),
+    )
+    .unwrap();
+    let x = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(x.contains("<a:buBlip>"), "{x}");
+    assert!(names(&c.pptx).iter().any(|n| n == "ppt/media/image1.png"));
+    // A picture that cannot be read is a round bullet.
+    let broken = auto.replace(&base64(PNG), "AAAA");
+    let x = slide1(&fodp("", &broken, page));
+    assert!(!x.contains("buBlip") && x.contains("<a:buChar"), "{x}");
+}
+
+#[test]
+fn custom_shapes_follow_their_enhanced_paths() {
+    // Even-odd: the inner square is drawn against the outer one's
+    // direction, so that it is a hole under the nonzero rule.
+    let x = slide1(&fodp(
+        "",
+        "",
+        &custom(
+            "M 0 0 L 100 0 100 100 0 100 Z M 20 20 L 80 20 80 80 20 80 Z N",
+            "",
+        ),
+    ));
+    assert!(
+        x.contains(r#"<a:close/><a:moveTo><a:pt x="20000" y="80000"/>"#),
+        "{x}"
+    );
+    // A path that does not nest stays as it is.
+    let x = slide1(&fodp(
+        "",
+        "",
+        &custom(
+            "M 0 0 L 40 0 40 40 0 40 Z M 60 60 L 100 60 100 100 60 100 Z N",
+            "",
+        ),
+    ));
+    assert!(
+        x.contains(r#"<a:close/><a:moveTo><a:pt x="60000" y="60000"/>"#),
+        "{x}"
+    );
+    // A line that comes first starts the path.
+    let x = slide1(&fodp("", "", &custom("L 10 10 90 10 90 90 Z N", "")));
+    assert!(
+        x.contains(r#"<a:path w="100000" h="100000"><a:moveTo><a:pt x="10000" y="10000"/>"#),
+        "{x}"
+    );
+    // An arc that ends before it starts turns the long way round: from the
+    // bottom of the circle clockwise to its right, three quarters.
+    let x = slide1(&fodp("", "", &custom("M 50 100 T 50 50 50 50 90 0 N", "")));
+    assert_eq!(x.matches("<a:cubicBezTo>").count(), 3, "{x}");
+    assert!(
+        x.contains(r#"<a:pt x="100000" y="50000"/></a:cubicBezTo>"#),
+        "{x}"
+    );
+    // An arc: from the right of the circle a quarter turn to its bottom.
+    let x = slide1(&fodp("", "", &custom("M 100 50 T 50 50 50 50 0 90 N", "")));
+    assert!(
+        x.contains(r#"<a:cubicBezTo><a:pt x="100000" y="77614"/><a:pt x="77614" y="100000"/><a:pt x="50000" y="100000"/></a:cubicBezTo>"#),
+        "{x}"
+    );
+}
+
+#[test]
+fn paths_with_no_fill_or_no_stroke_become_shapes_of_their_own() {
+    let x = slide1(&fodp(
+        "",
+        "",
+        &custom("M 0 0 L 100 0 100 100 Z F N M 0 0 L 100 100 S N", ""),
+    ));
+    assert_eq!(x.matches("<p:sp>").count(), 2, "{x}");
+    // The first is stroked and not filled, the second filled and not stroked.
+    let (a, b) = x.split_once("</p:sp>").unwrap();
+    assert!(a.contains("<a:noFill/><a:ln w=\"9525\">"), "{a}");
+    assert!(
+        b.contains("<a:ln><a:noFill/></a:ln>") && b.contains("729FCF"),
+        "{b}"
+    );
+}
+
+#[test]
+fn text_stays_in_the_shapes_text_area() {
+    let x = slide1(&fodp(
+        "",
+        "",
+        &custom(
+            "M 0 0 L 100 0 100 100 0 100 Z N",
+            r#"draw:text-areas="10 20 70 90""#,
+        ),
+    ));
+    // 10, 20, 30 and 10 percent of the 10 cm (3600000 EMU) box.
+    assert!(
+        x.contains(r#"lIns="360000" tIns="720000" rIns="1080000" bIns="360000""#),
+        "{x}"
+    );
+}
+
+#[test]
+fn videos_and_sounds_are_boxes() {
+    let plugin = |href: &str| {
+        format!(
+            r#"<draw:frame svg:x="0cm" svg:y="0cm" svg:width="8cm" svg:height="6cm"><draw:plugin xlink:href="{href}"/></draw:frame>"#
+        )
+    };
+    let c = convert(
+        fodp("", "", &plugin("movie.mp4")).as_bytes(),
+        Format::Fodp,
+        &Limits::default(),
+    )
+    .unwrap();
+    let x = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(
+        x.contains(r#"<a:srgbClr val="202020"/>"#) && x.contains("triangle"),
+        "{x}"
+    );
+    assert!(c.warnings.iter().any(|w| w.contains("videos and sounds")));
+    let x = slide1(&fodp("", "", &plugin("song.mp3")));
+    assert!(x.contains(r#"<a:srgbClr val="E8E8E8"/>"#), "{x}");
+}
+
+#[test]
+fn a_link_after_text_of_the_same_style_keeps_its_link() {
+    let rect = r#"<draw:rect svg:x="0cm" svg:y="0cm" svg:width="8cm" svg:height="2cm"><text:p>go <text:a xlink:href="https://example.test/x">here</text:a> now</text:p></draw:rect>"#;
+    let c = convert(
+        fodp("", "", rect).as_bytes(),
+        Format::Fodp,
+        &Limits::default(),
+    )
+    .unwrap();
+    let x = part(&c.pptx, "ppt/slides/slide1.xml");
+    // Three runs, the middle one a link to the address.
+    assert_eq!(x.matches("<a:hlinkClick").count(), 1, "{x}");
+    assert!(part(&c.pptx, "ppt/slides/_rels/slide1.xml.rels").contains("https://example.test/x"));
+    let i = x.find("<a:hlinkClick").unwrap();
+    assert!(x[i..].contains(">here</a:t>"), "{x}");
+}
diff --git a/crates/exav-render/tests/office_slides_old_ppt.rs b/crates/exav-render/tests/office_slides_old_ppt.rs
new file mode 100644
index 00000000..afe92ece
--- /dev/null
+++ b/crates/exav-render/tests/office_slides_old_ppt.rs
@@ -0,0 +1,289 @@
+//! PowerPoint 95 and the older versions, over documents built here: a
+//! PowerPoint 95 stream in a compound file, and the headers of versions 2
+//! to 4.
+
+use exav_render::formats::office::test_util::build_cfb as build;
+use exav_render::slides::{Error, Format, Limits, convert};
+use std::io::Read;
+
+fn part(pptx: &[u8], name: &str) -> String {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    let mut s = String::new();
+    z.by_name(name).unwrap().read_to_string(&mut s).unwrap();
+    s
+}
+
+/// A PowerPoint 95 record: type, flag (0xFFFF for a container), length and
+/// identifier, then the body.
+fn rec(typ: u32, flag: u32, id: u32, body: &[u8]) -> Vec<u8> {
+    let mut v = vec![];
+    for x in [typ, flag, body.len() as u32, id] {
+        v.extend(x.to_le_bytes());
+    }
+    v.extend(body);
+    v
+}
+
+fn container(typ: u32, kids: &[Vec<u8>]) -> Vec<u8> {
+    rec(typ, 0xFFFF, 0, &kids.concat())
+}
+
+fn i32s(v: &[i32]) -> Vec<u8> {
+    v.iter().flat_map(|x| x.to_le_bytes()).collect()
+}
+
+/// A colour as the format has it: red, green, blue and 0xFE for "this RGB".
+const fn rgb(r: u8, g: u8, b: u8) -> [u8; 4] {
+    [r, g, b, 0xFE]
+}
+
+/// A shape's look (0x0BBD, 56 bytes): the line and the fill.
+fn look(line: Option<([u8; 4], u8)>, fill: Option<[u8; 4]>) -> Vec<u8> {
+    let mut d = vec![0u8; 56];
+    match line {
+        Some((c, width)) => {
+            d[3] = width;
+            d[4..8].copy_from_slice(&c);
+        }
+        None => d[0] = 0xFF,
+    }
+    match fill {
+        Some(c) => {
+            d[13] = 1;
+            d[20..24].copy_from_slice(&c);
+        }
+        None => d[12] = 0xFF,
+    }
+    d
+}
+
+/// A shape's bounds (0x0BC1, 40 bytes), the origin at the slide's centre.
+fn bounds(code: i32, l: i32, t: i32, r: i32, b: i32, rot: i32) -> Vec<u8> {
+    i32s(&[code, 0, 0, l, t, r, b, rot, 0, 0])
+}
+
+fn shape(b: Vec<u8>, look: Vec<u8>, extra: &[Vec<u8>]) -> Vec<u8> {
+    let mut kids = vec![rec(0x0BC1, 0, 0, &b), rec(0x0BBD, 0, 0, &look)];
+    kids.extend_from_slice(extra);
+    container(0x0BC0, &kids)
+}
+
+/// A run: characters it covers, its kind, and its properties.
+fn run(count: u32, typ: u32, props: &[u8]) -> Vec<u8> {
+    let mut v = vec![];
+    for x in [count, typ, 0, props.len() as u32, 0] {
+        v.extend(x.to_le_bytes());
+    }
+    v.extend(props);
+    v
+}
+
+/// Character properties: font index, size, flags, colour.
+fn char_props(font: u16, size: u16, flags: u16, color: [u8; 4]) -> Vec<u8> {
+    let mut p = vec![0u8; 24];
+    p[0..2].copy_from_slice(&font.to_le_bytes());
+    p[4..6].copy_from_slice(&size.to_le_bytes());
+    p[8..10].copy_from_slice(&flags.to_le_bytes());
+    p[10..14].copy_from_slice(&color);
+    p
+}
+
+/// Paragraph properties: bullet flags, bullet character, alignment and the
+/// bullet's size in percent.
+fn para_props(bullet: bool, ch: u8, align: u32, size: u32) -> Vec<u8> {
+    let mut p = vec![0u8; 44];
+    p[0] = u8::from(bullet);
+    p[6] = ch;
+    p[12..16].copy_from_slice(&size.to_le_bytes());
+    p[28..32].copy_from_slice(&align.to_le_bytes());
+    p
+}
+
+/// A text object: the characters (in Windows 1252) and runs of each kind.
+fn text(chars: &[u8], char_runs: &[Vec<u8>], para_runs: &[Vec<u8>]) -> Vec<u8> {
+    let runs =
+        |typ: u32, rs: &[Vec<u8>]| rec(0x07EC, 0xFFFF, 0, &rec(0x07EE, 0, typ, &rs.concat()));
+    let body = container(
+        0x0FE0,
+        &[
+            rec(0x07EE, 0, 53, chars),
+            runs(0x0FE2, char_runs),
+            runs(0x0FE3, para_runs),
+        ],
+    );
+    container(0x0FA1, &[container(0x0FA2, &[body])])
+}
+
+/// A PowerPoint 95 stream of one slide holding `shapes` on a 10 by 7.5
+/// inch page, and one font, "Arial".
+fn stream(shapes: &[Vec<u8>]) -> Vec<u8> {
+    let atom = rec(0x03E9, 0, 0, &i32s(&[5760, 4320]));
+    let mut font = vec![0u8; 60];
+    font[28..33].copy_from_slice(b"Arial");
+    let env = container(0x03F2, &[rec(0x0FB7, 0, 0, &font)]);
+    let slide = container(0x03EE, &[container(0x0BB8, shapes)]);
+    let doc = container(0x03E8, &[atom, env, container(0x07D0, &[slide])]);
+    container(3, &[doc])
+}
+
+fn convert95(stream: &[u8]) -> Result<exav_render::slides::Converted, Error> {
+    let cf = build(&[("PowerPoint Document", stream)]);
+    convert(&cf, Format::Ppt, &Limits::default())
+}
+
+fn slide1(stream: &[u8]) -> String {
+    let c = convert95(stream).unwrap();
+    assert_eq!((c.slides, c.total_slides), (1, 1));
+    part(&c.pptx, "ppt/slides/slide1.xml")
+}
+
+#[test]
+fn shapes_have_their_geometry_fill_and_line() {
+    let s = stream(&[
+        // A rectangle 1 inch wide and 0.5 high at the page's centre, filled
+        // red, with a blue line.
+        shape(
+            bounds(-3, 0, 0, 576, 288, 0),
+            look(Some((rgb(0, 0, 255), 0)), Some(rgb(255, 0, 0))),
+            &[],
+        ),
+        // An ellipse without a line, filled green, rotated.
+        shape(
+            bounds(-1, -576, -288, -288, 0, 1344),
+            look(None, Some(rgb(0, 255, 0))),
+            &[],
+        ),
+        // A shape without a line or a fill is not drawn.
+        shape(bounds(-3, 0, 0, 10, 10, 0), look(None, None), &[]),
+    ]);
+    let x = slide1(&s);
+    assert_eq!(x.matches("<p:sp>").count(), 2, "{x}");
+    assert!(x.contains(r#"<a:srgbClr val="FF0000"/>"#), "{x}");
+    assert!(x.contains(r#"<a:srgbClr val="0000FF"/>"#), "{x}");
+    assert!(x.contains(r#"<a:srgbClr val="00FF00"/>"#), "{x}");
+    assert!(x.contains(r#"prst="ellipse""#), "{x}");
+    // The centre of a 10 by 7.5 inch page is at 5 by 3.75 inches; the
+    // rectangle is 1 by 0.5 inch from there.
+    assert!(
+        x.contains(r#"<a:off x="4572000" y="3429000"/><a:ext cx="914400" cy="457200"/>"#),
+        "{x}"
+    );
+    // 1344 of 5376 is a quarter turn.
+    assert!(x.contains(r#"rot="5400000""#), "{x}");
+}
+
+#[test]
+fn lines_have_arrows() {
+    let l = container(
+        0x0BC6,
+        &[
+            rec(0x0BC7, 0, 0, &i32s(&[-288, -144, 288, 144])),
+            rec(0x0BBD, 0, 0, &look(Some((rgb(0, 0, 0), 1)), None)),
+            rec(0x0BBF, 0, 0, &[0, 1, 0, 0]),
+        ],
+    );
+    let x = slide1(&stream(&[l]));
+    assert!(x.contains("<a:tailEnd type=\"triangle\""), "{x}");
+    assert!(!x.contains("<a:headEnd type"), "{x}");
+    // 2 points wide.
+    assert!(x.contains(r#"w="25400""#), "{x}");
+}
+
+#[test]
+fn text_has_its_runs_paragraphs_and_fonts() {
+    let chars = b"Hello\rWorld caf\xe9";
+    let t = text(
+        chars,
+        &[
+            run(5, 0x0FE2, &char_props(0, 24, 1, rgb(255, 0, 0))),
+            run(12, 0x0FE2, &char_props(0, 12, 2, rgb(0, 0, 0))),
+        ],
+        &[
+            run(6, 0x0FE3, &para_props(false, 0, 1, 0)),
+            run(11, 0x0FE3, &para_props(true, b'*', 0, 80)),
+        ],
+    );
+    let x = slide1(&stream(&[shape(
+        bounds(-3, -576, -288, 576, 288, 0),
+        look(None, Some(rgb(255, 255, 255))),
+        &[t],
+    )]));
+    assert!(x.contains(">Hello<"), "{x}");
+    assert!(x.contains(">World caf\u{e9}<"), "{x}");
+    assert!(x.contains(r#"sz="2400""#) && x.contains(r#"b="1""#), "{x}");
+    assert!(x.contains(r#"sz="1200""#) && x.contains(r#"i="1""#), "{x}");
+    assert!(x.contains(r#"typeface="Arial""#), "{x}");
+    assert!(x.contains(r#"algn="ctr""#), "{x}");
+    assert!(x.contains(r#"<a:buChar char="*""#), "{x}");
+    assert!(x.contains(r#"<a:buSzPct val="80000"/>"#), "{x}");
+}
+
+/// The bullet's size, a percent, is kept from 25 to 400: past it there is none,
+/// and a size too big to take a thousand times is not an overflow.
+#[test]
+fn a_bullet_size_out_of_range_is_dropped() {
+    let slide = |size: u32| {
+        let t = text(
+            b"abc",
+            &[run(3, 0x0FE2, &char_props(0, 12, 0, rgb(0, 0, 0)))],
+            &[run(3, 0x0FE3, &para_props(true, b'*', 0, size))],
+        );
+        slide1(&stream(&[shape(
+            bounds(-3, -576, -288, 576, 288, 0),
+            look(None, Some(rgb(255, 255, 255))),
+            &[t],
+        )]))
+    };
+    assert!(slide(400).contains(r#"<a:buSzPct val="400000"/>"#));
+    for size in [24, 401, 4_294_968, u32::MAX] {
+        let x = slide(size);
+        assert!(x.contains("<a:buChar"), "{size}: {x}");
+        assert!(!x.contains("buSzPct"), "{size}: {x}");
+    }
+}
+
+#[test]
+fn a_damaged_stream_does_not_panic() {
+    let t = text(
+        b"abc",
+        &[run(3, 0x0FE2, &char_props(0, 12, 0, rgb(0, 0, 0)))],
+        &[run(3, 0x0FE3, &para_props(false, 0, 0, 0))],
+    );
+    let s = stream(&[shape(
+        bounds(-3, -576, -288, 576, 288, 0),
+        look(Some((rgb(0, 0, 0), 0)), Some(rgb(1, 2, 3))),
+        &[t],
+    )]);
+    for n in 0..s.len() {
+        let _ = convert95(&s[..n]);
+    }
+    let mut s = s;
+    for i in (0..s.len()).step_by(7) {
+        let keep = s[i];
+        s[i] = 0xFF;
+        let _ = convert95(&s);
+        s[i] = keep;
+    }
+}
+
+#[test]
+fn old_versions_are_recognised_and_refused_as_unsupported() {
+    let le = |v: u8| [0xED, 0xDE, 0xAD, 0x0B, v, 0, 0, 0, 1, 2, 3, 4];
+    for (bytes, what) in [
+        (le(2).to_vec(), "PowerPoint 2"),
+        (le(3).to_vec(), "PowerPoint 3"),
+        (
+            vec![0x0B, 0xAD, 0xDE, 0xED, 0, 0, 0, 3, 1, 2, 3, 4],
+            "PowerPoint 3 for Macintosh",
+        ),
+        // Version 4 is a stream of a compound file.
+        (build(&[("PP40", &le(4))]), "PowerPoint 4"),
+    ] {
+        let e = convert(&bytes, Format::Ppt, &Limits::default()).unwrap_err();
+        assert_eq!(e.kind(), "unsupported", "{what}");
+        assert!(e.to_string().contains(what), "{what}: {e}");
+    }
+    // A version they never had.
+    let e = convert(&le(9), Format::Ppt, &Limits::default()).unwrap_err();
+    assert_eq!(e.kind(), "not-format");
+}
diff --git a/crates/exav-render/tests/office_slides_vsdx.rs b/crates/exav-render/tests/office_slides_vsdx.rs
new file mode 100644
index 00000000..afd7f1ed
--- /dev/null
+++ b/crates/exav-render/tests/office_slides_vsdx.rs
@@ -0,0 +1,833 @@
+//! Visio drawings (VSDX) as slides: one slide to a page, named as the page
+//! is, in the pages' largest size; shapes with their geometry, formats and
+//! text; masters, styles and themes resolved.
+
+use exav_render::formats::office::test_util::{PackageWriter, build_cfb};
+use exav_render::slides::{Error, Format, Limits, convert, convert_first, convert_first_from};
+use std::io::{Cursor, Read};
+
+const NS: &str = "xmlns='http://schemas.microsoft.com/office/visio/2012/main' xmlns:r='http://schemas.openxmlformats.org/officeDocument/2006/relationships'";
+const REL: &str = "http://schemas.microsoft.com/visio/2010/relationships";
+const OPC: &str = "http://schemas.openxmlformats.org/package/2006/relationships";
+
+fn fixture(name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/office/draw/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("{p}: {e}"))
+}
+
+fn part(pptx: &[u8], name: &str) -> String {
+    let mut z = zip::ZipArchive::new(Cursor::new(pptx)).unwrap();
+    let mut s = String::new();
+    z.by_name(name)
+        .unwrap_or_else(|_| panic!("no part {name}"))
+        .read_to_string(&mut s)
+        .unwrap();
+    s
+}
+
+fn has_part(pptx: &[u8], name: &str) -> bool {
+    zip::ZipArchive::new(Cursor::new(pptx))
+        .unwrap()
+        .by_name(name)
+        .is_ok()
+}
+
+fn rels(items: &[(&str, &str, &str)]) -> String {
+    let body: String = items
+        .iter()
+        .map(|(i, t, g)| format!(r#"<Relationship Id="{i}" Type="{t}" Target="{g}"/>"#))
+        .collect();
+    format!(r#"<Relationships xmlns="{OPC}">{body}</Relationships>"#)
+}
+
+/// A package of `parts`, each deflated.
+fn package(parts: &[(&str, String)]) -> Vec<u8> {
+    let mut w = PackageWriter::new(1 << 24);
+    for (name, data) in parts {
+        w.put(name, data.as_bytes(), true).unwrap();
+    }
+    w.finish().unwrap()
+}
+
+fn cell(n: &str, v: &str) -> String {
+    format!("<Cell N='{n}' V='{v}'/>")
+}
+
+fn rect(w: f64, h: f64) -> String {
+    format!(
+        "<Section N='Geometry' IX='0'>\
+         <Row T='MoveTo' IX='1'>{}{}</Row><Row T='LineTo' IX='2'>{}{}</Row>\
+         <Row T='LineTo' IX='3'>{}{}</Row><Row T='LineTo' IX='4'>{}{}</Row>\
+         <Row T='LineTo' IX='5'>{}{}</Row></Section>",
+        cell("X", "0"),
+        cell("Y", "0"),
+        cell("X", &w.to_string()),
+        cell("Y", "0"),
+        cell("X", &w.to_string()),
+        cell("Y", &h.to_string()),
+        cell("X", "0"),
+        cell("Y", &h.to_string()),
+        cell("X", "0"),
+        cell("Y", "0"),
+    )
+}
+
+/// A shape `w` by `h` inches centred on (`x`, `y`) with `extra` cells and
+/// children, and a rectangle for its geometry.
+fn boxed(id: u32, x: f64, y: f64, w: f64, h: f64, extra: &str) -> String {
+    format!(
+        "<Shape ID='{id}' Type='Shape'>{}{}{}{}{}{}{extra}{}</Shape>",
+        cell("PinX", &x.to_string()),
+        cell("PinY", &y.to_string()),
+        cell("Width", &w.to_string()),
+        cell("Height", &h.to_string()),
+        cell("LocPinX", &(w / 2.0).to_string()),
+        cell("LocPinY", &(h / 2.0).to_string()),
+        rect(w, h)
+    )
+}
+
+struct Page<'a> {
+    name: &'a str,
+    /// Cells of the page sheet.
+    sheet: String,
+    shapes: String,
+}
+
+fn page<'a>(name: &'a str, w: f64, h: f64, shapes: &str) -> Page<'a> {
+    Page {
+        name,
+        sheet: cell("PageWidth", &w.to_string()) + &cell("PageHeight", &h.to_string()),
+        shapes: shapes.to_string(),
+    }
+}
+
+/// A drawing of `pages`, `document` being what goes in the VisioDocument.
+fn drawing(pages: &[Page], document: &str) -> Vec<u8> {
+    let mut parts: Vec<(&str, String)> = vec![];
+    let names: Vec<String> = (0..pages.len())
+        .map(|i| format!("visio/pages/page{}.xml", i + 1))
+        .collect();
+    let mut page_els = String::new();
+    let mut page_rels = vec![];
+    let ids: Vec<String> = (0..pages.len()).map(|i| format!("rId{}", i + 1)).collect();
+    for (i, p) in pages.iter().enumerate() {
+        page_els.push_str(&format!(
+            "<Page ID='{i}' Name='{0}' NameU='{0}'><PageSheet>{1}</PageSheet><Rel r:id='{2}'/></Page>",
+            p.name, p.sheet, ids[i]
+        ));
+        page_rels.push((
+            ids[i].as_str(),
+            format!("{REL}/page"),
+            format!("page{}.xml", i + 1),
+        ));
+    }
+    parts.push((
+        "_rels/.rels",
+        rels(&[("rId1", &format!("{REL}/document"), "visio/document.xml")]),
+    ));
+    parts.push((
+        "visio/document.xml",
+        format!("<VisioDocument {NS}>{document}</VisioDocument>"),
+    ));
+    parts.push((
+        "visio/_rels/document.xml.rels",
+        rels(&[("rId2", &format!("{REL}/pages"), "pages/pages.xml")]),
+    ));
+    parts.push((
+        "visio/pages/pages.xml",
+        format!("<Pages {NS}>{page_els}</Pages>"),
+    ));
+    let pr: Vec<(&str, &str, &str)> = page_rels
+        .iter()
+        .map(|(i, t, g)| (*i, t.as_str(), g.as_str()))
+        .collect();
+    parts.push(("visio/pages/_rels/pages.xml.rels", rels(&pr)));
+    for (i, p) in pages.iter().enumerate() {
+        parts.push((
+            names[i].as_str(),
+            format!(
+                "<PageContents {NS}><Shapes>{}</Shapes></PageContents>",
+                p.shapes
+            ),
+        ));
+    }
+    package(&parts)
+}
+
+fn one(shapes: &str) -> Vec<u8> {
+    drawing(&[page("Page-1", 6.0, 4.0, shapes)], "")
+}
+
+fn slide(d: &[u8]) -> String {
+    let c = convert(d, Format::Vsdx, &Limits::default()).unwrap();
+    part(&c.pptx, "ppt/slides/slide1.xml")
+}
+
+#[test]
+fn each_page_is_a_slide_named_as_the_page_is() {
+    let c = convert(&fixture("sample.vsdx"), Format::Vsdx, &Limits::default()).unwrap();
+    // The background page is a master, not a slide.
+    assert_eq!((c.slides, c.total_slides), (2, 2));
+    assert!(part(&c.pptx, "ppt/slides/slide1.xml").contains(r#"<p:cSld name="Plan">"#));
+    assert!(part(&c.pptx, "ppt/slides/slide2.xml").contains(r#"<p:cSld name="Detail">"#));
+}
+
+#[test]
+fn the_presentation_has_the_largest_page_size() {
+    let c = convert(&fixture("sample.vsdx"), Format::Vsdx, &Limits::default()).unwrap();
+    // 11 by 8.5 inches, the other page being 5.8 by 8.2.
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="10058400" cy="7772400""#));
+    // The largest side and the other come from different pages.
+    let d = drawing(&[page("A", 10.0, 2.0, ""), page("B", 3.0, 6.0, "")], "");
+    let c = convert(&d, Format::Vsdx, &Limits::default()).unwrap();
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="9144000" cy="5486400""#));
+}
+
+#[test]
+fn a_page_scale_gives_paper_inches_and_a_page_too_big_is_made_to_fit() {
+    // 12 by 8 inches of drawing to 1 of paper for 2: a 6 by 4 inch slide,
+    // and the shape's coordinates in paper inches too.
+    let sheet = cell("PageWidth", "12")
+        + &cell("PageHeight", "8")
+        + &cell("PageScale", "1")
+        + &cell("DrawingScale", "2");
+    let p = Page {
+        name: "Scaled",
+        sheet,
+        shapes: boxed(1, 6.0, 4.0, 2.0, 2.0, ""),
+    };
+    let c = convert(&drawing(&[p], ""), Format::Vsdx, &Limits::default()).unwrap();
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="5486400" cy="3657600""#));
+    let s = part(&c.pptx, "ppt/slides/slide1.xml");
+    // 2 inches of drawing are 1 inch of paper, centred on (3, 2).
+    assert!(
+        s.contains(r#"<a:off x="2286000" y="1371600"/><a:ext cx="914400" cy="914400"/>"#),
+        "{s}"
+    );
+    // A page of 1000 inches is 55 inches at most, and its shapes with it.
+    let d = drawing(
+        &[page(
+            "Huge",
+            1000.0,
+            500.0,
+            &boxed(1, 500.0, 250.0, 100.0, 50.0, ""),
+        )],
+        "",
+    );
+    let c = convert(&d, Format::Vsdx, &Limits::default()).unwrap();
+    assert!(part(&c.pptx, "ppt/presentation.xml").contains(r#"cx="50292000" cy="25146000""#));
+    assert!(
+        part(&c.pptx, "ppt/slides/slide1.xml").contains(r#"<a:ext cx="5029200" cy="2514600"/>"#)
+    );
+}
+
+#[test]
+fn a_shape_is_placed_from_the_top_left_corner_of_the_page() {
+    let s = slide(&one(&boxed(1, 2.0, 3.0, 2.0, 1.0, "")));
+    // The page is 4 inches high and the box's top is at 3.5: 0.5 from the top.
+    assert!(
+        s.contains(r#"<a:off x="914400" y="457200"/><a:ext cx="1828800" cy="914400"/>"#),
+        "{s}"
+    );
+    // The path starts at the lower left of the box, y pointing down.
+    assert!(
+        s.contains(r#"<a:path w="1828800" h="914400"><a:moveTo><a:pt x="0" y="914400"/>"#),
+        "{s}"
+    );
+    assert!(s.contains(
+        r#"<a:lnTo><a:pt x="1828800" y="914400"/></a:lnTo><a:lnTo><a:pt x="1828800" y="0"/>"#
+    ));
+    assert!(s.contains("<a:close/>"));
+}
+
+#[test]
+fn rotation_is_counterclockwise_and_mirrors_stay_on_the_pin() {
+    // A quarter turn counterclockwise is three quarters clockwise.
+    let s = slide(&one(&boxed(
+        1,
+        3.0,
+        2.0,
+        2.0,
+        1.0,
+        &cell("Angle", "1.5707963267949"),
+    )));
+    assert!(s.contains(r#"<a:xfrm rot="16200000">"#), "{s}");
+    let s = slide(&one(&boxed(
+        1,
+        3.0,
+        2.0,
+        2.0,
+        1.0,
+        &(cell("FlipX", "1") + &cell("FlipY", "1")),
+    )));
+    assert!(s.contains(r#"flipH="1" flipV="1""#), "{s}");
+    // A pin at a corner: the box turns about it. Turned a quarter about its
+    // lower left corner at (2, 1), a 2 by 1 box covers x 1 to 2, y 1 to 3.
+    let extra = cell("Angle", "1.5707963267949") + &cell("LocPinX", "0") + &cell("LocPinY", "0");
+    let s = slide(&one(&boxed(1, 2.0, 1.0, 2.0, 1.0, &extra)));
+    // Its unturned box is centred on (1.5, 2): 2 wide, 1 high.
+    assert!(
+        s.contains(r#"<a:off x="457200" y="1371600"/><a:ext cx="1828800" cy="914400"/>"#),
+        "{s}"
+    );
+}
+
+#[test]
+fn fill_line_and_dash_come_from_the_cells_and_the_colour_table() {
+    let doc = "<Colors><ColorEntry IX='24' RGB='#336699'/></Colors>";
+    let extra = cell("FillPattern", "1")
+        + &cell("FillForegnd", "24")
+        + &cell("FillForegndTrans", "0.5")
+        + &cell("LinePattern", "2")
+        + &cell("LineWeight", "0.0208333333")
+        + &cell("LineColor", "#FF0000")
+        + &cell("EndArrow", "4");
+    let d = drawing(
+        &[page("P", 6.0, 4.0, &boxed(1, 3.0, 2.0, 2.0, 1.0, &extra))],
+        doc,
+    );
+    let s = slide(&d);
+    assert!(s.contains(r#"<a:solidFill><a:srgbClr val="336699"><a:alpha val="50000"/></a:srgbClr></a:solidFill>"#), "{s}");
+    assert!(s.contains(r#"<a:ln w="19050">"#), "{s}");
+    assert!(s.contains(r#"<a:srgbClr val="FF0000"/>"#));
+    assert!(s.contains(r#"<a:prstDash val="dash"/>"#));
+    assert!(s.contains(r#"<a:tailEnd type="triangle""#));
+    assert!(!s.contains("headEnd"));
+    // Without a pattern a shape is neither filled nor stroked.
+    let s = slide(&one(&boxed(1, 3.0, 2.0, 2.0, 1.0, "")));
+    assert!(s.contains("<a:noFill/><a:ln><a:noFill/></a:ln>"), "{s}");
+}
+
+#[test]
+fn a_style_sheet_gives_what_the_shape_leaves_out_through_its_parents() {
+    let doc = "<StyleSheets>\
+        <StyleSheet ID='0'><Cell N='FillPattern' V='1'/><Cell N='FillForegnd' V='#111111'/><Cell N='LinePattern' V='1'/><Cell N='LineColor' V='#222222'/><Cell N='LineWeight' V='0.01'/></StyleSheet>\
+        <StyleSheet ID='1' FillStyle='0' LineStyle='0'><Cell N='FillForegnd' V='#AABBCC'/></StyleSheet>\
+        </StyleSheets>";
+    let sh = "<Shape ID='1' FillStyle='1' LineStyle='1'><Cell N='PinX' V='3'/><Cell N='PinY' V='2'/><Cell N='Width' V='1'/><Cell N='Height' V='1'/><Cell N='LocPinX' V='0.5'/><Cell N='LocPinY' V='0.5'/>".to_string()
+        + &rect(1.0, 1.0)
+        + "</Shape>";
+    let d = drawing(&[page("P", 6.0, 4.0, &sh)], doc);
+    let s = slide(&d);
+    // The fill colour of the style, its pattern and the line of its parent.
+    assert!(
+        s.contains(r#"<a:solidFill><a:srgbClr val="AABBCC"/></a:solidFill>"#),
+        "{s}"
+    );
+    assert!(
+        s.contains(r#"<a:ln w="9144"><a:solidFill><a:srgbClr val="222222"/>"#),
+        "{s}"
+    );
+}
+
+fn master_package(instance: &str) -> Vec<u8> {
+    let master = "<Shape ID='1' Type='Shape'><Cell N='PinX' V='1'/><Cell N='PinY' V='0.5'/>\
+        <Cell N='Width' V='2'/><Cell N='Height' V='1'/><Cell N='LocPinX' V='1' F='Width*0.5'/><Cell N='LocPinY' V='0.5' F='Height*0.5'/>\
+        <Cell N='FillPattern' V='1'/><Cell N='FillForegnd' V='#00FF00'/>\
+        <Section N='Geometry' IX='0'>\
+        <Row T='MoveTo' IX='1'><Cell N='X' V='0' F='Width*0'/><Cell N='Y' V='0' F='Height*0'/></Row>\
+        <Row T='LineTo' IX='2'><Cell N='X' V='2' F='Width*1'/><Cell N='Y' V='0' F='Height*0'/></Row>\
+        <Row T='LineTo' IX='3'><Cell N='X' V='2' F='Width*1'/><Cell N='Y' V='1' F='Height*1'/></Row>\
+        </Section></Shape>";
+    package(&[
+        (
+            "_rels/.rels",
+            rels(&[("rId1", &format!("{REL}/document"), "visio/document.xml")]),
+        ),
+        ("visio/document.xml", format!("<VisioDocument {NS}/>")),
+        (
+            "visio/_rels/document.xml.rels",
+            rels(&[
+                ("rId1", &format!("{REL}/masters"), "masters/masters.xml"),
+                ("rId2", &format!("{REL}/pages"), "pages/pages.xml"),
+            ]),
+        ),
+        (
+            "visio/masters/masters.xml",
+            format!("<Masters {NS}><Master ID='7'><Rel r:id='rId1'/></Master></Masters>"),
+        ),
+        (
+            "visio/masters/_rels/masters.xml.rels",
+            rels(&[("rId1", &format!("{REL}/master"), "master1.xml")]),
+        ),
+        (
+            "visio/masters/master1.xml",
+            format!("<MasterContents {NS}><Shapes>{master}</Shapes></MasterContents>"),
+        ),
+        (
+            "visio/pages/pages.xml",
+            format!(
+                "<Pages {NS}><Page ID='0' Name='P'><PageSheet><Cell N='PageWidth' V='6'/><Cell N='PageHeight' V='4'/></PageSheet><Rel r:id='rId1'/></Page></Pages>"
+            ),
+        ),
+        (
+            "visio/pages/_rels/pages.xml.rels",
+            rels(&[("rId1", &format!("{REL}/page"), "page1.xml")]),
+        ),
+        (
+            "visio/pages/page1.xml",
+            format!("<PageContents {NS}><Shapes>{instance}</Shapes></PageContents>"),
+        ),
+    ])
+}
+
+#[test]
+fn an_instance_inherits_its_master_and_the_master_formulas_follow_its_size() {
+    // Twice as wide as the master and one cell of its own.
+    let inst = "<Shape ID='3' Type='Shape' Master='7'><Cell N='PinX' V='3'/><Cell N='PinY' V='2'/><Cell N='Width' V='4'/>\
+                <Cell N='FillForegnd' V='#0000FF'/></Shape>";
+    let s = slide(&master_package(inst));
+    // LocPinX = Width*0.5 gives a box from x = 1 to 5.
+    assert!(
+        s.contains(r#"<a:off x="914400" y="1371600"/><a:ext cx="3657600" cy="914400"/>"#),
+        "{s}"
+    );
+    // The path follows Width*1 (4 inches), and Height*0.
+    assert!(
+        s.contains(
+            r#"<a:lnTo><a:pt x="3657600" y="914400"/></a:lnTo><a:lnTo><a:pt x="3657600" y="0"/>"#
+        ),
+        "{s}"
+    );
+    // The instance's colour, not the master's.
+    assert!(
+        s.contains(r#"<a:srgbClr val="0000FF"/>"#) && !s.contains("00FF00"),
+        "{s}"
+    );
+    // Without the colour, the master's.
+    let inst = "<Shape ID='3' Type='Shape' Master='7'><Cell N='PinX' V='3'/><Cell N='PinY' V='2'/></Shape>";
+    let s = slide(&master_package(inst));
+    assert!(s.contains(r#"<a:srgbClr val="00FF00"/>"#), "{s}");
+    assert!(
+        s.contains(r#"<a:off x="1828800" y="1371600"/><a:ext cx="1828800" cy="914400"/>"#),
+        "{s}"
+    );
+}
+
+#[test]
+fn a_group_has_its_members_in_its_own_coordinates() {
+    let group = format!(
+        "<Shape ID='1' Type='Group'>{}{}{}{}{}{}{}<Shapes>{}</Shapes></Shape>",
+        cell("PinX", "3"),
+        cell("PinY", "2"),
+        cell("Width", "2"),
+        cell("Height", "1"),
+        cell("LocPinX", "1"),
+        cell("LocPinY", "0.5"),
+        cell("Angle", "0.5235987756"),
+        // A member at the group's lower left, a unit square.
+        boxed(2, 0.5, 0.5, 1.0, 1.0, "")
+    );
+    let s = slide(&one(&group));
+    assert!(s.contains("<p:grpSp>"), "{s}");
+    // The group's box, turned 30 degrees counterclockwise, and the space its
+    // members are in: its own size, y pointing down.
+    assert!(s.contains(r#"<a:xfrm rot="19800000"><a:off x="1828800" y="1371600"/><a:ext cx="1828800" cy="914400"/><a:chOff x="0" y="0"/><a:chExt cx="1828800" cy="914400"/></a:xfrm>"#), "{s}");
+    // The member fills the left half of it.
+    assert!(
+        s.contains(r#"<a:xfrm><a:off x="0" y="0"/><a:ext cx="914400" cy="914400"/></a:xfrm>"#),
+        "{s}"
+    );
+}
+
+#[test]
+fn text_has_runs_paragraphs_and_a_block_where_the_cells_put_it() {
+    let extra = "<Section N='Character'><Row IX='0'>\
+        <Cell N='Size' V='0.25'/><Cell N='Style' V='1'/><Cell N='Color' V='#FF0000'/><Cell N='Font' V='Arial'/></Row></Section>\
+        <Section N='Paragraph'><Row IX='0'><Cell N='HorzAlign' V='2'/></Row></Section>\
+        <Cell N='VerticalAlign' V='2'/>\
+        <Text><cp IX='0'/>Bold red<cp IX='0'/> and more\nSecond</Text>";
+    let s = slide(&one(&boxed(1, 3.0, 2.0, 2.0, 1.0, extra)));
+    assert_eq!(s.matches("<a:p>").count(), 2, "{s}");
+    assert!(s.contains(r#"sz="1800" b="1""#), "{s}");
+    assert!(s.contains(r#"<a:srgbClr val="FF0000"/>"#), "{s}");
+    assert!(s.contains(r#"<a:latin typeface="Arial"/>"#), "{s}");
+    assert!(
+        s.contains("<a:t>Bold red</a:t>") && s.contains("<a:t>Second</a:t>"),
+        "{s}"
+    );
+    assert!(s.contains(r#"algn="r""#), "{s}");
+    assert!(s.contains(r#"anchor="b""#), "{s}");
+    // A text block that is a part of the box: the insets are what is left.
+    let extra = "<Cell N='TxtPinX' V='1.5'/><Cell N='TxtPinY' V='0.5'/><Cell N='TxtWidth' V='1'/><Cell N='TxtHeight' V='0.5'/>\
+        <Cell N='TxtLocPinX' V='0.5'/><Cell N='TxtLocPinY' V='0.25'/><Text>Right part</Text>";
+    let s = slide(&one(&boxed(1, 3.0, 2.0, 2.0, 1.0, extra)));
+    // The block starts at x = 1 of 2 and is 0.5 of 1 high, centred.
+    assert!(
+        s.contains(r#"lIns="914400" tIns="228600" rIns="0" bIns="228600""#),
+        "{s}"
+    );
+    // A block turned or outside the box is a shape of its own.
+    let extra = "<Cell N='TxtPinX' V='1'/><Cell N='TxtPinY' V='0.5'/><Cell N='TxtWidth' V='1'/><Cell N='TxtHeight' V='0.5'/>\
+        <Cell N='TxtLocPinX' V='0.5'/><Cell N='TxtLocPinY' V='0.25'/><Cell N='TxtAngle' V='1.5707963267949'/><Text>Turned</Text>";
+    let s = slide(&one(&boxed(1, 3.0, 2.0, 2.0, 1.0, extra)));
+    assert_eq!(s.matches("<p:sp>").count(), 2, "{s}");
+    assert!(s.contains(r#"<a:xfrm rot="16200000">"#), "{s}");
+}
+
+#[test]
+fn what_is_hidden_deleted_or_a_guide_is_left_out() {
+    let layers = "<Section N='Layer'><Row IX='0'><Cell N='Name' V='A'/><Cell N='Visible' V='1'/></Row>\
+                  <Row IX='1'><Cell N='Name' V='B'/><Cell N='Visible' V='0'/></Row></Section>";
+    let shapes = [
+        boxed(1, 1.0, 1.0, 1.0, 1.0, &(cell("LayerMember", "0") + "<Text>shown</Text>")),
+        boxed(2, 2.0, 1.0, 1.0, 1.0, &(cell("LayerMember", "0;1") + "<Text>on a hidden layer</Text>")),
+        boxed(3, 3.0, 1.0, 1.0, 1.0, "<Text>no layer</Text>"),
+        "<Shape ID='4' Type='Guide'><Cell N='PinX' V='1'/><Text>guide</Text></Shape>".to_string(),
+        boxed(5, 4.0, 1.0, 1.0, 1.0, "<Text>on page</Text>").replace("Type='Shape'", "Type='Shape' Del='1'"),
+        // A path that does not show leaves nothing but the text.
+        format!(
+            "<Shape ID='6' Type='Shape'>{}{}{}{}<Section N='Geometry' IX='0'><Cell N='NoShow' V='1'/><Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row><Row T='LineTo' IX='2'><Cell N='X' V='1'/><Cell N='Y' V='1'/></Row></Section></Shape>",
+            cell("PinX", "5"), cell("PinY", "2"), cell("Width", "1"), cell("Height", "1")
+        ),
+    ]
+    .concat();
+    let p = Page {
+        name: "P",
+        sheet: cell("PageWidth", "6") + &cell("PageHeight", "4") + layers,
+        shapes,
+    };
+    let s = slide(&drawing(&[p], ""));
+    assert!(s.contains("shown") && s.contains("no layer"), "{s}");
+    for gone in ["on a hidden layer", "guide", "on page"] {
+        assert!(!s.contains(gone), "{gone}");
+    }
+    // Two shapes with a path, and the one whose only path does not show
+    // has none.
+    assert_eq!(s.matches("<a:custGeom>").count(), 2, "{s}");
+}
+
+#[test]
+fn a_picture_and_the_links_of_the_sample_drawing() {
+    let c = convert(&fixture("sample.vsdx"), Format::Vsdx, &Limits::default()).unwrap();
+    // The PNG of the second page is a picture of the PPTX.
+    assert!(has_part(&c.pptx, "ppt/media/image1.png"));
+    assert!(part(&c.pptx, "ppt/slides/slide2.xml").contains("<p:pic>"));
+    // A link to an address, and one to the first page.
+    let r1 = part(&c.pptx, "ppt/slides/_rels/slide1.xml.rels");
+    assert!(
+        r1.contains(r#"Target="https://example.org/" TargetMode="External""#),
+        "{r1}"
+    );
+    let s2 = part(&c.pptx, "ppt/slides/slide2.xml");
+    assert!(s2.contains(r#"action="ppaction://hlinksldjump""#), "{s2}");
+    assert!(part(&c.pptx, "ppt/slides/_rels/slide2.xml.rels").contains("slide1.xml"));
+    // Its hidden layer's shape is not in the first slide, the rest is.
+    let s1 = part(&c.pptx, "ppt/slides/slide1.xml");
+    assert!(
+        !s1.contains("Hidden note") && s1.contains("Wide box"),
+        "{s1}"
+    );
+    assert!(s1.contains(r#"<p:grpSp>"#) && s1.contains("First line"));
+    // The master's own formulas, the instance's colour and the turn.
+    assert!(s1.contains(r#"flipH="1""#) && s1.contains(r#"val="00FF00""#));
+    // The first instance gets the master's fill through its style and the
+    // colour table (24 is 336699).
+    assert!(s1.contains(r#"val="336699""#), "{s1}");
+}
+
+#[test]
+fn a_background_page_is_the_master_of_the_pages_that_use_it() {
+    let c = convert(&fixture("sample.vsdx"), Format::Vsdx, &Limits::default()).unwrap();
+    // The first master is the blank one, the second the page "Back".
+    let m = part(&c.pptx, "ppt/slideMasters/slideMaster2.xml");
+    assert!(m.contains("CCCCCC"), "{m}");
+    assert!(part(&c.pptx, "ppt/slides/_rels/slide1.xml.rels").contains("slideLayout2.xml"));
+    assert!(part(&c.pptx, "ppt/slides/_rels/slide2.xml.rels").contains("slideLayout1.xml"));
+}
+
+#[test]
+fn the_theme_gives_what_a_themed_cell_leaves_to_it() {
+    let c = convert(&fixture("themed.vsdx"), Format::Vsdx, &Limits::default()).unwrap();
+    let s = part(&c.pptx, "ppt/slides/slide1.xml");
+    let fills: Vec<&str> = s
+        .split("<a:solidFill><a:srgbClr val=\"")
+        .skip(1)
+        .map(|t| &t[..6])
+        .collect();
+    // For each box the fill and then the line. The first has no quick style:
+    // the root style's white and black; then accent 1 and the line in
+    // accent 2; a variation's second colour; the first variation, as the
+    // index 65534 is not one; the background colour.
+    assert_eq!(
+        fills,
+        [
+            "FFFFFF", "000000", "4472C4", "ED7D31", "00AA00", "000000", "222222", "000000",
+            "F0F0F0", "000000"
+        ],
+        "{s}"
+    );
+    // The theme's body font for text that names none.
+    assert!(s.contains(r#"typeface="Verdana""#), "{s}");
+}
+
+#[test]
+fn an_effect_that_is_not_drawn_is_a_warning() {
+    let d = one(&boxed(1, 3.0, 2.0, 1.0, 1.0, &cell("ShapeShdwType", "1")));
+    let c = convert(&d, Format::Vsdx, &Limits::default()).unwrap();
+    assert!(
+        c.warnings.iter().any(|w| w.contains("shadows")),
+        "{:?}",
+        c.warnings
+    );
+    let c = convert(
+        &one(&boxed(1, 3.0, 2.0, 1.0, 1.0, "")),
+        Format::Vsdx,
+        &Limits::default(),
+    )
+    .unwrap();
+    assert!(c.warnings.is_empty(), "{:?}", c.warnings);
+    // No page is said, too.
+    let c = convert(&drawing(&[], ""), Format::Vsdx, &Limits::default()).unwrap();
+    assert_eq!(c.slides, 0);
+    assert!(c.warnings.iter().any(|w| w.contains("no pages")));
+}
+
+#[test]
+fn the_first_pages_alone_and_a_source_read_part_by_part() {
+    let d = fixture("sample.vsdx");
+    let c = convert_first(&d, Format::Vsdx, &Limits::default(), 1).unwrap();
+    assert_eq!((c.slides, c.total_slides), (1, 2));
+    assert!(!has_part(&c.pptx, "ppt/media/image1.png"));
+    let whole = convert(&d, Format::Vsdx, &Limits::default()).unwrap();
+    let from =
+        convert_first_from(Cursor::new(d), Format::Vsdx, &Limits::default(), usize::MAX).unwrap();
+    assert_eq!(from.slides, whole.slides);
+    assert_eq!(
+        part(&from.pptx, "ppt/slides/slide1.xml"),
+        part(&whole.pptx, "ppt/slides/slide1.xml")
+    );
+}
+
+#[test]
+fn the_extensions_name_the_format() {
+    for e in ["vsdx", "VSDM", "vstx", "vstm"] {
+        assert_eq!(Format::from_extension(e), Some(Format::Vsdx), "{e}");
+    }
+    assert_eq!(Format::Vsdx.name(), "vsdx");
+    assert_eq!(Format::from_extension("vsd"), None);
+    assert_eq!(Format::from_extension("vdx"), None);
+}
+
+#[test]
+fn what_is_not_a_drawing_is_refused_by_kind() {
+    let l = Limits::default();
+    let kind = |d: &[u8]| convert(d, Format::Vsdx, &l).unwrap_err().kind();
+    assert_eq!(kind(b"not a zip at all"), "not-format");
+    assert_eq!(kind(b""), "not-format");
+    // A package without the Visio parts, and another document's.
+    let other = package(&[("word/document.xml", "<w:document/>".into())]);
+    assert_eq!(kind(&other), "not-format");
+    let odp = std::fs::read(format!(
+        "{}/tests/fixtures/office/slides/sample.odp",
+        env!("CARGO_MANIFEST_DIR")
+    ))
+    .unwrap();
+    assert_eq!(kind(&odp), "not-format");
+    // A document part that is not a Visio document.
+    let wrong = package(&[
+        (
+            "_rels/.rels",
+            rels(&[("rId1", &format!("{REL}/document"), "visio/document.xml")]),
+        ),
+        ("visio/document.xml", "<Other/>".into()),
+    ]);
+    assert_eq!(kind(&wrong), "not-format");
+    // A binary file (a compound file) is not a package; a password protected
+    // package is a compound file with an encrypted stream.
+    let cfb = build_cfb(&[("WordDocument", &[1u8; 600][..])]);
+    assert_eq!(kind(&cfb), "not-format");
+    let enc = build_cfb(&[
+        ("EncryptedPackage", &[1u8; 600][..]),
+        ("EncryptionInfo", &[2u8; 100][..]),
+    ]);
+    assert_eq!(kind(&enc), "encrypted");
+    assert_eq!(
+        convert_first_from(Cursor::new(enc), Format::Vsdx, &l, 1).unwrap_err(),
+        Error::Encrypted
+    );
+    // A member of the package that is encrypted.
+    let mut e = fixture("sample.vsdx");
+    for i in 0..e.len().saturating_sub(10) {
+        if e[i..].starts_with(b"PK\x03\x04") {
+            e[i + 6] |= 1;
+        } else if e[i..].starts_with(b"PK\x01\x02") {
+            e[i + 8] |= 1;
+        }
+    }
+    assert_eq!(kind(&e), "encrypted");
+}
+
+#[test]
+fn damaged_xml_is_malformed_and_limits_are_too_large() {
+    let l = Limits::default();
+    let mut parts: Vec<(&str, String)> = vec![
+        (
+            "_rels/.rels",
+            rels(&[("rId1", &format!("{REL}/document"), "visio/document.xml")]),
+        ),
+        ("visio/document.xml", format!("<VisioDocument {NS}")),
+    ];
+    let e = convert(&package(&parts), Format::Vsdx, &l).unwrap_err();
+    assert_eq!(e.kind(), "malformed", "{e}");
+    parts[1].1 = format!("<VisioDocument {NS}></Wrong></VisioDocument>");
+    parts.push((
+        "visio/_rels/document.xml.rels",
+        rels(&[("rId2", &format!("{REL}/pages"), "pages/pages.xml")]),
+    ));
+    parts.push((
+        "visio/pages/pages.xml",
+        format!("<Pages {NS}><Page ID='0' Name='P'><Rel r:id='rId1'/></Page></Pages>"),
+    ));
+    parts.push((
+        "visio/pages/_rels/pages.xml.rels",
+        rels(&[("rId1", &format!("{REL}/page"), "p.xml")]),
+    ));
+    parts.push(("visio/pages/p.xml", "<PageContents ".into()));
+    assert_eq!(
+        convert(&package(&parts), Format::Vsdx, &l)
+            .unwrap_err()
+            .kind(),
+        "malformed"
+    );
+
+    let many: String = (0..50).map(|i| boxed(i, 1.0, 1.0, 1.0, 1.0, "")).collect();
+    let d = one(&many);
+    assert_eq!(
+        convert(&d, Format::Vsdx, &Limits::default().with_max_shapes(10)).unwrap_err(),
+        Error::TooLarge("shapes")
+    );
+    let mut small = Limits::default();
+    small.max_slides = 1;
+    assert_eq!(
+        convert(&fixture("sample.vsdx"), Format::Vsdx, &small).unwrap_err(),
+        Error::TooLarge("slides")
+    );
+    let mut small = Limits::default();
+    small.max_part = 300;
+    assert!(matches!(
+        convert(&fixture("sample.vsdx"), Format::Vsdx, &small),
+        Err(Error::TooLarge(_))
+    ));
+    assert!(matches!(
+        convert(&d, Format::Vsdx, &Limits::default().with_max_memory(10_000)),
+        Err(Error::TooLarge(_))
+    ));
+    let mut small = Limits::default();
+    small.max_input = 100;
+    assert_eq!(
+        convert(&d, Format::Vsdx, &small).unwrap_err(),
+        Error::TooLarge("input")
+    );
+}
+
+#[test]
+fn a_shape_with_too_many_path_segments_is_too_large() {
+    let mut rows =
+        String::from("<Row T='MoveTo' IX='1'><Cell N='X' V='0'/><Cell N='Y' V='0'/></Row>");
+    for i in 2..40_000 {
+        rows.push_str(&format!(
+            "<Row T='LineTo' IX='{i}'><Cell N='X' V='1'/><Cell N='Y' V='1'/></Row>"
+        ));
+    }
+    let shape = format!(
+        "<Shape ID='1'>{}<Section N='Geometry' IX='0'>{rows}</Section></Shape>",
+        cell("Width", "1") + &cell("Height", "1")
+    );
+    // Within the bound of a shape.
+    assert!(convert(&one(&shape), Format::Vsdx, &Limits::default()).is_ok());
+    // Nine such sections in one shape are past it.
+    let many = format!(
+        "<Shape ID='1'>{}{}</Shape>",
+        cell("Width", "1") + &cell("Height", "1"),
+        (0..6)
+            .map(|k| format!("<Section N='Geometry' IX='{k}'>{rows}</Section>"))
+            .collect::<String>()
+    );
+    assert_eq!(
+        convert(&one(&many), Format::Vsdx, &Limits::default()).unwrap_err(),
+        Error::TooLarge("geometry segments")
+    );
+}
+
+#[test]
+fn hostile_structure_does_not_loop_or_panic() {
+    // A page whose part is the pages part, and a master that instantiates
+    // itself.
+    let cyc = package(&[
+        (
+            "_rels/.rels",
+            rels(&[("rId1", &format!("{REL}/document"), "visio/document.xml")]),
+        ),
+        ("visio/document.xml", format!("<VisioDocument {NS}/>")),
+        (
+            "visio/_rels/document.xml.rels",
+            rels(&[("rId2", &format!("{REL}/pages"), "pages/pages.xml")]),
+        ),
+        (
+            "visio/pages/pages.xml",
+            format!("<Pages {NS}><Page ID='0' Name='P'><Rel r:id='rId1'/></Page></Pages>"),
+        ),
+        (
+            "visio/pages/_rels/pages.xml.rels",
+            rels(&[("rId1", &format!("{REL}/page"), "pages.xml")]),
+        ),
+    ]);
+    let c = convert(&cyc, Format::Vsdx, &Limits::default()).unwrap();
+    assert_eq!(c.slides, 1);
+    let inst = "<Shape ID='1' Type='Shape' Master='7'><Cell N='PinX' V='3'/></Shape>";
+    let mut d = master_package(inst);
+    // The master holds an instance of itself.
+    let looping =
+        "<Shape ID='1' Type='Group' Master='7'><Shapes><Shape ID='2' Master='7'/></Shapes></Shape>";
+    let doc = package(&[
+        (
+            "_rels/.rels",
+            rels(&[("rId1", &format!("{REL}/document"), "visio/document.xml")]),
+        ),
+        ("visio/document.xml", format!("<VisioDocument {NS}/>")),
+        (
+            "visio/_rels/document.xml.rels",
+            rels(&[
+                ("rId1", &format!("{REL}/masters"), "masters/masters.xml"),
+                ("rId2", &format!("{REL}/pages"), "pages/pages.xml"),
+            ]),
+        ),
+        (
+            "visio/masters/masters.xml",
+            format!("<Masters {NS}><Master ID='7'><Rel r:id='rId1'/></Master></Masters>"),
+        ),
+        (
+            "visio/masters/_rels/masters.xml.rels",
+            rels(&[("rId1", &format!("{REL}/master"), "m.xml")]),
+        ),
+        (
+            "visio/masters/m.xml",
+            format!("<MasterContents {NS}><Shapes>{looping}</Shapes></MasterContents>"),
+        ),
+        (
+            "visio/pages/pages.xml",
+            format!("<Pages {NS}><Page ID='0' Name='P'><Rel r:id='rId1'/></Page></Pages>"),
+        ),
+        (
+            "visio/pages/_rels/pages.xml.rels",
+            rels(&[("rId1", &format!("{REL}/page"), "p.xml")]),
+        ),
+        (
+            "visio/pages/p.xml",
+            format!("<PageContents {NS}><Shapes>{looping}</Shapes></PageContents>"),
+        ),
+    ]);
+    let r = convert(
+        &doc,
+        Format::Vsdx,
+        &Limits::default().with_max_shapes(10_000),
+    );
+    assert!(r.is_ok() || matches!(r, Err(Error::TooLarge(_))), "{r:?}");
+    d.truncate(d.len() / 2);
+    let _ = convert(&d, Format::Vsdx, &Limits::default());
+}
diff --git a/crates/exav-render/tests/office_text_docs.rs b/crates/exav-render/tests/office_text_docs.rs
new file mode 100644
index 00000000..db6306fc
--- /dev/null
+++ b/crates/exav-render/tests/office_text_docs.rs
@@ -0,0 +1,1088 @@
+//! The text of every format, taken from what its reader makes: the fixtures,
+//! and short documents with one of each thing a reader sees (a table, a
+//! header, a footnote, a comment, links, hidden text).
+
+#[path = "office_common/mod.rs"]
+mod common;
+
+use common::*;
+use exav_render::docs::{Error, Format, Limits, convert, text};
+use exav_render::formats::office::test_util::{PackageWriter, W, Zip, build_cfb, literal_block};
+use exav_render::formats::office::text::Text;
+
+const CAP: usize = 1 << 20;
+
+fn fixture(name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/office/docs/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("{p}: {e}"))
+}
+
+fn extract(input: &[u8], f: Format) -> Text {
+    text(input, f, &Limits::default(), CAP).unwrap_or_else(|e| panic!("{f:?}: {e}"))
+}
+
+/// The text of the section called `label`.
+fn section<'a>(t: &'a Text, label: &str) -> &'a str {
+    let s = t
+        .sections
+        .iter()
+        .find(|s| s.label == label)
+        .unwrap_or_else(|| panic!("no section {label} in {:?}", t.sections));
+    &t.text[s.range.clone()]
+}
+
+/// The labels of the sections, in order.
+fn labels(t: &Text) -> Vec<&str> {
+    t.sections.iter().map(|s| s.label.as_str()).collect()
+}
+
+// ---- the words of a DOCX, to compare with ----
+
+fn unescape(s: &str) -> String {
+    let mut out = String::new();
+    let mut rest = s;
+    while let Some(i) = rest.find('&') {
+        out.push_str(&rest[..i]);
+        rest = &rest[i..];
+        let end = rest.find(';').expect("an entity ends");
+        let e = &rest[1..end];
+        match e {
+            "amp" => out.push('&'),
+            "lt" => out.push('<'),
+            "gt" => out.push('>'),
+            "quot" => out.push('"'),
+            "apos" => out.push('\''),
+            _ => {
+                let n = match e.strip_prefix("#x") {
+                    Some(h) => u32::from_str_radix(h, 16),
+                    None => e.trim_start_matches('#').parse(),
+                };
+                out.push(char::from_u32(n.expect("a character reference")).expect("a character"));
+            }
+        }
+        rest = &rest[end + 1..];
+    }
+    out.push_str(rest);
+    out
+}
+
+/// The `w:t` text of a part: runs, but not hidden ones, not field
+/// instructions and not the result of a page number field. A tab or a break
+/// is a space, a paragraph and a cell end with one.
+fn docx_text(xml: &str) -> String {
+    struct Field {
+        instr: String,
+        result: bool,
+        skip: bool,
+    }
+    let mut out = String::new();
+    // The runs open, with whether each is hidden: a text box holds runs
+    // inside a run.
+    let mut runs: Vec<(String, bool)> = vec![];
+    let mut fields: Vec<Field> = vec![];
+    let mut rest = xml;
+    while let Some(lt) = rest.find('<') {
+        rest = &rest[lt + 1..];
+        let gt = rest.find('>').expect("a tag ends");
+        let tag = &rest[..gt];
+        rest = &rest[gt + 1..];
+        let closing = tag.starts_with('/');
+        let name = tag
+            .trim_start_matches('/')
+            .split(|c: char| c.is_whitespace() || c == '/')
+            .next()
+            .unwrap_or("");
+        match (name, closing) {
+            ("w:r", false) => runs.push((String::new(), false)),
+            ("w:r", true) => {
+                let (run, hidden) = runs.pop().expect("a run is open");
+                if !hidden {
+                    out.push_str(&run);
+                }
+            }
+            ("w:vanish", false) => {
+                if let Some(r) = runs.last_mut() {
+                    r.1 = !tag.contains("w:val=\"0\"");
+                }
+            }
+            ("w:t", false) if !tag.ends_with('/') => {
+                let end = rest.find("</w:t>").expect("w:t ends");
+                // Not an instruction's, nor a page number's.
+                if fields.iter().all(|f| f.result && !f.skip)
+                    && let Some(r) = runs.last_mut()
+                {
+                    r.0.push_str(&unescape(&rest[..end]));
+                }
+                rest = &rest[end..];
+            }
+            ("w:instrText", false) => {
+                let end = rest.find("</w:instrText>").expect("w:instrText ends");
+                if let Some(f) = fields.last_mut() {
+                    f.instr.push_str(&unescape(&rest[..end]));
+                }
+                rest = &rest[end..];
+            }
+            ("w:fldChar", false) => {
+                if tag.contains("\"begin\"") {
+                    fields.push(Field {
+                        instr: String::new(),
+                        result: false,
+                        skip: false,
+                    });
+                } else if tag.contains("\"separate\"") {
+                    if let Some(f) = fields.last_mut() {
+                        f.result = true;
+                        let word = f.instr.split_whitespace().next().unwrap_or("");
+                        f.skip = word.eq_ignore_ascii_case("PAGE")
+                            || word.eq_ignore_ascii_case("NUMPAGES");
+                    }
+                } else {
+                    fields.pop();
+                }
+            }
+            ("w:tab" | "w:br" | "w:cr", false) => {
+                if let Some(r) = runs.last_mut() {
+                    r.0.push(' ');
+                }
+            }
+            ("w:noBreakHyphen", false) => {
+                if let Some(r) = runs.last_mut() {
+                    r.0.push('-');
+                }
+            }
+            ("w:p" | "w:tc", true) => out.push(' '),
+            _ => {}
+        }
+    }
+    out
+}
+
+/// The words of every text part of a DOCX, sorted.
+fn docx_words(docx: &[u8]) -> Vec<String> {
+    let names = Zip::open(docx).expect("a ZIP package").names();
+    let mut all = String::new();
+    for n in names {
+        let text_part = [
+            "document",
+            "header",
+            "footer",
+            "footnotes",
+            "endnotes",
+            "comments",
+        ]
+        .iter()
+        .any(|p| n.starts_with(&format!("word/{p}")) && n.ends_with(".xml"));
+        if text_part {
+            all.push(' ');
+            all.push_str(&docx_text(&part(docx, &n)));
+        }
+    }
+    let mut w: Vec<String> = all.split_whitespace().map(str::to_string).collect();
+    w.sort();
+    w
+}
+
+/// The words of a text, sorted, without the targets written after links.
+fn text_words(t: &Text) -> Vec<String> {
+    let mut s = t.text.clone();
+    for (_, target) in &t.links {
+        s = s.replace(&format!(" ({target})"), "");
+    }
+    let mut w: Vec<String> = s.split_whitespace().map(str::to_string).collect();
+    w.sort();
+    w
+}
+
+/// The text and the DOCX the converter writes have the same words.
+fn same_words_as_the_converter(name: &str, input: &[u8], f: Format) {
+    let t = extract(input, f);
+    let c = convert(input, f, &Limits::default()).unwrap_or_else(|e| panic!("{name}: {e}"));
+    let (a, b) = (text_words(&t), docx_words(&c.docx));
+    assert!(!a.is_empty(), "{name}: no words");
+    assert_eq!(a, b, "{name}");
+}
+
+// ---- documents of each format with the same things in them ----
+
+const ODF_NS: &str = r#"xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/""#;
+
+const ODF_AUTOMATIC: &str = r#"<office:automatic-styles>
+<style:page-layout style:name="L1"><style:page-layout-properties fo:page-width="21cm" fo:page-height="29.7cm"/></style:page-layout>
+<style:style style:name="Hid" style:family="text"><style:text-properties text:display="none"/></style:style>
+<style:style style:name="Strike" style:family="text"><style:text-properties style:text-line-through-style="solid"/></style:style>
+</office:automatic-styles>"#;
+
+const ODF_MASTER: &str = r#"<office:master-styles><style:master-page style:name="Standard" style:page-layout-name="L1"><style:header><text:p>HEADTEXT</text:p></style:header><style:footer><text:p>FOOTTEXT</text:p></style:footer></style:master-page></office:master-styles>"#;
+
+const ODF_BODY: &str = r#"<text:p>Alpha beta gamma</text:p>
+<text:p>Visit <text:a xlink:href="https://example.org/x">the site</text:a> today <text:a xlink:href="https://example.org/">https://example.org/</text:a></text:p>
+<text:p>before <text:span text:style-name="Hid">SECRET</text:span>after</text:p>
+<text:p><text:span text:style-name="Strike">struck</text:span> kept</text:p>
+<text:p>Page <text:page-number>7</text:page-number></text:p>
+<text:p>note<text:note text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p>NOTETEXT</text:p></text:note-body></text:note></text:p>
+<text:p>end<text:note text:note-class="endnote"><text:note-citation>i</text:note-citation><text:note-body><text:p>ENDTEXT</text:p></text:note-body></text:note></text:p>
+<text:p>word<office:annotation><dc:creator>Ann Lee</dc:creator><text:p>COMMENTTEXT</text:p></office:annotation></text:p>
+<table:table><table:table-column table:number-columns-repeated="2"/>
+<table:table-row><table:table-cell><text:p>r1c1</text:p></table:table-cell><table:table-cell><text:p>r1c2</text:p></table:table-cell></table:table-row>
+<table:table-row><table:table-cell><text:p>r2c1</text:p></table:table-cell><table:table-cell><text:p>r2c2</text:p></table:table-cell></table:table-row>
+</table:table>
+<text:p>Boxed <draw:frame text:anchor-type="as-char" svg:width="2cm" svg:height="1cm"><draw:text-box><text:p>BOXTEXT</text:p></draw:text-box></draw:frame> text</text:p>
+<text:p>Last</text:p>"#;
+
+fn fodt() -> Vec<u8> {
+    format!(
+        r#"<?xml version="1.0"?><office:document {ODF_NS} office:mimetype="application/vnd.oasis.opendocument.text">{ODF_AUTOMATIC}{ODF_MASTER}<office:body><office:text>{ODF_BODY}</office:text></office:body></office:document>"#
+    )
+    .into_bytes()
+}
+
+fn odt_with(content: &str, styles: &str, manifest: Option<&str>) -> Vec<u8> {
+    let mut z = PackageWriter::new(1 << 22);
+    z.put(
+        "mimetype",
+        b"application/vnd.oasis.opendocument.text",
+        false,
+    )
+    .unwrap();
+    z.put("content.xml", content.as_bytes(), true).unwrap();
+    z.put("styles.xml", styles.as_bytes(), true).unwrap();
+    if let Some(m) = manifest {
+        z.put("META-INF/manifest.xml", m.as_bytes(), true).unwrap();
+    }
+    z.finish().unwrap()
+}
+
+fn odt() -> Vec<u8> {
+    odt_with(
+        &format!(
+            r#"<?xml version="1.0"?><office:document-content {ODF_NS}>{ODF_AUTOMATIC}<office:body><office:text>{ODF_BODY}</office:text></office:body></office:document-content>"#
+        ),
+        &format!(
+            r#"<?xml version="1.0"?><office:document-styles {ODF_NS}>{ODF_AUTOMATIC}{ODF_MASTER}</office:document-styles>"#
+        ),
+        None,
+    )
+}
+
+fn rtf() -> Vec<u8> {
+    br#"{\rtf1\ansi\deff0{\fonttbl{\f0 Arial;}}
+{\header\pard HEADTEXT\par}{\footer\pard FOOTTEXT\par}
+\pard Alpha beta gamma\par
+Visit {\field{\*\fldinst HYPERLINK "https://example.org/x"}{\fldrslt the site}} today {\field{\*\fldinst HYPERLINK "https://example.org/"}{\fldrslt https://example.org/}}\par
+before {\v SECRET}after\par
+{\strike struck} kept\par
+Page {\field{\*\fldinst PAGE}{\fldrslt 7}}\par
+note{\super\chftn{\footnote\pard\plain\chftn  NOTETEXT}}\par
+\trowd\trgaph108\cellx2000\cellx4000
+\pard\intbl r1c1\cell r1c2\cell\row
+\trowd\trgaph108\cellx2000\cellx4000
+\pard\intbl r2c1\cell r2c2\cell\row
+\pard Last\par}
+"#
+    .to_vec()
+}
+
+const WML_NS: &str = r#"xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:v="urn:schemas-microsoft-com:vml""#;
+
+fn wml() -> Vec<u8> {
+    format!(
+        r#"<?xml version="1.0"?><w:wordDocument {WML_NS}><w:body><wx:sect><wx:sub-section>
+<w:p><w:r><w:t>Alpha beta gamma</w:t></w:r></w:p>
+<w:p><w:r><w:t>Visit </w:t></w:r><w:hlink w:dest="https://example.org/x"><w:r><w:t>the site</w:t></w:r></w:hlink><w:r><w:t> today </w:t></w:r><w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText> HYPERLINK "https://example.org/" </w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t>https://example.org/</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r></w:p>
+<w:p><w:r><w:t>before </w:t></w:r><w:r><w:rPr><w:vanish/></w:rPr><w:t>SECRET</w:t></w:r><w:r><w:t>after</w:t></w:r></w:p>
+<w:p><w:r><w:rPr><w:strike/></w:rPr><w:t>struck</w:t></w:r><w:r><w:t> kept</w:t></w:r></w:p>
+<w:p><w:r><w:t>Page </w:t></w:r><w:fldSimple w:instr=" PAGE "><w:r><w:t>7</w:t></w:r></w:fldSimple></w:p>
+<w:p><w:r><w:t>note</w:t></w:r><w:r><w:footnote><w:p><w:r><w:footnoteRef/><w:t> NOTETEXT</w:t></w:r></w:p></w:footnote></w:r></w:p>
+<w:p><w:r><w:t>word</w:t></w:r><aml:annotation aml:id="0" w:type="Word.Comment" aml:author="Ann Lee"><aml:content><w:p><w:r><w:t>COMMENTTEXT</w:t></w:r></w:p></aml:content></aml:annotation></w:p>
+<w:tbl><w:tblGrid><w:gridCol w:w="2000"/><w:gridCol w:w="2000"/></w:tblGrid>
+<w:tr><w:tc><w:p><w:r><w:t>r1c1</w:t></w:r></w:p></w:tc><w:tc><w:p><w:r><w:t>r1c2</w:t></w:r></w:p></w:tc></w:tr>
+<w:tr><w:tc><w:p><w:r><w:t>r2c1</w:t></w:r></w:p></w:tc><w:tc><w:p><w:r><w:t>r2c2</w:t></w:r></w:p></w:tc></w:tr></w:tbl>
+<w:p><w:r><w:t>Last</w:t></w:r></w:p>
+<w:sectPr><w:hdr w:type="odd"><w:p><w:r><w:t>HEADTEXT</w:t></w:r></w:p></w:hdr><w:ftr w:type="odd"><w:p><w:r><w:t>FOOTTEXT</w:t></w:r></w:p></w:ftr></w:sectPr>
+</wx:sub-section></wx:sect></w:body></w:wordDocument>"#
+    )
+    .into_bytes()
+}
+
+fn para(t: &str, runs: Vec<(usize, usize, Vec<u8>)>, grpprl: Vec<u8>) -> Para {
+    Para {
+        text: t.as_bytes().to_vec(),
+        runs,
+        grpprl,
+    }
+}
+
+/// A Word 97 document with the same things in it, as the file a writer would
+/// make.
+fn doc97() -> Vec<u8> {
+    let spec = vec![0x55, 0x08, 1];
+    let cell = vec![0x16, 0x24, 1];
+    let mut row = vec![0x16, 0x24, 1, 0x17, 0x24, 1];
+    // sprmTDefTable: two cells, edges 0, 2000, 4000, then a TC80 each.
+    let mut v = vec![2u8];
+    for e in [0i16, 2000, 4000] {
+        v.extend(e.to_le_bytes());
+    }
+    v.extend([0u8; 40]);
+    row.extend([0x08, 0xD6]);
+    row.extend((v.len() as u16 + 1).to_le_bytes());
+    row.extend(v);
+    let paras = vec![
+        para("Alpha beta gamma\r", vec![], vec![]),
+        para(
+            "Visit \x13 HYPERLINK \"https://example.org/x\" \x14the site\x15 today \x13 HYPERLINK \"https://example.org/\" \x14https://example.org/\x15\r",
+            vec![],
+            vec![],
+        ),
+        // sprmCFVanish on "SECRET".
+        para(
+            "before SECRETafter\r",
+            vec![(7, 13, vec![0x3C, 0x08, 1])],
+            vec![],
+        ),
+        // sprmCFStrike on "struck".
+        para("struck kept\r", vec![(0, 6, vec![0x37, 0x08, 1])], vec![]),
+        para("Page \x13 PAGE \x147\x15\r", vec![], vec![]),
+        para("note\x02\r", vec![(4, 5, spec.clone())], vec![]),
+        para("word\x05\r", vec![(4, 5, spec)], vec![]),
+        para("r1c1\x07", vec![], cell.clone()),
+        para("r1c2\x07", vec![], cell.clone()),
+        para("\x07", vec![], row.clone()),
+        para("r2c1\x07", vec![], cell.clone()),
+        para("r2c2\x07", vec![], cell),
+        para("\x07", vec![], row),
+        para("Last\r", vec![], vec![]),
+    ];
+    let mark_at = |mark: u8| {
+        let mut cp = 0u32;
+        for p in &paras {
+            if let Some(i) = p.text.iter().position(|c| *c == mark) {
+                return cp + i as u32;
+            }
+            cp += p.text.len() as u32;
+        }
+        panic!("no mark");
+    };
+    let head = b"HEADTEXT\r\r".to_vec();
+    let foot = b"FOOTTEXT\r\r".to_vec();
+    let (h, f) = (head.len() as u32, foot.len() as u32);
+    doc(
+        &paras,
+        &Options {
+            // The default header of the first section is the story 7, the
+            // default footer the story 9.
+            hdd: [vec![0; 8], vec![h, h, h + f, h + f, h + f, h + f]].concat(),
+            header: [head, foot].concat(),
+            footnotes: vec![b"\x02 NOTETEXT\r".to_vec()],
+            footnote_refs: vec![mark_at(2)],
+            comments: vec![b"COMMENTTEXT\r".to_vec()],
+            comment_refs: vec![mark_at(5)],
+            ..Options::default()
+        },
+    )
+}
+
+fn six(p: &[Para], header: Option<&[u8]>) -> Vec<u8> {
+    doc6(
+        p,
+        &Six {
+            header: header.map(<[u8]>::to_vec),
+            ..Six::default()
+        },
+    )
+}
+
+/// A Word 6 document: words, a tab, a break, hidden and struck text, a header.
+fn doc6_sample() -> Vec<u8> {
+    six(
+        &[
+            para("Plain bold words\r", vec![(6, 10, vec![85, 1])], vec![]),
+            para("Second\ttab and\x0Bbreak\r", vec![], vec![]),
+            // sprmCFVanish, sprmCFStrike.
+            para(
+                "before SECRETafter\rstruck kept\r",
+                vec![(7, 13, vec![92, 1]), (19, 25, vec![87, 1])],
+                vec![],
+            ),
+        ],
+        Some(b"HEADTEXT\r\r"),
+    )
+}
+
+fn table(entries: &[(u64, Option<u64>)]) -> W {
+    let mut t = W::default();
+    for (i, o) in entries {
+        let mut e = W::default().uint(1, *i);
+        if let Some(o) = o {
+            e = e.reference(2, *o);
+        }
+        t = t.msg(1, e);
+    }
+    t
+}
+
+fn iwa(objects: &[(u64, u32, W)]) -> Vec<u8> {
+    let mut raw = vec![];
+    for (id, ty, m) in objects {
+        let info = W::default().uint(1, *id).msg(
+            2,
+            W::default()
+                .uint(1, u64::from(*ty))
+                .uint(3, m.0.len() as u64),
+        );
+        raw.extend(W::varint_len(info.0.len() as u64));
+        raw.extend(&info.0);
+        raw.extend(&m.0);
+    }
+    let block = literal_block(&raw);
+    let mut out = vec![
+        0,
+        block.len() as u8,
+        (block.len() >> 8) as u8,
+        (block.len() >> 16) as u8,
+    ];
+    out.extend(block);
+    out
+}
+
+/// A Pages document of the paragraphs `body` (joined by line feeds).
+fn pages_of(body: &str) -> Vec<u8> {
+    let storage = W::default()
+        .bytes(3, body.as_bytes())
+        .msg(5, table(&[(0, Some(3))]))
+        .msg(8, table(&[(0, Some(4))]));
+    let objects = [
+        (1, 10000, W::default().reference(4, 2)),
+        (2, 2001, storage),
+        (3, 2022, W::default().msg(11, W::default().float(3, 12.0))),
+        (4, 2021, W::default().msg(11, W::default())),
+    ];
+    let mut z = PackageWriter::new(1 << 20);
+    z.put("Index/Document.iwa", &iwa(&objects), true).unwrap();
+    z.finish().unwrap()
+}
+
+fn every_document() -> Vec<(&'static str, Vec<u8>, Format)> {
+    vec![
+        ("sample.doc", fixture("sample.doc"), Format::Doc),
+        ("sample.odt", fixture("sample.odt"), Format::Odt),
+        ("sample.fodt", fixture("sample.fodt"), Format::Fodt),
+        ("sample.rtf", fixture("sample.rtf"), Format::Rtf),
+        (
+            "sample-2003.xml",
+            fixture("sample-2003.xml"),
+            Format::Wml2003,
+        ),
+        ("doc97", doc97(), Format::Doc),
+        ("doc6", doc6_sample(), Format::Doc),
+        ("fodt", fodt(), Format::Fodt),
+        ("odt", odt(), Format::Odt),
+        ("rtf", rtf(), Format::Rtf),
+        ("wml", wml(), Format::Wml2003),
+        (
+            "pages",
+            pages_of("Title\nBody words here\nA third paragraph"),
+            Format::Pages,
+        ),
+    ]
+}
+
+/// The text is `body`, then the sections, each with its label and text.
+fn assert_text(t: &Text, body: &str, sections: &[(&str, &str)]) {
+    let all: String = std::iter::once(body)
+        .chain(sections.iter().map(|s| s.1))
+        .collect();
+    assert_eq!(t.text, all);
+    assert_eq!(labels(t), sections.iter().map(|s| s.0).collect::<Vec<_>>());
+    for (label, s) in sections {
+        assert_eq!(section(t, label), *s);
+    }
+    assert_eq!(
+        body.len(),
+        t.text.len() - sections.iter().map(|s| s.1.len()).sum::<usize>()
+    );
+    assert!(!t.truncated);
+}
+
+/// The link whose label is not its target; the other one, whose label is its
+/// target, is written once and has no pair.
+fn assert_links(t: &Text) {
+    assert_eq!(
+        t.links,
+        [("the site".to_string(), "https://example.org/x".to_string())]
+    );
+}
+
+const START: &str = "Alpha beta gamma\nVisit the site (https://example.org/x) today https://example.org/\nbefore after\nstruck kept\nPage\nnote\n";
+
+const TABLE: &str = "r1c1\tr1c2\nr2c1\tr2c2\n";
+
+#[test]
+fn the_fixtures_have_their_words() {
+    let plain = "Quarterly summary\nRevenue grew by twelve percent over the quarter, while costs stayed flat.\nFirst item\nSecond item\nRegion\tSales\nNorth\t120\nEnd of the summary.\n";
+    for (name, f) in [
+        ("sample.doc", Format::Doc),
+        ("sample.odt", Format::Odt),
+        ("sample.fodt", Format::Fodt),
+    ] {
+        let t = extract(&fixture(name), f);
+        assert_text(&t, plain, &[]);
+        assert!(t.links.is_empty(), "{name}");
+    }
+    // The RTF fixture writes its bullets as text.
+    let t = extract(&fixture("sample.rtf"), Format::Rtf);
+    assert_text(
+        &t,
+        &plain
+            .replace("First", "\u{2022}\tFirst")
+            .replace("Second", "\u{2022}\tSecond"),
+        &[],
+    );
+    // A link whose label is not its target.
+    let t = extract(&fixture("sample-2003.xml"), Format::Wml2003);
+    assert_text(
+        &t,
+        "Title\nblue italic link (https://example.org/)\nc1\tc2\n",
+        &[],
+    );
+    assert_eq!(
+        t.links,
+        [("link".to_string(), "https://example.org/".to_string())]
+    );
+}
+
+#[test]
+fn every_document_has_the_words_of_the_docx_the_converter_writes() {
+    for (name, input, f) in every_document() {
+        same_words_as_the_converter(name, &input, f);
+    }
+}
+
+#[test]
+fn a_word_97_document_has_everything_a_reader_sees() {
+    let t = extract(&doc97(), Format::Doc);
+    assert_text(
+        &t,
+        &format!("{START}word\n{TABLE}Last\n"),
+        &[
+            ("headers and footers", "HEADTEXT\nFOOTTEXT\n"),
+            ("footnotes", "NOTETEXT\n"),
+            ("comments", "COMMENTTEXT\n"),
+        ],
+    );
+    assert_links(&t);
+}
+
+#[test]
+fn a_word_6_document_has_its_words_and_its_header() {
+    let t = extract(&doc6_sample(), Format::Doc);
+    assert_text(
+        &t,
+        "Plain bold words\nSecond\ttab and\nbreak\nbefore after\nstruck kept\n",
+        &[("headers and footers", "HEADTEXT\n")],
+    );
+}
+
+#[test]
+fn tracked_changes_are_text() {
+    let p = Para {
+        text: b"gone new kept\r".to_vec(),
+        // sprmCFRMarkDel on "gone", sprmCFRMark (inserted) on "new".
+        runs: vec![(0, 4, vec![0x00, 0x08, 1]), (5, 8, vec![0x01, 0x08, 1])],
+        grpprl: vec![],
+    };
+    let t = extract(&doc(&[p], &Options::default()), Format::Doc);
+    assert_text(&t, "gone new kept\n", &[]);
+}
+
+#[test]
+fn an_open_document_text_has_everything_a_reader_sees() {
+    let all = |t: &Text| {
+        assert_text(
+            t,
+            &format!("{START}end\nword\n{TABLE}Boxed text\nBOXTEXT\nLast\n"),
+            &[
+                ("headers and footers", "HEADTEXT\nFOOTTEXT\n"),
+                ("footnotes", "NOTETEXT\n"),
+                ("endnotes", "ENDTEXT\n"),
+                ("comments", "COMMENTTEXT\n"),
+            ],
+        );
+        assert_links(t);
+    };
+    all(&extract(&fodt(), Format::Fodt));
+    all(&extract(&odt(), Format::Odt));
+}
+
+#[test]
+fn an_rtf_has_everything_a_reader_sees_but_comments() {
+    let t = extract(&rtf(), Format::Rtf);
+    assert_text(
+        &t,
+        &format!("{START}{TABLE}Last\n"),
+        &[
+            ("headers and footers", "HEADTEXT\nFOOTTEXT\n"),
+            ("footnotes", "NOTETEXT\n"),
+        ],
+    );
+    assert_links(&t);
+}
+
+/// A `}` too many closes the document's group; what follows is still the
+/// document (html2rtf writes such files, and unrtf reads them whole).
+#[test]
+fn an_rtf_with_a_brace_too_many_goes_on() {
+    let t = extract(
+        br"{\rtf1\ansi{\b First}\par}} Second\par Third\par}",
+        Format::Rtf,
+    );
+    let words: Vec<&str> = t.text.split_whitespace().collect();
+    assert_eq!(words, ["First", "Second", "Third"], "{:?}", t.text);
+}
+
+/// A note in a list four levels deep is still a note (a bibliography's
+/// endnote in a nested bullet list lost its text), and notes in notes stop
+/// after a few levels.
+#[test]
+fn a_note_in_a_deeply_nested_list_keeps_its_text() {
+    let note = |body: &str| {
+        format!(
+            r#"<text:note text:note-class="endnote"><text:note-citation>1</text:note-citation><text:note-body>{body}</text:note-body></text:note>"#
+        )
+    };
+    let mut body = format!("<text:p>item{}</text:p>", note("<text:p>NOTETEXT</text:p>"));
+    for _ in 0..4 {
+        body = format!("<text:list><text:list-item>{body}</text:list-item></text:list>");
+    }
+    let fodt = format!(
+        r#"<?xml version="1.0"?><office:document {ODF_NS} office:mimetype="application/vnd.oasis.opendocument.text"><office:body><office:text>{body}</office:text></office:body></office:document>"#
+    );
+    let t = extract(fodt.as_bytes(), Format::Fodt);
+    assert_eq!(section(&t, "endnotes"), "NOTETEXT\n");
+
+    // Notes inside notes: the first levels are read, a long chain is cut.
+    let mut chain = "<text:p>LEAF</text:p>".to_string();
+    for level in (1..=6).rev() {
+        chain = format!("<text:p>L{level}{}</text:p>", note(&chain));
+    }
+    let fodt = format!(
+        r#"<?xml version="1.0"?><office:document {ODF_NS} office:mimetype="application/vnd.oasis.opendocument.text"><office:body><office:text>{chain}</office:text></office:body></office:document>"#
+    );
+    let t = extract(fodt.as_bytes(), Format::Fodt);
+    let notes = section(&t, "endnotes");
+    assert!(notes.contains("L2") && !notes.contains("LEAF"), "{notes:?}");
+}
+
+#[test]
+fn a_word_2003_xml_has_everything_a_reader_sees() {
+    let t = extract(&wml(), Format::Wml2003);
+    assert_text(
+        &t,
+        &format!("{START}word\n{TABLE}Last\n"),
+        &[
+            ("headers and footers", "HEADTEXT\nFOOTTEXT\n"),
+            ("footnotes", "NOTETEXT\n"),
+            ("comments", "COMMENTTEXT\n"),
+        ],
+    );
+    assert_links(&t);
+}
+
+#[test]
+fn a_header_the_sections_share_is_read_once() {
+    let sect = |footer: &str| {
+        format!(
+            r#"<w:sectPr><w:hdr w:type="odd"><w:p><w:r><w:t>SAME</w:t></w:r></w:p></w:hdr><w:ftr w:type="odd"><w:p><w:r><w:t>{footer}</w:t></w:r></w:p></w:ftr></w:sectPr>"#
+        )
+    };
+    let x = format!(
+        r#"<?xml version="1.0"?><w:wordDocument {WML_NS}><w:body><wx:sect><wx:sub-section><w:p><w:r><w:t>one</w:t></w:r></w:p>{}</wx:sub-section><wx:sub-section><w:p><w:r><w:t>two</w:t></w:r></w:p>{}</wx:sub-section></wx:sect></w:body></w:wordDocument>"#,
+        sect("F1"),
+        sect("F2")
+    );
+    let t = extract(x.as_bytes(), Format::Wml2003);
+    assert_text(
+        &t,
+        "one\ntwo\n",
+        &[("headers and footers", "SAME\nF1\nF2\n")],
+    );
+    // The converter writes a header part for each of the two sections.
+    let c = convert(x.as_bytes(), Format::Wml2003, &Limits::default()).unwrap();
+    assert_eq!(
+        docx_words(&c.docx).iter().filter(|w| *w == "SAME").count(),
+        2
+    );
+}
+
+#[test]
+fn word_2003_xml_fields_make_links_and_page_numbers_are_left_out() {
+    let x = format!(
+        r#"<?xml version="1.0"?><w:wordDocument {WML_NS}><w:body>
+<w:p><w:fldSimple w:instr=" HYPERLINK &quot;https://example.org/simple&quot; "><w:r><w:t>simple link</w:t></w:r></w:fldSimple><w:r><w:t> and </w:t></w:r><w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText> HYPERLINK "https://example.org/complex" \o "tip" </w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t>complex link</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r></w:p>
+<w:p><w:r><w:t>page </w:t></w:r><w:fldSimple w:instr=" PAGE \* MERGEFORMAT "><w:r><w:t>3</w:t></w:r></w:fldSimple><w:r><w:t> of </w:t></w:r><w:r><w:fldChar w:fldCharType="begin"/></w:r><w:r><w:instrText> NUMPAGES </w:instrText></w:r><w:r><w:fldChar w:fldCharType="separate"/></w:r><w:r><w:t>9</w:t></w:r><w:r><w:fldChar w:fldCharType="end"/></w:r><w:r><w:t> date </w:t></w:r><w:fldSimple w:instr=" DATE "><w:r><w:t>today</w:t></w:r></w:fldSimple></w:p>
+</w:body></w:wordDocument>"#
+    );
+    let t = extract(x.as_bytes(), Format::Wml2003);
+    assert_text(
+        &t,
+        "simple link (https://example.org/simple) and complex link (https://example.org/complex)\npage  of  date today\n",
+        &[],
+    );
+    assert_eq!(
+        t.links,
+        [
+            (
+                "simple link".to_string(),
+                "https://example.org/simple".to_string()
+            ),
+            (
+                "complex link".to_string(),
+                "https://example.org/complex".to_string()
+            )
+        ]
+    );
+    same_words_as_the_converter("fields", x.as_bytes(), Format::Wml2003);
+}
+
+#[test]
+fn a_pages_document_has_its_paragraphs() {
+    let t = extract(&pages_of("Title\nBody words here"), Format::Pages);
+    assert_text(&t, "Title\nBody words here\n", &[]);
+}
+
+#[test]
+fn hidden_text_is_left_out_of_every_format_and_struck_text_is_not() {
+    for (name, input, f) in every_document() {
+        let t = extract(&input, f);
+        assert!(!t.text.contains("SECRET"), "{name}");
+        assert!(
+            !t.text.contains("PAGE") && !t.text.contains("HYPERLINK"),
+            "{name}: a field instruction"
+        );
+        if ["doc97", "fodt", "odt", "rtf", "wml"].contains(&name) {
+            assert!(t.text.contains("struck kept"), "{name}");
+            assert!(t.text.contains("before after"), "{name}");
+            // The page number field is left out, its label is not.
+            assert!(!t.text.contains('7') && t.text.contains("Page\n"), "{name}");
+        }
+    }
+}
+
+#[test]
+fn a_style_can_hide_a_paragraph() {
+    let styles = r#"<office:automatic-styles><style:style style:name="HidP" style:family="paragraph"><style:text-properties text:display="none"/></style:style><style:style style:name="HidC" style:family="text"><style:text-properties text:display="none"/></style:style></office:automatic-styles>"#;
+    let body = r#"<text:p>one</text:p><text:p text:style-name="HidP">HIDDENPARA</text:p><text:p>two <text:span text:style-name="HidC">HIDDENSPAN</text:span>three</text:p>"#;
+    let flat = format!(
+        r#"<office:document {ODF_NS}>{styles}<office:body><office:text>{body}</office:text></office:body></office:document>"#
+    );
+    let t = extract(flat.as_bytes(), Format::Fodt);
+    assert_text(&t, "one\ntwo three\n", &[]);
+    // And through a style of a Word 2003 XML document.
+    let x = format!(
+        r#"<?xml version="1.0"?><w:wordDocument {WML_NS}><w:styles><w:style w:type="paragraph" w:styleId="Hid"><w:name w:val="Hid"/><w:rPr><w:vanish/></w:rPr></w:style><w:style w:type="character" w:styleId="HidC"><w:name w:val="HidC"/><w:rPr><w:vanish/></w:rPr></w:style></w:styles><w:body><w:p><w:r><w:t>one</w:t></w:r></w:p><w:p><w:pPr><w:pStyle w:val="Hid"/></w:pPr><w:r><w:t>HIDDENPARA</w:t></w:r></w:p><w:p><w:r><w:t>two </w:t></w:r><w:r><w:rPr><w:rStyle w:val="HidC"/></w:rPr><w:t>HIDDENSPAN</w:t></w:r><w:r><w:t>three</w:t></w:r></w:p></w:body></w:wordDocument>"#
+    );
+    let t = extract(x.as_bytes(), Format::Wml2003);
+    assert_text(&t, "one\ntwo three\n", &[]);
+}
+
+#[test]
+fn a_picture_has_its_alt_text_and_a_text_box_its_text() {
+    let b64 = "iVBORw0KGgoAAAANSUhEUgAAAAIAAAADCAIAAAA=";
+    let body = format!(
+        r#"<text:p>Look <draw:frame text:anchor-type="as-char" svg:width="2cm" svg:height="3cm"><draw:image><office:binary-data>{b64}</office:binary-data></draw:image><svg:desc>A red kite</svg:desc></draw:frame>here</text:p><text:p>Next</text:p>"#
+    );
+    let flat = format!(
+        r#"<office:document {ODF_NS}><office:body><office:text>{body}</office:text></office:body></office:document>"#
+    );
+    let t = extract(flat.as_bytes(), Format::Fodt);
+    assert_text(&t, "Look here\nA red kite\nNext\n", &[]);
+}
+
+#[test]
+fn the_text_of_shapes_in_a_group_is_kept() {
+    let body = r#"<text:p>before <draw:g text:anchor-type="paragraph"><draw:frame svg:width="5cm" svg:height="2cm"><draw:text-box><text:p>BOXTEXT</text:p></draw:text-box></draw:frame><draw:g><draw:rect svg:width="3cm" svg:height="1cm"><text:p>RECTTEXT</text:p></draw:rect></draw:g></draw:g> after</text:p>"#;
+    let flat = format!(
+        r#"<office:document {ODF_NS}><office:body><office:text>{body}</office:text></office:body></office:document>"#
+    );
+    let c = convert(flat.as_bytes(), Format::Fodt, &Limits::default()).unwrap();
+    let words = docx_words(&c.docx);
+    for w in ["BOXTEXT", "RECTTEXT", "before", "after"] {
+        assert!(words.iter().any(|x| x == w), "{w}: {words:?}");
+    }
+    same_words_as_the_converter("group", flat.as_bytes(), Format::Fodt);
+}
+
+#[test]
+fn spanned_empty_and_nested_cells_keep_a_row_on_a_line() {
+    let c = r#"<table:table><table:table-column table:number-columns-repeated="3"/>
+<table:table-row><table:table-cell table:number-columns-spanned="2"><text:p>A</text:p></table:table-cell><table:covered-table-cell/><table:table-cell><text:p>B</text:p></table:table-cell></table:table-row>
+<table:table-row><table:table-cell><text:p>x</text:p><text:p>y</text:p></table:table-cell><table:table-cell/><table:table-cell><text:p>C</text:p></table:table-cell></table:table-row>
+<table:table-row><table:table-cell><table:table><table:table-column table:number-columns-repeated="2"/><table:table-row><table:table-cell><text:p>n1</text:p></table:table-cell><table:table-cell><text:p>n2</text:p></table:table-cell></table:table-row></table:table></table:table-cell><table:table-cell><text:p>D</text:p></table:table-cell><table:table-cell/></table:table-row>
+</table:table><text:p>after</text:p>"#;
+    let flat = format!(
+        r#"<office:document {ODF_NS}><office:body><office:text>{c}</office:text></office:body></office:document>"#
+    );
+    let t = extract(flat.as_bytes(), Format::Fodt);
+    assert_text(&t, "A\tB\nx y\t\tC\nn1\tn2\n\tD\nafter\n", &[]);
+    same_words_as_the_converter("spans", flat.as_bytes(), Format::Fodt);
+
+    let x = format!(
+        r#"<?xml version="1.0"?><w:wordDocument {WML_NS}><w:body><w:tbl><w:tr><w:tc><w:p><w:r><w:t>one</w:t></w:r></w:p><w:tbl><w:tr><w:tc><w:p><w:r><w:t>in1</w:t></w:r></w:p></w:tc><w:tc><w:p><w:r><w:t>in2</w:t></w:r></w:p></w:tc></w:tr></w:tbl><w:p><w:r><w:t>two</w:t></w:r></w:p></w:tc><w:tc><w:p><w:r><w:t>side</w:t></w:r></w:p></w:tc></w:tr></w:tbl></w:body></w:wordDocument>"#
+    );
+    let t = extract(x.as_bytes(), Format::Wml2003);
+    assert_text(&t, "one\nin1\tin2\ntwo\tside\n", &[]);
+    same_words_as_the_converter("nested", x.as_bytes(), Format::Wml2003);
+}
+
+#[test]
+fn the_cap_cuts_the_text_of_every_format() {
+    for (name, input, f) in every_document() {
+        let full = extract(&input, f);
+        assert!(!full.truncated, "{name}");
+        // A cap that holds all of it, and one byte less.
+        let t = text(&input, f, &Limits::default(), full.text.len()).unwrap();
+        assert_eq!((&t.text, t.truncated), (&full.text, false), "{name}");
+        let t = text(&input, f, &Limits::default(), full.text.len() - 1).unwrap();
+        assert!(t.truncated, "{name}");
+        assert!(full.text.starts_with(&t.text), "{name}");
+        // Cut in the middle, and at nothing.
+        for cap in [0, 1, 7, 20, full.text.len() / 2] {
+            let t = text(&input, f, &Limits::default(), cap).unwrap();
+            assert!(t.truncated, "{name} at {cap}");
+            assert!(t.text.len() <= cap, "{name} at {cap}");
+            assert!(full.text.starts_with(&t.text), "{name} at {cap}");
+            for s in &t.sections {
+                assert!(s.range.end <= t.text.len(), "{name} at {cap}");
+            }
+        }
+    }
+}
+
+#[test]
+fn the_cap_leaves_the_later_sections_out() {
+    let t = text(&doc97(), Format::Doc, &Limits::default(), 40).unwrap();
+    assert!(t.truncated);
+    assert!(t.sections.is_empty());
+    assert!(!t.text.contains("HEADTEXT"));
+    // Room for the body and part of the footnotes.
+    let full = extract(&doc97(), Format::Doc);
+    let at = full.sections[1].range.start + 3;
+    let t = text(&doc97(), Format::Doc, &Limits::default(), at).unwrap();
+    assert!(t.truncated);
+    assert_eq!(labels(&t), ["headers and footers", "footnotes"]);
+    assert_eq!(section(&t, "footnotes"), "NOT");
+}
+
+// ---- refusals ----
+
+/// Documents that are encrypted.
+fn encrypted() -> Vec<(&'static str, Vec<u8>, Format)> {
+    let p = || para("x\r", vec![], vec![]);
+    let manifest = "<m><manifest:encryption-data xmlns:manifest=\"x\"/></m>";
+    let storage = W::default().bytes(3, b"text").msg(5, table(&[(0, None)]));
+    let mut z = PackageWriter::new(1 << 20);
+    z.put("Index/Document.iwa", &iwa(&[(2, 2001, storage)]), true)
+        .unwrap();
+    vec![
+        (
+            "doc97",
+            doc(
+                &[p()],
+                &Options {
+                    encrypted: true,
+                    ..Options::default()
+                },
+            ),
+            Format::Doc,
+        ),
+        (
+            "doc6",
+            doc6(
+                &[p()],
+                &Six {
+                    flags: 0x0100,
+                    ..Six::default()
+                },
+            ),
+            Format::Doc,
+        ),
+        ("odt", odt_with("<a/>", "<a/>", Some(manifest)), Format::Odt),
+        ("pages", z.finish().unwrap(), Format::Pages),
+    ]
+}
+
+#[test]
+fn an_encrypted_document_is_refused_like_the_converter_refuses_it() {
+    for (name, input, f) in encrypted() {
+        assert_eq!(
+            text(&input, f, &Limits::default(), CAP).unwrap_err(),
+            Error::Encrypted,
+            "{name}"
+        );
+        assert_eq!(
+            convert(&input, f, &Limits::default()).unwrap_err(),
+            Error::Encrypted,
+            "{name}"
+        );
+    }
+}
+
+/// Documents that are of the format and damaged, and what is said.
+fn damaged() -> Vec<(&'static str, Vec<u8>, Format)> {
+    let wd = vec![0u8; 100];
+    let deep = format!("{{\\rtf1 {}x{}}}", "{".repeat(500), "}".repeat(500));
+    vec![
+        (
+            "doc: the WordDocument stream ends too soon",
+            build_cfb(&[("WordDocument", &wd)]),
+            Format::Doc,
+        ),
+        (
+            "odt: the content is cut",
+            odt_with(
+                "<office:document-content><office:body><office:text><text:p",
+                "<a/>",
+                None,
+            ),
+            Format::Odt,
+        ),
+        (
+            "fodt: the document is cut",
+            fodt()[..200].to_vec(),
+            Format::Fodt,
+        ),
+        (
+            "rtf: groups nested past the bound",
+            deep.into_bytes(),
+            Format::Rtf,
+        ),
+        (
+            "wml: the document is cut",
+            wml()[..300].to_vec(),
+            Format::Wml2003,
+        ),
+    ]
+}
+
+#[test]
+fn a_damaged_document_is_malformed_and_never_a_panic() {
+    for (name, input, f) in damaged() {
+        let e = text(&input, f, &Limits::default(), CAP).unwrap_err();
+        assert_eq!(e.kind(), "malformed", "{name}: {e}");
+        assert_eq!(
+            convert(&input, f, &Limits::default()).unwrap_err(),
+            e,
+            "{name}"
+        );
+    }
+}
+
+#[test]
+fn what_is_not_of_the_format_is_refused_as_such() {
+    for f in [
+        Format::Doc,
+        Format::Odt,
+        Format::Fodt,
+        Format::Rtf,
+        Format::Wml2003,
+        Format::Pages,
+    ] {
+        for input in [
+            &b""[..],
+            b"plain text, no markup",
+            b"<a/>",
+            b"\x00\x01\x02\x03",
+        ] {
+            let e = text(input, f, &Limits::default(), CAP).unwrap_err();
+            assert_eq!(
+                convert(input, f, &Limits::default()).unwrap_err(),
+                e,
+                "{f:?} {input:?}"
+            );
+        }
+    }
+    let e = text(b"plain text", Format::Rtf, &Limits::default(), CAP).unwrap_err();
+    assert_eq!(e.kind(), "not-format");
+    // A Word 95 file is a document of the format this reader does not take.
+    let old = doc(
+        &[para("x\r", vec![], vec![])],
+        &Options {
+            fib_version: 0x0065,
+            ..Options::default()
+        },
+    );
+    let e = text(&old, Format::Doc, &Limits::default(), CAP).unwrap_err();
+    assert_eq!(e.kind(), "unsupported");
+}
+
+#[test]
+fn cut_and_flipped_documents_are_refused_as_the_converter_refuses_them() {
+    let limits = Limits::default().with_max_memory(64 << 20);
+    let (mut ok, mut refused) = (0, 0);
+    for (name, input, f) in every_document() {
+        let mut check = |d: &[u8]| match text(d, f, &limits, CAP) {
+            Ok(_) => ok += 1,
+            Err(e) => {
+                refused += 1;
+                assert_eq!(convert(d, f, &limits).unwrap_err(), e, "{name}");
+            }
+        };
+        let step = (input.len() / 60).max(1);
+        for cut in (0..input.len()).step_by(step) {
+            check(&input[..cut]);
+        }
+        let mut m = input.clone();
+        let step = (input.len() / 200).max(1);
+        for i in (0..m.len()).step_by(step) {
+            m[i] ^= 0xFF;
+            check(&m);
+            m[i] ^= 0xFF;
+        }
+    }
+    assert!(ok > 100 && refused > 100, "{ok} read, {refused} refused");
+}
+
+#[test]
+fn the_limits_bound_the_text_as_they_bound_the_conversion() {
+    let multi: Vec<_> = every_document()
+        .into_iter()
+        .filter(|d| d.0 != "sample-2003.xml")
+        .collect();
+    for (name, input, f) in &multi {
+        let tight = [
+            (Limits::default().with_max_paragraphs(1), "paragraphs"),
+            (Limits::default().with_max_memory(100), "memory"),
+        ];
+        for (limits, what) in tight {
+            let e = text(input, *f, &limits, CAP).unwrap_err();
+            assert_eq!(e.kind(), "too-large", "{name}: {e}");
+            assert_eq!(
+                convert(input, *f, &limits).unwrap_err(),
+                e,
+                "{name}: {what}"
+            );
+        }
+        let mut small = Limits::default();
+        small.max_input = 10;
+        assert_eq!(
+            text(input, *f, &small, CAP).unwrap_err(),
+            Error::TooLarge("input"),
+            "{name}"
+        );
+        // The same document within the limits.
+        text(input, *f, &Limits::default(), CAP).unwrap();
+    }
+    // Table cells.
+    for name in ["doc97", "fodt", "odt", "rtf", "wml"] {
+        let (_, input, f) = every_document().into_iter().find(|d| d.0 == name).unwrap();
+        let limits = Limits::default().with_max_cells(1);
+        assert_eq!(
+            text(&input, f, &limits, CAP).unwrap_err(),
+            Error::TooLarge("table cells"),
+            "{name}"
+        );
+    }
+}
diff --git a/crates/exav-render/tests/office_text_sheets.rs b/crates/exav-render/tests/office_text_sheets.rs
new file mode 100644
index 00000000..7975b969
--- /dev/null
+++ b/crates/exav-render/tests/office_text_sheets.rs
@@ -0,0 +1,819 @@
+//! The text of spreadsheets, taken from what the readers parse.
+
+use exav_render::formats::office::text::Text;
+use exav_render::sheets::{Error, Format, Limits, convert, text};
+use std::io::{Read, Write};
+
+const ALL: [(&str, Format); 8] = [
+    ("sample.xls", Format::Xls),
+    ("sample.ods", Format::Ods),
+    ("sample.fods", Format::Fods),
+    ("sample.numbers", Format::Numbers),
+    ("numbers09.numbers", Format::Numbers),
+    ("sample-2003.xml", Format::SpreadsheetMl),
+    ("sample.html", Format::Html),
+    ("sample.slk", Format::Sylk),
+];
+
+fn fixture(name: &str) -> Vec<u8> {
+    std::fs::read(format!(
+        "{}/tests/fixtures/office/sheets/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    ))
+    .unwrap()
+}
+
+const CAP: usize = 1 << 20;
+
+fn of(data: &[u8], format: Format) -> Text {
+    text(data, format, &Limits::default(), CAP).unwrap()
+}
+
+fn labels(t: &Text) -> Vec<&str> {
+    t.sections.iter().map(|s| s.label.as_str()).collect()
+}
+
+fn zip(files: &[(&str, &[u8])]) -> Vec<u8> {
+    let mut z = zip::ZipWriter::new(std::io::Cursor::new(vec![]));
+    for (name, data) in files {
+        z.start_file(*name, zip::write::SimpleFileOptions::default())
+            .unwrap();
+        z.write_all(data).unwrap();
+    }
+    z.finish().unwrap().into_inner()
+}
+
+// Fixtures.
+
+const BUDGET: &str = "Budget\nItem\tAmount\tDate\nRent\t1200\t45296\nFood\t345.5\t45303\n\
+Travel\t89.99\t45323\nTotal\t1635.49\nMerged note across three columns\n";
+
+#[test]
+fn the_cells_of_the_fixtures() {
+    // The workbooks keep the date as a serial and the number without its
+    // format: the model holds no displayed text.
+    let want = format!("{BUDGET}Notes\nSecond sheet\t1\n");
+    for name in [("sample.xls", Format::Xls), ("sample.ods", Format::Ods)] {
+        let t = of(&fixture(name.0), name.1);
+        assert_eq!(t.text, want, "{}", name.0);
+        assert_eq!(labels(&t), ["sheet \"Budget\"", "sheet \"Notes\""]);
+        assert!(!t.truncated && t.links.is_empty());
+    }
+    let t = of(&fixture("sample.fods"), Format::Fods);
+    assert_eq!(t.text, format!("{BUDGET}Notes\nSecond sheet\tTRUE\n"));
+    // The text formats: the same table, one day later, and no date or
+    // amount where the table has none.
+    let t = of(&fixture("sample-2003.xml"), Format::SpreadsheetMl);
+    assert_eq!(
+        t.text,
+        "Budget\nItem\tAmount\tDate\nRent\t1200\t45297\nFood\t345.5\nTravel\t89.99\n\
+         Total\t1635.49\nMerged note across three columns\nNotes\nSecond sheet\tTRUE\n"
+    );
+    assert_eq!(labels(&t), ["sheet \"Budget\"", "sheet \"Notes\""]);
+    for (name, format) in [("sample.html", Format::Html), ("sample.slk", Format::Sylk)] {
+        let t = of(&fixture(name), format);
+        assert!(
+            t.text.contains(
+                "Item\tAmount\tDate\nRent\t1200\t45297\nFood\t345.5\nTravel\t89.99\n\
+                 Total\t1635.49\nMerged note across three columns\n"
+            ),
+            "{name}: {}",
+            t.text
+        );
+        assert_eq!(t.sections.len(), 1);
+    }
+}
+
+#[test]
+fn numbers_documents() {
+    let t = of(&fixture("sample.numbers"), Format::Numbers);
+    assert_eq!(labels(&t), ["sheet \"Sheet 1\""]);
+    assert!(
+        t.text.starts_with("Sheet 1\nSheetJS\tB1\tC1\tD1\tE1\n"),
+        "{}",
+        t.text
+    );
+    assert!(t.text.contains("A3\tB3:D3\n"), "{}", t.text);
+    let t = of(&fixture("numbers09.numbers"), Format::Numbers);
+    assert_eq!(
+        labels(&t),
+        [
+            "sheet \"Checking - Account Categories\"",
+            "sheet \"Checking - Transactions\"",
+            "sheet \"Second sheet\""
+        ]
+    );
+    for s in [
+        "Category\tAmount\nHome\t-872.4\n",
+        "Total\t-2575.9\n",
+        "Beginning Balance\t4650\n",
+        // A formula's cached value.
+        "101\t40087\tRent\tHome\t-775\t3875\n",
+        "Debit Card\t40102\tFill up SUV for camping trip\tGas\t-75\t3702.6\n",
+        "Second sheet\nTest\n0.5\t0.1\n0.6\n",
+    ] {
+        assert!(t.text.contains(s), "{s:?} in {}", t.text);
+    }
+}
+
+// The XLSX the converter writes says the same.
+
+/// The unescaped text of an XML fragment's `<t>` elements, joined.
+fn t_elements(xml: &str) -> String {
+    let mut out = String::new();
+    let mut rest = xml;
+    while let Some(i) = rest.find("<t") {
+        rest = &rest[i + 2..];
+        let Some(close) = rest.find('>') else { break };
+        if !(rest.starts_with('>') || rest.starts_with(' ')) || rest[..close].ends_with('/') {
+            continue;
+        }
+        let body = &rest[close + 1..];
+        let end = body.find("</t>").unwrap();
+        out.push_str(&unescape(&body[..end]));
+        rest = &body[end..];
+    }
+    out
+}
+
+fn unescape(s: &str) -> String {
+    s.replace("&lt;", "<")
+        .replace("&gt;", ">")
+        .replace("&quot;", "\"")
+        .replace("&apos;", "'")
+        .replace("&amp;", "&")
+}
+
+/// The blocks `<tag>...</tag>` of an XML part.
+fn blocks<'a>(xml: &'a str, tag: &str) -> Vec<&'a str> {
+    let (open, close) = (format!("<{tag}>"), format!("</{tag}>"));
+    let mut out = vec![];
+    let mut rest = xml;
+    while let Some(i) = rest.find(&open) {
+        let body = &rest[i + open.len()..];
+        let end = body.find(&close).unwrap();
+        out.push(&body[..end]);
+        rest = &body[end + close.len()..];
+    }
+    out
+}
+
+/// The strings of an XLSX's shared string table and inline strings, and its
+/// sheets' names.
+fn xlsx_strings(xlsx: &[u8]) -> (Vec<String>, Vec<String>) {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(xlsx)).unwrap();
+    let names: Vec<String> = z
+        .file_names()
+        .filter_map(|n| n.ok().map(|n| n.to_string()))
+        .collect();
+    let mut strings = vec![];
+    let mut sheets = vec![];
+    for n in names {
+        let mut xml = String::new();
+        z.by_name(&n).unwrap().read_to_string(&mut xml).unwrap();
+        if n == "xl/sharedStrings.xml" {
+            strings.extend(blocks(&xml, "si").into_iter().map(t_elements));
+        } else if n.starts_with("xl/worksheets/") && n.ends_with(".xml") {
+            strings.extend(blocks(&xml, "is").into_iter().map(t_elements));
+        } else if n == "xl/workbook.xml" {
+            for part in xml.split("<sheet ").skip(1) {
+                let name = part.split("name=\"").nth(1).unwrap();
+                sheets.push(unescape(name.split('"').next().unwrap()));
+            }
+        }
+    }
+    (strings, sheets)
+}
+
+#[test]
+fn the_text_has_the_cell_texts_of_the_xlsx() {
+    for (name, format) in ALL {
+        let data = fixture(name);
+        let t = of(&data, format);
+        let xlsx = convert(&data, format, &Limits::default()).unwrap().xlsx;
+        let (strings, sheets) = xlsx_strings(&xlsx);
+        assert!(!strings.is_empty() && !sheets.is_empty(), "{name}");
+        let lines: Vec<&str> = t.text.lines().collect();
+        // Every string of the XLSX is in the text, line by line.
+        for s in &strings {
+            for line in s.lines().map(str::trim).filter(|l| !l.is_empty()) {
+                assert!(
+                    lines
+                        .iter()
+                        .any(|l| l.split('\t').any(|c| c.trim() == line)),
+                    "{name}: {line:?} of the XLSX is not in {}",
+                    t.text
+                );
+            }
+        }
+        // And every word of the text is a number, a sheet name or one of them.
+        for line in &lines {
+            for cell in line.split('\t').map(str::trim).filter(|c| !c.is_empty()) {
+                let known = cell.parse::<f64>().is_ok()
+                    || cell == "TRUE"
+                    || cell == "FALSE"
+                    || sheets.iter().any(|s| s == cell)
+                    || strings.iter().any(|s| s.lines().any(|l| l.trim() == cell));
+                assert!(known, "{name}: {cell:?} of the text is not in the XLSX");
+            }
+        }
+        for s in &sheets {
+            assert!(t.text.contains(s.as_str()), "{name}: sheet {s}");
+        }
+    }
+}
+
+// A flat ODF spreadsheet with a hidden sheet, a comment, links, a formula,
+// a boolean, an error, a validation and a shape.
+
+const ODF_NS: &str = r#"xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0""#;
+
+/// Styles, automatic then body, as `office:document` and
+/// `office:document-content` both hold them.
+const ODF_BODY: &str = r##"
+ <office:automatic-styles>
+  <number:number-style style:name="N2"><number:number number:decimal-places="2" number:grouping="true"/></number:number-style>
+  <style:style style:name="money" style:family="table-cell" style:data-style-name="N2"/>
+  <style:style style:name="ta-hidden" style:family="table"><style:table-properties table:display="false"/></style:style>
+ </office:automatic-styles>
+ <office:body><office:spreadsheet>
+  <table:content-validations>
+   <table:content-validation table:name="v1" table:condition="of:cell-content-is-whole-number() and cell-content-is-between(1,10)" table:allow-empty-cell="true">
+    <table:help-message table:title="Pick" table:display="true"><text:p>Enter a whole number</text:p></table:help-message>
+    <table:error-message table:message-type="stop" table:display="true" table:title="Oops"><text:p>Not a number</text:p></table:error-message>
+   </table:content-validation>
+  </table:content-validations>
+  <table:table table:name="Open">
+   <table:table-row>
+    <table:table-cell office:value-type="string"><office:annotation><dc:creator>Eve</dc:creator><text:p>Note one</text:p><text:p>Note two</text:p></office:annotation><text:p>Plain</text:p></table:table-cell>
+    <table:table-cell office:value-type="string"><text:p><text:a xlink:href="https://example.com/x">Site</text:a></text:p></table:table-cell>
+    <table:table-cell office:value-type="string"><text:p><text:a xlink:href="https://example.com/">https://example.com/</text:a></text:p></table:table-cell>
+   </table:table-row>
+   <table:table-row>
+    <table:table-cell table:formula="of:=1+2" office:value-type="float" office:value="3"><text:p>3,00</text:p></table:table-cell>
+    <table:table-cell office:value-type="boolean" office:boolean-value="true"><text:p>TRUE</text:p></table:table-cell>
+    <table:table-cell table:formula="of:=1/0" office:value-type="string" office:string-value="" calcext:value-type="error"><text:p>#DIV/0!</text:p></table:table-cell>
+   </table:table-row>
+   <table:table-row>
+    <table:table-cell table:style-name="money" office:value-type="float" office:value="1200"><text:p>1,200.00</text:p></table:table-cell>
+    <table:table-cell table:content-validation-name="v1" office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell>
+   </table:table-row>
+   <table:shapes>
+    <draw:custom-shape svg:x="1cm" svg:y="1cm" svg:width="3cm" svg:height="2cm"><text:p>Words in a shape</text:p><draw:enhanced-geometry draw:type="rectangle"/></draw:custom-shape>
+   </table:shapes>
+  </table:table>
+  <table:table table:name="Stash" table:style-name="ta-hidden">
+   <table:table-row>
+    <table:table-cell office:value-type="string"><text:p>hidden words</text:p></table:table-cell>
+   </table:table-row>
+  </table:table>
+ </office:spreadsheet></office:body>"##;
+
+fn fods() -> Vec<u8> {
+    format!(
+        r#"<?xml version="1.0" encoding="UTF-8"?>
+<office:document {ODF_NS} office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">{ODF_BODY}
+</office:document>"#
+    )
+    .into_bytes()
+}
+
+fn ods(manifest: Option<&str>) -> Vec<u8> {
+    let content = format!(
+        r#"<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content {ODF_NS} office:version="1.3">{ODF_BODY}
+</office:document-content>"#
+    );
+    let mut files = vec![
+        (
+            "mimetype",
+            &b"application/vnd.oasis.opendocument.spreadsheet"[..],
+        ),
+        ("content.xml", content.as_bytes()),
+    ];
+    if let Some(m) = manifest {
+        files.push(("META-INF/manifest.xml", m.as_bytes()));
+    }
+    zip(&files)
+}
+
+/// What both forms of the ODF document read as.
+fn check_odf(t: &Text) {
+    assert_eq!(
+        &t.text[t.sections[0].range.clone()],
+        "Open\nPlain\tSite (https://example.com/x)\thttps://example.com/\n\
+         3\tTRUE\t#DIV/0!\n1200\t5\n"
+    );
+    assert_eq!(
+        labels(t),
+        [
+            "sheet \"Open\"",
+            "sheet \"Open\" comments",
+            "sheet \"Open\" drawings",
+            "hidden sheet \"Stash\""
+        ],
+        "{}",
+        t.text
+    );
+    let comments = &t.text[t.sections[1].range.clone()];
+    assert_eq!(
+        comments,
+        "Note one\nNote two\nPick\nEnter a whole number\nOops\nNot a number\n"
+    );
+    let drawings = &t.text[t.sections[2].range.clone()];
+    assert_eq!(drawings, "Words in a shape\n");
+    assert_eq!(
+        &t.text[t.sections[3].range.clone()],
+        "Stash\nhidden words\n"
+    );
+    assert_eq!(
+        t.links,
+        [("Site".to_string(), "https://example.com/x".to_string())]
+    );
+}
+
+#[test]
+fn flat_odf_features() {
+    check_odf(&of(&fods(), Format::Fods));
+}
+
+#[test]
+fn odf_package_features() {
+    check_odf(&of(&ods(None), Format::Ods));
+}
+
+#[test]
+fn an_encrypted_ods_is_refused() {
+    let manifest = r#"<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"><manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"><manifest:encryption-data manifest:checksum-type="SHA1/1K"/></manifest:file-entry></manifest:manifest>"#;
+    let e = text(&ods(Some(manifest)), Format::Ods, &Limits::default(), CAP).unwrap_err();
+    assert_eq!(e, Error::Encrypted);
+}
+
+#[test]
+fn an_encrypted_numbers_document_is_refused() {
+    let enc = zip(&[("Index/Document.iwa", b"x"), (".iwpv2", b"x")]);
+    let e = text(&enc, Format::Numbers, &Limits::default(), CAP).unwrap_err();
+    assert_eq!(e, Error::Encrypted);
+}
+
+// XML Spreadsheet 2003.
+
+const XMLSS: &str = r##"<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet">
+ <Styles><Style ss:ID="money"><NumberFormat ss:Format="#,##0.00"/></Style></Styles>
+ <Worksheet ss:Name="Shown">
+  <Table>
+   <Row>
+    <Cell ss:HRef="https://example.com/x"><Data ss:Type="String">Site</Data></Cell>
+    <Cell ss:HRef="mailto:a@b.test"><Data ss:Type="String">a@b.test</Data></Cell>
+    <Cell ss:HRef="#Other!A1"><Data ss:Type="String">Jump</Data></Cell>
+   </Row>
+   <Row>
+    <Cell ss:Formula="=SUM(R[-1]C:R[-1]C)+1000"><Data ss:Type="Number">1005</Data></Cell>
+    <Cell><Data ss:Type="Boolean">0</Data></Cell>
+    <Cell><Data ss:Type="Error">#N/A</Data></Cell>
+    <Cell ss:StyleID="money"><Data ss:Type="Number">1200</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="String">Commented</Data><Comment ss:Author="Eve"><Data>Be careful here</Data></Comment></Cell>
+   </Row>
+  </Table>
+ </Worksheet>
+ <Worksheet ss:Name="Tucked away">
+  <Table><Row><Cell><Data ss:Type="String">hidden words</Data></Cell></Row></Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"><Visible>SheetHidden</Visible></WorksheetOptions>
+ </Worksheet>
+ <Worksheet ss:Name="Deeper">
+  <Table><Row><Cell><Data ss:Type="String">very hidden words</Data></Cell></Row></Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"><Visible>SheetVeryHidden</Visible></WorksheetOptions>
+ </Worksheet>
+</Workbook>"##;
+
+#[test]
+fn xml_spreadsheet_features() {
+    let t = of(XMLSS.as_bytes(), Format::SpreadsheetMl);
+    assert_eq!(
+        t.text,
+        "Shown\nSite (https://example.com/x)\ta@b.test\tJump (#Other!A1)\n\
+         1005\tFALSE\t#N/A\t1200\nCommented\n\
+         Be careful here\n\
+         Tucked away\nhidden words\nDeeper\nvery hidden words\n"
+    );
+    assert_eq!(
+        labels(&t),
+        [
+            "sheet \"Shown\"",
+            "sheet \"Shown\" comments",
+            "hidden sheet \"Tucked away\"",
+            "hidden sheet \"Deeper\""
+        ]
+    );
+    // The formula's source is not text.
+    assert!(!t.text.contains("SUM") && !t.text.contains("1000"));
+    // A mailto link whose label is its address is not a pair.
+    assert_eq!(
+        t.links,
+        [
+            ("Site".to_string(), "https://example.com/x".to_string()),
+            ("Jump".to_string(), "#Other!A1".to_string()),
+        ]
+    );
+}
+
+// HTML and SYLK.
+
+#[test]
+fn html_links() {
+    let html = br#"<html><body><table>
+<tr><td><a href="https://example.com/x">Site</a></td><td><a href="https://example.com/">https://example.com/</a></td></tr>
+<tr><td>plain</td><td><a href="javascript:alert(1)">trap</a></td></tr>
+</table></body></html>"#;
+    let t = of(html, Format::Html);
+    assert!(
+        t.text
+            .contains("Site (https://example.com/x)\thttps://example.com/\nplain\ttrap\n"),
+        "{}",
+        t.text
+    );
+    assert_eq!(
+        t.links,
+        [("Site".to_string(), "https://example.com/x".to_string())]
+    );
+}
+
+#[test]
+fn sylk_values() {
+    let slk = "ID;PWXL;N;E\r\nC;Y1;X1;K\"Text\"\r\nC;X2;KTRUE;Anote\r\nC;X3;K#N/A\r\n\
+C;Y2;X1;K3;E1+2\r\nC;X2;K0.5\r\nE\r\n";
+    let t = of(slk.as_bytes(), Format::Sylk);
+    assert_eq!(
+        labels(&t),
+        ["sheet \"Sheet1\"", "sheet \"Sheet1\" comments"]
+    );
+    assert_eq!(t.text, "Sheet1\nText\tTRUE\t#N/A\n3\t0.5\nnote\n");
+}
+
+// Excel 2 to 2003 workbooks, built record by record.
+
+fn rec(id: u16, body: &[u8]) -> Vec<u8> {
+    let mut r = id.to_le_bytes().to_vec();
+    r.extend((body.len() as u16).to_le_bytes());
+    r.extend(body);
+    r
+}
+
+fn bof(biff8: bool, dt: u16) -> Vec<u8> {
+    let v = if biff8 { 0x0600u16 } else { 0x0500 };
+    let mut b = v.to_le_bytes().to_vec();
+    b.extend(dt.to_le_bytes());
+    b.extend([0u8; 4]);
+    if biff8 {
+        b.extend([0u8; 8]);
+    }
+    rec(0x0809, &b)
+}
+
+fn label(biff8: bool, row: u16, col: u16, s: &str) -> Vec<u8> {
+    let mut b = [
+        row.to_le_bytes(),
+        col.to_le_bytes(),
+        0x000Fu16.to_le_bytes(),
+    ]
+    .concat();
+    b.extend((s.len() as u16).to_le_bytes());
+    if biff8 {
+        b.push(0);
+    }
+    b.extend(s.as_bytes());
+    rec(0x0204, &b)
+}
+
+fn number(row: u16, col: u16, v: f64) -> Vec<u8> {
+    let mut b = [
+        row.to_le_bytes(),
+        col.to_le_bytes(),
+        0x000Fu16.to_le_bytes(),
+    ]
+    .concat();
+    b.extend(v.to_le_bytes());
+    rec(0x0203, &b)
+}
+
+fn bool_err(row: u16, col: u16, v: u8, is_err: bool) -> Vec<u8> {
+    let mut b = [
+        row.to_le_bytes(),
+        col.to_le_bytes(),
+        0x000Fu16.to_le_bytes(),
+    ]
+    .concat();
+    b.extend([v, is_err as u8]);
+    rec(0x0205, &b)
+}
+
+/// A formula with a string result: the FORMULA record, then its STRING.
+fn formula_string(biff8: bool, row: u16, col: u16, source: &str, cached: &str) -> Vec<u8> {
+    let mut rgce = vec![0x17, source.len() as u8];
+    if biff8 {
+        rgce.push(0);
+    }
+    rgce.extend(source.as_bytes());
+    let mut b = [
+        row.to_le_bytes(),
+        col.to_le_bytes(),
+        0x000Fu16.to_le_bytes(),
+    ]
+    .concat();
+    b.extend([0, 0, 0, 0, 0, 0, 0xFF, 0xFF]);
+    b.extend([0u8; 6]);
+    b.extend((rgce.len() as u16).to_le_bytes());
+    b.extend(rgce);
+    let mut out = rec(0x0006, &b);
+    let mut s = (cached.len() as u16).to_le_bytes().to_vec();
+    if biff8 {
+        s.push(0);
+    }
+    s.extend(cached.as_bytes());
+    out.extend(rec(0x0207, &s));
+    out
+}
+
+/// A BIFF5 note: the text is in the record.
+fn note(row: u16, col: u16, s: &str) -> Vec<u8> {
+    let mut b = [row.to_le_bytes(), col.to_le_bytes()].concat();
+    b.extend((s.len() as u16).to_le_bytes());
+    b.extend(s.as_bytes());
+    rec(0x001C, &b)
+}
+
+fn utf16z(s: &str) -> Vec<u8> {
+    let mut b = (s.chars().count() as u32 + 1).to_le_bytes().to_vec();
+    for u in s.encode_utf16().chain([0]) {
+        b.extend(u.to_le_bytes());
+    }
+    b
+}
+
+/// A BIFF8 hyperlink to a URL, with a display text.
+fn hlink(row: u16, col: u16, display: &str, url: &str) -> Vec<u8> {
+    let mut b = [row, row, col, col]
+        .iter()
+        .flat_map(|v| v.to_le_bytes())
+        .collect::<Vec<u8>>();
+    b.extend([
+        0xD0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9,
+        0x0B,
+    ]);
+    b.extend(2u32.to_le_bytes());
+    // Has a moniker, absolute, has a display text.
+    b.extend(0x13u32.to_le_bytes());
+    b.extend(utf16z(display));
+    b.extend([
+        0xE0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9,
+        0x0B,
+    ]);
+    let u = utf16z(url);
+    b.extend((u.len() as u32 - 4).to_le_bytes());
+    b.extend(&u[4..]);
+    rec(0x01B8, &b)
+}
+
+/// A workbook of `sheets`: name, state (0 visible, 1 hidden, 2 very hidden)
+/// and the records of the sheet.
+fn workbook(biff8: bool, sheets: &[(&str, u8, Vec<u8>)]) -> Vec<u8> {
+    let eof = rec(0x000A, &[]);
+    let boundsheet = |pos: u32, state: u8, name: &str| {
+        let mut b = pos.to_le_bytes().to_vec();
+        b.extend([state, 0, name.len() as u8]);
+        if biff8 {
+            b.push(0);
+        }
+        b.extend(name.as_bytes());
+        rec(0x0085, &b)
+    };
+    let subs: Vec<Vec<u8>> = sheets
+        .iter()
+        .map(|(_, _, body)| {
+            let mut s = bof(biff8, 0x10);
+            s.extend(body);
+            s.extend(&eof);
+            s
+        })
+        .collect();
+    let codepage = rec(0x0042, &1252u16.to_le_bytes());
+    let head_len = bof(biff8, 5).len()
+        + codepage.len()
+        + sheets
+            .iter()
+            .map(|s| boundsheet(0, 0, s.0).len())
+            .sum::<usize>()
+        + eof.len();
+    let mut g = bof(biff8, 5);
+    g.extend(codepage);
+    let mut pos = head_len;
+    for (i, (name, state, _)) in sheets.iter().enumerate() {
+        g.extend(boundsheet(pos as u32, *state, name));
+        pos += subs[i].len();
+    }
+    g.extend(&eof);
+    assert_eq!(g.len(), head_len);
+    for s in subs {
+        g.extend(s);
+    }
+    g
+}
+
+#[test]
+fn biff5_features() {
+    let mut open = vec![];
+    open.extend(label(false, 0, 0, "Hello"));
+    open.extend(number(0, 1, 2.5));
+    open.extend(bool_err(1, 0, 1, false));
+    open.extend(bool_err(1, 1, 0x07, true));
+    open.extend(formula_string(false, 2, 0, "source words", "cached words"));
+    open.extend(note(0, 0, "check me"));
+    let mut stash = vec![];
+    stash.extend(label(false, 0, 0, "hidden words"));
+    let wb = workbook(false, &[("Open", 0, open), ("Stash", 1, stash)]);
+    let t = of(&wb, Format::Xls);
+    assert_eq!(
+        t.text,
+        "Open\nHello\t2.5\nTRUE\t#DIV/0!\ncached words\ncheck me\nStash\nhidden words\n"
+    );
+    assert_eq!(
+        labels(&t),
+        [
+            "sheet \"Open\"",
+            "sheet \"Open\" comments",
+            "hidden sheet \"Stash\""
+        ]
+    );
+    assert!(!t.text.contains("source words"));
+}
+
+#[test]
+fn biff8_features() {
+    let mut open = vec![];
+    open.extend(label(true, 0, 0, "Docs"));
+    open.extend(hlink(0, 0, "Docs", "https://example.com/docs"));
+    open.extend(label(true, 1, 0, "https://example.com/"));
+    open.extend(hlink(1, 0, "https://example.com/", "https://example.com/"));
+    open.extend(formula_string(true, 2, 0, "source words", "cached words"));
+    let mut deeper = vec![];
+    deeper.extend(label(true, 0, 0, "very hidden words"));
+    let wb = workbook(true, &[("Open", 0, open), ("Deeper", 2, deeper)]);
+    let t = of(&wb, Format::Xls);
+    assert_eq!(
+        t.text,
+        "Open\nDocs (https://example.com/docs)\nhttps://example.com/\ncached words\n\
+         Deeper\nvery hidden words\n"
+    );
+    assert_eq!(labels(&t), ["sheet \"Open\"", "hidden sheet \"Deeper\""]);
+    assert_eq!(
+        t.links,
+        [("Docs".to_string(), "https://example.com/docs".to_string())]
+    );
+}
+
+#[test]
+fn an_encrypted_workbook_is_refused() {
+    for filepass in [
+        // RC4 with a verifier of another password.
+        [&1u16.to_le_bytes()[..], &[1, 0, 1, 0], &[0x5Au8; 48]].concat(),
+        // XOR with another key.
+        [&0u16.to_le_bytes()[..], &[0x34, 0x12, 0x78, 0x56]].concat(),
+    ] {
+        let mut s = bof(true, 5);
+        s.extend(rec(0x002F, &filepass));
+        s.extend(rec(0x000A, &[]));
+        let e = text(&s, Format::Xls, &Limits::default(), CAP).unwrap_err();
+        assert_eq!(e, Error::Encrypted);
+    }
+}
+
+// Refusals and limits.
+
+#[test]
+fn the_wrong_format_is_refused() {
+    let l = Limits::default();
+    let xls = fixture("sample.xls");
+    assert!(matches!(
+        text(&xls, Format::Ods, &l, CAP),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        text(&xls, Format::Numbers, &l, CAP),
+        Err(Error::NotFormat(_))
+    ));
+    let ods = fixture("sample.ods");
+    assert!(matches!(
+        text(&ods, Format::Xls, &l, CAP),
+        Err(Error::NotFormat(_))
+    ));
+    assert!(matches!(
+        text(b"", Format::Fods, &l, CAP),
+        Err(Error::NotFormat(_) | Error::Malformed(_))
+    ));
+}
+
+#[test]
+fn damaged_documents_are_refused() {
+    let l = Limits::default();
+    // The compound file's signature, then nothing.
+    let mut cfb = fixture("sample.xls")[..8].to_vec();
+    cfb.extend([0u8; 600]);
+    assert!(matches!(
+        text(&cfb, Format::Xls, &l, CAP),
+        Err(Error::Malformed(_) | Error::Unsupported(_))
+    ));
+    // A workbook cut inside its directory, and one with its sectors erased.
+    let xls = fixture("sample.xls");
+    let mut erased = xls.clone();
+    erased[512..1024].fill(0xFF);
+    for d in [&xls[..600], &erased[..]] {
+        let r = text(d, Format::Xls, &l, CAP);
+        assert!(matches!(r, Err(Error::Malformed(_))), "{r:?}");
+    }
+    // XML cut short.
+    let truncated = text(&fods()[..400], Format::Fods, &l, CAP);
+    assert!(
+        matches!(truncated, Err(Error::Malformed(_))),
+        "{truncated:?}"
+    );
+    let xml = br#"<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"><Worksheet"#;
+    let r = text(xml, Format::SpreadsheetMl, &l, CAP);
+    assert!(matches!(r, Err(Error::Malformed(_))), "{r:?}");
+    let junk = zip(&[
+        (
+            "mimetype",
+            b"application/vnd.oasis.opendocument.spreadsheet",
+        ),
+        ("content.xml", b"<office:document-content><oops"),
+    ]);
+    let r = text(&junk, Format::Ods, &l, CAP);
+    assert!(matches!(r, Err(Error::Malformed(_))), "{r:?}");
+}
+
+#[test]
+fn every_truncation_is_read_or_refused() {
+    for (name, format) in ALL {
+        let data = fixture(name);
+        let step = (data.len() / 200).max(1);
+        for n in (0..data.len()).step_by(step) {
+            let _ = text(&data[..n], format, &Limits::default(), CAP);
+        }
+    }
+}
+
+#[test]
+fn limits_are_kept() {
+    for (name, format) in ALL {
+        let data = fixture(name);
+        let cap = CAP;
+        let r = |l: Limits| text(&data, format, &l, cap).unwrap_err();
+        assert_eq!(
+            r(Limits::default().with_max_cells(5)),
+            Error::TooLarge("cells"),
+            "{name}"
+        );
+        assert_eq!(
+            r(Limits::default().with_max_memory(2000)),
+            Error::TooLarge("memory"),
+            "{name}"
+        );
+        let mut small = Limits::default();
+        small.max_input = 100;
+        assert_eq!(r(small), Error::TooLarge("input"), "{name}");
+        // The converter refuses the same.
+        assert_eq!(
+            convert(&data, format, &Limits::default().with_max_cells(5)).unwrap_err(),
+            Error::TooLarge("cells")
+        );
+    }
+}
+
+// The cap.
+
+#[test]
+fn the_cap_cuts_the_text() {
+    for (name, format) in ALL {
+        let data = fixture(name);
+        let full = of(&data, format);
+        assert!(!full.truncated, "{name}");
+        let short = [0, 1, 7, 20, 64, 150, full.text.len() - 1];
+        for cap in short.into_iter().filter(|&c| c < full.text.len()) {
+            let t = text(&data, format, &Limits::default(), cap).unwrap();
+            assert!(t.text.len() <= cap, "{name} at {cap}: {}", t.text.len());
+            assert!(t.truncated, "{name} at {cap}");
+            assert!(full.text.starts_with(&t.text), "{name} at {cap}");
+        }
+        for cap in [full.text.len(), full.text.len() + 1] {
+            let t = text(&data, format, &Limits::default(), cap).unwrap();
+            assert_eq!(t.text, full.text, "{name} at {cap}");
+            assert!(!t.truncated, "{name} at {cap}");
+        }
+    }
+}
diff --git a/crates/exav-render/tests/office_text_slides.rs b/crates/exav-render/tests/office_text_slides.rs
new file mode 100644
index 00000000..0317a719
--- /dev/null
+++ b/crates/exav-render/tests/office_text_slides.rs
@@ -0,0 +1,254 @@
+//! The text of presentations and drawings, taken from the model the readers
+//! fill and not from a PPTX written and read back.
+
+use exav_render::slides::{Error, Format, Limits, convert, text};
+use std::io::Read;
+
+fn fixture(dir: &str, name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/office/{dir}/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("{p}: {e}"))
+}
+
+fn words(format: Format, dir: &str, name: &str) -> exav_render::formats::office::text::Text {
+    text(&fixture(dir, name), format, &Limits::default(), 1 << 20).unwrap()
+}
+
+const NS: &str = r#"xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:xlink="http://www.w3.org/1999/xlink""#;
+
+/// A flat presentation holding `pages` (draw:page elements).
+fn fodp(pages: &str) -> Vec<u8> {
+    format!(
+        r#"<office:document {NS} office:mimetype="application/vnd.oasis.opendocument.presentation"><office:body><office:presentation>{pages}</office:presentation></office:body></office:document>"#
+    )
+    .into_bytes()
+}
+
+fn rect(body: &str) -> String {
+    format!(
+        r#"<draw:rect svg:x="1cm" svg:y="1cm" svg:width="5cm" svg:height="2cm">{body}</draw:rect>"#
+    )
+}
+
+fn of(doc: &[u8]) -> exav_render::formats::office::text::Text {
+    text(doc, Format::Fodp, &Limits::default(), 1 << 20).unwrap()
+}
+
+#[test]
+fn every_format_gives_the_words_of_its_slides_one_section_to_a_slide() {
+    for (name, format) in [
+        ("sample.ppt", Format::Ppt),
+        ("sample.odp", Format::Odp),
+        ("sample.fodp", Format::Fodp),
+    ] {
+        let t = words(format, "slides", name);
+        assert_eq!(
+            t.text,
+            "Quarterly budget\nRevenue up 12%\nCosts flat\nPlan\nNotes\nSecond slide text\n",
+            "{name}"
+        );
+        let labels: Vec<_> = t.sections.iter().map(|s| s.label.as_str()).collect();
+        assert_eq!(labels, ["slide 1", "slide 2"], "{name}");
+        assert_eq!(
+            &t.text[t.sections[1].range.clone()],
+            "Notes\nSecond slide text\n"
+        );
+        assert!(!t.truncated);
+    }
+    let key = words(Format::Keynote, "slides", "sample.key");
+    assert_eq!(key.text, "Example Presentation\nThis is a subtitle.\n");
+}
+
+#[test]
+fn a_drawing_gives_its_pages_by_name() {
+    for (name, format) in [("sample.odg", Format::Odg), ("sample.fodg", Format::Fodg)] {
+        let t = words(format, "draw", name);
+        let labels: Vec<_> = t.sections.iter().map(|s| s.label.as_str()).collect();
+        assert_eq!(labels, ["slide 1 \"Plan\"", "slide 2 \"Detail\""], "{name}");
+        assert!(
+            t.text.contains("Red box") && t.text.contains("Detail"),
+            "{name}"
+        );
+        // A shape on a layer that is not displayed is not read.
+        assert!(!t.text.contains("Hidden note"), "{name}");
+    }
+}
+
+#[test]
+fn chart_text_is_text() {
+    let t = words(Format::Odp, "slides", "chart.odp");
+    for w in ["Quarterly sales", "Sales", "Q1", "Q2", "Q3"] {
+        assert!(t.text.lines().any(|l| l == w), "{w}");
+    }
+}
+
+#[test]
+fn a_hyperlink_is_its_label_then_its_target() {
+    let page = format!(
+        r#"<draw:page>{}</draw:page>"#,
+        rect(
+            r#"<text:p>go <text:a xlink:href="https://evil.test/login">paypal.com</text:a> now</text:p><text:p><text:a xlink:href="https://same.test/">https://same.test/</text:a></text:p>"#
+        )
+    );
+    let t = of(&fodp(&page));
+    assert_eq!(
+        t.text,
+        "go paypal.com (https://evil.test/login) now\nhttps://same.test/\n"
+    );
+    // Only a link whose label is not its target is a pair.
+    assert_eq!(
+        t.links,
+        [(
+            "paypal.com".to_string(),
+            "https://evil.test/login".to_string()
+        )]
+    );
+}
+
+#[test]
+fn the_slide_number_is_not_text() {
+    let page = format!(
+        "<draw:page>{}</draw:page>",
+        rect("<text:p>Page <text:page-number>7</text:page-number> end</text:p>")
+    );
+    let t = of(&fodp(&page));
+    assert!(
+        t.text.contains("Page") && t.text.contains("end"),
+        "{}",
+        t.text
+    );
+    // The reader writes the slide's own number (1) as the field's text.
+    assert!(!t.text.contains('1') && !t.text.contains('7'), "{}", t.text);
+}
+
+#[test]
+fn a_table_is_a_line_to_a_row_with_a_tab_between_cells() {
+    let page = r#"<draw:page><draw:frame svg:x="0cm" svg:y="0cm" svg:width="8cm" svg:height="3cm"><table:table><table:table-column table:number-columns-repeated="2"/><table:table-row><table:table-cell><text:p>a1</text:p></table:table-cell><table:table-cell><text:p>b1</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell><text:p>a2</text:p></table:table-cell><table:table-cell><text:p>b2</text:p></table:table-cell></table:table-row></table:table></draw:frame></draw:page>"#;
+    let t = of(&fodp(page));
+    assert_eq!(t.text, "a1\tb1\na2\tb2\n");
+}
+
+#[test]
+fn a_hidden_slide_is_read_and_says_it_is_hidden() {
+    let pages = format!(
+        r#"<draw:page presentation:visibility="hidden">{}</draw:page><draw:page>{}</draw:page>"#,
+        rect("<text:p>secret</text:p>"),
+        rect("<text:p>shown</text:p>")
+    );
+    let t = of(&fodp(&pages));
+    let labels: Vec<_> = t.sections.iter().map(|s| s.label.as_str()).collect();
+    assert_eq!(labels, ["hidden slide 1", "slide 2"]);
+    assert_eq!(t.text, "secret\nshown\n");
+}
+
+#[test]
+fn text_a_master_draws_on_every_slide_is_read_apart_from_the_placeholders() {
+    let doc = format!(
+        r#"<office:document {NS} office:mimetype="application/vnd.oasis.opendocument.presentation"><office:master-styles><style:master-page style:name="M" style:display-name="Corporate">{}{}</style:master-page></office:master-styles><office:body><office:presentation><draw:page draw:master-page-name="M">{}</draw:page></office:presentation></office:body></office:document>"#,
+        r#"<draw:rect svg:x="0cm" svg:y="0cm" svg:width="4cm" svg:height="1cm"><text:p>Confidential notice</text:p></draw:rect>"#,
+        r#"<draw:frame presentation:class="title" svg:x="0cm" svg:y="0cm" svg:width="4cm" svg:height="1cm"><draw:text-box><text:p>Click to edit the title</text:p></draw:text-box></draw:frame>"#,
+        rect("<text:p>slide words</text:p>")
+    );
+    let t = of(doc.as_bytes());
+    let labels: Vec<_> = t.sections.iter().map(|s| s.label.as_str()).collect();
+    assert_eq!(labels, ["slide 1", "master \"Corporate\""]);
+    assert!(t.text.contains("Confidential notice"));
+    assert!(!t.text.contains("Click to edit"));
+}
+
+#[test]
+fn the_cap_cuts_the_text_and_says_so() {
+    let pages = format!(
+        "<draw:page>{}</draw:page>",
+        rect("<text:p>aaaaaaaaaa</text:p><text:p>bbbbbbbbbb</text:p>")
+    );
+    let t = text(&fodp(&pages), Format::Fodp, &Limits::default(), 15).unwrap();
+    assert!(t.truncated);
+    assert!(t.text.len() <= 15);
+    assert!(t.text.starts_with("slide") || t.text.starts_with('a'));
+}
+
+#[test]
+fn it_refuses_what_the_converter_refuses() {
+    // Not that format.
+    assert!(matches!(
+        text(
+            &fixture("slides", "sample.ppt"),
+            Format::Odp,
+            &Limits::default(),
+            1 << 20
+        ),
+        Err(Error::NotFormat(_))
+    ));
+    // Damaged: an error, no panic.
+    let mut damaged = fixture("slides", "sample.ppt");
+    for b in damaged.iter_mut().skip(512).take(4096) {
+        *b = 0xFF;
+    }
+    assert!(text(&damaged, Format::Ppt, &Limits::default(), 1 << 20).is_err());
+    // Past a limit.
+    let mut small = Limits::default();
+    small.max_input = 100;
+    assert!(matches!(
+        text(
+            &fixture("slides", "sample.ppt"),
+            Format::Ppt,
+            &small,
+            1 << 20
+        ),
+        Err(Error::TooLarge(_))
+    ));
+}
+
+/// The words of the PPTX the converter writes for a fixture, in order.
+fn pptx_words(pptx: &[u8]) -> Vec<String> {
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(pptx)).unwrap();
+    let mut names: Vec<String> = z
+        .file_names()
+        .filter_map(|n| n.ok().map(|n| n.to_string()))
+        .filter(|n| n.starts_with("ppt/slides/slide") && n.ends_with(".xml"))
+        .collect();
+    names.sort_by_key(|n| {
+        n.trim_start_matches("ppt/slides/slide")
+            .trim_end_matches(".xml")
+            .parse::<u32>()
+            .unwrap_or(0)
+    });
+    let mut out = vec![];
+    for n in names {
+        let mut xml = String::new();
+        z.by_name(&n).unwrap().read_to_string(&mut xml).unwrap();
+        let mut rest = xml.as_str();
+        while let Some(i) = rest.find("<a:t>") {
+            let from = i + 5;
+            let j = rest[from..].find("</a:t>").unwrap();
+            out.push(rest[from..from + j].to_string());
+            rest = &rest[from + j..];
+        }
+    }
+    out
+}
+
+#[test]
+fn the_words_are_those_of_the_pptx_the_converter_writes() {
+    for (dir, name, format) in [
+        ("slides", "sample.ppt", Format::Ppt),
+        ("slides", "sample.odp", Format::Odp),
+        ("slides", "sample.key", Format::Keynote),
+        ("draw", "sample.odg", Format::Odg),
+    ] {
+        let bytes = fixture(dir, name);
+        let c = convert(&bytes, format, &Limits::default()).unwrap();
+        let t = text(&bytes, format, &Limits::default(), 1 << 20).unwrap();
+        let mine: Vec<&str> = t.text.split_whitespace().collect();
+        let theirs: Vec<String> = pptx_words(&c.pptx)
+            .iter()
+            .flat_map(|w| w.split_whitespace().map(String::from).collect::<Vec<_>>())
+            .collect();
+        for w in &theirs {
+            assert!(mine.contains(&w.as_str()), "{name}: {w} missing");
+        }
+    }
+}
diff --git a/crates/exav-render/tests/ply.rs b/crates/exav-render/tests/ply.rs
new file mode 100644
index 00000000..ee04c0f9
--- /dev/null
+++ b/crates/exav-render/tests/ply.rs
@@ -0,0 +1,692 @@
+//! The PLY reader on files written here from known geometry in every
+//! encoding, with the lists, the properties and the elements PLY files
+//! vary in; and on hostile files.
+
+mod mesh_common;
+
+use std::fmt::Write as _;
+use std::io::Write as _;
+use std::time::Duration;
+
+use exav_render::mesh::Scene;
+use exav_render::ply::{Error, read};
+use mesh_common::*;
+
+#[derive(Clone, Copy, PartialEq)]
+enum Enc {
+    Ascii,
+    Little,
+    Big,
+}
+
+/// A property: its name, its type, and the type of its list's count.
+type Prop = (&'static str, &'static str, Option<&'static str>);
+
+/// One element: its name, its properties and its rows, each row a list of
+/// values for every property (one value for a scalar).
+struct El {
+    name: &'static str,
+    props: Vec<Prop>,
+    rows: Vec<Vec<Vec<f64>>>,
+}
+
+fn put(out: &mut Vec<u8>, enc: Enc, ty: &str, v: f64) {
+    if enc == Enc::Ascii {
+        write!(out, "{v} ").unwrap();
+        return;
+    }
+    macro_rules! num {
+        ($t:ty) => {{
+            let n = v as $t;
+            out.extend_from_slice(&if enc == Enc::Big {
+                n.to_be_bytes()
+            } else {
+                n.to_le_bytes()
+            });
+        }};
+    }
+    match ty {
+        "char" | "int8" => num!(i8),
+        "uchar" | "uint8" => num!(u8),
+        "short" | "int16" => num!(i16),
+        "ushort" | "uint16" => num!(u16),
+        "int" | "int32" => num!(i32),
+        "uint" | "uint32" => num!(u32),
+        "float" | "float32" => num!(f32),
+        "double" | "float64" => num!(f64),
+        _ => panic!("{ty}"),
+    }
+}
+
+fn file(enc: Enc, elements: &[El]) -> Vec<u8> {
+    let mut out = b"ply\n".to_vec();
+    out.extend_from_slice(
+        match enc {
+            Enc::Ascii => "format ascii 1.0\n",
+            Enc::Little => "format binary_little_endian 1.0\n",
+            Enc::Big => "format binary_big_endian 1.0\n",
+        }
+        .as_bytes(),
+    );
+    out.extend_from_slice(b"comment made by the tests\n");
+    for e in elements {
+        writeln!(out, "element {} {}", e.name, e.rows.len()).unwrap();
+        for (name, ty, count) in &e.props {
+            match count {
+                Some(c) => writeln!(out, "property list {c} {ty} {name}").unwrap(),
+                None => writeln!(out, "property {ty} {name}").unwrap(),
+            }
+        }
+    }
+    out.extend_from_slice(b"end_header\n");
+    for e in elements {
+        for row in &e.rows {
+            for ((_, ty, count), values) in e.props.iter().zip(row) {
+                if let Some(c) = count {
+                    put(&mut out, enc, c, values.len() as f64);
+                }
+                for &v in values {
+                    put(&mut out, enc, ty, v);
+                }
+            }
+            if enc == Enc::Ascii {
+                out.push(b'\n');
+            }
+        }
+    }
+    out
+}
+
+fn vertex_element(points: &[P], with_color: bool) -> El {
+    let mut props: Vec<Prop> = vec![
+        ("x", "float", None),
+        ("y", "float", None),
+        ("z", "float", None),
+    ];
+    if with_color {
+        props.extend([
+            ("red", "uchar", None),
+            ("green", "uchar", None),
+            ("blue", "uchar", None),
+        ]);
+    }
+    El {
+        name: "vertex",
+        props,
+        rows: points
+            .iter()
+            .enumerate()
+            .map(|(i, p)| {
+                let mut row = vec![vec![p[0]], vec![p[1]], vec![p[2]]];
+                if with_color {
+                    row.extend(color_of(i).map(|c| vec![f64::from(c)]));
+                }
+                row
+            })
+            .collect(),
+    }
+}
+
+fn face_element(faces: &[Vec<usize>], count: &'static str, index: &'static str) -> El {
+    El {
+        name: "face",
+        props: vec![("vertex_indices", index, Some(count))],
+        rows: faces
+            .iter()
+            .map(|f| vec![f.iter().map(|&i| i as f64).collect()])
+            .collect(),
+    }
+}
+
+fn color_of(i: usize) -> [u8; 3] {
+    [(i * 30) as u8, 255 - (i * 30) as u8, (i * 7) as u8]
+}
+
+fn cube_faces() -> Vec<Vec<usize>> {
+    CUBE_QUADS.iter().map(|q| q.to_vec()).collect()
+}
+
+fn cube(enc: Enc) -> Vec<u8> {
+    file(
+        enc,
+        &[
+            vertex_element(&CUBE, true),
+            face_element(&cube_faces(), "uchar", "int"),
+        ],
+    )
+}
+
+fn parse(bytes: &[u8]) -> Scene {
+    read(bytes, usize::MAX).unwrap()
+}
+
+#[test]
+fn a_cube_is_the_same_in_ascii_and_both_binary_orders() {
+    for enc in [Enc::Ascii, Enc::Little, Enc::Big] {
+        let s = parse(&cube(enc));
+        assert_eq!(s.triangles(), 12);
+        assert_near(volume(&s), 1.0, "volume");
+        assert_near(area(&s), 6.0, "area");
+        assert_eq!(extent(&s), [[0.; 3], [1.; 3]]);
+        assert_eq!(s.warnings, Default::default());
+        assert_sound(&s);
+        // Each corner has the colour its vertex was given.
+        let b = &s.batches[0];
+        let colors = b.colors.as_ref().unwrap();
+        for (i, p) in b.positions.chunks(3).enumerate() {
+            let v = CUBE
+                .iter()
+                .position(|c| (0..3).all(|k| f64::from(p[k]) == c[k]))
+                .unwrap();
+            assert_eq!(&colors[i * 3..i * 3 + 3], &color_of(v), "vertex {v}");
+        }
+    }
+}
+
+#[test]
+fn list_counts_and_indices_of_every_integer_type_are_read() {
+    for enc in [Enc::Ascii, Enc::Little, Enc::Big] {
+        for count in [
+            "uchar", "char", "ushort", "short", "uint", "int", "uint8", "int32",
+        ] {
+            for index in [
+                "uchar", "char", "ushort", "short", "uint", "int", "uint16", "int8",
+            ] {
+                let bytes = file(
+                    enc,
+                    &[
+                        vertex_element(&CUBE, false),
+                        face_element(&cube_faces(), count, index),
+                    ],
+                );
+                let s = parse(&bytes);
+                assert_eq!(s.triangles(), 12, "{count} {index}");
+                assert_near(volume(&s), 1.0, "volume");
+            }
+        }
+    }
+}
+
+#[test]
+fn coordinates_of_every_type_are_read() {
+    for ty in ["float", "double", "int", "short", "uchar"] {
+        let points = TETRA;
+        let el = El {
+            name: "vertex",
+            props: vec![("x", ty, None), ("y", ty, None), ("z", ty, None)],
+            rows: points
+                .iter()
+                .map(|p| p.iter().map(|&v| vec![v]).collect())
+                .collect(),
+        };
+        let faces: Vec<Vec<usize>> = TETRA_FACES.iter().map(|f| f.to_vec()).collect();
+        for enc in [Enc::Ascii, Enc::Little, Enc::Big] {
+            let s = parse(&file(
+                enc,
+                &[
+                    El {
+                        name: el.name,
+                        props: el.props.clone(),
+                        rows: el.rows.clone(),
+                    },
+                    face_element(&faces, "uchar", "uint"),
+                ],
+            ));
+            assert_eq!(s.triangles(), 4, "{ty}");
+            assert_near(volume(&s), 1.0 / 6.0, ty);
+        }
+    }
+}
+
+#[test]
+fn a_pentagon_is_three_triangles_and_a_notched_polygon_is_covered_once() {
+    let pentagon: Vec<P> = (0..5)
+        .map(|k| {
+            let a = f64::from(k) * std::f64::consts::TAU / 5.0;
+            [a.cos(), a.sin(), 0.0]
+        })
+        .collect();
+    let bytes = file(
+        Enc::Little,
+        &[
+            vertex_element(&pentagon, false),
+            El {
+                name: "face",
+                props: vec![("vertex_index", "int", Some("uchar"))],
+                rows: vec![vec![vec![0., 1., 2., 3., 4.]]],
+            },
+        ],
+    );
+    let s = parse(&bytes);
+    assert_eq!(s.triangles(), 3);
+    assert_near(
+        area(&s),
+        2.5 * (std::f64::consts::TAU / 5.0).sin(),
+        "pentagon",
+    );
+    // A U in the xz plane, facing the other way.
+    let u: Vec<P> = [
+        [0., 0.],
+        [3., 0.],
+        [3., 2.],
+        [2., 2.],
+        [2., 1.],
+        [1., 1.],
+        [1., 2.],
+        [0., 2.],
+    ]
+    .iter()
+    .map(|p| [p[0], 0.0, p[1]])
+    .collect();
+    let bytes = file(
+        Enc::Ascii,
+        &[
+            vertex_element(&u, false),
+            face_element(&[(0..8).rev().collect()], "uchar", "int"),
+        ],
+    );
+    let s = parse(&bytes);
+    assert_eq!(s.triangles(), 6);
+    assert_near(area(&s), 5.0, "area");
+}
+
+#[test]
+fn other_elements_and_properties_are_skipped_by_their_types() {
+    for enc in [Enc::Ascii, Enc::Little, Enc::Big] {
+        let mut vertex = vertex_element(&CUBE, true);
+        // Properties before, among and after the ones read, one a list.
+        vertex.props.insert(0, ("confidence", "double", None));
+        vertex.props.insert(2, ("tex", "short", Some("uchar")));
+        vertex.props.push(("flags", "uint", None));
+        for (i, row) in vertex.rows.iter_mut().enumerate() {
+            row.insert(0, vec![0.25]);
+            row.insert(2, vec![1.0; i % 3]);
+            row.push(vec![4_000_000_000.0]);
+        }
+        let mut face = face_element(&cube_faces(), "uchar", "int");
+        face.props.insert(0, ("material", "short", None));
+        face.props.push(("texcoord", "float", Some("uchar")));
+        for (i, row) in face.rows.iter_mut().enumerate() {
+            row.insert(0, vec![-3.0]);
+            row.push(vec![0.5; 2 * (i % 4)]);
+        }
+        let camera = El {
+            name: "camera",
+            props: vec![("fov", "float", None), ("name", "uchar", Some("uchar"))],
+            rows: vec![vec![vec![60.0], vec![65.0, 66.0, 67.0]]; 3],
+        };
+        let edge = El {
+            name: "edge",
+            props: vec![("vertex1", "int", None), ("vertex2", "int", None)],
+            rows: vec![vec![vec![0.0], vec![1.0]]; 12],
+        };
+        let s = parse(&file(enc, &[camera, vertex, face, edge]));
+        assert_eq!(s.triangles(), 12);
+        assert_near(volume(&s), 1.0, "volume");
+        assert_eq!(extent(&s), [[0.; 3], [1.; 3]]);
+        assert!(s.batches[0].colors.is_some());
+        assert_eq!(s.warnings, Default::default());
+    }
+}
+
+#[test]
+fn normals_are_used_when_the_file_has_them() {
+    let mut vertex = vertex_element(&TETRA[..3], false);
+    vertex.props.extend([
+        ("nx", "float", None),
+        ("ny", "float", None),
+        ("nz", "float", None),
+    ]);
+    for row in &mut vertex.rows {
+        row.extend([vec![0.0], vec![0.0], vec![-4.0]]);
+    }
+    let s = parse(&file(
+        Enc::Little,
+        &[vertex, face_element(&[vec![0, 1, 2]], "uchar", "int")],
+    ));
+    for n in s.batches[0].normals.chunks(3) {
+        assert_eq!(n, [0.0, 0.0, -1.0]);
+    }
+    let s = parse(&file(
+        Enc::Little,
+        &[
+            vertex_element(&TETRA[..3], false),
+            face_element(&[vec![0, 1, 2]], "uchar", "int"),
+        ],
+    ));
+    assert_eq!(&s.batches[0].normals[..3], &[0.0, 0.0, 1.0]);
+}
+
+#[test]
+fn colours_of_each_type_are_scaled_to_bytes() {
+    let cases: [(&str, [f64; 3], [u8; 3]); 4] = [
+        ("uchar", [255., 128., 0.], [255, 128, 0]),
+        ("ushort", [65535., 32896., 0.], [255, 128, 0]),
+        ("float", [1.0, 0.5, 0.0], [255, 128, 0]),
+        ("double", [2.0, -1.0, 0.2], [255, 0, 51]),
+    ];
+    for (ty, value, want) in cases {
+        let vertex = El {
+            name: "vertex",
+            props: vec![
+                ("x", "float", None),
+                ("y", "float", None),
+                ("z", "float", None),
+                ("r", ty, None),
+                ("g", ty, None),
+                ("b", ty, None),
+                ("alpha", ty, None),
+            ],
+            rows: TETRA[..3]
+                .iter()
+                .map(|p| {
+                    vec![
+                        vec![p[0]],
+                        vec![p[1]],
+                        vec![p[2]],
+                        vec![value[0]],
+                        vec![value[1]],
+                        vec![value[2]],
+                        vec![0.0],
+                    ]
+                })
+                .collect(),
+        };
+        let s = parse(&file(
+            Enc::Little,
+            &[vertex, face_element(&[vec![0, 1, 2]], "uchar", "int")],
+        ));
+        let c = s.batches[0].colors.as_ref().unwrap();
+        assert_eq!(&c[..3], &want, "{ty}");
+    }
+}
+
+#[test]
+fn headers_as_some_writers_make_them_are_read() {
+    // The remarks in braces of the format's own example.
+    let text = "ply\nformat ascii 1.0\nelement vertex 3\nproperty float x { the x }\n\
+                property float y\nproperty float z\nelement face 1\n\
+                property list uchar int vertex_index { corners }\nend_header\n\
+                0 0 0\n1 0 0\n0 1 0\n3 0 1 2\n";
+    assert_eq!(parse(text.as_bytes()).triangles(), 1);
+    // A comment keyword with no space after it, and a line of text with none.
+    let text = text.replace("ply\n", "ply\ncommentWFhZ\nCreated by Blender3D 246\n");
+    assert_eq!(parse(text.as_bytes()).triangles(), 1);
+    // An empty list of faces before the vertices.
+    let text = "ply\nformat ascii 1.0\nelement face 0\nproperty list uchar int vertex_indices\n\
+                element vertex 1\nproperty float x\nproperty float y\nproperty float z\n\
+                end_header\n0 0 0\n";
+    assert!(matches!(
+        read(text.as_bytes(), 10).unwrap_err(),
+        Error::Unsupported(_)
+    ));
+    // Faces with something in them still need the vertices first.
+    let text = text.replace("element face 0", "element face 1");
+    let e = read(format!("{text}3 0 0 0\n").as_bytes(), 10).unwrap_err();
+    assert!(e.to_string().contains("faces before vertices"), "{e}");
+}
+
+#[test]
+fn vertices_with_no_z_are_flat() {
+    let text = "ply\nformat ascii 1.0\nelement vertex 3\nproperty float x\nproperty float y\n\
+                element face 1\nproperty list uchar int vertex_index\nend_header\n\
+                0 0\n2 0\n0 2\n3 0 1 2\n";
+    let s = parse(text.as_bytes());
+    assert_eq!(s.triangles(), 1);
+    assert_eq!(extent(&s), [[0., 0., 0.], [2., 2., 0.]]);
+    let e = read(text.replace("property float y\n", "").as_bytes(), 10).unwrap_err();
+    assert!(e.to_string().contains("x and y"), "{e}");
+}
+
+#[test]
+fn a_point_cloud_is_reported_as_unsupported() {
+    let bytes = file(Enc::Little, &[vertex_element(&CUBE, true)]);
+    let e = read(&bytes, 100).unwrap_err();
+    assert!(matches!(e, Error::Unsupported(_)));
+    assert!(e.to_string().contains("point cloud"), "{e}");
+    // A face element that holds no faces is the same.
+    let bytes = file(
+        Enc::Ascii,
+        &[
+            vertex_element(&CUBE, false),
+            face_element(&[], "uchar", "int"),
+        ],
+    );
+    assert!(matches!(
+        read(&bytes, 100).unwrap_err(),
+        Error::Unsupported(_)
+    ));
+}
+
+#[test]
+fn what_is_not_a_ply_file_is_refused() {
+    for bad in [
+        &b""[..],
+        b"ply",
+        b"ply\n",
+        b"plyx\nformat ascii 1.0\nend_header\n",
+        b"ply\nformat ascii 1.0\nelement vertex 1\n",
+        b"hello\n",
+        b"\x7fELF",
+        b"ply\r",
+    ] {
+        assert_eq!(read(bad, 10).unwrap_err(), Error::NotPly, "{bad:?}");
+    }
+    let cases: [(&[u8], &str); 5] = [
+        (b"ply\nformat ebcdic 1.0\nend_header\n", "format"),
+        (
+            b"ply\nproperty float x\nend_header\n",
+            "property before element",
+        ),
+        (
+            b"ply\nformat ascii 1.0\nelement vertex 1\nproperty quad x\nend_header\n",
+            "property type",
+        ),
+        (
+            b"ply\nformat ascii 1.0\nelement vertex -1\nend_header\n",
+            "element count",
+        ),
+        (b"ply\nelement vertex 1\nend_header\n", "no format line"),
+    ];
+    for (bad, what) in cases {
+        let e = read(bad, 10).unwrap_err();
+        assert!(e.to_string().contains(what), "{e}");
+    }
+    // CRLF headers are fine.
+    let crlf = String::from_utf8(cube(Enc::Ascii))
+        .unwrap()
+        .replace('\n', "\r\n");
+    assert_eq!(parse(crlf.as_bytes()).triangles(), 12);
+}
+
+#[test]
+fn faces_that_cannot_be_drawn_are_dropped_and_counted() {
+    let faces = vec![vec![0, 1, 2], vec![0, 1, 99], vec![0, 1], vec![3, 2, 1, 0]];
+    let s = parse(&file(
+        Enc::Ascii,
+        &[
+            vertex_element(&CUBE, false),
+            face_element(&faces, "uchar", "int"),
+        ],
+    ));
+    assert_eq!(s.triangles(), 3);
+    assert_eq!(s.warnings.invalid, 1);
+    // A negative index is out of range too.
+    let el = El {
+        name: "face",
+        props: vec![("vertex_indices", "int", Some("uchar"))],
+        rows: vec![vec![vec![0., 1., 2.]], vec![vec![0., -1., 2.]]],
+    };
+    let s = parse(&file(Enc::Little, &[vertex_element(&CUBE, false), el]));
+    assert_eq!(s.triangles(), 1);
+    assert_eq!(s.warnings.invalid, 1);
+    // Every face bad: an error, not an empty picture.
+    let bad = vec![vec![0, 1, 99]];
+    let bytes = file(
+        Enc::Ascii,
+        &[
+            vertex_element(&CUBE, false),
+            face_element(&bad, "uchar", "int"),
+        ],
+    );
+    assert!(matches!(read(&bytes, 10).unwrap_err(), Error::Invalid(_)));
+    // Vertices without a y.
+    let mut v = vertex_element(&CUBE, false);
+    v.props.remove(1);
+    v.rows.iter_mut().for_each(|r| drop(r.remove(1)));
+    let bytes = file(
+        Enc::Ascii,
+        &[v, face_element(&cube_faces(), "uchar", "int")],
+    );
+    assert!(matches!(read(&bytes, 10).unwrap_err(), Error::Invalid(_)));
+}
+
+const SQUARE_HEADER: &str = "ply\nformat ascii 1.0\nelement vertex 4\nproperty float x\n\
+    property float y\nproperty float z\nelement face 2\nproperty list uchar int vertex_indices\n\
+    end_header\n";
+
+#[test]
+fn an_ascii_line_with_more_values_than_the_header_names_is_one_record() {
+    // Each face line has three values the header does not declare, as the
+    // VCG library wrote its wedge colours.
+    let extra =
+        format!("{SQUARE_HEADER}0 0 0\n1 0 0\n1 1 0\n0 1 0\n3 0 1 2 9 9 9\n3 0 2 3 9 9 9\n");
+    let s = parse(extra.as_bytes());
+    assert_eq!(s.triangles(), 2);
+    assert!(!s.warnings.damaged);
+    assert_eq!(s.warnings.invalid, 0);
+    // A file that is right as a stream of values is read as one: records
+    // that share a line or run over several.
+    let stream = format!("{SQUARE_HEADER}0 0 0 1 0 0\n1 1 0 0 1 0\n3 0 1 2 3 0 2\n3\n");
+    let s = parse(stream.as_bytes());
+    assert_eq!(s.triangles(), 2);
+    assert!(!s.warnings.damaged);
+}
+
+#[test]
+fn a_file_that_ends_early_gives_what_it_holds() {
+    let whole = cube(Enc::Little);
+    // Cut in the faces: the first faces are kept.
+    let s = parse(&whole[..whole.len() - 7]);
+    assert!(s.warnings.damaged);
+    assert!(
+        s.triangles() >= 8 && s.triangles() < 12,
+        "{}",
+        s.triangles()
+    );
+    // Cut in the vertices: no face can be read.
+    let cut = whole.len() - 6 * 8 - 8 * 15;
+    assert!(read(&whole[..cut], 100).is_err());
+}
+
+#[test]
+fn coordinates_that_are_not_numbers_or_not_sizes_drop_their_faces() {
+    for bad in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY, 1e300, -1e13] {
+        let mut points = CUBE.to_vec();
+        points[6] = [bad, 0.0, 0.0];
+        let s = parse(&file(
+            Enc::Little,
+            &[
+                vertex_element(&points, false),
+                face_element(&cube_faces(), "uchar", "int"),
+            ],
+        ));
+        // The three quads at corner 6 are gone, three are whole.
+        assert_eq!(s.triangles(), 6, "{bad}");
+        assert_eq!(s.warnings.invalid, 3, "{bad}");
+        assert_sound(&s);
+    }
+}
+
+#[test]
+fn the_budget_stops_the_reading() {
+    let s = read(&cube(Enc::Ascii), 5).unwrap();
+    assert_eq!(s.triangles(), 5);
+    assert_eq!(s.warnings.truncated, 1);
+    assert_eq!(read(&cube(Enc::Ascii), 12).unwrap().warnings.truncated, 0);
+}
+
+#[test]
+fn counts_that_the_data_cannot_hold_are_cut_to_the_data() {
+    // Four billion vertices and faces, a few bytes of data.
+    for (enc, tail) in [
+        (Enc::Ascii, "0 0 0\n1 0 0\n0 1 0\n3 0 1 2\n"),
+        (Enc::Little, ""),
+    ] {
+        let mut text = format!(
+            "ply\nformat {} 1.0\nelement vertex 4294967295\nproperty float x\nproperty float y\nproperty float z\nelement face 18446744073709551615\nproperty list uchar int vertex_indices\nend_header\n",
+            if enc == Enc::Ascii { "ascii" } else { "binary_little_endian" },
+        )
+        .into_bytes();
+        text.extend_from_slice(tail.as_bytes());
+        let started = std::time::Instant::now();
+        let r = read(&text, 1000);
+        assert!(started.elapsed() < Duration::from_secs(5));
+        if let Ok(s) = r {
+            assert_sound(&s);
+            assert!(s.warnings.damaged);
+        }
+    }
+    // A list that claims four billion items.
+    let mut b = b"ply\nformat binary_little_endian 1.0\nelement vertex 3\nproperty float x\nproperty float y\nproperty float z\nelement face 2\nproperty list uint int vertex_indices\nend_header\n".to_vec();
+    for p in &TETRA[..3] {
+        for v in p {
+            b.extend_from_slice(&(*v as f32).to_le_bytes());
+        }
+    }
+    b.extend_from_slice(&u32::MAX.to_le_bytes());
+    b.extend_from_slice(&[0; 12]);
+    let r = within(Duration::from_secs(5), "the long list", || read(&b, 1000));
+    assert!(r.is_err());
+    // An element with no properties and four billion rows has nothing to read.
+    let b = b"ply\nformat binary_little_endian 1.0\nelement junk 4000000000\nelement vertex 0\nproperty float x\nproperty float y\nproperty float z\nend_header\n";
+    within(Duration::from_secs(5), "the empty element", || read(b, 10)).unwrap_err();
+}
+
+#[test]
+fn headers_with_too_much_in_them_are_refused() {
+    let mut text = String::from("ply\nformat ascii 1.0\nelement vertex 1\n");
+    for k in 0..100_000 {
+        writeln!(text, "property float p{k}").unwrap();
+    }
+    text.push_str("end_header\n0\n");
+    let r = within(Duration::from_secs(5), "many properties", || {
+        read(text.as_bytes(), 10)
+    });
+    assert!(r.is_err());
+    let mut text = String::from("ply\nformat ascii 1.0\n");
+    for k in 0..10_000 {
+        writeln!(text, "element e{k} 1\nproperty float x").unwrap();
+    }
+    text.push_str("end_header\n");
+    assert!(read(text.as_bytes(), 10).is_err());
+    // A header that never ends.
+    let mut text = String::from("ply\nformat ascii 1.0\n");
+    text.push_str(&"comment ".repeat(100_000));
+    assert_eq!(read(text.as_bytes(), 10).unwrap_err(), Error::NotPly);
+}
+
+#[test]
+fn a_polygon_of_a_million_corners_is_cut_at_the_budget_in_linear_time() {
+    let n = 1_000_000usize;
+    let points: Vec<P> = (0..n).map(|k| [k as f64, (k % 2) as f64, 0.0]).collect();
+    let face = El {
+        name: "face",
+        props: vec![("vertex_indices", "int", Some("uint"))],
+        rows: vec![vec![(0..n).map(|k| k as f64).collect()]],
+    };
+    let bytes = file(Enc::Little, &[vertex_element(&points, false), face]);
+    let s = within(Duration::from_secs(20), "the million-gon", || {
+        read(&bytes, 200_000).unwrap()
+    });
+    assert_eq!(s.triangles(), 200_000);
+    assert_eq!(s.warnings.truncated, 1);
+    assert_sound(&s);
+}
+
+#[test]
+fn a_file_cut_anywhere_or_changed_anywhere_is_read_soundly() {
+    for enc in [Enc::Ascii, Enc::Little, Enc::Big] {
+        sweep(&cube(enc), |b| read(b, 1000).ok());
+    }
+}
diff --git a/crates/exav-render/tests/raw.rs b/crates/exav-render/tests/raw.rs
new file mode 100644
index 00000000..50d2fe98
--- /dev/null
+++ b/crates/exav-render/tests/raw.rs
@@ -0,0 +1,705 @@
+//! Camera RAW files, shown by their embedded previews: synthetic containers of
+//! each family (tests/fixtures/raw/make.py), whose previews are four colour
+//! quadrants, so that what was chosen and how it was turned shows in the
+//! pixels. Hostile files are those fixtures with a field patched.
+#![cfg(feature = "raw")]
+
+use std::cell::Cell;
+use std::sync::Once;
+use std::time::{Duration, Instant};
+
+use exav_render::image::raw::{self, Kind};
+use exav_render::image::{DECODE_MAX, Error, Format, Pixels, Samples, decode, decode_any};
+
+fn fixture(name: &str) -> Vec<u8> {
+    let path = format!("{}/tests/fixtures/raw/{name}", env!("CARGO_MANIFEST_DIR"));
+    std::fs::read(&path).unwrap_or_else(|e| panic!("{path}: {e}"))
+}
+
+thread_local!(static PANICKED: Cell<bool> = const { Cell::new(false) });
+
+/// Records a panic on this thread, which the readers would otherwise turn
+/// into `Undecodable` without a trace.
+fn watch_panics() {
+    static HOOK: Once = Once::new();
+    HOOK.call_once(|| {
+        let previous = std::panic::take_hook();
+        std::panic::set_hook(Box::new(move |info| {
+            PANICKED.with(|p| p.set(true));
+            previous(info);
+        }));
+    });
+    PANICKED.with(|p| p.set(false));
+}
+
+fn panicked() -> bool {
+    PANICKED.with(|p| p.get())
+}
+
+fn rgb(p: &Pixels) -> &[u8] {
+    assert_eq!(p.channels.count(), 3, "RGB pixels expected");
+    match &p.samples {
+        Samples::U8(v) => v,
+        other => panic!("8-bit samples expected, got {other:?}"),
+    }
+}
+
+/// The pixel at the middle of quadrant (`qx`, `qy`), each 0 or 1.
+fn quadrant(p: &Pixels, qx: usize, qy: usize) -> [u8; 3] {
+    let (w, h) = (p.width as usize, p.height as usize);
+    let (x, y) = (w / 4 + qx * w / 2, h / 4 + qy * h / 2);
+    let at = (y * w + x) * 3;
+    rgb(p)[at..at + 3].try_into().unwrap()
+}
+
+const RED: [u8; 3] = [255, 0, 0];
+const GREEN: [u8; 3] = [0, 255, 0];
+const BLUE: [u8; 3] = [0, 0, 255];
+const YELLOW: [u8; 3] = [255, 255, 0];
+
+/// Within JPEG's loss of the four colours.
+fn is_colour(got: [u8; 3], want: [u8; 3]) -> bool {
+    got.iter().zip(want).all(|(&g, w)| g.abs_diff(w) < 40)
+}
+
+/// The quadrants as seen, top left, top right, bottom left, bottom right.
+fn quadrants(p: &Pixels) -> [[u8; 3]; 4] {
+    [
+        quadrant(p, 0, 0),
+        quadrant(p, 1, 0),
+        quadrant(p, 0, 1),
+        quadrant(p, 1, 1),
+    ]
+}
+
+fn assert_quadrants(p: &Pixels, want: [[u8; 3]; 4], what: &str) {
+    let got = quadrants(p);
+    for (g, w) in got.iter().zip(want) {
+        assert!(is_colour(*g, w), "{what}: got {got:?}, want {want:?}");
+    }
+}
+
+const AS_STORED: [[u8; 3]; 4] = [RED, GREEN, BLUE, YELLOW];
+
+fn open(name: &str) -> (Pixels, raw::Info) {
+    raw::preview(&fixture(name), DECODE_MAX).unwrap_or_else(|e| panic!("{name}: {e}"))
+}
+
+#[test]
+fn every_family_is_detected_by_its_bytes() {
+    let cases = [
+        ("preview-jpeg.dng", Kind::Dng),
+        ("preview-rgb.dng", Kind::Dng),
+        ("no-preview.dng", Kind::Dng),
+        ("canon.cr2", Kind::Cr2),
+        ("canon-o1.cr3", Kind::Cr3),
+        ("canon-heif.cr3", Kind::Cr3),
+        ("canon.crw", Kind::Crw),
+        ("nikon.nef", Kind::TiffEp),
+        ("sony.arw", Kind::TiffEp),
+        ("pentax.pef", Kind::TiffEp),
+        ("samsung.srw", Kind::TiffEp),
+        ("hasselblad.3fr", Kind::TiffEp),
+        ("sony-thumbnail.srf", Kind::TiffEp),
+        ("kodak16-be.dcr", Kind::TiffEp),
+        ("olympus.orf", Kind::Orf),
+        ("olympus-rs.orf", Kind::Orf),
+        ("olympus-be.orf", Kind::Orf),
+        ("panasonic.rw2", Kind::Rw2),
+        ("panasonic-no-preview.rw2", Kind::Rw2),
+        ("phaseone.iiq", Kind::Iiq),
+        ("fujifilm-o1.raf", Kind::Raf),
+        ("sigma.x3f", Kind::X3f),
+        ("minolta.mrw", Kind::Mrw),
+    ];
+    for (file, kind) in cases {
+        assert_eq!(raw::detect(&fixture(file)), Some(kind), "{file}");
+    }
+}
+
+/// What no maker's name goes with, TIFF-structured, is RAW by its sensor data
+/// alone: each compression the makers number, a colour filter array by its
+/// photometric or its tags, and the DNGPrivateData tag.
+#[test]
+fn sensor_data_alone_makes_a_tiff_a_raw_file() {
+    let files = [
+        "compression-99.tif",
+        "compression-32767.tif",
+        "compression-32769.tif",
+        "compression-32772.tif",
+        "compression-34713.tif",
+        "compression-65000.tif",
+        "compression-65535.tif",
+        "photometric-cfa-only.tif",
+        "cfa-tags-only.tif",
+        "private-data-only.tif",
+    ];
+    for file in files {
+        let data = fixture(file);
+        assert_eq!(raw::detect(&data), Some(Kind::TiffEp), "{file}");
+        let (p, info) = open(file);
+        assert_eq!((p.width, p.height, info.jpeg), (16, 12, false), "{file}");
+    }
+    // The same file without its sensor data is the TIFF it looks like.
+    assert_eq!(raw::detect(&fixture("plain.tif")), None);
+}
+
+/// A camera maker's name next to a camera's structure is enough, whatever the
+/// case it is written in, for each maker; another name is not.
+#[test]
+fn a_camera_makers_name_beside_a_subifd_makes_a_tiff_a_raw_file() {
+    let base = fixture("hasselblad.3fr");
+    let ifd0 = first_ifd(&base);
+    let make = entry(&base, ifd0, 0x10F);
+    let at = u32_at(&base, make + 8, true);
+    let makes = [
+        "CANON",
+        "Nikon",
+        "SONY",
+        "olympus",
+        "PANASONIC",
+        "Leica",
+        "FUJIFILM",
+        "PENTAX",
+        "RICOH",
+        "SAMSUNG",
+        "KODAK",
+        "EPSON",
+        "MINOLTA",
+        "MAMIYA",
+        "LEAF",
+        "PHASE ONE",
+        "HASSELBLAD",
+        "CASIO",
+        "SIGMA",
+    ];
+    for name in makes {
+        let mut d = base.clone();
+        d[at..at + 11].fill(0);
+        d[at..at + name.len()].copy_from_slice(name.as_bytes());
+        assert_eq!(raw::detect(&d), Some(Kind::TiffEp), "{name}");
+    }
+    for name in ["ACME", "Adobe", "GIMP", ""] {
+        let mut d = base.clone();
+        d[at..at + 11].fill(0);
+        d[at..at + name.len()].copy_from_slice(name.as_bytes());
+        assert_eq!(raw::detect(&d), None, "{name}");
+    }
+}
+
+/// Only a few JPEG start markers are tried, so that a file of nothing but
+/// those costs a bounded time: a preview the directories name is found
+/// whatever comes before it.
+#[test]
+fn a_preview_the_directories_name_is_found_past_a_crowd_of_start_markers() {
+    let (p, info) = open("many-markers.dng");
+    assert_eq!((p.width, p.height, info.found), (64, 48, 1));
+}
+
+/// The file name's extension says nothing: only the bytes are read.
+#[test]
+fn detection_ignores_the_name_and_the_tail() {
+    // A prefix is all a signature needs, and a cut-off file still says what
+    // it is.
+    assert_eq!(
+        raw::detect(&fixture("fujifilm-o1.raf")[..40]),
+        Some(Kind::Raf)
+    );
+    assert_eq!(raw::detect(&fixture("canon-o1.cr3")[..40]), Some(Kind::Cr3));
+    assert_eq!(raw::detect(b""), None);
+    assert_eq!(raw::detect(b"II*\0"), None);
+}
+
+/// A TIFF stays a TIFF: the TIFF decoder reads it, `raw` does not claim it,
+/// even with a camera maker's name in it.
+#[test]
+fn a_plain_tiff_is_not_a_raw_file() {
+    for file in ["plain.tif", "plain-with-make.tif"] {
+        let tiff = fixture(file);
+        assert_eq!(raw::detect(&tiff), None, "{file}");
+        assert_eq!(Format::detect(&tiff), Some(Format::Tiff), "{file}");
+        let via_any = decode_any(&tiff, DECODE_MAX).unwrap();
+        let direct = decode(&tiff, Format::Tiff, DECODE_MAX).unwrap();
+        assert_eq!(via_any, direct, "{file}");
+        assert_eq!((via_any.width, via_any.height), (16, 12), "{file}");
+        assert_quadrants(&via_any, AS_STORED, file);
+    }
+}
+
+/// A camera's structure and no preview, with nothing else to say it is RAW:
+/// `raw` leaves it to the TIFF decoder, which is what the file may be.
+#[test]
+fn a_tiff_with_a_camera_structure_and_no_preview_is_left_to_the_tiff_decoder() {
+    let tiff = fixture("camera-structure-no-preview.tif");
+    assert_eq!(raw::detect(&tiff), Some(Kind::TiffEp));
+    assert_eq!(raw::decode(&tiff, DECODE_MAX), Err(Error::Unsupported));
+    assert_eq!(
+        decode_any(&tiff, DECODE_MAX),
+        decode(&tiff, Format::Tiff, DECODE_MAX)
+    );
+    assert_ne!(decode_any(&tiff, DECODE_MAX), Err(Error::NoPreview));
+}
+
+#[test]
+fn a_dng_shows_its_largest_preview() {
+    // A 16 by 12 uncompressed thumbnail in the first directory, a 64 by 48
+    // JPEG in a SubIFD, sensor data (lossless JPEG) in another.
+    let (p, info) = open("preview-jpeg.dng");
+    assert_eq!((p.width, p.height), (64, 48));
+    assert_eq!(
+        info,
+        raw::Info {
+            kind: Kind::Dng,
+            width: 64,
+            height: 48,
+            orientation: 1,
+            jpeg: true,
+            found: 2,
+        }
+    );
+    assert_quadrants(&p, AS_STORED, "preview-jpeg.dng");
+}
+
+#[test]
+fn decode_any_shows_a_tiff_structured_raw_by_its_preview() {
+    // `Format::detect` reads the first bytes as TIFF, as `exav-imagehash`
+    // must; `decode_any` is the one that knows the file is a RAW.
+    for (file, size) in [
+        ("preview-jpeg.dng", (64, 48)),
+        ("nikon.nef", (80, 48)),
+        ("sony.arw", (72, 48)),
+        ("canon.cr2", (96, 64)),
+        ("pentax.pef", (88, 56)),
+    ] {
+        let data = fixture(file);
+        assert_eq!(Format::detect(&data), Some(Format::Tiff), "{file}");
+        let p = decode_any(&data, DECODE_MAX).unwrap_or_else(|e| panic!("{file}: {e}"));
+        assert_eq!((p.width, p.height), size, "{file}");
+        assert_quadrants(&p, AS_STORED, file);
+    }
+    // The formats no TIFF decoder reads (`detect` knows none of them).
+    for (file, size) in [
+        ("olympus.orf", (104, 72)),
+        ("panasonic.rw2", (112, 64)),
+        ("fujifilm-o1.raf", (64, 48)),
+        ("canon-o1.cr3", (128, 96)),
+        ("sigma.x3f", (80, 56)),
+        ("canon.crw", (72, 48)),
+    ] {
+        let data = fixture(file);
+        assert_eq!(Format::detect(&data), None, "{file}");
+        let p = decode_any(&data, DECODE_MAX).unwrap_or_else(|e| panic!("{file}: {e}"));
+        assert_eq!((p.width, p.height), size, "{file}");
+        assert_quadrants(&p, AS_STORED, file);
+    }
+}
+
+/// The families keep their previews in different places: a SubIFD, the first
+/// directory, a maker note, a tag nothing documents, a box, a section.
+#[test]
+fn each_family_gives_the_preview_where_it_keeps_it() {
+    let cases = [
+        ("canon.cr2", 96, 64, true),
+        ("nikon.nef", 80, 48, true),
+        ("sony.arw", 72, 48, true),
+        ("pentax.pef", 88, 56, true),
+        ("samsung.srw", 56, 40, true),
+        ("olympus.orf", 104, 72, true),
+        ("olympus-rs.orf", 104, 72, true),
+        ("olympus-be.orf", 104, 72, true),
+        ("panasonic.rw2", 112, 64, true),
+        ("fujifilm-o1.raf", 64, 48, true),
+        ("canon-o1.cr3", 128, 96, true),
+        ("sigma.x3f", 80, 56, true),
+        ("canon.crw", 72, 48, true),
+        ("hasselblad.3fr", 32, 24, false),
+        ("phaseone.iiq", 24, 16, false),
+    ];
+    for (file, w, h, jpeg) in cases {
+        let (p, info) = open(file);
+        assert_eq!((info.width, info.height, info.jpeg), (w, h, jpeg), "{file}");
+        assert_eq!((p.width, p.height), (w, h), "{file}");
+        assert_quadrants(&p, AS_STORED, file);
+    }
+}
+
+#[test]
+fn a_progressive_preview_decodes() {
+    let (p, _) = open("progressive.dng");
+    assert_eq!((p.width, p.height), (48, 32));
+    assert_quadrants(&p, AS_STORED, "progressive.dng");
+}
+
+#[test]
+fn uncompressed_previews_are_read_whatever_their_depth_and_byte_order() {
+    let (p, info) = open("preview-grey.dng");
+    assert_eq!((p.width, p.height, p.channels.count()), (16, 12, 1));
+    assert!(!info.jpeg);
+    for file in ["kodak16-be.dcr", "kodak16-le.dcr"] {
+        let (p, info) = open(file);
+        assert_eq!((p.width, p.height), (16, 12), "{file}");
+        assert!(!info.jpeg, "{file}");
+        assert_quadrants(&p, AS_STORED, file);
+        // The high byte of each 16-bit sample.
+        assert!(matches!(&p.samples, Samples::U8(_)), "{file}");
+    }
+}
+
+/// Lossy DNG compresses its sensor data as baseline JPEG, which is no
+/// preview, here larger than the real one.
+#[test]
+fn sensor_data_is_not_taken_for_a_preview_even_as_a_baseline_jpeg() {
+    let (p, info) = open("lossy-linear.dng");
+    assert_eq!((p.width, p.height), (48, 32));
+    assert_eq!(info.found, 1);
+}
+
+/// Where the preview is turned by the orientation of the file: the first
+/// directory's, or the JPEG's own Exif when it has one.
+#[test]
+fn the_orientation_is_applied_from_where_it_is_written() {
+    // IFD0 says 6 (a rotation a quarter turn clockwise) for a RGB preview.
+    let (p, info) = open("preview-rgb.dng");
+    assert_eq!((info.width, info.height, info.orientation), (32, 24, 6));
+    assert_eq!((p.width, p.height), (24, 32));
+    assert_quadrants(&p, [BLUE, RED, YELLOW, GREEN], "preview-rgb.dng");
+    // The JPEG's own Exif says 6 and IFD0 says 3: the JPEG's is the one.
+    let (p, info) = open("orientation-own.dng");
+    assert_eq!(info.orientation, 6);
+    assert_quadrants(&p, [BLUE, RED, YELLOW, GREEN], "orientation-own.dng");
+    // A CR3 keeps it in the CMT1 box of `moov`, not in its JPEGs.
+    let (p, info) = open("canon-o8.cr3");
+    assert_eq!(info.orientation, 8);
+    assert_eq!((p.width, p.height), (96, 128));
+    assert_quadrants(&p, [GREEN, YELLOW, RED, BLUE], "canon-o8.cr3");
+    assert_eq!(open("canon-o1.cr3").1.orientation, 1);
+}
+
+/// All eight, from the JPEG's own Exif, against what the Exif specification
+/// says each value is.
+#[test]
+fn all_eight_orientations_turn_the_picture_as_exif_defines_them() {
+    let [tl, tr, bl, br] = AS_STORED;
+    // The quadrants as seen after each value, row by row.
+    let want = [
+        [tl, tr, bl, br],
+        [tr, tl, br, bl],
+        [br, bl, tr, tl],
+        [bl, br, tl, tr],
+        [tl, bl, tr, br],
+        [bl, tl, br, tr],
+        [br, tr, bl, tl],
+        [tr, br, tl, bl],
+    ];
+    for (i, want) in want.into_iter().enumerate() {
+        let o = i + 1;
+        let (p, info) = open(&format!("fujifilm-o{o}.raf"));
+        assert_eq!(info.orientation as usize, o);
+        let swapped = o >= 5;
+        let size = if swapped { (48, 64) } else { (64, 48) };
+        assert_eq!((p.width, p.height), size, "orientation {o}");
+        assert_quadrants(&p, want, &format!("orientation {o}"));
+    }
+}
+
+/// A CR3 holds a thumbnail (THMB), a preview (PRVW) and the full-size JPEG
+/// at the start of `mdat`, whose box has a 64-bit size.
+#[test]
+fn a_cr3_gives_the_full_size_jpeg_when_the_budget_allows_it() {
+    let data = fixture("canon-o1.cr3");
+    let (p, info) = raw::preview(&data, DECODE_MAX).unwrap();
+    assert_eq!((info.kind, info.found, info.jpeg), (Kind::Cr3, 3, true));
+    assert_eq!((p.width, p.height), (128, 96));
+    // 4 bytes a pixel: 96 by 64 fits, 128 by 96 does not.
+    let (p, info) = raw::preview(&data, 96 * 64 * 4).unwrap();
+    assert_eq!((info.found, p.width, p.height), (3, 96, 64));
+    let (p, _) = raw::preview(&data, 16 * 12 * 4).unwrap();
+    assert_eq!((p.width, p.height), (16, 12));
+}
+
+#[test]
+fn a_file_with_no_preview_says_so() {
+    for file in [
+        "no-preview.dng",
+        "panasonic-no-preview.rw2",
+        "minolta.mrw",
+        "canon-heif.cr3",
+    ] {
+        let data = fixture(file);
+        assert!(raw::detect(&data).is_some(), "{file}");
+        assert_eq!(
+            raw::decode(&data, DECODE_MAX),
+            Err(Error::NoPreview),
+            "{file}"
+        );
+        assert_eq!(
+            decode_any(&data, DECODE_MAX),
+            Err(Error::NoPreview),
+            "{file}"
+        );
+    }
+    assert_eq!(
+        Error::NoPreview.to_string(),
+        "camera RAW file with no preview to show"
+    );
+}
+
+#[test]
+fn what_is_not_a_raw_file_is_unsupported() {
+    assert_eq!(raw::decode(b"", DECODE_MAX), Err(Error::Unsupported));
+    assert_eq!(
+        raw::decode(b"just some text, not a camera file", DECODE_MAX),
+        Err(Error::Unsupported)
+    );
+    // A JPEG is an image, not a RAW file with a preview.
+    assert_eq!(
+        raw::decode(&[0xFF, 0xD8, 0xFF, 0xE0, 0, 2], DECODE_MAX),
+        Err(Error::Unsupported)
+    );
+}
+
+/// The budget is on what the page holds, as RGBA (four bytes a pixel, six when
+/// the picture must be turned): a preview over it is passed by for a smaller
+/// one, and the error says it is the size when there is none.
+#[test]
+fn a_preview_over_the_budget_gives_way_to_a_smaller_one() {
+    let data = fixture("preview-jpeg.dng");
+    // 64 by 48 is 12,288 bytes; 16 by 12 is 768.
+    let (p, _) = raw::preview(&data, 12_288).unwrap();
+    assert_eq!((p.width, p.height), (64, 48));
+    let (p, info) = raw::preview(&data, 12_287).unwrap();
+    assert_eq!((p.width, p.height), (16, 12));
+    assert!(!info.jpeg);
+    assert_eq!(raw::decode(&data, 767), Err(Error::TooLarge));
+    assert_eq!(decode_any(&data, 767), Err(Error::TooLarge));
+    // Turned, the same preview needs six bytes a pixel.
+    let turned = fixture("preview-rgb.dng");
+    assert_eq!(raw::preview(&turned, 32 * 24 * 6).unwrap().1.width, 32);
+    assert_eq!(raw::preview(&turned, 32 * 24 * 6 - 1).unwrap().1.width, 16);
+    // A limit over the decoder's own is the decoder's.
+    assert!(raw::decode(&data, u64::MAX).is_ok());
+}
+
+fn u16_at(d: &[u8], at: usize, le: bool) -> usize {
+    let b = [d[at], d[at + 1]];
+    usize::from(if le {
+        u16::from_le_bytes(b)
+    } else {
+        u16::from_be_bytes(b)
+    })
+}
+
+fn u32_at(d: &[u8], at: usize, le: bool) -> usize {
+    let b = [d[at], d[at + 1], d[at + 2], d[at + 3]];
+    (if le {
+        u32::from_le_bytes(b)
+    } else {
+        u32::from_be_bytes(b)
+    }) as usize
+}
+
+fn put_u32(d: &mut [u8], at: usize, v: u32, le: bool) {
+    d[at..at + 4].copy_from_slice(&if le { v.to_le_bytes() } else { v.to_be_bytes() });
+}
+
+/// Offsets of the entries (tag, offset of the entry) of the directory at `ifd`.
+fn entries(d: &[u8], ifd: usize) -> Vec<(u16, usize)> {
+    let le = d[0] == b'I';
+    (0..u16_at(d, ifd, le))
+        .map(|k| {
+            let at = ifd + 2 + k * 12;
+            (u16_at(d, at, le) as u16, at)
+        })
+        .collect()
+}
+
+fn first_ifd(d: &[u8]) -> usize {
+    u32_at(d, 4, d[0] == b'I')
+}
+
+fn entry(d: &[u8], ifd: usize, tag: u16) -> usize {
+    entries(d, ifd)
+        .into_iter()
+        .find(|e| e.0 == tag)
+        .unwrap_or_else(|| panic!("no tag {tag:#x}"))
+        .1
+}
+
+/// No hostile input may hang or panic: each of these has some preview or
+/// none, and answers in a bounded time.
+fn assert_survives(data: &[u8], what: &str) -> Result<(Pixels, raw::Info), Error> {
+    watch_panics();
+    let started = Instant::now();
+    let r = raw::preview(data, 64 << 20);
+    assert!(!panicked(), "{what}: panicked");
+    assert!(started.elapsed() < Duration::from_secs(2), "{what}: slow");
+    r
+}
+
+#[test]
+fn a_chain_of_directories_that_loops_is_read_once() {
+    // IFD0 of the CR2 chained to itself.
+    let mut d = fixture("canon.cr2");
+    let ifd0 = first_ifd(&d);
+    let le = true;
+    let next = ifd0 + 2 + u16_at(&d, ifd0, le) * 12;
+    put_u32(&mut d, next, ifd0 as u32, le);
+    let (p, info) = assert_survives(&d, "chain loop").unwrap();
+    assert_eq!((p.width, p.height), (96, 64));
+    // The JPEG of the directory, once, and the thumbnail found by its marker.
+    assert_eq!(info.found, 2);
+    // And the SubIFD list of a DNG pointing back at its first directory.
+    let mut d = fixture("preview-jpeg.dng");
+    let ifd0 = first_ifd(&d);
+    let sub = entry(&d, ifd0, 0x14A);
+    let list = u32_at(&d, sub + 8, true);
+    put_u32(&mut d, list, ifd0 as u32, true);
+    let (p, info) = assert_survives(&d, "subifd loop").unwrap();
+    assert_eq!((p.width, p.height), (64, 48));
+    // The first directory's thumbnail, once, and the JPEG.
+    assert_eq!(info.found, 2);
+}
+
+#[test]
+fn offsets_and_counts_past_the_data_are_refused_not_followed() {
+    // A strip that starts past the end: the other preview is used.
+    let mut d = fixture("preview-rgb.dng");
+    let ifd0 = first_ifd(&d);
+    let strips = entry(&d, ifd0, 0x111);
+    put_u32(&mut d, strips + 8, u32::MAX - 3, false);
+    let (p, info) = assert_survives(&d, "strip offset").unwrap();
+    assert_eq!(info.width, 32);
+    assert_eq!(p.width, 24);
+    // A strip whose length runs past the end of the data.
+    let mut d = fixture("preview-rgb.dng");
+    let counts = entry(&d, ifd0, 0x117);
+    put_u32(&mut d, counts + 8, u32::MAX, false);
+    let (_, info) = assert_survives(&d, "strip length").unwrap();
+    assert_eq!(info.width, 32);
+    // A count of values that does not fit: the entry is not read.
+    let mut d = fixture("preview-rgb.dng");
+    let bits = entry(&d, ifd0, 0x102);
+    put_u32(&mut d, bits + 4, u32::MAX, false);
+    let _ = assert_survives(&d, "count");
+    // Every preview's strips gone: there is none, which is no crash.
+    let mut d = fixture("preview-rgb.dng");
+    for ifd in [ifd0] {
+        for tag in [0x111, 0x117] {
+            let e = entry(&d, ifd, tag);
+            put_u32(&mut d, e + 8, u32::MAX - 3, false);
+        }
+    }
+    let sub_list = u32_at(&d, entry(&d, ifd0, 0x14A) + 8, false);
+    for k in 0..2 {
+        let sub = u32_at(&d, sub_list + 4 * k, false);
+        for tag in [0x111, 0x117] {
+            if let Some(e) = entries(&d, sub).into_iter().find(|e| e.0 == tag) {
+                put_u32(&mut d, e.1 + 8, u32::MAX - 3, false);
+            }
+        }
+    }
+    assert_eq!(
+        assert_survives(&d, "no strips").err(),
+        Some(Error::NoPreview)
+    );
+}
+
+#[test]
+fn a_directory_with_more_entries_than_the_file_holds_is_skipped() {
+    let mut d = fixture("canon.cr2");
+    let ifd0 = first_ifd(&d);
+    d[ifd0..ifd0 + 2].copy_from_slice(&u16::MAX.to_le_bytes());
+    // The first directory cannot be read: the JPEG streams are still found
+    // where they lie.
+    let (p, _) = assert_survives(&d, "entry count").unwrap();
+    assert_eq!((p.width, p.height), (96, 64));
+}
+
+#[test]
+fn a_preview_declared_enormous_is_not_allocated() {
+    // The uncompressed preview claims 65,000 by 65,000 and has a few bytes.
+    let mut d = fixture("preview-rgb.dng");
+    let ifd0 = first_ifd(&d);
+    for tag in [0x100, 0x101] {
+        let e = entry(&d, ifd0, tag);
+        put_u32(&mut d, e + 8, 65_000, false);
+    }
+    let (_, info) = assert_survives(&d, "declared size").unwrap();
+    assert_eq!(info.width, 32);
+    // JPEG streams too: a frame header that says 65,535 by 65,535.
+    let mut d = fixture("fujifilm-o1.raf");
+    let sof = d.array_windows().position(|w| *w == [0xFF, 0xC0]).unwrap();
+    d[sof + 5..sof + 9].copy_from_slice(&[0xFF, 0xFF, 0xFF, 0xFF]);
+    // Past a limit that is the caller's, it is a size; past the decoder's own,
+    // the image is undecodable.
+    assert_eq!(
+        assert_survives(&d, "frame size").err(),
+        Some(Error::TooLarge)
+    );
+    assert_eq!(raw::decode(&d, DECODE_MAX).err(), Some(Error::Undecodable));
+}
+
+/// An uncompressed preview is read when it is stored as TIFF stores it,
+/// chunky: a planar one is not taken for one.
+#[test]
+fn a_planar_uncompressed_preview_is_not_read() {
+    let mut d = fixture("preview-rgb.dng");
+    let ifd0 = first_ifd(&d);
+    let sub_list = u32_at(&d, entry(&d, ifd0, 0x14A) + 8, false);
+    let sub = u32_at(&d, sub_list + 4, false);
+    let planar = entry(&d, sub, 0x11C);
+    d[planar + 8..planar + 10].copy_from_slice(&2u16.to_be_bytes());
+    let (_, info) = raw::preview(&d, DECODE_MAX).unwrap();
+    assert_eq!((info.width, info.found), (16, 1));
+}
+
+#[test]
+fn a_file_made_of_start_markers_costs_a_bounded_time() {
+    // A start marker every eight bytes, each followed by comment segments
+    // that run through every start marker after it and never reach a frame:
+    // read in full, each costs a walk of the rest of the file.
+    let mut d = b"FUJIFILMCCD-RAW ".to_vec();
+    d.extend_from_slice(&[0xFF, 0xD8, 0xFF, 0xFE, 0x00, 0x06, 0, 0].repeat(8 << 20));
+    let r = assert_survives(&d, "start markers");
+    assert_eq!(r.err(), Some(Error::NoPreview));
+}
+
+#[test]
+fn every_truncation_of_every_fixture_is_answered() {
+    watch_panics();
+    let dir = format!("{}/tests/fixtures/raw", env!("CARGO_MANIFEST_DIR"));
+    for entry in std::fs::read_dir(dir).unwrap() {
+        let path = entry.unwrap().path();
+        if path.extension().is_some_and(|e| e == "py") {
+            continue;
+        }
+        let data = std::fs::read(&path).unwrap();
+        for cut in (0..data.len()).step_by(7) {
+            let _ = raw::preview(&data[..cut], 64 << 20);
+            let _ = decode_any(&data[..cut], 64 << 20);
+            assert!(!panicked(), "{} cut at {cut}", path.display());
+        }
+    }
+}
+
+#[test]
+fn bytes_flipped_in_a_fixture_never_panic() {
+    watch_panics();
+    for file in [
+        "canon.cr2",
+        "nikon.nef",
+        "preview-jpeg.dng",
+        "canon-o8.cr3",
+        "olympus.orf",
+    ] {
+        let data = fixture(file);
+        for at in 0..data.len().min(400) {
+            for v in [0x00, 0xFF, 0x7F, 0x80] {
+                let mut d = data.clone();
+                d[at] = v;
+                let _ = raw::preview(&d, 64 << 20);
+                assert!(!panicked(), "{file} byte {at} = {v:#x}");
+            }
+        }
+    }
+}
diff --git a/crates/exav-render/tests/saturate.rs b/crates/exav-render/tests/saturate.rs
new file mode 100644
index 00000000..0b36e50c
--- /dev/null
+++ b/crates/exav-render/tests/saturate.rs
@@ -0,0 +1,294 @@
+//! Every fixture, with each length or count in turn set to an extreme.
+//!
+//! A file's header says how big its parts are and how many there are, and a
+//! file that lies about it is the oldest trick against a reader: the size
+//! becomes an allocation before a byte of the data has been seen, a count a
+//! loop. Fuzzing finds these by chance. This sweep is the deterministic
+//! version: for each fixture, at each position of its start, 4 bytes are
+//! overwritten with `0xFFFFFFFF` and with `0x7FFFFFFF`, and the file is read.
+//! None may hold more than a few times the file (measured as what the process
+//! has resident, where a request the reader never touches costs nothing),
+//! take seconds, or panic. `EXAV_DEBUG_SATURATE=full` takes more positions and
+//! values. A finding prints the fixture, the position and the value.
+
+#![cfg(all(
+    feature = "office-docs",
+    feature = "office-slides",
+    feature = "office-sheets"
+))]
+
+use std::io::Read;
+use std::path::{Path, PathBuf};
+use std::time::{Duration, Instant};
+
+/// What reading may hold over the size of the file.
+const RESIDENT_BASE: usize = 96 << 20;
+const RESIDENT_PER_BYTE: usize = 256;
+const SLOW: Duration = Duration::from_secs(4);
+/// What the converters are given to hold, so that holding more is theirs.
+const OFFICE_MEMORY: u64 = 32 << 20;
+
+fn walk_dir(dir: &Path, out: &mut Vec<PathBuf>) {
+    let Ok(rd) = std::fs::read_dir(dir) else {
+        return;
+    };
+    let mut entries: Vec<_> = rd.flatten().map(|e| e.path()).collect();
+    entries.sort();
+    for p in entries {
+        if p.is_dir() {
+            walk_dir(&p, out);
+        } else {
+            out.push(p);
+        }
+    }
+}
+
+/// A fixture's name without a `.gz`, and its bytes.
+fn load(p: &Path) -> Option<(String, Vec<u8>)> {
+    let raw = std::fs::read(p).ok()?;
+    let name = p.display().to_string();
+    match name.strip_suffix(".gz") {
+        Some(plain) => {
+            let mut out = vec![];
+            flate2::read::GzDecoder::new(&raw[..])
+                .take(8 << 20)
+                .read_to_end(&mut out)
+                .ok()?;
+            Some((plain.to_string(), out))
+        }
+        None => Some((name, raw)),
+    }
+}
+
+/// What reads a file, by its extension. `None` when nothing here does.
+type Reader = fn(&[u8]);
+
+fn reader_for(name: &str) -> Option<Reader> {
+    let ext = name.rsplit('.').next()?.to_ascii_lowercase();
+    Some(match ext.as_str() {
+        // Not JPEG XL: zenjxl-decoder sizes the buffer of each section of a frame
+        // from the length its table of contents declares, and zero-fills it
+        // before the data is looked at, so one header can take a gigabyte. The
+        // pixel and channel limits set in `image::jxl` do not reach it.
+        #[cfg(feature = "image")]
+        "png" | "jpg" | "jpeg" | "gif" | "tif" | "tiff" | "bmp" | "webp" | "ico" | "ppm"
+        | "pgm" | "pbm" | "pam" | "qoi" | "dds" | "ff" | "hdr" | "j2k" | "jp2" | "jb2" | "raf"
+        | "dng" | "cr2" | "cr3" | "nef" | "arw" | "orf" | "rw2" | "pef" | "dcr" => |d| {
+            let _ = exav_render::image::decode_any(d, 64 << 20);
+        },
+        #[cfg(feature = "stl")]
+        "stl" => |d| {
+            let _ = exav_render::stl::read(d, 1 << 20);
+        },
+        #[cfg(feature = "obj")]
+        "obj" => |d| {
+            let _ = exav_render::obj::read(d, 1 << 20);
+        },
+        #[cfg(feature = "ply")]
+        "ply" => |d| {
+            let _ = exav_render::ply::read(d, 1 << 20);
+        },
+        #[cfg(feature = "gltf")]
+        "gltf" | "glb" => |d| {
+            let _ = exav_render::gltf::read(d, 1 << 20);
+        },
+        #[cfg(feature = "ifc")]
+        "ifc" => |d| {
+            let _ = exav_render::ifc::read(d, &exav_render::ifc::Limits::default());
+        },
+        #[cfg(feature = "dwg")]
+        "dwg" => |d| {
+            let _ = exav_render::dwg::Document::parse(d).map(|doc| {
+                for l in doc.layouts() {
+                    let _ = doc.tessellate(Some(&l.name), None);
+                }
+            });
+        },
+        #[cfg(feature = "dwg")]
+        "dxf" => |d| {
+            let _ = exav_render::cad::read_dxf(d);
+        },
+        "ppt" => slides(exav_render::slides::Format::Ppt),
+        "odp" => slides(exav_render::slides::Format::Odp),
+        "fodp" => slides(exav_render::slides::Format::Fodp),
+        "key" => slides(exav_render::slides::Format::Keynote),
+        "odg" => slides(exav_render::slides::Format::Odg),
+        "fodg" => slides(exav_render::slides::Format::Fodg),
+        "vsdx" => slides(exav_render::slides::Format::Vsdx),
+        "xls" => sheets(exav_render::sheets::Format::Xls),
+        "ods" => sheets(exav_render::sheets::Format::Ods),
+        "fods" => sheets(exav_render::sheets::Format::Fods),
+        "numbers" => sheets(exav_render::sheets::Format::Numbers),
+        "doc" => docs(exav_render::docs::Format::Doc),
+        "odt" => docs(exav_render::docs::Format::Odt),
+        "fodt" => docs(exav_render::docs::Format::Fodt),
+        "rtf" => docs(exav_render::docs::Format::Rtf),
+        "pages" => docs(exav_render::docs::Format::Pages),
+        _ => return None,
+    })
+}
+
+fn slides(f: exav_render::slides::Format) -> Reader {
+    // A function pointer cannot capture, so one per format.
+    match f {
+        exav_render::slides::Format::Ppt => |d| conv_slides(d, exav_render::slides::Format::Ppt),
+        exav_render::slides::Format::Odp => |d| conv_slides(d, exav_render::slides::Format::Odp),
+        exav_render::slides::Format::Fodp => |d| conv_slides(d, exav_render::slides::Format::Fodp),
+        exav_render::slides::Format::Keynote => {
+            |d| conv_slides(d, exav_render::slides::Format::Keynote)
+        }
+        exav_render::slides::Format::Odg => |d| conv_slides(d, exav_render::slides::Format::Odg),
+        exav_render::slides::Format::Fodg => |d| conv_slides(d, exav_render::slides::Format::Fodg),
+        _ => |d| conv_slides(d, exav_render::slides::Format::Vsdx),
+    }
+}
+
+fn conv_slides(d: &[u8], f: exav_render::slides::Format) {
+    let l = exav_render::slides::Limits::default().with_max_memory(OFFICE_MEMORY);
+    let _ = exav_render::slides::convert(d, f, &l);
+}
+
+fn sheets(f: exav_render::sheets::Format) -> Reader {
+    match f {
+        exav_render::sheets::Format::Xls => |d| conv_sheets(d, exav_render::sheets::Format::Xls),
+        exav_render::sheets::Format::Ods => |d| conv_sheets(d, exav_render::sheets::Format::Ods),
+        exav_render::sheets::Format::Fods => |d| conv_sheets(d, exav_render::sheets::Format::Fods),
+        _ => |d| conv_sheets(d, exav_render::sheets::Format::Numbers),
+    }
+}
+
+fn conv_sheets(d: &[u8], f: exav_render::sheets::Format) {
+    let l = exav_render::sheets::Limits::default().with_max_memory(OFFICE_MEMORY);
+    let _ = exav_render::sheets::convert(d, f, &l);
+}
+
+fn docs(f: exav_render::docs::Format) -> Reader {
+    match f {
+        exav_render::docs::Format::Doc => |d| conv_docs(d, exav_render::docs::Format::Doc),
+        exav_render::docs::Format::Odt => |d| conv_docs(d, exav_render::docs::Format::Odt),
+        exav_render::docs::Format::Fodt => |d| conv_docs(d, exav_render::docs::Format::Fodt),
+        exav_render::docs::Format::Rtf => |d| conv_docs(d, exav_render::docs::Format::Rtf),
+        _ => |d| conv_docs(d, exav_render::docs::Format::Pages),
+    }
+}
+
+fn conv_docs(d: &[u8], f: exav_render::docs::Format) {
+    let l = exav_render::docs::Limits::default().with_max_memory(OFFICE_MEMORY);
+    let _ = exav_render::docs::convert(d, f, &l);
+}
+
+fn sweep() -> (Vec<usize>, Vec<Vec<u8>>) {
+    if std::env::var("EXAV_DEBUG_SATURATE").is_ok_and(|v| v == "full") {
+        let mut at: Vec<usize> = (0..256).collect();
+        at.extend((256..2048).step_by(2));
+        at.extend((2048..8192).step_by(8));
+        (
+            at,
+            vec![
+                vec![0xFF; 4],
+                vec![0xFF, 0xFF, 0xFF, 0x7F],
+                vec![0x00, 0x00, 0x00, 0x80],
+                vec![0x00, 0x00, 0x00, 0x10],
+                vec![0xFF; 2],
+                vec![0xFF; 8],
+            ],
+        )
+    } else {
+        let mut at: Vec<usize> = (0..64).collect();
+        at.extend((64..512).step_by(8));
+        (at, vec![vec![0xFF; 4], vec![0xFF, 0xFF, 0xFF, 0x7F]])
+    }
+}
+
+/// The resident-set high-water mark in bytes, from `/proc` (Linux only).
+fn high_water() -> usize {
+    std::fs::read_to_string("/proc/self/status")
+        .ok()
+        .and_then(|s| {
+            s.lines()
+                .find_map(|l| l.strip_prefix("VmHWM:"))
+                .and_then(|v| v.trim().trim_end_matches("kB").trim().parse::<usize>().ok())
+        })
+        .map_or(0, |kb| kb << 10)
+}
+
+fn reset_high_water() {
+    let _ = std::fs::write("/proc/self/clear_refs", "5");
+}
+
+#[test]
+fn a_field_at_its_extreme_costs_nothing_like_what_it_says() {
+    let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures");
+    let mut paths = vec![];
+    walk_dir(&root, &mut paths);
+    let mut corpus: Vec<(String, Reader, Vec<u8>)> = vec![];
+    for p in paths {
+        if let Some((name, data)) = load(&p)
+            && data.len() <= 256 << 10
+            && let Some(r) = reader_for(&name)
+        {
+            corpus.push((
+                name.strip_prefix(&format!("{}/", root.display()))
+                    .unwrap_or(&name)
+                    .to_string(),
+                r,
+                data,
+            ));
+        }
+    }
+    // The office fixtures alone, when the readers of the other formats are
+    // not built, are fewer.
+    let least = if cfg!(feature = "image") { 30 } else { 10 };
+    assert!(corpus.len() > least, "only {} fixtures", corpus.len());
+    let (positions, values) = sweep();
+    let mut findings: Vec<String> = vec![];
+    let mut runs = 0u64;
+    for (name, read, data) in &corpus {
+        let allowed = RESIDENT_BASE + RESIDENT_PER_BYTE * data.len();
+        let mut seen: Vec<usize> = vec![];
+        for &at in &positions {
+            if seen.contains(&at) {
+                continue;
+            }
+            for value in &values {
+                if at + value.len() > data.len() {
+                    continue;
+                }
+                let mut mutated = data.clone();
+                mutated[at..at + value.len()].copy_from_slice(value);
+                runs += 1;
+                reset_high_water();
+                let before = high_water();
+                let started = Instant::now();
+                let r = std::panic::catch_unwind(|| read(&mutated));
+                let took = started.elapsed();
+                let held = high_water().saturating_sub(before);
+                let hex: String = value.iter().map(|b| format!("{b:02x}")).collect();
+                let end = at + value.len();
+                if r.is_err() {
+                    findings.push(format!("{name}: bytes {at}..{end} set to {hex} panicked"));
+                    seen.push(at);
+                } else if held > allowed {
+                    findings.push(format!(
+                        "{name}: bytes {at}..{end} set to {hex} held {} MiB (allowed {} MiB)",
+                        held >> 20,
+                        allowed >> 20
+                    ));
+                    seen.push(at);
+                } else if took > SLOW {
+                    findings.push(format!(
+                        "{name}: bytes {at}..{end} set to {hex} took {:.1} s",
+                        took.as_secs_f64()
+                    ));
+                    seen.push(at);
+                }
+            }
+        }
+    }
+    eprintln!(
+        "{} fixtures, {runs} reads, {} findings",
+        corpus.len(),
+        findings.len()
+    );
+    assert!(findings.is_empty(), "\n{}", findings.join("\n"));
+}
diff --git a/crates/exav-render/tests/scaling.rs b/crates/exav-render/tests/scaling.rs
new file mode 100644
index 00000000..6f18a8fa
--- /dev/null
+++ b/crates/exav-render/tests/scaling.rs
@@ -0,0 +1,57 @@
+//! Documents of one kind of unit, many times over, converted in the time they
+//! take to read.
+//!
+//! A step that looks at everything made so far for each unit it makes is
+//! invisible in a document of a hundred units and takes minutes in one of a
+//! million. Each test here makes a document of one unit, enough of them that
+//! the step would take several times the limit, and gives the conversion that
+//! limit. The limits are generous (an order above what the linear conversion
+//! takes at the test profile's `opt-level = 1`, a quarter of the quadratic).
+
+#![cfg(all(
+    feature = "office-docs",
+    feature = "office-slides",
+    feature = "office-sheets"
+))]
+
+use std::time::{Duration, Instant};
+
+const ODF_NS: &str = "xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" \
+    xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" office:version=\"1.2\"";
+
+fn flat_odt(body: &str) -> Vec<u8> {
+    format!(
+        "<?xml version=\"1.0\"?><office:document {ODF_NS} \
+         office:mimetype=\"application/vnd.oasis.opendocument.text\"><office:body>\
+         <office:text>{body}</office:text></office:body></office:document>"
+    )
+    .into_bytes()
+}
+
+fn converts_within(what: &str, input: &[u8], format: exav_render::docs::Format, limit: Duration) {
+    let limits = exav_render::docs::Limits::default().with_max_memory(2 << 30);
+    let started = Instant::now();
+    let r = exav_render::docs::convert(input, format, &limits);
+    let took = started.elapsed();
+    assert!(r.is_ok(), "{what}: {:?}", r.err());
+    assert!(
+        took < limit,
+        "{what}: {:.1} s, the limit is {limit:?}",
+        took.as_secs_f64()
+    );
+}
+
+/// Each note looked for itself among all the notes before it, from the first:
+/// 160,000 of them took 5 s, and 300,000 would take 18.
+#[test]
+fn a_document_of_300_000_footnotes() {
+    let note = "<text:note text:note-class=\"footnote\"><text:note-citation>1</text:note-citation>\
+                <text:note-body><text:p>n</text:p></text:note-body></text:note>";
+    let doc = flat_odt(&format!("<text:p>{}</text:p>", note.repeat(300_000)));
+    converts_within(
+        "300,000 footnotes",
+        &doc,
+        exav_render::docs::Format::Fodt,
+        Duration::from_secs(10),
+    );
+}
diff --git a/crates/exav-render/tests/text.rs b/crates/exav-render/tests/text.rs
new file mode 100644
index 00000000..542be615
--- /dev/null
+++ b/crates/exav-render/tests/text.rs
@@ -0,0 +1,151 @@
+//! `text::visible_text`: one entry for the text of every kind of document that
+//! has some, chosen by the bytes where they say and by the name where not.
+
+#[path = "cad_common/mod.rs"]
+mod common;
+
+use exav_render::text::{visible_text, wants};
+use exav_unpack::Limits;
+
+fn text(name: &str, data: &[u8]) -> Option<String> {
+    visible_text(name, data, 1 << 20, &Limits::default()).map(|v| v.text)
+}
+
+#[test]
+fn markdown_html_and_package_parts_by_what_they_are() {
+    assert_eq!(
+        text("a.md", b"Please *read* it").unwrap(),
+        "Please read it\n"
+    );
+    assert_eq!(
+        text(
+            "page.bin",
+            b"<html><body><p>one</p><a href=\"http://x.example/\">two</a></body></html>"
+        )
+        .unwrap(),
+        "one\ntwo (http://x.example/)\n"
+    );
+    assert_eq!(
+        text(
+            "word/document.xml",
+            b"<w:document><w:p><w:r><w:t>in a docx</w:t></w:r></w:p></w:document>"
+        )
+        .unwrap(),
+        "in a docx\n"
+    );
+}
+
+/// Found by the `visible_text` fuzz target: the reader took a binary file with
+/// a SpreadsheetML marker among its first bytes for that document, where
+/// `wants`, which the scanner asks first, wants text to begin with.
+#[test]
+fn a_binary_file_with_a_spreadsheet_marker_among_its_bytes_is_not_that_document() {
+    let mut data = b"AC1012\0\0\0\0\0\0\x01X\0\0\0\0\0\x1e\0\x05\0\0\0\x12".to_vec();
+    data.extend_from_slice(
+        b"<?xml version=\"1.0\"?><Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\">\
+          <Worksheet/></Workbook>",
+    );
+    // And a flat OpenDocument file's root element.
+    let mut flat = b"{\\rinrtf2\0\x05\xb2\0\0\0\x01X\0\0\0\0\0\x1e\0\x05".to_vec();
+    flat.extend_from_slice(
+        b"<office:document office:mimetype=\"application/vnd.oasis.opendocument.text\"/>",
+    );
+    for data in [&data, &flat] {
+        for name in ["a.dwg", "a.xml", "member"] {
+            assert_eq!(text(name, data), None, "{name}");
+            assert!(!wants(name, &data[..data.len().min(1024)]), "{name}");
+        }
+    }
+    // The same document as text is read, and wanted.
+    let doc = &data[data.len() - 107..];
+    assert!(wants("a.xml", doc));
+    assert!(text("a.xml", doc).is_some());
+}
+
+#[test]
+fn what_has_no_text_gives_none() {
+    assert_eq!(text("notes.txt", b"just some words"), None);
+    assert_eq!(text("a.bin", &[0u8; 64]), None);
+    assert_eq!(text("a.dwg", b"AC1032 not really"), None);
+    assert_eq!(text("a", b""), None);
+}
+
+#[test]
+fn a_drawing_is_its_texts_attributes_and_names_in_dxf_and_in_dwg_alike() {
+    let dxf = common::fixture("ascii/R2018/all.dxf").expect("fixture");
+    let dwg = common::fixture("dwg/R2018/all.dwg").expect("fixture");
+    for (name, data) in [("all.dxf", &dxf), ("all.dwg", &dwg)] {
+        let t = text(name, data).unwrap_or_else(|| panic!("{name}: no text"));
+        // TEXT, a layer name, and MTEXT without its formatting codes.
+        assert!(t.contains("Left text"), "{name}: {t}");
+        assert!(t.contains("WALLS"), "{name}: {t}");
+        assert!(!t.contains("\\P") && !t.contains("\\f"), "{name}: {t}");
+    }
+    // The same drawing says the same in both.
+    let a: std::collections::BTreeSet<_> = text("a.dxf", &dxf)
+        .unwrap()
+        .lines()
+        .map(str::to_string)
+        .collect();
+    let b: std::collections::BTreeSet<_> = text("a.dwg", &dwg)
+        .unwrap()
+        .lines()
+        .map(str::to_string)
+        .collect();
+    assert!(a.contains("Left text") && b.contains("Left text"));
+    let common: Vec<_> = a.intersection(&b).collect();
+    assert!(
+        common.len() * 2 > a.len(),
+        "{} of {} lines agree",
+        common.len(),
+        a.len()
+    );
+}
+
+#[test]
+fn the_text_of_a_drawing_is_cut_at_the_cap() {
+    let dxf = common::fixture("ascii/R2018/all.dxf").expect("fixture");
+    let v = visible_text("all.dxf", &dxf, 64, &Limits::default()).unwrap();
+    assert!(v.truncated);
+    assert!(v.text.len() <= 64);
+}
+
+#[test]
+fn a_drawing_is_read_within_the_memory_the_caller_allows() {
+    let mut dxf = String::from("  0\nSECTION\n  2\nENTITIES\n");
+    for _ in 0..1000 {
+        dxf.push_str("  0\nLINE\n 10\n0\n 20\n0\n 11\n1\n 21\n1\n");
+    }
+    dxf.push_str("  0\nTEXT\n  1\nafter the lines\n 10\n0\n 20\n0\n  0\nENDSEC\n  0\nEOF\n");
+    let mut limits = Limits::default();
+    let v = visible_text("a.dxf", dxf.as_bytes(), 1 << 20, &limits).unwrap();
+    assert!(v.text.contains("after the lines") && !v.truncated);
+    // Room for fewer entities than the drawing has: the text found is kept,
+    // and the scan is told it is not all there.
+    limits.max_buffer_bytes = 100 * exav_render::cad::ENTITY_BYTES;
+    let v = visible_text("a.dxf", dxf.as_bytes(), 1 << 20, &limits).unwrap();
+    assert!(!v.text.contains("after the lines") && v.truncated);
+
+    // A DWG whose sections expand past it is unreadable, not empty.
+    let dwg = common::fixture("dwg/R2018/all.dwg").expect("fixture");
+    limits.max_buffer_bytes = 1 << 10;
+    let v = visible_text("a.dwg", &dwg, 1 << 20, &limits).unwrap();
+    assert!(v.text.is_empty());
+    assert!(v.unreadable.is_some_and(|w| w.starts_with("too-large")));
+}
+
+#[test]
+fn damaged_drawings_and_documents_do_not_panic() {
+    let dxf = common::fixture("ascii/R2018/all.dxf").expect("fixture");
+    let dwg = common::fixture("dwg/R2018/all.dwg").expect("fixture");
+    for data in [&dxf, &dwg] {
+        for cut in [0, 7, 100, data.len() / 3, data.len() - 1] {
+            let _ = text("x", &data[..cut]);
+            let mut flipped = data[..cut].to_vec();
+            for i in (0..flipped.len()).step_by(97) {
+                flipped[i] ^= 0xa5;
+            }
+            let _ = text("x", &flipped);
+        }
+    }
+}
diff --git a/crates/exav-unpack-wasm/Cargo.lock b/crates/exav-unpack-wasm/Cargo.lock
index 4f69ffc6..5bc7f7b6 100644
--- a/crates/exav-unpack-wasm/Cargo.lock
+++ b/crates/exav-unpack-wasm/Cargo.lock
@@ -28,22 +28,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "apfs"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1b4ecd96379464ea8b4ef2517c8eb674d8658ad364e9176bf5b8c278aa801e"
-dependencies = [
- "byteorder",
- "thiserror",
-]
-
-[[package]]
-name = "arraydeque"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8"
-
 [[package]]
 name = "autocfg"
 version = "1.5.1"
@@ -52,15 +36,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
 name = "bitflags"
@@ -101,6 +79,26 @@ version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
+[[package]]
+name = "bytemuck"
+version = "1.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -118,25 +116,14 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.5.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f360145194ee8e21db5ee7f3fcd4fe52210864c75c985dae33218202c8bbe040"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "shlex",
 ]
 
-[[package]]
-name = "cfb"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3"
-dependencies = [
- "fnv",
- "uuid",
- "web-time",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.5"
@@ -182,12 +169,6 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -215,26 +196,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
-
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
@@ -250,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "ctutils"
-version = "0.4.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+checksum = "38d28fb6aa7dd680b3ffd1a3e64e115c177bdba63c0ae7f9cd48129ff05c4fa0"
 dependencies = [
  "cmov",
 ]
@@ -265,11 +231,12 @@ checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
 
 [[package]]
 name = "delharc"
-version = "0.6.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3658b90877f637514897c3dcbd628e0d290bcc7fee551a398b3994ebdc62d51e"
+checksum = "9cfdcd2bee8dc367afd9064f3b0849156a4c29fc70d98370dae62773594d04dd"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
+ "bytemuck",
  "chrono",
  "memchr",
 ]
@@ -311,13 +278,13 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "exav-pe-emu"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "exav-x86",
  "rustc-hash",
@@ -325,16 +292,13 @@ dependencies = [
 
 [[package]]
 name = "exav-unpack"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "aes",
- "apfs",
  "base64",
  "bitstream-io",
  "byteorder",
  "cbc",
- "cfb",
- "constant_time_eq",
  "crc32fast",
  "deflate64",
  "delharc",
@@ -342,13 +306,8 @@ dependencies = [
  "digest",
  "encoding_rs",
  "exav-pe-emu",
- "explode",
- "ext4-view",
- "fatfs",
  "flate2",
- "hfsplus",
  "hmac",
- "lzfse_rust",
  "lzma-rust2",
  "lznt1",
  "lzxd",
@@ -365,56 +324,23 @@ dependencies = [
  "tar",
  "thiserror",
  "tinyvec",
- "unshield",
  "xz4rust",
  "zip",
 ]
 
 [[package]]
 name = "exav-unpack-wasm"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "exav-unpack",
- "flate2",
  "js-sys",
  "wasm-bindgen",
- "wasm-bindgen-futures",
  "web-sys",
 ]
 
 [[package]]
 name = "exav-x86"
-version = "0.0.2"
-
-[[package]]
-name = "explode"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46695dd0a1b7a2a6c3e0800604bd9738c2699682b9fc325d4886b6c1a78025ac"
-dependencies = [
- "arraydeque",
-]
-
-[[package]]
-name = "ext4-view"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ecf6379b7cfeace5e109ccc51955afc05f5f7f2466ae0cf2697bda46afd01e6"
-dependencies = [
- "bitflags 2.13.2",
- "crc",
-]
-
-[[package]]
-name = "fatfs"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05669f8e7e2d7badc545c513710f0eba09c2fbef683eb859fd79c46c355048e0"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "log",
-]
+version = "0.0.3"
 
 [[package]]
 name = "filetime"
@@ -428,9 +354,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "flate2"
@@ -443,12 +369,6 @@ dependencies = [
  "zlib-rs",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "futures-core"
 version = "0.3.34"
@@ -491,16 +411,6 @@ dependencies = [
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "hfsplus"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1003d8eed80d61e8e8ea6a958bbe1afd3aef060882b9d6134e50500dd307c0dc"
-dependencies = [
- "byteorder",
- "thiserror",
-]
-
 [[package]]
 name = "hmac"
 version = "0.13.0"
@@ -555,9 +465,9 @@ dependencies = [
 
 [[package]]
 name = "inout"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
+checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f"
 dependencies = [
  "block-padding",
  "hybrid-array",
@@ -576,9 +486,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "log"
@@ -586,17 +496,11 @@ version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
-[[package]]
-name = "lzfse_rust"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5edeac3ec657925dececc672bdd58fa2212291886ddcb3e08aa46924c78340c6"
-
 [[package]]
 name = "lzma-rust2"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde178a3caf126c440fa15628147772d8ee590a39477d711353fbe2e58a73a5b"
+checksum = "f1c46f3fcd2e888afdb01a07efc071cb21300e07c68d32c3e8b01b5c8cb1fcaa"
 
 [[package]]
 name = "lznt1"
@@ -660,7 +564,7 @@ version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -717,9 +621,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
 dependencies = [
  "memchr",
 ]
@@ -747,12 +651,9 @@ checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ruzstd"
-version = "0.8.3"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8"
-dependencies = [
- "twox-hash",
-]
+checksum = "69e4ce4a039f42bf25920b95667e4d789e98749ab11bbb8d2c2936f788421bb5"
 
 [[package]]
 name = "salzweg"
@@ -779,9 +680,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -836,9 +737,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -872,7 +773,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -881,26 +782,11 @@ version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
 
-[[package]]
-name = "tokio"
-version = "1.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
-dependencies = [
- "pin-project-lite",
-]
-
-[[package]]
-name = "twox-hash"
-version = "2.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5283634e518fe9e82c7b20520bb4bc209009fd16c82077c802f8111ecbb0117a"
-
 [[package]]
 name = "typed-path"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e"
+checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c"
 
 [[package]]
 name = "typenum"
@@ -916,15 +802,15 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d"
 dependencies = [
  "tinyvec",
 ]
@@ -935,26 +821,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 
-[[package]]
-name = "unshield"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd29bc2ffd8a674b7de402169d86b3c083229373d05c388526d626408416c5c"
-dependencies = [
- "byteorder",
- "explode",
-]
-
-[[package]]
-name = "uuid"
-version = "1.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.129"
@@ -968,17 +834,6 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e"
-dependencies = [
- "js-sys",
- "tokio",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.129"
@@ -998,7 +853,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -1021,16 +876,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -1098,9 +943,9 @@ checksum = "606930b71bad6379f366994e4e6252a3462fa28bfc3695c33b07bef8f967d6d6"
 
 [[package]]
 name = "zip"
-version = "9.0.1"
+version = "9.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49ade69c4434c55dd651d36fe05f38e0578db948b773cbc01c48c4b5e560692"
+checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e"
 dependencies = [
  "bitstream-io",
  "crc32fast",
diff --git a/crates/exav-unpack-wasm/Cargo.toml b/crates/exav-unpack-wasm/Cargo.toml
index 7a95270b..418a1d98 100644
--- a/crates/exav-unpack-wasm/Cargo.toml
+++ b/crates/exav-unpack-wasm/Cargo.toml
@@ -1,11 +1,11 @@
 # Excluded from the workspace (a wasm32-target artifact), so values are explicit.
 [package]
 name = "exav-unpack-wasm"
-version = "0.0.2"
-edition = "2021"
+version = "0.0.3"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/sylvinus/exav"
-rust-version = "1.92"
+rust-version = "1.95"
 description = "WebAssembly bindings for exav-unpack: in-browser, memory-safe universal archive extraction. Build with `wasm-pack build`."
 
 [lib]
@@ -55,8 +55,9 @@ minimal = ["zip", "gzip", "tar"]
 # anything published.
 testing-faults = []
 
-all-formats-no-emu = ["exav-unpack/all-formats-no-emu"]
-all-formats = ["exav-unpack/all-formats"]
+# `zip` and `rar` too: `joinSet` joins those sets with their decoders' own joiners.
+all-formats-no-emu = ["exav-unpack/all-formats-no-emu", "zip", "rar"]
+all-formats = ["exav-unpack/all-formats", "zip", "rar"]
 pe-emu = ["exav-unpack/pe-emu"]
 checksums = ["exav-unpack/checksums"]
 decrypt = ["exav-unpack/decrypt"]
@@ -67,7 +68,9 @@ bzip2 = ["exav-unpack/bzip2"]
 xz = ["exav-unpack/xz"]
 zstd = ["exav-unpack/zstd"]
 lzip = ["exav-unpack/lzip"]
-cab = ["exav-unpack/cab"]
+lzma = ["exav-unpack/lzma"]
+rpm = ["exav-unpack/rpm"]
+cab =["exav-unpack/cab"]
 sevenz = ["exav-unpack/sevenz"]
 rar = ["exav-unpack/rar"]
 arj = ["exav-unpack/arj"]
@@ -117,11 +120,9 @@ wasm-opt = [
 ]
 
 [dependencies]
-exav-unpack = { path = "../exav-unpack", version = "0.0.2", default-features = false }
+exav-unpack = { path = "../exav-unpack", version = "0.0.3", default-features = false }
 wasm-bindgen = "0.2"
-wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
-flate2 = "1"
 web-sys = { version = "0.3", features = [
     "Blob",
     "BlobPropertyBag",
diff --git a/crates/exav-unpack-wasm/NOTICE b/crates/exav-unpack-wasm/NOTICE
index 26b7e3aa..b5915937 100644
--- a/crates/exav-unpack-wasm/NOTICE
+++ b/crates/exav-unpack-wasm/NOTICE
@@ -101,14 +101,19 @@ Each under the MIT License (MIT OR Apache-2.0 ones used under MIT):
   https://github.com/mkrueger/unarc-rs
 - bzip2-rs (bzip2 decoder, vendored): Copyright (c) 2021 Paolo Barbolini.
   https://github.com/paolobarbolini/bzip2-rs
+- unshield and explode (InstallShield .z reader and PKWARE DCL decoder,
+  ported): Copyright (c) 2020 Aaron Griffith. https://github.com/agrif/unshield,
+  https://github.com/agrif/explode
+- cmpfs (decoder of the files macOS compresses, after its layouts): Copyright
+  (c) 2026 Dil4rd. https://github.com/Dil4rd/dpp
 - EggDotNet (AZO decoder, ported): Copyright (c) Andrew Kolman.
   https://github.com/akolman/EggDotNet
 - AutoIt-Ripper (compiled AutoIt3 layout and tables): Copyright (c) nazywam
   and contributors. https://github.com/nazywam/AutoIt-Ripper
 
 
-NSIS format headers, zlib
--------------------------
+NSIS format headers and blast.c, zlib
+-------------------------------------
 
 exav-unpack's NSIS reader implements the installer layout from NSIS's format
 header Source/exehead/fileform.h.
@@ -116,6 +121,14 @@ header Source/exehead/fileform.h.
 Upstream: https://github.com/kichik/nsis
 Copyright (c) Nullsoft and contributors
 
+exav-unpack's PKWARE DCL decoder keeps the algorithm and code-length tables of
+blast.c, through the explode port above, altered to decode a whole buffer.
+
+Upstream: https://github.com/madler/zlib/tree/master/contrib/blast
+Copyright (C) Mark Adler
+
+Each under these terms:
+
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the
 use of this software.
@@ -135,6 +148,42 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 
 
+Apple lzfse, BSD-3-Clause (source derivative)
+---------------------------------------------
+
+exav-unpack's LZFSE and LZVN decoder (DMG runs) is a Rust port of the decoder
+of Apple's reference implementation.
+
+Upstream: https://github.com/lzfse/lzfse
+
+Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder(s) nor the names of any
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 Apache-2.0 references
 ---------------------
 
@@ -167,8 +216,6 @@ the copyright its license file states, or its authors where it states none:
 
   adler2                 Jonas Schievink
   aes                    2018 Artyom Pavlov; 2018-2024 The RustCrypto Project Developers
-  apfs                   2026 Dil4rd
-  arraydeque             2018 Andy Lok
   base64                 2015 Alice Maz
   bitflags               2014 The Rust Project Developers
   bitstream-io           2017 Brian Langenberger
@@ -184,8 +231,6 @@ the copyright its license file states, or its authors where it states none:
   cmov                   2022-2026 The RustCrypto Project Developers
   const-oid              2020-2026 The RustCrypto Project Developers
   cpubits                2023-2026 The RustCrypto Project Developers
-  crc                    2017 crc-rs Developers
-  crc-catalog            2019 Akhil Velagapudi
   crc32fast              2018 Sam Rijs, Alex Crichton and contributors
   crypto-common          2021-2026 RustCrypto Developers
   ctutils                2025-2026 The RustCrypto Project Developers
@@ -195,9 +240,6 @@ the copyright its license file states, or its authors where it states none:
                          2017-2024 The RustCrypto Project Developers
   digest                 2017 Artyom Pavlov; 2017-2025 RustCrypto Developers
   equivalent             2016-2023 the equivalent authors
-  explode                2020 Aaron Griffith
-  ext4-view              2023 Google LLC
-  fatfs                  2017 Rafał Harabień
   filetime               2014 Alex Crichton
   flate2                 2014-2026 Alex Crichton
   fnv                    2017 Contributors
@@ -205,14 +247,12 @@ the copyright its license file states, or its authors where it states none:
   futures-task           2016 Alex Crichton; 2017 The Tokio Authors
   futures-util           2016 Alex Crichton; 2017 The Tokio Authors
   hashbrown              2016 Amanieu d'Antras
-  hfsplus                2026 Dil4rd
   hmac                   2017 Artyom Pavlov
   hybrid-array           2022-2026 The RustCrypto Project Developers
   indexmap               2016-2017 the indexmap authors
   inout                  2022 Artyom Pavlov; 2022-2025 The RustCrypto Project Developers
   js-sys                 2014 Alex Crichton
   log                    2014 The Rust Project Developers
-  lzfse_rust             2020 Vin Singh Ghataore
   lznt1                  Cody Wyatt Neiman
   lzxd                   2020 Lonami
   mail-parser            Stalwart Labs
@@ -240,17 +280,14 @@ the copyright its license file states, or its authors where it states none:
   tar                    The tar-rs Project Contributors
   thiserror              David Tolnay
   tinyvec                2019 Daniel "Lokathor" Gee
-  twox-hash              2015 Jake Goulding
   typed-path             Chip Senkbeil
   typenum                2014 Paho Lurie-Gregg
   unicode-bidi           2015 The Rust Project Developers
   unicode-normalization  2015 The Rust Project Developers
   unicode-properties     2015 The Rust Project Developers
-  unshield               2020 Aaron Griffith
   uuid                   2014 The Rust Project Developers; 2018 Ashley Mannix,
                          Christopher Armstrong, Dylan DPC, Hunar Roop Kahlon
   wasm-bindgen           2014 Alex Crichton
-  wasm-bindgen-futures   2014 Alex Crichton
   wasm-bindgen-shared    2014 Alex Crichton
   web-sys                2014 Alex Crichton
   web-time               2023 dAxpeDDa
@@ -263,10 +300,6 @@ no NOTICE file:
 
   lzma-rust2             the lzma-rust2 authors
 
-Under CC0-1.0 (public domain; no notice required, recorded for completeness):
-
-  constant_time_eq       Cesar Eduardo Barros
-
 
 MIT License
 -----------
diff --git a/crates/exav-unpack-wasm/README.md b/crates/exav-unpack-wasm/README.md
index f267f279..2b7141a1 100644
--- a/crates/exav-unpack-wasm/README.md
+++ b/crates/exav-unpack-wasm/README.md
@@ -192,6 +192,11 @@ phone browser.
 - `isVolumePart(name)` → whether a *filename* marks one part of a byte-split
   archive. Names only, so it is cheap enough to run over a whole drop.
 - `joinVolumes(files)` → rejoin the split archives among files dropped together.
+- `volumeSet(name, names)` → the volumes of the set `name` belongs to among
+  `names` (the file names of one directory): `{ parts, scheme, complete }`, or
+  `null` for a name that is not one of two or more volumes. Names only.
+- `joinSet(scheme, parts)` → a complete set's volumes, in order, as the one
+  archive they make (`"split"`, `"rar"` or `"zip"`).
 
 ## Split archives
 
@@ -215,9 +220,19 @@ nothing can read any more, and letting them vanish silently is the one outcome
 worth avoiding. Files that are not part of a set are simply absent from the
 result; you already have them.
 
-RAR `.partN` and ZIP `.zNN` volumes are not rejoined here. Each carries its own
-headers and a member's data resumes *past* the next volume's header, so
-concatenating them yields garbage that still looks like an archive.
+`joinVolumes` does not rejoin RAR `.partN` and ZIP `.zNN` volumes. Each carries
+its own headers and a member's data resumes *past* the next volume's header, so
+concatenating them yields garbage that still looks like an archive. `volumeSet`
+and `joinSet` read all three kinds of set, the RAR decoder's joiner and the ZIP
+spanning reader doing what the format needs:
+
+```js
+const set = volumeSet("x.part1.rar", namesInTheFolder);   // { parts, scheme, complete } or null
+if (set?.complete) {
+  const volumes = await Promise.all(set.parts.map(read));  // Uint8Arrays, in order
+  const archive = await Archive.open(joinSet(set.scheme, volumes));
+}
+```
 
 ## Notes
 
diff --git a/crates/exav-unpack-wasm/js/index.d.ts b/crates/exav-unpack-wasm/js/index.d.ts
index 6ae8fff7..722b6d84 100644
--- a/crates/exav-unpack-wasm/js/index.d.ts
+++ b/crates/exav-unpack-wasm/js/index.d.ts
@@ -114,5 +114,23 @@ export function joinVolumes(
 /** Whether a filename marks one part of a byte-split archive (`big.7z.001`). */
 export function isVolumePart(name: string): boolean;
 
+/**
+ * The volumes of the set `name` belongs to among `names`, the file names of one
+ * directory: in volume order, by scheme ("split" `big.7z.001`, "rar" `x.part1.rar`
+ * or `x.rar` with `x.r00`, "zip" `x.z01` to `x.zip`), and whether every volume is
+ * there. `null` for a name that is not one of two or more volumes. Names only.
+ */
+export function volumeSet(
+  name: string,
+  names: string[],
+): { parts: string[]; scheme: "split" | "rar" | "zip"; complete: boolean } | null;
+
+/**
+ * A complete set's volumes, in volume order, as the one archive they make, for
+ * `Archive.open`. RAR and ZIP volumes are joined by their decoders, not by
+ * concatenation.
+ */
+export function joinSet(scheme: "split" | "rar" | "zip", parts: Uint8Array[]): Uint8Array;
+
 /** Instantiate the wasm module. Memoised; awaited internally by every call. */
 export default function init(module_or_path?: unknown): Promise<unknown>;
diff --git a/crates/exav-unpack-wasm/js/index.js b/crates/exav-unpack-wasm/js/index.js
index 3f075233..bc28cde4 100644
--- a/crates/exav-unpack-wasm/js/index.js
+++ b/crates/exav-unpack-wasm/js/index.js
@@ -16,9 +16,11 @@ import init, {
   detectFormat,
   joinVolumes,
   isVolumePart,
+  volumeSet,
+  joinSet,
 } from "../pkg/exav_unpack_wasm.js";
 
-export { detectFormat, joinVolumes, isVolumePart };
+export { detectFormat, joinVolumes, isVolumePart, volumeSet, joinSet };
 
 /**
  * Instantiate the module, once.
diff --git a/crates/exav-unpack-wasm/package-lock.json b/crates/exav-unpack-wasm/package-lock.json
index 0b9bf0ad..3a716303 100644
--- a/crates/exav-unpack-wasm/package-lock.json
+++ b/crates/exav-unpack-wasm/package-lock.json
@@ -1,109 +1,96 @@
 {
-  "name": "exav-unpack-wasm",
-  "version": "0.1.0",
+  "name": "@exav/unpack-wasm",
+  "version": "0.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "exav-unpack-wasm",
-      "version": "0.1.0",
+      "name": "@exav/unpack-wasm",
+      "version": "0.0.3",
       "license": "MIT",
       "devDependencies": {
-        "@playwright/test": "^1.61.1",
+        "@playwright/test": "^1.64.1",
         "serve": "^14.2.6",
-        "vitest": "^4.1.9"
+        "vitest": "^5.0.5"
       }
     },
-    "node_modules/@emnapi/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.2",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
-      "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
-      "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
-      "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "@tybys/wasm-util": "^0.10.3"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Brooooooklyn"
-      },
-      "peerDependencies": {
-        "@emnapi/core": "^1.7.1",
-        "@emnapi/runtime": "^1.7.1"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@oxc-project/types": {
-      "version": "0.137.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.137.0.tgz",
-      "integrity": "sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==",
+      "version": "0.155.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.155.0.tgz",
+      "integrity": "sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
-        "url": "https://github.com/sponsors/Boshen"
+        "url": "https://github.com/sponsors/oxc-project"
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.61.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.1.tgz",
-      "integrity": "sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==",
+      "version": "1.64.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.64.1.tgz",
+      "integrity": "sha512-IaYGml/nSOiZWROfPtuIL7neuu9qDOZ3TNvNljUIrhDMxiGTgPjzj/g9p9RxpS2tSepPDRY+UwAaEeiKtUvIAg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.61.1"
+        "playwright": "1.64.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
+      }
+    },
+    "node_modules/@rolldown/binding-android-arm-eabi": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.15.tgz",
+      "integrity": "sha512-aLcgK9gIJ3YRvrrtfSBbRa27F5WrpiTaPulnFpsHPxpUHgFlSgnU4854MHwoRGEBhfRJDWCS2WQ7lIjskE9Olw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.3.tgz",
-      "integrity": "sha512-DT6Z3PhvioeHMvxo+xHc3KtqggrI7CCTXCmC2h/5zUlp5jVitv7XEy+9q5/7v8IolhlioawpMo8Kg0EEBy7J0g==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.15.tgz",
+      "integrity": "sha512-xD7DdZCrbThKuxNg7ooQmvp07ys4J/pnSEMTG3/OdOWl6daC67m/Q4fL78sRHMxTH/N4fGUbYhcPM0MF5WFHkg==",
       "cpu": [
         "arm64"
       ],
@@ -113,14 +100,15 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.3.tgz",
-      "integrity": "sha512-0NwgwsjM7LrsuVnXMK3koTpagBNOhloc/BNjKqZjv4V5zI5r13qx69uVhRx+o5Z0yy4Hzq+lpy7TAgUG/ocvrw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.15.tgz",
+      "integrity": "sha512-m2WuQ6r0B4OTYxyPpNLtXaMRbRDUbG8YQV2Q3KTdSSK8Th6KHCnC8jVCJt8bvYeSB5WivkkNbc85mKadaSdOxA==",
       "cpu": [
         "arm64"
       ],
@@ -130,14 +118,15 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.3.tgz",
-      "integrity": "sha512-YtiBp4disu6V560loT6PjMdiRaWmVvDNrUunAalbiFx2ggeJwxdAsgZMcoGP17uyAsTwAj5V1niksxlHnVQ1Sw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.15.tgz",
+      "integrity": "sha512-5RtnsHM36nodM9WbMy+zip0LGS/G+y5wro5RHrpOlr4ac24+1zSi9kiV2MP1myZeZ/ifEHfulQcWjnAXzc2C2A==",
       "cpu": [
         "x64"
       ],
@@ -147,14 +136,15 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.3.tgz",
-      "integrity": "sha512-yD3EkEdXk2LypPxnf/kSZHirarsI8gcPzc62SukhR9VJTyvV+F9Q/GxWNuCojc7sXyuVC4DxRGhdDK4X8VSsbw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.15.tgz",
+      "integrity": "sha512-g3l09pyFqhu+135JKkbkwiKGQmwU5hUMUPJ4VdBADvuqR8d33L6H578rh8m7rtxbdp+VmX/+nzI7nvhSZlzpUQ==",
       "cpu": [
         "x64"
       ],
@@ -164,14 +154,15 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.3.tgz",
-      "integrity": "sha512-c+8vieQbsD7HNAHKIA34w0GJ9FedFFuJGD+7E6vz7Q3uqAIugL5p45fhlsj4UaAsHpcmlqugBWMhA0/j7o0sIg==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.15.tgz",
+      "integrity": "sha512-nIe3VugI97nGQtspPxDqA4sXMUpeiocKIP/CqpY/u/vgbT+alX+cVxu1C/oVBPKg4feNTmYovE91v4DgXvXNwQ==",
       "cpu": [
         "arm"
       ],
@@ -181,14 +172,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.3.tgz",
-      "integrity": "sha512-50jD0uUwLvur7Zz9LHz17kaAdTPjn5wN93hEgjvmYFRZwiR7ZJYovTd5ipyWJDAnXKvZ+wgc+/Ika6dwSF5OcA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.15.tgz",
+      "integrity": "sha512-iTBjXx+B5QSvgI89lJfmqh4wTh8NabR1YZIIN3hNx4zSG0EVfVqkOvLulNpG4251pbd6/IAmZ/LefVk1Y4rPhw==",
       "cpu": [
         "arm64"
       ],
@@ -201,14 +193,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.3.tgz",
-      "integrity": "sha512-BO9+oPL8K9poZJBfYPsXNtYjPE5uM3qeehT3aFcW4LITOl+iSqhp0abzjR2nWBUNjIZeKXjAEWBZ64WjNoHd6w==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.15.tgz",
+      "integrity": "sha512-uN26XOnVR7rqQupG3V9oAG2EGGatWjcJHOeDOHUFCh4TBWmP2tHTFoVN13aYbwfm0aHqJAEmcwhAu6sooIjfqQ==",
       "cpu": [
         "arm64"
       ],
@@ -221,14 +214,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.3.tgz",
-      "integrity": "sha512-f3VpLB1vQ0Eo6ecr/6cekLnvYMFF4YBFoVGkfkvPLq1bAkbAwHYQPZKoAmG6OJyTcxxoC+AvezGx/S1obNC0Mw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.15.tgz",
+      "integrity": "sha512-9nWkcdd+H+XhaA3fQIwpHnKIrfx/PQ6rO0pivr78Og07tXlUlctBBJoEYLPfhTmCR/QxEVdn6uPjHV5SymPhdw==",
       "cpu": [
         "ppc64"
       ],
@@ -241,14 +235,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.3.tgz",
-      "integrity": "sha512-AmurZ26Pqx/RI9N1gzEOCklkKXl927yjfXWUUS0O7Puh8ARM/Ob8qfrD3qnWksScdw6cSrW5PSHE9DyLu7+PtA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.15.tgz",
+      "integrity": "sha512-Ggh0ciFjLwIusLSLz7LZYEaGdxOAUJXI+Qu5JCbhPJJHEt8vP+IjRATTJheiJsdzzTYgUiHUiw3X1Ea3ZpMBdA==",
       "cpu": [
         "s390x"
       ],
@@ -261,14 +256,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.3.tgz",
-      "integrity": "sha512-JJpqs8bRGITDOdbkNKnlojzBabbOHrqjSvDr0IVsZObE1lBcPjxItUEY9eWIDbxaJ3cGrXPWGfGkIxFijg/URg==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.15.tgz",
+      "integrity": "sha512-FHg60rS6DBePAYZ9X9F67x+JObFdmgn6tupA1C/a3B+CufFmTD4mX+e8M75tCiAO3foR/6xwVBI0KQiI7sn/rw==",
       "cpu": [
         "x64"
       ],
@@ -281,14 +277,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.3.tgz",
-      "integrity": "sha512-rSJcdjPxzA/by/6/rYs+v+bXU7UjvnbUWz8MJb6kh6+knqB1dCrtHg0uu7C/4haqJvqdkYHQ5IGn+tCH9GLW/g==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.15.tgz",
+      "integrity": "sha512-/cvV/7v5VGz/moiz0XKRj2dE8DzsKyhIu1KpOvJGPjRywg3yscON889UGvAe8zfiJLHup7VLjBduoGWi3HusWQ==",
       "cpu": [
         "x64"
       ],
@@ -301,14 +298,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.3.tgz",
-      "integrity": "sha512-hQ3/PYkDJICgevvyNcVrihVeqq7k1Pp3VZ9lY+dauAYUJKO+auqApvANhvR1An9BhmqYKvW2Mu1F9u4DXSMLxQ==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.15.tgz",
+      "integrity": "sha512-MyzC5Hrv/sm+Z7TSGKP/j8001RO2xQm1zOpCNVL4j0cY/VhBZviludA2YFQ7i4lH6ZAXxQm0lcMdBzM+99mE7w==",
       "cpu": [
         "arm64"
       ],
@@ -318,33 +316,15 @@
       "os": [
         "openharmony"
       ],
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
-    },
-    "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.3.tgz",
-      "integrity": "sha512-Elcv/BtML9lXrV6JuKITc/grN2kYV9gjsQpW8Jfw4ioK0TOkjBjye0nnyqQNy9STNaI20lXNaQBRrD5gSgR0Yg==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "1.11.1",
-        "@emnapi/runtime": "1.11.1",
-        "@napi-rs/wasm-runtime": "^1.1.6"
-      },
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.3.tgz",
-      "integrity": "sha512-2DrEfhluH9yhiaFApmsjsjwrSYbNcY1oFTzYSP1a535jDbV98zCFanA/96TBUd0iDFcxGmw9QRExwGCXz3U+/g==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.15.tgz",
+      "integrity": "sha512-+PgYiS+AH5omy6L45ZLxybasauJaj3M8buoT83D+nzPmCayXlxUV9hydhciCKVyIg0B/v0BtXPDE1uGqNwCPpg==",
       "cpu": [
         "arm64"
       ],
@@ -354,14 +334,15 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.3.tgz",
-      "integrity": "sha512-OL4OMk7UPXOeVGGd3qo5zJyPIljf4AFgk5QAkPPS+OoLuOOozhuaQGC18MxVTnw/06q93gShAJzlwnSCY9YtqA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.15.tgz",
+      "integrity": "sha512-HFZd2QNQYn1JbIi+Hpd7H+r/lkWxcfIu28nirZ6eCn2LafuvmExMlb/P96Sfx5tf7pPArw39IdhmCF8vmV+NhQ==",
       "cpu": [
         "x64"
       ],
@@ -371,6 +352,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
@@ -380,25 +362,8 @@
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
       "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
-      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tybys/wasm-util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
-      "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
+      "peer": true
     },
     "node_modules/@types/chai": {
       "version": "5.2.3",
@@ -425,40 +390,23 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@vitest/expect": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.9.tgz",
-      "integrity": "sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@standard-schema/spec": "^1.1.0",
-        "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.1.9",
-        "@vitest/utils": "4.1.9",
-        "chai": "^6.2.2",
-        "tinyrainbow": "^3.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/@vitest/mocker": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.9.tgz",
-      "integrity": "sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.0.5.tgz",
+      "integrity": "sha512-xLL3lkDegJZw+MGoGaCCsFayDZthGgpAtr3Vziyfc4p7xH89K7KRPcRBBh/kEYm0Aqkt5DtTmkYpBtRV/FrHZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.1.9",
+        "@jridgewell/trace-mapping": "0.3.31",
+        "@vitest/spy": "5.0.5",
         "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.21"
+        "magic-string": "^1.4.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "msw": "^2.4.9",
+        "msw": "^2.4.9 || ^3.0.0",
         "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
@@ -470,74 +418,16 @@
         }
       }
     },
-    "node_modules/@vitest/pretty-format": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.9.tgz",
-      "integrity": "sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tinyrainbow": "^3.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/runner": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.9.tgz",
-      "integrity": "sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/utils": "4.1.9",
-        "pathe": "^2.0.3"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/snapshot": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.9.tgz",
-      "integrity": "sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/pretty-format": "4.1.9",
-        "@vitest/utils": "4.1.9",
-        "magic-string": "^0.30.21",
-        "pathe": "^2.0.3"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/@vitest/spy": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.9.tgz",
-      "integrity": "sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.0.5.tgz",
+      "integrity": "sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==",
       "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/utils": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.9.tgz",
-      "integrity": "sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/pretty-format": "4.1.9",
-        "convert-source-map": "^2.0.0",
-        "tinyrainbow": "^3.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/@zeit/schemas": {
       "version": "2.36.0",
       "resolved": "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.36.0.tgz",
@@ -746,9 +636,9 @@
       }
     },
     "node_modules/chai": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
-      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz",
+      "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -917,13 +807,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -965,6 +848,7 @@
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -984,9 +868,9 @@
       "license": "MIT"
     },
     "node_modules/es-module-lexer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
-      "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz",
+      "integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==",
       "dev": true,
       "license": "MIT"
     },
@@ -1077,9 +961,9 @@
       }
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1087,6 +971,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
@@ -1211,11 +1096,12 @@
       "license": "MIT"
     },
     "node_modules/lightningcss": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
-      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
+      "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
       "dev": true,
       "license": "MPL-2.0",
+      "peer": true,
       "dependencies": {
         "detect-libc": "^2.0.3"
       },
@@ -1227,23 +1113,23 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-android-arm64": "1.32.0",
-        "lightningcss-darwin-arm64": "1.32.0",
-        "lightningcss-darwin-x64": "1.32.0",
-        "lightningcss-freebsd-x64": "1.32.0",
-        "lightningcss-linux-arm-gnueabihf": "1.32.0",
-        "lightningcss-linux-arm64-gnu": "1.32.0",
-        "lightningcss-linux-arm64-musl": "1.32.0",
-        "lightningcss-linux-x64-gnu": "1.32.0",
-        "lightningcss-linux-x64-musl": "1.32.0",
-        "lightningcss-win32-arm64-msvc": "1.32.0",
-        "lightningcss-win32-x64-msvc": "1.32.0"
+        "lightningcss-android-arm64": "1.33.0",
+        "lightningcss-darwin-arm64": "1.33.0",
+        "lightningcss-darwin-x64": "1.33.0",
+        "lightningcss-freebsd-x64": "1.33.0",
+        "lightningcss-linux-arm-gnueabihf": "1.33.0",
+        "lightningcss-linux-arm64-gnu": "1.33.0",
+        "lightningcss-linux-arm64-musl": "1.33.0",
+        "lightningcss-linux-x64-gnu": "1.33.0",
+        "lightningcss-linux-x64-musl": "1.33.0",
+        "lightningcss-win32-arm64-msvc": "1.33.0",
+        "lightningcss-win32-x64-msvc": "1.33.0"
       }
     },
     "node_modules/lightningcss-android-arm64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
-      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz",
+      "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
       "cpu": [
         "arm64"
       ],
@@ -1253,6 +1139,7 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1262,9 +1149,9 @@
       }
     },
     "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
-      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz",
+      "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
       "cpu": [
         "arm64"
       ],
@@ -1274,6 +1161,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1283,9 +1171,9 @@
       }
     },
     "node_modules/lightningcss-darwin-x64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
-      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz",
+      "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
       "cpu": [
         "x64"
       ],
@@ -1295,6 +1183,7 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1304,9 +1193,9 @@
       }
     },
     "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
-      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz",
+      "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
       "cpu": [
         "x64"
       ],
@@ -1316,6 +1205,7 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1325,9 +1215,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
-      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz",
+      "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
       "cpu": [
         "arm"
       ],
@@ -1337,6 +1227,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1346,9 +1237,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
-      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz",
+      "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
       "cpu": [
         "arm64"
       ],
@@ -1361,6 +1252,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1370,9 +1262,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
-      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz",
+      "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
       "cpu": [
         "arm64"
       ],
@@ -1385,6 +1277,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1394,9 +1287,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
-      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz",
+      "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
       "cpu": [
         "x64"
       ],
@@ -1409,6 +1302,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1418,9 +1312,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
-      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz",
+      "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
       "cpu": [
         "x64"
       ],
@@ -1433,6 +1327,7 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1442,9 +1337,9 @@
       }
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
-      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz",
+      "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
       "cpu": [
         "arm64"
       ],
@@ -1454,6 +1349,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1463,9 +1359,9 @@
       }
     },
     "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
-      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
+      "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
       "cpu": [
         "x64"
       ],
@@ -1475,6 +1371,7 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -1484,13 +1381,13 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.3.tgz",
+      "integrity": "sha512-z12OxmaPGE0F4xlpGdjuAUckipLpQlTAuAmyGhNoD7ODpYUzvDfvtxUbjM/jwznyP178oju/KDdyi220wNJ0RQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.5"
+        "@jridgewell/sourcemap-codec": "^1.6.0"
       }
     },
     "node_modules/merge-stream": {
@@ -1574,9 +1471,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.15",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
-      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
       "dev": true,
       "funding": [
         {
@@ -1585,6 +1482,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -1616,9 +1514,9 @@
       }
     },
     "node_modules/obug": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz",
-      "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-3.0.0.tgz",
+      "integrity": "sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/sxzz",
@@ -1679,24 +1577,18 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1707,41 +1599,38 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.61.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz",
-      "integrity": "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==",
+      "version": "1.64.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.64.1.tgz",
+      "integrity": "sha512-HCrVhHr5QQuwYoswEUGTb7gGp522yflbv/ST8nF4sFWGuLjQCt17Q/EubpGGSNKYn1tsTCPZxqHhHCfVURu7UA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.61.1"
+        "playwright-core": "1.64.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
+        "node": ">=20"
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.61.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.1.tgz",
-      "integrity": "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==",
+      "version": "1.64.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.64.1.tgz",
+      "integrity": "sha512-BC4s8y6SEVA6Q1rSxZTto8hI1KUI3xXlHGZgvGqP4IqPdI/a6FX9H29IDNz7vKo9l21b6LfYosScPL6M3xxyDQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.16.tgz",
-      "integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==",
+      "version": "8.5.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.31.tgz",
+      "integrity": "sha512-YUbWYCgErwnMAVkjUnYa+KlMBzGpHwiIt/DE7f0G33AuX2LH9UcTk6KgWxd3zRU+pN3u/C+Xl3EnMLM4Hea7Sg==",
       "dev": true,
       "funding": [
         {
@@ -1758,10 +1647,11 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "nanoid": "^3.3.12",
+        "nanoid": "^3.3.20",
         "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "source-map-js": "^1.2.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -1828,13 +1718,14 @@
       }
     },
     "node_modules/rolldown": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.3.tgz",
-      "integrity": "sha512-1F1eEtUBtFvcGm1HQ9TiUIUHPQG7mSAODrhIzjxoUEFuo8OcbrGLiVLkevNgj84TE4lnHvnumwFjhJO5Eu135g==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.15.tgz",
+      "integrity": "sha512-6odND+fel5zVw3I4Yc2e69gvguDnX0CAAGiNDZSq4ik5WUcaLrkD2GLuog0XcODbor31hZ5ayEMgVDno+KPV5g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@oxc-project/types": "=0.137.0",
+        "@oxc-project/types": "=0.155.0",
         "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
@@ -1844,21 +1735,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.1.3",
-        "@rolldown/binding-darwin-arm64": "1.1.3",
-        "@rolldown/binding-darwin-x64": "1.1.3",
-        "@rolldown/binding-freebsd-x64": "1.1.3",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.1.3",
-        "@rolldown/binding-linux-arm64-gnu": "1.1.3",
-        "@rolldown/binding-linux-arm64-musl": "1.1.3",
-        "@rolldown/binding-linux-ppc64-gnu": "1.1.3",
-        "@rolldown/binding-linux-s390x-gnu": "1.1.3",
-        "@rolldown/binding-linux-x64-gnu": "1.1.3",
-        "@rolldown/binding-linux-x64-musl": "1.1.3",
-        "@rolldown/binding-openharmony-arm64": "1.1.3",
-        "@rolldown/binding-wasm32-wasi": "1.1.3",
-        "@rolldown/binding-win32-arm64-msvc": "1.1.3",
-        "@rolldown/binding-win32-x64-msvc": "1.1.3"
+        "@rolldown/binding-android-arm-eabi": "1.2.15",
+        "@rolldown/binding-android-arm64": "1.2.15",
+        "@rolldown/binding-darwin-arm64": "1.2.15",
+        "@rolldown/binding-darwin-x64": "1.2.15",
+        "@rolldown/binding-freebsd-x64": "1.2.15",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.2.15",
+        "@rolldown/binding-linux-arm64-gnu": "1.2.15",
+        "@rolldown/binding-linux-arm64-musl": "1.2.15",
+        "@rolldown/binding-linux-ppc64-gnu": "1.2.15",
+        "@rolldown/binding-linux-s390x-gnu": "1.2.15",
+        "@rolldown/binding-linux-x64-gnu": "1.2.15",
+        "@rolldown/binding-linux-x64-musl": "1.2.15",
+        "@rolldown/binding-openharmony-arm64": "1.2.15",
+        "@rolldown/binding-win32-arm64-msvc": "1.2.15",
+        "@rolldown/binding-win32-x64-msvc": "1.2.15"
       }
     },
     "node_modules/safe-buffer": {
@@ -1957,13 +1848,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/siginfo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -1972,26 +1856,20 @@
       "license": "ISC"
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/stackback": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/std-env": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
-      "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.3.0.tgz",
+      "integrity": "sha512-OtU/EgQ1kIm5KwqQpBC6ZEMXrZRui11w8zgfTWp8cdO9B8OaPsbA8bTHO2P+HNo1VlUTGMVBwPhydu6poeXiag==",
       "dev": true,
       "license": "MIT"
     },
@@ -2063,16 +1941,19 @@
       }
     },
     "node_modules/tinybench": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
-      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-6.2.2.tgz",
+      "integrity": "sha512-nIZ2N2dFpjBsg2hgitKu7mA+FvsIJuGJOwysRngmVRRmWgR/UyPjwJj8c/fT/dhm8EkHnF5EOogRf+0Z2qrimA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
     },
     "node_modules/tinyexec": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
-      "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.1.tgz",
+      "integrity": "sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2096,24 +1977,6 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
-    "node_modules/tinyrainbow": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
-      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD",
-      "optional": true
-    },
     "node_modules/type-fest": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -2149,16 +2012,17 @@
       }
     },
     "node_modules/vite": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.0.tgz",
-      "integrity": "sha512-BuJcQK/56NQTWDGn4ABea3q4SSBdNPWwNZKTkkUpcMPnLoquSYH8llRtSUIgoL1KSCpHt5eghLShn50mH36y7Q==",
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz",
+      "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lightningcss": "^1.32.0",
-        "picomatch": "^4.0.4",
-        "postcss": "^8.5.15",
-        "rolldown": "~1.1.2",
+        "lightningcss": "^1.33.0",
+        "picomatch": "^4.0.7",
+        "postcss": "^8.5.30",
+        "rolldown": "~1.2.14",
         "tinyglobby": "^0.2.17"
       },
       "bin": {
@@ -2175,7 +2039,7 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.3.0",
+        "@vitejs/devtools": "^0.7.1 || ^0.8.0",
         "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
@@ -2226,54 +2090,32 @@
         }
       }
     },
-    "node_modules/vite/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/vitest": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.9.tgz",
-      "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-5.0.5.tgz",
+      "integrity": "sha512-cPODOMF8YnkiiYtDdHo6n4wWmBrOBBbOIYH2d33M4l3CdNn72h+qMmO6uXffUN6A5AZFXNND/d+krS9mgkXRfg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.1.9",
-        "@vitest/mocker": "4.1.9",
-        "@vitest/pretty-format": "4.1.9",
-        "@vitest/runner": "4.1.9",
-        "@vitest/snapshot": "4.1.9",
-        "@vitest/spy": "4.1.9",
-        "@vitest/utils": "4.1.9",
-        "es-module-lexer": "^2.0.0",
-        "expect-type": "^1.3.0",
-        "magic-string": "^0.30.21",
-        "obug": "^2.1.1",
-        "pathe": "^2.0.3",
-        "picomatch": "^4.0.3",
-        "std-env": "^4.0.0-rc.1",
-        "tinybench": "^2.9.0",
-        "tinyexec": "^1.0.2",
-        "tinyglobby": "^0.2.15",
-        "tinyrainbow": "^3.1.0",
-        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
-        "why-is-node-running": "^2.3.0"
+        "@types/chai": "^5.2.2",
+        "@vitest/mocker": "5.0.5",
+        "chai": "^6.3.0",
+        "es-module-lexer": "^2.3.2",
+        "expect-type": "^1.4.0",
+        "magic-string": "^1.4.3",
+        "obug": "^3.0.0",
+        "picomatch": "^4.0.7",
+        "std-env": "^4.3.0",
+        "tinybench": "^6.2.2",
+        "tinyexec": "^1.3.1",
+        "tinyglobby": "^0.2.17",
+        "why-is-node-running": "3.2.1"
       },
       "bin": {
         "vitest": "vitest.mjs"
       },
       "engines": {
-        "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
+        "node": "^22.12.0 || ^24.0.0 || >=26.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
@@ -2281,16 +2123,16 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
-        "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.1.9",
-        "@vitest/browser-preview": "4.1.9",
-        "@vitest/browser-webdriverio": "4.1.9",
-        "@vitest/coverage-istanbul": "4.1.9",
-        "@vitest/coverage-v8": "4.1.9",
-        "@vitest/ui": "4.1.9",
+        "@types/node": "^22.0.0 || >=24.0.0",
+        "@vitest/browser-playwright": "5.0.5",
+        "@vitest/browser-preview": "5.0.5",
+        "@vitest/browser-webdriverio": "^5.0.0-beta.5 || >=5.0.0",
+        "@vitest/coverage-istanbul": "5.0.5",
+        "@vitest/coverage-v8": "5.0.5",
+        "@vitest/ui": "5.0.5",
         "happy-dom": "*",
         "jsdom": "*",
-        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "vite": "^6.4.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "@edge-runtime/vm": {
@@ -2348,20 +2190,16 @@
       }
     },
     "node_modules/why-is-node-running": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
-      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-3.2.1.tgz",
+      "integrity": "sha512-Tb2FUhB4vUsGQlfSquQLYkApkuPAFQXGFzxWKHHumVz2dK+X1RUm/HnID4+TfIGYJ1kTcwOaCk/buYCEJr6YjQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "siginfo": "^2.0.0",
-        "stackback": "0.0.2"
-      },
       "bin": {
         "why-is-node-running": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=20.11"
       }
     },
     "node_modules/widest-line": {
diff --git a/crates/exav-unpack-wasm/package.json b/crates/exav-unpack-wasm/package.json
index 01acf452..4dcde5f1 100644
--- a/crates/exav-unpack-wasm/package.json
+++ b/crates/exav-unpack-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@exav/unpack-wasm",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "description": "WebAssembly bindings for exav-unpack: in-browser, memory-safe universal archive extraction. Supports zip, rar, 7z, tar, gz, bz2, xz, cab, arj, lha, iso, cpio, ar, xar, ole, pdf, email, UPX.",
   "license": "MIT",
@@ -62,8 +62,8 @@
   },
   "homepage": "https://exav.org/unpack/wasm/",
   "devDependencies": {
-    "@playwright/test": "^1.61.1",
+    "@playwright/test": "^1.64.1",
     "serve": "^14.2.6",
-    "vitest": "^4.1.9"
+    "vitest": "^5.0.5"
   }
 }
diff --git a/crates/exav-unpack-wasm/src/lib.rs b/crates/exav-unpack-wasm/src/lib.rs
index eefcc96c..5887f1d8 100644
--- a/crates/exav-unpack-wasm/src/lib.rs
+++ b/crates/exav-unpack-wasm/src/lib.rs
@@ -29,7 +29,7 @@ mod source;
 
 use exav_unpack::source::BlockCache;
 use exav_unpack::{
-    walk, Budget, ByteSource, Entry as UnpackEntry, Format, LimitHit, Limits, Member, MemberMeta,
+    Budget, ByteSource, Entry as UnpackEntry, Format, LimitHit, Limits, Member, MemberMeta, walk,
 };
 use js_sys::{Array, Object, Reflect, Uint8Array};
 use source::Src;
@@ -248,16 +248,16 @@ fn limits_from_js(v: &JsValue) -> Limits {
     // An unknown name is ignored rather than rejected: a page pinned to an
     // older module should not fail outright because it listed a format that
     // build does not have, and anything not listed is excluded anyway.
-    if let Ok(v) = Reflect::get(v, &JsValue::from_str("allowedFormats")) {
-        if let Some(arr) = v.dyn_ref::<Array>() {
-            let mut set = std::collections::BTreeSet::new();
-            for item in arr.iter() {
-                if let Some(f) = item.as_string().and_then(|n| format_by_name(&n)) {
-                    set.insert(f);
-                }
+    if let Ok(v) = Reflect::get(v, &JsValue::from_str("allowedFormats"))
+        && let Some(arr) = v.dyn_ref::<Array>()
+    {
+        let mut set = std::collections::BTreeSet::new();
+        for item in arr.iter() {
+            if let Some(f) = item.as_string().and_then(|n| format_by_name(&n)) {
+                set.insert(f);
             }
-            l.allowed_formats = Some(set);
         }
+        l.allowed_formats = Some(set);
     }
     l
 }
@@ -588,3 +588,116 @@ pub fn join_volumes(files: &Array) -> Result<Array, JsValue> {
 pub fn is_volume_part(name: &str) -> bool {
     exav_unpack::volume::parse(name).is_some_and(|v| v.scheme.is_byte_split())
 }
+
+/// The volumes of the set `name` belongs to, among `names` (the file names of
+/// one directory): `{ parts, scheme, complete }`, `parts` in volume order,
+/// `scheme` "split" (`big.7z.001`), "rar" (`x.part1.rar`, `x.rar` and
+/// `x.r00`) or "zip" (`x.z01` ... `x.zip`), and `complete` whether the set has
+/// every volume from the first to the last. `null` where `name` is not one of
+/// two or more volumes: a lone `x.rar` or `x.zip` is an archive on its own.
+///
+/// Names only, matched as `volume::parse` reads them: nothing is opened, and
+/// nothing outside `names` can be named.
+#[wasm_bindgen(js_name = "volumeSet")]
+pub fn volume_set(name: &str, names: Vec<String>) -> JsValue {
+    use exav_unpack::volume::{self, Scheme};
+    let ci = |a: &str, b: &str| a.eq_ignore_ascii_case(b);
+    // `x.zip` is the last volume of `x.z01`, `x.z02` ...
+    let zip_last = name
+        .len()
+        .checked_sub(4)
+        .and_then(|at| name.get(..at).zip(name.get(at..)))
+        .filter(|(_, ext)| ci(ext, ".zip"))
+        .map(|(stem, _)| stem.to_string());
+    let seed = match volume::parse(name) {
+        Some(v) => v,
+        None => match zip_last {
+            Some(stem) => volume::VolumeName {
+                stem,
+                index: 0,
+                scheme: Scheme::ZipSplit,
+            },
+            None => return JsValue::NULL,
+        },
+    };
+    let mut found: Vec<(usize, String)> = Vec::new();
+    for n in &names {
+        if let Some(v) = volume::parse(n)
+            && seed.same_set_as(&v)
+        {
+            found.push((v.index, n.clone()));
+        }
+    }
+    let mut last_zip = None;
+    if matches!(seed.scheme, Scheme::ZipSplit) {
+        last_zip = names
+            .iter()
+            .find(|n| ci(n, &format!("{}.zip", seed.stem)))
+            .cloned();
+    }
+    found.sort_by_key(|(i, _)| *i);
+    // Two names for one position: the shape is not the one a writer made.
+    let clash = found.array_windows().any(|[a, b]| a.0 == b.0);
+    let mut parts: Vec<String> = found.iter().map(|(_, n)| n.clone()).collect();
+    let mut complete = !clash && found.iter().enumerate().all(|(k, (i, _))| k == *i);
+    if matches!(seed.scheme, Scheme::ZipSplit) {
+        // The central directory is in the last part: no `.zip`, no archive.
+        complete &= last_zip.is_some();
+        parts.extend(last_zip);
+    }
+    if parts.len() < 2 {
+        return JsValue::NULL;
+    }
+    let scheme = match seed.scheme {
+        Scheme::NumberedSuffix { .. } => "split",
+        Scheme::RarPart { .. } | Scheme::RarOld => "rar",
+        Scheme::ZipSplit => "zip",
+    };
+    let out = Object::new();
+    let list = Array::new();
+    for p in &parts {
+        list.push(&JsValue::from_str(p));
+    }
+    let _ = Reflect::set(&out, &"parts".into(), &list);
+    let _ = Reflect::set(&out, &"scheme".into(), &JsValue::from_str(scheme));
+    let _ = Reflect::set(&out, &"complete".into(), &JsValue::from_bool(complete));
+    out.into()
+}
+
+/// The volumes of a complete set, given in volume order, as the one archive
+/// they make: "split" parts end to end, a "rar" set through the RAR decoder's
+/// joiner, a "zip" set (`.z01` ... `.zip`) read as one stream. The result is
+/// what `Archive.open` takes.
+#[wasm_bindgen(js_name = "joinSet")]
+pub fn join_set(scheme: &str, parts: &Array) -> Result<Uint8Array, JsValue> {
+    let mut volumes: Vec<Vec<u8>> = Vec::new();
+    for p in parts.iter() {
+        let bytes = p
+            .dyn_ref::<Uint8Array>()
+            .ok_or_else(|| JsValue::from_str("each part must be a Uint8Array"))?;
+        volumes.push(bytes.to_vec());
+    }
+    let joined: Vec<u8> = match scheme {
+        "split" => volumes.concat(),
+        #[cfg(feature = "rar")]
+        "rar" => {
+            let slices: Vec<&[u8]> = volumes.iter().map(Vec::as_slice).collect();
+            exav_unpack::join_rar_volumes(&slices).map_err(err)?
+        }
+        #[cfg(feature = "zip")]
+        "zip" => {
+            let boxed: Vec<Box<dyn ByteSource>> = volumes
+                .into_iter()
+                .map(|v| Box::new(v) as Box<dyn ByteSource>)
+                .collect();
+            let span = exav_unpack::span::ZipSpan::new(boxed).map_err(err)?;
+            span.window(0, span.len()).into_owned()
+        }
+        other => {
+            return Err(JsValue::from_str(&format!(
+                "a \"{other}\" set cannot be joined by this build"
+            )));
+        }
+    };
+    Ok(Uint8Array::from(joined.as_slice()))
+}
diff --git a/crates/exav-unpack-wasm/src/source.rs b/crates/exav-unpack-wasm/src/source.rs
index 6d1d4328..7a9ed432 100644
--- a/crates/exav-unpack-wasm/src/source.rs
+++ b/crates/exav-unpack-wasm/src/source.rs
@@ -87,7 +87,8 @@ impl<F: Fetch> Seek for Windowed<F> {
         // Seeking PAST the end is legal and reads nothing; the next `read`
         // returns zero bytes. Refusing here would reject a reader that seeks to
         // a computed offset before checking it.
-        self.pos = u64::try_from(at).map_err(|_| io::Error::other("seek past the largest offset"))?;
+        self.pos =
+            u64::try_from(at).map_err(|_| io::Error::other("seek past the largest offset"))?;
         Ok(self.pos)
     }
 }
diff --git a/crates/exav-unpack-wasm/tests/volumes.test.ts b/crates/exav-unpack-wasm/tests/volumes.test.ts
new file mode 100644
index 00000000..1bf55f62
--- /dev/null
+++ b/crates/exav-unpack-wasm/tests/volumes.test.ts
@@ -0,0 +1,93 @@
+// The split archives `volumeSet` tells from names and `joinSet` joins, on the
+// module as built (`wasm-pack build`): the RAR sets are the ones the official
+// tool wrote, which exav-unpack's tests read too.
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { beforeAll, describe, expect, it } from 'vitest';
+
+// @ts-expect-error the facade is plain JS beside its own declarations
+import init, { Archive, joinSet, volumeSet } from '../js/index.js';
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const rar = path.join(here, '..', '..', 'exav-unpack', 'tests', 'fixtures', 'rar_volumes');
+const read = (name: string) => new Uint8Array(fs.readFileSync(path.join(rar, name)));
+
+beforeAll(async () => {
+  await init({ module_or_path: fs.readFileSync(path.join(here, '..', 'pkg', 'exav_unpack_wasm_bg.wasm')) });
+});
+
+describe('the volumes of a set, from names', () => {
+  it('are in volume order whichever the order of the names', () => {
+    expect(volumeSet('big.7z.001', ['big.7z.003', 'big.7z.001', 'big.7z.002', 'note.txt'])).toEqual({
+      parts: ['big.7z.001', 'big.7z.002', 'big.7z.003'],
+      scheme: 'split',
+      complete: true,
+    });
+    expect(volumeSet('a.part2.rar', ['a.part3.rar', 'a.part1.rar', 'a.part2.rar'])).toEqual({
+      parts: ['a.part1.rar', 'a.part2.rar', 'a.part3.rar'],
+      scheme: 'rar',
+      complete: true,
+    });
+    // The bare .rar is the first, .r00 the second.
+    expect(volumeSet('a.r01', ['a.r01', 'a.rar', 'a.r00'])?.parts).toEqual(['a.rar', 'a.r00', 'a.r01']);
+  });
+
+  it('end with the .zip for a ZIP spanned over files, from any of its parts', () => {
+    for (const name of ['s.z01', 's.z02', 's.zip']) {
+      expect(volumeSet(name, ['s.zip', 's.z02', 's.z01'])).toEqual({ parts: ['s.z01', 's.z02', 's.zip'], scheme: 'zip', complete: true });
+    }
+  });
+
+  it('are incomplete with a volume missing, and a set only of those the names have', () => {
+    expect(volumeSet('big.7z.001', ['big.7z.001', 'big.7z.003'])?.complete).toBe(false);
+    expect(volumeSet('a.part1.rar', ['a.part1.rar', 'a.part2.rar'])?.complete).toBe(true);
+    expect(volumeSet('a.part2.rar', ['a.part2.rar', 'a.part3.rar'])?.complete).toBe(false);
+    // The central directory is in the last part.
+    expect(volumeSet('s.z01', ['s.z01', 's.z02'])?.complete).toBe(false);
+    expect(volumeSet('s.z01', ['s.z01', 's.z02', 's.zip'])?.complete).toBe(true);
+    expect(volumeSet('s.z01', ['s.z01', 's.z03', 's.zip'])?.complete).toBe(false);
+  });
+
+  it('are not found for a file that is one on its own, or in another set of the same stem', () => {
+    expect(volumeSet('a.rar', ['a.rar'])).toBeNull();
+    expect(volumeSet('a.zip', ['a.zip'])).toBeNull();
+    expect(volumeSet('notes.txt', ['notes.txt', 'notes.002'])).toBeNull();
+    expect(volumeSet('a.part1.rar', ['a.part1.rar', 'a.7z.001', 'a.7z.002'])).toBeNull();
+    expect(volumeSet('a.7z.001', ['a.7z.001', 'a.zip.002'])).toBeNull();
+    // Case does not matter to the stem or the scheme.
+    expect(volumeSet('A.PART1.RAR', ['A.PART1.RAR', 'a.part2.rar'])?.parts).toEqual(['A.PART1.RAR', 'a.part2.rar']);
+  });
+
+  it('are not found when two names claim a position', () => {
+    expect(volumeSet('a.7z.001', ['a.7z.001', 'a.7z.01', 'a.7z.002'])?.complete ?? false).toBe(false);
+  });
+});
+
+describe('a set joined', () => {
+  it('is read whole by its decoder: a RAR member that continues in the next volume has its size and bytes', async () => {
+    for (const names of [
+      ['set5.part1.rar', 'set5.part2.rar', 'set5.part3.rar'],
+      ['set4.rar', 'set4.r00', 'set4.r01'],
+    ]) {
+      const set = volumeSet(names[0]!, names)!;
+      const parts = set.parts.map(read);
+      const size = async (data: Uint8Array) => {
+        const archive = await Archive.open(data);
+        const noise = (await archive.list()).find((m: { name: string }) => m.name === 'noise.bin');
+        return noise.uncompressedSize as number;
+      };
+      expect(await size(parts[0]!), 'the first volume on its own').toBe(-1);
+      expect(await size(joinSet('rar', parts))).toBe(20000);
+    }
+  });
+
+  it('is the parts end to end for a split, and a ZIP spanned over files read as one', async () => {
+    const part = (n: number) => new Uint8Array([n]);
+    expect([...joinSet('split', [part(1), part(2), part(3)])]).toEqual([1, 2, 3]);
+    expect(() => joinSet('rar', [part(1), part(2)])).toThrow();
+    expect(() => joinSet('lzh', [part(1)])).toThrow(/cannot be joined/);
+    expect(() => joinSet('split', [1 as unknown as Uint8Array])).toThrow(/Uint8Array/);
+  });
+});
diff --git a/crates/exav-unpack/Cargo.toml b/crates/exav-unpack/Cargo.toml
index 41e48e57..14327ef3 100644
--- a/crates/exav-unpack/Cargo.toml
+++ b/crates/exav-unpack/Cargo.toml
@@ -41,7 +41,7 @@ chrono = { version = "0.4", default-features = false, features = ["clock", "std"
 # it is useful on its own and because it is the only thing that needs a CPU
 # decoder: keeping it out of here means a build without `pepack` never compiles
 # `exav-x86` at all.
-exav-pe-emu = { version = "0.0.2", path = "../exav-pe-emu", optional = true }
+exav-pe-emu = { version = "0.0.3", path = "../exav-pe-emu", optional = true }
 
 # --- Per-format optional deps. Each is pulled in only by the feature(s) below
 # that need it; a dep shared by several formats (e.g. `flate2`) is compiled if
@@ -56,34 +56,21 @@ zip = { version = "9", default-features = false, features = ["deflate-flate2", "
 # entirely (~8,600 `unsafe` ops, the single largest source in the dep tree).
 tar = { version = "0.4", default-features = false, optional = true }
 # For the bzip2 decoder vendored from `bzip2-rs` in `formats/bzip2_rs`.
-tinyvec = { version = "1.11", optional = true }
+tinyvec = { version = "1.13", optional = true }
 byteorder = { version = "1", optional = true }
 lzxd = { version = "0.2", optional = true }
-# FAT filesystem reader (a few `unsafe` uses of its own); `chrono` (timestamps)
-# is left off, so the only transitive deps are `bitflags` and `log`.
-fatfs = { version = "0.3", default-features = false, features = ["std", "alloc"], optional = true }
 # LZNT1, the compression NTFS applies per compression unit. Single-purpose and
 # dependency-free; the MFT walk itself is in-tree.
 lznt1 = { version = "0.1", optional = true }
-# ext2/3/4 reader. Read-only by construction, no `unsafe`, no dependencies.
-ext4-view = { version = "1", optional = true }
 # LZW, for ZOO's LZD codec. Dependency-free.
 salzweg = { version = "0.1", optional = true }
-# InstallShield `.z` reader. Its only real dep is `explode` (MIT), a leaf
-# decoder for the PKWARE DCL "implode" codec those archives use.
-unshield = { version = "0.2", default-features = false, optional = true }
-# The same decoder, read through a cap of our own: `unshield` only gives a
-# member whole, whatever it expands to.
-explode = { version = "0.1", optional = true }
-# structured documents that contain embedded files
-cfb = { version = "0.14.0", optional = true }
 # AutoCAD drawings before 2007 are in the code page `$DWGCODEPAGE` names,
 # among them the double-byte Asian ones, which `\M+` escapes use too.
 # encoding_rs is the WHATWG decoder set Firefox ships; built without
 # `simd-accel`.
 encoding_rs = { version = "0.8.42", default-features = false, features = ["alloc"], optional = true }
-mail-parser = { version = "0.11.4", optional = true }
-delharc = { version = "0.6.2", optional = true }
+mail-parser = { version = "0.11.9", optional = true }
+delharc = { version = "0.8.0", optional = true }
 # ARJ decompression: bitstream-io for the "fastest" LZ77 codec
 bitstream-io = { version = "4.10.0", optional = true }
 # Pure-Rust crypto for decrypting password-known encrypted archive members
@@ -95,31 +82,42 @@ aes = { version = "0.9", optional = true }
 hmac = { version = "0.13", optional = true }
 sha1 = { version = "0.11", optional = true }
 pbkdf2 = { version = "0.13", default-features = false, features = ["hmac"], optional = true }
-constant_time_eq = { version = "0.3", optional = true }
-# DMG support
-hfsplus = { version = "0.2", optional = true }
-apfs = { version = "0.2", optional = true }
-lzfse_rust = { version = "0.2.1", optional = true }
-base64 = { version = "0.22", optional = true }
-quick-xml = { version = "0.41", optional = true }
+base64 = { version = "0.23", optional = true }
+quick-xml = { version = "0.42", optional = true }
 des = { version = "0.9", default-features = false, optional = true }
 cbc = { version = "0.2", optional = true }
-flate2 = { version = "1.1.9", optional = true }
+flate2 = { version = "1.1.10", optional = true }
 # ZIP method 9 (Deflate64 / "enhanced deflate"). A leaf dep: zero runtime
 # dependencies, MIT, and `#![forbid(unsafe_code)]` like this crate. It is the
 # same decoder the `zip` crate uses behind its own `deflate64` feature; we depend
 # on it directly so the raw-bytes path (orphan local headers, where we never go
 # through the `zip` crate's reader) decodes method 9 too.
 deflate64 = { version = "0.1.12", optional = true }
-lzma-rust2 = { version = "0.21", default-features = false, features = ["std"], optional = true }
+lzma-rust2 = { version = "0.23", default-features = false, features = ["std"], optional = true }
 # PDF crypto primitives (replacing hand-rolled implementations)
 md-5 = { version = "0.11", optional = true }
 sha2 = { version = "0.11", optional = true }
 digest = { version = "0.11", optional = true }
 stringprep = { version = "0.1", optional = true }
-xz4rust = { version = "0.2.1", default-features = false, features = ["std", "bcj", "crc64", "delta", "no_unsafe"], optional = true }
-ruzstd = { version = "0.8", optional = true }
-crc32fast = { version = "1.5.0", optional = true }
+xz4rust = { version = "0.2.3", default-features = false, features = ["std", "bcj", "crc64", "delta", "no_unsafe"], optional = true }
+# 0.9.1 bounds a block's decoded size (RUSTSEC-2026-0344). Without `hash`
+# (`twox-hash`): exav does not check zstd's content checksum.
+ruzstd = { version = "0.9.1", default-features = false, features = ["std"], optional = true }
+crc32fast = { version = "1.5.3", optional = true }
+# HTML (`html`) and the text of a document (`text`, `text-pdf`). HTML is read by html5gum's
+# tokenizer alone (no tree; `forbid(unsafe_code)`, no dependency without its
+# `jetscii` feature), a PDF's text by hayro, which draws glyphs with their
+# Unicode: the same decoders (hayro-jpeg2000, hayro-jbig2) that
+# exav-render uses. Pinned with `=` for `cargo install`.
+#
+# hayro-interpret without `embed-cmaps` (the predefined CJK CMaps, brotli
+# compressed: it brings `brotli`), and it turns on hayro-syntax's `unsafe`
+# feature itself, which switches every `flate2` in the build to zlib-rs and
+# adds SIMD to the image decoders: `text-pdf` is therefore not a default.
+html5gum = { version = "=0.8.4", default-features = false, optional = true }
+hayro-interpret = { version = "=0.8.0", default-features = false, features = ["embed-fonts"], optional = true }
+hayro-syntax = { version = "=0.8.0", optional = true }
+kurbo = { version = "0.13", optional = true }
 
 [features]
 default = ["all-formats", "decrypt", "cli"]
@@ -145,11 +143,11 @@ all-formats = ["all-formats-no-emu", "pe-emu"]
 # attacker-supplied control flow. `pepack` stays in: it decompresses known
 # packers with native decoders and does not execute anything.
 all-formats-no-emu = [
-    "zip", "gzip", "tar", "bzip2", "xz", "zstd", "lzip", "cab", "sevenz", "rar",
+    "zip", "gzip", "tar", "bzip2", "xz", "zstd", "lzip", "lzma", "rpm", "cab", "sevenz", "rar",
     "arj", "lha", "iso", "ole", "pdf", "email", "dmg", "upx", "ar", "cpio", "xar", "chm",
     "uuencode", "xdp", "szdd", "tnef", "swf", "binhex", "lnk", "partition", "vhd", "lzw",
     "diskimage", "wim", "lz4", "arc", "ace", "stuffit", "alz", "egg", "hwp3",
-    "fat", "ext", "zoo", "ishieldz", "inno", "ntfs", "pyc",
+    "fat", "exfat", "squashfs", "cramfs", "romfs", "erofs", "ext", "zoo", "ishieldz", "inno", "ntfs", "pyc",
     "nsis", "machofat", "sfx", "autoit", "onenote", "rtf", "pepack",
     "javaclass", "aimodel", "screnc", "base64scan", "dxf", "dwg",
 ]
@@ -162,10 +160,12 @@ bzip2 = ["bzip2-decoder"]
 # Internal: the vendored bzip2 decoder, shared by every format that carries
 # bzip2. Not a format of its own; select `bzip2` instead.
 bzip2-decoder = ["dep:tinyvec", "dep:crc32fast"]
-xz = ["dep:xz4rust"]
+xz = ["dep:xz4rust", "dep:crc32fast"]
 zstd = ["dep:ruzstd"]
 lzip = ["dep:lzma-rust2", "dep:crc32fast"]
-cab = ["dep:lzxd", "dep:flate2", "dep:byteorder"]
+lzma = ["dep:lzma-rust2"]
+rpm = []
+cab =["dep:lzxd", "dep:flate2", "dep:byteorder"]
 chm = ["dep:lzxd"]
 sevenz = ["dep:lzma-rust2", "bzip2-decoder", "dep:flate2", "dep:crc32fast"]
 rar = []
@@ -225,16 +225,28 @@ alz = ["dep:flate2", "bzip2-decoder"]
 egg = ["dep:flate2", "bzip2-decoder", "dep:lzma-rust2"]
 hwp3 = ["dep:flate2"]
 # FAT filesystem reader.
-fat =["dep:fatfs"]
+fat = []
+# exFAT, walked like FAT: a fragmented file comes back whole from its chain.
+exfat = []
+# SquashFS 4, in the compressions it has: gzip, LZMA, LZO (in-tree), XZ, LZ4
+# and Zstandard, whose decoders are those of the formats of the same names.
+squashfs = ["dep:flate2", "xz", "lzma", "lz4", "zstd"]
+# cramfs, the small read-only filesystem of boot images: blocks of zlib.
+cramfs = ["dep:flate2"]
+# romfs, the smallest read-only filesystem: files stored as they are.
+romfs = []
+# EROFS, the read-only filesystem of Android and of container images; the files
+# stored as they are. A compressed file is reported.
+erofs = []
 # ext2/3/4, walked as a filesystem for the same reason as FAT: a fragmented file
 # comes back whole from the inode's block map and in pieces from a carve.
-ext = ["dep:ext4-view"]
+ext = []
 # ZOO carries LZD (LZW) and LZH. The latter is `lh5` on the wire, so `delharc`
 # already covers it.
 zoo = ["dep:salzweg", "dep:delharc"]
 # InstallShield `.z`. NOT the `ISc(` InstallScript cabinet, whose only
 # implementation is LGPL and which stays recognised-but-unopened.
-ishieldz = ["dep:unshield", "dep:explode"]
+ishieldz = []
 inno = []
 # NTFS is walked through the MFT rather than as a filesystem tree: a scanner
 # wants every file's bytes, and the MFT also still holds deleted records.
@@ -242,9 +254,17 @@ ntfs = ["dep:lznt1"]
 upx = ["dep:flate2", "dep:lzma-rust2", "dep:base64"]
 
 # Structured documents.
-ole = ["dep:cfb", "dep:flate2"]
+ole = ["dep:flate2", "dep:encoding_rs"]
+# The builders of the tests of what reads compound files (`cfb::build`).
+test-util = []
 pdf = ["dep:flate2"]
-email = ["dep:mail-parser", "dep:base64"]
+# HTML as tokens and its bytes as text (the public `html` module).
+html = ["dep:html5gum", "dep:encoding_rs"]
+# The text a reader sees in HTML and in the XML parts of Office and
+# OpenDocument files (the public `text` module). `text-pdf` adds PDF's.
+text = ["html", "dep:quick-xml"]
+text-pdf = ["text", "pdf", "dep:hayro-interpret", "dep:hayro-syntax", "dep:kurbo"]
+email =["dep:mail-parser", "dep:base64"]
 # AutoCAD DXF: the files a drawing embeds (an OLE2FRAME's object), and the
 # public `dxf` module that drawing readers (exav-render's) build on.
 dxf = ["dep:encoding_rs"]
@@ -256,7 +276,7 @@ dwg = ["dep:encoding_rs"]
 # Apple disk images (UDIF + HFS+/APFS). The encrypted-DMG cipher stack is under
 # the `decrypt` feature, not here.
 dmg = [
-    "dep:hfsplus", "dep:apfs", "dep:lzfse_rust", "dep:xz4rust", "bzip2-decoder",
+    "dep:xz4rust", "bzip2-decoder",
     "dep:flate2", "dep:base64", "dep:quick-xml",
 ]
 
@@ -269,9 +289,12 @@ dmg = [
 # same as when no password is supplied. Effective only combined with a format
 # that has encryptable members. ARJ's ciphers come with `arj`, not this.
 decrypt = [
-    "dep:aes", "dep:hmac", "dep:pbkdf2", "dep:sha1", "dep:constant_time_eq",
+    "offcrypto", "dep:aes", "dep:hmac", "dep:pbkdf2", "dep:sha1",
     "dep:des", "dep:cbc", "dep:md-5", "dep:sha2", "dep:digest", "dep:stringprep",
 ]
+# Excel workbooks saved with a password: RC4, RC4 CryptoAPI and XOR
+# obfuscation (the public `offcrypto` module), which exav-render opens too.
+offcrypto = ["dep:md-5", "dep:sha1"]
 
 # Verify RAR5-decompressed output against the header CRC-32 (debug assert).
 # Off by default; enabled by the rar5_check example/tests.
@@ -316,23 +339,26 @@ required-features = ["zip", "cli"]
 sha2 = "0.11"
 # Test helpers build ZIP fixtures and gunzip stored disk images; as optional
 # normal dependencies they would be missing from a single-format test build.
-flate2 = "1.1.9"
+flate2 = "1.1.10"
 zip = { version = "9", default-features = false, features = ["deflate-flate2"] }
 # Reference PPMd7 (var.H) and PPMd8 (var.I) encoders, used only to validate the
 # models in `formats/ppmd7` and `formats/ppmd8` (CC0-1.0/MIT-0).
 ppmd-rust = "1"
 # Used only in tests to create 7z archives for roundtrip testing.
-sevenz-rust2 = { version = "0.20.2", default-features = false, features = ["bzip2", "ppmd", "util", "compress"] }
+sevenz-rust2 = { version = "0.24.1", default-features = false, features = ["bzip2", "ppmd", "util", "compress"] }
 # Used only in tests to build CAB fixtures for roundtrip testing.
 cab = "0.6.0"
 # Its XZ writer, used only in tests to build XZ (method 95) ZIP members.
-lzma-rust2 = { version = "0.21", default-features = false, features = ["std", "encoder", "xz"] }
+lzma-rust2 = { version = "0.23", default-features = false, features = ["std", "encoder", "xz"] }
 # Reference bzip2 encoder (a port of libbzip2), used only in tests to build
 # streams the vendored decoder must read.
 bzip2 = "0.6"
-# Used only in tests to prove the strict CFB reader rejects a malformed
-# compound file that exav's lenient OLE fallback still recovers.
-cfb = "0.14.0"
+# Used only in tests: an independent writer and strict reader of compound
+# files, to build them and to check exav's lenient reader against.
+cfb = "0.15.0"
+# The oracle `formats/lzfse` is checked against, and its encoder builds the
+# streams it reads.
+lzfse_rust = "0.2.1"
 
 # docs.rs builds with every feature on, so the parts gated behind a feature
 # (in particular exav-core's `unstable-internals`) appear on the rendered page
diff --git a/crates/exav-unpack/MEMORY.md b/crates/exav-unpack/MEMORY.md
index 34e456f7..fcc7d818 100644
--- a/crates/exav-unpack/MEMORY.md
+++ b/crates/exav-unpack/MEMORY.md
@@ -70,7 +70,9 @@ goes through the same pipeline (`scan_object`).
   `Read` decoder straight off the source, no buffering on either side.
 - **Stored-offset containers** parse a small header or table through
   `Read + Seek`, then seek and `take` each member (`stream_stored`): ar, cpio,
-  partition, machofat, tnef, onenote, sfx, pyc, and the ISO 9660 trees of iso.
+  partition (a volume over `max_buffer_bytes` that holds a filesystem exav
+  reads is walked in place instead), machofat, tnef, onenote, sfx, pyc, and the ISO 9660 trees
+  of iso.
   A part of a table left unwalked (too many partitions or ISO directories, a
   truncated table) is a member of its own, reported unsupported.
 - **ISO** walks its ISO 9660 trees and then its UDF tree, skipping files the
@@ -82,10 +84,44 @@ goes through the same pipeline (`scan_object`).
   FWS header. **szdd**: SZDD's LZSS as a streaming `Read`; KWAJ is decoded whole.
 - **Solid blocks (7z, cab)**: the block or folder is a forward-only `Read`;
   each file is a `take(size)` window after skipping to its offset, so the
-  decompressed solid unit is never buffered. 7z still holds its compressed
-  input, and AES members take the buffered CRC/password path.
+  decompressed solid unit is never buffered. 7z reads its header from the end
+  of the source and a folder's packed bytes from where they are
+  (`source::Reader`), so the archive is not held; the members before the one
+  wanted are skipped and charged to the scan budget before they are decoded.
+  AES folders take the buffered CRC/password path and BCJ2 folders the graph
+  decoder, each holding the folder's packed bytes (at most `max_buffer_bytes`).
+- **WIM** (`formats/wim`): the header, the table of resources and the directory
+  tree (held, up to `max_buffer_bytes`) are read from where they are; a file
+  resource is a `ResourceReader` that reads and decodes a chunk at a time. With
+  checksums verified its SHA-1 is checked as it is read, and a mismatch is an
+  error at its end. **xar**: the table of contents is inflated (up to 64 MiB)
+  and each member is a reader over its range of the heap.
 - **DMG**: the UDIF disk is a `Read + Seek` over its decoded runs, and its
-  HFS+/APFS files are read from it.
+  HFS+/APFS files are read from it (`formats/hfsplus.rs`, `formats/apfs.rs`).
+  The directory records of a volume are kept, up to `max_members`, to build
+  paths; a file within `max_buffer_bytes` is held while it is read, a longer
+  one is streamed.
+- **Virtual disks (VHD, VHDX, QCOW2, VMDK)**: a `VDisk` (`formats/vdisk.rs`),
+  a `Read + Seek` that reads the container's tables from the source as units
+  are reached and holds nothing but a cache of decoded compressed units (32
+  MiB at most) and, for a streamOptimized VMDK, an index of one entry per grain
+  (counted against `max_buffer_bytes`). A disk of at most `max_buffer_bytes` is
+  read into one member; a larger one is walked in place (`formats/volumes.rs`):
+  its filesystems (NTFS, FAT, exFAT, ext, HFS+, APFS, SquashFS, cramfs, romfs,
+  EROFS) are read through the disk as a `Read + Seek`, one file at a time, a
+  file within `reserve()` held and a longer one streamed (`vol::Got::Stream`).
+  What the disk decodes is charged to the scan budget. A
+  raw image of one of them, and a raw partitioned disk with a volume over the
+  limit, are walked the same way.
+- **The filesystems** (`formats/{ntfs,fat,exfat,ext,hfsplus,apfs,squashfs,
+  cramfs,romfs,erofs}.rs`, on `formats/vol.rs`) hold a few blocks of metadata
+  and one file of at most `reserve()` bytes, whatever the volume; a longer file
+  is a `Read` over its stretches (`vol::Pieces` over a `vol::Plan`, or a
+  `vol::Fill` of their own for the compressed ones), which fails where the
+  volume stops giving it. Directories are read a block at a time;
+  the total read of directories is bounded by the volume's size (a directory
+  that lists one above it, or shares blocks with another, is walked once or
+  runs the bound out and is reported).
 - **Everything else** is read whole (`read_whole`: zero-copy when the source is
   in memory, bounded by `max_buffer_bytes`), and its members come out as
   `Bytes`.
@@ -134,7 +170,8 @@ it.
   so unwritten extents (zeroes) cost nothing until then.
 - **Decoders that thread `max_buffer`**: CAB (`Cabinet::new`, each folder and the
   combined buffer), 7z solid blocks, PPMd input and output, BCJ filters, DMG
-  HFS+/APFS files (read into a writer capped at `reserve()`), an encrypted
+  HFS+/APFS files (a size past `reserve()` is a limit; a compressed one is
+  unpacked under the same cap), an encrypted
   DMG (decrypted whole), encrypted ZIP members
   (`read_encrypted_member`), ARJ (the whole archive on entry), VBA
   (`decompress`, `build_artifacts`), the `ar` name table, the RAR3 window
diff --git a/crates/exav-unpack/NOTICE b/crates/exav-unpack/NOTICE
index 5dbbcdb8..b9943778 100644
--- a/crates/exav-unpack/NOTICE
+++ b/crates/exav-unpack/NOTICE
@@ -132,6 +132,66 @@ Upstream: https://github.com/akolman/EggDotNet
 Copyright (c) Andrew Kolman
 
 
+unshield and explode, MIT (source derivatives)
+----------------------------------------------
+
+src/formats/ishield_z.rs reads InstallShield .z tables of contents as the
+unshield crate 0.2.0 does, and src/formats/dcl_explode.rs decodes their PKWARE
+DCL "implode" members as the explode crate 0.1.2 does, a port of blast.c
+(below).
+
+Upstream: https://github.com/agrif/unshield, https://github.com/agrif/explode
+Copyright (c) 2020 Aaron Griffith
+
+
+cmpfs decmpfs decoder, MIT (source derivative)
+----------------------------------------------
+
+src/formats/decmpfs.rs, the decoder of the files macOS compresses (decmpfs) for
+HFS+ and APFS, follows cmpfs 0.1.0's reading of the attribute and of the
+resource fork (the types, the block tables, the stored-block markers), over
+exav's own codecs and with its own bounds. Used under the MIT License.
+
+Upstream: https://github.com/Dil4rd/dpp
+Copyright (c) 2026 Dil4rd
+
+
+Apple lzfse, BSD-3-Clause (source derivative)
+---------------------------------------------
+
+src/formats/lzfse.rs, the LZFSE and LZVN decoder of DMG runs, is a Rust port of
+the decoder of Apple's reference implementation, changed to decode a whole
+buffer into a capped one.
+
+Upstream: https://github.com/lzfse/lzfse
+Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder(s) nor the names of any
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 AutoIt-Ripper, MIT (reference implementation)
 ---------------------------------------------
 
@@ -143,8 +203,8 @@ Upstream: https://github.com/nazywam/AutoIt-Ripper
 Copyright (c) nazywam and contributors
 
 
-NSIS format headers, zlib
--------------------------
+NSIS format headers and blast.c, zlib
+-------------------------------------
 
 src/formats/nsis.rs implements the installer layout from NSIS's format header
 Source/exehead/fileform.h.
@@ -152,6 +212,14 @@ Source/exehead/fileform.h.
 Upstream: https://github.com/kichik/nsis
 Copyright (c) Nullsoft and contributors
 
+src/formats/dcl_explode.rs keeps the algorithm and code-length tables of
+blast.c, through the explode port above, altered to decode a whole buffer.
+
+Upstream: https://github.com/madler/zlib/tree/master/contrib/blast
+Copyright (C) Mark Adler
+
+Each under these terms:
+
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the
 use of this software.
@@ -191,14 +259,23 @@ Copyright the sevenz-rust2 authors. Licensed under the Apache License, Version
 2.0 (text below).
 
 
-Public-domain sources, recorded for completeness
-------------------------------------------------
+Specifications and public-domain sources, recorded for completeness
+-------------------------------------------------------------------
 
 - src/formats/ppmd7/ is vendored and adapted from ppmd-rust 1.4.0
   (https://crates.io/crates/ppmd-rust), CC0-1.0 OR MIT-0.
 - src/formats/aplib.rs reproduces the bit and gamma readers of the reference
   depack.c from aPLib by Jørgen Ibsen, released free to use
   (https://ibsensoftware.com/products_aPLib.html).
+- The BIFF reader (src/formats/biff/) follows Microsoft's [MS-XLS] under the
+  Microsoft Open Specifications Promise, and, for BIFF2 to BIFF5 formula
+  tokens and the argument counts of the function table (ftab.rs),
+  OpenOffice.org's "Microsoft Excel File Format" documentation (Daniel Rentz,
+  Public Documentation License 1.0).
+- The DOS and Mac code page tables in src/formats/charset_tables.rs (the
+  ones encoding_rs does not have) are generated by scripts/codepages.py from
+  the mapping tables of Python's codecs, which are the Unicode Consortium's
+  published mappings.
 - The decode tables in src/formats/screnc.rs are the Microsoft Script Encoder
   constants as published in Didier Stevens' public-domain decode-vbe.py
   (https://blog.didierstevens.com/programs/).
diff --git a/crates/exav-unpack/README.md b/crates/exav-unpack/README.md
index 6cde2f02..ff0c698f 100644
--- a/crates/exav-unpack/README.md
+++ b/crates/exav-unpack/README.md
@@ -15,10 +15,15 @@ member is reported as unsupported, never silently dropped.
 zstd, XZ, PPMd and the PKZIP 1.x ones), gzip, tar, xz, bzip2, zstd, lzip, LZ4,
 Unix `compress`, CAB, 7z, RAR (RAR3 LZ+PPMd, RAR5 LZ), ARJ, LHA, ZOO, ARC, EGG,
 ALZ, ISO 9660 and UDF, ar, cpio, xar, WIM, OLE2, PDF, MIME email and TNEF, Apple
-DMG (UDIF + HFS+/APFS), virtual disks (VHD, VHDX, QCOW2, VMDK) with the NTFS and
-FAT filesystems inside them, UPX and other PE packers, and more. The full list
+DMG (UDIF + HFS+/APFS), virtual disks (VHD, VHDX, QCOW2, VMDK), and the
+filesystems of disks and partitions (NTFS, FAT, exFAT, ext2/3/4, HFS+, APFS,
+SquashFS, cramfs, romfs, EROFS), UPX and other PE packers, and more. The full list
 is at [exav.org](https://exav.org/unpack/formats/).
 
+A virtual disk, or a raw disk image, larger than the buffer limit is not held:
+its tables are read as the walk reaches them, an unallocated range costs
+nothing, and the files of its filesystems come out one at a time.
+
 Every format is a **Cargo feature**, so you can build only what you need
 (`--no-default-features --features zip` for a ZIP-only extractor). Decryption
 (`decrypt`, on by default) and making a checksum mismatch an error
diff --git a/crates/exav-unpack/examples/dump_members.rs b/crates/exav-unpack/examples/dump_members.rs
index c83b0958..14638a92 100644
--- a/crates/exav-unpack/examples/dump_members.rs
+++ b/crates/exav-unpack/examples/dump_members.rs
@@ -11,7 +11,7 @@
 //!
 //! Usage: `cargo run --example dump_members --all-features -- <file> <outdir>`
 
-use exav_unpack::{detect, Budget, Limits, Member};
+use exav_unpack::{Budget, Limits, Member, detect};
 use std::path::PathBuf;
 
 fn main() {
diff --git a/crates/exav-unpack/examples/rar5_check.rs b/crates/exav-unpack/examples/rar5_check.rs
index 746c6f62..ac23d67a 100644
--- a/crates/exav-unpack/examples/rar5_check.rs
+++ b/crates/exav-unpack/examples/rar5_check.rs
@@ -98,11 +98,11 @@ fn check_archive(data: &[u8]) -> (u32, u32, u32, u32, u32) {
             let mut extra_size = 0u64;
             {
                 let mut qq = hdr + t1 + t2;
-                if hflags & 0x01 != 0 {
-                    if let Some((v, n)) = vint(data, qq) {
-                        extra_size = v;
-                        qq += n;
-                    }
+                if hflags & 0x01 != 0
+                    && let Some((v, n)) = vint(data, qq)
+                {
+                    extra_size = v;
+                    qq += n;
                 }
                 let _ = qq;
             }
diff --git a/crates/exav-unpack/scripts/codepages.py b/crates/exav-unpack/scripts/codepages.py
new file mode 100644
index 00000000..0336b2a0
--- /dev/null
+++ b/crates/exav-unpack/scripts/codepages.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+"""Writes src/formats/charset_tables.rs: the single-byte DOS and Mac code
+pages that encoding_rs does not have, as tables of 256 UTF-16 code units, from
+Python's own codecs. Undefined bytes map to U+FFFD.
+
+usage, from crates/exav-unpack:
+python3 -I scripts/codepages.py > src/formats/charset_tables.rs
+"""
+
+PAGES = [
+    (437, "cp437"),
+    (720, "cp720"),
+    (737, "cp737"),
+    (775, "cp775"),
+    (850, "cp850"),
+    (852, "cp852"),
+    (855, "cp855"),
+    (857, "cp857"),
+    (858, "cp858"),
+    (860, "cp860"),
+    (861, "cp861"),
+    (862, "cp862"),
+    (863, "cp863"),
+    (864, "cp864"),
+    (865, "cp865"),
+    (869, "cp869"),
+    (10006, "mac_greek"),
+    (10029, "mac_latin2"),
+    (10079, "mac_iceland"),
+    (10081, "mac_turkish"),
+]
+
+
+def table(codec):
+    out = []
+    for b in range(256):
+        try:
+            s = bytes([b]).decode(codec)
+        except UnicodeDecodeError:
+            s = "�"
+        cp = ord(s) if len(s) == 1 else 0xFFFD
+        if cp > 0xFFFF:
+            cp = 0xFFFD
+        out.append(cp)
+    return out
+
+
+print("// Generated by scripts/codepages.py from Python's codecs. Do not edit.")
+print()
+print("/// (code page, its 256 characters).")
+print("#[rustfmt::skip]")
+print("pub(crate) static TABLES: &[(u16, [u16; 256])] = &[")
+for cp, codec in PAGES:
+    t = table(codec)
+    print(f"    // {codec}")
+    print(f"    ({cp}, [")
+    for i in range(0, 256, 16):
+        print("        " + ", ".join(f"0x{x:04X}" for x in t[i:i + 16]) + ",")
+    print("    ]),")
+print("];")
diff --git a/crates/exav-unpack/src/bytes.rs b/crates/exav-unpack/src/bytes.rs
index 2e3e16d6..0b9ba51a 100644
--- a/crates/exav-unpack/src/bytes.rs
+++ b/crates/exav-unpack/src/bytes.rs
@@ -18,9 +18,126 @@ pub(crate) fn to_usize(v: u64) -> usize {
     usize::try_from(v).unwrap_or(usize::MAX)
 }
 
+/// A bounds-checked little-endian reader for formats made of short records:
+/// a read past the end gives zeros and sets `short`, so a truncated record
+/// never panics.
+#[derive(Clone)]
+pub struct Cur<'a> {
+    pub d: &'a [u8],
+    pub p: usize,
+    pub short: bool,
+}
+
+impl<'a> Cur<'a> {
+    pub fn new(d: &'a [u8]) -> Self {
+        Cur {
+            d,
+            p: 0,
+            short: false,
+        }
+    }
+
+    pub fn at(d: &'a [u8], p: usize) -> Self {
+        Cur { d, p, short: false }
+    }
+
+    pub fn left(&self) -> usize {
+        self.d.len().saturating_sub(self.p)
+    }
+
+    pub fn skip(&mut self, n: usize) {
+        if self.left() < n {
+            self.short = true;
+            self.p = self.d.len();
+        } else {
+            self.p += n;
+        }
+    }
+
+    /// `n` bytes, or what is left (and `short` set).
+    pub fn bytes(&mut self, n: usize) -> &'a [u8] {
+        let start = self.p.min(self.d.len());
+        if self.left() < n {
+            self.short = true;
+            self.p = self.d.len();
+            &self.d[start..]
+        } else {
+            self.p += n;
+            &self.d[start..start + n]
+        }
+    }
+
+    pub fn u8(&mut self) -> u8 {
+        match self.d.get(self.p) {
+            Some(&b) => {
+                self.p += 1;
+                b
+            }
+            None => {
+                self.short = true;
+                0
+            }
+        }
+    }
+
+    pub fn u16(&mut self) -> u16 {
+        match *self.bytes(2) {
+            [a, b] => u16::from_le_bytes([a, b]),
+            _ => 0,
+        }
+    }
+
+    pub fn i16(&mut self) -> i16 {
+        self.u16() as i16
+    }
+
+    pub fn u32(&mut self) -> u32 {
+        match *self.bytes(4) {
+            [a, b, c, d] => u32::from_le_bytes([a, b, c, d]),
+            _ => 0,
+        }
+    }
+
+    pub fn i32(&mut self) -> i32 {
+        self.u32() as i32
+    }
+
+    pub fn f64(&mut self) -> f64 {
+        let b = self.bytes(8);
+        let mut a = [0u8; 8];
+        if b.len() == 8 {
+            a.copy_from_slice(b);
+        }
+        f64::from_le_bytes(a)
+    }
+}
+
+/// The `u16` at `p`, zero past the end.
+pub fn u16_at(d: &[u8], p: usize) -> u16 {
+    Cur::at(d, p).u16()
+}
+
+/// The `u32` at `p`, zero past the end.
+pub fn u32_at(d: &[u8], p: usize) -> u32 {
+    Cur::at(d, p).u32()
+}
+
 #[cfg(test)]
 mod tests {
-    use super::{at, to_usize};
+    use super::{Cur, at, to_usize};
+
+    #[test]
+    fn short_reads_give_zero_and_flag() {
+        let mut c = Cur::new(&[1, 2, 3]);
+        assert_eq!(c.u16(), 0x0201);
+        assert!(!c.short);
+        assert_eq!(c.u32(), 0);
+        assert!(c.short);
+        assert_eq!(c.left(), 0);
+        let mut c = Cur::at(&[1], 5);
+        assert_eq!(c.bytes(3), &[] as &[u8]);
+        assert_eq!(c.f64(), 0.0);
+    }
 
     #[test]
     fn a_wide_offset_saturates_instead_of_truncating() {
diff --git a/crates/exav-unpack/src/formats/aimodel.rs b/crates/exav-unpack/src/formats/aimodel.rs
index a8e55a3e..8f66942e 100644
--- a/crates/exav-unpack/src/formats/aimodel.rs
+++ b/crates/exav-unpack/src/formats/aimodel.rs
@@ -138,8 +138,8 @@ fn extract_safetensors<R>(
     // it were the header hides whatever falls past the cut, so an over-cap header
     // is reported — and the part that fits is still handed over, since a prefix
     // is content even when it is not all of it.
-    if header.len() as u64 > cap {
-        if let Some(r) = visit(
+    if header.len() as u64 > cap
+        && let Some(r) = visit(
             Entry::unsupported(
                 "safetensors-header".into(),
                 header.len() as u64,
@@ -148,9 +148,9 @@ fn extract_safetensors<R>(
                  the part that fits was scanned",
             ),
             budget,
-        ) {
-            return Ok(Some(r));
-        }
+        )
+    {
+        return Ok(Some(r));
     }
     let take = (header.len() as u64).min(cap) as usize;
     let member = header[..take].to_vec();
@@ -204,7 +204,7 @@ fn disassemble(data: &[u8], cap: u64) -> Vec<u8> {
     // Append `bytes` + `\n` to output, honoring the cap. Returns false if the
     // cap was reached (caller stops the walk).
     macro_rules! push_out {
-        ($bytes:expr) => {{
+        ($bytes:expr_2021) => {{
             let b: &[u8] = $bytes;
             if out.len() >= cap {
                 return out;
@@ -221,7 +221,7 @@ fn disassemble(data: &[u8], cap: u64) -> Vec<u8> {
     // Record a freshly-pushed string literal for later STACK_GLOBAL use and add
     // it to output.
     macro_rules! record_str {
-        ($bytes:expr) => {{
+        ($bytes:expr_2021) => {{
             let v: Vec<u8> = $bytes;
             push_out!(&v);
             prev2 = prev1.take();
@@ -232,7 +232,7 @@ fn disassemble(data: &[u8], cap: u64) -> Vec<u8> {
     // Read a little-endian unsigned integer of `n` bytes starting at `i+1`;
     // returns None on short read.
     macro_rules! read_le {
-        ($n:expr) => {{
+        ($n:expr_2021) => {{
             let n: usize = $n;
             match crate::bytes::at(data, i + 1, n) {
                 Some(s) => {
@@ -561,7 +561,7 @@ mod tests {
         let entries = extract(Format::AiModel, &pkl, &mut budget).unwrap();
         assert_eq!(entries.len(), 1);
         let out = &entries[0].data;
-        assert!(out.windows(2).any(|w| w == b"os"), "os not surfaced");
+        assert!(out.array_windows().any(|w| w == b"os"), "os not surfaced");
         assert!(
             out.windows(6).any(|w| w == b"system"),
             "system not surfaced"
@@ -609,7 +609,7 @@ mod tests {
         let entries = extract(Format::AiModel, &pkl, &mut budget).unwrap();
         assert_eq!(entries.len(), 1);
         let out = &entries[0].data;
-        assert!(out.windows(2).any(|w| w == b"os"));
+        assert!(out.array_windows().any(|w| w == b"os"));
         assert!(out.windows(6).any(|w| w == b"system"));
         // The truncated string literal must not appear.
         assert!(!out.windows(3).any(|w| w == b"abc"));
diff --git a/crates/exav-unpack/src/formats/apfs.rs b/crates/exav-unpack/src/formats/apfs.rs
new file mode 100644
index 00000000..4fca4536
--- /dev/null
+++ b/crates/exav-unpack/src/formats/apfs.rs
@@ -0,0 +1,1690 @@
+//! APFS: the files of a container, read where they lie.
+//!
+//! The container is a `Read + Seek`, read where the walk goes: its
+//! superblock, the object maps, the nodes of each volume's file-system tree,
+//! and each file's extents. Only a file is ever held, bounded by the buffer
+//! limit.
+//!
+//! A scanner wants every file's bytes, not a navigable tree, so the file-system
+//! tree is read once, in key order, for its directory records, and the paths
+//! are rebuilt from those. Each file is then looked up by its id for the
+//! three things it has: the inode (size, flags), the attributes
+//! (`com.apple.decmpfs`, read by `formats/decmpfs`) and the extents.
+//!
+//! ```text
+//! block 0, checkpoint area      container superblock: block size, the volumes'
+//!                               ids, the container's object map
+//!   object map                  B-tree: virtual object id -> block
+//!   volume superblock           the volume's object map and tree root ids
+//!     file-system tree          B-tree, ordered by (object id, record type):
+//!       inode (3)               mode, flags, size
+//!       attribute (4)           extended attribute, or the stream holding it
+//!       file extent (8)         logical offset -> blocks; none: a hole
+//!       directory record (9)    (parent id, name) -> the object's id and kind
+//! ```
+//!
+//! All fields are little-endian, and every object begins with the Fletcher-64
+//! checksum of its block. Like every format's, it is not checked unless the
+//! budget asks for that (`checksums`), except to choose between the container's
+//! superblocks. Implemented from Apple's published reference.
+//!
+//! Every volume of the container is walked, under its name when there are
+//! several. A volume that is encrypted is reported, not read. A symbolic link
+//! is not read.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::collections::HashMap;
+use std::io::{Read, Seek, SeekFrom};
+
+use super::decmpfs;
+use super::vol::{
+    Attrs as VolAttrs, Emit, Found, Got, Next, Piece, Pieces, Plan, Vol, hand, le16, le32, le64,
+    read_file,
+};
+use crate::{Budget, Entry, LimitHit};
+
+/// "NXSB" and "APSB", little-endian, 32 bytes into their blocks.
+const NX_MAGIC: u32 = 0x4253_584E;
+const APSB_MAGIC: u32 = 0x4253_5041;
+
+/// Record types of the file-system tree.
+const J_INODE: u8 = 3;
+const J_XATTR: u8 = 4;
+const J_FILE_EXTENT: u8 = 8;
+const J_DREC: u8 = 9;
+
+/// The id of the root directory.
+const ROOT: u64 = 2;
+
+/// Directory record kinds.
+const DT_DIR: u16 = 4;
+const DT_LNK: u16 = 10;
+
+/// `APFS_FS_UNENCRYPTED`, a volume flag.
+const FS_UNENCRYPTED: u64 = 1;
+
+/// An inode flag: the size of the file before compression is recorded.
+const HAS_UNCOMPRESSED_SIZE: u64 = 0x4_0000;
+
+/// A tree is no deeper than this: a node's level counts down to a leaf's 0.
+const MAX_LEVEL: u16 = 16;
+
+/// The most records one walk of a tree visits.
+const MAX_RECORDS: u64 = 1 << 26;
+
+/// The most mappings of an object map that are kept.
+const MAX_OMAP: usize = 1 << 20;
+
+/// The most extents of one file that are followed.
+const MAX_EXTENTS: usize = 1 << 20;
+
+/// The most blocks of the checkpoint area that are searched for the newest
+/// superblock.
+const MAX_CHECKPOINT_BLOCKS: u64 = 1024;
+
+/// The most folders a path passes through.
+const MAX_PATH_DEPTH: usize = 256;
+
+/// The most blocks kept after they are read.
+const CACHE: usize = 256;
+
+/// The most an attribute held in a stream is, bytes.
+const ATTR_MAX: u64 = 1 << 16;
+
+/// The Fletcher-64 checksum of an object's block, from its ninth byte on.
+fn fletcher64(data: &[u8]) -> u64 {
+    const M: u64 = 0xFFFF_FFFF;
+    let (mut s1, mut s2) = (0u64, 0u64);
+    for c in data.as_chunks::<4>().0 {
+        s1 = s1.saturating_add(u64::from(u32::from_le_bytes(*c))) % M;
+        s2 = s2.saturating_add(s1) % M;
+    }
+    let c1 = M.saturating_sub(s1.saturating_add(s2) % M);
+    let c2 = M.saturating_sub(s1.saturating_add(c1) % M);
+    c2 << 32 | c1
+}
+
+/// A structure that is not what it must be, or cannot be read.
+struct Bad;
+
+type Res<T> = Result<T, Bad>;
+
+/// Whether a block carries the checksum of the rest of it.
+fn sum_holds(b: &[u8]) -> bool {
+    b.get(8..)
+        .is_some_and(|rest| le64(b, 0) == fletcher64(rest))
+}
+
+/// The container's blocks.
+struct Fs<'a, 'd> {
+    v: &'a mut Vol<'d>,
+    block: u64,
+    cache: HashMap<u64, Vec<u8>>,
+    /// Whether a block whose checksum does not hold is refused. It is not, as
+    /// with every format: a checksum that is wrong must not keep a file from
+    /// being scanned.
+    strict: bool,
+}
+
+impl Fs<'_, '_> {
+    /// Block `n`, if it is in the volume, whatever its checksum.
+    fn raw(&mut self, n: u64) -> Option<Vec<u8>> {
+        self.v.at(
+            n.checked_mul(self.block)?,
+            crate::bytes::to_usize(self.block),
+        )
+    }
+
+    /// Block `n`, if it is in the volume and, when checksums are checked, its
+    /// checksum holds.
+    fn read(&mut self, n: u64) -> Option<Vec<u8>> {
+        let b = self.raw(n)?;
+        (!self.strict || sum_holds(&b)).then_some(b)
+    }
+
+    /// [`Self::read`], kept for the next time: the top of a tree is read for
+    /// every lookup.
+    fn block(&mut self, n: u64) -> Option<Vec<u8>> {
+        if let Some(b) = self.cache.get(&n) {
+            return Some(b.clone());
+        }
+        let b = self.read(n)?;
+        if self.cache.len() >= CACHE {
+            self.cache.clear();
+        }
+        self.cache.insert(n, b.clone());
+        Some(b)
+    }
+}
+
+const ROOT_NODE: u16 = 1;
+const LEAF_NODE: u16 = 2;
+const FIXED_NODE: u16 = 4;
+
+/// A node of a B-tree.
+struct Node {
+    b: Vec<u8>,
+    flags: u16,
+    level: u16,
+    count: usize,
+    /// Where the table of contents, the keys and the values begin and end.
+    toc: usize,
+    keys: usize,
+    vals: usize,
+}
+
+impl Node {
+    fn parse(b: Vec<u8>) -> Option<Node> {
+        let flags = le16(&b, 32);
+        let count = crate::bytes::to_usize(u64::from(le32(&b, 36)));
+        let toc = 56usize.checked_add(usize::from(le16(&b, 40)))?;
+        let keys = toc.checked_add(usize::from(le16(&b, 42)))?;
+        // The root ends in the tree's description, which the values stop before.
+        let vals = match flags & ROOT_NODE != 0 {
+            true => b.len().checked_sub(40)?,
+            false => b.len(),
+        };
+        let entry = if flags & FIXED_NODE != 0 { 4 } else { 8 };
+        if toc.checked_add(count.checked_mul(entry)?)? > keys || keys > vals {
+            return None;
+        }
+        Some(Node {
+            level: le16(&b, 34),
+            flags,
+            count,
+            toc,
+            keys,
+            vals,
+            b,
+        })
+    }
+
+    fn leaf(&self) -> bool {
+        self.flags & LEAF_NODE != 0
+    }
+
+    /// Record `i`: its key and its value. `fixed` is the sizes of the keys and
+    /// values of a tree that has only one size of each.
+    fn rec(&self, i: usize, fixed: Option<(usize, usize)>) -> Option<(&[u8], &[u8])> {
+        if i >= self.count {
+            return None;
+        }
+        let at = |o: usize| Some(usize::from(le16(&self.b, o)));
+        let (key, val) = if self.flags & FIXED_NODE != 0 {
+            let (k, v) = fixed?;
+            let e = self.toc.checked_add(i.checked_mul(4)?)?;
+            ((at(e)?, k), (at(e.checked_add(2)?)?, v))
+        } else {
+            let e = self.toc.checked_add(i.checked_mul(8)?)?;
+            (
+                (at(e)?, at(e.checked_add(2)?)?),
+                (at(e.checked_add(4)?)?, at(e.checked_add(6)?)?),
+            )
+        };
+        // What a node above the leaves holds is the id of a child.
+        let val_len = if self.leaf() { val.1 } else { 8 };
+        let val_at = self.vals.checked_sub(val.0).filter(|&s| s >= self.keys)?;
+        Some((
+            crate::bytes::at(&self.b, self.keys.checked_add(key.0)?, key.1)?,
+            crate::bytes::at(&self.b, val_at, val_len)?,
+        ))
+    }
+}
+
+/// What an object map holds: the block of each object id, `None` where the
+/// newest mapping is a deletion.
+type Omap = HashMap<u64, Option<u64>>;
+
+/// A B-tree, from its root's block.
+struct Tree<'o> {
+    root: u64,
+    fixed: Option<(usize, usize)>,
+    /// How the ids of its children become blocks: through an object map, or
+    /// not at all (they are blocks).
+    omap: Option<&'o Omap>,
+}
+
+/// A position in a tree, from which its records follow in order.
+struct Cursor {
+    /// The nodes from the root to a leaf, and in each the child taken (the
+    /// record of a leaf not yet given).
+    stack: Vec<(Node, usize)>,
+    seen: u64,
+}
+
+impl Tree<'_> {
+    fn child(&self, fs: &mut Fs, node: &Node, i: usize) -> Res<Node> {
+        let (_, id) = node.rec(i, self.fixed).ok_or(Bad)?;
+        let id = le64(id, 0);
+        let block = match self.omap {
+            Some(map) => map.get(&id).copied().flatten().ok_or(Bad)?,
+            None => id,
+        };
+        let child = Node::parse(fs.block(block).ok_or(Bad)?).ok_or(Bad)?;
+        let leaf_ok = child.leaf() == (child.level == 0);
+        match child.level.checked_add(1) == Some(node.level) && leaf_ok {
+            true => Ok(child),
+            false => Err(Bad),
+        }
+    }
+
+    /// The first record whose key `before` does not put before the one wanted,
+    /// and those after it. Keys of the nodes above are the least of what is
+    /// below them, so the descent takes the last child whose key is before.
+    fn seek(&self, fs: &mut Fs, before: &dyn Fn(&[u8]) -> bool) -> Res<Cursor> {
+        let mut node = Node::parse(fs.block(self.root).ok_or(Bad)?).ok_or(Bad)?;
+        if node.level > MAX_LEVEL || node.leaf() != (node.level == 0) {
+            return Err(Bad);
+        }
+        let mut stack = Vec::new();
+        loop {
+            let keys = (0..node.count).map(|i| node.rec(i, self.fixed).map(|(k, _)| k));
+            if node.leaf() {
+                let mut at = node.count;
+                for (i, key) in keys.enumerate() {
+                    if !before(key.ok_or(Bad)?) {
+                        at = i;
+                        break;
+                    }
+                }
+                stack.push((node, at));
+                return Ok(Cursor { stack, seen: 0 });
+            }
+            let mut pick = 0;
+            for (i, key) in keys.enumerate() {
+                if !before(key.ok_or(Bad)?) {
+                    break;
+                }
+                pick = i;
+            }
+            let child = self.child(fs, &node, pick)?;
+            stack.push((node, pick));
+            node = child;
+        }
+    }
+}
+
+impl Cursor {
+    /// The next record, a copy of its key and of its value.
+    fn next(&mut self, fs: &mut Fs, tree: &Tree) -> Res<Option<(Vec<u8>, Vec<u8>)>> {
+        loop {
+            let Some((node, at)) = self.stack.last_mut() else {
+                return Ok(None);
+            };
+            if !node.leaf() {
+                return Err(Bad);
+            }
+            if *at < node.count {
+                let i = *at;
+                *at = at.saturating_add(1);
+                self.seen = self.seen.saturating_add(1);
+                if self.seen > MAX_RECORDS {
+                    return Err(Bad);
+                }
+                let (k, v) = node.rec(i, tree.fixed).ok_or(Bad)?;
+                return Ok(Some((k.to_vec(), v.to_vec())));
+            }
+            // This leaf is done: on to the next child of the nearest node
+            // above that has one, and down its first children to a leaf.
+            self.stack.pop();
+            let mut down = loop {
+                let Some((parent, taken)) = self.stack.last_mut() else {
+                    return Ok(None);
+                };
+                *taken = taken.saturating_add(1);
+                if *taken < parent.count {
+                    break tree.child(fs, parent, *taken)?;
+                }
+                self.stack.pop();
+            };
+            while !down.leaf() {
+                let first = tree.child(fs, &down, 0)?;
+                self.stack.push((down, 0));
+                down = first;
+            }
+            self.stack.push((down, 0));
+        }
+    }
+}
+
+/// The object id and the record type a key of the file-system tree starts with.
+fn key_of(key: &[u8]) -> (u64, u8) {
+    let packed = le64(key, 0);
+    (packed & 0x0FFF_FFFF_FFFF_FFFF, (packed >> 60) as u8)
+}
+
+/// The object map at physical block `block`: the block of each object id as of
+/// transaction `xid`.
+fn load_omap(fs: &mut Fs, block: u64, xid: u64) -> Option<Omap> {
+    let object = fs.block(block)?;
+    let tree = Tree {
+        root: le64(&object, 48),
+        fixed: Some((16, 16)),
+        omap: None,
+    };
+    let mut cursor = tree.seek(fs, &|_| false).ok()?;
+    // (the newest transaction seen, where it maps the object)
+    let mut newest: HashMap<u64, (u64, Option<u64>)> = HashMap::new();
+    while let Some((key, val)) = cursor.next(fs, &tree).ok()? {
+        let (id, at) = (le64(&key, 0), le64(&key, 8));
+        if at > xid || key.len() < 16 || val.len() < 16 {
+            continue;
+        }
+        if newest.len() >= MAX_OMAP && !newest.contains_key(&id) {
+            return None;
+        }
+        // Bit 0 of the flags marks a deleted mapping.
+        let to = (le32(&val, 0) & 1 == 0).then(|| le64(&val, 8));
+        match newest.get(&id) {
+            Some(&(seen, _)) if seen > at => {}
+            _ => {
+                newest.insert(id, (at, to));
+            }
+        }
+    }
+    Some(newest.into_iter().map(|(id, (_, to))| (id, to)).collect())
+}
+
+/// An inode, as far as a walk reads it.
+struct Inode {
+    /// The id its extents are keyed by.
+    stream: u64,
+    flags: u32,
+    size: u64,
+}
+
+impl Inode {
+    fn parse(val: &[u8]) -> Option<Inode> {
+        if val.len() < 92 {
+            return None;
+        }
+        let size = match dstream_size(val.get(92..)?) {
+            Some(size) => size,
+            None if le64(val, 48) & HAS_UNCOMPRESSED_SIZE != 0 => le64(val, 84),
+            None => 0,
+        };
+        Some(Inode {
+            stream: le64(val, 8),
+            flags: le32(val, 68),
+            size,
+        })
+    }
+}
+
+/// The size of the data stream in an inode's extended fields: a count and a
+/// length, an (id, flags, length) triple for each, then their values, each
+/// padded to eight bytes. The stream is field 8 and starts with its size.
+fn dstream_size(x: &[u8]) -> Option<u64> {
+    let count = usize::from(le16(x, 0));
+    let mut at = count.checked_mul(4)?.checked_add(4)?;
+    for i in 0..count {
+        let e = i.checked_mul(4)?.checked_add(4)?;
+        let len = usize::from(le16(x, e.checked_add(2)?));
+        if *x.get(e)? == 8 && len >= 8 {
+            return Some(le64(crate::bytes::at(x, at, 8)?, 0));
+        }
+        at = at.checked_add(len.checked_add(7)? & !7)?;
+    }
+    None
+}
+
+/// The name in a directory record's key: a length and a hash, or a length
+/// alone, then the name and its NUL.
+fn drec_name(key: &[u8]) -> Option<String> {
+    let hashed = usize::try_from(le32(key, 8) & 0x3FF).ok()?;
+    let (len, at) = match key.len() == hashed.checked_add(12)? {
+        true => (hashed, 12),
+        false => (usize::from(le16(key, 8)), 10),
+    };
+    let name =
+        crate::bytes::at(key, at, len).filter(|n| at.saturating_add(n.len()) == key.len())?;
+    let name = name.strip_suffix(&[0]).unwrap_or(name);
+    Some(String::from_utf8_lossy(name).into_owned())
+}
+
+/// A file named by a directory record.
+struct Named {
+    id: u64,
+    parent: u64,
+    name: String,
+}
+
+/// A file's extents: (offset in the file, length, first block); a first block
+/// of 0 is a hole.
+struct Extent {
+    at: u64,
+    len: u64,
+    block: u64,
+}
+
+/// What a file's attributes give a walk.
+#[derive(Default)]
+struct Attrs {
+    decmpfs: Option<Vec<u8>>,
+    /// The stream that is the resource fork: its id and size.
+    fork: Option<(u64, u64)>,
+}
+
+/// A volume, mounted.
+struct Volume<'o> {
+    tree: Tree<'o>,
+}
+
+impl Volume<'_> {
+    fn inode(&self, fs: &mut Fs, id: u64) -> Res<Inode> {
+        let mut c = self.records(fs, id, J_INODE)?;
+        match c.next(fs, &self.tree)? {
+            Some((k, v)) if key_of(&k) == (id, J_INODE) => Inode::parse(&v).ok_or(Bad),
+            _ => Err(Bad),
+        }
+    }
+
+    /// A cursor at the first record of object `id` of type `ty` (or the first
+    /// after).
+    fn records(&self, fs: &mut Fs, id: u64, ty: u8) -> Res<Cursor> {
+        self.tree.seek(fs, &|k| key_of(k) < (id, ty))
+    }
+
+    fn extents(&self, fs: &mut Fs, id: u64) -> Res<Vec<Extent>> {
+        let mut c = self.records(fs, id, J_FILE_EXTENT)?;
+        let mut out = Vec::new();
+        while let Some((k, v)) = c.next(fs, &self.tree)? {
+            if key_of(&k) != (id, J_FILE_EXTENT) {
+                break;
+            }
+            if out.len() >= MAX_EXTENTS {
+                return Err(Bad);
+            }
+            // The key: the id and type, then the offset in the file. The
+            // value: the length (and flags above 56 bits), the first block,
+            // the crypto id.
+            out.push(Extent {
+                at: le64(&k, 8),
+                len: le64(&v, 0) & 0x00FF_FFFF_FFFF_FFFF,
+                block: le64(&v, 8),
+            });
+        }
+        Ok(out)
+    }
+
+    fn attrs(&self, fs: &mut Fs, id: u64) -> Res<Attrs> {
+        let mut c = self.records(fs, id, J_XATTR)?;
+        let mut out = Attrs::default();
+        while let Some((k, v)) = c.next(fs, &self.tree)? {
+            if key_of(&k) != (id, J_XATTR) {
+                break;
+            }
+            // The key: the id and type, a length, the name and its NUL.
+            let len = usize::from(le16(&k, 8));
+            let name = crate::bytes::at(&k, 10, len).unwrap_or_default();
+            let name = name.strip_suffix(&[0]).unwrap_or(name);
+            // The value: flags, a length, then the bytes; or, flagged as a
+            // stream, the stream's id and its size.
+            let stream = le16(&v, 0) & 1 != 0;
+            let held = || {
+                let len = usize::from(le16(&v, 2));
+                crate::bytes::at(&v, 4, len).map(<[u8]>::to_vec)
+            };
+            if name == decmpfs::ATTR.as_bytes() {
+                out.decmpfs = match stream {
+                    true => self.stream(fs, le64(&v, 4), le64(&v, 12), ATTR_MAX).ok(),
+                    false => held(),
+                };
+            } else if name == decmpfs::RESOURCE_FORK_ATTR.as_bytes() && stream {
+                out.fork = Some((le64(&v, 4), le64(&v, 12)));
+            }
+        }
+        Ok(out)
+    }
+
+    /// The `size` bytes of the data stream `id`, if they are at most `bound`.
+    fn stream(&self, fs: &mut Fs, id: u64, size: u64, bound: u64) -> Res<Vec<u8>> {
+        if size > bound {
+            return Err(Bad);
+        }
+        let mut out = Vec::new();
+        let mut extents = self.extents(fs, id)?;
+        match read_extents(fs, &mut extents, size, &mut out) {
+            true => Ok(out),
+            false => Err(Bad),
+        }
+    }
+
+    /// The bytes of file `id`: held when they are at most `cap`, else read as
+    /// they go. A compressed file is unpacked, and is not read as it goes.
+    fn file<'x>(&self, fs: &'x mut Fs<'_, '_>, id: u64, cap: u64) -> Got<'x> {
+        let Ok(inode) = self.inode(fs, id) else {
+            return Got::Why("APFS file whose inode could not be read");
+        };
+        if inode.flags & decmpfs::COMPRESSED_FLAG != 0 {
+            let attrs = self.attrs(fs, id).unwrap_or_default();
+            if let Some(attr) = attrs.decmpfs {
+                let fork = decmpfs::header(&attr)
+                    .filter(|h| decmpfs::in_fork(h.kind))
+                    .and(attrs.fork)
+                    // A fork holds the bytes in blocks, a little over their number.
+                    .and_then(|(stream, size)| {
+                        let bound = cap.saturating_add(cap / 32).saturating_add(4096);
+                        self.stream(fs, stream, size, bound).ok()
+                    });
+                return decmpfs::unpack(&attr, fork.as_deref(), cap);
+            }
+            if inode.size == 0 {
+                return Got::Why("compressed file (decmpfs) without its attribute");
+            }
+        }
+        let Ok(mut extents) = self.extents(fs, inode.stream) else {
+            return Got::Why("APFS file whose extents could not be read");
+        };
+        extents.sort_by_key(|e| e.at);
+        let plan = Spans {
+            extents: extents.into_iter(),
+            pending: None,
+            block: fs.block,
+            size: inode.size,
+            at: 0,
+        };
+        read_file(&mut *fs.v, Pieces::new(plan, inode.size), inode.size, cap)
+    }
+}
+
+/// The stretches of a file, from its extents in order of their place in it: a
+/// hole between them or after the last reads as zeros.
+struct Spans {
+    extents: std::vec::IntoIter<Extent>,
+    /// An extent held back while the hole before it is given.
+    pending: Option<Extent>,
+    block: u64,
+    size: u64,
+    /// How many bytes of the file the stretches given so far cover.
+    at: u64,
+}
+
+impl Plan for Spans {
+    fn next(&mut self, _: &mut Vol) -> Next {
+        loop {
+            if self.at >= self.size {
+                return Next::End;
+            }
+            let Some(e) = self.pending.take().or_else(|| self.extents.next()) else {
+                let rest = self.size.saturating_sub(self.at);
+                self.at = self.size;
+                return Next::Piece(Piece::Zeros(rest));
+            };
+            if e.at > self.at {
+                let gap =
+                    e.at.saturating_sub(self.at)
+                        .min(self.size.saturating_sub(self.at));
+                self.at = self.at.saturating_add(gap);
+                self.pending = Some(e);
+                return Next::Piece(Piece::Zeros(gap));
+            }
+            // An extent that overlaps what was given gives only the rest.
+            let skip = self.at.saturating_sub(e.at);
+            if skip >= e.len {
+                continue;
+            }
+            let take = e
+                .len
+                .saturating_sub(skip)
+                .min(self.size.saturating_sub(self.at));
+            self.at = self.at.saturating_add(take);
+            return match e.block {
+                0 => Next::Piece(Piece::Zeros(take)),
+                block => match block
+                    .checked_mul(self.block)
+                    .and_then(|b| b.checked_add(skip))
+                {
+                    Some(at) => Next::Piece(Piece::Disk(at, take)),
+                    None => Next::Broken,
+                },
+            };
+        }
+    }
+}
+
+/// Append the first `size` bytes of a file to `out`: the extents in order of
+/// their place in the file, a hole between them or after the last reading as
+/// zeros. False when a block cannot be read; what was read stays.
+fn read_extents(fs: &mut Fs, extents: &mut [Extent], size: u64, out: &mut Vec<u8>) -> bool {
+    extents.sort_by_key(|e| e.at);
+    let zeros = |out: &mut Vec<u8>, n: u64| {
+        out.resize(out.len().saturating_add(crate::bytes::to_usize(n)), 0);
+    };
+    let mut pos = 0u64;
+    for e in extents.iter() {
+        if pos >= size {
+            break;
+        }
+        if e.at > pos {
+            let gap = e.at.saturating_sub(pos).min(size.saturating_sub(pos));
+            zeros(out, gap);
+            pos = pos.saturating_add(gap);
+            if pos >= size {
+                break;
+            }
+        }
+        // An extent that overlaps what was read gives only the rest.
+        let skip = pos.saturating_sub(e.at);
+        if skip >= e.len {
+            continue;
+        }
+        let take = e.len.saturating_sub(skip).min(size.saturating_sub(pos));
+        match e.block {
+            0 => zeros(out, take),
+            block => {
+                let Some(at) = block
+                    .checked_mul(fs.block)
+                    .and_then(|b| b.checked_add(skip))
+                else {
+                    return false;
+                };
+                if !fs.v.append(at, crate::bytes::to_usize(take), out) {
+                    return false;
+                }
+            }
+        }
+        pos = pos.saturating_add(take);
+    }
+    zeros(out, size.saturating_sub(pos));
+    true
+}
+
+/// The folders and files the directory records of a volume name.
+#[derive(Default)]
+struct Names {
+    folders: HashMap<u64, (u64, String)>,
+    files: Vec<Named>,
+}
+
+impl Names {
+    /// The path of `name` in folder `parent`, from the root. A folder whose
+    /// chain does not reach the root (a record missing, or a loop) stands
+    /// where the chain broke, by its id.
+    fn path(&self, parent: u64, name: &str) -> String {
+        let mut parts = vec![name];
+        let mut at = parent;
+        for _ in 0..MAX_PATH_DEPTH {
+            if at == ROOT {
+                break;
+            }
+            let Some((up, folder)) = self.folders.get(&at) else {
+                break;
+            };
+            parts.push(folder);
+            at = *up;
+        }
+        let lost = (at != ROOT).then(|| format!("<apfs-folder-{at}>"));
+        parts.extend(lost.as_deref());
+        parts.reverse();
+        format!("/{}", parts.join("/"))
+    }
+}
+
+/// The container: its newest superblock and its object map.
+struct Container {
+    sb: Vec<u8>,
+    omap: Omap,
+}
+
+fn open(fs: &mut Fs) -> Option<Container> {
+    // The block size is in the first block, whose size it gives.
+    fs.block = 4096;
+    let first = fs.raw(0)?;
+    let size = le32(&first, 36);
+    if le32(&first, 32) != NX_MAGIC || !(4096..=65536).contains(&size) || !size.is_power_of_two() {
+        return None;
+    }
+    fs.block = u64::from(size);
+    let mut sb = fs.raw(0)?;
+    // The newest superblock of the checkpoint area, if it has one the first
+    // block does not: that block is only the one written at format time. One
+    // whose checksum holds is preferred to a newer one whose does not, a write
+    // that was cut short, as the system that mounts the container does.
+    let rank = |b: &[u8]| (sum_holds(b), le64(b, 16));
+    let (base, blocks) = (le64(&sb, 112), u64::from(le32(&sb, 104)));
+    if base >> 63 == 0 {
+        for n in 0..blocks.min(MAX_CHECKPOINT_BLOCKS) {
+            let Some(b) = base.checked_add(n).and_then(|n| fs.raw(n)) else {
+                continue;
+            };
+            let is_sb = le32(&b, 24) & 0xFFFF == 1 && le32(&b, 32) == NX_MAGIC;
+            if is_sb && le32(&b, 36) == size && rank(&b) > rank(&sb) {
+                sb = b;
+            }
+        }
+    }
+    if fs.strict && !sum_holds(&sb) {
+        return None;
+    }
+    // Nothing is read from past the container the superblock describes.
+    fs.v.len = fs.v.len.min(le64(&sb, 40).saturating_mul(fs.block));
+    let omap = load_omap(fs, le64(&sb, 160), le64(&sb, 16))?;
+    Some(Container { sb, omap })
+}
+
+/// Whether `head`, the start of a volume, holds the superblock of an APFS
+/// container: its magic, and a block size that is a power of two from 4 KiB to
+/// 64 KiB.
+pub(crate) fn is_apfs(head: &[u8]) -> bool {
+    le32(head, 32) == NX_MAGIC
+        && (4096..=65536).contains(&le32(head, 36))
+        && le32(head, 36).is_power_of_two()
+}
+
+/// Walk the APFS container `disk`, which starts at its first block, handing
+/// each file to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let len = disk
+        .seek(SeekFrom::End(0))
+        .map_err(|e| LimitHit::corrupt(format!("APFS container: {e}")))?;
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    let mut fs = Fs {
+        v: &mut v,
+        block: 4096,
+        cache: HashMap::new(),
+        strict: budget.should_verify_checksums(),
+    };
+    let Some(container) = open(&mut fs) else {
+        return Err(LimitHit::corrupt(
+            "apfs open: the container superblock or its object map is unreadable".into(),
+        ));
+    };
+
+    // The volumes, each by the block its id maps to.
+    let listed = (0..le32(&container.sb, 180).min(100) as usize)
+        .map(|i| le64(&container.sb, 184usize.saturating_add(i.saturating_mul(8))))
+        .filter(|&id| id != 0)
+        .collect::<Vec<_>>();
+    let multiple = listed.len() > 1;
+    for (n, id) in listed.into_iter().enumerate() {
+        let sb = container
+            .omap
+            .get(&id)
+            .copied()
+            .flatten()
+            .and_then(|block| fs.block(block))
+            .filter(|sb| le32(sb, 32) == APSB_MAGIC);
+        let Some(sb) = sb else {
+            budget.count_entry()?;
+            let note = Entry::unsupported(
+                format!("<apfs-volume-{n}>"),
+                0,
+                false,
+                "APFS volume that could not be read",
+            );
+            if let Some(r) = visit(Found::Held(note), budget) {
+                return Ok(Some(r));
+            }
+            continue;
+        };
+        if let Some(r) = walk_one(&mut fs, &sb, multiple, n, budget, &mut *visit)? {
+            return Ok(Some(r));
+        }
+    }
+    Ok(None)
+}
+
+/// Walk the volume whose superblock is `sb`.
+fn walk_one<R>(
+    fs: &mut Fs,
+    sb: &[u8],
+    multiple: bool,
+    n: usize,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    // The name is 256 bytes, ended by a NUL, 704 bytes in.
+    let name = sb.get(704..960).unwrap_or_default();
+    let name = name.split(|&b| b == 0).next().unwrap_or_default();
+    let name = String::from_utf8_lossy(name).into_owned();
+    let name = if name.is_empty() {
+        format!("volume-{n}")
+    } else {
+        name
+    };
+    if le64(sb, 264) & FS_UNENCRYPTED == 0 {
+        budget.count_entry()?;
+        let note = Entry::unsupported(
+            format!("<apfs-volume:{name}>"),
+            0,
+            true,
+            "encrypted APFS volume; its files were not read",
+        );
+        return Ok(visit(Found::Held(note), budget));
+    }
+    let prefix = if multiple {
+        format!("/{name}")
+    } else {
+        String::new()
+    };
+    let unreadable = |budget: &mut Budget, visit: Emit<R>| {
+        budget.count_entry()?;
+        let note = Entry::unsupported(
+            format!("<apfs-volume:{name}>"),
+            0,
+            false,
+            "APFS volume whose file-system tree could not be read",
+        );
+        Ok::<_, LimitHit>(visit(Found::Held(note), budget))
+    };
+
+    // The volume's object map, as of its own transaction, gives the tree.
+    let Some(omap) = load_omap(fs, le64(sb, 128), le64(sb, 16)) else {
+        return unreadable(budget, visit);
+    };
+    let Some(root) = omap.get(&le64(sb, 136)).copied().flatten() else {
+        return unreadable(budget, visit);
+    };
+    let volume = Volume {
+        tree: Tree {
+            root,
+            fixed: None,
+            omap: Some(&omap),
+        },
+    };
+
+    // The directory records: every folder and file, up to the member limit.
+    let limit = crate::bytes::to_usize(budget.limits().max_members);
+    let mut names = Names::default();
+    let mut capped = false;
+    let mut intact = true;
+    match volume.records(fs, 0, 0) {
+        Err(Bad) => intact = false,
+        Ok(mut c) => loop {
+            match c.next(fs, &volume.tree) {
+                Err(Bad) => {
+                    intact = false;
+                    break;
+                }
+                Ok(None) => break,
+                Ok(Some((k, v))) => {
+                    let (parent, ty) = key_of(&k);
+                    if ty != J_DREC {
+                        continue;
+                    }
+                    if names.files.len().saturating_add(names.folders.len()) >= limit {
+                        capped = true;
+                        break;
+                    }
+                    let Some(name) = drec_name(&k) else { continue };
+                    let (id, kind) = (le64(&v, 0), le16(&v, 16) & 0xF);
+                    match kind {
+                        DT_DIR => {
+                            names.folders.insert(id, (parent, name));
+                        }
+                        DT_LNK => {}
+                        _ => names.files.push(Named { id, parent, name }),
+                    }
+                }
+            }
+        },
+    }
+
+    for f in &names.files {
+        let path = format!("{prefix}{}", names.path(f.parent, &f.name));
+        budget.count_entry()?;
+        let cap = budget.reserve()?;
+        let got = volume.file(fs, f.id, cap);
+        if let Some(r) = hand(budget, &mut *visit, path, VolAttrs::default(), got) {
+            return Ok(Some(r));
+        }
+    }
+    if capped {
+        return Err(LimitHit::of_kind(
+            crate::LimitKind::MaxFiles,
+            format!("file count > {limit}"),
+        ));
+    }
+    if !intact {
+        return Err(LimitHit::corrupt(
+            "apfs walk: file-system tree damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::{Cursor, Write};
+
+    const BS: usize = 4096;
+
+    fn put16(b: &mut [u8], at: usize, v: u16) {
+        b[at..at + 2].copy_from_slice(&v.to_le_bytes());
+    }
+
+    fn put32(b: &mut [u8], at: usize, v: u32) {
+        b[at..at + 4].copy_from_slice(&v.to_le_bytes());
+    }
+
+    fn put64(b: &mut [u8], at: usize, v: u64) {
+        b[at..at + 8].copy_from_slice(&v.to_le_bytes());
+    }
+
+    /// The block with its checksum.
+    fn seal(mut b: Vec<u8>) -> Vec<u8> {
+        let sum = fletcher64(&b[8..]);
+        b[..8].copy_from_slice(&sum.to_le_bytes());
+        b
+    }
+
+    /// A node of a B-tree. Keys and values are in the order given; a tree with
+    /// `fixed` sizes has only keys and values of those.
+    fn bnode(
+        flags: u16,
+        level: u16,
+        fixed: Option<(usize, usize)>,
+        recs: &[(Vec<u8>, Vec<u8>)],
+    ) -> Vec<u8> {
+        let mut b = vec![0u8; BS];
+        let fixed_flag = if fixed.is_some() { FIXED_NODE } else { 0 };
+        put16(&mut b, 32, flags | fixed_flag);
+        put16(&mut b, 34, level);
+        put32(&mut b, 36, recs.len() as u32);
+        let entry = if fixed.is_some() { 4 } else { 8 };
+        put16(&mut b, 42, (recs.len() * entry) as u16);
+        let keys = 56 + recs.len() * entry;
+        let vals = if flags & ROOT_NODE != 0 { BS - 40 } else { BS };
+        let (mut k_at, mut v_back) = (0, 0);
+        for (i, (k, v)) in recs.iter().enumerate() {
+            b[keys + k_at..keys + k_at + k.len()].copy_from_slice(k);
+            v_back += v.len();
+            b[vals - v_back..vals - v_back + v.len()].copy_from_slice(v);
+            let e = 56 + i * entry;
+            put16(&mut b, e, k_at as u16);
+            if fixed.is_some() {
+                put16(&mut b, e + 2, v_back as u16);
+            } else {
+                put16(&mut b, e + 2, k.len() as u16);
+                put16(&mut b, e + 4, v_back as u16);
+                put16(&mut b, e + 6, v.len() as u16);
+            }
+            k_at += k.len();
+        }
+        seal(b)
+    }
+
+    /// An object-map record: the block `oid` is at, from transaction `xid`.
+    fn mapping(oid: u64, xid: u64, block: u64, flags: u32) -> (Vec<u8>, Vec<u8>) {
+        let mut k = oid.to_le_bytes().to_vec();
+        k.extend_from_slice(&xid.to_le_bytes());
+        let mut v = flags.to_le_bytes().to_vec();
+        v.extend_from_slice(&0u32.to_le_bytes());
+        v.extend_from_slice(&block.to_le_bytes());
+        (k, v)
+    }
+
+    /// The blocks of a container being laid out; block 0 is left for its
+    /// superblock.
+    struct Cont {
+        blocks: Vec<Vec<u8>>,
+    }
+
+    impl Cont {
+        fn new() -> Cont {
+            Cont {
+                blocks: vec![vec![0; BS]],
+            }
+        }
+
+        fn push(&mut self, b: Vec<u8>) -> u64 {
+            self.blocks.push(b);
+            self.blocks.len() as u64 - 1
+        }
+
+        /// File bytes in blocks of their own: the first block.
+        fn data(&mut self, bytes: &[u8]) -> u64 {
+            let first = self.blocks.len() as u64;
+            for c in bytes.chunks(BS) {
+                let mut b = c.to_vec();
+                b.resize(BS, 0);
+                self.blocks.push(b);
+            }
+            first
+        }
+
+        /// An object map holding `recs`: the block of its object.
+        fn omap(&mut self, recs: &[(Vec<u8>, Vec<u8>)]) -> u64 {
+            let root = self.push(bnode(ROOT_NODE | LEAF_NODE, 0, Some((16, 16)), recs));
+            let mut o = vec![0u8; BS];
+            put64(&mut o, 48, root);
+            self.push(seal(o))
+        }
+
+        /// The file-system tree of `recs` (in key order) in two leaves under
+        /// a root: the root's id, and the object map that gives its nodes.
+        fn fs_tree(&mut self, recs: &[(Vec<u8>, Vec<u8>)], xid: u64) -> (u64, u64) {
+            let (a, b) = recs.split_at(recs.len() / 2);
+            let leaf_a = self.push(bnode(LEAF_NODE, 0, None, a));
+            let leaf_b = self.push(bnode(LEAF_NODE, 0, None, b));
+            let index = [
+                (a[0].0.clone(), 1030u64.to_le_bytes().to_vec()),
+                (b[0].0.clone(), 1031u64.to_le_bytes().to_vec()),
+            ];
+            let root = self.push(bnode(ROOT_NODE, 1, None, &index));
+            let omap = self.omap(&[
+                // An older mapping of the first leaf, to a block that is no tree.
+                mapping(1030, xid - 1, 0, 0),
+                mapping(1030, xid, leaf_a, 0),
+                mapping(1031, xid, leaf_b, 0),
+                mapping(1032, xid, root, 0),
+            ]);
+            (1032, omap)
+        }
+
+        /// A volume over `recs`: the block of its superblock.
+        fn volume(&mut self, name: &str, flags: u64, recs: &[(Vec<u8>, Vec<u8>)]) -> u64 {
+            let (root_oid, omap) = self.fs_tree(recs, 10);
+            let mut sb = vec![0u8; BS];
+            put64(&mut sb, 16, 10);
+            put32(&mut sb, 24, 13);
+            put32(&mut sb, 32, APSB_MAGIC);
+            put64(&mut sb, 128, omap);
+            put64(&mut sb, 136, root_oid);
+            put64(&mut sb, 264, flags);
+            sb[704..704 + name.len()].copy_from_slice(name.as_bytes());
+            self.push(seal(sb))
+        }
+
+        /// The container: its blocks, and a superblock over the volumes
+        /// (each by the block of its superblock).
+        fn finish(mut self, volumes: &[u64]) -> Vec<u8> {
+            let ids: Vec<u64> = (0..volumes.len() as u64).map(|i| 1100 + i).collect();
+            let omap = self.omap(
+                &ids.iter()
+                    .zip(volumes)
+                    .map(|(&id, &b)| mapping(id, 10, b, 0))
+                    .collect::<Vec<_>>(),
+            );
+            self.blocks[0] = self.superblock(10, omap, &ids, 0, 0);
+            self.blocks.concat()
+        }
+
+        fn superblock(&self, xid: u64, omap: u64, ids: &[u64], desc: u64, descs: u32) -> Vec<u8> {
+            let mut sb = vec![0u8; BS];
+            put64(&mut sb, 16, xid);
+            put32(&mut sb, 24, 1);
+            put32(&mut sb, 32, NX_MAGIC);
+            put32(&mut sb, 36, BS as u32);
+            put64(&mut sb, 40, self.blocks.len() as u64 + 8);
+            put32(&mut sb, 104, descs);
+            put64(&mut sb, 112, desc);
+            put64(&mut sb, 160, omap);
+            put32(&mut sb, 180, 100);
+            for (i, id) in ids.iter().enumerate() {
+                put64(&mut sb, 184 + 8 * i, *id);
+            }
+            seal(sb)
+        }
+    }
+
+    /// The key of a record of type `ty` of object `id`, then `tail`.
+    fn key(id: u64, ty: u8, tail: &[u8]) -> Vec<u8> {
+        let mut k = (id | (u64::from(ty) << 60)).to_le_bytes().to_vec();
+        k.extend_from_slice(tail);
+        k
+    }
+
+    /// An inode: its parent, the id its extents are keyed by, its mode, its
+    /// flags and its size (in a data stream field).
+    fn inode(id: u64, parent: u64, stream: u64, flags: u32, size: u64) -> (Vec<u8>, Vec<u8>) {
+        let mut v = vec![0u8; 92];
+        put64(&mut v, 0, parent);
+        put64(&mut v, 8, stream);
+        put32(&mut v, 68, flags);
+        put16(&mut v, 80, 0o100644);
+        v.extend_from_slice(&[1, 0, 48, 0, 8, 0, 40, 0]);
+        let mut d = size.to_le_bytes().to_vec();
+        d.resize(40, 0);
+        v.extend(d);
+        (key(id, J_INODE, &[]), v)
+    }
+
+    /// A directory record: `parent` holds `name`, the object `id` of kind `dt`.
+    fn drec(parent: u64, name: &str, id: u64, dt: u16) -> (Vec<u8>, Vec<u8>) {
+        let mut tail = (name.len() as u32 + 1).to_le_bytes().to_vec();
+        tail.extend_from_slice(name.as_bytes());
+        tail.push(0);
+        let mut v = id.to_le_bytes().to_vec();
+        v.extend_from_slice(&[0; 8]);
+        v.extend_from_slice(&dt.to_le_bytes());
+        (key(parent, J_DREC, &tail), v)
+    }
+
+    /// An extent of the stream `id`: `len` bytes at `at` in the file, in
+    /// blocks from `block` (0: a hole).
+    fn extent(id: u64, at: u64, len: u64, block: u64) -> (Vec<u8>, Vec<u8>) {
+        let mut v = len.to_le_bytes().to_vec();
+        v.extend_from_slice(&block.to_le_bytes());
+        v.extend_from_slice(&[0; 8]);
+        (key(id, J_FILE_EXTENT, &at.to_le_bytes()), v)
+    }
+
+    /// An attribute of object `id`, held in its record, or as a stream.
+    fn xattr(id: u64, name: &str, value: &[u8], stream: Option<(u64, u64)>) -> (Vec<u8>, Vec<u8>) {
+        let mut tail = (name.len() as u16 + 1).to_le_bytes().to_vec();
+        tail.extend_from_slice(name.as_bytes());
+        tail.push(0);
+        let mut v = Vec::new();
+        match stream {
+            None => {
+                v.extend_from_slice(&2u16.to_le_bytes());
+                v.extend_from_slice(&(value.len() as u16).to_le_bytes());
+                v.extend_from_slice(value);
+            }
+            Some((obj, size)) => {
+                v.extend_from_slice(&1u16.to_le_bytes());
+                v.extend_from_slice(&48u16.to_le_bytes());
+                v.extend_from_slice(&obj.to_le_bytes());
+                v.extend_from_slice(&size.to_le_bytes());
+                v.resize(52, 0);
+            }
+        }
+        (key(id, J_XATTR, &tail), v)
+    }
+
+    /// Records in the order of the tree: by object, then type; those of one
+    /// object and type stay as given.
+    fn sorted(mut recs: Vec<(Vec<u8>, Vec<u8>)>) -> Vec<(Vec<u8>, Vec<u8>)> {
+        recs.sort_by_key(|(k, _)| key_of(k));
+        recs
+    }
+
+    fn run(img: &[u8], limits: Limits) -> (Vec<Entry>, Result<(), LimitHit>) {
+        let mut budget = Budget::new(limits);
+        let mut out = Vec::new();
+        let end = walk_volume(Cursor::new(img.to_vec()), &mut budget, &mut |e, _| {
+            out.push(e.whole());
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    fn named(entries: &[Entry]) -> Vec<(&str, &[u8])> {
+        entries.iter().map(|e| (&e.name[..], &e.data[..])).collect()
+    }
+
+    const DT_REG: u16 = 8;
+    const PACKED: u32 = 0x20;
+
+    /// Folders and files, with a file in a hole-ridden stream and a clone.
+    fn tree_of_folders() -> Vec<u8> {
+        let mut c = Cont::new();
+        let (a, b, d) = (c.data(b"in root"), c.data(&[b'B'; BS]), c.data(&[b'D'; BS]));
+        let sub = c.data(b"in sub");
+        let recs = sorted(vec![
+            drec(2, "a.txt", 20, DT_REG),
+            drec(2, "dir", 16, DT_DIR),
+            drec(2, "link", 23, DT_LNK),
+            drec(16, "b.txt", 21, DT_REG),
+            drec(16, "sub", 17, DT_DIR),
+            // A clone: its inode names another stream.
+            drec(17, "c.txt", 22, DT_REG),
+            inode(20, 2, 20, 0, 7),
+            extent(20, 0, BS as u64, a),
+            // Two blocks with a hole between, and a hole at the end.
+            inode(21, 16, 21, 0, 4 * BS as u64),
+            extent(21, 0, BS as u64, b),
+            extent(21, 2 * BS as u64, BS as u64, d),
+            inode(22, 17, 77, 0, 6),
+            extent(77, 0, BS as u64, sub),
+        ]);
+        let v = c.volume("Data", FS_UNENCRYPTED, &recs);
+        c.finish(&[v])
+    }
+
+    #[test]
+    fn the_files_of_a_tree_of_folders_come_out_under_their_paths() {
+        let (entries, end) = run(&tree_of_folders(), Limits::default());
+        assert!(end.is_ok());
+        let mut hole = vec![b'B'; BS];
+        hole.extend_from_slice(&[0; BS]);
+        hole.extend_from_slice(&[b'D'; BS]);
+        hole.extend_from_slice(&[0; BS]);
+        assert_eq!(
+            named(&entries),
+            [
+                ("/a.txt", &b"in root"[..]),
+                ("/dir/b.txt", &hole[..]),
+                ("/dir/sub/c.txt", b"in sub"),
+            ]
+        );
+    }
+
+    #[test]
+    fn compressed_files_are_unpacked_from_an_attribute_or_a_stream_fork() {
+        let text = b"compressed text, compressed text, compressed text".to_vec();
+        let z = |data: &[u8]| {
+            let mut e = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+            e.write_all(data).unwrap();
+            e.finish().unwrap()
+        };
+        let attr = |kind: u32, payload: &[u8]| {
+            let mut a = b"fpmc".to_vec();
+            a.extend_from_slice(&kind.to_le_bytes());
+            a.extend_from_slice(&(text.len() as u64).to_le_bytes());
+            a.extend_from_slice(payload);
+            a
+        };
+        // Type 4: one zlib block, the table 4 bytes into the fork.
+        let block = z(&text);
+        let mut fork = vec![0, 0, 0, 0, 1, 0, 0, 0, 12, 0, 0, 0];
+        fork.extend_from_slice(&(block.len() as u32).to_le_bytes());
+        fork.extend_from_slice(&block);
+
+        let mut c = Cont::new();
+        let fork_at = c.data(&fork);
+        let plain = c.data(b"plain");
+        let recs = sorted(vec![
+            drec(2, "inline", 30, DT_REG),
+            drec(2, "forked", 31, DT_REG),
+            drec(2, "plain", 32, DT_REG),
+            inode(30, 2, 30, PACKED, 0),
+            xattr(30, "com.apple.FinderInfo", b"zz", None),
+            xattr(30, "com.apple.decmpfs", &attr(3, &z(&text)), None),
+            inode(31, 2, 31, PACKED, 0),
+            xattr(31, "com.apple.decmpfs", &attr(4, &[]), None),
+            xattr(
+                31,
+                "com.apple.ResourceFork",
+                &[],
+                Some((900, fork.len() as u64)),
+            ),
+            extent(900, 0, BS as u64, fork_at),
+            // Not marked: its attribute is not looked for.
+            inode(32, 2, 32, 0, 5),
+            xattr(32, "com.apple.decmpfs", &attr(3, &z(b"wrong")), None),
+            extent(32, 0, BS as u64, plain),
+        ]);
+        let v = c.volume("V", FS_UNENCRYPTED, &recs);
+        let (entries, end) = run(&c.finish(&[v]), Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(
+            named(&entries),
+            [
+                ("/inline", &text[..]),
+                ("/forked", &text[..]),
+                ("/plain", b"plain")
+            ]
+        );
+        assert!(entries.iter().all(|e| e.unsupported.is_none()));
+    }
+
+    #[test]
+    fn every_volume_is_walked_and_an_encrypted_one_is_reported() {
+        let mut c = Cont::new();
+        let one = c.data(b"one");
+        let two = c.data(b"two");
+        let first = sorted(vec![
+            drec(2, "f", 20, DT_REG),
+            inode(20, 2, 20, 0, 3),
+            extent(20, 0, BS as u64, one),
+        ]);
+        let second = sorted(vec![
+            drec(2, "f", 20, DT_REG),
+            inode(20, 2, 20, 0, 3),
+            extent(20, 0, BS as u64, two),
+        ]);
+        let (a, b) = (c.volume("First", 1, &first), c.volume("Second", 1, &second));
+        let locked = c.volume("Locked", 0, &first);
+        let (entries, end) = run(&c.finish(&[a, b, locked]), Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(
+            named(&entries[..2]),
+            [("/First/f", &b"one"[..]), ("/Second/f", b"two")]
+        );
+        assert_eq!(entries[2].name, "<apfs-volume:Locked>");
+        assert!(entries[2].encrypted && entries[2].unsupported.is_some());
+        assert_eq!(entries.len(), 3);
+    }
+
+    #[test]
+    fn what_the_volume_cannot_give_of_a_file_is_reported() {
+        let mut c = Cont::new();
+        let recs = sorted(vec![
+            drec(2, "no-inode", 20, DT_REG),
+            drec(2, "no-blocks", 21, DT_REG),
+            inode(21, 2, 21, 0, 100),
+            // Past the end of the container.
+            drec(2, "outside", 22, DT_REG),
+            inode(22, 2, 22, 0, 100),
+            extent(22, 0, 100, 5000),
+        ]);
+        let v = c.volume("V", 1, &recs);
+        let (entries, end) = run(&c.finish(&[v]), Limits::default());
+        assert!(end.is_ok());
+        let got: Vec<_> = entries
+            .iter()
+            .map(|e| (&e.name[..], e.unsupported.is_some(), e.data.len()))
+            .collect();
+        // A file with no extents is a hole as long as its size says.
+        assert_eq!(
+            got,
+            [
+                ("/no-inode", true, 0),
+                ("/no-blocks", false, 100),
+                ("/outside", true, 0)
+            ]
+        );
+        assert!(entries[0].unsupported.unwrap().contains("inode"));
+        assert_eq!(
+            entries[2].unsupported,
+            Some("file could not be read from the volume")
+        );
+    }
+
+    #[test]
+    fn the_newest_superblock_of_the_checkpoint_area_is_the_one() {
+        let mut c = Cont::new();
+        let old = c.data(b"old");
+        let new = c.data(b"new");
+        let make = |c: &mut Cont, block: u64| {
+            let recs = sorted(vec![
+                drec(2, "f", 20, DT_REG),
+                inode(20, 2, 20, 0, 3),
+                extent(20, 0, BS as u64, block),
+            ]);
+            c.volume("V", 1, &recs)
+        };
+        let (v_old, v_new) = (make(&mut c, old), make(&mut c, new));
+        // The container's first block names the old volume; the area, two
+        // blocks later, holds a superblock of a later transaction naming the new.
+        let omap = c.omap(&[mapping(1100, 10, v_old, 0), mapping(1101, 11, v_new, 0)]);
+        let area = c.blocks.len() as u64;
+        let newer = c.superblock(11, omap, &[1101], 0, 0);
+        c.blocks.push(vec![0; BS]);
+        c.blocks.push(newer);
+        c.blocks[0] = c.superblock(10, omap, &[1100], area, 2);
+        let (entries, end) = run(&c.blocks.concat(), Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(named(&entries), [("/f", &b"new"[..])]);
+    }
+
+    /// A superblock newer than the others whose checksum does not hold is a
+    /// write that was cut short: the one before it is the container's. With none
+    /// that holds, the newest is.
+    #[test]
+    fn a_newer_superblock_that_was_cut_short_is_passed_over() {
+        let mut c = Cont::new();
+        let (old, new) = (c.data(b"old"), c.data(b"new"));
+        let make = |c: &mut Cont, block: u64| {
+            let recs = sorted(vec![
+                drec(2, "f", 20, DT_REG),
+                inode(20, 2, 20, 0, 3),
+                extent(20, 0, BS as u64, block),
+            ]);
+            c.volume("V", 1, &recs)
+        };
+        let (v_old, v_new) = (make(&mut c, old), make(&mut c, new));
+        let omap = c.omap(&[mapping(1100, 10, v_old, 0), mapping(1101, 11, v_new, 0)]);
+        let area = c.blocks.len() as u64;
+        let newer = c.superblock(11, omap, &[1101], 0, 0);
+        c.blocks.push(vec![0; BS]);
+        c.blocks.push(newer);
+        c.blocks[0] = c.superblock(10, omap, &[1100], area, 2);
+        let mut img = c.blocks.concat();
+        let at = usize::try_from(area).unwrap() + 1;
+        img[at * BS] ^= 0xff;
+        let (entries, _) = run(&img, Limits::default());
+        assert_eq!(named(&entries), [("/f", &b"old"[..])]);
+        // The first block's does not hold either: the newest is the best there is.
+        img[0] ^= 0xff;
+        let (entries, _) = run(&img, Limits::default());
+        assert_eq!(named(&entries), [("/f", &b"new"[..])]);
+    }
+
+    #[test]
+    fn files_past_the_buffer_limit_are_read_as_they_go() {
+        let img = tree_of_folders();
+        let mut budget = Budget::new(Limits {
+            max_buffer_bytes: 3,
+            ..Limits::default()
+        });
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(img.to_vec()), &mut budget, emit));
+        end.unwrap();
+        // The same bytes as held, holes included, and none of them held.
+        let (held, end) = run(&img, Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(e.len(), held.len());
+        assert!(e.iter().any(|(m, _)| m.data.contains(&0)), "a hole");
+        for ((m, streamed), h) in e.iter().zip(&held) {
+            assert_eq!((&m.name, &m.data), (&h.name, &h.data));
+            assert_eq!(*streamed, m.data.len() > 3, "{}", m.name);
+        }
+    }
+
+    #[test]
+    fn a_tree_larger_than_the_member_limit_is_walked_to_it_and_then_stops() {
+        let limits = Limits {
+            max_members: 2,
+            ..Limits::default()
+        };
+        let (entries, end) = run(&tree_of_folders(), limits);
+        // The directory records are "a.txt" and "dir", which are kept, and
+        // "link", which is over.
+        assert_eq!(named(&entries), [("/a.txt", &b"in root"[..])]);
+        assert_eq!(end.expect_err("the limit").kind, crate::LimitKind::MaxFiles);
+    }
+
+    /// The block of the root of the tree of `img`'s last volume; its leaves
+    /// are the two before it.
+    fn root_of(img: &[u8]) -> usize {
+        img.chunks(BS)
+            .rposition(|b| le16(b, 32) == ROOT_NODE && le16(b, 34) == 1)
+            .unwrap()
+    }
+
+    #[test]
+    fn a_damaged_leaf_ends_the_walk_after_the_files_before_it() {
+        // Ten directory records and two inodes, which two leaves split in
+        // half: the second leaf has the last four of the names.
+        let mut recs: Vec<_> = (0..10)
+            .map(|i| drec(2, &format!("f{i}"), 20 + i, DT_REG))
+            .collect();
+        recs.push(inode(40, 2, 40, 0, 0));
+        recs.push(inode(41, 2, 41, 0, 0));
+        let mut c = Cont::new();
+        let v = c.volume("V", 1, &sorted(recs));
+        let mut img = c.finish(&[v]);
+        let root = root_of(&img);
+
+        // A node that says it has more keys than it has room for, its checksum
+        // made good again.
+        let spoil = |img: &mut Vec<u8>, block: usize| {
+            let b = &mut img[block * BS..(block + 1) * BS];
+            put32(b, 36, u32::MAX);
+            let sum = fletcher64(&b[8..]);
+            b[..8].copy_from_slice(&sum.to_le_bytes());
+        };
+
+        // The second leaf spoiled: the names of the first are walked, and
+        // their inodes, which are in the second, are not found.
+        let mut bad = img.clone();
+        spoil(&mut bad, root - 1);
+        let (entries, end) = run(&bad, Limits::default());
+        assert!(end.expect_err("damage").is_corrupt());
+        assert_eq!(entries.len(), 6);
+        assert!(entries.iter().all(|e| e.unsupported.is_some()));
+
+        // The first spoiled: the tree cannot be entered.
+        spoil(&mut img, root - 2);
+        let (entries, end) = run(&img, Limits::default());
+        assert!(end.expect_err("damage").is_corrupt());
+        assert!(entries.is_empty());
+    }
+
+    /// Ten files and the leaves that hold them, and the block of the root of
+    /// their tree.
+    fn ten_files() -> (Vec<u8>, usize) {
+        let mut recs: Vec<_> = (0..10)
+            .map(|i| drec(2, &format!("f{i}"), 20 + i, DT_REG))
+            .collect();
+        recs.push(inode(40, 2, 40, 0, 0));
+        recs.push(inode(41, 2, 41, 0, 0));
+        let mut c = Cont::new();
+        let v = c.volume("V", 1, &sorted(recs));
+        let img = c.finish(&[v]);
+        let root = root_of(&img);
+        (img, root)
+    }
+
+    /// A checksum that does not hold keeps nothing from being scanned: the
+    /// block is read as it is.
+    #[test]
+    fn a_checksum_that_does_not_hold_is_not_a_reason_not_to_read() {
+        let (mut img, root) = ten_files();
+        let (clean, _) = run(&img, Limits::default());
+        for block in [root, root - 1, root - 2, 0] {
+            img[block * BS] ^= 0xff;
+        }
+        let (entries, end) = run(&img, Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(named(&entries), named(&clean));
+        assert_eq!(entries.len(), 10);
+    }
+
+    /// With checksums checked, the same blocks are refused.
+    #[cfg(feature = "checksums")]
+    #[test]
+    fn a_checksum_that_does_not_hold_is_refused_when_checksums_are_checked() {
+        let strict = |img: &[u8]| {
+            let mut budget = Budget::new(Limits::default());
+            budget.set_verify_checksums(true);
+            let mut out = Vec::new();
+            let end = walk_volume(Cursor::new(img.to_vec()), &mut budget, &mut |e, _| {
+                out.push(e.whole());
+                None::<()>
+            });
+            (out, end)
+        };
+        let (mut img, root) = ten_files();
+        assert_eq!(strict(&img).0.len(), 10);
+        let mut bad = img.clone();
+        bad[(root - 1) * BS + 100] ^= 0xff;
+        let (entries, end) = strict(&bad);
+        assert!(end.expect_err("damage").is_corrupt());
+        assert_eq!(entries.len(), 6);
+        img[0] ^= 0xff;
+        assert!(strict(&img).1.is_err());
+    }
+
+    #[test]
+    fn nothing_is_a_container_but_a_checked_superblock_with_an_object_map() {
+        let good = tree_of_folders();
+        // The magic, the block size, the object map's block: each in turn,
+        // the checksum made good again, so that only it is wrong.
+        for (at, byte) in [(32, b'X'), (37, 0x20), (161, 0xff)] {
+            let mut bad = good.clone();
+            bad[at] ^= byte;
+            let sum = fletcher64(&bad[8..BS]);
+            bad[..8].copy_from_slice(&sum.to_le_bytes());
+            let (entries, end) = run(&bad, Limits::default());
+            assert!(entries.is_empty(), "byte {at}");
+            assert!(end.expect_err("not a container").is_corrupt(), "byte {at}");
+        }
+        assert!(run(&good[..BS - 1], Limits::default()).1.is_err());
+    }
+
+    /// Whatever a container says, the walk ends: every byte of the trees
+    /// changed, in turn, to each of a few values, the checksums made good.
+    #[test]
+    fn damaged_containers_end_the_walk_without_a_panic() {
+        let good = tree_of_folders();
+        for at in (0..good.len()).step_by(7) {
+            for byte in [0x00, 0x01, 0x7f, 0xff] {
+                let mut bad = good.clone();
+                bad[at] = byte;
+                let block = at / BS * BS;
+                let sum = fletcher64(&bad[block + 8..block + BS]);
+                bad[block..block + 8].copy_from_slice(&sum.to_le_bytes());
+                let _ = run(&bad, Limits::default());
+            }
+        }
+    }
+
+    /// A directory record's key has the name behind a length and a hash, or
+    /// behind a length alone; either way the name is NUL-ended and ends the key.
+    #[test]
+    fn a_directory_records_name_is_read_from_either_key() {
+        let hashed = |len_and_hash: u32, name: &[u8]| {
+            key(2, J_DREC, &[&len_and_hash.to_le_bytes()[..], name].concat())
+        };
+        let plain =
+            |len: u16, name: &[u8]| key(2, J_DREC, &[&len.to_le_bytes()[..], name].concat());
+        // The hash is the 22 bits above the length.
+        assert_eq!(
+            drec_name(&hashed(0xABCD_E000 | 6, b"hello\0")).as_deref(),
+            Some("hello")
+        );
+        assert_eq!(drec_name(&plain(6, b"hello\0")).as_deref(), Some("hello"));
+        assert_eq!(drec_name(&plain(1, b"\0")).as_deref(), Some(""));
+        // A length that is not the rest of the key is no name.
+        assert_eq!(drec_name(&hashed(9, b"hello\0")), None);
+        assert_eq!(drec_name(&plain(7, b"hello\0")), None);
+        assert_eq!(drec_name(&[0; 8]), None);
+        // Not UTF-8: kept as far as it can be.
+        assert_eq!(
+            drec_name(&plain(3, &[b'a', 0xff, 0])).as_deref(),
+            Some("a\u{fffd}")
+        );
+    }
+
+    #[test]
+    fn the_checksum_is_apples() {
+        // Worked by hand: words 1 and 2.
+        let m = 0xFFFF_FFFFu64;
+        assert_eq!(fletcher64(&[1, 0, 0, 0, 2, 0, 0, 0]), 4 << 32 | (m - 7));
+        // A block with the checksum it carries reads; with one byte changed, not.
+        let b = seal((0..BS).map(|i| (i % 251) as u8).collect());
+        assert_eq!(le64(&b, 0), fletcher64(&b[8..]));
+    }
+
+    #[test]
+    fn the_object_map_gives_the_newest_mapping_not_past_the_transaction() {
+        let mut c = Cont::new();
+        let omap = c.omap(&[
+            mapping(7, 3, 100, 0),
+            mapping(7, 5, 200, 0),
+            mapping(7, 9, 300, 0),
+            mapping(8, 4, 400, 0),
+            mapping(8, 6, 400, 1),
+            mapping(9, 2, 500, 0),
+        ]);
+        let img = c.blocks.concat();
+        let mut cur = Cursor::new(img);
+        let mut v = Vol {
+            disk: &mut cur,
+            len: (c.blocks.len() * BS) as u64,
+            max: 1 << 20,
+        };
+        let mut fs = Fs {
+            v: &mut v,
+            block: BS as u64,
+            cache: HashMap::new(),
+            strict: false,
+        };
+        let m = load_omap(&mut fs, omap, 6).unwrap();
+        // 7: the newest not past 6 is 5. 8: its newest, 6, is a deletion.
+        assert_eq!(m.get(&7), Some(&Some(200)));
+        assert_eq!(m.get(&8), Some(&None));
+        assert_eq!(m.get(&9), Some(&Some(500)));
+    }
+}
diff --git a/crates/exav-unpack/src/formats/ar.rs b/crates/exav-unpack/src/formats/ar.rs
index c75f7e4d..e7e68c9b 100644
--- a/crates/exav-unpack/src/formats/ar.rs
+++ b/crates/exav-unpack/src/formats/ar.rs
@@ -3,14 +3,23 @@
 //! `.deb` files are `ar` archives whose members are usually `control.tar.*` and
 //! `data.tar.*`; emitting those members lets the engine recurse into them.
 
+use crate::stream::Region;
 use crate::*;
 use std::io::{Read, Seek, SeekFrom};
 
 const MAGIC: &[u8] = b"!<arch>\n";
 
-fn parse_decimal(field: &[u8]) -> u64 {
-    let s = std::str::from_utf8(field).unwrap_or("").trim();
-    s.parse().unwrap_or(0)
+/// A header's decimal field as `ar` and `dpkg-deb` read it: leading white space
+/// skipped, then the digits, and whatever follows them (spaces, a stray byte)
+/// ignored. `None` when there are no digits.
+fn parse_decimal(field: &[u8]) -> Option<u64> {
+    let digits: Vec<u8> = field
+        .iter()
+        .copied()
+        .skip_while(|b| b.is_ascii_whitespace())
+        .take_while(u8::is_ascii_digit)
+        .collect();
+    std::str::from_utf8(&digits).ok()?.parse().ok()
 }
 
 /// Walk an `ar` archive, each member streamed from where it lies.
@@ -32,7 +41,7 @@ pub(crate) fn walk<T>(
 pub(crate) fn stream_offsets<R: Read + Seek>(
     source: &mut R,
     max_buffer: u64,
-) -> Result<Vec<(String, u64, u64)>, LimitHit> {
+) -> Result<Vec<Region>, LimitHit> {
     let mut magic = [0u8; 8];
     source
         .seek(SeekFrom::Start(0))
@@ -41,21 +50,38 @@ pub(crate) fn stream_offsets<R: Read + Seek>(
     if magic != MAGIC {
         return Err(LimitHit::new("ar: bad magic".to_string()));
     }
-    let mut out = Vec::new();
+    let mut out: Vec<Region> = Vec::new();
     let mut name_table: Vec<u8> = Vec::new();
     let mut pos = MAGIC.len() as u64;
+    let len = source
+        .seek(SeekFrom::End(0))
+        .map_err(|e| LimitHit::corrupt(format!("ar: {e}")))?;
     loop {
-        if source.seek(SeekFrom::Start(pos)).is_err() {
+        if pos >= len {
             break;
         }
+        source
+            .seek(SeekFrom::Start(pos))
+            .map_err(|e| LimitHit::corrupt(format!("ar: {e}")))?;
         let mut hdr = [0u8; 60];
-        if source.read_exact(&mut hdr).is_err() {
-            break;
-        }
-        if &hdr[58..60] != b"`\n" {
+        let got = source.read(&mut hdr).unwrap_or(0);
+        let size = (got == 60 && &hdr[58..60] == b"`\n")
+            .then(|| parse_decimal(&hdr[48..58]))
+            .flatten();
+        let Some(size) = size else {
+            // Not a header, with bytes left. `ar` and `dpkg-deb` do not all
+            // agree about what a damaged one is, so what is left is scanned as
+            // it lies, unless it is only the padding a writer leaves.
+            let rest = crate::read_at(source, pos, 4096)?;
+            if rest.iter().any(|b| !matches!(b, b'\n' | b' ' | 0)) {
+                out.push(Region::Member(
+                    format!("<ar-from-{pos}>"),
+                    pos,
+                    len.saturating_sub(pos),
+                ));
+            }
             break;
-        }
-        let size = parse_decimal(&hdr[48..58]);
+        };
         let body = pos + 60;
         let name = resolve_name(&hdr[0..16], &name_table);
         match name.as_str() {
@@ -70,9 +96,9 @@ pub(crate) fn stream_offsets<R: Read + Seek>(
                 source.read_exact(&mut name_table).ok();
             }
             "/" | "/SYM64/" | "__.SYMDEF" => {}
-            _ => out.push((name, body, size)),
+            _ => out.push(Region::Member(name, body, size)),
         }
-        pos = body + size + (size & 1);
+        pos = body.saturating_add(size).saturating_add(size & 1);
     }
     Ok(out)
 }
@@ -87,17 +113,16 @@ fn resolve_name(raw: &[u8], name_table: &[u8]) -> String {
         return trimmed.to_string();
     }
     // GNU long name: "/<offset>" into the string table.
-    if let Some(rest) = trimmed.strip_prefix('/') {
-        if let Ok(off) = rest.parse::<usize>() {
-            if off < name_table.len() {
-                let end = name_table[off..]
-                    .iter()
-                    .position(|&b| b == b'/' || b == b'\n')
-                    .map(|p| off + p)
-                    .unwrap_or(name_table.len());
-                return String::from_utf8_lossy(&name_table[off..end]).into_owned();
-            }
-        }
+    if let Some(rest) = trimmed.strip_prefix('/')
+        && let Ok(off) = rest.parse::<usize>()
+        && off < name_table.len()
+    {
+        let end = name_table[off..]
+            .iter()
+            .position(|&b| b == b'/' || b == b'\n')
+            .map(|p| off + p)
+            .unwrap_or(name_table.len());
+        return String::from_utf8_lossy(&name_table[off..end]).into_owned();
     }
     // GNU short name: trailing '/'.
     trimmed.trim_end_matches('/').to_string()
diff --git a/crates/exav-unpack/src/formats/arc.rs b/crates/exav-unpack/src/formats/arc.rs
index e72746d7..5f5f8754 100644
--- a/crates/exav-unpack/src/formats/arc.rs
+++ b/crates/exav-unpack/src/formats/arc.rs
@@ -240,12 +240,12 @@ fn lzw(src: &[u8], max_width: u32, cap: usize) -> Option<Vec<u8>> {
         }
         out.extend(stack.iter().rev());
 
-        if let Some(p) = prev {
-            if (next as usize) < table_cap {
-                prefix[next as usize] = p;
-                suffix[next as usize] = *stack.last()?;
-                next += 1;
-            }
+        if let Some(p) = prev
+            && (next as usize) < table_cap
+        {
+            prefix[next as usize] = p;
+            suffix[next as usize] = *stack.last()?;
+            next += 1;
         }
         prev = Some(code);
 
diff --git a/crates/exav-unpack/src/formats/arj.rs b/crates/exav-unpack/src/formats/arj.rs
index 04c99453..fb90bca1 100644
--- a/crates/exav-unpack/src/formats/arj.rs
+++ b/crates/exav-unpack/src/formats/arj.rs
@@ -53,8 +53,9 @@ pub(crate) fn extract_arj<R>(
             // unsupported compression method is different: the member is there
             // and the victim's extractor will unpack it, so report rather than
             // step over it.
-            if !supported && !matches!(header.file_type, ArjFileType::Directory) {
-                if let Some(r) = visit(
+            if !supported
+                && !matches!(header.file_type, ArjFileType::Directory)
+                && let Some(r) = visit(
                     Entry::unsupported(
                         header.name.clone(),
                         header.compressed_size as u64,
@@ -62,9 +63,9 @@ pub(crate) fn extract_arj<R>(
                         "unsupported ARJ compression method",
                     ),
                     budget,
-                ) {
-                    return Ok(Some(r));
-                }
+                )
+            {
+                return Ok(Some(r));
             }
             if !arc.skip(&header) {
                 return Err(LimitHit::corrupt("arj: truncated entry".to_string()));
@@ -162,7 +163,7 @@ pub(crate) fn extract_arj<R>(
 
 #[cfg(test)]
 mod tests {
-    use crate::{extract, Budget, Format, Limits};
+    use crate::{Budget, Format, Limits, extract};
 
     /// A garbled (encrypted, `arj -g`) member is decrypted with a pool password
     /// and its plaintext recovered — identical to the unencrypted `sample.arj`.
diff --git a/crates/exav-unpack/src/formats/arj_parse/arj_archive.rs b/crates/exav-unpack/src/formats/arj_parse/arj_archive.rs
index e7059efe..a09e967c 100644
--- a/crates/exav-unpack/src/formats/arj_parse/arj_archive.rs
+++ b/crates/exav-unpack/src/formats/arj_parse/arj_archive.rs
@@ -198,12 +198,10 @@ impl ArjArchive {
                     &buf,
                     header.original_size as usize,
                     &header.compression_method,
-                ) {
-                    if out.len() == header.original_size as usize
-                        && crc32fast::hash(&out) == header.original_crc32
-                    {
-                        return Some(out);
-                    }
+                ) && out.len() == header.original_size as usize
+                    && crc32fast::hash(&out) == header.original_crc32
+                {
+                    return Some(out);
                 }
             }
             return None;
diff --git a/crates/exav-unpack/src/formats/arj_parse/macros.rs b/crates/exav-unpack/src/formats/arj_parse/macros.rs
index 74dbe7d3..337f0720 100644
--- a/crates/exav-unpack/src/formats/arj_parse/macros.rs
+++ b/crates/exav-unpack/src/formats/arj_parse/macros.rs
@@ -3,7 +3,7 @@
 // than the fields it claims to hold is ordinary attacker input, and the caller
 // returns `None` for it rather than panicking out through the decoder.
 macro_rules! convert_u32 {
-    ( $t:ident, $x:expr ) => {
+    ( $t:ident, $x:expr_2021 ) => {
         if $x.len() < 4 {
             return None;
         }
@@ -16,7 +16,7 @@ macro_rules! convert_u32 {
 }
 
 macro_rules! convert_u16 {
-    ( $t:ident, $x:expr ) => {
+    ( $t:ident, $x:expr_2021 ) => {
         if $x.len() < 2 {
             return None;
         }
@@ -29,7 +29,7 @@ macro_rules! convert_u16 {
 }
 
 macro_rules! convert_u8 {
-    ( $t:ident, $x:expr ) => {
+    ( $t:ident, $x:expr_2021 ) => {
         if $x.is_empty() {
             return None;
         }
@@ -42,7 +42,7 @@ macro_rules! convert_u8 {
 }
 
 macro_rules! convert_string {
-    ( $t:ident, $x:expr ) => {
+    ( $t:ident, $x:expr_2021 ) => {
         let mut $t = String::new();
         while !$x.is_empty() && $x[0] != 0 {
             $t.push($x[0] as char);
@@ -57,7 +57,7 @@ macro_rules! convert_string {
 }
 
 macro_rules! skip {
-    ( $x:expr, $t:expr ) => {
+    ( $x:expr_2021, $t:expr_2021 ) => {
         #[allow(unused_assignments)]
         {
             let t = $t;
diff --git a/crates/exav-unpack/src/formats/autoit.rs b/crates/exav-unpack/src/formats/autoit.rs
index 540533a5..cf9deb59 100644
--- a/crates/exav-unpack/src/formats/autoit.rs
+++ b/crates/exav-unpack/src/formats/autoit.rs
@@ -672,7 +672,7 @@ mod tests {
         d.extend_from_slice(MARKER_EA05);
         d.extend_from_slice(&[0u8; 16]); // checksum region
         d.extend_from_slice(&mt_apply(b"FILE", KEY_FILE_TAG)); // tag
-                                                               // subtype string
+        // subtype string
         d.extend_from_slice(&((subtype.len() as u32) ^ KEY_SUBTYPE_LEN).to_le_bytes());
         d.extend_from_slice(&mt_apply(
             subtype,
@@ -979,8 +979,10 @@ mod tests {
             let _ = extract(Format::Autoit, &&full[..cut.min(full.len())], &mut budget).unwrap();
         }
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::Autoit, b"not autoit", &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Autoit, b"not autoit", &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 }
diff --git a/crates/exav-unpack/src/formats/azo.rs b/crates/exav-unpack/src/formats/azo.rs
index 4dc816af..dea5bf1f 100644
--- a/crates/exav-unpack/src/formats/azo.rs
+++ b/crates/exav-unpack/src/formats/azo.rs
@@ -51,11 +51,7 @@ const SCALE_N: u32 = 8;
 /// `x == 0` cannot occur at any call site (every argument is `n - 1` for
 /// `n >= 2`, or a positive quotient), but it is defined rather than panicking.
 fn log2(x: u32) -> u32 {
-    if x == 0 {
-        0
-    } else {
-        31 - x.leading_zeros()
-    }
+    if x == 0 { 0 } else { 31 - x.leading_zeros() }
 }
 
 /// Reads individual bits, MSB-first within each byte.
diff --git a/crates/exav-unpack/src/formats/biff/book.rs b/crates/exav-unpack/src/formats/biff/book.rs
new file mode 100644
index 00000000..302427bf
--- /dev/null
+++ b/crates/exav-unpack/src/formats/biff/book.rs
@@ -0,0 +1,345 @@
+//! What a BIFF workbook's global records say that formulas need: the code
+//! page, the sheets, the defined names and the external references their
+//! tokens point at.
+
+use super::formula::{Ctx, read_chars};
+use super::record::Rec;
+use crate::bytes::Cur;
+use crate::formats::charset;
+
+/// A BOUNDSHEET record.
+pub struct BoundSheet {
+    /// Offset of the sheet's BOF in the stream.
+    pub pos: usize,
+    pub name: String,
+    pub state: u8,
+    /// 0 worksheet, 1 Excel 4.0 macro sheet, 2 chart, 6 Visual Basic module.
+    pub kind: u8,
+}
+
+/// A NAME record.
+pub struct Name {
+    pub name: String,
+    /// 1-based sheet of a local name.
+    pub sheet: u16,
+    pub hidden: bool,
+    pub rgce: Vec<u8>,
+    /// What follows `rgce`: the data its array constants keep.
+    pub extra: Vec<u8>,
+}
+
+/// A BIFF8 SUPBOOK record.
+#[derive(Default, Clone, Debug)]
+pub struct Supbook {
+    pub internal: bool,
+    pub addin: bool,
+    /// An external workbook's number among them, from 1.
+    pub ext_index: usize,
+    pub sheets: Vec<String>,
+    pub names: Vec<String>,
+}
+
+/// A BIFF5 EXTERNSHEET entry.
+#[derive(Clone, Debug)]
+pub enum ExtSheet5 {
+    /// A sheet of this workbook (by name), or the workbook itself.
+    Own,
+    /// An external document's sheet: its number among external documents.
+    External { doc: usize, sheet: String },
+    /// Add-in functions: the names that follow.
+    Names(Vec<String>),
+}
+
+/// The workbook-wide tables, filled by [`Book::record`] from the records of
+/// the globals substream (all of a BIFF2 to BIFF4 stream's records).
+pub struct Book {
+    /// 2, 3, 4, 5 or 8.
+    pub ver: u8,
+    pub codepage: u16,
+    pub sheets: Vec<BoundSheet>,
+    pub names: Vec<Name>,
+    /// BIFF8 EXTERNSHEET entries: (supbook, first sheet, last sheet).
+    pub xti: Vec<(u16, i16, i16)>,
+    pub supbooks: Vec<Supbook>,
+    /// BIFF5 globals' EXTERNSHEET entries (for names).
+    pub ext5: Vec<ExtSheet5>,
+    /// The names of `sheets`, which formulas refer to; set by [`Book::finish`]
+    /// or by a reader that knows better.
+    pub sheet_names: Vec<String>,
+    /// The names of `names`; set by [`Book::finish`].
+    pub name_texts: Vec<String>,
+    /// External documents, numbered from 1 by their place here.
+    ext_docs: Vec<String>,
+}
+
+impl Book {
+    pub fn new(ver: u8) -> Book {
+        Book {
+            ver,
+            codepage: if ver >= 8 { 1200 } else { 1252 },
+            sheets: vec![],
+            names: vec![],
+            xti: vec![],
+            supbooks: vec![],
+            ext5: vec![],
+            sheet_names: vec![],
+            name_texts: vec![],
+            ext_docs: vec![],
+        }
+    }
+
+    /// Takes the record if it is one of the tables'. Returns whether it was.
+    pub fn record(&mut self, r: &Rec) -> bool {
+        let ver = self.ver;
+        let mut c = Cur::new(&r.data);
+        match r.id {
+            0x0042 => {
+                self.codepage = c.u16();
+                if ver >= 8 {
+                    self.codepage = 1200;
+                }
+            }
+            0x0085 => {
+                let pos = c.u32() as usize;
+                let state = c.u8();
+                let kind = c.u8();
+                let name = self.string(&mut c, 1);
+                self.sheets.push(BoundSheet {
+                    pos,
+                    name,
+                    state,
+                    kind,
+                });
+            }
+            0x0018 | 0x0218 => {
+                let n = self.name(r);
+                self.names.push(n);
+            }
+            0x0017 if ver >= 8 => {
+                let n = c.u16() as usize;
+                for _ in 0..n {
+                    let sb = c.u16();
+                    let a = c.i16();
+                    let b = c.i16();
+                    if c.short {
+                        break;
+                    }
+                    self.xti.push((sb, a, b));
+                }
+            }
+            0x0017 => {
+                let e = self.ext_sheet5(&r.data);
+                self.ext5.push(e);
+            }
+            0x01AE => {
+                let ctab = c.u16();
+                let cch = c.u16();
+                let mut sb = Supbook::default();
+                if cch == 0x0401 {
+                    sb.internal = true;
+                } else if cch == 0x3A01 {
+                    sb.addin = true;
+                } else {
+                    let mut c2 = Cur::at(&r.data, 2);
+                    let url = self.string(&mut c2, 2);
+                    for _ in 0..ctab.min(4096) {
+                        if c2.left() == 0 {
+                            break;
+                        }
+                        sb.sheets.push(self.string(&mut c2, 2));
+                    }
+                    sb.ext_index = self.ext_doc(&url);
+                }
+                self.supbooks.push(sb);
+            }
+            0x0023 => {
+                if ver >= 8 {
+                    let _flags = c.u16();
+                    c.u32();
+                    let name = self.string(&mut c, 1);
+                    if let Some(sb) = self.supbooks.last_mut() {
+                        sb.names.push(name);
+                    }
+                } else if ver == 5 {
+                    c.skip(6);
+                    let n = c.u8() as usize;
+                    let name = charset::decode(c.bytes(n), self.codepage);
+                    if let Some(ExtSheet5::Names(v)) = self.ext5.last_mut() {
+                        v.push(name);
+                    }
+                }
+            }
+            _ => return false,
+        }
+        true
+    }
+
+    /// Fills `sheet_names` and `name_texts` from the records read.
+    pub fn finish(&mut self) {
+        self.sheet_names = self.sheets.iter().map(|s| s.name.clone()).collect();
+        self.name_texts = self.names.iter().map(|n| n.name.clone()).collect();
+    }
+
+    /// What a formula needs to name what it refers to. `ext5` is the
+    /// EXTERNSHEET entries in scope (a BIFF5 sheet's, or the globals').
+    pub fn ctx<'a>(&'a self, ext5: &'a [ExtSheet5]) -> Ctx<'a> {
+        Ctx {
+            ver: self.ver,
+            sheets: &self.sheet_names,
+            names: &self.name_texts,
+            xti: &self.xti,
+            supbooks: &self.supbooks,
+            ext5,
+            codepage: self.codepage,
+        }
+    }
+
+    /// A string in the BIFF5-and-older code page, or BIFF8's Unicode, with
+    /// a length of `len_bytes` (1 or 2) before it.
+    pub fn string(&self, c: &mut Cur, len_bytes: u8) -> String {
+        let n = if len_bytes == 1 {
+            c.u8() as usize
+        } else {
+            c.u16() as usize
+        };
+        if self.ver >= 8 {
+            let f = c.u8();
+            read_chars(c, n, f & 1 != 0)
+        } else {
+            charset::decode(c.bytes(n), self.codepage)
+        }
+    }
+
+    /// The number of an external document among those the workbook names.
+    pub fn ext_doc(&mut self, doc: &str) -> usize {
+        match self.ext_docs.iter().position(|d| d == doc) {
+            Some(i) => i + 1,
+            None => {
+                self.ext_docs.push(doc.to_string());
+                self.ext_docs.len()
+            }
+        }
+    }
+
+    /// A BIFF5 EXTERNSHEET record's entry.
+    pub fn ext_sheet5(&mut self, d: &[u8]) -> ExtSheet5 {
+        let n = d.first().copied().unwrap_or(0) as usize;
+        let body = d.get(1..).unwrap_or(&[]);
+        match body.first() {
+            Some(0x02..=0x04) | None => ExtSheet5::Own,
+            Some(&0x3A) if n == 1 => ExtSheet5::Names(vec![]),
+            Some(_) => {
+                let s = charset::decode(&body[..n.min(body.len())], self.codepage);
+                let s = s.strip_prefix('\u{1}').unwrap_or(&s).to_string();
+                let (doc, sheet) = match s.rfind(']') {
+                    Some(i) => (s[..i].replace('[', ""), s[i + 1..].to_string()),
+                    None => (s.clone(), String::new()),
+                };
+                let doc: String = doc.chars().filter(|c| (*c as u32) >= 0x20).collect();
+                ExtSheet5::External {
+                    doc: self.ext_doc(&doc),
+                    sheet,
+                }
+            }
+        }
+    }
+
+    fn name(&self, r: &Rec) -> Name {
+        let ver = self.ver;
+        let mut c = Cur::new(&r.data);
+        let (flags, cch, cce, sheet, name);
+        if ver == 2 {
+            flags = u16::from(c.u8()) & 0xFFFE;
+            c.skip(2);
+            cch = c.u8() as usize;
+            cce = c.u8() as usize;
+            sheet = 0;
+            name = charset::decode(c.bytes(cch), self.codepage);
+        } else {
+            flags = c.u16();
+            c.u8();
+            cch = c.u8() as usize;
+            cce = c.u16() as usize;
+            if ver >= 5 {
+                c.u16();
+                sheet = c.u16();
+                c.skip(4);
+            } else {
+                sheet = 0;
+            }
+            name = if ver >= 8 {
+                let f = c.u8();
+                read_chars(&mut c, cch, f & 1 != 0)
+            } else {
+                charset::decode(c.bytes(cch), self.codepage)
+            };
+        }
+        let builtin = flags & 0x20 != 0;
+        let name = if builtin {
+            let b = match name.chars().next().map_or(0xFF, |c| c as u32) {
+                0 => "Consolidate_Area",
+                1 => "Auto_Open",
+                2 => "Auto_Close",
+                3 => "Extract",
+                4 => "Database",
+                5 => "Criteria",
+                6 => "Print_Area",
+                7 => "Print_Titles",
+                8 => "Recorder",
+                9 => "Data_Form",
+                10 => "Auto_Activate",
+                11 => "Auto_Deactivate",
+                12 => "Sheet_Title",
+                13 => "_FilterDatabase",
+                _ => "Unknown",
+            };
+            format!("_xlnm.{b}")
+        } else if name == "_FilterDatabase" {
+            "_xlnm._FilterDatabase".into()
+        } else {
+            name
+        };
+        let rgce = c.bytes(cce).to_vec();
+        let extra = r.data[c.p.min(r.data.len())..].to_vec();
+        Name {
+            name,
+            sheet,
+            hidden: flags & 1 != 0,
+            rgce,
+            extra,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::borrow::Cow;
+
+    fn rec(id: u16, data: Vec<u8>) -> Rec<'static> {
+        Rec {
+            id,
+            pos: 0,
+            data: Cow::Owned(data),
+            breaks: vec![],
+        }
+    }
+
+    #[test]
+    fn sheets_and_a_builtin_name_are_read() {
+        let mut b = Book::new(8);
+        // BOUNDSHEET: a macro sheet "Macro1" at 0x100.
+        let mut d = 0x100u32.to_le_bytes().to_vec();
+        d.extend([0, 1, 6, 0]);
+        d.extend(b"Macro1");
+        assert!(b.record(&rec(0x0085, d)));
+        // NAME: the built-in Auto_Open (code 1) with no formula.
+        let d = vec![0x20, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
+        assert!(b.record(&rec(0x0018, d)));
+        assert!(!b.record(&rec(0x0203, vec![0; 14])));
+        b.finish();
+        assert_eq!((b.sheets[0].kind, b.sheets[0].pos), (1, 0x100));
+        assert_eq!(b.sheet_names, ["Macro1"]);
+        assert_eq!(b.name_texts, ["_xlnm.Auto_Open"]);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/biff/formula.rs b/crates/exav-unpack/src/formats/biff/formula.rs
new file mode 100644
index 00000000..30d626c4
--- /dev/null
+++ b/crates/exav-unpack/src/formats/biff/formula.rs
@@ -0,0 +1,1034 @@
+//! BIFF formula tokens ([MS-XLS] 2.5.198 Rgce; BIFF2 to BIFF5 as
+//! OpenOffice.org's Excel format documentation, chapter 3, describes them)
+//! to Excel A1 formula text.
+
+use super::book::{ExtSheet5, Supbook};
+use super::ftab::function as ftab;
+use crate::bytes::Cur;
+use crate::formats::charset;
+
+/// Formula text past this many characters is refused: Excel's own limit is
+/// 8192.
+const MAX_TEXT: usize = 16_384;
+
+/// What a formula needs from the workbook to name what it refers to.
+pub struct Ctx<'a> {
+    pub ver: u8,
+    pub sheets: &'a [String],
+    /// Defined names, 1-based in tokens.
+    pub names: &'a [String],
+    /// BIFF8 EXTERNSHEET entries: (supbook, first sheet, last sheet).
+    pub xti: &'a [(u16, i16, i16)],
+    pub supbooks: &'a [Supbook],
+    /// BIFF5: the EXTERNSHEET entries in scope (a sheet's, or the globals').
+    pub ext5: &'a [ExtSheet5],
+    pub codepage: u16,
+}
+
+/// The name of a BIFF error code ([MS-XLS] 2.5.97 BErr), as XLSX writes it.
+pub fn error_name(code: u8) -> Option<&'static str> {
+    Some(match code {
+        0x00 => "#NULL!",
+        0x07 => "#DIV/0!",
+        0x0F => "#VALUE!",
+        0x17 => "#REF!",
+        0x1D => "#NAME?",
+        0x24 => "#NUM!",
+        0x2A => "#N/A",
+        0x2B => "#GETTING_DATA",
+        _ => return None,
+    })
+}
+
+fn error_or_na(code: u8) -> &'static str {
+    error_name(code).unwrap_or("#N/A")
+}
+
+/// Functions Excel 2007 added, stored in XLS as `_xlfn.` add-in calls: in
+/// XLSX they are native, written without the prefix.
+const XL2007: &[&str] = &[
+    "AVERAGEIF",
+    "AVERAGEIFS",
+    "COUNTIFS",
+    "IFERROR",
+    "SUMIFS",
+    "CUBEKPIMEMBER",
+    "CUBEMEMBER",
+    "CUBEMEMBERPROPERTY",
+    "CUBERANKEDMEMBER",
+    "CUBESET",
+    "CUBESETCOUNT",
+    "CUBEVALUE",
+];
+
+/// A sheet name as a formula writes it, quoted when it must be.
+pub fn quote_sheet(name: &str) -> String {
+    let plain = !name.is_empty()
+        && name
+            .chars()
+            .all(|c| c.is_alphanumeric() || c == '_' || c == '.')
+        && !name.starts_with(|c: char| c.is_ascii_digit() || c == '.')
+        && !looks_like_ref(name);
+    if plain {
+        name.to_string()
+    } else {
+        format!("'{}'", name.replace('\'', "''"))
+    }
+}
+
+/// A sheet of external workbook `n`: `[1]Sheet1`, quoted when the sheet's
+/// name must be.
+pub fn quote_external(n: usize, sheet: &str) -> String {
+    if quote_sheet(sheet) == sheet {
+        format!("[{n}]{sheet}")
+    } else {
+        format!("'[{n}]{}'", sheet.replace('\'', "''"))
+    }
+}
+
+fn looks_like_ref(s: &str) -> bool {
+    let up = s.to_ascii_uppercase();
+    let letters = up.chars().take_while(char::is_ascii_alphabetic).count();
+    let rest = &up[letters..];
+    ((1..=3).contains(&letters) && !rest.is_empty() && rest.chars().all(|c| c.is_ascii_digit()))
+        || up == "TRUE"
+        || up == "FALSE"
+        || (up.starts_with('R')
+            && up[1..].contains('C')
+            && up[1..].chars().all(|c| c.is_ascii_digit() || c == 'C'))
+}
+
+/// The name of a column: 0 is `A`, 26 is `AA`.
+pub fn col_name(col: u32) -> String {
+    let mut n = u64::from(col) + 1;
+    let mut s = Vec::new();
+    while n > 0 {
+        let r = (n - 1) % 26;
+        s.push(b'A' + r as u8);
+        n = (n - 1) / 26;
+    }
+    s.reverse();
+    String::from_utf8(s).unwrap_or_default()
+}
+
+/// A number as a spreadsheet shows it and writes it in a formula: at most 15
+/// significant digits.
+pub fn number(v: f64) -> String {
+    if !v.is_finite() {
+        return "0".into();
+    }
+    if v == v.trunc() && v.abs() < 1e15 {
+        return format!("{}", v as i64);
+    }
+    let e = format!("{v:.14e}");
+    let (mant, exp) = e.split_once('e').unwrap_or((&e, "0"));
+    let exp: i32 = exp.parse().unwrap_or(0);
+    let neg = mant.starts_with('-');
+    let digits: String = mant.chars().filter(char::is_ascii_digit).collect();
+    let digits = digits.trim_end_matches('0');
+    let digits = if digits.is_empty() { "0" } else { digits };
+    let body = if (-5..15).contains(&exp) {
+        if exp >= 0 {
+            let int_len = exp as usize + 1;
+            if digits.len() <= int_len {
+                format!("{}{}", digits, "0".repeat(int_len - digits.len()))
+            } else {
+                format!("{}.{}", &digits[..int_len], &digits[int_len..])
+            }
+        } else {
+            format!("0.{}{}", "0".repeat((-exp - 1) as usize), digits)
+        }
+    } else {
+        let m = if digits.len() > 1 {
+            format!("{}.{}", &digits[..1], &digits[1..])
+        } else {
+            digits.to_string()
+        };
+        format!("{}E{}{}", m, if exp < 0 { "-" } else { "+" }, exp.abs())
+    };
+    if neg { format!("-{body}") } else { body }
+}
+
+pub struct Decoded {
+    pub text: String,
+    /// The formula is a reference to a shared or array formula: its cell.
+    pub exp: Option<(u32, u32)>,
+    /// A data table's cell.
+    pub table: bool,
+}
+
+/// Fixed argument counts of functions whose count changed after BIFF2
+/// (FIXED after BIFF3): a PtgFunc in an older file carries them.
+fn old_fixed(i: u16, ver: u8) -> Option<usize> {
+    match (i, ver) {
+        (14, 2..=3) => Some(2),
+        (70, 2) | (197, 2) => Some(1),
+        (101, 2) | (102, 2) => Some(3),
+        (220, 2) => Some(2),
+        _ => None,
+    }
+}
+
+/// A formula under construction. The operands stay apart until the formula is
+/// written, so that each character is copied once, not once per operator
+/// above it: a chain of thousands of operators costs no more than its text.
+#[derive(Default)]
+struct Tree {
+    /// Each node with the length of the text it will write.
+    nodes: Vec<(Node, usize)>,
+}
+
+enum Node {
+    Text(String),
+    Binary(&'static str, usize, usize),
+    Prefix(&'static str, usize),
+    Suffix(&'static str, usize),
+    Paren(usize),
+    Call(String, Vec<usize>),
+}
+
+impl Tree {
+    fn add(&mut self, node: Node, len: usize) -> Result<usize, String> {
+        if len > MAX_TEXT {
+            return Err("formula too long".into());
+        }
+        self.nodes.push((node, len));
+        Ok(self.nodes.len() - 1)
+    }
+
+    fn len(&self, i: usize) -> usize {
+        self.nodes[i].1
+    }
+
+    fn text(&mut self, s: impl Into<String>) -> Result<usize, String> {
+        let s = s.into();
+        let n = s.len();
+        self.add(Node::Text(s), n)
+    }
+
+    fn binary(&mut self, op: &'static str, a: usize, b: usize) -> Result<usize, String> {
+        let n = self.len(a) + op.len() + self.len(b);
+        self.add(Node::Binary(op, a, b), n)
+    }
+
+    fn prefix(&mut self, op: &'static str, a: usize) -> Result<usize, String> {
+        let n = op.len() + self.len(a);
+        self.add(Node::Prefix(op, a), n)
+    }
+
+    fn suffix(&mut self, op: &'static str, a: usize) -> Result<usize, String> {
+        let n = self.len(a) + op.len();
+        self.add(Node::Suffix(op, a), n)
+    }
+
+    fn paren(&mut self, a: usize) -> Result<usize, String> {
+        let n = self.len(a) + 2;
+        self.add(Node::Paren(a), n)
+    }
+
+    fn call(&mut self, name: String, args: Vec<usize>) -> Result<usize, String> {
+        let n = name.len()
+            + 2
+            + args.len().saturating_sub(1)
+            + args.iter().map(|&a| self.len(a)).sum::<usize>();
+        self.add(Node::Call(name, args), n)
+    }
+
+    /// The text of node `root`. Iterative: a hostile formula nests as deep as
+    /// it has tokens.
+    fn write(&self, root: usize) -> String {
+        enum Piece<'a> {
+            Node(usize),
+            Lit(&'a str),
+        }
+        let mut out = String::with_capacity(self.len(root));
+        let mut work = vec![Piece::Node(root)];
+        while let Some(p) = work.pop() {
+            match p {
+                Piece::Lit(s) => out.push_str(s),
+                Piece::Node(i) => match &self.nodes[i].0 {
+                    Node::Text(s) => out.push_str(s),
+                    Node::Binary(op, a, b) => {
+                        work.push(Piece::Node(*b));
+                        work.push(Piece::Lit(op));
+                        work.push(Piece::Node(*a));
+                    }
+                    Node::Prefix(op, a) => {
+                        work.push(Piece::Node(*a));
+                        work.push(Piece::Lit(op));
+                    }
+                    Node::Suffix(op, a) => {
+                        work.push(Piece::Lit(op));
+                        work.push(Piece::Node(*a));
+                    }
+                    Node::Paren(a) => {
+                        work.push(Piece::Lit(")"));
+                        work.push(Piece::Node(*a));
+                        work.push(Piece::Lit("("));
+                    }
+                    Node::Call(name, args) => {
+                        work.push(Piece::Lit(")"));
+                        for (k, &a) in args.iter().enumerate().rev() {
+                            work.push(Piece::Node(a));
+                            if k > 0 {
+                                work.push(Piece::Lit(","));
+                            }
+                        }
+                        work.push(Piece::Lit("("));
+                        work.push(Piece::Lit(name));
+                    }
+                },
+            }
+        }
+        out
+    }
+}
+
+fn pop(st: &mut Vec<usize>) -> Result<usize, String> {
+    st.pop().ok_or_else(|| "stack underflow".to_string())
+}
+
+/// Decodes `rgce` (and `extra`, the data its array constants keep after
+/// it). `row` and `col` are the formula's cell, which relative references
+/// in shared formulas, conditional formats and validations are offsets
+/// from.
+pub fn decode(ctx: &Ctx, rgce: &[u8], extra: &[u8], row: u32, col: u32) -> Result<Decoded, String> {
+    decode_with(ctx, rgce, extra, row, col, false)
+}
+
+/// A conditional format's or a validation's formula: its references are
+/// offsets from (`row`, `col`), the top left of its ranges (the "method B"
+/// of OpenOffice.org's documentation, 3.9), whether written as RefN and
+/// AreaN tokens or as Ref, Area, Ref3d and Area3d ones with the relative
+/// flags set.
+pub fn decode_relative(ctx: &Ctx, rgce: &[u8], row: u32, col: u32) -> Result<Decoded, String> {
+    decode_with(ctx, rgce, &[], row, col, true)
+}
+
+/// What [`decode_partial`] could write of a formula.
+pub struct Partial {
+    /// The operands built before the formula was refused, in order and
+    /// separated by a space: whole calls and constants, never a half of one.
+    pub text: String,
+    /// Why the rest was not read: `None` for a formula read to its end.
+    pub error: Option<String>,
+}
+
+/// Like [`decode`], but keeps what was read before a token it cannot read:
+/// the scanner wants every function and string of a formula a writer made
+/// unreadable on purpose.
+pub fn decode_partial(ctx: &Ctx, rgce: &[u8], extra: &[u8], row: u32, col: u32) -> Partial {
+    let mut t = Tree::default();
+    let mut st: Vec<usize> = Vec::new();
+    let error = match walk(ctx, rgce, extra, row, col, false, &mut t, &mut st) {
+        // A reference to a shared formula or a data table: no text of its own.
+        Ok(Some(_)) => {
+            return Partial {
+                text: String::new(),
+                error: None,
+            };
+        }
+        Ok(None) if st.len() == 1 => None,
+        Ok(None) => Some("operands left over".to_string()),
+        Err(e) => Some(e),
+    };
+    let mut text = String::new();
+    for &i in &st {
+        if text.len() + t.len(i) > MAX_TEXT {
+            break;
+        }
+        if !text.is_empty() {
+            text.push(' ');
+        }
+        text.push_str(&t.write(i));
+    }
+    Partial { text, error }
+}
+
+fn decode_with(
+    ctx: &Ctx,
+    rgce: &[u8],
+    extra: &[u8],
+    row: u32,
+    col: u32,
+    relative: bool,
+) -> Result<Decoded, String> {
+    let mut t = Tree::default();
+    let mut st: Vec<usize> = Vec::new();
+    if let Some(d) = walk(ctx, rgce, extra, row, col, relative, &mut t, &mut st)? {
+        return Ok(d);
+    }
+    let root = st.pop().ok_or("empty formula")?;
+    if !st.is_empty() {
+        return Err("operands left over".into());
+    }
+    Ok(Decoded {
+        text: t.write(root),
+        exp: None,
+        table: false,
+    })
+}
+
+/// Reads the tokens onto `st`. `Some` is a formula that is only a reference
+/// to a shared formula or a data table; `None`, tokens read to the end.
+#[allow(clippy::too_many_arguments)]
+fn walk(
+    ctx: &Ctx,
+    rgce: &[u8],
+    extra: &[u8],
+    row: u32,
+    col: u32,
+    relative: bool,
+    t: &mut Tree,
+    st: &mut Vec<usize>,
+) -> Result<Option<Decoded>, String> {
+    let ver = ctx.ver;
+    let mut c = Cur::new(rgce);
+    let mut ex = Cur::new(extra);
+    let w2 = if ver >= 3 { 2 } else { 1 };
+    while c.left() > 0 {
+        let ptg = c.u8();
+        let base = if ptg >= 0x20 {
+            (ptg & 0x1F) | 0x20
+        } else {
+            ptg
+        };
+        match base {
+            0x01 => {
+                let r = c.u16() as u32;
+                let cc = if ver >= 3 {
+                    c.u16() as u32
+                } else {
+                    c.u8() as u32
+                };
+                return Ok(Some(Decoded {
+                    text: String::new(),
+                    exp: Some((r, cc)),
+                    table: false,
+                }));
+            }
+            0x02 => {
+                return Ok(Some(Decoded {
+                    text: String::new(),
+                    exp: None,
+                    table: true,
+                }));
+            }
+            0x03..=0x11 => {
+                let b = pop(st)?;
+                let a = pop(st)?;
+                let op = match base {
+                    0x03 => "+",
+                    0x04 => "-",
+                    0x05 => "*",
+                    0x06 => "/",
+                    0x07 => "^",
+                    0x08 => "&",
+                    0x09 => "<",
+                    0x0A => "<=",
+                    0x0B => "=",
+                    0x0C => ">=",
+                    0x0D => ">",
+                    0x0E => "<>",
+                    0x0F => " ",
+                    0x10 => ",",
+                    _ => ":",
+                };
+                st.push(t.binary(op, a, b)?);
+            }
+            0x12 => {
+                let a = pop(st)?;
+                st.push(t.prefix("+", a)?);
+            }
+            0x13 => {
+                let a = pop(st)?;
+                st.push(t.prefix("-", a)?);
+            }
+            0x14 => {
+                let a = pop(st)?;
+                st.push(t.suffix("%", a)?);
+            }
+            0x15 => {
+                let a = pop(st)?;
+                st.push(t.paren(a)?);
+            }
+            0x16 => st.push(t.text("")?),
+            0x17 => {
+                let s = if ver >= 8 {
+                    read_short_unicode(&mut c)
+                } else {
+                    read_byte_string(&mut c, ctx.codepage)
+                };
+                st.push(t.text(format!("\"{}\"", s.replace('"', "\"\"")))?);
+            }
+            0x18 => return Err("extended token".into()),
+            0x19 => {
+                let grbit = c.u8();
+                if grbit & 0x04 != 0 {
+                    // attrChoose: a jump table of its argument count plus one.
+                    let n = if ver >= 3 {
+                        c.u16() as usize
+                    } else {
+                        c.u8() as usize
+                    };
+                    c.skip((n + 1) * w2);
+                } else if grbit & 0x10 != 0 {
+                    c.skip(w2);
+                    let a = pop(st)?;
+                    st.push(t.call("SUM".into(), vec![a])?);
+                } else {
+                    c.skip(w2);
+                }
+            }
+            0x1C => st.push(t.text(error_or_na(c.u8()))?),
+            0x1D => st.push(t.text(if c.u8() != 0 { "TRUE" } else { "FALSE" })?),
+            0x1E => st.push(t.text(c.u16().to_string())?),
+            0x1F => st.push(t.text(number(c.f64()))?),
+            0x20 => {
+                c.skip(if ver >= 5 { 7 } else { 6 });
+                st.push(t.text(read_array(&mut ex, ver, ctx.codepage))?);
+            }
+            0x21 => {
+                let i = if ver >= 4 { c.u16() } else { u16::from(c.u8()) };
+                let (name, n) = ftab(i).ok_or_else(|| format!("unknown function {i}"))?;
+                let n = match (n, old_fixed(i, ver)) {
+                    (_, Some(k)) => k,
+                    (n, None) if n >= 0 => n as usize,
+                    _ => return Err(format!("variable function {name} in PtgFunc")),
+                };
+                if st.len() < n {
+                    return Err("stack underflow".into());
+                }
+                let args = st.split_off(st.len() - n);
+                st.push(t.call(name.to_string(), args)?);
+            }
+            0x22 => {
+                let argc = (c.u8() & 0x7F) as usize;
+                let i = if ver >= 4 { c.u16() } else { u16::from(c.u8()) };
+                let ce = i & 0x8000 != 0;
+                let i = i & 0x7FFF;
+                if st.len() < argc {
+                    return Err("stack underflow".into());
+                }
+                let mut args = st.split_off(st.len() - argc);
+                let name = if ce {
+                    // An Excel 4.0 macro command, by its name where it has one.
+                    ftab(i | 0x8000).map_or_else(|| format!("CMD{i}"), |f| f.0.to_string())
+                } else if i == 255 {
+                    // An add-in or newer function: its name is the first operand.
+                    if args.is_empty() {
+                        return Err("add-in call without a name".into());
+                    }
+                    let n = t.write(args.remove(0));
+                    let bare = n.strip_prefix("_xlfn.").unwrap_or(&n).to_string();
+                    if XL2007.contains(&bare.to_ascii_uppercase().as_str()) {
+                        bare
+                    } else {
+                        n
+                    }
+                } else {
+                    ftab(i)
+                        .map(|f| f.0.to_string())
+                        .ok_or_else(|| format!("unknown function {i}"))?
+                };
+                st.push(t.call(name, args)?);
+            }
+            0x23 => {
+                let idx = if ver >= 8 {
+                    c.u32() as usize
+                } else if ver == 5 {
+                    let i = c.u16();
+                    c.skip(12);
+                    i as usize
+                } else {
+                    let i = c.u16();
+                    c.skip(if ver == 4 { 10 } else { 5 });
+                    i as usize
+                };
+                st.push(
+                    t.text(
+                        ctx.names
+                            .get(idx.wrapping_sub(1))
+                            .map_or("#NAME?", String::as_str),
+                    )?,
+                );
+            }
+            0x24 | 0x2C => {
+                let l = loc(&mut c, ver, row, col, relative || base == 0x2C);
+                st.push(t.text(a1(l))?);
+            }
+            0x25 | 0x2D => {
+                let a = area(&mut c, ver, row, col, relative || base == 0x2D);
+                st.push(t.text(a)?);
+            }
+            0x26..=0x28 => c.skip(if ver >= 5 { 6 } else { 5 }),
+            0x29 => c.skip(w2),
+            0x2A => {
+                c.skip(if ver >= 8 { 4 } else { 3 });
+                st.push(t.text("#REF!")?);
+            }
+            0x2B => {
+                c.skip(if ver >= 8 { 8 } else { 6 });
+                st.push(t.text("#REF!")?);
+            }
+            0x39 => {
+                let text = if ver >= 8 {
+                    let ixti = c.u16() as usize;
+                    let ni = c.u32() as usize;
+                    name_x(ctx, ixti, ni)
+                } else {
+                    let ixals = c.i16();
+                    c.skip(8);
+                    let ni = c.u16() as usize;
+                    c.skip(12);
+                    if ixals < 0 {
+                        ctx.names
+                            .get(ni.wrapping_sub(1))
+                            .cloned()
+                            .unwrap_or_else(|| "#NAME?".into())
+                    } else {
+                        match ctx.ext5.get((ixals as usize).wrapping_sub(1)) {
+                            Some(ExtSheet5::Names(n)) => n
+                                .get(ni.wrapping_sub(1))
+                                .cloned()
+                                .unwrap_or_else(|| "#NAME?".into()),
+                            _ => "#NAME?".into(),
+                        }
+                    }
+                };
+                st.push(t.text(text)?);
+            }
+            0x3A..=0x3D => {
+                let prefix = sheet_prefix(ctx, &mut c);
+                let text = match base {
+                    0x3A => format!("{prefix}{}", a1(loc(&mut c, ver, row, col, relative))),
+                    0x3B => format!("{prefix}{}", area(&mut c, ver, row, col, relative)),
+                    0x3C => {
+                        c.skip(if ver >= 8 { 4 } else { 3 });
+                        "#REF!".into()
+                    }
+                    _ => {
+                        c.skip(if ver >= 8 { 8 } else { 6 });
+                        "#REF!".into()
+                    }
+                };
+                st.push(t.text(text)?);
+            }
+            _ => return Err(format!("unknown token {ptg:#x}")),
+        }
+        if c.short {
+            return Err("truncated formula".into());
+        }
+    }
+    Ok(None)
+}
+
+fn name_x(ctx: &Ctx, ixti: usize, ni: usize) -> String {
+    let Some(&(sb, _, _)) = ctx.xti.get(ixti) else {
+        return "#NAME?".into();
+    };
+    let Some(book) = ctx.supbooks.get(sb as usize) else {
+        return "#NAME?".into();
+    };
+    if book.internal {
+        return ctx
+            .names
+            .get(ni.wrapping_sub(1))
+            .cloned()
+            .unwrap_or_else(|| "#NAME?".into());
+    }
+    let n = book
+        .names
+        .get(ni.wrapping_sub(1))
+        .cloned()
+        .unwrap_or_else(|| "#NAME?".into());
+    if book.addin {
+        n
+    } else {
+        format!("[{}]!{n}", book.ext_index)
+    }
+}
+
+fn sheet_prefix(ctx: &Ctx, c: &mut Cur) -> String {
+    let range = |names: &[String], first: i64, last: i64, ext: Option<usize>| -> String {
+        let get =
+            |i: i64| -> Option<&String> { usize::try_from(i).ok().and_then(|i| names.get(i)) };
+        let prefix = ext.map(|n| format!("[{n}]")).unwrap_or_default();
+        match (get(first), get(last)) {
+            (Some(a), Some(_)) if first == last => match ext {
+                Some(n) => format!("{}!", quote_external(n, a)),
+                None => format!("{}!", quote_sheet(a)),
+            },
+            (Some(a), Some(b)) if quote_sheet(a) == *a && quote_sheet(b) == *b => {
+                format!("{prefix}{a}:{b}!")
+            }
+            (Some(a), Some(b)) => format!(
+                "'{prefix}{}:{}'!",
+                a.replace('\'', "''"),
+                b.replace('\'', "''")
+            ),
+            _ => "#REF!".into(),
+        }
+    };
+    if ctx.ver >= 8 {
+        let ixti = c.u16() as usize;
+        let Some(&(sb, first, last)) = ctx.xti.get(ixti) else {
+            return "#REF!".into();
+        };
+        match ctx.supbooks.get(sb as usize) {
+            Some(b) if !b.internal => {
+                range(&b.sheets, first.into(), last.into(), Some(b.ext_index))
+            }
+            _ => range(ctx.sheets, first.into(), last.into(), None),
+        }
+    } else {
+        let ixals = c.i16();
+        c.skip(8);
+        let first = c.i16();
+        let last = c.i16();
+        if ixals < 0 {
+            range(ctx.sheets, first.into(), last.into(), None)
+        } else {
+            match ctx.ext5.get((ixals as usize).wrapping_sub(1)) {
+                Some(ExtSheet5::External { doc, sheet }) => {
+                    format!("{}!", quote_external(*doc, sheet))
+                }
+                _ => "#REF!".into(),
+            }
+        }
+    }
+}
+
+/// A cell location with its relative flags.
+#[derive(Clone, Copy)]
+struct Loc {
+    r: u32,
+    c: u32,
+    rrel: bool,
+    crel: bool,
+}
+
+fn maxrow(ver: u8) -> i64 {
+    if ver >= 8 { 0x10000 } else { 0x4000 }
+}
+
+impl Loc {
+    /// BIFF8: a row, and a column word with the relative flags.
+    fn biff8(r: u32, cw: u16) -> Loc {
+        Loc {
+            r,
+            c: (cw & 0x3FFF) as u32,
+            rrel: cw & 0x8000 != 0,
+            crel: cw & 0x4000 != 0,
+        }
+    }
+
+    /// BIFF2 to BIFF7: a row word with the relative flags, and a column.
+    fn biff5(rw: u16, c: u32) -> Loc {
+        Loc {
+            r: (rw & 0x3FFF) as u32,
+            c,
+            rrel: rw & 0x8000 != 0,
+            crel: rw & 0x4000 != 0,
+        }
+    }
+}
+
+/// `offsets`: relative parts are offsets from (row, col), as in RefN.
+fn resolve(l: Loc, row: u32, col: u32, offsets: bool, ver: u8) -> Loc {
+    let mut out = l;
+    if offsets {
+        if l.rrel {
+            let off = if ver >= 8 {
+                i64::from(l.r as u16 as i16)
+            } else {
+                (i64::from(l.r) << 50) >> 50
+            };
+            out.r = (i64::from(row) + off).rem_euclid(maxrow(ver)) as u32;
+        }
+        if l.crel {
+            let off = i64::from(l.c as u8 as i8);
+            out.c = (i64::from(col) + off).rem_euclid(256) as u32;
+        }
+    }
+    out
+}
+
+fn loc(c: &mut Cur, ver: u8, row: u32, col: u32, offsets: bool) -> Loc {
+    let l = if ver >= 8 {
+        let r = c.u16() as u32;
+        Loc::biff8(r, c.u16())
+    } else {
+        let rw = c.u16();
+        Loc::biff5(rw, c.u8() as u32)
+    };
+    resolve(l, row, col, offsets, ver)
+}
+
+fn a1(l: Loc) -> String {
+    format!(
+        "{}{}{}{}",
+        if l.crel { "" } else { "$" },
+        col_name(l.c),
+        if l.rrel { "" } else { "$" },
+        u64::from(l.r) + 1
+    )
+}
+
+fn area(c: &mut Cur, ver: u8, row: u32, col: u32, offsets: bool) -> String {
+    let (a, b) = if ver >= 8 {
+        let r1 = c.u16() as u32;
+        let r2 = c.u16() as u32;
+        let c1 = c.u16();
+        let c2 = c.u16();
+        (
+            resolve(Loc::biff8(r1, c1), row, col, offsets, ver),
+            resolve(Loc::biff8(r2, c2), row, col, offsets, ver),
+        )
+    } else {
+        let r1 = c.u16();
+        let r2 = c.u16();
+        let c1 = c.u8() as u32;
+        let c2 = c.u8() as u32;
+        (
+            resolve(Loc::biff5(r1, c1), row, col, offsets, ver),
+            resolve(Loc::biff5(r2, c2), row, col, offsets, ver),
+        )
+    };
+    let lastrow = if ver >= 8 { 0xFFFF } else { 0x3FFF };
+    // Whole columns and rows, as Excel writes them.
+    if a.r == 0 && b.r == lastrow && !a.rrel && !b.rrel {
+        return format!(
+            "{}{}:{}{}",
+            if a.crel { "" } else { "$" },
+            col_name(a.c),
+            if b.crel { "" } else { "$" },
+            col_name(b.c)
+        );
+    }
+    if a.c == 0 && b.c == 0xFF && !a.crel && !b.crel {
+        return format!(
+            "{}{}:{}{}",
+            if a.rrel { "" } else { "$" },
+            u64::from(a.r) + 1,
+            if b.rrel { "" } else { "$" },
+            u64::from(b.r) + 1
+        );
+    }
+    format!("{}:{}", a1(a), a1(b))
+}
+
+fn read_short_unicode(c: &mut Cur) -> String {
+    let n = c.u8() as usize;
+    let flags = c.u8();
+    read_chars(c, n, flags & 1 != 0)
+}
+
+/// `n` characters, two bytes each or one byte each (Latin-1).
+pub fn read_chars(c: &mut Cur, n: usize, wide: bool) -> String {
+    if wide {
+        let b = c.bytes(n.saturating_mul(2));
+        let u: Vec<u16> = b
+            .as_chunks::<2>()
+            .0
+            .iter()
+            .map(|x| u16::from_le_bytes(*x))
+            .collect();
+        String::from_utf16_lossy(&u)
+    } else {
+        c.bytes(n).iter().map(|&b| b as char).collect()
+    }
+}
+
+fn read_byte_string(c: &mut Cur, cp: u16) -> String {
+    let n = c.u8() as usize;
+    charset::decode(c.bytes(n), cp)
+}
+
+/// Columns less one, then rows less one, in every version; strings differ.
+fn read_array(ex: &mut Cur, ver: u8, cp: u16) -> String {
+    let (cols, rows) = (ex.u8() as usize + 1, ex.u16() as usize + 1);
+    let mut out = String::from("{");
+    'rows: for r in 0..rows {
+        if r > 0 {
+            out.push(';');
+        }
+        for k in 0..cols {
+            if k > 0 {
+                out.push(',');
+            }
+            match ex.u8() {
+                0x01 => out.push_str(&number(ex.f64())),
+                0x02 => {
+                    let s = if ver >= 8 {
+                        let n = ex.u16() as usize;
+                        let f = ex.u8();
+                        read_chars(ex, n, f & 1 != 0)
+                    } else {
+                        let n = ex.u8() as usize;
+                        charset::decode(ex.bytes(n), cp)
+                    };
+                    out.push('"');
+                    out.push_str(&s.replace('"', "\"\""));
+                    out.push('"');
+                }
+                0x04 => {
+                    let b = ex.u8();
+                    ex.skip(7);
+                    out.push_str(if b != 0 { "TRUE" } else { "FALSE" });
+                }
+                0x10 => {
+                    let e = ex.u8();
+                    ex.skip(7);
+                    out.push_str(error_or_na(e));
+                }
+                _ => ex.skip(8),
+            }
+            if ex.short || out.len() > MAX_TEXT {
+                break 'rows;
+            }
+        }
+    }
+    out.push('}');
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn ctx() -> Ctx<'static> {
+        Ctx {
+            ver: 8,
+            sheets: &[],
+            names: &[],
+            xti: &[],
+            supbooks: &[],
+            ext5: &[],
+            codepage: 1252,
+        }
+    }
+
+    #[test]
+    fn decodes_operators_functions_and_constants() {
+        // =SUM(A1:B2)*2 with an attrSum, then <> TRUE, as Excel stores it.
+        let mut r = vec![0x25, 0, 0, 1, 0, 0, 0xC0, 1, 0xC0];
+        r.extend_from_slice(&[0x19, 0x10, 0, 0]);
+        r.extend_from_slice(&[0x1E, 2, 0, 0x05]);
+        r.extend_from_slice(&[0x1D, 1, 0x0E]);
+        let d = decode(&ctx(), &r, &[], 0, 0).unwrap();
+        assert_eq!(d.text, "SUM(A1:B2)*2<>TRUE");
+        // #N/A stays an error constant.
+        assert_eq!(
+            decode(&ctx(), &[0x1C, 0x2A], &[], 0, 0).unwrap().text,
+            "#N/A"
+        );
+        // ROUND(1.5,0): a fixed-argument function.
+        let mut r = vec![0x1F];
+        r.extend_from_slice(&1.5f64.to_le_bytes());
+        r.extend_from_slice(&[0x1E, 0, 0, 0x21, 27, 0]);
+        assert_eq!(decode(&ctx(), &r, &[], 0, 0).unwrap().text, "ROUND(1.5,0)");
+    }
+
+    #[test]
+    fn an_excel_4_macro_call_is_written_as_the_formula_it_is() {
+        // ALERT("hi"): the string, then a PtgFuncVar of one argument whose id
+        // has the command bit.
+        let mut r = vec![0x17, 2, 0, b'h', b'i'];
+        r.extend_from_slice(&[0x42, 1, 0x76, 0x80]);
+        assert_eq!(decode(&ctx(), &r, &[], 0, 0).unwrap().text, "ALERT(\"hi\")");
+        // HALT(): no arguments.
+        let r = [0x42, 0, 54, 0];
+        assert_eq!(decode(&ctx(), &r, &[], 0, 0).unwrap().text, "HALT()");
+    }
+
+    #[test]
+    fn relative_offsets_wrap() {
+        // RefN one row up and one column left of B2.
+        let r = [0x2C, 0xFF, 0xFF, 0xFF, 0xC0];
+        assert_eq!(decode(&ctx(), &r, &[], 1, 1).unwrap().text, "A1");
+    }
+
+    #[test]
+    fn conditional_formats_count_from_their_range() {
+        // An Area, relative, rows -1 to +1 and column +3 from B2: E1:E3.
+        // Read as a cell formula, the same token names rows 65536 and 2.
+        let r = [0x25, 0xFF, 0xFF, 1, 0, 3, 0xC0, 3, 0xC0];
+        assert_eq!(decode_relative(&ctx(), &r, 1, 1).unwrap().text, "E1:E3");
+        assert_eq!(decode(&ctx(), &r, &[], 1, 1).unwrap().text, "D65536:D2");
+        // Absolute parts stay where they are.
+        let r = [0x24, 4, 0, 2, 0x00];
+        assert_eq!(decode_relative(&ctx(), &r, 1, 1).unwrap().text, "$C$5");
+    }
+
+    #[test]
+    fn hostile_formulas_are_refused_not_panicking() {
+        assert!(decode(&ctx(), &[0x03], &[], 0, 0).is_err());
+        assert!(decode(&ctx(), &[0x22, 0x7F, 0xFF, 0x00], &[], 0, 0).is_err());
+        // A long chain of concatenations stops at the text limit.
+        let mut r = vec![0x17, 200, 0];
+        r.extend(std::iter::repeat_n(b'x', 200));
+        for _ in 0..200 {
+            r.extend_from_slice(&[0x17, 200, 0]);
+            r.extend(std::iter::repeat_n(b'x', 200));
+            r.push(0x08);
+        }
+        assert_eq!(
+            decode(&ctx(), &r, &[], 0, 0).err().as_deref(),
+            Some("formula too long")
+        );
+        assert!(
+            decode(
+                &ctx(),
+                &[0x20, 0, 0, 0, 0, 0, 0, 0],
+                &[0xFF, 0xFF, 0xFF],
+                0,
+                0
+            )
+            .is_ok()
+        );
+    }
+
+    #[test]
+    #[cfg_attr(target_family = "wasm", ignore = "needs a thread")]
+    fn a_chain_of_operators_is_written_without_recursion() {
+        // 1 followed by 16000 percent signs, in a thread whose stack could
+        // not hold that many nested calls.
+        let mut r = vec![0x1E, 1, 0];
+        r.extend(std::iter::repeat_n(0x14u8, 16_000));
+        let text = std::thread::Builder::new()
+            .stack_size(128 * 1024)
+            .spawn(move || decode(&ctx(), &r, &[], 0, 0).unwrap().text)
+            .unwrap()
+            .join()
+            .unwrap();
+        assert_eq!(text.len(), 16_001);
+        assert!(text.starts_with("1%%") && text.ends_with("%%"));
+    }
+
+    #[test]
+    fn biff2_fixed_counts() {
+        let c = Ctx { ver: 2, ..ctx() };
+        // FIXED(1,2) with a BIFF2 PtgFunc.
+        let r = [0x1E, 1, 0, 0x1E, 2, 0, 0x21, 14];
+        assert_eq!(decode(&c, &r, &[], 0, 0).unwrap().text, "FIXED(1,2)");
+    }
+
+    #[test]
+    fn numbers() {
+        assert_eq!(number(0.1 + 0.2), "0.3");
+        assert_eq!(number(-2.0), "-2");
+        assert_eq!(number(1e20), "1E+20");
+        assert_eq!(number(0.000012), "0.000012");
+        assert_eq!(number(1.5e-7), "1.5E-7");
+        assert_eq!(number(f64::NAN), "0");
+    }
+
+    #[test]
+    fn columns_are_named_in_letters() {
+        assert_eq!(col_name(0), "A");
+        assert_eq!(col_name(25), "Z");
+        assert_eq!(col_name(26), "AA");
+        assert_eq!(col_name(16383), "XFD");
+    }
+}
diff --git a/crates/exav-unpack/src/formats/biff/ftab.rs b/crates/exav-unpack/src/formats/biff/ftab.rs
new file mode 100644
index 00000000..f9cb736d
--- /dev/null
+++ b/crates/exav-unpack/src/formats/biff/ftab.rs
@@ -0,0 +1,820 @@
+//! The built-in functions that `ptgFunc` and `ptgFuncVar` formula tokens name
+//! by number (`EXEC`, `CALL` and the rest of an Excel 4.0 macro sheet are
+//! numbers in the file, invisible to a scan of its bytes).
+
+/// (function id, name, argument count when it is fixed, else -1), sorted by id.
+/// Ids with the 0x8000 bit are the command equivalents of Excel 4.0 macros.
+#[rustfmt::skip]
+const FUNCTIONS: &[(u16, &str, i8)] = &[
+    (0, "COUNT", -1),
+    (1, "IF", -1),
+    (2, "ISNA", 1),
+    (3, "ISERROR", 1),
+    (4, "SUM", -1),
+    (5, "AVERAGE", -1),
+    (6, "MIN", -1),
+    (7, "MAX", -1),
+    (8, "ROW", -1),
+    (9, "COLUMN", -1),
+    (10, "NA", 0),
+    (11, "NPV", -1),
+    (12, "STDEV", -1),
+    (13, "DOLLAR", -1),
+    (14, "FIXED", -1),
+    (15, "SIN", 1),
+    (16, "COS", 1),
+    (17, "TAN", 1),
+    (18, "ATAN", 1),
+    (19, "PI", 0),
+    (20, "SQRT", 1),
+    (21, "EXP", 1),
+    (22, "LN", 1),
+    (23, "LOG10", 1),
+    (24, "ABS", 1),
+    (25, "INT", 1),
+    (26, "SIGN", 1),
+    (27, "ROUND", 2),
+    (28, "LOOKUP", -1),
+    (29, "INDEX", -1),
+    (30, "REPT", 2),
+    (31, "MID", 3),
+    (32, "LEN", 1),
+    (33, "VALUE", 1),
+    (34, "TRUE", 0),
+    (35, "FALSE", 0),
+    (36, "AND", -1),
+    (37, "OR", -1),
+    (38, "NOT", 1),
+    (39, "MOD", 2),
+    (40, "DCOUNT", 3),
+    (41, "DSUM", 3),
+    (42, "DAVERAGE", 3),
+    (43, "DMIN", 3),
+    (44, "DMAX", 3),
+    (45, "DSTDEV", 3),
+    (46, "VAR", -1),
+    (47, "DVAR", 3),
+    (48, "TEXT", 2),
+    (49, "LINEST", -1),
+    (50, "TREND", -1),
+    (51, "LOGEST", -1),
+    (52, "GROWTH", -1),
+    (53, "GOTO", 1),
+    (54, "HALT", -1),
+    (55, "RETURN", -1),
+    (56, "PV", -1),
+    (57, "FV", -1),
+    (58, "NPER", -1),
+    (59, "PMT", -1),
+    (60, "RATE", -1),
+    (61, "MIRR", 3),
+    (62, "IRR", -1),
+    (63, "RAND", 0),
+    (64, "MATCH", -1),
+    (65, "DATE", 3),
+    (66, "TIME", 3),
+    (67, "DAY", 1),
+    (68, "MONTH", 1),
+    (69, "YEAR", 1),
+    (70, "WEEKDAY", -1),
+    (71, "HOUR", 1),
+    (72, "MINUTE", 1),
+    (73, "SECOND", 1),
+    (74, "NOW", 0),
+    (75, "AREAS", 1),
+    (76, "ROWS", 1),
+    (77, "COLUMNS", 1),
+    (78, "OFFSET", -1),
+    (79, "ABSREF", 2),
+    (80, "RELREF", 2),
+    (81, "ARGUMENT", -1),
+    (82, "SEARCH", -1),
+    (83, "TRANSPOSE", 1),
+    (84, "ERROR", -1),
+    (85, "STEP", 0),
+    (86, "TYPE", 1),
+    (87, "ECHO", -1),
+    (88, "SET.NAME", -1),
+    (89, "CALLER", 0),
+    (90, "DEREF", 1),
+    (91, "WINDOWS", -1),
+    (92, "SERIES", -1),
+    (93, "DOCUMENTS", -1),
+    (94, "ACTIVE.CELL", 0),
+    (95, "SELECTION", 0),
+    (96, "RESULT", -1),
+    (97, "ATAN2", 2),
+    (98, "ASIN", 1),
+    (99, "ACOS", 1),
+    (100, "CHOOSE", -1),
+    (101, "HLOOKUP", -1),
+    (102, "VLOOKUP", -1),
+    (103, "LINKS", -1),
+    (104, "INPUT", -1),
+    (105, "ISREF", 1),
+    (106, "GET.FORMULA", 1),
+    (107, "GET.NAME", -1),
+    (108, "SET.VALUE", 2),
+    (109, "LOG", -1),
+    (110, "EXEC", -1),
+    (111, "CHAR", 1),
+    (112, "LOWER", 1),
+    (113, "UPPER", 1),
+    (114, "PROPER", 1),
+    (115, "LEFT", -1),
+    (116, "RIGHT", -1),
+    (117, "EXACT", 2),
+    (118, "TRIM", 1),
+    (119, "REPLACE", 4),
+    (120, "SUBSTITUTE", -1),
+    (121, "CODE", 1),
+    (122, "NAMES", -1),
+    (123, "DIRECTORY", -1),
+    (124, "FIND", -1),
+    (125, "CELL", -1),
+    (126, "ISERR", 1),
+    (127, "ISTEXT", 1),
+    (128, "ISNUMBER", 1),
+    (129, "ISBLANK", 1),
+    (130, "T", 1),
+    (131, "N", 1),
+    (132, "FOPEN", -1),
+    (133, "FCLOSE", 1),
+    (134, "FSIZE", 1),
+    (135, "FREADLN", 1),
+    (136, "FREAD", 2),
+    (137, "FWRITELN", 2),
+    (138, "FWRITE", 2),
+    (139, "FPOS", -1),
+    (140, "DATEVALUE", 1),
+    (141, "TIMEVALUE", 1),
+    (142, "SLN", 3),
+    (143, "SYD", 4),
+    (144, "DDB", -1),
+    (145, "GET.DEF", -1),
+    (146, "REFTEXT", -1),
+    (147, "TEXTREF", -1),
+    (148, "INDIRECT", -1),
+    (149, "REGISTER", -1),
+    (150, "CALL", -1),
+    (151, "ADD.BAR", -1),
+    (152, "ADD.MENU", -1),
+    (153, "ADD.COMMAND", -1),
+    (154, "ENABLE.COMMAND", -1),
+    (155, "CHECK.COMMAND", -1),
+    (156, "RENAME.COMMAND", -1),
+    (157, "SHOW.BAR", -1),
+    (158, "DELETE.MENU", -1),
+    (159, "DELETE.COMMAND", -1),
+    (160, "GET.CHART.ITEM", -1),
+    (161, "DIALOG.BOX", 1),
+    (162, "CLEAN", 1),
+    (163, "MDETERM", 1),
+    (164, "MINVERSE", 1),
+    (165, "MMULT", 2),
+    (166, "FILES", -1),
+    (167, "IPMT", -1),
+    (168, "PPMT", -1),
+    (169, "COUNTA", -1),
+    (170, "CANCEL.KEY", -1),
+    (171, "FOR", -1),
+    (172, "WHILE", 1),
+    (173, "BREAK", 0),
+    (174, "NEXT", 0),
+    (175, "INITIATE", 2),
+    (176, "REQUEST", 2),
+    (177, "POKE", 3),
+    (178, "EXECUTE", 2),
+    (179, "TERMINATE", 1),
+    (180, "RESTART", -1),
+    (181, "HELP", -1),
+    (182, "GET.BAR", -1),
+    (183, "PRODUCT", -1),
+    (184, "FACT", 1),
+    (185, "GET.CELL", -1),
+    (186, "GET.WORKSPACE", 1),
+    (187, "GET.WINDOW", -1),
+    (188, "GET.DOCUMENT", -1),
+    (189, "DPRODUCT", 3),
+    (190, "ISNONTEXT", 1),
+    (191, "GET.NOTE", -1),
+    (192, "NOTE", -1),
+    (193, "STDEVP", -1),
+    (194, "VARP", -1),
+    (195, "DSTDEVP", 3),
+    (196, "DVARP", 3),
+    (197, "TRUNC", -1),
+    (198, "ISLOGICAL", 1),
+    (199, "DCOUNTA", 3),
+    (200, "DELETE.BAR", 1),
+    (201, "UNREGISTER", 1),
+    (204, "USDOLLAR", -1),
+    (205, "FINDB", -1),
+    (206, "SEARCHB", -1),
+    (207, "REPLACEB", 4),
+    (208, "LEFTB", -1),
+    (209, "RIGHTB", -1),
+    (210, "MIDB", 3),
+    (211, "LENB", 1),
+    (212, "ROUNDUP", 2),
+    (213, "ROUNDDOWN", 2),
+    (214, "ASC", 1),
+    (215, "DBCS", 1),
+    (216, "RANK", -1),
+    (219, "ADDRESS", -1),
+    (220, "DAYS360", -1),
+    (221, "TODAY", 0),
+    (222, "VDB", -1),
+    (223, "ELSE", 0),
+    (224, "ELSE.IF", 1),
+    (225, "END.IF", 0),
+    (226, "FOR.CELL", -1),
+    (227, "MEDIAN", -1),
+    (228, "SUMPRODUCT", -1),
+    (229, "SINH", 1),
+    (230, "COSH", 1),
+    (231, "TANH", 1),
+    (232, "ASINH", 1),
+    (233, "ACOSH", 1),
+    (234, "ATANH", 1),
+    (235, "DGET", 3),
+    (236, "CREATE.OBJECT", -1),
+    (237, "VOLATILE", -1),
+    (238, "LAST.ERROR", 0),
+    (239, "CUSTOM.UNDO", -1),
+    (240, "CUSTOM.REPEAT", -1),
+    (241, "FORMULA.CONVERT", -1),
+    (242, "GET.LINK.INFO", -1),
+    (243, "TEXT.BOX", -1),
+    (244, "INFO", 1),
+    (245, "GROUP", 0),
+    (246, "GET.OBJECT", -1),
+    (247, "DB", -1),
+    (248, "PAUSE", -1),
+    (251, "RESUME", -1),
+    (252, "FREQUENCY", 2),
+    (253, "ADD.TOOLBAR", -1),
+    (254, "DELETE.TOOLBAR", 1),
+    (255, "User Defined Function", -1),
+    (256, "RESET.TOOLBAR", 1),
+    (257, "EVALUATE", 1),
+    (258, "GET.TOOLBAR", -1),
+    (259, "GET.TOOL", -1),
+    (260, "SPELLING.CHECK", -1),
+    (261, "ERROR.TYPE", 1),
+    (262, "APP.TITLE", -1),
+    (263, "WINDOW.TITLE", -1),
+    (264, "SAVE.TOOLBAR", -1),
+    (265, "ENABLE.TOOL", 3),
+    (266, "PRESS.TOOL", 3),
+    (267, "REGISTER.ID", -1),
+    (268, "GET.WORKBOOK", -1),
+    (269, "AVEDEV", -1),
+    (270, "BETADIST", -1),
+    (271, "GAMMALN", 1),
+    (272, "BETAINV", -1),
+    (273, "BINOMDIST", 4),
+    (274, "CHIDIST", 2),
+    (275, "CHIINV", 2),
+    (276, "COMBIN", 2),
+    (277, "CONFIDENCE", 3),
+    (278, "CRITBINOM", 3),
+    (279, "EVEN", 1),
+    (280, "EXPONDIST", 3),
+    (281, "FDIST", 3),
+    (282, "FINV", 3),
+    (283, "FISHER", 1),
+    (284, "FISHERINV", 1),
+    (285, "FLOOR", 2),
+    (286, "GAMMADIST", 4),
+    (287, "GAMMAINV", 3),
+    (288, "CEILING", 2),
+    (289, "HYPGEOMDIST", 4),
+    (290, "LOGNORMDIST", 3),
+    (291, "LOGINV", 3),
+    (292, "NEGBINOMDIST", 3),
+    (293, "NORMDIST", 4),
+    (294, "NORMSDIST", 1),
+    (295, "NORMINV", 3),
+    (296, "NORMSINV", 1),
+    (297, "STANDARDIZE", 3),
+    (298, "ODD", 1),
+    (299, "PERMUT", 2),
+    (300, "POISSON", 3),
+    (301, "TDIST", 3),
+    (302, "WEIBULL", 4),
+    (303, "SUMXMY2", 2),
+    (304, "SUMX2MY2", 2),
+    (305, "SUMX2PY2", 2),
+    (306, "CHITEST", 2),
+    (307, "CORREL", 2),
+    (308, "COVAR", 2),
+    (309, "FORECAST", 3),
+    (310, "FTEST", 2),
+    (311, "INTERCEPT", 2),
+    (312, "PEARSON", 2),
+    (313, "RSQ", 2),
+    (314, "STEYX", 2),
+    (315, "SLOPE", 2),
+    (316, "TTEST", 4),
+    (317, "PROB", -1),
+    (318, "DEVSQ", -1),
+    (319, "GEOMEAN", -1),
+    (320, "HARMEAN", -1),
+    (321, "SUMSQ", -1),
+    (322, "KURT", -1),
+    (323, "SKEW", -1),
+    (324, "ZTEST", -1),
+    (325, "LARGE", 2),
+    (326, "SMALL", 2),
+    (327, "QUARTILE", 2),
+    (328, "PERCENTILE", 2),
+    (329, "PERCENTRANK", -1),
+    (330, "MODE", -1),
+    (331, "TRIMMEAN", 2),
+    (332, "TINV", 2),
+    (334, "MOVIE.COMMAND", -1),
+    (335, "GET.MOVIE", -1),
+    (336, "CONCATENATE", -1),
+    (337, "POWER", 2),
+    (338, "PIVOT.ADD.DATA", -1),
+    (339, "GET.PIVOT.TABLE", -1),
+    (340, "GET.PIVOT.FIELD", -1),
+    (341, "GET.PIVOT.ITEM", -1),
+    (342, "RADIANS", 1),
+    (343, "DEGREES", 1),
+    (344, "SUBTOTAL", -1),
+    (345, "SUMIF", -1),
+    (346, "COUNTIF", 2),
+    (347, "COUNTBLANK", 1),
+    (348, "SCENARIO.GET", -1),
+    (349, "OPTIONS.LISTS.GET", 1),
+    (350, "ISPMT", 4),
+    (351, "DATEDIF", 3),
+    (352, "DATESTRING", 1),
+    (353, "NUMBERSTRING", 2),
+    (354, "ROMAN", -1),
+    (355, "OPEN.DIALOG", -1),
+    (356, "SAVE.DIALOG", -1),
+    (357, "VIEW.GET", -1),
+    (358, "GETPIVOTDATA", -1),
+    (359, "HYPERLINK", -1),
+    (360, "PHONETIC", 1),
+    (361, "AVERAGEA", -1),
+    (362, "MAXA", -1),
+    (363, "MINA", -1),
+    (364, "STDEVPA", -1),
+    (365, "VARPA", -1),
+    (366, "STDEVA", -1),
+    (367, "VARA", -1),
+    (368, "BAHTTEXT", 1),
+    (369, "THAIDAYOFWEEK", 1),
+    (370, "THAIDIGIT", 1),
+    (371, "THAIMONTHOFYEAR", 1),
+    (372, "THAINUMSOUND", 1),
+    (373, "THAINUMSTRING", 1),
+    (374, "THAISTRINGLENGTH", 1),
+    (375, "ISTHAIDIGIT", 1),
+    (376, "ROUNDBAHTDOWN", 1),
+    (377, "ROUNDBAHTUP", 1),
+    (378, "THAIYEAR", 1),
+    (379, "RTD", -1),
+    (480, "IFERROR", -1),
+    (32768, "BEEP", -1),
+    (32769, "OPEN", -1),
+    (32770, "OPEN.LINKS", -1),
+    (32771, "CLOSE.ALL", -1),
+    (32772, "SAVE", -1),
+    (32773, "SAVE.AS", -1),
+    (32774, "FILE.DELETE", -1),
+    (32775, "PAGE.SETUP", -1),
+    (32776, "PRINT", -1),
+    (32777, "PRINTER.SETUP", -1),
+    (32778, "QUIT", -1),
+    (32779, "NEW.WINDOW", -1),
+    (32780, "ARRANGE.ALL", -1),
+    (32781, "WINDOW.SIZE", -1),
+    (32782, "WINDOW.MOVE", -1),
+    (32783, "FULL", -1),
+    (32784, "CLOSE", -1),
+    (32785, "RUN", -1),
+    (32790, "SET.PRINT.AREA", -1),
+    (32791, "SET.PRINT.TITLES", -1),
+    (32792, "SET.PAGE.BREAK", -1),
+    (32793, "REMOVE.PAGE.BREAK", -1),
+    (32794, "FONT", -1),
+    (32795, "DISPLAY", -1),
+    (32796, "PROTECT.DOCUMENT", -1),
+    (32797, "PRECISION", -1),
+    (32798, "A1.R1C1", -1),
+    (32799, "CALCULATE.NOW", -1),
+    (32800, "CALCULATION", -1),
+    (32802, "DATA.FIND", -1),
+    (32803, "EXTRACT", -1),
+    (32804, "DATA.DELETE", -1),
+    (32805, "SET.DATABASE", -1),
+    (32806, "SET.CRITERIA", -1),
+    (32807, "SORT", -1),
+    (32808, "DATA.SERIES", -1),
+    (32809, "TABLE", -1),
+    (32810, "FORMAT.NUMBER", -1),
+    (32811, "ALIGNMENT", -1),
+    (32812, "STYLE", -1),
+    (32813, "BORDER", -1),
+    (32814, "CELL.PROTECTION", -1),
+    (32815, "COLUMN.WIDTH", -1),
+    (32816, "UNDO", -1),
+    (32817, "CUT", -1),
+    (32818, "COPY", -1),
+    (32819, "PASTE", -1),
+    (32820, "CLEAR", -1),
+    (32821, "PASTE.SPECIAL", -1),
+    (32822, "EDIT.DELETE", -1),
+    (32823, "INSERT", -1),
+    (32824, "FILL.RIGHT", -1),
+    (32825, "FILL.DOWN", -1),
+    (32829, "DEFINE.NAME", -1),
+    (32830, "CREATE.NAMES", -1),
+    (32831, "FORMULA.GOTO", -1),
+    (32832, "FORMULA.FIND", -1),
+    (32833, "SELECT.LAST.CELL", -1),
+    (32834, "SHOW.ACTIVE.CELL", -1),
+    (32835, "GALLERY.AREA", -1),
+    (32836, "GALLERY.BAR", -1),
+    (32837, "GALLERY.COLUMN", -1),
+    (32838, "GALLERY.LINE", -1),
+    (32839, "GALLERY.PIE", -1),
+    (32840, "GALLERY.SCATTER", -1),
+    (32841, "COMBINATION", -1),
+    (32842, "PREFERRED", -1),
+    (32843, "ADD.OVERLAY", -1),
+    (32844, "GRIDLINES", -1),
+    (32845, "SET.PREFERRED", -1),
+    (32846, "AXES", -1),
+    (32847, "LEGEND", -1),
+    (32848, "ATTACH.TEXT", -1),
+    (32849, "ADD.ARROW", -1),
+    (32850, "SELECT.CHART", -1),
+    (32851, "SELECT.PLOT.AREA", -1),
+    (32852, "PATTERNS", -1),
+    (32853, "MAIN.CHART", -1),
+    (32854, "OVERLAY", -1),
+    (32855, "SCALE", -1),
+    (32856, "FORMAT.LEGEND", -1),
+    (32857, "FORMAT.TEXT", -1),
+    (32858, "EDIT.REPEAT", -1),
+    (32859, "PARSE", -1),
+    (32860, "JUSTIFY", -1),
+    (32861, "HIDE", -1),
+    (32862, "UNHIDE", -1),
+    (32863, "WORKSPACE", -1),
+    (32864, "FORMULA", -1),
+    (32865, "FORMULA.FILL", -1),
+    (32866, "FORMULA.ARRAY", -1),
+    (32867, "DATA.FIND.NEXT", -1),
+    (32868, "DATA.FIND.PREV", -1),
+    (32869, "FORMULA.FIND.NEXT", -1),
+    (32870, "FORMULA.FIND.PREV", -1),
+    (32871, "ACTIVATE", -1),
+    (32872, "ACTIVATE.NEXT", -1),
+    (32873, "ACTIVATE.PREV", -1),
+    (32874, "UNLOCKED.NEXT", -1),
+    (32875, "UNLOCKED.PREV", -1),
+    (32876, "COPY.PICTURE", -1),
+    (32877, "SELECT", -1),
+    (32878, "DELETE.NAME", -1),
+    (32879, "DELETE.FORMAT", -1),
+    (32880, "VLINE", -1),
+    (32881, "HLINE", -1),
+    (32882, "VPAGE", -1),
+    (32883, "HPAGE", -1),
+    (32884, "VSCROLL", -1),
+    (32885, "HSCROLL", -1),
+    (32886, "ALERT", -1),
+    (32887, "NEW", -1),
+    (32888, "CANCEL.COPY", -1),
+    (32889, "SHOW.CLIPBOARD", -1),
+    (32890, "MESSAGE", -1),
+    (32892, "PASTE.LINK", -1),
+    (32893, "APP.ACTIVATE", -1),
+    (32894, "DELETE.ARROW", -1),
+    (32895, "ROW.HEIGHT", -1),
+    (32896, "FORMAT.MOVE", -1),
+    (32897, "FORMAT.SIZE", -1),
+    (32898, "FORMULA.REPLACE", -1),
+    (32899, "SEND.KEYS", -1),
+    (32900, "SELECT.SPECIAL", -1),
+    (32901, "APPLY.NAMES", -1),
+    (32902, "REPLACE.FONT", -1),
+    (32903, "FREEZE.PANES", -1),
+    (32904, "SHOW.INFO", -1),
+    (32905, "SPLIT", -1),
+    (32906, "ON.WINDOW", -1),
+    (32907, "ON.DATA", -1),
+    (32908, "DISABLE.INPUT", -1),
+    (32910, "OUTLINE", -1),
+    (32911, "LIST.NAMES", -1),
+    (32912, "FILE.CLOSE", -1),
+    (32913, "SAVE.WORKBOOK", -1),
+    (32914, "DATA.FORM", -1),
+    (32915, "COPY.CHART", -1),
+    (32916, "ON.TIME", -1),
+    (32917, "WAIT", -1),
+    (32918, "FORMAT.FONT", -1),
+    (32919, "FILL.UP", -1),
+    (32920, "FILL.LEFT", -1),
+    (32921, "DELETE.OVERLAY", -1),
+    (32923, "SHORT.MENUS", -1),
+    (32927, "SET.UPDATE.STATUS", -1),
+    (32929, "COLOR.PALETTE", -1),
+    (32930, "DELETE.STYLE", -1),
+    (32931, "WINDOW.RESTORE", -1),
+    (32932, "WINDOW.MAXIMIZE", -1),
+    (32934, "CHANGE.LINK", -1),
+    (32935, "CALCULATE.DOCUMENT", -1),
+    (32936, "ON.KEY", -1),
+    (32937, "APP.RESTORE", -1),
+    (32938, "APP.MOVE", -1),
+    (32939, "APP.SIZE", -1),
+    (32940, "APP.MINIMIZE", -1),
+    (32941, "APP.MAXIMIZE", -1),
+    (32942, "BRING.TO.FRONT", -1),
+    (32943, "SEND.TO.BACK", -1),
+    (32953, "MAIN.CHART.TYPE", -1),
+    (32954, "OVERLAY.CHART.TYPE", -1),
+    (32955, "SELECT.END", -1),
+    (32956, "OPEN.MAIL", -1),
+    (32957, "SEND.MAIL", -1),
+    (32958, "STANDARD.FONT", -1),
+    (32959, "CONSOLIDATE", -1),
+    (32960, "SORT.SPECIAL", -1),
+    (32961, "GALLERY.3D.AREA", -1),
+    (32962, "GALLERY.3D.COLUMN", -1),
+    (32963, "GALLERY.3D.LINE", -1),
+    (32964, "GALLERY.3D.PIE", -1),
+    (32965, "VIEW.3D", -1),
+    (32966, "GOAL.SEEK", -1),
+    (32967, "WORKGROUP", -1),
+    (32968, "FILL.GROUP", -1),
+    (32969, "UPDATE.LINK", -1),
+    (32970, "PROMOTE", -1),
+    (32971, "DEMOTE", -1),
+    (32972, "SHOW.DETAIL", -1),
+    (32974, "UNGROUP", -1),
+    (32975, "OBJECT.PROPERTIES", -1),
+    (32976, "SAVE.NEW.OBJECT", -1),
+    (32977, "SHARE", -1),
+    (32978, "SHARE.NAME", -1),
+    (32979, "DUPLICATE", -1),
+    (32980, "APPLY.STYLE", -1),
+    (32981, "ASSIGN.TO.OBJECT", -1),
+    (32982, "OBJECT.PROTECTION", -1),
+    (32983, "HIDE.OBJECT", -1),
+    (32984, "SET.EXTRACT", -1),
+    (32985, "CREATE.PUBLISHER", -1),
+    (32986, "SUBSCRIBE.TO", -1),
+    (32987, "ATTRIBUTES", -1),
+    (32988, "SHOW.TOOLBAR", -1),
+    (32990, "PRINT.PREVIEW", -1),
+    (32991, "EDIT.COLOR", -1),
+    (32992, "SHOW.LEVELS", -1),
+    (32993, "FORMAT.MAIN", -1),
+    (32994, "FORMAT.OVERLAY", -1),
+    (32995, "ON.RECALC", -1),
+    (32996, "EDIT.SERIES", -1),
+    (32997, "DEFINE.STYLE", -1),
+    (33008, "LINE.PRINT", -1),
+    (33011, "ENTER.DATA", -1),
+    (33017, "GALLERY.RADAR", -1),
+    (33018, "MERGE.STYLES", -1),
+    (33019, "EDITION.OPTIONS", -1),
+    (33020, "PASTE.PICTURE", -1),
+    (33021, "PASTE.PICTURE.LINK", -1),
+    (33022, "SPELLING", -1),
+    (33024, "ZOOM", -1),
+    (33027, "INSERT.OBJECT", -1),
+    (33028, "WINDOW.MINIMIZE", -1),
+    (33033, "SOUND.NOTE", -1),
+    (33034, "SOUND.PLAY", -1),
+    (33035, "FORMAT.SHAPE", -1),
+    (33036, "EXTEND.POLYGON", -1),
+    (33037, "FORMAT.AUTO", -1),
+    (33040, "GALLERY.3D.BAR", -1),
+    (33041, "GALLERY.3D.SURFACE", -1),
+    (33042, "FILL.AUTO", -1),
+    (33044, "CUSTOMIZE.TOOLBAR", -1),
+    (33045, "ADD.TOOL", -1),
+    (33046, "EDIT.OBJECT", -1),
+    (33047, "ON.DOUBLECLICK", -1),
+    (33048, "ON.ENTRY", -1),
+    (33049, "WORKBOOK.ADD", -1),
+    (33050, "WORKBOOK.MOVE", -1),
+    (33051, "WORKBOOK.COPY", -1),
+    (33052, "WORKBOOK.OPTIONS", -1),
+    (33053, "SAVE.WORKSPACE", -1),
+    (33056, "CHART.WIZARD", -1),
+    (33057, "DELETE.TOOL", -1),
+    (33058, "MOVE.TOOL", -1),
+    (33059, "WORKBOOK.SELECT", -1),
+    (33060, "WORKBOOK.ACTIVATE", -1),
+    (33061, "ASSIGN.TO.TOOL", -1),
+    (33063, "COPY.TOOL", -1),
+    (33064, "RESET.TOOL", -1),
+    (33065, "CONSTRAIN.NUMERIC", -1),
+    (33066, "PASTE.TOOL", -1),
+    (33070, "WORKBOOK.NEW", -1),
+    (33073, "SCENARIO.CELLS", -1),
+    (33074, "SCENARIO.DELETE", -1),
+    (33075, "SCENARIO.ADD", -1),
+    (33076, "SCENARIO.EDIT", -1),
+    (33077, "SCENARIO.SHOW", -1),
+    (33078, "SCENARIO.SHOW.NEXT", -1),
+    (33079, "SCENARIO.SUMMARY", -1),
+    (33080, "PIVOT.TABLE.WIZARD", -1),
+    (33081, "PIVOT.FIELD.PROPERTIES", -1),
+    (33082, "PIVOT.FIELD", -1),
+    (33083, "PIVOT.ITEM", -1),
+    (33084, "PIVOT.ADD.FIELDS", -1),
+    (33086, "OPTIONS.CALCULATION", -1),
+    (33087, "OPTIONS.EDIT", -1),
+    (33088, "OPTIONS.VIEW", -1),
+    (33089, "ADDIN.MANAGER", -1),
+    (33090, "MENU.EDITOR", -1),
+    (33091, "ATTACH.TOOLBARS", -1),
+    (33092, "VBAActivate", -1),
+    (33093, "OPTIONS.CHART", -1),
+    (33096, "VBA.INSERT.FILE", -1),
+    (33098, "VBA.PROCEDURE.DEFINITION", -1),
+    (33104, "ROUTING.SLIP", -1),
+    (33106, "ROUTE.DOCUMENT", -1),
+    (33107, "MAIL.LOGON", -1),
+    (33110, "INSERT.PICTURE", -1),
+    (33111, "EDIT.TOOL", -1),
+    (33112, "GALLERY.DOUGHNUT", -1),
+    (33118, "CHART.TREND", -1),
+    (33120, "PIVOT.ITEM.PROPERTIES", -1),
+    (33122, "WORKBOOK.INSERT", -1),
+    (33123, "OPTIONS.TRANSITION", -1),
+    (33124, "OPTIONS.GENERAL", -1),
+    (33138, "FILTER.ADVANCED", -1),
+    (33141, "MAIL.ADD.MAILER", -1),
+    (33142, "MAIL.DELETE.MAILER", -1),
+    (33143, "MAIL.REPLY", -1),
+    (33144, "MAIL.REPLY.ALL", -1),
+    (33145, "MAIL.FORWARD", -1),
+    (33146, "MAIL.NEXT.LETTER", -1),
+    (33147, "DATA.LABEL", -1),
+    (33148, "INSERT.TITLE", -1),
+    (33149, "FONT.PROPERTIES", -1),
+    (33150, "MACRO.OPTIONS", -1),
+    (33151, "WORKBOOK.HIDE", -1),
+    (33152, "WORKBOOK.UNHIDE", -1),
+    (33153, "WORKBOOK.DELETE", -1),
+    (33154, "WORKBOOK.NAME", -1),
+    (33156, "GALLERY.CUSTOM", -1),
+    (33158, "ADD.CHART.AUTOFORMAT", -1),
+    (33159, "DELETE.CHART.AUTOFORMAT", -1),
+    (33160, "CHART.ADD.DATA", -1),
+    (33161, "AUTO.OUTLINE", -1),
+    (33162, "TAB.ORDER", -1),
+    (33163, "SHOW.DIALOG", -1),
+    (33164, "SELECT.ALL", -1),
+    (33165, "UNGROUP.SHEETS", -1),
+    (33166, "SUBTOTAL.CREATE", -1),
+    (33167, "SUBTOTAL.REMOVE", -1),
+    (33168, "RENAME.OBJECT", -1),
+    (33180, "WORKBOOK.SCROLL", -1),
+    (33181, "WORKBOOK.NEXT", -1),
+    (33182, "WORKBOOK.PREV", -1),
+    (33183, "WORKBOOK.TAB.SPLIT", -1),
+    (33184, "FULL.SCREEN", -1),
+    (33185, "WORKBOOK.PROTECT", -1),
+    (33188, "SCROLLBAR.PROPERTIES", -1),
+    (33189, "PIVOT.SHOW.PAGES", -1),
+    (33190, "TEXT.TO.COLUMNS", -1),
+    (33191, "FORMAT.CHARTTYPE", -1),
+    (33192, "LINK.FORMAT", -1),
+    (33193, "TRACER.DISPLAY", -1),
+    (33198, "TRACER.NAVIGATE", -1),
+    (33199, "TRACER.CLEAR", -1),
+    (33200, "TRACER.ERROR", -1),
+    (33201, "PIVOT.FIELD.GROUP", -1),
+    (33202, "PIVOT.FIELD.UNGROUP", -1),
+    (33203, "CHECKBOX.PROPERTIES", -1),
+    (33204, "LABEL.PROPERTIES", -1),
+    (33205, "LISTBOX.PROPERTIES", -1),
+    (33206, "EDITBOX.PROPERTIES", -1),
+    (33207, "PIVOT.REFRESH", -1),
+    (33208, "LINK.COMBO", -1),
+    (33209, "OPEN.TEXT", -1),
+    (33210, "HIDE.DIALOG", -1),
+    (33211, "SET.DIALOG.FOCUS", -1),
+    (33212, "ENABLE.OBJECT", -1),
+    (33213, "PUSHBUTTON.PROPERTIES", -1),
+    (33214, "SET.DIALOG.DEFAULT", -1),
+    (33215, "FILTER", -1),
+    (33216, "FILTER.SHOW.ALL", -1),
+    (33217, "CLEAR.OUTLINE", -1),
+    (33218, "FUNCTION.WIZARD", -1),
+    (33219, "ADD.LIST.ITEM", -1),
+    (33220, "SET.LIST.ITEM", -1),
+    (33221, "REMOVE.LIST.ITEM", -1),
+    (33222, "SELECT.LIST.ITEM", -1),
+    (33223, "SET.CONTROL.VALUE", -1),
+    (33224, "SAVE.COPY.AS", -1),
+    (33226, "OPTIONS.LISTS.ADD", -1),
+    (33227, "OPTIONS.LISTS.DELETE", -1),
+    (33228, "SERIES.AXES", -1),
+    (33229, "SERIES.X", -1),
+    (33230, "SERIES.Y", -1),
+    (33231, "ERRORBAR.X", -1),
+    (33232, "ERRORBAR.Y", -1),
+    (33233, "FORMAT.CHART", -1),
+    (33234, "SERIES.ORDER", -1),
+    (33235, "MAIL.LOGOFF", -1),
+    (33236, "CLEAR.ROUTING.SLIP", -1),
+    (33237, "APP.ACTIVATE.MICROSOFT", -1),
+    (33238, "MAIL.EDIT.MAILER", -1),
+    (33239, "ON.SHEET", -1),
+    (33240, "STANDARD.WIDTH", -1),
+    (33241, "SCENARIO.MERGE", -1),
+    (33242, "SUMMARY.INFO", -1),
+    (33243, "FIND.FILE", -1),
+    (33244, "ACTIVE.CELL.FONT", -1),
+    (33245, "ENABLE.TIPWIZARD", -1),
+    (33246, "VBA.MAKE.ADDIN", -1),
+    (33248, "INSERTDATATABLE", -1),
+    (33249, "WORKGROUP.OPTIONS", -1),
+    (33250, "MAIL.SEND.MAILER", -1),
+    (33253, "AUTOCORRECT", -1),
+    (33257, "POST.DOCUMENT", -1),
+    (33259, "PICKLIST", -1),
+    (33261, "VIEW.SHOW", -1),
+    (33262, "VIEW.DEFINE", -1),
+    (33263, "VIEW.DELETE", -1),
+    (33277, "SHEET.BACKGROUND", -1),
+    (33278, "INSERT.MAP.OBJECT", -1),
+    (33279, "OPTIONS.MENONO", -1),
+    (33285, "MSOCHECKS", -1),
+    (33286, "NORMAL", -1),
+    (33287, "LAYOUT", -1),
+    (33288, "RM.PRINT.AREA", -1),
+    (33289, "CLEAR.PRINT.AREA", -1),
+    (33290, "ADD.PRINT.AREA", -1),
+    (33291, "MOVE.BRK", -1),
+    (33313, "HIDECURR.NOTE", -1),
+    (33314, "HIDEALL.NOTES", -1),
+    (33315, "DELETE.NOTE", -1),
+    (33316, "TRAVERSE.NOTES", -1),
+    (33317, "ACTIVATE.NOTES", -1),
+    (33388, "PROTECT.REVISIONS", -1),
+    (33389, "UNPROTECT.REVISIONS", -1),
+    (33415, "OPTIONS.ME", -1),
+    (33421, "WEB.PUBLISH", -1),
+    (33435, "NEWWEBQUERY", -1),
+    (33441, "PIVOT.TABLE.CHART", -1),
+    (33521, "OPTIONS.SAVE", -1),
+    (33523, "OPTIONS.SPELL", -1),
+    (33576, "HIDEALL.INKANNOTS", -1),
+];
+
+/// The built-in function of id `id` ([MS-XLS] 2.5.198.17 and the Excel 4.0
+/// macro functions): its name, and its argument count when the id (a
+/// `ptgFunc`) fixes it, else -1.
+pub fn function(id: u16) -> Option<(&'static str, i8)> {
+    FUNCTIONS
+        .binary_search_by_key(&id, |e| e.0)
+        .ok()
+        .map(|k| (FUNCTIONS[k].1, FUNCTIONS[k].2))
+}
+
+/// The name of the function of a `ptgFunc` or `ptgFuncVar` token. A command
+/// equivalent (an Excel 4.0 macro command) has the 0x8000 bit; it is looked up
+/// as it is, and then with the bit the other way.
+pub fn function_name(id: u16) -> Option<&'static str> {
+    function(id).or_else(|| function(id ^ 0x8000)).map(|f| f.0)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn the_table_is_sorted_by_id_for_the_search() {
+        assert!(FUNCTIONS.array_windows().all(|[a, b]| a.0 < b.0));
+    }
+
+    #[test]
+    fn macro_functions_are_found_by_either_form_of_the_id() {
+        assert_eq!(function_name(110), Some("EXEC"));
+        assert_eq!(function_name(150), Some("CALL"));
+        assert_eq!(function_name(32886), Some("ALERT"));
+        // A command equivalent the table does not list takes the name of the
+        // function without the bit.
+        assert_eq!(function(32786), None);
+        assert_eq!(function_name(32786), Some("ATAN"));
+        assert_eq!(function(4), Some(("SUM", -1)));
+        assert_eq!(function(2), Some(("ISNA", 1)));
+        assert_eq!(function(0x7777), None);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/biff/mod.rs b/crates/exav-unpack/src/formats/biff/mod.rs
new file mode 100644
index 00000000..3aba1dc6
--- /dev/null
+++ b/crates/exav-unpack/src/formats/biff/mod.rs
@@ -0,0 +1,19 @@
+//! BIFF, the record format of Excel files up to 2003: the one reader of its
+//! records, workbook-wide tables and formula tokens, which the scanner (to
+//! surface the Excel 4.0 macros of a macro sheet) and exav-render (to convert
+//! a workbook) both read through.
+//!
+//! - [`records`] splits a stream into records, joining CONTINUE records;
+//! - [`Book`] collects what formulas need from the workbook records: code
+//!   page, sheet and defined names, external references;
+//! - [`formula`] writes a token array as Excel's formula text.
+
+mod book;
+pub mod formula;
+mod ftab;
+mod record;
+
+pub use book::{Book, BoundSheet, ExtSheet5, Name, Supbook};
+pub use formula::{Ctx, Decoded, error_name};
+pub use ftab::{function, function_name};
+pub use record::{BOF_IDS, CONTINUE, Rec, Records, bof_type, bof_version, records};
diff --git a/crates/exav-unpack/src/formats/biff/record.rs b/crates/exav-unpack/src/formats/biff/record.rs
new file mode 100644
index 00000000..00a846e8
--- /dev/null
+++ b/crates/exav-unpack/src/formats/biff/record.rs
@@ -0,0 +1,154 @@
+//! The BIFF record stream: a compound file's "Workbook" or "Book" stream, or
+//! a bare BIFF stream, as records, with the payload of the CONTINUE records
+//! of the records that are continued joined to them.
+
+use crate::bytes::u16_at;
+use std::borrow::Cow;
+
+pub struct Rec<'a> {
+    pub id: u16,
+    /// Offset of the record header in the stream (BOUNDSHEET points there).
+    pub pos: usize,
+    /// Borrowed from the stream unless CONTINUE records were joined to it.
+    pub data: Cow<'a, [u8]>,
+    /// Offsets in `data` where a CONTINUE record's payload starts.
+    pub breaks: Vec<usize>,
+}
+
+pub const CONTINUE: u16 = 0x003C;
+/// The BOF record of BIFF8 and BIFF5, BIFF4, BIFF3 and BIFF2.
+pub const BOF_IDS: [u16; 4] = [0x0809, 0x0409, 0x0209, 0x0009];
+
+/// Records whose CONTINUE records carry the rest of their payload.
+fn continued(id: u16) -> bool {
+    matches!(
+        id,
+        0x00FC // SST
+            | 0x01B6 // TXO
+            | 0x00EB // MSODRAWINGGROUP
+            | 0x00EC // MSODRAWING
+            | 0x0018 // NAME
+            | 0x0006 // FORMULA
+            | 0x0221 // ARRAY
+            | 0x04BC // SHRFMLA
+            | 0x01B8 // HLINK
+            | 0x01BE // DV
+            | 0x01B1 // CF
+            | 0x087A // CF12
+            | 0x0023 // EXTERNNAME
+            | 0x0017 // EXTERNSHEET
+            | 0x01AE // SUPBOOK
+            | 0x0207 // STRING
+    )
+}
+
+/// The records of `stream`, read as they are asked for: a stream of
+/// four-byte records costs nothing until a reader keeps them. A record cut
+/// short by the end of the stream keeps what is there.
+pub fn records(stream: &[u8]) -> Records<'_> {
+    Records { stream, p: 0 }
+}
+
+pub struct Records<'a> {
+    stream: &'a [u8],
+    p: usize,
+}
+
+impl Records<'_> {
+    /// The header at `p`: (id, payload range), the payload cut at the end of the stream.
+    fn header(&self, p: usize) -> Option<(u16, std::ops::Range<usize>)> {
+        if p + 4 > self.stream.len() {
+            return None;
+        }
+        let len = u16_at(self.stream, p + 2) as usize;
+        Some((
+            u16_at(self.stream, p),
+            p + 4..(p + 4 + len).min(self.stream.len()),
+        ))
+    }
+}
+
+impl<'a> Iterator for Records<'a> {
+    type Item = Rec<'a>;
+
+    fn next(&mut self) -> Option<Rec<'a>> {
+        let (id, range) = self.header(self.p)?;
+        let pos = self.p;
+        self.p = range.end;
+        let mut data = Cow::Borrowed(&self.stream[range]);
+        let mut breaks = vec![];
+        if continued(id) {
+            while let Some((CONTINUE, more)) = self.header(self.p) {
+                breaks.push(data.len());
+                data.to_mut().extend_from_slice(&self.stream[more.clone()]);
+                self.p = more.end;
+            }
+        }
+        Some(Rec {
+            id,
+            pos,
+            data,
+            breaks,
+        })
+    }
+}
+
+/// BIFF version of a BOF record: 2, 3, 4, 5 or 8 (0 for no BOF).
+pub fn bof_version(rec: &Rec) -> u8 {
+    match rec.id {
+        0x0009 => 2,
+        0x0209 => 3,
+        0x0409 => 4,
+        0x0809 => match u16_at(&rec.data, 0) {
+            0x0600 => 8,
+            0x0500 | 0x0400 | 0x0300 | 0x0200 => 5,
+            // Writers that leave the version out or write garbage: by length.
+            _ if rec.data.len() >= 16 => 8,
+            _ => 5,
+        },
+        _ => 0,
+    }
+}
+
+/// BOF substream type: 0x05 globals, 0x10 worksheet, 0x20 chart, 0x40 macro
+/// sheet, 0x100 workspace. BIFF2 to BIFF4 keep it at the same place.
+pub fn bof_type(rec: &Rec) -> u16 {
+    u16_at(&rec.data, 2)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn rec(id: u16, body: &[u8]) -> Vec<u8> {
+        let mut v = id.to_le_bytes().to_vec();
+        v.extend((body.len() as u16).to_le_bytes());
+        v.extend_from_slice(body);
+        v
+    }
+
+    #[test]
+    fn continue_records_are_joined_to_the_records_that_take_them() {
+        let mut s = rec(0x0006, b"ab");
+        s.extend(rec(CONTINUE, b"cd"));
+        s.extend(rec(0x0203, b"ef"));
+        // A CONTINUE after a record that is not continued stands alone.
+        s.extend(rec(CONTINUE, b"gh"));
+        let r: Vec<_> = records(&s).collect();
+        assert_eq!(r.len(), 3);
+        assert_eq!(
+            (r[0].data.as_ref(), r[0].breaks.as_slice()),
+            (&b"abcd"[..], &[2][..])
+        );
+        assert!(matches!(r[1].data, Cow::Borrowed(_)));
+        assert_eq!(r[2].id, CONTINUE);
+    }
+
+    #[test]
+    fn a_record_cut_short_keeps_what_is_there() {
+        let mut s = rec(0x0203, b"abcd");
+        s.truncate(s.len() - 2);
+        let r: Vec<_> = records(&s).collect();
+        assert_eq!(r[0].data.as_ref(), b"ab");
+    }
+}
diff --git a/crates/exav-unpack/src/formats/binhex.rs b/crates/exav-unpack/src/formats/binhex.rs
index 5dd15d71..8f8f098c 100644
--- a/crates/exav-unpack/src/formats/binhex.rs
+++ b/crates/exav-unpack/src/formats/binhex.rs
@@ -272,7 +272,7 @@ mod tests {
         hdr.extend_from_slice(&0u16.to_be_bytes()); // headerCRC
         hdr.extend_from_slice(data); // data fork
         hdr.extend_from_slice(&0u16.to_be_bytes()); // data-fork CRC
-                                                    // rsrcLen == 0, so no resource fork bytes.
+        // rsrcLen == 0, so no resource fork bytes.
 
         // RLE90 identity (no 0x90 in `hdr` by construction), then 6-bit encode.
         let encoded = sixbit_encode(&hdr);
diff --git a/crates/exav-unpack/src/formats/bzip2.rs b/crates/exav-unpack/src/formats/bzip2.rs
index ca9b2c04..50f40f26 100644
--- a/crates/exav-unpack/src/formats/bzip2.rs
+++ b/crates/exav-unpack/src/formats/bzip2.rs
@@ -1,6 +1,6 @@
 //! bzip2: one member, every concatenated stream decoded in turn as it is read.
 use crate::source::{ByteSource, Reader};
-use crate::stream::{emit_stream, single_meta, Visit};
+use crate::stream::{Visit, emit_stream, single_meta};
 use crate::{Budget, LimitHit};
 use std::io::Read;
 
@@ -34,9 +34,7 @@ pub(crate) fn walk<T>(
 /// content streamed the way it turned out.
 pub(crate) fn content_reader(data: &dyn ByteSource, cap: u64) -> Box<dyn Read + '_> {
     let starts = stream_starts(data);
-    let one = || -> Box<dyn Read + '_> {
-        Box::new(super::bzip2_rs::DecoderReader::new(Reader::new(data)))
-    };
+    let one = || -> Box<dyn Read + '_> { Box::new(Recovering::new(data, 0, data.len())) };
     if starts.len() <= 1 {
         return one();
     }
@@ -55,21 +53,122 @@ pub(crate) fn content_reader(data: &dyn ByteSource, cap: u64) -> Box<dyn Read +
         .map_or_else(|e| crate::is_checksum_mismatch(&e), |_| true)
     });
     if !each_decodes {
-        return one();
+        // Either one stream with a `BZh` in its compressed data, or streams of
+        // which a later one is cut short or damaged. The first is read whole as
+        // one stream. The ones behind the first are read as far as they go in
+        // either case, so that what a later stream holds is scanned and a
+        // false split costs only a stream that decodes to nothing.
+        let mut parts: std::collections::VecDeque<Box<dyn Read + '_>> =
+            std::collections::VecDeque::new();
+        parts.push_back(one());
+        for &(s, e) in bounds.iter().skip(1) {
+            parts.push_back(Box::new(AsFarAsItGoes(Recovering::new(data, s, e))));
+        }
+        return Box::new(Streams {
+            parts,
+            mismatch: None,
+        });
     }
     Box::new(Streams {
         parts: bounds
             .into_iter()
-            .map(|(s, e)| {
-                Box::new(super::bzip2_rs::DecoderReader::new(Reader::range(
-                    data, s, e,
-                ))) as Box<dyn Read + '_>
-            })
+            .map(|(s, e)| Box::new(Recovering::new(data, s, e)) as Box<dyn Read + '_>)
             .collect(),
         mismatch: None,
     })
 }
 
+/// A reader that ends where the one inside it fails.
+struct AsFarAsItGoes<R>(R);
+
+impl<R: Read> Read for AsFarAsItGoes<R> {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        Ok(self.0.read(buf).unwrap_or(0))
+    }
+}
+
+/// One stream of `data[start..end]`, decoded; a stream cut short, whose last
+/// block the decoder holds back because it looks ahead past the end of the
+/// input (a cut inside the ten bytes of the trailer loses the whole block, and
+/// `bzip2 -dc` writes it), is decoded again behind zeros that stand for the
+/// missing bytes, from where the first pass stopped, and the cut is reported
+/// once the block is out.
+struct Recovering<'a> {
+    data: &'a dyn ByteSource,
+    range: (usize, usize),
+    first: super::bzip2_rs::DecoderReader<Reader<'a>>,
+    /// Bytes `first` produced, to skip in the second pass.
+    produced: u64,
+    second: Option<
+        super::bzip2_rs::DecoderReader<std::io::Chain<Reader<'a>, std::io::Take<std::io::Repeat>>>,
+    >,
+    skip: u64,
+    cut: Option<(std::io::ErrorKind, String)>,
+}
+
+impl<'a> Recovering<'a> {
+    fn new(data: &'a dyn ByteSource, start: usize, end: usize) -> Self {
+        Recovering {
+            data,
+            range: (start, end),
+            first: super::bzip2_rs::DecoderReader::new(Reader::range(data, start, end)),
+            produced: 0,
+            second: None,
+            skip: 0,
+            cut: None,
+        }
+    }
+}
+
+impl Read for Recovering<'_> {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        loop {
+            if let Some(second) = &mut self.second {
+                if self.skip > 0 {
+                    let mut scratch = [0u8; 4096];
+                    let want = scratch.len().min(self.skip as usize);
+                    match second.read(&mut scratch[..want]) {
+                        Ok(n) if n > 0 => {
+                            self.skip -= n as u64;
+                            continue;
+                        }
+                        _ => return Err(self.cut_error()),
+                    }
+                }
+                return match second.read(buf) {
+                    Ok(0) | Err(_) => Err(self.cut_error()),
+                    Ok(n) => Ok(n),
+                };
+            }
+            match self.first.read(buf) {
+                Ok(n) => {
+                    self.produced += n as u64;
+                    return Ok(n);
+                }
+                Err(e) if e.kind() == std::io::ErrorKind::UnexpectedEof => {
+                    self.cut = Some((e.kind(), e.to_string()));
+                    self.skip = self.produced;
+                    let (start, end) = self.range;
+                    self.second = Some(super::bzip2_rs::DecoderReader::new(
+                        Reader::range(self.data, start, end).chain(std::io::repeat(0).take(16)),
+                    ));
+                }
+                Err(e) => return Err(e),
+            }
+        }
+    }
+}
+
+impl Recovering<'_> {
+    fn cut_error(&mut self) -> std::io::Error {
+        let (kind, msg) = self.cut.clone().unwrap_or((
+            std::io::ErrorKind::UnexpectedEof,
+            "bzip2: stream cut short".into(),
+        ));
+        std::io::Error::new(kind, msg)
+    }
+}
+
 /// Streams read one after another. A checksum mismatch in one is reported
 /// once all of them are read, so it does not cost the streams after it.
 struct Streams<'a> {
diff --git a/crates/exav-unpack/src/formats/bzip2_rs/decoder/reader.rs b/crates/exav-unpack/src/formats/bzip2_rs/decoder/reader.rs
index 743d2909..e8281afd 100644
--- a/crates/exav-unpack/src/formats/bzip2_rs/decoder/reader.rs
+++ b/crates/exav-unpack/src/formats/bzip2_rs/decoder/reader.rs
@@ -62,7 +62,7 @@ impl<R: Read> Read for DecoderReader<R> {
             let state = match self.decoder.read(buf) {
                 Ok(state) => state,
                 Err(e) if e.is_truncated() && self.input_ended => {
-                    return Err(io::Error::new(io::ErrorKind::UnexpectedEof, e))
+                    return Err(io::Error::new(io::ErrorKind::UnexpectedEof, e));
                 }
                 Err(e) => return Err(e.into()),
             };
diff --git a/crates/exav-unpack/src/formats/cab.rs b/crates/exav-unpack/src/formats/cab.rs
index 4f8a0e62..72fb2ef4 100644
--- a/crates/exav-unpack/src/formats/cab.rs
+++ b/crates/exav-unpack/src/formats/cab.rs
@@ -23,7 +23,7 @@ pub(crate) fn stream_cab<R: Read + Seek, T>(
 ) -> Result<Option<T>, LimitHit> {
     use crate::formats::cab_parse::cabinet::Cabinet;
     use crate::formats::cab_parse::folder::FolderReader;
-    use crate::stream::{emit_stream, MemberMeta};
+    use crate::stream::{MemberMeta, emit_stream};
     let (folder_metas, files) =
         Cabinet::layout(source).map_err(|e| LimitHit::new(format!("cab: {e}")))?;
     for (folder_idx, meta) in folder_metas.iter().enumerate() {
@@ -124,6 +124,29 @@ pub(crate) fn stream_cab<R: Read + Seek, T>(
             }
         }
     }
+    // A file in no folder of this cabinet runs from or into another one of its
+    // set (`iFolder` 0xFFFD to 0xFFFF), or names a folder that is not there.
+    // Its bytes are not here, and it is not for a scan to pass over it.
+    for f in files
+        .iter()
+        .filter(|f| f.folder_index as usize >= folder_metas.len())
+    {
+        budget.count_entry()?;
+        let m = MemberMeta {
+            name: f.name().to_string(),
+            comp_size: f.uncompressed_size as u64,
+            size: Some(f.uncompressed_size as u64),
+            unsupported: Some(if f.folder_index >= 0xFFFD {
+                "CAB member continues in another cabinet of its set"
+            } else {
+                "CAB member names a folder the cabinet does not have"
+            }),
+            ..MemberMeta::default()
+        };
+        if let Some(t) = visit(&m, None, budget) {
+            return Ok(Some(t));
+        }
+    }
     Ok(None)
 }
 
diff --git a/crates/exav-unpack/src/formats/cab_join.rs b/crates/exav-unpack/src/formats/cab_join.rs
new file mode 100644
index 00000000..c40349af
--- /dev/null
+++ b/crates/exav-unpack/src/formats/cab_join.rs
@@ -0,0 +1,415 @@
+//! Cabinets of a set: one folder, one file, cut across several `.cab` files.
+//!
+//! A cabinet names the one before it and the one after it. A folder that runs
+//! on into the next cabinet ends the first with a block cut short (`cbUncomp`
+//! zero, the rest of its bytes the first block of the next cabinet), and a file
+//! that straddles the two is listed in both, with the same name, size and
+//! offset in the folder, as continued to the next and from the previous. The
+//! layout is that of the format's published specification ([MS-CAB]); it was
+//! checked on sets built to it by `cabextract`, which reads them as the files
+//! they were made from.
+//!
+//! [`join`] puts such a set back into the one cabinet it was cut from, which
+//! [`super::cab`] reads as any other: the folders that run on are one, their
+//! blocks in order, and each file is listed once. Nothing is decoded here. No
+//! name is turned into a path: [`links`] reports the names a cabinet's header
+//! gives, for a caller to match against the names it was given.
+
+use crate::bytes::at;
+
+const PREV: u16 = 1;
+const NEXT: u16 = 2;
+const RESERVE: u16 = 4;
+
+/// `iFolder` values that say a file runs across cabinets.
+const FROM_PREV: u16 = 0xFFFD;
+const TO_NEXT: u16 = 0xFFFE;
+const BOTH: u16 = 0xFFFF;
+
+/// What a cabinet's header says of its place in a set.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Links {
+    pub set_id: u16,
+    /// Zero for the first cabinet of the set.
+    pub index: u16,
+    /// The cabinet before it, as its header names it.
+    pub prev: Option<String>,
+    /// The cabinet after it.
+    pub next: Option<String>,
+}
+
+fn u16_at(d: &[u8], o: usize) -> Option<u16> {
+    Some(u16::from_le_bytes(at(d, o, 2)?.try_into().ok()?))
+}
+
+fn u32_at(d: &[u8], o: usize) -> Option<u32> {
+    Some(u32::from_le_bytes(at(d, o, 4)?.try_into().ok()?))
+}
+
+/// A NUL-terminated string at `o` of at most 255 bytes, and where it ends.
+fn cstr(d: &[u8], o: usize) -> Option<(&[u8], usize)> {
+    let rest = d.get(o..)?;
+    let n = rest.iter().take(256).position(|&b| b == 0)?;
+    Some((&rest[..n], o + n + 1))
+}
+
+struct Header {
+    links: Links,
+    flags: u16,
+    folders: u16,
+    files: u16,
+    coff_files: usize,
+    /// Where the folder records start, and the reserved bytes after each,
+    /// and after each data block.
+    folders_at: usize,
+    cb_folder: usize,
+    cb_data: usize,
+}
+
+fn header(d: &[u8]) -> Option<Header> {
+    if at(d, 0, 4)? != b"MSCF" {
+        return None;
+    }
+    let (coff_files, flags) = (u32_at(d, 16)? as usize, u16_at(d, 30)?);
+    let (mut pos, mut cb_folder, mut cb_data) = (36usize, 0usize, 0usize);
+    if flags & RESERVE != 0 {
+        let cb_header = usize::from(u16_at(d, 36)?);
+        cb_folder = usize::from(*d.get(38)?);
+        cb_data = usize::from(*d.get(39)?);
+        pos = 40usize.checked_add(cb_header)?;
+    }
+    let mut name = |wanted: bool| -> Option<Option<String>> {
+        if !wanted {
+            return Some(None);
+        }
+        let (n, after) = cstr(d, pos)?;
+        // The disk's name follows, and is not wanted.
+        let (_, after) = cstr(d, after)?;
+        pos = after;
+        Some(Some(String::from_utf8_lossy(n).into_owned()))
+    };
+    let prev = name(flags & PREV != 0)?;
+    let next = name(flags & NEXT != 0)?;
+    Some(Header {
+        links: Links {
+            set_id: u16_at(d, 32)?,
+            index: u16_at(d, 34)?,
+            prev,
+            next,
+        },
+        flags,
+        folders: u16_at(d, 26)?,
+        files: u16_at(d, 28)?,
+        coff_files,
+        folders_at: pos,
+        cb_folder,
+        cb_data,
+    })
+}
+
+/// What `data`, a cabinet, says of its place in a set: `None` when it is not
+/// a cabinet that is part of one (no cabinet before it or after it).
+pub fn links(data: &[u8]) -> Option<Links> {
+    let h = header(data)?;
+    (h.flags & (PREV | NEXT) != 0).then_some(h.links)
+}
+
+#[derive(Clone)]
+struct Block {
+    uncompressed: u16,
+    payload: Vec<u8>,
+}
+
+struct Folder {
+    kind: u16,
+    blocks: Vec<Block>,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Place {
+    In(usize),
+    FromPrev,
+    ToNext,
+    Both,
+}
+
+struct File {
+    size: u32,
+    offset: u32,
+    place: Place,
+    date: u16,
+    time: u16,
+    attribs: u16,
+    name: Vec<u8>,
+}
+
+struct Cabinet {
+    links: Links,
+    folders: Vec<Folder>,
+    files: Vec<File>,
+}
+
+fn parse(d: &[u8]) -> Option<Cabinet> {
+    let h = header(d)?;
+    let mut folders = Vec::new();
+    let record = 8 + h.cb_folder;
+    for i in 0..usize::from(h.folders) {
+        let at_ = h.folders_at.checked_add(i.checked_mul(record)?)?;
+        let (start, count, kind) = (
+            u32_at(d, at_)? as usize,
+            u16_at(d, at_ + 4)?,
+            u16_at(d, at_ + 6)?,
+        );
+        let mut pos = start;
+        let mut blocks = Vec::new();
+        for _ in 0..count {
+            let (len, uncompressed) = (usize::from(u16_at(d, pos + 4)?), u16_at(d, pos + 6)?);
+            let from = pos.checked_add(8 + h.cb_data)?;
+            blocks.push(Block {
+                uncompressed,
+                payload: at(d, from, len)?.to_vec(),
+            });
+            pos = from.checked_add(len)?;
+        }
+        folders.push(Folder { kind, blocks });
+    }
+    let mut files = Vec::new();
+    let mut pos = h.coff_files;
+    for _ in 0..h.files {
+        let (size, offset, folder) = (u32_at(d, pos)?, u32_at(d, pos + 4)?, u16_at(d, pos + 8)?);
+        let (name, after) = cstr(d, pos.checked_add(16)?)?;
+        let place = match folder {
+            FROM_PREV => Place::FromPrev,
+            TO_NEXT => Place::ToNext,
+            BOTH => Place::Both,
+            i if usize::from(i) < folders.len() => Place::In(usize::from(i)),
+            _ => return None,
+        };
+        files.push(File {
+            size,
+            offset,
+            place,
+            date: u16_at(d, pos + 10)?,
+            time: u16_at(d, pos + 12)?,
+            attribs: u16_at(d, pos + 14)?,
+            name: name.to_vec(),
+        });
+        pos = after;
+    }
+    Some(Cabinet {
+        links: h.links,
+        folders,
+        files,
+    })
+}
+
+/// The cabinets of one set, in order, as the one cabinet they were cut from.
+/// `Err` says what does not fit: a part that is not a cabinet, a set whose
+/// ends or numbers are wrong, a folder or a file that does not continue.
+pub fn join(parts: &[&[u8]]) -> Result<Vec<u8>, String> {
+    if parts.len() < 2 {
+        return Err("a set of cabinets has at least two".into());
+    }
+    let mut cabs = Vec::new();
+    for (i, p) in parts.iter().enumerate() {
+        let c = parse(p).ok_or_else(|| format!("part {} is not a readable cabinet", i + 1))?;
+        let first = i == 0;
+        let last = i + 1 == parts.len();
+        if c.links.prev.is_some() == first || c.links.next.is_some() == last {
+            return Err(format!(
+                "part {} is not where its header puts it in the set",
+                i + 1
+            ));
+        }
+        let same_set = cabs
+            .first()
+            .is_none_or(|f: &Cabinet| f.links.set_id == c.links.set_id);
+        if usize::from(c.links.index) != i || !same_set {
+            return Err(format!("part {} is of another set, or out of order", i + 1));
+        }
+        cabs.push(c);
+    }
+    let mut iter = cabs.into_iter();
+    let mut acc = iter.next().expect("two parts at least");
+    for next in iter {
+        merge(&mut acc, next)?;
+    }
+    if acc
+        .files
+        .iter()
+        .any(|f| f.place != Place::In(f.folder_index()))
+    {
+        return Err("a file runs on past the last cabinet".into());
+    }
+    write(&acc)
+}
+
+impl File {
+    fn folder_index(&self) -> usize {
+        match self.place {
+            Place::In(i) => i,
+            _ => usize::MAX,
+        }
+    }
+}
+
+fn merge(acc: &mut Cabinet, mut next: Cabinet) -> Result<(), String> {
+    let spanning = |f: &File| matches!(f.place, Place::ToNext);
+    let last = acc
+        .folders
+        .len()
+        .checked_sub(1)
+        .ok_or("a cabinet with no folder")?;
+    let cut_block = acc.folders[last]
+        .blocks
+        .last()
+        .is_some_and(|b| b.uncompressed == 0);
+    let continues = !next.folders.is_empty() && (cut_block || acc.files.iter().any(spanning));
+    // Where each of the next cabinet's folders ends up.
+    let mut folders = std::mem::take(&mut next.folders).into_iter();
+    let map_from = if continues {
+        let first = folders.next().expect("one at least");
+        let into = &mut acc.folders[last];
+        if first.kind != into.kind {
+            return Err("a folder runs on in a cabinet that compresses it otherwise".into());
+        }
+        let mut rest = first.blocks.into_iter();
+        if cut_block && let Some(b) = rest.next() {
+            let end = into.blocks.last_mut().expect("a cut block");
+            end.payload.extend_from_slice(&b.payload);
+            if end.payload.len() > usize::from(u16::MAX) {
+                return Err("a block cut across cabinets is longer than a block can be".into());
+            }
+            end.uncompressed = b.uncompressed;
+        }
+        into.blocks.extend(rest);
+        if into.blocks.len() > usize::from(u16::MAX) {
+            return Err("a folder with more blocks than a cabinet can hold".into());
+        }
+        last
+    } else {
+        acc.folders.len()
+    };
+    let shift = |i: usize| if continues { last + i } else { map_from + i };
+    acc.folders.extend(folders);
+    if acc.folders.len() > usize::from(u16::MAX) {
+        return Err("more folders than a cabinet can hold".into());
+    }
+    // The files left running on at the end of `acc`, each of which the next
+    // cabinet must continue.
+    let mut open = acc
+        .files
+        .iter()
+        .filter(|f| f.place == Place::ToNext)
+        .count();
+    for f in next.files {
+        match f.place {
+            Place::FromPrev | Place::Both => {
+                let start = acc
+                    .files
+                    .iter_mut()
+                    .find(|a| {
+                        a.place == Place::ToNext
+                            && a.name == f.name
+                            && a.size == f.size
+                            && a.offset == f.offset
+                    })
+                    .ok_or("a file continued from the cabinet before is not in it")?;
+                open -= 1;
+                // Resolved here, unless it runs on again.
+                if f.place == Place::FromPrev {
+                    start.place = Place::In(last);
+                }
+            }
+            Place::In(i) => acc.files.push(File {
+                place: Place::In(shift(i)),
+                ..f
+            }),
+            Place::ToNext => acc.files.push(File {
+                place: Place::ToNext,
+                ..f
+            }),
+        }
+    }
+    if open != 0 {
+        return Err("a file continued to the next cabinet is not in it".into());
+    }
+    acc.links.next = next.links.next;
+    Ok(())
+}
+
+fn write(c: &Cabinet) -> Result<Vec<u8>, String> {
+    let too_big = || "the joined cabinet is larger than a cabinet can be".to_string();
+    let mut files = Vec::new();
+    for f in &c.files {
+        let Place::In(i) = f.place else {
+            return Err("a file runs on past the last cabinet".into());
+        };
+        files.extend_from_slice(&f.size.to_le_bytes());
+        files.extend_from_slice(&f.offset.to_le_bytes());
+        files.extend_from_slice(&u16::try_from(i).map_err(|_| too_big())?.to_le_bytes());
+        for v in [f.date, f.time, f.attribs] {
+            files.extend_from_slice(&v.to_le_bytes());
+        }
+        files.extend_from_slice(&f.name);
+        files.push(0);
+    }
+    let coff_files = 36 + 8 * c.folders.len();
+    let data_at = coff_files + files.len();
+    let mut records = Vec::new();
+    let mut data = Vec::new();
+    for fo in &c.folders {
+        records.extend_from_slice(
+            &u32::try_from(data_at + data.len())
+                .map_err(|_| too_big())?
+                .to_le_bytes(),
+        );
+        records.extend_from_slice(
+            &u16::try_from(fo.blocks.len())
+                .map_err(|_| too_big())?
+                .to_le_bytes(),
+        );
+        records.extend_from_slice(&fo.kind.to_le_bytes());
+        for b in &fo.blocks {
+            // No checksum: zero says there is none.
+            data.extend_from_slice(&0u32.to_le_bytes());
+            data.extend_from_slice(
+                &u16::try_from(b.payload.len())
+                    .map_err(|_| too_big())?
+                    .to_le_bytes(),
+            );
+            data.extend_from_slice(&b.uncompressed.to_le_bytes());
+            data.extend_from_slice(&b.payload);
+        }
+    }
+    let total = u32::try_from(data_at + data.len()).map_err(|_| too_big())?;
+    let mut out = Vec::with_capacity(total as usize);
+    out.extend_from_slice(b"MSCF");
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&total.to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(
+        &u32::try_from(coff_files)
+            .map_err(|_| too_big())?
+            .to_le_bytes(),
+    );
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&[3, 1]);
+    out.extend_from_slice(
+        &u16::try_from(c.folders.len())
+            .map_err(|_| too_big())?
+            .to_le_bytes(),
+    );
+    out.extend_from_slice(
+        &u16::try_from(c.files.len())
+            .map_err(|_| too_big())?
+            .to_le_bytes(),
+    );
+    out.extend_from_slice(&0u16.to_le_bytes());
+    out.extend_from_slice(&c.links.set_id.to_le_bytes());
+    out.extend_from_slice(&0u16.to_le_bytes());
+    out.extend(records);
+    out.extend(files);
+    out.extend(data);
+    Ok(out)
+}
diff --git a/crates/exav-unpack/src/formats/cab_parse/ctype.rs b/crates/exav-unpack/src/formats/cab_parse/ctype.rs
index b6477dee..92d5178c 100644
--- a/crates/exav-unpack/src/formats/cab_parse/ctype.rs
+++ b/crates/exav-unpack/src/formats/cab_parse/ctype.rs
@@ -83,24 +83,67 @@ pub(crate) enum Decompressor {
     Quantum(Box<super::qtm::QuantumDecompressor>),
 }
 
+/// What one CFDATA block gave: the bytes it decoded, and the error that
+/// stopped it short of its size, if one did.
+pub(crate) struct Decoded {
+    pub(crate) data: Vec<u8>,
+    pub(crate) error: Option<io::Error>,
+}
+
+impl Decoded {
+    pub(crate) fn failed(error: io::Error) -> Self {
+        Decoded {
+            data: Vec::new(),
+            error: Some(error),
+        }
+    }
+
+    fn of(result: io::Result<Vec<u8>>) -> Self {
+        match result {
+            Ok(data) => Decoded { data, error: None },
+            Err(e) => Decoded::failed(e),
+        }
+    }
+}
+
 impl Decompressor {
+    /// Decode one block. `cut`: the file ended inside it, so `data` is what
+    /// was there. Only MSZIP and stored blocks give back a part of a block
+    /// that failed or was cut: LZX and Quantum hand over a frame whole or not
+    /// at all.
     pub(crate) fn decompress(
         &mut self,
         data: Vec<u8>,
         uncompressed_size: usize,
-    ) -> io::Result<Vec<u8>> {
+        cut: bool,
+    ) -> Decoded {
+        let cut_error = |e: io::Error| {
+            if cut {
+                io::Error::new(io::ErrorKind::UnexpectedEof, e)
+            } else {
+                e
+            }
+        };
         match self {
-            Decompressor::Uncompressed => Ok(data),
+            Decompressor::Uncompressed => Decoded {
+                data,
+                error: cut.then(|| io::ErrorKind::UnexpectedEof.into()),
+            },
             Decompressor::MsZip(decompressor) => {
-                decompressor.decompress_block(&data, uncompressed_size)
-            }
-            Decompressor::Lzx(decompressor) => decompressor
-                .decompress_next(&data, uncompressed_size)
-                .map(|slice| slice.to_vec())
-                .map_err(io::Error::other),
-            Decompressor::Quantum(decompressor) => {
-                decompressor.decompress_block(&data, uncompressed_size)
+                decompressor.decompress_block(&data, uncompressed_size, cut)
             }
+            Decompressor::Lzx(decompressor) => Decoded::of(
+                decompressor
+                    .decompress_next(&data, uncompressed_size)
+                    .map(|slice| slice.to_vec())
+                    .map_err(io::Error::other)
+                    .map_err(cut_error),
+            ),
+            Decompressor::Quantum(decompressor) => Decoded::of(
+                decompressor
+                    .decompress_block(&data, uncompressed_size)
+                    .map_err(cut_error),
+            ),
         }
     }
 }
diff --git a/crates/exav-unpack/src/formats/cab_parse/folder.rs b/crates/exav-unpack/src/formats/cab_parse/folder.rs
index 3627c4c2..692d3178 100644
--- a/crates/exav-unpack/src/formats/cab_parse/folder.rs
+++ b/crates/exav-unpack/src/formats/cab_parse/folder.rs
@@ -15,6 +15,9 @@ pub(crate) struct FolderReader<'a, R: Read + Seek> {
     blocks_left: u16,
     out: Vec<u8>,
     out_pos: usize,
+    /// The error that ended the last block short, raised once what the block
+    /// did decode has been read.
+    pending: Option<io::Error>,
 }
 
 impl<'a, R: Read + Seek> FolderReader<'a, R> {
@@ -32,25 +35,40 @@ impl<'a, R: Read + Seek> FolderReader<'a, R> {
             blocks_left: num_data_blocks,
             out: Vec::new(),
             out_pos: 0,
+            pending: None,
         })
     }
 
     /// Decompress the next CFDATA block into `out`. Returns `false` at the last
-    /// block.
+    /// block. A block that fails, or that the file ends inside, leaves the
+    /// bytes it did decode in `out` and its error for the call after they are
+    /// read; nothing is decoded past it.
     fn refill(&mut self) -> io::Result<bool> {
+        if let Some(e) = self.pending.take() {
+            self.blocks_left = 0;
+            return Err(e);
+        }
         if self.blocks_left == 0 {
             return Ok(false);
         }
         let _checksum = self.reader.read_u32::<LittleEndian>()?;
         let compressed_size = self.reader.read_u16::<LittleEndian>()? as usize;
         let uncompressed_size = self.reader.read_u16::<LittleEndian>()? as usize;
-        let mut compressed = vec![0u8; compressed_size];
-        self.reader.read_exact(&mut compressed)?;
-        self.out = self
+        let mut compressed = Vec::new();
+        (&mut *self.reader)
+            .take(compressed_size as u64)
+            .read_to_end(&mut compressed)?;
+        let cut = compressed.len() < compressed_size;
+        let decoded = self
             .decompressor
-            .decompress(compressed, uncompressed_size)?;
+            .decompress(compressed, uncompressed_size, cut);
+        self.out = decoded.data;
         self.out_pos = 0;
         self.blocks_left -= 1;
+        // A cut block that decoded in full is only followed by the cut.
+        self.pending = decoded
+            .error
+            .or_else(|| cut.then(|| io::Error::new(io::ErrorKind::UnexpectedEof, "CAB block cut")));
         Ok(true)
     }
 }
diff --git a/crates/exav-unpack/src/formats/cab_parse/macros.rs b/crates/exav-unpack/src/formats/cab_parse/macros.rs
index 0266b7a4..e58a9581 100644
--- a/crates/exav-unpack/src/formats/cab_parse/macros.rs
+++ b/crates/exav-unpack/src/formats/cab_parse/macros.rs
@@ -1,11 +1,11 @@
 macro_rules! invalid_data {
-    ($e:expr) => {
+    ($e:expr_2021) => {
         return Err(::std::io::Error::new(
             ::std::io::ErrorKind::InvalidData,
             $e,
         ))
     };
-    ($fmt:expr, $($arg:tt)+) => {
+    ($fmt:expr_2021, $($arg:tt)+) => {
         return Err(::std::io::Error::new(
             ::std::io::ErrorKind::InvalidData,
             format!($fmt, $($arg)+),
@@ -14,13 +14,13 @@ macro_rules! invalid_data {
 }
 
 macro_rules! invalid_input {
-    ($e:expr) => {
+    ($e:expr_2021) => {
         return Err(::std::io::Error::new(
             ::std::io::ErrorKind::InvalidInput,
             $e,
         ))
     };
-    ($fmt:expr, $($arg:tt)+) => {
+    ($fmt:expr_2021, $($arg:tt)+) => {
         return Err(::std::io::Error::new(
             ::std::io::ErrorKind::InvalidInput,
             format!($fmt, $($arg)+),
@@ -30,10 +30,10 @@ macro_rules! invalid_input {
 
 #[allow(unused_macros)] // part of the vendored surface; kept with its siblings
 macro_rules! not_found {
-    ($e:expr) => {
+    ($e:expr_2021) => {
         return Err(::std::io::Error::new(::std::io::ErrorKind::NotFound, $e))
     };
-    ($fmt:expr, $($arg:tt)+) => {
+    ($fmt:expr_2021, $($arg:tt)+) => {
         return Err(::std::io::Error::new(
             ::std::io::ErrorKind::NotFound,
             format!($fmt, $($arg)+),
diff --git a/crates/exav-unpack/src/formats/cab_parse/mszip.rs b/crates/exav-unpack/src/formats/cab_parse/mszip.rs
index ec393920..e6485652 100644
--- a/crates/exav-unpack/src/formats/cab_parse/mszip.rs
+++ b/crates/exav-unpack/src/formats/cab_parse/mszip.rs
@@ -19,15 +19,32 @@ impl MsZipDecompressor {
         }
     }
 
+    /// Decode one CFDATA block. `cut`: the file ended inside the block, so
+    /// `data` is what was there of it.
+    ///
+    /// What came out before a failure is returned with it, so that a block
+    /// damaged or cut part way keeps its decoded start. Once a block has
+    /// failed the history the next one needs is wrong: the caller stops.
     pub(crate) fn decompress_block(
         &mut self,
         data: &[u8],
         uncompressed_size: usize,
-    ) -> io::Result<Vec<u8>> {
-        if data.len() < MSZIP_SIGNATURE_LEN
-            || ((data[0] as u16) | ((data[1] as u16) << 8)) != MSZIP_SIGNATURE
-        {
-            invalid_data!("MSZIP decompression failed: Invalid block signature");
+        cut: bool,
+    ) -> super::ctype::Decoded {
+        use super::ctype::Decoded;
+        let eof = |m: &str| io::Error::new(io::ErrorKind::UnexpectedEof, m.to_string());
+        let bad = |m: String| io::Error::new(io::ErrorKind::InvalidData, m);
+        if data.len() < MSZIP_SIGNATURE_LEN {
+            return Decoded::failed(if cut {
+                eof("MSZIP block cut inside its signature")
+            } else {
+                bad("MSZIP decompression failed: Invalid block signature".into())
+            });
+        }
+        if ((data[0] as u16) | ((data[1] as u16) << 8)) != MSZIP_SIGNATURE {
+            return Decoded::failed(bad(
+                "MSZIP decompression failed: Invalid block signature".into()
+            ));
         }
         let data = &data[MSZIP_SIGNATURE_LEN..];
         // Each CFDATA block is an independent raw-deflate stream, but back-
@@ -59,27 +76,43 @@ impl MsZipDecompressor {
         let mut combined =
             Vec::<u8>::with_capacity(dict_len + crate::cap_prealloc(uncompressed_size));
         let flush = flate2::FlushDecompress::Finish;
-        match self
+        let result = self
             .decompressor
-            .decompress_vec(&input, &mut combined, flush)
-        {
-            Ok(_) => {}
-            Err(error) => {
-                invalid_data!("MSZIP decompression failed: {}", error);
-            }
-        }
+            .decompress_vec(&input, &mut combined, flush);
         // Drop the dictionary prefix we prepended.
         if combined.len() < dict_len {
-            invalid_data!("MSZIP decompression failed: dictionary prefix truncated");
+            return Decoded::failed(bad(
+                "MSZIP decompression failed: dictionary prefix truncated".into(),
+            ));
+        }
+        let mut out = combined.split_off(dict_len);
+        if let Err(error) = result {
+            out.truncate(uncompressed_size);
+            return Decoded {
+                data: out,
+                error: Some(bad(format!("MSZIP decompression failed: {error}"))),
+            };
         }
-        let out = combined.split_off(dict_len);
         if out.len() != uncompressed_size {
-            invalid_data!(
+            let short = out.len() < uncompressed_size;
+            let message = format!(
                 "MSZIP decompression failed: Incorrect uncompressed size \
                  (expected {}, was actually {})",
                 uncompressed_size,
                 out.len()
             );
+            out.truncate(uncompressed_size);
+            // A stream that ends early in a block the file cut is the cut; in
+            // a whole block it is damage.
+            let error = if short && cut {
+                eof(&message)
+            } else {
+                bad(message)
+            };
+            return Decoded {
+                data: out,
+                error: Some(error),
+            };
         }
         if out.len() >= DEFLATE_MAX_DICT_LEN {
             let start = out.len() - DEFLATE_MAX_DICT_LEN;
@@ -91,6 +124,9 @@ impl MsZipDecompressor {
             }
             self.dictionary.extend_from_slice(&out);
         }
-        Ok(out)
+        Decoded {
+            data: out,
+            error: None,
+        }
     }
 }
diff --git a/crates/exav-unpack/src/formats/cab_parse/qtm.rs b/crates/exav-unpack/src/formats/cab_parse/qtm.rs
index afe2fe5b..b990cdd5 100644
--- a/crates/exav-unpack/src/formats/cab_parse/qtm.rs
+++ b/crates/exav-unpack/src/formats/cab_parse/qtm.rs
@@ -412,7 +412,7 @@ impl QuantumDecompressor {
                     return Err(io::Error::new(
                         io::ErrorKind::InvalidData,
                         "Quantum: selector out of range",
-                    ))
+                    ));
                 }
             }
         }
diff --git a/crates/exav-unpack/src/formats/cfb.rs b/crates/exav-unpack/src/formats/cfb.rs
new file mode 100644
index 00000000..2ca40b52
--- /dev/null
+++ b/crates/exav-unpack/src/formats/cfb.rs
@@ -0,0 +1,684 @@
+//! A lenient reader of OLE2 compound files ([MS-CFB]): the container of
+//! Word, Excel and PowerPoint 97 to 2003 files, of Publisher and Visio files,
+//! of Windows Installer databases, of the package a password-protected OOXML
+//! file hides in, and of the objects other files embed.
+//!
+//! It reads damaged files a strict reader refuses (a partial last sector,
+//! header counts that are garbage, a directory tree out of order, chains that
+//! end early) and gives what it finds: Office writes such files, and so does
+//! malware. Every chain is bounded by the sectors the file has and visits a
+//! sector once, so a cycle ends it, and nothing read is larger than the file.
+//!
+//! This is the only compound file reader of the workspace: the scanner walks
+//! [`Compound::streams`] and reads each with a cap, the converters of
+//! exav-render ask for the streams they know by name.
+
+use std::borrow::Cow;
+
+/// The first eight bytes of a compound file.
+pub const SIGNATURE: [u8; 8] = [0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1];
+
+const MAXREGSECT: u32 = 0xFFFF_FFFA;
+#[cfg(any(test, feature = "test-util"))]
+const ENDOFCHAIN: u32 = 0xFFFF_FFFE;
+#[cfg(any(test, feature = "test-util"))]
+const NOSTREAM: u32 = 0xFFFF_FFFF;
+/// Streams under this size live in the mini stream ([MS-CFB] 2.2: the header
+/// field MUST be 4096; damaged files have anything there).
+const MINI_CUTOFF: u64 = 4096;
+/// The longest a directory entry name is, in UTF-16 code units, terminator
+/// included.
+const NAME_UNITS: usize = 32;
+
+const STORAGE: u8 = 1;
+const STREAM: u8 = 2;
+const ROOT: u8 = 5;
+
+struct Entry {
+    name: String,
+    kind: u8,
+    left: u32,
+    right: u32,
+    child: u32,
+    start: u32,
+    size: u64,
+}
+
+/// A compound file in memory.
+pub struct Compound<'a> {
+    data: &'a [u8],
+    sector_size: usize,
+    mini_size: usize,
+    fat: Vec<u32>,
+    minifat: Vec<u32>,
+    mini: Vec<u8>,
+    entries: Vec<Entry>,
+    /// The path of each entry from the root (`/Macros/VBA/dir`) where the tree
+    /// reaches it, else its bare name.
+    paths: Vec<String>,
+    root: usize,
+}
+
+/// One stream of the directory.
+#[derive(Clone, Copy, Debug)]
+pub struct StreamInfo<'c> {
+    /// Where [`Compound::read`] finds it.
+    pub index: usize,
+    /// Its path from the root, `/` before each name.
+    pub path: &'c str,
+    /// Its own name.
+    pub name: &'c str,
+    /// The size its directory entry declares.
+    pub size: u64,
+}
+
+/// What [`Compound::read`] gives.
+pub struct Stream<'a> {
+    /// The stream's bytes, as far as its chain goes and the cap allows.
+    pub data: Cow<'a, [u8]>,
+    /// The stream is larger than the cap and `data` is its start.
+    pub truncated: bool,
+}
+
+fn u16_at(b: &[u8], at: usize) -> u16 {
+    b.get(at..at + 2)
+        .map_or(0, |s| u16::from_le_bytes([s[0], s[1]]))
+}
+
+fn u32_at(b: &[u8], at: usize) -> u32 {
+    b.get(at..at + 4)
+        .map_or(0, |s| u32::from_le_bytes([s[0], s[1], s[2], s[3]]))
+}
+
+impl<'a> Compound<'a> {
+    /// `None` when `data` is not a compound file or nothing of its directory
+    /// can be read.
+    pub fn open(data: &'a [u8]) -> Option<Compound<'a>> {
+        if data.len() < 512 || data[..8] != SIGNATURE {
+            return None;
+        }
+        let shift = u16_at(data, 30);
+        if !(7..=24).contains(&shift) {
+            return None;
+        }
+        let mini_shift = u16_at(data, 32);
+        if !(3..=12).contains(&mini_shift) {
+            return None;
+        }
+        let sector_size = 1usize << shift;
+        let v4 = u16_at(data, 26) >= 4;
+        let mut c = Compound {
+            data,
+            sector_size,
+            mini_size: 1usize << mini_shift,
+            fat: vec![],
+            minifat: vec![],
+            mini: vec![],
+            entries: vec![],
+            paths: vec![],
+            root: 0,
+        };
+        let sectors = c.sector_count();
+
+        // The FAT's sectors: the header's 109, then the DIFAT chain.
+        let mut fat_sectors: Vec<u32> = (0..109)
+            .map(|i| u32_at(data, 76 + i * 4))
+            .filter(|&s| s <= MAXREGSECT && (s as usize) < sectors)
+            .collect();
+        let mut seen = vec![false; sectors];
+        let mut difat = u32_at(data, 68);
+        let per = sector_size / 4;
+        while difat <= MAXREGSECT && (difat as usize) < sectors && !seen[difat as usize] {
+            seen[difat as usize] = true;
+            let Some(sec) = c.sector(difat) else { break };
+            for i in 0..per - 1 {
+                let s = u32_at(sec, i * 4);
+                if s <= MAXREGSECT && (s as usize) < sectors {
+                    fat_sectors.push(s);
+                }
+            }
+            difat = u32_at(sec, (per - 1) * 4);
+        }
+        fat_sectors.truncate(sectors);
+        let mut fat = Vec::with_capacity(fat_sectors.len().min(sectors) * per);
+        for &s in &fat_sectors {
+            if let Some(sec) = c.sector(s) {
+                fat.extend((0..sec.len() / 4).map(|i| u32_at(sec, i * 4)));
+            }
+            if fat.len() >= sectors {
+                break;
+            }
+        }
+        fat.truncate(sectors);
+        if fat.is_empty() {
+            return None;
+        }
+        c.fat = fat;
+
+        let dir = c.read_chain(u32_at(data, 48), u64::MAX);
+        for e in dir.as_chunks::<128>().0 {
+            let units = (usize::from(u16_at(e, 64)) / 2).min(NAME_UNITS);
+            let name: Vec<u16> = (0..units)
+                .map(|i| u16_at(e, i * 2))
+                .take_while(|&u| u != 0)
+                .collect();
+            let size = if v4 {
+                u64::from(u32_at(e, 120)) | u64::from(u32_at(e, 124)) << 32
+            } else {
+                u64::from(u32_at(e, 120))
+            };
+            c.entries.push(Entry {
+                name: String::from_utf16_lossy(&name),
+                kind: e[66],
+                left: u32_at(e, 68),
+                right: u32_at(e, 72),
+                child: u32_at(e, 76),
+                start: u32_at(e, 116),
+                size,
+            });
+        }
+        // The root is entry 0 ([MS-CFB] 2.6.2); its type byte may be damaged.
+        c.root = c
+            .entries
+            .iter()
+            .position(|e| e.kind == ROOT)
+            .or((!c.entries.is_empty()).then_some(0))?;
+        let minifat = c.read_chain(u32_at(data, 60), u64::MAX);
+        c.minifat = (0..minifat.len() / 4)
+            .map(|i| u32_at(&minifat, i * 4))
+            .collect();
+        let root = &c.entries[c.root];
+        c.mini = c.read_chain(root.start, root.size);
+        c.paths = c.tree_paths();
+        Some(c)
+    }
+
+    fn sector_count(&self) -> usize {
+        (self.data.len() - 1) / self.sector_size
+    }
+
+    /// Sector `s`, cut short at the end of the file.
+    fn sector(&self, s: u32) -> Option<&'a [u8]> {
+        let off = (s as usize).checked_add(1)?.checked_mul(self.sector_size)?;
+        if off >= self.data.len() {
+            return None;
+        }
+        Some(&self.data[off..(off + self.sector_size).min(self.data.len())])
+    }
+
+    /// The stream's bytes in the file when its sectors follow each other
+    /// there, as writers lay streams out.
+    fn contiguous(&self, start: u32, size: u64) -> Option<&'a [u8]> {
+        let size = usize::try_from(size).ok()?;
+        let count = size.div_ceil(self.sector_size);
+        let first = (start as usize)
+            .checked_add(1)?
+            .checked_mul(self.sector_size)?;
+        if first.checked_add(size)? > self.data.len() {
+            return None;
+        }
+        let mut s = start as usize;
+        for _ in 1..count {
+            let next = *self.fat.get(s)? as usize;
+            if next != s + 1 {
+                return None;
+            }
+            s = next;
+        }
+        Some(&self.data[first..first + size])
+    }
+
+    fn read_chain(&self, start: u32, size: u64) -> Vec<u8> {
+        // Sized once: no stream is longer than the file holds, and growing
+        // a large one would hold two copies for a while.
+        let cap = size.min(self.data.len() as u64) as usize + self.sector_size;
+        let mut out = Vec::with_capacity(cap);
+        let mut seen = vec![false; self.fat.len()];
+        let mut s = start;
+        while s <= MAXREGSECT && (out.len() as u64) < size {
+            let i = s as usize;
+            if i >= self.fat.len() || seen[i] {
+                break;
+            }
+            seen[i] = true;
+            let Some(sec) = self.sector(s) else { break };
+            out.extend_from_slice(sec);
+            s = self.fat[i];
+        }
+        if (out.len() as u64) > size {
+            out.truncate(size as usize);
+        }
+        out
+    }
+
+    fn read_mini_chain(&self, start: u32, size: u64) -> Vec<u8> {
+        let mut out = Vec::new();
+        let mut seen = vec![false; self.minifat.len()];
+        let mut s = start;
+        while s <= MAXREGSECT && (out.len() as u64) < size {
+            let i = s as usize;
+            if i >= self.minifat.len() || seen[i] {
+                break;
+            }
+            seen[i] = true;
+            let off = i * self.mini_size;
+            let Some(sec) = self
+                .mini
+                .get(off..(off + self.mini_size).min(self.mini.len()))
+            else {
+                break;
+            };
+            if sec.is_empty() {
+                break;
+            }
+            out.extend_from_slice(sec);
+            s = self.minifat[i];
+        }
+        if (out.len() as u64) > size {
+            out.truncate(size as usize);
+        }
+        out
+    }
+
+    /// The path of each entry, from the tree: a storage's child and that
+    /// child's siblings are its members. The sibling order a strict reader
+    /// insists on does not matter here. An entry the walk does not reach keeps
+    /// its bare name.
+    fn tree_paths(&self) -> Vec<String> {
+        let n = self.entries.len();
+        let mut paths: Vec<Option<String>> = vec![None; n];
+        let mut seen = vec![false; n];
+        seen[self.root] = true;
+        let mut storages = vec![(self.root, String::new())];
+        while let Some((storage, base)) = storages.pop() {
+            let mut members = vec![self.entries[storage].child];
+            while let Some(m) = members.pop() {
+                let m = m as usize;
+                if m >= n || seen[m] {
+                    continue;
+                }
+                seen[m] = true;
+                let e = &self.entries[m];
+                members.extend([e.left, e.right]);
+                let path = format!("{base}/{}", e.name);
+                if e.kind == STORAGE {
+                    storages.push((m, path.clone()));
+                }
+                paths[m] = Some(path);
+            }
+        }
+        paths
+            .into_iter()
+            .zip(&self.entries)
+            .map(|(p, e)| p.unwrap_or_else(|| e.name.clone()))
+            .collect()
+    }
+
+    /// The root storage's members, by walking its tree; others are found by
+    /// name only when this misses them.
+    fn root_members(&self) -> Vec<usize> {
+        let mut out = vec![];
+        let mut seen = vec![false; self.entries.len()];
+        let mut stack = vec![self.entries[self.root].child];
+        while let Some(i) = stack.pop() {
+            let i = i as usize;
+            if i >= self.entries.len() || seen[i] {
+                continue;
+            }
+            seen[i] = true;
+            out.push(i);
+            stack.push(self.entries[i].left);
+            stack.push(self.entries[i].right);
+        }
+        out
+    }
+
+    /// Every stream of the directory, in the order of its entries.
+    pub fn streams(&self) -> impl Iterator<Item = StreamInfo<'_>> {
+        self.entries
+            .iter()
+            .enumerate()
+            .filter(|(_, e)| e.kind == STREAM)
+            .map(|(index, e)| StreamInfo {
+                index,
+                path: &self.paths[index],
+                name: &e.name,
+                size: e.size,
+            })
+    }
+
+    /// The stream at `index` of the directory ([`StreamInfo::index`]), as far
+    /// as its chain goes, and no further than `cap` bytes: the file borrowed
+    /// where the stream's sectors follow each other in it, else a copy.
+    pub fn read(&self, index: usize, cap: u64) -> Stream<'a> {
+        let Some(e) = self.entries.get(index) else {
+            return Stream {
+                data: Cow::Borrowed(&[]),
+                truncated: false,
+            };
+        };
+        let want = e.size.min(cap);
+        let data = if e.size < MINI_CUTOFF {
+            Cow::Owned(self.read_mini_chain(e.start, want))
+        } else if let Some(d) = self.contiguous(e.start, want) {
+            Cow::Borrowed(d)
+        } else {
+            Cow::Owned(self.read_chain(e.start, want))
+        };
+        // A chain that ends early is short of the size, not cut by the cap:
+        // there is nothing more of it in the file.
+        let truncated = e.size > cap && (data.len() as u64) < e.size;
+        Stream { data, truncated }
+    }
+
+    /// The first of `names` that names a stream at the root (else anywhere),
+    /// read whole or as far as its chain goes.
+    pub fn stream(&self, names: &[&str]) -> Option<Vec<u8>> {
+        self.stream_ref(names).map(Cow::into_owned)
+    }
+
+    /// As [`Compound::stream`], borrowing the file's bytes when the
+    /// stream's sectors follow each other in it (no copy of a large
+    /// stream), else read into a copy.
+    pub fn stream_ref(&self, names: &[&str]) -> Option<Cow<'a, [u8]>> {
+        let members = self.root_members();
+        for want in names {
+            let hit = members
+                .iter()
+                .copied()
+                .find(|&i| {
+                    self.entries[i].kind == STREAM
+                        && self.entries[i].name.eq_ignore_ascii_case(want)
+                })
+                .or_else(|| {
+                    self.entries
+                        .iter()
+                        .position(|e| e.kind == STREAM && e.name.eq_ignore_ascii_case(want))
+                })
+                .or_else(|| {
+                    // A name whose terminator was lost, followed by junk.
+                    self.entries.iter().position(|e| {
+                        e.kind == STREAM
+                            && e.name.len() > want.len()
+                            && e.name.is_char_boundary(want.len())
+                            && e.name[..want.len()].eq_ignore_ascii_case(want)
+                            && e.name[want.len()..]
+                                .chars()
+                                .all(|c| !c.is_ascii_alphanumeric())
+                    })
+                });
+            if let Some(i) = hit {
+                return Some(self.read(i, u64::MAX).data);
+            }
+        }
+        None
+    }
+
+    /// Names of the streams and storages, for diagnostics.
+    pub fn names(&self) -> impl Iterator<Item = &str> {
+        self.entries
+            .iter()
+            .filter(|e| e.kind == STORAGE || e.kind == STREAM)
+            .map(|e| e.name.as_str())
+    }
+}
+
+/// A version 3 compound file holding `streams` at its root, each in the FAT
+/// (padded to 4096 bytes so) or the mini stream when shorter: for the tests of
+/// what reads compound files.
+#[cfg(any(test, feature = "test-util"))]
+pub fn build(streams: &[(&str, &[u8])]) -> Vec<u8> {
+    let ss = 512usize;
+    let mut sectors: Vec<Vec<u8>> = vec![];
+    let mut fat: Vec<u32> = vec![];
+    let chain = |sectors: &mut Vec<Vec<u8>>, fat: &mut Vec<u32>, data: &[u8]| -> u32 {
+        if data.is_empty() {
+            return ENDOFCHAIN;
+        }
+        let first = sectors.len() as u32;
+        let n = data.len().div_ceil(ss);
+        for k in 0..n {
+            let mut s = data[k * ss..((k + 1) * ss).min(data.len())].to_vec();
+            s.resize(ss, 0);
+            sectors.push(s);
+            fat.push(if k + 1 == n {
+                ENDOFCHAIN
+            } else {
+                first + k as u32 + 1
+            });
+        }
+        first
+    };
+    let mut mini = Vec::new();
+    let mut minifat: Vec<u32> = vec![];
+    let mut dirents: Vec<(String, u8, u32, u64)> = vec![];
+    for (name, data) in streams {
+        if (data.len() as u64) < MINI_CUTOFF {
+            let first = (mini.len() / 64) as u32;
+            let n = data.len().div_ceil(64);
+            for k in 0..n {
+                let mut s = data[k * 64..((k + 1) * 64).min(data.len())].to_vec();
+                s.resize(64, 0);
+                mini.extend_from_slice(&s);
+                minifat.push(if k + 1 == n {
+                    ENDOFCHAIN
+                } else {
+                    first + k as u32 + 1
+                });
+            }
+            dirents.push((
+                name.to_string(),
+                STREAM,
+                if n == 0 { ENDOFCHAIN } else { first },
+                data.len() as u64,
+            ));
+        } else {
+            let s = chain(&mut sectors, &mut fat, data);
+            dirents.push((name.to_string(), STREAM, s, data.len() as u64));
+        }
+    }
+    let mini_start = chain(&mut sectors, &mut fat, &mini);
+    let mf: Vec<u8> = minifat.iter().flat_map(|v| v.to_le_bytes()).collect();
+    let minifat_start = chain(&mut sectors, &mut fat, &mf);
+    let mut dir = Vec::new();
+    let mut entry = |name: &str, kind: u8, child: u32, right: u32, start: u32, size: u64| {
+        let mut e = vec![0u8; 128];
+        let u: Vec<u16> = name.encode_utf16().chain([0]).collect();
+        for (i, x) in u.iter().enumerate() {
+            e[i * 2..i * 2 + 2].copy_from_slice(&x.to_le_bytes());
+        }
+        e[64..66].copy_from_slice(&((u.len() * 2) as u16).to_le_bytes());
+        e[66] = kind;
+        e[68..72].copy_from_slice(&NOSTREAM.to_le_bytes());
+        e[72..76].copy_from_slice(&right.to_le_bytes());
+        e[76..80].copy_from_slice(&child.to_le_bytes());
+        e[116..120].copy_from_slice(&start.to_le_bytes());
+        e[120..124].copy_from_slice(&(size as u32).to_le_bytes());
+        dir.extend_from_slice(&e);
+    };
+    entry(
+        "Root Entry",
+        ROOT,
+        if dirents.is_empty() { NOSTREAM } else { 1 },
+        NOSTREAM,
+        mini_start,
+        mini.len() as u64,
+    );
+    for (k, (name, kind, start, size)) in dirents.iter().enumerate() {
+        let right = if k + 1 < dirents.len() {
+            k as u32 + 2
+        } else {
+            NOSTREAM
+        };
+        entry(name, *kind, NOSTREAM, right, *start, *size);
+    }
+    let dir_start = chain(&mut sectors, &mut fat, &dir);
+    // The FAT's own sectors, marked 0xFFFFFFFD.
+    let n_fat = (fat.len() + 1).div_ceil(128).max(1);
+    let fat_first = sectors.len() as u32;
+    fat.extend(std::iter::repeat_n(0xFFFF_FFFD, n_fat));
+    let mut fatb: Vec<u8> = fat.iter().flat_map(|v| v.to_le_bytes()).collect();
+    fatb.resize(n_fat * ss, 0xFF);
+    for k in 0..n_fat {
+        sectors.push(fatb[k * ss..(k + 1) * ss].to_vec());
+    }
+    let mut h = vec![0u8; 512];
+    h[..8].copy_from_slice(&SIGNATURE);
+    h[24..26].copy_from_slice(&0x3Eu16.to_le_bytes());
+    h[26..28].copy_from_slice(&3u16.to_le_bytes());
+    h[28..30].copy_from_slice(&0xFFFEu16.to_le_bytes());
+    h[30..32].copy_from_slice(&9u16.to_le_bytes());
+    h[32..34].copy_from_slice(&6u16.to_le_bytes());
+    h[44..48].copy_from_slice(&(n_fat as u32).to_le_bytes());
+    h[48..52].copy_from_slice(&dir_start.to_le_bytes());
+    h[56..60].copy_from_slice(&4096u32.to_le_bytes());
+    h[60..64].copy_from_slice(&minifat_start.to_le_bytes());
+    h[64..68].copy_from_slice(&(minifat.len().div_ceil(128) as u32).to_le_bytes());
+    h[68..72].copy_from_slice(&ENDOFCHAIN.to_le_bytes());
+    for i in 0..109 {
+        let v = if i < n_fat {
+            fat_first + i as u32
+        } else {
+            NOSTREAM
+        };
+        h[76 + i * 4..80 + i * 4].copy_from_slice(&v.to_le_bytes());
+    }
+    let mut out = h;
+    for s in sectors {
+        out.extend_from_slice(&s);
+    }
+    out
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reads_fat_and_mini_streams() {
+        let big: Vec<u8> = (0..10_000u32).map(|i| (i % 251) as u8).collect();
+        // In the strict reader's order: shorter names first.
+        let file = build(&[("small", b"hello"), ("Workbook", &big)]);
+        let c = Compound::open(&file).unwrap();
+        assert_eq!(c.stream(&["WORKBOOK"]).unwrap(), big);
+        assert_eq!(c.stream(&["nope", "Small"]).unwrap(), b"hello");
+        assert!(c.stream(&["nope"]).is_none());
+        // The strict reader agrees.
+        let mut s = ::cfb::CompoundFile::open(std::io::Cursor::new(&file)).unwrap();
+        let mut v = vec![];
+        std::io::Read::read_to_end(&mut s.open_stream("/Workbook").unwrap(), &mut v).unwrap();
+        assert_eq!(v, big);
+    }
+
+    #[test]
+    fn streams_in_order_are_borrowed() {
+        let big: Vec<u8> = (0..10_000u32).map(|i| (i % 13) as u8).collect();
+        let mut file = build(&[("Pictures", &big)]);
+        let c = Compound::open(&file).unwrap();
+        let s = c.stream_ref(&["Pictures"]).unwrap();
+        assert!(matches!(s, Cow::Borrowed(_)));
+        assert_eq!(s, &big[..]);
+        // Its chain out of order: a copy of what the chain gives.
+        let fat_sector = u32_at(&file, 76) as usize;
+        let off = (fat_sector + 1) * 512;
+        file[off..off + 4].copy_from_slice(&2u32.to_le_bytes());
+        file[off + 8..off + 12].copy_from_slice(&1u32.to_le_bytes());
+        file[off + 4..off + 8].copy_from_slice(&3u32.to_le_bytes());
+        let c = Compound::open(&file).unwrap();
+        let s = c.stream_ref(&["Pictures"]).unwrap();
+        assert!(matches!(s, Cow::Owned(_)));
+        assert_eq!(s[..512], big[..512]);
+        assert_eq!(s[512..1024], big[1024..1536]);
+        assert_eq!(s[1024..1536], big[512..1024]);
+    }
+
+    #[test]
+    fn damaged_files_give_what_is_there() {
+        let big: Vec<u8> = (0..10_000u32).map(|i| (i % 7) as u8).collect();
+        let mut file = build(&[("Workbook", &big)]);
+        // Garbage in the header's counts and cutoff.
+        file[44..48].copy_from_slice(&0x2020_2020u32.to_le_bytes());
+        file[56..60].copy_from_slice(&0x2020_2020u32.to_le_bytes());
+        let c = Compound::open(&file).unwrap();
+        assert_eq!(c.stream(&["Workbook"]).unwrap(), big);
+        // A FAT chain made a cycle: it ends where it loops.
+        let mut cyc = file.clone();
+        let fat_sector = u32_at(&cyc, 76) as usize;
+        let off = (fat_sector + 1) * 512;
+        cyc[off + 4..off + 8].copy_from_slice(&0u32.to_le_bytes());
+        let c = Compound::open(&cyc).unwrap();
+        assert_eq!(c.stream(&["Workbook"]).unwrap(), big[..1024]);
+        // Truncated through the stream: no panic, no directory.
+        for n in [600, 3000, file.len() - 100] {
+            let _ = Compound::open(&file[..n]).and_then(|c| c.stream(&["Workbook"]));
+        }
+    }
+
+    #[test]
+    fn damaged_root_type_and_unterminated_names() {
+        let big: Vec<u8> = (0..10_000u32).map(|i| (i % 11) as u8).collect();
+        let mut file = build(&[("Workbook", &big)]);
+        let dir = (u32_at(&file, 48) as usize + 1) * 512;
+        // The root's type byte damaged.
+        file[dir + 66] = 0xF8;
+        // The stream's name without its terminator, padded with junk.
+        let e = dir + 128;
+        for i in 8..32 {
+            file[e + i * 2..e + i * 2 + 2].copy_from_slice(&0x2020u16.to_le_bytes());
+        }
+        file[e + 64..e + 66].copy_from_slice(&64u16.to_le_bytes());
+        let c = Compound::open(&file).unwrap();
+        assert_eq!(c.stream(&["Workbook"]).unwrap(), big);
+        assert!(c.stream(&["Work"]).is_none());
+    }
+
+    /// The scanner's view: every stream with its path, each read under a cap
+    /// that says when it cut one.
+    #[test]
+    fn streams_are_listed_with_their_paths_and_read_under_a_cap() {
+        let big: Vec<u8> = (0..10_000u32).map(|i| (i % 5) as u8).collect();
+        let file = build(&[("a", b"hello"), ("Big", &big)]);
+        let c = Compound::open(&file).unwrap();
+        let listed: Vec<_> = c.streams().map(|s| (s.path.to_string(), s.size)).collect();
+        assert_eq!(
+            listed,
+            [("/a".to_string(), 5), ("/Big".to_string(), 10_000)]
+        );
+        let big_at = c.streams().find(|s| s.name == "Big").unwrap().index;
+        let cut = c.read(big_at, 4000);
+        assert!(cut.truncated);
+        assert_eq!(&cut.data[..], &big[..4000]);
+        let whole = c.read(big_at, 10_000);
+        assert!(!whole.truncated);
+        assert_eq!(&whole.data[..], &big[..]);
+        // A chain that ends early is short, not cut by the cap.
+        let mut file = file;
+        let dir = (u32_at(&file, 48) as usize + 1) * 512;
+        file[dir + 128 * 2 + 120..dir + 128 * 2 + 124].copy_from_slice(&20_000u32.to_le_bytes());
+        let c = Compound::open(&file).unwrap();
+        let short = c.read(big_at, u64::MAX);
+        assert!(!short.truncated);
+        assert!(short.data.len() < 20_000);
+    }
+
+    /// Storages give their streams a path, and an entry no storage reaches
+    /// keeps its bare name.
+    #[test]
+    fn paths_follow_the_tree_of_storages() {
+        let file = std::io::Cursor::new(Vec::new());
+        let mut w = ::cfb::CompoundFile::create(file).unwrap();
+        w.create_storage("/Macros").unwrap();
+        w.create_storage("/Macros/VBA").unwrap();
+        for (path, body) in [("/Macros/VBA/dir", &b"x"[..]), ("/top", &b"y"[..])] {
+            std::io::Write::write_all(&mut w.create_stream(path).unwrap(), body).unwrap();
+        }
+        w.flush().unwrap();
+        let bytes = w.into_inner().into_inner();
+        let c = Compound::open(&bytes).unwrap();
+        let mut paths: Vec<_> = c.streams().map(|s| s.path.to_string()).collect();
+        paths.sort();
+        assert_eq!(paths, ["/Macros/VBA/dir", "/top"]);
+        assert_eq!(c.stream(&["top"]).unwrap(), b"y");
+        assert_eq!(c.stream(&["dir"]).unwrap(), b"x");
+    }
+}
diff --git a/crates/exav-unpack/src/formats/charset.rs b/crates/exav-unpack/src/formats/charset.rs
new file mode 100644
index 00000000..063abede
--- /dev/null
+++ b/crates/exav-unpack/src/formats/charset.rs
@@ -0,0 +1,93 @@
+//! Text in a Windows code page number (an XLS CODEPAGE record's, a font's
+//! character set): Windows and Mac code pages through encoding_rs, DOS (OEM)
+//! and the remaining Mac ones through tables of our own.
+
+use super::charset_tables::TABLES;
+use encoding_rs::Encoding;
+
+enum Decoder {
+    Utf16,
+    Encoding(&'static Encoding),
+    Table(&'static [u16; 256]),
+}
+
+fn decoder(cp: u16) -> Option<Decoder> {
+    use encoding_rs::{
+        BIG5, EUC_KR, GBK, IBM866, MACINTOSH, SHIFT_JIS, WINDOWS_874, WINDOWS_1250, WINDOWS_1251,
+        WINDOWS_1252, WINDOWS_1253, WINDOWS_1254, WINDOWS_1255, WINDOWS_1256, WINDOWS_1257,
+        WINDOWS_1258, X_MAC_CYRILLIC,
+    };
+    Some(Decoder::Encoding(match cp {
+        1200 => return Some(Decoder::Utf16),
+        // US-ASCII, and 32769, which BIFF2 to BIFF4 write for Windows 1252.
+        367 | 1252 | 0x8001 => WINDOWS_1252,
+        866 => IBM866,
+        874 => WINDOWS_874,
+        932 => SHIFT_JIS,
+        936 => GBK,
+        949 => EUC_KR,
+        950 => BIG5,
+        1250 => WINDOWS_1250,
+        1251 => WINDOWS_1251,
+        1253 => WINDOWS_1253,
+        1254 => WINDOWS_1254,
+        1255 => WINDOWS_1255,
+        1256 => WINDOWS_1256,
+        1257 => WINDOWS_1257,
+        1258 => WINDOWS_1258,
+        // Mac Roman; 32768 is how BIFF names it.
+        10000 | 0x8000 => MACINTOSH,
+        10007 => X_MAC_CYRILLIC,
+        _ => {
+            return TABLES
+                .iter()
+                .find(|t| t.0 == cp)
+                .map(|t| Decoder::Table(&t.1));
+        }
+    }))
+}
+
+/// Whether `cp` is a code page this module decodes.
+pub fn known(cp: u16) -> bool {
+    decoder(cp).is_some()
+}
+
+/// `b` in code page `cp`; an unknown code page is read as Windows 1252.
+pub fn decode(b: &[u8], cp: u16) -> String {
+    match decoder(cp).unwrap_or(Decoder::Encoding(encoding_rs::WINDOWS_1252)) {
+        Decoder::Utf16 => {
+            let u: Vec<u16> = b
+                .as_chunks::<2>()
+                .0
+                .iter()
+                .map(|x| u16::from_le_bytes(*x))
+                .collect();
+            String::from_utf16_lossy(&u)
+        }
+        Decoder::Encoding(e) => e.decode_without_bom_handling(b).0.into_owned(),
+        Decoder::Table(t) => {
+            let u: Vec<u16> = b.iter().map(|&x| t[x as usize]).collect();
+            String::from_utf16_lossy(&u)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn dos_and_windows_pages() {
+        // 0x82 is é in DOS Latin 1 and Latin US, a low quotation mark in 1252.
+        assert_eq!(decode(&[0x82], 850), "é");
+        assert_eq!(decode(&[0x82], 437), "é");
+        assert_eq!(decode(&[0x82], 1252), "\u{201A}");
+        assert_eq!(decode(&[0xD5], 858), "€");
+        assert_eq!(decode(&[0x8E], 866), "О");
+        assert_eq!(decode(&[0x80], 10029), "Ä");
+        assert_eq!(decode(b"A\0", 1200), "A");
+        assert!(known(437) && known(869) && !known(1361));
+        // An unknown page reads as 1252.
+        assert_eq!(decode(&[0xE9], 1361), "é");
+    }
+}
diff --git a/crates/exav-unpack/src/formats/charset_tables.rs b/crates/exav-unpack/src/formats/charset_tables.rs
new file mode 100644
index 00000000..18ead152
--- /dev/null
+++ b/crates/exav-unpack/src/formats/charset_tables.rs
@@ -0,0 +1,386 @@
+// Generated by scripts/codepages.py from Python's codecs. Do not edit.
+
+/// (code page, its 256 characters).
+#[rustfmt::skip]
+pub(crate) static TABLES: &[(u16, [u16; 256])] = &[
+    // cp437
+    (437, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+        0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp720
+    (720, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x0080, 0x0081, 0x00E9, 0x00E2, 0x0084, 0x00E0, 0x0086, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x008D, 0x008E, 0x008F,
+        0x0090, 0x0651, 0x0652, 0x00F4, 0x00A4, 0x0640, 0x00FB, 0x00F9, 0x0621, 0x0622, 0x0623, 0x0624, 0x00A3, 0x0625, 0x0626, 0x0627,
+        0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A,
+        0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0x0650, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp737
+    (737, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0,
+        0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8,
+        0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD, 0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E,
+        0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp775
+    (775, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107, 0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A, 0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4,
+        0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6, 0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118, 0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D,
+        0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B, 0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144, 0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019,
+        0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E, 0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp850
+    (850, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+        0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE, 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+        0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+        0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp852
+    (852, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7, 0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106,
+        0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A, 0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E, 0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A, 0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+        0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE, 0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580,
+        0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161, 0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4,
+        0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8, 0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0,
+    ]),
+    // cp855
+    (855, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404, 0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408,
+        0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C, 0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A,
+        0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414, 0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438, 0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+        0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E, 0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580,
+        0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443, 0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116,
+        0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D, 0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0,
+    ]),
+    // cp857
+    (857, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F, 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+        0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, 0xFFFD, 0x00CD, 0x00CE, 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+        0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0xFFFD, 0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4,
+        0x00AD, 0x00B1, 0xFFFD, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp858
+    (858, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4,
+        0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x20AC, 0x00CD, 0x00CE, 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580,
+        0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4,
+        0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp860
+    (860, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E3, 0x00E0, 0x00C1, 0x00E7, 0x00EA, 0x00CA, 0x00E8, 0x00CD, 0x00D4, 0x00EC, 0x00C3, 0x00C2,
+        0x00C9, 0x00C0, 0x00C8, 0x00F4, 0x00F5, 0x00F2, 0x00DA, 0x00F9, 0x00CC, 0x00D5, 0x00DC, 0x00A2, 0x00A3, 0x00D9, 0x20A7, 0x00D3,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x00D2, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+        0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp861
+    (861, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00D0, 0x00F0, 0x00DE, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00FE, 0x00FB, 0x00DD, 0x00FD, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x20A7, 0x0192,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00C1, 0x00CD, 0x00D3, 0x00DA, 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+        0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp862
+    (862, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+        0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+        0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp863
+    (863, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00C2, 0x00E0, 0x00B6, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x2017, 0x00C0, 0x00A7,
+        0x00C9, 0x00C8, 0x00CA, 0x00F4, 0x00CB, 0x00CF, 0x00FB, 0x00F9, 0x00A4, 0x00D4, 0x00DC, 0x00A2, 0x00A3, 0x00D9, 0x00DB, 0x0192,
+        0x00A6, 0x00B4, 0x00F3, 0x00FA, 0x00A8, 0x00B8, 0x00B3, 0x00AF, 0x00CE, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00BE, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+        0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp864
+    (864, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x066A, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00B0, 0x00B7, 0x2219, 0x221A, 0x2592, 0x2500, 0x2502, 0x253C, 0x2524, 0x252C, 0x251C, 0x2534, 0x2510, 0x250C, 0x2514, 0x2518,
+        0x03B2, 0x221E, 0x03C6, 0x00B1, 0x00BD, 0x00BC, 0x2248, 0x00AB, 0x00BB, 0xFEF7, 0xFEF8, 0xFFFD, 0xFFFD, 0xFEFB, 0xFEFC, 0xFFFD,
+        0x00A0, 0x00AD, 0xFE82, 0x00A3, 0x00A4, 0xFE84, 0xFFFD, 0xFFFD, 0xFE8E, 0xFE8F, 0xFE95, 0xFE99, 0x060C, 0xFE9D, 0xFEA1, 0xFEA5,
+        0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, 0x0669, 0xFED1, 0x061B, 0xFEB1, 0xFEB5, 0xFEB9, 0x061F,
+        0x00A2, 0xFE80, 0xFE81, 0xFE83, 0xFE85, 0xFECA, 0xFE8B, 0xFE8D, 0xFE91, 0xFE93, 0xFE97, 0xFE9B, 0xFE9F, 0xFEA3, 0xFEA7, 0xFEA9,
+        0xFEAB, 0xFEAD, 0xFEAF, 0xFEB3, 0xFEB7, 0xFEBB, 0xFEBF, 0xFEC1, 0xFEC5, 0xFECB, 0xFECF, 0x00A6, 0x00AC, 0x00F7, 0x00D7, 0xFEC9,
+        0x0640, 0xFED3, 0xFED7, 0xFEDB, 0xFEDF, 0xFEE3, 0xFEE7, 0xFEEB, 0xFEED, 0xFEEF, 0xFEF3, 0xFEBD, 0xFECC, 0xFECE, 0xFECD, 0xFEE1,
+        0xFE7D, 0x0651, 0xFEE5, 0xFEE9, 0xFEEC, 0xFEF0, 0xFEF2, 0xFED0, 0xFED5, 0xFEF5, 0xFEF6, 0xFEDD, 0xFED9, 0xFEF1, 0x25A0, 0xFFFD,
+    ]),
+    // cp865
+    (865, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5,
+        0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x20A7, 0x0192,
+        0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00A4,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
+        0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
+        0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229,
+        0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0,
+    ]),
+    // cp869
+    (869, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x0386, 0xFFFD, 0x00B7, 0x00AC, 0x00A6, 0x2018, 0x2019, 0x0388, 0x2015, 0x0389,
+        0x038A, 0x03AA, 0x038C, 0xFFFD, 0xFFFD, 0x038E, 0x03AB, 0x00A9, 0x038F, 0x00B2, 0x00B3, 0x03AC, 0x00A3, 0x03AD, 0x03AE, 0x03AF,
+        0x03CA, 0x0390, 0x03CC, 0x03CD, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x00BD, 0x0398, 0x0399, 0x00AB, 0x00BB,
+        0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x039A, 0x039B, 0x039C, 0x039D, 0x2563, 0x2551, 0x2557, 0x255D, 0x039E, 0x039F, 0x2510,
+        0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x03A0, 0x03A1, 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x03A3,
+        0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03B1, 0x03B2, 0x03B3, 0x2518, 0x250C, 0x2588, 0x2584, 0x03B4, 0x03B5, 0x2580,
+        0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x0384,
+        0x00AD, 0x00B1, 0x03C5, 0x03C6, 0x03C7, 0x00A7, 0x03C8, 0x0385, 0x00B0, 0x00A8, 0x03C9, 0x03CB, 0x03B0, 0x03CE, 0x25A0, 0x00A0,
+    ]),
+    // mac_greek
+    (10006, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C4, 0x00B9, 0x00B2, 0x00C9, 0x00B3, 0x00D6, 0x00DC, 0x0385, 0x00E0, 0x00E2, 0x00E4, 0x0384, 0x00A8, 0x00E7, 0x00E9, 0x00E8,
+        0x00EA, 0x00EB, 0x00A3, 0x2122, 0x00EE, 0x00EF, 0x2022, 0x00BD, 0x2030, 0x00F4, 0x00F6, 0x00A6, 0x20AC, 0x00F9, 0x00FB, 0x00FC,
+        0x2020, 0x0393, 0x0394, 0x0398, 0x039B, 0x039E, 0x03A0, 0x00DF, 0x00AE, 0x00A9, 0x03A3, 0x03AA, 0x00A7, 0x2260, 0x00B0, 0x00B7,
+        0x0391, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x0392, 0x0395, 0x0396, 0x0397, 0x0399, 0x039A, 0x039C, 0x03A6, 0x03AB, 0x03A8, 0x03A9,
+        0x03AC, 0x039D, 0x00AC, 0x039F, 0x03A1, 0x2248, 0x03A4, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x03A5, 0x03A7, 0x0386, 0x0388, 0x0153,
+        0x2013, 0x2015, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x0389, 0x038A, 0x038C, 0x038E, 0x03AD, 0x03AE, 0x03AF, 0x03CC, 0x038F,
+        0x03CD, 0x03B1, 0x03B2, 0x03C8, 0x03B4, 0x03B5, 0x03C6, 0x03B3, 0x03B7, 0x03B9, 0x03BE, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF,
+        0x03C0, 0x03CE, 0x03C1, 0x03C3, 0x03C4, 0x03B8, 0x03C9, 0x03C2, 0x03C7, 0x03C5, 0x03B6, 0x03CA, 0x03CB, 0x0390, 0x03B0, 0x00AD,
+    ]),
+    // mac_latin2
+    (10029, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C4, 0x0100, 0x0101, 0x00C9, 0x0104, 0x00D6, 0x00DC, 0x00E1, 0x0105, 0x010C, 0x00E4, 0x010D, 0x0106, 0x0107, 0x00E9, 0x0179,
+        0x017A, 0x010E, 0x00ED, 0x010F, 0x0112, 0x0113, 0x0116, 0x00F3, 0x0117, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x011A, 0x011B, 0x00FC,
+        0x2020, 0x00B0, 0x0118, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x0119, 0x00A8, 0x2260, 0x0123, 0x012E,
+        0x012F, 0x012A, 0x2264, 0x2265, 0x012B, 0x0136, 0x2202, 0x2211, 0x0142, 0x013B, 0x013C, 0x013D, 0x013E, 0x0139, 0x013A, 0x0145,
+        0x0146, 0x0143, 0x00AC, 0x221A, 0x0144, 0x0147, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x0148, 0x0150, 0x00D5, 0x0151, 0x014C,
+        0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x014D, 0x0154, 0x0155, 0x0158, 0x2039, 0x203A, 0x0159, 0x0156,
+        0x0157, 0x0160, 0x201A, 0x201E, 0x0161, 0x015A, 0x015B, 0x00C1, 0x0164, 0x0165, 0x00CD, 0x017D, 0x017E, 0x016A, 0x00D3, 0x00D4,
+        0x016B, 0x016E, 0x00DA, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, 0x00DD, 0x00FD, 0x0137, 0x017B, 0x0141, 0x017C, 0x0122, 0x02C7,
+    ]),
+    // mac_iceland
+    (10079, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
+        0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
+        0x00DD, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8,
+        0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8,
+        0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153,
+        0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x00FF, 0x0178, 0x2044, 0x20AC, 0x00D0, 0x00F0, 0x00DE, 0x00FE,
+        0x00FD, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
+        0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7,
+    ]),
+    // mac_turkish
+    (10081, [
+        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
+        0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
+        0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F,
+        0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F,
+        0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+        0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F,
+        0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+        0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F,
+        0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8,
+        0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC,
+        0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8,
+        0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8,
+        0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153,
+        0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, 0x00FF, 0x0178, 0x011E, 0x011F, 0x0130, 0x0131, 0x015E, 0x015F,
+        0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4,
+        0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0xF8A0, 0x02C6, 0x02DC, 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7,
+    ]),
+];
diff --git a/crates/exav-unpack/src/formats/chm.rs b/crates/exav-unpack/src/formats/chm.rs
index fc63664e..7abc5a5d 100644
--- a/crates/exav-unpack/src/formats/chm.rs
+++ b/crates/exav-unpack/src/formats/chm.rs
@@ -105,10 +105,10 @@ fn parse_chm(d: &[u8]) -> Option<ChmDir> {
     }
     // Header-section table follows the 0x38-byte ITSF header.
     let off_hs1 = crate::bytes::to_usize(u64at(d, 0x38 + 0x10)?); // ITSP directory
-                                                                  // The directory offset must land inside the file. Bounding it here also keeps
-                                                                  // every `off_hs1 + <small const>` read below from overflowing `usize` on a
-                                                                  // crafted 64-bit offset (a `d.len() <= isize::MAX` invariant makes the adds
-                                                                  // safe once `off_hs1 < d.len()`).
+    // The directory offset must land inside the file. Bounding it here also keeps
+    // every `off_hs1 + <small const>` read below from overflowing `usize` on a
+    // crafted 64-bit offset (a `d.len() <= isize::MAX` invariant makes the adds
+    // safe once `off_hs1 < d.len()`).
     if off_hs1 >= d.len() {
         return None;
     }
@@ -384,31 +384,30 @@ pub(crate) fn extract_chm<R>(
     // Bounded to what the budget still allows so a huge declared length can't OOM.
     let mut decompressed: Vec<u8> = Vec::new();
     let mut frames_ok: Vec<bool> = Vec::new();
-    if let Some(content_e) = content {
-        if let Some(content_bytes) = read_sec0(data, dir.sec0_offset, content_e) {
-            let params = control
-                .and_then(|c| read_sec0(data, dir.sec0_offset, c))
-                .and_then(parse_control);
-            // Reset table gives the frame offsets + true uncompressed length;
-            // fall back to SpanInfo (length only) or the content length itself.
-            let rt = rtable
-                .and_then(|r| read_sec0(data, dir.sec0_offset, r))
-                .and_then(parse_reset_table)
-                .or_else(|| {
-                    spaninfo
-                        .and_then(|s| read_sec0(data, dir.sec0_offset, s))
-                        .and_then(|b| u64at(b, 0))
-                        .map(|uncomp_len| ResetTable {
-                            uncomp_len,
-                            offsets: Vec::new(),
-                        })
-                });
-            if let (Some(params), Some(rt)) = (params, rt) {
-                let cap = budget.reserve().unwrap_or(0) as usize;
-                if cap > 0 {
-                    (decompressed, frames_ok) =
-                        decompress_content(content_bytes, &params, &rt, cap);
-                }
+    if let Some(content_e) = content
+        && let Some(content_bytes) = read_sec0(data, dir.sec0_offset, content_e)
+    {
+        let params = control
+            .and_then(|c| read_sec0(data, dir.sec0_offset, c))
+            .and_then(parse_control);
+        // Reset table gives the frame offsets + true uncompressed length;
+        // fall back to SpanInfo (length only) or the content length itself.
+        let rt = rtable
+            .and_then(|r| read_sec0(data, dir.sec0_offset, r))
+            .and_then(parse_reset_table)
+            .or_else(|| {
+                spaninfo
+                    .and_then(|s| read_sec0(data, dir.sec0_offset, s))
+                    .and_then(|b| u64at(b, 0))
+                    .map(|uncomp_len| ResetTable {
+                        uncomp_len,
+                        offsets: Vec::new(),
+                    })
+            });
+        if let (Some(params), Some(rt)) = (params, rt) {
+            let cap = budget.reserve().unwrap_or(0) as usize;
+            if cap > 0 {
+                (decompressed, frames_ok) = decompress_content(content_bytes, &params, &rt, cap);
             }
         }
     }
diff --git a/crates/exav-unpack/src/formats/cpio.rs b/crates/exav-unpack/src/formats/cpio.rs
index 584f051d..346a62be 100644
--- a/crates/exav-unpack/src/formats/cpio.rs
+++ b/crates/exav-unpack/src/formats/cpio.rs
@@ -4,6 +4,7 @@
 //! the old POSIX "portable" format (`070707`, octal fields). Member data is
 //! emitted for the engine to recurse into.
 
+use crate::stream::Region;
 use crate::*;
 use std::io::{Read, Seek, SeekFrom};
 
@@ -39,9 +40,7 @@ pub(crate) fn walk<T>(
 /// cpio headers (newc/odc/old-binary) and return each file member as
 /// `(name, data_offset, size)`. Mirrors [`extract_cpio`]'s boundaries but never
 /// buffers member data.
-pub(crate) fn stream_offsets<R: Read + Seek>(
-    source: &mut R,
-) -> Result<Vec<(String, u64, u64)>, LimitHit> {
+pub(crate) fn stream_offsets<R: Read + Seek>(source: &mut R) -> Result<Vec<Region>, LimitHit> {
     let mut magic = [0u8; 6];
     source
         .seek(SeekFrom::Start(0))
@@ -66,49 +65,113 @@ enum Fields {
     Bin { swap: bool },
 }
 
+impl Fields {
+    /// The header magics a following header may start with, to find the next
+    /// one after bytes that are not a header (the binary format's two bytes
+    /// are too short to search for).
+    fn magics(&self) -> &'static [&'static [u8]] {
+        match self {
+            Fields::Newc => &[b"070701", b"070702"],
+            Fields::Odc => &[b"070707"],
+            Fields::Bin { .. } => &[],
+        }
+    }
+}
+
+/// The first offset at or after `from` where one of `magics` starts.
+fn find_magic<R: Read + Seek>(
+    source: &mut R,
+    from: u64,
+    len: u64,
+    magics: &[&[u8]],
+) -> Result<Option<u64>, LimitHit> {
+    const CHUNK: u64 = 1 << 20;
+    let mut at = from;
+    while at < len {
+        let buf = crate::read_at(source, at, (len - at).min(CHUNK) as usize)?;
+        let found = magics
+            .iter()
+            .filter_map(|m| memchr::memmem::find(&buf, m))
+            .min();
+        if let Some(p) = found {
+            return Ok(Some(at + p as u64));
+        }
+        if (buf.len() as u64) < CHUNK || at + buf.len() as u64 >= len {
+            break;
+        }
+        // A magic across the seam is seen whole by the next read.
+        at += buf.len() as u64 - 5;
+    }
+    Ok(None)
+}
+
 fn stream_walk<R: Read + Seek>(
     source: &mut R,
     hdr_len: usize,
     fields: Fields,
-) -> Result<Vec<(String, u64, u64)>, LimitHit> {
+) -> Result<Vec<Region>, LimitHit> {
+    let len = source
+        .seek(SeekFrom::End(0))
+        .map_err(|e| LimitHit::corrupt(format!("cpio: {e}")))?;
     let mut out = Vec::new();
     let mut pos = 0u64;
+    // Bytes that are not a header are scanned as they lie, as a member of their
+    // own, and the walk goes on at the next header there is. GNU cpio skips them
+    // the same way and extracts what follows, and the Linux kernel unpacks the
+    // archives of an initramfs one after the other, each ending in its own
+    // trailer.
+    let junk = |source: &mut R, out: &mut Vec<Region>, from: u64, magics: &[&[u8]]| {
+        let rest = crate::read_at(source, from, 4096)?;
+        if rest.iter().all(|&b| b == 0) {
+            return Ok::<Option<u64>, LimitHit>(None);
+        }
+        let next = find_magic(source, from + 1, len, magics)?.unwrap_or(len);
+        out.push(Region::Member(
+            format!("<cpio-from-{from}>"),
+            from,
+            next - from,
+        ));
+        Ok((next < len).then_some(next))
+    };
     loop {
-        let h = crate::read_at(source, pos, hdr_len)?;
-        if h.len() < hdr_len {
+        if pos >= len {
             break;
         }
-        let (namesize, filesize, magic_ok) = match &fields {
-            Fields::Newc => (
-                hex(&h[94..102]) as u64,
-                hex(&h[54..62]) as u64,
-                &h[0..6] == b"070701" || &h[0..6] == b"070702",
-            ),
-            Fields::Odc => (
-                oct(&h[59..65]) as u64,
-                oct(&h[65..76]) as u64,
-                &h[0..6] == b"070707",
-            ),
-            Fields::Bin { swap } => {
-                let u16at = |p: usize| -> u64 {
-                    let v = u16::from_le_bytes([h[p], h[p + 1]]);
-                    (if *swap { v.swap_bytes() } else { v }) as u64
-                };
-                (
-                    u16at(20),
-                    (u16at(22) << 16) | u16at(24),
-                    u16at(0) == 0o070707,
-                )
+        let h = crate::read_at(source, pos, hdr_len)?;
+        let parsed = if h.len() < hdr_len {
+            None
+        } else {
+            match &fields {
+                Fields::Newc => (|| {
+                    (&h[0..6] == b"070701" || &h[0..6] == b"070702")
+                        .then_some(())
+                        .and(Some((hex(&h[94..102])?, hex(&h[54..62])?)))
+                })(),
+                Fields::Odc => (|| {
+                    (&h[0..6] == b"070707")
+                        .then_some(())
+                        .and(Some((oct(&h[59..65])?, oct(&h[65..76])?)))
+                })(),
+                Fields::Bin { swap } => {
+                    let u16at = |p: usize| -> u64 {
+                        let v = u16::from_le_bytes([h[p], h[p + 1]]);
+                        (if *swap { v.swap_bytes() } else { v }) as u64
+                    };
+                    (u16at(0) == 0o070707).then(|| (u16at(20), (u16at(22) << 16) | u16at(24)))
+                }
+            }
+        };
+        let Some((namesize, filesize)) = parsed.filter(|(n, _)| *n > 0) else {
+            match junk(source, &mut out, pos, fields.magics())? {
+                Some(next) => {
+                    pos = next;
+                    continue;
+                }
+                None => break,
             }
         };
-        if !magic_ok {
-            break;
-        }
         let name_start = pos + hdr_len as u64;
         let name = read_name(source, name_start, namesize)?;
-        if name == TRAILER {
-            break;
-        }
         // Data start + next-header advance mirror the buffered extractor:
         // newc pads header+name and data to 4 bytes; odc has no padding; the old
         // binary format pads the name and the data to even boundaries.
@@ -126,8 +189,42 @@ fn stream_walk<R: Read + Seek>(
                 (ds, ds + filesize + (filesize & 1))
             }
         };
+        if name == TRAILER {
+            // What follows is another archive (an initramfs is laid out as
+            // several), padding, or neither. Padding of zeros is skipped.
+            let mut at = next.min(len);
+            loop {
+                let peek = crate::read_at(source, at, 4096)?;
+                let zeros = peek.iter().take_while(|&&b| b == 0).count();
+                if zeros == 0 || zeros < peek.len() {
+                    at += zeros as u64;
+                    break;
+                }
+                at += zeros as u64;
+            }
+            if at >= len {
+                break;
+            }
+            let peek = crate::read_at(source, at, 6)?;
+            let header = match &fields {
+                Fields::Bin { swap: false } => peek.starts_with(&[0xc7, 0x71]),
+                Fields::Bin { swap: true } => peek.starts_with(&[0x71, 0xc7]),
+                _ => fields.magics().iter().any(|m| peek.starts_with(m)),
+            };
+            if header {
+                pos = at;
+                continue;
+            }
+            match junk(source, &mut out, at, fields.magics())? {
+                Some(again) => {
+                    pos = again;
+                    continue;
+                }
+                None => break,
+            }
+        }
         if filesize > 0 {
-            out.push((name, data_start, filesize));
+            out.push(Region::Member(name, data_start, filesize));
         }
         if next <= pos {
             break; // no forward progress → stop rather than loop
@@ -137,11 +234,17 @@ fn stream_walk<R: Read + Seek>(
     Ok(out)
 }
 
-fn hex(field: &[u8]) -> usize {
-    usize::from_str_radix(std::str::from_utf8(field).unwrap_or("0").trim(), 16).unwrap_or(0)
+/// A header's hexadecimal field, `None` where a byte is not a digit.
+fn hex(field: &[u8]) -> Option<u64> {
+    std::str::from_utf8(field)
+        .ok()
+        .and_then(|s| u64::from_str_radix(s, 16).ok())
 }
-fn oct(field: &[u8]) -> usize {
-    usize::from_str_radix(std::str::from_utf8(field).unwrap_or("0").trim(), 8).unwrap_or(0)
+/// A header's octal field, `None` where a byte is not a digit.
+fn oct(field: &[u8]) -> Option<u64> {
+    std::str::from_utf8(field)
+        .ok()
+        .and_then(|s| u64::from_str_radix(s, 8).ok())
 }
 
 #[cfg(test)]
diff --git a/crates/exav-unpack/src/formats/cramfs.rs b/crates/exav-unpack/src/formats/cramfs.rs
new file mode 100644
index 00000000..cea37aff
--- /dev/null
+++ b/crates/exav-unpack/src/formats/cramfs.rs
@@ -0,0 +1,355 @@
+//! cramfs: the files of an image, read where they lie.
+//!
+//! The small read-only filesystem of embedded Linux boot images and initial
+//! ramdisks. The image is a `Read + Seek`, read where the walk goes: the
+//! superblock, each directory's entries and each file's blocks. Only a file is
+//! ever held, bounded by the buffer limit.
+//!
+//! ```text
+//! superblock (76 bytes)   magic and signature, the root inode
+//!   inode (12 bytes)      mode, size, and an offset in words: a directory's
+//!                         entries, or a file's table of block ends
+//!   directory             inodes, each followed by its name, padded to words
+//!   file                  a table of where each 4 KiB block ends, then the
+//!                         blocks, each deflated (zlib); a block that is
+//!                         empty is a hole
+//! ```
+//!
+//! Both byte orders are read, and an image that begins 512 bytes in (room for
+//! boot code). A block that is stored as it is, as the extended block
+//! pointers allow, is read; one that lies elsewhere than after the one before
+//! it is reported. A symbolic link or a device node holds no file's bytes and
+//! is not emitted. The image's checksum is not checked.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::collections::HashSet;
+use std::io::{Read, Seek};
+
+use super::vol::{Attrs, Emit, Fill, Got, Step, Vol, be32, give, le32, read_file};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, LimitHit};
+
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
+
+/// Bytes in a block of a file.
+const BLOCK: usize = 4096;
+
+/// Superblock flag: block pointers carry flags of their own.
+const EXT_BLOCK_POINTERS: u32 = 0x0000_0800;
+/// Flags of an extended block pointer.
+const BLK_UNCOMPRESSED: u32 = 1 << 31;
+const BLK_DIRECT: u32 = 1 << 30;
+
+const S_IFMT: u32 = 0o170000;
+const S_IFREG: u32 = 0o100000;
+const S_IFDIR: u32 = 0o040000;
+
+/// Whether `data`, the start of an image, holds a cramfs superblock, at the
+/// start or 512 bytes in: its magic in either byte order and its signature.
+pub(crate) fn is_cramfs(data: &[u8]) -> bool {
+    super::sniff::is(data, crate::Format::Cramfs)
+}
+
+/// An inode.
+#[derive(Clone)]
+struct Inode {
+    mode: u32,
+    size: u64,
+    /// Where its directory entries or its table of block ends are, in bytes
+    /// from the start of the image, and how long its name is, in bytes.
+    offset: u64,
+    name_len: usize,
+}
+
+/// What the superblock says of the image.
+struct Cram {
+    be: bool,
+    flags: u32,
+    root: Inode,
+}
+
+impl Cram {
+    fn word(&self, d: &[u8], at: usize) -> u32 {
+        if self.be { be32(d, at) } else { le32(d, at) }
+    }
+
+    /// The inode in the 12 bytes `d`. The fields are bits of words laid out as
+    /// the machine that made the image lays them out: from the low bit on in
+    /// the small-endian image, from the high bit on in the other.
+    fn inode(&self, d: &[u8]) -> Inode {
+        let (w0, w1, w2) = (self.word(d, 0), self.word(d, 4), self.word(d, 8));
+        let (mode, size, name_len, offset) = if self.be {
+            (w0 >> 16, w1 >> 8, w2 >> 26, w2 & 0x03FF_FFFF)
+        } else {
+            (w0 & 0xFFFF, w1 & 0x00FF_FFFF, w2 & 63, w2 >> 6)
+        };
+        Inode {
+            mode,
+            size: u64::from(size),
+            offset: u64::from(offset).saturating_mul(4),
+            name_len: crate::bytes::to_usize(u64::from(name_len).saturating_mul(4)),
+        }
+    }
+
+    /// The entries of the directory `dir`: name and inode. The flag is false
+    /// where the directory is damaged. `left` counts the bytes of directories
+    /// the walk may still read.
+    fn entries(
+        &self,
+        v: &mut Vol,
+        dir: &Inode,
+        left: &mut u64,
+        limit: usize,
+    ) -> (Vec<(String, Inode)>, bool) {
+        let mut out = Vec::new();
+        if dir.size > *left {
+            return (out, false);
+        }
+        *left = left.saturating_sub(dir.size);
+        let Some(list) = v.at(dir.offset, crate::bytes::to_usize(dir.size)) else {
+            return (out, false);
+        };
+        let mut pos = 0usize;
+        while pos < list.len() {
+            let Some(head) = crate::bytes::at(&list, pos, 12) else {
+                return (out, false);
+            };
+            let inode = self.inode(head);
+            let start = pos.saturating_add(12);
+            let Some(name) = crate::bytes::at(&list, start, inode.name_len) else {
+                return (out, false);
+            };
+            // The name is null-padded to a whole number of words.
+            let end = name.iter().position(|&b| b == 0).unwrap_or(name.len());
+            pos = start.saturating_add(inode.name_len);
+            if out.len() >= limit {
+                return (out, true);
+            }
+            out.push((String::from_utf8_lossy(&name[..end]).into_owned(), inode));
+        }
+        (out, true)
+    }
+
+    /// The bytes of a file: held when they are at most `cap`, else read as
+    /// they go.
+    fn file<'a>(&self, v: &'a mut Vol<'_>, f: &Inode, cap: u64) -> Got<'a> {
+        if f.size == 0 {
+            return Got::Whole(Vec::new());
+        }
+        let size = crate::bytes::to_usize(f.size);
+        let blocks = size.div_ceil(BLOCK);
+        let Some(ends) = v.at(f.offset, blocks.saturating_mul(4)) else {
+            return Got::Why("cramfs file whose table of blocks is unreadable");
+        };
+        let fill = Blocks {
+            ends,
+            be: self.be,
+            ext: self.flags & EXT_BLOCK_POINTERS != 0,
+            // The first block follows the table, and each follows the one before.
+            prev: f.offset.saturating_add((blocks as u64).saturating_mul(4)),
+            i: 0,
+            blocks,
+            size,
+        };
+        read_file(v, fill, f.size, cap)
+    }
+}
+
+/// The blocks of a file, read and inflated as they are wanted.
+struct Blocks {
+    /// Where each block ends.
+    ends: Vec<u8>,
+    be: bool,
+    ext: bool,
+    /// Where the next block starts.
+    prev: u64,
+    i: usize,
+    blocks: usize,
+    size: usize,
+}
+
+impl Fill for Blocks {
+    fn fill(&mut self, v: &mut Vol, out: &mut Vec<u8>) -> Step {
+        if self.i >= self.blocks {
+            return Step::End;
+        }
+        let at = self.i.saturating_mul(4);
+        let raw = if self.be {
+            be32(&self.ends, at)
+        } else {
+            le32(&self.ends, at)
+        };
+        let (stored, direct) = (
+            self.ext && raw & BLK_UNCOMPRESSED != 0,
+            self.ext && raw & BLK_DIRECT != 0,
+        );
+        let end = u64::from(if self.ext { raw & 0x3FFF_FFFF } else { raw });
+        let want = BLOCK.min(self.size.saturating_sub(self.i.saturating_mul(BLOCK)));
+        if direct || end < self.prev {
+            return Step::Broken;
+        }
+        if end == self.prev {
+            // A hole.
+            out.resize(out.len().saturating_add(want), 0);
+            self.i = self.i.saturating_add(1);
+            return Step::More;
+        }
+        let len = crate::bytes::to_usize(end.saturating_sub(self.prev));
+        // A block is a page, stored or deflated, and deflate adds a few bytes
+        // to a page it cannot shrink.
+        if len > BLOCK.saturating_mul(2) {
+            return Step::Broken;
+        }
+        let Some(raw_block) = v.at(self.prev, len) else {
+            return Step::Broken;
+        };
+        self.prev = end;
+        let mut block = if stored {
+            raw_block
+        } else {
+            match unzlib(&raw_block) {
+                Some(b) => b,
+                None => return Step::Broken,
+            }
+        };
+        block.resize(want, 0);
+        out.extend_from_slice(&block);
+        self.i = self.i.saturating_add(1);
+        Step::More
+    }
+}
+
+/// A block inflated, to at most one block of bytes.
+fn unzlib(src: &[u8]) -> Option<Vec<u8>> {
+    let mut out = Vec::new();
+    crate::inflate::zlib_body(src)?
+        .take((BLOCK as u64).saturating_add(1))
+        .read_to_end(&mut out)
+        .ok()?;
+    (out.len() <= BLOCK).then_some(out)
+}
+
+/// The image's superblock, or `None` where it describes none that is read.
+fn open(v: &mut Vol) -> Option<Cram> {
+    for base in [0u64, 512] {
+        let Some(b) = v.at(base, 76) else {
+            continue;
+        };
+        if b.get(16..32) != Some(b"Compressed ROMFS".as_slice()) {
+            continue;
+        }
+        let be = match b.get(0..4)? {
+            [0x28, 0xCD, 0x3D, 0x45] => true,
+            [0x45, 0x3D, 0xCD, 0x28] => false,
+            _ => continue,
+        };
+        let mut cram = Cram {
+            be,
+            flags: 0,
+            root: Inode {
+                mode: 0,
+                size: 0,
+                offset: 0,
+                name_len: 0,
+            },
+        };
+        cram.flags = cram.word(&b, 8);
+        cram.root = cram.inode(b.get(64..76)?);
+        return (cram.root.mode & S_IFMT == S_IFDIR).then_some(cram);
+    }
+    None
+}
+
+/// Walk a cramfs image given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the cramfs image `disk`, which is `len` bytes long, handing each file
+/// to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    let head = v
+        .at(0, crate::bytes::to_usize(len.min(544)))
+        .unwrap_or_default();
+    if !is_cramfs(&head) {
+        return Ok(None);
+    }
+    let Some(fs) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "cramfs open: the superblock or the root directory is unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    // The directories of an image are disjoint, so they are not more than it.
+    let mut left = len;
+    let mut damaged = false;
+    let mut seen: HashSet<(u64, u64)> = HashSet::from([(fs.root.offset, fs.root.size)]);
+    let mut stack = vec![(fs.root.clone(), String::new(), 0usize)];
+    while let Some((dir, prefix, depth)) = stack.pop() {
+        let (list, intact) = fs.entries(&mut v, &dir, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for (name, inode) in list {
+            budget.count_entry()?;
+            let path = if prefix.is_empty() {
+                name
+            } else {
+                format!("{prefix}/{name}")
+            };
+            match inode.mode & S_IFMT {
+                S_IFDIR => {
+                    if depth >= MAX_DEPTH {
+                        damaged = true;
+                    } else if seen.insert((inode.offset, inode.size)) {
+                        below.push((inode, path, depth.saturating_add(1)));
+                    }
+                }
+                S_IFREG => {
+                    let attrs = Attrs {
+                        mode: Some(inode.mode),
+                        mtime: None,
+                    };
+                    if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                        fs.file(&mut v, &inode, cap)
+                    })? {
+                        return Ok(Some(r));
+                    }
+                }
+                // A link or a node holds no file's bytes.
+                _ => {}
+            }
+        }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "cramfs walk: the image is damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
diff --git a/crates/exav-unpack/src/formats/dcl_explode.rs b/crates/exav-unpack/src/formats/dcl_explode.rs
new file mode 100644
index 00000000..2c7bbdd5
--- /dev/null
+++ b/crates/exav-unpack/src/formats/dcl_explode.rs
@@ -0,0 +1,334 @@
+//! PKWARE Data Compression Library "implode", decoded. Not ZIP's method 6
+//! implode: this is the codec of InstallShield `.z` members.
+//!
+//! The algorithm and the code-length tables are those of Mark Adler's
+//! `blast.c` (zlib `contrib/blast`, zlib licence), as the `explode` crate
+//! 0.1.2 (Aaron Griffith, MIT) ports them; both attributed in `NOTICE`. This
+//! one decodes a slice whole into a capped buffer, which drops `explode`'s
+//! byte-at-a-time state machine and its `arraydeque` window: the output is
+//! the window.
+
+use crate::Salvaged;
+
+/// `blast.c`'s code lengths, run-length packed: each byte is a length in its
+/// low nibble, repeated one more time than its high nibble.
+const LITERAL_LENGTHS: &[u8] = &[
+    11, 124, 8, 7, 28, 7, 188, 13, 76, 4, 10, 8, 12, 10, 12, 10, 8, 23, 8, 9, 7, 6, 7, 8, 7, 6, 55,
+    8, 23, 24, 12, 11, 7, 9, 11, 12, 6, 7, 22, 5, 7, 24, 6, 11, 9, 6, 7, 22, 7, 11, 38, 7, 9, 8,
+    25, 11, 8, 11, 9, 12, 8, 12, 5, 38, 5, 38, 5, 11, 7, 5, 6, 21, 6, 10, 53, 8, 7, 24, 10, 27, 44,
+    253, 253, 253, 252, 252, 252, 13, 12, 45, 12, 45, 12, 61, 12, 45, 44, 173,
+];
+const LENGTH_LENGTHS: &[u8] = &[2, 35, 36, 53, 38, 23];
+const DISTANCE_LENGTHS: &[u8] = &[2, 20, 53, 230, 247, 151, 248];
+
+const LENGTH_BASE: [usize; 16] = [3, 2, 4, 5, 6, 7, 8, 9, 10, 12, 16, 24, 40, 72, 136, 264];
+const LENGTH_EXTRA: [u8; 16] = [0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8];
+/// The length that ends the stream.
+const END: usize = 519;
+const MAX_BITS: usize = 13;
+
+/// A canonical Huffman code: how many codes of each length, and the symbols
+/// in code order.
+struct Huffman {
+    count: [u16; MAX_BITS + 1],
+    symbol: Vec<u8>,
+}
+
+impl Huffman {
+    fn new(packed: &[u8]) -> Huffman {
+        let mut lengths = Vec::with_capacity(256);
+        for &b in packed {
+            lengths.extend(std::iter::repeat_n(b & 15, usize::from(b >> 4) + 1));
+        }
+        let mut count = [0u16; MAX_BITS + 1];
+        for &l in &lengths {
+            count[usize::from(l)] += 1;
+        }
+        let mut offs = [0usize; MAX_BITS + 2];
+        for len in 1..=MAX_BITS {
+            offs[len + 1] = offs[len] + usize::from(count[len]);
+        }
+        let mut symbol = vec![0u8; offs[MAX_BITS + 1]];
+        for (s, &l) in lengths.iter().enumerate() {
+            if l != 0 {
+                symbol[offs[usize::from(l)]] = s as u8;
+                offs[usize::from(l)] += 1;
+            }
+        }
+        Huffman { count, symbol }
+    }
+}
+
+enum Stop {
+    /// The input ended before the end code.
+    Truncated,
+    /// The input is not a DCL stream.
+    Invalid,
+    /// The output reached the cap.
+    Full,
+}
+
+struct Bits<'a> {
+    input: &'a [u8],
+    pos: usize,
+    buf: u32,
+    count: u32,
+}
+
+impl Bits<'_> {
+    fn bits(&mut self, n: u32) -> Result<u32, Stop> {
+        while self.count < n {
+            let b = *self.input.get(self.pos).ok_or(Stop::Truncated)?;
+            self.pos += 1;
+            self.buf |= u32::from(b) << self.count;
+            self.count += 8;
+        }
+        let v = self.buf & ((1 << n) - 1);
+        self.buf >>= n;
+        self.count -= n;
+        Ok(v)
+    }
+
+    /// One symbol of `h`. The codes are stored bit-inverted.
+    fn decode(&mut self, h: &Huffman) -> Result<usize, Stop> {
+        let (mut code, mut first, mut index) = (0usize, 0usize, 0usize);
+        for len in 1..=MAX_BITS {
+            code |= (self.bits(1)? ^ 1) as usize;
+            let count = usize::from(h.count[len]);
+            if code < first + count {
+                return Ok(usize::from(h.symbol[index + code - first]));
+            }
+            index += count;
+            first = (first + count) << 1;
+            code <<= 1;
+        }
+        Err(Stop::Invalid)
+    }
+}
+
+/// Decode `input` up to `cap` bytes, salvaging what came out before an
+/// error, as [`crate::salvage`] reports a reader's.
+pub(crate) fn explode(input: &[u8], cap: u64) -> Salvaged {
+    let limit = usize::try_from(cap).unwrap_or(usize::MAX).saturating_add(1);
+    let mut out = Vec::new();
+    let stop = run(input, limit, &mut out);
+    let over_cap = out.len() > limit - 1;
+    out.truncate(limit - 1);
+    Salvaged {
+        data: out,
+        over_cap,
+        undecoded: matches!(stop, Some(Stop::Invalid)),
+        cut_short: matches!(stop, Some(Stop::Truncated)),
+    }
+}
+
+/// `None` at the end code.
+fn run(input: &[u8], limit: usize, out: &mut Vec<u8>) -> Option<Stop> {
+    let mut b = Bits {
+        input,
+        pos: 0,
+        buf: 0,
+        count: 0,
+    };
+    // Each header byte is judged as it is read: a bad first byte is damage
+    // whether or not a second follows.
+    let coded = match b.bits(8) {
+        Ok(coded @ 0..=1) => coded == 1,
+        Ok(_) => return Some(Stop::Invalid),
+        Err(e) => return Some(e),
+    };
+    let dict = match b.bits(8) {
+        Ok(dict @ 4..=6) => dict,
+        Ok(_) => return Some(Stop::Invalid),
+        Err(e) => return Some(e),
+    };
+    let literal = Huffman::new(LITERAL_LENGTHS);
+    let length = Huffman::new(LENGTH_LENGTHS);
+    let distance = Huffman::new(DISTANCE_LENGTHS);
+    let step = |b: &mut Bits, out: &mut Vec<u8>| -> Result<bool, Stop> {
+        if b.bits(1)? == 0 {
+            let byte = match coded {
+                true => b.decode(&literal)?,
+                false => b.bits(8)? as usize,
+            };
+            out.push(byte as u8);
+            return Ok(true);
+        }
+        let symbol = b.decode(&length)?;
+        let len = LENGTH_BASE[symbol] + b.bits(u32::from(LENGTH_EXTRA[symbol]))? as usize;
+        if len == END {
+            return Ok(false);
+        }
+        let extra = if len == 2 { 2 } else { dict };
+        let dist = (b.decode(&distance)? << extra) + b.bits(extra)? as usize + 1;
+        // At most 4,096 back, which the window always holds once that much
+        // has come out.
+        if dist > out.len() {
+            return Err(Stop::Invalid);
+        }
+        for _ in 0..len {
+            out.push(out[out.len() - dist]);
+        }
+        Ok(true)
+    };
+    loop {
+        if out.len() >= limit {
+            return Some(Stop::Full);
+        }
+        match step(&mut b, out) {
+            Ok(true) => {}
+            Ok(false) => return None,
+            Err(e) => return Some(e),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::explode;
+
+    /// `blast.c`'s own example.
+    const AIAI: &[u8] = &[0x00, 0x04, 0x82, 0x24, 0x25, 0x8f, 0x80, 0x7f];
+
+    #[test]
+    fn blast_example() {
+        let s = explode(AIAI, 1 << 20);
+        assert_eq!(s.data, b"AIAIAIAIAIAIA");
+        assert!(!s.over_cap && !s.undecoded && !s.cut_short);
+    }
+
+    #[test]
+    fn trailing_bytes_are_left_alone() {
+        let mut input = AIAI.to_vec();
+        input.push(42);
+        assert_eq!(explode(&input, 1 << 20).data, b"AIAIAIAIAIAIA");
+    }
+
+    #[test]
+    fn a_cut_stream_keeps_what_it_decoded() {
+        let s = explode(&AIAI[..AIAI.len() - 1], 1 << 20);
+        assert!(s.cut_short && !s.undecoded);
+        assert!(b"AIAIAIAIAIAIA".starts_with(&s.data));
+    }
+
+    #[test]
+    fn the_cap_holds() {
+        let s = explode(AIAI, 5);
+        assert!(s.over_cap);
+        assert_eq!(s.data, b"AIAIA");
+    }
+
+    #[test]
+    fn a_bad_header_or_distance_is_invalid() {
+        assert!(explode(&[2, 4, 0], 100).undecoded);
+        assert!(explode(&[0, 7, 0], 100).undecoded);
+        // A bad first byte is damage even with no second byte after it, and
+        // an input that ends inside the header is cut.
+        let s = explode(&[2], 100);
+        assert!(s.undecoded && !s.cut_short);
+        let s = explode(&[1], 100);
+        assert!(s.cut_short && !s.undecoded);
+        // A match first, before any output to copy from.
+        assert!(explode(&[0, 4, 0xff, 0xff, 0xff], 100).undecoded);
+    }
+
+    /// The reference's verdict codes (`dcl_oracle.c`) for what `explode` found:
+    /// output past the cap is reported first.
+    fn verdict(s: &crate::Salvaged) -> u8 {
+        match (s.over_cap, s.cut_short, s.undecoded) {
+            (true, _, _) => 1,
+            (_, true, _) => 2,
+            (_, _, true) => 3,
+            _ => 0,
+        }
+    }
+
+    /// Streams of every kind of damage, against `blast.c`'s verdict and the
+    /// bytes it wrote. Needs the oracle built by `tests/oracle/build.sh`:
+    /// `EXAV_DCL_ORACLE=... cargo test -p exav-unpack --lib -- --ignored dcl_oracle`.
+    #[test]
+    #[ignore = "needs the reference decoder: tests/oracle/build.sh, EXAV_DCL_ORACLE"]
+    fn dcl_oracle_agrees_on_damaged_streams() {
+        let rounds: usize = std::env::var("EXAV_DEBUG_ORACLE_ROUNDS")
+            .ok()
+            .and_then(|v| v.parse().ok())
+            .unwrap_or(5000);
+        let z = crate::read_fixture(&format!(
+            "{}/tests/fixtures/ishieldz/undhr.z",
+            env!("CARGO_MANIFEST_DIR")
+        ))
+        .unwrap();
+        let u32_at = |o: usize| u32::from_le_bytes(z[o..o + 4].try_into().unwrap()) as usize;
+        let mut bases: Vec<(Vec<u8>, usize)> = vec![
+            (AIAI.to_vec(), 8),
+            (z[255..u32_at(41)].to_vec(), 40),
+            // Headers of both literal modes and every window, then bit noise.
+            (
+                vec![0, 4, 0x55, 0xaa, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc],
+                10,
+            ),
+            (
+                vec![1, 6, 0x55, 0xaa, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc],
+                10,
+            ),
+        ];
+        let mut rng = crate::oracle::Rng(0x2545_f491_4f6c_dd1d);
+        let mut jobs = Vec::new();
+        for (base, hot) in bases.drain(..) {
+            jobs.push((u32::MAX >> 8, base.clone()));
+            for _ in 0..rounds {
+                let bad = rng.damage(&base, hot);
+                let cap = match rng.below(3) {
+                    0 => 1 << 20,
+                    1 => rng.below(base.len() * 8 + 1) as u32,
+                    _ => 1 << 24,
+                };
+                jobs.push((cap, bad));
+            }
+        }
+        // Noise after a valid header, for every window and both literal modes.
+        for i in 0..rounds {
+            let mut v = vec![(i % 2) as u8, 4 + (i % 3) as u8];
+            v.extend((0..1 + rng.below(60)).map(|_| rng.next() as u8));
+            jobs.push((1 << 20, v));
+        }
+        let replies = crate::oracle::run("EXAV_DCL_ORACLE", &[], &jobs);
+        let mut bad = Vec::new();
+        let mut matrix = [[0usize; 4]; 4];
+        for ((cap, input), reply) in jobs.iter().zip(&replies) {
+            let s = explode(input, u64::from(*cap));
+            let ours = verdict(&s);
+            matrix[usize::from(reply.0)][usize::from(ours)] += 1;
+            // Past the cap the reference may meet an error first, in the
+            // window it was writing.
+            let at_cap = reply.1.len() == *cap as usize && ours == 1;
+            if s.data != reply.1 || (ours != reply.0 && !at_cap) {
+                crate::oracle::dump("dcl", bad.len(), input, &reply.1, &s.data);
+                bad.push((
+                    *cap,
+                    reply.0,
+                    reply.1.len(),
+                    ours,
+                    s.data.len(),
+                    input.clone(),
+                ));
+            }
+        }
+        eprintln!(
+            "{} streams; rows the reference's verdict (ok, full, cut, error), columns ours: {matrix:?}",
+            jobs.len()
+        );
+        for (cap, status, written, ours, data, input) in bad.iter().take(5) {
+            eprintln!(
+                "cap {cap}: reference ({status}, {written} bytes), ours ({ours}, {data} bytes), input {:02x?}",
+                &input[..input.len().min(32)]
+            );
+        }
+        assert!(
+            bad.is_empty(),
+            "{} of {} streams differ",
+            bad.len(),
+            jobs.len()
+        );
+    }
+}
diff --git a/crates/exav-unpack/src/formats/decmpfs.rs b/crates/exav-unpack/src/formats/decmpfs.rs
new file mode 100644
index 00000000..722d6702
--- /dev/null
+++ b/crates/exav-unpack/src/formats/decmpfs.rs
@@ -0,0 +1,369 @@
+//! decmpfs, the transparent compression macOS applies to files, decoded.
+//!
+//! A compressed file's data fork is empty. Its bytes are in the
+//! `com.apple.decmpfs` attribute after a 16-byte header, or, for the types that
+//! do not fit there, in the file's resource fork (an attribute of its own on
+//! APFS, `com.apple.ResourceFork`). Both filesystems keep the same attribute
+//! and the same fork, so one decoder serves `formats/hfsplus` and
+//! `formats/apfs`.
+//!
+//! The header is little-endian: `cmpf`, the type, the uncompressed size. The
+//! types and their layouts are the ones libarchive (zlib) and apfs-fuse
+//! (the rest) read; Apple documents type 1 only.
+//!
+//! ```text
+//! type  codec   payload
+//!    1  none    attribute, as is
+//!    3  zlib    attribute (a first byte of 0xFF marks stored bytes)
+//!    7  LZVN    attribute (a first byte of 0x06 marks stored bytes)
+//!    9  none    attribute, behind a 0xCC byte
+//!   11  LZFSE   attribute
+//!    4  zlib    resource fork: a table of (offset, length) per block
+//!    8  LZVN    resource fork: a table of block offsets
+//!   10  none    resource fork: as 8, a marker byte before each block
+//!   12  LZFSE   resource fork: as 8
+//! ```
+//!
+//! A file is cut in blocks of 64 KiB, each coded alone. Types 13 and 14
+//! (LZBITMAP) and the dataless types, whose content is not on the volume,
+//! are reported.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use super::vol::{Got, be32, le32, le64};
+
+/// The attribute holding the header, and on APFS the one holding the fork.
+pub(crate) const ATTR: &str = "com.apple.decmpfs";
+pub(crate) const RESOURCE_FORK_ATTR: &str = "com.apple.ResourceFork";
+
+/// The file flag (`UF_COMPRESSED`) that marks a compressed file. macOS reads
+/// the attribute only where it is set, so it decides here too.
+pub(crate) const COMPRESSED_FLAG: u32 = 0x20;
+
+const MAGIC: u32 = 0x636d_7066; // "cmpf"
+const HEADER: usize = 16;
+const BLOCK: usize = 0x1_0000;
+
+/// The header of a `com.apple.decmpfs` attribute.
+pub(crate) struct Header {
+    pub(crate) kind: u32,
+    /// The size of the file once decompressed.
+    pub(crate) size: u64,
+}
+
+pub(crate) fn header(attr: &[u8]) -> Option<Header> {
+    (attr.len() >= HEADER && le32(attr, 0) == MAGIC).then(|| Header {
+        kind: le32(attr, 4),
+        size: le64(attr, 8),
+    })
+}
+
+/// Whether a type keeps its bytes in the resource fork.
+pub(crate) fn in_fork(kind: u32) -> bool {
+    matches!(kind, 4 | 8 | 10 | 12 | 14)
+}
+
+/// The bytes of the file `attr` describes, at most `cap` of them. `fork` is
+/// its resource fork, wanted by the types that keep their bytes there.
+pub(crate) fn unpack(attr: &[u8], fork: Option<&[u8]>, cap: u64) -> Got<'static> {
+    let Some(h) = header(attr) else {
+        return Got::Why("compressed file (decmpfs) with a damaged attribute");
+    };
+    if h.size > cap {
+        return Got::Big(h.size);
+    }
+    let size = crate::bytes::to_usize(h.size);
+    let payload = attr.get(HEADER..).unwrap_or_default();
+    if in_fork(h.kind) && fork.is_none() {
+        return Got::Why("compressed file (decmpfs) whose resource fork is missing");
+    }
+    let fork = fork.unwrap_or_default();
+    let out = match h.kind {
+        1 => Some(payload.to_vec()),
+        3 => zlib(payload, size),
+        7 => lzvn(payload, size),
+        9 => stored(payload, 0xCC),
+        11 => lzfse(payload, size),
+        4 => zlib_fork(fork, size),
+        8 | 10 | 12 => offset_fork(h.kind, fork, size),
+        _ => return Got::Why("compressed file (decmpfs) of a type exav does not read"),
+    };
+    match out {
+        Some(bytes) if bytes.len() == size => Got::Whole(bytes),
+        _ => Got::Why("compressed file (decmpfs) that did not decompress"),
+    }
+}
+
+fn blocks(size: usize) -> usize {
+    size.div_ceil(BLOCK)
+}
+
+/// The uncompressed length of block `k`, short only for the last.
+fn block_len(size: usize, k: usize) -> usize {
+    size.saturating_sub(k.saturating_mul(BLOCK)).min(BLOCK)
+}
+
+/// A block's coded bytes, none longer than a stored block (a marker and 64 KiB).
+fn slice(fork: &[u8], start: usize, len: usize) -> Option<&[u8]> {
+    if len > BLOCK.saturating_add(1) {
+        return None;
+    }
+    crate::bytes::at(fork, start, len)
+}
+
+/// Type 4: zlib blocks. The fork opens with the big-endian offset of its
+/// resource data, which opens with a block count and a table of
+/// (offset, length) pairs, both little-endian and from the count's place.
+fn zlib_fork(fork: &[u8], size: usize) -> Option<Vec<u8>> {
+    let table = crate::bytes::to_usize(u64::from(be32(fork, 0))).checked_add(4)?;
+    let count = crate::bytes::to_usize(u64::from(le32(fork, table)));
+    if count != blocks(size) {
+        return None;
+    }
+    let mut out = Vec::with_capacity(crate::cap_prealloc(size));
+    for k in 0..count {
+        let entry = table.checked_add(4)?.checked_add(k.checked_mul(8)?)?;
+        let at = crate::bytes::to_usize(u64::from(le32(fork, entry)));
+        let len = crate::bytes::to_usize(u64::from(le32(fork, entry.checked_add(4)?)));
+        let block = slice(fork, table.checked_add(at)?, len)?;
+        out.extend_from_slice(&zlib(block, block_len(size, k))?);
+    }
+    Some(out)
+}
+
+/// Types 8, 10 and 12: the fork opens with the offsets of its blocks, one more
+/// than there are blocks, each block running to the next offset.
+fn offset_fork(kind: u32, fork: &[u8], size: usize) -> Option<Vec<u8>> {
+    let mut out = Vec::with_capacity(crate::cap_prealloc(size));
+    for k in 0..blocks(size) {
+        let at = k.checked_mul(4)?;
+        let start = crate::bytes::to_usize(u64::from(le32(fork, at)));
+        let end = crate::bytes::to_usize(u64::from(le32(fork, at.checked_add(4)?)));
+        let block = slice(fork, start, end.checked_sub(start)?)?;
+        let want = block_len(size, k);
+        out.extend_from_slice(&match kind {
+            8 => lzvn(block, want)?,
+            10 => block.get(1..)?.to_vec(),
+            _ => lzfse(block, want)?,
+        });
+    }
+    Some(out)
+}
+
+/// zlib, or stored bytes behind a first byte whose low nibble is 0xF, which
+/// no zlib stream opens with.
+fn zlib(data: &[u8], size: usize) -> Option<Vec<u8>> {
+    if data.first()? & 0x0f == 0x0f {
+        return Some(data.get(1..)?.to_vec());
+    }
+    let s = crate::salvage(crate::inflate::zlib_body(data)?, size as u64);
+    (!s.over_cap).then_some(s.data)
+}
+
+/// LZVN, or stored bytes behind 0x06, which is the end opcode and so opens no
+/// coded block.
+fn lzvn(data: &[u8], size: usize) -> Option<Vec<u8>> {
+    if *data.first()? == 0x06 {
+        return Some(data.get(1..)?.to_vec());
+    }
+    let s = super::lzfse::decode_lzvn(data, size as u64);
+    (!s.over_cap && !s.undecoded && !s.cut_short).then_some(s.data)
+}
+
+fn lzfse(data: &[u8], size: usize) -> Option<Vec<u8>> {
+    let s = super::lzfse::decode(data, size as u64);
+    (!s.over_cap && !s.undecoded && !s.cut_short).then_some(s.data)
+}
+
+fn stored(data: &[u8], marker: u8) -> Option<Vec<u8>> {
+    (*data.first()? == marker).then(|| data[1..].to_vec())
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
+    use std::io::Write;
+
+    fn attr(kind: u32, size: usize, payload: &[u8]) -> Vec<u8> {
+        let mut a = b"fpmc".to_vec();
+        a.extend_from_slice(&kind.to_le_bytes());
+        a.extend_from_slice(&(size as u64).to_le_bytes());
+        a.extend_from_slice(payload);
+        a
+    }
+
+    fn deflated(data: &[u8]) -> Vec<u8> {
+        let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+        z.write_all(data).unwrap();
+        z.finish().unwrap()
+    }
+
+    fn lzfsed(data: &[u8]) -> Vec<u8> {
+        let mut enc = Vec::new();
+        lzfse_rust::encode_bytes(data, &mut enc).unwrap();
+        enc
+    }
+
+    /// `data` as LZVN literals and the end opcode, built without the decoder.
+    fn lzvned(data: &[u8]) -> Vec<u8> {
+        let mut p = Vec::new();
+        for c in data.chunks(271) {
+            match c.len() {
+                1..=15 => p.push(0xe0 | c.len() as u8),
+                n => p.extend_from_slice(&[0xe0, (n - 16) as u8]),
+            }
+            p.extend_from_slice(c);
+        }
+        p.extend_from_slice(&[6, 0, 0, 0, 0, 0, 0, 0]);
+        p
+    }
+
+    fn text(n: usize) -> Vec<u8> {
+        (0..n)
+            .map(|i| b"the quick brown fox "[i % 20] ^ (i / 997) as u8 & 3)
+            .collect()
+    }
+
+    fn bytes(u: Got) -> Vec<u8> {
+        match u {
+            Got::Whole(b) => b,
+            Got::Why(why) => panic!("{why}"),
+            _ => panic!("not whole"),
+        }
+    }
+
+    fn why(u: Got) -> &'static str {
+        match u {
+            Got::Why(why) => why,
+            Got::Big(_) => "over",
+            _ => "bytes",
+        }
+    }
+
+    #[test]
+    fn the_attribute_types_decode() {
+        let data = text(3000);
+        for (kind, payload) in [
+            (1, data.clone()),
+            (3, deflated(&data)),
+            (3, [&[0xff][..], &data].concat()),
+            (7, lzvned(&data)),
+            (7, [&[0x06][..], &data].concat()),
+            (9, [&[0xcc][..], &data].concat()),
+            (11, lzfsed(&data)),
+        ] {
+            let a = attr(kind, data.len(), &payload);
+            assert_eq!(bytes(unpack(&a, None, 1 << 20)), data, "type {kind}");
+        }
+    }
+
+    #[test]
+    fn the_fork_types_decode_over_several_blocks() {
+        // Two blocks, the second short.
+        let data = text(70_000);
+        let (a, b) = data.split_at(BLOCK);
+
+        // Type 4: the fork's header says where the table is (here 0x100).
+        let blocks = [deflated(a), deflated(b)];
+        let mut fork = vec![0u8; 0x104];
+        fork[..4].copy_from_slice(&0x100u32.to_be_bytes());
+        fork.extend_from_slice(&2u32.to_le_bytes());
+        let mut at = 4 + 2 * 8;
+        for blk in &blocks {
+            fork.extend_from_slice(&(at as u32).to_le_bytes());
+            fork.extend_from_slice(&(blk.len() as u32).to_le_bytes());
+            at += blk.len();
+        }
+        for blk in &blocks {
+            fork.extend_from_slice(blk);
+        }
+        let got = unpack(&attr(4, data.len(), &[]), Some(&fork), 1 << 20);
+        assert_eq!(bytes(got), data, "type 4");
+
+        // Types 8, 10, 12: offsets, then the blocks. (A block of literals
+        // alone would be longer than a block; the first is stored instead.)
+        for (kind, enc) in [
+            (8, [[&[0x06][..], a].concat(), lzvned(b)]),
+            (10, [[&[0][..], a].concat(), [&[0][..], b].concat()]),
+            (12, [lzfsed(a), lzfsed(b)]),
+        ] {
+            let mut fork = Vec::new();
+            let mut at = 12;
+            for blk in &enc {
+                fork.extend_from_slice(&(at as u32).to_le_bytes());
+                at += blk.len();
+            }
+            fork.extend_from_slice(&(at as u32).to_le_bytes());
+            for blk in &enc {
+                fork.extend_from_slice(blk);
+            }
+            let got = unpack(&attr(kind, data.len(), &[]), Some(&fork), 1 << 20);
+            assert_eq!(bytes(got), data, "type {kind}");
+        }
+    }
+
+    #[test]
+    fn what_cannot_be_decoded_is_reported_not_guessed() {
+        let data = text(100);
+        let z = deflated(&data);
+
+        // Over the cap, before anything is decoded.
+        let a = attr(3, data.len(), &z);
+        assert!(matches!(unpack(&a, None, 99), Got::Big(100)));
+        assert!(matches!(unpack(&a, None, 100), Got::Whole(_)));
+
+        // A size the stream does not give, either way.
+        for size in [99, 101] {
+            let a = attr(3, size, &z);
+            assert!(
+                why(unpack(&a, None, 1 << 20)).contains("did not decompress"),
+                "size {size}"
+            );
+        }
+        // A cut stream, a wrong marker, a missing fork, a type not read.
+        let cut = attr(3, data.len(), &z[..z.len() / 2]);
+        assert!(why(unpack(&cut, None, 1 << 20)).contains("did not decompress"));
+        let marker = attr(9, 3, &[0xcd, 1, 2, 3]);
+        assert!(why(unpack(&marker, None, 1 << 20)).contains("did not decompress"));
+        let no_fork = attr(8, 10, &[]);
+        assert!(why(unpack(&no_fork, None, 1 << 20)).contains("resource fork is missing"));
+        for kind in [13, 14, 0x8000_0001, 99] {
+            let a = attr(kind, 10, &[]);
+            let fork = [0u8; 64];
+            assert!(
+                why(unpack(&a, Some(&fork), 1 << 20)).contains("type exav does not read"),
+                "type {kind}"
+            );
+        }
+        // Not the header.
+        assert!(why(unpack(b"cmpf", None, 1 << 20)).contains("damaged"));
+        let mut a = attr(1, 3, b"abc");
+        a[0] = b'x';
+        assert!(why(unpack(&a, None, 1 << 20)).contains("damaged"));
+    }
+
+    #[test]
+    fn a_table_that_points_outside_the_fork_is_damage_not_a_panic() {
+        let data = text(70_000);
+        for kind in [4, 8, 10, 12] {
+            for fork in [
+                vec![],
+                vec![0xff; 40],
+                0x100u32.to_be_bytes().to_vec(),
+                [0u8; 300].to_vec(),
+                u32::MAX.to_le_bytes().repeat(40),
+            ] {
+                let got = unpack(&attr(kind, data.len(), &[]), Some(&fork), 1 << 20);
+                assert!(
+                    why(got).contains("did not decompress"),
+                    "type {kind}, fork of {} bytes",
+                    fork.len()
+                );
+            }
+        }
+    }
+}
diff --git a/crates/exav-unpack/src/formats/dmg.rs b/crates/exav-unpack/src/formats/dmg.rs
index 508792e3..e154f1a0 100644
--- a/crates/exav-unpack/src/formats/dmg.rs
+++ b/crates/exav-unpack/src/formats/dmg.rs
@@ -5,6 +5,7 @@
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
+use super::volumes;
 use crate::source::{ByteSource, Reader};
 use crate::*;
 use std::io::{Cursor, Read, Seek, SeekFrom};
@@ -185,7 +186,7 @@ fn decrypt_keyblob(
     header: &EncryptedDmgHeader,
     derived_key: &[u8; 24],
 ) -> Result<Vec<u8>, LimitHit> {
-    use cbc::cipher::{block_padding::NoPadding, BlockModeDecrypt, KeyIvInit};
+    use cbc::cipher::{BlockModeDecrypt, KeyIvInit, block_padding::NoPadding};
 
     let iv_len = header.blob_enc_iv_size as usize;
     let mut iv = [0u8; 8];
@@ -233,7 +234,11 @@ fn compute_chunk_iv(hmac_key: &[u8], chunk_no: u32) -> [u8; 16] {
 /// Decrypt the encrypted DMG data using the given password.
 /// Returns the decrypted raw disk image, or None if the password is wrong.
 #[cfg(feature = "decrypt")]
-fn try_decrypt_dmg(data: &[u8], password: &str) -> Result<Vec<u8>, LimitHit> {
+fn try_decrypt_dmg(
+    data: &[u8],
+    password: &str,
+    spent: &std::sync::atomic::AtomicU64,
+) -> Result<Vec<u8>, LimitHit> {
     let header = parse_encrypted_header(data)?;
 
     if header.version != 2 {
@@ -254,6 +259,16 @@ fn try_decrypt_dmg(data: &[u8], password: &str) -> Result<Vec<u8>, LimitHit> {
 
     let hmac_key_bytes = header.hmac_key_bits as usize / 8;
 
+    // The iteration count is the file's, up to 2^32: the scan has a bound on
+    // what it spends on them, over every password and every image
+    // ([`crate::kdf`]). A count of 0 is read as 1000 below.
+    let iterations = u64::from(header.kdf_iteration_count).max(1000);
+    if !crate::kdf::charge(spent, iterations, crate::kdf::PBKDF2_MAX_ROUNDS) {
+        return Err(LimitHit::new(
+            "encrypted DMG: key derivation past the scan's bound".into(),
+        ));
+    }
+
     // Derive key from password.
     let derived_key = derive_key_dmg(
         password.as_bytes(),
@@ -308,7 +323,7 @@ fn try_decrypt_dmg(data: &[u8], password: &str) -> Result<Vec<u8>, LimitHit> {
         let iv = compute_chunk_iv(hmac_key, chunk_no as u32);
 
         // AES-CBC decrypt.
-        use cbc::cipher::{block_padding::NoPadding, BlockModeDecrypt, KeyIvInit};
+        use cbc::cipher::{BlockModeDecrypt, KeyIvInit, block_padding::NoPadding};
         type Aes128Cbc = cbc::Decryptor<aes::Aes128>;
         type Aes256Cbc = cbc::Decryptor<aes::Aes256>;
 
@@ -324,7 +339,7 @@ fn try_decrypt_dmg(data: &[u8], password: &str) -> Result<Vec<u8>, LimitHit> {
                 Err(_) => {
                     return Err(LimitHit::corrupt(
                         "AES-128 decryption failed (wrong password?)".into(),
-                    ))
+                    ));
                 }
             }
         } else {
@@ -336,7 +351,7 @@ fn try_decrypt_dmg(data: &[u8], password: &str) -> Result<Vec<u8>, LimitHit> {
                 Err(_) => {
                     return Err(LimitHit::corrupt(
                         "AES-256 decryption failed (wrong password?)".into(),
-                    ))
+                    ));
                 }
             }
         }
@@ -355,22 +370,19 @@ pub(crate) fn walk<T>(
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
     budget.count_entry()?;
-    let mut emit =
-        |entry: Entry, budget: &mut Budget| crate::stream::emit_entry(entry, budget, &mut *visit);
     if src.window(0, 8)[..] != ENCRCDSA_SIG[..] {
-        return walk_disk(Reader::new(src), budget, &mut emit);
+        return walk_disk(Reader::new(src), budget, visit);
     }
     match decrypt_image(src, budget)? {
-        Ok(disk) => walk_disk(Cursor::new(disk), budget, &mut emit),
-        Err(reason) => emit(
+        Ok(disk) => walk_disk(Cursor::new(disk), budget, visit),
+        Err(reason) => crate::stream::emit_entry(
             Entry::unsupported("encrypted.dmg".to_string(), src.len() as u64, true, reason),
             budget,
+            visit,
         ),
     }
 }
 
-type Emit<'a, T> = &'a mut dyn FnMut(Entry, &mut Budget) -> Result<Option<T>, LimitHit>;
-
 /// The decrypted image of an encrypted DMG, or why it was not decrypted.
 /// Decryption takes the whole image.
 fn decrypt_image(
@@ -389,7 +401,7 @@ fn decrypt_image(
         }
         let data = crate::stream::read_whole(Format::Dmg, src, budget)?;
         for pw in &budget.passwords {
-            let Ok(decrypted) = try_decrypt_dmg(&data, pw) else {
+            let Ok(decrypted) = try_decrypt_dmg(&data, pw, &budget.kdf_rounds) else {
                 continue;
             };
             // A right password gives a koly trailer or a filesystem.
@@ -419,23 +431,20 @@ fn decrypt_image(
 fn walk_disk<D: Read + Seek, T>(
     disk: D,
     budget: &mut Budget,
-    emit: Emit<T>,
+    visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
     let disk = super::udif::disk(disk)?;
     let damaged = disk.damage();
-    let found = walk_fs(disk, budget, emit)?;
+    let found = walk_fs(disk, budget, &mut *visit)?;
     if found.is_some() || !damaged.load(std::sync::atomic::Ordering::Relaxed) {
         return Ok(found);
     }
-    budget.count_entry()?;
-    emit(
-        Entry::unsupported(
-            "dmg-disk".to_string(),
-            0,
-            false,
-            "DMG run failed to decode part way; the bytes before the failure were scanned",
-        ),
+    volumes::report(
+        "dmg-disk",
+        0,
+        "DMG run failed to decode part way; the bytes before the failure were scanned",
         budget,
+        visit,
     )
 }
 
@@ -443,7 +452,7 @@ fn walk_disk<D: Read + Seek, T>(
 fn walk_fs<D: Read + Seek, T>(
     mut disk: super::udif::Disk<D>,
     budget: &mut Budget,
-    emit: Emit<T>,
+    visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
     // Both filesystems are looked for in the first 64 KiB, as `is_dmg` does.
     let mut head = Vec::new();
@@ -453,56 +462,16 @@ fn walk_fs<D: Read + Seek, T>(
 
     if let Some(nxsb_off) = find_apfs_offset(&head) {
         let part = Part::new(disk, nxsb_off.saturating_sub(32) as u64)?;
-        let mut vol = apfs::ApfsVolume::open(part)
-            .map_err(|e| LimitHit::corrupt(format!("apfs open: {e}")))?;
-        let walk = vol
-            .walk()
-            .map_err(|e| LimitHit::corrupt(format!("apfs walk: {e}")))?;
-        for we in walk {
-            if we.entry.kind != apfs::EntryKind::File {
-                continue;
-            }
-            let hit = read_file(we.path, budget, emit, |path, out| {
-                vol.read_file_to(path, out).map(|_| ())
-            })?;
-            if hit.is_some() {
-                return Ok(hit);
-            }
-        }
-        return Ok(None);
+        return volumes::entries(budget, visit, "", |budget, sink| {
+            super::apfs::walk_volume(part, budget, sink)
+        });
     }
 
     if let Some(hfs_off) = find_hfs_offset(&head) {
         let part = Part::new(disk, hfs_off.saturating_sub(1024) as u64)?;
-        let mut vol = hfsplus::HfsVolume::open(part)
-            .map_err(|e| LimitHit::corrupt(format!("hfs+ open: {e}")))?;
-        let walk = vol
-            .walk()
-            .map_err(|e| LimitHit::corrupt(format!("hfs+ walk: {e}")))?;
-        for we in walk {
-            if we.entry.kind != hfsplus::EntryKind::File {
-                continue;
-            }
-            // Only the data fork is read. A resource fork is content too, and
-            // where macOS compressed a file (decmpfs) it holds the file's
-            // bytes while the data fork is empty: reported, not scanned as
-            // empty.
-            if vol.stat(&we.path).is_ok_and(|s| s.resource_fork_size > 0) {
-                budget.count_entry()?;
-                let e = Entry::unsupported(we.path, 0, false, "HFS+ resource fork not read");
-                if let Some(t) = emit(e, budget)? {
-                    return Ok(Some(t));
-                }
-                continue;
-            }
-            let hit = read_file(we.path, budget, emit, |path, out| {
-                vol.read_file_to(path, out).map(|_| ())
-            })?;
-            if hit.is_some() {
-                return Ok(hit);
-            }
-        }
-        return Ok(None);
+        return volumes::entries(budget, visit, "", |budget, sink| {
+            super::hfsplus::walk_volume(part, budget, sink)
+        });
     }
 
     Err(LimitHit::corrupt(
@@ -510,62 +479,6 @@ fn walk_fs<D: Read + Seek, T>(
     ))
 }
 
-/// Read one file, bounded by the peak-buffer limit, and emit it. The
-/// filesystem crates hand a file over whole.
-fn read_file<T, E>(
-    path: String,
-    budget: &mut Budget,
-    emit: Emit<T>,
-    read: impl FnOnce(&str, &mut Capped) -> Result<(), E>,
-) -> Result<Option<T>, LimitHit> {
-    budget.count_entry()?;
-    let mut out = Capped {
-        data: Vec::new(),
-        cap: budget.reserve()?,
-        over: false,
-    };
-    let read = read(&path, &mut out);
-    if out.over {
-        return Err(LimitHit::new(format!("DMG file '{path}' exceeds budget")));
-    }
-    if read.is_err() {
-        // Its bytes are in the image and were not all read: reported, not
-        // dropped, and those read before the failure scanned.
-        budget.commit(out.data.len() as u64);
-        return emit(
-            Entry {
-                unsupported: Some("DMG file could not be read"),
-                ..Entry::new(path, out.data)
-            },
-            budget,
-        );
-    }
-    budget.commit(out.data.len() as u64);
-    emit(Entry::new(path, out.data), budget)
-}
-
-/// A `Write` that refuses to grow past `cap`.
-struct Capped {
-    data: Vec<u8>,
-    cap: u64,
-    over: bool,
-}
-
-impl std::io::Write for Capped {
-    fn write(&mut self, b: &[u8]) -> std::io::Result<usize> {
-        if (self.data.len() as u64).saturating_add(b.len() as u64) > self.cap {
-            self.over = true;
-            return Err(std::io::Error::other("over the buffer limit"));
-        }
-        self.data.extend_from_slice(b);
-        Ok(b.len())
-    }
-
-    fn flush(&mut self) -> std::io::Result<()> {
-        Ok(())
-    }
-}
-
 /// The disk from `start` on, where a filesystem begins.
 struct Part<D> {
     disk: D,
@@ -701,10 +614,40 @@ mod tests {
         put32(&mut h, 104, 1); // kdf iterations
         put32(&mut h, 196, 64); // keyblob size
         h.resize(8192, 0);
-        let out = try_decrypt_dmg(&h, "any").expect("the walk ends with nothing decrypted");
+        let spent = std::sync::atomic::AtomicU64::new(0);
+        let out = try_decrypt_dmg(&h, "any", &spent).expect("the walk ends with nothing decrypted");
         assert!(out.is_empty());
     }
 
+    /// The iteration count is the file's (a `u32`); 264 bytes with u32::MAX took
+    /// 9 minutes of PBKDF2 to refuse every password. A count past what a scan
+    /// may spend is not derived, whatever the passwords.
+    #[cfg(feature = "decrypt")]
+    #[test]
+    fn an_iteration_count_past_the_scans_bound_is_not_derived() {
+        let mut h = vec![0u8; 264];
+        h[..8].copy_from_slice(b"encrcdsa");
+        let put32 =
+            |h: &mut Vec<u8>, at: usize, v: u32| h[at..at + 4].copy_from_slice(&v.to_be_bytes());
+        put32(&mut h, 8, 2);
+        put32(&mut h, 24, 128);
+        put32(&mut h, 32, 160);
+        put32(&mut h, 52, 4096);
+        put32(&mut h, 104, u32::MAX);
+        put32(&mut h, 196, 64);
+        let spent = std::sync::atomic::AtomicU64::new(0);
+        let start = std::time::Instant::now();
+        for password in ["a", "b", "c"] {
+            assert!(try_decrypt_dmg(&h, password, &spent).is_err());
+        }
+        assert!(start.elapsed() < std::time::Duration::from_millis(500));
+        assert_eq!(spent.load(std::sync::atomic::Ordering::Relaxed), 0);
+        // What a header written by Disk Utility asks for is derived, and counted.
+        put32(&mut h, 104, 1000);
+        let _ = try_decrypt_dmg(&h, "a", &spent);
+        assert_eq!(spent.load(std::sync::atomic::Ordering::Relaxed), 1000);
+    }
+
     /// Write a well-formed HFS+ volume header at `off`.
     fn put_hfs(buf: &mut [u8], off: usize) {
         buf[off] = 0x48;
diff --git a/crates/exav-unpack/src/formats/dwg/extract.rs b/crates/exav-unpack/src/formats/dwg/extract.rs
index da001111..b4846e97 100644
--- a/crates/exav-unpack/src/formats/dwg/extract.rs
+++ b/crates/exav-unpack/src/formats/dwg/extract.rs
@@ -5,7 +5,7 @@
 //! applications its proxy and custom objects demand, for signatures and
 //! heuristics to match.
 
-use super::{file, BitError, BitResult, Dwg, Error, PreviewKind, Version};
+use super::{BitError, BitResult, Dwg, Error, PreviewKind, Version, file};
 use crate::*;
 
 /// The compound file signature (MS-CFB 2.2).
@@ -219,10 +219,10 @@ fn from_objects<R>(
                 None if bytes.is_empty() => None,
                 None => Some((format!("{label}.bin"), bytes)),
             };
-            if let Some((name, bytes)) = member {
-                if let Some(r) = emit(name, bytes, budget, visit)? {
-                    return Ok(Some(r));
-                }
+            if let Some((name, bytes)) = member
+                && let Some(r) = emit(name, bytes, budget, visit)?
+            {
+                return Ok(Some(r));
             }
         } else if t == VBA_PROJECT
             || (t >= 500 && dwg.class(t).is_some_and(|c| c.name() == "VBA_PROJECT"))
@@ -233,10 +233,9 @@ fn from_objects<R>(
             if let Some((name, bytes)) = dwg
                 .object_bytes(offset)
                 .and_then(|b| vba_member(format!("vbaproject-{handle:X}.ole"), b))
+                && let Some(r) = emit(name, bytes, budget, visit)?
             {
-                if let Some(r) = emit(name, bytes, budget, visit)? {
-                    return Ok(Some(r));
-                }
+                return Ok(Some(r));
             }
         }
         meta.note_xref(&dwg, t, offset);
@@ -246,15 +245,14 @@ fn from_objects<R>(
     if let Some((name, bytes)) = dwg
         .vba_project()
         .and_then(|b| vba_member("vbaproject.ole".to_string(), b))
+        && let Some(r) = emit(name, bytes, budget, visit)?
     {
-        if let Some(r) = emit(name, bytes, budget, visit)? {
-            return Ok(Some(r));
-        }
+        return Ok(Some(r));
     }
-    if let Some(bytes) = meta.finish() {
-        if let Some(r) = emit("dwg-metadata".to_string(), bytes, budget, visit)? {
-            return Ok(Some(r));
-        }
+    if let Some(bytes) = meta.finish()
+        && let Some(r) = emit("dwg-metadata".to_string(), bytes, budget, visit)?
+    {
+        return Ok(Some(r));
     }
     Ok(None)
 }
@@ -300,12 +298,11 @@ impl Metadata {
         if t != BLOCK_HEADER {
             return;
         }
-        if let Ok(mut o) = dwg.object_at(offset) {
-            if let Some(path) = block_xref_path(&mut o, dwg.version()) {
-                if !path.is_empty() {
-                    self.lines.push(format!("xref: {path}"));
-                }
-            }
+        if let Ok(mut o) = dwg.object_at(offset)
+            && let Some(path) = block_xref_path(&mut o, dwg.version())
+            && !path.is_empty()
+        {
+            self.lines.push(format!("xref: {path}"));
         }
     }
 
diff --git a/crates/exav-unpack/src/formats/dwg/file.rs b/crates/exav-unpack/src/formats/dwg/file.rs
index 659c4732..3ae15f2a 100644
--- a/crates/exav-unpack/src/formats/dwg/file.rs
+++ b/crates/exav-unpack/src/formats/dwg/file.rs
@@ -7,9 +7,9 @@
 use std::borrow::Cow;
 
 use super::bits::{BitError, Bits};
-use super::object::{split_strings, HeaderStreams, Object, Text};
-use super::{r2004, r2007};
+use super::object::{HeaderStreams, Object, Text, split_strings};
 use super::{Error, Version};
+use super::{r2004, r2007};
 
 /// The named sections of an R2004 to R2018 file: R2007's container (spec
 /// 5) or the others' (spec 4).
diff --git a/crates/exav-unpack/src/formats/dwg/mod.rs b/crates/exav-unpack/src/formats/dwg/mod.rs
index eb7f8ee6..c18acb93 100644
--- a/crates/exav-unpack/src/formats/dwg/mod.rs
+++ b/crates/exav-unpack/src/formats/dwg/mod.rs
@@ -41,7 +41,7 @@ pub use bits::{BitError, BitResult, Bits, HandleRef};
 pub use extract::bmp_file;
 pub(crate) use extract::extract_dwg;
 pub use file::{
-    preview, trim_zeros, Class, Dwg, Locator, PreviewImage, PreviewKind, DEFAULT_MAX_BYTES,
+    Class, DEFAULT_MAX_BYTES, Dwg, Locator, PreviewImage, PreviewKind, preview, trim_zeros,
 };
 pub use object::{Eed, EedValue, EntityColor, EntityCommon, HeaderStreams, Object, Text};
 
diff --git a/crates/exav-unpack/src/formats/dwg/object.rs b/crates/exav-unpack/src/formats/dwg/object.rs
index 1d79895d..a9c3e3b8 100644
--- a/crates/exav-unpack/src/formats/dwg/object.rs
+++ b/crates/exav-unpack/src/formats/dwg/object.rs
@@ -3,9 +3,9 @@
 //! from: the data before the handles, from R2007 the strings after the data,
 //! and the handles.
 
+use super::Version;
 use super::bits::{BitError, BitResult, Bits, HandleRef};
 use super::file::Dwg;
-use super::Version;
 
 /// A TV string as stored (spec 2): bytes in the drawing's code page to
 /// R2004, UTF-16 from R2007.
diff --git a/crates/exav-unpack/src/formats/dwg/r2004.rs b/crates/exav-unpack/src/formats/dwg/r2004.rs
index ae486e40..f27e7288 100644
--- a/crates/exav-unpack/src/formats/dwg/r2004.rs
+++ b/crates/exav-unpack/src/formats/dwg/r2004.rs
@@ -175,14 +175,18 @@ pub(super) fn decompress(src: &[u8], limit: usize) -> Result<Vec<u8>, Inflate> {
         let op = byte(&mut i)?;
         let (count, offset, lits) = match op {
             0x11 => break,
-            0x10 | 0x12..=0x1F => {
-                let count = if op == 0x10 {
+            0x10..=0x1F => {
+                // As in LZO1X, bit 3 is a distance past 32 KiB (its high
+                // bit, 0x4000) and the length is the low three bits: only
+                // the section map of a large file is long enough to need it.
+                let low = usize::from(op & 7);
+                let count = if low == 0 {
                     long_count(&mut i)? + 9
                 } else {
-                    usize::from(op & 0x0F) + 2
+                    low + 2
                 };
                 let (offset, lits) = two_byte(&mut i)?;
-                (count, offset + 0x3FFF, lits)
+                (count, offset + 0x3FFF + (usize::from(op & 8) << 11), lits)
             }
             0x20..=0x3F => {
                 let count = if op == 0x20 {
@@ -631,6 +635,32 @@ mod tests {
         );
     }
 
+    #[test]
+    fn a_copy_from_more_than_32_kib_back_sets_bit_3_of_its_opcode() {
+        // 40000 literals: 0x00, then 156 zeros (each 0xFF more), then 202.
+        let mut src = vec![0x00];
+        src.extend_from_slice(&[0x00; 156]);
+        src.push(202);
+        let lits: Vec<u8> = (0..40_000u32).map(|i| (i % 251) as u8).collect();
+        src.extend_from_slice(&lits);
+        // 0x1D: bit 3 set, low bits 5: 5 + 2 = 7 bytes, from
+        // (233 + 0x3FFF + 0x4000) + 1 = 33001 back; the low bits of the
+        // offset's first byte say one literal follows.
+        src.extend_from_slice(&[0x1D, (41 << 2) | 1, 3, 0xEE, 0x11]);
+        let out = decompress(&src, 50_000).unwrap();
+        assert_eq!(out.len(), 40_008);
+        assert_eq!(out[..40_000], lits[..]);
+        assert_eq!(out[40_000..40_007], lits[6999..7006]);
+        assert_eq!(out[40_007], 0xEE);
+        // Bit 3 with no length bits: the length follows, as it does for 0x10.
+        let mut longer = src[..src.len() - 5].to_vec();
+        longer.extend_from_slice(&[0x18, 0x00, 11, (41 << 2) | 1, 3, 0xEE, 0x11]);
+        let out = decompress(&longer, 50_000).unwrap();
+        // 255 + 11 + 9 = 275 bytes from 33001 back.
+        assert_eq!(out.len(), 40_000 + 275 + 1);
+        assert_eq!(out[40_000..40_275], lits[6999..7274]);
+    }
+
     #[test]
     fn an_overlapping_copy_repeats_its_source() {
         // Five literals, then 0x24: 0x24 - 0x1E = 6 bytes from offset 1
diff --git a/crates/exav-unpack/src/formats/dwg/r2007.rs b/crates/exav-unpack/src/formats/dwg/r2007.rs
index 51f2bc67..14b8e573 100644
--- a/crates/exav-unpack/src/formats/dwg/r2007.rs
+++ b/crates/exav-unpack/src/formats/dwg/r2007.rs
@@ -15,8 +15,8 @@
 //! checked against what the file holds, or, for decompressed data, against
 //! the byte budget the caller gives.
 
-use super::r2004::Inflate;
 use super::Error;
+use super::r2004::Inflate;
 
 /// Spec 5.13: a codeword of 255 bytes, 239 of them data in system pages,
 /// 251 in data pages.
diff --git a/crates/exav-unpack/src/formats/dxf/extract.rs b/crates/exav-unpack/src/formats/dxf/extract.rs
index 4ffea0fb..84585fc7 100644
--- a/crates/exav-unpack/src/formats/dxf/extract.rs
+++ b/crates/exav-unpack/src/formats/dxf/extract.rs
@@ -121,10 +121,10 @@ pub(crate) fn extract_dxf<R>(
         } else {
             whole_file_extension(&chunks).map(|ext| (format!("{label}.{ext}"), chunks))
         };
-        if let Some((name, bytes)) = out {
-            if let Some(r) = emit(name, bytes, budget, visit)? {
-                return Ok(Some(r));
-            }
+        if let Some((name, bytes)) = out
+            && let Some(r) = emit(name, bytes, budget, visit)?
+        {
+            return Ok(Some(r));
         }
     }
     // A pair that is not one leaves the rest of the file undecoded: whatever
diff --git a/crates/exav-unpack/src/formats/dxf/mod.rs b/crates/exav-unpack/src/formats/dxf/mod.rs
index dce111ef..9ff13ddd 100644
--- a/crates/exav-unpack/src/formats/dxf/mod.rs
+++ b/crates/exav-unpack/src/formats/dxf/mod.rs
@@ -28,7 +28,7 @@ mod parts;
 mod records;
 
 pub(crate) use extract::extract_dxf;
-pub use pairs::{Stop, Tag, Tags, Value, BINARY_SENTINEL};
+pub use pairs::{BINARY_SENTINEL, Stop, Tag, Tags, Value};
 pub use parts::Parts;
 pub use records::{Record, Records};
 
diff --git a/crates/exav-unpack/src/formats/email.rs b/crates/exav-unpack/src/formats/email.rs
index 3c94caf0..ed314a28 100644
--- a/crates/exav-unpack/src/formats/email.rs
+++ b/crates/exav-unpack/src/formats/email.rs
@@ -1,32 +1,219 @@
 #![allow(unused_imports)]
 use crate::*;
+use mail_parser::{Message, MessageParser, MessagePart, MimeHeaders, PartType};
+use std::collections::HashSet;
 use std::io::{BufReader, Cursor, Read, Seek, Write};
+use std::ops::Deref;
+
+/// Deepest chain of `message/rfc822` parts read.
+const MAX_NESTED_MESSAGES: usize = 64;
+
+/// A parsed message that is taken apart without recursion when it is dropped.
+/// A message holds the messages attached to it, and dropping a chain of them
+/// one inside the other takes a frame of the stack for each: 40,000 levels is
+/// a 1.4 MB file.
+struct Parsed<'a>(Option<Message<'a>>);
+
+impl<'a> Deref for Parsed<'a> {
+    type Target = Message<'a>;
+    fn deref(&self) -> &Message<'a> {
+        self.0.as_ref().expect("held until dropped")
+    }
+}
+
+impl Drop for Parsed<'_> {
+    fn drop(&mut self) {
+        let mut pending: Vec<Message<'_>> = self.0.take().into_iter().collect();
+        while let Some(mut msg) = pending.pop() {
+            for part in &mut msg.parts {
+                if let PartType::Message(inner) =
+                    std::mem::replace(&mut part.body, PartType::Binary(Default::default()))
+                {
+                    pending.push(inner);
+                }
+            }
+        }
+    }
+}
+
+/// A leaf of a message: its name, its part, and its bytes.
+type Leaf<'a> = (String, &'a MessagePart<'a>, &'a [u8]);
+
+/// The leaves of `msg` and of the messages attached to it, in order, named by
+/// where they are: `email-part-3` and, in the message that is part 3,
+/// `email-part-3-0`.
+fn leaves<'a>(msg: &'a Message<'_>) -> Result<Vec<Leaf<'a>>, LimitHit> {
+    let mut out = vec![];
+    // The parts being read, the name of the message they belong to, the next
+    // one to read.
+    let mut stack: Vec<(&[MessagePart<'_>], String, usize)> =
+        vec![(&msg.parts, "email-part".to_string(), 0)];
+    while let Some((parts, name, i)) = stack.pop() {
+        let Some(part) = parts.get(i) else { continue };
+        stack.push((parts, name.clone(), i + 1));
+        let leaf = format!("{name}-{i}");
+        match &part.body {
+            PartType::Text(t) | PartType::Html(t) => out.push((leaf, part, t.as_bytes())),
+            PartType::Binary(b) | PartType::InlineBinary(b) => out.push((leaf, part, b.as_ref())),
+            PartType::Message(inner) => {
+                if stack.len() > MAX_NESTED_MESSAGES {
+                    return Err(LimitHit::new(format!(
+                        "email: messages attached to messages more than {MAX_NESTED_MESSAGES} deep"
+                    )));
+                }
+                stack.push((&inner.parts, leaf, 0));
+            }
+            // The parts of a multipart are the ones after it.
+            PartType::Multipart(_) => {}
+        }
+    }
+    Ok(out)
+}
+
+/// The boundaries of the multiparts in `msg` and in the messages attached to
+/// it, outer first.
+fn boundaries(msg: &Message<'_>) -> Vec<String> {
+    let mut out = Vec::new();
+    let mut pending: Vec<&Message<'_>> = vec![msg];
+    while let Some(m) = pending.pop() {
+        for part in &m.parts {
+            if let Some(b) = part.content_type().and_then(|ct| ct.attribute("boundary")) {
+                out.push(b.to_string());
+            }
+            if let PartType::Message(inner) = &part.body {
+                pending.push(inner);
+            }
+        }
+    }
+    out
+}
+
+/// The closing delimiters a message lacks: a multipart that is cut short, or
+/// that its writer never closed, has its last part dropped by the parser, and
+/// a mail reader shows that part. Inner multiparts are closed first.
+fn missing_closings(msg: &Message<'_>, data: &[u8]) -> Vec<u8> {
+    let boundaries = boundaries(msg);
+    // One pass over the lines for all of them: a search for each boundary in
+    // turn reads the whole message once per multipart.
+    let wanted: HashSet<&[u8]> = boundaries.iter().map(String::as_bytes).collect();
+    let mut closed: HashSet<&[u8]> = HashSet::new();
+    for line in data.split(|&c| c == b'\n') {
+        if let Some(b) = line
+            .trim_ascii_end()
+            .strip_prefix(b"--")
+            .and_then(|l| l.strip_suffix(b"--"))
+            && wanted.contains(b)
+        {
+            closed.insert(b);
+        }
+    }
+    let mut out = Vec::new();
+    for b in boundaries.iter().rev() {
+        if !closed.contains(b.as_bytes()) {
+            out.extend_from_slice(format!("\r\n--{b}--\r\n").as_bytes());
+        }
+    }
+    out
+}
+
+/// The text of a base64 or quoted-printable part the parser could not decode,
+/// decoded as far as it goes: every byte outside the alphabet is skipped, as the
+/// mail readers that show such a part do.
+fn lenient_decode(part: &MessagePart<'_>) -> Option<Vec<u8>> {
+    if !part.is_encoding_problem {
+        return None;
+    }
+    let declared = part
+        .headers
+        .iter()
+        .find(|h| {
+            h.name
+                .as_str()
+                .eq_ignore_ascii_case("content-transfer-encoding")
+        })?
+        .value
+        .as_text()?
+        .trim()
+        .to_ascii_lowercase();
+    if declared != "base64" {
+        return None;
+    }
+    let raw: &[u8] = match &part.body {
+        PartType::Text(t) | PartType::Html(t) => t.as_bytes(),
+        PartType::Binary(b) | PartType::InlineBinary(b) => b.as_ref(),
+        _ => return None,
+    };
+    let mut out = Vec::with_capacity(raw.len() / 4 * 3);
+    let (mut acc, mut bits) = (0u32, 0u32);
+    for &c in raw {
+        let v = match c {
+            b'A'..=b'Z' => c - b'A',
+            b'a'..=b'z' => c - b'a' + 26,
+            b'0'..=b'9' => c - b'0' + 52,
+            b'+' | b'-' => 62,
+            b'/' | b'_' => 63,
+            _ => continue,
+        };
+        acc = (acc << 6) | u32::from(v);
+        bits += 6;
+        if bits >= 8 {
+            bits -= 8;
+            out.push((acc >> bits) as u8);
+            acc &= (1 << bits) - 1;
+        }
+    }
+    Some(out)
+}
 
 /// MIME email: emit each text/binary part (already base64/QP-decoded by the
-/// parser), so attachments and bodies are scanned.
+/// parser), so attachments and bodies are scanned, those of attached messages
+/// too.
+///
+/// Three things a mail reader shows that the parser leaves out are added: the
+/// last part of a multipart nothing closed, a base64 part with a stray byte in
+/// it (read as far as it decodes), and a file uuencoded into a text part.
 pub(crate) fn extract_email<R>(
     data: &[u8],
     budget: &mut Budget,
     visit: Sink<R>,
 ) -> Result<Option<R>, LimitHit> {
-    use mail_parser::{MessageParser, PartType};
-    let msg = MessageParser::default()
-        .parse(data)
-        .ok_or_else(|| LimitHit::new("email: parse failed".to_string()))?;
-    for (i, part) in msg.parts.iter().enumerate() {
-        let bytes: Vec<u8> = match &part.body {
-            PartType::Text(t) | PartType::Html(t) => t.as_bytes().to_vec(),
-            PartType::Binary(b) | PartType::InlineBinary(b) => b.to_vec(),
-            // Nested messages/multiparts are walked via their own parts.
-            _ => continue,
-        };
+    fn parse(bytes: &[u8]) -> Result<Message<'_>, LimitHit> {
+        MessageParser::default()
+            .parse(bytes)
+            .ok_or_else(|| LimitHit::new("email: parse failed".to_string()))
+    }
+    let first = Parsed(Some(parse(data)?));
+    let closings = missing_closings(&first, data);
+    let completed;
+    let msg = if closings.is_empty() {
+        first
+    } else {
+        completed = [data, closings.as_slice()].concat();
+        drop(first);
+        Parsed(Some(parse(&completed)?))
+    };
+    let mut entries: Vec<(String, std::borrow::Cow<'_, [u8]>)> = Vec::new();
+    for (name, part, bytes) in leaves(&msg)? {
+        if let Some(decoded) = lenient_decode(part) {
+            entries.push((format!("{name}-decoded"), decoded.into()));
+        }
+        entries.push((name, bytes.into()));
+    }
+    for (name, bytes) in entries {
         budget.count_entry()?;
         let cap = budget.reserve()?;
         if bytes.len() as u64 > cap {
             return Err(LimitHit::new("email part exceeds budget".to_string()));
         }
         budget.commit(bytes.len() as u64);
-        if let Some(r) = visit(Entry::new(format!("email-part-{i}"), bytes), budget) {
+        if let Some(r) = visit(Entry::new(name.clone(), bytes.to_vec()), budget) {
+            return Ok(Some(r));
+        }
+        // A file uuencoded into the text, as old mailers sent attachments.
+        #[cfg(feature = "uuencode")]
+        if memchr::memmem::find(&bytes, b"begin ").is_some()
+            && let Some(r) = super::uuencode::extract_uuencode(&bytes, budget, &mut *visit)?
+        {
             return Ok(Some(r));
         }
     }
diff --git a/crates/exav-unpack/src/formats/erofs.rs b/crates/exav-unpack/src/formats/erofs.rs
new file mode 100644
index 00000000..8fb36088
--- /dev/null
+++ b/crates/exav-unpack/src/formats/erofs.rs
@@ -0,0 +1,762 @@
+//! EROFS: the files of an image, read where they lie.
+//!
+//! The read-only filesystem of Android system images, container images and
+//! live media. The image is a `Read + Seek`, read where the walk goes: the
+//! superblock, the inodes of the directories and files, and their data. Only a
+//! file is ever held, bounded by the buffer limit.
+//!
+//! ```text
+//! superblock (1024 bytes in)   block size, where the inodes are, the root
+//!   inode (32 or 64 bytes)     mode, size, how the data is laid out, and
+//!                              where it is
+//!   data                       whole blocks at an address, a tail after the
+//!                              inode, or chunks each at an address
+//!   directory                  blocks of (inode number, name) entries
+//! ```
+//!
+//! An inode is addressed by its number: the 32-byte slot it begins at, from the
+//! inode area. Data stored plain, with its tail after the inode, and in chunks
+//! (with holes) is read. A file stored compressed is reported, not read, and so
+//! is a file in chunks on another device. A symbolic link or a device node holds
+//! no file's bytes and is not emitted. The checksum is not checked.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::collections::HashSet;
+use std::io::{Read, Seek};
+
+use super::vol::{
+    Attrs, Emit, Got, List, Next, Piece, Pieces, Plan, Vol, give, le16, le32, le64, read_file,
+};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, LimitHit, Mtime};
+
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
+
+/// The most a directory is, bytes.
+const MAX_DIR: u64 = 64 << 20;
+
+/// How the data of an inode is laid out.
+const FLAT_PLAIN: u16 = 0;
+const FLAT_INLINE: u16 = 2;
+const CHUNK_BASED: u16 = 4;
+
+/// The address of a chunk that is a hole.
+const NULL_ADDR: u32 = 0xFFFF_FFFF;
+/// A chunk format with an index (and a device) for each chunk.
+const CHUNK_INDEXES: u16 = 0x20;
+
+const S_IFMT: u32 = 0o170000;
+const S_IFREG: u32 = 0o100000;
+const S_IFDIR: u32 = 0o040000;
+
+/// Whether `data`, the start of an image, holds the magic of an EROFS
+/// superblock.
+pub(crate) fn is_erofs(data: &[u8]) -> bool {
+    super::sniff::is(data, crate::Format::Erofs)
+}
+
+/// What the superblock says of the image.
+struct Erofs {
+    /// Bytes in a block.
+    bs: u64,
+    /// Where the inode area begins, and the number of the root.
+    meta: u64,
+    root: u64,
+}
+
+/// An inode.
+struct Inode {
+    mode: u32,
+    size: u64,
+    layout: u16,
+    /// The union at 16: the address of the data, or the format of the chunks.
+    union: u32,
+    mtime: Option<i64>,
+    /// Where the data kept after it begins: past the inode and its attributes.
+    after: u64,
+}
+
+impl Erofs {
+    fn inode(&self, v: &mut Vol, nid: u64) -> Option<Inode> {
+        let at = self.meta.checked_add(nid.checked_mul(32)?)?;
+        let h = v.at(at, 32)?;
+        let format = le16(&h, 0);
+        // Bit 0: the longer inode. Bits 1 to 3: the layout.
+        let wide = format & 1 != 0;
+        let layout = (format >> 1) & 7;
+        let (isize, size, mtime) = if wide {
+            let ext = v.at(at.checked_add(32)?, 32)?;
+            (64u64, le64(&h, 8), Some(i64::try_from(le64(&ext, 0)).ok()?))
+        } else {
+            (32u64, u64::from(le32(&h, 8)), None)
+        };
+        // The attributes: a header of 12 bytes and 4 for each count past the first.
+        let icount = u64::from(le16(&h, 2));
+        let xattr = if icount == 0 {
+            0
+        } else {
+            icount
+                .saturating_sub(1)
+                .saturating_mul(4)
+                .saturating_add(12)
+        };
+        let len = isize.saturating_add(xattr);
+        Some(Inode {
+            mode: u32::from(le16(&h, 4)),
+            size,
+            layout,
+            union: le32(&h, 16),
+            mtime,
+            after: at.checked_add(len)?,
+        })
+    }
+
+    /// The data of `ino`: held when it is at most `cap` bytes, else read as it
+    /// goes.
+    fn data<'a>(&self, v: &'a mut Vol<'_>, ino: &Inode, cap: u64) -> Got<'a> {
+        if ino.size == 0 {
+            return Got::Whole(Vec::new());
+        }
+        let size = ino.size;
+        match ino.layout {
+            FLAT_PLAIN | FLAT_INLINE => {
+                let whole = if ino.layout == FLAT_INLINE {
+                    size.checked_div(self.bs)
+                        .unwrap_or(0)
+                        .saturating_mul(self.bs)
+                } else {
+                    size
+                };
+                let mut pieces = Vec::new();
+                // A file of less than a block has no block: no address either.
+                if whole > 0 {
+                    let Some(at) = u64::from(ino.union).checked_mul(self.bs) else {
+                        return Got::Short(Vec::new());
+                    };
+                    pieces.push(Piece::Disk(at, whole));
+                }
+                // The tail kept after the inode.
+                if whole < size {
+                    pieces.push(Piece::Disk(ino.after, size.saturating_sub(whole)));
+                }
+                let plan = List {
+                    pieces: pieces.into_iter(),
+                    intact: true,
+                };
+                read_file(v, Pieces::new(plan, size), size, cap)
+            }
+            CHUNK_BASED => match self.chunks(ino) {
+                Some(plan) => read_file(v, Pieces::new(plan, size), size, cap),
+                None => Got::Short(Vec::new()),
+            },
+            _ => Got::Why("EROFS compressed file not read"),
+        }
+    }
+
+    /// The chunks of a file that is in chunks, or `None` where its layout is
+    /// not one.
+    fn chunks(&self, ino: &Inode) -> Option<Chunks> {
+        let format = (ino.union & 0xFFFF) as u16;
+        let chunk = self
+            .bs
+            .checked_shl(u32::from(format & 0x1F))
+            .filter(|&c| c > 0 && c <= 1 << 30)?;
+        let unit: u64 = if format & CHUNK_INDEXES != 0 { 8 } else { 4 };
+        // The map follows the attributes, at a multiple of its entries' size.
+        let map = ino.after.checked_next_multiple_of(unit)?;
+        Some(Chunks {
+            map,
+            unit,
+            bs: self.bs,
+            chunk,
+            size: ino.size,
+            count: ino.size.div_ceil(chunk),
+            k: 0,
+            batch: Vec::new(),
+            batch_at: 0,
+        })
+    }
+
+    /// The entries of directory `dir`: name and inode number. The flag is
+    /// false where the directory is damaged. `left` counts the bytes of
+    /// directories the walk may still read.
+    fn entries(
+        &self,
+        v: &mut Vol,
+        dir: &Inode,
+        left: &mut u64,
+        limit: usize,
+    ) -> (Vec<(String, u64)>, bool) {
+        let mut out = Vec::new();
+        if dir.size > MAX_DIR || dir.size > *left {
+            return (out, false);
+        }
+        *left = left.saturating_sub(dir.size);
+        let bytes = match self.data(v, dir, MAX_DIR) {
+            Got::Whole(b) => b,
+            _ => return (out, false),
+        };
+        let bs = crate::bytes::to_usize(self.bs);
+        let mut intact = true;
+        for block in bytes.as_slice().chunks(bs.max(1)) {
+            intact &= dirents(block, &mut out, limit);
+            if out.len() >= limit {
+                break;
+            }
+        }
+        (out, intact)
+    }
+}
+
+/// Append the entries of a block of a directory to `out`, up to `limit` in
+/// all. False where the block is not well formed.
+fn dirents(block: &[u8], out: &mut Vec<(String, u64)>, limit: usize) -> bool {
+    // The first name begins where the entries end, which says how many there are.
+    let first = usize::from(le16(block, 8));
+    if first == 0 || !first.is_multiple_of(12) || first > block.len() {
+        return false;
+    }
+    let count = first.checked_div(12).unwrap_or(0);
+    for i in 0..count {
+        let e = i.saturating_mul(12);
+        let (nid, off) = (
+            le64(block, e),
+            usize::from(le16(block, e.saturating_add(8))),
+        );
+        // The name ends where the next begins, or, for the last, at its null
+        // or at the end of the block.
+        let end = if i.saturating_add(1) < count {
+            usize::from(le16(block, e.saturating_add(20)))
+        } else {
+            block
+                .get(off..)
+                .and_then(|r| r.iter().position(|&b| b == 0))
+                .map_or(block.len(), |n| off.saturating_add(n))
+        };
+        let Some(name) = block
+            .get(off..end)
+            .filter(|n| !n.is_empty() && off >= first)
+        else {
+            return false;
+        };
+        if name == b"." || name == b".." {
+            continue;
+        }
+        if out.len() >= limit {
+            return true;
+        }
+        out.push((String::from_utf8_lossy(name).into_owned(), nid));
+    }
+    true
+}
+
+/// The image's superblock, or `None` where it describes none that is read.
+fn open(v: &mut Vol) -> Option<Erofs> {
+    let b = v.at(1024, 128)?;
+    if !is_erofs(&[&[0u8; 1024][..], &b].concat()) {
+        return None;
+    }
+    let bits = u32::from(b[12]);
+    if !(9..=16).contains(&bits) {
+        return None;
+    }
+    let bs = 1u64.checked_shl(bits)?;
+    let meta = u64::from(le32(&b, 40)).checked_mul(bs)?;
+    let fs = Erofs {
+        bs,
+        meta,
+        root: u64::from(le16(&b, 14)),
+    };
+    // The root is a directory.
+    let root = fs.inode(v, fs.root)?;
+    (root.mode & S_IFMT == S_IFDIR).then_some(fs)
+}
+
+/// How many entries of a file's chunk map are read at once.
+const MAP_BATCH: u64 = 4096;
+
+/// The stretches of a file that is in chunks, the map read as they are wanted.
+struct Chunks {
+    /// Where the map is, and how long its entries are.
+    map: u64,
+    unit: u64,
+    bs: u64,
+    chunk: u64,
+    size: u64,
+    count: u64,
+    /// The next chunk.
+    k: u64,
+    /// Some entries of the map, from entry `batch_at`.
+    batch: Vec<u8>,
+    batch_at: u64,
+}
+
+impl Plan for Chunks {
+    fn next(&mut self, v: &mut Vol) -> Next {
+        if self.k >= self.count {
+            return Next::End;
+        }
+        let held = (self.batch.len() as u64)
+            .checked_div(self.unit)
+            .unwrap_or(0);
+        if self.k < self.batch_at || self.k >= self.batch_at.saturating_add(held) {
+            let n = self.count.saturating_sub(self.k).min(MAP_BATCH);
+            let batch = self
+                .k
+                .checked_mul(self.unit)
+                .and_then(|o| o.checked_add(self.map))
+                .and_then(|at| v.at(at, crate::bytes::to_usize(n.saturating_mul(self.unit))));
+            let Some(batch) = batch else {
+                return Next::Broken;
+            };
+            self.batch = batch;
+            self.batch_at = self.k;
+        }
+        let entry = crate::bytes::to_usize(
+            self.k
+                .saturating_sub(self.batch_at)
+                .saturating_mul(self.unit),
+        );
+        let (addr, device) = if self.unit == 8 {
+            (
+                le32(&self.batch, entry.saturating_add(4)),
+                le16(&self.batch, entry.saturating_add(2)),
+            )
+        } else {
+            (le32(&self.batch, entry), 0)
+        };
+        let want = self
+            .chunk
+            .min(self.size.saturating_sub(self.k.saturating_mul(self.chunk)));
+        self.k = self.k.saturating_add(1);
+        if addr == NULL_ADDR {
+            return Next::Piece(Piece::Zeros(want));
+        }
+        // A chunk on another device is not on this image.
+        if device != 0 {
+            return Next::Broken;
+        }
+        match u64::from(addr).checked_mul(self.bs) {
+            Some(at) => Next::Piece(Piece::Disk(at, want)),
+            None => Next::Broken,
+        }
+    }
+}
+
+/// Walk an EROFS image given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the EROFS image `disk`, which is `len` bytes long, handing each file
+/// to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    let head = v
+        .at(0, crate::bytes::to_usize(len.min(1028)))
+        .unwrap_or_default();
+    if !is_erofs(&head) {
+        return Ok(None);
+    }
+    let Some(fs) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "erofs open: the superblock or the root directory is unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    // The directories of an image are disjoint, so they are not more than it.
+    let mut left = len;
+    let mut damaged = false;
+    let mut seen: HashSet<u64> = HashSet::from([fs.root]);
+    let mut stack = vec![(fs.root, String::new(), 0usize)];
+    while let Some((nid, prefix, depth)) = stack.pop() {
+        let Some(dir) = fs.inode(&mut v, nid) else {
+            damaged = true;
+            continue;
+        };
+        let (list, intact) = fs.entries(&mut v, &dir, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for (name, child) in list {
+            budget.count_entry()?;
+            let path = if prefix.is_empty() {
+                name
+            } else {
+                format!("{prefix}/{name}")
+            };
+            let Some(inode) = fs.inode(&mut v, child) else {
+                damaged = true;
+                continue;
+            };
+            match inode.mode & S_IFMT {
+                S_IFDIR => {
+                    if depth >= MAX_DEPTH {
+                        damaged = true;
+                    } else if seen.insert(child) {
+                        below.push((child, path, depth.saturating_add(1)));
+                    }
+                }
+                S_IFREG => {
+                    let attrs = Attrs {
+                        mode: Some(inode.mode),
+                        mtime: inode.mtime.map(Mtime::Unix),
+                    };
+                    if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                        fs.data(&mut v, &inode, cap)
+                    })? {
+                        return Ok(Some(r));
+                    }
+                }
+                // A link or a node holds no file's bytes.
+                _ => {}
+            }
+        }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "erofs walk: the image is damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::Cursor;
+
+    const BS: usize = 4096;
+    /// The inode area is the second block; data begins at the third.
+    const META: usize = BS;
+    const DATA: usize = 2 * BS;
+
+    /// An image being written: inodes in 32-byte slots of the inode area, data
+    /// in blocks after it.
+    struct Img {
+        d: Vec<u8>,
+        slot: usize,
+        blocks: usize,
+    }
+
+    impl Img {
+        fn new() -> Img {
+            let mut d = vec![0u8; DATA];
+            d[1024..1028].copy_from_slice(&0xE0F5_E1E2u32.to_le_bytes());
+            d[1024 + 12] = 12;
+            d[1024 + 40..1024 + 44].copy_from_slice(&1u32.to_le_bytes());
+            Img {
+                d,
+                slot: 0,
+                blocks: 2,
+            }
+        }
+
+        /// Whole blocks of data; their block address.
+        fn blocks(&mut self, bytes: &[u8]) -> u32 {
+            let at = self.blocks;
+            self.d
+                .resize((at + bytes.len().div_ceil(BS).max(1)) * BS, 0);
+            self.d[at * BS..at * BS + bytes.len()].copy_from_slice(bytes);
+            self.blocks = self.d.len() / BS;
+            at as u32
+        }
+
+        /// A compact inode of `layout`, with `tail` after it; its number.
+        fn inode(&mut self, layout: u16, mode: u16, size: u32, union: u32, tail: &[u8]) -> u64 {
+            let nid = self.slot;
+            let at = META + nid * 32;
+            let end = at + 32 + tail.len().div_ceil(32) * 32;
+            if self.d.len() < end {
+                self.d.resize(end.max(DATA), 0);
+            }
+            self.d[at..at + 2].copy_from_slice(&(layout << 1).to_le_bytes());
+            self.d[at + 4..at + 6].copy_from_slice(&mode.to_le_bytes());
+            self.d[at + 8..at + 12].copy_from_slice(&size.to_le_bytes());
+            self.d[at + 16..at + 20].copy_from_slice(&union.to_le_bytes());
+            self.d[at + 32..at + 32 + tail.len()].copy_from_slice(tail);
+            self.slot += 1 + tail.len().div_ceil(32);
+            nid as u64
+        }
+
+        fn file(&mut self, bytes: &[u8]) -> u64 {
+            let whole = bytes.len() / BS * BS;
+            let addr = if whole > 0 {
+                self.blocks(&bytes[..whole])
+            } else {
+                0
+            };
+            self.inode(
+                FLAT_INLINE,
+                0o100644,
+                bytes.len() as u32,
+                addr,
+                &bytes[whole..],
+            )
+        }
+
+        /// A directory of `entries`, kept after its inode.
+        fn dir(&mut self, entries: &[(&str, u64, u8)]) -> u64 {
+            let bytes = dir_bytes(entries);
+            self.inode(FLAT_INLINE, 0o040755, bytes.len() as u32, 0, &bytes)
+        }
+
+        /// The root of the image; the image.
+        fn finish(mut self, root: u64) -> Vec<u8> {
+            self.d[1024 + 14..1024 + 16].copy_from_slice(&(root as u16).to_le_bytes());
+            self.d
+        }
+    }
+
+    /// The bytes of a directory: the entries, then the names.
+    fn dir_bytes(entries: &[(&str, u64, u8)]) -> Vec<u8> {
+        let mut all: Vec<(&str, u64, u8)> = vec![(".", 0, 2), ("..", 0, 2)];
+        all.extend_from_slice(entries);
+        let mut out = Vec::new();
+        let mut names = Vec::new();
+        for (name, nid, ty) in &all {
+            out.extend_from_slice(&nid.to_le_bytes());
+            out.extend_from_slice(&((all.len() * 12 + names.len()) as u16).to_le_bytes());
+            out.push(*ty);
+            out.push(0);
+            names.extend_from_slice(name.as_bytes());
+        }
+        out.extend_from_slice(&names);
+        out
+    }
+
+    type Member = (String, Vec<u8>, Option<&'static str>);
+
+    fn walked(img: &[u8], limits: Limits) -> (Vec<Member>, Result<(), LimitHit>) {
+        let mut out = Vec::new();
+        let mut budget = Budget::new(limits);
+        let len = img.len() as u64;
+        let end = walk_volume(Cursor::new(img), len, &mut budget, &mut |e, _| {
+            let e = e.whole();
+            out.push((e.name, e.data, e.unsupported));
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    fn pat(n: usize) -> Vec<u8> {
+        (0..n).map(|i| (i % 251) as u8).collect()
+    }
+
+    /// A root with `a` (a block and a tail), a folder `d` holding `b` (all in
+    /// its tail), `h`, a file in chunks that has a hole, and an empty file.
+    fn tree() -> Img {
+        let mut img = Img::new();
+        let a = img.file(&pat(BS + 100));
+        let b = img.file(b"in d");
+        let d = img.dir(&[("b", b, 1)]);
+        // Two chunks of a block: the first a hole, the second at a block.
+        let at = img.blocks(&pat(BS));
+        let mut map = Vec::new();
+        map.extend_from_slice(&NULL_ADDR.to_le_bytes());
+        map.extend_from_slice(&at.to_le_bytes());
+        let h = img.inode(CHUNK_BASED, 0o100644, 2 * BS as u32, 0, &map);
+        let e = img.inode(FLAT_PLAIN, 0o100644, 0, 0, b"");
+        let root = img.dir(&[("a", a, 1), ("d", d, 2), ("h", h, 1), ("e", e, 1)]);
+        img.finish_with(root)
+    }
+
+    impl Img {
+        fn finish_with(self, root: u64) -> Img {
+            let d = self.finish(root);
+            Img {
+                d,
+                slot: 0,
+                blocks: 0,
+            }
+        }
+    }
+
+    fn sorted(mut e: Vec<Member>) -> Vec<(String, Vec<u8>)> {
+        assert!(
+            e.iter().all(|m| m.2.is_none()),
+            "{:?}",
+            e.iter().map(|m| (&m.0, m.2)).collect::<Vec<_>>()
+        );
+        e.sort_by(|a, b| a.0.cmp(&b.0));
+        e.into_iter().map(|m| (m.0, m.1)).collect()
+    }
+
+    #[test]
+    fn files_in_blocks_in_a_tail_and_in_chunks_with_a_hole_come_out() {
+        let (e, end) = walked(&tree().d, Limits::default());
+        end.unwrap();
+        let mut hole = vec![0u8; BS];
+        hole.extend(pat(BS));
+        assert_eq!(
+            sorted(e),
+            [
+                ("a".to_string(), pat(BS + 100)),
+                ("d/b".to_string(), b"in d".to_vec()),
+                ("e".to_string(), Vec::new()),
+                ("h".to_string(), hole),
+            ]
+        );
+    }
+
+    #[test]
+    fn a_folder_that_lists_itself_is_walked_once() {
+        let mut img = Img::new();
+        let b = img.file(b"in d");
+        // `b` takes the slots 0 and 1, so the folder is the inode in slot 2.
+        let d = img.dir(&[("b", b, 1), ("up", 2, 2)]);
+        let root = img.dir(&[("d", d, 2)]);
+        let img = img.finish(root);
+        let (e, end) = walked(&img, Limits::default());
+        end.unwrap();
+        let names: Vec<_> = e.iter().map(|m| m.0.as_str()).collect();
+        assert_eq!(names, ["d/b"]);
+    }
+
+    #[test]
+    fn a_file_at_an_address_past_the_image_is_reported_with_what_there_is() {
+        let mut img = Img::new();
+        let f = img.inode(FLAT_PLAIN, 0o100644, 100, 9999, b"");
+        let root = img.dir(&[("f", f, 1)]);
+        let (e, end) = walked(&img.finish(root), Limits::default());
+        end.unwrap();
+        assert_eq!(e[0].2, Some("file could not be read from the volume"));
+    }
+
+    #[test]
+    fn a_compressed_file_is_reported_and_so_is_a_chunk_on_another_device() {
+        let mut img = Img::new();
+        let z = img.inode(1, 0o100644, 100, 0, b"");
+        let at = img.blocks(&pat(BS));
+        // An indexed chunk: advise, device 1, address.
+        let mut map = vec![0u8, 0, 1, 0];
+        map.extend_from_slice(&at.to_le_bytes());
+        let other = img.inode(CHUNK_BASED, 0o100644, BS as u32, 0x20, &map);
+        let root = img.dir(&[("z", z, 1), ("o", other, 1)]);
+        let (e, end) = walked(&img.finish(root), Limits::default());
+        end.unwrap();
+        let by = |n: &str| e.iter().find(|m| m.0 == n).unwrap();
+        assert_eq!(by("z").2, Some("EROFS compressed file not read"));
+        assert_eq!(by("o").2, Some("file could not be read from the volume"));
+    }
+
+    #[test]
+    fn a_block_of_a_directory_that_does_not_add_up_is_damage() {
+        let good = dir_bytes(&[("x", 5, 1)]);
+        let mut out = Vec::new();
+        assert!(dirents(&good, &mut out, 100));
+        assert_eq!(out, [("x".to_string(), 5)]);
+        // No first name offset, one that is not a multiple of 12, one past the
+        // block, a name that begins before the entries end.
+        for edit in [(8usize, 0u16), (8, 13), (8, 4000), (20, 5)] {
+            let mut bad = good.clone();
+            bad[edit.0..edit.0 + 2].copy_from_slice(&edit.1.to_le_bytes());
+            let mut out = Vec::new();
+            assert!(!dirents(&bad, &mut out, 100), "{edit:?}");
+        }
+    }
+
+    #[test]
+    fn the_entry_past_the_member_limit_is_counted_and_stops_the_walk() {
+        let mut img = Img::new();
+        let a = img.file(b"a");
+        let b = img.file(b"b");
+        let c = img.file(b"c");
+        let root = img.dir(&[("a", a, 1), ("b", b, 1), ("c", c, 1)]);
+        let img = img.finish(root);
+        let run = |max: u64| {
+            let limits = Limits {
+                max_members: max,
+                ..Limits::default()
+            };
+            walked(&img, limits)
+        };
+        let (e, end) = run(3);
+        end.unwrap();
+        assert_eq!(e.len(), 3);
+        let (e, end) = run(2);
+        assert!(!end.unwrap_err().is_corrupt());
+        assert_eq!(e.len(), 2);
+    }
+
+    #[test]
+    fn files_over_the_buffer_limit_are_read_as_they_go_in_each_layout() {
+        let img = tree().d;
+        let len = img.len() as u64;
+        let mut budget = Budget::new(Limits {
+            max_buffer_bytes: 100,
+            ..Limits::default()
+        });
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(&img[..]), len, &mut budget, emit));
+        end.unwrap();
+        let mut hole = vec![0u8; BS];
+        hole.extend(pat(BS));
+        let want = [
+            ("a", pat(BS + 100), true),
+            ("d/b", b"in d".to_vec(), false),
+            ("e", Vec::new(), false),
+            ("h", hole, true),
+        ];
+        for (name, data, streamed) in want {
+            let (entry, was) = e.iter().find(|(m, _)| m.name == name).unwrap();
+            assert_eq!(entry.data, data, "{name}");
+            assert_eq!(*was, streamed, "{name}");
+            assert_eq!(entry.unsupported, None, "{name}");
+        }
+    }
+
+    #[test]
+    fn a_chunk_map_longer_than_a_batch_is_read_in_batches() {
+        // One more chunk than a batch of the map holds, each a block at the
+        // same place, so the file is that block over and over.
+        let n = MAP_BATCH as usize + 1;
+        let mut img = Img::new();
+        // The map is longer than the area of the inodes, so the data starts
+        // after where it ends.
+        img.blocks = 8;
+        let at = img.blocks(&pat(BS));
+        let map: Vec<u8> = (0..n).flat_map(|_| at.to_le_bytes()).collect();
+        let f = img.inode(CHUNK_BASED, 0o100644, (n * BS) as u32, 0, &map);
+        let root = img.dir(&[("f", f, 1)]);
+        let img = img.finish(root);
+        let len = img.len() as u64;
+        let mut budget = Budget::new(Limits {
+            max_buffer_bytes: 100,
+            ..Limits::default()
+        });
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(&img[..]), len, &mut budget, emit));
+        end.unwrap();
+        assert_eq!(e.len(), 1);
+        assert!(e[0].1, "read as it goes");
+        let want: Vec<u8> = (0..n).flat_map(|_| pat(BS)).collect();
+        assert_eq!(e[0].0.data, want);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/exfat.rs b/crates/exav-unpack/src/formats/exfat.rs
new file mode 100644
index 00000000..088b4764
--- /dev/null
+++ b/crates/exav-unpack/src/formats/exfat.rs
@@ -0,0 +1,938 @@
+//! exFAT: the files of a volume, read where they lie.
+//!
+//! The filesystem of the memory cards and USB sticks bigger than FAT32 holds.
+//! The volume is a `Read + Seek`, read where the walk goes: the boot sector,
+//! the part of the allocation table a chain passes through, each directory's
+//! clusters and each file's runs of clusters. Only a file is ever held, bounded
+//! by the buffer limit.
+//!
+//! ```text
+//! boot sector          sector and cluster sizes, where the table and the
+//!                      cluster heap start, the first cluster of the root
+//!   allocation table   one entry per cluster: the next of its chain, or the end
+//!   cluster heap       directories: sets of 32-byte entries, a file being a
+//!                      file entry, a stream entry (first cluster, size, and
+//!                      whether the clusters are in a row) and name entries
+//! ```
+//!
+//! A file whose stream says its clusters are in a row has no chain in the table.
+//! The bytes of a file past its valid length read as zeros, as they do to the
+//! system that mounts the volume. The checksums of the boot region and of the
+//! entry sets, and the hash of a name, are not checked, nor is the bitmap of
+//! the clusters in use read: a file is where its entry says.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::collections::{HashMap, HashSet};
+use std::io::{Read, Seek};
+
+use super::vol::{
+    Attrs, Emit, Fill, Got, Next, Piece, Pieces, Plan, Step, Vol, give, le16, le32, le64, read_file,
+};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, LimitHit, Mtime};
+
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
+
+/// Bytes of the allocation table kept at a time, and how many of those.
+const PAGE: u64 = 4096;
+const PAGES: usize = 64;
+
+/// File attribute bit of a folder.
+const ATTR_DIR: u16 = 0x10;
+
+/// Whether `data`, the start of a volume, holds the boot sector of an exFAT
+/// volume: its name, the zeroes where a FAT volume has its parameters, and the
+/// signature that ends a boot sector.
+pub(crate) fn is_exfat(data: &[u8]) -> bool {
+    data.len() >= 512
+        && data.get(3..11) == Some(b"EXFAT   ".as_slice())
+        && data.get(510..512) == Some(&[0x55, 0xAA][..])
+        && data.get(11..64).is_some_and(|z| z.iter().all(|&b| b == 0))
+}
+
+/// What the boot sector says of the volume.
+struct Exfat {
+    /// Bytes in a cluster.
+    cluster: u64,
+    /// Clusters of data, numbered from 2.
+    clusters: u32,
+    /// Byte offsets of the table in use and of cluster 2.
+    table: u64,
+    heap: u64,
+    root: u32,
+    pages: HashMap<u64, Vec<u8>>,
+}
+
+/// Where the bytes of a file or a folder are.
+#[derive(Clone, Copy)]
+struct Place {
+    first: u32,
+    /// The clusters are one after the other, with no chain in the table.
+    in_a_row: bool,
+    /// The size the entry gives, which is not known of the root.
+    size: Option<u64>,
+}
+
+/// A file or a folder in a folder.
+struct Item {
+    name: String,
+    dir: bool,
+    place: Place,
+    /// How much of the file is written: the rest reads as zeros.
+    valid: u64,
+    mtime: Option<Mtime>,
+}
+
+impl Exfat {
+    fn table_byte(&mut self, v: &mut Vol, off: u64) -> Option<u8> {
+        let (page, at) = (off.checked_div(PAGE)?, off.checked_rem(PAGE)?);
+        if !self.pages.contains_key(&page) {
+            let start = self.table.checked_add(page.checked_mul(PAGE)?)?;
+            let want = crate::bytes::to_usize(PAGE.min(v.len.checked_sub(start)?));
+            let got = v.at(start, want)?;
+            if self.pages.len() >= PAGES {
+                self.pages.clear();
+            }
+            self.pages.insert(page, got);
+        }
+        self.pages
+            .get(&page)?
+            .get(crate::bytes::to_usize(at))
+            .copied()
+    }
+
+    /// The cluster after `c` in its chain: `Some(None)` at the end of it, and
+    /// `None` where the table does not say.
+    fn next(&mut self, v: &mut Vol, c: u32) -> Option<Option<u32>> {
+        if c < 2 || c > self.clusters.saturating_add(1) {
+            return None;
+        }
+        let off = u64::from(c).checked_mul(4)?;
+        let mut raw = 0u32;
+        for i in (0..4u64).rev() {
+            let b = self.table_byte(v, off.checked_add(i)?)?;
+            raw = raw.checked_mul(256)?.checked_add(u32::from(b))?;
+        }
+        match raw {
+            0xFFFF_FFF8.. => Some(None),
+            2.. if raw <= self.clusters.saturating_add(1) => Some(Some(raw)),
+            _ => None,
+        }
+    }
+
+    /// The byte offset of cluster `c`.
+    fn at(&self, c: u32) -> Option<u64> {
+        u64::from(c.checked_sub(2)?)
+            .checked_mul(self.cluster)?
+            .checked_add(self.heap)
+    }
+
+    /// The runs of the clusters of `place`, as (first cluster, clusters), up
+    /// to `want` of them (all of them where it is not given). The flag is false
+    /// where the chain breaks, loops or ends before that.
+    fn runs(&mut self, v: &mut Vol, place: Place, want: Option<u64>) -> (Vec<(u32, u64)>, bool) {
+        if place.in_a_row {
+            let n = want.unwrap_or(0);
+            let last = u64::from(place.first).saturating_add(n).saturating_sub(1);
+            let fits = place.first >= 2 && last <= u64::from(self.clusters).saturating_add(1);
+            return (vec![(place.first, n)], fits);
+        }
+        let mut runs: Vec<(u32, u64)> = Vec::new();
+        let mut c = place.first;
+        let mut got = 0u64;
+        loop {
+            // A chain longer than the volume has clusters comes back on itself.
+            if got >= u64::from(self.clusters) || want.is_some_and(|w| got >= w) {
+                return (runs, want.is_some());
+            }
+            match runs.last_mut() {
+                Some((start, n)) if u64::from(*start).saturating_add(*n) == u64::from(c) => {
+                    *n = n.saturating_add(1);
+                }
+                _ => runs.push((c, 1)),
+            }
+            got = got.saturating_add(1);
+            match self.next(v, c) {
+                Some(Some(next)) => c = next,
+                Some(None) if want.is_none() => return (runs, true),
+                _ => return (runs, want.is_some_and(|w| got >= w)),
+            }
+        }
+    }
+
+    /// The items of the folder at `place`, up to `limit` of them. `left`
+    /// counts the clusters of folders the walk may still read. The flag is
+    /// false where the folder is damaged.
+    fn items(
+        &mut self,
+        v: &mut Vol,
+        place: Place,
+        left: &mut u64,
+        limit: usize,
+    ) -> (Vec<Item>, bool) {
+        let want = place.size.map(|s| s.div_ceil(self.cluster));
+        let (runs, mut intact) = self.runs(v, place, want);
+        let mut parse = Parser::default();
+        'runs: for (first, n) in runs {
+            for i in 0..n {
+                if *left == 0 {
+                    intact = false;
+                    break 'runs;
+                }
+                *left = left.saturating_sub(1);
+                let c = u32::try_from(u64::from(first).saturating_add(i)).unwrap_or(0);
+                let block = self
+                    .at(c)
+                    .and_then(|o| v.at(o, crate::bytes::to_usize(self.cluster)));
+                let Some(block) = block else {
+                    intact = false;
+                    break 'runs;
+                };
+                if parse.feed(&block, limit) {
+                    break 'runs;
+                }
+            }
+        }
+        (parse.items, intact)
+    }
+
+    /// The bytes of a file: held when they are at most `cap`, else read as
+    /// they go.
+    fn file<'a>(&'a mut self, v: &'a mut Vol<'_>, item: &Item, cap: u64) -> Got<'a> {
+        let Some(size) = item.place.size else {
+            return Got::Why("exFAT file without a size");
+        };
+        if size == 0 {
+            return Got::Whole(Vec::new());
+        }
+        let want = size.div_ceil(self.cluster);
+        let chain = Chain {
+            fat: self,
+            next: Some(item.place.first),
+            row: item.place.in_a_row,
+            want,
+            got: 0,
+            broken: false,
+        };
+        let fill = Valid {
+            inner: Pieces::new(chain, size),
+            at: 0,
+            valid: item.valid.min(size),
+        };
+        read_file(v, fill, size, cap)
+    }
+}
+
+/// The runs of clusters of a file, found as they are read.
+struct Chain<'a> {
+    fat: &'a mut Exfat,
+    /// Where the next run starts, if the chain goes on.
+    next: Option<u32>,
+    /// The clusters are one after the other, with no chain in the table.
+    row: bool,
+    /// The clusters of the file not yet in a run.
+    want: u64,
+    /// The clusters followed so far.
+    got: u64,
+    /// The chain breaks, loops or ends before the file does.
+    broken: bool,
+}
+
+impl Plan for Chain<'_> {
+    fn next(&mut self, v: &mut Vol) -> Next {
+        if self.want == 0 {
+            return Next::End;
+        }
+        let Some(first) = self.next.filter(|_| !self.broken) else {
+            return Next::Broken;
+        };
+        if self.row {
+            let n = self.want;
+            self.want = 0;
+            let last = u64::from(first).saturating_add(n).saturating_sub(1);
+            if first < 2 || last > u64::from(self.fat.clusters).saturating_add(1) {
+                return Next::Broken;
+            }
+            return match self.fat.at(first) {
+                Some(at) => Next::Piece(Piece::Disk(at, n.saturating_mul(self.fat.cluster))),
+                None => Next::Broken,
+            };
+        }
+        let mut c = first;
+        let mut n = 0u64;
+        loop {
+            // A chain longer than the volume has clusters comes back on itself.
+            if self.got >= u64::from(self.fat.clusters) {
+                self.broken = true;
+                break;
+            }
+            n = n.saturating_add(1);
+            self.got = self.got.saturating_add(1);
+            self.want = self.want.saturating_sub(1);
+            if self.want == 0 {
+                break;
+            }
+            match self.fat.next(v, c) {
+                Some(Some(next)) if u64::from(next) == u64::from(c).saturating_add(1) => c = next,
+                Some(Some(next)) => {
+                    self.next = Some(next);
+                    break;
+                }
+                Some(None) | None => {
+                    self.broken = true;
+                    break;
+                }
+            }
+        }
+        match self.fat.at(first) {
+            Some(at) if n > 0 => Next::Piece(Piece::Disk(at, n.saturating_mul(self.fat.cluster))),
+            _ => Next::Broken,
+        }
+    }
+}
+
+/// A file's bytes with what is past its valid length read as zeros: it was
+/// never written.
+struct Valid<F> {
+    inner: F,
+    /// How many bytes of the file `inner` has given.
+    at: u64,
+    valid: u64,
+}
+
+impl<F: Fill> Fill for Valid<F> {
+    fn fill(&mut self, v: &mut Vol, out: &mut Vec<u8>) -> Step {
+        let from = out.len();
+        let step = self.inner.fill(v, out);
+        let got = out.len().saturating_sub(from) as u64;
+        // The first byte of what was given that is past the valid length.
+        let zero = crate::bytes::to_usize(self.valid.saturating_sub(self.at).min(got));
+        if let Some(tail) = out.get_mut(from.saturating_add(zero)..) {
+            tail.fill(0);
+        }
+        self.at = self.at.saturating_add(got);
+        step
+    }
+}
+
+/// Reads the entries of a directory, across its clusters.
+#[derive(Default)]
+struct Parser {
+    items: Vec<Item>,
+    /// The entry set being read: its entries so far, and how many more.
+    set: Vec<[u8; 32]>,
+    more: usize,
+}
+
+impl Parser {
+    /// Read the entries of `block`. True where the directory ends in it, or
+    /// holds as many as `limit`.
+    fn feed(&mut self, block: &[u8], limit: usize) -> bool {
+        for e in block.as_chunks::<32>().0 {
+            if e[0] == 0 {
+                return true;
+            }
+            if self.items.len() >= limit {
+                return true;
+            }
+            match e[0] {
+                // A file: the entry, then its secondary entries.
+                0x85 => {
+                    self.set = vec![*e];
+                    self.more = usize::from(e[1]);
+                }
+                // A secondary entry of the set, in use: a stream, a name, or
+                // another, which is counted and not read.
+                0xC0..=0xFF if self.more > 0 && !self.set.is_empty() => {
+                    self.set.push(*e);
+                    self.more = self.more.saturating_sub(1);
+                    if self.more == 0 {
+                        self.finish();
+                    }
+                }
+                // The bitmap, the table of upper case letters, the label, the
+                // entries not in use: not files, and the end of a set.
+                _ => {
+                    self.set.clear();
+                    self.more = 0;
+                }
+            }
+        }
+        false
+    }
+
+    /// The item the set read is.
+    fn finish(&mut self) {
+        let set = std::mem::take(&mut self.set);
+        let (Some(file), Some(stream)) = (set.first(), set.get(1)) else {
+            return;
+        };
+        if stream[0] != 0xC0 {
+            return;
+        }
+        let units: Vec<u16> = set
+            .iter()
+            .skip(2)
+            .filter(|e| e[0] == 0xC1)
+            .flat_map(|e| e.get(2..).unwrap_or(&[]).as_chunks::<2>().0.iter())
+            .map(|c| u16::from_le_bytes(*c))
+            .take(usize::from(stream[3]))
+            .collect();
+        if units.is_empty() {
+            return;
+        }
+        let size = le64(stream, 24);
+        self.items.push(Item {
+            name: String::from_utf16_lossy(&units),
+            dir: le16(file, 4) & ATTR_DIR != 0,
+            place: Place {
+                first: le32(stream, 20),
+                in_a_row: stream[1] & 0x02 != 0,
+                size: Some(size),
+            },
+            valid: le64(stream, 8),
+            mtime: timestamp(le32(file, 12)),
+        });
+    }
+}
+
+/// A timestamp of a file entry: the year since 1980, month, day, hour, minute
+/// and two seconds, packed; wall-clock, the offset from UTC being another field.
+fn timestamp(t: u32) -> Option<Mtime> {
+    let (day, month) = ((t >> 16) & 0x1F, (t >> 21) & 0x0F);
+    let (hour, minute, second) = (
+        (t >> 11) & 0x1F,
+        (t >> 5) & 0x3F,
+        (t & 0x1F).saturating_mul(2),
+    );
+    if t == 0 || !(1..=12).contains(&month) || day == 0 || hour > 23 || minute > 59 || second > 59 {
+        return None;
+    }
+    Some(Mtime::Local {
+        year: 1980u16.saturating_add(u16::try_from(t >> 25).ok()?),
+        month: u8::try_from(month).ok()?,
+        day: u8::try_from(day).ok()?,
+        hour: u8::try_from(hour).ok()?,
+        minute: u8::try_from(minute).ok()?,
+        second: u8::try_from(second).ok()?,
+    })
+}
+
+/// The volume's boot sector, or `None` where it describes none a system would
+/// mount.
+fn open(v: &mut Vol) -> Option<Exfat> {
+    let b = v.at(0, 512)?;
+    if !is_exfat(&b) || le16(&b, 104) >> 8 != 1 {
+        return None;
+    }
+    let (sector_shift, cluster_shift) = (u32::from(b[108]), u32::from(b[109]));
+    if !(9..=12).contains(&sector_shift) || sector_shift.saturating_add(cluster_shift) > 25 {
+        return None;
+    }
+    let sector = 1u64.checked_shl(sector_shift)?;
+    let cluster = 1u64.checked_shl(sector_shift.saturating_add(cluster_shift))?;
+    let fats = u64::from(b[110]);
+    if !(1..=2).contains(&fats) {
+        return None;
+    }
+    let (fat_at, fat_len) = (u64::from(le32(&b, 80)), u64::from(le32(&b, 84)));
+    let heap = u64::from(le32(&b, 88)).checked_mul(sector)?;
+    // Nothing is read from past the volume the boot sector describes.
+    let volume = le64(&b, 72).saturating_mul(sector).min(v.len);
+    let room = volume.checked_sub(heap)?.checked_div(cluster)?;
+    let clusters = u32::try_from(u64::from(le32(&b, 92)).min(room)).ok()?;
+    let root = le32(&b, 96);
+    if clusters == 0 || fat_len == 0 || root < 2 || root > clusters.saturating_add(1) {
+        return None;
+    }
+    // Two tables, and the volume flags say which is in use.
+    let active = u64::from(fats == 2 && le16(&b, 106) & 1 != 0);
+    let table = fat_at
+        .saturating_add(active.saturating_mul(fat_len))
+        .saturating_mul(sector);
+    Some(Exfat {
+        cluster,
+        clusters,
+        table,
+        heap,
+        root,
+        pages: HashMap::new(),
+    })
+}
+
+/// Walk an exFAT volume given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the exFAT volume `disk`, which is `len` bytes long, handing each file
+/// to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    match v.at(0, 512) {
+        Some(boot) if is_exfat(&boot) => {}
+        _ => return Ok(None),
+    }
+    let Some(mut fs) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "exFAT open: the boot sector is unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    let mut left = u64::from(fs.clusters);
+    let mut damaged = false;
+    // A folder is walked once, however many entries name it.
+    let mut seen: HashSet<u32> = HashSet::from([fs.root]);
+    let root = Place {
+        first: fs.root,
+        in_a_row: false,
+        size: None,
+    };
+    let mut stack = vec![(root, String::new(), 0usize)];
+    while let Some((dir, prefix, depth)) = stack.pop() {
+        let (items, intact) = fs.items(&mut v, dir, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for item in items {
+            budget.count_entry()?;
+            let path = if prefix.is_empty() {
+                item.name.clone()
+            } else {
+                format!("{prefix}/{}", item.name)
+            };
+            if item.dir {
+                if item.place.first < 2 || depth >= MAX_DEPTH {
+                    damaged = true;
+                } else if seen.insert(item.place.first) {
+                    below.push((item.place, path, depth.saturating_add(1)));
+                }
+                continue;
+            }
+            let attrs = Attrs {
+                mode: None,
+                mtime: item.mtime,
+            };
+            if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                fs.file(&mut v, &item, cap)
+            })? {
+                return Ok(Some(r));
+            }
+        }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "exFAT walk: the volume is damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::Cursor;
+
+    /// Sectors and clusters of 512 bytes; the table at sector 1, 4 sectors
+    /// long, the heap at sector 8, 100 clusters, the root in cluster 2.
+    const FAT_AT: usize = 512;
+    const HEAP: usize = 8 * 512;
+
+    struct Img(Vec<u8>);
+
+    impl Img {
+        fn new() -> Img {
+            let mut d = vec![0u8; HEAP + 100 * 512];
+            d[0] = 0xEB;
+            d[3..11].copy_from_slice(b"EXFAT   ");
+            d[72..80].copy_from_slice(&108u64.to_le_bytes());
+            d[80..84].copy_from_slice(&1u32.to_le_bytes());
+            d[84..88].copy_from_slice(&4u32.to_le_bytes());
+            d[88..92].copy_from_slice(&8u32.to_le_bytes());
+            d[92..96].copy_from_slice(&100u32.to_le_bytes());
+            d[96..100].copy_from_slice(&2u32.to_le_bytes());
+            d[104..106].copy_from_slice(&0x0100u16.to_le_bytes());
+            d[108] = 9;
+            d[109] = 0;
+            d[110] = 1;
+            d[510..512].copy_from_slice(&[0x55, 0xAA]);
+            let mut img = Img(d);
+            img.link(2, 0xFFFF_FFFF);
+            img
+        }
+
+        fn link(&mut self, c: usize, next: u32) {
+            self.0[FAT_AT + c * 4..FAT_AT + c * 4 + 4].copy_from_slice(&next.to_le_bytes());
+        }
+
+        fn put(&mut self, c: usize, bytes: &[u8]) {
+            let at = HEAP + (c - 2) * 512;
+            self.0[at..at + bytes.len()].copy_from_slice(bytes);
+        }
+
+        /// `entries` as the directory in cluster `c`.
+        fn dir(&mut self, c: usize, entries: &[Vec<[u8; 32]>]) {
+            let flat: Vec<u8> = entries.iter().flatten().flatten().copied().collect();
+            self.put(c, &flat);
+        }
+    }
+
+    /// The entry set of a file (or folder) called `name`.
+    fn set(
+        name: &str,
+        attr: u16,
+        first: u32,
+        size: u64,
+        valid: u64,
+        in_a_row: bool,
+    ) -> Vec<[u8; 32]> {
+        let units: Vec<u16> = name.encode_utf16().collect();
+        let names = units.len().div_ceil(15);
+        let mut file = [0u8; 32];
+        file[0] = 0x85;
+        file[1] = 1 + names as u8;
+        file[4..6].copy_from_slice(&attr.to_le_bytes());
+        // 2024-03-05 14:30:12.
+        let ts: u32 = (44 << 25) | (3 << 21) | (5 << 16) | (14 << 11) | (30 << 5) | 6;
+        file[12..16].copy_from_slice(&ts.to_le_bytes());
+        let mut stream = [0u8; 32];
+        stream[0] = 0xC0;
+        stream[1] = 0x01 | if in_a_row { 0x02 } else { 0 };
+        stream[3] = units.len() as u8;
+        stream[8..16].copy_from_slice(&valid.to_le_bytes());
+        stream[20..24].copy_from_slice(&first.to_le_bytes());
+        stream[24..32].copy_from_slice(&size.to_le_bytes());
+        let mut out = vec![file, stream];
+        for chunk in units.chunks(15) {
+            let mut e = [0u8; 32];
+            e[0] = 0xC1;
+            for (i, u) in chunk.iter().enumerate() {
+                e[2 + i * 2..4 + i * 2].copy_from_slice(&u.to_le_bytes());
+            }
+            out.push(e);
+        }
+        out
+    }
+
+    type Member = (String, Vec<u8>, Option<&'static str>);
+
+    fn walked(d: &[u8], limits: Limits) -> (Vec<Member>, Result<(), LimitHit>) {
+        let mut out = Vec::new();
+        let mut budget = Budget::new(limits);
+        let len = d.len() as u64;
+        let end = walk_volume(Cursor::new(d), len, &mut budget, &mut |e, _| {
+            let e = e.whole();
+            out.push((e.name, e.data, e.unsupported));
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    /// Files in a row, chained, written in part, empty, and long-named.
+    fn mixed() -> Vec<u8> {
+        let mut img = Img::new();
+        // The root takes clusters 2 and 3.
+        img.link(2, 3);
+        img.link(3, 0xFFFF_FFFF);
+        // A file in a row, in clusters 13 and 14; a file chained 15, 17;
+        // another written to 600 bytes of 1000.
+        img.put(13, &[b'a'; 512]);
+        img.put(14, &[b'b'; 512]);
+        img.put(15, &[b'c'; 512]);
+        img.put(17, &[b'c'; 512]);
+        img.link(15, 17);
+        img.link(17, 0xFFFF_FFFF);
+        img.put(18, &[b'd'; 512]);
+        img.put(19, &[b'd'; 512]);
+        img.link(18, 19);
+        img.link(19, 0xFFFF_FFFF);
+        img.dir(
+            2,
+            &[
+                set("row.bin", 0x20, 13, 700, 700, true),
+                set("chain.bin", 0x20, 15, 1000, 1000, false),
+                set("partly.bin", 0x20, 18, 1000, 600, false),
+                set("empty", 0x20, 0, 0, 0, false),
+                set("a name of more than fifteen letters", 0x20, 13, 1, 1, true),
+            ],
+        );
+        img.0
+    }
+
+    #[test]
+    fn files_come_out_whether_they_are_in_a_row_or_chained_and_the_unwritten_end_is_zeros() {
+        let (e, end) = walked(&mixed(), Limits::default());
+        end.unwrap();
+        let by = |n: &str| e.iter().find(|x| x.0 == n).unwrap();
+        assert_eq!(by("row.bin").1, [vec![b'a'; 512], vec![b'b'; 188]].concat());
+        assert_eq!(by("chain.bin").1, vec![b'c'; 1000]);
+        assert_eq!(
+            by("partly.bin").1,
+            [vec![b'd'; 600], vec![0u8; 400]].concat()
+        );
+        assert_eq!(by("empty").1, b"");
+        assert_eq!(by("a name of more than fifteen letters").1, b"a");
+        assert!(e.iter().all(|x| x.2.is_none()));
+    }
+
+    #[test]
+    fn folders_are_walked_once_and_a_folder_that_names_itself_does_not_loop() {
+        let mut img = Img::new();
+        img.link(3, 0xFFFF_FFFF);
+        img.link(4, 0xFFFF_FFFF);
+        img.put(5, b"deep");
+        img.link(5, 0xFFFF_FFFF);
+        img.dir(
+            2,
+            &[
+                set("sub", 0x10, 3, 512, 512, false),
+                // The same folder under another name.
+                set("again", 0x10, 3, 512, 512, false),
+            ],
+        );
+        img.put(
+            3,
+            &[
+                set("inner", 0x10, 4, 512, 512, false),
+                set("self", 0x10, 3, 512, 512, false),
+                set("root", 0x10, 2, 512, 512, false),
+            ]
+            .iter()
+            .flatten()
+            .flatten()
+            .copied()
+            .collect::<Vec<u8>>(),
+        );
+        img.put(4, &set("deep.txt", 0x20, 5, 4, 4, false).concat());
+        let (e, end) = walked(&img.0, Limits::default());
+        end.unwrap();
+        let names: Vec<_> = e.iter().map(|x| x.0.as_str()).collect();
+        assert_eq!(names, ["sub/inner/deep.txt"]);
+    }
+
+    #[test]
+    fn an_entry_set_that_is_not_one_is_not_a_file() {
+        let mut img = Img::new();
+        img.put(3, &[b'x'; 512]);
+        let good = set("good", 0x20, 3, 5, 5, true);
+        // A file entry with its stream cut off by an entry of another kind.
+        let mut cut = set("cut", 0x20, 3, 5, 5, true);
+        cut.truncate(1);
+        let mut other = [0u8; 32];
+        other[0] = 0x83;
+        // A secondary entry with no file entry before it.
+        let mut orphan = set("orphan", 0x20, 3, 5, 5, true);
+        orphan.remove(0);
+        // A set that begins with a name, not a stream.
+        let mut nameless = set("nameless", 0x20, 3, 5, 5, true);
+        nameless.swap(1, 2);
+        // Entries not in use.
+        let mut unused = set("unused", 0x20, 3, 5, 5, true);
+        for e in &mut unused {
+            e[0] &= 0x7F;
+        }
+        img.dir(2, &[cut, vec![other], orphan, nameless, unused, good]);
+        let (e, end) = walked(&img.0, Limits::default());
+        end.unwrap();
+        let names: Vec<_> = e.iter().map(|x| x.0.as_str()).collect();
+        assert_eq!(names, ["good"]);
+    }
+
+    #[test]
+    fn a_chain_that_ends_early_is_a_file_cut_short() {
+        let mut img = Img::new();
+        img.put(3, &[b'x'; 512]);
+        img.link(3, 0xFFFF_FFFF);
+        img.dir(2, &[set("short", 0x20, 3, 1500, 1500, false)]);
+        let (e, end) = walked(&img.0, Limits::default());
+        end.unwrap();
+        assert_eq!(e.len(), 1);
+        assert_eq!(e[0].2, Some("file could not be read from the volume"));
+        assert_eq!(e[0].1.len(), 512);
+    }
+
+    #[test]
+    fn the_entry_past_the_member_limit_is_counted_and_stops_the_walk() {
+        let mut img = Img::new();
+        img.dir(
+            2,
+            &[
+                set("a", 0x20, 0, 0, 0, false),
+                set("b", 0x20, 0, 0, 0, false),
+                set("c", 0x20, 0, 0, 0, false),
+            ],
+        );
+        let run = |max: u64| {
+            let limits = Limits {
+                max_members: max,
+                ..Limits::default()
+            };
+            walked(&img.0, limits)
+        };
+        let (e, end) = run(3);
+        end.unwrap();
+        assert_eq!(e.len(), 3);
+        let (e, end) = run(2);
+        assert!(!end.unwrap_err().is_corrupt());
+        assert_eq!(e.len(), 2);
+    }
+
+    /// A [`Fill`] that gives its chunks one at a time.
+    struct Chunks(std::vec::IntoIter<Vec<u8>>);
+
+    impl Fill for Chunks {
+        fn fill(&mut self, _: &mut Vol, out: &mut Vec<u8>) -> Step {
+            match self.0.next() {
+                Some(c) => {
+                    out.extend_from_slice(&c);
+                    Step::More
+                }
+                None => Step::End,
+            }
+        }
+    }
+
+    #[test]
+    fn what_is_past_the_valid_length_is_zeros_whichever_chunk_it_falls_in() {
+        let mut disk = Cursor::new(Vec::new());
+        let mut v = Vol {
+            disk: &mut disk,
+            len: 0,
+            max: 0,
+        };
+        let chunks = vec![vec![1u8; 4], vec![2u8; 4], vec![3u8; 4]];
+        for (valid, want) in [
+            (0u64, [0u8; 12].to_vec()),
+            (3, [vec![1; 3], vec![0; 9]].concat()),
+            (4, [vec![1; 4], vec![0; 8]].concat()),
+            (6, [vec![1; 4], vec![2; 2], vec![0; 6]].concat()),
+            (12, [vec![1; 4], vec![2; 4], vec![3; 4]].concat()),
+        ] {
+            let mut fill = Valid {
+                inner: Chunks(chunks.clone().into_iter()),
+                at: 0,
+                valid,
+            };
+            let mut out = Vec::new();
+            while fill.fill(&mut v, &mut out) == Step::More {}
+            assert_eq!(out, want, "valid {valid}");
+        }
+    }
+
+    #[test]
+    fn files_over_the_buffer_limit_are_read_as_they_go_and_come_out_as_they_do_held() {
+        let d = mixed();
+        let (held, end) = walked(&d, Limits::default());
+        end.unwrap();
+        let limits = Limits {
+            max_buffer_bytes: 100,
+            ..Limits::default()
+        };
+        let mut budget = Budget::new(limits);
+        let len = d.len() as u64;
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(&d[..]), len, &mut budget, emit));
+        end.unwrap();
+        assert_eq!(e.len(), held.len());
+        for ((entry, streamed), (name, data, _)) in e.iter().zip(&held) {
+            assert_eq!((&entry.name, &entry.data), (name, data));
+            assert_eq!(*streamed, data.len() > 100, "{name}");
+            assert_eq!(entry.unsupported, None, "{name}");
+        }
+        assert!(e.iter().filter(|(_, streamed)| *streamed).count() >= 3);
+    }
+
+    #[test]
+    fn a_boot_sector_that_describes_no_volume_is_not_opened() {
+        // What is written, and where.
+        let edits: [(&str, usize, &[u8]); 10] = [
+            ("a FAT parameter where zeros are", 20, &[1]),
+            ("a revision of another major number", 105, &[2]),
+            ("sectors of 256", 108, &[8]),
+            ("sectors of 8 KiB", 108, &[13]),
+            ("a cluster past 32 MiB", 109, &[17]),
+            ("three tables", 110, &[3]),
+            ("no tables", 110, &[0]),
+            ("no table length", 84, &[0, 0, 0, 0]),
+            ("a root outside the clusters", 96, &[200, 0, 0, 0]),
+            ("a heap past the volume", 88, &[0xFF, 0xFF, 0, 0]),
+        ];
+        for (what, at, bytes) in edits {
+            let mut d = Img::new().0;
+            d[at..at + bytes.len()].copy_from_slice(bytes);
+            let (e, end) = walked(&d, Limits::default());
+            assert!(e.is_empty(), "{what}");
+            // A boot sector that is not exFAT's is no volume; one that is and
+            // cannot be used is damage.
+            if is_exfat(&d) {
+                assert!(end.unwrap_err().is_corrupt(), "{what}");
+            }
+        }
+    }
+
+    #[test]
+    fn the_second_table_is_the_one_in_use_when_the_flags_say_so() {
+        let mut img = Img::new();
+        img.0[110] = 2;
+        let table = |img: &Img| {
+            let mut d = img.0.clone();
+            let len = d.len() as u64;
+            let mut cur = Cursor::new(&mut d[..]);
+            let mut v = Vol {
+                disk: &mut cur,
+                len,
+                max: 1 << 20,
+            };
+            open(&mut v).map(|f| f.table)
+        };
+        assert_eq!(table(&img), Some(512));
+        img.0[106] = 1;
+        assert_eq!(table(&img), Some(512 + 4 * 512));
+    }
+
+    #[test]
+    fn a_timestamp_is_wall_clock_or_none() {
+        let t: u32 = (44 << 25) | (3 << 21) | (5 << 16) | (14 << 11) | (30 << 5) | 6;
+        assert_eq!(
+            timestamp(t),
+            Some(Mtime::Local {
+                year: 2024,
+                month: 3,
+                day: 5,
+                hour: 14,
+                minute: 30,
+                second: 12
+            })
+        );
+        assert_eq!(timestamp(0), None);
+        assert_eq!(timestamp(t & !(0xF << 21)), None);
+        assert_eq!(timestamp((t & !(0x1F << 11)) | (25 << 11)), None);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/ext.rs b/crates/exav-unpack/src/formats/ext.rs
index 9f4a65fa..a0c17075 100644
--- a/crates/exav-unpack/src/formats/ext.rs
+++ b/crates/exav-unpack/src/formats/ext.rs
@@ -1,230 +1,1176 @@
-//! ext2/ext3/ext4 — walking the filesystem rather than carving the bytes.
+//! ext2, ext3 and ext4: the files of a volume, read where they lie.
 //!
-//! Same argument as `formats/fat.rs`: a disk image handed to a victim gets
-//! mounted, and what they run is a *file* in the filesystem. Carving finds a
-//! file whose magic sits at the start of a contiguous run and misses the rest,
-//! and ext4 fragments freely — a file written into a hole left by a deleted one
-//! lands in two extents, and the first fragment alone will not decompress.
-//! Reassembling it needs the inode's block map, which means reading the
-//! filesystem.
+//! A disk image handed to a victim is mounted, and what they run is a file in
+//! the filesystem. Carving finds a file whose magic sits at the start of a
+//! contiguous run and misses the rest, and ext4 fragments freely: a file
+//! written into a hole left by a deleted one lands in two extents, and the
+//! first fragment alone will not decompress. Reassembling it takes the inode's
+//! extent tree or block map, which means reading the filesystem.
 //!
-//! Reading is delegated to the `ext4-view` crate: read-only by construction (it
-//! has no write path at all), no `unsafe`, and no dependencies of its own.
+//! The volume is a `Read + Seek`, read where the walk goes: the superblock, the
+//! group descriptors, each directory's blocks, the inodes it names and the
+//! files' blocks. Only a file is ever held, bounded by the buffer limit.
 //!
-//! **This is a forced-materialization site.** `Ext4::load` takes an owned
-//! `Box<dyn Ext4Read>`, so the image is copied once — it cannot borrow the
-//! caller's buffer. The copy is charged against `max_buffer_bytes` like every
-//! other such site, and an image past that budget is reported rather than
-//! quietly skipped.
+//! ```text
+//! superblock (1024 bytes in)   block size, inode size, group geometry
+//!   group descriptors          where each group's inode table is
+//!     inode table              mode, size, and 60 bytes that are an extent
+//!                              tree root, a block map, or the data itself
+//!   directories                linear lists of (inode, name); an indexed
+//!                              directory is read as the list it also is
+//! ```
+//!
+//! Extents (ext4), block maps (ext2/3), inline data, 64-bit group descriptors
+//! and meta block groups are followed. A preallocated extent reads as zeros, as
+//! it does to the system that mounts the volume. A file in an encrypted
+//! directory is reported. A symbolic link or a device node holds no file's
+//! bytes and is not emitted. The journal is not replayed, and no checksum is
+//! checked: a structure the system would refuse to mount is read all the same,
+//! which can only show a scan more.
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use std::collections::{HashMap, HashSet};
+use std::io::{Read, Seek};
+
+use super::vol::{Attrs, Emit, Got, Next, Piece, Pieces, Plan, Vol, give, le16, le32, read_file};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, LimitHit, Mtime};
+
+/// The inode of the root directory.
+const ROOT: u32 = 2;
+
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
+
+/// The most runs of blocks one file or directory is followed through.
+const MAX_RUNS: usize = 1 << 20;
+
+/// The most blocks of an extent tree or block map one file is followed through.
+const MAX_TREE_NODES: u32 = 1 << 16;
+
+/// The deepest an extent tree goes.
+const MAX_EXTENT_DEPTH: u16 = 5;
 
-/// Bounds on the tree walk; hitting either is reported, never a quiet stop.
-const MAX_ENTRIES: usize = 20_000;
-const MAX_DEPTH: u32 = 32;
+/// How many descriptor blocks are kept.
+const DESC_CACHE: usize = 64;
 
-/// The superblock magic `0xEF53`, which sits 0x38 bytes into the superblock —
-/// itself 1024 bytes into the volume.
+/// `s_feature_incompat` bits.
+const INCOMPAT_JOURNAL_DEV: u32 = 0x8;
+const INCOMPAT_META_BG: u32 = 0x10;
+const INCOMPAT_64BIT: u32 = 0x80;
+const INCOMPAT_LARGEDIR: u32 = 0x4000;
+/// `s_feature_compat` and `s_feature_ro_compat` bits.
+const COMPAT_SPARSE_SUPER2: u32 = 0x200;
+const RO_COMPAT_SPARSE_SUPER: u32 = 0x1;
+const RO_COMPAT_BIGALLOC: u32 = 0x200;
+
+/// `i_flags` bits.
+const ENCRYPT_FL: u32 = 0x800;
+const EXTENTS_FL: u32 = 0x8_0000;
+const INLINE_DATA_FL: u32 = 0x1000_0000;
+
+const S_IFMT: u16 = 0o170000;
+const S_IFREG: u16 = 0o100000;
+const S_IFDIR: u16 = 0o040000;
+
+/// Whether `data`, the start of a volume, holds an ext superblock's magic.
 pub(crate) fn is_ext(data: &[u8]) -> bool {
     super::sniff::is(data, crate::Format::Ext)
 }
 
-pub(crate) fn extract_ext<R>(
-    data: &[u8],
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if !is_ext(data) {
-        return Ok(None);
-    }
-    // See the module note: the reader must own its bytes.
-    let cap = budget.limits.max_buffer_bytes;
-    if data.len() as u64 > cap {
-        budget.count_entry()?;
-        return Ok(visit(
-            Entry::unsupported(
-                "<ext-filesystem>".to_string(),
-                data.len() as u64,
-                false,
-                "ext filesystem image exceeds the peak-buffer budget, so the \
-                 files inside it were not examined",
-            ),
-            budget,
-        ));
+/// What the superblock says of the volume.
+struct Fs {
+    /// Bytes in a block.
+    bs: u64,
+    /// Blocks in the volume: those it says it has, or fewer where the image
+    /// ends first.
+    blocks: u64,
+    first_data: u64,
+    /// Blocks and inodes in a group.
+    bpg: u64,
+    ipg: u64,
+    inodes: u64,
+    inode_size: usize,
+    desc_size: usize,
+    groups: u64,
+    meta_bg: bool,
+    first_meta_bg: u64,
+    sparse: bool,
+    sparse2: bool,
+    backup: [u64; 2],
+    large_dir: bool,
+    /// Descriptor blocks read, by block.
+    descs: HashMap<u64, Vec<u8>>,
+}
+
+/// An inode.
+struct Inode {
+    mode: u16,
+    flags: u32,
+    size: u64,
+    mtime: i64,
+    raw: Vec<u8>,
+}
+
+impl Inode {
+    fn kind(&self) -> u16 {
+        self.mode & S_IFMT
     }
-    let fs = match ext4_view::Ext4::load(Box::new(data.to_vec())) {
-        Ok(fs) => fs,
-        Err(e) => {
-            // The superblock said ext; failing to mount leaves every file in it
-            // unexamined, which must not pass quietly.
-            let _ = e;
-            budget.count_entry()?;
-            return Ok(visit(
-                Entry::unsupported(
-                    "<ext-filesystem>".to_string(),
-                    data.len() as u64,
-                    false,
-                    "ext filesystem could not be mounted",
-                ),
-                budget,
-            ));
+
+    /// The 60 bytes that hold the extent tree, the block map or the data.
+    fn block(&self) -> &[u8] {
+        crate::bytes::at(&self.raw, 40, 60).unwrap_or(&[])
+    }
+
+    fn attrs(&self) -> Attrs {
+        Attrs {
+            mode: Some(u32::from(self.mode)),
+            mtime: Some(Mtime::Unix(self.mtime)),
         }
-    };
+    }
+}
 
-    let mut seen = 0usize;
-    let mut stack = vec![("/".to_string(), 0u32)];
-    while let Some((dir, depth)) = stack.pop() {
-        if depth > MAX_DEPTH {
-            budget.count_entry()?;
-            if let Some(r) = visit(
-                Entry::unsupported(
-                    format!("<ext-below-depth-{MAX_DEPTH}>"),
-                    0,
-                    false,
-                    "ext directory tree deeper than exav walks",
-                ),
-                budget,
-            ) {
-                return Ok(Some(r));
+/// A run of a file's blocks.
+struct Run {
+    logical: u64,
+    phys: u64,
+    len: u64,
+    /// Preallocated, not written: it reads as zeros.
+    zero: bool,
+}
+
+/// The stretches of a file, from its runs: a block the map does not give is a
+/// hole.
+struct Extents {
+    runs: std::vec::IntoIter<Run>,
+    /// A run held back while the hole before it is given.
+    pending: Option<Run>,
+    bs: u64,
+    size: u64,
+    /// How many bytes of the file the stretches given so far cover.
+    at: u64,
+    /// The map is whole where its runs end.
+    intact: bool,
+}
+
+impl Plan for Extents {
+    fn next(&mut self, _: &mut Vol) -> Next {
+        loop {
+            if self.at >= self.size {
+                return Next::End;
             }
-            continue;
-        }
-        let entries = match fs.read_dir(dir.as_str()) {
-            Ok(e) => e,
-            Err(e) => {
-                // Everything under an unreadable directory is unreachable.
-                let _ = e;
-                budget.count_entry()?;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        format!("<ext-dir:{dir}>"),
-                        0,
-                        false,
-                        "unreadable ext directory; its contents are unreachable",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+            let Some(run) = self.pending.take().or_else(|| self.runs.next()) else {
+                // Past the last run, to the end of the file, is a hole.
+                if !self.intact {
+                    return Next::Broken;
                 }
+                let n = self.size.saturating_sub(self.at);
+                self.at = self.size;
+                return Next::Piece(Piece::Zeros(n));
+            };
+            let from = run.logical.saturating_mul(self.bs);
+            if from >= self.size {
+                self.runs = Vec::new().into_iter();
                 continue;
             }
+            // Runs come in order and do not overlap.
+            if from < self.at {
+                return Next::Broken;
+            }
+            if from > self.at {
+                let hole = from.saturating_sub(self.at);
+                self.at = from;
+                self.pending = Some(run);
+                return Next::Piece(Piece::Zeros(hole));
+            }
+            let want = run
+                .len
+                .saturating_mul(self.bs)
+                .min(self.size.saturating_sub(from));
+            self.at = from.saturating_add(want);
+            if run.zero {
+                return Next::Piece(Piece::Zeros(want));
+            }
+            return match run.phys.checked_mul(self.bs) {
+                Some(at) => Next::Piece(Piece::Disk(at, want)),
+                None => Next::Broken,
+            };
+        }
+    }
+}
+
+/// Where following a map stands.
+enum Flow {
+    More,
+    /// Everything wanted has been seen.
+    Done,
+    Bad,
+}
+
+impl Fs {
+    /// Whether group `g` holds a copy of the superblock.
+    fn has_super(&self, g: u64) -> bool {
+        if g == 0 {
+            return true;
+        }
+        if self.sparse2 {
+            return g == self.backup[0] || g == self.backup[1];
+        }
+        if !self.sparse {
+            return true;
+        }
+        g == 1 || [3u64, 5, 7].iter().any(|&p| is_power_of(g, p))
+    }
+
+    /// The block of group `g`'s inode table.
+    fn inode_table(&mut self, v: &mut Vol, g: u64) -> Option<u64> {
+        if g >= self.groups {
+            return None;
+        }
+        let per = self.bs.checked_div(self.desc_size as u64)?;
+        let (nr, idx) = (g.checked_div(per)?, g.checked_rem(per)?);
+        let at = if !self.meta_bg || nr < self.first_meta_bg {
+            // The superblock is in block 1 of a volume of 1 KiB blocks, else in 0.
+            let sb = u64::from(self.bs == 1024);
+            sb.saturating_add(1).saturating_add(nr)
+        } else {
+            let first = nr.saturating_mul(per);
+            self.first_data
+                .saturating_add(first.saturating_mul(self.bpg))
+                .saturating_add(u64::from(self.has_super(first)))
+        };
+        if !self.descs.contains_key(&at) {
+            let block = v.at(at.checked_mul(self.bs)?, crate::bytes::to_usize(self.bs))?;
+            if self.descs.len() >= DESC_CACHE {
+                self.descs.clear();
+            }
+            self.descs.insert(at, block);
+        }
+        let block = self.descs.get(&at)?;
+        let d = crate::bytes::at(
+            block,
+            crate::bytes::to_usize(idx).checked_mul(self.desc_size)?,
+            self.desc_size,
+        )?;
+        let lo = u64::from(le32(d, 8));
+        let hi = if self.desc_size >= 64 {
+            u64::from(le32(d, 0x28))
+        } else {
+            0
         };
-        for entry in entries {
-            let Ok(entry) = entry else {
-                budget.count_entry()?;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        format!("<ext-dir:{dir}>"),
-                        0,
-                        false,
-                        "unreadable ext directory entry; the rest of that \
-                         directory is unreachable",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
-                }
-                break;
+        Some(lo | hi.checked_shl(32)?)
+    }
+
+    fn inode(&mut self, v: &mut Vol, ino: u32) -> Option<Inode> {
+        let n = u64::from(ino);
+        if n == 0 || n > self.inodes {
+            return None;
+        }
+        let n = n.saturating_sub(1);
+        let table = self.inode_table(v, n.checked_div(self.ipg)?)?;
+        let slot = n.checked_rem(self.ipg)?;
+        let off = table
+            .checked_mul(self.bs)?
+            .checked_add(slot.checked_mul(self.inode_size as u64)?)?;
+        let raw = v.at(off, self.inode_size)?;
+        let mode = le16(&raw, 0);
+        let kind = mode & S_IFMT;
+        let hi = if kind == S_IFREG || (kind == S_IFDIR && self.large_dir) {
+            u64::from(le32(&raw, 108))
+        } else {
+            0
+        };
+        let size = u64::from(le32(&raw, 4)) | hi.checked_shl(32)?;
+        // The high bits of the time are in the extra fields, if the inode has them.
+        let extra = usize::from(le16(&raw, 128)) >= 12;
+        let epoch = if extra { le32(&raw, 136) & 3 } else { 0 };
+        let secs = i64::from(i32::from_le_bytes(le32(&raw, 16).to_le_bytes()));
+        let mtime = secs.saturating_add(i64::from(epoch).saturating_mul(1 << 32));
+        Some(Inode {
+            mode,
+            flags: le32(&raw, 32),
+            size,
+            mtime,
+            raw,
+        })
+    }
+
+    /// The runs of `ino`'s blocks before logical block `upto`, in order. The
+    /// flag is false where the extent tree or the block map is damaged.
+    fn runs(&self, v: &mut Vol, ino: &Inode, upto: u64) -> (Vec<Run>, bool) {
+        let mut m = Map {
+            fs: self,
+            upto,
+            runs: Vec::new(),
+            next: 0,
+            nodes: 0,
+        };
+        let flow = if ino.flags & EXTENTS_FL != 0 {
+            m.extents(v, ino.block(), None)
+        } else {
+            m.blocks(v, ino.block())
+        };
+        (m.runs, !matches!(flow, Flow::Bad))
+    }
+
+    /// The bytes of a regular file: held when they are at most `cap`, else
+    /// read as they go.
+    fn file<'a>(&self, v: &'a mut Vol<'_>, ino: &Inode, cap: u64) -> Got<'a> {
+        if ino.flags & ENCRYPT_FL != 0 {
+            return Got::Locked("ext file is encrypted");
+        }
+        if ino.flags & INLINE_DATA_FL != 0 {
+            let size = crate::bytes::to_usize(ino.size);
+            let mut data = inline_data(ino);
+            let whole = data.len() >= size;
+            data.truncate(size);
+            return if whole {
+                Got::Whole(data)
+            } else {
+                Got::Short(data)
             };
-            // A name that is not UTF-8 is still a name a `.cdb` signature may
-            // match on; `display()` keeps it printable without inventing bytes.
-            let name = entry.file_name().display().to_string();
-            if name == "." || name == ".." {
-                continue;
+        }
+        let (runs, intact) = self.runs(v, ino, ino.size.div_ceil(self.bs));
+        let plan = Extents {
+            runs: runs.into_iter(),
+            pending: None,
+            bs: self.bs,
+            size: ino.size,
+            at: 0,
+            intact,
+        };
+        read_file(v, Pieces::new(plan, ino.size), ino.size, cap)
+    }
+
+    /// The entries of directory `ino`, up to `limit` of them. The flag is
+    /// false where the directory is damaged. `left` counts the directory blocks
+    /// the walk may still read.
+    fn entries(
+        &self,
+        v: &mut Vol,
+        ino: &Inode,
+        left: &mut u64,
+        limit: usize,
+    ) -> (Vec<(String, u32)>, bool) {
+        let mut out = Vec::new();
+        let bs = crate::bytes::to_usize(self.bs);
+        if ino.flags & INLINE_DATA_FL != 0 {
+            // The parent's number, then entries; more of them in the attribute.
+            let head = ino.block().get(4..).unwrap_or(&[]);
+            let mut intact = dirents(head, bs, &mut out, limit);
+            if let Some(more) = system_data(&ino.raw) {
+                intact &= dirents(more, bs, &mut out, limit);
             }
-            let path = format!("{}{}", dir.trim_end_matches('/'), format_args!("/{name}"));
-            seen = seen.saturating_add(1);
-            if seen > MAX_ENTRIES {
-                budget.count_entry()?;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        format!("<ext-entries-beyond-{MAX_ENTRIES}>"),
-                        0,
-                        false,
-                        "too many ext entries to walk them all",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+            return (out, intact);
+        }
+        let upto = ino.size.div_ceil(self.bs);
+        let (runs, mut intact) = self.runs(v, ino, upto);
+        let mut at = 0u64;
+        'runs: for run in runs {
+            // A directory with a hole in it.
+            intact &= run.logical == at;
+            at = run.logical;
+            for i in 0..run.len.min(upto.saturating_sub(run.logical)) {
+                if *left == 0 {
+                    intact = false;
+                    break 'runs;
                 }
-                return Ok(None);
-            }
-            // `symlink_metadata` rather than `metadata`: a symlink must be seen
-            // as a symlink, not silently followed to whatever it points at —
-            // which for an absolute target would be a path outside the image.
-            let Ok(meta) = fs.symlink_metadata(path.as_str()) else {
-                budget.count_entry()?;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        path,
-                        0,
-                        false,
-                        "ext inode could not be read, so this file went unexamined",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+                *left = left.saturating_sub(1);
+                at = at.saturating_add(1);
+                // A block never written is zeros, which is no entry.
+                let block = (!run.zero)
+                    .then(|| {
+                        let blk = run.phys.saturating_add(i);
+                        blk.checked_mul(self.bs).and_then(|o| v.at(o, bs))
+                    })
+                    .flatten();
+                let Some(block) = block else {
+                    intact = false;
+                    continue;
+                };
+                intact &= dirents(&block, bs, &mut out, limit);
+                if out.len() >= limit {
+                    break 'runs;
                 }
-                continue;
+            }
+        }
+        (out, intact)
+    }
+}
+
+/// Whether `n` is a power of `p`.
+fn is_power_of(mut n: u64, p: u64) -> bool {
+    if n == 0 || p < 2 {
+        return false;
+    }
+    while n.checked_rem(p) == Some(0) {
+        n = n.checked_div(p).unwrap_or(0);
+    }
+    n == 1
+}
+
+/// The length of a directory entry, as the block size stores it.
+fn rec_len(raw: u16, bs: usize) -> usize {
+    if bs < 1 << 16 {
+        usize::from(raw)
+    } else if raw == 0 || raw == u16::MAX {
+        bs
+    } else {
+        usize::from(raw & 0xFFFC) | (usize::from(raw & 3) << 16)
+    }
+}
+
+/// Append the named entries of a block of directory entries to `out`, up to
+/// `limit` in all. False where an entry is not well formed: the rest of the
+/// block is not read.
+fn dirents(block: &[u8], bs: usize, out: &mut Vec<(String, u32)>, limit: usize) -> bool {
+    let mut pos = 0usize;
+    while pos < block.len() {
+        let Some(head) = crate::bytes::at(block, pos, 8) else {
+            return false;
+        };
+        let ino = le32(head, 0);
+        let rec = rec_len(le16(head, 4), bs);
+        let name_len = usize::from(head[6]);
+        let end = pos.saturating_add(rec);
+        if rec < 8
+            || !rec.is_multiple_of(4)
+            || end > block.len()
+            || name_len.saturating_add(8) > rec
+        {
+            return false;
+        }
+        let name = crate::bytes::at(block, pos.saturating_add(8), name_len).unwrap_or(&[]);
+        // The directory and its parent are not entries of it to walk.
+        if ino != 0 && name_len > 0 && name != b"." && name != b".." {
+            if out.len() >= limit {
+                return true;
+            }
+            out.push((String::from_utf8_lossy(name).into_owned(), ino));
+        }
+        pos = end;
+    }
+    true
+}
+
+/// The `system.data` attribute kept in the inode itself: the end of a file or
+/// a directory that does not fit the 60 bytes of `i_block`.
+fn system_data(raw: &[u8]) -> Option<&[u8]> {
+    let start = 128usize.saturating_add(usize::from(le16(raw, 128)));
+    let region = raw.get(start..)?;
+    if le32(region, 0) != 0xEA02_0000 {
+        return None;
+    }
+    let mut pos = 4usize;
+    loop {
+        let e = crate::bytes::at(region, pos, 16)?;
+        if le32(e, 0) == 0 {
+            return None;
+        }
+        let name_len = usize::from(e[0]);
+        let name = crate::bytes::at(region, pos.saturating_add(16), name_len)?;
+        if e[1] == 7 && name == b"data" {
+            // Values are placed from the first entry on.
+            let off = 4usize.saturating_add(usize::from(le16(e, 2)));
+            return crate::bytes::at(region, off, crate::bytes::to_usize(u64::from(le32(e, 8))));
+        }
+        let step = name_len.saturating_add(16).saturating_add(3) & !3;
+        pos = pos.saturating_add(step);
+    }
+}
+
+/// The bytes of a file or a directory kept in its inode.
+fn inline_data(ino: &Inode) -> Vec<u8> {
+    let mut data = ino.block().to_vec();
+    if let Some(more) = system_data(&ino.raw) {
+        data.extend_from_slice(more);
+    }
+    data
+}
+
+/// Following the extent tree or the block map of one inode.
+struct Map<'a> {
+    fs: &'a Fs,
+    /// The first logical block that is not wanted.
+    upto: u64,
+    runs: Vec<Run>,
+    /// The logical block the next run must not start before.
+    next: u64,
+    nodes: u32,
+}
+
+impl Map<'_> {
+    fn push(&mut self, run: Run) -> Flow {
+        if run.logical >= self.upto {
+            return Flow::Done;
+        }
+        // Runs come in order and do not overlap; one that does is not a map.
+        if run.logical < self.next || self.runs.len() >= MAX_RUNS {
+            return Flow::Bad;
+        }
+        self.next = run.logical.saturating_add(run.len);
+        self.runs.push(run);
+        Flow::More
+    }
+
+    /// The runs of the extent tree whose node is `node`.
+    fn extents(&mut self, v: &mut Vol, node: &[u8], depth: Option<u16>) -> Flow {
+        let height = le16(node, 6);
+        let entries = usize::from(le16(node, 2));
+        let room = node.len().saturating_sub(12).checked_div(12).unwrap_or(0);
+        if le16(node, 0) != 0xF30A
+            || height > MAX_EXTENT_DEPTH
+            || depth.is_some_and(|d| d != height)
+            || entries > room
+        {
+            return Flow::Bad;
+        }
+        for i in 0..entries {
+            let at = 12usize.saturating_add(i.saturating_mul(12));
+            let Some(e) = crate::bytes::at(node, at, 12) else {
+                return Flow::Bad;
             };
-            if meta.is_dir() {
-                stack.push((path, depth.saturating_add(1)));
-                continue;
+            let block = u64::from(le32(e, 0));
+            if height == 0 {
+                let raw = u64::from(le16(e, 4));
+                // A length past 32768 marks an extent preallocated, not written.
+                let (len, zero) = match raw.checked_sub(32768) {
+                    Some(n) if n > 0 => (n, true),
+                    _ => (raw, false),
+                };
+                if len == 0 {
+                    continue;
+                }
+                let phys = u64::from(le32(e, 8)) | u64::from(le16(e, 6)).saturating_mul(1 << 32);
+                match self.push(Run {
+                    logical: block,
+                    phys,
+                    len,
+                    zero,
+                }) {
+                    Flow::More => {}
+                    other => return other,
+                }
+            } else {
+                if block >= self.upto {
+                    return Flow::Done;
+                }
+                let child = u64::from(le32(e, 4)) | u64::from(le16(e, 8)).saturating_mul(1 << 32);
+                self.nodes = self.nodes.saturating_add(1);
+                let read = (self.nodes <= MAX_TREE_NODES)
+                    .then(|| child.checked_mul(self.fs.bs))
+                    .flatten()
+                    .and_then(|o| v.at(o, crate::bytes::to_usize(self.fs.bs)));
+                let Some(read) = read else {
+                    return Flow::Bad;
+                };
+                match self.extents(v, &read, Some(height.saturating_sub(1))) {
+                    Flow::More => {}
+                    other => return other,
+                }
             }
-            // Only regular files hold content. A symlink is a path, and a
-            // device/fifo/socket node has no bytes in the image at all — there
-            // is nothing here that went unscanned, so nothing to report.
-            if meta.file_type() != ext4_view::FileType::Regular {
-                continue;
+        }
+        Flow::More
+    }
+
+    /// The runs of a block map, `i_block` being twelve block numbers and then
+    /// those of a block of block numbers, one of those, and one of those.
+    fn blocks(&mut self, v: &mut Vol, i_block: &[u8]) -> Flow {
+        let mut at = 0u64;
+        let mut last: Option<Run> = None;
+        let flow = self.map_blocks(v, i_block, &mut at, &mut last);
+        if let Some(run) = last
+            && let Flow::Bad = self.push(run)
+        {
+            return Flow::Bad;
+        }
+        flow
+    }
+
+    fn map_blocks(
+        &mut self,
+        v: &mut Vol,
+        i_block: &[u8],
+        at: &mut u64,
+        last: &mut Option<Run>,
+    ) -> Flow {
+        for slot in 0..15usize {
+            if *at >= self.upto {
+                return Flow::Done;
+            }
+            let ptr = u64::from(le32(i_block, slot.saturating_mul(4)));
+            let level = match slot {
+                0..=11 => 0u32,
+                12 => 1,
+                13 => 2,
+                _ => 3,
+            };
+            match self.level(v, level, ptr, at, last) {
+                Flow::More => {}
+                other => return other,
+            }
+        }
+        Flow::More
+    }
+
+    /// The blocks `ptr` stands for: a data block at level 0, else a block of
+    /// pointers to the level below.
+    fn level(
+        &mut self,
+        v: &mut Vol,
+        level: u32,
+        ptr: u64,
+        at: &mut u64,
+        last: &mut Option<Run>,
+    ) -> Flow {
+        let per = self.fs.bs.checked_div(4).unwrap_or(0);
+        if level == 0 {
+            let here = *at;
+            *at = at.saturating_add(1);
+            if ptr == 0 {
+                return self.flush(last);
             }
+            if let Some(run) = last
+                && run.phys.saturating_add(run.len) == ptr
+                && run.logical.saturating_add(run.len) == here
+            {
+                run.len = run.len.saturating_add(1);
+                return Flow::More;
+            }
+            if let Flow::Bad = self.flush(last) {
+                return Flow::Bad;
+            }
+            *last = Some(Run {
+                logical: here,
+                phys: ptr,
+                len: 1,
+                zero: false,
+            });
+            return Flow::More;
+        }
+        if ptr == 0 {
+            // A hole as wide as the blocks below it.
+            *at = at.saturating_add(per.saturating_pow(level));
+            return self.flush(last);
+        }
+        self.nodes = self.nodes.saturating_add(1);
+        let read = (self.nodes <= MAX_TREE_NODES)
+            .then(|| ptr.checked_mul(self.fs.bs))
+            .flatten()
+            .and_then(|o| v.at(o, crate::bytes::to_usize(self.fs.bs)));
+        let Some(read) = read else {
+            return Flow::Bad;
+        };
+        for i in 0..crate::bytes::to_usize(per) {
+            if *at >= self.upto {
+                return Flow::Done;
+            }
+            let p = u64::from(le32(&read, i.saturating_mul(4)));
+            match self.level(v, level.saturating_sub(1), p, at, last) {
+                Flow::More => {}
+                other => return other,
+            }
+        }
+        Flow::More
+    }
 
+    fn flush(&mut self, last: &mut Option<Run>) -> Flow {
+        match last.take() {
+            Some(run) => self.push(run),
+            None => Flow::More,
+        }
+    }
+}
+
+/// The volume's superblock, or `None` where it is not one a system would mount.
+fn open(v: &mut Vol) -> Option<Fs> {
+    let sb = v.at(1024, 1024)?;
+    if le16(&sb, 56) != 0xEF53 {
+        return None;
+    }
+    let bs = 1024u64
+        .checked_shl(le32(&sb, 24))
+        .filter(|&b| b <= 1 << 16)?;
+    let (compat, incompat, ro_compat) = (le32(&sb, 92), le32(&sb, 96), le32(&sb, 100));
+    // A journal kept apart from the files it journals holds none of them.
+    if incompat & INCOMPAT_JOURNAL_DEV != 0 {
+        return None;
+    }
+    let wide = incompat & INCOMPAT_64BIT != 0;
+    let hi = if wide { u64::from(le32(&sb, 336)) } else { 0 };
+    let blocks = (u64::from(le32(&sb, 4)) | hi.checked_shl(32)?).min(v.len.checked_div(bs)?);
+    let first_data = u64::from(le32(&sb, 20));
+    let (bpg, ipg) = (u64::from(le32(&sb, 32)), u64::from(le32(&sb, 40)));
+    // A bitmap bit stands for a cluster, which is a block unless bigalloc says more.
+    let ratio = if ro_compat & RO_COMPAT_BIGALLOC != 0 {
+        let shift = le32(&sb, 28).checked_sub(le32(&sb, 24))?;
+        1u64.checked_shl(shift).filter(|&r| r <= 1 << 16)?
+    } else {
+        1
+    };
+    let per_bitmap = bs.checked_mul(8)?;
+    if bpg == 0
+        || ipg == 0
+        || bpg > per_bitmap.checked_mul(ratio)?
+        || ipg > per_bitmap
+        || blocks <= first_data
+    {
+        return None;
+    }
+    let inode_size = if le32(&sb, 76) == 0 {
+        128
+    } else {
+        usize::from(le16(&sb, 88))
+    };
+    if !inode_size.is_power_of_two() || inode_size < 128 || inode_size as u64 > bs {
+        return None;
+    }
+    let desc_size = if wide {
+        usize::from(le16(&sb, 254))
+    } else {
+        32
+    };
+    if !desc_size.is_power_of_two() || desc_size < 32 || (wide && desc_size < 64) {
+        return None;
+    }
+    if desc_size as u64 > bs {
+        return None;
+    }
+    let groups = blocks.saturating_sub(first_data).div_ceil(bpg);
+    let mut fs = Fs {
+        bs,
+        blocks,
+        first_data,
+        bpg,
+        ipg,
+        inodes: u64::from(le32(&sb, 0)).min(groups.saturating_mul(ipg)),
+        inode_size,
+        desc_size,
+        groups,
+        meta_bg: incompat & INCOMPAT_META_BG != 0,
+        first_meta_bg: u64::from(le32(&sb, 0x104)),
+        sparse: ro_compat & RO_COMPAT_SPARSE_SUPER != 0,
+        sparse2: compat & COMPAT_SPARSE_SUPER2 != 0,
+        backup: [u64::from(le32(&sb, 0x24C)), u64::from(le32(&sb, 0x250))],
+        large_dir: incompat & INCOMPAT_LARGEDIR != 0,
+        descs: HashMap::new(),
+    };
+    // A volume whose root is not a directory is none that can be walked.
+    let root = fs.inode(v, ROOT)?;
+    (root.kind() == S_IFDIR).then_some(fs)
+}
+
+/// Whether `src` is an ext volume a system would mount: a superblock, and a root
+/// that is a directory. The first kilobyte is left to boot code, so a file that
+/// starts as something else can be one too.
+pub(crate) fn is_volume(src: &dyn ByteSource) -> bool {
+    let mut disk = Reader::new(src);
+    let mut v = Vol {
+        disk: &mut disk,
+        len: src.len() as u64,
+        max: 1 << 20,
+    };
+    v.at(1080, 2).is_some_and(|m| m == [0x53, 0xEF]) && open(&mut v).is_some()
+}
+
+/// Walk an ext volume given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the ext volume `disk`, which is `len` bytes long, handing each file to
+/// `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    match v.at(1080, 2) {
+        Some(magic) if magic == [0x53, 0xEF] => {}
+        _ => return Ok(None),
+    }
+    let Some(mut fs) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "ext open: the superblock or the root directory is unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    let mut left = fs.blocks;
+    let mut damaged = false;
+    // A directory is walked once, whatever names it has.
+    let mut seen: HashSet<u32> = HashSet::from([ROOT]);
+    let mut stack = vec![(ROOT, String::new(), 0usize)];
+    while let Some((dir, prefix, depth)) = stack.pop() {
+        let Some(ino) = fs.inode(&mut v, dir) else {
+            damaged = true;
+            continue;
+        };
+        let (list, intact) = fs.entries(&mut v, &ino, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for (name, n) in list {
             budget.count_entry()?;
-            let declared = meta.len();
-            let cap = budget.reserve()?;
-            if declared > cap {
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        path,
-                        declared,
-                        false,
-                        "ext file exceeds the per-member size budget",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
-                }
+            let path = if prefix.is_empty() {
+                name
+            } else {
+                format!("{prefix}/{name}")
+            };
+            let Some(child) = fs.inode(&mut v, n) else {
+                damaged = true;
                 continue;
-            }
-            // Reading follows the inode's extent tree / block map, which is the
-            // whole point: a fragmented file comes back whole here and does not
-            // from a carve.
-            let bytes = match fs.read(path.as_str()) {
-                Ok(b) => b,
-                Err(e) => {
-                    let _ = e;
-                    if let Some(r) = visit(
-                        Entry::unsupported(
-                            path,
-                            declared,
-                            false,
-                            "ext file could not be read from its block map",
-                        ),
-                        budget,
-                    ) {
+            };
+            match child.kind() {
+                S_IFDIR => {
+                    if depth >= MAX_DEPTH {
+                        damaged = true;
+                    } else if seen.insert(n) {
+                        below.push((n, path, depth.saturating_add(1)));
+                    }
+                }
+                S_IFREG => {
+                    let attrs = child.attrs();
+                    if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                        fs.file(&mut v, &child, cap)
+                    })? {
                         return Ok(Some(r));
                     }
-                    continue;
                 }
-            };
-            budget.commit(bytes.len() as u64);
-            if let Some(r) = visit(Entry::new(path, bytes), budget) {
-                return Ok(Some(r));
+                // A link or a node holds no file's bytes.
+                _ => {}
             }
         }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "ext walk: the volume is damaged; the files before the damage were scanned".into(),
+        ));
     }
     Ok(None)
 }
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
+    use std::io::Cursor;
+
+    fn fs(bs: u64) -> Fs {
+        Fs {
+            bs,
+            blocks: 1 << 20,
+            first_data: 0,
+            bpg: 8192,
+            ipg: 8192,
+            inodes: 1 << 20,
+            inode_size: 256,
+            desc_size: 64,
+            groups: 1,
+            meta_bg: false,
+            first_meta_bg: 0,
+            sparse: true,
+            sparse2: false,
+            backup: [0; 2],
+            large_dir: false,
+            descs: HashMap::new(),
+        }
+    }
+
+    /// An extent node: the header, then `entries` as (first, len, physical) of
+    /// a leaf, or (first, 0, child) of an index when `height` is not 0.
+    fn node(height: u16, entries: &[(u32, u16, u32)]) -> Vec<u8> {
+        let mut n = vec![0u8; 12 + 12 * entries.len()];
+        n[0..2].copy_from_slice(&0xF30Au16.to_le_bytes());
+        n[2..4].copy_from_slice(&(entries.len() as u16).to_le_bytes());
+        n[4..6].copy_from_slice(&(entries.len() as u16).to_le_bytes());
+        n[6..8].copy_from_slice(&height.to_le_bytes());
+        for (i, (first, len, phys)) in entries.iter().enumerate() {
+            let e = 12 + 12 * i;
+            n[e..e + 4].copy_from_slice(&first.to_le_bytes());
+            if height == 0 {
+                n[e + 4..e + 6].copy_from_slice(&len.to_le_bytes());
+                n[e + 8..e + 12].copy_from_slice(&phys.to_le_bytes());
+            } else {
+                n[e + 4..e + 8].copy_from_slice(&phys.to_le_bytes());
+            }
+        }
+        n
+    }
+
+    fn runs(fs: &Fs, disk: Vec<u8>, node: &[u8], upto: u64) -> (Vec<(u64, u64, u64, bool)>, bool) {
+        let mut cur = Cursor::new(disk);
+        let len = cur.get_ref().len() as u64;
+        let mut v = Vol {
+            disk: &mut cur,
+            len,
+            max: 1 << 20,
+        };
+        let mut m = Map {
+            fs,
+            upto,
+            runs: Vec::new(),
+            next: 0,
+            nodes: 0,
+        };
+        let flow = m.extents(&mut v, node, None);
+        let runs = m
+            .runs
+            .iter()
+            .map(|r| (r.logical, r.phys, r.len, r.zero))
+            .collect();
+        (runs, !matches!(flow, Flow::Bad))
+    }
+
+    #[test]
+    fn the_extents_of_a_leaf_are_its_runs_and_a_preallocated_one_reads_as_zeros() {
+        let f = fs(1024);
+        let leaf = node(0, &[(0, 4, 100), (10, 32768 + 5, 200), (20, 0, 300)]);
+        let (r, ok) = runs(&f, vec![], &leaf, 100);
+        assert!(ok);
+        // A length of 0 is no extent.
+        assert_eq!(r, [(0, 100, 4, false), (10, 200, 5, true)]);
+    }
+
+    #[test]
+    fn extents_are_followed_through_an_index_to_the_blocks_it_wants() {
+        let f = fs(1024);
+        let mut disk = vec![0u8; 8192];
+        let a = node(0, &[(0, 2, 50), (2, 2, 60)]);
+        let b = node(0, &[(100, 3, 70)]);
+        disk[2048..2048 + a.len()].copy_from_slice(&a);
+        disk[3072..3072 + b.len()].copy_from_slice(&b);
+        let root = node(1, &[(0, 0, 2), (100, 0, 3)]);
+        let (r, ok) = runs(&f, disk.clone(), &root, 1000);
+        assert!(ok);
+        assert_eq!(r.len(), 3);
+        assert_eq!(r[2], (100, 70, 3, false));
+        // Only the first node is read when nothing past block 50 is wanted.
+        let (r, ok) = runs(&f, disk, &root, 50);
+        assert!(ok);
+        assert_eq!(r.len(), 2);
+    }
+
+    #[test]
+    fn extents_out_of_order_or_overlapping_are_not_a_map() {
+        let f = fs(1024);
+        let (_, ok) = runs(&f, vec![], &node(0, &[(10, 2, 1), (5, 2, 9)]), 100);
+        assert!(!ok, "out of order");
+        let (r, ok) = runs(&f, vec![], &node(0, &[(0, 10, 1), (5, 2, 9)]), 100);
+        assert!(!ok && r.len() == 1, "overlapping");
+    }
+
+    #[test]
+    fn a_node_that_is_not_one_is_not_followed() {
+        let f = fs(1024);
+        let mut bad = node(0, &[(0, 1, 1)]);
+        bad[0] = 0;
+        assert!(!runs(&f, vec![], &bad, 10).1, "magic");
+        let mut more = node(0, &[(0, 1, 1)]);
+        more[2..4].copy_from_slice(&5u16.to_le_bytes());
+        assert!(!runs(&f, vec![], &more, 10).1, "more entries than room");
+        assert!(!runs(&f, vec![], &node(6, &[(0, 0, 1)]), 10).1, "too tall");
+        // An index that points at a node of the wrong height.
+        let mut disk = vec![0u8; 4096];
+        let leaf = node(1, &[(0, 0, 1)]);
+        disk[2048..2048 + leaf.len()].copy_from_slice(&leaf);
+        assert!(!runs(&f, disk, &node(1, &[(0, 0, 2)]), 10).1, "height");
+        // An index that points past the volume.
+        assert!(!runs(&f, vec![0; 1024], &node(1, &[(0, 0, 9)]), 10).1);
+    }
+
+    #[test]
+    fn a_block_map_is_followed_through_its_three_levels() {
+        let f = fs(1024);
+        // 256 pointers to a block: direct blocks 0 to 11, then 12 to 267 by
+        // the first level, then 268 to 65803 by the second, then the third.
+        let mut disk = vec![0u8; 16 * 1024];
+        let put = |disk: &mut Vec<u8>, block: usize, slot: usize, ptr: u32| {
+            disk[block * 1024 + slot * 4..][..4].copy_from_slice(&ptr.to_le_bytes());
+        };
+        put(&mut disk, 3, 0, 500); // indirect block 3: block 12 is at 500
+        put(&mut disk, 3, 1, 501);
+        put(&mut disk, 5, 0, 4); // double indirect 5 -> indirect 4
+        put(&mut disk, 4, 2, 900); // block 268 + 2 is at 900
+        put(&mut disk, 8, 0, 7); // triple indirect 8 -> double 7 -> indirect 6
+        put(&mut disk, 7, 0, 6);
+        put(&mut disk, 6, 0, 1200); // block 268 + 65536 is at 1200
+        let mut i_block = [0u8; 60];
+        for (slot, ptr) in [(0, 40), (1, 41), (3, 43), (12, 3), (13, 5), (14, 8)] {
+            i_block[slot * 4..][..4].copy_from_slice(&u32::to_le_bytes(ptr));
+        }
+        let mut cur = Cursor::new(disk);
+        let mut v = Vol {
+            disk: &mut cur,
+            len: 16 * 1024,
+            max: 1 << 20,
+        };
+        let mut m = Map {
+            fs: &f,
+            upto: 1 << 20,
+            runs: Vec::new(),
+            next: 0,
+            nodes: 0,
+        };
+        assert!(!matches!(m.blocks(&mut v, &i_block), Flow::Bad));
+        let got: Vec<_> = m.runs.iter().map(|r| (r.logical, r.phys, r.len)).collect();
+        assert_eq!(
+            got,
+            [
+                (0, 40, 2),
+                (3, 43, 1),
+                (12, 500, 2),
+                (270, 900, 1),
+                (65804, 1200, 1)
+            ]
+        );
+    }
+
+    #[test]
+    fn a_block_map_stops_at_the_blocks_wanted() {
+        let f = fs(1024);
+        let mut i_block = [0u8; 60];
+        for slot in 0..12usize {
+            i_block[slot * 4..][..4].copy_from_slice(&(100 + slot as u32).to_le_bytes());
+        }
+        let mut cur = Cursor::new(vec![0u8; 1024]);
+        let mut v = Vol {
+            disk: &mut cur,
+            len: 1024,
+            max: 1 << 20,
+        };
+        let mut m = Map {
+            fs: &f,
+            upto: 5,
+            runs: Vec::new(),
+            next: 0,
+            nodes: 0,
+        };
+        m.blocks(&mut v, &i_block);
+        assert_eq!(m.runs.len(), 1);
+        assert_eq!(m.runs[0].len, 5);
+    }
+
+    fn entry(ino: u32, rec: u16, name: &str) -> Vec<u8> {
+        let mut e = vec![0u8; usize::from(rec)];
+        e[0..4].copy_from_slice(&ino.to_le_bytes());
+        e[4..6].copy_from_slice(&rec.to_le_bytes());
+        e[6] = name.len() as u8;
+        e[8..8 + name.len()].copy_from_slice(name.as_bytes());
+        e
+    }
+
+    #[test]
+    fn the_entries_of_a_block_are_its_live_names() {
+        let block = [
+            entry(2, 12, "."),
+            entry(2, 12, ".."),
+            entry(5, 12, "a"),
+            // Deleted: no inode.
+            entry(0, 16, "gone"),
+            entry(7, 1024 - 52, "b.txt"),
+        ]
+        .concat();
+        let mut out = Vec::new();
+        assert!(dirents(&block, 1024, &mut out, 100));
+        assert_eq!(out, [("a".to_string(), 5), ("b.txt".to_string(), 7)]);
+        // As many as are wanted.
+        let mut out = Vec::new();
+        assert!(dirents(&block, 1024, &mut out, 1));
+        assert_eq!(out.len(), 1);
+    }
+
+    #[test]
+    fn a_block_whose_entries_do_not_add_up_is_damaged() {
+        // An entry's header, and `total` bytes in all.
+        let raw = |rec: u16, name_len: u8, total: usize| {
+            let mut e = vec![0u8; total];
+            e[0] = 5;
+            e[4..6].copy_from_slice(&rec.to_le_bytes());
+            e[6] = name_len;
+            e
+        };
+        for (what, bad) in [
+            ("a length of 0 never moves on", raw(0, 1, 16)),
+            ("a length that is not a multiple of 4", raw(10, 1, 16)),
+            ("a length under the header", raw(4, 0, 16)),
+            ("a name longer than its entry", raw(12, 9, 12)),
+            ("an entry that runs past the block", raw(24, 1, 16)),
+            ("less than a header left", vec![0; 4]),
+        ] {
+            let mut out = Vec::new();
+            assert!(!dirents(&bad, 1024, &mut out, 100), "{what}");
+        }
+    }
+
+    #[test]
+    fn the_length_of_an_entry_is_stored_as_the_block_size_says() {
+        assert_eq!(rec_len(12, 4096), 12);
+        assert_eq!(rec_len(0, 65536), 65536);
+        assert_eq!(rec_len(u16::MAX, 65536), 65536);
+        assert_eq!(rec_len(0x0104, 65536), 0x0104);
+        // The two low bits stand for bits 16 and 17.
+        assert_eq!(rec_len(0x0105, 65536), 0x1_0104);
+    }
+
+    #[test]
+    fn the_superblock_copies_are_in_the_groups_that_have_them() {
+        let mut f = fs(4096);
+        let have = |f: &Fs| (0..60).filter(|&g| f.has_super(g)).collect::<Vec<_>>();
+        assert_eq!(have(&f), [0, 1, 3, 5, 7, 9, 25, 27, 49]);
+        f.sparse = false;
+        assert_eq!(have(&f).len(), 60);
+        f.sparse = true;
+        f.sparse2 = true;
+        f.backup = [1, 40];
+        assert_eq!(have(&f), [0, 1, 40]);
+    }
+
+    #[test]
+    fn the_data_kept_in_the_inode_is_found_by_its_name() {
+        let mut raw = vec![0u8; 256];
+        raw[128..130].copy_from_slice(&32u16.to_le_bytes());
+        let at = 128 + 32;
+        raw[at..at + 4].copy_from_slice(&0xEA02_0000u32.to_le_bytes());
+        // An entry of another name first, then "data" in index 7 (system).
+        let mut e = vec![0u8; 16 + 4];
+        e[0] = 4;
+        e[1] = 7;
+        e[16..20].copy_from_slice(b"junk");
+        e.extend_from_slice(&[0; 16]);
+        let d = e.len() - 16;
+        e[d] = 4;
+        e[d + 1] = 7;
+        e[d + 2..d + 4].copy_from_slice(&80u16.to_le_bytes());
+        e[d + 8..d + 12].copy_from_slice(&5u32.to_le_bytes());
+        e.extend_from_slice(b"data");
+        raw[at + 4..at + 4 + e.len()].copy_from_slice(&e);
+        raw[at + 4 + 80..at + 4 + 85].copy_from_slice(b"hello");
+        assert_eq!(system_data(&raw), Some(&b"hello"[..]));
+        // A value that runs past the inode is no value.
+        raw[at + 4 + d + 8..at + 4 + d + 12].copy_from_slice(&500u32.to_le_bytes());
+        assert_eq!(system_data(&raw), None);
+        raw[at] = 0;
+        assert_eq!(system_data(&raw), None);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/fat.rs b/crates/exav-unpack/src/formats/fat.rs
index 3d9f7750..6050cb98 100644
--- a/crates/exav-unpack/src/formats/fat.rs
+++ b/crates/exav-unpack/src/formats/fat.rs
@@ -1,4 +1,4 @@
-//! FAT12/16/32 — walking the filesystem rather than carving the bytes.
+//! FAT12, FAT16 and FAT32: the files of a volume, read where they lie.
 //!
 //! A disk image handed to a victim is usually mounted, and what they run is a
 //! *file* in the filesystem. exav reconstructs the guest disk of every image
@@ -7,58 +7,60 @@
 //!
 //! What that costs, concretely. A FAT image with a zipped payload written to a
 //! fresh filesystem is contiguous, and carving reaches it. Write two other files
-//! first, delete the middle one, then write the payload — it lands in the hole
-//! and continues after, in two runs — and carving finds only the first
-//! fragment, which will not decompress. Reassembling that needs the cluster
-//! chain, which means reading the filesystem.
+//! first, delete the middle one, then write the payload: it lands in the hole
+//! and continues after, in two runs, and carving finds only the first fragment,
+//! which will not decompress. Reassembling that needs the cluster chain, which
+//! means reading the filesystem.
 //!
-//! Reading is delegated to the `fatfs` crate rather than hand-rolled: it carries
-//! no `unsafe`, and its only dependencies are `bitflags` and `log`.
+//! The volume is a `Read + Seek`, read where the walk goes: the boot sector,
+//! the part of the allocation table a chain passes through, each directory's
+//! clusters and each file's runs of clusters. Only a file is ever held, bounded
+//! by the buffer limit.
 //!
-//! The volume boot record is also what a partition table is *not* — see
-//! `formats/partition.rs`, where mistaking one for the other invents a partition
-//! spanning the whole image.
+//! ```text
+//! boot sector          sector and cluster sizes, where the tables start
+//!   allocation table   one entry per cluster: the next of its chain, or the end
+//!   root directory     a fixed run of sectors (FAT12/16) or a chain (FAT32)
+//!   data clusters      32-byte entries in a directory: a name, a first
+//!                      cluster and a size
+//! ```
+//!
+//! A long name is the UCS-2 text of the entries before its short one, taken
+//! when their checksum is the short name's, as the systems that mount the
+//! volume take it; otherwise the short name is the name. A deleted entry and
+//! the volume label are not files. The volume boot record is also what a
+//! partition table is *not*: see `formats/partition.rs`, where mistaking one for
+//! the other invents a partition spanning the whole image.
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use std::io::Cursor;
+use std::collections::{HashMap, HashSet};
+use std::io::{Read, Seek};
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use super::vol::{Attrs, Emit, Got, Next, Piece, Pieces, Plan, Vol, give, le16, le32, read_file};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, LimitHit, Mtime};
 
-/// Bound on the tree walk; hitting it is reported, never a quiet stop.
-const MAX_ENTRIES: usize = 20_000;
-const MAX_DEPTH: u32 = 32;
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
 
-/// A read-only view of the image for `fatfs`, whose storage trait requires
-/// `Write`. Writing is refused rather than supported, which keeps this
-/// zero-copy: wrapping a `Cursor<Vec<u8>>` instead would duplicate the whole
-/// reconstructed disk in memory.
-struct ReadOnly<'a> {
-    inner: Cursor<&'a [u8]>,
-}
+/// Bytes of the allocation table kept at a time.
+const PAGE: u64 = 4096;
 
-impl std::io::Read for ReadOnly<'_> {
-    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        self.inner.read(buf)
-    }
-}
+/// How many of those are kept.
+const PAGES: usize = 64;
 
-impl std::io::Write for ReadOnly<'_> {
-    fn write(&mut self, _buf: &[u8]) -> std::io::Result<usize> {
-        Err(std::io::Error::from(std::io::ErrorKind::PermissionDenied))
-    }
-    fn flush(&mut self) -> std::io::Result<()> {
-        Ok(())
-    }
-}
+/// Attribute bits.
+const ATTR_VOLUME: u8 = 0x08;
+const ATTR_DIR: u8 = 0x10;
+/// Read-only, hidden, system and volume label together mark a long name's part.
+const ATTR_LONG: u8 = 0x0F;
 
-impl std::io::Seek for ReadOnly<'_> {
-    fn seek(&mut self, pos: std::io::SeekFrom) -> std::io::Result<u64> {
-        self.inner.seek(pos)
-    }
-}
+/// The characters of CP437, the code page short names are in, from 0x80 on.
+const CP437: &str = "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u{a0}";
 
 /// Does this look like a FAT volume boot record?
 ///
@@ -96,140 +98,1068 @@ pub(crate) fn is_fat(data: &[u8]) -> bool {
         || matches!(ty32, Some(b"FAT32"))
 }
 
-pub(crate) fn extract_fat<R>(
-    data: &[u8],
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if !is_fat(data) {
-        return Ok(None);
+/// Where a directory is.
+#[derive(Clone, Copy)]
+enum Dir {
+    /// The root of a FAT12/16 volume: a run of sectors before the clusters.
+    Root,
+    /// A chain of clusters, from this one.
+    Chain(u32),
+}
+
+/// What an entry of the allocation table says.
+enum Link {
+    Next(u32),
+    End,
+    /// Free, bad or out of range: not a chain.
+    Broken,
+}
+
+/// A file or a directory in a directory.
+struct Item {
+    name: String,
+    dir: bool,
+    first: u32,
+    size: u32,
+    mtime: Option<Mtime>,
+}
+
+/// What the boot sector says of the volume.
+struct Fat {
+    /// Bytes in a cluster.
+    cluster: u64,
+    /// 12, 16 or 32.
+    bits: u32,
+    /// Clusters of data, numbered from 2.
+    clusters: u32,
+    /// Byte offsets of the table in use, of the fixed root directory and of
+    /// cluster 2.
+    table: u64,
+    root: u64,
+    root_len: u64,
+    data: u64,
+    /// The first cluster of a FAT32 root directory.
+    root_cluster: u32,
+    /// Pages of the table, by number.
+    pages: HashMap<u64, Vec<u8>>,
+}
+
+impl Fat {
+    /// The byte of the table at `off`.
+    fn table_byte(&mut self, v: &mut Vol, off: u64) -> Option<u8> {
+        let (page, at) = (off.checked_div(PAGE)?, off.checked_rem(PAGE)?);
+        if !self.pages.contains_key(&page) {
+            let start = page.checked_mul(PAGE)?;
+            let want = usize::try_from(PAGE).ok()?;
+            let got = v.at(self.table.checked_add(start)?, want).or_else(|| {
+                // The end of the volume may cut the last page short.
+                let left = v.len.checked_sub(self.table.checked_add(start)?)?;
+                v.at(
+                    self.table.checked_add(start)?,
+                    crate::bytes::to_usize(left.min(PAGE)),
+                )
+            })?;
+            if self.pages.len() >= PAGES {
+                self.pages.clear();
+            }
+            self.pages.insert(page, got);
+        }
+        self.pages
+            .get(&page)?
+            .get(crate::bytes::to_usize(at))
+            .copied()
     }
-    let storage = ReadOnly {
-        inner: Cursor::new(data),
-    };
-    let fs = match fatfs::FileSystem::new(storage, fatfs::FsOptions::new()) {
-        Ok(fs) => fs,
-        Err(e) => {
-            // The boot sector said FAT; failing to mount leaves every file in it
-            // unexamined, which must not pass quietly.
-            budget.count_entry()?;
-            return Ok(visit(
-                Entry::unsupported("<fat-volume>".to_string(), data.len() as u64, false, {
-                    let _ = e;
-                    "FAT filesystem could not be mounted"
-                }),
-                budget,
-            ));
+
+    /// The `n` bytes of the table at `off`, as a little-endian number.
+    fn entry(&mut self, v: &mut Vol, off: u64, n: u64) -> Option<u32> {
+        let mut x = 0u32;
+        for i in (0..n).rev() {
+            let b = self.table_byte(v, off.checked_add(i)?)?;
+            x = x.checked_mul(256)?.checked_add(u32::from(b))?;
         }
-    };
+        Some(x)
+    }
 
-    let mut seen = 0usize;
-    let mut stack = vec![(fs.root_dir(), String::new(), 0u32)];
-    while let Some((dir, prefix, depth)) = stack.pop() {
-        if depth > MAX_DEPTH {
-            budget.count_entry()?;
-            if let Some(r) = visit(
-                Entry::unsupported(
-                    format!("<fat-below-depth-{MAX_DEPTH}>"),
-                    0,
-                    false,
-                    "FAT directory tree deeper than exav walks",
-                ),
-                budget,
-            ) {
-                return Ok(Some(r));
+    /// What follows cluster `c` in its chain.
+    fn link(&mut self, v: &mut Vol, c: u32) -> Link {
+        if c < 2 || c > self.clusters.saturating_add(1) {
+            return Link::Broken;
+        }
+        let at = u64::from(c);
+        let raw = match self.bits {
+            // Two entries share three bytes.
+            12 => self
+                .entry(v, at.saturating_add(at / 2), 2)
+                .map(|pair| if at % 2 == 1 { pair >> 4 } else { pair & 0xFFF }),
+            16 => self.entry(v, at.saturating_mul(2), 2),
+            _ => self
+                .entry(v, at.saturating_mul(4), 4)
+                .map(|x| x & 0x0FFF_FFFF),
+        };
+        let Some(raw) = raw else {
+            return Link::Broken;
+        };
+        // The values from 0xFF8 (FAT12), 0xFFF8 and 0x0FFFFFF8 on end a chain.
+        let end = match self.bits {
+            12 => 0xFF8,
+            16 => 0xFFF8,
+            _ => 0x0FFF_FFF8,
+        };
+        if raw >= end {
+            Link::End
+        } else if raw < 2 || raw > self.clusters.saturating_add(1) {
+            Link::Broken
+        } else {
+            Link::Next(raw)
+        }
+    }
+
+    /// The byte offset of cluster `c`.
+    fn at(&self, c: u32) -> Option<u64> {
+        u64::from(c.checked_sub(2)?)
+            .checked_mul(self.cluster)?
+            .checked_add(self.data)
+    }
+
+    /// The items of directory `dir`, up to `limit` of them. `left` counts the
+    /// clusters of directories the walk may still read. The flag is false
+    /// where the directory is damaged.
+    fn items(&mut self, v: &mut Vol, dir: Dir, left: &mut u64, limit: usize) -> (Vec<Item>, bool) {
+        let mut parse = Parser::default();
+        let mut intact = true;
+        match dir {
+            Dir::Root => {
+                let bytes = crate::bytes::to_usize(self.root_len);
+                match v.at(self.root, bytes) {
+                    Some(block) => {
+                        parse.feed(&block, self.bits == 32, limit);
+                    }
+                    None => intact = false,
+                }
             }
-            continue;
-        }
-        for entry in dir.iter() {
-            let Ok(entry) = entry else {
-                // A directory whose entries stop parsing hides everything after
-                // them in that directory.
-                budget.count_entry()?;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        format!("<fat-dir:{prefix}>"),
-                        0,
-                        false,
-                        "unreadable FAT directory entry; the rest of that directory is unreachable",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+            Dir::Chain(first) => {
+                let mut c = first;
+                let mut steps = 0u64;
+                'chain: loop {
+                    if *left == 0 || steps >= u64::from(self.clusters) {
+                        intact = false;
+                        break;
+                    }
+                    *left = left.saturating_sub(1);
+                    steps = steps.saturating_add(1);
+                    let block = self
+                        .at(c)
+                        .and_then(|o| v.at(o, crate::bytes::to_usize(self.cluster)));
+                    let Some(block) = block else {
+                        intact = false;
+                        break;
+                    };
+                    if parse.feed(&block, self.bits == 32, limit) {
+                        break 'chain;
+                    }
+                    match self.link(v, c) {
+                        Link::Next(next) => c = next,
+                        Link::End => break,
+                        Link::Broken => {
+                            intact = false;
+                            break;
+                        }
+                    }
                 }
+            }
+        }
+        (parse.items, intact)
+    }
+
+    /// The bytes of a file: held when they are at most `cap`, else read as
+    /// they go.
+    fn file<'a>(&'a mut self, v: &'a mut Vol<'_>, item: &Item, cap: u64) -> Got<'a> {
+        let size = u64::from(item.size);
+        if size == 0 {
+            return Got::Whole(Vec::new());
+        }
+        let want = size.div_ceil(self.cluster);
+        let chain = Chain {
+            fat: self,
+            next: Some(item.first),
+            want,
+            got: 0,
+            broken: false,
+        };
+        read_file(v, Pieces::new(chain, size), size, cap)
+    }
+}
+
+/// The runs of clusters of a file's chain, found as they are read.
+struct Chain<'a> {
+    fat: &'a mut Fat,
+    /// Where the next run starts, if the chain goes on.
+    next: Option<u32>,
+    /// The clusters of the file not yet in a run.
+    want: u64,
+    /// The clusters followed so far.
+    got: u64,
+    /// The chain breaks, loops or ends before the file does.
+    broken: bool,
+}
+
+impl Plan for Chain<'_> {
+    fn next(&mut self, v: &mut Vol) -> Next {
+        if self.want == 0 {
+            return Next::End;
+        }
+        let Some(first) = self.next.filter(|_| !self.broken) else {
+            return Next::Broken;
+        };
+        let mut c = first;
+        let mut n = 0u64;
+        loop {
+            // A chain longer than the volume has clusters comes back on itself.
+            if self.got >= u64::from(self.fat.clusters) {
+                self.broken = true;
                 break;
-            };
-            let name = entry.file_name();
-            if name == "." || name == ".." {
-                continue;
             }
-            let path = if prefix.is_empty() {
-                name.clone()
-            } else {
-                format!("{prefix}/{name}")
-            };
-            seen = seen.saturating_add(1);
-            if seen > MAX_ENTRIES {
-                budget.count_entry()?;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        format!("<fat-entries-beyond-{MAX_ENTRIES}>"),
-                        0,
-                        false,
-                        "too many FAT entries to walk them all",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+            n = n.saturating_add(1);
+            self.got = self.got.saturating_add(1);
+            self.want = self.want.saturating_sub(1);
+            if self.want == 0 {
+                break;
+            }
+            match self.fat.link(v, c) {
+                Link::Next(next) if u64::from(next) == u64::from(c).saturating_add(1) => c = next,
+                Link::Next(next) => {
+                    self.next = Some(next);
+                    break;
+                }
+                Link::End | Link::Broken => {
+                    self.broken = true;
+                    break;
                 }
-                return Ok(None);
             }
-            if entry.is_dir() {
-                stack.push((entry.to_dir(), path, depth.saturating_add(1)));
+        }
+        match self.fat.at(first) {
+            Some(at) if n > 0 => Next::Piece(Piece::Disk(at, n.saturating_mul(self.fat.cluster))),
+            _ => Next::Broken,
+        }
+    }
+}
+
+/// Reads directory entries, across the clusters of a directory.
+#[derive(Default)]
+struct Parser {
+    items: Vec<Item>,
+    /// The long name being put together: its parts by position (1 from the
+    /// end), the checksum they carry and the count they say they are.
+    parts: Vec<Option<[u16; 13]>>,
+    sum: u8,
+}
+
+impl Parser {
+    /// Read the entries of `block`. True where the directory ends in it, or
+    /// holds as many as `limit`.
+    fn feed(&mut self, block: &[u8], wide: bool, limit: usize) -> bool {
+        for e in block.as_chunks::<32>().0 {
+            if e[0] == 0 {
+                return true;
+            }
+            if self.items.len() >= limit {
+                return true;
+            }
+            if e[0] == 0xE5 {
+                self.parts.clear();
                 continue;
             }
-
-            budget.count_entry()?;
-            let declared = entry.len();
-            let cap = budget.reserve()?;
-            if declared > cap {
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        path,
-                        declared,
-                        false,
-                        "FAT file exceeds the per-member size budget",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
-                }
+            let attr = e[11];
+            if attr & 0x3F == ATTR_LONG {
+                self.part(e);
+                continue;
+            }
+            if attr & ATTR_VOLUME != 0 {
+                self.parts.clear();
+                continue;
+            }
+            let name = self.name(e);
+            self.parts.clear();
+            if name == "." || name == ".." {
                 continue;
             }
-            let mut file = entry.to_file();
-            let mut buf = Vec::with_capacity(declared as usize);
-            // Reading follows the cluster chain, so a fragmented file comes back
-            // whole here where a carve would return only its first extent.
-            if let Err(e) = std::io::Read::read_to_end(&mut file, &mut buf) {
-                let _ = e;
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        path,
-                        declared,
-                        false,
-                        "FAT file could not be read from its cluster chain",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+            let hi = if wide { u32::from(le16(e, 20)) } else { 0 };
+            self.items.push(Item {
+                name,
+                dir: attr & ATTR_DIR != 0,
+                first: u32::from(le16(e, 26)) | hi.saturating_mul(1 << 16),
+                size: le32(e, 28),
+                mtime: dos_time(le16(e, 24), le16(e, 22)),
+            });
+        }
+        false
+    }
+
+    /// Take in an entry that is a part of a long name.
+    fn part(&mut self, e: &[u8]) {
+        let seq = usize::from(e[0] & 0x3F);
+        let mut chars = [0u16; 13];
+        for (i, c) in chars.iter_mut().enumerate() {
+            let at = match i {
+                0..=4 => 1usize.saturating_add(i.saturating_mul(2)),
+                5..=10 => 14usize.saturating_add(i.saturating_sub(5).saturating_mul(2)),
+                _ => 28usize.saturating_add(i.saturating_sub(11).saturating_mul(2)),
+            };
+            *c = le16(e, at);
+        }
+        // The first part met is the last of the name, marked, and 20 is the most.
+        if e[0] & 0x40 != 0 {
+            self.parts.clear();
+            if seq == 0 || seq > 20 {
+                return;
+            }
+            self.parts.resize(seq, None);
+            self.sum = e[13];
+        } else if self.parts.is_empty() || e[13] != self.sum {
+            self.parts.clear();
+            return;
+        }
+        match seq.checked_sub(1).and_then(|i| self.parts.get_mut(i)) {
+            Some(slot) => *slot = Some(chars),
+            None => self.parts.clear(),
+        }
+    }
+
+    /// The name of the short entry `e`: its long name where there is one that
+    /// is whole and is its own, else its short name.
+    fn name(&self, e: &[u8]) -> String {
+        if !self.parts.is_empty()
+            && self.parts.iter().all(Option::is_some)
+            && self.sum == short_sum(e)
+        {
+            let units: Vec<u16> = self
+                .parts
+                .iter()
+                .flatten()
+                .flatten()
+                .copied()
+                .take_while(|&u| u != 0)
+                .collect();
+            return String::from_utf16_lossy(&units);
+        }
+        short_name(e)
+    }
+}
+
+/// The checksum a long name carries of its short name.
+fn short_sum(e: &[u8]) -> u8 {
+    e.iter().take(11).fold(0u8, |sum, &c| {
+        (sum >> 1).wrapping_add((sum & 1) << 7).wrapping_add(c)
+    })
+}
+
+/// The 8.3 name of a directory entry.
+fn short_name(e: &[u8]) -> String {
+    // The case flags NT keeps of the base and of the extension.
+    let (lower_base, lower_ext) = (e[12] & 0x08 != 0, e[12] & 0x10 != 0);
+    let text = |b: &[u8], lower: bool| -> String {
+        let end = b
+            .iter()
+            .rposition(|&c| c != b' ')
+            .map_or(0, |i| i.saturating_add(1));
+        b.iter()
+            .take(end)
+            .map(|&c| match c {
+                0x80..=0xFF => CP437
+                    .chars()
+                    .nth(usize::from(c).saturating_sub(0x80))
+                    .unwrap_or('?'),
+                _ if lower => char::from(c).to_ascii_lowercase(),
+                _ => char::from(c),
+            })
+            .collect()
+    };
+    let mut base = e[..8].to_vec();
+    // A first byte of 0xE5 is stored as 0x05, 0xE5 marking a deleted entry.
+    if base[0] == 0x05 {
+        base[0] = 0xE5;
+    }
+    let (base, ext) = (text(&base, lower_base), text(&e[8..11], lower_ext));
+    if ext.is_empty() {
+        base
+    } else {
+        format!("{base}.{ext}")
+    }
+}
+
+/// A DOS date and time, local with no zone.
+fn dos_time(date: u16, time: u16) -> Option<Mtime> {
+    let (day, month) = (date & 0x1F, (date >> 5) & 0x0F);
+    let (hour, minute, second) = (
+        time >> 11,
+        (time >> 5) & 0x3F,
+        (time & 0x1F).saturating_mul(2),
+    );
+    if date == 0
+        || !(1..=12).contains(&month)
+        || day == 0
+        || hour > 23
+        || minute > 59
+        || second > 59
+    {
+        return None;
+    }
+    Some(Mtime::Local {
+        year: 1980u16.saturating_add(date >> 9),
+        month: u8::try_from(month).ok()?,
+        day: u8::try_from(day).ok()?,
+        hour: u8::try_from(hour).ok()?,
+        minute: u8::try_from(minute).ok()?,
+        second: u8::try_from(second).ok()?,
+    })
+}
+
+/// The volume's boot sector, or `None` where it describes none a system would
+/// mount.
+fn open(v: &mut Vol) -> Option<(Fat, Dir)> {
+    let b = v.at(0, 512)?;
+    let sector = u64::from(le16(&b, 11));
+    let spc = u64::from(b[13]);
+    if !matches!(sector, 512 | 1024 | 2048 | 4096) || spc == 0 || !spc.is_power_of_two() {
+        return None;
+    }
+    let reserved = u64::from(le16(&b, 14));
+    let fats = u64::from(b[16]);
+    let root_entries = u64::from(le16(&b, 17));
+    let total = match le16(&b, 19) {
+        0 => u64::from(le32(&b, 32)),
+        n => u64::from(n),
+    };
+    let wide = le16(&b, 22) == 0;
+    let per_fat = if wide {
+        u64::from(le32(&b, 36))
+    } else {
+        u64::from(le16(&b, 22))
+    };
+    if reserved == 0 || fats == 0 || per_fat == 0 {
+        return None;
+    }
+    // The root directory of FAT12/16 is a run of sectors, 32 bytes an entry.
+    let root_sectors = root_entries.saturating_mul(32).div_ceil(sector);
+    let first_data = reserved
+        .saturating_add(fats.saturating_mul(per_fat))
+        .saturating_add(root_sectors);
+    // Nothing is read from past the volume.
+    let total = total.min(v.len.checked_div(sector)?);
+    let clusters = total
+        .checked_sub(first_data)?
+        .checked_div(spc)
+        .filter(|&n| n > 0)?;
+    // The number of clusters, not the label, says which FAT it is.
+    let bits = if wide {
+        32
+    } else if clusters < 4085 {
+        12
+    } else {
+        16
+    };
+    // FAT32 can keep one copy of the table in use and not mirror it.
+    let active = if wide && le16(&b, 40) & 0x80 != 0 {
+        u64::from(le16(&b, 40) & 0x0F).min(fats.saturating_sub(1))
+    } else {
+        0
+    };
+    // The table holds an entry for every cluster, and two more.
+    let room = per_fat
+        .saturating_mul(sector)
+        .saturating_mul(8)
+        .checked_div(u64::from(bits))?
+        .saturating_sub(2);
+    let clusters = u32::try_from(clusters.min(room).min(0x0FFF_FFF5)).ok()?;
+    if clusters == 0 {
+        return None;
+    }
+    let table = reserved
+        .saturating_add(active.saturating_mul(per_fat))
+        .saturating_mul(sector);
+    let fat = Fat {
+        cluster: sector.saturating_mul(spc),
+        bits,
+        clusters,
+        table,
+        root: reserved
+            .saturating_add(fats.saturating_mul(per_fat))
+            .saturating_mul(sector),
+        root_len: root_sectors.saturating_mul(sector),
+        data: first_data.saturating_mul(sector),
+        root_cluster: le32(&b, 44),
+        pages: HashMap::new(),
+    };
+    let root = if wide {
+        Dir::Chain(fat.root_cluster)
+    } else {
+        Dir::Root
+    };
+    Some((fat, root))
+}
+
+/// Walk a FAT volume given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the FAT volume `disk`, which is `len` bytes long, handing each file to
+/// `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    match v.at(0, 512) {
+        Some(boot) if is_fat(&boot) => {}
+        _ => return Ok(None),
+    }
+    let Some((mut fat, root)) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "FAT open: the boot sector or the tables are unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    let mut left = u64::from(fat.clusters);
+    let mut damaged = false;
+    // A directory is walked once, however many entries name it.
+    let mut seen: HashSet<u32> = HashSet::new();
+    if let Dir::Chain(first) = root {
+        seen.insert(first);
+    }
+    let mut stack = vec![(root, String::new(), 0usize)];
+    while let Some((dir, prefix, depth)) = stack.pop() {
+        let (items, intact) = fat.items(&mut v, dir, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for item in items {
+            budget.count_entry()?;
+            let path = if prefix.is_empty() {
+                item.name.clone()
+            } else {
+                format!("{prefix}/{}", item.name)
+            };
+            if item.dir {
+                if item.first < 2 || depth >= MAX_DEPTH {
+                    damaged = true;
+                } else if seen.insert(item.first) {
+                    below.push((Dir::Chain(item.first), path, depth.saturating_add(1)));
                 }
                 continue;
             }
-            budget.commit(buf.len() as u64);
-            if let Some(r) = visit(Entry::new(path, buf), budget) {
+            let attrs = Attrs {
+                mode: None,
+                mtime: item.mtime,
+            };
+            if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                fat.file(&mut v, &item, cap)
+            })? {
                 return Ok(Some(r));
             }
         }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "FAT walk: the volume is damaged; the files before the damage were scanned".into(),
+        ));
     }
     Ok(None)
 }
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::Cursor;
+
+    /// A directory entry.
+    fn entry(name: &[u8; 11], attr: u8, nt: u8, first: u16, size: u32) -> [u8; 32] {
+        let mut e = [0u8; 32];
+        e[..11].copy_from_slice(name);
+        e[11] = attr;
+        e[12] = nt;
+        e[26..28].copy_from_slice(&first.to_le_bytes());
+        e[28..32].copy_from_slice(&size.to_le_bytes());
+        e
+    }
+
+    /// The entries of a long name for the short entry with the name `short`,
+    /// last part first, as they are in a directory.
+    fn parts(name: &str, short: &[u8; 11]) -> Vec<[u8; 32]> {
+        let mut units: Vec<u16> = name.encode_utf16().collect();
+        if !units.len().is_multiple_of(13) {
+            units.push(0);
+        }
+        while !units.len().is_multiple_of(13) {
+            units.push(0xFFFF);
+        }
+        let sum = short_sum(short);
+        let n = units.len() / 13;
+        let mut out = Vec::new();
+        for (i, chunk) in units.chunks(13).enumerate().rev() {
+            let mut e = [0u8; 32];
+            e[0] = (i + 1) as u8 | if i + 1 == n { 0x40 } else { 0 };
+            e[11] = 0x0F;
+            e[13] = sum;
+            for (k, u) in chunk.iter().enumerate() {
+                let at = match k {
+                    0..=4 => 1 + 2 * k,
+                    5..=10 => 14 + 2 * (k - 5),
+                    _ => 28 + 2 * (k - 11),
+                };
+                e[at..at + 2].copy_from_slice(&u.to_le_bytes());
+            }
+            out.push(e);
+        }
+        out
+    }
+
+    fn names(block: &[[u8; 32]]) -> Vec<String> {
+        let mut p = Parser::default();
+        p.feed(&block.concat(), false, 100);
+        p.items.into_iter().map(|i| i.name).collect()
+    }
+
+    #[test]
+    fn a_short_name_has_its_case_flags_and_its_code_page() {
+        let n = |name: &[u8; 11], nt: u8| short_name(&entry(name, 0x20, nt, 2, 0));
+        assert_eq!(n(b"README  TXT", 0), "README.TXT");
+        assert_eq!(n(b"README  TXT", 0x18), "readme.txt");
+        assert_eq!(n(b"README  TXT", 0x08), "readme.TXT");
+        assert_eq!(n(b"README  TXT", 0x10), "README.txt");
+        assert_eq!(n(b"MAKEFILE   ", 0x08), "makefile");
+        // A name that begins with 0xE5 is stored with 0x05.
+        assert_eq!(n(b"\x05AB     DAT", 0), "\u{3c3}AB.DAT");
+        // Bytes from 0x80 are CP437.
+        assert_eq!(n(b"\x80\x81\xB0     TXT", 0), "\u{c7}\u{fc}\u{2591}.TXT");
+    }
+
+    #[test]
+    fn a_long_name_is_taken_when_it_is_whole_and_its_checksum_is_the_short_names() {
+        let short = *b"LONGNA~1TXT";
+        let e = entry(&short, 0x20, 0, 2, 1);
+        let long = "a long name.text";
+        let mut block = parts(long, &short);
+        block.push(e);
+        assert_eq!(names(&block), [long]);
+
+        // A name of exactly 13 characters has no end marker.
+        let mut block = parts("thirteen.char", &short);
+        block.push(e);
+        assert_eq!(names(&block), ["thirteen.char"]);
+
+        // The checksum of another short name.
+        let mut other = parts(long, b"OTHER   TXT");
+        other.push(e);
+        assert_eq!(names(&other), ["LONGNA~1.TXT"]);
+
+        // A part missing.
+        let mut cut = parts("a name that takes three parts of thirteen", &short);
+        cut.remove(1);
+        cut.push(e);
+        assert_eq!(names(&cut), ["LONGNA~1.TXT"]);
+
+        // Parts that begin with no last part are not a name.
+        let mut orphan = parts("a name that takes two parts", &short);
+        orphan.remove(0);
+        orphan.push(e);
+        assert_eq!(names(&orphan), ["LONGNA~1.TXT"]);
+
+        // A deleted entry between the parts and the short entry ends the name.
+        let mut gone = parts(long, &short);
+        gone.push(entry(b"\xE5ELETED TXT", 0x20, 0, 9, 1));
+        gone.push(e);
+        assert_eq!(names(&gone), ["LONGNA~1.TXT"]);
+
+        // The name of a short entry is not carried to the next.
+        let mut two = parts(long, &short);
+        two.push(e);
+        two.push(entry(b"NEXT    TXT", 0x20, 0, 3, 1));
+        assert_eq!(names(&two), [long, "NEXT.TXT"]);
+    }
+
+    #[test]
+    fn a_long_name_is_unicode() {
+        let short = *b"CAF~1   TXT";
+        let mut block = parts("caf\u{e9} \u{65e5}\u{672c} \u{1f600}.txt", &short);
+        block.push(entry(&short, 0x20, 0, 2, 1));
+        assert_eq!(names(&block), ["caf\u{e9} \u{65e5}\u{672c} \u{1f600}.txt"]);
+    }
+
+    #[test]
+    fn a_directory_is_read_to_its_end_marker() {
+        let block = [
+            entry(b"VOLUME     ", 0x08, 0, 0, 0),
+            entry(b".          ", 0x10, 0, 2, 0),
+            entry(b"..         ", 0x10, 0, 0, 0),
+            entry(b"A       TXT", 0x20, 0, 3, 5),
+            entry(b"\xE5DELETE TXT", 0x20, 0, 4, 5),
+            entry(b"SUB        ", 0x10, 0, 5, 0),
+            [0u8; 32],
+            entry(b"AFTER   TXT", 0x20, 0, 6, 5),
+        ];
+        let mut p = Parser::default();
+        assert!(p.feed(&block.concat(), false, 100));
+        let got: Vec<_> = p.items.iter().map(|i| (i.name.as_str(), i.dir)).collect();
+        assert_eq!(got, [("A.TXT", false), ("SUB", true)]);
+        // The first cluster of FAT32 has its high half in another field.
+        let mut e = entry(b"BIG     BIN", 0x20, 0, 0x1234, 1);
+        e[20..22].copy_from_slice(&0x0005u16.to_le_bytes());
+        for (wide, first) in [(false, 0x1234), (true, 0x5_1234)] {
+            let mut p = Parser::default();
+            p.feed(&e, wide, 100);
+            assert_eq!(p.items[0].first, first);
+        }
+    }
+
+    #[test]
+    fn a_time_is_a_wall_clock_one_or_none() {
+        // 2024-03-05 14:30:12.
+        let date = ((2024 - 1980) << 9) | (3 << 5) | 5;
+        let time = (14 << 11) | (30 << 5) | 6;
+        assert_eq!(
+            dos_time(date, time),
+            Some(Mtime::Local {
+                year: 2024,
+                month: 3,
+                day: 5,
+                hour: 14,
+                minute: 30,
+                second: 12
+            })
+        );
+        assert_eq!(dos_time(0, time), None);
+        assert_eq!(dos_time((2024 - 1980) << 9 | (13 << 5) | 5, time), None);
+        assert_eq!(dos_time(date & !0x1F, time), None);
+        assert_eq!(dos_time(date, 25 << 11), None);
+    }
+
+    /// A volume of 512-byte sectors, one to a cluster, with the table of `bits`
+    /// and the clusters numbered from 2.
+    fn volume(bits: u32, fat: &[u16]) -> (Fat, Vec<u8>) {
+        let mut d = vec![0u8; 4096];
+        for (c, &v) in fat.iter().enumerate() {
+            if bits == 16 {
+                d[c * 2..c * 2 + 2].copy_from_slice(&v.to_le_bytes());
+            } else {
+                let at = c + c / 2;
+                let pair = u16::from_le_bytes([d[at], d[at + 1]]);
+                let pair = if c % 2 == 1 {
+                    (pair & 0xF) | (v << 4)
+                } else {
+                    (pair & 0xF000) | v
+                };
+                d[at..at + 2].copy_from_slice(&pair.to_le_bytes());
+            }
+        }
+        let f = Fat {
+            cluster: 512,
+            bits,
+            clusters: 100,
+            table: 0,
+            root: 0,
+            root_len: 0,
+            data: 0,
+            root_cluster: 0,
+            pages: HashMap::new(),
+        };
+        (f, d)
+    }
+
+    fn link(f: &mut Fat, d: Vec<u8>, c: u32) -> String {
+        let mut cur = Cursor::new(d);
+        let mut v = Vol {
+            disk: &mut cur,
+            len: 4096,
+            max: 1 << 20,
+        };
+        match f.link(&mut v, c) {
+            Link::Next(n) => format!("next {n}"),
+            Link::End => "end".into(),
+            Link::Broken => "broken".into(),
+        }
+    }
+
+    #[test]
+    fn the_entries_of_a_table_are_followed_in_each_width() {
+        // 12 bits: two entries in three bytes.
+        let t12 = [0xFF8, 0xFFF, 3, 0x05B, 0xFF8, 0xFFF, 0, 1, 200];
+        for (c, want) in [
+            (2, "next 3"),
+            (3, "next 91"),
+            (4, "end"),
+            (5, "end"),
+            // Free, not a chain.
+            (6, "broken"),
+            // Cluster 1 is none, and 200 is past the clusters there are.
+            (7, "broken"),
+            (8, "broken"),
+            (1, "broken"),
+            (101, "broken"),
+        ] {
+            let (mut f, d) = volume(12, &t12);
+            assert_eq!(link(&mut f, d, c), want, "FAT12 cluster {c}");
+        }
+        let t16 = [0xFFF8, 0xFFFF, 3, 0xFFFF, 0, 0xFFF7, 0xFFF8];
+        for (c, want) in [
+            (2, "next 3"),
+            (3, "end"),
+            (4, "broken"),
+            (5, "broken"),
+            (6, "end"),
+        ] {
+            let (mut f, d) = volume(16, &t16);
+            assert_eq!(link(&mut f, d, c), want, "FAT16 cluster {c}");
+        }
+        // 32 bits keep 28 of them.
+        let mut d = vec![0u8; 4096];
+        d[8..12].copy_from_slice(&0xF000_0003u32.to_le_bytes());
+        d[12..16].copy_from_slice(&0x0FFF_FFFFu32.to_le_bytes());
+        let (mut f, _) = volume(32, &[]);
+        assert_eq!(link(&mut f, d.clone(), 2), "next 3");
+        assert_eq!(link(&mut f, d, 3), "end");
+    }
+
+    /// A boot sector of a FAT16 volume of 4200 sectors.
+    fn boot() -> Vec<u8> {
+        let mut b = vec![0u8; 512];
+        b[0] = 0xEB;
+        b[3..11].copy_from_slice(b"MSDOS5.0");
+        b[11..13].copy_from_slice(&512u16.to_le_bytes());
+        b[13] = 1;
+        b[14..16].copy_from_slice(&1u16.to_le_bytes());
+        b[16] = 2;
+        b[17..19].copy_from_slice(&512u16.to_le_bytes());
+        b[19..21].copy_from_slice(&4200u16.to_le_bytes());
+        b[22..24].copy_from_slice(&17u16.to_le_bytes());
+        b[54..62].copy_from_slice(b"FAT16   ");
+        b[510..512].copy_from_slice(&[0x55, 0xAA]);
+        b
+    }
+
+    fn opened(boot: &[u8]) -> Option<(u32, u32)> {
+        let mut d = vec![0u8; 4200 * 512];
+        d[..512].copy_from_slice(boot);
+        let len = d.len() as u64;
+        let mut cur = Cursor::new(d);
+        let mut v = Vol {
+            disk: &mut cur,
+            len,
+            max: 1 << 20,
+        };
+        open(&mut v).map(|(f, _)| (f.bits, f.clusters))
+    }
+
+    #[test]
+    fn the_number_of_clusters_says_which_fat_it_is() {
+        // 4200 sectors less one reserved, 2 tables of 17 and 32 of root.
+        assert_eq!(opened(&boot()), Some((16, 4133)));
+        let mut small = boot();
+        small[13] = 2;
+        assert_eq!(opened(&small), Some((12, 2066)));
+        // The table of a FAT32 volume is in another field.
+        let mut wide = boot();
+        wide[17..19].fill(0);
+        wide[22..24].fill(0);
+        wide[36..40].copy_from_slice(&17u32.to_le_bytes());
+        wide[44..48].copy_from_slice(&2u32.to_le_bytes());
+        assert_eq!(opened(&wide).map(|x| x.0), Some(32));
+    }
+
+    #[test]
+    fn a_fat32_volume_that_does_not_mirror_its_tables_is_read_through_the_one_in_use() {
+        let table = |ext_flags: u16| {
+            let mut b = boot();
+            b[17..19].fill(0);
+            b[22..24].fill(0);
+            b[36..40].copy_from_slice(&17u32.to_le_bytes());
+            b[40..42].copy_from_slice(&ext_flags.to_le_bytes());
+            b[44..48].copy_from_slice(&2u32.to_le_bytes());
+            let mut d = vec![0u8; 4200 * 512];
+            d[..512].copy_from_slice(&b);
+            let len = d.len() as u64;
+            let mut cur = Cursor::new(d);
+            let mut v = Vol {
+                disk: &mut cur,
+                len,
+                max: 1 << 20,
+            };
+            open(&mut v).map(|(f, _)| f.table)
+        };
+        // Mirrored: the first. Not mirrored, the second in use: the second.
+        assert_eq!(table(0), Some(512));
+        assert_eq!(table(0x80), Some(512));
+        assert_eq!(table(0x81), Some(512 + 17 * 512));
+        // One that is not there is the last there is.
+        assert_eq!(table(0x85), Some(512 + 17 * 512));
+    }
+
+    #[test]
+    fn a_boot_sector_that_describes_no_volume_is_not_opened() {
+        // What is written, and where.
+        let edits: [(&str, usize, &[u8]); 8] = [
+            ("sector size", 11, &500u16.to_le_bytes()),
+            ("cluster size 0", 13, &[0]),
+            ("cluster size 3", 13, &[3]),
+            ("no reserved sectors", 14, &[0, 0]),
+            ("no tables", 16, &[0]),
+            ("empty tables", 22, &[0, 0]),
+            ("tables past the volume", 22, &5000u16.to_le_bytes()),
+            ("no sectors", 19, &[0, 0]),
+        ];
+        for (what, at, bytes) in edits {
+            let mut b = boot();
+            b[at..at + bytes.len()].copy_from_slice(bytes);
+            assert_eq!(opened(&b), None, "{what}");
+        }
+    }
+
+    /// A FAT16 volume holding `files` in its root, each in clusters in order.
+    fn image(files: &[(&[u8; 11], &[u8])]) -> Vec<u8> {
+        let mut d = vec![0u8; 4200 * 512];
+        d[..512].copy_from_slice(&boot());
+        // The first table at 512, the root at 35 * 512, cluster 2 at 67 * 512.
+        let (fat, root, data) = (512, 35 * 512, 67 * 512);
+        d[fat..fat + 4].copy_from_slice(&[0xF8, 0xFF, 0xFF, 0xFF]);
+        let mut next = 2usize;
+        for (i, (name, bytes)) in files.iter().enumerate() {
+            let n = bytes.len().div_ceil(512).max(1);
+            for c in next..next + n {
+                let v: u16 = if c + 1 == next + n {
+                    0xFFFF
+                } else {
+                    c as u16 + 1
+                };
+                d[fat + c * 2..fat + c * 2 + 2].copy_from_slice(&v.to_le_bytes());
+            }
+            let at = data + (next - 2) * 512;
+            d[at..at + bytes.len()].copy_from_slice(bytes);
+            let e = entry(name, 0x20, 0, next as u16, bytes.len() as u32);
+            d[root + i * 32..root + i * 32 + 32].copy_from_slice(&e);
+            next += n;
+        }
+        d
+    }
+
+    /// A member as the tests see it: its name, its length and what it reports.
+    type Member = (String, usize, Option<&'static str>);
+
+    fn walked(d: &[u8], limits: Limits) -> (Vec<Member>, Result<(), LimitHit>) {
+        let mut out = Vec::new();
+        let mut budget = Budget::new(limits);
+        let len = d.len() as u64;
+        let end = walk_volume(Cursor::new(d), len, &mut budget, &mut |e, _| {
+            let e = e.whole();
+            out.push((e.name, e.data.len(), e.unsupported));
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    #[test]
+    fn the_files_of_a_root_come_out_with_what_their_chains_hold() {
+        let big = vec![7u8; 1300];
+        let d = image(&[(b"A       TXT", b"hello"), (b"BIG     BIN", &big)]);
+        let (e, end) = walked(&d, Limits::default());
+        end.unwrap();
+        assert_eq!(
+            e,
+            [
+                ("A.TXT".to_string(), 5, None),
+                ("BIG.BIN".to_string(), 1300, None)
+            ]
+        );
+    }
+
+    #[test]
+    fn a_chain_that_runs_in_a_circle_is_read_as_far_as_the_size_asks_and_no_further() {
+        let mut d = image(&[(b"LOOP    BIN", &vec![1u8; 1024])]);
+        // Make the file 5 clusters long by its size: cluster 3 leads back to 2.
+        let root = 35 * 512;
+        d[root + 28..root + 32].copy_from_slice(&2560u32.to_le_bytes());
+        d[512 + 6..512 + 8].copy_from_slice(&2u16.to_le_bytes());
+        let (e, end) = walked(&d, Limits::default());
+        end.unwrap();
+        assert_eq!(e, [("LOOP.BIN".to_string(), 2560, None)]);
+    }
+
+    #[test]
+    fn a_chain_that_ends_or_breaks_early_is_a_file_cut_short() {
+        // Cluster 2 ends the chain, or leads to cluster 1, which is none.
+        for next in [0xFFFFu16, 0xFFF7, 1] {
+            let mut d = image(&[(b"CUT     BIN", &vec![1u8; 1024])]);
+            d[512 + 4..512 + 6].copy_from_slice(&next.to_le_bytes());
+            let (e, end) = walked(&d, Limits::default());
+            end.unwrap();
+            assert_eq!(
+                e,
+                [(
+                    "CUT.BIN".to_string(),
+                    512,
+                    Some("file could not be read from the volume")
+                )],
+                "{next:#x}"
+            );
+        }
+    }
+
+    #[test]
+    fn the_entry_past_the_member_limit_is_counted_and_stops_the_walk() {
+        let d = image(&[
+            (b"A       TXT", b"a"),
+            (b"B       TXT", b"b"),
+            (b"C       TXT", b"c"),
+        ]);
+        let run = |max: u64| {
+            let limits = Limits {
+                max_members: max,
+                ..Limits::default()
+            };
+            walked(&d, limits)
+        };
+        let (e, end) = run(3);
+        end.unwrap();
+        assert_eq!(e.len(), 3);
+        let (e, end) = run(2);
+        assert!(!end.unwrap_err().is_corrupt());
+        assert_eq!(e.len(), 2);
+    }
+
+    #[test]
+    fn a_file_over_the_buffer_limit_is_read_as_it_goes_and_the_walk_goes_on() {
+        let d = image(&[(b"BIG     BIN", &vec![1u8; 4000]), (b"SMALL   TXT", b"x")]);
+        let limits = Limits {
+            max_buffer_bytes: 1000,
+            ..Limits::default()
+        };
+        let mut budget = Budget::new(limits);
+        let len = d.len() as u64;
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(&d[..]), len, &mut budget, emit));
+        end.unwrap();
+        assert_eq!(e[0].0.name, "BIG.BIN");
+        assert_eq!(e[0].0.data, vec![1u8; 4000]);
+        assert!(e[0].1, "a file past the limit is not held");
+        assert_eq!(e[0].0.unsupported, None);
+        assert_eq!((e[1].0.name.as_str(), e[1].1), ("SMALL.TXT", false));
+    }
+}
diff --git a/crates/exav-unpack/src/formats/gzip.rs b/crates/exav-unpack/src/formats/gzip.rs
index e6667a61..9bea6ee6 100644
--- a/crates/exav-unpack/src/formats/gzip.rs
+++ b/crates/exav-unpack/src/formats/gzip.rs
@@ -3,7 +3,7 @@
 use std::io::{BufReader, Read};
 
 use crate::source::{ByteSource, Reader};
-use crate::stream::{stream_single, Visit};
+use crate::stream::{Visit, stream_single};
 use crate::{Budget, LimitHit};
 
 pub(crate) fn walk<T>(
diff --git a/crates/exav-unpack/src/formats/hfsplus.rs b/crates/exav-unpack/src/formats/hfsplus.rs
new file mode 100644
index 00000000..bb0abe53
--- /dev/null
+++ b/crates/exav-unpack/src/formats/hfsplus.rs
@@ -0,0 +1,1327 @@
+//! HFS+ and HFSX: the files of a volume, read where they lie.
+//!
+//! The volume is a `Read + Seek`, read where the walk goes: the volume header,
+//! the catalog's nodes, and each file's extents. Only a file is ever held,
+//! bounded by the buffer limit.
+//!
+//! A scanner wants every file's bytes, not a navigable tree, so the catalog
+//! B-tree is read once through its leaves, which are chained in key order, and
+//! the paths are rebuilt from the folder records. Nothing is searched by name:
+//! the case folding that HFS+ lookups need is not here, and an HFSX volume
+//! reads the same as an HFS+ one. What is searched, by binary keys, is the
+//! extents overflow tree (the extents of a fragmented file past its eighth)
+//! and the attributes tree (the `com.apple.decmpfs` attribute of a compressed
+//! file, read by `formats/decmpfs`).
+//!
+//! ```text
+//! volume header (1024 bytes in)   block size, the five special forks
+//!   catalog file                  B-tree: a folder record or a file record
+//!                                 per (parent id, name); a file record holds
+//!                                 the data fork and the resource fork
+//!   extents overflow file         B-tree: the extents past a fork's eighth
+//!   attributes file               B-tree: extended attributes
+//! ```
+//!
+//! All fields are big-endian. Implemented from Apple's TN1150.
+//!
+//! A file's resource fork is not content here unless it carries a compressed
+//! file's bytes: any other is reported, and the data fork is read all the
+//! same. A symbolic link is not read. A journal is not replayed.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::cmp::Ordering;
+use std::collections::HashMap;
+use std::io::{Read, Seek, SeekFrom};
+
+use super::decmpfs;
+use super::vol::{
+    Attrs, Emit, Found, Got, List, Piece, Pieces, Vol, be16, be32, be64, hand, read_file,
+};
+use crate::{Budget, Entry, LimitHit};
+
+/// The catalog id of the root folder, whose children the paths start from.
+const ROOT: u32 = 2;
+
+/// Deeper than any real tree: a node's height counts down to a leaf's 1.
+const MAX_HEIGHT: u8 = 16;
+
+/// The most folders a path passes through.
+const MAX_PATH_DEPTH: usize = 256;
+
+/// The most lookups in the extents overflow tree for the extents of one fork:
+/// each gives up to eight, so a fork in this many fragments is not followed
+/// to its end.
+const MAX_OVERFLOW_LOOKUPS: u32 = 1 << 16;
+
+/// The most an attribute read from its fork is, bytes.
+const ATTR_MAX: u64 = 1 << 16;
+
+/// A fork type in an extents overflow key.
+const DATA: u8 = 0x00;
+const RESOURCE: u8 = 0xFF;
+
+/// `S_IFMT` and `S_IFLNK` of a file's mode.
+const S_IFMT: u16 = 0o170000;
+const S_IFLNK: u16 = 0o120000;
+
+/// A run of allocation blocks.
+#[derive(Clone, Copy, Default)]
+struct Extent {
+    start: u32,
+    count: u32,
+}
+
+/// A fork's size and its first eight extents, as a catalog record or the
+/// volume header holds them.
+#[derive(Clone, Default)]
+struct Fork {
+    size: u64,
+    extents: [Extent; 8],
+}
+
+impl Fork {
+    /// The fork data (80 bytes) at `at`.
+    fn parse(d: &[u8], at: usize) -> Fork {
+        let mut fork = Fork {
+            size: be64(d, at),
+            ..Fork::default()
+        };
+        for (i, e) in fork.extents.iter_mut().enumerate() {
+            let o = at.saturating_add(16).saturating_add(i.saturating_mul(8));
+            *e = Extent {
+                start: be32(d, o),
+                count: be32(d, o.saturating_add(4)),
+            };
+        }
+        fork
+    }
+}
+
+/// The blocks of a fork in order, which map a position in it to the volume.
+struct Map {
+    block: u64,
+    /// (the fork's block this extent starts at, the extent)
+    list: Vec<(u64, Extent)>,
+    blocks: u64,
+}
+
+impl Map {
+    fn new(block: u64) -> Self {
+        Map {
+            block,
+            list: Vec::new(),
+            blocks: 0,
+        }
+    }
+
+    fn push(&mut self, e: Extent) {
+        if e.count > 0 {
+            self.list.push((self.blocks, e));
+            self.blocks = self.blocks.saturating_add(u64::from(e.count));
+        }
+    }
+
+    /// The bytes the extents hold.
+    fn bytes(&self) -> u64 {
+        self.blocks.saturating_mul(self.block)
+    }
+
+    /// Append `len` bytes of the fork from `off` to `out`. False when the
+    /// extents do not hold them or the volume does not have them; what was
+    /// appended before that stays.
+    fn read(&self, v: &mut Vol, off: u64, len: usize, out: &mut Vec<u8>) -> bool {
+        let Some(end) = off.checked_add(len as u64) else {
+            return false;
+        };
+        if end > self.bytes() {
+            return false;
+        }
+        let mut pos = off;
+        while pos < end {
+            let at = self
+                .list
+                .partition_point(|(first, _)| *first <= pos.checked_div(self.block).unwrap_or(0));
+            let Some((first, e)) = at.checked_sub(1).and_then(|i| self.list.get(i)) else {
+                return false;
+            };
+            let into = pos.saturating_sub(first.saturating_mul(self.block));
+            let room = u64::from(e.count)
+                .saturating_mul(self.block)
+                .saturating_sub(into);
+            let take = end.saturating_sub(pos).min(room);
+            let Some(phys) = u64::from(e.start)
+                .saturating_mul(self.block)
+                .checked_add(into)
+            else {
+                return false;
+            };
+            if take == 0 || !v.append(phys, crate::bytes::to_usize(take), out) {
+                return false;
+            }
+            pos = pos.saturating_add(take);
+        }
+        true
+    }
+}
+
+/// A node of a B-tree: its descriptor and its records.
+struct Node {
+    data: Vec<u8>,
+    kind: u8,
+    height: u8,
+    next: u32,
+    count: usize,
+}
+
+const LEAF: u8 = 0xFF;
+const INDEX: u8 = 0x00;
+
+impl Node {
+    fn parse(data: Vec<u8>) -> Option<Node> {
+        let count = usize::from(be16(&data, 10));
+        // The offset table, one more entry than there are records, ends the node.
+        let table = count.checked_add(1)?.checked_mul(2)?;
+        if data.len() < table.checked_add(14)? {
+            return None;
+        }
+        Some(Node {
+            kind: *data.get(8)?,
+            height: *data.get(9)?,
+            next: be32(&data, 0),
+            count,
+            data,
+        })
+    }
+
+    /// Record `i`, which lies between its offset and the next record's.
+    fn rec(&self, i: usize) -> Option<&[u8]> {
+        if i >= self.count {
+            return None;
+        }
+        let size = self.data.len();
+        let offset = |k: usize| {
+            let at = size.checked_sub(k.checked_add(1)?.checked_mul(2)?)?;
+            Some(usize::from(be16(&self.data, at)))
+        };
+        let (start, end) = (offset(i)?, offset(i.checked_add(1)?)?);
+        let table = size.checked_sub(self.count.checked_add(1)?.checked_mul(2)?)?;
+        if start < 14 || start > end || end > table {
+            return None;
+        }
+        self.data.get(start..end)
+    }
+}
+
+/// The offset of what follows a record's key: its `u16` length, and the
+/// key, padded to an even length.
+fn after_key(rec: &[u8]) -> usize {
+    usize::from(be16(rec, 0)).saturating_add(3) & !1
+}
+
+/// A B-tree file: the catalog, the extents overflow file or the attributes
+/// file.
+struct Tree {
+    map: Map,
+    node_size: usize,
+    root: u32,
+    height: u8,
+    first_leaf: u32,
+}
+
+impl Tree {
+    /// The tree in the fork `map` describes, from its header node.
+    fn open(v: &mut Vol, map: Map) -> Option<Tree> {
+        let mut head = Vec::new();
+        if !map.read(v, 0, 64, &mut head) || head.get(8) != Some(&1) {
+            return None;
+        }
+        let node_size = usize::from(be16(&head, 32));
+        if !(512..=32768).contains(&node_size) || !node_size.is_power_of_two() {
+            return None;
+        }
+        let height = u8::try_from(be16(&head, 14)).ok()?;
+        (height <= MAX_HEIGHT).then_some(Tree {
+            node_size,
+            root: be32(&head, 16),
+            height,
+            first_leaf: be32(&head, 24),
+            map,
+        })
+    }
+
+    fn node(&self, v: &mut Vol, n: u32) -> Option<Node> {
+        let size = self.node_size as u64;
+        let mut data = Vec::new();
+        self.map
+            .read(
+                v,
+                u64::from(n).checked_mul(size)?,
+                self.node_size,
+                &mut data,
+            )
+            .then_some(())?;
+        Node::parse(data)
+    }
+
+    /// The record `cmp` finds equal, where `cmp` orders a record by its key
+    /// against the one wanted. The descent takes, in an index node, the last
+    /// record whose key is not past the wanted one.
+    fn find(&self, v: &mut Vol, cmp: &dyn Fn(&[u8]) -> Ordering) -> Option<Vec<u8>> {
+        let (mut n, mut height) = (self.root, self.height);
+        while n != 0 {
+            let node = self.node(v, n)?;
+            if node.height != height {
+                return None;
+            }
+            let recs = (0..node.count).map(|i| node.rec(i));
+            if node.kind == LEAF && height == 1 {
+                for rec in recs {
+                    match cmp(rec?) {
+                        Ordering::Equal => return rec.map(<[u8]>::to_vec),
+                        Ordering::Greater => return None,
+                        Ordering::Less => {}
+                    }
+                }
+                return None;
+            }
+            if node.kind != INDEX || height < 2 {
+                return None;
+            }
+            let mut child = None;
+            for rec in recs {
+                let rec = rec?;
+                if cmp(rec) == Ordering::Greater {
+                    break;
+                }
+                child = Some(be32(rec, after_key(rec)));
+            }
+            n = child?;
+            height = height.saturating_sub(1);
+        }
+        None
+    }
+
+    /// Every record of the leaves, in order, until `each` returns false. False
+    /// where the tree is damaged: a leaf that is not one, one that cannot be
+    /// read, a chain longer than the file holds nodes.
+    fn scan(&self, v: &mut Vol, mut each: impl FnMut(&[u8]) -> bool) -> bool {
+        let limit = self.map.bytes().checked_div(self.node_size as u64);
+        let (mut n, mut seen) = (self.first_leaf, 0u64);
+        // A chain that loops back on itself is as long as the volume's size
+        // allows (billions of nodes), so it is looked for: the node taken at
+        // each power of two of the steps, and met again, is a loop (Brent's).
+        let (mut mark, mut power, mut since) = (0u32, 1u64, 0u64);
+        while n != 0 {
+            seen = seen.saturating_add(1);
+            if Some(seen) > limit || n == mark {
+                return false;
+            }
+            since = since.saturating_add(1);
+            if since == power {
+                (mark, power, since) = (n, power.saturating_mul(2), 0);
+            }
+            let Some(node) = self.node(v, n) else {
+                return false;
+            };
+            if node.kind != LEAF {
+                return false;
+            }
+            for i in 0..node.count {
+                let Some(rec) = node.rec(i) else {
+                    return false;
+                };
+                if !each(rec) {
+                    return true;
+                }
+            }
+            n = node.next;
+        }
+        true
+    }
+}
+
+/// A file of the catalog.
+struct File {
+    id: u32,
+    parent: u32,
+    name: String,
+    /// Marked as compressed (decmpfs), as macOS marks one.
+    compressed: bool,
+    data: Fork,
+    resource: Fork,
+}
+
+/// What the catalog holds: the folders by id, and the files in key order.
+#[derive(Default)]
+struct Catalog {
+    folders: HashMap<u32, (u32, String)>,
+    files: Vec<File>,
+}
+
+impl Catalog {
+    /// Keep the folder or file record `rec` (a key and its body), unless it
+    /// is another kind of record or a symbolic link.
+    fn add(&mut self, rec: &[u8]) {
+        // The key: its length, the parent's id, the name's length and the
+        // name in UTF-16, all inside the key's length.
+        let name_len = usize::from(be16(rec, 6));
+        let name_bytes = name_len.saturating_mul(2);
+        let in_key = usize::from(be16(rec, 0)) >= name_bytes.saturating_add(6);
+        let Some(units) =
+            crate::bytes::at(rec, 8, name_bytes).filter(|_| in_key && name_len <= 255)
+        else {
+            return;
+        };
+        let units: Vec<u16> = units
+            .as_chunks::<2>()
+            .0
+            .iter()
+            .map(|c| u16::from_be_bytes(*c))
+            .collect();
+        let name = String::from_utf16_lossy(&units);
+        let parent = be32(rec, 2);
+        let Some(body) = rec.get(after_key(rec)..) else {
+            return;
+        };
+        match be16(body, 0) {
+            1 if body.len() >= 88 => {
+                self.folders.insert(be32(body, 8), (parent, name));
+            }
+            2 if body.len() >= 248 && be16(body, 42) & S_IFMT != S_IFLNK => {
+                let owner_flags = u32::from(body.get(41).copied().unwrap_or(0));
+                self.files.push(File {
+                    id: be32(body, 8),
+                    parent,
+                    name,
+                    compressed: owner_flags & decmpfs::COMPRESSED_FLAG != 0,
+                    data: Fork::parse(body, 88),
+                    resource: Fork::parse(body, 168),
+                });
+            }
+            _ => {}
+        }
+    }
+
+    /// The path of `name` in folder `parent`, from the root. A folder whose
+    /// chain does not reach the root (a record missing, or a loop) stands
+    /// where the chain broke, by its id.
+    fn path(&self, parent: u32, name: &str) -> String {
+        let mut parts = vec![name];
+        let mut at = parent;
+        for _ in 0..MAX_PATH_DEPTH {
+            if at == ROOT {
+                break;
+            }
+            let Some((up, folder)) = self.folders.get(&at) else {
+                break;
+            };
+            parts.push(folder);
+            at = *up;
+        }
+        let lost = (at != ROOT).then(|| format!("<hfs-folder-{at}>"));
+        parts.extend(lost.as_deref());
+        parts.reverse();
+        format!("/{}", parts.join("/"))
+    }
+}
+
+/// The volume's trees and geometry.
+struct Hfs {
+    block: u64,
+    extents: Tree,
+    attributes: Option<Tree>,
+}
+
+/// The extents overflow key `rec` against (`id`, `fork`, `start`): file id
+/// first, then fork type, then the fork's block the extents start at.
+fn cmp_extent_key(rec: &[u8], id: u32, fork: u8, start: u32) -> Ordering {
+    be32(rec, 4)
+        .cmp(&id)
+        .then(rec.get(2).copied().unwrap_or(0).cmp(&fork))
+        .then(be32(rec, 8).cmp(&start))
+}
+
+/// The attributes key `rec` against (`id`, `name`): file id, then the name by
+/// 16-bit code units, then the first block (0 for a value held whole).
+fn cmp_attr_key(rec: &[u8], id: u32, name: &[u16]) -> Ordering {
+    let len = usize::from(be16(rec, 12));
+    let mine = (0..len).map(|i| be16(rec, 14usize.saturating_add(i.saturating_mul(2))));
+    be32(rec, 4)
+        .cmp(&id)
+        .then_with(|| mine.cmp(name.iter().copied()))
+        .then(be32(rec, 8).cmp(&0))
+}
+
+impl Hfs {
+    /// The blocks of a fork: its eight extents and, past them, the extents
+    /// the overflow tree has for (`id`, `fork`).
+    fn map(&self, v: &mut Vol, fork: &Fork, id: u32, ty: u8) -> Map {
+        let mut map = Map::new(self.block);
+        for e in fork.extents {
+            map.push(e);
+        }
+        let need = fork.size.div_ceil(self.block);
+        for _ in 0..MAX_OVERFLOW_LOOKUPS {
+            if map.blocks >= need {
+                break;
+            }
+            let Ok(start) = u32::try_from(map.blocks) else {
+                break;
+            };
+            let found = self
+                .extents
+                .find(v, &|rec| cmp_extent_key(rec, id, ty, start));
+            // The key is 10 bytes, then eight extents.
+            let Some(rec) = found.filter(|r| r.len() >= 76) else {
+                break;
+            };
+            let before = map.blocks;
+            for i in 0..8usize {
+                let o = 12usize.saturating_add(i.saturating_mul(8));
+                map.push(Extent {
+                    start: be32(&rec, o),
+                    count: be32(&rec, o.saturating_add(4)),
+                });
+            }
+            if map.blocks == before {
+                break;
+            }
+        }
+        map
+    }
+
+    /// The whole of a fork, or `None` when it is longer than `bound` or its
+    /// extents do not give it.
+    fn read_fork(&self, v: &mut Vol, fork: &Fork, id: u32, ty: u8, bound: u64) -> Option<Vec<u8>> {
+        if fork.size > bound {
+            return None;
+        }
+        let mut out = Vec::new();
+        let len = crate::bytes::to_usize(fork.size);
+        self.map(v, fork, id, ty)
+            .read(v, 0, len, &mut out)
+            .then_some(out)
+    }
+
+    /// The `com.apple.decmpfs` attribute of file `id`.
+    fn decmpfs_attr(&self, v: &mut Vol, id: u32) -> Option<Vec<u8>> {
+        let tree = self.attributes.as_ref()?;
+        let name: Vec<u16> = decmpfs::ATTR.encode_utf16().collect();
+        let rec = tree.find(v, &|rec| cmp_attr_key(rec, id, &name))?;
+        let value = rec.get(after_key(&rec)..)?;
+        match be32(value, 0) {
+            // recordType, two reserved words, the size, the bytes
+            0x10 => {
+                let len = usize::try_from(be32(value, 12)).ok()?;
+                crate::bytes::at(value, 16, len).map(<[u8]>::to_vec)
+            }
+            // recordType, a reserved word, the fork data
+            0x20 => {
+                let fork = Fork::parse(value, 8);
+                // Its eight extents only: an attribute this long is not one.
+                let mut map = Map::new(self.block);
+                for e in fork.extents {
+                    map.push(e);
+                }
+                let mut out = Vec::new();
+                let len = crate::bytes::to_usize(fork.size.min(ATTR_MAX));
+                (fork.size <= ATTR_MAX && map.read(v, 0, len, &mut out)).then_some(out)
+            }
+            _ => None,
+        }
+    }
+}
+
+impl Hfs {
+    /// The bytes of `f`: held when they are at most `cap`, else read as they
+    /// go. A compressed file is unpacked, and is not read as it goes.
+    fn file<'a>(&self, v: &'a mut Vol<'_>, f: &File, cap: u64) -> Got<'a> {
+        if f.compressed {
+            if let Some(attr) = self.decmpfs_attr(v, f.id) {
+                let kind = decmpfs::header(&attr).map(|h| h.kind);
+                let fork = kind
+                    .filter(|&k| decmpfs::in_fork(k))
+                    // A fork holds the bytes in blocks, a little over their number.
+                    .and_then(|_| {
+                        let bound = cap.saturating_add(cap / 32).saturating_add(4096);
+                        self.read_fork(v, &f.resource, f.id, RESOURCE, bound)
+                    });
+                return decmpfs::unpack(&attr, fork.as_deref(), cap);
+            }
+            if f.data.size == 0 {
+                return Got::Why("compressed file (decmpfs) without its attribute");
+            }
+        }
+        let map = self.map(v, &f.data, f.id, DATA);
+        let block = self.block;
+        let plan = List {
+            pieces: map
+                .list
+                .iter()
+                .map(|(_, e)| {
+                    Piece::Disk(
+                        u64::from(e.start).saturating_mul(block),
+                        u64::from(e.count).saturating_mul(block),
+                    )
+                })
+                .collect::<Vec<_>>()
+                .into_iter(),
+            // The extents hold what the fork says it does.
+            intact: map.bytes() >= f.data.size,
+        };
+        read_file(v, Pieces::new(plan, f.data.size), f.data.size, cap)
+    }
+}
+
+/// Whether `head`, the start of a volume, holds the header of an HFS+ or an
+/// HFSX volume (version 4 and 5).
+pub(crate) fn is_hfsplus(head: &[u8]) -> bool {
+    matches!(
+        (be16(head, 1024), be16(head, 1026)),
+        (0x482B, 4) | (0x4858, 5)
+    )
+}
+
+/// Walk the HFS+ or HFSX volume `disk`, which starts at its boot area,
+/// handing each file to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let len = disk
+        .seek(SeekFrom::End(0))
+        .map_err(|e| LimitHit::corrupt(format!("HFS+ volume: {e}")))?;
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    let Some((hfs, catalog)) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "hfs+ open: the volume header or a tree is unreadable".into(),
+        ));
+    };
+
+    // The catalog, kept up to the member limit; a volume with more is walked
+    // as far as that and then stops as any container does at the limit.
+    let limit = crate::bytes::to_usize(budget.limits().max_members);
+    let mut cat = Catalog::default();
+    let mut capped = false;
+    let intact = catalog.scan(&mut v, |rec| {
+        if cat.files.len().saturating_add(cat.folders.len()) >= limit {
+            capped = true;
+            return false;
+        }
+        cat.add(rec);
+        true
+    });
+
+    for f in &cat.files {
+        let path = cat.path(f.parent, &f.name);
+        budget.count_entry()?;
+        let cap = budget.reserve()?;
+        let got = hfs.file(&mut v, f, cap);
+        // A compressed file's resource fork is its content, not a fork to report.
+        if f.resource.size > 0 && !f.compressed {
+            let note = Entry::unsupported(path.clone(), 0, false, "HFS+ resource fork not read");
+            if let Some(r) = visit(Found::Held(note), budget) {
+                return Ok(Some(r));
+            }
+            // A file that is only a resource fork has nothing else to give.
+            if f.data.size == 0 {
+                continue;
+            }
+        }
+        if let Some(r) = hand(budget, &mut *visit, path, Attrs::default(), got) {
+            return Ok(Some(r));
+        }
+    }
+    if capped {
+        return Err(LimitHit::of_kind(
+            crate::LimitKind::MaxFiles,
+            format!("file count > {limit}"),
+        ));
+    }
+    if !intact {
+        return Err(LimitHit::corrupt(
+            "hfs+ walk: catalog damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
+
+/// The volume's header and trees.
+fn open(v: &mut Vol) -> Option<(Hfs, Tree)> {
+    let h = v.at(1024, 512)?;
+    let (sig, version) = (be16(&h, 0), be16(&h, 2));
+    // "H+" is version 4, "HX" (case-sensitive) version 5.
+    if !matches!((sig, version), (0x482B, 4) | (0x4858, 5)) {
+        return None;
+    }
+    let block = be32(&h, 40);
+    if block < 512 || !block.is_power_of_two() || block > 1 << 30 {
+        return None;
+    }
+    let block = u64::from(block);
+    // Nothing is read from past the volume the header describes.
+    v.len = v.len.min(u64::from(be32(&h, 44)).saturating_mul(block));
+
+    let inline = |at: usize| {
+        let fork = Fork::parse(&h, at);
+        let mut map = Map::new(block);
+        for e in fork.extents {
+            map.push(e);
+        }
+        (fork, map)
+    };
+    // The extents file has no overflow of its own: its extents are the eight.
+    let (_, map) = inline(192);
+    let mut hfs = Hfs {
+        block,
+        extents: Tree::open(v, map)?,
+        attributes: None,
+    };
+    let catalog = Fork::parse(&h, 272);
+    let map = hfs.map(v, &catalog, 4, DATA);
+    let catalog = Tree::open(v, map)?;
+    let attributes = Fork::parse(&h, 352);
+    if attributes.size > 0 {
+        let map = hfs.map(v, &attributes, 8, DATA);
+        hfs.attributes = Tree::open(v, map);
+    }
+    Some((hfs, catalog))
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::{Cursor, Write};
+
+    /// The allocation block and the node size of the volumes built here.
+    const B: usize = 512;
+
+    fn be16(v: u16) -> [u8; 2] {
+        v.to_be_bytes()
+    }
+
+    fn be32(v: u32) -> [u8; 4] {
+        v.to_be_bytes()
+    }
+
+    /// The fork data (80 bytes) of `size` bytes in `(start, count)` extents.
+    fn fork(size: u64, extents: &[(u32, u32)]) -> Vec<u8> {
+        let mut f = size.to_be_bytes().to_vec();
+        f.extend_from_slice(&[0; 8]);
+        for i in 0..8 {
+            let (s, c) = extents.get(i).copied().unwrap_or((0, 0));
+            f.extend_from_slice(&be32(s));
+            f.extend_from_slice(&be32(c));
+        }
+        f
+    }
+
+    /// A catalog key: the parent's id, the name.
+    fn key(parent: u32, name: &str) -> Vec<u8> {
+        let units: Vec<u16> = name.encode_utf16().collect();
+        let mut k = be16((6 + 2 * units.len()) as u16).to_vec();
+        k.extend_from_slice(&be32(parent));
+        k.extend_from_slice(&be16(units.len() as u16));
+        k.extend(units.iter().flat_map(|u| u.to_be_bytes()));
+        k
+    }
+
+    fn folder(parent: u32, name: &str, id: u32) -> Vec<u8> {
+        let mut r = key(parent, name);
+        let mut body = vec![0u8; 88];
+        body[..2].copy_from_slice(&be16(1));
+        body[8..12].copy_from_slice(&be32(id));
+        r.extend(body);
+        r
+    }
+
+    /// A file record: `mode`, the owner flags, the data fork and the resource
+    /// fork (each 80 bytes).
+    fn file(
+        parent: u32,
+        name: &str,
+        id: u32,
+        mode: u16,
+        flags: u8,
+        data: &[u8],
+        rsrc: &[u8],
+    ) -> Vec<u8> {
+        let mut r = key(parent, name);
+        let mut body = vec![0u8; 248];
+        body[..2].copy_from_slice(&be16(2));
+        body[8..12].copy_from_slice(&be32(id));
+        body[41] = flags;
+        body[42..44].copy_from_slice(&be16(mode));
+        body[88..168].copy_from_slice(data);
+        body[168..248].copy_from_slice(rsrc);
+        r.extend(body);
+        r
+    }
+
+    /// The size of the nodes: a file record fills a node of the smallest size.
+    const N: usize = 4096;
+
+    /// A node holding `recs`.
+    fn node(kind: u8, height: u8, next: u32, recs: &[Vec<u8>]) -> Vec<u8> {
+        let mut n = vec![0u8; N];
+        n[..4].copy_from_slice(&be32(next));
+        n[8] = kind;
+        n[9] = height;
+        n[10..12].copy_from_slice(&be16(recs.len() as u16));
+        let mut at = 14;
+        let mut offsets = Vec::new();
+        for r in recs {
+            n[at..at + r.len()].copy_from_slice(r);
+            offsets.push(at);
+            at += r.len();
+        }
+        offsets.push(at);
+        for (i, o) in offsets.iter().enumerate() {
+            n[N - 2 * (i + 1)..N - 2 * i].copy_from_slice(&be16(*o as u16));
+        }
+        n
+    }
+
+    fn leaf(next: u32, recs: &[Vec<u8>]) -> Vec<u8> {
+        node(0xFF, 1, next, recs)
+    }
+
+    /// The file of a tree: its header node, then `nodes`.
+    fn tree(depth: u16, root: u32, first_leaf: u32, nodes: &[Vec<u8>]) -> Vec<u8> {
+        let mut h = node(1, 0, 0, &[]);
+        h[14..16].copy_from_slice(&be16(depth));
+        h[16..20].copy_from_slice(&be32(root));
+        h[24..28].copy_from_slice(&be32(first_leaf));
+        h[32..34].copy_from_slice(&be16(N as u16));
+        h[36..40].copy_from_slice(&be32(nodes.len() as u32 + 1));
+        let mut t = h;
+        for n in nodes {
+            t.extend_from_slice(n);
+        }
+        t
+    }
+
+    /// A volume of 512-byte blocks being laid out: the boot area, the header's
+    /// block, then what is added.
+    struct Img {
+        d: Vec<u8>,
+    }
+
+    impl Img {
+        fn new() -> Img {
+            Img { d: vec![0; 3 * B] }
+        }
+
+        /// `bytes` in blocks of their own: (the first block, how many).
+        fn add(&mut self, bytes: &[u8]) -> (u32, u32) {
+            let start = (self.d.len() / B) as u32;
+            self.d.extend_from_slice(bytes);
+            self.d.resize(self.d.len().div_ceil(B) * B, 0);
+            (start, (self.d.len() / B) as u32 - start)
+        }
+
+        /// A fork holding `bytes`, in one extent.
+        fn data(&mut self, bytes: &[u8]) -> Vec<u8> {
+            let (s, c) = self.add(bytes);
+            fork(bytes.len() as u64, &[(s, c)])
+        }
+
+        /// The volume: the three trees (each the file `tree` made) and the
+        /// header over them.
+        fn finish(mut self, catalog: &[u8], extents: &[u8], attributes: &[u8]) -> Vec<u8> {
+            let mut forks = Vec::new();
+            // Every volume has an extents file, a tree with no records at least.
+            let empty = tree(0, 0, 0, &[]);
+            let extents = if extents.is_empty() { &empty } else { extents };
+            for t in [extents, catalog, attributes] {
+                let f = match t.is_empty() {
+                    true => fork(0, &[]),
+                    false => {
+                        let (s, c) = self.add(t);
+                        fork(t.len() as u64, &[(s, c)])
+                    }
+                };
+                forks.push(f);
+            }
+            let total = (self.d.len() / B) as u32;
+            let h = &mut self.d[1024..1536];
+            h[..2].copy_from_slice(b"H+");
+            h[2..4].copy_from_slice(&be16(4));
+            h[40..44].copy_from_slice(&be32(B as u32));
+            h[44..48].copy_from_slice(&be32(total));
+            h[192..272].copy_from_slice(&forks[0]);
+            h[272..352].copy_from_slice(&forks[1]);
+            h[352..432].copy_from_slice(&forks[2]);
+            self.d
+        }
+    }
+
+    fn run(img: &[u8], limits: Limits) -> (Vec<Entry>, Result<(), LimitHit>) {
+        let mut budget = Budget::new(limits);
+        let mut out = Vec::new();
+        let end = walk_volume(Cursor::new(img.to_vec()), &mut budget, &mut |e, _| {
+            out.push(e.whole());
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    fn named(entries: &[Entry]) -> Vec<(&str, &[u8])> {
+        entries.iter().map(|e| (&e.name[..], &e.data[..])).collect()
+    }
+
+    const FILE: u16 = 0o100644;
+    const LINK: u16 = 0o120777;
+
+    /// A volume of folders and files in two chained leaves of the catalog.
+    fn tree_of_folders() -> Vec<u8> {
+        let mut img = Img::new();
+        let (a, b, c) = (
+            img.data(b"in root"),
+            img.data(b"in dir"),
+            img.data(b"in sub"),
+        );
+        let none = fork(0, &[]);
+        let first = [
+            folder(1, "Vol", 2),
+            file(2, "a.txt", 20, FILE, 0, &a, &none),
+            folder(2, "dir", 16),
+            file(2, "link", 23, LINK, 0, &none, &none),
+        ];
+        let second = [
+            file(16, "b.txt", 21, FILE, 0, &b, &none),
+            folder(16, "sub", 17),
+            file(17, "c.txt", 22, FILE, 0, &c, &none),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(2, &first), leaf(0, &second)]);
+        img.finish(&cat, &tree(0, 0, 0, &[]), &[])
+    }
+
+    #[test]
+    fn the_files_of_a_tree_of_folders_come_out_under_their_paths() {
+        let (entries, end) = run(&tree_of_folders(), Limits::default());
+        assert!(end.is_ok());
+        // The symbolic link is not read; the leaves are walked in their chain.
+        assert_eq!(
+            named(&entries),
+            [
+                ("/a.txt", &b"in root"[..]),
+                ("/dir/b.txt", b"in dir"),
+                ("/dir/sub/c.txt", b"in sub"),
+            ]
+        );
+    }
+
+    #[test]
+    fn a_file_in_a_folder_the_catalog_lacks_is_named_by_the_folder_it_lost() {
+        let mut img = Img::new();
+        let data = img.data(b"x");
+        let none = fork(0, &[]);
+        let recs = [
+            folder(1, "Vol", 2),
+            // Folders 50 and 51 are each other's parent: a loop.
+            folder(51, "f50", 50),
+            folder(50, "f51", 51),
+            file(99, "orphan", 30, FILE, 0, &data, &none),
+            file(50, "looped", 31, FILE, 0, &data, &none),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(0, &recs)]);
+        let (entries, end) = run(&img.finish(&cat, &[], &[]), Limits::default());
+        assert!(end.is_ok());
+        let names: Vec<_> = entries.iter().map(|e| e.name.as_str()).collect();
+        assert_eq!(names[0], "/<hfs-folder-99>/orphan");
+        // The loop ends where the path depth does, and says where it broke.
+        assert!(names[1].starts_with("/<hfs-folder-5"), "{}", names[1]);
+        assert!(names[1].ends_with("/looped"));
+    }
+
+    /// The extents past a fork's eighth are in the extents overflow tree, found
+    /// through its index.
+    #[test]
+    fn a_fragmented_file_is_put_together_from_the_overflow_tree() {
+        let mut img = Img::new();
+        // Twelve blocks of one file, each between two blocks of another.
+        let pieces: Vec<Vec<u8>> = (0..12u8).map(|i| vec![b'a' + i; B]).collect();
+        let mut at = Vec::new();
+        for p in &pieces {
+            at.push(img.add(p));
+            img.add(&[0xee; B]);
+        }
+        let want: Vec<u8> = pieces.concat();
+        let inline: Vec<(u32, u32)> = at[..8].to_vec();
+        let data = fork(want.len() as u64, &inline);
+        let none = fork(0, &[]);
+
+        let ext_rec = |id: u32, start: u32, exts: &[(u32, u32)]| {
+            let mut r = be16(10).to_vec();
+            r.extend_from_slice(&[0, 0]);
+            r.extend_from_slice(&be32(id));
+            r.extend_from_slice(&be32(start));
+            r.extend_from_slice(&fork(0, exts)[16..]);
+            r
+        };
+        // Records for other files before and after, in two leaves under an index.
+        let other = |id| ext_rec(id, 0, &[(1, 1)]);
+        let ours = ext_rec(30, 8, &at[8..]);
+        let first = leaf(2, &[other(5), other(29)]);
+        let second = leaf(0, &[ours.clone(), other(31)]);
+        let index = node(
+            0,
+            2,
+            0,
+            &[
+                [&other(5)[..12], &be32(1)].concat(),
+                [&ours[..12], &be32(2)].concat(),
+            ],
+        );
+        let extents = tree(2, 3, 1, &[first, second, index]);
+
+        let cat = tree(
+            1,
+            1,
+            1,
+            &[leaf(
+                0,
+                &[folder(1, "V", 2), file(2, "f", 30, FILE, 0, &data, &none)],
+            )],
+        );
+        let (entries, end) = run(&img.finish(&cat, &extents, &[]), Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(named(&entries), [("/f", &want[..])]);
+    }
+
+    /// An attribute record: file id, name, inline value.
+    fn attr(id: u32, name: &str, value: &[u8]) -> Vec<u8> {
+        let units: Vec<u16> = name.encode_utf16().collect();
+        let mut r = be16((12 + 2 * units.len()) as u16).to_vec();
+        r.extend_from_slice(&[0, 0]);
+        r.extend_from_slice(&be32(id));
+        r.extend_from_slice(&be32(0));
+        r.extend_from_slice(&be16(units.len() as u16));
+        r.extend(units.iter().flat_map(|u| u.to_be_bytes()));
+        if r.len() % 2 == 1 {
+            r.push(0);
+        }
+        r.extend_from_slice(&be32(0x10));
+        r.extend_from_slice(&[0; 8]);
+        r.extend_from_slice(&be32(value.len() as u32));
+        r.extend_from_slice(value);
+        r
+    }
+
+    fn deflated(data: &[u8]) -> Vec<u8> {
+        let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+        z.write_all(data).unwrap();
+        z.finish().unwrap()
+    }
+
+    fn decmpfs_attr(kind: u32, size: usize, payload: &[u8]) -> Vec<u8> {
+        let mut a = b"fpmc".to_vec();
+        a.extend_from_slice(&kind.to_le_bytes());
+        a.extend_from_slice(&(size as u64).to_le_bytes());
+        a.extend_from_slice(payload);
+        a
+    }
+
+    /// Files macOS compressed have no data fork. Their bytes are in the
+    /// `com.apple.decmpfs` attribute, found by its file id and name among
+    /// the others in the attributes tree, or in the resource fork.
+    #[test]
+    fn compressed_files_are_unpacked_from_their_attribute_or_resource_fork() {
+        let mut img = Img::new();
+        let text = b"compressed text, compressed text, compressed text".to_vec();
+        let none = fork(0, &[]);
+
+        // Type 4: one zlib block, the table 4 bytes into the fork.
+        let z = deflated(&text);
+        let mut rsrc = vec![0, 0, 0, 0, 1, 0, 0, 0, 12, 0, 0, 0];
+        rsrc.extend_from_slice(&(z.len() as u32).to_le_bytes());
+        rsrc.extend_from_slice(&z);
+        let rsrc = img.data(&rsrc);
+
+        const PACKED: u8 = 0x20;
+        let recs = [
+            folder(1, "V", 2),
+            file(2, "inline", 40, FILE, PACKED, &none, &none),
+            file(2, "forked", 41, FILE, PACKED, &none, &rsrc),
+            // Not marked: its attribute is not looked for.
+            file(2, "plain", 42, FILE, 0, &img.data(b"plain"), &none),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(0, &recs)]);
+        let inline = decmpfs_attr(3, text.len(), &deflated(&text));
+        let forked = decmpfs_attr(4, text.len(), &[]);
+        let other = decmpfs_attr(3, 5, &deflated(b"wrong"));
+        let first = leaf(
+            2,
+            &[
+                attr(39, "com.apple.decmpfs", &other),
+                attr(40, "com.apple.FinderInfo", b"zz"),
+            ],
+        );
+        let second = leaf(
+            0,
+            &[
+                attr(40, "com.apple.decmpfs", &inline),
+                attr(41, "com.apple.decmpfs", &forked),
+                attr(42, "com.apple.decmpfs", &other),
+            ],
+        );
+        let key_of = |r: &Vec<u8>| r[..2 + usize::from(u16::from_be_bytes([r[0], r[1]]))].to_vec();
+        let index = node(
+            0,
+            2,
+            0,
+            &[
+                [
+                    key_of(&attr(39, "com.apple.decmpfs", &[])),
+                    be32(1).to_vec(),
+                ]
+                .concat(),
+                [
+                    key_of(&attr(40, "com.apple.decmpfs", &[])),
+                    be32(2).to_vec(),
+                ]
+                .concat(),
+            ],
+        );
+        let attrs = tree(2, 3, 1, &[first, second, index]);
+        let (entries, end) = run(
+            &img.finish(&cat, &tree(0, 0, 0, &[]), &attrs),
+            Limits::default(),
+        );
+        assert!(end.is_ok());
+        // The resource fork of a compressed file is its content, not a fork to report.
+        assert_eq!(
+            named(&entries),
+            [
+                ("/inline", &text[..]),
+                ("/forked", &text[..]),
+                ("/plain", b"plain")
+            ]
+        );
+        assert!(entries.iter().all(|e| e.unsupported.is_none()));
+    }
+
+    #[test]
+    fn a_compressed_file_whose_attribute_is_missing_is_reported_not_empty() {
+        let img = Img::new();
+        let none = fork(0, &[]);
+        let recs = [
+            folder(1, "V", 2),
+            file(2, "gone", 40, FILE, 0x20, &none, &none),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(0, &recs)]);
+        let (entries, _) = run(&img.finish(&cat, &[], &[]), Limits::default());
+        assert_eq!(entries.len(), 1);
+        assert!(
+            entries[0]
+                .unsupported
+                .unwrap()
+                .contains("without its attribute")
+        );
+    }
+
+    #[test]
+    fn a_resource_fork_is_reported_and_the_data_fork_is_still_read() {
+        let mut img = Img::new();
+        let data = img.data(b"data fork");
+        let rsrc = fork(5, &[]);
+        let only = fork(0, &[]);
+        let recs = [
+            folder(1, "V", 2),
+            file(2, "both", 30, FILE, 0, &data, &rsrc),
+            file(2, "fork-only", 31, FILE, 0, &only, &rsrc),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(0, &recs)]);
+        let (entries, _) = run(&img.finish(&cat, &[], &[]), Limits::default());
+        let got: Vec<_> = entries
+            .iter()
+            .map(|e| (&e.name[..], e.unsupported, e.data.len()))
+            .collect();
+        let note = Some("HFS+ resource fork not read");
+        assert_eq!(
+            got,
+            [
+                ("/both", note, 0),
+                ("/both", None, 9),
+                ("/fork-only", note, 0)
+            ]
+        );
+    }
+
+    #[test]
+    fn a_file_the_volume_holds_only_part_of_is_reported_with_what_there_is() {
+        let mut img = Img::new();
+        let (s, _) = img.add(&[7; B]);
+        // 1000 bytes declared, one block mapped.
+        let data = fork(1000, &[(s, 1)]);
+        let recs = [
+            folder(1, "V", 2),
+            file(2, "short", 30, FILE, 0, &data, &fork(0, &[])),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(0, &recs)]);
+        let (entries, end) = run(&img.finish(&cat, &[], &[]), Limits::default());
+        assert!(end.is_ok());
+        assert_eq!(
+            entries[0].unsupported,
+            Some("file could not be read from the volume")
+        );
+        assert_eq!(entries[0].data, vec![7; B]);
+    }
+
+    #[test]
+    fn files_past_the_buffer_limit_are_read_as_they_go_across_their_extents() {
+        let mut img = Img::new();
+        let (first, _) = img.add(&[1; B]);
+        let (second, _) = img.add(&[2; B]);
+        // The second block of the file is before the first on the volume.
+        let data = fork(2 * B as u64, &[(second, 1), (first, 1)]);
+        let small = img.data(b"x");
+        let none = fork(0, &[]);
+        let recs = [
+            folder(1, "V", 2),
+            file(2, "big", 30, FILE, 0, &data, &none),
+            file(2, "small", 31, FILE, 0, &small, &none),
+        ];
+        let cat = tree(1, 1, 1, &[leaf(0, &recs)]);
+        let vol = img.finish(&cat, &[], &[]);
+        let mut budget = Budget::new(Limits {
+            max_buffer_bytes: 100,
+            ..Limits::default()
+        });
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(vol.clone()), &mut budget, emit));
+        end.unwrap();
+        let (big, was) = e.iter().find(|(m, _)| m.name == "/big").unwrap();
+        assert!(*was, "past the limit, so not held");
+        assert_eq!(big.data, [vec![2u8; B], vec![1u8; B]].concat());
+        let (small, was) = e.iter().find(|(m, _)| m.name == "/small").unwrap();
+        assert!(!*was);
+        assert_eq!(small.data, b"x");
+    }
+
+    #[test]
+    fn a_catalog_larger_than_the_member_limit_is_walked_to_it_and_then_stops() {
+        let limits = Limits {
+            max_members: 3,
+            ..Limits::default()
+        };
+        let (entries, end) = run(&tree_of_folders(), limits);
+        // The folder of the volume, "a.txt" and "dir" are the three records
+        // kept; what is kept is scanned.
+        assert_eq!(named(&entries), [("/a.txt", &b"in root"[..])]);
+        let hit = end.expect_err("the member limit");
+        assert_eq!(hit.kind, crate::LimitKind::MaxFiles);
+    }
+
+    #[test]
+    fn a_damaged_leaf_ends_the_walk_after_the_files_before_it() {
+        let mut img = tree_of_folders();
+        // The catalog is the second tree written: find its second leaf by the
+        // names it holds, and make it an index node.
+        let at = img
+            .windows(12)
+            .position(|w| w == [0, 0x10, 0, 0, 0, 0x10, 0, 5, 0, b'b', 0, b'.'])
+            .unwrap();
+        img[at - 14 + 8] = 0;
+        let (entries, end) = run(&img, Limits::default());
+        assert_eq!(named(&entries), [("/a.txt", &b"in root"[..])]);
+        assert!(end.expect_err("damage").is_corrupt());
+    }
+
+    #[test]
+    fn nothing_is_a_volume_but_a_header_with_a_block_size_and_trees() {
+        let good = tree_of_folders();
+        for (at, byte) in [(1024, b'X'), (1027, 9), (1064, 3)] {
+            let mut bad = good.clone();
+            bad[at] = byte;
+            let (entries, end) = run(&bad, Limits::default());
+            assert!(entries.is_empty(), "byte {at}");
+            assert!(end.expect_err("not a volume").is_corrupt(), "byte {at}");
+        }
+        assert!(run(&good[..1200], Limits::default()).1.is_err());
+    }
+
+    /// Whatever a volume says, the walk ends: every byte of the header and
+    /// the trees changed, in turn, to each of a few values.
+    #[test]
+    fn damaged_volumes_end_the_walk_without_a_panic() {
+        let good = tree_of_folders();
+        for at in (1024..good.len()).step_by(3) {
+            for byte in [0x00, 0x01, 0x7f, 0xff] {
+                let mut bad = good.clone();
+                bad[at] = byte;
+                let _ = run(&bad, Limits::default());
+            }
+        }
+    }
+
+    /// A disk of `image` and then zeros up to `len`: a virtual disk of a size
+    /// its header declares and nothing behind.
+    struct Padded {
+        image: Vec<u8>,
+        len: u64,
+        at: u64,
+    }
+
+    impl Read for Padded {
+        fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+            let n = (buf.len() as u64).min(self.len.saturating_sub(self.at)) as usize;
+            for (i, b) in buf[..n].iter_mut().enumerate() {
+                *b = self.image.get(self.at as usize + i).copied().unwrap_or(0);
+            }
+            self.at += n as u64;
+            Ok(n)
+        }
+    }
+
+    impl std::io::Seek for Padded {
+        fn seek(&mut self, to: SeekFrom) -> std::io::Result<u64> {
+            self.at = match to {
+                SeekFrom::Start(n) => n,
+                SeekFrom::End(d) => self.len.saturating_add_signed(d),
+                SeekFrom::Current(d) => self.at.saturating_add_signed(d),
+            };
+            Ok(self.at)
+        }
+    }
+
+    /// Two leaves that are each other's next, in a catalog whose fork says it
+    /// is 32 GiB (a fuzzer's 19 KB disk image of this took 21 s under the
+    /// sanitizer, and a declared 2^62 bytes would not end): the chain is
+    /// bounded by the fork, 8 million nodes here, and each is a valid leaf with
+    /// no record the catalog keeps, so no member limit ends it.
+    #[test]
+    fn a_leaf_chain_that_loops_is_damage_not_a_walk_to_the_end_of_the_fork() {
+        let t = tree(1, 1, 1, &[leaf(2, &[]), leaf(1, &[])]);
+        let mut img = Img::new().finish(&t, &[], &[]);
+        // The catalog's one extent is 2^26 blocks of 512 bytes, from its start.
+        let fork_at = 1024 + 272;
+        let extent_count = fork_at + 16 + 4;
+        img[extent_count..extent_count + 4].copy_from_slice(&be32(1 << 26));
+        img[fork_at..fork_at + 8].copy_from_slice(&(512u64 << 26).to_be_bytes());
+        img[1024 + 44..1024 + 48].copy_from_slice(&be32(u32::MAX));
+        let disk = Padded {
+            image: img,
+            len: 1 << 40,
+            at: 0,
+        };
+        let mut budget = Budget::new(Limits::default());
+        let started = std::time::Instant::now();
+        let end = walk_volume(disk, &mut budget, &mut |_, _| None::<()>);
+        assert!(started.elapsed().as_secs() < 2, "{:?}", started.elapsed());
+        assert!(end.expect_err("a loop").is_corrupt());
+    }
+}
diff --git a/crates/exav-unpack/src/formats/ishield_z.rs b/crates/exav-unpack/src/formats/ishield_z.rs
index 900b108f..14c3b3db 100644
--- a/crates/exav-unpack/src/formats/ishield_z.rs
+++ b/crates/exav-unpack/src/formats/ishield_z.rs
@@ -7,32 +7,104 @@
 //!
 //! Members are compressed with the **PKWARE Data Compression Library** codec
 //! ("implode"), which is not the same as ZIP's method 8 deflate and not the
-//! same as ZIP method 6 either. Decoding is delegated to `unshield` (MIT), whose
-//! only real dependency is `explode` (MIT), a leaf DCL decoder.
+//! same as ZIP method 6 either; [`super::dcl_explode`] decodes it.
+//!
+//! The table of contents is read as `unshield` 0.2.0 (Aaron Griffith, MIT;
+//! attributed in `NOTICE`) reads it, with two differences: every member is
+//! listed in table order, where `unshield` keys them by path and keeps only
+//! the last of two that share one, and a name that is not UTF-8 is read
+//! lossily instead of failing the whole archive.
 //!
 //! Names come out as `path/name` and are used only for reporting and `.cdb`
 //! matching — nothing here resolves one against a filesystem.
 
-use std::io::Cursor;
-
+use crate::bytes::at;
 use crate::{Budget, Entry, LimitHit, Sink};
 
 /// Bound on the member walk; hitting it is reported, never a quiet stop.
 const MAX_ENTRIES: usize = 20_000;
 
+/// Where the first member's data begins, the end of the header.
+const FILE_OFFSET: usize = 255;
+
 pub(crate) fn is_ishield_z(data: &[u8]) -> bool {
     super::sniff::is(data, crate::Format::IshieldZ)
 }
 
-/// A member's reported name. `FileInfo::path` is already the full path; only
-/// the separator differs — InstallShield wrote backslashes — so it is
-/// normalised to read like every other container's.
-///
-/// The archive is addressed by the raw `path` string, never by this.
+/// A member's reported name. `path` is already the full path; only the
+/// separator differs — InstallShield wrote backslashes — so it is normalised
+/// to read like every other container's.
 fn display_name(path: &str) -> String {
     path.replace('\\', "/").trim_matches('/').to_string()
 }
 
+struct Member {
+    path: String,
+    /// Where its compressed bytes start: members follow each other from
+    /// [`FILE_OFFSET`] in table order.
+    offset: usize,
+    /// Its COMPRESSED size.
+    size: usize,
+}
+
+enum Toc {
+    Members(Vec<Member>),
+    /// More members declared than [`MAX_ENTRIES`].
+    TooMany,
+}
+
+/// The table of contents. `None` when it cannot be read.
+///
+/// The directory records come first, each with its member count, then the
+/// member records, directory by directory. A record's `chunk` is its length:
+/// a zero one makes every record read the same bytes again, so the member
+/// count is summed and bounded before any member record is read.
+fn read_toc(data: &[u8]) -> Option<Toc> {
+    let u16at = |d: &[u8], o: usize| -> Option<usize> {
+        Some(u16::from_le_bytes(at(d, o, 2)?.try_into().ok()?) as usize)
+    };
+    let u32at = |d: &[u8], o: usize| -> Option<usize> {
+        let v = u32::from_le_bytes(at(d, o, 4)?.try_into().ok()?);
+        Some(crate::bytes::to_usize(v as u64))
+    };
+    let string = |d: &[u8], o: usize, len: usize| -> Option<String> {
+        Some(String::from_utf8_lossy(at(d, o, len)?).into_owned())
+    };
+    let toc = data.get(u32at(data, 41)?..u32at(data, 18)?)?;
+    let mut next = 0usize;
+    let mut dirs = Vec::new();
+    let mut declared = 0usize;
+    for _ in 0..u16at(data, 49)? {
+        let files = u16at(toc, next)?;
+        let chunk = u16at(toc, next.checked_add(2)?)?;
+        let name_len = u16at(toc, next.checked_add(4)?)?;
+        dirs.push((files, string(toc, next.checked_add(6)?, name_len)?));
+        declared += files;
+        next = next.checked_add(chunk)?;
+    }
+    if declared > MAX_ENTRIES {
+        return Some(Toc::TooMany);
+    }
+    let mut members = Vec::with_capacity(declared);
+    let mut offset = FILE_OFFSET;
+    for (files, dir) in dirs {
+        for _ in 0..files {
+            let size = u32at(toc, next.checked_add(7)?)?;
+            let chunk = u16at(toc, next.checked_add(23)?)?;
+            let name_len = *toc.get(next.checked_add(29)?)? as usize;
+            let name = string(toc, next.checked_add(30)?, name_len)?;
+            let path = match dir.is_empty() {
+                true => name,
+                false => format!("{dir}\\{name}"),
+            };
+            members.push(Member { path, offset, size });
+            next = next.checked_add(chunk)?;
+            offset = offset.checked_add(size)?;
+        }
+    }
+    Some(Toc::Members(members))
+}
+
 pub(crate) fn extract_ishield_z<R>(
     data: &[u8],
     budget: &mut Budget,
@@ -41,13 +113,24 @@ pub(crate) fn extract_ishield_z<R>(
     if !is_ishield_z(data) {
         return Ok(None);
     }
-    let mut archive = match unshield::Archive::new(Cursor::new(data)) {
-        Ok(a) => a,
-        Err(e) => {
+    let members = match read_toc(data) {
+        Some(Toc::Members(m)) => m,
+        Some(Toc::TooMany) => {
+            budget.count_entry()?;
+            return Ok(visit(
+                Entry::unsupported(
+                    format!("<installshield-z-entries-beyond-{MAX_ENTRIES}>"),
+                    0,
+                    false,
+                    "too many InstallShield Z members to walk them all",
+                ),
+                budget,
+            ));
+        }
+        None => {
             // The header said InstallShield Z and its own arithmetic checked
             // out; failing to open now leaves every member unexamined, which
             // must not pass quietly.
-            let _ = e;
             budget.count_entry()?;
             return Ok(visit(
                 Entry::unsupported(
@@ -61,32 +144,20 @@ pub(crate) fn extract_ishield_z<R>(
         }
     };
 
-    // The listing is borrowed from the archive and `load` needs it mutably, so
-    // the paths are taken first. This is a table of contents, not content: it is
-    // bounded by `MAX_ENTRIES` and holds no member bytes.
-    let mut listing: Vec<(String, usize)> = Vec::new();
-    let mut truncated = false;
-    for f in archive.list() {
-        if listing.len() >= MAX_ENTRIES {
-            truncated = true;
-            break;
-        }
-        listing.push((f.path.clone(), f.size));
-    }
-
-    for (path, comp_size) in listing {
-        let name = display_name(&path);
+    for m in members {
+        let name = display_name(&m.path);
+        let comp_size = m.size as u64;
         budget.count_entry()?;
         let cap = budget.reserve()?;
-        // `size` in the table of contents is the COMPRESSED length — that is
-        // what `load_compressed` reads — so it cannot stand in for the output
-        // size. What it does bound is the input: a member whose compressed form
-        // is already over the cap cannot decode to anything under it.
-        if comp_size as u64 > cap {
+        // The table's size is the COMPRESSED length, so it cannot stand in
+        // for the output size. What it does bound is the input: a member whose
+        // compressed form is already over the cap cannot decode to anything
+        // under it.
+        if comp_size > cap {
             if let Some(r) = visit(
                 Entry::unsupported(
                     name,
-                    comp_size as u64,
+                    comp_size,
                     false,
                     "InstallShield Z member exceeds the per-member size budget",
                 ),
@@ -96,76 +167,45 @@ pub(crate) fn extract_ishield_z<R>(
             }
             continue;
         }
-        // Addressed by the raw path the listing gave; nothing constructs a name
-        // of its own here.
+        // The codec's matches run to 518 bytes, so a bounded input can expand
+        // a few hundred times over: the member is decoded up to the cap, and an
+        // over-cap result is still reported. Discarded bytes that nobody hears
+        // about are the failure mode this crate exists to avoid.
         //
-        // `Archive::load` explodes a member whole, with no cap: the codec's
-        // matches run to 518 bytes, so a bounded input can expand a few hundred
-        // times over. The compressed bytes are taken instead and read through
-        // the decoder up to the cap. An over-cap result is still reported:
-        // discarded bytes that nobody hears about are the failure mode this
-        // crate exists to avoid.
-        let loaded = archive
-            .load_compressed(&path)
-            .map_err(|_| ())
-            .and_then(|raw| {
-                let s = crate::salvage(explode::ExplodeReader::new(Cursor::new(raw)), cap);
-                if s.over_cap || !s.undecoded {
-                    Ok(s)
-                } else {
-                    Err(())
-                }
-            });
-        match loaded.map(|s| (s.over_cap, s.data)) {
-            Ok((true, _)) => {
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        name,
-                        comp_size as u64,
-                        false,
-                        "InstallShield Z member decompressed past the per-member \
-                         size budget",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
-                }
-            }
-            Ok((false, bytes)) => {
-                budget.commit(bytes.len() as u64);
-                let mut e = Entry::new(name, bytes);
-                e.comp_size = comp_size as u64;
-                if let Some(r) = visit(e, budget) {
-                    return Ok(Some(r));
-                }
-            }
-            Err(()) => {
-                // One member exav cannot decode must not stop the rest.
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        name,
-                        comp_size as u64,
-                        false,
-                        "InstallShield Z member could not be decompressed",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
-                }
+        // A member whose range runs past the file is decoded as far as the
+        // file goes. What the codec decoded before a stream failed or ended
+        // early is kept and scanned, and the member is reported.
+        let raw = data.get(m.offset..).unwrap_or_default();
+        let raw = &raw[..m.size.min(raw.len())];
+        let range_cut = raw.len() < m.size;
+        let s = super::dcl_explode::explode(raw, cap);
+        if s.over_cap {
+            if let Some(r) = visit(
+                Entry::unsupported(
+                    name,
+                    comp_size,
+                    false,
+                    "InstallShield Z member decompressed past the per-member \
+                     size budget",
+                ),
+                budget,
+            ) {
+                return Ok(Some(r));
             }
+            continue;
+        }
+        budget.commit(s.data.len() as u64);
+        let mut e = Entry::new(name, s.data);
+        e.comp_size = comp_size;
+        if s.undecoded || s.cut_short || range_cut {
+            e.unsupported = Some(
+                "InstallShield Z member failed to decompress in full; the bytes \
+                 before the failure were scanned",
+            );
+        }
+        if let Some(r) = visit(e, budget) {
+            return Ok(Some(r));
         }
-    }
-    if truncated {
-        budget.count_entry()?;
-        return Ok(visit(
-            Entry::unsupported(
-                format!("<installshield-z-entries-beyond-{MAX_ENTRIES}>"),
-                0,
-                false,
-                "too many InstallShield Z members to walk them all",
-            ),
-            budget,
-        ));
     }
     Ok(None)
 }
diff --git a/crates/exav-unpack/src/formats/iso.rs b/crates/exav-unpack/src/formats/iso.rs
index 78264559..d3df8850 100644
--- a/crates/exav-unpack/src/formats/iso.rs
+++ b/crates/exav-unpack/src/formats/iso.rs
@@ -89,13 +89,13 @@ pub(crate) fn walk<T>(
 }
 
 /// The ISO 9660 regions, and the sectors the files start at.
-type StreamedTree = (Vec<Region>, HashSet<u64>);
+type StreamedTree = (Vec<Region>, HashSet<(u64, u64)>);
 
 /// Walk the ISO 9660 directory tree(s) via targeted reads (directory records
 /// are small) and return each file as a region; file extents, the bulk of a
 /// disc image, are streamed by the caller. `max_buffer` bounds each directory
 /// read. Both the primary and Joliet trees are walked; a file present in both
-/// (by extent) is emitted once. The extents emitted come back too, for the UDF
+/// (by extent and length) is emitted once. The extents emitted come back too, for the UDF
 /// walk that follows to skip.
 pub(crate) fn stream_offsets<R: Read + Seek>(
     source: &mut R,
@@ -123,7 +123,7 @@ pub(crate) fn stream_offsets<R: Read + Seek>(
         return Err(e);
     }
     let mut out = Vec::new();
-    let mut seen_files: HashSet<u64> = HashSet::new();
+    let mut seen_files: HashSet<(u64, u64)> = HashSet::new();
     if roots.is_empty() {
         return Ok((out, seen_files));
     }
@@ -132,7 +132,9 @@ pub(crate) fn stream_offsets<R: Read + Seek>(
     // A directory is walked once per tree, however many records name it: a
     // record can point back at its own extent.
     let mut queued: HashSet<(bool, u64)> = roots.iter().map(|&(j, lba, _)| (j, lba)).collect();
-    let mut dirs: Vec<(bool, u64, u64)> = roots;
+    // Popped from the end: the Joliet roots, which `vd_roots` puts first, are
+    // walked first, and a file in both trees takes its long name.
+    let mut dirs: Vec<(bool, u64, u64)> = roots.into_iter().rev().collect();
     while let Some((joliet, lba, len)) = dirs.pop() {
         visited = visited.saturating_add(1);
         if visited > MAX_DIRS {
@@ -188,7 +190,10 @@ pub(crate) fn stream_offsets<R: Read + Seek>(
                 if queued.insert((joliet, child_lba)) {
                     dirs.push((joliet, child_lba, child_len));
                 }
-            } else if seen_files.insert(child_lba) {
+            // A file is its extent and its length: two records at one start with
+            // different lengths are two files, and the empty one must not take
+            // the place of the other.
+            } else if seen_files.insert((child_lba, child_len)) {
                 let raw = rec
                     .get(33..33usize.saturating_add(name_len.min(rec_len.saturating_sub(33))))
                     .unwrap_or(&[]);
diff --git a/crates/exav-unpack/src/formats/javaclass.rs b/crates/exav-unpack/src/formats/javaclass.rs
index 51712d97..bd52c1e6 100644
--- a/crates/exav-unpack/src/formats/javaclass.rs
+++ b/crates/exav-unpack/src/formats/javaclass.rs
@@ -156,7 +156,7 @@ mod tests {
         data.extend_from_slice(&0xCAFEBABEu32.to_be_bytes()); // magic
         data.extend_from_slice(&0u16.to_be_bytes()); // minor
         data.extend_from_slice(&52u16.to_be_bytes()); // major (Java 8)
-                                                      // constant_pool_count = slots + 1 (1-indexed, count is entries + 1).
+        // constant_pool_count = slots + 1 (1-indexed, count is entries + 1).
         data.extend_from_slice(&(pool_slots + 1).to_be_bytes());
         data.extend_from_slice(pool_bytes);
         data
@@ -213,7 +213,7 @@ mod tests {
         data.extend_from_slice(&0u16.to_be_bytes());
         data.extend_from_slice(&52u16.to_be_bytes());
         data.extend_from_slice(&1001u16.to_be_bytes()); // count => 1000 entries
-                                                        // One complete Utf8, then EOF mid-pool.
+        // One complete Utf8, then EOF mid-pool.
         push_utf8(&mut data, b"present");
         data.push(TAG_UTF8); // dangling tag, no length/body follows
 
@@ -221,10 +221,12 @@ mod tests {
         let entries = extract(Format::JavaClass, &data, &mut budget).unwrap();
         // At most the one fully-parsed string is surfaced; no panic.
         assert_eq!(entries.len(), 1);
-        assert!(entries[0]
-            .data
-            .windows(b"present".len())
-            .any(|w| w == b"present"));
+        assert!(
+            entries[0]
+                .data
+                .windows(b"present".len())
+                .any(|w| w == b"present")
+        );
     }
 
     #[test]
diff --git a/crates/exav-unpack/src/formats/lha.rs b/crates/exav-unpack/src/formats/lha.rs
index 92e1c874..e89c0eae 100644
--- a/crates/exav-unpack/src/formats/lha.rs
+++ b/crates/exav-unpack/src/formats/lha.rs
@@ -74,7 +74,7 @@ pub(crate) fn walk<T>(
     budget: &mut Budget,
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
-    use crate::stream::{emit_stream, MemberMeta};
+    use crate::stream::{MemberMeta, emit_stream};
     check_first_header(src)?;
     let mut dec = delharc::LhaDecodeReader::new(crate::source::Reader::new(src))
         .map_err(|e| LimitHit::new(format!("lha: {e}")))?;
diff --git a/crates/exav-unpack/src/formats/lz4.rs b/crates/exav-unpack/src/formats/lz4.rs
index e8a24a8a..4c1edd6b 100644
--- a/crates/exav-unpack/src/formats/lz4.rs
+++ b/crates/exav-unpack/src/formats/lz4.rs
@@ -53,7 +53,7 @@ fn le_u32(d: &[u8], off: usize) -> Option<u32> {
 /// Decompress one LZ4 block, appending to `out`. Matches may reach back before
 /// `block_start` when blocks are linked, which is why the whole output buffer is
 /// passed rather than a per-block one.
-fn block(src: &[u8], out: &mut Vec<u8>, cap: usize) -> Result<(), &'static str> {
+pub(crate) fn block(src: &[u8], out: &mut Vec<u8>, cap: usize) -> Result<(), &'static str> {
     let mut i = 0usize;
     while i < src.len() {
         let token = src[i];
diff --git a/crates/exav-unpack/src/formats/lzfse.rs b/crates/exav-unpack/src/formats/lzfse.rs
new file mode 100644
index 00000000..0729ece9
--- /dev/null
+++ b/crates/exav-unpack/src/formats/lzfse.rs
@@ -0,0 +1,1110 @@
+//! LZFSE, Apple's codec for DMG `lzfse` runs, decoded: its raw (`bvx-`),
+//! LZVN (`bvxn`) and FSE (`bvx1`, `bvx2`) blocks, up to the end-of-stream
+//! block (`bvx$`).
+//!
+//! A port of the decoder of Apple's reference implementation (`lzfse`,
+//! BSD-3-Clause, attributed in `NOTICE`). It decodes a slice whole into a
+//! capped buffer, so the reference's resumable state and its wide, unchecked
+//! copies are gone. A damaged stream the reference decodes is decoded to the
+//! same bytes: its literal buffer and decoding tables are kept across blocks
+//! as it keeps them, since a damaged block reads what earlier ones left
+//! there. Where it would read memory it never wrote instead (an LZVN match
+//! reusing a distance before there is one, or reaching back past the
+//! output's start), the stream is invalid here.
+
+use crate::Salvaged;
+
+const END_OF_STREAM: u32 = 0x2478_7662; // bvx$
+const UNCOMPRESSED: u32 = 0x2d78_7662; // bvx-
+const COMPRESSED_V1: u32 = 0x3178_7662; // bvx1
+const COMPRESSED_V2: u32 = 0x3278_7662; // bvx2
+const COMPRESSED_LZVN: u32 = 0x6e78_7662; // bvxn
+
+const L_SYMBOLS: usize = 20;
+const M_SYMBOLS: usize = 20;
+const D_SYMBOLS: usize = 64;
+const LITERAL_SYMBOLS: usize = 256;
+const L_STATES: usize = 64;
+const M_STATES: usize = 64;
+const D_STATES: usize = 256;
+const LITERAL_STATES: usize = 1024;
+const MATCHES_PER_BLOCK: u32 = 10_000;
+const LITERALS_PER_BLOCK: u32 = 4 * MATCHES_PER_BLOCK;
+/// The reference's literal buffer, which a damaged block's matches may read
+/// past the literals it decoded.
+const LITERAL_BUFFER: usize = LITERALS_PER_BLOCK as usize + 64;
+/// `sizeof(lzfse_compressed_block_header_v1)`, padding included.
+const V1_HEADER: usize = 772;
+/// Where a v2 header's frequency tables start.
+const V2_FREQ: usize = 32;
+
+const L_EXTRA_BITS: [u8; L_SYMBOLS] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 5, 8];
+const L_BASE: [i32; L_SYMBOLS] = [
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 28, 60,
+];
+const M_EXTRA_BITS: [u8; M_SYMBOLS] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11];
+const M_BASE: [i32; M_SYMBOLS] = [
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 24, 56, 312,
+];
+const D_EXTRA_BITS: [u8; D_SYMBOLS] = [
+    0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7,
+    8, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14,
+    14, 14, 15, 15, 15, 15,
+];
+const D_BASE: [i32; D_SYMBOLS] = [
+    0, 1, 2, 3, 4, 6, 8, 10, 12, 16, 20, 24, 28, 36, 44, 52, 60, 76, 92, 108, 124, 156, 188, 220,
+    252, 316, 380, 444, 508, 636, 764, 892, 1020, 1276, 1532, 1788, 2044, 2556, 3068, 3580, 4092,
+    5116, 6140, 7164, 8188, 10236, 12284, 14332, 16380, 20476, 24572, 28668, 32764, 40956, 49148,
+    57340, 65532, 81916, 98300, 114684, 131068, 163836, 196604, 229372,
+];
+
+enum Stop {
+    /// The input ended before the end-of-stream block.
+    Truncated,
+    /// The input is not an LZFSE stream.
+    Invalid,
+    /// The output reached the cap.
+    Full,
+}
+
+/// Decode `input` up to `cap` bytes, salvaging what came out before an
+/// error, as [`crate::salvage`] reports a reader's.
+pub(crate) fn decode(input: &[u8], cap: u64) -> Salvaged {
+    let mut out = Out::new(cap);
+    let stop = run(input, &mut out);
+    out.finish(stop)
+}
+
+/// [`decode`] of a bare LZVN stream, as macOS stores a compressed file's
+/// blocks (`formats/decmpfs`): the opcodes of a `bvxn` block's payload, up to
+/// its end-of-stream opcode, with no block header.
+pub(crate) fn decode_lzvn(input: &[u8], cap: u64) -> Salvaged {
+    let mut out = Out::new(cap);
+    let stop = lzvn(input, &mut out).err();
+    out.finish(stop)
+}
+
+/// The output, which LZVN and LZFSE matches reach back into across blocks.
+struct Out {
+    buf: Vec<u8>,
+    limit: usize,
+}
+
+impl Out {
+    /// An output of at most `cap` bytes (one more is held, to see the cap passed).
+    fn new(cap: u64) -> Self {
+        Out {
+            buf: Vec::new(),
+            limit: usize::try_from(cap).unwrap_or(usize::MAX).saturating_add(1),
+        }
+    }
+
+    fn finish(self, stop: Option<Stop>) -> Salvaged {
+        let kept = self.limit - 1;
+        let over_cap = self.buf.len() > kept;
+        let mut data = self.buf;
+        data.truncate(kept);
+        Salvaged {
+            data,
+            over_cap,
+            undecoded: matches!(stop, Some(Stop::Invalid)),
+            cut_short: matches!(stop, Some(Stop::Truncated)),
+        }
+    }
+
+    fn literal(&mut self, bytes: &[u8]) -> Result<(), Stop> {
+        let room = self.limit - self.buf.len();
+        self.buf.extend_from_slice(&bytes[..bytes.len().min(room)]);
+        match bytes.len() > room {
+            true => Err(Stop::Full),
+            false => Ok(()),
+        }
+    }
+
+    /// `len` bytes from `dist` back, byte by byte: the copy may overlap
+    /// what it writes.
+    fn copy(&mut self, dist: usize, len: usize) -> Result<(), Stop> {
+        if dist == 0 || dist > self.buf.len() {
+            return Err(Stop::Invalid);
+        }
+        for _ in 0..len {
+            if self.buf.len() == self.limit {
+                return Err(Stop::Full);
+            }
+            self.buf.push(self.buf[self.buf.len() - dist]);
+        }
+        Ok(())
+    }
+}
+
+fn u32_at(d: &[u8], at: usize) -> Option<u32> {
+    Some(u32::from_le_bytes(
+        crate::bytes::at(d, at, 4)?.try_into().ok()?,
+    ))
+}
+
+/// What the reference keeps in its decoder state from block to block, zeros
+/// at first: a block only overwrites the part it decodes or lays out.
+struct Kept {
+    literals: Vec<u8>,
+    literal: Vec<Entry>,
+    l: Vec<ValueEntry>,
+    m: Vec<ValueEntry>,
+    d: Vec<ValueEntry>,
+}
+
+/// `None` at the end-of-stream block.
+fn run(input: &[u8], out: &mut Out) -> Option<Stop> {
+    let mut pos = 0;
+    let mut kept = Kept {
+        literals: vec![0; LITERAL_BUFFER],
+        literal: vec![Entry::default(); LITERAL_STATES],
+        l: vec![ValueEntry::default(); L_STATES],
+        m: vec![ValueEntry::default(); M_STATES],
+        d: vec![ValueEntry::default(); D_STATES],
+    };
+    loop {
+        let Some(magic) = u32_at(input, pos) else {
+            return Some(Stop::Truncated);
+        };
+        let r = match magic {
+            END_OF_STREAM => return None,
+            UNCOMPRESSED => uncompressed(input, pos, out),
+            COMPRESSED_LZVN => lzvn_block(input, pos, out),
+            COMPRESSED_V1 | COMPRESSED_V2 => fse_block(input, pos, magic, &mut kept, out),
+            _ => Err(Stop::Invalid),
+        };
+        match r {
+            Ok(next) => pos = next,
+            Err(e) => return Some(e),
+        }
+    }
+}
+
+fn uncompressed(input: &[u8], pos: usize, out: &mut Out) -> Result<usize, Stop> {
+    let n = u32_at(input, pos + 4).ok_or(Stop::Truncated)? as usize;
+    let data = &input[(pos + 8).min(input.len())..];
+    out.literal(&data[..n.min(data.len())])?;
+    match data.len() < n {
+        true => Err(Stop::Truncated),
+        false => Ok(pos + 8 + n),
+    }
+}
+
+fn lzvn_block(input: &[u8], pos: usize, out: &mut Out) -> Result<usize, Stop> {
+    let n_raw = u32_at(input, pos + 4).ok_or(Stop::Truncated)? as usize;
+    let n_payload = u32_at(input, pos + 8).ok_or(Stop::Truncated)? as usize;
+    let rest = &input[pos + 12..];
+    let payload = &rest[..n_payload.min(rest.len())];
+    let end = out.buf.len().saturating_add(n_raw);
+    // The block's output stops at its declared size, as at the output limit:
+    // whichever comes first ends it, after the part of an instruction that
+    // fits.
+    let saved = out.limit;
+    out.limit = saved.min(end);
+    let result = lzvn(payload, out);
+    out.limit = saved;
+    match result {
+        Err(Stop::Full) if end < saved => Err(Stop::Invalid),
+        Err(Stop::Full) => Err(Stop::Full),
+        Ok(used) if used == n_payload && out.buf.len() == end => Ok(pos + 12 + n_payload),
+        // Out of payload before the end opcode: cut if the input ends there.
+        Err(Stop::Truncated) if rest.len() < n_payload => Err(Stop::Truncated),
+        _ => Err(Stop::Invalid),
+    }
+}
+
+/// Decode an LZVN payload. The bytes it used, once it reaches its
+/// end-of-stream opcode. `Truncated` when the payload ends before that.
+fn lzvn(src: &[u8], out: &mut Out) -> Result<usize, Stop> {
+    enum Op {
+        LiteralMatch {
+            len: usize,
+            l: usize,
+            m: usize,
+            d: Option<usize>,
+        },
+        Match {
+            len: usize,
+            m: usize,
+        },
+        Literal {
+            len: usize,
+            l: usize,
+        },
+        Nop,
+        End,
+        Undefined,
+    }
+    let mut i = 0;
+    let mut d = 0usize;
+    loop {
+        // Every opcode but the end is followed by at least one byte, the next
+        // opcode's.
+        let left = src.len() - i;
+        let opc = *src.get(i).ok_or(Stop::Truncated)?;
+        let op = match opc {
+            6 => Op::End,
+            14 | 22 => Op::Nop,
+            0xe0 => Op::Literal {
+                len: 2,
+                l: *src.get(i + 1).ok_or(Stop::Truncated)? as usize + 16,
+            },
+            0xe1..=0xef => Op::Literal {
+                len: 1,
+                l: (opc & 15) as usize,
+            },
+            0xf0 => Op::Match {
+                len: 2,
+                m: *src.get(i + 1).ok_or(Stop::Truncated)? as usize + 16,
+            },
+            0xf1..=0xff => Op::Match {
+                len: 1,
+                m: (opc & 15) as usize,
+            },
+            0x70..=0x7f | 0xd0..=0xdf => Op::Undefined,
+            0xa0..=0xbf => Op::LiteralMatch {
+                len: 3,
+                l: ((opc >> 3) & 3) as usize,
+                m: 0,
+                d: None,
+            },
+            _ => match opc & 7 {
+                7 => Op::LiteralMatch {
+                    len: 3,
+                    l: (opc >> 6) as usize,
+                    m: ((opc >> 3) & 7) as usize + 3,
+                    d: None,
+                },
+                6 if opc >= 64 => Op::LiteralMatch {
+                    len: 1,
+                    l: (opc >> 6) as usize,
+                    m: ((opc >> 3) & 7) as usize + 3,
+                    d: Some(d),
+                },
+                6 => Op::Undefined,
+                _ => Op::LiteralMatch {
+                    len: 2,
+                    l: (opc >> 6) as usize,
+                    m: ((opc >> 3) & 7) as usize + 3,
+                    d: None,
+                },
+            },
+        };
+        match op {
+            Op::End => {
+                return match left >= 8 {
+                    true => Ok(i + 8),
+                    false => Err(Stop::Truncated),
+                };
+            }
+            Op::Undefined => return Err(Stop::Invalid),
+            Op::Nop => {
+                if left <= 1 {
+                    return Err(Stop::Truncated);
+                }
+                i += 1;
+            }
+            Op::Literal { len, l } => {
+                if left <= len + l {
+                    return Err(Stop::Truncated);
+                }
+                out.literal(&src[i + len..i + len + l])?;
+                i += len + l;
+            }
+            Op::Match { len, m } => {
+                if left <= len {
+                    return Err(Stop::Truncated);
+                }
+                i += len;
+                out.copy(d, m)?;
+            }
+            Op::LiteralMatch {
+                len,
+                l,
+                mut m,
+                d: dist,
+            } => {
+                if left <= len + l {
+                    return Err(Stop::Truncated);
+                }
+                d = match (len, dist) {
+                    (_, Some(prev)) => prev,
+                    (2, None) => ((opc & 7) as usize) << 8 | src[i + 1] as usize,
+                    (_, None) => {
+                        let v = u16::from_le_bytes([src[i + 1], src[i + 2]]) as usize;
+                        if opc & 0xe0 == 0xa0 {
+                            m = ((((opc & 7) as usize) << 2) | (v & 3)) + 3;
+                            v >> 2
+                        } else {
+                            v
+                        }
+                    }
+                };
+                out.literal(&src[i + len..i + len + l])?;
+                i += len + l;
+                out.copy(d, m)?;
+            }
+        }
+    }
+}
+
+/// A block's header, as the reference's `lzfse_compressed_block_header_v1`.
+struct Header {
+    n_literals: u32,
+    n_matches: u32,
+    n_literal_payload: usize,
+    n_lmd_payload: usize,
+    literal_bits: i32,
+    literal_state: [u16; 4],
+    lmd_bits: i32,
+    l_state: u16,
+    m_state: u16,
+    d_state: u16,
+    /// `l_freq`, `m_freq`, `d_freq` and `literal_freq`, in that order.
+    freq: [u16; L_SYMBOLS + M_SYMBOLS + D_SYMBOLS + LITERAL_SYMBOLS],
+}
+
+fn fse_block(
+    input: &[u8],
+    pos: usize,
+    magic: u32,
+    kept: &mut Kept,
+    out: &mut Out,
+) -> Result<usize, Stop> {
+    let (h, header_size) = match magic {
+        COMPRESSED_V2 => header_v2(input, pos)?,
+        _ => header_v1(input, pos)?,
+    };
+    // Header fields: on wasm32 their sum can pass `usize::MAX`.
+    let lmd_start = (pos + header_size).checked_add(h.n_literal_payload);
+    let block_end = lmd_start.and_then(|s| s.checked_add(h.n_lmd_payload));
+    let (Some(lmd_start), Some(block_end)) = (lmd_start, block_end.filter(|&e| e <= input.len()))
+    else {
+        return Err(Stop::Truncated);
+    };
+    check(&h)?;
+    let (l_freq, rest) = h.freq.split_at(L_SYMBOLS);
+    let (m_freq, rest) = rest.split_at(M_SYMBOLS);
+    let (d_freq, literal_freq) = rest.split_at(D_SYMBOLS);
+    decoder_table(&mut kept.literal, literal_freq);
+    value_table(&mut kept.l, l_freq, &L_EXTRA_BITS, &L_BASE);
+    value_table(&mut kept.m, m_freq, &M_EXTRA_BITS, &M_BASE);
+    value_table(&mut kept.d, d_freq, &D_EXTRA_BITS, &D_BASE);
+    let Kept {
+        literals,
+        literal: literal_table,
+        l: l_table,
+        m: m_table,
+        d: d_table,
+    } = kept;
+
+    {
+        // The reference bounds even this stream's first bytes by the input's
+        // start, not the payload's: a payload of 7 bytes is read as 8.
+        let mut s = Stream::new(input, 0, lmd_start, h.literal_bits)?;
+        let mut state = h.literal_state;
+        // `check` bounds `n_literals` by the buffer.
+        let n = (h.n_literals as usize).next_multiple_of(4);
+        for quad in literals[..n].as_chunks_mut::<4>().0 {
+            s.flush()?;
+            for (byte, st) in quad.iter_mut().zip(state.iter_mut()) {
+                let e = literal_table.get(*st as usize).ok_or(Stop::Invalid)?;
+                *st = e.delta.wrapping_add(s.pull(e.k)? as u16);
+                *byte = e.symbol;
+            }
+        }
+    }
+
+    let mut s = Stream::new(input, lmd_start, block_end, h.lmd_bits)?;
+    let (mut l_state, mut m_state, mut d_state) = (h.l_state, h.m_state, h.d_state);
+    let mut lit = 0usize;
+    // No distance yet: a match that reuses it is invalid.
+    let mut d: i64 = -1;
+    for _ in 0..h.n_matches {
+        s.flush()?;
+        let l = s.value(l_table, &mut l_state)? as usize;
+        let m = s.value(m_table, &mut m_state)? as usize;
+        let new_d = s.value(d_table, &mut d_state)?;
+        if new_d != 0 {
+            d = i64::from(new_d);
+        }
+        // The reference's bound, one byte short of its buffer's end.
+        let literal = literals
+            .get(lit..lit + l)
+            .filter(|_| lit + l < LITERAL_BUFFER);
+        let literal = literal.ok_or(Stop::Invalid)?;
+        if d < 0 || d as usize > out.buf.len() + l {
+            return Err(Stop::Invalid);
+        }
+        out.literal(literal)?;
+        lit += l;
+        if m > 0 {
+            out.copy(d as usize, m)?;
+        }
+    }
+    Ok(block_end)
+}
+
+fn header_v1(input: &[u8], pos: usize) -> Result<(Header, usize), Stop> {
+    let h = crate::bytes::at(input, pos, V1_HEADER).ok_or(Stop::Truncated)?;
+    let u32_ = |o: usize| u32::from_le_bytes(h[o..o + 4].try_into().unwrap());
+    let u16_ = |o: usize| u16::from_le_bytes([h[o], h[o + 1]]);
+    let mut freq = [0u16; L_SYMBOLS + M_SYMBOLS + D_SYMBOLS + LITERAL_SYMBOLS];
+    for (i, f) in freq.iter_mut().enumerate() {
+        *f = u16_(50 + 2 * i);
+    }
+    let header = Header {
+        n_literals: u32_(12),
+        n_matches: u32_(16),
+        n_literal_payload: u32_(20) as usize,
+        n_lmd_payload: u32_(24) as usize,
+        literal_bits: u32_(28) as i32,
+        literal_state: [u16_(32), u16_(34), u16_(36), u16_(38)],
+        lmd_bits: u32_(40) as i32,
+        l_state: u16_(44),
+        m_state: u16_(46),
+        d_state: u16_(48),
+        freq,
+    };
+    Ok((header, V1_HEADER))
+}
+
+fn header_v2(input: &[u8], pos: usize) -> Result<(Header, usize), Stop> {
+    let fixed = crate::bytes::at(input, pos, V2_FREQ).ok_or(Stop::Truncated)?;
+    let packed = |i: usize| u64::from_le_bytes(fixed[8 + 8 * i..16 + 8 * i].try_into().unwrap());
+    let (v0, v1, v2) = (packed(0), packed(1), packed(2));
+    let field = |v: u64, offset: u32, bits: u32| ((v >> offset) & ((1 << bits) - 1)) as u32;
+    let header_size = field(v2, 0, 32) as usize;
+    if header_size < V2_FREQ {
+        return Err(Stop::Invalid);
+    }
+    let tables =
+        crate::bytes::at(input, pos + V2_FREQ, header_size - V2_FREQ).ok_or(Stop::Truncated)?;
+    let mut freq = [0u16; L_SYMBOLS + M_SYMBOLS + D_SYMBOLS + LITERAL_SYMBOLS];
+    // No tables at all is allowed: every frequency is zero.
+    if !tables.is_empty() {
+        let (mut accum, mut accum_bits, mut next) = (0u32, 0u32, 0usize);
+        for f in freq.iter_mut() {
+            while next < tables.len() && accum_bits + 8 <= 32 {
+                accum |= u32::from(tables[next]) << accum_bits;
+                accum_bits += 8;
+                next += 1;
+            }
+            let (value, bits) = freq_value(accum);
+            if bits > accum_bits {
+                return Err(Stop::Invalid);
+            }
+            *f = value;
+            accum >>= bits;
+            accum_bits -= bits;
+        }
+        if accum_bits >= 8 || next != tables.len() {
+            return Err(Stop::Invalid);
+        }
+    }
+    let header = Header {
+        n_literals: field(v0, 0, 20),
+        n_literal_payload: field(v0, 20, 20) as usize,
+        n_matches: field(v0, 40, 20),
+        literal_bits: field(v0, 60, 3) as i32 - 7,
+        literal_state: [0, 10, 20, 30].map(|o| field(v1, o, 10) as u16),
+        n_lmd_payload: field(v1, 40, 20) as usize,
+        lmd_bits: field(v1, 60, 3) as i32 - 7,
+        l_state: field(v2, 32, 10) as u16,
+        m_state: field(v2, 42, 10) as u16,
+        d_state: field(v2, 52, 10) as u16,
+        freq,
+    };
+    Ok((header, header_size))
+}
+
+/// One frequency of a v2 header's tables, and the bits it took.
+fn freq_value(bits: u32) -> (u16, u32) {
+    const NBITS: [u8; 32] = [
+        2, 3, 2, 5, 2, 3, 2, 8, 2, 3, 2, 5, 2, 3, 2, 14, 2, 3, 2, 5, 2, 3, 2, 8, 2, 3, 2, 5, 2, 3,
+        2, 14,
+    ];
+    const VALUE: [u8; 32] = [
+        0, 2, 1, 4, 0, 3, 1, 0, 0, 2, 1, 5, 0, 3, 1, 0, 0, 2, 1, 6, 0, 3, 1, 0, 0, 2, 1, 7, 0, 3,
+        1, 0,
+    ];
+    let b = (bits & 31) as usize;
+    match NBITS[b] {
+        8 => (8 + ((bits >> 4) & 0xf) as u16, 8),
+        14 => (24 + ((bits >> 4) & 0x3ff) as u16, 14),
+        n => (u16::from(VALUE[b]), u32::from(n)),
+    }
+}
+
+/// The reference's `lzfse_check_block_header_v1`.
+fn check(h: &Header) -> Result<(), Stop> {
+    let sum = |f: &[u16]| f.iter().map(|&v| v as usize).sum::<usize>();
+    let (l, rest) = h.freq.split_at(L_SYMBOLS);
+    let (m, rest) = rest.split_at(M_SYMBOLS);
+    let (d, literal) = rest.split_at(D_SYMBOLS);
+    let ok = h.n_literals <= LITERALS_PER_BLOCK
+        && h.n_matches <= MATCHES_PER_BLOCK
+        && h.literal_state
+            .iter()
+            .all(|&s| (s as usize) < LITERAL_STATES)
+        && (h.l_state as usize) < L_STATES
+        && (h.m_state as usize) < M_STATES
+        && (h.d_state as usize) < D_STATES
+        && sum(l) <= L_STATES
+        && sum(m) <= M_STATES
+        && sum(d) <= D_STATES
+        && sum(literal) <= LITERAL_STATES;
+    match ok {
+        true => Ok(()),
+        false => Err(Stop::Invalid),
+    }
+}
+
+#[derive(Clone, Copy, Default)]
+struct Entry {
+    k: u32,
+    symbol: u8,
+    delta: u16,
+}
+
+#[derive(Clone, Copy, Default)]
+struct ValueEntry {
+    total_bits: u32,
+    value_bits: u32,
+    delta: u16,
+    vbase: i32,
+}
+
+/// The states each symbol reaches, as `fse_init_decoder_table` lays them
+/// out in `t`. States past the frequencies' sum keep what they held.
+fn decoder_table(t: &mut [Entry], freq: &[u16]) {
+    let mut at = 0;
+    for (symbol, &f) in freq.iter().enumerate() {
+        for (j, (k, delta)) in transitions(t.len(), f).enumerate() {
+            t[at + j] = Entry {
+                k,
+                symbol: symbol as u8,
+                delta,
+            };
+        }
+        at += f as usize;
+    }
+}
+
+fn value_table(t: &mut [ValueEntry], freq: &[u16], extra: &[u8], base: &[i32]) {
+    let mut at = 0;
+    for (symbol, &f) in freq.iter().enumerate() {
+        for (j, (k, delta)) in transitions(t.len(), f).enumerate() {
+            t[at + j] = ValueEntry {
+                total_bits: k + u32::from(extra[symbol]),
+                value_bits: u32::from(extra[symbol]),
+                delta,
+                vbase: base[symbol],
+            };
+        }
+        at += f as usize;
+    }
+}
+
+/// For each of a symbol's `f` states: the bits read and the next state's
+/// base. [`check`] has bounded `f` by `nstates`.
+fn transitions(nstates: usize, f: u16) -> impl Iterator<Item = (u32, u16)> {
+    let n = nstates as u32;
+    let f = u32::from(f);
+    let k = f.leading_zeros().saturating_sub(n.leading_zeros());
+    let j0 = ((2 * n) >> k).saturating_sub(f);
+    (0..f).map(move |j| match j < j0 {
+        true => (k, (((f + j) << k) - n) as u16),
+        false => (k - 1, ((j - j0) << (k - 1)) as u16),
+    })
+}
+
+/// A bit stream read backwards from `end`, 56 to 63 bits held: the
+/// reference's 64-bit `fse_in_stream`. Its first bytes are after `start`;
+/// later reads may run past that, as the encoder's last flush does, but not
+/// past the input's start.
+struct Stream<'a> {
+    input: &'a [u8],
+    pos: usize,
+    accum: u64,
+    bits: u32,
+}
+
+impl<'a> Stream<'a> {
+    fn new(input: &'a [u8], start: usize, end: usize, n: i32) -> Result<Self, Stop> {
+        let width = if n != 0 { 8 } else { 7 };
+        if end < start + width {
+            return Err(Stop::Invalid);
+        }
+        let pos = end - width;
+        let mut b = [0u8; 8];
+        b[..width].copy_from_slice(&input[pos..end]);
+        let accum = u64::from_le_bytes(b);
+        let bits = i64::from(n) + 8 * width as i64;
+        if !(56..64).contains(&bits) || accum >> bits != 0 {
+            return Err(Stop::Invalid);
+        }
+        Ok(Stream {
+            input,
+            pos,
+            accum,
+            bits: bits as u32,
+        })
+    }
+
+    fn flush(&mut self) -> Result<(), Stop> {
+        let n = (63 - self.bits) & !7;
+        let pos = self.pos.checked_sub(n as usize / 8).ok_or(Stop::Invalid)?;
+        let mut b = [0u8; 8];
+        b[..n as usize / 8].copy_from_slice(&self.input[pos..self.pos]);
+        self.pos = pos;
+        if n > 0 {
+            self.accum = (self.accum << n) | u64::from_le_bytes(b);
+        }
+        self.bits += n;
+        Ok(())
+    }
+
+    fn pull(&mut self, n: u32) -> Result<u64, Stop> {
+        self.bits = self.bits.checked_sub(n).ok_or(Stop::Invalid)?;
+        let v = self.accum >> self.bits;
+        self.accum &= (1u64 << self.bits) - 1;
+        Ok(v)
+    }
+
+    fn value(&mut self, t: &[ValueEntry], state: &mut u16) -> Result<i32, Stop> {
+        let e = t.get(*state as usize).ok_or(Stop::Invalid)?;
+        let v = self.pull(e.total_bits)? as u32;
+        *state = e.delta.wrapping_add((v >> e.value_bits) as u16);
+        Ok(e.vbase + (v & ((1 << e.value_bits) - 1)) as i32)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{decode, decode_lzvn};
+
+    fn encode(data: &[u8]) -> Vec<u8> {
+        let mut enc = Vec::new();
+        lzfse_rust::encode_bytes(data, &mut enc).unwrap();
+        enc
+    }
+
+    /// Text with repeats near and far, so the encoder emits matches of every
+    /// length and distance class.
+    fn text(n: usize, seed: u64) -> Vec<u8> {
+        let mut x = seed;
+        let mut out: Vec<u8> = Vec::with_capacity(n);
+        while out.len() < n {
+            x ^= x << 13;
+            x ^= x >> 7;
+            x ^= x << 17;
+            match (x % 4, out.len()) {
+                (0, len) if len > 300 => {
+                    let back = 1 + (x >> 8) as usize % len.min(200_000);
+                    let len_ = 3 + (x >> 40) as usize % 300;
+                    for _ in 0..len_ {
+                        out.push(out[out.len() - back]);
+                    }
+                }
+                (1, _) => out.push(b'a' + (x >> 20) as u8 % 26),
+                _ => out.extend_from_slice(b"the quick brown fox "),
+            }
+        }
+        out.truncate(n);
+        out
+    }
+
+    fn magics(enc: &[u8]) -> bool {
+        enc.windows(4).any(|w| w == b"bvx2")
+    }
+
+    #[test]
+    fn every_block_kind_decodes_to_what_was_encoded() {
+        for (n, kind) in [
+            (0, &b"bvx$"[..]),
+            (11, b"bvx-"),
+            (3000, b"bvxn"),
+            (100_000, b"bvx2"),
+            (3_000_000, b"bvx2"),
+        ] {
+            let data = text(n, n as u64 + 1);
+            let enc = encode(&data);
+            assert!(
+                enc.windows(4).any(|w| w == kind),
+                "{n} bytes: no {kind:?} block"
+            );
+            let s = decode(&enc, u64::MAX);
+            assert!(!s.undecoded && !s.cut_short && !s.over_cap, "{n} bytes");
+            assert!(s.data == data, "{n} bytes decode differently");
+        }
+    }
+
+    /// An LZVN block with each opcode once, by hand, and what it decodes to,
+    /// built without the decoder.
+    fn every_lzvn_opcode() -> (Vec<u8>, Vec<u8>) {
+        fn copy(out: &mut Vec<u8>, d: usize, m: usize) {
+            for _ in 0..m {
+                out.push(out[out.len() - d]);
+            }
+        }
+        let mut p = Vec::new();
+        let mut want = Vec::new();
+        // Large literal: 16 + 4 bytes.
+        p.extend_from_slice(&[0xe0, 4]);
+        p.extend_from_slice(b"abcdefghijklmnopqrst");
+        want.extend_from_slice(b"abcdefghijklmnopqrst");
+        // Small distance (LLMMMDDD): L 1, M 4, D 5.
+        p.extend_from_slice(&[0b0100_1000, 5, b'X']);
+        want.push(b'X');
+        copy(&mut want, 5, 4);
+        // Medium distance (101LLMMM): L 0, M 5, D 10.
+        p.extend_from_slice(&[0b1010_0000, (10 << 2) | 2, 0]);
+        copy(&mut want, 10, 5);
+        // Large distance (LLMMM111): L 0, M 3, D 12.
+        p.extend_from_slice(&[0b0000_0111, 12, 0]);
+        copy(&mut want, 12, 3);
+        // Previous distance (LLMMM110): L 2, M 5.
+        p.extend_from_slice(&[0b1001_0110, b'Y', b'Z']);
+        want.extend_from_slice(b"YZ");
+        copy(&mut want, 12, 5);
+        // Small match: M 3. Large match: M 16 + 1.
+        p.push(0xf3);
+        copy(&mut want, 12, 3);
+        p.extend_from_slice(&[0xf0, 1]);
+        copy(&mut want, 12, 17);
+        // Small literal, a no-op, the end.
+        p.extend_from_slice(&[0xe2, b'!', b'?', 0x0e, 6, 0, 0, 0, 0, 0, 0, 0]);
+        want.extend_from_slice(b"!?");
+
+        let mut s = b"bvxn".to_vec();
+        s.extend_from_slice(&(want.len() as u32).to_le_bytes());
+        s.extend_from_slice(&(p.len() as u32).to_le_bytes());
+        s.extend(p);
+        s.extend_from_slice(b"bvx$");
+        (s, want)
+    }
+
+    /// A stream of one bvx2 block, its header rewritten as the bvx1 header
+    /// the reference reads the same way. The frequencies are decoded here,
+    /// not by `header_v2`.
+    fn as_v1(enc: &[u8]) -> Vec<u8> {
+        assert!(enc.starts_with(b"bvx2"));
+        let packed = |i: usize| u64::from_le_bytes(enc[8 + 8 * i..16 + 8 * i].try_into().unwrap());
+        let (v0, v1, v2) = (packed(0), packed(1), packed(2));
+        let f = |v: u64, o: u32, b: u32| ((v >> o) & ((1u64 << b) - 1)) as u32;
+        let header_size = f(v2, 0, 32) as usize;
+        let mut freq = Vec::new();
+        let mut table = enc[32..header_size].iter();
+        let (mut acc, mut bits) = (0u64, 0u32);
+        while freq.len() < 360 {
+            while bits <= 24 {
+                acc |= u64::from(table.next().copied().unwrap_or(0)) << bits;
+                bits += 8;
+            }
+            let (v, n) = match acc & 31 {
+                b if b & 15 == 7 => (8 + ((acc >> 4) & 0xf), 8),
+                b if b & 15 == 15 => (24 + ((acc >> 4) & 0x3ff), 14),
+                b if b & 1 == 0 => ((b >> 1) & 1, 2),
+                b if b & 3 == 1 => (2 + ((b >> 2) & 1), 3),
+                b => (4 + ((b >> 3) & 3), 5),
+            };
+            freq.push(v as u16);
+            acc >>= n;
+            bits -= n;
+        }
+        let (lit, lmd) = (f(v0, 20, 20), f(v1, 40, 20));
+        let mut h = Vec::new();
+        h.extend_from_slice(b"bvx1");
+        for v in [
+            u32::from_le_bytes(enc[4..8].try_into().unwrap()),
+            lit + lmd,
+            f(v0, 0, 20),
+            f(v0, 40, 20),
+            lit,
+            lmd,
+            (f(v0, 60, 3) as i32 - 7) as u32,
+        ] {
+            h.extend_from_slice(&v.to_le_bytes());
+        }
+        for k in 0..4 {
+            h.extend_from_slice(&(f(v1, 10 * k, 10) as u16).to_le_bytes());
+        }
+        h.extend_from_slice(&(f(v1, 60, 3) as i32 - 7).to_le_bytes());
+        for o in [32, 42, 52] {
+            h.extend_from_slice(&(f(v2, o, 10) as u16).to_le_bytes());
+        }
+        for v in freq {
+            h.extend_from_slice(&v.to_le_bytes());
+        }
+        h.resize(772, 0);
+        let body = header_size + (lit + lmd) as usize;
+        h.extend_from_slice(&enc[header_size..body]);
+        assert_eq!(&enc[body..], b"bvx$", "one block");
+        h.extend_from_slice(b"bvx$");
+        h
+    }
+
+    #[test]
+    fn a_block_with_uncompressed_tables_decodes() {
+        let data = text(30_000, 11);
+        let v1 = as_v1(&encode(&data));
+        let s = decode(&v1, u64::MAX);
+        assert!(!s.undecoded && !s.cut_short);
+        assert!(s.data == data);
+    }
+
+    #[test]
+    fn every_lzvn_opcode_decodes() {
+        let (stream, want) = every_lzvn_opcode();
+        let s = decode(&stream, u64::MAX);
+        assert!(!s.undecoded && !s.cut_short);
+        assert_eq!(s.data, want);
+    }
+
+    /// The payload of the block above is a bare LZVN stream, as decmpfs
+    /// stores one.
+    #[test]
+    fn a_bare_lzvn_stream_decodes() {
+        let (stream, want) = every_lzvn_opcode();
+        let bare = &stream[12..stream.len() - 4];
+        let s = decode_lzvn(bare, u64::MAX);
+        assert!(!s.undecoded && !s.cut_short && !s.over_cap);
+        assert_eq!(s.data, want);
+
+        let s = decode_lzvn(&bare[..bare.len() - 8], u64::MAX);
+        assert!(s.cut_short && !s.undecoded, "no end opcode");
+        let s = decode_lzvn(bare, 10);
+        assert!(s.over_cap);
+        assert_eq!(s.data, want[..10]);
+    }
+
+    #[test]
+    fn incompressible_data_decodes() {
+        let data: Vec<u8> = text(200_000, 7)
+            .iter()
+            .enumerate()
+            .map(|(i, b)| b ^ (i.wrapping_mul(2654435761) >> 13) as u8)
+            .collect();
+        let enc = encode(&data);
+        assert_eq!(decode(&enc, u64::MAX).data, data);
+    }
+
+    #[test]
+    fn the_cap_holds() {
+        let data = text(100_000, 3);
+        let s = decode(&encode(&data), 1000);
+        assert!(s.over_cap && !s.undecoded);
+        assert_eq!(s.data, data[..1000]);
+    }
+
+    #[test]
+    fn a_cut_stream_keeps_its_whole_blocks_and_says_so() {
+        let first = text(3000, 5);
+        let mut enc = encode(&first);
+        enc.truncate(enc.len() - 4); // the end-of-stream block
+        enc.extend(encode(&text(100_000, 6)));
+        assert!(magics(&enc));
+        let s = decode(&enc[..enc.len() - 100], u64::MAX);
+        assert!(s.cut_short && !s.undecoded);
+        assert!(s.data.starts_with(&first));
+    }
+
+    #[test]
+    fn damage_is_invalid_not_a_panic() {
+        assert!(decode(b"bvxZ\0\0\0\0", 100).undecoded);
+        let enc = encode(&text(100_000, 9));
+        for at in (0..enc.len()).step_by(97) {
+            for bit in [0x01, 0x10, 0x80] {
+                let mut bad = enc.clone();
+                bad[at] ^= bit;
+                let _ = decode(&bad, 1 << 20);
+            }
+        }
+    }
+
+    /// A stream of one LZVN block: "abc", then a match of 5 from 3 back (so
+    /// 8 bytes), then the end opcode, and the end-of-stream block.
+    fn lzvn_stream(n_raw: u32, n_payload: u32, with_end_opcode: bool) -> Vec<u8> {
+        let mut p = vec![0xe3, b'a', b'b', b'c', 0x10, 0x03];
+        if with_end_opcode {
+            p.extend_from_slice(&[6, 0, 0, 0, 0, 0, 0, 0]);
+        }
+        let mut s = b"bvxn".to_vec();
+        s.extend_from_slice(&n_raw.to_le_bytes());
+        s.extend_from_slice(&n_payload.to_le_bytes());
+        s.extend(p);
+        s.extend_from_slice(b"bvx$");
+        s
+    }
+
+    #[test]
+    fn the_lzvn_stream_of_these_tests_decodes() {
+        let s = decode(&lzvn_stream(8, 14, true), 100);
+        assert!(!s.undecoded && !s.cut_short && !s.over_cap);
+        assert_eq!(s.data, b"abcabcab");
+    }
+
+    #[test]
+    fn an_lzvn_payload_longer_than_the_input_that_still_ends_is_damaged_not_cut() {
+        // The end opcode is reached, 6 bytes short of the declared payload.
+        let mut s = lzvn_stream(8, 20, true);
+        s.truncate(s.len() - 4);
+        let r = decode(&s, 100);
+        assert!(
+            r.undecoded && !r.cut_short,
+            "{:?}",
+            (r.undecoded, r.cut_short)
+        );
+        assert_eq!(r.data, b"abcabcab");
+    }
+
+    #[test]
+    fn an_lzvn_payload_cut_before_its_end_opcode_is_cut() {
+        let mut s = lzvn_stream(8, 14, true);
+        s.truncate(12 + 6);
+        let r = decode(&s, 100);
+        assert!(r.cut_short && !r.undecoded);
+        // The match is left out: an instruction needs the next opcode's byte.
+        assert_eq!(r.data, b"abc");
+        // The same payload with the input whole is damaged.
+        let r = decode(&lzvn_stream(8, 6, false), 100);
+        assert!(r.undecoded && !r.cut_short);
+    }
+
+    #[test]
+    fn an_lzvn_instruction_past_the_block_size_is_damaged_and_clipped() {
+        let r = decode(&lzvn_stream(6, 14, true), 100);
+        assert!(r.undecoded && !r.over_cap);
+        assert_eq!(r.data, b"abcabc");
+    }
+
+    #[test]
+    fn the_output_limit_comes_before_a_block_size_it_is_inside_of() {
+        // The block's declared 6 bytes are past the cap of 4.
+        let r = decode(&lzvn_stream(6, 14, true), 4);
+        assert!(r.over_cap && !r.undecoded);
+        assert_eq!(r.data, b"abca");
+    }
+
+    /// The reference's verdict codes (`lzfse_oracle.c`) for what `decode`
+    /// found: output past the limit is reported first.
+    fn verdict(s: &crate::Salvaged) -> u8 {
+        match (s.over_cap, s.cut_short, s.undecoded) {
+            (true, _, _) => 1,
+            (_, true, _) => 2,
+            (_, _, true) => 3,
+            _ => 0,
+        }
+    }
+
+    /// What `decode` says of a stream, against what the reference says of it
+    /// with a destination of `limit` bytes, run twice with different fills of
+    /// that destination. `None` when they agree.
+    ///
+    /// The reference counts a failed block's last instruction out of the
+    /// bytes it reports, writes the part of an LZVN match that fits the
+    /// block's size, and calls an LZVN payload that ends before its end opcode
+    /// "destination full", so on a failure the two outputs are held to agree
+    /// as far as both go, and to a failure of some kind. A stream whose output
+    /// depends on the fill is one the reference read unwritten memory for,
+    /// which is invalid here.
+    fn disagreement(
+        input: &[u8],
+        limit: u32,
+        reference: &(u8, Vec<u8>),
+        other_fill: &(u8, Vec<u8>),
+    ) -> Option<&'static str> {
+        let s = decode(input, u64::from(limit));
+        let (status, out) = reference;
+        if reference != other_fill {
+            return (!s.undecoded && !s.over_cap).then_some("read of unwritten memory accepted");
+        }
+        let ours = verdict(&s);
+        match status {
+            0 if ours != 0 => Some("a stream the reference decodes is not"),
+            0 if s.data != *out => Some("output differs"),
+            0 => None,
+            _ if ours == 0 => Some("a stream the reference refuses is decoded"),
+            _ if !s.data.starts_with(out) && !out.starts_with(&s.data) => Some("outputs diverge"),
+            1 if out.len() == limit as usize && (ours != 1 || s.data != *out) => {
+                Some("output past the limit differs")
+            }
+            2 if ours == 3 => Some("cut stream called damaged"),
+            // An LZVN payload cut inside its end opcode, after all its output:
+            // the reference's size check calls it an error.
+            3 if ours == 2 && s.data != *out => Some("damaged stream called cut"),
+            _ => None,
+        }
+    }
+
+    /// Streams the reference decodes, cut or damaged in many ways, and the
+    /// bytes it wrote before it stopped, against `decode`. Needs the oracle
+    /// built by `tests/oracle/build.sh`:
+    /// `EXAV_LZFSE_ORACLE=... cargo test -p exav-unpack --lib -- --ignored lzfse_oracle`.
+    #[test]
+    #[ignore = "needs the reference decoder: tests/oracle/build.sh, EXAV_LZFSE_ORACLE"]
+    fn lzfse_oracle_agrees_on_damaged_streams() {
+        let rounds: usize = std::env::var("EXAV_DEBUG_ORACLE_ROUNDS")
+            .ok()
+            .and_then(|v| v.parse().ok())
+            .unwrap_or(3000);
+        let mut bases: Vec<(Vec<u8>, usize)> = Vec::new();
+        for (n, seed) in [(0, 1), (11, 2), (3000, 3), (30_000, 4), (100_000, 5)] {
+            let enc = encode(&text(n, seed));
+            bases.push((enc, 800));
+        }
+        bases.push((as_v1(&encode(&text(30_000, 11))), 800));
+        bases.push((every_lzvn_opcode().0, 200));
+        let mut two = encode(&text(3000, 6));
+        two.truncate(two.len() - 4);
+        two.extend(encode(&text(40_000, 7)));
+        bases.push((two, 800));
+        let mut rng = crate::oracle::Rng(0x9e37_79b9_7f4a_7c15);
+        let mut jobs = Vec::new();
+        for (base, hot) in &bases {
+            jobs.push((u32::MAX >> 8, base.clone()));
+            for _ in 0..rounds {
+                let bad = rng.damage(base, *hot);
+                let limit = match rng.below(3) {
+                    0 => 1 << 20,
+                    1 => rng.below(base.len() * 4 + 1) as u32,
+                    _ => 1 << 24,
+                };
+                jobs.push((limit, bad));
+            }
+        }
+        let replies = crate::oracle::run("EXAV_LZFSE_ORACLE", &["0"], &jobs);
+        let others = crate::oracle::run("EXAV_LZFSE_ORACLE", &["255"], &jobs);
+        let mut bad = Vec::new();
+        // The reference's verdict by ours.
+        let mut matrix = [[0usize; 4]; 4];
+        for (((limit, input), reply), other) in jobs.iter().zip(&replies).zip(&others) {
+            let s = decode(input, u64::from(*limit));
+            matrix[usize::from(reply.0)][usize::from(verdict(&s))] += 1;
+            if let Some(why) = disagreement(input, *limit, reply, other) {
+                let ours = (s.data.len(), s.over_cap, s.cut_short, s.undecoded);
+                crate::oracle::dump("lzfse", bad.len(), input, &reply.1, &s.data);
+                bad.push((why, *limit, (reply.0, reply.1.len()), ours, input.clone()));
+            }
+        }
+        eprintln!(
+            "{} streams; rows the reference's verdict (ok, full, cut, error), columns ours: {matrix:?}",
+            jobs.len()
+        );
+        for (why, limit, reference, ours, input) in bad.iter().take(5) {
+            eprintln!("{why}: limit {limit}, {} bytes", input.len());
+            eprintln!("  reference (status, written) {reference:?}");
+            eprintln!("  ours (written, over cap, cut, undecoded) {ours:?}");
+            let head: Vec<String> = input.iter().take(48).map(|b| format!("{b:02x}")).collect();
+            eprintln!("  {}", head.join(" "));
+        }
+        assert!(
+            bad.is_empty(),
+            "{} of {} streams differ",
+            bad.len(),
+            jobs.len()
+        );
+    }
+}
diff --git a/crates/exav-unpack/src/formats/lzip.rs b/crates/exav-unpack/src/formats/lzip.rs
index 772eb7e3..9d4b37c5 100644
--- a/crates/exav-unpack/src/formats/lzip.rs
+++ b/crates/exav-unpack/src/formats/lzip.rs
@@ -14,7 +14,7 @@ use lzma_rust2::LzmaStream;
 
 use super::lzma::SansIo;
 use crate::source::{ByteSource, Reader};
-use crate::stream::{stream_single, Visit};
+use crate::stream::{Visit, stream_single};
 use crate::{Budget, LimitHit};
 
 const HEADER: usize = 6;
@@ -159,11 +159,11 @@ impl Read for Members<'_> {
             };
             match member.read(buf) {
                 Ok(0) => {
-                    if let Some(m) = self.member.take() {
-                        if let Err(e) = self.finish(m) {
-                            self.done = true;
-                            return Err(e);
-                        }
+                    if let Some(m) = self.member.take()
+                        && let Err(e) = self.finish(m)
+                    {
+                        self.done = true;
+                        return Err(e);
                     }
                 }
                 Ok(n) => {
diff --git a/crates/exav-unpack/src/formats/lzmaalone.rs b/crates/exav-unpack/src/formats/lzmaalone.rs
new file mode 100644
index 00000000..977bd1ae
--- /dev/null
+++ b/crates/exav-unpack/src/formats/lzmaalone.rs
@@ -0,0 +1,31 @@
+//! LZMA-alone (`.lzma`, the format of LZMA Utils before xz): a 13-byte header
+//! (the properties byte, the dictionary size, the uncompressed size or all ones
+//! when unknown) and one LZMA stream, which ends at the size or at an end
+//! marker. There is no checksum. `lzma_rust2` parses the header and decodes;
+//! the sniff is in [`super::sniff`].
+use std::io::Read;
+
+use lzma_rust2::LzmaStream;
+
+use super::lzma::SansIo;
+use crate::source::{ByteSource, Reader};
+use crate::stream::{Visit, stream_single};
+use crate::{Budget, LimitHit};
+
+/// Memory the decoder may take, in KiB: the dictionary the header asks for and
+/// the probability tables. `lzma -9` asks for a 64 MiB dictionary.
+const MEM_LIMIT_KIB: u32 = 128 * 1024;
+
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let mut source = Reader::new(src);
+    stream_single(&mut source, budget, visit, "lzma-content", |r| {
+        Ok(Box::new(SansIo::new(
+            r,
+            LzmaStream::new_mem_limit(MEM_LIMIT_KIB, None),
+        )) as Box<dyn Read + '_>)
+    })
+}
diff --git a/crates/exav-unpack/src/formats/lzo.rs b/crates/exav-unpack/src/formats/lzo.rs
new file mode 100644
index 00000000..1b057af4
--- /dev/null
+++ b/crates/exav-unpack/src/formats/lzo.rs
@@ -0,0 +1,267 @@
+//! LZO1X decompression, the codec of the squashfs images of routers and set-top
+//! boxes. Safe on any input: every read and every copy is bounds-checked, and
+//! the output has a ceiling.
+//!
+//! The stream is a run of instructions, each a literal run or a match, the low
+//! two bits of the last byte of a match saying how many literals (0 to 3) follow
+//! it. A match's distance and length are in its opcode and the bytes after, in
+//! one of four layouts by the opcode's size, and the stream ends with the match
+//! of the longest distance and no distance at all (`11 00 00`).
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+/// What the decoder does next, the places the format's instructions lead to.
+#[derive(Clone, Copy)]
+enum Next {
+    /// An instruction that is a literal run, or a match.
+    Instruction,
+    /// The instruction after a literal run: a match, or one that is the short
+    /// match of a run of four literals or more.
+    AfterRun,
+    /// A match, its opcode being `t`.
+    Match,
+}
+
+/// The decoder: the input and where it is, the output and its ceiling.
+struct Lzo<'a> {
+    src: &'a [u8],
+    at: usize,
+    out: Vec<u8>,
+    max: usize,
+}
+
+impl Lzo<'_> {
+    fn byte(&mut self) -> Result<usize, &'static str> {
+        let b = *self
+            .src
+            .get(self.at)
+            .ok_or("LZO input ends inside an instruction")?;
+        self.at = self.at.saturating_add(1);
+        Ok(usize::from(b))
+    }
+
+    /// A length that goes on in bytes of 255 while they are zero: the zeros,
+    /// then the last byte, and `base` besides.
+    fn extended(&mut self, base: usize) -> Result<usize, &'static str> {
+        let mut n = base;
+        loop {
+            let b = self.byte()?;
+            if b != 0 {
+                return Ok(n.saturating_add(b));
+            }
+            n = n.saturating_add(255);
+        }
+    }
+
+    fn literals(&mut self, n: usize) -> Result<(), &'static str> {
+        let end = self.at.checked_add(n).ok_or("LZO literal run overflows")?;
+        let lits = self
+            .src
+            .get(self.at..end)
+            .ok_or("LZO literal run goes past the input")?;
+        if self.out.len().saturating_add(n) > self.max {
+            return Err("LZO output exceeds the size budget");
+        }
+        self.out.extend_from_slice(lits);
+        self.at = end;
+        Ok(())
+    }
+
+    /// `len` bytes from `dist` back, which may overlap what is being written.
+    fn copy(&mut self, dist: usize, len: usize) -> Result<(), &'static str> {
+        if dist == 0 || dist > self.out.len() {
+            return Err("LZO match points before the start of the output");
+        }
+        if self.out.len().saturating_add(len) > self.max {
+            return Err("LZO output exceeds the size budget");
+        }
+        let start = self.out.len().saturating_sub(dist);
+        for k in 0..len {
+            let b = self.out[start.saturating_add(k)];
+            self.out.push(b);
+        }
+        Ok(())
+    }
+}
+
+/// Decompress an LZO1X stream of at most `max` bytes of output.
+pub fn decompress(src: &[u8], max: usize) -> Result<Vec<u8>, &'static str> {
+    let mut d = Lzo {
+        src,
+        at: 0,
+        out: Vec::new(),
+        max,
+    };
+    let mut next = Next::Instruction;
+    let mut t = 0usize;
+    // A first byte above 17 is a literal run of that many less 17.
+    if let Some(&first) = src.first().filter(|&&b| b > 17) {
+        d.at = 1;
+        t = usize::from(first).saturating_sub(17);
+        d.literals(t)?;
+        if t < 4 {
+            // The literals of a match that has not been read: its instruction is next.
+            t = d.byte()?;
+            next = Next::Match;
+        } else {
+            next = Next::AfterRun;
+        }
+    }
+    loop {
+        // How many literals follow the match just read.
+        let trail: usize;
+        match next {
+            Next::Instruction => {
+                if d.at >= src.len() {
+                    return Ok(d.out);
+                }
+                t = d.byte()?;
+                if t >= 16 {
+                    next = Next::Match;
+                    continue;
+                }
+                if t == 0 {
+                    t = d.extended(15)?;
+                }
+                d.literals(t.saturating_add(3))?;
+                next = Next::AfterRun;
+                continue;
+            }
+            Next::AfterRun => {
+                t = d.byte()?;
+                if t >= 16 {
+                    next = Next::Match;
+                    continue;
+                }
+                // A match of three bytes, far back, that follows a run of literals.
+                let dist = 1usize
+                    .saturating_add(0x0800)
+                    .saturating_add(t >> 2)
+                    .saturating_add(d.byte()?.saturating_mul(4));
+                d.copy(dist, 3)?;
+                trail = t & 3;
+            }
+            Next::Match => {
+                if t >= 64 {
+                    let dist = 1usize
+                        .saturating_add((t >> 2) & 7)
+                        .saturating_add(d.byte()?.saturating_mul(8));
+                    d.copy(dist, (t >> 5).saturating_add(1))?;
+                    trail = t & 3;
+                } else if t >= 32 {
+                    let mut len = t & 31;
+                    if len == 0 {
+                        len = d.extended(31)?;
+                    }
+                    let (a, b) = (d.byte()?, d.byte()?);
+                    let dist = 1usize
+                        .saturating_add(a >> 2)
+                        .saturating_add(b.saturating_mul(64));
+                    d.copy(dist, len.saturating_add(2))?;
+                    trail = a & 3;
+                } else if t >= 16 {
+                    let mut len = t & 7;
+                    if len == 0 {
+                        len = d.extended(7)?;
+                    }
+                    let (a, b) = (d.byte()?, d.byte()?);
+                    let far = (t & 8).saturating_mul(2048);
+                    let dist = far
+                        .saturating_add(a >> 2)
+                        .saturating_add(b.saturating_mul(64));
+                    // The longest distance, no distance: the end.
+                    if dist == 0 {
+                        return Ok(d.out);
+                    }
+                    d.copy(dist.saturating_add(0x4000), len.saturating_add(2))?;
+                    trail = a & 3;
+                } else {
+                    // Two bytes, near, after literals of one to three.
+                    let dist = 1usize
+                        .saturating_add(t >> 2)
+                        .saturating_add(d.byte()?.saturating_mul(4));
+                    d.copy(dist, 2)?;
+                    trail = t & 3;
+                }
+            }
+        }
+        if trail == 0 {
+            next = Next::Instruction;
+        } else {
+            d.literals(trail)?;
+            t = d.byte()?;
+            next = Next::Match;
+        }
+    }
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_stream_of_literals_alone_ends_at_its_marker() {
+        // 17 + 5: five literals, then the end marker.
+        let mut s = vec![22];
+        s.extend_from_slice(b"hello");
+        s.extend_from_slice(&[0x11, 0, 0]);
+        assert_eq!(decompress(&s, 100).unwrap(), b"hello");
+    }
+
+    #[test]
+    fn a_long_run_of_literals_and_a_match_over_itself() {
+        // Literals "abc", then an M3 match: 001 00110 (length 6 + 2), and
+        // distance 1 (0 << 2, 0) with no literals after; then the end.
+        let mut s = vec![17 + 3];
+        s.extend_from_slice(b"abc");
+        s.extend_from_slice(&[0x20 | 6, 0, 0]);
+        s.extend_from_slice(&[0x11, 0, 0]);
+        assert_eq!(decompress(&s, 100).unwrap(), b"abccccccccc");
+    }
+
+    #[test]
+    fn the_output_has_a_ceiling_and_the_input_is_not_trusted() {
+        let mut s = vec![17 + 5];
+        s.extend_from_slice(b"hello");
+        s.extend_from_slice(&[0x11, 0, 0]);
+        assert!(decompress(&s, 4).is_err());
+        // Ends inside a literal run, a match, and with no marker.
+        assert!(decompress(&[22, b'h', b'e'], 100).is_err());
+        assert!(decompress(&[22, b'h', b'e', b'l', b'l', b'o', 0x20], 100).is_err());
+        // A match before the start.
+        assert!(decompress(&[17 + 4, b'a', b'b', b'c', b'd', 0x20 | 3, 0xFC, 0xFF], 100).is_err());
+        assert!(decompress(&[], 100).unwrap().is_empty());
+    }
+
+    /// The first block `lzop` makes of a text, at its levels 1 (LZO1X-1) and 9
+    /// (LZO1X-999): the instructions of both encoders, near and far matches and
+    /// long runs of literals, put to one decoder (`fuzz/seeds/lzo/make.py`).
+    #[test]
+    fn the_blocks_lzop_makes_are_decoded_to_the_text() {
+        let mut text = Vec::new();
+        for _ in 0..4 {
+            text.extend_from_slice(&b"the quick brown fox jumps over the lazy dog. ".repeat(40));
+            for _ in 0..3 {
+                text.extend((0..=255u8).collect::<Vec<_>>());
+            }
+        }
+        for level in [1, 9] {
+            let p = format!(
+                "{}/tests/fixtures/fs/lzo_text_{level}.bin",
+                env!("CARGO_MANIFEST_DIR")
+            );
+            let block = crate::read_fixture(&p).unwrap();
+            assert_eq!(
+                decompress(&block, text.len()).unwrap(),
+                text,
+                "level {level}"
+            );
+            // One byte of room less than the text.
+            assert!(decompress(&block, text.len() - 1).is_err(), "level {level}");
+        }
+    }
+}
diff --git a/crates/exav-unpack/src/formats/lzw.rs b/crates/exav-unpack/src/formats/lzw.rs
index 3ad4d964..042efe70 100644
--- a/crates/exav-unpack/src/formats/lzw.rs
+++ b/crates/exav-unpack/src/formats/lzw.rs
@@ -168,12 +168,12 @@ impl<B: Bytes> Lzw<B> {
 
             // Define the next table entry from the previous code plus this
             // string's first byte.
-            if let Some(p) = self.prev {
-                if (self.next as usize) < table_cap {
-                    self.prefix[self.next as usize] = p;
-                    self.suffix[self.next as usize] = *self.stack.last().unwrap_or(&0);
-                    self.next += 1;
-                }
+            if let Some(p) = self.prev
+                && (self.next as usize) < table_cap
+            {
+                self.prefix[self.next as usize] = p;
+                self.suffix[self.next as usize] = *self.stack.last().unwrap_or(&0);
+                self.next += 1;
             }
             self.prev = Some(code);
             return Some(true);
diff --git a/crates/exav-unpack/src/formats/machofat.rs b/crates/exav-unpack/src/formats/machofat.rs
index 1068dd97..1f0aecf6 100644
--- a/crates/exav-unpack/src/formats/machofat.rs
+++ b/crates/exav-unpack/src/formats/machofat.rs
@@ -195,9 +195,11 @@ mod tests {
         assert_eq!(entries[0].name, "macho-arch-0");
         assert_eq!(entries[0].data, b"first-arch-image");
         assert_eq!(entries[1].name, "macho-arch-1");
-        assert!(entries
-            .iter()
-            .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST")));
+        assert!(
+            entries
+                .iter()
+                .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST"))
+        );
     }
 
     #[test]
@@ -209,25 +211,31 @@ mod tests {
         blob.extend_from_slice(&[0xABu8; 200]); // constant pool: not valid arch records
         assert!(!looks_like_machofat(&crate::Probe::whole(&blob)));
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::Machofat, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Machofat, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     #[test]
     fn truncated_and_garbage_do_not_panic() {
         let mut budget = Budget::new(Limits::default());
         // Too short for even the header.
-        assert!(extract(Format::Machofat, b"\xCA\xFE", &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Machofat, b"\xCA\xFE", &mut budget)
+                .unwrap()
+                .is_empty()
+        );
         // Valid magic + count but a truncated arch table.
         let mut blob = FAT_MAGIC.to_be_bytes().to_vec();
         blob.extend_from_slice(&2u32.to_be_bytes());
         blob.extend_from_slice(&[0u8; 10]); // < 2 * 20 bytes of records
-        assert!(extract(Format::Machofat, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Machofat, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
         // Arch offset/size pointing past EOF must be rejected, not sliced.
         let mut blob = FAT_MAGIC.to_be_bytes().to_vec();
         blob.extend_from_slice(&1u32.to_be_bytes());
@@ -236,8 +244,10 @@ mod tests {
         blob.extend_from_slice(&0xFFFF_FFFFu32.to_be_bytes()); // offset past EOF
         blob.extend_from_slice(&0xFFFF_FFFFu32.to_be_bytes()); // size past EOF
         blob.extend_from_slice(&0u32.to_be_bytes()); // align
-        assert!(extract(Format::Machofat, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Machofat, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 }
diff --git a/crates/exav-unpack/src/formats/mod.rs b/crates/exav-unpack/src/formats/mod.rs
index 6926a78f..94179ae4 100644
--- a/crates/exav-unpack/src/formats/mod.rs
+++ b/crates/exav-unpack/src/formats/mod.rs
@@ -2,6 +2,8 @@
 //! extractor entry point are gated behind the matching Cargo feature (see the
 //! crate's `[features]`); a disabled format simply isn't compiled in.
 
+#[cfg(feature = "dmg")]
+mod apfs;
 #[cfg(feature = "ar")]
 pub(crate) mod ar;
 #[cfg(feature = "arj")]
@@ -23,16 +25,27 @@ mod bzip2_rs;
 #[cfg(feature = "cab")]
 pub(crate) mod cab;
 #[cfg(feature = "cab")]
+pub(crate) mod cab_join;
+#[cfg(feature = "cab")]
 mod cab_parse;
 #[cfg(feature = "chm")]
 mod chm;
 #[cfg(feature = "cpio")]
 pub(crate) mod cpio;
 #[cfg(feature = "dmg")]
+mod decmpfs;
+#[cfg(feature = "dmg")]
 pub(crate) mod dmg;
+#[cfg(feature = "dmg")]
+mod hfsplus;
 // Code pages of AutoCAD drawings, which DXF and DWG strings are in.
 #[cfg(any(feature = "dxf", feature = "dwg"))]
 mod codepage;
+// Text in a Windows code page number.
+#[cfg(feature = "ole")]
+pub mod charset;
+#[cfg(feature = "ole")]
+mod charset_tables;
 #[cfg(feature = "dwg")]
 pub mod dwg;
 #[cfg(feature = "dxf")]
@@ -49,9 +62,18 @@ pub(crate) mod iso;
 pub(crate) mod lha;
 #[cfg(feature = "lzip")]
 pub(crate) mod lzip;
+#[cfg(feature = "lzma")]
+pub(crate) mod lzmaalone;
+#[cfg(feature = "rpm")]
+pub(crate) mod rpm;
 // Every feature that enables `lzma-rust2`.
+#[cfg(feature = "ole")]
+pub mod biff;
+#[cfg(feature = "ole")]
+pub mod cfb;
 #[cfg(any(
     feature = "lzip",
+    feature = "lzma",
     feature = "sevenz",
     feature = "swf",
     feature = "nsis",
@@ -59,18 +81,18 @@ pub(crate) mod lzip;
     feature = "upx"
 ))]
 pub(crate) mod lzma;
+#[cfg(feature = "offcrypto")]
+pub mod offcrypto;
 #[cfg(feature = "ole")]
 mod ole;
 #[cfg(all(feature = "ole", feature = "decrypt"))]
 mod ole_crypto;
 #[cfg(feature = "pdf")]
-mod pdf;
+pub(crate) mod pdf;
 #[cfg(feature = "pdf")]
-mod pdf_parse;
+pub(crate) mod pdf_parse;
 #[cfg(feature = "ole")]
 mod xlm;
-#[cfg(feature = "ole")]
-mod xlm_functions;
 #[cfg(feature = "zstd")]
 pub(crate) mod zstd;
 // Shared PPMd7 model: used by both RAR (RAR3 PPMd blocks) and 7-Zip.
@@ -90,6 +112,14 @@ pub(crate) mod azo;
 pub(crate) mod azo_tables;
 #[cfg(feature = "binhex")]
 mod binhex;
+#[cfg(feature = "cramfs")]
+pub(crate) mod cramfs;
+#[cfg(feature = "ishieldz")]
+mod dcl_explode;
+#[cfg(feature = "erofs")]
+pub(crate) mod erofs;
+#[cfg(feature = "exfat")]
+pub(crate) mod exfat;
 #[cfg(feature = "ext")]
 pub(crate) mod ext;
 #[cfg(feature = "fat")]
@@ -104,6 +134,10 @@ pub(crate) mod ishield_z;
 mod lnk;
 #[cfg(feature = "lz4")]
 pub(crate) mod lz4;
+#[cfg(feature = "dmg")]
+mod lzfse;
+#[cfg(feature = "squashfs")]
+pub(crate) mod lzo;
 #[cfg(feature = "lzw")]
 pub(crate) mod lzw;
 #[cfg(feature = "machofat")]
@@ -134,6 +168,10 @@ mod rar3_unpack;
 mod rar5_crypt;
 #[cfg(feature = "rar")]
 mod rar5_unpack;
+#[cfg(feature = "romfs")]
+pub(crate) mod romfs;
+#[cfg(feature = "squashfs")]
+pub(crate) mod squashfs;
 
 /// Passwords tried on an encrypted archive member after the caller's: the
 /// conventions of malware distribution. A password-protected dropper is a
@@ -159,21 +197,59 @@ mod udif;
 mod upx;
 #[cfg(feature = "ole")]
 mod vba;
+// Virtual disks read in place, and the partitions and filesystems walked on
+// them: shared by every format that has a disk in it.
+#[cfg(any(feature = "vhd", feature = "diskimage"))]
+pub(crate) mod vdisk;
 #[cfg(feature = "vhd")]
 pub(crate) mod vhd;
 #[cfg(feature = "diskimage")]
 pub(crate) mod vhdx;
 #[cfg(feature = "diskimage")]
 pub(crate) mod vmdk;
+#[cfg(any(
+    feature = "vhd",
+    feature = "diskimage",
+    feature = "partition",
+    feature = "ntfs",
+    feature = "fat",
+    feature = "exfat",
+    feature = "squashfs",
+    feature = "cramfs",
+    feature = "romfs",
+    feature = "erofs",
+    feature = "ext",
+    feature = "dmg"
+))]
+pub(crate) mod volumes;
+// The volume the filesystems read in place are read through, and what they
+// hand their files over as, which the walk of a disk takes from them.
+#[cfg(any(
+    feature = "vhd",
+    feature = "diskimage",
+    feature = "partition",
+    feature = "ntfs",
+    feature = "dmg",
+    feature = "ext",
+    feature = "fat",
+    feature = "exfat",
+    feature = "squashfs",
+    feature = "cramfs",
+    feature = "romfs",
+    feature = "erofs"
+))]
+mod vol;
 #[cfg(feature = "wim")]
 pub(crate) mod wim;
 #[cfg(feature = "xar")]
-mod xar;
+pub(crate) mod xar;
 // DMG's xz runs use its `XzReader` only.
 #[cfg(any(feature = "xz", feature = "dmg"))]
 #[cfg_attr(not(feature = "xz"), allow(dead_code))]
 #[doc(hidden)]
 pub mod xz;
+#[cfg(any(feature = "xz", feature = "dmg"))]
+mod xz_nocheck;
 #[cfg(feature = "zip")]
 #[doc(hidden)]
 pub mod zip;
@@ -195,7 +271,7 @@ pub(crate) mod pepack;
 #[cfg(feature = "pyc")]
 pub(crate) mod pyc;
 #[cfg(feature = "rtf")]
-mod rtf;
+pub mod rtf;
 #[cfg(feature = "screnc")]
 mod screnc;
 #[cfg(feature = "sfx")]
@@ -217,7 +293,7 @@ pub(crate) use aimodel::{extract_aimodel, is_aimodel};
 #[cfg(feature = "arj")]
 pub(crate) use arj::extract_arj;
 #[cfg(feature = "autoit")]
-pub(crate) use autoit::{extract_autoit, is_autoit, MARKER_EA05, MARKER_EA06};
+pub(crate) use autoit::{MARKER_EA05, MARKER_EA06, extract_autoit, is_autoit};
 #[cfg(feature = "binhex")]
 pub(crate) use binhex::{extract_binhex, looks_like_binhex};
 #[cfg(feature = "chm")]
@@ -233,7 +309,7 @@ pub(crate) use lnk::extract_lnk;
 #[cfg(feature = "machofat")]
 pub(crate) use machofat::looks_like_machofat;
 #[cfg(feature = "nsis")]
-pub(crate) use nsis::{extract_nsis, is_nsis, NSIS_SIG};
+pub(crate) use nsis::{NSIS_SIG, extract_nsis, is_nsis};
 #[cfg(feature = "ole")]
 pub(crate) use ole::extract_ole;
 #[cfg(feature = "onenote")]
@@ -253,7 +329,7 @@ pub(crate) use rar::{extract_rar, join_volumes as join_rar_volumes};
 #[cfg(feature = "rtf")]
 pub(crate) use rtf::extract_rtf;
 #[cfg(feature = "screnc")]
-pub(crate) use screnc::{extract_screnc, looks_like_screnc, MARKER as SCRENC_MARKER};
+pub(crate) use screnc::{MARKER as SCRENC_MARKER, extract_screnc, looks_like_screnc};
 #[cfg(feature = "sfx")]
 pub(crate) use sfx::looks_like_sfx;
 #[cfg(feature = "szdd")]
@@ -262,8 +338,6 @@ pub(crate) use szdd::{extract_szdd, is_szdd};
 pub(crate) use upx::{extract_upx, find_packheader, has_packheader_layout};
 #[cfg(feature = "uuencode")]
 pub(crate) use uuencode::{extract_uuencode, looks_like_uuencode};
-#[cfg(feature = "xar")]
-pub(crate) use xar::extract_xar;
 #[cfg(feature = "xdp")]
 pub(crate) use xdp::{extract_xdp, looks_like_xdp};
 #[cfg(feature = "zip")]
diff --git a/crates/exav-unpack/src/formats/nsis.rs b/crates/exav-unpack/src/formats/nsis.rs
index bcd7d796..2c20555a 100644
--- a/crates/exav-unpack/src/formats/nsis.rs
+++ b/crates/exav-unpack/src/formats/nsis.rs
@@ -35,7 +35,6 @@ pub(crate) const NSIS_SIG: [u8; 16] = [
 const FIRSTHEADER_LEN: usize = 0x1c;
 /// `firstheader.flags`: the installer carries no CRC-32 after its data.
 const FH_FLAGS_NO_CRC: u32 = 4;
-const MAX_BLOCKS: usize = 10_000;
 const SOLID_MIN_OUTPUT: usize = 64;
 
 #[inline]
@@ -102,12 +101,16 @@ pub(crate) fn extract_nsis<R>(
     // Non-solid: a `[u32 size][data]` block sequence.
     let mut pos = data_start;
     let mut n = 0usize;
-    while pos + 4 <= arch_end && n < MAX_BLOCKS {
+    // Each block is counted against the archive's member limit, an empty one
+    // too, and that is the bound on the walk: it ends in a limit that is said,
+    // where a count of its own ended it quietly with blocks left.
+    while pos + 4 <= arch_end {
         let word = u32le(data, pos);
         pos += 4;
         let compressed = word & 0x8000_0000 != 0;
         let size = (word & 0x7fff_ffff) as usize;
         if size == 0 {
+            budget.count_entry()?;
             n += 1;
             continue;
         }
@@ -237,7 +240,7 @@ mod tests {
     fn is_nsis(data: &[u8]) -> bool {
         super::is_nsis(&crate::Probe::whole(data))
     }
-    use flate2::{write::DeflateEncoder, Compression};
+    use flate2::{Compression, write::DeflateEncoder};
     use std::io::Write;
 
     /// A declared dictionary size is attacker input and is allocated UP FRONT.
@@ -314,9 +317,11 @@ mod tests {
             entries.iter().all(|e| e.unsupported.is_none()),
             "{entries:?}"
         );
-        assert!(entries
-            .iter()
-            .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST")));
+        assert!(
+            entries
+                .iter()
+                .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST"))
+        );
     }
 
     /// The CRC-32 after the data is not one more block.
@@ -342,9 +347,11 @@ mod tests {
         assert_eq!(detect(&blob), Some(Format::Nsis));
         let mut budget = Budget::new(Limits::default());
         let entries = extract(Format::Nsis, &blob, &mut budget).unwrap();
-        assert!(entries
-            .iter()
-            .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST")));
+        assert!(
+            entries
+                .iter()
+                .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST"))
+        );
     }
 
     #[test]
@@ -353,9 +360,11 @@ mod tests {
         blob.extend_from_slice(&[0u8; 512]);
         assert!(!is_nsis(&blob));
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::Nsis, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Nsis, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     #[test]
@@ -364,9 +373,11 @@ mod tests {
         blob.extend_from_slice(&[0u8; 8]);
         blob.extend_from_slice(&NSIS_SIG);
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::Nsis, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Nsis, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     #[test]
@@ -376,9 +387,11 @@ mod tests {
         let blob = synthetic_nsis(&junk);
         let mut budget = Budget::new(Limits::default());
         let entries = extract(Format::Nsis, &blob, &mut budget).unwrap();
-        assert!(entries
-            .iter()
-            .all(|e| e.unsupported.is_some() || !e.data.is_empty()));
+        assert!(
+            entries
+                .iter()
+                .all(|e| e.unsupported.is_some() || !e.data.is_empty())
+        );
     }
 
     #[test]
diff --git a/crates/exav-unpack/src/formats/ntfs.rs b/crates/exav-unpack/src/formats/ntfs.rs
index ea51b90c..76bbe44a 100644
--- a/crates/exav-unpack/src/formats/ntfs.rs
+++ b/crates/exav-unpack/src/formats/ntfs.rs
@@ -41,12 +41,22 @@
 //! the size the record declares, the shortfall is reported *and* the bytes that
 //! were read are still handed over, rather than a prefix being passed off as the
 //! whole file.
+//!
+//! The volume is a `Read + Seek`, read where the walk goes: the boot sector, the
+//! MFT record by record through `$MFT`'s own runs, and the runs of each file.
+//! Only a file is ever held, bounded by the buffer limit.
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use std::collections::HashMap;
+use std::io::{Read, Seek, SeekFrom};
+
+use super::vol::{Attrs, Emit, Found, Next, Piece, Pieces, Plan, Vol, hand, read_file};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, Entry, LimitHit};
 
 /// The OEM name every NTFS boot sector carries at offset 3.
 /// Every MFT record starts with this.
@@ -177,6 +187,7 @@ fn apply_fixups(rec: &mut [u8], sector: usize) -> bool {
 
 /// One extent of a non-resident attribute: `lcn` is `None` for a sparse run,
 /// which reads as zeroes.
+#[derive(Clone)]
 struct Run {
     lcn: Option<i64>,
     clusters: u64,
@@ -240,8 +251,41 @@ fn data_runs(d: &[u8]) -> Vec<Run> {
     runs
 }
 
-/// Read a non-resident attribute's bytes by following its runs.
-fn read_runs(volume: &[u8], runs: &[Run], cluster: usize, real_size: usize) -> Vec<u8> {
+/// The stretches of a non-resident attribute: each run in order, a sparse one
+/// zeros.
+struct Runs {
+    runs: std::vec::IntoIter<Run>,
+    cluster: u64,
+}
+
+impl Plan for Runs {
+    fn next(&mut self, _: &mut Vol) -> Next {
+        let Some(r) = self.runs.next() else {
+            return Next::End;
+        };
+        let len = r.clusters.saturating_mul(self.cluster);
+        match r.lcn {
+            None => Next::Piece(Piece::Zeros(len)),
+            Some(lcn) => match u64::try_from(lcn)
+                .ok()
+                .and_then(|l| l.checked_mul(self.cluster))
+            {
+                Some(at) => Next::Piece(Piece::Disk(at, len)),
+                None => Next::Broken,
+            },
+        }
+    }
+}
+
+/// `visit`'s member `e`, held whole.
+fn held<R>(visit: Emit<R>, e: Entry, budget: &mut Budget) -> Option<R> {
+    visit(Found::Held(e), budget)
+}
+
+/// Read a non-resident attribute's bytes by following its runs. Short where
+/// the runs stop being readable, and never longer than `real_size`, which the
+/// caller has bounded: a sparse run is zeros held in memory.
+fn read_runs(v: &mut Vol, runs: &[Run], cluster: usize, real_size: usize) -> Vec<u8> {
     let mut out = Vec::with_capacity(real_size.min(1 << 20));
     for r in runs {
         if out.len() >= real_size {
@@ -254,12 +298,11 @@ fn read_runs(volume: &[u8], runs: &[Run], cluster: usize, real_size: usize) -> V
             // victim's machine too.
             None => out.resize(out.len().saturating_add(take), 0),
             Some(lcn) if lcn >= 0 => {
-                let start = crate::bytes::to_usize(lcn as u64).saturating_mul(cluster);
-                match crate::bytes::at(volume, start, take) {
-                    Some(s) => out.extend_from_slice(s),
-                    // Past the end of the image: those bytes are absent rather
-                    // than hidden, so what exists still stands.
-                    None => break,
+                let start = (lcn as u64).saturating_mul(cluster as u64);
+                // Past the end of the image: those bytes are absent rather
+                // than hidden, so what exists still stands.
+                if !v.append(start, take, &mut out) {
+                    break;
                 }
             }
             Some(_) => break,
@@ -269,6 +312,116 @@ fn read_runs(volume: &[u8], runs: &[Run], cluster: usize, real_size: usize) -> V
     out
 }
 
+/// `len` bytes at `offset` of the attribute the runs describe, appended to
+/// `out`. False when any of them is not readable.
+fn read_runs_at(
+    v: &mut Vol,
+    runs: &[Run],
+    cluster: usize,
+    offset: u64,
+    len: usize,
+    out: &mut Vec<u8>,
+) -> bool {
+    let Some(end) = offset.checked_add(len as u64) else {
+        return false;
+    };
+    let cl = cluster as u64;
+    let mut pos = 0u64;
+    for r in runs {
+        if pos >= end {
+            break;
+        }
+        let run_end = pos.saturating_add(r.clusters.saturating_mul(cl));
+        if run_end > offset {
+            let from = offset.max(pos);
+            let take = crate::bytes::to_usize(end.min(run_end).saturating_sub(from));
+            match r.lcn {
+                None => out.resize(out.len().saturating_add(take), 0),
+                Some(lcn) if lcn >= 0 => {
+                    let host = (lcn as u64)
+                        .saturating_mul(cl)
+                        .saturating_add(from.saturating_sub(pos));
+                    if !v.append(host, take, out) {
+                        return false;
+                    }
+                }
+                Some(_) => return false,
+            }
+        }
+        pos = run_end;
+    }
+    pos >= end
+}
+
+/// `$MFT`, read a record at a time through its own runs: it can be
+/// fragmented, so it cannot simply be read from its first cluster.
+struct Mft {
+    runs: Vec<Run>,
+    /// Bytes of the table that are readable from its start.
+    size: u64,
+}
+
+impl Mft {
+    /// The table `rec0`, record 0, describes.
+    fn open(rec0: &[u8], v: &mut Vol, geo: &Geometry) -> Option<Mft> {
+        let mut off = le_u16(rec0, 20) as usize;
+        while off.saturating_add(8) <= rec0.len() {
+            let atype = le_u32(rec0, off);
+            if atype == ATTR_END {
+                break;
+            }
+            let alen = le_u32(rec0, off.saturating_add(4)) as usize;
+            if alen < 16 || alen > rec0.len().saturating_sub(off) {
+                break;
+            }
+            if atype == ATTR_DATA && rec0.get(off.saturating_add(8)).copied().unwrap_or(0) != 0 {
+                let real_size = le_u64(rec0, off.saturating_add(0x30));
+                let runs_off = off.saturating_add(le_u16(rec0, off.saturating_add(0x20)) as usize);
+                let runs = data_runs(rec0.get(runs_off..off.saturating_add(alen)).unwrap_or(&[]));
+                // The table cannot be larger than the volume it is in. It is
+                // only as long as its runs can be read.
+                let limit = real_size.min(v.len);
+                let cl = geo.cluster as u64;
+                let mut size = 0u64;
+                for r in &runs {
+                    if size >= limit {
+                        break;
+                    }
+                    let take = r
+                        .clusters
+                        .saturating_mul(cl)
+                        .min(limit.saturating_sub(size));
+                    match r.lcn {
+                        None => size = size.saturating_add(take),
+                        Some(lcn) if lcn >= 0 => {
+                            let start = (lcn as u64).saturating_mul(cl);
+                            if start.checked_add(take).is_none_or(|e| e > v.len) {
+                                break;
+                            }
+                            size = size.saturating_add(take);
+                        }
+                        Some(_) => break,
+                    }
+                }
+                return (size > 0).then_some(Mft { runs, size });
+            }
+            off = off.saturating_add(alen);
+        }
+        None
+    }
+
+    /// Record `n`, as stored (the fix-ups not undone).
+    fn record(&self, v: &mut Vol, geo: &Geometry, n: u64) -> Option<Vec<u8>> {
+        let size = geo.record_size as u64;
+        let at = n.checked_mul(size)?;
+        if at.checked_add(size)? > self.size {
+            return None;
+        }
+        let mut out = Vec::with_capacity(geo.record_size);
+        read_runs_at(v, &self.runs, geo.cluster, at, geo.record_size, &mut out).then_some(out)
+    }
+}
+
 /// Every extent of the unnamed `$DATA`, gathered across MFT records.
 ///
 /// A file fragmented past what one record can describe has its run list split
@@ -278,81 +431,120 @@ fn read_runs(volume: &[u8], runs: &[Run], cluster: usize, real_size: usize) -> V
 /// gets read. Which is exactly the kind of gap worth closing rather than
 /// reporting.
 fn data_extents(
-    rec: &[u8],
-    volume: &[u8],
-    mft: &[u8],
+    list: &[u8],
+    v: &mut Vol,
+    mft: &Mft,
     geo: &Geometry,
     sector: usize,
-) -> Option<(Vec<Run>, usize)> {
-    // The list itself is an attribute, resident or not.
-    let list = find_attribute_list(rec, volume, geo)?;
+) -> Result<Option<(Vec<Run>, usize)>, TooManyExtents> {
     let mut refs: Vec<(u64, u64)> = Vec::new(); // (starting VCN, MFT record)
     let mut i = 0usize;
     while i.saturating_add(26) <= list.len() {
-        let atype = le_u32(&list, i);
-        let entry_len = le_u16(&list, i.saturating_add(4)) as usize;
+        let atype = le_u32(list, i);
+        let entry_len = le_u16(list, i.saturating_add(4)) as usize;
         if entry_len < 26 {
             break;
         }
         let name_len = list.get(i.saturating_add(6)).copied().unwrap_or(0);
         // Only the unnamed `$DATA`; a named one is an alternate stream.
         if atype == ATTR_DATA && name_len == 0 {
-            let vcn = le_u64(&list, i.saturating_add(8));
+            // More references than any file has: a list made to cost, which is
+            // not followed (the caller reports the file as not fully read).
+            if refs.len() >= MAX_LIST_REFS {
+                return Err(TooManyExtents);
+            }
+            let vcn = le_u64(list, i.saturating_add(8));
             // The low 48 bits of the file reference are the record number.
-            let record = le_u64(&list, i.saturating_add(16)) & RECORD_NUMBER_MASK;
+            let record = le_u64(list, i.saturating_add(16)) & RECORD_NUMBER_MASK;
             refs.push((vcn, record));
         }
         i = i.saturating_add(entry_len);
     }
     if refs.is_empty() {
-        return None;
+        return Ok(None);
     }
+    // An extent starts at one VCN, named once; the first of the entries that
+    // name it (the sort is stable) is the one.
     refs.sort_by_key(|&(vcn, _)| vcn);
+    refs.dedup_by_key(|&mut (vcn, _)| vcn);
 
+    // The extents each record holds, found once however many entries name
+    // the record: reading it for each entry costs the record's size each.
+    type Extents = HashMap<u64, (usize, Vec<Run>)>;
+    let mut records: HashMap<u64, Option<Extents>> = HashMap::new();
     let mut runs: Vec<Run> = Vec::new();
     let mut real_size = 0usize;
     for (vcn, record) in refs {
-        let at = crate::bytes::to_usize(record).checked_mul(geo.record_size)?;
-        let Some(slice) = crate::bytes::at(mft, at, geo.record_size) else {
+        let held = records.entry(record).or_insert_with(|| {
+            let mut r = mft.record(v, geo, record)?;
+            if r.get(0..4) != Some(RECORD_MAGIC.as_slice()) || !apply_fixups(&mut r, sector) {
+                return None;
+            }
+            Some(extents_of(&r))
+        });
+        let Some((size, extent)) = held.as_ref().and_then(|h| h.get(&vcn)) else {
             continue;
         };
-        let mut r = slice.to_vec();
-        if r.get(0..4) != Some(RECORD_MAGIC.as_slice()) || !apply_fixups(&mut r, sector) {
-            continue;
+        // Only the extent starting at VCN 0 carries the true size.
+        if vcn == 0 {
+            real_size = *size;
         }
-        let mut off = le_u16(&r, 20) as usize;
-        while off.saturating_add(8) <= r.len() {
-            let atype = le_u32(&r, off);
-            if atype == ATTR_END {
-                break;
-            }
-            let alen = le_u32(&r, off.saturating_add(4)) as usize;
-            if alen < 16 || alen > r.len().saturating_sub(off) {
-                break;
-            }
-            let non_resident = r.get(off.saturating_add(8)).copied().unwrap_or(0) != 0;
-            if atype == ATTR_DATA
-                && r.get(off.saturating_add(9)).copied().unwrap_or(0) == 0
-                && non_resident
-                && le_u64(&r, off.saturating_add(16)) == vcn
-            {
-                // Only the extent starting at VCN 0 carries the true size.
-                if vcn == 0 {
-                    real_size = crate::bytes::to_usize(le_u64(&r, off.saturating_add(0x30)));
-                }
-                let runs_off = off.saturating_add(le_u16(&r, off.saturating_add(0x20)) as usize);
-                runs.extend(data_runs(
-                    r.get(runs_off..off.saturating_add(alen)).unwrap_or(&[]),
-                ));
-                break;
-            }
-            off = off.saturating_add(alen);
+        // Each record can hold thousands of runs, and a list names thousands
+        // of records: the runs of one file are bounded in all.
+        if runs.len().saturating_add(extent.len()) > MAX_FILE_RUNS {
+            return Err(TooManyExtents);
         }
+        runs.extend(extent.iter().cloned());
     }
     if runs.is_empty() || real_size == 0 {
-        return None;
+        return Ok(None);
+    }
+    Ok(Some((runs, real_size)))
+}
+
+/// The most `$DATA` entries of one attribute list that are followed. A file
+/// with its runs in this many records has more than any volume this reads holds.
+const MAX_LIST_REFS: usize = 1 << 16;
+
+/// The most data runs of one file followed, over all its extents: a million is
+/// a file in a million fragments, and 24 MB of runs.
+const MAX_FILE_RUNS: usize = 1 << 20;
+
+/// An attribute list that names more extents than [`MAX_LIST_REFS`], or more
+/// runs than [`MAX_FILE_RUNS`].
+struct TooManyExtents;
+
+/// The unnamed non-resident `$DATA` attributes of an MFT record by the VCN each
+/// starts at: its recorded size (the true one at VCN 0) and its runs. The first
+/// attribute of a VCN is the one.
+fn extents_of(r: &[u8]) -> HashMap<u64, (usize, Vec<Run>)> {
+    let mut found = HashMap::new();
+    let mut off = le_u16(r, 20) as usize;
+    while off.saturating_add(8) <= r.len() {
+        let atype = le_u32(r, off);
+        if atype == ATTR_END {
+            break;
+        }
+        let alen = le_u32(r, off.saturating_add(4)) as usize;
+        if alen < 16 || alen > r.len().saturating_sub(off) {
+            break;
+        }
+        let non_resident = r.get(off.saturating_add(8)).copied().unwrap_or(0) != 0;
+        if atype == ATTR_DATA
+            && r.get(off.saturating_add(9)).copied().unwrap_or(0) == 0
+            && non_resident
+        {
+            let vcn = le_u64(r, off.saturating_add(16));
+            found.entry(vcn).or_insert_with(|| {
+                let size = crate::bytes::to_usize(le_u64(r, off.saturating_add(0x30)));
+                let runs_off = off.saturating_add(le_u16(r, off.saturating_add(0x20)) as usize);
+                let runs = data_runs(r.get(runs_off..off.saturating_add(alen)).unwrap_or(&[]));
+                (size, runs)
+            });
+        }
+        off = off.saturating_add(alen);
     }
-    Some((runs, real_size))
+    found
 }
 
 /// The `$ATTRIBUTE_LIST` value.
@@ -362,7 +554,7 @@ fn data_extents(
 /// So the non-resident form is followed too, by walking its own data runs.
 /// Stopping at the resident case would leave the most fragmented files, which is
 /// to say the ones someone took the trouble to fragment, unread.
-fn find_attribute_list(rec: &[u8], volume: &[u8], geo: &Geometry) -> Option<Vec<u8>> {
+fn find_attribute_list(rec: &[u8], v: &mut Vol, geo: &Geometry) -> Option<Vec<u8>> {
     let mut off = le_u16(rec, 20) as usize;
     while off.saturating_add(8) <= rec.len() {
         let atype = le_u32(rec, off);
@@ -385,7 +577,8 @@ fn find_attribute_list(rec: &[u8], volume: &[u8], geo: &Geometry) -> Option<Vec<
             let runs = data_runs(rec.get(runs_off..off.saturating_add(alen)).unwrap_or(&[]));
             // No table of this kind is larger than the volume, and a sparse run
             // costs memory for every zero it reads.
-            let bytes = read_runs(volume, &runs, geo.cluster, real_size.min(volume.len()));
+            let bound = crate::bytes::to_usize(v.len).min(v.max);
+            let bytes = read_runs(v, &runs, geo.cluster, real_size.min(bound));
             // A list read short would silently drop the extents it names, so it
             // is treated as unusable rather than half-used.
             return (bytes.len() == real_size && real_size > 0).then_some(bytes);
@@ -402,13 +595,15 @@ struct File {
     /// Set when the bytes are present but exav could not read them.
     unreadable: Option<&'static str>,
     deleted: bool,
+    /// The runs and the size of a file too long to hold, to be read as it goes.
+    stream: Option<(Vec<Run>, u64)>,
 }
 
 /// Parse one MFT record into a file, or `None` when it holds nothing to scan.
 fn parse_record(
     rec: &[u8],
-    volume: &[u8],
-    mft: &[u8],
+    v: &mut Vol,
+    mft: &Mft,
     geo: &Geometry,
     sector: usize,
     cap: usize,
@@ -429,7 +624,14 @@ fn parse_record(
     }
     // The name is in this record, or, for a file fragmented hard enough to
     // have an attribute list, in an extension record the list names.
-    let name = record_name(rec).or_else(|| name_from_extensions(rec, volume, mft, geo, sector));
+    // The attribute list is read once, for the name and for the data.
+    let mut list: Option<Option<Vec<u8>>> = None;
+    let name = record_name(rec).or_else(|| {
+        let l = list
+            .get_or_insert_with(|| find_attribute_list(rec, v, geo))
+            .as_deref()?;
+        name_from_extensions(l, v, mft, geo, sector)
+    });
     let mut file: Option<File> = None;
     let mut off = le_u16(rec, 20) as usize;
 
@@ -455,6 +657,7 @@ fn parse_record(
                     data: None,
                     unreadable: Some("EFS-encrypted NTFS file"),
                     deleted,
+                    stream: None,
                 });
             } else if !non_resident {
                 let vlen = le_u32(rec, off.saturating_add(16)) as usize;
@@ -465,14 +668,20 @@ fn parse_record(
                     data: Some(bytes),
                     unreadable: None,
                     deleted,
+                    stream: None,
                 });
             } else {
                 // A file fragmented past what one record can hold has its runs
                 // split across several, listed in `$ATTRIBUTE_LIST`. Gather them
                 // all; falling back to this record alone would return the first
                 // extent and call it the whole file.
-                let spread = data_extents(rec, volume, mft, geo, sector);
-                if le_u64(rec, off.saturating_add(16)) != 0 && spread.is_none() {
+                let spread = list
+                    .get_or_insert_with(|| find_attribute_list(rec, v, geo))
+                    .as_deref()
+                    .map_or(Ok(None), |l| data_extents(l, v, mft, geo, sector));
+                let refused = spread.is_err();
+                let spread = spread.ok().flatten();
+                if refused || (le_u64(rec, off.saturating_add(16)) != 0 && spread.is_none()) {
                     // Only this extent is reachable. Report the shortfall, but
                     // still scan the part that is here.
                     let real_size = crate::bytes::to_usize(le_u64(rec, off.saturating_add(0x30)));
@@ -480,24 +689,28 @@ fn parse_record(
                         off.saturating_add(le_u16(rec, off.saturating_add(0x20)) as usize);
                     let runs =
                         data_runs(rec.get(runs_off..off.saturating_add(alen)).unwrap_or(&[]));
-                    let part = read_runs(
-                        volume,
-                        &runs,
-                        geo.cluster,
-                        real_size.clamp(1, volume.len().max(1)),
-                    );
+                    let size = real_size.clamp(1, crate::bytes::to_usize(v.len).max(1));
+                    let part = if size > cap {
+                        Vec::new()
+                    } else {
+                        read_runs(v, &runs, geo.cluster, size)
+                    };
                     file = Some(File {
                         name: String::new(),
                         data: Some(part),
-                        unreadable: Some(
+                        unreadable: Some(if refused {
+                            "NTFS file whose attribute list names more extents than exav \
+                             follows; the extent that could be read was scanned"
+                        } else {
                             "NTFS file whose data runs span MFT records exav could not follow; \
-                             the extent that could be read was scanned",
-                        ),
+                             the extent that could be read was scanned"
+                        }),
                         deleted,
+                        stream: None,
                     });
                 } else {
                     let (runs, real_size) = match spread {
-                        Some(v) => v,
+                        Some(found) => found,
                         None => {
                             let real_size =
                                 crate::bytes::to_usize(le_u64(rec, off.saturating_add(0x30)));
@@ -511,24 +724,43 @@ fn parse_record(
                             )
                         }
                     };
-                    if real_size > cap {
+                    if real_size > cap && attr_flags & ATTR_COMPRESSED == 0 {
+                        // Read as it goes, its holes zeros, where the volume
+                        // gives it. Runs short of the declared size are
+                        // reported before it, as for a file that is held.
+                        let covered = runs.iter().fold(0u64, |n, r| {
+                            n.saturating_add(r.clusters.saturating_mul(geo.cluster as u64))
+                        });
+                        file = Some(File {
+                            name: String::new(),
+                            data: None,
+                            unreadable: (covered < real_size as u64).then_some(
+                                "NTFS file whose data runs did not cover its declared size; \
+                                 the part that could be read was scanned",
+                            ),
+                            deleted,
+                            stream: Some((runs, real_size as u64)),
+                        });
+                    } else if real_size > cap {
                         file = Some(File {
                             name: String::new(),
                             data: None,
                             unreadable: Some("NTFS file exceeds the per-member size budget"),
                             deleted,
+                            stream: None,
                         });
                     } else if attr_flags & ATTR_COMPRESSED != 0 {
                         // A compression unit is 2^4 clusters in practice.
                         let unit = Some(le_u16(rec, off.saturating_add(0x22)))
                             .filter(|&s| s <= 16)
                             .and_then(|s| 1usize.checked_shl(s.into()))
-                            .and_then(|n| n.checked_mul(geo.cluster));
+                            .and_then(|n| n.checked_mul(geo.cluster))
+                            .filter(|&n| n <= cap);
                         // Stored compressed, so never more than the file's size
                         // plus a unit; a sparse run is not read past that.
                         let raw = match unit {
                             Some(u) => {
-                                read_runs(volume, &runs, geo.cluster, real_size.saturating_add(u))
+                                read_runs(v, &runs, geo.cluster, real_size.saturating_add(u))
                             }
                             None => Vec::new(),
                         };
@@ -538,12 +770,14 @@ fn parse_record(
                                 data: Some(d),
                                 unreadable: None,
                                 deleted,
+                                stream: None,
                             },
                             None => File {
                                 name: String::new(),
                                 data: None,
                                 unreadable: Some("NTFS-compressed file that would not decompress"),
                                 deleted,
+                                stream: None,
                             },
                         });
                     } else if attr_flags & ATTR_SPARSE != 0 || runs.iter().any(|r| r.lcn.is_none())
@@ -552,12 +786,13 @@ fn parse_record(
                         // sees too, so this is still the file.
                         file = Some(File {
                             name: String::new(),
-                            data: Some(read_runs(volume, &runs, geo.cluster, real_size)),
+                            data: Some(read_runs(v, &runs, geo.cluster, real_size)),
                             unreadable: None,
                             deleted,
+                            stream: None,
                         });
                     } else {
-                        let bytes = read_runs(volume, &runs, geo.cluster, real_size);
+                        let bytes = read_runs(v, &runs, geo.cluster, real_size);
                         // Short of the size the record declares. Passing that off
                         // as the file would be a silent truncation, so it is
                         // reported — *and* the bytes that were read are still
@@ -573,6 +808,7 @@ fn parse_record(
                                  the part that could be read was scanned",
                             ),
                             deleted,
+                            stream: None,
                         });
                     }
                 }
@@ -623,12 +859,12 @@ fn record_name(rec: &[u8]) -> Option<String> {
             break;
         }
         let non_resident = rec.get(off.saturating_add(8)).copied().unwrap_or(0) != 0;
-        if atype == ATTR_FILE_NAME && !non_resident {
-            if let Some(n) = file_name_attr(rec, off) {
-                if name.as_ref().is_none_or(|old| n.len() > old.len()) {
-                    name = Some(n);
-                }
-            }
+        if atype == ATTR_FILE_NAME
+            && !non_resident
+            && let Some(n) = file_name_attr(rec, off)
+            && name.as_ref().is_none_or(|old| n.len() > old.len())
+        {
+            name = Some(n);
         }
         off = off.saturating_add(alen);
     }
@@ -638,33 +874,36 @@ fn record_name(rec: &[u8]) -> Option<String> {
 /// The name of a file whose record has none because its `$FILE_NAME` is in an
 /// extension record, which the `$ATTRIBUTE_LIST` names.
 fn name_from_extensions(
-    rec: &[u8],
-    volume: &[u8],
-    mft: &[u8],
+    list: &[u8],
+    v: &mut Vol,
+    mft: &Mft,
     geo: &Geometry,
     sector: usize,
 ) -> Option<String> {
-    let list = find_attribute_list(rec, volume, geo)?;
     let mut name: Option<String> = None;
     let mut i = 0usize;
+    // A record is read once however many entries name it (each read costs the
+    // record's size), and no more than [`MAX_LIST_REFS`] are.
+    let mut read: std::collections::HashSet<u64> = std::collections::HashSet::new();
     // Bounded by the list, which is bounded by the volume.
     while i.saturating_add(26) <= list.len() {
-        let entry_len = le_u16(&list, i.saturating_add(4)) as usize;
+        let entry_len = le_u16(list, i.saturating_add(4)) as usize;
         if entry_len < 26 {
             break;
         }
-        if le_u32(&list, i) == ATTR_FILE_NAME {
-            let record = le_u64(&list, i.saturating_add(16)) & RECORD_NUMBER_MASK;
-            let at = crate::bytes::to_usize(record).checked_mul(geo.record_size)?;
-            if let Some(slice) = crate::bytes::at(mft, at, geo.record_size) {
-                let mut r = slice.to_vec();
-                if r.get(0..4) == Some(RECORD_MAGIC.as_slice()) && apply_fixups(&mut r, sector) {
-                    if let Some(n) = record_name(&r) {
-                        if name.as_ref().is_none_or(|old| n.len() > old.len()) {
-                            name = Some(n);
-                        }
-                    }
-                }
+        if le_u32(list, i) == ATTR_FILE_NAME {
+            let record = le_u64(list, i.saturating_add(16)) & RECORD_NUMBER_MASK;
+            if read.len() >= MAX_LIST_REFS {
+                break;
+            }
+            if read.insert(record)
+                && let Some(mut r) = mft.record(v, geo, record)
+                && r.get(0..4) == Some(RECORD_MAGIC.as_slice())
+                && apply_fixups(&mut r, sector)
+                && let Some(n) = record_name(&r)
+                && name.as_ref().is_none_or(|old| n.len() > old.len())
+            {
+                name = Some(n);
             }
         }
         i = i.saturating_add(entry_len);
@@ -697,20 +936,48 @@ fn decompress(raw: &[u8], unit_bytes: usize, real_size: usize) -> Option<Vec<u8>
     Some(out)
 }
 
-pub(crate) fn extract_ntfs<R>(
-    data: &[u8],
+/// Walk a raw NTFS volume.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the NTFS volume `disk`, which is `len` bytes long, handing each file
+/// to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
     budget: &mut Budget,
-    visit: Sink<R>,
+    visit: Emit<R>,
 ) -> Result<Option<R>, LimitHit> {
-    if !super::sniff::is(data, crate::Format::Ntfs) {
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max: crate::bytes::to_usize(budget.limits().max_buffer_bytes),
+    };
+    if len < 512 {
+        return Ok(None);
+    }
+    let mut boot = vec![0u8; 512];
+    v.disk
+        .seek(SeekFrom::Start(0))
+        .and_then(|_| v.disk.read_exact(&mut boot))
+        .map_err(|e| LimitHit::corrupt(format!("NTFS volume: {e}")))?;
+    if !super::sniff::is(&boot, crate::Format::Ntfs) {
         return Ok(None);
     }
-    let Some(geo) = geometry(data) else {
+    let Some(geo) = geometry(&boot) else {
         budget.count_entry()?;
-        return Ok(visit(
+        return Ok(held(
+            visit,
             Entry::unsupported(
                 "<ntfs-volume>".to_string(),
-                data.len() as u64,
+                len,
                 false,
                 "implausible NTFS geometry",
             ),
@@ -721,52 +988,54 @@ pub(crate) fn extract_ntfs<R>(
     // Record 0 is `$MFT` itself, and its `$DATA` gives the runs of the whole
     // table — which can be fragmented, so the MFT cannot simply be read
     // linearly from its first cluster.
-    let mft_start = crate::bytes::to_usize(geo.mft_lcn).saturating_mul(geo.cluster);
-    let Some(first) = crate::bytes::at(data, mft_start, geo.record_size) else {
+    let mft_start = geo.mft_lcn.saturating_mul(geo.cluster as u64);
+    let Some(mut rec0) = v.at(mft_start, geo.record_size) else {
         budget.count_entry()?;
-        return Ok(visit(
+        return Ok(held(
+            visit,
             Entry::unsupported(
                 "<ntfs-volume>".to_string(),
-                data.len() as u64,
+                len,
                 false,
                 "NTFS master file table lies outside the image",
             ),
             budget,
         ));
     };
-    let mut rec0 = first.to_vec();
-    let sector = le_u16(data, 11) as usize;
+    let sector = le_u16(&boot, 11) as usize;
     if !apply_fixups(&mut rec0, sector) || rec0.get(0..4) != Some(RECORD_MAGIC.as_slice()) {
         budget.count_entry()?;
-        return Ok(visit(
+        return Ok(held(
+            visit,
             Entry::unsupported(
                 "<ntfs-volume>".to_string(),
-                data.len() as u64,
+                len,
                 false,
                 "NTFS master file table record is not readable",
             ),
             budget,
         ));
     }
-    let mft = mft_bytes(&rec0, data, &geo);
-    if mft.is_empty() {
+    let Some(mft) = Mft::open(&rec0, &mut v, &geo) else {
         budget.count_entry()?;
-        return Ok(visit(
+        return Ok(held(
+            visit,
             Entry::unsupported(
                 "<ntfs-volume>".to_string(),
-                data.len() as u64,
+                len,
                 false,
                 "NTFS master file table could not be read",
             ),
             budget,
         ));
-    }
+    };
 
-    let records = mft.len().checked_div(geo.record_size).unwrap_or(0);
+    let records = crate::bytes::to_usize(mft.size.checked_div(geo.record_size as u64).unwrap_or(0));
     let n = records.min(MAX_RECORDS);
     if records > MAX_RECORDS {
         budget.count_entry()?;
-        if let Some(r) = visit(
+        if let Some(r) = held(
+            visit,
             Entry::unsupported(
                 format!("<ntfs-records-beyond-{MAX_RECORDS}>"),
                 0,
@@ -780,23 +1049,20 @@ pub(crate) fn extract_ntfs<R>(
     }
 
     for i in FIRST_USER_RECORD..n {
-        let Some(slice) = i
-            .checked_mul(geo.record_size)
-            .and_then(|at| crate::bytes::at(&mft, at, geo.record_size))
-        else {
+        let Some(mut rec) = mft.record(&mut v, &geo, i as u64) else {
             break;
         };
-        if slice.get(0..4) != Some(RECORD_MAGIC.as_slice()) {
+        if rec.get(0..4) != Some(RECORD_MAGIC.as_slice()) {
             continue; // an unused slot
         }
         // Past this point the slot carries the `FILE` magic, so a record IS here
         // and whatever it names is a file on the volume. Failing to read it is a
         // gap to report, not a slot to skip — an unused slot was already handled
         // above, and conflating the two hides real files.
-        let mut rec = slice.to_vec();
         if !apply_fixups(&mut rec, sector) {
             budget.count_entry()?;
-            if let Some(r) = visit(
+            if let Some(r) = held(
+                visit,
                 Entry::unsupported(
                     format!("<mft-record-{i}>"),
                     0,
@@ -809,11 +1075,11 @@ pub(crate) fn extract_ntfs<R>(
             }
             continue;
         }
-        let cap = budget.reserve()? as usize;
+        let cap = crate::bytes::to_usize(budget.reserve()?);
         // `None` here means "not a user file with content" — a directory, or the
         // volume's own metadata — not a parse failure. Reporting it would flag
         // every healthy volume, which the reserved records 16..63 make loud.
-        let Some(f) = parse_record(&rec, data, &mft, &geo, sector, cap) else {
+        let Some(f) = parse_record(&rec, &mut v, &mft, &geo, sector, cap) else {
             continue;
         };
         // A deleted record's runs may since have been reused by another file, so
@@ -833,46 +1099,132 @@ pub(crate) fn extract_ntfs<R>(
         // of the two would either hide the gap or throw away content.
         if let Some(why) = f.unreadable {
             budget.count_entry()?;
-            if let Some(r) = visit(
+            if let Some(r) = held(
+                visit,
                 Entry::unsupported(name.clone(), 0, why.contains("encrypted"), why),
                 budget,
             ) {
                 return Ok(Some(r));
             }
         }
-        if let Some(d) = f.data {
-            if !d.is_empty() {
-                budget.count_entry()?;
-                budget.commit(d.len() as u64);
-                if let Some(r) = visit(Entry::new(name, d), budget) {
-                    return Ok(Some(r));
-                }
+        if let Some(d) = f.data
+            && !d.is_empty()
+        {
+            budget.count_entry()?;
+            budget.commit(d.len() as u64);
+            if let Some(r) = held(visit, Entry::new(name, d), budget) {
+                return Ok(Some(r));
+            }
+        } else if let Some((runs, size)) = f.stream {
+            budget.count_entry()?;
+            let plan = Runs {
+                runs: runs.into_iter(),
+                cluster: geo.cluster as u64,
+            };
+            let got = read_file(&mut v, Pieces::new(plan, size), size, 0);
+            if let Some(r) = hand(budget, &mut *visit, name, Attrs::default(), got) {
+                return Ok(Some(r));
             }
         }
     }
     Ok(None)
 }
 
-/// The whole MFT, gathered by following `$MFT`'s own data runs.
-fn mft_bytes(rec0: &[u8], volume: &[u8], geo: &Geometry) -> Vec<u8> {
-    let mut off = le_u16(rec0, 20) as usize;
-    while off.saturating_add(8) <= rec0.len() {
-        let atype = le_u32(rec0, off);
-        if atype == ATTR_END {
-            break;
-        }
-        let alen = le_u32(rec0, off.saturating_add(4)) as usize;
-        if alen < 16 || alen > rec0.len().saturating_sub(off) {
-            break;
-        }
-        if atype == ATTR_DATA && rec0.get(off.saturating_add(8)).copied().unwrap_or(0) != 0 {
-            let real_size = crate::bytes::to_usize(le_u64(rec0, off.saturating_add(0x30)));
-            let runs_off = off.saturating_add(le_u16(rec0, off.saturating_add(0x20)) as usize);
-            let runs = data_runs(rec0.get(runs_off..off.saturating_add(alen)).unwrap_or(&[]));
-            // The table cannot be larger than the volume it is in.
-            return read_runs(volume, &runs, geo.cluster, real_size.min(volume.len()));
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
+    use std::io::Cursor;
+
+    /// A volume of 16 clusters of 4 bytes, each byte its own index.
+    fn volume() -> Cursor<Vec<u8>> {
+        Cursor::new((0..64u8).collect())
+    }
+
+    fn runs() -> Vec<Run> {
+        vec![
+            Run {
+                lcn: Some(2),
+                clusters: 2,
+            },
+            Run {
+                lcn: None,
+                clusters: 1,
+            },
+            Run {
+                lcn: Some(8),
+                clusters: 1,
+            },
+        ]
+    }
+
+    /// The attribute those runs describe, 16 bytes.
+    fn attribute() -> Vec<u8> {
+        let v: Vec<u8> = (0..64).collect();
+        [&v[8..16], &[0; 4][..], &v[32..36]].concat()
+    }
+
+    fn range(vol: &mut Cursor<Vec<u8>>, runs: &[Run], at: u64, len: usize) -> Option<Vec<u8>> {
+        let mut v = Vol {
+            len: vol.get_ref().len() as u64,
+            disk: vol,
+            max: usize::MAX,
+        };
+        let mut out = Vec::new();
+        read_runs_at(&mut v, runs, 4, at, len, &mut out).then_some(out)
+    }
+
+    #[test]
+    fn a_range_of_an_attribute_is_read_across_its_runs_and_holes() {
+        let want = attribute();
+        for (at, len) in [(0, 16), (3, 9), (8, 4), (11, 2), (12, 4), (15, 1), (16, 0)] {
+            assert_eq!(
+                range(&mut volume(), &runs(), at, len),
+                Some(want[at as usize..at as usize + len].to_vec()),
+                "({at}, {len})"
+            );
         }
-        off = off.saturating_add(alen);
+        // Past the end of the runs.
+        assert_eq!(range(&mut volume(), &runs(), 14, 4), None);
+        assert_eq!(range(&mut volume(), &runs(), u64::MAX - 2, 8), None);
+    }
+
+    #[test]
+    fn a_range_is_none_where_a_run_is_not_readable() {
+        let past = vec![Run {
+            lcn: Some(15),
+            clusters: 2,
+        }];
+        assert_eq!(range(&mut volume(), &past, 0, 4).map(|v| v.len()), Some(4));
+        assert_eq!(range(&mut volume(), &past, 0, 8), None);
+        let negative = vec![Run {
+            lcn: Some(-1),
+            clusters: 2,
+        }];
+        assert_eq!(range(&mut volume(), &negative, 0, 4), None);
+        let top = vec![Run {
+            lcn: Some(i64::MAX),
+            clusters: u64::MAX,
+        }];
+        assert_eq!(range(&mut volume(), &top, 0, 4), None);
+    }
+
+    /// A read the volume cannot satisfy appends nothing, however much it asks.
+    #[test]
+    fn a_read_past_the_volume_appends_nothing_and_allocates_nothing() {
+        let mut vol = volume();
+        let mut v = Vol {
+            len: 64,
+            disk: &mut vol,
+            max: usize::MAX,
+        };
+        let mut out = vec![9u8];
+        assert!(!v.append(60, 5, &mut out));
+        assert!(!v.append(0, usize::MAX, &mut out));
+        assert!(!v.append(u64::MAX, 2, &mut out));
+        assert_eq!(out, [9]);
+        assert!(v.append(60, 4, &mut out));
+        assert_eq!(out, [9, 60, 61, 62, 63]);
     }
-    Vec::new()
 }
diff --git a/crates/exav-unpack/src/formats/offcrypto.rs b/crates/exav-unpack/src/formats/offcrypto.rs
new file mode 100644
index 00000000..8fa7f4f1
--- /dev/null
+++ b/crates/exav-unpack/src/formats/offcrypto.rs
@@ -0,0 +1,797 @@
+//! Decryption of Excel workbooks saved with a password ([MS-OFFCRYPTO] 2.3.5
+//! to 2.3.7, [MS-XLS] 2.2.10): RC4 (2.3.6), RC4 CryptoAPI (2.3.5) and XOR
+//! obfuscation (2.3.7, BIFF2 to BIFF8), read from the `FilePass` record.
+//!
+//! The headline case is the default password `VelvetSweatshop`: Excel
+//! encrypts with it a workbook that is only protected against changes, so it
+//! opens with no prompt, and malware abuses that to hide macros and objects
+//! from scanners that stop at "encrypted". The scanner and the converters of
+//! exav-render both open such a workbook here, with the passwords they were
+//! given and these defaults.
+//!
+//! Only the workbook stream is encrypted; the other storages of the compound
+//! file (the VBA project among them) are not.
+
+use md5::{Digest, Md5};
+use sha1::Sha1;
+
+/// The password Excel uses for a workbook it protects against changes only.
+pub const DEFAULT_PASSWORD: &str = "VelvetSweatshop";
+
+/// The passwords tried on every encrypted workbook after the caller's own:
+/// the default one, and none.
+pub const DEFAULT_PASSWORDS: &[&str] = &[DEFAULT_PASSWORD, ""];
+
+/// RC4 keystream XORed into `data`.
+pub fn rc4(key: &[u8], data: &mut [u8]) {
+    if key.is_empty() {
+        return;
+    }
+    let mut s: [u8; 256] = std::array::from_fn(|i| i as u8);
+    let mut j = 0u8;
+    for i in 0..256 {
+        j = j.wrapping_add(s[i]).wrapping_add(key[i % key.len()]);
+        s.swap(i, j as usize);
+    }
+    let (mut i, mut j) = (0u8, 0u8);
+    for b in data {
+        i = i.wrapping_add(1);
+        j = j.wrapping_add(s[i as usize]);
+        s.swap(i as usize, j as usize);
+        *b ^= s[s[i as usize].wrapping_add(s[j as usize]) as usize];
+    }
+}
+
+fn utf16(s: &str) -> Vec<u8> {
+    s.encode_utf16().flat_map(u16::to_le_bytes).collect()
+}
+
+fn u16_at(b: &[u8], at: usize) -> u16 {
+    b.get(at..at + 2)
+        .map_or(0, |s| u16::from_le_bytes([s[0], s[1]]))
+}
+
+fn u32_at(b: &[u8], at: usize) -> u32 {
+    b.get(at..at + 4)
+        .map_or(0, |s| u32::from_le_bytes([s[0], s[1], s[2], s[3]]))
+}
+
+/// A cursor over a record's payload that never reads past it: a short read
+/// is flagged, not a panic.
+struct Cur<'a> {
+    d: &'a [u8],
+    p: usize,
+    short: bool,
+}
+
+impl<'a> Cur<'a> {
+    fn new(d: &'a [u8]) -> Self {
+        Cur {
+            d,
+            p: 0,
+            short: false,
+        }
+    }
+
+    fn bytes(&mut self, n: usize) -> &'a [u8] {
+        match self.p.checked_add(n).and_then(|e| self.d.get(self.p..e)) {
+            Some(s) => {
+                self.p += n;
+                s
+            }
+            None => {
+                self.short = true;
+                self.p = self.d.len();
+                &[]
+            }
+        }
+    }
+
+    fn u16(&mut self) -> u16 {
+        u16_at(self.bytes(2), 0)
+    }
+
+    fn u32(&mut self) -> u32 {
+        u32_at(self.bytes(4), 0)
+    }
+}
+
+/// 2.3.7.1: the 16-bit verifier of a password.
+pub fn xor_verifier(pw: &[u8]) -> u16 {
+    let mut v: u16 = 0;
+    let mut arr = vec![pw.len() as u8];
+    arr.extend_from_slice(pw);
+    for &b in arr.iter().rev() {
+        let i1 = u16::from(v & 0x4000 != 0);
+        let i2 = (v << 1) & 0x7FFF;
+        v = (i1 | i2) ^ u16::from(b);
+    }
+    v ^ 0xCE4B
+}
+
+/// The 16-byte XOR array of a password and the key FILEPASS stores, as
+/// [MS-OFFCRYPTO] 2.3.7.5 builds it, kept rotated left by 3 so that a byte
+/// decrypts as `rol3(byte) ^ array[i]`.
+fn xor_array(pw: &[u8], key: u16) -> [u8; 16] {
+    const PAD: [u8; 15] = [
+        0xBB, 0xFF, 0xFF, 0xBA, 0xFF, 0xFF, 0xB9, 0x80, 0x00, 0xBE, 0x0F, 0x00, 0xBF, 0x0F, 0x00,
+    ];
+    let mut a = [0u8; 16];
+    for (i, v) in a.iter_mut().enumerate() {
+        *v = if i < pw.len() {
+            pw[i]
+        } else {
+            PAD[i - pw.len()]
+        };
+    }
+    let [lo, hi] = key.to_le_bytes();
+    for (i, v) in a.iter_mut().enumerate() {
+        let k = if i % 2 == 0 { lo } else { hi };
+        *v = (*v ^ k).rotate_left(2);
+    }
+    a
+}
+
+/// What decrypts a workbook, from its FILEPASS record and a password.
+pub enum Decryptor {
+    Rc4 { h1: [u8; 5] },
+    CryptoApi { h0: Vec<u8>, key_len: usize },
+    Xor { array: [u8; 16] },
+}
+
+/// Why FILEPASS could not be used.
+#[derive(Debug, PartialEq, Eq)]
+pub enum Refused {
+    /// None of the passwords.
+    Password,
+    /// A method this reader does not have.
+    Method,
+}
+
+impl Decryptor {
+    /// From a FILEPASS record's payload and the passwords to try, in order.
+    /// BIFF2 to BIFF5 have only XOR obfuscation, without the leading
+    /// encryption type.
+    pub fn from_filepass(d: &[u8], biff8: bool, passwords: &[&str]) -> Result<Decryptor, Refused> {
+        let mut c = Cur::new(d);
+        let kind = if biff8 { c.u16() } else { 0 };
+        if kind == 0 {
+            let key = c.u16();
+            let verifier = c.u16();
+            if c.short {
+                return Err(Refused::Method);
+            }
+            // The scheme takes passwords of 1 to 15 bytes.
+            return passwords
+                .iter()
+                .map(|pw| pw.as_bytes())
+                .find(|pw| (1..=15).contains(&pw.len()) && xor_verifier(pw) == verifier)
+                .map(|pw| Decryptor::Xor {
+                    array: xor_array(pw, key),
+                })
+                .ok_or(Refused::Password);
+        }
+        if kind != 1 {
+            return Err(Refused::Method);
+        }
+        let major = c.u16();
+        let _minor = c.u16();
+        if major == 1 {
+            let salt = c.bytes(16).to_vec();
+            let verifier = c.bytes(16).to_vec();
+            let hash = c.bytes(16).to_vec();
+            if c.short {
+                return Err(Refused::Method);
+            }
+            for pw in passwords {
+                let h0 = Md5::digest(utf16(pw));
+                let mut buf = Vec::with_capacity(336);
+                for _ in 0..16 {
+                    buf.extend_from_slice(&h0[..5]);
+                    buf.extend_from_slice(&salt);
+                }
+                let h1 = Md5::digest(&buf);
+                let mut t = [0u8; 5];
+                t.copy_from_slice(&h1[..5]);
+                let dec = Decryptor::Rc4 { h1: t };
+                let mut both = [verifier.clone(), hash.clone()].concat();
+                rc4(&dec.key(0), &mut both);
+                if Md5::digest(&both[..16]).as_slice() == &both[16..] {
+                    return Ok(dec);
+                }
+            }
+            return Err(Refused::Password);
+        }
+        if (2..=4).contains(&major) {
+            let _flags = c.u32();
+            let hsize = c.u32() as usize;
+            let header = c.bytes(hsize);
+            let key_bits = u32_at(header, 16) as usize;
+            let key_len = match key_bits {
+                0 => 5,
+                40..=128 if key_bits.is_multiple_of(8) => key_bits / 8,
+                _ => return Err(Refused::Method),
+            };
+            let salt_size = c.u32() as usize;
+            let salt = c.bytes(salt_size.min(16)).to_vec();
+            let verifier = c.bytes(16).to_vec();
+            let _hash_size = c.u32();
+            let vhash = c.bytes(20).to_vec();
+            if c.short {
+                return Err(Refused::Method);
+            }
+            for pw in passwords {
+                let mut h = Sha1::new();
+                h.update(&salt);
+                h.update(utf16(pw));
+                let dec = Decryptor::CryptoApi {
+                    h0: h.finalize().to_vec(),
+                    key_len,
+                };
+                let mut both = [verifier.clone(), vhash.clone()].concat();
+                rc4(&dec.key(0), &mut both);
+                if Sha1::digest(&both[..16]).as_slice() == &both[16..] {
+                    return Ok(dec);
+                }
+            }
+            return Err(Refused::Password);
+        }
+        Err(Refused::Method)
+    }
+
+    fn key(&self, block: u32) -> Vec<u8> {
+        match self {
+            Decryptor::Rc4 { h1 } => {
+                let mut h = Md5::new();
+                h.update(h1);
+                h.update(block.to_le_bytes());
+                h.finalize().to_vec()
+            }
+            Decryptor::CryptoApi { h0, key_len } => {
+                let mut h = Sha1::new();
+                h.update(h0);
+                h.update(block.to_le_bytes());
+                let f = h.finalize();
+                if *key_len == 5 {
+                    let mut k = f[..5].to_vec();
+                    k.resize(16, 0);
+                    k
+                } else {
+                    f[..(*key_len).min(16)].to_vec()
+                }
+            }
+            Decryptor::Xor { .. } => vec![],
+        }
+    }
+
+    /// Decrypts, in place, every record of `data` after the one at
+    /// `filepass` (the offset of its header), but for the records and
+    /// fields that are never encrypted ([MS-XLS] 2.2.10).
+    pub fn decrypt_stream(&self, data: &mut [u8], filepass: usize) {
+        let mut p = filepass + 4 + u16_at(data, filepass + 2) as usize;
+        // (start of plain bytes, start of encrypted bytes, end, data start)
+        let mut ranges = Vec::new();
+        while p + 4 <= data.len() {
+            let id = u16_at(data, p);
+            let len = u16_at(data, p + 2) as usize;
+            let start = p + 4;
+            let end = (start + len).min(data.len());
+            let from = match id {
+                // BOF, FILEPASS, USREXCL, FILELOCK, INTERFACEHDR, RRDINFO, RRDHEAD.
+                0x0809 | 0x0409 | 0x0209 | 0x0009 | 0x002F | 0x0194 | 0x0195 | 0x00E1 | 0x0138
+                | 0x0196 => end,
+                // BOUNDSHEET's stream position.
+                0x0085 => (start + 4).min(end),
+                _ => start,
+            };
+            if from < end {
+                ranges.push((from, end, start, len));
+            }
+            p = end;
+        }
+        match self {
+            Decryptor::Xor { array } => {
+                for (from, end, start, len) in ranges {
+                    for (i, b) in data.iter_mut().enumerate().take(end).skip(from) {
+                        let k = array[(start + len + (i - start)) & 15];
+                        *b = b.rotate_left(3) ^ k;
+                    }
+                }
+            }
+            _ => {
+                let mut block = u32::MAX;
+                let mut ks = vec![0u8; 1024];
+                for (from, end, _, _) in ranges {
+                    for i in from..end {
+                        let blk = (i / 1024) as u32;
+                        if blk != block {
+                            block = blk;
+                            ks.iter_mut().for_each(|b| *b = 0);
+                            rc4(&self.key(blk), &mut ks);
+                        }
+                        data[i] ^= ks[i % 1024];
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// The offset of the FILEPASS record of a workbook stream, if it has one: it
+/// follows the opening BOF.
+pub fn filepass_at(stream: &[u8]) -> Option<usize> {
+    let mut p = 0usize;
+    // BOF, then FILEPASS where it is written; a few records are looked at in
+    // case a writer put something between.
+    for _ in 0..8 {
+        if p + 4 > stream.len() {
+            return None;
+        }
+        if u16_at(stream, p) == 0x002F {
+            return Some(p);
+        }
+        p += 4 + usize::from(u16_at(stream, p + 2));
+    }
+    None
+}
+
+/// A workbook stream decrypted with the first password that opens it:
+/// `Err(Refused::Password)` if none does. A stream with no FILEPASS comes back
+/// as it is. The FILEPASS record of the result is blanked (its type zero, its
+/// payload zeros), so that what reads the result does not take it for
+/// encrypted again.
+pub fn decrypt_workbook(stream: &[u8], passwords: &[&str]) -> Result<Vec<u8>, Refused> {
+    let mut out = stream.to_vec();
+    let Some(fp) = filepass_at(stream) else {
+        return Ok(out);
+    };
+    // BIFF2 to BIFF5 write only the key and verifier of XOR obfuscation, four
+    // bytes; from BIFF8 on there is an encryption type first.
+    let size = usize::from(u16_at(stream, fp + 2));
+    let biff8 = size > 4;
+    let payload = stream.get(fp + 4..fp + 4 + size).ok_or(Refused::Method)?;
+    Decryptor::from_filepass(payload, biff8, passwords)?.decrypt_stream(&mut out, fp);
+    out[fp..fp + 2].fill(0);
+    out[fp + 4..fp + 4 + size].fill(0);
+    Ok(out)
+}
+
+/// Encryption with the default password, for the tests of what reads encrypted
+/// workbooks: the inverse of [`Decryptor::decrypt_stream`], written from the
+/// specification apart from it.
+#[cfg(any(test, feature = "test-util"))]
+pub mod encrypt {
+    use super::*;
+
+    /// A FILEPASS payload for `method` ("xor", "rc4", "cryptoapi40",
+    /// "cryptoapi128") and a fixed salt.
+    pub fn filepass(method: &str, biff8: bool) -> Vec<u8> {
+        let pw = DEFAULT_PASSWORD;
+        let salt: Vec<u8> = (0..16u8)
+            .map(|i| i.wrapping_mul(37).wrapping_add(11))
+            .collect();
+        let verifier: Vec<u8> = (0..16u8)
+            .map(|i| i.wrapping_mul(91).wrapping_add(3))
+            .collect();
+        let mut out = vec![];
+        match method {
+            "xor" => {
+                if biff8 {
+                    out.extend_from_slice(&0u16.to_le_bytes());
+                }
+                out.extend_from_slice(&xor_key(pw.as_bytes()).to_le_bytes());
+                out.extend_from_slice(&xor_verifier(pw.as_bytes()).to_le_bytes());
+            }
+            "rc4" => {
+                out.extend_from_slice(&[1, 0, 1, 0, 1, 0]);
+                out.extend_from_slice(&salt);
+                let h0 = Md5::digest(utf16(pw));
+                let mut buf = vec![];
+                for _ in 0..16 {
+                    buf.extend_from_slice(&h0[..5]);
+                    buf.extend_from_slice(&salt);
+                }
+                let h1 = Md5::digest(&buf);
+                let mut key = Md5::new();
+                key.update(&h1[..5]);
+                key.update(0u32.to_le_bytes());
+                let mut both = [verifier.clone(), Md5::digest(&verifier).to_vec()].concat();
+                rc4(&key.finalize(), &mut both);
+                out.extend_from_slice(&both);
+            }
+            m => {
+                let bits: u32 = if m == "cryptoapi40" { 40 } else { 128 };
+                out.extend_from_slice(&[1, 0, 2, 0, 2, 0]);
+                out.extend_from_slice(&4u32.to_le_bytes());
+                let csp: Vec<u8> = utf16("Microsoft Base Cryptographic Provider v1.0\0");
+                let mut header = vec![];
+                header.extend_from_slice(&4u32.to_le_bytes()); // flags: fCryptoAPI
+                header.extend_from_slice(&0u32.to_le_bytes());
+                header.extend_from_slice(&0x6801u32.to_le_bytes()); // RC4
+                header.extend_from_slice(&0x8004u32.to_le_bytes()); // SHA-1
+                header.extend_from_slice(&bits.to_le_bytes());
+                header.extend_from_slice(&1u32.to_le_bytes());
+                header.extend_from_slice(&[0; 8]);
+                header.extend_from_slice(&csp);
+                out.extend_from_slice(&(header.len() as u32).to_le_bytes());
+                out.extend_from_slice(&header);
+                out.extend_from_slice(&16u32.to_le_bytes());
+                out.extend_from_slice(&salt);
+                let mut h = Sha1::new();
+                h.update(&salt);
+                h.update(utf16(pw));
+                let h0 = h.finalize();
+                let mut k = Sha1::new();
+                k.update(h0);
+                k.update(0u32.to_le_bytes());
+                let f = k.finalize();
+                let key = if bits == 40 {
+                    [&f[..5], &[0u8; 11][..]].concat()
+                } else {
+                    f[..16].to_vec()
+                };
+                let mut both = [verifier.clone(), Sha1::digest(&verifier).to_vec()].concat();
+                rc4(&key, &mut both);
+                out.extend_from_slice(&both[..16]);
+                out.extend_from_slice(&20u32.to_le_bytes());
+                out.extend_from_slice(&both[16..]);
+            }
+        }
+        out
+    }
+
+    /// 2.3.7.2's CreateXorKey_Method1.
+    pub fn xor_key(pw: &[u8]) -> u16 {
+        const INITIAL: [u16; 15] = [
+            0xE1F0, 0x1D0F, 0xCC9C, 0x84C0, 0x110C, 0x0E10, 0xF1CE, 0x313E, 0x1872, 0xE139, 0xD40F,
+            0x84F9, 0x280C, 0xA96A, 0x4EC3,
+        ];
+        const MATRIX: [u16; 105] = [
+            0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09, 0x7B61, 0xF6C2, 0xFDA5, 0xEB6B,
+            0xC6F7, 0x9DCF, 0x2BBF, 0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0, 0x0375,
+            0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40, 0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D,
+            0xAA7A, 0x44D5, 0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A, 0xEB23, 0xC667,
+            0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9, 0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68,
+            0xF6D0, 0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC, 0x45A0, 0x8B40, 0x06A1,
+            0x0D42, 0x1A84, 0x3508, 0x6A10, 0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168,
+            0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C, 0x3730, 0x6E60, 0xDCC0, 0xA9A1,
+            0x4363, 0x86C6, 0x1DAD, 0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC, 0x1021,
+            0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4,
+        ];
+        let mut key = INITIAL[pw.len() - 1];
+        let mut el = 0x68usize;
+        for &c in pw.iter().rev() {
+            let mut c = c;
+            for _ in 0..7 {
+                if c & 0x40 != 0 {
+                    key ^= MATRIX[el];
+                }
+                c = c.wrapping_mul(2);
+                el = el.wrapping_sub(1);
+            }
+        }
+        key
+    }
+
+    /// Encrypts the records after FILEPASS (at offset `filepass`), as
+    /// [MS-OFFCRYPTO] 2.3.7.3 (EncryptData_Method1 with the array of
+    /// 2.3.7.2) and 2.3.6 describe it.
+    pub fn encrypt_stream(method: &str, data: &mut [u8], filepass: usize) {
+        let mut p = filepass + 4 + u16_at(data, filepass + 2) as usize;
+        let pw = DEFAULT_PASSWORD.as_bytes();
+        let fp = data[filepass + 4..filepass + 4 + u16_at(data, filepass + 2) as usize].to_vec();
+        let biff8 = fp.len() > 4;
+        let dec = Decryptor::from_filepass(&fp, biff8, &[DEFAULT_PASSWORD]).ok();
+        let xa = method_1_array(pw);
+        while p + 4 <= data.len() {
+            let id = u16_at(data, p);
+            let len = u16_at(data, p + 2) as usize;
+            let start = p + 4;
+            let end = (start + len).min(data.len());
+            let from = match id {
+                0x0809 | 0x0409 | 0x0209 | 0x0009 | 0x002F | 0x0194 | 0x0195 | 0x00E1 | 0x0138
+                | 0x0196 => end,
+                0x0085 => start + 4,
+                _ => start,
+            };
+            for i in from..end {
+                if method == "xor" {
+                    let idx = (start + len + (i - start)) & 15;
+                    data[i] = data[i].rotate_left(5) ^ xa[idx];
+                } else if let Some(d) = &dec {
+                    let mut ks = vec![0u8; i % 1024 + 1];
+                    rc4(&d.key((i / 1024) as u32), &mut ks);
+                    data[i] ^= ks[i % 1024];
+                }
+            }
+            p = end;
+        }
+    }
+
+    /// 2.3.7.2's CreateXorArray_Method1, as the specification writes it.
+    fn method_1_array(pw: &[u8]) -> [u8; 16] {
+        const PAD: [u8; 15] = [
+            0xBB, 0xFF, 0xFF, 0xBA, 0xFF, 0xFF, 0xB9, 0x80, 0x00, 0xBE, 0x0F, 0x00, 0xBF, 0x0F,
+            0x00,
+        ];
+        let ror = |b: u8| b.rotate_right(1);
+        let key = xor_key(pw);
+        let (hi, lo) = ((key >> 8) as u8, key as u8);
+        let mut a = [0u8; 16];
+        let mut index = pw.len();
+        if index % 2 == 1 {
+            a[index] = ror(PAD[0] ^ hi);
+            index -= 1;
+            a[index] = ror(pw[pw.len() - 1] ^ lo);
+        }
+        while index > 0 {
+            index -= 1;
+            a[index] = ror(pw[index] ^ hi);
+            index -= 1;
+            a[index] = ror(pw[index] ^ lo);
+        }
+        let mut index = 15usize;
+        let mut pad = 15 - pw.len();
+        while pad > 0 {
+            a[index] = ror(PAD[pad] ^ hi);
+            index -= 1;
+            pad -= 1;
+            a[index] = ror(PAD[pad] ^ lo);
+            index = index.wrapping_sub(1);
+            pad = pad.wrapping_sub(1);
+            if pad > 15 {
+                break;
+            }
+        }
+        a
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::encrypt::*;
+    use super::*;
+
+    #[test]
+    fn rc4_test_vector() {
+        // RFC 6229, key 0x0102030405, first bytes of keystream.
+        let mut d = [0u8; 8];
+        rc4(&[1, 2, 3, 4, 5], &mut d);
+        assert_eq!(d, [0xb2, 0x39, 0x63, 0x05, 0xf0, 0x3d, 0xc0, 0x27]);
+    }
+
+    #[test]
+    fn verifier_of_the_default_password() {
+        // [MS-OFFCRYPTO] 2.3.7.1 on "VelvetSweatshop"; the stored key is
+        // CreateXorKey_Method1 of it.
+        let pw = DEFAULT_PASSWORD.as_bytes();
+        let fp = filepass("xor", true);
+        assert!(matches!(
+            Decryptor::from_filepass(&fp, true, &[DEFAULT_PASSWORD]),
+            Ok(Decryptor::Xor { .. })
+        ));
+        assert_eq!(u16_at(&fp, 4), xor_verifier(pw));
+        // Another password's verifier is refused.
+        let mut bad = fp.clone();
+        bad[4] ^= 1;
+        assert_eq!(
+            Decryptor::from_filepass(&bad, true, &[DEFAULT_PASSWORD]).err(),
+            Some(Refused::Password)
+        );
+    }
+
+    /// The password that opens a workbook is found among those given, in the
+    /// order given; none of them is a refusal.
+    #[test]
+    fn the_right_password_is_found_among_several() {
+        for m in ["xor", "rc4", "cryptoapi40", "cryptoapi128"] {
+            let fp = filepass(m, true);
+            let found = Decryptor::from_filepass(&fp, true, &["wrong", "", DEFAULT_PASSWORD]);
+            assert!(found.is_ok(), "{m}");
+            assert_eq!(
+                Decryptor::from_filepass(&fp, true, &["wrong", ""]).err(),
+                Some(Refused::Password),
+                "{m}"
+            );
+            assert_eq!(
+                Decryptor::from_filepass(&fp, true, &[]).err(),
+                Some(Refused::Password),
+                "{m}"
+            );
+        }
+    }
+
+    #[test]
+    fn our_xor_array_is_the_specifications() {
+        // The array built from the stored key, rotated, equals 2.3.7.2's
+        // CreateXorArray_Method1 rotated the same way.
+        let mut stream = vec![];
+        // A FILEPASS (XOR, BIFF8), then a record of 40 known bytes.
+        let fp = filepass("xor", true);
+        stream.extend_from_slice(&0x002Fu16.to_le_bytes());
+        stream.extend_from_slice(&(fp.len() as u16).to_le_bytes());
+        stream.extend_from_slice(&fp);
+        let plain: Vec<u8> = (0..40u8).collect();
+        stream.extend_from_slice(&0x0204u16.to_le_bytes());
+        stream.extend_from_slice(&40u16.to_le_bytes());
+        stream.extend_from_slice(&plain);
+        let mut enc = stream.clone();
+        encrypt_stream("xor", &mut enc, 0);
+        assert_ne!(enc, stream);
+        let d = Decryptor::from_filepass(&fp, true, &[DEFAULT_PASSWORD]).unwrap();
+        d.decrypt_stream(&mut enc, 0);
+        assert_eq!(enc, stream);
+    }
+
+    #[test]
+    fn rc4_and_cryptoapi_round_trip() {
+        for m in ["rc4", "cryptoapi40", "cryptoapi128"] {
+            let fp = filepass(m, true);
+            let mut stream = vec![];
+            stream.extend_from_slice(&0x002Fu16.to_le_bytes());
+            stream.extend_from_slice(&(fp.len() as u16).to_le_bytes());
+            stream.extend_from_slice(&fp);
+            for k in 0..300u16 {
+                stream.extend_from_slice(&0x0203u16.to_le_bytes());
+                stream.extend_from_slice(&14u16.to_le_bytes());
+                stream.extend_from_slice(&k.to_le_bytes());
+                stream.extend_from_slice(&[7; 12]);
+            }
+            let mut enc = stream.clone();
+            encrypt_stream(m, &mut enc, 0);
+            assert_ne!(enc, stream, "{m}");
+            let d = Decryptor::from_filepass(&fp, true, &[DEFAULT_PASSWORD])
+                .unwrap_or_else(|e| panic!("{m}: {e:?}"));
+            d.decrypt_stream(&mut enc, 0);
+            assert_eq!(enc, stream, "{m}");
+        }
+    }
+
+    fn hexv(s: &str) -> Vec<u8> {
+        (0..s.len() / 2)
+            .map(|i| u8::from_str_radix(&s[i * 2..i * 2 + 2], 16).unwrap())
+            .collect()
+    }
+
+    /// The verifier matches the MS-OFFCRYPTO reference vectors (the
+    /// `VelvetSweatshop` default stores `0x9a0a`).
+    #[test]
+    fn xor_verifier_matches_reference() {
+        assert_eq!(xor_verifier(b"VelvetSweatshop"), 0x9a0a);
+        assert_eq!(xor_verifier(b"password1"), 0xe1ae);
+        assert_eq!(xor_verifier(b"Secret1"), 0xc266);
+        assert_ne!(xor_verifier(b"wrong"), 0x9a0a);
+    }
+
+    /// The obfuscation array matches the MIT msoffcrypto reference for several
+    /// passwords, byte for byte (which validates the tables and the key
+    /// derivation): the reference array is ours rotated left by 3, and ours
+    /// rotated back is the reference's.
+    #[test]
+    fn xor_array_matches_reference_vectors() {
+        for (pw, hex) in [
+            ("VelvetSweatshop", "876b9ae21ee305621e699660986e9404"),
+            ("password1", "dbb75abe58b0da357bda1cf8bef81cdb"),
+            ("abc", "95999475da577857da7465a87a2f2577"),
+            ("Secret1", "7b3863b360b04a572d758f752d56928a"),
+        ] {
+            let ours = xor_array(pw.as_bytes(), xor_key(pw.as_bytes()));
+            let reference: Vec<u8> = ours.iter().map(|b| b.rotate_right(3)).collect();
+            assert_eq!(reference, hexv(hex), "xor array mismatch for {pw:?}");
+        }
+    }
+
+    /// Passwords of 1 to 15 bytes are opened by the XOR scheme, others are not.
+    #[test]
+    fn xor_passwords_of_every_length_are_tried() {
+        for n in 0..=16 {
+            let pw = "a".repeat(n);
+            let key = if (1..=15).contains(&n) {
+                xor_key(pw.as_bytes())
+            } else {
+                0
+            };
+            let mut fp = vec![0u8, 0];
+            fp.extend(key.to_le_bytes());
+            fp.extend(xor_verifier(pw.as_bytes()).to_le_bytes());
+            let found = Decryptor::from_filepass(&fp, true, &[&pw]).is_ok();
+            assert_eq!(found, (1..=15).contains(&n), "length {n}");
+        }
+    }
+
+    // Independently generated vector (salt 00..0f, password "Secret1").
+    #[test]
+    fn rc4_basic_verifier_and_key() {
+        let mut fp = vec![1u8, 0, 1, 0, 1, 0];
+        fp.extend(0u8..16);
+        fp.extend(hexv("d11cfb57cde29a6eaf45018e01931b31"));
+        fp.extend(hexv("9687999033ca45aaade5f45386030a07"));
+        match Decryptor::from_filepass(&fp, true, &["wrong", DEFAULT_PASSWORD, "Secret1"]) {
+            Ok(Decryptor::Rc4 { h1 }) => assert_eq!(h1.to_vec(), hexv("cabe9bb94c")),
+            _ => panic!("Secret1 opens it"),
+        }
+        assert_eq!(
+            Decryptor::from_filepass(&fp, true, &["wrong", DEFAULT_PASSWORD]).err(),
+            Some(Refused::Password)
+        );
+    }
+
+    // Independently generated vector, cross-checked against the msoffcrypto
+    // reference (salt 10..1f, password "VelvetSweatshop", 128-bit).
+    #[test]
+    fn rc4_cryptoapi_verifier_vector() {
+        let mut header = vec![0u8; 32];
+        header[16..20].copy_from_slice(&128u32.to_le_bytes());
+        let mut fp = vec![1u8, 0, 3, 0, 3, 0];
+        fp.extend(0x24u32.to_le_bytes());
+        fp.extend((header.len() as u32).to_le_bytes());
+        fp.extend(&header);
+        fp.extend(16u32.to_le_bytes());
+        fp.extend(16u8..32);
+        fp.extend(hexv("66871900f3075fc3fa7e1d9b934d6b22"));
+        fp.extend(20u32.to_le_bytes());
+        fp.extend(hexv("13146eb6c265735c52ea6eb1cc48739e80561620"));
+        assert!(Decryptor::from_filepass(&fp, true, &[DEFAULT_PASSWORD]).is_ok());
+        assert_eq!(
+            Decryptor::from_filepass(&fp, true, &["nope"]).err(),
+            Some(Refused::Password)
+        );
+        // A key size past what SHA-1 gives is a method not had, not a cut key.
+        fp[6 + 8 + 16..6 + 8 + 20].copy_from_slice(&2048u32.to_le_bytes());
+        assert_eq!(
+            Decryptor::from_filepass(&fp, true, &[DEFAULT_PASSWORD]).err(),
+            Some(Refused::Method)
+        );
+    }
+
+    #[test]
+    fn rc4_is_symmetric() {
+        let k = b"key1234567890abc";
+        let pt = b"eicar-ish plaintext content";
+        let mut d = pt.to_vec();
+        rc4(k, &mut d);
+        assert_ne!(&d[..], &pt[..]);
+        rc4(k, &mut d);
+        assert_eq!(&d[..], &pt[..]);
+    }
+
+    /// A whole workbook stream (a BOF, a FILEPASS, records), whose FILEPASS is
+    /// found after the BOF.
+    #[test]
+    fn a_workbook_is_decrypted_from_its_filepass() {
+        for m in ["xor", "rc4", "cryptoapi128"] {
+            let fp = filepass(m, true);
+            let mut stream = vec![];
+            // BOF, BIFF8, workbook globals.
+            stream.extend_from_slice(&0x0809u16.to_le_bytes());
+            stream.extend_from_slice(&16u16.to_le_bytes());
+            stream.extend_from_slice(&[0x00, 0x06, 0x05, 0x00]);
+            stream.extend_from_slice(&[0; 12]);
+            let filepass_pos = stream.len();
+            stream.extend_from_slice(&0x002Fu16.to_le_bytes());
+            stream.extend_from_slice(&(fp.len() as u16).to_le_bytes());
+            stream.extend_from_slice(&fp);
+            for k in 0..50u16 {
+                stream.extend_from_slice(&0x0203u16.to_le_bytes());
+                stream.extend_from_slice(&14u16.to_le_bytes());
+                stream.extend_from_slice(&k.to_le_bytes());
+                stream.extend_from_slice(&[9; 12]);
+            }
+            let mut enc = stream.clone();
+            encrypt_stream(m, &mut enc, filepass_pos);
+            assert_eq!(filepass_at(&enc), Some(filepass_pos), "{m}");
+            let out = decrypt_workbook(&enc, DEFAULT_PASSWORDS).unwrap();
+            // The records are the plain ones, and FILEPASS is blanked.
+            let mut blanked = stream.clone();
+            blanked[filepass_pos..filepass_pos + 2].fill(0);
+            blanked[filepass_pos + 4..filepass_pos + 4 + fp.len()].fill(0);
+            assert_eq!(out, blanked, "{m}");
+            assert_eq!(filepass_at(&out), None, "{m}");
+            assert_eq!(
+                decrypt_workbook(&enc, &["no"]).err(),
+                Some(Refused::Password),
+                "{m}"
+            );
+        }
+    }
+}
diff --git a/crates/exav-unpack/src/formats/ole.rs b/crates/exav-unpack/src/formats/ole.rs
index 134366f9..a3d31c24 100644
--- a/crates/exav-unpack/src/formats/ole.rs
+++ b/crates/exav-unpack/src/formats/ole.rs
@@ -1,67 +1,37 @@
 #![allow(unused_imports)]
+use super::cfb::{self, Compound};
 use crate::*;
 use std::io::{BufReader, Cursor, Read, Seek, Write};
 
 /// OLE2 / Compound File Binary (legacy Office, MSI): emit every stream so the
 /// engine can match on macro/object/shellcode content.
-pub(crate) fn extract_ole(data: &[u8], budget: &mut Budget) -> Result<Vec<Entry>, LimitHit> {
-    match cfb::CompoundFile::open(Cursor::new(data)) {
-        Ok(comp) => collect_ole_entries(comp, data.len() as u64, budget),
-        // A strict CFB reader rejects compound files that violate the spec — most
-        // commonly a broken red-black-tree sibling ordering in the directory (e.g.
-        // `_VBA_PROJECT` sorted before `dir`), which many real Office documents and
-        // malware carry. The streams are still readable; fall back to a lenient flat
-        // directory walk (ClamAV-style) so we scan the content instead of returning
-        // "not fully scanned". Only surface the error if it is not a compound file.
-        Err(e) => match lenient_cfb_streams(data, budget.limits.max_buffer_bytes) {
-            Some(streams) => assemble_ole_entries(streams, data.len() as u64, budget),
-            None => Err(LimitHit::new(format!("ole: {e}"))),
-        },
-    }
-}
-
-/// Open a CFB compound file over a **seekable source** (the reader-based
-/// streaming path): the whole `.doc`/`.xls`/`.msi` file is never buffered — cfb
-/// walks the FAT chains with seeks, and each stream is read on demand. Returns
-/// the same members as [`extract_ole`].
 ///
-/// Staged: the unpack-layer capability is ready, but core routing is gated on the
-/// streamed member-scan path replicating OLE-specific handling (VBA-macro
-/// heuristics + textual-type forcing) — see the module notes — so it is not yet
-/// called. Wiring it without that would risk false positives on benign macros.
-#[allow(dead_code)]
-pub(crate) fn stream_ole_entries<R: Read + Seek>(
-    mut source: R,
-    budget: &mut Budget,
-) -> Result<Vec<Entry>, LimitHit> {
-    let total = source
-        .seek(std::io::SeekFrom::End(0))
-        .map_err(|e| LimitHit::corrupt(format!("ole: {e}")))?;
-    source
-        .seek(std::io::SeekFrom::Start(0))
-        .map_err(|e| LimitHit::corrupt(format!("ole: {e}")))?;
-    let comp = cfb::CompoundFile::open(source).map_err(|e| LimitHit::new(format!("ole: {e}")))?;
-    collect_ole_entries(comp, total, budget)
+/// The reader is lenient: a compound file whose directory tree is out of order
+/// (e.g. `_VBA_PROJECT` sorted before `dir`), which many real Office documents
+/// and malware carry, is read as well as a clean one, so its content is scanned
+/// instead of the file being reported as not fully scanned.
+pub(crate) fn extract_ole(data: &[u8], budget: &mut Budget) -> Result<Vec<Entry>, LimitHit> {
+    let comp = Compound::open(data)
+        .ok_or_else(|| LimitHit::new("ole: not a compound file".to_string()))?;
+    collect_ole_entries(&comp, data.len() as u64, budget)
 }
 
 /// Walk every stream of a compound file and emit it as an [`Entry`], handling MSI
 /// name decompression, `.doc`/`.xls`/OOXML encryption detection, and VBA-macro
-/// artifact synthesis. Shared by the buffered ([`extract_ole`]) and seekable
-/// ([`stream_ole_entries`]) entry points. `total_len` is the container size (used
-/// only for the encrypted-member size field).
-fn collect_ole_entries<R: Read + Seek>(
-    mut comp: cfb::CompoundFile<R>,
+/// artifact synthesis. `total_len` is the container size (used only for the
+/// encrypted-member size field).
+fn collect_ole_entries(
+    comp: &Compound<'_>,
     total_len: u64,
     budget: &mut Budget,
 ) -> Result<Vec<Entry>, LimitHit> {
-    let paths: Vec<std::path::PathBuf> = comp
-        .walk()
-        .filter(|e| e.is_stream())
-        .map(|e| e.path().to_path_buf())
-        .collect();
+    // A stream entry with no name (a malformed directory) has its sectors
+    // inside this same file, uncompressed, where the raw scan of the caller
+    // covers them: skipping it loses the name and size, not the content.
+    let streams: Vec<cfb::StreamInfo<'_>> = comp.streams().filter(|s| !s.name.is_empty()).collect();
 
     // Detect MSI database: decompress each stream name and check for `_Tables`.
-    let msi = is_msi_database(&paths);
+    let msi = is_msi_database(&streams);
 
     // Encrypted Office document. A password-protected OOXML file
     // (`.docx`/`.xlsx`/`.pptx`) is wrapped in an OLE2/CFB container holding the
@@ -70,38 +40,22 @@ fn collect_ole_entries<R: Read + Seek>(
     // agile AES-CBC) with the default `VelvetSweatshop`/empty password + the caller
     // pool so the real content is scanned; if that fails (wrong password) we still
     // surface an encrypted member — never a silent clean.
-    let stream_named = |want: &str| -> Option<std::path::PathBuf> {
-        paths
-            .iter()
-            .find(|p| {
-                p.file_name()
-                    .map(|s| s.to_string_lossy().eq_ignore_ascii_case(want))
-                    .unwrap_or(false)
-            })
-            .cloned()
+    let stream_named = |want: &str| -> Option<&cfb::StreamInfo<'_>> {
+        streams.iter().find(|s| s.name.eq_ignore_ascii_case(want))
     };
-    // The stream paths are what the decryptor needs; without `decrypt` there is
-    // nothing to hand them to, and the member is reported unsupported below
-    // without either stream being read.
+    // Without `decrypt` there is nothing to hand the streams to, and the
+    // member is reported unsupported below without either being read.
     #[cfg_attr(not(feature = "decrypt"), allow(unused_variables))]
-    if let (Some(info_p), Some(pkg_p)) = (
+    if let (Some(info_s), Some(pkg_s)) = (
         stream_named("EncryptionInfo"),
         stream_named("EncryptedPackage"),
     ) {
         #[cfg(feature = "decrypt")]
         let decrypted = {
-            let mut read_full = |p: &std::path::Path| -> Option<Vec<u8>> {
-                let s = comp.open_stream(p).ok()?;
-                bounded_read(s, budget.limits.max_buffer_bytes)
-                    .ok()
-                    .map(|(b, _)| b)
-            };
-            match (read_full(&info_p), read_full(&pkg_p)) {
-                (Some(info), Some(pkg)) => {
-                    super::ole_crypto::try_decrypt_ooxml(&info, &pkg, &budget.passwords)
-                }
-                _ => None,
-            }
+            let cap = budget.limits.max_buffer_bytes;
+            let info = comp.read(info_s.index, cap);
+            let pkg = comp.read(pkg_s.index, cap);
+            super::ole_crypto::try_decrypt_ooxml(&info.data, &pkg.data, &budget.passwords)
         };
         #[cfg(not(feature = "decrypt"))]
         let decrypted: Option<Vec<u8>> = None;
@@ -122,23 +76,21 @@ fn collect_ole_entries<R: Read + Seek>(
     }
 
     let mut entries = Vec::new();
-    for p in &paths {
+    for s in &streams {
         budget.count_entry()?;
         let cap = budget.reserve()?;
-        let stream = comp
-            .open_stream(p)
-            .map_err(|e| LimitHit::new(format!("ole stream: {e}")))?;
-        let (buf, truncated) =
-            bounded_read(stream, cap).map_err(|e| LimitHit::new(format!("ole read: {e}")))?;
-        if truncated {
+        let read = comp.read(s.index, cap);
+        // A prefix handed over as a whole stream would be a payload past the
+        // cap that nothing scanned and nothing reported.
+        if read.truncated {
             return Err(LimitHit::new("ole stream exceeds budget".to_string()));
         }
-        let (buf, was_decrypted) = match legacy_encryption(&p.to_string_lossy(), buf, budget) {
+        let (buf, was_decrypted) = match legacy_encryption(s.path, read.data.into_owned(), budget) {
             Legacy::Plain(b) => (b, false),
             Legacy::Decrypted(b) => (b, true),
             Legacy::Locked => {
                 entries.push(Entry::unsupported(
-                    p.to_string_lossy().into_owned(),
+                    s.path.to_string(),
                     total_len,
                     true,
                     "encrypted Office document",
@@ -151,10 +103,9 @@ fn collect_ole_entries<R: Read + Seek>(
         // MSI compresses OLE2 stream names to fit longer names into the
         // 31-char OLE2 limit. Decompress if this is an MSI database.
         let name = if msi {
-            let full = p.to_string_lossy();
-            decompress_msi_name(&full)
+            decompress_msi_name(s.path)
         } else {
-            p.to_string_lossy().into_owned()
+            s.path.to_string()
         };
         // A stream we DECRYPTED carries its plaintext and stays marked encrypted.
         // Both facts are true: the content is available to scan, and the document
@@ -166,10 +117,10 @@ fn collect_ole_entries<R: Read + Seek>(
         entries.push(entry);
     }
 
-    append_ole10native_payloads(&mut entries, budget);
+    append_ole10native_payloads(&mut entries, budget)?;
     // Before the macro pass: an embedded storage can itself hold the VBA
     // project, and the artifacts are synthesised from whatever is present.
-    append_ppt_embedded_storages(&mut entries, budget);
+    append_ppt_embedded_storages(&mut entries, budget)?;
     append_macro_artifacts(&mut entries, budget);
     Ok(entries)
 }
@@ -187,7 +138,10 @@ fn collect_ole_entries<R: Read + Seek>(
 /// 13 corpus documents carried an encrypted OLE2 this way that exav never saw,
 /// and the detection was already correct once the payload was carved by hand.
 /// It is a routine malware-delivery shape, so the value is well beyond those 13.
-fn append_ole10native_payloads(entries: &mut Vec<Entry>, budget: &mut Budget) {
+fn append_ole10native_payloads(
+    entries: &mut Vec<Entry>,
+    budget: &mut Budget,
+) -> Result<(), LimitHit> {
     let mut carved: Vec<Entry> = Vec::new();
     for e in entries.iter() {
         // Stream names arrive as paths (`/\x01Ole10Native`), and the `\x01`
@@ -205,19 +159,27 @@ fn append_ole10native_payloads(entries: &mut Vec<Entry>, budget: &mut Budget) {
         let Some(payload) = ole10native_payload(&e.data) else {
             continue;
         };
-        if budget.count_entry().is_err() {
-            break;
-        }
-        let Ok(cap) = budget.reserve() else { break };
+        budget.count_entry()?;
+        let cap = budget.reserve()?;
         if payload.len() as u64 > cap {
+            carved.push(Entry::unsupported(
+                format!("{leaf}-payload"),
+                payload.len() as u64,
+                false,
+                "embedded object exceeds the per-member budget",
+            ));
             continue;
         }
         budget.commit(payload.len() as u64);
         carved.push(Entry::new(format!("{leaf}-payload"), payload.to_vec()));
     }
     entries.extend(carved);
+    Ok(())
 }
 
+/// An embedded storage's bytes, and why they are not all of it when they are not.
+type Storage = (Vec<u8>, Option<&'static str>);
+
 /// Inflate every object PowerPoint 97 embedded in its own record stream and
 /// append it.
 ///
@@ -234,20 +196,21 @@ fn append_ole10native_payloads(entries: &mut Vec<Entry>, budget: &mut Budget) {
 /// 10,752-byte compound file deflated inside one of these records, and exav's
 /// own OLE reader decompresses the module source from it once it is handed over.
 /// The value is wider than macros — *any* embedded object was unreachable.
-fn append_ppt_embedded_storages(entries: &mut Vec<Entry>, budget: &mut Budget) {
+fn append_ppt_embedded_storages(
+    entries: &mut Vec<Entry>,
+    budget: &mut Budget,
+) -> Result<(), LimitHit> {
     let mut carved: Vec<Entry> = Vec::new();
     for e in entries.iter() {
         let leaf = e.name.rsplit(['/', '\\']).next().unwrap_or(&e.name);
         if !leaf.eq_ignore_ascii_case("PowerPoint Document") {
             continue;
         }
-        for (i, (blob, why)) in ppt_embedded_storages(&e.data, budget)
+        for (i, (blob, why)) in ppt_embedded_storages(&e.data, budget)?
             .into_iter()
             .enumerate()
         {
-            if budget.count_entry().is_err() {
-                break;
-            }
+            budget.count_entry()?;
             budget.commit(blob.len() as u64);
             let mut entry = Entry::new(format!("ppt-embedded-{i}"), blob);
             entry.unsupported = why;
@@ -255,6 +218,7 @@ fn append_ppt_embedded_storages(entries: &mut Vec<Entry>, budget: &mut Budget) {
         }
     }
     entries.extend(carved);
+    Ok(())
 }
 
 /// Walk a `PowerPoint Document` record tree and return the payload of every
@@ -266,22 +230,14 @@ fn append_ppt_embedded_storages(entries: &mut Vec<Entry>, budget: &mut Budget) {
 /// how a record nested three levels down is reached at all. The instance (the
 /// high twelve bits) selects the storage form: `0` is stored, `1` is
 /// `[uncompressedSize:u32]` followed by a zlib stream.
-fn ppt_embedded_storages(
-    stream: &[u8],
-    budget: &mut Budget,
-) -> Vec<(Vec<u8>, Option<&'static str>)> {
+fn ppt_embedded_storages(stream: &[u8], budget: &mut Budget) -> Result<Vec<Storage>, LimitHit> {
     /// `RT_ExternalOleObjectStg`.
     const EXT_OLE_OBJ_STG: u16 = 0x1011;
-    /// A record tree deep enough to need more steps than this is malformed, and
-    /// bounding the walk is cheaper than reasoning about whether it can loop.
-    const MAX_RECORDS: usize = 100_000;
-
     let mut out = Vec::new();
     let mut off = 0usize;
-    for _ in 0..MAX_RECORDS {
-        let Some(hdr) = crate::bytes::at(stream, off, 8) else {
-            break;
-        };
+    // Every step moves `off` forward by a header at least, so the walk ends
+    // with the stream. It has no count of its own to stop it with records left.
+    while let Some(hdr) = crate::bytes::at(stream, off, 8) {
         let ver_instance = u16::from_le_bytes([hdr[0], hdr[1]]);
         let rec_type = u16::from_le_bytes([hdr[2], hdr[3]]);
         let len = u32::from_le_bytes([hdr[4], hdr[5], hdr[6], hdr[7]]) as usize;
@@ -290,11 +246,18 @@ fn ppt_embedded_storages(
             off += 8;
             continue;
         }
-        if rec_type == EXT_OLE_OBJ_STG {
-            if let Some(body) = crate::bytes::at(stream, off + 8, len) {
-                if let Some(blob) = ppt_storage_payload(ver_instance >> 4, body, budget) {
-                    out.push(blob);
-                }
+        if rec_type == EXT_OLE_OBJ_STG
+            && let Some(rest) = stream.get(off.saturating_add(8)..)
+        {
+            // A record that runs past the end of the stream is read as far as
+            // the stream goes, and says so.
+            let cut = len > rest.len();
+            let body = &rest[..len.min(rest.len())];
+            if let Some((blob, why)) = ppt_storage_payload(ver_instance >> 4, body, budget)? {
+                let why = why
+                    .or(cut
+                        .then_some("embedded PowerPoint storage runs past the end of its stream"));
+                out.push((blob, why));
             }
         }
         // `len` is attacker-controlled; a wrapping step would walk the stream
@@ -304,7 +267,7 @@ fn ppt_embedded_storages(
             _ => break,
         }
     }
-    out
+    Ok(out)
 }
 
 /// One storage record's bytes: stored as-is, or inflated, bounded by the
@@ -313,38 +276,39 @@ fn ppt_storage_payload(
     instance: u16,
     body: &[u8],
     budget: &mut Budget,
-) -> Option<(Vec<u8>, Option<&'static str>)> {
+) -> Result<Option<Storage>, LimitHit> {
     const OVER: &str = "embedded PowerPoint storage exceeds the per-member budget";
     const BROKEN: &str = "embedded PowerPoint storage could not be decompressed";
     const PART_WAY: &str = "embedded PowerPoint storage failed to decompress part way; \
                             the bytes before the failure were scanned";
-    let cap = budget.reserve().ok()?;
+    let cap = budget.reserve()?;
     if instance == 0 {
         // Stored. The record is the compound file.
-        return Some(if body.len() as u64 <= cap {
+        return Ok(Some(if body.len() as u64 <= cap {
             (body.to_vec(), None)
         } else {
             (Vec::new(), Some(OVER))
-        });
+        }));
     }
     // Compressed: a declared size then a zlib stream. The declared size is a
     // hint from the file, so it is not trusted for allocation — the read is
     // bounded by the budget and salvages a truncated tail, which is how a
     // deliberately-truncated object still gets scanned rather than dropped.
-    let deflated = body.get(4..)?;
-    let Some(zlib) = crate::inflate::zlib_body(deflated) else {
-        return Some((Vec::new(), Some(BROKEN)));
+    let Some(zlib) = body.get(4..).and_then(crate::inflate::zlib_body) else {
+        return Ok(Some((Vec::new(), Some(BROKEN))));
+    };
+    let Ok(s) = bounded_read_salvage(zlib, cap, true) else {
+        return Ok(Some((Vec::new(), Some(BROKEN))));
     };
-    let s = bounded_read_salvage(zlib, cap, true).ok()?;
     let why = match (s.over_cap, s.undecoded, s.data.is_empty()) {
         (true, _, _) => Some(OVER),
         (_, true, true) => Some(BROKEN),
         (_, true, false) => Some(PART_WAY),
         // Nothing decoded and nothing left undecoded: an empty storage.
-        (_, false, true) => return None,
+        (_, false, true) => return Ok(None),
         (_, false, false) => None,
     };
-    Some((s.data, why))
+    Ok(Some((s.data, why)))
 }
 
 /// The payload bytes inside an `Ole10Native` stream, or `None` when the header
@@ -459,403 +423,6 @@ fn push_artifact(entries: &mut Vec<Entry>, budget: &mut Budget, name: &str, art:
     entries.push(Entry::new(name.to_string(), art));
 }
 
-// ---------------------------------------------------------------------------
-// Lenient (fault-tolerant) Compound File Binary reader
-// ---------------------------------------------------------------------------
-//
-// Clean-room implementation of the [MS-CFB] container just far enough to
-// recover stream *contents* from a compound file whose directory red-black tree
-// is malformed (bad sibling ordering, adjacent red nodes, etc.). A strict reader
-// aborts on such files; here we ignore the tree structure entirely and walk the
-// directory sectors as a flat array of 128-byte entries, following the FAT and
-// mini-FAT sector chains to reassemble each stream. Written purely from the
-// public [MS-CFB] specification.
-
-const CFB_SIGNATURE: [u8; 8] = [0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1];
-/// Highest value that names a real sector; everything above is a sentinel
-/// (`FREESECT`/`ENDOFCHAIN`/`FATSECT`/`DIFSECT`/`NOSTREAM`).
-const CFB_MAXREGSECT: u32 = 0xFFFF_FFFA;
-
-fn le16(b: &[u8], o: usize) -> u16 {
-    u16::from_le_bytes([b[o], b[o + 1]])
-}
-fn le32(b: &[u8], o: usize) -> u32 {
-    u32::from_le_bytes([b[o], b[o + 1], b[o + 2], b[o + 3]])
-}
-fn le64(b: &[u8], o: usize) -> u64 {
-    let mut v = [0u8; 8];
-    v.copy_from_slice(&b[o..o + 8]);
-    u64::from_le_bytes(v)
-}
-
-/// Parse a Compound File Binary tolerantly, returning `(stream leaf name, bytes)`
-/// for every directory entry marked as a stream. Returns `None` if `data` is not
-/// a compound file (bad signature / too small) so the caller can report the
-/// original strict-parse error instead of masking a genuine non-OLE input.
-///
-/// `cap` bounds the bytes read for any single stream (the peak-buffer limit).
-/// Each stream comes back as `(name, bytes, truncated)`. The flag matters: the
-/// readers below stop at `cap`, and a prefix delivered as a whole stream would
-/// hide whatever sits past it.
-fn lenient_cfb_streams(data: &[u8], cap: u64) -> Option<Vec<(String, Vec<u8>, bool)>> {
-    if data.len() < 512 || data[..8] != CFB_SIGNATURE {
-        return None;
-    }
-    let sector_shift = le16(data, 30);
-    if !(7..=24).contains(&sector_shift) {
-        return None;
-    }
-    let sector_size = 1usize << sector_shift; // v3 = 512, v4 = 4096
-    let mini_shift = le16(data, 32);
-    if !(3..=12).contains(&mini_shift) {
-        return None;
-    }
-    let mini_sector_size = 1usize << mini_shift; // normally 64
-    let v4 = le16(data, 26) >= 4;
-    let first_dir = le32(data, 48);
-    let mini_cutoff = le32(data, 56) as u64; // normally 4096
-    let first_minifat = le32(data, 60);
-    let first_difat = le32(data, 68);
-
-    let entries_per_sector = sector_size / 4;
-    // Upper bound on how many sectors any chain can traverse (loop guard).
-    let max_sectors = data.len() / sector_size + 2;
-
-    let read_sector = |s: u32| -> Option<&[u8]> {
-        // Sector N begins at byte offset (N + 1) * sector_size (the header
-        // occupies the first sector regardless of version).
-        let off = (s as usize).checked_add(1)?.checked_mul(sector_size)?;
-        data.get(off..off.checked_add(sector_size)?)
-    };
-
-    // --- Assemble the DIFAT (list of FAT sector numbers) ---------------------
-    let mut fat_sectors: Vec<u32> = Vec::new();
-    for i in 0..109 {
-        let v = le32(data, 76 + i * 4);
-        if v <= CFB_MAXREGSECT {
-            fat_sectors.push(v);
-        }
-    }
-    let mut difat = first_difat;
-    let mut guard = 0;
-    while difat <= CFB_MAXREGSECT && guard < max_sectors {
-        guard += 1;
-        let Some(sec) = read_sector(difat) else { break };
-        for i in 0..entries_per_sector - 1 {
-            let v = le32(sec, i * 4);
-            if v <= CFB_MAXREGSECT {
-                fat_sectors.push(v);
-            }
-        }
-        difat = le32(sec, (entries_per_sector - 1) * 4);
-        if fat_sectors.len() > max_sectors {
-            break;
-        }
-    }
-
-    // --- Build the FAT -------------------------------------------------------
-    let mut fat: Vec<u32> = Vec::with_capacity(crate::cap_prealloc(
-        fat_sectors.len().saturating_mul(entries_per_sector),
-    ));
-    for &fs in &fat_sectors {
-        match read_sector(fs) {
-            Some(sec) => {
-                for i in 0..entries_per_sector {
-                    fat.push(le32(sec, i * 4));
-                }
-            }
-            None => break,
-        }
-    }
-    if fat.is_empty() {
-        return None;
-    }
-
-    // Follow a FAT sector chain, bounded to avoid cycles on corrupt tables.
-    let follow = |start: u32| -> Vec<u32> {
-        let mut out = Vec::new();
-        let mut cur = start;
-        while cur <= CFB_MAXREGSECT && (cur as usize) < fat.len() && out.len() < max_sectors {
-            out.push(cur);
-            cur = fat[cur as usize];
-        }
-        out
-    };
-    let read_fat_stream = |start: u32, size: u64| -> Vec<u8> {
-        let need = size.min(cap) as usize;
-        let mut out = Vec::with_capacity(need.min(1 << 20));
-        for s in follow(start) {
-            if out.len() >= need {
-                break;
-            }
-            if let Some(sec) = read_sector(s) {
-                let take = sec.len().min(need - out.len());
-                out.extend_from_slice(&sec[..take]);
-            }
-        }
-        out.truncate(need);
-        out
-    };
-
-    // --- Directory sectors (flat array of 128-byte entries) ------------------
-    let mut dir = Vec::new();
-    for s in follow(first_dir) {
-        if let Some(sec) = read_sector(s) {
-            dir.extend_from_slice(sec);
-        }
-    }
-    let n_entries = dir.len() / 128;
-    if n_entries == 0 {
-        return None;
-    }
-
-    // Root entry (object type 5) anchors the mini stream.
-    let mut root = None;
-    let mut root_start = 0u32;
-    let mut root_size = 0u64;
-    for i in 0..n_entries {
-        let e = &dir[i * 128..i * 128 + 128];
-        if e[66] == 5 {
-            root = Some(i);
-            root_start = le32(e, 116);
-            root_size = if v4 {
-                le64(e, 120)
-            } else {
-                le32(e, 120) as u64
-            };
-            break;
-        }
-    }
-
-    // Each entry's path, from the tree: a storage's child and that child's
-    // siblings are its members. The sibling order the strict reader refuses
-    // does not matter here, and the VBA project is found by its `VBA` storage.
-    // An entry the walk does not reach keeps its bare name.
-    let entry_name = |i: usize| {
-        let e = &dir[i * 128..i * 128 + 128];
-        cfb_entry_name(&e[..64], le16(e, 64) as usize)
-    };
-    let mut paths: Vec<Option<String>> = vec![None; n_entries];
-    let mut seen = vec![false; n_entries];
-    let mut storages = Vec::new();
-    if let Some(r) = root {
-        seen[r] = true;
-        storages.push((r, String::new()));
-    }
-    while let Some((storage, base)) = storages.pop() {
-        let mut members = vec![le32(&dir[storage * 128..storage * 128 + 128], 76)];
-        while let Some(m) = members.pop() {
-            let m = m as usize;
-            if m >= n_entries || seen[m] {
-                continue;
-            }
-            seen[m] = true;
-            let e = &dir[m * 128..m * 128 + 128];
-            members.extend([le32(e, 68), le32(e, 72)]);
-            let path = format!("{base}/{}", entry_name(m));
-            if e[66] == 1 {
-                storages.push((m, path.clone()));
-            }
-            paths[m] = Some(path);
-        }
-    }
-    let mini_stream = read_fat_stream(root_start, root_size);
-
-    // --- Mini-FAT ------------------------------------------------------------
-    let mut minifat: Vec<u32> = Vec::new();
-    for s in follow(first_minifat) {
-        if let Some(sec) = read_sector(s) {
-            for i in 0..entries_per_sector {
-                minifat.push(le32(sec, i * 4));
-            }
-        }
-        if minifat.len() > max_sectors * entries_per_sector {
-            break;
-        }
-    }
-    let read_mini_stream = |start: u32, size: u64| -> Vec<u8> {
-        let need = size.min(cap) as usize;
-        let mut out = Vec::with_capacity(need.min(1 << 16));
-        let mut cur = start;
-        let mut steps = 0;
-        while cur <= CFB_MAXREGSECT && (cur as usize) < minifat.len() && out.len() < need {
-            steps += 1;
-            if steps > minifat.len() + 1 {
-                break; // cycle guard
-            }
-            let off = (cur as usize) * mini_sector_size;
-            if let Some(chunk) = crate::bytes::at(&mini_stream, off, mini_sector_size) {
-                let take = chunk.len().min(need - out.len());
-                out.extend_from_slice(&chunk[..take]);
-            }
-            cur = minifat[cur as usize];
-        }
-        out.truncate(need);
-        out
-    };
-
-    // --- Collect every stream entry ------------------------------------------
-    let mut streams = Vec::new();
-    for i in 0..n_entries {
-        let e = &dir[i * 128..i * 128 + 128];
-        if e[66] != 2 {
-            continue; // only streams (2); skip storage (1)/root (5)/unallocated (0)
-        }
-        let name_len = le16(e, 64) as usize;
-        let name = cfb_entry_name(&e[..64], name_len);
-        if name.is_empty() {
-            // A nameless stream entry (malformed directory). Its sectors are
-            // stored UNCOMPRESSED inside this same file, so the caller's raw
-            // pattern scan already covers those bytes — skipping the member here
-            // loses the name/size metadata for `.cdb` matching, not the content,
-            // so nothing goes unscanned by skipping it here.
-            continue;
-        }
-        let start = le32(e, 116);
-        let size = if v4 {
-            le64(e, 120)
-        } else {
-            le32(e, 120) as u64
-        };
-        let bytes = if size < mini_cutoff {
-            read_mini_stream(start, size)
-        } else {
-            read_fat_stream(start, size)
-        };
-        // Both readers stop at `cap`. A stream the directory declares larger
-        // than that was cut by the budget, and the caller has to be told,
-        // because a prefix handed over as a whole stream is a payload past the
-        // cap that nothing ever scanned and nothing ever reported. One that
-        // comes back short of a size within the cap has a sector chain that
-        // ends early: there is nothing more of it in the file to read.
-        let truncated = size > cap && (bytes.len() as u64) < size;
-        streams.push((paths[i].take().unwrap_or(name), bytes, truncated));
-        if streams.len() >= 4096 {
-            break;
-        }
-    }
-    if streams.is_empty() {
-        return None;
-    }
-    Some(streams)
-}
-
-/// Decode a directory entry name: `name_len` bytes of UTF-16LE from a 64-byte
-/// field, including the terminating NUL (so the character count is
-/// `name_len / 2 - 1`).
-fn cfb_entry_name(raw: &[u8], name_len: usize) -> String {
-    let chars = (name_len / 2).saturating_sub(1).min(32);
-    let mut u16s = Vec::with_capacity(chars);
-    for i in 0..chars {
-        u16s.push(le16(raw, i * 2));
-    }
-    String::from_utf16_lossy(&u16s)
-}
-
-/// Build the OLE [`Entry`] list from an already-extracted stream set (each a leaf
-/// name with its raw bytes). Mirrors the tail of [`collect_ole_entries`] but
-/// operates purely in memory, so it serves the lenient fallback path. Handles MSI
-/// name decompression, OOXML/legacy encryption detection + decryption, and VBA/XLM
-/// macro artifacts.
-fn assemble_ole_entries(
-    streams: Vec<(String, Vec<u8>, bool)>,
-    total_len: u64,
-    budget: &mut Budget,
-) -> Result<Vec<Entry>, LimitHit> {
-    let leaf = |n: &str| -> String { n.rsplit(['/', '\\']).next().unwrap_or(n).to_string() };
-    let find = |want: &str| -> Option<&Vec<u8>> {
-        streams
-            .iter()
-            .find(|(n, _, _)| leaf(n).eq_ignore_ascii_case(want))
-            .map(|(_, d, _)| d)
-    };
-
-    let msi = streams.iter().any(|(n, _, _)| {
-        let d = decompress_msi_name(&leaf(n));
-        d == "_Tables" || d == "!_Tables"
-    });
-
-    // OOXML encrypted container: decrypt the standard scheme or surface an
-    // encrypted member — never a silent clean.
-    #[cfg_attr(not(feature = "decrypt"), allow(unused_variables))]
-    if let (Some(info), Some(pkg)) = (find("EncryptionInfo"), find("EncryptedPackage")) {
-        #[cfg(feature = "decrypt")]
-        let decrypted = super::ole_crypto::try_decrypt_ooxml(
-            info.as_slice(),
-            pkg.as_slice(),
-            &budget.passwords,
-        );
-        #[cfg(not(feature = "decrypt"))]
-        let decrypted: Option<Vec<u8>> = None;
-        budget.count_entry()?;
-        return match decrypted {
-            Some(zip) => {
-                budget.commit(zip.len() as u64);
-                Ok(vec![Entry::new("EncryptedPackage.zip".to_string(), zip)])
-            }
-            None => Ok(vec![Entry::unsupported(
-                "EncryptedPackage".to_string(),
-                total_len,
-                true,
-                "encrypted Office document",
-            )]),
-        };
-    }
-
-    let mut entries = Vec::new();
-    for (name, data, truncated) in streams {
-        budget.count_entry()?;
-        let (buf, was_decrypted) = match legacy_encryption(&name, data, budget) {
-            Legacy::Plain(b) => (b, false),
-            Legacy::Decrypted(b) => (b, true),
-            Legacy::Locked => {
-                entries.push(Entry::unsupported(
-                    name,
-                    total_len,
-                    true,
-                    "encrypted Office document",
-                ));
-                continue;
-            }
-        };
-        let cap = budget.reserve()?;
-        if buf.len() as u64 > cap {
-            return Err(LimitHit::new("ole stream exceeds budget".to_string()));
-        }
-        budget.commit(buf.len() as u64);
-        let out_name = if msi {
-            decompress_msi_name(&leaf(&name))
-        } else {
-            name.clone()
-        };
-        // A stream the reader had to cut short is reported alongside the part
-        // that fits, the same way an over-budget safetensors header is. Handing
-        // back only the prefix would let a payload past the cap go unscanned
-        // with nothing said about it.
-        if truncated {
-            entries.push(Entry::unsupported(
-                out_name.clone(),
-                buf.len() as u64,
-                false,
-                "stream exceeds the per-member size budget; only its head was read",
-            ));
-        }
-        // Decrypted streams stay marked encrypted — same rule as the strict path
-        // above, applied here too because the lenient fallback is the one a
-        // malformed compound file actually takes.
-        let mut entry = Entry::new(out_name, buf);
-        entry.encrypted = was_decrypted;
-        entries.push(entry);
-    }
-
-    append_ole10native_payloads(&mut entries, budget);
-    // Before the macro pass: an embedded storage can itself hold the VBA
-    // project, and the artifacts are synthesised from whatever is present.
-    append_ppt_embedded_storages(&mut entries, budget);
-    append_macro_artifacts(&mut entries, budget);
-    Ok(entries)
-}
-
 /// A stream after the legacy `.doc`/`.xls` encryption check.
 enum Legacy {
     Plain(Vec<u8>),
@@ -886,10 +453,9 @@ fn legacy_encryption(path: &str, data: Vec<u8>, budget: &Budget) -> Legacy {
         return Legacy::Plain(data);
     }
     #[cfg(feature = "decrypt")]
-    if is_excel {
-        if let Some(dec) = super::ole_crypto::try_decrypt_workbook(&data, &budget.passwords) {
-            return Legacy::Decrypted(dec);
-        }
+    if is_excel && let Some(dec) = super::ole_crypto::try_decrypt_workbook(&data, &budget.passwords)
+    {
+        return Legacy::Decrypted(dec);
     }
     #[cfg(not(feature = "decrypt"))]
     let _ = budget;
@@ -922,14 +488,10 @@ fn xls_has_filepass(head: &[u8]) -> bool {
 
 /// Check if an OLE2 compound file is an MSI database by testing whether any
 /// stream name decompresses to `_Tables` (WiX uses `!_Tables` prefix).
-fn is_msi_database(paths: &[std::path::PathBuf]) -> bool {
-    paths.iter().any(|p| {
-        p.file_name()
-            .map(|s| {
-                let d = decompress_msi_name(&s.to_string_lossy());
-                d == "_Tables" || d == "!_Tables"
-            })
-            .unwrap_or(false)
+fn is_msi_database(streams: &[cfb::StreamInfo<'_>]) -> bool {
+    streams.iter().any(|s| {
+        let d = decompress_msi_name(s.name);
+        d == "_Tables" || d == "!_Tables"
     })
 }
 
@@ -1063,13 +625,13 @@ mod macro_artifact_tests {
         let mut b = Budget::new(Limits::default());
 
         let intact = compressed(b"storage");
-        let got = ppt_storage_payload(1, &intact, &mut b).unwrap();
+        let got = ppt_storage_payload(1, &intact, &mut b).unwrap().unwrap();
         assert_eq!(got, (b"storage".to_vec(), None));
 
         let mut bad_adler = intact.clone();
         let n = bad_adler.len();
         bad_adler[n - 1] ^= 1;
-        let got = ppt_storage_payload(1, &bad_adler, &mut b).unwrap();
+        let got = ppt_storage_payload(1, &bad_adler, &mut b).unwrap().unwrap();
         assert_eq!(got, (b"storage".to_vec(), None));
 
         // Damaged after a long run of content: that run, and a reason.
@@ -1080,18 +642,22 @@ mod macro_artifact_tests {
         let mut damaged = vec![0, 0, 0, 0, 0x78, 0x9c];
         damaged.extend_from_slice(e.get_ref());
         damaged.extend_from_slice(&[0x06, 0x5a, 0x5a]);
-        let (data, why) = ppt_storage_payload(1, &damaged, &mut b).unwrap();
+        let (data, why) = ppt_storage_payload(1, &damaged, &mut b).unwrap().unwrap();
         assert_eq!(data, content);
         assert!(why.is_some_and(|w| w.contains("part way")), "{why:?}");
 
-        let (data, why) = ppt_storage_payload(1, b"\0\0\0\0not zlib", &mut b).unwrap();
+        let (data, why) = ppt_storage_payload(1, b"\0\0\0\0not zlib", &mut b)
+            .unwrap()
+            .unwrap();
         assert!(data.is_empty() && why.is_some());
 
         let mut small = Budget::new(Limits {
             max_buffer_bytes: 4,
             ..Limits::default()
         });
-        let (data, why) = ppt_storage_payload(0, b"stored storage", &mut small).unwrap();
+        let (data, why) = ppt_storage_payload(0, b"stored storage", &mut small)
+            .unwrap()
+            .unwrap();
         assert!(data.is_empty() && why.is_some());
     }
 
diff --git a/crates/exav-unpack/src/formats/ole_crypto.rs b/crates/exav-unpack/src/formats/ole_crypto.rs
index 0fbdc03d..c33eaa9d 100644
--- a/crates/exav-unpack/src/formats/ole_crypto.rs
+++ b/crates/exav-unpack/src/formats/ole_crypto.rs
@@ -19,19 +19,9 @@
 //! `EncryptedPackage` compound file here and scans the recovered `.zip`; a
 //! document that still won't open is reported password-protected, never clean.
 
-use md5::{Digest, Md5};
-use sha1::Sha1;
+use sha1::{Digest, Sha1};
 
-/// Passwords exav tries automatically on an encrypted Office document before
-/// giving up and reporting it password-protected: the Excel default (opens with
-/// no prompt, the common malware trick) and the empty password.
-pub(crate) const DEFAULT_OFFICE_PASSWORDS: &[&str] = &["VelvetSweatshop", ""];
-
-fn md5(data: &[u8]) -> [u8; 16] {
-    let mut h = Md5::new();
-    h.update(data);
-    h.finalize().into()
-}
+use super::offcrypto::DEFAULT_PASSWORDS as DEFAULT_OFFICE_PASSWORDS;
 
 fn sha1(data: &[u8]) -> [u8; 20] {
     let mut h = Sha1::new();
@@ -43,453 +33,18 @@ fn utf16le(s: &str) -> Vec<u8> {
     s.encode_utf16().flat_map(u16::to_le_bytes).collect()
 }
 
-/// RC4 stream cipher (symmetric: the same routine decrypts and encrypts).
-fn rc4(key: &[u8], data: &[u8]) -> Vec<u8> {
-    let mut s: [u8; 256] = std::array::from_fn(|i| i as u8);
-    let mut j = 0usize;
-    for i in 0..256 {
-        j = (j + s[i] as usize + key[i % key.len()] as usize) & 0xff;
-        s.swap(i, j);
-    }
-    let (mut i, mut j) = (0usize, 0usize);
-    let mut out = Vec::with_capacity(data.len());
-    for &b in data {
-        i = (i + 1) & 0xff;
-        j = (j + s[i] as usize) & 0xff;
-        s.swap(i, j);
-        let k = s[(s[i] as usize + s[j] as usize) & 0xff];
-        out.push(b ^ k);
-    }
-    out
-}
-
-/// The RC4 key schedule for a password, in one of the two legacy schemes.
-enum KeyDeriver {
-    /// RC4 basic ([MS-OFFCRYPTO] §2.3.6.2): MD5-based, 5-byte intermediate.
-    Basic([u8; 5]),
-    /// RC4-CryptoAPI ([MS-OFFCRYPTO] §2.3.5.2): SHA-1-based, `key_bytes`-long key.
-    CryptoApi { h0: [u8; 20], key_bytes: usize },
-}
-
-impl KeyDeriver {
-    fn basic(salt: &[u8], pw: &str) -> Self {
-        let h0 = md5(&utf16le(pw));
-        let mut buf = Vec::with_capacity(21 * 16);
-        for _ in 0..16 {
-            buf.extend_from_slice(&h0[..5]);
-            buf.extend_from_slice(salt);
-        }
-        let h1 = md5(&buf);
-        let mut inter = [0u8; 5];
-        inter.copy_from_slice(&h1[..5]);
-        KeyDeriver::Basic(inter)
-    }
-
-    fn cryptoapi(salt: &[u8], pw: &str, key_bits: u32) -> Self {
-        let mut m = Vec::with_capacity(salt.len() + pw.len() * 2);
-        m.extend_from_slice(salt);
-        m.extend_from_slice(&utf16le(pw));
-        // A zero KeySize means the 40-bit default.
-        let key_bytes = if key_bits == 0 {
-            5
-        } else {
-            (key_bits / 8) as usize
-        };
-        KeyDeriver::CryptoApi {
-            h0: sha1(&m),
-            key_bytes,
-        }
-    }
-
-    /// Per-block RC4 key; the stream is re-keyed every 1024 bytes.
-    fn block_key(&self, block: u32) -> Vec<u8> {
-        match self {
-            KeyDeriver::Basic(inter) => {
-                let mut kd = [0u8; 9];
-                kd[..5].copy_from_slice(inter);
-                kd[5..].copy_from_slice(&block.to_le_bytes());
-                md5(&kd).to_vec()
-            }
-            KeyDeriver::CryptoApi { h0, key_bytes } => {
-                let mut kd = Vec::with_capacity(24);
-                kd.extend_from_slice(h0);
-                kd.extend_from_slice(&block.to_le_bytes());
-                let hf = sha1(&kd);
-                if *key_bytes <= 5 {
-                    // 40-bit: 5 real key bytes zero-padded to a 16-byte RC4 key.
-                    let mut k = vec![0u8; 16];
-                    k[..5].copy_from_slice(&hf[..5]);
-                    k
-                } else {
-                    hf[..(*key_bytes).min(hf.len())].to_vec()
-                }
-            }
-        }
-    }
-
-    /// The verifier hash: MD5 for basic, SHA-1 for CryptoAPI.
-    fn hash(&self, data: &[u8]) -> Vec<u8> {
-        match self {
-            KeyDeriver::Basic(_) => md5(data).to_vec(),
-            KeyDeriver::CryptoApi { .. } => sha1(data).to_vec(),
-        }
-    }
-}
-
-/// The parameters parsed from a `FilePass` record.
-struct FilePass {
-    salt: Vec<u8>,
-    enc_verifier: Vec<u8>,
-    enc_vhash: Vec<u8>,
-    /// `None` = RC4 basic; `Some(key_bits)` = RC4-CryptoAPI.
-    cryptoapi_key_bits: Option<u32>,
-}
-
-impl FilePass {
-    fn deriver(&self, pw: &str) -> KeyDeriver {
-        match self.cryptoapi_key_bits {
-            None => KeyDeriver::basic(&self.salt, pw),
-            Some(bits) => KeyDeriver::cryptoapi(&self.salt, pw, bits),
-        }
-    }
-
-    /// [MS-OFFCRYPTO] §2.3.6.3 / §2.3.5.6: the block-0 keystream decrypts the
-    /// 16-byte verifier followed continuously by its hash; the password is
-    /// correct when `H(verifier) == verifierHash`.
-    fn password_ok(&self, pw: &str) -> bool {
-        if self.enc_verifier.len() != 16 || self.enc_vhash.is_empty() {
-            return false;
-        }
-        let d = self.deriver(pw);
-        let mut blob = Vec::with_capacity(self.enc_verifier.len() + self.enc_vhash.len());
-        blob.extend_from_slice(&self.enc_verifier);
-        blob.extend_from_slice(&self.enc_vhash);
-        let dec = rc4(&d.block_key(0), &blob);
-        d.hash(&dec[..16]) == dec[16..]
-    }
-}
-
-/// Parse the `FilePass` record (BIFF record `0x2F`) that must follow `BOF` at the
-/// start of an encrypted `Workbook`/`Book` stream. Handles RC4 basic (version
-/// major 1) and RC4-CryptoAPI (major ≥ 2); XOR obfuscation (`wEncryptionType 0`)
-/// is left for the detect-only path.
-fn parse_filepass(stream: &[u8]) -> Option<FilePass> {
-    if stream.len() < 4 {
-        return None;
-    }
-    let bof_size = u16::from_le_bytes([stream[2], stream[3]]) as usize;
-    let fp = 4 + bof_size;
-    let body = fp + 4;
-    if body > stream.len() || u16::from_le_bytes([stream[fp], stream[fp + 1]]) != 0x2f {
-        return None;
-    }
-    let size = u16::from_le_bytes([stream[fp + 2], stream[fp + 3]]) as usize;
-    let rec = crate::bytes::at(stream, body, size)?;
-    if rec.len() < 6 || u16::from_le_bytes([rec[0], rec[1]]) != 1 {
-        return None; // XOR obfuscation or none
-    }
-    let major = u16::from_le_bytes([rec[2], rec[3]]);
-    if major == 1 {
-        // RC4 basic: salt(16) ‖ encVerifier(16) ‖ encVerifierHash(16).
-        let v = rec.get(6..54)?;
-        Some(FilePass {
-            salt: v[0..16].to_vec(),
-            enc_verifier: v[16..32].to_vec(),
-            enc_vhash: v[32..48].to_vec(),
-            cryptoapi_key_bits: None,
-        })
-    } else {
-        // RC4-CryptoAPI: Flags(4) HeaderSize(4) EncryptionHeader{…KeySize@16…}
-        // then EncryptionVerifier{SaltSize(4) Salt EncVerifier(16) HashSize(4) Hash}.
-        let hdr_meta = rec.get(6..14)?;
-        let header_size = u32::from_le_bytes(hdr_meta[4..8].try_into().ok()?) as usize;
-        let header = crate::bytes::at(rec, 14, header_size)?;
-        let key_bits = u32::from_le_bytes(header.get(16..20)?.try_into().ok()?);
-        let v = rec.get(14usize.checked_add(header_size)?..)?;
-        let salt_size = u32::from_le_bytes(v.get(0..4)?.try_into().ok()?) as usize;
-        let salt = crate::bytes::at(v, 4, salt_size)?.to_vec();
-        let ev_off = 4usize.checked_add(salt_size)?;
-        let enc_verifier = crate::bytes::at(v, ev_off, 16)?.to_vec();
-        let vh = ev_off.checked_add(16)?;
-        let vhash_size = u32::from_le_bytes(crate::bytes::at(v, vh, 4)?.try_into().ok()?) as usize;
-        let enc_vhash = crate::bytes::at(v, vh.checked_add(4)?, vhash_size)?.to_vec();
-        Some(FilePass {
-            salt,
-            enc_verifier,
-            enc_vhash,
-            cryptoapi_key_bits: Some(key_bits),
-        })
-    }
-}
-
-// Record IDs whose *data* stays in cleartext ([MS-OFFCRYPTO] §2.3.6.1): BOF,
-// FilePass, UsrExcl, FileLock, InterfaceHdr, RRDInfo, RRDHead.
-const EXEMPT: &[u16] = &[0x0809, 0x002f, 0x0194, 0x0195, 0x00e1, 0x0196, 0x0138];
-// BoundSheet8: its 4-byte `lbPlyPos` (right after the header) also stays cleartext.
-const BOUNDSHEET8: u16 = 0x0085;
-const BLOCK: usize = 1024;
-
-/// Decrypt a whole `Workbook`/`Book` stream in place following the BIFF record
-/// structure: record headers stay cleartext, exempt records' data stays
-/// cleartext, and every other record's data is RC4-decrypted, while the cipher
-/// position advances continuously over the cleartext regions (re-keyed each
-/// 1024-byte block). See [MS-OFFCRYPTO] §2.3.6.1.
-fn decrypt_workbook(stream: &[u8], deriver: &KeyDeriver) -> Vec<u8> {
-    // `cipher_in` is the same length as the stream: cleartext positions are zero
-    // (so the cipher still advances over them) and encrypted positions carry the
-    // real bytes. `plain[pos] = Some(byte)` overlays the cleartext afterwards.
-    let mut cipher_in = vec![0u8; stream.len()];
-    let mut plain: Vec<Option<u8>> = vec![None; stream.len()];
-    let mut p = 0usize;
-    while p + 4 <= stream.len() {
-        let num = u16::from_le_bytes([stream[p], stream[p + 1]]);
-        let size = u16::from_le_bytes([stream[p + 2], stream[p + 3]]) as usize;
-        let dstart = p + 4;
-        let dend = (dstart + size).min(stream.len());
-        // Record header is always cleartext.
-        for k in 0..4.min(stream.len() - p) {
-            plain[p + k] = Some(stream[p + k]);
-        }
-        if num == 0x2f {
-            // FilePass: neutralise the type to 0 but keep the size field; zero data.
-            plain[p] = Some(0);
-            plain[p + 1] = Some(0);
-            for pos in plain.iter_mut().take(dend).skip(dstart) {
-                *pos = Some(0);
-            }
-        } else if EXEMPT.contains(&num) {
-            for k in dstart..dend {
-                plain[k] = Some(stream[k]);
-            }
-        } else if num == BOUNDSHEET8 {
-            for k in dstart..(dstart + 4).min(dend) {
-                plain[k] = Some(stream[k]); // lbPlyPos stays cleartext
-            }
-            let s = (dstart + 4).min(dend);
-            cipher_in[s..dend].copy_from_slice(&stream[s..dend]);
-        } else {
-            cipher_in[dstart..dend].copy_from_slice(&stream[dstart..dend]);
-        }
-        p = dend;
-    }
-    // RC4 the buffer, re-keying every 1024 bytes.
-    let mut out = Vec::with_capacity(stream.len());
-    for (b, chunk) in cipher_in.chunks(BLOCK).enumerate() {
-        out.extend_from_slice(&rc4(&deriver.block_key(b as u32), chunk));
-    }
-    // Overlay the cleartext skeleton.
-    for (pos, &pb) in plain.iter().enumerate() {
-        if let Some(byte) = pb {
-            out[pos] = byte;
-        }
-    }
-    out
-}
-
-/// Try to decrypt an encrypted BIFF8 `Workbook`/`Book` stream with the caller's
-/// password pool plus exav's [`DEFAULT_OFFICE_PASSWORDS`]. Handles the RC4 schemes
-/// (basic / CryptoAPI) and the legacy XOR obfuscation (`wEncryptionType == 0`).
-/// Returns the decrypted stream on the first password that verifies, or `None`
-/// if the scheme is unhandled or no password matched (the caller then reports
-/// password-protected, never a silent clean).
+/// An encrypted BIFF `Workbook`/`Book` stream decrypted with the caller's
+/// password pool plus the default passwords ([`DEFAULT_OFFICE_PASSWORDS`]), by
+/// [`offcrypto`](super::offcrypto): `None` if the scheme is not handled or no
+/// password matched (the caller then reports password-protected, never a silent
+/// clean).
 pub(crate) fn try_decrypt_workbook(stream: &[u8], passwords: &[String]) -> Option<Vec<u8>> {
     let candidates: Vec<&str> = passwords
         .iter()
         .map(String::as_str)
         .chain(DEFAULT_OFFICE_PASSWORDS.iter().copied())
         .collect();
-    // RC4 basic / CryptoAPI (wEncryptionType == 1).
-    if let Some(fp) = parse_filepass(stream) {
-        for pw in &candidates {
-            if fp.password_ok(pw) {
-                return Some(decrypt_workbook(stream, &fp.deriver(pw)));
-            }
-        }
-        return None;
-    }
-    // Legacy XOR obfuscation (wEncryptionType == 0).
-    if let Some(verifier) = parse_filepass_xor(stream) {
-        for pw in &candidates {
-            if xor_verify_password(pw, verifier) {
-                return Some(decrypt_workbook_xor(stream, pw));
-            }
-        }
-    }
-    None
-}
-
-// ─────────────────── BIFF XOR obfuscation ([MS-OFFCRYPTO] §2.3.7) ───────────────
-//
-// The legacy `wEncryptionType == 0` scheme obfuscates each record's data with a
-// 16-byte array derived from the password (`ROR(byte ^ pad, 5)` per byte), with
-// the same cleartext-exempt records as the RC4 path. Clean-room from the public
-// [MS-OFFCRYPTO] §2.3.7 tables/algorithms, cross-checked against the MIT
-// msoffcrypto reference vectors.
-
-#[rustfmt::skip]
-const XOR_PAD: [u8; 15] = [
-    0xBB, 0xFF, 0xFF, 0xBA, 0xFF, 0xFF, 0xB9, 0x80,
-    0x00, 0xBE, 0x0F, 0x00, 0xBF, 0x0F, 0x00,
-];
-#[rustfmt::skip]
-const XOR_INITIAL: [u16; 15] = [
-    0xE1F0, 0x1D0F, 0xCC9C, 0x84C0, 0x110C, 0x0E10, 0xF1CE, 0x313E,
-    0x1872, 0xE139, 0xD40F, 0x84F9, 0x280C, 0xA96A, 0x4EC3,
-];
-#[rustfmt::skip]
-const XOR_MATRIX: [u16; 105] = [
-    0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09, 0x7B61, 0xF6C2, 0xFDA5,
-    0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF, 0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68,
-    0x5AD0, 0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40, 0xD849, 0xA0B3,
-    0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5, 0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496,
-    0x390D, 0x721A, 0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9, 0x47D3,
-    0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0, 0xB861, 0x60E3, 0xC1C6, 0x93AD,
-    0x377B, 0x6EF6, 0xDDEC, 0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10,
-    0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168, 0x76B4, 0xED68, 0xCAF1,
-    0x85C3, 0x1BA7, 0x374E, 0x6E9C, 0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6,
-    0x1DAD, 0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC, 0x1021, 0x2042,
-    0x4084, 0x8108, 0x1231, 0x2462, 0x48C4,
-];
-
-/// `ROR(b1 ^ b2, 1)` over 8 bits: the per-element mixing of the XOR array.
-fn xor_ror(b1: u8, b2: u8) -> u8 {
-    (b1 ^ b2).rotate_right(1)
-}
-
-/// [MS-OFFCRYPTO] §2.3.7.1 password verifier derivation. `true` if `pw` matches
-/// the stored `verification_bytes`.
-fn xor_verify_password(pw: &str, verification_bytes: u16) -> bool {
-    let bytes = pw.as_bytes();
-    if bytes.is_empty() || bytes.len() > 15 {
-        return false;
-    }
-    let mut arr: Vec<u16> = Vec::with_capacity(bytes.len() + 1);
-    arr.push(bytes.len() as u16);
-    arr.extend(bytes.iter().map(|&b| b as u16));
-    arr.reverse();
-    let mut verifier: u16 = 0;
-    for b in arr {
-        let i1 = if verifier & 0x4000 == 0 { 0 } else { 1 };
-        let i2 = verifier.wrapping_mul(2) & 0x7FFF;
-        verifier = (i1 ^ i2) ^ b;
-    }
-    (verifier ^ 0xCE4B) == verification_bytes
-}
-
-/// [MS-OFFCRYPTO] §2.3.7.2 `CreateXorKey_Method1`.
-fn xor_create_key(pw: &[u8]) -> u16 {
-    let mut xor_key = XOR_INITIAL[pw.len() - 1];
-    let mut current_element: i32 = 0x68;
-    for &ch in pw.iter().rev() {
-        let mut c = ch;
-        for _ in 0..7 {
-            if c & 0x40 != 0 {
-                xor_key ^= XOR_MATRIX[current_element as usize];
-            }
-            c <<= 1;
-            current_element -= 1;
-        }
-    }
-    xor_key
-}
-
-/// [MS-OFFCRYPTO] §2.3.7.2 `CreateXorArray_Method1`: the 16-byte obfuscation
-/// array. `None` if the password length isn't 1..=15 (the scheme's range).
-fn xor_create_array(pw: &str) -> Option<[u8; 16]> {
-    let pw = pw.as_bytes();
-    if pw.is_empty() || pw.len() > 15 {
-        return None;
-    }
-    let xor_key = xor_create_key(pw);
-    let hi = (xor_key >> 8) as u8;
-    let lo = (xor_key & 0xFF) as u8;
-    let mut obf = [0u8; 16];
-    let mut index = pw.len();
-
-    if index % 2 == 1 {
-        obf[index] = xor_ror(XOR_PAD[0], hi);
-        index -= 1;
-        obf[index] = xor_ror(pw[pw.len() - 1], lo);
-    }
-    while index > 0 {
-        index -= 1;
-        obf[index] = xor_ror(pw[index], hi);
-        index -= 1;
-        obf[index] = xor_ror(pw[index], lo);
-    }
-
-    let mut index = 15usize;
-    let mut pad_index = 15 - pw.len();
-    while pad_index > 0 {
-        obf[index] = xor_ror(XOR_PAD[pad_index], hi);
-        index -= 1;
-        pad_index -= 1;
-        obf[index] = xor_ror(XOR_PAD[pad_index], lo);
-        // An odd count of pad bytes ends here, one step short of two.
-        index = index.saturating_sub(1);
-        pad_index = pad_index.saturating_sub(1);
-    }
-    Some(obf)
-}
-
-/// Locate the `FilePass` record and, if it is the XOR scheme
-/// (`wEncryptionType == 0`), return its 16-bit `verificationBytes`.
-fn parse_filepass_xor(stream: &[u8]) -> Option<u16> {
-    if stream.len() < 4 {
-        return None;
-    }
-    let bof_size = u16::from_le_bytes([stream[2], stream[3]]) as usize;
-    let fp = 4 + bof_size;
-    let body = fp + 4;
-    if body > stream.len() || u16::from_le_bytes([stream[fp], stream[fp + 1]]) != 0x2f {
-        return None;
-    }
-    let size = u16::from_le_bytes([stream[fp + 2], stream[fp + 3]]) as usize;
-    let rec = crate::bytes::at(stream, body, size)?;
-    // XORObfuscation: wEncryptionType(2)=0, Key(2), VerificationBytes(2).
-    if rec.len() < 6 || u16::from_le_bytes([rec[0], rec[1]]) != 0 {
-        return None;
-    }
-    Some(u16::from_le_bytes([rec[4], rec[5]]))
-}
-
-/// Decrypt a BIFF `Workbook`/`Book` stream obfuscated with the XOR scheme
-/// ([MS-OFFCRYPTO] §2.3.7.3 `DecryptData_Method1`). Record headers and the
-/// cleartext-exempt records (BOF/FilePass/… and BoundSheet8's `lbPlyPos`) stay
-/// verbatim; every other record's data is de-obfuscated `ROR(byte ^ pad, 5)`,
-/// with the array index seeded from the record's end offset in the stream.
-fn decrypt_workbook_xor(stream: &[u8], password: &str) -> Vec<u8> {
-    let Some(arr) = xor_create_array(password) else {
-        return stream.to_vec();
-    };
-    let mut out = stream.to_vec();
-    // De-obfuscate one encrypted run: `idx0` seeds the array position.
-    let deobf = |out: &mut [u8], start: usize, end: usize, idx0: usize| {
-        let mut idx = idx0 % 16;
-        for k in start..end {
-            out[k] = (stream[k] ^ arr[idx]).rotate_right(5);
-            idx = (idx + 1) % 16;
-        }
-    };
-    let mut p = 0usize;
-    while p + 4 <= stream.len() {
-        let num = u16::from_le_bytes([stream[p], stream[p + 1]]);
-        let size = u16::from_le_bytes([stream[p + 2], stream[p + 3]]) as usize;
-        let dstart = p + 4;
-        let dend = (dstart + size).min(stream.len());
-        if EXEMPT.contains(&num) {
-            // header + data stay cleartext (already copied)
-        } else if num == BOUNDSHEET8 {
-            // lbPlyPos (first 4 data bytes) stays cleartext; the rest is a run
-            // whose seed carries the +4 offset the spec applies to it.
-            let run = (dstart + 4).min(dend);
-            deobf(&mut out, run, dend, dend + 4);
-        } else {
-            deobf(&mut out, dstart, dend, dend);
-        }
-        p = dend;
-    }
-    out
+    super::offcrypto::decrypt_workbook(stream, &candidates).ok()
 }
 
 // ─────────────────────────── OOXML (.docx/.xlsx) AES ───────────────────────────
@@ -930,24 +485,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn xor_arrays_for_every_password_length_are_built() {
-        for n in 0..=16 {
-            let pw = "a".repeat(n);
-            assert_eq!(
-                xor_create_array(&pw).is_some(),
-                (1..=15).contains(&n),
-                "length {n}"
-            );
-        }
-    }
-
-    #[test]
-    fn a_cryptoapi_key_size_past_the_hash_is_cut_to_the_hash() {
-        let k = KeyDeriver::cryptoapi(&[0u8; 16], "pw", 2048);
-        assert!(k.block_key(0).len() <= 20);
-    }
-
     #[test]
     fn a_short_standard_encryption_info_is_not_parsed_not_a_panic() {
         for len in 0..=11 {
@@ -973,20 +510,22 @@ mod tests {
         v.extend_from_slice(data);
     }
 
-    /// Build a `Workbook` stream (BOF, `FilePass`, an EICAR record, EOF) and
-    /// encrypt the EICAR record's data with the block-0 keystream (the whole
-    /// stream fits one 1024-byte block).
-    fn encrypted_workbook(d: &KeyDeriver, filepass_body: &[u8]) -> Vec<u8> {
+    /// A `Workbook` stream (BOF, `FilePass`, an EICAR record, EOF) encrypted
+    /// with the default password by `method`.
+    fn encrypted_workbook(method: &str) -> Vec<u8> {
+        use super::super::offcrypto::encrypt::{encrypt_stream, filepass};
         let mut wb = Vec::new();
-        push_rec(&mut wb, 0x0809, &[0u8; 16]); // BOF
-        push_rec(&mut wb, 0x002f, filepass_body); // FilePass
-        let off = wb.len() + 4;
+        // BOF of BIFF8.
+        push_rec(
+            &mut wb,
+            0x0809,
+            &[0x00, 0x06, 0x05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        );
+        let at = wb.len();
+        push_rec(&mut wb, 0x002f, &filepass(method, true)); // FilePass
         push_rec(&mut wb, 0x00ff, eicar()); // non-exempt → encrypted
         push_rec(&mut wb, 0x000a, &[]); // EOF
-        let ks = rc4(&d.block_key(0), &vec![0u8; wb.len()]);
-        for i in 0..eicar().len() {
-            wb[off + i] ^= ks[off + i];
-        }
+        encrypt_stream(method, &mut wb, at);
         assert!(
             !wb.windows(eicar().len()).any(|w| w == eicar()),
             "EICAR encrypted"
@@ -994,70 +533,21 @@ mod tests {
         wb
     }
 
-    /// Encrypted verifier pair for a password/scheme: `verifier ‖ H(verifier)`
-    /// under the block-0 keystream.
-    fn verifier_pair(d: &KeyDeriver, verifier: &[u8]) -> Vec<u8> {
-        let mut vblob = verifier.to_vec();
-        vblob.extend_from_slice(&d.hash(verifier));
-        rc4(&d.block_key(0), &vblob)
-    }
-
-    // Independently-generated vector (salt 00..0f, password "Secret1").
+    /// End-to-end: the default password recovers the cleartext EICAR of a
+    /// workbook with no caller password, whichever the scheme.
     #[test]
-    fn rc4_basic_verifier_and_key() {
-        let salt = (0u8..16).collect::<Vec<_>>();
-        let fp = FilePass {
-            salt: salt.clone(),
-            enc_verifier: hex("d11cfb57cde29a6eaf45018e01931b31").to_vec(),
-            enc_vhash: hex("9687999033ca45aaade5f45386030a07").to_vec(),
-            cryptoapi_key_bits: None,
-        };
-        assert!(fp.password_ok("Secret1"));
-        assert!(!fp.password_ok("wrong"));
-        assert!(!fp.password_ok("VelvetSweatshop"));
-        match KeyDeriver::basic(&salt, "Secret1") {
-            KeyDeriver::Basic(inter) => assert_eq!(inter, hex5("cabe9bb94c")),
-            _ => panic!(),
+    fn velvetsweatshop_recovers_eicar() {
+        for method in ["rc4", "cryptoapi40", "cryptoapi128", "xor"] {
+            let ct = encrypted_workbook(method);
+            let recovered = try_decrypt_workbook(&ct, &[])
+                .unwrap_or_else(|| panic!("{method}: VelvetSweatshop must decrypt"));
+            assert!(
+                recovered.windows(eicar().len()).any(|w| w == eicar()),
+                "{method}"
+            );
         }
     }
 
-    // Independently-generated vector, cross-checked against the msoffcrypto
-    // reference `verifypw` (salt 10..1f, password "VelvetSweatshop", 128-bit).
-    #[test]
-    fn rc4_cryptoapi_verifier_vector() {
-        let salt = (16u8..32).collect::<Vec<_>>();
-        let fp = FilePass {
-            salt,
-            enc_verifier: hex("66871900f3075fc3fa7e1d9b934d6b22").to_vec(),
-            enc_vhash: hex20("13146eb6c265735c52ea6eb1cc48739e80561620").to_vec(),
-            cryptoapi_key_bits: Some(128),
-        };
-        assert!(fp.password_ok("VelvetSweatshop"));
-        assert!(!fp.password_ok("nope"));
-    }
-
-    #[test]
-    fn rc4_is_symmetric() {
-        let k = b"key1234567890abc";
-        let pt = b"eicar-ish plaintext content";
-        assert_eq!(rc4(k, &rc4(k, pt)), pt);
-    }
-
-    /// End-to-end (RC4 basic): VelvetSweatshop default recovers cleartext EICAR
-    /// with no caller password.
-    #[test]
-    fn velvetsweatshop_basic_recovers_eicar() {
-        let salt = [0x5au8; 16];
-        let d = KeyDeriver::basic(&salt, "VelvetSweatshop");
-        let enc = verifier_pair(&d, &[0x24u8; 16]);
-        let mut fp = vec![1u8, 0, 1, 0, 1, 0]; // encType=1, ver 1.1
-        fp.extend_from_slice(&salt);
-        fp.extend_from_slice(&enc[..32]);
-        let ct = encrypted_workbook(&d, &fp);
-        let recovered = try_decrypt_workbook(&ct, &[]).expect("VelvetSweatshop must decrypt");
-        assert!(recovered.windows(eicar().len()).any(|w| w == eicar()));
-    }
-
     /// A workbook embedded in another, as Excel stores an inserted workbook
     /// object, is decrypted too: only the first workbook stream was checked,
     /// and a plain one at the top hid an encrypted one below it. Excel names
@@ -1066,13 +556,7 @@ mod tests {
     #[test]
     fn an_embedded_encrypted_workbook_is_decrypted() {
         use std::io::Write;
-        let salt = [0x5au8; 16];
-        let d = KeyDeriver::basic(&salt, "VelvetSweatshop");
-        let enc = verifier_pair(&d, &[0x24u8; 16]);
-        let mut fp = vec![1u8, 0, 1, 0, 1, 0];
-        fp.extend_from_slice(&salt);
-        fp.extend_from_slice(&enc[..32]);
-        let ct = encrypted_workbook(&d, &fp);
+        let ct = encrypted_workbook("rc4");
 
         for storage in ["/MBD0001", "/MBD0012AB34"] {
             let mut cf = cfb::CompoundFile::create(std::io::Cursor::new(Vec::new())).unwrap();
@@ -1102,34 +586,6 @@ mod tests {
         }
     }
 
-    /// End-to-end (RC4-CryptoAPI, 128-bit): VelvetSweatshop default recovers EICAR.
-    #[test]
-    fn velvetsweatshop_cryptoapi_recovers_eicar() {
-        let salt = [0x3cu8; 16];
-        let d = KeyDeriver::cryptoapi(&salt, "VelvetSweatshop", 128);
-        let enc = verifier_pair(&d, &[0x24u8; 16]); // 16 + 20 = 36 bytes
-                                                    // FilePass: encType(1) vMaj(3) vMin(3) Flags(4) HeaderSize(4) Header Verifier
-        let mut header = vec![0u8; 32];
-        header[16..20].copy_from_slice(&128u32.to_le_bytes()); // KeySize
-        let mut vblk = Vec::new();
-        vblk.extend_from_slice(&16u32.to_le_bytes());
-        vblk.extend_from_slice(&salt);
-        vblk.extend_from_slice(&enc[..16]);
-        vblk.extend_from_slice(&20u32.to_le_bytes());
-        vblk.extend_from_slice(&enc[16..36]);
-        let mut fp = Vec::new();
-        fp.extend_from_slice(&1u16.to_le_bytes());
-        fp.extend_from_slice(&3u16.to_le_bytes());
-        fp.extend_from_slice(&3u16.to_le_bytes());
-        fp.extend_from_slice(&0x24u32.to_le_bytes());
-        fp.extend_from_slice(&(header.len() as u32).to_le_bytes());
-        fp.extend_from_slice(&header);
-        fp.extend_from_slice(&vblk);
-        let ct = encrypted_workbook(&d, &fp);
-        let recovered = try_decrypt_workbook(&ct, &[]).expect("CryptoAPI VelvetSweatshop decrypt");
-        assert!(recovered.windows(eicar().len()).any(|w| w == eicar()));
-    }
-
     fn aes_ecb_encrypt(key: &[u8], data: &[u8]) -> Vec<u8> {
         use aes::cipher::{BlockCipherEncrypt, KeyInit};
         let cipher = aes::Aes128::new_from_slice(key).unwrap();
@@ -1258,7 +714,7 @@ mod tests {
     }
 
     fn aes256_cbc_encrypt(key: &[u8], iv: &[u8], data: &[u8]) -> Vec<u8> {
-        use aes::cipher::{block_padding::NoPadding, BlockModeEncrypt, KeyIvInit};
+        use aes::cipher::{BlockModeEncrypt, KeyIvInit, block_padding::NoPadding};
         let mut out = data.to_vec();
         let n = out.len();
         let enc = <cbc::Encryptor<aes::Aes256>>::new_from_slices(key, &iv[..16]).unwrap();
@@ -1373,75 +829,6 @@ encryptedVerifierHashInput=\"{}\" encryptedVerifierHashValue=\"{}\" encryptedKey
         );
     }
 
-    /// Password verifier matches the MS-OFFCRYPTO reference vector (the
-    /// `VelvetSweatshop` default stores `0x9a0a`).
-    #[test]
-    fn xor_verifier_matches_reference() {
-        assert!(xor_verify_password("VelvetSweatshop", 0x9a0a));
-        assert!(xor_verify_password("password1", 0xe1ae));
-        assert!(xor_verify_password("Secret1", 0xc266));
-        assert!(!xor_verify_password("VelvetSweatshop", 0x0000));
-        assert!(!xor_verify_password("wrong", 0x9a0a));
-    }
-
-    /// The 16-byte obfuscation array matches the MIT msoffcrypto reference for
-    /// several passwords (validates the tables + key derivation byte-for-byte).
-    #[test]
-    fn xor_array_matches_reference_vectors() {
-        for (pw, hex) in [
-            ("VelvetSweatshop", "876b9ae21ee305621e699660986e9404"),
-            ("password1", "dbb75abe58b0da357bda1cf8bef81cdb"),
-            ("abc", "95999475da577857da7465a87a2f2577"),
-            ("Secret1", "7b3863b360b04a572d758f752d56928a"),
-        ] {
-            assert_eq!(
-                xor_create_array(pw).unwrap().to_vec(),
-                hexv(hex),
-                "xor array mismatch for {pw:?}"
-            );
-        }
-    }
-
-    /// End-to-end: obfuscate a BIFF `Workbook` (BOF, XOR `FilePass`, an EICAR
-    /// record, EOF) with the XOR scheme, then confirm the default-password path
-    /// recovers the cleartext EICAR, exercising the per-record index math.
-    #[test]
-    fn xor_obfuscation_recovers_eicar() {
-        let pw = "VelvetSweatshop";
-        let arr = xor_create_array(pw).unwrap();
-
-        let mut wb = Vec::new();
-        push_rec(&mut wb, 0x0809, &[0u8; 16]); // BOF (exempt)
-                                               // FilePass XOR: wEncryptionType=0, key, verifier(0x9a0a)
-        let mut fp = Vec::new();
-        fp.extend_from_slice(&0u16.to_le_bytes());
-        fp.extend_from_slice(&0x1234u16.to_le_bytes()); // key (unused for verify)
-        fp.extend_from_slice(&0x9a0au16.to_le_bytes()); // verificationBytes
-        push_rec(&mut wb, 0x002f, &fp);
-        let rec_off = wb.len(); // stream offset of the EICAR record header
-        push_rec(&mut wb, 0x00ff, eicar()); // non-exempt → obfuscated
-        push_rec(&mut wb, 0x000a, &[]); // EOF
-
-        // Obfuscate the EICAR record's data in place: cipher = ROL(plain,5) ^ pad,
-        // with the same end-offset seed the decryptor uses.
-        let dstart = rec_off + 4;
-        let dend = dstart + eicar().len();
-        let idx0 = dend % 16;
-        for (j, k) in (dstart..dend).enumerate() {
-            wb[k] = wb[k].rotate_left(5) ^ arr[(idx0 + j) % 16];
-        }
-        assert!(
-            !wb.windows(eicar().len()).any(|w| w == eicar()),
-            "EICAR must be obfuscated in the input"
-        );
-
-        let recovered = try_decrypt_workbook(&wb, &[]).expect("XOR VelvetSweatshop must decrypt");
-        assert!(
-            recovered.windows(eicar().len()).any(|w| w == eicar()),
-            "EICAR must be recovered from the de-obfuscated workbook"
-        );
-    }
-
     fn hexv(s: &str) -> Vec<u8> {
         (0..s.len() / 2)
             .map(|i| u8::from_str_radix(&s[i * 2..i * 2 + 2], 16).unwrap())
@@ -1488,26 +875,4 @@ encryptedVerifierHashInput=\"{}\" encryptedVerifierHashValue=\"{}\" encryptedKey
         assert!(check("Password1234_"), "correct password must verify");
         assert!(!check("wrong-password"), "wrong password must not verify");
     }
-
-    fn hex(s: &str) -> [u8; 16] {
-        let mut o = [0u8; 16];
-        for (i, b) in o.iter_mut().enumerate() {
-            *b = u8::from_str_radix(&s[i * 2..i * 2 + 2], 16).unwrap();
-        }
-        o
-    }
-    fn hex20(s: &str) -> [u8; 20] {
-        let mut o = [0u8; 20];
-        for (i, b) in o.iter_mut().enumerate() {
-            *b = u8::from_str_radix(&s[i * 2..i * 2 + 2], 16).unwrap();
-        }
-        o
-    }
-    fn hex5(s: &str) -> [u8; 5] {
-        let mut o = [0u8; 5];
-        for (i, b) in o.iter_mut().enumerate() {
-            *b = u8::from_str_radix(&s[i * 2..i * 2 + 2], 16).unwrap();
-        }
-        o
-    }
 }
diff --git a/crates/exav-unpack/src/formats/onenote.rs b/crates/exav-unpack/src/formats/onenote.rs
index 9c3f6527..16633d1a 100644
--- a/crates/exav-unpack/src/formats/onenote.rs
+++ b/crates/exav-unpack/src/formats/onenote.rs
@@ -147,9 +147,11 @@ mod tests {
         blob.extend_from_slice(&FILE_DATA_STORE_GUID);
         blob.extend_from_slice(&[0u8; 3]);
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::OneNote, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::OneNote, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     #[test]
@@ -158,8 +160,10 @@ mod tests {
         blob.extend_from_slice(&ONENOTE_HEADER_GUID);
         blob.extend_from_slice(b"a section with no embedded files");
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::OneNote, &blob, &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::OneNote, &blob, &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 }
diff --git a/crates/exav-unpack/src/formats/partition.rs b/crates/exav-unpack/src/formats/partition.rs
index 6304563f..224e945f 100644
--- a/crates/exav-unpack/src/formats/partition.rs
+++ b/crates/exav-unpack/src/formats/partition.rs
@@ -129,7 +129,16 @@ pub fn intersection_alert(data: &dyn crate::source::ByteSource) -> Option<&'stat
     }
 }
 
-/// Walk a disk image, each partition streamed from where it lies.
+/// Whether the start of a disk `len` bytes long, `head` (at least two
+/// sectors of it, or all of a shorter one), holds a partition table.
+#[cfg(feature = "partition")]
+pub(crate) fn is_table(head: &[u8], len: u64) -> bool {
+    is_gpt(head) || is_apm(head) || is_mbr_in(head, len)
+}
+
+/// Walk a disk image, each partition streamed from where it lies. A partition
+/// larger than the buffer limit that holds a filesystem exav reads is walked
+/// in place instead, where the stream would be all of it.
 #[cfg(feature = "partition")]
 pub(crate) fn walk<T>(
     src: &dyn crate::source::ByteSource,
@@ -137,8 +146,14 @@ pub(crate) fn walk<T>(
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
     let mut source = crate::source::Reader::new(src);
-    let members = stream_offsets(&mut source)?;
-    crate::stream::stream_stored(&mut source, budget, visit, members)
+    let regions = stream_offsets(&mut source)?;
+    super::volumes::walk_regions(
+        &mut source,
+        regions,
+        super::volumes::Mode::Raw,
+        budget,
+        visit,
+    )
 }
 
 /// Parse the GPT/APM/MBR table (tiny, near the start) via targeted reads and
@@ -365,8 +380,8 @@ mod tests {
         b[3..11].copy_from_slice(b"MTOO4048");
         b[11..13].copy_from_slice(&512u16.to_le_bytes()); // bytes per sector
         b[13] = 1; // sectors per cluster
-                   // Boot code that parses as: bootable, type 0x01 (FAT12), LBA 0, 4096
-                   // sectors — i.e. a "partition" covering the entire image.
+        // Boot code that parses as: bootable, type 0x01 (FAT12), LBA 0, 4096
+        // sectors — i.e. a "partition" covering the entire image.
         b[446] = 0x80;
         b[446 + 4] = 0x01;
         b[446 + 8..446 + 12].copy_from_slice(&0u32.to_le_bytes());
@@ -423,12 +438,12 @@ mod tests {
         img[h + 72..h + 80].copy_from_slice(&2u64.to_le_bytes()); // entries_lba = 2
         img[h + 80..h + 84].copy_from_slice(&1u32.to_le_bytes()); // num_entries = 1
         img[h + 84..h + 88].copy_from_slice(&128u32.to_le_bytes()); // entry_size = 128
-                                                                    // Partition entry at sector 2.
+        // Partition entry at sector 2.
         let e = 2 * SECTOR;
         img[e] = 0xAB; // non-zero type GUID => used
         img[e + 32..e + 40].copy_from_slice(&3u64.to_le_bytes()); // first_lba = 3
         img[e + 40..e + 48].copy_from_slice(&3u64.to_le_bytes()); // last_lba  = 3
-                                                                  // Partition region at sector 3.
+        // Partition region at sector 3.
         img[3 * SECTOR..3 * SECTOR + MARKER.len()].copy_from_slice(MARKER);
         img
     }
diff --git a/crates/exav-unpack/src/formats/pdf.rs b/crates/exav-unpack/src/formats/pdf.rs
index c72d11c4..e27237a9 100644
--- a/crates/exav-unpack/src/formats/pdf.rs
+++ b/crates/exav-unpack/src/formats/pdf.rs
@@ -66,17 +66,17 @@ pub fn has_obfuscated_name_object(data: &[u8]) -> bool {
         let mut decoded: Vec<u8> = Vec::new();
         let mut gratuitous = false;
         while j < data.len() && !TERM.contains(&data[j]) {
-            if data[j] == b'#' && j + 2 < data.len() {
-                if let Ok(b) =
+            if data[j] == b'#'
+                && j + 2 < data.len()
+                && let Ok(b) =
                     u8::from_str_radix(std::str::from_utf8(&data[j + 1..j + 3]).unwrap_or("x"), 16)
-                {
-                    if b.is_ascii_alphanumeric() {
-                        gratuitous = true;
-                    }
-                    decoded.push(b);
-                    j += 3;
-                    continue;
+            {
+                if b.is_ascii_alphanumeric() {
+                    gratuitous = true;
                 }
+                decoded.push(b);
+                j += 3;
+                continue;
             }
             decoded.push(data[j]);
             j += 1;
@@ -160,11 +160,51 @@ pub(crate) fn extract_pdf<R>(
     let mut js_acc: Vec<u8> = Vec::new();
     let mut uri_acc: Vec<u8> = Vec::new();
     let mut lex = Lexer::new(data);
-    while let Some((obj_id, gen, obj_start)) = lex.find_next_obj() {
+    // Where each object number is, found when a stream's `/Filter` or
+    // `/DecodeParms` is a reference to one.
+    let mut index: Option<HashMap<u32, usize>> = None;
+    // Bytes read again because an object ended before its parse did, or did not
+    // parse. Bounded, since every object of a crafted file can claim the rest of
+    // it, and the bound is said when it is reached.
+    let mut reread = 0u64;
+    let reread_cap = (data.len() as u64)
+        .saturating_mul(8)
+        .saturating_add(1 << 20);
+    let mut gave_up = false;
+    while let Some((obj_id, r#gen, obj_start)) = lex.find_next_obj() {
         lex.set_pos(obj_start);
-        let Some((obj, _end)) = parse_indirect_object_body(&mut lex) else {
+        let Some((obj, end)) = parse_indirect_object_body(&mut lex) else {
+            // An object that does not parse (an unterminated string in it runs
+            // to the end of the file) is not the end of the document: the scan
+            // goes on from its start, as a reader going by the cross-reference
+            // table reaches every object after it.
+            reread = reread.saturating_add(lex.pos().saturating_sub(obj_start) as u64);
+            if reread > reread_cap {
+                gave_up = true;
+            } else {
+                lex.set_pos(obj_start);
+            }
             continue;
         };
+        // An object that does not end where it says (a string left open takes
+        // the rest of the file for itself, and the dictionary round it still
+        // parses) must not take the objects after it. Parsing resumes after the
+        // first `endobj`, as a reader that goes by the cross-reference table
+        // finds each of them.
+        if let Some(p) = memchr::memmem::find(
+            &data[obj_start.min(data.len())..end.min(data.len())],
+            b"endobj",
+        ) {
+            let stop = obj_start + p + b"endobj".len();
+            if end > stop {
+                reread = reread.saturating_add((end - stop) as u64);
+                if reread > reread_cap {
+                    gave_up = true;
+                } else {
+                    lex.set_pos(stop);
+                }
+            }
+        }
         budget.count_entry()?;
 
         // Harvest JS / URI / launch strings from this object's dictionary(s).
@@ -174,7 +214,7 @@ pub(crate) fn extract_pdf<R>(
         harvest_actions(
             &obj,
             decoder.as_ref(),
-            (obj_id, gen),
+            (obj_id, r#gen),
             &mut js_acc,
             &mut uri_acc,
         );
@@ -188,10 +228,11 @@ pub(crate) fn extract_pdf<R>(
         {
             #[cfg(feature = "decrypt")]
             if let Some(ref dec) = decoder {
-                dec.decrypt_stream(obj_id, gen, &mut stream_data);
+                dec.decrypt_stream(obj_id, r#gen, &mut stream_data);
             }
             let raw_len = stream_data.len() as u64;
             let cap = budget.reserve()?;
+            let info = resolve_filter_references(info, data, &mut index);
             let outcome = apply_filters(&stream_data, &info, cap)?;
             if outcome.truncated {
                 return Err(LimitHit::new("pdf stream exceeds budget".to_string()));
@@ -225,7 +266,12 @@ pub(crate) fn extract_pdf<R>(
                 e
             } else {
                 let mut e = Entry::new(format!("pdf-obj-{obj_id}-{gen}"), buf);
-                if outcome.part_way {
+                if outcome.unknown_filter {
+                    e.unsupported = Some(
+                        "PDF stream uses a filter that is not decoded; its bytes were \
+                         scanned as far as the filters before it decode them",
+                    );
+                } else if outcome.part_way {
                     e.unsupported = Some(
                         "PDF stream failed to decode part way; the bytes before the \
                          failure were scanned",
@@ -239,6 +285,21 @@ pub(crate) fn extract_pdf<R>(
         }
     }
 
+    if gave_up {
+        budget.count_entry()?;
+        if let Some(r) = visit(
+            Entry::unsupported(
+                "pdf-overlapping-objects".to_string(),
+                data.len() as u64,
+                false,
+                "PDF objects run into one another more than can be read again; the rest of the file was not scanned object by object",
+            ),
+            budget,
+        ) {
+            return Ok(Some(r));
+        }
+    }
+
     // Emit the harvested active-content members (bounded by the budget like any
     // other member). Non-empty only.
     for (name, acc) in [("pdf-javascript", js_acc), ("pdf-uris", uri_acc)] {
@@ -330,11 +391,85 @@ fn harvest_inner(
     }
 }
 
+/// `info` with the references in `/Filter` and `/DecodeParms` replaced by the
+/// objects they name, which a PDF may use for either. The scan is object by
+/// object, so a filter written as `7 0 R` was no filter at all, and the stream
+/// was scanned compressed.
+fn resolve_filter_references(
+    mut info: HashMap<String, Primitive>,
+    data: &[u8],
+    index: &mut Option<HashMap<u32, usize>>,
+) -> HashMap<String, Primitive> {
+    let mut resolve = |p: &Primitive| -> Option<Primitive> {
+        let mut at = p.clone();
+        // A reference to a reference is followed, a loop of them not forever.
+        for _ in 0..8 {
+            let Primitive::Reference(id) = at else {
+                return Some(at);
+            };
+            let index = index.get_or_insert_with(|| {
+                let mut found = HashMap::new();
+                let mut lex = Lexer::new(data);
+                // The last definition of a number wins, as in an incremental
+                // update.
+                while let Some((n, _gen, start)) = lex.find_next_obj() {
+                    found.insert(n, start);
+                }
+                found
+            });
+            let start = *index.get(&id)?;
+            let mut lex = Lexer::new(data);
+            lex.set_pos(start);
+            at = match parse_indirect_object_body(&mut lex)?.0 {
+                Primitive::Stream { .. } => return None,
+                other => other,
+            };
+        }
+        None
+    };
+    for key in ["Filter", "DecodeParms", "DP"] {
+        let Some(value) = info.get(key) else {
+            continue;
+        };
+        let resolved = match value {
+            Primitive::Reference(_) => resolve(value),
+            Primitive::Array(items)
+                if items.iter().any(|i| matches!(i, Primitive::Reference(_))) =>
+            {
+                Some(Primitive::Array(
+                    items
+                        .iter()
+                        .map(|i| resolve(i).unwrap_or(Primitive::Null))
+                        .collect(),
+                ))
+            }
+            _ => continue,
+        };
+        match resolved {
+            Some(v) => {
+                info.insert(key.to_string(), v);
+            }
+            // A reference to nothing: the stream names a filter it does not
+            // give. Left as a name no decoder has, so the stream is reported.
+            None if key == "Filter" => {
+                info.insert(
+                    key.to_string(),
+                    Primitive::Name("<unresolved filter reference>".to_string()),
+                );
+            }
+            None => {
+                info.remove(key);
+            }
+        }
+    }
+    info
+}
+
 /// What decoding a stream's `/Filter` chain produced.
-struct FilterOutcome {
-    buf: Vec<u8>,
+pub(crate) struct FilterOutcome {
+    pub(crate) buf: Vec<u8>,
     /// An output cap was hit: the caller should treat the stream as over budget.
-    truncated: bool,
+    pub(crate) truncated: bool,
     /// An implemented filter failed and nothing was recovered: the caller
     /// should report the stream undecodable rather than scan an empty buffer
     /// as though its bytes were examined. Distinct from "decoded to empty",
@@ -344,6 +479,9 @@ struct FilterOutcome {
     /// A filter decoded part of its input and failed on the rest: `buf` holds
     /// what came before the failure.
     part_way: bool,
+    /// The chain names a filter that is neither decoded here nor an image
+    /// codec: what follows it was not decoded, and `buf` is not the content.
+    unknown_filter: bool,
 }
 
 /// A zlib stream decoded up to any damage, without its Adler-32 check.
@@ -366,7 +504,7 @@ fn salvage_zlib(data: &[u8], cap: u64) -> Salvaged {
 /// filters use the pure decoders in [`filters`]. An unknown/unsupported filter
 /// (e.g. an image codec like DCTDecode) stops the chain and passes through
 /// whatever was decoded so far.
-fn apply_filters(
+pub(crate) fn apply_filters(
     stream_data: &[u8],
     info: &HashMap<String, Primitive>,
     cap: u64,
@@ -380,11 +518,13 @@ fn apply_filters(
             // No decoding involved: raw bytes pass through, nothing to fail.
             decode_error: false,
             part_way: false,
+            unknown_filter: false,
         });
     }
     let parms = decode_parms_list(info, names.len());
     let mut buf = stream_data.to_vec();
     let mut part_way = false;
+    let mut unknown_filter = false;
     // Whether an implemented filter failed with nothing recovered. Sticky
     // across the chain: only a successful decode producing content clears the
     // question, and the caller reports `unsupported` solely on
@@ -407,10 +547,10 @@ fn apply_filters(
                     Ok((out, truncated)) => (out, truncated, false),
                     Err(_) => {
                         let mut s = salvage_zlib(&buf, cap);
-                        if s.data.is_empty() {
-                            if let Some(z) = buf.iter().position(|&b| b == 0x78) {
-                                s = salvage_zlib(&buf[z..], cap);
-                            }
+                        if s.data.is_empty()
+                            && let Some(z) = buf.iter().position(|&b| b == 0x78)
+                        {
+                            s = salvage_zlib(&buf[z..], cap);
                         }
                         // Empty input decodes vacuously (nothing to fail on);
                         // only non-empty input decoding to nothing is an error.
@@ -448,7 +588,18 @@ fn apply_filters(
             // (an image codec over raw bytes reads as the raw bytes — same as
             // ClamAV, which matches signatures against the stream content
             // without decoding image codecs either).
-            _ => break,
+            // The identity crypt filter, which every reader passes over:
+            // what a `/Crypt` before `/FlateDecode` leaves is still to be
+            // inflated. (A named crypt filter is applied with the document's
+            // key, in the pass that decrypts streams.)
+            "Crypt" => continue,
+            // An image codec ends the chain. Any other name is a filter no
+            // decoder here has, and what follows it cannot be reached.
+            "DCTDecode" | "DCT" | "JPXDecode" | "CCITTFaxDecode" | "CCF" | "JBIG2Decode" => break,
+            _ => {
+                unknown_filter = true;
+                break;
+            }
         };
         decode_error |= err;
         if truncated {
@@ -457,6 +608,7 @@ fn apply_filters(
                 truncated: true,
                 decode_error,
                 part_way,
+                unknown_filter,
             });
         }
         buf = out;
@@ -467,12 +619,13 @@ fn apply_filters(
         truncated,
         decode_error,
         part_way,
+        unknown_filter,
     })
 }
 
 /// Collect the ordered list of filter names from `/Filter` (a single name or an
 /// array of names).
-fn filter_names(info: &HashMap<String, Primitive>) -> Vec<String> {
+pub(crate) fn filter_names(info: &HashMap<String, Primitive>) -> Vec<String> {
     match info.get("Filter") {
         Some(Primitive::Name(n)) => vec![n.clone()],
         Some(Primitive::Array(arr)) => arr
@@ -564,26 +717,25 @@ fn detect_encryption(data: &[u8]) -> Option<CryptDict> {
             parse_indirect_object_body(&mut lex)
         {
             // Strategy 1: dict contains an /Encrypt key
-            if let Some(Primitive::Dictionary(enc)) = dict.get("Encrypt") {
-                if let Some(cd) = CryptDict::from_primitive(enc) {
-                    return Some(cd);
-                }
+            if let Some(Primitive::Dictionary(enc)) = dict.get("Encrypt")
+                && let Some(cd) = CryptDict::from_primitive(enc)
+            {
+                return Some(cd);
             }
             // Strategy 2: this IS the encrypt dict (standalone)
-            if is_encrypt_dict(&dict) {
-                if let Some(cd) = CryptDict::from_primitive(&dict) {
-                    return Some(cd);
-                }
+            if is_encrypt_dict(&dict)
+                && let Some(cd) = CryptDict::from_primitive(&dict)
+            {
+                return Some(cd);
             }
         }
     }
     // Strategy 3: check trailer
-    if let Some(trailer) = parse_trailer_dict(data) {
-        if let Some(Primitive::Dictionary(enc)) = trailer.get("Encrypt") {
-            if let Some(cd) = CryptDict::from_primitive(enc) {
-                return Some(cd);
-            }
-        }
+    if let Some(trailer) = parse_trailer_dict(data)
+        && let Some(Primitive::Dictionary(enc)) = trailer.get("Encrypt")
+        && let Some(cd) = CryptDict::from_primitive(enc)
+    {
+        return Some(cd);
     }
     None
 }
@@ -597,21 +749,18 @@ fn find_doc_id(data: &[u8]) -> Option<Vec<u8>> {
         lex.set_pos(obj_start);
         if let Some((Primitive::Dictionary(dict) | Primitive::Stream { info: dict, .. }, _end)) =
             parse_indirect_object_body(&mut lex)
+            && let Some(Primitive::Array(arr)) = dict.get("ID")
+            && let Some(Primitive::String(s)) = arr.first()
         {
-            if let Some(Primitive::Array(arr)) = dict.get("ID") {
-                if let Some(Primitive::String(s)) = arr.first() {
-                    return Some(s.clone());
-                }
-            }
+            return Some(s.clone());
         }
     }
     // Check the trailer
-    if let Some(trailer) = parse_trailer_dict(data) {
-        if let Some(Primitive::Array(arr)) = trailer.get("ID") {
-            if let Some(Primitive::String(s)) = arr.first() {
-                return Some(s.clone());
-            }
-        }
+    if let Some(trailer) = parse_trailer_dict(data)
+        && let Some(Primitive::Array(arr)) = trailer.get("ID")
+        && let Some(Primitive::String(s)) = arr.first()
+    {
+        return Some(s.clone());
     }
     None
 }
@@ -627,11 +776,11 @@ mod tests {
         assert!(has_obfuscated_name_object(b"<</#4f#70enAction 2 0 R>>")); // /OpenAction
         assert!(has_obfuscated_name_object(b"/J#61vaScript")); // → JavaScript
         assert!(has_obfuscated_name_object(b"/La#75nch")); // → Launch
-                                                           // An incidental escape in an *ordinary* name is benign and must NOT fire
-                                                           // (this is the false positive that made it unsafe to run by default).
+        // An incidental escape in an *ordinary* name is benign and must NOT fire
+        // (this is the false positive that made it unsafe to run by default).
         assert!(!has_obfuscated_name_object(b"/Ty#70e")); // → Type (not sensitive)
         assert!(!has_obfuscated_name_object(b"/C#31")); // → C1 (a real benign-PDF FP)
-                                                        // No escapes, or only legitimate ones → not flagged.
+        // No escapes, or only legitimate ones → not flagged.
         assert!(!has_obfuscated_name_object(b"/Type/Catalog/OpenAction"));
         assert!(!has_obfuscated_name_object(b"/JavaScript")); // unobfuscated → not flagged
         assert!(!has_obfuscated_name_object(b"/Weird#20Name")); // #20 = space, needs escaping
@@ -917,8 +1066,10 @@ trailer\n<< /Root 1 0 R >>\n%%EOF";
             b"%PDF-1.5\n1 0 obj\n<< /Type /Catalog >>\nendobj\ntrailer\n<< /Root 1 0 R >>\n%%EOF";
         let mut budget = Budget::new(Limits::default());
         let entries = extract(Format::Pdf, pdf, &mut budget).unwrap();
-        assert!(entries
-            .iter()
-            .all(|e| e.name != "pdf-javascript" && e.name != "pdf-uris"));
+        assert!(
+            entries
+                .iter()
+                .all(|e| e.name != "pdf-javascript" && e.name != "pdf-uris")
+        );
     }
 }
diff --git a/crates/exav-unpack/src/formats/pdf_parse/crypt.rs b/crates/exav-unpack/src/formats/pdf_parse/crypt.rs
index d4adfe9f..de32a8fb 100644
--- a/crates/exav-unpack/src/formats/pdf_parse/crypt.rs
+++ b/crates/exav-unpack/src/formats/pdf_parse/crypt.rs
@@ -160,17 +160,17 @@ impl Decoder {
         Err(PdfCryptError::UnsupportedRevision(level))
     }
 
-    pub(crate) fn decrypt_stream(&self, obj_id: u32, gen: u32, data: &mut Vec<u8>) {
+    pub(crate) fn decrypt_stream(&self, obj_id: u32, r#gen: u32, data: &mut Vec<u8>) {
         if data.is_empty() || self.method == CryptMethod::None {
             return;
         }
         match self.method {
             CryptMethod::V2 => {
-                let key = self.per_object_key(obj_id, gen, None);
+                let key = self.per_object_key(obj_id, r#gen, None);
                 rc4_apply(&key, data);
             }
             CryptMethod::AESV2 => {
-                let key = self.per_object_key(obj_id, gen, Some(b"sAlT"));
+                let key = self.per_object_key(obj_id, r#gen, Some(b"sAlT"));
                 aes_cbc_decrypt(&key, data);
             }
             CryptMethod::AESV3 => {
@@ -184,12 +184,12 @@ impl Decoder {
     /// ISO 32000-1 7.6.2, algorithm 1: MD5 of the file key, the object
     /// number's low 3 bytes and the generation's low 2, and for AES the salt;
     /// the first n + 5 bytes of it, at most 16, are the object's key.
-    fn per_object_key(&self, obj_id: u32, gen: u32, salt: Option<&[u8]>) -> Vec<u8> {
+    fn per_object_key(&self, obj_id: u32, r#gen: u32, salt: Option<&[u8]>) -> Vec<u8> {
         let n = self.key_size.min(16).min(self.key.len());
         let mut data = Vec::with_capacity(n + 5 + 4);
         data.extend_from_slice(&self.key[..n]);
         data.extend_from_slice(&obj_id.to_le_bytes()[..3]);
-        data.extend_from_slice(&gen.to_le_bytes()[..2]);
+        data.extend_from_slice(&r#gen.to_le_bytes()[..2]);
         if let Some(s) = salt {
             data.extend_from_slice(s);
         }
@@ -755,8 +755,14 @@ mod tests {
             method: CryptMethod::AESV2,
         };
         let cases = [
-            (&v3, "222222222222222222222222222222221667316af8df34c59a9cfbb282f3f15390b837b680e02362584c9426a765787eba74d5ee5529da8aad289df5c742541b"),
-            (&v2, "22222222222222222222222222222222c0f2686b1de9823bb0b732f174856be9b2bde49ef0768d91635c34a59383f9e6064367ffe1064032238b380d4224a448"),
+            (
+                &v3,
+                "222222222222222222222222222222221667316af8df34c59a9cfbb282f3f15390b837b680e02362584c9426a765787eba74d5ee5529da8aad289df5c742541b",
+            ),
+            (
+                &v2,
+                "22222222222222222222222222222222c0f2686b1de9823bb0b732f174856be9b2bde49ef0768d91635c34a59383f9e6064367ffe1064032238b380d4224a448",
+            ),
         ];
         for (dec, hex) in cases {
             // As extracted, and with the end-of-line a stream body can carry.
@@ -769,6 +775,33 @@ mod tests {
         }
     }
 
+    /// An AES-128 (R4) file whose `/O` holds a backspace, written `\b`, opens
+    /// with the empty password. The dictionary is the one of a real file that
+    /// was reported password-protected while qpdf opened it.
+    #[test]
+    fn an_owner_key_with_a_backspace_escape_still_opens_with_the_empty_password() {
+        use crate::formats::pdf_parse::{lex::Lexer, parse::parse_object};
+        let mut src = b"<</Filter/Standard/O (".to_vec();
+        src.extend_from_slice(
+            b"\xe4\xa5`\xed\xd7\\b\x9c\xd0\x85\x0fB\x8c\xba\\)\x18\\(\xdc\\\\\xd8[\x1d\\)\xefFm\xb4\x96\xe2O\xf3<\xb0",
+        );
+        src.extend_from_slice(b")/U (");
+        src.extend_from_slice(b"\xb7c\x87\xea/\xb6\\n\xa9\x0b\xe5O\x81\xc7\xcf\x80I");
+        src.extend_from_slice(&[0; 16]);
+        src.extend_from_slice(
+            b")/P -300/R 4/EncryptMetadata false/V 4/Length 128/StrF/StdCF/StmF/StdCF\
+              /CF<</StdCF<</Length 16/AuthEvent/DocOpen/CFM/AESV2>>>>>>",
+        );
+        let Some(Primitive::Dictionary(dict)) = parse_object(&mut Lexer::new(&src)) else {
+            panic!("not a dictionary");
+        };
+        let dict = CryptDict::from_primitive(&dict).unwrap();
+        assert_eq!(dict.o.len(), 32);
+        assert_eq!(dict.o[5], 0x08);
+        let id = unhex("4db41f9bda1583e5463f724dd715f4ee");
+        assert!(Decoder::from_password(&dict, &id, b"").is_ok());
+    }
+
     /// RC4 with a 40-bit file key: the object key is 10 bytes (n + 5), and it
     /// covers the generation number. Vector from Python's hashlib and a plain
     /// RC4, object 9, generation 1.
diff --git a/crates/exav-unpack/src/formats/pdf_parse/filters.rs b/crates/exav-unpack/src/formats/pdf_parse/filters.rs
index f43c14b4..6336a5c0 100644
--- a/crates/exav-unpack/src/formats/pdf_parse/filters.rs
+++ b/crates/exav-unpack/src/formats/pdf_parse/filters.rs
@@ -248,12 +248,13 @@ pub(crate) fn lzw_decode(data: &[u8], early_change: bool, cap: u64) -> (Vec<u8>,
         }
 
         // Add prev + first-byte-of-entry as the next dictionary entry.
-        if let Some(p) = prev {
-            if (p as usize) < dict.len() && dict.len() < MAX_ENTRIES {
-                let mut new_entry = dict[p as usize].clone();
-                new_entry.push(entry[0]);
-                dict.push(new_entry);
-            }
+        if let Some(p) = prev
+            && (p as usize) < dict.len()
+            && dict.len() < MAX_ENTRIES
+        {
+            let mut new_entry = dict[p as usize].clone();
+            new_entry.push(entry[0]);
+            dict.push(new_entry);
         }
         prev = Some(code);
 
diff --git a/crates/exav-unpack/src/formats/pdf_parse/lex.rs b/crates/exav-unpack/src/formats/pdf_parse/lex.rs
index 33d66e4c..7337f1a4 100644
--- a/crates/exav-unpack/src/formats/pdf_parse/lex.rs
+++ b/crates/exav-unpack/src/formats/pdf_parse/lex.rs
@@ -45,10 +45,24 @@ impl<'a> Lexer<'a> {
         self.data
     }
 
+    /// White space only. A `%` here is the byte it is: a comment is no reason to
+    /// miss an `N G obj` after it on the same line, which a reader that goes by
+    /// the cross-reference table finds, and the scan for objects must too.
+    fn skip_blank(&mut self) {
+        while self.pos < self.data.len()
+            && matches!(
+                self.data[self.pos],
+                b' ' | b'\t' | b'\r' | b'\n' | b'\x0c' | b'\x00'
+            )
+        {
+            self.pos += 1;
+        }
+    }
+
     fn skip_whitespace(&mut self) {
         while self.pos < self.data.len() {
             match self.data[self.pos] {
-                b' ' | b'\t' | b'\r' | b'\n' | b'\x00' => self.pos += 1,
+                b' ' | b'\t' | b'\r' | b'\n' | b'\x0c' | b'\x00' => self.pos += 1,
                 b'%' => {
                     // PDF comment: skip to end of line
                     self.pos += 1;
@@ -189,10 +203,10 @@ impl<'a> Lexer<'a> {
                 if let Ok(b) = u8::from_str_radix(std::str::from_utf8(pair).unwrap_or("0"), 16) {
                     result.push(b);
                 }
-            } else if pair.len() == 1 {
-                if let Ok(b) = u8::from_str_radix(&format!("{}0", char::from(pair[0])), 16) {
-                    result.push(b);
-                }
+            } else if pair.len() == 1
+                && let Ok(b) = u8::from_str_radix(&format!("{}0", char::from(pair[0])), 16)
+            {
+                result.push(b);
             }
         }
         result
@@ -223,6 +237,8 @@ impl<'a> Lexer<'a> {
                             b'n' => result.push(b'\n'),
                             b'r' => result.push(b'\r'),
                             b't' => result.push(b'\t'),
+                            b'b' => result.push(0x08),
+                            b'f' => result.push(0x0c),
                             b'\\' => result.push(b'\\'),
                             b'(' => result.push(b'('),
                             b')' => result.push(b')'),
@@ -239,18 +255,15 @@ impl<'a> Lexer<'a> {
                             }
                             d @ b'0'..=b'7' => {
                                 let mut octal = (d - b'0') as u16;
+                                // Up to two more digits; a byte that is not one
+                                // belongs to the string, so it is only peeked at.
                                 for _ in 0..2 {
-                                    self.pos += 1;
-                                    if self.pos < self.data.len() {
-                                        if let Some(o) = self.data[self.pos].checked_sub(b'0') {
-                                            if o <= 7 {
-                                                octal = octal * 8 + o as u16;
-                                            } else {
-                                                break;
-                                            }
-                                        } else {
-                                            break;
+                                    match self.data.get(self.pos + 1) {
+                                        Some(&n @ b'0'..=b'7') => {
+                                            octal = octal * 8 + (n - b'0') as u16;
+                                            self.pos += 1;
                                         }
+                                        _ => break,
                                     }
                                 }
                                 result.push(octal as u8);
@@ -273,8 +286,8 @@ impl<'a> Lexer<'a> {
         let start = self.pos;
         while self.pos < self.data.len() {
             match self.data[self.pos] {
-                b' ' | b'\t' | b'\r' | b'\n' | b'(' | b')' | b'<' | b'>' | b'/' | b'[' | b']'
-                | b'{' | b'}' | b'%' | 0 => break,
+                b' ' | b'\t' | b'\r' | b'\n' | b'\x0c' | b'(' | b')' | b'<' | b'>' | b'/'
+                | b'[' | b']' | b'{' | b'}' | b'%' | 0 => break,
                 _ => self.pos += 1,
             }
         }
@@ -283,14 +296,14 @@ impl<'a> Lexer<'a> {
         let mut name = String::with_capacity(raw.len());
         let mut i = 0;
         while i < raw.len() {
-            if raw[i] == b'#' && i + 2 < raw.len() {
-                if let Ok(b) =
+            if raw[i] == b'#'
+                && i + 2 < raw.len()
+                && let Ok(b) =
                     u8::from_str_radix(std::str::from_utf8(&raw[i + 1..i + 3]).unwrap_or("0"), 16)
-                {
-                    name.push(b as char);
-                    i += 3;
-                    continue;
-                }
+            {
+                name.push(b as char);
+                i += 3;
+                continue;
             }
             name.push(raw[i] as char);
             i += 1;
@@ -330,30 +343,30 @@ impl<'a> Lexer<'a> {
     /// Returns (obj_number, gen_number, offset_of_first_byte_after_obj_keyword) or None.
     pub(crate) fn find_next_obj(&mut self) -> Option<(u32, u32, usize)> {
         while self.pos < self.data.len() {
-            self.skip_whitespace();
+            self.skip_blank();
             if self.pos >= self.data.len() {
                 return None;
             }
             // Try to read: number number obj
             let saved = self.pos;
-            if let Token::Integer(n) = self.read_number() {
-                if n >= 0 {
-                    self.skip_whitespace();
-                    if self.pos < self.data.len() && self.data[self.pos].is_ascii_digit() {
-                        // This might be the generation number
-                        let gen_start = self.pos;
-                        while self.pos < self.data.len() && self.data[self.pos].is_ascii_digit() {
-                            self.pos += 1;
-                        }
-                        let gen: u32 = std::str::from_utf8(&self.data[gen_start..self.pos])
-                            .unwrap_or("0")
-                            .parse()
-                            .unwrap_or(0);
-                        self.skip_whitespace();
-                        if self.starts_with(b"obj") {
-                            self.pos += 3;
-                            return Some((n as u32, gen, self.pos));
-                        }
+            if let Token::Integer(n) = self.read_number()
+                && n >= 0
+            {
+                self.skip_blank();
+                if self.pos < self.data.len() && self.data[self.pos].is_ascii_digit() {
+                    // This might be the generation number
+                    let gen_start = self.pos;
+                    while self.pos < self.data.len() && self.data[self.pos].is_ascii_digit() {
+                        self.pos += 1;
+                    }
+                    let r#gen: u32 = std::str::from_utf8(&self.data[gen_start..self.pos])
+                        .unwrap_or("0")
+                        .parse()
+                        .unwrap_or(0);
+                    self.skip_blank();
+                    if self.starts_with(b"obj") {
+                        self.pos += 3;
+                        return Some((n as u32, r#gen, self.pos));
                     }
                 }
             }
@@ -399,6 +412,34 @@ mod tests {
         assert!(none);
     }
 
+    fn string_of(src: &[u8]) -> Vec<u8> {
+        match Lexer::new(src).next_token() {
+            Token::String(s) => s,
+            other => panic!("not a string: {other:?}"),
+        }
+    }
+
+    /// `\b` and `\f` are backspace and form feed. Read as the letters, an
+    /// `/O` entry that holds one is the wrong key, and an encrypted PDF that
+    /// opens with an empty password is reported password-protected.
+    #[test]
+    fn backspace_and_form_feed_escapes_are_decoded() {
+        assert_eq!(string_of(b"(a\\bb\\fc)"), b"a\x08b\x0cc");
+    }
+
+    /// A short octal escape ended where the next byte is not a digit, and
+    /// that byte was dropped: the `)` after `\0` closed nothing, and the
+    /// string ran on into the rest of the file.
+    #[test]
+    fn a_short_octal_escape_does_not_eat_the_next_byte() {
+        let mut lex = Lexer::new(b"(a\\0) /Next");
+        assert_eq!(lex.next_token(), Token::String(b"a\0".to_vec()));
+        assert_eq!(lex.next_token(), Token::Name("Next".into()));
+        assert_eq!(string_of(b"(\\12x)"), b"\nx");
+        assert_eq!(string_of(b"(\\1234)"), b"S4");
+        assert_eq!(string_of(b"(\\8)"), b"8");
+    }
+
     #[test]
     fn an_object_after_a_long_digit_run_is_still_found() {
         let mut data = vec![b'9'; 5000];
diff --git a/crates/exav-unpack/src/formats/pdf_parse/parse.rs b/crates/exav-unpack/src/formats/pdf_parse/parse.rs
index ae532590..fce57bb3 100644
--- a/crates/exav-unpack/src/formats/pdf_parse/parse.rs
+++ b/crates/exav-unpack/src/formats/pdf_parse/parse.rs
@@ -25,10 +25,10 @@ fn parse_object_depth(lex: &mut Lexer, depth: usize) -> Option<Primitive> {
             // encrypted-PDF key derivation). The reference target isn't resolved
             // here, so it surfaces as the leading integer.
             let saved = lex.pos();
-            if let Token::Integer(_gen) = lex.next_token() {
-                if let Token::R = lex.next_token() {
-                    return Some(Primitive::Reference(n as u32));
-                }
+            if let Token::Integer(_gen) = lex.next_token()
+                && let Token::R = lex.next_token()
+            {
+                return Some(Primitive::Reference(n as u32));
             }
             lex.set_pos(saved);
             Some(Primitive::Integer(n))
diff --git a/crates/exav-unpack/src/formats/pepack.rs b/crates/exav-unpack/src/formats/pepack.rs
index c8278010..04700b6f 100644
--- a/crates/exav-unpack/src/formats/pepack.rs
+++ b/crates/exav-unpack/src/formats/pepack.rs
@@ -344,13 +344,13 @@ fn identify(pe: &Pe) -> Option<Packer> {
     // Entry-point signature for FSG (which strips section names). FSG 2.0 stubs
     // begin the decompressor with a distinctive load of the packed-source and
     // destination pointers. Match at the entry-point file offset only.
-    if let Some(off) = pe.rva_to_off(pe.entry_rva) {
-        if let Some(win) = crate::bytes::at(pe.data, off, 2) {
-            // `BE xx xx xx xx` (mov esi, imm32) is the canonical FSG 2.0 stub
-            // opener; require it to sit right at the entry point.
-            if win[0] == 0xBE && fsg_stub_plausible(pe, off) {
-                return Some(Packer::Fsg);
-            }
+    if let Some(off) = pe.rva_to_off(pe.entry_rva)
+        && let Some(win) = crate::bytes::at(pe.data, off, 2)
+    {
+        // `BE xx xx xx xx` (mov esi, imm32) is the canonical FSG 2.0 stub
+        // opener; require it to sit right at the entry point.
+        if win[0] == 0xBE && fsg_stub_plausible(pe, off) {
+            return Some(Packer::Fsg);
         }
     }
     None
@@ -586,8 +586,8 @@ fn looks_random_name(name: &[u8; 8]) -> bool {
         return false;
     }
     let switches = n
-        .windows(2)
-        .filter(|w| w[0].is_ascii_lowercase() && w[1].is_ascii_uppercase())
+        .array_windows()
+        .filter(|[a, b]| a.is_ascii_lowercase() && b.is_ascii_uppercase())
         .count();
     digits > 0 || switches >= 2
 }
@@ -798,15 +798,15 @@ fn aplib_unpack<R>(
         if stream.len() < 8 {
             continue;
         }
-        if let Some(out) = aplib::depack(stream, cap) {
-            if looks_like_pe(&out) {
-                budget.commit(out.len() as u64);
-                let name = format!("{}-unpacked", packer_name(packer));
-                return Ok(match visit(Entry::new(name, out), budget) {
-                    Some(r) => Recovered::Halt(r),
-                    None => Recovered::Emitted,
-                });
-            }
+        if let Some(out) = aplib::depack(stream, cap)
+            && looks_like_pe(&out)
+        {
+            budget.commit(out.len() as u64);
+            let name = format!("{}-unpacked", packer_name(packer));
+            return Ok(match visit(Entry::new(name, out), budget) {
+                Some(r) => Recovered::Halt(r),
+                None => Recovered::Emitted,
+            });
         }
     }
     Ok(Recovered::Nothing)
@@ -999,7 +999,7 @@ fn looks_like_pe(out: &[u8]) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{extract, Format, Limits};
+    use crate::{Format, Limits, extract};
 
     /// Build a minimal but structurally valid PE with the given section names
     /// and one section carrying `body` as raw data. Used both as the packed
@@ -1197,9 +1197,11 @@ mod tests {
     fn non_pe_input_is_ignored() {
         let mut b = Budget::new(Limits::default());
         assert!(!is_pepack(b"\x7fELF not a PE"));
-        assert!(extract(Format::PePacked, b"\x7fELF..", &mut b)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::PePacked, b"\x7fELF..", &mut b)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     #[test]
diff --git a/crates/exav-unpack/src/formats/ppmd7/model.rs b/crates/exav-unpack/src/formats/ppmd7/model.rs
index c07d4055..c84348b6 100644
--- a/crates/exav-unpack/src/formats/ppmd7/model.rs
+++ b/crates/exav-unpack/src/formats/ppmd7/model.rs
@@ -162,10 +162,12 @@ impl<RC: RangeDec> Ppmd7<RC> {
             return None;
         }
         // Bounds-checked byte arena. Zero-initialised, matching `alloc_zeroed`.
-        // `try_reserve` keeps allocation failure non-panicking.
-        let mut arena: Vec<u8> = Vec::new();
-        arena.try_reserve_exact(total_size).ok()?;
-        arena.resize(total_size, 0u8);
+        // The size is a header's to choose, up to the model's largest, so the
+        // arena must not be touched to be made: `vec![0; n]` takes zeroed pages
+        // from the system and a stream pays for the ones its model reaches.
+        // The `try_reserve` first keeps failure to allocate non-panicking.
+        Vec::<u8>::new().try_reserve_exact(total_size).ok()?;
+        let arena: Vec<u8> = vec![0u8; total_size];
 
         let mut ppmd = Self {
             min_context: 0,
@@ -1504,11 +1506,7 @@ impl<RC: RangeDec> Ppmd7<RC> {
     /// an arena-bounds violation was observed while updating the model.
     #[inline(always)]
     fn finish_symbol(&self, sym: i32) -> i32 {
-        if self.corrupt {
-            SYM_ERROR
-        } else {
-            sym
-        }
+        if self.corrupt { SYM_ERROR } else { sym }
     }
 }
 
@@ -1516,7 +1514,7 @@ impl<RC: RangeDec> Ppmd7<RC> {
 mod tests {
     use super::*;
     use crate::formats::ppmd7::SevenZRangeDecoder;
-    use std::panic::{catch_unwind, AssertUnwindSafe};
+    use std::panic::{AssertUnwindSafe, catch_unwind};
 
     type Model = Ppmd7<SevenZRangeDecoder>;
 
diff --git a/crates/exav-unpack/src/formats/ppmd7/rangedec.rs b/crates/exav-unpack/src/formats/ppmd7/rangedec.rs
index c08f7d16..3b787a0f 100644
--- a/crates/exav-unpack/src/formats/ppmd7/rangedec.rs
+++ b/crates/exav-unpack/src/formats/ppmd7/rangedec.rs
@@ -19,8 +19,8 @@
 // Each coder is dead in a build without the format that uses it.
 #![cfg_attr(not(all(feature = "rar", feature = "sevenz")), allow(dead_code))]
 
-use super::common::PPMD_BIN_SCALE;
 use super::RangeDec;
+use super::common::PPMD_BIN_SCALE;
 
 const K_TOP_VALUE: u32 = 1 << 24;
 
diff --git a/crates/exav-unpack/src/formats/ppmd8/mod.rs b/crates/exav-unpack/src/formats/ppmd8/mod.rs
index d62843fb..0b35fdae 100644
--- a/crates/exav-unpack/src/formats/ppmd8/mod.rs
+++ b/crates/exav-unpack/src/formats/ppmd8/mod.rs
@@ -12,8 +12,8 @@ mod model;
 
 use std::io::{self, Read};
 
-use crate::formats::ppmd7::{RarRangeDecoder, SYM_END};
 use crate::LimitHit;
+use crate::formats::ppmd7::{RarRangeDecoder, SYM_END};
 pub(crate) use model::Ppmd8;
 
 pub(crate) const PPMD8_MIN_ORDER: u32 = 2;
@@ -203,6 +203,10 @@ mod tests {
     /// The reference `ppmd-rust` PPMd8 encoder, restart method only: its
     /// cut-off path swaps a state with itself through `mem::swap`, which a
     /// debug build aborts on. Cut-off streams come from fixtures instead.
+    /// The smallest model the reference encoder takes: ppmd-rust 1.5.2 refuses
+    /// the 2048 bytes the format allows (and the port reads).
+    const REF_MIN_MEM: u32 = 2064;
+
     fn encode(data: &[u8], order: u32, mem: u32, end_marker: bool) -> Vec<u8> {
         let mut packed = Vec::new();
         let mut enc = ppmd_rust::Ppmd8Encoder::new(
@@ -329,7 +333,7 @@ mod tests {
 
     #[test]
     fn model_matches_reference_small() {
-        roundtrip(b"a", 2, 2048);
+        roundtrip(b"a", 2, REF_MIN_MEM);
         roundtrip(b"abcabcabcabc", 3, 4096);
         roundtrip(&[0u8; 1000], 6, 1 << 16);
         roundtrip(&(0..=255u8).collect::<Vec<_>>(), 16, 1 << 16);
@@ -362,7 +366,7 @@ mod tests {
             lcg_bytes(100 * 1024, 43, 20),
         ];
         for data in &inputs {
-            for (order, mem) in [(2, 2048), (6, 4096), (16, 16 * 1024), (8, 64 * 1024)] {
+            for (order, mem) in [(2, REF_MIN_MEM), (6, 4096), (16, 16 * 1024), (8, 64 * 1024)] {
                 roundtrip(data, order, mem);
                 let packed = encode(data, order, mem, false);
                 let (restarts, cut_offs, _) =
diff --git a/crates/exav-unpack/src/formats/ppmd8/model.rs b/crates/exav-unpack/src/formats/ppmd8/model.rs
index abbf95e3..8323a423 100644
--- a/crates/exav-unpack/src/formats/ppmd8/model.rs
+++ b/crates/exav-unpack/src/formats/ppmd8/model.rs
@@ -17,7 +17,7 @@
 
 use super::RestoreMethod;
 use crate::formats::ppmd7::common::*;
-use crate::formats::ppmd7::{RangeDec, TaggedOffset, SYM_END, SYM_ERROR};
+use crate::formats::ppmd7::{RangeDec, SYM_END, SYM_ERROR, TaggedOffset};
 
 // Context (12 bytes):
 //   num_stats:u8 @0 (symbol count - 1)  flags:u8 @1
@@ -151,9 +151,9 @@ impl<RC: RangeDec> Ppmd8<RC> {
 
         let align_offset = (4u32.wrapping_sub(mem_size)) & 3;
         let total_size = (align_offset as usize).checked_add(mem_size as usize)?;
-        let mut arena: Vec<u8> = Vec::new();
-        arena.try_reserve_exact(total_size).ok()?;
-        arena.resize(total_size, 0u8);
+        // Not touched to be made: see the PPMd7 arena.
+        Vec::<u8>::new().try_reserve_exact(total_size).ok()?;
+        let arena: Vec<u8> = vec![0u8; total_size];
 
         let mut ppmd = Self {
             min_context: 0,
@@ -1817,10 +1817,6 @@ impl<RC: RangeDec> Ppmd8<RC> {
 
     /// `sym`, unless the model went out of bounds while updating.
     fn finish_symbol(&self, sym: u8) -> i32 {
-        if self.corrupt {
-            SYM_ERROR
-        } else {
-            sym as i32
-        }
+        if self.corrupt { SYM_ERROR } else { sym as i32 }
     }
 }
diff --git a/crates/exav-unpack/src/formats/qcow2.rs b/crates/exav-unpack/src/formats/qcow2.rs
index 3f3d5564..5e0c7a96 100644
--- a/crates/exav-unpack/src/formats/qcow2.rs
+++ b/crates/exav-unpack/src/formats/qcow2.rs
@@ -1,10 +1,11 @@
 //! QCOW2 — QEMU's copy-on-write disk image.
 //!
 //! 7-Zip opens these, every hypervisor reads them, and `qemu-img convert -c`
-//! produces one whose clusters are **deflate-compressed**. That last part is
-//! what makes the format matter to a scanner rather than merely to a
-//! virtualisation stack: a payload inside a compressed image appears nowhere in
-//! the file's bytes, so nothing short of real reconstruction reaches it.
+//! produces one whose clusters are **compressed** (deflate, or zstd where the
+//! image says so). That last part is what makes the format matter to a scanner
+//! rather than merely to a virtualisation stack: a payload inside a compressed
+//! image appears nowhere in the file's bytes, so nothing short of real
+//! reconstruction reaches it.
 //!
 //! Implemented from the public QCOW2 specification. All header and table fields
 //! are **big-endian**.
@@ -12,18 +13,23 @@
 //! The disk is addressed through two levels of tables. A guest offset splits
 //! into an L1 index, an L2 index and an offset within the cluster; `L1[i]` gives
 //! the location of an L2 table, and `L2[j]` gives the location of the cluster
-//! itself — or marks it unallocated (reads as zeroes) or compressed.
+//! itself — or marks it unallocated (reads as zeroes) or compressed. The tables
+//! are read from the source as clusters are reached, never held.
 //!
-//! Reconstruction emits the guest disk as a single member, which the partition
-//! and filesystem handlers then pick up in the normal way.
+//! The disk is a [`VDisk`]: one member when it fits the buffer limit, else its
+//! filesystems are walked in place (see `vdisk.rs`).
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use super::vdisk::{self, Health, Layout, Map, Unpacked, VDisk, be64, bytes_at};
+use super::volumes::report_enc;
+use crate::source::ByteSource;
+use crate::stream::Visit;
+use crate::{Budget, LimitHit};
 
-/// L2 entry bit 62: the cluster is deflate-compressed.
+/// L2 entry bit 62: the cluster is compressed.
 const L2_COMPRESSED: u64 = 1 << 62;
 /// Mask selecting a cluster's host offset from an uncompressed L1/L2 entry.
 /// Bits 9..55; the low bits are flags and the top bit is `COPIED`.
@@ -31,6 +37,17 @@ const OFFSET_MASK: u64 = 0x00ff_ffff_ffff_fe00;
 /// L2 entry bit 0 (qcow2 v3): the cluster reads as zeroes.
 const L2_ZERO: u64 = 1;
 
+/// Incompatible-feature bits (version 3, header offset 72) that change how
+/// the image is read.
+const INCOMPAT_EXTERNAL_DATA: u64 = 1 << 2;
+const INCOMPAT_COMPRESSION_TYPE: u64 = 1 << 3;
+const INCOMPAT_EXTENDED_L2: u64 = 1 << 4;
+/// Dirty, corrupt, external data file, compression type, extended L2: the
+/// bits this reader knows. An image needing another is not read.
+const INCOMPAT_KNOWN: u64 = 0b1_1111;
+
+const NAME: &str = "qcow2-disk";
+
 fn be_u32(d: &[u8], off: usize) -> u32 {
     crate::bytes::at(d, off, 4)
         .map(|b| u32::from_be_bytes([b[0], b[1], b[2], b[3]]))
@@ -53,193 +70,501 @@ pub(crate) fn is_qcow2(data: &[u8]) -> bool {
     super::sniff::is(data, crate::Format::Qcow2)
 }
 
-pub(crate) fn extract_qcow2<R>(
-    data: &[u8],
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if !is_qcow2(data) {
-        return Ok(None);
-    }
-    let cluster_bits = be_u32(data, 20);
-    let virtual_size = be_u64(data, 24);
-    let crypt_method = be_u32(data, 32);
-    let l1_size = be_u32(data, 36) as usize;
-    let l1_offset = crate::bytes::to_usize(be_u64(data, 40));
-    let backing_file_size = be_u32(data, 16);
+/// How a cluster is compressed.
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Codec {
+    Deflate,
+    Zstd,
+}
+
+struct Qcow2<'a> {
+    src: &'a dyn ByteSource,
+    l1: u64,
+    cluster: u64,
+    l2_entries: u64,
+    size: u64,
+    file_len: u64,
+    codec: Codec,
+    /// Compressed-cluster descriptor split, per the specification: the low
+    /// `csize_shift` bits are the host offset, the next ones the length in
+    /// 512-byte sectors minus one.
+    csize_shift: u32,
+    csize_mask: u64,
+}
+
+impl Layout for Qcow2<'_> {
+    fn name(&self) -> &'static str {
+        NAME
+    }
+
+    fn size(&self) -> u64 {
+        self.size
+    }
+
+    fn unit(&self) -> u64 {
+        self.cluster
+    }
+
+    fn map(&self, idx: u64) -> Map {
+        let i = idx.checked_div(self.l2_entries).unwrap_or(0);
+        let j = idx.checked_rem(self.l2_entries).unwrap_or(0);
+        let Some(l1e) = be64(self.src, self.l1.saturating_add(i.saturating_mul(8))) else {
+            return Map::Zero;
+        };
+        let l2 = l1e & OFFSET_MASK;
+        if l2 == 0 {
+            return Map::Zero; // no L2 table: this whole range is unallocated (zeroes)
+        }
+        // An L2 table past the end is a truncated image.
+        if l2
+            .checked_add(self.cluster)
+            .is_none_or(|end| end > self.file_len)
+        {
+            return Map::Zero;
+        }
+        let Some(e) = be64(self.src, l2.saturating_add(j.saturating_mul(8))) else {
+            return Map::Zero;
+        };
+        let compressed = e & L2_COMPRESSED != 0;
+        // Bit 0 means "reads as zeroes" for a *plain* entry only. In a
+        // compressed descriptor it is part of the host offset, so testing it
+        // unconditionally drops every compressed cluster that happens to
+        // start at an odd byte — silently, as a hole of zeroes that scans
+        // clean.
+        if e == 0 || (!compressed && e & L2_ZERO != 0) {
+            return Map::Zero; // unallocated or explicitly zero
+        }
+        if compressed {
+            let at = e & low_mask(self.csize_shift);
+            let sectors =
+                (e.checked_shr(self.csize_shift).unwrap_or(0) & self.csize_mask).saturating_add(1);
+            // The run starts mid-sector, so the first partial sector counts
+            // against the total length.
+            let len = sectors.saturating_mul(512).saturating_sub(at & 511);
+            // Past the end: a truncated image, not a hidden cluster.
+            if at >= self.file_len {
+                return Map::Zero;
+            }
+            let avail = self.file_len.saturating_sub(at);
+            return Map::Packed {
+                at,
+                stored: len.min(avail),
+                cut: len > avail,
+            };
+        }
+        // A table entry pointing past the end means the image is truncated:
+        // those bytes are absent rather than hidden, so the cluster stays zero.
+        // An offset of zero is no cluster at all, whatever the flag bits say.
+        let host = e & OFFSET_MASK;
+        let n = self
+            .cluster
+            .min(self.size.saturating_sub(idx.saturating_mul(self.cluster)));
+        if host == 0 || host.checked_add(n).is_none_or(|end| end > self.file_len) {
+            return Map::Zero;
+        }
+        Map::Plain(host)
+    }
+
+    fn unpack(&self, _idx: u64, at: u64, stored: u64, cut: bool, out: usize) -> Unpacked {
+        let raw = usize::try_from(stored)
+            .ok()
+            .and_then(|n| bytes_at(self.src, at, n));
+        let Some(raw) = raw else {
+            return Unpacked {
+                data: Vec::new(),
+                damaged: true,
+            };
+        };
+        let cap = out as u64;
+        let s = match self.codec {
+            // Clusters are raw DEFLATE, with no zlib wrapper.
+            Codec::Deflate => crate::salvage(crate::inflate::Inflate::new(&raw[..]), cap),
+            #[cfg(feature = "zstd")]
+            Codec::Zstd => {
+                use std::io::Read;
+                // The compressed run is padded to a sector: the cluster is
+                // what the frame holds, and what follows it is not a frame.
+                let frames = super::zstd::ZstdReader::new(std::io::Cursor::new(&raw[..]));
+                crate::salvage(frames.take(cap), cap)
+            }
+            #[cfg(not(feature = "zstd"))]
+            Codec::Zstd => {
+                return Unpacked {
+                    data: Vec::new(),
+                    damaged: true,
+                };
+            }
+        };
+        Unpacked {
+            damaged: s.part_way(cut),
+            data: s.data,
+        }
+    }
+
+    fn reports(&self, health: &Health) -> Vec<(u64, &'static str)> {
+        // A cluster whose compressed bytes are *present* but will not decode is
+        // content exav failed to read — it must be reported. A cluster pointing
+        // past the end of the file is content that is not there at all, which
+        // is a truncated image rather than a hidden payload, and stays quiet.
+        // Reported alongside the disk, not instead of it: zero-filling a failed
+        // cluster and saying nothing would hand the scanner clean-looking space
+        // where real content should be.
+        match health.undecodable() {
+            0 => Vec::new(),
+            n => vec![(
+                n.saturating_mul(self.cluster).min(self.size),
+                "QCOW2 compressed clusters that could not be decompressed",
+            )],
+        }
+    }
+}
+
+/// What a QCOW2 header makes of an image.
+enum Opened<'a> {
+    /// Not a QCOW2 image at all.
+    No,
+    /// A disk to read.
+    Disk(Qcow2<'a>),
+    /// An image whose disk is not read: the size it declares, whether it is
+    /// encrypted, and why.
+    Unread(u64, bool, &'static str),
+}
+
+/// Read the header of `src`.
+fn open(src: &dyn ByteSource) -> Opened<'_> {
+    let head = src.window(0, 112);
+    if !is_qcow2(&head) {
+        return Opened::No;
+    }
+    let version = be_u32(&head, 4);
+    let cluster_bits = be_u32(&head, 20);
+    let virtual_size = be_u64(&head, 24);
+    let crypt_method = be_u32(&head, 32);
+    let l1_size = u64::from(be_u32(&head, 36));
+    let l1_offset = be_u64(&head, 40);
+    let backing_file_size = be_u32(&head, 16);
+    let unread = |why| Opened::Unread(virtual_size, false, why);
 
     // A backing file holds the clusters this image does not, and it is not in
     // this file — the same shape as a differencing VHD.
     if backing_file_size > 0 {
-        return report(
+        return unread(
             "QCOW2 with a backing file: the disk is a delta against an image not in this file",
-            virtual_size,
-            budget,
-            visit,
         );
     }
     if crypt_method != 0 {
-        return report_enc("encrypted QCOW2 image", virtual_size, budget, visit);
+        return Opened::Unread(virtual_size, true, "encrypted QCOW2 image");
+    }
+    let mut codec = Codec::Deflate;
+    if version == 3 {
+        let incompat = be_u64(&head, 72);
+        if incompat & INCOMPAT_EXTERNAL_DATA != 0 {
+            return unread(
+                "QCOW2 with an external data file: the disk is held in a file not in this one",
+            );
+        }
+        if incompat & INCOMPAT_EXTENDED_L2 != 0 {
+            return unread("QCOW2 with extended L2 entries, which exav does not read");
+        }
+        if incompat & !INCOMPAT_KNOWN != 0 {
+            return unread("QCOW2 needing a feature exav does not know");
+        }
+        if incompat & INCOMPAT_COMPRESSION_TYPE != 0 {
+            // Past the header's declared length the field is not there.
+            let at = if be_u32(&head, 100) > 104 {
+                head.get(104).copied()
+            } else {
+                Some(0)
+            };
+            codec = match at {
+                Some(0) => Codec::Deflate,
+                Some(1) => Codec::Zstd,
+                _ => return unread("QCOW2 with a compression type exav does not read"),
+            };
+        }
     }
     // 9..=21 covers the 512-byte to 2 MiB cluster sizes the format allows; the
     // shift arithmetic below is meaningless outside it.
     if !(9..=21).contains(&cluster_bits) || l1_size == 0 {
-        return report("implausible QCOW2 geometry", virtual_size, budget, visit);
+        return unread("implausible QCOW2 geometry");
     }
-    let cluster_size = 1usize << cluster_bits;
-    let l2_entries = cluster_size / 8;
+    let cluster = 1u64 << cluster_bits;
+    let l2_entries = cluster / 8;
 
-    let Some(l1) = crate::bytes::at(data, l1_offset, l1_size.saturating_mul(8)) else {
-        return report(
-            "QCOW2 L1 table lies outside the image",
-            virtual_size,
-            budget,
-            visit,
-        );
-    };
-
-    budget.count_entry()?;
-    let cap = budget.reserve()?;
-    let want = virtual_size.min(
-        (l1_size as u64)
-            .saturating_mul(l2_entries as u64)
-            .saturating_mul(cluster_size as u64),
-    );
-    if want > cap {
-        return Ok(visit(
-            Entry::unsupported(
-                "qcow2-disk".to_string(),
-                want,
-                false,
-                "QCOW2 disk exceeds the per-member size budget",
-            ),
-            budget,
-        ));
+    // The L1 table is read as clusters are reached, but it has to be in the
+    // file.
+    let file_len = src.len() as u64;
+    if !l1_offset
+        .checked_add(l1_size.saturating_mul(8))
+        .is_some_and(|end| end <= file_len)
+    {
+        return unread("QCOW2 L1 table lies outside the image");
     }
+    let size = virtual_size.min(l1_size.saturating_mul(l2_entries).saturating_mul(cluster));
+    Opened::Disk(Qcow2 {
+        src,
+        l1: l1_offset,
+        cluster,
+        l2_entries,
+        size,
+        file_len,
+        codec,
+        csize_shift: 62u32.saturating_sub(cluster_bits.saturating_sub(8)),
+        csize_mask: low_mask(cluster_bits.saturating_sub(8)),
+    })
+}
 
-    // Compressed-cluster descriptor split, per the specification: the low
-    // `csize_shift` bits are the host offset, the next ones the length in
-    // 512-byte sectors minus one.
-    let csize_shift = 62u32.saturating_sub(cluster_bits.saturating_sub(8));
-    let csize_mask = low_mask(cluster_bits.saturating_sub(8));
+/// Walk a QCOW2 image's disk.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    match open(src) {
+        Opened::No => Ok(None),
+        Opened::Unread(size, encrypted, why) => {
+            report_enc(NAME, size, encrypted, why, budget, visit)
+        }
+        Opened::Disk(layout) => {
+            let allowance = budget.remaining_scan();
+            vdisk::walk(VDisk::new(src, layout, allowance), budget, visit)
+        }
+    }
+}
 
-    let mut disk = vec![0u8; want as usize];
-    // A cluster whose compressed bytes are *present* but will not inflate is
-    // content exav failed to read — it must be reported. A cluster pointing past
-    // the end of the file is content that is not there at all, which is a
-    // truncated image rather than a hidden payload, and stays quiet.
-    let mut undecodable_clusters = 0usize;
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
+    use std::io::{Read, Seek, SeekFrom};
 
-    for (i, l1_chunk) in l1.as_chunks::<8>().0.iter().enumerate() {
-        let l1e = u64::from_be_bytes(*l1_chunk);
-        let l2_off = crate::bytes::to_usize(l1e & OFFSET_MASK);
-        if l2_off == 0 {
-            continue; // no L2 table: this whole range is unallocated (zeroes)
-        }
-        let Some(l2) = crate::bytes::at(data, l2_off, l2_entries.saturating_mul(8)) else {
-            continue; // L2 table past the end: truncated image
+    /// An image of 64 clusters of 512 bytes: the header at 0, the L1 table at
+    /// 512 (one entry, to the L2 table at 1024), and `entry` as the L2 entry of
+    /// cluster 0. A data cluster holding `data` is at 1536.
+    fn image(version: u32, entry: u64, data: &[u8]) -> Vec<u8> {
+        let mut f = vec![0u8; 2048];
+        f[..4].copy_from_slice(b"QFI\xfb");
+        f[4..8].copy_from_slice(&version.to_be_bytes());
+        f[20..24].copy_from_slice(&9u32.to_be_bytes());
+        f[24..32].copy_from_slice(&(64u64 * 512).to_be_bytes());
+        f[36..40].copy_from_slice(&1u32.to_be_bytes());
+        f[40..48].copy_from_slice(&512u64.to_be_bytes());
+        f[512..520].copy_from_slice(&((1u64 << 63) | 1024).to_be_bytes());
+        f[1024..1032].copy_from_slice(&entry.to_be_bytes());
+        f[1536..1536 + data.len()].copy_from_slice(data);
+        f
+    }
+
+    /// A version 3 header with `incompat` set, `len` bytes long, and `ctype`.
+    fn v3(incompat: u64, len: u32, ctype: u8) -> Vec<u8> {
+        let mut f = image(3, 0, &[]);
+        f[72..80].copy_from_slice(&incompat.to_be_bytes());
+        f[100..104].copy_from_slice(&len.to_be_bytes());
+        f[104] = ctype;
+        f
+    }
+
+    /// The first `n` bytes of the disk the image opens as, and what was found
+    /// of the compressed clusters in reading them.
+    fn read(img: &[u8], n: usize) -> (Vec<u8>, u64) {
+        let src = &img;
+        let Opened::Disk(layout) = open(src) else {
+            panic!("the image should open as a disk");
         };
-        for (j, l2_chunk) in l2.as_chunks::<8>().0.iter().enumerate() {
-            let e = u64::from_be_bytes(*l2_chunk);
-            let compressed = e & L2_COMPRESSED != 0;
-            // Bit 0 means "reads as zeroes" for a *plain* entry only. In a
-            // compressed descriptor it is part of the host offset, so testing it
-            // unconditionally drops every compressed cluster that happens to
-            // start at an odd byte — silently, as a hole of zeroes that scans
-            // clean.
-            if e == 0 || (!compressed && e & L2_ZERO != 0) {
-                continue; // unallocated or explicitly zero
-            }
-            let guest = i
-                .saturating_mul(l2_entries)
-                .saturating_add(j)
-                .saturating_mul(cluster_size);
-            if guest >= disk.len() {
-                continue;
-            }
-            let n = cluster_size.min(disk.len().saturating_sub(guest));
-
-            if compressed {
-                let coffset = crate::bytes::to_usize(e & low_mask(csize_shift));
-                let nb_csectors =
-                    crate::bytes::to_usize(e.checked_shr(csize_shift).unwrap_or(0) & csize_mask)
-                        .saturating_add(1);
-                // The run starts mid-sector, so the first partial sector counts
-                // against the total length.
-                let csize = nb_csectors
-                    .saturating_mul(512)
-                    .saturating_sub(coffset & 511);
-                let Some(raw) = data.get(coffset..coffset.saturating_add(csize).min(data.len()))
-                else {
-                    continue; // past the end: truncated image, not a hidden cluster
-                };
-                // Cut by the end of the file: what is there is decoded, the
-                // rest is absent.
-                let rest_absent = coffset.saturating_add(csize) > data.len();
-                // Clusters are raw DEFLATE, with no zlib wrapper.
-                let s = crate::salvage(crate::inflate::Inflate::new(raw), cluster_size as u64);
-                let k = n.min(s.data.len());
-                disk[guest..guest.saturating_add(k)].copy_from_slice(&s.data[..k]);
-                if s.part_way(rest_absent) {
-                    undecodable_clusters = undecodable_clusters.saturating_add(1);
-                }
-                continue;
-            }
+        let mut d = VDisk::new(src, layout, u64::MAX);
+        let mut out = vec![0u8; n];
+        d.read_exact(&mut out).unwrap();
+        (out, d.health().undecodable())
+    }
 
-            // A table entry pointing past the end means the image is
-            // truncated: those bytes are absent rather than hidden, so the
-            // cluster stays zero.
-            let host = crate::bytes::to_usize(e & OFFSET_MASK);
-            if let Some(src) = crate::bytes::at(data, host, n) {
-                disk[guest..guest.saturating_add(n)].copy_from_slice(src);
-            }
+    fn unread(img: &[u8]) -> (bool, &'static str) {
+        match open(&img) {
+            Opened::Unread(_, enc, why) => (enc, why),
+            Opened::Disk(_) => panic!("the image should not open as a disk"),
+            Opened::No => panic!("the image should be one"),
         }
     }
 
-    if undecodable_clusters > 0 {
-        // Reported alongside the disk, not instead of it: what was reconstructed
-        // is still worth scanning, and the hole is still worth knowing about.
-        // Zero-filling a failed cluster and saying nothing would hand the
-        // scanner clean-looking space where real content should be.
-        budget.count_entry()?;
-        if let Some(r) = visit(
-            Entry::unsupported(
-                "qcow2-disk".to_string(),
-                (undecodable_clusters as u64).saturating_mul(cluster_size as u64),
-                false,
-                "QCOW2 compressed clusters that could not be decompressed",
-            ),
-            budget,
-        ) {
-            return Ok(Some(r));
+    const COPIED: u64 = 1 << 63;
+
+    #[test]
+    fn a_plain_cluster_is_read_from_its_offset() {
+        let img = image(2, COPIED | 1536, b"payload");
+        assert_eq!(&read(&img, 7).0, b"payload");
+    }
+
+    /// Bit 0 of a plain entry makes the cluster zeros, whatever it points at.
+    #[test]
+    fn the_zero_flag_of_a_plain_entry_reads_zeros() {
+        let img = image(3, COPIED | 1536 | 1, b"payload");
+        assert_eq!(read(&img, 7).0, [0u8; 7]);
+    }
+
+    /// An entry with flags and no offset names no cluster. Read as the offset
+    /// it is, zero, it would give the file's own header as the disk's first
+    /// sector, where the tool that mounts the image reads zeros.
+    #[test]
+    fn an_entry_with_flags_and_no_offset_is_not_the_file_header() {
+        let img = image(2, COPIED, b"payload");
+        assert_eq!(read(&img, 4).0, [0u8; 4]);
+    }
+
+    /// A cluster that is not wholly in the file is absent, not partly read.
+    #[test]
+    fn a_cluster_past_the_end_of_the_file_reads_as_zeros() {
+        let mut img = image(2, COPIED | 1536, b"payload");
+        img.truncate(1536 + 100);
+        assert_eq!(read(&img, 7).0, [0u8; 7]);
+    }
+
+    /// An L2 table that is not wholly in the file is absent.
+    #[test]
+    fn an_l2_table_past_the_end_of_the_file_reads_as_zeros() {
+        let mut img = image(2, COPIED | 1536, b"payload");
+        img[512..520].copy_from_slice(&(COPIED | 1800).to_be_bytes());
+        assert_eq!(read(&img, 7).0, [0u8; 7]);
+    }
+
+    /// A compressed cluster that will not inflate is counted, and an image cut
+    /// inside one is not: what is there is decoded and the rest is absent.
+    /// Forty compressed clusters of 2 MiB are 80 MiB decoded, past what the
+    /// cache keeps. The first, read again after the rest, is decoded again and
+    /// is what it was; the cache never holds more than it may, and what was
+    /// decoded is counted.
+    #[test]
+    fn a_compressed_cluster_read_again_after_eviction_is_the_same() {
+        use std::io::Write;
+        let (n, cluster) = (40usize, 1usize << 21);
+        let pattern =
+            |i: usize| -> Vec<u8> { (0..cluster).map(|k| (k % 251) as u8 ^ i as u8).collect() };
+        let mut f = vec![0u8; 4 << 20];
+        f[..4].copy_from_slice(b"QFI\xfb");
+        f[4..8].copy_from_slice(&2u32.to_be_bytes());
+        f[20..24].copy_from_slice(&21u32.to_be_bytes());
+        f[24..32].copy_from_slice(&((n * cluster) as u64).to_be_bytes());
+        f[36..40].copy_from_slice(&1u32.to_be_bytes());
+        f[40..48].copy_from_slice(&4096u64.to_be_bytes());
+        // The one L2 table is at 2 MiB, wholly in the file.
+        f[4096..4104].copy_from_slice(&((1u64 << 63) | (2 << 20)).to_be_bytes());
+        for i in 0..n {
+            let mut z = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::fast());
+            z.write_all(&pattern(i)).unwrap();
+            let z = z.finish().unwrap();
+            assert!(z.len() < 100_000);
+            let at = f.len() as u64;
+            let sectors = (at % 512 + z.len() as u64).div_ceil(512);
+            let e = (1u64 << 62) | at | ((sectors - 1) << 49);
+            f[(2 << 20) + i * 8..(2 << 20) + i * 8 + 8].copy_from_slice(&e.to_be_bytes());
+            f.extend_from_slice(&z);
+        }
+        let src = f.as_slice();
+        let Opened::Disk(layout) = open(&src) else {
+            panic!("a disk")
+        };
+        let mut d = VDisk::new(&src, layout, u64::MAX);
+        let at = |d: &mut VDisk<'_, Qcow2<'_>>, i: usize| {
+            d.seek(SeekFrom::Start((i * cluster + 1000) as u64))
+                .unwrap();
+            let mut b = vec![0u8; 4096];
+            d.read_exact(&mut b).unwrap();
+            b
+        };
+        let first = at(&mut d, 0);
+        assert_eq!(first, pattern(0)[1000..5096]);
+        for i in 1..n {
+            assert_eq!(at(&mut d, i), pattern(i)[1000..5096], "cluster {i}");
         }
+        assert_eq!(d.health().decoded(), (n * cluster) as u64);
+        assert_eq!(at(&mut d, 0), first, "cluster 0 after it was evicted");
+        let h = d.health();
+        assert_eq!(h.decoded(), ((n + 1) * cluster) as u64, "decoded again");
+        assert_eq!(h.undecodable(), 0);
+        assert!(h.cache_peak() <= vdisk::CACHE_BYTES, "{}", h.cache_peak());
     }
-    budget.commit(disk.len() as u64);
-    Ok(visit(Entry::new("qcow2-disk".to_string(), disk), budget))
-}
 
-fn report<R>(
-    reason: &'static str,
-    size: u64,
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    budget.count_entry()?;
-    Ok(visit(
-        Entry::unsupported("qcow2-disk".to_string(), size, false, reason),
-        budget,
-    ))
-}
+    #[test]
+    fn a_compressed_cluster_that_will_not_inflate_is_counted() {
+        use std::io::Write;
+        // One sector at 1536, compressed.
+        let entry = (1u64 << 62) | 1536;
+        let mut z = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::best());
+        z.write_all(&[b'a'; 512]).unwrap();
+        let z = z.finish().unwrap();
+        assert!(z.len() > 4 && z.len() < 100);
+        let whole = image(2, entry, &z);
+        assert_eq!(read(&whole, 512), (vec![b'a'; 512], 0));
+        // Bytes that are not deflate.
+        let (d, bad) = read(&image(2, entry, &[0xFF; 512]), 512);
+        assert_eq!((d, bad), (vec![0u8; 512], 1));
+        // The same stream with the file ending inside it: what is there is
+        // decoded, the rest is absent, and nothing is left undecoded.
+        let mut cut = whole.clone();
+        cut.truncate(1536 + z.len() / 2);
+        let (d, bad) = read(&cut, 512);
+        assert_eq!(bad, 0);
+        assert!(d.iter().all(|&b| b == 0 || b == b'a'));
+    }
 
-fn report_enc<R>(
-    reason: &'static str,
-    size: u64,
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    budget.count_entry()?;
-    Ok(visit(
-        Entry::unsupported("qcow2-disk".to_string(), size, true, reason),
-        budget,
-    ))
+    #[test]
+    fn the_features_that_change_how_the_image_is_read_are_not_ignored() {
+        assert!(unread(&v3(1 << 2, 104, 0)).1.contains("external data file"));
+        assert!(unread(&v3(1 << 4, 104, 0)).1.contains("extended L2"));
+        assert!(
+            unread(&v3(1 << 5, 104, 0))
+                .1
+                .contains("feature exav does not know")
+        );
+        assert!(unread(&v3(1 << 3, 112, 9)).1.contains("compression type"));
+        // Dirty and corrupt do not change where anything is.
+        assert!(matches!(
+            open(&v3(0b11, 104, 0).as_slice()),
+            Opened::Disk(_)
+        ));
+        // Zlib named by the feature, or the field absent: deflate.
+        assert!(matches!(
+            open(&v3(1 << 3, 112, 0).as_slice()),
+            Opened::Disk(_)
+        ));
+        assert!(matches!(
+            open(&v3(1 << 3, 104, 1).as_slice()),
+            Opened::Disk(_)
+        ));
+    }
+
+    #[test]
+    fn an_image_that_is_not_the_disk_is_reported_with_what_it_declares() {
+        let mut img = image(2, 0, &[]);
+        img[16..20].copy_from_slice(&5u32.to_be_bytes());
+        assert!(unread(&img).1.contains("backing file"));
+        let mut img = image(2, 0, &[]);
+        img[32..36].copy_from_slice(&1u32.to_be_bytes());
+        assert_eq!(unread(&img), (true, "encrypted QCOW2 image"));
+        for (at, v) in [(20usize, 8u32), (20, 22), (36, 0)] {
+            let mut img = image(2, 0, &[]);
+            img[at..at + 4].copy_from_slice(&v.to_be_bytes());
+            assert!(unread(&img).1.contains("geometry"), "{at} {v}");
+        }
+    }
+
+    /// A table bigger than the file is refused up front, and one that fits is
+    /// not held: the size of the disk is what the tables cover.
+    #[test]
+    fn the_l1_table_has_to_be_in_the_file_and_bounds_the_disk() {
+        let mut img = image(2, 0, &[]);
+        img[36..40].copy_from_slice(&u32::MAX.to_be_bytes());
+        assert!(unread(&img).1.contains("L1 table"));
+        // Offset near the top of the range: the sum must not wrap.
+        let mut img = image(2, 0, &[]);
+        img[40..48].copy_from_slice(&(u64::MAX - 3).to_be_bytes());
+        assert!(unread(&img).1.contains("L1 table"));
+        // A size beyond what one L1 entry covers is cut to it.
+        let mut img = image(2, 0, &[]);
+        img[24..32].copy_from_slice(&u64::MAX.to_be_bytes());
+        let src = img.as_slice();
+        let Opened::Disk(l) = open(&src) else {
+            panic!()
+        };
+        assert_eq!(l.size(), 64 * 512);
+    }
 }
diff --git a/crates/exav-unpack/src/formats/rar.rs b/crates/exav-unpack/src/formats/rar.rs
index a221ac90..5b6c3568 100644
--- a/crates/exav-unpack/src/formats/rar.rs
+++ b/crates/exav-unpack/src/formats/rar.rs
@@ -164,7 +164,7 @@ fn rar4_decrypt_member(
         None => rar3_crypt::candidates(&budget.passwords),
     };
     for pw in tries {
-        let Some(keys) = crypt.keys.get(&pw, &salt) else {
+        let Some(keys) = crypt.keys.get(&pw, &salt, &budget.rar3_derivations) else {
             break; // no more derivations: the member stays encrypted
         };
         let mut buf = raw.to_vec();
@@ -234,7 +234,7 @@ fn rar4_open_headers(
         let mut blocks = 0;
         while q < data.len() {
             let salt: [u8; 8] = crate::bytes::at(data, q, 8)?.try_into().ok()?;
-            let keys = crypt.keys.get(&pw, &salt)?;
+            let keys = crypt.keys.get(&pw, &salt, &budget.rar3_derivations)?;
             let mut first = data.get(q + 8..q + 24)?.to_vec();
             rar3_crypt::decrypt(&keys, &mut first);
             let head_size = usize::from(u16::from_le_bytes([first[5], first[6]]));
@@ -883,7 +883,7 @@ fn rar5_decrypt_member(
     if raw.len() as u64 > budget.limits.max_buffer_bytes {
         return None;
     }
-    let k = rar5_crypt::find_keys(&rec, &budget.passwords, keys)?;
+    let k = rar5_crypt::find_keys(&rec, &budget.passwords, keys, &budget.kdf_rounds)?;
     let mut buf = raw.to_vec();
     rar5_crypt::decrypt(&k.key, &rec.iv, &mut buf);
     Some((buf, rec.tweaked.then_some(k.hash_key)))
@@ -913,7 +913,7 @@ fn rar5_open_headers(
     budget: &Budget,
     keys: &mut KeyCache,
 ) -> Option<Vec<u8>> {
-    let k = rar5_crypt::find_keys(rec, &budget.passwords, keys)?;
+    let k = rar5_crypt::find_keys(rec, &budget.passwords, keys, &budget.kdf_rounds)?;
     let mut plain = data.get(..start)?.to_vec();
     let mut headers = 0;
     while p < data.len() {
@@ -1159,14 +1159,14 @@ fn join_rar4(volumes: &[&[u8]]) -> Result<Vec<u8>, String> {
             // it is given.
             if htype == 0x7B && flags & 0x0008 != 0 {
                 let at = pos + 7 + if flags & 0x0002 != 0 { 4 } else { 0 };
-                if let Some(n) = u16le(v, at).filter(|_| at + 2 <= pos + head_size) {
-                    if usize::from(n) != k {
-                        return Err(format!(
-                            "part {} is volume {} of its set",
-                            k + 1,
-                            usize::from(n) + 1
-                        ));
-                    }
+                if let Some(n) = u16le(v, at).filter(|_| at + 2 <= pos + head_size)
+                    && usize::from(n) != k
+                {
+                    return Err(format!(
+                        "part {} is volume {} of its set",
+                        k + 1,
+                        usize::from(n) + 1
+                    ));
                 }
             }
             match htype {
@@ -1186,13 +1186,13 @@ fn join_rar4(volumes: &[&[u8]]) -> Result<Vec<u8>, String> {
                         (false, None) => out.extend_from_slice(&v[pos..end]),
                         (true, Some(p)) => p.data.extend_from_slice(data),
                         (false, Some(_)) => {
-                            return Err(format!("part {} drops a member mid-way", k + 1))
+                            return Err(format!("part {} drops a member mid-way", k + 1));
                         }
                         (true, None) => {
                             return Err(format!(
                                 "part {} goes on with a member whose start is missing",
                                 k + 1
-                            ))
+                            ));
                         }
                     }
                     if before && !after {
@@ -1248,7 +1248,7 @@ fn rar4_whole(mut p: Pending, crc: u32) -> Result<Vec<u8>, String> {
     match (flags & 0x100 != 0, h.len() >= 40) {
         (true, true) => h[32..36].copy_from_slice(&((total >> 32) as u32).to_le_bytes()),
         _ if total > u64::from(u32::MAX) => {
-            return Err("a member past 4 GiB with no 64-bit size".to_string())
+            return Err("a member past 4 GiB with no 64-bit size".to_string());
         }
         _ => {}
     }
@@ -1320,16 +1320,16 @@ fn join_rar5(volumes: &[&[u8]]) -> Result<Vec<u8>, String> {
             let Some(b) = rar5_block(v, pos) else { break };
             // A volume past the first records its number: it must be where
             // it is given.
-            if b.htype == 1 && k > 0 {
-                if let Some(n) = rar5_volume_number(&v[b.hdr..b.data_off]) {
-                    if n != k as u64 {
-                        return Err(format!(
-                            "part {} is volume {} of its set",
-                            k + 1,
-                            n.saturating_add(1)
-                        ));
-                    }
-                }
+            if b.htype == 1
+                && k > 0
+                && let Some(n) = rar5_volume_number(&v[b.hdr..b.data_off])
+                && n != k as u64
+            {
+                return Err(format!(
+                    "part {} is volume {} of its set",
+                    k + 1,
+                    n.saturating_add(1)
+                ));
             }
             match b.htype {
                 1 if k == 0 => out.extend_from_slice(&v[pos..b.end]),
@@ -1354,13 +1354,13 @@ fn join_rar5(volumes: &[&[u8]]) -> Result<Vec<u8>, String> {
                             deferred.extend_from_slice(&v[pos..b.end])
                         }
                         (false, Some(_)) => {
-                            return Err(format!("part {} drops a member mid-way", k + 1))
+                            return Err(format!("part {} drops a member mid-way", k + 1));
                         }
                         (true, None) => {
                             return Err(format!(
                                 "part {} goes on with a member whose start is missing",
                                 k + 1
-                            ))
+                            ));
                         }
                     }
                     if before && !after {
@@ -1565,7 +1565,7 @@ mod tests {
         v.extend_from_slice(&0u16.to_le_bytes()); // flags
         v.extend_from_slice(&13u16.to_le_bytes()); // head_size
         v.extend_from_slice(&[0; 6]); // reserved1(2)+reserved2(4) = 6 -> total 13
-                                      // file header (type 0x74), flags 0x8000 (ADD_SIZE present)
+        // file header (type 0x74), flags 0x8000 (ADD_SIZE present)
         let mut fh = Vec::new();
         fh.extend_from_slice(&(payload.len() as u32).to_le_bytes()); // PACK_SIZE
         fh.extend_from_slice(&(payload.len() as u32).to_le_bytes()); // UNP_SIZE
@@ -1577,8 +1577,8 @@ mod tests {
         fh.extend_from_slice(&(name.len() as u16).to_le_bytes()); // NAME_SIZE
         fh.extend_from_slice(&0u32.to_le_bytes()); // ATTR
         fh.extend_from_slice(name); // NAME
-                                    // PACK_SIZE (first field of `fh`) doubles as the block's ADD_SIZE; there
-                                    // is no separate ADD_SIZE field. Header = generic(7) + fields.
+        // PACK_SIZE (first field of `fh`) doubles as the block's ADD_SIZE; there
+        // is no separate ADD_SIZE field. Header = generic(7) + fields.
         let head_size = 7 + fh.len();
         v.extend_from_slice(&[0, 0]); // crc
         v.push(0x74);
@@ -1786,8 +1786,8 @@ mod tests {
         let arcs = [
             rar4_stored(b"hi.txt", &[b'z'; 1000]),
             rar5_stored(b"a/b.bin", &[b'y'; 1000]),
-            std::fs::read(format!("{dir}/solid_rar4.rar")).unwrap(),
-            std::fs::read(format!("{dir}/solid_rar5.rar")).unwrap(),
+            crate::read_fixture(&format!("{dir}/solid_rar4.rar")).unwrap(),
+            crate::read_fixture(&format!("{dir}/solid_rar5.rar")).unwrap(),
         ];
         let names = |e: &[Entry]| {
             e.iter()
diff --git a/crates/exav-unpack/src/formats/rar3_crypt.rs b/crates/exav-unpack/src/formats/rar3_crypt.rs
index d09bee5b..22300d66 100644
--- a/crates/exav-unpack/src/formats/rar3_crypt.rs
+++ b/crates/exav-unpack/src/formats/rar3_crypt.rs
@@ -8,7 +8,9 @@
 //! The format has no password check: a wrong password is found out by the
 //! member's checksum.
 
-use aes::cipher::{block_padding::NoPadding, BlockModeDecrypt, KeyIvInit};
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use aes::cipher::{BlockModeDecrypt, KeyIvInit, block_padding::NoPadding};
 use sha1::{Digest, Sha1};
 
 type Aes128CbcDec = cbc::Decryptor<aes::Aes128>;
@@ -64,7 +66,7 @@ pub(crate) struct KeyCache {
     limit: usize,
 }
 
-/// The derivations one archive may make: about half a minute of SHA-1.
+/// The derivations one scan may make, whatever the number of archives in it.
 const MAX_DERIVATIONS: usize = 256;
 
 impl Default for KeyCache {
@@ -78,8 +80,14 @@ impl Default for KeyCache {
 
 impl KeyCache {
     /// The keys of `password` over `salt`; `None` when they are not cached and
-    /// the limit of derivations is reached.
-    pub(crate) fn get(&mut self, password: &str, salt: &[u8; 8]) -> Option<Keys> {
+    /// the limit of derivations is reached. `made` counts the derivations of
+    /// the whole scan.
+    pub(crate) fn get(
+        &mut self,
+        password: &str,
+        salt: &[u8; 8],
+        made: &AtomicUsize,
+    ) -> Option<Keys> {
         if let Some((.., k)) = self
             .keys
             .iter()
@@ -87,7 +95,7 @@ impl KeyCache {
         {
             return Some(k.clone());
         }
-        if self.keys.len() >= self.limit {
+        if made.fetch_add(1, Ordering::Relaxed) >= self.limit {
             return None;
         }
         let k = derive(password, salt);
@@ -121,11 +129,33 @@ mod tests {
             keys: Vec::new(),
             limit: 3,
         };
+        let made = AtomicUsize::new(0);
         for salt in 0..10u8 {
-            let got = cache.get("pw", &[salt; 8]);
+            let got = cache.get("pw", &[salt; 8], &made);
             assert_eq!(got.is_some(), salt < 3, "salt {salt}");
         }
-        assert!(cache.get("pw", &[1; 8]).is_some(), "a cached one is served");
+        assert!(
+            cache.get("pw", &[1; 8], &made).is_some(),
+            "a cached one is served"
+        );
         assert_eq!(cache.keys.len(), 3);
     }
+
+    /// Archives inside archives each start a cache of their own: the limit is
+    /// the scan's, counted in `made`, not each archive's.
+    #[test]
+    fn archives_of_one_scan_share_the_derivation_limit() {
+        let made = AtomicUsize::new(0);
+        let mut got = 0;
+        for archive in 0..10u8 {
+            let mut cache = KeyCache {
+                keys: Vec::new(),
+                limit: 3,
+            };
+            for salt in 0..5u8 {
+                got += usize::from(cache.get("pw", &[archive * 5 + salt; 8], &made).is_some());
+            }
+        }
+        assert_eq!(got, 3);
+    }
 }
diff --git a/crates/exav-unpack/src/formats/rar3_unpack.rs b/crates/exav-unpack/src/formats/rar3_unpack.rs
index aa2c888e..a7b09286 100644
--- a/crates/exav-unpack/src/formats/rar3_unpack.rs
+++ b/crates/exav-unpack/src/formats/rar3_unpack.rs
@@ -15,8 +15,8 @@
 //! Everything is bounds-checked and never panics on malformed input.
 
 use super::ppmd7::{
-    Ppmd7, RarRangeDecoder, PPMD7_MAX_MEM_SIZE, PPMD7_MAX_ORDER, PPMD7_MIN_MEM_SIZE,
-    PPMD7_MIN_ORDER, SYM_END,
+    PPMD7_MAX_MEM_SIZE, PPMD7_MAX_ORDER, PPMD7_MIN_MEM_SIZE, PPMD7_MIN_ORDER, Ppmd7,
+    RarRangeDecoder, SYM_END,
 };
 use crate::{Budget, LimitHit};
 use std::collections::VecDeque;
@@ -1191,10 +1191,11 @@ impl DecodeReader {
                         None => Ok(0),
                     };
                 }
-            } else if let Some(f) = self.filters.front() {
-                if f.offset == 0 && f.length > self.win.buffered() {
-                    self.fill();
-                }
+            } else if let Some(f) = self.filters.front()
+                && f.offset == 0
+                && f.length > self.win.buffered()
+            {
+                self.fill();
             }
             if !self.filters.is_empty() {
                 self.process_filters()?;
@@ -1566,11 +1567,7 @@ fn filter_itanium(mut buf: Vec<u8>, offset: i64) -> Vec<u8> {
 }
 
 fn abs_i(n: i32) -> i32 {
-    if n < 0 {
-        -n
-    } else {
-        n
-    }
+    if n < 0 { -n } else { n }
 }
 
 fn filter_rgb(r0: u32, r1: u32, buf: &[u8]) -> Vec<u8> {
diff --git a/crates/exav-unpack/src/formats/rar5_crypt.rs b/crates/exav-unpack/src/formats/rar5_crypt.rs
index 89650ba8..d39168d3 100644
--- a/crates/exav-unpack/src/formats/rar5_crypt.rs
+++ b/crates/exav-unpack/src/formats/rar5_crypt.rs
@@ -6,6 +6,8 @@
 //! key that tweaks the member's checksum, and the password check, the last
 //! folded to 8 bytes by XOR.
 
+use std::sync::atomic::AtomicU64;
+
 use aes::cipher::{BlockModeDecrypt, KeyIvInit};
 use hmac::{Hmac, KeyInit, Mac};
 use sha2::{Digest, Sha256};
@@ -134,19 +136,28 @@ pub(crate) fn find_keys(
     record: &CryptRecord,
     passwords: &[String],
     cache: &mut Vec<([u8; 16], u8, Vec<u8>, Keys)>,
+    spent: &AtomicU64,
 ) -> Option<Keys> {
-    find_keys_within(record, passwords, cache, MAX_KDF_ROUNDS)
+    find_keys_within(record, passwords, cache, spent, MAX_KDF_ROUNDS)
 }
 
-/// The PBKDF2 iterations all the derivations of one archive may add up to:
-/// every member may carry a salt of its own, and every password is tried over
-/// each. About half a minute of HMACs.
-const MAX_KDF_ROUNDS: u64 = 1 << 25;
+/// The PBKDF2 iterations all the derivations of one scan may add up to, however
+/// many archives it opens: every member may carry a salt of its own, every
+/// password is tried over each, and an archive may hold another. About 0.7 s of
+/// HMACs: 128 derivations at the count RAR writes (15), or one at 22. A
+/// header asking for 2^24 took 2.6 s a scan, and a member with a larger count
+/// than this is reported as encrypted, like one no password opens.
+const MAX_KDF_ROUNDS: u64 = crate::kdf::PBKDF2_MAX_ROUNDS;
+
+use crate::kdf::charge;
 
+/// `spent` counts the iterations derived so far in the scan, `cache` only the
+/// ones of this archive.
 fn find_keys_within(
     record: &CryptRecord,
     passwords: &[String],
     cache: &mut Vec<([u8; 16], u8, Vec<u8>, Keys)>,
+    spent: &AtomicU64,
     max_rounds: u64,
 ) -> Option<Keys> {
     let candidates = passwords
@@ -154,7 +165,6 @@ fn find_keys_within(
         .map(String::as_str)
         .chain(super::DEFAULT_ARCHIVE_PASSWORDS.iter().copied());
     let rounds_of = |count: u8| 1u64 << count.min(MAX_KDF_COUNT);
-    let mut spent: u64 = cache.iter().map(|(_, c, ..)| rounds_of(*c)).sum();
     for pw in candidates {
         let pw = pw.as_bytes();
         let cached = cache
@@ -164,8 +174,8 @@ fn find_keys_within(
         let keys = match cached {
             Some(k) => k,
             None => {
-                spent = spent.saturating_add(rounds_of(record.kdf_count));
-                if spent > max_rounds {
+                let rounds = rounds_of(record.kdf_count);
+                if !charge(spent, rounds, max_rounds) {
                     return None;
                 }
                 let k = derive(pw, &record.salt, record.kdf_count)?;
@@ -228,15 +238,60 @@ mod tests {
         }
     }
 
+    /// Archives inside archives each start a cache of their own, so a bound
+    /// kept in the cache is a bound per archive: a chain of them paid it each
+    /// time (21 s under a sanitizer for one 25 KB file). The bound is the
+    /// scan's.
+    #[test]
+    fn archives_of_one_scan_share_the_derivation_bound() {
+        let passwords: Vec<String> = (0..50).map(|i| format!("password {i}")).collect();
+        let spent = AtomicU64::new(0);
+        // 2^10 iterations a derivation, 2^13 allowed in all: eight of them,
+        // however many archives they are spread over.
+        let mut derived = 0;
+        for archive in 0..10 {
+            let mut cache = Vec::new();
+            let _ = find_keys_within(
+                &record(archive, 10),
+                &passwords,
+                &mut cache,
+                &spent,
+                1 << 13,
+            );
+            derived += cache.len();
+        }
+        assert_eq!(derived, 8);
+    }
+
+    /// A header asking for 2^24 iterations (the largest count RAR writes) cost
+    /// 2.6 s to refuse every password, 20 s under a sanitizer; it is not derived.
+    #[test]
+    fn a_count_whose_derivation_exceeds_the_scan_bound_is_not_derived() {
+        let passwords = vec!["secret".to_string()];
+        let mut cache = Vec::new();
+        let spent = AtomicU64::new(0);
+        let start = std::time::Instant::now();
+        assert!(find_keys(&record(1, 24), &passwords, &mut cache, &spent).is_none());
+        assert!(cache.is_empty());
+        assert!(start.elapsed() < std::time::Duration::from_millis(500));
+        // Counts RAR writes by default are still derived.
+        let _ = find_keys(&record(1, 15), &passwords, &mut cache, &spent);
+        assert!(!cache.is_empty());
+    }
+
     /// Salts of a member each, and a password list: the derivations stop at
     /// the archive's total, not at the end of the members.
     #[test]
     fn key_derivations_over_many_salts_stop_at_the_total() {
         let passwords: Vec<String> = (0..50).map(|i| format!("password {i}")).collect();
         let mut cache = Vec::new();
+        let spent = AtomicU64::new(0);
         // 2^10 iterations a derivation, 2^13 allowed in all: eight of them.
         for salt in 0..40 {
-            assert!(find_keys_within(&record(salt, 10), &passwords, &mut cache, 1 << 13).is_none());
+            assert!(
+                find_keys_within(&record(salt, 10), &passwords, &mut cache, &spent, 1 << 13)
+                    .is_none()
+            );
         }
         assert_eq!(cache.len(), 8);
     }
diff --git a/crates/exav-unpack/src/formats/rar5_unpack.rs b/crates/exav-unpack/src/formats/rar5_unpack.rs
index be988157..e33e1afc 100644
--- a/crates/exav-unpack/src/formats/rar5_unpack.rs
+++ b/crates/exav-unpack/src/formats/rar5_unpack.rs
@@ -730,18 +730,19 @@ fn run_filter(u: &mut Unpacker, flt: &FilterInfo) -> Result<(), LimitHit> {
 /// apply_filters: emit pending output, running the next filter if its range is
 /// fully unpacked. Returns true if it made progress (should be retried).
 fn apply_filters(u: &mut Unpacker) -> Result<bool, LimitHit> {
-    if let Some(flt) = u.filters.front() {
-        if u.write_ptr > flt.block_start && u.write_ptr >= flt.block_start + flt.block_length {
-            if u.last_write_ptr == flt.block_start {
-                let flt = u.filters.pop_front().unwrap();
+    let Some((bs, len)) = u.filters.front().map(|f| (f.block_start, f.block_length)) else {
+        return Ok(false);
+    };
+    if u.write_ptr > bs && u.write_ptr >= bs + len {
+        if u.last_write_ptr == bs {
+            if let Some(flt) = u.filters.pop_front() {
                 run_filter(u, &flt)?;
-            } else {
-                let bs = flt.block_start;
-                push_window_data(u, u.last_write_ptr, bs)?;
-                u.last_write_ptr = bs;
             }
-            return Ok(true);
+        } else {
+            push_window_data(u, u.last_write_ptr, bs)?;
+            u.last_write_ptr = bs;
         }
+        return Ok(true);
     }
     Ok(false)
 }
diff --git a/crates/exav-unpack/src/formats/reported.rs b/crates/exav-unpack/src/formats/reported.rs
index b5513e0f..3a059585 100644
--- a/crates/exav-unpack/src/formats/reported.rs
+++ b/crates/exav-unpack/src/formats/reported.rs
@@ -12,8 +12,8 @@
 //!
 //! # Why these are still here
 //!
-//! Two of them are blocked on licensing rather than on effort, and that is
-//! worth writing down so nobody re-derives the search:
+//! One is blocked on licensing, the others on effort or on a way to check a
+//! decoder; that is worth writing down so nobody re-derives the search:
 //!
 //! * **lrzip** — the rzip long-range match stream has no published
 //!   specification. It is defined only by lrzip's own GPL source, which exav
@@ -21,12 +21,14 @@
 //!   language. Running the tool as an *oracle* is allowed, but inferring an
 //!   exact bitstream from black-box behaviour is not something to attempt and
 //!   then claim.
-//! * **InstallShield `ISc(` cabinets** — likewise undocumented; the only
-//!   implementation is the LGPL `unshield` **C project**. Not to be confused
-//!   with the MIT `unshield` *crate*, which reads the older InstallShield `.z`
-//!   archive — a different format, and one exav does open (`formats/ishield_z`).
+//! * **InstallShield `ISc(` cabinets** — undocumented; the implementation is
+//!   the `unshield` **C project**, under the MIT licence, so its source may be
+//!   read and ported with a NOTICE entry. Not to be confused with the MIT
+//!   `unshield` *crate*, which reads the older InstallShield `.z` archive — a
+//!   different format, and one exav does open (`formats/ishield_z`, ported
+//!   from that crate).
 //!
-//! Both therefore stay recognised-and-reported, which is the honest answer:
+//! They stay recognised-and-reported, which is the honest answer:
 //! `UNSCANNABLE` tells an operator there is a gap, where a decoder that guessed
 //! would produce plausible bytes and a confident `OK`.
 
diff --git a/crates/exav-unpack/src/formats/romfs.rs b/crates/exav-unpack/src/formats/romfs.rs
new file mode 100644
index 00000000..d744d744
--- /dev/null
+++ b/crates/exav-unpack/src/formats/romfs.rs
@@ -0,0 +1,443 @@
+//! romfs: the files of an image, read where they lie.
+//!
+//! The smallest read-only filesystem Linux has, of boot floppies and the
+//! firmware of small devices: nothing is compressed, so a file is the bytes
+//! after its header. The image is a `Read + Seek`, read where the walk goes.
+//! Only a file is ever held, bounded by the buffer limit.
+//!
+//! ```text
+//! "-rom1fs-"  size  checksum  volume name         padded to 16 bytes
+//! file header (16 bytes)   next header and type, a directory's first entry
+//!                          (or a link's target), size, checksum
+//!   name (null-ended, padded to 16), then the data (padded to 16)
+//! ```
+//!
+//! All numbers are big-endian. A directory is the list of headers that its
+//! first entry begins and each one's next header goes on with. A hard link is
+//! read as the file it names. A symbolic link or a device node holds no file's
+//! bytes and is not emitted. The checksums are not checked.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::collections::HashSet;
+use std::io::{Read, Seek};
+
+use super::vol::{Attrs, Emit, Got, List, Piece, Pieces, Vol, be32, give, read_file};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, LimitHit};
+
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
+
+/// The longest a name is, bytes.
+const MAX_NAME: usize = 1024;
+
+/// How many hard links are followed to a file.
+const MAX_LINKS: usize = 8;
+
+/// The kinds of header.
+const HARD_LINK: u32 = 0;
+const DIRECTORY: u32 = 1;
+const FILE: u32 = 2;
+
+/// Whether `data`, the start of an image, holds the name romfs begins with.
+pub(crate) fn is_romfs(data: &[u8]) -> bool {
+    super::sniff::is(data, crate::Format::Romfs)
+}
+
+/// A file header.
+struct Header {
+    kind: u32,
+    executable: bool,
+    next: u64,
+    spec: u64,
+    size: u64,
+    name: String,
+    /// Where the data begins.
+    data: u64,
+}
+
+/// The next multiple of 16.
+fn align(n: u64) -> u64 {
+    n.saturating_add(15) & !15
+}
+
+/// The header at `at`.
+fn header(v: &mut Vol, at: u64) -> Option<Header> {
+    let h = v.at(at, 16)?;
+    let word = be32(&h, 0);
+    let mut name = Vec::new();
+    let mut pos = at.checked_add(16)?;
+    loop {
+        let chunk = v.at(pos, 16)?;
+        match chunk.iter().position(|&b| b == 0) {
+            Some(end) => {
+                name.extend_from_slice(&chunk[..end]);
+                break;
+            }
+            None => name.extend_from_slice(&chunk),
+        }
+        if name.len() > MAX_NAME {
+            return None;
+        }
+        pos = pos.checked_add(16)?;
+    }
+    // The name and its null end, padded to 16 bytes.
+    let data = at
+        .checked_add(16)?
+        .checked_add(align((name.len() as u64).saturating_add(1)))?;
+    Some(Header {
+        kind: word & 7,
+        executable: word & 8 != 0,
+        next: u64::from(word & !15),
+        spec: u64::from(be32(&h, 4)),
+        size: u64::from(be32(&h, 8)),
+        name: String::from_utf8_lossy(&name).into_owned(),
+        data,
+    })
+}
+
+/// The entries of the directory whose first header is at `first`: header and
+/// place. The flag is false where the list is damaged. `left` counts the
+/// headers the walk may still read.
+fn entries(v: &mut Vol, first: u64, left: &mut u64, limit: usize) -> (Vec<(u64, Header)>, bool) {
+    let mut out = Vec::new();
+    let mut at = first;
+    let mut seen = HashSet::new();
+    while at != 0 {
+        if *left == 0 || !seen.insert(at) {
+            return (out, false);
+        }
+        *left = left.saturating_sub(1);
+        let Some(h) = header(v, at) else {
+            return (out, false);
+        };
+        let next = h.next;
+        if h.name != "." && h.name != ".." {
+            if out.len() >= limit {
+                return (out, true);
+            }
+            out.push((at, h));
+        }
+        at = next;
+    }
+    (out, true)
+}
+
+/// The bytes of a file whose header is `h`: held when they are at most `cap`,
+/// else read as they go.
+fn file<'a>(v: &'a mut Vol<'_>, h: &Header, cap: u64) -> Got<'a> {
+    let plan = List {
+        pieces: vec![Piece::Disk(h.data, h.size)].into_iter(),
+        intact: true,
+    };
+    read_file(v, Pieces::new(plan, h.size), h.size, cap)
+}
+
+/// Walk a romfs image given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the romfs image `disk`, which is `len` bytes long, handing each file
+/// to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    let head = v
+        .at(0, crate::bytes::to_usize(len.min(64)))
+        .unwrap_or_default();
+    if !is_romfs(&head) {
+        return Ok(None);
+    }
+    // Nothing is read from past the size the image says it has.
+    v.len = v.len.min(u64::from(be32(&head, 8)));
+    // The volume name, padded to 16 bytes, and then the header of the root.
+    let name_end = head
+        .get(16..)
+        .and_then(|n| n.iter().position(|&b| b == 0))
+        .unwrap_or(0);
+    let root_at = 16u64.saturating_add(align((name_end as u64).saturating_add(1)));
+    let Some(root) = header(&mut v, root_at).filter(|r| r.kind == DIRECTORY) else {
+        return Err(LimitHit::corrupt(
+            "romfs open: the root directory is unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    // The headers of an image are disjoint, 16 bytes at the least each.
+    let mut left = v.len / 16;
+    let mut damaged = false;
+    let mut seen: HashSet<u64> = HashSet::from([root.spec]);
+    let mut stack = vec![(root.spec, String::new(), 0usize)];
+    while let Some((first, prefix, depth)) = stack.pop() {
+        let (list, intact) = entries(&mut v, first, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for (_, h) in list {
+            budget.count_entry()?;
+            let path = if prefix.is_empty() {
+                h.name.clone()
+            } else {
+                format!("{prefix}/{}", h.name)
+            };
+            // A hard link is the file it names.
+            let mut target = h;
+            let mut hops = 0usize;
+            while target.kind == HARD_LINK && hops < MAX_LINKS {
+                hops = hops.saturating_add(1);
+                match header(&mut v, target.spec) {
+                    Some(t) => {
+                        target = Header {
+                            name: target.name,
+                            ..t
+                        };
+                    }
+                    None => {
+                        damaged = true;
+                        break;
+                    }
+                }
+            }
+            // Links that lead only to links lead nowhere.
+            if target.kind == HARD_LINK {
+                damaged = true;
+                continue;
+            }
+            match target.kind {
+                DIRECTORY => {
+                    if depth >= MAX_DEPTH {
+                        damaged = true;
+                    } else if seen.insert(target.spec) {
+                        below.push((target.spec, path, depth.saturating_add(1)));
+                    }
+                }
+                FILE => {
+                    let attrs = Attrs {
+                        mode: Some(if target.executable {
+                            0o100755
+                        } else {
+                            0o100644
+                        }),
+                        mtime: None,
+                    };
+                    if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                        file(&mut v, &target, cap)
+                    })? {
+                        return Ok(Some(r));
+                    }
+                }
+                // A link or a node holds no file's bytes.
+                _ => {}
+            }
+        }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "romfs walk: the image is damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::Cursor;
+
+    /// An image being written: headers at the places it is told.
+    struct Img(Vec<u8>);
+
+    impl Img {
+        fn new() -> Img {
+            let mut d = vec![0u8; 32];
+            d[..8].copy_from_slice(b"-rom1fs-");
+            d[16] = b'T';
+            Img(d)
+        }
+
+        /// A header at `at` (which must be a multiple of 16), its data after
+        /// the name; the place after it.
+        fn put(
+            &mut self,
+            at: usize,
+            next: u32,
+            kind: u32,
+            spec: u32,
+            name: &str,
+            data: &[u8],
+        ) -> usize {
+            let end = at + 16 + (name.len() + 1).div_ceil(16) * 16 + data.len().div_ceil(16) * 16;
+            if self.0.len() < end.max(at + 16) {
+                self.0.resize(end.max(at + 16), 0);
+            }
+            self.0[at..at + 4].copy_from_slice(&(next | kind).to_be_bytes());
+            self.0[at + 4..at + 8].copy_from_slice(&spec.to_be_bytes());
+            self.0[at + 8..at + 12].copy_from_slice(&(data.len() as u32).to_be_bytes());
+            self.0[at + 16..at + 16 + name.len()].copy_from_slice(name.as_bytes());
+            let d = at + 16 + (name.len() + 1).div_ceil(16) * 16;
+            self.0[d..d + data.len()].copy_from_slice(data);
+            end
+        }
+
+        fn finish(mut self) -> Vec<u8> {
+            let n = self.0.len() as u32;
+            self.0[8..12].copy_from_slice(&n.to_be_bytes());
+            self.0
+        }
+    }
+
+    type Member = (String, Vec<u8>, Option<&'static str>);
+
+    fn walked(d: &[u8], limits: Limits) -> (Vec<Member>, Result<(), LimitHit>) {
+        let mut out = Vec::new();
+        let mut budget = Budget::new(limits);
+        let len = d.len() as u64;
+        let end = walk_volume(Cursor::new(d), len, &mut budget, &mut |e, _| {
+            let e = e.whole();
+            out.push((e.name, e.data, e.unsupported));
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    /// A root (`.` at 32, `..` at 64, and the entries from 96) with a file `a`
+    /// ("hi"), a folder `d` holding a file `b`, and a link `l` to `a`.
+    fn tree() -> Img {
+        let mut img = Img::new();
+        img.put(32, 64, DIRECTORY, 32, ".", b"");
+        img.put(64, 96, DIRECTORY, 32, "..", b"");
+        // a at 96 (data after the name: 96 + 16 + 16 + 16 = 144), d at 144.
+        img.put(96, 144, FILE, 0, "a", b"hi");
+        img.put(144, 224, DIRECTORY, 176, "d", b"");
+        // d's entries from 176: `.` is not listed, `b` is.
+        img.put(176, 0, FILE, 0, "b", b"in d");
+        // The link follows d in the root's list, after d's entries.
+        img.put(224, 0, HARD_LINK, 96, "l", b"");
+        img
+    }
+
+    #[test]
+    fn the_files_of_a_tree_come_out_and_a_hard_link_is_the_file_it_names() {
+        let (e, end) = walked(&tree().finish(), Limits::default());
+        end.unwrap();
+        let mut got: Vec<_> = e.iter().map(|m| (m.0.as_str(), m.1.as_slice())).collect();
+        got.sort();
+        assert_eq!(
+            got,
+            [("a", &b"hi"[..]), ("d/b", &b"in d"[..]), ("l", &b"hi"[..])]
+        );
+    }
+
+    #[test]
+    fn a_list_that_comes_back_to_a_header_ends_with_the_files_before_it() {
+        let mut img = tree();
+        // a's next is a.
+        img.0[96..100].copy_from_slice(&(96u32 | FILE).to_be_bytes());
+        let (e, end) = walked(&img.finish(), Limits::default());
+        assert!(end.unwrap_err().is_corrupt());
+        assert_eq!(e.iter().map(|m| m.0.as_str()).collect::<Vec<_>>(), ["a"]);
+    }
+
+    #[test]
+    fn a_folder_that_lists_the_folder_it_is_in_is_walked_once() {
+        let mut img = tree();
+        // d's first entry is the root's first: its list is the root's.
+        img.0[148..152].copy_from_slice(&96u32.to_be_bytes());
+        let (e, end) = walked(&img.finish(), Limits::default());
+        end.unwrap();
+        let names: Vec<_> = e.iter().map(|m| m.0.as_str()).collect();
+        assert_eq!(
+            names.iter().filter(|n| n.ends_with('a')).count(),
+            2,
+            "{names:?}"
+        );
+        assert!(names.len() < 8, "{names:?}");
+    }
+
+    #[test]
+    fn links_that_lead_only_to_links_end_the_walk_as_damaged() {
+        let mut img = Img::new();
+        img.put(32, 64, DIRECTORY, 32, ".", b"");
+        img.put(64, 96, DIRECTORY, 32, "..", b"");
+        img.put(96, 128, HARD_LINK, 128, "x", b"");
+        img.put(128, 0, HARD_LINK, 96, "y", b"");
+        let (e, end) = walked(&img.finish(), Limits::default());
+        assert!(e.is_empty());
+        assert!(end.unwrap_err().is_corrupt());
+    }
+
+    #[test]
+    fn a_file_longer_than_the_image_is_reported_with_what_there_is() {
+        let mut img = tree();
+        img.0[96 + 8..96 + 12].copy_from_slice(&5000u32.to_be_bytes());
+        let (e, end) = walked(&img.finish(), Limits::default());
+        end.unwrap();
+        let a = e.iter().find(|m| m.0 == "a").unwrap();
+        assert_eq!(a.2, Some("file could not be read from the volume"));
+    }
+
+    #[test]
+    fn the_entry_past_the_member_limit_is_counted_and_stops_the_walk() {
+        let run = |max: u64| {
+            let limits = Limits {
+                max_members: max,
+                ..Limits::default()
+            };
+            walked(&tree().finish(), limits)
+        };
+        // a, d, b and l.
+        let (e, end) = run(4);
+        end.unwrap();
+        assert_eq!(e.len(), 3);
+        let (_, end) = run(3);
+        assert!(!end.unwrap_err().is_corrupt());
+    }
+
+    #[test]
+    fn a_file_over_the_buffer_limit_is_read_as_it_goes_and_the_walk_goes_on() {
+        let limits = Limits {
+            max_buffer_bytes: 3,
+            ..Limits::default()
+        };
+        let (held, _) = walked(&tree().finish(), Limits::default());
+        let img = tree().finish();
+        let len = img.len() as u64;
+        let mut budget = Budget::new(limits);
+        let (e, end) = collected(|emit| walk_volume(Cursor::new(&img[..]), len, &mut budget, emit));
+        end.unwrap();
+        // The same files, the same bytes, the long ones not held.
+        assert_eq!(e.len(), held.len());
+        for ((entry, streamed), (name, data, _)) in e.iter().zip(&held) {
+            assert_eq!((&entry.name, &entry.data), (name, data));
+            assert_eq!(*streamed, data.len() > 3, "{name}");
+            assert_eq!(entry.unsupported, None, "{name}");
+        }
+        assert!(e.iter().any(|(_, streamed)| *streamed));
+    }
+}
diff --git a/crates/exav-unpack/src/formats/rpm.rs b/crates/exav-unpack/src/formats/rpm.rs
new file mode 100644
index 00000000..6cc2bc83
--- /dev/null
+++ b/crates/exav-unpack/src/formats/rpm.rs
@@ -0,0 +1,229 @@
+//! RPM packages: the install scripts and the payload.
+//!
+//! An RPM is a 96-byte lead, a signature header, the package's header (both
+//! "header structures": a magic, an entry count, a size of data, the entries,
+//! then the data) and the payload, a compressed cpio archive. The payload comes
+//! out as one member, named for its format and compressor, which the scanner
+//! opens in turn (gzip, xz, zstd, bzip2 or lzma, then cpio). The scripts that
+//! run as root when a package is installed, removed or updated sit in the
+//! header's data; each comes out as a member of its own, so signatures see them
+//! as text. Integers are big-endian.
+//!
+//! Every count and offset is checked against the file before it is used; the
+//! header data is read whole, up to a fixed bound.
+
+use crate::*;
+use std::io::{Read, Seek, SeekFrom};
+
+const LEAD: u64 = 96;
+const HEADER_MAGIC: [u8; 4] = [0x8E, 0xAD, 0xE8, 0x01];
+/// Signature type of a lead that is followed by a signature header.
+const HEADER_SIGNATURE: u16 = 5;
+/// The most entries a header may have (rpm's own bound).
+const MAX_ENTRIES: u32 = 0xFFFF;
+/// The most data a header is read with. Real packages have a few megabytes at
+/// most (a kernel's file list).
+const MAX_DATA: u32 = 64 << 20;
+/// The most strings of one script array taken (triggers).
+const MAX_STRINGS: u32 = 4096;
+/// The most script members of a package.
+const MAX_SCRIPTS: usize = 4096;
+
+const TAG_PAYLOAD_FORMAT: u32 = 1124;
+const TAG_PAYLOAD_COMPRESSOR: u32 = 1125;
+const STRING: u32 = 6;
+const STRING_ARRAY: u32 = 8;
+
+/// Header tags whose value is a script, and the member each is given.
+const SCRIPTS: &[(u32, &str)] = &[
+    (1023, "scripts/prein"),
+    (1024, "scripts/postin"),
+    (1025, "scripts/preun"),
+    (1026, "scripts/postun"),
+    (1079, "scripts/verify"),
+    (1151, "scripts/pretrans"),
+    (1152, "scripts/posttrans"),
+    (5020, "scripts/preuntrans"),
+    (5021, "scripts/postuntrans"),
+    (1065, "scripts/trigger"),
+    (5016, "scripts/filetrigger"),
+    (5026, "scripts/transfiletrigger"),
+];
+
+struct Entry {
+    tag: u32,
+    kind: u32,
+    offset: u32,
+    count: u32,
+}
+
+/// A header structure: its entries, its data and where it ends.
+struct Header {
+    entries: Vec<Entry>,
+    data: Vec<u8>,
+    /// Where the data starts in the file.
+    data_at: u64,
+    end: u64,
+}
+
+fn be32(b: &[u8], at: usize) -> u32 {
+    u32::from_be_bytes([b[at], b[at + 1], b[at + 2], b[at + 3]])
+}
+
+fn read_at<R: Read + Seek>(r: &mut R, at: u64, n: usize) -> Result<Vec<u8>, LimitHit> {
+    let mut out = vec![0u8; n];
+    r.seek(SeekFrom::Start(at))
+        .and_then(|_| r.read_exact(&mut out))
+        .map_err(|e| LimitHit::corrupt(format!("rpm: {e}")))?;
+    Ok(out)
+}
+
+fn read_header<R: Read + Seek>(r: &mut R, at: u64, total: u64) -> Result<Header, LimitHit> {
+    let h = read_at(r, at, 16)?;
+    if h[..4] != HEADER_MAGIC {
+        return Err(LimitHit::corrupt(
+            "rpm: no header structure where one belongs".to_string(),
+        ));
+    }
+    let (count, size) = (be32(&h, 8), be32(&h, 12));
+    if count > MAX_ENTRIES || size > MAX_DATA {
+        return Err(LimitHit::corrupt(
+            "rpm: header counts past the limits".to_string(),
+        ));
+    }
+    // Nothing is allocated for a count the file is too short to hold.
+    let data_at = at + 16 + u64::from(count) * 16;
+    if data_at + u64::from(size) > total {
+        return Err(LimitHit::corrupt("rpm: header cut short".to_string()));
+    }
+    let table = read_at(r, at + 16, count as usize * 16)?;
+    let entries = table
+        .as_chunks::<16>()
+        .0
+        .iter()
+        .map(|e| Entry {
+            tag: be32(e, 0),
+            kind: be32(e, 4),
+            offset: be32(e, 8),
+            count: be32(e, 12),
+        })
+        .collect();
+    Ok(Header {
+        entries,
+        data: read_at(r, data_at, size as usize)?,
+        data_at,
+        end: data_at + u64::from(size),
+    })
+}
+
+impl Header {
+    /// The NUL-terminated string at `offset` of the data, `(offset, length)`.
+    fn string_at(&self, offset: usize) -> Option<(usize, usize)> {
+        let rest = self.data.get(offset..)?;
+        Some((offset, rest.iter().position(|&b| b == 0)?))
+    }
+
+    fn string_of(&self, tag: u32) -> Option<&str> {
+        let e = self
+            .entries
+            .iter()
+            .find(|e| e.tag == tag && e.kind == STRING)?;
+        let (at, n) = self.string_at(e.offset as usize)?;
+        std::str::from_utf8(&self.data[at..at + n]).ok()
+    }
+}
+
+/// The name of the payload: what it is (`cpio`) and how it is compressed.
+fn payload_name(h: &Header) -> String {
+    let format = match h.string_of(TAG_PAYLOAD_FORMAT) {
+        Some("cpio") | None => ".cpio",
+        Some(_) => "",
+    };
+    let compressor = match h.string_of(TAG_PAYLOAD_COMPRESSOR) {
+        Some("gzip") => ".gz",
+        Some("bzip2") => ".bz2",
+        Some("xz") => ".xz",
+        Some("lzma") => ".lzma",
+        Some("zstd") => ".zst",
+        _ => "",
+    };
+    format!("payload{format}{compressor}")
+}
+
+/// Walk a package: its scripts, then its payload, each read from where it lies.
+pub(crate) fn walk<T>(
+    src: &dyn crate::source::ByteSource,
+    budget: &mut Budget,
+    visit: crate::stream::Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let mut source = crate::source::Reader::new(src);
+    let members = stream_offsets(&mut source)?;
+    crate::stream::stream_stored(&mut source, budget, visit, members)
+}
+
+pub(crate) fn stream_offsets<R: Read + Seek>(
+    source: &mut R,
+) -> Result<Vec<crate::stream::Region>, LimitHit> {
+    use crate::stream::Region;
+    let total = source
+        .seek(SeekFrom::End(0))
+        .map_err(|e| LimitHit::corrupt(format!("rpm: {e}")))?;
+    let lead = read_at(source, 0, LEAD as usize)?;
+    if u16::from_be_bytes([lead[78], lead[79]]) != HEADER_SIGNATURE {
+        // RPM 2's signature is a bare block that is not read here.
+        return Ok(vec![Region::Unwalked(
+            "rpm".into(),
+            "an RPM of the old kind, with no signature header",
+        )]);
+    }
+    let signature = read_header(source, LEAD, total)?;
+    // The package header follows the signature header, from the next multiple of 8.
+    let header = read_header(source, signature.end.next_multiple_of(8), total)?;
+
+    let mut regions = Vec::new();
+    'scripts: for &(tag, name) in SCRIPTS {
+        for e in header.entries.iter().filter(|e| e.tag == tag) {
+            let strings = match e.kind {
+                STRING => 1,
+                STRING_ARRAY => e.count.min(MAX_STRINGS),
+                _ => continue,
+            };
+            let mut at = e.offset as usize;
+            for i in 0..strings {
+                // Entries may share their strings: the members are bounded
+                // here, before anything is built for each.
+                if regions.len() >= MAX_SCRIPTS {
+                    regions.push(Region::Unwalked(
+                        "scripts".into(),
+                        "an RPM with more scripts than exav lists",
+                    ));
+                    break 'scripts;
+                }
+                let Some((start, n)) = header.string_at(at) else {
+                    break;
+                };
+                if n > 0 {
+                    let name = if e.kind == STRING {
+                        name.to_string()
+                    } else {
+                        format!("{name}/{i}")
+                    };
+                    regions.push(Region::Member(
+                        name,
+                        header.data_at + start as u64,
+                        n as u64,
+                    ));
+                }
+                at = start + n + 1;
+            }
+        }
+    }
+    if header.end < total {
+        regions.push(Region::Member(
+            payload_name(&header),
+            header.end,
+            total - header.end,
+        ));
+    }
+    Ok(regions)
+}
diff --git a/crates/exav-unpack/src/formats/rtf.rs b/crates/exav-unpack/src/formats/rtf.rs
index 76a1761b..85a5e829 100644
--- a/crates/exav-unpack/src/formats/rtf.rs
+++ b/crates/exav-unpack/src/formats/rtf.rs
@@ -1,99 +1,202 @@
-//! RTF embedded-object extractor.
+//! RTF: the tokenizer of the format, and the extractor of the objects it
+//! embeds.
 //!
 //! Implemented from the public **Microsoft Rich Text Format (RTF) Specification**
 //! (v1.9.1). An RTF file is a tree of brace-delimited groups containing control
 //! words (`\word` + optional signed number + one optional delimiting space) and
-//! control symbols (`\` + a single non-letter). An embedded OLE object is carried
-//! as ASCII hex inside an `\objdata` destination (RTF §"Objects"); malware hides
-//! droppers there (an OLE2/VBA document or a raw PE). We collect the hex bytes of
-//! every `\objdata`/`\datastore` destination and emit the decoded object so the
+//! control symbols (`\` + a single non-letter). The [`Lexer`] reads it, for the
+//! scanner and for exav-render's converter alike: what one sees as a control
+//! word, a group or text, so does the other.
+//!
+//! An embedded OLE object is carried as ASCII hex inside an `\objdata`
+//! destination (RTF §"Objects"); malware hides droppers there (an OLE2/VBA
+//! document or a raw PE). The extractor collects the hex bytes of every
+//! `\objdata`/`\datastore` destination and emits the decoded object so the
 //! engine can recurse into it.
 //!
 //! Hex digits inside the destination may be split across lines and interleaved
-//! with control words; we decode only `[0-9a-fA-F]`, skip control sequences (so
-//! their letters aren't misread as hex), and stop at the `}` closing the group.
-//! Every read is bounds-checked; truncated/hostile RTF cannot panic (an
-//! unterminated group runs to EOF, an odd trailing nibble is dropped).
+//! with control words; only `[0-9a-fA-F]` of the text between them is decoded
+//! (so the letters of a control word are not misread as hex), up to the `}`
+//! that closes the destination. Every read is bounds-checked; truncated or
+//! hostile RTF cannot panic (an unterminated group runs to EOF, an odd
+//! trailing nibble is dropped).
 
 use crate::*;
 
-/// Numeric value of an ASCII hex digit, else `None`.
-fn hex_nibble(b: u8) -> Option<u8> {
-    match b {
-        b'0'..=b'9' => Some(b - b'0'),
-        b'a'..=b'f' => Some(b - b'a' + 10),
-        b'A'..=b'F' => Some(b - b'A' + 10),
-        _ => None,
-    }
+/// One token of an RTF file.
+#[derive(Debug, PartialEq, Eq)]
+pub enum Tok<'a> {
+    Open,
+    Close,
+    /// A control word and its parameter.
+    Word(&'a str, Option<i32>),
+    /// `\'hh`.
+    Hex(u8),
+    /// A control symbol other than `\'`: `\~`, `\-`, `\_`, `\*`, `\\`, ...
+    Sym(u8),
+    /// Plain bytes.
+    Text(&'a [u8]),
+}
+
+/// The tokens of an RTF file, one at a time. Line breaks between tokens are
+/// not tokens; a backslash before one is a paragraph end.
+pub struct Lexer<'a> {
+    pub d: &'a [u8],
+    pub p: usize,
 }
 
-/// Consume the control word/symbol at `at` (a `\`). Returns its letter name
-/// (empty for a control symbol) and the offset just past the token — including a
-/// signed numeric parameter and one trailing delimiting space. Always advances.
-fn control_token(data: &[u8], at: usize) -> (&[u8], usize) {
-    let n = data.len();
-    let mut i = at + 1;
-    if i >= n {
-        return (&[], n);
+impl<'a> Lexer<'a> {
+    pub fn new(d: &'a [u8]) -> Self {
+        Lexer { d, p: 0 }
     }
-    if !data[i].is_ascii_alphabetic() {
-        return (&data[i..i], i + 1); // control symbol: backslash + one char
+
+    pub fn next_tok(&mut self) -> Option<Tok<'a>> {
+        loop {
+            let c = *self.d.get(self.p)?;
+            match c {
+                b'{' => {
+                    self.p += 1;
+                    return Some(Tok::Open);
+                }
+                b'}' => {
+                    self.p += 1;
+                    return Some(Tok::Close);
+                }
+                b'\r' | b'\n' => {
+                    self.p += 1;
+                    continue;
+                }
+                b'\\' => return Some(self.control()),
+                _ => {
+                    let s = self.p;
+                    while let Some(&c) = self.d.get(self.p) {
+                        if matches!(c, b'{' | b'}' | b'\\' | b'\r' | b'\n') {
+                            break;
+                        }
+                        self.p += 1;
+                    }
+                    return Some(Tok::Text(&self.d[s..self.p]));
+                }
+            }
+        }
     }
-    let name_start = i;
-    while i < n && data[i].is_ascii_alphabetic() {
-        i += 1;
+
+    fn control(&mut self) -> Tok<'a> {
+        self.p += 1;
+        let Some(&c) = self.d.get(self.p) else {
+            return Tok::Text(&[]);
+        };
+        if c.is_ascii_alphabetic() {
+            let s = self.p;
+            while self.d.get(self.p).is_some_and(|c| c.is_ascii_alphabetic()) && self.p - s < 32 {
+                self.p += 1;
+            }
+            let name = std::str::from_utf8(&self.d[s..self.p]).unwrap_or("");
+            let mut param = None;
+            let neg = self.d.get(self.p) == Some(&b'-');
+            let ds = if neg { self.p + 1 } else { self.p };
+            let mut e = ds;
+            while self.d.get(e).is_some_and(|c| c.is_ascii_digit()) && e - ds < 11 {
+                e += 1;
+            }
+            if e > ds {
+                let v: i64 = std::str::from_utf8(&self.d[ds..e])
+                    .ok()
+                    .and_then(|t| t.parse().ok())
+                    .unwrap_or(0);
+                let v = if neg { -v } else { v };
+                // Parameters are small in any real document; the bound keeps
+                // the arithmetic on them from overflowing.
+                param = Some(v.clamp(-100_000_000, 100_000_000) as i32);
+                self.p = e;
+            }
+            // One space after a control word belongs to it.
+            if self.d.get(self.p) == Some(&b' ') {
+                self.p += 1;
+            }
+            return Tok::Word(name, param);
+        }
+        self.p += 1;
+        if c == b'\'' {
+            let h = |b: Option<&u8>| b.and_then(|b| (*b as char).to_digit(16));
+            let hi = h(self.d.get(self.p));
+            let lo = h(self.d.get(self.p + 1));
+            return match (hi, lo) {
+                (Some(a), Some(b)) => {
+                    self.p += 2;
+                    Tok::Hex((a * 16 + b) as u8)
+                }
+                _ => Tok::Hex(0),
+            };
+        }
+        if c == b'\r' || c == b'\n' {
+            // A backslash before a line break is a paragraph end.
+            return Tok::Word("par", None);
+        }
+        Tok::Sym(c)
     }
-    let name = &data[name_start..i];
-    if i < n && data[i] == b'-' {
-        i += 1;
+
+    /// Skips the bytes standing for the `n` characters after `\uN`.
+    pub fn skip_fallback(&mut self, n: u32) {
+        for _ in 0..n {
+            match self.d.get(self.p) {
+                Some(b'\\') if self.d.get(self.p + 1) == Some(&b'\'') => self.p += 4,
+                Some(b'\\' | b'{' | b'}' | b'\r' | b'\n') | None => break,
+                Some(_) => self.p += 1,
+            }
+        }
+        self.p = self.p.min(self.d.len());
     }
-    while i < n && data[i].is_ascii_digit() {
-        i += 1;
+
+    /// The `n` raw bytes after `\binN`.
+    pub fn take_bin(&mut self, n: usize) -> &'a [u8] {
+        let e = self.p.saturating_add(n).min(self.d.len());
+        let s = &self.d[self.p..e];
+        self.p = e;
+        s
     }
-    if i < n && data[i] == b' ' {
-        i += 1; // the single delimiting space belongs to the control word
+}
+
+/// Numeric value of an ASCII hex digit, else `None`.
+fn hex_nibble(b: u8) -> Option<u8> {
+    match b {
+        b'0'..=b'9' => Some(b - b'0'),
+        b'a'..=b'f' => Some(b - b'a' + 10),
+        b'A'..=b'F' => Some(b - b'A' + 10),
+        _ => None,
     }
-    (name, i)
 }
 
-/// Decode the hex payload of a destination whose data begins at `from`, tracking
-/// group depth (starting at 1) and stopping at the closing `}`. Returns the
-/// decoded bytes and the offset just past that `}` (or EOF).
-fn decode_object(data: &[u8], from: usize) -> (Vec<u8>, usize) {
-    let n = data.len();
-    let mut i = from;
+/// Decode the hex payload of the destination whose data begins where `lex`
+/// stands, up to the `}` that closes it. Returns the decoded bytes and the
+/// offset of that `}` (or EOF).
+fn decode_object(lex: &mut Lexer<'_>) -> (Vec<u8>, usize) {
     let mut depth = 1i32;
     let mut hi: Option<u8> = None;
     let mut out = Vec::new();
-    while i < n {
-        match data[i] {
-            b'{' => {
-                depth += 1;
-                i += 1;
-            }
-            b'}' => {
+    loop {
+        let at = lex.p;
+        match lex.next_tok() {
+            None => return (out, lex.d.len()),
+            Some(Tok::Open) => depth += 1,
+            Some(Tok::Close) => {
                 depth -= 1;
-                i += 1;
                 if depth == 0 {
-                    break;
+                    return (out, at);
                 }
             }
-            b'\\' => {
-                let (_, next) = control_token(data, i);
-                i = next;
-            }
-            other => {
-                if let Some(v) = hex_nibble(other) {
+            Some(Tok::Text(text)) => {
+                for v in text.iter().filter_map(|&b| hex_nibble(b)) {
                     match hi.take() {
                         None => hi = Some(v),
                         Some(h) => out.push((h << 4) | v),
                     }
                 }
-                i += 1;
             }
+            // Control words and symbols hold no digits of the object.
+            Some(_) => {}
         }
     }
-    (out, i)
 }
 
 pub(crate) fn extract_rtf<R>(
@@ -104,71 +207,49 @@ pub(crate) fn extract_rtf<R>(
     if !data.starts_with(b"{\\rtf") {
         return Ok(None);
     }
-    let n = data.len();
-    let mut i = 0usize;
+    let mut lex = Lexer::new(data);
     let mut index = 0usize;
-    while i < n {
-        if data[i] != b'\\' {
-            i += 1;
+    while let Some(tok) = lex.next_tok() {
+        // `\binN` is not honored: its bytes are read as the groups and words
+        // they could be, so an object in them is found whichever way a reader
+        // takes them.
+        if !matches!(tok, Tok::Word("objdata" | "datastore", _)) {
             continue;
         }
-        let (name, after) = control_token(data, i);
-        if name == b"objdata" || name == b"datastore" {
-            let (bytes, next) = decode_object(data, after);
-            // `next` sits just past the `}` that closed the destination, so drop
-            // that byte: the artifact should be the destination's content and
-            // nothing else.
-            let hex_end = match next.checked_sub(1) {
-                Some(e) if e >= after && data.get(e) == Some(&b'}') => e,
-                _ => next,
-            };
-            let hex = data.get(after..hex_end).unwrap_or(&[]);
-            i = next;
-            if bytes.is_empty() {
-                continue;
-            }
-            // Hex digits are case-insensitive by definition — `4D` and `4d` name
-            // the same byte — so a signature written against this destination's
-            // hex TEXT should match whichever case the writer chose. Emitting a
-            // lowercased copy makes that true for exactly the region where the
-            // format says case carries no meaning.
-            //
-            // The alternative in place today is a blunt instrument: exav
-            // lowercases any pure-ASCII file it types as text, which turns EVERY
-            // case-sensitive signature case-insensitive on a whole class of files
-            // to fix this one case, and flips behaviour on a single NUL byte.
-            // This rule can be stated in one sentence and defended; that one
-            // cannot.
-            //
-            // Only when it would differ: an already-lowercase destination is
-            // identical to bytes the raw scan has covered, so copying it would
-            // cost memory for nothing.
-            index += 1;
-            if hex.iter().any(|b| b.is_ascii_uppercase()) {
-                budget.count_entry()?;
-                let cap = budget.reserve()?;
-                if hex.len() as u64 <= cap {
-                    budget.commit(hex.len() as u64);
-                    let folded = hex.to_ascii_lowercase();
-                    if let Some(r) = visit(
-                        Entry::new(format!("rtf-objdata-hex-{index}"), folded),
-                        budget,
-                    ) {
-                        return Ok(Some(r));
-                    }
-                }
-            }
+        let start = lex.p;
+        let (bytes, end) = decode_object(&mut lex);
+        let hex = data.get(start..end).unwrap_or(&[]);
+        if bytes.is_empty() {
+            continue;
+        }
+        // Hex digits are case-insensitive by definition, so a signature
+        // written against this destination's hex TEXT should match whichever
+        // case the writer chose: an uppercase destination is also offered
+        // lowercased. Only then: a lowercase one is identical to bytes the
+        // raw scan has covered, so copying it would cost memory for nothing.
+        index += 1;
+        if hex.iter().any(|b| b.is_ascii_uppercase()) {
             budget.count_entry()?;
             let cap = budget.reserve()?;
-            if bytes.len() as u64 > cap {
-                return Err(LimitHit::new("rtf object exceeds budget".to_string()));
-            }
-            budget.commit(bytes.len() as u64);
-            if let Some(r) = visit(Entry::new(format!("rtf-object-{index}"), bytes), budget) {
-                return Ok(Some(r));
+            if hex.len() as u64 <= cap {
+                budget.commit(hex.len() as u64);
+                let folded = hex.to_ascii_lowercase();
+                if let Some(r) = visit(
+                    Entry::new(format!("rtf-objdata-hex-{index}"), folded),
+                    budget,
+                ) {
+                    return Ok(Some(r));
+                }
             }
-        } else {
-            i = after;
+        }
+        budget.count_entry()?;
+        let cap = budget.reserve()?;
+        if bytes.len() as u64 > cap {
+            return Err(LimitHit::new("rtf object exceeds budget".to_string()));
+        }
+        budget.commit(bytes.len() as u64);
+        if let Some(r) = visit(Entry::new(format!("rtf-object-{index}"), bytes), budget) {
+            return Ok(Some(r));
         }
     }
     Ok(None)
@@ -182,6 +263,50 @@ mod tests {
         bytes.iter().map(|b| format!("{b:02x}")).collect()
     }
 
+    fn all(s: &[u8]) -> Vec<Tok<'_>> {
+        let mut l = Lexer::new(s);
+        let mut v = vec![];
+        while let Some(t) = l.next_tok() {
+            v.push(t);
+        }
+        v
+    }
+
+    #[test]
+    fn words_parameters_and_text() {
+        let t = all(b"{\\rtf1\\ansi\\fs-24 Hi\\'e9\\~x\\u-3913 ?}");
+        assert_eq!(
+            t,
+            vec![
+                Tok::Open,
+                Tok::Word("rtf", Some(1)),
+                Tok::Word("ansi", None),
+                Tok::Word("fs", Some(-24)),
+                Tok::Text(b"Hi"),
+                Tok::Hex(0xE9),
+                Tok::Sym(b'~'),
+                Tok::Text(b"x"),
+                Tok::Word("u", Some(-3913)),
+                Tok::Text(b"?"),
+                Tok::Close,
+            ]
+        );
+    }
+
+    #[test]
+    fn line_breaks_are_ignored_and_a_slash_before_one_is_a_paragraph() {
+        assert_eq!(all(b"a\r\nb"), vec![Tok::Text(b"a"), Tok::Text(b"b")]);
+        assert_eq!(all(b"\\\nx"), vec![Tok::Word("par", None), Tok::Text(b"x")]);
+    }
+
+    #[test]
+    fn fallback_characters_are_skipped() {
+        let mut l = Lexer::new(b"\\u233\\'e9z");
+        assert_eq!(l.next_tok(), Some(Tok::Word("u", Some(233))));
+        l.skip_fallback(1);
+        assert_eq!(l.next_tok(), Some(Tok::Text(b"z")));
+    }
+
     #[test]
     fn extracts_single_object() {
         let payload = b"MALWARETEST-inside-rtf-object";
@@ -241,9 +366,11 @@ mod tests {
         let rtf = format!("{{\\rtf1{{\\object{{\\objdata {}}}}}}}", hex(payload));
         let mut budget = Budget::new(Limits::default());
         let entries = extract(Format::Rtf, &rtf.as_bytes(), &mut budget).unwrap();
-        assert!(entries
-            .iter()
-            .all(|e| !e.name.starts_with("rtf-objdata-hex")));
+        assert!(
+            entries
+                .iter()
+                .all(|e| !e.name.starts_with("rtf-objdata-hex"))
+        );
     }
 
     #[test]
@@ -285,8 +412,26 @@ mod tests {
                 .unwrap()
                 .is_empty()
         );
-        assert!(extract(Format::Rtf, b"not rtf", &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Rtf, b"not rtf", &mut budget)
+                .unwrap()
+                .is_empty()
+        );
+    }
+
+    /// The destination ends at its own closing brace, whatever groups open
+    /// inside it, and an object a `\bin` run seems to hide is still found.
+    #[test]
+    fn nested_groups_and_bin_runs() {
+        let payload = b"NESTED-MALWARETEST";
+        let h = hex(payload);
+        let (a, b) = h.split_at(8);
+        let rtf = format!("{{\\rtf1{{\\objdata {a}{{\\*\\x}}{b}}}more}}");
+        let mut budget = Budget::new(Limits::default());
+        let entries = extract(Format::Rtf, &rtf.as_bytes(), &mut budget).unwrap();
+        assert_eq!(entries[0].data, payload);
+        let rtf = format!("{{\\rtf1\\bin4 abcd{{\\objdata {h}}}}}");
+        let entries = extract(Format::Rtf, &rtf.as_bytes(), &mut budget).unwrap();
+        assert!(entries.iter().any(|e| e.data == payload));
     }
 }
diff --git a/crates/exav-unpack/src/formats/sevenz/aes.rs b/crates/exav-unpack/src/formats/sevenz/aes.rs
index 08a99af1..e9432b4e 100644
--- a/crates/exav-unpack/src/formats/sevenz/aes.rs
+++ b/crates/exav-unpack/src/formats/sevenz/aes.rs
@@ -16,7 +16,8 @@
 //! the downstream codec rejects (never a panic, never emitted as data).
 
 use crate::LimitHit;
-use cbc::cipher::{block_padding::NoPadding, BlockModeDecrypt, KeyIvInit};
+use crate::kdf::Pass;
+use cbc::cipher::{BlockModeDecrypt, KeyIvInit, block_padding::NoPadding};
 use sha2::{Digest, Sha256};
 use std::io::{self, Cursor, Read};
 
@@ -123,30 +124,41 @@ fn utf16le(password: &str) -> Vec<u8> {
 /// ciphertext on first read (folder streams are bounded by the archive/budget),
 /// AES-256-CBC-decrypts it with no padding (7z streams are block-aligned; the
 /// exact unpacked length is enforced by the caller), and serves the plaintext.
-pub(super) struct Aes7zReader {
-    inner: Option<Box<dyn Read>>,
+pub(super) struct Aes7zReader<'a> {
+    inner: Option<Box<dyn Read + 'a>>,
     key: [u8; 32],
     iv: [u8; 16],
     plain: Cursor<Vec<u8>>,
 }
 
-impl Aes7zReader {
+impl<'a> Aes7zReader<'a> {
     /// Build the decryptor for a 7zAES coder. `password` is the passphrase to
     /// try. Returns an error if the properties are malformed, no password was
     /// supplied, or the KDF cost is out of range; the caller maps that to the
     /// existing "encrypted / unsupported" outcome.
     pub(super) fn new(
-        inner: Box<dyn Read>,
+        inner: Box<dyn Read + 'a>,
         properties: &[u8],
-        password: Option<&str>,
+        password: Option<Pass<'_>>,
     ) -> Result<Self, LimitHit> {
-        let Some(password) = password else {
+        let Some(pass) = password else {
             return Err(LimitHit::corrupt("7z: AES member needs a password".into()));
         };
         let props =
             parse_props(properties).ok_or_else(|| LimitHit::corrupt("7z: bad AES props".into()))?;
-        let key = derive_key(&utf16le(password), &props.salt, props.num_cycles_power)
-            .ok_or_else(|| LimitHit::corrupt("7z: AES KDF cost too high".into()))?;
+        let word = utf16le(pass.word);
+        // The key is made once per password, salt and count in a scan, and the
+        // scan has a bound on the rounds it spends ([`crate::kdf`]).
+        let key = match props.num_cycles_power {
+            NO_HASH_CYCLES => derive_key(&word, &props.salt, NO_HASH_CYCLES),
+            cycles if cycles > MAX_CYCLES_POWER => None,
+            cycles => pass
+                .kdf
+                .sevenz_key(&word, &props.salt, cycles, 1u64 << cycles, || {
+                    derive_key(&word, &props.salt, cycles)
+                }),
+        }
+        .ok_or_else(|| LimitHit::corrupt("7z: AES KDF cost too high".into()))?;
         Ok(Aes7zReader {
             inner: Some(inner),
             key,
@@ -173,7 +185,7 @@ impl Aes7zReader {
     }
 }
 
-impl Read for Aes7zReader {
+impl Read for Aes7zReader<'_> {
     fn read(&mut self, out: &mut [u8]) -> io::Result<usize> {
         if self.inner.is_some() {
             self.fill()?;
@@ -223,8 +235,12 @@ mod tests {
         let plain = b"CreateObject(\"WScript.Shell\") EICAR body padded out to blocks!!".to_vec();
         let ct = encrypt(&key, &parsed.iv, plain.clone());
 
-        let mut reader =
-            Aes7zReader::new(Box::new(Cursor::new(ct)), &props, Some("s3cr3t")).unwrap();
+        let kdf = crate::kdf::Kdf::default();
+        let pass = Pass {
+            word: "s3cr3t",
+            kdf: &kdf,
+        };
+        let mut reader = Aes7zReader::new(Box::new(Cursor::new(ct)), &props, Some(pass)).unwrap();
         let mut got = Vec::new();
         reader.read_to_end(&mut got).unwrap();
         // Decryption yields the block-padded plaintext; the real caller truncates
@@ -242,8 +258,12 @@ mod tests {
         let key = derive_key(&utf16le("right"), &parsed.salt, parsed.num_cycles_power).unwrap();
         let plain = vec![0x41u8; 32];
         let ct = encrypt(&key, &parsed.iv, plain.clone());
-        let mut reader =
-            Aes7zReader::new(Box::new(Cursor::new(ct)), &props, Some("wrong")).unwrap();
+        let kdf = crate::kdf::Kdf::default();
+        let pass = Pass {
+            word: "wrong",
+            kdf: &kdf,
+        };
+        let mut reader = Aes7zReader::new(Box::new(Cursor::new(ct)), &props, Some(pass)).unwrap();
         let mut got = Vec::new();
         reader.read_to_end(&mut got).unwrap();
         assert_ne!(got, plain, "wrong password must not recover plaintext");
@@ -251,14 +271,56 @@ mod tests {
 
     #[test]
     fn dos_guard_and_missing_password() {
+        let kdf = crate::kdf::Kdf::default();
+        let pass = Pass {
+            word: "x",
+            kdf: &kdf,
+        };
         // Cycle power above the cap is rejected.
         let hot = build_props(40, b"s", &[0u8; 16]);
-        assert!(Aes7zReader::new(Box::new(Cursor::new(vec![])), &hot, Some("x")).is_err());
+        assert!(Aes7zReader::new(Box::new(Cursor::new(vec![])), &hot, Some(pass)).is_err());
         // Missing password is rejected.
         let ok = build_props(16, b"s", &[0u8; 16]);
         assert!(Aes7zReader::new(Box::new(Cursor::new(vec![])), &ok, None).is_err());
         // Malformed props are rejected.
-        assert!(Aes7zReader::new(Box::new(Cursor::new(vec![])), &[], Some("x")).is_err());
+        assert!(Aes7zReader::new(Box::new(Cursor::new(vec![])), &[], Some(pass)).is_err());
+    }
+
+    /// Thousands of folders of one archive, which 7-Zip gives the same key, cost
+    /// one derivation; a scan that asks for more than its share is refused
+    /// the rest, whatever the passwords.
+    #[test]
+    fn a_scan_derives_a_key_once_and_within_its_share() {
+        let kdf = crate::kdf::Kdf::default();
+        let props = build_props(16, b"s", &[9u8; 16]);
+        let start = std::time::Instant::now();
+        for _ in 0..2000 {
+            let pass = Pass {
+                word: "same",
+                kdf: &kdf,
+            };
+            assert!(Aes7zReader::new(Box::new(Cursor::new(vec![])), &props, Some(pass)).is_ok());
+        }
+        // 2000 derivations of 2^16 would be 1.3 s here; one is a few ms.
+        assert!(start.elapsed() < std::time::Duration::from_millis(500));
+        assert_eq!(kdf.sevenz_spent(), 1 << 16);
+        // Many passwords at 2^24: 4 are derived, then the scan has no share left.
+        let hot = build_props(24, b"s", &[9u8; 16]);
+        let mut derived = 0;
+        for n in 0..8 {
+            let word = format!("password {n}");
+            let pass = Pass {
+                word: &word,
+                kdf: &kdf,
+            };
+            if Aes7zReader::new(Box::new(Cursor::new(vec![])), &hot, Some(pass)).is_ok() {
+                derived += 1;
+            }
+        }
+        assert_eq!(
+            derived, 3,
+            "2^26 less the 2^16 already spent is three of 2^24"
+        );
     }
 
     /// Build a 7zAES property blob with an explicit salt and IV (both present).
diff --git a/crates/exav-unpack/src/formats/sevenz/decode.rs b/crates/exav-unpack/src/formats/sevenz/decode.rs
index b742fcf8..4694cd8e 100644
--- a/crates/exav-unpack/src/formats/sevenz/decode.rs
+++ b/crates/exav-unpack/src/formats/sevenz/decode.rs
@@ -3,8 +3,8 @@
 
 use super::header::Coder;
 use super::parse::*;
-use crate::formats::lzma::SansIo;
 use crate::LimitHit;
+use crate::formats::lzma::SansIo;
 use lzma_rust2::filter::bcj::BcjReader;
 use std::io::{self, Read};
 
@@ -27,13 +27,13 @@ pub(super) fn is_known_codec(id: &[u8]) -> bool {
 /// `password` is the passphrase to try for an AES-encrypted coder (ignored by
 /// every other codec); `None` (or a build without the `decrypt` feature) leaves
 /// AES reported as unsupported.
-pub(super) fn wrap_coder(
-    inner: Box<dyn Read>,
+pub(super) fn wrap_coder<'a>(
+    inner: Box<dyn Read + 'a>,
     coder: &Coder,
     expected_size: usize,
-    password: Option<&str>,
+    password: Option<crate::kdf::Pass<'_>>,
     max_buffer: u64,
-) -> Result<Box<dyn Read>, LimitHit> {
+) -> Result<Box<dyn Read + 'a>, LimitHit> {
     let _ = password;
     match coder.method_id.as_slice() {
         x if x == ID_COPY => Ok(inner),
diff --git a/crates/exav-unpack/src/formats/sevenz/entry.rs b/crates/exav-unpack/src/formats/sevenz/entry.rs
index 80e22e86..ba687bae 100644
--- a/crates/exav-unpack/src/formats/sevenz/entry.rs
+++ b/crates/exav-unpack/src/formats/sevenz/entry.rs
@@ -1,6 +1,6 @@
 //! Public entry point for 7z extraction.
 
-use super::header::{ordered_coder_iter, parse_archive};
+use super::header::ordered_coder_iter;
 use super::parse::SIGNATURE_HEADER_SIZE;
 use crate::*;
 use std::io::{Cursor, Read};
@@ -35,14 +35,14 @@ fn has_unsupported_codec(block: &super::header::Block, has_password: bool) -> Op
 /// data, without decoding it. The streaming path reads this incrementally (skip
 /// to a file's offset, then `take(size)`) so the whole decompressed solid block
 /// is never buffered. `password` is threaded to an AES coder (if any).
-fn decode_block_reader(
+pub(super) fn decode_block_reader<'a>(
     block: &super::header::Block,
-    pack_data: &[u8],
+    pack_data: Box<dyn Read + 'a>,
     expected_total: u64,
-    password: Option<&str>,
+    password: Option<crate::kdf::Pass<'_>>,
     max_buffer: u64,
-) -> Result<Box<dyn Read>, LimitHit> {
-    let mut current: Box<dyn Read> = Box::new(Cursor::new(pack_data.to_vec()));
+) -> Result<Box<dyn Read + 'a>, LimitHit> {
+    let mut current = pack_data;
     for coder_idx in ordered_coder_iter(block) {
         let coder = &block.coders[coder_idx];
         // Each coder decodes to its own declared size, the one for its first
@@ -71,7 +71,7 @@ fn decode_block_reader(
 fn decode_block_graph(
     block: &super::header::Block,
     pack_streams: &[&[u8]],
-    password: Option<&str>,
+    password: Option<crate::kdf::Pass<'_>>,
     max_buffer: u64,
 ) -> Result<Decoded, LimitHit> {
     // Exclusive prefix sums: the global index of each coder's first in/out stream.
@@ -101,7 +101,7 @@ fn decode_block_graph(
         in_base: &'a [u64],
         out_base: &'a [u64],
         producer: &'a dyn Fn(u64) -> Option<usize>,
-        password: Option<&'a str>,
+        password: Option<crate::kdf::Pass<'a>>,
         max_buffer: u64,
     }
 
@@ -226,7 +226,7 @@ fn decode_block(
     pack_data: &[u8],
     pack_sizes: &[u64],
     expected_total: u64,
-    password: Option<&str>,
+    password: Option<crate::kdf::Pass<'_>>,
     max_buffer: u64,
 ) -> Result<Decoded, LimitHit> {
     // A folder whose coders take more inputs than there are coders cannot be a
@@ -248,7 +248,13 @@ fn decode_block(
         }
         return decode_block_graph(block, &slices, password, max_buffer);
     }
-    let mut current = decode_block_reader(block, pack_data, expected_total, password, max_buffer)?;
+    let mut current = decode_block_reader(
+        block,
+        Box::new(Cursor::new(pack_data)),
+        expected_total,
+        password,
+        max_buffer,
+    )?;
     // A 7z block is a *solid* unit that may hold many members; its decompressed
     // size can amplify far beyond the packed input. Bound it by the global
     // peak-buffer limit.
@@ -292,9 +298,9 @@ impl Read for Failed {
 /// bytes have been read. The members of a block follow each other in it, so
 /// the next one starts where this one left off: starting the decoder over for
 /// each is a pass over the block per member.
-struct Solid {
+struct Solid<'a> {
     block: usize,
-    reader: Box<dyn Read>,
+    reader: Box<dyn Read + 'a>,
     pos: u64,
 }
 
@@ -340,15 +346,16 @@ fn skip_reader(r: &mut dyn Read, n: u64) -> (u64, bool) {
     (skipped, false)
 }
 
-/// The packed bytes of folder `block_idx`, and the size of each of its packed
-/// streams. A folder can have several (BCJ2 folders have four), laid end to
-/// end; the sizes let the graph decoder split them apart again. `Err` says
-/// why the header puts them out of reach.
-fn block_pack_data<'a>(
+/// Where the packed bytes of folder `block_idx` are in the archive, as
+/// `[start, end)`, and the size of each of its packed streams. A folder can
+/// have several (BCJ2 folders have four), laid end to end; the sizes let the
+/// graph decoder split them apart again. `Err` says why the header puts them
+/// out of reach.
+fn block_pack_data(
     archive: &super::header::Archive,
     block_idx: usize,
-    data: &'a [u8],
-) -> Result<(&'a [u8], Vec<u64>), &'static str> {
+    len: usize,
+) -> Result<((usize, usize), Vec<u64>), &'static str> {
     const MISSING: &str = "7z: folder names a packed stream the header does not list";
     const PAST_END: &str = "7z: packed data runs past the end of the archive";
     let block = &archive.blocks[block_idx];
@@ -376,37 +383,62 @@ fn block_pack_data<'a>(
         .ok()
         .zip(usize::try_from(end).ok())
         .ok_or(PAST_END)?;
-    data.get(range.0..range.1)
-        .map(|packed| (packed, sizes))
-        .ok_or(PAST_END)
+    (range.1 <= len).then_some((range, sizes)).ok_or(PAST_END)
 }
 
-/// Walk a 7z archive. Its header is at the end, so the container is read whole;
-/// each member's decompressed output then streams, which is where a solid
+/// The packed bytes `range` of `src`, held, for the paths that decode a folder
+/// whole: an encrypted one, and one with several packed streams.
+fn pack_bytes<'a>(
+    src: &'a dyn crate::source::ByteSource,
+    range: (usize, usize),
+    max_buffer: u64,
+) -> Result<std::borrow::Cow<'a, [u8]>, LimitHit> {
+    let len = range.1.saturating_sub(range.0);
+    if len as u64 > max_buffer {
+        return Err(LimitHit::new(format!(
+            "7z folder of {len} packed bytes is decoded whole, over the {max_buffer}-byte buffer limit"
+        )));
+    }
+    let bytes = src.window(range.0, len);
+    if bytes.len() != len {
+        return Err(LimitHit::corrupt(
+            "7z: the packed data could not be read".into(),
+        ));
+    }
+    Ok(bytes)
+}
+
+/// Walk a 7z archive. Its header is at the end and is read from there; each
+/// folder's packed bytes are read as its members are, so the archive is never
+/// held, and each member's decompressed output streams, which is where a solid
 /// block can be far larger than the archive.
 pub(crate) fn walk<T>(
     src: &dyn crate::source::ByteSource,
     budget: &mut Budget,
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
-    let data = crate::stream::read_whole(Format::SevenZip, src, budget)?;
-    stream_sevenz(&data, budget, visit)
+    stream_sevenz(src, budget, visit)
 }
 
 /// Streaming 7z extraction (pattern A): each file's solid block is built as a
-/// forward-only `Read`; the file is emitted by skipping to its offset and handing
-/// the visitor a `take(size)` window — the decompressed block is never buffered,
-/// so a huge solid archive is scanned in bounded memory. AES members keep the
-/// buffered CRC/password path (rare). The 7z container itself is still parsed
-/// from `data` (the header lives at the end → random access), but its members'
-/// decompressed output streams.
+/// forward-only `Read` over its packed bytes in the source; the file is emitted
+/// by skipping to its offset and handing the visitor a `take(size)` window — the
+/// decompressed block is never buffered, so a huge solid archive is scanned in
+/// bounded memory. AES members and folders with several packed streams (BCJ2)
+/// keep the buffered path, bounded by the buffer limit.
 fn stream_sevenz<T>(
-    data: &[u8],
+    src: &dyn crate::source::ByteSource,
     budget: &mut Budget,
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
-    use crate::stream::{emit_bytes, emit_stream, MemberMeta};
-    let archive = match parse_archive(data, &budget.passwords) {
+    use crate::stream::{MemberMeta, emit_bytes, emit_stream};
+    let kdf = std::sync::Arc::clone(&budget.kdf);
+    let archive = match super::header::parse_archive_with(
+        src,
+        &budget.passwords,
+        &kdf,
+        budget.limits.max_buffer_bytes,
+    ) {
         Ok(a) => a,
         Err(e) => {
             let reason = e.reason.as_str();
@@ -418,7 +450,7 @@ fn stream_sevenz<T>(
                 budget.count_entry()?;
                 let meta = MemberMeta {
                     name: "encrypted.7z".to_string(),
-                    comp_size: data.len() as u64,
+                    comp_size: src.len() as u64,
                     size: None,
                     encrypted: true,
                     unsupported: Some("7z: encrypted header, unsupported codec"),
@@ -489,7 +521,7 @@ fn stream_sevenz<T>(
             continue;
         }
 
-        let (pack_data, block_pack_sizes) = match block_pack_data(&archive, block_idx, data) {
+        let (pack_range, block_pack_sizes) = match block_pack_data(&archive, block_idx, src.len()) {
             Ok(v) => v,
             Err(reason) => {
                 let meta = out_of_reach(name, reason);
@@ -555,6 +587,7 @@ fn stream_sevenz<T>(
             if let Some(dec) = &state.good {
                 file_data = member(dec);
             } else {
+                let packed = pack_bytes(src, pack_range, max_buffer)?;
                 for (i, pw) in passwords.iter().enumerate() {
                     if state.wrong[i] {
                         continue;
@@ -563,10 +596,13 @@ fn stream_sevenz<T>(
                     // damage: try the next one.
                     match decode_block(
                         block,
-                        pack_data,
+                        &packed,
                         &block_pack_sizes,
                         block_total,
-                        Some(pw.as_str()),
+                        Some(crate::kdf::Pass {
+                            word: pw.as_str(),
+                            kdf: &kdf,
+                        }),
                         max_buffer,
                     ) {
                         Ok((dec, None)) => match member(&dec) {
@@ -612,23 +648,6 @@ fn stream_sevenz<T>(
             continue;
         }
 
-        // Non-AES: stream. A file whose start is past the peak-buffer limit sits
-        // in a block bigger than we would decode buffered. Its bytes are not
-        // reachable, and a member nobody looked at is reported rather than
-        // dropped — the rest of the archive still scans.
-        if bytes_to_skip > max_buffer {
-            let meta = MemberMeta {
-                name,
-                comp_size: file.size,
-                size: Some(file.size),
-                unsupported: Some("7z: member starts past the peak-buffer limit"),
-                ..MemberMeta::default()
-            };
-            if let Some(t) = visit(&meta, None, budget) {
-                return Ok(Some(t));
-            }
-            continue;
-        }
         // A multi-input folder (BCJ2) cannot be streamed as a linear chain: its
         // filter needs all four streams present at once. Decode the block
         // buffered instead, bounded by the same peak-buffer limit.
@@ -636,10 +655,11 @@ fn stream_sevenz<T>(
             .as_ref()
             .is_some_and(|s| s.block == block_idx && s.pos <= bytes_to_skip)
         {
-            let reader: Box<dyn Read> = if block.coders.iter().any(|c| c.num_in_streams > 1) {
+            let reader: Box<dyn Read + '_> = if block.coders.iter().any(|c| c.num_in_streams > 1) {
+                let packed = pack_bytes(src, pack_range, max_buffer)?;
                 let (decoded, failed) = decode_block(
                     block,
-                    pack_data,
+                    &packed,
                     &block_pack_sizes,
                     block_total,
                     None,
@@ -647,7 +667,12 @@ fn stream_sevenz<T>(
                 )?;
                 Box::new(Cursor::new(decoded).chain(Failed(failed)))
             } else {
-                decode_block_reader(block, pack_data, block_total, None, max_buffer)?
+                let packed = Box::new(crate::source::Reader::range(
+                    src,
+                    pack_range.0,
+                    pack_range.1,
+                ));
+                decode_block_reader(block, packed, block_total, None, max_buffer)?
             };
             solid = Some(Solid {
                 block: block_idx,
@@ -658,7 +683,12 @@ fn stream_sevenz<T>(
         let Some(s) = solid.as_mut() else {
             continue;
         };
-        let (skipped, failed) = skip_reader(s.reader.as_mut(), bytes_to_skip - s.pos);
+        // The members before this one in the block are decoded and dropped,
+        // which is the work a scan limit is for: charged before it is done, so
+        // a block that declares more than the limit allows is not decoded.
+        let to_skip = bytes_to_skip.saturating_sub(s.pos);
+        budget.charge_scan(to_skip)?;
+        let (skipped, failed) = skip_reader(s.reader.as_mut(), to_skip);
         s.pos += skipped;
         if s.pos < bytes_to_skip {
             // The block ended before this file's offset: the sub-stream table
diff --git a/crates/exav-unpack/src/formats/sevenz/header.rs b/crates/exav-unpack/src/formats/sevenz/header.rs
index 889055fd..2c822b1c 100644
--- a/crates/exav-unpack/src/formats/sevenz/header.rs
+++ b/crates/exav-unpack/src/formats/sevenz/header.rs
@@ -56,7 +56,30 @@ pub(super) struct Archive {
 
 // ─── Public entry point ────────────────────────────────────────────────────
 
+/// [`parse_archive_with`] with a scan of its own (the one that reads only this
+/// archive).
+#[cfg(test)]
 pub(super) fn parse_archive(data: &[u8], passwords: &[String]) -> Result<Archive, LimitHit> {
+    parse_archive_with(
+        &data,
+        passwords,
+        &crate::kdf::Kdf::default(),
+        crate::Limits::default().max_buffer_bytes,
+    )
+}
+
+/// The archive's structure, its encrypted header opened with the first of
+/// `passwords` that does it; the derivations count against `kdf`, the scan's.
+/// Only the signature header, the header and the packed header are read from
+/// `src`, and the header is held up to `max_buffer` bytes.
+pub(super) fn parse_archive_with(
+    src: &dyn crate::source::ByteSource,
+    passwords: &[String],
+    kdf: &crate::kdf::Kdf,
+    max_buffer: u64,
+) -> Result<Archive, LimitHit> {
+    let head = src.window(0, 32);
+    let data: &[u8] = &head;
     if data.len() < 32 {
         return Err(LimitHit::corrupt("7z: file too small".into()));
     }
@@ -80,16 +103,40 @@ pub(super) fn parse_archive(data: &[u8], passwords: &[String]) -> Result<Archive
         .checked_add(next_header_offset)
         .and_then(|v| usize::try_from(v).ok())
         .ok_or_else(|| LimitHit::corrupt("7z: next header offset overflow".into()))?;
-    let nh_end = nh_start
-        .checked_add(next_header_size as usize)
+    let nh_end = usize::try_from(next_header_size)
+        .ok()
+        .and_then(|n| nh_start.checked_add(n))
         .ok_or_else(|| LimitHit::corrupt("7z: next header offset overflow".into()))?;
-    if nh_end > data.len() {
+    if nh_end > src.len() {
         return Err(LimitHit::corrupt(
             "7z: next header extends past end of file".into(),
         ));
     }
+    // The header is parsed from memory, whole.
+    if next_header_size > max_buffer {
+        return Err(LimitHit::new(format!(
+            "7z header is {next_header_size} bytes, over the {max_buffer}-byte buffer limit"
+        )));
+    }
+
+    // An archive of nothing is the signature header alone.
+    if next_header_size == 0 {
+        return Ok(Archive {
+            pack_pos: 0,
+            pack_sizes: Vec::new(),
+            blocks: Vec::new(),
+            files: Vec::new(),
+            stream_map: calculate_stream_map(&[], &[], &[]),
+        });
+    }
 
-    let nh = &data[nh_start..nh_end];
+    let nh_bytes = src.window(nh_start, nh_end.saturating_sub(nh_start));
+    if nh_bytes.len() != nh_end.saturating_sub(nh_start) {
+        return Err(LimitHit::corrupt(
+            "7z: next header could not be read".into(),
+        ));
+    }
+    let nh: &[u8] = &nh_bytes;
     let mut nr = SevenZReader::new(nh);
 
     let first_nid = nr.read_nid()?;
@@ -111,12 +158,12 @@ pub(super) fn parse_archive(data: &[u8], passwords: &[String]) -> Result<Archive
                 // correct one yields bytes that parse as a valid 7z header.
                 let mut decoded = None;
                 for pw in passwords {
-                    if let Ok(bytes) = decompress_encoded_header(data, &mut streams_info, Some(pw))
+                    let pass = crate::kdf::Pass { word: pw, kdf };
+                    if let Ok(bytes) = decompress_encoded_header(src, &mut streams_info, Some(pass))
+                        && parse_header(&bytes).is_ok()
                     {
-                        if parse_header(&bytes).is_ok() {
-                            decoded = Some(bytes);
-                            break;
-                        }
+                        decoded = Some(bytes);
+                        break;
                     }
                 }
                 decoded.ok_or_else(|| {
@@ -125,7 +172,7 @@ pub(super) fn parse_archive(data: &[u8], passwords: &[String]) -> Result<Archive
             } else {
                 // No password (or no AES): a `-mhe` header without a password
                 // surfaces as unsupported via the AES coder, never a silent clean.
-                decompress_encoded_header(data, &mut streams_info, None)?
+                decompress_encoded_header(src, &mut streams_info, None)?
             }
         }
         NID_HEADER => nh.to_vec(),
@@ -555,6 +602,7 @@ fn parse_files_info(
 
     let mut empty_streams = BitSet::new(num_files);
     let mut empty_files = BitSet::new(num_files);
+    let mut num_empty = 0usize;
 
     loop {
         let prop_type = r.read_nid()?;
@@ -562,16 +610,20 @@ fn parse_files_info(
             break;
         }
         let _prop_size = read_var_u64(r)?;
+        let prop_start = r.pos;
 
         match prop_type {
             NID_EMPTY_STREAM => {
                 empty_streams = BitSet::read_bits(r, num_files, BitSet::new(num_files))?;
+                // EmptyFile and Anti have one bit per entry that has no
+                // stream, not one per entry.
+                num_empty = (0..num_files).filter(|&i| empty_streams.get(i)).count();
             }
             NID_EMPTY_FILE => {
-                empty_files = BitSet::read_bits(r, num_files, BitSet::new(num_files))?;
+                empty_files = BitSet::read_bits(r, num_empty, BitSet::new(num_empty))?;
             }
             NID_ANTI => {
-                let _ = BitSet::read_bits(r, num_files, BitSet::new(num_files))?;
+                let _ = BitSet::read_bits(r, num_empty, BitSet::new(num_empty))?;
             }
             NID_NAME => {
                 let external = r.read_byte()?;
@@ -631,10 +683,18 @@ fn parse_files_info(
                 let _ = r.read_bytes(_prop_size as usize)?;
             }
         }
+        // A property ends where its size says, whatever was read of it.
+        if let Some(end) = prop_start
+            .checked_add(_prop_size as usize)
+            .filter(|&e| e <= r.data.len())
+        {
+            r.pos = end;
+        }
     }
 
     // Post-process: determine has_stream / is_directory for each file
     let mut non_empty_counter = 0usize;
+    let mut empty_counter = 0usize;
 
     let total_unpack_sub_streams: usize = blocks.iter().map(|b| b.num_unpack_sub_streams).sum();
 
@@ -660,7 +720,8 @@ fn parse_files_info(
             non_empty_counter += 1;
         } else {
             file.has_stream = false;
-            file.is_directory = !empty_files.get(i);
+            file.is_directory = !empty_files.get(empty_counter);
+            empty_counter += 1;
             file.size = 0;
         }
     }
@@ -725,9 +786,9 @@ fn calculate_stream_map(blocks: &[Block], files: &[FileEntry], pack_sizes: &[u64
 // ─── Decompress encoded header ─────────────────────────────────────────────
 
 fn decompress_encoded_header(
-    data: &[u8],
+    src: &dyn crate::source::ByteSource,
     streams_info: &mut StreamsInfo,
-    password: Option<&str>,
+    password: Option<crate::kdf::Pass<'_>>,
 ) -> Result<Vec<u8>, LimitHit> {
     if streams_info.blocks.is_empty() {
         return Err(LimitHit::corrupt("7z: encoded header has no blocks".into()));
@@ -759,14 +820,13 @@ fn decompress_encoded_header(
         .and_then(|v| v.checked_add(pack_stream_offset))
         .and_then(|v| usize::try_from(v).ok())
         .ok_or_else(|| LimitHit::corrupt("7z: pack stream offset overflow".into()))?;
-    let pack_size = streams_info.pack_sizes[pack_idx] as usize;
-
-    let pack_end = pack_offset
-        .checked_add(pack_size)
-        .filter(|&e| e <= data.len())
+    let pack_end = usize::try_from(streams_info.pack_sizes[pack_idx])
+        .ok()
+        .and_then(|n| pack_offset.checked_add(n))
+        .filter(|&e| e <= src.len())
         .ok_or_else(|| LimitHit::corrupt("7z: pack stream extends past end of file".into()))?;
 
-    let pack_data = &data[pack_offset..pack_end];
+    let pack_data = Box::new(crate::source::Reader::range(src, pack_offset, pack_end));
     // Sum of attacker-controlled coder output sizes: saturate instead of `.sum()`
     // (which panics on overflow). `cap_prealloc` bounds the resulting allocation.
     let total_unpack: u64 = block
@@ -775,27 +835,25 @@ fn decompress_encoded_header(
         .copied()
         .fold(0u64, u64::saturating_add);
 
-    // Build decoder chain and decompress
-    // We must own the data so Box<dyn Read> can be 'static
-    let owned_pack_data = pack_data.to_vec();
-    let reader = std::io::Cursor::new(owned_pack_data);
-    let mut current: Box<dyn std::io::Read> = Box::new(reader);
-
     // The 7z parser threads no `Budget`, so the encoded header/TOC is bounded by
     // the *default* global peak-buffer limit. A header is metadata (not the
     // operator's tuning surface), and it must be buffered whole for random-access
     // parsing — so a fixed default ceiling is the right bound here.
     let max_buffer = crate::Limits::default().max_buffer_bytes;
-
-    let chain = ordered_coder_iter(block);
-    for coder_idx in chain {
-        let coder = &block.coders[coder_idx];
-        // Header decompression: `password` is threaded so AES-encrypted headers
-        // (`-mhe=on`) can be decrypted when a candidate password is supplied.
-        current =
-            super::decode::wrap_coder(current, coder, total_unpack as usize, password, max_buffer)?;
+    // Its decoder may hold what it is given, so what it is given is bounded
+    // too, not by the archive's size.
+    if (pack_end.saturating_sub(pack_offset)) as u64 > max_buffer {
+        return Err(LimitHit::new("7z encoded header exceeds max-buffer".into()));
     }
 
+    // Build the decoder chain as a block's is built: each coder decodes to its
+    // own declared size (an AES coder's output is its padded input, an LZMA
+    // coder behind it is the header's own length), not to their sum. `password`
+    // is threaded so AES-encrypted headers (`-mhe=on`) can be decrypted when a
+    // candidate password is supplied.
+    let mut current =
+        super::entry::decode_block_reader(block, pack_data, total_unpack, password, max_buffer)?;
+
     let (buf, truncated) = crate::bounded_read(&mut current, max_buffer)
         .map_err(|e| LimitHit::corrupt(format!("7z: decompress header: {e}")))?;
     if truncated {
@@ -830,9 +888,13 @@ fn parse_header(data: &[u8]) -> Result<Archive, LimitHit> {
                 streams = Some(parse_streams_info(&mut r)?);
             }
             NID_FILES_INFO => {
-                let s = streams.as_ref().ok_or_else(|| {
-                    LimitHit::corrupt("7z: NID_FILES_INFO before NID_MAIN_STREAMS_INFO".into())
-                })?;
+                // An archive of empty files and directories has no streams.
+                let s = streams.get_or_insert_with(|| StreamsInfo {
+                    pack_pos: 0,
+                    pack_sizes: Vec::new(),
+                    blocks: Vec::new(),
+                    sub_streams_info: None,
+                });
                 files = Some(parse_files_info(&mut r, &s.blocks, &s.sub_streams_info)?);
             }
             _ => {
@@ -941,6 +1003,52 @@ pub(super) fn ordered_coder_iter(block: &Block) -> Vec<usize> {
 mod tests {
     use super::*;
 
+    /// The signature header and the header it points to.
+    fn archive_of(header: &[u8]) -> Vec<u8> {
+        let mut d = vec![b'7', b'z', 0xBC, 0xAF, 0x27, 0x1C, 0, 4, 0, 0, 0, 0];
+        d.extend_from_slice(&0u64.to_le_bytes());
+        d.extend_from_slice(&(header.len() as u64).to_le_bytes());
+        d.extend_from_slice(&[0; 4]);
+        d.extend_from_slice(header);
+        d
+    }
+
+    #[test]
+    fn an_archive_of_nothing_and_one_of_empty_files_have_no_streams() {
+        // The signature header alone.
+        let a = parse_archive(&archive_of(&[]), &[]).unwrap();
+        assert!(a.files.is_empty());
+        // Files with no streams info before them: one empty file, "a".
+        let header = [
+            0x01, 0x05, 0x01, 0x0E, 0x01, 0x80, 0x0F, 0x01, 0x80, 0x11, 0x05, 0x00, b'a', 0, 0, 0,
+            0x00, 0x00,
+        ];
+        let a = parse_archive(&archive_of(&header), &[]).unwrap();
+        assert_eq!(a.files.len(), 1);
+        assert_eq!(a.files[0].name, "a");
+        assert!(!a.files[0].has_stream && !a.files[0].is_directory);
+    }
+
+    #[test]
+    fn archive_properties_with_ids_of_more_than_a_byte_are_skipped_by_their_size() {
+        // The empty-file header above, with three archive properties in front
+        // of its files: ids of 9 bytes, 2 bytes and 1 byte, as 7-Zip reads them.
+        let header = [
+            0x01, // header
+            0x02, // archive properties
+            0xFF, 1, 0, 0x9A, 0x78, 0x56, 0x34, 0x12, 0x3F, 0x03, 0xAA, 0xBB,
+            0xCC, // id, size 3
+            0x80, 0x90, 0x01, 0xEE, // id 0x90, size 1
+            0x07, 0x00, // id 7, size 0
+            0x00, // end of properties
+            0x05, 0x01, 0x0E, 0x01, 0x80, 0x0F, 0x01, 0x80, 0x11, 0x05, 0x00, b'a', 0, 0, 0, 0x00,
+            0x00,
+        ];
+        let a = parse_archive(&archive_of(&header), &[]).unwrap();
+        assert_eq!(a.files.len(), 1);
+        assert_eq!(a.files[0].name, "a");
+    }
+
     #[test]
     fn varint_basic() {
         let data = [0x00];
diff --git a/crates/exav-unpack/src/formats/sevenz/mod.rs b/crates/exav-unpack/src/formats/sevenz/mod.rs
index 73980a59..c4d40f94 100644
--- a/crates/exav-unpack/src/formats/sevenz/mod.rs
+++ b/crates/exav-unpack/src/formats/sevenz/mod.rs
@@ -20,7 +20,7 @@ pub(crate) use entry::walk;
 
 #[cfg(test)]
 mod tests {
-    use crate::{detect, extract, Budget, Format, Limits};
+    use crate::{Budget, Format, Limits, detect, extract};
     use std::collections::HashMap;
     use std::fs;
 
@@ -213,9 +213,10 @@ mod tests {
         let data = fixture("aes_stored.7z");
         // Correct password → recovered.
         let ok = extract_entries_pw(&data, &["hunter2"]);
-        assert!(ok
-            .values()
-            .any(|v| v.windows(16).any(|w| w == b"EICAR-7Z-AES-MAR")));
+        assert!(
+            ok.values()
+                .any(|v| v.windows(16).any(|w| w == b"EICAR-7Z-AES-MAR"))
+        );
         // Wrong password → no plaintext member; reported unsupported instead.
         let mut budget = Budget::with_passwords(Limits::default(), vec!["wrongpw".into()]);
         let entries = extract(Format::SevenZip, &data, &mut budget).expect("no error");
@@ -225,9 +226,11 @@ mod tests {
                 .all(|e| e.unsupported.is_some() || !e.data.windows(5).any(|w| w == b"EICAR")),
             "wrong password must not surface plaintext"
         );
-        assert!(entries
-            .iter()
-            .any(|e| e.encrypted && e.unsupported.is_some()));
+        assert!(
+            entries
+                .iter()
+                .any(|e| e.encrypted && e.unsupported.is_some())
+        );
     }
 
     /// A solid multi-file AES block decrypts all members with one password.
@@ -266,15 +269,38 @@ mod tests {
         }
     }
 
+    /// 40 folders (7-Zip gives the folders of an archive one key), each with a
+    /// CRC that no password satisfies, tried with five passwords at 2^19 rounds:
+    /// the keys are derived once each, not once for each folder (200 times, 2 s
+    /// in a release build; and 2000 folders took 20 s, 30 at 2^24 took 9 s). Every
+    /// member is still reported encrypted.
+    #[cfg(feature = "decrypt")]
+    #[test]
+    fn a_scan_derives_the_key_of_a_password_once_for_all_the_folders() {
+        let data = fixture("aes_40_folders_2p19.7z");
+        let words = ["a", "b", "c", "d", "e"].map(String::from).to_vec();
+        let mut budget = Budget::with_passwords(Limits::default(), words);
+        let entries = extract(Format::SevenZip, &data, &mut budget).unwrap();
+        assert_eq!(entries.len(), 40);
+        assert!(
+            entries
+                .iter()
+                .all(|e| e.encrypted && e.unsupported.is_some())
+        );
+        assert_eq!(budget.kdf.sevenz_spent(), 5 << 19);
+    }
+
     /// Without a password an AES archive is still reported encrypted/unsupported.
     #[test]
     fn aes_without_password_unsupported() {
         let data = fixture("aes_lzma2.7z");
         let mut budget = Budget::new(Limits::default());
         let entries = extract(Format::SevenZip, &data, &mut budget).expect("no error");
-        assert!(entries
-            .iter()
-            .any(|e| e.encrypted && e.unsupported.is_some()));
+        assert!(
+            entries
+                .iter()
+                .any(|e| e.encrypted && e.unsupported.is_some())
+        );
     }
 
     /// Fuzz regressions: crafted 7z headers with absurd stream/file counts must
@@ -387,4 +413,185 @@ mod tests {
             assert!(entries[0].data == payload, "{filter:?} altered the member");
         }
     }
+
+    /// Every member `walk` hands over, a streamed one read to its end, and how
+    /// the walk ended.
+    type Walked = (Vec<(String, Vec<u8>, Option<&'static str>)>, bool);
+
+    fn walked_from(
+        src: &dyn crate::source::ByteSource,
+        mut budget: Budget,
+    ) -> (Walked, Result<(), crate::LimitHit>) {
+        use crate::Member;
+        let mut out = Vec::new();
+        let end = crate::walk(
+            Format::SevenZip,
+            src,
+            &mut budget,
+            &mut |meta, content, _| {
+                let data = match content {
+                    None => Vec::new(),
+                    Some(Member::Bytes(b)) => b,
+                    Some(Member::Stream(r)) => {
+                        let mut b = Vec::new();
+                        let _ = r.read_to_end(&mut b);
+                        b
+                    }
+                };
+                out.push((meta.name.clone(), data, meta.unsupported));
+                None::<()>
+            },
+        );
+        ((out, end.is_ok()), end.map(|_| ()))
+    }
+
+    fn cache_of(blob: &[u8]) -> crate::source::BlockCache<std::io::Cursor<Vec<u8>>> {
+        // Blocks and a capacity far under the archive, so it is never in memory.
+        crate::source::BlockCache::with_sizes(std::io::Cursor::new(blob.to_vec()), 64, 4 * 64)
+            .unwrap()
+    }
+
+    /// An archive on a source that is not in memory gives the members it gives
+    /// when it is, under a buffer limit far under the archive.
+    #[test]
+    fn an_archive_on_a_source_that_is_not_in_memory_gives_the_same_members() {
+        for name in [
+            "lzma2.7z",
+            "lzma.7z",
+            "bzip2.7z",
+            "deflate.7z",
+            "copy.7z",
+            "ppmd.7z",
+            "lzma2_solid.7z",
+            "lzma2_nonsolid.7z",
+            "bcj_lzma.7z",
+            "delta_lzma.7z",
+            "ppmd_plain_header.7z",
+            "many_entries.7z",
+        ] {
+            let blob = fixture(name);
+            let (held, _) = walked_from(&blob.as_slice(), Budget::new(Limits::default()));
+            // PPMd holds its model, which is 64 KiB at the least.
+            let limits = Limits {
+                max_buffer_bytes: if name.starts_with("ppmd") {
+                    1 << 20
+                } else {
+                    1000
+                },
+                ..Limits::default()
+            };
+            let (cached, end) = walked_from(&cache_of(&blob), Budget::new(limits));
+            end.unwrap_or_else(|h| panic!("{name}: {h:?}"));
+            assert_eq!(held.0, cached.0, "{name}");
+            assert!(!held.0.is_empty(), "{name}");
+        }
+    }
+
+    /// A solid folder of three files, stored, so that the third starts 6000
+    /// bytes into it.
+    fn solid_of_three() -> (Vec<u8>, Vec<Vec<u8>>) {
+        use sevenz_rust2::{ArchiveEntry, ArchiveWriter, EncoderMethod, SourceReader};
+        use std::io::Cursor;
+        let files: Vec<Vec<u8>> = vec![
+            (0..3000u32).map(|i| (i * 7 % 251) as u8).collect(),
+            (0..3000u32).map(|i| (i * 13 % 241) as u8).collect(),
+            b"the tail".to_vec(),
+        ];
+        let mut sink = Cursor::new(Vec::new());
+        {
+            let mut w = ArchiveWriter::new(&mut sink).unwrap();
+            w.set_content_methods(vec![EncoderMethod::COPY.into()]);
+            let entries = ["a", "b", "c"]
+                .iter()
+                .map(|n| ArchiveEntry::new_file(n))
+                .collect();
+            let readers = files
+                .iter()
+                .map(|f| SourceReader::new(Cursor::new(f.clone())))
+                .collect();
+            w.push_archive_entries(entries, readers).unwrap();
+            w.finish().unwrap();
+        }
+        (sink.into_inner(), files)
+    }
+
+    /// A member far into a solid folder is read, not reported: it starts past
+    /// the buffer limit, which a folder streamed through is not held under.
+    #[test]
+    fn a_member_far_into_a_solid_folder_is_read_not_reported() {
+        let (blob, files) = solid_of_three();
+        let limits = Limits {
+            max_buffer_bytes: 1000,
+            ..Limits::default()
+        };
+        let ((got, _), end) = walked_from(&cache_of(&blob), Budget::new(limits));
+        end.unwrap();
+        let want: Vec<_> = ["a", "b", "c"]
+            .iter()
+            .zip(&files)
+            .map(|(n, f)| (n.to_string(), f.clone(), None))
+            .collect();
+        assert_eq!(got, want);
+    }
+
+    /// The members before the one wanted are decoded and dropped, which counts
+    /// against the scan budget: a folder that declares more than it allows is
+    /// not decoded to reach a member.
+    #[test]
+    fn what_is_skipped_to_reach_a_member_counts_against_the_scan_budget() {
+        let (blob, _) = solid_of_three();
+        // A visitor that reads no member, so that reaching the third skips the
+        // 6000 bytes of the two before it.
+        let reached = |scanned: u64| {
+            let mut budget = Budget::new(Limits {
+                max_scanned_bytes: scanned,
+                ..Limits::default()
+            });
+            let mut names = Vec::new();
+            let end = crate::walk(
+                Format::SevenZip,
+                &blob.as_slice(),
+                &mut budget,
+                &mut |meta, _, _| {
+                    names.push(meta.name.clone());
+                    None::<()>
+                },
+            );
+            (names, end)
+        };
+        let (names, end) = reached(1 << 20);
+        end.unwrap();
+        assert_eq!(names, ["a", "b", "c"]);
+        let (names, end) = reached(5000);
+        assert_eq!(names, ["a", "b"], "c is not reached");
+        assert!(end.is_err_and(|h| !h.is_corrupt()));
+    }
+
+    /// A folder decoded whole, as an encrypted one is, is held under the buffer
+    /// limit, read from where it is in the source.
+    #[cfg(feature = "decrypt")]
+    #[test]
+    fn an_encrypted_folder_is_held_under_the_buffer_limit_and_read_from_the_source() {
+        let blob = fixture("aes_stored.7z");
+        let limits = Limits {
+            max_buffer_bytes: 4096,
+            ..Limits::default()
+        };
+        let budget = Budget::with_passwords(limits, vec!["hunter2".into()]);
+        let ((got, _), end) = walked_from(&cache_of(&blob), budget);
+        end.unwrap();
+        assert!(
+            got.iter()
+                .any(|(_, d, _)| d.windows(16).any(|w| w == b"EICAR-7Z-AES-MAR"))
+        );
+        // Under a limit the packed bytes do not fit, it is the limit.
+        let limits = Limits {
+            max_buffer_bytes: 32,
+            ..Limits::default()
+        };
+        let budget = Budget::with_passwords(limits, vec!["hunter2".into()]);
+        let (_, end) = walked_from(&cache_of(&blob), budget);
+        let hit = end.unwrap_err();
+        assert!(!hit.is_corrupt(), "{}", hit.reason);
+    }
 }
diff --git a/crates/exav-unpack/src/formats/sevenz/parse.rs b/crates/exav-unpack/src/formats/sevenz/parse.rs
index bf6d8937..f6122539 100644
--- a/crates/exav-unpack/src/formats/sevenz/parse.rs
+++ b/crates/exav-unpack/src/formats/sevenz/parse.rs
@@ -106,8 +106,11 @@ impl<'a> SevenZReader<'a> {
         ]))
     }
 
+    /// A property id. 7-Zip reads it as a number, so an id from 128 up is more
+    /// than a byte; it is returned as 255, which no id the reader knows is, and
+    /// the property is skipped by its size.
     pub fn read_nid(&mut self) -> Result<u8, LimitHit> {
-        self.read_byte()
+        Ok(u8::try_from(read_var_u64(self)?).unwrap_or(u8::MAX))
     }
 }
 
diff --git a/crates/exav-unpack/src/formats/sfx.rs b/crates/exav-unpack/src/formats/sfx.rs
index e345bdfe..3039df7a 100644
--- a/crates/exav-unpack/src/formats/sfx.rs
+++ b/crates/exav-unpack/src/formats/sfx.rs
@@ -99,10 +99,10 @@ fn find_archive_from(data: &[u8], from: usize) -> Option<(usize, &'static str)>
         let found = memchr::memmem::find_iter(hay, sig)
             .map(|rel| rel + from)
             .find(|&off| plausible(data, off));
-        if let Some(off) = found {
-            if best.is_none_or(|(b, _)| off < b) {
-                best = Some((off, name));
-            }
+        if let Some(off) = found
+            && best.is_none_or(|(b, _)| off < b)
+        {
+            best = Some((off, name));
         }
     }
     best
diff --git a/crates/exav-unpack/src/formats/sniff.rs b/crates/exav-unpack/src/formats/sniff.rs
index c624d901..bc09fe98 100644
--- a/crates/exav-unpack/src/formats/sniff.rs
+++ b/crates/exav-unpack/src/formats/sniff.rs
@@ -38,12 +38,15 @@ pub(crate) fn is_in(p: &Probe, fmt: Format) -> bool {
         Format::Ace => d.get(7..14) == Some(b"**ACE**".as_slice()),
 
         // LZ4 frame, the pre-1.5 legacy frame, or a skippable frame
-        // (`0x184D2A50`..`5F`).
+        // (`0x184D2A50`..`5F`), which Zstandard has as well: those that are
+        // followed by a Zstandard frame are Zstandard's.
         Format::Lz4 => {
             d.len() > 7
                 && (d.starts_with(&[0x04, 0x22, 0x4D, 0x18])
                     || d.starts_with(&[0x02, 0x21, 0x4C, 0x18])
-                    || (d[0] & 0xF0 == 0x50 && d[1..4] == [0x2A, 0x4D, 0x18]))
+                    || (d[0] & 0xF0 == 0x50
+                        && d[1..4] == [0x2A, 0x4D, 0x18]
+                        && !zstd_after_skippable(d)))
         }
 
         // The `conectix` footer cookie. A fixed-disk image carries only the
@@ -190,14 +193,143 @@ pub(crate) fn is_in(p: &Probe, fmt: Format) -> bool {
             d.starts_with(&[0x00, 0x05, 0x16, 0x00]) || d.starts_with(&[0x00, 0x05, 0x16, 0x07])
         }
 
+        Format::Lzma => lzma_alone_header(d),
+
+        // The lead: magic, then the major version of the format (1 to 4).
+        // The superblock's magic, in either byte order, and its 96 bytes.
+        Format::Squashfs => d.len() >= 96 && (d.starts_with(b"hsqs") || d.starts_with(b"sqsh")),
+
+        // The superblock's magic, in either byte order, and the signature
+        // after it, at the start or 512 bytes in (room for boot code).
+        Format::Cramfs => [0usize, 512].iter().any(|&at| {
+            d.get(at..at.saturating_add(32)).is_some_and(|h| {
+                (h.starts_with(&[0x45, 0x3D, 0xCD, 0x28])
+                    || h.starts_with(&[0x28, 0xCD, 0x3D, 0x45]))
+                    && h.get(16..32) == Some(b"Compressed ROMFS".as_slice())
+            })
+        }),
+
+        // The eight bytes the first line of a romfs image is, and the file
+        // system's name after it.
+        Format::Romfs => d.len() >= 32 && d.starts_with(b"-rom1fs-"),
+
+        // The superblock is 1024 bytes in, with its magic first (little-endian).
+        Format::Erofs => d.get(1024..1028) == Some(&[0xE2, 0xE1, 0xF5, 0xE0][..]),
+
+        Format::Rpm => {
+            d.len() >= 96 && d.starts_with(&[0xED, 0xAB, 0xEE, 0xDB]) && (1..=4).contains(&d[4])
+        }
+
         _ => false,
     }
 }
 
+/// Whether the start of a file is the header of an LZMA-alone stream, as the xz
+/// utilities decide it when they are not told: valid properties, a dictionary
+/// size of the form 2^n or 2^n + 2^(n-1) (what the encoders write), a size that
+/// is unknown or below 256 GiB, and the zero byte every range coder starts
+/// with. A file that is not LZMA passes by chance about once in 10^10, which
+/// matters because this runs against every file.
+fn lzma_alone_header(d: &[u8]) -> bool {
+    let Some(h) = d.get(..14) else {
+        return false;
+    };
+    let dict = u32::from_le_bytes([h[1], h[2], h[3], h[4]]);
+    let size = u64::from_le_bytes(h[5..13].try_into().unwrap());
+    h[0] < 9 * 5 * 5
+        && (dict == u32::MAX
+            || (12..=31).any(|n| dict == 1 << n || (n > 12 && dict == (1 << n) + (1 << (n - 1)))))
+        && (size == u64::MAX || size < 1 << 38)
+        && h[13] == 0
+}
+
+/// Whether a file that is no other format is a ZIP that does not start with a
+/// local header: behind a script line (a Python zipapp), padding or a stub, or
+/// with the marker of a spanned archive in front. Readers find a ZIP by its end
+/// record, so these open everywhere. The end record (and its comment) may be
+/// followed by padding, the directory must end where it starts, and the first
+/// entry's local header must be where its offset puts it, counted from the
+/// archive's start or from the file's. ZIP64 is not followed.
+#[cfg(feature = "zip")]
+pub(crate) fn prefixed_zip(p: &Probe) -> bool {
+    const EOCD: usize = 22;
+    if p.len < EOCD + 30 {
+        return false;
+    }
+    let from = p.len.saturating_sub(EOCD + usize::from(u16::MAX));
+    let tail = p.window(from, p.len - from);
+    let Some(rel) = tail.windows(4).rposition(|w| w == b"PK\x05\x06") else {
+        return false;
+    };
+    let Some(end) = tail.get(rel..rel + EOCD) else {
+        return false;
+    };
+    let eocd = from + rel;
+    let u16_at = |at: usize| usize::from(u16::from_le_bytes([end[at], end[at + 1]]));
+    let u32_at = |at: usize| u32::from_le_bytes([end[at], end[at + 1], end[at + 2], end[at + 3]]);
+    let (entries, cd_size, cd_off) = (u16_at(10), u32_at(12), u32_at(16));
+    if eocd + EOCD + u16_at(20) > p.len
+        || entries == 0
+        || entries == 0xFFFF
+        || cd_size == u32::MAX
+        || cd_off == u32::MAX
+    {
+        return false;
+    }
+    let Some(cd_start) = eocd.checked_sub(cd_size as usize) else {
+        return false;
+    };
+    let Some(prefix) = cd_start.checked_sub(cd_off as usize) else {
+        return false;
+    };
+    let entry = p.window(cd_start, 46);
+    if !entry.starts_with(b"PK\x01\x02") || entry.len() < 46 {
+        return false;
+    }
+    let local = u32::from_le_bytes([entry[42], entry[43], entry[44], entry[45]]) as usize;
+    p.window(prefix.saturating_add(local), 4)
+        .starts_with(b"PK\x03\x04")
+}
+
+/// Whether `d` is skippable frames (`0x184D2A50`..`5F`, a length, that many
+/// bytes) and then a Zstandard frame. A file may open with a skippable frame
+/// and be LZ4 or Zstandard; only what follows says which.
+pub(crate) fn zstd_after_skippable(d: &[u8]) -> bool {
+    let mut rest = d;
+    // A few frames is all a real file has; the bound keeps a long run cheap.
+    for _ in 0..16 {
+        match rest {
+            [m, 0x2A, 0x4D, 0x18, a, b, c, e, tail @ ..] if m & 0xF0 == 0x50 => {
+                let len = u32::from_le_bytes([*a, *b, *c, *e]) as usize;
+                match tail.get(len..) {
+                    Some(next) => rest = next,
+                    None => return false,
+                }
+            }
+            _ => return rest.starts_with(&[0x28, 0xB5, 0x2F, 0xFD]),
+        }
+    }
+    false
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn a_skippable_frame_is_lz4_or_zstd_by_what_follows() {
+        let skip = [&[0x50, 0x2A, 0x4D, 0x18, 3, 0, 0, 0][..], b"xyz"].concat();
+        let zstd = [&skip[..], &[0x28, 0xB5, 0x2F, 0xFD, 0, 0, 0, 0][..]].concat();
+        let lz4 = [&skip[..], &[0x04, 0x22, 0x4D, 0x18, 0, 0, 0, 0][..]].concat();
+        assert!(!is(&zstd, Format::Lz4));
+        assert!(zstd_after_skippable(&zstd));
+        assert!(is(&lz4, Format::Lz4));
+        assert!(!zstd_after_skippable(&lz4));
+        // Skippable frames and nothing after: LZ4 as before.
+        let only = [&skip[..], &[0; 8][..]].concat();
+        assert!(is(&only, Format::Lz4));
+    }
+
     #[test]
     fn each_format_accepts_its_own_magic() {
         let cases: Vec<(Format, Vec<u8>)> = vec![
@@ -302,6 +434,35 @@ mod tests {
         assert!(!is(b"KDMV", Format::Vmdk));
     }
 
+    fn lzma_header(props: u8, dict: u32, size: u64) -> Vec<u8> {
+        let mut h = vec![props];
+        h.extend_from_slice(&dict.to_le_bytes());
+        h.extend_from_slice(&size.to_le_bytes());
+        h.extend_from_slice(&[0, 1, 2]);
+        h
+    }
+
+    #[test]
+    fn a_header_of_lzma_utils_is_told() {
+        let is_lzma = |h: &[u8]| is(h, Format::Lzma);
+        // `lzma` writes 0x5D (lc 3, lp 0, pb 2) and a 2^n dictionary.
+        assert!(is_lzma(&lzma_header(0x5D, 1 << 26, u64::MAX)));
+        assert!(is_lzma(&lzma_header(0x5D, 3 << 23, 1234)));
+        assert!(is_lzma(&lzma_header(0x5D, u32::MAX, 0)));
+        // A properties byte past lc 8, lp 4, pb 4.
+        assert!(!is_lzma(&lzma_header(225, 1 << 26, 1)));
+        // A dictionary that is not 2^n or 2^n + 2^(n-1), or is below 4 KiB.
+        assert!(!is_lzma(&lzma_header(0x5D, (1 << 26) + 1, 1)));
+        assert!(!is_lzma(&lzma_header(0x5D, 1 << 11, 1)));
+        // A size of 256 GiB or more that is not "unknown".
+        assert!(!is_lzma(&lzma_header(0x5D, 1 << 26, 1 << 38)));
+        // A range coder starts with a zero byte.
+        let mut h = lzma_header(0x5D, 1 << 26, 1);
+        h[13] = 1;
+        assert!(!is_lzma(&h));
+        assert!(!is_lzma(&h[..13]));
+    }
+
     /// A format this module does not speak for must answer `false` rather than
     /// something accidental — the structural sniffs own those.
     #[test]
diff --git a/crates/exav-unpack/src/formats/squashfs.rs b/crates/exav-unpack/src/formats/squashfs.rs
new file mode 100644
index 00000000..305906cc
--- /dev/null
+++ b/crates/exav-unpack/src/formats/squashfs.rs
@@ -0,0 +1,1103 @@
+//! SquashFS 4: the files of an image, read where they lie.
+//!
+//! The filesystem of firmware, live images, AppImages and snaps: a read-only
+//! tree in blocks that are each compressed on its own. The image is a
+//! `Read + Seek`, read where the walk goes: the superblock, the blocks of the
+//! tables the walk passes through, and each file's blocks. Only a file is ever
+//! held, bounded by the buffer limit.
+//!
+//! ```text
+//! superblock          block size, compression, where each table is, the root
+//!   inode table       metadata blocks: one inode per file, with the sizes of
+//!                     its data blocks, and the fragment its tail is in
+//!   directory table   metadata blocks: runs of (name, inode) per directory
+//!   fragment table    where each block that holds tails is
+//!   data blocks       file contents, in blocks of the block size, each
+//!                     compressed or not
+//! ```
+//!
+//! A metadata block is at most 8 KiB once decompressed, behind a 2-byte header
+//! that says whether it is compressed and how long it is. An inode or a
+//! directory is addressed by the metadata block it starts in, and the offset
+//! in it, and may go on into the next block. Both byte orders are read (an
+//! image from a big-endian machine begins `sqsh`). The compressions are gzip,
+//! LZMA, LZO, XZ, LZ4 and Zstandard. A sparse block reads as zeros. A symbolic
+//! link or a device node holds no file's bytes and is not emitted. Versions
+//! before 4 are reported, not read.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+
+use std::collections::{HashMap, HashSet};
+use std::io::{Read, Seek};
+use std::rc::Rc;
+
+use super::vol::{
+    Attrs, Emit, Fill, Found, Got, Step, Vol, be16, be32, be64, give, le16, le32, le64, read_file,
+};
+use crate::source::{ByteSource, Reader};
+use crate::stream::Visit;
+use crate::{Budget, Entry, LimitHit, Mtime};
+
+/// The most directories a path passes through.
+const MAX_DEPTH: usize = 256;
+
+/// What a metadata block holds once decompressed, at most.
+const META: usize = 8192;
+
+/// How many metadata blocks are kept.
+const CACHED: usize = 64;
+
+/// The most a directory's listing is, bytes.
+const MAX_LISTING: u64 = 64 << 20;
+
+/// The most data blocks of a file are read from a list.
+const MAX_BLOCKS: u64 = 1 << 24;
+
+/// The size of a fragment that is none.
+const NO_FRAGMENT: u32 = 0xFFFF_FFFF;
+
+/// `st_mode` file types.
+const S_IFREG: u32 = 0o100000;
+const S_IFDIR: u32 = 0o040000;
+
+/// Whether `data`, the start of an image, holds a SquashFS superblock's magic,
+/// in either byte order.
+pub(crate) fn is_squashfs(data: &[u8]) -> bool {
+    super::sniff::is(data, crate::Format::Squashfs)
+}
+
+/// What the superblock says of the image.
+struct Squash {
+    be: bool,
+    block_size: u64,
+    compression: u16,
+    fragments: u32,
+    root: u64,
+    inode_table: u64,
+    dir_table: u64,
+    frag_table: u64,
+    /// The decompressed bytes of the metadata blocks read, by place, and the
+    /// place of the block after.
+    cache: HashMap<u64, (Rc<Vec<u8>>, u64)>,
+    /// The last block of fragments read, and which.
+    fragment: Option<(u32, Rc<Vec<u8>>)>,
+}
+
+/// What an inode is.
+enum Kind {
+    Dir {
+        /// The directory table's block and the offset in it.
+        block: u64,
+        offset: usize,
+        /// The bytes of its listing.
+        size: u64,
+    },
+    File {
+        blocks_start: u64,
+        size: u64,
+        fragment: u32,
+        fragment_offset: u64,
+        /// Where its list of block sizes is: the inode's place, the bytes
+        /// before the list, and how many sizes there are.
+        place: (u64, usize),
+        before: usize,
+        count: u64,
+    },
+    Other,
+}
+
+struct Inode {
+    kind: Kind,
+    mode: u32,
+    mtime: i64,
+}
+
+impl Squash {
+    fn u16(&self, d: &[u8], at: usize) -> u16 {
+        if self.be { be16(d, at) } else { le16(d, at) }
+    }
+
+    fn u32(&self, d: &[u8], at: usize) -> u32 {
+        if self.be { be32(d, at) } else { le32(d, at) }
+    }
+
+    fn u64(&self, d: &[u8], at: usize) -> u64 {
+        if self.be { be64(d, at) } else { le64(d, at) }
+    }
+
+    /// `src` decompressed with the image's compression, to at most `max` bytes.
+    fn unpack(&self, src: &[u8], max: usize) -> Option<Vec<u8>> {
+        let mut out = Vec::new();
+        let limit = u64::try_from(max).ok()?.checked_add(1)?;
+        match self.compression {
+            1 => {
+                crate::inflate::zlib_body(src)?
+                    .take(limit)
+                    .read_to_end(&mut out)
+                    .ok()?;
+            }
+            2 => {
+                let stream = lzma_rust2::LzmaStream::new_mem_limit(128 * 1024, None);
+                super::lzma::SansIo::new(src, stream)
+                    .take(limit)
+                    .read_to_end(&mut out)
+                    .ok()?;
+            }
+            3 => out = super::lzo::decompress(src, max).ok()?,
+            4 => {
+                super::xz::XzReader::new(src)
+                    .take(limit)
+                    .read_to_end(&mut out)
+                    .ok()?;
+            }
+            5 => super::lz4::block(src, &mut out, max).ok()?,
+            6 => {
+                super::zstd::ZstdReader::new(src)
+                    .take(limit)
+                    .read_to_end(&mut out)
+                    .ok()?;
+            }
+            _ => return None,
+        }
+        (out.len() <= max).then_some(out)
+    }
+
+    /// The metadata block at `at`, and where the one after it is.
+    fn meta_block(&mut self, v: &mut Vol, at: u64) -> Option<(Rc<Vec<u8>>, u64)> {
+        if let Some((data, next)) = self.cache.get(&at) {
+            return Some((Rc::clone(data), *next));
+        }
+        let head = v.at(at, 2)?;
+        let header = self.u16(&head, 0);
+        let size = usize::from(header & 0x7FFF);
+        if size == 0 || size > META {
+            return None;
+        }
+        let raw = v.at(at.checked_add(2)?, size)?;
+        let data = if header & 0x8000 != 0 {
+            raw
+        } else {
+            self.unpack(&raw, META)?
+        };
+        let next = at.checked_add(2)?.checked_add(size as u64)?;
+        if self.cache.len() >= CACHED {
+            self.cache.clear();
+        }
+        let data = Rc::new(data);
+        self.cache.insert(at, (Rc::clone(&data), next));
+        Some((data, next))
+    }
+
+    /// `n` bytes of a table that starts at `table`, from the offset `inner` of
+    /// the metadata block that is `block` bytes into it, going on into the
+    /// blocks after.
+    fn meta_read(
+        &mut self,
+        v: &mut Vol,
+        table: u64,
+        block: u64,
+        inner: usize,
+        n: usize,
+    ) -> Option<Vec<u8>> {
+        let mut at = table.checked_add(block)?;
+        let mut inner = inner;
+        let mut out: Vec<u8> = Vec::new();
+        while out.len() < n {
+            let (data, next) = self.meta_block(v, at)?;
+            let left = data.len().checked_sub(inner)?;
+            let take = left.min(n.saturating_sub(out.len()));
+            if take == 0 {
+                return None;
+            }
+            out.extend_from_slice(data.get(inner..inner.checked_add(take)?)?);
+            inner = 0;
+            at = next;
+        }
+        Some(out)
+    }
+
+    /// The inode at a reference: the block of the inode table it starts in
+    /// (above 16 bits) and the offset in it.
+    fn inode(&mut self, v: &mut Vol, reference: u64) -> Option<Inode> {
+        let (block, inner) = (reference >> 16, usize::from(reference as u16));
+        let h = self.meta_read(v, self.inode_table, block, inner, 16)?;
+        let (ty, mode, mtime) = (self.u16(&h, 0), u32::from(self.u16(&h, 2)), self.u32(&h, 8));
+        let fixed = match ty {
+            1 => 32,
+            8 => 40,
+            2 => 32,
+            9 => 56,
+            _ => 16,
+        };
+        let b = self.meta_read(v, self.inode_table, block, inner, fixed)?;
+        let kind = match ty {
+            1 => Kind::Dir {
+                block: u64::from(self.u32(&b, 16)),
+                offset: usize::from(self.u16(&b, 26)),
+                size: u64::from(self.u16(&b, 24)),
+            },
+            8 => Kind::Dir {
+                block: u64::from(self.u32(&b, 24)),
+                offset: usize::from(self.u16(&b, 34)),
+                size: u64::from(self.u32(&b, 20)),
+            },
+            2 | 9 => {
+                let (blocks_start, size, fragment, fragment_offset) = if ty == 2 {
+                    (
+                        u64::from(self.u32(&b, 16)),
+                        u64::from(self.u32(&b, 28)),
+                        self.u32(&b, 20),
+                        u64::from(self.u32(&b, 24)),
+                    )
+                } else {
+                    (
+                        self.u64(&b, 16),
+                        self.u64(&b, 24),
+                        self.u32(&b, 44),
+                        u64::from(self.u32(&b, 48)),
+                    )
+                };
+                // A tail in a fragment is not a block of the list.
+                let count = if fragment == NO_FRAGMENT {
+                    size.div_ceil(self.block_size)
+                } else {
+                    size.checked_div(self.block_size)?
+                };
+                Kind::File {
+                    blocks_start,
+                    size,
+                    fragment,
+                    fragment_offset,
+                    place: (block, inner),
+                    before: fixed,
+                    count,
+                }
+            }
+            _ => Kind::Other,
+        };
+        // The type in `mode` is the one that counts: the inode type says the
+        // layout, and a directory may be stored in the extended one.
+        let ftype = match ty {
+            1 | 8 => S_IFDIR,
+            2 | 9 => S_IFREG,
+            _ => 0,
+        };
+        Some(Inode {
+            kind,
+            mode: (mode & 0o7777) | ftype,
+            mtime: i64::from(mtime),
+        })
+    }
+
+    /// The entries of a directory: name, type and inode reference. The flag is
+    /// false where the listing is damaged.
+    fn entries(
+        &mut self,
+        v: &mut Vol,
+        block: u64,
+        offset: usize,
+        size: u64,
+        left: &mut u64,
+        limit: usize,
+    ) -> (Vec<(String, u16, u64)>, bool) {
+        let mut out = Vec::new();
+        // The listing is three bytes longer than what is in it.
+        let want = size.saturating_sub(3);
+        if want > MAX_LISTING || want > *left {
+            return (out, false);
+        }
+        *left = left.saturating_sub(want);
+        let Some(list) = self.meta_read(
+            v,
+            self.dir_table,
+            block,
+            offset,
+            crate::bytes::to_usize(want),
+        ) else {
+            return (out, false);
+        };
+        let mut at = 0usize;
+        while at < list.len() {
+            let Some(h) = crate::bytes::at(&list, at, 12) else {
+                return (out, false);
+            };
+            // The entries of one inode block: one fewer than they are, the
+            // block, and the number the others are relative to.
+            let count = u64::from(self.u32(h, 0)).saturating_add(1);
+            let start = u64::from(self.u32(h, 4));
+            at = at.saturating_add(12);
+            for _ in 0..count {
+                let Some(e) = crate::bytes::at(&list, at, 8) else {
+                    return (out, false);
+                };
+                let (inner, ty) = (u64::from(self.u16(e, 0)), self.u16(e, 4));
+                let name_len = usize::from(self.u16(e, 6)).saturating_add(1);
+                let Some(name) = crate::bytes::at(&list, at.saturating_add(8), name_len) else {
+                    return (out, false);
+                };
+                at = at.saturating_add(8).saturating_add(name_len);
+                if out.len() >= limit {
+                    return (out, true);
+                }
+                out.push((
+                    String::from_utf8_lossy(name).into_owned(),
+                    ty,
+                    start.saturating_mul(1 << 16).saturating_add(inner),
+                ));
+            }
+        }
+        (out, true)
+    }
+
+    /// Where fragment `n` is: its place and its size field.
+    fn fragment_place(&mut self, v: &mut Vol, n: u32) -> Option<(u64, u32)> {
+        if n >= self.fragments {
+            return None;
+        }
+        let index = u64::from(n.checked_div(512)?);
+        let loc = self.u64(
+            &v.at(self.frag_table.checked_add(index.checked_mul(8)?)?, 8)?,
+            0,
+        );
+        let slot = usize::try_from(n.checked_rem(512)?).ok()?;
+        // A block of the table is a block with no inner offset: it begins at its
+        // own place, not at one counted from a table.
+        let (data, _) = self.meta_block(v, loc)?;
+        let e = crate::bytes::at(&data, slot.checked_mul(16)?, 16)?;
+        Some((self.u64(e, 0), self.u32(e, 8)))
+    }
+
+    /// The decompressed block of fragments `n`.
+    fn fragment_block(&mut self, v: &mut Vol, n: u32) -> Option<Rc<Vec<u8>>> {
+        if let Some((m, data)) = &self.fragment
+            && *m == n
+        {
+            return Some(Rc::clone(data));
+        }
+        let (start, field) = self.fragment_place(v, n)?;
+        let data = Rc::new(self.data_block(v, start, field)?);
+        self.fragment = Some((n, Rc::clone(&data)));
+        Some(data)
+    }
+
+    /// A block of data at `at`, as its size field says it is stored.
+    fn data_block(&mut self, v: &mut Vol, at: u64, field: u32) -> Option<Vec<u8>> {
+        let size = usize::try_from(field & 0x00FF_FFFF).ok()?;
+        let raw = v.at(at, size)?;
+        if field & 0x0100_0000 != 0 {
+            return Some(raw);
+        }
+        self.unpack(&raw, crate::bytes::to_usize(self.block_size))
+    }
+
+    /// The bytes of a file: held when they are at most `cap`, else read as
+    /// they go.
+    fn file<'a>(&'a mut self, v: &'a mut Vol<'_>, kind: &Kind, cap: u64) -> Got<'a> {
+        let Kind::File {
+            blocks_start,
+            size,
+            fragment,
+            fragment_offset,
+            place,
+            before,
+            count,
+        } = kind
+        else {
+            return Got::Why("not a file");
+        };
+        if *size == 0 {
+            return Got::Whole(Vec::new());
+        }
+        if *count > MAX_BLOCKS {
+            return Got::Why("SquashFS file with more blocks than are followed");
+        }
+        let n = crate::bytes::to_usize(*count);
+        let list = self.meta_read(
+            v,
+            self.inode_table,
+            place.0,
+            place.1,
+            before.saturating_add(n.saturating_mul(4)),
+        );
+        let Some(list) = list else {
+            return Got::Why("SquashFS file whose list of blocks is unreadable");
+        };
+        let bs = crate::bytes::to_usize(self.block_size);
+        let fill = Blocks {
+            fs: self,
+            list,
+            before: *before,
+            n,
+            i: 0,
+            at: *blocks_start,
+            bs,
+            total: crate::bytes::to_usize(*size),
+            given: 0,
+            fragment: *fragment,
+            fragment_offset: *fragment_offset,
+            tail: false,
+        };
+        read_file(v, fill, *size, cap)
+    }
+}
+
+/// The blocks of a file, then its tail in a fragment, read and decompressed as
+/// they are wanted.
+struct Blocks<'a> {
+    fs: &'a mut Squash,
+    /// The inode's bytes: what comes before the list of blocks, and the list.
+    list: Vec<u8>,
+    before: usize,
+    n: usize,
+    /// The next block, and where it is stored.
+    i: usize,
+    at: u64,
+    bs: usize,
+    total: usize,
+    /// How many bytes of the file have been given.
+    given: usize,
+    fragment: u32,
+    fragment_offset: u64,
+    /// The tail has been given.
+    tail: bool,
+}
+
+impl Fill for Blocks<'_> {
+    fn fill(&mut self, v: &mut Vol, out: &mut Vec<u8>) -> Step {
+        if self.i < self.n {
+            let field = self.fs.u32(
+                &self.list,
+                self.before.saturating_add(self.i.saturating_mul(4)),
+            );
+            // The last block is what is left, if the tail is not in a fragment.
+            let want = self.bs.min(self.total.saturating_sub(self.given));
+            let stored = u64::from(field & 0x00FF_FFFF);
+            if stored == 0 {
+                out.resize(out.len().saturating_add(want), 0);
+            } else {
+                match self.fs.data_block(v, self.at, field) {
+                    Some(mut b) => {
+                        b.resize(want, 0);
+                        out.extend_from_slice(&b);
+                    }
+                    None => return Step::Broken,
+                }
+                self.at = self.at.saturating_add(stored);
+            }
+            self.given = self.given.saturating_add(want);
+            self.i = self.i.saturating_add(1);
+            return Step::More;
+        }
+        if self.fragment == NO_FRAGMENT || self.tail {
+            return Step::End;
+        }
+        let tail = self.total.saturating_sub(self.given);
+        let from = crate::bytes::to_usize(self.fragment_offset);
+        let part = self
+            .fs
+            .fragment_block(v, self.fragment)
+            .and_then(|b| crate::bytes::at(&b, from, tail).map(<[u8]>::to_vec));
+        match part {
+            Some(p) => {
+                self.given = self.given.saturating_add(p.len());
+                out.extend_from_slice(&p);
+                self.tail = true;
+                Step::More
+            }
+            None => Step::Broken,
+        }
+    }
+}
+
+/// The image's superblock, or `None` where it describes none that is read.
+fn open(v: &mut Vol) -> Option<Squash> {
+    let b = v.at(0, 96)?;
+    let be = b.starts_with(b"sqsh");
+    let mut s = Squash {
+        be,
+        block_size: 0,
+        compression: 0,
+        fragments: 0,
+        root: 0,
+        inode_table: 0,
+        dir_table: 0,
+        frag_table: 0,
+        cache: HashMap::new(),
+        fragment: None,
+    };
+    let (block_size, log) = (u64::from(s.u32(&b, 12)), s.u16(&b, 22));
+    if s.u16(&b, 28) != 4
+        || !(4096..=1 << 20).contains(&block_size)
+        || !block_size.is_power_of_two()
+        || block_size != 1u64.checked_shl(u32::from(log))?
+    {
+        return None;
+    }
+    s.block_size = block_size;
+    s.compression = s.u16(&b, 20);
+    s.fragments = s.u32(&b, 16);
+    s.root = s.u64(&b, 32);
+    s.inode_table = s.u64(&b, 64);
+    s.dir_table = s.u64(&b, 72);
+    s.frag_table = s.u64(&b, 80);
+    // The root is a directory of the inode table.
+    let root = s.inode(v, s.root)?;
+    matches!(root.kind, Kind::Dir { .. }).then_some(s)
+}
+
+/// Walk a SquashFS image given whole as a source.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    super::volumes::entries(budget, visit, "", |budget, sink| {
+        walk_volume(Reader::new(src), src.len() as u64, budget, sink)
+    })
+}
+
+/// Walk the SquashFS image `disk`, which is `len` bytes long, handing each
+/// file to `visit`.
+pub(crate) fn walk_volume<D: Read + Seek, R>(
+    mut disk: D,
+    len: u64,
+    budget: &mut Budget,
+    visit: Emit<R>,
+) -> Result<Option<R>, LimitHit> {
+    let max = crate::bytes::to_usize(budget.limits().max_buffer_bytes);
+    let mut v = Vol {
+        disk: &mut disk,
+        len,
+        max,
+    };
+    let head = match v.at(0, 96) {
+        Some(h) if is_squashfs(&h) => h,
+        _ => return Ok(None),
+    };
+    let be = head.starts_with(b"sqsh");
+    let version = if be { be16(&head, 28) } else { le16(&head, 28) };
+    if version != 4 {
+        budget.count_entry()?;
+        let note = Entry::unsupported(
+            "<squashfs-filesystem>".to_string(),
+            len,
+            false,
+            "SquashFS before version 4 is not read",
+        );
+        return Ok(visit(Found::Held(note), budget));
+    }
+    let Some(mut fs) = open(&mut v) else {
+        return Err(LimitHit::corrupt(
+            "squashfs open: the superblock or the root directory is unreadable".into(),
+        ));
+    };
+
+    // One more than the member limit, so the entry past it is counted and the
+    // walk stops there rather than ending short.
+    let limit = crate::bytes::to_usize(budget.limits().max_members).saturating_add(1);
+    // The directory listings of an image are all of its directory table.
+    let mut left = fs
+        .frag_table
+        .saturating_sub(fs.dir_table)
+        .saturating_mul(4096);
+    let mut damaged = false;
+    // A listing is a place and a length: an empty one is where the next begins.
+    let mut seen: HashSet<(u64, usize, u64)> = HashSet::new();
+    let mut stack = Vec::new();
+    if let Some(Inode {
+        kind: Kind::Dir {
+            block,
+            offset,
+            size,
+        },
+        ..
+    }) = fs.inode(&mut v, fs.root)
+    {
+        seen.insert((block, offset, size));
+        stack.push((block, offset, size, String::new(), 0usize));
+    }
+    while let Some((block, offset, size, prefix, depth)) = stack.pop() {
+        let (list, intact) = fs.entries(&mut v, block, offset, size, &mut left, limit);
+        damaged |= !intact;
+        let mut below = Vec::new();
+        for (name, _, reference) in list {
+            budget.count_entry()?;
+            let path = if prefix.is_empty() {
+                name
+            } else {
+                format!("{prefix}/{name}")
+            };
+            let Some(inode) = fs.inode(&mut v, reference) else {
+                damaged = true;
+                continue;
+            };
+            match inode.kind {
+                Kind::Dir {
+                    block,
+                    offset,
+                    size,
+                } => {
+                    if depth >= MAX_DEPTH {
+                        damaged = true;
+                    } else if seen.insert((block, offset, size)) {
+                        below.push((block, offset, size, path, depth.saturating_add(1)));
+                    }
+                }
+                Kind::File { .. } => {
+                    let attrs = Attrs {
+                        mode: Some(inode.mode),
+                        mtime: Some(Mtime::Unix(inode.mtime)),
+                    };
+                    if let Some(r) = give(budget, &mut *visit, path, attrs, |cap| {
+                        fs.file(&mut v, &inode.kind, cap)
+                    })? {
+                        return Ok(Some(r));
+                    }
+                }
+                // A link or a node holds no file's bytes.
+                Kind::Other => {}
+            }
+        }
+        stack.extend(below.into_iter().rev());
+    }
+    if damaged {
+        return Err(LimitHit::corrupt(
+            "squashfs walk: the image is damaged; the files before the damage were scanned".into(),
+        ));
+    }
+    Ok(None)
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::super::vol::collected;
+    use super::*;
+    use crate::Limits;
+    use std::io::Cursor;
+
+    const BS: usize = 4096;
+
+    /// A file or a directory to put in an image.
+    enum N {
+        File(Vec<u8>),
+        Dir(Vec<(&'static str, N)>),
+    }
+
+    /// An image written the way `mksquashfs` lays one out, nothing compressed:
+    /// the superblock, the data blocks, the inode table, the directory table and
+    /// the fragment table. One directory header to each entry.
+    struct Img {
+        be: bool,
+        data: Vec<u8>,
+        inodes: Vec<u8>,
+        dirs: Vec<u8>,
+        /// (place in the data, size field) of each fragment block.
+        fragments: Vec<(usize, u32)>,
+        count: u32,
+    }
+
+    impl Img {
+        fn put16(&self, v: &mut Vec<u8>, x: u16) {
+            v.extend_from_slice(&if self.be {
+                x.to_be_bytes()
+            } else {
+                x.to_le_bytes()
+            });
+        }
+        fn put32(&self, v: &mut Vec<u8>, x: u32) {
+            v.extend_from_slice(&if self.be {
+                x.to_be_bytes()
+            } else {
+                x.to_le_bytes()
+            });
+        }
+        fn put64(&self, v: &mut Vec<u8>, x: u64) {
+            v.extend_from_slice(&if self.be {
+                x.to_be_bytes()
+            } else {
+                x.to_le_bytes()
+            });
+        }
+
+        /// A table as metadata blocks, none compressed.
+        fn meta(&self, table: &[u8]) -> Vec<u8> {
+            let mut out = Vec::new();
+            for chunk in table.chunks(META) {
+                self.put16(&mut out, 0x8000 | chunk.len() as u16);
+                out.extend_from_slice(chunk);
+            }
+            out
+        }
+
+        /// The place of byte `pos` of a table in its metadata blocks.
+        fn place(pos: usize) -> (u64, u16) {
+            ((pos / META * (META + 2)) as u64, (pos % META) as u16)
+        }
+
+        fn inode_header(&mut self, ty: u16, mode: u16) {
+            let mut h = Vec::new();
+            self.put16(&mut h, ty);
+            self.put16(&mut h, mode);
+            self.put16(&mut h, 0);
+            self.put16(&mut h, 0);
+            self.put32(&mut h, 1_700_000_000);
+            self.count += 1;
+            let n = self.count;
+            self.put32(&mut h, n);
+            self.inodes.extend_from_slice(&h);
+        }
+
+        /// Write `n`; its inode reference and its type.
+        fn node(&mut self, n: &N, tail_in_fragment: bool) -> (u64, u16) {
+            match n {
+                N::File(bytes) => {
+                    let start = self.data.len();
+                    let full = bytes.len() / BS;
+                    let tail = bytes.len() % BS;
+                    let (mut sizes, mut fragment, mut offset) = (Vec::new(), NO_FRAGMENT, 0u32);
+                    let blocks = if tail > 0 && !tail_in_fragment {
+                        full + 1
+                    } else {
+                        full
+                    };
+                    for i in 0..blocks {
+                        let chunk = &bytes[i * BS..bytes.len().min((i + 1) * BS)];
+                        if chunk.iter().all(|&b| b == 0) {
+                            // A sparse block is stored as nothing.
+                            sizes.push(0u32);
+                        } else {
+                            sizes.push(chunk.len() as u32 | 0x0100_0000);
+                            self.data.extend_from_slice(chunk);
+                        }
+                    }
+                    if tail > 0 && tail_in_fragment {
+                        // The tails share a fragment block per file here.
+                        fragment = self.fragments.len() as u32;
+                        offset = 0;
+                        let at = self.data.len();
+                        self.data.extend_from_slice(&bytes[full * BS..]);
+                        self.fragments.push((at, tail as u32 | 0x0100_0000));
+                    }
+                    let (block, inner) = Img::place(self.inodes.len());
+                    self.inode_header(2, 0o100644);
+                    let mut b = Vec::new();
+                    self.put32(&mut b, (96 + start) as u32);
+                    self.put32(&mut b, fragment);
+                    self.put32(&mut b, offset);
+                    self.put32(&mut b, bytes.len() as u32);
+                    for s in sizes {
+                        self.put32(&mut b, s);
+                    }
+                    self.inodes.extend_from_slice(&b);
+                    (block << 16 | u64::from(inner), 2)
+                }
+                N::Dir(entries) => {
+                    let mut kids: Vec<_> = entries
+                        .iter()
+                        .map(|(name, n)| (*name, self.node(n, tail_in_fragment)))
+                        .collect();
+                    kids.sort_by_key(|k| k.0);
+                    let (dblock, doffset) = Img::place(self.dirs.len());
+                    let mut list = Vec::new();
+                    for (name, (reference, ty)) in &kids {
+                        self.put32(&mut list, 0);
+                        self.put32(&mut list, (reference >> 16) as u32);
+                        self.put32(&mut list, 1);
+                        self.put16(&mut list, (reference & 0xFFFF) as u16);
+                        self.put16(&mut list, 0);
+                        self.put16(&mut list, *ty);
+                        self.put16(&mut list, (name.len() - 1) as u16);
+                        list.extend_from_slice(name.as_bytes());
+                    }
+                    self.dirs.extend_from_slice(&list);
+                    let (block, inner) = Img::place(self.inodes.len());
+                    self.inode_header(1, 0o040755);
+                    let mut b = Vec::new();
+                    self.put32(&mut b, dblock as u32);
+                    self.put32(&mut b, 2);
+                    self.put16(&mut b, (list.len() + 3) as u16);
+                    self.put16(&mut b, doffset);
+                    self.put32(&mut b, 1);
+                    self.inodes.extend_from_slice(&b);
+                    (block << 16 | u64::from(inner), 1)
+                }
+            }
+        }
+
+        /// The image of `root`.
+        fn build(be: bool, root: &N, tail_in_fragment: bool) -> Vec<u8> {
+            let mut img = Img {
+                be,
+                data: Vec::new(),
+                inodes: Vec::new(),
+                dirs: Vec::new(),
+                fragments: Vec::new(),
+                count: 0,
+            };
+            let (root_ref, _) = img.node(root, tail_in_fragment);
+            let inode_table = 96 + img.data.len();
+            let inodes = img.meta(&img.inodes);
+            let dir_table = inode_table + inodes.len();
+            let dirs = img.meta(&img.dirs);
+            // The fragment table: a metadata block of 16-byte entries, and the
+            // list of the places of those.
+            let mut entries = Vec::new();
+            for &(at, size) in &img.fragments {
+                img.put64(&mut entries, (96 + at) as u64);
+                img.put32(&mut entries, size);
+                img.put32(&mut entries, 0);
+            }
+            let frag_block = img.meta(&entries);
+            let frag_block_at = dir_table + dirs.len();
+            let mut index = Vec::new();
+            if !img.fragments.is_empty() {
+                img.put64(&mut index, frag_block_at as u64);
+            }
+            let frag_table = frag_block_at + frag_block.len();
+            let total = frag_table + index.len();
+            let mut sb = Vec::new();
+            sb.extend_from_slice(if be { b"sqsh" } else { b"hsqs" });
+            img.put32(&mut sb, img.count);
+            img.put32(&mut sb, 1_700_000_000);
+            img.put32(&mut sb, BS as u32);
+            img.put32(&mut sb, img.fragments.len() as u32);
+            img.put16(&mut sb, 1);
+            img.put16(&mut sb, 12);
+            img.put16(&mut sb, 0xB);
+            img.put16(&mut sb, 0);
+            img.put16(&mut sb, 4);
+            img.put16(&mut sb, 0);
+            img.put64(&mut sb, root_ref);
+            img.put64(&mut sb, total as u64);
+            img.put64(&mut sb, 0);
+            img.put64(&mut sb, u64::MAX);
+            img.put64(&mut sb, inode_table as u64);
+            img.put64(&mut sb, dir_table as u64);
+            img.put64(&mut sb, frag_table as u64);
+            img.put64(&mut sb, u64::MAX);
+            assert_eq!(sb.len(), 96);
+            [sb, img.data, inodes, dirs, frag_block, index].concat()
+        }
+    }
+
+    type Member = (String, Vec<u8>, Option<&'static str>);
+
+    fn walked(img: &[u8], limits: Limits) -> (Vec<Member>, Result<(), LimitHit>) {
+        let mut out = Vec::new();
+        let mut budget = Budget::new(limits);
+        let len = img.len() as u64;
+        let end = walk_volume(Cursor::new(img), len, &mut budget, &mut |e, _| {
+            let e = e.whole();
+            out.push((e.name, e.data, e.unsupported));
+            None::<()>
+        });
+        (out, end.map(|_| ()))
+    }
+
+    fn pat(n: usize, seed: u8) -> Vec<u8> {
+        (0..n)
+            .map(|i| (i as u8).wrapping_mul(7).wrapping_add(seed))
+            .collect()
+    }
+
+    fn tree() -> N {
+        let mut sparse = pat(BS, 1);
+        sparse.extend(vec![0u8; BS]);
+        sparse.extend(pat(100, 2));
+        N::Dir(vec![
+            ("a.txt", N::File(b"hello".to_vec())),
+            ("empty", N::File(Vec::new())),
+            ("big", N::File(pat(3 * BS + 77, 3))),
+            ("sparse", N::File(sparse)),
+            (
+                "sub",
+                N::Dir(vec![
+                    ("deeper", N::Dir(vec![("x.bin", N::File(pat(BS, 4)))])),
+                    ("y.bin", N::File(pat(10, 5))),
+                ]),
+            ),
+        ])
+    }
+
+    fn want() -> Vec<(String, Vec<u8>)> {
+        let mut sparse = pat(BS, 1);
+        sparse.extend(vec![0u8; BS]);
+        sparse.extend(pat(100, 2));
+        vec![
+            ("a.txt".into(), b"hello".to_vec()),
+            ("big".into(), pat(3 * BS + 77, 3)),
+            ("empty".into(), Vec::new()),
+            ("sparse".into(), sparse),
+            ("sub/deeper/x.bin".into(), pat(BS, 4)),
+            ("sub/y.bin".into(), pat(10, 5)),
+        ]
+    }
+
+    fn sorted(mut e: Vec<Member>) -> Vec<(String, Vec<u8>)> {
+        assert!(
+            e.iter().all(|m| m.2.is_none()),
+            "{:?}",
+            e.iter().map(|m| (&m.0, m.2)).collect::<Vec<_>>()
+        );
+        e.sort_by(|a, b| a.0.cmp(&b.0));
+        e.into_iter().map(|m| (m.0, m.1)).collect()
+    }
+
+    #[test]
+    fn the_files_come_out_of_an_image_of_either_byte_order_with_tails_and_holes() {
+        for be in [false, true] {
+            for tails in [false, true] {
+                let img = Img::build(be, &tree(), tails);
+                let (e, end) = walked(&img, Limits::default());
+                end.unwrap_or_else(|h| panic!("be {be} tails {tails}: {h:?}"));
+                assert_eq!(sorted(e), want(), "be {be} tails {tails}");
+            }
+        }
+    }
+
+    #[test]
+    fn a_directory_that_is_empty_does_not_hide_the_one_after_it() {
+        let root = N::Dir(vec![
+            ("a", N::Dir(vec![])),
+            ("b", N::Dir(vec![("f", N::File(b"in b".to_vec()))])),
+        ]);
+        let (e, end) = walked(&Img::build(false, &root, false), Limits::default());
+        end.unwrap();
+        assert_eq!(sorted(e), [("b/f".to_string(), b"in b".to_vec())]);
+    }
+
+    #[test]
+    fn a_directory_that_lists_itself_is_walked_once() {
+        let mut img = Img::build(false, &tree(), false);
+        // The root's listing is the last directory table's first run; make the
+        // entry named `sub` (a directory) point at the root's inode instead.
+        let root_ref = u64::from_le_bytes(img[32..40].try_into().unwrap());
+        let sub = img
+            .windows(3)
+            .position(|w| w == b"sub")
+            .filter(|&p| p > 8)
+            .unwrap();
+        // The entry: offset u16, delta i16, type u16, name size u16, the name;
+        // the header before it has the inode block.
+        let header = sub - 8 - 12;
+        img[header + 4..header + 8].copy_from_slice(&((root_ref >> 16) as u32).to_le_bytes());
+        img[sub - 8..sub - 6].copy_from_slice(&((root_ref & 0xFFFF) as u16).to_le_bytes());
+        let (e, end) = walked(&img, Limits::default());
+        end.unwrap();
+        let names: Vec<_> = e.iter().map(|m| m.0.as_str()).collect();
+        assert_eq!(
+            names.iter().filter(|n| n.ends_with("a.txt")).count(),
+            1,
+            "{names:?}"
+        );
+    }
+
+    #[test]
+    fn a_file_whose_blocks_or_fragment_are_not_there_is_reported_with_what_there_is() {
+        // The fragment index past the fragments there are.
+        let mut img = Img::build(false, &N::Dir(vec![("f", N::File(pat(BS + 5, 9)))]), true);
+        let inode_table = u64::from_le_bytes(img[64..72].try_into().unwrap()) as usize;
+        // The file inode follows the header (16 bytes) after the block (2).
+        let at = inode_table + 2 + 16 + 4;
+        img[at..at + 4].copy_from_slice(&7u32.to_le_bytes());
+        let (e, end) = walked(&img, Limits::default());
+        end.unwrap();
+        assert_eq!(e[0].2, Some("file could not be read from the volume"));
+        assert_eq!(e[0].1.len(), BS);
+
+        // A block that runs past the image.
+        let mut img = Img::build(false, &N::Dir(vec![("f", N::File(pat(2 * BS, 9)))]), false);
+        let at = inode_table_of(&img) + 2 + 16 + 16;
+        img[at..at + 4].copy_from_slice(&(0x00FF_FFFFu32 | 0x0100_0000).to_le_bytes());
+        let (e, _) = walked(&img, Limits::default());
+        assert_eq!(e[0].2, Some("file could not be read from the volume"));
+    }
+
+    fn inode_table_of(img: &[u8]) -> usize {
+        u64::from_le_bytes(img[64..72].try_into().unwrap()) as usize
+    }
+
+    #[test]
+    fn what_is_not_a_superblock_is_not_an_image() {
+        let good = Img::build(false, &tree(), false);
+        // What is written, and where.
+        let edits: [(&str, usize, &[u8]); 5] = [
+            ("a block size of 3000", 12, &3000u32.to_le_bytes()),
+            ("a block size that is not its log", 22, &[13, 0]),
+            ("a root inode in no block", 32, &[0xFF; 8]),
+            ("an inode table past the image", 64, &[0xFF; 8]),
+            ("a root that is a file", 32, &[0, 0, 0, 0, 0, 0, 0, 0]),
+        ];
+        for (what, at, bytes) in edits {
+            let mut img = good.clone();
+            img[at..at + bytes.len()].copy_from_slice(bytes);
+            let (e, end) = walked(&img, Limits::default());
+            // A root that is a file: the first inode written is a file.
+            assert!(
+                end.as_ref().is_err_and(|h| h.is_corrupt()) || e.is_empty(),
+                "{what}"
+            );
+        }
+        // Version 3 is reported and not read.
+        let mut v3 = good.clone();
+        v3[28..30].copy_from_slice(&3u16.to_le_bytes());
+        let (e, end) = walked(&v3, Limits::default());
+        end.unwrap();
+        assert_eq!(e[0].2, Some("SquashFS before version 4 is not read"));
+    }
+
+    #[test]
+    fn the_entry_past_the_member_limit_is_counted_and_stops_the_walk() {
+        let root = N::Dir(vec![
+            ("a", N::File(b"a".to_vec())),
+            ("b", N::File(b"b".to_vec())),
+            ("c", N::File(b"c".to_vec())),
+        ]);
+        let img = Img::build(false, &root, false);
+        let run = |max: u64| {
+            let limits = Limits {
+                max_members: max,
+                ..Limits::default()
+            };
+            walked(&img, limits)
+        };
+        let (e, end) = run(3);
+        end.unwrap();
+        assert_eq!(e.len(), 3);
+        let (e, end) = run(2);
+        assert!(!end.unwrap_err().is_corrupt());
+        assert_eq!(e.len(), 2);
+    }
+
+    #[test]
+    fn files_over_the_buffer_limit_are_read_as_they_go_in_either_byte_order() {
+        for be in [false, true] {
+            for tails in [false, true] {
+                let img = Img::build(be, &tree(), tails);
+                let len = img.len() as u64;
+                let mut budget = Budget::new(Limits {
+                    max_buffer_bytes: 100,
+                    ..Limits::default()
+                });
+                let (e, end) =
+                    collected(|emit| walk_volume(Cursor::new(&img[..]), len, &mut budget, emit));
+                end.unwrap_or_else(|h| panic!("be {be} tails {tails}: {h:?}"));
+                let mut got: Vec<(String, Vec<u8>)> = e
+                    .iter()
+                    .map(|(m, _)| (m.name.clone(), m.data.clone()))
+                    .collect();
+                got.sort_by(|a, b| a.0.cmp(&b.0));
+                assert_eq!(got, want(), "be {be} tails {tails}");
+                for (m, streamed) in &e {
+                    assert_eq!(m.unsupported, None, "{}", m.name);
+                    assert_eq!(*streamed, m.data.len() > 100, "{}", m.name);
+                }
+                assert!(e.iter().any(|(_, streamed)| *streamed));
+            }
+        }
+    }
+}
diff --git a/crates/exav-unpack/src/formats/swf.rs b/crates/exav-unpack/src/formats/swf.rs
index 421d50a3..94541e84 100644
--- a/crates/exav-unpack/src/formats/swf.rs
+++ b/crates/exav-unpack/src/formats/swf.rs
@@ -16,7 +16,7 @@ use std::io::{BufReader, Cursor, Read};
 
 use super::lzma::SansIo;
 use crate::source::{ByteSource, Reader};
-use crate::stream::{emit_stream, MemberMeta, Visit};
+use crate::stream::{MemberMeta, Visit, emit_stream};
 use crate::{Budget, LimitHit};
 
 /// Walk an SWF movie: the rebuilt `FWS` header, then the body decoded as it is
@@ -97,8 +97,8 @@ fn dict_size(declared: u32, want: u64, max_buffer: u64) -> u32 {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{extract, Format, Limits};
-    use flate2::{write::ZlibEncoder, Compression};
+    use crate::{Format, Limits, extract};
+    use flate2::{Compression, write::ZlibEncoder};
     use std::io::Write;
 
     /// Assemble an 8-byte SWF header for `sig` with a `FileLength` covering the
@@ -178,9 +178,11 @@ mod tests {
     fn short_and_non_swf_input_is_ignored() {
         let mut budget = Budget::new(Limits::default());
         assert!(extract(Format::Swf, b"CW", &mut budget).unwrap().is_empty());
-        assert!(extract(Format::Swf, b"NOTASWF!", &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Swf, b"NOTASWF!", &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 
     // A `ZWS` header carries two attacker-chosen sizes, and the LZMA dictionary
diff --git a/crates/exav-unpack/src/formats/szdd.rs b/crates/exav-unpack/src/formats/szdd.rs
index 7f2ce67d..e952e221 100644
--- a/crates/exav-unpack/src/formats/szdd.rs
+++ b/crates/exav-unpack/src/formats/szdd.rs
@@ -41,7 +41,7 @@ pub(crate) fn walk<T>(
     budget: &mut Budget,
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
-    use crate::stream::{emit_stream, whole, MemberMeta};
+    use crate::stream::{MemberMeta, emit_stream, whole};
     let hdr = src.window(0, 14);
     if !hdr.starts_with(SZDD_MAGIC) {
         return whole(Format::Szdd, src, budget, visit);
diff --git a/crates/exav-unpack/src/formats/tar.rs b/crates/exav-unpack/src/formats/tar.rs
index 50ef69cf..a347429b 100644
--- a/crates/exav-unpack/src/formats/tar.rs
+++ b/crates/exav-unpack/src/formats/tar.rs
@@ -3,7 +3,7 @@
 use std::io::{Seek, SeekFrom};
 
 use crate::source::{ByteSource, Reader};
-use crate::stream::{emit_stream, MemberMeta, Mtime, Visit};
+use crate::stream::{MemberMeta, Mtime, Visit, emit_stream};
 use crate::{Budget, LimitHit};
 
 pub(crate) fn walk<T>(
diff --git a/crates/exav-unpack/src/formats/tnef.rs b/crates/exav-unpack/src/formats/tnef.rs
index 40c47339..3c3692db 100644
--- a/crates/exav-unpack/src/formats/tnef.rs
+++ b/crates/exav-unpack/src/formats/tnef.rs
@@ -150,8 +150,10 @@ mod tests {
     #[test]
     fn non_tnef_yields_nothing() {
         let mut budget = Budget::new(Limits::default());
-        assert!(extract(Format::Tnef, b"not a tnef file", &mut budget)
-            .unwrap()
-            .is_empty());
+        assert!(
+            extract(Format::Tnef, b"not a tnef file", &mut budget)
+                .unwrap()
+                .is_empty()
+        );
     }
 }
diff --git a/crates/exav-unpack/src/formats/udf.rs b/crates/exav-unpack/src/formats/udf.rs
index d94b224b..2d4f2961 100644
--- a/crates/exav-unpack/src/formats/udf.rs
+++ b/crates/exav-unpack/src/formats/udf.rs
@@ -43,7 +43,7 @@ use std::borrow::Cow;
 use std::collections::HashSet;
 use std::io::{self, Read, Seek, SeekFrom};
 
-use crate::stream::{emit_stream, MemberMeta, Visit};
+use crate::stream::{MemberMeta, Visit, emit_stream};
 use crate::{Budget, LimitHit};
 
 /// UDF descriptors are addressed in 2048-byte sectors regardless of the logical
@@ -758,11 +758,11 @@ struct Node {
 fn walk<T>(
     img: &mut dyn Image,
     max_dir: u64,
-    seen_extents: &mut HashSet<u64>,
+    seen_extents: &mut HashSet<(u64, u64)>,
     sink: Emit<'_, T>,
 ) -> Result<Option<T>, LimitHit> {
     macro_rules! emit {
-        ($item:expr) => {
+        ($item:expr_2021) => {
             if let Some(t) = sink(&mut *img, $item)? {
                 return Ok(Some(t));
             }
@@ -905,10 +905,10 @@ fn walk<T>(
             // Deduplicate against the ISO 9660 walk of the same image: a bridge
             // image's two trees point at the same blocks.
             let part = child.icb.part;
-            if let Some(s) = first_extent_sector(img, &vol, fe, part, &fe_head, ad_kind)? {
-                if !seen_extents.insert(s) {
-                    continue;
-                }
+            if let Some(s) = first_extent_sector(img, &vol, fe, part, &fe_head, ad_kind)?
+                && !seen_extents.insert((s, declared))
+            {
+                continue;
             }
             let Some(l) = layout(img, &vol, fe, part, &fe_head, FILE_TYPE_FILE)? else {
                 // The directory names this file, so it exists; its extents just
@@ -945,7 +945,7 @@ pub(crate) fn stream_udf<R: Read + Seek, T>(
     source: &mut R,
     budget: &mut Budget,
     visit: Visit<T>,
-    seen_extents: &mut HashSet<u64>,
+    seen_extents: &mut HashSet<(u64, u64)>,
 ) -> Result<Option<T>, LimitHit> {
     let head = crate::read_at(source, 0, RECOGNITION_END)?;
     if !has_udf(&head) {
@@ -1013,20 +1013,21 @@ fn read_fids(dir: &[u8], parent: &str) -> Vec<Fid> {
         let total = impl_len.saturating_add(38).saturating_add(name_len);
 
         // `..` carries no name and points back up the tree.
-        if characteristics & FID_PARENT == 0 && name_len > 0 {
-            if let Some(raw) = crate::bytes::at(dir, name_at, name_len) {
-                let name = decode_name(raw);
-                let path = if parent.is_empty() {
-                    name
-                } else {
-                    format!("{parent}/{name}")
-                };
-                out.push(Fid {
-                    path,
-                    icb,
-                    is_dir: characteristics & FID_DIRECTORY != 0,
-                });
-            }
+        if characteristics & FID_PARENT == 0
+            && name_len > 0
+            && let Some(raw) = crate::bytes::at(dir, name_at, name_len)
+        {
+            let name = decode_name(raw);
+            let path = if parent.is_empty() {
+                name
+            } else {
+                format!("{parent}/{name}")
+            };
+            out.push(Fid {
+                path,
+                icb,
+                is_dir: characteristics & FID_DIRECTORY != 0,
+            });
         }
         // Descriptors are padded to a four-byte boundary.
         let step = total.div_ceil(4).saturating_mul(4);
diff --git a/crates/exav-unpack/src/formats/udif.rs b/crates/exav-unpack/src/formats/udif.rs
index b26eec07..02ab7d77 100644
--- a/crates/exav-unpack/src/formats/udif.rs
+++ b/crates/exav-unpack/src/formats/udif.rs
@@ -7,12 +7,12 @@
 #![deny(clippy::arithmetic_side_effects)]
 
 use std::io::{self, Cursor, Read, Seek, SeekFrom};
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 
 use base64::Engine;
-use quick_xml::events::Event;
 use quick_xml::Reader;
+use quick_xml::events::Event;
 
 use crate::LimitHit;
 
@@ -374,7 +374,7 @@ fn decompress(entry_type: u32, compressed: &[u8], expected_len: usize) -> Result
                 return Ok(Run {
                     data: Vec::new(),
                     damaged: true,
-                })
+                });
             }
         },
         BLK_BZIP2 => crate::salvage(
@@ -383,20 +383,17 @@ fn decompress(entry_type: u32, compressed: &[u8], expected_len: usize) -> Result
         ),
         // ULMO blocks are XZ-framed (stream magic FD 37 7A 58 5A 00).
         BLK_LZMA => crate::salvage(super::xz::XzReader::new(Cursor::new(compressed)), cap),
-        BLK_LZFSE => {
-            let mut decoder = lzfse_rust::LzfseRingDecoder::default();
-            crate::salvage(decoder.reader_bytes(compressed), cap)
-        }
+        BLK_LZFSE => super::lzfse::decode(compressed, cap),
         BLK_ADC => {
             return Ok(Run {
                 data: adc_decompress(compressed, expected_len),
                 damaged: false,
-            })
+            });
         }
         other => {
             return Err(LimitHit::corrupt(format!(
                 "UDIF unsupported block type {other:#010x}"
-            )))
+            )));
         }
     };
     // The run's compressed bytes are all here, so a stream that runs out of
@@ -461,7 +458,7 @@ fn parse_plist(xml: &str) -> Result<Vec<Partition>, LimitHit> {
 
     loop {
         match reader.read_event() {
-            Ok(Event::Start(e)) => match e.name().as_ref() {
+            Ok(Event::Start(e)) => match e.name().as_ref().as_bytes() {
                 b"array" if last_key == "blkx" => {
                     in_blkx = true;
                 }
@@ -471,9 +468,8 @@ fn parse_plist(xml: &str) -> Result<Vec<Partition>, LimitHit> {
                 _ => {}
             },
             Ok(Event::Text(e)) => {
-                // quick-xml 0.41 replaced `BytesText::unescape()` with
-                // `xml10_content()` (decode + XML-1.0 entity unescape).
-                let text = e.xml10_content().unwrap_or_default();
+                // `xml10_content()` decodes and unescapes XML 1.0 entities.
+                let text = e.xml10_content();
                 let trimmed = text.trim();
                 if e.is_empty() || trimmed.is_empty() {
                     continue;
@@ -497,7 +493,7 @@ fn parse_plist(xml: &str) -> Result<Vec<Partition>, LimitHit> {
                 }
             }
             Ok(Event::End(e)) => {
-                if e.name().as_ref() == b"array" {
+                if e.name().as_ref() == "array" {
                     in_blkx = false;
                 }
             }
@@ -665,6 +661,36 @@ mod tests {
         assert!(!d.damage().load(Ordering::Relaxed));
     }
 
+    fn lzfse(data: &[u8]) -> Vec<u8> {
+        let mut enc = Vec::new();
+        lzfse_rust::encode_bytes(data, &mut enc).unwrap();
+        enc
+    }
+
+    #[test]
+    fn an_lzfse_run_decodes() {
+        let t = text(64 * 1024);
+        let enc = lzfse(&t);
+        assert!(enc.starts_with(b"bvx2"));
+        let mut d = open(udif(BLK_LZFSE, 128, &enc));
+        assert_eq!(read_at(&mut d, 0, t.len()).unwrap(), t);
+        assert!(!d.damage().load(Ordering::Relaxed));
+    }
+
+    #[test]
+    fn an_lzfse_run_damaged_part_way_keeps_its_whole_blocks_and_is_flagged() {
+        // A whole LZVN block, then an FSE block whose header is damaged.
+        let (first, rest) = (text(3000), text(64 * 1024));
+        let mut enc = lzfse(&first);
+        enc.truncate(enc.len() - 4);
+        let at = enc.len();
+        enc.extend(lzfse(&rest));
+        enc[at + 3] = b'Z';
+        let mut d = open(udif(BLK_LZFSE, 136, &enc));
+        assert_eq!(read_at(&mut d, 0, first.len()).unwrap(), first);
+        assert!(d.damage().load(Ordering::Relaxed));
+    }
+
     #[test]
     fn a_run_decoding_past_its_size_is_flagged() {
         let t = text(4096);
diff --git a/crates/exav-unpack/src/formats/upx.rs b/crates/exav-unpack/src/formats/upx.rs
index ab85ec94..caa12aeb 100644
--- a/crates/exav-unpack/src/formats/upx.rs
+++ b/crates/exav-unpack/src/formats/upx.rs
@@ -905,7 +905,7 @@ mod tests {
     fn deflate_block_roundtrips() {
         // UPX method 15 is a raw DEFLATE stream; verify the decoder recovers the
         // original size-bounded payload.
-        use flate2::{write::DeflateEncoder, Compression};
+        use flate2::{Compression, write::DeflateEncoder};
         use std::io::Write as _;
         let orig: Vec<u8> = (0..4096u32).map(|i| (i * 7) as u8).collect();
         let mut enc = DeflateEncoder::new(Vec::new(), Compression::best());
diff --git a/crates/exav-unpack/src/formats/uuencode.rs b/crates/exav-unpack/src/formats/uuencode.rs
index 5e883a20..655591f0 100644
--- a/crates/exav-unpack/src/formats/uuencode.rs
+++ b/crates/exav-unpack/src/formats/uuencode.rs
@@ -333,11 +333,7 @@ mod tests {
     fn uuencode(name: &str, data: &[u8]) -> Vec<u8> {
         let enc = |v: u8| -> u8 {
             let v = v & 0x3F;
-            if v == 0 {
-                b'`'
-            } else {
-                v + 0x20
-            }
+            if v == 0 { b'`' } else { v + 0x20 }
         };
         let mut out = format!("begin 644 {name}\n").into_bytes();
         for chunk in data.chunks(45) {
diff --git a/crates/exav-unpack/src/formats/vdisk.rs b/crates/exav-unpack/src/formats/vdisk.rs
new file mode 100644
index 00000000..f9aae89c
--- /dev/null
+++ b/crates/exav-unpack/src/formats/vdisk.rs
@@ -0,0 +1,667 @@
+//! Virtual disks read in place.
+//!
+//! VHD, VHDX, QCOW2 and VMDK declare a disk size that is not the file's. A
+//! [`VDisk`] gives such a disk as a `Read + Seek` without holding it. The
+//! container's tables are read from the source when a read first reaches a
+//! unit (a cluster, block or grain), a stored unit is read straight from the
+//! source, an unallocated one reads as zeros and costs nothing, and a
+//! compressed one is decoded into a cache of at most [`CACHE_BYTES`] and
+//! decoded again if it was evicted.
+//!
+//! [`walk`] hands the disk over in one of two ways. A disk that fits the buffer
+//! limit is read into one member, as it always was, so its raw bytes are
+//! scanned and typed one level down. A larger one is never held: its partitions
+//! and filesystems are walked in place ([`super::volumes`]) and each file comes
+//! out as a member.
+//!
+//! What the decoder does is bounded three ways. The tables are not held at all
+//! (they are read from the source, which caches them), so a hostile table size
+//! costs reads, not memory. The cache is a fixed size. And the bytes decoded
+//! over the whole walk are counted against the scan budget, so an image that
+//! makes the filesystem walker land on a different compressed unit for every
+//! small read stops when the budget does.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+// Each format uses a part of this module (VHD has no compressed units, QCOW2 and
+// VMDK no big-endian tables); see `cap_prealloc` for why the feature lists are
+// not spelled out.
+#![allow(dead_code)]
+
+use std::borrow::Cow;
+use std::cell::Cell;
+use std::collections::{BTreeMap, HashMap};
+use std::io::{self, Read, Seek, SeekFrom};
+use std::rc::Rc;
+
+use super::volumes::{self, report};
+use crate::source::ByteSource;
+use crate::stream::Visit;
+use crate::{Budget, Entry, LimitHit, LimitKind};
+
+/// Decoded units kept.
+pub(crate) const CACHE_BYTES: usize = 32 * 1024 * 1024;
+
+/// The largest compressed unit a layout may declare: a unit is decoded whole
+/// into the cache, which has to hold a few of them.
+pub(crate) const MAX_PACKED_UNIT: u64 = (CACHE_BYTES / 2) as u64;
+
+/// Carried by the error a read fails with when the disk has decoded its
+/// allowance.
+const OVER_ALLOWANCE: &str = "exav:virtual-disk-decode-allowance";
+
+/// Where a unit of the disk is.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum Map {
+    /// Not stored: reads as zeros.
+    Zero,
+    /// Stored as it reads, from this offset in the file, wholly inside it.
+    Plain(u64),
+    /// Compressed: `stored` bytes at `at`, fewer than the container says when
+    /// the file ends first (`cut`).
+    Packed { at: u64, stored: u64, cut: bool },
+}
+
+/// A compressed unit as far as it decoded.
+pub(crate) struct Unpacked {
+    pub(crate) data: Vec<u8>,
+    /// Compressed bytes of the unit were left undecoded, or it decoded to more
+    /// than the unit holds: what was read from it may not be the disk's.
+    pub(crate) damaged: bool,
+}
+
+/// What a container format says of its disk.
+pub(crate) trait Layout {
+    /// The member the disk is handed over as, when it is handed over whole.
+    fn name(&self) -> &'static str;
+
+    /// The disk's size in bytes.
+    fn size(&self) -> u64;
+
+    /// Bytes per unit, never zero.
+    fn unit(&self) -> u64;
+
+    /// Where unit `idx` is. A unit whose table entry cannot be read, or whose
+    /// stored bytes are not all in the file, is [`Map::Zero`]: the file is
+    /// short, so those bytes are absent, not hidden.
+    fn map(&self, idx: u64) -> Map;
+
+    /// Decode unit `idx`, `out` bytes long, from its [`Map::Packed`] bytes.
+    fn unpack(&self, _idx: u64, _at: u64, _stored: u64, _cut: bool, _out: usize) -> Unpacked {
+        Unpacked {
+            data: Vec::new(),
+            damaged: true,
+        }
+    }
+
+    /// What the walk found that the member alone would not say: a size and a
+    /// reason for each, reported ahead of it.
+    fn reports(&self, _health: &Health) -> Vec<(u64, &'static str)> {
+        Vec::new()
+    }
+
+    /// Why the disk is not worth handing over: the reason replaces it.
+    /// `whole`: every unit was read.
+    fn unusable(&self, _health: &Health, _whole: bool) -> Option<&'static str> {
+        None
+    }
+}
+
+/// What reads of a disk found, shared with the walker that reads it.
+pub(crate) struct Health {
+    /// Compressed units decoded with a fault, counted per decode.
+    undecodable: Cell<u64>,
+    /// Compressed units that gave any bytes, damaged or not.
+    produced: Cell<u64>,
+    /// Bytes decoded so far, and the most the disk may decode.
+    decoded: Cell<u64>,
+    allowance: u64,
+    over: Cell<bool>,
+    /// The most the cache held at once.
+    cache_peak: Cell<usize>,
+}
+
+impl Health {
+    fn new(allowance: u64) -> Rc<Self> {
+        Rc::new(Health {
+            undecodable: Cell::new(0),
+            produced: Cell::new(0),
+            decoded: Cell::new(0),
+            allowance,
+            over: Cell::new(false),
+            cache_peak: Cell::new(0),
+        })
+    }
+
+    /// Units reached whose compressed bytes would not decode.
+    pub(crate) fn undecodable(&self) -> u64 {
+        self.undecodable.get()
+    }
+
+    /// Units that gave any bytes: a unit damaged part way still gave what
+    /// decoded before the damage.
+    pub(crate) fn produced(&self) -> u64 {
+        self.produced.get()
+    }
+
+    /// Bytes decoded so far.
+    pub(crate) fn decoded(&self) -> u64 {
+        self.decoded.get()
+    }
+
+    /// The most bytes of decoded units the cache held at once.
+    #[cfg(test)]
+    pub(crate) fn cache_peak(&self) -> usize {
+        self.cache_peak.get()
+    }
+
+    /// A read was refused for decoding more than the disk may.
+    pub(crate) fn over_allowance(&self) -> bool {
+        self.over.get()
+    }
+
+    fn charge(&self, n: u64) -> io::Result<()> {
+        let total = self.decoded.get().saturating_add(n);
+        if total > self.allowance {
+            self.over.set(true);
+            return Err(io::Error::other(OVER_ALLOWANCE));
+        }
+        self.decoded.set(total);
+        Ok(())
+    }
+}
+
+/// Decoded units by index, the least recently used evicted past `cap` bytes.
+struct Cache {
+    units: HashMap<u64, (Vec<u8>, u64)>,
+    /// Tick of last use to unit.
+    order: BTreeMap<u64, u64>,
+    bytes: usize,
+    tick: u64,
+    cap: usize,
+}
+
+impl Cache {
+    fn new(cap: usize) -> Self {
+        Cache {
+            units: HashMap::new(),
+            order: BTreeMap::new(),
+            bytes: 0,
+            tick: 0,
+            cap,
+        }
+    }
+
+    /// Mark `idx` used. Whether it is held.
+    fn touch(&mut self, idx: u64) -> bool {
+        let Some((_, used)) = self.units.get_mut(&idx) else {
+            return false;
+        };
+        self.order.remove(used);
+        self.tick = self.tick.saturating_add(1);
+        *used = self.tick;
+        self.order.insert(self.tick, idx);
+        true
+    }
+
+    fn get(&self, idx: u64) -> Option<&[u8]> {
+        self.units.get(&idx).map(|(d, _)| d.as_slice())
+    }
+
+    fn put(&mut self, idx: u64, data: Vec<u8>) {
+        while self.bytes.saturating_add(data.len()) > self.cap {
+            let Some((_, old)) = self.order.pop_first() else {
+                break;
+            };
+            if let Some((d, _)) = self.units.remove(&old) {
+                self.bytes = self.bytes.saturating_sub(d.len());
+            }
+        }
+        self.bytes = self.bytes.saturating_add(data.len());
+        self.tick = self.tick.saturating_add(1);
+        self.order.insert(self.tick, idx);
+        if let Some((old, used)) = self.units.insert(idx, (data, self.tick)) {
+            self.order.remove(&used);
+            self.bytes = self.bytes.saturating_sub(old.len());
+        }
+    }
+}
+
+/// `len` bytes at `off` of `src`, or `None` when they are not all in it.
+pub(crate) fn bytes_at(src: &dyn ByteSource, off: u64, len: usize) -> Option<Cow<'_, [u8]>> {
+    let off = usize::try_from(off).ok()?;
+    if off.checked_add(len)? > src.len() {
+        return None;
+    }
+    let w = src.window(off, len);
+    (w.len() == len).then_some(w)
+}
+
+/// A big-endian `u32` at `off`.
+pub(crate) fn be32(src: &dyn ByteSource, off: u64) -> Option<u32> {
+    let b = bytes_at(src, off, 4)?;
+    Some(u32::from_be_bytes([b[0], b[1], b[2], b[3]]))
+}
+
+/// A big-endian `u64` at `off`.
+pub(crate) fn be64(src: &dyn ByteSource, off: u64) -> Option<u64> {
+    let b = bytes_at(src, off, 8)?;
+    Some(u64::from_be_bytes([
+        b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
+    ]))
+}
+
+/// A little-endian `u32` at `off`.
+pub(crate) fn le32(src: &dyn ByteSource, off: u64) -> Option<u32> {
+    let b = bytes_at(src, off, 4)?;
+    Some(u32::from_le_bytes([b[0], b[1], b[2], b[3]]))
+}
+
+/// A little-endian `u64` at `off`.
+pub(crate) fn le64(src: &dyn ByteSource, off: u64) -> Option<u64> {
+    let b = bytes_at(src, off, 8)?;
+    Some(u64::from_le_bytes([
+        b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
+    ]))
+}
+
+/// A virtual disk, as a `Read + Seek`.
+pub(crate) struct VDisk<'a, L: Layout> {
+    src: &'a dyn ByteSource,
+    layout: L,
+    pos: u64,
+    health: Rc<Health>,
+    cache: Cache,
+    /// The unit the last read was in, so a filesystem reading it sector by
+    /// sector looks it up once.
+    last: Option<(u64, Map)>,
+}
+
+impl<'a, L: Layout> VDisk<'a, L> {
+    /// A disk that may decode `allowance` bytes in all.
+    pub(crate) fn new(src: &'a dyn ByteSource, layout: L, allowance: u64) -> Self {
+        VDisk {
+            src,
+            layout,
+            pos: 0,
+            health: Health::new(allowance),
+            cache: Cache::new(CACHE_BYTES),
+            last: None,
+        }
+    }
+
+    pub(crate) fn size(&self) -> u64 {
+        self.layout.size()
+    }
+
+    pub(crate) fn health(&self) -> Rc<Health> {
+        self.health.clone()
+    }
+
+    fn lookup(&mut self, idx: u64) -> Map {
+        if let Some((i, m)) = self.last
+            && i == idx
+        {
+            return m;
+        }
+        let m = self.layout.map(idx);
+        self.last = Some((idx, m));
+        m
+    }
+
+    /// Unit `idx` decoded, `out` bytes long when whole.
+    fn unpacked(
+        &mut self,
+        idx: u64,
+        (at, stored, cut): (u64, u64, bool),
+        out: usize,
+    ) -> io::Result<&[u8]> {
+        if !self.cache.touch(idx) {
+            self.health.charge(out as u64)?;
+            let u = self.layout.unpack(idx, at, stored, cut, out);
+            let h = &self.health;
+            if u.damaged {
+                h.undecodable.set(h.undecodable.get().saturating_add(1));
+            }
+            if !u.data.is_empty() {
+                h.produced.set(h.produced.get().saturating_add(1));
+            }
+            self.cache.put(idx, u.data);
+            let peak = self.health.cache_peak.get().max(self.cache.bytes);
+            self.health.cache_peak.set(peak);
+        }
+        Ok(self.cache.get(idx).unwrap_or(&[]))
+    }
+}
+
+impl<L: Layout> Read for VDisk<'_, L> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let size = self.layout.size();
+        if buf.is_empty() || self.pos >= size {
+            return Ok(0);
+        }
+        let unit = self.layout.unit().max(1);
+        let idx = self.pos.checked_div(unit).unwrap_or(0);
+        let into = self.pos.checked_rem(unit).unwrap_or(0);
+        let unit_len = unit.min(size.saturating_sub(idx.saturating_mul(unit)));
+        let room = unit_len.saturating_sub(into);
+        let want = usize::try_from(room).map_or(buf.len(), |r| r.min(buf.len()));
+        let buf = &mut buf[..want];
+        match self.lookup(idx) {
+            Map::Zero => buf.fill(0),
+            Map::Plain(at) => {
+                let from = at.saturating_add(into);
+                let w = bytes_at(self.src, from, want).ok_or_else(|| {
+                    io::Error::new(
+                        io::ErrorKind::UnexpectedEof,
+                        self.src
+                            .read_error()
+                            .unwrap_or_else(|| "the image ended inside a stored unit".into()),
+                    )
+                })?;
+                buf.copy_from_slice(&w);
+            }
+            Map::Packed { at, stored, cut } => {
+                let out = usize::try_from(unit_len).unwrap_or(usize::MAX);
+                let skip = usize::try_from(into).unwrap_or(usize::MAX);
+                let data = self.unpacked(idx, (at, stored, cut), out)?;
+                let have = data.len().saturating_sub(skip).min(want);
+                if let Some(s) = data.get(skip..skip.saturating_add(have)) {
+                    buf[..have].copy_from_slice(s);
+                }
+                // A unit that decoded short reads as zeros past what decoded.
+                buf[have..].fill(0);
+            }
+        }
+        self.pos = self.pos.saturating_add(want as u64);
+        Ok(want)
+    }
+}
+
+impl<L: Layout> Seek for VDisk<'_, L> {
+    fn seek(&mut self, to: SeekFrom) -> io::Result<u64> {
+        let pos = match to {
+            SeekFrom::Start(p) => Some(p),
+            SeekFrom::End(d) => self.layout.size().checked_add_signed(d),
+            SeekFrom::Current(d) => self.pos.checked_add_signed(d),
+        }
+        .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "seek outside the disk"))?;
+        self.pos = pos;
+        Ok(pos)
+    }
+}
+
+/// The stop for a disk that decoded more than its allowance.
+fn over_allowance(name: &str) -> LimitHit {
+    LimitHit::of_kind(
+        LimitKind::MaxScanSize,
+        format!("{name}: the bytes decoded to read the disk exceed the scan budget"),
+    )
+}
+
+/// Hand `disk` to the visitor. See the module note for the two ways.
+pub(crate) fn walk<L: Layout, T>(
+    mut disk: VDisk<'_, L>,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    budget.count_entry()?;
+    let cap = budget.reserve()?;
+    let size = disk.size();
+    let name = disk.layout.name();
+    let health = disk.health();
+    match usize::try_from(size) {
+        Ok(n) if size <= cap => {
+            let mut data = Vec::with_capacity(crate::cap_prealloc(n));
+            if let Err(e) = (&mut disk).take(size).read_to_end(&mut data) {
+                if health.over_allowance() {
+                    return Err(over_allowance(name));
+                }
+                return Err(LimitHit::corrupt(format!("{name}: {e}")));
+            }
+            if let Some(why) = disk.layout.unusable(&health, true) {
+                return report(name, size, why, budget, visit);
+            }
+            for (n, why) in disk.layout.reports(&health) {
+                if let Some(t) = report(name, n, why, budget, &mut *visit)? {
+                    return Ok(Some(t));
+                }
+            }
+            budget.commit(data.len() as u64);
+            crate::stream::emit_entry(Entry::new(name.to_string(), data), budget, visit)
+        }
+        _ => {
+            let found = volumes::walk_disk(&mut disk, volumes::Mode::Virtual, budget, &mut *visit);
+            budget.charge_scan(health.decoded())?;
+            // A walk that failed because the disk ran out of what it may
+            // decode failed for that, whatever it was reading.
+            match found {
+                Ok(Some(t)) => return Ok(Some(t)),
+                Err(_) if health.over_allowance() => return Err(over_allowance(name)),
+                Err(e) => return Err(e),
+                Ok(None) if health.over_allowance() => return Err(over_allowance(name)),
+                Ok(None) => {}
+            }
+            if let Some(why) = disk.layout.unusable(&health, false) {
+                return report(name, size, why, budget, visit);
+            }
+            for (n, why) in disk.layout.reports(&health) {
+                if let Some(t) = report(name, n, why, budget, &mut *visit)? {
+                    return Ok(Some(t));
+                }
+            }
+            Ok(None)
+        }
+    }
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+pub(crate) mod tests {
+    use super::*;
+
+    /// A layout of `units` units of `unit` bytes where the test says what each is.
+    pub(crate) struct Table<'a> {
+        pub(crate) src: &'a [u8],
+        pub(crate) unit: u64,
+        pub(crate) size: u64,
+        pub(crate) maps: Vec<Map>,
+        pub(crate) decodes: Rc<Cell<u64>>,
+    }
+
+    impl Layout for Table<'_> {
+        fn name(&self) -> &'static str {
+            "test-disk"
+        }
+        fn size(&self) -> u64 {
+            self.size
+        }
+        fn unit(&self) -> u64 {
+            self.unit
+        }
+        fn map(&self, idx: u64) -> Map {
+            usize::try_from(idx)
+                .ok()
+                .and_then(|i| self.maps.get(i).copied())
+                .unwrap_or(Map::Zero)
+        }
+        /// The unit's stored bytes, backwards.
+        fn unpack(&self, _idx: u64, at: u64, stored: u64, _cut: bool, out: usize) -> Unpacked {
+            self.decodes.set(self.decodes.get() + 1);
+            let at = at as usize;
+            let mut d: Vec<u8> = self.src[at..at + stored as usize].to_vec();
+            d.reverse();
+            d.resize(out, 0);
+            Unpacked {
+                data: d,
+                damaged: false,
+            }
+        }
+    }
+
+    fn read_all<L: Layout>(d: &mut VDisk<'_, L>) -> Vec<u8> {
+        let mut out = Vec::new();
+        d.seek(SeekFrom::Start(0)).unwrap();
+        d.read_to_end(&mut out).unwrap();
+        out
+    }
+
+    /// Four units of 8 bytes: stored, absent, compressed, stored past the end.
+    fn disk_of<'a>(file: &'a [u8], decodes: &Rc<Cell<u64>>) -> Table<'a> {
+        Table {
+            src: file,
+            unit: 8,
+            size: 30,
+            maps: vec![
+                Map::Plain(0),
+                Map::Zero,
+                Map::Packed {
+                    at: 8,
+                    stored: 8,
+                    cut: false,
+                },
+                Map::Plain(8),
+            ],
+            decodes: decodes.clone(),
+        }
+    }
+
+    #[test]
+    fn units_read_as_their_map_says_and_the_last_one_is_short() {
+        let file: Vec<u8> = (1..=16).collect();
+        let decodes = Rc::new(Cell::new(0));
+        let mut d = VDisk::new(&file, disk_of(&file, &decodes), u64::MAX);
+        let all = read_all(&mut d);
+        let mut want = Vec::new();
+        want.extend_from_slice(&file[..8]);
+        want.extend_from_slice(&[0; 8]);
+        want.extend(file[8..16].iter().rev());
+        want.extend_from_slice(&file[8..14]);
+        assert_eq!(all, want);
+        assert_eq!(d.size(), 30);
+    }
+
+    #[test]
+    fn reads_that_cross_units_and_seeks_agree_with_the_whole() {
+        let file: Vec<u8> = (1..=16).collect();
+        let decodes = Rc::new(Cell::new(0));
+        let mut d = VDisk::new(&file, disk_of(&file, &decodes), u64::MAX);
+        let all = read_all(&mut d);
+        for (at, n) in [(0u64, 5usize), (6, 9), (15, 3), (23, 7), (29, 1)] {
+            d.seek(SeekFrom::Start(at)).unwrap();
+            let mut got = vec![0u8; n];
+            d.read_exact(&mut got).unwrap();
+            assert_eq!(got, all[at as usize..at as usize + n], "({at}, {n})");
+        }
+        // End and Current seeks; reading at the end is empty, past it too.
+        assert_eq!(d.seek(SeekFrom::End(-2)).unwrap(), 28);
+        assert_eq!(d.seek(SeekFrom::Current(-1)).unwrap(), 27);
+        assert!(d.seek(SeekFrom::Current(-100)).is_err());
+        d.seek(SeekFrom::Start(30)).unwrap();
+        assert_eq!(d.read(&mut [0u8; 4]).unwrap(), 0);
+        d.seek(SeekFrom::Start(u64::MAX)).unwrap();
+        assert_eq!(d.read(&mut [0u8; 4]).unwrap(), 0);
+        assert!(d.seek(SeekFrom::Current(1)).is_err());
+    }
+
+    /// Decoded units are kept while the cache has room for them.
+    #[test]
+    fn a_decoded_unit_is_decoded_once_while_it_is_cached() {
+        let file: Vec<u8> = (1..=16).collect();
+        let decodes = Rc::new(Cell::new(0));
+        let mut d = VDisk::new(&file, disk_of(&file, &decodes), u64::MAX);
+        for _ in 0..3 {
+            d.seek(SeekFrom::Start(16)).unwrap();
+            d.read_exact(&mut [0u8; 8]).unwrap();
+        }
+        assert_eq!(decodes.get(), 1);
+        assert_eq!(d.health().produced(), 1);
+    }
+
+    #[test]
+    fn cache_evicts_the_least_recently_used_and_decodes_again_to_the_same_bytes() {
+        let mut c = Cache::new(20);
+        c.put(1, vec![1; 8]);
+        c.put(2, vec![2; 8]);
+        assert!(c.touch(1));
+        // 3 does not fit beside both: 2, the least recently used, goes.
+        c.put(3, vec![3; 8]);
+        assert!(c.get(1).is_some() && c.get(2).is_none() && c.get(3).is_some());
+        assert!(c.bytes <= 20);
+        // A unit put again replaces itself without double counting.
+        c.put(3, vec![9; 4]);
+        assert_eq!(c.get(3), Some(&[9u8; 4][..]));
+        assert_eq!(c.bytes, 12);
+        assert!(!c.touch(2));
+    }
+
+    /// Reading A, then enough other units to evict it, then A again gives A.
+    #[test]
+    fn a_unit_read_again_after_eviction_is_the_same() {
+        // 64 packed units of 1 MiB, each its own pattern; a cache of 32 MiB
+        // holds 32 of them.
+        let unit = 1usize << 20;
+        let file: Vec<u8> = (0..64u32 * 1024).map(|i| (i % 251) as u8).collect();
+        let decodes = Rc::new(Cell::new(0));
+        let maps: Vec<Map> = (0..64)
+            .map(|i| Map::Packed {
+                at: (i % 8) * 8192,
+                stored: 8192,
+                cut: false,
+            })
+            .collect();
+        let layout = Table {
+            src: &file,
+            unit: unit as u64,
+            size: 64 * unit as u64,
+            maps,
+            decodes: decodes.clone(),
+        };
+        let mut d = VDisk::new(&file, layout, u64::MAX);
+        let read = |d: &mut VDisk<'_, Table<'_>>, at: u64| {
+            d.seek(SeekFrom::Start(at)).unwrap();
+            let mut b = vec![0u8; 8192];
+            d.read_exact(&mut b).unwrap();
+            b
+        };
+        let a = read(&mut d, 0);
+        // Walk through 40 more units: A is evicted.
+        for i in 1..41u64 {
+            read(&mut d, i * unit as u64);
+        }
+        let before = decodes.get();
+        assert_eq!(read(&mut d, 0), a);
+        assert_eq!(decodes.get(), before + 1, "A was decoded again");
+        assert!(d.health().cache_peak() <= CACHE_BYTES + 8192);
+    }
+
+    #[test]
+    fn decoding_past_the_allowance_stops_the_read_and_says_so() {
+        let file: Vec<u8> = (1..=16).collect();
+        let decodes = Rc::new(Cell::new(0));
+        let mut d = VDisk::new(&file, disk_of(&file, &decodes), 4);
+        d.seek(SeekFrom::Start(16)).unwrap();
+        let e = d.read_exact(&mut [0u8; 8]).unwrap_err();
+        assert_eq!(e.to_string(), OVER_ALLOWANCE);
+        assert!(d.health().over_allowance());
+        assert_eq!(decodes.get(), 0, "nothing was decoded past the allowance");
+    }
+
+    /// A plain unit the source cannot deliver is an error, not zeros.
+    #[test]
+    fn a_stored_unit_the_source_lost_is_an_error() {
+        let file: Vec<u8> = (1..=4).collect();
+        let layout = Table {
+            src: &file,
+            unit: 8,
+            size: 8,
+            maps: vec![Map::Plain(0)],
+            decodes: Rc::new(Cell::new(0)),
+        };
+        let mut d = VDisk::new(&file, layout, u64::MAX);
+        let e = d.read_exact(&mut [0u8; 8]).unwrap_err();
+        assert_eq!(e.kind(), io::ErrorKind::UnexpectedEof);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/vhd.rs b/crates/exav-unpack/src/formats/vhd.rs
index 049f1f89..f5ba82a4 100644
--- a/crates/exav-unpack/src/formats/vhd.rs
+++ b/crates/exav-unpack/src/formats/vhd.rs
@@ -10,33 +10,38 @@
 //! Format Specification* (the VHD footer / dynamic-disk header layout is public).
 //! All multi-byte fields are **big-endian**.
 //!
-//! Two of the three disk types are reconstructed:
+//! Two of the three disk types are read:
 //!
 //! * **Fixed** (`disk_type == 2`) — the file *is* the raw disk, followed by a
-//!   512-byte footer. Extraction is a slice.
+//!   512-byte footer.
 //! * **Dynamic** (`disk_type == 3`) — a Block Allocation Table maps each block
 //!   of the virtual disk to a location in the file, or marks it unallocated.
-//!   Reconstruct the disk by walking the BAT; unallocated blocks read as zeroes,
-//!   exactly as they do when Windows mounts the image.
+//!   Unallocated blocks read as zeroes, exactly as they do when Windows mounts
+//!   the image. The table is read from the source as blocks are reached, never
+//!   held.
 //!
-//! **Differencing** (`disk_type == 4`) images are *not* reconstructed: they hold
+//! **Differencing** (`disk_type == 4`) images are *not* read: they hold
 //! only the delta against a parent `.vhd` that is not in this file, so the disk
 //! cannot be assembled from what we have. That is reported, never passed over —
-//! see [`extract_vhd`].
+//! see [`walk`].
 //!
-//! The reconstructed disk is emitted as a single member, which the partition and
-//! filesystem handlers then pick up in the normal way.
+//! The disk is a [`VDisk`]: one member when it fits the buffer limit, else its
+//! filesystems are walked in place (see `vdisk.rs`).
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use super::vdisk::{self, Layout, Map, VDisk, be32, bytes_at};
+use super::volumes::report;
+use crate::source::ByteSource;
+use crate::stream::Visit;
+use crate::{Budget, LimitHit};
 
-const FOOTER_LEN: usize = 512;
+const FOOTER_LEN: u64 = 512;
 const FOOTER_COOKIE: &[u8; 8] = b"conectix";
 const DYN_COOKIE: &[u8; 8] = b"cxsparse";
-const SECTOR: usize = 512;
+const SECTOR: u64 = 512;
 
 /// Sentinel BAT entry meaning "this block has never been written".
 const BAT_UNUSED: u32 = 0xFFFF_FFFF;
@@ -45,6 +50,8 @@ const DISK_TYPE_FIXED: u32 = 2;
 const DISK_TYPE_DYNAMIC: u32 = 3;
 const DISK_TYPE_DIFFERENCING: u32 = 4;
 
+const NAME: &str = "vhd-disk";
+
 fn be_u32(d: &[u8], off: usize) -> u32 {
     crate::bytes::at(d, off, 4)
         .map(|b| u32::from_be_bytes([b[0], b[1], b[2], b[3]]))
@@ -59,226 +66,300 @@ fn be_u64(d: &[u8], off: usize) -> u64 {
 
 /// Locate the authoritative footer: the trailing copy, falling back to the
 /// leading one that dynamic and differencing images also keep at offset 0.
-fn footer(data: &[u8]) -> Option<&[u8]> {
-    let tail = data.get(data.len().checked_sub(FOOTER_LEN)?..)?;
-    if tail.starts_with(FOOTER_COOKIE) {
-        return Some(tail);
+fn footer(src: &dyn ByteSource) -> Option<Vec<u8>> {
+    let len = src.len() as u64;
+    if let Some(tail) = len
+        .checked_sub(FOOTER_LEN)
+        .and_then(|at| bytes_at(src, at, FOOTER_LEN as usize))
+        && tail.starts_with(FOOTER_COOKIE)
+    {
+        return Some(tail.into_owned());
+    }
+    let head = bytes_at(src, 0, FOOTER_LEN as usize)?;
+    head.starts_with(FOOTER_COOKIE).then(|| head.into_owned())
+}
+
+/// A fixed disk: the file up to its footer.
+struct Flat {
+    size: u64,
+}
+
+impl Layout for Flat {
+    fn name(&self) -> &'static str {
+        NAME
+    }
+
+    fn size(&self) -> u64 {
+        self.size
     }
-    let head = data.get(..FOOTER_LEN)?;
-    head.starts_with(FOOTER_COOKIE).then_some(head)
+
+    fn unit(&self) -> u64 {
+        1 << 20
+    }
+
+    fn map(&self, idx: u64) -> Map {
+        Map::Plain(idx.saturating_mul(self.unit()))
+    }
+}
+
+/// A dynamic disk: blocks placed by the Block Allocation Table.
+struct Dynamic<'a> {
+    src: &'a dyn ByteSource,
+    bat: u64,
+    /// The virtual disk's size: the footer's, if the table covers it.
+    size: u64,
+    block: u64,
+    /// The sector bitmap ahead of each block, padded to a sector.
+    bitmap: u64,
+    file_len: u64,
 }
 
-pub(crate) fn extract_vhd<R>(
-    data: &[u8],
+impl Dynamic<'_> {
+    /// Where block `idx`, whose table entry is `ent`, is in the file, when
+    /// all of it is there.
+    fn place(&self, ent: u32, idx: u64) -> Option<u64> {
+        let host = u64::from(ent)
+            .saturating_mul(SECTOR)
+            .saturating_add(self.bitmap);
+        let n = self
+            .block
+            .min(self.size.saturating_sub(idx.saturating_mul(self.block)));
+        host.checked_add(n)
+            .is_some_and(|end| end <= self.file_len)
+            .then_some(host)
+    }
+
+    /// Whether the table allocates blocks and every one of them is outside
+    /// the file: not a truncated image but one that was not read at all.
+    fn all_outside(&self) -> bool {
+        const STEP: u64 = 16 * 1024;
+        let blocks = self.size.div_ceil(self.block);
+        let (mut allocated, mut missing) = (0u64, 0u64);
+        let mut i = 0u64;
+        while i < blocks {
+            let n = blocks.saturating_sub(i).min(STEP);
+            let at = self.bat.saturating_add(i.saturating_mul(4));
+            let Some(chunk) = bytes_at(
+                self.src,
+                at,
+                usize::try_from(n).unwrap_or(0).saturating_mul(4),
+            ) else {
+                break;
+            };
+            for (k, e) in chunk.as_chunks::<4>().0.iter().enumerate() {
+                let ent = u32::from_be_bytes(*e);
+                if ent == BAT_UNUSED {
+                    continue;
+                }
+                allocated = allocated.saturating_add(1);
+                let idx = i.saturating_add(k as u64);
+                if self.place(ent, idx).is_none() {
+                    missing = missing.saturating_add(1);
+                }
+            }
+            i = i.saturating_add(n);
+        }
+        allocated > 0 && missing == allocated
+    }
+}
+
+impl Layout for Dynamic<'_> {
+    fn name(&self) -> &'static str {
+        NAME
+    }
+
+    fn size(&self) -> u64 {
+        self.size
+    }
+
+    fn unit(&self) -> u64 {
+        self.block
+    }
+
+    fn map(&self, idx: u64) -> Map {
+        let Some(ent) = be32(self.src, self.bat.saturating_add(idx.saturating_mul(4))) else {
+            return Map::Zero;
+        };
+        if ent == BAT_UNUSED {
+            return Map::Zero; // never written: reads as zeroes when mounted, as here
+        }
+        // A BAT that points at a block outside the file is a truncated image:
+        // those bytes are absent rather than hidden, so they stay zero.
+        self.place(ent, idx).map_or(Map::Zero, Map::Plain)
+    }
+}
+
+/// Walk a VHD's disk.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
     budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    let Some(f) = footer(data) else {
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let Some(f) = footer(src) else {
         return Ok(None);
     };
     // Footer layout: +16 data offset (u64), +48 current size (u64),
     // +60 disk type (u32).
-    let disk_type = be_u32(f, 60);
-    let current_size = be_u48_size(f);
+    let disk_type = be_u32(&f, 60);
+    let current_size = be_u64(&f, 48);
+    let allowance = budget.remaining_scan();
 
     match disk_type {
         DISK_TYPE_FIXED => {
             // The disk is everything before the trailing footer.
-            let end = data.len().saturating_sub(FOOTER_LEN);
-            emit(data.get(..end).unwrap_or(&[]), "vhd-disk", budget, visit)
+            let size = (src.len() as u64).saturating_sub(FOOTER_LEN);
+            if size == 0 {
+                return Ok(None);
+            }
+            vdisk::walk(VDisk::new(src, Flat { size }, allowance), budget, visit)
         }
-        DISK_TYPE_DYNAMIC => extract_dynamic(data, f, current_size, budget, visit),
+        DISK_TYPE_DYNAMIC => dynamic(src, &f, current_size, budget, visit),
         DISK_TYPE_DIFFERENCING => {
             // The payload lives in a parent image this file does not contain, so
             // the disk cannot be assembled here at all. That is content
             // present-elsewhere-but-unreadable, not content absent: say so.
-            budget.count_entry()?;
-            Ok(visit(
-                Entry::unsupported(
-                    "vhd-disk".to_string(),
-                    current_size,
-                    false,
-                    "differencing VHD: the disk is a delta against a parent image not in this file",
-                ),
-                budget,
-            ))
-        }
-        other => {
-            budget.count_entry()?;
-            Ok(visit(
-                Entry::unsupported(
-                    "vhd-disk".to_string(),
-                    current_size,
-                    false,
-                    match other {
-                        0 | 1 => "VHD marked as no-disk/reserved",
-                        _ => "unsupported VHD disk type",
-                    },
-                ),
+            report(
+                NAME,
+                current_size,
+                "differencing VHD: the disk is a delta against a parent image not in this file",
                 budget,
-            ))
+                visit,
+            )
         }
+        other => report(
+            NAME,
+            current_size,
+            match other {
+                0 | 1 => "VHD marked as no-disk/reserved",
+                _ => "unsupported VHD disk type",
+            },
+            budget,
+            visit,
+        ),
     }
 }
 
-/// `current size` from the footer (+48), the virtual disk's byte length.
-fn be_u48_size(f: &[u8]) -> u64 {
-    be_u64(f, 48)
-}
-
-/// Reassemble a dynamic VHD from its Block Allocation Table.
-fn extract_dynamic<R>(
-    data: &[u8],
+/// Read a dynamic VHD through its Block Allocation Table.
+fn dynamic<T>(
+    src: &dyn ByteSource,
     f: &[u8],
     current_size: u64,
     budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    let dyn_off = crate::bytes::to_usize(be_u64(f, 16));
-    let Some(hdr) = crate::bytes::at(data, dyn_off, 1024) else {
-        return unreadable(
-            "dynamic VHD header lies outside the image",
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let file_len = src.len() as u64;
+    let Some(hdr) = bytes_at(src, be_u64(f, 16), 1024) else {
+        return report(
+            NAME,
             current_size,
+            "dynamic VHD header lies outside the image",
             budget,
             visit,
         );
     };
     if !hdr.starts_with(DYN_COOKIE) {
-        return unreadable(
-            "dynamic VHD header is missing or corrupt",
+        return report(
+            NAME,
             current_size,
+            "dynamic VHD header is missing or corrupt",
             budget,
             visit,
         );
     }
     // Dynamic header: +16 BAT offset (u64), +28 max table entries (u32),
     // +32 block size (u32).
-    let bat_off = crate::bytes::to_usize(be_u64(hdr, 16));
-    let max_entries = be_u32(hdr, 28) as usize;
-    let block_size = be_u32(hdr, 32) as usize;
+    let bat = be_u64(&hdr, 16);
+    let max_entries = u64::from(be_u32(&hdr, 28));
+    let block = u64::from(be_u32(&hdr, 32));
     // A block size that is not a sane power-of-two multiple of the sector size
     // would make the sector bitmap length meaningless.
-    if block_size == 0
-        || !block_size.is_multiple_of(SECTOR)
-        || !block_size.is_power_of_two()
-        || max_entries == 0
-    {
-        return unreadable(
-            "dynamic VHD geometry is implausible",
+    if block == 0 || !block.is_multiple_of(SECTOR) || !block.is_power_of_two() || max_entries == 0 {
+        return report(
+            NAME,
             current_size,
+            "dynamic VHD geometry is implausible",
             budget,
             visit,
         );
     }
     // Each block is preceded by a sector bitmap, padded up to a sector boundary.
-    let bitmap_len = ((block_size / SECTOR).div_ceil(8)).next_multiple_of(SECTOR);
-
-    let Some(bat) = crate::bytes::at(data, bat_off, max_entries.saturating_mul(4)) else {
-        return unreadable(
-            "dynamic VHD block allocation table lies outside the image",
+    let bitmap = ((block / SECTOR).div_ceil(8)).next_multiple_of(SECTOR);
+    // The table is read as blocks are reached, but it has to be in the file.
+    if !bat
+        .checked_add(max_entries.saturating_mul(4))
+        .is_some_and(|end| end <= file_len)
+    {
+        return report(
+            NAME,
             current_size,
+            "dynamic VHD block allocation table lies outside the image",
             budget,
             visit,
         );
-    };
-
-    // Reserve the whole reconstructed disk up front: a dynamic VHD can declare a
-    // very large virtual size from a small file, which is a decompression bomb by
-    // another name.
-    budget.count_entry()?;
-    let cap = budget.reserve()?;
-    let want = current_size.min((max_entries as u64).saturating_mul(block_size as u64));
-    if want > cap {
-        return Ok(visit(
-            Entry::unsupported(
-                "vhd-disk".to_string(),
-                want,
-                false,
-                "dynamic VHD exceeds the per-member size budget",
-            ),
-            budget,
-        ));
-    }
-
-    let mut disk = vec![0u8; want as usize];
-    let mut missing = 0usize;
-    for i in 0..max_entries {
-        let ent = be_u32(bat, i.saturating_mul(4));
-        if ent == BAT_UNUSED {
-            continue; // never written: reads as zeroes when mounted, as here
-        }
-        let src = (ent as usize)
-            .saturating_mul(SECTOR)
-            .saturating_add(bitmap_len);
-        let dst = i.saturating_mul(block_size);
-        if dst >= disk.len() {
-            break;
-        }
-        let n = block_size.min(disk.len().saturating_sub(dst));
-        match crate::bytes::at(data, src, n) {
-            Some(block) => disk[dst..dst.saturating_add(n)].copy_from_slice(block),
-            // The BAT points at a block outside the file: the image is truncated,
-            // so those bytes are absent rather than hidden (they stay zero).
-            // Counted so a wholly bogus table can be told apart from a healthy
-            // one below.
-            None => missing = missing.saturating_add(1),
-        }
     }
+    let layout = Dynamic {
+        src,
+        bat,
+        size: current_size.min(max_entries.saturating_mul(block)),
+        block,
+        bitmap,
+        file_len,
+    };
     // A BAT whose every allocated entry points outside the file is not a
     // truncated image, it is one exav failed to read at all.
-    let allocated = (0..max_entries)
-        .filter(|&i| be_u32(bat, i.saturating_mul(4)) != BAT_UNUSED)
-        .count();
-    if allocated > 0 && missing == allocated {
-        return Ok(visit(
-            Entry::unsupported(
-                "vhd-disk".to_string(),
-                current_size,
-                false,
-                "dynamic VHD block table points entirely outside the image",
-            ),
+    if layout.all_outside() {
+        return report(
+            NAME,
+            current_size,
+            "dynamic VHD block table points entirely outside the image",
             budget,
-        ));
+            visit,
+        );
     }
-    budget.commit(disk.len() as u64);
-    Ok(visit(Entry::new("vhd-disk".to_string(), disk), budget))
+    let allowance = budget.remaining_scan();
+    vdisk::walk(VDisk::new(src, layout, allowance), budget, visit)
 }
 
-fn unreadable<R>(
-    reason: &'static str,
-    size: u64,
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    budget.count_entry()?;
-    Ok(visit(
-        Entry::unsupported("vhd-disk".to_string(), size, false, reason),
-        budget,
-    ))
-}
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
 
-fn emit<R>(
-    slice: &[u8],
-    name: &str,
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if slice.is_empty() {
-        return Ok(None);
+    /// Whether a table of `ents`, over a file of `file_len` bytes, in blocks of
+    /// 1 KiB each preceded by a one-sector bitmap, is outside the file.
+    fn outside(ents: &[u32], file_len: u64) -> bool {
+        let bat: Vec<u8> = ents.iter().flat_map(|e| e.to_be_bytes()).collect();
+        let src = bat.as_slice();
+        let l = Dynamic {
+            src: &src,
+            bat: 0,
+            size: ents.len() as u64 * 1024,
+            block: 1024,
+            bitmap: 512,
+            file_len,
+        };
+        l.all_outside()
     }
-    budget.count_entry()?;
-    let cap = budget.reserve()?;
-    if slice.len() as u64 > cap {
-        return Ok(visit(
-            Entry::unsupported(
-                name.to_string(),
-                slice.len() as u64,
-                false,
-                "VHD disk exceeds the per-member size budget",
-            ),
-            budget,
-        ));
+
+    #[test]
+    fn a_table_is_outside_the_file_only_if_every_allocated_block_is() {
+        // Sector 100 is at byte 51200: a block there ends at 51200 + 512 + 1024.
+        assert!(outside(&[100, 200], 40_000));
+        assert!(!outside(&[100, 200], 60_000));
+        // One block in, one out: a truncated image, not an unread one.
+        assert!(!outside(&[10, 200], 8000));
+        // Nothing allocated is not "everything outside".
+        assert!(!outside(&[BAT_UNUSED, BAT_UNUSED], 100));
+        // A block cut by the end of the file is not wholly in it.
+        assert!(outside(&[100], 51_200 + 512 + 1023));
+        assert!(!outside(&[100], 51_200 + 512 + 1024));
+    }
+
+    /// A table entry at the top of the range names a block that is not there,
+    /// and the arithmetic placing it does not wrap.
+    #[test]
+    fn an_entry_at_the_top_of_the_range_is_outside() {
+        assert!(outside(&[u32::MAX - 1], 1 << 40));
     }
-    budget.commit(slice.len() as u64);
-    Ok(visit(Entry::new(name.to_string(), slice.to_vec()), budget))
 }
diff --git a/crates/exav-unpack/src/formats/vhdx.rs b/crates/exav-unpack/src/formats/vhdx.rs
index 96ef6e6a..4a6ed7c1 100644
--- a/crates/exav-unpack/src/formats/vhdx.rs
+++ b/crates/exav-unpack/src/formats/vhdx.rs
@@ -10,25 +10,30 @@
 //! Windows uses (first three components byte-swapped).
 //!
 //! Payload blocks are stored uncompressed, so unlike QCOW2 the bytes are
-//! visible to a raw scan wherever they happen to land. Reconstruction still
+//! visible to a raw scan wherever they happen to land. Reading the disk still
 //! matters: blocks are placed in arbitrary file order and sparse ranges are
 //! absent entirely, so a payload spanning a block boundary appears in the file
 //! only as two disjoint fragments — and a filesystem inside cannot be walked at
 //! all until the guest disk is put back in order.
 //!
-//! The reconstructed disk is emitted as a single member for the partition and
-//! filesystem handlers to pick up.
+//! The disk is a [`VDisk`]: one member when it fits the buffer limit, else its
+//! filesystems are walked in place (see `vdisk.rs`). The block allocation table
+//! is read from the source as blocks are reached.
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use super::vdisk::{self, Health, Layout, Map, VDisk, bytes_at, le32, le64};
+use super::volumes::report;
+use crate::source::ByteSource;
+use crate::stream::Visit;
+use crate::{Budget, LimitHit};
 
 /// The two region tables, at 192 KiB and 256 KiB. The second is a mirror, read
 /// when the first does not parse.
-const REGION_TABLE_1: usize = 192 * 1024;
-const REGION_TABLE_2: usize = 256 * 1024;
+const REGION_TABLE_1: u64 = 192 * 1024;
+const REGION_TABLE_2: u64 = 256 * 1024;
 const REGION_SIGNATURE: &[u8; 4] = b"regi";
 const METADATA_SIGNATURE: &[u8; 8] = b"metadata";
 
@@ -36,6 +41,8 @@ const METADATA_SIGNATURE: &[u8; 8] = b"metadata";
 const MAX_REGION_ENTRIES: u32 = 2047;
 /// Likewise for metadata items — the table is one 64 KiB region.
 const MAX_METADATA_ENTRIES: u16 = 2047;
+/// Both tables are one 64 KiB region.
+const TABLE_LEN: usize = 64 * 1024;
 
 /// Region GUIDs, in stored (mixed-endian) byte order.
 const BAT_REGION: [u8; 16] = [
@@ -65,6 +72,8 @@ const PAYLOAD_BLOCK_PARTIALLY_PRESENT: u64 = 7;
 /// `FileParameters` flag bit 1: the disk is a delta against a parent image.
 const HAS_PARENT: u32 = 1 << 1;
 
+const NAME: &str = "vhdx-disk";
+
 fn le_u16(d: &[u8], off: usize) -> u16 {
     crate::bytes::at(d, off, 2)
         .map(|b| u16::from_le_bytes([b[0], b[1]]))
@@ -85,31 +94,36 @@ fn le_u64(d: &[u8], off: usize) -> u64 {
 
 /// Where a region lives in the file, and how long it is.
 struct Region {
-    offset: usize,
-    length: usize,
+    offset: u64,
+    length: u64,
 }
 
 /// Find the BAT and metadata regions in whichever region table parses.
-fn regions(data: &[u8]) -> Option<(Region, Region)> {
+fn regions(src: &dyn ByteSource) -> Option<(Region, Region)> {
     for base in [REGION_TABLE_1, REGION_TABLE_2] {
-        if crate::bytes::at(data, base, 4) != Some(REGION_SIGNATURE.as_slice()) {
+        let Some(t) = bytes_at(src, base, 16) else {
+            continue;
+        };
+        if t[..4] != REGION_SIGNATURE[..] {
             continue;
         }
-        let count = le_u32(data, base.saturating_add(8)).min(MAX_REGION_ENTRIES);
+        let count = le32(src, base.saturating_add(8))
+            .unwrap_or(0)
+            .min(MAX_REGION_ENTRIES);
         let (mut bat, mut meta) = (None, None);
-        for i in 0..count as usize {
+        for i in 0..u64::from(count) {
             let e = base.saturating_add(16).saturating_add(i.saturating_mul(32));
-            let Some(guid) = crate::bytes::at(data, e, 16) else {
+            // Entry: GUID(16), FileOffset u64, Length u32, Required u32.
+            let Some(entry) = bytes_at(src, e, 28) else {
                 break;
             };
-            // Entry: GUID(16), FileOffset u64, Length u32, Required u32.
             let r = Region {
-                offset: crate::bytes::to_usize(le_u64(data, e.saturating_add(16))),
-                length: le_u32(data, e.saturating_add(24)) as usize,
+                offset: le_u64(&entry, 16),
+                length: u64::from(le_u32(&entry, 24)),
             };
-            if guid == BAT_REGION {
+            if entry[..16] == BAT_REGION {
                 bat = Some(r);
-            } else if guid == METADATA_REGION {
+            } else if entry[..16] == METADATA_REGION {
                 meta = Some(r);
             }
         }
@@ -120,7 +134,7 @@ fn regions(data: &[u8]) -> Option<(Region, Region)> {
     None
 }
 
-/// The three metadata items reconstruction needs.
+/// The three metadata items reading the disk needs.
 struct Geometry {
     block_size: u32,
     virtual_size: u64,
@@ -128,12 +142,17 @@ struct Geometry {
     has_parent: bool,
 }
 
-fn geometry(data: &[u8], meta: &Region) -> Option<Geometry> {
+fn geometry(src: &dyn ByteSource, meta: &Region) -> Option<Geometry> {
     let base = meta.offset;
-    if crate::bytes::at(data, base, 8) != Some(METADATA_SIGNATURE.as_slice()) {
+    let table = bytes_at(src, base, TABLE_LEN).or_else(|| {
+        // A table cut short by the end of the file still has its entries.
+        let n = (src.len() as u64).saturating_sub(base);
+        bytes_at(src, base, usize::try_from(n).ok()?.min(TABLE_LEN))
+    })?;
+    if table.get(..8) != Some(METADATA_SIGNATURE.as_slice()) {
         return None;
     }
-    let count = le_u16(data, base.saturating_add(10)).min(MAX_METADATA_ENTRIES);
+    let count = le_u16(&table, 10).min(MAX_METADATA_ENTRIES);
     let mut g = Geometry {
         block_size: 0,
         virtual_size: 0,
@@ -142,22 +161,20 @@ fn geometry(data: &[u8], meta: &Region) -> Option<Geometry> {
         logical_sector_size: 512,
         has_parent: false,
     };
-    for i in 0..count as usize {
-        let Some(e) = base.checked_add(i.saturating_mul(32).saturating_add(32)) else {
-            break;
-        };
-        let Some(guid) = crate::bytes::at(data, e, 16) else {
+    for i in 0..usize::from(count) {
+        let e = i.saturating_mul(32).saturating_add(32);
+        let Some(guid) = crate::bytes::at(&table, e, 16) else {
             break;
         };
         // Item offsets are relative to the start of the metadata region.
-        let item = base.saturating_add(le_u32(data, e.saturating_add(16)) as usize);
+        let item = base.saturating_add(u64::from(le_u32(&table, e.saturating_add(16))));
         if guid == FILE_PARAMETERS {
-            g.block_size = le_u32(data, item);
-            g.has_parent = le_u32(data, item.saturating_add(4)) & HAS_PARENT != 0;
+            g.block_size = le32(src, item).unwrap_or(0);
+            g.has_parent = le32(src, item.saturating_add(4)).unwrap_or(0) & HAS_PARENT != 0;
         } else if guid == VIRTUAL_DISK_SIZE {
-            g.virtual_size = le_u64(data, item);
+            g.virtual_size = le64(src, item).unwrap_or(0);
         } else if guid == LOGICAL_SECTOR_SIZE {
-            let s = le_u32(data, item);
+            let s = le32(src, item).unwrap_or(0);
             if s != 0 {
                 g.logical_sector_size = s;
             }
@@ -166,26 +183,130 @@ fn geometry(data: &[u8], meta: &Region) -> Option<Geometry> {
     (g.block_size != 0 && g.virtual_size != 0).then_some(g)
 }
 
-pub(crate) fn extract_vhdx<R>(
-    data: &[u8],
+/// A VHDX disk: blocks placed by the Block Allocation Table.
+struct Vhdx<'a> {
+    src: &'a dyn ByteSource,
+    bat: Region,
+    block: u64,
+    size: u64,
+    /// Payload entries between the sector-bitmap entries the BAT interleaves.
+    chunk_ratio: u64,
+    file_len: u64,
+    /// Blocks past the end of the table the region declares.
+    unlocatable: u64,
+}
+
+impl Vhdx<'_> {
+    /// The BAT index of block `idx`: one sector-bitmap entry follows every
+    /// `chunk_ratio` payload entries, so it is not the block's index on the
+    /// disk.
+    fn bat_index(&self, idx: u64) -> u64 {
+        idx.saturating_add(idx.checked_div(self.chunk_ratio).unwrap_or(0))
+    }
+
+    /// Whether the region declares an entry for block `idx`.
+    fn has_entry(&self, idx: u64) -> bool {
+        self.bat_index(idx).saturating_mul(8).saturating_add(8) <= self.bat.length
+    }
+
+    /// How many blocks, from the first, the table has an entry for.
+    fn covered(&self, blocks: u64) -> u64 {
+        // The entries needed grow with the index, so the blocks without one
+        // are a suffix.
+        let (mut lo, mut hi) = (0u64, blocks);
+        while lo < hi {
+            let mid = lo.saturating_add(hi.saturating_sub(lo) / 2);
+            if self.has_entry(mid) {
+                lo = mid.saturating_add(1);
+            } else {
+                hi = mid;
+            }
+        }
+        lo
+    }
+}
+
+impl Layout for Vhdx<'_> {
+    fn name(&self) -> &'static str {
+        NAME
+    }
+
+    fn size(&self) -> u64 {
+        self.size
+    }
+
+    fn unit(&self) -> u64 {
+        self.block
+    }
+
+    fn map(&self, idx: u64) -> Map {
+        // Past the end of the declared BAT region the table is short, so this
+        // block and every one after it has no entry to read.
+        if !self.has_entry(idx) {
+            return Map::Zero;
+        }
+        let at = self
+            .bat
+            .offset
+            .saturating_add(self.bat_index(idx).saturating_mul(8));
+        let Some(entry) = le64(self.src, at) else {
+            return Map::Zero;
+        };
+        let state = entry & 7;
+        if state != PAYLOAD_BLOCK_FULLY_PRESENT && state != PAYLOAD_BLOCK_PARTIALLY_PRESENT {
+            return Map::Zero; // unallocated or explicitly zero
+        }
+        // Bits 20..63 hold the file offset in megabytes.
+        let host = (entry >> 20) << 20;
+        let n = self
+            .block
+            .min(self.size.saturating_sub(idx.saturating_mul(self.block)));
+        // An entry pointing past the end of the file names bytes that are
+        // absent rather than hidden, so the block stays zero and stays quiet.
+        host.checked_add(n)
+            .is_some_and(|end| end <= self.file_len)
+            .then_some(host)
+            .map_or(Map::Zero, Map::Plain)
+    }
+
+    fn reports(&self, _health: &Health) -> Vec<(u64, &'static str)> {
+        if self.unlocatable == 0 {
+            return Vec::new();
+        }
+        // Reported alongside the disk, not instead of it: what was read
+        // is still worth scanning, and the hole is still worth knowing about.
+        vec![(
+            self.unlocatable.saturating_mul(self.block),
+            "VHDX block allocation table is shorter than the disk it describes",
+        )]
+    }
+}
+
+/// Walk a VHDX's disk.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
     budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if !super::sniff::is(data, crate::Format::Vhdx) {
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let file_len = src.len() as u64;
+    if file_len <= REGION_TABLE_1 || bytes_at(src, 0, 8).as_deref() != Some(b"vhdxfile".as_slice())
+    {
         return Ok(None);
     }
-    let Some((bat, meta)) = regions(data) else {
+    let Some((bat, meta)) = regions(src) else {
         return report(
-            "VHDX region table names no BAT or metadata region",
+            NAME,
             0,
+            "VHDX region table names no BAT or metadata region",
             budget,
             visit,
         );
     };
-    let Some(g) = geometry(data, &meta) else {
+    let Some(g) = geometry(src, &meta) else {
         return report(
-            "VHDX metadata does not give the disk geometry",
+            NAME,
             0,
+            "VHDX metadata does not give the disk geometry",
             budget,
             visit,
         );
@@ -194,8 +315,9 @@ pub(crate) fn extract_vhdx<R>(
         // The blocks this image lacks live in the parent, which is a separate
         // file — the same shape as a differencing VHD.
         return report(
-            "differencing VHDX: the disk is a delta against a parent image not in this file",
+            NAME,
             g.virtual_size,
+            "differencing VHDX: the disk is a delta against a parent image not in this file",
             budget,
             visit,
         );
@@ -203,97 +325,84 @@ pub(crate) fn extract_vhdx<R>(
     // The block size is a power of two between 1 MiB and 256 MiB; outside that
     // the chunk-ratio arithmetic below is meaningless.
     if !g.block_size.is_power_of_two() || !(1 << 20..=1 << 28).contains(&g.block_size) {
-        return report("implausible VHDX block size", g.virtual_size, budget, visit);
-    }
-
-    budget.count_entry()?;
-    let cap = budget.reserve()?;
-    if g.virtual_size > cap {
-        return Ok(visit(
-            Entry::unsupported(
-                "vhdx-disk".to_string(),
-                g.virtual_size,
-                false,
-                "VHDX disk exceeds the per-member size budget",
-            ),
+        return report(
+            NAME,
+            g.virtual_size,
+            "implausible VHDX block size",
             budget,
-        ));
+            visit,
+        );
     }
-
-    // The BAT interleaves one sector-bitmap entry after every `chunk_ratio`
-    // payload entries, so a block's index in the table is not its index on the
-    // disk.
     let chunk_ratio = (1u64 << 23)
         .saturating_mul(u64::from(g.logical_sector_size))
         .checked_div(u64::from(g.block_size))
         .unwrap_or(0);
-    let block_size = g.block_size as usize;
-    let total_blocks = g.virtual_size.div_ceil(u64::from(g.block_size).max(1));
+    let block = u64::from(g.block_size);
+    let total_blocks = g.virtual_size.div_ceil(block);
+    let mut layout = Vhdx {
+        src,
+        bat,
+        block,
+        size: g.virtual_size,
+        chunk_ratio,
+        file_len,
+        unlocatable: 0,
+    };
+    layout.unlocatable = total_blocks.saturating_sub(layout.covered(total_blocks));
+    let allowance = budget.remaining_scan();
+    vdisk::walk(VDisk::new(src, layout, allowance), budget, visit)
+}
 
-    let mut disk = vec![0u8; crate::bytes::to_usize(g.virtual_size)];
-    // Blocks the BAT says are here but that could not be located. Zero-filling
-    // one and saying nothing would hand the scanner a clean-looking hole where
-    // real content should be.
-    let mut unlocatable_blocks = 0usize;
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
 
-    for i in 0..total_blocks {
-        let bat_index = i.saturating_add(i.checked_div(chunk_ratio).unwrap_or(0));
-        let bat_at = crate::bytes::to_usize(bat_index).saturating_mul(8);
-        // Past the end of the declared BAT region: the table is short, so this
-        // block and every one after it has no entry to read.
-        if bat_at.saturating_add(8) > bat.length {
-            unlocatable_blocks = unlocatable_blocks
-                .saturating_add(crate::bytes::to_usize(total_blocks.saturating_sub(i)));
-            break;
-        }
-        let entry = le_u64(data, bat.offset.saturating_add(bat_at));
-        let state = entry & 7;
-        if state != PAYLOAD_BLOCK_FULLY_PRESENT && state != PAYLOAD_BLOCK_PARTIALLY_PRESENT {
-            continue; // unallocated or explicitly zero
-        }
-        // Bits 20..63 hold the file offset in megabytes.
-        let host = crate::bytes::to_usize((entry >> 20) << 20);
-        let guest = crate::bytes::to_usize(i).saturating_mul(block_size);
-        if guest >= disk.len() {
-            continue;
-        }
-        // An entry pointing past the end of the file names bytes that are
-        // absent rather than hidden, so the block stays zero and stays quiet.
-        let n = block_size.min(disk.len().saturating_sub(guest));
-        if let Some(src) = crate::bytes::at(data, host, n) {
-            disk[guest..guest.saturating_add(n)].copy_from_slice(src);
+    fn layout<'a>(src: &'a dyn ByteSource, bat_len: u64, ratio: u64) -> Vhdx<'a> {
+        Vhdx {
+            src,
+            bat: Region {
+                offset: 0,
+                length: bat_len,
+            },
+            block: 1 << 20,
+            size: 1 << 40,
+            chunk_ratio: ratio,
+            file_len: 0,
+            unlocatable: 0,
         }
     }
 
-    if unlocatable_blocks > 0 {
-        // Reported alongside the disk, not instead of it: what was reconstructed
-        // is still worth scanning, and the hole is still worth knowing about.
-        budget.count_entry()?;
-        if let Some(r) = visit(
-            Entry::unsupported(
-                "vhdx-disk".to_string(),
-                (unlocatable_blocks as u64).saturating_mul(g.block_size as u64),
-                false,
-                "VHDX block allocation table is shorter than the disk it describes",
-            ),
-            budget,
-        ) {
-            return Ok(Some(r));
+    /// The blocks the table has an entry for are found by search; they are the
+    /// ones a walk over every block would count, whatever the table's length
+    /// and however the sector-bitmap entries are interleaved.
+    #[test]
+    fn the_blocks_a_short_table_covers_are_those_with_an_entry() {
+        let src: &[u8] = &[];
+        for ratio in [0u64, 1, 4, 16] {
+            for entries in 0..40u64 {
+                let l = layout(&src, entries * 8, ratio);
+                for blocks in [0u64, 1, 7, 33, 100] {
+                    let brute = (0..blocks).take_while(|&i| l.has_entry(i)).count() as u64;
+                    assert_eq!(l.covered(blocks), brute, "{ratio} {entries} {blocks}");
+                }
+            }
         }
+        // An entry is eight bytes: a length that cuts one does not hold it.
+        let l = layout(&src, 8 * 3 + 7, 0);
+        assert_eq!(l.covered(10), 3);
     }
-    budget.commit(disk.len() as u64);
-    Ok(visit(Entry::new("vhdx-disk".to_string(), disk), budget))
-}
 
-fn report<R>(
-    reason: &'static str,
-    size: u64,
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    budget.count_entry()?;
-    Ok(visit(
-        Entry::unsupported("vhdx-disk".to_string(), size, false, reason),
-        budget,
-    ))
+    /// With a sector-bitmap entry after every four payload entries, block 4
+    /// is at index 5.
+    #[test]
+    fn a_block_is_found_past_the_sector_bitmap_entries() {
+        let src: &[u8] = &[];
+        let l = layout(&src, 1 << 20, 4);
+        assert_eq!(
+            (0..8).map(|i| l.bat_index(i)).collect::<Vec<_>>(),
+            [0, 1, 2, 3, 5, 6, 7, 8]
+        );
+    }
 }
diff --git a/crates/exav-unpack/src/formats/vmdk.rs b/crates/exav-unpack/src/formats/vmdk.rs
index dde71001..ae2cde93 100644
--- a/crates/exav-unpack/src/formats/vmdk.rs
+++ b/crates/exav-unpack/src/formats/vmdk.rs
@@ -10,28 +10,46 @@
 //! Implemented from VMware's published Virtual Disk Format specification. Sparse
 //! header fields are **little-endian**.
 //!
-//! The reconstructed guest disk is emitted as a single member for the partition
-//! and filesystem handlers to pick up.
+//! A sparse extent's tables are read from the source as grains are reached,
+//! never held. A streamOptimized extent is a stream of marker sectors, each
+//! grain preceded by its guest LBA and compressed length: one pass over the
+//! markers indexes where each grain is (the index, one entry per grain, is
+//! counted against the buffer limit), and a grain is inflated when a read
+//! reaches it.
+//!
+//! The disk is a [`VDisk`]: one member when it fits the buffer limit, else its
+//! filesystems are walked in place (see `vdisk.rs`).
 
 // Every sum and product on a header's number is checked or saturating here; a
 // plain one fails the build, so the next edit cannot add the unchecked kind.
 #![deny(clippy::arithmetic_side_effects)]
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use std::collections::HashMap;
+
+use super::vdisk::{self, Health, Layout, MAX_PACKED_UNIT, Map, Unpacked, VDisk, bytes_at, le32};
+use super::volumes::report;
+use crate::source::ByteSource;
+use crate::stream::Visit;
+use crate::{Budget, LimitHit, Salvaged};
 
-/// `KDMV` — the sparse-extent header magic, little-endian on disk.
 const SECTOR: u64 = 512;
 const HEADER_LEN: usize = 512;
 
-/// Grain-directory entry marking an unallocated range.
-const GDE_UNALLOCATED: u32 = 0;
-
 /// Marker sector kinds used by streamOptimized extents.
 const MARKER_EOS: u32 = 0;
 const MARKER_GT: u32 = 1;
 const MARKER_GD: u32 = 2;
 const MARKER_FOOTER: u32 = 3;
 
+/// A grain table entry of 1 marks a grain that reads as zeroes.
+const GTE_ZEROED: u32 = 1;
+
+/// What one entry of the streamOptimized index costs, for counting it against
+/// the buffer limit.
+const INDEX_ENTRY_COST: u64 = 64;
+
+const NAME: &str = "vmdk-disk";
+
 fn le_u32(d: &[u8], off: usize) -> u32 {
     crate::bytes::at(d, off, 4)
         .map(|b| u32::from_le_bytes([b[0], b[1], b[2], b[3]]))
@@ -44,234 +62,547 @@ fn le_u64(d: &[u8], off: usize) -> u64 {
         .unwrap_or(0)
 }
 
-pub(crate) fn extract_vmdk<R>(
-    data: &[u8],
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if data.starts_with(b"# Disk DescriptorFile") {
+/// A sparse extent: grain directory, grain tables, grains.
+struct Sparse<'a> {
+    src: &'a dyn ByteSource,
+    /// Byte offset of the grain directory.
+    gd: u64,
+    /// Entries in a grain table.
+    gtes: u64,
+    grain: u64,
+    size: u64,
+    file_len: u64,
+}
+
+impl Layout for Sparse<'_> {
+    fn name(&self) -> &'static str {
+        NAME
+    }
+
+    fn size(&self) -> u64 {
+        self.size
+    }
+
+    fn unit(&self) -> u64 {
+        self.grain
+    }
+
+    fn map(&self, idx: u64) -> Map {
+        let i = idx.checked_div(self.gtes).unwrap_or(0);
+        let j = idx.checked_rem(self.gtes).unwrap_or(0);
+        let gde = le32(self.src, self.gd.saturating_add(i.saturating_mul(4))).unwrap_or(0);
+        if gde == 0 {
+            return Map::Zero; // no grain table: unallocated
+        }
+        let gt = u64::from(gde).saturating_mul(SECTOR);
+        // A grain table past the end is a truncated image.
+        if gt
+            .checked_add(self.gtes.saturating_mul(4))
+            .is_none_or(|end| end > self.file_len)
+        {
+            return Map::Zero;
+        }
+        let gte = le32(self.src, gt.saturating_add(j.saturating_mul(4))).unwrap_or(0);
+        if gte == 0 || gte == GTE_ZEROED {
+            return Map::Zero;
+        }
+        let host = u64::from(gte).saturating_mul(SECTOR);
+        let n = self
+            .grain
+            .min(self.size.saturating_sub(idx.saturating_mul(self.grain)));
+        host.checked_add(n)
+            .is_some_and(|end| end <= self.file_len)
+            .then_some(host)
+            .map_or(Map::Zero, Map::Plain)
+    }
+}
+
+/// Where a streamOptimized grain's marker data is.
+#[derive(Clone, Copy)]
+struct Grain {
+    at: u64,
+    stored: u64,
+    /// The file ends inside it.
+    cut: bool,
+}
+
+/// A streamOptimized extent: grains found by walking its markers.
+struct Stream<'a> {
+    src: &'a dyn ByteSource,
+    grain: u64,
+    size: u64,
+    index: HashMap<u64, Grain>,
+    /// Grains in the file that could not be indexed: off a grain boundary, or
+    /// more than the index holds.
+    unplaced: u64,
+}
+
+impl<'a> Stream<'a> {
+    /// Walk the markers from where the grain data begins.
+    ///
+    /// Grain data begins after the header's declared `overhead` — the sectors
+    /// taken by the embedded descriptor and the redundant grain tables.
+    /// Starting at the end of the header instead lands in the middle of that
+    /// metadata and finds no grains at all.
+    fn new(
+        src: &'a dyn ByteSource,
+        overhead_sectors: u64,
+        grain: u64,
+        size: u64,
+        max_entries: usize,
+    ) -> Self {
+        let mut s = Stream {
+            src,
+            grain,
+            size,
+            index: HashMap::new(),
+            unplaced: 0,
+        };
+        let file_len = src.len() as u64;
+        let mut pos = overhead_sectors
+            .saturating_mul(SECTOR)
+            .max(HEADER_LEN as u64);
+        // `pos` saturates at the top after a marker that skips past the file.
+        while pos.saturating_add(SECTOR) <= file_len {
+            // Marker: u64 LBA, u32 size, u32 type (the last only when size == 0).
+            let Some(m) = bytes_at(src, pos, 16) else {
+                break;
+            };
+            let lba = le_u64(&m, 0);
+            let len = le_u32(&m, 8);
+            if len == 0 {
+                match le_u32(&m, 12) {
+                    MARKER_EOS => break,
+                    // Metadata regions: `lba` counts the sectors that follow.
+                    MARKER_GT | MARKER_GD | MARKER_FOOTER => {
+                        pos = pos
+                            .saturating_add(SECTOR)
+                            .saturating_add(lba.saturating_mul(SECTOR));
+                    }
+                    _ => pos = pos.saturating_add(SECTOR),
+                }
+                continue;
+            }
+            // A data marker: 12 bytes of header then `len` bytes of deflate,
+            // padded out to a sector boundary.
+            let start = pos.saturating_add(12);
+            let len = u64::from(len);
+            // A grain cut by the end of the file: what is there is decoded, the
+            // rest is absent.
+            let cut = start.saturating_add(len) > file_len;
+            let guest = lba.saturating_mul(SECTOR);
+            if guest < size {
+                let idx = guest.checked_div(grain).unwrap_or(0);
+                let aligned = guest.checked_rem(grain) == Some(0);
+                let known = s.index.contains_key(&idx);
+                if !aligned || (!known && s.index.len() >= max_entries) {
+                    s.unplaced = s.unplaced.saturating_add(1);
+                } else {
+                    let stored = len.min(file_len.saturating_sub(start));
+                    // A later marker for a grain replaces an earlier one.
+                    s.index.insert(
+                        idx,
+                        Grain {
+                            at: start,
+                            stored,
+                            cut,
+                        },
+                    );
+                }
+            }
+            if cut {
+                break;
+            }
+            let consumed = len
+                .saturating_add(12)
+                .div_ceil(SECTOR)
+                .saturating_mul(SECTOR);
+            pos = pos.saturating_add(consumed);
+        }
+        s
+    }
+}
+
+impl Layout for Stream<'_> {
+    fn name(&self) -> &'static str {
+        NAME
+    }
+
+    fn size(&self) -> u64 {
+        self.size
+    }
+
+    fn unit(&self) -> u64 {
+        self.grain
+    }
+
+    fn map(&self, idx: u64) -> Map {
+        self.index.get(&idx).map_or(Map::Zero, |g| Map::Packed {
+            at: g.at,
+            stored: g.stored,
+            cut: g.cut,
+        })
+    }
+
+    fn unpack(&self, _idx: u64, at: u64, stored: u64, cut: bool, out: usize) -> Unpacked {
+        let raw = usize::try_from(stored)
+            .ok()
+            .and_then(|n| bytes_at(self.src, at, n));
+        let Some(raw) = raw else {
+            return Unpacked {
+                data: Vec::new(),
+                damaged: true,
+            };
+        };
+        let s = match crate::inflate::zlib_reader(&raw[..]) {
+            Ok(Some(z)) => crate::salvage(z, out as u64),
+            // Cut inside the zlib header, or not a zlib stream.
+            Err(_) => Salvaged {
+                data: Vec::new(),
+                over_cap: false,
+                undecoded: false,
+                cut_short: true,
+            },
+            Ok(None) => Salvaged {
+                data: Vec::new(),
+                over_cap: false,
+                undecoded: true,
+                cut_short: false,
+            },
+        };
+        // The grain's bytes are in this file; exav just could not read them.
+        // That is content left unexamined, not content absent.
+        Unpacked {
+            damaged: s.part_way(cut),
+            data: s.data,
+        }
+    }
+
+    fn reports(&self, health: &Health) -> Vec<(u64, &'static str)> {
+        // Reported alongside the disk, not instead of it. A grain that fails
+        // to inflate leaves zeroes behind, and zeroes that nobody mentions
+        // read exactly like empty disk.
+        let mut out = Vec::new();
+        if health.undecodable() > 0 {
+            out.push((
+                health
+                    .undecodable()
+                    .saturating_mul(self.grain)
+                    .min(self.size),
+                "streamOptimized VMDK: grains that could not be decompressed",
+            ));
+        }
+        if self.unplaced > 0 {
+            out.push((
+                self.unplaced.saturating_mul(self.grain),
+                "streamOptimized VMDK: grains off a grain boundary or beyond the index",
+            ));
+        }
+        out
+    }
+
+    fn unusable(&self, health: &Health, whole: bool) -> Option<&'static str> {
+        let none = self.index.is_empty() || (whole && health.produced() == 0);
+        (none && self.size > 0).then_some("streamOptimized VMDK: no grain could be decoded")
+    }
+}
+
+/// What a VMDK header makes of an image.
+enum Opened<'a> {
+    /// Not a VMDK extent at all.
+    No,
+    Sparse(Sparse<'a>),
+    Stream(Stream<'a>),
+    /// A file whose disk is not read: the size it declares, and why.
+    Unread(u64, &'static str),
+}
+
+/// Read the header of `src`. A streamOptimized extent's markers are indexed
+/// into at most `max_grains` entries.
+fn open(src: &dyn ByteSource, max_grains: usize) -> Opened<'_> {
+    let head = src.window(0, HEADER_LEN);
+    if head.starts_with(b"# Disk DescriptorFile") {
         // The extents named here are separate files, absent from this one.
-        budget.count_entry()?;
-        return Ok(visit(
-            Entry::unsupported(
-                "vmdk-disk".to_string(),
-                data.len() as u64,
-                false,
-                "VMDK descriptor: the disk extents are separate files not in this one",
-            ),
-            budget,
-        ));
+        return Opened::Unread(
+            src.len() as u64,
+            "VMDK descriptor: the disk extents are separate files not in this one",
+        );
     }
-    if !super::sniff::is(data, crate::Format::Vmdk) {
-        return Ok(None);
+    if !(src.len() > HEADER_LEN && head.starts_with(b"KDMV")) {
+        return Opened::No;
     }
 
-    let flags = le_u32(data, 8);
-    let capacity_sectors = le_u64(data, 12);
-    let grain_sectors = le_u64(data, 20);
-    let gd_offset = le_u64(data, 56);
-    let compress_algorithm = data
+    let flags = le_u32(&head, 8);
+    let capacity_sectors = le_u64(&head, 12);
+    let grain_sectors = le_u64(&head, 20);
+    let gtes = match le_u32(&head, 44) {
+        0 => 512,
+        n => n,
+    };
+    let gd_offset = le_u64(&head, 56);
+    let overhead_sectors = le_u64(&head, 64);
+    let compress_algorithm = head
         .get(77..79)
         .map(|b| u16::from_le_bytes([b[0], b[1]]))
         .unwrap_or(0);
     // Bit 16 of `flags` marks compressed grains; bit 17 marks the marker-based
     // (streamOptimized) layout.
     let compressed = flags & (1 << 16) != 0 || compress_algorithm == 1;
-    let virtual_size = capacity_sectors.saturating_mul(SECTOR);
+    let size = capacity_sectors.saturating_mul(SECTOR);
 
     if grain_sectors == 0 || !grain_sectors.is_power_of_two() {
-        return report("implausible VMDK grain size", virtual_size, budget, visit);
-    }
-    let grain_size = crate::bytes::to_usize(grain_sectors.saturating_mul(SECTOR));
-
-    budget.count_entry()?;
-    let cap = budget.reserve()?;
-    if virtual_size > cap {
-        return Ok(visit(
-            Entry::unsupported(
-                "vmdk-disk".to_string(),
-                virtual_size,
-                false,
-                "VMDK disk exceeds the per-member size budget",
-            ),
-            budget,
-        ));
+        return Opened::Unread(size, "implausible VMDK grain size");
     }
-    let mut disk = vec![0u8; virtual_size as usize];
+    let grain = grain_sectors.saturating_mul(SECTOR);
 
     // streamOptimized extents are written as a stream of marker sectors rather
     // than a navigable grain directory: each grain is preceded by its guest LBA
     // and compressed length, and the metadata markers can be skipped.
     if compressed || gd_offset == u64::MAX {
-        let (wrote, undecodable) = read_markers(data, &mut disk, grain_size);
-        if wrote == 0 && !disk.is_empty() {
-            return Ok(visit(
-                Entry::unsupported(
-                    "vmdk-disk".to_string(),
-                    virtual_size,
-                    false,
-                    "streamOptimized VMDK: no grain could be decoded",
-                ),
-                budget,
-            ));
+        // A grain is inflated whole into the cache.
+        if grain > MAX_PACKED_UNIT {
+            return Opened::Unread(size, "implausible VMDK grain size");
         }
-        if undecodable > 0 {
-            // Reported alongside the disk, not instead of it. A grain that fails
-            // to inflate leaves zeroes behind, and zeroes that nobody mentions
-            // read exactly like empty disk.
-            budget.count_entry()?;
-            if let Some(r) = visit(
-                Entry::unsupported(
-                    "vmdk-disk".to_string(),
-                    (undecodable as u64).saturating_mul(grain_size as u64),
-                    false,
-                    "streamOptimized VMDK: grains that could not be decompressed",
-                ),
-                budget,
-            ) {
-                return Ok(Some(r));
-            }
+        let layout = Stream::new(src, overhead_sectors, grain, size, max_grains);
+        if layout.index.is_empty() && size > 0 {
+            return Opened::Unread(size, "streamOptimized VMDK: no grain could be decoded");
         }
-        budget.commit(disk.len() as u64);
-        return Ok(visit(Entry::new("vmdk-disk".to_string(), disk), budget));
+        return Opened::Stream(layout);
     }
 
     // Plain sparse: grain directory -> grain tables -> grains.
-    let gd_byte = crate::bytes::to_usize(gd_offset.saturating_mul(SECTOR));
+    if !gtes.is_power_of_two() || gtes > 1 << 16 {
+        return Opened::Unread(size, "implausible VMDK grain table size");
+    }
+    let gtes = u64::from(gtes);
+    let gd = gd_offset.saturating_mul(SECTOR);
     let num_gde = capacity_sectors
-        .div_ceil(grain_sectors.saturating_mul(SECTOR))
-        .max(1) as usize;
-    let Some(gd) = crate::bytes::at(data, gd_byte, num_gde.saturating_mul(4)) else {
-        return report(
-            "VMDK grain directory lies outside the image",
-            virtual_size,
-            budget,
-            visit,
-        );
-    };
-    for (i, gde_chunk) in gd.as_chunks::<4>().0.iter().enumerate() {
-        let gde = u32::from_le_bytes(*gde_chunk);
-        if gde == GDE_UNALLOCATED {
-            continue;
-        }
-        let gt_byte = crate::bytes::to_usize((gde as u64).saturating_mul(SECTOR));
-        // A grain table is 512 entries in every published version.
-        let Some(gt) = crate::bytes::at(data, gt_byte, 512 * 4) else {
-            continue;
+        .div_ceil(grain_sectors.saturating_mul(gtes))
+        .max(1);
+    let file_len = src.len() as u64;
+    if !gd
+        .checked_add(num_gde.saturating_mul(4))
+        .is_some_and(|end| end <= file_len)
+    {
+        return Opened::Unread(size, "VMDK grain directory lies outside the image");
+    }
+    Opened::Sparse(Sparse {
+        src,
+        gd,
+        gtes,
+        grain,
+        size,
+        file_len,
+    })
+}
+
+/// Walk a VMDK's disk.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let max_grains =
+        usize::try_from(budget.limits().max_buffer_bytes / INDEX_ENTRY_COST).unwrap_or(usize::MAX);
+    let allowance = budget.remaining_scan();
+    match open(src, max_grains) {
+        Opened::No => Ok(None),
+        Opened::Unread(size, why) => report(NAME, size, why, budget, visit),
+        Opened::Sparse(l) => vdisk::walk(VDisk::new(src, l, allowance), budget, visit),
+        Opened::Stream(l) => vdisk::walk(VDisk::new(src, l, allowance), budget, visit),
+    }
+}
+
+// The tests lay out their inputs by index arithmetic on small constants.
+#[cfg(test)]
+#[allow(clippy::arithmetic_side_effects)]
+mod tests {
+    use super::*;
+    use std::io::{Read, Seek, SeekFrom};
+
+    /// A sparse extent of 512 sectors in grains of one sector: the header, the
+    /// grain directory at sector 1, its one grain table at sectors 2 to 5, and
+    /// grain data from sector 6. `gte` is the table entry of grain 0.
+    fn sparse(gte: u32, data: &[u8]) -> Vec<u8> {
+        let mut f = vec![0u8; 7 * 512];
+        f[..4].copy_from_slice(b"KDMV");
+        f[12..20].copy_from_slice(&512u64.to_le_bytes());
+        f[20..28].copy_from_slice(&1u64.to_le_bytes());
+        f[44..48].copy_from_slice(&512u32.to_le_bytes());
+        f[56..64].copy_from_slice(&1u64.to_le_bytes());
+        f[512..516].copy_from_slice(&2u32.to_le_bytes());
+        f[1024..1028].copy_from_slice(&gte.to_le_bytes());
+        f[6 * 512..6 * 512 + data.len()].copy_from_slice(data);
+        f
+    }
+
+    fn first(img: &[u8], n: usize) -> Vec<u8> {
+        let src = &img;
+        let Opened::Sparse(l) = open(src, usize::MAX) else {
+            panic!("a sparse extent");
         };
-        for (j, gte_chunk) in gt.as_chunks::<4>().0.iter().enumerate() {
-            let gte = u32::from_le_bytes(*gte_chunk);
-            if gte == 0 {
-                continue;
-            }
-            let guest = i
-                .saturating_mul(512)
-                .saturating_add(j)
-                .saturating_mul(grain_size);
-            if guest >= disk.len() {
-                continue;
-            }
-            let n = grain_size.min(disk.len().saturating_sub(guest));
-            let host = crate::bytes::to_usize((gte as u64).saturating_mul(SECTOR));
-            if let Some(src) = crate::bytes::at(data, host, n) {
-                disk[guest..guest.saturating_add(n)].copy_from_slice(src);
-            }
+        let mut d = VDisk::new(src, l, u64::MAX);
+        let mut out = vec![0u8; n];
+        d.read_exact(&mut out).unwrap();
+        out
+    }
+
+    fn unread(img: &[u8]) -> &'static str {
+        let src = img;
+        match open(&src, usize::MAX) {
+            Opened::Unread(_, why) => why,
+            _ => panic!("the image should not open as a disk"),
         }
     }
-    budget.commit(disk.len() as u64);
-    Ok(visit(Entry::new("vmdk-disk".to_string(), disk), budget))
-}
 
-/// Walk a streamOptimized extent's marker sectors, inflating each grain into
-/// place. Returns how many grains were written, and how many were present but
-/// would not inflate.
-///
-/// Grain data begins after the header's declared `overhead` — the sectors taken
-/// by the embedded descriptor and the redundant grain tables. Starting at the
-/// end of the header instead lands in the middle of that metadata and finds no
-/// grains at all.
-fn read_markers(data: &[u8], disk: &mut [u8], grain_size: usize) -> (usize, usize) {
-    let overhead_sectors = le_u64(data, 64);
-    let mut pos = crate::bytes::to_usize(overhead_sectors.saturating_mul(SECTOR)).max(HEADER_LEN);
-    let mut wrote = 0usize;
-    let mut undecodable = 0usize;
-    // `pos` saturates at the top of `usize` after a marker that skips past the file.
-    while pos.saturating_add(512) <= data.len() {
-        // Marker: u64 LBA, u32 size, u32 type (the last only when size == 0).
-        let lba = le_u64(data, pos);
-        let size = le_u32(data, pos.saturating_add(8)) as usize;
-        if size == 0 {
-            let kind = le_u32(data, pos.saturating_add(12));
-            match kind {
-                MARKER_EOS => break,
-                // Metadata regions: `lba` counts the sectors that follow.
-                MARKER_GT | MARKER_GD | MARKER_FOOTER => {
-                    let skip = crate::bytes::to_usize(lba).saturating_mul(SECTOR as usize);
-                    pos = pos.saturating_add(512).saturating_add(skip);
-                    continue;
-                }
-                _ => {
-                    pos = pos.saturating_add(512);
-                    continue;
-                }
-            }
+    #[test]
+    fn a_grain_is_read_from_its_table_entry() {
+        assert_eq!(&first(&sparse(6, b"payload"), 7), b"payload");
+    }
+
+    /// An entry of 1 is a grain that reads as zeros; read as the sector it
+    /// names, it would be the extent's own descriptor area.
+    #[test]
+    fn a_grain_table_entry_of_one_reads_zeros() {
+        // Sector 1 is the grain directory, which does not start with zeros.
+        assert_eq!(first(&sparse(1, b"payload"), 7), [0u8; 7]);
+        assert_eq!(first(&sparse(0, b"payload"), 7), [0u8; 7]);
+    }
+
+    #[test]
+    fn a_grain_or_table_outside_the_file_reads_as_zeros() {
+        assert_eq!(first(&sparse(7, b"payload"), 7), [0u8; 7]);
+        assert_eq!(first(&sparse(u32::MAX, b"payload"), 7), [0u8; 7]);
+        let mut img = sparse(6, b"payload");
+        img[512..516].copy_from_slice(&6u32.to_le_bytes());
+        assert_eq!(first(&img, 7), [0u8; 7]);
+    }
+
+    #[test]
+    fn what_the_header_says_that_cannot_be_followed_is_reported() {
+        let mut img = sparse(6, b"x");
+        img[20..28].copy_from_slice(&3u64.to_le_bytes());
+        assert!(unread(&img).contains("grain size"));
+        let mut img = sparse(6, b"x");
+        img[20..28].copy_from_slice(&0u64.to_le_bytes());
+        assert!(unread(&img).contains("grain size"));
+        for gtes in [3u32, 1 << 20] {
+            let mut img = sparse(6, b"x");
+            img[44..48].copy_from_slice(&gtes.to_le_bytes());
+            assert!(unread(&img).contains("grain table size"), "{gtes}");
         }
-        // A data marker: 12 bytes of header then `size` bytes of deflate,
-        // padded out to a sector boundary.
-        let start = pos.saturating_add(12);
-        // A grain cut by the end of the file: what is there is decoded, the
-        // rest is absent.
-        let rest_absent = start.saturating_add(size) > data.len();
-        let Some(raw) = data.get(start..start.saturating_add(size).min(data.len())) else {
-            break;
-        };
-        let guest = crate::bytes::to_usize(lba).saturating_mul(SECTOR as usize);
-        if guest < disk.len() {
-            let s = match crate::inflate::zlib_reader(raw) {
-                Ok(Some(z)) => crate::salvage(z, grain_size as u64),
-                // Cut inside the zlib header, or not a zlib stream.
-                Err(_) => crate::Salvaged {
-                    data: Vec::new(),
-                    over_cap: false,
-                    undecoded: false,
-                    cut_short: true,
-                },
-                Ok(None) => crate::Salvaged {
-                    data: Vec::new(),
-                    over_cap: false,
-                    undecoded: true,
-                    cut_short: false,
-                },
-            };
-            let n = s.data.len().min(disk.len().saturating_sub(guest));
-            disk[guest..guest.saturating_add(n)].copy_from_slice(&s.data[..n]);
-            if n > 0 {
-                wrote = wrote.saturating_add(1);
-            }
-            // The grain's bytes are in this file; exav just could not read
-            // them. That is content left unexamined, not content absent.
-            if s.part_way(rest_absent) {
-                undecodable = undecodable.saturating_add(1);
-            }
+        // The directory at the top of the range: the sum must not wrap.
+        for gd in [1000u64, u64::MAX - 1, 1 << 60] {
+            let mut img = sparse(6, b"x");
+            img[56..64].copy_from_slice(&gd.to_le_bytes());
+            assert!(unread(&img).contains("grain directory"), "{gd}");
         }
-        if rest_absent {
-            break;
+        // Compressed grains are inflated whole into the cache: not a huge one.
+        let mut img = sparse(6, b"x");
+        img[8..12].copy_from_slice(&(1u32 << 16).to_le_bytes());
+        img[20..28].copy_from_slice(&(1u64 << 30).to_le_bytes());
+        assert!(unread(&img).contains("grain size"));
+        let descriptor = b"# Disk DescriptorFile\nversion=1\n".to_vec();
+        assert!(unread(&descriptor).contains("descriptor"));
+        let short: &[u8] = b"KDMV";
+        assert!(matches!(open(&short, usize::MAX), Opened::No));
+    }
+
+    /// One data marker for a grain of one sector, deflate of `grain`, then the
+    /// end-of-stream marker.
+    fn stream(markers: &[(u64, &[u8])]) -> Vec<u8> {
+        use std::io::Write;
+        let mut f = vec![0u8; 512];
+        f[..4].copy_from_slice(b"KDMV");
+        f[8..12].copy_from_slice(&(1u32 << 16).to_le_bytes());
+        f[12..20].copy_from_slice(&512u64.to_le_bytes());
+        f[20..28].copy_from_slice(&1u64.to_le_bytes());
+        f[56..64].copy_from_slice(&u64::MAX.to_le_bytes());
+        f[64..72].copy_from_slice(&1u64.to_le_bytes());
+        for (lba, grain) in markers {
+            let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::best());
+            z.write_all(grain).unwrap();
+            let z = z.finish().unwrap();
+            f.extend_from_slice(&lba.to_le_bytes());
+            f.extend_from_slice(&(z.len() as u32).to_le_bytes());
+            f.extend_from_slice(&z);
+            f.resize(f.len().next_multiple_of(512), 0);
         }
-        let consumed = size.saturating_add(12).div_ceil(512).saturating_mul(512);
-        pos = pos.saturating_add(consumed);
+        f.extend_from_slice(&[0u8; 512]);
+        f
     }
-    (wrote, undecodable)
-}
 
-fn report<R>(
-    reason: &'static str,
-    size: u64,
-    budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    budget.count_entry()?;
-    Ok(visit(
-        Entry::unsupported("vmdk-disk".to_string(), size, false, reason),
-        budget,
-    ))
+    fn grains(img: &[u8], max: usize) -> Option<(Vec<u8>, u64)> {
+        let src = &img;
+        let Opened::Stream(l) = open(src, max) else {
+            return None;
+        };
+        let unplaced = l.unplaced;
+        let mut d = VDisk::new(src, l, u64::MAX);
+        let mut out = vec![0u8; 4 * 512];
+        d.seek(SeekFrom::Start(0)).unwrap();
+        d.read_exact(&mut out).unwrap();
+        Some((out, unplaced))
+    }
+
+    /// A marker for a grain already seen replaces it, as a later write does.
+    #[test]
+    fn a_later_marker_replaces_an_earlier_one_for_the_same_grain() {
+        let (a, b) = ([b'a'; 512], [b'b'; 512]);
+        let img = stream(&[(1, &a), (1, &b), (2, &a)]);
+        let (d, unplaced) = grains(&img, usize::MAX).unwrap();
+        assert_eq!(&d[..512], &[0u8; 512][..]);
+        assert_eq!(&d[512..1024], &b[..]);
+        assert_eq!(&d[1024..1536], &a[..]);
+        assert_eq!(unplaced, 0);
+    }
+
+    /// The index is counted against a limit; a grain past it is counted as one
+    /// that could not be placed, not dropped.
+    #[test]
+    fn grains_past_the_index_limit_are_counted_not_dropped() {
+        let a = [b'a'; 512];
+        let img = stream(&[(0, &a), (1, &a), (2, &a)]);
+        let (d, unplaced) = grains(&img, 2).unwrap();
+        assert_eq!(&d[..1024], &[b'a'; 1024][..]);
+        assert_eq!(&d[1024..1536], &[0u8; 512][..]);
+        assert_eq!(unplaced, 1);
+    }
+
+    /// A grain damaged part way gave what decoded before the damage, and that
+    /// is handed over with the report; a disk is not "no grain decoded" for
+    /// having one bad grain.
+    #[test]
+    fn a_grain_damaged_part_way_keeps_its_prefix_and_is_reported() {
+        let text: Vec<u8> = (0..512u32).map(|i| b'a' + (i * 7 % 26) as u8).collect();
+        let mut img = stream(&[(0, &text)]);
+        // The grain's deflate stream starts 12 bytes into the marker at 512;
+        // damage its second half.
+        let len = u32::from_le_bytes(img[520..524].try_into().unwrap()) as usize;
+        for b in &mut img[512 + 12 + len / 2..512 + 12 + len] {
+            *b ^= 0xFF;
+        }
+        let mut budget = crate::Budget::new(crate::Limits::default());
+        let got = crate::extract(crate::Format::Vmdk, &img.as_slice(), &mut budget).unwrap();
+        assert!(
+            got[0]
+                .unsupported
+                .is_some_and(|w| w.contains("could not be decompressed"))
+        );
+        let disk = &got[1];
+        assert!(disk.unsupported.is_none() && disk.name == "vmdk-disk");
+        assert!(disk.data.len() == 512 * 512);
+        assert!(
+            disk.data.starts_with(&text[..3]),
+            "the decoded prefix is kept"
+        );
+    }
+
+    #[test]
+    fn a_stream_with_no_grain_is_reported() {
+        assert!(matches!(
+            open(&stream(&[]).as_slice(), usize::MAX),
+            Opened::Unread(_, w) if w.contains("no grain")
+        ));
+    }
 }
diff --git a/crates/exav-unpack/src/formats/vol.rs b/crates/exav-unpack/src/formats/vol.rs
new file mode 100644
index 00000000..38e94fb6
--- /dev/null
+++ b/crates/exav-unpack/src/formats/vol.rs
@@ -0,0 +1,532 @@
+//! A volume read at the offsets its own structures give, for the filesystem
+//! readers that walk one in place (NTFS, HFS+, APFS).
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+// Each build has the filesystems its features give it.
+#![allow(dead_code)]
+
+use std::io::{self, Read, Seek, SeekFrom};
+
+use crate::{Budget, Entry, LimitHit, Mtime};
+
+/// A `Read + Seek` volume, whichever it is.
+pub(crate) trait Disk: Read + Seek {}
+impl<T: Read + Seek + ?Sized> Disk for T {}
+
+/// How much of the volume one read asks of it at once.
+const STEP: usize = 1 << 20;
+
+/// The volume, read at offsets the filesystem's own numbers give.
+pub(crate) struct Vol<'a> {
+    pub(crate) disk: &'a mut dyn Disk,
+    pub(crate) len: u64,
+    /// The most an on-disk structure (a table, an attribute list) is read
+    /// whole: the buffer limit. Only NTFS reads whole structures of any size.
+    pub(crate) max: usize,
+}
+
+impl Vol<'_> {
+    /// `len` bytes at `off`, or `None` when they are not all in the volume.
+    pub(crate) fn at(&mut self, off: u64, len: usize) -> Option<Vec<u8>> {
+        let mut out = Vec::new();
+        self.append(off, len, &mut out).then_some(out)
+    }
+
+    /// Append `len` bytes at `off` to `out`, if they are all in the volume.
+    /// They are read a step at a time, so what is held grows with what is read.
+    pub(crate) fn append(&mut self, off: u64, len: usize, out: &mut Vec<u8>) -> bool {
+        let Some(end) = off.checked_add(len as u64) else {
+            return false;
+        };
+        if end > self.len || self.disk.seek(SeekFrom::Start(off)).is_err() {
+            return false;
+        }
+        let base = out.len();
+        let mut done = 0usize;
+        while done < len {
+            let step = len.saturating_sub(done).min(STEP);
+            let from = base.saturating_add(done);
+            out.resize(from.saturating_add(step), 0);
+            if self.disk.read_exact(&mut out[from..]).is_err() {
+                out.truncate(base);
+                return false;
+            }
+            done = done.saturating_add(step);
+        }
+        true
+    }
+}
+
+/// What reading a file of a volume came to.
+pub(crate) enum Got<'a> {
+    Whole(Vec<u8>),
+    /// What could be read of a file the volume does not hold all of.
+    Short(Vec<u8>),
+    /// A file too long to hold, of that many bytes, to be read as it goes. It
+    /// fails with an error where the volume stops giving its bytes.
+    Stream(Box<dyn Read + 'a>, u64),
+    /// Longer than a member may be, of that many bytes, and not a file this
+    /// reader can read as it goes: reported, and the walk goes on.
+    Big(u64),
+    Why(&'static str),
+    /// Stored encrypted.
+    Locked(&'static str),
+}
+
+impl Got<'_> {
+    /// The member for the file at `path`. A file to be read as it goes is not
+    /// one: [`give`] hands it over before it gets here.
+    pub(crate) fn entry(self, path: String) -> Entry {
+        match self {
+            Got::Whole(d) => Entry::new(path, d),
+            Got::Short(d) => Entry {
+                unsupported: Some("file could not be read from the volume"),
+                ..Entry::new(path, d)
+            },
+            Got::Stream(_, size) => {
+                Entry::unsupported(path, size, false, "file was not read as it goes")
+            }
+            Got::Big(size) => {
+                Entry::unsupported(path, size, false, "file exceeds the per-member size budget")
+            }
+            Got::Why(why) => Entry::unsupported(path, 0, false, why),
+            Got::Locked(why) => Entry::unsupported(path, 0, true, why),
+        }
+    }
+}
+
+/// A file a filesystem walker hands over.
+pub(crate) enum Found<'a> {
+    /// A member held whole.
+    Held(Entry),
+    /// A member read as it goes: its name, mode and time in the entry, which
+    /// has no data, and the reader of its bytes.
+    Read(Entry, &'a mut dyn Read),
+}
+
+impl Found<'_> {
+    /// The member whole, a file read as it goes read to its end, or to 32 MiB:
+    /// a damaged volume can give a file of any length, holes and all.
+    #[cfg(test)]
+    pub(crate) fn whole(self) -> Entry {
+        match self {
+            Found::Held(e) => e,
+            Found::Read(mut e, r) => {
+                if let Err(err) = r.take(32 << 20).read_to_end(&mut e.data) {
+                    e.unsupported = Some(Box::leak(err.to_string().into_boxed_str()));
+                }
+                e
+            }
+        }
+    }
+}
+
+/// What a filesystem walker hands each file to.
+pub(crate) type Emit<'a, R> = &'a mut dyn FnMut(Found<'_>, &mut Budget) -> Option<R>;
+
+/// What one step of producing a file's bytes came to.
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(crate) enum Step {
+    /// Bytes were appended, and there may be more.
+    More,
+    /// The file is over.
+    End,
+    /// The volume does not give the rest of the file.
+    Broken,
+}
+
+/// The bytes of a file, produced a piece at a time.
+pub(crate) trait Fill {
+    /// Append the next bytes of the file to `out`, at most [`STEP`] of them.
+    fn fill(&mut self, v: &mut Vol, out: &mut Vec<u8>) -> Step;
+}
+
+/// A file read to its end where it is as long as `size`, which is held, so
+/// it is within what a member may hold. What was read stays where the
+/// volume stops giving more.
+pub(crate) fn drain<'a>(fill: &mut impl Fill, v: &mut Vol, size: u64) -> Got<'a> {
+    let mut out = Vec::new();
+    let end = loop {
+        match fill.fill(v, &mut out) {
+            Step::More => {}
+            other => break other,
+        }
+    };
+    if end == Step::End && out.len() as u64 == size {
+        Got::Whole(out)
+    } else {
+        Got::Short(out)
+    }
+}
+
+/// A file of `size` bytes: held when it is within `cap`, else read as it goes.
+pub(crate) fn read_file<'a, 'b, F: Fill + 'a>(
+    v: &'a mut Vol<'b>,
+    mut fill: F,
+    size: u64,
+    cap: u64,
+) -> Got<'a>
+where
+    'b: 'a,
+{
+    if size <= cap {
+        return drain(&mut fill, v, size);
+    }
+    Got::Stream(
+        Box::new(Streamed {
+            v,
+            fill,
+            buf: Vec::new(),
+            at: 0,
+            step: Step::More,
+        }),
+        size,
+    )
+}
+
+/// A [`Fill`] as a `Read`.
+struct Streamed<'a, 'b, F> {
+    v: &'a mut Vol<'b>,
+    fill: F,
+    buf: Vec<u8>,
+    at: usize,
+    step: Step,
+}
+
+impl<F: Fill> Read for Streamed<'_, '_, F> {
+    fn read(&mut self, out: &mut [u8]) -> io::Result<usize> {
+        loop {
+            if let Some(rest) = self.buf.get(self.at..).filter(|r| !r.is_empty()) {
+                let n = rest.len().min(out.len());
+                out[..n].copy_from_slice(&rest[..n]);
+                self.at = self.at.saturating_add(n);
+                return Ok(n);
+            }
+            match self.step {
+                Step::End => return Ok(0),
+                Step::Broken => {
+                    return Err(io::Error::new(
+                        io::ErrorKind::InvalidData,
+                        "file could not be read from the volume",
+                    ));
+                }
+                Step::More => {
+                    self.buf.clear();
+                    self.at = 0;
+                    self.step = self.fill.fill(self.v, &mut self.buf);
+                }
+            }
+        }
+    }
+}
+
+/// A stretch of a file.
+#[derive(Clone, Copy)]
+pub(crate) enum Piece {
+    /// `len` bytes at `off` of the volume.
+    Disk(u64, u64),
+    /// `len` bytes of zeros: a hole, or what was never written.
+    Zeros(u64),
+}
+
+/// What a [`Plan`] gives next.
+pub(crate) enum Next {
+    Piece(Piece),
+    End,
+    /// The volume does not say where the rest of the file is.
+    Broken,
+}
+
+/// Where the stretches of a file are, in order, found as they are wanted.
+pub(crate) trait Plan {
+    fn next(&mut self, v: &mut Vol) -> Next;
+}
+
+/// A [`Plan`]'s stretches as the first `left` bytes of a file.
+pub(crate) struct Pieces<P> {
+    plan: P,
+    left: u64,
+    cur: Option<Piece>,
+}
+
+impl<P: Plan> Pieces<P> {
+    pub(crate) fn new(plan: P, size: u64) -> Self {
+        Pieces {
+            plan,
+            left: size,
+            cur: None,
+        }
+    }
+}
+
+impl<P: Plan> Fill for Pieces<P> {
+    fn fill(&mut self, v: &mut Vol, out: &mut Vec<u8>) -> Step {
+        if self.left == 0 {
+            return Step::End;
+        }
+        let piece = match self.cur.take() {
+            Some(p) => p,
+            None => match self.plan.next(v) {
+                Next::Piece(p) => p,
+                // The file is longer than what the volume says it holds.
+                Next::End | Next::Broken => return Step::Broken,
+            },
+        };
+        let (Piece::Disk(_, len) | Piece::Zeros(len)) = piece;
+        let take = len.min(self.left).min(STEP as u64);
+        let n = crate::bytes::to_usize(take);
+        let read = match piece {
+            Piece::Disk(off, _) => v.append(off, n, out),
+            Piece::Zeros(_) => {
+                out.resize(out.len().saturating_add(n), 0);
+                true
+            }
+        };
+        if !read {
+            return Step::Broken;
+        }
+        self.left = self.left.saturating_sub(take);
+        // What is left of the piece, if any.
+        let left = len.saturating_sub(take);
+        if left > 0 {
+            self.cur = Some(match piece {
+                Piece::Disk(off, _) => Piece::Disk(off.saturating_add(take), left),
+                Piece::Zeros(_) => Piece::Zeros(left),
+            });
+        }
+        Step::More
+    }
+}
+
+/// A plan that is a list of stretches, with a flag for whether the list is
+/// whole where it ends.
+pub(crate) struct List {
+    pub(crate) pieces: std::vec::IntoIter<Piece>,
+    pub(crate) intact: bool,
+}
+
+impl Plan for List {
+    fn next(&mut self, _: &mut Vol) -> Next {
+        match self.pieces.next() {
+            Some(p) => Next::Piece(p),
+            None if self.intact => Next::End,
+            None => Next::Broken,
+        }
+    }
+}
+
+/// What a volume records of a file besides its bytes.
+#[derive(Clone, Copy, Default)]
+pub(crate) struct Attrs {
+    /// `st_mode`.
+    pub(crate) mode: Option<u32>,
+    pub(crate) mtime: Option<Mtime>,
+}
+
+/// The file at `path`, read under the bounds a member has and handed to
+/// `visit`: held when it fits, else read as it goes. The caller has counted
+/// the member.
+pub(crate) fn give<'a, R>(
+    budget: &mut Budget,
+    visit: Emit<R>,
+    path: String,
+    attrs: Attrs,
+    read: impl FnOnce(u64) -> Got<'a>,
+) -> Result<Option<R>, LimitHit> {
+    let cap = budget.reserve()?;
+    Ok(hand(budget, visit, path, attrs, read(cap)))
+}
+
+/// What a volume gave of the file at `path`, handed to `visit`. The caller has
+/// counted the member.
+pub(crate) fn hand<R>(
+    budget: &mut Budget,
+    visit: Emit<R>,
+    path: String,
+    attrs: Attrs,
+    got: Got<'_>,
+) -> Option<R> {
+    let (mut entry, mut stream) = match got {
+        Got::Stream(reader, size) => {
+            let mut e = Entry::new(path, Vec::new());
+            e.comp_size = size;
+            (e, Some(reader))
+        }
+        other => (other.entry(path), None),
+    };
+    entry.mode = attrs.mode;
+    entry.mtime = attrs.mtime;
+    match stream.as_mut() {
+        Some(reader) => visit(Found::Read(entry, &mut **reader), budget),
+        None => {
+            budget.commit(entry.data.len() as u64);
+            visit(Found::Held(entry), budget)
+        }
+    }
+}
+
+/// The integer of `N` bytes at `off`, or 0 where the data ends: a record is
+/// length-checked once, and its fields are then read without a check each.
+fn field<const N: usize>(d: &[u8], off: usize) -> [u8; N] {
+    crate::bytes::at(d, off, N)
+        .and_then(|b| b.try_into().ok())
+        .unwrap_or([0; N])
+}
+
+pub(crate) fn be16(d: &[u8], off: usize) -> u16 {
+    u16::from_be_bytes(field(d, off))
+}
+
+pub(crate) fn be32(d: &[u8], off: usize) -> u32 {
+    u32::from_be_bytes(field(d, off))
+}
+
+pub(crate) fn be64(d: &[u8], off: usize) -> u64 {
+    u64::from_be_bytes(field(d, off))
+}
+
+pub(crate) fn le16(d: &[u8], off: usize) -> u16 {
+    u16::from_le_bytes(field(d, off))
+}
+
+pub(crate) fn le32(d: &[u8], off: usize) -> u32 {
+    u32::from_le_bytes(field(d, off))
+}
+
+pub(crate) fn le64(d: &[u8], off: usize) -> u64 {
+    u64::from_le_bytes(field(d, off))
+}
+
+/// What a walk handed over, each member whole with whether it was read as it
+/// goes, and what the walk returned. For the readers' tests.
+#[cfg(test)]
+pub(crate) fn collected<T>(run: impl FnOnce(Emit<()>) -> T) -> (Vec<(Entry, bool)>, T) {
+    let mut out = Vec::new();
+    let end = run(&mut |found, _| {
+        let streamed = matches!(found, Found::Read(..));
+        out.push((found.whole(), streamed));
+        None
+    });
+    (out, end)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io::Cursor;
+
+    #[test]
+    fn a_read_is_all_in_the_volume_or_absent() {
+        let mut c = Cursor::new((0u8..10).collect::<Vec<_>>());
+        let mut v = Vol {
+            disk: &mut c,
+            len: 10,
+            max: 1 << 20,
+        };
+        assert_eq!(v.at(2, 3), Some(vec![2, 3, 4]));
+        assert_eq!(v.at(10, 0), Some(vec![]));
+        assert_eq!(v.at(8, 3), None, "past the end");
+        assert_eq!(v.at(u64::MAX, 2), None, "the sum overflows");
+        let mut out = vec![9];
+        assert!(!v.append(8, 3, &mut out));
+        assert_eq!(out, [9], "a failed append leaves what was there");
+    }
+
+    fn plan(pieces: Vec<Piece>, intact: bool) -> List {
+        List {
+            pieces: pieces.into_iter(),
+            intact,
+        }
+    }
+
+    #[test]
+    fn a_file_longer_than_a_step_is_read_in_steps_across_disk_and_holes() {
+        let data: Vec<u8> = (0..STEP * 2 + 100).map(|i| (i % 251) as u8).collect();
+        let mut c = Cursor::new(data.clone());
+        let mut v = Vol {
+            disk: &mut c,
+            len: data.len() as u64,
+            max: 1 << 20,
+        };
+        let size = (data.len() + STEP + 5) as u64;
+        let pieces = vec![
+            Piece::Disk(0, data.len() as u64),
+            Piece::Zeros(STEP as u64 + 5),
+        ];
+        let got = read_file(&mut v, Pieces::new(plan(pieces, true), size), size, 10);
+        let Got::Stream(mut r, n) = got else {
+            panic!("not read as it goes");
+        };
+        assert_eq!(n, size);
+        let mut out = Vec::new();
+        r.read_to_end(&mut out).unwrap();
+        let mut want = data;
+        want.resize(size as usize, 0);
+        assert!(out == want, "the bytes differ");
+    }
+
+    #[test]
+    fn a_file_the_volume_stops_giving_is_read_up_to_there_and_then_fails() {
+        let mut c = Cursor::new(vec![7u8; 100]);
+        let mut v = Vol {
+            disk: &mut c,
+            len: 100,
+            max: 1 << 20,
+        };
+        // The file is 300 bytes, and the volume has the first 100 of them.
+        for pieces in [
+            plan(vec![Piece::Disk(0, 100)], false),
+            plan(vec![Piece::Disk(0, 100), Piece::Disk(100, 200)], true),
+        ] {
+            let got = read_file(&mut v, Pieces::new(pieces, 300), 300, 10);
+            let Got::Stream(mut r, _) = got else {
+                panic!("not read as it goes");
+            };
+            let mut out = Vec::new();
+            let err = r.read_to_end(&mut out).expect_err("the end is not there");
+            assert_eq!(err.kind(), io::ErrorKind::InvalidData);
+            assert_eq!(out, vec![7u8; 100]);
+        }
+    }
+
+    #[test]
+    fn a_file_within_the_limit_is_held_whole_or_short() {
+        let mut c = Cursor::new(vec![7u8; 100]);
+        let mut v = Vol {
+            disk: &mut c,
+            len: 100,
+            max: 1 << 20,
+        };
+        let whole = read_file(
+            &mut v,
+            Pieces::new(plan(vec![Piece::Disk(0, 60)], true), 60),
+            60,
+            60,
+        );
+        assert!(matches!(&whole, Got::Whole(d) if *d == vec![7u8; 60]));
+        drop(whole);
+        // A file longer than what the plan holds is short, not whole.
+        let short = read_file(
+            &mut v,
+            Pieces::new(plan(vec![Piece::Disk(0, 60)], true), 80),
+            80,
+            80,
+        );
+        assert!(matches!(short, Got::Short(d) if d == vec![7u8; 60]));
+    }
+
+    #[test]
+    fn fields_are_read_in_their_order_and_zero_past_the_end() {
+        let d = [1u8, 2, 3, 4, 5, 6, 7, 8];
+        assert_eq!(be16(&d, 0), 0x0102);
+        assert_eq!(le16(&d, 0), 0x0201);
+        assert_eq!(be32(&d, 1), 0x0203_0405);
+        assert_eq!(le32(&d, 1), 0x0504_0302);
+        assert_eq!(be64(&d, 0), 0x0102_0304_0506_0708);
+        assert_eq!(le64(&d, 0), 0x0807_0605_0403_0201);
+        assert_eq!(be32(&d, 6), 0);
+        assert_eq!(le64(&d, usize::MAX), 0);
+    }
+}
diff --git a/crates/exav-unpack/src/formats/volumes.rs b/crates/exav-unpack/src/formats/volumes.rs
new file mode 100644
index 00000000..b1b7c490
--- /dev/null
+++ b/crates/exav-unpack/src/formats/volumes.rs
@@ -0,0 +1,373 @@
+//! The partitions and filesystems of a disk, walked where they lie.
+//!
+//! A disk image is a `Read + Seek`; the filesystem readers (NTFS, FAT, and ext
+//! for the one volume it holds) take one, so a file comes out of a disk
+//! without the disk, or the volume around it, being held.
+//!
+//! A volume of at most the buffer limit is handed over whole, as a stream, as
+//! a partition of a raw disk always was: its raw bytes are scanned and typed
+//! one level down, which also reaches whatever it holds that is not a
+//! filesystem exav reads. A larger one that is a filesystem exav reads is
+//! walked in place. A larger one that is not is streamed when the disk is a
+//! file ([`Mode::Raw`]), where those bytes are the input, and reported when
+//! the disk is a virtual one ([`Mode::Virtual`]), where its size is only what
+//! a header declares and reading it could be a long walk through zeros.
+
+// Every sum and product on a header's number is checked or saturating here; a
+// plain one fails the build, so the next edit cannot add the unchecked kind.
+#![deny(clippy::arithmetic_side_effects)]
+// Each build has the filesystems and the partition walker its features give it.
+#![allow(dead_code, unused_imports, unused_variables)]
+
+use std::io::{self, Read, Seek, SeekFrom};
+
+use super::vol::{Emit, Found};
+use crate::stream::{MemberMeta, Region, Visit, emit_entry, emit_stream};
+use crate::{Budget, Entry, LimitHit};
+
+/// A member that is only a report: `reason` about `size` bytes of `name`.
+pub(crate) fn report<T>(
+    name: &str,
+    size: u64,
+    reason: &'static str,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    report_enc(name, size, false, reason, budget, visit)
+}
+
+/// [`report`] of content that is encrypted.
+pub(crate) fn report_enc<T>(
+    name: &str,
+    size: u64,
+    encrypted: bool,
+    reason: &'static str,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    budget.count_entry()?;
+    emit_entry(
+        Entry::unsupported(name.to_string(), size, encrypted, reason),
+        budget,
+        visit,
+    )
+}
+
+/// What is read to tell a filesystem apart.
+const HEAD: usize = 4096;
+
+/// How far into a virtual disk the bytes before the first partition are
+/// scanned: the boot code, where a bootkit lives.
+const BOOT_AREA: u64 = 1024 * 1024;
+
+/// What the disk is.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Mode {
+    /// A file's bytes: the disk was scanned as the object it is.
+    Raw,
+    /// A virtual disk's declared bytes.
+    Virtual,
+}
+
+/// A filesystem that is read in place.
+#[derive(Clone, Copy)]
+enum Fs {
+    #[cfg(feature = "ntfs")]
+    Ntfs,
+    #[cfg(feature = "fat")]
+    Fat,
+    #[cfg(feature = "ext")]
+    Ext,
+    #[cfg(feature = "exfat")]
+    Exfat,
+    #[cfg(feature = "squashfs")]
+    Squashfs,
+    #[cfg(feature = "cramfs")]
+    Cramfs,
+    #[cfg(feature = "romfs")]
+    Romfs,
+    #[cfg(feature = "erofs")]
+    Erofs,
+    #[cfg(feature = "dmg")]
+    Hfs,
+    #[cfg(feature = "dmg")]
+    Apfs,
+}
+
+/// The filesystem a volume starting with `head` is. The order is `detect`'s.
+fn sniff(head: &[u8]) -> Option<Fs> {
+    #[cfg(feature = "dmg")]
+    if super::apfs::is_apfs(head) {
+        return Some(Fs::Apfs);
+    }
+    #[cfg(feature = "dmg")]
+    if super::hfsplus::is_hfsplus(head) {
+        return Some(Fs::Hfs);
+    }
+    #[cfg(feature = "ext")]
+    if super::ext::is_ext(head) {
+        return Some(Fs::Ext);
+    }
+    #[cfg(feature = "fat")]
+    if super::fat::is_fat(head) {
+        return Some(Fs::Fat);
+    }
+    #[cfg(feature = "exfat")]
+    if super::exfat::is_exfat(head) {
+        return Some(Fs::Exfat);
+    }
+    #[cfg(feature = "squashfs")]
+    if super::squashfs::is_squashfs(head) {
+        return Some(Fs::Squashfs);
+    }
+    #[cfg(feature = "cramfs")]
+    if super::cramfs::is_cramfs(head) {
+        return Some(Fs::Cramfs);
+    }
+    #[cfg(feature = "romfs")]
+    if super::romfs::is_romfs(head) {
+        return Some(Fs::Romfs);
+    }
+    #[cfg(feature = "erofs")]
+    if super::erofs::is_erofs(head) {
+        return Some(Fs::Erofs);
+    }
+    #[cfg(feature = "ntfs")]
+    if super::sniff::is(head, crate::Format::Ntfs) {
+        return Some(Fs::Ntfs);
+    }
+    let _ = head;
+    None
+}
+
+/// `[start, start + len)` of a disk, as a disk of its own.
+pub(crate) struct Window<'a, D> {
+    disk: &'a mut D,
+    start: u64,
+    len: u64,
+    pos: u64,
+}
+
+impl<'a, D> Window<'a, D> {
+    pub(crate) fn new(disk: &'a mut D, start: u64, len: u64) -> Self {
+        Window {
+            disk,
+            start,
+            len,
+            pos: 0,
+        }
+    }
+}
+
+impl<D: Read + Seek> Read for Window<'_, D> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let left = self.len.saturating_sub(self.pos);
+        let want = usize::try_from(left).map_or(buf.len(), |l| l.min(buf.len()));
+        if want == 0 {
+            return Ok(0);
+        }
+        let at = self
+            .start
+            .checked_add(self.pos)
+            .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "offset overflow"))?;
+        self.disk.seek(SeekFrom::Start(at))?;
+        let n = self.disk.read(&mut buf[..want])?;
+        self.pos = self.pos.saturating_add(n as u64);
+        Ok(n)
+    }
+}
+
+impl<D> Seek for Window<'_, D> {
+    fn seek(&mut self, to: SeekFrom) -> io::Result<u64> {
+        let pos = match to {
+            SeekFrom::Start(p) => Some(p),
+            SeekFrom::End(d) => self.len.checked_add_signed(d),
+            SeekFrom::Current(d) => self.pos.checked_add_signed(d),
+        }
+        .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "seek outside the volume"))?;
+        self.pos = pos;
+        Ok(pos)
+    }
+}
+
+/// Run a filesystem walker, which hands each file to an [`Emit`], as a walk
+/// handing members to `visit`, each name under `prefix`. A file read as it
+/// goes is a streamed member.
+pub(crate) fn entries<T>(
+    budget: &mut Budget,
+    visit: Visit<T>,
+    prefix: &str,
+    run: impl FnOnce(
+        &mut Budget,
+        Emit<Result<T, LimitHit>>,
+    ) -> Result<Option<Result<T, LimitHit>>, LimitHit>,
+) -> Result<Option<T>, LimitHit> {
+    let under = |e: Entry| {
+        if prefix.is_empty() {
+            e
+        } else {
+            Entry {
+                name: format!("{prefix}/{}", e.name),
+                ..e
+            }
+        }
+    };
+    let mut emit = |found: Found<'_>, budget: &mut Budget| -> Option<Result<T, LimitHit>> {
+        match found {
+            Found::Held(e) => emit_entry(under(e), budget, &mut *visit).transpose(),
+            Found::Read(e, reader) => {
+                let e = under(e);
+                let meta = MemberMeta {
+                    name: e.name,
+                    comp_size: e.comp_size,
+                    size: Some(e.comp_size),
+                    mtime: e.mtime,
+                    mode: e.mode,
+                    ..MemberMeta::default()
+                };
+                emit_stream(&meta, reader, budget, &mut *visit).transpose()
+            }
+        }
+    };
+    run(budget, &mut emit)?.transpose()
+}
+
+/// Walk the filesystem `fs` that fills `[start, start + len)` of `disk`, each
+/// file's name under `prefix`.
+fn walk_fs<D: Read + Seek, T>(
+    fs: Fs,
+    disk: &mut D,
+    start: u64,
+    len: u64,
+    prefix: &str,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let window = Window::new(disk, start, len);
+    entries(budget, visit, prefix, |budget, sink| match fs {
+        #[cfg(feature = "ntfs")]
+        Fs::Ntfs => super::ntfs::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "fat")]
+        Fs::Fat => super::fat::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "ext")]
+        Fs::Ext => super::ext::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "exfat")]
+        Fs::Exfat => super::exfat::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "squashfs")]
+        Fs::Squashfs => super::squashfs::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "cramfs")]
+        Fs::Cramfs => super::cramfs::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "romfs")]
+        Fs::Romfs => super::romfs::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "erofs")]
+        Fs::Erofs => super::erofs::walk_volume(window, len, budget, sink),
+        #[cfg(feature = "dmg")]
+        Fs::Hfs => super::hfsplus::walk_volume(window, budget, sink),
+        #[cfg(feature = "dmg")]
+        Fs::Apfs => super::apfs::walk_volume(window, budget, sink),
+    })
+}
+
+/// Walk a disk image: the filesystem that starts it, or the volumes its
+/// partition table lists. A disk that is neither is reported: its bytes were
+/// not read.
+pub(crate) fn walk_disk<D: Read + Seek, T>(
+    disk: &mut D,
+    mode: Mode,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let len = disk
+        .seek(SeekFrom::End(0))
+        .map_err(|e| LimitHit::corrupt(format!("disk: {e}")))?;
+    let head = crate::read_at(disk, 0, HEAD)?;
+    if let Some(fs) = sniff(&head) {
+        return walk_fs(fs, disk, 0, len, "", budget, visit);
+    }
+    #[cfg(feature = "partition")]
+    {
+        let regions = super::partition::stream_offsets(disk)?;
+        if !regions.is_empty() {
+            return walk_regions(disk, regions, mode, budget, visit);
+        }
+        // A table with nothing in it holds nothing.
+        if super::partition::is_table(&head, len) {
+            return Ok(None);
+        }
+    }
+    let why = "the disk is larger than the buffer limit and is neither a filesystem nor a \
+               partition table exav reads, so its bytes were not examined";
+    report("<disk>", len, why, budget, visit)
+}
+
+/// Walk the volumes of a partitioned disk.
+pub(crate) fn walk_regions<D: Read + Seek, T>(
+    disk: &mut D,
+    regions: Vec<Region>,
+    mode: Mode,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let cap = budget.limits().max_buffer_bytes;
+    if mode == Mode::Virtual {
+        let first = regions
+            .iter()
+            .filter_map(|r| match r {
+                Region::Member(_, off, _) => Some(*off),
+                Region::Unwalked(..) => None,
+            })
+            .min();
+        let n = first.map_or(0, |f| f.min(BOOT_AREA).min(cap));
+        if let Some(n) = usize::try_from(n).ok().filter(|&n| n > 0) {
+            let boot = crate::read_at(disk, 0, n)?;
+            budget.count_entry()?;
+            let e = Entry::new("<boot-area>".to_string(), boot);
+            if let Some(t) = emit_entry(e, budget, &mut *visit)? {
+                return Ok(Some(t));
+            }
+        }
+    }
+    for region in regions {
+        let (name, off, len) = match region {
+            Region::Member(name, off, len) => (name, off, len),
+            // A part of the table that was not walked arrives as it always did.
+            Region::Unwalked(..) => {
+                if let Some(t) = crate::stream::stream_stored(disk, budget, &mut *visit, [region])?
+                {
+                    return Ok(Some(t));
+                }
+                continue;
+            }
+        };
+        let found = if len > cap {
+            let head = crate::read_at(&mut Window::new(disk, off, len), 0, HEAD)?;
+            match sniff(&head) {
+                Some(fs) => walk_fs(fs, disk, off, len, &name, budget, &mut *visit)?,
+                None if mode == Mode::Raw => stream_volume(disk, name, off, len, budget, visit)?,
+                None => {
+                    let why = "a volume larger than the buffer limit that is not a filesystem \
+                               exav reads in place, so its bytes were not examined";
+                    report(&name, len, why, budget, &mut *visit)?
+                }
+            }
+        } else {
+            stream_volume(disk, name, off, len, budget, &mut *visit)?
+        };
+        if found.is_some() {
+            return Ok(found);
+        }
+    }
+    Ok(None)
+}
+
+/// Hand the visitor the bytes of a volume as a stream.
+fn stream_volume<D: Read + Seek, T>(
+    disk: &mut D,
+    name: String,
+    off: u64,
+    len: u64,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    crate::stream::stream_stored(disk, budget, visit, [Region::Member(name, off, len)])
+}
diff --git a/crates/exav-unpack/src/formats/wim/mod.rs b/crates/exav-unpack/src/formats/wim/mod.rs
index a52c2a73..68c78d38 100644
--- a/crates/exav-unpack/src/formats/wim/mod.rs
+++ b/crates/exav-unpack/src/formats/wim/mod.rs
@@ -27,8 +27,13 @@
 #![deny(clippy::arithmetic_side_effects)]
 
 use std::collections::HashMap;
+use std::io::{self, Read};
 
-use crate::{Budget, Entry, LimitHit, Sink};
+use sha1::{Digest, Sha1};
+
+use crate::source::{ByteSource, Reader};
+use crate::stream::{MemberMeta, Visit, emit_entry, emit_stream};
+use crate::{Budget, Entry, LimitHit};
 
 /// One offset-table entry: a 24-byte resource header, then part number,
 /// reference count and the 20-byte SHA-1.
@@ -113,105 +118,250 @@ fn resource_header(data: &[u8], off: usize) -> Resource {
     }
 }
 
-fn sha1_of(data: &[u8]) -> [u8; HASH_LEN] {
-    use sha1::{Digest, Sha1};
-    let mut h = Sha1::new();
-    h.update(data);
-    let out = h.finalize();
-    let mut r = [0u8; HASH_LEN];
-    r.copy_from_slice(&out);
-    r
+/// The most a chunk may decode to. The codecs' windows go to 2 MiB; a header
+/// that names more is not a chunk size any image has.
+const MAX_CHUNK: u32 = 1 << 24;
+
+/// A resource's bytes, decoded a chunk at a time as they are read.
+struct ResourceReader<'a> {
+    src: &'a dyn ByteSource,
+    codec: Codec,
+    /// Where the chunks' bytes start in the image, and how many there are.
+    body: usize,
+    body_len: usize,
+    /// The start of chunks 1 to n-1 in the body, as the image gives them.
+    table: Vec<u8>,
+    wide: bool,
+    chunk: usize,
+    n_chunks: usize,
+    original: u64,
+    /// The next chunk to decode, and how many bytes have been decoded.
+    next: usize,
+    given: u64,
+    /// The chunk being served, and how much of it has been.
+    buf: Vec<u8>,
+    at: usize,
 }
 
-/// Decompress one resource. `Err` names a reason worth reporting; `Ok` bytes are
-/// not checked against the recorded hash here.
-fn read_resource(
-    data: &[u8],
+fn bad(why: &'static str) -> io::Error {
+    io::Error::new(io::ErrorKind::InvalidData, why)
+}
+
+impl ResourceReader<'_> {
+    /// Where chunk `i` starts in the body.
+    fn start(&self, i: usize) -> usize {
+        let entry = if self.wide { 8 } else { 4 };
+        let at = i.saturating_sub(1).saturating_mul(entry);
+        if i == 0 {
+            0
+        } else if self.wide {
+            crate::bytes::to_usize(le_u64(&self.table, at))
+        } else {
+            le_u32(&self.table, at) as usize
+        }
+    }
+
+    /// Decode the chunk that is next into `buf`.
+    fn decode(&mut self) -> io::Result<()> {
+        let i = self.next;
+        let s = self.start(i);
+        let e = if i.saturating_add(1) < self.n_chunks {
+            self.start(i.saturating_add(1))
+        } else {
+            self.body_len
+        };
+        if s > e || e > self.body_len {
+            return Err(bad("WIM chunk lies outside its resource"));
+        }
+        let want = crate::bytes::to_usize(
+            (self.chunk as u64).min(self.original.saturating_sub(self.given)),
+        );
+        // A chunk that did not compress is stored verbatim, and is then exactly
+        // as long as what it decodes to; only that much of it is read.
+        let stored = e.saturating_sub(s) >= want;
+        let len = if stored { want } else { e.saturating_sub(s) };
+        let cdata = self.src.window(self.body.saturating_add(s), len);
+        if cdata.len() != len {
+            return Err(bad("WIM chunk could not be read"));
+        }
+        self.buf = if stored {
+            cdata.into_owned()
+        } else {
+            match self.codec {
+                Codec::Xpress => xpress::decompress(&cdata, want).ok_or(bad("WIM XPRESS chunk"))?,
+                Codec::Lzx => lzx::decompress(&cdata, want).ok_or(bad("WIM LZX chunk"))?,
+                // An uncompressed image should have had the flag clear; if a
+                // resource claims compression anyway there is nothing to
+                // decode it with.
+                Codec::None | Codec::Lzms => return Err(bad("WIM resource names no chunk codec")),
+            }
+        };
+        self.at = 0;
+        self.next = i.saturating_add(1);
+        self.given = self.given.saturating_add(self.buf.len() as u64);
+        Ok(())
+    }
+}
+
+impl Read for ResourceReader<'_> {
+    fn read(&mut self, out: &mut [u8]) -> io::Result<usize> {
+        loop {
+            if let Some(rest) = self.buf.get(self.at..).filter(|r| !r.is_empty()) {
+                let n = rest.len().min(out.len());
+                out[..n].copy_from_slice(&rest[..n]);
+                self.at = self.at.saturating_add(n);
+                return Ok(n);
+            }
+            if self.next >= self.n_chunks || self.given >= self.original {
+                return Ok(0);
+            }
+            self.decode()?;
+        }
+    }
+}
+
+/// A reader of resource `res`'s bytes. `Err` names a reason worth reporting;
+/// the bytes are not checked against the recorded hash here.
+fn open_resource<'a>(
+    src: &'a dyn ByteSource,
     res: &Resource,
     codec: Codec,
     chunk_size: u32,
-    budget: &mut Budget,
-) -> Result<Vec<u8>, &'static str> {
-    let start = crate::bytes::to_usize(res.offset);
-    let raw = crate::bytes::at(data, start, crate::bytes::to_usize(res.size_in_wim))
-        .ok_or("WIM resource lies outside the image")?;
+    max_buffer: u64,
+) -> Result<Box<dyn Read + 'a>, &'static str> {
+    let outside = "WIM resource lies outside the image";
+    let start = usize::try_from(res.offset).map_err(|_| outside)?;
+    let len = usize::try_from(res.size_in_wim).map_err(|_| outside)?;
+    let end = start.checked_add(len).filter(|&e| e <= src.len());
+    let Some(end) = end else {
+        return Err(outside);
+    };
 
     if res.flags & RESOURCE_COMPRESSED == 0 {
-        return Ok(raw.to_vec());
+        return Ok(Box::new(Reader::range(src, start, end)));
     }
     if codec == Codec::Lzms {
         return Err("WIM LZMS-compressed resource");
     }
-    let cap = budget.limits.max_buffer_bytes;
-    if res.original_size > cap {
-        return Err("WIM resource exceeds max-buffer");
+    let chunk = chunk_size.max(1);
+    if chunk > MAX_CHUNK {
+        return Err("WIM chunk size is larger than any codec's window");
     }
-    let original = crate::bytes::to_usize(res.original_size);
-    let chunk = chunk_size.max(1) as usize;
-    let n_chunks = original.div_ceil(chunk).max(1);
+    let chunk = chunk as usize;
+    let original = res.original_size;
+    let n_chunks = crate::bytes::to_usize(original.div_ceil(chunk as u64)).max(1);
 
     // The chunk table gives the start of chunks 1..n-1 relative to the end of
     // the table; chunk 0 always starts there. Entries are u32 unless the
     // uncompressed resource is over 4 GiB.
-    let wide = res.original_size > u32::MAX as u64;
+    let wide = original > u64::from(u32::MAX);
     let entry = if wide { 8 } else { 4 };
     let table_len = n_chunks.saturating_sub(1).saturating_mul(entry);
-    let table = raw.get(..table_len).ok_or("WIM chunk table is truncated")?;
-    let body = &raw[table_len..];
+    if table_len > len {
+        return Err("WIM chunk table is truncated");
+    }
+    if table_len as u64 > max_buffer {
+        return Err("WIM chunk table exceeds max-buffer");
+    }
+    let table = src.window(start, table_len);
+    if table.len() != table_len {
+        return Err("WIM chunk table is truncated");
+    }
+    Ok(Box::new(ResourceReader {
+        src,
+        codec,
+        body: start.saturating_add(table_len),
+        body_len: len.saturating_sub(table_len),
+        table: table.into_owned(),
+        wide,
+        chunk,
+        n_chunks,
+        original,
+        next: 0,
+        given: 0,
+        buf: Vec::new(),
+        at: 0,
+    }))
+}
 
-    let chunk_start = |i: usize| -> usize {
-        let at = i.saturating_sub(1).saturating_mul(entry);
-        if i == 0 {
-            0
-        } else if wide {
-            crate::bytes::to_usize(le_u64(table, at))
-        } else {
-            le_u32(table, at) as usize
-        }
+/// Resource `res` read whole, up to `max_buffer` bytes.
+fn read_resource(
+    src: &dyn ByteSource,
+    res: &Resource,
+    codec: Codec,
+    chunk_size: u32,
+    max_buffer: u64,
+) -> Result<Vec<u8>, &'static str> {
+    let compressed = res.flags & RESOURCE_COMPRESSED != 0;
+    let size = if compressed {
+        res.original_size
+    } else {
+        res.size_in_wim
     };
+    if size > max_buffer {
+        return Err("WIM resource exceeds max-buffer");
+    }
+    let mut reader = open_resource(src, res, codec, chunk_size, max_buffer)?;
+    let mut out = Vec::new();
+    reader
+        .by_ref()
+        .take(size.saturating_add(1))
+        .read_to_end(&mut out)
+        .map_err(|_| "WIM resource did not decode")?;
+    Ok(out)
+}
 
-    let mut out = Vec::with_capacity(original);
-    for i in 0..n_chunks {
-        let s = chunk_start(i);
-        let e = if i.saturating_add(1) < n_chunks {
-            chunk_start(i.saturating_add(1))
-        } else {
-            body.len()
-        };
-        let Some(cdata) = body.get(s..e.max(s)) else {
-            return Err("WIM chunk lies outside its resource");
-        };
-        let want = chunk.min(original.saturating_sub(out.len()));
-        // A chunk that did not compress is stored verbatim, and is then exactly
-        // as long as what it decodes to.
-        if cdata.len() >= want {
-            out.extend_from_slice(&cdata[..want]);
-            continue;
+/// A resource's bytes, hashed as they are read: at the end they are the
+/// resource the image recorded, or they are not.
+struct Checked<'a> {
+    inner: Box<dyn Read + 'a>,
+    hasher: Sha1,
+    expected: [u8; HASH_LEN],
+}
+
+impl Read for Checked<'_> {
+    fn read(&mut self, out: &mut [u8]) -> io::Result<usize> {
+        let n = self.inner.read(out)?;
+        if n > 0 {
+            self.hasher.update(&out[..n]);
+        } else if !out.is_empty() && self.hasher.clone().finalize().as_slice() != self.expected {
+            return Err(crate::checksum_mismatch("WIM SHA-1"));
         }
-        let decoded = match codec {
-            Codec::Xpress => xpress::decompress(cdata, want).ok_or("WIM XPRESS chunk")?,
-            Codec::Lzx => lzx::decompress(cdata, want).ok_or("WIM LZX chunk")?,
-            // An uncompressed image should have had the flag clear; if a
-            // resource claims compression anyway there is nothing to decode it
-            // with.
-            Codec::None | Codec::Lzms => return Err("WIM resource names no chunk codec"),
-        };
-        out.extend_from_slice(&decoded);
+        Ok(n)
     }
-    out.truncate(original);
-    Ok(out)
 }
 
 mod lzx;
 
-pub(crate) fn extract_wim<R>(
-    data: &[u8],
+/// A member that is only a report.
+fn report<T>(
+    name: String,
+    size: u64,
+    reason: &'static str,
     budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    emit_entry(Entry::unsupported(name, size, false, reason), budget, visit)
+}
+
+/// How much of the image is read to tell it is one and to read its header.
+const HEADER_READ: usize = 256;
+
+/// Walk a WIM image. Its header, its table of resources and its directory
+/// tree are read from where they are in the source; each file resource is then
+/// decoded a chunk at a time as it is read, so neither the image nor a
+/// resource is held.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
+    budget: &mut Budget,
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let head = src.window(0, HEADER_READ);
+    let data: &[u8] = &head;
     if !crate::formats::sniff::is(data, crate::Format::Wim) {
         return Ok(None);
     }
+    let max_buffer = budget.limits.max_buffer_bytes;
     let flags = le_u32(data, 16);
     let codec = if flags & FLAG_COMPRESS_LZMS != 0 {
         Codec::Lzms
@@ -229,44 +379,45 @@ pub(crate) fn extract_wim<R>(
 
     // The offset table is itself a resource.
     let table_res = resource_header(data, 48);
-    let Some(table) = crate::bytes::at(
-        data,
-        crate::bytes::to_usize(table_res.offset),
-        crate::bytes::to_usize(table_res.size_in_wim),
-    ) else {
+    let table_at = usize::try_from(table_res.offset).ok();
+    let table_len = usize::try_from(table_res.size_in_wim).ok();
+    let inside = table_at
+        .zip(table_len)
+        .filter(|(at, len)| at.checked_add(*len).is_some_and(|end| end <= src.len()));
+    let Some((table_at, table_len)) = inside else {
         budget.count_entry()?;
-        return Ok(visit(
-            Entry::unsupported(
-                "<wim-offset-table>".to_string(),
-                0,
-                false,
-                "WIM offset table lies outside the image",
-            ),
+        return report(
+            "<wim-offset-table>".to_string(),
+            0,
+            "WIM offset table lies outside the image",
             budget,
-        ));
+            visit,
+        );
     };
+    let listed = table_len.checked_div(TABLE_ENTRY_LEN).unwrap_or(0);
+    let table = src.window(
+        table_at,
+        listed.min(MAX_RESOURCES).saturating_mul(TABLE_ENTRY_LEN),
+    );
 
     let mut resources: Vec<Resource> = Vec::new();
-    let listed = table.len().checked_div(TABLE_ENTRY_LEN).unwrap_or(0);
     for i in 0..listed.min(MAX_RESOURCES) {
         let o = i.saturating_mul(TABLE_ENTRY_LEN);
-        let mut r = resource_header(table, o);
-        if let Some(h) = crate::bytes::at(table, o.saturating_add(30), HASH_LEN) {
+        let mut r = resource_header(&table, o);
+        if let Some(h) = crate::bytes::at(&table, o.saturating_add(30), HASH_LEN) {
             r.hash.copy_from_slice(h);
         }
         resources.push(r);
     }
     if listed > MAX_RESOURCES {
         budget.count_entry()?;
-        if let Some(r) = visit(
-            Entry::unsupported(
-                format!("<wim-resources-beyond-{MAX_RESOURCES}>"),
-                0,
-                false,
-                "too many WIM resources to enumerate them all",
-            ),
+        if let Some(r) = report(
+            format!("<wim-resources-beyond-{MAX_RESOURCES}>"),
+            0,
+            "too many WIM resources to enumerate them all",
             budget,
-        ) {
+            &mut *visit,
+        )? {
             return Ok(Some(r));
         }
     }
@@ -279,7 +430,7 @@ pub(crate) fn extract_wim<R>(
         .iter()
         .filter(|r| r.flags & RESOURCE_METADATA != 0)
     {
-        if let Ok(meta) = read_resource(data, res, codec, chunk_size, budget) {
+        if let Ok(meta) = read_resource(src, res, codec, chunk_size, max_buffer) {
             collect_names(&meta, &mut names);
         }
     }
@@ -297,57 +448,52 @@ pub(crate) fn extract_wim<R>(
             // The rest of this resource is in another part of the image set,
             // which exav is not scanning.
             budget.count_entry()?;
-            if let Some(r) = visit(
-                Entry::unsupported(
-                    name,
-                    res.size_in_wim,
-                    false,
-                    "WIM resource continues in another part of a spanned image",
-                ),
+            if let Some(r) = report(
+                name,
+                res.size_in_wim,
+                "WIM resource continues in another part of a spanned image",
                 budget,
-            ) {
+                &mut *visit,
+            )? {
                 return Ok(Some(r));
             }
             continue;
         }
 
         budget.count_entry()?;
-        let decoded = read_resource(data, res, codec, chunk_size, budget);
-        let bytes = match decoded {
-            // Decoded in full. A SHA-1 mismatch after that hides nothing: the
-            // bytes are scanned, as a ZIP member's are, and reported only when
-            // checksums are verified.
-            Ok(b) if !budget.should_verify_checksums() || sha1_of(&b) == res.hash => b,
-            Ok(_) => {
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        name,
-                        res.size_in_wim,
-                        false,
-                        "WIM resource did not match its recorded SHA-1 after decoding",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
-                }
-                continue;
-            }
+        let opened = open_resource(src, res, codec, chunk_size, max_buffer);
+        let reader = match opened {
+            Ok(r) => r,
             Err(reason) => {
-                if let Some(r) = visit(
-                    Entry::unsupported(name, res.size_in_wim, false, reason),
-                    budget,
-                ) {
+                if let Some(r) = report(name, res.size_in_wim, reason, budget, &mut *visit)? {
                     return Ok(Some(r));
                 }
                 continue;
             }
         };
-        let cap = budget.reserve()?;
-        if bytes.len() as u64 > cap {
-            return Err(LimitHit::new(format!("wim member '{name}' exceeds budget")));
-        }
-        budget.commit(bytes.len() as u64);
-        if let Some(r) = visit(Entry::new(name, bytes), budget) {
+        // A SHA-1 mismatch once the resource has decoded hides nothing: the
+        // bytes are scanned, as a ZIP member's are, and it is an error at the
+        // end of the member only when checksums are verified.
+        let mut reader: Box<dyn Read + '_> = if budget.should_verify_checksums() {
+            Box::new(Checked {
+                inner: reader,
+                hasher: Sha1::new(),
+                expected: res.hash,
+            })
+        } else {
+            reader
+        };
+        let meta = MemberMeta {
+            name,
+            comp_size: res.size_in_wim,
+            size: Some(if res.flags & RESOURCE_COMPRESSED == 0 {
+                res.size_in_wim
+            } else {
+                res.original_size
+            }),
+            ..MemberMeta::default()
+        };
+        if let Some(r) = emit_stream(&meta, &mut *reader, budget, &mut *visit)? {
             return Ok(Some(r));
         }
     }
diff --git a/crates/exav-unpack/src/formats/xar.rs b/crates/exav-unpack/src/formats/xar.rs
index 6daf1cd5..4cce9141 100644
--- a/crates/exav-unpack/src/formats/xar.rs
+++ b/crates/exav-unpack/src/formats/xar.rs
@@ -4,125 +4,119 @@
 //! Layout: a 28-byte header, a zlib-compressed XML table of contents, then the
 //! file heap. The TOC describes each file's data block as an offset/length into
 //! the heap plus an encoding (commonly gzip/zlib). We parse the header, inflate
-//! the TOC, and pull each data block out of the heap (inflating zlib-encoded
-//! blocks), emitting members for the engine to recurse into. The TOC XML is
+//! the TOC, and read each data block from the heap where it is (inflating
+//! zlib-encoded blocks as they are read), emitting members for the engine to
+//! recurse into. Neither the archive nor a member is held. The TOC XML is
 //! scanned with a small targeted parser rather than a full XML dependency.
 
-use crate::*;
+use crate::source::{ByteSource, Reader};
+use crate::stream::{MemberMeta, Visit, emit_entry, emit_stream};
+use crate::{Budget, Entry, LimitHit};
 use flate2::read::ZlibDecoder;
-use std::io::Read;
+use std::io::{BufReader, Read};
 
 const MAGIC: &[u8] = b"xar!";
 
+/// How much of what is read from the source for a member is buffered.
+const BUFFER: usize = 64 * 1024;
+
+/// The most the table of contents inflates to.
+const TOC_CAP: u64 = 64 * 1024 * 1024;
+
 fn be_u16(d: &[u8], p: usize) -> u64 {
-    u16::from_be_bytes([d[p], d[p + 1]]) as u64
+    crate::bytes::at(d, p, 2)
+        .map(|b| u64::from(u16::from_be_bytes([b[0], b[1]])))
+        .unwrap_or(0)
 }
+
 fn be_u64(d: &[u8], p: usize) -> u64 {
-    u64::from_be_bytes([
-        d[p],
-        d[p + 1],
-        d[p + 2],
-        d[p + 3],
-        d[p + 4],
-        d[p + 5],
-        d[p + 6],
-        d[p + 7],
-    ])
+    crate::bytes::at(d, p, 8)
+        .and_then(|b| <[u8; 8]>::try_from(b).ok())
+        .map(u64::from_be_bytes)
+        .unwrap_or(0)
 }
 
-pub(crate) fn extract_xar<R>(
-    data: &[u8],
+/// Walk a XAR archive. The table of contents is read from the front of the
+/// source and each member from its place in the heap.
+pub(crate) fn walk<T>(
+    src: &dyn ByteSource,
     budget: &mut Budget,
-    visit: Sink<R>,
-) -> Result<Option<R>, LimitHit> {
-    if data.len() < 28 || !data.starts_with(MAGIC) {
-        return Err(LimitHit::new("xar: bad magic".to_string()));
+    visit: Visit<T>,
+) -> Result<Option<T>, LimitHit> {
+    let head = src.window(0, 28);
+    if head.len() < 28 || !head.starts_with(MAGIC) {
+        return Err(LimitHit::corrupt("xar: bad magic".to_string()));
     }
-    let header_size = be_u16(data, 4) as usize;
-    let toc_comp = be_u64(data, 8) as usize;
-    let toc_uncomp = be_u64(data, 16) as usize;
+    let len = src.len();
+    let header_size = crate::bytes::to_usize(be_u16(&head, 4));
+    let toc_comp = crate::bytes::to_usize(be_u64(&head, 8));
+    let toc_uncomp = be_u64(&head, 16);
     let toc_start = header_size;
     let toc_end = toc_start.saturating_add(toc_comp);
-    if toc_end > data.len() {
-        return Err(LimitHit::new("xar: truncated TOC".to_string()));
+    if toc_end > len {
+        return Err(LimitHit::corrupt("xar: truncated TOC".to_string()));
     }
     let heap_start = toc_end;
 
     // Inflate the TOC (bounded by its declared uncompressed size, capped).
-    let toc_cap = toc_uncomp.min(64 * 1024 * 1024);
     let mut toc = Vec::new();
-    ZlibDecoder::new(&data[toc_start..toc_end])
-        .take(toc_cap as u64)
-        .read_to_end(&mut toc)
-        .map_err(|e| LimitHit::new(format!("xar: TOC inflate: {e}")))?;
+    ZlibDecoder::new(BufReader::with_capacity(
+        BUFFER,
+        Reader::range(src, toc_start, toc_end),
+    ))
+    .take(toc_uncomp.min(TOC_CAP))
+    .read_to_end(&mut toc)
+    .map_err(|e| LimitHit::new(format!("xar: TOC inflate: {e}")))?;
     let toc = String::from_utf8_lossy(&toc);
 
     for (name, blk) in iter_data_blocks(&toc) {
         let off = heap_start.saturating_add(blk.offset);
-        let end = off.saturating_add(blk.length).min(data.len());
+        let end = off.saturating_add(blk.length).min(len);
         // A zero-length block has nothing to scan; a block starting past EOF, or
         // one the bound above clamped short, is truncated — the declared bytes
         // are absent from this file rather than hidden in it, so what exists is
         // scanned and a clean result is honest. See docs/QUIRKS.md.
-        if off >= data.len() || blk.length == 0 {
+        if off >= len || blk.length == 0 {
             continue;
         }
-        let raw = &data[off..end];
 
         budget.count_entry()?;
-        let cap = budget.reserve()?;
-        let mut why = None;
-        let member = if blk.gzip {
-            // Heap data is zlib-wrapped; inflate bounded by the declared size.
-            let want = blk.size.min(cap as usize) as u64;
-            let rest_absent = off.saturating_add(blk.length) > data.len();
-            let s = match crate::inflate::zlib_reader(raw) {
-                Ok(Some(z)) => Some(crate::salvage(z.take(want + 1), cap)),
+        let raw = BufReader::with_capacity(BUFFER, Reader::range(src, off, end));
+        let meta = MemberMeta {
+            name: name.clone(),
+            comp_size: end.saturating_sub(off) as u64,
+            size: Some(blk.size as u64),
+            ..MemberMeta::default()
+        };
+        let found = if blk.gzip {
+            // Heap data is zlib-wrapped.
+            match crate::inflate::zlib_reader(raw) {
+                Ok(Some(mut z)) => emit_stream(&meta, &mut z, budget, &mut *visit)?,
                 // Cut inside the zlib header: no byte of the stream is here.
-                Err(_) if rest_absent => Some(crate::Salvaged {
-                    data: Vec::new(),
-                    over_cap: false,
-                    undecoded: false,
-                    cut_short: true,
-                }),
-                _ => None,
-            };
-            let Some(s) = s.filter(|s| !(s.undecoded && s.data.is_empty())) else {
-                // The TOC names this member and its bytes are in the heap; the
-                // stream just would not inflate. Dropping it would leave a file
-                // the archive contains with no trace in the result.
-                if let Some(r) = visit(
-                    Entry::unsupported(
-                        name,
-                        blk.size as u64,
-                        false,
-                        "XAR member would not inflate",
-                    ),
-                    budget,
-                ) {
-                    return Ok(Some(r));
+                Err(_) if off.saturating_add(blk.length) > len => {
+                    emit_stream(&meta, &mut std::io::empty(), budget, &mut *visit)?
+                }
+                _ => {
+                    // The TOC names this member and its bytes are in the heap;
+                    // the stream just would not inflate. Dropping it would leave
+                    // a file the archive contains with no trace in the result.
+                    emit_entry(
+                        Entry::unsupported(
+                            name,
+                            blk.size as u64,
+                            false,
+                            "XAR member would not inflate",
+                        ),
+                        budget,
+                        &mut *visit,
+                    )?
                 }
-                continue;
-            };
-            if s.over_cap {
-                return Err(LimitHit::new(format!("xar member '{name}' exceeds budget")));
             }
-            why = s.part_way(rest_absent).then_some(
-                "XAR member failed to inflate part way; the bytes before the failure were scanned",
-            );
-            s.data
         } else {
-            if raw.len() as u64 > cap {
-                return Err(LimitHit::new(format!("xar member '{name}' exceeds budget")));
-            }
-            raw.to_vec()
+            let mut raw = raw;
+            emit_stream(&meta, &mut raw, budget, &mut *visit)?
         };
-        budget.commit(member.len() as u64);
-        let entry = Entry {
-            unsupported: why,
-            ..Entry::new(name, member)
-        };
-        if let Some(r) = visit(entry, budget) {
+        if let Some(r) = found {
             return Ok(Some(r));
         }
     }
@@ -192,7 +186,8 @@ fn inner_text(hay: &str, tag: &str) -> Option<String> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use flate2::{write::ZlibEncoder, Compression};
+    use crate::{Format, Limits, Member, extract};
+    use flate2::{Compression, write::ZlibEncoder};
     use std::io::Write;
 
     fn zlib(data: &[u8]) -> Vec<u8> {
@@ -201,17 +196,28 @@ mod tests {
         e.finish().unwrap()
     }
 
-    #[test]
-    fn extracts_one_gzip_member() {
-        let payload = b"EICAR-ish payload bytes";
-        let heap = zlib(payload);
-        let toc_xml = format!(
-            "<xar><toc><file><name>evil.sh</name><data><offset>0</offset>\
-             <length>{}</length><size>{}</size>\
-             <encoding style=\"application/x-gzip\"/></data></file></toc></xar>",
-            heap.len(),
-            payload.len()
-        );
+    /// An archive of `members`: name, bytes, and whether they are stored
+    /// zlib-compressed in the heap.
+    fn archive(members: &[(&str, &[u8], bool)]) -> Vec<u8> {
+        let mut heap = Vec::new();
+        let mut files = String::new();
+        for (name, data, deflate) in members {
+            let stored = if *deflate { zlib(data) } else { data.to_vec() };
+            let style = if *deflate {
+                "application/x-gzip"
+            } else {
+                "application/octet-stream"
+            };
+            files.push_str(&format!(
+                "<file><name>{name}</name><data><offset>{}</offset><length>{}</length>\
+                 <size>{}</size><encoding style=\"{style}\"/></data></file>",
+                heap.len(),
+                stored.len(),
+                data.len()
+            ));
+            heap.extend_from_slice(&stored);
+        }
+        let toc_xml = format!("<xar><toc>{files}</toc></xar>");
         let toc_comp = zlib(toc_xml.as_bytes());
         let mut buf = Vec::new();
         buf.extend_from_slice(MAGIC);
@@ -222,11 +228,76 @@ mod tests {
         buf.extend_from_slice(&1u32.to_be_bytes()); // cksum alg
         buf.extend_from_slice(&toc_comp);
         buf.extend_from_slice(&heap);
+        buf
+    }
 
+    #[test]
+    fn extracts_one_gzip_member() {
+        let payload = b"EICAR-ish payload bytes";
+        let buf = archive(&[("evil.sh", payload, true)]);
         let mut budget = Budget::new(Limits::default());
         let entries = extract(Format::Xar, &buf, &mut budget).unwrap();
         assert_eq!(entries.len(), 1);
         assert_eq!(entries[0].name, "evil.sh");
         assert_eq!(entries[0].data, payload);
     }
+
+    /// What `walk` gives of `buf` read from a source that is not in memory,
+    /// under a buffer limit of `cap`: each member's name, bytes and whether
+    /// it was read as it goes.
+    fn off_a_source(buf: &[u8], cap: u64) -> Vec<(String, Vec<u8>, bool)> {
+        let cache =
+            crate::source::BlockCache::with_sizes(std::io::Cursor::new(buf.to_vec()), 64, 4 * 64)
+                .unwrap();
+        let mut budget = Budget::new(Limits {
+            max_buffer_bytes: cap,
+            ..Limits::default()
+        });
+        let mut out = Vec::new();
+        crate::walk(Format::Xar, &cache, &mut budget, &mut |meta, content, _| {
+            let (data, streamed) = match content {
+                None => (Vec::new(), false),
+                Some(Member::Bytes(b)) => (b, false),
+                Some(Member::Stream(r)) => {
+                    let mut b = Vec::new();
+                    r.read_to_end(&mut b).unwrap();
+                    (b, true)
+                }
+            };
+            assert!(meta.unsupported.is_none(), "{}", meta.name);
+            out.push((meta.name.clone(), data, streamed));
+            None::<()>
+        })
+        .unwrap();
+        out
+    }
+
+    #[test]
+    fn members_are_read_as_they_go_from_a_source_that_is_not_in_memory() {
+        let big: Vec<u8> = (0..70_000u32).map(|i| (i * 31 % 251) as u8).collect();
+        let buf = archive(&[
+            ("deflated.bin", &big, true),
+            ("stored.bin", &big, false),
+            ("small.txt", b"small", true),
+        ]);
+        let got = off_a_source(&buf, 100);
+        assert_eq!(
+            got,
+            [
+                ("deflated.bin".to_string(), big.clone(), true),
+                ("stored.bin".to_string(), big, true),
+                ("small.txt".to_string(), b"small".to_vec(), true),
+            ]
+        );
+    }
+
+    #[test]
+    fn a_member_cut_short_by_the_end_of_the_archive_comes_out_as_far_as_it_goes() {
+        let big: Vec<u8> = (0..70_000u32).map(|i| (i * 31 % 251) as u8).collect();
+        let mut buf = archive(&[("stored.bin", &big, false)]);
+        buf.truncate(buf.len() - 1000);
+        let got = off_a_source(&buf, 100);
+        assert_eq!(got.len(), 1);
+        assert_eq!(got[0].1, big[..big.len() - 1000]);
+    }
 }
diff --git a/crates/exav-unpack/src/formats/xlm.rs b/crates/exav-unpack/src/formats/xlm.rs
index 03a35db1..182af38c 100644
--- a/crates/exav-unpack/src/formats/xlm.rs
+++ b/crates/exav-unpack/src/formats/xlm.rs
@@ -1,33 +1,29 @@
 //! Excel 4.0 (XLM) macro surfacing from an OLE2 `Workbook`/`Book` BIFF stream.
 //!
-//! XLM macros predate VBA: the macro lives in cells of a dedicated *macro sheet*
-//! rather than a VBA project, so they slip past VBA-only macro detection. A
-//! `BOUNDSHEET` record (`0x0085`) with sheet-type `1` marks an Excel 4.0 macro
-//! sheet; the macro formulas live in `FORMULA` records whose string constants
-//! (URLs, `EXEC`/`CALL` arguments, alert text) are stored as `ptgStr` tokens.
+//! XLM macros predate VBA: the macro lives in cells of a dedicated *macro
+//! sheet* rather than a VBA project, so they slip past VBA-only macro
+//! detection. A `BOUNDSHEET` record with sheet type `1` marks an Excel 4.0
+//! macro sheet; the macro formulas live in `FORMULA` and `ARRAY` records as
+//! `ptg` tokens, where the built-in functions (`EXEC`, `CALL`, `ALERT`, ...)
+//! are numbers, invisible to a scan of the file's bytes.
 //!
-//! We walk the BIFF record stream, detect any macro sheet, and — when present —
-//! surface a synthetic `xlm_macro` artifact carrying the macro-sheet names, the
-//! recovered string constants, and each macro formula's tokens decoded from the
-//! `ptg` stream, including the **built-in function names** (`EXEC`/`CALL`/
-//! `ALERT`/…) which are stored as numeric ids and so are *invisible to a raw
-//! byte scan*. So the engine's `Target:2`/`Doc.*` signatures match the real
-//! function calls and `--alert-macros` fires for XLM the same way it does for
-//! VBA. Every read is bounds-checked; a malformed stream yields `None`, never a
-//! panic.
-//!
-//! The formula tokens are emitted in postfix (RPN) order — full infix
-//! reconstruction with operator precedence and cell-reference formatting is a
-//! follow-up, but every IOC-bearing token (function name, string, number) is
-//! recovered, and the raw `Workbook` stream is scanned regardless.
+//! We read the stream with the BIFF reader exav-render converts workbooks
+//! with, and when a macro sheet is present surface a synthetic `xlm_macro`
+//! artifact: the macro-sheet names, the defined names with what they refer to,
+//! the text cells, and each formula as Excel shows it (`=EXEC("calc.exe")`),
+//! so the engine's `Target:2` and `Doc.*` signatures match the function calls
+//! and `--alert-macros` fires for XLM as it does for VBA. A formula the reader
+//! refuses still gives the calls and constants it read before the token it
+//! could not. Every read is bounds-checked; a malformed stream yields `None`,
+//! never a panic.
+
+use super::biff::{self, Book, formula};
+use crate::bytes::{Cur, u16_at};
 
-/// BIFF record types we care about.
-const R_BOF: u16 = 0x0809;
-const R_BOUNDSHEET: u16 = 0x0085;
 const R_FORMULA: u16 = 0x0006;
 const R_LABEL: u16 = 0x0204;
-const R_NAME: u16 = 0x0018;
 const R_ARRAY: u16 = 0x0221;
+const R_EOF: u16 = 0x000A;
 
 /// Sheet-type (`dt`) byte in a `BOUNDSHEET` record marking an Excel 4.0 macro sheet.
 const DT_EXCEL4_MACRO: u8 = 1;
@@ -35,270 +31,90 @@ const DT_EXCEL4_MACRO: u8 = 1;
 /// Total surfaced-string budget (defensive; the artifact only needs the IOCs).
 const MAX_XLM_ARTIFACT: usize = 512 * 1024;
 
-#[inline]
-fn u16le(d: &[u8], p: usize) -> Option<u16> {
-    Some(u16::from_le_bytes([*d.get(p)?, *d.get(p + 1)?]))
-}
-
-/// Read a `ShortXLUnicodeString` (`cch:u8`, `grbit:u8`, chars) → `String`.
-/// `grbit` bit 0 (`fHighByte`) selects 16-bit UTF-16 vs 8-bit compressed chars.
-fn read_short_string(d: &[u8]) -> Option<String> {
-    let cch = *d.first()? as usize;
-    let grbit = *d.get(1)?;
-    let chars = d.get(2..)?;
-    if grbit & 1 == 0 {
-        // 8-bit compressed: each byte is the low half of a UTF-16 unit.
-        let n = cch.min(chars.len());
-        Some(chars[..n].iter().map(|&b| b as char).collect())
-    } else {
-        let n = cch.min(chars.len() / 2);
-        let units: Vec<u16> = (0..n)
-            .map(|i| u16::from_le_bytes([chars[i * 2], chars[i * 2 + 1]]))
-            .collect();
-        Some(String::from_utf16_lossy(&units))
-    }
-}
-
 /// True if `s` is worth surfacing: non-trivial length and mostly printable.
 fn is_useful(s: &str) -> bool {
     let t = s.trim();
     t.len() >= 3 && t.chars().filter(|c| !c.is_control()).count() * 4 >= t.chars().count() * 3
 }
 
-/// Look up a BIFF/XLM built-in function name by its `ptgFunc`/`ptgFuncVar` id.
-fn func_name(id: u16) -> Option<&'static str> {
-    let t = &super::xlm_functions::XLM_FUNCTIONS;
-    t.binary_search_by_key(&id, |&(k, _)| k)
-        .ok()
-        .map(|i| t[i].1)
-        .or_else(|| {
-            // Command-equivalent (macro) functions carry the 0x8000 bit; try both.
-            t.binary_search_by_key(&(id ^ 0x8000), |&(k, _)| k)
-                .ok()
-                .map(|i| t[i].1)
-        })
-}
-
-/// Read a `ptgStr` string (`cch:u8`, `grbit:u8`, chars) at `rgce[i+1..]`,
-/// returning `(text, bytes_consumed_after_the_token_byte)`.
-fn read_ptgstr(rgce: &[u8], i: usize) -> Option<(String, usize)> {
-    let cch = *rgce.get(i)? as usize;
-    let high = rgce.get(i + 1)? & 1 == 1;
-    let nbytes = if high { cch * 2 } else { cch };
-    let chars = crate::bytes::at(rgce, i + 2, nbytes)?;
-    let s = if high {
-        let units: Vec<u16> = chars
-            .as_chunks::<2>()
-            .0
-            .iter()
-            .copied()
-            .map(u16::from_le_bytes)
-            .collect();
-        String::from_utf16_lossy(&units)
-    } else {
-        chars.iter().map(|&b| b as char).collect()
-    };
-    Some((s, 2 + nbytes))
-}
-
-/// Walk a `FORMULA`/`ARRAY` `rgce` token array, emitting the IOC-bearing tokens
-/// — built-in **function names** (`EXEC`/`CALL`/`ALERT`/…, invisible to a raw
-/// byte scan because they're stored as numeric ids), **string constants**, and
-/// numeric literals — as a single reconstructed formula line. Fully
-/// bounds-checked; an unknown/complex token (`ptgArray`, `ptgMemArea`, …) ends
-/// the walk cleanly (partial line kept). `ptg` class bits (value/ref/array,
-/// `0x20`/`0x40`/`0x60`) are normalised to the base type.
-fn parse_formula(rgce: &[u8], out: &mut Vec<String>) {
-    let mut items: Vec<String> = Vec::new();
-    let mut i = 0usize;
-    let mut guard = 0usize;
-    while i < rgce.len() {
-        guard += 1;
-        if guard > 100_000 || items.len() > 4096 {
-            break;
-        }
-        let tok = rgce[i];
-        let base = if tok >= 0x20 {
-            0x20 | (tok & 0x1f)
-        } else {
-            tok
-        };
-        i += 1;
-        // Operand byte-lengths for the tokens we walk through; `None` = special.
-        let fixed: Option<usize> = match base {
-            0x01 | 0x02 => Some(4),        // ptgExp / ptgTbl
-            0x03..=0x16 => Some(0),        // binary/unary operators, paren, missarg
-            0x1c | 0x1d => Some(1),        // ptgErr / ptgBool
-            0x1e => Some(2),               // ptgInt
-            0x1f => Some(8),               // ptgNum
-            0x23 => Some(4),               // ptgName (BIFF8)
-            0x24 | 0x2a | 0x2c => Some(4), // ptgRef / ptgRefErr / ptgRefN
-            0x25 | 0x2b | 0x2d => Some(8), // ptgArea / ptgAreaErr / ptgAreaN
-            0x39 | 0x3a | 0x3c => Some(6), // ptgNameX / ptgRef3d / ptgRefErr3d
-            0x3b | 0x3d => Some(10),       // ptgArea3d / ptgAreaErr3d
-            _ => None,
-        };
-        if let Some(n) = fixed {
-            if base == 0x1e {
-                if let Some(b) = crate::bytes::at(rgce, i, 2) {
-                    items.push(u16::from_le_bytes([b[0], b[1]]).to_string());
-                }
-            }
-            i += n;
-            continue;
-        }
-        match base {
-            0x17 => match read_ptgstr(rgce, i) {
-                Some((s, consumed)) => {
-                    items.push(format!("\"{}\"", s.replace('"', "\"\"")));
-                    i += consumed;
-                }
-                None => break,
-            },
-            0x19 => {
-                // ptgAttr: grbit + 2 bytes; a `bAttrChoose` jump table is complex.
-                match rgce.get(i) {
-                    Some(&g) if g & 0x04 == 0 => i += 3,
-                    _ => break,
-                }
-            }
-            0x21 => {
-                // ptgFunc: 2-byte function id.
-                match crate::bytes::at(rgce, i, 2) {
-                    Some(b) => {
-                        let id = u16::from_le_bytes([b[0], b[1]]);
-                        items.push(func_name(id).unwrap_or("FUNC").to_string());
-                        i += 2;
-                    }
-                    None => break,
-                }
-            }
-            0x22 => {
-                // ptgFuncVar: 1-byte arg count + 2-byte function id.
-                match rgce.get(i + 1..i + 3) {
-                    Some(b) => {
-                        let id = u16::from_le_bytes([b[0], b[1]]);
-                        items.push(func_name(id).unwrap_or("FUNC").to_string());
-                        i += 3;
-                    }
-                    None => break,
-                }
-            }
-            _ => break, // unknown / complex token — stop cleanly
-        }
-    }
-    if !items.is_empty() {
-        let line = items.join(" ");
-        if is_useful(&line) {
-            out.push(line);
-        }
-    }
-}
-
-/// Compute the `rgce` token slice of a `FORMULA` (0x0006) record body: a 20-byte
-/// header, then `cce:u16`, then the tokens.
-fn formula_rgce(body: &[u8]) -> Option<&[u8]> {
-    let cce = u16le(body, 20)? as usize;
-    crate::bytes::at(body, 22, cce)
-}
-
 /// Parse the OLE2 streams; if a `Workbook`/`Book` stream contains at least one
-/// Excel 4.0 macro sheet, return a surfaced `xlm_macro` artifact (macro-sheet
-/// names + recovered string constants). Returns `None` when no XLM macro sheet
-/// is present or the stream can't be parsed.
+/// Excel 4.0 macro sheet, return a surfaced `xlm_macro` artifact. Returns
+/// `None` when no XLM macro sheet is present or the stream can't be parsed.
 pub(crate) fn xlm_macro_artifact(streams: &[(String, &[u8])]) -> Option<Vec<u8>> {
     // OLE stream names carry a path prefix (e.g. `/Workbook`); match the basename.
     let (_, data) = streams.iter().find(|(n, _)| {
         let base = n.rsplit(['/', '\\']).next().unwrap_or(n);
         base.eq_ignore_ascii_case("Workbook") || base.eq_ignore_ascii_case("Book")
     })?;
-    if u16le(data, 0)? != R_BOF {
+    let mut recs = biff::records(data);
+    let first = recs.next()?;
+    // BIFF8 and BIFF5; the older kinds are not in compound files.
+    if first.id != 0x0809 {
+        return None;
+    }
+    let mut book = Book::new(biff::bof_version(&first));
+    for r in recs.by_ref().take_while(|r| r.id != R_EOF) {
+        book.record(&r);
+    }
+    book.finish();
+    if !book.sheets.iter().any(|s| s.kind == DT_EXCEL4_MACRO) {
         return None;
     }
 
-    let mut macro_sheets: Vec<String> = Vec::new();
-    let mut strings: Vec<String> = Vec::new();
+    let mut lines: Vec<String> = Vec::new();
     let mut total = 0usize;
-    let mut pos = 0usize;
-    // Bound the number of records walked (defensive against a crafted stream).
-    let mut guard = 0usize;
-
-    while pos + 4 <= data.len() {
-        guard += 1;
-        if guard > 1_000_000 || total > MAX_XLM_ARTIFACT {
+    let ctx = book.ctx(&book.ext5);
+    for n in &book.names {
+        let text = match formula::decode_partial(&ctx, &n.rgce, &n.extra, 0, 0) {
+            p if p.text.is_empty() => n.name.clone(),
+            p => format!("{}={}", n.name, p.text),
+        };
+        if is_useful(&text) {
+            total += text.len();
+            lines.push(text);
+        }
+    }
+    for r in biff::records(data) {
+        if total > MAX_XLM_ARTIFACT {
             break;
         }
-        let typ = u16le(data, pos)?;
-        let len = u16le(data, pos + 2)? as usize;
-        pos += 4;
-        let end = (pos + len).min(data.len());
-        let body = &data[pos..end];
-        pos = end;
-
-        match typ {
-            R_BOUNDSHEET => {
-                // [lbPlyPos:u32][hsState:u8][dt:u8][name: ShortXLUnicodeString]
-                if body.get(5).copied() == Some(DT_EXCEL4_MACRO) {
-                    let name = body
-                        .get(6..)
-                        .and_then(read_short_string)
-                        .unwrap_or_default();
-                    total += name.len();
-                    macro_sheets.push(name);
-                }
-            }
-            R_LABEL => {
-                // [rw:u16][col:u16][ixfe:u16][XLUnicodeString: cch:u16 ...]
-                if let Some(s) = body.get(6..).and_then(|b| {
-                    let cch = u16le(b, 0)? as usize;
-                    read_short_string_wide(b.get(2..)?, cch)
-                }) {
-                    if is_useful(&s) {
-                        total += s.len();
-                        strings.push(s);
-                    }
-                }
-            }
-            R_NAME => {
-                // Defined names (e.g. built-in `Auto_Open`). Name text is a
-                // ShortXLUnicodeString at a fixed offset in the record.
-                if let Some(s) = body.get(15..).and_then(read_short_string) {
-                    if is_useful(&s) {
-                        total += s.len();
-                        strings.push(s);
-                    }
-                }
-            }
+        let body: &[u8] = &r.data;
+        let text = match r.id {
             R_FORMULA => {
-                if let Some(rgce) = formula_rgce(body) {
-                    parse_formula(rgce, &mut strings);
-                }
+                // 20 bytes of cell, value and flags, then cce:u16 and the tokens.
+                let cce = u16_at(body, 20) as usize;
+                crate::bytes::at(body, 22, cce)
+                    .map(|rgce| macro_formula(&ctx, rgce, u16_at(body, 0), u16_at(body, 2)))
             }
             R_ARRAY => {
-                // ARRAY body: 12-byte header, then cce:u16, then rgce.
-                if let Some(cce) = u16le(body, 12) {
-                    if let Some(rgce) = crate::bytes::at(body, 14, cce as usize) {
-                        parse_formula(rgce, &mut strings);
-                    }
-                }
+                // 12 bytes of range and flags, then cce:u16 and the tokens.
+                let cce = u16_at(body, 12) as usize;
+                crate::bytes::at(body, 14, cce)
+                    .map(|rgce| macro_formula(&ctx, rgce, u16_at(body, 0), u16::from(body[4])))
+            }
+            R_LABEL => {
+                // [rw:u16][col:u16][ixfe:u16][string: cch:u16 ...]
+                let mut c = Cur::at(body, 6);
+                let s = book.string(&mut c, 2);
+                (!c.short && is_useful(&s)).then_some(s)
             }
-            _ => {}
+            _ => None,
+        };
+        if let Some(t) = text.filter(|t| !t.is_empty()) {
+            total += t.len();
+            lines.push(t);
         }
     }
 
-    if macro_sheets.is_empty() {
-        return None;
-    }
-
     let mut out = String::from("Excel 4.0 macro (XLM)\n");
-    for m in &macro_sheets {
+    for s in book.sheets.iter().filter(|s| s.kind == DT_EXCEL4_MACRO) {
         out.push_str("macro-sheet: ");
-        out.push_str(m);
+        out.push_str(&s.name);
         out.push('\n');
     }
-    // Dedup adjacent duplicates (SST/shared strings can repeat) cheaply.
-    strings.dedup();
-    for s in &strings {
+    // Adjacent duplicates (a fill-down repeats a formula) say nothing new.
+    lines.dedup();
+    for s in &lines {
         if out.len() + s.len() + 1 > MAX_XLM_ARTIFACT {
             break;
         }
@@ -308,30 +124,24 @@ pub(crate) fn xlm_macro_artifact(streams: &[(String, &[u8])]) -> Option<Vec<u8>>
     Some(out.into_bytes())
 }
 
-/// Read a wide (`cch:u16`-counted) `XLUnicodeString` body: `grbit:u8`, chars.
-fn read_short_string_wide(d: &[u8], cch: usize) -> Option<String> {
-    let grbit = *d.first()?;
-    let chars = d.get(1..)?;
-    if grbit & 1 == 0 {
-        let n = cch.min(chars.len());
-        Some(chars[..n].iter().map(|&b| b as char).collect())
+/// A macro formula as a line: `=` and the formula, as the cell shows it.
+fn macro_formula(ctx: &formula::Ctx, rgce: &[u8], row: u16, col: u16) -> String {
+    let p = formula::decode_partial(ctx, rgce, &[], u32::from(row), u32::from(col));
+    if p.text.is_empty() {
+        String::new()
     } else {
-        let n = cch.min(chars.len() / 2);
-        let units: Vec<u16> = (0..n)
-            .map(|i| u16::from_le_bytes([chars[i * 2], chars[i * 2 + 1]]))
-            .collect();
-        Some(String::from_utf16_lossy(&units))
+        format!("={}", p.text)
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::{extract, Budget, Format, Limits};
+    use crate::{Budget, Format, Limits, extract};
 
     /// End-to-end against a real Excel 4.0 macro `.xls` (from the `oletools` test
     /// corpus, cross-checked with `olevba`): the OLE path must surface an
-    /// `xlm_macro` member that flags the macro sheet and recovers the macro's
-    /// string constant (`olevba`: `ALERT("This is a sample Excel 4 macro")`).
+    /// `xlm_macro` member that flags the macro sheet and writes the macro as
+    /// `olevba` does: `ALERT("This is a sample Excel 4 macro")`.
     #[test]
     fn real_excel4_macro_is_surfaced() {
         let data = include_bytes!("../../tests/fixtures/xlm_excel4_sample.xls");
@@ -343,15 +153,13 @@ mod tests {
             .expect("an xlm_macro artifact must be surfaced");
         let text = String::from_utf8_lossy(&xlm.data);
         assert!(text.contains("Excel 4.0 macro (XLM)"), "text: {text}");
-        // The plain string constant carrying the payload.
+        // Function names are numbers in the file; the formulas read as in Excel.
         assert!(
-            text.contains("This is a sample Excel 4 macro"),
+            text.lines()
+                .any(|l| l == "=ALERT(\"This is a sample Excel 4 macro\")"),
             "recovered XLM text was: {text}"
         );
-        // The Ptg-decoded function names (invisible to a raw byte scan — stored
-        // as numeric ids). olevba: ALERT("This is a sample Excel 4 macro"), HALT().
-        assert!(text.contains("ALERT"), "expected ALERT in: {text}");
-        assert!(text.contains("HALT"), "expected HALT in: {text}");
+        assert!(text.lines().any(|l| l == "=HALT()"), "text: {text}");
     }
 
     /// A benign OLE document with no macro sheet must NOT surface an xlm_macro.
@@ -363,4 +171,33 @@ mod tests {
         let streams: Vec<(String, &[u8])> = vec![("Workbook".to_string(), &biff[..])];
         assert!(super::xlm_macro_artifact(&streams).is_none());
     }
+
+    /// A formula with a token the reader refuses keeps the calls and strings
+    /// before it, so a writer cannot hide a function behind an odd token.
+    #[test]
+    fn a_formula_the_reader_refuses_still_gives_what_came_before() {
+        let mut stream = Vec::new();
+        let mut rec = |id: u16, body: &[u8]| {
+            stream.extend(id.to_le_bytes());
+            stream.extend((body.len() as u16).to_le_bytes());
+            stream.extend_from_slice(body);
+        };
+        rec(0x0809, &[0, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+        let mut sheet = vec![0u8; 4];
+        sheet.extend([0, 1, 6, 0]);
+        sheet.extend(b"Macro1");
+        rec(0x0085, &sheet);
+        rec(0x000A, &[]);
+        // =EXEC("calc") followed by a token that is not one (0x7F).
+        let mut rgce = vec![0x17, 4, 0, b'c', b'a', b'l', b'c'];
+        rgce.extend([0x42, 1, 110, 0, 0x7F]);
+        let mut f = vec![0u8; 20];
+        f.extend((rgce.len() as u16).to_le_bytes());
+        f.extend(rgce);
+        rec(0x0006, &f);
+        let streams: Vec<(String, &[u8])> = vec![("Workbook".to_string(), &stream[..])];
+        let out = super::xlm_macro_artifact(&streams).unwrap();
+        let text = String::from_utf8_lossy(&out);
+        assert!(text.lines().any(|l| l == "=EXEC(\"calc\")"), "text: {text}");
+    }
 }
diff --git a/crates/exav-unpack/src/formats/xlm_functions.rs b/crates/exav-unpack/src/formats/xlm_functions.rs
deleted file mode 100644
index 497bfa1d..00000000
--- a/crates/exav-unpack/src/formats/xlm_functions.rs
+++ /dev/null
@@ -1,769 +0,0 @@
-// AUTO-GENERATED from oledump plugin_biff.py dFunctions — BIFF/XLM function table.
-// (id, name) sorted by id for binary search. 0x8000 bit = command-equivalent.
-pub static XLM_FUNCTIONS: &[(u16, &str)] = &[
-    (0x0000, "COUNT"),
-    (0x0001, "IF"),
-    (0x0002, "ISNA"),
-    (0x0003, "ISERROR"),
-    (0x0004, "SUM"),
-    (0x0005, "AVERAGE"),
-    (0x0006, "MIN"),
-    (0x0007, "MAX"),
-    (0x0008, "ROW"),
-    (0x0009, "COLUMN"),
-    (0x000a, "NA"),
-    (0x000b, "NPV"),
-    (0x000c, "STDEV"),
-    (0x000d, "DOLLAR"),
-    (0x000e, "FIXED"),
-    (0x000f, "SIN"),
-    (0x0010, "COS"),
-    (0x0011, "TAN"),
-    (0x0012, "ATAN"),
-    (0x0013, "PI"),
-    (0x0014, "SQRT"),
-    (0x0015, "EXP"),
-    (0x0016, "LN"),
-    (0x0017, "LOG10"),
-    (0x0018, "ABS"),
-    (0x0019, "INT"),
-    (0x001a, "SIGN"),
-    (0x001b, "ROUND"),
-    (0x001c, "LOOKUP"),
-    (0x001d, "INDEX"),
-    (0x001e, "REPT"),
-    (0x0020, "LEN"),
-    (0x0021, "VALUE"),
-    (0x0022, "TRUE"),
-    (0x0023, "FALSE"),
-    (0x0024, "AND"),
-    (0x0025, "OR"),
-    (0x0026, "NOT"),
-    (0x0027, "MOD"),
-    (0x0028, "DCOUNT"),
-    (0x0029, "DSUM"),
-    (0x002a, "DAVERAGE"),
-    (0x002b, "DMIN"),
-    (0x002c, "DMAX"),
-    (0x002d, "DSTDEV"),
-    (0x002e, "VAR"),
-    (0x002f, "DVAR"),
-    (0x0030, "TEXT"),
-    (0x0031, "LINEST"),
-    (0x0032, "TREND"),
-    (0x0033, "LOGEST"),
-    (0x0034, "GROWTH"),
-    (0x0035, "GOTO"),
-    (0x0036, "HALT"),
-    (0x0037, "RETURN"),
-    (0x0038, "PV"),
-    (0x0039, "FV"),
-    (0x003a, "NPER"),
-    (0x003b, "PMT"),
-    (0x003c, "RATE"),
-    (0x003d, "MIRR"),
-    (0x003e, "IRR"),
-    (0x003f, "RAND"),
-    (0x0040, "MATCH"),
-    (0x0041, "DATE"),
-    (0x0042, "TIME"),
-    (0x0043, "DAY"),
-    (0x0044, "MONTH"),
-    (0x0045, "YEAR"),
-    (0x0046, "WEEKDAY"),
-    (0x0047, "HOUR"),
-    (0x0048, "MINUTE"),
-    (0x0049, "SECOND"),
-    (0x004b, "AREAS"),
-    (0x004c, "ROWS"),
-    (0x004d, "COLUMNS"),
-    (0x004e, "OFFSET"),
-    (0x004f, "ABSREF"),
-    (0x0050, "RELREF"),
-    (0x0051, "ARGUMENT"),
-    (0x0052, "SEARCH"),
-    (0x0053, "TRANSPOSE"),
-    (0x0054, "ERROR"),
-    (0x0055, "STEP"),
-    (0x0056, "TYPE"),
-    (0x0057, "ECHO"),
-    (0x0058, "SET.NAME"),
-    (0x0059, "CALLER"),
-    (0x005a, "DEREF"),
-    (0x005b, "WINDOWS"),
-    (0x005c, "SERIES"),
-    (0x005d, "DOCUMENTS"),
-    (0x005f, "SELECTION"),
-    (0x0060, "RESULT"),
-    (0x0061, "ATAN2"),
-    (0x0062, "ASIN"),
-    (0x0063, "ACOS"),
-    (0x0064, "CHOOSE"),
-    (0x0065, "HLOOKUP"),
-    (0x0066, "VLOOKUP"),
-    (0x0067, "LINKS"),
-    (0x0068, "INPUT"),
-    (0x0069, "ISREF"),
-    (0x006a, "GET.FORMULA"),
-    (0x006b, "GET.NAME"),
-    (0x006d, "LOG"),
-    (0x006e, "EXEC"),
-    (0x006f, "CHAR"),
-    (0x0070, "LOWER"),
-    (0x0071, "UPPER"),
-    (0x0072, "PROPER"),
-    (0x0073, "LEFT"),
-    (0x0074, "RIGHT"),
-    (0x0075, "EXACT"),
-    (0x0076, "TRIM"),
-    (0x0077, "REPLACE"),
-    (0x0078, "SUBSTITUTE"),
-    (0x0079, "CODE"),
-    (0x007a, "NAMES"),
-    (0x007b, "DIRECTORY"),
-    (0x007c, "FIND"),
-    (0x007d, "CELL"),
-    (0x007e, "ISERR"),
-    (0x007f, "ISTEXT"),
-    (0x0080, "ISNUMBER"),
-    (0x0081, "ISBLANK"),
-    (0x0082, "T"),
-    (0x0083, "N"),
-    (0x0084, "FOPEN"),
-    (0x0085, "FCLOSE"),
-    (0x0086, "FSIZE"),
-    (0x0087, "FREADLN"),
-    (0x0088, "FREAD"),
-    (0x0089, "FWRITELN"),
-    (0x008a, "FWRITE"),
-    (0x008b, "FPOS"),
-    (0x008c, "DATEVALUE"),
-    (0x008d, "TIMEVALUE"),
-    (0x008e, "SLN"),
-    (0x008f, "SYD"),
-    (0x0090, "DDB"),
-    (0x0091, "GET.DEF"),
-    (0x0092, "REFTEXT"),
-    (0x0093, "TEXTREF"),
-    (0x0094, "INDIRECT"),
-    (0x0095, "REGISTER"),
-    (0x0096, "CALL"),
-    (0x0097, "ADD.BAR"),
-    (0x0098, "ADD.MENU"),
-    (0x0099, "ADD.COMMAND"),
-    (0x009a, "ENABLE.COMMAND"),
-    (0x009b, "CHECK.COMMAND"),
-    (0x009c, "RENAME.COMMAND"),
-    (0x009d, "SHOW.BAR"),
-    (0x009e, "DELETE.MENU"),
-    (0x009f, "DELETE.COMMAND"),
-    (0x00a0, "GET.CHART.ITEM"),
-    (0x00a1, "DIALOG.BOX"),
-    (0x00a2, "CLEAN"),
-    (0x00a3, "MDETERM"),
-    (0x00a4, "MINVERSE"),
-    (0x00a5, "MMULT"),
-    (0x00a6, "FILES"),
-    (0x00a7, "IPMT"),
-    (0x00a8, "PPMT"),
-    (0x00a9, "COUNTA"),
-    (0x00aa, "CANCEL.KEY"),
-    (0x00ab, "FOR"),
-    (0x00ac, "WHILE"),
-    (0x00ad, "BREAK"),
-    (0x00af, "INITIATE"),
-    (0x00b0, "REQUEST"),
-    (0x00b1, "POKE"),
-    (0x00b2, "EXECUTE"),
-    (0x00b3, "TERMINATE"),
-    (0x00b4, "RESTART"),
-    (0x00b5, "HELP"),
-    (0x00b6, "GET.BAR"),
-    (0x00b7, "PRODUCT"),
-    (0x00b8, "FACT"),
-    (0x00b9, "GET.CELL"),
-    (0x00ba, "GET.WORKSPACE"),
-    (0x00bb, "GET.WINDOW"),
-    (0x00bc, "GET.DOCUMENT"),
-    (0x00bd, "DPRODUCT"),
-    (0x00be, "ISNONTEXT"),
-    (0x00bf, "GET.NOTE"),
-    (0x00c0, "NOTE"),
-    (0x00c1, "STDEVP"),
-    (0x00c2, "VARP"),
-    (0x00c3, "DSTDEVP"),
-    (0x00c4, "DVARP"),
-    (0x00c5, "TRUNC"),
-    (0x00c6, "ISLOGICAL"),
-    (0x00c7, "DCOUNTA"),
-    (0x00c8, "DELETE.BAR"),
-    (0x00c9, "UNREGISTER"),
-    (0x00cc, "USDOLLAR"),
-    (0x00cd, "FINDB"),
-    (0x00ce, "SEARCHB"),
-    (0x00cf, "REPLACEB"),
-    (0x00d0, "LEFTB"),
-    (0x00d1, "RIGHTB"),
-    (0x00d2, "MIDB"),
-    (0x00d3, "LENB"),
-    (0x00d4, "ROUNDUP"),
-    (0x00d5, "ROUNDDOWN"),
-    (0x00d6, "ASC"),
-    (0x00d7, "DBCS"),
-    (0x00d8, "RANK"),
-    (0x00db, "ADDRESS"),
-    (0x00dc, "DAYS360"),
-    (0x00dd, "TODAY"),
-    (0x00de, "VDB"),
-    (0x00df, "ELSE"),
-    (0x00e0, "ELSE.IF"),
-    (0x00e1, "END.IF"),
-    (0x00e2, "FOR.CELL"),
-    (0x00e3, "MEDIAN"),
-    (0x00e4, "SUMPRODUCT"),
-    (0x00e5, "SINH"),
-    (0x00e6, "COSH"),
-    (0x00e7, "TANH"),
-    (0x00e8, "ASINH"),
-    (0x00e9, "ACOSH"),
-    (0x00ea, "ATANH"),
-    (0x00eb, "DGET"),
-    (0x00ec, "CREATE.OBJECT"),
-    (0x00ed, "VOLATILE"),
-    (0x00ee, "LAST.ERROR"),
-    (0x00ef, "CUSTOM.UNDO"),
-    (0x00f0, "CUSTOM.REPEAT"),
-    (0x00f1, "FORMULA.CONVERT"),
-    (0x00f2, "GET.LINK.INFO"),
-    (0x00f3, "TEXT.BOX"),
-    (0x00f4, "INFO"),
-    (0x00f5, "GROUP"),
-    (0x00f6, "GET.OBJECT"),
-    (0x00f7, "DB"),
-    (0x00f8, "PAUSE"),
-    (0x00fb, "RESUME"),
-    (0x00fc, "FREQUENCY"),
-    (0x00fd, "ADD.TOOLBAR"),
-    (0x00fe, "DELETE.TOOLBAR"),
-    (0x00ff, "User Defined Function"),
-    (0x0100, "RESET.TOOLBAR"),
-    (0x0101, "EVALUATE"),
-    (0x0102, "GET.TOOLBAR"),
-    (0x0103, "GET.TOOL"),
-    (0x0104, "SPELLING.CHECK"),
-    (0x0105, "ERROR.TYPE"),
-    (0x0106, "APP.TITLE"),
-    (0x0107, "WINDOW.TITLE"),
-    (0x0108, "SAVE.TOOLBAR"),
-    (0x0109, "ENABLE.TOOL"),
-    (0x010a, "PRESS.TOOL"),
-    (0x010b, "REGISTER.ID"),
-    (0x010c, "GET.WORKBOOK"),
-    (0x010d, "AVEDEV"),
-    (0x010e, "BETADIST"),
-    (0x010f, "GAMMALN"),
-    (0x0110, "BETAINV"),
-    (0x0111, "BINOMDIST"),
-    (0x0112, "CHIDIST"),
-    (0x0113, "CHIINV"),
-    (0x0114, "COMBIN"),
-    (0x0115, "CONFIDENCE"),
-    (0x0116, "CRITBINOM"),
-    (0x0117, "EVEN"),
-    (0x0118, "EXPONDIST"),
-    (0x0119, "FDIST"),
-    (0x011a, "FINV"),
-    (0x011b, "FISHER"),
-    (0x011c, "FISHERINV"),
-    (0x011d, "FLOOR"),
-    (0x011e, "GAMMADIST"),
-    (0x011f, "GAMMAINV"),
-    (0x0120, "CEILING"),
-    (0x0121, "HYPGEOMDIST"),
-    (0x0122, "LOGNORMDIST"),
-    (0x0123, "LOGINV"),
-    (0x0124, "NEGBINOMDIST"),
-    (0x0125, "NORMDIST"),
-    (0x0126, "NORMSDIST"),
-    (0x0127, "NORMINV"),
-    (0x0128, "NORMSINV"),
-    (0x0129, "STANDARDIZE"),
-    (0x012a, "ODD"),
-    (0x012b, "PERMUT"),
-    (0x012c, "POISSON"),
-    (0x012d, "TDIST"),
-    (0x012e, "WEIBULL"),
-    (0x012f, "SUMXMY2"),
-    (0x0130, "SUMX2MY2"),
-    (0x0131, "SUMX2PY2"),
-    (0x0132, "CHITEST"),
-    (0x0133, "CORREL"),
-    (0x0134, "COVAR"),
-    (0x0135, "FORECAST"),
-    (0x0136, "FTEST"),
-    (0x0137, "INTERCEPT"),
-    (0x0138, "PEARSON"),
-    (0x0139, "RSQ"),
-    (0x013a, "STEYX"),
-    (0x013b, "SLOPE"),
-    (0x013c, "TTEST"),
-    (0x013d, "PROB"),
-    (0x013e, "DEVSQ"),
-    (0x013f, "GEOMEAN"),
-    (0x0140, "HARMEAN"),
-    (0x0141, "SUMSQ"),
-    (0x0142, "KURT"),
-    (0x0143, "SKEW"),
-    (0x0144, "ZTEST"),
-    (0x0145, "LARGE"),
-    (0x0146, "SMALL"),
-    (0x0147, "QUARTILE"),
-    (0x0148, "PERCENTILE"),
-    (0x0149, "PERCENTRANK"),
-    (0x014a, "MODE"),
-    (0x014b, "TRIMMEAN"),
-    (0x014c, "TINV"),
-    (0x014e, "MOVIE.COMMAND"),
-    (0x014f, "GET.MOVIE"),
-    (0x0150, "CONCATENATE"),
-    (0x0151, "POWER"),
-    (0x0152, "PIVOT.ADD.DATA"),
-    (0x0153, "GET.PIVOT.TABLE"),
-    (0x0154, "GET.PIVOT.FIELD"),
-    (0x0155, "GET.PIVOT.ITEM"),
-    (0x0156, "RADIANS"),
-    (0x0157, "DEGREES"),
-    (0x0158, "SUBTOTAL"),
-    (0x0159, "SUMIF"),
-    (0x015a, "COUNTIF"),
-    (0x015b, "COUNTBLANK"),
-    (0x015c, "SCENARIO.GET"),
-    (0x015d, "OPTIONS.LISTS.GET"),
-    (0x015e, "ISPMT"),
-    (0x015f, "DATEDIF"),
-    (0x0160, "DATESTRING"),
-    (0x0161, "NUMBERSTRING"),
-    (0x0162, "ROMAN"),
-    (0x0163, "OPEN.DIALOG"),
-    (0x0164, "SAVE.DIALOG"),
-    (0x0165, "VIEW.GET"),
-    (0x0166, "GETPIVOTDATA"),
-    (0x0167, "HYPERLINK"),
-    (0x0168, "PHONETIC"),
-    (0x0169, "AVERAGEA"),
-    (0x016a, "MAXA"),
-    (0x016b, "MINA"),
-    (0x016c, "STDEVPA"),
-    (0x016d, "VARPA"),
-    (0x016e, "STDEVA"),
-    (0x016f, "VARA"),
-    (0x0170, "BAHTTEXT"),
-    (0x0171, "THAIDAYOFWEEK"),
-    (0x0172, "THAIDIGIT"),
-    (0x0173, "THAIMONTHOFYEAR"),
-    (0x0174, "THAINUMSOUND"),
-    (0x0175, "THAINUMSTRING"),
-    (0x0176, "THAISTRINGLENGTH"),
-    (0x0177, "ISTHAIDIGIT"),
-    (0x0178, "ROUNDBAHTDOWN"),
-    (0x0179, "ROUNDBAHTUP"),
-    (0x017a, "THAIYEAR"),
-    (0x017b, "RTD"),
-    (0x01e0, "IFERROR"),
-    (0x8000, "BEEP"),
-    (0x8001, "OPEN"),
-    (0x8002, "OPEN.LINKS"),
-    (0x8003, "CLOSE.ALL"),
-    (0x8004, "SAVE"),
-    (0x8005, "SAVE.AS"),
-    (0x8006, "FILE.DELETE"),
-    (0x8007, "PAGE.SETUP"),
-    (0x8008, "PRINT"),
-    (0x8009, "PRINTER.SETUP"),
-    (0x800a, "QUIT"),
-    (0x800b, "NEW.WINDOW"),
-    (0x800c, "ARRANGE.ALL"),
-    (0x800d, "WINDOW.SIZE"),
-    (0x800e, "WINDOW.MOVE"),
-    (0x800f, "FULL"),
-    (0x8010, "CLOSE"),
-    (0x8011, "RUN"),
-    (0x8016, "SET.PRINT.AREA"),
-    (0x8017, "SET.PRINT.TITLES"),
-    (0x8018, "SET.PAGE.BREAK"),
-    (0x8019, "REMOVE.PAGE.BREAK"),
-    (0x801a, "FONT"),
-    (0x801b, "DISPLAY"),
-    (0x801c, "PROTECT.DOCUMENT"),
-    (0x801d, "PRECISION"),
-    (0x801e, "A1.R1C1"),
-    (0x801f, "CALCULATE.NOW"),
-    (0x8020, "CALCULATION"),
-    (0x8022, "DATA.FIND"),
-    (0x8023, "EXTRACT"),
-    (0x8024, "DATA.DELETE"),
-    (0x8025, "SET.DATABASE"),
-    (0x8026, "SET.CRITERIA"),
-    (0x8027, "SORT"),
-    (0x8028, "DATA.SERIES"),
-    (0x8029, "TABLE"),
-    (0x802a, "FORMAT.NUMBER"),
-    (0x802b, "ALIGNMENT"),
-    (0x802c, "STYLE"),
-    (0x802d, "BORDER"),
-    (0x802e, "CELL.PROTECTION"),
-    (0x802f, "COLUMN.WIDTH"),
-    (0x8030, "UNDO"),
-    (0x8031, "CUT"),
-    (0x8032, "COPY"),
-    (0x8033, "PASTE"),
-    (0x8034, "CLEAR"),
-    (0x8035, "PASTE.SPECIAL"),
-    (0x8036, "EDIT.DELETE"),
-    (0x8037, "INSERT"),
-    (0x8038, "FILL.RIGHT"),
-    (0x8039, "FILL.DOWN"),
-    (0x803d, "DEFINE.NAME"),
-    (0x803e, "CREATE.NAMES"),
-    (0x803f, "FORMULA.GOTO"),
-    (0x8040, "FORMULA.FIND"),
-    (0x8041, "SELECT.LAST.CELL"),
-    (0x8042, "SHOW.ACTIVE.CELL"),
-    (0x8043, "GALLERY.AREA"),
-    (0x8044, "GALLERY.BAR"),
-    (0x8045, "GALLERY.COLUMN"),
-    (0x8046, "GALLERY.LINE"),
-    (0x8047, "GALLERY.PIE"),
-    (0x8048, "GALLERY.SCATTER"),
-    (0x8049, "COMBINATION"),
-    (0x804a, "PREFERRED"),
-    (0x804b, "ADD.OVERLAY"),
-    (0x804c, "GRIDLINES"),
-    (0x804d, "SET.PREFERRED"),
-    (0x804e, "AXES"),
-    (0x804f, "LEGEND"),
-    (0x8050, "ATTACH.TEXT"),
-    (0x8051, "ADD.ARROW"),
-    (0x8052, "SELECT.CHART"),
-    (0x8053, "SELECT.PLOT.AREA"),
-    (0x8054, "PATTERNS"),
-    (0x8055, "MAIN.CHART"),
-    (0x8056, "OVERLAY"),
-    (0x8057, "SCALE"),
-    (0x8058, "FORMAT.LEGEND"),
-    (0x8059, "FORMAT.TEXT"),
-    (0x805a, "EDIT.REPEAT"),
-    (0x805b, "PARSE"),
-    (0x805c, "JUSTIFY"),
-    (0x805d, "HIDE"),
-    (0x805e, "UNHIDE"),
-    (0x805f, "WORKSPACE"),
-    (0x8060, "FORMULA"),
-    (0x8061, "FORMULA.FILL"),
-    (0x8062, "FORMULA.ARRAY"),
-    (0x8063, "DATA.FIND.NEXT"),
-    (0x8064, "DATA.FIND.PREV"),
-    (0x8065, "FORMULA.FIND.NEXT"),
-    (0x8066, "FORMULA.FIND.PREV"),
-    (0x8067, "ACTIVATE"),
-    (0x8068, "ACTIVATE.NEXT"),
-    (0x8069, "ACTIVATE.PREV"),
-    (0x806a, "UNLOCKED.NEXT"),
-    (0x806b, "UNLOCKED.PREV"),
-    (0x806c, "COPY.PICTURE"),
-    (0x806d, "SELECT"),
-    (0x806e, "DELETE.NAME"),
-    (0x806f, "DELETE.FORMAT"),
-    (0x8070, "VLINE"),
-    (0x8071, "HLINE"),
-    (0x8072, "VPAGE"),
-    (0x8073, "HPAGE"),
-    (0x8074, "VSCROLL"),
-    (0x8075, "HSCROLL"),
-    (0x8076, "ALERT"),
-    (0x8077, "NEW"),
-    (0x8078, "CANCEL.COPY"),
-    (0x8079, "SHOW.CLIPBOARD"),
-    (0x807a, "MESSAGE"),
-    (0x807c, "PASTE.LINK"),
-    (0x807d, "APP.ACTIVATE"),
-    (0x807e, "DELETE.ARROW"),
-    (0x807f, "ROW.HEIGHT"),
-    (0x8080, "FORMAT.MOVE"),
-    (0x8081, "FORMAT.SIZE"),
-    (0x8082, "FORMULA.REPLACE"),
-    (0x8083, "SEND.KEYS"),
-    (0x8084, "SELECT.SPECIAL"),
-    (0x8085, "APPLY.NAMES"),
-    (0x8086, "REPLACE.FONT"),
-    (0x8087, "FREEZE.PANES"),
-    (0x8088, "SHOW.INFO"),
-    (0x8089, "SPLIT"),
-    (0x808a, "ON.WINDOW"),
-    (0x808b, "ON.DATA"),
-    (0x808c, "DISABLE.INPUT"),
-    (0x808e, "OUTLINE"),
-    (0x808f, "LIST.NAMES"),
-    (0x8090, "FILE.CLOSE"),
-    (0x8091, "SAVE.WORKBOOK"),
-    (0x8092, "DATA.FORM"),
-    (0x8093, "COPY.CHART"),
-    (0x8094, "ON.TIME"),
-    (0x8095, "WAIT"),
-    (0x8096, "FORMAT.FONT"),
-    (0x8097, "FILL.UP"),
-    (0x8098, "FILL.LEFT"),
-    (0x8099, "DELETE.OVERLAY"),
-    (0x809b, "SHORT.MENUS"),
-    (0x809f, "SET.UPDATE.STATUS"),
-    (0x80a1, "COLOR.PALETTE"),
-    (0x80a2, "DELETE.STYLE"),
-    (0x80a3, "WINDOW.RESTORE"),
-    (0x80a4, "WINDOW.MAXIMIZE"),
-    (0x80a6, "CHANGE.LINK"),
-    (0x80a7, "CALCULATE.DOCUMENT"),
-    (0x80a8, "ON.KEY"),
-    (0x80a9, "APP.RESTORE"),
-    (0x80aa, "APP.MOVE"),
-    (0x80ab, "APP.SIZE"),
-    (0x80ac, "APP.MINIMIZE"),
-    (0x80ad, "APP.MAXIMIZE"),
-    (0x80ae, "BRING.TO.FRONT"),
-    (0x80af, "SEND.TO.BACK"),
-    (0x80b9, "MAIN.CHART.TYPE"),
-    (0x80ba, "OVERLAY.CHART.TYPE"),
-    (0x80bb, "SELECT.END"),
-    (0x80bc, "OPEN.MAIL"),
-    (0x80bd, "SEND.MAIL"),
-    (0x80be, "STANDARD.FONT"),
-    (0x80bf, "CONSOLIDATE"),
-    (0x80c0, "SORT.SPECIAL"),
-    (0x80c1, "GALLERY.3D.AREA"),
-    (0x80c2, "GALLERY.3D.COLUMN"),
-    (0x80c3, "GALLERY.3D.LINE"),
-    (0x80c4, "GALLERY.3D.PIE"),
-    (0x80c5, "VIEW.3D"),
-    (0x80c6, "GOAL.SEEK"),
-    (0x80c7, "WORKGROUP"),
-    (0x80c8, "FILL.GROUP"),
-    (0x80c9, "UPDATE.LINK"),
-    (0x80ca, "PROMOTE"),
-    (0x80cb, "DEMOTE"),
-    (0x80cc, "SHOW.DETAIL"),
-    (0x80ce, "UNGROUP"),
-    (0x80cf, "OBJECT.PROPERTIES"),
-    (0x80d0, "SAVE.NEW.OBJECT"),
-    (0x80d1, "SHARE"),
-    (0x80d2, "SHARE.NAME"),
-    (0x80d3, "DUPLICATE"),
-    (0x80d4, "APPLY.STYLE"),
-    (0x80d5, "ASSIGN.TO.OBJECT"),
-    (0x80d6, "OBJECT.PROTECTION"),
-    (0x80d7, "HIDE.OBJECT"),
-    (0x80d8, "SET.EXTRACT"),
-    (0x80d9, "CREATE.PUBLISHER"),
-    (0x80da, "SUBSCRIBE.TO"),
-    (0x80db, "ATTRIBUTES"),
-    (0x80dc, "SHOW.TOOLBAR"),
-    (0x80de, "PRINT.PREVIEW"),
-    (0x80df, "EDIT.COLOR"),
-    (0x80e0, "SHOW.LEVELS"),
-    (0x80e1, "FORMAT.MAIN"),
-    (0x80e2, "FORMAT.OVERLAY"),
-    (0x80e3, "ON.RECALC"),
-    (0x80e4, "EDIT.SERIES"),
-    (0x80e5, "DEFINE.STYLE"),
-    (0x80f0, "LINE.PRINT"),
-    (0x80f3, "ENTER.DATA"),
-    (0x80f9, "GALLERY.RADAR"),
-    (0x80fa, "MERGE.STYLES"),
-    (0x80fb, "EDITION.OPTIONS"),
-    (0x80fc, "PASTE.PICTURE"),
-    (0x80fd, "PASTE.PICTURE.LINK"),
-    (0x80fe, "SPELLING"),
-    (0x8100, "ZOOM"),
-    (0x8103, "INSERT.OBJECT"),
-    (0x8104, "WINDOW.MINIMIZE"),
-    (0x8109, "SOUND.NOTE"),
-    (0x810a, "SOUND.PLAY"),
-    (0x810b, "FORMAT.SHAPE"),
-    (0x810c, "EXTEND.POLYGON"),
-    (0x810d, "FORMAT.AUTO"),
-    (0x8110, "GALLERY.3D.BAR"),
-    (0x8111, "GALLERY.3D.SURFACE"),
-    (0x8112, "FILL.AUTO"),
-    (0x8114, "CUSTOMIZE.TOOLBAR"),
-    (0x8115, "ADD.TOOL"),
-    (0x8116, "EDIT.OBJECT"),
-    (0x8117, "ON.DOUBLECLICK"),
-    (0x8118, "ON.ENTRY"),
-    (0x8119, "WORKBOOK.ADD"),
-    (0x811a, "WORKBOOK.MOVE"),
-    (0x811b, "WORKBOOK.COPY"),
-    (0x811c, "WORKBOOK.OPTIONS"),
-    (0x811d, "SAVE.WORKSPACE"),
-    (0x8120, "CHART.WIZARD"),
-    (0x8121, "DELETE.TOOL"),
-    (0x8122, "MOVE.TOOL"),
-    (0x8123, "WORKBOOK.SELECT"),
-    (0x8124, "WORKBOOK.ACTIVATE"),
-    (0x8125, "ASSIGN.TO.TOOL"),
-    (0x8127, "COPY.TOOL"),
-    (0x8128, "RESET.TOOL"),
-    (0x8129, "CONSTRAIN.NUMERIC"),
-    (0x812a, "PASTE.TOOL"),
-    (0x812e, "WORKBOOK.NEW"),
-    (0x8131, "SCENARIO.CELLS"),
-    (0x8132, "SCENARIO.DELETE"),
-    (0x8133, "SCENARIO.ADD"),
-    (0x8134, "SCENARIO.EDIT"),
-    (0x8135, "SCENARIO.SHOW"),
-    (0x8136, "SCENARIO.SHOW.NEXT"),
-    (0x8137, "SCENARIO.SUMMARY"),
-    (0x8138, "PIVOT.TABLE.WIZARD"),
-    (0x8139, "PIVOT.FIELD.PROPERTIES"),
-    (0x813a, "PIVOT.FIELD"),
-    (0x813b, "PIVOT.ITEM"),
-    (0x813c, "PIVOT.ADD.FIELDS"),
-    (0x813e, "OPTIONS.CALCULATION"),
-    (0x813f, "OPTIONS.EDIT"),
-    (0x8140, "OPTIONS.VIEW"),
-    (0x8141, "ADDIN.MANAGER"),
-    (0x8142, "MENU.EDITOR"),
-    (0x8143, "ATTACH.TOOLBARS"),
-    (0x8144, "VBAActivate"),
-    (0x8145, "OPTIONS.CHART"),
-    (0x8148, "VBA.INSERT.FILE"),
-    (0x814a, "VBA.PROCEDURE.DEFINITION"),
-    (0x8150, "ROUTING.SLIP"),
-    (0x8152, "ROUTE.DOCUMENT"),
-    (0x8153, "MAIL.LOGON"),
-    (0x8156, "INSERT.PICTURE"),
-    (0x8157, "EDIT.TOOL"),
-    (0x8158, "GALLERY.DOUGHNUT"),
-    (0x815e, "CHART.TREND"),
-    (0x8160, "PIVOT.ITEM.PROPERTIES"),
-    (0x8162, "WORKBOOK.INSERT"),
-    (0x8163, "OPTIONS.TRANSITION"),
-    (0x8164, "OPTIONS.GENERAL"),
-    (0x8172, "FILTER.ADVANCED"),
-    (0x8175, "MAIL.ADD.MAILER"),
-    (0x8176, "MAIL.DELETE.MAILER"),
-    (0x8177, "MAIL.REPLY"),
-    (0x8178, "MAIL.REPLY.ALL"),
-    (0x8179, "MAIL.FORWARD"),
-    (0x817a, "MAIL.NEXT.LETTER"),
-    (0x817b, "DATA.LABEL"),
-    (0x817c, "INSERT.TITLE"),
-    (0x817d, "FONT.PROPERTIES"),
-    (0x817e, "MACRO.OPTIONS"),
-    (0x817f, "WORKBOOK.HIDE"),
-    (0x8180, "WORKBOOK.UNHIDE"),
-    (0x8181, "WORKBOOK.DELETE"),
-    (0x8182, "WORKBOOK.NAME"),
-    (0x8184, "GALLERY.CUSTOM"),
-    (0x8186, "ADD.CHART.AUTOFORMAT"),
-    (0x8187, "DELETE.CHART.AUTOFORMAT"),
-    (0x8188, "CHART.ADD.DATA"),
-    (0x8189, "AUTO.OUTLINE"),
-    (0x818a, "TAB.ORDER"),
-    (0x818b, "SHOW.DIALOG"),
-    (0x818c, "SELECT.ALL"),
-    (0x818d, "UNGROUP.SHEETS"),
-    (0x818e, "SUBTOTAL.CREATE"),
-    (0x818f, "SUBTOTAL.REMOVE"),
-    (0x8190, "RENAME.OBJECT"),
-    (0x819c, "WORKBOOK.SCROLL"),
-    (0x819d, "WORKBOOK.NEXT"),
-    (0x819e, "WORKBOOK.PREV"),
-    (0x819f, "WORKBOOK.TAB.SPLIT"),
-    (0x81a0, "FULL.SCREEN"),
-    (0x81a1, "WORKBOOK.PROTECT"),
-    (0x81a4, "SCROLLBAR.PROPERTIES"),
-    (0x81a5, "PIVOT.SHOW.PAGES"),
-    (0x81a6, "TEXT.TO.COLUMNS"),
-    (0x81a7, "FORMAT.CHARTTYPE"),
-    (0x81a8, "LINK.FORMAT"),
-    (0x81a9, "TRACER.DISPLAY"),
-    (0x81ae, "TRACER.NAVIGATE"),
-    (0x81af, "TRACER.CLEAR"),
-    (0x81b0, "TRACER.ERROR"),
-    (0x81b1, "PIVOT.FIELD.GROUP"),
-    (0x81b2, "PIVOT.FIELD.UNGROUP"),
-    (0x81b3, "CHECKBOX.PROPERTIES"),
-    (0x81b4, "LABEL.PROPERTIES"),
-    (0x81b5, "LISTBOX.PROPERTIES"),
-    (0x81b6, "EDITBOX.PROPERTIES"),
-    (0x81b7, "PIVOT.REFRESH"),
-    (0x81b8, "LINK.COMBO"),
-    (0x81b9, "OPEN.TEXT"),
-    (0x81ba, "HIDE.DIALOG"),
-    (0x81bb, "SET.DIALOG.FOCUS"),
-    (0x81bc, "ENABLE.OBJECT"),
-    (0x81bd, "PUSHBUTTON.PROPERTIES"),
-    (0x81be, "SET.DIALOG.DEFAULT"),
-    (0x81bf, "FILTER"),
-    (0x81c0, "FILTER.SHOW.ALL"),
-    (0x81c1, "CLEAR.OUTLINE"),
-    (0x81c2, "FUNCTION.WIZARD"),
-    (0x81c3, "ADD.LIST.ITEM"),
-    (0x81c4, "SET.LIST.ITEM"),
-    (0x81c5, "REMOVE.LIST.ITEM"),
-    (0x81c6, "SELECT.LIST.ITEM"),
-    (0x81c7, "SET.CONTROL.VALUE"),
-    (0x81c8, "SAVE.COPY.AS"),
-    (0x81ca, "OPTIONS.LISTS.ADD"),
-    (0x81cb, "OPTIONS.LISTS.DELETE"),
-    (0x81cc, "SERIES.AXES"),
-    (0x81cd, "SERIES.X"),
-    (0x81ce, "SERIES.Y"),
-    (0x81cf, "ERRORBAR.X"),
-    (0x81d0, "ERRORBAR.Y"),
-    (0x81d1, "FORMAT.CHART"),
-    (0x81d2, "SERIES.ORDER"),
-    (0x81d3, "MAIL.LOGOFF"),
-    (0x81d4, "CLEAR.ROUTING.SLIP"),
-    (0x81d5, "APP.ACTIVATE.MICROSOFT"),
-    (0x81d6, "MAIL.EDIT.MAILER"),
-    (0x81d7, "ON.SHEET"),
-    (0x81d8, "STANDARD.WIDTH"),
-    (0x81d9, "SCENARIO.MERGE"),
-    (0x81da, "SUMMARY.INFO"),
-    (0x81db, "FIND.FILE"),
-    (0x81dc, "ACTIVE.CELL.FONT"),
-    (0x81dd, "ENABLE.TIPWIZARD"),
-    (0x81de, "VBA.MAKE.ADDIN"),
-    (0x81e0, "INSERTDATATABLE"),
-    (0x81e1, "WORKGROUP.OPTIONS"),
-    (0x81e2, "MAIL.SEND.MAILER"),
-    (0x81e5, "AUTOCORRECT"),
-    (0x81e9, "POST.DOCUMENT"),
-    (0x81eb, "PICKLIST"),
-    (0x81ed, "VIEW.SHOW"),
-    (0x81ee, "VIEW.DEFINE"),
-    (0x81ef, "VIEW.DELETE"),
-    (0x81fd, "SHEET.BACKGROUND"),
-    (0x81fe, "INSERT.MAP.OBJECT"),
-    (0x81ff, "OPTIONS.MENONO"),
-    (0x8205, "MSOCHECKS"),
-    (0x8206, "NORMAL"),
-    (0x8207, "LAYOUT"),
-    (0x8208, "RM.PRINT.AREA"),
-    (0x8209, "CLEAR.PRINT.AREA"),
-    (0x820a, "ADD.PRINT.AREA"),
-    (0x820b, "MOVE.BRK"),
-    (0x8221, "HIDECURR.NOTE"),
-    (0x8222, "HIDEALL.NOTES"),
-    (0x8223, "DELETE.NOTE"),
-    (0x8224, "TRAVERSE.NOTES"),
-    (0x8225, "ACTIVATE.NOTES"),
-    (0x826c, "PROTECT.REVISIONS"),
-    (0x826d, "UNPROTECT.REVISIONS"),
-    (0x8287, "OPTIONS.ME"),
-    (0x828d, "WEB.PUBLISH"),
-    (0x829b, "NEWWEBQUERY"),
-    (0x82a1, "PIVOT.TABLE.CHART"),
-    (0x82f1, "OPTIONS.SAVE"),
-    (0x82f3, "OPTIONS.SPELL"),
-    (0x8328, "HIDEALL.INKANNOTS"),
-];
diff --git a/crates/exav-unpack/src/formats/xz.rs b/crates/exav-unpack/src/formats/xz.rs
index 65caa828..aa990f5b 100644
--- a/crates/exav-unpack/src/formats/xz.rs
+++ b/crates/exav-unpack/src/formats/xz.rs
@@ -118,13 +118,18 @@ pub(crate) fn content_reader(
 
 /// Every stream of an `.xz` input read from `input`, decoded as it is read.
 pub(crate) struct XzReader<R> {
-    input: R,
+    /// The input, with a check the decoder does not read taken out
+    /// ([`super::xz_nocheck`]).
+    input: super::xz_nocheck::NoCheck<R>,
     inbuf: Vec<u8>,
     in_pos: usize,
     in_len: usize,
     /// The decoder owns its dictionary allocation, so its lifetime is
     /// independent of the input; `'static` keeps it out of the caller's way.
-    decoder: xz4rust::XzDecoder<'static>,
+    /// Boxed: its tables are about 30 KB, which the frame of whatever holds
+    /// the reader would take for as long as a member is scanned, once per
+    /// level of xz inside xz.
+    decoder: Box<xz4rust::XzDecoder<'static>>,
     /// Decoded bytes not yet handed to the caller. A single `decode` call can
     /// produce more than the caller asked for, and those bytes cannot be
     /// re-derived, so they wait here.
@@ -133,20 +138,50 @@ pub(crate) struct XzReader<R> {
     done: bool,
     /// Input was fed to the decoder since the last end of stream.
     mid_stream: bool,
+    /// The input ended inside a stream, and that is yet to be reported.
+    cut: bool,
 }
 
 impl<R: std::io::Read> XzReader<R> {
     pub(crate) fn new(input: R) -> Self {
         XzReader {
-            input,
+            input: super::xz_nocheck::NoCheck::new(input),
             inbuf: vec![0; 8192],
             in_pos: 0,
             in_len: 0,
-            decoder: xz4rust::XzDecoder::with_alloc_dict_size(8192, XZ_MAX_DICT as usize),
+            decoder: Box::new(xz4rust::XzDecoder::with_alloc_dict_size(
+                8192,
+                XZ_MAX_DICT as usize,
+            )),
             staged: Vec::new(),
             taken: 0,
             done: false,
             mid_stream: false,
+            cut: false,
+        }
+    }
+
+    /// Stage what the decoder holds when the input ends inside a stream. It
+    /// reads ahead of what it writes, so the last bytes it could decode from
+    /// what it was given stay in it until it is given more; `xz -dc` writes
+    /// them. One zero byte stands for the input that is missing, and the
+    /// decoder, having its lookahead, writes them all at once. Output that
+    /// comes out byte for byte with the one zero given is not the stream's:
+    /// an uncompressed chunk copies its input, so the zero is all it makes of
+    /// it. Nothing is read from the decoder after that call, the rest of what
+    /// it writes being made of the padding.
+    fn drain(&mut self) {
+        self.cut = true;
+        let mut buf = [0u8; OUT_STEP];
+        if let Ok(result) = self.decoder.decode(&[0u8], &mut buf) {
+            let n = result.output_produced();
+            if matches!(result, xz4rust::XzNextBlockResult::EndOfStream(_, _)) {
+                // It ended after all: nothing was cut.
+                self.staged.extend_from_slice(&buf[..n]);
+                self.cut = false;
+            } else if n > result.input_consumed() {
+                self.staged.extend_from_slice(&buf[..n]);
+            }
         }
     }
 
@@ -176,20 +211,23 @@ impl<R: std::io::Read> std::io::Read for XzReader<R> {
                 return Ok(n);
             }
             if self.done {
+                // The input ended inside a stream: the rest of it is not here.
+                if std::mem::take(&mut self.cut) {
+                    return Err(std::io::Error::new(
+                        std::io::ErrorKind::UnexpectedEof,
+                        "xz: stream cut short",
+                    ));
+                }
                 return Ok(0);
             }
             self.staged.clear();
             self.taken = 0;
             if !self.fill()? {
                 self.done = true;
-                // The input ended inside a stream: the rest of it is not here.
                 if self.mid_stream {
-                    return Err(std::io::Error::new(
-                        std::io::ErrorKind::UnexpectedEof,
-                        "xz: stream cut short",
-                    ));
+                    self.drain();
                 }
-                return Ok(0);
+                continue;
             }
             self.mid_stream = true;
             let mut buf = [0u8; OUT_STEP];
diff --git a/crates/exav-unpack/src/formats/xz_nocheck.rs b/crates/exav-unpack/src/formats/xz_nocheck.rs
new file mode 100644
index 00000000..4cba6718
--- /dev/null
+++ b/crates/exav-unpack/src/formats/xz_nocheck.rs
@@ -0,0 +1,405 @@
+//! xz streams whose integrity check `xz4rust` does not read, decoded without it.
+//!
+//! The format has sixteen check types: none, CRC32, CRC64 and SHA-256 are
+//! defined, and the rest reserved. The decoder reads none, CRC32 and CRC64 and
+//! refuses the others, but liblzma and the `xz` tool decode a stream with a
+//! check they do not support and warn that its integrity is unchecked. A scanner
+//! should look at the data either way, so a stream with such a check is
+//! rewritten as it is read: the same blocks with no check fields, an index
+//! without the check sizes in its records, and a header and footer saying "no
+//! check". The data are not touched.
+//!
+//! Only a stream that opens with an unsupported check is rewritten, and the
+//! streams after it that do the same. A stream with a check the decoder reads
+//! passes through byte for byte, as the rest of the input after it does.
+
+use std::io::{self, Read};
+
+const MAGIC: [u8; 6] = [0xFD, b'7', b'z', b'X', b'Z', 0];
+/// The largest index read: a record is a few bytes.
+const MAX_INDEX: usize = 64 << 20;
+
+/// Bytes of the check field for a check type (xz file format, 2.1.1.2).
+fn check_size(id: u8) -> usize {
+    if id == 0 { 0 } else { 4 << ((id - 1) / 3) }
+}
+
+/// Whether `xz4rust` reads the check.
+fn supported(id: u8) -> bool {
+    matches!(id, 0 | 1 | 4)
+}
+
+fn bad(what: &str) -> io::Error {
+    io::Error::new(io::ErrorKind::InvalidData, format!("xz: {what}"))
+}
+
+/// A variable-length integer, as xz codes sizes: 7 bits a byte, low first.
+fn vli_bytes(mut v: u64) -> Vec<u8> {
+    let mut out = Vec::new();
+    while v >= 0x80 {
+        out.push(v as u8 | 0x80);
+        v >>= 7;
+    }
+    out.push(v as u8);
+    out
+}
+
+/// The VLI at the start of `b`, and the bytes it takes.
+fn vli_at(b: &[u8]) -> Option<(u64, usize)> {
+    let mut v = 0u64;
+    for (i, &byte) in b.iter().take(9).enumerate() {
+        v |= u64::from(byte & 0x7F) << (7 * i);
+        if byte & 0x80 == 0 {
+            return Some((v, i + 1));
+        }
+    }
+    None
+}
+
+enum Mode {
+    /// Nothing read yet, or between streams.
+    Header,
+    /// Handing the input on unchanged.
+    Pass,
+    /// In a stream being rewritten: at the start of a block or the index.
+    Block,
+    /// In the LZMA2 data of a block, at the start of a chunk.
+    Chunks {
+        header: u64,
+        data: u64,
+    },
+    /// After a block's data, `header + data` bytes into it.
+    Tail {
+        header: u64,
+        data: u64,
+    },
+    /// In a block whose compressed size its header gives, `left` bytes to go.
+    Sized {
+        left: u64,
+        header: u64,
+        data: u64,
+    },
+    Done,
+}
+
+pub(crate) struct NoCheck<R> {
+    inner: R,
+    mode: Mode,
+    /// Bytes of check field to leave out of each block.
+    strip: usize,
+    out: Vec<u8>,
+    at: usize,
+}
+
+impl<R: Read> NoCheck<R> {
+    pub(crate) fn new(inner: R) -> Self {
+        NoCheck {
+            inner,
+            mode: Mode::Header,
+            strip: 0,
+            out: Vec::new(),
+            at: 0,
+        }
+    }
+
+    /// Up to `n` bytes of the input; fewer at its end.
+    fn take(&mut self, n: usize) -> io::Result<Vec<u8>> {
+        let mut buf = vec![0u8; n];
+        let mut got = 0;
+        while got < n {
+            match self.inner.read(&mut buf[got..]) {
+                Ok(0) => break,
+                Ok(k) => got += k,
+                Err(e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(e) => return Err(e),
+            }
+        }
+        buf.truncate(got);
+        Ok(buf)
+    }
+
+    /// Hands on what `take` got of `n` bytes; `None` and the end of the input
+    /// when it got fewer.
+    fn copy(&mut self, n: usize) -> io::Result<Option<()>> {
+        let b = self.take(n)?;
+        let whole = b.len() == n;
+        self.out.extend_from_slice(&b);
+        if !whole {
+            self.mode = Mode::Done;
+        }
+        Ok(whole.then_some(()))
+    }
+
+    /// A VLI read from the input, byte by byte, and its bytes.
+    fn read_vli(&mut self) -> io::Result<(u64, Vec<u8>)> {
+        let mut raw = Vec::new();
+        loop {
+            let b = self.take(1)?;
+            let Some(&byte) = b.first() else {
+                return Err(io::Error::new(
+                    io::ErrorKind::UnexpectedEof,
+                    "xz: index cut short",
+                ));
+            };
+            raw.push(byte);
+            if byte & 0x80 == 0 || raw.len() == 9 {
+                break;
+            }
+        }
+        vli_at(&raw)
+            .map(|(v, _)| (v, raw))
+            .ok_or_else(|| bad("bad index number"))
+    }
+
+    /// The 12 bytes that open a stream, `first` of them already read.
+    fn start(&mut self, mut header: Vec<u8>) -> io::Result<()> {
+        header.extend(self.take(12 - header.len())?);
+        let id = header.get(7).map(|b| b & 0x0F);
+        match id {
+            Some(id)
+                if header.len() == 12
+                    && header[..6] == MAGIC
+                    && header[6] == 0
+                    && header[7] >> 4 == 0
+                    && !supported(id) =>
+            {
+                self.strip = check_size(id);
+                self.out.extend_from_slice(&MAGIC);
+                self.out.extend_from_slice(&[0, 0]);
+                self.out
+                    .extend_from_slice(&crc32fast::hash(&[0, 0]).to_le_bytes());
+                self.mode = Mode::Block;
+            }
+            _ => {
+                self.out.extend_from_slice(&header);
+                self.mode = Mode::Pass;
+            }
+        }
+        Ok(())
+    }
+
+    /// One piece of the stream, rewritten into `out`.
+    fn step(&mut self) -> io::Result<()> {
+        match std::mem::replace(&mut self.mode, Mode::Done) {
+            Mode::Header => {
+                let first = self.take(4)?;
+                if first.is_empty() {
+                    return Ok(());
+                }
+                // Zero padding between streams goes on as it is.
+                if first == [0; 4] {
+                    self.out.extend_from_slice(&first);
+                    self.mode = Mode::Header;
+                    return Ok(());
+                }
+                self.start(first)
+            }
+            Mode::Block => {
+                let b = self.take(1)?;
+                match b.first() {
+                    None => Ok(()),
+                    Some(0) => self.index(),
+                    Some(&size) => self.block_header(size),
+                }
+            }
+            Mode::Sized { left, header, data } => {
+                let n = left.min(64 << 10) as usize;
+                if self.copy(n)?.is_some() {
+                    self.mode = if left > n as u64 {
+                        Mode::Sized {
+                            left: left - n as u64,
+                            header,
+                            data,
+                        }
+                    } else {
+                        Mode::Tail { header, data }
+                    };
+                }
+                Ok(())
+            }
+            Mode::Chunks { header, data } => self.chunk(header, data),
+            Mode::Tail { header, data } => {
+                let pad = (4 - (header + data) % 4) % 4;
+                if self.copy(pad as usize)?.is_some() {
+                    // The check field is left out.
+                    let skipped = self.take(self.strip)?;
+                    self.mode = if skipped.len() == self.strip {
+                        Mode::Block
+                    } else {
+                        Mode::Done
+                    };
+                }
+                Ok(())
+            }
+            Mode::Pass | Mode::Done => Ok(()),
+        }
+    }
+
+    /// A block header of `(size + 1) * 4` bytes, `size` being its first byte.
+    fn block_header(&mut self, size: u8) -> io::Result<()> {
+        let len = (usize::from(size) + 1) * 4;
+        let rest = self.take(len - 1)?;
+        self.out.push(size);
+        self.out.extend_from_slice(&rest);
+        if rest.len() < len - 1 {
+            return Ok(());
+        }
+        let flags = rest[0];
+        // The compressed size, when the header says it; the uncompressed size
+        // follows it and is not needed.
+        let compressed = if flags & 0x40 != 0 {
+            Some(vli_at(&rest[1..]).ok_or_else(|| bad("bad block header"))?.0)
+        } else {
+            None
+        };
+        let header = len as u64;
+        self.mode = match compressed {
+            Some(left) => Mode::Sized {
+                left,
+                header,
+                data: left,
+            },
+            None => Mode::Chunks { header, data: 0 },
+        };
+        Ok(())
+    }
+
+    /// One chunk of LZMA2 data: a control byte, its sizes, its bytes.
+    fn chunk(&mut self, header: u64, data: u64) -> io::Result<()> {
+        let Some(&control) = self.take(1)?.first() else {
+            return Ok(());
+        };
+        self.out.push(control);
+        let (fields, props) = match control {
+            0 => {
+                self.mode = Mode::Tail {
+                    header,
+                    data: data + 1,
+                };
+                return Ok(());
+            }
+            1 | 2 => (2, 0),
+            0x80..=0xFF => (4, usize::from(control >= 0xC0)),
+            _ => return Err(bad("bad LZMA2 chunk")),
+        };
+        let sizes = self.take(fields + props)?;
+        self.out.extend_from_slice(&sizes);
+        if sizes.len() < fields + props {
+            return Ok(());
+        }
+        let packed = if control < 3 {
+            usize::from(u16::from_be_bytes([sizes[0], sizes[1]])) + 1
+        } else {
+            usize::from(u16::from_be_bytes([sizes[2], sizes[3]])) + 1
+        };
+        let total = 1 + (fields + props) as u64 + packed as u64;
+        if self.copy(packed)?.is_some() {
+            self.mode = Mode::Chunks {
+                header,
+                data: data + total,
+            };
+        }
+        Ok(())
+    }
+
+    /// The index and the footer, rewritten for a stream with no check fields.
+    fn index(&mut self) -> io::Result<()> {
+        let (count, count_raw) = self.read_vli()?;
+        let mut taken = 1 + count_raw.len();
+        let mut index = vec![0u8];
+        index.extend_from_slice(&vli_bytes(count));
+        for _ in 0..count {
+            let (unpadded, a) = self.read_vli()?;
+            let (uncompressed, b) = self.read_vli()?;
+            taken += a.len() + b.len();
+            let unpadded = unpadded
+                .checked_sub(self.strip as u64)
+                .filter(|&n| n > 0)
+                .ok_or_else(|| bad("bad index record"))?;
+            index.extend_from_slice(&vli_bytes(unpadded));
+            index.extend_from_slice(&vli_bytes(uncompressed));
+            if taken > MAX_INDEX {
+                return Err(bad("index too large"));
+            }
+        }
+        // The padding and the CRC-32 of the input's index: ours are made anew.
+        let padding = (4 - taken % 4) % 4;
+        if self.take(padding + 4)?.len() < padding + 4 {
+            return Err(io::Error::new(
+                io::ErrorKind::UnexpectedEof,
+                "xz: index cut short",
+            ));
+        }
+        index.resize(index.len().next_multiple_of(4), 0);
+        let crc = crc32fast::hash(&index);
+        let backward = ((index.len() + 4) / 4 - 1) as u32;
+        let footer = self.take(12)?;
+        if footer.len() < 12 || footer[10..] != *b"YZ" {
+            return Err(bad("bad stream footer"));
+        }
+        self.out.extend_from_slice(&index);
+        self.out.extend_from_slice(&crc.to_le_bytes());
+        let mut tail = backward.to_le_bytes().to_vec();
+        tail.extend_from_slice(&[0, 0]);
+        self.out
+            .extend_from_slice(&crc32fast::hash(&tail).to_le_bytes());
+        self.out.extend_from_slice(&tail);
+        self.out.extend_from_slice(b"YZ");
+        self.mode = Mode::Header;
+        Ok(())
+    }
+}
+
+impl<R: Read> Read for NoCheck<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        loop {
+            if self.at < self.out.len() {
+                let n = (self.out.len() - self.at).min(buf.len());
+                buf[..n].copy_from_slice(&self.out[self.at..self.at + n]);
+                self.at += n;
+                return Ok(n);
+            }
+            self.out.clear();
+            self.at = 0;
+            match self.mode {
+                Mode::Pass => return self.inner.read(buf),
+                Mode::Done => return Ok(0),
+                _ => self.step()?,
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Whatever the bytes, reading ends: with data or an error, never a panic
+    /// or a loop. Streams with a byte changed, or cut.
+    #[test]
+    fn damaged_streams_end() {
+        let seeds = [
+            &include_bytes!("../../tests/fixtures/xz_checks/reserved_12.xz")[..],
+            &include_bytes!("../../tests/fixtures/xz_checks/sha256.xz")[..],
+        ];
+        let mut state = 0x9E37_79B9_7F4A_7C15u64;
+        let mut next = move || {
+            state ^= state << 13;
+            state ^= state >> 7;
+            state ^= state << 17;
+            state
+        };
+        for seed in seeds {
+            for _ in 0..3000 {
+                let mut blob = seed.to_vec();
+                for _ in 0..1 + next() % 3 {
+                    let at = next() as usize % blob.len();
+                    blob[at] = next() as u8;
+                }
+                blob.truncate(1 + next() as usize % blob.len());
+                let mut out = Vec::new();
+                let _ = NoCheck::new(&blob[..]).read_to_end(&mut out);
+            }
+        }
+    }
+}
diff --git a/crates/exav-unpack/src/formats/zip.rs b/crates/exav-unpack/src/formats/zip.rs
index d134ca3c..dfc77e9a 100644
--- a/crates/exav-unpack/src/formats/zip.rs
+++ b/crates/exav-unpack/src/formats/zip.rs
@@ -285,17 +285,24 @@ pub(crate) fn raw_decoder<'a, R: Read + 'a>(
 }
 
 /// [`raw_decoder`] over bytes in hand, read whole up to `cap`. `None` when
-/// there is no decoder or decoding failed; the flag is set when the member
-/// is larger than `cap`.
+/// there is no decoder or the codec's header is unreadable. A stream that
+/// fails part way gives the bytes decoded before the failure, with the
+/// damage in the result ([`crate::Salvaged`]); one larger than `cap` has
+/// `over_cap` set.
 pub(crate) fn decode_zip_raw(
     method: u16,
     raw: &[u8],
     usz: Option<u64>,
     cap: u64,
-) -> Option<(Vec<u8>, bool)> {
+) -> Option<crate::Salvaged> {
     match raw_decoder(method, raw, usz, cap) {
-        Ok(r) => bounded_read(r, cap).ok(),
-        Err(RawRefusal::TooBig) => Some((Vec::new(), true)),
+        Ok(r) => bounded_read_salvage(r, cap, true).ok(),
+        Err(RawRefusal::TooBig) => Some(crate::Salvaged {
+            data: Vec::new(),
+            over_cap: true,
+            undecoded: false,
+            cut_short: false,
+        }),
         Err(RawRefusal::Unsupported(_) | RawRefusal::Truncated) => None,
     }
 }
@@ -507,6 +514,21 @@ fn open_archive<R: Read + Seek + Clone>(
     ::zip::ZipArchive::new(Patched::new(reader))
 }
 
+/// Where a ZIP begins when it is appended to something else: the bytes before
+/// it count in no offset of its, and `unzip` finds it by its end record, which
+/// is at the end of the file. `None` for a file that is not one, or that starts
+/// where its offsets say.
+pub fn appended_start(src: &dyn crate::source::ByteSource) -> Option<u64> {
+    let mut r = crate::source::Reader::new(src);
+    // The longest comment an end record may carry, and the record.
+    match directory_shift_within(&mut r, 2 * 65_536)? {
+        Shift::Prepended(n) if n > 0 && src.window(n as usize, 4).starts_with(b"PK\x03\x04") => {
+            Some(n)
+        }
+        _ => None,
+    }
+}
+
 /// Where a ZIP's central directory is, against where its end record says.
 enum Shift {
     /// `n` bytes precede the archive, and every offset counts from its start.
@@ -565,6 +587,14 @@ impl<R: Seek> Seek for Patched<R> {
 /// crate tries first. `None` for ZIP64, an empty archive, or no central header
 /// where that record puts the directory.
 fn directory_shift<R: Read + Seek>(r: &mut R) -> Option<Shift> {
+    directory_shift_within(r, u64::MAX)
+}
+
+/// [`directory_shift`] looking at the last `reach` bytes of the file and no
+/// further back. An end record that closes an archive stapled to the end of a
+/// file is within the longest comment of it, so a search for one that reads
+/// the whole of a large file is a pass over it for nothing.
+fn directory_shift_within<R: Read + Seek>(r: &mut R, reach: u64) -> Option<Shift> {
     use std::io::SeekFrom;
     const EOCD_LEN: usize = 22;
     const CHUNK: u64 = 1 << 16;
@@ -590,7 +620,7 @@ fn directory_shift<R: Read + Seek>(r: &mut R) -> Option<Shift> {
                 break 'found at;
             }
         }
-        if start == 0 {
+        if start == 0 || len - start >= reach {
             return None;
         }
         end = start + 3;
@@ -663,9 +693,32 @@ fn scan_orphan_locals<R>(
     // Local-header offsets the central directory already covered.
     let mut known = std::collections::HashSet::new();
     if let Ok(mut zip) = open_archive(Cursor::new(data)) {
+        let read = |at: u64, len: usize| {
+            usize::try_from(at)
+                .ok()
+                .and_then(|at| crate::bytes::at(data, at, len))
+                .map_or_else(
+                    || {
+                        let from = usize::try_from(at).unwrap_or(usize::MAX).min(data.len());
+                        data[from..].iter().take(len).copied().collect()
+                    },
+                    <[u8]>::to_vec,
+                )
+        };
         for i in 0..zip.len() {
             if let Ok(f) = zip.by_index_raw(i) {
-                known.insert(f.header_start() as usize);
+                let start = f.header_start();
+                // A member whose local header says otherwise than the
+                // directory is read once more, as the local header says.
+                if local_header_agrees(
+                    &read,
+                    start,
+                    f.name_raw(),
+                    zip_method_code(&f.compression()),
+                    f.compressed_size(),
+                ) {
+                    known.insert(start as usize);
+                }
             }
         }
     }
@@ -691,10 +744,10 @@ fn scan_orphan_locals<R>(
         if !plausible_local_header(data, off) {
             continue;
         }
-        if let Some(entry) = parse_local_member(data, off, true, budget)? {
-            if let Some(r) = visit(entry, budget) {
-                return Ok(Some(r));
-            }
+        if let Some(entry) = parse_local_member(data, off, true, budget)?
+            && let Some(r) = visit(entry, budget)
+        {
+            return Ok(Some(r));
         }
     }
     Ok(None)
@@ -1127,7 +1180,7 @@ fn parse_local_member(
                         "streaming zip member with unrecoverable size (orphan local header)",
                         false,
                         budget,
-                    )
+                    );
                 }
             },
         }
@@ -1224,7 +1277,7 @@ fn parse_local_member(
                     comp,
                     false,
                     "unsupported zip compression method (orphan local header)",
-                )))
+                )));
             }
         },
     };
@@ -1262,6 +1315,7 @@ const PAST_END: &str =
 /// declaring 0 bytes compressed and uncompressed is empty (Civil 3D writes
 /// them; Python's zipfile reads them so), not a stream cut before its first
 /// block.
+#[inline(never)]
 pub(crate) fn member_reader<'a, R: Read + Seek>(
     zip: &'a mut ::zip::ZipArchive<R>,
     i: usize,
@@ -1559,11 +1613,25 @@ pub fn extract_zip_from<Rd: Read + Seek + Clone, R>(
         // metadata-only unsupported member and the archive keeps going — one bad
         // member never aborts the whole ZIP.
         let (buf, truncated, part_way) = if !crate_decodes(method) {
-            let (raw, _) = bounded_read(&mut file, budget.limits.max_buffer_bytes)
+            let (raw, raw_over) = bounded_read(&mut file, budget.limits.max_buffer_bytes)
                 .map_err(|e| LimitHit::new(format!("zip raw read: {e}")))?;
             drop(file);
+            // The compressed bytes themselves past the buffer limit: what is
+            // here is a prefix of the member, not the member.
+            if raw_over {
+                if let Some(r) = oversized(budget, "archive member exceeds size budget") {
+                    return Ok(Some(r));
+                }
+                continue;
+            }
             match decode_zip_raw(method, &raw, Some(usz), cap) {
-                Some((out, truncated)) => (out, truncated, false),
+                // All of the member's compressed bytes were here, so a stream
+                // that ran out of them hides nothing, but it is not the
+                // member the directory declares, whose size it does not reach.
+                Some(s) => {
+                    let part_way = s.undecoded || s.cut_short || s.data.len() as u64 != usz;
+                    (s.data, s.over_cap, part_way)
+                }
                 None => {
                     if let Some(r) = oversized(budget, "archive member: unsupported ZIP codec") {
                         return Ok(Some(r));
@@ -1628,6 +1696,7 @@ pub fn extract_zip_from<Rd: Read + Seek + Clone, R>(
 /// members are laid out end to end, this is empty and costs nothing.
 fn unclaimed_spans<R: Read + Seek>(
     zip: &mut ::zip::ZipArchive<R>,
+    read: &dyn Fn(u64, usize) -> Vec<u8>,
 ) -> (Vec<(u64, u64)>, std::collections::HashSet<u64>) {
     let cd = zip.central_directory_start();
     let mut claimed: Vec<(u64, u64)> = Vec::with_capacity(zip.len());
@@ -1635,6 +1704,18 @@ fn unclaimed_spans<R: Read + Seek>(
     for i in 0..zip.len() {
         if let Ok(f) = zip.by_index_raw(i) {
             let start = f.header_start();
+            // A member the local header describes otherwise is read as the
+            // local header says too, by the orphan scan: it is not known, and
+            // it claims no space, least of all the bytes of another member.
+            if !local_header_agrees(
+                read,
+                start,
+                f.name_raw(),
+                zip_method_code(&f.compression()),
+                f.compressed_size(),
+            ) {
+                continue;
+            }
             known.insert(start);
             // A member using a trailing data descriptor declares no data start,
             // so its extent is not knowable here. Claiming only the header
@@ -1666,6 +1747,41 @@ fn unclaimed_spans<R: Read + Seek>(
     (gaps, known)
 }
 
+/// Whether the local header at `start` says of a member what the central
+/// directory says: its name, its method, and its compressed size when the
+/// header carries one.
+///
+/// Readers differ in which they believe. The `zip` crate decodes with the
+/// directory's method and size, and Info-ZIP `unzip` with the local header's, so
+/// an archive whose two disagree holds one thing for one and another for the
+/// other. `read(offset, len)` returns what is there, short at the end of the
+/// input. A header that cannot be read as one is left to the errors the member's
+/// own open gives.
+fn local_header_agrees(
+    read: &dyn Fn(u64, usize) -> Vec<u8>,
+    start: u64,
+    name_raw: &[u8],
+    method: u16,
+    comp: u64,
+) -> bool {
+    let h = read(start, LFH_LEN);
+    if h.len() < LFH_LEN || h[..4] != *b"PK\x03\x04" {
+        return true;
+    }
+    let flags = u16::from_le_bytes([h[6], h[7]]);
+    if u16::from_le_bytes([h[8], h[9]]) != method {
+        return false;
+    }
+    // The sizes follow the data (bit 3), or are in a ZIP64 field (all ones).
+    let local_comp = u32::from_le_bytes([h[18], h[19], h[20], h[21]]);
+    if flags & 0x08 == 0 && local_comp != u32::MAX && u64::from(local_comp) != comp {
+        return false;
+    }
+    let name_len = usize::from(u16::from_le_bytes([h[26], h[27]]));
+    let name = read(start + LFH_LEN as u64, name_len);
+    name.len() < name_len || name == name_raw
+}
+
 /// Whether the local header at `off` names a member with something to scan:
 /// not a directory entry (no data, a name ending in '/'), and readable.
 /// Parses the header only; [`parse_local_member`] reads the member.
@@ -1805,12 +1921,63 @@ fn zip_mtime<'a>(
 /// crate's decompressing reader, so a member decompressing to any size is
 /// never held. An encrypted member is decrypted whole (decryption needs the
 /// full ciphertext), bounded by the buffer limit.
+/// What `walk` takes from the directory entry of a member.
+struct RawEntry {
+    name: String,
+    is_dir: bool,
+    encrypted: bool,
+    comp: u64,
+    size: u64,
+    method: u16,
+    mtime: Option<crate::Mtime>,
+    mode: Option<u32>,
+    local: Option<u16>,
+}
+
+// The three below open a `ZipFile`, which holds the decoders of every codec
+// inline: tens of kilobytes. Opened in `walk` itself, one would be in its frame
+// for as long as a member is scanned, and a ZIP inside a ZIP inside a ZIP
+// takes that once for each level.
+
+#[inline(never)]
+fn raw_entry<R: Read + Seek>(
+    zip: &mut ::zip::ZipArchive<R>,
+    src: &dyn crate::source::ByteSource,
+    i: usize,
+) -> ::zip::result::ZipResult<RawEntry> {
+    let f = zip.by_index_raw(i)?;
+    Ok(RawEntry {
+        name: member_name(&f),
+        is_dir: f.is_dir(),
+        encrypted: f.encrypted(),
+        comp: f.compressed_size(),
+        size: f.size(),
+        method: zip_method_code(&f.compression()),
+        mtime: zip_mtime(f.extra_data_fields(), f.last_modified()),
+        mode: f.unix_mode(),
+        local: local_flags(&src.window(f.header_start() as usize, 8)),
+    })
+}
+
+#[inline(never)]
+fn header_parses<R: Read + Seek>(
+    zip: &mut ::zip::ZipArchive<R>,
+    i: usize,
+) -> ::zip::result::ZipResult<()> {
+    zip.by_index_raw(i).map(|_| ())
+}
+
+#[inline(never)]
+fn member_decodes<R: Read + Seek>(zip: &mut ::zip::ZipArchive<R>, i: usize) -> bool {
+    zip.by_index(i).is_ok()
+}
+
 pub(crate) fn walk<T>(
     src: &dyn crate::source::ByteSource,
     budget: &mut Budget,
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
-    use crate::stream::{emit_entry, emit_stream, whole, MemberMeta};
+    use crate::stream::{MemberMeta, emit_entry, emit_stream, whole};
     // A forged or corrupt central directory (a bad CDFH offset in the EOCD,
     // say) makes the seekable walk impossible, but the members' local file
     // headers are still in the file. Fall back to reading the archive whole
@@ -1831,7 +1998,7 @@ pub(crate) fn walk<T>(
         // strand every later member: the salvage pass skips them as already
         // covered, so a payload behind one bad directory pointer would never
         // be scanned.
-        if let Err(e) = zip.by_index_raw(i).map(|_| ()) {
+        if let Err(e) = header_parses(&mut zip, i) {
             let hit = zip_entry_error(i, &e);
             if !hit.is_corrupt() {
                 return Err(hit);
@@ -1846,20 +2013,17 @@ pub(crate) fn walk<T>(
             }
             continue;
         }
-        let (name, is_dir, encrypted, comp, size, method, mtime, mode, local) = {
-            let f = zip.by_index_raw(i).map_err(|e| zip_entry_error(i, &e))?;
-            (
-                member_name(&f),
-                f.is_dir(),
-                f.encrypted(),
-                f.compressed_size(),
-                f.size(),
-                zip_method_code(&f.compression()),
-                zip_mtime(f.extra_data_fields(), f.last_modified()),
-                f.unix_mode(),
-                local_flags(&src.window(f.header_start() as usize, 8)),
-            )
-        };
+        let RawEntry {
+            name,
+            is_dir,
+            encrypted,
+            comp,
+            size,
+            method,
+            mtime,
+            mode,
+            local,
+        } = raw_entry(&mut zip, src, i).map_err(|e| zip_entry_error(i, &e))?;
         // `is_dir()` is true purely because the name ends in '/'. A JAR packer
         // buys exactly that: `kingDavid/9.class/` holds a real deflate-compressed
         // class that the JVM loads by name, while every ZIP tool discards it as a
@@ -1913,8 +2077,7 @@ pub(crate) fn walk<T>(
         // decoder, so fall back to the raw bytes and decode them ourselves,
         // as `extract_zip_from` does. Probe first so the borrow of `zip` ends
         // before the fallback needs it.
-        let decodable = zip.by_index(i).is_ok();
-        let mut file = match decodable {
+        let mut file = match member_decodes(&mut zip, i) {
             true => member_reader(&mut zip, i).map_err(|e| zip_entry_error(i, &e))?,
             false => {
                 let out = walk_raw_decode(&mut zip, src, i, meta, budget, visit, &mut deferred)?;
@@ -1930,7 +2093,7 @@ pub(crate) fn walk<T>(
     }
     // Members left out of the central directory while their local headers and
     // data stay in the file, which is what the target extracts.
-    for entry in hidden_members(zip, budget)? {
+    for entry in hidden_members(zip, src, budget)? {
         if let Some(t) = emit_entry(entry, budget, visit)? {
             return Ok(Some(t));
         }
@@ -1938,11 +2101,41 @@ pub(crate) fn walk<T>(
     deferred.map_or(Ok(None), Err)
 }
 
+/// A member's raw bytes behind the decoder for its method.
+struct RawMember<'a> {
+    method: u16,
+    usz: u64,
+    data_start: Option<u64>,
+    decoder: Result<Box<dyn Read + 'a>, RawRefusal>,
+}
+
+/// Opens member `i` raw and puts its decoder on it. Kept out of
+/// `walk_raw_decode`: a `ZipFile` is tens of kilobytes, and a frame that held
+/// one would stay on the stack while the member is scanned.
+#[inline(never)]
+fn raw_member<'a, R: Read + Seek>(
+    zip: &'a mut ::zip::ZipArchive<R>,
+    i: usize,
+    cap: u64,
+) -> Option<RawMember<'a>> {
+    let f = zip.by_index_raw(i).ok()?;
+    let method = zip_method_code(&f.compression());
+    let usz = f.size();
+    let data_start = f.data_start();
+    Some(RawMember {
+        method,
+        usz,
+        data_start,
+        decoder: raw_decoder(method, f, Some(usz), cap),
+    })
+}
+
 /// Decode a member the `zip` crate refused, from its RAW bytes, using exav's own
 /// codec set, as it is read. The member is visited once: decoded, or as a
 /// marker saying why it could not be. A decoder needing more memory than the
 /// buffer limit leaves the member unread, and the limit goes in `deferred`
 /// for the walk to report once the other members are scanned.
+#[inline(never)]
 fn walk_raw_decode<R: Read + Seek, T>(
     zip: &mut ::zip::ZipArchive<R>,
     src: &dyn crate::source::ByteSource,
@@ -1953,17 +2146,17 @@ fn walk_raw_decode<R: Read + Seek, T>(
     deferred: &mut Option<LimitHit>,
 ) -> Result<Option<T>, LimitHit> {
     let cap = budget.limits.max_buffer_bytes;
-    let f = match zip.by_index_raw(i) {
-        Ok(f) => f,
-        Err(_) => {
-            meta.unsupported = Some("ZIP member header will not parse");
-            return Ok(visit(&meta, None, budget));
-        }
+    let Some(RawMember {
+        method,
+        usz,
+        data_start,
+        decoder,
+    }) = raw_member(zip, i, cap)
+    else {
+        meta.unsupported = Some("ZIP member header will not parse");
+        return Ok(visit(&meta, None, budget));
     };
-    let method = zip_method_code(&f.compression());
-    let usz = f.size();
-    let data_start = f.data_start();
-    match raw_decoder(method, f, Some(usz), cap) {
+    match decoder {
         Ok(mut r) => crate::stream::emit_stream(&meta, &mut r, budget, visit),
         Err(RawRefusal::Unsupported(_)) if !defined_method(method) && data_start.is_some() => {
             // A method no ZIP specification defines is no codec at all.
@@ -2006,6 +2199,7 @@ fn walk_raw_decode<R: Read + Seek, T>(
 /// One encrypted ZIP member: try the password pool and hand over the
 /// plaintext on success, else a metadata-only unsupported member, so the
 /// caller reports it without masking later members.
+#[inline(never)]
 fn walk_encrypted<R: Read + Seek, T>(
     zip: &mut ::zip::ZipArchive<R>,
     i: usize,
@@ -2013,7 +2207,7 @@ fn walk_encrypted<R: Read + Seek, T>(
     budget: &mut Budget,
     visit: crate::stream::Visit<T>,
 ) -> Result<Option<T>, LimitHit> {
-    use crate::stream::{emit_bytes, MemberMeta};
+    use crate::stream::{MemberMeta, emit_bytes};
     let unsupported_meta = MemberMeta {
         encrypted: true,
         unsupported: Some("encrypted ZIP member"),
@@ -2067,11 +2261,15 @@ fn walk_encrypted<R: Read + Seek, T>(
 /// bounded search [`ZipMembers`] uses: only the space the directory leaves
 /// unaccounted for is read, up to [`MAX_ORPHAN_SCAN`], and a search that stops
 /// there yields a member saying so.
+#[inline(never)]
 pub(crate) fn hidden_members<Rd: Read + Seek>(
     mut zip: ::zip::ZipArchive<Rd>,
+    src: &dyn crate::source::ByteSource,
     budget: &mut Budget,
 ) -> Result<Vec<Entry>, LimitHit> {
-    let (gaps, known) = unclaimed_spans(&mut zip);
+    let (gaps, known) = unclaimed_spans(&mut zip, &|at, len| {
+        usize::try_from(at).map_or_else(|_| Vec::new(), |at| src.window(at, len).into_owned())
+    });
     if gaps.is_empty() {
         return Ok(Vec::new());
     }
@@ -2100,6 +2298,43 @@ pub(crate) fn hidden_members<Rd: Read + Seek>(
 /// The member that says the search for hidden members stopped at its limit.
 const HIDDEN_SEARCH_TRUNCATED: &str = "<hidden-member search stopped at its limit>";
 
+/// The search for a ZIP stapled to the end of a file reads the end of it.
+#[cfg(test)]
+mod appended_start_tests {
+    use super::*;
+    use std::sync::Arc;
+    use std::sync::atomic::{AtomicU64, Ordering};
+
+    struct Tally(std::io::Cursor<Vec<u8>>, Arc<AtomicU64>);
+    impl Read for Tally {
+        fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+            let n = self.0.read(buf)?;
+            self.1.fetch_add(n as u64, Ordering::Relaxed);
+            Ok(n)
+        }
+    }
+    impl Seek for Tally {
+        fn seek(&mut self, p: std::io::SeekFrom) -> std::io::Result<u64> {
+            self.0.seek(p)
+        }
+    }
+
+    #[test]
+    fn a_file_with_no_end_record_is_not_read_through_for_one() {
+        let read = Arc::new(AtomicU64::new(0));
+        let cache = crate::source::BlockCache::with_sizes(
+            Tally(std::io::Cursor::new(vec![b'x'; 8 << 20]), read.clone()),
+            64 * 1024,
+            1 << 20,
+        )
+        .unwrap();
+        let before = read.load(Ordering::Relaxed);
+        assert_eq!(appended_start(&cache), None);
+        let used = read.load(Ordering::Relaxed) - before;
+        assert!(used <= 1 << 20, "{used} bytes read for an 8 MiB file");
+    }
+}
+
 #[cfg(test)]
 mod orphan_scan_tests {
     use super::*;
@@ -2196,6 +2431,118 @@ mod directory_tests {
     }
 }
 
+/// The buffered path (`extract_zip_from`) over a member of a codec the `zip`
+/// crate does not decode.
+#[cfg(all(test, feature = "bzip2"))]
+mod buffered_raw_tests {
+    use super::*;
+    use std::io::Write;
+
+    /// A one-member ZIP, central directory included.
+    fn zip_of(method: u16, raw: &[u8], crc: u32, usz: u32) -> Vec<u8> {
+        let fields = |v: &mut Vec<u8>| {
+            v.extend_from_slice(&20u16.to_le_bytes());
+            v.extend_from_slice(&0u16.to_le_bytes());
+            v.extend_from_slice(&method.to_le_bytes());
+            v.extend_from_slice(&[0; 4]);
+            v.extend_from_slice(&crc.to_le_bytes());
+            v.extend_from_slice(&(raw.len() as u32).to_le_bytes());
+            v.extend_from_slice(&usz.to_le_bytes());
+            v.extend_from_slice(&5u16.to_le_bytes());
+            v.extend_from_slice(&0u16.to_le_bytes());
+        };
+        let mut z = b"PK\x03\x04".to_vec();
+        fields(&mut z);
+        z.extend_from_slice(b"m.bin");
+        z.extend_from_slice(raw);
+        let mut cd = b"PK\x01\x02".to_vec();
+        cd.extend_from_slice(&20u16.to_le_bytes());
+        fields(&mut cd);
+        cd.extend_from_slice(&[0; 6]);
+        cd.extend_from_slice(&0u32.to_le_bytes());
+        cd.extend_from_slice(&0u32.to_le_bytes());
+        cd.extend_from_slice(b"m.bin");
+        let cd_at = z.len() as u32;
+        z.extend_from_slice(&cd);
+        z.extend_from_slice(b"PK\x05\x06\0\0\0\0\x01\0\x01\0");
+        z.extend_from_slice(&(cd.len() as u32).to_le_bytes());
+        z.extend_from_slice(&cd_at.to_le_bytes());
+        z.extend_from_slice(&0u16.to_le_bytes());
+        z
+    }
+
+    fn noise(n: usize) -> Vec<u8> {
+        let mut x: u32 = 0x1234_5678;
+        (0..n)
+            .map(|_| {
+                x ^= x << 13;
+                x ^= x >> 17;
+                x ^= x << 5;
+                (x >> 24) as u8
+            })
+            .collect()
+    }
+
+    fn bzip2(data: &[u8]) -> Vec<u8> {
+        let mut w = ::bzip2::write::BzEncoder::new(Vec::new(), ::bzip2::Compression::new(1));
+        w.write_all(data).unwrap();
+        w.finish().unwrap()
+    }
+
+    fn entries(zip: &[u8]) -> Vec<Entry> {
+        let mut out = Vec::new();
+        let mut budget = Budget::new(crate::Limits::default());
+        extract_zip_from(
+            Cursor::new(zip),
+            &mut budget,
+            &mut |e: Entry, _: &mut Budget| {
+                out.push(e);
+                None::<()>
+            },
+        )
+        .unwrap();
+        out
+    }
+
+    /// Three 100 kB blocks, the last damaged: the first two are scanned and the
+    /// member is reported.
+    #[test]
+    fn a_member_damaged_part_way_keeps_its_prefix_and_is_reported() {
+        let data = noise(270_000);
+        let mut raw = bzip2(&data);
+        let at = raw.len() * 4 / 5;
+        raw[at..].fill(0xff);
+        let e = entries(&zip_of(12, &raw, 0, data.len() as u32));
+        assert_eq!(e.len(), 1);
+        assert!(
+            e[0].data.len() >= 100_000 && data.starts_with(&e[0].data),
+            "the blocks before the damage are lost: {} bytes",
+            e[0].data.len()
+        );
+        assert!(
+            e[0].unsupported.is_some(),
+            "a member damaged part way came out whole"
+        );
+    }
+
+    #[test]
+    fn a_whole_member_is_not_reported() {
+        let data = noise(270_000);
+        let e = entries(&zip_of(12, &bzip2(&data), 0, data.len() as u32));
+        assert!(e[0].unsupported.is_none() && e[0].data == data);
+    }
+
+    /// A stream that ends whole but short of the size the directory declares is
+    /// not that member.
+    #[test]
+    fn a_member_shorter_than_declared_is_reported() {
+        let data = noise(1000);
+        let e = entries(&zip_of(12, &bzip2(&data), 0, 5000));
+        assert_eq!(e[0].data, data);
+        assert!(e[0].unsupported.is_some());
+    }
+}
+
 #[cfg(test)]
 mod zip_ppmd_tests {
     use super::*;
@@ -2239,10 +2586,8 @@ mod zip_ppmd_tests {
     fn ppmd_model_over_the_buffer_limit_is_too_big() {
         // order 6, 256 MB.
         let raw = [0xf5u8, 0x0f, 0xde, 0xad, 0xbe, 0xef];
-        assert_eq!(
-            decode_zip_raw(98, &raw, Some(64), 1 << 20),
-            Some((Vec::new(), true))
-        );
+        let s = decode_zip_raw(98, &raw, Some(64), 1 << 20).unwrap();
+        assert!(s.over_cap && s.data.is_empty() && !s.undecoded);
         assert!(matches!(
             raw_decoder(98, &raw[..], Some(64), 1 << 20),
             Err(RawRefusal::TooBig)
@@ -2256,9 +2601,10 @@ mod zip_ppmd_tests {
         let cap = budget.reserve().unwrap();
         // Valid parameter header, garbage stream.
         let raw = [0x07u8, 0x01, 0xde, 0xad, 0xbe, 0xef];
+        let s = decode_zip_raw(98, &raw, Some(64), cap).expect("a decoder is there");
         assert!(
-            decode_zip_raw(98, &raw, Some(64), cap).is_none(),
-            "a corrupt PPMd stream must decode to nothing, so the caller reports it"
+            s.undecoded || s.cut_short,
+            "a corrupt PPMd stream must say so, for the caller to report it"
         );
     }
 
@@ -2270,7 +2616,7 @@ mod zip_ppmd_tests {
             env!("CARGO_MANIFEST_DIR"),
             "/tests/fixtures/zip/7z_ppmd_large_then_small.zip"
         );
-        let zip = std::fs::read(path).unwrap();
+        let zip = crate::read_fixture(path).unwrap();
         let u32_at = |o: usize| u32::from_le_bytes(zip[o..o + 4].try_into().unwrap());
         let u16_at = |o: usize| u16::from_le_bytes([zip[o], zip[o + 1]]) as usize;
         let (comp, usz) = (u32_at(18) as usize, Some(u32_at(22) as u64));
@@ -2278,8 +2624,15 @@ mod zip_ppmd_tests {
         let member = &zip[start..start + comp];
         assert_eq!(member[..2], [0x0b, 0x10]);
         let cap = 1 << 20;
-        let (whole, over) = decode_zip_raw(98, member, usz, cap).expect("intact member decodes");
-        assert_eq!((Some(whole.len() as u64), over), (usz, false));
+        let whole = decode_zip_raw(98, member, usz, cap).expect("intact member decodes");
+        assert_eq!(
+            (
+                Some(whole.data.len() as u64),
+                whole.over_cap,
+                whole.undecoded
+            ),
+            (usz, false, false)
+        );
 
         let flips = (2..18)
             .flat_map(|p| (0..8).map(move |b| (p, b)))
@@ -2287,15 +2640,20 @@ mod zip_ppmd_tests {
         for (pos, bit) in flips {
             let mut bad = member.to_vec();
             bad[pos] ^= 1 << bit;
-            if let Some((out, _)) = decode_zip_raw(98, &bad, usz, cap) {
-                assert!(Some(out.len() as u64) <= usz);
+            if let Some(s) = decode_zip_raw(98, &bad, usz, cap) {
+                assert!(Some(s.data.len() as u64) <= usz);
             }
         }
         for cut in (0..member.len()).step_by(97) {
-            assert!(
-                decode_zip_raw(98, &member[..cut], usz, cap).is_none(),
-                "cut at {cut}: a truncated member is not a decoded one"
-            );
+            // The header's two bytes cut, nothing decodes; later, a prefix does
+            // and the cut is the stream's running out, never a whole member.
+            match decode_zip_raw(98, &member[..cut], usz, cap) {
+                None => assert!(cut < 2, "cut at {cut}: no decoder"),
+                Some(s) => assert!(
+                    Some(s.data.len() as u64) < usz && (s.cut_short || s.undecoded),
+                    "cut at {cut}: a truncated member is not a decoded one"
+                ),
+            }
         }
     }
 }
diff --git a/crates/exav-unpack/src/formats/zip_crypto.rs b/crates/exav-unpack/src/formats/zip_crypto.rs
index fe7fe98c..1ddcdc2a 100644
--- a/crates/exav-unpack/src/formats/zip_crypto.rs
+++ b/crates/exav-unpack/src/formats/zip_crypto.rs
@@ -54,7 +54,9 @@ pub(crate) fn decrypt_aes(body: &[u8], strength: u8, password: &[u8]) -> Option<
     let mac_key = &derived[key_len..key_len * 2];
     let verifier = &derived[key_len * 2..];
 
-    if !constant_time_eq::constant_time_eq(verifier, pw_verify) {
+    // Plain comparisons: the password is the caller's own and the file is the
+    // attacker's, so there is no secret for timing to leak.
+    if verifier != pw_verify {
         return None;
     }
 
@@ -62,7 +64,7 @@ pub(crate) fn decrypt_aes(body: &[u8], strength: u8, password: &[u8]) -> Option<
     let mut mac = HmacSha1::new_from_slice(mac_key).ok()?;
     mac.update(ct);
     let full = mac.finalize().into_bytes();
-    if !constant_time_eq::constant_time_eq(&full[..10], stored_mac) {
+    if full[..10] != *stored_mac {
         return None;
     }
 
diff --git a/crates/exav-unpack/src/formats/zoo.rs b/crates/exav-unpack/src/formats/zoo.rs
index 8537a225..c7f38906 100644
--- a/crates/exav-unpack/src/formats/zoo.rs
+++ b/crates/exav-unpack/src/formats/zoo.rs
@@ -20,7 +20,7 @@
 //! With checksums verified (`Budget::set_verify_checksums`) the entry also
 //! carries the mismatch.
 
-use super::zoo_parse::{crc16_arc, DirEntry, Header, Method, DIRENT_HEADER_SIZE, ZOO_HEADER_SIZE};
+use super::zoo_parse::{DIRENT_HEADER_SIZE, DirEntry, Header, Method, ZOO_HEADER_SIZE, crc16_arc};
 use crate::{Budget, Entry, LimitHit, Sink};
 
 /// Bound on the directory walk; hitting it is reported, never a quiet stop.
diff --git a/crates/exav-unpack/src/formats/zstd.rs b/crates/exav-unpack/src/formats/zstd.rs
index 3c6ca8a9..6c6b2c36 100644
--- a/crates/exav-unpack/src/formats/zstd.rs
+++ b/crates/exav-unpack/src/formats/zstd.rs
@@ -6,7 +6,7 @@ use ruzstd::decoding::errors::{FrameDecoderError, ReadFrameHeaderError};
 use ruzstd::decoding::{BlockDecodingStrategy, FrameDecoder};
 
 use crate::source::{ByteSource, Reader};
-use crate::stream::{emit_stream, single_meta, Visit};
+use crate::stream::{Visit, emit_stream, single_meta};
 use crate::{Budget, LimitHit};
 
 pub(crate) fn walk<T>(
@@ -136,8 +136,8 @@ impl<R: Read> Read for ZstdReader<R> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{extract, Budget, Format, Limits};
-    use ruzstd::encoding::{compress_to_vec, CompressionLevel};
+    use crate::{Budget, Format, Limits, extract};
+    use ruzstd::encoding::{CompressionLevel, compress_to_vec};
 
     #[test]
     fn every_frame_is_decoded() {
@@ -155,4 +155,31 @@ mod tests {
         assert_eq!(entries.len(), 1);
         assert_eq!(entries[0].data, b"first frame PAYLOAD in frame two");
     }
+
+    /// RUSTSEC-2026-0344: a block may not decode to more than 128 KiB. Here
+    /// 37 bytes of block decode to 640 KiB; with 40,000 sequences instead of
+    /// 10, a block under 128 KiB would decode to 2.6 GB.
+    #[test]
+    fn a_block_decoding_past_its_maximum_is_refused() {
+        const SEQS: usize = 10;
+        let mut block = vec![(SEQS as u8) << 3]; // raw literals, 5-bit size
+        block.extend_from_slice(&[b'A'; SEQS]);
+        block.push(SEQS as u8);
+        // All three codes RLE: literal length 1, repeat offset 1, and match
+        // length code 52 (65,539 plus 16 extra bits, all zero here).
+        block.extend_from_slice(&[0b0101_0100, 1, 0, 52]);
+        block.extend_from_slice(&[0; 2 * SEQS]);
+        block.push(1); // end of the backward bitstream
+        let header = 1 | (2 << 1) | ((block.len() as u32) << 3); // last, compressed
+        let mut frame = vec![0x28, 0xB5, 0x2F, 0xFD, 0x00, 0x50]; // window 1 MiB
+        frame.extend_from_slice(&header.to_le_bytes()[..3]);
+        frame.extend(block);
+
+        let mut out = Vec::new();
+        let r = std::io::Read::read_to_end(&mut super::ZstdReader::new(&frame[..]), &mut out);
+        assert!(r.is_err(), "decoded {} bytes from one block", out.len());
+        // ruzstd stops at the sequence that crosses the bound: at most one
+        // match (131,074 bytes) past it.
+        assert!(out.len() <= 128 * 1024 + 131_074, "{} bytes", out.len());
+    }
 }
diff --git a/crates/exav-unpack/src/html.rs b/crates/exav-unpack/src/html.rs
new file mode 100644
index 00000000..16e21ec3
--- /dev/null
+++ b/crates/exav-unpack/src/html.rs
@@ -0,0 +1,393 @@
+//! HTML as a stream of tokens, through html5gum's tokenizer alone: its states,
+//! entities and quirks are the specification's, and no tree is built. The one
+//! HTML reader of the scanner's text view and of the converters that read
+//! Word's and Excel's web pages.
+//!
+//! What this adds is the reading of the tokenizer's output: element and
+//! attribute names in lower case, the content of `script`, `style`, `title`,
+//! `textarea`, `iframe`, `noembed`, `noframes` and `xmp` read as the
+//! specification reads it (text up to the end tag), and the text of a run of
+//! characters in one token. What a reader does with an element is its own
+//! policy.
+//!
+//! [`decode`] is the other half: the bytes of a page as text, in the encoding
+//! its byte order mark or `<meta>` names.
+
+use html5gum::{HtmlString, State, StringReader, Token as Gum, Tokenizer};
+use std::borrow::Cow;
+
+/// Attributes kept of one tag.
+pub const MAX_ATTRS: usize = 256;
+
+#[derive(Debug, PartialEq)]
+pub enum Token {
+    Start {
+        name: String,
+        attrs: Vec<(String, String)>,
+        /// Written `<name ... />`.
+        closed: bool,
+    },
+    End(String),
+    Text(String),
+    Comment(String),
+}
+
+impl Token {
+    /// What the token takes in memory: its own size and its strings'.
+    pub fn size(&self) -> u64 {
+        const ALLOC: u64 = 16;
+        let heap = match self {
+            Token::Start { name, attrs, .. } => {
+                name.len() as u64
+                    + ALLOC
+                    + attrs.capacity() as u64 * std::mem::size_of::<(String, String)>() as u64
+                    + attrs
+                        .iter()
+                        .map(|(k, v)| (k.len() + v.len()) as u64 + 2 * ALLOC)
+                        .sum::<u64>()
+            }
+            Token::End(s) | Token::Text(s) | Token::Comment(s) => s.len() as u64 + ALLOC,
+        };
+        std::mem::size_of::<Token>() as u64 + heap
+    }
+}
+
+/// The tokens of `src`, one at a time.
+pub fn tokens(src: &str) -> Tokens<'_> {
+    Tokens {
+        gum: Tokenizer::new(src),
+        ahead: None,
+    }
+}
+
+pub struct Tokens<'a> {
+    gum: Tokenizer<StringReader<'a>>,
+    /// A token read past the end of a text.
+    ahead: Option<Token>,
+}
+
+fn lower(b: &HtmlString) -> String {
+    String::from_utf8_lossy(b).to_ascii_lowercase()
+}
+
+fn text(b: &HtmlString) -> String {
+    String::from_utf8_lossy(b).into_owned()
+}
+
+impl Tokens<'_> {
+    /// The next token as html5gum has it, converted.
+    fn one(&mut self) -> Option<Token> {
+        loop {
+            match self.gum.next()?.ok()? {
+                Gum::String(s) => return Some(Token::Text(text(&s.value))),
+                Gum::Comment(c) => return Some(Token::Comment(text(&c.value))),
+                Gum::EndTag(t) => return Some(Token::End(lower(&t.name))),
+                Gum::StartTag(t) => {
+                    let name = lower(&t.name);
+                    // The tokenizer reads what is inside as the specification has it.
+                    match name.as_str() {
+                        "script" => self.gum.set_state(State::ScriptData),
+                        "style" | "iframe" | "noembed" | "noframes" | "xmp" => {
+                            self.gum.set_state(State::RawText)
+                        }
+                        "textarea" | "title" => self.gum.set_state(State::RcData),
+                        "plaintext" => self.gum.set_state(State::PlainText),
+                        _ => {}
+                    }
+                    let attrs = t
+                        .attributes
+                        .iter()
+                        .take(MAX_ATTRS)
+                        .map(|(k, v)| (lower(k), text(&v.value)))
+                        .collect();
+                    return Some(Token::Start {
+                        name,
+                        attrs,
+                        closed: t.self_closing,
+                    });
+                }
+                Gum::Doctype(_) | Gum::Error(_) => {}
+            }
+        }
+    }
+}
+
+impl Iterator for Tokens<'_> {
+    type Item = Token;
+
+    fn next(&mut self) -> Option<Token> {
+        let first = match self.ahead.take() {
+            Some(t) => t,
+            None => self.one()?,
+        };
+        let Token::Text(mut joined) = first else {
+            return Some(first);
+        };
+        loop {
+            match self.one() {
+                Some(Token::Text(more)) => joined.push_str(&more),
+                other => {
+                    self.ahead = other;
+                    return Some(Token::Text(joined));
+                }
+            }
+        }
+    }
+}
+
+/// The tokens of `src` did not fit what the caller allows.
+#[derive(Debug, PartialEq, Eq)]
+pub struct TooLarge;
+
+/// All the tokens of `src`. `charge` is told what each takes in memory as it
+/// is made, and answers whether the caller allows it: a page of `<a>` takes
+/// many times its size.
+pub fn read(src: &str, charge: &mut dyn FnMut(u64) -> bool) -> Result<Vec<Token>, TooLarge> {
+    let mut out = Vec::new();
+    for t in tokens(src) {
+        if !charge(t.size()) {
+            return Err(TooLarge);
+        }
+        out.push(t);
+    }
+    Ok(out)
+}
+
+/// The text of `s` with its character references resolved, as the tokenizer
+/// resolves them; markup in `s` is dropped.
+pub fn unescape(s: &str) -> String {
+    tokens(s)
+        .filter_map(|t| match t {
+            Token::Text(t) => Some(t),
+            _ => None,
+        })
+        .collect()
+}
+
+/// The tokens of a page Office wrote, without what it writes for browsers:
+/// the content of a downlevel-revealed conditional (`<![if !vml]> ... <![endif]>`,
+/// and the ones that name `support`) is not what Office reads, and the markers
+/// go. They are comments to the tokenizer.
+pub fn without_downlevel(tokens: Vec<Token>) -> Vec<Token> {
+    // `Some(Some(hide))` opens a conditional, `Some(None)` ends one.
+    let marker = |t: &Token| match t {
+        Token::Comment(c) => {
+            let c = c.trim().to_ascii_lowercase();
+            if c == "[endif]" {
+                Some(None)
+            } else if c.starts_with("[if") && c.ends_with(']') && !c.contains('>') {
+                Some(Some(c.contains('!') || c.contains("support")))
+            } else {
+                None
+            }
+        }
+        _ => None,
+    };
+    let mut out = Vec::with_capacity(tokens.len());
+    // For each conditional open, whether it hides its content.
+    let mut open: Vec<bool> = vec![];
+    for t in tokens {
+        match marker(&t) {
+            Some(Some(hide)) => open.push(hide),
+            Some(None) => {
+                open.pop();
+            }
+            None if open.iter().any(|&h| h) => {}
+            None => out.push(t),
+        }
+    }
+    out
+}
+
+/// The value of the attribute `key` of a start tag.
+pub fn attr<'a>(attrs: &'a [(String, String)], key: &str) -> Option<&'a str> {
+    attrs.iter().find(|a| a.0 == key).map(|a| a.1.as_str())
+}
+
+/// How far into a page its encoding is looked for.
+const HEAD: usize = 4096;
+
+/// UTF-16 by its byte order mark, or by the `<` of a page without one.
+fn utf16(b: &[u8]) -> Option<&'static encoding_rs::Encoding> {
+    match b {
+        [0xFF, 0xFE, ..] | [b'<', 0, b'?' | b'!' | b'h' | b'H', 0, ..] => {
+            Some(encoding_rs::UTF_16LE)
+        }
+        [0xFE, 0xFF, ..] | [0, b'<', 0, b'?' | b'!' | b'h' | b'H', ..] => {
+            Some(encoding_rs::UTF_16BE)
+        }
+        _ => None,
+    }
+}
+
+/// The value of `name="..."` (or `'...'`, or bare) in `head`, any case.
+fn attr_value(head: &str, name: &str) -> Option<String> {
+    let lower = head.to_ascii_lowercase();
+    let mut from = 0;
+    while let Some(p) = lower[from..].find(name) {
+        let mut i = from + p + name.len();
+        from = i;
+        let b = lower.as_bytes();
+        while i < b.len() && b[i] == b' ' {
+            i += 1;
+        }
+        if b.get(i) != Some(&b'=') {
+            continue;
+        }
+        i += 1;
+        while i < b.len() && b[i] == b' ' {
+            i += 1;
+        }
+        let quote = b.get(i).copied().filter(|q| matches!(q, b'"' | b'\''));
+        if quote.is_some() {
+            i += 1;
+        }
+        let start = i;
+        while i < b.len() && !matches!(b[i], b'"' | b'\'' | b' ' | b'>' | b';' | b'/') {
+            i += 1;
+        }
+        if i > start {
+            return Some(lower[start..i].to_string());
+        }
+    }
+    None
+}
+
+/// A page as text: its byte order mark's encoding, else the charset a
+/// `<meta>` in its first kilobytes names, else UTF-8 when it is valid UTF-8,
+/// else Windows-1252, in which no byte is invalid.
+pub fn decode(b: &[u8]) -> Cow<'_, str> {
+    if let Some(enc) = utf16(b) {
+        // UTF-16 cut after an odd byte: the half unit dropped.
+        let even = b.len() - b.len() % 2;
+        return enc.decode_with_bom_removal(&b[..even]).0;
+    }
+    if let Some(rest) = b.strip_prefix(b"\xEF\xBB\xBF") {
+        return String::from_utf8_lossy(rest);
+    }
+    let head = String::from_utf8_lossy(&b[..b.len().min(HEAD)]);
+    let named =
+        attr_value(&head, "charset").and_then(|l| encoding_rs::Encoding::for_label(l.as_bytes()));
+    let enc = match named {
+        // A page declaring UTF-16 that is not is read as ASCII-compatible.
+        Some(e) if e == encoding_rs::UTF_16LE || e == encoding_rs::UTF_16BE => encoding_rs::UTF_8,
+        Some(e) => e,
+        None if std::str::from_utf8(b).is_ok() => encoding_rs::UTF_8,
+        None => encoding_rs::WINDOWS_1252,
+    };
+    enc.decode_without_bom_handling(b).0
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn all(src: &str) -> Vec<Token> {
+        tokens(src).collect()
+    }
+
+    fn start(name: &str, attrs: &[(&str, &str)], closed: bool) -> Token {
+        Token::Start {
+            name: name.into(),
+            attrs: attrs
+                .iter()
+                .map(|(k, v)| (k.to_string(), v.to_string()))
+                .collect(),
+            closed,
+        }
+    }
+
+    #[test]
+    fn names_are_lower_case_and_text_is_one_token() {
+        assert_eq!(
+            all("<TD Class=xl65 X:Num='3'>a &amp; b &lt;c</TD><br/>"),
+            [
+                start("td", &[("class", "xl65"), ("x:num", "3")], false),
+                Token::Text("a & b <c".into()),
+                Token::End("td".into()),
+                start("br", &[], true),
+            ]
+        );
+    }
+
+    #[test]
+    fn the_content_of_a_raw_element_is_text_up_to_its_end_tag() {
+        assert_eq!(
+            all(
+                "<style>td { x: 1 } <b></style><script>if (a<b) {}</script><title>A &amp; B</title>"
+            ),
+            [
+                start("style", &[], false),
+                Token::Text("td { x: 1 } <b>".into()),
+                Token::End("style".into()),
+                start("script", &[], false),
+                Token::Text("if (a<b) {}".into()),
+                Token::End("script".into()),
+                start("title", &[], false),
+                Token::Text("A & B".into()),
+                Token::End("title".into()),
+            ]
+        );
+    }
+
+    #[test]
+    fn comments_and_downlevel_conditionals_are_comments() {
+        let t = all("<!--[if gte mso 9]><xml/><![endif]--><![if !vml]>x<![endif]>");
+        assert_eq!(
+            t[0],
+            Token::Comment("[if gte mso 9]><xml/><![endif]".into())
+        );
+        assert_eq!(t[1], Token::Comment("[if !vml]".into()));
+        assert_eq!(t[2], Token::Text("x".into()));
+        assert_eq!(t[3], Token::Comment("[endif]".into()));
+    }
+
+    #[test]
+    fn what_office_writes_for_browsers_is_left_out() {
+        let t = without_downlevel(all(
+            "a<![if !vml]>b<![if x]>c<![endif]>d<![endif]>e<![if gte x]>f<![endif]>\
+             <!--[if gte mso 9]><xml/><![endif]-->",
+        ));
+        assert_eq!(
+            t,
+            [
+                Token::Text("a".into()),
+                Token::Text("e".into()),
+                Token::Text("f".into()),
+                Token::Comment("[if gte mso 9]><xml/><![endif]".into()),
+            ]
+        );
+    }
+
+    #[test]
+    fn a_page_of_empty_elements_is_charged_for_what_it_builds() {
+        let page = "<a>".repeat(1000);
+        let mut told = 0u64;
+        let r = read(&page, &mut |n| {
+            told += n;
+            true
+        });
+        assert_eq!(r.unwrap().len(), 1000);
+        assert!(told > 1000 * 3 * 20, "told {told} for 3000 bytes");
+        assert_eq!(read(&page, &mut |_| false), Err(TooLarge));
+    }
+
+    #[test]
+    fn the_encoding_a_page_names_is_the_one_it_is_read_in() {
+        assert_eq!(
+            decode(b"<meta charset=windows-1251><td>\xC0"),
+            "<meta charset=windows-1251><td>\u{410}"
+        );
+        assert_eq!(
+            decode(b"<meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\xE9"),
+            "<meta http-equiv=Content-Type content=\"text/html; charset=iso-8859-1\">\u{E9}"
+        );
+        assert_eq!(decode("<td>é".as_bytes()), "<td>é");
+        assert_eq!(decode(b"<td>\xE9"), "<td>\u{E9}");
+        let utf16: Vec<u8> = [0xFF, 0xFE]
+            .into_iter()
+            .chain("<td>é".encode_utf16().flat_map(u16::to_le_bytes))
+            .collect();
+        assert_eq!(decode(&utf16), "<td>é");
+    }
+}
diff --git a/crates/exav-unpack/src/inflate.rs b/crates/exav-unpack/src/inflate.rs
index 0027bcc0..285e853d 100644
--- a/crates/exav-unpack/src/inflate.rs
+++ b/crates/exav-unpack/src/inflate.rs
@@ -93,7 +93,7 @@ impl<R: BufRead> Inflate<R> {
                     return Err(io::Error::new(
                         io::ErrorKind::UnexpectedEof,
                         "deflate stream ends before its last block",
-                    ))
+                    ));
                 }
                 Ok(_) => self.out.resize(OUT, 0),
                 Err(e) => {
@@ -189,7 +189,7 @@ impl<R: BufRead> Gunzip<R> {
                     return Err(io::Error::new(
                         io::ErrorKind::InvalidInput,
                         "not a gzip stream",
-                    ))
+                    ));
                 }
             }
         }
diff --git a/crates/exav-unpack/src/kdf.rs b/crates/exav-unpack/src/kdf.rs
new file mode 100644
index 00000000..b6c1a667
--- /dev/null
+++ b/crates/exav-unpack/src/kdf.rs
@@ -0,0 +1,138 @@
+//! What a scan spends on password key derivations, and the keys it made.
+//!
+//! Every derivation costs time the file chooses: 7z's runs 2^`numCyclesPower`
+//! SHA-256 rounds (up to 2^24) for every password tried over every folder, and
+//! a disk image's PBKDF2 asks for any count a `u32` holds. None of that is
+//! members, bytes or entries, which the [`Budget`](crate::Budget) counts, so it
+//! is counted here, over the whole scan however many archives it opens, as
+//! RAR5's was (`rar5_crypt`). A derivation past the bound is not made, and the
+//! member is reported encrypted like one no password opens.
+
+use std::collections::HashMap;
+use std::sync::Mutex;
+use std::sync::atomic::{AtomicU64, Ordering};
+
+/// SHA-256 rounds all the 7z derivations of one scan may add up to: about
+/// 1.3 s (a round is about 20 ns), 128 derivations at 7-Zip's default of 2^19.
+pub(crate) const SEVENZ_MAX_ROUNDS: u64 = 1 << 26;
+
+/// PBKDF2 iterations all the derivations of one scan may add up to, for RAR5
+/// and for disk images alike: about 0.7 s of HMACs. See `rar5_crypt`.
+pub(crate) const PBKDF2_MAX_ROUNDS: u64 = 1 << 22;
+
+/// The least a derivation is charged, so that many with a tiny count still
+/// add up.
+const MIN_CHARGE: u64 = 256;
+
+/// The most keys kept, of one scan.
+const MAX_KEYS: usize = 4096;
+
+/// Adds `rounds` to `spent` unless that passes `max`; a refused derivation is
+/// not charged, so one member asking for too much leaves the rest of the scan
+/// its share.
+pub(crate) fn charge(spent: &AtomicU64, rounds: u64, max: u64) -> bool {
+    let rounds = rounds.max(MIN_CHARGE);
+    let mut now = spent.load(Ordering::Relaxed);
+    loop {
+        let Some(next) = now.checked_add(rounds).filter(|&t| t <= max) else {
+            return false;
+        };
+        match spent.compare_exchange_weak(now, next, Ordering::Relaxed, Ordering::Relaxed) {
+            Ok(_) => return true,
+            Err(seen) => now = seen,
+        }
+    }
+}
+
+/// A 7z key: the password as UTF-16LE, the salt, `numCyclesPower`.
+type SevenZKey = (Vec<u8>, Vec<u8>, u32);
+
+/// The derivations of one scan.
+#[derive(Default)]
+pub(crate) struct Kdf {
+    sevenz_rounds: AtomicU64,
+    sevenz_keys: Mutex<HashMap<SevenZKey, [u8; 32]>>,
+}
+
+impl Kdf {
+    /// The 7z key for a password, a salt and a count, made by `derive` (which is
+    /// charged `rounds`) unless this scan made it before. `None` when the scan has
+    /// spent its share, or `derive` refuses.
+    pub(crate) fn sevenz_key(
+        &self,
+        password: &[u8],
+        salt: &[u8],
+        cycles: u32,
+        rounds: u64,
+        derive: impl FnOnce() -> Option<[u8; 32]>,
+    ) -> Option<[u8; 32]> {
+        let id = (password.to_vec(), salt.to_vec(), cycles);
+        if let Some(k) = self.sevenz_keys.lock().ok()?.get(&id) {
+            return Some(*k);
+        }
+        if !charge(&self.sevenz_rounds, rounds, SEVENZ_MAX_ROUNDS) {
+            return None;
+        }
+        let key = derive()?;
+        if let Ok(mut keys) = self.sevenz_keys.lock()
+            && keys.len() < MAX_KEYS
+        {
+            keys.insert(id, key);
+        }
+        Some(key)
+    }
+
+    #[cfg(test)]
+    pub(crate) fn sevenz_spent(&self) -> u64 {
+        self.sevenz_rounds.load(Ordering::Relaxed)
+    }
+}
+
+/// A password to try, with what its derivations are counted against.
+#[derive(Clone, Copy)]
+pub(crate) struct Pass<'a> {
+    pub word: &'a str,
+    pub kdf: &'a Kdf,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_key_is_made_once_and_the_scan_has_a_share() {
+        let kdf = Kdf::default();
+        let mut made = 0;
+        for _ in 0..5 {
+            let k = kdf.sevenz_key(b"pw", b"", 19, 1 << 19, || {
+                made += 1;
+                Some([1; 32])
+            });
+            assert_eq!(k, Some([1; 32]));
+        }
+        assert_eq!(made, 1);
+        assert_eq!(kdf.sevenz_spent(), 1 << 19);
+        // Other salts are other keys, until the scan has spent its share:
+        // 2^26 rounds is 128 keys of 2^19.
+        let mut keys = 1;
+        for salt in 0u32..1000 {
+            if kdf
+                .sevenz_key(b"pw", &salt.to_le_bytes(), 19, 1 << 19, || Some([2; 32]))
+                .is_some()
+            {
+                keys += 1;
+            }
+        }
+        assert_eq!(keys, 128);
+    }
+
+    #[test]
+    fn a_tiny_count_is_charged_something() {
+        let spent = AtomicU64::new(0);
+        let mut n = 0;
+        while charge(&spent, 1, 10_000) {
+            n += 1;
+        }
+        assert_eq!(n, 10_000 / MIN_CHARGE);
+    }
+}
diff --git a/crates/exav-unpack/src/lib.rs b/crates/exav-unpack/src/lib.rs
index 5e582887..5f59734d 100644
--- a/crates/exav-unpack/src/lib.rs
+++ b/crates/exav-unpack/src/lib.rs
@@ -53,7 +53,9 @@ pub(crate) mod formats;
 #[allow(unused_imports)]
 use formats::*;
 
-mod bytes;
+/// The bounds-checked little-endian cursor of the record readers.
+pub mod bytes;
+// What a build uses of it depends on the formats with a password it has.
 #[cfg(any(
     feature = "gzip",
     feature = "zip",
@@ -68,14 +70,42 @@ mod bytes;
     feature = "xar",
     feature = "diskimage",
     feature = "upx",
-    feature = "dmg"
+    feature = "dmg",
+    feature = "squashfs",
+    feature = "cramfs"
 ))]
 mod inflate;
+// Each item is read by a different mix of the `decrypt`, `sevenz`, `dmg` and
+// `rar` features, so any build leaves some of them unused.
+/// HTML as tokens, and the bytes of a page as text: the one HTML reader of
+/// the scanner's text view and the converters. Feature `html`.
+#[cfg(feature = "html")]
+pub mod html;
+#[allow(dead_code)]
+mod kdf;
+#[cfg(all(test, any(feature = "dmg", feature = "ishieldz")))]
+mod oracle;
 pub mod profile;
 pub mod source;
 pub mod span;
 mod stream;
+/// The text a reader sees in HTML, Office and OpenDocument XML parts, and
+/// PDF. Feature `text`.
+#[cfg(feature = "text")]
+pub mod text;
 pub mod volume;
+/// What BIFF (Excel up to 2003) shares: the built-in function table that
+/// formula tokens name by number. Feature `ole`.
+#[cfg(feature = "ole")]
+pub use formats::biff;
+/// OLE2 compound files: the one reader of Word, Excel and PowerPoint 97 to
+/// 2003 files and the like, lenient and bounded. Feature `ole`.
+#[cfg(feature = "ole")]
+pub use formats::cfb;
+/// Text in a Windows code page number, as BIFF records and Office fonts name
+/// them. Feature `ole`.
+#[cfg(feature = "ole")]
+pub use formats::charset;
 /// AutoCAD DWG's bit codes, sections and object records, for drawing
 /// readers. Feature `dwg`.
 #[cfg(feature = "dwg")]
@@ -86,9 +116,17 @@ pub use formats::dwg;
 pub use formats::dxf;
 #[cfg(feature = "pdf")]
 pub use formats::has_obfuscated_name_object;
+/// Excel workbooks saved with a password (RC4, CryptoAPI, XOR), opened with
+/// the default password or those given. Feature `offcrypto`.
+#[cfg(feature = "offcrypto")]
+pub use formats::offcrypto;
+/// RTF's tokenizer, which the scanner's extractor of embedded objects and
+/// exav-render's converter both read with. Feature `rtf`.
+#[cfg(feature = "rtf")]
+pub use formats::rtf;
 #[allow(unused_imports)]
 pub(crate) use stream::Region;
-pub use stream::{is_budget_overflow, walk, Member, MemberMeta, Mtime, Visit};
+pub use stream::{Member, MemberMeta, Mtime, Visit, is_budget_overflow, walk};
 
 /// Count of overlapping ZIP local file records, the signal behind ClamAV's
 /// `Heuristics.Zip.OverlappingFiles`. Zero for any well-formed archive.
@@ -105,6 +143,17 @@ pub fn overlapping_local_records(_data: &dyn ByteSource) -> usize {
 #[cfg(feature = "zip")]
 pub use formats::zip::directory_is_consistent as zip_directory_is_consistent;
 
+/// Where a ZIP appended to another file begins, by its end record at the end of
+/// the file.
+#[cfg(feature = "zip")]
+pub use formats::zip::appended_start as appended_zip_start;
+
+/// Without the `zip` feature no ZIP is found.
+#[cfg(not(feature = "zip"))]
+pub fn appended_zip_start(_src: &dyn ByteSource) -> Option<u64> {
+    None
+}
+
 /// Without the `zip` feature no ZIP is ever confirmed.
 #[cfg(not(feature = "zip"))]
 pub fn zip_directory_is_consistent(_data: &[u8]) -> bool {
@@ -116,7 +165,7 @@ pub fn zip_directory_is_consistent(_data: &[u8]) -> bool {
 /// `Heuristics.XZ.DicSizeLimit`: memory a decoder must commit before producing
 /// a single byte.
 #[cfg(feature = "xz")]
-pub use formats::xz::{declared_dict_size as xz_declared_dict_size, XZ_MAX_DICT};
+pub use formats::xz::{XZ_MAX_DICT, declared_dict_size as xz_declared_dict_size};
 
 #[cfg(not(feature = "xz"))]
 pub fn xz_declared_dict_size(_data: &[u8]) -> Option<u64> {
@@ -151,6 +200,11 @@ pub fn has_obfuscated_name_object(_data: &[u8]) -> bool {
 #[cfg(feature = "rar")]
 #[doc(hidden)]
 pub use formats::{unpack29, unpack50, window_size_from_comp_info};
+// The LZO decoder of SquashFS, exposed for the fuzz target that drives it.
+// Diagnostic surface, not part of the stable API: may change in any release.
+#[cfg(feature = "squashfs")]
+#[doc(hidden)]
+pub use formats::lzo::decompress as lzo_decompress;
 
 /// Limits governing recursive extraction.
 ///
@@ -217,6 +271,11 @@ pub struct Limits {
     /// large file. Deterministic, so it trips identically on every machine
     /// (unlike a wall-clock deadline).
     pub max_scanned_bytes: u64,
+    /// What one run of a bytecode signature may hold in all: its `malloc`s
+    /// (a program frees nothing), the frames of its calls in progress, and the
+    /// globals it has read. A run that reaches it stops as incomplete. Default
+    /// 256 MiB.
+    pub max_bytecode_memory_bytes: u64,
     /// Cap on the instructions the PE stub emulator may run across the whole
     /// recursive analysis of one top-level file.
     ///
@@ -265,6 +324,7 @@ impl Default for Limits {
             // and runaway scan time, and lets a multi-gigabyte member be fully
             // scanned.
             max_scanned_bytes: 10 * 1024 * 1024 * 1024,
+            max_bytecode_memory_bytes: 256 * 1024 * 1024,
             // A few seconds to tens of seconds of emulation per top-level file,
             // against the per-stub budget of `formats::pepack`.
             max_pe_emulation_steps: 1_000_000_000,
@@ -293,6 +353,18 @@ pub struct Budget {
     pub(crate) scanned: u64,
     /// Emulator instructions spent so far (see [`Limits::max_pe_emulation_steps`]).
     pub(crate) pe_emulation_steps: u64,
+    /// PBKDF2 iterations spent so far on RAR5 and disk image passwords, across
+    /// every archive of the scan. Atomic because the readers hold the budget by `&`.
+    #[cfg_attr(not(feature = "decrypt"), allow(dead_code))]
+    pub(crate) kdf_rounds: std::sync::atomic::AtomicU64,
+    /// What the scan has spent on 7z key derivations, and the keys it made
+    /// ([`kdf`]). A handle, so that a reader can hold it while the budget is
+    /// borrowed for something else.
+    #[cfg_attr(not(feature = "decrypt"), allow(dead_code))]
+    pub(crate) kdf: std::sync::Arc<kdf::Kdf>,
+    /// RAR3 key derivations made so far, across every archive of the scan.
+    #[cfg_attr(not(feature = "decrypt"), allow(dead_code))]
+    pub(crate) rar3_derivations: std::sync::atomic::AtomicUsize,
     /// Candidate passwords tried, in order, when decrypting an encrypted ZIP,
     /// 7z, RAR, ARJ, PDF, DMG or Office member, before the built-in ones a
     /// format has (a PDF's empty user password goes first). Empty by default:
@@ -328,6 +400,9 @@ impl Budget {
             total_out: 0,
             scanned: 0,
             pe_emulation_steps: 0,
+            kdf_rounds: std::sync::atomic::AtomicU64::new(0),
+            kdf: std::sync::Arc::default(),
+            rar3_derivations: std::sync::atomic::AtomicUsize::new(0),
             passwords: Vec::new(),
             verify_checksums: false,
             visit_directories: false,
@@ -702,6 +777,10 @@ pub enum Format {
     Zstd,
     /// Lzip compressed stream.
     Lzip,
+    /// LZMA-alone (`.lzma`) compressed stream, as LZMA Utils wrote it.
+    Lzma,
+    /// RPM package: its install scripts and its payload (a compressed cpio).
+    Rpm,
     /// uuencode / Base64-uuencode (`begin`…`end`) wrapped file.
     Uuencode,
     /// Adobe XDP (XML-wrapped, base64-encoded PDF).
@@ -748,6 +827,16 @@ pub enum Format {
     /// the objects its OLE2FRAMEs embed. A drawing of an older release is
     /// one unsupported entry. See [`dwg`] (feature `dwg`).
     Dwg,
+    /// exFAT filesystem, walked, so fragmented files come back whole.
+    Exfat,
+    /// SquashFS 4 image: walked, each block decompressed as it is read.
+    Squashfs,
+    /// cramfs image: walked, each block inflated as it is read.
+    Cramfs,
+    /// romfs image: walked, its files being stored as they are.
+    Romfs,
+    /// EROFS image: walked, files stored plain or compressed with LZ4.
+    Erofs,
 }
 
 impl Format {
@@ -800,6 +889,8 @@ impl Format {
         Format::Ntfs,
         Format::Zstd,
         Format::Lzip,
+        Format::Lzma,
+        Format::Rpm,
         Format::Uuencode,
         Format::Xdp,
         Format::Szdd,
@@ -821,6 +912,11 @@ impl Format {
         Format::Screnc,
         Format::Dxf,
         Format::Dwg,
+        Format::Exfat,
+        Format::Squashfs,
+        Format::Cramfs,
+        Format::Romfs,
+        Format::Erofs,
     ];
 }
 
@@ -904,6 +1000,13 @@ mod format_all_tests {
                 Format::Screnc => 44,
                 Format::Dxf => 66,
                 Format::Dwg => 67,
+                Format::Lzma => 68,
+                Format::Rpm => 69,
+                Format::Exfat => 70,
+                Format::Squashfs => 71,
+                Format::Cramfs => 72,
+                Format::Romfs => 73,
+                Format::Erofs => 74,
             }
         }
         let mut seen: Vec<u8> = Format::ALL.iter().map(|f| tag(*f)).collect();
@@ -911,7 +1014,7 @@ mod format_all_tests {
         seen.dedup();
         assert_eq!(
             seen.len(),
-            67,
+            74,
             "Format::ALL is missing a variant (or lists one twice)"
         );
     }
@@ -933,14 +1036,65 @@ fn is_bzip2_magic(data: &[u8]) -> bool {
             || data[4..10] == [0x17, 0x72, 0x45, 0x38, 0x50, 0x90])
 }
 
+/// A second format the object also is, when its first bytes were claimed by
+/// `first`, for the formats that leave their own start free: an ISO 9660 image
+/// keeps its first 32 KiB for the system area, and an ext volume its first
+/// kilobyte for boot code, so either can start with an archive's magic and be
+/// mounted all the same.
+pub fn also_reads_as(src: &dyn ByteSource, first: Format) -> Option<Format> {
+    #[cfg(feature = "iso")]
+    if first != Format::Iso && src.window(32769, 5).starts_with(b"CD001") {
+        return Some(Format::Iso);
+    }
+    #[cfg(feature = "ext")]
+    if first != Format::Ext && formats::ext::is_volume(src) {
+        return Some(Format::Ext);
+    }
+    let _ = (src, first);
+    None
+}
+
+/// Whether `data` is a PDF: `%PDF-` and a version digit within its first
+/// kilobyte, which is where Acrobat, qpdf, pdfium and pdf.js look. A file with a
+/// newline, a byte-order mark or a mail's leftover headers before it is a PDF
+/// to every one of them, and offsets in the file count from the header.
+fn pdf_header_near_start(data: &[u8]) -> bool {
+    // At the start the magic alone has always been enough.
+    if data.starts_with(b"%PDF-") {
+        return true;
+    }
+    let head = &data[..data.len().min(1024)];
+    memchr::memmem::find_iter(head, b"%PDF-")
+        .any(|at| head.get(at + 5).is_some_and(u8::is_ascii_digit))
+}
+
 /// Whether `data` begins with a real CAB (Microsoft Cabinet) header: `MSCF`
 /// followed by the `reserved1` field, which the MS-CAB spec fixes at zero in
 /// every genuine cabinet. The bare 4-byte `MSCF` magic collides with binary data
 /// (e.g. inside an ISO), and a false hit routed to the cabinet parser fails deep
 /// in string parsing and reports the object `LIMITS-EXCEEDED`; requiring the zero
 /// `reserved1` rejects those without dropping any real cabinet.
+///
+/// Readers do not check `reserved1` (`cabextract` opens a cabinet whose field is
+/// anything), so a cabinet is also recognised by what follows it: a size, the
+/// offset of the first file entry inside it, and version 1.3, none of which a
+/// chance `MSCF` has.
 fn is_cab_magic(data: &[u8]) -> bool {
-    data.len() >= 8 && data.starts_with(b"MSCF") && data[4..8] == [0, 0, 0, 0]
+    if !data.starts_with(b"MSCF") || data.len() < 8 {
+        return false;
+    }
+    if data[4..8] == [0, 0, 0, 0] {
+        return true;
+    }
+    let u32_at = |o: usize| {
+        data.get(o..o + 4)
+            .map(|b| u32::from_le_bytes([b[0], b[1], b[2], b[3]]))
+    };
+    let (Some(size), Some(files)) = (u32_at(8), u32_at(16)) else {
+        return false;
+    };
+    // `versionMinor`, `versionMajor`.
+    data.get(24..26) == Some(&[3, 1]) && size >= 36 && (36..=size).contains(&files)
 }
 
 /// Whether `data` begins with an ARJ main header: `60 EA`, a size of at most
@@ -986,6 +1140,30 @@ fn starts_executable_magic(d: &[u8]) -> bool {
         || d.starts_with(&[0xd0, 0xcf, 0x11, 0xe0])
 }
 
+/// Whether `d` starts with the magic of an archive a script or page may carry
+/// in base64 (HTML smuggling puts a ZIP in a `data:` URI or an `atob` string):
+/// the magics long enough not to turn up by chance, and ZIP's and gzip's, which
+/// [`is_archive_payload`] confirms from what follows.
+#[cfg(feature = "base64scan")]
+fn starts_archive_magic(d: &[u8]) -> bool {
+    d.starts_with(b"PK\x03\x04")
+        || is_gzip_magic(d)
+        || d.starts_with(b"7z\xBC\xAF\x27\x1C")
+        || d.starts_with(b"Rar!\x1a\x07")
+        || d.starts_with(&[0xFD, b'7', b'z', b'X', b'Z', 0x00])
+}
+
+/// Whether a fully-decoded blob is an archive worth scanning as one: a magic of
+/// [`starts_archive_magic`], and for a ZIP a directory that holds together, so
+/// four bytes of coincidence are not enough.
+#[cfg(feature = "base64scan")]
+fn is_archive_payload(d: &[u8]) -> bool {
+    if d.len() < 22 || !starts_archive_magic(d) {
+        return false;
+    }
+    !d.starts_with(b"PK\x03\x04") || zip_directory_is_consistent(d)
+}
+
 /// Whether a fully-decoded blob is a real, re-scannable executable: one of
 /// [`starts_executable_magic`] and, for a PE, with a *valid* PE header at
 /// `e_lfanew` (rejecting a bare `MZ`). See [`base64_payloads`].
@@ -1019,6 +1197,13 @@ fn is_executable_payload(d: &[u8]) -> bool {
 /// nothing more. Bounded by `cap` per payload and by a cap on how many return.
 #[cfg(feature = "base64scan")]
 pub fn markup_embedded_payloads(src: &dyn ByteSource, cap: u64) -> Vec<Vec<u8>> {
+    markup_embedded_payloads_capped(src, cap).0
+}
+
+/// [`markup_embedded_payloads`], and whether it stopped at the number it
+/// returns with another run behind them that it would have decoded.
+#[cfg(feature = "base64scan")]
+pub fn markup_embedded_payloads_capped(src: &dyn ByteSource, cap: u64) -> (Vec<Vec<u8>>, bool) {
     match src.as_slice() {
         Some(data) => markup_payloads_on(&mut Indexed(data), cap),
         None => markup_payloads_on(&mut Stepper::new(src), cap),
@@ -1026,7 +1211,7 @@ pub fn markup_embedded_payloads(src: &dyn ByteSource, cap: u64) -> Vec<Vec<u8>>
 }
 
 #[cfg(feature = "base64scan")]
-fn markup_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
+fn markup_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> (Vec<Vec<u8>>, bool) {
     use base64::Engine;
     /// Shortest base64 run worth decoding; below this it cannot be an asset.
     const MIN_RUN: usize = 64;
@@ -1036,9 +1221,10 @@ fn markup_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
     let plain = base64::engine::general_purpose::STANDARD_NO_PAD;
     let is_b64 = |b: u8| b.is_ascii_alphanumeric() || b == b'+' || b == b'/';
     let mut out = Vec::new();
+    let mut capped = false;
     let mut i = 0usize;
     let n = data.len();
-    while i < n && out.len() < MAX_PAYLOADS {
+    while i < n {
         if !is_b64(data.at(i)) {
             i += 1;
             continue;
@@ -1059,9 +1245,15 @@ fn markup_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
         // Cheap gate first: 8 base64 chars decode to 6 bytes, enough for every
         // magic we care about, and costs no allocation on a miss.
         match plain.decode(data.range(start, start + 8)) {
-            Ok(head) if starts_asset_magic(&head) => {}
+            Ok(head) if starts_asset_magic(&head) || starts_archive_magic(&head) => {}
             _ => continue,
         }
+        // Another run worth decoding, with the number returned already at its
+        // limit: the rest of the document is not read.
+        if out.len() >= MAX_PAYLOADS {
+            capped = true;
+            break;
+        }
         // Absorb the padding the run scan stopped at, so a well-formed URI
         // decodes whole. Without it the tail falls off the last 4-char group and
         // the payload comes back one or two bytes short: invisible on an image,
@@ -1081,13 +1273,15 @@ fn markup_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
         let decoded = engine
             .decode(&run)
             .or_else(|_| plain.decode(&run[..bare - usize::from(bare % 4 == 1)]));
-        if let Ok(dec) = decoded {
-            if !dec.is_empty() && dec.len() as u64 <= cap {
-                out.push(dec);
-            }
+        if let Ok(dec) = decoded
+            && !dec.is_empty()
+            && dec.len() as u64 <= cap
+            && (!starts_archive_magic(&dec) || is_archive_payload(&dec))
+        {
+            out.push(dec);
         }
     }
-    out
+    (out, capped)
 }
 
 /// Magics of things worth pulling out of a document: raster images (what
@@ -1118,6 +1312,13 @@ fn starts_asset_magic(d: &[u8]) -> bool {
 /// `cap` (per-payload size), `MAX_PAYLOADS`, and `MAX_ATTEMPTS` (decode tries).
 #[cfg(feature = "base64scan")]
 pub fn base64_payloads(src: &dyn ByteSource, cap: u64) -> Vec<Vec<u8>> {
+    base64_payloads_capped(src, cap).0
+}
+
+/// [`base64_payloads`], and whether it stopped at its limits with another run
+/// behind them that it would have decoded.
+#[cfg(feature = "base64scan")]
+pub fn base64_payloads_capped(src: &dyn ByteSource, cap: u64) -> (Vec<Vec<u8>>, bool) {
     match src.as_slice() {
         Some(data) => base64_payloads_on(&mut Indexed(data), cap),
         None => base64_payloads_on(&mut Stepper::new(src), cap),
@@ -1125,7 +1326,7 @@ pub fn base64_payloads(src: &dyn ByteSource, cap: u64) -> Vec<Vec<u8>> {
 }
 
 #[cfg(feature = "base64scan")]
-fn base64_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
+fn base64_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> (Vec<Vec<u8>>, bool) {
     use base64::Engine;
     // A base64-encoded PE is at minimum a few hundred bytes; require a run that
     // decodes to ≥ ~1 KB so we never trial-decode short incidental runs.
@@ -1137,10 +1338,11 @@ fn base64_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
     let engine = base64::engine::general_purpose::STANDARD_NO_PAD;
 
     let mut out = Vec::new();
+    let mut capped = false;
     let mut attempts = 0;
     let n = data.len();
     let mut i = 0;
-    while i < n && out.len() < MAX_PAYLOADS && attempts < MAX_ATTEMPTS {
+    while i < n {
         if !is_b64(data.at(i)) {
             i += 1;
             continue;
@@ -1175,9 +1377,15 @@ fn base64_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
         // NOT executables (RTF `\objdata` hex, benign base64 text) cost nothing
         // beyond the byte count above: no full decode, no payload allocation.
         match engine.decode(head) {
-            Ok(prefix) if starts_executable_magic(&prefix) => {}
+            Ok(prefix) if starts_executable_magic(&prefix) || starts_archive_magic(&prefix) => {}
             _ => continue,
         }
+        // Another run worth decoding, with the limits already reached: the
+        // rest of the text is not read.
+        if out.len() >= MAX_PAYLOADS || attempts >= MAX_ATTEMPTS {
+            capped = true;
+            break;
+        }
         attempts += 1;
         // Whole 4-char groups decode to exactly 3 bytes each, so a run too
         // large to keep is known before it is read.
@@ -1203,13 +1411,14 @@ fn base64_payloads_on<B: Bytes>(data: &mut B, cap: u64) -> Vec<Vec<u8>> {
         if run.len() % 4 == 1 {
             run.pop();
         }
-        if let Ok(dec) = engine.decode(&run) {
-            if dec.len() as u64 <= cap && is_executable_payload(&dec) {
-                out.push(dec);
-            }
+        if let Ok(dec) = engine.decode(&run)
+            && dec.len() as u64 <= cap
+            && (is_executable_payload(&dec) || is_archive_payload(&dec))
+        {
+            out.push(dec);
         }
     }
-    out
+    (out, capped)
 }
 
 /// What [`detect`] reads of an object: its start (all of it when it is held in
@@ -1477,7 +1686,7 @@ fn detect_with(src: &dyn ByteSource, prescan: Option<&dyn Fn() -> Prescan>) -> O
     // read `DETECT_HEAD` deep: over a network or browser reader that is most
     // of a small archive. Only those `detect_probe` makes first: a later one,
     // such as RAR's, could be overruled by an earlier check that needs more.
-    if let Some(fmt) = archive_magic(&src.window(0, 16)) {
+    if let Some(fmt) = archive_magic(&src.window(0, 32)) {
         return Some(udif_or(fmt, src.len(), |off| {
             src.window(off, 12).into_owned()
         }));
@@ -1500,7 +1709,7 @@ fn detect_with(src: &dyn ByteSource, prescan: Option<&dyn Fn() -> Prescan>) -> O
 /// RAR), as [`detect`] would type it: what an archive carved out of another
 /// object at its magic needs confirmed, without a search through the rest.
 pub fn detect_archive_start(src: &dyn ByteSource) -> Option<Format> {
-    let head = src.window(0, 16);
+    let head = src.window(0, 32);
     archive_magic(&head).or_else(|| is_rar_magic(&head).then_some(Format::Rar))
 }
 
@@ -1545,6 +1754,51 @@ fn udif_or(fmt: Format, len: usize, read: impl FnOnce(usize) -> Vec<u8>) -> Form
     fmt
 }
 
+/// The first header of a tar from before `ustar` (V7), which has no magic:
+/// a name, octal mode and size, and a checksum of the header that is right.
+fn is_v7_tar(data: &[u8]) -> bool {
+    let Some(h) = data.get(..512) else {
+        return false;
+    };
+    let octal = |f: &[u8]| {
+        let t = f
+            .iter()
+            .take_while(|&&b| b != 0)
+            .copied()
+            .collect::<Vec<u8>>();
+        let t = t.trim_ascii();
+        (!t.is_empty() && t.iter().all(|b| (b'0'..=b'7').contains(b))).then(|| {
+            t.iter().fold(0u64, |a, b| {
+                a.wrapping_mul(8).wrapping_add(u64::from(b - b'0'))
+            })
+        })
+    };
+    if h[0] == 0 || octal(&h[100..108]).is_none() || octal(&h[124..136]).is_none() {
+        return false;
+    }
+    let Some(sum) = octal(&h[148..156]) else {
+        return false;
+    };
+    let field = 148..156;
+    let unsigned: u64 = h
+        .iter()
+        .enumerate()
+        .map(|(i, &b)| if field.contains(&i) { 32 } else { u64::from(b) })
+        .sum();
+    let signed: i64 = h
+        .iter()
+        .enumerate()
+        .map(|(i, &b)| {
+            if field.contains(&i) {
+                32
+            } else {
+                i64::from(b as i8)
+            }
+        })
+        .sum();
+    sum == unsigned || i64::try_from(sum).is_ok_and(|s| s == signed)
+}
+
 fn is_rar_magic(data: &[u8]) -> bool {
     data.starts_with(b"Rar!\x1a\x07\x00") || data.starts_with(b"Rar!\x1a\x07\x01\x00")
 }
@@ -1570,6 +1824,9 @@ fn detect_probe(p: &Probe) -> Option<Format> {
     if data.len() >= 263 && &data[257..262] == b"ustar" {
         return Some(Format::Tar);
     }
+    if is_v7_tar(data) {
+        return Some(Format::Tar);
+    }
     if data.len() >= 7 && data[2] == b'-' && data[6] == b'-' && matches!(data[3], b'l' | b'p') {
         return Some(Format::Lha);
     }
@@ -1637,6 +1894,18 @@ fn detect_probe(p: &Probe) -> Option<Format> {
     if formats::sniff::is_in(p, Format::AppleSingle) {
         return Some(Format::AppleSingle);
     }
+    if formats::sniff::is_in(p, Format::Squashfs) {
+        return Some(Format::Squashfs);
+    }
+    if formats::sniff::is_in(p, Format::Cramfs) {
+        return Some(Format::Cramfs);
+    }
+    if formats::sniff::is_in(p, Format::Romfs) {
+        return Some(Format::Romfs);
+    }
+    if formats::sniff::is_in(p, Format::Erofs) {
+        return Some(Format::Erofs);
+    }
     // ext last of the filesystem sniffs: its magic is 1080 bytes in, so a
     // partition table or boot sector at offset 0 is the more specific answer.
     if formats::sniff::is_in(p, Format::Ext) {
@@ -1648,6 +1917,10 @@ fn detect_probe(p: &Probe) -> Option<Format> {
     if formats::fat::is_fat(data) {
         return Some(Format::Fat);
     }
+    #[cfg(feature = "exfat")]
+    if formats::exfat::is_exfat(data) {
+        return Some(Format::Exfat);
+    }
     if formats::sniff::is_in(p, Format::Ntfs) {
         return Some(Format::Ntfs);
     }
@@ -1674,7 +1947,7 @@ fn detect_probe(p: &Probe) -> Option<Format> {
     if formats::sniff::is_in(p, Format::Vhdx) {
         return Some(Format::Vhdx);
     }
-    if data.starts_with(&[0x28, 0xB5, 0x2F, 0xFD]) {
+    if data.starts_with(&[0x28, 0xB5, 0x2F, 0xFD]) || formats::sniff::zstd_after_skippable(data) {
         return Some(Format::Zstd);
     }
     if data.starts_with(b"!<arch>\n") {
@@ -1683,6 +1956,12 @@ fn detect_probe(p: &Probe) -> Option<Format> {
     if data.starts_with(b"LZIP") {
         return Some(Format::Lzip);
     }
+    if formats::sniff::is_in(p, Format::Lzma) {
+        return Some(Format::Lzma);
+    }
+    if formats::sniff::is_in(p, Format::Rpm) {
+        return Some(Format::Rpm);
+    }
     if data.starts_with(b"070701")
         || data.starts_with(b"070702")
         || data.starts_with(b"070707")
@@ -1821,6 +2100,17 @@ fn detect_probe(p: &Probe) -> Option<Format> {
     if is_partition(p) {
         return Some(Format::Partition);
     }
+    // After every structural check: a tar or a disk image holds a PDF in its
+    // first kilobyte as a member, which is not the file's own header.
+    if pdf_header_near_start(data) {
+        return Some(Format::Pdf);
+    }
+    // Last: a ZIP behind a script line or padding, found by its end record.
+    // The walker reads such an archive (`open_archive`'s prepended case).
+    #[cfg(feature = "zip")]
+    if formats::sniff::prefixed_zip(p) {
+        return Some(Format::Zip);
+    }
     None
 }
 
@@ -1845,10 +2135,10 @@ mod detect_source_tests {
             let path = e.path();
             if path.is_dir() {
                 fixtures(&path, out);
-            } else if let Ok(data) = std::fs::read(&path) {
-                if data.len() < 8 << 20 {
-                    out.push((path.display().to_string(), data));
-                }
+            } else if let Ok(data) = std::fs::read(&path)
+                && data.len() < 8 << 20
+            {
+                out.push((path.display().to_string(), data));
             }
         }
     }
@@ -2131,18 +2421,6 @@ pub(crate) fn dispatch_extract<R>(
         Format::Rar => emit_collected(extract_rar(data, budget)?, budget, visit),
         #[cfg(feature = "upx")]
         Format::Upx => extract_upx(data, budget, visit),
-        #[cfg(feature = "xar")]
-        Format::Xar => extract_xar(data, budget, visit),
-        #[cfg(feature = "vhd")]
-        Format::Vhd => formats::vhd::extract_vhd(data, budget, visit),
-        #[cfg(feature = "diskimage")]
-        Format::Qcow2 => formats::qcow2::extract_qcow2(data, budget, visit),
-        #[cfg(feature = "diskimage")]
-        Format::Vmdk => formats::vmdk::extract_vmdk(data, budget, visit),
-        #[cfg(feature = "diskimage")]
-        Format::Vhdx => formats::vhdx::extract_vhdx(data, budget, visit),
-        #[cfg(feature = "wim")]
-        Format::Wim => formats::wim::extract_wim(data, budget, visit),
         #[cfg(feature = "arc")]
         Format::Arc => formats::arc::extract_arc(data, budget, visit),
         #[cfg(feature = "ace")]
@@ -2159,20 +2437,14 @@ pub(crate) fn dispatch_extract<R>(
         | Format::CryptFf
         | Format::Lrzip
         | Format::AppleSingle => formats::reported::extract_reported(fmt, data, budget, visit),
-        #[cfg(feature = "ext")]
-        Format::Ext => formats::ext::extract_ext(data, budget, visit),
         #[cfg(feature = "zoo")]
         Format::Zoo => formats::zoo::extract_zoo(data, budget, visit),
         #[cfg(feature = "ishieldz")]
         Format::IshieldZ => formats::ishield_z::extract_ishield_z(data, budget, visit),
         #[cfg(feature = "stuffit")]
         Format::StuffIt => formats::stuffit::extract_stuffit(data, budget, visit),
-        #[cfg(feature = "fat")]
-        Format::Fat => formats::fat::extract_fat(data, budget, visit),
         #[cfg(feature = "inno")]
         Format::Inno => formats::inno::extract_inno(data, budget, visit),
-        #[cfg(feature = "ntfs")]
-        Format::Ntfs => formats::ntfs::extract_ntfs(data, budget, visit),
         #[cfg(feature = "uuencode")]
         Format::Uuencode => extract_uuencode(data, budget, visit),
         #[cfg(feature = "xdp")]
@@ -2322,6 +2594,28 @@ pub fn join_rar_volumes(volumes: &[&[u8]]) -> Result<Vec<u8>, String> {
     formats::join_rar_volumes(volumes)
 }
 
+/// What a cabinet's header says of its place in a set of them: the cabinet
+/// before it and the one after it, by the names the header gives (labels, for
+/// a caller to match against the names it was given: nothing here opens
+/// one), its number in the set and the set's. `None` for a cabinet that is not
+/// one of several.
+#[cfg(feature = "cab")]
+pub fn cab_links(cabinet: &[u8]) -> Option<CabLinks> {
+    formats::cab_join::links(cabinet)
+}
+
+/// The cabinets of one set, in order, as the one cabinet they were cut from:
+/// what [`walk`] reads as [`Format::Cab`]. A folder or a file that runs from
+/// one cabinet into the next is read whole that way, where one cabinet at a
+/// time it is cut short. `Err` says what does not fit the set.
+#[cfg(feature = "cab")]
+pub fn join_cab_volumes(cabinets: &[&[u8]]) -> Result<Vec<u8>, String> {
+    formats::cab_join::join(cabinets)
+}
+
+#[cfg(feature = "cab")]
+pub use formats::cab_join::Links as CabLinks;
+
 /// True if `data` looks like a UPX-packed executable (a valid `PackHeader` is
 /// present). Used by callers whose file-type classifier already recognises
 /// PE/ELF/Mach-O and wants to additionally unpack UPX.
@@ -2823,8 +3117,8 @@ mod markup_payload_tests {
 #[cfg(all(test, feature = "all-formats"))]
 mod tests {
     use super::*;
-    use flate2::write::GzEncoder;
     use flate2::Compression;
+    use flate2::write::GzEncoder;
     use std::io::{Cursor, Write};
 
     fn gz(data: &[u8]) -> Vec<u8> {
@@ -2939,6 +3233,29 @@ mod tests {
         buf
     }
 
+    #[test]
+    fn a_tar_from_before_ustar_has_no_magic_and_is_found_by_its_checksum() {
+        let mut buf = Vec::new();
+        {
+            let mut b = ::tar::Builder::new(&mut buf);
+            let mut h = ::tar::Header::new_old();
+            h.set_size(5);
+            h.set_mode(0o644);
+            h.set_cksum();
+            b.append_data(&mut h, "input.txt", &b"hello"[..]).unwrap();
+            b.finish().unwrap();
+        }
+        assert_eq!(&buf[257..262], &[0u8; 5], "no magic");
+        assert_eq!(detect(&buf), Some(Format::Tar));
+        let entries = extract(Format::Tar, &buf, &mut Budget::new(Limits::default())).unwrap();
+        assert_eq!(entries[0].data, b"hello");
+        // One byte of the header changed: the checksum no longer fits.
+        buf[1] ^= 1;
+        assert_eq!(detect(&buf), None);
+        // Text that happens to be octal is not one.
+        assert_eq!(detect(&[b'7'; 2048]), None);
+    }
+
     fn cab_of(members: &[(&str, &[u8])]) -> Vec<u8> {
         let mut b = ::cab::CabinetBuilder::new();
         {
@@ -3114,6 +3431,31 @@ mod tests {
         assert_eq!(detect(b"MSCF"), None);
     }
 
+    /// `reserved1` is reserved: `cabextract` opens a cabinet whatever it holds,
+    /// so a cabinet with a nonzero field is a cabinet, not data.
+    #[cfg(feature = "cab")]
+    #[test]
+    fn a_cabinet_with_a_nonzero_reserved_field_is_still_a_cabinet() {
+        let real = include_bytes!("../tests/fixtures/cab/mszip_lzx_qtm.cab");
+        let mut odd = real.to_vec();
+        odd[4..8].copy_from_slice(&[0x12, 0x34, 0x56, 0x78]);
+        assert_eq!(detect(&odd), Some(Format::Cab));
+        let names = |blob: &[u8]| {
+            let mut budget = Budget::new(Limits::default());
+            extract(Format::Cab, &blob, &mut budget)
+                .unwrap()
+                .into_iter()
+                .map(|e| (e.name, e.data))
+                .collect::<Vec<_>>()
+        };
+        assert!(!names(real).is_empty());
+        assert_eq!(names(&odd), names(real));
+        // And a header that only starts like one is still not.
+        let mut chance = odd.clone();
+        chance[24] = 9;
+        assert_eq!(detect(&chance), None);
+    }
+
     /// `60 EA` is two bytes, so about one object in 65,536 starts with it by
     /// chance, and reading such an object as a damaged ARJ reports it
     /// `UNSCANNABLE`. The main header carries a CRC-32 that settles it.
@@ -3207,8 +3549,8 @@ mod tests {
             detect(&[0x1f, 0x8b, 0x08, 0x08, 0, 0, 0, 0]),
             Some(Format::Gzip)
         ); // FNAME set
-           // Coincidental `1f 8b` in binary data with a non-deflate CM or reserved
-           // flag bits set → not gzip (would otherwise fail inflate → UNSCANNABLE).
+        // Coincidental `1f 8b` in binary data with a non-deflate CM or reserved
+        // flag bits set → not gzip (would otherwise fail inflate → UNSCANNABLE).
         assert_eq!(detect(&[0x1f, 0x8b, 0x99, 0xff]), None); // CM != 8
         assert_eq!(detect(&[0x1f, 0x8b, 0x08, 0xe0]), None); // reserved flag bits set
         assert_eq!(detect(&[0x1f, 0x8b]), None); // too short
@@ -3276,6 +3618,23 @@ mod tests {
         assert_eq!(entries[0].data, payload);
     }
 
+    /// ClamAV's `skip_prefix.txt.zst`: a skippable frame (which LZ4 uses as
+    /// well) ahead of the Zstandard one was taken for an LZ4 file.
+    #[test]
+    fn zstd_after_a_skippable_frame_is_zstd() {
+        let payload = b"hello exav inside zstd";
+        let mut blob = Vec::new();
+        blob.extend_from_slice(&0x184D_2A50u32.to_le_bytes());
+        blob.extend_from_slice(&5u32.to_le_bytes());
+        blob.extend_from_slice(b"PADDY");
+        blob.extend(zstd_of(payload));
+        assert_eq!(detect(&blob), Some(Format::Zstd));
+        let mut budget = Budget::new(Limits::default());
+        let entries = extract(Format::Zstd, &blob, &mut budget).unwrap();
+        assert_eq!(entries.len(), 1);
+        assert_eq!(entries[0].data, payload);
+    }
+
     #[test]
     fn zstd_bomb_trips_ratio() {
         let mut w =
@@ -3330,7 +3689,7 @@ mod tests {
         // Build an OLE2/CFB with a stream holding EICAR, then extract it.
         let mut buf = Cursor::new(Vec::new());
         {
-            let mut comp = cfb::CompoundFile::create(&mut buf).unwrap();
+            let mut comp = ::cfb::CompoundFile::create(&mut buf).unwrap();
             comp.create_storage("Macros").unwrap();
             let mut s = comp.create_stream("Macros/Module1").unwrap();
             std::io::Write::write_all(&mut s, eicar()).unwrap();
@@ -3443,7 +3802,7 @@ mod tests {
         img[pvd] = 1; // type = primary
         img[pvd + 1..pvd + 6].copy_from_slice(b"CD001");
         img[pvd + 6] = 1; // version
-                          // Root directory record at PVD+156 (length 34).
+        // Root directory record at PVD+156 (length 34).
         let rd = pvd + 156;
         img[rd] = 34; // record length
         img[rd + 2..rd + 6].copy_from_slice(&17u32.to_le_bytes()); // extent LBA (LE)
@@ -3451,7 +3810,7 @@ mod tests {
         img[rd + 25] = 0x02; // flags: directory
         img[rd + 32] = 1; // name len
         img[rd + 33] = 0; // name "\0" (self)
-                          // --- Root directory at sector 17 ---
+        // --- Root directory at sector 17 ---
         let dir = 17 * S;
         let mut p = dir;
         // "." record
@@ -3534,6 +3893,82 @@ mod tests {
         assert_eq!(entries.len(), 1);
         assert_eq!(entries[0].data, payload);
     }
+
+    /// A ZIP behind a script line (a zipapp), with a marker of a spanned archive
+    /// in front, or with padding before and after is told by its end record, and
+    /// opens as it does without them; text that merely ends like a ZIP is not.
+    #[cfg(feature = "zip")]
+    #[test]
+    fn a_zip_behind_other_bytes_is_a_zip() {
+        let zip = include_bytes!("../tests/fixtures/zip/legacy_implode.zip").to_vec();
+        let plain = extract(
+            Format::Zip,
+            &zip.as_slice(),
+            &mut Budget::new(Limits::default()),
+        )
+        .unwrap();
+        assert!(!plain.is_empty());
+        let names = |blob: &[u8]| -> Vec<(String, Vec<u8>)> {
+            extract(Format::Zip, &blob, &mut Budget::new(Limits::default()))
+                .unwrap()
+                .into_iter()
+                .map(|e| (e.name, e.data))
+                .collect()
+        };
+        let want = names(&zip);
+        for (what, blob) in [
+            (
+                "a zipapp",
+                [&b"#!/usr/bin/env python3\n"[..], &zip].concat(),
+            ),
+            (
+                "padding around",
+                [&[7u8; 300][..], &zip, &[9u8; 100]].concat(),
+            ),
+        ] {
+            assert_eq!(detect(&blob.as_slice()), Some(Format::Zip), "{what}");
+            assert_eq!(names(&blob), want, "{what}");
+        }
+        // A directory that points at no local header, and an end record cut off.
+        let mut broken = [&b"#!/bin/sh\n"[..], &zip].concat();
+        let at = broken.len() - zip.len();
+        broken[at..at + 4].copy_from_slice(b"XXXX");
+        assert_eq!(detect(&broken.as_slice()), None);
+        let cut = [&b"#!/bin/sh\n"[..], &zip[..zip.len() - 30]].concat();
+        assert_eq!(detect(&cut.as_slice()), None);
+    }
+
+    /// `xz --format=lzma`: a stream that ends with a marker, and the same with
+    /// its size in the header (what LZMA Utils wrote).
+    #[cfg(feature = "lzma")]
+    #[test]
+    fn lzma_alone_roundtrip() {
+        let payload = b"hello exav inside lzma";
+        for blob in [
+            &include_bytes!("../tests/fixtures/lzma_simple.lzma")[..],
+            &include_bytes!("../tests/fixtures/lzma_sized.lzma")[..],
+        ] {
+            assert_eq!(detect(&blob), Some(Format::Lzma));
+            let mut budget = Budget::new(Limits::default());
+            let entries = extract(Format::Lzma, &blob, &mut budget).unwrap();
+            assert_eq!(entries.len(), 1);
+            assert_eq!(entries[0].name, "lzma-content");
+            assert_eq!(entries[0].data, payload);
+        }
+    }
+
+    /// The header chooses the dictionary the decoder allocates: one of 2 GiB is
+    /// refused, not allocated.
+    #[cfg(feature = "lzma")]
+    #[test]
+    fn lzma_alone_with_a_huge_dictionary_is_refused() {
+        let mut blob = include_bytes!("../tests/fixtures/lzma_simple.lzma").to_vec();
+        blob[1..5].copy_from_slice(&(1u32 << 31).to_le_bytes());
+        assert_eq!(detect(&blob.as_slice()), Some(Format::Lzma));
+        let mut budget = Budget::new(Limits::default());
+        let entries = extract(Format::Lzma, &blob.as_slice(), &mut budget).unwrap();
+        assert!(entries[0].data.is_empty() && entries[0].unsupported.is_some());
+    }
 }
 
 /// An LZMA dictionary size clamped to what the caller's budget allows.
diff --git a/crates/exav-unpack/src/main.rs b/crates/exav-unpack/src/main.rs
index 69fd6d4a..fe453ca8 100644
--- a/crates/exav-unpack/src/main.rs
+++ b/crates/exav-unpack/src/main.rs
@@ -20,9 +20,34 @@
 
 #![forbid(unsafe_code)]
 
+/// `println!`, except that a closed standard output ends the run quietly.
+///
+/// Rust's runtime ignores `SIGPIPE`, so `exav-unpack -l archive | head` made
+/// `println!` panic on the `EPIPE` and print a backtrace at the user. Every
+/// other Unix filter just stops.
+macro_rules! println {
+    ($($arg:tt)*) => {{
+        use std::io::Write as _;
+        if let Err(e) = writeln!(std::io::stdout(), $($arg)*) {
+            stdout_closed(&e);
+        }
+    }};
+}
+
+/// The end of a run whose standard output cannot be written to: 141, what a
+/// shell reports for a process killed by `SIGPIPE`, when the reader went away,
+/// and 2 for any other write error.
+fn stdout_closed(e: &std::io::Error) -> ! {
+    if e.kind() == std::io::ErrorKind::BrokenPipe {
+        std::process::exit(141);
+    }
+    eprintln!("exav-unpack:  cannot write to standard output: {e}");
+    std::process::exit(2);
+}
+
 use chrono::{Local, LocalResult, TimeZone};
 use exav_unpack::source::BlockCache;
-use exav_unpack::{detect, walk, Budget, ByteSource, Format, Limits, Member, MemberMeta, Mtime};
+use exav_unpack::{Budget, ByteSource, Format, Limits, Member, MemberMeta, Mtime, detect, walk};
 use std::fs::{self, File, OpenOptions};
 use std::io::{self, BufRead, Read, Seek, SeekFrom, Write};
 use std::path::{Component, Path, PathBuf};
@@ -282,7 +307,7 @@ fn parse(args: &[String]) -> Result<Parsed, String> {
                             format!("-{c} ({what}) is an unzip option exav-unpack does not take")
                         }
                         None => format!("unknown option -{c}"),
-                    })
+                    });
                 }
             }
             k += 1;
@@ -589,11 +614,11 @@ impl<'a> Archive<'a> {
             println!("---------  ---------- -----   ----");
         }
         let root = o.dir.clone().unwrap_or_else(|| PathBuf::from("."));
-        if o.mode == Mode::Extract {
-            if let Err(e) = fs::create_dir_all(&root) {
-                eprintln!("exav-unpack:  cannot create {}: {e}", root.display());
-                return status::ERROR;
-            }
+        if o.mode == Mode::Extract
+            && let Err(e) = fs::create_dir_all(&root)
+        {
+            eprintln!("exav-unpack:  cannot create {}: {e}", root.display());
+            return status::ERROR;
         }
         let mut budget = Budget::with_passwords(o.limits.clone(), o.passwords.clone());
         budget.set_visit_directories(true);
@@ -1160,12 +1185,70 @@ fn escapes(root: &Path, path: &Path, target: &str) -> bool {
     false
 }
 
+/// Whether a link at `path` to `target` leads out of `root` once the links
+/// already made are followed. [`escapes`] reads the words of the target alone,
+/// and counts a `..` against the link's own depth: `a -> .` and `b -> a/..` each
+/// pass it, and `b` is the directory above the root.
+fn resolves_outside(root: &Path, path: &Path, target: &str) -> bool {
+    let Ok(root) = fs::canonicalize(root) else {
+        return true;
+    };
+    let Some(mut at) = path.parent().and_then(|p| fs::canonicalize(p).ok()) else {
+        return true;
+    };
+    if !at.starts_with(&root) {
+        return true;
+    }
+    // The words still to be read, the next one last.
+    let words = |t: &str| -> Option<Vec<std::ffi::OsString>> {
+        let mut out = Vec::new();
+        for c in Path::new(t).components().rev() {
+            match c {
+                Component::RootDir | Component::Prefix(_) => return None,
+                Component::CurDir => {}
+                Component::ParentDir => out.push("..".into()),
+                Component::Normal(n) => out.push(n.to_os_string()),
+            }
+        }
+        Some(out)
+    };
+    let Some(mut todo) = words(target) else {
+        return true;
+    };
+    let mut hops = 0;
+    while let Some(w) = todo.pop() {
+        if w == ".." {
+            if !at.pop() || !at.starts_with(&root) {
+                return true;
+            }
+            continue;
+        }
+        at.push(&w);
+        if fs::symlink_metadata(&at).is_ok_and(|m| m.file_type().is_symlink()) {
+            hops += 1;
+            let Some(next) = (hops <= 40)
+                .then(|| fs::read_link(&at).ok())
+                .flatten()
+                .and_then(|l| words(&l.to_string_lossy()))
+            else {
+                return true;
+            };
+            at.pop();
+            todo.extend(next);
+        }
+    }
+    !at.starts_with(&root)
+}
+
 /// Make the link at `path` to `target`, if the target stays under `root`.
 fn make_link(root: &Path, path: &Path, target: &str) -> Result<(), String> {
     if escapes(root, path, target) {
         return Err("symbolic link points outside the extraction directory".to_string());
     }
     directories(root, path, false)?;
+    if resolves_outside(root, path, target) {
+        return Err("symbolic link points outside the extraction directory".to_string());
+    }
     if fs::symlink_metadata(path).is_ok() {
         fs::remove_file(path).map_err(|e| e.to_string())?;
     }
@@ -1240,7 +1323,7 @@ fn directories(root: &Path, path: &Path, last: bool) -> Result<(), String> {
         at.push(c);
         match fs::symlink_metadata(&at) {
             Ok(m) if m.file_type().is_symlink() => {
-                return Err(format!("{} is a link, not followed", at.display()))
+                return Err(format!("{} is a link, not followed", at.display()));
             }
             Ok(m) if m.is_dir() => {}
             Ok(_) => return Err(format!("{} is a file, not a directory", at.display())),
diff --git a/crates/exav-unpack/src/oracle.rs b/crates/exav-unpack/src/oracle.rs
new file mode 100644
index 00000000..c727d4c6
--- /dev/null
+++ b/crates/exav-unpack/src/oracle.rs
@@ -0,0 +1,151 @@
+//! Test support for the differential tests against a reference decoder built
+//! from its own sources (`tests/oracle/build.sh`).
+//!
+//! Those tests are `#[ignore]`d: a run that did not ask for them lists them as
+//! ignored, never as passed. Run on request, one whose oracle is not built
+//! fails instead of skipping.
+
+use std::io::{Read, Write};
+use std::process::{Command, Stdio};
+
+/// Runs the oracle named by the environment variable `var`, with `args`, over
+/// `jobs` (a limit and an input each), and returns its status byte and output
+/// for each. Panics when the variable is unset or the oracle fails.
+pub(crate) fn run(var: &str, args: &[&str], jobs: &[(u32, Vec<u8>)]) -> Vec<(u8, Vec<u8>)> {
+    let path = std::env::var(var).unwrap_or_else(|_| {
+        panic!("{var} is not set: build the oracle with tests/oracle/build.sh and set it")
+    });
+    let mut child = Command::new(&path)
+        .args(args)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .spawn()
+        .unwrap_or_else(|e| panic!("cannot run {path}: {e}"));
+    let mut stdin = child.stdin.take().unwrap();
+    let mut request = Vec::new();
+    for (limit, input) in jobs {
+        request.extend_from_slice(&limit.to_le_bytes());
+        request.extend_from_slice(&(input.len() as u32).to_le_bytes());
+        request.extend_from_slice(input);
+    }
+    let writer = std::thread::spawn(move || stdin.write_all(&request));
+    let mut reply = Vec::new();
+    child
+        .stdout
+        .take()
+        .unwrap()
+        .read_to_end(&mut reply)
+        .unwrap();
+    let wrote = writer.join().unwrap();
+    let status = child.wait().unwrap();
+    assert!(status.success(), "{path} failed: {status} ({wrote:?})");
+    let mut out = Vec::new();
+    let mut at = 0;
+    while at < reply.len() {
+        let n = u32::from_le_bytes(reply[at + 1..at + 5].try_into().unwrap()) as usize;
+        out.push((reply[at], reply[at + 5..at + 5 + n].to_vec()));
+        at += 5 + n;
+    }
+    assert_eq!(out.len(), jobs.len(), "{path} answered fewer inputs");
+    out
+}
+
+/// With `EXAV_DEBUG_ORACLE_DUMP` set to a directory, writes a stream that differs,
+/// the reference's output for it and ours, to inspect it.
+pub(crate) fn dump(name: &str, n: usize, input: &[u8], reference: &[u8], ours: &[u8]) {
+    if let Ok(dir) = std::env::var("EXAV_DEBUG_ORACLE_DUMP") {
+        for (ext, bytes) in [("in", input), ("ref", reference), ("ours", ours)] {
+            let _ = std::fs::write(format!("{dir}/{name}{n}.{ext}"), bytes);
+        }
+    }
+}
+
+/// A xorshift generator, so a failure repeats from its seed.
+pub(crate) struct Rng(pub(crate) u64);
+
+impl Rng {
+    pub(crate) fn next(&mut self) -> u64 {
+        self.0 ^= self.0 << 13;
+        self.0 ^= self.0 >> 7;
+        self.0 ^= self.0 << 17;
+        self.0
+    }
+
+    pub(crate) fn below(&mut self, n: usize) -> usize {
+        (self.next() % n.max(1) as u64) as usize
+    }
+
+    /// `base` damaged one way: a bit flipped, a byte or a four-byte field
+    /// set (to an extreme half the time), a cut, bytes inserted or removed, a
+    /// piece repeated. `hot` is the length of the header region the
+    /// fields are chosen from three times in four.
+    pub(crate) fn damage(&mut self, base: &[u8], hot: usize) -> Vec<u8> {
+        let mut v = base.to_vec();
+        if v.is_empty() {
+            return v;
+        }
+        let at = |r: &mut Rng, len: usize| match r.below(4) {
+            0 => r.below(len),
+            _ => r.below(len.min(hot.max(1))),
+        };
+        match self.below(8) {
+            0 | 1 => {
+                let i = at(self, v.len());
+                v[i] ^= 1 << self.below(8);
+            }
+            2 => {
+                let i = at(self, v.len());
+                v[i] = self.next() as u8;
+            }
+            3 => {
+                let i = at(self, v.len());
+                let w = [0, 1, 0x7f, 0x80, 0xff, 0xfe][self.below(6)];
+                v[i] = w;
+            }
+            4 => {
+                let i = at(self, v.len());
+                let w: u32 = match self.below(3) {
+                    0 => [0, 1, 0xffff, 0x10000, 0x7fff_ffff, 0x8000_0000, u32::MAX][self.below(7)],
+                    1 => self.next() as u32 & 0xfffff,
+                    _ => self.next() as u32,
+                };
+                for (k, b) in w.to_le_bytes().iter().enumerate() {
+                    if let Some(x) = v.get_mut(i + k) {
+                        *x = *b;
+                    }
+                }
+            }
+            5 => {
+                let cut = self.below(v.len());
+                v.truncate(cut);
+            }
+            6 => {
+                let i = at(self, v.len());
+                let n = 1 + self.below(8);
+                match self.below(2) {
+                    0 => {
+                        let end = (i + n).min(v.len());
+                        v.drain(i..end);
+                    }
+                    _ => {
+                        for _ in 0..n {
+                            v.insert(i, self.next() as u8);
+                        }
+                    }
+                }
+            }
+            _ => {
+                let i = at(self, v.len());
+                let n = 1 + self.below(32);
+                let piece: Vec<u8> = v[i..(i + n).min(v.len())].to_vec();
+                let j = self.below(v.len());
+                v.splice(j..j, piece);
+            }
+        }
+        if !v.is_empty() && self.below(5) == 0 {
+            let i = at(self, v.len());
+            v[i] ^= 1 << self.below(8);
+        }
+        v
+    }
+}
diff --git a/crates/exav-unpack/src/source.rs b/crates/exav-unpack/src/source.rs
index dd58d216..7159eb3f 100644
--- a/crates/exav-unpack/src/source.rs
+++ b/crates/exav-unpack/src/source.rs
@@ -310,14 +310,13 @@ impl<R: Read + Seek> BlockCache<R> {
             out.extend_from_slice(&data[skip..end]);
         }
         let whole = end == skip + want;
-        if blocks.len() >= self.max_blocks {
-            if let Some(&old) = blocks
+        if blocks.len() >= self.max_blocks
+            && let Some(&old) = blocks
                 .iter()
                 .min_by_key(|(_, (_, used))| *used)
                 .map(|(k, _)| k)
-            {
-                blocks.remove(&old);
-            }
+        {
+            blocks.remove(&old);
         }
         blocks.insert(idx, (data.into_boxed_slice(), tick));
         whole
@@ -631,7 +630,7 @@ pub fn bytes<'a, B: ByteSource + ?Sized>(
 /// A source that claims `claimed` bytes and delivers only `data`, for tests of
 /// what a failed read does.
 #[cfg(test)]
-pub(crate) fn short_source(data: &[u8], claimed: u64) -> BlockCache<impl Read + Seek> {
+pub(crate) fn short_source(data: &[u8], claimed: u64) -> BlockCache<impl Read + Seek + use<>> {
     struct Short(std::io::Cursor<Vec<u8>>, u64);
     impl Read for Short {
         fn read(&mut self, b: &mut [u8]) -> std::io::Result<usize> {
diff --git a/crates/exav-unpack/src/stream.rs b/crates/exav-unpack/src/stream.rs
index 51353a00..63a5ebd6 100644
--- a/crates/exav-unpack/src/stream.rs
+++ b/crates/exav-unpack/src/stream.rs
@@ -232,6 +232,12 @@ pub fn walk<T>(
             Some(e) => Err(LimitHit::corrupt(format!("{fmt:?}: {e}"))),
             None => Ok(None),
         },
+        // A container that is found damaged where the source failed to give it
+        // is damaged by the failure: that is the reason to report.
+        Ok(Err(hit)) if hit.is_corrupt() => match src.read_error() {
+            Some(e) => Err(LimitHit::corrupt(format!("{fmt:?}: {e}"))),
+            None => Err(hit),
+        },
         Ok(r) => r,
         Err(_) => Err(LimitHit::corrupt(format!(
             "{fmt:?} decoder panicked on malformed input"
@@ -278,6 +284,10 @@ fn dispatch<T>(
         Format::Zstd => f::zstd::walk,
         #[cfg(feature = "lzip")]
         Format::Lzip => f::lzip::walk,
+        #[cfg(feature = "lzma")]
+        Format::Lzma => f::lzmaalone::walk,
+        #[cfg(feature = "rpm")]
+        Format::Rpm => f::rpm::walk,
         #[cfg(feature = "sevenz")]
         Format::SevenZip => f::sevenz::walk,
         #[cfg(feature = "cab")]
@@ -310,8 +320,36 @@ fn dispatch<T>(
         Format::Swf => f::swf::walk,
         #[cfg(feature = "dmg")]
         Format::Dmg => f::dmg::walk,
+        #[cfg(feature = "vhd")]
+        Format::Vhd => f::vhd::walk,
+        #[cfg(feature = "diskimage")]
+        Format::Qcow2 => f::qcow2::walk,
+        #[cfg(feature = "diskimage")]
+        Format::Vmdk => f::vmdk::walk,
+        #[cfg(feature = "diskimage")]
+        Format::Vhdx => f::vhdx::walk,
+        #[cfg(feature = "ntfs")]
+        Format::Ntfs => f::ntfs::walk,
+        #[cfg(feature = "fat")]
+        Format::Fat => f::fat::walk,
+        #[cfg(feature = "ext")]
+        Format::Ext => f::ext::walk,
+        #[cfg(feature = "exfat")]
+        Format::Exfat => f::exfat::walk,
+        #[cfg(feature = "squashfs")]
+        Format::Squashfs => f::squashfs::walk,
+        #[cfg(feature = "cramfs")]
+        Format::Cramfs => f::cramfs::walk,
+        #[cfg(feature = "romfs")]
+        Format::Romfs => f::romfs::walk,
+        #[cfg(feature = "erofs")]
+        Format::Erofs => f::erofs::walk,
         #[cfg(feature = "szdd")]
         Format::Szdd => f::szdd::walk,
+        #[cfg(feature = "wim")]
+        Format::Wim => f::wim::walk,
+        #[cfg(feature = "xar")]
+        Format::Xar => f::xar::walk,
         _ => return whole(fmt, src, budget, visit),
     };
     walk(src, budget, visit)
@@ -1028,7 +1066,7 @@ mod tests {
                 "{path}"
             );
         }
-        assert_eq!(seen, 7);
+        assert_eq!(seen, 8);
     }
 
     // Every codec decodes, including the solid multi-file case, where each file
@@ -1084,11 +1122,11 @@ mod tests {
             out.extend_from_slice(&0u16.to_le_bytes()); // flags
             out.extend_from_slice(&0u16.to_le_bytes()); // setID
             out.extend_from_slice(&0u16.to_le_bytes()); // iCabinet
-                                                        // CFFOLDER
+            // CFFOLDER
             out.extend_from_slice(&cfdata_start.to_le_bytes()); // coffCabStart
             out.extend_from_slice(&1u16.to_le_bytes()); // cCFData
             out.extend_from_slice(&0u16.to_le_bytes()); // typeCompress = None (stored)
-                                                        // CFFILE table
+            // CFFILE table
             let mut off = 0u32;
             for (n, d) in files {
                 out.extend_from_slice(&(d.len() as u32).to_le_bytes()); // cbFile
diff --git a/crates/exav-unpack/src/text/html.rs b/crates/exav-unpack/src/text/html.rs
new file mode 100644
index 00000000..3d8d4c41
--- /dev/null
+++ b/crates/exav-unpack/src/text/html.rs
@@ -0,0 +1,151 @@
+//! HTML into its text, from the tokens of `crate::html`, pulled one at a time.
+//!
+//! What this adds is the policy: left out are comments, `script`, `style`,
+//! `template` and `iframe` (code, markup and content nobody reads as text);
+//! kept is every text node, including a `noscript` and what a CSS rule would
+//! hide (a reader of the source cannot tell), an image's `alt`, and each
+//! link's target after its label. Blocks, rows and breaks end the line.
+
+use crate::html::{Token, attr, tokens};
+
+use super::Out;
+
+/// Elements whose start and end end the line.
+const BLOCKS: &[&str] = &[
+    "address",
+    "article",
+    "aside",
+    "blockquote",
+    "body",
+    "br",
+    "caption",
+    "center",
+    "dd",
+    "details",
+    "dialog",
+    "dir",
+    "div",
+    "dl",
+    "dt",
+    "fieldset",
+    "figcaption",
+    "figure",
+    "footer",
+    "form",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "header",
+    "hr",
+    "html",
+    "legend",
+    "li",
+    "main",
+    "menu",
+    "nav",
+    "noscript",
+    "ol",
+    "optgroup",
+    "option",
+    "p",
+    "pre",
+    "section",
+    "select",
+    "summary",
+    "table",
+    "tbody",
+    "textarea",
+    "tfoot",
+    "thead",
+    "title",
+    "tr",
+    "ul",
+];
+
+/// Elements whose content is skipped to their end tag.
+const SKIPPED: &[&str] = &[
+    "script", "style", "template", "iframe", "noembed", "noframes", "xmp",
+];
+
+struct State<'a> {
+    out: &'a mut Out,
+    /// The element being skipped.
+    skipping: Option<String>,
+    /// The link being read: where its label starts in the text, and its target.
+    anchor: Option<(usize, String)>,
+}
+
+pub(super) fn read(src: &str, out: &mut Out) {
+    let mut st = State {
+        out,
+        skipping: None,
+        anchor: None,
+    };
+    for token in tokens(src) {
+        match token {
+            Token::Text(text) => {
+                if st.skipping.is_none() {
+                    st.out.text(&text);
+                }
+            }
+            Token::Start { name, attrs, .. } => st.start(&name, &attrs),
+            Token::End(name) => st.end(&name),
+            Token::Comment(_) => {}
+        }
+        if st.out.full() {
+            return;
+        }
+    }
+    st.close_anchor();
+}
+
+impl State<'_> {
+    fn close_anchor(&mut self) {
+        if let Some((from, href)) = self.anchor.take() {
+            self.out.target(from, &href);
+        }
+    }
+
+    fn end(&mut self, name: &str) {
+        if self.skipping.as_deref() == Some(name) {
+            self.skipping = None;
+        } else if self.skipping.is_none() {
+            match name {
+                "a" => self.close_anchor(),
+                "td" | "th" => self.out.tab(),
+                _ if BLOCKS.contains(&name) => self.out.newline(),
+                _ => {}
+            }
+        }
+    }
+
+    fn start(&mut self, name: &str, attrs: &[(String, String)]) {
+        if self.skipping.is_some() {
+            return;
+        }
+        match name {
+            "a" => {
+                self.close_anchor();
+                if let Some(href) = attr(attrs, "href") {
+                    self.anchor = Some((self.out.len(), href.to_string()));
+                }
+            }
+            "img" | "area" => {
+                if let Some(alt) = attr(attrs, "alt") {
+                    self.out.space();
+                    self.out.text(alt);
+                    self.out.space();
+                }
+            }
+            "td" | "th" => self.out.tab(),
+            _ if BLOCKS.contains(&name) => self.out.newline(),
+            _ => {}
+        }
+        if SKIPPED.contains(&name) {
+            self.skipping = Some(name.to_string());
+        }
+    }
+}
diff --git a/crates/exav-unpack/src/text/mod.rs b/crates/exav-unpack/src/text/mod.rs
new file mode 100644
index 00000000..07dae7cb
--- /dev/null
+++ b/crates/exav-unpack/src/text/mod.rs
@@ -0,0 +1,352 @@
+//! The text a reader sees in a document, for a scanner or a search: HTML, the
+//! XML parts of Office and OpenDocument files, and (feature `text-pdf`) PDF.
+//!
+//! A signature written against what a document says (a phrase, a link's
+//! address) cannot match it in the bytes when markup, escapes, encodings or
+//! compression sit between the words. These readers take the words out, one
+//! block to a line, and nothing else: what a reader never sees (a script, a
+//! style, a comment, a field code) is left out, and where a link leads is
+//! written after its label, `label (target)`, whatever the target is.
+//!
+//! The parsing is other people's: html5gum's tokenizer for HTML, quick-xml
+//! for XML, hayro for PDF. Each is read in a single pass that builds no tree,
+//! except hayro's page interpretation, and the text made is cut at the `cap`
+//! given, which [`Extracted`] says. Nothing here fetches, runs or follows
+//! anything.
+
+mod html;
+#[cfg(feature = "text-pdf")]
+mod pdf;
+#[cfg(feature = "text-pdf")]
+mod pdf_screen;
+mod xml;
+
+use std::borrow::Cow;
+
+/// What a document is, for reading its text.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Kind {
+    /// An HTML document or fragment.
+    Html,
+    /// A PDF document. Feature `text-pdf`: without it, [`kind`] never says so.
+    Pdf,
+    /// One XML part of an Office or OpenDocument file.
+    Xml(XmlPart),
+}
+
+/// Which part of an Office or OpenDocument file an XML member is, which says
+/// where its text is.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum XmlPart {
+    /// WordprocessingML: the document, its headers, footers, notes and comments.
+    Word,
+    /// DrawingML slides and their notes.
+    Slide,
+    /// SpreadsheetML's shared strings.
+    SharedStrings,
+    /// A SpreadsheetML sheet: inline strings and formulas.
+    Sheet,
+    /// OpenDocument's content and styles.
+    Odf,
+}
+
+/// What [`extract`] made.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Extracted {
+    /// The text, in UTF-8, one block to a line.
+    pub text: String,
+    /// The text reached the cap, or a PDF stream decompressed past it: the
+    /// rest of the document is not here.
+    pub truncated: bool,
+    /// Each link whose label is not its target, as `(label, target)`, for a
+    /// check of what a link says against where it goes. At most [`MAX_LINKS`].
+    pub links: Vec<(String, String)>,
+}
+
+/// Links kept in [`Extracted::links`].
+pub const MAX_LINKS: usize = 4096;
+
+/// What `data` is, going by its member `name` and its first bytes `head`
+/// (a kilobyte is enough), when its text can be read.
+///
+/// A PDF is known by its signature (with the `text-pdf` feature), HTML by its extension or an `<html>`,
+/// `<body>` or doctype near the start, an XML part by its path in the package.
+pub fn kind(name: &str, head: &[u8]) -> Option<Kind> {
+    let head = &head[..head.len().min(1024)];
+    #[cfg(feature = "text-pdf")]
+    if find(head, b"%PDF-").is_some() {
+        return Some(Kind::Pdf);
+    }
+    // The rest is markup: a binary file called `x.html` is not.
+    if !looks_text(head) {
+        return None;
+    }
+    let lower = name.to_ascii_lowercase();
+    if let Some(part) = xml_part(&lower) {
+        return Some(Kind::Xml(part));
+    }
+    let by_name = [".html", ".htm", ".xhtml", ".shtml"]
+        .iter()
+        .any(|e| lower.ends_with(e));
+    let by_head = {
+        let h = head.to_ascii_lowercase();
+        HTML_MARKERS.iter().any(|n| find(&h, n).is_some())
+    };
+    (by_name || by_head).then_some(Kind::Html)
+}
+
+/// What near the start of a text says it is HTML: a document's tags, or the
+/// ones a fragment (an email's body, say) is made of.
+const HTML_MARKERS: &[&[u8]] = &[
+    b"<!doctype html",
+    b"<html",
+    b"<body",
+    b"<head>",
+    b"<a href",
+    b"<p>",
+    b"<p ",
+    b"<div",
+    b"<table",
+    b"<span",
+    b"<br",
+    b"<img ",
+    b"<font",
+    b"<center",
+    b"<ul>",
+    b"<li>",
+];
+
+/// Whether `head` reads as text: no NUL, and few other control bytes.
+pub fn looks_text(head: &[u8]) -> bool {
+    let controls = head
+        .iter()
+        .filter(|&&b| b < 0x20 && !matches!(b, b'\t' | b'\n' | b'\r' | 0x0c))
+        .count();
+    !head.is_empty() && !head.contains(&0) && controls * 20 <= head.len()
+}
+
+/// The text of `data`, a document of `kind`, cut at `cap` bytes. `limits` bound
+/// what a PDF's streams decompress to.
+pub fn extract(kind: Kind, data: &[u8], cap: usize, limits: &crate::Limits) -> Extracted {
+    let mut out = Out::new(cap);
+    match kind {
+        Kind::Html => html::read(&crate::html::decode(data), &mut out),
+        #[cfg(feature = "text-pdf")]
+        Kind::Pdf => pdf::read(data, limits, &mut out),
+        #[cfg(not(feature = "text-pdf"))]
+        Kind::Pdf => {
+            let _ = limits;
+        }
+        Kind::Xml(part) => xml::read(&decode(data), part, &mut out),
+    }
+    out.finish()
+}
+
+fn find(hay: &[u8], needle: &[u8]) -> Option<usize> {
+    memchr::memmem::find(hay, needle)
+}
+
+/// Whether the package path `lower` (lowercased) is a part that holds text.
+fn xml_part(lower: &str) -> Option<XmlPart> {
+    let path = lower.trim_start_matches('/');
+    let numbered = |dir: &str, stem: &str| {
+        path.strip_prefix(dir)
+            .and_then(|r| r.strip_prefix(stem))
+            .and_then(|r| r.strip_suffix(".xml"))
+            .is_some_and(|n| n.bytes().all(|b| b.is_ascii_digit()))
+    };
+    if matches!(
+        path,
+        "word/document.xml" | "word/comments.xml" | "word/footnotes.xml" | "word/endnotes.xml"
+    ) || numbered("word/", "header")
+        || numbered("word/", "footer")
+    {
+        Some(XmlPart::Word)
+    } else if numbered("ppt/slides/", "slide") || numbered("ppt/notesslides/", "notesslide") {
+        Some(XmlPart::Slide)
+    } else if path == "xl/sharedstrings.xml" {
+        Some(XmlPart::SharedStrings)
+    } else if numbered("xl/worksheets/", "sheet") {
+        Some(XmlPart::Sheet)
+    } else if path == "content.xml" || path == "styles.xml" {
+        Some(XmlPart::Odf)
+    } else {
+        None
+    }
+}
+
+/// `data` as text: UTF-8, UTF-16 by its byte-order mark, else windows-1252,
+/// which no byte sequence is invalid in.
+fn decode(data: &[u8]) -> Cow<'_, str> {
+    if data.starts_with(&[0xff, 0xfe]) || data.starts_with(&[0xfe, 0xff]) {
+        let (text, _, _) = encoding_rs::UTF_16LE.decode(data);
+        let (text, _, _) = if data[0] == 0xfe {
+            encoding_rs::UTF_16BE.decode(data)
+        } else {
+            (text, encoding_rs::UTF_16LE, false)
+        };
+        return Cow::Owned(text.into_owned());
+    }
+    let data = data.strip_prefix(b"\xef\xbb\xbf").unwrap_or(data);
+    match std::str::from_utf8(data) {
+        Ok(s) => Cow::Borrowed(s),
+        Err(_) => Cow::Owned(encoding_rs::WINDOWS_1252.decode(data).0.into_owned()),
+    }
+}
+
+/// The text being made: whitespace collapsed to one space, blocks on their
+/// own lines, and a cap.
+pub(crate) struct Out {
+    s: String,
+    cap: usize,
+    pub(crate) truncated: bool,
+    space: bool,
+    links: Vec<(String, String)>,
+}
+
+impl Out {
+    pub(crate) fn new(cap: usize) -> Self {
+        Out {
+            s: String::new(),
+            cap,
+            truncated: false,
+            space: false,
+            links: Vec::new(),
+        }
+    }
+
+    /// The cap was reached: nothing more is wanted.
+    pub(crate) fn full(&self) -> bool {
+        self.truncated
+    }
+
+    pub(crate) fn len(&self) -> usize {
+        self.s.len()
+    }
+
+    /// The text made from byte offset `from`.
+    pub(crate) fn since(&self, from: usize) -> &str {
+        self.s.get(from..).unwrap_or("")
+    }
+
+    fn at_line_start(&self) -> bool {
+        self.s.is_empty() || self.s.ends_with('\n')
+    }
+
+    fn put(&mut self, c: char) {
+        if self.s.len() + c.len_utf8() > self.cap {
+            self.truncated = true;
+        } else {
+            self.s.push(c);
+        }
+    }
+
+    /// Words: any white space is one space, none at the start of a line.
+    pub(crate) fn text(&mut self, t: &str) {
+        for c in t.chars() {
+            if self.truncated {
+                return;
+            }
+            if c.is_whitespace() || c == '\u{200b}' {
+                self.space = true;
+            } else {
+                if self.space && !self.at_line_start() {
+                    self.put(' ');
+                }
+                self.space = false;
+                self.put(c);
+            }
+        }
+    }
+
+    /// A separator inside a line.
+    pub(crate) fn space(&mut self) {
+        self.space = true;
+    }
+
+    /// The end of a block: the next text starts a line.
+    pub(crate) fn newline(&mut self) {
+        // A row ends its last cell's tab.
+        if self.s.ends_with('\t') {
+            self.s.pop();
+        }
+        if !self.at_line_start() {
+            self.put('\n');
+        }
+        self.space = false;
+    }
+
+    /// A tab between cells.
+    pub(crate) fn tab(&mut self) {
+        if !self.at_line_start() && !self.s.ends_with('\t') {
+            self.put('\t');
+        }
+        self.space = false;
+    }
+
+    /// Mark the text cut short, for a reader that stopped for another reason.
+    #[cfg(feature = "text-pdf")]
+    pub(crate) fn cut(&mut self) {
+        self.truncated = true;
+    }
+
+    /// ` (target)` after a link's label, unless the label is the target (or
+    /// there is no label to follow).
+    pub(crate) fn target(&mut self, label_from: usize, target: &str) {
+        let target = target.trim();
+        if target.is_empty() || target.starts_with('#') {
+            return;
+        }
+        let label = self.since(label_from).trim();
+        let bare = target.strip_prefix("mailto:").unwrap_or(target);
+        if label == target
+            || label == bare
+            || label.trim_end_matches('/') == target.trim_end_matches('/')
+        {
+            return;
+        }
+        if self.links.len() < MAX_LINKS {
+            self.links.push((
+                label.chars().take(2048).collect(),
+                target.chars().take(2048).collect(),
+            ));
+        }
+        self.space();
+        self.text(&format!("({target})"));
+    }
+
+    fn finish(mut self) -> Extracted {
+        while self.s.ends_with(['\n', ' ', '\t']) {
+            self.s.pop();
+        }
+        if !self.s.is_empty() {
+            self.s.push('\n');
+        }
+        Extracted {
+            text: self.s,
+            truncated: self.truncated,
+            links: self.links,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn what_a_part_of_a_package_is() {
+        assert_eq!(xml_part("word/document.xml"), Some(XmlPart::Word));
+        assert_eq!(xml_part("word/header2.xml"), Some(XmlPart::Word));
+        assert_eq!(xml_part("word/headers.xml"), None);
+        assert_eq!(xml_part("ppt/slides/slide12.xml"), Some(XmlPart::Slide));
+        assert_eq!(xml_part("ppt/slides/_rels/slide1.xml.rels"), None);
+        assert_eq!(xml_part("xl/worksheets/sheet1.xml"), Some(XmlPart::Sheet));
+        assert_eq!(
+            xml_part("xl/sharedstrings.xml"),
+            Some(XmlPart::SharedStrings)
+        );
+        assert_eq!(xml_part("content.xml"), Some(XmlPart::Odf));
+        assert_eq!(xml_part("docprops/core.xml"), None);
+    }
+}
diff --git a/crates/exav-unpack/src/text/pdf.rs b/crates/exav-unpack/src/text/pdf.rs
new file mode 100644
index 00000000..ae10df4c
--- /dev/null
+++ b/crates/exav-unpack/src/text/pdf.rs
@@ -0,0 +1,156 @@
+//! The text of a PDF, read by hayro: it interprets each page and hands over
+//! its glyphs with their Unicode (the font's `ToUnicode`, else the glyph's name),
+//! and this puts them back in lines and words from where they sit.
+//!
+//! hayro puts no bound on what a stream decompresses to, nor on the size of the
+//! image a dictionary or a codec's header declares (a 123 KB PDF with JBIG2
+//! data for 100000 by 100000 pixels took it 8.9 GB), so it is given a PDF only
+//! after this crate's own reader has taken every stream of it within the budget
+//! (what the scanner does anyway) and `pdf_screen` has read no image size past
+//! its bound; one that does not pass is cut, not read. A PDF that hayro cannot
+//! open (encrypted with a password, too damaged) has no text here. A panic in
+//! hayro is contained.
+
+use std::collections::HashMap;
+use std::panic::{AssertUnwindSafe, catch_unwind};
+
+use hayro_interpret::font::{Glyph, GlyphRun};
+use hayro_interpret::hayro_cmap::BfString;
+use hayro_interpret::{
+    BlendMode, CacheKey, ClipPath, Context, Device, DrawMode, DrawProps, Image, ImageDrawProps,
+    InterpreterCache, InterpreterSettings, SoftMask, interpret_page,
+};
+use hayro_syntax::Pdf;
+use kurbo::{Affine, BezPath, Point, Rect, Shape};
+
+use super::Out;
+use super::pdf_screen::images_are_small;
+use crate::{Budget, Format, Limits};
+
+/// Glyph shapes remembered, for how far each reaches.
+const MAX_REMEMBERED: usize = 1 << 16;
+
+pub(super) fn read(data: &[u8], limits: &Limits, out: &mut Out) {
+    // An encrypted PDF has no text here: hayro opens none, and the scanner
+    // reports it as encrypted on its own.
+    if memchr::memmem::find(data, b"/Encrypt").is_some() {
+        return;
+    }
+    if !images_are_small(data, limits.max_buffer_bytes) {
+        out.cut();
+        return;
+    }
+    // Every stream within the budget first: hayro does not look.
+    let mut budget = Budget::new(limits.clone());
+    match crate::walk(Format::Pdf, &data, &mut budget, &mut |_, _, _| None::<()>) {
+        Ok(_) => {}
+        Err(_) => {
+            out.cut();
+            return;
+        }
+    }
+    let read = catch_unwind(AssertUnwindSafe(|| pages(data, out)));
+    if read.is_err() {
+        out.cut();
+    }
+}
+
+fn pages(data: &[u8], out: &mut Out) {
+    let Ok(pdf) = Pdf::new(data.to_vec()) else {
+        return;
+    };
+    let cache = InterpreterCache::new();
+    let mut device = Lines {
+        out,
+        last: None,
+        reach: HashMap::new(),
+    };
+    for page in pdf.pages().iter() {
+        if device.out.full() {
+            return;
+        }
+        let settings = InterpreterSettings {
+            render_annotations: false,
+            ..InterpreterSettings::default()
+        };
+        let mut context = Context::new(
+            Affine::IDENTITY,
+            Rect::new(0.0, 0.0, 1.0, 1.0),
+            &cache,
+            pdf.xref(),
+            settings,
+        );
+        interpret_page(page, &mut context, &mut device);
+        device.out.newline();
+        device.last = None;
+    }
+}
+
+/// Where the last glyph ended.
+struct Last {
+    right: f64,
+    y: f64,
+}
+
+struct Lines<'o> {
+    out: &'o mut Out,
+    last: Option<Last>,
+    /// How far right of its origin each glyph shape reaches, in 1000 units to
+    /// the em.
+    reach: HashMap<u128, f64>,
+}
+
+impl Device<'_> for Lines<'_> {
+    fn draw_path(&mut self, _: &BezPath, _: DrawProps<'_>, _: &DrawMode) {}
+
+    fn push_clip_path(&mut self, _: &ClipPath) {}
+
+    fn push_transparency_group(&mut self, _: f32, _: Option<SoftMask<'_>>, _: BlendMode) {}
+
+    fn draw_glyph_run(&mut self, run: &GlyphRun<'_, '_>, props: DrawProps<'_>, _: &DrawMode) {
+        for glyph in run.glyphs() {
+            if self.out.full() {
+                return;
+            }
+            let m = props.transform * glyph.transform();
+            let origin = m * Point::ZERO;
+            let em = ((m * Point::new(0.0, 1000.0)) - origin).hypot().max(1e-6);
+            let reach = match &**glyph {
+                Glyph::Outline(g) => {
+                    let key = g.identifier().cache_key();
+                    match self.reach.get(&key) {
+                        Some(r) => *r,
+                        None => {
+                            let r = g.outline().bounding_box().x1.max(0.0);
+                            if self.reach.len() < MAX_REMEMBERED {
+                                self.reach.insert(key, r);
+                            }
+                            r
+                        }
+                    }
+                }
+                Glyph::Type3(_) => 500.0,
+            };
+            let right = (m * Point::new(reach, 0.0)).x;
+            if let Some(last) = &self.last {
+                if (origin.y - last.y).abs() > em * 0.5 {
+                    self.out.newline();
+                } else if origin.x - last.right > em * 0.12 {
+                    self.out.space();
+                }
+            }
+            self.last = Some(Last { right, y: origin.y });
+            match glyph.as_unicode() {
+                Some(BfString::Char(c)) => self.out.text(c.encode_utf8(&mut [0; 4])),
+                Some(BfString::String(s)) => self.out.text(&s),
+                None => {}
+            }
+        }
+    }
+
+    fn draw_image(&mut self, _: Image<'_, '_>, _: ImageDrawProps<'_>) {}
+
+    fn pop_clip(&mut self) {}
+
+    fn pop_transparency_group(&mut self) {}
+}
diff --git a/crates/exav-unpack/src/text/pdf_screen.rs b/crates/exav-unpack/src/text/pdf_screen.rs
new file mode 100644
index 00000000..9342fa26
--- /dev/null
+++ b/crates/exav-unpack/src/text/pdf_screen.rs
@@ -0,0 +1,181 @@
+//! What a PDF declares before hayro is given it.
+//!
+//! hayro sizes its buffers by what an image says of itself, in its dictionary
+//! or in the header of its JPEG, JPEG 2000 or JBIG2 data: a 123 KB file with
+//! JBIG2 data for 100000 by 100000 pixels took it 8.9 GB. This reads those
+//! numbers, and nothing else of the data, from every stream of the document,
+//! and refuses a document in which one is past [`MAX_IMAGE_PIXELS`] or cannot
+//! be read.
+
+use std::collections::HashMap;
+
+use crate::formats::pdf::{apply_filters, filter_names};
+use crate::formats::pdf_parse::lex::Lexer;
+use crate::formats::pdf_parse::parse::parse_indirect_object_body;
+use crate::formats::pdf_parse::types::Primitive;
+
+/// Most pixels an image of the document may declare (a 134 million pixel image
+/// is 536 MB of RGBA).
+pub(super) const MAX_IMAGE_PIXELS: u64 = 1 << 27;
+
+/// Whether every image of `data` is within [`MAX_IMAGE_PIXELS`], by what it
+/// declares. `cap` bounds what a stream decodes to before its image codec.
+pub(super) fn images_are_small(data: &[u8], cap: u64) -> bool {
+    let mut lex = Lexer::new(data);
+    while let Some((_, _, start)) = lex.find_next_obj() {
+        lex.set_pos(start);
+        let Some((obj, _)) = parse_indirect_object_body(&mut lex) else {
+            continue;
+        };
+        let (info, raw) = match obj {
+            Primitive::Stream { info, data } => (info, Some(data)),
+            Primitive::Dictionary(info) => (info, None),
+            _ => continue,
+        };
+        if declared(&info).is_some_and(|(w, h)| w.saturating_mul(h) > MAX_IMAGE_PIXELS) {
+            return false;
+        }
+        let Some(raw) = raw else { continue };
+        let Some(codec) = filter_names(&info).into_iter().find_map(|f| codec(&f)) else {
+            continue;
+        };
+        // The data as the codec gets it, after the filters before it.
+        let Ok(decoded) = apply_filters(&raw, &info, cap) else {
+            return false;
+        };
+        if decoded.truncated {
+            return false;
+        }
+        match header_dims(codec, &decoded.buf) {
+            Some((w, h)) if w.saturating_mul(h) <= MAX_IMAGE_PIXELS => {}
+            _ => return false,
+        }
+    }
+    true
+}
+
+#[derive(Clone, Copy)]
+enum Codec {
+    Jpeg,
+    Jpx,
+    Jbig2,
+}
+
+/// The image codec a filter name is, when it is one whose header is read.
+fn codec(filter: &str) -> Option<Codec> {
+    match filter {
+        "DCTDecode" | "DCT" => Some(Codec::Jpeg),
+        "JPXDecode" => Some(Codec::Jpx),
+        "JBIG2Decode" => Some(Codec::Jbig2),
+        _ => None,
+    }
+}
+
+/// `/Width` and `/Height` of a dictionary, when it has both as integers.
+fn declared(info: &HashMap<String, Primitive>) -> Option<(u64, u64)> {
+    let n = |k: &str| {
+        info.get(k)
+            .and_then(Primitive::as_i64)
+            .map(|v| u64::try_from(v).unwrap_or(0))
+    };
+    Some((n("Width")?, n("Height")?))
+}
+
+fn header_dims(codec: Codec, d: &[u8]) -> Option<(u64, u64)> {
+    match codec {
+        Codec::Jpeg => jpeg_dims(d),
+        Codec::Jpx => jpx_dims(d),
+        Codec::Jbig2 => jbig2_dims(d),
+    }
+}
+
+fn be16(d: &[u8], at: usize) -> Option<u64> {
+    Some(u64::from(u16::from_be_bytes(
+        d.get(at..at + 2)?.try_into().ok()?,
+    )))
+}
+
+fn be32(d: &[u8], at: usize) -> Option<u64> {
+    Some(u64::from(u32::from_be_bytes(
+        d.get(at..at + 4)?.try_into().ok()?,
+    )))
+}
+
+/// A JPEG's size, from its first start-of-frame marker.
+fn jpeg_dims(d: &[u8]) -> Option<(u64, u64)> {
+    let mut at = 2;
+    for _ in 0..4096 {
+        if *d.get(at)? != 0xff {
+            at += 1;
+            continue;
+        }
+        let marker = *d.get(at + 1)?;
+        match marker {
+            0xff => at += 1,
+            // Start of frame (not the Huffman table, the JPEG extension or the
+            // arithmetic conditioning).
+            0xc0..=0xcf if !matches!(marker, 0xc4 | 0xc8 | 0xcc) => {
+                return Some((be16(d, at + 7)?, be16(d, at + 5)?));
+            }
+            // Markers without a length.
+            0x00 | 0x01 | 0xd0..=0xd9 => at += 2,
+            _ => at += 2 + usize::try_from(be16(d, at + 2)?).ok()?,
+        }
+    }
+    None
+}
+
+/// A JPEG 2000 image's size: from the codestream's SIZ marker, or the `ihdr`
+/// box of a JP2 file.
+fn jpx_dims(d: &[u8]) -> Option<(u64, u64)> {
+    let head = &d[..d.len().min(4096)];
+    if let Some(at) = memchr::memmem::find(head, b"ihdr") {
+        return Some((be32(d, at + 8)?, be32(d, at + 4)?));
+    }
+    let at = memchr::memmem::find(head, &[0xff, 0x4f, 0xff, 0x51])? + 2;
+    let (x, y) = (be32(d, at + 6)?, be32(d, at + 10)?);
+    let (xo, yo) = (be32(d, at + 14)?, be32(d, at + 18)?);
+    Some((x.saturating_sub(xo), y.saturating_sub(yo)))
+}
+
+/// A JBIG2 page's size, from its page information segment (embedded
+/// organisation, as PDF has it: a run of segments).
+fn jbig2_dims(d: &[u8]) -> Option<(u64, u64)> {
+    let mut at = 0usize;
+    for _ in 0..64 {
+        let number = be32(d, at)?;
+        let flags = *d.get(at + 4)?;
+        let kind = flags & 0x3f;
+        let mut p = at + 5;
+        // Referred-to segments: a count, retain bits, and their numbers.
+        let first = *d.get(p)?;
+        let count = if first >> 5 == 7 {
+            let n = be32(d, p)? & 0x1fff_ffff;
+            p += 4 + usize::try_from(n + 1).ok()?.div_ceil(8);
+            n
+        } else {
+            p += 1;
+            u64::from(first >> 5)
+        };
+        let size = if number <= 256 {
+            1
+        } else if number <= 65536 {
+            2
+        } else {
+            4
+        };
+        p += usize::try_from(count).ok()?.checked_mul(size)?;
+        // The page the segment belongs to, then its length.
+        p += if flags & 0x40 != 0 { 4 } else { 1 };
+        let length = be32(d, p)?;
+        p += 4;
+        if kind == 48 {
+            return Some((be32(d, p)?, be32(d, p + 4)?));
+        }
+        if length == 0xffff_ffff {
+            return None;
+        }
+        at = p.checked_add(usize::try_from(length).ok()?)?;
+    }
+    None
+}
diff --git a/crates/exav-unpack/src/text/xml.rs b/crates/exav-unpack/src/text/xml.rs
new file mode 100644
index 00000000..67db315c
--- /dev/null
+++ b/crates/exav-unpack/src/text/xml.rs
@@ -0,0 +1,109 @@
+//! The text of an XML part of an Office or OpenDocument file.
+//!
+//! Where the text is depends on the part: Word and PowerPoint keep it in `t`
+//! elements, a sheet in `t` (inline strings) and `f` (formulas), the shared
+//! strings in `t`, OpenDocument anywhere in its content. A field code
+//! (`instrText`) and deleted text (`delText`) are not read: a reader does not
+//! see them. Paragraphs, rows and breaks end the line, cells are apart by
+//! tabs. Entities are the XML ones and character references; a DTD, and so a
+//! custom entity, is never read.
+
+use quick_xml::Reader;
+use quick_xml::events::Event;
+
+use super::{Out, XmlPart};
+
+pub(super) fn read(src: &str, part: XmlPart, out: &mut Out) {
+    let mut reader = Reader::from_str(src);
+    {
+        let c = reader.config_mut();
+        c.check_end_names = false;
+        c.allow_unmatched_ends = true;
+        c.allow_dangling_amp = true;
+    }
+    // How many open elements hold text, how many hold what is not read, and
+    // for each open element what it added to those.
+    let mut text = usize::from(part == XmlPart::Odf);
+    let mut skip = 0usize;
+    // OpenDocument table cells open, whose paragraphs do not end the line.
+    let mut cells = 0usize;
+    let mut open: Vec<(bool, bool)> = Vec::new();
+    while !out.full() {
+        let event = match reader.read_event() {
+            Ok(Event::Eof) | Err(_) => break,
+            Ok(e) => e,
+        };
+        match event {
+            Event::Start(e) => {
+                let name = e.local_name();
+                let name = name.as_ref().as_bytes();
+                let holds = holds_text(part, name);
+                let hides = matches!(name, b"instrText" | b"delText");
+                text += usize::from(holds);
+                skip += usize::from(hides);
+                open.push((holds, hides));
+                cells += usize::from(part == XmlPart::Odf && name == b"table-cell");
+                starts(part, name, out);
+            }
+            Event::Empty(e) => starts(part, e.local_name().as_ref().as_bytes(), out),
+            Event::End(e) => {
+                let (holds, hides) = open.pop().unwrap_or((false, false));
+                text -= usize::from(holds);
+                skip -= usize::from(hides);
+                let name = e.local_name();
+                let name = name.as_ref().as_bytes();
+                if part == XmlPart::Odf && name == b"table-cell" {
+                    cells = cells.saturating_sub(1);
+                }
+                ends(part, name, cells > 0, out);
+            }
+            Event::Text(t) if text > 0 && skip == 0 => {
+                out.text(&t.xml10_content());
+            }
+            Event::CData(t) if text > 0 && skip == 0 => {
+                out.text(&t);
+            }
+            Event::GeneralRef(r) if text > 0 && skip == 0 => {
+                if let Ok(Some(c)) = r.resolve_char_ref() {
+                    out.text(c.encode_utf8(&mut [0; 4]));
+                } else if let Some(s) = quick_xml::escape::resolve_predefined_entity(&r) {
+                    out.text(s);
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+fn holds_text(part: XmlPart, name: &[u8]) -> bool {
+    match part {
+        XmlPart::Word | XmlPart::Slide | XmlPart::SharedStrings => name == b"t",
+        XmlPart::Sheet => matches!(name, b"t" | b"f"),
+        XmlPart::Odf => false,
+    }
+}
+
+/// An element that is itself a break or a gap.
+fn starts(part: XmlPart, name: &[u8], out: &mut Out) {
+    match (part, name) {
+        (XmlPart::Word, b"tab") | (XmlPart::Odf, b"tab" | b"s") => out.space(),
+        (XmlPart::Word, b"br" | b"cr")
+        | (XmlPart::Slide, b"br")
+        | (XmlPart::Odf, b"line-break") => out.newline(),
+        _ => {}
+    }
+}
+
+/// An element whose end ends a line or a cell. `in_cell`: inside an
+/// OpenDocument table cell, where a paragraph is a gap.
+fn ends(part: XmlPart, name: &[u8], in_cell: bool, out: &mut Out) {
+    match (part, name) {
+        (XmlPart::Odf, b"p" | b"h") if in_cell => out.space(),
+        (XmlPart::Word | XmlPart::Slide, b"p")
+        | (XmlPart::SharedStrings, b"si")
+        | (XmlPart::Sheet, b"row")
+        | (XmlPart::Odf, b"p" | b"h" | b"table-row") => out.newline(),
+        (XmlPart::Sheet, b"c") | (XmlPart::Odf, b"table-cell") => out.tab(),
+        _ => {}
+    }
+}
diff --git a/crates/exav-unpack/src/volume.rs b/crates/exav-unpack/src/volume.rs
index bd864d85..5bed4f23 100644
--- a/crates/exav-unpack/src/volume.rs
+++ b/crates/exav-unpack/src/volume.rs
@@ -76,28 +76,30 @@ pub fn parse(name: &str) -> Option<VolumeName> {
     let stem = &name[..stem_l.len()];
 
     // `stem.rNN` — continuation of the old RAR scheme. `.r00` is volume 1.
-    if let Some(digits) = ext.strip_prefix('r') {
-        if digits.len() == 2 && digits.bytes().all(|b| b.is_ascii_digit()) {
-            let n: usize = digits.parse().ok()?;
-            return Some(VolumeName {
-                stem: stem.to_string(),
-                index: n + 1,
-                scheme: Scheme::RarOld,
-            });
-        }
+    if let Some(digits) = ext.strip_prefix('r')
+        && digits.len() == 2
+        && digits.bytes().all(|b| b.is_ascii_digit())
+    {
+        let n: usize = digits.parse().ok()?;
+        return Some(VolumeName {
+            stem: stem.to_string(),
+            index: n + 1,
+            scheme: Scheme::RarOld,
+        });
     }
 
     // `stem.zNN` — ZIP spanning. `.z01` is volume 0; the bare `.zip` is LAST,
     // because it carries the central directory.
-    if let Some(digits) = ext.strip_prefix('z') {
-        if digits.len() == 2 && digits.bytes().all(|b| b.is_ascii_digit()) {
-            let n: usize = digits.parse().ok()?;
-            return Some(VolumeName {
-                stem: stem.to_string(),
-                index: n.checked_sub(1)?,
-                scheme: Scheme::ZipSplit,
-            });
-        }
+    if let Some(digits) = ext.strip_prefix('z')
+        && digits.len() == 2
+        && digits.bytes().all(|b| b.is_ascii_digit())
+    {
+        let n: usize = digits.parse().ok()?;
+        return Some(VolumeName {
+            stem: stem.to_string(),
+            index: n.checked_sub(1)?,
+            scheme: Scheme::ZipSplit,
+        });
     }
 
     // `stem.<ext>.NNN` — the generic numbered split (7z, zip, arj, tar…).
@@ -149,7 +151,14 @@ impl VolumeName {
     /// archive.
     pub fn same_set_as(&self, other: &VolumeName) -> bool {
         self.stem.eq_ignore_ascii_case(&other.stem)
-            && std::mem::discriminant(&self.scheme) == std::mem::discriminant(&other.scheme)
+            && match (&self.scheme, &other.scheme) {
+                // `a.7z.001` and `a.zip.002` are the volumes of two archives.
+                (
+                    Scheme::NumberedSuffix { base_ext: a, .. },
+                    Scheme::NumberedSuffix { base_ext: b, .. },
+                ) => a.eq_ignore_ascii_case(b),
+                (a, b) => std::mem::discriminant(a) == std::mem::discriminant(b),
+            }
     }
 }
 
@@ -177,11 +186,11 @@ pub fn group(names: &[&str]) -> Vec<Vec<usize>> {
             if claimed[j] {
                 continue;
             }
-            if let Some(vj) = item {
-                if vi.same_set_as(vj) {
-                    members.push((vj.index, j));
-                    claimed[j] = true;
-                }
+            if let Some(vj) = item
+                && vi.same_set_as(vj)
+            {
+                members.push((vj.index, j));
+                claimed[j] = true;
             }
         }
         if members.len() < 2 {
@@ -191,7 +200,7 @@ pub fn group(names: &[&str]) -> Vec<Vec<usize>> {
         members.sort_by_key(|(idx, _)| *idx);
         // Duplicate positions mean the names disagree about the set's shape;
         // concatenating them would splice bytes in an order nothing wrote.
-        if members.windows(2).any(|w| w[0].0 == w[1].0) {
+        if members.array_windows().any(|[a, b]| a.0 == b.0) {
             continue;
         }
         sets.push(members.into_iter().map(|(_, j)| j).collect());
@@ -399,7 +408,8 @@ impl Collector {
                 continue;
             }
             let idx: Vec<usize> = set.parts.iter().map(|(i, _, _)| *i).collect();
-            let complete = idx.first() == Some(&0) && idx.windows(2).all(|w| w[1] == w[0] + 1);
+            let complete =
+                idx.first() == Some(&0) && idx.array_windows().all(|[a, b]| *b == *a + 1);
             if !complete {
                 let reason = if idx.first() != Some(&0) {
                     "part of a multi-volume set whose first volume was not present"
@@ -525,6 +535,32 @@ mod tests {
         assert_eq!(sets.len(), 2, "got {sets:?}");
     }
 
+    #[test]
+    fn a_shared_stem_with_other_formats_numbered_is_two_archives() {
+        // The same stem and the same kind of numbering, but a 7z and a zip.
+        let names = ["a.7z.001", "a.zip.002", "a.ZIP.001", "a.7z.002"];
+        let sets = group(&names);
+        assert_eq!(sets.len(), 2, "got {sets:?}");
+        for s in &sets {
+            let exts: Vec<_> = s
+                .iter()
+                .map(|&i| {
+                    names[i]
+                        .rsplit_once('.')
+                        .unwrap()
+                        .0
+                        .rsplit('.')
+                        .next()
+                        .unwrap()
+                })
+                .collect();
+            assert!(
+                exts.iter().all(|e| e.eq_ignore_ascii_case(exts[0])),
+                "{exts:?}"
+            );
+        }
+    }
+
     #[test]
     fn a_lone_volume_is_not_a_set() {
         assert!(group(&["a.part1.rar"]).is_empty());
diff --git a/crates/exav-unpack/tests/cli.rs b/crates/exav-unpack/tests/cli.rs
index b3510429..49d63462 100644
--- a/crates/exav-unpack/tests/cli.rs
+++ b/crates/exav-unpack/tests/cli.rs
@@ -412,6 +412,55 @@ fn nothing_is_written_through_a_link() {
     assert!(!fresh.join("up").is_symlink());
 }
 
+/// Each link of a chain passes a check of its own words: `a -> .` stays, and
+/// `b -> a/..` has one `..` against two components. Followed through `a`, `b` is
+/// the directory above the root, and `c -> b/..` the one above that.
+#[cfg(unix)]
+#[test]
+fn a_chain_of_links_does_not_walk_out_of_the_extraction_directory() {
+    let sc = Scratch::new("link-chain");
+    let t = sc.write(
+        "chain.tar",
+        &tar_of(&[
+            ("a", b'2', 0o777, 0, ".", b""),
+            ("b", b'2', 0o777, 0, "a/..", b""),
+            ("c", b'2', 0o777, 0, "b/..", b""),
+            ("d", b'2', 0o777, 0, "c/etc", b""),
+            ("fine", b'2', 0o777, 0, "a/sub", b""),
+        ]),
+    );
+    let fresh = sc.subdir("outer/root");
+    let o = run(&[s(&t), "-d", s(&fresh)]);
+    assert!(
+        stderr(&o).contains("outside the extraction directory"),
+        "{}",
+        stderr(&o)
+    );
+    let root = std::fs::canonicalize(&fresh).unwrap();
+    for name in ["a", "b", "c", "d", "fine"] {
+        let l = fresh.join(name);
+        if l.is_symlink() {
+            let resolved = std::fs::canonicalize(&l).unwrap_or_else(|_| {
+                // Dangling: judge it by where its parent's target would be.
+                root.join(std::fs::read_link(&l).unwrap())
+            });
+            assert!(
+                resolved.starts_with(&root) || name == "fine",
+                "{name} leaves the root: {}",
+                resolved.display()
+            );
+        }
+    }
+    assert!(
+        !fresh.join("b").is_symlink(),
+        "b -> a/.. is the directory above the root"
+    );
+    assert!(
+        fresh.join("a").is_symlink(),
+        "a link inside the root is still made"
+    );
+}
+
 /// tar keeps what unzip restores: the time, the permission bits, the links.
 #[cfg(unix)]
 #[test]
@@ -716,7 +765,7 @@ fn a_real_rar_volume_set_extracts_from_any_part() {
 /// joined; parts named otherwise are given with `--volume`.
 #[test]
 fn a_rar_volume_set_is_read_whole() {
-    let arc = std::fs::read(concat!(
+    let arc = exav_unpack::read_fixture(concat!(
         env!("CARGO_MANIFEST_DIR"),
         "/tests/fixtures/rar_solid/solid_rar4.rar"
     ))
@@ -835,3 +884,42 @@ fn an_unrecognised_format_fails_rather_than_reporting_an_empty_archive() {
     assert!(stderr(&o).contains("not an archive"), "{}", stderr(&o));
     assert_eq!(stdout(&o), "");
 }
+
+/// `exav-unpack -l archive | head` ends quietly, as every Unix filter does:
+/// Rust ignores `SIGPIPE`, and `println!` panics on the `EPIPE` it gets back.
+#[cfg(unix)]
+#[test]
+fn a_listing_into_a_closed_pipe_ends_quietly() {
+    use std::io::Read;
+    let sc = Scratch::new("closed-pipe");
+    // Far more output than a pipe holds, so the program is still writing when
+    // the reader goes away.
+    let names: Vec<String> = (0..6000)
+        .map(|i| format!("member-with-a-long-name-{i:05}.txt"))
+        .collect();
+    let members: Vec<(&str, &[u8])> = names.iter().map(|n| (n.as_str(), &b""[..])).collect();
+    let arc = sc.write("many.zip", &zip_of(&members));
+    let mut child = Command::new(BIN)
+        .arg("-l")
+        .arg(&arc)
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .unwrap();
+    // One byte read, then the pipe closed.
+    let mut stdout = child.stdout.take().unwrap();
+    let mut one = [0u8; 1];
+    stdout.read_exact(&mut one).unwrap();
+    drop(stdout);
+    let mut err = String::new();
+    child
+        .stderr
+        .take()
+        .unwrap()
+        .read_to_string(&mut err)
+        .unwrap();
+    let status = child.wait().unwrap();
+    assert!(!err.contains("panicked"), "{err}");
+    assert!(!err.contains("failed printing"), "{err}");
+    assert_ne!(status.code(), Some(101), "{err}");
+}
diff --git a/crates/exav-unpack/tests/fixtures/7z/aes_40_folders_2p19.7z b/crates/exav-unpack/tests/fixtures/7z/aes_40_folders_2p19.7z
new file mode 100644
index 00000000..878ca5d4
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/7z/aes_40_folders_2p19.7z differ
diff --git a/crates/exav-unpack/tests/fixtures/7z/many_entries.7z b/crates/exav-unpack/tests/fixtures/7z/many_entries.7z
new file mode 100644
index 00000000..6a59bcd4
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/7z/many_entries.7z differ
diff --git a/crates/exav-unpack/tests/fixtures/README.md b/crates/exav-unpack/tests/fixtures/README.md
index 7d1dd2e2..7cd93946 100644
--- a/crates/exav-unpack/tests/fixtures/README.md
+++ b/crates/exav-unpack/tests/fixtures/README.md
@@ -33,9 +33,10 @@ in archives would make the ZIP and 7z tests depend on working ZIP and decryption
 support to load their own inputs, and the `--no-default-features` build has
 neither compiled in.
 
-`scripts/release.sh` re-checks the whole tracked tree with `clamscan` when a
-signature database is present, so a fixture committed in the clear is caught
-before it ships.
+`scripts/release.sh` greps the tracked tree for the EICAR string on every run.
+`make av-audit` scans it with `clamscan` and a signature database, which needs
+both installed, so it is run when fixtures change; `docs/RELEASING.md` also
+has the release build scanned over the tree.
 
 ## Real malware is never committed
 
@@ -54,6 +55,18 @@ locally. Those are:
 That needs the `zip` and `decrypt` features; a build without them, like a
 checkout without the samples, skips the tests that use them.
 
+## Written by a script
+
+`dmg/udif_lzfse.dmg` is `dmg/hfs_plus_udrw.dmg`'s disk in two LZFSE runs (sectors
+0 to 8, then the rest): a UDIF image with a `koly` trailer and a block map
+around the streams the `lzfse_rust` crate (an LZFSE encoder, MIT) writes, one
+LZVN block and FSE blocks. `tests/suites/lzfse.rs` reads it back against the
+raw image.
+
+`tests/oracle/` holds the C wrappers and `build.sh` for the differential tests
+of the LZFSE and DCL decoders against their reference sources, which are
+fetched, never committed (`src/formats/lzfse.rs`, `src/formats/dcl_explode.rs`).
+
 To add one (`pip install pyzipper`):
 
 ```python
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.deflate.qcow2.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.deflate.qcow2.gz.xor
new file mode 100644
index 00000000..6509f53f
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.deflate.qcow2.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.dynamic.vhd.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.dynamic.vhd.gz.xor
new file mode 100644
index 00000000..f93286bf
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.dynamic.vhd.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.dynamic.vhdx.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.dynamic.vhdx.gz.xor
new file mode 100644
index 00000000..5f1b8380
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.dynamic.vhdx.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.plain.qcow2.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.plain.qcow2.gz.xor
new file mode 100644
index 00000000..330d3c0f
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.plain.qcow2.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.sparse.vmdk.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.sparse.vmdk.gz.xor
new file mode 100644
index 00000000..5bb23403
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.sparse.vmdk.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.stream.vmdk.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.stream.vmdk.gz.xor
new file mode 100644
index 00000000..f6cac4db
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.stream.vmdk.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/diskimage/fat4g.zstd.qcow2.gz.xor b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.zstd.qcow2.gz.xor
new file mode 100644
index 00000000..a139e2e2
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/diskimage/fat4g.zstd.qcow2.gz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/dmg/udif_lzfse.dmg b/crates/exav-unpack/tests/fixtures/dmg/udif_lzfse.dmg
new file mode 100644
index 00000000..9ee74cb4
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/dmg/udif_lzfse.dmg differ
diff --git a/crates/exav-unpack/tests/fixtures/encrypted/mhe_lzma.7z b/crates/exav-unpack/tests/fixtures/encrypted/mhe_lzma.7z
new file mode 100644
index 00000000..8780118c
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/encrypted/mhe_lzma.7z differ
diff --git a/crates/exav-unpack/tests/fixtures/encrypted/mhe_lzma2.7z b/crates/exav-unpack/tests/fixtures/encrypted/mhe_lzma2.7z
new file mode 100644
index 00000000..54a56d4a
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/encrypted/mhe_lzma2.7z differ
diff --git a/crates/exav-unpack/tests/fixtures/encrypted/mhe_sevenz_rust2.7z b/crates/exav-unpack/tests/fixtures/encrypted/mhe_sevenz_rust2.7z
new file mode 100644
index 00000000..43436c66
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/encrypted/mhe_sevenz_rust2.7z differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/cramfs.img.gz b/crates/exav-unpack/tests/fixtures/fs/cramfs.img.gz
new file mode 100644
index 00000000..b341f1cb
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/cramfs.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/cramfs_big_endian.img.gz b/crates/exav-unpack/tests/fixtures/fs/cramfs_big_endian.img.gz
new file mode 100644
index 00000000..cdc3643d
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/cramfs_big_endian.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/cramfs_extended.img.gz b/crates/exav-unpack/tests/fixtures/fs/cramfs_extended.img.gz
new file mode 100644
index 00000000..e6644efa
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/cramfs_extended.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/cramfs_holes.img.gz b/crates/exav-unpack/tests/fixtures/fs/cramfs_holes.img.gz
new file mode 100644
index 00000000..1988f76b
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/cramfs_holes.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/cramfs_padded.img.gz b/crates/exav-unpack/tests/fixtures/fs/cramfs_padded.img.gz
new file mode 100644
index 00000000..589fcfe5
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/cramfs_padded.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/erofs.img.gz b/crates/exav-unpack/tests/fixtures/fs/erofs.img.gz
new file mode 100644
index 00000000..6fd6d736
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/erofs.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/erofs_chunks.img.gz b/crates/exav-unpack/tests/fixtures/fs/erofs_chunks.img.gz
new file mode 100644
index 00000000..759a0145
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/erofs_chunks.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/erofs_compact_inodes.img.gz b/crates/exav-unpack/tests/fixtures/fs/erofs_compact_inodes.img.gz
new file mode 100644
index 00000000..deea360b
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/erofs_compact_inodes.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/erofs_lz4.img.gz b/crates/exav-unpack/tests/fixtures/fs/erofs_lz4.img.gz
new file mode 100644
index 00000000..63529f81
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/erofs_lz4.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/erofs_small_blocks.img.gz b/crates/exav-unpack/tests/fixtures/fs/erofs_small_blocks.img.gz
new file mode 100644
index 00000000..ee0696ba
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/erofs_small_blocks.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/exfat.img.gz b/crates/exav-unpack/tests/fixtures/fs/exfat.img.gz
new file mode 100644
index 00000000..e94f0463
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/exfat.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/exfat_small_clusters.img.gz b/crates/exav-unpack/tests/fixtures/fs/exfat_small_clusters.img.gz
new file mode 100644
index 00000000..833d0fcc
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/exfat_small_clusters.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext2_blockmap.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext2_blockmap.img.gz
new file mode 100644
index 00000000..caafa286
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext2_blockmap.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext3.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext3.img.gz
new file mode 100644
index 00000000..69c39e48
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext3.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext4.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext4.img.gz
new file mode 100644
index 00000000..cd393718
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext4.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext4_bigalloc.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext4_bigalloc.img.gz
new file mode 100644
index 00000000..2ce2bddb
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext4_bigalloc.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext4_inline.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext4_inline.img.gz
new file mode 100644
index 00000000..c24c58fa
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext4_inline.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext4_kernel.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext4_kernel.img.gz
new file mode 100644
index 00000000..ff60d728
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext4_kernel.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/ext4_metabg.img.gz b/crates/exav-unpack/tests/fixtures/fs/ext4_metabg.img.gz
new file mode 100644
index 00000000..88dce6d4
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/ext4_metabg.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/extras.py b/crates/exav-unpack/tests/fixtures/fs/extras.py
new file mode 100644
index 00000000..30e4804d
--- /dev/null
+++ b/crates/exav-unpack/tests/fixtures/fs/extras.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+"""Write, in the current directory, what only a mounted filesystem makes.
+
+    extras.py [--trunc-only]
+
+Preallocated space that was written in part, a hole punched in a written file,
+a file written across the holes of deleted ones, a file longer than what was
+written to it, and a directory that lost a third of its entries. The matching
+list is `extras` in `tests/suites/fs_tree.rs`.
+"""
+import ctypes
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from tree import pat  # noqa: E402
+
+KEEP_SIZE, PUNCH_HOLE = 1, 2
+
+
+def main():
+    os.mkdir("k")
+    # Blocks that hold something when they are preallocated, to be read as zeros.
+    with open("k/stale", "wb") as f:
+        f.write(b"stale" * (1 << 18))
+        f.flush()
+        os.fsync(f.fileno())
+    os.unlink("k/stale")
+    os.sync()
+    # A file longer than what was written to it. Only this, for a filesystem
+    # that keeps the length written apart (exFAT) and has no holes or
+    # preallocation to speak of.
+    with open("k/trunc.bin", "wb") as f:
+        f.write(b"abc")
+        f.truncate(100000)
+    if "--trunc-only" in sys.argv:
+        return
+    fd = os.open("k/prealloc.bin", os.O_CREAT | os.O_WRONLY)
+    os.posix_fallocate(fd, 0, 1 << 20)
+    os.pwrite(fd, pat(3000, 5000), 300000)
+    os.close(fd)
+
+    with open("k/holey.bin", "wb") as f:
+        f.write(pat(3001, 1 << 20))
+    fd = os.open("k/holey.bin", os.O_WRONLY)
+    libc = ctypes.CDLL(None, use_errno=True)
+    libc.fallocate(fd, PUNCH_HOLE | KEEP_SIZE, ctypes.c_long(100000), ctypes.c_long(300000))
+    os.close(fd)
+
+    os.mkdir("k/d")
+    for i in range(300):
+        with open("k/d/f%d" % i, "wb") as f:
+            f.write(b"x" * i)
+    for i in range(0, 300, 3):
+        os.unlink("k/d/f%d" % i)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/crates/exav-unpack/tests/fixtures/fs/fat12.img.gz b/crates/exav-unpack/tests/fixtures/fs/fat12.img.gz
new file mode 100644
index 00000000..644dc963
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/fat12.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/fat16.img.gz b/crates/exav-unpack/tests/fixtures/fs/fat16.img.gz
new file mode 100644
index 00000000..5bc70706
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/fat16.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/fat16_kernel.img.gz b/crates/exav-unpack/tests/fixtures/fs/fat16_kernel.img.gz
new file mode 100644
index 00000000..d824eff4
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/fat16_kernel.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/fat32.img.gz b/crates/exav-unpack/tests/fixtures/fs/fat32.img.gz
new file mode 100644
index 00000000..097adc28
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/fat32.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/lzo_text_1.bin b/crates/exav-unpack/tests/fixtures/fs/lzo_text_1.bin
new file mode 100644
index 00000000..252cb31b
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/lzo_text_1.bin differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/lzo_text_9.bin b/crates/exav-unpack/tests/fixtures/fs/lzo_text_9.bin
new file mode 100644
index 00000000..6b4215a1
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/lzo_text_9.bin differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/make.sh b/crates/exav-unpack/tests/fixtures/fs/make.sh
new file mode 100644
index 00000000..e156f4d2
--- /dev/null
+++ b/crates/exav-unpack/tests/fixtures/fs/make.sh
@@ -0,0 +1,178 @@
+#!/bin/bash
+# Build the filesystem images of this directory.
+#
+#     bash make.sh [ext] [fat] [exfat] [squashfs] [cramfs] [romfs] [erofs]
+#
+# Each image holds the tree of tree.py (the suites compare a walk with it), and
+# is kept gzipped, a filesystem being mostly empty space. The tools are
+# e2fsprogs, mtools, exfatprogs, squashfs-tools, erofs-utils, genromfs and
+# util-linux's mkfs.cramfs, and `sudo` for the images a kernel writes (a loop
+# mount): those are marked.
+set -euo pipefail
+DIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$DIR"
+WORK="$(mktemp -d)"
+trap 'sudo umount "$WORK/mnt" 2>/dev/null || true; rm -rf "$WORK"' EXIT
+
+tree() { python3 "$DIR/tree.py" "$1" "${@:2}"; }
+keep() { gzip -9 -n -c "$1" > "$2.img.gz"; }
+
+# A volume a kernel wrote: pads written and every other one deleted, so the
+# files that follow land in the holes, then the tree and extras.py's files.
+# $1 name, $2 mkfs command (IMG stands for the image), $3 size in MiB, $4 mount
+# options, $5 pad size.
+kernel() {
+    local img="$WORK/$1.img"
+    truncate -s "$3M" "$img"
+    eval "${2//IMG/$img}"
+    mkdir -p "$WORK/mnt"
+    sudo mount -o "loop,$4" "$img" "$WORK/mnt"
+    sudo chown "$(id -u)" "$WORK/mnt" 2>/dev/null || true
+    (
+        cd "$WORK/mnt"
+        mkdir pad
+        for i in $(seq 0 99); do head -c "$5" /dev/zero | tr '\0' p > "pad/$i"; done
+        for i in $(seq 0 2 99); do rm "pad/$i"; done
+        tree .
+        # A filesystem without holes or preallocation has no use for most of
+        # these (plain), or only for the file longer than it was written (trunc).
+        case "${6:-}" in
+            plain) ;;
+            trunc) python3 "$DIR/extras.py" --trunc-only ;;
+            *) python3 "$DIR/extras.py" ;;
+        esac
+        rm -rf pad
+    )
+    sync
+    sudo umount "$WORK/mnt"
+    keep "$img" "$1"
+}
+
+# A volume made from a directory. $1 name, $2 mkfs command (IMG, TREE), $3 size.
+from_tree() {
+    local img="$WORK/$1.img"
+    rm -rf "$WORK/tree"
+    tree "$WORK/tree" --sparse
+    truncate -s "$3M" "$img"
+    eval "$(echo "$2" | sed "s|IMG|$img|; s|TREE|$WORK/tree|")"
+    keep "$img" "$1"
+}
+
+ext() {
+    local mk="mke2fs -q -F -E root_owner=0:0 -d TREE"
+    from_tree ext4 "$mk -t ext4 -b 4096 IMG" 8
+    from_tree ext2_blockmap "$mk -t ext2 -b 1024 IMG" 8
+    from_tree ext3 "$mk -t ext3 -b 2048 IMG" 8
+    from_tree ext4_inline "$mk -t ext4 -b 1024 -O inline_data,^has_journal IMG" 8
+    from_tree ext4_metabg "$mk -t ext4 -b 1024 -g 1024 -i 65536 -O meta_bg,^resize_inode,64bit IMG" 24
+    from_tree ext4_bigalloc "$mk -t ext4 -b 1024 -O bigalloc -C 8192 IMG" 8
+    # Written by a kernel (sudo).
+    kernel ext4_kernel "mkfs.ext4 -q -F -b 1024 IMG" 8 "" 8192
+}
+
+# A FAT volume made with mtools. $1 name, $2 mkfs.vfat options, $3 size in
+# KiB. Pads are written and every other one deleted first, so the files that
+# follow land in the holes: a fragmented file has more than one run.
+mtools_fat() {
+    local img="$WORK/$1.img"
+    rm -rf "$WORK/tree"
+    tree "$WORK/tree"
+    truncate -s "${3}K" "$img"
+    mkfs.vfat -n TESTVOL $2 "$img" > /dev/null
+    mkdir "$WORK/pad"
+    for i in $(seq 0 99); do head -c 3000 /dev/zero | tr '\0' p > "$WORK/pad/$i"; done
+    mcopy -i "$img" "$WORK"/pad/* ::/
+    for i in $(seq 0 2 99); do mdel -i "$img" "::/$i"; done
+    mcopy -s -i "$img" "$WORK"/tree/* ::/
+    for i in $(seq 1 2 99); do mdel -i "$img" "::/$i"; done
+    rm -rf "$WORK/pad"
+    keep "$img" "$1"
+}
+
+fat() {
+    mtools_fat fat12 "-F 12" 1440
+    mtools_fat fat16 "-F 16" 16384
+    mtools_fat fat32 "-F 32 -s 2" 40960
+    # Written by a kernel (sudo), which keeps the case of a short name in two
+    # flags of its entry instead of a long name.
+    kernel fat16_kernel "mkfs.vfat -F 16 IMG" 16 "shortname=winnt,uid=$(id -u)" 3000 plain
+}
+
+squashfs() {
+    rm -rf "$WORK/tree"
+    tree "$WORK/tree" --sparse
+    # A link holds no file's bytes.
+    ln -s tiny.txt "$WORK/tree/link"
+    local c
+    for c in gzip xz lzo lz4 zstd lzma; do
+        mksquashfs "$WORK/tree" "$WORK/$c.sqsh" -comp "$c" -noappend -quiet > /dev/null
+        keep "$WORK/$c.sqsh" "squashfs_$c"
+    done
+    mksquashfs "$WORK/tree" "$WORK/small.sqsh" -b 4096 -noappend -quiet > /dev/null
+    keep "$WORK/small.sqsh" squashfs_small_blocks
+    mksquashfs "$WORK/tree" "$WORK/plain.sqsh" -no-compression -no-fragments -noappend -quiet > /dev/null
+    keep "$WORK/plain.sqsh" squashfs_uncompressed
+}
+
+# cramfs needs `mkcramfs` (MKCRAMFS names it: github.com/npitre/cramfs-tools,
+# which Linux distributions do not package any more) and `cramfsswap`.
+cramfs() {
+    local mk="${MKCRAMFS:-mkcramfs}"
+    rm -rf "$WORK/tree"
+    tree "$WORK/tree"
+    # Three blocks of nothing, which -z makes holes of, and a tail.
+    { head -c 12288 /dev/zero; printf end; } > "$WORK/tree/zeros.bin"
+    "$mk" "$WORK/tree" "$WORK/plain.cramfs" > /dev/null 2>&1
+    keep "$WORK/plain.cramfs" cramfs
+    "$mk" -p "$WORK/tree" "$WORK/padded.cramfs" > /dev/null 2>&1
+    keep "$WORK/padded.cramfs" cramfs_padded
+    "$mk" -z "$WORK/tree" "$WORK/holes.cramfs" > /dev/null 2>&1
+    keep "$WORK/holes.cramfs" cramfs_holes
+    "$mk" -x "$WORK/tree" "$WORK/ext.cramfs" > /dev/null 2>&1
+    keep "$WORK/ext.cramfs" cramfs_extended
+    cramfsswap "$WORK/plain.cramfs" "$WORK/be.cramfs" > /dev/null
+    keep "$WORK/be.cramfs" cramfs_big_endian
+}
+
+romfs() {
+    rm -rf "$WORK/tree"
+    tree "$WORK/tree"
+    # An executable, a hard link to it and a symbolic link, which holds no file.
+    chmod +x "$WORK/tree/tiny.txt"
+    ln "$WORK/tree/tiny.txt" "$WORK/tree/hard"
+    ln -s tiny.txt "$WORK/tree/link"
+    genromfs -f "$WORK/plain.romfs" -d "$WORK/tree" -V TEST > /dev/null
+    keep "$WORK/plain.romfs" romfs
+    genromfs -f "$WORK/aligned.romfs" -d "$WORK/tree" -a 512 > /dev/null
+    keep "$WORK/aligned.romfs" romfs_aligned
+}
+
+erofs() {
+    rm -rf "$WORK/tree"
+    tree "$WORK/tree"
+    # A link holds no file's bytes.
+    ln -s tiny.txt "$WORK/tree/link"
+    mkfs.erofs "$WORK/plain.erofs" "$WORK/tree" > /dev/null 2>&1
+    keep "$WORK/plain.erofs" erofs
+    mkfs.erofs -b 1024 "$WORK/small.erofs" "$WORK/tree" > /dev/null 2>&1
+    keep "$WORK/small.erofs" erofs_small_blocks
+    mkfs.erofs -E force-inode-compact "$WORK/compact.erofs" "$WORK/tree" > /dev/null 2>&1
+    keep "$WORK/compact.erofs" erofs_compact_inodes
+    # Compressed: the files are reported, the directories are read.
+    mkfs.erofs -zlz4hc "$WORK/lz4.erofs" "$WORK/tree" > /dev/null 2>&1
+    keep "$WORK/lz4.erofs" erofs_lz4
+    # Files in chunks, with holes.
+    tree "$WORK/tree" --sparse
+    mkfs.erofs --chunksize 4096 "$WORK/chunks.erofs" "$WORK/tree" > /dev/null 2>&1
+    keep "$WORK/chunks.erofs" erofs_chunks
+}
+
+exfat() {
+    # Written by a kernel (sudo); the sparse file does not fit.
+    kernel exfat "mkfs.exfat -c 4096 IMG" 16 "uid=$(id -u)" 30000 trunc
+    kernel exfat_small_clusters "mkfs.exfat -c 512 IMG" 16 "uid=$(id -u)" 30000 trunc
+}
+
+[ $# -eq 0 ] && set -- ext fat exfat squashfs cramfs romfs erofs
+for what in "$@"; do "$what"; done
+ls -l "$DIR"/*.img.gz
diff --git a/crates/exav-unpack/tests/fixtures/fs/romfs.img.gz b/crates/exav-unpack/tests/fixtures/fs/romfs.img.gz
new file mode 100644
index 00000000..8ab06722
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/romfs.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/romfs_aligned.img.gz b/crates/exav-unpack/tests/fixtures/fs/romfs_aligned.img.gz
new file mode 100644
index 00000000..be478876
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/romfs_aligned.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_gzip.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_gzip.img.gz
new file mode 100644
index 00000000..f541bb4f
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_gzip.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_lz4.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_lz4.img.gz
new file mode 100644
index 00000000..21fd9a6a
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_lz4.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_lzma.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_lzma.img.gz
new file mode 100644
index 00000000..9a62e1d1
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_lzma.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_lzo.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_lzo.img.gz
new file mode 100644
index 00000000..f3558b1d
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_lzo.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_small_blocks.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_small_blocks.img.gz
new file mode 100644
index 00000000..1ecf6da9
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_small_blocks.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_uncompressed.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_uncompressed.img.gz
new file mode 100644
index 00000000..41a002bd
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_uncompressed.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_xz.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_xz.img.gz
new file mode 100644
index 00000000..6bfefeec
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_xz.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/squashfs_zstd.img.gz b/crates/exav-unpack/tests/fixtures/fs/squashfs_zstd.img.gz
new file mode 100644
index 00000000..a77b2b48
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/fs/squashfs_zstd.img.gz differ
diff --git a/crates/exav-unpack/tests/fixtures/fs/tree.py b/crates/exav-unpack/tests/fixtures/fs/tree.py
new file mode 100644
index 00000000..68a4305f
--- /dev/null
+++ b/crates/exav-unpack/tests/fixtures/fs/tree.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+"""Write the one tree of files every filesystem fixture holds.
+
+    tree.py DIR [--sparse]
+
+The same bytes are generated by `pat` in `tests/suites/fs_tree.rs`, which is
+what the filesystem suites compare a walk against. --sparse adds a file with
+data at its start, in its middle and at its end, and holes between.
+"""
+import os
+import sys
+
+TEXT = b"abcdefghij0123456789"
+
+# (path, size). The seed of a file's bytes is its position in this list.
+FILES = [
+    ("empty", 0),
+    ("tiny.txt", 10),
+    ("sixty.bin", 60),
+    ("sixtyone.bin", 61),
+    ("p1.bin", 1025),
+    ("big4k.bin", 4096),
+    ("a/b/c/deep.bin", 5000),
+    ("café 日本.txt", 300),
+    ("long name with spaces and a long extension.markdown", 700),
+    ("frag.bin", 100000),
+]
+MANY = 300
+SPARSE_AT = (0, 30 << 20, 70 << 20)
+SPARSE_LEN = (3000, 7000, 4)
+
+
+def pat(seed, n):
+    out = bytearray(n)
+    for i in range(n):
+        if (i // 64) % 2 == 0:
+            out[i] = ((((i * 2654435761) + seed * 40503) & 0xFFFFFFFF) >> 13) & 0xFF
+        else:
+            out[i] = TEXT[(i + seed) % 20]
+    return bytes(out)
+
+
+def write(root, path, data):
+    p = os.path.join(root, path)
+    os.makedirs(os.path.dirname(p), exist_ok=True)
+    with open(p, "wb") as f:
+        f.write(data)
+
+
+def main():
+    root = sys.argv[1]
+    for seed, (path, size) in enumerate(FILES):
+        write(root, path, pat(seed, size))
+    for i in range(MANY):
+        write(root, "many/file_%03d.dat" % i, pat(1000 + i, i % 97))
+    os.makedirs(os.path.join(root, "emptydir"), exist_ok=True)
+    if "--sparse" in sys.argv:
+        with open(os.path.join(root, "sparse.bin"), "wb") as f:
+            for k, (at, n) in enumerate(zip(SPARSE_AT, SPARSE_LEN)):
+                f.seek(at)
+                f.write(pat(2000 + k, n))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/crates/exav-unpack/tests/fixtures/lzma_simple.lzma b/crates/exav-unpack/tests/fixtures/lzma_simple.lzma
new file mode 100644
index 00000000..dba8ba8d
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/lzma_simple.lzma differ
diff --git a/crates/exav-unpack/tests/fixtures/lzma_sized.lzma b/crates/exav-unpack/tests/fixtures/lzma_sized.lzma
new file mode 100644
index 00000000..86967e52
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/lzma_sized.lzma differ
diff --git a/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar4.rar b/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar4.rar
deleted file mode 100644
index 10fd3f12..00000000
Binary files a/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar4.rar and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar4.rar.xor b/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar4.rar.xor
new file mode 100644
index 00000000..c77f59e7
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar4.rar.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar5.rar b/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar5.rar
deleted file mode 100644
index b1250ee2..00000000
Binary files a/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar5.rar and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar5.rar.xor b/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar5.rar.xor
new file mode 100644
index 00000000..f665f005
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/rar_solid/solid_rar5.rar.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/rar_solid/vol_rar4.part03.rar b/crates/exav-unpack/tests/fixtures/rar_solid/vol_rar4.part03.rar
deleted file mode 100644
index 63c3e6c1..00000000
Binary files a/crates/exav-unpack/tests/fixtures/rar_solid/vol_rar4.part03.rar and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/rar_solid/vol_rar4.part03.rar.xor b/crates/exav-unpack/tests/fixtures/rar_solid/vol_rar4.part03.rar.xor
new file mode 100644
index 00000000..04ccca53
--- /dev/null
+++ b/crates/exav-unpack/tests/fixtures/rar_solid/vol_rar4.part03.rar.xor
@@ -0,0 +1 @@
+;({@]ZC )KZWZZZZZZZg;.z�tZZZZZZZYf�2�&�GiSZ��ZZ?39;(t957Z�#[Q���Ob�VM���>TR�t�pt}-!�1�740`u3��%�sd�㔭�86��g�cQ��^E�jv�����`!TNZ��~PXZZZZZZZZ
\ No newline at end of file
diff --git a/crates/exav-unpack/tests/fixtures/rpm/hello.rpm b/crates/exav-unpack/tests/fixtures/rpm/hello.rpm
new file mode 100644
index 00000000..bc72dedc
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/rpm/hello.rpm differ
diff --git a/crates/exav-unpack/tests/fixtures/rpm/make.py b/crates/exav-unpack/tests/fixtures/rpm/make.py
new file mode 100644
index 00000000..24ea63cc
--- /dev/null
+++ b/crates/exav-unpack/tests/fixtures/rpm/make.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+"""Builds the RPM fixtures (rpmbuild is not needed): python3 make.py
+
+hello.rpm: a package with install scripts and a gzip cpio payload.
+eicar.rpm: the EICAR test string in the payload, which the compression hides
+(mask it with XOR 0x5A as the README of this directory's parent says, and
+copy it to crates/exav-core/tests/fixtures/eicar.rpm.xor).
+"""
+import gzip
+import struct
+import sys
+
+STRING, BIN, STRING_ARRAY = 6, 7, 8
+EICAR = b"X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR-" + b"STANDARD-ANTIVIRUS-TEST-FILE!$H+H*\n"
+
+
+def header(entries):
+    """entries: (tag, type, count, bytes). The index and data of a header structure."""
+    data = b""
+    index = b""
+    for tag, kind, count, blob in sorted(entries):
+        index += struct.pack(">IIII", tag, kind, len(data), count)
+        data += blob
+    return b"\x8e\xad\xe8\x01" + bytes(4) + struct.pack(">II", len(entries), len(data)) + index + data
+
+
+def cpio(files):
+    out = b""
+    for ino, (name, content) in enumerate(files, 1):
+        name = name.encode() + b"\0"
+        out += b"070701" + b"".join(
+            b"%08X" % v for v in (ino, 0o100644, 0, 0, 1, 0, len(content), 0, 0, 0, 0, len(name), 0)
+        )
+        out += name + bytes(-(110 + len(name)) % 4) + content + bytes(-len(content) % 4)
+    trailer = b"TRAILER!!!\0"
+    out += b"070701" + b"".join(b"%08X" % v for v in (0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, len(trailer), 0))
+    return out + trailer + bytes(-(110 + len(trailer)) % 4)
+
+
+def rpm(files, scripts):
+    payload = gzip.compress(cpio(files), mtime=0)
+    main = [
+        (1000, STRING, 1, b"hello\0"),
+        (1124, STRING, 1, b"cpio\0"),
+        (1125, STRING, 1, b"gzip\0"),
+    ] + scripts
+    sig = header([(1000, BIN, 4, bytes(4))])
+    sig += bytes(-len(sig) % 8)
+    lead = b"\xed\xab\xee\xdb" + bytes([3, 0]) + struct.pack(">HH", 0, 1) + b"hello".ljust(66, b"\0")
+    lead += struct.pack(">HH", 1, 5) + bytes(16)
+    assert len(lead) == 96
+    return lead + sig + header(main) + payload
+
+
+hello = rpm(
+    [("./usr/share/hello/hello.txt", b"hello from an rpm\n")],
+    [
+        (1023, STRING, 1, b"echo prein\0"),
+        (1024, STRING, 1, b"#!/bin/sh\necho postin\n\0"),
+        (1065, STRING_ARRAY, 2, b"echo first trigger\0echo second trigger\0"),
+    ],
+)
+open("hello.rpm", "wb").write(hello)
+open("eicar.rpm", "wb").write(rpm([("./usr/share/hello/eicar.com", EICAR)], []))
+print(len(hello), file=sys.stderr)
diff --git a/crates/exav-unpack/tests/fixtures/xz/cut_where_xz_has_written_the_payload.xz.xor b/crates/exav-unpack/tests/fixtures/xz/cut_where_xz_has_written_the_payload.xz.xor
new file mode 100644
index 00000000..ba601dfa
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz/cut_where_xz_has_written_the_payload.xz.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/crc32.xz b/crates/exav-unpack/tests/fixtures/xz_checks/crc32.xz
new file mode 100644
index 00000000..f43e96ab
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/crc32.xz differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/make.py b/crates/exav-unpack/tests/fixtures/xz_checks/make.py
new file mode 100644
index 00000000..27fe67d9
--- /dev/null
+++ b/crates/exav-unpack/tests/fixtures/xz_checks/make.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+"""Builds the xz fixtures with a check type the decoder does not read.
+
+    python3 make.py        # needs the xz command
+
+plain.bin           the data every stream below decodes to (random bytes, so that
+                    LZMA2 stores chunks, then text)
+crc32.xz            xz --check=crc32, three blocks (a check the decoder reads)
+sha256.xz           xz --check=sha256, three blocks
+reserved_*.xz       the same streams with a reserved check type (2, 9, 12, 15),
+                    rebuilt from a CRC32 stream: the check bytes are filled
+                    with 0xA5 and the index and the stream flags are rewritten
+                    (liblzma decodes these without verifying them)
+"""
+import random
+import struct
+import subprocess
+import zlib
+
+rng = random.Random(7)
+plain = bytes(rng.randrange(256) for _ in range(6000)) + b"the quick brown fox jumps over the lazy dog\n" * 140
+open("plain.bin", "wb").write(plain)
+
+
+def xz(check):
+    return subprocess.run(
+        ["xz", "-c", "-T1", f"--check={check}", "--block-size=4000", "-1"],
+        input=plain,
+        capture_output=True,
+        check=True,
+    ).stdout
+
+
+def vli(n):
+    out = b""
+    while n >= 0x80:
+        out += bytes([n & 0x7F | 0x80])
+        n >>= 7
+    return out + bytes([n])
+
+
+def read_vli(b, at):
+    v, shift = 0, 0
+    while True:
+        byte = b[at]
+        at += 1
+        v |= (byte & 0x7F) << shift
+        shift += 7
+        if not byte & 0x80:
+            return v, at
+
+
+def reserved(check_id):
+    """The CRC32 stream with check type `check_id` instead."""
+    old = 4  # CRC32
+    new = 4 << ((check_id - 1) // 3)
+    d = xz("crc32")
+    backward = struct.unpack("<I", d[-8:-4])[0]
+    index_size = (backward + 1) * 4
+    index_at = len(d) - 12 - index_size
+    index = d[index_at : len(d) - 12]
+    count, at = read_vli(index, 1)
+    records = []
+    for _ in range(count):
+        unpadded, at = read_vli(index, at)
+        uncompressed, at = read_vli(index, at)
+        records.append((unpadded, uncompressed))
+    out = d[:6] + bytes([0, check_id]) + struct.pack("<I", zlib.crc32(bytes([0, check_id])))
+    pos = 12
+    for unpadded, _ in records:
+        block = unpadded - old
+        out += d[pos : pos + block]
+        out += bytes(-block % 4)
+        out += bytes([0xA5]) * new
+        pos += (block + 3) // 4 * 4 + old
+    body = b"\0" + vli(count)
+    for unpadded, uncompressed in records:
+        body += vli(unpadded - old + new) + vli(uncompressed)
+    body += bytes(-len(body) % 4)
+    body += struct.pack("<I", zlib.crc32(body))
+    tail = struct.pack("<I", len(body) // 4 - 1) + bytes([0, check_id])
+    return out + body + struct.pack("<I", zlib.crc32(tail)) + tail + b"YZ"
+
+
+open("crc32.xz", "wb").write(xz("crc32"))
+open("sha256.xz", "wb").write(xz("sha256"))
+for i in (2, 9, 12, 15):
+    open(f"reserved_{i}.xz", "wb").write(reserved(i))
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/plain.bin b/crates/exav-unpack/tests/fixtures/xz_checks/plain.bin
new file mode 100644
index 00000000..67079262
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/plain.bin differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/reserved_12.xz b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_12.xz
new file mode 100644
index 00000000..40309d96
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_12.xz differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/reserved_15.xz b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_15.xz
new file mode 100644
index 00000000..d600450e
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_15.xz differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/reserved_2.xz b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_2.xz
new file mode 100644
index 00000000..b7d7dd4c
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_2.xz differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/reserved_9.xz b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_9.xz
new file mode 100644
index 00000000..39512f98
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/reserved_9.xz differ
diff --git a/crates/exav-unpack/tests/fixtures/xz_checks/sha256.xz b/crates/exav-unpack/tests/fixtures/xz_checks/sha256.xz
new file mode 100644
index 00000000..4b3e0a54
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/xz_checks/sha256.xz differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_bzip2_large_then_small.zip b/crates/exav-unpack/tests/fixtures/zip/7z_bzip2_large_then_small.zip
deleted file mode 100644
index 1fe0b495..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/7z_bzip2_large_then_small.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_bzip2_large_then_small.zip.xor b/crates/exav-unpack/tests/fixtures/zip/7z_bzip2_large_then_small.zip.xor
new file mode 100644
index 00000000..9d07711a
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/7z_bzip2_large_then_small.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_deflate64_large_then_small.zip b/crates/exav-unpack/tests/fixtures/zip/7z_deflate64_large_then_small.zip
deleted file mode 100644
index 20e59666..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/7z_deflate64_large_then_small.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_deflate64_large_then_small.zip.xor b/crates/exav-unpack/tests/fixtures/zip/7z_deflate64_large_then_small.zip.xor
new file mode 100644
index 00000000..bd7dc089
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/7z_deflate64_large_then_small.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_lzma_large_then_small.zip b/crates/exav-unpack/tests/fixtures/zip/7z_lzma_large_then_small.zip
deleted file mode 100644
index b33412e7..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/7z_lzma_large_then_small.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_lzma_large_then_small.zip.xor b/crates/exav-unpack/tests/fixtures/zip/7z_lzma_large_then_small.zip.xor
new file mode 100644
index 00000000..58462ad1
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/7z_lzma_large_then_small.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_ppmd_large_then_small.zip b/crates/exav-unpack/tests/fixtures/zip/7z_ppmd_large_then_small.zip
deleted file mode 100644
index 2510a474..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/7z_ppmd_large_then_small.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/7z_ppmd_large_then_small.zip.xor b/crates/exav-unpack/tests/fixtures/zip/7z_ppmd_large_then_small.zip.xor
new file mode 100644
index 00000000..2fbb8d48
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/7z_ppmd_large_then_small.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_bzip2.zip b/crates/exav-unpack/tests/fixtures/zip/eicar_bzip2.zip
deleted file mode 100644
index 0195fc00..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/eicar_bzip2.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_bzip2.zip.xor b/crates/exav-unpack/tests/fixtures/zip/eicar_bzip2.zip.xor
new file mode 100644
index 00000000..4772a2dd
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/eicar_bzip2.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_deflate64.zip b/crates/exav-unpack/tests/fixtures/zip/eicar_deflate64.zip
deleted file mode 100644
index 0241c030..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/eicar_deflate64.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_deflate64.zip.xor b/crates/exav-unpack/tests/fixtures/zip/eicar_deflate64.zip.xor
new file mode 100644
index 00000000..4a8af8ac
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/eicar_deflate64.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_infected.zip b/crates/exav-unpack/tests/fixtures/zip/eicar_infected.zip
deleted file mode 100644
index 959490ae..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/eicar_infected.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_infected.zip.xor b/crates/exav-unpack/tests/fixtures/zip/eicar_infected.zip.xor
new file mode 100644
index 00000000..369a618f
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/eicar_infected.zip.xor differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_lzma.zip b/crates/exav-unpack/tests/fixtures/zip/eicar_lzma.zip
deleted file mode 100644
index 54985802..00000000
Binary files a/crates/exav-unpack/tests/fixtures/zip/eicar_lzma.zip and /dev/null differ
diff --git a/crates/exav-unpack/tests/fixtures/zip/eicar_lzma.zip.xor b/crates/exav-unpack/tests/fixtures/zip/eicar_lzma.zip.xor
new file mode 100644
index 00000000..56e17b9d
Binary files /dev/null and b/crates/exav-unpack/tests/fixtures/zip/eicar_lzma.zip.xor differ
diff --git a/crates/exav-unpack/tests/oracle/build.sh b/crates/exav-unpack/tests/oracle/build.sh
new file mode 100755
index 00000000..8d462d86
--- /dev/null
+++ b/crates/exav-unpack/tests/oracle/build.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# Builds the differential oracles the ignored tests of formats/lzfse.rs and
+# formats/dcl_explode.rs compare the in-tree decoders against, from the
+# reference sources, which are fetched and not kept in this repository:
+#
+#   tests/oracle/build.sh DIR     # DIR is created; prints the variables to set
+#
+# Then:
+#   EXAV_LZFSE_ORACLE=DIR/lzfse_oracle EXAV_DCL_ORACLE=DIR/dcl_oracle \
+#     cargo test -p exav-unpack --lib -- --ignored oracle
+#
+# The oracles are built with AddressSanitizer and UndefinedBehaviorSanitizer,
+# so a damaged stream the reference itself mishandles is reported by the run.
+#
+# References: Apple's lzfse (BSD-3-Clause) and zlib's contrib/blast (zlib
+# licence). They are only compiled here, never copied into the tree.
+set -euo pipefail
+
+HERE="$(cd "$(dirname "$0")" && pwd)"
+OUT="${1:?usage: build.sh DIR}"
+LZFSE_REV="${LZFSE_REV:-e634ca58b4821d9f3d560cdc6df5dec02ffc93fd}"
+ZLIB_TAG="${ZLIB_TAG:-v1.3.1}"
+
+mkdir -p "$OUT"
+cd "$OUT"
+
+if [ ! -d lzfse-src ]; then
+  git init -q lzfse-src
+  git -C lzfse-src fetch -q --depth 1 https://github.com/lzfse/lzfse "$LZFSE_REV"
+  git -C lzfse-src checkout -q FETCH_HEAD
+fi
+for f in blast.c blast.h; do
+  [ -f "$f" ] || curl -fsSL "https://raw.githubusercontent.com/madler/zlib/$ZLIB_TAG/contrib/blast/$f" -o "$f"
+done
+
+CC="${CC:-cc}"
+# The reference loads unaligned words on purpose, adds to a header's bit count
+# where only the range check after it matters, and blast.c forms a pointer
+# before its window (`to - dist`) that it moves back inside before the read,
+# which the object-size check reports although AddressSanitizer sees every
+# access in bounds.
+SAN="-fsanitize=address,undefined -fno-sanitize=alignment,signed-integer-overflow,object-size -fwrapv -fno-sanitize-recover=undefined -g -O1"
+S=lzfse-src/src
+# shellcheck disable=SC2086
+$CC $SAN -I"$S" "$HERE/lzfse_oracle.c" \
+  "$S/lzfse_decode.c" "$S/lzfse_decode_base.c" "$S/lzfse_fse.c" "$S/lzvn_decode_base.c" \
+  -o lzfse_oracle
+# shellcheck disable=SC2086
+$CC $SAN -I. "$HERE/dcl_oracle.c" blast.c -o dcl_oracle
+
+echo "EXAV_LZFSE_ORACLE=$PWD/lzfse_oracle"
+echo "EXAV_DCL_ORACLE=$PWD/dcl_oracle"
diff --git a/crates/exav-unpack/tests/oracle/dcl_oracle.c b/crates/exav-unpack/tests/oracle/dcl_oracle.c
new file mode 100644
index 00000000..9fee6503
--- /dev/null
+++ b/crates/exav-unpack/tests/oracle/dcl_oracle.c
@@ -0,0 +1,69 @@
+/* Differential oracle for formats/dcl_explode.rs: blast.c from zlib's
+ * contrib/blast (Mark Adler, zlib licence), which decodes the PKWARE Data
+ * Compression Library format.
+ *
+ * Build and run: see build.sh. Input on stdin, a sequence of records:
+ *   u32 cap, u32 src_len, src bytes             (little endian)
+ * Output on stdout, one record per input record:
+ *   u8 status, u32 out_len, out bytes
+ * status: 0 ok, 1 output past the cap, 2 source truncated, 3 invalid.
+ * At most cap bytes of output are reported.
+ */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "blast.h"
+
+struct in_state {
+  unsigned char *p;
+  unsigned n;
+};
+
+static unsigned feed(void *how, unsigned char **buf) {
+  struct in_state *s = how;
+  unsigned n = s->n;
+  *buf = s->p;
+  s->p += n;
+  s->n = 0;
+  return n;
+}
+
+struct out_state {
+  unsigned char *p;
+  size_t cap, len;
+};
+
+static int sink(void *how, unsigned char *buf, unsigned len) {
+  struct out_state *o = how;
+  size_t room = o->cap - o->len;
+  size_t take = len < room ? len : room;
+  memcpy(o->p + o->len, buf, take);
+  o->len += take;
+  return take < len;
+}
+
+static int read_exact(void *p, size_t n) { return fread(p, 1, n, stdin) == n; }
+
+int main(void) {
+  uint32_t head[2];
+  while (read_exact(head, sizeof head)) {
+    size_t cap = head[0], src_len = head[1];
+    unsigned char *src = malloc(src_len ? src_len : 1);
+    unsigned char *dst = malloc(cap ? cap : 1);
+    if (!read_exact(src, src_len)) return 2;
+    struct in_state in = {src, (unsigned)src_len};
+    struct out_state out = {dst, cap, 0};
+    int r = blast(feed, &in, sink, &out, NULL, NULL);
+    uint8_t code = r == 0 ? 0 : r == 1 ? 1 : r == 2 ? 2 : 3;
+    uint32_t n = (uint32_t)out.len;
+    fwrite(&code, 1, 1, stdout);
+    fwrite(&n, 4, 1, stdout);
+    fwrite(dst, 1, n, stdout);
+    free(src);
+    free(dst);
+  }
+  fflush(stdout);
+  return 0;
+}
diff --git a/crates/exav-unpack/tests/oracle/lzfse_oracle.c b/crates/exav-unpack/tests/oracle/lzfse_oracle.c
new file mode 100644
index 00000000..55e479c4
--- /dev/null
+++ b/crates/exav-unpack/tests/oracle/lzfse_oracle.c
@@ -0,0 +1,55 @@
+/* Differential oracle for formats/lzfse.rs: Apple's reference LZFSE decoder
+ * (BSD-3-Clause, github.com/lzfse/lzfse), driven through its internal state
+ * API so that the bytes written before a failure are reported too.
+ *
+ * Build and run: see build.sh. Optional argument: the destination fill byte.
+ * Input on stdin, a sequence of records:
+ *   u32 dst_size, u32 src_len, src bytes        (little endian)
+ * Output on stdout, one record per input record:
+ *   u8 status, u32 out_len, out bytes
+ * status: 0 ok, 1 destination full, 2 source truncated, 3 error.
+ */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lzfse_internal.h"
+
+static int read_exact(void *p, size_t n) { return fread(p, 1, n, stdin) == n; }
+
+int main(int argc, char **argv) {
+  /* The byte the destination is filled with first. The reference does not
+   * clear it, and a stream may make it copy from bytes it never wrote: two runs
+   * with different fills tell such a stream by its different output. */
+  int fill = argc > 1 ? atoi(argv[1]) : 0;
+  lzfse_decoder_state *s = malloc(sizeof(*s));
+  uint32_t head[2];
+  while (read_exact(head, sizeof head)) {
+    size_t dst_size = head[0], src_len = head[1];
+    /* Exact-size heap blocks, so a read or write past either is an ASan error. */
+    uint8_t *src = malloc(src_len ? src_len : 1);
+    uint8_t *dst = malloc(dst_size ? dst_size : 1);
+    if (!read_exact(src, src_len)) return 2;
+    memset(dst, fill, dst_size);
+    memset(s, 0, sizeof(*s));
+    s->src = s->src_begin = src;
+    s->src_end = src + src_len;
+    s->dst = s->dst_begin = dst;
+    s->dst_end = dst + dst_size;
+    int st = lzfse_decode(s);
+    uint8_t code = st == LZFSE_STATUS_OK         ? 0
+                   : st == LZFSE_STATUS_DST_FULL ? 1
+                   : st == LZFSE_STATUS_SRC_EMPTY ? 2
+                                                  : 3;
+    uint32_t n = (uint32_t)(s->dst - dst);
+    fwrite(&code, 1, 1, stdout);
+    fwrite(&n, 4, 1, stdout);
+    fwrite(dst, 1, n, stdout);
+    free(src);
+    free(dst);
+  }
+  fflush(stdout);
+  free(s);
+  return 0;
+}
diff --git a/crates/exav-unpack/tests/saturate.rs b/crates/exav-unpack/tests/saturate.rs
new file mode 100644
index 00000000..7701e571
--- /dev/null
+++ b/crates/exav-unpack/tests/saturate.rs
@@ -0,0 +1,334 @@
+//! Every container fixture, with each length or count in turn set to an
+//! extreme.
+//!
+//! A container's header says how big its parts are and how many there are, and
+//! the file that lies about it is the oldest trick against a reader: the size
+//! becomes an allocation before a byte of the data has been seen, a count
+//! becomes a loop, an offset a seek. Fuzzing finds these by chance, and an
+//! over-allocation is the kind it finds worst, because asking for the memory
+//! costs nothing until it is used. This sweep is the deterministic version:
+//! for each fixture, at each position of its start, a field of 4 bytes is
+//! overwritten with `0xFFFFFFFF`, with `0x7FFFFFFF`, and the walk is made. None
+//! may allocate more than a few times the file (the allocator counts what was
+//! asked for, whether or not it was used), take seconds, or panic where it
+//! should have said the file is damaged.
+//!
+//! The quick sweep runs with the suite; `EXAV_DEBUG_SATURATE=full` takes every
+//! position of the first kilobytes, with more values; `deep` takes every
+//! fourth position of the first 64 KB of the fixtures up to 256 KB, where the
+//! tables of the file systems and the directories of the archives are.
+//!
+//! A case that fails prints the fixture, the position and the value, which is
+//! the whole reproduction.
+
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::time::{Duration, Instant};
+
+use exav_unpack::{Budget, Limits, Member, detect, walk};
+
+struct Counting;
+
+static NOW: AtomicUsize = AtomicUsize::new(0);
+static PEAK: AtomicUsize = AtomicUsize::new(0);
+/// The largest single request this run has made.
+static BIGGEST: AtomicUsize = AtomicUsize::new(0);
+
+unsafe impl GlobalAlloc for Counting {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        let p = unsafe { System.alloc(layout) };
+        if !p.is_null() {
+            note(layout.size());
+        }
+        p
+    }
+
+    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+        let p = unsafe { System.alloc_zeroed(layout) };
+        if !p.is_null() {
+            note(layout.size());
+        }
+        p
+    }
+
+    unsafe fn dealloc(&self, p: *mut u8, layout: Layout) {
+        unsafe { System.dealloc(p, layout) };
+        NOW.fetch_sub(layout.size(), Ordering::Relaxed);
+    }
+
+    unsafe fn realloc(&self, p: *mut u8, layout: Layout, new: usize) -> *mut u8 {
+        let q = unsafe { System.realloc(p, layout, new) };
+        if !q.is_null() {
+            if new >= layout.size() {
+                note(new - layout.size());
+                BIGGEST.fetch_max(new, Ordering::Relaxed);
+            } else {
+                NOW.fetch_sub(layout.size() - new, Ordering::Relaxed);
+            }
+        }
+        q
+    }
+}
+
+/// Set to print where the request over [`ALLOC_BASE`] comes from.
+static TRACING: AtomicBool = AtomicBool::new(false);
+static IN_TRACE: AtomicBool = AtomicBool::new(false);
+
+fn note(size: usize) {
+    let now = NOW.fetch_add(size, Ordering::Relaxed) + size;
+    PEAK.fetch_max(now, Ordering::Relaxed);
+    BIGGEST.fetch_max(size, Ordering::Relaxed);
+    if size > REQUEST_MAX
+        && TRACING.load(Ordering::Relaxed)
+        && !IN_TRACE.swap(true, Ordering::Relaxed)
+    {
+        eprintln!(
+            "{} bytes asked for at:\n{}",
+            size,
+            std::backtrace::Backtrace::force_capture()
+        );
+        IN_TRACE.store(false, Ordering::Relaxed);
+    }
+}
+
+#[global_allocator]
+static ALLOCATOR: Counting = Counting;
+
+/// What a walk may hold, over the size of the file: a decoder's window and a
+/// member that really expands both need room, a header that only says so does
+/// not. Measured as what the process has resident at its peak, where the
+/// kernel counts memory a decoder asked for and never touched as nothing.
+const RESIDENT_BASE: usize = 96 << 20;
+const RESIDENT_PER_BYTE: usize = 256;
+/// What a walk may ask for in one request, touched or not: past what any limit
+/// of the extractor's allows, a request is a header's size taken at its word.
+const REQUEST_MAX: usize = 1 << 30;
+const SLOW: Duration = Duration::from_secs(4);
+
+fn fixtures(dir: &Path, out: &mut Vec<PathBuf>) {
+    let Ok(rd) = std::fs::read_dir(dir) else {
+        return;
+    };
+    let mut entries: Vec<_> = rd.flatten().map(|e| e.path()).collect();
+    entries.sort();
+    for p in entries {
+        if p.is_dir() {
+            fixtures(&p, out);
+        } else {
+            out.push(p);
+        }
+    }
+}
+
+/// The fixtures as `(name, bytes)`, masked ones unmasked, those too large to
+/// sweep and those no container reader takes left out.
+fn corpus() -> Vec<(String, Vec<u8>)> {
+    let root = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures");
+    let mut paths = vec![];
+    fixtures(&root, &mut paths);
+    let mut out = vec![];
+    for p in paths {
+        let name = p.strip_prefix(&root).unwrap().display().to_string();
+        let plain = name.strip_suffix(".xor").unwrap_or(&name).to_string();
+        if matches!(
+            plain.rsplit('.').next(),
+            Some("md" | "json" | "txt" | "py" | "sh" | "zip" | "gz")
+        ) {
+            continue;
+        }
+        let Ok(data) = exav_unpack::read_fixture(root.join(&plain).to_str().unwrap()) else {
+            continue;
+        };
+        let largest = if mode() == "deep" {
+            256 << 10
+        } else {
+            64 << 10
+        };
+        if data.len() <= largest && detect(&data).is_some() {
+            out.push((plain, data));
+        }
+    }
+    out.dedup_by(|a, b| a.0 == b.0);
+    out
+}
+
+/// `EXAV_DEBUG_SATURATE`: `full`, `deep`, or the quick sweep.
+fn mode() -> String {
+    std::env::var("EXAV_DEBUG_SATURATE").unwrap_or_default()
+}
+
+/// The positions to put a value at, and the values.
+fn sweep() -> (Vec<usize>, Vec<Vec<u8>>) {
+    if mode() == "deep" {
+        return (
+            (0..64 << 10).step_by(4).collect(),
+            vec![vec![0xFF; 4], vec![0xFF, 0xFF, 0xFF, 0x7F]],
+        );
+    }
+    if mode() == "full" {
+        let mut at: Vec<usize> = (0..256).collect();
+        at.extend((256..2048).step_by(2));
+        at.extend((2048..8192).step_by(8));
+        let values = vec![
+            vec![0xFF; 4],
+            vec![0xFF, 0xFF, 0xFF, 0x7F],
+            vec![0x00, 0x00, 0x00, 0x80],
+            vec![0x00, 0x00, 0x00, 0x10],
+            vec![0xFF; 2],
+            vec![0xFF; 8],
+        ];
+        (at, values)
+    } else {
+        let mut at: Vec<usize> = (0..64).collect();
+        at.extend((64..512).step_by(8));
+        (at, vec![vec![0xFF; 4], vec![0xFF, 0xFF, 0xFF, 0x7F]])
+    }
+}
+
+/// What came of one walk.
+struct Outcome {
+    resident: usize,
+    biggest: usize,
+    took: Duration,
+    panicked: Option<String>,
+}
+
+/// The resident-set high-water mark in bytes, from `/proc` (Linux only).
+fn high_water() -> usize {
+    std::fs::read_to_string("/proc/self/status")
+        .ok()
+        .and_then(|s| {
+            s.lines()
+                .find_map(|l| l.strip_prefix("VmHWM:"))
+                .and_then(|v| v.trim().trim_end_matches("kB").trim().parse::<usize>().ok())
+        })
+        .map_or(0, |kb| kb << 10)
+}
+
+/// Starts the high-water mark again from what is resident now.
+fn reset_high_water() {
+    let _ = std::fs::write("/proc/self/clear_refs", "5");
+}
+
+fn run(fmt: exav_unpack::Format, data: &[u8]) -> Outcome {
+    let before = NOW.load(Ordering::Relaxed);
+    PEAK.store(before, Ordering::Relaxed);
+    BIGGEST.store(0, Ordering::Relaxed);
+    reset_high_water();
+    let resident_before = high_water();
+    let started = Instant::now();
+    let mut budget = Budget::new(Limits::default());
+    let mut panicked = None;
+    let r = walk::<()>(fmt, &data, &mut budget, &mut |_, content, _| {
+        match content {
+            Some(Member::Bytes(b)) => drop(b),
+            Some(Member::Stream(r)) => {
+                let mut sink = [0u8; 8192];
+                while matches!(r.read(&mut sink), Ok(n) if n > 0) {}
+            }
+            None => {}
+        }
+        None
+    });
+    if let Err(hit) = r
+        && hit.reason.contains("panicked")
+    {
+        panicked = Some(hit.reason);
+    }
+    Outcome {
+        resident: high_water().saturating_sub(resident_before),
+        biggest: BIGGEST.load(Ordering::Relaxed),
+        took: started.elapsed(),
+        panicked,
+    }
+}
+
+/// `EXAV_DEBUG_SATURATE_CASE=<fixture>:<position>:<hex>` walks one case and
+/// prints where its large requests come from: the reproduction of a finding.
+#[test]
+fn one_case_traced() {
+    let Ok(case) = std::env::var("EXAV_DEBUG_SATURATE_CASE") else {
+        return;
+    };
+    let mut parts = case.rsplitn(3, ':');
+    let hex = parts.next().unwrap();
+    let at: usize = parts.next().unwrap().parse().unwrap();
+    let name = parts.next().unwrap();
+    let value: Vec<u8> = (0..hex.len() / 2)
+        .map(|i| u8::from_str_radix(&hex[2 * i..2 * i + 2], 16).unwrap())
+        .collect();
+    let (_, data) = corpus().into_iter().find(|(n, _)| n == name).unwrap();
+    let mut mutated = data.clone();
+    mutated[at..at + value.len()].copy_from_slice(&value);
+    TRACING.store(true, Ordering::Relaxed);
+    let o = run(detect(&mutated).unwrap(), &mutated);
+    TRACING.store(false, Ordering::Relaxed);
+    eprintln!("held {} MiB in {:?}", o.resident >> 20, o.took);
+}
+
+#[test]
+fn a_field_at_its_extreme_costs_nothing_like_what_it_says() {
+    let corpus = corpus();
+    assert!(corpus.len() > 50, "only {} fixtures", corpus.len());
+    let (positions, values) = sweep();
+    let mut findings: Vec<String> = vec![];
+    let mut runs = 0u64;
+    for (name, data) in &corpus {
+        let fmt = detect(data).unwrap();
+        let allowed = RESIDENT_BASE + RESIDENT_PER_BYTE * data.len();
+        // One finding per fixture and field: the same field set to the other
+        // value is the same bug.
+        let mut seen: Vec<usize> = vec![];
+        for &at in &positions {
+            if seen.contains(&at) {
+                continue;
+            }
+            for value in &values {
+                if at + value.len() > data.len() {
+                    continue;
+                }
+                let mut mutated = data.clone();
+                mutated[at..at + value.len()].copy_from_slice(value);
+                // A mutation that turns the container into another kind is
+                // another test: this one is about the format's own fields.
+                if detect(&mutated) != Some(fmt) {
+                    continue;
+                }
+                runs += 1;
+                let o = run(fmt, &mutated);
+                let hex: String = value.iter().map(|b| format!("{b:02x}")).collect();
+                if o.resident > allowed || o.biggest > REQUEST_MAX {
+                    findings.push(format!(
+                        "{name} ({fmt:?}): bytes {at}..{} set to {hex} held {} MiB at its peak, and asked for {} MiB at once (allowed {} MiB held, {} MiB asked)",
+                        at + value.len(),
+                        o.resident >> 20,
+                        o.biggest >> 20,
+                        allowed >> 20,
+                        REQUEST_MAX >> 20
+                    ));
+                    seen.push(at);
+                } else if o.took > SLOW {
+                    findings.push(format!(
+                        "{name} ({fmt:?}): bytes {at}..{} set to {hex} took {:.1} s",
+                        at + value.len(),
+                        o.took.as_secs_f64()
+                    ));
+                    seen.push(at);
+                } else if let Some(why) = o.panicked {
+                    findings.push(format!(
+                        "{name} ({fmt:?}): bytes {at}..{} set to {hex} panicked: {why}",
+                        at + value.len()
+                    ));
+                    seen.push(at);
+                }
+            }
+        }
+    }
+    eprintln!(
+        "{} fixtures, {runs} walks, {} findings",
+        corpus.len(),
+        findings.len()
+    );
+    assert!(findings.is_empty(), "\n{}", findings.join("\n"));
+}
diff --git a/crates/exav-unpack/tests/suites/allowed_formats.rs b/crates/exav-unpack/tests/suites/allowed_formats.rs
index c3d625c6..2dd40cc8 100644
--- a/crates/exav-unpack/tests/suites/allowed_formats.rs
+++ b/crates/exav-unpack/tests/suites/allowed_formats.rs
@@ -11,7 +11,7 @@
 // `extract` and `Budget` are used only by the tests that open a real container,
 // which are behind the `zip` feature; `Format` and `Limits` are always needed.
 #[allow(unused_imports)]
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use std::collections::BTreeSet;
 
 /// A two-member ZIP, stored (no compression), so the test does not depend on a
diff --git a/crates/exav-unpack/tests/suites/alz.rs b/crates/exav-unpack/tests/suites/alz.rs
index bbe99775..73aa0d34 100644
--- a/crates/exav-unpack/tests/suites/alz.rs
+++ b/crates/exav-unpack/tests/suites/alz.rs
@@ -17,7 +17,7 @@
 //! confirmed field by field: the first member's declared sizes (1,171,458
 //! compressed, 1,195,080 uncompressed) and its name matched `unalz` exactly.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use sha2::{Digest, Sha256};
 
 /// `(name, uncompressed size, sha256 prefix)` for every member of the fixture, as
diff --git a/crates/exav-unpack/tests/suites/ar_cpio_irregular.rs b/crates/exav-unpack/tests/suites/ar_cpio_irregular.rs
new file mode 100644
index 00000000..a2605206
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/ar_cpio_irregular.rs
@@ -0,0 +1,170 @@
+//! `ar` and `cpio` archives that are a little irregular are read as far as the
+//! tools that unpack them read them.
+//!
+//! `ar` and `dpkg-deb` take a size field that has a stray byte after its digits;
+//! GNU `cpio` skips bytes that are not a header and goes on at the next one; the
+//! Linux kernel unpacks the archives of an initramfs one after the other. A
+//! reader that stops at the first of these shows the rest of the file to no
+//! scan.
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+
+fn entries(format: Format, blob: &[u8]) -> Vec<Entry> {
+    let mut budget = Budget::new(Limits::default());
+    extract(format, &blob, &mut budget).unwrap()
+}
+
+fn names(es: &[Entry]) -> Vec<&str> {
+    es.iter().map(|e| e.name.as_str()).collect()
+}
+
+// ---- ar --------------------------------------------------------------------
+
+fn ar_member(name: &str, data: &[u8], size_field: Option<&[u8; 10]>) -> Vec<u8> {
+    let mut size = [b' '; 10];
+    let digits = data.len().to_string();
+    size[..digits.len()].copy_from_slice(digits.as_bytes());
+    let mut h = format!(
+        "{:<16}{:<12}{:<6}{:<6}{:<8}",
+        format!("{name}/"),
+        0,
+        0,
+        0,
+        100644
+    )
+    .into_bytes();
+    h.extend_from_slice(size_field.unwrap_or(&size));
+    h.extend_from_slice(b"`\n");
+    assert_eq!(h.len(), 60);
+    h.extend_from_slice(data);
+    if data.len() % 2 == 1 {
+        h.push(b'\n');
+    }
+    h
+}
+
+#[test]
+fn an_ar_size_field_with_a_stray_byte_after_its_digits_is_read() {
+    let mut size = [b' '; 10];
+    size[..2].copy_from_slice(b"11");
+    size[9] = 0;
+    let mut ar = b"!<arch>\n".to_vec();
+    ar.extend(ar_member("first.txt", b"hello world", Some(&size)));
+    ar.extend(ar_member("second.bin", b"the payload!", None));
+    let es = entries(Format::Ar, &ar);
+    assert_eq!(names(&es), ["first.txt", "second.bin"], "{es:?}");
+    assert_eq!(es[1].data, b"the payload!");
+}
+
+#[test]
+fn bytes_after_an_ar_member_that_are_not_a_header_are_scanned() {
+    let mut ar = b"!<arch>\n".to_vec();
+    ar.extend(ar_member("first.txt", b"hello world", None));
+    let at = ar.len();
+    ar.extend_from_slice(b"this is not a header at all, but it is in the file");
+    let es = entries(Format::Ar, &ar);
+    let rest = es
+        .iter()
+        .find(|e| e.name == format!("<ar-from-{at}>"))
+        .expect("the rest, as a member");
+    assert!(rest.data.starts_with(b"this is not a header"));
+}
+
+#[test]
+fn padding_after_the_last_ar_member_is_not_a_member() {
+    let mut ar = b"!<arch>\n".to_vec();
+    ar.extend(ar_member("first.txt", b"hello world", None));
+    ar.extend_from_slice(b"\n\n");
+    let es = entries(Format::Ar, &ar);
+    assert_eq!(names(&es), ["first.txt"]);
+}
+
+// ---- cpio ------------------------------------------------------------------
+
+fn newc(name: &str, data: &[u8]) -> Vec<u8> {
+    let name_z = format!("{name}\0");
+    let fields = [0, 0, 0, 0, 1, 0, data.len(), 0, 0, 0, 0, name_z.len(), 0];
+    let mut out = b"070701".to_vec();
+    for f in fields {
+        out.extend_from_slice(format!("{f:08x}").as_bytes());
+    }
+    out.extend_from_slice(name_z.as_bytes());
+    while !out.len().is_multiple_of(4) {
+        out.push(0);
+    }
+    out.extend_from_slice(data);
+    while !out.len().is_multiple_of(4) {
+        out.push(0);
+    }
+    out
+}
+
+fn archive(members: &[(&str, &[u8])]) -> Vec<u8> {
+    let mut v: Vec<u8> = members.iter().flat_map(|(n, d)| newc(n, d)).collect();
+    v.extend(newc("TRAILER!!!", b""));
+    v
+}
+
+#[test]
+fn a_cpio_header_with_a_bad_digit_is_skipped_and_the_next_one_read() {
+    let mut cpio = archive(&[("benign.txt", b"hello"), ("payload.bin", b"the payload!")]);
+    // The first header's file size field.
+    cpio[54] = b'g';
+    let es = entries(Format::Cpio, &cpio);
+    assert!(
+        es.iter()
+            .any(|e| e.name == "payload.bin" && e.data == b"the payload!"),
+        "{:?}",
+        names(&es)
+    );
+    // And what was skipped was scanned.
+    assert!(
+        es.iter().any(|e| e.name.starts_with("<cpio-from-0")),
+        "{:?}",
+        names(&es)
+    );
+}
+
+#[test]
+fn the_archives_of_an_initramfs_are_all_read() {
+    let mut cpio = archive(&[("early.txt", b"microcode")]);
+    cpio.extend(archive(&[("payload.bin", b"the payload!")]));
+    let es = entries(Format::Cpio, &cpio);
+    assert!(
+        es.iter().any(|e| e.name == "payload.bin"),
+        "{:?}",
+        names(&es)
+    );
+    // With zeros of padding between them.
+    let mut padded = archive(&[("early.txt", b"microcode")]);
+    padded.extend_from_slice(&[0; 512]);
+    padded.extend(archive(&[("payload.bin", b"the payload!")]));
+    let es = entries(Format::Cpio, &padded);
+    assert!(
+        es.iter().any(|e| e.name == "payload.bin"),
+        "{:?}",
+        names(&es)
+    );
+}
+
+#[test]
+fn what_follows_a_cpio_trailer_that_is_not_a_header_is_scanned() {
+    // A compressed second part of an initramfs, as bootloaders concatenate them.
+    let mut cpio = archive(&[("early.txt", b"microcode")]);
+    let at = cpio.len();
+    cpio.extend_from_slice(b"\x1f\x8b\x08\x00 the rest of the image, compressed");
+    let es = entries(Format::Cpio, &cpio);
+    let rest = es
+        .iter()
+        .find(|e| e.name == format!("<cpio-from-{at}>"))
+        .expect("the rest");
+    assert!(rest.data.starts_with(b"\x1f\x8b\x08"));
+}
+
+#[test]
+fn a_plain_cpio_with_zero_padding_is_unchanged() {
+    let mut cpio = archive(&[("a.txt", b"one"), ("b.txt", b"two")]);
+    cpio.extend_from_slice(&[0; 1024]);
+    let es = entries(Format::Cpio, &cpio);
+    assert_eq!(names(&es), ["a.txt", "b.txt"]);
+}
diff --git a/crates/exav-unpack/tests/suites/arc.rs b/crates/exav-unpack/tests/suites/arc.rs
index 4e0f2ff0..fbc20ecb 100644
--- a/crates/exav-unpack/tests/suites/arc.rs
+++ b/crates/exav-unpack/tests/suites/arc.rs
@@ -19,7 +19,7 @@
 //! ```
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 const EICAR: &str = "275a021bbfb6489e54d471899f7db9d1663fc695ec2fe2a2c4538aabf651fd0f";
 const TEXT: &str = "080d15586f0165e6fe26ccc32060051fb67344c54691e3bca8ea7871b2c5d23f";
diff --git a/crates/exav-unpack/tests/suites/bzip2_blocks.rs b/crates/exav-unpack/tests/suites/bzip2_blocks.rs
index 77b9d5c8..a1e86e8f 100644
--- a/crates/exav-unpack/tests/suites/bzip2_blocks.rs
+++ b/crates/exav-unpack/tests/suites/bzip2_blocks.rs
@@ -3,7 +3,7 @@
 
 use std::io::Write;
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 /// Bytes no compressor can shrink, from a fixed seed.
 fn noise(len: usize) -> Vec<u8> {
diff --git a/crates/exav-unpack/tests/suites/cab_quantum.rs b/crates/exav-unpack/tests/suites/cab_quantum.rs
index bdfca1bb..c13bff42 100644
--- a/crates/exav-unpack/tests/suites/cab_quantum.rs
+++ b/crates/exav-unpack/tests/suites/cab_quantum.rs
@@ -17,7 +17,7 @@
 //! outputs up to 11 KB — zero disagreements. Treat a pass here as "still
 //! wired up", not as "the codec is correct".
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 fn fixture() -> Vec<u8> {
     let p = format!(
diff --git a/crates/exav-unpack/tests/suites/cab_salvage.rs b/crates/exav-unpack/tests/suites/cab_salvage.rs
new file mode 100644
index 00000000..5a789d76
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/cab_salvage.rs
@@ -0,0 +1,127 @@
+//! A cabinet cut or damaged inside a CFDATA block keeps what that block
+//! decoded before the cut or the damage.
+//!
+//! A damaged block is reported (the compressed bytes after the damage were
+//! present and never decoded); one cut by the end of the file is not (nothing
+//! is hidden: the rest is absent).
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+use std::io::{Cursor, Write};
+
+/// Text that deflates well, so a block holds a long run of it.
+fn text(n: usize) -> Vec<u8> {
+    (0..n as u32)
+        .flat_map(|i| format!("line {} of the file {}\n", i % 977, i / 3).into_bytes())
+        .take(n)
+        .collect()
+}
+
+fn mszip_cab(data: &[u8]) -> Vec<u8> {
+    let mut builder = cab::CabinetBuilder::new();
+    builder
+        .add_folder(cab::CompressionType::MsZip)
+        .add_file("data.bin");
+    let mut w = builder.build(Cursor::new(Vec::new())).unwrap();
+    while let Some(mut f) = w.next_file().unwrap() {
+        f.write_all(data).unwrap();
+    }
+    w.finish().unwrap().into_inner()
+}
+
+/// The offset of the first CFDATA record of a one-folder cabinet.
+fn first_block(cab: &[u8]) -> usize {
+    u32::from_le_bytes(cab[36..40].try_into().unwrap()) as usize
+}
+
+fn entries(cab: &[u8]) -> Vec<Entry> {
+    extract(Format::Cab, &cab, &mut Budget::new(Limits::default())).unwrap()
+}
+
+#[test]
+fn a_block_whose_deflate_stream_ends_early_keeps_what_it_decoded_and_is_reported() {
+    let data = text(20_000);
+    let mut cab = mszip_cab(&data);
+    let at = first_block(&cab);
+    let cb = u16::from_le_bytes([cab[at + 4], cab[at + 5]]);
+    assert!(cb > 200);
+    // The record claims fewer compressed bytes than the stream needs.
+    cab[at + 4..at + 6].copy_from_slice(&(cb / 2).to_le_bytes());
+    let e = entries(&cab);
+    assert_eq!(e.len(), 1);
+    assert!(e[0].unsupported.is_some(), "a damaged block came out whole");
+    assert!(
+        e[0].data.len() > 1000 && data.starts_with(&e[0].data),
+        "the part of the block decoded before the damage is lost: {} bytes",
+        e[0].data.len()
+    );
+}
+
+#[test]
+fn a_block_damaged_inside_its_deflate_stream_keeps_what_came_before() {
+    let data = text(20_000);
+    let cab = mszip_cab(&data);
+    let at = first_block(&cab);
+    // A reserved block type, some way into the first block's stream. The
+    // bits before it decode; which byte does it is found by trying.
+    let end = at + 8 + u16::from_le_bytes([cab[at + 4], cab[at + 5]]) as usize;
+    let mut kept = 0;
+    for k in (at + 40..end - 8).step_by(13) {
+        let mut bad = cab.clone();
+        bad[k] = 0xff;
+        bad[k + 1] = 0xff;
+        let e = entries(&bad);
+        if e.len() == 1 && e[0].unsupported.is_some() && e[0].data.len() > 100 {
+            // The start of the block is the file's own, up to the damage.
+            assert!(e[0].data.starts_with(&data[..100]));
+            kept += 1;
+        }
+    }
+    assert!(kept > 0, "no damaged block kept a decoded prefix");
+}
+
+#[test]
+fn a_cabinet_cut_inside_a_block_keeps_what_the_block_decoded() {
+    let data = text(20_000);
+    let cab = mszip_cab(&data);
+    let at = first_block(&cab);
+    let cb = u16::from_le_bytes([cab[at + 4], cab[at + 5]]) as usize;
+    let cut = &cab[..at + 8 + cb / 2];
+    let e = extract(Format::Cab, &cut, &mut Budget::new(Limits::default()));
+    let e = e.expect("a cut cabinet is still walked");
+    assert_eq!(e.len(), 1);
+    assert!(
+        e[0].data.len() > 1000 && data.starts_with(&e[0].data),
+        "the part of the block present is lost: {} bytes",
+        e[0].data.len()
+    );
+    // The rest of the block is absent, not hidden: not a damaged member.
+    assert!(e[0].unsupported.is_none(), "{:?}", e[0].unsupported);
+}
+
+#[test]
+fn a_whole_cabinet_still_decodes_to_the_file() {
+    let data = text(150_000);
+    let cab = mszip_cab(&data);
+    let e = entries(&cab);
+    assert_eq!(e.len(), 1);
+    assert!(e[0].unsupported.is_none());
+    assert_eq!(e[0].data, data);
+}
+
+#[test]
+fn a_second_block_damaged_keeps_the_first_whole_and_part_of_the_second() {
+    let data = text(150_000);
+    let mut cab = mszip_cab(&data);
+    let mut at = first_block(&cab);
+    at += 8 + u16::from_le_bytes([cab[at + 4], cab[at + 5]]) as usize;
+    let cb = u16::from_le_bytes([cab[at + 4], cab[at + 5]]);
+    let first = 32768usize;
+    cab[at + 4..at + 6].copy_from_slice(&(cb / 2).to_le_bytes());
+    let e = entries(&cab);
+    assert!(e[0].unsupported.is_some());
+    assert!(
+        e[0].data.len() > first + 1000 && data.starts_with(&e[0].data),
+        "{} bytes",
+        e[0].data.len()
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/cab_volumes.rs b/crates/exav-unpack/tests/suites/cab_volumes.rs
new file mode 100644
index 00000000..11b826d3
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/cab_volumes.rs
@@ -0,0 +1,549 @@
+//! Cabinets cut across several `.cab` files, put back into the one they were
+//! cut from.
+//!
+//! The layout of a cut set is the format specification's, and was checked
+//! against `cabextract`: sets built to it as `build` does are read by it as the
+//! files they were made from, and a set whose first cabinet ends on a whole
+//! block (not one cut short, `cbUncomp` zero) is refused by it as damaged. The
+//! oracle here is the plaintext each set was built from; the MSZIP blocks are
+//! real ones, written by the `cab` crate and cut apart here.
+
+use super::extract_each;
+use exav_unpack::{Budget, Entry, Format, Limits, cab_links, join_cab_volumes};
+
+struct FileSpec {
+    size: u32,
+    offset: u32,
+    /// `iFolder`: a folder, or 0xFFFD (from the cabinet before), 0xFFFE (to the
+    /// next), 0xFFFF (both).
+    place: u16,
+    name: &'static str,
+}
+
+/// One folder: its compression, and its blocks as (cbUncomp, payload).
+struct FolderSpec {
+    kind: u16,
+    blocks: Vec<(u16, Vec<u8>)>,
+}
+
+struct Set<'a> {
+    prev: Option<&'a str>,
+    next: Option<&'a str>,
+    id: u16,
+    index: u16,
+}
+
+fn build(files: &[FileSpec], folders: &[FolderSpec], set: Set) -> Vec<u8> {
+    let flags = u16::from(set.prev.is_some()) | (u16::from(set.next.is_some()) << 1);
+    let mut links = Vec::new();
+    for name in [set.prev, set.next].into_iter().flatten() {
+        links.extend_from_slice(name.as_bytes());
+        links.extend_from_slice(b"\0disk\0");
+    }
+    let mut file_records = Vec::new();
+    for f in files {
+        file_records.extend_from_slice(&f.size.to_le_bytes());
+        file_records.extend_from_slice(&f.offset.to_le_bytes());
+        file_records.extend_from_slice(&f.place.to_le_bytes());
+        file_records.extend_from_slice(&[0x21, 0x5a, 0x00, 0x60, 0x20, 0x00]);
+        file_records.extend_from_slice(f.name.as_bytes());
+        file_records.push(0);
+    }
+    let coff_files = 36 + links.len() + 8 * folders.len();
+    let data_at = coff_files + file_records.len();
+    let (mut records, mut data) = (Vec::new(), Vec::new());
+    for f in folders {
+        records.extend_from_slice(&((data_at + data.len()) as u32).to_le_bytes());
+        records.extend_from_slice(&(f.blocks.len() as u16).to_le_bytes());
+        records.extend_from_slice(&f.kind.to_le_bytes());
+        for (uncompressed, payload) in &f.blocks {
+            data.extend_from_slice(&0u32.to_le_bytes());
+            data.extend_from_slice(&(payload.len() as u16).to_le_bytes());
+            data.extend_from_slice(&uncompressed.to_le_bytes());
+            data.extend_from_slice(payload);
+        }
+    }
+    let mut out = b"MSCF".to_vec();
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&((data_at + data.len()) as u32).to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&(coff_files as u32).to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&[3, 1]);
+    for v in [
+        folders.len() as u16,
+        files.len() as u16,
+        flags,
+        set.id,
+        set.index,
+    ] {
+        out.extend_from_slice(&v.to_le_bytes());
+    }
+    out.extend(links);
+    out.extend(records);
+    out.extend(file_records);
+    out.extend(data);
+    out
+}
+
+fn members(cab: &[u8]) -> Vec<Entry> {
+    let mut out = Vec::new();
+    let mut budget = Budget::new(Limits::default());
+    let _ = extract_each(
+        Format::Cab,
+        cab,
+        &mut budget,
+        &mut |e: Entry, _: &mut Budget| {
+            out.push(e);
+            None::<()>
+        },
+    );
+    out
+}
+
+fn named<'a>(entries: &'a [Entry], name: &str) -> &'a Entry {
+    entries.iter().find(|e| e.name == name).unwrap_or_else(|| {
+        panic!(
+            "{name} in {:?}",
+            entries.iter().map(|e| &e.name).collect::<Vec<_>>()
+        )
+    })
+}
+
+fn noise(seed: u32, n: usize) -> Vec<u8> {
+    let mut x = seed.wrapping_mul(2_654_435_761).wrapping_add(1);
+    (0..n)
+        .map(|_| {
+            x ^= x << 13;
+            x ^= x >> 17;
+            x ^= x << 5;
+            (x >> 11) as u8
+        })
+        .collect()
+}
+
+/// Two files of one folder of three blocks, the second file running from
+/// the first cabinet into the second, with the third block cut in two.
+fn two_part_set() -> (Vec<u8>, Vec<u8>, Vec<u8>, Vec<u8>) {
+    let (f1, f2) = (noise(1, 3000), noise(2, 2000));
+    let stream = [f1.clone(), f2.clone()].concat();
+    let one = build(
+        &[
+            FileSpec {
+                size: 3000,
+                offset: 0,
+                place: 0,
+                name: "f1.bin",
+            },
+            FileSpec {
+                size: 2000,
+                offset: 3000,
+                place: 0xFFFE,
+                name: "f2.bin",
+            },
+        ],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![
+                (2000, stream[..2000].to_vec()),
+                (2000, stream[2000..4000].to_vec()),
+                (0, stream[4000..4500].to_vec()),
+            ],
+        }],
+        Set {
+            prev: None,
+            next: Some("two.cab"),
+            id: 7,
+            index: 0,
+        },
+    );
+    let two = build(
+        &[FileSpec {
+            size: 2000,
+            offset: 3000,
+            place: 0xFFFD,
+            name: "f2.bin",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(1000, stream[4500..].to_vec())],
+        }],
+        Set {
+            prev: Some("one.cab"),
+            next: None,
+            id: 7,
+            index: 1,
+        },
+    );
+    (one, two, f1, f2)
+}
+
+#[test]
+fn a_cut_set_is_read_as_the_files_it_was_cut_from() {
+    let (one, two, f1, f2) = two_part_set();
+    // Alone, each is cut short.
+    // The first reports the file it cannot read, not drops it; the second is
+    // refused as a whole.
+    let alone = members(&one);
+    let lost = alone
+        .iter()
+        .find(|e| e.name == "f2.bin")
+        .expect("the first part says nothing of f2.bin");
+    assert!(
+        lost.unsupported
+            .is_some_and(|r| r.contains("another cabinet")),
+        "{:?}",
+        lost.unsupported
+    );
+    let mut budget = Budget::new(Limits::default());
+    let second = extract_each(
+        Format::Cab,
+        &two,
+        &mut budget,
+        &mut |_: Entry, _: &mut Budget| None::<()>,
+    );
+    assert!(
+        second.is_err(),
+        "the second part, read alone, is not read as complete"
+    );
+    let joined = join_cab_volumes(&[&one, &two]).unwrap();
+    let got = members(&joined);
+    assert_eq!(
+        got.len(),
+        2,
+        "{:?}",
+        got.iter().map(|e| &e.name).collect::<Vec<_>>()
+    );
+    assert_eq!(named(&got, "f1.bin").data, f1);
+    assert_eq!(named(&got, "f2.bin").data, f2);
+    assert!(got.iter().all(|e| e.unsupported.is_none()));
+}
+
+#[test]
+fn a_set_of_three_with_a_file_through_the_middle_one_is_joined() {
+    let big = noise(3, 6000);
+    let tail = noise(4, 500);
+    let stream = [big.clone(), tail.clone()].concat();
+    // One block of 6500 bytes, cut at 2000 and 4000.
+    let one = build(
+        &[FileSpec {
+            size: 6000,
+            offset: 0,
+            place: 0xFFFE,
+            name: "big.bin",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(0, stream[..2000].to_vec())],
+        }],
+        Set {
+            prev: None,
+            next: Some("b.cab"),
+            id: 1,
+            index: 0,
+        },
+    );
+    let two = build(
+        &[FileSpec {
+            size: 6000,
+            offset: 0,
+            place: 0xFFFF,
+            name: "big.bin",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(0, stream[2000..4000].to_vec())],
+        }],
+        Set {
+            prev: Some("a.cab"),
+            next: Some("c.cab"),
+            id: 1,
+            index: 1,
+        },
+    );
+    let three = build(
+        &[
+            FileSpec {
+                size: 6000,
+                offset: 0,
+                place: 0xFFFD,
+                name: "big.bin",
+            },
+            FileSpec {
+                size: 500,
+                offset: 6000,
+                place: 0,
+                name: "tail.bin",
+            },
+        ],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(6500, stream[4000..].to_vec())],
+        }],
+        Set {
+            prev: Some("b.cab"),
+            next: None,
+            id: 1,
+            index: 2,
+        },
+    );
+    let got = members(&join_cab_volumes(&[&one, &two, &three]).unwrap());
+    assert_eq!(got.len(), 2);
+    assert_eq!(named(&got, "big.bin").data, big);
+    assert_eq!(named(&got, "tail.bin").data, tail);
+}
+
+#[test]
+fn a_folder_that_starts_in_the_next_cabinet_is_its_own() {
+    let (a, b) = (noise(5, 1200), noise(6, 900));
+    let one = build(
+        &[FileSpec {
+            size: 1200,
+            offset: 0,
+            place: 0,
+            name: "a.bin",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(1200, a.clone())],
+        }],
+        Set {
+            prev: None,
+            next: Some("two.cab"),
+            id: 2,
+            index: 0,
+        },
+    );
+    let two = build(
+        &[FileSpec {
+            size: 900,
+            offset: 0,
+            place: 0,
+            name: "b.bin",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(900, b.clone())],
+        }],
+        Set {
+            prev: Some("one.cab"),
+            next: None,
+            id: 2,
+            index: 1,
+        },
+    );
+    let got = members(&join_cab_volumes(&[&one, &two]).unwrap());
+    assert_eq!(named(&got, "a.bin").data, a);
+    assert_eq!(named(&got, "b.bin").data, b);
+}
+
+/// The blocks MSZIP writes for `data`, as the `cab` crate writes them.
+fn mszip_blocks(data: &[u8]) -> Vec<(u16, Vec<u8>)> {
+    use std::io::{Cursor, Write};
+    let mut builder = cab::CabinetBuilder::new();
+    builder
+        .add_folder(cab::CompressionType::MsZip)
+        .add_file("data.bin");
+    let mut writer = builder.build(Cursor::new(Vec::new())).unwrap();
+    while let Some(mut file) = writer.next_file().unwrap() {
+        file.write_all(data).unwrap();
+    }
+    let bytes = writer.finish().unwrap().into_inner();
+    let u16_at = |o: usize| u16::from_le_bytes([bytes[o], bytes[o + 1]]) as usize;
+    let u32_at = |o: usize| u32::from_le_bytes(bytes[o..o + 4].try_into().unwrap()) as usize;
+    // One folder: its record is the first after the 36-byte header.
+    let (mut pos, count) = (u32_at(36), u16_at(40));
+    (0..count)
+        .map(|_| {
+            let (len, uncompressed) = (u16_at(pos + 4), u16_at(pos + 6));
+            let payload = bytes[pos + 8..pos + 8 + len].to_vec();
+            pos += 8 + len;
+            (uncompressed as u16, payload)
+        })
+        .collect()
+}
+
+#[test]
+fn an_mszip_folder_cut_across_cabinets_decodes_to_the_file() {
+    // Text that compresses, over several 32 KiB blocks, so that a block
+    // depends on the ones before it.
+    let data: Vec<u8> = (0..150_000u32)
+        .flat_map(|i| format!("line {} of the file, {}\n", i % 977, i / 3).into_bytes())
+        .take(150_000)
+        .collect();
+    let blocks = mszip_blocks(&data);
+    assert!(blocks.len() >= 4, "{} blocks", blocks.len());
+    let cut = 2;
+    let (whole, rest) = blocks.split_at(cut);
+    let (mid_uncompressed, mid) = &rest[0];
+    let half = mid.len() / 2;
+    let mut first: Vec<(u16, Vec<u8>)> = whole.to_vec();
+    first.push((0, mid[..half].to_vec()));
+    let mut second: Vec<(u16, Vec<u8>)> = vec![(*mid_uncompressed, mid[half..].to_vec())];
+    second.extend_from_slice(&rest[1..]);
+    let size = data.len() as u32;
+    let one = build(
+        &[FileSpec {
+            size,
+            offset: 0,
+            place: 0xFFFE,
+            name: "data.bin",
+        }],
+        &[FolderSpec {
+            kind: 1,
+            blocks: first,
+        }],
+        Set {
+            prev: None,
+            next: Some("part2.cab"),
+            id: 9,
+            index: 0,
+        },
+    );
+    let two = build(
+        &[FileSpec {
+            size,
+            offset: 0,
+            place: 0xFFFD,
+            name: "data.bin",
+        }],
+        &[FolderSpec {
+            kind: 1,
+            blocks: second,
+        }],
+        Set {
+            prev: Some("part1.cab"),
+            next: None,
+            id: 9,
+            index: 1,
+        },
+    );
+    let got = members(&join_cab_volumes(&[&one, &two]).unwrap());
+    assert_eq!(got.len(), 1);
+    assert!(got[0].unsupported.is_none(), "{:?}", got[0].unsupported);
+    assert!(
+        got[0].data == data,
+        "{} bytes of {}",
+        got[0].data.len(),
+        data.len()
+    );
+}
+
+#[test]
+fn a_cabinet_says_where_it_is_in_its_set() {
+    let (one, two, _, _) = two_part_set();
+    let l1 = cab_links(&one).unwrap();
+    assert_eq!(
+        (l1.set_id, l1.index, l1.prev.as_deref(), l1.next.as_deref()),
+        (7, 0, None, Some("two.cab"))
+    );
+    let l2 = cab_links(&two).unwrap();
+    assert_eq!(
+        (l2.set_id, l2.index, l2.prev.as_deref(), l2.next.as_deref()),
+        (7, 1, Some("one.cab"), None)
+    );
+    // A cabinet that is not one of several, and what is not a cabinet.
+    let alone = build(
+        &[FileSpec {
+            size: 3,
+            offset: 0,
+            place: 0,
+            name: "x",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(3, b"abc".to_vec())],
+        }],
+        Set {
+            prev: None,
+            next: None,
+            id: 1,
+            index: 0,
+        },
+    );
+    assert_eq!(cab_links(&alone), None);
+    assert_eq!(cab_links(b"MSCF"), None);
+    assert_eq!(cab_links(b"not a cabinet at all, nothing like one"), None);
+}
+
+#[test]
+fn what_does_not_fit_together_is_refused_not_joined_wrong() {
+    let (one, two, _, _) = two_part_set();
+    assert!(join_cab_volumes(&[&one]).is_err(), "one part is not a set");
+    assert!(join_cab_volumes(&[&two, &one]).is_err(), "out of order");
+    assert!(join_cab_volumes(&[&one, &one]).is_err(), "a part twice");
+    assert!(
+        join_cab_volumes(&[&one, b"MSCF\0\0\0\0"]).is_err(),
+        "not a cabinet"
+    );
+    // The second of another set.
+    let other = {
+        let mut v = two.clone();
+        v[32..34].copy_from_slice(&8u16.to_le_bytes());
+        v
+    };
+    assert!(join_cab_volumes(&[&one, &other]).is_err(), "another set");
+    // A file continued from the cabinet before with another size than it had.
+    let wrong = build(
+        &[FileSpec {
+            size: 1999,
+            offset: 3000,
+            place: 0xFFFD,
+            name: "f2.bin",
+        }],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(1000, vec![0; 500])],
+        }],
+        Set {
+            prev: Some("one.cab"),
+            next: None,
+            id: 7,
+            index: 1,
+        },
+    );
+    assert!(
+        join_cab_volumes(&[&one, &wrong]).is_err(),
+        "a file that is not the one that ran on"
+    );
+    // The second cabinet without the file the first continues.
+    let missing = build(
+        &[],
+        &[FolderSpec {
+            kind: 0,
+            blocks: vec![(1000, vec![0; 500])],
+        }],
+        Set {
+            prev: Some("one.cab"),
+            next: None,
+            id: 7,
+            index: 1,
+        },
+    );
+    assert!(join_cab_volumes(&[&one, &missing]).is_err(), "a lost file");
+    // A third that is not there: the second says another follows.
+    let (a, b, _, _) = two_part_set();
+    let mut open = b.clone();
+    open[30..32].copy_from_slice(&3u16.to_le_bytes());
+    let _ = a;
+    assert!(join_cab_volumes(&[&one, &open]).is_err() || cab_links(&open).is_some());
+}
+
+#[test]
+fn damaged_cabinets_of_a_set_are_errors_not_panics() {
+    let (one, two, _, _) = two_part_set();
+    for at in 0..one.len().min(two.len()) {
+        for v in [0x00u8, 0x7F, 0xFF] {
+            let (mut a, mut b) = (one.clone(), two.clone());
+            a[at] = v;
+            b[at] = v;
+            let _ = join_cab_volumes(&[&a, &two]);
+            let _ = join_cab_volumes(&[&one, &b]);
+            let _ = cab_links(&a);
+        }
+    }
+    for cut in 0..one.len() {
+        let _ = join_cab_volumes(&[&one[..cut], &two]);
+        let _ = join_cab_volumes(&[&one, &two[..cut.min(two.len())]]);
+    }
+}
diff --git a/crates/exav-unpack/tests/suites/chm.rs b/crates/exav-unpack/tests/suites/chm.rs
index a9c9a641..c073b507 100644
--- a/crates/exav-unpack/tests/suites/chm.rs
+++ b/crates/exav-unpack/tests/suites/chm.rs
@@ -11,7 +11,7 @@
 //!   The tests read them at runtime and **skip when absent** (a fresh clone /
 //!   CI), adding extra real-world hostile-input robustness for local runs.
 
-use exav_unpack::{detect, extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, detect, extract};
 
 /// The committed, benign LZX oracle. Must always be present.
 const BENIGN_LZX: &str = "benign-lzx.chm";
diff --git a/crates/exav-unpack/tests/suites/cramfs.rs b/crates/exav-unpack/tests/suites/cramfs.rs
new file mode 100644
index 00000000..907c68c8
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/cramfs.rs
@@ -0,0 +1,75 @@
+//! cramfs: reading the filesystem, a block at a time.
+//!
+//! The images are what `mkcramfs` writes for the tree of `tree.py` and a file of
+//! three blocks of zeros and a tail (`fixtures/fs/make.sh`): plain, padded by 512
+//! bytes for boot code, with the empty blocks made holes, with extended block
+//! pointers, and byte-swapped, as an image of a big-endian machine is.
+
+use super::fs_tree::{assert_streams_alike, assert_tree, image, members, tree, walked};
+use exav_unpack::{Format, Limits, detect};
+
+const IMAGES: [&str; 5] = [
+    "cramfs",
+    "cramfs_padded",
+    "cramfs_holes",
+    "cramfs_extended",
+    "cramfs_big_endian",
+];
+
+fn want() -> Vec<(String, Vec<u8>)> {
+    let mut want = tree(false);
+    let mut zeros = vec![0u8; 12288];
+    zeros.extend_from_slice(b"end");
+    want.push(("zeros.bin".to_string(), zeros));
+    want
+}
+
+#[test]
+fn a_cramfs_image_is_recognised() {
+    for name in IMAGES {
+        assert_eq!(detect(&image(name)), Some(Format::Cramfs), "{name}");
+    }
+}
+
+#[test]
+fn every_kind_of_image_reads_the_same_tree() {
+    for name in IMAGES {
+        let e = members(Format::Cramfs, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &want())).unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+#[test]
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in IMAGES {
+        assert_streams_alike(Format::Cramfs, &image(name), 1000);
+    }
+}
+
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("cramfs");
+    let (e, end) = walked(Format::Cramfs, &img[..100], Limits::default());
+    assert!(e.is_empty() && end.is_err());
+    let (e, end) = walked(Format::Cramfs, &img[..img.len() / 2], Limits::default());
+    assert!(end.is_err() || e.iter().any(|x| x.unsupported.is_some()));
+}
+
+/// A block that does not inflate is a file reported with what came before it.
+#[test]
+fn a_block_that_does_not_inflate_is_a_file_reported_with_what_precedes_it() {
+    let mut img = image("cramfs");
+    let at = img.len() - 3000;
+    for b in &mut img[at..at + 1000] {
+        *b ^= 0x5A;
+    }
+    let (e, _) = walked(Format::Cramfs, &img, Limits::default());
+    assert!(
+        e.iter().any(|x| x.unsupported.is_some()),
+        "nothing was reported"
+    );
+    assert!(
+        e.iter().any(|x| x.unsupported.is_none()),
+        "nothing else was read"
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/cut_streams.rs b/crates/exav-unpack/tests/suites/cut_streams.rs
new file mode 100644
index 00000000..9c52f51b
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/cut_streams.rs
@@ -0,0 +1,134 @@
+//! A stream cut short gives up what the reference decoder gives up.
+//!
+//! `bzip2 -dc`, `xz -dc` and Python's `bz2` and `lzma` write every byte they can
+//! decode from a stream whose end is missing, then report the cut. An extractor
+//! that holds back more than they do shows a scan less than the file has: the
+//! payload at the end of a stream is the one a truncation puts at the cut.
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+use std::io::Write;
+
+/// A text that compresses, so the string is not in the compressed bytes.
+fn payload() -> Vec<u8> {
+    let mut v = b"filler to put the payload at the end ".repeat(30);
+    v.extend([exav_unpack::eicar(), b"\n"].concat().repeat(8));
+    v
+}
+
+fn decoded(format: Format, blob: &[u8]) -> Vec<u8> {
+    let mut budget = Budget::new(Limits::default());
+    match extract(format, &blob, &mut budget) {
+        Ok(entries) => entries.into_iter().flat_map(|e: Entry| e.data).collect(),
+        Err(_) => Vec::new(),
+    }
+}
+
+fn finds_the_payload(out: &[u8]) -> bool {
+    let eicar = exav_unpack::eicar();
+    out.windows(eicar.len()).any(|w| w == eicar)
+}
+
+fn bzip2(data: &[u8]) -> Vec<u8> {
+    let mut enc = bzip2::write::BzEncoder::new(Vec::new(), bzip2::Compression::new(9));
+    enc.write_all(data).unwrap();
+    enc.finish().unwrap()
+}
+
+#[test]
+fn a_bzip2_stream_cut_inside_its_trailer_still_gives_its_last_block() {
+    let data = payload();
+    let bz = bzip2(&data);
+    assert!(!bz.windows(68).any(|w| w == exav_unpack::eicar()));
+    assert!(
+        finds_the_payload(&decoded(Format::Bzip2, &bz)),
+        "the whole stream"
+    );
+    // The trailer is ten bytes: the end magic and the combined checksum.
+    for cut in 1..=9 {
+        let out = decoded(Format::Bzip2, &bz[..bz.len() - cut]);
+        assert!(
+            finds_the_payload(&out),
+            "cut {cut} bytes short: {} bytes out",
+            out.len()
+        );
+    }
+}
+
+#[test]
+fn a_later_bzip2_stream_that_is_cut_short_is_scanned_as_far_as_it_goes() {
+    let benign = bzip2(&b"nothing to see here ".repeat(50));
+    let mut cut = bzip2(&payload());
+    cut.truncate(cut.len() - 5);
+    let both = [benign.as_slice(), &cut].concat();
+    assert!(
+        finds_the_payload(&decoded(Format::Bzip2, &both)),
+        "the second stream was read as far as the first"
+    );
+    // Whole, the two streams give both.
+    let whole = [benign.as_slice(), &bzip2(&payload())].concat();
+    assert!(finds_the_payload(&decoded(Format::Bzip2, &whole)));
+}
+
+fn xz(data: &[u8]) -> Vec<u8> {
+    let mut w =
+        lzma_rust2::XzWriter::new(Vec::new(), lzma_rust2::XzOptions::with_preset(6)).unwrap();
+    w.write_all(data).unwrap();
+    w.finish().unwrap()
+}
+
+/// Words, so that the stream is compressed and its end carries real symbols,
+/// and the string at the very end.
+fn words_then_payload() -> Vec<u8> {
+    let mut x: u32 = 0x1234_5678;
+    let mut v = Vec::new();
+    while v.len() < 30_000 {
+        for _ in 0..(3 + x % 7) {
+            x ^= x << 13;
+            x ^= x >> 17;
+            x ^= x << 5;
+            v.push(b'a' + (x % 16) as u8);
+        }
+        v.push(b' ');
+    }
+    v.extend_from_slice(exav_unpack::eicar());
+    v
+}
+
+/// The decoder reads ahead of what it writes, so the last bytes it could decode
+/// from what it was given wait in it for input that is not there; `xz -dc` and
+/// Python's `lzma` write them. This stream is cut at the shortest length at
+/// which they have written the whole of the string at its end (generated with
+/// Python: 30,000 bytes of words, then the string, `lzma.compress`, then a
+/// binary search for the cut).
+#[test]
+fn an_xz_stream_cut_gives_what_xz_writes() {
+    // Masked: a scanner that reads a cut stream as `xz -dc` does finds the
+    // string in it.
+    let blob = exav_unpack::read_fixture(&format!(
+        "{}/tests/fixtures/xz/cut_where_xz_has_written_the_payload.xz",
+        env!("CARGO_MANIFEST_DIR")
+    ))
+    .unwrap();
+    let out = decoded(Format::Xz, &blob);
+    assert!(finds_the_payload(&out), "{} bytes out", out.len());
+}
+
+/// A cut anywhere gives a prefix of the whole, and at least what a
+/// straightforward decoder gives.
+#[test]
+fn an_xz_stream_cut_anywhere_gives_a_prefix_of_the_whole() {
+    let data = words_then_payload();
+    let blob = xz(&data);
+    assert!(
+        finds_the_payload(&decoded(Format::Xz, &blob)),
+        "the whole stream"
+    );
+    for cut in 1..=400 {
+        let got = decoded(Format::Xz, &blob[..blob.len() - cut]);
+        assert!(
+            data.starts_with(&got),
+            "cut {cut}: {} bytes that are not the stream's",
+            got.len()
+        );
+    }
+}
diff --git a/crates/exav-unpack/tests/suites/decrypt_disabled.rs b/crates/exav-unpack/tests/suites/decrypt_disabled.rs
index 7b83489d..9093b10c 100644
--- a/crates/exav-unpack/tests/suites/decrypt_disabled.rs
+++ b/crates/exav-unpack/tests/suites/decrypt_disabled.rs
@@ -2,7 +2,7 @@
 //! never decrypted (the cipher stack isn't compiled in) — the same as when no
 //! password is supplied, and never a silent clean. Compiled/run only in a
 //! no-decrypt build: `cargo test -p exav-unpack --no-default-features --features zip`.
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 #[test]
 fn encrypted_zip_is_unsupported_without_decrypt() {
@@ -15,7 +15,9 @@ fn encrypted_zip_is_unsupported_without_decrypt() {
         let mut budget = Budget::with_passwords(Limits::default(), vec!["exavtest".into()]);
         let entries = extract(Format::Zip, &data, &mut budget).unwrap();
         assert!(
-            entries.iter().any(|e| e.encrypted && e.unsupported.is_some()),
+            entries
+                .iter()
+                .any(|e| e.encrypted && e.unsupported.is_some()),
             "encrypted member must be reported unsupported (not decrypted) without the decrypt feature",
         );
         // And never handed back as decrypted plaintext.
diff --git a/crates/exav-unpack/tests/suites/disabled_formats.rs b/crates/exav-unpack/tests/suites/disabled_formats.rs
index 6a02b1ce..91a24c70 100644
--- a/crates/exav-unpack/tests/suites/disabled_formats.rs
+++ b/crates/exav-unpack/tests/suites/disabled_formats.rs
@@ -10,7 +10,7 @@
 //! come back clean — the one outcome exav refuses.
 #![cfg(not(feature = "all-formats"))]
 
-use exav_unpack::{detect, extract, Budget, Limits};
+use exav_unpack::{Budget, Limits, detect, extract};
 
 /// `(what it is, a blob that sniffs as it)`. Magic only — enough for `detect`,
 /// not a valid archive, which is deliberate: recognition must not need a
diff --git a/crates/exav-unpack/tests/suites/dmg.rs b/crates/exav-unpack/tests/suites/dmg.rs
index 76310770..2e0e2875 100644
--- a/crates/exav-unpack/tests/suites/dmg.rs
+++ b/crates/exav-unpack/tests/suites/dmg.rs
@@ -3,7 +3,7 @@
 //! Fixtures are generated by `fixture_gen.sh` in this directory.
 //! Run it on macOS: `cd tests/fixtures/dmg && bash fixture_gen.sh`
 
-use exav_unpack::{detect, extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, detect, extract};
 
 const MARKER: &[u8] = b"hello hfs+";
 
@@ -18,10 +18,10 @@ fn contains_marker(entries: &[exav_unpack::Entry]) -> bool {
         .any(|e| e.data.windows(MARKER.len()).any(|w| w == MARKER))
 }
 
-/// Only the data fork is read, so a file with a resource fork, which is where
-/// macOS keeps a compressed file's bytes, is reported rather than scanned as
-/// though the data fork were all of it. The fixture's one file is given a
-/// resource fork in its catalog record.
+/// A resource fork that is not a compressed file's bytes is not read, so a file
+/// with one is reported rather than scanned as though the data fork were all of
+/// it (which is read beside it). The fixture's one file is given a resource
+/// fork in its catalog record.
 #[test]
 fn a_file_with_a_resource_fork_is_reported() {
     let mut blob = fixture("hfs_plus_udrw.dmg");
diff --git a/crates/exav-unpack/tests/suites/dwg.rs b/crates/exav-unpack/tests/suites/dwg.rs
index 9c147421..bac0ec7d 100644
--- a/crates/exav-unpack/tests/suites/dwg.rs
+++ b/crates/exav-unpack/tests/suites/dwg.rs
@@ -13,8 +13,8 @@
 
 use std::io::Read;
 
-use exav_unpack::dwg::{looks_like_dwg, Dwg, PreviewKind, Version};
-use exav_unpack::{detect, extract, Budget, Entry, Format, Limits};
+use exav_unpack::dwg::{Dwg, PreviewKind, Version, looks_like_dwg};
+use exav_unpack::{Budget, Entry, Format, Limits, detect, extract};
 
 /// Every version the converter writes, as the fixture directories name them.
 const VERSIONS: [&str; 8] = [
diff --git a/crates/exav-unpack/tests/suites/dxf.rs b/crates/exav-unpack/tests/suites/dxf.rs
index c281dc80..8feb0890 100644
--- a/crates/exav-unpack/tests/suites/dxf.rs
+++ b/crates/exav-unpack/tests/suites/dxf.rs
@@ -11,7 +11,7 @@
 
 use std::io::{Read, Write};
 
-use exav_unpack::{detect, extract, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect, extract};
 
 fn members(data: &[u8]) -> Vec<Entry> {
     let mut budget = Budget::new(Limits::default());
diff --git a/crates/exav-unpack/tests/suites/email.rs b/crates/exav-unpack/tests/suites/email.rs
new file mode 100644
index 00000000..5d1b57fa
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/email.rs
@@ -0,0 +1,95 @@
+//! MIME email: every part that holds bytes is a member, those of attached
+//! messages included.
+
+use super::extract_each;
+use exav_unpack::{Budget, Entry, Format, Limits};
+
+/// Members as `(name, bytes)`.
+type Members = Vec<(String, Vec<u8>)>;
+
+/// Every member of `data` read as an email, and how the walk ended.
+fn members(data: &[u8]) -> (Members, Result<(), String>) {
+    let mut out = vec![];
+    let mut budget = Budget::new(Limits::default());
+    let r = extract_each(
+        Format::Email,
+        data,
+        &mut budget,
+        &mut |e: Entry, _: &mut Budget| {
+            out.push((e.name, e.data));
+            None::<()>
+        },
+    );
+    (out, r.map(|_| ()).map_err(|e| e.reason))
+}
+
+const B64_X: &str = "WFhYWFhYWFg="; // XXXXXXXX
+const B64_Y: &str = "WVlZWVlZWVk="; // YYYYYYYY
+
+fn mail(attached: &str) -> String {
+    format!(
+        "From: a@b\r\nMIME-Version: 1.0\r\nContent-Type: multipart/mixed; boundary=\"out\"\r\n\r\n\
+         --out\r\nContent-Type: text/plain\r\n\r\nbody\r\n\
+         --out\r\nContent-Type: application/octet-stream\r\nContent-Transfer-Encoding: base64\r\n\r\n{B64_X}\r\n\
+         --out\r\nContent-Type: message/rfc822\r\n\r\n{attached}\r\n--out--\r\n"
+    )
+}
+
+fn inner() -> String {
+    format!(
+        "From: c@d\r\nMIME-Version: 1.0\r\nContent-Type: multipart/mixed; boundary=\"in\"\r\n\r\n\
+         --in\r\nContent-Type: text/plain\r\n\r\ninner body\r\n\
+         --in\r\nContent-Type: application/octet-stream\r\nContent-Transfer-Encoding: base64\r\n\r\n{B64_Y}\r\n--in--\r\n"
+    )
+}
+
+#[test]
+fn a_part_is_a_member_decoded() {
+    let (m, r) = members(mail(&inner()).as_bytes());
+    assert_eq!(r, Ok(()));
+    assert!(m.iter().any(|(_, d)| d == b"XXXXXXXX"), "{m:?}");
+    assert!(m.iter().any(|(_, d)| d.starts_with(b"body")), "{m:?}");
+}
+
+#[test]
+fn the_parts_of_an_attached_message_are_members_too() {
+    let (m, r) = members(mail(&inner()).as_bytes());
+    assert_eq!(r, Ok(()));
+    let inner_attachment = m
+        .iter()
+        .find(|(_, d)| d == b"YYYYYYYY")
+        .unwrap_or_else(|| panic!("the attachment of the attached message was not read: {m:?}"));
+    assert!(
+        inner_attachment.0.matches('-').count() >= 2,
+        "{}",
+        inner_attachment.0
+    );
+    assert!(m.iter().any(|(_, d)| d.starts_with(b"inner body")), "{m:?}");
+    let mut names: Vec<_> = m.iter().map(|(n, _)| n.as_str()).collect();
+    names.sort();
+    names.dedup();
+    assert_eq!(names.len(), m.len(), "names are distinct: {names:?}");
+}
+
+/// A message attached to a message, `levels` deep, with an attachment at the
+/// bottom.
+fn chain(levels: usize) -> String {
+    let mut body = inner();
+    for i in 0..levels {
+        body = format!(
+            "From: a@b\r\nContent-Type: multipart/mixed; boundary=\"b{i}\"\r\n\r\n\
+             --b{i}\r\nContent-Type: message/rfc822\r\n\r\n{body}\r\n--b{i}--\r\n"
+        );
+    }
+    body
+}
+
+#[test]
+fn a_chain_of_attached_messages_is_read_to_a_bound_and_refused_past_it() {
+    let (m, r) = members(chain(8).as_bytes());
+    assert_eq!(r, Ok(()));
+    assert!(m.iter().any(|(_, d)| d == b"YYYYYYYY"), "{m:?}");
+    let (_, r) = members(chain(200).as_bytes());
+    let why = r.expect_err("a chain this deep is not read");
+    assert!(why.contains("attached to messages"), "{why}");
+}
diff --git a/crates/exav-unpack/tests/suites/email_readers_agree.rs b/crates/exav-unpack/tests/suites/email_readers_agree.rs
new file mode 100644
index 00000000..d5a12ffe
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/email_readers_agree.rs
@@ -0,0 +1,170 @@
+//! What a mail reader shows of a message is what exav scans.
+//!
+//! The parser leaves out three things a reader shows: the last part of a
+//! multipart that nothing closed, a base64 part with a byte in it outside the
+//! alphabet, and a file uuencoded into the text. The payload is base64 or
+//! uuencoded EICAR, so the string is nowhere in the message itself.
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+
+fn eicar() -> &'static [u8] {
+    exav_unpack::eicar()
+}
+
+fn base64(data: &[u8]) -> String {
+    const A: &[u8; 64] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    let mut out = String::new();
+    for chunk in data.chunks(3) {
+        let n = chunk
+            .iter()
+            .enumerate()
+            .fold(0u32, |n, (i, b)| n | u32::from(*b) << (16 - 8 * i));
+        for i in 0..4 {
+            if i <= chunk.len() {
+                out.push(A[(n >> (18 - 6 * i) & 63) as usize] as char);
+            } else {
+                out.push('=');
+            }
+        }
+    }
+    out
+}
+
+/// 76 columns, as a mail client writes it.
+fn wrapped(b64: &str) -> String {
+    b64.as_bytes()
+        .chunks(76)
+        .map(|c| String::from_utf8_lossy(c).into_owned())
+        .collect::<Vec<_>>()
+        .join("\r\n")
+}
+
+fn message(body_after_headers: &str) -> Vec<u8> {
+    format!(
+        "From: a@example.org\r\nTo: b@example.org\r\nSubject: s\r\nMIME-Version: 1.0\r\n\
+         Content-Type: multipart/mixed; boundary=\"b1\"\r\n\r\n{body_after_headers}"
+    )
+    .into_bytes()
+}
+
+fn entries(msg: &[u8]) -> Vec<Entry> {
+    let mut budget = Budget::new(Limits::default());
+    extract(Format::Email, &msg, &mut budget).unwrap()
+}
+
+fn has_payload(entries: &[Entry]) -> bool {
+    entries
+        .iter()
+        .any(|e| e.data.windows(eicar().len()).any(|w| w == eicar()))
+}
+
+fn attachment(encoded: &str) -> String {
+    format!(
+        "--b1\r\nContent-Type: text/plain\r\n\r\nSee the attachment.\r\n\
+         --b1\r\nContent-Type: application/octet-stream; name=\"e.com\"\r\n\
+         Content-Transfer-Encoding: base64\r\n\r\n{encoded}\r\n"
+    )
+}
+
+fn assert_hidden_from_a_byte_search(msg: &[u8]) {
+    assert!(
+        !msg.windows(eicar().len()).any(|w| w == eicar()),
+        "the string must not be in the message's bytes"
+    );
+}
+
+#[test]
+fn a_closed_multipart_is_read() {
+    let msg = message(&format!(
+        "{}--b1--\r\n",
+        attachment(&wrapped(&base64(eicar())))
+    ));
+    assert_hidden_from_a_byte_search(&msg);
+    assert!(has_payload(&entries(&msg)));
+}
+
+#[test]
+fn the_last_part_of_a_multipart_nothing_closed_is_read() {
+    let msg = message(&attachment(&wrapped(&base64(eicar()))));
+    assert_hidden_from_a_byte_search(&msg);
+    assert!(has_payload(&entries(&msg)));
+}
+
+#[test]
+fn an_inner_multipart_nothing_closed_is_read_with_the_outer_one() {
+    let inner = format!(
+        "--b1\r\nContent-Type: multipart/mixed; boundary=\"b2\"\r\n\r\n\
+         --b2\r\nContent-Type: application/octet-stream\r\n\
+         Content-Transfer-Encoding: base64\r\n\r\n{}\r\n",
+        wrapped(&base64(eicar()))
+    );
+    let msg = message(&inner);
+    assert_hidden_from_a_byte_search(&msg);
+    assert!(has_payload(&entries(&msg)));
+}
+
+#[test]
+fn a_base64_part_with_a_byte_outside_the_alphabet_is_read_as_far_as_it_goes() {
+    let mut enc = wrapped(&base64(eicar()));
+    enc.insert(30, '!');
+    let msg = message(&format!("{}--b1--\r\n", attachment(&enc)));
+    assert_hidden_from_a_byte_search(&msg);
+    assert!(has_payload(&entries(&msg)));
+}
+
+#[cfg(feature = "uuencode")]
+#[test]
+fn a_file_uuencoded_into_the_text_is_read() {
+    fn uu(name: &str, data: &[u8]) -> String {
+        let enc = |v: u8| (if v == 0 { b'`' } else { v + 32 }) as char;
+        let mut out = format!("begin 644 {name}\n");
+        for line in data.chunks(45) {
+            out.push(enc(line.len() as u8));
+            for g in line.chunks(3) {
+                let b = [g[0], *g.get(1).unwrap_or(&0), *g.get(2).unwrap_or(&0)];
+                out.push(enc(b[0] >> 2));
+                out.push(enc((b[0] << 4 | b[1] >> 4) & 63));
+                out.push(enc((b[1] << 2 | b[2] >> 6) & 63));
+                out.push(enc(b[2] & 63));
+            }
+            out.push('\n');
+        }
+        out.push_str("`\nend\n");
+        out
+    }
+    let text = format!(
+        "--b1\r\nContent-Type: text/plain\r\n\r\nHere is the file.\n\n{}\r\n--b1--\r\n",
+        uu("e.com", eicar())
+    );
+    let msg = message(&text);
+    assert_hidden_from_a_byte_search(&msg);
+    assert!(has_payload(&entries(&msg)));
+}
+
+/// Each multipart has its own boundary, so a search of the message for each
+/// closing delimiter reads all of it once per multipart.
+#[test]
+fn messages_nested_deep_with_boundaries_of_their_own_are_read_in_linear_time() {
+    let depth = 40_000;
+    let mut msg = Vec::new();
+    for i in 0..depth {
+        msg.extend_from_slice(
+            format!(
+                "Content-Type: multipart/mixed; boundary=\"b{i}\"\r\n\r\n--b{i}\r\n\
+                 Content-Type: message/rfc822\r\n\r\n"
+            )
+            .as_bytes(),
+        );
+    }
+    for i in (0..depth).rev() {
+        msg.extend_from_slice(format!("\r\n--b{i}--\r\n").as_bytes());
+    }
+    let start = std::time::Instant::now();
+    let mut budget = Budget::new(Limits::default());
+    let _ = extract(Format::Email, &msg, &mut budget);
+    assert!(
+        start.elapsed() < std::time::Duration::from_secs(3),
+        "{:?}",
+        start.elapsed()
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/encrypted_zip.rs b/crates/exav-unpack/tests/suites/encrypted_zip.rs
index 19a4ff69..48ee47fd 100644
--- a/crates/exav-unpack/tests/suites/encrypted_zip.rs
+++ b/crates/exav-unpack/tests/suites/encrypted_zip.rs
@@ -14,7 +14,7 @@
 //! member must surface as `unsupported(encrypted=true)` (→ `PasswordProtected`),
 //! never silently clean.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 const EICAR_PREFIX: &[u8] = b"X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR";
 
@@ -198,6 +198,50 @@ fn sevenz_encrypted_detected() {
     }
 }
 
+/// A header-encrypted 7z whose header is AES and then LZMA (what 7-Zip's
+/// `-mhe=on` and sevenz-rust2 write; the one above has no compressed layer) is
+/// listed with the right password: each coder of the header's chain decodes to
+/// its own size, not to the sum of them. With a wrong password it is still an
+/// encrypted member and nothing else.
+#[cfg(feature = "decrypt")]
+#[test]
+fn sevenz_header_encrypted_over_lzma_is_listed_with_the_password() {
+    for (name, first, count, content) in [
+        // 7-Zip 25.01, `7z a -phunter2 -mhe=on` (LZMA2) and with `-m0=LZMA`.
+        ("mhe_lzma2.7z", "f0.txt", 5, b'x'),
+        ("mhe_lzma.7z", "f0.txt", 5, b'x'),
+        // sevenz-rust2 0.24.1's writer, 40 members.
+        ("mhe_sevenz_rust2.7z", "m0.txt", 40, b'A'),
+    ] {
+        let p = format!(
+            "{}/tests/fixtures/encrypted/{name}",
+            env!("CARGO_MANIFEST_DIR")
+        );
+        let blob = std::fs::read(&p).unwrap();
+        let mut budget = Budget::with_passwords(Limits::default(), vec!["hunter2".to_string()]);
+        let entries = extract(Format::SevenZip, &blob, &mut budget).unwrap();
+        assert_eq!(
+            entries.len(),
+            count,
+            "{name}: {:?}",
+            entries.iter().map(|e| &e.name).collect::<Vec<_>>()
+        );
+        assert_eq!(entries[0].name, first, "{name}");
+        assert!(
+            entries
+                .iter()
+                .all(|e| e.unsupported.is_none() && e.data == vec![content; 64]),
+            "{name}"
+        );
+        let mut budget = Budget::with_passwords(Limits::default(), vec!["wrong".to_string()]);
+        let entries = extract(Format::SevenZip, &blob, &mut budget).unwrap();
+        assert!(
+            entries.len() == 1 && entries[0].encrypted && entries[0].unsupported.is_some(),
+            "{name}"
+        );
+    }
+}
+
 /// Verify that MSI stream names are correctly decompressed by exav-unpack.
 /// Reads the PowerShell MSI, extracts all streams, and checks that:
 /// 1. Known decompressed names appear (e.g., !_Tables, !_StringPool)
diff --git a/crates/exav-unpack/tests/suites/entry_accounting.rs b/crates/exav-unpack/tests/suites/entry_accounting.rs
index 26320485..418e886a 100644
--- a/crates/exav-unpack/tests/suites/entry_accounting.rs
+++ b/crates/exav-unpack/tests/suites/entry_accounting.rs
@@ -10,7 +10,7 @@
 //! arithmetic to the shape a caller can reason about: a flat archive costs its
 //! member count, and nesting costs the members at each level and nothing more.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use std::io::Write;
 
 /// Extract with `max_members` set to `cap`, and say whether the limit fired.
diff --git a/crates/exav-unpack/tests/suites/erofs.rs b/crates/exav-unpack/tests/suites/erofs.rs
new file mode 100644
index 00000000..33fbfb65
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/erofs.rs
@@ -0,0 +1,72 @@
+//! EROFS: reading the filesystem, which stores its files where an inode says.
+//!
+//! The images are what `mkfs.erofs` writes for the tree of `tree.py` and a link
+//! (`fixtures/fs/make.sh`): with blocks of 4 KiB and of 1 KiB, with the small
+//! inodes, in chunks (and the sparse file's holes), and compressed with LZ4,
+//! which is reported and not read.
+
+use super::fs_tree::{assert_streams_alike, assert_tree, image, members, tree, walked};
+use exav_unpack::{Format, Limits, detect};
+
+#[test]
+fn an_erofs_image_is_recognised() {
+    for name in ["erofs", "erofs_chunks", "erofs_lz4"] {
+        assert_eq!(detect(&image(name)), Some(Format::Erofs), "{name}");
+    }
+}
+
+/// The tree comes out whole: files whose tail is kept after their inode, files
+/// in whole blocks, and files in chunks with holes.
+#[test]
+fn the_tree_comes_out_of_every_uncompressed_layout() {
+    for (name, sparse) in [
+        ("erofs", false),
+        ("erofs_small_blocks", false),
+        ("erofs_compact_inodes", false),
+        ("erofs_chunks", true),
+    ] {
+        let e = members(Format::Erofs, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &tree(sparse)))
+            .unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+/// A file over the buffer limit is read as it goes in every layout: whole
+/// blocks, a tail after the inode, and chunks with holes.
+#[test]
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in [
+        "erofs",
+        "erofs_small_blocks",
+        "erofs_compact_inodes",
+        "erofs_chunks",
+    ] {
+        assert_streams_alike(Format::Erofs, &image(name), 1000);
+    }
+}
+
+/// A file stored compressed is reported, not read as though it were plain, and
+/// the files that were stored as they are come out.
+#[test]
+fn a_compressed_file_is_reported_and_the_directories_are_still_read() {
+    let e = members(Format::Erofs, &image("erofs_lz4"));
+    let want = tree(false);
+    assert_eq!(e.len(), want.len(), "every file is a member");
+    for (path, data) in &want {
+        let m = e.iter().find(|x| &x.name == path).unwrap();
+        match m.unsupported {
+            None => assert_eq!(&m.data, data, "{path}"),
+            Some(why) => assert_eq!(why, "EROFS compressed file not read", "{path}"),
+        }
+    }
+    assert!(e.iter().any(|x| x.unsupported.is_some()));
+}
+
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("erofs");
+    let (e, end) = walked(Format::Erofs, &img[..1100], Limits::default());
+    assert!(e.is_empty() && end.is_err());
+    let (e, end) = walked(Format::Erofs, &img[..img.len() / 2], Limits::default());
+    assert!(end.is_err() || e.iter().any(|x| x.unsupported.is_some()));
+}
diff --git a/crates/exav-unpack/tests/suites/exfat.rs b/crates/exav-unpack/tests/suites/exfat.rs
new file mode 100644
index 00000000..ca055199
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/exfat.rs
@@ -0,0 +1,98 @@
+//! exFAT: reading the filesystem, not carving the clusters.
+//!
+//! The images are written by a kernel (`fixtures/fs/make.sh`): the tree of
+//! `tree.py`, written across the holes of deleted files so that the larger ones
+//! are chained and not in a row, and a file given a length longer than what was
+//! written to it. Clusters of 4 KiB and of 512 bytes.
+
+use super::fs_tree::{assert_streams_alike, assert_tree, image, members, tree, truncated, walked};
+use exav_unpack::{Format, Limits, detect};
+
+fn want() -> Vec<(String, Vec<u8>)> {
+    let mut want = tree(false);
+    want.push(truncated());
+    want
+}
+
+#[test]
+fn an_exfat_volume_is_recognised() {
+    assert_eq!(detect(&image("exfat")), Some(Format::Exfat));
+}
+
+/// The tree comes out whole, the files that are chained as well as those in a
+/// row, and the file that was lengthened reads as zeros past what was written,
+/// though the clusters it was given held other files' bytes before.
+#[test]
+fn the_tree_comes_out_of_a_volume_a_kernel_wrote() {
+    for name in ["exfat", "exfat_small_clusters"] {
+        let e = members(Format::Exfat, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &want())).unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+/// A file over the buffer limit is read as it goes: the chained ones, those in
+/// a row, and the one lengthened past what was written.
+#[test]
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in ["exfat", "exfat_small_clusters"] {
+        assert_streams_alike(Format::Exfat, &image(name), 1000);
+    }
+}
+
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("exfat");
+    let (_, end) = walked(Format::Exfat, &img[..2048], Limits::default());
+    assert!(end.unwrap_err().is_corrupt());
+    // Cut where the files are, the volume opens and the files are partial.
+    let heap = u32::from_le_bytes(img[88..92].try_into().unwrap()) as usize * 512;
+    let (e, _) = walked(Format::Exfat, &img[..heap + 200 * 1024], Limits::default());
+    assert!(e.iter().any(|x| x.unsupported.is_some()));
+}
+
+/// The place of the file entry of the set named `name`.
+fn set_of(img: &[u8], name: &str) -> usize {
+    let units: Vec<u8> = name.encode_utf16().flat_map(u16::to_le_bytes).collect();
+    (0..img.len().saturating_sub(96))
+        .step_by(32)
+        .find(|&p| {
+            img[p] == 0x85
+                && img[p + 32] == 0xC0
+                && img[p + 64] == 0xC1
+                && usize::from(img[p + 35]) == name.len()
+                && img[p + 66..].starts_with(&units)
+        })
+        .unwrap_or_else(|| panic!("no entry {name}"))
+}
+
+/// A folder that names the folder it is in is walked once.
+#[test]
+fn a_folder_that_names_the_folder_it_is_in_is_walked_once() {
+    let mut img = image("exfat");
+    let a = set_of(&img, "a");
+    let b = set_of(&img, "b");
+    let first: [u8; 4] = img[a + 32 + 20..a + 32 + 24].try_into().unwrap();
+    img[b + 32 + 20..b + 32 + 24].copy_from_slice(&first);
+    let e = members(Format::Exfat, &img);
+    let mut want = want();
+    want.retain(|(p, _)| p != "a/b/c/deep.bin");
+    assert_tree(&e, &want);
+}
+
+/// A file that is no longer said to be in a row is followed in the table, which
+/// holds no chain for it: it is reported with its first cluster.
+#[test]
+fn a_chain_the_table_does_not_hold_is_a_file_reported_with_what_it_has() {
+    let mut img = image("exfat");
+    let at = set_of(&img, "frag.bin") + 32;
+    assert_eq!(img[at + 1] & 2, 2, "the fixture's file is in a row");
+    img[at + 1] &= !2;
+    let (e, end) = walked(Format::Exfat, &img, Limits::default());
+    end.unwrap();
+    let f = e.iter().find(|x| x.name == "frag.bin").unwrap();
+    assert_eq!(
+        f.unsupported,
+        Some("file could not be read from the volume")
+    );
+    assert_eq!(f.data.len(), 4096);
+}
diff --git a/crates/exav-unpack/tests/suites/ext.rs b/crates/exav-unpack/tests/suites/ext.rs
index a6d05eb3..81bb7c78 100644
--- a/crates/exav-unpack/tests/suites/ext.rs
+++ b/crates/exav-unpack/tests/suites/ext.rs
@@ -36,13 +36,17 @@
 //! ```
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use super::fs_tree::{
+    assert_streams_alike, assert_tree, came, extras, image, members as walk_members, pat, tree,
+    walked,
+};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 /// `sha256sum` of the ZIP that was written in, which is what following the
 /// extent tree has to reproduce.
 const PAYLOAD: &str = "d61da8b0c3cd1d5ffa812601aae787c81a7424850c4dca15c27e593f8f92fcc8";
 
-fn fixture() -> Vec<u8> {
+pub(super) fn fixture() -> Vec<u8> {
     let p = format!(
         "{}/tests/fixtures/ext/fragmented.img.gz",
         env!("CARGO_MANIFEST_DIR")
@@ -158,39 +162,179 @@ fn a_corrupt_filesystem_is_reported_not_shrugged_off() {
     for b in &mut img[2048..8192] {
         *b = 0xFF;
     }
-    let e = members(&img);
-    assert!(
-        e.iter().any(|x| x.unsupported.is_some()),
-        "an image that cannot be walked must say so, got {:?}",
-        e.iter()
-            .map(|x| (&x.name, x.unsupported))
-            .collect::<Vec<_>>()
-    );
+    let (e, end) = walked(Format::Ext, &img, Limits::default());
+    assert!(e.is_empty());
+    assert!(end.unwrap_err().is_corrupt());
 }
 
+/// A file over the buffer limit is read as it goes, and comes out as it does
+/// held, in every layout of the filesystem.
 #[test]
-fn an_image_past_the_buffer_budget_is_reported_not_skipped() {
-    // The reader owns its bytes, so the image is copied once. An image too
-    // large to copy is a gap the operator must be able to see.
-    let img = fixture();
-    let mut limits = Limits::default();
-    limits.max_buffer_bytes = 1024;
-    let mut b = Budget::new(limits);
-    let mut out = Vec::new();
-    let _ = extract_each(
-        Format::Ext,
-        &img,
-        &mut b,
-        &mut |e: Entry, _: &mut Budget| {
-            out.push(e);
-            None::<()>
-        },
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in [
+        "ext4",
+        "ext2_blockmap",
+        "ext3",
+        "ext4_metabg",
+        "ext4_bigalloc",
+    ] {
+        assert_streams_alike(Format::Ext, &image(name), 8192);
+    }
+    let (e, end) = came(Format::Ext, &image("ext4"), 8192);
+    end.unwrap();
+    let by = |n: &str| e.iter().find(|x| x.name == n).unwrap();
+    assert!(by("frag.bin").streamed);
+    assert_eq!(by("frag.bin").data.len(), 100000);
+    assert!(!by("big4k.bin").streamed);
+    assert!(!by("many/file_299.dat").streamed);
+}
+
+/// The same tree comes out of every layout of the filesystem: extents, block
+/// maps with their three levels of indirection, data in the inode, descriptors
+/// in meta block groups, and clusters of several blocks.
+#[test]
+fn every_layout_of_the_filesystem_reads_the_same_tree() {
+    for name in [
+        "ext4",
+        "ext2_blockmap",
+        "ext3",
+        "ext4_inline",
+        "ext4_metabg",
+        "ext4_bigalloc",
+    ] {
+        let e = walk_members(Format::Ext, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &tree(true)))
+            .unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+/// A volume a kernel wrote: preallocated space reads as zeros, a punched hole
+/// reads as zeros, and a file written across the holes of deleted ones comes
+/// back whole.
+#[test]
+fn a_volume_a_kernel_wrote_reads_as_the_kernel_shows_it() {
+    let mut want = tree(false);
+    want.extend(extras());
+    let e = walk_members(Format::Ext, &image("ext4_kernel"));
+    assert_tree(&e, &want);
+}
+
+/// The place of inode `ino` in `img`, an ext4 volume of 4 KiB blocks.
+fn inode_at(img: &[u8], ino: usize) -> usize {
+    let le32 = |at: usize| u32::from_le_bytes(img[at..at + 4].try_into().unwrap()) as usize;
+    let (ipg, size) = (
+        le32(1024 + 40),
+        u16::from_le_bytes([img[1024 + 88], img[1024 + 89]]),
     );
-    assert!(
-        out.iter().any(|x| x.unsupported.is_some()),
-        "an image over the budget must be reported, got {:?}",
-        out.iter()
-            .map(|x| (&x.name, x.unsupported))
-            .collect::<Vec<_>>()
+    let (group, slot) = ((ino - 1) / ipg, (ino - 1) % ipg);
+    // The descriptors start in block 1 and are 64 bytes each with 64bit.
+    let desc = 4096 + group * 64;
+    le32(desc + 8) * 4096 + slot * usize::from(size)
+}
+
+/// The inode number a name has in a directory block of `img`.
+fn ino_of(img: &[u8], name: &str) -> (usize, usize) {
+    // An entry: inode, length, name length, type, name.
+    let entry = |p: usize| {
+        p >= 8 && {
+            let rec = usize::from(u16::from_le_bytes([img[p - 4], img[p - 3]]));
+            img[p - 2] == name.len() as u8
+                && (1..=7).contains(&img[p - 1])
+                && rec % 4 == 0
+                && rec >= 8 + name.len()
+        }
+    };
+    let at = img
+        .windows(name.len())
+        .enumerate()
+        .position(|(p, w)| w == name.as_bytes() && entry(p))
+        .unwrap_or_else(|| panic!("no entry {name}"));
+    let ino = u32::from_le_bytes(img[at - 8..at - 4].try_into().unwrap()) as usize;
+    (ino, at - 8)
+}
+
+/// A directory that names one above it is walked once, not forever.
+#[test]
+fn a_directory_that_names_its_ancestor_is_walked_once() {
+    let mut img = image("ext4");
+    let (_, at) = ino_of(&img, "emptydir");
+    img[at..at + 4].copy_from_slice(&2u32.to_le_bytes());
+    let e = walk_members(Format::Ext, &img);
+    assert_tree(&e, &tree(true));
+}
+
+/// A file whose extent tree is gone is reported, and the others come out.
+#[test]
+fn a_file_with_a_damaged_extent_tree_is_reported_and_the_others_are_read() {
+    let mut img = image("ext4");
+    let (ino, _) = ino_of(&img, "big4k.bin");
+    // The extent header's magic, 40 bytes into the inode.
+    let at = inode_at(&img, ino) + 40;
+    assert_eq!(&img[at..at + 2], &[0x0A, 0xF3]);
+    img[at] = 0;
+    let (e, end) = walked(Format::Ext, &img, Limits::default());
+    end.unwrap();
+    let by = |n: &str| e.iter().find(|x| x.name == n).unwrap();
+    assert_eq!(
+        by("big4k.bin").unsupported,
+        Some("file could not be read from the volume")
     );
+    assert_eq!(by("p1.bin").data, pat(4, 1025));
+    assert_eq!(by("many/file_299.dat").data, pat(1299, 299 % 97));
+}
+
+/// A file in an encrypted directory holds ciphertext; it is reported as
+/// encrypted.
+#[test]
+fn an_encrypted_file_is_reported_as_encrypted() {
+    let mut img = image("ext4");
+    let (ino, _) = ino_of(&img, "tiny.txt");
+    // `i_flags`, 32 bytes into the inode: encrypted.
+    let at = inode_at(&img, ino) + 32;
+    let flags = u32::from_le_bytes(img[at..at + 4].try_into().unwrap()) | 0x800;
+    img[at..at + 4].copy_from_slice(&flags.to_le_bytes());
+    let e = walk_members(Format::Ext, &img);
+    let tiny = e.iter().find(|x| x.name == "tiny.txt").unwrap();
+    assert!(tiny.encrypted && tiny.unsupported.is_some() && tiny.data.is_empty());
+}
+
+/// What the image records of a file besides its bytes comes with it.
+#[test]
+fn a_file_comes_with_its_mode() {
+    let e = walk_members(Format::Ext, &image("ext4"));
+    let tiny = e.iter().find(|x| x.name == "tiny.txt").unwrap();
+    assert_eq!(tiny.mode.map(|m| m & 0o170000), Some(0o100000));
+    assert!(tiny.mtime.is_some());
+}
+
+/// An image cut short is a volume whose structures are not all there: that is
+/// said, not read as a smaller volume.
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("ext4");
+    let (_, end) = walked(Format::Ext, &img[..40 * 1024], Limits::default());
+    assert!(end.unwrap_err().is_corrupt());
+}
+
+/// The walk stops at the member limit, as every container does, and the
+/// entry past it is not lost without a word: the root with its folders removed
+/// holds 10 files.
+#[test]
+fn a_volume_with_more_entries_than_the_limit_is_walked_to_it_and_stops() {
+    let mut img = image("ext4");
+    for dir in ["lost+found", "a", "many", "emptydir"] {
+        let (_, at) = ino_of(&img, dir);
+        img[at..at + 4].fill(0);
+    }
+    let run = |max: u64| {
+        let mut limits = Limits::default();
+        limits.max_members = max;
+        walked(Format::Ext, &img, limits)
+    };
+    let (e, end) = run(10);
+    end.unwrap();
+    assert_eq!(e.len(), 10);
+    let (e, end) = run(9);
+    assert!(!end.unwrap_err().is_corrupt());
+    assert_eq!(e.len(), 9);
 }
diff --git a/crates/exav-unpack/tests/suites/extreme.rs b/crates/exav-unpack/tests/suites/extreme.rs
index a7b451fd..e0d683ec 100644
--- a/crates/exav-unpack/tests/suites/extreme.rs
+++ b/crates/exav-unpack/tests/suites/extreme.rs
@@ -5,7 +5,8 @@
 //! checks, which `walk` turns into a "decoder panicked" error, and wraps in the
 //! WebAssembly builds, where it can defeat the bounds check next to it. Each
 //! test here takes a valid container, sets one field at a time to a value near
-//! the top of its range, and requires that no run ends in a panic.
+//! the top of its range, and requires that no run ends in a panic or fails to
+//! end at all.
 
 use super::extract_each;
 use exav_unpack::{Budget, Entry, Format, Limits};
@@ -28,23 +29,83 @@ const POSITION_OFFSETS: [usize; 4] = [0, 4, 8, 16];
 /// What makes a changed input pass its own checks again.
 type Fixup = dyn Fn(&mut [u8]);
 
-/// Whether the walk of `blob` ended in a panic inside the decoder.
-fn panicked(fmt: Format, blob: &[u8]) -> bool {
-    let mut limits = Limits::default();
-    limits.max_buffer_bytes = 8 * 1024 * 1024;
-    limits.max_extracted_bytes = 16 * 1024 * 1024;
-    let mut budget = Budget::new(limits);
-    match extract_each(fmt, blob, &mut budget, &mut |_: Entry, _: &mut Budget| {
-        None::<()>
-    }) {
-        Err(e) => e.reason.contains("panicked"),
-        Ok(_) => false,
+/// How long a walk of one of these small inputs may take. A real one is
+/// milliseconds; one that wraps a position and loops is not stopped by the
+/// budgets, which count bytes and members, not steps.
+const HANG_AFTER: std::time::Duration = std::time::Duration::from_secs(10);
+
+/// How the walk of `blob` went wrong: a panic inside the decoder, or no end
+/// within [`HANG_AFTER`]. `None` when it ended, however it ended.
+fn broke(fmt: Format, blob: &[u8]) -> Option<&'static str> {
+    let blob = blob.to_vec();
+    bounded(HANG_AFTER, move || {
+        let mut limits = Limits::default();
+        limits.max_buffer_bytes = 8 * 1024 * 1024;
+        limits.max_extracted_bytes = 16 * 1024 * 1024;
+        let mut budget = Budget::new(limits);
+        matches!(
+            extract_each(fmt, &blob, &mut budget, &mut |_: Entry, _: &mut Budget| {
+                None::<()>
+            }),
+            Err(e) if e.reason.contains("panicked")
+        )
+    })
+}
+
+/// Runs `walk`, which says whether the decoder panicked: `Some("panic")` if it
+/// did, `Some("hang")` if it did not end within `limit`, `None` otherwise.
+///
+/// A thread cannot be stopped: a walk that never ends is left running, and the
+/// test reports it. The WebAssembly build has no threads, and can only say
+/// after the fact that a walk took too long.
+fn bounded(
+    limit: std::time::Duration,
+    walk: impl FnOnce() -> bool + Send + 'static,
+) -> Option<&'static str> {
+    #[cfg(not(target_family = "wasm"))]
+    {
+        let (tx, rx) = std::sync::mpsc::channel();
+        std::thread::spawn(move || {
+            let _ = tx.send(walk());
+        });
+        match rx.recv_timeout(limit) {
+            Ok(true) => Some("panic"),
+            Ok(false) => None,
+            Err(_) => Some("hang"),
+        }
     }
+    #[cfg(target_family = "wasm")]
+    {
+        let start = std::time::Instant::now();
+        if walk() {
+            Some("panic")
+        } else if start.elapsed() > limit {
+            Some("hang")
+        } else {
+            None
+        }
+    }
+}
+
+/// The sweeps are only worth their name if a walk that never ends is seen as
+/// one, and a panic is not taken for it.
+#[test]
+fn a_walk_that_does_not_end_is_a_hang_and_a_panic_is_a_panic() {
+    let short = std::time::Duration::from_millis(100);
+    assert_eq!(bounded(short, || false), None);
+    assert_eq!(bounded(short, || true), Some("panic"));
+    assert_eq!(
+        bounded(short, || {
+            std::thread::sleep(std::time::Duration::from_secs(2));
+            false
+        }),
+        Some("hang")
+    );
 }
 
 /// Sets every aligned 4- and 8-byte field, and every byte, inside `regions` to
 /// the values above, one at a time, and returns the changes that panicked the
-/// decoder as `"offset width value"`.
+/// decoder or kept it from ending as `"offset width value (how)"`.
 pub fn sweep(fmt: Format, blob: &[u8], regions: &[Range<usize>]) -> Vec<String> {
     sweep_fixing(fmt, blob, regions, None)
 }
@@ -63,7 +124,11 @@ pub fn sweep_fixing(
     regions: &[Range<usize>],
     fix: Option<&Fixup>,
 ) -> Vec<String> {
-    assert!(!panicked(fmt, blob), "the unmodified input already panics");
+    assert_eq!(
+        broke(fmt, blob),
+        None,
+        "the unmodified input already breaks"
+    );
     let mut work = blob.to_vec();
     let mut bad = Vec::new();
     let mut try_set = |work: &mut Vec<u8>, at: usize, bytes: &[u8], what: String| {
@@ -72,15 +137,15 @@ pub fn sweep_fixing(
             let mut trial = work.clone();
             trial[at..at + bytes.len()].copy_from_slice(bytes);
             fix(&mut trial);
-            if panicked(fmt, &trial) {
-                bad.push(what);
+            if let Some(how) = broke(fmt, &trial) {
+                bad.push(format!("{what} ({how})"));
             }
             return;
         }
         let saved = work[at..at + bytes.len()].to_vec();
         work[at..at + bytes.len()].copy_from_slice(bytes);
-        if panicked(fmt, work) {
-            bad.push(what);
+        if let Some(how) = broke(fmt, work) {
+            bad.push(format!("{what} ({how})"));
         }
         work[at..at + bytes.len()].copy_from_slice(&saved);
     };
@@ -127,7 +192,7 @@ pub fn sweep_fixing(
 
 /// The first `len` bytes of up to `cap` evenly spread 512-byte sectors that are
 /// not all zero: where a container keeps its headers and tables.
-fn sectors(blob: &[u8], cap: usize, len: usize) -> Vec<Range<usize>> {
+pub fn sectors(blob: &[u8], cap: usize, len: usize) -> Vec<Range<usize>> {
     let live: Vec<usize> = (0..blob.len() / 512)
         .map(|i| i * 512)
         .filter(|&s| blob[s..s + 512].iter().any(|&b| b != 0))
@@ -246,6 +311,12 @@ fn other_containers_fields_at_their_extremes() {
         (Format::SevenZip, "7z/aes_lzma2.7z"),
         (Format::Zip, "encrypted/zip_aes256_deflate.zip"),
         (Format::Xz, "xz/simple.xz"),
+        (Format::Xz, "xz/multi.xz"),
+        (Format::Lzip, "lzip_simple.lz"),
+        (Format::Zip, "zip/dd_python_stored.zip"),
+        (Format::Zip, "zip/eicar_deflate64.zip"),
+        (Format::SevenZip, "7z/lzma2_solid.7z"),
+        (Format::Binhex, "binhex/eicar.hqx.xor"),
         (Format::Lzw, "lzw/repetitive.b16.Z"),
         (Format::IshieldZ, "ishieldz/demo.z"),
         (Format::Hwp3, "hwp3/tika_testHWP_3.0.hwp"),
@@ -370,7 +441,7 @@ fn lz4_with_a_skippable_frame_fields_at_their_extremes() {
 pub fn none(bad: Vec<String>) {
     assert!(
         bad.is_empty(),
-        "{} field values panic the decoder, first: {:?}",
+        "{} field values panic or hang the decoder, first: {:?}",
         bad.len(),
         &bad[..bad.len().min(12)]
     );
diff --git a/crates/exav-unpack/tests/suites/fat.rs b/crates/exav-unpack/tests/suites/fat.rs
index 703285ec..4e162592 100644
--- a/crates/exav-unpack/tests/suites/fat.rs
+++ b/crates/exav-unpack/tests/suites/fat.rs
@@ -24,7 +24,10 @@
 //! ```
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use super::fs_tree::{
+    assert_streams_alike, assert_tree, image, members as walk_members, tree, walked as fs_walked,
+};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 /// `sha256sum` of the ZIP that was copied in, which is what following the
 /// cluster chain has to reproduce.
@@ -128,16 +131,189 @@ fn a_corrupt_filesystem_is_reported_not_shrugged_off() {
     // The boot sector still says FAT, so the files are there and a real mount
     // would read them; failing to must not read as clean.
     let mut img = fixture();
-    // Scribble over the file allocation table itself.
-    for b in &mut img[512..2048] {
-        *b = 0xFF;
-    }
+    // Scribble over the file allocation table itself: the first copy, which
+    // begins after the reserved sectors.
+    let sector = usize::from(u16::from_le_bytes([img[11], img[12]]));
+    let start = usize::from(u16::from_le_bytes([img[14], img[15]])) * sector;
+    let len = usize::from(u16::from_le_bytes([img[22], img[23]])) * sector;
+    img[start..start + len].fill(0xFF);
     let e = members(&img);
     assert!(
-        e.is_empty() || e.iter().any(|x| x.unsupported.is_some()),
-        "a filesystem that cannot be walked must be reported, got {:?}",
+        e.iter().any(|x| x.unsupported.is_some()),
+        "a file whose chain is gone must be reported, got {:?}",
         e.iter()
             .map(|x| (&x.name, x.unsupported))
             .collect::<Vec<_>>()
     );
 }
+
+/// The fixture with the first cluster of the root directory's entry `name`
+/// (8.3, padded to 11 bytes) set to `cluster`.
+fn with_first_cluster(name: &[u8; 11], cluster: u16) -> Vec<u8> {
+    let mut img = fixture();
+    let at = img
+        .windows(11)
+        .position(|w| w == name)
+        .unwrap_or_else(|| panic!("no entry {:?}", String::from_utf8_lossy(name)));
+    img[at + 26..at + 28].copy_from_slice(&cluster.to_le_bytes());
+    img
+}
+
+fn walked(blob: &[u8]) -> (Vec<Entry>, Result<Option<()>, exav_unpack::LimitHit>) {
+    let mut out = Vec::new();
+    let mut b = Budget::new(Limits::default());
+    let end = extract_each(
+        Format::Fat,
+        blob,
+        &mut b,
+        &mut |e: Entry, _: &mut Budget| {
+            out.push(e);
+            None::<()>
+        },
+    );
+    (out, end)
+}
+
+/// Clusters are numbered from 2, and a directory that names cluster 1 has no
+/// place to be read from. The rest of the volume is walked, and the walk ends
+/// as one over a damaged volume.
+#[test]
+fn a_directory_at_cluster_1_ends_the_walk_as_damaged_after_the_rest_of_the_volume() {
+    let (e, end) = walked(&with_first_cluster(b"SUB        ", 1));
+    assert!(end.unwrap_err().is_corrupt());
+    let names: Vec<&str> = e.iter().map(|x| x.name.as_str()).collect();
+    assert!(
+        names.contains(&"a.bin") && names.contains(&"c.bin"),
+        "{names:?}"
+    );
+    assert!(!names.iter().any(|n| n.starts_with("sub/")), "{names:?}");
+}
+
+/// The same for a file: the others come out, it is reported.
+#[test]
+fn a_file_at_cluster_1_is_reported_and_the_other_files_come_out() {
+    let (e, end) = walked(&with_first_cluster(b"A       BIN", 1));
+    end.unwrap_or_else(|h| panic!("the volume was ended: {h:?}"));
+    let by = |n: &str| e.iter().find(|x| x.name == n);
+    assert!(by("a.bin").is_some_and(|x| x.unsupported.is_some()));
+    assert!(by("c.bin").is_some_and(|x| x.unsupported.is_none()));
+    assert_eq!(
+        by("sub/p.zip").map(|x| sha256_hex(&x.data)).as_deref(),
+        Some(PAYLOAD)
+    );
+}
+
+/// The same tree comes out of FAT12, FAT16 and FAT32, long names included, and
+/// of a volume a kernel wrote, which keeps the case of a short name in two flags
+/// where the other images have a long name. The deleted entries (pads written
+/// first, to fragment the files) and the volume label are not files.
+#[test]
+fn every_kind_of_fat_reads_the_same_tree() {
+    for name in ["fat12", "fat16", "fat32", "fat16_kernel"] {
+        let e = walk_members(Format::Fat, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &tree(false)))
+            .unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+/// A file over the buffer limit is read as it goes, in every kind of FAT, a
+/// fragmented one included.
+#[test]
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in ["fat12", "fat16", "fat32", "fat16_kernel"] {
+        assert_streams_alike(Format::Fat, &image(name), 1000);
+    }
+}
+
+/// The place of the 32-byte directory entry with the short name `name`.
+fn entry_of(img: &[u8], name: &[u8; 11]) -> usize {
+    img.windows(12)
+        .position(|w| w[..11] == name[..] && w[11] & 0x10 != 0)
+        .unwrap_or_else(|| panic!("no folder {:?}", String::from_utf8_lossy(name)))
+}
+
+/// A folder that names a folder it is in is walked once.
+#[test]
+fn a_folder_that_names_the_folder_it_is_in_is_walked_once() {
+    let mut img = image("fat16");
+    let a = entry_of(&img, b"A          ");
+    let b = entry_of(&img, b"B          ");
+    let first = [img[a + 26], img[a + 27]];
+    img[b + 26..b + 28].copy_from_slice(&first);
+    let e = walk_members(Format::Fat, &img);
+    let mut want = tree(false);
+    want.retain(|(p, _)| p != "a/b/c/deep.bin");
+    assert_tree(&e, &want);
+}
+
+/// A file with a chain that ends before its size does is reported with what
+/// there is.
+#[test]
+fn a_chain_that_ends_early_is_a_file_reported_with_what_it_holds() {
+    let mut img = image("fat16");
+    // The table begins after the reserved sectors; cluster 3 is the second
+    // entry of a file in the first run, and an end of chain makes it the last.
+    let e = walk_members(Format::Fat, &img);
+    assert!(e.iter().all(|x| x.unsupported.is_none()));
+    let reserved = usize::from(u16::from_le_bytes([img[14], img[15]]));
+    let table = reserved * usize::from(u16::from_le_bytes([img[11], img[12]]));
+    let frag = entry_of_file(&img, b"FRAG    BIN");
+    let first = usize::from(u16::from_le_bytes([img[frag + 26], img[frag + 27]]));
+    img[table + first * 2..table + first * 2 + 2].copy_from_slice(&0xFFFFu16.to_le_bytes());
+    let (e, end) = walked(&img);
+    end.unwrap();
+    let f = e.iter().find(|x| x.name == "frag.bin").unwrap();
+    assert_eq!(
+        f.unsupported,
+        Some("file could not be read from the volume")
+    );
+    assert!(!f.data.is_empty() && f.data.len() < 100000);
+}
+
+fn entry_of_file(img: &[u8], name: &[u8; 11]) -> usize {
+    img.windows(12)
+        .position(|w| w[..11] == name[..] && w[11] & 0x10 == 0)
+        .unwrap_or_else(|| panic!("no file {:?}", String::from_utf8_lossy(name)))
+}
+
+/// Entries past the member limit are not lost without a word.
+#[test]
+fn a_directory_longer_than_the_member_limit_stops_the_walk() {
+    let img = image("fat16");
+    // The root holds 10 files and 3 folders, `many` 300 files.
+    let run = |max: u64| {
+        let mut limits = Limits::default();
+        limits.max_members = max;
+        fs_walked(Format::Fat, &img, limits)
+    };
+    let (e, end) = run(1000);
+    end.unwrap();
+    assert_eq!(e.len(), 310);
+    let (e, end) = run(100);
+    assert!(!end.unwrap_err().is_corrupt());
+    assert!(!e.is_empty() && e.len() <= 100);
+}
+
+/// An image cut short is a volume whose structures are not all there.
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("fat16");
+    let (_, end) = fs_walked(Format::Fat, &img[..2048], Limits::default());
+    assert!(end.unwrap_err().is_corrupt());
+    // Cut where the files are, the volume opens and the files are partial.
+    let (e, end) = fs_walked(Format::Fat, &img[..200 * 1024], Limits::default());
+    let _ = end;
+    assert!(e.iter().any(|x| x.unsupported.is_some()));
+}
+
+/// What a file records of when it was written is kept, as the wall-clock time
+/// a FAT volume records it as.
+#[test]
+fn a_file_comes_with_the_time_it_was_written() {
+    let e = walk_members(Format::Fat, &image("fat16_kernel"));
+    let tiny = e.iter().find(|x| x.name == "tiny.txt").unwrap();
+    assert!(matches!(
+        tiny.mtime,
+        Some(exav_unpack::Mtime::Local { year: 2026, .. })
+    ));
+}
diff --git a/crates/exav-unpack/tests/suites/fs_tree.rs b/crates/exav-unpack/tests/suites/fs_tree.rs
new file mode 100644
index 00000000..044f598d
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/fs_tree.rs
@@ -0,0 +1,224 @@
+//! The tree every filesystem fixture holds (`fixtures/fs/tree.py`, built into
+//! images by `fixtures/fs/make.sh`), and the check of a walk against it.
+//!
+//! The bytes of a file are made by `pat`, the same function `tree.py` has, so
+//! a walk is compared with what was written and not with a list of hashes.
+
+use std::collections::HashMap;
+
+use exav_unpack::{Budget, Entry, Format, LimitHit, Limits, Member, walk};
+
+use super::extract_each;
+
+/// `n` bytes for the file numbered `seed`: runs of 64 that are noise and runs
+/// of 64 that are text, so a compressor has something to do and something not
+/// to.
+pub(super) fn pat(seed: u32, n: usize) -> Vec<u8> {
+    (0..n)
+        .map(|i| {
+            if (i / 64) % 2 == 0 {
+                (((i as u32).wrapping_mul(2654435761)).wrapping_add(seed.wrapping_mul(40503)) >> 13)
+                    as u8
+            } else {
+                b"abcdefghij0123456789"[(i + seed as usize) % 20]
+            }
+        })
+        .collect()
+}
+
+/// An image of `fixtures/fs`, gunzipped.
+pub(super) fn image(name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/fs/{name}.img.gz",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    let raw = exav_unpack::read_fixture(&p).unwrap_or_else(|e| panic!("read {p}: {e}"));
+    let mut out = Vec::new();
+    std::io::Read::read_to_end(&mut flate2::read::GzDecoder::new(&raw[..]), &mut out)
+        .unwrap_or_else(|e| panic!("gunzip {p}: {e}"));
+    out
+}
+
+/// The files of `tree.py`, with `sparse.bin` where asked.
+pub(super) fn tree(sparse: bool) -> Vec<(String, Vec<u8>)> {
+    let files: [(&str, usize); 10] = [
+        ("empty", 0),
+        ("tiny.txt", 10),
+        ("sixty.bin", 60),
+        ("sixtyone.bin", 61),
+        ("p1.bin", 1025),
+        ("big4k.bin", 4096),
+        ("a/b/c/deep.bin", 5000),
+        ("caf\u{e9} \u{65e5}\u{672c}.txt", 300),
+        ("long name with spaces and a long extension.markdown", 700),
+        ("frag.bin", 100000),
+    ];
+    let mut out: Vec<(String, Vec<u8>)> = files
+        .iter()
+        .enumerate()
+        .map(|(seed, (path, size))| ((*path).to_string(), pat(seed as u32, *size)))
+        .collect();
+    for i in 0..300u32 {
+        out.push((
+            format!("many/file_{i:03}.dat"),
+            pat(1000 + i, (i % 97) as usize),
+        ));
+    }
+    if sparse {
+        let mut data = vec![0u8; (70 << 20) + 4];
+        for (k, (at, n)) in [(0usize, 3000usize), (30 << 20, 7000), (70 << 20, 4)]
+            .into_iter()
+            .enumerate()
+        {
+            data[at..at + n].copy_from_slice(&pat(2000 + k as u32, n));
+        }
+        out.push(("sparse.bin".to_string(), data));
+    }
+    out
+}
+
+/// The files `fixtures/fs/extras.py` makes in a mounted volume.
+pub(super) fn extras() -> Vec<(String, Vec<u8>)> {
+    let mut prealloc = vec![0u8; 1 << 20];
+    prealloc[300000..305000].copy_from_slice(&pat(3000, 5000));
+    let mut holey = pat(3001, 1 << 20);
+    holey[100000..400000].fill(0);
+    let mut trunc = b"abc".to_vec();
+    trunc.resize(100000, 0);
+    let mut out = vec![
+        ("k/prealloc.bin".to_string(), prealloc),
+        ("k/holey.bin".to_string(), holey),
+        ("k/trunc.bin".to_string(), trunc),
+    ];
+    for i in (0..300usize).filter(|i| i % 3 != 0) {
+        out.push((format!("k/d/f{i}"), vec![b'x'; i]));
+    }
+    out
+}
+
+/// The file `extras.py --trunc-only` makes: 3 bytes written and the length set
+/// to 100000.
+pub(super) fn truncated() -> (String, Vec<u8>) {
+    let mut data = b"abc".to_vec();
+    data.resize(100000, 0);
+    ("k/trunc.bin".to_string(), data)
+}
+
+/// What a walk of `img` gave, and how it ended.
+pub(super) fn walked(
+    fmt: Format,
+    img: &[u8],
+    limits: Limits,
+) -> (Vec<Entry>, Result<Option<()>, LimitHit>) {
+    let mut out = Vec::new();
+    let mut budget = Budget::new(limits);
+    let end = extract_each(fmt, img, &mut budget, &mut |e: Entry, _: &mut Budget| {
+        out.push(e);
+        None::<()>
+    });
+    (out, end)
+}
+
+/// A member of a walk as it came: whether it was read as it goes, its bytes,
+/// the error that ended that read, and what the walk reported of it.
+pub(super) struct Came {
+    pub(super) name: String,
+    pub(super) streamed: bool,
+    pub(super) data: Vec<u8>,
+    pub(super) read_error: Option<String>,
+    pub(super) unsupported: Option<&'static str>,
+}
+
+/// A walk of `img` under a buffer limit of `cap` bytes, which a file past it is
+/// read as it goes under.
+pub(super) fn came(fmt: Format, img: &[u8], cap: u64) -> (Vec<Came>, Result<Option<()>, LimitHit>) {
+    let mut out = Vec::new();
+    let mut limits = Limits::default();
+    limits.max_buffer_bytes = cap;
+    let mut budget = Budget::new(limits);
+    let end = walk(fmt, &img, &mut budget, &mut |meta, content, _| {
+        let mut read_error = None;
+        let (streamed, data) = match content {
+            None => (false, Vec::new()),
+            Some(Member::Bytes(bytes)) => (false, bytes),
+            Some(Member::Stream(reader)) => {
+                let mut bytes = Vec::new();
+                read_error = reader.read_to_end(&mut bytes).err().map(|e| e.to_string());
+                (true, bytes)
+            }
+        };
+        out.push(Came {
+            name: meta.name.clone(),
+            streamed,
+            data,
+            read_error,
+            unsupported: meta.unsupported,
+        });
+        None::<()>
+    });
+    (out, end)
+}
+
+/// A walk of `img` under a buffer limit of `cap` gives what a walk that holds
+/// every file gives, the files past `cap` read as they go and the others
+/// held.
+pub(super) fn assert_streams_alike(fmt: Format, img: &[u8], cap: u64) {
+    let held = members(fmt, img);
+    let (came, end) = came(fmt, img, cap);
+    end.unwrap_or_else(|h| panic!("{fmt:?} ended: {h:?}"));
+    assert_eq!(came.len(), held.len(), "{fmt:?}: the same members");
+    for (c, h) in came.iter().zip(&held) {
+        assert_eq!(c.name, h.name, "{fmt:?}");
+        assert_eq!(c.data, h.data, "{fmt:?}: {}", c.name);
+        assert_eq!(c.unsupported, h.unsupported, "{fmt:?}: {}", c.name);
+        assert_eq!(c.read_error, None, "{fmt:?}: {}", c.name);
+        assert_eq!(c.streamed, c.data.len() as u64 > cap, "{fmt:?}: {}", c.name);
+    }
+    assert!(
+        came.iter().any(|c| c.streamed),
+        "{fmt:?}: nothing was past {cap}"
+    );
+}
+
+/// A walk of `img` that must end cleanly.
+pub(super) fn members(fmt: Format, img: &[u8]) -> Vec<Entry> {
+    let (e, end) = walked(fmt, img, Limits::default());
+    end.unwrap_or_else(|h| panic!("{fmt:?} ended: {h:?}"));
+    e
+}
+
+/// The walk has every file of `want` with its bytes, and nothing else, and
+/// reports nothing unreadable.
+pub(super) fn assert_tree(entries: &[Entry], want: &[(String, Vec<u8>)]) {
+    let bad: Vec<_> = entries
+        .iter()
+        .filter(|e| e.unsupported.is_some())
+        .map(|e| (&e.name, e.unsupported))
+        .collect();
+    assert!(bad.is_empty(), "reported: {bad:?}");
+    let mut got: HashMap<&str, &[u8]> = HashMap::new();
+    for e in entries {
+        assert!(
+            got.insert(&e.name, &e.data).is_none(),
+            "{} came out twice",
+            e.name
+        );
+    }
+    let mut missing = Vec::new();
+    let mut differ = Vec::new();
+    for (path, data) in want {
+        match got.get(path.as_str()) {
+            None => missing.push(path.as_str()),
+            Some(d) if d != &data.as_slice() => differ.push(path.as_str()),
+            Some(_) => {}
+        }
+    }
+    let extra: Vec<_> = got
+        .keys()
+        .filter(|k| !want.iter().any(|(p, _)| p == **k))
+        .collect();
+    assert!(
+        missing.is_empty() && differ.is_empty() && extra.is_empty(),
+        "missing {missing:?}, differing {differ:?}, unexpected {extra:?}"
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/ishield_z.rs b/crates/exav-unpack/tests/suites/ishield_z.rs
index 8d5debe0..f41f8fac 100644
--- a/crates/exav-unpack/tests/suites/ishield_z.rs
+++ b/crates/exav-unpack/tests/suites/ishield_z.rs
@@ -13,7 +13,7 @@
 //! Fixtures are the `unshield` project's own examples (MIT); see `NOTICE`.
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 fn fixture(name: &str) -> Vec<u8> {
     let p = format!(
@@ -156,6 +156,86 @@ fn a_member_that_expands_past_the_budget_is_reported() {
     );
 }
 
+/// An archive whose table of contents has `dirs` directory records, each
+/// declaring `dir_files` members and each a zero-length chunk, so that every
+/// record and every member reads the same bytes again. 498 bytes of this took
+/// the `unshield` reader 1.5 GB: it builds one entry per declared member before
+/// anything is checked.
+fn declared_member_bomb(dirs: u16, dir_files: u16) -> Vec<u8> {
+    const HEADER: usize = 255;
+    const TOC: usize = 64;
+    let mut d = vec![0u8; HEADER + TOC];
+    d[..4].copy_from_slice(&[0x13, 0x5D, 0x65, 0x8C]);
+    d[12..14].copy_from_slice(&1u16.to_le_bytes());
+    d[18..22].copy_from_slice(&((HEADER + TOC) as u32).to_le_bytes());
+    d[41..45].copy_from_slice(&(HEADER as u32).to_le_bytes());
+    d[49..51].copy_from_slice(&dirs.to_le_bytes());
+    d[HEADER..HEADER + 2].copy_from_slice(&dir_files.to_le_bytes());
+    d
+}
+
+#[test]
+fn a_table_declaring_more_members_than_the_walk_bound_is_reported_not_built() {
+    let blob = declared_member_bomb(1, u16::MAX);
+    assert_eq!(detect(&blob), Some(Format::IshieldZ));
+    let e = members(&blob);
+    assert_eq!(
+        e.len(),
+        1,
+        "got {:?}",
+        e.iter().map(|x| &x.name).collect::<Vec<_>>()
+    );
+    assert!(
+        e[0].unsupported.is_some(),
+        "members left unexamined must be reported"
+    );
+}
+
+#[test]
+fn a_table_of_many_directories_each_declaring_many_members_stays_small() {
+    // 65535 x 65535 declared members: 4 billion entries if built.
+    let blob = declared_member_bomb(u16::MAX, u16::MAX);
+    let e = members(&blob);
+    assert_eq!(e.len(), 1);
+    assert!(e[0].unsupported.is_some());
+}
+
+/// `undhr.z`'s one member twice, under the same path.
+fn same_path_twice() -> Vec<u8> {
+    let z = fixture("undhr.z");
+    let u32at = |o: usize| u32::from_le_bytes(z[o..o + 4].try_into().unwrap()) as usize;
+    let toc = &z[u32at(41)..u32at(18)];
+    let dir_chunk = u16::from_le_bytes([toc[2], toc[3]]) as usize;
+    let (dir, file) = toc.split_at(dir_chunk);
+    let data = &z[255..u32at(41)];
+
+    let mut out = z[..255].to_vec();
+    out.extend_from_slice(data);
+    out.extend_from_slice(data);
+    let toc_at = out.len();
+    out.extend_from_slice(&[2, 0]);
+    out.extend_from_slice(&dir[2..]);
+    out.extend_from_slice(file);
+    out.extend_from_slice(file);
+    let end = out.len() as u32;
+    out[18..22].copy_from_slice(&end.to_le_bytes());
+    out[41..45].copy_from_slice(&(toc_at as u32).to_le_bytes());
+    out
+}
+
+#[test]
+fn members_sharing_a_path_are_all_extracted() {
+    let e = members(&same_path_twice());
+    let want = fixture("undhr.md");
+    assert_eq!(
+        e.len(),
+        2,
+        "one member hid the other: {:?}",
+        e.iter().map(|x| &x.name).collect::<Vec<_>>()
+    );
+    assert!(e.iter().all(|x| x.data == want));
+}
+
 #[test]
 fn a_member_past_the_budget_is_reported_not_skipped() {
     let mut limits = Limits::default();
@@ -179,3 +259,67 @@ fn a_member_past_the_budget_is_reported_not_skipped() {
             .collect::<Vec<_>>()
     );
 }
+
+/// `undhr.z` with its one member's compressed size (in the file record of the
+/// table of contents) set to `size`.
+fn with_member_size(size: u32) -> Vec<u8> {
+    let mut z = fixture("undhr.z");
+    let u32at = |z: &[u8], o: usize| u32::from_le_bytes(z[o..o + 4].try_into().unwrap()) as usize;
+    let toc = u32at(&z, 41);
+    let dir_chunk = u16::from_le_bytes([z[toc + 2], z[toc + 3]]) as usize;
+    let at = toc + dir_chunk + 7;
+    z[at..at + 4].copy_from_slice(&size.to_le_bytes());
+    z
+}
+
+#[test]
+fn a_member_cut_inside_its_stream_keeps_its_prefix_and_is_reported() {
+    let whole = members(&fixture("undhr.z"));
+    let want = fixture("undhr.md");
+    let half = (whole[0].comp_size / 2) as u32;
+    let e = members(&with_member_size(half));
+    assert_eq!(e.len(), 1);
+    assert!(
+        e[0].unsupported.is_some(),
+        "a member whose stream stops short was reported as whole"
+    );
+    assert!(
+        e[0].data.len() > 100 && want.starts_with(&e[0].data),
+        "the decoded prefix is lost: {} bytes",
+        e[0].data.len()
+    );
+    assert!(e[0].data.len() < want.len());
+}
+
+#[test]
+fn a_member_damaged_part_way_keeps_its_prefix_and_is_reported() {
+    // A byte of the compressed data set to each value in turn until one
+    // makes the stream invalid after it has produced output.
+    let z = fixture("undhr.z");
+    let want = fixture("undhr.md");
+    let mut found = false;
+    for at in (300..1500).step_by(7) {
+        let mut bad = z.clone();
+        bad[at] = !bad[at];
+        let e = members(&bad);
+        if e.len() != 1 || e[0].unsupported.is_none() || e[0].data.is_empty() {
+            continue;
+        }
+        found = true;
+        // Output before the damaged byte is the file's own.
+        assert!(e[0].data.starts_with(&want[..20]), "byte {at}");
+        break;
+    }
+    assert!(found, "no damaged member kept a decoded prefix");
+}
+
+#[test]
+fn a_member_whose_range_runs_past_the_file_is_reported() {
+    // Past the end of the file, but within the size budget; its stream still
+    // ends, so only the range says something is wrong.
+    let whole = members(&fixture("undhr.z"));
+    let e = members(&with_member_size(whole[0].comp_size as u32 + 100_000));
+    assert_eq!(e.len(), 1);
+    assert!(e[0].unsupported.is_some());
+    assert_eq!(e[0].data, fixture("undhr.md"));
+}
diff --git a/crates/exav-unpack/tests/suites/iso_joliet.rs b/crates/exav-unpack/tests/suites/iso_joliet.rs
index 9942916a..49c80f5e 100644
--- a/crates/exav-unpack/tests/suites/iso_joliet.rs
+++ b/crates/exav-unpack/tests/suites/iso_joliet.rs
@@ -4,7 +4,7 @@
 //! that file extracted and scanned. Walking only the primary volume descriptor's
 //! directory tree would silently miss such files.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 const EICAR: &[u8] = b"X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR";
 const SECTOR: usize = 2048;
@@ -125,3 +125,76 @@ fn file_in_both_trees_is_emitted_once() {
         "a file in both trees must be extracted exactly once"
     );
 }
+
+/// A file is its start and its length. A record of no length at the start of
+/// another file's extent, in either tree, must not stand in for that file: an
+/// extractor that deduplicated on the start alone reported the empty one and
+/// skipped the real one, and the ISO mounted, with the file in it, anywhere.
+#[test]
+fn an_empty_record_in_one_tree_does_not_hide_the_file_of_the_other() {
+    // The Joliet tree lists an empty file at the extent, the primary tree the
+    // real one. The Joliet tree is walked first.
+    let mut iso = joliet_only_iso(&utf16be("empty.txt"), b"");
+    let mut jol = dir_record(20, SECTOR as u32, true, &[0]);
+    jol.extend(dir_record(20, SECTOR as u32, true, &[1]));
+    jol.extend(dir_record(21, 0, false, &utf16be("empty.txt")));
+    let a = 20 * SECTOR;
+    iso[a..a + SECTOR].fill(0);
+    iso[a..a + jol.len()].copy_from_slice(&jol);
+    let mut prim = dir_record(19, SECTOR as u32, true, &[0]);
+    prim.extend(dir_record(19, SECTOR as u32, true, &[1]));
+    prim.extend(dir_record(21, EICAR.len() as u32, false, b"PAYLOAD.BIN;1"));
+    let a = 19 * SECTOR;
+    iso[a..a + prim.len()].copy_from_slice(&prim);
+    iso[21 * SECTOR..21 * SECTOR + EICAR.len()].copy_from_slice(EICAR);
+
+    let mut budget = Budget::new(Limits::default());
+    let entries = extract(Format::Iso, &iso, &mut budget).expect("iso extract");
+    assert!(
+        entries
+            .iter()
+            .any(|e| e.data.windows(EICAR.len()).any(|w| w == EICAR)),
+        "{entries:?}"
+    );
+}
+
+/// In both trees, the file takes the long name the Joliet tree gives it.
+#[test]
+fn a_file_in_both_trees_is_named_by_the_joliet_tree() {
+    let mut iso = joliet_only_iso(&utf16be("a-long-name.bin"), EICAR);
+    let mut prim = dir_record(19, SECTOR as u32, true, &[0]);
+    prim.extend(dir_record(19, SECTOR as u32, true, &[1]));
+    prim.extend(dir_record(21, EICAR.len() as u32, false, b"A_LONG_N.BIN;1"));
+    let a = 19 * SECTOR;
+    iso[a..a + prim.len()].copy_from_slice(&prim);
+    let mut budget = Budget::new(Limits::default());
+    let entries = extract(Format::Iso, &iso, &mut budget).expect("iso extract");
+    let names: Vec<&str> = entries.iter().map(|e| e.name.as_str()).collect();
+    assert_eq!(names, ["a-long-name.bin"]);
+}
+
+/// The same inside one tree: the empty record is listed first.
+#[test]
+fn an_empty_record_before_the_file_in_the_same_directory_does_not_hide_it() {
+    let mut iso = joliet_only_iso(&utf16be("payload.bin"), EICAR);
+    let mut jol = dir_record(20, SECTOR as u32, true, &[0]);
+    jol.extend(dir_record(20, SECTOR as u32, true, &[1]));
+    jol.extend(dir_record(21, 0, false, &utf16be("empty.txt")));
+    jol.extend(dir_record(
+        21,
+        EICAR.len() as u32,
+        false,
+        &utf16be("payload.bin"),
+    ));
+    let a = 20 * SECTOR;
+    iso[a..a + jol.len()].copy_from_slice(&jol);
+
+    let mut budget = Budget::new(Limits::default());
+    let entries = extract(Format::Iso, &iso, &mut budget).expect("iso extract");
+    assert!(
+        entries
+            .iter()
+            .any(|e| e.name == "payload.bin" && e.data.windows(EICAR.len()).any(|w| w == EICAR)),
+        "{entries:?}"
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/iso_never_silent.rs b/crates/exav-unpack/tests/suites/iso_never_silent.rs
index 3f446f9f..0c0c313f 100644
--- a/crates/exav-unpack/tests/suites/iso_never_silent.rs
+++ b/crates/exav-unpack/tests/suites/iso_never_silent.rs
@@ -5,7 +5,7 @@
 //! examine — and the containing file must not be reportable as clean on that
 //! basis. Each case here was a silent `break`/`continue` before.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 const SECTOR: usize = 2048;
 
diff --git a/crates/exav-unpack/tests/suites/lha_header_bounds.rs b/crates/exav-unpack/tests/suites/lha_header_bounds.rs
index 3325490c..99f8b799 100644
--- a/crates/exav-unpack/tests/suites/lha_header_bounds.rs
+++ b/crates/exav-unpack/tests/suites/lha_header_bounds.rs
@@ -8,7 +8,7 @@
 //! unwinding. The only place to stop it is before the reader is handed the
 //! bytes.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 /// The 143-byte archive that reserves ~3.2 GB. Its level-3 header states a
 /// total of 0xFFFFFFDF, which cannot be true of a file this size.
diff --git a/crates/exav-unpack/tests/suites/lz4.rs b/crates/exav-unpack/tests/suites/lz4.rs
index ab953a1d..55c63d07 100644
--- a/crates/exav-unpack/tests/suites/lz4.rs
+++ b/crates/exav-unpack/tests/suites/lz4.rs
@@ -18,7 +18,7 @@
 //! ```
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 /// `sha256sum` of what `lz4 -dc` writes for each fixture.
 const ONE: &str = "30c2abfccdf15a28990bae7bb0efa2444d82af3ce7053ff493956ef9612f775d";
diff --git a/crates/exav-unpack/tests/suites/lzfse.rs b/crates/exav-unpack/tests/suites/lzfse.rs
new file mode 100644
index 00000000..3ef2fbe9
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/lzfse.rs
@@ -0,0 +1,65 @@
+//! DMG runs compressed with LZFSE, through the whole extraction.
+//!
+//! `udif_lzfse.dmg` is `hfs_plus_udrw.dmg`'s disk in two LZFSE runs (an LZVN
+//! block, then FSE blocks) written by an encoder that is not exav's
+//! (`lzfse_rust`), so the files that come out are checked against the same
+//! disk read from its raw runs.
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+
+fn fixture(name: &str) -> Vec<u8> {
+    let p = format!("{}/tests/fixtures/dmg/{name}", env!("CARGO_MANIFEST_DIR"));
+    exav_unpack::read_fixture(&p).unwrap_or_else(|e| panic!("read {p}: {e}"))
+}
+
+fn entries(data: &[u8]) -> Vec<Entry> {
+    extract(Format::Dmg, &data, &mut Budget::new(Limits::default())).unwrap()
+}
+
+fn files(entries: &[Entry]) -> Vec<(String, Vec<u8>)> {
+    entries
+        .iter()
+        .map(|e| (e.name.clone(), e.data.clone()))
+        .collect()
+}
+
+#[test]
+fn an_lzfse_image_gives_the_files_of_its_raw_twin() {
+    let raw = entries(&fixture("hfs_plus_udrw.dmg"));
+    let lzfse = entries(&fixture("udif_lzfse.dmg"));
+    assert!(
+        lzfse.iter().all(|e| e.unsupported.is_none()),
+        "{:?}",
+        lzfse
+            .iter()
+            .map(|e| (&e.name, e.unsupported))
+            .collect::<Vec<_>>()
+    );
+    let want = files(&raw);
+    assert!(want.iter().any(|(_, d)| d.starts_with(b"hello hfs+")));
+    assert_eq!(files(&lzfse), want);
+}
+
+#[test]
+fn an_lzfse_image_with_a_damaged_run_is_not_the_whole_image() {
+    let image = fixture("udif_lzfse.dmg");
+    // The second run is the one with the FSE block; its magic is damaged.
+    let at = image.windows(4).rposition(|w| w == b"bvx2").unwrap();
+    let mut bad = image.clone();
+    bad[at + 3] = b'Z';
+    let got = extract(
+        Format::Dmg,
+        &bad.as_slice(),
+        &mut Budget::new(Limits::default()),
+    );
+    // Refused outright, or walked with the damage reported.
+    if let Ok(got) = got {
+        assert!(
+            got.iter().any(|e| e.unsupported.is_some()),
+            "a damaged run came out clean: {:?}",
+            got.iter()
+                .map(|e| (&e.name, e.unsupported))
+                .collect::<Vec<_>>()
+        );
+    }
+}
diff --git a/crates/exav-unpack/tests/suites/mod.rs b/crates/exav-unpack/tests/suites/mod.rs
index ce522197..63468c12 100644
--- a/crates/exav-unpack/tests/suites/mod.rs
+++ b/crates/exav-unpack/tests/suites/mod.rs
@@ -14,6 +14,8 @@
 mod allowed_formats;
 #[cfg(feature = "alz")]
 mod alz;
+#[cfg(all(feature = "ar", feature = "cpio"))]
+mod ar_cpio_irregular;
 #[cfg(feature = "arc")]
 mod arc;
 #[cfg(feature = "arj")]
@@ -23,10 +25,18 @@ mod broken_media;
 mod bzip2_blocks;
 #[cfg(feature = "cab")]
 mod cab_quantum;
+#[cfg(feature = "cab")]
+mod cab_salvage;
+#[cfg(feature = "cab")]
+mod cab_volumes;
 #[cfg(feature = "chm")]
 mod chm;
 #[cfg(feature = "cpio")]
 mod cpio_never_silent;
+#[cfg(feature = "cramfs")]
+mod cramfs;
+#[cfg(all(feature = "bzip2", feature = "xz"))]
+mod cut_streams;
 #[cfg(all(not(feature = "decrypt"), feature = "zip"))]
 mod decrypt_disabled;
 mod disabled_formats;
@@ -39,15 +49,24 @@ mod dwg;
 #[cfg(feature = "dxf")]
 mod dxf;
 mod egg;
+#[cfg(feature = "email")]
+mod email;
+#[cfg(feature = "email")]
+mod email_readers_agree;
 #[cfg(feature = "decrypt")]
 mod encrypted_zip;
 #[cfg(feature = "tar")]
 mod entry_accounting;
+#[cfg(feature = "erofs")]
+mod erofs;
+#[cfg(feature = "exfat")]
+mod exfat;
 #[cfg(feature = "ext")]
 mod ext;
 mod extreme;
 #[cfg(feature = "fat")]
 mod fat;
+mod fs_tree;
 mod hwp3;
 #[cfg(feature = "ishieldz")]
 mod ishield_z;
@@ -59,8 +78,11 @@ mod iso_never_silent;
 mod lha_header_bounds;
 #[cfg(feature = "lz4")]
 mod lz4;
+#[cfg(feature = "dmg")]
+mod lzfse;
 #[cfg(feature = "lzw")]
 mod lzw;
+mod nesting;
 #[cfg(feature = "nsis")]
 mod nsis;
 #[cfg(feature = "ntfs")]
@@ -78,6 +100,8 @@ mod partition_never_silent;
 mod pdf_empty_password;
 #[cfg(feature = "pdf")]
 mod pdf_parse;
+#[cfg(feature = "pdf")]
+mod pdf_readers_agree;
 #[cfg(feature = "pepack")]
 mod pe_emulation;
 #[cfg(feature = "pepack")]
@@ -95,13 +119,23 @@ mod rar4_compat;
 mod rar5_encryption;
 #[cfg(feature = "rar")]
 mod rar_solid;
+#[cfg(feature = "romfs")]
+mod romfs;
+#[cfg(feature = "rpm")]
+mod rpm;
 #[cfg(feature = "sevenz")]
 mod sevenz_bcj2;
 #[cfg(feature = "sevenz")]
+mod sevenz_entries;
+#[cfg(feature = "sevenz")]
 mod sevenz_ppmd;
 mod silent_skips;
+#[cfg(feature = "squashfs")]
+mod squashfs;
 #[cfg(feature = "all-formats")]
 mod stream_read_errors;
+#[cfg(feature = "text")]
+mod text;
 #[cfg(feature = "iso")]
 mod udf;
 #[cfg(feature = "upx")]
@@ -110,9 +144,20 @@ mod upx_rebuild;
 mod vba_module_source;
 #[cfg(feature = "vhd")]
 mod vhd;
+#[cfg(all(
+    feature = "diskimage",
+    feature = "vhd",
+    feature = "partition",
+    feature = "ntfs",
+    feature = "fat",
+    feature = "ext"
+))]
+mod virtual_disks;
 #[cfg(feature = "wim")]
 mod wim;
 #[cfg(feature = "xz")]
+mod xz_checks;
+#[cfg(feature = "xz")]
 mod xz_dict;
 #[cfg(feature = "zip")]
 mod zip_appended;
@@ -123,11 +168,13 @@ mod zip_deflate64;
 #[cfg(feature = "zip")]
 mod zip_disguised_members;
 #[cfg(feature = "zip")]
+mod zip_local_vs_directory;
+#[cfg(feature = "zip")]
 mod zip_overlap;
 #[cfg(feature = "zoo")]
 mod zoo;
 
-use exav_unpack::{walk, Budget, Entry, Format, LimitHit, Member};
+use exav_unpack::{Budget, Entry, Format, LimitHit, Member, walk};
 
 /// A real-malware sample under `tests/fixtures/`, kept locally only (see
 /// `read_fixture`), or `None` when it is absent or this build cannot open its
diff --git a/crates/exav-unpack/tests/suites/nesting.rs b/crates/exav-unpack/tests/suites/nesting.rs
new file mode 100644
index 00000000..064b33d6
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/nesting.rs
@@ -0,0 +1,319 @@
+//! Structure nested as deep as the file is long.
+//!
+//! A reader that follows a group, a part or an object into the next one with
+//! a call of its own uses a frame of the stack per level, and a level costs a
+//! few bytes of input: a megabyte of `{` is a million levels. The stack of a
+//! thread is a few hundred kilobytes (a worker of the scan, a viewer, a
+//! WebAssembly host) and running out of it ends the process, not the file. Each
+//! reader that has nesting is walked here on a small stack with its structure
+//! as deep as 200 KB of input makes it. It may refuse the file or read it, but
+//! it has to end, in seconds, and without a panic.
+
+use super::extract_each;
+use exav_unpack::{Budget, Entry, Format, Limits};
+use std::time::{Duration, Instant};
+
+const STACK: usize = 512 * 1024;
+const LEVELS: usize = 50_000;
+
+/// Walks `data` as `fmt` on a [`STACK`]-sized thread. The failure, if any.
+fn walk_small(fmt: Format, data: Vec<u8>) -> Result<Duration, String> {
+    let started = Instant::now();
+    let r = std::thread::Builder::new()
+        .stack_size(STACK)
+        .spawn(move || {
+            let mut limits = Limits::default();
+            limits.max_buffer_bytes = 64 << 20;
+            limits.max_extracted_bytes = 128 << 20;
+            let mut budget = Budget::new(limits);
+            let r = extract_each(fmt, &data, &mut budget, &mut |_: Entry, _: &mut Budget| {
+                None::<()>
+            });
+            matches!(r, Err(e) if e.reason.contains("panicked"))
+        })
+        .unwrap()
+        .join();
+    match r {
+        Err(_) => Err("overflowed its stack or panicked".into()),
+        Ok(true) => Err("the decoder panicked".into()),
+        Ok(false) => Ok(started.elapsed()),
+    }
+}
+
+fn check(fmt: Format, name: &str, data: Vec<u8>) -> Option<String> {
+    match walk_small(fmt, data) {
+        Err(e) => Some(format!("{fmt:?} {name}: {e}")),
+        Ok(took) if took > Duration::from_secs(20) => {
+            Some(format!("{fmt:?} {name}: took {:.1} s", took.as_secs_f64()))
+        }
+        Ok(_) => None,
+    }
+}
+
+fn assert_all(findings: Vec<Option<String>>) {
+    let findings: Vec<String> = findings.into_iter().flatten().collect();
+    assert!(findings.is_empty(), "\n{}", findings.join("\n"));
+}
+
+#[cfg(feature = "rtf")]
+#[test]
+fn rtf_groups() {
+    let n = LEVELS * 4;
+    let wrap = |open: &str, inner: &str, close: &str| {
+        format!("{{\\rtf1 {}{inner}{}}}", open.repeat(n), close.repeat(n)).into_bytes()
+    };
+    assert_all(vec![
+        check(Format::Rtf, "groups", wrap("{", "x", "}")),
+        check(Format::Rtf, "unclosed", wrap("{", "x", "")),
+        check(Format::Rtf, "destinations", wrap("{\\*\\foo ", "x", "}")),
+        check(
+            Format::Rtf,
+            "objdata",
+            wrap("{\\object{\\*\\objdata ", "41", "}}"),
+        ),
+        check(
+            Format::Rtf,
+            "fields",
+            wrap("{\\field{\\*\\fldinst ", "x", "}}"),
+        ),
+        check(Format::Rtf, "pict", wrap("{\\pict ", "41", "}")),
+        check(
+            Format::Rtf,
+            "shapes",
+            wrap("{\\shp{\\*\\shpinst ", "x", "}}"),
+        ),
+        check(Format::Rtf, "tables", wrap("\\trowd{\\intbl ", "x", "}")),
+    ]);
+}
+
+#[cfg(feature = "email")]
+#[test]
+fn mime_parts() {
+    let n = LEVELS / 5;
+    // multipart inside multipart, each with a boundary of its own.
+    let mut nested = String::new();
+    for i in 0..n {
+        nested.push_str(&format!(
+            "Content-Type: multipart/mixed; boundary=\"b{i}\"\r\n\r\n--b{i}\r\n"
+        ));
+    }
+    nested.push_str("Content-Type: text/plain\r\n\r\nx\r\n");
+    // multipart inside multipart with the one boundary.
+    let mut same = String::from("Content-Type: multipart/mixed; boundary=\"b\"\r\n\r\n");
+    for _ in 0..n * 4 {
+        same.push_str("--b\r\nContent-Type: multipart/mixed; boundary=\"b\"\r\n\r\n");
+    }
+    let rfc822 = "Content-Type: message/rfc822\r\n\r\n".repeat(n * 4);
+    let rfc822_headers = format!(
+        "From: a@b\r\n{}\r\nx",
+        "Content-Type: message/rfc822\r\n\r\nFrom: a@b\r\n".repeat(n * 4)
+    );
+    let comments = format!(
+        "From: a@b\r\nSubject: {}x{}\r\n\r\nx",
+        "(".repeat(n * 8),
+        ")".repeat(n * 8)
+    );
+    let groups = format!("To: {}a@b;\r\n\r\nx", "g:".repeat(n * 8));
+    let quoted = format!("Subject: =?utf-8?q?{}?=\r\n\r\nx", "=3D".repeat(n * 8));
+    assert_all(
+        [
+            ("multipart", nested),
+            ("same boundary", same),
+            ("message/rfc822", rfc822),
+            ("rfc822 with headers", rfc822_headers),
+            ("comments", comments),
+            ("group addresses", groups),
+            ("encoded words", quoted),
+        ]
+        .into_iter()
+        .map(|(name, s)| check(Format::Email, name, s.into_bytes()))
+        .collect(),
+    );
+}
+
+#[cfg(feature = "xdp")]
+#[test]
+fn xdp_elements() {
+    let n = LEVELS * 2;
+    let head = "<?xml version=\"1.0\"?><xdp:xdp xmlns:xdp=\"http://ns.adobe.com/xdp/\">";
+    let nest = |open: &str, close: &str, inner: &str| {
+        format!(
+            "{head}{}{inner}{}</xdp:xdp>",
+            open.repeat(n),
+            close.repeat(n)
+        )
+        .into_bytes()
+    };
+    assert_all(vec![
+        check(Format::Xdp, "elements", nest("<a>", "</a>", "")),
+        check(Format::Xdp, "unclosed", nest("<a>", "", "")),
+        check(
+            Format::Xdp,
+            "chunks",
+            nest("<pdf><chunk>", "</chunk></pdf>", "QQ=="),
+        ),
+        check(Format::Xdp, "comments", nest("<!--", "", "")),
+        check(Format::Xdp, "cdata", nest("<![CDATA[", "", "")),
+    ]);
+}
+
+/// A PDF whose one object is `body`.
+#[cfg(feature = "pdf")]
+fn pdf_with(objects: &str) -> Vec<u8> {
+    format!("%PDF-1.7\n{objects}trailer\n<</Root 1 0 R /Size 3>>\n%%EOF\n").into_bytes()
+}
+
+/// PDFs whose structure is as deep as `LEVELS` makes it.
+#[cfg(any(feature = "pdf", feature = "text-pdf"))]
+fn deep_pdfs() -> Vec<(&'static str, Vec<u8>)> {
+    let n = LEVELS * 2;
+    let arrays = format!("{}{}", "[".repeat(n), "]".repeat(n));
+    let dicts = format!("{}{}", "<</A ".repeat(n), ">>".repeat(n));
+    let names = "/A ".repeat(n);
+    let strings = format!("{}x{}", "(".repeat(n), ")".repeat(n));
+    let mixed = format!("{}{}", "[<</A ".repeat(n), ">>]".repeat(n));
+    // A chain of pages, each the parent of the next: 20,000 objects.
+    let mut tree = String::from("1 0 obj\n<</Type/Catalog/Pages 2 0 R>>\nendobj\n");
+    for i in 2..20_000 {
+        tree.push_str(&format!(
+            "{i} 0 obj\n<</Type/Pages/Kids[{} 0 R]/Count 1/Parent {} 0 R>>\nendobj\n",
+            i + 1,
+            i - 1
+        ));
+    }
+    // Objects that refer to each other.
+    let cycle = "1 0 obj\n<</Type/Catalog/Pages 2 0 R>>\nendobj\n\
+        2 0 obj\n<</Type/Pages/Kids[2 0 R 3 0 R]/Count 1/Parent 3 0 R>>\nendobj\n\
+        3 0 obj\n<</Type/Pages/Kids[2 0 R]/Count 1/Parent 2 0 R>>\nendobj\n";
+    // A content stream's own nesting.
+    let content = format!("q {}BT (x) Tj ET {}", "q ".repeat(n), "Q ".repeat(n));
+    let stream = format!(
+        "1 0 obj\n<</Type/Catalog/Pages 2 0 R>>\nendobj\n\
+         2 0 obj\n<</Type/Pages/Kids[3 0 R]/Count 1>>\nendobj\n\
+         3 0 obj\n<</Type/Page/Parent 2 0 R/Contents 4 0 R>>\nendobj\n\
+         4 0 obj\n<</Length {}>>\nstream\n{content}\nendstream\nendobj\n",
+        content.len()
+    );
+    let tj = format!(
+        "1 0 obj\n<</Type/Catalog/Pages 2 0 R>>\nendobj\n\
+         2 0 obj\n<</Type/Pages/Kids[3 0 R]/Count 1>>\nendobj\n\
+         3 0 obj\n<</Type/Page/Parent 2 0 R/Contents 4 0 R>>\nendobj\n\
+         4 0 obj\n<</Length {}>>\nstream\nBT {}(x){} TJ ET\nendstream\nendobj\n",
+        n * 2 + 14,
+        "[".repeat(n),
+        "]".repeat(n)
+    );
+    let obj = |body: &str| format!("1 0 obj\n{body}\nendobj\n");
+    vec![
+        ("arrays", pdf_with(&obj(&arrays))),
+        ("dictionaries", pdf_with(&obj(&dicts))),
+        ("names", pdf_with(&obj(&format!("[{names}]")))),
+        ("strings", pdf_with(&obj(&strings))),
+        ("arrays of dictionaries", pdf_with(&obj(&mixed))),
+        ("page tree", pdf_with(&tree)),
+        ("page cycle", pdf_with(cycle)),
+        ("q/Q", pdf_with(&stream)),
+        ("TJ arrays", pdf_with(&tj)),
+    ]
+}
+
+#[cfg(feature = "pdf")]
+#[test]
+fn pdf_objects() {
+    assert_all(
+        deep_pdfs()
+            .into_iter()
+            .map(|(name, pdf)| check(Format::Pdf, name, pdf))
+            .collect(),
+    );
+}
+
+#[cfg(feature = "text-pdf")]
+#[test]
+fn pdf_text() {
+    use exav_unpack::text::{Kind, extract};
+    let mut findings = vec![];
+    for (name, pdf) in deep_pdfs() {
+        let started = Instant::now();
+        let r = std::thread::Builder::new()
+            .stack_size(STACK)
+            .spawn(move || {
+                extract(Kind::Pdf, &pdf, 1 << 22, &Limits::default())
+                    .text
+                    .len()
+            })
+            .unwrap()
+            .join();
+        findings.push(match r {
+            Err(_) => Some(format!("Pdf text {name}: overflowed its stack or panicked")),
+            Ok(_) if started.elapsed() > Duration::from_secs(20) => {
+                Some(format!("Pdf text {name}: took {:?}", started.elapsed()))
+            }
+            Ok(_) => None,
+        });
+    }
+    assert_all(findings);
+}
+
+#[cfg(feature = "text")]
+#[test]
+fn text_markup() {
+    use exav_unpack::text::{Kind, XmlPart, extract};
+    let n = LEVELS * 4;
+    let run = |kind: Kind, name: &str, src: String| -> Option<String> {
+        let started = Instant::now();
+        let r = std::thread::Builder::new()
+            .stack_size(STACK)
+            .spawn(move || {
+                extract(kind, src.as_bytes(), 1 << 22, &Limits::default())
+                    .text
+                    .len()
+            })
+            .unwrap()
+            .join();
+        match r {
+            Err(_) => Some(format!("{kind:?} {name}: overflowed its stack or panicked")),
+            Ok(_) if started.elapsed() > Duration::from_secs(20) => {
+                Some(format!("{kind:?} {name}: took {:?}", started.elapsed()))
+            }
+            Ok(_) => None,
+        }
+    };
+    let mut findings = vec![];
+    let html = [
+        ("tables", "<table><tr><td>".repeat(n)),
+        ("lists", "<ul><li>".repeat(n)),
+        ("formatting", "<b><i><u><font>".repeat(n)),
+        ("unclosed blockquote", "<blockquote>".repeat(n)),
+        ("select", "<select><option>".repeat(n)),
+        ("svg", "<svg><g>".repeat(n)),
+        ("template", "<template>".repeat(n)),
+        ("nested forms", "<form><div>".repeat(n)),
+        ("closing tags", "</div>".repeat(n)),
+        ("math", "<math><mrow>".repeat(n)),
+    ];
+    for (name, src) in html {
+        findings.push(run(Kind::Html, name, src));
+    }
+    let parts = [
+        XmlPart::Word,
+        XmlPart::Slide,
+        XmlPart::SharedStrings,
+        XmlPart::Sheet,
+        XmlPart::Odf,
+    ];
+    for part in parts {
+        let shapes = [
+            ("elements", "<a>".repeat(n)),
+            ("paragraphs", "<w:p><w:r><w:t>".repeat(n)),
+            ("drawing", "<a:p><a:r><a:t>".repeat(n)),
+            ("odf", "<text:p><text:span><text:a>".repeat(n)),
+            ("tables", "<w:tbl><w:tr><w:tc>".repeat(n)),
+            ("sheet", "<c><is><r><t>".repeat(n)),
+        ];
+        for (name, src) in shapes {
+            findings.push(run(Kind::Xml(part), name, src));
+        }
+    }
+    assert_all(findings);
+}
diff --git a/crates/exav-unpack/tests/suites/nsis.rs b/crates/exav-unpack/tests/suites/nsis.rs
index c87ebbab..255a126d 100644
--- a/crates/exav-unpack/tests/suites/nsis.rs
+++ b/crates/exav-unpack/tests/suites/nsis.rs
@@ -1,5 +1,5 @@
 //! NSIS installer extraction: real-sample robustness + synthetic-payload recovery.
-use exav_unpack::{detect, extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, detect, extract};
 
 /// A real NSIS installer (PE stub + NSIS firstheader + compressed data block).
 /// Its blocks use NSIS's modified bzip2, and every one of them decodes. It is
@@ -34,7 +34,7 @@ fn real_sample_decodes_every_block() {
 
 #[test]
 fn synthetic_deflate_block_recovers_marker() {
-    use flate2::{write::DeflateEncoder, Compression};
+    use flate2::{Compression, write::DeflateEncoder};
     use std::io::Write;
 
     // Build a minimal non-solid NSIS: MZ stub + firstheader + one raw-deflate
@@ -99,3 +99,43 @@ fn truncated_and_garbage_do_not_panic() {
     let entries = extract(Format::Nsis, b"not an nsis file at all", &mut budget).unwrap();
     assert!(entries.is_empty());
 }
+
+/// A non-solid installer's blocks are walked to the end of its data. A count of
+/// blocks of its own ended the walk at 10,000 and left what came after
+/// unread, with nothing said; the walk is bounded by the member limit instead.
+#[test]
+fn a_block_after_many_empty_ones_is_still_read() {
+    use flate2::{Compression, write::DeflateEncoder};
+    use std::io::Write;
+    let sig: [u8; 16] = [
+        0xEF, 0xBE, 0xAD, 0xDE, b'N', b'u', b'l', b'l', b's', b'o', b'f', b't', b'I', b'n', b's',
+        b't',
+    ];
+    let payload = b"MALWARETEST hidden behind twelve thousand empty blocks";
+    let mut enc = DeflateEncoder::new(Vec::new(), Compression::best());
+    enc.write_all(payload).unwrap();
+    let deflate = enc.finish().unwrap();
+    let empties = 12_000usize;
+
+    let mut blob = Vec::new();
+    blob.extend_from_slice(b"MZ");
+    blob.extend_from_slice(&[0u8; 62]);
+    blob.extend_from_slice(&0u32.to_le_bytes());
+    blob.extend_from_slice(&sig);
+    blob.extend_from_slice(&0u32.to_le_bytes());
+    blob.extend_from_slice(&((0x1c + empties * 4 + 4 + deflate.len() + 4) as u32).to_le_bytes());
+    blob.extend(std::iter::repeat_n(0u8, empties * 4));
+    blob.extend_from_slice(&((deflate.len() as u32) | 0x8000_0000).to_le_bytes());
+    blob.extend_from_slice(&deflate);
+    blob.extend_from_slice(&0u32.to_le_bytes());
+
+    assert_eq!(detect(&blob), Some(Format::Nsis));
+    let mut budget = Budget::new(Limits::default());
+    let entries = extract(Format::Nsis, &blob, &mut budget).unwrap();
+    assert!(
+        entries
+            .iter()
+            .any(|e| e.data.windows(11).any(|w| w == b"MALWARETEST")),
+        "the block behind the empty ones was not read"
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/ntfs.rs b/crates/exav-unpack/tests/suites/ntfs.rs
index fe95ad05..df11f651 100644
--- a/crates/exav-unpack/tests/suites/ntfs.rs
+++ b/crates/exav-unpack/tests/suites/ntfs.rs
@@ -22,7 +22,8 @@
 //! ```
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use super::fs_tree::{assert_streams_alike, came};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 /// `sha256sum` of what `ntfscat` returns for each file.
 const PAYLOAD: &str = "49c7e4f4b184954a212c78c87c17705cd4c16f0b8c83a5cd6a750369c47957c5";
@@ -161,6 +162,41 @@ fn runs_that_do_not_cover_the_declared_size_are_reported_not_truncated() {
     );
 }
 
+#[test]
+fn a_fragmented_file_over_the_buffer_limit_is_read_as_it_goes_across_both_runs() {
+    let img = fixture();
+    assert_streams_alike(Format::Ntfs, &img, 1000);
+    let (e, end) = came(Format::Ntfs, &img, 1000);
+    end.unwrap();
+    let p = e.iter().find(|x| x.name == "payload.zip").unwrap();
+    assert!(p.streamed, "the payload is past the limit, so not held");
+    assert_eq!(sha256_hex(&p.data), PAYLOAD);
+    assert_eq!(p.read_error, None);
+}
+
+#[test]
+fn runs_that_do_not_cover_the_size_of_a_file_read_as_it_goes_are_reported_with_what_there_is() {
+    let mut img = fixture();
+    let at = img
+        .windows(RUNLIST.len())
+        .position(|w| w == RUNLIST)
+        .expect("the two-run list should be in the fixture");
+    img[at + 1] = 0x02;
+    let (e, end) = came(Format::Ntfs, &img, 1000);
+    end.unwrap();
+    // Reported first, then the file, which ends in an error where its runs do.
+    let at = e.iter().position(|x| x.name == "payload.zip").unwrap();
+    assert!(e[at].unsupported.is_some(), "the shortfall is reported");
+    let stream = &e[at + 1];
+    assert!(stream.streamed && stream.name == "payload.zip");
+    assert!(stream.read_error.is_some(), "and the read says it stops");
+    assert_eq!(
+        stream.data.len(),
+        6 * 4096,
+        "with the six clusters there are"
+    );
+}
+
 // A file fragmented past what its MFT record holds: the runs continue in
 // extension records, and the `$ATTRIBUTE_LIST` that names them is itself outside
 // the record (non-resident). `attribute_list.img.gz` is a 14 MiB volume made by
@@ -263,6 +299,139 @@ fn an_attribute_list_that_reads_short_is_reported_not_half_used() {
     );
 }
 
+/// A volume of 512-byte clusters and 1 MiB records (the format's largest)
+/// whose record 16 is a file with a non-resident `$ATTRIBUTE_LIST` of `entries`
+/// entries of type `kind`, all naming record 2 (a valid file of 1 MiB). 39 MB,
+/// made in memory; the list is the one bytes a reviewer's generator wrote
+/// (`entries * 26` of them).
+fn volume_with_a_list(entries: usize, kind: u32) -> Vec<u8> {
+    const CLUSTER: usize = 512;
+    const REC: usize = 1 << 20;
+    const USA: usize = 0x30;
+    let attr_off = (USA + 2 * (REC / CLUSTER + 1) + 7) & !7;
+    let list_len = entries * 26;
+    let (list_at, mft_at, rec2_data, rec16_data) = (60_000usize, 5usize, 70_000usize, 71_000usize);
+    let mft_bytes = 17 * 1024 * 1024;
+    let mut vol = vec![0u8; (72_000 + 4096) * CLUSTER];
+    vol[..3].copy_from_slice(&[0xEB, 0x52, 0x90]);
+    vol[3..11].copy_from_slice(b"NTFS    ");
+    vol[11..13].copy_from_slice(&512u16.to_le_bytes());
+    vol[13] = 1;
+    vol[0x30..0x38].copy_from_slice(&(mft_at as u64).to_le_bytes());
+    vol[0x40] = 0xEC;
+    vol[510..512].copy_from_slice(&[0x55, 0xAA]);
+
+    for k in 0..entries {
+        let at = list_at * CLUSTER + k * 26;
+        vol[at..at + 4].copy_from_slice(&kind.to_le_bytes());
+        vol[at + 4..at + 6].copy_from_slice(&26u16.to_le_bytes());
+        vol[at + 8..at + 16].copy_from_slice(&(k as u64).to_le_bytes());
+        vol[at + 16..at + 24].copy_from_slice(&2u64.to_le_bytes());
+    }
+
+    let run = |lcn: usize, clusters: usize| {
+        let mut r = vec![0x33];
+        r.extend_from_slice(&clusters.to_le_bytes()[..3]);
+        r.extend_from_slice(&lcn.to_le_bytes()[..3]);
+        r.push(0);
+        r
+    };
+    // A non-resident attribute at `off` of the record; its length.
+    let attribute = |rec: &mut Vec<u8>, off: usize, ty: u32, size: usize, runs: &[u8]| {
+        let len = 64 + runs.len();
+        rec[off..off + 4].copy_from_slice(&ty.to_le_bytes());
+        rec[off + 4..off + 6].copy_from_slice(&(len as u16).to_le_bytes());
+        rec[off + 8] = 1;
+        rec[off + 0x18..off + 0x20].copy_from_slice(&(size.div_ceil(CLUSTER) as u64).to_le_bytes());
+        rec[off + 0x20..off + 0x22].copy_from_slice(&64u16.to_le_bytes());
+        rec[off + 0x28..off + 0x30].copy_from_slice(&(size as u64).to_le_bytes());
+        rec[off + 0x30..off + 0x38].copy_from_slice(&(size as u64).to_le_bytes());
+        rec[off + 0x38..off + 0x40].copy_from_slice(&(size as u64).to_le_bytes());
+        rec[off + 64..off + len].copy_from_slice(runs);
+        len
+    };
+    let mut record = |n: usize, attrs: &[(u32, usize, Vec<u8>)]| {
+        let mut r = vec![0u8; REC];
+        r[..4].copy_from_slice(b"FILE");
+        r[0x14..0x16].copy_from_slice(&(attr_off as u16).to_le_bytes());
+        r[0x16..0x18].copy_from_slice(&1u16.to_le_bytes());
+        r[0x18..0x1C].copy_from_slice(&(REC as u32).to_le_bytes());
+        r[0x1C..0x20].copy_from_slice(&(REC as u32).to_le_bytes());
+        let mut off = attr_off;
+        for (ty, size, runs) in attrs {
+            off += attribute(&mut r, off, *ty, *size, runs);
+        }
+        // The update sequence: its number at the start, and at the end of
+        // each sector (the values they replace are zeros here).
+        let count = REC / CLUSTER + 1;
+        r[4..6].copy_from_slice(&(USA as u16).to_le_bytes());
+        r[6..8].copy_from_slice(&(count as u16).to_le_bytes());
+        r[USA..USA + 2].copy_from_slice(&[0xAA, 0xBB]);
+        for i in 1..count {
+            r[i * CLUSTER - 2..i * CLUSTER].copy_from_slice(&[0xAA, 0xBB]);
+        }
+        let at = mft_at * CLUSTER + n * REC;
+        vol[at..at + REC].copy_from_slice(&r);
+    };
+    record(0, &[(0x80, mft_bytes, run(mft_at, mft_bytes / CLUSTER))]);
+    record(2, &[(0x80, 1 << 20, run(rec2_data, 2048))]);
+    record(
+        16,
+        &[
+            (0x80, 1 << 15, run(rec16_data, 64)),
+            (0x20, list_len, run(list_at, list_len.div_ceil(CLUSTER))),
+        ],
+    );
+    vol
+}
+
+/// One record named by tens of thousands of list entries was read, and its
+/// fix-ups applied, once for each: 40,000 entries took 2 s, 160,000 took 8 s
+/// in a release build, and a 256 MiB list (the most a volume may give) about
+/// 13 minutes. Read once, it costs what one read does.
+#[test]
+fn a_record_named_by_a_list_thousands_of_times_is_read_once() {
+    for kind in [0x30, 0x80] {
+        let start = std::time::Instant::now();
+        let e = members(&volume_with_a_list(40_000, kind));
+        assert!(
+            e.iter()
+                .any(|x| x.name.starts_with("<mft-record-") && x.unsupported.is_none()),
+            "kind {kind:#x}: {:?}",
+            e.iter()
+                .map(|x| (&x.name, x.unsupported))
+                .collect::<Vec<_>>()
+        );
+        assert!(
+            start.elapsed() < std::time::Duration::from_secs(1),
+            "kind {kind:#x}: {:?}",
+            start.elapsed()
+        );
+    }
+}
+
+/// A list that names more extents than a file has is not followed, and the file
+/// is reported as not read whole, never passed off as its first extent.
+#[test]
+fn a_list_naming_more_extents_than_exav_follows_is_reported() {
+    let start = std::time::Instant::now();
+    let e = members(&volume_with_a_list(70_000, 0x80));
+    let file = e
+        .iter()
+        .find(|x| x.name.starts_with("<mft-record-"))
+        .unwrap();
+    assert!(
+        file.unsupported.is_some_and(|r| r.contains("more extents")),
+        "{:?}",
+        file.unsupported
+    );
+    assert!(
+        start.elapsed() < std::time::Duration::from_secs(1),
+        "{:?}",
+        start.elapsed()
+    );
+}
+
 #[test]
 fn the_payload_is_absent_from_the_raw_volume() {
     // Guards the premise: if EICAR were visible in the sectors, a raw scan would
@@ -285,3 +454,150 @@ fn the_payload_is_absent_from_the_raw_volume() {
     let plain = e.iter().find(|x| x.name == "eicar.com").expect("eicar");
     assert_eq!(sha256_hex(&plain.data), EICAR);
 }
+
+/// A volume of 512-byte clusters and 1,024-byte records whose record 16 is a
+/// file with a non-resident `$ATTRIBUTE_LIST` naming `records` records, each
+/// holding the next extent of its `$DATA`: `runs_each` runs of one cluster.
+/// As [`volume_with_a_list`], made in memory.
+fn volume_with_extents(records: usize, runs_each: usize) -> Vec<u8> {
+    const CLUSTER: usize = 512;
+    const REC: usize = 1024;
+    const USA: usize = 0x30;
+    const FIRST: usize = 17;
+    let attr_off = (USA + 2 * (REC / CLUSTER + 1) + 7) & !7;
+    let list_len = records * 26;
+    let mft_at = 5usize;
+    let mft_bytes = (FIRST + records) * REC;
+    let list_at = mft_at + mft_bytes.div_ceil(CLUSTER) + 8;
+    let mut vol = vec![0u8; (list_at + list_len.div_ceil(CLUSTER) + 8) * CLUSTER];
+    vol[..3].copy_from_slice(&[0xEB, 0x52, 0x90]);
+    vol[3..11].copy_from_slice(b"NTFS    ");
+    vol[11..13].copy_from_slice(&512u16.to_le_bytes());
+    vol[13] = 1;
+    vol[0x30..0x38].copy_from_slice(&(mft_at as u64).to_le_bytes());
+    vol[0x40] = 0xF6;
+    vol[510..512].copy_from_slice(&[0x55, 0xAA]);
+    assert!(mft_at * CLUSTER + mft_bytes <= list_at * CLUSTER);
+
+    for k in 0..records {
+        let at = list_at * CLUSTER + k * 26;
+        vol[at..at + 4].copy_from_slice(&0x80u32.to_le_bytes());
+        vol[at + 4..at + 6].copy_from_slice(&26u16.to_le_bytes());
+        vol[at + 8..at + 16].copy_from_slice(&((k * runs_each) as u64).to_le_bytes());
+        vol[at + 16..at + 24].copy_from_slice(&((FIRST + k) as u64).to_le_bytes());
+    }
+
+    // `count` runs of one cluster, each a step on from the one before.
+    let run = |lcn: usize, clusters: usize, count: usize| {
+        let mut r = vec![0x33];
+        r.extend_from_slice(&clusters.to_le_bytes()[..3]);
+        r.extend_from_slice(&lcn.to_le_bytes()[..3]);
+        for _ in 1..count {
+            r.extend_from_slice(&[0x11, 1, 1]);
+        }
+        r.push(0);
+        r
+    };
+    // A record of the non-resident attributes `(type, starting VCN, size, runs)`.
+    let mut record = |n: usize, attrs: &[(u32, u64, usize, Vec<u8>)]| {
+        let mut r = vec![0u8; REC];
+        r[..4].copy_from_slice(b"FILE");
+        r[0x14..0x16].copy_from_slice(&(attr_off as u16).to_le_bytes());
+        r[0x16..0x18].copy_from_slice(&1u16.to_le_bytes());
+        r[0x18..0x1C].copy_from_slice(&(REC as u32).to_le_bytes());
+        r[0x1C..0x20].copy_from_slice(&(REC as u32).to_le_bytes());
+        let mut off = attr_off;
+        for (ty, vcn, size, runs) in attrs {
+            let len = 64 + runs.len();
+            r[off..off + 4].copy_from_slice(&ty.to_le_bytes());
+            r[off + 4..off + 6].copy_from_slice(&(len as u16).to_le_bytes());
+            r[off + 8] = 1;
+            r[off + 0x10..off + 0x18].copy_from_slice(&vcn.to_le_bytes());
+            r[off + 0x18..off + 0x20]
+                .copy_from_slice(&(size.div_ceil(CLUSTER) as u64).to_le_bytes());
+            r[off + 0x20..off + 0x22].copy_from_slice(&64u16.to_le_bytes());
+            for at in [0x28, 0x30, 0x38] {
+                r[off + at..off + at + 8].copy_from_slice(&(*size as u64).to_le_bytes());
+            }
+            r[off + 64..off + len].copy_from_slice(runs);
+            off += len;
+        }
+        r[off..off + 4].copy_from_slice(&0xFFFF_FFFFu32.to_le_bytes());
+        let count = REC / CLUSTER + 1;
+        r[4..6].copy_from_slice(&(USA as u16).to_le_bytes());
+        r[6..8].copy_from_slice(&(count as u16).to_le_bytes());
+        r[USA..USA + 2].copy_from_slice(&[0xAA, 0xBB]);
+        for i in 1..count {
+            // What the sector ends with is kept in the update sequence array.
+            let kept = [r[i * CLUSTER - 2], r[i * CLUSTER - 1]];
+            r[USA + 2 * i..USA + 2 * i + 2].copy_from_slice(&kept);
+            r[i * CLUSTER - 2..i * CLUSTER].copy_from_slice(&[0xAA, 0xBB]);
+        }
+        let at = mft_at * CLUSTER + n * REC;
+        vol[at..at + REC].copy_from_slice(&r);
+    };
+    record(
+        0,
+        &[(0x80, 0, mft_bytes, run(mft_at, mft_bytes / CLUSTER, 1))],
+    );
+    record(
+        16,
+        &[
+            (0x80, 0, 16 * CLUSTER, run(10, 16, 1)),
+            (
+                0x20,
+                0,
+                list_len,
+                run(list_at, list_len.div_ceil(CLUSTER), 1),
+            ),
+        ],
+    );
+    for k in 0..records {
+        let size = if k == 0 { 16 * CLUSTER } else { 0 };
+        record(
+            FIRST + k,
+            &[(0x80, (k * runs_each) as u64, size, run(10, 1, runs_each))],
+        );
+    }
+    vol
+}
+
+/// Each extent can hold as many runs as a record has room for, and a file can
+/// have thousands of extents: the runs of one file are bounded in all, and the
+/// file past the bound is reported, not read from the part of it that was kept.
+#[test]
+fn the_runs_of_all_the_extents_of_a_file_are_bounded() {
+    let start = std::time::Instant::now();
+    let e = members(&volume_with_extents(4000, 280));
+    let file = e
+        .iter()
+        .find(|x| x.name == "<mft-record-16>")
+        .unwrap_or_else(|| {
+            panic!(
+                "{:?}",
+                e.iter()
+                    .map(|x| (&x.name, x.unsupported))
+                    .collect::<Vec<_>>()
+            )
+        });
+    assert!(
+        file.unsupported.is_some_and(|r| r.contains("more extents")),
+        "{:?}",
+        file.unsupported
+    );
+    assert!(start.elapsed() < std::time::Duration::from_secs(5));
+}
+
+/// The same shape within the bound is read.
+#[test]
+fn a_file_of_a_few_extents_with_many_runs_is_read() {
+    let e = members(&volume_with_extents(40, 280));
+    assert!(
+        e.iter()
+            .any(|x| x.name == "<mft-record-16>" && x.unsupported.is_none()),
+        "{:?}",
+        e.iter()
+            .map(|x| (&x.name, x.unsupported))
+            .collect::<Vec<_>>()
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/ole_lenient.rs b/crates/exav-unpack/tests/suites/ole_lenient.rs
index a1ea168d..e6652559 100644
--- a/crates/exav-unpack/tests/suites/ole_lenient.rs
+++ b/crates/exav-unpack/tests/suites/ole_lenient.rs
@@ -6,7 +6,7 @@
 //! directory walk that ignores the tree structure and recovers the stream
 //! contents anyway, so embedded payloads can't hide behind a broken directory.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 const EICAR: &[u8] = b"X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR";
 
diff --git a/crates/exav-unpack/tests/suites/onenote.rs b/crates/exav-unpack/tests/suites/onenote.rs
index acac312f..f3fc8e20 100644
--- a/crates/exav-unpack/tests/suites/onenote.rs
+++ b/crates/exav-unpack/tests/suites/onenote.rs
@@ -5,7 +5,7 @@
 //! their embedded FileDataStoreObject payloads and assert the extractor is
 //! panic-safe. See `tests/fixtures/onenote/README.md` for sha256 provenance.
 
-use exav_unpack::{detect, extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, detect, extract};
 
 /// The `.one` samples present locally, as `(name, bytes)`, each kept in its
 /// AES ZIP (`../README.md`).
diff --git a/crates/exav-unpack/tests/suites/panic_containment.rs b/crates/exav-unpack/tests/suites/panic_containment.rs
index 00a749fa..a4246738 100644
--- a/crates/exav-unpack/tests/suites/panic_containment.rs
+++ b/crates/exav-unpack/tests/suites/panic_containment.rs
@@ -3,11 +3,12 @@
 //! format dispatch in a catch-unwind boundary that turns any such panic
 //! into a clean `LimitHit`.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 /// Regression for a fuzz-found crash: this 291-byte cabinet drove `cab-0.6.0`'s
 /// `seek_to_uncompressed_offset` into an out-of-bounds index (`folder.rs:134`,
-/// "len is 0 but the index is 0"). Patched via [patch.crates-io]; must not panic.
+/// "len is 0 but the index is 0"). The reader is vendored in `formats/cab_parse`
+/// and checks it; must not panic.
 #[test]
 fn malformed_cab_does_not_panic() {
     let data = include_bytes!("../fixtures/cab_folder_panic.cab");
@@ -26,7 +27,7 @@ fn malformed_cab_zero_folder_does_not_panic() {
 
 /// Regression for fuzz-found crash (2026-06-30): CAB triggering underflow in
 /// `FolderReader::read()` (`folder.rs:239`) — `current_offset_within_block`
-/// exceeds `current_block_data.len()`. Patched cab returns 0 gracefully.
+/// exceeds `current_block_data.len()`. The vendored reader returns 0.
 #[test]
 fn malformed_cab_read_underflow_does_not_panic() {
     let data = include_bytes!("../fixtures/cab_read_underflow.cab");
diff --git a/crates/exav-unpack/tests/suites/pdf_empty_password.rs b/crates/exav-unpack/tests/suites/pdf_empty_password.rs
index 6da401de..fef5a853 100644
--- a/crates/exav-unpack/tests/suites/pdf_empty_password.rs
+++ b/crates/exav-unpack/tests/suites/pdf_empty_password.rs
@@ -2,7 +2,7 @@
 //! "encrypted" malicious PDFs — they encrypt only to obstruct scanners, and open
 //! with no prompt) must be transparently decrypted and scanned, across every
 //! standard-security revision: R3/R4 (RC4) and R6 (AES-256). No password supplied.
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 fn recovers_eicar(fixture: &str) -> bool {
     let p = format!(
diff --git a/crates/exav-unpack/tests/suites/pdf_parse.rs b/crates/exav-unpack/tests/suites/pdf_parse.rs
index e4807cba..3fcdfddb 100644
--- a/crates/exav-unpack/tests/suites/pdf_parse.rs
+++ b/crates/exav-unpack/tests/suites/pdf_parse.rs
@@ -7,7 +7,7 @@
 //! * `aes256_encrypted.pdf` — AES-256 encrypted (user: user123, owner: owner456)
 //! * `rc4_40bit_encrypted.pdf` — RC4 40-bit encrypted (user: test, owner: owner)
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 fn fixture(name: &str) -> Vec<u8> {
     let p = format!("{}/test_data/pdf/{name}", env!("CARGO_MANIFEST_DIR"));
diff --git a/crates/exav-unpack/tests/suites/pdf_readers_agree.rs b/crates/exav-unpack/tests/suites/pdf_readers_agree.rs
new file mode 100644
index 00000000..d69eeb2e
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/pdf_readers_agree.rs
@@ -0,0 +1,225 @@
+//! A PDF that a reader opens is a PDF whose streams exav reads.
+//!
+//! Each file here is one that qpdf, pdfium or Acrobat open and show the stream
+//! of, with one thing different from the plain layout: bytes before the header,
+//! a form feed where a space goes, a filter named by a reference or behind a
+//! `/Crypt`, an earlier object that does not end. The stream holds deflated
+//! EICAR, so the string is nowhere in the file.
+
+use exav_unpack::{Budget, Format, Limits, detect, extract};
+use std::io::Write;
+
+fn payload() -> Vec<u8> {
+    [exav_unpack::eicar(), b"\n"].concat().repeat(40)
+}
+
+fn zlib(data: &[u8]) -> Vec<u8> {
+    let mut e = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+    e.write_all(data).unwrap();
+    e.finish().unwrap()
+}
+
+/// `1 0 obj`'s dictionary text up to `/Length`, then the stream.
+fn stream_object(id: u32, dict_extra: &str, raw: &[u8]) -> Vec<u8> {
+    let mut o = format!(
+        "{id} 0 obj\n<< /Length {} {dict_extra} >>\nstream\n",
+        raw.len()
+    )
+    .into_bytes();
+    o.extend_from_slice(raw);
+    o.extend_from_slice(b"\nendstream\nendobj\n");
+    o
+}
+
+fn pdf(lead: &[u8], objects: &[Vec<u8>]) -> Vec<u8> {
+    let mut v = lead.to_vec();
+    v.extend_from_slice(b"%PDF-1.5\n");
+    for o in objects {
+        v.extend_from_slice(o);
+    }
+    v.extend_from_slice(b"trailer\n<< /Root 1 0 R >>\n%%EOF\n");
+    v
+}
+
+fn entries(blob: &[u8]) -> Vec<exav_unpack::Entry> {
+    let mut budget = Budget::new(Limits::default());
+    extract(Format::Pdf, &blob, &mut budget).unwrap()
+}
+
+fn finds_the_payload(blob: &[u8]) -> bool {
+    let eicar = exav_unpack::eicar();
+    assert!(
+        !blob.windows(eicar.len()).any(|w| w == eicar),
+        "the string must not be in the file's bytes"
+    );
+    entries(blob)
+        .iter()
+        .any(|e| e.data.windows(eicar.len()).any(|w| w == eicar))
+}
+
+#[test]
+fn the_plain_layout_is_read() {
+    let p = pdf(
+        b"",
+        &[stream_object(5, "/Filter /FlateDecode", &zlib(&payload()))],
+    );
+    assert_eq!(detect(&p), Some(Format::Pdf));
+    assert!(finds_the_payload(&p));
+}
+
+#[test]
+fn bytes_before_the_header_do_not_make_it_another_file() {
+    let body = stream_object(5, "/Filter /FlateDecode", &zlib(&payload()));
+    for lead in [
+        b"\n".to_vec(),
+        b"\xEF\xBB\xBF".to_vec(),
+        b"Content-Type: application/pdf\r\n\r\n".to_vec(),
+        vec![b'x'; 1000],
+    ] {
+        let p = pdf(&lead, std::slice::from_ref(&body));
+        assert_eq!(detect(&p), Some(Format::Pdf), "{} bytes before", lead.len());
+        assert!(finds_the_payload(&p), "{} bytes before", lead.len());
+    }
+}
+
+#[test]
+fn a_header_far_in_or_without_a_version_is_not_a_pdf() {
+    let body = stream_object(5, "/Filter /FlateDecode", &zlib(&payload()));
+    // Past the first kilobyte, no reader takes it for one.
+    let far = pdf(&vec![b'x'; 1100], std::slice::from_ref(&body));
+    assert_eq!(detect(&far), None);
+    // A text that merely mentions the magic.
+    assert_eq!(detect(b"the header of a PDF is %PDF- and a version"), None);
+}
+
+/// A tar whose first member is a PDF has the magic at byte 512, inside the
+/// first kilobyte, and is a tar.
+#[cfg(feature = "tar")]
+#[test]
+fn a_tar_holding_a_pdf_first_is_a_tar() {
+    let body = stream_object(5, "/Filter /FlateDecode", &zlib(&payload()));
+    let file = pdf(b"", &[body]);
+    let mut tar = tar::Builder::new(Vec::new());
+    let mut h = tar::Header::new_gnu();
+    h.set_size(file.len() as u64);
+    h.set_mode(0o644);
+    h.set_cksum();
+    tar.append_data(&mut h, "report.pdf", &file[..]).unwrap();
+    assert_eq!(detect(&tar.into_inner().unwrap()), Some(Format::Tar));
+}
+
+#[test]
+fn a_form_feed_is_white_space() {
+    let z = zlib(&payload());
+    let filter = stream_object(5, "/Filter\x0c/FlateDecode", &z);
+    assert!(finds_the_payload(&pdf(b"", &[filter])));
+    let mut keyword = stream_object(5, "/Filter /FlateDecode", &z);
+    keyword.splice(..8, b"5\x0c0\x0cobj\n".iter().copied());
+    assert!(finds_the_payload(&pdf(b"", &[keyword])));
+}
+
+#[test]
+fn a_filter_given_by_reference_is_applied() {
+    let z = zlib(&payload());
+    let name = b"7 0 obj\n/FlateDecode\nendobj\n".to_vec();
+    let list = b"8 0 obj\n[ /FlateDecode ]\nendobj\n".to_vec();
+    assert!(finds_the_payload(&pdf(
+        b"",
+        &[name.clone(), stream_object(5, "/Filter 7 0 R", &z)]
+    )));
+    assert!(finds_the_payload(&pdf(
+        b"",
+        &[list, stream_object(5, "/Filter 8 0 R", &z)]
+    )));
+    // The name inside an array, by reference.
+    assert!(finds_the_payload(&pdf(
+        b"",
+        &[name, stream_object(5, "/Filter [ 7 0 R ]", &z)]
+    )));
+}
+
+#[test]
+fn a_filter_given_by_a_reference_to_nothing_is_reported() {
+    let z = zlib(&payload());
+    let es = entries(&pdf(b"", &[stream_object(5, "/Filter 99 0 R", &z)]));
+    assert!(
+        es.iter().any(|e| e.unsupported.is_some()),
+        "a stream whose filter cannot be found must say so: {es:?}"
+    );
+}
+
+#[test]
+fn the_identity_crypt_filter_is_passed_over() {
+    let z = zlib(&payload());
+    let p = pdf(
+        b"",
+        &[stream_object(5, "/Filter [ /Crypt /FlateDecode ]", &z)],
+    );
+    assert!(finds_the_payload(&p));
+}
+
+#[test]
+fn a_filter_nothing_decodes_is_reported() {
+    let z = zlib(&payload());
+    let es = entries(&pdf(
+        b"",
+        &[stream_object(
+            5,
+            "/Filter [ /NoSuchDecode /FlateDecode ]",
+            &z,
+        )],
+    ));
+    assert!(es.iter().any(|e| e.unsupported.is_some()), "{es:?}");
+    // An image codec ends a chain without a word: nothing follows it to hide.
+    let es = entries(&pdf(b"", &[stream_object(5, "/Filter /DCTDecode", &z)]));
+    assert!(es.iter().all(|e| e.unsupported.is_none()), "{es:?}");
+}
+
+#[test]
+fn an_object_that_does_not_end_does_not_hide_the_ones_after_it() {
+    let z = zlib(&payload());
+    let broken = b"3 0 obj\n<< /Note (this string is never closed >>\nendobj\n".to_vec();
+    let p = pdf(b"", &[broken, stream_object(5, "/Filter /FlateDecode", &z)]);
+    assert!(finds_the_payload(&p));
+}
+
+#[test]
+fn a_comment_mark_before_an_object_on_the_same_line_does_not_hide_it() {
+    let z = zlib(&payload());
+    let mut p = pdf(b"", &[stream_object(4, "", b"plain")]);
+    // After the first object's `endobj`, on the line the next one starts on.
+    let after = b"endobj\n";
+    let at = p.windows(after.len()).position(|w| w == after).unwrap() + after.len();
+    let next = stream_object(5, "/Filter /FlateDecode", &z);
+    p.splice(at..at, [b"% a note ".as_slice(), &next].concat());
+    assert!(finds_the_payload(&p));
+}
+
+/// Reading on after an object that does not end costs the bytes read twice. A
+/// file of thousands of objects that each leave a string open would cost the
+/// square of its size, so the re-reading is bounded, and the file says so when
+/// the bound is reached.
+#[test]
+fn many_objects_that_do_not_end_are_bounded_and_reported() {
+    let mut p = b"%PDF-1.5\n".to_vec();
+    for i in 0..6000 {
+        p.extend_from_slice(
+            format!("{} 0 obj\n<< /A (never closed >>\nendobj\n", i + 1).as_bytes(),
+        );
+    }
+    let started = std::time::Instant::now();
+    let es = entries(&p);
+    assert!(
+        started.elapsed() < std::time::Duration::from_secs(20),
+        "took {:?}",
+        started.elapsed()
+    );
+    assert!(
+        es.iter()
+            .any(|e| e.name == "pdf-overlapping-objects" && e.unsupported.is_some()),
+        "{:?}",
+        es.iter()
+            .map(|e| (&e.name, e.unsupported))
+            .collect::<Vec<_>>()
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/pe_emulation.rs b/crates/exav-unpack/tests/suites/pe_emulation.rs
index 30cd629c..da3be756 100644
--- a/crates/exav-unpack/tests/suites/pe_emulation.rs
+++ b/crates/exav-unpack/tests/suites/pe_emulation.rs
@@ -11,7 +11,7 @@
 //! recovered image, a bounded run, and nothing invented when there is nothing
 //! to recover.
 
-use exav_unpack::{extract, is_pepack, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract, is_pepack};
 
 const IMAGE_BASE: u32 = 0x0040_0000;
 const DEST_RVA: u32 = 0x1000;
diff --git a/crates/exav-unpack/tests/suites/pe_emulation_corpus.rs b/crates/exav-unpack/tests/suites/pe_emulation_corpus.rs
index d0b4c895..ddc496d4 100644
--- a/crates/exav-unpack/tests/suites/pe_emulation_corpus.rs
+++ b/crates/exav-unpack/tests/suites/pe_emulation_corpus.rs
@@ -19,7 +19,7 @@
 //! cargo test --release -p exav-unpack --test all -- --ignored pe_emulation_corpus
 //! ```
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use std::path::{Path, PathBuf};
 
 /// Packers where every sample is expected to yield a reconstructed image.
diff --git a/crates/exav-unpack/tests/suites/pe_emulation_techniques.rs b/crates/exav-unpack/tests/suites/pe_emulation_techniques.rs
index 98c8499f..45876a0a 100644
--- a/crates/exav-unpack/tests/suites/pe_emulation_techniques.rs
+++ b/crates/exav-unpack/tests/suites/pe_emulation_techniques.rs
@@ -16,7 +16,7 @@
 //! bytes, and addresses are computed from the layout constants rather than
 //! hard-coded.
 
-use exav_unpack::{extract, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
 
 const BASE: u32 = 0x0040_0000;
 /// Destination section: reserved in memory, empty on disk.
diff --git a/crates/exav-unpack/tests/suites/ppt_embedded_storage.rs b/crates/exav-unpack/tests/suites/ppt_embedded_storage.rs
index 4667353e..0dac2cb6 100644
--- a/crates/exav-unpack/tests/suites/ppt_embedded_storage.rs
+++ b/crates/exav-unpack/tests/suites/ppt_embedded_storage.rs
@@ -11,7 +11,7 @@
 //! The fixtures here are built rather than vendored, so each one isolates a
 //! single property of the record walk.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use std::io::Write;
 
 const MARKER: &[u8] = b"EMBEDDED-OBJECT-MARKER";
@@ -192,3 +192,34 @@ fn a_truncated_deflate_stream_still_yields_what_it_decoded() {
         "a truncated object gave back nothing at all"
     );
 }
+
+/// The record walk ends with the stream. A count of records of its own ended it
+/// at 100,000 and left the objects after them unread, with nothing said.
+#[test]
+#[cfg(feature = "ole")]
+fn an_object_after_many_records_is_still_recovered() {
+    let mut records = record(0x0000, 0x0001, b"").repeat(150_000);
+    records.extend(compressed_storage(MARKER));
+    assert!(
+        has_marker(&members(&ppt_with(&records))),
+        "the object behind 150,000 records was not read"
+    );
+}
+
+/// A record that runs past the end of its stream is read as far as the stream
+/// goes, and reported as cut, not dropped.
+#[test]
+#[cfg(feature = "ole")]
+fn an_object_cut_by_the_end_of_the_stream_is_read_and_reported() {
+    let mut full = stored_storage(MARKER);
+    // The header says more than there is.
+    full[4..8].copy_from_slice(&((MARKER.len() as u32) + 500).to_le_bytes());
+    let es = members(&ppt_with(&full));
+    let cut = es
+        .iter()
+        .find(|e| {
+            e.name.starts_with("ppt-embedded") && e.data.windows(MARKER.len()).any(|w| w == MARKER)
+        })
+        .expect("the part that is there is scanned");
+    assert!(cut.unsupported.is_some(), "{:?}", cut.unsupported);
+}
diff --git a/crates/exav-unpack/tests/suites/protectors.rs b/crates/exav-unpack/tests/suites/protectors.rs
index 1be21291..e74d03cb 100644
--- a/crates/exav-unpack/tests/suites/protectors.rs
+++ b/crates/exav-unpack/tests/suites/protectors.rs
@@ -11,7 +11,7 @@
 //! is the one outcome worse than not unpacking them — it reads identically to
 //! "we looked and found nothing".
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 /// Build a minimal but structurally valid PE with the given section names.
 fn pe_with_sections(names: &[&[u8]]) -> Vec<u8> {
diff --git a/crates/exav-unpack/tests/suites/rar3_ppmd.rs b/crates/exav-unpack/tests/suites/rar3_ppmd.rs
index 2137c0e6..ced5f5a4 100644
--- a/crates/exav-unpack/tests/suites/rar3_ppmd.rs
+++ b/crates/exav-unpack/tests/suites/rar3_ppmd.rs
@@ -12,7 +12,7 @@
 //! * `ppmd_use_after_free*.rar` — crafted malformed PPMd inputs (libarchive
 //!   crash-test corpus); they must fail gracefully without panicking.
 
-use exav_unpack::{unpack29, Budget, Limits};
+use exav_unpack::{Budget, Limits, unpack29};
 
 const RAR4_MAGIC: &[u8] = &[0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x00];
 
diff --git a/crates/exav-unpack/tests/suites/romfs.rs b/crates/exav-unpack/tests/suites/romfs.rs
new file mode 100644
index 00000000..fbfd157c
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/romfs.rs
@@ -0,0 +1,53 @@
+//! romfs: reading the filesystem, which stores its files as they are.
+//!
+//! The images are what `genromfs` writes for the tree of `tree.py`, with a hard
+//! link to a file, a link that holds no file, and (the second) every file
+//! aligned to 512 bytes (`fixtures/fs/make.sh`).
+
+use super::fs_tree::{assert_streams_alike, assert_tree, image, members, pat, tree, walked};
+use exav_unpack::{Format, Limits, detect};
+
+fn want() -> Vec<(String, Vec<u8>)> {
+    let mut want = tree(false);
+    // The hard link is the file it names.
+    want.push(("hard".to_string(), pat(1, 10)));
+    want
+}
+
+#[test]
+fn a_romfs_image_is_recognised() {
+    assert_eq!(detect(&image("romfs")), Some(Format::Romfs));
+}
+
+#[test]
+fn the_tree_comes_out_with_its_hard_link() {
+    for name in ["romfs", "romfs_aligned"] {
+        let e = members(Format::Romfs, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &want())).unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+#[test]
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in ["romfs", "romfs_aligned"] {
+        assert_streams_alike(Format::Romfs, &image(name), 1000);
+    }
+}
+
+/// The files carry the mode a romfs header can say: executable or not.
+#[test]
+fn a_file_comes_with_whether_it_is_executable() {
+    let e = members(Format::Romfs, &image("romfs"));
+    let mode = |n: &str| e.iter().find(|x| x.name == n).unwrap().mode;
+    assert_eq!(mode("tiny.txt"), Some(0o100755));
+    assert_eq!(mode("empty"), Some(0o100644));
+}
+
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("romfs");
+    let (e, end) = walked(Format::Romfs, &img[..40], Limits::default());
+    assert!(e.is_empty() && end.is_err());
+    let (e, end) = walked(Format::Romfs, &img[..img.len() / 2], Limits::default());
+    assert!(end.is_err() || e.iter().any(|x| x.unsupported.is_some()));
+}
diff --git a/crates/exav-unpack/tests/suites/rpm.rs b/crates/exav-unpack/tests/suites/rpm.rs
new file mode 100644
index 00000000..83834cbe
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/rpm.rs
@@ -0,0 +1,113 @@
+//! RPM packages: install scripts and payload as members.
+//!
+//! `tests/fixtures/rpm/hello.rpm` is built by `make.py` next to it, to the
+//! layout of RPM's own file format (lead, signature header, header, payload);
+//! the walker was also run over 155 packages from distributions' repositories.
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+
+fn hello() -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/rpm/hello.rpm",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("read {p}: {e}"))
+}
+
+fn members(blob: &[u8]) -> Result<Vec<Entry>, String> {
+    extract(Format::Rpm, &blob, &mut Budget::new(Limits::default())).map_err(|e| e.reason)
+}
+
+#[test]
+fn scripts_and_payload_are_members() {
+    let blob = hello();
+    assert_eq!(exav_unpack::detect(&blob), Some(Format::Rpm));
+    let m = members(&blob).unwrap();
+    let names: Vec<_> = m.iter().map(|e| e.name.as_str()).collect();
+    assert_eq!(
+        names,
+        [
+            "scripts/prein",
+            "scripts/postin",
+            "scripts/trigger/0",
+            "scripts/trigger/1",
+            "payload.cpio.gz",
+        ]
+    );
+    assert_eq!(m[0].data, b"echo prein");
+    assert_eq!(m[1].data, b"#!/bin/sh\necho postin\n");
+    assert_eq!(m[3].data, b"echo second trigger");
+}
+
+/// The payload is the package's files: gzip, then cpio.
+#[cfg(all(feature = "gzip", feature = "cpio"))]
+#[test]
+fn the_payload_is_the_packages_files() {
+    let payload = members(&hello()).unwrap().pop().unwrap();
+    let mut b = Budget::new(Limits::default());
+    let cpio = extract(Format::Gzip, &payload.data.as_slice(), &mut b).unwrap();
+    assert_eq!(
+        exav_unpack::detect(&cpio[0].data.as_slice()),
+        Some(Format::Cpio)
+    );
+    let files = extract(Format::Cpio, &cpio[0].data.as_slice(), &mut b).unwrap();
+    assert_eq!(files[0].name, "./usr/share/hello/hello.txt");
+    assert_eq!(files[0].data, b"hello from an rpm\n");
+}
+
+/// A package cut short has the scripts and the start of its payload, or is
+/// refused when its headers are cut; it is never taken for whole.
+#[test]
+fn a_cut_package_is_not_silently_whole() {
+    let blob = hello();
+    let payload_at = blob.len() - members(&blob).unwrap().pop().unwrap().data.len();
+    let cut = members(&blob[..blob.len() - 5]).unwrap();
+    assert_eq!(cut.last().unwrap().data.len(), blob.len() - 5 - payload_at);
+    for n in [10, 96, 100, 120, payload_at - 8] {
+        assert!(members(&blob[..n]).is_err(), "cut at {n}");
+    }
+}
+
+/// A header's counts are the file's to claim: past the file, they are refused.
+#[test]
+fn counts_past_the_file_are_refused() {
+    let mut blob = hello();
+    // The signature header's entry count and data size, 96 + 8.
+    blob[104..108].copy_from_slice(&0xFFFFu32.to_be_bytes());
+    blob[108..112].copy_from_slice(&(60u32 << 20).to_be_bytes());
+    assert!(members(&blob).is_err());
+}
+
+/// An RPM of the old kind (a signature that is not a header) is reported, not
+/// read as if it had one.
+#[test]
+fn an_old_style_signature_is_reported() {
+    let mut blob = hello();
+    blob[78..80].copy_from_slice(&1u16.to_be_bytes());
+    let m = members(&blob).unwrap();
+    assert_eq!(m.len(), 1);
+    assert!(m[0].unsupported.is_some());
+}
+
+/// Entries that each point at the same long array of scripts make a member
+/// for every string of every one: they are listed up to a bound, and the rest
+/// is reported.
+#[test]
+fn scripts_listed_are_bounded() {
+    let mut blob = hello()[..96].to_vec();
+    blob.extend([0x8e, 0xad, 0xe8, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    let entries = 300u32;
+    let data = b"a\0".repeat(4096);
+    blob.extend([0x8e, 0xad, 0xe8, 0x01, 0, 0, 0, 0]);
+    blob.extend(entries.to_be_bytes());
+    blob.extend((data.len() as u32).to_be_bytes());
+    for _ in 0..entries {
+        for v in [1065u32, 8, 0, 4096] {
+            blob.extend(v.to_be_bytes());
+        }
+    }
+    blob.extend(data);
+    let m = members(&blob).unwrap();
+    assert!(m.len() <= 4100, "{}", m.len());
+    assert!(m.iter().any(|e| e.unsupported.is_some()));
+}
diff --git a/crates/exav-unpack/tests/suites/sevenz_entries.rs b/crates/exav-unpack/tests/suites/sevenz_entries.rs
new file mode 100644
index 00000000..4c3eafca
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/sevenz_entries.rs
@@ -0,0 +1,82 @@
+//! 7z archives with entries that have no stream (directories and empty
+//! files) among more than eight in all, so that the bit vectors of the
+//! header span two bytes. `many_entries.7z` was written by p7zip 16.02:
+//! `7z a -mx=1 -mtc=off -mta=off many_entries.7z top`, from a tree of three
+//! directories, two empty files and ten files of 54 bytes.
+
+use exav_unpack::{Budget, Format, Limits, extract};
+
+fn fixture() -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/7z/many_entries.7z",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    exav_unpack::read_fixture(&p).unwrap_or_else(|e| panic!("read {p}: {e}"))
+}
+
+#[test]
+fn the_empty_entries_of_a_larger_archive_do_not_misplace_the_names_after_them() {
+    let entries = extract(
+        Format::SevenZip,
+        &fixture(),
+        &mut Budget::new(Limits::default()),
+    )
+    .unwrap();
+    for i in 0..10 {
+        let want = format!("content of file {i}\n").repeat(3);
+        let name = format!("top/file{i}.txt");
+        let e = entries.iter().find(|e| e.name == name).unwrap_or_else(|| {
+            panic!(
+                "{name} among {:?}",
+                entries.iter().map(|e| &e.name).collect::<Vec<_>>()
+            )
+        });
+        assert_eq!(e.data, want.as_bytes(), "{name}");
+    }
+    // A directory is not a file.
+    for dir in ["top", "top/empty_dir", "top/sub"] {
+        assert!(!entries.iter().any(|e| e.name == dir), "{dir}");
+    }
+}
+
+fn crc32(data: &[u8]) -> u32 {
+    let mut crc = !0u32;
+    for &b in data {
+        crc ^= u32::from(b);
+        for _ in 0..8 {
+            crc = (crc >> 1) ^ (0xEDB8_8320 & (crc & 1).wrapping_neg());
+        }
+    }
+    !crc
+}
+
+/// An archive of nothing but a header: `files` entries and `props` properties
+/// of them that mean nothing.
+fn header_only(files: u32, props: usize) -> Vec<u8> {
+    let mut header = vec![0x01, 0x05];
+    // A 7z number of three bytes.
+    header.extend([0xC0 | (files >> 16) as u8, files as u8, (files >> 8) as u8]);
+    for _ in 0..props {
+        header.extend([0x30, 0x00]);
+    }
+    header.extend([0x00, 0x00]);
+    let mut start = Vec::new();
+    start.extend(0u64.to_le_bytes());
+    start.extend((header.len() as u64).to_le_bytes());
+    start.extend(crc32(&header).to_le_bytes());
+    let mut out = b"7z\xBC\xAF\x27\x1C\x00\x04".to_vec();
+    out.extend(crc32(&start).to_le_bytes());
+    out.extend(start);
+    out.extend(header);
+    out
+}
+
+/// The entries without a stream are counted when the property that sets them
+/// is read, not again for every property that follows.
+#[test]
+fn a_header_of_many_properties_over_many_files_is_read_in_linear_time() {
+    let blob = header_only(100_000, 100_000);
+    let start = std::time::Instant::now();
+    let _ = extract(Format::SevenZip, &blob, &mut Budget::new(Limits::default()));
+    assert!(start.elapsed().as_secs() < 3, "{:?}", start.elapsed());
+}
diff --git a/crates/exav-unpack/tests/suites/sevenz_ppmd.rs b/crates/exav-unpack/tests/suites/sevenz_ppmd.rs
index 00ea2668..03bffea6 100644
--- a/crates/exav-unpack/tests/suites/sevenz_ppmd.rs
+++ b/crates/exav-unpack/tests/suites/sevenz_ppmd.rs
@@ -6,7 +6,7 @@
 //! 16 MB), its header left uncompressed so a test can rewrite the packed size
 //! declared in it.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 fn fixture() -> Vec<u8> {
     let p = format!(
diff --git a/crates/exav-unpack/tests/suites/silent_skips.rs b/crates/exav-unpack/tests/suites/silent_skips.rs
index b427f3cf..08e11e96 100644
--- a/crates/exav-unpack/tests/suites/silent_skips.rs
+++ b/crates/exav-unpack/tests/suites/silent_skips.rs
@@ -95,11 +95,11 @@ fn a_cab_member_beyond_its_folder_data_is_reported() {
     blob.extend_from_slice(&0u16.to_le_bytes()); // flags
     blob.extend_from_slice(&0u16.to_le_bytes()); // setID
     blob.extend_from_slice(&0u16.to_le_bytes()); // iCabinet
-                                                 // CFFOLDER
+    // CFFOLDER
     blob.extend_from_slice(&(data_off as u32).to_le_bytes()); // coffCabStart
     blob.extend_from_slice(&1u16.to_le_bytes()); // cCFData
     blob.extend_from_slice(&0u16.to_le_bytes()); // typeCompress = none
-                                                 // CFFILE a: offset 0, fits.
+    // CFFILE a: offset 0, fits.
     blob.extend_from_slice(&(payload.len() as u32).to_le_bytes());
     blob.extend_from_slice(&0u32.to_le_bytes()); // uoffFolderStart
     blob.extend_from_slice(&0u16.to_le_bytes()); // iFolder
diff --git a/crates/exav-unpack/tests/suites/squashfs.rs b/crates/exav-unpack/tests/suites/squashfs.rs
new file mode 100644
index 00000000..95f21a65
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/squashfs.rs
@@ -0,0 +1,80 @@
+//! SquashFS: reading the filesystem, a block at a time.
+//!
+//! The images are what `mksquashfs` writes for the tree of `tree.py`, in each
+//! of its compressions, with blocks of 4 KiB, and with nothing compressed
+//! (`fixtures/fs/make.sh`). The tree has a file of 70 MiB that is holes but for
+//! three places in it, and a link, which holds no file.
+
+use super::fs_tree::{assert_streams_alike, assert_tree, image, members, tree, walked};
+use exav_unpack::{Format, Limits, detect};
+
+const IMAGES: [&str; 8] = [
+    "squashfs_gzip",
+    "squashfs_xz",
+    "squashfs_lzo",
+    "squashfs_lz4",
+    "squashfs_zstd",
+    "squashfs_lzma",
+    "squashfs_small_blocks",
+    "squashfs_uncompressed",
+];
+
+#[test]
+fn a_squashfs_image_is_recognised() {
+    for name in IMAGES {
+        assert_eq!(detect(&image(name)), Some(Format::Squashfs), "{name}");
+    }
+}
+
+/// The same tree comes out of an image in every compression, in blocks of 128
+/// KiB and of 4 KiB, with tails in fragments and without compression, with the
+/// holes of the sparse file read as zeros.
+#[test]
+fn every_compression_reads_the_same_tree() {
+    for name in IMAGES {
+        let e = members(Format::Squashfs, &image(name));
+        std::panic::catch_unwind(|| assert_tree(&e, &tree(true)))
+            .unwrap_or_else(|_| panic!("{name}"));
+    }
+}
+
+/// A file over the buffer limit is read as it goes, whatever compresses its
+/// blocks.
+#[test]
+fn files_over_the_buffer_limit_are_read_as_they_go() {
+    for name in IMAGES {
+        assert_streams_alike(Format::Squashfs, &image(name), 1000);
+    }
+}
+
+/// An image cut short is a filesystem whose tables are not all there; the files
+/// before the cut are partial or reported.
+#[test]
+fn an_image_cut_short_is_reported() {
+    let img = image("squashfs_gzip");
+    let (e, end) = walked(Format::Squashfs, &img[..200], Limits::default());
+    assert!(e.is_empty() && end.is_err());
+    let (e, end) = walked(Format::Squashfs, &img[..img.len() / 2], Limits::default());
+    assert!(end.is_err() || e.iter().any(|x| x.unsupported.is_some()));
+}
+
+/// A block that does not decompress is a file reported with what came before.
+#[test]
+fn a_block_that_does_not_decompress_is_a_file_reported_with_what_precedes_it() {
+    let mut img = image("squashfs_small_blocks");
+    // The data blocks begin after the 96 bytes of the superblock; spoil the
+    // middle of the data, which is a few blocks of a few files.
+    for b in &mut img[2000..3000] {
+        *b ^= 0xA5;
+    }
+    let (e, end) = walked(Format::Squashfs, &img, Limits::default());
+    let _ = end;
+    assert!(
+        e.iter().any(|x| x.unsupported.is_some()),
+        "nothing was reported"
+    );
+    assert!(
+        e.iter().any(|x| x.unsupported.is_none()),
+        "nothing else was read"
+    );
+}
diff --git a/crates/exav-unpack/tests/suites/stream_read_errors.rs b/crates/exav-unpack/tests/suites/stream_read_errors.rs
index a730181e..b451a4a2 100644
--- a/crates/exav-unpack/tests/suites/stream_read_errors.rs
+++ b/crates/exav-unpack/tests/suites/stream_read_errors.rs
@@ -5,7 +5,7 @@
 //! every member past that point without a word.
 
 use exav_unpack::source::BlockCache;
-use exav_unpack::{walk, Budget, Format, Limits, Member};
+use exav_unpack::{Budget, Format, Limits, Member, walk};
 use std::io::{self, Read, Seek, SeekFrom};
 
 /// Seeks anywhere in `len` bytes; every read fails.
diff --git a/crates/exav-unpack/tests/suites/text.rs b/crates/exav-unpack/tests/suites/text.rs
new file mode 100644
index 00000000..474fe9bc
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/text.rs
@@ -0,0 +1,529 @@
+//! The text a reader sees in HTML, in the XML parts of Office and OpenDocument
+//! files, and in PDF.
+
+use exav_unpack::Limits;
+use exav_unpack::text::{Kind, XmlPart, extract, kind};
+
+fn html(src: &str) -> String {
+    extract(Kind::Html, src.as_bytes(), 1 << 20, &Limits::default()).text
+}
+
+fn xml(part: XmlPart, src: &str) -> String {
+    extract(Kind::Xml(part), src.as_bytes(), 1 << 20, &Limits::default()).text
+}
+
+// ── HTML ─────────────────────────────────────────────────────────────────────
+
+#[test]
+fn tags_between_the_letters_of_a_word_do_not_split_it() {
+    assert_eq!(html("cl<b>ick</b> <i>here</i>"), "click here\n");
+}
+
+#[test]
+fn blocks_are_lines_and_a_table_row_is_a_line_with_tabs() {
+    assert_eq!(
+        html("<p>one</p><p>two</p><div>three</div>"),
+        "one\ntwo\nthree\n"
+    );
+    assert_eq!(
+        html("<table><tr><td>a</td><td>b</td></tr><tr><td>c</td></tr></table>"),
+        "a\tb\nc\n"
+    );
+    assert_eq!(html("a<br>b<br/>c"), "a\nb\nc\n");
+}
+
+#[test]
+fn scripts_styles_comments_and_templates_are_not_text() {
+    assert_eq!(
+        html(
+            "a<script>var x = \"<b>no</b>\"; </script><style>p { } </style><!-- hid -->b<template><p>t</p></template>c"
+        ),
+        "abc\n"
+    );
+    // A raw-text element ends at its own end tag only.
+    assert_eq!(html("<style>x</script>y</style>z"), "z\n");
+    assert_eq!(html("<SCRIPT>no</SCRIPT>yes"), "yes\n");
+    // A script that opens a comment and another script ends at the second end tag.
+    assert_eq!(html("<script><!--<script>x</script>y</script>z"), "z\n");
+}
+
+#[test]
+fn entities_are_decoded_whatever_their_name() {
+    assert_eq!(
+        html(
+            "&amp; &lt;b&gt; &hearts; &#65; &#x42; &nbsp;x &zzzz; &CounterClockwiseContourIntegral;"
+        ),
+        "& <b> \u{2665} A B x &zzzz; \u{2233}\n"
+    );
+    // The specification's legacy names need no semicolon.
+    assert_eq!(html("&notit"), "\u{ac}it\n");
+}
+
+#[test]
+fn a_link_is_its_label_and_where_it_leads() {
+    assert_eq!(
+        html("<a href=\"https://evil.example/x?a=1&amp;b=2\">Click <b>here</b></a> now"),
+        "Click here (https://evil.example/x?a=1&b=2) now\n"
+    );
+    // The label that is the target says it once; a fragment leads nowhere.
+    assert_eq!(
+        html("<a href=\"https://a.example/\">https://a.example/</a> <a href=\"#top\">top</a>"),
+        "https://a.example/ top\n"
+    );
+    // Whatever the target is.
+    assert_eq!(
+        html("<a href='javascript:alert(1)'>run</a>"),
+        "run (javascript:alert(1))\n"
+    );
+    // A label naming one site over a target on another is all there to see.
+    let t = html("<a href=\"https://evil.example/steal\">https://www.paypal.com/login</a>");
+    assert!(
+        t.contains("paypal.com/login") && t.contains("(https://evil.example/steal)"),
+        "{t}"
+    );
+    // An unclosed link ends with the document.
+    assert_eq!(html("<a href=x>y"), "y (x)\n");
+}
+
+#[test]
+fn an_image_is_its_alt_text() {
+    assert_eq!(html("a<img src=x alt=\"a diagram\">b"), "a a diagram b\n");
+}
+
+#[test]
+fn title_and_textarea_are_text_as_written() {
+    assert_eq!(
+        html("<title>T &amp; U</title><textarea><b>x</b></textarea>"),
+        "T & U\n<b>x</b>\n"
+    );
+}
+
+#[test]
+fn a_greater_than_in_a_quoted_attribute_does_not_end_the_tag() {
+    assert_eq!(html("<a title=\"a > b\" href=\"u\">t</a>"), "t (u)\n");
+}
+
+#[test]
+fn bytes_that_are_not_utf8_are_read_as_windows_1252() {
+    let t = extract(
+        Kind::Html,
+        b"<p>caf\xe9 \x80</p>",
+        1 << 20,
+        &Limits::default(),
+    )
+    .text;
+    assert_eq!(t, "caf\u{e9} \u{20ac}\n");
+    let utf16: Vec<u8> = [0xff, 0xfe]
+        .into_iter()
+        .chain("<p>hi</p>".encode_utf16().flat_map(u16::to_le_bytes))
+        .collect();
+    assert_eq!(
+        extract(Kind::Html, &utf16, 1 << 20, &Limits::default()).text,
+        "hi\n"
+    );
+}
+
+#[test]
+fn the_text_is_cut_at_the_cap_and_says_so() {
+    let e = extract(
+        Kind::Html,
+        "<p>word </p>".repeat(1000).as_bytes(),
+        100,
+        &Limits::default(),
+    );
+    assert!(e.truncated);
+    assert!(e.text.len() <= 101, "{}", e.text.len());
+    assert!(!extract(Kind::Html, b"<p>a</p>", 100, &Limits::default()).truncated);
+}
+
+#[test]
+fn hostile_html_is_bounded_in_time_and_stack() {
+    let inputs = [
+        "<a href=\"".repeat(100_000),
+        "<".repeat(500_000),
+        "<div>".repeat(300_000),
+        "<!--".repeat(100_000),
+        "&".repeat(500_000),
+        "<a ".repeat(200_000),
+        "<script>".repeat(100_000),
+        "<p a=b ".repeat(100_000),
+    ];
+    for src in inputs {
+        let started = std::time::Instant::now();
+        let src = src.clone();
+        std::thread::Builder::new()
+            .stack_size(512 * 1024)
+            .spawn(move || {
+                extract(Kind::Html, src.as_bytes(), 1 << 22, &Limits::default())
+                    .text
+                    .len()
+            })
+            .unwrap()
+            .join()
+            .expect("no panic, no stack overflow");
+        assert!(started.elapsed().as_secs() < 20, "{:?}", started.elapsed());
+    }
+}
+
+// ── XML parts ────────────────────────────────────────────────────────────────
+
+#[test]
+fn a_word_document_is_its_paragraphs_without_field_codes_and_deleted_text() {
+    let doc = r#"<w:document xmlns:w="x"><w:body>
+        <w:p><w:r><w:t>Hello</w:t></w:r><w:r><w:t xml:space="preserve"> world</w:t></w:r></w:p>
+        <w:p><w:r><w:instrText>HYPERLINK "http://x.example"</w:instrText></w:r>
+            <w:del><w:r><w:delText>gone</w:delText></w:r></w:del><w:r><w:t>Second</w:t><w:tab/><w:t>tabbed &amp; &#65;</w:t></w:r></w:p>
+        </w:body></w:document>"#;
+    assert_eq!(xml(XmlPart::Word, doc), "Hello world\nSecond tabbed & A\n");
+}
+
+#[test]
+fn slides_shared_strings_and_sheets_have_their_own_places_for_text() {
+    assert_eq!(
+        xml(
+            XmlPart::Slide,
+            "<p:sld><a:p><a:r><a:t>Title</a:t></a:r></a:p><a:p><a:r><a:t>Body</a:t></a:r><a:br/><a:r><a:t>next</a:t></a:r></a:p></p:sld>"
+        ),
+        "Title\nBody\nnext\n"
+    );
+    assert_eq!(
+        xml(
+            XmlPart::SharedStrings,
+            "<sst><si><t>one</t></si><si><r><t>tw</t></r><r><t>o</t></r></si></sst>"
+        ),
+        "one\ntwo\n"
+    );
+    assert_eq!(
+        xml(
+            XmlPart::Sheet,
+            "<worksheet><sheetData><row><c t=\"s\"><v>5</v></c><c><f>HYPERLINK(\"http://x\",\"y\")</f><v>0</v></c></row><row><c t=\"inlineStr\"><is><t>z</t></is></c></row></sheetData></worksheet>"
+        ),
+        "HYPERLINK(\"http://x\",\"y\")\nz\n"
+    );
+}
+
+#[test]
+fn opendocument_text_is_read_wherever_it_is() {
+    assert_eq!(
+        xml(
+            XmlPart::Odf,
+            "<office:text><text:h>Head</text:h><text:p>a <text:span>b</text:span><text:s/>c<text:line-break/>d</text:p><table:table-row><table:table-cell><text:p>x</text:p></table:table-cell><table:table-cell><text:p>y</text:p></table:table-cell></table:table-row></office:text>"
+        ),
+        "Head\na b c\nd\nx\ty\n"
+    );
+}
+
+#[test]
+fn a_custom_entity_is_never_expanded_and_damage_ends_the_reading_not_the_scan() {
+    let bomb = "<!DOCTYPE d [<!ENTITY a \"aaaaaaaaaa\"><!ENTITY b \"&a;&a;&a;&a;&a;&a;&a;&a;&a;&a;\">]><w:document><w:p><w:t>&b;ok</w:t></w:p></w:document>";
+    let t = xml(XmlPart::Word, bomb);
+    assert!(t.len() < 100, "{t}");
+    assert_eq!(
+        xml(XmlPart::Word, "<w:p><w:t>before</w:t></w:p><w:p><w:t>cut"),
+        "before\ncut\n"
+    );
+    assert_eq!(xml(XmlPart::Word, "<<<>>>&&& <w:t"), "");
+}
+
+// ── what a document is ───────────────────────────────────────────────────────
+
+#[test]
+fn a_document_is_known_by_its_bytes_or_its_path() {
+    assert_eq!(
+        kind("x", b"%PDF-1.7\n"),
+        cfg!(feature = "text-pdf").then_some(Kind::Pdf)
+    );
+    assert_eq!(kind("x", b"\n\n<!DOCTYPE html><html>"), Some(Kind::Html));
+    assert_eq!(kind("a.htm", b"plain"), Some(Kind::Html));
+    assert_eq!(kind("x", b"<HTML><BODY>"), Some(Kind::Html));
+    assert_eq!(
+        kind("word/document.xml", b"<?xml"),
+        Some(Kind::Xml(XmlPart::Word))
+    );
+    assert_eq!(
+        kind("xl/worksheets/sheet3.xml", b"<?xml"),
+        Some(Kind::Xml(XmlPart::Sheet))
+    );
+    // A fragment, as an email's body is.
+    assert_eq!(kind("x", b"Hi <a href='u'>there</a>"), Some(Kind::Html));
+    // Markup is text: a binary file by any of these names is not.
+    assert_eq!(kind("a.html", b"PK\x03\x04\0\0\0"), None);
+    assert_eq!(kind("word/document.xml", b"\x89PNG\r\n\x1a\n\0\0"), None);
+    assert_eq!(kind("notes.txt", b"just words"), None);
+    assert_eq!(kind("x", b""), None);
+}
+
+// ── PDF ──────────────────────────────────────────────────────────────────────
+
+#[cfg(feature = "text-pdf")]
+mod pdf {
+    use super::*;
+
+    /// A PDF of one page with the text drawn by `content`, in the font
+    /// dictionary `font` (not embedded: a standard font).
+    fn pdf(content: &str, font: &str) -> Vec<u8> {
+        pdf_objects(content, font, "")
+    }
+
+    fn pdf_objects(content: &str, font: &str, extra: &str) -> Vec<u8> {
+        let mut out = b"%PDF-1.4\n".to_vec();
+        let mut offsets = Vec::new();
+        let mut put = |out: &mut Vec<u8>, body: &str| {
+            offsets.push(out.len());
+            out.extend_from_slice(format!("{} 0 obj\n{body}\nendobj\n", offsets.len()).as_bytes());
+        };
+        put(&mut out, "<</Type/Catalog/Pages 2 0 R>>");
+        put(&mut out, "<</Type/Pages/Kids[3 0 R]/Count 1>>");
+        put(
+            &mut out,
+            "<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>",
+        );
+        put(
+            &mut out,
+            &format!(
+                "<</Length {}>>\nstream\n{content}\nendstream",
+                content.len()
+            ),
+        );
+        put(&mut out, font);
+        if !extra.is_empty() {
+            put(&mut out, extra);
+        }
+        let xref = out.len();
+        out.extend_from_slice(
+            format!("xref\n0 {}\n0000000000 65535 f \n", offsets.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",
+                offsets.len() + 1
+            )
+            .as_bytes(),
+        );
+        out
+    }
+
+    const HELVETICA: &str =
+        "<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>";
+
+    fn text(pdf: &[u8]) -> String {
+        extract(Kind::Pdf, pdf, 1 << 20, &Limits::default()).text
+    }
+
+    #[test]
+    fn the_lines_and_words_of_a_page() {
+        let p = pdf(
+            "BT /F1 12 Tf 72 700 Td (Hello World) Tj 0 -20 Td (Second ) Tj (line) Tj ET",
+            HELVETICA,
+        );
+        assert_eq!(text(&p), "Hello World\nSecond line\n");
+    }
+
+    #[test]
+    fn a_kerned_word_stays_whole_and_a_gap_is_a_space() {
+        let p = pdf(
+            "BT /F1 12 Tf 72 700 Td [(W) 80 (ord) -600 (next)] TJ ET",
+            HELVETICA,
+        );
+        assert_eq!(text(&p), "Word next\n");
+    }
+
+    #[test]
+    fn the_fonts_to_unicode_map_decides_what_the_codes_are() {
+        // Code 0x41 is shown as "Z" by the font's own map.
+        let cmap = "/CIDInit /ProcSet findresource begin 12 dict begin begincmap 1 begincodespacerange <00> <FF> endcodespacerange 1 beginbfchar <41> <005A> endbfchar endcmap";
+        let font = "<</Type/Font/Subtype/Type1/BaseFont/Helvetica/ToUnicode 6 0 R>>";
+        let extra = format!("<</Length {}>>\nstream\n{cmap}\nendstream", cmap.len());
+        let p = pdf_objects("BT /F1 12 Tf 72 700 Td (AAB) Tj ET", font, &extra);
+        assert_eq!(text(&p), "ZZB\n");
+    }
+
+    #[test]
+    fn a_flate_stream_is_read_and_a_bomb_is_cut_not_read() {
+        use std::io::Write;
+        let content = "BT /F1 12 Tf 72 700 Td (compressed text) Tj ET";
+        let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+        z.write_all(content.as_bytes()).unwrap();
+        let z = z.finish().unwrap();
+        // A page, its content stream deflated.
+        let mut out = b"%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>endobj\n".to_vec();
+        out.extend_from_slice(
+            format!(
+                "4 0 obj<</Length {}/Filter/FlateDecode>>\nstream\n",
+                z.len()
+            )
+            .as_bytes(),
+        );
+        out.extend_from_slice(&z);
+        out.extend_from_slice(
+            format!(
+                "\nendstream\nendobj\n5 0 obj{HELVETICA}endobj\ntrailer<</Root 1 0 R>>\n%%EOF\n"
+            )
+            .as_bytes(),
+        );
+        assert_eq!(text(&out), "compressed text\n");
+
+        // 64 MiB of spaces in a 64 KiB stream, against a 1 MiB limit.
+        let mut z = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::best());
+        let chunk = vec![b' '; 1 << 20];
+        for _ in 0..64 {
+            z.write_all(&chunk).unwrap();
+        }
+        let z = z.finish().unwrap();
+        let mut bomb = b"%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 9 9]/Contents 4 0 R>>endobj\n".to_vec();
+        bomb.extend_from_slice(
+            format!(
+                "4 0 obj<</Length {}/Filter/FlateDecode>>\nstream\n",
+                z.len()
+            )
+            .as_bytes(),
+        );
+        bomb.extend_from_slice(&z);
+        bomb.extend_from_slice(b"\nendstream\nendobj\ntrailer<</Root 1 0 R>>\n%%EOF\n");
+        let mut limits = Limits::default();
+        limits.max_buffer_bytes = 1 << 20;
+        let e = extract(Kind::Pdf, &bomb, 1 << 20, &limits);
+        assert!(e.truncated, "a stream past the limit is cut");
+        assert!(e.text.is_empty());
+    }
+
+    #[test]
+    fn an_image_that_declares_a_size_hayro_would_allocate_is_not_read() {
+        // hayro sizes its buffers by the dictionary: a 100000 by 100000 JBIG2
+        // image in a 123 KB file took it 8.9 GB.
+        let image = |w: u32, h: u32| {
+            let content = "BT /F1 12 Tf 72 700 Td (visible words) Tj ET /Im0 Do";
+            format!(
+                "%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n\
+                 3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>/XObject<</Im0 6 0 R>>>>/Contents 4 0 R>>endobj\n\
+                 4 0 obj<</Length {}>>\nstream\n{content}\nendstream\nendobj\n\
+                 5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>endobj\n\
+                 6 0 obj<</Type/XObject/Subtype/Image/Width {w}/Height {h}/ColorSpace/DeviceGray/BitsPerComponent 8/Length 4>>\nstream\nabcd\nendstream\nendobj\n\
+                 trailer<</Root 1 0 R>>\n%%EOF\n",
+                content.len()
+            )
+            .into_bytes()
+        };
+        let big = extract(
+            Kind::Pdf,
+            &image(100_000, 100_000),
+            1 << 20,
+            &Limits::default(),
+        );
+        assert!(big.truncated && big.text.is_empty(), "{big:?}");
+        // An ordinary image is no reason to refuse the page.
+        let small = extract(Kind::Pdf, &image(640, 480), 1 << 20, &Limits::default());
+        assert!(!small.truncated);
+        assert_eq!(small.text, "visible words\n");
+    }
+
+    /// A PDF whose page content is `stream`, with `filter`.
+    fn pdf_with_stream(filter: &str, stream: &[u8]) -> Vec<u8> {
+        let mut v = format!(
+            "%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n\
+             3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 9 9]/Contents 4 0 R>>endobj\n\
+             4 0 obj<</Length {}/Filter/{filter}>>\nstream\n",
+            stream.len()
+        )
+        .into_bytes();
+        v.extend_from_slice(stream);
+        v.extend_from_slice(b"\nendstream\nendobj\ntrailer<</Root 1 0 R>>\n%%EOF\n");
+        v
+    }
+
+    #[test]
+    fn image_data_whose_header_declares_a_huge_page_is_not_read() {
+        // A JBIG2 page information segment for 100000 by 100000 pixels: the
+        // shape of the 123 KB file that took hayro 8.9 GB.
+        let mut jbig2 = vec![0, 0, 0, 0, 0x30, 0x00, 0x01, 0, 0, 0, 19];
+        jbig2.extend_from_slice(&100_000u32.to_be_bytes());
+        jbig2.extend_from_slice(&100_000u32.to_be_bytes());
+        jbig2.extend_from_slice(&[0; 11]);
+        let bomb = extract(
+            Kind::Pdf,
+            &pdf_with_stream("JBIG2Decode", &jbig2),
+            1 << 20,
+            &Limits::default(),
+        );
+        assert!(bomb.truncated, "{bomb:?}");
+        // The same page at a size a scan has.
+        let mut small = jbig2.clone();
+        small[11..15].copy_from_slice(&2000u32.to_be_bytes());
+        small[15..19].copy_from_slice(&3000u32.to_be_bytes());
+        let ok = extract(
+            Kind::Pdf,
+            &pdf_with_stream("JBIG2Decode", &small),
+            1 << 20,
+            &Limits::default(),
+        );
+        assert!(!ok.truncated, "{ok:?}");
+
+        // A JPEG of 65535 by 65535, and one of 640 by 480.
+        let jpeg = |w: u16, h: u16| {
+            let mut j = vec![0xff, 0xd8, 0xff, 0xc0, 0, 17, 8];
+            j.extend_from_slice(&h.to_be_bytes());
+            j.extend_from_slice(&w.to_be_bytes());
+            j.extend_from_slice(&[3, 1, 0x22, 0, 2, 0x11, 1, 3, 0x11, 1, 0xff, 0xd9]);
+            j
+        };
+        assert!(
+            extract(
+                Kind::Pdf,
+                &pdf_with_stream("DCTDecode", &jpeg(65535, 65535)),
+                1 << 20,
+                &Limits::default()
+            )
+            .truncated
+        );
+        assert!(
+            !extract(
+                Kind::Pdf,
+                &pdf_with_stream("DCTDecode", &jpeg(640, 480)),
+                1 << 20,
+                &Limits::default()
+            )
+            .truncated
+        );
+
+        // A JPEG 2000 codestream whose SIZ says 100000 by 100000.
+        let mut jpx = vec![0xff, 0x4f, 0xff, 0x51, 0, 41, 0, 0];
+        jpx.extend_from_slice(&100_000u32.to_be_bytes());
+        jpx.extend_from_slice(&100_000u32.to_be_bytes());
+        jpx.extend_from_slice(&[0; 8]);
+        assert!(
+            extract(
+                Kind::Pdf,
+                &pdf_with_stream("JPXDecode", &jpx),
+                1 << 20,
+                &Limits::default()
+            )
+            .truncated
+        );
+        // Image data whose header cannot be read is refused too.
+        assert!(
+            extract(
+                Kind::Pdf,
+                &pdf_with_stream("JBIG2Decode", b"nonsense"),
+                1 << 20,
+                &Limits::default()
+            )
+            .truncated
+        );
+    }
+
+    #[test]
+    fn what_is_not_a_pdf_has_no_text_and_does_not_panic() {
+        for data in [
+            &b""[..],
+            b"%PDF-",
+            b"%PDF-1.4\n1 0 obj<<>>endobj",
+            b"%PDF-1.4 garbage \xff\xfe\x00",
+        ] {
+            let e = extract(Kind::Pdf, data, 1 << 20, &Limits::default());
+            assert!(e.text.is_empty());
+        }
+    }
+}
diff --git a/crates/exav-unpack/tests/suites/udf.rs b/crates/exav-unpack/tests/suites/udf.rs
index 8449a520..c7c8aace 100644
--- a/crates/exav-unpack/tests/suites/udf.rs
+++ b/crates/exav-unpack/tests/suites/udf.rs
@@ -22,7 +22,7 @@
 //! The bytes inside are genisoimage's.
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 /// `sha256sum` of what `7zz x` writes for each member.
 const README_SHA256: &str = "8d2f3443b4461106fa29ee57260e553ee6acb25cc0a00a28a777013d2420985e";
diff --git a/crates/exav-unpack/tests/suites/upx_rebuild.rs b/crates/exav-unpack/tests/suites/upx_rebuild.rs
index 5b72b659..4fbfa4e9 100644
--- a/crates/exav-unpack/tests/suites/upx_rebuild.rs
+++ b/crates/exav-unpack/tests/suites/upx_rebuild.rs
@@ -24,7 +24,7 @@
 //! is handed over only when no candidate matches it, and never when checksums
 //! are verified.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 /// Assemble a minimal UPX-packed PE whose payload is a stored (uncompressed)
 /// run — enough to drive routing and the rebuild without depending on the NRV
diff --git a/crates/exav-unpack/tests/suites/vba_module_source.rs b/crates/exav-unpack/tests/suites/vba_module_source.rs
index 72f69551..33d5a56e 100644
--- a/crates/exav-unpack/tests/suites/vba_module_source.rs
+++ b/crates/exav-unpack/tests/suites/vba_module_source.rs
@@ -12,7 +12,7 @@
 //! and the ContainsMacros heuristic still fires, while every macro-content
 //! signature quietly matches nothing.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use std::io::Write;
 
 /// An MS-OVBA CompressedContainer holding `payload` in one UNCOMPRESSED chunk.
@@ -281,3 +281,42 @@ fn an_ole10native_payload_with_a_counted_temp_path_is_carved() {
         .expect("the payload");
     assert_eq!(carved.data, PAYLOAD);
 }
+
+/// A payload the budget has no room for is a member that says so, where it was
+/// dropped without a word.
+#[test]
+fn an_ole10native_payload_over_the_budget_is_reported_not_dropped() {
+    let payload = vec![0x41u8; 4096];
+    let mut stream = Vec::new();
+    stream.extend_from_slice(&0u32.to_le_bytes());
+    stream.extend_from_slice(&2u16.to_le_bytes());
+    stream.extend_from_slice(b"invoice.exe\0");
+    stream.extend_from_slice(b"C:\\Users\\x\\invoice.exe\0");
+    stream.extend_from_slice(b"C:\\Temp\\invoice.exe\0");
+    stream.extend_from_slice(&(payload.len() as u32).to_le_bytes());
+    stream.extend_from_slice(&payload);
+
+    let mut cf = cfb::CompoundFile::create(std::io::Cursor::new(Vec::<u8>::new())).unwrap();
+    cf.create_stream("/\u{1}Ole10Native")
+        .unwrap()
+        .write_all(&stream)
+        .unwrap();
+    cf.flush().unwrap();
+    let blob = cf.into_inner().into_inner();
+
+    // Room for the stream and not for the payload carved out of it.
+    let mut limits = Limits::default();
+    limits.max_extracted_bytes = stream.len() as u64 + 512;
+    let mut budget = Budget::new(limits);
+    let entries = extract(Format::Ole, &blob, &mut budget).expect("extract OLE");
+    let carved = entries
+        .iter()
+        .find(|e| e.name.contains("Ole10Native-payload"))
+        .unwrap_or_else(|| {
+            panic!(
+                "the payload must be reported; got {:?}",
+                entries.iter().map(|e| &e.name).collect::<Vec<_>>()
+            )
+        });
+    assert!(carved.unsupported.is_some(), "{:?}", carved.unsupported);
+}
diff --git a/crates/exav-unpack/tests/suites/virtual_disks.rs b/crates/exav-unpack/tests/suites/virtual_disks.rs
new file mode 100644
index 00000000..444c2d6e
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/virtual_disks.rs
@@ -0,0 +1,1263 @@
+//! Virtual disks and filesystems too big to hold, walked where they lie.
+//!
+//! A QCOW2, VMDK, VHD or VHDX declares a disk size that is not the file's, and
+//! a raw disk image can be larger than the buffer limit. Whichever it is, a file
+//! near the end of a disk of many GiB has to come out without the disk being
+//! built: the image is read where the filesystem walk goes, and an unallocated
+//! range costs nothing.
+//!
+//! Two kinds of image are used. The `fat4g.*` fixtures are what `qemu-img`
+//! writes for a 4 GiB disk holding an MBR and a FAT volume at 3 GiB, so the
+//! container layouts are those of the tools that make them:
+//!
+//! ```sh
+//! # disk.raw: 4 GiB sparse, the MBR at 0, fat/fragmented.img at 3 GiB
+//! qemu-img convert -f raw -O qcow2 -o cluster_size=4096 disk.raw plain.qcow2
+//! qemu-img convert -f raw -O qcow2 -c -o cluster_size=4096 disk.raw deflate.qcow2
+//! qemu-img convert -f raw -O qcow2 -c -o cluster_size=4096,compression_type=zstd disk.raw zstd.qcow2
+//! qemu-img convert -f raw -O vmdk -o subformat=monolithicSparse disk.raw sparse.vmdk
+//! qemu-img convert -f raw -O vmdk -o subformat=streamOptimized disk.raw stream.vmdk
+//! qemu-img convert -f raw -O vpc -o subformat=dynamic,force_size=on disk.raw dynamic.vhd
+//! qemu-img convert -f raw -O vhdx -o block_size=1M disk.raw dynamic.vhdx
+//! ```
+//!
+//! Each is stored gzipped. The others are written here, so a disk can be a
+//! terabyte, an NTFS volume can lie in it, and a table can be made hostile.
+
+use super::extract_each;
+use exav_unpack::{Budget, Entry, Format, LimitHit, Limits};
+use std::collections::BTreeMap;
+
+const SECTOR: u64 = 512;
+const KIB: u64 = 1 << 10;
+const MIB: u64 = 1 << 20;
+const GIB: u64 = 1 << 30;
+
+/// `sha256sum` of the ZIP in `fat/fragmented.img`, which the walk of the FAT
+/// volume has to reproduce.
+const FAT_PAYLOAD: &str = "aa3029a89a5e657f2d4fa85d3c352d348c08d30b04b924417d7e8b2c3a6bb342";
+/// `sha256sum` of what `ntfscat` returns for `payload.zip` of the NTFS fixture.
+const NTFS_PAYLOAD: &str = "49c7e4f4b184954a212c78c87c17705cd4c16f0b8c83a5cd6a750369c47957c5";
+
+fn sha256_hex(data: &[u8]) -> String {
+    use sha2::{Digest, Sha256};
+    let mut h = Sha256::new();
+    h.update(data);
+    h.finalize().iter().map(|b| format!("{b:02x}")).collect()
+}
+
+fn gunzipped(name: &str) -> Vec<u8> {
+    super::diskimage::fixture(&format!("{name}.gz"))
+}
+
+// ─── Images ──────────────────────────────────────────────────────────────────
+
+/// Pieces of a disk: `(offset, bytes)`, the rest of it zeros.
+type Pieces = Vec<(u64, Vec<u8>)>;
+
+/// A disk with an MBR listing one partition of type `ptype` holding `volume`
+/// at `at`.
+fn mbr_disk(at: u64, volume: Vec<u8>, ptype: u8) -> Pieces {
+    let mut mbr = vec![0u8; 512];
+    mbr[0x1BE] = 0x80;
+    mbr[0x1BE + 4] = ptype;
+    mbr[0x1BE + 8..0x1BE + 12].copy_from_slice(&u32::try_from(at / SECTOR).unwrap().to_le_bytes());
+    mbr[0x1BE + 12..0x1BE + 16].copy_from_slice(
+        &u32::try_from(volume.len() as u64 / SECTOR)
+            .unwrap()
+            .to_le_bytes(),
+    );
+    mbr[510] = 0x55;
+    mbr[511] = 0xAA;
+    vec![(0, mbr), (at, volume)]
+}
+
+/// The units of `unit` bytes of a disk that hold anything but zeros.
+fn units(pieces: &Pieces, unit: u64) -> BTreeMap<u64, Vec<u8>> {
+    let mut m: BTreeMap<u64, Vec<u8>> = BTreeMap::new();
+    for (off, bytes) in pieces {
+        let mut pos = 0usize;
+        while pos < bytes.len() {
+            let abs = off + pos as u64;
+            let (idx, into) = (abs / unit, (abs % unit) as usize);
+            let n = (unit as usize - into).min(bytes.len() - pos);
+            let u = m.entry(idx).or_insert_with(|| vec![0; unit as usize]);
+            u[into..into + n].copy_from_slice(&bytes[pos..pos + n]);
+            pos += n;
+        }
+    }
+    m.retain(|_, u| u.iter().any(|&b| b != 0));
+    m
+}
+
+#[derive(Clone, Copy, PartialEq)]
+enum Packing {
+    Stored,
+    Deflate,
+    #[cfg(feature = "zstd")]
+    Zstd,
+}
+
+fn deflate(data: &[u8]) -> Vec<u8> {
+    use std::io::Write;
+    let mut w = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::default());
+    w.write_all(data).unwrap();
+    w.finish().unwrap()
+}
+
+fn zlib(data: &[u8]) -> Vec<u8> {
+    use std::io::Write;
+    let mut w = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
+    w.write_all(data).unwrap();
+    w.finish().unwrap()
+}
+
+/// A QCOW2 of `size` bytes holding `pieces`, its clusters stored or compressed.
+fn qcow2(size: u64, cluster_bits: u32, pieces: &Pieces, packing: Packing) -> Vec<u8> {
+    let cluster = 1u64 << cluster_bits;
+    let l2n = cluster / 8;
+    let l1_size = size.div_ceil(l2n * cluster);
+    let l1_clusters = (l1_size * 8).div_ceil(cluster);
+    let mut file = vec![0u8; ((1 + l1_clusters) * cluster) as usize];
+    let csize_shift = 62 - (cluster_bits - 8);
+    let mut l2: BTreeMap<u64, Vec<u64>> = BTreeMap::new();
+    for (idx, data) in units(pieces, cluster) {
+        let packed = match packing {
+            Packing::Stored => None,
+            Packing::Deflate => Some(deflate(&data)),
+            #[cfg(feature = "zstd")]
+            Packing::Zstd => Some(ruzstd::encoding::compress_to_vec(
+                &data[..],
+                ruzstd::encoding::CompressionLevel::Fastest,
+            )),
+        }
+        .filter(|p| (p.len() as u64) < cluster);
+        let entry = match packed {
+            Some(p) => {
+                // Packed end to end, whatever the offset.
+                let at = file.len() as u64;
+                file.extend_from_slice(&p);
+                let sectors = ((at % SECTOR) + p.len() as u64).div_ceil(SECTOR);
+                (1 << 62) | at | ((sectors - 1) << csize_shift)
+            }
+            None => {
+                file.resize(file.len().next_multiple_of(cluster as usize), 0);
+                let at = file.len() as u64;
+                file.extend_from_slice(&data);
+                (1 << 63) | at
+            }
+        };
+        l2.entry(idx / l2n).or_insert_with(|| vec![0; l2n as usize])[(idx % l2n) as usize] = entry;
+    }
+    let mut l1 = vec![0u64; l1_size as usize];
+    for (i, table) in l2 {
+        file.resize(file.len().next_multiple_of(cluster as usize), 0);
+        l1[i as usize] = (1 << 63) | file.len() as u64;
+        for e in table {
+            file.extend_from_slice(&e.to_be_bytes());
+        }
+    }
+    for (i, e) in l1.iter().enumerate() {
+        let at = cluster as usize + i * 8;
+        file[at..at + 8].copy_from_slice(&e.to_be_bytes());
+    }
+    file[..4].copy_from_slice(b"QFI\xfb");
+    file[4..8].copy_from_slice(&2u32.to_be_bytes());
+    file[20..24].copy_from_slice(&cluster_bits.to_be_bytes());
+    file[24..32].copy_from_slice(&size.to_be_bytes());
+    file[36..40].copy_from_slice(&(l1_size as u32).to_be_bytes());
+    file[40..48].copy_from_slice(&cluster.to_be_bytes());
+    #[cfg(feature = "zstd")]
+    if packing == Packing::Zstd {
+        // Version 3 with the compression-type feature, type 1 (zstd).
+        file[4..8].copy_from_slice(&3u32.to_be_bytes());
+        file[72..80].copy_from_slice(&(1u64 << 3).to_be_bytes());
+        file[100..104].copy_from_slice(&112u32.to_be_bytes());
+        file[104] = 1;
+    }
+    file
+}
+
+/// A dynamic VHD of `size` bytes holding `pieces`.
+fn vhd(size: u64, block: u32, pieces: &Pieces) -> Vec<u8> {
+    use super::vhd::{dyn_header, footer};
+    let blocks = units(pieces, u64::from(block));
+    let max_entries = size.div_ceil(u64::from(block)) as u32;
+    let bat_off = 512 + 1024;
+    let bat_len = (max_entries as usize * 4).next_multiple_of(512);
+    let mut file = footer(3, 512, size);
+    file.extend(dyn_header(bat_off as u64, max_entries, block));
+    file.resize(bat_off + bat_len, 0);
+    let mut bat = vec![0xFFu8; max_entries as usize * 4];
+    let bitmap = (block as usize / 512).div_ceil(8).next_multiple_of(512);
+    for (idx, data) in blocks {
+        let start = file.len();
+        bat[idx as usize * 4..idx as usize * 4 + 4]
+            .copy_from_slice(&((start / 512) as u32).to_be_bytes());
+        file.resize(start + bitmap, 0);
+        file.extend_from_slice(&data);
+    }
+    file[bat_off..bat_off + bat.len()].copy_from_slice(&bat);
+    file.extend(footer(3, 512, size));
+    file
+}
+
+/// A dynamic VHDX of `size` bytes holding `pieces`, in blocks of `block`.
+fn vhdx(size: u64, block: u32, pieces: &Pieces) -> Vec<u8> {
+    const BAT: [u8; 16] = [
+        0x66, 0x77, 0xc2, 0x2d, 0x23, 0xf6, 0x00, 0x42, 0x9d, 0x64, 0x11, 0x5e, 0x9b, 0xfd, 0x4a,
+        0x08,
+    ];
+    const META: [u8; 16] = [
+        0x06, 0xa2, 0x7c, 0x8b, 0x90, 0x47, 0x9a, 0x4b, 0xb8, 0xfe, 0x57, 0x5f, 0x05, 0x0f, 0x88,
+        0x6e,
+    ];
+    const FILE_PARAMS: [u8; 16] = [
+        0x37, 0x67, 0xa1, 0xca, 0x36, 0xfa, 0x43, 0x4d, 0xb3, 0xb6, 0x33, 0xf0, 0xaa, 0x44, 0xe7,
+        0x6b,
+    ];
+    const DISK_SIZE: [u8; 16] = [
+        0x24, 0x42, 0xa5, 0x2f, 0x1b, 0xcd, 0x76, 0x48, 0xb2, 0x11, 0x5d, 0xbe, 0xd8, 0x3b, 0xf4,
+        0xb8,
+    ];
+    const SECTOR_SIZE: [u8; 16] = [
+        0x1d, 0xbf, 0x41, 0x81, 0x6f, 0xa9, 0x09, 0x47, 0xba, 0x47, 0xf2, 0x33, 0xa8, 0xfa, 0xab,
+        0x5f,
+    ];
+    let blocks = units(pieces, u64::from(block));
+    let total = size.div_ceil(u64::from(block));
+    let ratio = (1u64 << 23) * 512 / u64::from(block);
+    let bat_entries = total + total / ratio + 1;
+    let bat_off = MIB as usize;
+    let bat_len = (bat_entries as usize * 8).next_multiple_of(MIB as usize);
+    let meta_off = bat_off + bat_len;
+    let data_start = meta_off + MIB as usize;
+    let mut file = vec![0u8; data_start];
+    file[..8].copy_from_slice(b"vhdxfile");
+    let table = 192 * KIB as usize;
+    file[table..table + 4].copy_from_slice(b"regi");
+    file[table + 8..table + 12].copy_from_slice(&2u32.to_le_bytes());
+    for (i, (guid, off, len)) in [(BAT, bat_off, bat_len), (META, meta_off, MIB as usize)]
+        .into_iter()
+        .enumerate()
+    {
+        let e = table + 16 + i * 32;
+        file[e..e + 16].copy_from_slice(&guid);
+        file[e + 16..e + 24].copy_from_slice(&(off as u64).to_le_bytes());
+        file[e + 24..e + 28].copy_from_slice(&(len as u32).to_le_bytes());
+    }
+    file[meta_off..meta_off + 8].copy_from_slice(b"metadata");
+    file[meta_off + 10..meta_off + 12].copy_from_slice(&3u16.to_le_bytes());
+    let items = 64 * KIB as usize;
+    for (i, (guid, at, len)) in [(FILE_PARAMS, 0, 8), (DISK_SIZE, 8, 8), (SECTOR_SIZE, 16, 4)]
+        .into_iter()
+        .enumerate()
+    {
+        let e = meta_off + 32 + i * 32;
+        file[e..e + 16].copy_from_slice(&guid);
+        file[e + 16..e + 20].copy_from_slice(&((items + at) as u32).to_le_bytes());
+        file[e + 20..e + 24].copy_from_slice(&(len as u32).to_le_bytes());
+    }
+    file[meta_off + items..meta_off + items + 4].copy_from_slice(&block.to_le_bytes());
+    file[meta_off + items + 8..meta_off + items + 16].copy_from_slice(&size.to_le_bytes());
+    file[meta_off + items + 16..meta_off + items + 20].copy_from_slice(&512u32.to_le_bytes());
+    for (idx, data) in blocks {
+        let at = file.len();
+        file.extend_from_slice(&data);
+        let entry = 6 | (((at as u64) >> 20) << 20);
+        let b = bat_off + ((idx + idx / ratio) as usize) * 8;
+        file[b..b + 8].copy_from_slice(&entry.to_le_bytes());
+    }
+    file
+}
+
+/// A sparse VMDK of `size` bytes holding `pieces`, in grains of 64 KiB.
+fn vmdk_sparse(size: u64, pieces: &Pieces) -> Vec<u8> {
+    vmdk_sparse_grains(size, pieces, 64 * KIB)
+}
+
+/// [`vmdk_sparse`] in grains of `grain` bytes.
+fn vmdk_sparse_grains(size: u64, pieces: &Pieces, grain: u64) -> Vec<u8> {
+    let grains = units(pieces, grain);
+    let per_gde = 512 * grain;
+    let num_gde = size.div_ceil(per_gde);
+    let gd_sectors = (num_gde * 4).div_ceil(SECTOR);
+    let mut file = vec![0u8; ((1 + gd_sectors) * SECTOR) as usize];
+    let mut gts: BTreeMap<u64, usize> = BTreeMap::new();
+    for idx in grains.keys() {
+        let g = idx / 512;
+        gts.entry(g).or_insert_with(|| {
+            let at = file.len();
+            file.resize(at + 2048, 0);
+            let sector = (at / 512) as u32;
+            file[512 + g as usize * 4..512 + g as usize * 4 + 4]
+                .copy_from_slice(&sector.to_le_bytes());
+            at
+        });
+    }
+    for (idx, data) in grains {
+        let sector = (file.len() / 512) as u32;
+        file.extend_from_slice(&data);
+        let at = gts[&(idx / 512)] + (idx % 512) as usize * 4;
+        file[at..at + 4].copy_from_slice(&sector.to_le_bytes());
+    }
+    file[..4].copy_from_slice(b"KDMV");
+    file[4..8].copy_from_slice(&1u32.to_le_bytes());
+    file[12..20].copy_from_slice(&(size / SECTOR).to_le_bytes());
+    file[20..28].copy_from_slice(&(grain / SECTOR).to_le_bytes());
+    file[44..48].copy_from_slice(&512u32.to_le_bytes());
+    file[56..64].copy_from_slice(&1u64.to_le_bytes());
+    file[64..72].copy_from_slice(&(1 + gd_sectors).to_le_bytes());
+    file
+}
+
+/// A streamOptimized VMDK of `size` bytes holding `pieces`.
+fn vmdk_stream(size: u64, pieces: &Pieces) -> Vec<u8> {
+    vmdk_stream_grains(size, pieces, 64 * KIB)
+}
+
+/// [`vmdk_stream`] in grains of `grain` bytes.
+fn vmdk_stream_grains(size: u64, pieces: &Pieces, grain: u64) -> Vec<u8> {
+    let mut file = vec![0u8; 512];
+    file[..4].copy_from_slice(b"KDMV");
+    file[4..8].copy_from_slice(&3u32.to_le_bytes());
+    file[8..12].copy_from_slice(&(1u32 << 16).to_le_bytes());
+    file[12..20].copy_from_slice(&(size / SECTOR).to_le_bytes());
+    file[20..28].copy_from_slice(&(grain / SECTOR).to_le_bytes());
+    file[44..48].copy_from_slice(&512u32.to_le_bytes());
+    file[56..64].copy_from_slice(&u64::MAX.to_le_bytes());
+    file[64..72].copy_from_slice(&1u64.to_le_bytes());
+    file[77..79].copy_from_slice(&1u16.to_le_bytes());
+    for (idx, data) in units(pieces, grain) {
+        let z = zlib(&data);
+        file.extend_from_slice(&(idx * grain / SECTOR).to_le_bytes());
+        file.extend_from_slice(&(z.len() as u32).to_le_bytes());
+        file.extend_from_slice(&z);
+        file.resize(file.len().next_multiple_of(512), 0);
+    }
+    file.extend_from_slice(&[0u8; 512]);
+    file
+}
+
+// ─── Walking ─────────────────────────────────────────────────────────────────
+
+/// Limits under which a volume of `cap` bytes or more is read in place and a
+/// disk of a few MiB is not held.
+fn limits(cap: u64) -> Limits {
+    let mut l = Limits::default();
+    l.max_buffer_bytes = cap;
+    l.max_extracted_bytes = 256 * MIB;
+    l
+}
+
+/// What a walk of `blob` gave: every member, and how the walk ended.
+fn walked(fmt: Format, blob: &[u8], limits: Limits) -> (Vec<Entry>, Result<(), LimitHit>) {
+    let mut out = Vec::new();
+    let mut budget = Budget::new(limits);
+    let end = extract_each(fmt, blob, &mut budget, &mut |e: Entry, _: &mut Budget| {
+        out.push(e);
+        None::<()>
+    });
+    (out, end.map(|_| ()))
+}
+
+fn named<'a>(e: &'a [Entry], name: &str) -> &'a Entry {
+    e.iter().find(|x| x.name == name).unwrap_or_else(|| {
+        panic!(
+            "no member {name}; got {:?}",
+            e.iter()
+                .map(|x| (&x.name, x.data.len(), x.unsupported))
+                .collect::<Vec<_>>()
+        )
+    })
+}
+
+fn unreported(e: &[Entry]) {
+    assert!(
+        e.iter().all(|x| x.unsupported.is_none()),
+        "nothing should be reported, got {:?}",
+        e.iter()
+            .filter(|x| x.unsupported.is_some())
+            .map(|x| (&x.name, x.unsupported))
+            .collect::<Vec<_>>()
+    );
+}
+
+// ─── The images qemu-img writes ──────────────────────────────────────────────
+
+const REAL: &[(Format, &str)] = &[
+    (Format::Qcow2, "fat4g.plain.qcow2"),
+    (Format::Qcow2, "fat4g.deflate.qcow2"),
+    #[cfg(feature = "zstd")]
+    (Format::Qcow2, "fat4g.zstd.qcow2"),
+    (Format::Vmdk, "fat4g.sparse.vmdk"),
+    (Format::Vmdk, "fat4g.stream.vmdk"),
+    (Format::Vhd, "fat4g.dynamic.vhd"),
+    (Format::Vhdx, "fat4g.dynamic.vhdx"),
+];
+
+/// A file of a FAT volume at 3 GiB of a 4 GiB disk comes out under its
+/// partition, whichever container the disk is in.
+#[test]
+fn a_file_at_the_end_of_a_four_gib_disk_comes_out_of_every_container() {
+    for &(fmt, name) in REAL {
+        let blob = gunzipped(name);
+        assert_eq!(exav_unpack::detect(&blob), Some(fmt), "{name}");
+        // Over the volume (128 KiB), so it is read in place, and under the disk.
+        let (e, end) = walked(fmt, &blob, limits(64 * KIB));
+        end.unwrap_or_else(|h| panic!("{name}: {h:?}"));
+        unreported(&e);
+        let p = named(&e, "mbr-part-1/sub/p.zip");
+        assert_eq!(sha256_hex(&p.data), FAT_PAYLOAD, "{name}");
+        assert!(
+            e.iter().all(|x| x.data.len() as u64 <= 64 * KIB),
+            "{name}: no member may pass the buffer limit"
+        );
+        assert!(
+            !e.iter().any(|x| x.name.ends_with("-disk")),
+            "{name}: the disk was held whole"
+        );
+    }
+}
+
+/// A disk that fits the limit is still handed over as one member, whose bytes
+/// are the disk's: what `qemu-img convert -O raw` gives, which the image was
+/// made from.
+#[test]
+fn a_disk_that_fits_the_limit_is_still_one_member() {
+    // A small disk: the raw image of the existing fixtures.
+    let d = super::diskimage::fixture("compressed.qcow2");
+    let (e, end) = walked(Format::Qcow2, &d, limits(8 * MIB));
+    end.unwrap();
+    assert_eq!(e.len(), 1);
+    assert_eq!(e[0].name, "qcow2-disk");
+    assert_eq!(e[0].data.len(), 256 * KIB as usize);
+}
+
+// ─── Disks of any size ───────────────────────────────────────────────────────
+
+/// Every container with the NTFS fixture (20 MiB, mostly zeros) at the end of a
+/// disk of `size`, and the name each is walked under.
+fn ntfs_images(size: u64, at: u64) -> Vec<(Format, &'static str, Vec<u8>)> {
+    let ntfs = super::ntfs::fixture();
+    let disk = mbr_disk(at, ntfs, 0x07);
+    let mut v = vec![
+        (
+            Format::Qcow2,
+            "qcow2",
+            qcow2(size, 16, &disk, Packing::Stored),
+        ),
+        (
+            Format::Qcow2,
+            "qcow2 deflate",
+            qcow2(size, 16, &disk, Packing::Deflate),
+        ),
+        (Format::Vmdk, "vmdk sparse", vmdk_sparse(size, &disk)),
+        (Format::Vmdk, "vmdk stream", vmdk_stream(size, &disk)),
+        (Format::Vhdx, "vhdx", vhdx(size, MIB as u32, &disk)),
+    ];
+    #[cfg(feature = "zstd")]
+    v.push((
+        Format::Qcow2,
+        "qcow2 zstd",
+        qcow2(size, 16, &disk, Packing::Zstd),
+    ));
+    v.push((Format::Vhd, "vhd", vhd(size, 2 * MIB as u32, &disk)));
+    v
+}
+
+/// The NTFS volume of 20 MiB, near the end of a 256 GiB disk, is walked: its
+/// files come out under the partition, none larger than the limit, and nothing
+/// the size of the disk is built (that would be 256 GiB).
+#[test]
+fn an_ntfs_volume_deep_in_a_256_gib_disk_is_walked() {
+    for (fmt, what, blob) in ntfs_images(256 * GIB, 250 * GIB) {
+        let (e, end) = walked(fmt, &blob, limits(8 * MIB));
+        end.unwrap_or_else(|h| panic!("{what}: {h:?}"));
+        unreported(&e);
+        let p = named(&e, "mbr-part-1/payload.zip");
+        assert_eq!(sha256_hex(&p.data), NTFS_PAYLOAD, "{what}");
+        named(&e, "mbr-part-1/small.txt");
+        named(&e, "mbr-part-1/eicar.com");
+        assert!(
+            e.iter().map(|x| x.data.len() as u64).sum::<u64>() < 3 * MIB,
+            "{what}: only the files and the boot area come out"
+        );
+    }
+}
+
+/// The same at a terabyte, where anything proportional to the disk is out of
+/// reach of the machine.
+#[test]
+fn a_terabyte_disk_costs_what_it_holds() {
+    let disk = mbr_disk(1000 * GIB, gunzipped_fat(), 0x01);
+    let size = 1024 * GIB;
+    let images = [
+        (Format::Qcow2, qcow2(size, 16, &disk, Packing::Deflate)),
+        (Format::Vmdk, vmdk_sparse(size, &disk)),
+        (Format::Vmdk, vmdk_stream(size, &disk)),
+    ];
+    for (fmt, blob) in images {
+        let (e, end) = walked(fmt, &blob, limits(64 * KIB));
+        end.unwrap_or_else(|h| panic!("{fmt:?}: {h:?}"));
+        let p = named(&e, "mbr-part-1/sub/p.zip");
+        assert_eq!(sha256_hex(&p.data), FAT_PAYLOAD, "{fmt:?}");
+    }
+}
+
+fn gunzipped_fat() -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/fat/fragmented.img.gz",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    let raw = exav_unpack::read_fixture(&p).unwrap();
+    let mut out = Vec::new();
+    std::io::Read::read_to_end(&mut flate2::read::GzDecoder::new(&raw[..]), &mut out).unwrap();
+    out
+}
+
+// ─── Volumes written here ────────────────────────────────────────────────────
+
+/// A FAT12 or FAT16 volume of `size` bytes holding `files` (names of 8.3 in
+/// lower case, which the entry says with its case flags), each in a run of
+/// clusters.
+fn fat_volume(size: usize, files: &[(&str, &[u8])]) -> Vec<u8> {
+    let sectors = size / 512;
+    let root_sectors = 32;
+    // The smallest cluster that keeps the volume within FAT16.
+    let spc = [1usize, 2, 4, 8, 16, 32, 64]
+        .into_iter()
+        .find(|&s| (sectors - 1 - root_sectors) / s < 60000)
+        .unwrap();
+    let guess = (sectors - 1 - root_sectors) / spc;
+    let bits = if guess < 4085 { 12 } else { 16 };
+    let fat_sectors = ((guess + 2) * bits / 8).div_ceil(512);
+    let first_data = 1 + 2 * fat_sectors + root_sectors;
+    let clusters = (sectors - first_data) / spc;
+    let mut d = vec![0u8; size];
+    d[0..3].copy_from_slice(&[0xEB, 0x3C, 0x90]);
+    d[3..11].copy_from_slice(b"MSDOS5.0");
+    d[11..13].copy_from_slice(&512u16.to_le_bytes());
+    d[13] = spc as u8;
+    d[14..16].copy_from_slice(&1u16.to_le_bytes());
+    d[16] = 2;
+    d[17..19].copy_from_slice(&512u16.to_le_bytes());
+    // The sector count is in a 16-bit field, or in a 32-bit one when it is more.
+    match u16::try_from(sectors) {
+        Ok(n) => d[19..21].copy_from_slice(&n.to_le_bytes()),
+        Err(_) => d[32..36].copy_from_slice(&(sectors as u32).to_le_bytes()),
+    }
+    d[21] = 0xF8;
+    d[22..24].copy_from_slice(&(fat_sectors as u16).to_le_bytes());
+    d[38] = 0x29;
+    d[54..62].copy_from_slice(if bits == 12 { b"FAT12   " } else { b"FAT16   " });
+    d[510..512].copy_from_slice(&[0x55, 0xAA]);
+    let fat = 512;
+    let set = |d: &mut Vec<u8>, c: usize, v: usize| {
+        for copy in 0..2 {
+            let t = fat + copy * fat_sectors * 512;
+            if bits == 16 {
+                d[t + c * 2..t + c * 2 + 2].copy_from_slice(&(v as u16).to_le_bytes());
+            } else {
+                let at = t + c + c / 2;
+                let pair = u16::from_le_bytes([d[at], d[at + 1]]);
+                let pair = if c % 2 == 1 {
+                    (pair & 0x000F) | ((v as u16) << 4)
+                } else {
+                    (pair & 0xF000) | v as u16
+                };
+                d[at..at + 2].copy_from_slice(&pair.to_le_bytes());
+            }
+        }
+    };
+    let end = if bits == 16 { 0xFFFF } else { 0xFFF };
+    set(&mut d, 0, if bits == 16 { 0xFFF8 } else { 0xFF8 });
+    set(&mut d, 1, end);
+    let (mut next, root) = (2usize, fat + 2 * fat_sectors * 512);
+    for (i, (name, data)) in files.iter().enumerate() {
+        let n = data.len().div_ceil(spc * 512);
+        assert!(next + n <= clusters + 2, "the volume is full");
+        for c in next..next + n {
+            set(&mut d, c, if c + 1 == next + n { end } else { c + 1 });
+        }
+        let at = first_data * 512 + (next - 2) * spc * 512;
+        d[at..at + data.len()].copy_from_slice(data);
+        let (base, ext) = name.split_once('.').unwrap_or((name, ""));
+        let e = root + i * 32;
+        d[e..e + 11].fill(b' ');
+        d[e..e + base.len()].copy_from_slice(base.to_ascii_uppercase().as_bytes());
+        d[e + 8..e + 8 + ext.len()].copy_from_slice(ext.to_ascii_uppercase().as_bytes());
+        d[e + 11] = 0x20;
+        d[e + 12] = 0x18;
+        d[e + 26..e + 28].copy_from_slice(&(next as u16).to_le_bytes());
+        d[e + 28..e + 32].copy_from_slice(&(data.len() as u32).to_le_bytes());
+        next += n;
+    }
+    d
+}
+
+/// `n` bytes that compress, and differ from those of another `seed`.
+fn patterned(n: usize, seed: u32) -> Vec<u8> {
+    let mut x = seed.wrapping_mul(2654435761) | 1;
+    let block: Vec<u8> = (0..4096)
+        .map(|_| {
+            x ^= x << 13;
+            x ^= x >> 17;
+            x ^= x << 5;
+            x as u8
+        })
+        .collect();
+    (0..n).map(|i| block[i % 4096] ^ (i >> 20) as u8).collect()
+}
+
+// ─── Reading back after eviction ─────────────────────────────────────────────
+
+/// A 40 MiB file between two small ones, in 2 MiB compressed clusters: the walk
+/// goes through more decoded clusters than the cache holds, so the first ones
+/// are evicted while it goes on to the next file.
+#[test]
+fn a_walk_that_returns_to_evicted_clusters_reads_the_same_files() {
+    let (a, big, z) = (
+        patterned(3000, 1),
+        patterned(40 << 20, 2),
+        patterned(5000, 3),
+    );
+    let vol = fat_volume(64 << 20, &[("a.txt", &a), ("big.bin", &big), ("z.txt", &z)]);
+    let blob = qcow2(2 * GIB, 21, &mbr_disk(GIB, vol, 0x06), Packing::Deflate);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(48 * MIB));
+    end.unwrap();
+    unreported(&e);
+    for (name, want) in [("a.txt", &a), ("big.bin", &big), ("z.txt", &z)] {
+        let got = named(&e, &format!("mbr-part-1/{name}"));
+        assert!(got.data == *want, "{name} differs");
+    }
+}
+
+// ─── What is read ────────────────────────────────────────────────────────────
+
+/// A source in memory that counts the bytes it hands out and does not let a
+/// caller borrow it whole.
+struct Counting {
+    data: Vec<u8>,
+    read: std::cell::Cell<usize>,
+}
+
+impl Counting {
+    fn new(data: Vec<u8>) -> Self {
+        Counting {
+            data,
+            read: std::cell::Cell::new(0),
+        }
+    }
+}
+
+impl exav_unpack::ByteSource for Counting {
+    fn len(&self) -> usize {
+        self.data.len()
+    }
+
+    fn window(&self, off: usize, len: usize) -> std::borrow::Cow<'_, [u8]> {
+        let start = off.min(self.data.len());
+        let end = start.saturating_add(len).min(self.data.len());
+        self.read.set(self.read.get() + (end - start));
+        std::borrow::Cow::Borrowed(&self.data[start..end])
+    }
+
+    fn identity(&self) -> (usize, usize) {
+        (self as *const Self as usize, self.data.len())
+    }
+}
+
+fn walked_src(
+    fmt: Format,
+    src: &dyn exav_unpack::ByteSource,
+    limits: Limits,
+) -> (Vec<Entry>, Result<(), LimitHit>) {
+    let mut out = Vec::new();
+    let mut budget = Budget::new(limits);
+    let end = exav_unpack::walk(fmt, src, &mut budget, &mut |meta, content, _| {
+        // A stream is read as the engine reads it, which holds it up to its own
+        // limit; the buffer limit is for members held whole.
+        let data = match content {
+            None => Vec::new(),
+            Some(exav_unpack::Member::Bytes(d)) => d,
+            Some(exav_unpack::Member::Stream(r)) => {
+                let mut d = Vec::new();
+                let _ = std::io::Read::read_to_end(r, &mut d);
+                d
+            }
+        };
+        out.push(Entry {
+            name: meta.name.clone(),
+            data,
+            unsupported: meta.unsupported,
+            ..Entry::default()
+        });
+        None::<()>
+    });
+    (out, end.map(|_| ()))
+}
+
+/// The files of an NTFS volume come out of a disk image without reading the
+/// image: the walk reads the boot sector, the records it goes through and the
+/// files, a small part of a volume that is mostly its own bookkeeping.
+#[test]
+fn a_walk_reads_a_small_part_of_the_image() {
+    let disk = mbr_disk(250 * GIB, super::ntfs::fixture(), 0x07);
+    let blob = qcow2(256 * GIB, 16, &disk, Packing::Stored);
+    let src = Counting::new(blob);
+    let (e, end) = walked_src(Format::Qcow2, &src, limits(8 * MIB));
+    end.unwrap();
+    named(&e, "mbr-part-1/payload.zip");
+    let (read, size) = (src.read.get(), src.data.len());
+    assert!(
+        read < size / 2,
+        "{read} of the image's {size} bytes were read: more than the metadata and the files"
+    );
+}
+
+/// A raw NTFS image over the buffer limit used to be refused for being read
+/// whole; it is walked, reading the volume where the walk goes.
+#[test]
+fn a_raw_ntfs_image_over_the_limit_is_walked_not_read_whole() {
+    let src = Counting::new(super::ntfs::fixture());
+    let (e, end) = walked_src(Format::Ntfs, &src, limits(8 * MIB));
+    end.unwrap();
+    unreported(&e);
+    assert_eq!(sha256_hex(&named(&e, "payload.zip").data), NTFS_PAYLOAD);
+    assert!(
+        src.read.get() < src.data.len() / 4,
+        "read {}",
+        src.read.get()
+    );
+}
+
+#[test]
+fn a_raw_fat_image_over_the_limit_is_walked_not_read_whole() {
+    let src = Counting::new(gunzipped_fat());
+    let (e, end) = walked_src(Format::Fat, &src, limits(32 * KIB));
+    end.unwrap();
+    unreported(&e);
+    assert_eq!(sha256_hex(&named(&e, "sub/p.zip").data), FAT_PAYLOAD);
+}
+
+/// A raw disk of 64 GiB, held as pieces: the walk asks for bytes by offset and
+/// gets zeros for the rest.
+#[cfg(target_pointer_width = "64")]
+struct SparseDisk {
+    len: usize,
+    pieces: Pieces,
+}
+
+#[cfg(target_pointer_width = "64")]
+impl exav_unpack::ByteSource for SparseDisk {
+    fn len(&self) -> usize {
+        self.len
+    }
+
+    fn window(&self, off: usize, len: usize) -> std::borrow::Cow<'_, [u8]> {
+        let start = off.min(self.len);
+        let n = len.min(self.len - start);
+        let mut out = vec![0u8; n];
+        for (at, bytes) in &self.pieces {
+            let (from, to) = (*at as usize, *at as usize + bytes.len());
+            let (lo, hi) = (from.max(start), to.min(start + n));
+            if lo < hi {
+                out[lo - start..hi - start].copy_from_slice(&bytes[lo - from..hi - from]);
+            }
+        }
+        std::borrow::Cow::Owned(out)
+    }
+
+    fn identity(&self) -> (usize, usize) {
+        (self as *const Self as usize, self.len)
+    }
+}
+
+/// A raw partitioned disk of 64 GiB whose NTFS volume (20 MiB) is over the
+/// limit: its files come out of the partition, which is not streamed.
+#[cfg(target_pointer_width = "64")]
+#[test]
+fn a_raw_disk_larger_than_the_limit_is_walked_through_its_partitions() {
+    let disk = SparseDisk {
+        len: (64 * GIB) as usize,
+        pieces: mbr_disk(60 * GIB, super::ntfs::fixture(), 0x07),
+    };
+    let (e, end) = walked_src(Format::Partition, &disk, limits(8 * MIB));
+    end.unwrap();
+    unreported(&e);
+    assert_eq!(
+        sha256_hex(&named(&e, "mbr-part-1/payload.zip").data),
+        NTFS_PAYLOAD
+    );
+    assert!(!e.iter().any(|x| x.name == "mbr-part-1"));
+}
+
+/// A partition that fits the limit is still handed over as a stream of its
+/// bytes, for the engine to type and scan as it always did.
+#[cfg(target_pointer_width = "64")]
+#[test]
+fn a_partition_that_fits_the_limit_is_still_streamed() {
+    let fat = gunzipped_fat();
+    let disk = SparseDisk {
+        len: (64 * GIB) as usize,
+        pieces: mbr_disk(60 * GIB, fat.clone(), 0x01),
+    };
+    let (e, end) = walked_src(Format::Partition, &disk, limits(8 * MIB));
+    end.unwrap();
+    assert_eq!(e.len(), 1);
+    assert_eq!(e[0].name, "mbr-part-1");
+    assert!(e[0].data == fat);
+}
+
+/// Over the limit, a volume of a kind not read in place is still streamed from a
+/// raw file: those bytes are the input, and the engine types and scans them.
+#[cfg(target_pointer_width = "64")]
+#[test]
+fn a_raw_partition_over_the_limit_that_is_no_filesystem_is_still_streamed() {
+    let blob = patterned(9 << 20, 7);
+    let disk = SparseDisk {
+        len: (64 * GIB) as usize,
+        pieces: mbr_disk(60 * GIB, blob.clone(), 0x83),
+    };
+    let (e, end) = walked_src(Format::Partition, &disk, limits(8 * MIB));
+    end.unwrap();
+    assert_eq!(e.len(), 1);
+    assert_eq!(e[0].name, "mbr-part-1");
+    assert!(e[0].data == blob);
+}
+
+/// The same inside a virtual disk is reported: its size is what a header
+/// declares, not bytes that were scanned already, and reading them could be a
+/// walk through zeros.
+#[test]
+fn a_virtual_volume_over_the_limit_that_is_no_filesystem_is_reported() {
+    let disk = mbr_disk(200 * GIB, patterned(9 << 20, 7), 0x83);
+    let blob = qcow2(256 * GIB, 16, &disk, Packing::Deflate);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(8 * MIB));
+    end.unwrap();
+    let r = named(&e, "mbr-part-1");
+    assert!(r.unsupported.is_some() && r.data.is_empty(), "{r:?}");
+}
+
+/// A partition table with no partition in it holds nothing, which is not a
+/// disk that could not be read.
+#[test]
+fn a_table_with_no_partition_holds_nothing() {
+    let mut gpt = vec![0u8; 512];
+    gpt[..8].copy_from_slice(b"EFI PART");
+    gpt[72..80].copy_from_slice(&2u64.to_le_bytes());
+    gpt[84..88].copy_from_slice(&128u32.to_le_bytes());
+    let blob = qcow2(256 * GIB, 16, &vec![(512, gpt)], Packing::Stored);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(8 * MIB));
+    end.unwrap();
+    assert!(
+        e.is_empty(),
+        "{:?}",
+        e.iter().map(|x| &x.name).collect::<Vec<_>>()
+    );
+}
+
+/// What lies before the first partition (the boot code) is scanned, within the
+/// limit, since no filesystem walk reaches it.
+#[test]
+fn the_boot_area_of_a_walked_disk_comes_out() {
+    let disk = mbr_disk(200 * GIB, gunzipped_fat(), 0x01);
+    let blob = qcow2(256 * GIB, 16, &disk, Packing::Stored);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(64 * KIB));
+    end.unwrap();
+    let boot = named(&e, "<boot-area>");
+    assert_eq!(boot.data.len(), 64 * KIB as usize);
+    assert_eq!(boot.data[510..512], [0x55, 0xAA]);
+}
+
+/// An ext volume under the limit is streamed for the engine to walk, and one
+/// over it is walked in place, from its own range of the disk.
+#[test]
+fn an_ext_volume_in_a_big_disk_is_read_from_its_own_range() {
+    let ext = super::ext::fixture();
+    let disk = mbr_disk(100 * GIB, ext.clone(), 0x83);
+    let blob = qcow2(128 * GIB, 16, &disk, Packing::Deflate);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(8 * MIB));
+    end.unwrap();
+    assert!(named(&e, "mbr-part-1").data == ext);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(MIB));
+    end.unwrap();
+    unreported(&e);
+    let p = named(&e, "mbr-part-1/sub/p.zip");
+    assert_eq!(
+        sha256_hex(&p.data),
+        "d61da8b0c3cd1d5ffa812601aae787c81a7424850c4dca15c27e593f8f92fcc8"
+    );
+}
+
+/// The raw volume of an Apple image: the disk of a UDRW image, which is its
+/// bytes before the trailer, from where the filesystem's header says it starts.
+#[cfg(feature = "dmg")]
+fn apple_volume(dmg: &str, magic: &[u8], header_at: usize) -> Vec<u8> {
+    let p = format!("{}/tests/fixtures/dmg/{dmg}", env!("CARGO_MANIFEST_DIR"));
+    let image = exav_unpack::read_fixture(&p).unwrap();
+    let disk = &image[..image.len() - 512];
+    let at = disk
+        .windows(magic.len())
+        .position(|w| w == magic)
+        .unwrap_or_else(|| panic!("no filesystem in {dmg}"))
+        - header_at;
+    disk[at..].to_vec()
+}
+
+/// An HFS+ or an APFS volume in a disk is walked where it lies, as the others
+/// are, and one that fits the limit is streamed as it was.
+#[cfg(feature = "dmg")]
+#[test]
+fn an_hfs_plus_or_apfs_volume_in_a_big_disk_is_walked_from_its_own_range() {
+    for (dmg, magic, header_at, ptype) in [
+        ("hfs_plus_udrw.dmg", &[0x48u8, 0x2B, 0, 4][..], 1024, 0xAF),
+        ("apfs_udrw.dmg", b"NXSB", 32, 0xAB),
+    ] {
+        let volume = apple_volume(dmg, magic, header_at);
+        let disk = mbr_disk(100 * GIB, volume.clone(), ptype);
+        let blob = qcow2(128 * GIB, 16, &disk, Packing::Deflate);
+        let (e, end) = walked(Format::Qcow2, &blob, limits(volume.len() as u64 + 1));
+        end.unwrap();
+        assert!(named(&e, "mbr-part-1").data == volume, "{dmg}");
+        let (e, end) = walked(Format::Qcow2, &blob, limits(volume.len() as u64 / 2));
+        end.unwrap_or_else(|h| panic!("{dmg}: {h:?}"));
+        unreported(&e);
+        let hello = e
+            .iter()
+            .find(|x| x.name.starts_with("mbr-part-1/") && x.data.starts_with(b"hello hfs+"))
+            .unwrap_or_else(|| {
+                panic!("{dmg}: {:?}", e.iter().map(|x| &x.name).collect::<Vec<_>>())
+            });
+        assert!(hello.name.ends_with("test.txt"), "{dmg}: {}", hello.name);
+    }
+}
+
+// ─── Bounds ──────────────────────────────────────────────────────────────────
+
+/// The bytes a disk decodes are counted against the scan budget: an image of
+/// 2 MiB compressed clusters cannot be walked on a budget of 1 MiB, and says
+/// that is why.
+#[test]
+fn decoding_more_than_the_scan_budget_allows_is_a_limit_not_a_silent_stop() {
+    let vol = fat_volume(9 << 20, &[("a.txt", &patterned(5000, 1))]);
+    let blob = qcow2(GIB, 21, &mbr_disk(512 * MIB, vol, 0x06), Packing::Deflate);
+    let (e, end) = walked(Format::Qcow2, &blob, limits(8 * MIB));
+    end.unwrap();
+    named(&e, "mbr-part-1/a.txt");
+
+    let mut tight = limits(8 * MIB);
+    // Room for the boot area and the file, not for the clusters decoded to get
+    // to them.
+    tight.max_scanned_bytes = 3 * MIB;
+    let (_, end) = walked(Format::Qcow2, &blob, tight);
+    let hit = end.expect_err("a walk that decodes past its budget must not end as clean");
+    assert_eq!(hit.kind, exav_unpack::LimitKind::MaxScanSize, "{hit:?}");
+}
+
+// ─── Hostile images ──────────────────────────────────────────────────────────
+
+/// A 64 MiB disk with a 9 MiB FAT volume in the middle: over a limit of 8 MiB,
+/// so read in place, in every container.
+fn small_images() -> Vec<(Format, &'static str, Vec<u8>)> {
+    let vol = fat_volume(
+        9 << 20,
+        &[
+            ("a.txt", &patterned(3000, 1)),
+            ("b.bin", &patterned(70_000, 2)),
+        ],
+    );
+    let disk = mbr_disk(32 * MIB, vol, 0x06);
+    let size = 64 * MIB;
+    vec![
+        (
+            Format::Qcow2,
+            "qcow2",
+            qcow2(size, 16, &disk, Packing::Stored),
+        ),
+        (
+            Format::Qcow2,
+            "qcow2 deflate",
+            qcow2(size, 16, &disk, Packing::Deflate),
+        ),
+        (Format::Vmdk, "vmdk sparse", vmdk_sparse(size, &disk)),
+        (Format::Vmdk, "vmdk stream", vmdk_stream(size, &disk)),
+        (Format::Vhd, "vhd", vhd(size, 2 * MIB as u32, &disk)),
+        (Format::Vhdx, "vhdx", vhdx(size, MIB as u32, &disk)),
+    ]
+}
+
+#[test]
+fn the_small_images_are_walked_in_place() {
+    for (fmt, what, blob) in small_images() {
+        let (e, end) = walked(fmt, &blob, limits(8 * MIB));
+        end.unwrap_or_else(|h| panic!("{what}: {h:?}"));
+        unreported(&e);
+        assert_eq!(
+            named(&e, "mbr-part-1/a.txt").data,
+            patterned(3000, 1),
+            "{what}"
+        );
+        assert_eq!(
+            named(&e, "mbr-part-1/b.bin").data,
+            patterned(70_000, 2),
+            "{what}"
+        );
+    }
+}
+
+/// Each header and table field at the top of its range, one at a time: no
+/// panic, and no walk that fails to end. The disk is read in place, so a
+/// field that moves a table, a size or a count is followed into the
+/// filesystem walk.
+#[test]
+fn container_fields_at_their_extremes() {
+    use super::extreme::{none, sectors, sweep};
+    let mut bad = Vec::new();
+    for (fmt, what, blob) in small_images() {
+        let regions: Vec<std::ops::Range<usize>> = match what {
+            "vhd" => vec![0..512, 512..1536, 1536..1700],
+            // The region table, the metadata table and its items, the start of
+            // the block allocation table.
+            "vhdx" => vec![
+                0..16,
+                192 * 1024..192 * 1024 + 96,
+                256 * 1024..256 * 1024 + 96,
+                (MIB as usize)..(MIB as usize) + 64,
+                2 * MIB as usize..2 * MIB as usize + 160,
+                2 * MIB as usize + 64 * 1024..2 * MIB as usize + 64 * 1024 + 24,
+            ],
+            _ => sectors(&blob, 24, 128),
+        };
+        bad.extend(
+            sweep(fmt, &blob, &regions)
+                .into_iter()
+                .map(|w| format!("{what} {w}")),
+        );
+    }
+    none(bad);
+}
+
+/// An image cut anywhere: no panic, and what comes out of a file is its bytes
+/// or zeros where the cut took them. A cluster that is not all there is absent,
+/// not read as something else.
+#[test]
+fn an_image_cut_anywhere_never_gives_content_it_did_not_have() {
+    let (a, b) = (patterned(3000, 1), patterned(70_000, 2));
+    for (fmt, what, blob) in small_images() {
+        let step = blob.len() / 50 + 1;
+        let cuts = (0..blob.len())
+            .step_by(step)
+            .chain((0..4096).step_by(53))
+            .chain([blob.len() - 1, blob.len() - 512]);
+        for cut in cuts {
+            let (e, end) = walked(fmt, &blob[..cut], limits(8 * MIB));
+            if let Err(h) = &end {
+                assert!(!h.reason.contains("panicked"), "{what} cut at {cut}: {h:?}");
+            }
+            for (name, want) in [("a.txt", &a), ("b.bin", &b)] {
+                let found = e
+                    .iter()
+                    .find(|x| x.name == format!("mbr-part-1/{name}") && x.unsupported.is_none());
+                if let Some(f) = found {
+                    // A file whose chain is in the part that was cut ends where
+                    // the filesystem's own table does, so it can be short.
+                    assert!(
+                        f.data.len() <= want.len(),
+                        "{what} cut at {cut}: {name} is longer than the file"
+                    );
+                    assert!(
+                        f.data
+                            .iter()
+                            .zip(want.iter())
+                            .all(|(g, w)| g == w || *g == 0),
+                        "{what} cut at {cut}: {name} holds bytes the image does not"
+                    );
+                }
+            }
+        }
+    }
+}
+
+/// A cut inside the table that says where everything is leaves nothing to
+/// follow, which is said.
+#[test]
+fn a_cut_inside_a_table_is_reported() {
+    let images = small_images();
+    let image = |what: &str| images.iter().find(|i| i.1 == what).unwrap();
+    for (what, at) in [
+        ("qcow2", 64 * KIB as usize + 4),
+        ("vmdk sparse", 514),
+        ("vhd", 1540),
+        ("vhdx", MIB as usize + 100),
+    ] {
+        let (fmt, _, blob) = image(what);
+        let (e, end) = walked(*fmt, &blob[..at], limits(8 * MIB));
+        end.unwrap_or_else(|h| panic!("{what}: {h:?}"));
+        assert!(
+            e.iter().any(|x| x.unsupported.is_some()),
+            "{what}: a table that is not there must be reported, got {:?}",
+            e.iter()
+                .map(|x| (&x.name, x.unsupported))
+                .collect::<Vec<_>>()
+        );
+        assert!(e.iter().all(|x| x.data.is_empty()), "{what}");
+    }
+}
+
+/// Tables that point where nothing is, claim sizes nothing could have, or name
+/// units that do not decode: the walk ends, and it does not end quietly with
+/// less than the image holds.
+#[test]
+fn hostile_tables_do_not_end_clean_or_in_a_panic() {
+    let images = small_images();
+    let image = |what: &str| images.iter().find(|i| i.1 == what).unwrap();
+    let top = u64::MAX.to_le_bytes();
+    let mib = MIB as usize;
+    // (image, what is changed, where, to what)
+    let cases: Vec<(&str, &str, usize, Vec<u8>)> = vec![
+        (
+            "qcow2",
+            "L1 entry beyond the file",
+            64 * 1024,
+            (u64::MAX >> 1 & !511).to_be_bytes().to_vec(),
+        ),
+        (
+            "qcow2",
+            "L1 table of 2^32 entries",
+            36,
+            u32::MAX.to_be_bytes().to_vec(),
+        ),
+        ("qcow2", "cluster bits", 20, 21u32.to_be_bytes().to_vec()),
+        (
+            "qcow2 deflate",
+            "L1 entry beyond the file",
+            64 * 1024,
+            (u64::MAX >> 1 & !511).to_be_bytes().to_vec(),
+        ),
+        (
+            "vmdk sparse",
+            "directory entry beyond the file",
+            512,
+            u32::MAX.to_le_bytes().to_vec(),
+        ),
+        (
+            "vmdk sparse",
+            "grain table size",
+            44,
+            (1u32 << 20).to_le_bytes().to_vec(),
+        ),
+        ("vmdk sparse", "capacity", 12, top.to_vec()),
+        (
+            "vmdk stream",
+            "grain longer than the file",
+            512 + 8,
+            u32::MAX.to_le_bytes().to_vec(),
+        ),
+        (
+            "vmdk stream",
+            "grain at the top of the disk",
+            512,
+            top.to_vec(),
+        ),
+        (
+            "vhd",
+            "table entry beyond the file",
+            1536,
+            (u32::MAX - 1).to_be_bytes().to_vec(),
+        ),
+        (
+            "vhd",
+            "table of 2^32 entries",
+            512 + 28,
+            u32::MAX.to_be_bytes().to_vec(),
+        ),
+        (
+            "vhdx",
+            "table entry beyond the file",
+            mib,
+            (6 | (u64::MAX >> 20 << 20)).to_le_bytes().to_vec(),
+        ),
+        (
+            "vhdx",
+            "disk of 2^64 bytes",
+            2 * mib + 64 * 1024 + 8,
+            top.to_vec(),
+        ),
+        (
+            "vhdx",
+            "block of 256 MiB",
+            2 * mib + 64 * 1024,
+            (1u32 << 28).to_le_bytes().to_vec(),
+        ),
+    ];
+    let a = patterned(3000, 1);
+    for (what, change, at, to) in cases {
+        let (fmt, _, blob) = image(what);
+        let mut blob = blob.clone();
+        blob[at..at + to.len()].copy_from_slice(&to);
+        let (e, end) = walked(*fmt, &blob, limits(8 * MIB));
+        if let Err(h) = &end {
+            assert!(!h.reason.contains("panicked"), "{what}, {change}: {h:?}");
+            continue;
+        }
+        let kept = e
+            .iter()
+            .any(|x| x.name == "mbr-part-1/a.txt" && x.data == a);
+        assert!(
+            kept || e.iter().any(|x| x.unsupported.is_some()),
+            "{what}, {change}: neither the files nor a report, got {:?}",
+            e.iter()
+                .map(|x| (&x.name, x.unsupported))
+                .collect::<Vec<_>>()
+        );
+    }
+}
+
+/// The seeds of `fuzz/seeds/vdisk`: a 1 MiB disk holding an MBR and a FAT
+/// volume of 70 KiB (over the fuzz target's buffer limit, so walked in place),
+/// small enough to fit the fuzzer's inputs, each behind the byte that picks the
+/// format the target tries. Written with
+/// `EXAV_DEBUG_WRITE_SEEDS=fuzz/seeds/vdisk cargo test -p exav-unpack --test all write_the_fuzz_seeds -- --ignored`.
+#[test]
+#[ignore = "writes the committed fuzz seeds"]
+fn write_the_fuzz_seeds() {
+    let dir = std::env::var("EXAV_DEBUG_WRITE_SEEDS")
+        .expect("EXAV_DEBUG_WRITE_SEEDS names the directory");
+    let vol = fat_volume(70 * 1024, &[("a.txt", &patterned(300, 1))]);
+    let disk = mbr_disk(128 * KIB, vol, 0x01);
+    let size = MIB;
+    let images: Vec<(&str, u8, Vec<u8>)> = vec![
+        ("qcow2.bin", 0, qcow2(size, 9, &disk, Packing::Stored)),
+        (
+            "qcow2_deflate.bin",
+            0,
+            qcow2(size, 9, &disk, Packing::Deflate),
+        ),
+        #[cfg(feature = "zstd")]
+        ("qcow2_zstd.bin", 0, qcow2(size, 9, &disk, Packing::Zstd)),
+        (
+            "vmdk_sparse.bin",
+            1,
+            vmdk_sparse_grains(size, &disk, 4 * KIB),
+        ),
+        (
+            "vmdk_stream.bin",
+            1,
+            vmdk_stream_grains(size, &disk, 4 * KIB),
+        ),
+        ("vhd.bin", 2, vhd(size, 4096, &disk)),
+    ];
+    for (name, pick, image) in images {
+        assert!(image.len() < 24 * 1024, "{name}: {} bytes", image.len());
+        // Each is a seed because the walk reaches the file in the volume.
+        let fmt = [Format::Qcow2, Format::Vmdk, Format::Vhd][usize::from(pick)];
+        let (e, end) = walked(fmt, &image, limits(64 * KIB));
+        end.unwrap();
+        named(&e, "mbr-part-1/a.txt");
+        let mut seed = vec![pick];
+        seed.extend_from_slice(&image);
+        std::fs::write(std::path::Path::new(&dir).join(name), seed).unwrap();
+    }
+}
diff --git a/crates/exav-unpack/tests/suites/wim.rs b/crates/exav-unpack/tests/suites/wim.rs
index 54530fe1..0df63519 100644
--- a/crates/exav-unpack/tests/suites/wim.rs
+++ b/crates/exav-unpack/tests/suites/wim.rs
@@ -22,7 +22,7 @@
 //! ```
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 /// `sha256sum` of the files that went into the images.
 const EICAR: &str = "275a021bbfb6489e54d471899f7db9d1663fc695ec2fe2a2c4538aabf651fd0f";
@@ -131,6 +131,98 @@ fn lzx_handles_call_translation_and_stored_blocks() {
     assert_eq!(contents("hard_LZX.wim"), want);
 }
 
+/// Every member of `blob` read from a source that is not in memory, under a
+/// buffer limit of `cap`: its name, its bytes, whether it was read as it goes,
+/// and the error that ended its read.
+fn off_a_source(blob: &[u8], cap: u64) -> Vec<(String, Vec<u8>, bool, Option<String>)> {
+    use exav_unpack::Member;
+    use exav_unpack::source::BlockCache;
+    let cache = BlockCache::with_sizes(std::io::Cursor::new(blob.to_vec()), 256, 4 * 256).unwrap();
+    let mut limits = Limits::default();
+    limits.max_buffer_bytes = cap;
+    let mut budget = Budget::new(limits);
+    let mut out = Vec::new();
+    let end = exav_unpack::walk(Format::Wim, &cache, &mut budget, &mut |meta, content, _| {
+        let (data, streamed, error) = match content {
+            None => (Vec::new(), false, None),
+            Some(Member::Bytes(b)) => (b, false, None),
+            Some(Member::Stream(r)) => {
+                let mut b = Vec::new();
+                let e = r.read_to_end(&mut b).err().map(|e| e.to_string());
+                (b, true, e)
+            }
+        };
+        assert!(meta.unsupported.is_none(), "{}", meta.name);
+        out.push((meta.name.clone(), data, streamed, error));
+        None::<()>
+    });
+    end.unwrap();
+    out
+}
+
+/// A resource past the buffer limit is decoded a chunk at a time off a source
+/// that is not in memory, and comes out as the file that went in: the resources
+/// of every codec, and the several chunks of the one that is 88 KB.
+#[test]
+fn resources_over_the_buffer_limit_are_read_as_they_go_off_a_source_not_in_memory() {
+    for name in ["w_none.wim", "w_XPRESS.wim", "w_LZX.wim", "hard_LZX.wim"] {
+        // The directory tree is held whole, under the limit, and is larger
+        // than 400 bytes, so the names are not there: the bytes are.
+        let mut got: Vec<String> = off_a_source(&fixture(name), 400)
+            .into_iter()
+            .map(|(n, d, streamed, error)| {
+                assert_eq!(error, None, "{name}: {n}");
+                assert!(streamed, "{name}: {n} is past the limit");
+                sha256_hex(&d)
+            })
+            .collect();
+        got.sort();
+        let mut want: Vec<String> = contents(name).into_iter().map(|(_, h)| h).collect();
+        want.sort();
+        assert_eq!(got, want, "{name}");
+    }
+}
+
+/// A chunk table that names a chunk past the end of its resource ends the
+/// read with an error, where the table is read, and not with a panic or bytes
+/// that are not the file's.
+#[test]
+fn a_chunk_past_the_end_of_its_resource_ends_the_read_with_an_error() {
+    let mut raw = fixture("hard_LZX.wim");
+    // Resource headers are at the start of the offset table: find the one for
+    // the resource of more than one chunk, and make its second chunk start
+    // far past its end.
+    let le = |d: &[u8], at: usize| u64::from_le_bytes(d[at..at + 8].try_into().unwrap());
+    let size = (le(&raw, 48) & 0x00FF_FFFF_FFFF_FFFF) as usize;
+    let table = le(&raw, 56) as usize;
+    let mut changed = 0;
+    for e in (table..table + size).step_by(50) {
+        let in_wim = (le(&raw, e) & 0x00FF_FFFF_FFFF_FFFF) as usize;
+        let at = le(&raw, e + 8) as usize;
+        let original = le(&raw, e + 16);
+        let flags = raw[e + 7];
+        if flags & 0x04 != 0 && original > 32768 {
+            assert!(in_wim > 4, "the chunk table is in the resource");
+            raw[at..at + 4].copy_from_slice(&u32::MAX.to_le_bytes());
+            changed += 1;
+        }
+    }
+    assert!(changed > 0, "a resource of more than one chunk");
+    let got = off_a_source(&raw, 400);
+    let broken: Vec<_> = got.iter().filter(|m| m.3.is_some()).collect();
+    assert!(
+        !broken.is_empty(),
+        "{:?}",
+        got.iter().map(|m| &m.0).collect::<Vec<_>>()
+    );
+    for (name, data, streamed, error) in broken {
+        assert!(*streamed, "{name}");
+        assert!(error.as_ref().unwrap().contains("outside"), "{name}");
+        // The first chunk ends where the second starts, which is not in it.
+        assert!(data.is_empty(), "{name}");
+    }
+}
+
 #[test]
 fn resources_in_a_codec_exav_lacks_are_reported_not_passed_over() {
     // LZMS is not decoded yet. That costs coverage, and it must not cost a
@@ -185,20 +277,31 @@ fn resources_failing_only_their_sha1_are_handed_over() {
     }
 }
 
+/// The members of `blob` with checksums verified. A resource is a stream whose
+/// read fails at its end where its SHA-1 does not hold, which a scan treats as
+/// the member not scanned, so it comes here as a member reported, with no data.
 #[cfg(feature = "checksums")]
 fn members_verified(blob: &[u8]) -> Vec<Entry> {
+    use exav_unpack::Member;
     let mut out = Vec::new();
     let mut b = Budget::new(Limits::default());
     b.set_verify_checksums(true);
-    let _ = extract_each(
-        Format::Wim,
-        blob,
-        &mut b,
-        &mut |e: Entry, _: &mut Budget| {
-            out.push(e);
-            None::<()>
-        },
-    );
+    let _ = exav_unpack::walk(Format::Wim, &blob, &mut b, &mut |meta, content, _| {
+        let mut entry = Entry::new(meta.name.clone(), Vec::new());
+        entry.unsupported = meta.unsupported;
+        match content {
+            Some(Member::Bytes(bytes)) => entry.data = bytes,
+            Some(Member::Stream(r)) => {
+                if r.read_to_end(&mut entry.data).is_err() {
+                    entry.data.clear();
+                    entry.unsupported = Some("stream read failed");
+                }
+            }
+            None => {}
+        }
+        out.push(entry);
+        None::<()>
+    });
     out
 }
 
diff --git a/crates/exav-unpack/tests/suites/xz_checks.rs b/crates/exav-unpack/tests/suites/xz_checks.rs
new file mode 100644
index 00000000..11ba37cd
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/xz_checks.rs
@@ -0,0 +1,71 @@
+//! xz streams with a check the decoder does not read (SHA-256, and the reserved
+//! types) are decoded without it, as liblzma does. The fixtures are built by
+//! `make.py` in `tests/fixtures/xz_checks/`; `xz -t` accepts them, with a
+//! warning that the check is not verified for the reserved ones.
+
+use exav_unpack::{Budget, Entry, Format, Limits, extract};
+
+fn fixture(name: &str) -> Vec<u8> {
+    let p = format!(
+        "{}/tests/fixtures/xz_checks/{name}",
+        env!("CARGO_MANIFEST_DIR")
+    );
+    std::fs::read(&p).unwrap_or_else(|e| panic!("read {p}: {e}"))
+}
+
+fn members(blob: &[u8]) -> Vec<Entry> {
+    extract(Format::Xz, &blob, &mut Budget::new(Limits::default())).unwrap()
+}
+
+#[test]
+fn a_sha256_stream_is_decoded() {
+    let m = members(&fixture("sha256.xz"));
+    assert_eq!(m.len(), 1);
+    assert!(m[0].unsupported.is_none(), "{:?}", m[0].unsupported);
+    assert_eq!(m[0].data, fixture("plain.bin"));
+}
+
+#[test]
+fn a_reserved_check_is_skipped() {
+    for id in [2, 9, 12, 15] {
+        let m = members(&fixture(&format!("reserved_{id}.xz")));
+        assert!(
+            m[0].unsupported.is_none(),
+            "check {id}: {:?}",
+            m[0].unsupported
+        );
+        assert_eq!(m[0].data, fixture("plain.bin"), "check {id}");
+    }
+}
+
+/// Two such streams one after the other, with the zero padding the format
+/// allows between them, decode to both.
+#[test]
+fn streams_in_a_row_are_all_decoded() {
+    let one = fixture("reserved_9.xz");
+    let blob = [&one[..], &[0u8; 8], &fixture("sha256.xz")].concat();
+    let plain = fixture("plain.bin");
+    assert_eq!(members(&blob)[0].data, [&plain[..], &plain].concat());
+}
+
+/// A stream cut short gives the data before the cut and is reported as one
+/// with a check the decoder reads is.
+#[test]
+fn a_cut_stream_is_treated_as_a_cut_stream_is() {
+    let cut = |name: &str, at: usize| {
+        let blob = fixture(name);
+        members(&blob[..blob.len() * at / 100])
+    };
+    for at in [20, 50, 80, 95] {
+        let (read, rewritten) = (cut("crc32.xz", at), cut("reserved_12.xz", at));
+        assert_eq!(
+            read[0].unsupported, rewritten[0].unsupported,
+            "cut at {at}%"
+        );
+        assert!(!rewritten[0].data.is_empty(), "cut at {at}%");
+        assert!(
+            fixture("plain.bin").starts_with(&rewritten[0].data),
+            "cut at {at}%"
+        );
+    }
+}
diff --git a/crates/exav-unpack/tests/suites/xz_dict.rs b/crates/exav-unpack/tests/suites/xz_dict.rs
index 4dabe935..1cee9d56 100644
--- a/crates/exav-unpack/tests/suites/xz_dict.rs
+++ b/crates/exav-unpack/tests/suites/xz_dict.rs
@@ -11,7 +11,7 @@
 //! does not fully understand is deliberate: a guessed dictionary size would
 //! either invent alerts on ordinary archives or miss the ones that matter.
 
-use exav_unpack::{xz_declared_dict_size, XZ_MAX_DICT};
+use exav_unpack::{XZ_MAX_DICT, xz_declared_dict_size};
 
 /// Build an XZ stream header plus one block header declaring an LZMA2 filter
 /// with dictionary-size property `prop`. The body is irrelevant — the whole
diff --git a/crates/exav-unpack/tests/suites/zip_appended.rs b/crates/exav-unpack/tests/suites/zip_appended.rs
index 1d635b62..79b9ccf9 100644
--- a/crates/exav-unpack/tests/suites/zip_appended.rs
+++ b/crates/exav-unpack/tests/suites/zip_appended.rs
@@ -1,7 +1,7 @@
 //! A ZIP whose offsets count from the archive's own start while bytes precede
 //! it: a self-extractor's payload, or an archive appended to another file.
 
-use exav_unpack::{walk, Budget, Format, Limits, Member, MemberMeta};
+use exav_unpack::{Budget, Format, Limits, Member, MemberMeta, walk};
 use std::io::Write;
 
 fn zip_of(name: &str, contents: &[u8]) -> Vec<u8> {
diff --git a/crates/exav-unpack/tests/suites/zip_codecs.rs b/crates/exav-unpack/tests/suites/zip_codecs.rs
index 33567f14..79b66a15 100644
--- a/crates/exav-unpack/tests/suites/zip_codecs.rs
+++ b/crates/exav-unpack/tests/suites/zip_codecs.rs
@@ -3,7 +3,7 @@
 //! decoders and scanned — a payload behind an exotic codec must not hide. And one
 //! undecodable member must never abort the whole archive.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 const EICAR: &[u8] = b"X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR";
 
@@ -35,7 +35,7 @@ fn zip_lzma_member_is_decoded() {
 #[test]
 #[cfg(feature = "lzip")]
 fn zip_lzma_member_is_decoded_once_when_streamed() {
-    use exav_unpack::{walk, Member, MemberMeta};
+    use exav_unpack::{Member, MemberMeta, walk};
     let blob = fixture("eicar_lzma.zip");
     let mut budget = Budget::new(Limits::default());
     let mut seen = Vec::new();
@@ -177,7 +177,7 @@ const LEGACY: [&str; 3] = [
 
 #[test]
 fn legacy_methods_are_decoded() {
-    use exav_unpack::{walk, Member, MemberMeta};
+    use exav_unpack::{Member, MemberMeta, walk};
     for name in LEGACY {
         let blob = fixture(name);
         let entries = extract(Format::Zip, &blob, &mut Budget::new(Limits::default())).unwrap();
@@ -264,7 +264,7 @@ fn implode_tree_size_255_is_not_a_panic() {
 /// decoded and the limit is reported.
 #[test]
 fn legacy_methods_over_the_buffer_limit_are_a_limit() {
-    use exav_unpack::{walk, Member, MemberMeta};
+    use exav_unpack::{Member, MemberMeta, walk};
     for name in LEGACY {
         let blob = fixture(name);
         let mut limits = Limits::default();
@@ -288,7 +288,7 @@ fn legacy_methods_over_the_buffer_limit_are_a_limit() {
 #[test]
 #[cfg(feature = "bzip2")]
 fn a_large_raw_decoded_member_streams_and_the_walk_goes_on() {
-    use exav_unpack::{walk, Member, MemberMeta};
+    use exav_unpack::{Member, MemberMeta, walk};
     // big.bin: 20000 bytes, bzip2 (method 12); after.txt: deflated.
     let blob = fixture("bzip2_large_then_small.zip");
     let mut limits = Limits::default();
@@ -416,7 +416,7 @@ fn walk_small_buffer(blob: &[u8]) -> Seen {
 }
 
 fn walk_with_buffer(blob: &[u8], max_buffer: u64) -> (Seen, Result<(), exav_unpack::LimitHit>) {
-    use exav_unpack::{walk, Member, MemberMeta};
+    use exav_unpack::{Member, MemberMeta, walk};
     let mut limits = Limits::default();
     limits.max_buffer_bytes = max_buffer;
     let mut seen = Vec::new();
@@ -694,7 +694,7 @@ fn orphan_directory_entry_is_not_reported() {
 /// directory (streamed walk and buffered extraction) and as an orphan.
 #[test]
 fn a_deflated_member_of_zero_bytes_is_empty() {
-    use exav_unpack::{walk, Member, MemberMeta};
+    use exav_unpack::{Member, MemberMeta, walk};
     let blob = zip_of(&[
         ("empty.txt", 8, b"", 0, 0),
         ("after.txt", 0, EICAR, crc(EICAR), EICAR.len() as u32),
diff --git a/crates/exav-unpack/tests/suites/zip_deflate64.rs b/crates/exav-unpack/tests/suites/zip_deflate64.rs
index 8cc8a305..a3073cf8 100644
--- a/crates/exav-unpack/tests/suites/zip_deflate64.rs
+++ b/crates/exav-unpack/tests/suites/zip_deflate64.rs
@@ -35,7 +35,7 @@
 //! repetitive and high-entropy) through `7z a -tzip -mm=Deflate64` and comparing
 //! exav's output byte-for-byte against the originals.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 
 const EICAR: &[u8] = b"X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR";
 
diff --git a/crates/exav-unpack/tests/suites/zip_disguised_members.rs b/crates/exav-unpack/tests/suites/zip_disguised_members.rs
index 3d9aef09..d59ff7f7 100644
--- a/crates/exav-unpack/tests/suites/zip_disguised_members.rs
+++ b/crates/exav-unpack/tests/suites/zip_disguised_members.rs
@@ -9,7 +9,7 @@
 //! not use, and the sample still scanned clean; asserting on the walk the
 //! scanner takes is what catches that.
 
-use exav_unpack::{extract, walk, Budget, Entry, Format, Limits, Member, MemberMeta};
+use exav_unpack::{Budget, Entry, Format, Limits, Member, MemberMeta, extract, walk};
 
 /// Bitwise CRC-32 (IEEE), so the fixtures carry real checksums without pulling a
 /// dependency into the test.
diff --git a/crates/exav-unpack/tests/suites/zip_local_vs_directory.rs b/crates/exav-unpack/tests/suites/zip_local_vs_directory.rs
new file mode 100644
index 00000000..d7b774a7
--- /dev/null
+++ b/crates/exav-unpack/tests/suites/zip_local_vs_directory.rs
@@ -0,0 +1,213 @@
+//! A ZIP whose central directory and local headers disagree holds one member for
+//! a reader that believes the directory (the `zip` crate, 7-Zip) and another for
+//! a reader that believes the local header (Info-ZIP `unzip`). Each is a thing
+//! a user extracts, so a payload in either must be scanned.
+//!
+//! Each archive here has a member whose payload is deflated EICAR, and one field
+//! of its directory record that does not match its local header. Nothing in the
+//! file is the string itself, so only a reader that decodes the member the way
+//! the local header says finds it.
+
+use exav_unpack::{Budget, Format, Limits, Member, MemberMeta, extract, walk};
+use std::io::Write;
+
+fn eicar_text() -> Vec<u8> {
+    // Repetitive, so that deflate codes it and the string is not in the bytes.
+    [exav_unpack::eicar(), b"\n"].concat().repeat(40)
+}
+
+fn deflate(data: &[u8]) -> Vec<u8> {
+    let mut e = flate2::write::DeflateEncoder::new(Vec::new(), flate2::Compression::default());
+    e.write_all(data).unwrap();
+    e.finish().unwrap()
+}
+
+fn crc32(data: &[u8]) -> u32 {
+    let mut c = !0u32;
+    for &b in data {
+        c ^= u32::from(b);
+        for _ in 0..8 {
+            c = if c & 1 != 0 {
+                (c >> 1) ^ 0xEDB8_8320
+            } else {
+                c >> 1
+            };
+        }
+    }
+    !c
+}
+
+/// What a header says of the member.
+#[derive(Clone)]
+struct Fields {
+    method: u16,
+    comp: u32,
+    usize_: u32,
+    name: &'static str,
+}
+
+/// A one-member ZIP: `local` is the local header's reading, `dir` the central
+/// directory's, `data` what lies after the local header.
+fn zip(local: &Fields, dir: &Fields, data: &[u8], crc: u32) -> Vec<u8> {
+    let mut z = Vec::new();
+    z.extend_from_slice(b"PK\x03\x04");
+    z.extend_from_slice(&20u16.to_le_bytes());
+    z.extend_from_slice(&0u16.to_le_bytes());
+    z.extend_from_slice(&local.method.to_le_bytes());
+    z.extend_from_slice(&[0; 4]);
+    z.extend_from_slice(&crc.to_le_bytes());
+    z.extend_from_slice(&local.comp.to_le_bytes());
+    z.extend_from_slice(&local.usize_.to_le_bytes());
+    z.extend_from_slice(&(local.name.len() as u16).to_le_bytes());
+    z.extend_from_slice(&0u16.to_le_bytes());
+    z.extend_from_slice(local.name.as_bytes());
+    z.extend_from_slice(data);
+    let cd_at = z.len() as u32;
+    let mut cd = b"PK\x01\x02".to_vec();
+    cd.extend_from_slice(&20u16.to_le_bytes());
+    cd.extend_from_slice(&20u16.to_le_bytes());
+    cd.extend_from_slice(&0u16.to_le_bytes());
+    cd.extend_from_slice(&dir.method.to_le_bytes());
+    cd.extend_from_slice(&[0; 4]);
+    cd.extend_from_slice(&crc.to_le_bytes());
+    cd.extend_from_slice(&dir.comp.to_le_bytes());
+    cd.extend_from_slice(&dir.usize_.to_le_bytes());
+    cd.extend_from_slice(&(dir.name.len() as u16).to_le_bytes());
+    cd.extend_from_slice(&[0; 12]);
+    cd.extend_from_slice(&0u32.to_le_bytes());
+    cd.extend_from_slice(dir.name.as_bytes());
+    z.extend_from_slice(&cd);
+    z.extend_from_slice(b"PK\x05\x06\0\0\0\0\x01\0\x01\0");
+    z.extend_from_slice(&(cd.len() as u32).to_le_bytes());
+    z.extend_from_slice(&cd_at.to_le_bytes());
+    z.extend_from_slice(&0u16.to_le_bytes());
+    z
+}
+
+/// Every member the two paths a scan takes find, their bytes.
+fn members(blob: &[u8]) -> (Vec<Vec<u8>>, Vec<Vec<u8>>) {
+    let mut budget = Budget::new(Limits::default());
+    let mut buffered = Vec::new();
+    if let Ok(entries) = extract(Format::Zip, &blob, &mut budget) {
+        buffered = entries.into_iter().map(|e| e.data).collect();
+    }
+    let mut budget = Budget::new(Limits::default());
+    let mut streamed = Vec::new();
+    let mut visit = |_: &MemberMeta, content: Option<Member<'_>>, _: &mut Budget| {
+        match content {
+            Some(Member::Bytes(d)) => streamed.push(d),
+            Some(Member::Stream(r)) => {
+                // A member the directory misdescribes may fail its checksum
+                // part way; what was read is what a scan would have matched.
+                let mut d = Vec::new();
+                let _ = std::io::Read::read_to_end(r, &mut d);
+                streamed.push(d);
+            }
+            None => {}
+        }
+        None::<()>
+    };
+    let _ = walk(Format::Zip, &blob, &mut budget, &mut visit);
+    (buffered, streamed)
+}
+
+fn holds_the_payload(found: &[Vec<u8>]) -> bool {
+    let eicar = exav_unpack::eicar();
+    found
+        .iter()
+        .any(|d| d.windows(eicar.len()).any(|w| w == eicar))
+}
+
+fn assert_both_paths_find_it(name: &str, blob: &[u8]) {
+    let eicar = exav_unpack::eicar();
+    assert!(
+        !blob.windows(eicar.len()).any(|w| w == eicar),
+        "{name}: the string must not be in the file's bytes"
+    );
+    let (buffered, streamed) = members(blob);
+    assert!(
+        holds_the_payload(&buffered),
+        "{name}: the buffered path missed it"
+    );
+    assert!(
+        holds_the_payload(&streamed),
+        "{name}: the streaming path missed it"
+    );
+}
+
+#[test]
+fn a_directory_that_says_stored_for_a_deflated_member() {
+    let text = eicar_text();
+    let comp = deflate(&text);
+    let local = Fields {
+        method: 8,
+        comp: comp.len() as u32,
+        usize_: text.len() as u32,
+        name: "e.com",
+    };
+    // Same size, so a reader that takes the directory at its word takes the
+    // compressed bytes for the file.
+    let dir = Fields {
+        method: 0,
+        ..local.clone()
+    };
+    assert_both_paths_find_it("method", &zip(&local, &dir, &comp, crc32(&text)));
+}
+
+#[test]
+fn a_directory_that_gives_a_deflated_member_no_size() {
+    let text = eicar_text();
+    let comp = deflate(&text);
+    let local = Fields {
+        method: 8,
+        comp: comp.len() as u32,
+        usize_: text.len() as u32,
+        name: "e.com",
+    };
+    for short in [0, 3] {
+        let dir = Fields {
+            comp: short,
+            ..local.clone()
+        };
+        assert_both_paths_find_it(
+            &format!("size {short}"),
+            &zip(&local, &dir, &comp, crc32(&text)),
+        );
+    }
+}
+
+#[test]
+fn a_directory_that_names_the_member_as_another() {
+    // The record's name is not the local header's: `unzip` goes by the header.
+    let text = eicar_text();
+    let comp = deflate(&text);
+    let local = Fields {
+        method: 8,
+        comp: comp.len() as u32,
+        usize_: text.len() as u32,
+        name: "e.com",
+    };
+    let dir = Fields {
+        name: "x.txt",
+        method: 0,
+        comp: 0,
+        usize_: 0,
+    };
+    assert_both_paths_find_it("name", &zip(&local, &dir, &comp, crc32(&text)));
+}
+
+#[test]
+fn an_archive_whose_headers_agree_has_no_member_twice() {
+    let text = eicar_text();
+    let comp = deflate(&text);
+    let f = Fields {
+        method: 8,
+        comp: comp.len() as u32,
+        usize_: text.len() as u32,
+        name: "e.com",
+    };
+    let (buffered, streamed) = members(&zip(&f, &f, &comp, crc32(&text)));
+    assert_eq!(buffered.len(), 1);
+    assert_eq!(streamed.len(), 1);
+    assert!(holds_the_payload(&buffered) && holds_the_payload(&streamed));
+}
diff --git a/crates/exav-unpack/tests/suites/zoo.rs b/crates/exav-unpack/tests/suites/zoo.rs
index 2b36bdda..7890377e 100644
--- a/crates/exav-unpack/tests/suites/zoo.rs
+++ b/crates/exav-unpack/tests/suites/zoo.rs
@@ -12,7 +12,7 @@
 //! written by real `zoo`; see `NOTICE`.
 
 use super::extract_each;
-use exav_unpack::{detect, Budget, Entry, Format, Limits};
+use exav_unpack::{Budget, Entry, Format, Limits, detect};
 
 fn fixture(name: &str) -> Vec<u8> {
     let p = format!("{}/tests/fixtures/zoo/{name}", env!("CARGO_MANIFEST_DIR"));
diff --git a/crates/exav-update/src/lib.rs b/crates/exav-update/src/lib.rs
index 744f4bd8..3729c307 100644
--- a/crates/exav-update/src/lib.rs
+++ b/crates/exav-update/src/lib.rs
@@ -269,23 +269,19 @@ fn fetch_into(
     let have_dest = dest.exists();
 
     // HEAD shortcut: unchanged validator -> no body transfer.
-    if have_dest {
-        if let Some(p) = prev {
-            if let Ok(head) = with_auth(agent.head(url)).call() {
-                if validator_of(&head).as_deref() == Some(p) {
-                    return Ok(Fetch::Unchanged {
-                        validator: Some(p.to_string()),
-                    });
-                }
-            }
-        }
+    if have_dest
+        && let Some(p) = prev
+        && let Ok(head) = with_auth(agent.head(url)).call()
+        && validator_of(&head).as_deref() == Some(p)
+    {
+        return Ok(Fetch::Unchanged {
+            validator: Some(p.to_string()),
+        });
     }
 
     let mut req = with_auth(agent.get(url));
-    if have_dest {
-        if let Some(p) = prev {
-            req = req.header(validator_header(p), p);
-        }
+    if have_dest && let Some(p) = prev {
+        req = req.header(validator_header(p), p);
     }
     let resp = req.call().map_err(|e| io::Error::other(e.to_string()))?;
     // ureq surfaces a 304 as `Ok`; treat it as unchanged.
@@ -304,12 +300,12 @@ fn fetch_into(
     // Refuse before allocating, not after. `Content-Length` was already parsed
     // and was previously only consulted once the whole body was in memory, so a
     // server declaring 4 GiB got 4 GiB read before anything objected.
-    if let Some(len) = expected {
-        if len > MAX_FETCH {
-            return Err(io::Error::other(format!(
-                "response declares {len} bytes, over the {MAX_FETCH}-byte cap"
-            )));
-        }
+    if let Some(len) = expected
+        && len > MAX_FETCH
+    {
+        return Err(io::Error::other(format!(
+            "response declares {len} bytes, over the {MAX_FETCH}-byte cap"
+        )));
     }
     let mut body = Vec::new();
     resp.into_body()
@@ -319,13 +315,13 @@ fn fetch_into(
     if body.len() as u64 > MAX_FETCH {
         return Err(io::Error::other("response exceeds size cap"));
     }
-    if let Some(len) = expected {
-        if body.len() as u64 != len {
-            return Err(io::Error::other(format!(
-                "truncated download: got {} of {len} bytes",
-                body.len()
-            )));
-        }
+    if let Some(len) = expected
+        && body.len() as u64 != len
+    {
+        return Err(io::Error::other(format!(
+            "truncated download: got {} of {len} bytes",
+            body.len()
+        )));
     }
     validate(&body).map_err(io::Error::other)?;
 
diff --git a/crates/exav-update/tests/http_fetch.rs b/crates/exav-update/tests/http_fetch.rs
index a9ab15e0..946da4d5 100644
--- a/crates/exav-update/tests/http_fetch.rs
+++ b/crates/exav-update/tests/http_fetch.rs
@@ -8,7 +8,7 @@ use std::net::TcpListener;
 use std::sync::{Arc, Mutex};
 
 use exav_update::{
-    fetch_db_if_changed, fetch_signature_if_changed, prune_env_sources, sig_dest, Fetch,
+    Fetch, fetch_db_if_changed, fetch_signature_if_changed, prune_env_sources, sig_dest,
 };
 
 struct State {
@@ -396,9 +396,10 @@ fn sig_dest_namespaces_by_origin_and_resists_traversal() {
     // The layout still reads as the origin it came from; the final component
     // carries a digest of the whole URL, so the exact filename is not pinned.
     assert!(a.to_string_lossy().contains("mirror-a.example.com/daily"));
-    assert!(b
-        .to_string_lossy()
-        .contains("mirror-b.example.com/feeds/daily"));
+    assert!(
+        b.to_string_lossy()
+            .contains("mirror-b.example.com/feeds/daily")
+    );
 
     // The extension survives the digest, for every source and every suffix. The
     // loader routes a database file by extension and nothing else, so a name it
diff --git a/crates/exav-viewer/.gitignore b/crates/exav-viewer/.gitignore
index 77f47001..a46231dc 100644
--- a/crates/exav-viewer/.gitignore
+++ b/crates/exav-viewer/.gitignore
@@ -6,3 +6,5 @@
 /e2e/.out/
 # The demo's sample files, from github.com/sylvinus/exav-samples: `npm run demo:showcase`.
 /demo/public/showcase/
+# The demo's example files, from demo/examples/: `npm run demo:examples`.
+/demo/public/examples/
diff --git a/crates/exav-viewer/Cargo.lock b/crates/exav-viewer/Cargo.lock
index e3183482..af7b3e19 100644
--- a/crates/exav-viewer/Cargo.lock
+++ b/crates/exav-viewer/Cargo.lock
@@ -8,18 +8,76 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aligned-vec"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
+
+[[package]]
+name = "archmage"
+version = "0.9.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15785ee3576fbd41276a25f063b1e6b5bf323af9b4924632e25a8de6a3065f06"
+dependencies = [
+ "archmage-macros",
+ "safe_unaligned_simd",
+ "winarm-cpufeatures",
+]
+
+[[package]]
+name = "archmage-macros"
+version = "0.9.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce7707714970d5cf476caccbae2d282000c6c14ca5aada878e722a10d8e1c153"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
+[[package]]
+name = "atomic_refcell"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e4227379beff4205943696e6c3e0cd809bacdf3f0edd6e3dd153e2269571a4"
+
 [[package]]
 name = "autocfg"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
+[[package]]
+name = "bcdec_rs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f09c37bc0e9f0924b7dae9988265ef3c76c88538f41a3b06caf4bed07cee5226"
+
 [[package]]
 name = "bitflags"
 version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
+[[package]]
+name = "block-buffer"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
+dependencies = [
+ "hybrid-array",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
@@ -31,6 +89,26 @@ name = "bytemuck"
 version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "byteorder-lite"
@@ -44,32 +122,67 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
 [[package]]
 name = "core_detect"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48"
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "crunchy"
-version = "0.2.4"
+name = "crypto-common"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
+dependencies = [
+ "hybrid-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+]
 
 [[package]]
 name = "encoding_rs"
@@ -85,41 +198,83 @@ dependencies = [
  "simdutf8",
 ]
 
+[[package]]
+name = "enough"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877362cb7b70d1c617f0cd3c67708bd58d894a86af5104018e2c10ebaee3c02f"
+
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
+
 [[package]]
 name = "exav-render"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
+ "bcdec_rs",
  "bytemuck",
+ "encoding_rs",
  "exav-unpack",
  "fax",
  "flate2",
  "gif",
- "half",
  "hayro-ccitt",
  "hayro-jbig2",
  "hayro-jpeg2000",
  "image",
+ "lzma-rust2",
  "png",
+ "pulldown-cmark",
  "quick-error",
+ "quick-xml",
+ "ruzstd",
  "weezl",
- "zune-core 0.4.12",
- "zune-core 0.5.0",
+ "zenjxl-decoder",
+ "zip",
+ "zune-core 0.5.3",
  "zune-jpeg 0.4.21",
- "zune-jpeg 0.5.8",
+ "zune-jpeg 0.5.15",
 ]
 
 [[package]]
 name = "exav-unpack"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "encoding_rs",
+ "flate2",
+ "html5gum",
+ "md-5",
  "memchr",
+ "sha1",
  "thiserror",
 ]
 
 [[package]]
 name = "exav-viewer"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "exav-render",
  "wasm-bindgen",
@@ -176,15 +331,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "half"
-version = "2.7.1"
+name = "hashbrown"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
-dependencies = [
- "cfg-if",
- "crunchy",
- "zerocopy",
-]
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
 [[package]]
 name = "hayro-ccitt"
@@ -207,6 +357,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "122c5f834c37a2260b9c851bb8be685cf539b2a8b94b704a931ef7d2525d5835"
 
+[[package]]
+name = "html5gum"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "428502d3ec1742c35e015871aef742bc4722a9acfcb616b8ff79b519922e1c36"
+
+[[package]]
+name = "hybrid-array"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17"
+dependencies = [
+ "typenum",
+]
+
 [[package]]
 name = "image"
 version = "0.25.9"
@@ -234,6 +399,38 @@ dependencies = [
  "quick-error",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.191"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
+
+[[package]]
+name = "lzma-rust2"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1c46f3fcd2e888afdb01a07efc071cb21300e07c68d32c3e8b01b5c8cb1fcaa"
+
+[[package]]
+name = "md-5"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
 [[package]]
 name = "memchr"
 version = "2.8.3"
@@ -276,6 +473,29 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
 
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -291,6 +511,12 @@ version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "png"
 version = "0.18.0"
@@ -313,6 +539,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "278e9268c93b9e498a2da46c34d90ba93a3255eb99009646398f34bc73ab36eb"
+dependencies = [
+ "bitflags",
+ "memchr",
+ "unicase",
+]
+
 [[package]]
 name = "pxfm"
 version = "0.1.30"
@@ -334,6 +571,15 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
+[[package]]
+name = "quick-xml"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.47"
@@ -349,12 +595,35 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
+[[package]]
+name = "ruzstd"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e4ce4a039f42bf25920b95667e4d789e98749ab11bbb8d2c2936f788421bb5"
+
+[[package]]
+name = "safe_unaligned_simd"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9c874fb993656d484725d58fbfddb39dfcf98ebcadc1a1d09568aa6b39bafba"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sha1"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.10"
@@ -367,6 +636,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
+[[package]]
+name = "smallvec"
+version = "1.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
+
 [[package]]
 name = "syn"
 version = "2.0.119"
@@ -380,9 +655,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -406,14 +681,32 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
+[[package]]
+name = "typed-path"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c"
+
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
+[[package]]
+name = "unicase"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f"
+
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "wasm-bindgen"
@@ -447,7 +740,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -467,25 +760,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
 
 [[package]]
-name = "zerocopy"
-version = "0.8.59"
+name = "winarm-cpufeatures"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"
+checksum = "d107c80dd656e1a2c254dfb1d57ece73b7f515b8a8684c270c23cab68f4a440d"
+
+[[package]]
+name = "zenjxl-decoder"
+version = "0.3.10"
 dependencies = [
- "zerocopy-derive",
+ "aligned-vec",
+ "array-init",
+ "atomic_refcell",
+ "bytemuck",
+ "byteorder",
+ "enough",
+ "num-derive",
+ "num-traits",
+ "paste",
+ "smallvec",
+ "thiserror",
+ "zenjxl-decoder-macros",
+ "zenjxl-decoder-simd",
 ]
 
 [[package]]
-name = "zerocopy-derive"
-version = "0.8.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"
+name = "zenjxl-decoder-macros"
+version = "0.3.9"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "zenjxl-decoder-simd"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237f3740d3d098854c6008515cdff29d8cbadcb6b4e3a1582e28dd3a04e3213e"
+dependencies = [
+ "archmage",
+ "paste",
+]
+
+[[package]]
+name = "zip"
+version = "9.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "indexmap",
+ "memchr",
+ "nix",
+ "typed-path",
+]
+
 [[package]]
 name = "zlib-rs"
 version = "0.6.8"
@@ -500,9 +831,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
 name = "zune-core"
-version = "0.5.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b"
 
 [[package]]
 name = "zune-jpeg"
@@ -515,9 +846,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.5.8"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
 dependencies = [
- "zune-core 0.5.0",
+ "zune-core 0.5.3",
 ]
diff --git a/crates/exav-viewer/Cargo.toml b/crates/exav-viewer/Cargo.toml
index 9776d999..287e0e26 100644
--- a/crates/exav-viewer/Cargo.toml
+++ b/crates/exav-viewer/Cargo.toml
@@ -2,27 +2,36 @@
 # target directory), so values are explicit.
 [package]
 name = "exav-viewer"
-version = "0.0.2"
-edition = "2021"
+version = "0.0.3"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/sylvinus/exav"
-rust-version = "1.92"
+rust-version = "1.95"
 description = "The WebAssembly half of @exav/viewer: exav-render's image decoders, DWG/DXF engine and IFC/STL meshes for the browser."
 publish = false
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-# Five modules are built from this crate, one per feature, so that a page
+# Nine modules are built from this crate, one per feature, so that a page
 # downloads only the engine of what it opens (`scripts/build-wasm.sh`).
 [features]
 default = []
 # exav-render's image decoders, for the formats browsers do not draw.
-image = ["exav-render/image", "exav-render/webp", "exav-render/ico", "exav-render/pnm", "exav-render/qoi", "exav-render/dds", "exav-render/ff", "exav-render/hdr", "exav-render/jp2", "exav-render/jbig2"]
+image = ["exav-render/image", "exav-render/webp", "exav-render/ico", "exav-render/pnm", "exav-render/qoi", "exav-render/dds", "exav-render/ff", "exav-render/hdr", "exav-render/jp2", "exav-render/jbig2", "exav-render/jxl", "exav-render/raw"]
 # DWG and DXF, parsed and tessellated.
 dwg = ["exav-render/dwg"]
-# IFC and STL models, meshed.
-model = ["exav-render/ifc", "exav-render/stl"]
+# IFC, STL, OBJ, PLY and glTF models, meshed.
+model = ["exav-render/ifc", "exav-render/stl", "exav-render/obj", "exav-render/ply", "exav-render/gltf"]
+# Markdown, read into a tree of blocks and inlines.
+text = ["exav-render/markdown"]
+# XLS, ODS, FODS and Numbers, converted to XLSX for the spreadsheet engine.
+sheets = ["exav-render/office-sheets"]
+# PPT, ODP, FODP and Keynote, converted to PPTX for the presentation engine.
+slides = ["exav-render/office-slides"]
+# DOC, ODT, FODT and RTF, converted to DOCX for the document engine (opt-in:
+# `converter: "exav"`).
+docs = ["exav-render/office-docs"]
 # pdf.js's JPXDecode decoder, in place of OpenJPEG (openjpeg_nowasm_fallback.js).
 pdf-jpx = ["exav-render/jp2"]
 # pdf.js's JBIG2Decode and CCITTFaxDecode decoder, in place of PDFium's
@@ -30,9 +39,18 @@ pdf-jpx = ["exav-render/jp2"]
 pdf-jbig2 = ["exav-render/jbig2", "exav-render/ccitt"]
 
 [dependencies]
-exav-render = { path = "../exav-render", version = "0.0.2", default-features = false }
+exav-render = { path = "../exav-render", version = "0.0.3", default-features = false }
 wasm-bindgen = "=0.2.129"
 
+# zenjxl-decoder reads `std::time::Instant` for every frame, which panics on
+# this target: the copy here reads a clock that says zero there, and is the
+# published 0.3.10 in everything else (vendor/zenjxl-decoder/EXAV.md). Its
+# macros crate is copied without `proc-macro-error2`, which is unmaintained
+# (vendor/zenjxl-decoder-macros/EXAV.md).
+[patch.crates-io]
+zenjxl-decoder = { path = "vendor/zenjxl-decoder" }
+zenjxl-decoder-macros = { path = "vendor/zenjxl-decoder-macros" }
+
 # Size-optimised: this crate ships as `.wasm`.
 #
 # `wasm32-unknown-unknown` is a `panic = "abort"` target, so a panic traps the
diff --git a/crates/exav-viewer/LICENSES/BSD-3-Clause.txt b/crates/exav-viewer/LICENSES/BSD-3-Clause.txt
new file mode 100644
index 00000000..c66034b1
--- /dev/null
+++ b/crates/exav-viewer/LICENSES/BSD-3-Clause.txt
@@ -0,0 +1,27 @@
+Copyright (c) the JPEG XL Project Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/exav-viewer/NOTICE b/crates/exav-viewer/NOTICE
index 9c15cc4b..6ebdb457 100644
--- a/crates/exav-viewer/NOTICE
+++ b/crates/exav-viewer/NOTICE
@@ -2,7 +2,7 @@
 =================================
 
 @exav/viewer is licensed under the MIT License (see LICENSE). Its JavaScript
-is exav's own, but for the wasm-bindgen glue in its modules. Its five
+is exav's own, but for the wasm-bindgen glue in its modules. Its nine
 WebAssembly modules are builds of exav-render, and its fonts are
 third-party: this file gives their notices. The licence texts it refers to
 are in LICENSES/, and in assets/fonts/ for the fonts.
@@ -23,7 +23,14 @@ Part 1: in every WebAssembly module
 
 wasm/exav_viewer_image_bg.wasm decodes raster images; wasm/exav_viewer_dwg_bg.wasm
 reads DWG and DXF drawings and tessellates them; wasm/exav_viewer_model_bg.wasm
-reads IFC and STL models and meshes them. Two more are embedded, in
+reads IFC and STL models and meshes them; wasm/exav_viewer_text_bg.wasm reads
+Markdown into a tree; wasm/exav_viewer_sheets_bg.wasm converts XLS, ODS,
+Numbers and other spreadsheets to XLSX (exav-render's office-sheets);
+wasm/exav_viewer_slides_bg.wasm converts PPT, ODP, Keynote, ODG and VSDX
+files to PPTX (exav-render's office-slides, with office-sheets for the charts
+of ODP files); wasm/exav_viewer_docs_bg.wasm converts DOC, ODT, RTF, Word 2003
+XML and Pages documents to DOCX (exav-render's office-docs). Two more
+are embedded, in
 base64, in the modules pdf.js imports in place of its own decoders:
 exav_viewer_pdf_jpx_bg.wasm (JPXDecode) in wasm/openjpeg_nowasm_fallback.js,
 exav_viewer_pdf_jbig2_bg.wasm (JBIG2Decode, CCITTFaxDecode) in
@@ -37,7 +44,7 @@ used under the MIT License). Upstream: https://github.com/image-rs/image
 DXF and DWG readers, MIT.
 
 Build-time crates (proc-macro2, quote, syn, unicode-ident, thiserror-impl,
-fax_derive, zerocopy-derive, multiversion_no_op, wasm-bindgen-macro,
+fax_derive, multiversion_no_op, wasm-bindgen-macro,
 wasm-bindgen-macro-support) generate code but do not reach the modules and
 are not listed.
 
@@ -56,6 +63,9 @@ Upstream: http://vovanium.ru/sledy/newstroke/en
 encoding_rs, (Apache-2.0 OR MIT) AND BSD-3-Clause
 -------------------------------------------------
 
+In exav_viewer_sheets_bg.wasm, exav_viewer_slides_bg.wasm and
+exav_viewer_docs_bg.wasm too.
+
 encoding_rs is copyright Mozilla Foundation, used under the MIT License. Its
 tables are derived from the WHATWG Encoding Standard's data, under these
 terms:
@@ -96,46 +106,84 @@ Under the MIT License, each offering it (alone, or among MIT OR Apache-2.0,
 Unlicense OR MIT, MIT OR Zlib OR Apache-2.0 and similar), with the copyright
 its licence file states, or its authors where it states none. The MIT text is
 in LICENSE. Each is in the image module unless marked with the modules it
-is in: image, dwg, model, and the pdf.js decoders' jpx and jbig2. bumpalo,
-cfg-if, once_cell, wasm-bindgen and wasm-bindgen-shared are in all five.
+is in: image, dwg, model, text, sheets, slides, docs, and the pdf.js decoders'
+jpx and jbig2. bumpalo, cfg-if, once_cell, wasm-bindgen and wasm-bindgen-shared
+are in all nine.
 hayro-jpeg2000 carries two ICC profiles (ProPhoto, CIELAB) under CC0-1.0
 (LICENSES/CC0-1.0.txt).
 
-  adler2                 Jonas Schievink
-  bitflags               2014 The Rust Project Developers
+  adler2                 Jonas Schievink                         (image, sheets,
+                                                                 slides, docs)
+  aligned-vec            2022 sarah                              (image)
+  archmage, archmage-macros
+                         2025-2026 Lilith River                  (image)
+  array-init             2017-2020 The array-init developers     (image)
+  atomic_refcell         2022 Bobby Holley                       (image)
+  bitflags               2014 The Rust Project Developers        (image, text)
+  bcdec_rs               2023 SMG, from bcdec, 2022 Sergii Kudlai (image)
+  block-buffer, const-oid, crypto-common, digest, hybrid-array, md-5, sha1
+                         2016-2026 The RustCrypto Project Developers
+                                                                 (sheets, slides)
   bumpalo                2019 Nick Fitzgerald                    (all)
-  bytemuck               2019 Daniel "Lokathor" Gee
+  bytemuck, bytemuck_derive
+                         2019 Daniel "Lokathor" Gee
   byteorder-lite         2015 Andrew Gallant
   cfg-if                 2014 Alex Crichton                      (all)
   color_quant            2016 PistonDevelopers
   crc32fast              2018 Sam Rijs, Alex Crichton and contributors
+                                                                 (image, sheets,
+                                                                 slides, docs)
+  enough                 Lilith River and the enough developers  (image)
+  equator, equator-macro 2023 sarah                              (image)
+  equivalent, indexmap   2016-2023 bluss, Josh Stone             (sheets, slides,
+                                                                 docs)
   fax                    Sebastian K
   fdeflate               The image-rs Developers
-  flate2                 2014-2026 Alex Crichton
+  flate2                 2014-2026 Alex Crichton                 (image, sheets,
+                                                                 slides, docs)
   gif                    2015 nwin
-  half                   Kathryn Long
+  hashbrown              2016 Amanieu d'Antras                   (sheets, slides,
+                                                                 docs)
   hayro-ccitt            Laurenz Stampfl                         (image, jbig2)
   hayro-jbig2            Laurenz Stampfl                         (image, jbig2)
   hayro-jpeg2000         Laurenz Stampfl                         (image, jpx)
   image                  The image-rs Developers
   image-webp             The image-rs Developers
-  memchr                 2015 Andrew Gallant                     (dwg)
+  memchr                 2015 Andrew Gallant                     (dwg, text, sheets,
+                                                                 slides, docs)
   miniz_oxide            Frommi, oyvindln, Rich Geldreich; 2013-2014 RAD Game
                          Tools and Valve Software; 2010-2014 Rich Geldreich and
-                         Tenacious Software LLC
-  num-traits             2014 The Rust Project Developers
+                         Tenacious Software LLC                  (image, sheets,
+                                                                 slides, docs)
+  num-derive, num-traits 2014 The Rust Project Developers        (image)
   once_cell              Aleksey Kladov                          (all)
+  paste                  David Tolnay                            (image)
   png                    2015 nwin
+  proc-macro-error2, proc-macro-error-attr2
+                         2019-2020 CreepySkeleton                (image)
+  safe_unaligned_simd    2025 Collyn O'Kane, 2017 The Rust Project
+                         Developers                              (image)
+  pulldown-cmark         2015 Google Inc.                        (text)
+  ruzstd                 2019 Moritz Borcherding                 (image)
   qoi                    2022 Ivan Smirnov
   quick-error            2015 The quick-error Developers
+  quick-xml              2016 Johann Tuffe                       (sheets, slides,
+                                                                 docs)
   scopeguard             2016-2019 Ulrik Sverdrup "bluss" and scopeguard
                          developers                              (dwg)
-  simd-adler32           2021 Marvin Countryman
+  simd-adler32           2021 Marvin Countryman                  (image, sheets,
+                                                                 slides, docs)
+  smallvec               2018 The Servo Project Developers       (image)
   thiserror              David Tolnay                            (dwg)
+  typed-path             Chip Senkbeil                           (sheets, slides,
+                                                                 docs)
+  typenum                2014 Paho Lurie-Gregg                   (sheets, slides)
+  unicase                2014-2026 Sean McArthur                 (text)
   wasm-bindgen           2014 Alex Crichton                      (all)
   wasm-bindgen-shared    2014 Alex Crichton                      (all)
   weezl                  2020 HeroicKatora
-  zerocopy               2023 The Fuchsia Authors
+  zip                    2014 Mathijs van de Nes                 (sheets, slides,
+                                                                 docs)
   zune-core, zune-jpeg   zune-image developers
 
 Under the Apache License 2.0 (LICENSES/Apache-2.0.txt), each offering it
@@ -144,6 +192,16 @@ among other licences:
   moxcms                 2024 Radzivon Bartoshyk
   pxfm                   2024 Radzivon Bartoshyk
 
+Under the BSD 3-Clause License (LICENSES/BSD-3-Clause.txt), whose notice a
+binary distribution must reproduce: the JPEG XL decoder of the image module,
+
+  zenjxl-decoder, zenjxl-decoder-macros, zenjxl-decoder-simd
+                         Copyright (c) the JPEG XL Project Authors. All
+                         rights reserved. A fork of the libjxl team's jxl-rs
+                         (https://github.com/libjxl/jxl-rs), vendored in
+                         vendor/zenjxl-decoder and
+                         vendor/zenjxl-decoder-macros of the source tree.
+
 
 Part 4: fonts
 =============
diff --git a/crates/exav-viewer/README.md b/crates/exav-viewer/README.md
index 7f7027f9..140bd00d 100644
--- a/crates/exav-viewer/README.md
+++ b/crates/exav-viewer/README.md
@@ -1,10 +1,9 @@
 # @exav/viewer
 
-A file viewer for the browser: PDF, images, DWG and DXF drawings, Word,
-Excel, PowerPoint and CSV, IFC and STL models, video, audio, and what is
-inside an archive. One package; each format's engine is loaded only when a
-file of that format is opened, and only the engines a host lists are ever
-bundled.
+A file viewer for the browser: <!-- formats:viewer-summary -->PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint and CSV, text (Markdown, JSON, XML, source code), IFC, STL, OBJ, PLY and glTF models, video, audio, and what is inside an archive<!-- /formats:viewer-summary -->; and, converted in the browser, RTF, the 1997 Office
+formats and OpenDocument. One package; each format's engine is
+loaded only when a file of that format is opened, and only the engines a
+host lists are ever bundled.
 
 **[Live demo](https://exav.org/viewer/demo/)** · **[Documentation](https://exav.org/viewer/)**
 
@@ -14,8 +13,9 @@ bundled.
   checks every message the frame sends. See
   [Security](https://exav.org/viewer/security/).
 - Formats browsers do not draw (TIFF, BMP variants, ICO, PNM, QOI, DDS,
-  farbfeld, HDR, JPEG 2000, JBIG2), DWG/DXF and IFC/STL models are decoded
-  by exav's own Rust decoders, compiled to WebAssembly and run in workers. So are the
+  farbfeld, HDR, JPEG 2000, JBIG2, JPEG XL, camera RAW files, shown by the
+  preview they embed), DWG/DXF drawings and IFC, STL, OBJ, PLY and glTF
+  models are decoded by exav's own Rust decoders, compiled to WebAssembly and run in workers. So are the
   JPEG 2000, JBIG2 and fax images of PDFs: pdf.js is given them in place of
   its OpenJPEG and PDFium decoders (C and C++), which are not copied. The
   modules import nothing but wasm-bindgen's plumbing: no network, no global
@@ -25,6 +25,15 @@ bundled.
   Content-Security-Policy and offline.
 - Archives open in place, an archive inside an archive included, with the
   same plugins.
+- Whatever draws something can be exported as a picture: a page, a region of
+  it in the format's own coordinates (a fraction of a page, pixels of an
+  image, drawing units, a 3D camera), or what the user sees now
+  (`controllers.viewport`), drawn again from the document's data at the size
+  asked for, as an `ImageBitmap` or an image file (`pictures.raster`,
+  `pictures.toBlob`), in the sandboxed frame too. See
+  [Pictures of pages](https://exav.org/viewer/api/#pictures-of-pages).
+- A session keeps its zoom and place when the same document comes again with
+  other bytes (`session.replace`), in the sandboxed frame too.
 - A framework-free core with a plugin contract, and a default React UI on
   top of it whose every piece can be restyled or replaced.
 
@@ -39,17 +48,96 @@ then the engines of the formats you open (all optional peer dependencies):
 | Format | Plugin | Install beside it |
 |---|---|---|
 | PDF | `pdf()` from `@exav/viewer/pdf` | `pdfjs-dist` (5 or 6) |
-| Images | `image({ wasmDecoders: true })` from `@exav/viewer/image` | nothing |
+| Images, SVG, camera RAW (DNG, CR2, CR3, NEF, ARW, ORF, RW2, RAF, PEF, SRW, 3FR, IIQ, X3F and more: the largest embedded preview) | `image({ wasmDecoders: true })` from `@exav/viewer/image` | nothing |
 | DWG, DXF | `dwg()`, `dxf()` from `@exav/viewer/cad` | nothing |
 | Word, Excel, PowerPoint, CSV | `docx()`, `xlsx()`, `pptx()`, `csv()` from `@exav/viewer/office` | `@silurus/ooxml` |
+| RTF, DOC, ODT | `rtf()`, `doc()`, `odt()` from `@exav/viewer/office`, beside `docx()` | `@silurus/ooxml` (read by exav-render's `docs`, a prototype; an external converter and `pdf()` do better) |
+| XLS, ODS, Numbers | `xls()`, `ods()`, `numbers()` from `@exav/viewer/office`, beside `xlsx()` | `@silurus/ooxml` (an external converter for the files exav-render's `sheets` does not recognise) |
+| PPT, ODP, Keynote, ODG, Visio (VSDX) | `ppt()`, `odp()`, `keynote()`, `odg()`, `visio()` from `@exav/viewer/office`, beside `pptx()` | `@silurus/ooxml` (an external converter and `pdf()` for the files exav-render's `slides` does not recognise, such as the binary .vsd) |
+| Binary Visio (VSD), CorelDRAW, Publisher, PageMaker, FreeHand, QuarkXPress, Zoner Draw, WPG | `visio()`, `coreldraw()`, `publisher()`, `pagemaker()`, `freehand()`, `quarkxpress()`, `zonerdraw()`, `wpg()` from `@exav/viewer/office`, beside `pdf()` | an external converter (see below) |
+| Text, Markdown, JSON, XML, source code | `text()` from `@exav/viewer/text` | nothing (Markdown is read by a small wasm module, loaded when one is opened) |
 | IFC | `ifc()` from `@exav/viewer/ifc` | `three` |
-| STL | `stl()` from `@exav/viewer/model` | `three` |
+| STL, OBJ, PLY, glTF | `stl()`, `obj()`, `ply()`, `gltf()` from `@exav/viewer/model` | `three` |
 | Video, audio | `video()`, `audio()` from `@exav/viewer/media` | nothing |
 | Archives | `archive()` from `@exav/viewer/archive` | `@exav/unpack-wasm` |
 | Default UI | `@exav/viewer/react` | `react`, `react-dom` (19) |
 
 IFC models (IFC2X3, IFC4, IFC4X3) are read and meshed by exav's own engine
-(exav-render), and three.js draws them.
+(exav-render), and three.js draws them. Categories and building storeys
+(`controllers.storeys`, for a model with two or more) can be hidden.
+
+XLS, ODS and Numbers are converted to XLSX, shown by `xlsx()` as a
+workbook; PPT, ODP, Keynote, ODG and VSDX (a page to a slide) to PPTX, shown
+by `pptx()`; RTF, DOC and ODT to DOCX, shown by `docx()`. All by exav-render,
+which the package ships as WebAssembly modules
+(`wasm/exav_viewer_sheets_bg.wasm`, `..._slides_...`, `..._docs_...`): no
+install is needed, and nothing is fetched besides the module. What no
+converter of the package reads (binary Visio, CorelDRAW, Publisher,
+PageMaker, FreeHand, QuarkXPress, Zoner Draw and WordPerfect Graphics
+files, a CSV or a DIF saved as .xls) goes to an external converter if the
+host set one, and ends in the "needs_converter" error, with the format's
+name, if not. Each plugin also takes its templates (.dot, .pps, .pot, .xlt,
+.ott, .otp, .ots, .otg, Visio's), the flat XML OpenDocument files (.fodt,
+.fodp, .fods, .fodg), and Word 6.0/95 and Excel 2.1 to 95 files. What the
+bytes are decides, within each kind: an RTF saved as .doc is read as RTF,
+an XLSX named .xls is shown unconverted. The sandboxed viewer opens these
+formats only when named in `formats` (`BUILTIN_ORDER` names every one).
+
+A file a converter of the package recognises and cannot convert (encrypted
+with a password, too large, damaged, of a version it does not read) ends in
+the Office error, whose cause is a `SheetConversionError`,
+`SlideConversionError` or `DocConversionError` naming the reason in its
+`kind`; it is never handed to the external converter, which gets only what
+the package's converters do not recognise. exav-render reads PowerPoint 95
+and 97 to 2003 (2 to 4 are recognised and reported as unsupported), Excel 2
+to 2003, the text formats Excel opens from a .xls file (XML Spreadsheet
+2003, HTML tables, SYLK), OpenDocument drawings (a page to a slide, in the
+largest page's size) and Keynote and Numbers of every version. Text
+documents (DOC, ODT, RTF) are read by `docs`, a prototype, where no external
+converter is set; with one, text documents go to it.
+
+### The external converter
+
+`rtf({ externalConverter })` and the other plugins take `converter` and
+`externalConverter` (a plugin's options, or `conversion` in the sandboxed
+viewer's):
+
+- `converter: "exav"` (the default): the converters of the package, then the
+  external one for what they do not read. For text documents, the external
+  converter first when there is one.
+- `converter: "external"`: the external converter alone, for every format.
+- `externalConverter`: where the converter is. A URL (absolute, rooted, or
+  relative to the page) of an ES module, or the name of a package copied
+  beside the viewer's assets, which `exavViewer({ externalConverter:
+  "<package>" })` of `@exav/viewer/vite` (or `exav-viewer-assets
+  --external-converter <package>`) copies: its published files go under
+  `assetBase`, and `manifest.json` names its entry. Default: none.
+
+The module exports `convert`, and may export `prefetch`:
+
+```ts
+export function convert(bytes: Uint8Array, options: {
+  hint: string;          // what the viewer took the file for: "rtf", "doc", "odt", "ppt",
+                         // "odp", "keynote", "xls", "ods", "numbers", "odg", "visio",
+                         // "coreldraw", "publisher", "pagemaker", "freehand", "quarkxpress",
+                         // "zonerdraw" or "wpg": a hint, the bytes decide
+  maxMemory?: number;    // bytes, when the host set the `maxMemory` option
+  signal?: AbortSignal;  // aborted when the file is closed or `timeoutMs` passes: reject
+  onProgress?: (p: ConvertProgress) => void;
+}): Promise<{ format: "pdf" | "xlsx"; bytes: Uint8Array }>;
+
+export function prefetch?(hint: string): string[] | Promise<string[]>;  // URLs, relative to the module
+```
+
+`ConvertProgress` is `{ stage: "download"; loaded; total }` (the module's
+code and data arriving, `total` 0 when not known), `{ stage: "start" }`, and
+`{ stage: "load" | "export"; done; total }`; the viewer shows them as its
+loading and converting steps. A PDF is shown by `pdf()`, an XLSX by
+`xlsx()`: register them. A rejection ends in the Office error, its cause an
+`ExternalConversionError` (`kind` "failed", with the module's error as its
+cause, or "timeout": the viewer stops waiting after `timeoutMs` whether or
+not the module looks at its signal). `e2e/fixtures/fake-converter.js` is a
+minimal module that implements it.
 
 ## Use
 
@@ -103,6 +191,12 @@ import { SandboxedViewerProvider } from "@exav/viewer/react/sandbox";
 </SandboxedViewerProvider>
 ```
 
+The converted formats in the frame: name them, `sandbox={{ url, formats:
+BUILTIN_ORDER }}`. For an external converter, install it where the frame
+is built and give `exavViewer({ frameDir, externalConverter: "<package>" })`
+its name (it is copied beside the frame app, and the frame's
+`conversion.externalConverter` names it).
+
 The host reads each file for the frame: a PDF or a ZIP by HTTP range
 requests, as the frame asks for parts, the rest whole. Video, audio and
 images can go to the frame by URL instead, from origins written into its
@@ -121,11 +215,20 @@ import { pdf } from "@exav/viewer/pdf";
 
 const viewer = createViewer({ plugins: [pdf()] });
 const session = viewer.mount(element, { id: "1", name: "report.pdf", source: { url: "/files/report.pdf" } });
-session.status.subscribe((s) => console.log(s.phase));
+// While loading: what it is doing (`step`: "file", "engine", "convert"...) and how far (`progress`, 0 to 1)
+session.status.subscribe((s) => console.log(s.phase, "step" in s && s.step, "progress" in s && s.progress));
 // later
 session.destroy();
 ```
 
+`createSandboxedViewer` from `@exav/viewer/frame` gives the same sessions
+for files in the frame. A host can draw every control itself from their
+controllers (pages, zoom, sheets, a player's controls, thumbnails,
+printing) with no React and no stylesheet in its page; the frame takes the
+page's colours and hands back the arrow keys and Escape. See
+[Integration](https://exav.org/viewer/integration/#a-host-that-draws-its-own-ui)
+and `demo/headless.html`.
+
 Other bundlers: copy the assets with the command the package installs, and
 serve the directory as the viewer's `assetBase` (default `/exav-viewer/`):
 
@@ -136,7 +239,9 @@ npx exav-viewer-assets public/exav-viewer --frame public/exav-frame --frame-orig
 ```
 
 The files are under versioned directories, so `assetBase` can be served
-`Cache-Control: immutable`. The package's own wasm, workers and fonts are
+`Cache-Control: immutable`. With an `externalConverter` they include that
+package's published files under `converters/<name>/<version>/`. The
+package's own wasm, workers and fonts are
 referenced with `new URL("...", import.meta.url)`, which Vite, webpack 5 and
 Parcel follow and emit; Rollup and esbuild need a plugin for it.
 
@@ -159,6 +264,8 @@ MIT. The DWG module contains the NewStroke font (CC0-1.0) and encoding_rs,
 whose WHATWG data is BSD-3-Clause; the bundled fonts are under the SIL Open
 Font License. See NOTICE and LICENSES/. The engines installed beside the
 package keep their own licences: pdf.js is Apache-2.0 (and its ICC engine,
-qcms, MIT), the others MIT. The sandboxed frame app
+qcms, MIT), the others MIT; an external converter you install keeps its
+own.
+The sandboxed frame app
 (`dist/frame/app/`) bundles them, with their licence files in its
 `licenses/`.
diff --git a/crates/exav-viewer/demo/examples/NOTICE.md b/crates/exav-viewer/demo/examples/NOTICE.md
new file mode 100644
index 00000000..722c822e
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/NOTICE.md
@@ -0,0 +1,2912 @@
+# Notices of the example files
+
+The demo of `@exav/viewer` lists the files of this directory's `examples.json`. Each has a free licence
+that was read at the page named under "Evidence", or is made by a script of this repository and
+given to the public domain (CC0-1.0). This file is written by `generate/make-attributions.mjs`; do not edit it.
+
+235 files: 145 are committed under `files/` (5.6 MB); 90 are downloaded by `npm run demo:examples` (83.0 MB).
+
+To rebuild: run the scripts of `generate/` (each lists what it needs; `python3 -I generate/make-images.py`, `make-cad.py`,
+`make-models.py`, `make-ifc.py`, `make-text.py`, `make-archives.py`, `make-media.py`, `make-pdf.py`, `make-office.py`), then
+`node generate/make-manifest.mjs` and `node generate/make-attributions.mjs`. `node check.mjs` checks the manifest and the
+files, `node verify-open.mjs` opens every example with the viewer's own engines, and `node generate/verify-evidence.mjs`
+reads the licence pages again. `catalog.json` is where each example is described by hand.
+
+Where the pictures made here hold text, it is set in Aileron, the font Pillow bundles, which its author gives to the
+public domain (CC0-1.0, "No Rights Reserved": https://dotcolon.net/font/aileron/). Drawings name their fonts and
+embed none; documents that embed fonts embed the Liberation fonts (SIL OFL 1.1, which lets documents embed them).
+
+## PDF
+
+### field-report.pdf
+
+- What: Field report, six pages (pdf, 104 KB)
+- Shows: a table of contents whose lines are links, a two-level outline, roman and arabic page labels, internal and external links, a table, bar, line and pie charts as vectors, a JPEG, standard and embedded fonts (Latin, Greek, Cyrillic), document information
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-pdf.py`
+- SHA-256: 75b7649d62fb12034d56478c98baa92beba3c0a2117ce0cfcfffa9233d060a5b
+
+### application-form.pdf
+
+- What: Berth application form (AcroForm) (pdf-form, 19 KB)
+- Shows: text fields (multiline, maximum length, password, read-only), check boxes, radio buttons, a drop-down list, a list box, some filled in
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-pdf.py`
+- SHA-256: 883dff8626a2a95d66d74bd8876ceee621197902de671b7c036d39e21774c50b
+
+### annotations.pdf
+
+- What: Annotations without appearance streams (pdf-annotations, 6.1 KB)
+- Shows: links to a URL, a page and a named destination, highlight, underline, strike-out, squiggly, note, free text, square, circle, line with arrows, polygon, polyline, ink, stamp, file attachment, an outline and a named destination
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-pdf.py`
+- SHA-256: 212ea14f43e151d2d477b73659ef4fdb50735ee337eb76283d065ba9ec1701e9
+
+### scan-mixed.pdf
+
+- What: Scanned letters, one page for each scanner image filter (pdf-scan, 201 KB)
+- Shows: four pages: DCTDecode (JPEG), CCITTFaxDecode (Group 4), JBIG2Decode and JPXDecode (JPEG 2000), each with an invisible OCR text layer; the viewer decodes the last three with its own decoders
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-pdf.py` (with opj_compress, jbig2, tiffcp)
+- SHA-256: daeb8cab36d82d4e5391041effc7d37dddf2421a87c3853c4b763e4a4d534776
+
+### vector-art.pdf
+
+- What: Vector art (pdf, 4.3 KB)
+- Shows: axial and radial shadings, transparency, a clipping path, dashes, caps and joins, Bezier curves, an even-odd fill, text with render modes, rotated and scaled text
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-pdf.py`
+- SHA-256: fad466f385e89bc008128072d0b16544144c8a42983afd5d444079e59519e08e
+
+### handbook-tagged.pdf
+
+- What: Harbour handbook as a tagged PDF/A-2 (pdf, 188 KB)
+- Shows: bookmarks from the headings, hyperlinks, tags, footnotes, a landscape section, embedded Liberation fonts
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: c88a1434c1cbf8a8af467325bb413463276bbe70c84b5f88760638ff5975773d
+
+### arxiv-rational-cherednik-torus-knots.pdf
+
+- What: Rational Cherednik Algebras and Torus Knot Invariants (arXiv:2402.18770) (pdf, 421 KB)
+- Shows: 28 pages of mathematics, 24 outline entries, 256 links, set in LaTeX
+- Author: Xinchun Ma
+- Source: https://arxiv.org/abs/2402.18770v1
+- Licence: CC-BY-4.0
+- Evidence: https://arxiv.org/abs/2402.18770v1
+- Words read there: "href="http://creativecommons.org/licenses/by/4.0/" title="Rights to this article""
+- Attribution: Xinchun Ma, Rational Cherednik Algebras and Torus Knot Invariants, arXiv:2402.18770v1, CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/). Not modified.
+- Origin: downloaded from https://arxiv.org/pdf/2402.18770v1
+- SHA-256: 2b22841d8a64b271d7def6fa15aa0b5b98f533ae259e4108eb7104320f07cf10
+
+### nist-sp-800-63-4-digital-identity.pdf
+
+- What: NIST SP 800-63-4, Digital Identity Guidelines (pdf, 838 KB)
+- Shows: 96 tagged pages, 54 outline entries, 227 links
+- Author: David Temoshok, Diana Proud-Madruga, Yee-Yin Choong et al., NIST
+- Source: https://csrc.nist.gov/pubs/sp/800/63/4/final
+- Licence: public-domain (US federal government work, 17 U.S.C. 105; the PDF says so itself)
+- Evidence: https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63-4.pdf
+- Words read there: "is not subject to copyright in the United States."
+- Origin: downloaded from https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63-4.pdf
+- SHA-256: 2f5b107de218a0fc3fe7f7e91b2ece5babb001eda5745b7c568a3cc876002f2d
+
+### scan-cfa-minutes-1971.pdf
+
+- What: Minutes of the U.S. Commission of Fine Arts, 1970 to 1972 (scan) (pdf-scan, 1.1 MB)
+- Shows: 40 scanned pages: JPEG 2000 pictures and JBIG2 masks, an OCR text layer, PDF/A-2B
+- Author: U.S. Commission of Fine Arts; scanned by the Internet Archive
+- Source: https://archive.org/details/cfaminutes21april1971
+- Licence: public-domain (US federal government work, 17 U.S.C. 105)
+- Evidence: https://commons.wikimedia.org/wiki/File:July_8_1970_to_May_19_1972_(IA_cfaminutes21april1971).pdf
+- Words read there: "This work is in the public domain in the United States because it is a work prepared by an officer o"
+- Origin: downloaded from https://archive.org/download/cfaminutes21april1971/cfaminutes21april1971.pdf
+- SHA-256: 2fc5edb8a4f303b89449443dcb5a32249c79b2a8d67253348025d0e7eea5f94b
+
+### scan-blm-land-survey-records.pdf
+
+- What: Land and survey records, Bureau of Land Management (scan) (pdf-scan, 2.1 MB)
+- Shows: 40 pages scanned at about 500 ppi: JPEG 2000 and JBIG2 images, an OCR text layer, PDF/A-2B
+- Author: United States Bureau of Land Management; scanned by the Internet Archive
+- Source: https://archive.org/details/landsurveyrecord00unit
+- Licence: public-domain (US federal government work, 17 U.S.C. 105)
+- Evidence: https://commons.wikimedia.org/wiki/File:Land_%26_survey_records_-_record_preservation_%26_service_through_microfilm_(IA_landsurveyrecord00unit).pdf
+- Words read there: "This work is in the public domain in the United States because it is a work prepared by an officer o"
+- Origin: downloaded from https://archive.org/download/landsurveyrecord00unit/landsurveyrecord00unit.pdf
+- SHA-256: d9a9e6583d0afb1688a043ef59a8d2e236e20c58d4ba76ff625d7c11a181c16c
+
+### form-uscis-i9.pdf
+
+- What: USCIS Form I-9, Employment Eligibility Verification (pdf-form, 512 KB)
+- Shows: 115 text fields, 5 drop-down lists, 8 check boxes, links; a tagged government form
+- Author: U.S. Citizenship and Immigration Services (DHS)
+- Source: https://www.uscis.gov/i-9
+- Licence: public-domain (US federal government work, 17 U.S.C. 105)
+- Evidence: https://www.uscis.gov/website-policies
+- Words read there: "Information presented on this WWW site is considered public information and may be distributed or co"
+- Origin: downloaded from https://www.uscis.gov/sites/default/files/document/forms/i-9.pdf
+- SHA-256: 780f348c34df694bb0b4dbbfaf9f22b99b9757b80d16a37ba89aadf069597281
+
+### map-nps-canyonlands.pdf
+
+- What: Canyonlands National Park, Island in the Sky: roads and trails (pdf-map, 341 KB)
+- Shows: two tagged pages of vector map
+- Author: National Park Service
+- Source: https://home.nps.gov/cany/planyourvisit/maps.htm
+- Licence: public-domain (US federal government work, 17 U.S.C. 105)
+- Evidence: https://www.nps.gov/aboutus/disclaimer.htm
+- Words read there: "material created by the National Park Service and presented on this website, unless otherwise indica"
+- Origin: downloaded from https://home.nps.gov/cany/planyourvisit/upload/IslandRoadsandTrailsUpdated24-508forweb.pdf
+- SHA-256: b29a639d9bc0d2e37ca41b68c21bcddba7637b1727dce86980c3373715610d55
+
+### slides-unige-open-access.pdf
+
+- What: Open Access publishing at no cost thanks to UNIGE agreements (slides) (pdf, 782 KB)
+- Shows: ten slides with outline, links, tags and pictures
+- Author: Floriane Muller, Anouk Santos (University of Geneva)
+- Source: https://zenodo.org/records/23478694
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/23478694
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Floriane Muller and Anouk Santos, Open Access publishing at no cost thanks to UNIGE agreements, in 15 minutes, Zenodo, https://doi.org/10.5281/zenodo.23478694, CC BY 4.0. Not modified.
+- Origin: downloaded from https://zenodo.org/api/records/23478694/files/2026-10-20_Read_and_publish_en15min_EN_zenodo.pdf/content
+- SHA-256: 03356ed569a80f7d7dc1d96fcbfd75a2fbc663c63f6d74f4e89eb2390bb5ee64
+
+### paper-ja-labor-law.pdf
+
+- What: A paper in Japanese on labour law and the constitution (pdf, 860 KB)
+- Shows: 25 pages with embedded MS Mincho fonts
+- Author: Takashi Fujiki (藤木 貴史)
+- Source: https://zenodo.org/records/23469422
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/23469422
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: 藤木 貴史, アメリカ労働法からみた憲法の影響, アメリカ憲法の理論と実践 創刊号, Zenodo, https://doi.org/10.5281/zenodo.23469422, CC BY 4.0. Not modified.
+- Origin: downloaded from https://zenodo.org/api/records/23469422/files/%E3%82%A2%E3%83%A1%E3%83%AA%E3%82%AB%E5%8A%B4%E5%83%8D%E6%B3%95%E3%81%8B%E3%82%89%E3%81%BF%E3%81%9F%E6%86%B2%E6%B3%95%E3%81%AE%E5%BD%B1%E9%9F%BF.pdf/content
+- SHA-256: 08b2be3ebc781107f71003344ccf8b230229079e978687f1e0da2329bef1cbe9
+
+## Word, Excel, PowerPoint
+
+### handbook.docx
+
+- What: Harbour handbook (Word) (docx, 25 KB)
+- Shows: title page, table of contents with links, outline numbering, character and paragraph styles, bulleted and numbered lists of three levels, tables with merged cells and a repeated header, two pictures (one floating with wrapped text), a shape, footnotes, hyperlinks, bookmarks, fields, a comment, tracked changes, a two-column section, a landscape section with a wide table, headers and footers with page numbers
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 46c4fb53949dbd25cfc8b1fecbbd282d470b767d16c1fea426394872fcffc95d
+
+### workbook.xlsx
+
+- What: Harbour workbook (Excel) (xlsx, 23 KB)
+- Shows: three sheets: a budget with formulas (SUM, AVERAGE, INDEX, MATCH, COUNTIF, IF, VLOOKUP, ROUND), currency, percent and date formats, merged title, frozen header rows, a validation list, a comment, a hyperlink and named ranges; 120 rows of sales with an autofilter; a bar, a line and a pie chart
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 3e3e0247bde87b6fa1c6f9b06f0561f2eae8bc326925b4b28ba2d7d3b8c12792
+
+### deck.pptx
+
+- What: Harbour review (PowerPoint) (pptx, 30 KB)
+- Shows: five slides: a gradient title slide, nested bullets, a native bar chart with a callout, a table, a picture with shapes, gradients and arrows; a master with footer and slide number; speaker notes (not shown) and transitions
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 160962428c7f1d15c8865d51fef7e74ebc8ccc6782f60ea4bf08ed0a805a7edb
+
+### docx4j-getting-started.docx
+
+- What: docx4j Getting Started (Word) (docx, 153 KB)
+- Shows: a manual with styles, tables, pictures and links
+- Author: Jason Harrop and the docx4j contributors
+- Source: https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/legals/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx
+- SHA-256: a518cffcbef0b60cf5c95930acd9af9a56484e47376c5f0c4d6e3a15a0799941
+
+### docx4j-two-charts.docx
+
+- What: docx4j chart test: two charts (Word) (docx, 41 KB)
+- Shows: two native charts in a document
+- Author: Jason Harrop and the docx4j contributors
+- Source: https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/legals/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx
+- SHA-256: e0bc29916de415c53c03dcee14817bbd1e3eeea8f54a2b76629fe6754e6c641e
+
+### gsa-policy-review-template.xlsx
+
+- What: Section508.gov Policy Review Template (Excel) (xlsx, 217 KB)
+- Shows: a government workbook with formatted tables
+- Author: U.S. General Services Administration and the agencies that wrote the documents (Section508.gov)
+- Source: https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx
+- Licence: CC0-1.0
+- Evidence: https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md
+- Words read there: "this project is in the public domain within the United States of America. Additionally, we waive copyright and"
+- Origin: downloaded from https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx
+- SHA-256: 840661eba4653879dca24f209bca1619f7b168ef1232b595df5713741b2465bd
+
+### closedxml-pivot-tables.xlsx
+
+- What: ClosedXML example: pivot tables (Excel) (xlsx, 30 KB)
+- Shows: pivot tables over a data sheet
+- Author: ClosedXML contributors
+- Source: https://github.com/ClosedXML/ClosedXML/blob/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx
+- Licence: MIT
+- Evidence: https://raw.githubusercontent.com/ClosedXML/ClosedXML/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/LICENSE
+- Words read there: "MIT License Copyright (c) 2016 ClosedXML"
+- Attribution: Copyright (c) 2016 ClosedXML, MIT, https://github.com/ClosedXML/ClosedXML. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/ClosedXML/ClosedXML/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx
+- SHA-256: d13f149091c804cfe9b02c81301ea7ce13d20d1f3311cac799151541d0467d02
+
+### xlsxwriter-bar-chart.xlsx
+
+- What: XlsxWriter test file: a bar chart (Excel) (xlsx, 14 KB)
+- Shows: a native bar chart saved in Excel
+- Author: John McNamara (XlsxWriter)
+- Source: https://github.com/jmcnamara/XlsxWriter/blob/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx
+- Licence: BSD-2-Clause
+- Evidence: https://raw.githubusercontent.com/jmcnamara/XlsxWriter/5d4606d89a955226d2d0825a0f44309043ae7251/LICENSE.txt
+- Words read there: "BSD 2-Clause License Copyright (c) 2013-2025, John McNamara"
+- Attribution: Copyright (c) 2013-2025, John McNamara, BSD-2-Clause, https://github.com/jmcnamara/XlsxWriter. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/jmcnamara/XlsxWriter/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx
+- SHA-256: c4ed1e8117b4a0e014b95f42361c7e060728b398d4ea650395d902557429cdd2
+
+### python-pptx-chart-types.pptx
+
+- What: python-pptx test file: one slide for each chart type (PowerPoint) (pptx, 1.3 MB)
+- Shows: many native chart types
+- Author: Steve Canny (python-pptx)
+- Source: https://github.com/scanny/python-pptx/blob/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx
+- Licence: MIT
+- Evidence: https://raw.githubusercontent.com/scanny/python-pptx/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/LICENSE
+- Words read there: "The MIT License (MIT) Copyright (c) 2013 Steve Canny"
+- Attribution: Copyright (c) 2013 Steve Canny, MIT, https://github.com/scanny/python-pptx. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/scanny/python-pptx/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx
+- SHA-256: d0a7979d05970aa83fd8406f0829cd0019853a7bc4e16f8cda814586fc2eaccc
+
+### cdc-lifecycle-508.pptx
+
+- What: Integrating Section 508 Requirements in the Development Lifecycle (PowerPoint) (pptx, 598 KB)
+- Shows: a government deck with pictures and diagrams
+- Author: Mark D. Urban, CDC Section 508 Coordinator (US federal government)
+- Source: https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx
+- Licence: CC0-1.0
+- Evidence: https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md
+- Words read there: "this project is in the public domain within the United States of America. Additionally, we waive copyright and"
+- Origin: downloaded from https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx
+- SHA-256: 51c7d6af2e6682e5ee66204b813a45488e62b0e6e13cecc9207a982fdeb1720a
+
+## Other office formats
+
+### handbook.doc
+
+- What: Harbour handbook (Word 97 to 2003) (doc, 66 KB)
+- Shows: the handbook as a binary .doc
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 807c9b812188d73b3558ea8b91360d7a39eb637a18172295f206612da92cce39
+
+### handbook.odt
+
+- What: Harbour handbook (OpenDocument text) (odt, 41 KB)
+- Shows: the handbook as .odt
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: d28f2667008ebd0e9456f7900eb4af8dbbd10b5af7490a059d6868d468c475ce
+
+### handbook.fodt
+
+- What: Harbour handbook (flat OpenDocument text) (fodt, 76 KB)
+- Shows: one XML file, pictures in base64; written by hand, not converted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with )
+- SHA-256: 7c9f74181b5c9ad2b4766d5e3c82d9edf2c1cdd370417d0f8592d00ec71beec9
+
+### handbook.rtf
+
+- What: Harbour handbook (Rich Text Format) (rtf, 94 KB)
+- Shows: the handbook as .rtf
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 04eea9909d09ed87fb621459f1ac6e024b094eb767c1d0f7d536dd76f0b82e43
+
+### workbook.xls
+
+- What: Harbour workbook (Excel 97 to 2003) (xls, 29 KB)
+- Shows: the workbook as a binary .xls
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 8552c433665e927723ecb747c5a0e1696076964f1bfd20ddd30bc3b95cc97e19
+
+### workbook.ods
+
+- What: Harbour workbook (OpenDocument spreadsheet) (ods, 45 KB)
+- Shows: the workbook as .ods
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 32b0cf2984ddef9c2209d4cdb874866a65217d0b6bcdd3417264982ef07d660a
+
+### workbook.fods
+
+- What: Harbour workbook (flat OpenDocument spreadsheet) (fods, 118 KB)
+- Shows: one XML file; written by hand, not converted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with )
+- SHA-256: 80f5ad00faf7555d5aab526226204658880127a91f0af62a439d106c7a52e1be
+
+### deck.ppt
+
+- What: Harbour review (PowerPoint 97 to 2003) (ppt, 480 KB)
+- Shows: the deck as a binary .ppt (its thumbnail makes it large)
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 8a6285ae02086db5ddb3246c75ef08a3508f672a91ba38b30efae291e119fb1e
+
+### deck.odp
+
+- What: Harbour review (OpenDocument presentation) (odp, 71 KB)
+- Shows: the deck as .odp
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: e194842a5abfb245477c00eee30736ef7f8460606b62b887bf8392283b41dd07
+
+### deck.fodp
+
+- What: Harbour review (flat OpenDocument presentation) (fodp, 31 KB)
+- Shows: one XML file; written by hand, not converted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with )
+- SHA-256: 07da109d15eceb65d7a0601998ed9508ecd140d5aef311301c96e7aad6faa236
+
+### diagram.odg
+
+- What: Flowchart (OpenDocument drawing) (odg, 26 KB)
+- Shows: two pages, layers (one hidden), connectors glued to shapes, groups, gradients, a curve and a polyline, shadows, dashes
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with soffice)
+- SHA-256: 8c80d0ef2e536db14a7e5a92fc0092ab4f0976c87a091875899d3a7655f5b56e
+
+### diagram.fodg
+
+- What: Flowchart (flat OpenDocument drawing) (fodg, 14 KB)
+- Shows: one XML file; written by hand, not converted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-office.py` (with )
+- SHA-256: 52ed359ccb0acec09a2d7401129021ff3f0ad69e35c770eab33986f063924203
+
+### poi-sample.doc
+
+- What: Apache POI test document (Word 97) (doc, 27 KB)
+- Shows: a binary .doc
+- Author: Apache POI committers
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc
+- SHA-256: 717585c0a88f20862c86220163dd03da87cd743970354c6b29add32725f2e833
+
+### poi-word95.doc
+
+- What: Apache POI test document (Word 6 and 95 format) (doc, 100 KB)
+- Shows: the pre-1997 Word format
+- Author: Nick Burch (Apache POI)
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc
+- SHA-256: a7b9557e917daf29cfee6baaa90226fbfa7900ffa05cc35bdc03aafdefef5789
+
+### dhs-directive-139-02.doc
+
+- What: DHS Directive 139-02 (Word 97) (doc, 81 KB)
+- Shows: a government directive in the binary .doc format
+- Author: U.S. Department of Homeland Security
+- Source: https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc
+- Licence: CC0-1.0
+- Evidence: https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md
+- Words read there: "this project is in the public domain within the United States of America. Additionally, we waive copyright and"
+- Origin: downloaded from https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc
+- SHA-256: 48d1c85456d6b515ce8e3db6b43024f90bac69be86a3e78c1ae08406d4cad493
+
+### poi-formula-eval.xls
+
+- What: Apache POI test workbook of formulas (Excel 97) (xls, 174 KB)
+- Shows: hundreds of formula cases
+- Author: Apache POI committers
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls
+- SHA-256: c2040c1fac1088f1e112abef197ae1f9bcb03547861783b89c1d4281a42049d1
+
+### poi-conditional-formats.xls
+
+- What: Apache POI test workbook of conditional formats (Excel 97) (xls, 44 KB)
+- Shows: colour scales, icon sets and data bars
+- Author: Nick Burch (Apache POI)
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls
+- SHA-256: 899a29aa6ce35fee0268847ff8b5d9459e6ce34d5e2ff462fd42ee9b80837b87
+
+### poi-excel5.xls
+
+- What: Apache POI test workbook (Excel 5 and 95 format) (xls, 7.5 KB)
+- Shows: the BIFF5 format of 1993 to 1995
+- Author: Apache POI committers
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls
+- SHA-256: ac0ce3a2eff43e32e56d6b789df6aaa1645ae846d22fa3a2fe3057391d0f1cae
+
+### poi-sample-show.ppt
+
+- What: Apache POI test presentation (PowerPoint 97) (ppt, 123 KB)
+- Shows: a binary .ppt
+- Author: Apache POI committers
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt
+- SHA-256: 64275a6685b8f267827178037dcc59de927475e56385725916f4c6039c7ce7f6
+
+### tika-rtf-various.rtf
+
+- What: Apache Tika test document: various RTF features (rtf, 64 KB)
+- Shows: fonts, colours, tables and lists in RTF
+- Author: Michael McCandless (Apache Tika)
+- Source: https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf
+- SHA-256: cf00c56fe7099d14b820a0d751324e415f2c09af580f2c96f08614a2aec42c1e
+
+### tdf-thesis-template.odt
+
+- What: Thesis template in Spanish (OpenDocument text) (odt, 66 KB)
+- Shows: styles, a table of contents, headers
+- Author: Phorious (Document Foundation wiki user)
+- Source: https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt
+- Licence: CC0-1.0
+- Evidence: https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt
+- Words read there: "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Ded"
+- Origin: downloaded from https://wiki.documentfoundation.org/images/5/54/Tesis-v1.0.4.odt
+- SHA-256: ec323e9fde67103a7f0039d8a59625bd7e2c5afa9e057563f5064c6b68d442a1
+
+### tika-odt-ooo3.odt
+
+- What: Apache Tika test document written with OpenOffice 3 (OpenDocument text) (odt, 24 KB)
+- Shows: an .odt of 2009
+- Author: Apache Tika committers
+- Source: https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt
+- SHA-256: b6cd74b570a98fcb6d838dd85ab869604e0711812d9533d5ecde0000b24ba7ef
+
+### tdf-household-budget.ods
+
+- What: Household budget book (OpenDocument spreadsheet) (ods, 21 KB)
+- Shows: formulas, charts and several sheets
+- Author: Hrbrgr (Document Foundation wiki user)
+- Source: https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods
+- Licence: CC-BY-3.0
+- Evidence: https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods
+- Words read there: "This work is licensed under the Attribution 3.0 Unported License"
+- Attribution: Hrbrgr (Document Foundation wiki user), Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, CC BY 3.0. No changes.
+- Origin: downloaded from https://wiki.documentfoundation.org/images/b/bc/Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods
+- SHA-256: aacd76666860f7bf879e1518a07b90d535815ce92d076ea26c835061b8aff854
+
+### odfdo-flat.fods
+
+- What: odfdo test sample (flat OpenDocument spreadsheet) (fods, 32 KB)
+- Shows: one XML file
+- Author: Jérôme Dumonteil (odfdo)
+- Source: https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods
+- SHA-256: 4966023bf427dbc9c975dc9b11816b4a90158f7dab452c59104b8800fb27ec36
+
+### tdf-presentation-template.odp
+
+- What: Presentation template (OpenDocument presentation) (odp, 403 KB)
+- Shows: master slides, pictures and layouts
+- Author: Phorious (Document Foundation wiki user)
+- Source: https://wiki.documentfoundation.org/File:Presenta.odp
+- Licence: CC0-1.0
+- Evidence: https://wiki.documentfoundation.org/File:Presenta.odp
+- Words read there: "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Ded"
+- Origin: downloaded from https://wiki.documentfoundation.org/images/5/51/Presenta.odp
+- SHA-256: 147ca9c6dbcdd45470627b84c04824c7f3e07de57485a8190018eea5f23c64b3
+
+### odfdo-example.odp
+
+- What: odfdo test sample (OpenDocument presentation) (odp, 54 KB)
+- Shows: slides with text and shapes
+- Author: Jérôme Dumonteil (odfdo)
+- Source: https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp
+- SHA-256: 9075b87e36bb4618bdc9a8a6138bcaaf31b2b81e089e9006ac906e66a94f912b
+
+### tdf-diagram-gallery.odg
+
+- What: A gallery of diagrams (OpenDocument drawing) (odg, 89 KB)
+- Shows: several diagram types
+- Author: Hrbrgr (Document Foundation wiki user)
+- Source: https://wiki.documentfoundation.org/File:Diagramme.odg
+- Licence: CC-BY-3.0
+- Evidence: https://wiki.documentfoundation.org/File:Diagramme.odg
+- Words read there: "This work is licensed under the Attribution 3.0 Unported License"
+- Attribution: Hrbrgr (Document Foundation wiki user), Diagramme.odg, https://wiki.documentfoundation.org/File:Diagramme.odg, CC BY 3.0. No changes.
+- Origin: downloaded from https://wiki.documentfoundation.org/images/0/07/Diagramme.odg
+- SHA-256: 2e5f43734db7c600256e0670f6ec9da9428eb6b7a074c4742fd506e32c833a5a
+
+### odfdo-shapes.odg
+
+- What: odfdo test sample: basic shapes (OpenDocument drawing) (odg, 10 KB)
+- Shows: rectangles, ellipses, lines and polygons
+- Author: Jérôme Dumonteil (odfdo)
+- Source: https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg
+- SHA-256: dfe6a6c83ba5caec340889d6c77a899e420060d55f4b08fd9a1fb7b36e0b799f
+
+### tika-keynote09.key
+
+- What: Apache Tika test presentation (Keynote '09) (keynote, 217 KB)
+- Shows: an XML Keynote document (index.apxl)
+- Author: Jukka Zitting (Apache Tika)
+- Source: https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key
+- SHA-256: 4a270c2427f11d77f82fae696e3fd6eda945bae0422ae87c5fac6cf2bd06015c
+
+### tika-keynote2013.key
+
+- What: Apache Tika test presentation (Keynote 2013, IWA format) (keynote, 268 KB)
+- Shows: a Keynote document in the iWork archive format
+- Author: Tim Allison (Apache Tika)
+- Source: https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key
+- SHA-256: 8da93f6b566bc9eb22f4791bbfd5f2179162f39bf80968187b164c33d31824db
+
+### tika-numbers09-charts.numbers
+
+- What: Apache Tika test spreadsheet with charts (Numbers '09) (numbers, 102 KB)
+- Shows: an XML Numbers document with charts
+- Author: Michael McCandless (Apache Tika)
+- Source: https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers
+- SHA-256: f4430f2aa0ddab186e7e32f15552b58b7b03abada7a978dfbcd51e5548757789
+
+### numbers-formulas.numbers
+
+- What: numbers-parser test spreadsheet of formulas (Numbers) (numbers, 323 KB)
+- Shows: formulas across tables
+- Author: Jon Connell (numbers-parser)
+- Source: https://github.com/masaccio/numbers-parser/blob/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers
+- Licence: MIT
+- Evidence: https://raw.githubusercontent.com/masaccio/numbers-parser/a6affe5599c8373f575192ac5777d0c6426da696/LICENSE.rst
+- Words read there: "Permission is hereby granted, free of charge, to any person obtaining a copy of this softw"
+- Attribution: Copyright 2021 Jon Connell, numbers-parser, MIT, https://github.com/masaccio/numbers-parser. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/masaccio/numbers-parser/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers
+- SHA-256: 9371c5b1d6ee4dfa17569097f064eba9c67f804d88b48638efbbeeb459d07dd4
+
+### poi-network.vsdx
+
+- What: Apache POI test diagram (Visio): a network (visio, 43 KB)
+- Shows: a use-case diagram: actors, ovals and connecting lines
+- Author: A reporter of Apache POI bug 60489 (committed by Tim Allison)
+- Source: https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx
+- SHA-256: 15494702ecb5554c1dfaee2c09ac35e2ea656e2eed7ba4ba0cf1039e6125fbe1
+
+### vsdx-house.vsdx
+
+- What: vsdx library test drawing (Visio): a house (visio, 20 KB)
+- Shows: boxes and house shapes with text
+- Author: Dave Howard (vsdx library)
+- Source: https://github.com/dave-howard/vsdx/blob/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx
+- Licence: BSD-3-Clause
+- Evidence: https://raw.githubusercontent.com/dave-howard/vsdx/6703e6c2c906bea4051f43525ec9af9dcf735c13/LICENSE
+- Words read there: "BSD 3-Clause License Copyright (c) 2020, Dave Howard"
+- Attribution: Copyright (c) 2020, Dave Howard, BSD-3-Clause, https://github.com/dave-howard/vsdx. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/dave-howard/vsdx/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx
+- SHA-256: e454217e49d1ec2aaa7c9b8f38b148ffc0d028ce44ba096fe3386e9894b1775f
+
+## Text and code
+
+### field-guide.md
+
+- What: Field guide to Markdown (markdown, 2.3 KB)
+- Shows: headings of six levels, nested and task lists, quotes, an aligned table, fenced code with languages, footnotes, links and references, inline HTML, Unicode
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 0f65f0bb537b18b6d5b1ec88da73686350e31d6529bb78a682aaa93d755e9f49
+
+### field-notes.txt
+
+- What: Plain text with tabs, a long line and pangrams in nine scripts (text, 1.6 KB)
+- Shows: Latin, Greek, Cyrillic, Japanese, Arabic and Hebrew text, box drawing, symbols, no final newline
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 12054040d6aef17fff17a18adf238fee6fd4158eeefd1d1230108fbd0f03df11
+
+### recipes.json
+
+- What: A small recipe book as JSON (json, 2.4 KB)
+- Shows: nested objects and arrays, numbers of every kind, null, booleans, escapes, empty values
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 9662568867ec0629cb9c18897f1bff96f2b837cc7f89f0840f25f1e1f3e8f69c
+
+### config.yaml
+
+- What: Configuration file, YAML (yaml, 585 B)
+- Shows: mappings, lists, block scalars, anchors and aliases, comments
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 398192bf091eeedd240dca6116180ef291ea95d7ee1c20e2e9853505d62854c9
+
+### pyproject.toml
+
+- What: Project file, TOML (toml, 440 B)
+- Shows: tables, arrays of tables, inline values
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: abcdc7dd5ef4d56589629b5c88d8b9a7931a84ddebd60c6b19f9f3b45349fb03
+
+### feed.xml
+
+- What: Atom feed (xml, 1.3 KB)
+- Shows: namespaces, CDATA, an XHTML content element, entities, comments
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 6cddabc37cc985205a2c04b4863fe3514695a5ef437e710463d15a597eb54560
+
+### route.gpx
+
+- What: Coastal walk, GPX track (xml, 6.3 KB)
+- Shows: 60 track points with elevation and time, two waypoints
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: fcafdec4e3a6819fa406e98590dd7ede302bf76cbc6a2080f08542438d08524e
+
+### places.kml
+
+- What: Places, KML (xml, 1.0 KB)
+- Shows: a point, a line and a polygon, a shared style, HTML in CDATA
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 9bb4a018a5c1f00843e61af1c475c1a735898f73950689b9ce36f9bdeb7879b8
+
+### harbour-log.csv
+
+- What: Harbour log, 300 rows of CSV (csv, 19 KB)
+- Shows: nine columns, quoted fields with commas, quotes and line breaks, accents
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: d4e07a9e0b1aec65f189c8897fa27e1daf24189c3c204fb9527f2bf75d22e314
+
+### tides.tsv
+
+- What: Tide table, tab-separated values (csv, 833 B)
+- Shows: 28 rows, six columns
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: eff347351015e329e7904aebc8f334de5ab16cfda7a6b4c6b2575d25ac06fd68
+
+### prix.csv
+
+- What: Price list in the European style (csv, 255 B)
+- Shows: semicolon separator, decimal commas, accented headers
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: d490f1d9c26d7218e9937591baf5688d9846303fb6942a5e3c60417c1647b91d
+
+### life.py
+
+- What: Conway's Game of Life, Python (source, 1.0 KB)
+- Shows: docstrings, comprehensions, f-strings, a main guard
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 2cfc1e34f435d1ee59d3b01e5567bf61034df38a7257e9fed4f1fbdf9436e19e
+
+### lru.rs
+
+- What: A least-recently-used cache, Rust (source, 1.6 KB)
+- Shows: generics, trait bounds, closures, a test module
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 1e2181c4c51e88e4255f391fce16a9d657560408b728df079274804674ab1acb
+
+### tokens.ts
+
+- What: Arithmetic tokenizer and evaluator, TypeScript (source, 2.2 KB)
+- Shows: union types, a sticky regular expression, the shunting-yard algorithm
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 3587b167a990c8ec02b14477721b4259431f39b432556a6cd86afc8cd2f525c2
+
+### bits.c
+
+- What: Bit tricks on 32-bit words, C (source, 1.4 KB)
+- Shows: static functions, hexadecimal literals, printf formats
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: dc7eab8de40430eb6ed22610c37fd2b13df11e69cc70f6d9e2718514e589a6d5
+
+### report.sql
+
+- What: Monthly report with window functions, SQL (source, 1.3 KB)
+- Shows: DDL, a CTE, lag, rank and sum over windows, joins
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 99688fcab08ea4876cee7a5d3352abbbd23d230c8c17bc4bbebeea276cf2bd9a
+
+### deploy.sh
+
+- What: Build and deploy script, Bash (source, 989 B)
+- Shows: strict mode, traps, functions, process substitution, a case statement
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: a304fad73e5636d1caf340cfeca167e01905df2a31fc7abca661e8b8131375c7
+
+### style.css
+
+- What: A small stylesheet, CSS (source, 1.1 KB)
+- Shows: custom properties, grid, clamp, color-mix, a dark mode and a media query
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 7918765d12e41edd33e5a0eb2b7dba28c5429c3a517f086fcc8722f0306920c0
+
+### page.html
+
+- What: A page, shown as its source, HTML (html, 1.1 KB)
+- Shows: semantic elements, a table, a form, a style and a script that do not run
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: 82dd9087ee3afdb2c5443f2a9fb8100500a1633f2e0bdffc2630a8be8387c678
+
+### changes.diff
+
+- What: A unified diff of two files (diff, 879 B)
+- Shows: two files, three hunks, added and removed lines
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: e0d7a274666b4f411cd8a5b7318736c37ad7993db25b884c4c9100e13a1391d6
+
+### subtitles.srt
+
+- What: Subtitles, SubRip (text, 338 B)
+- Shows: six cues with a tag
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: b4e25a1b12f662df624ae81c2c8bd89a8951e338688d2ea2cce55134c5de3161
+
+### server.log
+
+- What: A server log of 120 lines (text, 8.9 KB)
+- Shows: INFO, WARN and ERROR lines
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-text.py`
+- SHA-256: d7e982445e5d36a398533f671c0e7d0f758b47ff406798631924b037a64f6d95
+
+## Images
+
+### scene.png
+
+- What: Dusk landscape, PNG (png, 26 KB)
+- Shows: 8-bit RGB, optimised
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 4a0f00c07bb229932be134ede00f78851c8b1c4d3fa3eaa32164bb97c424f3fe
+
+### scene-alpha.png
+
+- What: Landscape fading to transparent, PNG (png, 48 KB)
+- Shows: RGBA: the viewer shows its chequerboard through the alpha
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: c06a1651cfa68c3c729ba2a94eb0e6a3ccb306a24b3e4029d909a0da3e705a69
+
+### scene-indexed.png
+
+- What: Landscape in 32 colours, PNG (png, 5.0 KB)
+- Shows: palette (indexed) PNG
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: ebd709f812945dd233203f4dbea12c22af3450bd67be52dbc6668f35f55a0e58
+
+### gradient-grey16.png
+
+- What: Grey ramp, 16-bit PNG (png, 47 KB)
+- Shows: 16-bit greyscale
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 594a376de8d26c143d65c012f82aafd3775e8bd6698cd168ce957638c636379d
+
+### bounce.png
+
+- What: Bouncing ball, animated PNG (apng, 40 KB)
+- Shows: 24 frames, APNG
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: dbe78676dee3a09eb44aafd14980b8999f11bf576e1152d2183193a9c18ff131
+
+### scene.jpg
+
+- What: Dusk landscape, JPEG (jpeg, 24 KB)
+- Shows: baseline 4:2:0 with EXIF description and copyright
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 42f3881913d6401dc2df511f6a975caeb834f965299c152f5535aa3ae6a5e02e
+
+### scene-progressive.jpg
+
+- What: Dusk landscape, progressive JPEG (jpeg, 20 KB)
+- Shows: progressive scans, optimised Huffman tables
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 70c6c3352c093ac5da448706cb7873dc1fa991f84119d37f80acf63550078f65
+
+### scene-orientation6.jpg
+
+- What: JPEG stored on its side with EXIF orientation 6 (jpeg, 22 KB)
+- Shows: shown upright through the EXIF orientation
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 02e8b993e435a3de434c7efbe688757efa2fef452b1747c7382732b63e8e971b
+
+### scene-grey.jpg
+
+- What: Landscape in grey, JPEG (jpeg, 17 KB)
+- Shows: single-component JPEG
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 546838a80bc5b7b042fdc593b8e95fbaaf39165347dcba32c45d341f2f5dabea
+
+### scene-cmyk.jpg
+
+- What: Landscape as a CMYK JPEG (jpeg, 51 KB)
+- Shows: four components (Adobe inverted CMYK)
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 2c85449ef1574bc35fc3f54cf8aa724e518180aa86488ecef2be603816bfac01
+
+### bounce.gif
+
+- What: Bouncing ball, animated GIF (gif, 100 KB)
+- Shows: 24 frames with a palette each
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 386425b57344417f2205ac176a3a72eaed208ad67e57f7cd304ab845bf27d83b
+
+### scene.gif
+
+- What: Dusk landscape, dithered GIF (gif, 25 KB)
+- Shows: 256 colours, Floyd-Steinberg dithering
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 9680147c7fabe6ba25e464c9cd41fe6e45b73502e68e811ea7037922f8c33255
+
+### scene.webp
+
+- What: Dusk landscape, lossy WebP (webp, 8.8 KB)
+- Shows: VP8
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: c5a026e0341b0952e99af9ff4fa34de68e7ecc2da3326421e79a66639fef4787
+
+### scene-lossless.webp
+
+- What: Dusk landscape, lossless WebP (webp, 18 KB)
+- Shows: VP8L
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 7455a0e9ae36e7e9fb3f5b6ee094fcbece393dd9444d37cee3db785e36b01e79
+
+### scene-alpha.webp
+
+- What: Landscape fading to transparent, WebP (webp, 18 KB)
+- Shows: lossy colour with an alpha plane (VP8X, ALPH)
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: d62a7a8f0b2655221b84eec04c8adfd3d5f37a59425a706fa0eea900cc05b525
+
+### bounce.webp
+
+- What: Bouncing ball, animated WebP (webp, 20 KB)
+- Shows: 24 frames
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: edb4905dd92651bd42dbc3c15873913ec6bdca9a04afe83740565e082d90b84c
+
+### scene-lzw.tif
+
+- What: Dusk landscape, TIFF with LZW (tiff, 94 KB)
+- Shows: RGB, LZW, 300 dpi
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: b3a41a6e8e4644e2b2291a50e499fd9988b735932c6c27def20587c1f565bcaa
+
+### scene-jpeg.tif
+
+- What: Dusk landscape, TIFF with JPEG compression (tiff, 56 KB)
+- Shows: JPEG in TIFF (compression 7)
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: c5add42f305af0ca4dcf2cd554dc973611ce1334e5e91ba2b38ec2c58a35e89b
+
+### scene-cmyk-packbits.tif
+
+- What: Landscape as a CMYK TIFF (tiff, 49 KB)
+- Shows: four inks, PackBits
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 57d7dbd0c807d1bcd7064367051ff75cdedddc4109e85cf67450c6601ec48fbc
+
+### gradient-grey16.tif
+
+- What: Grey ramp, 16-bit TIFF (tiff, 91 KB)
+- Shows: 16-bit greyscale, Deflate
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 94c41cab542120478f4a7b97e694e8ddddd2520b022f9266a59bcf0e727baeea
+
+### scene-pages.tif
+
+- What: Three-page TIFF (tiff, 83 KB)
+- Shows: pages of 512, 256 and 128 pixels, the last in grey, Deflate
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 9a8267875af78208d587777b341eb152d166b6acc10aede6d198d8e788ebd7a6
+
+### fax-g4.tif
+
+- What: Fax cover sheet and register, CCITT Group 4 TIFF (tiff-fax, 22 KB)
+- Shows: 1-bit, 1728 by 2200 at 204 by 196 dpi, T.6
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: c4efa355dc63ce59863446b62b960397f34ab3d3c04a212450d0c2bca5f3904a
+
+### fax-g4-3pages.tif
+
+- What: Three-page fax, CCITT Group 4 TIFF (tiff-fax, 66 KB)
+- Shows: three pages, T.6
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: a94bc11060a7f2553803580c0feb779d1e59b032fd9f4406fbd4972765842cbb
+
+### scene-24.bmp
+
+- What: Dusk landscape, 24-bit BMP (bmp, 56 KB)
+- Shows: BI_RGB, bottom-up
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: f3281d18d1f2944c7cb5f60eac3593facfbb3b77a0e5505e1ac88a9fdbefbfaa
+
+### scene-8.bmp
+
+- What: Dusk landscape, 8-bit BMP (bmp, 20 KB)
+- Shows: 256-colour palette
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: d8ac5f35b9b76cd509191ec7f5c4a48f8236c5ca4dcc88197810060b16f47ad2
+
+### scene-32.bmp
+
+- What: Dusk landscape, 32-bit BMP (bmp, 75 KB)
+- Shows: four channels
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 1d99799f83adc1486eb1072502893ed39d91220d9e132a0716d56d9e05285d94
+
+### scene-1bit.bmp
+
+- What: Dusk landscape, 1-bit BMP (bmp, 24 KB)
+- Shows: two-colour palette
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: cc5152076963ba9beca3d0a5ed8a4ebd5f082c127e780ef68a955ce4b71e8786
+
+### scene-rle8.bmp
+
+- What: Dusk landscape, 8-bit BMP with RLE compression (bmp, 11 KB)
+- Shows: BI_RLE8 with encoded and absolute runs
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 2b1c69a7597006677e38cd8e32ad11f85acb0602ef228ec5c080d03350fc7936
+
+### icon.ico
+
+- What: Icon with seven sizes (ico, 25 KB)
+- Shows: 16 to 256 pixels, PNG-coded images
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 436e2c802c34d1c83b4492308ca660d4944eeb44fe32f6de87d3869e1c9e89ea
+
+### icon-legacy.ico
+
+- What: Icon in the legacy bitmap coding (ico, 14 KB)
+- Shows: 32-bit and 8-bit DIBs with AND masks, and one PNG image
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 0ded5b411cd2cf1ebd15cdecfa12a1e9f4a53b74da39fa263f935329efe399ec
+
+### scene.ppm
+
+- What: Dusk landscape, PPM (P6) (pnm, 36 KB)
+- Shows: binary pixmap with a comment
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 43949e7d7636ed5a7d552ad6fac28eb72487a70a1f63db7d944fb7e587612b40
+
+### scene-ascii.ppm
+
+- What: Dusk landscape, ASCII PPM (P3) (pnm, 17 KB)
+- Shows: text pixmap, 48 by 36
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 996f21e5c7c05ed1c586b9dc9882ad6fba9f1153ba23c49844c640eef647bf8a
+
+### scene-grey16.pgm
+
+- What: Landscape in grey, 16-bit PGM (P5) (pnm, 24 KB)
+- Shows: maxval 65535
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 059c3e7b9e22b0aa4247552139886564f9b36d66051ffc7957efd972f557b52c
+
+### scene.pbm
+
+- What: Landscape as a bitmap, PBM (P4) (pnm, 6.0 KB)
+- Shows: 1 bit a pixel
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 648c9687dc2c226306c64aa945bf81170bbff5d8c9f88b0630b07b294d4e2edb
+
+### scene-alpha.pam
+
+- What: Landscape with alpha, PAM (P7) (pnm, 48 KB)
+- Shows: RGB_ALPHA tuples
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 806cee6e77cbd0226f6ec3ab18de4259612a89c1df5ff5e27e37d4d5c932c515
+
+### scene.qoi
+
+- What: Dusk landscape, QOI (qoi, 38 KB)
+- Shows: three channels
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: d04c2ff91df0173bf20c495eb19555dc4bc9342b9ec7b61f653a4742c00b6188
+
+### scene-alpha.qoi
+
+- What: Landscape with alpha, QOI (qoi, 89 KB)
+- Shows: four channels
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 16a53b8756ab8dd663400cfa04dde6a598b6c608d345efd131c0d714cde8affb
+
+### scene.ff
+
+- What: Landscape with alpha, farbfeld (farbfeld, 54 KB)
+- Shows: 16-bit RGBA, big-endian
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: b6d250a92f39b7183b42191933d84da7e6ef1a33a971c8e7c2f8ccc85ad060d0
+
+### sunset.hdr
+
+- What: Sunset with a sun far brighter than the sky, Radiance HDR (hdr, 54 KB)
+- Shows: RGBE with run-length scanlines; the sun is 60 times white
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: f65ffee0666792f829c6692ca1ef4a0a553304d06e28682f18a47de5efed7e9b
+
+### sunset-flat.hdr
+
+- What: Sunset, uncompressed Radiance HDR (hdr, 48 KB)
+- Shows: flat RGBE scanlines
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: a401df61e76cfdf88731294a4ba5ce1ba607ee294b5010a1312925240f5d2131
+
+### scene-bc1.dds
+
+- What: Dusk landscape, DDS with BC1 (DXT1) (dds, 32 KB)
+- Shows: full mipmap chain
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 77d26e97cc0f532481e3e585321305aca44efd7694307f312d75b1c4bfecf8f8
+
+### scene-bc3.dds
+
+- What: Landscape with alpha, DDS with BC3 (DXT5) (dds, 64 KB)
+- Shows: full mipmap chain, alpha blocks
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 9028c95d163d7283b357e3beb6a531a192087fcb76e7aeb1aead81195e4f4a92
+
+### scene.jp2
+
+- What: Dusk landscape, JPEG 2000 (JP2) (jpeg2000, 80 KB)
+- Shows: lossy, 3 quality layers, 5 resolutions, 256-pixel tiles, RPCL progression
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: f90f58bb1e3ef0bfd48b9b55bffc293ee4f1fe506a6717f0052319a34621bf9a
+
+### scene.j2k
+
+- What: Dusk landscape, bare JPEG 2000 codestream (jpeg2000, 48 KB)
+- Shows: no JP2 boxes
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 949564fa2b811a1987a12989095289d673c2a4937f5014b0b9c1d7bfbe660b9c
+
+### scene-grey.jp2
+
+- What: Landscape in grey, JPEG 2000 (jpeg2000, 19 KB)
+- Shows: one component
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: eb50ae4528e774c7ab9c427509faee07473249a89d35403c33afb2e5e9abf983
+
+### scene-alpha.jp2
+
+- What: Landscape with alpha, JPEG 2000 (jpeg2000, 77 KB)
+- Shows: four components with an alpha channel
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: bc1adbddf1bd608b71b1cac9dd1a47f47cde2c046a4202f1642cd15efa647825
+
+### page-generic.jb2
+
+- What: Fax page as a JBIG2 file, generic region (jbig2, 8.4 KB)
+- Shows: 1-bit page of 1240 by 1579, arithmetic coding
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 1447cbbc1ebab320062a78fa40f81ccf768aed3d9aea2cfa0583ebce2fb3e088
+
+### page-symbol.jb2
+
+- What: Fax page as a JBIG2 file, symbol coding (jbig2, 5.4 KB)
+- Shows: text region over a symbol dictionary
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 8fba2e640c71101dd5ab376008ea177ee0e8f2070c49250d31186c198991da9e
+
+### scene-lossy.jxl
+
+- What: Dusk landscape, JPEG XL, lossy (jpeg-xl, 23 KB)
+- Shows: VarDCT at distance 1
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: dc1e17bd77c26a49a3c61fcd8b299c79b71395550a4e1d42bc69af6aa33a200f
+
+### scene-lossless.jxl
+
+- What: Dusk landscape, JPEG XL, lossless (jpeg-xl, 26 KB)
+- Shows: modular mode
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 5f2ce3702bb3fe54bb31feb6f1a9e92347a9acd290a6a7730a3074fe5fb088fe
+
+### scene-alpha.jxl
+
+- What: Landscape with alpha, JPEG XL (jpeg-xl, 35 KB)
+- Shows: lossless with an extra alpha channel
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: d18698258dcc59292483265284a96099bc2c1f23f53f4893d778062070588166
+
+### bounce.jxl
+
+- What: Bouncing ball, animated JPEG XL (jpeg-xl, 60 KB)
+- Shows: 24 frames
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: 679c04f1bec63d699c6baeb1d42dfa4ff205a40327f208f650115f7292e27f89
+
+### monet-gardeners-house-antibes.jpg
+
+- What: Claude Monet, The Gardener's House at Antibes (1888) (jpeg, 395 KB)
+- Shows: a painting, JPEG from the museum's web size
+- Author: Claude Monet, Cleveland Museum of Art (open access)
+- Source: https://clevelandart.org/art/1916.1044
+- Licence: CC0-1.0
+- Evidence: https://clevelandart.org/art/1916.1044
+- Words read there: ""share_license_status":"CC0""
+- Origin: downloaded from https://openaccess-cdn.clevelandart.org/1916.1044/1916.1044_web.jpg
+- SHA-256: 95142eba48d54f01352eb4ef6f04260cb3df3bcb1d9c86000c1284a7817674ca
+
+### queen-mab-cave.jpg
+
+- What: Queen Mab's Cave, in the manner of Turner (jpeg, 213 KB)
+- Shows: a painting
+- Author: Imitator of J. M. W. Turner, Cleveland Museum of Art (open access)
+- Source: https://clevelandart.org/art/1916.1036
+- Licence: CC0-1.0
+- Evidence: https://clevelandart.org/art/1916.1036
+- Words read there: ""share_license_status":"CC0""
+- Origin: downloaded from https://openaccess-cdn.clevelandart.org/1916.1036/1916.1036_web.jpg
+- SHA-256: b84e005332288229d808172a7610b501d9977c0b4668e333faea5ff780157223
+
+### rembrandt-st-francis.jpg
+
+- What: Rembrandt, Saint Francis Beneath a Tree Praying (etching) (jpeg, 362 KB)
+- Shows: an etching, fine line work
+- Author: Rembrandt van Rijn, Cleveland Museum of Art (open access)
+- Source: https://clevelandart.org/art/2024.64
+- Licence: CC0-1.0
+- Evidence: https://clevelandart.org/art/2024.64
+- Words read there: ""share_license_status":"CC0""
+- Origin: downloaded from https://openaccess-cdn.clevelandart.org/2024.64/2024.64_web.jpg
+- SHA-256: 74b37aa3738914dd66c07533b3758f7694fefbaa918d2f23c263205cf987db7b
+
+### nolli-rome-plate.jpg
+
+- What: Nolli's map of Rome (1748), a plate (jpeg, 315 KB)
+- Shows: an engraved city plan
+- Author: Giovanni Battista Nolli et al., Cleveland Museum of Art (open access)
+- Source: https://clevelandart.org/art/2020.276.3
+- Licence: CC0-1.0
+- Evidence: https://clevelandart.org/art/2020.276.3
+- Words read there: ""share_license_status":"CC0""
+- Origin: downloaded from https://openaccess-cdn.clevelandart.org/2020.276.3/2020.276.3_web.jpg
+- SHA-256: 7643c9e59f7706ebe62518a51daf7d72129acc8092dde7afc65516d3d11b6c77
+
+### pallid-swift.jpg
+
+- What: Pallid swift in flight (photograph) (jpeg, 348 KB)
+- Shows: a camera JPEG with EXIF data (Canon EOS R6 Mark II)
+- Author: Hobbyfotowiki
+- Source: https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg
+- Licence: CC0-1.0
+- Evidence: https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg
+- Words read there: "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Dedication."
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/d/df/Pallid_swift_%28in_flight%29.jpg
+- SHA-256: 9d0f79f12dcc236f549cdefb66dc468f25335d444ebd26e98805efdd94afecbd
+
+### cyclotron-patent.png
+
+- What: Drawing from Lawrence's cyclotron patent (png, 202 KB)
+- Shows: a black and white technical drawing
+- Author: Ernest O. Lawrence (US Patent Office)
+- Source: https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png
+- Licence: public-domain (US patent text and drawings published before 1989)
+- Evidence: https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png
+- Words read there: "The text and illustrations of US patents published before March 1, 1989 are in the public domain unl"
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/4/42/Cyclotron_patent_p1.png
+- SHA-256: 0be9b59ae21bbadeb8a13fafde5e0bcfb6d470ba516244eab0ec1c74afd7394f
+
+### mature-flower-diagram.svg
+
+- What: Diagram of a mature flower (svg, 121 KB)
+- Shows: 85 texts, about 90 gradient references, many paths
+- Author: Mariana Ruiz Villarreal (LadyofHats)
+- Source: https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg
+- Licence: public-domain (released by its author)
+- Evidence: https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg
+- Words read there: "This work has been released into the public domain by its author, LadyofHats."
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/7/7f/Mature_flower_diagram.svg
+- SHA-256: b40bd4e188c0a99e51e994b4f39f931d3fca28093ecb6454aa2bd93c575ea999
+
+### entamoeba-life-cycle.svg
+
+- What: Life cycle of Entamoeba histolytica (svg, 267 KB)
+- Shows: 547 paths, text and arrows
+- Author: Mariana Ruiz Villarreal (LadyofHats)
+- Source: https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg
+- Licence: public-domain (released by its author)
+- Evidence: https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg
+- Words read there: "This work has been released into the public domain by its author, LadyofHats."
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/a/a1/Entamoeba_histolytica_life_cycle-en.svg
+- SHA-256: 68a4a92289d81f0e7e9361abbba2da9a8c8b4e440e3ad9de5c420646eb133eaa
+
+### sieve-of-eratosthenes.svg
+
+- What: Sieve of Eratosthenes, animated (svg, 22 KB)
+- Shows: SMIL animation with 179 animate elements
+- Author: Ricordisamoa, with later edits by Jc86035, HereToHelp and Glrx
+- Source: https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg
+- Licence: public-domain (ineligible for copyright, Wikimedia Commons PD-ineligible)
+- Evidence: https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg
+- Words read there: "This work is ineligible for copyright and therefore in the public domain because it consists entirel"
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/0/0b/Sieve_of_Eratosthenes_animation.svg
+- SHA-256: d8f1d6d0a4b5710ebe1e7766eab30b766b10dc9380c1058ccb39baccd7d51586
+
+### muybridge-horse.gif
+
+- What: Muybridge's horse in motion, animated GIF (gif, 555 KB)
+- Shows: 15 frames
+- Author: Eadweard Muybridge (photographs, 1887); animation by Waugsberg
+- Source: https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif
+- Licence: public-domain (the author died in 1904)
+- Evidence: https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif
+- Words read there: "The author died in 1904, so this work is in the public domain in its country of origin and other cou"
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/d/dd/Muybridge_race_horse_animated.gif
+- SHA-256: eb40bebc1f039e7c2a121673c3b55d4aa73582f858053dbbcca9ebce9e2b479d
+
+### geneva-mechanism.gif
+
+- What: Geneva mechanism with six spokes, animated GIF (gif, 224 KB)
+- Shows: 101 frames
+- Author: Mike1024
+- Source: https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif
+- Licence: public-domain (released by its author)
+- Evidence: https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif
+- Words read there: "I, the copyright holder of this work, release this work into the public domain."
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/9/9b/Geneva_mechanism_6spoke_animation.gif
+- SHA-256: d7df5c9984109c2ca60f7aab1a51db1f0b578cddcdede5d43be9f67536e2a1ee
+
+### abundance-nemo-g4-6pages.tif
+
+- What: Les grans et merveilleux faictz du seigneur Nemo (scan, six pages, CCITT Group 4) (tiff-fax, 323 KB)
+- Shows: a multi-page bilevel TIFF scanned from a 16th-century book
+- Author: Jean d'Abundance (16th century); scanned by the Bibliothèque nationale de France
+- Source: https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif
+- Licence: public-domain (a mechanical scan of a public domain book, Wikimedia Commons PD-scan)
+- Evidence: https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif
+- Words read there: "This file is in the public domain because it is a mere mechanical scan or photocopy of a public doma"
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/b/b5/Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif
+- SHA-256: 38bab27c6d559e11468d6c7e4222f0bb1bee4ba0044540adcebfc012930e00d1
+
+## Camera RAW
+
+### canon-eos-40d-sraw.cr2
+
+- What: Canon EOS 40D, sRAW (CR2) (raw-cr2, 5.5 MB)
+- Shows: TIFF-based CR2 with a 1936 by 1288 JPEG preview
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/2102/nice/Canon%20-%20EOS%2040D%20-%20sRAW2%20%28sRAW%29%20%283%3A2%29.CR2
+- SHA-256: ba644e7dd2abe74eca260e67f0206ff113bf0f62e710f8130611e964d6be5bf1
+
+### canon-eos-r6.cr3
+
+- What: Canon EOS R6, C-RAW (CR3) (raw-cr3, 5.0 MB)
+- Shows: ISO base media CR3 with a 3408 by 2272 JPEG in its second track; its EXIF names Johannes Kimmel as artist and states CC0
+- Author: Uploader to raw.pixls.us; EXIF artist Johannes Kimmel
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/4659/nice/Canon%20-%20EOS%20R6%20-%203%3A2.CR3
+- SHA-256: 74abb0a113d075ad9887a058082f40dd2a938c4813a08474d82356f11a027778
+
+### canon-powershot-g1.crw
+
+- What: Canon PowerShot G1 (CRW) (raw-crw, 2.2 MB)
+- Shows: the 2000 CIFF/HEAP container with a 640 by 480 JPEG
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/2073/nice/Canon%20-%20PowerShot%20G1%20-%20RAW%20%284%3A3%29.crw
+- SHA-256: f39be5acf14057ce04527fd8d0574e57ec8ed5fed082d7bfaff763075a44ee8a
+
+### nikon-d70s.nef
+
+- What: Nikon D70s (NEF) (raw-nef, 5.0 MB)
+- Shows: TIFF-based NEF with a 3008 by 2000 JPEG in a SubIFD
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/1117/nice/Nikon%20-%20D70s%20-%2012bit%2012bit%20compressed%20%28Lossy%20%28type%201%29%29%20%283%3A2%29.NEF
+- SHA-256: 6c46f9854033e7623ebbb5de8c951df6762ca44f05d45035ccc5cb7e9f4e5692
+
+### sony-ilce-7s.arw
+
+- What: Sony A7S (ARW) (raw-arw, 5.9 MB)
+- Shows: TIFF-based ARW with a 1616 by 1080 JPEG preview
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/1582/nice/Sony%20-%20ILCE-7S%20-%2014bit%2014bit%20compressed%20%283%3A2%29.ARW
+- SHA-256: a35ebb2fbec929daa5beb20d1ce5c15a8aac7b1a7a231455387f3df8a7442e07
+
+### olympus-c5060wz.orf
+
+- What: Olympus C5060WZ (ORF) (raw-orf, 7.3 MB)
+- Shows: the only picture inside is a 160 by 120 thumbnail
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/1799/nice/Olympus%20-%20C5060WZ%20-%2012bit%20%284%3A3%29.ORF
+- SHA-256: 3fc12bc3f6320cfab456111d7805b446e329fdd1907680be55e2e163e5e084bd
+
+### panasonic-dmc-lx7.rw2
+
+- What: Panasonic Lumix DMC-LX7 (RW2) (raw-rw2, 3.2 MB)
+- Shows: RW2 with a 1920 by 1280 JPEG
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/7010/nice/Panasonic%20-%20DMC-LX7%20-%203%3A2.RW2
+- SHA-256: 18dfc3877e944020299635a8c2fad61fca2485b1c9b67645a495ee870a86e599
+
+### fujifilm-finepix-s5000.raf
+
+- What: Fujifilm FinePix S5000 (RAF) (raw-raf, 6.5 MB)
+- Shows: RAF container with a 1280 by 960 JPEG
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/2726/nice/Fujifilm%20-%20FinePix%20S5000%20-%204%3A3.RAF
+- SHA-256: dabd5e74521a6980156be9fd4b88d0c37b0fe4d0e0e6f5c12db8cffff1b76297
+
+### adobe-dng-canon-5d3.dng
+
+- What: Canon EOS 5D Mark III converted to DNG (lossy JPEG) (raw-dng, 2.4 MB)
+- Shows: DNG with previews of 256, 1024 and 3960 pixels; converted by Adobe DNG Converter, not straight from a camera
+- Author: Uploader to raw.pixls.us; EXIF artist Simon Harhues
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/1033/nice/Adobe%20DNG%20Converter%20-%20Canon%20EOS%205D%20Mark%20III%20-%20Lossy%20JPEG%20compression%2C%20rgb%20%283%3A2%29.DNG
+- SHA-256: b22f1e36331f679abb8b13e433b9bbde3988723adf10fee7aa0dda6381016a98
+
+## CAD
+
+### house-plan.dxf
+
+- What: House, ground floor plan (DXF 2018) (dxf, 85 KB)
+- Shows: walls cut at openings with pattern hatches, door blocks with attributes, window and furniture blocks, axes with bubbles, room labels, linear, aligned, radius and angular dimensions, stair, north arrow, 17 layers, paper-space sheet with a viewport and a title block
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: ad78cc54ad3c52483040b71dcb5cafda6f3660bdc9f229e21b22ece2cc773815
+
+### house-plan-r2000.dxf
+
+- What: House, ground floor plan (DXF 2000) (dxf, 82 KB)
+- Shows: the same plan written as an AutoCAD 2000 file
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: eabe480065538e478a22424b5d3b0427efd321e098f7e9cabe4ad332984ab033
+
+### house-elevations.dxf
+
+- What: House, four elevations and a section in 2D (dxf, 95 KB)
+- Shows: gabled roofs with roof-tile hatches, plaster hatches, ground hatching, windows with transparent glass, steps, level marks, height dimensions, a hatched section with a stair
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: 4ddb32c976e6709e39a4184a09c772ecff99324dcefd03e40a2cf7d89f62661f
+
+### hatch-gallery.dxf
+
+- What: Hatch gallery (dxf, 142 KB)
+- Shows: about a hundred predefined patterns, nine gradient types, islands in the three hatch styles, boundaries of lines, arcs, ellipses and splines, pattern angle and scale
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: 0d9978ab422cfea65f91149502727f7132a3192450eedf52f90c9075f36b8cf4
+
+### dimensions.dxf
+
+- What: Dimension types (dxf, 55 KB)
+- Shows: linear, aligned, diameter, radius, arc length, angular (two lines and three points), ordinate, leaders, a multileader, tolerances, text override, three dimension styles
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: 515ccb26e3d707c2dc12192f147a4003dc44118d17da04d6f162250aa5935d87
+
+### linetypes.dxf
+
+- What: Linetypes, line weights and polylines (dxf, 35 KB)
+- Shows: the standard linetypes, custom ones with text inside, 12 line weights, per-entity scale, linetype generation, polylines with widths, circles, arcs, ellipses and splines in dashed styles
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: 0c8f9b53c105c230bad51a7fbad1af8972725fea449d638015c94467229c7cc0
+
+### text-styles.dxf
+
+- What: Text styles and MTEXT (dxf, 30 KB)
+- Shows: ten text styles (width and oblique factors, mirrored, upside down), justifications, rotation, special codes, Unicode, MTEXT colours, fonts, stacked fractions, underline, columns, background, nine attachment points
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: e2c312052780d94fd25ad4205370645b143ceecde87d57dac2d471582cddeb3e
+
+### blocks.dxf
+
+- What: Blocks, nested inserts and arrays (dxf, 30 KB)
+- Shows: a block inside a block inside a block with attributes, mirrored, scaled and rotated inserts, a 3 by 8 array, BYBLOCK colours
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: 419ffd35c1dd1d4ded3d70039dfa49852fa85cce935911b10a7a00557b967844
+
+### bracket.dxf
+
+- What: Mechanical part: an L bracket in three views (dxf, 42 KB)
+- Shows: centre and hidden lines, a section with hatching, dimensions with tolerances, diameter and radius dimensions, a leader, an A4 sheet with a title block
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: cd5d9676a8bb77c0702757674e17723202e3a614c38ca96ae8bd8f9c2ad1cfa9
+
+### site-plan.dxf
+
+- What: Site plan with contour lines (dxf, 84 KB)
+- Shows: closed spline contours, wide polyline roads, parcels with areas, hatched buildings, a gradient pond, spot heights, trees, scale bar, legend and north arrow
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: c5bb9b26f9dbd785754d18854c1faef18fd360a8411f2244c3553d4c75a8baeb
+
+### legacy-r12.dxf
+
+- What: Gear in the R12 format (dxf, 14 KB)
+- Shows: POLYLINE, CIRCLE, ARC, TEXT, SOLID, 3DFACE and INSERT entities of the 1992 format
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-cad.py`
+- SHA-256: 926e991c1389fcdf73d8aff413eb8b0c122943bf95f1667b31ba78b7db2a0723
+
+### barraca-valenciana-0100-r2010.dwg
+
+- What: Barraca Valenciana, ground floor plan (DWG 2010, Revit export) (dwg, 278 KB)
+- Shows: walls, doors, glazing, stairs, furniture, hatches, areas, 24 layers, 56 blocks, extra layouts with title block and viewports
+- Author: Òscar Selfa
+- Source: https://zenodo.org/records/14293897
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/14293897
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/14293897/files/BRC-OSP-XXX-P00-PLA-ARQ-0100-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1
+- SHA-256: fcd3eef78cbd568e3f8a8262378670495a3ea6b8e091cb162fe8ef9c3c9add13
+
+### barraca-valenciana-0300-r2010.dwg
+
+- What: Barraca Valenciana, elevations (DWG 2010, Revit export) (dwg, 1.0 MB)
+- Shows: elevations drawn as 2D linework with hatches, topography and planting, no 3D
+- Author: Òscar Selfa
+- Source: https://zenodo.org/records/14293897
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/14293897
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-PLA-ARQ-0300-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1
+- SHA-256: 93a211cfb797525a94b5b41aeae3ecf33e61442eea07cadae056463cc400a3e5
+
+### barraca-valenciana-0400-r2010.dwg
+
+- What: Barraca Valenciana, sections and details (DWG 2010, Revit export) (dwg, 499 KB)
+- Shows: 42 layers, hatches, arcs, splines, ellipses, 61 blocks
+- Author: Òscar Selfa
+- Source: https://zenodo.org/records/14293897
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/14293897
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-PLA-ARQ-0400-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1
+- SHA-256: a09c492dc34ead8df619d6d618049298afffb050a8436c470055923a90f4b61c
+
+### building-survey-plans-r2000.dwg
+
+- What: Survey of a small building: plans, elevations and details (DWG 2000) (dwg, 2.0 MB)
+- Shows: Italian drawing with room names and areas, over 120 layers, 890 blocks, 567 dimensions, 492 hatches
+- Author: Giovanni De Gasperis, Sante Dino Facchini, Asif Saeed
+- Source: https://zenodo.org/records/15076037
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/15076037
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: De Gasperis, G., Facchini, S. D., Saeed, A., Building Ledger Dossier: Seismic Prevention and Building Documentation Tracking through a Digital Twin Approach (4_Architectural_Building_Survey.dwg), Zenodo, doi:10.5281/zenodo.15076037, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/15076037/files/4_Architectural_Building_Survey.dwg?download=1
+- SHA-256: 2f096b44cd5b60ded2ad8b12c2f46116db8b1fda1c980f7bb02660a85782ab1d
+
+### golden-tile-palace-r2004.dwg
+
+- What: Golden Tile Palace: front elevation and section (DWG 2004) (dwg, 746 KB)
+- Shows: elevation and section with level marks and Chinese titles, 4393 polylines, 841 arcs, 328 splines, 26 dimensions, 24 hatches
+- Author: Jing Zhang, Yunying Ren, Xiaofan An
+- Source: https://figshare.com/articles/dataset/Figure_of_surveying_and_mapping_of_Golden_Tile_Palace_/21374221
+- Licence: CC-BY-4.0
+- Evidence: https://api.figshare.com/v2/articles/21374221
+- Words read there: ""name": "CC BY 4.0""
+- Attribution: Jing Zhang, Yunying Ren, Xiaofan An, Figure of surveying and mapping of Golden Tile Palace, supplementary file S1 of PLOS ONE doi:10.1371/journal.pone.0262155, figshare, CC BY 4.0. No changes.
+- Origin: downloaded from https://ndownloader.figshare.com/files/37930432
+- SHA-256: 14d128397f89c1af652b2cd3c9d523db98ae539b1bc061d4f06fba6d21501ae9
+
+### residential-site-plan-r2007.dwg
+
+- What: Site plan of an old residential community in Beijing (DWG 2007) (dwg, 926 KB)
+- Shows: 58 layers, 79 blocks, buildings, roads, 2865 polylines, 656 texts, 125 hatches, 39 dimensions
+- Author: Yijun Fan
+- Source: https://figshare.com/articles/dataset/Drainage_System_Layout_of_Old_Urban_Residential_Communities_In_Beijing/28188725
+- Licence: CC-BY-4.0
+- Evidence: https://api.figshare.com/v2/articles/28188725
+- Words read there: ""name": "CC BY 4.0""
+- Attribution: Yijun Fan, Drainage System Layout of Old Urban Residential Communities In Beijing (Site Plan.dwg), figshare, doi:10.6084/m9.figshare.28188725.v1, CC BY 4.0. No changes.
+- Origin: downloaded from https://ndownloader.figshare.com/files/51611078
+- SHA-256: 37b03757172e5360a03cc26da473cde84e85dbd61914b67741c94a40f7f0db2f
+
+### hospital-floor-plan-r2013.dwg
+
+- What: Furnished hospital floor plan (DWG 2013) (dwg, 1.2 MB)
+- Shows: section and level marks, 109 dimensions, 429 block definitions of furniture and plants, 19 layers
+- Author: Toka Ehab
+- Source: https://zenodo.org/records/10520508
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/10520508
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Toka Ehab, Nanotechnology Applications in Interior Design of hospitals to enhance thermal comfort and decrease the infection spread for the occupants (Elite hospital plan.dwg), Zenodo, doi:10.5281/zenodo.10520508, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/10520508/files/Elite%20hospital%20plan.dwg?download=1
+- SHA-256: b618207b01a1759142e038e1edf762ab8efbe11804bb2e84fc6f472e7e040fb9
+
+### commercial-building-hvac-plans-r2018.dwg
+
+- What: Air-conditioning plans of a commercial building (DWG 2018) (dwg, 495 KB)
+- Shows: 48 layers, 320 blocks, 316 dimensions, 125 hatches, 112 wipeouts
+- Author: Kevin Anthony do Bem
+- Source: https://zenodo.org/records/10407941
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/10407941
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Kevin Anthony do Bem, Projeto de Climatização de um Edifício de Comércio e Serviços (F04 Plantas- Rede aerolica.dwg), Zenodo, doi:10.5281/zenodo.10407941, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/10407941/files/F04%20Plantas-%20Rede%20aerolica.dwg?download=1
+- SHA-256: bcf3b92e0afdf29bb75e7632e8193f881918ddabb4de67a1331b5eda34ee9be2
+
+### ezdxf-dim-linear-tutorial-r2013.dwg
+
+- What: ezdxf documentation: linear dimension tutorial (DWG 2013) (dwg, 36 KB)
+- Shows: 16 dimensions, 16 multileaders, 13 dimension styles, 27 text styles
+- Author: Manfred Moitzi (ezdxf)
+- Source: https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg
+- Licence: MIT
+- Evidence: https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE
+- Words read there: "Copyright (c) 2020 Manfred Moitzi"
+- Attribution: Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg
+- SHA-256: 88037b595bd46d81c5c98ce7aa428ce6b8506d1aa4602e976811cfb154005155
+
+### hospital-ward-wing-plan-section.dxf
+
+- What: Hospital ward wing, plan and section (DXF 2010) (dxf, 300 KB)
+- Shows: 542 polylines, 17 layers of the A-* scheme, 3 blocks, a paper-space viewport
+- Author: Innerscene (original model)
+- Source: https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd
+- Licence: CC0-1.0
+- Evidence: https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd
+- Words read there: "Original Innerscene model, released CC0."
+- Origin: downloaded from https://www.innerscene.com/api/library/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd/download
+- SHA-256: 4fabf62d6d7bbc7c8bdc5f3c9d292d4980c3ec504281b0bd77f487d3c6bb9ba3
+
+### grocery-store-plan-section.dxf
+
+- What: Grocery store, plan and section (DXF 2010) (dxf, 128 KB)
+- Shows: 234 lines, 150 polylines, 17 layers, 3 blocks, a viewport
+- Author: Innerscene (original model)
+- Source: https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041
+- Licence: CC0-1.0
+- Evidence: https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041
+- Words read there: "Original Innerscene model, released CC0."
+- Origin: downloaded from https://www.innerscene.com/api/library/grocery-store-600-square-metres-plan-and-section-2a67d041/download
+- SHA-256: 0b875304e1769e0f7c9377abf270f1fb4d103547cc27a3795a57c34fb4619d30
+
+### ezdxf-uncommon-entities.dxf
+
+- What: ezdxf example: uncommon entities (DXF 2018) (dxf, 335 KB)
+- Shows: 13 dimensions, 2 multileaders, large radial dimensions, rays, construction lines, splines, 33 blocks, 2 extra layouts
+- Author: Manfred Moitzi (ezdxf)
+- Source: https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf
+- Licence: MIT
+- Evidence: https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE
+- Words read there: "Copyright (c) 2020 Manfred Moitzi"
+- Attribution: Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf
+- SHA-256: 5efdd671e3b6d8c45bd0688b1d6479d523f2290f0b390f1584348bf46e34c965
+
+### ezdxf-hatches-1.dxf
+
+- What: ezdxf example: solid hatches (DXF 2018) (dxf, 127 KB)
+- Shows: ten solid hatches over polylines and arcs
+- Author: Manfred Moitzi (ezdxf)
+- Source: https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf
+- Licence: MIT
+- Evidence: https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE
+- Words read there: "Copyright (c) 2020 Manfred Moitzi"
+- Attribution: Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf
+- SHA-256: 2dc2930b4f7d5fb16698437e4f6972986e580a81b2b5d36a780b4311f85fb326
+
+## 3D
+
+### gear.stl
+
+- What: Spur gear, binary STL with facet colours (stl, 42 KB)
+- Shows: 864 facets, orange teeth and blue hub through the VisCAM colour attribute
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: aac8dd0d87fed7b77061d32a5bbe61ac90cbfef16130b7c35730cdc1e77e93c9
+
+### bracket-ascii.stl
+
+- What: L bracket, ASCII STL (stl, 8.8 KB)
+- Shows: text STL, three overlapping boxes
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: dd4b8c55140214fe71a8200d4fe2ae7b51f53e6ab6184e82e79b3d2d12c708f9
+
+### knot.obj
+
+- What: Trefoil knot and base, OBJ with vertex colours (obj, 98 KB)
+- Shows: two objects (knot, base), a colour and a normal per vertex, quads, a rainbow along the knot
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: a2eaba271264d700edc372eaaa6944d342fe9b823c98e698b1445846bded3bf1
+
+### terrain.ply
+
+- What: Height field, binary PLY with colours (ply, 117 KB)
+- Shows: 2304 vertices with normals and a hypsometric colour each, 4418 triangles
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: 22c2f25d47c43841c1ed1327c6fb9e75725925ca1e3c61dc413c23319dcfde52
+
+### icosphere-ascii.ply
+
+- What: Icosphere, ASCII PLY with colours (ply, 14 KB)
+- Shows: text PLY with normals and RGBA per vertex
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: dbe5ae97077d8177503d5bab7d83fbc3f0a943181384fbffc68db7a4930f19be
+
+### arm.glb
+
+- What: Articulated arm in a glass dome, GLB (glb, 28 KB)
+- Shows: node tree with rotations and scales, five materials, a metallic and a transparent one, vertex colours on the floor
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: 146ba6e29d9b8bf4ec57c72bde686a5119b80cfe4365f05f0f0b7004b066a7b7
+
+### table.gltf
+
+- What: Table and two chairs, glTF with an embedded buffer (gltf, 7.6 KB)
+- Shows: 17 nodes, a data URI buffer, shared meshes instanced under several nodes
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-models.py`
+- SHA-256: ae656d2f656968fa44870ffc539d2383b85725289feb90e658881c5825bb7ef4
+
+### house.ifc
+
+- What: Two-storey house (IFC4) (ifc, 65 KB)
+- Shows: walls with openings filled by windows and doors, slabs, a gable roof, porch columns, a stair of eleven steps, a table and chairs sharing a mapped representation, spaces, a property set, a material and colours
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-ifc.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-ifc.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-ifc.py`
+- SHA-256: d65c93ae607a5b03316662719f5995f9de3bfd94366383ab683838bbccfa4731
+
+### bsi-building-architecture-ifc2x3.ifc
+
+- What: buildingSMART Simple-Scene Building-Architecture (IFC2X3) (ifc, 90 KB)
+- Shows: a small SketchUp house: walls, slabs, a roof, spaces, materials with colours, quantity and property sets; faceted breps
+- Author: buildingSMART International Ltd.
+- Source: https://github.com/buildingSMART/Sample-Test-Files
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE
+- Words read there: "This work is licensed under the Creative Commons Attribution 4.0 International License."
+- Attribution: buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%202.3.0.1%20%28IFC%202x3%20TC1%29/Simple-Scene/Building-Architecture.ifc
+- SHA-256: c4db65ba847f6b369a95d6c54fa11f4750cbe6d59f021934e8923d8d578e5885
+
+### bsi-building-architecture-ifc4x3.ifc
+
+- What: buildingSMART Simple-Scene Building-Architecture (IFC4X3_ADD2) (ifc, 139 KB)
+- Shows: the same house in IFC 4.3, with triangulated faces
+- Author: buildingSMART International Ltd.
+- Source: https://github.com/buildingSMART/Sample-Test-Files
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE
+- Words read there: "This work is licensed under the Creative Commons Attribution 4.0 International License."
+- Attribution: buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%204.3.2.0%20%28IFC%204.3%20ADD2%29/Simple-Scene/Building-Architecture.ifc
+- SHA-256: 96e7103812b15b65eb1fd7802d36b9962833485dce5ead4f440bbf529530881d
+
+### bsi-wall-with-opening-and-window-ifc4.ifc
+
+- What: buildingSMART reference view: a wall with an opening and a window (IFC4) (ifc, 12 KB)
+- Shows: a wall with a material layer set, an opening element and a window with its type
+- Author: Peter Bonsma, RDF Ltd. (file header), distributed by buildingSMART International Ltd.
+- Source: https://github.com/buildingSMART/Sample-Test-Files
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE
+- Words read there: "This work is licensed under the Creative Commons Attribution 4.0 International License."
+- Attribution: buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%204.0.2.1%20%28IFC%204%20ADD2%20TC1%29/ISO%20Spec%20-%20ReferenceView_V1.2/wall-with-opening-and-window.ifc
+- SHA-256: 73b0e45d931d5dc13bfee5fdc7bd80f796526445458b2de74c4168d209097832
+
+### duplex-apartment-ifc2x3.ifc
+
+- What: Duplex Apartment (IFC2X3, Revit export) (ifc, 2.3 MB)
+- Shows: four storeys: 57 walls, 24 windows, 14 doors, 2 stairs, 21 spaces, furniture, 18 materials
+- Author: Provided to the US Army Construction Engineering Research Laboratory, republished by buildingSMART International
+- Source: https://github.com/buildingsmart-community/Community-Sample-Test-Files/tree/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20(IFC%202x3)/Duplex%20Apartment
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/buildingsmart-community/Community-Sample-Test-Files/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20%28IFC%202x3%29/Duplex%20Apartment/README.md
+- Words read there: "Creative Commons (CC BY 4.0). You are free (1) to copy and resitribute this material any way you like"
+- Attribution: BSI (2020) Duplex Apartment Test Files, buildingSMART International, https://github.com/buildingsmart-community/Community-Sample-Test-Files, CC BY 4.0. No changes.
+- Origin: downloaded from https://media.githubusercontent.com/media/buildingsmart-community/Community-Sample-Test-Files/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20%28IFC%202x3%29/Duplex%20Apartment/Duplex_A_20110907.ifc
+- SHA-256: b347a2c8aa8fff6db896a4417a9c50c22ac0ccd7c5cfc22b99b8d29336c606ed
+
+### barraca-valenciana-ifc4.ifc
+
+- What: Barraca Valenciana de Llauradors, BIM model (IFC4, Revit export) (ifc, 1.5 MB)
+- Shows: a traditional farmhouse: 2 storeys, 16 walls, 5 slabs, 2 roofs, a stair, 27 beams, 28 materials
+- Author: Òscar Selfa
+- Source: https://zenodo.org/records/14293897
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/14293897
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-M3D-ARQ-0001-tipologiaGen%C3%A8rica-S3-0001.ifc?download=1
+- SHA-256: b6f8828e9bd2491dc452b2ab78f9f9e28f39bd81a5f2f4e2cdb2d81668287193
+
+### office-archetype-1970-ifc4x3.ifc
+
+- What: Office archetype of 1970 (IFC4X3_ADD2) (ifc, 1.4 MB)
+- Shows: four storeys: 88 walls, 167 windows, 49 doors, 16 curtain walls, 48 spaces
+- Author: Verena Dannapfel, Moritz Müller, Rita Streblow, Dirk Müller et al., RWTH Aachen University
+- Source: https://zenodo.org/records/21820756
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/records/21820756
+- Words read there: "Creative Commons Attribution 4.0 International"
+- Attribution: Dannapfel, V., Müller, M., Streblow, R., Müller, D. et al., Archetypes for German Office Buildings of Construction Years 1970, 1998 and 2026, Zenodo, doi:10.5281/zenodo.21820756, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/records/21820756/files/2026-07_Klassiqua_Office_Archetype_Construction_Year_1970.ifc?download=1
+- SHA-256: a5f12304d33fe5da9174c8ea9827d2f322706646b3da2766dff0ab278c65df3c
+
+### fox.glb
+
+- What: Fox, skinned and animated (GLB) (glb, 159 KB)
+- Shows: a low-poly fox with a skin, three animations and a texture
+- Author: PixelMannen (model, CC0), tomkranis (rigging and animation, CC BY 4.0), glTF conversion by Asobo Studio and the Khronos Group
+- Source: https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox/README.md
+- Words read there: "&copy; 2014, tomkranis. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)"
+- Attribution: Fox: model by PixelMannen (CC0, https://opengameart.org/content/fox-and-shiba), rigging and animation by tomkranis (CC BY 4.0, https://sketchfab.com/3d-models/low-poly-fox-by-pixelmannen-animated-371dea88d7e04a76af5763f2a36866bc), glTF conversion by Asobo Studio and the Khronos Group. Unmodified.
+- Origin: downloaded from https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox/glTF-Binary/Fox.glb
+- SHA-256: d97044e701822bac5a62696459b27d7b375aada5de8574ed4362edbba94771f7
+
+### riggedfigure.gltf
+
+- What: Rigged Figure (glTF with an embedded buffer) (gltf, 98 KB)
+- Shows: a skinned figure, a data URI buffer
+- Author: Cesium
+- Source: https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure/README.md
+- Words read there: "&copy; 2017, Cesium. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)"
+- Attribution: Rigged Figure by Cesium, CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/RiggedFigure. Unmodified.
+- Origin: downloaded from https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure/glTF-Embedded/RiggedFigure.gltf
+- SHA-256: 354572cfef17b136b437ac9749da0fa316fd6e42ee7d62fe50a696b25f5047e9
+
+### vertexcolortest.glb
+
+- What: Vertex Color Test (GLB) (glb, 26 KB)
+- Shows: COLOR_0 vertex colours, tangents, two textures
+- Author: Ed Mackey, Analytical Graphics, Inc. (Cesium)
+- Source: https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest
+- Licence: CC-BY-4.0
+- Evidence: https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest/README.md
+- Words read there: "&copy; 2018, Analytical Graphics, Inc.. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)"
+- Attribution: Vertex Color Test by Ed Mackey, Copyright 2018 Analytical Graphics, Inc., CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/VertexColorTest. Unmodified.
+- Origin: downloaded from https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest/glTF-Binary/VertexColorTest.glb
+- SHA-256: 58006bdcff8084339da0f6e24400160890638c16dbcb83c362ccaf150e8c6e10
+
+### metalroughspheres.glb
+
+- What: Metal-Rough spheres (GLB) (glb, 284 KB)
+- Shows: 119 nodes and 98 materials of growing metalness and roughness
+- Author: Krill Gavrilov / Draw Harness script (Open CASCADE Technology)
+- Source: https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures
+- Licence: CC0-1.0
+- Evidence: https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures/README.md
+- Words read there: "&copy; 2019, Public. [Creative Commons Zero v1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)"
+- Origin: downloaded from https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures/glTF-Binary/MetalRoughSpheresNoTextures.glb
+- SHA-256: 5e677f260ec0f366967a6e9545de2f3dab2a160e307b9bcb9d050cd2028f63f8
+
+### iridescencesuzanne.glb
+
+- What: Iridescence Suzanne (GLB) (glb, 496 KB)
+- Shows: Suzanne with the iridescence, transmission and volume extensions
+- Author: Mathias Kanzler (UX3D), Pascal Schoen
+- Source: https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne
+- Licence: CC0-1.0
+- Evidence: https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne/README.md
+- Words read there: "&copy; 2022, UX3D. [Creative Commons Zero v1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)"
+- Origin: downloaded from https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne/glTF-Binary/IridescenceSuzanne.glb
+- SHA-256: 866762602d60a0942b7608bfabf4e8686a29033636224f4b55c5e56abe8abf8f
+
+### ratchet-cam.stl
+
+- What: Apollo 11 hatch, stationary ratchet cam (binary STL) (stl, 75 KB)
+- Shows: 1536 triangles, a mechanical part
+- Author: NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons
+- Source: https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl
+- Licence: CC0-1.0
+- Evidence: https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl
+- Words read there: "CC0 1.0 Universal Public Domain Dedication"
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/e/e0/Stationary_Ratchet_Cam_v11_%28Hatch%2C_Crew%2C_Apollo_11_by_NASA_and_Smithsonian_Institution%29.stl
+- SHA-256: b42d79fb357413b118b973f3fa40b76ae2999451537cd991bebce18b486c581f
+
+### ratchet-spur-gear.stl
+
+- What: Apollo 11 hatch, stationary ratchet spur gear (binary STL) (stl, 148 KB)
+- Shows: 3026 triangles, a gear with 19 teeth
+- Author: NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons
+- Source: https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl
+- Licence: CC0-1.0
+- Evidence: https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl
+- Words read there: "CC0 1.0 Universal Public Domain Dedication"
+- Origin: downloaded from https://upload.wikimedia.org/wikipedia/commons/c/cb/N%3D19%2C_P%3D28_-_Stat._Ratchet_Spur_Gear_v13_%28Hatch%2C_Crew%2C_Apollo_11_by_NASA_and_Smithsonian_Institution%29.stl
+- SHA-256: c99eca56ab40ed6b2e9dfc49b88c23c6fbef982ff18813ba593d3e138ef1f51d
+
+### petri-dish-holder-base.stl
+
+- What: Petri dish holder base of a spore capture device (ASCII STL) (stl, 148 KB)
+- Shows: 566 facets as text
+- Author: Kevin A. Adkins, Kaiyu Li, M. N. Blasko, J. L. Cabrera, B. H. Neal, James et al.
+- Source: https://zenodo.org/records/12193898
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/api/records/12193898
+- Words read there: ""license": {"id": "cc-by-4.0"}"
+- Attribution: Components of the spore capture device in A simple mechanism for uncrewed aircraft bioaerosol sampling in the lower atmosphere (Inspire1Petri_Dish_Holder_Base.stl), Kevin A. Adkins et al., Zenodo 2024, doi:10.5281/zenodo.12193898, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/api/records/12193898/files/Inspire1Petri_Dish_Holder_Base.stl/content
+- SHA-256: d654bf60064e79675acd9694726282c70251905d77391ad45c29d3ba3ecaf93e
+
+### chickpea-mesh.ply
+
+- What: Photogrammetric mesh of a chickpea plant (binary PLY with colours) (ply, 198 KB)
+- Shows: 8788 triangles, RGBA per vertex
+- Author: William T. Salter, Arjina Shrestha, Margaret M. Barbour
+- Source: https://zenodo.org/records/4018242
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/api/records/4018242
+- Words read there: ""license": {"id": "cc-by-4.0"}"
+- Attribution: 3D photogrammetric reconstructions of individual chickpea plants (PBASlasher_S3s_Wk1_meshed.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/api/records/4018242/files/PBASlasher_S3s_Wk1_meshed.ply/content
+- SHA-256: ef9cd2141897781c8e3e6a72ac316056b991d4d0fae99e053c4695fceea8cb75
+
+### ruthwell-lamb-of-god.ply
+
+- What: Lamb of God panel of the Ruthwell Cross (binary PLY with normals and colours) (ply, 873 KB)
+- Shows: 33020 triangles, a scanned stone carving
+- Author: Gurpreet Singh
+- Source: https://zenodo.org/records/3348342
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/api/records/3348342
+- Words read there: ""license": {"id": "cc-by-4.0"}"
+- Attribution: Small Panel PLY (Lamb of God panel from the Ruthwell Cross), Gurpreet Singh, Zenodo 2019, doi:10.5281/zenodo.3348342, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/api/records/3348342/files/Small_Lamb_Of_God_North_Ruthwell_Cross.ply/content
+- SHA-256: 0d40a4305885932596afce091891a8f4b212b0c012b742db10d4487351c2457a
+
+## Audio and video
+
+### canon.wav
+
+- What: A four-voice canon, WAV (wav, 131 KB)
+- Shows: 8 kHz mono 16-bit, 8.4 seconds, synthesised
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: c26b3aa385a70bb6785c7eb36b0bf3fe04a379fe46294d77d29ad153d0cc1028
+
+### canon.mp3
+
+- What: The canon as MP3 (mp3, 25 KB)
+- Shows: 24 kbit/s
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: c9f569a2833d11af90232c2f950c865f02bfbcc5822fc35cccb7466dd9c46c49
+
+### canon.flac
+
+- What: The canon as FLAC (flac, 73 KB)
+- Shows: lossless, level 8
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: c3dd10ace8ccaacb09f74ca73619e0d991ff94ce3d25fdc20ee9fb4597bc8a63
+
+### canon.ogg
+
+- What: The canon as Ogg Vorbis (ogg, 14 KB)
+- Shows: quality 2
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: 39c1dabbcadc817bfa1fc76839b1ee6940bab7187dffd4c495a5f61362cb91ad
+
+### canon.opus
+
+- What: The canon as Opus (opus, 16 KB)
+- Shows: 16 kbit/s
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: e18075a4586929741c6bf264c92e8f7f35086f5e4ab2f3be58845835556bc9ae
+
+### canon.m4a
+
+- What: The canon as AAC in MP4 (m4a, 24 KB)
+- Shows: 24 kbit/s
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: edd56750fd23edd327a46ea907c9d34d53fcff6e04f2d0516a1083ea2c7306e5
+
+### testcard.mp4
+
+- What: Test card with a clock, H.264 and AAC in MP4 (mp4, 41 KB)
+- Shows: 256 by 192, 12 frames a second, 4 seconds, with the canon as sound
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: ad088934ae59962bafc0b9b56a57556623d5e2b7821869e2dc91047573213a12
+
+### testcard.webm
+
+- What: Test card with a clock, VP9 and Opus in WebM (webm, 41 KB)
+- Shows: 256 by 192, 12 frames a second, 4 seconds, with the canon as sound
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-media.py` (with ffmpeg)
+- SHA-256: dca14e93bb8e3448a5d9a61fbbe402a7cf2b0c8f476a13b98f5649d079a1b7b8
+
+## Archives
+
+### sample.zip
+
+- What: Zip with folders, stored and deflated members, Unicode names and a comment (zip, 15 KB)
+- Shows: 9 files in 5 folders, an empty folder
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: ad98593f9dc85d5dad309140ce703f96b36da749e48ea6648ce10c53a418250d
+
+### sample.tar
+
+- What: Tar (ustar) with folders and a symbolic link (tar, 50 KB)
+- Shows: 16 entries
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: b31804242af3545fd922934e81a2aade8fd09a7e2648fe26b41cd32dc37e1fb8
+
+### sample.tar.gz
+
+- What: Tar compressed with gzip (tar.gz, 15 KB)
+- Shows: the tar opens inside the gzip
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 5c423a4e7e0d96e025bb871034a88308f1d32861f60826074c29aa121fcdecca
+
+### sample.tar.bz2
+
+- What: Tar compressed with bzip2 (tar.bz2, 14 KB)
+- Shows: the tar opens inside the bzip2 stream
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 99b6742b5c54a36261f06a24032c22c11ed84b01e40e2267ef338b15ca181fcf
+
+### sample.tar.xz
+
+- What: Tar compressed with xz (tar.xz, 13 KB)
+- Shows: the tar opens inside the xz stream
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 762ce440ee2dfd2f4d22a6d29f2535e7079ad21d461d7fce3167cd62a9f356bf
+
+### sample.tar.zst
+
+- What: Tar compressed with Zstandard (tar.zst, 14 KB)
+- Shows: level 19
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with zstd)
+- SHA-256: d134793d16db00229eb192be488ef248a7c3e1226d9d27b67d8a763cd9b0641d
+
+### server.log.gz
+
+- What: A log compressed with gzip (gz, 1.3 KB)
+- Shows: one member, no tar
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 9f80faaae63eb4ae0a3a68c1346966049cb6ad5eba17e9c8600eb404ced75922
+
+### server.log.bz2
+
+- What: A log compressed with bzip2 (bz2, 1.1 KB)
+- Shows: one member, no tar
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 4b235dc9fc1a2840be3dd7ed792c7e4bc373851130e7122de3e798e7061b39c4
+
+### server.log.xz
+
+- What: A log compressed with xz (xz, 820 B)
+- Shows: one member, no tar
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 7dec383660d188a36f28cae361ebb809914849ddf10a508fc47503f367c1e86c
+
+### sample.7z
+
+- What: 7z with LZMA2 (7z, 13 KB)
+- Shows: a solid archive of 9 files
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with 7z)
+- SHA-256: 7a2df3dd03ae207f3be0175190e3795662753e701d36555cd06e7295a72483c9
+
+### sample.rar
+
+- What: RAR 5 with stored members (rar, 34 KB)
+- Shows: folders, CRC32 and Unix modes, written by the script from the format's documentation (no RAR program)
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 71aa4939bc7f2e4a98cc484e7353b829ad8a5019b1dee3911e8df3548e317c90
+
+### sample.iso
+
+- What: ISO 9660 image with Joliet and Rock Ridge (iso, 130 KB)
+- Shows: volume EXAV_EXAMPLE, long and Unicode names
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with genisoimage)
+- SHA-256: baa0c331dc2f1f8e3f04c171282faf7753a38d380e82e0ca894c70a04f08d4c0
+
+### matryoshka.zip
+
+- What: Nested archives: a zip holding a tar.gz holding a 7z holding a zip (zip, 7.1 KB)
+- Shows: four levels, opened in place one after the other
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with 7z)
+- SHA-256: 0c4d4171bd6cd565a17ff675763cebf6c8d8c9408ebd6c738d436feab6cb42e9
+
+### encrypted-aes.zip
+
+- What: Zip encrypted with AES-256, password: exav (zip, 16 KB)
+- Shows: names are listed, each member says it is encrypted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with 7z)
+- SHA-256: e6cd983b8b1694a5df2c2f7d7790a249e4e9c529cb0d796e6d05de7a4bb03bd0
+
+### encrypted-zipcrypto.zip
+
+- What: Zip encrypted with the traditional ZipCrypto, password: exav (zip, 16 KB)
+- Shows: names are listed, each member says it is encrypted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with 7z)
+- SHA-256: 21053827c2871cda2d2f6259dc1d3848e318b40c0e71858220d601fc3c90767c
+
+### encrypted.7z
+
+- What: 7z encrypted with AES-256, password: exav (7z, 13 KB)
+- Shows: file names visible, contents encrypted
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with 7z)
+- SHA-256: c2606ee4ee72de0d9ba1461ba976c5ac20de157b6b17771372bd6acf221cc6ce
+
+### example.jar
+
+- What: A jar (a zip with a manifest) (jar, 793 B)
+- Shows: META-INF/MANIFEST.MF, a source file, a properties file
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 44aeabd990d5a5c75f88846f5310ad44a9b56deadde592ec3d932cf13476ff45
+
+### pages.cbz
+
+- What: Comic book archive (zip of pages) (cbz, 10 KB)
+- Shows: two page images and ComicInfo.xml
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with )
+- SHA-256: 82dc884486eec4ca4fbeb3c016d6431848d0a2ccd843ab6e65972503524b0723
+
+### sample.cab
+
+- What: Microsoft cabinet (cab, 6.1 KB)
+- Shows: four files, MSZIP
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with gcab)
+- SHA-256: 5f12d6c186b5cc81f70dc4b3d4a4d7b4b7bdebb74f002ada9067b4738589de00
+
+### exav-example.deb
+
+- What: Debian package (deb, 2.2 KB)
+- Shows: an ar archive of debian-binary, control.tar.xz and data.tar.xz
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with dpkg-deb)
+- SHA-256: d73cac532f34c9948bc596e1241189b66d4d4497af030d766bbb451b4ab1adea
+
+### libexample.a
+
+- What: Unix ar archive (ar, 1.9 KB)
+- Shows: two members
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with ar)
+- SHA-256: 59396e78830b3119a01419e202810446dc15c312cf4b91727170b181d0afaf3e
+
+### sample.cpio
+
+- What: cpio archive (newc) (cpio, 7.0 KB)
+- Shows: four files
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-archives.py` (with cpio)
+- SHA-256: aab3c3fdd392a978d0a516e5a420bbed6b97c203966c1ed275d7246a93ab9827
+
+## Unsupported
+
+### fax-g3-1d.tif
+
+- What: Fax page, CCITT Group 3 (T.4, one-dimensional) TIFF (tiff-fax, 60 KB)
+- Shows: kept to show the error: the TIFF decoder reads Group 4 only
+- Author: exav project
+- Source: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Licence: CC0-1.0
+- Evidence: https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py
+- Words read there: "Output: CC0-1.0, a public domain dedication by the exav project."
+- Origin: generated by `generate/make-images.py`
+- SHA-256: ee3c004c31ac0c49f045db053347a219bcce795a074931ad15463fc86fd208ed
+
+### minolta-dimage-5.mrw
+
+- What: Minolta DiMAGE 5 (MRW) (raw-mrw, 6.1 MB)
+- Shows: MRW with a 640 by 480 preview whose first byte is stored as zero: the viewer finds no preview in it (kept to show the message)
+- Author: Uploader to raw.pixls.us (the site gives no name)
+- Source: https://raw.pixls.us/#repo
+- Licence: CC0-1.0
+- Evidence: https://raw.pixls.us/json/getrepository.php?set=all
+- Words read there: "Creative Commons 0 - Public Domain"
+- Origin: downloaded from https://raw.pixls.us/getfile.php/7795/nice/Minolta%20-%20DiMAGE%205%20-%204%3A3.MRW
+- SHA-256: d60bfd80bcb1f7b9c88b14a5e46ea27885bbf92d990ab30b3939288678fea0d9
+
+### chickpea-pointcloud-ascii.ply
+
+- What: Point cloud of a chickpea plant (ASCII PLY without faces) (ply, 3.3 MB)
+- Shows: 53195 coloured points and no faces: kept to show what the viewer says about a point cloud
+- Author: William T. Salter, Arjina Shrestha, Margaret M. Barbour
+- Source: https://zenodo.org/records/4018242
+- Licence: CC-BY-4.0
+- Evidence: https://zenodo.org/api/records/4018242
+- Words read there: ""license": {"id": "cc-by-4.0"}"
+- Attribution: 3D photogrammetric reconstructions of individual chickpea plants (SonSla_3_groundtruth_pointcloud.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.
+- Origin: downloaded from https://zenodo.org/api/records/4018242/files/SonSla_3_groundtruth_pointcloud.ply/content
+- SHA-256: 53a08f6e1c831ac58c42342ee257c97730bcf6997e246c88198478f9aeba4fe0
+
+### tika-pages09-layout.pages
+
+- What: Apache Tika test document (Pages '09) (pages, 65 KB)
+- Shows: kept to show what the viewer says about Pages files, which it does not list yet
+- Author: Michael McCandless (Apache Tika)
+- Source: https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages
+- Licence: Apache-2.0
+- Evidence: https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt
+- Words read there: "Version 2.0, January 2004"
+- Attribution: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- Origin: downloaded from https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages
+- SHA-256: 6157fe7a95f7bc7d42251872f990d2f2d589f7f5e25a52b58e25c14cc447a4b2
+
diff --git a/crates/exav-viewer/demo/examples/check.mjs b/crates/exav-viewer/demo/examples/check.mjs
new file mode 100644
index 00000000..4faf29ec
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/check.mjs
@@ -0,0 +1,114 @@
+#!/usr/bin/env node
+// Checks demo/examples/examples.json against the files:
+//
+//     node demo/examples/check.mjs            # the manifest and files/
+//     node demo/examples/check.mjs --public   # also demo/public/examples/ (after `npm run demo:examples`)
+//
+// Fails (exit 1) on a missing field, a licence that is not allowed, a missing
+// attribution, a file whose size or SHA-256 differs, a file in files/ that the
+// manifest does not list, a group the demo does not know, or a script that is
+// not there.
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const pkg = path.join(here, "..", "..");
+const repo = path.join(pkg, "..", "..");
+const withPublic = process.argv.includes("--public");
+
+const manifest = JSON.parse(fs.readFileSync(path.join(here, "examples.json"), "utf8"));
+const problems = [];
+const bad = (file, msg) => problems.push(`${file}: ${msg}`);
+
+// Public domain, CC0, CC-BY, and MIT, BSD and Apache test files. No share-alike or copyleft licence.
+const SPDX = /^(CC0-1\.0|CC-BY-(1\.0|2\.0|2\.5|3\.0|4\.0)|MIT|BSD-2-Clause|BSD-3-Clause|Apache-2\.0)$/;
+const NEEDS_ATTRIBUTION = /^(CC-BY|MIT|BSD|Apache)/;
+const REFUSED = /\b(GPL|LGPL|AGPL|MPL|NC|ND|non-?commercial|no derivatives)\b/i;
+
+const groups = new Set([...fs.readFileSync(path.join(pkg, "demo", "src", "showcase.ts"), "utf8").matchAll(/^\s+(?:"([\w-]+)"|(\w+)): \{ en: /gm)].map((m) => m[1] ?? m[2]));
+
+const sha256 = (data) => crypto.createHash("sha256").update(data).digest("hex");
+const isUrl = (s) => typeof s === "string" && /^https:\/\/[^\s]+$/.test(s);
+const names = new Set();
+const paths = new Set();
+let committedBytes = 0;
+let fetchedBytes = 0;
+
+for (const e of manifest.examples) {
+  const f = e.file ?? "(no file)";
+  for (const k of ["file", "group", "family", "title", "author", "source", "evidence", "evidence_quote", "licence", "sha256"]) {
+    if (typeof e[k] !== "string" || !e[k].trim()) bad(f, `no ${k}`);
+  }
+  if (typeof e.attribution !== "string") bad(f, "no attribution (use \"\" when the licence asks for none)");
+  if (!Number.isInteger(e.bytes) || e.bytes <= 0) bad(f, "no bytes");
+  if (typeof e.committed !== "boolean") bad(f, "no committed flag");
+  if (names.has(e.file)) bad(f, "listed twice");
+  names.add(e.file);
+  if (e.file && e.file !== path.basename(e.file)) bad(f, "not a plain file name");
+  if (e.group && !groups.has(e.group)) bad(f, `group ${e.group} is not in demo/src/showcase.ts`);
+  if (!isUrl(e.source)) bad(f, "source is not an https URL");
+  if (!isUrl(e.evidence)) bad(f, "evidence is not an https URL");
+  if (e.sha256 && !/^[0-9a-f]{64}$/.test(e.sha256)) bad(f, "sha256 is not 64 hex digits");
+
+  const lic = e.licence ?? "";
+  if (!SPDX.test(lic) && !/^public-domain \(.{8,}\)$/.test(lic)) bad(f, `licence "${lic}" is not allowed (use an SPDX id of the list, or "public-domain (reason)")`);
+  if (REFUSED.test(lic)) bad(f, `licence "${lic}" is refused`);
+  if (NEEDS_ATTRIBUTION.test(lic) && !(e.attribution ?? "").trim()) bad(f, `${lic} needs an attribution line`);
+  if (e.attribution && /—|load-bearing|genuinely/i.test(e.attribution + e.title)) bad(f, "dash or AI wording in the credit");
+
+  const origins = ["generated", "fetched", "fixture"].filter((k) => e[k] !== undefined);
+  if (!origins.length) bad(f, "none of generated, fetched, fixture");
+  if (e.generated) {
+    if (typeof e.generated.script !== "string" || !Array.isArray(e.generated.args)) bad(f, "generated needs a script and its args");
+    else if (!fs.existsSync(path.join(here, e.generated.script))) bad(f, `script ${e.generated.script} is missing`);
+  }
+  if (e.fetched !== undefined && !isUrl(e.fetched)) bad(f, "fetched is not an https URL");
+  if (e.fixture !== undefined && !fs.existsSync(path.join(repo, e.fixture))) bad(f, `fixture ${e.fixture} is not in the repository`);
+  if (!e.committed && !isUrl(e.fetched)) bad(f, "not committed and not fetched: nothing to serve");
+
+  if (e.committed) {
+    if (!e.path) {
+      bad(f, "committed without a path");
+      continue;
+    }
+    paths.add(path.normalize(e.path));
+    const p = path.join(here, "files", e.path);
+    if (!fs.existsSync(p)) {
+      bad(f, `files/${e.path} is missing`);
+      continue;
+    }
+    const data = fs.readFileSync(p);
+    if (data.length !== e.bytes) bad(f, `files/${e.path} is ${data.length} bytes, the manifest says ${e.bytes}`);
+    if (sha256(data) !== e.sha256) bad(f, `files/${e.path} has sha256 ${sha256(data)}, the manifest says ${e.sha256}`);
+    if (path.basename(e.path) !== e.file) bad(f, "path and file name differ");
+    if (data.length > 1_000_000) bad(f, `committed file of ${data.length} bytes: over 1 MB goes by download`);
+    committedBytes += data.length;
+  } else {
+    if (e.bytes > 12_000_000) bad(f, `fetched file of ${e.bytes} bytes is too large`);
+    fetchedBytes += e.bytes;
+  }
+
+  if (withPublic) {
+    const p = path.join(pkg, "demo", "public", "examples", e.file);
+    if (fs.existsSync(p)) {
+      const data = fs.readFileSync(p);
+      if (data.length !== e.bytes || sha256(data) !== e.sha256) bad(f, `demo/public/examples/${e.file} does not match the manifest`);
+    } else if (e.committed) {
+      bad(f, `demo/public/examples/${e.file} is missing: run npm run demo:examples`);
+    }
+  }
+}
+
+// Every file under files/ is listed.
+const listed = (dir, base = "") =>
+  fs.readdirSync(path.join(dir, base), { withFileTypes: true }).flatMap((d) => (d.isDirectory() ? listed(dir, path.join(base, d.name)) : [path.join(base, d.name)]));
+const filesDir = path.join(here, "files");
+if (fs.existsSync(filesDir)) for (const p of listed(filesDir)) if (!paths.has(path.normalize(p))) bad(p, "in files/ but not in the manifest");
+
+if (problems.length) {
+  console.error(`${problems.length} problem${problems.length === 1 ? "" : "s"} in demo/examples/examples.json:\n  ${problems.join("\n  ")}`);
+  process.exit(1);
+}
+console.log(`${manifest.examples.length} examples ok: ${committedBytes} bytes committed, ${fetchedBytes} bytes fetched`);
diff --git a/crates/exav-viewer/demo/examples/examples.json b/crates/exav-viewer/demo/examples/examples.json
new file mode 100644
index 00000000..e9a3418f
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/examples.json
@@ -0,0 +1,4703 @@
+{
+  "version": 1,
+  "examples": [
+    {
+      "file": "scene.png",
+      "group": "images",
+      "family": "png",
+      "title": "Dusk landscape, PNG",
+      "features": "8-bit RGB, optimised",
+      "path": "images/scene.png",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 26756,
+      "sha256": "4a0f00c07bb229932be134ede00f78851c8b1c4d3fa3eaa32164bb97c424f3fe"
+    },
+    {
+      "file": "scene-alpha.png",
+      "group": "images",
+      "family": "png",
+      "title": "Landscape fading to transparent, PNG",
+      "features": "RGBA: the viewer shows its chequerboard through the alpha",
+      "path": "images/scene-alpha.png",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 48816,
+      "sha256": "c06a1651cfa68c3c729ba2a94eb0e6a3ccb306a24b3e4029d909a0da3e705a69"
+    },
+    {
+      "file": "scene-indexed.png",
+      "group": "images",
+      "family": "png",
+      "title": "Landscape in 32 colours, PNG",
+      "features": "palette (indexed) PNG",
+      "path": "images/scene-indexed.png",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 5152,
+      "sha256": "ebd709f812945dd233203f4dbea12c22af3450bd67be52dbc6668f35f55a0e58"
+    },
+    {
+      "file": "gradient-grey16.png",
+      "group": "images",
+      "family": "png",
+      "title": "Grey ramp, 16-bit PNG",
+      "features": "16-bit greyscale",
+      "path": "images/gradient-grey16.png",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 48383,
+      "sha256": "594a376de8d26c143d65c012f82aafd3775e8bd6698cd168ce957638c636379d"
+    },
+    {
+      "file": "bounce.png",
+      "group": "images",
+      "family": "apng",
+      "title": "Bouncing ball, animated PNG",
+      "features": "24 frames, APNG",
+      "path": "images/bounce.png",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 41428,
+      "sha256": "dbe78676dee3a09eb44aafd14980b8999f11bf576e1152d2183193a9c18ff131"
+    },
+    {
+      "file": "scene.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Dusk landscape, JPEG",
+      "features": "baseline 4:2:0 with EXIF description and copyright",
+      "path": "images/scene.jpg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 24631,
+      "sha256": "42f3881913d6401dc2df511f6a975caeb834f965299c152f5535aa3ae6a5e02e"
+    },
+    {
+      "file": "scene-progressive.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Dusk landscape, progressive JPEG",
+      "features": "progressive scans, optimised Huffman tables",
+      "path": "images/scene-progressive.jpg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 20456,
+      "sha256": "70c6c3352c093ac5da448706cb7873dc1fa991f84119d37f80acf63550078f65"
+    },
+    {
+      "file": "scene-orientation6.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "JPEG stored on its side with EXIF orientation 6",
+      "features": "shown upright through the EXIF orientation",
+      "path": "images/scene-orientation6.jpg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 22193,
+      "sha256": "02e8b993e435a3de434c7efbe688757efa2fef452b1747c7382732b63e8e971b"
+    },
+    {
+      "file": "scene-grey.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Landscape in grey, JPEG",
+      "features": "single-component JPEG",
+      "path": "images/scene-grey.jpg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 17273,
+      "sha256": "546838a80bc5b7b042fdc593b8e95fbaaf39165347dcba32c45d341f2f5dabea"
+    },
+    {
+      "file": "scene-cmyk.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Landscape as a CMYK JPEG",
+      "features": "four components (Adobe inverted CMYK)",
+      "path": "images/scene-cmyk.jpg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 52705,
+      "sha256": "2c85449ef1574bc35fc3f54cf8aa724e518180aa86488ecef2be603816bfac01"
+    },
+    {
+      "file": "bounce.gif",
+      "group": "images",
+      "family": "gif",
+      "title": "Bouncing ball, animated GIF",
+      "features": "24 frames with a palette each",
+      "path": "images/bounce.gif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 102524,
+      "sha256": "386425b57344417f2205ac176a3a72eaed208ad67e57f7cd304ab845bf27d83b"
+    },
+    {
+      "file": "scene.gif",
+      "group": "images",
+      "family": "gif",
+      "title": "Dusk landscape, dithered GIF",
+      "features": "256 colours, Floyd-Steinberg dithering",
+      "path": "images/scene.gif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 25539,
+      "sha256": "9680147c7fabe6ba25e464c9cd41fe6e45b73502e68e811ea7037922f8c33255"
+    },
+    {
+      "file": "scene.webp",
+      "group": "images",
+      "family": "webp",
+      "title": "Dusk landscape, lossy WebP",
+      "features": "VP8",
+      "path": "images/scene.webp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 9040,
+      "sha256": "c5a026e0341b0952e99af9ff4fa34de68e7ecc2da3326421e79a66639fef4787"
+    },
+    {
+      "file": "scene-lossless.webp",
+      "group": "images",
+      "family": "webp",
+      "title": "Dusk landscape, lossless WebP",
+      "features": "VP8L",
+      "path": "images/scene-lossless.webp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 18644,
+      "sha256": "7455a0e9ae36e7e9fb3f5b6ee094fcbece393dd9444d37cee3db785e36b01e79"
+    },
+    {
+      "file": "scene-alpha.webp",
+      "group": "images",
+      "family": "webp",
+      "title": "Landscape fading to transparent, WebP",
+      "features": "lossy colour with an alpha plane (VP8X, ALPH)",
+      "path": "images/scene-alpha.webp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 18784,
+      "sha256": "d62a7a8f0b2655221b84eec04c8adfd3d5f37a59425a706fa0eea900cc05b525"
+    },
+    {
+      "file": "bounce.webp",
+      "group": "images",
+      "family": "webp",
+      "title": "Bouncing ball, animated WebP",
+      "features": "24 frames",
+      "path": "images/bounce.webp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 20748,
+      "sha256": "edb4905dd92651bd42dbc3c15873913ec6bdca9a04afe83740565e082d90b84c"
+    },
+    {
+      "file": "scene-lzw.tif",
+      "group": "images",
+      "family": "tiff",
+      "title": "Dusk landscape, TIFF with LZW",
+      "features": "RGB, LZW, 300 dpi",
+      "path": "images/scene-lzw.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 96668,
+      "sha256": "b3a41a6e8e4644e2b2291a50e499fd9988b735932c6c27def20587c1f565bcaa"
+    },
+    {
+      "file": "scene-jpeg.tif",
+      "group": "images",
+      "family": "tiff",
+      "title": "Dusk landscape, TIFF with JPEG compression",
+      "features": "JPEG in TIFF (compression 7)",
+      "path": "images/scene-jpeg.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 57205,
+      "sha256": "c5add42f305af0ca4dcf2cd554dc973611ce1334e5e91ba2b38ec2c58a35e89b"
+    },
+    {
+      "file": "scene-cmyk-packbits.tif",
+      "group": "images",
+      "family": "tiff",
+      "title": "Landscape as a CMYK TIFF",
+      "features": "four inks, PackBits",
+      "path": "images/scene-cmyk-packbits.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 49730,
+      "sha256": "57d7dbd0c807d1bcd7064367051ff75cdedddc4109e85cf67450c6601ec48fbc"
+    },
+    {
+      "file": "gradient-grey16.tif",
+      "group": "images",
+      "family": "tiff",
+      "title": "Grey ramp, 16-bit TIFF",
+      "features": "16-bit greyscale, Deflate",
+      "path": "images/gradient-grey16.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 93424,
+      "sha256": "94c41cab542120478f4a7b97e694e8ddddd2520b022f9266a59bcf0e727baeea"
+    },
+    {
+      "file": "scene-pages.tif",
+      "group": "images",
+      "family": "tiff",
+      "title": "Three-page TIFF",
+      "features": "pages of 512, 256 and 128 pixels, the last in grey, Deflate",
+      "path": "images/scene-pages.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 84896,
+      "sha256": "9a8267875af78208d587777b341eb152d166b6acc10aede6d198d8e788ebd7a6"
+    },
+    {
+      "file": "fax-g4.tif",
+      "group": "images",
+      "family": "tiff-fax",
+      "title": "Fax cover sheet and register, CCITT Group 4 TIFF",
+      "features": "1-bit, 1728 by 2200 at 204 by 196 dpi, T.6",
+      "path": "images/fax-g4.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 22702,
+      "sha256": "c4efa355dc63ce59863446b62b960397f34ab3d3c04a212450d0c2bca5f3904a"
+    },
+    {
+      "file": "fax-g4-3pages.tif",
+      "group": "images",
+      "family": "tiff-fax",
+      "title": "Three-page fax, CCITT Group 4 TIFF",
+      "features": "three pages, T.6",
+      "path": "images/fax-g4-3pages.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 68092,
+      "sha256": "a94bc11060a7f2553803580c0feb779d1e59b032fd9f4406fbd4972765842cbb"
+    },
+    {
+      "file": "fax-g3-1d.tif",
+      "group": "unsupported",
+      "family": "tiff-fax",
+      "title": "Fax page, CCITT Group 3 (T.4, one-dimensional) TIFF",
+      "features": "kept to show the error: the TIFF decoder reads Group 4 only",
+      "path": "images/fax-g3-1d.tif",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 61464,
+      "sha256": "ee3c004c31ac0c49f045db053347a219bcce795a074931ad15463fc86fd208ed"
+    },
+    {
+      "file": "scene-24.bmp",
+      "group": "images",
+      "family": "bmp",
+      "title": "Dusk landscape, 24-bit BMP",
+      "features": "BI_RGB, bottom-up",
+      "path": "images/scene-24.bmp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 57654,
+      "sha256": "f3281d18d1f2944c7cb5f60eac3593facfbb3b77a0e5505e1ac88a9fdbefbfaa"
+    },
+    {
+      "file": "scene-8.bmp",
+      "group": "images",
+      "family": "bmp",
+      "title": "Dusk landscape, 8-bit BMP",
+      "features": "256-colour palette",
+      "path": "images/scene-8.bmp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 20278,
+      "sha256": "d8ac5f35b9b76cd509191ec7f5c4a48f8236c5ca4dcc88197810060b16f47ad2"
+    },
+    {
+      "file": "scene-32.bmp",
+      "group": "images",
+      "family": "bmp",
+      "title": "Dusk landscape, 32-bit BMP",
+      "features": "four channels",
+      "path": "images/scene-32.bmp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 76854,
+      "sha256": "1d99799f83adc1486eb1072502893ed39d91220d9e132a0716d56d9e05285d94"
+    },
+    {
+      "file": "scene-1bit.bmp",
+      "group": "images",
+      "family": "bmp",
+      "title": "Dusk landscape, 1-bit BMP",
+      "features": "two-colour palette",
+      "path": "images/scene-1bit.bmp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 24638,
+      "sha256": "cc5152076963ba9beca3d0a5ed8a4ebd5f082c127e780ef68a955ce4b71e8786"
+    },
+    {
+      "file": "scene-rle8.bmp",
+      "group": "images",
+      "family": "bmp",
+      "title": "Dusk landscape, 8-bit BMP with RLE compression",
+      "features": "BI_RLE8 with encoded and absolute runs",
+      "path": "images/scene-rle8.bmp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 10838,
+      "sha256": "2b1c69a7597006677e38cd8e32ad11f85acb0602ef228ec5c080d03350fc7936"
+    },
+    {
+      "file": "icon.ico",
+      "group": "images",
+      "family": "ico",
+      "title": "Icon with seven sizes",
+      "features": "16 to 256 pixels, PNG-coded images",
+      "path": "images/icon.ico",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 25530,
+      "sha256": "436e2c802c34d1c83b4492308ca660d4944eeb44fe32f6de87d3869e1c9e89ea"
+    },
+    {
+      "file": "icon-legacy.ico",
+      "group": "images",
+      "family": "ico",
+      "title": "Icon in the legacy bitmap coding",
+      "features": "32-bit and 8-bit DIBs with AND masks, and one PNG image",
+      "path": "images/icon-legacy.ico",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 14193,
+      "sha256": "0ded5b411cd2cf1ebd15cdecfa12a1e9f4a53b74da39fa263f935329efe399ec"
+    },
+    {
+      "file": "scene.ppm",
+      "group": "images",
+      "family": "pnm",
+      "title": "Dusk landscape, PPM (P6)",
+      "features": "binary pixmap with a comment",
+      "path": "images/scene.ppm",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 36893,
+      "sha256": "43949e7d7636ed5a7d552ad6fac28eb72487a70a1f63db7d944fb7e587612b40"
+    },
+    {
+      "file": "scene-ascii.ppm",
+      "group": "images",
+      "family": "pnm",
+      "title": "Dusk landscape, ASCII PPM (P3)",
+      "features": "text pixmap, 48 by 36",
+      "path": "images/scene-ascii.ppm",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 17916,
+      "sha256": "996f21e5c7c05ed1c586b9dc9882ad6fba9f1153ba23c49844c640eef647bf8a"
+    },
+    {
+      "file": "scene-grey16.pgm",
+      "group": "images",
+      "family": "pnm",
+      "title": "Landscape in grey, 16-bit PGM (P5)",
+      "features": "maxval 65535",
+      "path": "images/scene-grey16.pgm",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 24592,
+      "sha256": "059c3e7b9e22b0aa4247552139886564f9b36d66051ffc7957efd972f557b52c"
+    },
+    {
+      "file": "scene.pbm",
+      "group": "images",
+      "family": "pnm",
+      "title": "Landscape as a bitmap, PBM (P4)",
+      "features": "1 bit a pixel",
+      "path": "images/scene.pbm",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 6155,
+      "sha256": "648c9687dc2c226306c64aa945bf81170bbff5d8c9f88b0630b07b294d4e2edb"
+    },
+    {
+      "file": "scene-alpha.pam",
+      "group": "images",
+      "family": "pnm",
+      "title": "Landscape with alpha, PAM (P7)",
+      "features": "RGB_ALPHA tuples",
+      "path": "images/scene-alpha.pam",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 49220,
+      "sha256": "806cee6e77cbd0226f6ec3ab18de4259612a89c1df5ff5e27e37d4d5c932c515"
+    },
+    {
+      "file": "scene.qoi",
+      "group": "images",
+      "family": "qoi",
+      "title": "Dusk landscape, QOI",
+      "features": "three channels",
+      "path": "images/scene.qoi",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 38960,
+      "sha256": "d04c2ff91df0173bf20c495eb19555dc4bc9342b9ec7b61f653a4742c00b6188"
+    },
+    {
+      "file": "scene-alpha.qoi",
+      "group": "images",
+      "family": "qoi",
+      "title": "Landscape with alpha, QOI",
+      "features": "four channels",
+      "path": "images/scene-alpha.qoi",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 90838,
+      "sha256": "16a53b8756ab8dd663400cfa04dde6a598b6c608d345efd131c0d714cde8affb"
+    },
+    {
+      "file": "scene.ff",
+      "group": "images",
+      "family": "farbfeld",
+      "title": "Landscape with alpha, farbfeld",
+      "features": "16-bit RGBA, big-endian",
+      "path": "images/scene.ff",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 55312,
+      "sha256": "b6d250a92f39b7183b42191933d84da7e6ef1a33a971c8e7c2f8ccc85ad060d0"
+    },
+    {
+      "file": "sunset.hdr",
+      "group": "images",
+      "family": "hdr",
+      "title": "Sunset with a sun far brighter than the sky, Radiance HDR",
+      "features": "RGBE with run-length scanlines; the sun is 60 times white",
+      "path": "images/sunset.hdr",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 55026,
+      "sha256": "f65ffee0666792f829c6692ca1ef4a0a553304d06e28682f18a47de5efed7e9b"
+    },
+    {
+      "file": "sunset-flat.hdr",
+      "group": "images",
+      "family": "hdr",
+      "title": "Sunset, uncompressed Radiance HDR",
+      "features": "flat RGBE scanlines",
+      "path": "images/sunset-flat.hdr",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 49248,
+      "sha256": "a401df61e76cfdf88731294a4ba5ce1ba607ee294b5010a1312925240f5d2131"
+    },
+    {
+      "file": "scene-bc1.dds",
+      "group": "images",
+      "family": "dds",
+      "title": "Dusk landscape, DDS with BC1 (DXT1)",
+      "features": "full mipmap chain",
+      "path": "images/scene-bc1.dds",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 32904,
+      "sha256": "77d26e97cc0f532481e3e585321305aca44efd7694307f312d75b1c4bfecf8f8"
+    },
+    {
+      "file": "scene-bc3.dds",
+      "group": "images",
+      "family": "dds",
+      "title": "Landscape with alpha, DDS with BC3 (DXT5)",
+      "features": "full mipmap chain, alpha blocks",
+      "path": "images/scene-bc3.dds",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 65680,
+      "sha256": "9028c95d163d7283b357e3beb6a531a192087fcb76e7aeb1aead81195e4f4a92"
+    },
+    {
+      "file": "scene.jp2",
+      "group": "images",
+      "family": "jpeg2000",
+      "title": "Dusk landscape, JPEG 2000 (JP2)",
+      "features": "lossy, 3 quality layers, 5 resolutions, 256-pixel tiles, RPCL progression",
+      "path": "images/scene.jp2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 81825,
+      "sha256": "f90f58bb1e3ef0bfd48b9b55bffc293ee4f1fe506a6717f0052319a34621bf9a"
+    },
+    {
+      "file": "scene.j2k",
+      "group": "images",
+      "family": "jpeg2000",
+      "title": "Dusk landscape, bare JPEG 2000 codestream",
+      "features": "no JP2 boxes",
+      "path": "images/scene.j2k",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 49050,
+      "sha256": "949564fa2b811a1987a12989095289d673c2a4937f5014b0b9c1d7bfbe660b9c"
+    },
+    {
+      "file": "scene-grey.jp2",
+      "group": "images",
+      "family": "jpeg2000",
+      "title": "Landscape in grey, JPEG 2000",
+      "features": "one component",
+      "path": "images/scene-grey.jp2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 19629,
+      "sha256": "eb50ae4528e774c7ab9c427509faee07473249a89d35403c33afb2e5e9abf983"
+    },
+    {
+      "file": "scene-alpha.jp2",
+      "group": "images",
+      "family": "jpeg2000",
+      "title": "Landscape with alpha, JPEG 2000",
+      "features": "four components with an alpha channel",
+      "path": "images/scene-alpha.jp2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 78619,
+      "sha256": "bc1adbddf1bd608b71b1cac9dd1a47f47cde2c046a4202f1642cd15efa647825"
+    },
+    {
+      "file": "page-generic.jb2",
+      "group": "images",
+      "family": "jbig2",
+      "title": "Fax page as a JBIG2 file, generic region",
+      "features": "1-bit page of 1240 by 1579, arithmetic coding",
+      "path": "images/page-generic.jb2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 8595,
+      "sha256": "1447cbbc1ebab320062a78fa40f81ccf768aed3d9aea2cfa0583ebce2fb3e088"
+    },
+    {
+      "file": "page-symbol.jb2",
+      "group": "images",
+      "family": "jbig2",
+      "title": "Fax page as a JBIG2 file, symbol coding",
+      "features": "text region over a symbol dictionary",
+      "path": "images/page-symbol.jb2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 5577,
+      "sha256": "8fba2e640c71101dd5ab376008ea177ee0e8f2070c49250d31186c198991da9e"
+    },
+    {
+      "file": "scene-lossy.jxl",
+      "group": "images",
+      "family": "jpeg-xl",
+      "title": "Dusk landscape, JPEG XL, lossy",
+      "features": "VarDCT at distance 1",
+      "path": "images/scene-lossy.jxl",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 23664,
+      "sha256": "dc1e17bd77c26a49a3c61fcd8b299c79b71395550a4e1d42bc69af6aa33a200f"
+    },
+    {
+      "file": "scene-lossless.jxl",
+      "group": "images",
+      "family": "jpeg-xl",
+      "title": "Dusk landscape, JPEG XL, lossless",
+      "features": "modular mode",
+      "path": "images/scene-lossless.jxl",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 26223,
+      "sha256": "5f2ce3702bb3fe54bb31feb6f1a9e92347a9acd290a6a7730a3074fe5fb088fe"
+    },
+    {
+      "file": "scene-alpha.jxl",
+      "group": "images",
+      "family": "jpeg-xl",
+      "title": "Landscape with alpha, JPEG XL",
+      "features": "lossless with an extra alpha channel",
+      "path": "images/scene-alpha.jxl",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 35576,
+      "sha256": "d18698258dcc59292483265284a96099bc2c1f23f53f4893d778062070588166"
+    },
+    {
+      "file": "bounce.jxl",
+      "group": "images",
+      "family": "jpeg-xl",
+      "title": "Bouncing ball, animated JPEG XL",
+      "features": "24 frames",
+      "path": "images/bounce.jxl",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-images.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-images.py",
+        "args": []
+      },
+      "bytes": 61211,
+      "sha256": "679c04f1bec63d699c6baeb1d42dfa4ff205a40327f208f650115f7292e27f89"
+    },
+    {
+      "file": "house-plan.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "House, ground floor plan (DXF 2018)",
+      "features": "walls cut at openings with pattern hatches, door blocks with attributes, window and furniture blocks, axes with bubbles, room labels, linear, aligned, radius and angular dimensions, stair, north arrow, 17 layers, paper-space sheet with a viewport and a title block",
+      "path": "cad/house-plan.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 86949,
+      "sha256": "ad78cc54ad3c52483040b71dcb5cafda6f3660bdc9f229e21b22ece2cc773815"
+    },
+    {
+      "file": "house-plan-r2000.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "House, ground floor plan (DXF 2000)",
+      "features": "the same plan written as an AutoCAD 2000 file",
+      "path": "cad/house-plan-r2000.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 84233,
+      "sha256": "eabe480065538e478a22424b5d3b0427efd321e098f7e9cabe4ad332984ab033"
+    },
+    {
+      "file": "house-elevations.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "House, four elevations and a section in 2D",
+      "features": "gabled roofs with roof-tile hatches, plaster hatches, ground hatching, windows with transparent glass, steps, level marks, height dimensions, a hatched section with a stair",
+      "path": "cad/house-elevations.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 97170,
+      "sha256": "4ddb32c976e6709e39a4184a09c772ecff99324dcefd03e40a2cf7d89f62661f"
+    },
+    {
+      "file": "hatch-gallery.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Hatch gallery",
+      "features": "about a hundred predefined patterns, nine gradient types, islands in the three hatch styles, boundaries of lines, arcs, ellipses and splines, pattern angle and scale",
+      "path": "cad/hatch-gallery.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 145226,
+      "sha256": "0d9978ab422cfea65f91149502727f7132a3192450eedf52f90c9075f36b8cf4"
+    },
+    {
+      "file": "dimensions.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Dimension types",
+      "features": "linear, aligned, diameter, radius, arc length, angular (two lines and three points), ordinate, leaders, a multileader, tolerances, text override, three dimension styles",
+      "path": "cad/dimensions.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 56099,
+      "sha256": "515ccb26e3d707c2dc12192f147a4003dc44118d17da04d6f162250aa5935d87"
+    },
+    {
+      "file": "linetypes.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Linetypes, line weights and polylines",
+      "features": "the standard linetypes, custom ones with text inside, 12 line weights, per-entity scale, linetype generation, polylines with widths, circles, arcs, ellipses and splines in dashed styles",
+      "path": "cad/linetypes.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 36080,
+      "sha256": "0c8f9b53c105c230bad51a7fbad1af8972725fea449d638015c94467229c7cc0"
+    },
+    {
+      "file": "text-styles.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Text styles and MTEXT",
+      "features": "ten text styles (width and oblique factors, mirrored, upside down), justifications, rotation, special codes, Unicode, MTEXT colours, fonts, stacked fractions, underline, columns, background, nine attachment points",
+      "path": "cad/text-styles.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 30737,
+      "sha256": "e2c312052780d94fd25ad4205370645b143ceecde87d57dac2d471582cddeb3e"
+    },
+    {
+      "file": "blocks.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Blocks, nested inserts and arrays",
+      "features": "a block inside a block inside a block with attributes, mirrored, scaled and rotated inserts, a 3 by 8 array, BYBLOCK colours",
+      "path": "cad/blocks.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 30901,
+      "sha256": "419ffd35c1dd1d4ded3d70039dfa49852fa85cce935911b10a7a00557b967844"
+    },
+    {
+      "file": "bracket.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Mechanical part: an L bracket in three views",
+      "features": "centre and hidden lines, a section with hatching, dimensions with tolerances, diameter and radius dimensions, a leader, an A4 sheet with a title block",
+      "path": "cad/bracket.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 42633,
+      "sha256": "cd5d9676a8bb77c0702757674e17723202e3a614c38ca96ae8bd8f9c2ad1cfa9"
+    },
+    {
+      "file": "site-plan.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Site plan with contour lines",
+      "features": "closed spline contours, wide polyline roads, parcels with areas, hatched buildings, a gradient pond, spot heights, trees, scale bar, legend and north arrow",
+      "path": "cad/site-plan.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 85531,
+      "sha256": "c5bb9b26f9dbd785754d18854c1faef18fd360a8411f2244c3553d4c75a8baeb"
+    },
+    {
+      "file": "legacy-r12.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Gear in the R12 format",
+      "features": "POLYLINE, CIRCLE, ARC, TEXT, SOLID, 3DFACE and INSERT entities of the 1992 format",
+      "path": "cad/legacy-r12.dxf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-cad.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-cad.py",
+        "args": []
+      },
+      "bytes": 13965,
+      "sha256": "926e991c1389fcdf73d8aff413eb8b0c122943bf95f1667b31ba78b7db2a0723"
+    },
+    {
+      "file": "gear.stl",
+      "group": "3d",
+      "family": "stl",
+      "title": "Spur gear, binary STL with facet colours",
+      "features": "864 facets, orange teeth and blue hub through the VisCAM colour attribute",
+      "path": "models/gear.stl",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 43284,
+      "sha256": "aac8dd0d87fed7b77061d32a5bbe61ac90cbfef16130b7c35730cdc1e77e93c9"
+    },
+    {
+      "file": "bracket-ascii.stl",
+      "group": "3d",
+      "family": "stl",
+      "title": "L bracket, ASCII STL",
+      "features": "text STL, three overlapping boxes",
+      "path": "models/bracket-ascii.stl",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 8980,
+      "sha256": "dd4b8c55140214fe71a8200d4fe2ae7b51f53e6ab6184e82e79b3d2d12c708f9"
+    },
+    {
+      "file": "knot.obj",
+      "group": "3d",
+      "family": "obj",
+      "title": "Trefoil knot and base, OBJ with vertex colours",
+      "features": "two objects (knot, base), a colour and a normal per vertex, quads, a rainbow along the knot",
+      "path": "models/knot.obj",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 100272,
+      "sha256": "a2eaba271264d700edc372eaaa6944d342fe9b823c98e698b1445846bded3bf1"
+    },
+    {
+      "file": "terrain.ply",
+      "group": "3d",
+      "family": "ply",
+      "title": "Height field, binary PLY with colours",
+      "features": "2304 vertices with normals and a hypsometric colour each, 4418 triangles",
+      "path": "models/terrain.ply",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 119979,
+      "sha256": "22c2f25d47c43841c1ed1327c6fb9e75725925ca1e3c61dc413c23319dcfde52"
+    },
+    {
+      "file": "icosphere-ascii.ply",
+      "group": "3d",
+      "family": "ply",
+      "title": "Icosphere, ASCII PLY with colours",
+      "features": "text PLY with normals and RGBA per vertex",
+      "path": "models/icosphere-ascii.ply",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 14774,
+      "sha256": "dbe5ae97077d8177503d5bab7d83fbc3f0a943181384fbffc68db7a4930f19be"
+    },
+    {
+      "file": "arm.glb",
+      "group": "3d",
+      "family": "glb",
+      "title": "Articulated arm in a glass dome, GLB",
+      "features": "node tree with rotations and scales, five materials, a metallic and a transparent one, vertex colours on the floor",
+      "path": "models/arm.glb",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 29036,
+      "sha256": "146ba6e29d9b8bf4ec57c72bde686a5119b80cfe4365f05f0f0b7004b066a7b7"
+    },
+    {
+      "file": "table.gltf",
+      "group": "3d",
+      "family": "gltf",
+      "title": "Table and two chairs, glTF with an embedded buffer",
+      "features": "17 nodes, a data URI buffer, shared meshes instanced under several nodes",
+      "path": "models/table.gltf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-models.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-models.py",
+        "args": []
+      },
+      "bytes": 7768,
+      "sha256": "ae656d2f656968fa44870ffc539d2383b85725289feb90e658881c5825bb7ef4"
+    },
+    {
+      "file": "field-report.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "Field report, six pages",
+      "features": "a table of contents whose lines are links, a two-level outline, roman and arabic page labels, internal and external links, a table, bar, line and pie charts as vectors, a JPEG, standard and embedded fonts (Latin, Greek, Cyrillic), document information",
+      "path": "pdf/field-report.pdf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-pdf.py",
+        "args": []
+      },
+      "bytes": 107001,
+      "sha256": "75b7649d62fb12034d56478c98baa92beba3c0a2117ce0cfcfffa9233d060a5b"
+    },
+    {
+      "file": "application-form.pdf",
+      "group": "pdf",
+      "family": "pdf-form",
+      "title": "Berth application form (AcroForm)",
+      "features": "text fields (multiline, maximum length, password, read-only), check boxes, radio buttons, a drop-down list, a list box, some filled in",
+      "path": "pdf/application-form.pdf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-pdf.py",
+        "args": []
+      },
+      "bytes": 19127,
+      "sha256": "883dff8626a2a95d66d74bd8876ceee621197902de671b7c036d39e21774c50b"
+    },
+    {
+      "file": "annotations.pdf",
+      "group": "pdf",
+      "family": "pdf-annotations",
+      "title": "Annotations without appearance streams",
+      "features": "links to a URL, a page and a named destination, highlight, underline, strike-out, squiggly, note, free text, square, circle, line with arrows, polygon, polyline, ink, stamp, file attachment, an outline and a named destination",
+      "path": "pdf/annotations.pdf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-pdf.py",
+        "args": []
+      },
+      "bytes": 6245,
+      "sha256": "212ea14f43e151d2d477b73659ef4fdb50735ee337eb76283d065ba9ec1701e9"
+    },
+    {
+      "file": "scan-mixed.pdf",
+      "group": "pdf",
+      "family": "pdf-scan",
+      "title": "Scanned letters, one page for each scanner image filter",
+      "features": "four pages: DCTDecode (JPEG), CCITTFaxDecode (Group 4), JBIG2Decode and JPXDecode (JPEG 2000), each with an invisible OCR text layer; the viewer decodes the last three with its own decoders",
+      "path": "pdf/scan-mixed.pdf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-pdf.py",
+        "args": [],
+        "tools": [
+          "opj_compress",
+          "jbig2",
+          "tiffcp"
+        ]
+      },
+      "bytes": 206092,
+      "sha256": "daeb8cab36d82d4e5391041effc7d37dddf2421a87c3853c4b763e4a4d534776"
+    },
+    {
+      "file": "vector-art.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "Vector art",
+      "features": "axial and radial shadings, transparency, a clipping path, dashes, caps and joins, Bezier curves, an even-odd fill, text with render modes, rotated and scaled text",
+      "path": "pdf/vector-art.pdf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-pdf.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-pdf.py",
+        "args": []
+      },
+      "bytes": 4368,
+      "sha256": "fad466f385e89bc008128072d0b16544144c8a42983afd5d444079e59519e08e"
+    },
+    {
+      "file": "handbook.docx",
+      "group": "office",
+      "family": "docx",
+      "title": "Harbour handbook (Word)",
+      "features": "title page, table of contents with links, outline numbering, character and paragraph styles, bulleted and numbered lists of three levels, tables with merged cells and a repeated header, two pictures (one floating with wrapped text), a shape, footnotes, hyperlinks, bookmarks, fields, a comment, tracked changes, a two-column section, a landscape section with a wide table, headers and footers with page numbers",
+      "path": "office/handbook.docx",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 25180,
+      "sha256": "46c4fb53949dbd25cfc8b1fecbbd282d470b767d16c1fea426394872fcffc95d"
+    },
+    {
+      "file": "workbook.xlsx",
+      "group": "office",
+      "family": "xlsx",
+      "title": "Harbour workbook (Excel)",
+      "features": "three sheets: a budget with formulas (SUM, AVERAGE, INDEX, MATCH, COUNTIF, IF, VLOOKUP, ROUND), currency, percent and date formats, merged title, frozen header rows, a validation list, a comment, a hyperlink and named ranges; 120 rows of sales with an autofilter; a bar, a line and a pie chart",
+      "path": "office/workbook.xlsx",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 23363,
+      "sha256": "3e3e0247bde87b6fa1c6f9b06f0561f2eae8bc326925b4b28ba2d7d3b8c12792"
+    },
+    {
+      "file": "deck.pptx",
+      "group": "office",
+      "family": "pptx",
+      "title": "Harbour review (PowerPoint)",
+      "features": "five slides: a gradient title slide, nested bullets, a native bar chart with a callout, a table, a picture with shapes, gradients and arrows; a master with footer and slide number; speaker notes (not shown) and transitions",
+      "path": "office/deck.pptx",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 30490,
+      "sha256": "160962428c7f1d15c8865d51fef7e74ebc8ccc6782f60ea4bf08ed0a805a7edb"
+    },
+    {
+      "file": "handbook-tagged.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "Harbour handbook as a tagged PDF/A-2",
+      "features": "bookmarks from the headings, hyperlinks, tags, footnotes, a landscape section, embedded Liberation fonts",
+      "path": "pdf/handbook-tagged.pdf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 192239,
+      "sha256": "c88a1434c1cbf8a8af467325bb413463276bbe70c84b5f88760638ff5975773d"
+    },
+    {
+      "file": "handbook.doc",
+      "group": "converted",
+      "family": "doc",
+      "title": "Harbour handbook (Word 97 to 2003)",
+      "features": "the handbook as a binary .doc",
+      "path": "converted/handbook.doc",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 67584,
+      "sha256": "807c9b812188d73b3558ea8b91360d7a39eb637a18172295f206612da92cce39"
+    },
+    {
+      "file": "handbook.odt",
+      "group": "converted",
+      "family": "odt",
+      "title": "Harbour handbook (OpenDocument text)",
+      "features": "the handbook as .odt",
+      "path": "converted/handbook.odt",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 42008,
+      "sha256": "d28f2667008ebd0e9456f7900eb4af8dbbd10b5af7490a059d6868d468c475ce"
+    },
+    {
+      "file": "handbook.fodt",
+      "group": "converted",
+      "family": "fodt",
+      "title": "Harbour handbook (flat OpenDocument text)",
+      "features": "one XML file, pictures in base64; written by hand, not converted",
+      "path": "converted/handbook.fodt",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 78095,
+      "sha256": "7c9f74181b5c9ad2b4766d5e3c82d9edf2c1cdd370417d0f8592d00ec71beec9"
+    },
+    {
+      "file": "handbook.rtf",
+      "group": "converted",
+      "family": "rtf",
+      "title": "Harbour handbook (Rich Text Format)",
+      "features": "the handbook as .rtf",
+      "path": "converted/handbook.rtf",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 95772,
+      "sha256": "04eea9909d09ed87fb621459f1ac6e024b094eb767c1d0f7d536dd76f0b82e43"
+    },
+    {
+      "file": "workbook.xls",
+      "group": "converted",
+      "family": "xls",
+      "title": "Harbour workbook (Excel 97 to 2003)",
+      "features": "the workbook as a binary .xls",
+      "path": "converted/workbook.xls",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 29696,
+      "sha256": "8552c433665e927723ecb747c5a0e1696076964f1bfd20ddd30bc3b95cc97e19"
+    },
+    {
+      "file": "workbook.ods",
+      "group": "converted",
+      "family": "ods",
+      "title": "Harbour workbook (OpenDocument spreadsheet)",
+      "features": "the workbook as .ods",
+      "path": "converted/workbook.ods",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 45583,
+      "sha256": "32b0cf2984ddef9c2209d4cdb874866a65217d0b6bcdd3417264982ef07d660a"
+    },
+    {
+      "file": "workbook.fods",
+      "group": "converted",
+      "family": "fods",
+      "title": "Harbour workbook (flat OpenDocument spreadsheet)",
+      "features": "one XML file; written by hand, not converted",
+      "path": "converted/workbook.fods",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 120795,
+      "sha256": "80f5ad00faf7555d5aab526226204658880127a91f0af62a439d106c7a52e1be"
+    },
+    {
+      "file": "deck.ppt",
+      "group": "converted",
+      "family": "ppt",
+      "title": "Harbour review (PowerPoint 97 to 2003)",
+      "features": "the deck as a binary .ppt (its thumbnail makes it large)",
+      "path": "converted/deck.ppt",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 491520,
+      "sha256": "8a6285ae02086db5ddb3246c75ef08a3508f672a91ba38b30efae291e119fb1e"
+    },
+    {
+      "file": "deck.odp",
+      "group": "converted",
+      "family": "odp",
+      "title": "Harbour review (OpenDocument presentation)",
+      "features": "the deck as .odp",
+      "path": "converted/deck.odp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 72325,
+      "sha256": "e194842a5abfb245477c00eee30736ef7f8460606b62b887bf8392283b41dd07"
+    },
+    {
+      "file": "deck.fodp",
+      "group": "converted",
+      "family": "fodp",
+      "title": "Harbour review (flat OpenDocument presentation)",
+      "features": "one XML file; written by hand, not converted",
+      "path": "converted/deck.fodp",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 31777,
+      "sha256": "07da109d15eceb65d7a0601998ed9508ecd140d5aef311301c96e7aad6faa236"
+    },
+    {
+      "file": "diagram.odg",
+      "group": "converted",
+      "family": "odg",
+      "title": "Flowchart (OpenDocument drawing)",
+      "features": "two pages, layers (one hidden), connectors glued to shapes, groups, gradients, a curve and a polyline, shadows, dashes",
+      "path": "converted/diagram.odg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": [
+          "soffice"
+        ]
+      },
+      "bytes": 26758,
+      "sha256": "8c80d0ef2e536db14a7e5a92fc0092ab4f0976c87a091875899d3a7655f5b56e"
+    },
+    {
+      "file": "diagram.fodg",
+      "group": "converted",
+      "family": "fodg",
+      "title": "Flowchart (flat OpenDocument drawing)",
+      "features": "one XML file; written by hand, not converted",
+      "path": "converted/diagram.fodg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-office.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-office.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 14205,
+      "sha256": "52ed359ccb0acec09a2d7401129021ff3f0ad69e35c770eab33986f063924203"
+    },
+    {
+      "file": "field-guide.md",
+      "group": "text",
+      "family": "markdown",
+      "title": "Field guide to Markdown",
+      "features": "headings of six levels, nested and task lists, quotes, an aligned table, fenced code with languages, footnotes, links and references, inline HTML, Unicode",
+      "path": "text/field-guide.md",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 2368,
+      "sha256": "0f65f0bb537b18b6d5b1ec88da73686350e31d6529bb78a682aaa93d755e9f49"
+    },
+    {
+      "file": "field-notes.txt",
+      "group": "text",
+      "family": "text",
+      "title": "Plain text with tabs, a long line and pangrams in nine scripts",
+      "features": "Latin, Greek, Cyrillic, Japanese, Arabic and Hebrew text, box drawing, symbols, no final newline",
+      "path": "text/field-notes.txt",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1632,
+      "sha256": "12054040d6aef17fff17a18adf238fee6fd4158eeefd1d1230108fbd0f03df11"
+    },
+    {
+      "file": "recipes.json",
+      "group": "text",
+      "family": "json",
+      "title": "A small recipe book as JSON",
+      "features": "nested objects and arrays, numbers of every kind, null, booleans, escapes, empty values",
+      "path": "text/recipes.json",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 2457,
+      "sha256": "9662568867ec0629cb9c18897f1bff96f2b837cc7f89f0840f25f1e1f3e8f69c"
+    },
+    {
+      "file": "config.yaml",
+      "group": "text",
+      "family": "yaml",
+      "title": "Configuration file, YAML",
+      "features": "mappings, lists, block scalars, anchors and aliases, comments",
+      "path": "text/config.yaml",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 585,
+      "sha256": "398192bf091eeedd240dca6116180ef291ea95d7ee1c20e2e9853505d62854c9"
+    },
+    {
+      "file": "pyproject.toml",
+      "group": "text",
+      "family": "toml",
+      "title": "Project file, TOML",
+      "features": "tables, arrays of tables, inline values",
+      "path": "text/pyproject.toml",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 440,
+      "sha256": "abcdc7dd5ef4d56589629b5c88d8b9a7931a84ddebd60c6b19f9f3b45349fb03"
+    },
+    {
+      "file": "feed.xml",
+      "group": "text",
+      "family": "xml",
+      "title": "Atom feed",
+      "features": "namespaces, CDATA, an XHTML content element, entities, comments",
+      "path": "text/feed.xml",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1330,
+      "sha256": "6cddabc37cc985205a2c04b4863fe3514695a5ef437e710463d15a597eb54560"
+    },
+    {
+      "file": "route.gpx",
+      "group": "text",
+      "family": "xml",
+      "title": "Coastal walk, GPX track",
+      "features": "60 track points with elevation and time, two waypoints",
+      "path": "text/route.gpx",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 6491,
+      "sha256": "fcafdec4e3a6819fa406e98590dd7ede302bf76cbc6a2080f08542438d08524e"
+    },
+    {
+      "file": "places.kml",
+      "group": "text",
+      "family": "xml",
+      "title": "Places, KML",
+      "features": "a point, a line and a polygon, a shared style, HTML in CDATA",
+      "path": "text/places.kml",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1035,
+      "sha256": "9bb4a018a5c1f00843e61af1c475c1a735898f73950689b9ce36f9bdeb7879b8"
+    },
+    {
+      "file": "harbour-log.csv",
+      "group": "text",
+      "family": "csv",
+      "title": "Harbour log, 300 rows of CSV",
+      "features": "nine columns, quoted fields with commas, quotes and line breaks, accents",
+      "path": "text/harbour-log.csv",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 19962,
+      "sha256": "d4e07a9e0b1aec65f189c8897fa27e1daf24189c3c204fb9527f2bf75d22e314"
+    },
+    {
+      "file": "tides.tsv",
+      "group": "text",
+      "family": "csv",
+      "title": "Tide table, tab-separated values",
+      "features": "28 rows, six columns",
+      "path": "text/tides.tsv",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 833,
+      "sha256": "eff347351015e329e7904aebc8f334de5ab16cfda7a6b4c6b2575d25ac06fd68"
+    },
+    {
+      "file": "prix.csv",
+      "group": "text",
+      "family": "csv",
+      "title": "Price list in the European style",
+      "features": "semicolon separator, decimal commas, accented headers",
+      "path": "text/prix.csv",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 255,
+      "sha256": "d490f1d9c26d7218e9937591baf5688d9846303fb6942a5e3c60417c1647b91d"
+    },
+    {
+      "file": "life.py",
+      "group": "text",
+      "family": "source",
+      "title": "Conway's Game of Life, Python",
+      "features": "docstrings, comprehensions, f-strings, a main guard",
+      "path": "text/life.py",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1069,
+      "sha256": "2cfc1e34f435d1ee59d3b01e5567bf61034df38a7257e9fed4f1fbdf9436e19e"
+    },
+    {
+      "file": "lru.rs",
+      "group": "text",
+      "family": "source",
+      "title": "A least-recently-used cache, Rust",
+      "features": "generics, trait bounds, closures, a test module",
+      "path": "text/lru.rs",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1592,
+      "sha256": "1e2181c4c51e88e4255f391fce16a9d657560408b728df079274804674ab1acb"
+    },
+    {
+      "file": "tokens.ts",
+      "group": "text",
+      "family": "source",
+      "title": "Arithmetic tokenizer and evaluator, TypeScript",
+      "features": "union types, a sticky regular expression, the shunting-yard algorithm",
+      "path": "text/tokens.ts",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 2262,
+      "sha256": "3587b167a990c8ec02b14477721b4259431f39b432556a6cd86afc8cd2f525c2"
+    },
+    {
+      "file": "bits.c",
+      "group": "text",
+      "family": "source",
+      "title": "Bit tricks on 32-bit words, C",
+      "features": "static functions, hexadecimal literals, printf formats",
+      "path": "text/bits.c",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1463,
+      "sha256": "dc7eab8de40430eb6ed22610c37fd2b13df11e69cc70f6d9e2718514e589a6d5"
+    },
+    {
+      "file": "report.sql",
+      "group": "text",
+      "family": "source",
+      "title": "Monthly report with window functions, SQL",
+      "features": "DDL, a CTE, lag, rank and sum over windows, joins",
+      "path": "text/report.sql",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1287,
+      "sha256": "99688fcab08ea4876cee7a5d3352abbbd23d230c8c17bc4bbebeea276cf2bd9a"
+    },
+    {
+      "file": "deploy.sh",
+      "group": "text",
+      "family": "source",
+      "title": "Build and deploy script, Bash",
+      "features": "strict mode, traps, functions, process substitution, a case statement",
+      "path": "text/deploy.sh",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 989,
+      "sha256": "a304fad73e5636d1caf340cfeca167e01905df2a31fc7abca661e8b8131375c7"
+    },
+    {
+      "file": "style.css",
+      "group": "text",
+      "family": "source",
+      "title": "A small stylesheet, CSS",
+      "features": "custom properties, grid, clamp, color-mix, a dark mode and a media query",
+      "path": "text/style.css",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1165,
+      "sha256": "7918765d12e41edd33e5a0eb2b7dba28c5429c3a517f086fcc8722f0306920c0"
+    },
+    {
+      "file": "page.html",
+      "group": "text",
+      "family": "html",
+      "title": "A page, shown as its source, HTML",
+      "features": "semantic elements, a table, a form, a style and a script that do not run",
+      "path": "text/page.html",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 1116,
+      "sha256": "82dd9087ee3afdb2c5443f2a9fb8100500a1633f2e0bdffc2630a8be8387c678"
+    },
+    {
+      "file": "changes.diff",
+      "group": "text",
+      "family": "diff",
+      "title": "A unified diff of two files",
+      "features": "two files, three hunks, added and removed lines",
+      "path": "text/changes.diff",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 879,
+      "sha256": "e0d7a274666b4f411cd8a5b7318736c37ad7993db25b884c4c9100e13a1391d6"
+    },
+    {
+      "file": "subtitles.srt",
+      "group": "text",
+      "family": "text",
+      "title": "Subtitles, SubRip",
+      "features": "six cues with a tag",
+      "path": "text/subtitles.srt",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 338,
+      "sha256": "b4e25a1b12f662df624ae81c2c8bd89a8951e338688d2ea2cce55134c5de3161"
+    },
+    {
+      "file": "server.log",
+      "group": "text",
+      "family": "text",
+      "title": "A server log of 120 lines",
+      "features": "INFO, WARN and ERROR lines",
+      "path": "text/server.log",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-text.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-text.py",
+        "args": []
+      },
+      "bytes": 9084,
+      "sha256": "d7e982445e5d36a398533f671c0e7d0f758b47ff406798631924b037a64f6d95"
+    },
+    {
+      "file": "sample.zip",
+      "group": "archives",
+      "family": "zip",
+      "title": "Zip with folders, stored and deflated members, Unicode names and a comment",
+      "features": "9 files in 5 folders, an empty folder",
+      "path": "archives/sample.zip",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 15824,
+      "sha256": "ad98593f9dc85d5dad309140ce703f96b36da749e48ea6648ce10c53a418250d"
+    },
+    {
+      "file": "sample.tar",
+      "group": "archives",
+      "family": "tar",
+      "title": "Tar (ustar) with folders and a symbolic link",
+      "features": "16 entries",
+      "path": "archives/sample.tar",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 51200,
+      "sha256": "b31804242af3545fd922934e81a2aade8fd09a7e2648fe26b41cd32dc37e1fb8"
+    },
+    {
+      "file": "sample.tar.gz",
+      "group": "archives",
+      "family": "tar.gz",
+      "title": "Tar compressed with gzip",
+      "features": "the tar opens inside the gzip",
+      "path": "archives/sample.tar.gz",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 15648,
+      "sha256": "5c423a4e7e0d96e025bb871034a88308f1d32861f60826074c29aa121fcdecca"
+    },
+    {
+      "file": "sample.tar.bz2",
+      "group": "archives",
+      "family": "tar.bz2",
+      "title": "Tar compressed with bzip2",
+      "features": "the tar opens inside the bzip2 stream",
+      "path": "archives/sample.tar.bz2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 14648,
+      "sha256": "99b6742b5c54a36261f06a24032c22c11ed84b01e40e2267ef338b15ca181fcf"
+    },
+    {
+      "file": "sample.tar.xz",
+      "group": "archives",
+      "family": "tar.xz",
+      "title": "Tar compressed with xz",
+      "features": "the tar opens inside the xz stream",
+      "path": "archives/sample.tar.xz",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 13772,
+      "sha256": "762ce440ee2dfd2f4d22a6d29f2535e7079ad21d461d7fce3167cd62a9f356bf"
+    },
+    {
+      "file": "sample.tar.zst",
+      "group": "archives",
+      "family": "tar.zst",
+      "title": "Tar compressed with Zstandard",
+      "features": "level 19",
+      "path": "archives/sample.tar.zst",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "zstd"
+        ]
+      },
+      "bytes": 14331,
+      "sha256": "d134793d16db00229eb192be488ef248a7c3e1226d9d27b67d8a763cd9b0641d"
+    },
+    {
+      "file": "server.log.gz",
+      "group": "archives",
+      "family": "gz",
+      "title": "A log compressed with gzip",
+      "features": "one member, no tar",
+      "path": "archives/server.log.gz",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 1331,
+      "sha256": "9f80faaae63eb4ae0a3a68c1346966049cb6ad5eba17e9c8600eb404ced75922"
+    },
+    {
+      "file": "server.log.bz2",
+      "group": "archives",
+      "family": "bz2",
+      "title": "A log compressed with bzip2",
+      "features": "one member, no tar",
+      "path": "archives/server.log.bz2",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 1155,
+      "sha256": "4b235dc9fc1a2840be3dd7ed792c7e4bc373851130e7122de3e798e7061b39c4"
+    },
+    {
+      "file": "server.log.xz",
+      "group": "archives",
+      "family": "xz",
+      "title": "A log compressed with xz",
+      "features": "one member, no tar",
+      "path": "archives/server.log.xz",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 820,
+      "sha256": "7dec383660d188a36f28cae361ebb809914849ddf10a508fc47503f367c1e86c"
+    },
+    {
+      "file": "sample.7z",
+      "group": "archives",
+      "family": "7z",
+      "title": "7z with LZMA2",
+      "features": "a solid archive of 9 files",
+      "path": "archives/sample.7z",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "7z"
+        ]
+      },
+      "bytes": 13642,
+      "sha256": "7a2df3dd03ae207f3be0175190e3795662753e701d36555cd06e7295a72483c9"
+    },
+    {
+      "file": "sample.rar",
+      "group": "archives",
+      "family": "rar",
+      "title": "RAR 5 with stored members",
+      "features": "folders, CRC32 and Unix modes, written by the script from the format's documentation (no RAR program)",
+      "path": "archives/sample.rar",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 35056,
+      "sha256": "71aa4939bc7f2e4a98cc484e7353b829ad8a5019b1dee3911e8df3548e317c90"
+    },
+    {
+      "file": "sample.iso",
+      "group": "archives",
+      "family": "iso",
+      "title": "ISO 9660 image with Joliet and Rock Ridge",
+      "features": "volume EXAV_EXAMPLE, long and Unicode names",
+      "path": "archives/sample.iso",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "genisoimage"
+        ]
+      },
+      "bytes": 133120,
+      "sha256": "baa0c331dc2f1f8e3f04c171282faf7753a38d380e82e0ca894c70a04f08d4c0"
+    },
+    {
+      "file": "matryoshka.zip",
+      "group": "archives",
+      "family": "zip",
+      "title": "Nested archives: a zip holding a tar.gz holding a 7z holding a zip",
+      "features": "four levels, opened in place one after the other",
+      "path": "archives/matryoshka.zip",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "7z"
+        ]
+      },
+      "bytes": 7232,
+      "sha256": "0c4d4171bd6cd565a17ff675763cebf6c8d8c9408ebd6c738d436feab6cb42e9"
+    },
+    {
+      "file": "encrypted-aes.zip",
+      "group": "archives",
+      "family": "zip",
+      "title": "Zip encrypted with AES-256, password: exav",
+      "features": "names are listed, each member says it is encrypted",
+      "path": "archives/encrypted-aes.zip",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "7z"
+        ]
+      },
+      "bytes": 16604,
+      "sha256": "e6cd983b8b1694a5df2c2f7d7790a249e4e9c529cb0d796e6d05de7a4bb03bd0"
+    },
+    {
+      "file": "encrypted-zipcrypto.zip",
+      "group": "archives",
+      "family": "zip",
+      "title": "Zip encrypted with the traditional ZipCrypto, password: exav",
+      "features": "names are listed, each member says it is encrypted",
+      "path": "archives/encrypted-zipcrypto.zip",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "7z"
+        ]
+      },
+      "bytes": 16262,
+      "sha256": "21053827c2871cda2d2f6259dc1d3848e318b40c0e71858220d601fc3c90767c"
+    },
+    {
+      "file": "encrypted.7z",
+      "group": "archives",
+      "family": "7z",
+      "title": "7z encrypted with AES-256, password: exav",
+      "features": "file names visible, contents encrypted",
+      "path": "archives/encrypted.7z",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "7z"
+        ]
+      },
+      "bytes": 13726,
+      "sha256": "c2606ee4ee72de0d9ba1461ba976c5ac20de157b6b17771372bd6acf221cc6ce"
+    },
+    {
+      "file": "example.jar",
+      "group": "archives",
+      "family": "jar",
+      "title": "A jar (a zip with a manifest)",
+      "features": "META-INF/MANIFEST.MF, a source file, a properties file",
+      "path": "archives/example.jar",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 793,
+      "sha256": "44aeabd990d5a5c75f88846f5310ad44a9b56deadde592ec3d932cf13476ff45"
+    },
+    {
+      "file": "pages.cbz",
+      "group": "archives",
+      "family": "cbz",
+      "title": "Comic book archive (zip of pages)",
+      "features": "two page images and ComicInfo.xml",
+      "path": "archives/pages.cbz",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": []
+      },
+      "bytes": 10720,
+      "sha256": "82dc884486eec4ca4fbeb3c016d6431848d0a2ccd843ab6e65972503524b0723"
+    },
+    {
+      "file": "sample.cab",
+      "group": "archives",
+      "family": "cab",
+      "title": "Microsoft cabinet",
+      "features": "four files, MSZIP",
+      "path": "archives/sample.cab",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "gcab"
+        ]
+      },
+      "bytes": 6284,
+      "sha256": "5f12d6c186b5cc81f70dc4b3d4a4d7b4b7bdebb74f002ada9067b4738589de00"
+    },
+    {
+      "file": "exav-example.deb",
+      "group": "archives",
+      "family": "deb",
+      "title": "Debian package",
+      "features": "an ar archive of debian-binary, control.tar.xz and data.tar.xz",
+      "path": "archives/exav-example.deb",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "dpkg-deb"
+        ]
+      },
+      "bytes": 2256,
+      "sha256": "d73cac532f34c9948bc596e1241189b66d4d4497af030d766bbb451b4ab1adea"
+    },
+    {
+      "file": "libexample.a",
+      "group": "archives",
+      "family": "ar",
+      "title": "Unix ar archive",
+      "features": "two members",
+      "path": "archives/libexample.a",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "ar"
+        ]
+      },
+      "bytes": 1988,
+      "sha256": "59396e78830b3119a01419e202810446dc15c312cf4b91727170b181d0afaf3e"
+    },
+    {
+      "file": "sample.cpio",
+      "group": "archives",
+      "family": "cpio",
+      "title": "cpio archive (newc)",
+      "features": "four files",
+      "path": "archives/sample.cpio",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-archives.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-archives.py",
+        "args": [],
+        "tools": [
+          "cpio"
+        ]
+      },
+      "bytes": 7168,
+      "sha256": "aab3c3fdd392a978d0a516e5a420bbed6b97c203966c1ed275d7246a93ab9827"
+    },
+    {
+      "file": "canon.wav",
+      "group": "media",
+      "family": "wav",
+      "title": "A four-voice canon, WAV",
+      "features": "8 kHz mono 16-bit, 8.4 seconds, synthesised",
+      "path": "media/canon.wav",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 134444,
+      "sha256": "c26b3aa385a70bb6785c7eb36b0bf3fe04a379fe46294d77d29ad153d0cc1028"
+    },
+    {
+      "file": "canon.mp3",
+      "group": "media",
+      "family": "mp3",
+      "title": "The canon as MP3",
+      "features": "24 kbit/s",
+      "path": "media/canon.mp3",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 25920,
+      "sha256": "c9f569a2833d11af90232c2f950c865f02bfbcc5822fc35cccb7466dd9c46c49"
+    },
+    {
+      "file": "canon.flac",
+      "group": "media",
+      "family": "flac",
+      "title": "The canon as FLAC",
+      "features": "lossless, level 8",
+      "path": "media/canon.flac",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 74904,
+      "sha256": "c3dd10ace8ccaacb09f74ca73619e0d991ff94ce3d25fdc20ee9fb4597bc8a63"
+    },
+    {
+      "file": "canon.ogg",
+      "group": "media",
+      "family": "ogg",
+      "title": "The canon as Ogg Vorbis",
+      "features": "quality 2",
+      "path": "media/canon.ogg",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 14618,
+      "sha256": "39c1dabbcadc817bfa1fc76839b1ee6940bab7187dffd4c495a5f61362cb91ad"
+    },
+    {
+      "file": "canon.opus",
+      "group": "media",
+      "family": "opus",
+      "title": "The canon as Opus",
+      "features": "16 kbit/s",
+      "path": "media/canon.opus",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 16274,
+      "sha256": "e18075a4586929741c6bf264c92e8f7f35086f5e4ab2f3be58845835556bc9ae"
+    },
+    {
+      "file": "canon.m4a",
+      "group": "media",
+      "family": "m4a",
+      "title": "The canon as AAC in MP4",
+      "features": "24 kbit/s",
+      "path": "media/canon.m4a",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 25066,
+      "sha256": "edd56750fd23edd327a46ea907c9d34d53fcff6e04f2d0516a1083ea2c7306e5"
+    },
+    {
+      "file": "testcard.mp4",
+      "group": "media",
+      "family": "mp4",
+      "title": "Test card with a clock, H.264 and AAC in MP4",
+      "features": "256 by 192, 12 frames a second, 4 seconds, with the canon as sound",
+      "path": "media/testcard.mp4",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 41946,
+      "sha256": "ad088934ae59962bafc0b9b56a57556623d5e2b7821869e2dc91047573213a12"
+    },
+    {
+      "file": "testcard.webm",
+      "group": "media",
+      "family": "webm",
+      "title": "Test card with a clock, VP9 and Opus in WebM",
+      "features": "256 by 192, 12 frames a second, 4 seconds, with the canon as sound",
+      "path": "media/testcard.webm",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-media.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-media.py",
+        "args": [],
+        "tools": [
+          "ffmpeg"
+        ]
+      },
+      "bytes": 42004,
+      "sha256": "dca14e93bb8e3448a5d9a61fbbe402a7cf2b0c8f476a13b98f5649d079a1b7b8"
+    },
+    {
+      "file": "house.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "Two-storey house (IFC4)",
+      "features": "walls with openings filled by windows and doors, slabs, a gable roof, porch columns, a stair of eleven steps, a table and chairs sharing a mapped representation, spaces, a property set, a material and colours",
+      "path": "ifc/house.ifc",
+      "committed": true,
+      "author": "exav project",
+      "source": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-ifc.py",
+      "evidence": "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/generate/make-ifc.py",
+      "evidence_quote": "Output: CC0-1.0, a public domain dedication by the exav project.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "generated": {
+        "script": "generate/make-ifc.py",
+        "args": []
+      },
+      "bytes": 66945,
+      "sha256": "d65c93ae607a5b03316662719f5995f9de3bfd94366383ab683838bbccfa4731"
+    },
+    {
+      "file": "canon-eos-40d-sraw.cr2",
+      "group": "raw",
+      "family": "raw-cr2",
+      "title": "Canon EOS 40D, sRAW (CR2)",
+      "features": "TIFF-based CR2 with a 1936 by 1288 JPEG preview",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/2102/nice/Canon%20-%20EOS%2040D%20-%20sRAW2%20%28sRAW%29%20%283%3A2%29.CR2",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 5805950,
+      "sha256": "ba644e7dd2abe74eca260e67f0206ff113bf0f62e710f8130611e964d6be5bf1"
+    },
+    {
+      "file": "canon-eos-r6.cr3",
+      "group": "raw",
+      "family": "raw-cr3",
+      "title": "Canon EOS R6, C-RAW (CR3)",
+      "features": "ISO base media CR3 with a 3408 by 2272 JPEG in its second track; its EXIF names Johannes Kimmel as artist and states CC0",
+      "author": "Uploader to raw.pixls.us; EXIF artist Johannes Kimmel",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/4659/nice/Canon%20-%20EOS%20R6%20-%203%3A2.CR3",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 5273174,
+      "sha256": "74abb0a113d075ad9887a058082f40dd2a938c4813a08474d82356f11a027778"
+    },
+    {
+      "file": "canon-powershot-g1.crw",
+      "group": "raw",
+      "family": "raw-crw",
+      "title": "Canon PowerShot G1 (CRW)",
+      "features": "the 2000 CIFF/HEAP container with a 640 by 480 JPEG",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/2073/nice/Canon%20-%20PowerShot%20G1%20-%20RAW%20%284%3A3%29.crw",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 2300702,
+      "sha256": "f39be5acf14057ce04527fd8d0574e57ec8ed5fed082d7bfaff763075a44ee8a"
+    },
+    {
+      "file": "nikon-d70s.nef",
+      "group": "raw",
+      "family": "raw-nef",
+      "title": "Nikon D70s (NEF)",
+      "features": "TIFF-based NEF with a 3008 by 2000 JPEG in a SubIFD",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/1117/nice/Nikon%20-%20D70s%20-%2012bit%2012bit%20compressed%20%28Lossy%20%28type%201%29%29%20%283%3A2%29.NEF",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 5193213,
+      "sha256": "6c46f9854033e7623ebbb5de8c951df6762ca44f05d45035ccc5cb7e9f4e5692"
+    },
+    {
+      "file": "sony-ilce-7s.arw",
+      "group": "raw",
+      "family": "raw-arw",
+      "title": "Sony A7S (ARW)",
+      "features": "TIFF-based ARW with a 1616 by 1080 JPEG preview",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/1582/nice/Sony%20-%20ILCE-7S%20-%2014bit%2014bit%20compressed%20%283%3A2%29.ARW",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 6160384,
+      "sha256": "a35ebb2fbec929daa5beb20d1ce5c15a8aac7b1a7a231455387f3df8a7442e07"
+    },
+    {
+      "file": "olympus-c5060wz.orf",
+      "group": "raw",
+      "family": "raw-orf",
+      "title": "Olympus C5060WZ (ORF)",
+      "features": "the only picture inside is a 160 by 120 thumbnail",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/1799/nice/Olympus%20-%20C5060WZ%20-%2012bit%20%284%3A3%29.ORF",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 7646208,
+      "sha256": "3fc12bc3f6320cfab456111d7805b446e329fdd1907680be55e2e163e5e084bd"
+    },
+    {
+      "file": "panasonic-dmc-lx7.rw2",
+      "group": "raw",
+      "family": "raw-rw2",
+      "title": "Panasonic Lumix DMC-LX7 (RW2)",
+      "features": "RW2 with a 1920 by 1280 JPEG",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/7010/nice/Panasonic%20-%20DMC-LX7%20-%203%3A2.RW2",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 3394560,
+      "sha256": "18dfc3877e944020299635a8c2fad61fca2485b1c9b67645a495ee870a86e599"
+    },
+    {
+      "file": "fujifilm-finepix-s5000.raf",
+      "group": "raw",
+      "family": "raw-raf",
+      "title": "Fujifilm FinePix S5000 (RAF)",
+      "features": "RAF container with a 1280 by 960 JPEG",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/2726/nice/Fujifilm%20-%20FinePix%20S5000%20-%204%3A3.RAF",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 6851240,
+      "sha256": "dabd5e74521a6980156be9fd4b88d0c37b0fe4d0e0e6f5c12db8cffff1b76297"
+    },
+    {
+      "file": "minolta-dimage-5.mrw",
+      "group": "unsupported",
+      "family": "raw-mrw",
+      "title": "Minolta DiMAGE 5 (MRW)",
+      "features": "MRW with a 640 by 480 preview whose first byte is stored as zero: the viewer finds no preview in it (kept to show the message)",
+      "author": "Uploader to raw.pixls.us (the site gives no name)",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/7795/nice/Minolta%20-%20DiMAGE%205%20-%204%3A3.MRW",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 6422144,
+      "sha256": "d60bfd80bcb1f7b9c88b14a5e46ea27885bbf92d990ab30b3939288678fea0d9"
+    },
+    {
+      "file": "adobe-dng-canon-5d3.dng",
+      "group": "raw",
+      "family": "raw-dng",
+      "title": "Canon EOS 5D Mark III converted to DNG (lossy JPEG)",
+      "features": "DNG with previews of 256, 1024 and 3960 pixels; converted by Adobe DNG Converter, not straight from a camera",
+      "author": "Uploader to raw.pixls.us; EXIF artist Simon Harhues",
+      "source": "https://raw.pixls.us/#repo",
+      "evidence": "https://raw.pixls.us/json/getrepository.php?set=all",
+      "evidence_quote": "Creative Commons 0 - Public Domain",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.pixls.us/getfile.php/1033/nice/Adobe%20DNG%20Converter%20-%20Canon%20EOS%205D%20Mark%20III%20-%20Lossy%20JPEG%20compression%2C%20rgb%20%283%3A2%29.DNG",
+      "evidence_row": "sha256",
+      "committed": false,
+      "bytes": 2484836,
+      "sha256": "b22f1e36331f679abb8b13e433b9bbde3988723adf10fee7aa0dda6381016a98"
+    },
+    {
+      "file": "barraca-valenciana-0100-r2010.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Barraca Valenciana, ground floor plan (DWG 2010, Revit export)",
+      "features": "walls, doors, glazing, stairs, furniture, hatches, areas, 24 layers, 56 blocks, extra layouts with title block and viewports",
+      "author": "Òscar Selfa",
+      "source": "https://zenodo.org/records/14293897",
+      "evidence": "https://zenodo.org/records/14293897",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-P00-PLA-ARQ-0100-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1",
+      "committed": false,
+      "bytes": 284266,
+      "sha256": "fcd3eef78cbd568e3f8a8262378670495a3ea6b8e091cb162fe8ef9c3c9add13"
+    },
+    {
+      "file": "barraca-valenciana-0300-r2010.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Barraca Valenciana, elevations (DWG 2010, Revit export)",
+      "features": "elevations drawn as 2D linework with hatches, topography and planting, no 3D",
+      "author": "Òscar Selfa",
+      "source": "https://zenodo.org/records/14293897",
+      "evidence": "https://zenodo.org/records/14293897",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-PLA-ARQ-0300-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1",
+      "committed": false,
+      "bytes": 1069565,
+      "sha256": "93a211cfb797525a94b5b41aeae3ecf33e61442eea07cadae056463cc400a3e5"
+    },
+    {
+      "file": "barraca-valenciana-0400-r2010.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Barraca Valenciana, sections and details (DWG 2010, Revit export)",
+      "features": "42 layers, hatches, arcs, splines, ellipses, 61 blocks",
+      "author": "Òscar Selfa",
+      "source": "https://zenodo.org/records/14293897",
+      "evidence": "https://zenodo.org/records/14293897",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-PLA-ARQ-0400-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1",
+      "committed": false,
+      "bytes": 511114,
+      "sha256": "a09c492dc34ead8df619d6d618049298afffb050a8436c470055923a90f4b61c"
+    },
+    {
+      "file": "building-survey-plans-r2000.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Survey of a small building: plans, elevations and details (DWG 2000)",
+      "features": "Italian drawing with room names and areas, over 120 layers, 890 blocks, 567 dimensions, 492 hatches",
+      "author": "Giovanni De Gasperis, Sante Dino Facchini, Asif Saeed",
+      "source": "https://zenodo.org/records/15076037",
+      "evidence": "https://zenodo.org/records/15076037",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "De Gasperis, G., Facchini, S. D., Saeed, A., Building Ledger Dossier: Seismic Prevention and Building Documentation Tracking through a Digital Twin Approach (4_Architectural_Building_Survey.dwg), Zenodo, doi:10.5281/zenodo.15076037, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/15076037/files/4_Architectural_Building_Survey.dwg?download=1",
+      "committed": false,
+      "bytes": 2097350,
+      "sha256": "2f096b44cd5b60ded2ad8b12c2f46116db8b1fda1c980f7bb02660a85782ab1d"
+    },
+    {
+      "file": "golden-tile-palace-r2004.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Golden Tile Palace: front elevation and section (DWG 2004)",
+      "features": "elevation and section with level marks and Chinese titles, 4393 polylines, 841 arcs, 328 splines, 26 dimensions, 24 hatches",
+      "author": "Jing Zhang, Yunying Ren, Xiaofan An",
+      "source": "https://figshare.com/articles/dataset/Figure_of_surveying_and_mapping_of_Golden_Tile_Palace_/21374221",
+      "evidence": "https://api.figshare.com/v2/articles/21374221",
+      "evidence_quote": "\"name\": \"CC BY 4.0\"",
+      "licence": "CC-BY-4.0",
+      "attribution": "Jing Zhang, Yunying Ren, Xiaofan An, Figure of surveying and mapping of Golden Tile Palace, supplementary file S1 of PLOS ONE doi:10.1371/journal.pone.0262155, figshare, CC BY 4.0. No changes.",
+      "fetched": "https://ndownloader.figshare.com/files/37930432",
+      "committed": false,
+      "bytes": 763903,
+      "sha256": "14d128397f89c1af652b2cd3c9d523db98ae539b1bc061d4f06fba6d21501ae9"
+    },
+    {
+      "file": "residential-site-plan-r2007.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Site plan of an old residential community in Beijing (DWG 2007)",
+      "features": "58 layers, 79 blocks, buildings, roads, 2865 polylines, 656 texts, 125 hatches, 39 dimensions",
+      "author": "Yijun Fan",
+      "source": "https://figshare.com/articles/dataset/Drainage_System_Layout_of_Old_Urban_Residential_Communities_In_Beijing/28188725",
+      "evidence": "https://api.figshare.com/v2/articles/28188725",
+      "evidence_quote": "\"name\": \"CC BY 4.0\"",
+      "licence": "CC-BY-4.0",
+      "attribution": "Yijun Fan, Drainage System Layout of Old Urban Residential Communities In Beijing (Site Plan.dwg), figshare, doi:10.6084/m9.figshare.28188725.v1, CC BY 4.0. No changes.",
+      "fetched": "https://ndownloader.figshare.com/files/51611078",
+      "committed": false,
+      "bytes": 948192,
+      "sha256": "37b03757172e5360a03cc26da473cde84e85dbd61914b67741c94a40f7f0db2f"
+    },
+    {
+      "file": "hospital-floor-plan-r2013.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Furnished hospital floor plan (DWG 2013)",
+      "features": "section and level marks, 109 dimensions, 429 block definitions of furniture and plants, 19 layers",
+      "author": "Toka Ehab",
+      "source": "https://zenodo.org/records/10520508",
+      "evidence": "https://zenodo.org/records/10520508",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Toka Ehab, Nanotechnology Applications in Interior Design of hospitals to enhance thermal comfort and decrease the infection spread for the occupants (Elite hospital plan.dwg), Zenodo, doi:10.5281/zenodo.10520508, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/10520508/files/Elite%20hospital%20plan.dwg?download=1",
+      "committed": false,
+      "bytes": 1249695,
+      "sha256": "b618207b01a1759142e038e1edf762ab8efbe11804bb2e84fc6f472e7e040fb9"
+    },
+    {
+      "file": "commercial-building-hvac-plans-r2018.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "Air-conditioning plans of a commercial building (DWG 2018)",
+      "features": "48 layers, 320 blocks, 316 dimensions, 125 hatches, 112 wipeouts",
+      "author": "Kevin Anthony do Bem",
+      "source": "https://zenodo.org/records/10407941",
+      "evidence": "https://zenodo.org/records/10407941",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Kevin Anthony do Bem, Projeto de Climatização de um Edifício de Comércio e Serviços (F04 Plantas- Rede aerolica.dwg), Zenodo, doi:10.5281/zenodo.10407941, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/10407941/files/F04%20Plantas-%20Rede%20aerolica.dwg?download=1",
+      "committed": false,
+      "bytes": 506884,
+      "sha256": "bcf3b92e0afdf29bb75e7632e8193f881918ddabb4de67a1331b5eda34ee9be2"
+    },
+    {
+      "file": "ezdxf-dim-linear-tutorial-r2013.dwg",
+      "group": "cad",
+      "family": "dwg",
+      "title": "ezdxf documentation: linear dimension tutorial (DWG 2013)",
+      "features": "16 dimensions, 16 multileaders, 13 dimension styles, 27 text styles",
+      "author": "Manfred Moitzi (ezdxf)",
+      "source": "https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg",
+      "evidence": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE",
+      "evidence_quote": "Copyright (c) 2020 Manfred Moitzi",
+      "licence": "MIT",
+      "attribution": "Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.",
+      "fetched": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg",
+      "committed": false,
+      "bytes": 36391,
+      "sha256": "88037b595bd46d81c5c98ce7aa428ce6b8506d1aa4602e976811cfb154005155"
+    },
+    {
+      "file": "hospital-ward-wing-plan-section.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Hospital ward wing, plan and section (DXF 2010)",
+      "features": "542 polylines, 17 layers of the A-* scheme, 3 blocks, a paper-space viewport",
+      "author": "Innerscene (original model)",
+      "source": "https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd",
+      "evidence": "https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd",
+      "evidence_quote": "Original Innerscene model, released CC0.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://www.innerscene.com/api/library/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd/download",
+      "committed": false,
+      "bytes": 307641,
+      "sha256": "3042880c63b7d093f287528bc723298879ffe7c9cf7b47cd8de0d81045867b69"
+    },
+    {
+      "file": "grocery-store-plan-section.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "Grocery store, plan and section (DXF 2010)",
+      "features": "234 lines, 150 polylines, 17 layers, 3 blocks, a viewport",
+      "author": "Innerscene (original model)",
+      "source": "https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041",
+      "evidence": "https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041",
+      "evidence_quote": "Original Innerscene model, released CC0.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://www.innerscene.com/api/library/grocery-store-600-square-metres-plan-and-section-2a67d041/download",
+      "committed": false,
+      "bytes": 131073,
+      "sha256": "b3d430fa6b47801e99cda102cd2a56c342fdc55f776d57e1e4b28fc59c2ec1bb"
+    },
+    {
+      "file": "ezdxf-uncommon-entities.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "ezdxf example: uncommon entities (DXF 2018)",
+      "features": "13 dimensions, 2 multileaders, large radial dimensions, rays, construction lines, splines, 33 blocks, 2 extra layouts",
+      "author": "Manfred Moitzi (ezdxf)",
+      "source": "https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf",
+      "evidence": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE",
+      "evidence_quote": "Copyright (c) 2020 Manfred Moitzi",
+      "licence": "MIT",
+      "attribution": "Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.",
+      "fetched": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf",
+      "committed": false,
+      "bytes": 343110,
+      "sha256": "5efdd671e3b6d8c45bd0688b1d6479d523f2290f0b390f1584348bf46e34c965"
+    },
+    {
+      "file": "ezdxf-hatches-1.dxf",
+      "group": "cad",
+      "family": "dxf",
+      "title": "ezdxf example: solid hatches (DXF 2018)",
+      "features": "ten solid hatches over polylines and arcs",
+      "author": "Manfred Moitzi (ezdxf)",
+      "source": "https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf",
+      "evidence": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE",
+      "evidence_quote": "Copyright (c) 2020 Manfred Moitzi",
+      "licence": "MIT",
+      "attribution": "Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.",
+      "fetched": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf",
+      "committed": false,
+      "bytes": 130334,
+      "sha256": "2dc2930b4f7d5fb16698437e4f6972986e580a81b2b5d36a780b4311f85fb326"
+    },
+    {
+      "file": "bsi-building-architecture-ifc2x3.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "buildingSMART Simple-Scene Building-Architecture (IFC2X3)",
+      "features": "a small SketchUp house: walls, slabs, a roof, spaces, materials with colours, quantity and property sets; faceted breps",
+      "author": "buildingSMART International Ltd.",
+      "source": "https://github.com/buildingSMART/Sample-Test-Files",
+      "evidence": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE",
+      "evidence_quote": "This work is licensed under the Creative Commons Attribution 4.0 International License.",
+      "licence": "CC-BY-4.0",
+      "attribution": "buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.",
+      "fetched": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%202.3.0.1%20%28IFC%202x3%20TC1%29/Simple-Scene/Building-Architecture.ifc",
+      "committed": false,
+      "bytes": 92542,
+      "sha256": "c4db65ba847f6b369a95d6c54fa11f4750cbe6d59f021934e8923d8d578e5885"
+    },
+    {
+      "file": "bsi-building-architecture-ifc4x3.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "buildingSMART Simple-Scene Building-Architecture (IFC4X3_ADD2)",
+      "features": "the same house in IFC 4.3, with triangulated faces",
+      "author": "buildingSMART International Ltd.",
+      "source": "https://github.com/buildingSMART/Sample-Test-Files",
+      "evidence": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE",
+      "evidence_quote": "This work is licensed under the Creative Commons Attribution 4.0 International License.",
+      "licence": "CC-BY-4.0",
+      "attribution": "buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.",
+      "fetched": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%204.3.2.0%20%28IFC%204.3%20ADD2%29/Simple-Scene/Building-Architecture.ifc",
+      "committed": false,
+      "bytes": 141965,
+      "sha256": "96e7103812b15b65eb1fd7802d36b9962833485dce5ead4f440bbf529530881d"
+    },
+    {
+      "file": "bsi-wall-with-opening-and-window-ifc4.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "buildingSMART reference view: a wall with an opening and a window (IFC4)",
+      "features": "a wall with a material layer set, an opening element and a window with its type",
+      "author": "Peter Bonsma, RDF Ltd. (file header), distributed by buildingSMART International Ltd.",
+      "source": "https://github.com/buildingSMART/Sample-Test-Files",
+      "evidence": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE",
+      "evidence_quote": "This work is licensed under the Creative Commons Attribution 4.0 International License.",
+      "licence": "CC-BY-4.0",
+      "attribution": "buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.",
+      "fetched": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%204.0.2.1%20%28IFC%204%20ADD2%20TC1%29/ISO%20Spec%20-%20ReferenceView_V1.2/wall-with-opening-and-window.ifc",
+      "committed": false,
+      "bytes": 12492,
+      "sha256": "73b0e45d931d5dc13bfee5fdc7bd80f796526445458b2de74c4168d209097832"
+    },
+    {
+      "file": "duplex-apartment-ifc2x3.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "Duplex Apartment (IFC2X3, Revit export)",
+      "features": "four storeys: 57 walls, 24 windows, 14 doors, 2 stairs, 21 spaces, furniture, 18 materials",
+      "author": "Provided to the US Army Construction Engineering Research Laboratory, republished by buildingSMART International",
+      "source": "https://github.com/buildingsmart-community/Community-Sample-Test-Files/tree/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20(IFC%202x3)/Duplex%20Apartment",
+      "evidence": "https://raw.githubusercontent.com/buildingsmart-community/Community-Sample-Test-Files/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20%28IFC%202x3%29/Duplex%20Apartment/README.md",
+      "evidence_quote": "Creative Commons (CC BY 4.0). You are free (1) to copy and resitribute this material any way you like",
+      "licence": "CC-BY-4.0",
+      "attribution": "BSI (2020) Duplex Apartment Test Files, buildingSMART International, https://github.com/buildingsmart-community/Community-Sample-Test-Files, CC BY 4.0. No changes.",
+      "fetched": "https://media.githubusercontent.com/media/buildingsmart-community/Community-Sample-Test-Files/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20%28IFC%202x3%29/Duplex%20Apartment/Duplex_A_20110907.ifc",
+      "committed": false,
+      "bytes": 2380763,
+      "sha256": "b347a2c8aa8fff6db896a4417a9c50c22ac0ccd7c5cfc22b99b8d29336c606ed"
+    },
+    {
+      "file": "barraca-valenciana-ifc4.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "Barraca Valenciana de Llauradors, BIM model (IFC4, Revit export)",
+      "features": "a traditional farmhouse: 2 storeys, 16 walls, 5 slabs, 2 roofs, a stair, 27 beams, 28 materials",
+      "author": "Òscar Selfa",
+      "source": "https://zenodo.org/records/14293897",
+      "evidence": "https://zenodo.org/records/14293897",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-M3D-ARQ-0001-tipologiaGen%C3%A8rica-S3-0001.ifc?download=1",
+      "committed": false,
+      "bytes": 1584183,
+      "sha256": "b6f8828e9bd2491dc452b2ab78f9f9e28f39bd81a5f2f4e2cdb2d81668287193"
+    },
+    {
+      "file": "office-archetype-1970-ifc4x3.ifc",
+      "group": "3d",
+      "family": "ifc",
+      "title": "Office archetype of 1970 (IFC4X3_ADD2)",
+      "features": "four storeys: 88 walls, 167 windows, 49 doors, 16 curtain walls, 48 spaces",
+      "author": "Verena Dannapfel, Moritz Müller, Rita Streblow, Dirk Müller et al., RWTH Aachen University",
+      "source": "https://zenodo.org/records/21820756",
+      "evidence": "https://zenodo.org/records/21820756",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Dannapfel, V., Müller, M., Streblow, R., Müller, D. et al., Archetypes for German Office Buildings of Construction Years 1970, 1998 and 2026, Zenodo, doi:10.5281/zenodo.21820756, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/records/21820756/files/2026-07_Klassiqua_Office_Archetype_Construction_Year_1970.ifc?download=1",
+      "committed": false,
+      "bytes": 1471699,
+      "sha256": "a5f12304d33fe5da9174c8ea9827d2f322706646b3da2766dff0ab278c65df3c"
+    },
+    {
+      "file": "fox.glb",
+      "group": "3d",
+      "family": "glb",
+      "title": "Fox, skinned and animated (GLB)",
+      "features": "a low-poly fox with a skin, three animations and a texture",
+      "author": "PixelMannen (model, CC0), tomkranis (rigging and animation, CC BY 4.0), glTF conversion by Asobo Studio and the Khronos Group",
+      "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox",
+      "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox/README.md",
+      "evidence_quote": "&copy; 2014, tomkranis. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)",
+      "licence": "CC-BY-4.0",
+      "attribution": "Fox: model by PixelMannen (CC0, https://opengameart.org/content/fox-and-shiba), rigging and animation by tomkranis (CC BY 4.0, https://sketchfab.com/3d-models/low-poly-fox-by-pixelmannen-animated-371dea88d7e04a76af5763f2a36866bc), glTF conversion by Asobo Studio and the Khronos Group. Unmodified.",
+      "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox/glTF-Binary/Fox.glb",
+      "committed": false,
+      "bytes": 162852,
+      "sha256": "d97044e701822bac5a62696459b27d7b375aada5de8574ed4362edbba94771f7"
+    },
+    {
+      "file": "riggedfigure.gltf",
+      "group": "3d",
+      "family": "gltf",
+      "title": "Rigged Figure (glTF with an embedded buffer)",
+      "features": "a skinned figure, a data URI buffer",
+      "author": "Cesium",
+      "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure",
+      "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure/README.md",
+      "evidence_quote": "&copy; 2017, Cesium. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)",
+      "licence": "CC-BY-4.0",
+      "attribution": "Rigged Figure by Cesium, CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/RiggedFigure. Unmodified.",
+      "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure/glTF-Embedded/RiggedFigure.gltf",
+      "committed": false,
+      "bytes": 99902,
+      "sha256": "354572cfef17b136b437ac9749da0fa316fd6e42ee7d62fe50a696b25f5047e9"
+    },
+    {
+      "file": "vertexcolortest.glb",
+      "group": "3d",
+      "family": "glb",
+      "title": "Vertex Color Test (GLB)",
+      "features": "COLOR_0 vertex colours, tangents, two textures",
+      "author": "Ed Mackey, Analytical Graphics, Inc. (Cesium)",
+      "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest",
+      "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest/README.md",
+      "evidence_quote": "&copy; 2018, Analytical Graphics, Inc.. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)",
+      "licence": "CC-BY-4.0",
+      "attribution": "Vertex Color Test by Ed Mackey, Copyright 2018 Analytical Graphics, Inc., CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/VertexColorTest. Unmodified.",
+      "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest/glTF-Binary/VertexColorTest.glb",
+      "committed": false,
+      "bytes": 26220,
+      "sha256": "58006bdcff8084339da0f6e24400160890638c16dbcb83c362ccaf150e8c6e10"
+    },
+    {
+      "file": "metalroughspheres.glb",
+      "group": "3d",
+      "family": "glb",
+      "title": "Metal-Rough spheres (GLB)",
+      "features": "119 nodes and 98 materials of growing metalness and roughness",
+      "author": "Krill Gavrilov / Draw Harness script (Open CASCADE Technology)",
+      "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures",
+      "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures/README.md",
+      "evidence_quote": "&copy; 2019, Public. [Creative Commons Zero v1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures/glTF-Binary/MetalRoughSpheresNoTextures.glb",
+      "committed": false,
+      "bytes": 291316,
+      "sha256": "5e677f260ec0f366967a6e9545de2f3dab2a160e307b9bcb9d050cd2028f63f8"
+    },
+    {
+      "file": "iridescencesuzanne.glb",
+      "group": "3d",
+      "family": "glb",
+      "title": "Iridescence Suzanne (GLB)",
+      "features": "Suzanne with the iridescence, transmission and volume extensions",
+      "author": "Mathias Kanzler (UX3D), Pascal Schoen",
+      "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne",
+      "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne/README.md",
+      "evidence_quote": "&copy; 2022, UX3D. [Creative Commons Zero v1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne/glTF-Binary/IridescenceSuzanne.glb",
+      "committed": false,
+      "bytes": 507608,
+      "sha256": "866762602d60a0942b7608bfabf4e8686a29033636224f4b55c5e56abe8abf8f"
+    },
+    {
+      "file": "ratchet-cam.stl",
+      "group": "3d",
+      "family": "stl",
+      "title": "Apollo 11 hatch, stationary ratchet cam (binary STL)",
+      "features": "1536 triangles, a mechanical part",
+      "author": "NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons",
+      "source": "https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl",
+      "evidence_quote": "CC0 1.0 Universal Public Domain Dedication",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/e/e0/Stationary_Ratchet_Cam_v11_%28Hatch%2C_Crew%2C_Apollo_11_by_NASA_and_Smithsonian_Institution%29.stl",
+      "committed": false,
+      "bytes": 76884,
+      "sha256": "b42d79fb357413b118b973f3fa40b76ae2999451537cd991bebce18b486c581f"
+    },
+    {
+      "file": "ratchet-spur-gear.stl",
+      "group": "3d",
+      "family": "stl",
+      "title": "Apollo 11 hatch, stationary ratchet spur gear (binary STL)",
+      "features": "3026 triangles, a gear with 19 teeth",
+      "author": "NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons",
+      "source": "https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl",
+      "evidence": "https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl",
+      "evidence_quote": "CC0 1.0 Universal Public Domain Dedication",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/c/cb/N%3D19%2C_P%3D28_-_Stat._Ratchet_Spur_Gear_v13_%28Hatch%2C_Crew%2C_Apollo_11_by_NASA_and_Smithsonian_Institution%29.stl",
+      "committed": false,
+      "bytes": 151384,
+      "sha256": "c99eca56ab40ed6b2e9dfc49b88c23c6fbef982ff18813ba593d3e138ef1f51d"
+    },
+    {
+      "file": "petri-dish-holder-base.stl",
+      "group": "3d",
+      "family": "stl",
+      "title": "Petri dish holder base of a spore capture device (ASCII STL)",
+      "features": "566 facets as text",
+      "author": "Kevin A. Adkins, Kaiyu Li, M. N. Blasko, J. L. Cabrera, B. H. Neal, James et al.",
+      "source": "https://zenodo.org/records/12193898",
+      "evidence": "https://zenodo.org/api/records/12193898",
+      "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}",
+      "licence": "CC-BY-4.0",
+      "attribution": "Components of the spore capture device in A simple mechanism for uncrewed aircraft bioaerosol sampling in the lower atmosphere (Inspire1Petri_Dish_Holder_Base.stl), Kevin A. Adkins et al., Zenodo 2024, doi:10.5281/zenodo.12193898, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/api/records/12193898/files/Inspire1Petri_Dish_Holder_Base.stl/content",
+      "committed": false,
+      "bytes": 151270,
+      "sha256": "d654bf60064e79675acd9694726282c70251905d77391ad45c29d3ba3ecaf93e"
+    },
+    {
+      "file": "chickpea-mesh.ply",
+      "group": "3d",
+      "family": "ply",
+      "title": "Photogrammetric mesh of a chickpea plant (binary PLY with colours)",
+      "features": "8788 triangles, RGBA per vertex",
+      "author": "William T. Salter, Arjina Shrestha, Margaret M. Barbour",
+      "source": "https://zenodo.org/records/4018242",
+      "evidence": "https://zenodo.org/api/records/4018242",
+      "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}",
+      "licence": "CC-BY-4.0",
+      "attribution": "3D photogrammetric reconstructions of individual chickpea plants (PBASlasher_S3s_Wk1_meshed.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/api/records/4018242/files/PBASlasher_S3s_Wk1_meshed.ply/content",
+      "committed": false,
+      "bytes": 202701,
+      "sha256": "ef9cd2141897781c8e3e6a72ac316056b991d4d0fae99e053c4695fceea8cb75"
+    },
+    {
+      "file": "ruthwell-lamb-of-god.ply",
+      "group": "3d",
+      "family": "ply",
+      "title": "Lamb of God panel of the Ruthwell Cross (binary PLY with normals and colours)",
+      "features": "33020 triangles, a scanned stone carving",
+      "author": "Gurpreet Singh",
+      "source": "https://zenodo.org/records/3348342",
+      "evidence": "https://zenodo.org/api/records/3348342",
+      "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}",
+      "licence": "CC-BY-4.0",
+      "attribution": "Small Panel PLY (Lamb of God panel from the Ruthwell Cross), Gurpreet Singh, Zenodo 2019, doi:10.5281/zenodo.3348342, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/api/records/3348342/files/Small_Lamb_Of_God_North_Ruthwell_Cross.ply/content",
+      "committed": false,
+      "bytes": 893893,
+      "sha256": "0d40a4305885932596afce091891a8f4b212b0c012b742db10d4487351c2457a"
+    },
+    {
+      "file": "chickpea-pointcloud-ascii.ply",
+      "group": "unsupported",
+      "family": "ply",
+      "title": "Point cloud of a chickpea plant (ASCII PLY without faces)",
+      "features": "53195 coloured points and no faces: kept to show what the viewer says about a point cloud",
+      "author": "William T. Salter, Arjina Shrestha, Margaret M. Barbour",
+      "source": "https://zenodo.org/records/4018242",
+      "evidence": "https://zenodo.org/api/records/4018242",
+      "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}",
+      "licence": "CC-BY-4.0",
+      "attribution": "3D photogrammetric reconstructions of individual chickpea plants (SonSla_3_groundtruth_pointcloud.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.",
+      "fetched": "https://zenodo.org/api/records/4018242/files/SonSla_3_groundtruth_pointcloud.ply/content",
+      "committed": false,
+      "bytes": 3455582,
+      "sha256": "53a08f6e1c831ac58c42342ee257c97730bcf6997e246c88198478f9aeba4fe0"
+    },
+    {
+      "file": "arxiv-rational-cherednik-torus-knots.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "Rational Cherednik Algebras and Torus Knot Invariants (arXiv:2402.18770)",
+      "features": "28 pages of mathematics, 24 outline entries, 256 links, set in LaTeX",
+      "author": "Xinchun Ma",
+      "source": "https://arxiv.org/abs/2402.18770v1",
+      "evidence": "https://arxiv.org/abs/2402.18770v1",
+      "evidence_quote": "href=\"http://creativecommons.org/licenses/by/4.0/\" title=\"Rights to this article\"",
+      "licence": "CC-BY-4.0",
+      "attribution": "Xinchun Ma, Rational Cherednik Algebras and Torus Knot Invariants, arXiv:2402.18770v1, CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/). Not modified.",
+      "fetched": "https://arxiv.org/pdf/2402.18770v1",
+      "committed": false,
+      "bytes": 430745,
+      "sha256": "2b22841d8a64b271d7def6fa15aa0b5b98f533ae259e4108eb7104320f07cf10"
+    },
+    {
+      "file": "nist-sp-800-63-4-digital-identity.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "NIST SP 800-63-4, Digital Identity Guidelines",
+      "features": "96 tagged pages, 54 outline entries, 227 links",
+      "author": "David Temoshok, Diana Proud-Madruga, Yee-Yin Choong et al., NIST",
+      "source": "https://csrc.nist.gov/pubs/sp/800/63/4/final",
+      "evidence": "https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63-4.pdf",
+      "evidence_quote": "is not subject to copyright in the United States.",
+      "licence": "public-domain (US federal government work, 17 U.S.C. 105; the PDF says so itself)",
+      "attribution": "",
+      "fetched": "https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63-4.pdf",
+      "committed": false,
+      "bytes": 858054,
+      "sha256": "2f5b107de218a0fc3fe7f7e91b2ece5babb001eda5745b7c568a3cc876002f2d"
+    },
+    {
+      "file": "scan-cfa-minutes-1971.pdf",
+      "group": "pdf",
+      "family": "pdf-scan",
+      "title": "Minutes of the U.S. Commission of Fine Arts, 1970 to 1972 (scan)",
+      "features": "40 scanned pages: JPEG 2000 pictures and JBIG2 masks, an OCR text layer, PDF/A-2B",
+      "author": "U.S. Commission of Fine Arts; scanned by the Internet Archive",
+      "source": "https://archive.org/details/cfaminutes21april1971",
+      "evidence": "https://commons.wikimedia.org/wiki/File:July_8_1970_to_May_19_1972_(IA_cfaminutes21april1971).pdf",
+      "evidence_quote": "This work is in the public domain in the United States because it is a work prepared by an officer o",
+      "licence": "public-domain (US federal government work, 17 U.S.C. 105)",
+      "attribution": "",
+      "fetched": "https://archive.org/download/cfaminutes21april1971/cfaminutes21april1971.pdf",
+      "committed": false,
+      "bytes": 1104628,
+      "sha256": "2fc5edb8a4f303b89449443dcb5a32249c79b2a8d67253348025d0e7eea5f94b"
+    },
+    {
+      "file": "scan-blm-land-survey-records.pdf",
+      "group": "pdf",
+      "family": "pdf-scan",
+      "title": "Land and survey records, Bureau of Land Management (scan)",
+      "features": "40 pages scanned at about 500 ppi: JPEG 2000 and JBIG2 images, an OCR text layer, PDF/A-2B",
+      "author": "United States Bureau of Land Management; scanned by the Internet Archive",
+      "source": "https://archive.org/details/landsurveyrecord00unit",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Land_%26_survey_records_-_record_preservation_%26_service_through_microfilm_(IA_landsurveyrecord00unit).pdf",
+      "evidence_quote": "This work is in the public domain in the United States because it is a work prepared by an officer o",
+      "licence": "public-domain (US federal government work, 17 U.S.C. 105)",
+      "attribution": "",
+      "fetched": "https://archive.org/download/landsurveyrecord00unit/landsurveyrecord00unit.pdf",
+      "committed": false,
+      "bytes": 2192413,
+      "sha256": "d9a9e6583d0afb1688a043ef59a8d2e236e20c58d4ba76ff625d7c11a181c16c"
+    },
+    {
+      "file": "form-uscis-i9.pdf",
+      "group": "pdf",
+      "family": "pdf-form",
+      "title": "USCIS Form I-9, Employment Eligibility Verification",
+      "features": "115 text fields, 5 drop-down lists, 8 check boxes, links; a tagged government form",
+      "author": "U.S. Citizenship and Immigration Services (DHS)",
+      "source": "https://www.uscis.gov/i-9",
+      "evidence": "https://www.uscis.gov/website-policies",
+      "evidence_quote": "Information presented on this WWW site is considered public information and may be distributed or co",
+      "licence": "public-domain (US federal government work, 17 U.S.C. 105)",
+      "attribution": "",
+      "fetched": "https://www.uscis.gov/sites/default/files/document/forms/i-9.pdf",
+      "committed": false,
+      "bytes": 524095,
+      "sha256": "780f348c34df694bb0b4dbbfaf9f22b99b9757b80d16a37ba89aadf069597281"
+    },
+    {
+      "file": "map-nps-canyonlands.pdf",
+      "group": "pdf",
+      "family": "pdf-map",
+      "title": "Canyonlands National Park, Island in the Sky: roads and trails",
+      "features": "two tagged pages of vector map",
+      "author": "National Park Service",
+      "source": "https://home.nps.gov/cany/planyourvisit/maps.htm",
+      "evidence": "https://www.nps.gov/aboutus/disclaimer.htm",
+      "evidence_quote": "material created by the National Park Service and presented on this website, unless otherwise indica",
+      "licence": "public-domain (US federal government work, 17 U.S.C. 105)",
+      "attribution": "",
+      "fetched": "https://home.nps.gov/cany/planyourvisit/upload/IslandRoadsandTrailsUpdated24-508forweb.pdf",
+      "committed": false,
+      "bytes": 349001,
+      "sha256": "b29a639d9bc0d2e37ca41b68c21bcddba7637b1727dce86980c3373715610d55"
+    },
+    {
+      "file": "slides-unige-open-access.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "Open Access publishing at no cost thanks to UNIGE agreements (slides)",
+      "features": "ten slides with outline, links, tags and pictures",
+      "author": "Floriane Muller, Anouk Santos (University of Geneva)",
+      "source": "https://zenodo.org/records/23478694",
+      "evidence": "https://zenodo.org/records/23478694",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "Floriane Muller and Anouk Santos, Open Access publishing at no cost thanks to UNIGE agreements, in 15 minutes, Zenodo, https://doi.org/10.5281/zenodo.23478694, CC BY 4.0. Not modified.",
+      "fetched": "https://zenodo.org/api/records/23478694/files/2026-10-20_Read_and_publish_en15min_EN_zenodo.pdf/content",
+      "committed": false,
+      "bytes": 800339,
+      "sha256": "03356ed569a80f7d7dc1d96fcbfd75a2fbc663c63f6d74f4e89eb2390bb5ee64"
+    },
+    {
+      "file": "paper-ja-labor-law.pdf",
+      "group": "pdf",
+      "family": "pdf",
+      "title": "A paper in Japanese on labour law and the constitution",
+      "features": "25 pages with embedded MS Mincho fonts",
+      "author": "Takashi Fujiki (藤木 貴史)",
+      "source": "https://zenodo.org/records/23469422",
+      "evidence": "https://zenodo.org/records/23469422",
+      "evidence_quote": "Creative Commons Attribution 4.0 International",
+      "licence": "CC-BY-4.0",
+      "attribution": "藤木 貴史, アメリカ労働法からみた憲法の影響, アメリカ憲法の理論と実践 創刊号, Zenodo, https://doi.org/10.5281/zenodo.23469422, CC BY 4.0. Not modified.",
+      "fetched": "https://zenodo.org/api/records/23469422/files/%E3%82%A2%E3%83%A1%E3%83%AA%E3%82%AB%E5%8A%B4%E5%83%8D%E6%B3%95%E3%81%8B%E3%82%89%E3%81%BF%E3%81%9F%E6%86%B2%E6%B3%95%E3%81%AE%E5%BD%B1%E9%9F%BF.pdf/content",
+      "committed": false,
+      "bytes": 881101,
+      "sha256": "08b2be3ebc781107f71003344ccf8b230229079e978687f1e0da2329bef1cbe9"
+    },
+    {
+      "file": "monet-gardeners-house-antibes.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Claude Monet, The Gardener's House at Antibes (1888)",
+      "features": "a painting, JPEG from the museum's web size",
+      "author": "Claude Monet, Cleveland Museum of Art (open access)",
+      "source": "https://clevelandart.org/art/1916.1044",
+      "evidence": "https://clevelandart.org/art/1916.1044",
+      "evidence_quote": "\"share_license_status\":\"CC0\"",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://openaccess-cdn.clevelandart.org/1916.1044/1916.1044_web.jpg",
+      "committed": false,
+      "bytes": 404254,
+      "sha256": "95142eba48d54f01352eb4ef6f04260cb3df3bcb1d9c86000c1284a7817674ca"
+    },
+    {
+      "file": "queen-mab-cave.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Queen Mab's Cave, in the manner of Turner",
+      "features": "a painting",
+      "author": "Imitator of J. M. W. Turner, Cleveland Museum of Art (open access)",
+      "source": "https://clevelandart.org/art/1916.1036",
+      "evidence": "https://clevelandart.org/art/1916.1036",
+      "evidence_quote": "\"share_license_status\":\"CC0\"",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://openaccess-cdn.clevelandart.org/1916.1036/1916.1036_web.jpg",
+      "committed": false,
+      "bytes": 218321,
+      "sha256": "b84e005332288229d808172a7610b501d9977c0b4668e333faea5ff780157223"
+    },
+    {
+      "file": "rembrandt-st-francis.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Rembrandt, Saint Francis Beneath a Tree Praying (etching)",
+      "features": "an etching, fine line work",
+      "author": "Rembrandt van Rijn, Cleveland Museum of Art (open access)",
+      "source": "https://clevelandart.org/art/2024.64",
+      "evidence": "https://clevelandart.org/art/2024.64",
+      "evidence_quote": "\"share_license_status\":\"CC0\"",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://openaccess-cdn.clevelandart.org/2024.64/2024.64_web.jpg",
+      "committed": false,
+      "bytes": 370411,
+      "sha256": "74b37aa3738914dd66c07533b3758f7694fefbaa918d2f23c263205cf987db7b"
+    },
+    {
+      "file": "nolli-rome-plate.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Nolli's map of Rome (1748), a plate",
+      "features": "an engraved city plan",
+      "author": "Giovanni Battista Nolli et al., Cleveland Museum of Art (open access)",
+      "source": "https://clevelandart.org/art/2020.276.3",
+      "evidence": "https://clevelandart.org/art/2020.276.3",
+      "evidence_quote": "\"share_license_status\":\"CC0\"",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://openaccess-cdn.clevelandart.org/2020.276.3/2020.276.3_web.jpg",
+      "committed": false,
+      "bytes": 322943,
+      "sha256": "7643c9e59f7706ebe62518a51daf7d72129acc8092dde7afc65516d3d11b6c77"
+    },
+    {
+      "file": "pallid-swift.jpg",
+      "group": "images",
+      "family": "jpeg",
+      "title": "Pallid swift in flight (photograph)",
+      "features": "a camera JPEG with EXIF data (Canon EOS R6 Mark II)",
+      "author": "Hobbyfotowiki",
+      "source": "https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg",
+      "evidence_quote": "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Dedication.",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/d/df/Pallid_swift_%28in_flight%29.jpg",
+      "committed": false,
+      "bytes": 356572,
+      "sha256": "9d0f79f12dcc236f549cdefb66dc468f25335d444ebd26e98805efdd94afecbd"
+    },
+    {
+      "file": "cyclotron-patent.png",
+      "group": "images",
+      "family": "png",
+      "title": "Drawing from Lawrence's cyclotron patent",
+      "features": "a black and white technical drawing",
+      "author": "Ernest O. Lawrence (US Patent Office)",
+      "source": "https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png",
+      "evidence_quote": "The text and illustrations of US patents published before March 1, 1989 are in the public domain unl",
+      "licence": "public-domain (US patent text and drawings published before 1989)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/4/42/Cyclotron_patent_p1.png",
+      "committed": false,
+      "bytes": 207304,
+      "sha256": "0be9b59ae21bbadeb8a13fafde5e0bcfb6d470ba516244eab0ec1c74afd7394f"
+    },
+    {
+      "file": "mature-flower-diagram.svg",
+      "group": "images",
+      "family": "svg",
+      "title": "Diagram of a mature flower",
+      "features": "85 texts, about 90 gradient references, many paths",
+      "author": "Mariana Ruiz Villarreal (LadyofHats)",
+      "source": "https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg",
+      "evidence_quote": "This work has been released into the public domain by its author, LadyofHats.",
+      "licence": "public-domain (released by its author)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/7/7f/Mature_flower_diagram.svg",
+      "committed": false,
+      "bytes": 123527,
+      "sha256": "b40bd4e188c0a99e51e994b4f39f931d3fca28093ecb6454aa2bd93c575ea999"
+    },
+    {
+      "file": "entamoeba-life-cycle.svg",
+      "group": "images",
+      "family": "svg",
+      "title": "Life cycle of Entamoeba histolytica",
+      "features": "547 paths, text and arrows",
+      "author": "Mariana Ruiz Villarreal (LadyofHats)",
+      "source": "https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg",
+      "evidence_quote": "This work has been released into the public domain by its author, LadyofHats.",
+      "licence": "public-domain (released by its author)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/a/a1/Entamoeba_histolytica_life_cycle-en.svg",
+      "committed": false,
+      "bytes": 273234,
+      "sha256": "68a4a92289d81f0e7e9361abbba2da9a8c8b4e440e3ad9de5c420646eb133eaa"
+    },
+    {
+      "file": "sieve-of-eratosthenes.svg",
+      "group": "images",
+      "family": "svg",
+      "title": "Sieve of Eratosthenes, animated",
+      "features": "SMIL animation with 179 animate elements",
+      "author": "Ricordisamoa, with later edits by Jc86035, HereToHelp and Glrx",
+      "source": "https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg",
+      "evidence_quote": "This work is ineligible for copyright and therefore in the public domain because it consists entirel",
+      "licence": "public-domain (ineligible for copyright, Wikimedia Commons PD-ineligible)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/0/0b/Sieve_of_Eratosthenes_animation.svg",
+      "committed": false,
+      "bytes": 22054,
+      "sha256": "d8f1d6d0a4b5710ebe1e7766eab30b766b10dc9380c1058ccb39baccd7d51586"
+    },
+    {
+      "file": "muybridge-horse.gif",
+      "group": "images",
+      "family": "gif",
+      "title": "Muybridge's horse in motion, animated GIF",
+      "features": "15 frames",
+      "author": "Eadweard Muybridge (photographs, 1887); animation by Waugsberg",
+      "source": "https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif",
+      "evidence_quote": "The author died in 1904, so this work is in the public domain in its country of origin and other cou",
+      "licence": "public-domain (the author died in 1904)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/d/dd/Muybridge_race_horse_animated.gif",
+      "committed": false,
+      "bytes": 568203,
+      "sha256": "eb40bebc1f039e7c2a121673c3b55d4aa73582f858053dbbcca9ebce9e2b479d"
+    },
+    {
+      "file": "geneva-mechanism.gif",
+      "group": "images",
+      "family": "gif",
+      "title": "Geneva mechanism with six spokes, animated GIF",
+      "features": "101 frames",
+      "author": "Mike1024",
+      "source": "https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif",
+      "evidence_quote": "I, the copyright holder of this work, release this work into the public domain.",
+      "licence": "public-domain (released by its author)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/9/9b/Geneva_mechanism_6spoke_animation.gif",
+      "committed": false,
+      "bytes": 229346,
+      "sha256": "d7df5c9984109c2ca60f7aab1a51db1f0b578cddcdede5d43be9f67536e2a1ee"
+    },
+    {
+      "file": "abundance-nemo-g4-6pages.tif",
+      "group": "images",
+      "family": "tiff-fax",
+      "title": "Les grans et merveilleux faictz du seigneur Nemo (scan, six pages, CCITT Group 4)",
+      "features": "a multi-page bilevel TIFF scanned from a 16th-century book",
+      "author": "Jean d'Abundance (16th century); scanned by the Bibliothèque nationale de France",
+      "source": "https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif",
+      "evidence": "https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif",
+      "evidence_quote": "This file is in the public domain because it is a mere mechanical scan or photocopy of a public doma",
+      "licence": "public-domain (a mechanical scan of a public domain book, Wikimedia Commons PD-scan)",
+      "attribution": "",
+      "fetched": "https://upload.wikimedia.org/wikipedia/commons/b/b5/Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif",
+      "committed": false,
+      "bytes": 330420,
+      "sha256": "38bab27c6d559e11468d6c7e4222f0bb1bee4ba0044540adcebfc012930e00d1"
+    },
+    {
+      "file": "docx4j-getting-started.docx",
+      "group": "office",
+      "family": "docx",
+      "title": "docx4j Getting Started (Word)",
+      "features": "a manual with styles, tables, pictures and links",
+      "author": "Jason Harrop and the docx4j contributors",
+      "source": "https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx",
+      "evidence": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/legals/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes.",
+      "fetched": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx",
+      "committed": false,
+      "bytes": 156287,
+      "sha256": "a518cffcbef0b60cf5c95930acd9af9a56484e47376c5f0c4d6e3a15a0799941"
+    },
+    {
+      "file": "docx4j-two-charts.docx",
+      "group": "office",
+      "family": "docx",
+      "title": "docx4j chart test: two charts (Word)",
+      "features": "two native charts in a document",
+      "author": "Jason Harrop and the docx4j contributors",
+      "source": "https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx",
+      "evidence": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/legals/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes.",
+      "fetched": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx",
+      "committed": false,
+      "bytes": 41590,
+      "sha256": "e0bc29916de415c53c03dcee14817bbd1e3eeea8f54a2b76629fe6754e6c641e"
+    },
+    {
+      "file": "gsa-policy-review-template.xlsx",
+      "group": "office",
+      "family": "xlsx",
+      "title": "Section508.gov Policy Review Template (Excel)",
+      "features": "a government workbook with formatted tables",
+      "author": "U.S. General Services Administration and the agencies that wrote the documents (Section508.gov)",
+      "source": "https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx",
+      "evidence": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md",
+      "evidence_quote": "this project is in the public domain within the United States of America. Additionally, we waive copyright and",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx",
+      "committed": false,
+      "bytes": 222164,
+      "sha256": "840661eba4653879dca24f209bca1619f7b168ef1232b595df5713741b2465bd"
+    },
+    {
+      "file": "closedxml-pivot-tables.xlsx",
+      "group": "office",
+      "family": "xlsx",
+      "title": "ClosedXML example: pivot tables (Excel)",
+      "features": "pivot tables over a data sheet",
+      "author": "ClosedXML contributors",
+      "source": "https://github.com/ClosedXML/ClosedXML/blob/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx",
+      "evidence": "https://raw.githubusercontent.com/ClosedXML/ClosedXML/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/LICENSE",
+      "evidence_quote": "MIT License Copyright (c) 2016 ClosedXML",
+      "licence": "MIT",
+      "attribution": "Copyright (c) 2016 ClosedXML, MIT, https://github.com/ClosedXML/ClosedXML. No changes.",
+      "fetched": "https://raw.githubusercontent.com/ClosedXML/ClosedXML/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx",
+      "committed": false,
+      "bytes": 30912,
+      "sha256": "d13f149091c804cfe9b02c81301ea7ce13d20d1f3311cac799151541d0467d02"
+    },
+    {
+      "file": "xlsxwriter-bar-chart.xlsx",
+      "group": "office",
+      "family": "xlsx",
+      "title": "XlsxWriter test file: a bar chart (Excel)",
+      "features": "a native bar chart saved in Excel",
+      "author": "John McNamara (XlsxWriter)",
+      "source": "https://github.com/jmcnamara/XlsxWriter/blob/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx",
+      "evidence": "https://raw.githubusercontent.com/jmcnamara/XlsxWriter/5d4606d89a955226d2d0825a0f44309043ae7251/LICENSE.txt",
+      "evidence_quote": "BSD 2-Clause License Copyright (c) 2013-2025, John McNamara",
+      "licence": "BSD-2-Clause",
+      "attribution": "Copyright (c) 2013-2025, John McNamara, BSD-2-Clause, https://github.com/jmcnamara/XlsxWriter. No changes.",
+      "fetched": "https://raw.githubusercontent.com/jmcnamara/XlsxWriter/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx",
+      "committed": false,
+      "bytes": 13879,
+      "sha256": "c4ed1e8117b4a0e014b95f42361c7e060728b398d4ea650395d902557429cdd2"
+    },
+    {
+      "file": "python-pptx-chart-types.pptx",
+      "group": "office",
+      "family": "pptx",
+      "title": "python-pptx test file: one slide for each chart type (PowerPoint)",
+      "features": "many native chart types",
+      "author": "Steve Canny (python-pptx)",
+      "source": "https://github.com/scanny/python-pptx/blob/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx",
+      "evidence": "https://raw.githubusercontent.com/scanny/python-pptx/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/LICENSE",
+      "evidence_quote": "The MIT License (MIT) Copyright (c) 2013 Steve Canny",
+      "licence": "MIT",
+      "attribution": "Copyright (c) 2013 Steve Canny, MIT, https://github.com/scanny/python-pptx. No changes.",
+      "fetched": "https://raw.githubusercontent.com/scanny/python-pptx/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx",
+      "committed": false,
+      "bytes": 1393564,
+      "sha256": "d0a7979d05970aa83fd8406f0829cd0019853a7bc4e16f8cda814586fc2eaccc"
+    },
+    {
+      "file": "cdc-lifecycle-508.pptx",
+      "group": "office",
+      "family": "pptx",
+      "title": "Integrating Section 508 Requirements in the Development Lifecycle (PowerPoint)",
+      "features": "a government deck with pictures and diagrams",
+      "author": "Mark D. Urban, CDC Section 508 Coordinator (US federal government)",
+      "source": "https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx",
+      "evidence": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md",
+      "evidence_quote": "this project is in the public domain within the United States of America. Additionally, we waive copyright and",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx",
+      "committed": false,
+      "bytes": 611924,
+      "sha256": "51c7d6af2e6682e5ee66204b813a45488e62b0e6e13cecc9207a982fdeb1720a"
+    },
+    {
+      "file": "poi-sample.doc",
+      "group": "converted",
+      "family": "doc",
+      "title": "Apache POI test document (Word 97)",
+      "features": "a binary .doc",
+      "author": "Apache POI committers",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc",
+      "committed": false,
+      "bytes": 27136,
+      "sha256": "717585c0a88f20862c86220163dd03da87cd743970354c6b29add32725f2e833"
+    },
+    {
+      "file": "poi-word95.doc",
+      "group": "converted",
+      "family": "doc",
+      "title": "Apache POI test document (Word 6 and 95 format)",
+      "features": "the pre-1997 Word format",
+      "author": "Nick Burch (Apache POI)",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc",
+      "committed": false,
+      "bytes": 102400,
+      "sha256": "a7b9557e917daf29cfee6baaa90226fbfa7900ffa05cc35bdc03aafdefef5789"
+    },
+    {
+      "file": "dhs-directive-139-02.doc",
+      "group": "converted",
+      "family": "doc",
+      "title": "DHS Directive 139-02 (Word 97)",
+      "features": "a government directive in the binary .doc format",
+      "author": "U.S. Department of Homeland Security",
+      "source": "https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc",
+      "evidence": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md",
+      "evidence_quote": "this project is in the public domain within the United States of America. Additionally, we waive copyright and",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc",
+      "committed": false,
+      "bytes": 82432,
+      "sha256": "48d1c85456d6b515ce8e3db6b43024f90bac69be86a3e78c1ae08406d4cad493"
+    },
+    {
+      "file": "poi-formula-eval.xls",
+      "group": "converted",
+      "family": "xls",
+      "title": "Apache POI test workbook of formulas (Excel 97)",
+      "features": "hundreds of formula cases",
+      "author": "Apache POI committers",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls",
+      "committed": false,
+      "bytes": 178176,
+      "sha256": "c2040c1fac1088f1e112abef197ae1f9bcb03547861783b89c1d4281a42049d1"
+    },
+    {
+      "file": "poi-conditional-formats.xls",
+      "group": "converted",
+      "family": "xls",
+      "title": "Apache POI test workbook of conditional formats (Excel 97)",
+      "features": "colour scales, icon sets and data bars",
+      "author": "Nick Burch (Apache POI)",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls",
+      "committed": false,
+      "bytes": 44544,
+      "sha256": "899a29aa6ce35fee0268847ff8b5d9459e6ce34d5e2ff462fd42ee9b80837b87"
+    },
+    {
+      "file": "poi-excel5.xls",
+      "group": "converted",
+      "family": "xls",
+      "title": "Apache POI test workbook (Excel 5 and 95 format)",
+      "features": "the BIFF5 format of 1993 to 1995",
+      "author": "Apache POI committers",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls",
+      "committed": false,
+      "bytes": 7680,
+      "sha256": "ac0ce3a2eff43e32e56d6b789df6aaa1645ae846d22fa3a2fe3057391d0f1cae"
+    },
+    {
+      "file": "poi-sample-show.ppt",
+      "group": "converted",
+      "family": "ppt",
+      "title": "Apache POI test presentation (PowerPoint 97)",
+      "features": "a binary .ppt",
+      "author": "Apache POI committers",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt",
+      "committed": false,
+      "bytes": 125440,
+      "sha256": "64275a6685b8f267827178037dcc59de927475e56385725916f4c6039c7ce7f6"
+    },
+    {
+      "file": "tika-rtf-various.rtf",
+      "group": "converted",
+      "family": "rtf",
+      "title": "Apache Tika test document: various RTF features",
+      "features": "fonts, colours, tables and lists in RTF",
+      "author": "Michael McCandless (Apache Tika)",
+      "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf",
+      "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf",
+      "committed": false,
+      "bytes": 65517,
+      "sha256": "cf00c56fe7099d14b820a0d751324e415f2c09af580f2c96f08614a2aec42c1e"
+    },
+    {
+      "file": "tdf-thesis-template.odt",
+      "group": "converted",
+      "family": "odt",
+      "title": "Thesis template in Spanish (OpenDocument text)",
+      "features": "styles, a table of contents, headers",
+      "author": "Phorious (Document Foundation wiki user)",
+      "source": "https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt",
+      "evidence": "https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt",
+      "evidence_quote": "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Ded",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://wiki.documentfoundation.org/images/5/54/Tesis-v1.0.4.odt",
+      "committed": false,
+      "bytes": 67249,
+      "sha256": "ec323e9fde67103a7f0039d8a59625bd7e2c5afa9e057563f5064c6b68d442a1"
+    },
+    {
+      "file": "tika-odt-ooo3.odt",
+      "group": "converted",
+      "family": "odt",
+      "title": "Apache Tika test document written with OpenOffice 3 (OpenDocument text)",
+      "features": "an .odt of 2009",
+      "author": "Apache Tika committers",
+      "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt",
+      "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt",
+      "committed": false,
+      "bytes": 24286,
+      "sha256": "b6cd74b570a98fcb6d838dd85ab869604e0711812d9533d5ecde0000b24ba7ef"
+    },
+    {
+      "file": "tdf-household-budget.ods",
+      "group": "converted",
+      "family": "ods",
+      "title": "Household budget book (OpenDocument spreadsheet)",
+      "features": "formulas, charts and several sheets",
+      "author": "Hrbrgr (Document Foundation wiki user)",
+      "source": "https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods",
+      "evidence": "https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods",
+      "evidence_quote": "This work is licensed under the Attribution 3.0 Unported License",
+      "licence": "CC-BY-3.0",
+      "attribution": "Hrbrgr (Document Foundation wiki user), Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, CC BY 3.0. No changes.",
+      "fetched": "https://wiki.documentfoundation.org/images/b/bc/Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods",
+      "committed": false,
+      "bytes": 21595,
+      "sha256": "aacd76666860f7bf879e1518a07b90d535815ce92d076ea26c835061b8aff854"
+    },
+    {
+      "file": "odfdo-flat.fods",
+      "group": "converted",
+      "family": "fods",
+      "title": "odfdo test sample (flat OpenDocument spreadsheet)",
+      "features": "one XML file",
+      "author": "Jérôme Dumonteil (odfdo)",
+      "source": "https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods",
+      "evidence": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.",
+      "fetched": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods",
+      "committed": false,
+      "bytes": 33177,
+      "sha256": "4966023bf427dbc9c975dc9b11816b4a90158f7dab452c59104b8800fb27ec36"
+    },
+    {
+      "file": "tdf-presentation-template.odp",
+      "group": "converted",
+      "family": "odp",
+      "title": "Presentation template (OpenDocument presentation)",
+      "features": "master slides, pictures and layouts",
+      "author": "Phorious (Document Foundation wiki user)",
+      "source": "https://wiki.documentfoundation.org/File:Presenta.odp",
+      "evidence": "https://wiki.documentfoundation.org/File:Presenta.odp",
+      "evidence_quote": "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Ded",
+      "licence": "CC0-1.0",
+      "attribution": "",
+      "fetched": "https://wiki.documentfoundation.org/images/5/51/Presenta.odp",
+      "committed": false,
+      "bytes": 412768,
+      "sha256": "147ca9c6dbcdd45470627b84c04824c7f3e07de57485a8190018eea5f23c64b3"
+    },
+    {
+      "file": "odfdo-example.odp",
+      "group": "converted",
+      "family": "odp",
+      "title": "odfdo test sample (OpenDocument presentation)",
+      "features": "slides with text and shapes",
+      "author": "Jérôme Dumonteil (odfdo)",
+      "source": "https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp",
+      "evidence": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.",
+      "fetched": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp",
+      "committed": false,
+      "bytes": 55687,
+      "sha256": "9075b87e36bb4618bdc9a8a6138bcaaf31b2b81e089e9006ac906e66a94f912b"
+    },
+    {
+      "file": "tdf-diagram-gallery.odg",
+      "group": "converted",
+      "family": "odg",
+      "title": "A gallery of diagrams (OpenDocument drawing)",
+      "features": "several diagram types",
+      "author": "Hrbrgr (Document Foundation wiki user)",
+      "source": "https://wiki.documentfoundation.org/File:Diagramme.odg",
+      "evidence": "https://wiki.documentfoundation.org/File:Diagramme.odg",
+      "evidence_quote": "This work is licensed under the Attribution 3.0 Unported License",
+      "licence": "CC-BY-3.0",
+      "attribution": "Hrbrgr (Document Foundation wiki user), Diagramme.odg, https://wiki.documentfoundation.org/File:Diagramme.odg, CC BY 3.0. No changes.",
+      "fetched": "https://wiki.documentfoundation.org/images/0/07/Diagramme.odg",
+      "committed": false,
+      "bytes": 91383,
+      "sha256": "2e5f43734db7c600256e0670f6ec9da9428eb6b7a074c4742fd506e32c833a5a"
+    },
+    {
+      "file": "odfdo-shapes.odg",
+      "group": "converted",
+      "family": "odg",
+      "title": "odfdo test sample: basic shapes (OpenDocument drawing)",
+      "features": "rectangles, ellipses, lines and polygons",
+      "author": "Jérôme Dumonteil (odfdo)",
+      "source": "https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg",
+      "evidence": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.",
+      "fetched": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg",
+      "committed": false,
+      "bytes": 10351,
+      "sha256": "dfe6a6c83ba5caec340889d6c77a899e420060d55f4b08fd9a1fb7b36e0b799f"
+    },
+    {
+      "file": "tika-keynote09.key",
+      "group": "converted",
+      "family": "keynote",
+      "title": "Apache Tika test presentation (Keynote '09)",
+      "features": "an XML Keynote document (index.apxl)",
+      "author": "Jukka Zitting (Apache Tika)",
+      "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key",
+      "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key",
+      "committed": false,
+      "bytes": 221745,
+      "sha256": "4a270c2427f11d77f82fae696e3fd6eda945bae0422ae87c5fac6cf2bd06015c"
+    },
+    {
+      "file": "tika-keynote2013.key",
+      "group": "converted",
+      "family": "keynote",
+      "title": "Apache Tika test presentation (Keynote 2013, IWA format)",
+      "features": "a Keynote document in the iWork archive format",
+      "author": "Tim Allison (Apache Tika)",
+      "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key",
+      "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key",
+      "committed": false,
+      "bytes": 274397,
+      "sha256": "8da93f6b566bc9eb22f4791bbfd5f2179162f39bf80968187b164c33d31824db"
+    },
+    {
+      "file": "tika-numbers09-charts.numbers",
+      "group": "converted",
+      "family": "numbers",
+      "title": "Apache Tika test spreadsheet with charts (Numbers '09)",
+      "features": "an XML Numbers document with charts",
+      "author": "Michael McCandless (Apache Tika)",
+      "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers",
+      "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers",
+      "committed": false,
+      "bytes": 104547,
+      "sha256": "f4430f2aa0ddab186e7e32f15552b58b7b03abada7a978dfbcd51e5548757789"
+    },
+    {
+      "file": "numbers-formulas.numbers",
+      "group": "converted",
+      "family": "numbers",
+      "title": "numbers-parser test spreadsheet of formulas (Numbers)",
+      "features": "formulas across tables",
+      "author": "Jon Connell (numbers-parser)",
+      "source": "https://github.com/masaccio/numbers-parser/blob/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers",
+      "evidence": "https://raw.githubusercontent.com/masaccio/numbers-parser/a6affe5599c8373f575192ac5777d0c6426da696/LICENSE.rst",
+      "evidence_quote": "Permission is hereby granted, free of charge, to any person obtaining a copy of this softw",
+      "licence": "MIT",
+      "attribution": "Copyright 2021 Jon Connell, numbers-parser, MIT, https://github.com/masaccio/numbers-parser. No changes.",
+      "fetched": "https://raw.githubusercontent.com/masaccio/numbers-parser/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers",
+      "committed": false,
+      "bytes": 330282,
+      "sha256": "9371c5b1d6ee4dfa17569097f064eba9c67f804d88b48638efbbeeb459d07dd4"
+    },
+    {
+      "file": "poi-network.vsdx",
+      "group": "converted",
+      "family": "visio",
+      "title": "Apache POI test diagram (Visio): a network",
+      "features": "a use-case diagram: actors, ovals and connecting lines",
+      "author": "A reporter of Apache POI bug 60489 (committed by Tim Allison)",
+      "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx",
+      "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx",
+      "committed": false,
+      "bytes": 44426,
+      "sha256": "15494702ecb5554c1dfaee2c09ac35e2ea656e2eed7ba4ba0cf1039e6125fbe1"
+    },
+    {
+      "file": "vsdx-house.vsdx",
+      "group": "converted",
+      "family": "visio",
+      "title": "vsdx library test drawing (Visio): a house",
+      "features": "boxes and house shapes with text",
+      "author": "Dave Howard (vsdx library)",
+      "source": "https://github.com/dave-howard/vsdx/blob/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx",
+      "evidence": "https://raw.githubusercontent.com/dave-howard/vsdx/6703e6c2c906bea4051f43525ec9af9dcf735c13/LICENSE",
+      "evidence_quote": "BSD 3-Clause License Copyright (c) 2020, Dave Howard",
+      "licence": "BSD-3-Clause",
+      "attribution": "Copyright (c) 2020, Dave Howard, BSD-3-Clause, https://github.com/dave-howard/vsdx. No changes.",
+      "fetched": "https://raw.githubusercontent.com/dave-howard/vsdx/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx",
+      "committed": false,
+      "bytes": 20914,
+      "sha256": "e454217e49d1ec2aaa7c9b8f38b148ffc0d028ce44ba096fe3386e9894b1775f"
+    },
+    {
+      "file": "tika-pages09-layout.pages",
+      "group": "unsupported",
+      "family": "pages",
+      "title": "Apache Tika test document (Pages '09)",
+      "features": "kept to show what the viewer says about Pages files, which it does not list yet",
+      "author": "Michael McCandless (Apache Tika)",
+      "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages",
+      "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt",
+      "evidence_quote": "Version 2.0, January 2004",
+      "licence": "Apache-2.0",
+      "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.",
+      "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages",
+      "committed": false,
+      "bytes": 66480,
+      "sha256": "6157fe7a95f7bc7d42251872f990d2f2d589f7f5e25a52b58e25c14cc447a4b2"
+    }
+  ]
+}
diff --git a/crates/exav-viewer/demo/examples/files/archives/encrypted-aes.zip b/crates/exav-viewer/demo/examples/files/archives/encrypted-aes.zip
new file mode 100644
index 00000000..adc147a7
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/encrypted-aes.zip differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/encrypted-zipcrypto.zip b/crates/exav-viewer/demo/examples/files/archives/encrypted-zipcrypto.zip
new file mode 100644
index 00000000..cdb7fa4b
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/encrypted-zipcrypto.zip differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/encrypted.7z b/crates/exav-viewer/demo/examples/files/archives/encrypted.7z
new file mode 100644
index 00000000..e1cc2da9
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/encrypted.7z differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/example.jar b/crates/exav-viewer/demo/examples/files/archives/example.jar
new file mode 100644
index 00000000..6f07e392
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/example.jar differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/exav-example.deb b/crates/exav-viewer/demo/examples/files/archives/exav-example.deb
new file mode 100644
index 00000000..7bfac737
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/exav-example.deb differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/libexample.a b/crates/exav-viewer/demo/examples/files/archives/libexample.a
new file mode 100644
index 00000000..075883e1
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/archives/libexample.a
@@ -0,0 +1,40 @@
+!<arch>
+README.txt/     0           0     0     644     227       `
+Example archive
+===============
+
+This archive holds a few files of the exav demo. It is in the public domain
+(CC0-1.0). Look at the folders: docs, data, images, src, an empty one, and a
+folder with accented and Japanese names.
+
+field-notes.txt/0           0     0     644     1632      `
+Field notes
+===========
+
+Plain text is shown as it is written: line breaks, indentation, tabs and
+long lines are kept.
+
+	A line that starts with a tab.
+        A line that starts with eight spaces.
+
+A very long line, to see how the viewer wraps or scrolls it: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Pangrams, one for each script:
+
+  English   The quick brown fox jumps over the lazy dog.
+  Français Portez ce vieux whisky au juge blond qui fume.
+  Deutsch   Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich.
+  Español  El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío.
+  Ελληνικά   Ξεσκεπάζω την ψυχοφθόρα βδελυγμία.
+  Русский   Съешь же ещё этих мягких французских булок да выпей чаю.
+  日本語    いろはにほへと ちりぬるを わかよたれそ つねならむ
+  العربية   نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومزخرف
+  עברית    דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה
+
+Symbols and box drawing:
+
+  ┌──────┬──────┐   ← ↑ → ↓   ✓ ✗   ½ ⅓ ¾   ± × ÷ ≠ ≤ ≥ ∞
+  │ a    │ b    │   € £ ¥ ₿   © ® ™   ☀ ☁ ☂ ☃
+  └──────┴──────┘
+
+The last line has no newline at the end.
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/archives/matryoshka.zip b/crates/exav-viewer/demo/examples/files/archives/matryoshka.zip
new file mode 100644
index 00000000..cb364545
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/matryoshka.zip differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/pages.cbz b/crates/exav-viewer/demo/examples/files/archives/pages.cbz
new file mode 100644
index 00000000..04c5fd2a
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/pages.cbz differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.7z b/crates/exav-viewer/demo/examples/files/archives/sample.7z
new file mode 100644
index 00000000..11e20bf6
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.7z differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.cab b/crates/exav-viewer/demo/examples/files/archives/sample.cab
new file mode 100644
index 00000000..8a7e54cc
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.cab differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.cpio b/crates/exav-viewer/demo/examples/files/archives/sample.cpio
new file mode 100644
index 00000000..53c7d50d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.cpio differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.iso b/crates/exav-viewer/demo/examples/files/archives/sample.iso
new file mode 100644
index 00000000..17b5c7cb
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.iso differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.rar b/crates/exav-viewer/demo/examples/files/archives/sample.rar
new file mode 100644
index 00000000..b1b3f915
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.rar differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.tar b/crates/exav-viewer/demo/examples/files/archives/sample.tar
new file mode 100644
index 00000000..af4121bc
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.tar differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.tar.bz2 b/crates/exav-viewer/demo/examples/files/archives/sample.tar.bz2
new file mode 100644
index 00000000..e324763b
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.tar.bz2 differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.tar.gz b/crates/exav-viewer/demo/examples/files/archives/sample.tar.gz
new file mode 100644
index 00000000..e2226a94
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.tar.gz differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.tar.xz b/crates/exav-viewer/demo/examples/files/archives/sample.tar.xz
new file mode 100644
index 00000000..67a330de
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.tar.xz differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.tar.zst b/crates/exav-viewer/demo/examples/files/archives/sample.tar.zst
new file mode 100644
index 00000000..be2a171f
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.tar.zst differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/sample.zip b/crates/exav-viewer/demo/examples/files/archives/sample.zip
new file mode 100644
index 00000000..8dfb9b37
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/sample.zip differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/server.log.bz2 b/crates/exav-viewer/demo/examples/files/archives/server.log.bz2
new file mode 100644
index 00000000..0ee7140c
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/server.log.bz2 differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/server.log.gz b/crates/exav-viewer/demo/examples/files/archives/server.log.gz
new file mode 100644
index 00000000..c466381d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/server.log.gz differ
diff --git a/crates/exav-viewer/demo/examples/files/archives/server.log.xz b/crates/exav-viewer/demo/examples/files/archives/server.log.xz
new file mode 100644
index 00000000..d6fbea03
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/archives/server.log.xz differ
diff --git a/crates/exav-viewer/demo/examples/files/cad/blocks.dxf b/crates/exav-viewer/demo/examples/files/cad/blocks.dxf
new file mode 100644
index 00000000..e7273b73
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/blocks.dxf
@@ -0,0 +1,6052 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+A2
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+9E
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+298.30127018922195
+ 22
+-110.57066309444073
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+421.1983924983256
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+5
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+PARTS
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+NOTE
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+RED
+ 70
+0
+ 62
+1
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+44
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+BL-TEXT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+9F
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+A0
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+6
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+45
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BOLT
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+52
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+PLATE
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+67
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+FRAME
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SYMBOL
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+46
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BOLT
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BOLT
+  1
+
+  0
+LWPOLYLINE
+  5
+48
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+-6.0
+ 20
+0.0
+ 10
+6.0
+ 20
+0.0
+ 10
+6.0
+ 20
+4.0
+ 10
+-6.0
+ 20
+4.0
+  0
+LWPOLYLINE
+  5
+49
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+-3.0
+ 20
+0.0
+ 10
+3.0
+ 20
+0.0
+ 10
+3.0
+ 20
+-22.0
+ 10
+-3.0
+ 20
+-22.0
+  0
+LINE
+  5
+4A
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-4.0
+ 30
+0.0
+ 11
+3.0
+ 21
+-6.5
+ 31
+0.0
+  0
+LINE
+  5
+4B
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-6.5
+ 30
+0.0
+ 11
+3.0
+ 21
+-9.0
+ 31
+0.0
+  0
+LINE
+  5
+4C
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-9.0
+ 30
+0.0
+ 11
+3.0
+ 21
+-11.5
+ 31
+0.0
+  0
+LINE
+  5
+4D
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-11.5
+ 30
+0.0
+ 11
+3.0
+ 21
+-14.0
+ 31
+0.0
+  0
+LINE
+  5
+4E
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-14.0
+ 30
+0.0
+ 11
+3.0
+ 21
+-16.5
+ 31
+0.0
+  0
+LINE
+  5
+4F
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-16.5
+ 30
+0.0
+ 11
+3.0
+ 21
+-19.0
+ 31
+0.0
+  0
+LINE
+  5
+50
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+-3.0
+ 20
+-19.0
+ 30
+0.0
+ 11
+3.0
+ 21
+-21.5
+ 31
+0.0
+  0
+ATTDEF
+  5
+51
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+8.0
+ 20
+1.0
+ 30
+0.0
+ 40
+2.5
+  1
+M6
+100
+AcDbAttributeDefinition
+  3
+
+  2
+SIZE
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+47
+330
+45
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+53
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+PLATE
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+PLATE
+  1
+
+  0
+LWPOLYLINE
+  5
+55
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+100.0
+ 20
+0.0
+ 10
+100.0
+ 20
+60.0
+ 10
+0.0
+ 20
+60.0
+  0
+CIRCLE
+  5
+56
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbCircle
+ 10
+15.0
+ 20
+15.0
+ 30
+0.0
+ 40
+4.0
+  0
+INSERT
+  5
+57
+330
+52
+100
+AcDbEntity
+  8
+RED
+100
+AcDbBlockReference
+ 66
+1
+  2
+BOLT
+ 10
+15.0
+ 20
+15.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+59
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+23.0
+ 20
+16.0
+ 30
+0.0
+ 40
+2.5
+  1
+M6
+ 11
+23.0
+ 21
+16.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+SIZE
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+23.0
+ 21
+16.0
+ 31
+0.0
+  0
+SEQEND
+  5
+58
+330
+57
+100
+AcDbEntity
+  8
+RED
+  0
+CIRCLE
+  5
+5A
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbCircle
+ 10
+85.0
+ 20
+15.0
+ 30
+0.0
+ 40
+4.0
+  0
+INSERT
+  5
+5B
+330
+52
+100
+AcDbEntity
+  8
+RED
+100
+AcDbBlockReference
+ 66
+1
+  2
+BOLT
+ 10
+85.0
+ 20
+15.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+5D
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+93.0
+ 20
+16.0
+ 30
+0.0
+ 40
+2.5
+  1
+M6
+ 11
+93.0
+ 21
+16.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+SIZE
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+93.0
+ 21
+16.0
+ 31
+0.0
+  0
+SEQEND
+  5
+5C
+330
+5B
+100
+AcDbEntity
+  8
+RED
+  0
+CIRCLE
+  5
+5E
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbCircle
+ 10
+15.0
+ 20
+45.0
+ 30
+0.0
+ 40
+4.0
+  0
+INSERT
+  5
+5F
+330
+52
+100
+AcDbEntity
+  8
+RED
+100
+AcDbBlockReference
+ 66
+1
+  2
+BOLT
+ 10
+15.0
+ 20
+45.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+61
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+23.0
+ 20
+46.0
+ 30
+0.0
+ 40
+2.5
+  1
+M6
+ 11
+23.0
+ 21
+46.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+SIZE
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+23.0
+ 21
+46.0
+ 31
+0.0
+  0
+SEQEND
+  5
+60
+330
+5F
+100
+AcDbEntity
+  8
+RED
+  0
+CIRCLE
+  5
+62
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbCircle
+ 10
+85.0
+ 20
+45.0
+ 30
+0.0
+ 40
+4.0
+  0
+INSERT
+  5
+63
+330
+52
+100
+AcDbEntity
+  8
+RED
+100
+AcDbBlockReference
+ 66
+1
+  2
+BOLT
+ 10
+85.0
+ 20
+45.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+65
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+93.0
+ 20
+46.0
+ 30
+0.0
+ 40
+2.5
+  1
+M6
+ 11
+93.0
+ 21
+46.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+SIZE
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+93.0
+ 21
+46.0
+ 31
+0.0
+  0
+SEQEND
+  5
+64
+330
+63
+100
+AcDbEntity
+  8
+RED
+  0
+ATTDEF
+  5
+66
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+50.0
+ 20
+30.0
+ 30
+0.0
+ 40
+6.0
+  1
+P-1
+ 72
+4
+ 11
+50.0
+ 21
+30.0
+ 31
+0.0
+100
+AcDbAttributeDefinition
+  3
+
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+50.0
+ 21
+30.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+54
+330
+52
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+68
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+FRAME
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+FRAME
+  1
+
+  0
+LWPOLYLINE
+  5
+6A
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+-10.0
+ 20
+-10.0
+ 10
+330.0
+ 20
+-10.0
+ 10
+330.0
+ 20
+90.0
+ 10
+-10.0
+ 20
+90.0
+  0
+INSERT
+  5
+6B
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+6D
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+50.0
+ 20
+30.0
+ 30
+0.0
+ 40
+6.0
+  1
+A
+ 72
+4
+ 11
+50.0
+ 21
+30.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+50.0
+ 21
+30.0
+ 31
+0.0
+  0
+SEQEND
+  5
+6C
+330
+6B
+100
+AcDbEntity
+  8
+0
+  0
+INSERT
+  5
+6E
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+120.0
+ 20
+0.0
+ 30
+0.0
+ 41
+0.7
+ 42
+0.7
+  0
+ATTRIB
+  5
+70
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+155.0
+ 20
+21.0
+ 30
+0.0
+ 40
+4.199999999999999
+  1
+B
+ 72
+4
+ 11
+155.0
+ 21
+21.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+155.0
+ 21
+21.0
+ 31
+0.0
+  0
+SEQEND
+  5
+6F
+330
+6E
+100
+AcDbEntity
+  8
+0
+  0
+INSERT
+  5
+71
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+230.0
+ 20
+70.0
+ 30
+0.0
+ 41
+0.6
+ 42
+0.6
+ 50
+-90.0
+  0
+ATTRIB
+  5
+73
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+248.0
+ 20
+40.0
+ 30
+0.0
+ 40
+3.5999999999999996
+  1
+C
+ 50
+-90.0
+ 72
+4
+ 11
+248.0
+ 21
+40.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+248.0
+ 21
+40.0
+ 31
+0.0
+  0
+SEQEND
+  5
+72
+330
+71
+100
+AcDbEntity
+  8
+0
+  0
+ENDBLK
+  5
+69
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+90
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SYMBOL
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SYMBOL
+  1
+
+  0
+CIRCLE
+  5
+92
+330
+8F
+100
+AcDbEntity
+  8
+0
+ 62
+0
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+10.0
+  0
+LINE
+  5
+93
+330
+8F
+100
+AcDbEntity
+  8
+0
+ 62
+0
+100
+AcDbLine
+ 10
+-10.0
+ 20
+0.0
+ 30
+0.0
+ 11
+10.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+94
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbLine
+ 10
+0.0
+ 20
+-10.0
+ 30
+0.0
+ 11
+0.0
+ 21
+10.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+91
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+INSERT
+  5
+74
+330
+17
+100
+AcDbEntity
+  8
+PARTS
+100
+AcDbBlockReference
+  2
+FRAME
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+TEXT
+  5
+76
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+0.0
+ 20
+-20.0
+ 30
+0.0
+ 40
+4.0
+  1
+FRAME: nested PLATE, BOLT blocks, attributes
+  7
+BL-TEXT
+ 11
+0.0
+ 21
+-20.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+77
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+0.0
+ 20
+-80.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+79
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+50.0
+ 20
+-50.0
+ 30
+0.0
+ 40
+6.0
+  1
+scale 1
+ 72
+4
+ 11
+50.0
+ 21
+-50.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+50.0
+ 21
+-50.0
+ 31
+0.0
+  0
+SEQEND
+  5
+78
+330
+77
+100
+AcDbEntity
+  8
+0
+  0
+TEXT
+  5
+7A
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+0.0
+ 20
+-100.0
+ 30
+0.0
+ 40
+4.0
+  1
+scale 1
+  7
+BL-TEXT
+ 11
+0.0
+ 21
+-100.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+7B
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+230.0
+ 20
+-80.0
+ 30
+0.0
+ 41
+-1.0
+  0
+ATTRIB
+  5
+7D
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+-180.0
+ 20
+-50.0
+ 30
+0.0
+ 40
+6.0
+  1
+xscale -1
+ 72
+4
+ 11
+-180.0
+ 21
+-50.0
+ 31
+0.0
+210
+0.0
+220
+0.0
+230
+-1.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-180.0
+ 21
+-50.0
+ 31
+0.0
+  0
+SEQEND
+  5
+7C
+330
+7B
+100
+AcDbEntity
+  8
+0
+  0
+TEXT
+  5
+7E
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+130.0
+ 20
+-100.0
+ 30
+0.0
+ 40
+4.0
+  1
+xscale -1
+  7
+BL-TEXT
+ 11
+130.0
+ 21
+-100.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+7F
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+260.0
+ 20
+-20.0
+ 30
+0.0
+ 42
+-1.0
+  0
+ATTRIB
+  5
+81
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+-310.0
+ 20
+-50.0
+ 30
+0.0
+ 40
+6.0
+  1
+yscale -1
+ 50
+180.0
+ 72
+4
+ 11
+-310.0
+ 21
+-50.0
+ 31
+0.0
+210
+0.0
+220
+0.0
+230
+-1.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-310.0
+ 21
+-50.0
+ 31
+0.0
+  0
+SEQEND
+  5
+80
+330
+7F
+100
+AcDbEntity
+  8
+0
+  0
+TEXT
+  5
+82
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+260.0
+ 20
+-100.0
+ 30
+0.0
+ 40
+4.0
+  1
+yscale -1
+  7
+BL-TEXT
+ 11
+260.0
+ 21
+-100.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+83
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+390.0
+ 20
+-80.0
+ 30
+0.0
+ 41
+1.5
+ 42
+0.6
+  0
+ATTRIB
+  5
+85
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+465.0
+ 20
+-62.0
+ 30
+0.0
+ 40
+3.5999999999999996
+  1
+1.5 by 0.6
+ 41
+2.5
+ 72
+4
+ 11
+465.0
+ 21
+-62.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+465.0
+ 21
+-62.0
+ 31
+0.0
+  0
+SEQEND
+  5
+84
+330
+83
+100
+AcDbEntity
+  8
+0
+  0
+TEXT
+  5
+86
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+390.0
+ 20
+-100.0
+ 30
+0.0
+ 40
+4.0
+  1
+1.5 by 0.6
+  7
+BL-TEXT
+ 11
+390.0
+ 21
+-100.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+87
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockReference
+ 66
+1
+  2
+PLATE
+ 10
+520.0
+ 20
+-80.0
+ 30
+0.0
+ 50
+30.0
+  0
+ATTRIB
+  5
+89
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+548.3012701892219
+ 20
+-29.01923788646684
+ 30
+0.0
+ 40
+6.0
+  1
+rotated 30
+ 50
+29.999999999999996
+ 72
+4
+ 11
+548.3012701892219
+ 21
+-29.01923788646684
+ 31
+0.0
+100
+AcDbAttribute
+  2
+MARK
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+548.3012701892219
+ 21
+-29.01923788646684
+ 31
+0.0
+  0
+SEQEND
+  5
+88
+330
+87
+100
+AcDbEntity
+  8
+0
+  0
+TEXT
+  5
+8A
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+520.0
+ 20
+-100.0
+ 30
+0.0
+ 40
+4.0
+  1
+rotated 30
+  7
+BL-TEXT
+ 11
+520.0
+ 21
+-100.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+8B
+330
+17
+100
+AcDbEntity
+  8
+PARTS
+100
+AcDbMInsertBlock
+ 66
+1
+  2
+BOLT
+ 10
+0.0
+ 20
+-200.0
+ 30
+0.0
+ 70
+8
+ 71
+3
+ 44
+20.0
+ 45
+35.0
+  0
+ATTRIB
+  5
+8D
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbText
+ 10
+8.0
+ 20
+-199.0
+ 30
+0.0
+ 40
+2.5
+  1
+M6
+ 11
+8.0
+ 21
+-199.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+SIZE
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+8.0
+ 21
+-199.0
+ 31
+0.0
+  0
+SEQEND
+  5
+8C
+330
+8B
+100
+AcDbEntity
+  8
+PARTS
+  0
+TEXT
+  5
+8E
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+0.0
+ 20
+-310.0
+ 30
+0.0
+ 40
+4.0
+  1
+MINSERT: 3 rows by 8 columns of BOLT
+  7
+BL-TEXT
+ 11
+0.0
+ 21
+-310.0
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+95
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbBlockReference
+  2
+SYMBOL
+ 10
+200.0
+ 20
+-220.0
+ 30
+0.0
+  0
+INSERT
+  5
+97
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbBlockReference
+  2
+SYMBOL
+ 10
+230.0
+ 20
+-220.0
+ 30
+0.0
+  0
+INSERT
+  5
+99
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+5
+100
+AcDbBlockReference
+  2
+SYMBOL
+ 10
+260.0
+ 20
+-220.0
+ 30
+0.0
+  0
+INSERT
+  5
+9B
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+6
+100
+AcDbBlockReference
+  2
+SYMBOL
+ 10
+290.0
+ 20
+-220.0
+ 30
+0.0
+  0
+TEXT
+  5
+9D
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+200.0
+ 20
+-240.0
+ 30
+0.0
+ 40
+3.0
+  1
+BYBLOCK circle and cross, BYLAYER vertical line: insert colour 1, 3, 5, 6
+  7
+BL-TEXT
+ 11
+200.0
+ 21
+-240.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+A1
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+A1
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/bracket.dxf b/crates/exav-viewer/demo/examples/files/cad/bracket.dxf
new file mode 100644
index 00000000..b099700f
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/bracket.dxf
@@ -0,0 +1,8288 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+E9
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+E5
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+101.06408489618218
+ 22
+-32.25
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+247.275
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+9
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+OUTLINE
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+50
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+HIDDEN
+ 70
+0
+ 62
+4
+  6
+DASHED
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+CENTER
+ 70
+0
+ 62
+1
+  6
+CENTER
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+44
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+SECTION
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+45
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+DIMS
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+46
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+SHEET
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+35
+390
+13
+347
+21
+  0
+LAYER
+  5
+47
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+TEXT
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+48
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+MECH
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+E6
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+E7
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+49
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+MECH
+ 70
+0
+ 40
+1.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 43
+3.75
+ 44
+2.1
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+3.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+1.05
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+1
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+48
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+4A
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+MECHTOL
+ 70
+0
+ 40
+1.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 43
+3.75
+ 44
+2.1
+ 45
+0.0
+ 46
+0.0
+ 47
+0.1
+ 48
+0.0
+ 49
+2.5
+140
+3.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+0.7
+147
+1.05
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+1
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+1
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+48
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+11
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+6D
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D1
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+72
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_CLOSEDFILLED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+80
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D2
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D3
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+9E
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D4
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+A9
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D5
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+B8
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D6
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+C5
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D7
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+D5
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space0
+340
+D8
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+6E
+330
+6D
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D1
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D1
+  1
+
+  0
+LINE
+  5
+70
+330
+6D
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-2.8000000000000003
+ 30
+0.0
+ 11
+0.0
+ 21
+-14.1
+ 31
+0.0
+  0
+LINE
+  5
+71
+330
+6D
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+100.0
+ 20
+-2.8000000000000003
+ 30
+0.0
+ 11
+100.0
+ 21
+-14.1
+ 31
+0.0
+  0
+INSERT
+  5
+76
+330
+6D
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+78
+330
+6D
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+100.0
+ 20
+-12.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+7A
+330
+6D
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+-12.0
+ 30
+0.0
+ 11
+97.2
+ 21
+-12.0
+ 31
+0.0
+  0
+MTEXT
+  5
+7B
+330
+6D
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+50.0
+ 20
+-9.2
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+100
+  7
+MECH
+  0
+POINT
+  5
+7C
+330
+6D
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+  0
+POINT
+  5
+7D
+330
+6D
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+7E
+330
+6D
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+100.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+6F
+330
+6D
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+73
+330
+72
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+_CLOSEDFILLED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+_CLOSEDFILLED
+  1
+
+  0
+SOLID
+  5
+75
+330
+72
+100
+AcDbEntity
+  8
+0
+  6
+BYBLOCK
+ 62
+0
+100
+AcDbTrace
+ 10
+-1.0
+ 20
+0.16439898372402537
+ 30
+0.0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+ 12
+-1.0
+ 22
+-0.16439898372402537
+ 32
+0.0
+ 13
+-1.0
+ 23
+-0.16439898372402537
+ 33
+0.0
+  0
+ENDBLK
+  5
+74
+330
+72
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+81
+330
+80
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D2
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D2
+  1
+
+  0
+LINE
+  5
+83
+330
+80
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2.8000000000000003
+ 20
+0.0
+ 30
+0.0
+ 11
+-14.1
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+84
+330
+80
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2.8000000000000003
+ 20
+72.0
+ 30
+0.0
+ 11
+-14.1
+ 21
+72.0
+ 31
+0.0
+  0
+INSERT
+  5
+85
+330
+80
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-12.0
+ 20
+0.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+270.0
+  0
+INSERT
+  5
+87
+330
+80
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-12.0
+ 20
+72.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+90.0
+  0
+LINE
+  5
+89
+330
+80
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-12.0
+ 20
+2.8000000000000003
+ 30
+0.0
+ 11
+-12.0
+ 21
+69.2
+ 31
+0.0
+  0
+MTEXT
+  5
+8A
+330
+80
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-14.8
+ 20
+36.0
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+\A1;72{\H0.70x;\S+0,10^  0,00;}
+  7
+MECH
+ 50
+90.0
+  0
+POINT
+  5
+8B
+330
+80
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-12.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+8C
+330
+80
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+8D
+330
+80
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+72.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+82
+330
+80
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+90
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D3
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D3
+  1
+
+  0
+LINE
+  5
+92
+330
+8F
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+35.0
+ 20
+-2.8000000000000003
+ 30
+0.0
+ 11
+35.0
+ 21
+-26.1
+ 31
+0.0
+  0
+LINE
+  5
+93
+330
+8F
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+80.0
+ 20
+-2.8000000000000003
+ 30
+0.0
+ 11
+80.0
+ 21
+-26.1
+ 31
+0.0
+  0
+INSERT
+  5
+94
+330
+8F
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+35.0
+ 20
+-24.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+96
+330
+8F
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+80.0
+ 20
+-24.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+98
+330
+8F
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+37.8
+ 20
+-24.0
+ 30
+0.0
+ 11
+77.2
+ 21
+-24.0
+ 31
+0.0
+  0
+MTEXT
+  5
+99
+330
+8F
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+57.5
+ 20
+-21.2
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+\A1;45{\H0.70x;\S+0,10^  0,00;}
+  7
+MECH
+  0
+POINT
+  5
+9A
+330
+8F
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+35.0
+ 20
+-24.0
+ 30
+0.0
+  0
+POINT
+  5
+9B
+330
+8F
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+35.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+9C
+330
+8F
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+80.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+91
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+9F
+330
+9E
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D4
+  1
+
+  0
+INSERT
+  5
+A1
+330
+9E
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14.343145750507619
+ 20
+14.34314575050762
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+44.99999999999997
+  0
+LINE
+  5
+A3
+330
+9E
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+20.0
+ 20
+20.0
+ 30
+0.0
+ 11
+14.343145750507619
+ 21
+14.34314575050762
+ 31
+0.0
+  0
+LINE
+  5
+A4
+330
+9E
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+12.363246763185284
+ 20
+12.363246763185288
+ 30
+0.0
+ 11
+6.671037174633574
+ 21
+6.67103717463358
+ 31
+0.0
+  0
+MTEXT
+  5
+A5
+330
+9E
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+7.166011921464162
+ 20
+11.125809896108832
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+R8
+  7
+MECH
+ 50
+44.99999999999997
+  0
+POINT
+  5
+A6
+330
+9E
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+20.0
+ 20
+20.0
+ 30
+0.0
+  0
+POINT
+  5
+A7
+330
+9E
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14.343145750507619
+ 20
+14.34314575050762
+ 30
+0.0
+  0
+ENDBLK
+  5
+A0
+330
+9E
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+AA
+330
+A9
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D5
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D5
+  1
+
+  0
+LINE
+  5
+AC
+330
+A9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-87.2
+ 30
+0.0
+ 11
+0.0
+ 21
+-75.9
+ 31
+0.0
+  0
+LINE
+  5
+AD
+330
+A9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+100.0
+ 20
+-87.2
+ 30
+0.0
+ 11
+100.0
+ 21
+-75.9
+ 31
+0.0
+  0
+INSERT
+  5
+AE
+330
+A9
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-78.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+B0
+330
+A9
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+100.0
+ 20
+-78.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+B2
+330
+A9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+-78.0
+ 30
+0.0
+ 11
+97.2
+ 21
+-78.0
+ 31
+0.0
+  0
+MTEXT
+  5
+B3
+330
+A9
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+50.0
+ 20
+-75.2
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+100
+  7
+MECH
+  0
+POINT
+  5
+B4
+330
+A9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-78.0
+ 30
+0.0
+  0
+POINT
+  5
+B5
+330
+A9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+B6
+330
+A9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+100.0
+ 20
+-90.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+AB
+330
+A9
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+B9
+330
+B8
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D6
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D6
+  1
+
+  0
+INSERT
+  5
+BB
+330
+B8
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+76.72339182284404
+ 20
+-122.29430574540419
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+35.00000000000006
+  0
+INSERT
+  5
+BD
+330
+B8
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+83.27660817715596
+ 20
+-117.70569425459581
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+35.00000000000006
+  0
+LINE
+  5
+BF
+330
+B8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+74.42976609883486
+ 20
+-123.90031976718711
+ 30
+0.0
+ 11
+80.98298245314679
+ 21
+-119.31170827637874
+ 31
+0.0
+  0
+LINE
+  5
+C0
+330
+B8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+74.42976609883486
+ 20
+-123.90031976718711
+ 30
+0.0
+ 11
+56.367463522262604
+ 21
+-136.5476801887277
+ 31
+0.0
+  0
+MTEXT
+  5
+C1
+330
+B8
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+63.36254596551408
+ 20
+-128.23150188303254
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+2x ⌀%%c8
+  7
+MECH
+ 50
+35.00000000000006
+  0
+POINT
+  5
+C2
+330
+B8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+80.0
+ 20
+-120.0
+ 30
+0.0
+  0
+POINT
+  5
+C3
+330
+B8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+76.72339182284404
+ 20
+-122.29430574540419
+ 30
+0.0
+  0
+ENDBLK
+  5
+BA
+330
+B8
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+C6
+330
+C5
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D7
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D7
+  1
+
+  0
+LINE
+  5
+C8
+330
+C5
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+212.8
+ 20
+0.0
+ 30
+0.0
+ 11
+222.1
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+C9
+330
+C5
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+212.8
+ 20
+12.0
+ 30
+0.0
+ 11
+222.1
+ 21
+12.0
+ 31
+0.0
+  0
+INSERT
+  5
+CA
+330
+C5
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+220.0
+ 20
+0.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+270.0
+  0
+INSERT
+  5
+CC
+330
+C5
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+220.0
+ 20
+12.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+90.0
+  0
+LINE
+  5
+CE
+330
+C5
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+220.0
+ 20
+2.8000000000000003
+ 30
+0.0
+ 11
+220.0
+ 21
+9.2
+ 31
+0.0
+  0
+MTEXT
+  5
+CF
+330
+C5
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+217.2
+ 20
+6.0
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+12
+  7
+MECH
+ 50
+90.0
+  0
+POINT
+  5
+D0
+330
+C5
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+D1
+330
+C5
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+210.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+D2
+330
+C5
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+210.0
+ 20
+12.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+C7
+330
+C5
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+D6
+330
+D5
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space0
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space0
+  1
+
+  0
+VIEWPORT
+  5
+D9
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+VIEWPORTS
+100
+AcDbViewport
+ 10
+143.5
+ 20
+100.0
+ 30
+0.0
+ 40
+326.70000000000005
+ 41
+231.00000000000003
+ 68
+1
+ 69
+1
+ 12
+143.5
+ 22
+100.0
+ 13
+0.0
+ 23
+0.0
+ 14
+10.0
+ 24
+10.0
+ 15
+10.0
+ 25
+10.0
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+231.00000000000003
+ 50
+0.0
+ 51
+0.0
+ 72
+100
+ 90
+557088
+  1
+
+281
+0
+ 71
+0
+ 74
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+282
+0
+  0
+LWPOLYLINE
+  5
+DA
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+5.0
+ 20
+5.0
+ 10
+292.0
+ 20
+5.0
+ 10
+292.0
+ 20
+205.0
+ 10
+5.0
+ 20
+205.0
+  0
+LWPOLYLINE
+  5
+DB
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+137.0
+ 20
+5.0
+ 10
+292.0
+ 20
+5.0
+ 10
+292.0
+ 20
+45.0
+ 10
+137.0
+ 20
+45.0
+  0
+LINE
+  5
+DC
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbLine
+ 10
+137.0
+ 20
+25.0
+ 30
+0.0
+ 11
+292.0
+ 21
+25.0
+ 31
+0.0
+  0
+LINE
+  5
+DD
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbLine
+ 10
+200.0
+ 20
+5.0
+ 30
+0.0
+ 11
+200.0
+ 21
+25.0
+ 31
+0.0
+  0
+LINE
+  5
+DE
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbLine
+ 10
+250.0
+ 20
+5.0
+ 30
+0.0
+ 11
+250.0
+ 21
+25.0
+ 31
+0.0
+  0
+TEXT
+  5
+DF
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbText
+ 10
+142.0
+ 20
+33.0
+ 30
+0.0
+ 40
+6.0
+  1
+L-BRACKET 100 x 72 x 60
+  7
+MECH
+ 11
+142.0
+ 21
+33.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+E0
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbText
+ 10
+142.0
+ 20
+15.0
+ 30
+0.0
+ 40
+3.5
+  1
+Material: steel S235
+  7
+MECH
+ 11
+142.0
+ 21
+15.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+E1
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbText
+ 10
+205.0
+ 20
+15.0
+ 30
+0.0
+ 40
+3.5
+  1
+Scale 1:1
+  7
+MECH
+ 11
+205.0
+ 21
+15.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+E2
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbText
+ 10
+255.0
+ 20
+15.0
+ 30
+0.0
+ 40
+3.5
+  1
+Sheet 1/1
+  7
+MECH
+ 11
+255.0
+ 21
+15.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+E3
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+SHEET
+100
+AcDbText
+ 10
+142.0
+ 20
+8.0
+ 30
+0.0
+ 40
+3.0
+  1
+Drawn: exav demo
+  7
+MECH
+ 11
+142.0
+ 21
+8.0
+ 31
+0.0
+100
+AcDbText
+  0
+VIEWPORT
+  5
+E4
+330
+D5
+100
+AcDbEntity
+ 67
+1
+  8
+VIEWPORTS
+100
+AcDbViewport
+ 10
+130.0
+ 20
+120.0
+ 30
+0.0
+ 40
+250.0
+ 41
+140.0
+ 68
+1
+ 69
+3
+ 12
+90.0
+ 22
+-30.0
+ 13
+0.0
+ 23
+0.0
+ 14
+10.0
+ 24
+10.0
+ 15
+10.0
+ 25
+10.0
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+140.0
+ 50
+0.0
+ 51
+0.0
+ 72
+100
+ 90
+0
+  1
+
+281
+0
+ 71
+0
+ 74
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+282
+0
+  0
+ENDBLK
+  5
+D7
+330
+D5
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+LWPOLYLINE
+  5
+4B
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbPolyline
+ 90
+7
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+100.0
+ 20
+0.0
+ 10
+100.0
+ 20
+12.0
+ 10
+20.0
+ 20
+12.0
+ 10
+12.0
+ 20
+12.0
+ 10
+12.0
+ 20
+72.0
+ 10
+0.0
+ 20
+72.0
+  0
+ARC
+  5
+4C
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbCircle
+ 10
+20.0
+ 20
+20.0
+ 30
+0.0
+ 40
+8.0
+100
+AcDbArc
+ 50
+180.0
+ 51
+270.0
+  0
+LINE
+  5
+4D
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+ 62
+8
+100
+AcDbLine
+ 10
+12.0
+ 20
+12.0
+ 30
+0.0
+ 11
+12.0
+ 21
+20.0
+ 31
+0.0
+  0
+LINE
+  5
+4E
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+100.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+4F
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbLine
+ 10
+31.0
+ 20
+0.0
+ 30
+0.0
+ 11
+31.0
+ 21
+12.0
+ 31
+0.0
+  0
+LINE
+  5
+50
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbLine
+ 10
+39.0
+ 20
+0.0
+ 30
+0.0
+ 11
+39.0
+ 21
+12.0
+ 31
+0.0
+  0
+LINE
+  5
+51
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+35.0
+ 20
+-6.0
+ 30
+0.0
+ 11
+35.0
+ 21
+18.0
+ 31
+0.0
+  0
+LINE
+  5
+52
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbLine
+ 10
+76.0
+ 20
+0.0
+ 30
+0.0
+ 11
+76.0
+ 21
+12.0
+ 31
+0.0
+  0
+LINE
+  5
+53
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbLine
+ 10
+84.0
+ 20
+0.0
+ 30
+0.0
+ 11
+84.0
+ 21
+12.0
+ 31
+0.0
+  0
+LINE
+  5
+54
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+80.0
+ 20
+-6.0
+ 30
+0.0
+ 11
+80.0
+ 21
+18.0
+ 31
+0.0
+  0
+LINE
+  5
+55
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+-6.0
+ 20
+52.0
+ 30
+0.0
+ 11
+18.0
+ 21
+52.0
+ 31
+0.0
+  0
+LINE
+  5
+56
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbLine
+ 10
+0.0
+ 20
+45.0
+ 30
+0.0
+ 11
+12.0
+ 21
+45.0
+ 31
+0.0
+  0
+LINE
+  5
+57
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbLine
+ 10
+0.0
+ 20
+59.0
+ 30
+0.0
+ 11
+12.0
+ 21
+59.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+58
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-90.0
+ 10
+100.0
+ 20
+-90.0
+ 10
+100.0
+ 20
+-150.0
+ 10
+0.0
+ 20
+-150.0
+  0
+LINE
+  5
+59
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbLine
+ 10
+12.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+12.0
+ 21
+-150.0
+ 31
+0.0
+  0
+CIRCLE
+  5
+5A
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbCircle
+ 10
+35.0
+ 20
+-120.0
+ 30
+0.0
+ 40
+4.0
+  0
+LINE
+  5
+5B
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+27.0
+ 20
+-120.0
+ 30
+0.0
+ 11
+43.0
+ 21
+-120.0
+ 31
+0.0
+  0
+LINE
+  5
+5C
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+35.0
+ 20
+-112.0
+ 30
+0.0
+ 11
+35.0
+ 21
+-128.0
+ 31
+0.0
+  0
+CIRCLE
+  5
+5D
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbCircle
+ 10
+80.0
+ 20
+-120.0
+ 30
+0.0
+ 40
+4.0
+  0
+LINE
+  5
+5E
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+72.0
+ 20
+-120.0
+ 30
+0.0
+ 11
+88.0
+ 21
+-120.0
+ 31
+0.0
+  0
+LINE
+  5
+5F
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+80.0
+ 20
+-112.0
+ 30
+0.0
+ 11
+80.0
+ 21
+-128.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+60
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+0.0
+ 20
+-110.0
+ 10
+12.0
+ 20
+-110.0
+  0
+LWPOLYLINE
+  5
+61
+330
+17
+100
+AcDbEntity
+  8
+HIDDEN
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+0.0
+ 20
+-130.0
+ 10
+12.0
+ 20
+-130.0
+  0
+LWPOLYLINE
+  5
+62
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+ 62
+8
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+0.0
+ 20
+-110.0
+ 10
+0.0
+ 20
+-130.0
+  0
+LWPOLYLINE
+  5
+63
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbPolyline
+ 90
+6
+ 70
+1
+ 10
+150.0
+ 20
+0.0
+ 10
+181.0
+ 20
+0.0
+ 10
+181.0
+ 20
+12.0
+ 10
+162.0
+ 20
+12.0
+ 10
+162.0
+ 20
+72.0
+ 10
+150.0
+ 20
+72.0
+  0
+LWPOLYLINE
+  5
+64
+330
+17
+100
+AcDbEntity
+  8
+OUTLINE
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+189.0
+ 20
+0.0
+ 10
+210.0
+ 20
+0.0
+ 10
+210.0
+ 20
+12.0
+ 10
+189.0
+ 20
+12.0
+  0
+HATCH
+  5
+65
+330
+17
+100
+AcDbEntity
+  8
+SECTION
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+6
+ 10
+150.0
+ 20
+0.0
+ 10
+181.0
+ 20
+0.0
+ 10
+181.0
+ 20
+12.0
+ 10
+162.0
+ 20
+12.0
+ 10
+162.0
+ 20
+72.0
+ 10
+150.0
+ 20
+72.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+2.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.4901280606
+ 46
+4.4901280606
+ 79
+0
+ 98
+0
+  0
+HATCH
+  5
+66
+330
+17
+100
+AcDbEntity
+  8
+SECTION
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+189.0
+ 20
+0.0
+ 10
+210.0
+ 20
+0.0
+ 10
+210.0
+ 20
+12.0
+ 10
+189.0
+ 20
+12.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+2.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.4901280606
+ 46
+4.4901280606
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+67
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+100
+AcDbLine
+ 10
+185.0
+ 20
+-6.0
+ 30
+0.0
+ 11
+185.0
+ 21
+18.0
+ 31
+0.0
+  0
+TEXT
+  5
+68
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+150.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+5.0
+  1
+SECTION A-A
+  7
+MECH
+ 11
+150.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+LWPOLYLINE
+  5
+69
+330
+17
+100
+AcDbEntity
+  8
+CENTER
+370
+50
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+-8.0
+ 20
+-120.0
+ 10
+108.0
+ 20
+-120.0
+  0
+TEXT
+  5
+6A
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+-14.0
+ 20
+-123.0
+ 30
+0.0
+ 40
+6.0
+  1
+A
+  7
+MECH
+ 11
+-14.0
+ 21
+-123.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+6B
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+112.0
+ 20
+-123.0
+ 30
+0.0
+ 40
+6.0
+  1
+A
+  7
+MECH
+ 11
+112.0
+ 21
+-123.0
+ 31
+0.0
+100
+AcDbText
+  0
+DIMENSION
+  5
+6C
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D1
+  3
+MECH
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+ 11
+50.0
+ 21
+-9.2
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+100.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+7F
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D2
+  3
+MECHTOL
+ 10
+-12.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-14.8
+ 21
+36.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+72.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+8E
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D3
+  3
+MECHTOL
+ 10
+35.0
+ 20
+-24.0
+ 30
+0.0
+ 11
+57.5
+ 21
+-21.2
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+35.0
+ 23
+0.0
+ 33
+0.0
+ 14
+80.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+9D
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D4
+  3
+MECH
+ 10
+20.0
+ 20
+20.0
+ 30
+0.0
+ 11
+7.166011921464162
+ 21
+11.125809896108832
+ 31
+0.0
+ 70
+36
+ 71
+5
+  1
+<>
+100
+AcDbRadialDimension
+ 15
+14.343145750507619
+ 25
+14.34314575050762
+ 35
+0.0
+  0
+DIMENSION
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D5
+  3
+MECH
+ 10
+0.0
+ 20
+-78.0
+ 30
+0.0
+ 11
+50.0
+ 21
+-75.2
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+-90.0
+ 33
+0.0
+ 14
+100.0
+ 24
+-90.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+B7
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D6
+  3
+MECH
+ 10
+83.27660817715596
+ 20
+-117.70569425459581
+ 30
+0.0
+ 11
+63.36254596551408
+ 21
+-128.23150188303254
+ 31
+0.0
+ 70
+35
+ 71
+5
+  1
+2x ⌀<>
+100
+AcDbDiametricDimension
+ 15
+76.72339182284404
+ 25
+-122.29430574540419
+ 35
+0.0
+  0
+DIMENSION
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D7
+  3
+MECH
+ 10
+220.0
+ 20
+0.0
+ 30
+0.0
+ 11
+217.2
+ 21
+6.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+210.0
+ 23
+0.0
+ 33
+0.0
+ 14
+210.0
+ 24
+12.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+LEADER
+  5
+D3
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbLeader
+  3
+Standard
+ 73
+3
+ 76
+3
+ 10
+155.0
+ 20
+60.0
+ 30
+0.0
+ 10
+138.0
+ 20
+80.0
+ 30
+0.0
+ 10
+110.0
+ 20
+80.0
+ 30
+0.0
+  0
+TEXT
+  5
+D4
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+110.0
+ 20
+82.0
+ 30
+0.0
+ 40
+3.5
+  1
+slot 14 x 12
+  7
+MECH
+ 11
+110.0
+ 21
+82.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  3
+A4 Sheet
+350
+D8
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+E8
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+LAYOUT
+  5
+D8
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  2
+DWG to PDF.pc3
+  4
+ezdxf_(297.00_x_210.00_MM)
+  6
+
+ 40
+5.0
+ 41
+5.0
+ 42
+5.0
+ 43
+5.0
+ 44
+297.0
+ 45
+210.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+672
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+A4 Sheet
+ 70
+1
+ 71
+3
+ 10
+-5.0
+ 20
+-5.0
+ 11
+292.0
+ 21
+205.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+D5
+331
+D9
+  0
+DICTIONARYVAR
+  5
+E8
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/dimensions.dxf b/crates/exav-viewer/demo/examples/files/cad/dimensions.dxf
new file mode 100644
index 00000000..87ae230a
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/dimensions.dxf
@@ -0,0 +1,10562 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+153
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ARC_DIMENSION
+  2
+AcDbArcDimension
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+1
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+14F
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+152.28944372309257
+ 22
+-33.04999999999998
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+308.80500000000006
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+5
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+OBJECT
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+35
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+DIMS
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+NOTE
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+44
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+DIM-TEXT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+150
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+151
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+4
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+45
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+METRIC
+ 70
+0
+ 40
+1.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 43
+3.75
+ 44
+2.1
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+3.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+1.05
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+1
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+44
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+46
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+TOL
+ 70
+0
+ 40
+1.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 43
+3.75
+ 44
+2.1
+ 45
+0.0
+ 46
+0.0
+ 47
+0.05
+ 48
+0.02
+ 49
+2.5
+140
+3.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+0.7
+147
+1.05
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+1
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+1
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+44
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+47
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+ARCH
+ 70
+0
+ 40
+1.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 43
+3.75
+ 44
+2.1
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+3.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+1.05
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+1
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+0
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+44
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+4A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D1
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+4F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_CLOSEDFILLED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+5D
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D2
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+6C
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D3
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+7B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D4
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D5
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+9A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D6
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+A8
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D7
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+B4
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D8
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+C6
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D9
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+D7
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D10
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+EA
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D11
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+F5
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D12
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+100
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D13
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+10B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D14
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+116
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D15
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+121
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D16
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+131
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D17
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+141
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D18
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+4B
+330
+4A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D1
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D1
+  1
+
+  0
+LINE
+  5
+4D
+330
+4A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-2.8000000000000003
+ 30
+0.0
+ 11
+0.0
+ 21
+-14.1
+ 31
+0.0
+  0
+LINE
+  5
+4E
+330
+4A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+80.0
+ 20
+-2.8000000000000003
+ 30
+0.0
+ 11
+80.0
+ 21
+-14.1
+ 31
+0.0
+  0
+INSERT
+  5
+53
+330
+4A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+55
+330
+4A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+80.0
+ 20
+-12.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+57
+330
+4A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+-12.0
+ 30
+0.0
+ 11
+77.2
+ 21
+-12.0
+ 31
+0.0
+  0
+MTEXT
+  5
+58
+330
+4A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+40.0
+ 20
+-9.2
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+80
+  7
+DIM-TEXT
+  0
+POINT
+  5
+59
+330
+4A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+  0
+POINT
+  5
+5A
+330
+4A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+5B
+330
+4A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+80.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+4C
+330
+4A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+50
+330
+4F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+_CLOSEDFILLED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+_CLOSEDFILLED
+  1
+
+  0
+SOLID
+  5
+52
+330
+4F
+100
+AcDbEntity
+  8
+0
+  6
+BYBLOCK
+ 62
+0
+100
+AcDbTrace
+ 10
+-1.0
+ 20
+0.16439898372402537
+ 30
+0.0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+ 12
+-1.0
+ 22
+-0.16439898372402537
+ 32
+0.0
+ 13
+-1.0
+ 23
+-0.16439898372402537
+ 33
+0.0
+  0
+ENDBLK
+  5
+51
+330
+4F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+5E
+330
+5D
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D2
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D2
+  1
+
+  0
+LINE
+  5
+60
+330
+5D
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2.8000000000000003
+ 20
+0.0
+ 30
+0.0
+ 11
+-16.1
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+61
+330
+5D
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2.8000000000000003
+ 20
+50.0
+ 30
+0.0
+ 11
+-16.1
+ 21
+50.0
+ 31
+0.0
+  0
+INSERT
+  5
+62
+330
+5D
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-14.0
+ 20
+0.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+270.0
+  0
+INSERT
+  5
+64
+330
+5D
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-14.0
+ 20
+50.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+90.0
+  0
+LINE
+  5
+66
+330
+5D
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-14.0
+ 20
+2.8000000000000003
+ 30
+0.0
+ 11
+-14.0
+ 21
+47.2
+ 31
+0.0
+  0
+MTEXT
+  5
+67
+330
+5D
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-16.8
+ 20
+25.0
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+50
+  7
+DIM-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+68
+330
+5D
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-14.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+69
+330
+5D
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+6A
+330
+5D
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+50.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+5F
+330
+5D
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+6D
+330
+6C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D3
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D3
+  1
+
+  0
+LINE
+  5
+6F
+330
+6C
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+52.8
+ 30
+0.0
+ 11
+0.0
+ 21
+64.1
+ 31
+0.0
+  0
+LINE
+  5
+70
+330
+6C
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+80.0
+ 20
+52.8
+ 30
+0.0
+ 11
+80.0
+ 21
+64.1
+ 31
+0.0
+  0
+INSERT
+  5
+71
+330
+6C
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+62.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+73
+330
+6C
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+80.0
+ 20
+62.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+75
+330
+6C
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+62.0
+ 30
+0.0
+ 11
+77.2
+ 21
+62.0
+ 31
+0.0
+  0
+MTEXT
+  5
+76
+330
+6C
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+40.0
+ 20
+64.8
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+\A1;80{\H0.70x;\S+0,05^ -0,02;}
+  7
+DIM-TEXT
+  0
+POINT
+  5
+77
+330
+6C
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+62.0
+ 30
+0.0
+  0
+POINT
+  5
+78
+330
+6C
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+50.0
+ 30
+0.0
+  0
+POINT
+  5
+79
+330
+6C
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+80.0
+ 20
+50.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+6E
+330
+6C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+7C
+330
+7B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D4
+  1
+
+  0
+LINE
+  5
+7E
+330
+7B
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+52.8
+ 30
+0.0
+ 11
+0.0
+ 21
+72.1
+ 31
+0.0
+  0
+LINE
+  5
+7F
+330
+7B
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+80.0
+ 20
+52.8
+ 30
+0.0
+ 11
+80.0
+ 21
+72.1
+ 31
+0.0
+  0
+INSERT
+  5
+80
+330
+7B
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+70.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+82
+330
+7B
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+80.0
+ 20
+70.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+84
+330
+7B
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+70.0
+ 30
+0.0
+ 11
+77.2
+ 21
+70.0
+ 31
+0.0
+  0
+MTEXT
+  5
+85
+330
+7B
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+40.0
+ 20
+74.9
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+80 overall (text override)
+  7
+DIM-TEXT
+  0
+POINT
+  5
+86
+330
+7B
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+70.0
+ 30
+0.0
+  0
+POINT
+  5
+87
+330
+7B
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+50.0
+ 30
+0.0
+  0
+POINT
+  5
+88
+330
+7B
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+80.0
+ 20
+50.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+7D
+330
+7B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+8B
+330
+8A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D5
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D5
+  1
+
+  0
+LINE
+  5
+8D
+330
+8A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+77.59901980800488
+ 20
+1.4405881151970736
+ 30
+0.0
+ 11
+67.90934974745312
+ 21
+7.254390151528121
+ 31
+0.0
+  0
+LINE
+  5
+8E
+330
+8A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+107.59901980800488
+ 20
+51.44058811519707
+ 30
+0.0
+ 11
+97.90934974745312
+ 21
+57.254390151528135
+ 31
+0.0
+  0
+INSERT
+  5
+8F
+330
+8A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+69.71008489144947
+ 20
+6.173949065130316
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+239.03624346792648
+  0
+INSERT
+  5
+91
+330
+8A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+99.71008489144947
+ 20
+56.17394906513033
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+59.03624346792648
+  0
+LINE
+  5
+93
+330
+8A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+71.15067300664654
+ 20
+8.57492925712544
+ 30
+0.0
+ 11
+98.2694967762524
+ 21
+53.772968873135206
+ 31
+0.0
+  0
+MTEXT
+  5
+94
+330
+8A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+82.30910469945435
+ 20
+32.614537180327396
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+58,3
+  7
+DIM-TEXT
+ 50
+59.03624346792648
+  0
+POINT
+  5
+95
+330
+8A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+69.71008489144947
+ 20
+6.173949065130316
+ 30
+0.0
+  0
+POINT
+  5
+96
+330
+8A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+80.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+97
+330
+8A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+110.0
+ 20
+50.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+8C
+330
+8A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+9B
+330
+9A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D6
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D6
+  1
+
+  0
+INSERT
+  5
+9D
+330
+9A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+130.84888892202554
+ 20
+8.930309757836518
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+39.99999999999997
+  0
+INSERT
+  5
+9F
+330
+9A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+169.15111107797446
+ 20
+41.06969024216348
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+39.99999999999997
+  0
+LINE
+  5
+A1
+330
+9A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+128.7039644812924
+ 20
+7.130504450714209
+ 30
+0.0
+ 11
+167.0061866372413
+ 21
+39.26988493504117
+ 31
+0.0
+  0
+LINE
+  5
+A2
+330
+9A
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+128.7039644812924
+ 20
+7.130504450714209
+ 30
+0.0
+ 11
+119.8561511632682
+ 21
+-0.2936924411653168
+ 31
+0.0
+  0
+MTEXT
+  5
+A3
+330
+9A
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+122.07807918252053
+ 20
+5.2258669504221515
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+%%c50
+  7
+DIM-TEXT
+ 50
+39.99999999999997
+  0
+POINT
+  5
+A4
+330
+9A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+150.0
+ 20
+25.0
+ 30
+0.0
+  0
+POINT
+  5
+A5
+330
+9A
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+130.84888892202554
+ 20
+8.930309757836518
+ 30
+0.0
+  0
+ENDBLK
+  5
+9C
+330
+9A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+A9
+330
+A8
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D7
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D7
+  1
+
+  0
+INSERT
+  5
+AB
+330
+A8
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+229.0
+ 20
+9.411542731880106
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+120.0
+  0
+LINE
+  5
+AD
+330
+A8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+220.0
+ 20
+25.0
+ 30
+0.0
+ 11
+229.0
+ 21
+9.411542731880106
+ 31
+0.0
+  0
+LINE
+  5
+AE
+330
+A8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+230.4
+ 20
+6.9866716012836765
+ 30
+0.0
+ 11
+236.175
+ 21
+-3.0159218124265887
+ 31
+0.0
+  0
+MTEXT
+  5
+AF
+330
+A8
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+235.97487113059643
+ 20
+2.9307115574417146
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+R18
+  7
+DIM-TEXT
+ 50
+300.0
+  0
+POINT
+  5
+B0
+330
+A8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+25.0
+ 30
+0.0
+  0
+POINT
+  5
+B1
+330
+A8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+229.0
+ 20
+9.411542731880106
+ 30
+0.0
+  0
+ENDBLK
+  5
+AA
+330
+A8
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+B5
+330
+B4
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D8
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D8
+  1
+
+  0
+LINE
+  5
+B7
+330
+B4
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+330.2188441696369
+ 20
+14.63846213433862
+ 30
+0.0
+ 11
+337.078600301374
+ 21
+17.135209180616002
+ 31
+0.0
+  0
+LINE
+  5
+B8
+330
+B4
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+257.2132978345078
+ 20
+27.511309694583893
+ 30
+0.0
+ 11
+251.62117339973923
+ 21
+32.20365924529563
+ 31
+0.0
+  0
+INSERT
+  5
+B9
+330
+B4
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+335.10524579772357
+ 20
+16.4169668796321
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+291.6711269024649
+  0
+INSERT
+  5
+BB
+330
+B4
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+253.22986673028907
+ 20
+30.853805264953902
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+-131.67112690246492
+  0
+MTEXT
+  5
+BD
+330
+B4
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+298.8213274254801
+ 20
+50.028233853020154
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+83,8
+  7
+DIM-TEXT
+ 50
+-10.000000000000018
+  0
+ARC
+  5
+BE
+330
+B4
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+290.0
+ 20
+0.0
+ 30
+0.0
+ 40
+47.99999999999999
+100
+AcDbArc
+ 50
+23.342253804929804
+ 51
+136.6577461950702
+  0
+POINT
+  5
+BF
+330
+B4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+298.33511252801264
+ 20
+47.27077214458598
+ 30
+0.0
+  0
+POINT
+  5
+C0
+330
+B4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+327.5877048314363
+ 20
+13.680805733026748
+ 30
+0.0
+  0
+POINT
+  5
+C1
+330
+B4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+259.3582222752409
+ 20
+25.71150438746158
+ 30
+0.0
+  0
+POINT
+  5
+C2
+330
+B4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+290.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+B6
+330
+B4
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+C7
+330
+C6
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D9
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D9
+  1
+
+  0
+LINE
+  5
+C9
+330
+C6
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.0927460923142474
+ 20
+-58.139781251276226
+ 30
+0.0
+ 11
+24.190270250470654
+ 21
+-38.49753755513719
+ 31
+0.0
+  0
+LINE
+  5
+CA
+330
+C6
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+57.2
+ 20
+-60.0
+ 30
+0.0
+ 11
+28.16549190084311
+ 21
+-60.0
+ 31
+0.0
+  0
+INSERT
+  5
+CB
+330
+C6
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+22.62071068123497
+ 20
+-39.89270161668003
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+314.2838875146575
+  0
+INSERT
+  5
+CD
+330
+C6
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+30.265491900843113
+ 20
+-60.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+87.3496518219127
+  0
+MTEXT
+  5
+CF
+330
+C6
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-30.907032852025363
+ 20
+-71.75083294615946
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+318,37°
+  7
+DIM-TEXT
+ 50
+290.8167696682851
+  0
+ARC
+  5
+D0
+330
+C6
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+0.0
+ 20
+-60.0
+ 30
+0.0
+ 40
+30.265491900843113
+100
+AcDbArc
+ 50
+46.934235692744785
+ 51
+-5.300696356174586
+  0
+POINT
+  5
+D1
+330
+C6
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+45.0
+ 20
+-20.0
+ 30
+0.0
+  0
+POINT
+  5
+D2
+330
+C6
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-60.0
+ 30
+0.0
+  0
+POINT
+  5
+D3
+330
+C6
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+60.0
+ 20
+-60.0
+ 30
+0.0
+  0
+POINT
+  5
+D4
+330
+C6
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-60.0
+ 30
+0.0
+  0
+POINT
+  5
+D5
+330
+C6
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+30.0
+ 20
+-56.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+C8
+330
+C6
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+D8
+330
+D7
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D10
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D10
+  1
+
+  0
+LINE
+  5
+DA
+330
+D7
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+148.61081097260086
+ 20
+-47.43108079794849
+ 30
+0.0
+ 11
+140.05211215395522
+ 21
+-62.40880373057834
+ 31
+0.0
+  0
+LINE
+  5
+DB
+330
+D7
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+167.2
+ 20
+-80.0
+ 30
+0.0
+ 11
+150.2606797749979
+ 21
+-80.0
+ 31
+0.0
+  0
+INSERT
+  5
+DC
+330
+D7
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+141.0940039245046
+ 20
+-60.58549313211698
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+333.8424019218803
+  0
+INSERT
+  5
+DE
+330
+D7
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+152.3606797749979
+ 20
+-80.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+86.41271678117742
+  0
+MTEXT
+  5
+E0
+330
+D7
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+108.23827411287941
+ 20
+-92.62881994304354
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+299,74°
+  7
+DIM-TEXT
+ 50
+300.12755935152893
+  0
+ARC
+  5
+E1
+330
+D7
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+130.0
+ 20
+-80.0
+ 30
+0.0
+ 40
+22.360679774997898
+100
+AcDbArc
+ 50
+67.42968514070293
+ 51
+-7.1745664376451455
+  0
+POINT
+  5
+E2
+330
+D7
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+140.0
+ 20
+-60.0
+ 30
+0.0
+  0
+POINT
+  5
+E3
+330
+D7
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+150.0
+ 20
+-45.0
+ 30
+0.0
+  0
+POINT
+  5
+E4
+330
+D7
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+170.0
+ 20
+-80.0
+ 30
+0.0
+  0
+POINT
+  5
+E5
+330
+D7
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+130.0
+ 20
+-80.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+D9
+330
+D7
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+EB
+330
+EA
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D11
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D11
+  1
+
+  0
+LINE
+  5
+ED
+330
+EA
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+220.0
+ 20
+-92.8
+ 30
+0.0
+ 11
+220.0
+ 21
+-95.6
+ 31
+0.0
+  0
+LINE
+  5
+EE
+330
+EA
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+220.0
+ 20
+-95.6
+ 30
+0.0
+ 11
+220.0
+ 21
+-96.39999999999999
+ 31
+0.0
+  0
+LINE
+  5
+EF
+330
+EA
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+220.0
+ 20
+-96.39999999999999
+ 30
+0.0
+ 11
+220.0
+ 21
+-105.49999999999999
+ 31
+0.0
+  0
+MTEXT
+  5
+F0
+330
+EA
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+217.2
+ 20
+-103.74999999999999
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+0
+  7
+DIM-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+F1
+330
+EA
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+F2
+330
+EA
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+F3
+330
+EA
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-101.99999999999999
+ 30
+0.0
+  0
+ENDBLK
+  5
+EC
+330
+EA
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+F6
+330
+F5
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D12
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D12
+  1
+
+  0
+LINE
+  5
+F8
+330
+F5
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+260.0
+ 20
+-92.8
+ 30
+0.0
+ 11
+260.0
+ 21
+-95.6
+ 31
+0.0
+  0
+LINE
+  5
+F9
+330
+F5
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+260.0
+ 20
+-95.6
+ 30
+0.0
+ 11
+259.99999999999994
+ 21
+-96.39999999999999
+ 31
+0.0
+  0
+LINE
+  5
+FA
+330
+F5
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+259.99999999999994
+ 20
+-96.39999999999999
+ 30
+0.0
+ 11
+259.99999999999994
+ 21
+-108.99999999999999
+ 31
+0.0
+  0
+MTEXT
+  5
+FB
+330
+F5
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+257.19999999999993
+ 20
+-105.49999999999999
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+40
+  7
+DIM-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+FC
+330
+F5
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+FD
+330
+F5
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+260.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+FE
+330
+F5
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+259.99999999999994
+ 20
+-101.99999999999999
+ 30
+0.0
+  0
+ENDBLK
+  5
+F7
+330
+F5
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+101
+330
+100
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D13
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D13
+  1
+
+  0
+LINE
+  5
+103
+330
+100
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+320.0
+ 20
+-92.8
+ 30
+0.0
+ 11
+320.0
+ 21
+-95.6
+ 31
+0.0
+  0
+LINE
+  5
+104
+330
+100
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+320.0
+ 20
+-95.6
+ 30
+0.0
+ 11
+320.0
+ 21
+-96.4
+ 31
+0.0
+  0
+LINE
+  5
+105
+330
+100
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+320.0
+ 20
+-96.4
+ 30
+0.0
+ 11
+320.0
+ 21
+-112.5
+ 31
+0.0
+  0
+MTEXT
+  5
+106
+330
+100
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+317.2
+ 20
+-107.25
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+100
+  7
+DIM-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+107
+330
+100
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+108
+330
+100
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+320.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+109
+330
+100
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+320.0
+ 20
+-102.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+102
+330
+100
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+10C
+330
+10B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D14
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D14
+  1
+
+  0
+LINE
+  5
+10E
+330
+10B
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+322.8
+ 20
+-90.0
+ 30
+0.0
+ 11
+325.6
+ 21
+-90.0
+ 31
+0.0
+  0
+LINE
+  5
+10F
+330
+10B
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+325.6
+ 20
+-90.0
+ 30
+0.0
+ 11
+328.4
+ 21
+-90.0
+ 31
+0.0
+  0
+LINE
+  5
+110
+330
+10B
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+328.4
+ 20
+-90.0
+ 30
+0.0
+ 11
+337.5
+ 21
+-90.0
+ 31
+0.0
+  0
+MTEXT
+  5
+111
+330
+10B
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+335.75
+ 20
+-87.2
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+0
+  7
+DIM-TEXT
+  0
+POINT
+  5
+112
+330
+10B
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+113
+330
+10B
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+320.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+114
+330
+10B
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+334.0
+ 20
+-90.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+10D
+330
+10B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+117
+330
+116
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D15
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D15
+  1
+
+  0
+LINE
+  5
+119
+330
+116
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+322.8
+ 20
+-60.0
+ 30
+0.0
+ 11
+325.6
+ 21
+-60.0
+ 31
+0.0
+  0
+LINE
+  5
+11A
+330
+116
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+325.6
+ 20
+-60.0
+ 30
+0.0
+ 11
+328.4
+ 21
+-59.999999999999986
+ 31
+0.0
+  0
+LINE
+  5
+11B
+330
+116
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+328.4
+ 20
+-59.999999999999986
+ 30
+0.0
+ 11
+341.0
+ 21
+-59.999999999999986
+ 31
+0.0
+  0
+MTEXT
+  5
+11C
+330
+116
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+337.5
+ 20
+-57.19999999999999
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+30
+  7
+DIM-TEXT
+  0
+POINT
+  5
+11D
+330
+116
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+11E
+330
+116
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+320.0
+ 20
+-60.0
+ 30
+0.0
+  0
+POINT
+  5
+11F
+330
+116
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+334.0
+ 20
+-59.999999999999986
+ 30
+0.0
+  0
+ENDBLK
+  5
+118
+330
+116
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+122
+330
+121
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D16
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D16
+  1
+
+  0
+LINE
+  5
+124
+330
+121
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+322.8
+ 20
+-40.0
+ 30
+0.0
+ 11
+325.6
+ 21
+-40.0
+ 31
+0.0
+  0
+LINE
+  5
+125
+330
+121
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+325.6
+ 20
+-40.0
+ 30
+0.0
+ 11
+328.4
+ 21
+-40.00000000000001
+ 31
+0.0
+  0
+LINE
+  5
+126
+330
+121
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+328.4
+ 20
+-40.00000000000001
+ 30
+0.0
+ 11
+341.0
+ 21
+-40.00000000000001
+ 31
+0.0
+  0
+MTEXT
+  5
+127
+330
+121
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+337.5
+ 20
+-37.20000000000001
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+50
+  7
+DIM-TEXT
+  0
+POINT
+  5
+128
+330
+121
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+  0
+POINT
+  5
+129
+330
+121
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+320.0
+ 20
+-40.0
+ 30
+0.0
+  0
+POINT
+  5
+12A
+330
+121
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+334.0
+ 20
+-40.00000000000001
+ 30
+0.0
+  0
+ENDBLK
+  5
+123
+330
+121
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+132
+330
+131
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D17
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D17
+  1
+
+  0
+LINE
+  5
+134
+330
+131
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-162.8
+ 30
+0.0
+ 11
+0.0
+ 21
+-170.1
+ 31
+0.0
+  0
+LINE
+  5
+135
+330
+131
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+60.0
+ 20
+-162.8
+ 30
+0.0
+ 11
+60.0
+ 21
+-170.1
+ 31
+0.0
+  0
+INSERT
+  5
+136
+330
+131
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-168.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+138
+330
+131
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+60.0
+ 20
+-168.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+13A
+330
+131
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+-168.0
+ 30
+0.0
+ 11
+26.5
+ 21
+-168.0
+ 31
+0.0
+  0
+LINE
+  5
+13B
+330
+131
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+33.49999999999999
+ 20
+-168.0
+ 30
+0.0
+ 11
+57.2
+ 21
+-168.0
+ 31
+0.0
+  0
+MTEXT
+  5
+13C
+330
+131
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+30.0
+ 20
+-168.0
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+60
+  7
+DIM-TEXT
+  0
+POINT
+  5
+13D
+330
+131
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-168.0
+ 30
+0.0
+  0
+POINT
+  5
+13E
+330
+131
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-160.0
+ 30
+0.0
+  0
+POINT
+  5
+13F
+330
+131
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+60.0
+ 20
+-160.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+133
+330
+131
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+142
+330
+141
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D18
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D18
+  1
+
+  0
+LINE
+  5
+144
+330
+141
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-162.8
+ 30
+0.0
+ 11
+0.0
+ 21
+-180.1
+ 31
+0.0
+  0
+LINE
+  5
+145
+330
+141
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+60.0
+ 20
+-162.8
+ 30
+0.0
+ 11
+60.0
+ 21
+-180.1
+ 31
+0.0
+  0
+INSERT
+  5
+146
+330
+141
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-178.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+ 50
+180.0
+  0
+INSERT
+  5
+148
+330
+141
+100
+AcDbEntity
+  8
+DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+60.0
+ 20
+-178.0
+ 30
+0.0
+ 41
+2.8000000000000003
+ 42
+2.8000000000000003
+  0
+LINE
+  5
+14A
+330
+141
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+2.8000000000000003
+ 20
+-178.0
+ 30
+0.0
+ 11
+57.2
+ 21
+-178.0
+ 31
+0.0
+  0
+MTEXT
+  5
+14B
+330
+141
+100
+AcDbEntity
+  8
+DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+30.0
+ 20
+-175.2
+ 30
+0.0
+ 40
+3.5
+ 71
+5
+  1
+\A1;60{\H0.70x;\S+0,05^ -0,02;}
+  7
+DIM-TEXT
+  0
+POINT
+  5
+14C
+330
+141
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-178.0
+ 30
+0.0
+  0
+POINT
+  5
+14D
+330
+141
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-160.0
+ 30
+0.0
+  0
+POINT
+  5
+14E
+330
+141
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+60.0
+ 20
+-160.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+143
+330
+141
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+LWPOLYLINE
+  5
+48
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+80.0
+ 20
+0.0
+ 10
+80.0
+ 20
+50.0
+ 10
+0.0
+ 20
+50.0
+  0
+DIMENSION
+  5
+49
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D1
+  3
+METRIC
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+ 11
+40.0
+ 21
+-9.2
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+80.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+5C
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D2
+  3
+METRIC
+ 10
+-14.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-16.8
+ 21
+25.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+50.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+6B
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D3
+  3
+TOL
+ 10
+0.0
+ 20
+62.0
+ 30
+0.0
+ 11
+40.0
+ 21
+64.8
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+50.0
+ 33
+0.0
+ 14
+80.0
+ 24
+50.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+7A
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D4
+  3
+METRIC
+ 10
+0.0
+ 20
+70.0
+ 30
+0.0
+ 11
+40.0
+ 21
+74.9
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+80 overall (text override)
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+50.0
+ 33
+0.0
+ 14
+80.0
+ 24
+50.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+89
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D5
+  3
+METRIC
+ 10
+69.71008489144947
+ 20
+6.173949065130316
+ 30
+0.0
+ 11
+82.30910469945435
+ 21
+32.614537180327396
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+80.0
+ 23
+0.0
+ 33
+0.0
+ 14
+110.0
+ 24
+50.0
+ 34
+0.0
+ 50
+59.03624346792648
+100
+AcDbRotatedDimension
+  0
+CIRCLE
+  5
+98
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbCircle
+ 10
+150.0
+ 20
+25.0
+ 30
+0.0
+ 40
+25.0
+  0
+DIMENSION
+  5
+99
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D6
+  3
+METRIC
+ 10
+169.15111107797446
+ 20
+41.06969024216348
+ 30
+0.0
+ 11
+122.07807918252053
+ 21
+5.2258669504221515
+ 31
+0.0
+ 70
+35
+ 71
+5
+  1
+<>
+100
+AcDbDiametricDimension
+ 15
+130.84888892202554
+ 25
+8.930309757836518
+ 35
+0.0
+  0
+CIRCLE
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbCircle
+ 10
+220.0
+ 20
+25.0
+ 30
+0.0
+ 40
+18.0
+  0
+DIMENSION
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D7
+  3
+METRIC
+ 10
+220.0
+ 20
+25.0
+ 30
+0.0
+ 11
+235.97487113059643
+ 21
+2.9307115574417146
+ 31
+0.0
+ 70
+36
+ 71
+5
+  1
+<>
+100
+AcDbRadialDimension
+ 15
+229.0
+ 25
+9.411542731880106
+ 35
+0.0
+  0
+ARC
+  5
+B2
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbCircle
+ 10
+290.0
+ 20
+0.0
+ 30
+0.0
+ 40
+40.0
+100
+AcDbArc
+ 50
+20.0
+ 51
+140.0
+  0
+ARC_DIMENSION
+  5
+B3
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D8
+  3
+METRIC
+ 10
+298.33511252801264
+ 20
+47.27077214458598
+ 30
+0.0
+ 11
+298.8213274254801
+ 21
+50.028233853020154
+ 31
+0.0
+ 70
+40
+ 71
+5
+  1
+<>
+100
+AcDbArcDimension
+ 13
+327.5877048314363
+ 23
+13.680805733026748
+ 33
+0.0
+ 14
+259.3582222752409
+ 24
+25.71150438746158
+ 34
+0.0
+ 15
+290.0
+ 25
+0.0
+ 35
+0.0
+ 40
+0.0
+ 41
+0.0
+ 70
+0
+ 71
+0
+ 16
+0.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+  0
+LINE
+  5
+C3
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbLine
+ 10
+0.0
+ 20
+-60.0
+ 30
+0.0
+ 11
+60.0
+ 21
+-60.0
+ 31
+0.0
+  0
+LINE
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbLine
+ 10
+0.0
+ 20
+-60.0
+ 30
+0.0
+ 11
+45.0
+ 21
+-20.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+C5
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D9
+  3
+METRIC
+ 10
+45.0
+ 20
+-20.0
+ 30
+0.0
+ 11
+-30.907032852025363
+ 21
+-71.75083294615946
+ 31
+0.0
+ 70
+34
+ 71
+5
+  1
+<>
+100
+AcDb2LineAngularDimension
+ 13
+0.0
+ 23
+-60.0
+ 33
+0.0
+ 14
+60.0
+ 24
+-60.0
+ 34
+0.0
+ 15
+0.0
+ 25
+-60.0
+ 35
+0.0
+ 16
+30.0
+ 26
+-56.0
+ 36
+0.0
+  0
+DIMENSION
+  5
+D6
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D10
+  3
+METRIC
+ 10
+140.0
+ 20
+-60.0
+ 30
+0.0
+ 11
+108.23827411287941
+ 21
+-92.62881994304354
+ 31
+0.0
+ 70
+37
+ 71
+5
+  1
+<>
+100
+AcDb3PointAngularDimension
+ 13
+150.0
+ 23
+-45.0
+ 33
+0.0
+ 14
+170.0
+ 24
+-80.0
+ 34
+0.0
+ 15
+130.0
+ 25
+-80.0
+ 35
+0.0
+ 16
+0.0
+ 26
+0.0
+ 36
+0.0
+  0
+LINE
+  5
+E6
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbLine
+ 10
+130.0
+ 20
+-80.0
+ 30
+0.0
+ 11
+170.0
+ 21
+-80.0
+ 31
+0.0
+  0
+LINE
+  5
+E7
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbLine
+ 10
+130.0
+ 20
+-80.0
+ 30
+0.0
+ 11
+150.0
+ 21
+-45.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+E8
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbPolyline
+ 90
+6
+ 70
+1
+ 10
+220.0
+ 20
+-90.0
+ 10
+320.0
+ 20
+-90.0
+ 10
+320.0
+ 20
+-40.0
+ 10
+260.0
+ 20
+-40.0
+ 10
+260.0
+ 20
+-60.0
+ 10
+220.0
+ 20
+-60.0
+  0
+DIMENSION
+  5
+E9
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D11
+  3
+METRIC
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+217.2
+ 21
+-103.74999999999999
+ 31
+0.0
+ 70
+102
+ 71
+5
+  1
+<>
+100
+AcDbOrdinateDimension
+ 13
+220.0
+ 23
+-90.0
+ 33
+0.0
+ 14
+220.0
+ 24
+-101.99999999999999
+ 34
+0.0
+  0
+DIMENSION
+  5
+F4
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D12
+  3
+METRIC
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+257.19999999999993
+ 21
+-105.49999999999999
+ 31
+0.0
+ 70
+102
+ 71
+5
+  1
+<>
+100
+AcDbOrdinateDimension
+ 13
+260.0
+ 23
+-90.0
+ 33
+0.0
+ 14
+259.99999999999994
+ 24
+-101.99999999999999
+ 34
+0.0
+  0
+DIMENSION
+  5
+FF
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D13
+  3
+METRIC
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+317.2
+ 21
+-107.25
+ 31
+0.0
+ 70
+102
+ 71
+5
+  1
+<>
+100
+AcDbOrdinateDimension
+ 13
+320.0
+ 23
+-90.0
+ 33
+0.0
+ 14
+320.0
+ 24
+-102.0
+ 34
+0.0
+  0
+DIMENSION
+  5
+10A
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D14
+  3
+METRIC
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+335.75
+ 21
+-87.2
+ 31
+0.0
+ 70
+38
+ 71
+5
+  1
+<>
+100
+AcDbOrdinateDimension
+ 13
+320.0
+ 23
+-90.0
+ 33
+0.0
+ 14
+334.0
+ 24
+-90.0
+ 34
+0.0
+  0
+DIMENSION
+  5
+115
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D15
+  3
+METRIC
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+337.5
+ 21
+-57.19999999999999
+ 31
+0.0
+ 70
+38
+ 71
+5
+  1
+<>
+100
+AcDbOrdinateDimension
+ 13
+320.0
+ 23
+-60.0
+ 33
+0.0
+ 14
+334.0
+ 24
+-59.999999999999986
+ 34
+0.0
+  0
+DIMENSION
+  5
+120
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D16
+  3
+METRIC
+ 10
+220.0
+ 20
+-90.0
+ 30
+0.0
+ 11
+337.5
+ 21
+-37.20000000000001
+ 31
+0.0
+ 70
+38
+ 71
+5
+  1
+<>
+100
+AcDbOrdinateDimension
+ 13
+320.0
+ 23
+-40.0
+ 33
+0.0
+ 14
+334.0
+ 24
+-40.00000000000001
+ 34
+0.0
+  0
+MULTILEADER
+  5
+12B
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbMLeader
+270
+2
+300
+CONTEXT_DATA{
+ 40
+1.0
+ 10
+98.0
+ 20
+83.25
+ 30
+0.0
+ 41
+3.5
+140
+4.0
+145
+2.0
+174
+1
+175
+1
+176
+0
+177
+0
+290
+1
+304
+Chamfer 2 x 45°
+ 11
+0.0
+ 21
+0.0
+ 31
+1.0
+340
+29
+ 12
+100.0
+ 22
+85.0
+ 32
+0.0
+ 13
+1.0
+ 23
+0.0
+ 33
+0.0
+ 42
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+1.0
+170
+1
+ 90
+-1056964608
+171
+1
+172
+1
+ 91
+-939524096
+141
+1.5
+ 92
+0
+291
+0
+292
+0
+173
+0
+293
+0
+142
+0.0
+143
+0.0
+294
+0
+295
+1
+296
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+297
+0
+302
+LEADER{
+290
+1
+291
+1
+ 10
+90.0
+ 20
+83.25
+ 30
+0.0
+ 11
+1.0
+ 21
+0.0
+ 31
+0.0
+ 90
+0
+ 40
+8.0
+304
+LEADER_LINE{
+ 10
+75.0
+ 20
+45.0
+ 30
+0.0
+ 91
+0
+ 92
+-1056964608
+305
+}
+271
+0
+303
+}
+272
+9
+273
+9
+301
+}
+340
+2C
+ 90
+2147483647
+170
+1
+ 91
+-1056964608
+341
+25
+171
+-2
+290
+1
+291
+1
+ 41
+8.0
+ 42
+4.0
+172
+2
+343
+29
+173
+1
+ 95
+1
+174
+1
+175
+0
+ 92
+-1056964608
+292
+0
+ 93
+-1056964608
+ 10
+1.0
+ 20
+1.0
+ 30
+1.0
+ 43
+0.0
+176
+0
+293
+0
+294
+0
+178
+0
+179
+1
+ 45
+1.0
+271
+0
+272
+9
+273
+9
+295
+0
+  0
+LEADER
+  5
+12C
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbLeader
+  3
+METRIC
+ 73
+3
+ 76
+3
+ 10
+15.0
+ 20
+15.0
+ 30
+0.0
+ 10
+30.0
+ 20
+30.0
+ 30
+0.0
+ 10
+40.0
+ 20
+30.0
+ 30
+0.0
+  0
+TEXT
+  5
+12D
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+41.0
+ 20
+29.0
+ 30
+0.0
+ 40
+3.5
+  1
+hole 5
+  7
+DIM-TEXT
+ 11
+41.0
+ 21
+29.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+12E
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+0.0
+ 20
+110.0
+ 30
+0.0
+ 40
+4.0
+  1
+METRIC style (left), TOL style with tolerances, ARCH (text horizontal)
+  7
+DIM-TEXT
+ 11
+0.0
+ 21
+110.0
+ 31
+0.0
+100
+AcDbText
+  0
+LWPOLYLINE
+  5
+12F
+330
+17
+100
+AcDbEntity
+  8
+OBJECT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-160.0
+ 10
+60.0
+ 20
+-160.0
+ 10
+60.0
+ 20
+-130.0
+ 10
+0.0
+ 20
+-130.0
+  0
+DIMENSION
+  5
+130
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D17
+  3
+ARCH
+ 10
+0.0
+ 20
+-168.0
+ 30
+0.0
+ 11
+30.0
+ 21
+-168.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+-160.0
+ 33
+0.0
+ 14
+60.0
+ 24
+-160.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+140
+330
+17
+100
+AcDbEntity
+  8
+DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D18
+  3
+TOL
+ 10
+0.0
+ 20
+-178.0
+ 30
+0.0
+ 11
+30.0
+ 21
+-175.2
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+-160.0
+ 33
+0.0
+ 14
+60.0
+ 24
+-160.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+152
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+152
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/hatch-gallery.dxf b/crates/exav-viewer/demo/examples/files/cad/hatch-gallery.dxf
new file mode 100644
index 00000000..bb8bfeb8
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/hatch-gallery.dxf
@@ -0,0 +1,26910 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+13E
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+13A
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+630.0
+ 22
+-965.7839919624917
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+2238.1463831212327
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+7
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+PATTERNS
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+GRADIENTS
+ 70
+0
+ 62
+5
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+ISLANDS
+ 70
+0
+ 62
+1
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+44
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+EDGES
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+45
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LABELS
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+46
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+LABEL
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+13B
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+13C
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+HATCH
+  5
+47
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+0.0
+ 10
+100.0
+ 20
+0.0
+ 10
+100.0
+ 20
+100.0
+ 10
+0.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.2450640303
+ 46
+2.2450640303
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+48
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+100.0
+ 20
+0.0
+ 10
+100.0
+ 20
+100.0
+ 10
+0.0
+ 20
+100.0
+  0
+TEXT
+  5
+49
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI31
+  7
+LABEL
+ 11
+0.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+4A
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI32
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+0.0
+ 10
+240.0
+ 20
+0.0
+ 10
+240.0
+ 20
+100.0
+ 10
+140.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.7351920908
+ 46
+6.7351920908
+ 79
+0
+ 53
+45.0
+ 43
+4.490128053
+ 44
+0.0
+ 45
+-6.7351920908
+ 46
+6.7351920908
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+4B
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+0.0
+ 10
+240.0
+ 20
+0.0
+ 10
+240.0
+ 20
+100.0
+ 10
+140.0
+ 20
+100.0
+  0
+TEXT
+  5
+4C
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI32
+  7
+LABEL
+ 11
+140.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+4D
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI33
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+0.0
+ 10
+380.0
+ 20
+0.0
+ 10
+380.0
+ 20
+100.0
+ 10
+280.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.4901280605
+ 46
+4.4901280605
+ 79
+0
+ 53
+45.0
+ 43
+4.490128053
+ 44
+0.0
+ 45
+-4.4901280605
+ 46
+4.4901280605
+ 79
+2
+ 49
+3.175
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+4E
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+0.0
+ 10
+380.0
+ 20
+0.0
+ 10
+380.0
+ 20
+100.0
+ 10
+280.0
+ 20
+100.0
+  0
+TEXT
+  5
+4F
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI33
+  7
+LABEL
+ 11
+280.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+50
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI34
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+0.0
+ 10
+520.0
+ 20
+0.0
+ 10
+520.0
+ 20
+100.0
+ 10
+420.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+4
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-13.4703841816
+ 46
+13.4703841816
+ 79
+0
+ 53
+45.0
+ 43
+4.490128053
+ 44
+0.0
+ 45
+-13.4703841816
+ 46
+13.4703841816
+ 79
+0
+ 53
+45.0
+ 43
+8.9802561314
+ 44
+0.0
+ 45
+-13.4703841816
+ 46
+13.4703841816
+ 79
+0
+ 53
+45.0
+ 43
+13.4703841844
+ 44
+0.0
+ 45
+-13.4703841816
+ 46
+13.4703841816
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+51
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+0.0
+ 10
+520.0
+ 20
+0.0
+ 10
+520.0
+ 20
+100.0
+ 10
+420.0
+ 20
+100.0
+  0
+TEXT
+  5
+52
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI34
+  7
+LABEL
+ 11
+420.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+53
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI35
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+0.0
+ 10
+660.0
+ 20
+0.0
+ 10
+660.0
+ 20
+100.0
+ 10
+560.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.4901280605
+ 46
+4.4901280605
+ 79
+0
+ 53
+45.0
+ 43
+4.490128053
+ 44
+0.0
+ 45
+-4.4901280605
+ 46
+4.4901280605
+ 79
+4
+ 49
+7.9375
+ 49
+-1.5875
+ 49
+0.0
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+54
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+0.0
+ 10
+660.0
+ 20
+0.0
+ 10
+660.0
+ 20
+100.0
+ 10
+560.0
+ 20
+100.0
+  0
+TEXT
+  5
+55
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI35
+  7
+LABEL
+ 11
+560.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+56
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI36
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+0.0
+ 10
+800.0
+ 20
+0.0
+ 10
+800.0
+ 20
+100.0
+ 10
+700.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+1.6837980227
+ 46
+6.1739260832
+ 79
+4
+ 49
+7.9375
+ 49
+-1.5875
+ 49
+0.0
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+57
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+0.0
+ 10
+800.0
+ 20
+0.0
+ 10
+800.0
+ 20
+100.0
+ 10
+700.0
+ 20
+100.0
+  0
+TEXT
+  5
+58
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI36
+  7
+LABEL
+ 11
+700.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+59
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI37
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+0.0
+ 10
+940.0
+ 20
+0.0
+ 10
+940.0
+ 20
+100.0
+ 10
+840.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.2450640303
+ 46
+2.2450640303
+ 79
+0
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.2450640303
+ 46
+-2.2450640303
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+5A
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+0.0
+ 10
+940.0
+ 20
+0.0
+ 10
+940.0
+ 20
+100.0
+ 10
+840.0
+ 20
+100.0
+  0
+TEXT
+  5
+5B
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI37
+  7
+LABEL
+ 11
+840.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+5C
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI38
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+0.0
+ 10
+1080.0
+ 20
+0.0
+ 10
+1080.0
+ 20
+100.0
+ 10
+980.0
+ 20
+100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.2450640303
+ 46
+2.2450640303
+ 79
+0
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.7351920908
+ 46
+2.2450640303
+ 79
+2
+ 49
+7.9375
+ 49
+-4.7625
+ 98
+0
+  0
+LWPOLYLINE
+  5
+5D
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+0.0
+ 10
+1080.0
+ 20
+0.0
+ 10
+1080.0
+ 20
+100.0
+ 10
+980.0
+ 20
+100.0
+  0
+TEXT
+  5
+5E
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-14.0
+ 30
+0.0
+ 40
+9.0
+  1
+ANSI38
+  7
+LABEL
+ 11
+980.0
+ 21
+-14.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+5F
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-B816
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-165.0
+ 10
+100.0
+ 20
+-165.0
+ 10
+100.0
+ 20
+-65.0
+ 10
+0.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+203.2
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-203.2
+ 46
+203.2
+ 79
+2
+ 49
+203.2
+ 49
+-203.2
+ 98
+0
+  0
+LWPOLYLINE
+  5
+60
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-165.0
+ 10
+100.0
+ 20
+-165.0
+ 10
+100.0
+ 20
+-65.0
+ 10
+0.0
+ 20
+-65.0
+  0
+TEXT
+  5
+61
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-B816
+  7
+LABEL
+ 11
+0.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+62
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-B816C
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-165.0
+ 10
+240.0
+ 20
+-165.0
+ 10
+240.0
+ 20
+-65.0
+ 10
+140.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+4
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+203.2
+ 46
+203.2
+ 79
+2
+ 49
+396.875
+ 49
+-9.525
+ 53
+0.0
+ 43
+-203.2
+ 44
+9.525
+ 45
+203.2
+ 46
+203.2
+ 79
+2
+ 49
+396.875
+ 49
+-9.525
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-203.2
+ 46
+203.2
+ 79
+2
+ 49
+-212.725
+ 49
+193.675
+ 53
+90.0
+ 43
+-9.525
+ 44
+0.0
+ 45
+-203.2
+ 46
+203.2
+ 79
+2
+ 49
+-212.725
+ 49
+193.675
+ 98
+0
+  0
+LWPOLYLINE
+  5
+63
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-165.0
+ 10
+240.0
+ 20
+-165.0
+ 10
+240.0
+ 20
+-65.0
+ 10
+140.0
+ 20
+-65.0
+  0
+TEXT
+  5
+64
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-B816C
+  7
+LABEL
+ 11
+140.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+65
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-B88
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-165.0
+ 10
+380.0
+ 20
+-165.0
+ 10
+380.0
+ 20
+-65.0
+ 10
+280.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+203.2
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-101.6
+ 46
+203.2
+ 79
+2
+ 49
+203.2
+ 49
+-203.2
+ 98
+0
+  0
+LWPOLYLINE
+  5
+66
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-165.0
+ 10
+380.0
+ 20
+-165.0
+ 10
+380.0
+ 20
+-65.0
+ 10
+280.0
+ 20
+-65.0
+  0
+TEXT
+  5
+67
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-B88
+  7
+LABEL
+ 11
+280.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+68
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-BRELM
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-165.0
+ 10
+520.0
+ 20
+-165.0
+ 10
+520.0
+ 20
+-65.0
+ 10
+420.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+8
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+135.484
+ 79
+2
+ 49
+193.675
+ 49
+-9.525
+ 53
+0.0
+ 43
+0.0
+ 44
+57.15
+ 45
+0.0
+ 46
+135.484
+ 79
+2
+ 49
+193.675
+ 49
+-9.525
+ 53
+0.0
+ 43
+50.8
+ 44
+67.7418
+ 45
+0.0
+ 46
+135.484
+ 79
+2
+ 49
+92.075
+ 49
+-9.525
+ 53
+0.0
+ 43
+50.8
+ 44
+124.892
+ 45
+0.0
+ 46
+135.484
+ 79
+2
+ 49
+92.075
+ 49
+-9.525
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-203.2
+ 46
+0.0
+ 79
+2
+ 49
+57.15
+ 49
+-78.334
+ 53
+90.0
+ 43
+-9.525
+ 44
+0.0
+ 45
+-203.2
+ 46
+0.0
+ 79
+2
+ 49
+57.15
+ 49
+-78.334
+ 53
+90.0
+ 43
+50.8
+ 44
+67.7418
+ 45
+-101.6
+ 46
+0.0
+ 79
+2
+ 49
+57.15
+ 49
+-78.334
+ 53
+90.0
+ 43
+41.275
+ 44
+67.7418
+ 45
+-101.6
+ 46
+0.0
+ 79
+2
+ 49
+57.15
+ 49
+-78.334
+ 98
+0
+  0
+LWPOLYLINE
+  5
+69
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-165.0
+ 10
+520.0
+ 20
+-165.0
+ 10
+520.0
+ 20
+-65.0
+ 10
+420.0
+ 20
+-65.0
+  0
+TEXT
+  5
+6A
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-BRELM
+  7
+LABEL
+ 11
+420.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+6B
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-BRSTD
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-165.0
+ 10
+660.0
+ 20
+-165.0
+ 10
+660.0
+ 20
+-65.0
+ 10
+560.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+67.7418
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-101.6
+ 46
+67.7418
+ 79
+2
+ 49
+67.7418
+ 49
+-67.7418
+ 98
+0
+  0
+LWPOLYLINE
+  5
+6C
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-165.0
+ 10
+660.0
+ 20
+-165.0
+ 10
+660.0
+ 20
+-65.0
+ 10
+560.0
+ 20
+-65.0
+  0
+TEXT
+  5
+6D
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-BRSTD
+  7
+LABEL
+ 11
+560.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+6E
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-CONC
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-165.0
+ 10
+800.0
+ 20
+-165.0
+ 10
+800.0
+ 20
+-65.0
+ 10
+700.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+13
+ 53
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+182.184668996
+ 46
+-15.9390855389
+ 79
+2
+ 49
+19.05
+ 49
+-209.55
+ 53
+355.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-35.243421425
+ 46
+191.056845239
+ 79
+2
+ 49
+15.24
+ 49
+-167.64058417
+ 53
+100.4514447
+ 43
+15.182007
+ 44
+-1.3282535
+ 45
+146.9412470904
+ 46
+175.1177519122
+ 79
+2
+ 49
+16.1900088
+ 49
+-178.0902446
+ 53
+46.1842
+ 43
+0.0
+ 44
+50.8
+ 45
+271.0790408921
+ 46
+-42.0423279327
+ 79
+2
+ 49
+28.575
+ 49
+-314.325
+ 53
+96.63555761
+ 43
+22.5899
+ 44
+47.2965
+ 45
+237.4041340515
+ 46
+247.4261245977
+ 79
+2
+ 49
+24.28502314
+ 49
+-267.13560816
+ 53
+351.18415117
+ 43
+0.0
+ 44
+50.8
+ 45
+237.404134065
+ 46
+247.4261245855
+ 79
+2
+ 49
+22.85996707
+ 49
+-251.45973192
+ 53
+21.0
+ 43
+25.4
+ 44
+38.1
+ 45
+151.6143912691
+ 46
+-102.2651981871
+ 79
+2
+ 49
+19.05
+ 49
+-209.55
+ 53
+326.0
+ 43
+25.4
+ 44
+38.1
+ 45
+61.8020283476
+ 46
+184.1879661223
+ 79
+2
+ 49
+15.24
+ 49
+-167.64
+ 53
+71.451445
+ 43
+38.0345326
+ 44
+29.5779001
+ 45
+213.4164192787
+ 46
+81.9227688859
+ 79
+2
+ 49
+16.1900088
+ 49
+-178.0899376
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+3.0886032506
+ 46
+84.5550388732
+ 79
+6
+ 49
+0.0
+ 49
+-165.608
+ 49
+0.0
+ 49
+-170.18
+ 49
+0.0
+ 49
+-168.275
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+66.8196625103
+ 46
+100.1805748181
+ 79
+6
+ 49
+0.0
+ 49
+-97.028
+ 49
+0.0
+ 49
+-161.798
+ 49
+0.0
+ 49
+-64.135
+ 53
+-32.5
+ 43
+-56.642
+ 44
+0.0
+ 45
+135.5905951669
+ 46
+-5.7287439927
+ 79
+6
+ 49
+0.0
+ 49
+-63.5
+ 49
+0.0
+ 49
+-198.12
+ 49
+0.0
+ 49
+-262.89
+ 53
+-42.5
+ 43
+-82.042
+ 44
+0.0
+ 45
+148.129181386
+ 46
+25.4264910333
+ 79
+6
+ 49
+0.0
+ 49
+-82.55
+ 49
+0.0
+ 49
+-131.572
+ 49
+0.0
+ 49
+-186.69
+ 98
+0
+  0
+LWPOLYLINE
+  5
+6F
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-165.0
+ 10
+800.0
+ 20
+-165.0
+ 10
+800.0
+ 20
+-65.0
+ 10
+700.0
+ 20
+-65.0
+  0
+TEXT
+  5
+70
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-CONC
+  7
+LABEL
+ 11
+700.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+71
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-HBONE
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-165.0
+ 10
+940.0
+ 20
+-165.0
+ 10
+940.0
+ 20
+-65.0
+ 10
+840.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+143.6840979371
+ 79
+2
+ 49
+304.8
+ 49
+-101.6
+ 53
+135.0
+ 43
+71.842
+ 44
+71.842
+ 45
+0.0
+ 46
+143.6840979371
+ 79
+2
+ 49
+304.8
+ 49
+-101.6
+ 98
+0
+  0
+LWPOLYLINE
+  5
+72
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-165.0
+ 10
+940.0
+ 20
+-165.0
+ 10
+940.0
+ 20
+-65.0
+ 10
+840.0
+ 20
+-65.0
+  0
+TEXT
+  5
+73
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-HBONE
+  7
+LABEL
+ 11
+840.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+74
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-PARQ1
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-165.0
+ 10
+1080.0
+ 20
+-165.0
+ 10
+1080.0
+ 20
+-65.0
+ 10
+980.0
+ 20
+-65.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+14
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+90.0
+ 43
+50.8
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+90.0
+ 43
+101.6
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+90.0
+ 43
+152.4
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+90.0
+ 43
+203.2
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+90.0
+ 43
+254.0
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+90.0
+ 43
+304.8
+ 44
+0.0
+ 45
+-304.8
+ 46
+304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+304.8
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+355.6
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+406.4
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+457.2
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+508.0
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+558.8
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 53
+0.0
+ 43
+0.0
+ 44
+609.6
+ 45
+304.8
+ 46
+-304.8
+ 79
+2
+ 49
+304.8
+ 49
+-304.8
+ 98
+0
+  0
+LWPOLYLINE
+  5
+75
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-165.0
+ 10
+1080.0
+ 20
+-165.0
+ 10
+1080.0
+ 20
+-65.0
+ 10
+980.0
+ 20
+-65.0
+  0
+TEXT
+  5
+76
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-179.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-PARQ1
+  7
+LABEL
+ 11
+980.0
+ 21
+-179.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+77
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-RROOF
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-330.0
+ 10
+100.0
+ 20
+-330.0
+ 10
+100.0
+ 20
+-230.0
+ 10
+0.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+55.88
+ 46
+25.4
+ 79
+4
+ 49
+381.0
+ 49
+-50.8
+ 49
+127.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+33.782
+ 44
+12.7
+ 45
+-25.4
+ 46
+33.782
+ 79
+4
+ 49
+76.2
+ 49
+-8.382
+ 49
+152.4
+ 49
+-19.05
+ 53
+0.0
+ 43
+12.7
+ 44
+21.59
+ 45
+132.08
+ 46
+17.018
+ 79
+4
+ 49
+203.2
+ 49
+-35.56
+ 49
+101.6
+ 49
+-25.4
+ 98
+0
+  0
+LWPOLYLINE
+  5
+78
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-330.0
+ 10
+100.0
+ 20
+-330.0
+ 10
+100.0
+ 20
+-230.0
+ 10
+0.0
+ 20
+-230.0
+  0
+TEXT
+  5
+79
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-RROOF
+  7
+LABEL
+ 11
+0.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+7A
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-RSHKE
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-330.0
+ 10
+240.0
+ 20
+-330.0
+ 10
+240.0
+ 20
+-230.0
+ 10
+140.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+9
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+647.7
+ 46
+304.8
+ 79
+6
+ 49
+152.4
+ 49
+-127.0
+ 49
+177.8
+ 49
+-76.2
+ 49
+228.6
+ 49
+-101.6
+ 53
+0.0
+ 43
+152.4
+ 44
+12.7
+ 45
+647.7
+ 46
+304.8
+ 79
+4
+ 49
+127.0
+ 49
+-482.6
+ 49
+101.6
+ 49
+-152.4
+ 53
+0.0
+ 43
+457.2
+ 44
+-19.05
+ 45
+647.7
+ 46
+304.8
+ 79
+2
+ 49
+76.2
+ 49
+-787.4
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-215.9
+ 46
+304.8
+ 79
+2
+ 49
+292.1
+ 49
+-927.1
+ 53
+90.0
+ 43
+152.4
+ 44
+0.0
+ 45
+-215.9
+ 46
+304.8
+ 79
+2
+ 49
+285.75
+ 49
+-933.45
+ 53
+90.0
+ 43
+279.4
+ 44
+0.0
+ 45
+-215.9
+ 46
+304.8
+ 79
+2
+ 49
+266.7
+ 49
+-952.5
+ 53
+90.0
+ 43
+457.2
+ 44
+-19.05
+ 45
+-215.9
+ 46
+304.8
+ 79
+2
+ 49
+292.1
+ 49
+-927.1
+ 53
+90.0
+ 43
+533.4
+ 44
+-19.05
+ 45
+-215.9
+ 46
+304.8
+ 79
+2
+ 49
+292.1
+ 49
+-927.1
+ 53
+90.0
+ 43
+762.0
+ 44
+0.0
+ 45
+-215.9
+ 46
+304.8
+ 79
+2
+ 49
+279.4
+ 49
+-939.8
+ 98
+0
+  0
+LWPOLYLINE
+  5
+7B
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-330.0
+ 10
+240.0
+ 20
+-330.0
+ 10
+240.0
+ 20
+-230.0
+ 10
+140.0
+ 20
+-230.0
+  0
+TEXT
+  5
+7C
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-RSHKE
+  7
+LABEL
+ 11
+140.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+7D
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-SAND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-330.0
+ 10
+380.0
+ 20
+-330.0
+ 10
+380.0
+ 20
+-230.0
+ 10
+280.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+4
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+-1.600031296
+ 46
+48.9413237329
+ 79
+6
+ 49
+0.0
+ 49
+-38.608
+ 49
+0.0
+ 49
+-43.18
+ 49
+0.0
+ 49
+-41.275
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+44.9523283138
+ 46
+71.6825100568
+ 79
+6
+ 49
+0.0
+ 49
+-20.828
+ 49
+0.0
+ 49
+-34.798
+ 49
+0.0
+ 49
+-13.335
+ 53
+-32.5
+ 43
+-31.242
+ 44
+0.0
+ 45
+79.0992370241
+ 46
+0.1437184679
+ 79
+6
+ 49
+0.0
+ 49
+-12.7
+ 49
+0.0
+ 49
+-45.72
+ 49
+0.0
+ 49
+-59.69
+ 53
+-42.5
+ 43
+-31.242
+ 44
+0.0
+ 45
+76.3556452472
+ 46
+22.2929323257
+ 79
+6
+ 49
+0.0
+ 49
+-6.35
+ 49
+0.0
+ 49
+-29.972
+ 49
+0.0
+ 49
+-34.29
+ 98
+0
+  0
+LWPOLYLINE
+  5
+7E
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-330.0
+ 10
+380.0
+ 20
+-330.0
+ 10
+380.0
+ 20
+-230.0
+ 10
+280.0
+ 20
+-230.0
+  0
+TEXT
+  5
+7F
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+AR-SAND
+  7
+LABEL
+ 11
+280.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+80
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BOX
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-330.0
+ 10
+520.0
+ 20
+-330.0
+ 10
+520.0
+ 20
+-230.0
+ 10
+420.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+8
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-25.4
+ 46
+0.0
+ 79
+0
+ 53
+90.0
+ 43
+6.35
+ 44
+0.0
+ 45
+-25.4
+ 46
+0.0
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+-6.35
+ 49
+6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+6.35
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+-6.35
+ 49
+6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+12.7
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+19.05
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+12.7
+ 44
+0.0
+ 45
+-25.4
+ 46
+0.0
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+19.05
+ 44
+0.0
+ 45
+-25.4
+ 46
+0.0
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+81
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-330.0
+ 10
+520.0
+ 20
+-330.0
+ 10
+520.0
+ 20
+-230.0
+ 10
+420.0
+ 20
+-230.0
+  0
+TEXT
+  5
+82
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+BOX
+  7
+LABEL
+ 11
+420.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+83
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRASS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-330.0
+ 10
+660.0
+ 20
+-330.0
+ 10
+660.0
+ 20
+-230.0
+ 10
+560.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+3.175
+ 45
+0.0
+ 46
+6.35
+ 79
+2
+ 49
+3.175
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+84
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-330.0
+ 10
+660.0
+ 20
+-330.0
+ 10
+660.0
+ 20
+-230.0
+ 10
+560.0
+ 20
+-230.0
+  0
+TEXT
+  5
+85
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRASS
+  7
+LABEL
+ 11
+560.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+86
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-330.0
+ 10
+800.0
+ 20
+-330.0
+ 10
+800.0
+ 20
+-230.0
+ 10
+700.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-12.7
+ 46
+0.0
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+6.35
+ 44
+0.0
+ 45
+-12.7
+ 46
+0.0
+ 79
+2
+ 49
+-6.35
+ 49
+6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+87
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-330.0
+ 10
+800.0
+ 20
+-330.0
+ 10
+800.0
+ 20
+-230.0
+ 10
+700.0
+ 20
+-230.0
+  0
+TEXT
+  5
+88
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK
+  7
+LABEL
+ 11
+700.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+89
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_DEMOLITION
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-330.0
+ 10
+940.0
+ 20
+-330.0
+ 10
+940.0
+ 20
+-230.0
+ 10
+840.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+2
+ 49
+2.54
+ 49
+-2.54
+ 53
+45.0
+ 43
+1.796034
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+2
+ 49
+2.54
+ 49
+-2.54
+ 98
+0
+  0
+LWPOLYLINE
+  5
+8A
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-330.0
+ 10
+940.0
+ 20
+-330.0
+ 10
+940.0
+ 20
+-230.0
+ 10
+840.0
+ 20
+-230.0
+  0
+TEXT
+  5
+8B
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_DEMOLITION
+  7
+LABEL
+ 11
+840.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+8C
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_EXISTING
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-330.0
+ 10
+1080.0
+ 20
+-330.0
+ 10
+1080.0
+ 20
+-230.0
+ 10
+980.0
+ 20
+-230.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-7.1842048969
+ 46
+7.1842048969
+ 79
+0
+ 53
+45.0
+ 43
+3.5920934
+ 44
+0.0
+ 45
+-7.1842048969
+ 46
+7.1842048969
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+8D
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-330.0
+ 10
+1080.0
+ 20
+-330.0
+ 10
+1080.0
+ 20
+-230.0
+ 10
+980.0
+ 20
+-230.0
+  0
+TEXT
+  5
+8E
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-344.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_EXISTING
+  7
+LABEL
+ 11
+980.0
+ 21
+-344.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+8F
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_FLBOND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-495.0
+ 10
+100.0
+ 20
+-495.0
+ 10
+100.0
+ 20
+-395.0
+ 10
+0.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+8
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+48.41875
+ 49
+-27.78125
+ 53
+0.0
+ 43
+50.8
+ 44
+0.0
+ 45
+38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+23.01875
+ 49
+-53.18125
+ 53
+0.0
+ 43
+0.0
+ 44
+14.5520833291
+ 45
+38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+48.41875
+ 49
+-27.78125
+ 53
+0.0
+ 43
+50.8
+ 44
+14.5520833291
+ 45
+38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+23.01875
+ 49
+-53.18125
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+14.5520833291
+ 49
+-19.3145833291
+ 53
+90.0
+ 43
+48.41875
+ 44
+0.0
+ 45
+-38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+14.5520833291
+ 49
+-19.3145833291
+ 53
+90.0
+ 43
+50.8
+ 44
+0.0
+ 45
+-38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+14.5520833291
+ 49
+-19.3145833291
+ 53
+90.0
+ 43
+73.81875
+ 44
+0.0
+ 45
+-38.1
+ 46
+16.9333333291
+ 79
+2
+ 49
+14.5520833291
+ 49
+-19.3145833291
+ 98
+0
+  0
+LWPOLYLINE
+  5
+90
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-495.0
+ 10
+100.0
+ 20
+-495.0
+ 10
+100.0
+ 20
+-395.0
+ 10
+0.0
+ 20
+-395.0
+  0
+TEXT
+  5
+91
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_FLBOND
+  7
+LABEL
+ 11
+0.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+92
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_INSULATING
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-495.0
+ 10
+240.0
+ 20
+-495.0
+ 10
+240.0
+ 20
+-395.0
+ 10
+140.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.2861792847
+ 46
+6.2861792847
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+2.54
+ 79
+2
+ 49
+0.0
+ 49
+-2.54
+ 98
+0
+  0
+LWPOLYLINE
+  5
+93
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-495.0
+ 10
+240.0
+ 20
+-495.0
+ 10
+240.0
+ 20
+-395.0
+ 10
+140.0
+ 20
+-395.0
+  0
+TEXT
+  5
+94
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_INSULATING
+  7
+LABEL
+ 11
+140.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+95
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_LWEIGHT
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-495.0
+ 10
+380.0
+ 20
+-495.0
+ 10
+380.0
+ 20
+-395.0
+ 10
+280.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.2861792847
+ 46
+6.2861792847
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.79375
+ 46
+1.5875
+ 79
+2
+ 49
+0.0
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+96
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-495.0
+ 10
+380.0
+ 20
+-495.0
+ 10
+380.0
+ 20
+-395.0
+ 10
+280.0
+ 20
+-395.0
+  0
+TEXT
+  5
+97
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_LWEIGHT
+  7
+LABEL
+ 11
+280.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+98
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_PAIRS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-495.0
+ 10
+520.0
+ 20
+-495.0
+ 10
+520.0
+ 20
+-395.0
+ 10
+420.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+8
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+50.8
+ 46
+50.8
+ 79
+6
+ 49
+48.41875
+ 49
+-2.38125
+ 49
+23.01875
+ 49
+-2.38125
+ 49
+23.01875
+ 49
+-2.38125
+ 53
+0.0
+ 43
+0.0
+ 44
+23.01875
+ 45
+50.8
+ 46
+50.8
+ 79
+2
+ 49
+48.41875
+ 49
+-53.18125
+ 53
+0.0
+ 43
+0.0
+ 44
+25.4
+ 45
+50.8
+ 46
+50.8
+ 79
+2
+ 49
+48.41875
+ 49
+-53.18125
+ 53
+0.0
+ 43
+0.0
+ 44
+48.41875
+ 45
+50.8
+ 46
+50.8
+ 79
+6
+ 49
+48.41875
+ 49
+-2.38125
+ 49
+23.01875
+ 49
+-2.38125
+ 49
+23.01875
+ 49
+-2.38125
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-50.8
+ 46
+50.8
+ 79
+6
+ 49
+23.01875
+ 49
+-2.38125
+ 49
+23.01875
+ 49
+-2.38125
+ 49
+48.41875
+ 49
+-2.38125
+ 53
+90.0
+ 43
+23.01875
+ 44
+50.8
+ 45
+-50.8
+ 46
+50.8
+ 79
+2
+ 49
+48.41875
+ 49
+-53.18125
+ 53
+90.0
+ 43
+25.4
+ 44
+50.8
+ 45
+-50.8
+ 46
+50.8
+ 79
+2
+ 49
+48.41875
+ 49
+-53.18125
+ 53
+90.0
+ 43
+48.41875
+ 44
+0.0
+ 45
+-50.8
+ 46
+50.8
+ 79
+6
+ 49
+23.01875
+ 49
+-2.38125
+ 49
+23.01875
+ 49
+-2.38125
+ 49
+48.41875
+ 49
+-2.38125
+ 98
+0
+  0
+LWPOLYLINE
+  5
+99
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-495.0
+ 10
+520.0
+ 20
+-495.0
+ 10
+520.0
+ 20
+-395.0
+ 10
+420.0
+ 20
+-395.0
+  0
+TEXT
+  5
+9A
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_PAIRS
+  7
+LABEL
+ 11
+420.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+9B
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_STBOND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-495.0
+ 10
+660.0
+ 20
+-495.0
+ 10
+660.0
+ 20
+-395.0
+ 10
+560.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+25.4
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-50.8
+ 46
+0.0
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+9C
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-495.0
+ 10
+660.0
+ 20
+-495.0
+ 10
+660.0
+ 20
+-395.0
+ 10
+560.0
+ 20
+-395.0
+  0
+TEXT
+  5
+9D
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_STBOND
+  7
+LABEL
+ 11
+560.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+9E
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+BRICK_STRBOND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-495.0
+ 10
+800.0
+ 20
+-495.0
+ 10
+800.0
+ 20
+-395.0
+ 10
+700.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+50.8
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-101.6
+ 46
+50.8
+ 79
+2
+ 49
+50.8
+ 49
+-50.8
+ 98
+0
+  0
+LWPOLYLINE
+  5
+9F
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-495.0
+ 10
+800.0
+ 20
+-495.0
+ 10
+800.0
+ 20
+-395.0
+ 10
+700.0
+ 20
+-395.0
+  0
+TEXT
+  5
+A0
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+BRICK_STRBOND
+  7
+LABEL
+ 11
+700.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+A1
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CLAY
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-495.0
+ 10
+940.0
+ 20
+-495.0
+ 10
+940.0
+ 20
+-395.0
+ 10
+840.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+4
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+4.7625
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+0.79375
+ 45
+0.0
+ 46
+4.7625
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+1.5875
+ 45
+0.0
+ 46
+4.7625
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+3.175
+ 45
+0.0
+ 46
+4.7625
+ 79
+2
+ 49
+4.7625
+ 49
+-3.175
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A2
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-495.0
+ 10
+940.0
+ 20
+-495.0
+ 10
+940.0
+ 20
+-395.0
+ 10
+840.0
+ 20
+-395.0
+  0
+TEXT
+  5
+A3
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+CLAY
+  7
+LABEL
+ 11
+840.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+A4
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CONCRETE1
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-495.0
+ 10
+1080.0
+ 20
+-495.0
+ 10
+1080.0
+ 20
+-395.0
+ 10
+980.0
+ 20
+-395.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+22
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+20.32
+ 46
+20.32
+ 79
+2
+ 49
+2.54
+ 49
+-17.78
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+2.54
+ 49
+-17.78
+ 53
+135.0
+ 43
+2.54
+ 44
+0.0
+ 45
+-20.3199999659
+ 46
+0.0
+ 79
+2
+ 49
+3.592102544
+ 49
+-25.144717808
+ 53
+0.0
+ 43
+2.54
+ 44
+11.43
+ 45
+20.32
+ 46
+20.32
+ 79
+2
+ 49
+2.54
+ 49
+-17.78
+ 53
+45.0
+ 43
+3.81
+ 44
+10.16
+ 45
+0.0
+ 46
+20.3199999659
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+135.0
+ 43
+3.81
+ 44
+10.16
+ 45
+-20.3199999659
+ 46
+0.0
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+0.0
+ 43
+10.16
+ 44
+16.51
+ 45
+20.32
+ 46
+20.32
+ 79
+2
+ 49
+3.592102544
+ 49
+-16.727897456
+ 53
+45.0
+ 43
+10.16
+ 44
+16.51
+ 45
+0.0
+ 46
+20.3199999659
+ 79
+2
+ 49
+2.54
+ 49
+-26.196820352
+ 53
+135.0
+ 43
+13.752102544
+ 44
+16.51
+ 45
+-20.3199999659
+ 46
+0.0
+ 79
+2
+ 49
+2.54
+ 49
+-26.196820352
+ 53
+90.0
+ 43
+13.97
+ 44
+5.08
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+2.54
+ 49
+-17.78
+ 53
+45.0
+ 43
+13.97
+ 44
+5.08
+ 45
+0.0
+ 46
+20.3199999659
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+135.0
+ 43
+15.24
+ 44
+6.35
+ 45
+-20.3199999659
+ 46
+0.0
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+0.0
+ 43
+2.54
+ 44
+5.08
+ 45
+20.32
+ 46
+20.32
+ 79
+2
+ 49
+1.27
+ 49
+-17.018
+ 53
+0.0
+ 43
+17.78
+ 44
+10.16
+ 45
+20.32
+ 46
+20.32
+ 79
+2
+ 49
+1.27
+ 49
+-17.018
+ 53
+90.0
+ 43
+11.43
+ 44
+12.7
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+1.27
+ 49
+-17.018
+ 53
+135.0
+ 43
+13.97
+ 44
+1.27
+ 45
+-20.3199999659
+ 46
+0.0
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+135.0
+ 43
+5.08
+ 44
+15.24
+ 45
+-20.3199999659
+ 46
+0.0
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+45.0
+ 43
+9.525
+ 44
+6.6675
+ 45
+0.0
+ 46
+20.3199999659
+ 79
+2
+ 49
+1.796050256
+ 49
+-26.940768064
+ 53
+90.0
+ 43
+6.985
+ 44
+2.54
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+0.3175
+ 49
+-20.0025
+ 53
+90.0
+ 43
+7.9375
+ 44
+11.1125
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+0.3175
+ 49
+-20.0025
+ 53
+90.0
+ 43
+17.4625
+ 44
+14.605
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+0.3175
+ 49
+-20.0025
+ 53
+90.0
+ 43
+17.78
+ 44
+3.81
+ 45
+-20.32
+ 46
+20.32
+ 79
+2
+ 49
+0.3175
+ 49
+-20.0025
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A5
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-495.0
+ 10
+1080.0
+ 20
+-495.0
+ 10
+1080.0
+ 20
+-395.0
+ 10
+980.0
+ 20
+-395.0
+  0
+TEXT
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-509.0
+ 30
+0.0
+ 40
+9.0
+  1
+CONCRETE1
+  7
+LABEL
+ 11
+980.0
+ 21
+-509.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CONCRETE2
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-660.0
+ 10
+100.0
+ 20
+-660.0
+ 10
+100.0
+ 20
+-560.0
+ 10
+0.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+13
+ 53
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+14.5747269104
+ 46
+-1.2751233828
+ 79
+2
+ 49
+1.524
+ 49
+-16.764
+ 53
+355.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.819427099
+ 46
+15.2845441568
+ 79
+2
+ 49
+1.2192
+ 49
+-13.4112
+ 53
+100.4514
+ 43
+1.2145605376
+ 44
+-0.1062601888
+ 45
+11.7553106364
+ 46
+14.0094114947
+ 79
+2
+ 49
+1.2952006608
+ 49
+-14.2472077158
+ 53
+46.1842
+ 43
+0.0
+ 44
+4.064
+ 45
+21.6863381081
+ 46
+-3.3633463712
+ 79
+2
+ 49
+2.286
+ 49
+-25.146
+ 53
+96.6356
+ 43
+1.8071946584
+ 44
+3.7837200018
+ 45
+18.9923461767
+ 46
+19.7940751367
+ 79
+2
+ 49
+1.9428010522
+ 49
+-21.37080816
+ 53
+351.1842
+ 43
+0.0
+ 44
+4.064
+ 45
+18.9923307251
+ 46
+19.7940899708
+ 79
+2
+ 49
+1.8288
+ 49
+-20.1168
+ 53
+21.0
+ 43
+2.032
+ 44
+3.048
+ 45
+12.129151299
+ 46
+-8.1812158583
+ 79
+2
+ 49
+1.524
+ 49
+-16.764
+ 53
+326.0
+ 43
+2.032
+ 44
+3.048
+ 45
+4.9441675446
+ 46
+14.7350489154
+ 79
+2
+ 49
+1.2192
+ 49
+-13.4112
+ 53
+71.4514
+ 43
+3.0427621746
+ 44
+2.3662313661
+ 45
+17.0733238128
+ 46
+6.5538196931
+ 79
+2
+ 49
+1.2952006608
+ 49
+-14.2472077158
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+0.24708826
+ 46
+6.7644031099
+ 79
+6
+ 49
+0.0
+ 49
+-13.24864
+ 49
+0.0
+ 49
+-13.6144
+ 49
+0.0
+ 49
+-13.462
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+5.3455730008
+ 46
+8.0144459854
+ 79
+6
+ 49
+0.0
+ 49
+-7.76224
+ 49
+0.0
+ 49
+-12.94384
+ 49
+0.0
+ 49
+-5.1308
+ 53
+-32.5
+ 43
+-4.53136
+ 44
+0.0
+ 45
+10.847271903
+ 46
+-0.4583149936
+ 79
+6
+ 49
+0.0
+ 49
+-5.08
+ 49
+0.0
+ 49
+-15.8496
+ 49
+0.0
+ 49
+-21.0312
+ 53
+-42.5
+ 43
+-6.56336
+ 44
+0.0
+ 45
+11.850342961
+ 46
+2.034133241
+ 79
+6
+ 49
+0.0
+ 49
+-6.604
+ 49
+0.0
+ 49
+-10.52576
+ 49
+0.0
+ 49
+-14.9352
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-660.0
+ 10
+100.0
+ 20
+-660.0
+ 10
+100.0
+ 20
+-560.0
+ 10
+0.0
+ 20
+-560.0
+  0
+TEXT
+  5
+A9
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+CONCRETE2
+  7
+LABEL
+ 11
+0.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+AA
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CONCRETE3
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-660.0
+ 10
+240.0
+ 20
+-660.0
+ 10
+240.0
+ 20
+-560.0
+ 10
+140.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+304
+ 53
+82.88
+ 43
+97.10721498
+ 44
+59.2083144
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.03725418
+ 49
+-136.48436
+ 53
+97.13
+ 43
+97.10660538
+ 44
+59.2448904
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.04934458
+ 49
+-136.4722696
+ 53
+116.57
+ 43
+97.09453022
+ 44
+59.29154258
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+135.0
+ 43
+97.06356
+ 44
+59.33695778
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+172.88
+ 43
+97.01943258
+ 44
+59.3792564
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+172.88
+ 43
+96.9621632
+ 44
+59.3875368
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+187.13
+ 43
+96.92463978
+ 44
+59.38655382
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.05259578
+ 49
+-136.4690184
+ 53
+225.0
+ 43
+96.8702152
+ 44
+59.3801708
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.06072378
+ 49
+-23.88639622
+ 53
+243.44
+ 43
+96.82142942
+ 44
+59.3422232
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+262.88
+ 43
+96.79022298
+ 44
+59.29440262
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+262.88
+ 43
+96.78295858
+ 44
+59.2425536
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+277.13
+ 43
+96.78366978
+ 44
+59.20499462
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.0483108
+ 49
+-136.47330338
+ 53
+296.57
+ 43
+96.79555698
+ 44
+59.1593432
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+315.0
+ 43
+96.8265272
+ 44
+59.11391022
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+352.88
+ 43
+96.87065462
+ 44
+59.07162938
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+7.13
+ 43
+96.96544742
+ 44
+59.0642964
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.0521208
+ 49
+-136.46949338
+ 53
+45.0
+ 43
+97.0198212
+ 44
+59.07066418
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.0608076
+ 49
+-23.8863124
+ 53
+63.44
+ 43
+97.06865778
+ 44
+59.1086448
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+82.88
+ 43
+97.09986422
+ 44
+59.15646538
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+82.88
+ 43
+87.67045458
+ 44
+53.3422352
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.03725418
+ 49
+-136.48436
+ 53
+97.13
+ 43
+87.66984498
+ 44
+53.37879342
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.04934458
+ 49
+-136.4722696
+ 53
+116.57
+ 43
+87.65776982
+ 44
+53.4254456
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+135.0
+ 43
+87.6267996
+ 44
+53.47087858
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+172.88
+ 43
+87.58267218
+ 44
+53.51315942
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+172.88
+ 43
+87.5254028
+ 44
+53.52143982
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+187.13
+ 43
+87.48787938
+ 44
+53.52045938
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.05259578
+ 49
+-136.4690184
+ 53
+225.0
+ 43
+87.4334548
+ 44
+53.51407382
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.06072378
+ 49
+-23.88639622
+ 53
+243.44
+ 43
+87.38466902
+ 44
+53.47612622
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+262.88
+ 43
+87.35346258
+ 44
+53.42830818
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+262.88
+ 43
+87.34619818
+ 44
+53.37645662
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+277.13
+ 43
+87.34690938
+ 44
+53.33890018
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.0483108
+ 49
+-136.47330338
+ 53
+296.57
+ 43
+87.35879658
+ 44
+53.29324622
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+315.0
+ 43
+87.3897668
+ 44
+53.24781578
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+352.88
+ 43
+87.43389422
+ 44
+53.2055324
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+7.13
+ 43
+87.52868702
+ 44
+53.19819942
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.0521208
+ 49
+-136.46949338
+ 53
+45.0
+ 43
+87.5830608
+ 44
+53.2045672
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.0608076
+ 49
+-23.8863124
+ 53
+63.44
+ 43
+87.63189738
+ 44
+53.24254782
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+82.88
+ 43
+87.66310382
+ 44
+53.29038618
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+82.88
+ 43
+93.68222818
+ 44
+52.93331298
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+63.44
+ 43
+93.6510192
+ 44
+52.8854924
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+45.0
+ 43
+93.60218262
+ 44
+52.847494
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.0608076
+ 49
+-23.8863124
+ 53
+7.13
+ 43
+93.54781138
+ 44
+52.84112622
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.0521208
+ 49
+-136.46949338
+ 53
+352.88
+ 43
+93.45301858
+ 44
+52.84847698
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+315.0
+ 43
+93.40888862
+ 44
+52.89075782
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+296.57
+ 43
+93.3779184
+ 44
+52.93617302
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+277.13
+ 43
+93.3660312
+ 44
+52.98182698
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.0483108
+ 49
+-136.47330338
+ 53
+262.88
+ 43
+93.36532
+ 44
+53.01938342
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+262.88
+ 43
+93.3725844
+ 44
+53.07125022
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+243.44
+ 43
+93.40379338
+ 44
+53.1190708
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+225.0
+ 43
+93.45257662
+ 44
+53.15700062
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.06072378
+ 49
+-23.88639622
+ 53
+187.13
+ 43
+93.5070012
+ 44
+53.16340142
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.05259578
+ 49
+-136.4690184
+ 53
+172.88
+ 43
+93.54452462
+ 44
+53.16436662
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+172.88
+ 43
+93.601794
+ 44
+53.15608622
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+135.0
+ 43
+93.64592142
+ 44
+53.11380538
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+116.57
+ 43
+93.67689418
+ 44
+53.0683724
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+97.13
+ 43
+93.6889668
+ 44
+53.02172022
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.04934458
+ 49
+-136.4722696
+ 53
+82.88
+ 43
+93.6895764
+ 44
+52.985162
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.03725418
+ 49
+-136.48436
+ 53
+82.88
+ 43
+89.09138138
+ 44
+65.02255982
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+63.44
+ 43
+89.06015462
+ 44
+64.97474178
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+45.0
+ 43
+89.01132058
+ 44
+64.93675862
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.0608076
+ 49
+-23.8863124
+ 53
+7.13
+ 43
+88.95696458
+ 44
+64.93039338
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.0521208
+ 49
+-136.46949338
+ 53
+352.88
+ 43
+88.862154
+ 44
+64.93772382
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+315.0
+ 43
+88.81802658
+ 44
+64.9800072
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+296.57
+ 43
+88.78705382
+ 44
+65.0254224
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+277.13
+ 43
+88.7751844
+ 44
+65.07107382
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.0483108
+ 49
+-136.47330338
+ 53
+262.88
+ 43
+88.77445542
+ 44
+65.10865058
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+262.88
+ 43
+88.78171982
+ 44
+65.1604996
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+243.44
+ 43
+88.81294658
+ 44
+65.20832018
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+225.0
+ 43
+88.86171458
+ 44
+65.24626778
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.06072378
+ 49
+-23.88639622
+ 53
+187.13
+ 43
+88.9161544
+ 44
+65.2526508
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.05259578
+ 49
+-136.4690184
+ 53
+172.88
+ 43
+88.95366258
+ 44
+65.253616
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+172.88
+ 43
+89.0109472
+ 44
+65.2453356
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+135.0
+ 43
+89.05507462
+ 44
+65.20305222
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+116.57
+ 43
+89.08604738
+ 44
+65.15763702
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+97.13
+ 43
+89.09810222
+ 44
+65.11098738
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.04934458
+ 49
+-136.4722696
+ 53
+82.88
+ 43
+89.0987296
+ 44
+65.07441138
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.03725418
+ 49
+-136.48436
+ 53
+82.88
+ 43
+88.11877982
+ 44
+63.97348902
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.15551658
+ 49
+-136.3660976
+ 53
+97.13
+ 43
+88.11622458
+ 44
+64.12612778
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.20597622
+ 49
+-136.31563542
+ 53
+116.57
+ 43
+88.06583098
+ 44
+64.32089498
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+135.0
+ 43
+87.93656022
+ 44
+64.51053138
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+172.88
+ 43
+87.75230862
+ 44
+64.6870436
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+172.88
+ 43
+87.51319302
+ 44
+64.72162062
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+187.13
+ 43
+87.35657662
+ 44
+64.71755662
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.21959062
+ 49
+-136.30202102
+ 53
+225.0
+ 43
+87.12934822
+ 44
+64.69088662
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.25350978
+ 49
+-23.69361022
+ 53
+243.44
+ 43
+86.92572658
+ 44
+64.53249222
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+262.88
+ 43
+86.79542458
+ 44
+64.33284822
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+262.88
+ 43
+86.76506142
+ 44
+64.11637418
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+277.13
+ 43
+86.7680764
+ 44
+63.95955458
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.20170902
+ 49
+-136.31990262
+ 53
+296.57
+ 43
+86.81769022
+ 44
+63.768986
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+315.0
+ 43
+86.94696098
+ 44
+63.5793496
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+352.88
+ 43
+87.13121258
+ 44
+63.4028196
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+7.13
+ 43
+87.52695982
+ 44
+63.37220498
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.21760942
+ 49
+-136.30400222
+ 53
+45.0
+ 43
+87.75393422
+ 44
+63.39877338
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.2538476
+ 49
+-23.6932724
+ 53
+63.44
+ 43
+87.95779462
+ 44
+63.55737098
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+82.88
+ 43
+88.0881144
+ 44
+63.75701498
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+82.88
+ 43
+87.3229648
+ 44
+65.74639378
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+63.44
+ 43
+87.1926628
+ 44
+65.54674978
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+45.0
+ 43
+86.98878462
+ 44
+65.38815218
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.2538476
+ 49
+-23.6932724
+ 53
+7.13
+ 43
+86.76181022
+ 44
+65.361566
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.21760942
+ 49
+-136.30400222
+ 53
+352.88
+ 43
+86.36606298
+ 44
+65.3921984
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+315.0
+ 43
+86.18182662
+ 44
+65.56871062
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+296.57
+ 43
+86.05254062
+ 44
+65.75834702
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+277.13
+ 43
+86.00294458
+ 44
+65.94893338
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.20170902
+ 49
+-136.31990262
+ 53
+262.88
+ 43
+85.9999296
+ 44
+66.1057352
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+262.88
+ 43
+86.03027498
+ 44
+66.32222702
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+243.44
+ 43
+86.16057698
+ 44
+66.52187102
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+225.0
+ 43
+86.36419862
+ 44
+66.68025018
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.25350978
+ 49
+-23.69361022
+ 53
+187.13
+ 43
+86.5914448
+ 44
+66.70692018
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.21959062
+ 49
+-136.30202102
+ 53
+172.88
+ 43
+86.7480612
+ 44
+66.71099942
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+172.88
+ 43
+86.9871768
+ 44
+66.6764224
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+135.0
+ 43
+87.17141062
+ 44
+66.4998924
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+116.57
+ 43
+87.30069662
+ 44
+66.310256
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+97.13
+ 43
+87.35107498
+ 44
+66.1154888
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.20597622
+ 49
+-136.31563542
+ 53
+82.88
+ 43
+87.353648
+ 44
+65.96285258
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.15551658
+ 49
+-136.3660976
+ 53
+82.88
+ 43
+94.74125578
+ 44
+62.99714858
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.52391818
+ 49
+-135.997696
+ 53
+63.44
+ 43
+94.43093382
+ 44
+62.52167582
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.55751222
+ 49
+-37.3071136
+ 53
+45.0
+ 43
+93.94542298
+ 44
+62.14397782
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.60453778
+ 49
+-23.34258222
+ 53
+7.13
+ 43
+93.40487542
+ 44
+62.08068102
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.51824382
+ 49
+-136.00336782
+ 53
+352.88
+ 43
+92.46236778
+ 44
+62.15361458
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.578866
+ 49
+-135.94274818
+ 53
+315.0
+ 43
+92.0235904
+ 44
+62.5740176
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.59077098
+ 49
+-23.35634902
+ 53
+296.57
+ 43
+91.71570938
+ 44
+63.0256296
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.559816
+ 49
+-37.30480982
+ 53
+277.13
+ 43
+91.5975816
+ 44
+63.47950982
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.4803648
+ 49
+-136.04124938
+ 53
+262.88
+ 43
+91.59040102
+ 44
+63.85294062
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.38306502
+ 49
+-136.13854662
+ 53
+262.88
+ 43
+91.66267418
+ 44
+64.36850982
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.52391818
+ 49
+-135.997696
+ 53
+243.44
+ 43
+91.97301138
+ 44
+64.84398258
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.55751222
+ 49
+-37.3071136
+ 53
+225.0
+ 43
+92.4579304
+ 44
+65.22117258
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.603758
+ 49
+-23.343362
+ 53
+187.13
+ 43
+92.99912058
+ 44
+65.28468782
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.52296822
+ 49
+-135.99864342
+ 53
+172.88
+ 43
+93.37209418
+ 44
+65.29439062
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.38306502
+ 49
+-136.13854662
+ 53
+172.88
+ 43
+93.94156218
+ 44
+65.21204382
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.578866
+ 49
+-135.94274818
+ 53
+135.0
+ 43
+94.38033702
+ 44
+64.7916408
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.59077098
+ 49
+-23.35634902
+ 53
+116.57
+ 43
+94.68822058
+ 44
+64.3400288
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.559816
+ 49
+-37.30480982
+ 53
+97.13
+ 43
+94.80822542
+ 44
+63.876174
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.49054258
+ 49
+-136.0310716
+ 53
+82.88
+ 43
+94.81432142
+ 44
+63.51266698
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.37036502
+ 49
+-136.15124662
+ 53
+82.88
+ 43
+99.5581956
+ 44
+54.0248856
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.37036502
+ 49
+-136.15124662
+ 53
+97.13
+ 43
+99.5520996
+ 44
+54.3884104
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.49054258
+ 49
+-136.0310716
+ 53
+116.57
+ 43
+99.43211
+ 44
+54.8522652
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.559816
+ 49
+-37.30480982
+ 53
+135.0
+ 43
+99.12422898
+ 44
+55.3038772
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.59077098
+ 49
+-23.35634902
+ 53
+172.88
+ 43
+98.6854516
+ 44
+55.72428022
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.578866
+ 49
+-135.94274818
+ 53
+172.88
+ 43
+98.1159836
+ 44
+55.80661178
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.38306502
+ 49
+-136.13854662
+ 53
+187.13
+ 43
+97.74301
+ 44
+55.79692422
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.52296822
+ 49
+-135.99864342
+ 53
+225.0
+ 43
+97.20181982
+ 44
+55.73340898
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.603758
+ 49
+-23.343362
+ 53
+243.44
+ 43
+96.7169008
+ 44
+55.3562012
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.55751222
+ 49
+-37.3071136
+ 53
+262.88
+ 43
+96.4065636
+ 44
+54.88073098
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.52391818
+ 49
+-135.997696
+ 53
+262.88
+ 43
+96.33429298
+ 44
+54.36517702
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.38306502
+ 49
+-136.13854662
+ 53
+277.13
+ 43
+96.34147102
+ 44
+53.99174622
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.4803648
+ 49
+-136.04124938
+ 53
+296.57
+ 43
+96.4595988
+ 44
+53.53784822
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.559816
+ 49
+-37.30480982
+ 53
+315.0
+ 43
+96.76747982
+ 44
+53.08623622
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.59077098
+ 49
+-23.35634902
+ 53
+352.88
+ 43
+97.2062572
+ 44
+52.6658332
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.578866
+ 49
+-135.94274818
+ 53
+7.13
+ 43
+98.1487496
+ 44
+52.59291742
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.51824382
+ 49
+-136.00336782
+ 53
+45.0
+ 43
+98.68929462
+ 44
+52.65619898
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.60453778
+ 49
+-23.34258222
+ 53
+63.44
+ 43
+99.174808
+ 44
+53.03391222
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.55751222
+ 49
+-37.3071136
+ 53
+82.88
+ 43
+99.4851452
+ 44
+53.50938498
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.52391818
+ 49
+-135.997696
+ 53
+82.88
+ 43
+100.58544018
+ 44
+60.18634902
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+63.44
+ 43
+100.4551204
+ 44
+59.98670502
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+45.0
+ 43
+100.25126
+ 44
+59.82810742
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.2538476
+ 49
+-23.6932724
+ 53
+7.13
+ 43
+100.0242856
+ 44
+59.80153902
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.21760942
+ 49
+-136.30400222
+ 53
+352.88
+ 43
+99.62853582
+ 44
+59.83215618
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+315.0
+ 43
+99.444302
+ 44
+60.00868618
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+296.57
+ 43
+99.315016
+ 44
+60.1983048
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+277.13
+ 43
+99.26541742
+ 44
+60.38888862
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.20170902
+ 49
+-136.31990262
+ 53
+262.88
+ 43
+99.26240498
+ 44
+60.54570822
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+262.88
+ 43
+99.29274782
+ 44
+60.7621848
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+243.44
+ 43
+99.42304982
+ 44
+60.9618288
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+225.0
+ 43
+99.626674
+ 44
+61.1202232
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.25350978
+ 49
+-23.69361022
+ 53
+187.13
+ 43
+99.85392018
+ 44
+61.1468932
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.21959062
+ 49
+-136.30202102
+ 53
+172.88
+ 43
+100.01053658
+ 44
+61.1509572
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+172.88
+ 43
+100.24965218
+ 44
+61.11638018
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+135.0
+ 43
+100.433886
+ 44
+60.93986542
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+116.57
+ 43
+100.563172
+ 44
+60.75022902
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+97.13
+ 43
+100.61354782
+ 44
+60.55544658
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.20597622
+ 49
+-136.31563542
+ 53
+82.88
+ 43
+100.6161056
+ 44
+60.40280782
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.15551658
+ 49
+-136.3660976
+ 53
+82.88
+ 43
+97.50794062
+ 44
+65.78770942
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+63.44
+ 43
+97.47673418
+ 44
+65.73989138
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+45.0
+ 43
+97.4278976
+ 44
+65.70189298
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.0608076
+ 49
+-23.8863124
+ 53
+7.13
+ 43
+97.37352382
+ 44
+65.6955252
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.0521208
+ 49
+-136.46949338
+ 53
+352.88
+ 43
+97.27873102
+ 44
+65.70285818
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+315.0
+ 43
+97.2346036
+ 44
+65.7451568
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+296.57
+ 43
+97.20363338
+ 44
+65.790572
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+277.13
+ 43
+97.19174618
+ 44
+65.83622342
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.0483108
+ 49
+-136.47330338
+ 53
+262.88
+ 43
+97.19103498
+ 44
+65.8737824
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+262.88
+ 43
+97.19829938
+ 44
+65.9256492
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+243.44
+ 43
+97.22950582
+ 44
+65.97346978
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+225.0
+ 43
+97.2782916
+ 44
+66.0113996
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.06072378
+ 49
+-23.88639622
+ 53
+187.13
+ 43
+97.33271618
+ 44
+66.01778262
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.05259578
+ 49
+-136.4690184
+ 53
+172.88
+ 43
+97.3702396
+ 44
+66.0187656
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+172.88
+ 43
+97.42750898
+ 44
+66.0104852
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+135.0
+ 43
+97.4716364
+ 44
+65.96820182
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+116.57
+ 43
+97.50260662
+ 44
+65.92277138
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+97.13
+ 43
+97.51468178
+ 44
+65.8761192
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.04934458
+ 49
+-136.4722696
+ 53
+82.88
+ 43
+97.51529138
+ 44
+65.83956098
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.03725418
+ 49
+-136.48436
+ 53
+82.88
+ 43
+98.2182948
+ 44
+64.2727696
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.15922498
+ 49
+-136.3623892
+ 53
+63.44
+ 43
+98.12399222
+ 44
+64.12827662
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.16943578
+ 49
+-37.69519258
+ 53
+45.0
+ 43
+97.97641822
+ 44
+64.01346862
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.18372582
+ 49
+-23.76339418
+ 53
+7.13
+ 43
+97.8121488
+ 44
+63.99425098
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.15749778
+ 49
+-136.3641164
+ 53
+352.88
+ 43
+97.52570538
+ 44
+64.01639978
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.17593818
+ 49
+-136.345676
+ 53
+315.0
+ 43
+97.3923376
+ 44
+64.14417702
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.17954498
+ 49
+-23.76757502
+ 53
+296.57
+ 43
+97.298764
+ 44
+64.28142338
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.17014698
+ 49
+-37.69448138
+ 53
+277.13
+ 43
+97.26286618
+ 44
+64.4193784
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.1459992
+ 49
+-136.37561498
+ 53
+262.88
+ 43
+97.26069702
+ 44
+64.5328656
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.11641582
+ 49
+-136.40519582
+ 53
+262.88
+ 43
+97.2826604
+ 44
+64.68956582
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.15922498
+ 49
+-136.3623892
+ 53
+243.44
+ 43
+97.37697822
+ 44
+64.8340588
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.16943578
+ 49
+-37.69519258
+ 53
+225.0
+ 43
+97.52434902
+ 44
+64.94869662
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.1834896
+ 49
+-23.7636304
+ 53
+187.13
+ 43
+97.68882418
+ 44
+64.96800062
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.15893542
+ 49
+-136.36267622
+ 53
+172.88
+ 43
+97.80217422
+ 44
+64.9709648
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.11641582
+ 49
+-136.40519582
+ 53
+172.88
+ 43
+97.97524982
+ 44
+64.94593818
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.17593818
+ 49
+-136.345676
+ 53
+135.0
+ 43
+98.1086176
+ 44
+64.8181584
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.17954498
+ 49
+-23.76757502
+ 53
+116.57
+ 43
+98.2021912
+ 44
+64.68091458
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.17014698
+ 49
+-37.69448138
+ 53
+97.13
+ 43
+98.23864782
+ 44
+64.5399268
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.14908022
+ 49
+-136.37253142
+ 53
+82.88
+ 43
+98.24051218
+ 44
+64.42945458
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.11255502
+ 49
+-136.40905662
+ 53
+82.88
+ 43
+94.03588
+ 44
+58.51547098
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.15551658
+ 49
+-136.3660976
+ 53
+97.13
+ 43
+94.03332222
+ 44
+58.6681072
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.20597622
+ 49
+-136.31563542
+ 53
+116.57
+ 43
+93.9829464
+ 44
+58.8628744
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+135.0
+ 43
+93.8536604
+ 44
+59.0525108
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+172.88
+ 43
+93.66942658
+ 44
+59.2290408
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+172.88
+ 43
+93.4302932
+ 44
+59.26360258
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+187.13
+ 43
+93.27369458
+ 44
+59.25953858
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.21959062
+ 49
+-136.30202102
+ 53
+225.0
+ 43
+93.0464484
+ 44
+59.23286858
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.25350978
+ 49
+-23.69361022
+ 53
+243.44
+ 43
+92.84282422
+ 44
+59.07447418
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+262.88
+ 43
+92.71252222
+ 44
+58.87483018
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+262.88
+ 43
+92.68217938
+ 44
+58.6583536
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.16085058
+ 49
+-136.3607636
+ 53
+277.13
+ 43
+92.68519182
+ 44
+58.50155178
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.20170902
+ 49
+-136.31990262
+ 53
+296.57
+ 43
+92.7347904
+ 44
+58.31096542
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.23506938
+ 49
+-37.62955898
+ 53
+315.0
+ 43
+92.86405862
+ 44
+58.12132902
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.24807418
+ 49
+-23.69904582
+ 53
+352.88
+ 43
+93.04831022
+ 44
+57.94479902
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.24306022
+ 49
+-136.27855142
+ 53
+7.13
+ 43
+93.44406
+ 44
+57.9141844
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.21760942
+ 49
+-136.30400222
+ 53
+45.0
+ 43
+93.6710344
+ 44
+57.9407528
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.2538476
+ 49
+-23.6932724
+ 53
+63.44
+ 43
+93.8748948
+ 44
+58.0993504
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.23410418
+ 49
+-37.63052418
+ 53
+82.88
+ 43
+94.00521458
+ 44
+58.29901218
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.21999702
+ 49
+-136.30161462
+ 53
+82.88
+ 43
+90.7421096
+ 44
+59.22648302
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.11255502
+ 49
+-136.40905662
+ 53
+97.13
+ 43
+90.74024778
+ 44
+59.33695778
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.14908022
+ 49
+-136.37253142
+ 53
+116.57
+ 43
+90.70378862
+ 44
+59.47794302
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.17014698
+ 49
+-37.69448138
+ 53
+135.0
+ 43
+90.61021502
+ 44
+59.61518938
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.17954498
+ 49
+-23.76757502
+ 53
+172.88
+ 43
+90.47686502
+ 44
+59.74296662
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.17593818
+ 49
+-136.345676
+ 53
+172.88
+ 43
+90.30378942
+ 44
+59.767978
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.11641582
+ 49
+-136.40519582
+ 53
+187.13
+ 43
+90.1904216
+ 44
+59.7650316
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.15893542
+ 49
+-136.36267622
+ 53
+225.0
+ 43
+90.02594898
+ 44
+59.7457276
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.1834896
+ 49
+-23.7636304
+ 53
+243.44
+ 43
+89.87857818
+ 44
+59.63108978
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.16943578
+ 49
+-37.69519258
+ 53
+262.88
+ 43
+89.78425782
+ 44
+59.4865968
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.15922498
+ 49
+-136.3623892
+ 53
+262.88
+ 43
+89.76229698
+ 44
+59.32989658
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.11641582
+ 49
+-136.40519582
+ 53
+277.13
+ 43
+89.7644636
+ 44
+59.21640938
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.1459992
+ 49
+-136.37561498
+ 53
+296.57
+ 43
+89.8003792
+ 44
+59.07845182
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.17014698
+ 49
+-37.69448138
+ 53
+315.0
+ 43
+89.8939528
+ 44
+58.941208
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.17954498
+ 49
+-23.76757502
+ 53
+352.88
+ 43
+90.0273028
+ 44
+58.81342822
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.17593818
+ 49
+-136.345676
+ 53
+7.13
+ 43
+90.31374622
+ 44
+58.79126418
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.15749778
+ 49
+-136.3641164
+ 53
+45.0
+ 43
+90.47803342
+ 44
+58.8104996
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.18372582
+ 49
+-23.76339418
+ 53
+63.44
+ 43
+90.62559218
+ 44
+58.9253076
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.16943578
+ 49
+-37.69519258
+ 53
+82.88
+ 43
+90.71991
+ 44
+59.06980058
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.15922498
+ 49
+-136.3623892
+ 53
+82.88
+ 43
+88.04749218
+ 44
+58.09938342
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.21413978
+ 49
+-136.3074744
+ 53
+97.13
+ 43
+88.0439692
+ 44
+58.30954302
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.28359862
+ 49
+-136.23801302
+ 53
+116.57
+ 43
+87.97459418
+ 44
+58.57771622
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.32366458
+ 49
+-37.54096378
+ 53
+135.0
+ 43
+87.79659098
+ 44
+58.83882822
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.34156142
+ 49
+-23.60555858
+ 53
+172.88
+ 43
+87.54291102
+ 44
+59.0818732
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.3346704
+ 49
+-136.18694378
+ 53
+172.88
+ 43
+87.21367622
+ 44
+59.12949058
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.22147022
+ 49
+-136.30014142
+ 53
+187.13
+ 43
+86.998048
+ 44
+59.1238848
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.3023616
+ 49
+-136.21925258
+ 53
+225.0
+ 43
+86.68515302
+ 44
+59.0871564
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.34906458
+ 49
+-23.59805542
+ 53
+243.44
+ 43
+86.40478782
+ 44
+58.869072
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.322326
+ 49
+-37.54229982
+ 53
+262.88
+ 43
+86.22538
+ 44
+58.59417542
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.30290262
+ 49
+-136.21870902
+ 53
+262.88
+ 43
+86.18358938
+ 44
+58.29611658
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.22147022
+ 49
+-136.30014142
+ 53
+277.13
+ 43
+86.1877372
+ 44
+58.08021658
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.2777236
+ 49
+-136.24389058
+ 53
+296.57
+ 43
+86.25603018
+ 44
+57.81779902
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.32366458
+ 49
+-37.54096378
+ 53
+315.0
+ 43
+86.43403338
+ 44
+57.5567048
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.34156142
+ 49
+-23.60555858
+ 53
+352.88
+ 43
+86.6877108
+ 44
+57.31364458
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.3346704
+ 49
+-136.18694378
+ 53
+7.13
+ 43
+87.23262462
+ 44
+57.27148058
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.2996184
+ 49
+-136.22199578
+ 53
+45.0
+ 43
+87.54514622
+ 44
+57.30807182
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.349504
+ 49
+-23.597616
+ 53
+63.44
+ 43
+87.825834
+ 44
+57.52644578
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.322326
+ 49
+-37.54229982
+ 53
+82.88
+ 43
+88.0052596
+ 44
+57.80133982
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.30290262
+ 49
+-136.21870902
+ 53
+82.88
+ 43
+90.0168888
+ 44
+60.63658942
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.03725418
+ 49
+-136.48436
+ 53
+97.13
+ 43
+90.0162792
+ 44
+60.67315018
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.04934458
+ 49
+-136.4722696
+ 53
+116.57
+ 43
+90.00420658
+ 44
+60.71979982
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+135.0
+ 43
+89.9732516
+ 44
+60.7652328
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+172.88
+ 43
+89.9291064
+ 44
+60.80751618
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+172.88
+ 43
+89.87183702
+ 44
+60.81579658
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+187.13
+ 43
+89.8343136
+ 44
+60.8148136
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.05259578
+ 49
+-136.4690184
+ 53
+225.0
+ 43
+89.77988902
+ 44
+60.80843058
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.06072378
+ 49
+-23.88639622
+ 53
+243.44
+ 43
+89.73110578
+ 44
+60.77049822
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+262.88
+ 43
+89.6998968
+ 44
+60.7226624
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+262.88
+ 43
+89.6926324
+ 44
+60.67081338
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.03852418
+ 49
+-136.48309
+ 53
+277.13
+ 43
+89.6933436
+ 44
+60.6332544
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.0483108
+ 49
+-136.47330338
+ 53
+296.57
+ 43
+89.7052308
+ 44
+60.58760298
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.05630418
+ 49
+-37.80832418
+ 53
+315.0
+ 43
+89.73620102
+ 44
+60.54218778
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.05941822
+ 49
+-23.88770178
+ 53
+352.88
+ 43
+89.78033098
+ 44
+60.49988662
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.0582168
+ 49
+-136.46339738
+ 53
+7.13
+ 43
+89.87512378
+ 44
+60.49255618
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.0521208
+ 49
+-136.46949338
+ 53
+45.0
+ 43
+89.92949502
+ 44
+60.49892142
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.0608076
+ 49
+-23.8863124
+ 53
+63.44
+ 43
+89.9783316
+ 44
+60.53691982
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.0560832
+ 49
+-37.80854262
+ 53
+82.88
+ 43
+90.00954058
+ 44
+60.5847404
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.05269738
+ 49
+-136.4689168
+ 53
+82.88
+ 43
+91.272614
+ 44
+55.4477428
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.52391818
+ 49
+-135.997696
+ 53
+63.44
+ 43
+90.9622768
+ 44
+54.97227258
+ 45
+-0.0014916558
+ 46
+16.9328188651
+ 79
+2
+ 49
+0.55751222
+ 49
+-37.3071136
+ 53
+45.0
+ 43
+90.47676342
+ 44
+54.5945568
+ 45
+0.0
+ 46
+16.9331709419
+ 79
+2
+ 49
+0.60453778
+ 49
+-23.34258222
+ 53
+7.13
+ 43
+89.9362184
+ 44
+54.53127778
+ 45
+118.5322702695
+ 46
+16.9431028479
+ 79
+2
+ 49
+0.51824382
+ 49
+-136.00336782
+ 53
+352.88
+ 43
+88.993726
+ 44
+54.6042088
+ 45
+118.5352255934
+ 46
+-16.9224148061
+ 79
+2
+ 49
+0.578866
+ 49
+-135.94274818
+ 53
+315.0
+ 43
+88.55494862
+ 44
+55.02461182
+ 45
+16.9331709419
+ 46
+-0.0
+ 79
+2
+ 49
+0.59077098
+ 49
+-23.35634902
+ 53
+296.57
+ 43
+88.2470676
+ 44
+55.47622382
+ 45
+16.9342802744
+ 46
+-16.9313563251
+ 79
+2
+ 49
+0.559816
+ 49
+-37.30480982
+ 53
+277.13
+ 43
+88.12893982
+ 44
+55.93010658
+ 45
+16.9431028479
+ 46
+-118.5322702695
+ 79
+2
+ 49
+0.4803648
+ 49
+-136.04124938
+ 53
+262.88
+ 43
+88.12176178
+ 44
+56.30353738
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.38306502
+ 49
+-136.13854662
+ 53
+262.88
+ 43
+88.1940324
+ 44
+56.8190888
+ 45
+0.0008534187
+ 46
+-16.9336313627
+ 79
+2
+ 49
+0.52391818
+ 49
+-135.997696
+ 53
+243.44
+ 43
+88.5043696
+ 44
+57.2945768
+ 45
+0.0014916558
+ 46
+-16.9328188651
+ 79
+2
+ 49
+0.55751222
+ 49
+-37.3071136
+ 53
+225.0
+ 43
+88.98928862
+ 44
+57.6717668
+ 45
+-0.0
+ 46
+-16.9331709419
+ 79
+2
+ 49
+0.603758
+ 49
+-23.343362
+ 53
+187.13
+ 43
+89.5304788
+ 44
+57.73528458
+ 45
+-118.5322702695
+ 46
+-16.9431028479
+ 79
+2
+ 49
+0.52296822
+ 49
+-135.99864342
+ 53
+172.88
+ 43
+89.9034524
+ 44
+57.74498738
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.38306502
+ 49
+-136.13854662
+ 53
+172.88
+ 43
+90.4729204
+ 44
+57.66264058
+ 45
+-118.5352255934
+ 46
+16.9224148061
+ 79
+2
+ 49
+0.578866
+ 49
+-135.94274818
+ 53
+135.0
+ 43
+90.91169778
+ 44
+57.24223502
+ 45
+-16.9331709419
+ 46
+0.0
+ 79
+2
+ 49
+0.59077098
+ 49
+-23.35634902
+ 53
+116.57
+ 43
+91.2195788
+ 44
+56.79062302
+ 45
+-16.9342802744
+ 46
+16.9313563251
+ 79
+2
+ 49
+0.559816
+ 49
+-37.30480982
+ 53
+97.13
+ 43
+91.3395684
+ 44
+56.32676822
+ 45
+-16.9431028479
+ 46
+118.5322702695
+ 79
+2
+ 49
+0.49054258
+ 49
+-136.0310716
+ 53
+82.88
+ 43
+91.3456644
+ 44
+55.96324342
+ 45
+-0.0008534187
+ 46
+16.9336313627
+ 79
+2
+ 49
+0.37036502
+ 49
+-136.15124662
+ 98
+0
+  0
+LWPOLYLINE
+  5
+AB
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-660.0
+ 10
+240.0
+ 20
+-660.0
+ 10
+240.0
+ 20
+-560.0
+ 10
+140.0
+ 20
+-560.0
+  0
+TEXT
+  5
+AC
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+CONCRETE3
+  7
+LABEL
+ 11
+140.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+AD
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CORK
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-660.0
+ 10
+380.0
+ 20
+-660.0
+ 10
+380.0
+ 20
+-560.0
+ 10
+280.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+4
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+3.81
+ 79
+0
+ 53
+135.0
+ 43
+1.905
+ 44
+-1.905
+ 45
+-7.6199999872
+ 46
+-7.6199999872
+ 79
+2
+ 49
+5.3881536941
+ 49
+-5.3881536941
+ 53
+135.0
+ 43
+2.8575
+ 44
+-1.905
+ 45
+-7.6199999872
+ 46
+-7.6199999872
+ 79
+2
+ 49
+5.3881536941
+ 49
+-5.3881536941
+ 53
+135.0
+ 43
+3.81
+ 44
+-1.905
+ 45
+-7.6199999872
+ 46
+-7.6199999872
+ 79
+2
+ 49
+5.3881536941
+ 49
+-5.3881536941
+ 98
+0
+  0
+LWPOLYLINE
+  5
+AE
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-660.0
+ 10
+380.0
+ 20
+-660.0
+ 10
+380.0
+ 20
+-560.0
+ 10
+280.0
+ 20
+-560.0
+  0
+TEXT
+  5
+AF
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+CORK
+  7
+LABEL
+ 11
+280.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+B0
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CROSS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-660.0
+ 10
+520.0
+ 20
+-660.0
+ 10
+520.0
+ 20
+-560.0
+ 10
+420.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+3.175
+ 49
+-9.525
+ 53
+90.0
+ 43
+1.5875
+ 44
+-1.5875
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+3.175
+ 49
+-9.525
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B1
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-660.0
+ 10
+520.0
+ 20
+-660.0
+ 10
+520.0
+ 20
+-560.0
+ 10
+420.0
+ 20
+-560.0
+  0
+TEXT
+  5
+B2
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+CROSS
+  7
+LABEL
+ 11
+420.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+B3
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+CROSSES
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-660.0
+ 10
+660.0
+ 20
+-660.0
+ 10
+660.0
+ 20
+-560.0
+ 10
+560.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+-4.48945
+ 44
+0.0
+ 45
+-8.9802561211
+ 46
+8.9802561211
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-8.9802561211
+ 46
+-8.9802561211
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B4
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-660.0
+ 10
+660.0
+ 20
+-660.0
+ 10
+660.0
+ 20
+-560.0
+ 10
+560.0
+ 20
+-560.0
+  0
+TEXT
+  5
+B5
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+CROSSES
+  7
+LABEL
+ 11
+560.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+B6
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+DOLMIT
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-660.0
+ 10
+800.0
+ 20
+-660.0
+ 10
+800.0
+ 20
+-560.0
+ 10
+700.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-12.6999913435
+ 46
+12.6999913435
+ 79
+2
+ 49
+8.9802561211
+ 49
+-17.9605122421
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B7
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-660.0
+ 10
+800.0
+ 20
+-660.0
+ 10
+800.0
+ 20
+-560.0
+ 10
+700.0
+ 20
+-560.0
+  0
+TEXT
+  5
+B8
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+DOLMIT
+  7
+LABEL
+ 11
+700.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+B9
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+DOTS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-660.0
+ 10
+940.0
+ 20
+-660.0
+ 10
+940.0
+ 20
+-560.0
+ 10
+840.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.79375
+ 46
+1.5875
+ 79
+2
+ 49
+0.0
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BA
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-660.0
+ 10
+940.0
+ 20
+-660.0
+ 10
+940.0
+ 20
+-560.0
+ 10
+840.0
+ 20
+-560.0
+  0
+TEXT
+  5
+BB
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+DOTS
+  7
+LABEL
+ 11
+840.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+BC
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+DOTS1
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-660.0
+ 10
+1080.0
+ 20
+-660.0
+ 10
+1080.0
+ 20
+-560.0
+ 10
+980.0
+ 20
+-560.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.79375
+ 46
+1.5875
+ 79
+2
+ 49
+0.0
+ 49
+-1.5875
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BD
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-660.0
+ 10
+1080.0
+ 20
+-660.0
+ 10
+1080.0
+ 20
+-560.0
+ 10
+980.0
+ 20
+-560.0
+  0
+TEXT
+  5
+BE
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-674.0
+ 30
+0.0
+ 40
+9.0
+  1
+DOTS1
+  7
+LABEL
+ 11
+980.0
+ 21
+-674.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+BF
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+DOTS2
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-825.0
+ 10
+100.0
+ 20
+-825.0
+ 10
+100.0
+ 20
+-725.0
+ 10
+0.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+17
+ 53
+0.0
+ 43
+1.016
+ 44
+0.508
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+9.144
+ 44
+1.016
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+4.572
+ 44
+6.604
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+10.16
+ 44
+10.668
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+3.556
+ 44
+12.192
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+5.588
+ 44
+18.288
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+2.032
+ 44
+22.86
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+10.16
+ 44
+22.352
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+16.256
+ 44
+23.368
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+19.304
+ 44
+17.272
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+24.384
+ 44
+16.764
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+24.384
+ 44
+7.62
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+19.812
+ 44
+4.572
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+12.7
+ 44
+6.096
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+17.272
+ 44
+10.668
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+12.7
+ 44
+15.24
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 53
+0.0
+ 43
+23.368
+ 44
+1.016
+ 45
+0.0
+ 46
+25.4
+ 79
+2
+ 49
+0.0
+ 49
+-25.4
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C0
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-825.0
+ 10
+100.0
+ 20
+-825.0
+ 10
+100.0
+ 20
+-725.0
+ 10
+0.0
+ 20
+-725.0
+  0
+TEXT
+  5
+C1
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+DOTS2
+  7
+LABEL
+ 11
+0.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+C2
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-825.0
+ 10
+240.0
+ 20
+-825.0
+ 10
+240.0
+ 20
+-725.0
+ 10
+140.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+2.38125
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+4.7625
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+0.79375
+ 44
+5.55625
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+3.175
+ 44
+5.55625
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+5.55625
+ 44
+5.55625
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C3
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-825.0
+ 10
+240.0
+ 20
+-825.0
+ 10
+240.0
+ 20
+-725.0
+ 10
+140.0
+ 20
+-725.0
+  0
+TEXT
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+EARTH
+  7
+LABEL
+ 11
+140.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+C5
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH1
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-825.0
+ 10
+380.0
+ 20
+-825.0
+ 10
+380.0
+ 20
+-725.0
+ 10
+280.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+2.38125
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+0.0
+ 43
+0.0
+ 44
+4.7625
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+0.79375
+ 44
+5.55625
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+3.175
+ 44
+5.55625
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+5.55625
+ 44
+5.55625
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C6
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-825.0
+ 10
+380.0
+ 20
+-825.0
+ 10
+380.0
+ 20
+-725.0
+ 10
+280.0
+ 20
+-725.0
+  0
+TEXT
+  5
+C7
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+EARTH1
+  7
+LABEL
+ 11
+280.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+C8
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH2
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-825.0
+ 10
+520.0
+ 20
+-825.0
+ 10
+520.0
+ 20
+-725.0
+ 10
+420.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+12
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+13.4703841816
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+45.0
+ 43
+-1.3470384159
+ 44
+1.3470384159
+ 45
+0.0
+ 46
+13.4703841816
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+45.0
+ 43
+-2.6940768128
+ 44
+2.6940768128
+ 45
+0.0
+ 46
+13.4703841816
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+45.0
+ 43
+-4.0411152668
+ 44
+4.0411152668
+ 45
+0.0
+ 46
+13.4703841816
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+45.0
+ 43
+-5.388153435
+ 44
+5.388153435
+ 45
+0.0
+ 46
+13.4703841816
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+45.0
+ 43
+-6.73519227
+ 44
+6.73519227
+ 45
+0.0
+ 46
+13.4703841816
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-13.4703841816
+ 46
+0.0
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+135.0
+ 43
+-1.3470384159
+ 44
+-1.3470384159
+ 45
+-13.4703841816
+ 46
+0.0
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+135.0
+ 43
+-2.6940768128
+ 44
+-2.6940768128
+ 45
+-13.4703841816
+ 46
+0.0
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+135.0
+ 43
+-4.0411152668
+ 44
+-4.0411152668
+ 45
+-13.4703841816
+ 46
+0.0
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+135.0
+ 43
+-5.388153435
+ 44
+-5.388153435
+ 45
+-13.4703841816
+ 46
+0.0
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 53
+135.0
+ 43
+-6.73519227
+ 44
+-6.73519227
+ 45
+-13.4703841816
+ 46
+0.0
+ 79
+2
+ 49
+9.525
+ 49
+-9.525
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C9
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-825.0
+ 10
+520.0
+ 20
+-825.0
+ 10
+520.0
+ 20
+-725.0
+ 10
+420.0
+ 20
+-725.0
+  0
+TEXT
+  5
+CA
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+EARTH2
+  7
+LABEL
+ 11
+420.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+CB
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ESCHER
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-825.0
+ 10
+660.0
+ 20
+-825.0
+ 10
+660.0
+ 20
+-725.0
+ 10
+560.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+21
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+27.94
+ 49
+-2.54
+ 53
+180.0
+ 43
+0.0
+ 44
+0.0
+ 45
+15.24
+ 46
+-26.3964542936
+ 79
+2
+ 49
+27.94
+ 49
+-2.54
+ 53
+300.0
+ 43
+0.0
+ 44
+0.0
+ 45
+30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+27.94
+ 49
+-2.54
+ 53
+60.0
+ 43
+2.54
+ 44
+0.0
+ 45
+-30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+300.0
+ 43
+2.54
+ 44
+0.0
+ 45
+30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+60.0
+ 43
+-1.27
+ 44
+2.199704516
+ 45
+-30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+180.0
+ 43
+-1.27
+ 44
+2.199704516
+ 45
+15.24
+ 46
+-26.3964542936
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+300.0
+ 43
+-1.27
+ 44
+-2.199704516
+ 45
+30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+180.0
+ 43
+-1.27
+ 44
+-2.199704516
+ 45
+15.24
+ 46
+-26.3964542936
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+60.0
+ 43
+-10.16
+ 44
+0.0
+ 45
+-30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+300.0
+ 43
+-10.16
+ 44
+0.0
+ 45
+30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+60.0
+ 43
+5.08
+ 44
+-8.7988180894
+ 45
+-30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+180.0
+ 43
+5.08
+ 44
+-8.7988180894
+ 45
+15.24
+ 46
+-26.3964542936
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+300.0
+ 43
+5.08
+ 44
+8.7988180894
+ 45
+30.4799999881
+ 46
+-6.9e-09
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+180.0
+ 43
+5.08
+ 44
+8.7988180894
+ 45
+15.24
+ 46
+-26.3964542936
+ 79
+2
+ 49
+5.08
+ 49
+-25.4
+ 53
+0.0
+ 43
+5.08
+ 44
+4.3994090574
+ 45
+-15.24
+ 46
+26.3964542936
+ 79
+2
+ 49
+17.78
+ 49
+-12.7
+ 53
+0.0
+ 43
+5.08
+ 44
+-4.3994090574
+ 45
+-15.24
+ 46
+26.3964542936
+ 79
+2
+ 49
+17.78
+ 49
+-12.7
+ 53
+120.0
+ 43
+1.27
+ 44
+6.5991135734
+ 45
+-30.4799999881
+ 46
+6.9e-09
+ 79
+2
+ 49
+17.78
+ 49
+-12.7
+ 53
+120.0
+ 43
+-6.35
+ 44
+2.199704516
+ 45
+-30.4799999881
+ 46
+6.9e-09
+ 79
+2
+ 49
+17.78
+ 49
+-12.7
+ 53
+240.0
+ 43
+-6.35
+ 44
+-2.199704516
+ 45
+15.2399999881
+ 46
+-26.3964543005
+ 79
+2
+ 49
+17.78
+ 49
+-12.7
+ 53
+240.0
+ 43
+1.27
+ 44
+-6.5991135734
+ 45
+15.2399999881
+ 46
+-26.3964543005
+ 79
+2
+ 49
+17.78
+ 49
+-12.7
+ 98
+0
+  0
+LWPOLYLINE
+  5
+CC
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-825.0
+ 10
+660.0
+ 20
+-825.0
+ 10
+660.0
+ 20
+-725.0
+ 10
+560.0
+ 20
+-725.0
+  0
+TEXT
+  5
+CD
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+ESCHER
+  7
+LABEL
+ 11
+560.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+CE
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+GRASS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-825.0
+ 10
+800.0
+ 20
+-825.0
+ 10
+800.0
+ 20
+-725.0
+ 10
+700.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-17.96051224
+ 46
+17.96051224
+ 79
+2
+ 49
+4.7625
+ 49
+-31.15852448
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-17.9605122421
+ 46
+17.9605122421
+ 79
+2
+ 49
+4.7625
+ 49
+-20.6375
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-17.9605122421
+ 46
+-17.9605122421
+ 79
+2
+ 49
+4.7625
+ 49
+-20.6375
+ 98
+0
+  0
+LWPOLYLINE
+  5
+CF
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-825.0
+ 10
+800.0
+ 20
+-825.0
+ 10
+800.0
+ 20
+-725.0
+ 10
+700.0
+ 20
+-725.0
+  0
+TEXT
+  5
+D0
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+GRASS
+  7
+LABEL
+ 11
+700.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+D1
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+GRASS1
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-825.0
+ 10
+940.0
+ 20
+-825.0
+ 10
+940.0
+ 20
+-725.0
+ 10
+840.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-14.3684097899
+ 46
+14.3684097899
+ 79
+2
+ 49
+3.81
+ 49
+-24.9268196002
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-14.3684097937
+ 46
+14.3684097937
+ 79
+2
+ 49
+3.81
+ 49
+-16.51
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-14.3684097937
+ 46
+-14.3684097937
+ 79
+2
+ 49
+3.81
+ 49
+-16.51
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D2
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-825.0
+ 10
+940.0
+ 20
+-825.0
+ 10
+940.0
+ 20
+-725.0
+ 10
+840.0
+ 20
+-725.0
+  0
+TEXT
+  5
+D3
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+GRASS1
+  7
+LABEL
+ 11
+840.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+D4
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+GRASS2
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-825.0
+ 10
+1080.0
+ 20
+-825.0
+ 10
+1080.0
+ 20
+-725.0
+ 10
+980.0
+ 20
+-725.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+10.16
+ 46
+17.597636189
+ 79
+2
+ 49
+2.54
+ 49
+-17.78
+ 53
+90.0
+ 43
+1.27
+ 44
+0.0
+ 45
+-10.16
+ 46
+17.597636189
+ 79
+2
+ 49
+1.27
+ 49
+-33.9252723779
+ 53
+90.0
+ 43
+1.5875
+ 44
+0.0
+ 45
+-10.16
+ 46
+17.597636189
+ 79
+2
+ 49
+1.016
+ 49
+-34.1792723779
+ 53
+90.0
+ 43
+0.9525
+ 44
+0.0
+ 45
+-10.16
+ 46
+17.597636189
+ 79
+2
+ 49
+1.016
+ 49
+-34.1792723779
+ 53
+60.0
+ 43
+1.905
+ 44
+0.0
+ 45
+-10.1599999862
+ 46
+17.5976361969
+ 79
+2
+ 49
+0.8128
+ 49
+-19.5072
+ 53
+120.0
+ 43
+0.635
+ 44
+0.0
+ 45
+-20.3199999862
+ 46
+8e-09
+ 79
+2
+ 49
+0.8128
+ 49
+-19.5072
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D5
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-825.0
+ 10
+1080.0
+ 20
+-825.0
+ 10
+1080.0
+ 20
+-725.0
+ 10
+980.0
+ 20
+-725.0
+  0
+TEXT
+  5
+D6
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-839.0
+ 30
+0.0
+ 40
+9.0
+  1
+GRASS2
+  7
+LABEL
+ 11
+980.0
+ 21
+-839.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+D7
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+GRAVEL
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-990.0
+ 10
+100.0
+ 20
+-990.0
+ 10
+100.0
+ 20
+-890.0
+ 10
+0.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+41
+ 53
+228.0127875
+ 43
+18.288
+ 44
+25.4
+ 45
+-203.200000016
+ 46
+-228.5999999858
+ 79
+2
+ 49
+3.4172144
+ 49
+-338.3048363956
+ 53
+184.969741
+ 43
+16.002
+ 44
+22.86
+ 45
+304.7999998794
+ 46
+25.400001447
+ 79
+2
+ 49
+5.8640472
+ 49
+-580.5404889352
+ 53
+132.5104471
+ 43
+10.16
+ 44
+22.352
+ 45
+254.0000001073
+ 46
+-279.3999999025
+ 79
+2
+ 49
+4.1348152
+ 49
+-409.347227941
+ 53
+267.273689
+ 43
+0.254
+ 44
+16.002
+ 45
+25.4000000532
+ 46
+507.9999999973
+ 79
+2
+ 49
+5.3400452
+ 49
+-528.6643742574
+ 53
+292.83365418
+ 43
+0.0
+ 44
+10.668
+ 45
+-127.0000000106
+ 46
+304.7999999956
+ 79
+2
+ 49
+5.236337
+ 49
+-518.3980774534
+ 53
+357.273689
+ 43
+2.032
+ 44
+5.842
+ 45
+-507.9999999973
+ 46
+25.4000000532
+ 79
+2
+ 49
+5.3400452
+ 49
+-528.6643742574
+ 53
+37.69424047
+ 43
+7.366
+ 44
+5.588
+ 45
+-330.1999999854
+ 46
+-254.000000019
+ 79
+2
+ 49
+7.0619366
+ 49
+-699.1311531425
+ 53
+72.25532837
+ 43
+12.954
+ 44
+9.906
+ 45
+177.8000000478
+ 46
+558.7999999848
+ 79
+2
+ 49
+6.6671952
+ 49
+-660.0525660191
+ 53
+121.42956562
+ 43
+14.986
+ 44
+16.256
+ 45
+-203.2000000288
+ 46
+330.1999999823
+ 79
+2
+ 49
+5.35813
+ 49
+-530.4554569871
+ 53
+175.2363583
+ 43
+12.192
+ 44
+20.828
+ 45
+279.399999996
+ 46
+-25.4000000439
+ 79
+2
+ 49
+6.1171328
+ 49
+-299.7393695
+ 53
+222.3974378
+ 43
+6.096
+ 44
+21.336
+ 45
+-304.7999999902
+ 46
+-279.4000000106
+ 79
+2
+ 49
+7.9107792
+ 49
+-783.1677251218
+ 53
+138.81407483
+ 43
+25.4
+ 44
+15.748
+ 45
+-177.7999999893
+ 46
+152.4000000124
+ 79
+2
+ 49
+2.7000454
+ 49
+-267.3056582434
+ 53
+171.4692344
+ 43
+23.368
+ 44
+17.526
+ 45
+330.2000000089
+ 46
+-50.7999999424
+ 79
+2
+ 49
+5.1368198
+ 49
+-508.5463899704
+ 53
+225.0
+ 43
+18.288
+ 44
+18.288
+ 45
+-0.0
+ 46
+-25.4
+ 79
+2
+ 49
+3.5920934
+ 49
+-32.3289310843
+ 53
+203.19859051
+ 43
+16.51
+ 44
+21.336
+ 45
+127.0000000035
+ 46
+50.7999999911
+ 79
+2
+ 49
+1.9344132
+ 49
+-191.5062236889
+ 53
+291.80140949
+ 43
+14.732
+ 44
+20.574
+ 45
+-25.4000000053
+ 46
+76.1999999982
+ 79
+2
+ 49
+2.7356562
+ 49
+-134.0475299
+ 53
+30.96375653
+ 43
+15.748
+ 44
+18.034
+ 45
+76.2000000019
+ 46
+50.7999999972
+ 79
+2
+ 49
+4.4431966
+ 49
+-143.6629815291
+ 53
+161.56505118
+ 43
+19.558
+ 44
+20.32
+ 45
+50.8000000013
+ 46
+-25.3999999973
+ 79
+2
+ 49
+3.2128714
+ 49
+-77.1089811683
+ 53
+16.389540334
+ 43
+0.0
+ 44
+20.574
+ 45
+254.0
+ 46
+76.2
+ 79
+2
+ 49
+4.50088
+ 49
+-445.5882667254
+ 53
+70.34617594
+ 43
+4.318
+ 44
+21.844
+ 45
+-101.6000000093
+ 46
+-279.3999999967
+ 79
+2
+ 49
+3.7759894
+ 49
+-373.822156782
+ 53
+293.19859051
+ 43
+19.558
+ 44
+25.4
+ 45
+-50.7999999911
+ 46
+127.0000000036
+ 79
+2
+ 49
+3.868801
+ 49
+-189.5718358889
+ 53
+343.61045967
+ 43
+21.082
+ 44
+21.844
+ 45
+-254.0000000053
+ 46
+76.1999999822
+ 79
+2
+ 49
+4.50088
+ 49
+-445.5882667254
+ 53
+339.44395478
+ 43
+0.0
+ 44
+4.826
+ 45
+-127.0
+ 46
+50.8
+ 79
+2
+ 49
+4.340352
+ 49
+-212.6773431311
+ 53
+294.7751406
+ 43
+4.064
+ 44
+3.302
+ 45
+-127.0000001512
+ 46
+279.3999999313
+ 79
+2
+ 49
+3.6367212
+ 49
+-360.0359338072
+ 53
+66.80140949
+ 43
+19.812
+ 44
+0.0
+ 45
+50.799999992
+ 46
+127.0000000032
+ 79
+2
+ 49
+3.868801
+ 49
+-189.5718358889
+ 53
+17.35402464
+ 43
+21.336
+ 44
+3.556
+ 45
+-330.1999999934
+ 46
+-101.6000000213
+ 79
+2
+ 49
+4.2578274
+ 49
+-421.523759802
+ 53
+69.44395478
+ 43
+7.366
+ 44
+0.0
+ 45
+-50.8000000009
+ 46
+-126.9999999996
+ 79
+2
+ 49
+2.170176
+ 49
+-214.8475191311
+ 53
+101.309932474
+ 43
+18.288
+ 44
+0.0
+ 45
+-25.4
+ 46
+101.6
+ 79
+2
+ 49
+1.295146
+ 49
+-128.2199496453
+ 53
+165.963756532
+ 43
+18.034
+ 44
+1.27
+ 45
+76.2
+ 46
+-25.4
+ 79
+2
+ 49
+5.236337
+ 49
+-99.4905458907
+ 53
+186.00900596
+ 43
+12.954
+ 44
+2.54
+ 45
+253.9999999987
+ 46
+25.4000000133
+ 79
+2
+ 49
+4.85267
+ 49
+-480.4136486334
+ 53
+303.69006753
+ 43
+15.748
+ 44
+15.748
+ 45
+-25.4000000035
+ 46
+50.7999999982
+ 79
+2
+ 49
+3.6632388
+ 49
+-87.9177635968
+ 53
+353.15722659
+ 43
+17.78
+ 44
+12.7
+ 45
+431.8000000027
+ 46
+-50.7999999774
+ 79
+2
+ 49
+6.3955676
+ 49
+-633.1600906503
+ 53
+60.9453959
+ 43
+24.13
+ 44
+11.938
+ 45
+-101.6000000028
+ 46
+-177.7999999984
+ 79
+2
+ 49
+2.6150824
+ 49
+-258.8939231811
+ 53
+90.0
+ 43
+25.4
+ 44
+14.224
+ 45
+-25.4
+ 46
+25.4
+ 79
+2
+ 49
+1.524
+ 49
+-23.876
+ 53
+120.25643716
+ 43
+12.446
+ 44
+3.302
+ 45
+101.5999999876
+ 46
+-177.8000000071
+ 79
+2
+ 49
+3.5286696
+ 49
+-349.339407732
+ 53
+48.0127875
+ 43
+10.668
+ 44
+6.35
+ 45
+203.2000000168
+ 46
+228.5999999851
+ 79
+2
+ 49
+6.8344288
+ 49
+-334.8876219957
+ 53
+0.0
+ 43
+15.24
+ 44
+11.43
+ 45
+25.4
+ 46
+25.4
+ 79
+2
+ 49
+6.604
+ 49
+-18.796
+ 53
+325.3048465
+ 43
+21.844
+ 44
+11.43
+ 45
+254.0000000962
+ 46
+-177.7999998625
+ 79
+2
+ 49
+4.0160956
+ 49
+-397.5931672414
+ 53
+254.0546041
+ 43
+25.146
+ 44
+9.144
+ 45
+-25.3999999982
+ 46
+-101.6000000004
+ 79
+2
+ 49
+3.6982908
+ 49
+-181.2165003877
+ 53
+207.64597536
+ 43
+24.13
+ 44
+5.588
+ 45
+-482.6000000177
+ 46
+-253.9999999663
+ 79
+2
+ 49
+6.021451
+ 49
+-596.1246442294
+ 53
+175.42607874
+ 43
+18.796
+ 44
+2.794
+ 45
+-330.2
+ 46
+25.4
+ 79
+2
+ 49
+6.3702946
+ 49
+-630.6584645624
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D8
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-990.0
+ 10
+100.0
+ 20
+-990.0
+ 10
+100.0
+ 20
+-890.0
+ 10
+0.0
+ 20
+-890.0
+  0
+TEXT
+  5
+D9
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+GRAVEL
+  7
+LABEL
+ 11
+0.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+DA
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+GRAVEL1
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-990.0
+ 10
+240.0
+ 20
+-990.0
+ 10
+240.0
+ 20
+-890.0
+ 10
+140.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+41
+ 53
+228.0128
+ 43
+12.9600000032
+ 44
+17.9999999816
+ 45
+-143.9999681763
+ 46
+-162.000024158
+ 79
+2
+ 49
+2.4216479939
+ 49
+-239.7435839968
+ 53
+184.9697
+ 43
+11.3399999971
+ 44
+16.2000000155
+ 45
+216.0000189102
+ 46
+17.9998435066
+ 79
+2
+ 49
+4.1556239824
+ 49
+-411.4066499867
+ 53
+132.5104
+ 43
+7.2000000018
+ 44
+15.840000004
+ 45
+179.9998329469
+ 46
+-198.0001561228
+ 79
+2
+ 49
+2.9301840101
+ 49
+-290.0885759914
+ 53
+267.2737
+ 43
+0.1800000058
+ 44
+11.3399999971
+ 45
+17.9999283207
+ 46
+360.0000052976
+ 79
+2
+ 49
+3.7842839935
+ 49
+-374.6440439896
+ 53
+292.8337
+ 43
+0.0
+ 44
+7.5600000133
+ 45
+-90.0001782992
+ 46
+215.999935404
+ 79
+2
+ 49
+3.7107900079
+ 49
+-367.3687139784
+ 53
+357.2737
+ 43
+1.4400000004
+ 44
+4.1399999953
+ 45
+-360.0000052976
+ 46
+17.9999283207
+ 79
+2
+ 49
+3.7842839935
+ 49
+-374.6440439896
+ 53
+37.6942
+ 43
+5.2199999842
+ 44
+3.9599999896
+ 45
+-234.0001322119
+ 46
+-179.9998272812
+ 79
+2
+ 49
+5.0045219899
+ 49
+-495.4472817984
+ 53
+72.2553
+ 43
+9.1800000194
+ 44
+7.019999996
+ 45
+126.0001937207
+ 46
+395.9999321528
+ 79
+2
+ 49
+4.724783987
+ 49
+-467.7537780288
+ 53
+121.4296
+ 43
+10.6200000198
+ 44
+11.5200000029
+ 45
+-144.0001482242
+ 46
+233.9999106564
+ 79
+2
+ 49
+3.7970999953
+ 49
+-375.9133139885
+ 53
+175.2364
+ 43
+8.6400000022
+ 44
+14.7600000151
+ 45
+198.0000170247
+ 46
+-17.9998475922
+ 79
+2
+ 49
+4.3349759986
+ 49
+-212.4137339982
+ 53
+222.3974
+ 43
+4.3200000011
+ 44
+15.1199999809
+ 45
+-216.0001323074
+ 46
+-197.9998574727
+ 79
+2
+ 49
+5.6060640076
+ 49
+-555.0007501944
+ 53
+138.8141
+ 43
+17.9999999816
+ 44
+11.1599999914
+ 45
+-126.0000530418
+ 46
+107.9999516683
+ 79
+2
+ 49
+1.9134179816
+ 49
+-189.4291919867
+ 53
+171.4692
+ 43
+16.5599999813
+ 44
+12.419999986
+ 45
+233.9999691401
+ 46
+-36.0001423904
+ 79
+2
+ 49
+3.6402659935
+ 49
+-360.3871980151
+ 53
+225.0
+ 43
+12.9600000032
+ 44
+12.9600000032
+ 45
+-0.0
+ 46
+-18.000005591
+ 79
+2
+ 49
+2.5455779975
+ 49
+-22.9102560184
+ 53
+203.1986
+ 43
+11.7000000086
+ 44
+15.1199999809
+ 45
+89.9999951667
+ 46
+36.0000238407
+ 79
+2
+ 49
+1.3708440198
+ 49
+-135.7130699906
+ 53
+291.8014
+ 43
+10.440000014
+ 44
+14.5800000094
+ 45
+-17.9999983704
+ 46
+54.0000049026
+ 79
+2
+ 49
+1.9386540043
+ 49
+-94.9943160054
+ 53
+30.9638
+ 43
+11.1599999914
+ 44
+12.7799999975
+ 45
+53.9999644169
+ 46
+36.0000446951
+ 79
+2
+ 49
+3.1487219982
+ 49
+-101.8084140155
+ 53
+161.5651
+ 43
+13.8599999863
+ 44
+14.4000000036
+ 45
+36.0000078261
+ 46
+-17.9999712785
+ 79
+2
+ 49
+2.2768379863
+ 49
+-54.644165987
+ 53
+16.3895
+ 43
+0.0
+ 44
+14.5800000094
+ 45
+180.0000395482
+ 46
+53.999868792
+ 79
+2
+ 49
+3.1896000216
+ 49
+-315.7712100108
+ 53
+70.3462
+ 43
+3.0600000065
+ 44
+15.4799999924
+ 45
+-71.9999144577
+ 46
+-198.0000384368
+ 79
+2
+ 49
+2.6758980112
+ 49
+-264.913343995
+ 53
+293.1986
+ 43
+13.8599999863
+ 44
+17.9999999816
+ 45
+-36.0000238407
+ 46
+89.9999951667
+ 79
+2
+ 49
+2.7416699802
+ 49
+-134.3422439845
+ 53
+343.6105
+ 43
+14.9400000209
+ 44
+15.4799999924
+ 45
+-180.0000395482
+ 46
+53.999868792
+ 79
+2
+ 49
+3.1896000216
+ 49
+-315.7712100108
+ 53
+339.444
+ 43
+0.0
+ 44
+3.420000018
+ 45
+-90.000033183
+ 46
+35.9999279355
+ 79
+2
+ 49
+3.0758400205
+ 49
+-150.7162320086
+ 53
+294.7751
+ 43
+2.8800000007
+ 44
+2.3399999834
+ 45
+-89.9998594132
+ 46
+198.0000615975
+ 79
+2
+ 49
+2.5772039845
+ 49
+-255.1435739892
+ 53
+66.8014
+ 43
+14.0399999921
+ 44
+0.0
+ 45
+36.0000238407
+ 46
+89.9999951667
+ 79
+2
+ 49
+2.7416699802
+ 49
+-134.3422439845
+ 53
+17.354
+ 43
+15.1199999809
+ 44
+2.5199999892
+ 45
+-234.0000363497
+ 46
+-71.9999010651
+ 79
+2
+ 49
+3.017358014
+ 49
+-298.7176319971
+ 53
+69.444
+ 43
+5.2199999842
+ 44
+0.0
+ 45
+-35.9999279355
+ 46
+-90.000033183
+ 79
+2
+ 49
+1.5379199874
+ 49
+-152.254151996
+ 53
+101.3099
+ 43
+12.9600000032
+ 44
+0.0
+ 45
+-17.9999573944
+ 46
+72.0000135294
+ 79
+2
+ 49
+0.9178199932
+ 49
+-90.8645219942
+ 53
+165.9638
+ 43
+12.7799999975
+ 44
+0.8999999831
+ 45
+54.0000098409
+ 46
+-17.9999650276
+ 79
+2
+ 49
+3.7107900079
+ 49
+-70.5050999903
+ 53
+186.009
+ 43
+9.1800000194
+ 44
+1.8000000119
+ 45
+179.9999954963
+ 46
+17.9999876948
+ 79
+2
+ 49
+3.4388999802
+ 49
+-340.4506140022
+ 53
+303.6901
+ 43
+11.1599999914
+ 44
+11.1599999914
+ 45
+-18.0000240412
+ 46
+35.9999920382
+ 79
+2
+ 49
+2.5959960018
+ 49
+-62.3039220112
+ 53
+353.1572
+ 43
+12.5999999917
+ 44
+9.0000000137
+ 45
+305.9999885795
+ 46
+-36.0001439522
+ 79
+2
+ 49
+4.5322919971
+ 49
+-448.6961339953
+ 53
+60.9454
+ 43
+17.0999999986
+ 44
+8.4599999964
+ 45
+-72.0000005012
+ 46
+-126.0000069224
+ 79
+2
+ 49
+1.8532079878
+ 49
+-183.4681320216
+ 53
+90.0
+ 43
+17.9999999816
+ 44
+10.0800000025
+ 45
+-17.9999999816
+ 46
+17.9999999816
+ 79
+2
+ 49
+1.0799999888
+ 49
+-16.9199999928
+ 53
+120.2564
+ 43
+8.8200000079
+ 44
+2.3399999834
+ 45
+71.9999079614
+ 46
+-126.0000441964
+ 79
+2
+ 49
+2.5006319914
+ 49
+-247.5633600209
+ 53
+48.0128
+ 43
+7.5600000133
+ 44
+4.5000000068
+ 45
+143.9999681763
+ 46
+162.000024158
+ 79
+2
+ 49
+4.8432959878
+ 49
+-237.3219360029
+ 53
+0.0
+ 43
+10.7999999798
+ 44
+8.0999999849
+ 45
+17.9999999816
+ 46
+17.9999999816
+ 79
+2
+ 49
+4.6800000126
+ 49
+-13.3200000148
+ 53
+325.3048
+ 43
+15.4799999924
+ 44
+8.0999999849
+ 45
+-179.9998966718
+ 46
+126.0001549797
+ 79
+2
+ 49
+2.8460519863
+ 49
+-281.7589319903
+ 53
+254.0546
+ 43
+17.8200000216
+ 44
+6.4799999788
+ 45
+-17.9999980057
+ 46
+-72.0000022974
+ 79
+2
+ 49
+2.6208359978
+ 49
+-128.4211439852
+ 53
+207.646
+ 43
+17.0999999986
+ 44
+3.9599999896
+ 45
+-341.999924501
+ 46
+-180.0001388421
+ 79
+2
+ 49
+4.2671699924
+ 49
+-422.4505320137
+ 53
+175.4261
+ 43
+13.320007142
+ 44
+1.980001628
+ 45
+-233.9997863523
+ 46
+17.9999001623
+ 79
+2
+ 49
+4.51438391
+ 49
+-446.9228933
+ 98
+0
+  0
+LWPOLYLINE
+  5
+DB
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-990.0
+ 10
+240.0
+ 20
+-990.0
+ 10
+240.0
+ 20
+-890.0
+ 10
+140.0
+ 20
+-890.0
+  0
+TEXT
+  5
+DC
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+GRAVEL1
+  7
+LABEL
+ 11
+140.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+DD
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+HEX
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-990.0
+ 10
+380.0
+ 20
+-990.0
+ 10
+380.0
+ 20
+-890.0
+ 10
+280.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+5.4992613154
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.7625000012
+ 46
+-2.7496306577
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 53
+60.0
+ 43
+3.175
+ 44
+0.0
+ 45
+-4.7625000012
+ 46
+2.7496306577
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+DE
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-990.0
+ 10
+380.0
+ 20
+-990.0
+ 10
+380.0
+ 20
+-890.0
+ 10
+280.0
+ 20
+-890.0
+  0
+TEXT
+  5
+DF
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+HEX
+  7
+LABEL
+ 11
+280.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+E0
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+HEXAGONS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-990.0
+ 10
+520.0
+ 20
+-990.0
+ 10
+520.0
+ 20
+-890.0
+ 10
+420.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+6.5991135785
+ 79
+2
+ 49
+3.81
+ 49
+-7.62
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-5.7150000014
+ 46
+-3.2995567892
+ 79
+2
+ 49
+3.81
+ 49
+-7.62
+ 53
+60.0
+ 43
+3.81
+ 44
+0.0
+ 45
+-5.7150000014
+ 46
+3.2995567892
+ 79
+2
+ 49
+3.81
+ 49
+-7.62
+ 98
+0
+  0
+LWPOLYLINE
+  5
+E1
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-990.0
+ 10
+520.0
+ 20
+-990.0
+ 10
+520.0
+ 20
+-890.0
+ 10
+420.0
+ 20
+-890.0
+  0
+TEXT
+  5
+E2
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+HEXAGONS
+  7
+LABEL
+ 11
+420.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+E3
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+HONEY
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-990.0
+ 10
+660.0
+ 20
+-990.0
+ 10
+660.0
+ 20
+-890.0
+ 10
+560.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+4.7625
+ 46
+2.749630645
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.7624999896
+ 46
+2.749630663
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+1.04e-08
+ 46
+5.499261308
+ 79
+2
+ 49
+-6.35
+ 49
+3.175
+ 98
+0
+  0
+LWPOLYLINE
+  5
+E4
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-990.0
+ 10
+660.0
+ 20
+-990.0
+ 10
+660.0
+ 20
+-890.0
+ 10
+560.0
+ 20
+-890.0
+  0
+TEXT
+  5
+E5
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+HONEY
+  7
+LABEL
+ 11
+560.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+E6
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+HONEYCOMB
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-990.0
+ 10
+800.0
+ 20
+-990.0
+ 10
+800.0
+ 20
+-890.0
+ 10
+700.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+5.715
+ 46
+3.299556774
+ 79
+2
+ 49
+3.81
+ 49
+-7.62
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-5.7149999875
+ 46
+3.2995567956
+ 79
+2
+ 49
+3.81
+ 49
+-7.62
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+1.25e-08
+ 46
+6.5991135696
+ 79
+2
+ 49
+-7.62
+ 49
+3.81
+ 98
+0
+  0
+LWPOLYLINE
+  5
+E7
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-990.0
+ 10
+800.0
+ 20
+-990.0
+ 10
+800.0
+ 20
+-890.0
+ 10
+700.0
+ 20
+-890.0
+  0
+TEXT
+  5
+E8
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+HONEYCOMB
+  7
+LABEL
+ 11
+700.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+E9
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+INSUL
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-990.0
+ 10
+940.0
+ 20
+-990.0
+ 10
+940.0
+ 20
+-890.0
+ 10
+840.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+9.525
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+3.175
+ 45
+0.0
+ 46
+9.525
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 53
+0.0
+ 43
+0.0
+ 44
+6.35
+ 45
+0.0
+ 46
+9.525
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 98
+0
+  0
+LWPOLYLINE
+  5
+EA
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-990.0
+ 10
+940.0
+ 20
+-990.0
+ 10
+940.0
+ 20
+-890.0
+ 10
+840.0
+ 20
+-890.0
+  0
+TEXT
+  5
+EB
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+INSUL
+  7
+LABEL
+ 11
+840.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+EC
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+INSULATION
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-990.0
+ 10
+1080.0
+ 20
+-990.0
+ 10
+1080.0
+ 20
+-890.0
+ 10
+980.0
+ 20
+-890.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.5144717139
+ 46
+2.5144717139
+ 79
+0
+ 53
+135.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.5144717139
+ 46
+-2.5144717139
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+ED
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-990.0
+ 10
+1080.0
+ 20
+-990.0
+ 10
+1080.0
+ 20
+-890.0
+ 10
+980.0
+ 20
+-890.0
+  0
+TEXT
+  5
+EE
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-1004.0
+ 30
+0.0
+ 40
+9.0
+  1
+INSULATION
+  7
+LABEL
+ 11
+980.0
+ 21
+-1004.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+EF
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+LINE
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-1155.0
+ 10
+100.0
+ 20
+-1155.0
+ 10
+100.0
+ 20
+-1055.0
+ 10
+0.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+3.175
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F0
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-1155.0
+ 10
+100.0
+ 20
+-1155.0
+ 10
+100.0
+ 20
+-1055.0
+ 10
+0.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+F1
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+LINE
+  7
+LABEL
+ 11
+0.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+F2
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+LINES
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-1155.0
+ 10
+240.0
+ 20
+-1155.0
+ 10
+240.0
+ 20
+-1055.0
+ 10
+140.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+2.54
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F3
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-1155.0
+ 10
+240.0
+ 20
+-1155.0
+ 10
+240.0
+ 20
+-1055.0
+ 10
+140.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+F4
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+LINES
+  7
+LABEL
+ 11
+140.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+F5
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+MUDST
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-1155.0
+ 10
+380.0
+ 20
+-1155.0
+ 10
+380.0
+ 20
+-1055.0
+ 10
+280.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+1
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+12.7
+ 46
+6.35
+ 79
+6
+ 49
+6.35
+ 49
+-6.35
+ 49
+0.0
+ 49
+-6.35
+ 49
+0.0
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F6
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-1155.0
+ 10
+380.0
+ 20
+-1155.0
+ 10
+380.0
+ 20
+-1055.0
+ 10
+280.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+F7
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+MUDST
+  7
+LABEL
+ 11
+280.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+F8
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+NET
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-1155.0
+ 10
+520.0
+ 20
+-1155.0
+ 10
+520.0
+ 20
+-1055.0
+ 10
+420.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+3.175
+ 79
+0
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.175
+ 46
+0.0
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F9
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-1155.0
+ 10
+520.0
+ 20
+-1155.0
+ 10
+520.0
+ 20
+-1055.0
+ 10
+420.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+FA
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+NET
+  7
+LABEL
+ 11
+420.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+FB
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+NET3
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-1155.0
+ 10
+660.0
+ 20
+-1155.0
+ 10
+660.0
+ 20
+-1055.0
+ 10
+560.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+3.175
+ 79
+0
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.749630657
+ 46
+1.5875
+ 79
+0
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-2.749630657
+ 46
+-1.5875
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+FC
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-1155.0
+ 10
+660.0
+ 20
+-1155.0
+ 10
+660.0
+ 20
+-1055.0
+ 10
+560.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+FD
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+NET3
+  7
+LABEL
+ 11
+560.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+FE
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+PLAST
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-1155.0
+ 10
+800.0
+ 20
+-1155.0
+ 10
+800.0
+ 20
+-1055.0
+ 10
+700.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+0.79375
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+1.5875
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+FF
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-1155.0
+ 10
+800.0
+ 20
+-1155.0
+ 10
+800.0
+ 20
+-1055.0
+ 10
+700.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+100
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+PLAST
+  7
+LABEL
+ 11
+700.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+101
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+PLASTI
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-1155.0
+ 10
+940.0
+ 20
+-1155.0
+ 10
+940.0
+ 20
+-1055.0
+ 10
+840.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+4
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+0.79375
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+1.5875
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 53
+0.0
+ 43
+0.0
+ 44
+3.96875
+ 45
+0.0
+ 46
+6.35
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+102
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-1155.0
+ 10
+940.0
+ 20
+-1155.0
+ 10
+940.0
+ 20
+-1055.0
+ 10
+840.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+103
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+PLASTI
+  7
+LABEL
+ 11
+840.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+104
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SQUARE
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-1155.0
+ 10
+1080.0
+ 20
+-1155.0
+ 10
+1080.0
+ 20
+-1055.0
+ 10
+980.0
+ 20
+-1055.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+3.175
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.175
+ 46
+0.0
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 98
+0
+  0
+LWPOLYLINE
+  5
+105
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+980.0
+ 20
+-1155.0
+ 10
+1080.0
+ 20
+-1155.0
+ 10
+1080.0
+ 20
+-1055.0
+ 10
+980.0
+ 20
+-1055.0
+  0
+TEXT
+  5
+106
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-1169.0
+ 30
+0.0
+ 40
+9.0
+  1
+SQUARE
+  7
+LABEL
+ 11
+980.0
+ 21
+-1169.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+107
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SQUARES
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-1320.0
+ 10
+100.0
+ 20
+-1320.0
+ 10
+100.0
+ 20
+-1220.0
+ 10
+0.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+3.81
+ 79
+2
+ 49
+3.81
+ 49
+-3.81
+ 53
+90.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.81
+ 46
+0.0
+ 79
+2
+ 49
+3.81
+ 49
+-3.81
+ 98
+0
+  0
+LWPOLYLINE
+  5
+108
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-1320.0
+ 10
+100.0
+ 20
+-1320.0
+ 10
+100.0
+ 20
+-1220.0
+ 10
+0.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+109
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+SQUARES
+  7
+LABEL
+ 11
+0.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+10A
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+STARS
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-1320.0
+ 10
+240.0
+ 20
+-1320.0
+ 10
+240.0
+ 20
+-1220.0
+ 10
+140.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+0.0
+ 46
+5.4992613154
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.7625000012
+ 46
+2.7496306577
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 53
+120.0
+ 43
+1.5875
+ 44
+2.7496306704
+ 45
+-4.7625000012
+ 46
+-2.7496306577
+ 79
+2
+ 49
+3.175
+ 49
+-3.175
+ 98
+0
+  0
+LWPOLYLINE
+  5
+10B
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+140.0
+ 20
+-1320.0
+ 10
+240.0
+ 20
+-1320.0
+ 10
+240.0
+ 20
+-1220.0
+ 10
+140.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+10C
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+STARS
+  7
+LABEL
+ 11
+140.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+10D
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+STEEL
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-1320.0
+ 10
+380.0
+ 20
+-1320.0
+ 10
+380.0
+ 20
+-1220.0
+ 10
+280.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+8
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+4.318
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+4.572
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+4.826
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+5.08
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+5.334
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+5.588
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 53
+45.0
+ 43
+5.842
+ 44
+0.0
+ 45
+-5.3881536726
+ 46
+5.3881536726
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+10E
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+280.0
+ 20
+-1320.0
+ 10
+380.0
+ 20
+-1320.0
+ 10
+380.0
+ 20
+-1220.0
+ 10
+280.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+10F
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+STEEL
+  7
+LABEL
+ 11
+280.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+110
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SWAMP
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-1320.0
+ 10
+520.0
+ 20
+-1320.0
+ 10
+520.0
+ 20
+-1220.0
+ 10
+420.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+12.7
+ 46
+21.9970452362
+ 79
+2
+ 49
+3.175
+ 49
+-22.225
+ 53
+90.0
+ 43
+1.5875
+ 44
+0.0
+ 45
+-12.7
+ 46
+21.9970452362
+ 79
+2
+ 49
+1.5875
+ 49
+-42.4065904724
+ 53
+90.0
+ 43
+1.984375
+ 44
+0.0
+ 45
+-12.7
+ 46
+21.9970452362
+ 79
+2
+ 49
+1.27
+ 49
+-42.7240904724
+ 53
+90.0
+ 43
+1.190625
+ 44
+0.0
+ 45
+-12.7
+ 46
+21.9970452362
+ 79
+2
+ 49
+1.27
+ 49
+-42.7240904724
+ 53
+60.0
+ 43
+2.38125
+ 44
+0.0
+ 45
+-12.6999999827
+ 46
+21.9970452462
+ 79
+2
+ 49
+1.016
+ 49
+-24.384
+ 53
+120.0
+ 43
+0.79375
+ 44
+0.0
+ 45
+-25.3999999827
+ 46
+1e-08
+ 79
+2
+ 49
+1.016
+ 49
+-24.384
+ 98
+0
+  0
+LWPOLYLINE
+  5
+111
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+420.0
+ 20
+-1320.0
+ 10
+520.0
+ 20
+-1320.0
+ 10
+520.0
+ 20
+-1220.0
+ 10
+420.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+112
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+SWAMP
+  7
+LABEL
+ 11
+420.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+113
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+TRIANG
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-1320.0
+ 10
+660.0
+ 20
+-1320.0
+ 10
+660.0
+ 20
+-1220.0
+ 10
+560.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.7624999908
+ 46
+8.2488919657
+ 79
+2
+ 49
+4.7625
+ 49
+-4.7625
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-9.5249999908
+ 46
+5.3e-09
+ 79
+2
+ 49
+4.7625
+ 49
+-4.7625
+ 53
+0.0
+ 43
+-2.38125
+ 44
+4.1244459802
+ 45
+4.7625
+ 46
+8.2488919604
+ 79
+2
+ 49
+4.7625
+ 49
+-4.7625
+ 98
+0
+  0
+LWPOLYLINE
+  5
+114
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+560.0
+ 20
+-1320.0
+ 10
+660.0
+ 20
+-1320.0
+ 10
+660.0
+ 20
+-1220.0
+ 10
+560.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+115
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+TRIANG
+  7
+LABEL
+ 11
+560.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+116
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+TRIANGLES
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-1320.0
+ 10
+800.0
+ 20
+-1320.0
+ 10
+800.0
+ 20
+-1220.0
+ 10
+700.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-5.7149999889
+ 46
+9.8986703589
+ 79
+2
+ 49
+5.715
+ 49
+-5.715
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-11.4299999889
+ 46
+6.4e-09
+ 79
+2
+ 49
+5.715
+ 49
+-5.715
+ 53
+0.0
+ 43
+-2.8575
+ 44
+4.9493351762
+ 45
+5.715
+ 46
+9.8986703525
+ 79
+2
+ 49
+5.715
+ 49
+-5.715
+ 98
+0
+  0
+LWPOLYLINE
+  5
+117
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+700.0
+ 20
+-1320.0
+ 10
+800.0
+ 20
+-1320.0
+ 10
+800.0
+ 20
+-1220.0
+ 10
+700.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+118
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+TRIANGLES
+  7
+LABEL
+ 11
+700.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+119
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ZIGZAG
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-1320.0
+ 10
+940.0
+ 20
+-1320.0
+ 10
+940.0
+ 20
+-1220.0
+ 10
+840.0
+ 20
+-1220.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+2
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 53
+90.0
+ 43
+6.35
+ 44
+0.0
+ 45
+-6.35
+ 46
+6.35
+ 79
+2
+ 49
+6.35
+ 49
+-6.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+11A
+330
+17
+100
+AcDbEntity
+  8
+PATTERNS
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+-1320.0
+ 10
+940.0
+ 20
+-1320.0
+ 10
+940.0
+ 20
+-1220.0
+ 10
+840.0
+ 20
+-1220.0
+  0
+TEXT
+  5
+11B
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-1334.0
+ 30
+0.0
+ 40
+9.0
+  1
+ZIGZAG
+  7
+LABEL
+ 11
+840.0
+ 21
+-1334.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+11C
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-1585.0
+ 10
+100.0
+ 20
+-1585.0
+ 10
+100.0
+ 20
+-1485.0
+ 10
+0.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.0
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+LINEAR
+  0
+TEXT
+  5
+11D
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+linear
+  7
+LABEL
+ 11
+0.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+11E
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+140.0
+ 20
+-1585.0
+ 10
+240.0
+ 20
+-1585.0
+ 10
+240.0
+ 20
+-1485.0
+ 10
+140.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.5235987755982988
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+CYLINDER
+  0
+TEXT
+  5
+11F
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+140.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+cylinder
+  7
+LABEL
+ 11
+140.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+120
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+280.0
+ 20
+-1585.0
+ 10
+380.0
+ 20
+-1585.0
+ 10
+380.0
+ 20
+-1485.0
+ 10
+280.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.0
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+INVCYLINDER
+  0
+TEXT
+  5
+121
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+280.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+invcylinder
+  7
+LABEL
+ 11
+280.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+122
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+420.0
+ 20
+-1585.0
+ 10
+520.0
+ 20
+-1585.0
+ 10
+520.0
+ 20
+-1485.0
+ 10
+420.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.5235987755982988
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+SPHERICAL
+  0
+TEXT
+  5
+123
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+420.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+spherical
+  7
+LABEL
+ 11
+420.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+124
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+560.0
+ 20
+-1585.0
+ 10
+660.0
+ 20
+-1585.0
+ 10
+660.0
+ 20
+-1485.0
+ 10
+560.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.0
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+INVSPHERICAL
+  0
+TEXT
+  5
+125
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+560.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+invspherical
+  7
+LABEL
+ 11
+560.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+126
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+700.0
+ 20
+-1585.0
+ 10
+800.0
+ 20
+-1585.0
+ 10
+800.0
+ 20
+-1485.0
+ 10
+700.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.5235987755982988
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+HEMISPHERICAL
+  0
+TEXT
+  5
+127
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+700.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+hemispherical
+  7
+LABEL
+ 11
+700.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+128
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+840.0
+ 20
+-1585.0
+ 10
+940.0
+ 20
+-1585.0
+ 10
+940.0
+ 20
+-1485.0
+ 10
+840.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.0
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+INVHEMISPHERICAL
+  0
+TEXT
+  5
+129
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+840.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+invhemispherical
+  7
+LABEL
+ 11
+840.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+12A
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+980.0
+ 20
+-1585.0
+ 10
+1080.0
+ 20
+-1585.0
+ 10
+1080.0
+ 20
+-1485.0
+ 10
+980.0
+ 20
+-1485.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.5235987755982988
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+CURVED
+  0
+TEXT
+  5
+12B
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+980.0
+ 20
+-1599.0
+ 30
+0.0
+ 40
+9.0
+  1
+curved
+  7
+LABEL
+ 11
+980.0
+ 21
+-1599.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+12C
+330
+17
+100
+AcDbEntity
+  8
+GRADIENTS
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-1750.0
+ 10
+100.0
+ 20
+-1750.0
+ 10
+100.0
+ 20
+-1650.0
+ 10
+0.0
+ 20
+-1650.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+0.0
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+16768080
+463
+1
+421
+1326220
+470
+INVCURVED
+  0
+TEXT
+  5
+12D
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-1764.0
+ 30
+0.0
+ 40
+9.0
+  1
+invcurved
+  7
+LABEL
+ 11
+0.0
+ 21
+-1764.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+12E
+330
+17
+100
+AcDbEntity
+  8
+ISLANDS
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+3
+ 92
+19
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-2015.0
+ 10
+200.0
+ 20
+-2015.0
+ 10
+200.0
+ 20
+-1815.0
+ 10
+0.0
+ 20
+-1815.0
+ 97
+0
+ 92
+16
+ 93
+1
+ 72
+2
+ 10
+100.0
+ 20
+-1915.0
+ 40
+70
+ 50
+0
+ 51
+360
+ 73
+1
+ 97
+0
+ 92
+18
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+75.0
+ 20
+-1935.0
+ 10
+125.0
+ 20
+-1935.0
+ 10
+100.0
+ 20
+-1887.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.4
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.1430896424
+ 46
+3.1430896424
+ 79
+0
+ 98
+0
+  0
+TEXT
+  5
+12F
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+0.0
+ 20
+-2029.0
+ 30
+0.0
+ 40
+9.0
+  1
+normal: nested islands
+  7
+LABEL
+ 11
+0.0
+ 21
+-2029.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+130
+330
+17
+100
+AcDbEntity
+  8
+ISLANDS
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+3
+ 92
+19
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+240.0
+ 20
+-2015.0
+ 10
+440.0
+ 20
+-2015.0
+ 10
+440.0
+ 20
+-1815.0
+ 10
+240.0
+ 20
+-1815.0
+ 97
+0
+ 92
+16
+ 93
+1
+ 72
+2
+ 10
+340.0
+ 20
+-1915.0
+ 40
+70
+ 50
+0
+ 51
+360
+ 73
+1
+ 97
+0
+ 92
+18
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+315.0
+ 20
+-1935.0
+ 10
+365.0
+ 20
+-1935.0
+ 10
+340.0
+ 20
+-1887.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.4
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.1430896424
+ 46
+3.1430896424
+ 79
+0
+ 98
+0
+  0
+TEXT
+  5
+131
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+240.0
+ 20
+-2029.0
+ 30
+0.0
+ 40
+9.0
+  1
+outer only
+  7
+LABEL
+ 11
+240.0
+ 21
+-2029.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+132
+330
+17
+100
+AcDbEntity
+  8
+ISLANDS
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+3
+ 92
+19
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+480.0
+ 20
+-2015.0
+ 10
+680.0
+ 20
+-2015.0
+ 10
+680.0
+ 20
+-1815.0
+ 10
+480.0
+ 20
+-1815.0
+ 97
+0
+ 92
+16
+ 93
+1
+ 72
+2
+ 10
+580.0
+ 20
+-1915.0
+ 40
+70
+ 50
+0
+ 51
+360
+ 73
+1
+ 97
+0
+ 92
+18
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+555.0
+ 20
+-1935.0
+ 10
+605.0
+ 20
+-1935.0
+ 10
+580.0
+ 20
+-1887.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.4
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.1430896424
+ 46
+3.1430896424
+ 79
+0
+ 98
+0
+  0
+TEXT
+  5
+133
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+480.0
+ 20
+-2029.0
+ 30
+0.0
+ 40
+9.0
+  1
+ignore: all filled
+  7
+LABEL
+ 11
+480.0
+ 21
+-2029.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+134
+330
+17
+100
+AcDbEntity
+  8
+EDGES
+ 62
+3
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+HONEY
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+1
+ 93
+5
+ 72
+1
+ 10
+720.0
+ 20
+-2015.0
+ 11
+880.0
+ 21
+-2015.0
+ 72
+2
+ 10
+880.0
+ 20
+-1975.0
+ 40
+40
+ 50
+270
+ 51
+90
+ 73
+1
+ 72
+1
+ 10
+880.0
+ 20
+-1935.0
+ 11
+840.0
+ 21
+-1935.0
+ 72
+4
+ 94
+3
+ 73
+0
+ 74
+0
+ 95
+8
+ 96
+0
+ 40
+0.0
+ 40
+0.0
+ 40
+0.0
+ 40
+0.0
+ 40
+-3.0
+ 40
+-3.0
+ 40
+-3.0
+ 40
+-3.0
+ 97
+5
+ 11
+840.0
+ 21
+-1935.0
+ 11
+820.0
+ 21
+-1875.0
+ 11
+780.0
+ 21
+-1975.0
+ 11
+760.0
+ 21
+-1895.0
+ 11
+720.0
+ 21
+-1915.0
+ 72
+1
+ 10
+720.0
+ 20
+-1915.0
+ 11
+720.0
+ 21
+-2015.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+1.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+4.7625
+ 46
+2.749630645
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 53
+120.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-4.7624999896
+ 46
+2.749630663
+ 79
+2
+ 49
+3.175
+ 49
+-6.35
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+1.04e-08
+ 46
+5.499261308
+ 79
+2
+ 49
+-6.35
+ 49
+3.175
+ 98
+0
+  0
+TEXT
+  5
+135
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+720.0
+ 20
+-2029.0
+ 30
+0.0
+ 40
+9.0
+  1
+edges: line, arc, spline
+  7
+LABEL
+ 11
+720.0
+ 21
+-2029.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+136
+330
+17
+100
+AcDbEntity
+  8
+EDGES
+ 62
+6
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+1
+ 93
+1
+ 72
+3
+ 10
+1010.0
+ 20
+-1945.0
+ 11
+70.0
+ 21
+0.0
+ 40
+0.55
+ 50
+0
+ 51
+360
+ 73
+1
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+TEXT
+  5
+137
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+940.0
+ 20
+-2029.0
+ 30
+0.0
+ 40
+9.0
+  1
+ellipse, solid
+  7
+LABEL
+ 11
+940.0
+ 21
+-2029.0
+ 31
+0.0
+100
+AcDbText
+  0
+HATCH
+  5
+138
+330
+17
+100
+AcDbEntity
+  8
+EDGES
+ 62
+2
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI37
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+1120.0
+ 20
+-2015.0
+ 10
+1260.0
+ 20
+-2015.0
+ 10
+1260.0
+ 20
+-1875.0
+ 10
+1120.0
+ 20
+-1875.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+15.0
+ 41
+2.5
+ 77
+0
+ 78
+2
+ 53
+60.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.8740766426
+ 46
+3.9687500001
+ 79
+0
+ 53
+150.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-3.9687500001
+ 46
+-6.8740766426
+ 79
+0
+ 98
+0
+  0
+TEXT
+  5
+139
+330
+17
+100
+AcDbEntity
+  8
+LABELS
+100
+AcDbText
+ 10
+1120.0
+ 20
+-2029.0
+ 30
+0.0
+ 40
+9.0
+  1
+angle 15, scale 2.5
+  7
+LABEL
+ 11
+1120.0
+ 21
+-2029.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+13D
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+13D
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/house-elevations.dxf b/crates/exav-viewer/demo/examples/files/cad/house-elevations.dxf
new file mode 100644
index 00000000..e22260b4
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/house-elevations.dxf
@@ -0,0 +1,18904 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+23A
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+236
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+20684.586738111186
+ 22
+-5270.0
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+29358.0
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+14
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-GROUND
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+50
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-WALL
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+35
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-RENDER
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+44
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-PLINTH
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+45
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-ROOF
+ 70
+0
+ 62
+1
+  6
+Continuous
+370
+35
+390
+13
+347
+21
+  0
+LAYER
+  5
+46
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-FLOOR
+ 70
+0
+ 62
+9
+  6
+DASHDOT
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+47
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-DOOR
+ 70
+0
+ 62
+30
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+48
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+E-STEP
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+49
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WIND
+ 70
+0
+ 62
+5
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+4A
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-ANNO
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+4B
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-DIMS
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+LAYER
+  5
+4C
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FIXT
+ 70
+0
+ 62
+4
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+4D
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-TEXT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+4E
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-TITLE
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+times.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+237
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+238
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+4F
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+ELEV50
+ 70
+0
+ 40
+1.0
+ 41
+128.0
+ 42
+128.0
+ 43
+3.75
+ 44
+96.0
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+160.0
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+48.0
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+0
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+4D
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+26
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+50
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+DOOR
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+57
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WINDOW
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+60
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+67
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+TABLE
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+73
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SOFA
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+7B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WC
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+80
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SINK
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+86
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BATH
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+AXIS
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+90
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+NORTH
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+96
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+LEVEL
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+D9
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D1
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+DE
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_CLOSEDFILLED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+EC
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D2
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+FB
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D3
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+138
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D4
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+147
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D5
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+156
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D6
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+193
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D7
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1A2
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D8
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D9
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1E9
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D10
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1F8
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D11
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+207
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D12
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+51
+330
+50
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+DOOR
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+DOOR
+  1
+
+  0
+LINE
+  5
+53
+330
+50
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+900.0
+ 31
+0.0
+  0
+ARC
+  5
+54
+330
+50
+100
+AcDbEntity
+  8
+A-DOOR
+  6
+DASHED
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+900.0
+100
+AcDbArc
+ 50
+0.0
+ 51
+90.0
+  0
+LWPOLYLINE
+  5
+55
+330
+50
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+900.0
+ 20
+0.0
+ 10
+900.0
+ 20
+40.0
+ 10
+0.0
+ 20
+40.0
+  0
+ATTDEF
+  5
+56
+330
+50
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+350.0
+ 20
+-330.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-000
+100
+AcDbAttributeDefinition
+  3
+
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+52
+330
+50
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+58
+330
+57
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WINDOW
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WINDOW
+  1
+
+  0
+LINE
+  5
+5A
+330
+57
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+5B
+330
+57
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.35
+ 30
+0.0
+ 11
+1.0
+ 21
+0.35
+ 31
+0.0
+  0
+LINE
+  5
+5C
+330
+57
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.65
+ 30
+0.0
+ 11
+1.0
+ 21
+0.65
+ 31
+0.0
+  0
+LINE
+  5
+5D
+330
+57
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+5E
+330
+57
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+5F
+330
+57
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+59
+330
+57
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+61
+330
+60
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BED
+  1
+
+  0
+LWPOLYLINE
+  5
+63
+330
+60
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+2000.0
+ 10
+0.0
+ 20
+2000.0
+  0
+LWPOLYLINE
+  5
+64
+330
+60
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+80.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1920.0
+ 10
+80.0
+ 20
+1920.0
+  0
+LWPOLYLINE
+  5
+65
+330
+60
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1920.0
+ 10
+840.0
+ 20
+1920.0
+  0
+LINE
+  5
+66
+330
+60
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbLine
+ 10
+0.0
+ 20
+1200.0
+ 30
+0.0
+ 11
+1600.0
+ 21
+1200.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+62
+330
+60
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+68
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+TABLE
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+TABLE
+  1
+
+  0
+LWPOLYLINE
+  5
+6A
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+900.0
+ 10
+0.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+6B
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-50.0
+ 10
+150.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+6C
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+950.0
+ 10
+550.0
+ 20
+950.0
+ 10
+550.0
+ 20
+1350.0
+ 10
+150.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+6D
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-50.0
+ 10
+600.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+6E
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+1350.0
+ 10
+600.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+6F
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-50.0
+ 10
+1050.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+70
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+1350.0
+ 10
+1050.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+71
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-50.0
+ 10
+1500.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+72
+330
+67
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+1350.0
+ 10
+1500.0
+ 20
+1350.0
+  0
+ENDBLK
+  5
+69
+330
+67
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+74
+330
+73
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SOFA
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SOFA
+  1
+
+  0
+LWPOLYLINE
+  5
+76
+330
+73
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+950.0
+ 10
+0.0
+ 20
+950.0
+  0
+LWPOLYLINE
+  5
+77
+330
+73
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+250.0
+ 10
+0.0
+ 20
+250.0
+  0
+LWPOLYLINE
+  5
+78
+330
+73
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+120.0
+ 20
+300.0
+ 10
+720.0
+ 20
+300.0
+ 10
+720.0
+ 20
+900.0
+ 10
+120.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+79
+330
+73
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+770.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+900.0
+ 10
+770.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+7A
+330
+73
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1420.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+900.0
+ 10
+1420.0
+ 20
+900.0
+  0
+ENDBLK
+  5
+75
+330
+73
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+7C
+330
+7B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WC
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WC
+  1
+
+  0
+LWPOLYLINE
+  5
+7E
+330
+7B
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+400.0
+ 20
+0.0
+ 10
+400.0
+ 20
+200.0
+ 10
+0.0
+ 20
+200.0
+  0
+ELLIPSE
+  5
+7F
+330
+7B
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbEllipse
+ 10
+200.0
+ 20
+-250.0
+ 30
+0.0
+ 11
+0.0
+ 21
+230.0
+ 31
+0.0
+ 40
+0.8
+ 41
+0.0
+ 42
+6.283185307179586
+  0
+ENDBLK
+  5
+7D
+330
+7B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+81
+330
+80
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SINK
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SINK
+  1
+
+  0
+LWPOLYLINE
+  5
+83
+330
+80
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+600.0
+ 20
+0.0
+ 10
+600.0
+ 20
+450.0
+ 10
+0.0
+ 20
+450.0
+  0
+CIRCLE
+  5
+84
+330
+80
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+160.0
+  0
+CIRCLE
+  5
+85
+330
+80
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+25.0
+  0
+ENDBLK
+  5
+82
+330
+80
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+87
+330
+86
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BATH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BATH
+  1
+
+  0
+LWPOLYLINE
+  5
+89
+330
+86
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+750.0
+ 10
+0.0
+ 20
+750.0
+  0
+LWPOLYLINE
+  5
+8A
+330
+86
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+5
+ 70
+1
+ 10
+100.0
+ 20
+100.0
+ 10
+1500.0
+ 20
+100.0
+ 10
+1600.0
+ 20
+375.0
+ 10
+1500.0
+ 20
+650.0
+ 10
+100.0
+ 20
+650.0
+  0
+ENDBLK
+  5
+88
+330
+86
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+8C
+330
+8B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+AXIS
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+AXIS
+  1
+
+  0
+CIRCLE
+  5
+8E
+330
+8B
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  0
+ATTDEF
+  5
+8F
+330
+8B
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  1
+A
+ 72
+4
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbAttributeDefinition
+  3
+
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+8D
+330
+8B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+91
+330
+90
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+NORTH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+NORTH
+  1
+
+  0
+CIRCLE
+  5
+93
+330
+90
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+500.0
+  0
+SOLID
+  5
+94
+330
+90
+100
+AcDbEntity
+  8
+A-ANNO
+ 62
+7
+100
+AcDbTrace
+ 10
+0.0
+ 20
+650.0
+ 30
+0.0
+ 11
+-170.0
+ 21
+-400.0
+ 31
+0.0
+ 12
+0.0
+ 22
+-200.0
+ 32
+0.0
+ 13
+170.0
+ 23
+-400.0
+ 33
+0.0
+  0
+TEXT
+  5
+95
+330
+90
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+800.0
+ 30
+0.0
+ 40
+300.0
+  1
+N
+ 72
+1
+ 11
+0.0
+ 21
+800.0
+ 31
+0.0
+100
+AcDbText
+ 73
+1
+  0
+ENDBLK
+  5
+92
+330
+90
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+97
+330
+96
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+LEVEL
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+LEVEL
+  1
+
+  0
+LWPOLYLINE
+  5
+99
+330
+96
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+-250.0
+ 20
+250.0
+ 10
+0.0
+ 20
+0.0
+ 10
+250.0
+ 20
+250.0
+  0
+LINE
+  5
+9A
+330
+96
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbLine
+ 10
+-250.0
+ 20
+250.0
+ 30
+0.0
+ 11
+900.0
+ 21
+250.0
+ 31
+0.0
+  0
+ATTDEF
+  5
+9B
+330
+96
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+320.0
+ 20
+290.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+100
+AcDbAttributeDefinition
+  3
+
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+98
+330
+96
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+DA
+330
+D9
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D1
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D1
+  1
+
+  0
+LINE
+  5
+DC
+330
+D9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+DD
+330
+D9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+5400.0
+ 31
+0.0
+  0
+INSERT
+  5
+E2
+330
+D9
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+0.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+E4
+330
+D9
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+5400.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+E6
+330
+D9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-1900.0
+ 20
+128.0
+ 30
+0.0
+ 11
+-1900.0
+ 21
+5272.0
+ 31
+0.0
+  0
+MTEXT
+  5
+E7
+330
+D9
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2028.0
+ 20
+2700.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+5400
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+E8
+330
+D9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-1900.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+E9
+330
+D9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+EA
+330
+D9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+5400.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+DB
+330
+D9
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+DF
+330
+DE
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+_CLOSEDFILLED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+_CLOSEDFILLED
+  1
+
+  0
+SOLID
+  5
+E1
+330
+DE
+100
+AcDbEntity
+  8
+0
+  6
+BYBLOCK
+ 62
+0
+100
+AcDbTrace
+ 10
+-1.0
+ 20
+0.16439898372402537
+ 30
+0.0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+ 12
+-1.0
+ 22
+-0.16439898372402537
+ 32
+0.0
+ 13
+-1.0
+ 23
+-0.16439898372402537
+ 33
+0.0
+  0
+ENDBLK
+  5
+E0
+330
+DE
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+ED
+330
+EC
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D2
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D2
+  1
+
+  0
+LINE
+  5
+EF
+330
+EC
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+5400.0
+ 31
+0.0
+  0
+LINE
+  5
+F0
+330
+EC
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+8300.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+8300.0
+ 31
+0.0
+  0
+INSERT
+  5
+F1
+330
+EC
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+5400.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+F3
+330
+EC
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+8300.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+F5
+330
+EC
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-1900.0
+ 20
+5528.0
+ 30
+0.0
+ 11
+-1900.0
+ 21
+8172.0
+ 31
+0.0
+  0
+MTEXT
+  5
+F6
+330
+EC
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2028.0
+ 20
+6850.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+2900
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+F7
+330
+EC
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-1900.0
+ 20
+5400.0
+ 30
+0.0
+  0
+POINT
+  5
+F8
+330
+EC
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+5400.0
+ 30
+0.0
+  0
+POINT
+  5
+F9
+330
+EC
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+8300.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+EE
+330
+EC
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+FC
+330
+FB
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D3
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D3
+  1
+
+  0
+LINE
+  5
+FE
+330
+FB
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-128.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-1196.0
+ 31
+0.0
+  0
+LINE
+  5
+FF
+330
+FB
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-128.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-1196.0
+ 31
+0.0
+  0
+INSERT
+  5
+100
+330
+FB
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-1100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+180.0
+  0
+INSERT
+  5
+102
+330
+FB
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+10000.0
+ 20
+-1100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+  0
+LINE
+  5
+104
+330
+FB
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+128.0
+ 20
+-1100.0
+ 30
+0.0
+ 11
+9872.0
+ 21
+-1100.0
+ 31
+0.0
+  0
+MTEXT
+  5
+105
+330
+FB
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+5000.0
+ 20
+-972.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+10000
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+106
+330
+FB
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-1100.0
+ 30
+0.0
+  0
+POINT
+  5
+107
+330
+FB
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+108
+330
+FB
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+10000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+FD
+330
+FB
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+139
+330
+138
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D4
+  1
+
+  0
+LINE
+  5
+13B
+330
+138
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+0.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+13C
+330
+138
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+5400.0
+ 31
+0.0
+  0
+INSERT
+  5
+13D
+330
+138
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+0.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+13F
+330
+138
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+5400.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+141
+330
+138
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+14100.0
+ 20
+128.0
+ 30
+0.0
+ 11
+14100.0
+ 21
+5272.0
+ 31
+0.0
+  0
+MTEXT
+  5
+142
+330
+138
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+13972.0
+ 20
+2700.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+5400
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+143
+330
+138
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14100.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+144
+330
+138
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+145
+330
+138
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+5400.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+13A
+330
+138
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+148
+330
+147
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D5
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D5
+  1
+
+  0
+LINE
+  5
+14A
+330
+147
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+5400.0
+ 31
+0.0
+  0
+LINE
+  5
+14B
+330
+147
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+8300.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+8300.0
+ 31
+0.0
+  0
+INSERT
+  5
+14C
+330
+147
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+5400.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+14E
+330
+147
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+8300.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+150
+330
+147
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+14100.0
+ 20
+5528.0
+ 30
+0.0
+ 11
+14100.0
+ 21
+8172.0
+ 31
+0.0
+  0
+MTEXT
+  5
+151
+330
+147
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+13972.0
+ 20
+6850.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+2900
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+152
+330
+147
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14100.0
+ 20
+5400.0
+ 30
+0.0
+  0
+POINT
+  5
+153
+330
+147
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+5400.0
+ 30
+0.0
+  0
+POINT
+  5
+154
+330
+147
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+8300.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+149
+330
+147
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+157
+330
+156
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D6
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D6
+  1
+
+  0
+LINE
+  5
+159
+330
+156
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+16000.0
+ 20
+-128.0
+ 30
+0.0
+ 11
+16000.0
+ 21
+-1196.0
+ 31
+0.0
+  0
+LINE
+  5
+15A
+330
+156
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+24000.0
+ 20
+-128.0
+ 30
+0.0
+ 11
+24000.0
+ 21
+-1196.0
+ 31
+0.0
+  0
+INSERT
+  5
+15B
+330
+156
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+16000.0
+ 20
+-1100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+180.0
+  0
+INSERT
+  5
+15D
+330
+156
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+24000.0
+ 20
+-1100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+  0
+LINE
+  5
+15F
+330
+156
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+16128.0
+ 20
+-1100.0
+ 30
+0.0
+ 11
+23872.0
+ 21
+-1100.0
+ 31
+0.0
+  0
+MTEXT
+  5
+160
+330
+156
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+20000.0
+ 20
+-972.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+8000
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+161
+330
+156
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-1100.0
+ 30
+0.0
+  0
+POINT
+  5
+162
+330
+156
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+163
+330
+156
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+24000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+158
+330
+156
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+194
+330
+193
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D7
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D7
+  1
+
+  0
+LINE
+  5
+196
+330
+193
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+-17000.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+-17000.0
+ 31
+0.0
+  0
+LINE
+  5
+197
+330
+193
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+-11600.0
+ 31
+0.0
+  0
+INSERT
+  5
+198
+330
+193
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+-17000.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+19A
+330
+193
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+-11600.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+19C
+330
+193
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-1900.0
+ 20
+-16872.0
+ 30
+0.0
+ 11
+-1900.0
+ 21
+-11728.0
+ 31
+0.0
+  0
+MTEXT
+  5
+19D
+330
+193
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2028.0
+ 20
+-14300.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+5400
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+19E
+330
+193
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-1900.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+POINT
+  5
+19F
+330
+193
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+POINT
+  5
+1A0
+330
+193
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+195
+330
+193
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1A3
+330
+1A2
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D8
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D8
+  1
+
+  0
+LINE
+  5
+1A5
+330
+1A2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+-11600.0
+ 31
+0.0
+  0
+LINE
+  5
+1A6
+330
+1A2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-128.0
+ 20
+-8700.0
+ 30
+0.0
+ 11
+-1996.0
+ 21
+-8700.0
+ 31
+0.0
+  0
+INSERT
+  5
+1A7
+330
+1A2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+-11600.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+1A9
+330
+1A2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-1900.0
+ 20
+-8700.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+1AB
+330
+1A2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-1900.0
+ 20
+-11472.0
+ 30
+0.0
+ 11
+-1900.0
+ 21
+-8828.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1AC
+330
+1A2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2028.0
+ 20
+-10150.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+2900
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1AD
+330
+1A2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-1900.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+POINT
+  5
+1AE
+330
+1A2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+POINT
+  5
+1AF
+330
+1A2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-8700.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1A4
+330
+1A2
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1B2
+330
+1B1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D9
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D9
+  1
+
+  0
+LINE
+  5
+1B4
+330
+1B1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-17128.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-18196.0
+ 31
+0.0
+  0
+LINE
+  5
+1B5
+330
+1B1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-17128.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-18196.0
+ 31
+0.0
+  0
+INSERT
+  5
+1B6
+330
+1B1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-18100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+180.0
+  0
+INSERT
+  5
+1B8
+330
+1B1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+10000.0
+ 20
+-18100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+  0
+LINE
+  5
+1BA
+330
+1B1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+128.0
+ 20
+-18100.0
+ 30
+0.0
+ 11
+9872.0
+ 21
+-18100.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1BB
+330
+1B1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+5000.0
+ 20
+-17972.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+10000
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+1BC
+330
+1B1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-18100.0
+ 30
+0.0
+  0
+POINT
+  5
+1BD
+330
+1B1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+POINT
+  5
+1BE
+330
+1B1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+10000.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1B3
+330
+1B1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1EA
+330
+1E9
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D10
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D10
+  1
+
+  0
+LINE
+  5
+1EC
+330
+1E9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+-17000.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+-17000.0
+ 31
+0.0
+  0
+LINE
+  5
+1ED
+330
+1E9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+-11600.0
+ 31
+0.0
+  0
+INSERT
+  5
+1EE
+330
+1E9
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+-17000.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+1F0
+330
+1E9
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+-11600.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+1F2
+330
+1E9
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+14100.0
+ 20
+-16872.0
+ 30
+0.0
+ 11
+14100.0
+ 21
+-11728.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1F3
+330
+1E9
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+13972.0
+ 20
+-14300.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+5400
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1F4
+330
+1E9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14100.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+POINT
+  5
+1F5
+330
+1E9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+POINT
+  5
+1F6
+330
+1E9
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1EB
+330
+1E9
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1F9
+330
+1F8
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D11
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D11
+  1
+
+  0
+LINE
+  5
+1FB
+330
+1F8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+-11600.0
+ 31
+0.0
+  0
+LINE
+  5
+1FC
+330
+1F8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+15872.0
+ 20
+-8700.0
+ 30
+0.0
+ 11
+14004.0
+ 21
+-8700.0
+ 31
+0.0
+  0
+INSERT
+  5
+1FD
+330
+1F8
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+-11600.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+270.0
+  0
+INSERT
+  5
+1FF
+330
+1F8
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14100.0
+ 20
+-8700.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+90.0
+  0
+LINE
+  5
+201
+330
+1F8
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+14100.0
+ 20
+-11472.0
+ 30
+0.0
+ 11
+14100.0
+ 21
+-8828.0
+ 31
+0.0
+  0
+MTEXT
+  5
+202
+330
+1F8
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+13972.0
+ 20
+-10150.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+2900
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+203
+330
+1F8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14100.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+POINT
+  5
+204
+330
+1F8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+POINT
+  5
+205
+330
+1F8
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-8700.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1FA
+330
+1F8
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+208
+330
+207
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D12
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D12
+  1
+
+  0
+LINE
+  5
+20A
+330
+207
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+16000.0
+ 20
+-17128.0
+ 30
+0.0
+ 11
+16000.0
+ 21
+-18196.0
+ 31
+0.0
+  0
+LINE
+  5
+20B
+330
+207
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+24000.0
+ 20
+-17128.0
+ 30
+0.0
+ 11
+24000.0
+ 21
+-18196.0
+ 31
+0.0
+  0
+INSERT
+  5
+20C
+330
+207
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+16000.0
+ 20
+-18100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+ 50
+180.0
+  0
+INSERT
+  5
+20E
+330
+207
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+24000.0
+ 20
+-18100.0
+ 30
+0.0
+ 41
+128.0
+ 42
+128.0
+  0
+LINE
+  5
+210
+330
+207
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+16128.0
+ 20
+-18100.0
+ 30
+0.0
+ 11
+23872.0
+ 21
+-18100.0
+ 31
+0.0
+  0
+MTEXT
+  5
+211
+330
+207
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+20000.0
+ 20
+-17972.0
+ 30
+0.0
+ 40
+160.0
+ 71
+5
+  1
+8000
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+212
+330
+207
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-18100.0
+ 30
+0.0
+  0
+POINT
+  5
+213
+330
+207
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+16000.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+POINT
+  5
+214
+330
+207
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+24000.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+209
+330
+207
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+LWPOLYLINE
+  5
+9C
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+370
+70
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+-1500.0
+ 20
+0.0
+ 10
+11500.0
+ 20
+0.0
+  0
+HATCH
+  5
+9D
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+ 62
+3
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+-1500.0
+ 20
+-600.0
+ 10
+11500.0
+ 20
+-600.0
+ 10
+11500.0
+ 20
+0.0
+ 10
+-1500.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+142.875
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+285.75
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+47.625
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+190.5
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+333.375
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+9E
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+5400.0
+ 10
+0.0
+ 20
+5400.0
+  0
+HATCH
+  5
+9F
+330
+17
+100
+AcDbEntity
+  8
+E-RENDER
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-SAND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+5400.0
+ 10
+0.0
+ 20
+5400.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+15.0
+ 77
+0
+ 78
+4
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+-24.00046944
+ 46
+734.1198559935
+ 79
+6
+ 49
+0.0
+ 49
+-579.12
+ 49
+0.0
+ 49
+-647.7
+ 49
+0.0
+ 49
+-619.125
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+674.284924707
+ 46
+1075.237650852
+ 79
+6
+ 49
+0.0
+ 49
+-312.42
+ 49
+0.0
+ 49
+-521.97
+ 49
+0.0
+ 49
+-200.025
+ 53
+-32.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1186.4885553615
+ 46
+2.1557770185
+ 79
+6
+ 49
+0.0
+ 49
+-190.5
+ 49
+0.0
+ 49
+-685.8
+ 49
+0.0
+ 49
+-895.35
+ 53
+-42.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1145.334678708
+ 46
+334.3939848855
+ 79
+6
+ 49
+0.0
+ 49
+-95.25
+ 49
+0.0
+ 49
+-449.58
+ 49
+0.0
+ 49
+-514.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A0
+330
+17
+100
+AcDbEntity
+  8
+E-PLINTH
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+450.0
+ 10
+0.0
+ 20
+450.0
+  0
+LWPOLYLINE
+  5
+A1
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+370
+50
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+-450.0
+ 20
+5400.0
+ 10
+5000.0
+ 20
+8300.0
+ 10
+10450.0
+ 20
+5400.0
+  0
+HATCH
+  5
+A2
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-RROOF
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+-450.0
+ 20
+5400.0
+ 10
+5000.0
+ 20
+8300.0
+ 10
+10450.0
+ 20
+5400.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+3352.8
+ 46
+1524.0
+ 79
+4
+ 49
+22860.0
+ 49
+-3048.0
+ 49
+7620.0
+ 49
+-1524.0
+ 53
+0.0
+ 43
+2026.92
+ 44
+762.0
+ 45
+-1524.0
+ 46
+2026.92
+ 79
+4
+ 49
+4572.0
+ 49
+-502.92
+ 49
+9144.0
+ 49
+-1143.0
+ 53
+0.0
+ 43
+762.0
+ 44
+1295.4
+ 45
+7924.8
+ 46
+1021.08
+ 79
+4
+ 49
+12192.0
+ 49
+-2133.6
+ 49
+6096.0
+ 49
+-1524.0
+ 98
+0
+  0
+LINE
+  5
+A3
+330
+17
+100
+AcDbEntity
+  8
+E-FLOOR
+  6
+DASHDOT
+100
+AcDbLine
+ 10
+0.0
+ 20
+2700.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+2700.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+A4
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3600.0
+ 20
+1100.0
+ 10
+4500.0
+ 20
+1100.0
+ 10
+4500.0
+ 20
+2400.0
+ 10
+3600.0
+ 20
+2400.0
+  0
+LWPOLYLINE
+  5
+A5
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3660.0
+ 20
+1160.0
+ 10
+4440.0
+ 20
+1160.0
+ 10
+4440.0
+ 20
+2340.0
+ 10
+3660.0
+ 20
+2340.0
+  0
+LINE
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+4050.0
+ 20
+1160.0
+ 30
+0.0
+ 11
+4050.0
+ 21
+2340.0
+ 31
+0.0
+  0
+HATCH
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3660.0
+ 20
+1160.0
+ 10
+4440.0
+ 20
+1160.0
+ 10
+4440.0
+ 20
+2340.0
+ 10
+3660.0
+ 20
+2340.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3520.0
+ 20
+1010.0
+ 10
+4580.0
+ 20
+1010.0
+ 10
+4580.0
+ 20
+1100.0
+ 10
+3520.0
+ 20
+1100.0
+  0
+LWPOLYLINE
+  5
+A9
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6200.0
+ 20
+1100.0
+ 10
+7100.0
+ 20
+1100.0
+ 10
+7100.0
+ 20
+2400.0
+ 10
+6200.0
+ 20
+2400.0
+  0
+LWPOLYLINE
+  5
+AA
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6260.0
+ 20
+1160.0
+ 10
+7040.0
+ 20
+1160.0
+ 10
+7040.0
+ 20
+2340.0
+ 10
+6260.0
+ 20
+2340.0
+  0
+LINE
+  5
+AB
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+6650.0
+ 20
+1160.0
+ 30
+0.0
+ 11
+6650.0
+ 21
+2340.0
+ 31
+0.0
+  0
+HATCH
+  5
+AC
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6260.0
+ 20
+1160.0
+ 10
+7040.0
+ 20
+1160.0
+ 10
+7040.0
+ 20
+2340.0
+ 10
+6260.0
+ 20
+2340.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+AD
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6120.0
+ 20
+1010.0
+ 10
+7180.0
+ 20
+1010.0
+ 10
+7180.0
+ 20
+1100.0
+ 10
+6120.0
+ 20
+1100.0
+  0
+LWPOLYLINE
+  5
+AE
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8200.0
+ 20
+1100.0
+ 10
+9400.0
+ 20
+1100.0
+ 10
+9400.0
+ 20
+2400.0
+ 10
+8200.0
+ 20
+2400.0
+  0
+LWPOLYLINE
+  5
+AF
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8260.0
+ 20
+1160.0
+ 10
+9340.0
+ 20
+1160.0
+ 10
+9340.0
+ 20
+2340.0
+ 10
+8260.0
+ 20
+2340.0
+  0
+LINE
+  5
+B0
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+8800.0
+ 20
+1160.0
+ 30
+0.0
+ 11
+8800.0
+ 21
+2340.0
+ 31
+0.0
+  0
+HATCH
+  5
+B1
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+8260.0
+ 20
+1160.0
+ 10
+9340.0
+ 20
+1160.0
+ 10
+9340.0
+ 20
+2340.0
+ 10
+8260.0
+ 20
+2340.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B2
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8120.0
+ 20
+1010.0
+ 10
+9480.0
+ 20
+1010.0
+ 10
+9480.0
+ 20
+1100.0
+ 10
+8120.0
+ 20
+1100.0
+  0
+LWPOLYLINE
+  5
+B3
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+800.0
+ 20
+3400.0
+ 10
+1800.0
+ 20
+3400.0
+ 10
+1800.0
+ 20
+4800.0
+ 10
+800.0
+ 20
+4800.0
+  0
+LWPOLYLINE
+  5
+B4
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+860.0
+ 20
+3460.0
+ 10
+1740.0
+ 20
+3460.0
+ 10
+1740.0
+ 20
+4740.0
+ 10
+860.0
+ 20
+4740.0
+  0
+LINE
+  5
+B5
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+1300.0
+ 20
+3460.0
+ 30
+0.0
+ 11
+1300.0
+ 21
+4740.0
+ 31
+0.0
+  0
+HATCH
+  5
+B6
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+860.0
+ 20
+3460.0
+ 10
+1740.0
+ 20
+3460.0
+ 10
+1740.0
+ 20
+4740.0
+ 10
+860.0
+ 20
+4740.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B7
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+720.0
+ 20
+3310.0
+ 10
+1880.0
+ 20
+3310.0
+ 10
+1880.0
+ 20
+3400.0
+ 10
+720.0
+ 20
+3400.0
+  0
+LWPOLYLINE
+  5
+B8
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3600.0
+ 20
+3400.0
+ 10
+4500.0
+ 20
+3400.0
+ 10
+4500.0
+ 20
+4800.0
+ 10
+3600.0
+ 20
+4800.0
+  0
+LWPOLYLINE
+  5
+B9
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3660.0
+ 20
+3460.0
+ 10
+4440.0
+ 20
+3460.0
+ 10
+4440.0
+ 20
+4740.0
+ 10
+3660.0
+ 20
+4740.0
+  0
+LINE
+  5
+BA
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+4050.0
+ 20
+3460.0
+ 30
+0.0
+ 11
+4050.0
+ 21
+4740.0
+ 31
+0.0
+  0
+HATCH
+  5
+BB
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3660.0
+ 20
+3460.0
+ 10
+4440.0
+ 20
+3460.0
+ 10
+4440.0
+ 20
+4740.0
+ 10
+3660.0
+ 20
+4740.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BC
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3520.0
+ 20
+3310.0
+ 10
+4580.0
+ 20
+3310.0
+ 10
+4580.0
+ 20
+3400.0
+ 10
+3520.0
+ 20
+3400.0
+  0
+LWPOLYLINE
+  5
+BD
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6200.0
+ 20
+3400.0
+ 10
+7100.0
+ 20
+3400.0
+ 10
+7100.0
+ 20
+4800.0
+ 10
+6200.0
+ 20
+4800.0
+  0
+LWPOLYLINE
+  5
+BE
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6260.0
+ 20
+3460.0
+ 10
+7040.0
+ 20
+3460.0
+ 10
+7040.0
+ 20
+4740.0
+ 10
+6260.0
+ 20
+4740.0
+  0
+LINE
+  5
+BF
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+6650.0
+ 20
+3460.0
+ 30
+0.0
+ 11
+6650.0
+ 21
+4740.0
+ 31
+0.0
+  0
+HATCH
+  5
+C0
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6260.0
+ 20
+3460.0
+ 10
+7040.0
+ 20
+3460.0
+ 10
+7040.0
+ 20
+4740.0
+ 10
+6260.0
+ 20
+4740.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C1
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6120.0
+ 20
+3310.0
+ 10
+7180.0
+ 20
+3310.0
+ 10
+7180.0
+ 20
+3400.0
+ 10
+6120.0
+ 20
+3400.0
+  0
+LWPOLYLINE
+  5
+C2
+330
+17
+100
+AcDbEntity
+  8
+E-DOOR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1400.0
+ 20
+0.0
+ 10
+2900.0
+ 20
+0.0
+ 10
+2900.0
+ 20
+2300.0
+ 10
+1400.0
+ 20
+2300.0
+  0
+LWPOLYLINE
+  5
+C3
+330
+17
+100
+AcDbEntity
+  8
+E-DOOR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+100.0
+ 10
+2800.0
+ 20
+100.0
+ 10
+2800.0
+ 20
+2200.0
+ 10
+1500.0
+ 20
+2200.0
+  0
+CIRCLE
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+E-DOOR
+100
+AcDbCircle
+ 10
+2700.0
+ 20
+1000.0
+ 30
+0.0
+ 40
+40.0
+  0
+LWPOLYLINE
+  5
+C5
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1250.0
+ 20
+300.0
+ 10
+3050.0
+ 20
+300.0
+ 10
+3050.0
+ 20
+450.0
+ 10
+1250.0
+ 20
+450.0
+  0
+LWPOLYLINE
+  5
+C6
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1130.0
+ 20
+150.0
+ 10
+3170.0
+ 20
+150.0
+ 10
+3170.0
+ 20
+300.0
+ 10
+1130.0
+ 20
+300.0
+  0
+LWPOLYLINE
+  5
+C7
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1010.0
+ 20
+0.0
+ 10
+3290.0
+ 20
+0.0
+ 10
+3290.0
+ 20
+150.0
+ 10
+1010.0
+ 20
+150.0
+  0
+INSERT
+  5
+C8
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+0.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+CA
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+290.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+ 11
+12220.0
+ 21
+290.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+290.0
+ 31
+0.0
+  0
+SEQEND
+  5
+C9
+330
+C8
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+CB
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+0.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+0.0
+ 31
+0.0
+  0
+INSERT
+  5
+CC
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+2700.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+CE
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+2990.0
+ 30
+0.0
+ 40
+120.0
+  1
++2.70
+ 11
+12220.0
+ 21
+2990.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+2990.0
+ 31
+0.0
+  0
+SEQEND
+  5
+CD
+330
+CC
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+CF
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+2700.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+2700.0
+ 31
+0.0
+  0
+INSERT
+  5
+D0
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+5400.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+D2
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+5690.0
+ 30
+0.0
+ 40
+120.0
+  1
++5.40
+ 11
+12220.0
+ 21
+5690.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+5690.0
+ 31
+0.0
+  0
+SEQEND
+  5
+D1
+330
+D0
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+D3
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+5400.0
+ 31
+0.0
+  0
+INSERT
+  5
+D4
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+8300.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+D6
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+8590.0
+ 30
+0.0
+ 40
+120.0
+  1
++8.30
+ 11
+12220.0
+ 21
+8590.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+8590.0
+ 31
+0.0
+  0
+SEQEND
+  5
+D5
+330
+D4
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+D7
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+8300.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+8300.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+D8
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D1
+  3
+ELEV50
+ 10
+-1900.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-2028.0
+ 21
+2700.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+5400.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+EB
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D2
+  3
+ELEV50
+ 10
+-1900.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+-2028.0
+ 21
+6850.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+5400.0
+ 33
+0.0
+ 14
+0.0
+ 24
+8300.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+FA
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D3
+  3
+ELEV50
+ 10
+0.0
+ 20
+-1100.0
+ 30
+0.0
+ 11
+5000.0
+ 21
+-972.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+10000.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+TEXT
+  5
+109
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+-2100.0
+ 30
+0.0
+ 40
+300.0
+  1
+SOUTH ELEVATION  1:50
+  7
+ARCH-TITLE
+ 11
+0.0
+ 21
+-2100.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+10A
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+370
+70
+100
+AcDbLine
+ 10
+0.0
+ 20
+-2250.0
+ 30
+0.0
+ 11
+3600.0
+ 21
+-2250.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+10B
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+370
+70
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+14500.0
+ 20
+0.0
+ 10
+25500.0
+ 20
+0.0
+  0
+HATCH
+  5
+10C
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+ 62
+3
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+14500.0
+ 20
+-600.0
+ 10
+25500.0
+ 20
+-600.0
+ 10
+25500.0
+ 20
+0.0
+ 10
+14500.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+142.875
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+285.75
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+47.625
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+190.5
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+333.375
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+10D
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+16000.0
+ 20
+0.0
+ 10
+24000.0
+ 20
+0.0
+ 10
+24000.0
+ 20
+5400.0
+ 10
+16000.0
+ 20
+5400.0
+  0
+HATCH
+  5
+10E
+330
+17
+100
+AcDbEntity
+  8
+E-RENDER
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-SAND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+16000.0
+ 20
+0.0
+ 10
+24000.0
+ 20
+0.0
+ 10
+24000.0
+ 20
+5400.0
+ 10
+16000.0
+ 20
+5400.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+15.0
+ 77
+0
+ 78
+4
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+-24.00046944
+ 46
+734.1198559935
+ 79
+6
+ 49
+0.0
+ 49
+-579.12
+ 49
+0.0
+ 49
+-647.7
+ 49
+0.0
+ 49
+-619.125
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+674.284924707
+ 46
+1075.237650852
+ 79
+6
+ 49
+0.0
+ 49
+-312.42
+ 49
+0.0
+ 49
+-521.97
+ 49
+0.0
+ 49
+-200.025
+ 53
+-32.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1186.4885553615
+ 46
+2.1557770185
+ 79
+6
+ 49
+0.0
+ 49
+-190.5
+ 49
+0.0
+ 49
+-685.8
+ 49
+0.0
+ 49
+-895.35
+ 53
+-42.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1145.334678708
+ 46
+334.3939848855
+ 79
+6
+ 49
+0.0
+ 49
+-95.25
+ 49
+0.0
+ 49
+-449.58
+ 49
+0.0
+ 49
+-514.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+10F
+330
+17
+100
+AcDbEntity
+  8
+E-PLINTH
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+16000.0
+ 20
+0.0
+ 10
+24000.0
+ 20
+0.0
+ 10
+24000.0
+ 20
+450.0
+ 10
+16000.0
+ 20
+450.0
+  0
+LWPOLYLINE
+  5
+110
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+370
+50
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+15550.0
+ 20
+5400.0
+ 10
+20000.0
+ 20
+8300.0
+ 10
+24450.0
+ 20
+5400.0
+  0
+HATCH
+  5
+111
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-RROOF
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+15550.0
+ 20
+5400.0
+ 10
+20000.0
+ 20
+8300.0
+ 10
+24450.0
+ 20
+5400.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+3352.8
+ 46
+1524.0
+ 79
+4
+ 49
+22860.0
+ 49
+-3048.0
+ 49
+7620.0
+ 49
+-1524.0
+ 53
+0.0
+ 43
+2026.92
+ 44
+762.0
+ 45
+-1524.0
+ 46
+2026.92
+ 79
+4
+ 49
+4572.0
+ 49
+-502.92
+ 49
+9144.0
+ 49
+-1143.0
+ 53
+0.0
+ 43
+762.0
+ 44
+1295.4
+ 45
+7924.8
+ 46
+1021.08
+ 79
+4
+ 49
+12192.0
+ 49
+-2133.6
+ 49
+6096.0
+ 49
+-1524.0
+ 98
+0
+  0
+LINE
+  5
+112
+330
+17
+100
+AcDbEntity
+  8
+E-FLOOR
+  6
+DASHDOT
+100
+AcDbLine
+ 10
+16000.0
+ 20
+2700.0
+ 30
+0.0
+ 11
+24000.0
+ 21
+2700.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+113
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17500.0
+ 20
+1100.0
+ 10
+18800.0
+ 20
+1100.0
+ 10
+18800.0
+ 20
+2400.0
+ 10
+17500.0
+ 20
+2400.0
+  0
+LWPOLYLINE
+  5
+114
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17560.0
+ 20
+1160.0
+ 10
+18740.0
+ 20
+1160.0
+ 10
+18740.0
+ 20
+2340.0
+ 10
+17560.0
+ 20
+2340.0
+  0
+LINE
+  5
+115
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+18150.0
+ 20
+1160.0
+ 30
+0.0
+ 11
+18150.0
+ 21
+2340.0
+ 31
+0.0
+  0
+HATCH
+  5
+116
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+17560.0
+ 20
+1160.0
+ 10
+18740.0
+ 20
+1160.0
+ 10
+18740.0
+ 20
+2340.0
+ 10
+17560.0
+ 20
+2340.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+117
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17420.0
+ 20
+1010.0
+ 10
+18880.0
+ 20
+1010.0
+ 10
+18880.0
+ 20
+1100.0
+ 10
+17420.0
+ 20
+1100.0
+  0
+LWPOLYLINE
+  5
+118
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20800.0
+ 20
+1100.0
+ 10
+22100.0
+ 20
+1100.0
+ 10
+22100.0
+ 20
+2400.0
+ 10
+20800.0
+ 20
+2400.0
+  0
+LWPOLYLINE
+  5
+119
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20860.0
+ 20
+1160.0
+ 10
+22040.0
+ 20
+1160.0
+ 10
+22040.0
+ 20
+2340.0
+ 10
+20860.0
+ 20
+2340.0
+  0
+LINE
+  5
+11A
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+21450.0
+ 20
+1160.0
+ 30
+0.0
+ 11
+21450.0
+ 21
+2340.0
+ 31
+0.0
+  0
+HATCH
+  5
+11B
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+20860.0
+ 20
+1160.0
+ 10
+22040.0
+ 20
+1160.0
+ 10
+22040.0
+ 20
+2340.0
+ 10
+20860.0
+ 20
+2340.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+11C
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20720.0
+ 20
+1010.0
+ 10
+22180.0
+ 20
+1010.0
+ 10
+22180.0
+ 20
+1100.0
+ 10
+20720.0
+ 20
+1100.0
+  0
+LWPOLYLINE
+  5
+11D
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17500.0
+ 20
+3400.0
+ 10
+18800.0
+ 20
+3400.0
+ 10
+18800.0
+ 20
+4800.0
+ 10
+17500.0
+ 20
+4800.0
+  0
+LWPOLYLINE
+  5
+11E
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17560.0
+ 20
+3460.0
+ 10
+18740.0
+ 20
+3460.0
+ 10
+18740.0
+ 20
+4740.0
+ 10
+17560.0
+ 20
+4740.0
+  0
+LINE
+  5
+11F
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+18150.0
+ 20
+3460.0
+ 30
+0.0
+ 11
+18150.0
+ 21
+4740.0
+ 31
+0.0
+  0
+HATCH
+  5
+120
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+17560.0
+ 20
+3460.0
+ 10
+18740.0
+ 20
+3460.0
+ 10
+18740.0
+ 20
+4740.0
+ 10
+17560.0
+ 20
+4740.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+121
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17420.0
+ 20
+3310.0
+ 10
+18880.0
+ 20
+3310.0
+ 10
+18880.0
+ 20
+3400.0
+ 10
+17420.0
+ 20
+3400.0
+  0
+LWPOLYLINE
+  5
+122
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20800.0
+ 20
+3400.0
+ 10
+22100.0
+ 20
+3400.0
+ 10
+22100.0
+ 20
+4800.0
+ 10
+20800.0
+ 20
+4800.0
+  0
+LWPOLYLINE
+  5
+123
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20860.0
+ 20
+3460.0
+ 10
+22040.0
+ 20
+3460.0
+ 10
+22040.0
+ 20
+4740.0
+ 10
+20860.0
+ 20
+4740.0
+  0
+LINE
+  5
+124
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+21450.0
+ 20
+3460.0
+ 30
+0.0
+ 11
+21450.0
+ 21
+4740.0
+ 31
+0.0
+  0
+HATCH
+  5
+125
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+20860.0
+ 20
+3460.0
+ 10
+22040.0
+ 20
+3460.0
+ 10
+22040.0
+ 20
+4740.0
+ 10
+20860.0
+ 20
+4740.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+126
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20720.0
+ 20
+3310.0
+ 10
+22180.0
+ 20
+3310.0
+ 10
+22180.0
+ 20
+3400.0
+ 10
+20720.0
+ 20
+3400.0
+  0
+INSERT
+  5
+127
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+0.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+129
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+290.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+ 11
+26220.0
+ 21
+290.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+290.0
+ 31
+0.0
+  0
+SEQEND
+  5
+128
+330
+127
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+12A
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+0.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+0.0
+ 31
+0.0
+  0
+INSERT
+  5
+12B
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+2700.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+12D
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+2990.0
+ 30
+0.0
+ 40
+120.0
+  1
++2.70
+ 11
+26220.0
+ 21
+2990.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+2990.0
+ 31
+0.0
+  0
+SEQEND
+  5
+12C
+330
+12B
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+12E
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+2700.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+2700.0
+ 31
+0.0
+  0
+INSERT
+  5
+12F
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+5400.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+131
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+5690.0
+ 30
+0.0
+ 40
+120.0
+  1
++5.40
+ 11
+26220.0
+ 21
+5690.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+5690.0
+ 31
+0.0
+  0
+SEQEND
+  5
+130
+330
+12F
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+132
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+5400.0
+ 31
+0.0
+  0
+INSERT
+  5
+133
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+8300.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+135
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+8590.0
+ 30
+0.0
+ 40
+120.0
+  1
++8.30
+ 11
+26220.0
+ 21
+8590.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+8590.0
+ 31
+0.0
+  0
+SEQEND
+  5
+134
+330
+133
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+136
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+8300.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+8300.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+137
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D4
+  3
+ELEV50
+ 10
+14100.0
+ 20
+0.0
+ 30
+0.0
+ 11
+13972.0
+ 21
+2700.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+16000.0
+ 23
+0.0
+ 33
+0.0
+ 14
+16000.0
+ 24
+5400.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+146
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D5
+  3
+ELEV50
+ 10
+14100.0
+ 20
+5400.0
+ 30
+0.0
+ 11
+13972.0
+ 21
+6850.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+16000.0
+ 23
+5400.0
+ 33
+0.0
+ 14
+16000.0
+ 24
+8300.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+155
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D6
+  3
+ELEV50
+ 10
+16000.0
+ 20
+-1100.0
+ 30
+0.0
+ 11
+20000.0
+ 21
+-972.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+16000.0
+ 23
+0.0
+ 33
+0.0
+ 14
+24000.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+TEXT
+  5
+164
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+16000.0
+ 20
+-2100.0
+ 30
+0.0
+ 40
+300.0
+  1
+EAST ELEVATION  1:50
+  7
+ARCH-TITLE
+ 11
+16000.0
+ 21
+-2100.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+165
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+370
+70
+100
+AcDbLine
+ 10
+16000.0
+ 20
+-2250.0
+ 30
+0.0
+ 11
+19600.0
+ 21
+-2250.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+166
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+370
+70
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+-1500.0
+ 20
+-17000.0
+ 10
+11500.0
+ 20
+-17000.0
+  0
+HATCH
+  5
+167
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+ 62
+3
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+-1500.0
+ 20
+-17600.0
+ 10
+11500.0
+ 20
+-17600.0
+ 10
+11500.0
+ 20
+-17000.0
+ 10
+-1500.0
+ 20
+-17000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+142.875
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+285.75
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+47.625
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+190.5
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+333.375
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+168
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-17000.0
+ 10
+10000.0
+ 20
+-17000.0
+ 10
+10000.0
+ 20
+-11600.0
+ 10
+0.0
+ 20
+-11600.0
+  0
+HATCH
+  5
+169
+330
+17
+100
+AcDbEntity
+  8
+E-RENDER
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-SAND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-17000.0
+ 10
+10000.0
+ 20
+-17000.0
+ 10
+10000.0
+ 20
+-11600.0
+ 10
+0.0
+ 20
+-11600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+15.0
+ 77
+0
+ 78
+4
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+-24.00046944
+ 46
+734.1198559935
+ 79
+6
+ 49
+0.0
+ 49
+-579.12
+ 49
+0.0
+ 49
+-647.7
+ 49
+0.0
+ 49
+-619.125
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+674.284924707
+ 46
+1075.237650852
+ 79
+6
+ 49
+0.0
+ 49
+-312.42
+ 49
+0.0
+ 49
+-521.97
+ 49
+0.0
+ 49
+-200.025
+ 53
+-32.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1186.4885553615
+ 46
+2.1557770185
+ 79
+6
+ 49
+0.0
+ 49
+-190.5
+ 49
+0.0
+ 49
+-685.8
+ 49
+0.0
+ 49
+-895.35
+ 53
+-42.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1145.334678708
+ 46
+334.3939848855
+ 79
+6
+ 49
+0.0
+ 49
+-95.25
+ 49
+0.0
+ 49
+-449.58
+ 49
+0.0
+ 49
+-514.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+16A
+330
+17
+100
+AcDbEntity
+  8
+E-PLINTH
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-17000.0
+ 10
+10000.0
+ 20
+-17000.0
+ 10
+10000.0
+ 20
+-16550.0
+ 10
+0.0
+ 20
+-16550.0
+  0
+LWPOLYLINE
+  5
+16B
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+370
+50
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+-450.0
+ 20
+-11600.0
+ 10
+5000.0
+ 20
+-8700.0
+ 10
+10450.0
+ 20
+-11600.0
+  0
+HATCH
+  5
+16C
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-RROOF
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+-450.0
+ 20
+-11600.0
+ 10
+5000.0
+ 20
+-8700.0
+ 10
+10450.0
+ 20
+-11600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+3352.8
+ 46
+1524.0
+ 79
+4
+ 49
+22860.0
+ 49
+-3048.0
+ 49
+7620.0
+ 49
+-1524.0
+ 53
+0.0
+ 43
+2026.92
+ 44
+762.0
+ 45
+-1524.0
+ 46
+2026.92
+ 79
+4
+ 49
+4572.0
+ 49
+-502.92
+ 49
+9144.0
+ 49
+-1143.0
+ 53
+0.0
+ 43
+762.0
+ 44
+1295.4
+ 45
+7924.8
+ 46
+1021.08
+ 79
+4
+ 49
+12192.0
+ 49
+-2133.6
+ 49
+6096.0
+ 49
+-1524.0
+ 98
+0
+  0
+LINE
+  5
+16D
+330
+17
+100
+AcDbEntity
+  8
+E-FLOOR
+  6
+DASHDOT
+100
+AcDbLine
+ 10
+0.0
+ 20
+-14300.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-14300.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+16E
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1200.0
+ 20
+-15900.0
+ 10
+2600.0
+ 20
+-15900.0
+ 10
+2600.0
+ 20
+-14600.0
+ 10
+1200.0
+ 20
+-14600.0
+  0
+LWPOLYLINE
+  5
+16F
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1260.0
+ 20
+-15840.0
+ 10
+2540.0
+ 20
+-15840.0
+ 10
+2540.0
+ 20
+-14660.0
+ 10
+1260.0
+ 20
+-14660.0
+  0
+LINE
+  5
+170
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+1900.0
+ 20
+-15840.0
+ 30
+0.0
+ 11
+1900.0
+ 21
+-14660.0
+ 31
+0.0
+  0
+HATCH
+  5
+171
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+1260.0
+ 20
+-15840.0
+ 10
+2540.0
+ 20
+-15840.0
+ 10
+2540.0
+ 20
+-14660.0
+ 10
+1260.0
+ 20
+-14660.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+172
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1120.0
+ 20
+-15990.0
+ 10
+2680.0
+ 20
+-15990.0
+ 10
+2680.0
+ 20
+-15900.0
+ 10
+1120.0
+ 20
+-15900.0
+  0
+LWPOLYLINE
+  5
+173
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3600.0
+ 20
+-15900.0
+ 10
+5200.0
+ 20
+-15900.0
+ 10
+5200.0
+ 20
+-14600.0
+ 10
+3600.0
+ 20
+-14600.0
+  0
+LWPOLYLINE
+  5
+174
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3660.0
+ 20
+-15840.0
+ 10
+5140.0
+ 20
+-15840.0
+ 10
+5140.0
+ 20
+-14660.0
+ 10
+3660.0
+ 20
+-14660.0
+  0
+LINE
+  5
+175
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+4400.0
+ 20
+-15840.0
+ 30
+0.0
+ 11
+4400.0
+ 21
+-14660.0
+ 31
+0.0
+  0
+HATCH
+  5
+176
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3660.0
+ 20
+-15840.0
+ 10
+5140.0
+ 20
+-15840.0
+ 10
+5140.0
+ 20
+-14660.0
+ 10
+3660.0
+ 20
+-14660.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+177
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3520.0
+ 20
+-15990.0
+ 10
+5280.0
+ 20
+-15990.0
+ 10
+5280.0
+ 20
+-15900.0
+ 10
+3520.0
+ 20
+-15900.0
+  0
+LWPOLYLINE
+  5
+178
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6600.0
+ 20
+-15900.0
+ 10
+7800.0
+ 20
+-15900.0
+ 10
+7800.0
+ 20
+-14600.0
+ 10
+6600.0
+ 20
+-14600.0
+  0
+LWPOLYLINE
+  5
+179
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6660.0
+ 20
+-15840.0
+ 10
+7740.0
+ 20
+-15840.0
+ 10
+7740.0
+ 20
+-14660.0
+ 10
+6660.0
+ 20
+-14660.0
+  0
+LINE
+  5
+17A
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+7200.0
+ 20
+-15840.0
+ 30
+0.0
+ 11
+7200.0
+ 21
+-14660.0
+ 31
+0.0
+  0
+HATCH
+  5
+17B
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6660.0
+ 20
+-15840.0
+ 10
+7740.0
+ 20
+-15840.0
+ 10
+7740.0
+ 20
+-14660.0
+ 10
+6660.0
+ 20
+-14660.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+17C
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6520.0
+ 20
+-15990.0
+ 10
+7880.0
+ 20
+-15990.0
+ 10
+7880.0
+ 20
+-15900.0
+ 10
+6520.0
+ 20
+-15900.0
+  0
+LWPOLYLINE
+  5
+17D
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3600.0
+ 20
+-13600.0
+ 10
+5200.0
+ 20
+-13600.0
+ 10
+5200.0
+ 20
+-12200.0
+ 10
+3600.0
+ 20
+-12200.0
+  0
+LWPOLYLINE
+  5
+17E
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3660.0
+ 20
+-13540.0
+ 10
+5140.0
+ 20
+-13540.0
+ 10
+5140.0
+ 20
+-12260.0
+ 10
+3660.0
+ 20
+-12260.0
+  0
+LINE
+  5
+17F
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+4400.0
+ 20
+-13540.0
+ 30
+0.0
+ 11
+4400.0
+ 21
+-12260.0
+ 31
+0.0
+  0
+HATCH
+  5
+180
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3660.0
+ 20
+-13540.0
+ 10
+5140.0
+ 20
+-13540.0
+ 10
+5140.0
+ 20
+-12260.0
+ 10
+3660.0
+ 20
+-12260.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+181
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3520.0
+ 20
+-13690.0
+ 10
+5280.0
+ 20
+-13690.0
+ 10
+5280.0
+ 20
+-13600.0
+ 10
+3520.0
+ 20
+-13600.0
+  0
+INSERT
+  5
+182
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+184
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+-16710.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+ 11
+12220.0
+ 21
+-16710.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+-16710.0
+ 31
+0.0
+  0
+SEQEND
+  5
+183
+330
+182
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+185
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-17000.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+-17000.0
+ 31
+0.0
+  0
+INSERT
+  5
+186
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+-14300.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+188
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+-14010.0
+ 30
+0.0
+ 40
+120.0
+  1
++2.70
+ 11
+12220.0
+ 21
+-14010.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+-14010.0
+ 31
+0.0
+  0
+SEQEND
+  5
+187
+330
+186
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+189
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-14300.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+-14300.0
+ 31
+0.0
+  0
+INSERT
+  5
+18A
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+18C
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+-11310.0
+ 30
+0.0
+ 40
+120.0
+  1
++5.40
+ 11
+12220.0
+ 21
+-11310.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+-11310.0
+ 31
+0.0
+  0
+SEQEND
+  5
+18B
+330
+18A
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+18D
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+-11600.0
+ 31
+0.0
+  0
+INSERT
+  5
+18E
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+11900.0
+ 20
+-8700.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+190
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+12220.0
+ 20
+-8410.0
+ 30
+0.0
+ 40
+120.0
+  1
++8.30
+ 11
+12220.0
+ 21
+-8410.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+12220.0
+ 21
+-8410.0
+ 31
+0.0
+  0
+SEQEND
+  5
+18F
+330
+18E
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+191
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-8700.0
+ 30
+0.0
+ 11
+11900.0
+ 21
+-8700.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+192
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D7
+  3
+ELEV50
+ 10
+-1900.0
+ 20
+-17000.0
+ 30
+0.0
+ 11
+-2028.0
+ 21
+-14300.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+-17000.0
+ 33
+0.0
+ 14
+0.0
+ 24
+-11600.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1A1
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D8
+  3
+ELEV50
+ 10
+-1900.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+-2028.0
+ 21
+-10150.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+-11600.0
+ 33
+0.0
+ 14
+0.0
+ 24
+-8700.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1B0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D9
+  3
+ELEV50
+ 10
+0.0
+ 20
+-18100.0
+ 30
+0.0
+ 11
+5000.0
+ 21
+-17972.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+-17000.0
+ 33
+0.0
+ 14
+10000.0
+ 24
+-17000.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+TEXT
+  5
+1BF
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+-19100.0
+ 30
+0.0
+ 40
+300.0
+  1
+NORTH ELEVATION  1:50
+  7
+ARCH-TITLE
+ 11
+0.0
+ 21
+-19100.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+1C0
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+370
+70
+100
+AcDbLine
+ 10
+0.0
+ 20
+-19250.0
+ 30
+0.0
+ 11
+3600.0
+ 21
+-19250.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+1C1
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+370
+70
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+14500.0
+ 20
+-17000.0
+ 10
+25500.0
+ 20
+-17000.0
+  0
+HATCH
+  5
+1C2
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+ 62
+3
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+EARTH
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+14500.0
+ 20
+-17600.0
+ 10
+25500.0
+ 20
+-17600.0
+ 10
+25500.0
+ 20
+-17000.0
+ 10
+14500.0
+ 20
+-17000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+6
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+142.875
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+0.0
+ 43
+0.0
+ 44
+285.75
+ 45
+381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+47.625
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+190.5
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 53
+90.0
+ 43
+333.375
+ 44
+333.375
+ 45
+-381.0
+ 46
+381.0
+ 79
+2
+ 49
+381.0
+ 49
+-381.0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+1C3
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+16000.0
+ 20
+-17000.0
+ 10
+24000.0
+ 20
+-17000.0
+ 10
+24000.0
+ 20
+-11600.0
+ 10
+16000.0
+ 20
+-11600.0
+  0
+HATCH
+  5
+1C4
+330
+17
+100
+AcDbEntity
+  8
+E-RENDER
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-SAND
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+16000.0
+ 20
+-17000.0
+ 10
+24000.0
+ 20
+-17000.0
+ 10
+24000.0
+ 20
+-11600.0
+ 10
+16000.0
+ 20
+-11600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+15.0
+ 77
+0
+ 78
+4
+ 53
+37.5
+ 43
+0.0
+ 44
+0.0
+ 45
+-24.00046944
+ 46
+734.1198559935
+ 79
+6
+ 49
+0.0
+ 49
+-579.12
+ 49
+0.0
+ 49
+-647.7
+ 49
+0.0
+ 49
+-619.125
+ 53
+7.5
+ 43
+0.0
+ 44
+0.0
+ 45
+674.284924707
+ 46
+1075.237650852
+ 79
+6
+ 49
+0.0
+ 49
+-312.42
+ 49
+0.0
+ 49
+-521.97
+ 49
+0.0
+ 49
+-200.025
+ 53
+-32.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1186.4885553615
+ 46
+2.1557770185
+ 79
+6
+ 49
+0.0
+ 49
+-190.5
+ 49
+0.0
+ 49
+-685.8
+ 49
+0.0
+ 49
+-895.35
+ 53
+-42.5
+ 43
+-468.63
+ 44
+0.0
+ 45
+1145.334678708
+ 46
+334.3939848855
+ 79
+6
+ 49
+0.0
+ 49
+-95.25
+ 49
+0.0
+ 49
+-449.58
+ 49
+0.0
+ 49
+-514.35
+ 98
+0
+  0
+LWPOLYLINE
+  5
+1C5
+330
+17
+100
+AcDbEntity
+  8
+E-PLINTH
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+16000.0
+ 20
+-17000.0
+ 10
+24000.0
+ 20
+-17000.0
+ 10
+24000.0
+ 20
+-16550.0
+ 10
+16000.0
+ 20
+-16550.0
+  0
+LWPOLYLINE
+  5
+1C6
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+370
+50
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+15550.0
+ 20
+-11600.0
+ 10
+20000.0
+ 20
+-8700.0
+ 10
+24450.0
+ 20
+-11600.0
+  0
+HATCH
+  5
+1C7
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+AR-RROOF
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+3
+ 10
+15550.0
+ 20
+-11600.0
+ 10
+20000.0
+ 20
+-8700.0
+ 10
+24450.0
+ 20
+-11600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+3
+ 53
+0.0
+ 43
+0.0
+ 44
+0.0
+ 45
+3352.8
+ 46
+1524.0
+ 79
+4
+ 49
+22860.0
+ 49
+-3048.0
+ 49
+7620.0
+ 49
+-1524.0
+ 53
+0.0
+ 43
+2026.92
+ 44
+762.0
+ 45
+-1524.0
+ 46
+2026.92
+ 79
+4
+ 49
+4572.0
+ 49
+-502.92
+ 49
+9144.0
+ 49
+-1143.0
+ 53
+0.0
+ 43
+762.0
+ 44
+1295.4
+ 45
+7924.8
+ 46
+1021.08
+ 79
+4
+ 49
+12192.0
+ 49
+-2133.6
+ 49
+6096.0
+ 49
+-1524.0
+ 98
+0
+  0
+LINE
+  5
+1C8
+330
+17
+100
+AcDbEntity
+  8
+E-FLOOR
+  6
+DASHDOT
+100
+AcDbLine
+ 10
+16000.0
+ 20
+-14300.0
+ 30
+0.0
+ 11
+24000.0
+ 21
+-14300.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+1C9
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17600.0
+ 20
+-15900.0
+ 10
+19000.0
+ 20
+-15900.0
+ 10
+19000.0
+ 20
+-14600.0
+ 10
+17600.0
+ 20
+-14600.0
+  0
+LWPOLYLINE
+  5
+1CA
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17660.0
+ 20
+-15840.0
+ 10
+18940.0
+ 20
+-15840.0
+ 10
+18940.0
+ 20
+-14660.0
+ 10
+17660.0
+ 20
+-14660.0
+  0
+LINE
+  5
+1CB
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+18300.0
+ 20
+-15840.0
+ 30
+0.0
+ 11
+18300.0
+ 21
+-14660.0
+ 31
+0.0
+  0
+HATCH
+  5
+1CC
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+17660.0
+ 20
+-15840.0
+ 10
+18940.0
+ 20
+-15840.0
+ 10
+18940.0
+ 20
+-14660.0
+ 10
+17660.0
+ 20
+-14660.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+1CD
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+17520.0
+ 20
+-15990.0
+ 10
+19080.0
+ 20
+-15990.0
+ 10
+19080.0
+ 20
+-15900.0
+ 10
+17520.0
+ 20
+-15900.0
+  0
+LWPOLYLINE
+  5
+1CE
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+21000.0
+ 20
+-15900.0
+ 10
+22400.0
+ 20
+-15900.0
+ 10
+22400.0
+ 20
+-14600.0
+ 10
+21000.0
+ 20
+-14600.0
+  0
+LWPOLYLINE
+  5
+1CF
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+21060.0
+ 20
+-15840.0
+ 10
+22340.0
+ 20
+-15840.0
+ 10
+22340.0
+ 20
+-14660.0
+ 10
+21060.0
+ 20
+-14660.0
+  0
+LINE
+  5
+1D0
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+21700.0
+ 20
+-15840.0
+ 30
+0.0
+ 11
+21700.0
+ 21
+-14660.0
+ 31
+0.0
+  0
+HATCH
+  5
+1D1
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+21060.0
+ 20
+-15840.0
+ 10
+22340.0
+ 20
+-15840.0
+ 10
+22340.0
+ 20
+-14660.0
+ 10
+21060.0
+ 20
+-14660.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+1D2
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20920.0
+ 20
+-15990.0
+ 10
+22480.0
+ 20
+-15990.0
+ 10
+22480.0
+ 20
+-15900.0
+ 10
+20920.0
+ 20
+-15900.0
+  0
+LWPOLYLINE
+  5
+1D3
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+19000.0
+ 20
+-13600.0
+ 10
+20200.0
+ 20
+-13600.0
+ 10
+20200.0
+ 20
+-12200.0
+ 10
+19000.0
+ 20
+-12200.0
+  0
+LWPOLYLINE
+  5
+1D4
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+19060.0
+ 20
+-13540.0
+ 10
+20140.0
+ 20
+-13540.0
+ 10
+20140.0
+ 20
+-12260.0
+ 10
+19060.0
+ 20
+-12260.0
+  0
+LINE
+  5
+1D5
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+19600.0
+ 20
+-13540.0
+ 30
+0.0
+ 11
+19600.0
+ 21
+-12260.0
+ 31
+0.0
+  0
+HATCH
+  5
+1D6
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+ 62
+5
+440
+33554534
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+19060.0
+ 20
+-13540.0
+ 10
+20140.0
+ 20
+-13540.0
+ 10
+20140.0
+ 20
+-12260.0
+ 10
+19060.0
+ 20
+-12260.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+1D7
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+18920.0
+ 20
+-13690.0
+ 10
+20280.0
+ 20
+-13690.0
+ 10
+20280.0
+ 20
+-13600.0
+ 10
+18920.0
+ 20
+-13600.0
+  0
+INSERT
+  5
+1D8
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+-17000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+1DA
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+-16710.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+ 11
+26220.0
+ 21
+-16710.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+-16710.0
+ 31
+0.0
+  0
+SEQEND
+  5
+1D9
+330
+1D8
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+1DB
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+-17000.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+-17000.0
+ 31
+0.0
+  0
+INSERT
+  5
+1DC
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+-14300.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+1DE
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+-14010.0
+ 30
+0.0
+ 40
+120.0
+  1
++2.70
+ 11
+26220.0
+ 21
+-14010.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+-14010.0
+ 31
+0.0
+  0
+SEQEND
+  5
+1DD
+330
+1DC
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+1DF
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+-14300.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+-14300.0
+ 31
+0.0
+  0
+INSERT
+  5
+1E0
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+-11600.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+1E2
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+-11310.0
+ 30
+0.0
+ 40
+120.0
+  1
++5.40
+ 11
+26220.0
+ 21
+-11310.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+-11310.0
+ 31
+0.0
+  0
+SEQEND
+  5
+1E1
+330
+1E0
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+1E3
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+-11600.0
+ 31
+0.0
+  0
+INSERT
+  5
+1E4
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+25900.0
+ 20
+-8700.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+1E6
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+26220.0
+ 20
+-8410.0
+ 30
+0.0
+ 40
+120.0
+  1
++8.30
+ 11
+26220.0
+ 21
+-8410.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+26220.0
+ 21
+-8410.0
+ 31
+0.0
+  0
+SEQEND
+  5
+1E5
+330
+1E4
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+LINE
+  5
+1E7
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+  6
+DASHED
+100
+AcDbLine
+ 10
+24000.0
+ 20
+-8700.0
+ 30
+0.0
+ 11
+25900.0
+ 21
+-8700.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+1E8
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D10
+  3
+ELEV50
+ 10
+14100.0
+ 20
+-17000.0
+ 30
+0.0
+ 11
+13972.0
+ 21
+-14300.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+16000.0
+ 23
+-17000.0
+ 33
+0.0
+ 14
+16000.0
+ 24
+-11600.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1F7
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D11
+  3
+ELEV50
+ 10
+14100.0
+ 20
+-11600.0
+ 30
+0.0
+ 11
+13972.0
+ 21
+-10150.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+16000.0
+ 23
+-11600.0
+ 33
+0.0
+ 14
+16000.0
+ 24
+-8700.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+206
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D12
+  3
+ELEV50
+ 10
+16000.0
+ 20
+-18100.0
+ 30
+0.0
+ 11
+20000.0
+ 21
+-17972.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+16000.0
+ 23
+-17000.0
+ 33
+0.0
+ 14
+24000.0
+ 24
+-17000.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+TEXT
+  5
+215
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+16000.0
+ 20
+-19100.0
+ 30
+0.0
+ 40
+300.0
+  1
+WEST ELEVATION  1:50
+  7
+ARCH-TITLE
+ 11
+16000.0
+ 21
+-19100.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+216
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+370
+70
+100
+AcDbLine
+ 10
+16000.0
+ 20
+-19250.0
+ 30
+0.0
+ 11
+19600.0
+ 21
+-19250.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+217
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+32000.0
+ 20
+0.0
+ 10
+32300.0
+ 20
+0.0
+ 10
+32300.0
+ 20
+5400.0
+ 10
+32000.0
+ 20
+5400.0
+  0
+HATCH
+  5
+218
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+32000.0
+ 20
+0.0
+ 10
+32300.0
+ 20
+0.0
+ 10
+32300.0
+ 20
+5400.0
+ 10
+32000.0
+ 20
+5400.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-134.703841818
+ 46
+134.703841818
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+219
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+41700.0
+ 20
+0.0
+ 10
+42000.0
+ 20
+0.0
+ 10
+42000.0
+ 20
+5400.0
+ 10
+41700.0
+ 20
+5400.0
+  0
+HATCH
+  5
+21A
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+41700.0
+ 20
+0.0
+ 10
+42000.0
+ 20
+0.0
+ 10
+42000.0
+ 20
+5400.0
+ 10
+41700.0
+ 20
+5400.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+60.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-134.703841818
+ 46
+134.703841818
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+21B
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+32000.0
+ 20
+-300.0
+ 10
+42000.0
+ 20
+-300.0
+ 10
+42000.0
+ 20
+0.0
+ 10
+32000.0
+ 20
+0.0
+  0
+LWPOLYLINE
+  5
+21C
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+32000.0
+ 20
+2600.0
+ 10
+42000.0
+ 20
+2600.0
+ 10
+42000.0
+ 20
+2900.0
+ 10
+32000.0
+ 20
+2900.0
+  0
+LWPOLYLINE
+  5
+21D
+330
+17
+100
+AcDbEntity
+  8
+E-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+32000.0
+ 20
+5000.0
+ 10
+42000.0
+ 20
+5000.0
+ 10
+42000.0
+ 20
+5300.0
+ 10
+32000.0
+ 20
+5300.0
+  0
+LWPOLYLINE
+  5
+21E
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+370
+50
+100
+AcDbPolyline
+ 90
+6
+ 70
+1
+ 10
+31550.0
+ 20
+5400.0
+ 10
+37000.0
+ 20
+8300.0
+ 10
+42450.0
+ 20
+5400.0
+ 10
+42450.0
+ 20
+5250.0
+ 10
+37000.0
+ 20
+8150.0
+ 10
+31550.0
+ 20
+5250.0
+  0
+HATCH
+  5
+21F
+330
+17
+100
+AcDbEntity
+  8
+E-ROOF
+ 62
+1
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+6
+ 10
+31550.0
+ 20
+5400.0
+ 10
+37000.0
+ 20
+8300.0
+ 10
+42450.0
+ 20
+5400.0
+ 10
+42450.0
+ 20
+5250.0
+ 10
+37000.0
+ 20
+8150.0
+ 10
+31550.0
+ 20
+5250.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+220
+330
+17
+100
+AcDbEntity
+  8
+E-GROUND
+370
+70
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+30500.0
+ 20
+-300.0
+ 10
+43500.0
+ 20
+-300.0
+  0
+LINE
+  5
+221
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+38300.0
+ 20
+0.0
+ 30
+0.0
+ 11
+38600.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+222
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+38600.0
+ 20
+0.0
+ 30
+0.0
+ 11
+38600.0
+ 21
+270.0
+ 31
+0.0
+  0
+LINE
+  5
+223
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+38600.0
+ 20
+270.0
+ 30
+0.0
+ 11
+38900.0
+ 21
+270.0
+ 31
+0.0
+  0
+LINE
+  5
+224
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+38900.0
+ 20
+270.0
+ 30
+0.0
+ 11
+38900.0
+ 21
+540.0
+ 31
+0.0
+  0
+LINE
+  5
+225
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+38900.0
+ 20
+540.0
+ 30
+0.0
+ 11
+39200.0
+ 21
+540.0
+ 31
+0.0
+  0
+LINE
+  5
+226
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+39200.0
+ 20
+540.0
+ 30
+0.0
+ 11
+39200.0
+ 21
+810.0
+ 31
+0.0
+  0
+LINE
+  5
+227
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+39200.0
+ 20
+810.0
+ 30
+0.0
+ 11
+39500.0
+ 21
+810.0
+ 31
+0.0
+  0
+LINE
+  5
+228
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+39500.0
+ 20
+810.0
+ 30
+0.0
+ 11
+39500.0
+ 21
+1080.0
+ 31
+0.0
+  0
+LINE
+  5
+229
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+39500.0
+ 20
+1080.0
+ 30
+0.0
+ 11
+39800.0
+ 21
+1080.0
+ 31
+0.0
+  0
+LINE
+  5
+22A
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+39800.0
+ 20
+1080.0
+ 30
+0.0
+ 11
+39800.0
+ 21
+1350.0
+ 31
+0.0
+  0
+LINE
+  5
+22B
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+39800.0
+ 20
+1350.0
+ 30
+0.0
+ 11
+40100.0
+ 21
+1350.0
+ 31
+0.0
+  0
+LINE
+  5
+22C
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+40100.0
+ 20
+1350.0
+ 30
+0.0
+ 11
+40100.0
+ 21
+1620.0
+ 31
+0.0
+  0
+LINE
+  5
+22D
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+40100.0
+ 20
+1620.0
+ 30
+0.0
+ 11
+40400.0
+ 21
+1620.0
+ 31
+0.0
+  0
+LINE
+  5
+22E
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+40400.0
+ 20
+1620.0
+ 30
+0.0
+ 11
+40400.0
+ 21
+1890.0
+ 31
+0.0
+  0
+LINE
+  5
+22F
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+40400.0
+ 20
+1890.0
+ 30
+0.0
+ 11
+40700.0
+ 21
+1890.0
+ 31
+0.0
+  0
+LINE
+  5
+230
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+40700.0
+ 20
+1890.0
+ 30
+0.0
+ 11
+40700.0
+ 21
+2160.0
+ 31
+0.0
+  0
+LINE
+  5
+231
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+40700.0
+ 20
+2160.0
+ 30
+0.0
+ 11
+41000.0
+ 21
+2160.0
+ 31
+0.0
+  0
+LINE
+  5
+232
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+41000.0
+ 20
+2160.0
+ 30
+0.0
+ 11
+41000.0
+ 21
+2430.0
+ 31
+0.0
+  0
+LINE
+  5
+233
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+41000.0
+ 20
+2430.0
+ 30
+0.0
+ 11
+41300.0
+ 21
+2430.0
+ 31
+0.0
+  0
+LINE
+  5
+234
+330
+17
+100
+AcDbEntity
+  8
+E-STEP
+100
+AcDbLine
+ 10
+41300.0
+ 20
+2430.0
+ 30
+0.0
+ 11
+41300.0
+ 21
+2700.0
+ 31
+0.0
+  0
+TEXT
+  5
+235
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+32000.0
+ 20
+-2100.0
+ 30
+0.0
+ 40
+300.0
+  1
+SECTION A-A  1:50
+  7
+ARCH-TITLE
+ 11
+32000.0
+ 21
+-2100.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+239
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+239
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/house-plan-r2000.dxf b/crates/exav-viewer/demo/examples/files/cad/house-plan-r2000.dxf
new file mode 100644
index 00000000..281a7303
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/house-plan-r2000.dxf
@@ -0,0 +1,16378 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1015
+  9
+$ACADMAINTVER
+ 70
+6
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+218
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+214
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+5835.463185876482
+ 22
+2324.253181513731
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+15878.827193569996
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+17
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WALL
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+50
+390
+13
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WALL-PAT
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+9
+390
+13
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-DOOR
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+25
+390
+13
+  0
+LAYER
+  5
+44
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WIND
+ 70
+0
+ 62
+5
+  6
+Continuous
+370
+25
+390
+13
+  0
+LAYER
+  5
+45
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FURN
+ 70
+0
+ 62
+9
+  6
+Continuous
+370
+13
+390
+13
+  0
+LAYER
+  5
+46
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FIXT
+ 70
+0
+ 62
+4
+  6
+Continuous
+370
+18
+390
+13
+  0
+LAYER
+  5
+47
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-GRID
+ 70
+0
+ 62
+1
+  6
+CENTER
+370
+9
+390
+13
+  0
+LAYER
+  5
+48
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-ANNO
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+18
+390
+13
+  0
+LAYER
+  5
+49
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-DIMS
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+13
+390
+13
+  0
+LAYER
+  5
+4A
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-AREA
+ 70
+0
+ 62
+6
+  6
+Continuous
+370
+9
+390
+13
+  0
+LAYER
+  5
+4B
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FLOR
+ 70
+0
+ 62
+252
+  6
+Continuous
+370
+9
+390
+13
+  0
+LAYER
+  5
+4C
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-SLAB
+ 70
+0
+ 62
+254
+  6
+Continuous
+370
+9
+390
+13
+  0
+LAYER
+  5
+4D
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-STAIR
+ 70
+0
+ 62
+30
+  6
+Continuous
+370
+18
+390
+13
+  0
+LAYER
+  5
+4E
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-SHEET
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+35
+390
+13
+  0
+LAYER
+  5
+4F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-VPORT
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+9
+390
+13
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+4
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+50
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-TEXT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+51
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-TITLE
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+times.ttf
+  4
+
+  0
+STYLE
+  5
+52
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-NOTE
+ 70
+0
+ 40
+0.0
+ 41
+0.9
+ 50
+15.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+215
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+216
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+  3
+
+  4
+
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+53
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+PLAN50
+ 70
+0
+  3
+
+  4
+
+ 40
+1.0
+ 41
+176.0
+ 42
+176.0
+ 43
+3.75
+ 44
+132.0
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+140
+220.0
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+66.0
+148
+0.0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+0
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+340
+50
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+25
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+  0
+BLOCK_RECORD
+  5
+54
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+DOOR
+340
+0
+  0
+BLOCK_RECORD
+  5
+5B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WINDOW
+340
+0
+  0
+BLOCK_RECORD
+  5
+64
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BED
+340
+0
+  0
+BLOCK_RECORD
+  5
+6B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+TABLE
+340
+0
+  0
+BLOCK_RECORD
+  5
+77
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SOFA
+340
+0
+  0
+BLOCK_RECORD
+  5
+7F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WC
+340
+0
+  0
+BLOCK_RECORD
+  5
+84
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SINK
+340
+0
+  0
+BLOCK_RECORD
+  5
+8A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BATH
+340
+0
+  0
+BLOCK_RECORD
+  5
+8F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+AXIS
+340
+0
+  0
+BLOCK_RECORD
+  5
+94
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+NORTH
+340
+0
+  0
+BLOCK_RECORD
+  5
+9A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+LEVEL
+340
+0
+  0
+BLOCK_RECORD
+  5
+163
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D1
+340
+0
+  0
+BLOCK_RECORD
+  5
+168
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_CLOSEDFILLED
+340
+0
+  0
+BLOCK_RECORD
+  5
+176
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D2
+340
+0
+  0
+BLOCK_RECORD
+  5
+185
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D3
+340
+0
+  0
+BLOCK_RECORD
+  5
+194
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D4
+340
+0
+  0
+BLOCK_RECORD
+  5
+1A3
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D5
+340
+0
+  0
+BLOCK_RECORD
+  5
+1B2
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D6
+340
+0
+  0
+BLOCK_RECORD
+  5
+1C1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D7
+340
+0
+  0
+BLOCK_RECORD
+  5
+1D1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D8
+340
+0
+  0
+BLOCK_RECORD
+  5
+1E1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D9
+340
+0
+  0
+BLOCK_RECORD
+  5
+1F4
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D10
+340
+0
+  0
+BLOCK_RECORD
+  5
+206
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space0
+340
+209
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+55
+330
+54
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+DOOR
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+DOOR
+  1
+
+  0
+LINE
+  5
+57
+330
+54
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+900.0
+ 31
+0.0
+  0
+ARC
+  5
+58
+330
+54
+100
+AcDbEntity
+  8
+A-DOOR
+  6
+DASHED
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+900.0
+100
+AcDbArc
+ 50
+0.0
+ 51
+90.0
+  0
+LWPOLYLINE
+  5
+59
+330
+54
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+900.0
+ 20
+0.0
+ 10
+900.0
+ 20
+40.0
+ 10
+0.0
+ 20
+40.0
+  0
+ATTDEF
+  5
+5A
+330
+54
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+350.0
+ 20
+-330.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-000
+100
+AcDbAttributeDefinition
+  3
+
+  2
+TAG
+ 70
+0
+  0
+ENDBLK
+  5
+56
+330
+54
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+5C
+330
+5B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WINDOW
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WINDOW
+  1
+
+  0
+LINE
+  5
+5E
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+5F
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.35
+ 30
+0.0
+ 11
+1.0
+ 21
+0.35
+ 31
+0.0
+  0
+LINE
+  5
+60
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.65
+ 30
+0.0
+ 11
+1.0
+ 21
+0.65
+ 31
+0.0
+  0
+LINE
+  5
+61
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+62
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+63
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+5D
+330
+5B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+65
+330
+64
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BED
+  1
+
+  0
+LWPOLYLINE
+  5
+67
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+2000.0
+ 10
+0.0
+ 20
+2000.0
+  0
+LWPOLYLINE
+  5
+68
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+80.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1920.0
+ 10
+80.0
+ 20
+1920.0
+  0
+LWPOLYLINE
+  5
+69
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1920.0
+ 10
+840.0
+ 20
+1920.0
+  0
+LINE
+  5
+6A
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbLine
+ 10
+0.0
+ 20
+1200.0
+ 30
+0.0
+ 11
+1600.0
+ 21
+1200.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+66
+330
+64
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+6C
+330
+6B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+TABLE
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+TABLE
+  1
+
+  0
+LWPOLYLINE
+  5
+6E
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+900.0
+ 10
+0.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+6F
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-50.0
+ 10
+150.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+70
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+950.0
+ 10
+550.0
+ 20
+950.0
+ 10
+550.0
+ 20
+1350.0
+ 10
+150.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+71
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-50.0
+ 10
+600.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+72
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+1350.0
+ 10
+600.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+73
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-50.0
+ 10
+1050.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+74
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+1350.0
+ 10
+1050.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+75
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-50.0
+ 10
+1500.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+76
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+1350.0
+ 10
+1500.0
+ 20
+1350.0
+  0
+ENDBLK
+  5
+6D
+330
+6B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+78
+330
+77
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SOFA
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SOFA
+  1
+
+  0
+LWPOLYLINE
+  5
+7A
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+950.0
+ 10
+0.0
+ 20
+950.0
+  0
+LWPOLYLINE
+  5
+7B
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+250.0
+ 10
+0.0
+ 20
+250.0
+  0
+LWPOLYLINE
+  5
+7C
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+120.0
+ 20
+300.0
+ 10
+720.0
+ 20
+300.0
+ 10
+720.0
+ 20
+900.0
+ 10
+120.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+7D
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+770.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+900.0
+ 10
+770.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+7E
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1420.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+900.0
+ 10
+1420.0
+ 20
+900.0
+  0
+ENDBLK
+  5
+79
+330
+77
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+80
+330
+7F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WC
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WC
+  1
+
+  0
+LWPOLYLINE
+  5
+82
+330
+7F
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+400.0
+ 20
+0.0
+ 10
+400.0
+ 20
+200.0
+ 10
+0.0
+ 20
+200.0
+  0
+ELLIPSE
+  5
+83
+330
+7F
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbEllipse
+ 10
+200.0
+ 20
+-250.0
+ 30
+0.0
+ 11
+0.0
+ 21
+230.0
+ 31
+0.0
+ 40
+0.8
+ 41
+0.0
+ 42
+6.283185307179586
+  0
+ENDBLK
+  5
+81
+330
+7F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+85
+330
+84
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SINK
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SINK
+  1
+
+  0
+LWPOLYLINE
+  5
+87
+330
+84
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+600.0
+ 20
+0.0
+ 10
+600.0
+ 20
+450.0
+ 10
+0.0
+ 20
+450.0
+  0
+CIRCLE
+  5
+88
+330
+84
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+160.0
+  0
+CIRCLE
+  5
+89
+330
+84
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+25.0
+  0
+ENDBLK
+  5
+86
+330
+84
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+8B
+330
+8A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BATH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BATH
+  1
+
+  0
+LWPOLYLINE
+  5
+8D
+330
+8A
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+750.0
+ 10
+0.0
+ 20
+750.0
+  0
+LWPOLYLINE
+  5
+8E
+330
+8A
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+5
+ 70
+1
+ 10
+100.0
+ 20
+100.0
+ 10
+1500.0
+ 20
+100.0
+ 10
+1600.0
+ 20
+375.0
+ 10
+1500.0
+ 20
+650.0
+ 10
+100.0
+ 20
+650.0
+  0
+ENDBLK
+  5
+8C
+330
+8A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+90
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+AXIS
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+AXIS
+  1
+
+  0
+CIRCLE
+  5
+92
+330
+8F
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  0
+ATTDEF
+  5
+93
+330
+8F
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  1
+A
+ 72
+4
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbAttributeDefinition
+  3
+
+  2
+ID
+ 70
+0
+  0
+ENDBLK
+  5
+91
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+95
+330
+94
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+NORTH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+NORTH
+  1
+
+  0
+CIRCLE
+  5
+97
+330
+94
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+500.0
+  0
+SOLID
+  5
+98
+330
+94
+100
+AcDbEntity
+  8
+A-ANNO
+ 62
+7
+100
+AcDbTrace
+ 10
+0.0
+ 20
+650.0
+ 30
+0.0
+ 11
+-170.0
+ 21
+-400.0
+ 31
+0.0
+ 12
+0.0
+ 22
+-200.0
+ 32
+0.0
+ 13
+170.0
+ 23
+-400.0
+ 33
+0.0
+  0
+TEXT
+  5
+99
+330
+94
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+800.0
+ 30
+0.0
+ 40
+300.0
+  1
+N
+ 72
+1
+ 11
+0.0
+ 21
+800.0
+ 31
+0.0
+100
+AcDbText
+ 73
+1
+  0
+ENDBLK
+  5
+96
+330
+94
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+9B
+330
+9A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+LEVEL
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+LEVEL
+  1
+
+  0
+LWPOLYLINE
+  5
+9D
+330
+9A
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+-250.0
+ 20
+250.0
+ 10
+0.0
+ 20
+0.0
+ 10
+250.0
+ 20
+250.0
+  0
+LINE
+  5
+9E
+330
+9A
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbLine
+ 10
+-250.0
+ 20
+250.0
+ 30
+0.0
+ 11
+900.0
+ 21
+250.0
+ 31
+0.0
+  0
+ATTDEF
+  5
+9F
+330
+9A
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+320.0
+ 20
+290.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+100
+AcDbAttributeDefinition
+  3
+
+  2
+H
+ 70
+0
+  0
+ENDBLK
+  5
+9C
+330
+9A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+164
+330
+163
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D1
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D1
+  1
+
+  0
+LINE
+  5
+166
+330
+163
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-3232.0
+ 31
+0.0
+  0
+LINE
+  5
+167
+330
+163
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-3232.0
+ 31
+0.0
+  0
+INSERT
+  5
+16C
+330
+163
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-3100.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+16E
+330
+163
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+10000.0
+ 20
+-3100.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+170
+330
+163
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+176.0
+ 20
+-3100.0
+ 30
+0.0
+ 11
+9824.0
+ 21
+-3100.0
+ 31
+0.0
+  0
+MTEXT
+  5
+171
+330
+163
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+5000.0
+ 20
+-2924.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+10000
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+172
+330
+163
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-3100.0
+ 30
+0.0
+  0
+POINT
+  5
+173
+330
+163
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+174
+330
+163
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+10000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+165
+330
+163
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+169
+330
+168
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+_CLOSEDFILLED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+_CLOSEDFILLED
+  1
+
+  0
+SOLID
+  5
+16B
+330
+168
+100
+AcDbEntity
+  8
+0
+  6
+BYBLOCK
+ 62
+0
+100
+AcDbTrace
+ 10
+-1.0
+ 20
+0.16439898372402537
+ 30
+0.0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+ 12
+-1.0
+ 22
+-0.16439898372402537
+ 32
+0.0
+ 13
+-1.0
+ 23
+-0.16439898372402537
+ 33
+0.0
+  0
+ENDBLK
+  5
+16A
+330
+168
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+177
+330
+176
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D2
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D2
+  1
+
+  0
+LINE
+  5
+179
+330
+176
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+LINE
+  5
+17A
+330
+176
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+3500.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+3500.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+INSERT
+  5
+17B
+330
+176
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+17D
+330
+176
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+17F
+330
+176
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+176.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+3324.0
+ 21
+-2600.0
+ 31
+0.0
+  0
+MTEXT
+  5
+180
+330
+176
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+1750.0
+ 20
+-2424.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+3500
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+181
+330
+176
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-2600.0
+ 30
+0.0
+  0
+POINT
+  5
+182
+330
+176
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+183
+330
+176
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+3500.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+178
+330
+176
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+186
+330
+185
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D3
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D3
+  1
+
+  0
+LINE
+  5
+188
+330
+185
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+3500.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+3500.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+LINE
+  5
+189
+330
+185
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6200.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+INSERT
+  5
+18A
+330
+185
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+18C
+330
+185
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+18E
+330
+185
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+3676.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+6024.0
+ 21
+-2600.0
+ 31
+0.0
+  0
+MTEXT
+  5
+18F
+330
+185
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+4850.0
+ 20
+-2424.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+2700
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+190
+330
+185
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+  0
+POINT
+  5
+191
+330
+185
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+3500.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+192
+330
+185
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6200.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+187
+330
+185
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+195
+330
+194
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D4
+  1
+
+  0
+LINE
+  5
+197
+330
+194
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6200.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+LINE
+  5
+198
+330
+194
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+INSERT
+  5
+199
+330
+194
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+19B
+330
+194
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+10000.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+19D
+330
+194
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6376.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+9824.0
+ 21
+-2600.0
+ 31
+0.0
+  0
+MTEXT
+  5
+19E
+330
+194
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+8100.0
+ 20
+-2424.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+3800
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+19F
+330
+194
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+  0
+POINT
+  5
+1A0
+330
+194
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6200.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1A1
+330
+194
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+10000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+196
+330
+194
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1A4
+330
+1A3
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D5
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D5
+  1
+
+  0
+LINE
+  5
+1A6
+330
+1A3
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-3232.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+1A7
+330
+1A3
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+8000.0
+ 30
+0.0
+ 11
+-3232.0
+ 21
+8000.0
+ 31
+0.0
+  0
+INSERT
+  5
+1A8
+330
+1A3
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-3100.0
+ 20
+0.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+270.0
+  0
+INSERT
+  5
+1AA
+330
+1A3
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-3100.0
+ 20
+8000.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+90.0
+  0
+LINE
+  5
+1AC
+330
+1A3
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-3100.0
+ 20
+176.0
+ 30
+0.0
+ 11
+-3100.0
+ 21
+7824.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1AD
+330
+1A3
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-3276.0
+ 20
+4000.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+8000
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1AE
+330
+1A3
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-3100.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1AF
+330
+1A3
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1B0
+330
+1A3
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+8000.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1A5
+330
+1A3
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1B3
+330
+1B2
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D6
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D6
+  1
+
+  0
+LINE
+  5
+1B5
+330
+1B2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+1B6
+330
+1B2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+4200.0
+ 31
+0.0
+  0
+INSERT
+  5
+1B7
+330
+1B2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+0.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+270.0
+  0
+INSERT
+  5
+1B9
+330
+1B2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+90.0
+  0
+LINE
+  5
+1BB
+330
+1B2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2600.0
+ 20
+176.0
+ 30
+0.0
+ 11
+-2600.0
+ 21
+4024.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1BC
+330
+1B2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2776.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+4200
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1BD
+330
+1B2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-2600.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1BE
+330
+1B2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1BF
+330
+1B2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+4200.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1B4
+330
+1B2
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C2
+330
+1C1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D7
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D7
+  1
+
+  0
+LINE
+  5
+1C4
+330
+1C1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+4200.0
+ 31
+0.0
+  0
+LINE
+  5
+1C5
+330
+1C1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+8000.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+8000.0
+ 31
+0.0
+  0
+INSERT
+  5
+1C6
+330
+1C1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+270.0
+  0
+INSERT
+  5
+1C8
+330
+1C1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+8000.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+90.0
+  0
+LINE
+  5
+1CA
+330
+1C1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2600.0
+ 20
+4376.0
+ 30
+0.0
+ 11
+-2600.0
+ 21
+7824.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1CB
+330
+1C1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2776.0
+ 20
+6100.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+3800
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1CC
+330
+1C1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+  0
+POINT
+  5
+1CD
+330
+1C1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+4200.0
+ 30
+0.0
+  0
+POINT
+  5
+1CE
+330
+1C1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+8000.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1C3
+330
+1C1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1D2
+330
+1D1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D8
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D8
+  1
+
+  0
+LINE
+  5
+1D4
+330
+1D1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+11624.450793488832
+ 20
+375.54920651116765
+ 30
+0.0
+ 11
+12088.312841947207
+ 21
+-88.31284194720743
+ 31
+0.0
+  0
+LINE
+  5
+1D5
+330
+1D1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+14624.450793488832
+ 20
+3375.5492065111675
+ 30
+0.0
+ 11
+15088.312841947207
+ 21
+2911.6871580527927
+ 31
+0.0
+  0
+INSERT
+  5
+1D6
+330
+1D1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+11994.974746830583
+ 20
+5.025253169416828
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+225.0
+  0
+INSERT
+  5
+1D8
+330
+1D1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14994.974746830583
+ 20
+3005.025253169417
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+45.0
+  0
+LINE
+  5
+1DA
+330
+1D1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+12119.425540319415
+ 20
+129.47604665824917
+ 30
+0.0
+ 11
+14870.523953341752
+ 21
+2880.5744596805844
+ 31
+0.0
+  0
+MTEXT
+  5
+1DB
+330
+1D1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+13370.523953341752
+ 20
+1629.4760466582493
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+4243
+  7
+ARCH-TEXT
+ 50
+45.0
+  0
+POINT
+  5
+1DC
+330
+1D1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11994.974746830583
+ 20
+5.025253169416828
+ 30
+0.0
+  0
+POINT
+  5
+1DD
+330
+1D1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1DE
+330
+1D1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14500.0
+ 20
+3500.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1D3
+330
+1D1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1E2
+330
+1E1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D9
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D9
+  1
+
+  0
+LINE
+  5
+1E4
+330
+1E1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+11676.0
+ 20
+500.0
+ 30
+0.0
+ 11
+12456.621125123533
+ 21
+500.0
+ 31
+0.0
+  0
+LINE
+  5
+1E5
+330
+1E1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+11624.450793488832
+ 20
+624.4507934888323
+ 30
+0.0
+ 11
+12176.433284601155
+ 21
+1176.4332846011544
+ 31
+0.0
+  0
+INSERT
+  5
+1E6
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+12324.621125123533
+ 20
+500.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+443.88564221369427
+  0
+INSERT
+  5
+1E8
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+12083.09518948453
+ 20
+1083.0951894845302
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+321.11435778630573
+  0
+MTEXT
+  5
+1EA
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+12546.405475591537
+ 20
+933.4353397314832
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+45�
+  7
+ARCH-TEXT
+ 50
+-67.5
+  0
+ARC
+  5
+1EB
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 40
+824.6211251235321
+100
+AcDbArc
+ 50
+0.0
+ 51
+45.0
+  0
+ARC
+  5
+1EC
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 40
+824.6211251235321
+100
+AcDbArc
+ 50
+-24.45743114522284
+ 51
+-12.22871557261142
+  0
+ARC
+  5
+1ED
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 40
+824.6211251235321
+100
+AcDbArc
+ 50
+57.22871557261142
+ 51
+69.45743114522284
+  0
+POINT
+  5
+1EE
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1EF
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1F0
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14500.0
+ 20
+3500.0
+ 30
+0.0
+  0
+POINT
+  5
+1F1
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1F2
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+12300.0
+ 20
+700.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1E3
+330
+1E1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1F5
+330
+1F4
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D10
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D10
+  1
+
+  0
+INSERT
+  5
+1F7
+330
+1F4
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+6911.396103067893
+ 20
+2336.396103067893
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+225.0
+  0
+LINE
+  5
+1F9
+330
+1F4
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+ 11
+6911.396103067893
+ 21
+2336.396103067893
+ 31
+0.0
+  0
+LINE
+  5
+1FA
+330
+1F4
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+7035.846896556725
+ 20
+2460.8468965567254
+ 30
+0.0
+ 11
+7704.7699115591995
+ 21
+3129.7699115591995
+ 31
+0.0
+  0
+MTEXT
+  5
+1FB
+330
+1F4
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+7269.192134348285
+ 20
+2943.093721325951
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+R900
+  7
+ARCH-TEXT
+ 50
+45.0
+  0
+POINT
+  5
+1FC
+330
+1F4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+  0
+POINT
+  5
+1FD
+330
+1F4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6911.396103067893
+ 20
+2336.396103067893
+ 30
+0.0
+  0
+ENDBLK
+  5
+1F6
+330
+1F4
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+207
+330
+206
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space0
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space0
+  1
+
+  0
+VIEWPORT
+  5
+20A
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+VIEWPORTS
+100
+AcDbViewport
+ 10
+200.0
+ 20
+138.5
+ 30
+0.0
+ 40
+462.00000000000006
+ 41
+326.70000000000005
+ 68
+1
+ 69
+1
+ 12
+200.0
+ 22
+138.5
+ 13
+0.0
+ 23
+0.0
+ 14
+10.0
+ 24
+10.0
+ 15
+10.0
+ 25
+10.0
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+326.70000000000005
+ 50
+0.0
+ 51
+0.0
+ 72
+100
+ 90
+557088
+  1
+
+281
+0
+ 71
+0
+ 74
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+LWPOLYLINE
+  5
+20B
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+10.0
+ 20
+10.0
+ 10
+410.0
+ 20
+10.0
+ 10
+410.0
+ 20
+287.0
+ 10
+10.0
+ 20
+287.0
+  0
+LWPOLYLINE
+  5
+20C
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+5.0
+ 20
+5.0
+ 10
+415.0
+ 20
+5.0
+ 10
+415.0
+ 20
+292.0
+ 10
+5.0
+ 20
+292.0
+  0
+LWPOLYLINE
+  5
+20D
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+260.0
+ 20
+10.0
+ 10
+410.0
+ 20
+10.0
+ 10
+410.0
+ 20
+60.0
+ 10
+260.0
+ 20
+60.0
+  0
+LINE
+  5
+20E
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbLine
+ 10
+260.0
+ 20
+35.0
+ 30
+0.0
+ 11
+410.0
+ 21
+35.0
+ 31
+0.0
+  0
+LINE
+  5
+20F
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbLine
+ 10
+335.0
+ 20
+10.0
+ 30
+0.0
+ 11
+335.0
+ 21
+35.0
+ 31
+0.0
+  0
+TEXT
+  5
+210
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbText
+ 10
+265.0
+ 20
+45.0
+ 30
+0.0
+ 40
+7.0
+  1
+HOUSE, GROUND FLOOR
+  7
+ARCH-TITLE
+ 11
+265.0
+ 21
+45.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+211
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbText
+ 10
+265.0
+ 20
+18.0
+ 30
+0.0
+ 40
+4.0
+  1
+Scale 1:50
+  7
+ARCH-TEXT
+ 11
+265.0
+ 21
+18.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+212
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbText
+ 10
+340.0
+ 20
+18.0
+ 30
+0.0
+ 40
+4.0
+  1
+Sheet A-101
+  7
+ARCH-TEXT
+ 11
+340.0
+ 21
+18.0
+ 31
+0.0
+100
+AcDbText
+  0
+VIEWPORT
+  5
+213
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-VPORT
+100
+AcDbViewport
+ 10
+135.0
+ 20
+160.0
+ 30
+0.0
+ 40
+250.0
+ 41
+200.0
+ 68
+1
+ 69
+3
+ 12
+5000.0
+ 22
+3400.0
+ 13
+0.0
+ 23
+0.0
+ 14
+10.0
+ 24
+10.0
+ 15
+10.0
+ 25
+10.0
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+10000.0
+ 50
+0.0
+ 51
+0.0
+ 72
+100
+ 90
+0
+  1
+
+281
+0
+ 71
+0
+ 74
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDBLK
+  5
+208
+330
+206
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+HATCH
+  5
+A0
+330
+17
+100
+AcDbEntity
+  8
+A-SLAB
+ 62
+254
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+8000.0
+ 10
+0.0
+ 20
+8000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+-150.0
+ 10
+0.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+-150.0
+ 10
+0.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+2900.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+-150.0
+ 10
+2900.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+2900.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+-150.0
+ 10
+2900.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+4500.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+-150.0
+ 10
+4500.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+4500.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+-150.0
+ 10
+4500.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+7100.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+-150.0
+ 10
+7100.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+7100.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+-150.0
+ 10
+7100.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9400.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+-150.0
+ 10
+9400.0
+ 20
+-150.0
+  0
+HATCH
+  5
+AA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9400.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+-150.0
+ 10
+9400.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+AB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+1400.0
+ 20
+150.0
+ 30
+0.0
+ 11
+1400.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+2900.0
+ 20
+150.0
+ 30
+0.0
+ 11
+2900.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3600.0
+ 20
+150.0
+ 30
+0.0
+ 11
+3600.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+4500.0
+ 20
+150.0
+ 30
+0.0
+ 11
+4500.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6200.0
+ 20
+150.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+B0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+7100.0
+ 20
+150.0
+ 30
+0.0
+ 11
+7100.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+B1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8200.0
+ 20
+150.0
+ 30
+0.0
+ 11
+8200.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+B2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9400.0
+ 20
+150.0
+ 30
+0.0
+ 11
+9400.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+B3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9850.0
+ 20
+0.0
+ 10
+9850.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+0.0
+  0
+HATCH
+  5
+B4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9850.0
+ 20
+0.0
+ 10
+9850.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9850.0
+ 20
+2800.0
+ 10
+9850.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+2800.0
+  0
+HATCH
+  5
+B6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9850.0
+ 20
+2800.0
+ 10
+9850.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+2800.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9850.0
+ 20
+6100.0
+ 10
+9850.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+6100.0
+  0
+HATCH
+  5
+B8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9850.0
+ 20
+6100.0
+ 10
+9850.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+6100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+B9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+1500.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+1500.0
+ 31
+0.0
+  0
+LINE
+  5
+BA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+2800.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+2800.0
+ 31
+0.0
+  0
+LINE
+  5
+BB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+4800.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+4800.0
+ 31
+0.0
+  0
+LINE
+  5
+BC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+6100.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+6100.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+BD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+10000.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+8150.0
+ 10
+10000.0
+ 20
+8150.0
+  0
+HATCH
+  5
+BE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+10000.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+8150.0
+ 10
+10000.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+7400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+8150.0
+ 10
+7400.0
+ 20
+8150.0
+  0
+HATCH
+  5
+C0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+7400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+8150.0
+ 10
+7400.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+4800.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+8150.0
+ 10
+4800.0
+ 20
+8150.0
+  0
+HATCH
+  5
+C2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+4800.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+8150.0
+ 10
+4800.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+2200.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+8150.0
+ 10
+2200.0
+ 20
+8150.0
+  0
+HATCH
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+2200.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+8150.0
+ 10
+2200.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+C5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8800.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+8800.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+7400.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6400.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+6400.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+4800.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+4800.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3400.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+3400.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+CA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+2200.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+2200.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+CB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+8000.0
+ 10
+150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+8000.0
+  0
+HATCH
+  5
+CC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+8000.0
+ 10
+150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+8000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+CD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+5000.0
+ 10
+150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+5000.0
+  0
+HATCH
+  5
+CE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+5000.0
+ 10
+150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+5000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+CF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+1600.0
+ 10
+150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+1600.0
+  0
+HATCH
+  5
+D0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+1600.0
+ 10
+150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+1600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+D1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+6400.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+6400.0
+ 31
+0.0
+  0
+LINE
+  5
+D2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+5000.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+5000.0
+ 31
+0.0
+  0
+LINE
+  5
+D3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+3000.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+3000.0
+ 31
+0.0
+  0
+LINE
+  5
+D4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+1600.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+1600.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+D5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4125.0
+ 10
+0.0
+ 20
+4125.0
+  0
+HATCH
+  5
+D6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4125.0
+ 10
+0.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4125.0
+ 10
+1500.0
+ 20
+4125.0
+  0
+HATCH
+  5
+D8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+1500.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4125.0
+ 10
+1500.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3600.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4125.0
+ 10
+3600.0
+ 20
+4125.0
+  0
+HATCH
+  5
+DA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3600.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4125.0
+ 10
+3600.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+DB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+5700.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4125.0
+ 10
+5700.0
+ 20
+4125.0
+  0
+HATCH
+  5
+DC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+5700.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4125.0
+ 10
+5700.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+DD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+600.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+600.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+DE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+1500.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+1500.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+DF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+2700.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+2700.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+E0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3600.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+3600.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+E1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+4800.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+4800.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+E2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+5700.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+5700.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+E3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+0.0
+ 10
+6125.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+0.0
+  0
+HATCH
+  5
+E4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+0.0
+ 10
+6125.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+E5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+2600.0
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+2600.0
+  0
+HATCH
+  5
+E6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+2600.0
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+2600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+E7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+1700.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+1700.0
+ 31
+0.0
+  0
+LINE
+  5
+E8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+2600.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+2600.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+E9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6125.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+4200.0
+  0
+HATCH
+  5
+EA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6125.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+4200.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+EB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+7200.0
+ 10
+6125.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+7200.0
+  0
+HATCH
+  5
+EC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+7200.0
+ 10
+6125.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+7200.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+ED
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+6300.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+6300.0
+ 31
+0.0
+  0
+LINE
+  5
+EE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+7200.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+7200.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+EF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3425.0
+ 20
+0.0
+ 10
+3425.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+0.0
+  0
+HATCH
+  5
+F0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3425.0
+ 20
+0.0
+ 10
+3425.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3425.0
+ 20
+3300.0
+ 10
+3425.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+3300.0
+  0
+HATCH
+  5
+F2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3425.0
+ 20
+3300.0
+ 10
+3425.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+3300.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+F3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3425.0
+ 20
+2400.0
+ 30
+0.0
+ 11
+3575.0
+ 21
+2400.0
+ 31
+0.0
+  0
+LINE
+  5
+F4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3425.0
+ 20
+3300.0
+ 30
+0.0
+ 11
+3575.0
+ 21
+3300.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+F5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6200.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4125.0
+ 10
+6200.0
+ 20
+4125.0
+  0
+HATCH
+  5
+F6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6200.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4125.0
+ 10
+6200.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8125.0
+ 20
+4200.0
+ 10
+8125.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+4200.0
+  0
+HATCH
+  5
+F8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+8125.0
+ 20
+4200.0
+ 10
+8125.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+4200.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8125.0
+ 20
+6700.0
+ 10
+8125.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+6700.0
+  0
+HATCH
+  5
+FA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+8125.0
+ 20
+6700.0
+ 10
+8125.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+6700.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+FB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8125.0
+ 20
+5800.0
+ 30
+0.0
+ 11
+8275.0
+ 21
+5800.0
+ 31
+0.0
+  0
+LINE
+  5
+FC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8125.0
+ 20
+6700.0
+ 30
+0.0
+ 11
+8275.0
+ 21
+6700.0
+ 31
+0.0
+  0
+INSERT
+  5
+FD
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+1700.0
+ 20
+150.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+FF
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+2050.0
+ 20
+-180.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-101
+ 11
+2050.0
+ 21
+-180.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+FE
+330
+FD
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+100
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+ 50
+90.0
+  0
+ATTRIB
+  5
+102
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+6605.0
+ 20
+2050.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-102
+ 50
+90.0
+ 11
+6605.0
+ 21
+2050.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+101
+330
+100
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+103
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+3575.0
+ 20
+2400.0
+ 30
+0.0
+ 50
+90.0
+  0
+ATTRIB
+  5
+105
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+3905.0
+ 20
+2750.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-103
+ 50
+90.0
+ 11
+3905.0
+ 21
+2750.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+104
+330
+103
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+106
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+700.0
+ 20
+4275.0
+ 30
+0.0
+ 42
+-1.0
+  0
+ATTRIB
+  5
+108
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+-1050.0
+ 20
+4605.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-104
+ 50
+180.0
+ 11
+-1050.0
+ 21
+4605.0
+ 31
+0.0
+210
+0.0
+220
+0.0
+230
+-1.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+107
+330
+106
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+109
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+2800.0
+ 20
+4275.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+10B
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+3150.0
+ 20
+3945.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-105
+ 11
+3150.0
+ 21
+3945.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+10A
+330
+109
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+10C
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+4900.0
+ 20
+4275.0
+ 30
+0.0
+ 42
+-1.0
+  0
+ATTRIB
+  5
+10E
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+-5250.0
+ 20
+4605.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-106
+ 50
+180.0
+ 11
+-5250.0
+ 21
+4605.0
+ 31
+0.0
+210
+0.0
+220
+0.0
+230
+-1.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+10D
+330
+10C
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+10F
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+8275.0
+ 20
+5800.0
+ 30
+0.0
+ 50
+90.0
+  0
+ATTRIB
+  5
+111
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+8605.0
+ 20
+6150.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-107
+ 50
+90.0
+ 11
+8605.0
+ 21
+6150.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+  0
+SEQEND
+  5
+110
+330
+10F
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+112
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+3600.0
+ 20
+-150.0
+ 30
+0.0
+ 41
+900.0
+ 42
+300.0
+  0
+INSERT
+  5
+114
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+6200.0
+ 20
+-150.0
+ 30
+0.0
+ 41
+900.0
+ 42
+300.0
+  0
+INSERT
+  5
+116
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+8200.0
+ 20
+-150.0
+ 30
+0.0
+ 41
+1200.0
+ 42
+300.0
+  0
+INSERT
+  5
+118
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+10150.0
+ 20
+4800.0
+ 30
+0.0
+ 41
+1300.0
+ 42
+300.0
+ 50
+90.0
+  0
+INSERT
+  5
+11A
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+1200.0
+ 20
+7850.0
+ 30
+0.0
+ 41
+1400.0
+ 42
+300.0
+  0
+INSERT
+  5
+11C
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+3600.0
+ 20
+7850.0
+ 30
+0.0
+ 41
+1600.0
+ 42
+300.0
+  0
+INSERT
+  5
+11E
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+6600.0
+ 20
+7850.0
+ 30
+0.0
+ 41
+1200.0
+ 42
+300.0
+  0
+INSERT
+  5
+120
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+150.0
+ 20
+5000.0
+ 30
+0.0
+ 41
+1400.0
+ 42
+300.0
+ 50
+90.0
+  0
+INSERT
+  5
+122
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+SOFA
+ 10
+1200.0
+ 20
+6900.0
+ 30
+0.0
+  0
+INSERT
+  5
+124
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+TABLE
+ 10
+3900.0
+ 20
+5300.0
+ 30
+0.0
+  0
+INSERT
+  5
+126
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+BED
+ 10
+4300.0
+ 20
+400.0
+ 30
+0.0
+  0
+INSERT
+  5
+128
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+BED
+ 10
+500.0
+ 20
+600.0
+ 30
+0.0
+ 41
+0.8
+ 42
+0.9
+  0
+INSERT
+  5
+12A
+330
+17
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbBlockReference
+  2
+BATH
+ 10
+6800.0
+ 20
+300.0
+ 30
+0.0
+  0
+INSERT
+  5
+12C
+330
+17
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbBlockReference
+  2
+WC
+ 10
+8300.0
+ 20
+3200.0
+ 30
+0.0
+ 50
+90.0
+  0
+INSERT
+  5
+12E
+330
+17
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbBlockReference
+  2
+SINK
+ 10
+6500.0
+ 20
+3350.0
+ 30
+0.0
+  0
+LINE
+  5
+130
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+4400.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+4400.0
+ 31
+0.0
+  0
+LINE
+  5
+131
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+4680.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+4680.0
+ 31
+0.0
+  0
+LINE
+  5
+132
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+4960.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+4960.0
+ 31
+0.0
+  0
+LINE
+  5
+133
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+5240.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+5240.0
+ 31
+0.0
+  0
+LINE
+  5
+134
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+5520.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+5520.0
+ 31
+0.0
+  0
+LINE
+  5
+135
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+5800.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+5800.0
+ 31
+0.0
+  0
+LINE
+  5
+136
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6080.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6080.0
+ 31
+0.0
+  0
+LINE
+  5
+137
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6360.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6360.0
+ 31
+0.0
+  0
+LINE
+  5
+138
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6640.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6640.0
+ 31
+0.0
+  0
+LINE
+  5
+139
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6920.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6920.0
+ 31
+0.0
+  0
+LINE
+  5
+13A
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+7200.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+7200.0
+ 31
+0.0
+  0
+LINE
+  5
+13B
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+7480.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+7480.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+13C
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6400.0
+ 20
+4400.0
+ 10
+7400.0
+ 20
+4400.0
+ 10
+7400.0
+ 20
+7760.0
+ 10
+6400.0
+ 20
+7760.0
+  0
+LWPOLYLINE
+  5
+13D
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+6900.0
+ 20
+4500.0
+ 10
+6900.0
+ 20
+7700.0
+  0
+LEADER
+  5
+13E
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLeader
+  3
+Standard
+ 73
+3
+ 76
+3
+ 10
+6900.0
+ 20
+7700.0
+ 30
+0.0
+ 10
+6820.0
+ 20
+7400.0
+ 30
+0.0
+ 10
+6980.0
+ 20
+7400.0
+ 30
+0.0
+  0
+TEXT
+  5
+13F
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbText
+ 10
+6950.0
+ 20
+4600.0
+ 30
+0.0
+ 40
+150.0
+  1
+UP
+  7
+ARCH-TEXT
+ 11
+6950.0
+ 21
+4600.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+140
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+0.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+0.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+141
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+0.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+143
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+0.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+1
+ 72
+4
+ 11
+0.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+142
+330
+141
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+144
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+3500.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+3500.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+145
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+3500.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+147
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+3500.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+2
+ 72
+4
+ 11
+3500.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+146
+330
+145
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+148
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+6200.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+149
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+6200.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+14B
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+6200.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+3
+ 72
+4
+ 11
+6200.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+14A
+330
+149
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+14C
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+14D
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+10000.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+14F
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+10000.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+4
+ 72
+4
+ 11
+10000.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+14E
+330
+14D
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+150
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+-1700.0
+ 20
+0.0
+ 30
+0.0
+ 11
+11200.0
+ 21
+0.0
+ 31
+0.0
+  0
+INSERT
+  5
+151
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+-2000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+153
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+-2000.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  1
+A
+ 72
+4
+ 11
+-2000.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+152
+330
+151
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+154
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+-1700.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+11200.0
+ 21
+4200.0
+ 31
+0.0
+  0
+INSERT
+  5
+155
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+-2000.0
+ 20
+4200.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+157
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+-2000.0
+ 20
+4200.0
+ 30
+0.0
+ 40
+300.0
+  1
+B
+ 72
+4
+ 11
+-2000.0
+ 21
+4200.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+156
+330
+155
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+158
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+-1700.0
+ 20
+8000.0
+ 30
+0.0
+ 11
+11200.0
+ 21
+8000.0
+ 31
+0.0
+  0
+INSERT
+  5
+159
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+-2000.0
+ 20
+8000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+15B
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+-2000.0
+ 20
+8000.0
+ 30
+0.0
+ 40
+300.0
+  1
+C
+ 72
+4
+ 11
+-2000.0
+ 21
+8000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+  0
+SEQEND
+  5
+15A
+330
+159
+100
+AcDbEntity
+  8
+A-GRID
+  0
+MTEXT
+  5
+15C
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+1750.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;BEDROOM 1\P\fArial|b0;14.7 m�
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+15D
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+4850.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;BEDROOM 2\P\fArial|b0;11.3 m�
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+15E
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+7500.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;BATH\P\fArial|b0;16.0 m�
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+15F
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+3100.0
+ 20
+6100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;LIVING ROOM\P\fArial|b0;23.6 m�
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+160
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+7150.0
+ 20
+6100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;KITCHEN\P\fArial|b0;14.4 m�
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+161
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+1500.0
+ 20
+4650.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;HALL
+  7
+ARCH-TEXT
+  0
+DIMENSION
+  5
+162
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D1
+  3
+PLAN50
+ 10
+0.0
+ 20
+-3100.0
+ 30
+0.0
+ 11
+5000.0
+ 21
+-2924.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+10000.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+175
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D2
+  3
+PLAN50
+ 10
+0.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+1750.0
+ 21
+-2424.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+3500.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+184
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D3
+  3
+PLAN50
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+4850.0
+ 21
+-2424.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+3500.0
+ 23
+0.0
+ 33
+0.0
+ 14
+6200.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+193
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D4
+  3
+PLAN50
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+8100.0
+ 21
+-2424.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+6200.0
+ 23
+0.0
+ 33
+0.0
+ 14
+10000.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1A2
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D5
+  3
+PLAN50
+ 10
+-3100.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-3276.0
+ 21
+4000.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+8000.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1B1
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D6
+  3
+PLAN50
+ 10
+-2600.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-2776.0
+ 21
+2100.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+4200.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1C0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D7
+  3
+PLAN50
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+-2776.0
+ 21
+6100.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+4200.0
+ 33
+0.0
+ 14
+0.0
+ 24
+8000.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+LWPOLYLINE
+  5
+1CF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+  6
+DASHED
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+11500.0
+ 20
+500.0
+ 10
+14500.0
+ 20
+3500.0
+  0
+DIMENSION
+  5
+1D0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D8
+  3
+PLAN50
+ 10
+11994.974746830583
+ 20
+5.025253169416828
+ 30
+0.0
+ 11
+13370.523953341752
+ 21
+1629.4760466582493
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+11500.0
+ 23
+500.0
+ 33
+0.0
+ 14
+14500.0
+ 24
+3500.0
+ 34
+0.0
+ 50
+45.0
+100
+AcDbRotatedDimension
+  0
+LINE
+  5
+1DF
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 11
+14500.0
+ 21
+500.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+1E0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D9
+  3
+PLAN50
+ 10
+14500.0
+ 20
+500.0
+ 30
+0.0
+ 11
+12546.405475591537
+ 21
+933.4353397314832
+ 31
+0.0
+ 70
+34
+ 71
+5
+  1
+<>
+100
+AcDb2LineAngularDimension
+ 13
+11500.0
+ 23
+500.0
+ 33
+0.0
+ 14
+14500.0
+ 24
+3500.0
+ 34
+0.0
+ 15
+11500.0
+ 25
+500.0
+ 35
+0.0
+ 16
+12300.0
+ 26
+700.0
+ 36
+0.0
+  0
+DIMENSION
+  5
+1F3
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+  2
+*D10
+  3
+PLAN50
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+ 11
+7269.192134348285
+ 21
+2943.093721325951
+ 31
+0.0
+ 70
+36
+ 71
+5
+  1
+<>
+100
+AcDbRadialDimension
+ 15
+6911.396103067893
+ 25
+2336.396103067893
+ 35
+0.0
+  0
+INSERT
+  5
+1FE
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+  2
+NORTH
+ 10
+12200.0
+ 20
+8700.0
+ 30
+0.0
+  0
+INSERT
+  5
+200
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+5000.0
+ 20
+3400.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+202
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+5320.0
+ 20
+3690.0
+ 30
+0.0
+ 40
+120.0
+  1
+�0.00
+ 11
+5320.0
+ 21
+3690.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+  0
+SEQEND
+  5
+201
+330
+200
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+TEXT
+  5
+203
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+-4700.0
+ 30
+0.0
+ 40
+330.0
+  1
+GROUND FLOOR PLAN  1:50
+  7
+ARCH-TITLE
+ 11
+0.0
+ 21
+-4700.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+204
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+370
+70
+100
+AcDbLine
+ 10
+0.0
+ 20
+-4900.0
+ 30
+0.0
+ 11
+4500.0
+ 21
+-4900.0
+ 31
+0.0
+  0
+TEXT
+  5
+205
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+-5200.0
+ 30
+0.0
+ 40
+130.0
+  1
+Drawn for the exav demo. Dimensions in millimetres.
+  7
+ARCH-NOTE
+ 11
+0.0
+ 21
+-5200.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  3
+A3 Plan
+350
+209
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+217
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+LAYOUT
+  5
+209
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  2
+DWG to PDF.pc3
+  4
+ezdxf_(420.00_x_297.00_MM)
+  6
+
+ 40
+10.0
+ 41
+10.0
+ 42
+10.0
+ 43
+10.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+672
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+A3 Plan
+ 70
+1
+ 71
+3
+ 10
+-10.0
+ 20
+-10.0
+ 11
+410.0
+ 21
+287.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+206
+331
+20A
+  0
+DICTIONARYVAR
+  5
+217
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/house-plan.dxf b/crates/exav-viewer/demo/examples/files/cad/house-plan.dxf
new file mode 100644
index 00000000..6cdcec39
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/house-plan.dxf
@@ -0,0 +1,17000 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+218
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+214
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+5835.463185876482
+ 22
+2324.253181513731
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+15878.827193569996
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+17
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WALL
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+50
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WALL-PAT
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-DOOR
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+44
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-WIND
+ 70
+0
+ 62
+5
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+45
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FURN
+ 70
+0
+ 62
+9
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+LAYER
+  5
+46
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FIXT
+ 70
+0
+ 62
+4
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+47
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-GRID
+ 70
+0
+ 62
+1
+  6
+CENTER
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+48
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-ANNO
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+49
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-DIMS
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+LAYER
+  5
+4A
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-AREA
+ 70
+0
+ 62
+6
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+4B
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-FLOR
+ 70
+0
+ 62
+252
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+4C
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-SLAB
+ 70
+0
+ 62
+254
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+4D
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-STAIR
+ 70
+0
+ 62
+30
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+4E
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-SHEET
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+35
+390
+13
+347
+21
+  0
+LAYER
+  5
+4F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+A-VPORT
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+9
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+4
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+50
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-TEXT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+51
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-TITLE
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+times.ttf
+  4
+
+  0
+STYLE
+  5
+52
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+ARCH-NOTE
+ 70
+0
+ 40
+0.0
+ 41
+0.9
+ 50
+15.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+215
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+216
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+DIMSTYLE
+105
+53
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+PLAN50
+ 70
+0
+ 40
+1.0
+ 41
+176.0
+ 42
+176.0
+ 43
+3.75
+ 44
+132.0
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+220.0
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+66.0
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+3
+177
+3
+178
+2
+179
+2
+271
+0
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+340
+50
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+25
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+54
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+DOOR
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+5B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WINDOW
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+64
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+6B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+TABLE
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+77
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SOFA
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+7F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WC
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+84
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SINK
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BATH
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+AXIS
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+94
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+NORTH
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+9A
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+LEVEL
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+163
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D1
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+168
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_CLOSEDFILLED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+176
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D2
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+185
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D3
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+194
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D4
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1A3
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D5
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B2
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D6
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1C1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D7
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1D1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D8
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1E1
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D9
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1F4
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*D10
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+206
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space0
+340
+209
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+55
+330
+54
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+DOOR
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+DOOR
+  1
+
+  0
+LINE
+  5
+57
+330
+54
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+900.0
+ 31
+0.0
+  0
+ARC
+  5
+58
+330
+54
+100
+AcDbEntity
+  8
+A-DOOR
+  6
+DASHED
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+900.0
+100
+AcDbArc
+ 50
+0.0
+ 51
+90.0
+  0
+LWPOLYLINE
+  5
+59
+330
+54
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+900.0
+ 20
+0.0
+ 10
+900.0
+ 20
+40.0
+ 10
+0.0
+ 20
+40.0
+  0
+ATTDEF
+  5
+5A
+330
+54
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+350.0
+ 20
+-330.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-000
+100
+AcDbAttributeDefinition
+  3
+
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+56
+330
+54
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+5C
+330
+5B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WINDOW
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WINDOW
+  1
+
+  0
+LINE
+  5
+5E
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+5F
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.35
+ 30
+0.0
+ 11
+1.0
+ 21
+0.35
+ 31
+0.0
+  0
+LINE
+  5
+60
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.65
+ 30
+0.0
+ 11
+1.0
+ 21
+0.65
+ 31
+0.0
+  0
+LINE
+  5
+61
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+62
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+63
+330
+5B
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+5D
+330
+5B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+65
+330
+64
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BED
+  1
+
+  0
+LWPOLYLINE
+  5
+67
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+2000.0
+ 10
+0.0
+ 20
+2000.0
+  0
+LWPOLYLINE
+  5
+68
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+80.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1920.0
+ 10
+80.0
+ 20
+1920.0
+  0
+LWPOLYLINE
+  5
+69
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1920.0
+ 10
+840.0
+ 20
+1920.0
+  0
+LINE
+  5
+6A
+330
+64
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbLine
+ 10
+0.0
+ 20
+1200.0
+ 30
+0.0
+ 11
+1600.0
+ 21
+1200.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+66
+330
+64
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+6C
+330
+6B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+TABLE
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+TABLE
+  1
+
+  0
+LWPOLYLINE
+  5
+6E
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+900.0
+ 10
+0.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+6F
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-50.0
+ 10
+150.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+70
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+950.0
+ 10
+550.0
+ 20
+950.0
+ 10
+550.0
+ 20
+1350.0
+ 10
+150.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+71
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-50.0
+ 10
+600.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+72
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+1350.0
+ 10
+600.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+73
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-50.0
+ 10
+1050.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+74
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+1350.0
+ 10
+1050.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+75
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-50.0
+ 10
+1500.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+76
+330
+6B
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+1350.0
+ 10
+1500.0
+ 20
+1350.0
+  0
+ENDBLK
+  5
+6D
+330
+6B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+78
+330
+77
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SOFA
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SOFA
+  1
+
+  0
+LWPOLYLINE
+  5
+7A
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+950.0
+ 10
+0.0
+ 20
+950.0
+  0
+LWPOLYLINE
+  5
+7B
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+250.0
+ 10
+0.0
+ 20
+250.0
+  0
+LWPOLYLINE
+  5
+7C
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+120.0
+ 20
+300.0
+ 10
+720.0
+ 20
+300.0
+ 10
+720.0
+ 20
+900.0
+ 10
+120.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+7D
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+770.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+900.0
+ 10
+770.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+7E
+330
+77
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1420.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+900.0
+ 10
+1420.0
+ 20
+900.0
+  0
+ENDBLK
+  5
+79
+330
+77
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+80
+330
+7F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WC
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WC
+  1
+
+  0
+LWPOLYLINE
+  5
+82
+330
+7F
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+400.0
+ 20
+0.0
+ 10
+400.0
+ 20
+200.0
+ 10
+0.0
+ 20
+200.0
+  0
+ELLIPSE
+  5
+83
+330
+7F
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbEllipse
+ 10
+200.0
+ 20
+-250.0
+ 30
+0.0
+ 11
+0.0
+ 21
+230.0
+ 31
+0.0
+ 40
+0.8
+ 41
+0.0
+ 42
+6.283185307179586
+  0
+ENDBLK
+  5
+81
+330
+7F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+85
+330
+84
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SINK
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SINK
+  1
+
+  0
+LWPOLYLINE
+  5
+87
+330
+84
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+600.0
+ 20
+0.0
+ 10
+600.0
+ 20
+450.0
+ 10
+0.0
+ 20
+450.0
+  0
+CIRCLE
+  5
+88
+330
+84
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+160.0
+  0
+CIRCLE
+  5
+89
+330
+84
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+25.0
+  0
+ENDBLK
+  5
+86
+330
+84
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+8B
+330
+8A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BATH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BATH
+  1
+
+  0
+LWPOLYLINE
+  5
+8D
+330
+8A
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+750.0
+ 10
+0.0
+ 20
+750.0
+  0
+LWPOLYLINE
+  5
+8E
+330
+8A
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+5
+ 70
+1
+ 10
+100.0
+ 20
+100.0
+ 10
+1500.0
+ 20
+100.0
+ 10
+1600.0
+ 20
+375.0
+ 10
+1500.0
+ 20
+650.0
+ 10
+100.0
+ 20
+650.0
+  0
+ENDBLK
+  5
+8C
+330
+8A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+90
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+AXIS
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+AXIS
+  1
+
+  0
+CIRCLE
+  5
+92
+330
+8F
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  0
+ATTDEF
+  5
+93
+330
+8F
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  1
+A
+ 72
+4
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbAttributeDefinition
+  3
+
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+91
+330
+8F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+95
+330
+94
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+NORTH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+NORTH
+  1
+
+  0
+CIRCLE
+  5
+97
+330
+94
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+500.0
+  0
+SOLID
+  5
+98
+330
+94
+100
+AcDbEntity
+  8
+A-ANNO
+ 62
+7
+100
+AcDbTrace
+ 10
+0.0
+ 20
+650.0
+ 30
+0.0
+ 11
+-170.0
+ 21
+-400.0
+ 31
+0.0
+ 12
+0.0
+ 22
+-200.0
+ 32
+0.0
+ 13
+170.0
+ 23
+-400.0
+ 33
+0.0
+  0
+TEXT
+  5
+99
+330
+94
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+800.0
+ 30
+0.0
+ 40
+300.0
+  1
+N
+ 72
+1
+ 11
+0.0
+ 21
+800.0
+ 31
+0.0
+100
+AcDbText
+ 73
+1
+  0
+ENDBLK
+  5
+96
+330
+94
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+9B
+330
+9A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+LEVEL
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+LEVEL
+  1
+
+  0
+LWPOLYLINE
+  5
+9D
+330
+9A
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+-250.0
+ 20
+250.0
+ 10
+0.0
+ 20
+0.0
+ 10
+250.0
+ 20
+250.0
+  0
+LINE
+  5
+9E
+330
+9A
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbLine
+ 10
+-250.0
+ 20
+250.0
+ 30
+0.0
+ 11
+900.0
+ 21
+250.0
+ 31
+0.0
+  0
+ATTDEF
+  5
+9F
+330
+9A
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+320.0
+ 20
+290.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+100
+AcDbAttributeDefinition
+  3
+
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+9C
+330
+9A
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+164
+330
+163
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D1
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D1
+  1
+
+  0
+LINE
+  5
+166
+330
+163
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-3232.0
+ 31
+0.0
+  0
+LINE
+  5
+167
+330
+163
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-3232.0
+ 31
+0.0
+  0
+INSERT
+  5
+16C
+330
+163
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-3100.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+16E
+330
+163
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+10000.0
+ 20
+-3100.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+170
+330
+163
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+176.0
+ 20
+-3100.0
+ 30
+0.0
+ 11
+9824.0
+ 21
+-3100.0
+ 31
+0.0
+  0
+MTEXT
+  5
+171
+330
+163
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+5000.0
+ 20
+-2924.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+10000
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+172
+330
+163
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-3100.0
+ 30
+0.0
+  0
+POINT
+  5
+173
+330
+163
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+174
+330
+163
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+10000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+165
+330
+163
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+169
+330
+168
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+_CLOSEDFILLED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+_CLOSEDFILLED
+  1
+
+  0
+SOLID
+  5
+16B
+330
+168
+100
+AcDbEntity
+  8
+0
+  6
+BYBLOCK
+ 62
+0
+100
+AcDbTrace
+ 10
+-1.0
+ 20
+0.16439898372402537
+ 30
+0.0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+ 12
+-1.0
+ 22
+-0.16439898372402537
+ 32
+0.0
+ 13
+-1.0
+ 23
+-0.16439898372402537
+ 33
+0.0
+  0
+ENDBLK
+  5
+16A
+330
+168
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+177
+330
+176
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D2
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D2
+  1
+
+  0
+LINE
+  5
+179
+330
+176
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+0.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+LINE
+  5
+17A
+330
+176
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+3500.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+3500.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+INSERT
+  5
+17B
+330
+176
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+0.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+17D
+330
+176
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+17F
+330
+176
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+176.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+3324.0
+ 21
+-2600.0
+ 31
+0.0
+  0
+MTEXT
+  5
+180
+330
+176
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+1750.0
+ 20
+-2424.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+3500
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+181
+330
+176
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+-2600.0
+ 30
+0.0
+  0
+POINT
+  5
+182
+330
+176
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+183
+330
+176
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+3500.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+178
+330
+176
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+186
+330
+185
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D3
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D3
+  1
+
+  0
+LINE
+  5
+188
+330
+185
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+3500.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+3500.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+LINE
+  5
+189
+330
+185
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6200.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+INSERT
+  5
+18A
+330
+185
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+18C
+330
+185
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+18E
+330
+185
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+3676.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+6024.0
+ 21
+-2600.0
+ 31
+0.0
+  0
+MTEXT
+  5
+18F
+330
+185
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+4850.0
+ 20
+-2424.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+2700
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+190
+330
+185
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+  0
+POINT
+  5
+191
+330
+185
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+3500.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+192
+330
+185
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6200.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+187
+330
+185
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+195
+330
+194
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D4
+  1
+
+  0
+LINE
+  5
+197
+330
+194
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6200.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+LINE
+  5
+198
+330
+194
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+-2732.0
+ 31
+0.0
+  0
+INSERT
+  5
+199
+330
+194
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+180.0
+  0
+INSERT
+  5
+19B
+330
+194
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+10000.0
+ 20
+-2600.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+  0
+LINE
+  5
+19D
+330
+194
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6376.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+9824.0
+ 21
+-2600.0
+ 31
+0.0
+  0
+MTEXT
+  5
+19E
+330
+194
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+8100.0
+ 20
+-2424.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+3800
+  7
+ARCH-TEXT
+  0
+POINT
+  5
+19F
+330
+194
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+  0
+POINT
+  5
+1A0
+330
+194
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6200.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1A1
+330
+194
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+10000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+196
+330
+194
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1A4
+330
+1A3
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D5
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D5
+  1
+
+  0
+LINE
+  5
+1A6
+330
+1A3
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-3232.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+1A7
+330
+1A3
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+8000.0
+ 30
+0.0
+ 11
+-3232.0
+ 21
+8000.0
+ 31
+0.0
+  0
+INSERT
+  5
+1A8
+330
+1A3
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-3100.0
+ 20
+0.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+270.0
+  0
+INSERT
+  5
+1AA
+330
+1A3
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-3100.0
+ 20
+8000.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+90.0
+  0
+LINE
+  5
+1AC
+330
+1A3
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-3100.0
+ 20
+176.0
+ 30
+0.0
+ 11
+-3100.0
+ 21
+7824.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1AD
+330
+1A3
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-3276.0
+ 20
+4000.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+8000
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1AE
+330
+1A3
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-3100.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1AF
+330
+1A3
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1B0
+330
+1A3
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+8000.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1A5
+330
+1A3
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1B3
+330
+1B2
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D6
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D6
+  1
+
+  0
+LINE
+  5
+1B5
+330
+1B2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+1B6
+330
+1B2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+4200.0
+ 31
+0.0
+  0
+INSERT
+  5
+1B7
+330
+1B2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+0.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+270.0
+  0
+INSERT
+  5
+1B9
+330
+1B2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+90.0
+  0
+LINE
+  5
+1BB
+330
+1B2
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2600.0
+ 20
+176.0
+ 30
+0.0
+ 11
+-2600.0
+ 21
+4024.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1BC
+330
+1B2
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2776.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+4200
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1BD
+330
+1B2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-2600.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1BE
+330
+1B2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+POINT
+  5
+1BF
+330
+1B2
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+4200.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1B4
+330
+1B2
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C2
+330
+1C1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D7
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D7
+  1
+
+  0
+LINE
+  5
+1C4
+330
+1C1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+4200.0
+ 31
+0.0
+  0
+LINE
+  5
+1C5
+330
+1C1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-176.0
+ 20
+8000.0
+ 30
+0.0
+ 11
+-2732.0
+ 21
+8000.0
+ 31
+0.0
+  0
+INSERT
+  5
+1C6
+330
+1C1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+270.0
+  0
+INSERT
+  5
+1C8
+330
+1C1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+-2600.0
+ 20
+8000.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+90.0
+  0
+LINE
+  5
+1CA
+330
+1C1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+-2600.0
+ 20
+4376.0
+ 30
+0.0
+ 11
+-2600.0
+ 21
+7824.0
+ 31
+0.0
+  0
+MTEXT
+  5
+1CB
+330
+1C1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+-2776.0
+ 20
+6100.0
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+3800
+  7
+ARCH-TEXT
+ 50
+90.0
+  0
+POINT
+  5
+1CC
+330
+1C1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+  0
+POINT
+  5
+1CD
+330
+1C1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+4200.0
+ 30
+0.0
+  0
+POINT
+  5
+1CE
+330
+1C1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+0.0
+ 20
+8000.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1C3
+330
+1C1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1D2
+330
+1D1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D8
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D8
+  1
+
+  0
+LINE
+  5
+1D4
+330
+1D1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+11624.450793488832
+ 20
+375.54920651116765
+ 30
+0.0
+ 11
+12088.312841947207
+ 21
+-88.31284194720743
+ 31
+0.0
+  0
+LINE
+  5
+1D5
+330
+1D1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+14624.450793488832
+ 20
+3375.5492065111675
+ 30
+0.0
+ 11
+15088.312841947207
+ 21
+2911.6871580527927
+ 31
+0.0
+  0
+INSERT
+  5
+1D6
+330
+1D1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+11994.974746830583
+ 20
+5.025253169416828
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+225.0
+  0
+INSERT
+  5
+1D8
+330
+1D1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+14994.974746830583
+ 20
+3005.025253169417
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+45.0
+  0
+LINE
+  5
+1DA
+330
+1D1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+12119.425540319415
+ 20
+129.47604665824917
+ 30
+0.0
+ 11
+14870.523953341752
+ 21
+2880.5744596805844
+ 31
+0.0
+  0
+MTEXT
+  5
+1DB
+330
+1D1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+13370.523953341752
+ 20
+1629.4760466582493
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+4243
+  7
+ARCH-TEXT
+ 50
+45.0
+  0
+POINT
+  5
+1DC
+330
+1D1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11994.974746830583
+ 20
+5.025253169416828
+ 30
+0.0
+  0
+POINT
+  5
+1DD
+330
+1D1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1DE
+330
+1D1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14500.0
+ 20
+3500.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1D3
+330
+1D1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1E2
+330
+1E1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D9
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D9
+  1
+
+  0
+LINE
+  5
+1E4
+330
+1E1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+11676.0
+ 20
+500.0
+ 30
+0.0
+ 11
+12456.621125123533
+ 21
+500.0
+ 31
+0.0
+  0
+LINE
+  5
+1E5
+330
+1E1
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+11624.450793488832
+ 20
+624.4507934888323
+ 30
+0.0
+ 11
+12176.433284601155
+ 21
+1176.4332846011544
+ 31
+0.0
+  0
+INSERT
+  5
+1E6
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+12324.621125123533
+ 20
+500.0
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+443.88564221369427
+  0
+INSERT
+  5
+1E8
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+12083.09518948453
+ 20
+1083.0951894845302
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+321.11435778630573
+  0
+MTEXT
+  5
+1EA
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+12546.405475591537
+ 20
+933.4353397314832
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+45°
+  7
+ARCH-TEXT
+ 50
+-67.5
+  0
+ARC
+  5
+1EB
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 40
+824.6211251235321
+100
+AcDbArc
+ 50
+0.0
+ 51
+45.0
+  0
+ARC
+  5
+1EC
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 40
+824.6211251235321
+100
+AcDbArc
+ 50
+-24.45743114522284
+ 51
+-12.22871557261142
+  0
+ARC
+  5
+1ED
+330
+1E1
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbCircle
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 40
+824.6211251235321
+100
+AcDbArc
+ 50
+57.22871557261142
+ 51
+69.45743114522284
+  0
+POINT
+  5
+1EE
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1EF
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1F0
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+14500.0
+ 20
+3500.0
+ 30
+0.0
+  0
+POINT
+  5
+1F1
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+  0
+POINT
+  5
+1F2
+330
+1E1
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+12300.0
+ 20
+700.0
+ 30
+0.0
+  0
+ENDBLK
+  5
+1E3
+330
+1E1
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1F5
+330
+1F4
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*D10
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*D10
+  1
+
+  0
+INSERT
+  5
+1F7
+330
+1F4
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+3
+100
+AcDbBlockReference
+  2
+_CLOSEDFILLED
+ 10
+6911.396103067893
+ 20
+2336.396103067893
+ 30
+0.0
+ 41
+176.0
+ 42
+176.0
+ 50
+225.0
+  0
+LINE
+  5
+1F9
+330
+1F4
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+ 11
+6911.396103067893
+ 21
+2336.396103067893
+ 31
+0.0
+  0
+LINE
+  5
+1FA
+330
+1F4
+100
+AcDbEntity
+  8
+0
+ 62
+3
+100
+AcDbLine
+ 10
+7035.846896556725
+ 20
+2460.8468965567254
+ 30
+0.0
+ 11
+7704.7699115591995
+ 21
+3129.7699115591995
+ 31
+0.0
+  0
+MTEXT
+  5
+1FB
+330
+1F4
+100
+AcDbEntity
+  8
+A-DIMS
+ 62
+2
+100
+AcDbMText
+ 10
+7269.192134348285
+ 20
+2943.093721325951
+ 30
+0.0
+ 40
+220.0
+ 71
+5
+  1
+R900
+  7
+ARCH-TEXT
+ 50
+45.0
+  0
+POINT
+  5
+1FC
+330
+1F4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+  0
+POINT
+  5
+1FD
+330
+1F4
+100
+AcDbEntity
+  8
+Defpoints
+100
+AcDbPoint
+ 10
+6911.396103067893
+ 20
+2336.396103067893
+ 30
+0.0
+  0
+ENDBLK
+  5
+1F6
+330
+1F4
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+207
+330
+206
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space0
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space0
+  1
+
+  0
+VIEWPORT
+  5
+20A
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+VIEWPORTS
+100
+AcDbViewport
+ 10
+200.0
+ 20
+138.5
+ 30
+0.0
+ 40
+462.00000000000006
+ 41
+326.70000000000005
+ 68
+1
+ 69
+1
+ 12
+200.0
+ 22
+138.5
+ 13
+0.0
+ 23
+0.0
+ 14
+10.0
+ 24
+10.0
+ 15
+10.0
+ 25
+10.0
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+326.70000000000005
+ 50
+0.0
+ 51
+0.0
+ 72
+100
+ 90
+557088
+  1
+
+281
+0
+ 71
+0
+ 74
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+282
+0
+  0
+LWPOLYLINE
+  5
+20B
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+10.0
+ 20
+10.0
+ 10
+410.0
+ 20
+10.0
+ 10
+410.0
+ 20
+287.0
+ 10
+10.0
+ 20
+287.0
+  0
+LWPOLYLINE
+  5
+20C
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+5.0
+ 20
+5.0
+ 10
+415.0
+ 20
+5.0
+ 10
+415.0
+ 20
+292.0
+ 10
+5.0
+ 20
+292.0
+  0
+LWPOLYLINE
+  5
+20D
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+260.0
+ 20
+10.0
+ 10
+410.0
+ 20
+10.0
+ 10
+410.0
+ 20
+60.0
+ 10
+260.0
+ 20
+60.0
+  0
+LINE
+  5
+20E
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbLine
+ 10
+260.0
+ 20
+35.0
+ 30
+0.0
+ 11
+410.0
+ 21
+35.0
+ 31
+0.0
+  0
+LINE
+  5
+20F
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbLine
+ 10
+335.0
+ 20
+10.0
+ 30
+0.0
+ 11
+335.0
+ 21
+35.0
+ 31
+0.0
+  0
+TEXT
+  5
+210
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbText
+ 10
+265.0
+ 20
+45.0
+ 30
+0.0
+ 40
+7.0
+  1
+HOUSE, GROUND FLOOR
+  7
+ARCH-TITLE
+ 11
+265.0
+ 21
+45.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+211
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbText
+ 10
+265.0
+ 20
+18.0
+ 30
+0.0
+ 40
+4.0
+  1
+Scale 1:50
+  7
+ARCH-TEXT
+ 11
+265.0
+ 21
+18.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+212
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-SHEET
+100
+AcDbText
+ 10
+340.0
+ 20
+18.0
+ 30
+0.0
+ 40
+4.0
+  1
+Sheet A-101
+  7
+ARCH-TEXT
+ 11
+340.0
+ 21
+18.0
+ 31
+0.0
+100
+AcDbText
+  0
+VIEWPORT
+  5
+213
+330
+206
+100
+AcDbEntity
+ 67
+1
+  8
+A-VPORT
+100
+AcDbViewport
+ 10
+135.0
+ 20
+160.0
+ 30
+0.0
+ 40
+250.0
+ 41
+200.0
+ 68
+1
+ 69
+3
+ 12
+5000.0
+ 22
+3400.0
+ 13
+0.0
+ 23
+0.0
+ 14
+10.0
+ 24
+10.0
+ 15
+10.0
+ 25
+10.0
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 45
+10000.0
+ 50
+0.0
+ 51
+0.0
+ 72
+100
+ 90
+0
+  1
+
+281
+0
+ 71
+0
+ 74
+0
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+282
+0
+  0
+ENDBLK
+  5
+208
+330
+206
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+HATCH
+  5
+A0
+330
+17
+100
+AcDbEntity
+  8
+A-SLAB
+ 62
+254
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+0.0
+ 10
+10000.0
+ 20
+8000.0
+ 10
+0.0
+ 20
+8000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+-150.0
+ 10
+0.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+150.0
+ 10
+1400.0
+ 20
+-150.0
+ 10
+0.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+2900.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+-150.0
+ 10
+2900.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+2900.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+150.0
+ 10
+3600.0
+ 20
+-150.0
+ 10
+2900.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+4500.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+-150.0
+ 10
+4500.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+4500.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+150.0
+ 10
+6200.0
+ 20
+-150.0
+ 10
+4500.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+7100.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+-150.0
+ 10
+7100.0
+ 20
+-150.0
+  0
+HATCH
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+7100.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+150.0
+ 10
+8200.0
+ 20
+-150.0
+ 10
+7100.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+A9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9400.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+-150.0
+ 10
+9400.0
+ 20
+-150.0
+  0
+HATCH
+  5
+AA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9400.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+150.0
+ 10
+10000.0
+ 20
+-150.0
+ 10
+9400.0
+ 20
+-150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+AB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+1400.0
+ 20
+150.0
+ 30
+0.0
+ 11
+1400.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+2900.0
+ 20
+150.0
+ 30
+0.0
+ 11
+2900.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3600.0
+ 20
+150.0
+ 30
+0.0
+ 11
+3600.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+4500.0
+ 20
+150.0
+ 30
+0.0
+ 11
+4500.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+AF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6200.0
+ 20
+150.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+B0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+7100.0
+ 20
+150.0
+ 30
+0.0
+ 11
+7100.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+B1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8200.0
+ 20
+150.0
+ 30
+0.0
+ 11
+8200.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LINE
+  5
+B2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9400.0
+ 20
+150.0
+ 30
+0.0
+ 11
+9400.0
+ 21
+-150.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+B3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9850.0
+ 20
+0.0
+ 10
+9850.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+0.0
+  0
+HATCH
+  5
+B4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9850.0
+ 20
+0.0
+ 10
+9850.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+1500.0
+ 10
+10150.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9850.0
+ 20
+2800.0
+ 10
+9850.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+2800.0
+  0
+HATCH
+  5
+B6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9850.0
+ 20
+2800.0
+ 10
+9850.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+4800.0
+ 10
+10150.0
+ 20
+2800.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+B7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+9850.0
+ 20
+6100.0
+ 10
+9850.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+6100.0
+  0
+HATCH
+  5
+B8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+9850.0
+ 20
+6100.0
+ 10
+9850.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+8000.0
+ 10
+10150.0
+ 20
+6100.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+B9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+1500.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+1500.0
+ 31
+0.0
+  0
+LINE
+  5
+BA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+2800.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+2800.0
+ 31
+0.0
+  0
+LINE
+  5
+BB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+4800.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+4800.0
+ 31
+0.0
+  0
+LINE
+  5
+BC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+9850.0
+ 20
+6100.0
+ 30
+0.0
+ 11
+10150.0
+ 21
+6100.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+BD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+10000.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+8150.0
+ 10
+10000.0
+ 20
+8150.0
+  0
+HATCH
+  5
+BE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+10000.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+7850.0
+ 10
+8800.0
+ 20
+8150.0
+ 10
+10000.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+7400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+8150.0
+ 10
+7400.0
+ 20
+8150.0
+  0
+HATCH
+  5
+C0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+7400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+7850.0
+ 10
+6400.0
+ 20
+8150.0
+ 10
+7400.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+4800.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+8150.0
+ 10
+4800.0
+ 20
+8150.0
+  0
+HATCH
+  5
+C2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+4800.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+7850.0
+ 10
+3400.0
+ 20
+8150.0
+ 10
+4800.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+C3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+2200.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+8150.0
+ 10
+2200.0
+ 20
+8150.0
+  0
+HATCH
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+2200.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+7850.0
+ 10
+0.0
+ 20
+8150.0
+ 10
+2200.0
+ 20
+8150.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+C5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8800.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+8800.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+7400.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6400.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+6400.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+4800.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+4800.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+C9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3400.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+3400.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LINE
+  5
+CA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+2200.0
+ 20
+7850.0
+ 30
+0.0
+ 11
+2200.0
+ 21
+8150.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+CB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+8000.0
+ 10
+150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+8000.0
+  0
+HATCH
+  5
+CC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+8000.0
+ 10
+150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+6400.0
+ 10
+-150.0
+ 20
+8000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+CD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+5000.0
+ 10
+150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+5000.0
+  0
+HATCH
+  5
+CE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+5000.0
+ 10
+150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+3000.0
+ 10
+-150.0
+ 20
+5000.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+CF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+1600.0
+ 10
+150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+1600.0
+  0
+HATCH
+  5
+D0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+1600.0
+ 10
+150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+0.0
+ 10
+-150.0
+ 20
+1600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+D1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+6400.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+6400.0
+ 31
+0.0
+  0
+LINE
+  5
+D2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+5000.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+5000.0
+ 31
+0.0
+  0
+LINE
+  5
+D3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+3000.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+3000.0
+ 31
+0.0
+  0
+LINE
+  5
+D4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+150.0
+ 20
+1600.0
+ 30
+0.0
+ 11
+-150.0
+ 21
+1600.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+D5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4125.0
+ 10
+0.0
+ 20
+4125.0
+  0
+HATCH
+  5
+D6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4275.0
+ 10
+600.0
+ 20
+4125.0
+ 10
+0.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4125.0
+ 10
+1500.0
+ 20
+4125.0
+  0
+HATCH
+  5
+D8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+1500.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4275.0
+ 10
+2700.0
+ 20
+4125.0
+ 10
+1500.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+D9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3600.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4125.0
+ 10
+3600.0
+ 20
+4125.0
+  0
+HATCH
+  5
+DA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3600.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4275.0
+ 10
+4800.0
+ 20
+4125.0
+ 10
+3600.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+DB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+5700.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4125.0
+ 10
+5700.0
+ 20
+4125.0
+  0
+HATCH
+  5
+DC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+5700.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4275.0
+ 10
+6200.0
+ 20
+4125.0
+ 10
+5700.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+DD
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+600.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+600.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+DE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+1500.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+1500.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+DF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+2700.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+2700.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+E0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3600.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+3600.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+E1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+4800.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+4800.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LINE
+  5
+E2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+5700.0
+ 20
+4275.0
+ 30
+0.0
+ 11
+5700.0
+ 21
+4125.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+E3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+0.0
+ 10
+6125.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+0.0
+  0
+HATCH
+  5
+E4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+0.0
+ 10
+6125.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+1700.0
+ 10
+6275.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+E5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+2600.0
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+2600.0
+  0
+HATCH
+  5
+E6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+2600.0
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+4200.0
+ 10
+6275.0
+ 20
+2600.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+E7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+1700.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+1700.0
+ 31
+0.0
+  0
+LINE
+  5
+E8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+2600.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+2600.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+E9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6125.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+4200.0
+  0
+HATCH
+  5
+EA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+4200.0
+ 10
+6125.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+6300.0
+ 10
+6275.0
+ 20
+4200.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+EB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6125.0
+ 20
+7200.0
+ 10
+6125.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+7200.0
+  0
+HATCH
+  5
+EC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6125.0
+ 20
+7200.0
+ 10
+6125.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+8000.0
+ 10
+6275.0
+ 20
+7200.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+ED
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+6300.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+6300.0
+ 31
+0.0
+  0
+LINE
+  5
+EE
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+6125.0
+ 20
+7200.0
+ 30
+0.0
+ 11
+6275.0
+ 21
+7200.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+EF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3425.0
+ 20
+0.0
+ 10
+3425.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+0.0
+  0
+HATCH
+  5
+F0
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3425.0
+ 20
+0.0
+ 10
+3425.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+2400.0
+ 10
+3575.0
+ 20
+0.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F1
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+3425.0
+ 20
+3300.0
+ 10
+3425.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+3300.0
+  0
+HATCH
+  5
+F2
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+3425.0
+ 20
+3300.0
+ 10
+3425.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+4200.0
+ 10
+3575.0
+ 20
+3300.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+F3
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3425.0
+ 20
+2400.0
+ 30
+0.0
+ 11
+3575.0
+ 21
+2400.0
+ 31
+0.0
+  0
+LINE
+  5
+F4
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+3425.0
+ 20
+3300.0
+ 30
+0.0
+ 11
+3575.0
+ 21
+3300.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+F5
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6200.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4125.0
+ 10
+6200.0
+ 20
+4125.0
+  0
+HATCH
+  5
+F6
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+6200.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4275.0
+ 10
+10000.0
+ 20
+4125.0
+ 10
+6200.0
+ 20
+4125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F7
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8125.0
+ 20
+4200.0
+ 10
+8125.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+4200.0
+  0
+HATCH
+  5
+F8
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+8125.0
+ 20
+4200.0
+ 10
+8125.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+5800.0
+ 10
+8275.0
+ 20
+4200.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+F9
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+8125.0
+ 20
+6700.0
+ 10
+8125.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+6700.0
+  0
+HATCH
+  5
+FA
+330
+17
+100
+AcDbEntity
+  8
+A-WALL-PAT
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+8125.0
+ 20
+6700.0
+ 10
+8125.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+8000.0
+ 10
+8275.0
+ 20
+6700.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+40.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-89.802561212
+ 46
+89.802561212
+ 79
+0
+ 98
+0
+  0
+LINE
+  5
+FB
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8125.0
+ 20
+5800.0
+ 30
+0.0
+ 11
+8275.0
+ 21
+5800.0
+ 31
+0.0
+  0
+LINE
+  5
+FC
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+100
+AcDbLine
+ 10
+8125.0
+ 20
+6700.0
+ 30
+0.0
+ 11
+8275.0
+ 21
+6700.0
+ 31
+0.0
+  0
+INSERT
+  5
+FD
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+1700.0
+ 20
+150.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+FF
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+2050.0
+ 20
+-180.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-101
+ 11
+2050.0
+ 21
+-180.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+2050.0
+ 21
+-180.0
+ 31
+0.0
+  0
+SEQEND
+  5
+FE
+330
+FD
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+100
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+ 50
+90.0
+  0
+ATTRIB
+  5
+102
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+6605.0
+ 20
+2050.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-102
+ 50
+90.0
+ 11
+6605.0
+ 21
+2050.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+6605.0
+ 21
+2050.0
+ 31
+0.0
+  0
+SEQEND
+  5
+101
+330
+100
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+103
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+3575.0
+ 20
+2400.0
+ 30
+0.0
+ 50
+90.0
+  0
+ATTRIB
+  5
+105
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+3905.0
+ 20
+2750.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-103
+ 50
+90.0
+ 11
+3905.0
+ 21
+2750.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+3905.0
+ 21
+2750.0
+ 31
+0.0
+  0
+SEQEND
+  5
+104
+330
+103
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+106
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+700.0
+ 20
+4275.0
+ 30
+0.0
+ 42
+-1.0
+  0
+ATTRIB
+  5
+108
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+-1050.0
+ 20
+4605.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-104
+ 50
+180.0
+ 11
+-1050.0
+ 21
+4605.0
+ 31
+0.0
+210
+0.0
+220
+0.0
+230
+-1.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-1050.0
+ 21
+4605.0
+ 31
+0.0
+  0
+SEQEND
+  5
+107
+330
+106
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+109
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+2800.0
+ 20
+4275.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+10B
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+3150.0
+ 20
+3945.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-105
+ 11
+3150.0
+ 21
+3945.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+3150.0
+ 21
+3945.0
+ 31
+0.0
+  0
+SEQEND
+  5
+10A
+330
+109
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+10C
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+4900.0
+ 20
+4275.0
+ 30
+0.0
+ 42
+-1.0
+  0
+ATTRIB
+  5
+10E
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+-5250.0
+ 20
+4605.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-106
+ 50
+180.0
+ 11
+-5250.0
+ 21
+4605.0
+ 31
+0.0
+210
+0.0
+220
+0.0
+230
+-1.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-5250.0
+ 21
+4605.0
+ 31
+0.0
+  0
+SEQEND
+  5
+10D
+330
+10C
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+10F
+330
+17
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbBlockReference
+ 66
+1
+  2
+DOOR
+ 10
+8275.0
+ 20
+5800.0
+ 30
+0.0
+ 50
+90.0
+  0
+ATTRIB
+  5
+111
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+8605.0
+ 20
+6150.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-107
+ 50
+90.0
+ 11
+8605.0
+ 21
+6150.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+8605.0
+ 21
+6150.0
+ 31
+0.0
+  0
+SEQEND
+  5
+110
+330
+10F
+100
+AcDbEntity
+  8
+A-DOOR
+  0
+INSERT
+  5
+112
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+3600.0
+ 20
+-150.0
+ 30
+0.0
+ 41
+900.0
+ 42
+300.0
+  0
+INSERT
+  5
+114
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+6200.0
+ 20
+-150.0
+ 30
+0.0
+ 41
+900.0
+ 42
+300.0
+  0
+INSERT
+  5
+116
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+8200.0
+ 20
+-150.0
+ 30
+0.0
+ 41
+1200.0
+ 42
+300.0
+  0
+INSERT
+  5
+118
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+10150.0
+ 20
+4800.0
+ 30
+0.0
+ 41
+1300.0
+ 42
+300.0
+ 50
+90.0
+  0
+INSERT
+  5
+11A
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+1200.0
+ 20
+7850.0
+ 30
+0.0
+ 41
+1400.0
+ 42
+300.0
+  0
+INSERT
+  5
+11C
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+3600.0
+ 20
+7850.0
+ 30
+0.0
+ 41
+1600.0
+ 42
+300.0
+  0
+INSERT
+  5
+11E
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+6600.0
+ 20
+7850.0
+ 30
+0.0
+ 41
+1200.0
+ 42
+300.0
+  0
+INSERT
+  5
+120
+330
+17
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbBlockReference
+  2
+WINDOW
+ 10
+150.0
+ 20
+5000.0
+ 30
+0.0
+ 41
+1400.0
+ 42
+300.0
+ 50
+90.0
+  0
+INSERT
+  5
+122
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+SOFA
+ 10
+1200.0
+ 20
+6900.0
+ 30
+0.0
+  0
+INSERT
+  5
+124
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+TABLE
+ 10
+3900.0
+ 20
+5300.0
+ 30
+0.0
+  0
+INSERT
+  5
+126
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+BED
+ 10
+4300.0
+ 20
+400.0
+ 30
+0.0
+  0
+INSERT
+  5
+128
+330
+17
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbBlockReference
+  2
+BED
+ 10
+500.0
+ 20
+600.0
+ 30
+0.0
+ 41
+0.8
+ 42
+0.9
+  0
+INSERT
+  5
+12A
+330
+17
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbBlockReference
+  2
+BATH
+ 10
+6800.0
+ 20
+300.0
+ 30
+0.0
+  0
+INSERT
+  5
+12C
+330
+17
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbBlockReference
+  2
+WC
+ 10
+8300.0
+ 20
+3200.0
+ 30
+0.0
+ 50
+90.0
+  0
+INSERT
+  5
+12E
+330
+17
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbBlockReference
+  2
+SINK
+ 10
+6500.0
+ 20
+3350.0
+ 30
+0.0
+  0
+LINE
+  5
+130
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+4400.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+4400.0
+ 31
+0.0
+  0
+LINE
+  5
+131
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+4680.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+4680.0
+ 31
+0.0
+  0
+LINE
+  5
+132
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+4960.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+4960.0
+ 31
+0.0
+  0
+LINE
+  5
+133
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+5240.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+5240.0
+ 31
+0.0
+  0
+LINE
+  5
+134
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+5520.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+5520.0
+ 31
+0.0
+  0
+LINE
+  5
+135
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+5800.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+5800.0
+ 31
+0.0
+  0
+LINE
+  5
+136
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6080.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6080.0
+ 31
+0.0
+  0
+LINE
+  5
+137
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6360.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6360.0
+ 31
+0.0
+  0
+LINE
+  5
+138
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6640.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6640.0
+ 31
+0.0
+  0
+LINE
+  5
+139
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+6920.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+6920.0
+ 31
+0.0
+  0
+LINE
+  5
+13A
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+7200.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+7200.0
+ 31
+0.0
+  0
+LINE
+  5
+13B
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLine
+ 10
+6400.0
+ 20
+7480.0
+ 30
+0.0
+ 11
+7400.0
+ 21
+7480.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+13C
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+6400.0
+ 20
+4400.0
+ 10
+7400.0
+ 20
+4400.0
+ 10
+7400.0
+ 20
+7760.0
+ 10
+6400.0
+ 20
+7760.0
+  0
+LWPOLYLINE
+  5
+13D
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+6900.0
+ 20
+4500.0
+ 10
+6900.0
+ 20
+7700.0
+  0
+LEADER
+  5
+13E
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbLeader
+  3
+Standard
+ 73
+3
+ 76
+3
+ 10
+6900.0
+ 20
+7700.0
+ 30
+0.0
+ 10
+6820.0
+ 20
+7400.0
+ 30
+0.0
+ 10
+6980.0
+ 20
+7400.0
+ 30
+0.0
+  0
+TEXT
+  5
+13F
+330
+17
+100
+AcDbEntity
+  8
+A-STAIR
+100
+AcDbText
+ 10
+6950.0
+ 20
+4600.0
+ 30
+0.0
+ 40
+150.0
+  1
+UP
+  7
+ARCH-TEXT
+ 11
+6950.0
+ 21
+4600.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+140
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+0.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+0.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+141
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+0.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+143
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+0.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+1
+ 72
+4
+ 11
+0.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+0.0
+ 21
+-2000.0
+ 31
+0.0
+  0
+SEQEND
+  5
+142
+330
+141
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+144
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+3500.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+3500.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+145
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+3500.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+147
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+3500.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+2
+ 72
+4
+ 11
+3500.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+3500.0
+ 21
+-2000.0
+ 31
+0.0
+  0
+SEQEND
+  5
+146
+330
+145
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+148
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+6200.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+6200.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+149
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+6200.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+14B
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+6200.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+3
+ 72
+4
+ 11
+6200.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+6200.0
+ 21
+-2000.0
+ 31
+0.0
+  0
+SEQEND
+  5
+14A
+330
+149
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+14C
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+10000.0
+ 20
+-1700.0
+ 30
+0.0
+ 11
+10000.0
+ 21
+9200.0
+ 31
+0.0
+  0
+INSERT
+  5
+14D
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+10000.0
+ 20
+-2000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+14F
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+10000.0
+ 20
+-2000.0
+ 30
+0.0
+ 40
+300.0
+  1
+4
+ 72
+4
+ 11
+10000.0
+ 21
+-2000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+10000.0
+ 21
+-2000.0
+ 31
+0.0
+  0
+SEQEND
+  5
+14E
+330
+14D
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+150
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+-1700.0
+ 20
+0.0
+ 30
+0.0
+ 11
+11200.0
+ 21
+0.0
+ 31
+0.0
+  0
+INSERT
+  5
+151
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+-2000.0
+ 20
+0.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+153
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+-2000.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  1
+A
+ 72
+4
+ 11
+-2000.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-2000.0
+ 21
+0.0
+ 31
+0.0
+  0
+SEQEND
+  5
+152
+330
+151
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+154
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+-1700.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+11200.0
+ 21
+4200.0
+ 31
+0.0
+  0
+INSERT
+  5
+155
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+-2000.0
+ 20
+4200.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+157
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+-2000.0
+ 20
+4200.0
+ 30
+0.0
+ 40
+300.0
+  1
+B
+ 72
+4
+ 11
+-2000.0
+ 21
+4200.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-2000.0
+ 21
+4200.0
+ 31
+0.0
+  0
+SEQEND
+  5
+156
+330
+155
+100
+AcDbEntity
+  8
+A-GRID
+  0
+LINE
+  5
+158
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+-1700.0
+ 20
+8000.0
+ 30
+0.0
+ 11
+11200.0
+ 21
+8000.0
+ 31
+0.0
+  0
+INSERT
+  5
+159
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbBlockReference
+ 66
+1
+  2
+AXIS
+ 10
+-2000.0
+ 20
+8000.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+15B
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+-2000.0
+ 20
+8000.0
+ 30
+0.0
+ 40
+300.0
+  1
+C
+ 72
+4
+ 11
+-2000.0
+ 21
+8000.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+-2000.0
+ 21
+8000.0
+ 31
+0.0
+  0
+SEQEND
+  5
+15A
+330
+159
+100
+AcDbEntity
+  8
+A-GRID
+  0
+MTEXT
+  5
+15C
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+1750.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;BEDROOM 1\P\fArial|b0;14.7 m²
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+15D
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+4850.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;BEDROOM 2\P\fArial|b0;11.3 m²
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+15E
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+7500.0
+ 20
+2100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;BATH\P\fArial|b0;16.0 m²
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+15F
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+3100.0
+ 20
+6100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;LIVING ROOM\P\fArial|b0;23.6 m²
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+160
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+7150.0
+ 20
+6100.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;KITCHEN\P\fArial|b0;14.4 m²
+  7
+ARCH-TEXT
+  0
+MTEXT
+  5
+161
+330
+17
+100
+AcDbEntity
+  8
+A-AREA
+100
+AcDbMText
+ 10
+1500.0
+ 20
+4650.0
+ 30
+0.0
+ 40
+260.0
+ 41
+2600.0
+ 71
+5
+  1
+\fArial|b1;HALL
+  7
+ARCH-TEXT
+  0
+DIMENSION
+  5
+162
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D1
+  3
+PLAN50
+ 10
+0.0
+ 20
+-3100.0
+ 30
+0.0
+ 11
+5000.0
+ 21
+-2924.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+10000.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+175
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D2
+  3
+PLAN50
+ 10
+0.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+1750.0
+ 21
+-2424.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+3500.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+184
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D3
+  3
+PLAN50
+ 10
+3500.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+4850.0
+ 21
+-2424.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+3500.0
+ 23
+0.0
+ 33
+0.0
+ 14
+6200.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+193
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D4
+  3
+PLAN50
+ 10
+6200.0
+ 20
+-2600.0
+ 30
+0.0
+ 11
+8100.0
+ 21
+-2424.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+6200.0
+ 23
+0.0
+ 33
+0.0
+ 14
+10000.0
+ 24
+0.0
+ 34
+0.0
+ 50
+0.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1A2
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D5
+  3
+PLAN50
+ 10
+-3100.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-3276.0
+ 21
+4000.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+8000.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1B1
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D6
+  3
+PLAN50
+ 10
+-2600.0
+ 20
+0.0
+ 30
+0.0
+ 11
+-2776.0
+ 21
+2100.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 14
+0.0
+ 24
+4200.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+DIMENSION
+  5
+1C0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D7
+  3
+PLAN50
+ 10
+-2600.0
+ 20
+4200.0
+ 30
+0.0
+ 11
+-2776.0
+ 21
+6100.0
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+0.0
+ 23
+4200.0
+ 33
+0.0
+ 14
+0.0
+ 24
+8000.0
+ 34
+0.0
+ 50
+90.0
+100
+AcDbRotatedDimension
+  0
+LWPOLYLINE
+  5
+1CF
+330
+17
+100
+AcDbEntity
+  8
+A-WALL
+  6
+DASHED
+100
+AcDbPolyline
+ 90
+2
+ 70
+0
+ 10
+11500.0
+ 20
+500.0
+ 10
+14500.0
+ 20
+3500.0
+  0
+DIMENSION
+  5
+1D0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D8
+  3
+PLAN50
+ 10
+11994.974746830583
+ 20
+5.025253169416828
+ 30
+0.0
+ 11
+13370.523953341752
+ 21
+1629.4760466582493
+ 31
+0.0
+ 70
+32
+ 71
+5
+  1
+<>
+100
+AcDbAlignedDimension
+ 13
+11500.0
+ 23
+500.0
+ 33
+0.0
+ 14
+14500.0
+ 24
+3500.0
+ 34
+0.0
+ 50
+45.0
+100
+AcDbRotatedDimension
+  0
+LINE
+  5
+1DF
+330
+17
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbLine
+ 10
+11500.0
+ 20
+500.0
+ 30
+0.0
+ 11
+14500.0
+ 21
+500.0
+ 31
+0.0
+  0
+DIMENSION
+  5
+1E0
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D9
+  3
+PLAN50
+ 10
+14500.0
+ 20
+500.0
+ 30
+0.0
+ 11
+12546.405475591537
+ 21
+933.4353397314832
+ 31
+0.0
+ 70
+34
+ 71
+5
+  1
+<>
+100
+AcDb2LineAngularDimension
+ 13
+11500.0
+ 23
+500.0
+ 33
+0.0
+ 14
+14500.0
+ 24
+3500.0
+ 34
+0.0
+ 15
+11500.0
+ 25
+500.0
+ 35
+0.0
+ 16
+12300.0
+ 26
+700.0
+ 36
+0.0
+  0
+DIMENSION
+  5
+1F3
+330
+17
+100
+AcDbEntity
+  8
+A-DIMS
+100
+AcDbDimension
+280
+0
+  2
+*D10
+  3
+PLAN50
+ 10
+6275.0
+ 20
+1700.0
+ 30
+0.0
+ 11
+7269.192134348285
+ 21
+2943.093721325951
+ 31
+0.0
+ 70
+36
+ 71
+5
+  1
+<>
+100
+AcDbRadialDimension
+ 15
+6911.396103067893
+ 25
+2336.396103067893
+ 35
+0.0
+  0
+INSERT
+  5
+1FE
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+  2
+NORTH
+ 10
+12200.0
+ 20
+8700.0
+ 30
+0.0
+  0
+INSERT
+  5
+200
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbBlockReference
+ 66
+1
+  2
+LEVEL
+ 10
+5000.0
+ 20
+3400.0
+ 30
+0.0
+  0
+ATTRIB
+  5
+202
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+5320.0
+ 20
+3690.0
+ 30
+0.0
+ 40
+120.0
+  1
+±0.00
+ 11
+5320.0
+ 21
+3690.0
+ 31
+0.0
+100
+AcDbAttribute
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+5320.0
+ 21
+3690.0
+ 31
+0.0
+  0
+SEQEND
+  5
+201
+330
+200
+100
+AcDbEntity
+  8
+A-ANNO
+  0
+TEXT
+  5
+203
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+-4700.0
+ 30
+0.0
+ 40
+330.0
+  1
+GROUND FLOOR PLAN  1:50
+  7
+ARCH-TITLE
+ 11
+0.0
+ 21
+-4700.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+204
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+370
+70
+100
+AcDbLine
+ 10
+0.0
+ 20
+-4900.0
+ 30
+0.0
+ 11
+4500.0
+ 21
+-4900.0
+ 31
+0.0
+  0
+TEXT
+  5
+205
+330
+17
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+-5200.0
+ 30
+0.0
+ 40
+130.0
+  1
+Drawn for the exav demo. Dimensions in millimetres.
+  7
+ARCH-NOTE
+ 11
+0.0
+ 21
+-5200.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  3
+A3 Plan
+350
+209
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+217
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+LAYOUT
+  5
+209
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  2
+DWG to PDF.pc3
+  4
+ezdxf_(420.00_x_297.00_MM)
+  6
+
+ 40
+10.0
+ 41
+10.0
+ 42
+10.0
+ 43
+10.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+672
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+A3 Plan
+ 70
+1
+ 71
+3
+ 10
+-10.0
+ 20
+-10.0
+ 11
+410.0
+ 21
+287.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+206
+331
+20A
+  0
+DICTIONARYVAR
+  5
+217
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/legacy-r12.dxf b/crates/exav-viewer/demo/examples/files/cad/legacy-r12.dxf
new file mode 100644
index 00000000..c7210ca2
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/legacy-r12.dxf
@@ -0,0 +1,2602 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1009
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$DRAGMODE
+ 70
+2
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$OSMODE
+ 70
+20583
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$COORDS
+ 70
+1
+  9
+$ATTDIA
+ 70
+0
+  9
+$ATTREQ
+ 70
+1
+  9
+$HANDLING
+ 70
+1
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+A1
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+ 70
+1
+  0
+VPORT
+  5
+9E
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+10.0
+ 22
+-7.427997320830542
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+120.59879437374414
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+ 70
+3
+  0
+LTYPE
+  5
+24
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+ 70
+6
+  0
+LAYER
+  5
+27
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+  0
+LAYER
+  5
+28
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+  0
+LAYER
+  5
+2D
+  2
+GEAR
+ 70
+0
+ 62
+7
+  6
+Continuous
+  0
+LAYER
+  5
+2E
+  2
+AXES
+ 70
+0
+ 62
+1
+  6
+Continuous
+  0
+LAYER
+  5
+2F
+  2
+TEXT
+ 70
+0
+ 62
+2
+  6
+Continuous
+  0
+LAYER
+  5
+30
+  2
+DIMS
+ 70
+0
+ 62
+3
+  6
+Continuous
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+ 70
+1
+  0
+STYLE
+  5
+29
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+ 70
+3
+  0
+APPID
+  5
+2A
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+9F
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+A0
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+ 70
+1
+  0
+DIMSTYLE
+105
+2B
+  2
+Standard
+ 70
+0
+  3
+
+  4
+
+  5
+
+  6
+
+  7
+
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+  8
+0
+  2
+$Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+$Model_Space
+  1
+
+1001
+EZDXF
+1000
+CREATED_BY_EZDXF
+1000
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+1000
+WRITTEN_BY_EZDXF
+1000
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDBLK
+  5
+19
+  8
+0
+  0
+BLOCK
+  5
+1C
+  8
+0
+  2
+$Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+$Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+  8
+0
+  0
+BLOCK
+  5
+94
+  8
+0
+  2
+TAG
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+TAG
+  1
+
+  0
+CIRCLE
+  5
+96
+  8
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+5.0
+  0
+TEXT
+  5
+97
+  8
+0
+ 10
+-1.5
+ 20
+-2.0
+ 30
+0.0
+ 40
+5.0
+  1
+1
+ 11
+-1.5
+ 21
+-2.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+95
+  8
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+POLYLINE
+  5
+31
+  8
+GEAR
+ 66
+1
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 70
+1
+  0
+VERTEX
+  5
+33
+  8
+GEAR
+ 10
+33.0
+ 20
+0.0
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+34
+  8
+GEAR
+ 10
+39.921069137130864
+ 20
+2.511620781172535
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+35
+  8
+GEAR
+ 10
+39.404373046190955
+ 20
+6.877164011176382
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+36
+  8
+GEAR
+ 10
+32.088207373123325
+ 20
+7.703697007244878
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+37
+  8
+GEAR
+ 10
+31.384865037740067
+ 20
+10.197560814373263
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+38
+  8
+GEAR
+ 10
+37.19105943553006
+ 20
+14.724982107387117
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+39
+  8
+GEAR
+ 10
+35.350625203547736
+ 20
+18.717192570422934
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+3A
+  8
+GEAR
+ 10
+28.137125423685042
+ 20
+17.24245263562631
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+3B
+  8
+GEAR
+ 10
+26.697560814373265
+ 20
+19.396913325651614
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+3C
+  8
+GEAR
+ 10
+30.82052971103157
+ 20
+25.496959589947586
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+3D
+  8
+GEAR
+ 10
+27.83651186369257
+ 20
+28.725051910527554
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+3E
+  8
+GEAR
+ 10
+21.43178559489606
+ 20
+25.093396864801022
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+3F
+  8
+GEAR
+ 10
+19.396913325651614
+ 20
+26.697560814373265
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+40
+  8
+GEAR
+ 10
+21.433071799159862
+ 20
+33.773117020080605
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+41
+  8
+GEAR
+ 10
+17.59756679423661
+ 20
+35.92110303042462
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+42
+  8
+GEAR
+ 10
+12.628553268047964
+ 20
+30.48802457287246
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+43
+  8
+GEAR
+ 10
+10.197560814373265
+ 20
+31.384865037740067
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+44
+  8
+GEAR
+ 10
+9.947595486594189
+ 20
+38.74332644514524
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+45
+  8
+GEAR
+ 10
+5.636049277503313
+ 20
+39.6009463086623
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+46
+  8
+GEAR
+ 10
+2.589150159018885
+ 20
+32.89827201319322
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+47
+  8
+GEAR
+ 10
+2.0206672185931327e-15
+ 20
+33.0
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+48
+  8
+GEAR
+ 10
+-2.511620781172536
+ 20
+39.921069137130864
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+49
+  8
+GEAR
+ 10
+-6.877164011176376
+ 20
+39.40437304619096
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+4A
+  8
+GEAR
+ 10
+-7.703697007244876
+ 20
+32.08820737312333
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+4B
+  8
+GEAR
+ 10
+-10.197560814373261
+ 20
+31.38486503774007
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+4C
+  8
+GEAR
+ 10
+-14.724982107387119
+ 20
+37.19105943553005
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+4D
+  8
+GEAR
+ 10
+-18.71719257042293
+ 20
+35.350625203547736
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+4E
+  8
+GEAR
+ 10
+-17.24245263562631
+ 20
+28.137125423685045
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+4F
+  8
+GEAR
+ 10
+-19.39691332565161
+ 20
+26.697560814373265
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+50
+  8
+GEAR
+ 10
+-25.49695958994759
+ 20
+30.82052971103157
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+51
+  8
+GEAR
+ 10
+-28.725051910527547
+ 20
+27.83651186369258
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+52
+  8
+GEAR
+ 10
+-25.093396864801022
+ 20
+21.431785594896063
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+53
+  8
+GEAR
+ 10
+-26.69756081437326
+ 20
+19.396913325651617
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+54
+  8
+GEAR
+ 10
+-33.773117020080605
+ 20
+21.433071799159865
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+55
+  8
+GEAR
+ 10
+-35.92110303042462
+ 20
+17.597566794236613
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+56
+  8
+GEAR
+ 10
+-30.48802457287246
+ 20
+12.628553268047966
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+57
+  8
+GEAR
+ 10
+-31.384865037740067
+ 20
+10.197560814373269
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+58
+  8
+GEAR
+ 10
+-38.74332644514524
+ 20
+9.947595486594192
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+59
+  8
+GEAR
+ 10
+-39.6009463086623
+ 20
+5.636049277503314
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+5A
+  8
+GEAR
+ 10
+-32.89827201319322
+ 20
+2.5891501590188875
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+5B
+  8
+GEAR
+ 10
+-33.0
+ 20
+4.0413344371862654e-15
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+5C
+  8
+GEAR
+ 10
+-39.921069137130864
+ 20
+-2.511620781172534
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+5D
+  8
+GEAR
+ 10
+-39.40437304619096
+ 20
+-6.877164011176373
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+5E
+  8
+GEAR
+ 10
+-32.08820737312333
+ 20
+-7.703697007244874
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+5F
+  8
+GEAR
+ 10
+-31.384865037740074
+ 20
+-10.197560814373247
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+60
+  8
+GEAR
+ 10
+-37.191059435530065
+ 20
+-14.724982107387099
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+61
+  8
+GEAR
+ 10
+-35.35062520354775
+ 20
+-18.71719257042291
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+62
+  8
+GEAR
+ 10
+-28.137125423685053
+ 20
+-17.242452635626297
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+63
+  8
+GEAR
+ 10
+-26.69756081437327
+ 20
+-19.39691332565161
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+64
+  8
+GEAR
+ 10
+-30.82052971103157
+ 20
+-25.496959589947586
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+65
+  8
+GEAR
+ 10
+-27.836511863692582
+ 20
+-28.725051910527547
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+66
+  8
+GEAR
+ 10
+-21.431785594896077
+ 20
+-25.093396864801008
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+67
+  8
+GEAR
+ 10
+-19.396913325651617
+ 20
+-26.69756081437326
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+68
+  8
+GEAR
+ 10
+-21.433071799159883
+ 20
+-33.77311702008059
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+69
+  8
+GEAR
+ 10
+-17.597566794236613
+ 20
+-35.92110303042462
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+6A
+  8
+GEAR
+ 10
+-12.62855326804798
+ 20
+-30.488024572872455
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+6B
+  8
+GEAR
+ 10
+-10.19756081437327
+ 20
+-31.384865037740067
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+6C
+  8
+GEAR
+ 10
+-9.947595486594212
+ 20
+-38.743326445145236
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+6D
+  8
+GEAR
+ 10
+-5.636049277503316
+ 20
+-39.6009463086623
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+6E
+  8
+GEAR
+ 10
+-2.589150159018904
+ 20
+-32.89827201319322
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+6F
+  8
+GEAR
+ 10
+-6.062001655779398e-15
+ 20
+-33.0
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+70
+  8
+GEAR
+ 10
+2.511620781172513
+ 20
+-39.921069137130864
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+71
+  8
+GEAR
+ 10
+6.8771640111763706
+ 20
+-39.40437304619096
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+72
+  8
+GEAR
+ 10
+7.703697007244858
+ 20
+-32.08820737312333
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+73
+  8
+GEAR
+ 10
+10.197560814373258
+ 20
+-31.38486503774007
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+74
+  8
+GEAR
+ 10
+14.724982107387097
+ 20
+-37.191059435530065
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+75
+  8
+GEAR
+ 10
+18.717192570422924
+ 20
+-35.35062520354774
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+76
+  8
+GEAR
+ 10
+17.242452635626297
+ 20
+-28.137125423685053
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+77
+  8
+GEAR
+ 10
+19.396913325651607
+ 20
+-26.69756081437327
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+78
+  8
+GEAR
+ 10
+25.496959589947572
+ 20
+-30.820529711031583
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+79
+  8
+GEAR
+ 10
+28.725051910527544
+ 20
+-27.836511863692582
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+7A
+  8
+GEAR
+ 10
+25.093396864801004
+ 20
+-21.43178559489608
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+7B
+  8
+GEAR
+ 10
+26.69756081437326
+ 20
+-19.39691332565162
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+7C
+  8
+GEAR
+ 10
+33.77311702008059
+ 20
+-21.433071799159883
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+7D
+  8
+GEAR
+ 10
+35.92110303042462
+ 20
+-17.597566794236617
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+7E
+  8
+GEAR
+ 10
+30.488024572872455
+ 20
+-12.628553268047982
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+7F
+  8
+GEAR
+ 10
+31.384865037740067
+ 20
+-10.197560814373272
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+80
+  8
+GEAR
+ 10
+38.743326445145236
+ 20
+-9.947595486594214
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+81
+  8
+GEAR
+ 10
+39.6009463086623
+ 20
+-5.63604927750332
+ 30
+0.0
+ 70
+0
+  0
+VERTEX
+  5
+82
+  8
+GEAR
+ 10
+32.89827201319322
+ 20
+-2.5891501590189057
+ 30
+0.0
+ 70
+0
+  0
+SEQEND
+  5
+32
+  8
+GEAR
+  0
+CIRCLE
+  5
+83
+  8
+GEAR
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+10.0
+  0
+CIRCLE
+  5
+84
+  8
+GEAR
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+4.0
+  0
+CIRCLE
+  5
+85
+  8
+GEAR
+ 10
+20.0
+ 20
+0.0
+ 30
+0.0
+ 40
+4.0
+  0
+CIRCLE
+  5
+86
+  8
+GEAR
+ 10
+10.000000000000002
+ 20
+17.32050807568877
+ 30
+0.0
+ 40
+4.0
+  0
+CIRCLE
+  5
+87
+  8
+GEAR
+ 10
+-9.999999999999996
+ 20
+17.320508075688775
+ 30
+0.0
+ 40
+4.0
+  0
+CIRCLE
+  5
+88
+  8
+GEAR
+ 10
+-20.0
+ 20
+2.4492935982947065e-15
+ 30
+0.0
+ 40
+4.0
+  0
+CIRCLE
+  5
+89
+  8
+GEAR
+ 10
+-10.000000000000009
+ 20
+-17.320508075688767
+ 30
+0.0
+ 40
+4.0
+  0
+CIRCLE
+  5
+8A
+  8
+GEAR
+ 10
+10.000000000000002
+ 20
+-17.32050807568877
+ 30
+0.0
+ 40
+4.0
+  0
+LINE
+  5
+8B
+  8
+AXES
+ 10
+-50.0
+ 20
+0.0
+ 30
+0.0
+ 11
+50.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+8C
+  8
+AXES
+ 10
+0.0
+ 20
+-50.0
+ 30
+0.0
+ 11
+0.0
+ 21
+50.0
+ 31
+0.0
+  0
+ARC
+  5
+8D
+  8
+GEAR
+ 62
+4
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+30.0
+ 50
+30.0
+ 51
+150.0
+  0
+TEXT
+  5
+8E
+  8
+TEXT
+ 10
+-45.0
+ 20
+-58.0
+ 30
+0.0
+ 40
+4.0
+  1
+GEAR, 20 TEETH (R12 FILE)
+ 11
+-45.0
+ 21
+-58.0
+ 31
+0.0
+  0
+TEXT
+  5
+8F
+  8
+TEXT
+ 10
+-45.0
+ 20
+-64.0
+ 30
+0.0
+ 40
+3.0
+  1
+module 4, pitch diameter 80
+ 11
+-45.0
+ 21
+-64.0
+ 31
+0.0
+  0
+POINT
+  5
+90
+  8
+AXES
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  0
+SOLID
+  5
+91
+  8
+DIMS
+ 10
+55.0
+ 20
+40.0
+ 30
+0.0
+ 11
+65.0
+ 21
+40.0
+ 31
+0.0
+ 12
+55.0
+ 22
+46.0
+ 32
+0.0
+ 13
+65.0
+ 23
+46.0
+ 33
+0.0
+  0
+3DFACE
+  5
+92
+  8
+DIMS
+ 62
+5
+ 10
+55.0
+ 20
+-10.0
+ 30
+0.0
+ 11
+70.0
+ 21
+-10.0
+ 31
+0.0
+ 12
+70.0
+ 22
+5.0
+ 32
+0.0
+ 13
+55.0
+ 23
+5.0
+ 33
+0.0
+  0
+INSERT
+  5
+98
+  8
+DIMS
+  2
+TAG
+ 10
+60.0
+ 20
+20.0
+ 30
+0.0
+  0
+INSERT
+  5
+9A
+  8
+DIMS
+  2
+TAG
+ 10
+60.0
+ 20
+5.0
+ 30
+0.0
+ 41
+1.3
+ 42
+1.3
+  0
+INSERT
+  5
+9C
+  8
+DIMS
+  2
+TAG
+ 10
+60.0
+ 20
+-10.0
+ 30
+0.0
+ 41
+1.6
+ 42
+1.6
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/linetypes.dxf b/crates/exav-viewer/demo/examples/files/cad/linetypes.dxf
new file mode 100644
index 00000000..72ce2da6
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/linetypes.dxf
@@ -0,0 +1,7112 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+B3
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+AF
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+165.9919624916276
+ 22
+-187.56625834024877
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+398.08914251452245
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+25
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+42
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+EXAV_DASH3
+ 70
+0
+  3
+Dash and three dots
+ 72
+65
+ 73
+6
+ 40
+10.0
+ 49
+6.0
+ 74
+0
+ 49
+-3.0
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-3.0
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-3.0
+ 74
+0
+  0
+LTYPE
+  5
+43
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+GAS_LINE
+ 70
+0
+  3
+Gas line ---- GAS ----
+ 72
+65
+ 73
+3
+ 40
+0.0
+ 49
+5.0
+ 74
+0
+ 49
+-2.0
+ 74
+2
+ 75
+0
+340
+41
+ 46
+1.5
+ 50
+0.0
+ 44
+-1.0
+ 45
+-0.75
+  9
+GAS
+ 49
+-4.0
+ 74
+0
+  0
+LTYPE
+  5
+44
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+HOT_WATER
+ 70
+0
+  3
+Hot water ---- HW ----
+ 72
+65
+ 73
+3
+ 40
+0.0
+ 49
+6.0
+ 74
+0
+ 49
+-1.5
+ 74
+2
+ 75
+0
+340
+41
+ 46
+1.5
+ 50
+0.0
+ 44
+-1.0
+ 45
+-0.75
+  9
+HW
+ 49
+-3.0
+ 74
+0
+  0
+LTYPE
+  5
+45
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+FENCE
+ 70
+0
+  3
+Fence ---- x ----
+ 72
+65
+ 73
+3
+ 40
+0.0
+ 49
+4.0
+ 74
+0
+ 49
+-2.0
+ 74
+2
+ 75
+0
+340
+41
+ 46
+1.4
+ 50
+0.0
+ 44
+-0.5
+ 45
+-0.7
+  9
+x
+ 49
+-2.0
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+22
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+46
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-00
+ 70
+0
+ 62
+1
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+49
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-01
+ 70
+0
+ 62
+2
+  6
+DASHED
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+4C
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-02
+ 70
+0
+ 62
+3
+  6
+DASHED2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+4F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-03
+ 70
+0
+ 62
+4
+  6
+DASHEDX2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+52
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-04
+ 70
+0
+ 62
+5
+  6
+DASHED
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+55
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-05
+ 70
+0
+ 62
+6
+  6
+CENTER
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+58
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-06
+ 70
+0
+ 62
+7
+  6
+CENTER2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+5B
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-07
+ 70
+0
+ 62
+1
+  6
+CENTERX2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+5E
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-08
+ 70
+0
+ 62
+2
+  6
+PHANTOM
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+61
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-09
+ 70
+0
+ 62
+3
+  6
+PHANTOM2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+64
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-10
+ 70
+0
+ 62
+4
+  6
+DASHDOT
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+67
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-11
+ 70
+0
+ 62
+5
+  6
+DASHDOT2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+6A
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-12
+ 70
+0
+ 62
+6
+  6
+DOT
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+6D
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-13
+ 70
+0
+ 62
+7
+  6
+DOT2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+70
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-14
+ 70
+0
+ 62
+1
+  6
+DIVIDE
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+73
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-15
+ 70
+0
+ 62
+2
+  6
+DIVIDE2
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+76
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-16
+ 70
+0
+ 62
+3
+  6
+EXAV_DASH3
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+79
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-17
+ 70
+0
+ 62
+4
+  6
+GAS_LINE
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+7C
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-18
+ 70
+0
+ 62
+5
+  6
+HOT_WATER
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+7F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LT-19
+ 70
+0
+ 62
+6
+  6
+FENCE
+370
+25
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+41
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+LT-TEXT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+B0
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+B1
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+LINE
+  5
+47
+330
+17
+100
+AcDbEntity
+  8
+LT-00
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+220.0
+ 21
+0.0
+ 31
+0.0
+  0
+TEXT
+  5
+48
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-1.0
+ 30
+0.0
+ 40
+3.0
+  1
+Continuous
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-1.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+4A
+330
+17
+100
+AcDbEntity
+  8
+LT-01
+100
+AcDbLine
+ 10
+0.0
+ 20
+-8.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-8.0
+ 31
+0.0
+  0
+TEXT
+  5
+4B
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-9.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-9.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+4D
+330
+17
+100
+AcDbEntity
+  8
+LT-02
+100
+AcDbLine
+ 10
+0.0
+ 20
+-16.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-16.0
+ 31
+0.0
+  0
+TEXT
+  5
+4E
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-17.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-17.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+50
+330
+17
+100
+AcDbEntity
+  8
+LT-03
+100
+AcDbLine
+ 10
+0.0
+ 20
+-24.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-24.0
+ 31
+0.0
+  0
+TEXT
+  5
+51
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-25.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHEDX2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-25.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+53
+330
+17
+100
+AcDbEntity
+  8
+LT-04
+100
+AcDbLine
+ 10
+0.0
+ 20
+-32.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-32.0
+ 31
+0.0
+  0
+TEXT
+  5
+54
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-33.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-33.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+56
+330
+17
+100
+AcDbEntity
+  8
+LT-05
+100
+AcDbLine
+ 10
+0.0
+ 20
+-40.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-40.0
+ 31
+0.0
+  0
+TEXT
+  5
+57
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-41.0
+ 30
+0.0
+ 40
+3.0
+  1
+CENTER
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-41.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+59
+330
+17
+100
+AcDbEntity
+  8
+LT-06
+100
+AcDbLine
+ 10
+0.0
+ 20
+-48.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-48.0
+ 31
+0.0
+  0
+TEXT
+  5
+5A
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-49.0
+ 30
+0.0
+ 40
+3.0
+  1
+CENTER2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-49.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+5C
+330
+17
+100
+AcDbEntity
+  8
+LT-07
+100
+AcDbLine
+ 10
+0.0
+ 20
+-56.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-56.0
+ 31
+0.0
+  0
+TEXT
+  5
+5D
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-57.0
+ 30
+0.0
+ 40
+3.0
+  1
+CENTERX2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-57.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+5F
+330
+17
+100
+AcDbEntity
+  8
+LT-08
+100
+AcDbLine
+ 10
+0.0
+ 20
+-64.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-64.0
+ 31
+0.0
+  0
+TEXT
+  5
+60
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-65.0
+ 30
+0.0
+ 40
+3.0
+  1
+PHANTOM
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-65.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+62
+330
+17
+100
+AcDbEntity
+  8
+LT-09
+100
+AcDbLine
+ 10
+0.0
+ 20
+-72.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-72.0
+ 31
+0.0
+  0
+TEXT
+  5
+63
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-73.0
+ 30
+0.0
+ 40
+3.0
+  1
+PHANTOM2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-73.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+65
+330
+17
+100
+AcDbEntity
+  8
+LT-10
+100
+AcDbLine
+ 10
+0.0
+ 20
+-80.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-80.0
+ 31
+0.0
+  0
+TEXT
+  5
+66
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-81.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHDOT
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-81.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+68
+330
+17
+100
+AcDbEntity
+  8
+LT-11
+100
+AcDbLine
+ 10
+0.0
+ 20
+-88.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-88.0
+ 31
+0.0
+  0
+TEXT
+  5
+69
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-89.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHDOT2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-89.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+6B
+330
+17
+100
+AcDbEntity
+  8
+LT-12
+100
+AcDbLine
+ 10
+0.0
+ 20
+-96.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-96.0
+ 31
+0.0
+  0
+TEXT
+  5
+6C
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-97.0
+ 30
+0.0
+ 40
+3.0
+  1
+DOT
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-97.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+6E
+330
+17
+100
+AcDbEntity
+  8
+LT-13
+100
+AcDbLine
+ 10
+0.0
+ 20
+-104.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-104.0
+ 31
+0.0
+  0
+TEXT
+  5
+6F
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-105.0
+ 30
+0.0
+ 40
+3.0
+  1
+DOT2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-105.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+71
+330
+17
+100
+AcDbEntity
+  8
+LT-14
+100
+AcDbLine
+ 10
+0.0
+ 20
+-112.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-112.0
+ 31
+0.0
+  0
+TEXT
+  5
+72
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-113.0
+ 30
+0.0
+ 40
+3.0
+  1
+DIVIDE
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-113.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+74
+330
+17
+100
+AcDbEntity
+  8
+LT-15
+100
+AcDbLine
+ 10
+0.0
+ 20
+-120.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-120.0
+ 31
+0.0
+  0
+TEXT
+  5
+75
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-121.0
+ 30
+0.0
+ 40
+3.0
+  1
+DIVIDE2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-121.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+77
+330
+17
+100
+AcDbEntity
+  8
+LT-16
+100
+AcDbLine
+ 10
+0.0
+ 20
+-128.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-128.0
+ 31
+0.0
+  0
+TEXT
+  5
+78
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-129.0
+ 30
+0.0
+ 40
+3.0
+  1
+EXAV_DASH3
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-129.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+7A
+330
+17
+100
+AcDbEntity
+  8
+LT-17
+100
+AcDbLine
+ 10
+0.0
+ 20
+-136.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-136.0
+ 31
+0.0
+  0
+TEXT
+  5
+7B
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-137.0
+ 30
+0.0
+ 40
+3.0
+  1
+GAS_LINE
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-137.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+7D
+330
+17
+100
+AcDbEntity
+  8
+LT-18
+100
+AcDbLine
+ 10
+0.0
+ 20
+-144.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-144.0
+ 31
+0.0
+  0
+TEXT
+  5
+7E
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-145.0
+ 30
+0.0
+ 40
+3.0
+  1
+HOT_WATER
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-145.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+80
+330
+17
+100
+AcDbEntity
+  8
+LT-19
+100
+AcDbLine
+ 10
+0.0
+ 20
+-152.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-152.0
+ 31
+0.0
+  0
+TEXT
+  5
+81
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-153.0
+ 30
+0.0
+ 40
+3.0
+  1
+FENCE
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-153.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+82
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+0.0
+ 20
+-160.0
+ 30
+0.0
+ 40
+4.0
+  1
+Line weights (mm)
+  7
+LT-TEXT
+ 11
+0.0
+ 21
+-160.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+83
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+0
+100
+AcDbLine
+ 10
+0.0
+ 20
+-166.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-166.0
+ 31
+0.0
+  0
+TEXT
+  5
+84
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-167.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.00
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-167.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+85
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+5
+100
+AcDbLine
+ 10
+0.0
+ 20
+-171.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-171.0
+ 31
+0.0
+  0
+TEXT
+  5
+86
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-172.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.05
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-172.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+87
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+9
+100
+AcDbLine
+ 10
+0.0
+ 20
+-176.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-176.0
+ 31
+0.0
+  0
+TEXT
+  5
+88
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-177.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.09
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-177.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+89
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+13
+100
+AcDbLine
+ 10
+0.0
+ 20
+-181.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-181.0
+ 31
+0.0
+  0
+TEXT
+  5
+8A
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-182.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.13
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-182.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+8B
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+18
+100
+AcDbLine
+ 10
+0.0
+ 20
+-186.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-186.0
+ 31
+0.0
+  0
+TEXT
+  5
+8C
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-187.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.18
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-187.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+8D
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+25
+100
+AcDbLine
+ 10
+0.0
+ 20
+-191.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-191.0
+ 31
+0.0
+  0
+TEXT
+  5
+8E
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-192.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.25
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-192.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+8F
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+35
+100
+AcDbLine
+ 10
+0.0
+ 20
+-196.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-196.0
+ 31
+0.0
+  0
+TEXT
+  5
+90
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-197.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.35
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-197.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+91
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+50
+100
+AcDbLine
+ 10
+0.0
+ 20
+-201.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-201.0
+ 31
+0.0
+  0
+TEXT
+  5
+92
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-202.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.50
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-202.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+93
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+70
+100
+AcDbLine
+ 10
+0.0
+ 20
+-206.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-206.0
+ 31
+0.0
+  0
+TEXT
+  5
+94
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-207.0
+ 30
+0.0
+ 40
+3.0
+  1
+0.70
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-207.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+95
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+100
+100
+AcDbLine
+ 10
+0.0
+ 20
+-211.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-211.0
+ 31
+0.0
+  0
+TEXT
+  5
+96
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-212.0
+ 30
+0.0
+ 40
+3.0
+  1
+1.00
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-212.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+97
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+140
+100
+AcDbLine
+ 10
+0.0
+ 20
+-216.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-216.0
+ 31
+0.0
+  0
+TEXT
+  5
+98
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-217.0
+ 30
+0.0
+ 40
+3.0
+  1
+1.40
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-217.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+99
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+370
+200
+100
+AcDbLine
+ 10
+0.0
+ 20
+-221.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-221.0
+ 31
+0.0
+  0
+TEXT
+  5
+9A
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-222.0
+ 30
+0.0
+ 40
+3.0
+  1
+2.00
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-222.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+9B
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHED
+ 62
+4
+ 48
+0.25
+100
+AcDbLine
+ 10
+0.0
+ 20
+-236.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-236.0
+ 31
+0.0
+  0
+TEXT
+  5
+9C
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-237.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED, ltscale 0.25
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-237.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+9D
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHED
+ 62
+4
+ 48
+0.5
+100
+AcDbLine
+ 10
+0.0
+ 20
+-242.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-242.0
+ 31
+0.0
+  0
+TEXT
+  5
+9E
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-243.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED, ltscale 0.5
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-243.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+9F
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHED
+ 62
+4
+100
+AcDbLine
+ 10
+0.0
+ 20
+-248.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-248.0
+ 31
+0.0
+  0
+TEXT
+  5
+A0
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-249.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED, ltscale 1
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-249.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+A1
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHED
+ 62
+4
+ 48
+2.0
+100
+AcDbLine
+ 10
+0.0
+ 20
+-254.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-254.0
+ 31
+0.0
+  0
+TEXT
+  5
+A2
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-255.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED, ltscale 2
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-255.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+A3
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHED
+ 62
+4
+ 48
+4.0
+100
+AcDbLine
+ 10
+0.0
+ 20
+-260.0
+ 30
+0.0
+ 11
+220.0
+ 21
+-260.0
+ 31
+0.0
+  0
+TEXT
+  5
+A4
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-261.0
+ 30
+0.0
+ 40
+3.0
+  1
+DASHED, ltscale 4
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-261.0
+ 31
+0.0
+100
+AcDbText
+  0
+LWPOLYLINE
+  5
+A5
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+PHANTOM
+ 62
+1
+100
+AcDbPolyline
+ 90
+6
+ 70
+128
+ 10
+0.0
+ 20
+-274.0
+ 10
+40.0
+ 20
+-286.0
+ 10
+80.0
+ 20
+-274.0
+ 10
+120.0
+ 20
+-286.0
+ 10
+160.0
+ 20
+-274.0
+ 10
+200.0
+ 20
+-286.0
+  0
+TEXT
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-275.0
+ 30
+0.0
+ 40
+3.0
+  1
+lwpolyline, linetype generation on
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-275.0
+ 31
+0.0
+100
+AcDbText
+  0
+LWPOLYLINE
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+PHANTOM
+ 62
+3
+100
+AcDbPolyline
+ 90
+6
+ 70
+0
+ 10
+0.0
+ 20
+-299.0
+ 10
+40.0
+ 20
+-311.0
+ 10
+80.0
+ 20
+-299.0
+ 10
+120.0
+ 20
+-311.0
+ 10
+160.0
+ 20
+-299.0
+ 10
+200.0
+ 20
+-311.0
+  0
+TEXT
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-300.0
+ 30
+0.0
+ 40
+3.0
+  1
+lwpolyline, linetype generation off
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-300.0
+ 31
+0.0
+100
+AcDbText
+  0
+LWPOLYLINE
+  5
+A9
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+6
+100
+AcDbPolyline
+ 90
+5
+ 70
+0
+ 10
+0.0
+ 20
+-330.0
+ 40
+0.0
+ 41
+6.0
+ 10
+50.0
+ 20
+-330.0
+ 40
+6.0
+ 41
+1.0
+ 10
+100.0
+ 20
+-345.0
+ 40
+1.0
+ 41
+6.0
+ 10
+150.0
+ 20
+-330.0
+ 40
+6.0
+ 41
+6.0
+ 10
+200.0
+ 20
+-338.0
+  0
+TEXT
+  5
+AA
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+7
+100
+AcDbText
+ 10
+230.0
+ 20
+-331.0
+ 30
+0.0
+ 40
+3.0
+  1
+lwpolyline with start and end widths per segment
+  7
+LT-TEXT
+ 11
+230.0
+ 21
+-331.0
+ 31
+0.0
+100
+AcDbText
+  0
+CIRCLE
+  5
+AB
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+CENTER
+ 62
+1
+370
+35
+100
+AcDbCircle
+ 10
+30.0
+ 20
+-360.0
+ 30
+0.0
+ 40
+15.0
+  0
+ARC
+  5
+AC
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHED
+ 62
+3
+100
+AcDbCircle
+ 10
+90.0
+ 20
+-360.0
+ 30
+0.0
+ 40
+15.0
+100
+AcDbArc
+ 50
+30.0
+ 51
+300.0
+  0
+ELLIPSE
+  5
+AD
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+PHANTOM
+ 62
+5
+100
+AcDbEllipse
+ 10
+150.0
+ 20
+-360.0
+ 30
+0.0
+ 11
+25.0
+ 21
+0.0
+ 31
+0.0
+ 40
+0.5
+ 41
+0.0
+ 42
+6.283185307179586
+  0
+SPLINE
+  5
+AE
+330
+17
+100
+AcDbEntity
+  8
+0
+  6
+DASHDOT
+ 62
+6
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+4
+ 11
+190.0
+ 21
+-370.0
+ 31
+0.0
+ 11
+200.0
+ 21
+-348.0
+ 31
+0.0
+ 11
+215.0
+ 21
+-374.0
+ 31
+0.0
+ 11
+225.0
+ 21
+-350.0
+ 31
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+B2
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+B2
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/site-plan.dxf b/crates/exav-viewer/demo/examples/files/cad/site-plan.dxf
new file mode 100644
index 00000000..92e0d42c
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/site-plan.dxf
@@ -0,0 +1,14098 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+158
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+6
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+154
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+193.55039660541104
+ 22
+20.714668452779648
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+384.29437374413936
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+12
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+CONTOUR-MINOR
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+CONTOUR-MAJOR
+ 70
+0
+ 62
+30
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+43
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+PARCEL
+ 70
+0
+ 62
+1
+  6
+DASHDOT
+370
+35
+390
+13
+347
+21
+  0
+LAYER
+  5
+44
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+BUILDING
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+50
+390
+13
+347
+21
+  0
+LAYER
+  5
+45
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+ROAD
+ 70
+0
+ 62
+9
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+46
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+WATER
+ 70
+0
+ 62
+5
+  6
+Continuous
+370
+18
+390
+13
+347
+21
+  0
+LAYER
+  5
+47
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+TREES
+ 70
+0
+ 62
+3
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+48
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+SPOT
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+9
+390
+13
+347
+21
+  0
+LAYER
+  5
+49
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+TEXT
+ 70
+0
+ 62
+2
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+LAYER
+  5
+4A
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+LEGEND
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+13
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+4B
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+SITE
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+155
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+156
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+13
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+4C
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+DOOR
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+53
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WINDOW
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+5C
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BED
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+63
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+TABLE
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+6F
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SOFA
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+77
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+WC
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+7C
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SINK
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+82
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+BATH
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+87
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+AXIS
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+8C
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+NORTH
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+92
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+LEVEL
+340
+0
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+4D
+330
+4C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+DOOR
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+DOOR
+  1
+
+  0
+LINE
+  5
+4F
+330
+4C
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+900.0
+ 31
+0.0
+  0
+ARC
+  5
+50
+330
+4C
+100
+AcDbEntity
+  8
+A-DOOR
+  6
+DASHED
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+900.0
+100
+AcDbArc
+ 50
+0.0
+ 51
+90.0
+  0
+LWPOLYLINE
+  5
+51
+330
+4C
+100
+AcDbEntity
+  8
+A-DOOR
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+900.0
+ 20
+0.0
+ 10
+900.0
+ 20
+40.0
+ 10
+0.0
+ 20
+40.0
+  0
+ATTDEF
+  5
+52
+330
+4C
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+350.0
+ 20
+-330.0
+ 30
+0.0
+ 40
+110.0
+  1
+D-000
+100
+AcDbAttributeDefinition
+  3
+
+  2
+TAG
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+4E
+330
+4C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+54
+330
+53
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WINDOW
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WINDOW
+  1
+
+  0
+LINE
+  5
+56
+330
+53
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+0.0
+ 31
+0.0
+  0
+LINE
+  5
+57
+330
+53
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.35
+ 30
+0.0
+ 11
+1.0
+ 21
+0.35
+ 31
+0.0
+  0
+LINE
+  5
+58
+330
+53
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.65
+ 30
+0.0
+ 11
+1.0
+ 21
+0.65
+ 31
+0.0
+  0
+LINE
+  5
+59
+330
+53
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+5A
+330
+53
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+1.0
+ 31
+0.0
+  0
+LINE
+  5
+5B
+330
+53
+100
+AcDbEntity
+  8
+A-WIND
+100
+AcDbLine
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+ 11
+1.0
+ 21
+1.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+55
+330
+53
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+5D
+330
+5C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BED
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BED
+  1
+
+  0
+LWPOLYLINE
+  5
+5F
+330
+5C
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+0.0
+ 10
+1600.0
+ 20
+2000.0
+ 10
+0.0
+ 20
+2000.0
+  0
+LWPOLYLINE
+  5
+60
+330
+5C
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+80.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1300.0
+ 10
+760.0
+ 20
+1920.0
+ 10
+80.0
+ 20
+1920.0
+  0
+LWPOLYLINE
+  5
+61
+330
+5C
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+840.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1300.0
+ 10
+1520.0
+ 20
+1920.0
+ 10
+840.0
+ 20
+1920.0
+  0
+LINE
+  5
+62
+330
+5C
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbLine
+ 10
+0.0
+ 20
+1200.0
+ 30
+0.0
+ 11
+1600.0
+ 21
+1200.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+5E
+330
+5C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+64
+330
+63
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+TABLE
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+TABLE
+  1
+
+  0
+LWPOLYLINE
+  5
+66
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+0.0
+ 10
+1800.0
+ 20
+900.0
+ 10
+0.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+67
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-450.0
+ 10
+550.0
+ 20
+-50.0
+ 10
+150.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+68
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+950.0
+ 10
+550.0
+ 20
+950.0
+ 10
+550.0
+ 20
+1350.0
+ 10
+150.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+69
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-450.0
+ 10
+1000.0
+ 20
+-50.0
+ 10
+600.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+6A
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+600.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+950.0
+ 10
+1000.0
+ 20
+1350.0
+ 10
+600.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+6B
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-450.0
+ 10
+1450.0
+ 20
+-50.0
+ 10
+1050.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+6C
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1050.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+950.0
+ 10
+1450.0
+ 20
+1350.0
+ 10
+1050.0
+ 20
+1350.0
+  0
+LWPOLYLINE
+  5
+6D
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-450.0
+ 10
+1900.0
+ 20
+-50.0
+ 10
+1500.0
+ 20
+-50.0
+  0
+LWPOLYLINE
+  5
+6E
+330
+63
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1500.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+950.0
+ 10
+1900.0
+ 20
+1350.0
+ 10
+1500.0
+ 20
+1350.0
+  0
+ENDBLK
+  5
+65
+330
+63
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+70
+330
+6F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SOFA
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SOFA
+  1
+
+  0
+LWPOLYLINE
+  5
+72
+330
+6F
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+950.0
+ 10
+0.0
+ 20
+950.0
+  0
+LWPOLYLINE
+  5
+73
+330
+6F
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+0.0
+ 10
+2200.0
+ 20
+250.0
+ 10
+0.0
+ 20
+250.0
+  0
+LWPOLYLINE
+  5
+74
+330
+6F
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+120.0
+ 20
+300.0
+ 10
+720.0
+ 20
+300.0
+ 10
+720.0
+ 20
+900.0
+ 10
+120.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+75
+330
+6F
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+770.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+300.0
+ 10
+1370.0
+ 20
+900.0
+ 10
+770.0
+ 20
+900.0
+  0
+LWPOLYLINE
+  5
+76
+330
+6F
+100
+AcDbEntity
+  8
+A-FURN
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+1420.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+300.0
+ 10
+2020.0
+ 20
+900.0
+ 10
+1420.0
+ 20
+900.0
+  0
+ENDBLK
+  5
+71
+330
+6F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+78
+330
+77
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+WC
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+WC
+  1
+
+  0
+LWPOLYLINE
+  5
+7A
+330
+77
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+400.0
+ 20
+0.0
+ 10
+400.0
+ 20
+200.0
+ 10
+0.0
+ 20
+200.0
+  0
+ELLIPSE
+  5
+7B
+330
+77
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbEllipse
+ 10
+200.0
+ 20
+-250.0
+ 30
+0.0
+ 11
+0.0
+ 21
+230.0
+ 31
+0.0
+ 40
+0.8
+ 41
+0.0
+ 42
+6.283185307179586
+  0
+ENDBLK
+  5
+79
+330
+77
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+7D
+330
+7C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+SINK
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+SINK
+  1
+
+  0
+LWPOLYLINE
+  5
+7F
+330
+7C
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+600.0
+ 20
+0.0
+ 10
+600.0
+ 20
+450.0
+ 10
+0.0
+ 20
+450.0
+  0
+CIRCLE
+  5
+80
+330
+7C
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+160.0
+  0
+CIRCLE
+  5
+81
+330
+7C
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbCircle
+ 10
+300.0
+ 20
+225.0
+ 30
+0.0
+ 40
+25.0
+  0
+ENDBLK
+  5
+7E
+330
+7C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+83
+330
+82
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+BATH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+BATH
+  1
+
+  0
+LWPOLYLINE
+  5
+85
+330
+82
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+0.0
+ 10
+1700.0
+ 20
+750.0
+ 10
+0.0
+ 20
+750.0
+  0
+LWPOLYLINE
+  5
+86
+330
+82
+100
+AcDbEntity
+  8
+A-FIXT
+100
+AcDbPolyline
+ 90
+5
+ 70
+1
+ 10
+100.0
+ 20
+100.0
+ 10
+1500.0
+ 20
+100.0
+ 10
+1600.0
+ 20
+375.0
+ 10
+1500.0
+ 20
+650.0
+ 10
+100.0
+ 20
+650.0
+  0
+ENDBLK
+  5
+84
+330
+82
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+88
+330
+87
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+AXIS
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+AXIS
+  1
+
+  0
+CIRCLE
+  5
+8A
+330
+87
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  0
+ATTDEF
+  5
+8B
+330
+87
+100
+AcDbEntity
+  8
+A-GRID
+100
+AcDbText
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+300.0
+  1
+A
+ 72
+4
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbAttributeDefinition
+  3
+
+  2
+ID
+ 70
+0
+ 71
+1
+ 72
+0
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+  0
+ENDBLK
+  5
+89
+330
+87
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+8D
+330
+8C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+NORTH
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+NORTH
+  1
+
+  0
+CIRCLE
+  5
+8F
+330
+8C
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbCircle
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+500.0
+  0
+SOLID
+  5
+90
+330
+8C
+100
+AcDbEntity
+  8
+A-ANNO
+ 62
+7
+100
+AcDbTrace
+ 10
+0.0
+ 20
+650.0
+ 30
+0.0
+ 11
+-170.0
+ 21
+-400.0
+ 31
+0.0
+ 12
+0.0
+ 22
+-200.0
+ 32
+0.0
+ 13
+170.0
+ 23
+-400.0
+ 33
+0.0
+  0
+TEXT
+  5
+91
+330
+8C
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+0.0
+ 20
+800.0
+ 30
+0.0
+ 40
+300.0
+  1
+N
+ 72
+1
+ 11
+0.0
+ 21
+800.0
+ 31
+0.0
+100
+AcDbText
+ 73
+1
+  0
+ENDBLK
+  5
+8E
+330
+8C
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+93
+330
+92
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+LEVEL
+ 70
+2
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+LEVEL
+  1
+
+  0
+LWPOLYLINE
+  5
+95
+330
+92
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbPolyline
+ 90
+3
+ 70
+1
+ 10
+-250.0
+ 20
+250.0
+ 10
+0.0
+ 20
+0.0
+ 10
+250.0
+ 20
+250.0
+  0
+LINE
+  5
+96
+330
+92
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbLine
+ 10
+-250.0
+ 20
+250.0
+ 30
+0.0
+ 11
+900.0
+ 21
+250.0
+ 31
+0.0
+  0
+ATTDEF
+  5
+97
+330
+92
+100
+AcDbEntity
+  8
+A-ANNO
+100
+AcDbText
+ 10
+320.0
+ 20
+290.0
+ 30
+0.0
+ 40
+120.0
+  1
++0.00
+100
+AcDbAttributeDefinition
+  3
+
+  2
+H
+ 70
+0
+ 71
+1
+ 72
+0
+  0
+ENDBLK
+  5
+94
+330
+92
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+SPLINE
+  5
+98
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+162.72
+ 21
+110.0
+ 31
+0.0
+ 11
+162.75464820619362
+ 21
+112.56319826494449
+ 31
+0.0
+ 11
+161.09938142686286
+ 21
+114.8061731409782
+ 31
+0.0
+ 11
+158.84528137423857
+ 21
+116.63396103067893
+ 31
+0.0
+ 11
+156.18
+ 21
+118.02805549308175
+ 31
+0.0
+ 11
+153.02229025050545
+ 21
+118.45950557757982
+ 31
+0.0
+ 11
+150.0
+ 21
+117.92
+ 31
+0.0
+ 11
+147.33770974949454
+ 21
+117.45185185953622
+ 31
+0.0
+ 11
+144.18
+ 21
+117.56040177503814
+ 31
+0.0
+ 11
+140.43471862576143
+ 21
+117.17396103067892
+ 31
+0.0
+ 11
+137.82061857313715
+ 21
+115.2738268590218
+ 31
+0.0
+ 11
+137.6053517938064
+ 21
+112.49085198298809
+ 31
+0.0
+ 11
+138.72
+ 21
+110.0
+ 31
+0.0
+ 11
+139.57242837525598
+ 21
+107.90445545309912
+ 31
+0.0
+ 11
+140.31477173603633
+ 21
+105.8061731409782
+ 31
+0.0
+ 11
+141.87471862576143
+ 21
+103.90603896932107
+ 31
+0.0
+ 11
+144.18
+ 21
+102.43959822496186
+ 31
+0.0
+ 11
+146.81063316804494
+ 21
+101.07284070437659
+ 31
+0.0
+ 11
+150.0
+ 21
+99.92
+ 31
+0.0
+ 11
+153.54936683195504
+ 21
+100.06518698633299
+ 31
+0.0
+ 11
+156.18
+ 21
+101.97194450691825
+ 31
+0.0
+ 11
+157.40528137423857
+ 21
+104.44603896932107
+ 31
+0.0
+ 11
+158.60522826396368
+ 21
+106.2738268590218
+ 31
+0.0
+ 11
+160.787571624744
+ 21
+107.8321091711427
+ 31
+0.0
+ 11
+162.72
+ 21
+110.0
+ 31
+0.0
+  0
+SPLINE
+  5
+99
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+173.81378607118785
+ 21
+108.0
+ 31
+0.0
+ 11
+173.58551100564256
+ 21
+112.13690328730793
+ 31
+0.0
+ 11
+170.48583079664297
+ 21
+115.57158683808454
+ 31
+0.0
+ 11
+166.61721940455368
+ 21
+118.21291455341525
+ 31
+0.0
+ 11
+162.44810696440607
+ 21
+120.2734509732725
+ 31
+0.0
+ 11
+157.68061818399474
+ 21
+121.10122865512437
+ 31
+0.0
+ 11
+153.0
+ 21
+120.61637460359522
+ 31
+0.0
+ 11
+148.64275899723438
+ 21
+120.19608360235772
+ 31
+0.0
+ 11
+143.44810696440607
+ 21
+120.408273034584
+ 31
+0.0
+ 11
+137.56899452425847
+ 21
+119.57325410680613
+ 31
+0.0
+ 11
+133.80416920335705
+ 21
+116.31203855832024
+ 31
+0.0
+ 11
+133.90489788431614
+ 21
+111.83738789346549
+ 31
+0.0
+ 11
+135.81378607118785
+ 21
+108.0
+ 31
+0.0
+ 11
+136.88032960665797
+ 21
+104.76056050188609
+ 31
+0.0
+ 11
+137.57686545283428
+ 21
+101.32158683808456
+ 31
+0.0
+ 11
+139.74716171946486
+ 21
+98.06037128959865
+ 31
+0.0
+ 11
+143.44810696440607
+ 21
+95.591726965416
+ 31
+0.0
+ 11
+147.84549447009897
+ 21
+93.57234260588592
+ 31
+0.0
+ 11
+153.0
+ 21
+92.11637460359522
+ 31
+0.0
+ 11
+158.47788271113018
+ 21
+92.66719755311927
+ 31
+0.0
+ 11
+162.44810696440607
+ 21
+95.7265490267275
+ 31
+0.0
+ 11
+164.4390522093473
+ 21
+99.42071084298954
+ 31
+0.0
+ 11
+166.7131345471657
+ 21
+102.06203855832024
+ 31
+0.0
+ 11
+170.61007928330073
+ 21
+104.46104510804363
+ 31
+0.0
+ 11
+173.81378607118785
+ 21
+108.0
+ 31
+0.0
+  0
+SPLINE
+  5
+9A
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+185.32168451699252
+ 21
+106.0
+ 31
+0.0
+ 11
+184.46611427526742
+ 21
+111.72060424878246
+ 31
+0.0
+ 11
+179.57671671897407
+ 21
+116.20901780823043
+ 31
+0.0
+ 11
+174.01145761161308
+ 21
+119.50859320870981
+ 31
+0.0
+ 11
+168.50915774150374
+ 21
+122.24987257613353
+ 31
+0.0
+ 11
+162.32561819866925
+ 21
+123.705646380037
+ 31
+0.0
+ 11
+156.0
+ 21
+123.56871466111136
+ 31
+0.0
+ 11
+149.80956051465776
+ 21
+123.32727601035833
+ 31
+0.0
+ 11
+142.50915774150374
+ 21
+123.52511817145958
+ 31
+0.0
+ 11
+134.66685787139443
+ 21
+121.9998565964542
+ 31
+0.0
+ 11
+130.08328328102593
+ 21
+117.22226753065821
+ 31
+0.0
+ 11
+130.72039152839807
+ 21
+111.08023800620553
+ 31
+0.0
+ 11
+133.32168451699252
+ 21
+106.0
+ 31
+0.0
+ 11
+134.23797130823584
+ 21
+101.62666148978415
+ 31
+0.0
+ 11
+134.54339572218328
+ 21
+96.70901780823043
+ 31
+0.0
+ 11
+137.2419049899126
+ 21
+91.93142874243446
+ 31
+0.0
+ 11
+142.50915774150374
+ 21
+88.47488182854042
+ 31
+0.0
+ 11
+148.8670278533382
+ 21
+86.03453915476334
+ 31
+0.0
+ 11
+156.0
+ 21
+84.56871466111136
+ 31
+0.0
+ 11
+163.26815085998882
+ 21
+85.65616878508466
+ 31
+0.0
+ 11
+168.50915774150374
+ 21
+89.75012742386647
+ 31
+0.0
+ 11
+171.43641049309488
+ 21
+94.42269213017883
+ 31
+0.0
+ 11
+175.11660427781672
+ 21
+97.72226753065821
+ 31
+0.0
+ 11
+180.9485344954296
+ 21
+100.98629524720721
+ 31
+0.0
+ 11
+185.32168451699252
+ 21
+106.0
+ 31
+0.0
+  0
+SPLINE
+  5
+9B
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MAJOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+197.08197456212483
+ 21
+104.0
+ 31
+0.0
+ 11
+195.17052761006573
+ 21
+111.26889774719355
+ 31
+0.0
+ 11
+188.2256252190079
+ 21
+116.65506694057198
+ 31
+0.0
+ 11
+181.02432423526957
+ 21
+120.51824317645217
+ 31
+0.0
+ 11
+174.44401271893759
+ 21
+124.06236102645488
+ 31
+0.0
+ 11
+167.01782816409502
+ 21
+126.44220655606952
+ 31
+0.0
+ 11
+159.0
+ 21
+126.90381839423613
+ 31
+0.0
+ 11
+150.83677034427416
+ 21
+126.84919087176635
+ 31
+0.0
+ 11
+141.44401271893759
+ 21
+126.80589646087483
+ 31
+0.0
+ 11
+131.8937012026056
+ 21
+124.3297240980458
+ 31
+0.0
+ 11
+126.8043747809921
+ 21
+117.94111466519188
+ 31
+0.0
+ 11
+128.0568484436899
+ 21
+110.21839435309036
+ 31
+0.0
+ 11
+131.08197456212483
+ 21
+104.0
+ 31
+0.0
+ 11
+131.41942307498724
+ 21
+98.45735501461877
+ 31
+0.0
+ 11
+131.06794856923494
+ 21
+91.905066940572
+ 31
+0.0
+ 11
+134.35527667695743
+ 21
+85.51645750771809
+ 31
+0.0
+ 11
+141.44401271893756
+ 21
+81.19410353912518
+ 31
+0.0
+ 11
+149.93577118732867
+ 21
+78.62887815476064
+ 31
+0.0
+ 11
+159.0
+ 21
+77.40381839423614
+ 31
+0.0
+ 11
+167.9188273210405
+ 21
+79.03586247045747
+ 31
+0.0
+ 11
+174.44401271893759
+ 21
+83.9376389735451
+ 31
+0.0
+ 11
+178.56274876091774
+ 21
+89.3279384293117
+ 31
+0.0
+ 11
+183.96205143076503
+ 21
+93.19111466519188
+ 31
+0.0
+ 11
+191.80795297876838
+ 21
+97.40685162051555
+ 31
+0.0
+ 11
+197.08197456212483
+ 21
+104.0
+ 31
+0.0
+  0
+TEXT
+  5
+9C
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+198.08197456212483
+ 20
+104.0
+ 30
+0.0
+ 40
+3.0
+  1
+100
+  7
+SITE
+ 11
+198.08197456212483
+ 21
+104.0
+ 31
+0.0
+100
+AcDbText
+ 73
+2
+  0
+SPLINE
+  5
+9D
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+208.8737876126427
+ 21
+102.0
+ 31
+0.0
+ 11
+205.48066257146198
+ 21
+110.73795631679504
+ 31
+0.0
+ 11
+196.34730905042596
+ 21
+116.87282109465201
+ 31
+0.0
+ 11
+187.71703605188458
+ 21
+121.28777703891343
+ 31
+0.0
+ 11
+180.36310619367865
+ 21
+125.85437468417562
+ 31
+0.0
+ 11
+171.81568470126695
+ 21
+129.47447551215362
+ 31
+0.0
+ 11
+162.0
+ 21
+130.69551208388398
+ 31
+0.0
+ 11
+151.74679538136968
+ 21
+130.69911043284617
+ 31
+0.0
+ 11
+140.36310619367868
+ 21
+130.10714954289068
+ 31
+0.0
+ 11
+129.40917633547275
+ 21
+126.44311774839545
+ 31
+0.0
+ 11
+124.05269094957404
+ 21
+118.431666821464
+ 31
+0.0
+ 11
+125.83064495854407
+ 21
+109.26866210558451
+ 31
+0.0
+ 11
+128.87378761264267
+ 21
+102.0
+ 31
+0.0
+ 11
+128.2065964683365
+ 21
+95.20881361064379
+ 31
+0.0
+ 11
+127.06527674767085
+ 21
+86.87282109465202
+ 31
+0.0
+ 11
+131.14849355696077
+ 21
+78.8613701677206
+ 31
+0.0
+ 11
+140.36310619367865
+ 21
+73.89285045710932
+ 31
+0.0
+ 11
+151.1101610930653
+ 21
+71.51892593480952
+ 31
+0.0
+ 11
+162.0
+ 21
+70.69551208388398
+ 31
+0.0
+ 11
+172.45231898957132
+ 21
+72.74356085550205
+ 31
+0.0
+ 11
+180.36310619367865
+ 21
+78.14562531582438
+ 31
+0.0
+ 11
+185.97771883039653
+ 21
+84.0167108772026
+ 31
+0.0
+ 11
+193.33472325232913
+ 21
+88.431666821464
+ 31
+0.0
+ 11
+203.10471106166952
+ 21
+93.73951939943323
+ 31
+0.0
+ 11
+208.8737876126427
+ 21
+102.0
+ 31
+0.0
+  0
+SPLINE
+  5
+9E
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+220.44587172444687
+ 21
+100.0
+ 31
+0.0
+ 11
+215.2185489394071
+ 21
+110.09201472503271
+ 31
+0.0
+ 11
+203.9337015827805
+ 21
+116.85878731702515
+ 31
+0.0
+ 11
+194.2105617622472
+ 21
+121.90792132168542
+ 31
+0.0
+ 11
+186.39206413777657
+ 21
+127.78910647405084
+ 31
+0.0
+ 11
+176.76687478692395
+ 21
+132.93593091332605
+ 31
+0.0
+ 11
+165.0
+ 21
+134.95078163694564
+ 31
+0.0
+ 11
+152.58391324349594
+ 21
+134.75309995484218
+ 31
+0.0
+ 11
+139.39206413777657
+ 21
+133.2656844927521
+ 31
+0.0
+ 11
+127.34356651330592
+ 21
+128.24232511502058
+ 31
+0.0
+ 11
+121.83629841721952
+ 21
+118.69043104602923
+ 31
+0.0
+ 11
+123.8765347546199
+ 21
+108.26424947685172
+ 31
+0.0
+ 11
+126.44587172444687
+ 21
+100.0
+ 31
+0.0
+ 11
+124.42152126823467
+ 21
+91.845272045305
+ 31
+0.0
+ 11
+122.52731362704324
+ 21
+81.60878731702516
+ 31
+0.0
+ 11
+127.74252433071173
+ 21
+72.05689324803383
+ 31
+0.0
+ 11
+139.39206413777654
+ 21
+66.73431550724791
+ 31
+0.0
+ 11
+152.437884547287
+ 21
+64.83816015994672
+ 31
+0.0
+ 11
+165.0
+ 21
+64.45078163694562
+ 31
+0.0
+ 11
+176.91290348313285
+ 21
+66.65532920146288
+ 31
+0.0
+ 11
+186.39206413777657
+ 21
+72.21089352594916
+ 31
+0.0
+ 11
+193.81160394484138
+ 21
+78.39129704136896
+ 31
+0.0
+ 11
+203.24268637295674
+ 21
+83.44043104602923
+ 31
+0.0
+ 11
+214.67356242579228
+ 21
+90.01750679712397
+ 31
+0.0
+ 11
+220.44587172444687
+ 21
+100.0
+ 31
+0.0
+  0
+SPLINE
+  5
+9F
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+231.55053264809072
+ 21
+98.0
+ 31
+0.0
+ 11
+224.2745897545753
+ 21
+109.30904815934838
+ 31
+0.0
+ 11
+211.0603489523935
+ 21
+116.6456780442977
+ 31
+0.0
+ 11
+200.6723650732226
+ 21
+122.50427380491696
+ 31
+0.0
+ 11
+192.65473367595465
+ 21
+130.02743853037464
+ 31
+0.0
+ 11
+181.90076483781027
+ 21
+136.90877047908117
+ 31
+0.0
+ 11
+168.0
+ 21
+139.6042021802084
+ 31
+0.0
+ 11
+153.40941990157745
+ 21
+138.83958967941223
+ 31
+0.0
+ 11
+138.65473367595467
+ 21
+136.1206191761649
+ 31
+0.0
+ 11
+125.7771022786867
+ 21
+129.66717329098498
+ 31
+0.0
+ 11
+120.07965104760649
+ 21
+118.75011977549389
+ 31
+0.0
+ 11
+121.96575815412771
+ 21
+107.25112844508537
+ 31
+0.0
+ 11
+123.5505326480907
+ 21
+98.0
+ 31
+0.0
+ 11
+119.9546005153559
+ 21
+88.3447055060442
+ 31
+0.0
+ 11
+117.52960534367412
+ 21
+76.14567804429772
+ 31
+0.0
+ 11
+124.30483270507546
+ 21
+65.22862452880662
+ 31
+0.0
+ 11
+138.65473367595462
+ 21
+59.8793808238351
+ 31
+0.0
+ 11
+153.94830796673804
+ 21
+58.668778549666634
+ 31
+0.0
+ 11
+168.0
+ 21
+58.604202180208404
+ 31
+0.0
+ 11
+181.36187677264965
+ 21
+60.599597749997685
+ 31
+0.0
+ 11
+192.65473367595465
+ 21
+65.97256146962538
+ 31
+0.0
+ 11
+202.14463464683382
+ 21
+72.39152401487462
+ 31
+0.0
+ 11
+213.61039465632584
+ 21
+78.25011977549389
+ 31
+0.0
+ 11
+226.28574739334704
+ 21
+86.28678579178114
+ 31
+0.0
+ 11
+231.55053264809072
+ 21
+98.0
+ 31
+0.0
+  0
+SPLINE
+  5
+A0
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+241.97869256386974
+ 21
+96.0
+ 31
+0.0
+ 11
+232.62816735388895
+ 21
+108.38491325511347
+ 31
+0.0
+ 11
+217.88217571324788
+ 21
+116.30057757617925
+ 31
+0.0
+ 11
+207.29643062760906
+ 21
+123.22232297070678
+ 31
+0.0
+ 11
+199.25565371806513
+ 21
+132.70517088057093
+ 31
+0.0
+ 11
+187.2228793400974
+ 21
+141.40845745672718
+ 31
+0.0
+ 11
+171.0
+ 21
+144.52160511425322
+ 31
+0.0
+ 11
+154.29431866282246
+ 21
+142.75983864405134
+ 31
+0.0
+ 11
+138.25565371806513
+ 21
+138.5361535657052
+ 31
+0.0
+ 11
+124.7248768085212
+ 21
+130.7063423936091
+ 31
+0.0
+ 11
+118.62782428675212
+ 21
+118.67781730956753
+ 31
+0.0
+ 11
+119.83332720706096
+ 21
+106.28255149069165
+ 31
+0.0
+ 11
+119.97869256386977
+ 21
+96.0
+ 31
+0.0
+ 11
+114.7852165466226
+ 21
+84.70297062823282
+ 31
+0.0
+ 11
+112.22707645154637
+ 21
+70.55057757617926
+ 31
+0.0
+ 11
+121.02940332285021
+ 21
+58.5220524921377
+ 31
+0.0
+ 11
+138.25565371806508
+ 21
+53.4638464342948
+ 31
+0.0
+ 11
+155.64695583758987
+ 21
+53.02624435127743
+ 31
+0.0
+ 11
+171.0
+ 21
+53.02160511425322
+ 31
+0.0
+ 11
+185.87024216532996
+ 21
+54.377625538601585
+ 31
+0.0
+ 11
+199.25565371806513
+ 21
+59.29482911942907
+ 31
+0.0
+ 11
+210.99190411328
+ 21
+66.00607191504
+ 31
+0.0
+ 11
+224.2829235484536
+ 21
+72.92781730956752
+ 31
+0.0
+ 11
+237.67627801432727
+ 21
+82.60060886381095
+ 31
+0.0
+ 11
+241.97869256386974
+ 21
+96.0
+ 31
+0.0
+  0
+SPLINE
+  5
+A1
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MAJOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+251.59177955329739
+ 21
+94.0
+ 31
+0.0
+ 11
+240.35779355666563
+ 21
+107.33538789626478
+ 31
+0.0
+ 11
+224.61873766490416
+ 21
+115.91855636265359
+ 31
+0.0
+ 11
+214.27880498462827
+ 21
+124.20910373847119
+ 31
+0.0
+ 11
+206.2641102233513
+ 21
+135.91230862588517
+ 31
+0.0
+ 11
+192.71218111520287
+ 21
+146.37610798177593
+ 31
+0.0
+ 11
+174.0
+ 21
+149.51284953911244
+ 31
+0.0
+ 11
+155.31036754823066
+ 21
+146.3129934135935
+ 31
+0.0
+ 11
+138.26411022335134
+ 21
+140.42228256012757
+ 31
+0.0
+ 11
+124.12941546207435
+ 21
+131.40293840344424
+ 31
+0.0
+ 11
+117.26126233509584
+ 21
+118.56859409823397
+ 31
+0.0
+ 11
+117.21143733319828
+ 21
+105.41233712942031
+ 31
+0.0
+ 11
+115.59177955329739
+ 21
+94.0
+ 31
+0.0
+ 11
+108.99188118135231
+ 21
+80.93584529580767
+ 31
+0.0
+ 11
+106.83928275022049
+ 21
+64.91855636265362
+ 31
+0.0
+ 11
+118.11228274325775
+ 21
+52.08421205744336
+ 31
+0.0
+ 11
+138.26411022335128
+ 21
+47.57771743987244
+ 31
+0.0
+ 11
+157.51279098126005
+ 21
+47.85167370029099
+ 31
+0.0
+ 11
+174.0
+ 21
+47.51284953911243
+ 31
+0.0
+ 11
+190.50975768217344
+ 21
+47.78855913210852
+ 31
+0.0
+ 11
+206.2641102233513
+ 21
+52.08769137411484
+ 31
+0.0
+ 11
+220.2959377034448
+ 21
+59.27804672241638
+ 31
+0.0
+ 11
+235.04071724977945
+ 21
+67.56859409823397
+ 31
+0.0
+ 11
+248.57734970851152
+ 21
+79.01279452896313
+ 31
+0.0
+ 11
+251.59177955329739
+ 21
+94.0
+ 31
+0.0
+  0
+TEXT
+  5
+A2
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+252.59177955329739
+ 20
+94.0
+ 30
+0.0
+ 40
+3.0
+  1
+110
+  7
+SITE
+ 11
+252.59177955329739
+ 21
+94.0
+ 31
+0.0
+100
+AcDbText
+ 73
+2
+  0
+SPLINE
+  5
+A3
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+260.3464189221045
+ 21
+92.0
+ 31
+0.0
+ 11
+247.63915514445503
+ 21
+106.19577843123014
+ 31
+0.0
+ 11
+231.5303603072676
+ 21
+115.61233865180617
+ 31
+0.0
+ 11
+221.79147448886206
+ 21
+125.59360586664654
+ 31
+0.0
+ 11
+213.70179053894776
+ 21
+139.67702445665617
+ 31
+0.0
+ 11
+198.32159503188961
+ 21
+151.67995696806514
+ 31
+0.0
+ 11
+177.0
+ 21
+154.35248695861517
+ 31
+0.0
+ 11
+156.520517929023
+ 21
+149.32285070118658
+ 31
+0.0
+ 11
+138.70179053894776
+ 21
+141.75083346909315
+ 31
+0.0
+ 11
+123.86210658903349
+ 21
+131.85342005822488
+ 31
+0.0
+ 11
+115.71963969273239
+ 21
+118.53517438957866
+ 31
+0.0
+ 11
+113.86515081673686
+ 21
+104.68769888968708
+ 31
+0.0
+ 11
+110.34641892210448
+ 21
+92.0
+ 31
+0.0
+ 11
+102.75028120109478
+ 21
+77.07863585719655
+ 31
+0.0
+ 11
+101.6265497396018
+ 21
+59.3623386518062
+ 31
+0.0
+ 11
+115.72545731087988
+ 21
+46.04409298315996
+ 31
+0.0
+ 11
+138.7017905389477
+ 21
+42.24916653090684
+ 31
+0.0
+ 11
+159.4987382665115
+ 21
+43.01330151054496
+ 31
+0.0
+ 11
+177.0
+ 21
+41.85248695861517
+ 31
+0.0
+ 11
+195.34337469440106
+ 21
+40.656195243666396
+ 31
+0.0
+ 11
+213.70179053894776
+ 21
+44.32297554334383
+ 31
+0.0
+ 11
+229.9281237670156
+ 21
+52.303907174738285
+ 31
+0.0
+ 11
+245.62345026039816
+ 21
+62.28517438957864
+ 31
+0.0
+ 11
+258.7540247600971
+ 21
+75.57055631565343
+ 31
+0.0
+ 11
+260.3464189221045
+ 21
+92.0
+ 31
+0.0
+  0
+SPLINE
+  5
+A4
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+268.3086208793091
+ 21
+90.0
+ 31
+0.0
+ 11
+254.7307773468165
+ 21
+105.01803857987214
+ 31
+0.0
+ 11
+238.88767397846223
+ 21
+115.49911081756206
+ 31
+0.0
+ 11
+229.95768253436816
+ 21
+127.46826190077613
+ 31
+0.0
+ 11
+221.53568956034547
+ 21
+143.9564434844449
+ 31
+0.0
+ 11
+203.98184946367417
+ 21
+157.1261104934253
+ 31
+0.0
+ 11
+180.0
+ 21
+158.80614462491127
+ 31
+0.0
+ 11
+157.96988001827322
+ 21
+151.66314530148202
+ 31
+0.0
+ 11
+139.53568956034547
+ 21
+142.56468118104107
+ 31
+0.0
+ 11
+123.73369658632276
+ 21
+132.19972756025794
+ 31
+0.0
+ 11
+113.73232602153777
+ 21
+118.69474455752663
+ 31
+0.0
+ 11
+109.62611405054523
+ 21
+104.14246943129727
+ 31
+0.0
+ 11
+104.3086208793091
+ 21
+90.0
+ 31
+0.0
+ 11
+96.31894183540929
+ 21
+73.18329603226208
+ 31
+0.0
+ 11
+96.85950775781428
+ 21
+53.99911081756209
+ 31
+0.0
+ 11
+113.99217041977431
+ 21
+40.4941278148308
+ 31
+0.0
+ 11
+139.53568956034542
+ 21
+37.43531881895895
+ 31
+0.0
+ 11
+161.53552606686077
+ 21
+38.317233859869916
+ 31
+0.0
+ 11
+180.0
+ 21
+35.8061446249113
+ 31
+0.0
+ 11
+200.41620341508658
+ 21
+32.85426866792661
+ 31
+0.0
+ 11
+221.53568956034547
+ 21
+36.0435565155551
+ 31
+0.0
+ 11
+239.69920870091653
+ 21
+45.22559347431258
+ 31
+0.0
+ 11
+255.76049224218568
+ 21
+57.19474455752662
+ 31
+0.0
+ 11
+268.03794956195236
+ 21
+72.30772688368715
+ 31
+0.0
+ 11
+268.3086208793091
+ 21
+90.0
+ 31
+0.0
+  0
+SPLINE
+  5
+A5
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+275.6552759865501
+ 21
+88.0
+ 31
+0.0
+ 11
+261.948464748782
+ 21
+103.86563302983481
+ 31
+0.0
+ 11
+246.93791112697645
+ 21
+115.68592765043665
+ 31
+0.0
+ 11
+238.83172356101434
+ 21
+129.87379267076074
+ 31
+0.0
+ 11
+229.67736200672496
+ 21
+148.63567191919958
+ 31
+0.0
+ 11
+209.60832482703114
+ 21
+162.47771511908246
+ 31
+0.0
+ 11
+183.0
+ 21
+162.65971295697
+ 31
+0.0
+ 11
+159.6783269602572
+ 21
+153.27825152637212
+ 31
+0.0
+ 11
+140.677362006725
+ 21
+142.97871948602298
+ 31
+0.0
+ 11
+123.51300045243556
+ 21
+132.61524966067333
+ 31
+0.0
+ 11
+111.05208887302356
+ 21
+119.15435939259334
+ 31
+0.0
+ 11
+104.4201594504798
+ 21
+103.79155361245776
+ 31
+0.0
+ 11
+97.65527598655011
+ 21
+88.00000000000001
+ 31
+0.0
+ 11
+90.01366766932783
+ 21
+69.3132905086483
+ 31
+0.0
+ 11
+92.78538925334634
+ 21
+48.93592765043668
+ 31
+0.0
+ 11
+112.96671650980882
+ 21
+35.475037382356675
+ 31
+0.0
+ 11
+140.6773620067249
+ 21
+33.021280513977025
+ 31
+0.0
+ 11
+163.53853479878248
+ 21
+33.52661730949184
+ 31
+0.0
+ 11
+182.99999999999997
+ 21
+29.15971295697001
+ 31
+0.0
+ 11
+205.74811698850584
+ 21
+24.32715371678151
+ 31
+0.0
+ 11
+229.67736200672496
+ 21
+27.364328080800412
+ 31
+0.0
+ 11
+249.37800750364102
+ 21
+38.216494372269224
+ 31
+0.0
+ 11
+265.2046107466536
+ 21
+52.40435939259331
+ 31
+0.0
+ 11
+276.35495652993393
+ 21
+69.23921109127117
+ 31
+0.0
+ 11
+275.6552759865501
+ 21
+88.0
+ 31
+0.0
+  0
+SPLINE
+  5
+A6
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+282.66216449324327
+ 21
+86.0
+ 31
+0.0
+ 11
+269.63102300052367
+ 21
+102.80664880638423
+ 31
+0.0
+ 11
+255.87182740148103
+ 21
+116.2553887692621
+ 31
+0.0
+ 11
+248.38584026920222
+ 21
+132.78938020190168
+ 31
+0.0
+ 11
+237.98891775337836
+ 21
+153.53558523452818
+ 31
+0.0
+ 11
+215.11023842160583
+ 21
+167.48066660740744
+ 31
+0.0
+ 11
+186.0
+ 21
+165.74799271712703
+ 31
+0.0
+ 11
+161.63569887818144
+ 21
+154.19660725815072
+ 31
+0.0
+ 11
+141.98891775337836
+ 21
+143.17207291043098
+ 31
+0.0
+ 11
+122.95199523755448
+ 21
+133.28600357183416
+ 31
+0.0
+ 11
+107.488172598519
+ 21
+119.99661851361085
+ 31
+0.0
+ 11
+98.28520419293238
+ 21
+103.62733152557347
+ 31
+0.0
+ 11
+90.66216449324332
+ 21
+86.00000000000001
+ 31
+0.0
+ 11
+84.17326435302257
+ 21
+65.53670631162123
+ 31
+0.0
+ 11
+89.59494987486876
+ 21
+44.25538876926211
+ 31
+0.0
+ 11
+112.62133828138504
+ 21
+30.966003711038837
+ 31
+0.0
+ 11
+141.9889177533783
+ 21
+28.827927089569023
+ 31
+0.0
+ 11
+165.41698176192185
+ 21
+28.387347621781622
+ 31
+0.0
+ 11
+185.99999999999997
+ 21
+21.747992717127033
+ 31
+0.0
+ 11
+211.32895553786537
+ 21
+15.103288272524864
+ 31
+0.0
+ 11
+237.98891775337836
+ 21
+18.46441476547183
+ 31
+0.0
+ 11
+258.7164972253716
+ 21
+31.46262708097128
+ 31
+0.0
+ 11
+273.7650501251312
+ 21
+47.996618513610834
+ 31
+0.0
+ 11
+283.74296284043345
+ 21
+66.3573890308104
+ 31
+0.0
+ 11
+282.66216449324327
+ 21
+86.0
+ 31
+0.0
+  0
+SPLINE
+  5
+A7
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MAJOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+289.6792102724861
+ 21
+84.0
+ 31
+0.0
+ 11
+278.10086537956244
+ 21
+101.90587869252595
+ 31
+0.0
+ 11
+265.7951834933446
+ 21
+117.25328989676191
+ 31
+0.0
+ 11
+258.5061316860145
+ 21
+136.12959876451086
+ 31
+0.0
+ 11
+246.29539486375697
+ 21
+158.42890120781095
+ 31
+0.0
+ 11
+220.40119987005744
+ 21
+171.89315500025964
+ 31
+0.0
+ 11
+189.0
+ 21
+167.9793924599353
+ 31
+0.0
+ 11
+163.80030512244247
+ 21
+154.53490621370847
+ 31
+0.0
+ 11
+143.295394863757
+ 21
+143.37202367688482
+ 31
+0.0
+ 11
+121.81465804149943
+ 21
+134.38900646887544
+ 31
+0.0
+ 11
+102.93481650665538
+ 21
+121.26731764330279
+ 31
+0.0
+ 11
+91.3768399004238
+ 21
+103.61853518344175
+ 31
+0.0
+ 11
+83.67921027248609
+ 21
+84.00000000000001
+ 31
+0.0
+ 11
+79.12014516401436
+ 21
+61.91833622418649
+ 31
+0.0
+ 11
+87.39395031375024
+ 21
+40.003289896761935
+ 31
+0.0
+ 11
+112.84213476158564
+ 21
+26.881601071189287
+ 31
+0.0
+ 11
+143.29539486375688
+ 21
+24.627976323115185
+ 31
+0.0
+ 11
+167.08447657893817
+ 21
+22.65761483859861
+ 31
+0.0
+ 11
+188.99999999999997
+ 21
+13.479392459935312
+ 31
+0.0
+ 11
+217.11702841356168
+ 21
+5.299366052047418
+ 31
+0.0
+ 11
+246.29539486375697
+ 21
+9.571098792189048
+ 31
+0.0
+ 11
+267.4786549659282
+ 21
+25.14100877555383
+ 31
+0.0
+ 11
+281.33604968624974
+ 21
+44.01731764330274
+ 31
+0.0
+ 11
+290.35756011597186
+ 21
+63.63099271510221
+ 31
+0.0
+ 11
+289.6792102724861
+ 21
+84.0
+ 31
+0.0
+  0
+TEXT
+  5
+A8
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+290.6792102724861
+ 20
+84.0
+ 30
+0.0
+ 40
+3.0
+  1
+120
+  7
+SITE
+ 11
+290.6792102724861
+ 21
+84.0
+ 31
+0.0
+100
+AcDbText
+ 73
+2
+  0
+SPLINE
+  5
+A9
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+297.09519980414063
+ 21
+82.0
+ 31
+0.0
+ 11
+287.6238385648448
+ 21
+101.21674774046065
+ 31
+0.0
+ 11
+276.7083605162395
+ 21
+118.67979605999705
+ 31
+0.0
+ 11
+268.9984246076013
+ 21
+139.74881845570098
+ 31
+0.0
+ 11
+254.4024000979297
+ 21
+163.06309561289146
+ 31
+0.0
+ 11
+225.4099757694517
+ 21
+175.51579528842916
+ 31
+0.0
+ 11
+192.0
+ 21
+169.3535821312729
+ 31
+0.0
+ 11
+166.101073367697
+ 21
+154.49208253994016
+ 31
+0.0
+ 11
+144.4024000979297
+ 21
+143.83109601154092
+ 31
+0.0
+ 11
+119.90637558825807
+ 21
+136.07021830880646
+ 31
+0.0
+ 11
+97.3916394837605
+ 21
+122.96662180873003
+ 31
+0.0
+ 11
+83.96031210214717
+ 21
+103.71186034205518
+ 31
+0.0
+ 11
+77.09519980414066
+ 21
+82.00000000000001
+ 31
+0.0
+ 11
+75.12015678124975
+ 21
+58.51160529854472
+ 31
+0.0
+ 11
+86.18277168366298
+ 21
+36.17979605999709
+ 31
+0.0
+ 11
+113.43493274656076
+ 21
+23.07619955992064
+ 31
+0.0
+ 11
+144.40240009792961
+ 21
+20.168903988459085
+ 31
+0.0
+ 11
+168.46978584689717
+ 21
+16.138033950732904
+ 31
+0.0
+ 11
+191.99999999999997
+ 21
+4.35358213127293
+ 31
+0.0
+ 11
+223.0412632902515
+ 21
+-4.885678797756128
+ 31
+0.0
+ 11
+254.4024000979297
+ 21
+0.936904387108541
+ 31
+0.0
+ 11
+275.4698674492985
+ 21
+19.397599413026093
+ 31
+0.0
+ 11
+287.917228316337
+ 21
+40.466621808729975
+ 31
+0.0
+ 11
+296.4639938857421
+ 21
+61.006717900139165
+ 31
+0.0
+ 11
+297.09519980414063
+ 21
+82.0
+ 31
+0.0
+  0
+SPLINE
+  5
+AA
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+305.29547714798207
+ 21
+80.0
+ 31
+0.0
+ 11
+298.37287227290756
+ 21
+100.77400823360838
+ 31
+0.0
+ 11
+288.4969068196331
+ 21
+120.48534824053439
+ 31
+0.0
+ 11
+279.60396831283094
+ 21
+143.45297623462324
+ 31
+0.0
+ 11
+262.117261426009
+ 21
+167.18788014104774
+ 31
+0.0
+ 11
+230.0902297418953
+ 21
+178.21889018451336
+ 31
+0.0
+ 11
+195.0
+ 21
+169.96967976800613
+ 31
+0.0
+ 11
+168.44329427676334
+ 21
+154.33323128058083
+ 31
+0.0
+ 11
+145.117261426009
+ 21
+144.79957822312127
+ 31
+0.0
+ 11
+117.100554539187
+ 21
+138.42458409560976
+ 31
+0.0
+ 11
+90.97309318036686
+ 21
+125.04497199145948
+ 31
+0.0
+ 11
+76.38908085641586
+ 21
+103.83627499852744
+ 31
+0.0
+ 11
+71.29547714798206
+ 21
+80.00000000000001
+ 31
+0.0
+ 11
+72.34622892126559
+ 21
+55.35126581811599
+ 31
+0.0
+ 11
+85.84696233407446
+ 21
+32.735348240534435
+ 31
+0.0
+ 11
+114.14098151517878
+ 21
+19.355736136384152
+ 31
+0.0
+ 11
+145.11726142600892
+ 21
+15.200421776878756
+ 31
+0.0
+ 11
+169.52657318790546
+ 21
+8.69890767078185
+ 31
+0.0
+ 11
+194.99999999999997
+ 21
+-5.530320231993883
+ 31
+0.0
+ 11
+229.0069508307531
+ 21
+-15.186751233150659
+ 31
+0.0
+ 11
+262.117261426009
+ 21
+-7.187880141047728
+ 31
+0.0
+ 11
+282.5635413368391
+ 21
+14.327343997370647
+ 31
+0.0
+ 11
+293.6230376659255
+ 21
+37.294971991459434
+ 31
+0.0
+ 11
+302.4157242080578
+ 21
+58.413532583034964
+ 31
+0.0
+ 11
+305.29547714798207
+ 21
+80.0
+ 31
+0.0
+  0
+SPLINE
+  5
+AB
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+314.61707062052267
+ 21
+78.0
+ 31
+0.0
+ 11
+310.39982562073607
+ 21
+100.58808187835643
+ 31
+0.0
+ 11
+300.9347020451329
+ 21
+122.57203345103352
+ 31
+0.0
+ 11
+290.02369799366005
+ 21
+147.01777349524502
+ 31
+0.0
+ 11
+269.27146468973865
+ 21
+170.5843484793589
+ 31
+0.0
+ 11
+234.42806617887177
+ 21
+179.96354535077322
+ 31
+0.0
+ 11
+198.0
+ 21
+170.0235113448158
+ 31
+0.0
+ 11
+170.71750253251963
+ 21
+154.36475002950453
+ 31
+0.0
+ 11
+145.27146468973868
+ 21
+146.49637662454666
+ 31
+0.0
+ 11
+113.3592313858173
+ 21
+141.48057646063705
+ 31
+0.0
+ 11
+83.90529795486715
+ 21
+127.40445520415068
+ 31
+0.0
+ 11
+69.07167628839522
+ 21
+103.90968016501718
+ 31
+0.0
+ 11
+66.6170706205227
+ 21
+78.00000000000001
+ 31
+0.0
+ 11
+70.85022070104716
+ 21
+52.44773948928757
+ 31
+0.0
+ 11
+86.16040190659201
+ 21
+29.572033451033548
+ 31
+0.0
+ 11
+114.66121625939617
+ 21
+15.49591219454721
+ 31
+0.0
+ 11
+145.2714646897386
+ 21
+9.50362337545333
+ 31
+0.0
+ 11
+170.24094299344665
+ 21
+0.3013416610065178
+ 31
+0.0
+ 11
+197.99999999999997
+ 21
+-15.976488655184184
+ 31
+0.0
+ 11
+234.9046257179447
+ 21
+-25.297453660262192
+ 31
+0.0
+ 11
+269.27146468973865
+ 21
+-14.584348479358908
+ 31
+0.0
+ 11
+288.721713120081
+ 21
+9.958715159939203
+ 31
+0.0
+ 11
+298.67959809340795
+ 21
+34.40445520415064
+ 31
+0.0
+ 11
+308.6212812080841
+ 21
+55.76933777594823
+ 31
+0.0
+ 11
+314.61707062052267
+ 21
+78.0
+ 31
+0.0
+  0
+SPLINE
+  5
+AC
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+325.30619319380804
+ 21
+76.0
+ 31
+0.0
+ 11
+323.6191801154361
+ 21
+100.64178271637311
+ 31
+0.0
+ 11
+313.70008640020285
+ 21
+124.80056891563837
+ 31
+0.0
+ 11
+299.94879679625774
+ 21
+150.2115975971933
+ 31
+0.0
+ 11
+275.741903403096
+ 21
+173.09258061142555
+ 31
+0.0
+ 11
+238.44639969149011
+ 21
+180.81389965687947
+ 31
+0.0
+ 11
+201.0
+ 21
+169.79364241341398
+ 31
+0.0
+ 11
+172.81066332134702
+ 21
+154.9030275372984
+ 31
+0.0
+ 11
+144.741903403096
+ 21
+149.08141123221665
+ 31
+0.0
+ 11
+108.74501000993425
+ 21
+145.19124249254932
+ 31
+0.0
+ 11
+76.50991359979716
+ 21
+129.90578867094766
+ 31
+0.0
+ 11
+62.429950065534825
+ 21
+103.84729973131024
+ 31
+0.0
+ 11
+63.30619319380807
+ 21
+76.00000000000001
+ 31
+0.0
+ 11
+70.5466136277002
+ 21
+49.78384035372778
+ 31
+0.0
+ 11
+86.80143060867987
+ 21
+26.550568915638408
+ 31
+0.0
+ 11
+114.6868201253822
+ 21
+11.26511509403673
+ 31
+0.0
+ 11
+144.7419034030959
+ 21
+2.918588767783362
+ 31
+0.0
+ 11
+170.6358098746297
+ 21
+-8.990525208922435
+ 31
+0.0
+ 11
+200.99999999999997
+ 21
+-26.706357586586023
+ 31
+0.0
+ 11
+240.62125313820738
+ 21
+-34.90139732850352
+ 31
+0.0
+ 11
+275.741903403096
+ 21
+-21.09258061142556
+ 31
+0.0
+ 11
+294.00698668080963
+ 21
+6.2447599893927475
+ 31
+0.0
+ 11
+303.40856939132004
+ 21
+31.655788670947608
+ 31
+0.0
+ 11
+315.50251655327065
+ 21
+52.98935736866483
+ 31
+0.0
+ 11
+325.30619319380804
+ 21
+76.0
+ 31
+0.0
+  0
+SPLINE
+  5
+AD
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MAJOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+337.4830200860729
+ 21
+74.0
+ 31
+0.0
+ 11
+337.80607878372757
+ 21
+100.88992306435622
+ 31
+0.0
+ 11
+326.40387787526345
+ 21
+127.00243388085306
+ 31
+0.0
+ 11
+309.09448277351214
+ 21
+152.8208620801341
+ 31
+0.0
+ 11
+281.4684899569636
+ 21
+174.63452044332516
+ 31
+0.0
+ 11
+242.2054805241532
+ 21
+180.93859583279217
+ 31
+0.0
+ 11
+204.0
+ 21
+169.61711448079248
+ 31
+0.0
+ 11
+174.61853921606337
+ 21
+156.239828334683
+ 31
+0.0
+ 11
+143.4684899569636
+ 21
+152.63273814005362
+ 31
+0.0
+ 11
+103.42249714041503
+ 21
+149.43312714468874
+ 31
+0.0
+ 11
+69.17612212473654
+ 21
+132.38045163835443
+ 31
+0.0
+ 11
+56.852921562128785
+ 21
+103.57095562702003
+ 31
+0.0
+ 11
+61.483020086072855
+ 21
+74.00000000000001
+ 31
+0.0
+ 11
+71.21055072794468
+ 21
+47.314380728134424
+ 31
+0.0
+ 11
+87.38086643075837
+ 21
+23.502433880853104
+ 31
+0.0
+ 11
+113.93301116602497
+ 21
+6.449758374518808
+ 31
+0.0
+ 11
+143.4684899569635
+ 21
+-4.632738140053604
+ 31
+0.0
+ 11
+170.77142407585745
+ 21
+-19.008050209044967
+ 31
+0.0
+ 11
+203.99999999999997
+ 21
+-37.382885519207505
+ 31
+0.0
+ 11
+246.05259566435902
+ 21
+-43.706817707154116
+ 31
+0.0
+ 11
+281.4684899569636
+ 21
+-26.634520443325158
+ 31
+0.0
+ 11
+298.5839687479021
+ 21
+3.0620234390733856
+ 31
+0.0
+ 11
+308.1991335692416
+ 21
+28.88045163835438
+ 31
+0.0
+ 11
+323.44844961791154
+ 21
+49.99541329079813
+ 31
+0.0
+ 11
+337.4830200860729
+ 21
+74.0
+ 31
+0.0
+  0
+TEXT
+  5
+AE
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+338.4830200860729
+ 20
+74.0
+ 30
+0.0
+ 40
+3.0
+  1
+130
+  7
+SITE
+ 11
+338.4830200860729
+ 21
+74.0
+ 31
+0.0
+100
+AcDbText
+ 73
+2
+  0
+SPLINE
+  5
+AF
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbSpline
+ 70
+0
+ 71
+3
+ 72
+0
+ 73
+0
+ 74
+25
+ 11
+351.11807155880115
+ 21
+72.0
+ 31
+0.0
+ 11
+352.6097441378531
+ 21
+101.2620100138801
+ 31
+0.0
+ 11
+338.6268386404416
+ 21
+128.99609304122876
+ 31
+0.0
+ 11
+317.23344872074955
+ 21
+154.67508654056215
+ 31
+0.0
+ 11
+286.46596422059946
+ 21
+175.22931562689658
+ 31
+0.0
+ 11
+245.79929922142856
+ 21
+180.60071699432928
+ 31
+0.0
+ 11
+207.0
+ 21
+169.85699815784898
+ 31
+0.0
+ 11
+176.05793000529485
+ 21
+158.6080329836941
+ 31
+0.0
+ 11
+141.4659642205995
+ 21
+157.1312096962188
+ 31
+0.0
+ 11
+97.64847972044937
+ 21
+154.01364020966298
+ 31
+0.0
+ 11
+62.323161359558384
+ 21
+134.64690880092223
+ 31
+0.0
+ 11
+52.6510981942246
+ 21
+103.01824769361616
+ 31
+0.0
+ 11
+61.11807155880112
+ 21
+72.00000000000001
+ 31
+0.0
+ 11
+72.4912545140233
+ 21
+44.96886770408183
+ 31
+0.0
+ 11
+87.47947154295434
+ 21
+20.246093041228818
+ 31
+0.0
+ 11
+112.17248217665069
+ 21
+0.8793616324880986
+ 31
+0.0
+ 11
+141.4659642205994
+ 21
+-13.131209696218804
+ 31
+0.0
+ 11
+170.74177614169758
+ 21
+-29.4881502235431
+ 31
+0.0
+ 11
+206.99999999999997
+ 21
+-47.64300184215102
+ 31
+0.0
+ 11
+251.1154530850258
+ 21
+-51.4808342341783
+ 31
+0.0
+ 11
+286.4659642205995
+ 21
+-31.22931562689662
+ 31
+0.0
+ 11
+302.70944626454815
+ 21
+0.2179153015888602
+ 31
+0.0
+ 11
+313.4705284570456
+ 21
+25.896908800922198
+ 31
+0.0
+ 11
+332.76958781805433
+ 21
+46.7251053838178
+ 31
+0.0
+ 11
+351.11807155880115
+ 21
+72.0
+ 31
+0.0
+  0
+LWPOLYLINE
+  5
+B0
+330
+17
+100
+AcDbEntity
+  8
+ROAD
+100
+AcDbPolyline
+ 90
+5
+ 70
+0
+ 43
+9.0
+ 10
+-40.0
+ 20
+40.0
+ 10
+60.0
+ 20
+50.0
+ 10
+140.0
+ 20
+20.0
+ 10
+260.0
+ 20
+30.0
+ 10
+360.0
+ 20
+70.0
+  0
+LWPOLYLINE
+  5
+B1
+330
+17
+100
+AcDbEntity
+  8
+ROAD
+100
+AcDbPolyline
+ 90
+3
+ 70
+0
+ 43
+6.0
+ 10
+140.0
+ 20
+20.0
+ 10
+150.0
+ 20
+-40.0
+ 10
+130.0
+ 20
+-90.0
+  0
+CIRCLE
+  5
+B2
+330
+17
+100
+AcDbEntity
+  8
+ROAD
+100
+AcDbCircle
+ 10
+140.0
+ 20
+20.0
+ 30
+0.0
+ 40
+12.0
+  0
+LWPOLYLINE
+  5
+B3
+330
+17
+100
+AcDbEntity
+  8
+PARCEL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20.0
+ 20
+60.0
+ 10
+120.0
+ 20
+66.0
+ 10
+116.0
+ 20
+150.0
+ 10
+14.0
+ 20
+140.0
+  0
+MTEXT
+  5
+B4
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+67.5
+ 20
+64.0
+ 30
+0.0
+ 40
+5.0
+ 71
+5
+  1
+Parcel 101\P8322 m²
+  7
+SITE
+  0
+LWPOLYLINE
+  5
+B5
+330
+17
+100
+AcDbEntity
+  8
+PARCEL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+120.0
+ 20
+66.0
+ 10
+230.0
+ 20
+62.0
+ 10
+240.0
+ 20
+160.0
+ 10
+116.0
+ 20
+150.0
+  0
+MTEXT
+  5
+B6
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+176.5
+ 20
+69.5
+ 30
+0.0
+ 40
+5.0
+ 71
+5
+  1
+Parcel 102\P10638 m²
+  7
+SITE
+  0
+LWPOLYLINE
+  5
+B7
+330
+17
+100
+AcDbEntity
+  8
+PARCEL
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+230.0
+ 20
+62.0
+ 10
+330.0
+ 20
+80.0
+ 10
+320.0
+ 20
+170.0
+ 10
+240.0
+ 20
+160.0
+  0
+MTEXT
+  5
+B8
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+280.0
+ 20
+78.0
+ 30
+0.0
+ 40
+5.0
+ 71
+5
+  1
+Parcel 103\P8460 m²
+  7
+SITE
+  0
+LWPOLYLINE
+  5
+B9
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+40.0
+ 20
+90.0
+ 10
+80.0
+ 20
+90.0
+ 10
+80.0
+ 20
+116.0
+ 10
+40.0
+ 20
+116.0
+  0
+HATCH
+  5
+BA
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+40.0
+ 20
+90.0
+ 10
+80.0
+ 20
+90.0
+ 10
+80.0
+ 20
+116.0
+ 10
+40.0
+ 20
+116.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+3.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.7351920909
+ 46
+6.7351920909
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BB
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+150.0
+ 20
+95.0
+ 10
+184.0
+ 20
+95.0
+ 10
+184.0
+ 20
+125.0
+ 10
+150.0
+ 20
+125.0
+  0
+HATCH
+  5
+BC
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+150.0
+ 20
+95.0
+ 10
+184.0
+ 20
+95.0
+ 10
+184.0
+ 20
+125.0
+ 10
+150.0
+ 20
+125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+3.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.7351920909
+ 46
+6.7351920909
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BD
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+262.0
+ 20
+110.0
+ 10
+306.0
+ 20
+110.0
+ 10
+306.0
+ 20
+138.0
+ 10
+262.0
+ 20
+138.0
+  0
+HATCH
+  5
+BE
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+ 62
+8
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+ANSI31
+ 70
+0
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+262.0
+ 20
+110.0
+ 10
+306.0
+ 20
+110.0
+ 10
+306.0
+ 20
+138.0
+ 10
+262.0
+ 20
+138.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 52
+0.0
+ 41
+3.0
+ 77
+0
+ 78
+1
+ 53
+45.0
+ 43
+0.0
+ 44
+0.0
+ 45
+-6.7351920909
+ 46
+6.7351920909
+ 79
+0
+ 98
+0
+  0
+LWPOLYLINE
+  5
+BF
+330
+17
+100
+AcDbEntity
+  8
+WATER
+100
+AcDbPolyline
+ 90
+5
+ 70
+1
+ 10
+280.0
+ 20
+-10.0
+ 10
+310.0
+ 20
+-25.0
+ 10
+340.0
+ 20
+-5.0
+ 10
+325.0
+ 20
+20.0
+ 10
+295.0
+ 20
+18.0
+  0
+HATCH
+  5
+C0
+330
+17
+100
+AcDbEntity
+  8
+WATER
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+5
+ 10
+280.0
+ 20
+-10.0
+ 10
+310.0
+ 20
+-25.0
+ 10
+340.0
+ 20
+-5.0
+ 10
+325.0
+ 20
+20.0
+ 10
+295.0
+ 20
+18.0
+ 97
+0
+ 75
+0
+ 76
+1
+ 98
+0
+450
+1
+451
+0
+460
+1.5707963267948966
+461
+0.0
+452
+0
+462
+0.0
+453
+2
+463
+0
+421
+9226495
+463
+1
+421
+1989290
+470
+LINEAR
+  0
+CIRCLE
+  5
+C1
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+204.2446101602927
+ 20
+1.2680483891094099
+ 30
+0.0
+ 40
+2.851829061461684
+  0
+CIRCLE
+  5
+C2
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+312.03699879955013
+ 20
+-105.6492157574578
+ 30
+0.0
+ 40
+2.291558512442779
+  0
+CIRCLE
+  5
+C3
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+304.3241770302242
+ 20
+-93.01910530202835
+ 30
+0.0
+ 40
+2.2974173812296783
+  0
+CIRCLE
+  5
+C4
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+68.76621974313892
+ 20
+-28.435871114610435
+ 30
+0.0
+ 40
+2.475700019477771
+  0
+CIRCLE
+  5
+C5
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+-15.278891747995207
+ 20
+-77.49052993042278
+ 30
+0.0
+ 40
+1.9751200222188876
+  0
+CIRCLE
+  5
+C6
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+37.45751644889376
+ 20
+9.572048714680676
+ 30
+0.0
+ 40
+1.7359046112781353
+  0
+CIRCLE
+  5
+C7
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+202.28290736780198
+ 20
+-90.99511511745955
+ 30
+0.0
+ 40
+1.5030172657443088
+  0
+CIRCLE
+  5
+C8
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+293.70570810074156
+ 20
+-78.58154262573231
+ 30
+0.0
+ 40
+1.8663179876820448
+  0
+CIRCLE
+  5
+C9
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+84.14986038889354
+ 20
+34.221698342512525
+ 30
+0.0
+ 40
+2.4166798970803782
+  0
+CIRCLE
+  5
+CA
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+224.01897181021323
+ 20
+-79.28307281993108
+ 30
+0.0
+ 40
+3.0996592018495983
+  0
+CIRCLE
+  5
+CB
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+228.63109879848696
+ 20
+34.98464684757931
+ 30
+0.0
+ 40
+3.0193608518800135
+  0
+CIRCLE
+  5
+CC
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+87.56400322739239
+ 20
+-55.82150979164238
+ 30
+0.0
+ 40
+1.7821252971205674
+  0
+CIRCLE
+  5
+CD
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+32.4526874346457
+ 20
+-100.22904299364856
+ 30
+0.0
+ 40
+2.012310471308086
+  0
+CIRCLE
+  5
+CE
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+197.11959906675557
+ 20
+-109.49253209384649
+ 30
+0.0
+ 40
+2.6524882242310754
+  0
+CIRCLE
+  5
+CF
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+101.64287018603144
+ 20
+-63.50631025953068
+ 30
+0.0
+ 40
+2.8914807269000207
+  0
+CIRCLE
+  5
+D0
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+153.068267186814
+ 20
+-62.631034123033395
+ 30
+0.0
+ 40
+2.3180712566026687
+  0
+CIRCLE
+  5
+D1
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+233.68088829072732
+ 20
+-101.44986056963151
+ 30
+0.0
+ 40
+3.1576692573452
+  0
+CIRCLE
+  5
+D2
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+-11.768397229020543
+ 20
+2.469253343690994
+ 30
+0.0
+ 40
+2.9362975119598205
+  0
+CIRCLE
+  5
+D3
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+-13.495687263729156
+ 20
+8.16074559706513
+ 30
+0.0
+ 40
+2.122513608931163
+  0
+CIRCLE
+  5
+D4
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+188.26677846047485
+ 20
+-108.63824197707073
+ 30
+0.0
+ 40
+1.5794361017882006
+  0
+CIRCLE
+  5
+D5
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+45.13101566237722
+ 20
+33.27698493867496
+ 30
+0.0
+ 40
+1.834086839872114
+  0
+CIRCLE
+  5
+D6
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+252.0651084824744
+ 20
+29.448297939628162
+ 30
+0.0
+ 40
+3.101474510027089
+  0
+CIRCLE
+  5
+D7
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+103.97745269908431
+ 20
+-56.78101924131317
+ 30
+0.0
+ 40
+2.391993095178304
+  0
+CIRCLE
+  5
+D8
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+259.2170852916383
+ 20
+-93.79206964027506
+ 30
+0.0
+ 40
+2.772276696023927
+  0
+CIRCLE
+  5
+D9
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+267.0016039328798
+ 20
+18.954147878137007
+ 30
+0.0
+ 40
+1.5622736859028068
+  0
+CIRCLE
+  5
+DA
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+320.48806661518614
+ 20
+-96.32302037423472
+ 30
+0.0
+ 40
+2.079258910357178
+  0
+CIRCLE
+  5
+DB
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+199.89791371334474
+ 20
+27.71307782999682
+ 30
+0.0
+ 40
+2.077931195263936
+  0
+CIRCLE
+  5
+DC
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+92.48213296344649
+ 20
+-62.48000215049342
+ 30
+0.0
+ 40
+1.8017122183584806
+  0
+CIRCLE
+  5
+DD
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+8.150643599406454
+ 20
+-87.66979330651272
+ 30
+0.0
+ 40
+2.6715967984930877
+  0
+CIRCLE
+  5
+DE
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+338.8216532332134
+ 20
+-85.77058033630756
+ 30
+0.0
+ 40
+1.5825386780323756
+  0
+CIRCLE
+  5
+DF
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+126.11968764258575
+ 20
+-74.39950942185689
+ 30
+0.0
+ 40
+2.509732375178605
+  0
+CIRCLE
+  5
+E0
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+277.4663842475056
+ 20
+-41.65023477640028
+ 30
+0.0
+ 40
+2.216987379249702
+  0
+CIRCLE
+  5
+E1
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+0.05460316284163724
+ 20
+27.410402266298632
+ 30
+0.0
+ 40
+1.5556260739477688
+  0
+CIRCLE
+  5
+E2
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+157.68311143149958
+ 20
+15.764392175219825
+ 30
+0.0
+ 40
+1.721972106160304
+  0
+CIRCLE
+  5
+E3
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+243.39919241560352
+ 20
+32.46978439328481
+ 30
+0.0
+ 40
+2.5716787988248706
+  0
+CIRCLE
+  5
+E4
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+263.6834379209285
+ 20
+-94.00540854541117
+ 30
+0.0
+ 40
+2.238743824020743
+  0
+CIRCLE
+  5
+E5
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+33.72832403449282
+ 20
+16.71008455080444
+ 30
+0.0
+ 40
+2.001181974560351
+  0
+CIRCLE
+  5
+E6
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+143.13576885999143
+ 20
+39.894992210420185
+ 30
+0.0
+ 40
+2.9488295405193634
+  0
+CIRCLE
+  5
+E7
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+331.3627251087871
+ 20
+-41.969001561256505
+ 30
+0.0
+ 40
+2.329870297543901
+  0
+CIRCLE
+  5
+E8
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+242.6218071160675
+ 20
+-38.14363247822725
+ 30
+0.0
+ 40
+1.9947384491498574
+  0
+CIRCLE
+  5
+E9
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+125.3641894807649
+ 20
+-88.02404562470278
+ 30
+0.0
+ 40
+2.1409012712351494
+  0
+CIRCLE
+  5
+EA
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+335.81957214646536
+ 20
+33.97238252244469
+ 30
+0.0
+ 40
+2.5658404506232264
+  0
+CIRCLE
+  5
+EB
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+159.75608223980376
+ 20
+-59.22818595902589
+ 30
+0.0
+ 40
+1.6515336076629565
+  0
+CIRCLE
+  5
+EC
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+78.03164828914694
+ 20
+7.302845658474254
+ 30
+0.0
+ 40
+2.9745575715214136
+  0
+CIRCLE
+  5
+ED
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+110.07744388818116
+ 20
+7.903386945074544
+ 30
+0.0
+ 40
+2.817326756601691
+  0
+CIRCLE
+  5
+EE
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+230.054829802322
+ 20
+-10.39723325410651
+ 30
+0.0
+ 40
+2.7913858519471324
+  0
+CIRCLE
+  5
+EF
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+110.83543480450777
+ 20
+-4.329563898994536
+ 30
+0.0
+ 40
+1.9774484948806108
+  0
+CIRCLE
+  5
+F0
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+154.84668057671962
+ 20
+5.462120973642854
+ 30
+0.0
+ 40
+2.674501025804691
+  0
+CIRCLE
+  5
+F1
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+85.78673649190924
+ 20
+31.83213301756237
+ 30
+0.0
+ 40
+2.6044766538121102
+  0
+CIRCLE
+  5
+F2
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+189.03789748740132
+ 20
+-108.26290144662875
+ 30
+0.0
+ 40
+2.4298845165619176
+  0
+CIRCLE
+  5
+F3
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+70.24922368918189
+ 20
+-9.253561414385103
+ 30
+0.0
+ 40
+2.2869962810799858
+  0
+CIRCLE
+  5
+F4
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+267.14534080300797
+ 20
+-57.81732379584502
+ 30
+0.0
+ 40
+2.5949072240851008
+  0
+CIRCLE
+  5
+F5
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbCircle
+ 10
+245.61784697700637
+ 20
+14.228300238179813
+ 30
+0.0
+ 40
+2.0950767574307805
+  0
+POINT
+  5
+F6
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+278.1502637782402
+ 20
+136.1769256399019
+ 30
+0.0
+  0
+TEXT
+  5
+F7
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+279.6502637782402
+ 20
+136.6769256399019
+ 30
+0.0
+ 40
+1.8
+  1
+97.04
+  7
+SITE
+ 11
+279.6502637782402
+ 21
+136.6769256399019
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+F8
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+227.15119576773597
+ 20
+163.79176895850463
+ 30
+0.0
+  0
+TEXT
+  5
+F9
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+228.65119576773597
+ 20
+164.29176895850463
+ 30
+0.0
+ 40
+1.8
+  1
+106.61
+  7
+SITE
+ 11
+228.65119576773597
+ 21
+164.29176895850463
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+FA
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+315.65043740221824
+ 20
+44.71625191631267
+ 30
+0.0
+  0
+TEXT
+  5
+FB
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+317.15043740221824
+ 20
+45.21625191631267
+ 30
+0.0
+ 40
+1.8
+  1
+109.24
+  7
+SITE
+ 11
+317.15043740221824
+ 21
+45.21625191631267
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+FC
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+174.68222665390067
+ 20
+-46.79511940740176
+ 30
+0.0
+  0
+TEXT
+  5
+FD
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+176.18222665390067
+ 20
+-46.29511940740176
+ 30
+0.0
+ 40
+1.8
+  1
+89.47
+  7
+SITE
+ 11
+176.18222665390067
+ 21
+-46.29511940740176
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+FE
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+276.08469284675675
+ 20
+153.71923969687705
+ 30
+0.0
+  0
+TEXT
+  5
+FF
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+277.58469284675675
+ 20
+154.21923969687705
+ 30
+0.0
+ 40
+1.8
+  1
+98.95
+  7
+SITE
+ 11
+277.58469284675675
+ 21
+154.21923969687705
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+100
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+157.48884784685973
+ 20
+89.77065205944737
+ 30
+0.0
+  0
+TEXT
+  5
+101
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+158.98884784685973
+ 20
+90.27065205944737
+ 30
+0.0
+ 40
+1.8
+  1
+99.23
+  7
+SITE
+ 11
+158.98884784685973
+ 21
+90.27065205944737
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+102
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+237.49653705495027
+ 20
+99.89189064744619
+ 30
+0.0
+  0
+TEXT
+  5
+103
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+238.99653705495027
+ 20
+100.39189064744619
+ 30
+0.0
+ 40
+1.8
+  1
+101.39
+  7
+SITE
+ 11
+238.99653705495027
+ 21
+100.39189064744619
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+104
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+56.702829029690825
+ 20
+112.8966233388964
+ 30
+0.0
+  0
+TEXT
+  5
+105
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+58.202829029690825
+ 20
+113.3966233388964
+ 30
+0.0
+ 40
+1.8
+  1
+89.38
+  7
+SITE
+ 11
+58.202829029690825
+ 21
+113.3966233388964
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+106
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+191.67894907616233
+ 20
+83.04461958611074
+ 30
+0.0
+  0
+TEXT
+  5
+107
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+193.17894907616233
+ 20
+83.54461958611074
+ 30
+0.0
+ 40
+1.8
+  1
+108.85
+  7
+SITE
+ 11
+193.17894907616233
+ 21
+83.54461958611074
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+108
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+138.8613700857744
+ 20
+72.17164429898583
+ 30
+0.0
+  0
+TEXT
+  5
+109
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+140.3613700857744
+ 20
+72.67164429898583
+ 30
+0.0
+ 40
+1.8
+  1
+93.96
+  7
+SITE
+ 11
+140.3613700857744
+ 21
+72.67164429898583
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+10A
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+255.6525661509654
+ 20
+75.58533378231209
+ 30
+0.0
+  0
+TEXT
+  5
+10B
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+257.1525661509654
+ 20
+76.08533378231209
+ 30
+0.0
+ 40
+1.8
+  1
+103.97
+  7
+SITE
+ 11
+257.1525661509654
+ 21
+76.08533378231209
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+10C
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+237.7367766103562
+ 20
+-82.81827590722068
+ 30
+0.0
+  0
+TEXT
+  5
+10D
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+239.2367766103562
+ 20
+-82.31827590722068
+ 30
+0.0
+ 40
+1.8
+  1
+111.09
+  7
+SITE
+ 11
+239.2367766103562
+ 21
+-82.31827590722068
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+10E
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+52.80761237090758
+ 20
+24.677788036008693
+ 30
+0.0
+  0
+TEXT
+  5
+10F
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+54.30761237090758
+ 20
+25.177788036008693
+ 30
+0.0
+ 40
+1.8
+  1
+105.79
+  7
+SITE
+ 11
+54.30761237090758
+ 21
+25.177788036008693
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+110
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+214.53863091502416
+ 20
+-33.050077279364636
+ 30
+0.0
+  0
+TEXT
+  5
+111
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+216.03863091502416
+ 20
+-32.550077279364636
+ 30
+0.0
+ 40
+1.8
+  1
+100.20
+  7
+SITE
+ 11
+216.03863091502416
+ 21
+-32.550077279364636
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+112
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+226.36588655096244
+ 20
+74.02494212091122
+ 30
+0.0
+  0
+TEXT
+  5
+113
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+227.86588655096244
+ 20
+74.52494212091122
+ 30
+0.0
+ 40
+1.8
+  1
+111.23
+  7
+SITE
+ 11
+227.86588655096244
+ 21
+74.52494212091122
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+114
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+13.814362775791947
+ 20
+32.61223118556728
+ 30
+0.0
+  0
+TEXT
+  5
+115
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+15.314362775791947
+ 20
+33.11223118556728
+ 30
+0.0
+ 40
+1.8
+  1
+104.03
+  7
+SITE
+ 11
+15.314362775791947
+ 21
+33.11223118556728
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+116
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+74.66005656641728
+ 20
+-75.92281720138668
+ 30
+0.0
+  0
+TEXT
+  5
+117
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+76.16005656641728
+ 20
+-75.42281720138668
+ 30
+0.0
+ 40
+1.8
+  1
+94.51
+  7
+SITE
+ 11
+76.16005656641728
+ 21
+-75.42281720138668
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+118
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+44.06387199888762
+ 20
+-7.488781126775365
+ 30
+0.0
+  0
+TEXT
+  5
+119
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+45.56387199888762
+ 20
+-6.988781126775365
+ 30
+0.0
+ 40
+1.8
+  1
+118.38
+  7
+SITE
+ 11
+45.56387199888762
+ 21
+-6.988781126775365
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+11A
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+59.910580361473656
+ 20
+-39.7263735341773
+ 30
+0.0
+  0
+TEXT
+  5
+11B
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+61.410580361473656
+ 20
+-39.2263735341773
+ 30
+0.0
+ 40
+1.8
+  1
+113.50
+  7
+SITE
+ 11
+61.410580361473656
+ 21
+-39.2263735341773
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+11C
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+11.766991668281122
+ 20
+30.985842580243627
+ 30
+0.0
+  0
+TEXT
+  5
+11D
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+13.266991668281122
+ 20
+31.485842580243627
+ 30
+0.0
+ 40
+1.8
+  1
+104.07
+  7
+SITE
+ 11
+13.266991668281122
+ 21
+31.485842580243627
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+11E
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+125.4986206340262
+ 20
+69.06642719145128
+ 30
+0.0
+  0
+TEXT
+  5
+11F
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+126.9986206340262
+ 20
+69.56642719145128
+ 30
+0.0
+ 40
+1.8
+  1
+99.26
+  7
+SITE
+ 11
+126.9986206340262
+ 21
+69.56642719145128
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+120
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+194.75425271273303
+ 20
+-28.15993348744543
+ 30
+0.0
+  0
+TEXT
+  5
+121
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+196.25425271273303
+ 20
+-27.65993348744543
+ 30
+0.0
+ 40
+1.8
+  1
+96.10
+  7
+SITE
+ 11
+196.25425271273303
+ 21
+-27.65993348744543
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+122
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+298.0501666175098
+ 20
+-89.82823989439535
+ 30
+0.0
+  0
+TEXT
+  5
+123
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+299.5501666175098
+ 20
+-89.32823989439535
+ 30
+0.0
+ 40
+1.8
+  1
+97.12
+  7
+SITE
+ 11
+299.5501666175098
+ 21
+-89.32823989439535
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+124
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+133.77399701025467
+ 20
+-17.582701574845416
+ 30
+0.0
+  0
+TEXT
+  5
+125
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+135.27399701025467
+ 20
+-17.082701574845416
+ 30
+0.0
+ 40
+1.8
+  1
+87.04
+  7
+SITE
+ 11
+135.27399701025467
+ 21
+-17.082701574845416
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+126
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+135.31396385962077
+ 20
+-60.08064598513852
+ 30
+0.0
+  0
+TEXT
+  5
+127
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+136.81396385962077
+ 20
+-59.58064598513852
+ 30
+0.0
+ 40
+1.8
+  1
+93.24
+  7
+SITE
+ 11
+136.81396385962077
+ 21
+-59.58064598513852
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+128
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+274.35211971841903
+ 20
+7.208710541847154
+ 30
+0.0
+  0
+TEXT
+  5
+129
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+275.85211971841903
+ 20
+7.708710541847154
+ 30
+0.0
+ 40
+1.8
+  1
+126.01
+  7
+SITE
+ 11
+275.85211971841903
+ 21
+7.708710541847154
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+12A
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+11.90049649386008
+ 20
+69.52666370838458
+ 30
+0.0
+  0
+TEXT
+  5
+12B
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+13.40049649386008
+ 20
+70.02666370838458
+ 30
+0.0
+ 40
+1.8
+  1
+87.73
+  7
+SITE
+ 11
+13.40049649386008
+ 21
+70.02666370838458
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+12C
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+31.291149090549617
+ 20
+51.757424423757186
+ 30
+0.0
+  0
+TEXT
+  5
+12D
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+32.79114909054962
+ 20
+52.257424423757186
+ 30
+0.0
+ 40
+1.8
+  1
+93.73
+  7
+SITE
+ 11
+32.79114909054962
+ 21
+52.257424423757186
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+12E
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+111.99319313365189
+ 20
+61.03302192859255
+ 30
+0.0
+  0
+TEXT
+  5
+12F
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+113.49319313365189
+ 20
+61.53302192859255
+ 30
+0.0
+ 40
+1.8
+  1
+105.95
+  7
+SITE
+ 11
+113.49319313365189
+ 21
+61.53302192859255
+ 31
+0.0
+100
+AcDbText
+  0
+POINT
+  5
+130
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+ 62
+2
+100
+AcDbPoint
+ 10
+316.2391662302166
+ 20
+122.81571994410109
+ 30
+0.0
+  0
+TEXT
+  5
+131
+330
+17
+100
+AcDbEntity
+  8
+SPOT
+100
+AcDbText
+ 10
+317.7391662302166
+ 20
+123.31571994410109
+ 30
+0.0
+ 40
+1.8
+  1
+101.01
+  7
+SITE
+ 11
+317.7391662302166
+ 21
+123.31571994410109
+ 31
+0.0
+100
+AcDbText
+  0
+INSERT
+  5
+132
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbBlockReference
+  2
+NORTH
+ 10
+370.0
+ 20
+180.0
+ 30
+0.0
+ 41
+0.02
+ 42
+0.02
+ 43
+0.02
+  0
+LWPOLYLINE
+  5
+134
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+0.0
+ 20
+-130.0
+ 10
+20.0
+ 20
+-130.0
+ 10
+20.0
+ 20
+-125.0
+ 10
+0.0
+ 20
+-125.0
+  0
+HATCH
+  5
+135
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+252
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+0.0
+ 20
+-130.0
+ 10
+20.0
+ 20
+-130.0
+ 10
+20.0
+ 20
+-125.0
+ 10
+0.0
+ 20
+-125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+136
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+7
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+20.0
+ 20
+-130.0
+ 10
+40.0
+ 20
+-130.0
+ 10
+40.0
+ 20
+-125.0
+ 10
+20.0
+ 20
+-125.0
+  0
+HATCH
+  5
+137
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+20.0
+ 20
+-130.0
+ 10
+40.0
+ 20
+-130.0
+ 10
+40.0
+ 20
+-125.0
+ 10
+20.0
+ 20
+-125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+138
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+40.0
+ 20
+-130.0
+ 10
+60.0
+ 20
+-130.0
+ 10
+60.0
+ 20
+-125.0
+ 10
+40.0
+ 20
+-125.0
+  0
+HATCH
+  5
+139
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+252
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+40.0
+ 20
+-130.0
+ 10
+60.0
+ 20
+-130.0
+ 10
+60.0
+ 20
+-125.0
+ 10
+40.0
+ 20
+-125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+13A
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+7
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+60.0
+ 20
+-130.0
+ 10
+80.0
+ 20
+-130.0
+ 10
+80.0
+ 20
+-125.0
+ 10
+60.0
+ 20
+-125.0
+  0
+HATCH
+  5
+13B
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+7
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+60.0
+ 20
+-130.0
+ 10
+80.0
+ 20
+-130.0
+ 10
+80.0
+ 20
+-125.0
+ 10
+60.0
+ 20
+-125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+LWPOLYLINE
+  5
+13C
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+8
+100
+AcDbPolyline
+ 90
+4
+ 70
+1
+ 10
+80.0
+ 20
+-130.0
+ 10
+100.0
+ 20
+-130.0
+ 10
+100.0
+ 20
+-125.0
+ 10
+80.0
+ 20
+-125.0
+  0
+HATCH
+  5
+13D
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+ 62
+252
+100
+AcDbHatch
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+210
+0.0
+220
+0.0
+230
+1.0
+  2
+SOLID
+ 70
+1
+ 71
+0
+ 91
+1
+ 92
+3
+ 72
+0
+ 73
+1
+ 93
+4
+ 10
+80.0
+ 20
+-130.0
+ 10
+100.0
+ 20
+-130.0
+ 10
+100.0
+ 20
+-125.0
+ 10
+80.0
+ 20
+-125.0
+ 97
+0
+ 75
+1
+ 76
+1
+ 98
+0
+  0
+TEXT
+  5
+13E
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+0.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+0
+  7
+SITE
+ 72
+1
+ 11
+0.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+TEXT
+  5
+13F
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+20.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+20
+  7
+SITE
+ 72
+1
+ 11
+20.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+TEXT
+  5
+140
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+40.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+40
+  7
+SITE
+ 72
+1
+ 11
+40.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+TEXT
+  5
+141
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+60.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+60
+  7
+SITE
+ 72
+1
+ 11
+60.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+TEXT
+  5
+142
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+80.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+80
+  7
+SITE
+ 72
+1
+ 11
+80.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+TEXT
+  5
+143
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+100.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+100
+  7
+SITE
+ 72
+1
+ 11
+100.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+TEXT
+  5
+144
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+108.0
+ 20
+-138.0
+ 30
+0.0
+ 40
+3.0
+  1
+m
+  7
+SITE
+ 11
+108.0
+ 21
+-138.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+145
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MINOR
+100
+AcDbLine
+ 10
+370.0
+ 20
+170.0
+ 30
+0.0
+ 11
+390.0
+ 21
+170.0
+ 31
+0.0
+  0
+TEXT
+  5
+146
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+169.0
+ 30
+0.0
+ 40
+3.0
+  1
+Contour, 2 m
+  7
+SITE
+ 11
+394.0
+ 21
+169.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+147
+330
+17
+100
+AcDbEntity
+  8
+CONTOUR-MAJOR
+100
+AcDbLine
+ 10
+370.0
+ 20
+162.0
+ 30
+0.0
+ 11
+390.0
+ 21
+162.0
+ 31
+0.0
+  0
+TEXT
+  5
+148
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+161.0
+ 30
+0.0
+ 40
+3.0
+  1
+Contour, 10 m
+  7
+SITE
+ 11
+394.0
+ 21
+161.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+149
+330
+17
+100
+AcDbEntity
+  8
+PARCEL
+100
+AcDbLine
+ 10
+370.0
+ 20
+154.0
+ 30
+0.0
+ 11
+390.0
+ 21
+154.0
+ 31
+0.0
+  0
+TEXT
+  5
+14A
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+153.0
+ 30
+0.0
+ 40
+3.0
+  1
+Parcel boundary
+  7
+SITE
+ 11
+394.0
+ 21
+153.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+14B
+330
+17
+100
+AcDbEntity
+  8
+BUILDING
+100
+AcDbLine
+ 10
+370.0
+ 20
+146.0
+ 30
+0.0
+ 11
+390.0
+ 21
+146.0
+ 31
+0.0
+  0
+TEXT
+  5
+14C
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+145.0
+ 30
+0.0
+ 40
+3.0
+  1
+Building
+  7
+SITE
+ 11
+394.0
+ 21
+145.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+14D
+330
+17
+100
+AcDbEntity
+  8
+ROAD
+100
+AcDbLine
+ 10
+370.0
+ 20
+138.0
+ 30
+0.0
+ 11
+390.0
+ 21
+138.0
+ 31
+0.0
+  0
+TEXT
+  5
+14E
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+137.0
+ 30
+0.0
+ 40
+3.0
+  1
+Road
+  7
+SITE
+ 11
+394.0
+ 21
+137.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+14F
+330
+17
+100
+AcDbEntity
+  8
+WATER
+100
+AcDbLine
+ 10
+370.0
+ 20
+130.0
+ 30
+0.0
+ 11
+390.0
+ 21
+130.0
+ 31
+0.0
+  0
+TEXT
+  5
+150
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+129.0
+ 30
+0.0
+ 40
+3.0
+  1
+Water
+  7
+SITE
+ 11
+394.0
+ 21
+129.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+151
+330
+17
+100
+AcDbEntity
+  8
+TREES
+100
+AcDbLine
+ 10
+370.0
+ 20
+122.0
+ 30
+0.0
+ 11
+390.0
+ 21
+122.0
+ 31
+0.0
+  0
+TEXT
+  5
+152
+330
+17
+100
+AcDbEntity
+  8
+LEGEND
+100
+AcDbText
+ 10
+394.0
+ 20
+121.0
+ 30
+0.0
+ 40
+3.0
+  1
+Tree
+  7
+SITE
+ 11
+394.0
+ 21
+121.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+153
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-160.0
+ 30
+0.0
+ 40
+8.0
+  1
+SITE PLAN  1:1000
+  7
+SITE
+ 11
+0.0
+ 21
+-160.0
+ 31
+0.0
+100
+AcDbText
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+157
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+157
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/cad/text-styles.dxf b/crates/exav-viewer/demo/examples/files/cad/text-styles.dxf
new file mode 100644
index 00000000..25fe2cbe
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/cad/text-styles.dxf
@@ -0,0 +1,5696 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1032
+  9
+$ACADMAINTVER
+ 90
+4
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$LASTSAVEDBY
+  1
+ezdxf
+  9
+$REQUIREDVERSIONS
+160
+0
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$EXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$ORTHOMODE
+ 70
+0
+  9
+$REGENMODE
+ 70
+1
+  9
+$FILLMODE
+ 70
+1
+  9
+$QTEXTMODE
+ 70
+0
+  9
+$MIRRTEXT
+ 70
+1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+1
+  9
+$TEXTSIZE
+ 40
+2.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+2.5
+  9
+$DIMEXO
+ 40
+0.625
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.25
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+2.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+0
+  9
+$DIMLIM
+ 70
+0
+  9
+$DIMTIH
+ 70
+0
+  9
+$DIMTOH
+ 70
+0
+  9
+$DIMSE1
+ 70
+0
+  9
+$DIMSE2
+ 70
+0
+  9
+$DIMTAD
+ 70
+1
+  9
+$DIMZIN
+ 70
+8
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+1
+  9
+$DIMSHO
+ 70
+1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+0
+  9
+$DIMALTD
+ 70
+3
+  9
+$DIMALTF
+ 40
+0.03937007874
+  9
+$DIMLFAC
+ 40
+1.0
+  9
+$DIMTOFL
+ 70
+1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+0
+  9
+$DIMSOXD
+ 70
+0
+  9
+$DIMSAH
+ 70
+0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+0
+  9
+$DIMCLRE
+ 70
+0
+  9
+$DIMCLRT
+ 70
+0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+0.625
+  9
+$DIMJUST
+ 70
+0
+  9
+$DIMSD1
+ 70
+0
+  9
+$DIMSD2
+ 70
+0
+  9
+$DIMTOLJ
+ 70
+0
+  9
+$DIMTZIN
+ 70
+8
+  9
+$DIMALTZ
+ 70
+0
+  9
+$DIMALTTZ
+ 70
+0
+  9
+$DIMUPT
+ 70
+0
+  9
+$DIMDEC
+ 70
+2
+  9
+$DIMTDEC
+ 70
+2
+  9
+$DIMALTU
+ 70
+2
+  9
+$DIMALTTD
+ 70
+3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+0
+  9
+$DIMADEC
+ 70
+0
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+3
+  9
+$DIMFRAC
+ 70
+0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+0
+  9
+$DIMFXL
+ 40
+1.0
+  9
+$DIMFXLON
+ 70
+0
+  9
+$DIMJOGANG
+ 40
+0.785398163397
+  9
+$DIMTFILL
+ 70
+0
+  9
+$DIMTFILLCLR
+ 70
+0
+  9
+$DIMARCSYM
+ 70
+0
+  9
+$DIMLTYPE
+  6
+
+  9
+$DIMLTEX1
+  6
+
+  9
+$DIMLTEX2
+  6
+
+  9
+$DIMTXTDIRECTION
+ 70
+0
+  9
+$LUNITS
+ 70
+2
+  9
+$LUPREC
+ 70
+4
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+0
+  9
+$AUPREC
+ 70
+2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+0
+  9
+$CHAMFERA
+ 40
+0.0
+  9
+$CHAMFERB
+ 40
+0.0
+  9
+$CHAMFERC
+ 40
+0.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+0
+  9
+$TDCREATE
+ 40
+2451545.0
+  9
+$TDUCREATE
+ 40
+2451545.0
+  9
+$TDUPDATE
+ 40
+2451545.0
+  9
+$TDUUPDATE
+ 40
+2451545.0
+  9
+$TDINDWG
+ 40
+0.0
+  9
+$TDUSRTIMER
+ 40
+0.0
+  9
+$USRTIMER
+ 70
+1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+0
+  9
+$PDMODE
+ 70
+0
+  9
+$PDSIZE
+ 40
+0.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+0
+  9
+$SPLINETYPE
+ 70
+6
+  9
+$SPLINESEGS
+ 70
+8
+  9
+$HANDSEED
+  5
+87
+  9
+$SURFTAB1
+ 70
+6
+  9
+$SURFTAB2
+ 70
+6
+  9
+$SURFTYPE
+ 70
+6
+  9
+$SURFU
+ 70
+6
+  9
+$SURFV
+ 70
+6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$PUCSORTHOREF
+  2
+
+  9
+$PUCSORTHOVIEW
+ 70
+0
+  9
+$PUCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$USERI1
+ 70
+0
+  9
+$USERI2
+ 70
+0
+  9
+$USERI3
+ 70
+0
+  9
+$USERI4
+ 70
+0
+  9
+$USERI5
+ 70
+0
+  9
+$USERR1
+ 40
+0.0
+  9
+$USERR2
+ 40
+0.0
+  9
+$USERR3
+ 40
+0.0
+  9
+$USERR4
+ 40
+0.0
+  9
+$USERR5
+ 40
+0.0
+  9
+$WORLDVIEW
+ 70
+1
+  9
+$SHADEDGE
+ 70
+3
+  9
+$SHADEDIF
+ 70
+70
+  9
+$TILEMODE
+ 70
+1
+  9
+$MAXACTVP
+ 70
+64
+  9
+$PINSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PLIMCHECK
+ 70
+0
+  9
+$PEXTMIN
+ 10
+1e+20
+ 20
+1e+20
+ 30
+1e+20
+  9
+$PEXTMAX
+ 10
+-1e+20
+ 20
+-1e+20
+ 30
+-1e+20
+  9
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$PLIMMAX
+ 10
+420.0
+ 20
+297.0
+  9
+$UNITMODE
+ 70
+0
+  9
+$VISRETAIN
+ 70
+1
+  9
+$PLINEGEN
+ 70
+0
+  9
+$PSLTSCALE
+ 70
+1
+  9
+$TREEDEPTH
+ 70
+3020
+  9
+$CMLSTYLE
+  2
+Standard
+  9
+$CMLJUST
+ 70
+0
+  9
+$CMLSCALE
+ 40
+20.0
+  9
+$PROXYGRAPHICS
+ 70
+1
+  9
+$MEASUREMENT
+ 70
+1
+  9
+$CELWEIGHT
+370
+-1
+  9
+$ENDCAPS
+280
+0
+  9
+$JOINSTYLE
+280
+0
+  9
+$LWDISPLAY
+290
+0
+  9
+$INSUNITS
+ 70
+4
+  9
+$HYPERLINKBASE
+  1
+
+  9
+$STYLESHEET
+  1
+
+  9
+$XEDIT
+290
+1
+  9
+$CEPSNTYPE
+380
+0
+  9
+$PSTYLEMODE
+290
+1
+  9
+$FINGERPRINTGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$VERSIONGUID
+  2
+{00000000-0000-0000-0000-000000000000}
+  9
+$EXTNAMES
+290
+1
+  9
+$PSVPSCALE
+ 40
+0.0
+  9
+$OLESTARTUP
+290
+0
+  9
+$SORTENTS
+280
+127
+  9
+$INDEXCTL
+280
+0
+  9
+$HIDETEXT
+280
+1
+  9
+$XCLIPFRAME
+280
+1
+  9
+$HALOGAP
+280
+0
+  9
+$OBSCOLOR
+ 70
+257
+  9
+$OBSLTYPE
+280
+0
+  9
+$INTERSECTIONDISPLAY
+280
+0
+  9
+$INTERSECTIONCOLOR
+ 70
+257
+  9
+$DIMASSOC
+280
+2
+  9
+$PROJECTNAME
+  1
+
+  9
+$CAMERADISPLAY
+290
+0
+  9
+$LENSLENGTH
+ 40
+50.0
+  9
+$CAMERAHEIGHT
+ 40
+0.0
+  9
+$STEPSPERSEC
+ 40
+24.0
+  9
+$STEPSIZE
+ 40
+100.0
+  9
+$3DDWFPREC
+ 40
+2.0
+  9
+$PSOLWIDTH
+ 40
+0.005
+  9
+$PSOLHEIGHT
+ 40
+0.08
+  9
+$LOFTANG1
+ 40
+1.570796326795
+  9
+$LOFTANG2
+ 40
+1.570796326795
+  9
+$LOFTMAG1
+ 40
+0.0
+  9
+$LOFTMAG2
+ 40
+0.0
+  9
+$LOFTPARAM
+ 70
+7
+  9
+$LOFTNORMALS
+280
+1
+  9
+$LATITUDE
+ 40
+37.795
+  9
+$LONGITUDE
+ 40
+-122.394
+  9
+$NORTHDIRECTION
+ 40
+0.0
+  9
+$TIMEZONE
+ 70
+-8000
+  9
+$LIGHTGLYPHDISPLAY
+280
+1
+  9
+$TILEMODELIGHTSYNCH
+280
+1
+  9
+$CMATERIAL
+347
+20
+  9
+$SOLIDHIST
+280
+0
+  9
+$SHOWHIST
+280
+1
+  9
+$DWFFRAME
+280
+2
+  9
+$DGNFRAME
+280
+2
+  9
+$REALWORLDSCALE
+290
+1
+  9
+$INTERFERECOLOR
+ 62
+256
+  9
+$CSHADOW
+280
+0
+  9
+$SHADOWPLANELOCATION
+ 40
+0.0
+  0
+ENDSEC
+  0
+SECTION
+  2
+CLASSES
+  0
+CLASS
+  1
+ACDBDICTIONARYWDFLT
+  2
+AcDbDictionaryWithDefault
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SUN
+  2
+AcDbSun
+  3
+SCENEOE
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+VISUALSTYLE
+  2
+AcDbVisualStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MATERIAL
+  2
+AcDbMaterial
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+SCALE
+  2
+AcDbScale
+  3
+ObjectDBX Classes
+ 90
+1153
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+TABLESTYLE
+  2
+AcDbTableStyle
+  3
+ObjectDBX Classes
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MLEADERSTYLE
+  2
+AcDbMLeaderStyle
+  3
+ACDB_MLEADERSTYLE_CLASS
+ 90
+4095
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+DICTIONARYVAR
+  2
+AcDbDictionaryVar
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+CELLSTYLEMAP
+  2
+AcDbCellStyleMap
+  3
+ObjectDBX Classes
+ 90
+1152
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+MENTALRAYRENDERSETTINGS
+  2
+AcDbMentalRayRenderSettings
+  3
+SCENEOE
+ 90
+1024
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBDETAILVIEWSTYLE
+  2
+AcDbDetailViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBSECTIONVIEWSTYLE
+  2
+AcDbSectionViewStyle
+  3
+ObjectDBX Classes
+ 90
+1025
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+RASTERVARIABLES
+  2
+AcDbRasterVariables
+  3
+ISM
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+ACDBPLACEHOLDER
+  2
+AcDbPlaceHolder
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+CLASS
+  1
+LAYOUT
+  2
+AcDbLayout
+  3
+ObjectDBX Classes
+ 90
+0
+ 91
+0
+280
+0
+281
+0
+  0
+ENDSEC
+  0
+SECTION
+  2
+TABLES
+  0
+TABLE
+  2
+VPORT
+  5
+8
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+  0
+VPORT
+  5
+83
+330
+8
+100
+AcDbSymbolTableRecord
+100
+AcDbViewportTableRecord
+  2
+*Active
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+1.0
+ 21
+1.0
+ 12
+305.0
+ 22
+-179.42799732083054
+ 13
+0.0
+ 23
+0.0
+ 14
+0.5
+ 24
+0.5
+ 15
+0.5
+ 25
+0.5
+ 16
+0.0
+ 26
+0.0
+ 36
+1.0
+ 17
+0.0
+ 27
+0.0
+ 37
+0.0
+ 40
+389.3987943737442
+ 41
+1.34
+ 42
+50.0
+ 43
+0.0
+ 44
+0.0
+ 50
+0.0
+ 51
+0.0
+ 71
+0
+ 72
+1000
+ 73
+1
+ 74
+3
+ 75
+0
+ 76
+0
+ 77
+0
+ 78
+0
+281
+0
+ 65
+1
+110
+0.0
+120
+0.0
+130
+0.0
+111
+1.0
+121
+0.0
+131
+0.0
+112
+0.0
+122
+1.0
+132
+0.0
+ 79
+0
+146
+0.0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LTYPE
+  5
+2
+330
+0
+100
+AcDbSymbolTable
+ 70
+21
+  0
+LTYPE
+  5
+24
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByBlock
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+25
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+ByLayer
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+26
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+Continuous
+ 70
+0
+  3
+
+ 72
+65
+ 73
+0
+ 40
+0.0
+  0
+LTYPE
+  5
+2F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER
+ 70
+0
+  3
+Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+5.08
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+30
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTERX2
+ 70
+0
+  3
+Center (2x) ________  __  ________  __  ________
+ 72
+65
+ 73
+4
+ 40
+8.89
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+31
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+CENTER2
+ 70
+0
+  3
+Center (.5x) ____ _ ____ _ ____ _ ____ _ ____
+ 72
+65
+ 73
+4
+ 40
+2.54
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+32
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED
+ 70
+0
+  3
+Dashed __ __ __ __ __ __ __ __ __ __ __ __ __ _
+ 72
+65
+ 73
+2
+ 40
+1.524
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+33
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHEDX2
+ 70
+0
+  3
+Dashed (2x) ____  ____  ____  ____  ____  ____
+ 72
+65
+ 73
+2
+ 40
+3.048
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+34
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHED2
+ 70
+0
+  3
+Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ 72
+65
+ 73
+2
+ 40
+0.762
+ 49
+0.635
+ 74
+0
+ 49
+-0.127
+ 74
+0
+  0
+LTYPE
+  5
+35
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM
+ 70
+0
+  3
+Phantom ______  __  __  ______  __  __  ______
+ 72
+65
+ 73
+6
+ 40
+6.35
+ 49
+3.175
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+0.635
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+36
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOMX2
+ 70
+0
+  3
+Phantom (2x)____________    ____    ____    ____________
+ 72
+65
+ 73
+6
+ 40
+10.795
+ 49
+6.35
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+ 49
+1.27
+ 74
+0
+ 49
+-0.635
+ 74
+0
+  0
+LTYPE
+  5
+37
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+PHANTOM2
+ 70
+0
+  3
+Phantom (.5x) ___ _ _ ___ _ _ ___ _ _ ___ _ _ ___
+ 72
+65
+ 73
+6
+ 40
+3.175
+ 49
+1.587
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+ 49
+0.318
+ 74
+0
+ 49
+-0.318
+ 74
+0
+  0
+LTYPE
+  5
+38
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT
+ 70
+0
+  3
+Dash dot __ . __ . __ . __ . __ . __ . __ . __
+ 72
+65
+ 73
+4
+ 40
+3.556
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+39
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOTX2
+ 70
+0
+  3
+Dash dot (2x) ____  .  ____  .  ____  .  ____
+ 72
+65
+ 73
+4
+ 40
+6.096
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3A
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DASHDOT2
+ 70
+0
+  3
+Dash dot (.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+4
+ 40
+1.778
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3B
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT
+ 70
+0
+  3
+Dot .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+ 72
+65
+ 73
+2
+ 40
+0.508
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3C
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOTX2
+ 70
+0
+  3
+Dot (2x) .    .    .    .    .    .    .    . 
+ 72
+65
+ 73
+2
+ 40
+1.016
+ 49
+0.0
+ 74
+0
+ 49
+-1.016
+ 74
+0
+  0
+LTYPE
+  5
+3D
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DOT2
+ 70
+0
+  3
+Dot (.5) . . . . . . . . . . . . . . . . . . . 
+ 72
+65
+ 73
+2
+ 40
+0.254
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+LTYPE
+  5
+3E
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE
+ 70
+0
+  3
+Divide __ . . __ . . __ . . __ . . __ . . __
+ 72
+65
+ 73
+6
+ 40
+4.064
+ 49
+2.54
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+3F
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDEX2
+ 70
+0
+  3
+Divide (2x) ____  . .  ____  . .  ____  . .  ____
+ 72
+65
+ 73
+6
+ 40
+6.604
+ 49
+5.08
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.508
+ 74
+0
+  0
+LTYPE
+  5
+40
+330
+2
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+  2
+DIVIDE2
+ 70
+0
+  3
+Divide(.5x) _ . _ . _ . _ . _ . _ . _ . _
+ 72
+65
+ 73
+6
+ 40
+2.032
+ 49
+1.27
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+ 49
+0.0
+ 74
+0
+ 49
+-0.254
+ 74
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+LAYER
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+4
+  0
+LAYER
+  5
+27
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+0
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+28
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+Defpoints
+ 70
+0
+ 62
+7
+  6
+Continuous
+290
+0
+370
+-3
+390
+13
+347
+21
+  0
+LAYER
+  5
+41
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+TEXT
+ 70
+0
+ 62
+7
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+LAYER
+  5
+42
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+  2
+NOTE
+ 70
+0
+ 62
+8
+  6
+Continuous
+370
+25
+390
+13
+347
+21
+  0
+ENDTAB
+  0
+TABLE
+  2
+STYLE
+  5
+5
+330
+0
+100
+AcDbSymbolTable
+ 70
+11
+  0
+STYLE
+  5
+29
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+txt
+  4
+
+  0
+STYLE
+  5
+43
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-ARIAL
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+44
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-TIMES
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+times.ttf
+  4
+
+  0
+STYLE
+  5
+45
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-COURIER
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+cour.ttf
+  4
+
+  0
+STYLE
+  5
+46
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-NARROW
+ 70
+0
+ 40
+0.0
+ 41
+0.6
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+47
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-WIDE
+ 70
+0
+ 40
+0.0
+ 41
+1.6
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+48
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-SLANT
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+20.0
+ 71
+0
+ 42
+2.5
+  3
+times.ttf
+  4
+
+  0
+STYLE
+  5
+49
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-ROMANS
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+romans.shx
+  4
+
+  0
+STYLE
+  5
+4A
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-SIMPLEX
+ 70
+0
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+simplex.shx
+  4
+
+  0
+STYLE
+  5
+4B
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-BACKWARDS
+ 70
+2
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+STYLE
+  5
+4C
+330
+5
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+  2
+S-UPSIDE
+ 70
+4
+ 40
+0.0
+ 41
+1.0
+ 50
+0.0
+ 71
+0
+ 42
+2.5
+  3
+arial.ttf
+  4
+
+  0
+ENDTAB
+  0
+TABLE
+  2
+VIEW
+  5
+7
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+UCS
+  5
+6
+330
+0
+100
+AcDbSymbolTable
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+APPID
+  5
+3
+330
+0
+100
+AcDbSymbolTable
+ 70
+3
+  0
+APPID
+  5
+2A
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+ACAD
+ 70
+0
+  0
+APPID
+  5
+84
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+HATCHBACKGROUNDCOLOR
+ 70
+0
+  0
+APPID
+  5
+85
+330
+3
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+  2
+EZDXF
+ 70
+0
+  0
+ENDTAB
+  0
+TABLE
+  2
+DIMSTYLE
+  5
+4
+330
+0
+100
+AcDbSymbolTable
+ 70
+1
+100
+AcDbDimStyleTable
+  0
+DIMSTYLE
+105
+2B
+330
+4
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+Standard
+ 70
+0
+ 40
+1.0
+ 41
+2.5
+ 42
+0.625
+ 43
+3.75
+ 44
+1.25
+ 45
+0.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+2.5
+140
+2.5
+141
+2.5
+142
+0.0
+143
+0.03937007874
+144
+1.0
+145
+0.0
+146
+1.0
+147
+0.625
+148
+0.0
+ 69
+0
+ 70
+0
+ 71
+0
+ 72
+0
+ 73
+0
+ 74
+0
+ 75
+0
+ 76
+0
+ 77
+1
+ 78
+8
+ 79
+3
+170
+0
+171
+3
+172
+1
+173
+0
+174
+0
+175
+0
+176
+0
+177
+0
+178
+0
+179
+2
+271
+2
+272
+2
+273
+2
+274
+3
+275
+0
+276
+0
+277
+2
+278
+44
+279
+0
+280
+0
+281
+0
+282
+0
+283
+0
+284
+8
+285
+0
+286
+0
+288
+0
+289
+3
+290
+0
+371
+-2
+372
+-2
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+9
+330
+0
+100
+AcDbSymbolTable
+ 70
+2
+  0
+BLOCK_RECORD
+  5
+17
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+1A
+ 70
+0
+280
+1
+281
+0
+  0
+BLOCK_RECORD
+  5
+1B
+330
+9
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+ 70
+0
+280
+1
+281
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+18
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+19
+330
+17
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper_Space
+  1
+
+  0
+ENDBLK
+  5
+1D
+330
+1B
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+ENDSEC
+  0
+SECTION
+  2
+ENTITIES
+  0
+TEXT
+  5
+4D
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-ARIAL (arial.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-ARIAL
+ 11
+0.0
+ 21
+0.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+4E
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-12.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-TIMES (times.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-TIMES
+ 11
+0.0
+ 21
+-12.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+4F
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-24.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-COURIER (cour.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-COURIER
+ 11
+0.0
+ 21
+-24.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+50
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-36.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-NARROW (arial.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-NARROW
+ 11
+0.0
+ 21
+-36.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+51
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-48.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-WIDE (arial.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-WIDE
+ 11
+0.0
+ 21
+-48.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+52
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-60.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-SLANT (times.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-SLANT
+ 11
+0.0
+ 21
+-60.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+53
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-72.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-ROMANS (romans.shx): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-ROMANS
+ 11
+0.0
+ 21
+-72.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+54
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-84.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-SIMPLEX (simplex.shx): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-SIMPLEX
+ 11
+0.0
+ 21
+-84.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+55
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-96.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-BACKWARDS (arial.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-BACKWARDS
+ 11
+0.0
+ 21
+-96.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+56
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-108.0
+ 30
+0.0
+ 40
+6.0
+  1
+S-UPSIDE (arial.ttf): Sphinx of black quartz, judge my vow 0123456789
+  7
+S-UPSIDE
+ 11
+0.0
+ 21
+-108.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+57
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+15.0
+ 20
+-126.0
+ 30
+0.0
+ 11
+25.0
+ 21
+-126.0
+ 31
+0.0
+  0
+LINE
+  5
+58
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+20.0
+ 20
+-131.0
+ 30
+0.0
+ 11
+20.0
+ 21
+-121.0
+ 31
+0.0
+  0
+TEXT
+  5
+59
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+20.0
+ 20
+-126.0
+ 30
+0.0
+ 40
+6.0
+  1
+TOP_LEFT
+  7
+S-ARIAL
+ 11
+20.0
+ 21
+-126.0
+ 31
+0.0
+100
+AcDbText
+ 73
+3
+  0
+LINE
+  5
+5A
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+145.0
+ 20
+-126.0
+ 30
+0.0
+ 11
+155.0
+ 21
+-126.0
+ 31
+0.0
+  0
+LINE
+  5
+5B
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+150.0
+ 20
+-131.0
+ 30
+0.0
+ 11
+150.0
+ 21
+-121.0
+ 31
+0.0
+  0
+TEXT
+  5
+5C
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+150.0
+ 20
+-126.0
+ 30
+0.0
+ 40
+6.0
+  1
+MIDDLE_CENTER
+  7
+S-ARIAL
+ 72
+1
+ 11
+150.0
+ 21
+-126.0
+ 31
+0.0
+100
+AcDbText
+ 73
+2
+  0
+LINE
+  5
+5D
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+275.0
+ 20
+-126.0
+ 30
+0.0
+ 11
+285.0
+ 21
+-126.0
+ 31
+0.0
+  0
+LINE
+  5
+5E
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+280.0
+ 20
+-131.0
+ 30
+0.0
+ 11
+280.0
+ 21
+-121.0
+ 31
+0.0
+  0
+TEXT
+  5
+5F
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+280.0
+ 20
+-126.0
+ 30
+0.0
+ 40
+6.0
+  1
+BOTTOM_RIGHT
+  7
+S-ARIAL
+ 72
+2
+ 11
+280.0
+ 21
+-126.0
+ 31
+0.0
+100
+AcDbText
+ 73
+1
+  0
+LINE
+  5
+60
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+405.0
+ 20
+-126.0
+ 30
+0.0
+ 11
+415.0
+ 21
+-126.0
+ 31
+0.0
+  0
+LINE
+  5
+61
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+410.0
+ 20
+-131.0
+ 30
+0.0
+ 11
+410.0
+ 21
+-121.0
+ 31
+0.0
+  0
+TEXT
+  5
+62
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+410.0
+ 20
+-126.0
+ 30
+0.0
+ 40
+6.0
+  1
+ALIGNED
+  7
+S-ARIAL
+ 72
+3
+ 11
+480.0
+ 21
+-126.0
+ 31
+0.0
+100
+AcDbText
+  0
+LINE
+  5
+63
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+535.0
+ 20
+-126.0
+ 30
+0.0
+ 11
+545.0
+ 21
+-126.0
+ 31
+0.0
+  0
+LINE
+  5
+64
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbLine
+ 10
+540.0
+ 20
+-131.0
+ 30
+0.0
+ 11
+540.0
+ 21
+-121.0
+ 31
+0.0
+  0
+TEXT
+  5
+65
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+540.0
+ 20
+-126.0
+ 30
+0.0
+ 40
+6.0
+  1
+FIT
+  7
+S-ARIAL
+ 72
+5
+ 11
+610.0
+ 21
+-126.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+66
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+20.0
+ 20
+-150.0
+ 30
+0.0
+ 40
+6.0
+  1
+rotated 0 degrees
+  7
+S-TIMES
+ 11
+20.0
+ 21
+-150.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+67
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+65.0
+ 20
+-150.0
+ 30
+0.0
+ 40
+6.0
+  1
+rotated 30 degrees
+ 50
+30.0
+  7
+S-TIMES
+ 11
+65.0
+ 21
+-150.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+68
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+110.0
+ 20
+-150.0
+ 30
+0.0
+ 40
+6.0
+  1
+rotated 60 degrees
+ 50
+60.0
+  7
+S-TIMES
+ 11
+110.0
+ 21
+-150.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+69
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+155.0
+ 20
+-150.0
+ 30
+0.0
+ 40
+6.0
+  1
+rotated 90 degrees
+ 50
+90.0
+  7
+S-TIMES
+ 11
+155.0
+ 21
+-150.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+6A
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-220.0
+ 30
+0.0
+ 40
+5.0
+  1
+Special: %%d degree 45%%d, %%p plus/minus 0.5, %%c diameter 25, %%%% percent, %%u under%%u, %%o over%%o
+  7
+S-ARIAL
+ 11
+0.0
+ 21
+-220.0
+ 31
+0.0
+100
+AcDbText
+  0
+TEXT
+  5
+6B
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbText
+ 10
+0.0
+ 20
+-230.0
+ 30
+0.0
+ 40
+5.0
+  1
+Unicode: éèê üöä ß ñ ΔΩπ Жя € ½ ²³
+  7
+S-ARIAL
+ 11
+0.0
+ 21
+-230.0
+ 31
+0.0
+100
+AcDbText
+  0
+MTEXT
+  5
+6C
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+0.0
+ 20
+-250.0
+ 30
+0.0
+ 40
+4.0
+ 41
+120.0
+ 71
+1
+  3
+{\C1;Red}, {\C3;green}, {\C5;blue} and {\c16744192;orange by RGB}.\P{\fTimes New Roman|b1;Bold serif}, {\fArial|i1;italic sans}, {\fCourier New|b1|i1;bold italic mono}.\PUnderline \Lis on\l, overline \Ois on\o, \Kstrike-through\k.\PHeight \H2x;double
+  1
+s\H1x; and returns; width \W2;wide\W1; and back; slant \Q20;oblique\Q0;.\PStacked: \S1/2; \S1#2; \S1^2; \S\U+00B1 0.1^ -0.1; and x\S2^;, H\S2^ ;.\PTab\Pstops: A\tB\tC
+  7
+S-ARIAL
+  0
+MTEXT
+  5
+6D
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+130.0
+ 20
+-250.0
+ 30
+0.0
+ 40
+4.2
+ 41
+90.0
+ 71
+1
+  1
+{\L\C2;Paragraph 1}\PA justified-looking paragraph with a long text that wraps inside the box of the entity, set at width 90, to see how line breaks are made by the viewer.
+  7
+S-ARIAL
+  0
+MTEXT
+  5
+6E
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+230.0
+ 20
+-250.0
+ 30
+0.0
+ 40
+4.2
+ 41
+70.0
+ 71
+1
+  1
+Background box, with a border in the text colour: the viewer fills the box behind the text.
+  7
+S-ARIAL
+ 45
+1.5
+ 90
+1
+ 63
+0
+421
+16771980
+  0
+MTEXT
+  5
+6F
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+0.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+3.5
+ 41
+40.0
+ 46
+40.0
+ 71
+1
+  1
+Column one text, a short paragraph that sits at the left.\NColumn two: more text, in the middle.\NColumn three at the right.
+  7
+S-ARIAL
+101
+Embedded Object
+ 70
+1
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+ 11
+0.0
+ 21
+-320.0
+ 31
+0.0
+ 40
+40.0
+ 41
+40.0
+ 42
+132.0
+ 43
+40.0
+ 71
+1
+ 72
+3
+ 44
+40.0
+ 45
+6.0
+ 73
+0
+ 74
+0
+  0
+TEXT
+  5
+70
+330
+17
+100
+AcDbEntity
+  8
+NOTE
+100
+AcDbText
+ 10
+0.0
+ 20
+-364.0
+ 30
+0.0
+ 40
+3.0
+  1
+MTEXT in three static columns
+  7
+S-ARIAL
+ 11
+0.0
+ 21
+-364.0
+ 31
+0.0
+100
+AcDbText
+  0
+MTEXT
+  5
+71
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+150.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+1
+  1
+AP 1
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+72
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+150.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+73
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+190.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+2
+  1
+AP 2
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+74
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+190.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+75
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+230.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+3
+  1
+AP 3
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+76
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+230.0
+ 20
+-320.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+77
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+150.0
+ 20
+-334.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+4
+  1
+AP 4
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+78
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+150.0
+ 20
+-334.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+79
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+190.0
+ 20
+-334.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+5
+  1
+AP 5
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+7A
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+190.0
+ 20
+-334.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+7B
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+230.0
+ 20
+-334.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+6
+  1
+AP 6
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+7C
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+230.0
+ 20
+-334.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+7D
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+150.0
+ 20
+-348.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+7
+  1
+AP 7
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+7E
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+150.0
+ 20
+-348.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+7F
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+190.0
+ 20
+-348.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+8
+  1
+AP 8
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+80
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+190.0
+ 20
+-348.0
+ 30
+0.0
+ 40
+0.8
+  0
+MTEXT
+  5
+81
+330
+17
+100
+AcDbEntity
+  8
+TEXT
+100
+AcDbMText
+ 10
+230.0
+ 20
+-348.0
+ 30
+0.0
+ 40
+4.0
+ 41
+30.0
+ 71
+9
+  1
+AP 9
+  7
+S-ARIAL
+  0
+CIRCLE
+  5
+82
+330
+17
+100
+AcDbEntity
+  8
+0
+ 62
+1
+100
+AcDbCircle
+ 10
+230.0
+ 20
+-348.0
+ 30
+0.0
+ 40
+0.8
+  0
+ENDSEC
+  0
+SECTION
+  2
+OBJECTS
+  0
+DICTIONARY
+  5
+A
+330
+0
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ACAD_COLOR
+350
+B
+  3
+ACAD_GROUP
+350
+C
+  3
+ACAD_LAYOUT
+350
+D
+  3
+ACAD_MATERIAL
+350
+E
+  3
+ACAD_MLEADERSTYLE
+350
+F
+  3
+ACAD_MLINESTYLE
+350
+10
+  3
+ACAD_PLOTSETTINGS
+350
+11
+  3
+ACAD_PLOTSTYLENAME
+350
+12
+  3
+ACAD_SCALELIST
+350
+14
+  3
+ACAD_TABLESTYLE
+350
+15
+  3
+ACAD_VISUALSTYLE
+350
+16
+  3
+EZDXF_META
+350
+2D
+  0
+DICTIONARY
+  5
+B
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+C
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+D
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Model
+350
+1A
+  3
+Layout1
+350
+1E
+  0
+DICTIONARY
+  5
+E
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+ByBlock
+350
+1F
+  3
+ByLayer
+350
+20
+  3
+Global
+350
+21
+  0
+DICTIONARY
+  5
+F
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+2C
+  0
+DICTIONARY
+  5
+10
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Standard
+350
+22
+  0
+DICTIONARY
+  5
+11
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+ACDBDICTIONARYWDFLT
+  5
+12
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  3
+Normal
+350
+13
+100
+AcDbDictionaryWithDefault
+340
+13
+  0
+ACDBPLACEHOLDER
+  5
+13
+330
+12
+  0
+DICTIONARY
+  5
+14
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+15
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+DICTIONARY
+  5
+16
+330
+A
+100
+AcDbDictionary
+280
+0
+281
+1
+  0
+LAYOUT
+  5
+1A
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+1024
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Model
+ 70
+1
+ 71
+0
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+17
+  0
+LAYOUT
+  5
+1E
+330
+D
+100
+AcDbPlotSettings
+  1
+
+  4
+A3
+  6
+
+ 40
+7.5
+ 41
+20.0
+ 42
+7.5
+ 43
+20.0
+ 44
+420.0
+ 45
+297.0
+ 46
+0.0
+ 47
+0.0
+ 48
+0.0
+ 49
+0.0
+140
+0.0
+141
+0.0
+142
+1.0
+143
+1.0
+ 70
+0
+ 72
+1
+ 73
+0
+ 74
+5
+  7
+
+ 75
+16
+ 76
+0
+ 77
+2
+ 78
+300
+147
+1.0
+148
+0.0
+149
+0.0
+100
+AcDbLayout
+  1
+Layout1
+ 70
+1
+ 71
+1
+ 10
+0.0
+ 20
+0.0
+ 11
+420.0
+ 21
+297.0
+ 12
+0.0
+ 22
+0.0
+ 32
+0.0
+ 14
+1e+20
+ 24
+1e+20
+ 34
+1e+20
+ 15
+-1e+20
+ 25
+-1e+20
+ 35
+-1e+20
+146
+0.0
+ 13
+0.0
+ 23
+0.0
+ 33
+0.0
+ 16
+1.0
+ 26
+0.0
+ 36
+0.0
+ 17
+0.0
+ 27
+1.0
+ 37
+0.0
+ 76
+1
+330
+1B
+  0
+MATERIAL
+  5
+1F
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByBlock
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+20
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+ByLayer
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MATERIAL
+  5
+21
+102
+{ACAD_REACTORS
+330
+E
+102
+}
+330
+E
+100
+AcDbMaterial
+  1
+Global
+  2
+
+ 70
+0
+ 40
+1.0
+ 71
+1
+ 41
+1.0
+ 91
+-1023410177
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 44
+0.5
+ 73
+0
+ 45
+1.0
+ 46
+1.0
+ 77
+1
+  4
+
+ 78
+1
+ 79
+1
+170
+1
+ 48
+1.0
+171
+1
+  6
+
+172
+1
+173
+1
+174
+1
+140
+1.0
+141
+1.0
+175
+1
+  7
+
+176
+1
+177
+1
+178
+1
+143
+1.0
+179
+1
+  8
+
+270
+1
+271
+1
+272
+1
+145
+1.0
+146
+1.0
+273
+1
+  9
+
+274
+1
+275
+1
+276
+1
+ 42
+1.0
+ 72
+1
+  3
+
+ 73
+1
+ 74
+1
+ 75
+1
+ 94
+63
+  0
+MLINESTYLE
+  5
+22
+102
+{ACAD_REACTORS
+330
+10
+102
+}
+330
+10
+100
+AcDbMlineStyle
+  2
+Standard
+ 70
+0
+  3
+
+ 62
+256
+ 51
+90.0
+ 52
+90.0
+ 71
+2
+ 49
+0.5
+ 62
+256
+  6
+BYLAYER
+ 49
+-0.5
+ 62
+256
+  6
+BYLAYER
+  0
+MLEADERSTYLE
+  5
+2C
+102
+{ACAD_REACTORS
+330
+F
+102
+}
+330
+F
+100
+AcDbMLeaderStyle
+179
+2
+170
+2
+171
+1
+172
+0
+ 90
+2
+ 40
+0.0
+ 41
+0.0
+173
+1
+ 91
+-1056964608
+ 92
+-2
+290
+1
+ 42
+2.0
+291
+1
+ 43
+8.0
+  3
+Standard
+ 44
+4.0
+300
+
+342
+29
+174
+1
+175
+1
+176
+0
+178
+1
+ 93
+-1056964608
+ 45
+4.0
+292
+0
+297
+0
+ 46
+4.0
+ 94
+-1056964608
+ 47
+1.0
+ 49
+1.0
+140
+1.0
+294
+1
+141
+0.0
+177
+0
+142
+1.0
+295
+0
+296
+0
+143
+3.75
+271
+0
+272
+9
+273
+9
+  0
+DICTIONARY
+  5
+2D
+330
+A
+100
+AcDbDictionary
+281
+1
+  3
+CREATED_BY_EZDXF
+350
+2E
+  3
+WRITTEN_BY_EZDXF
+350
+86
+  0
+DICTIONARYVAR
+  5
+2E
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+DICTIONARYVAR
+  5
+86
+330
+2D
+100
+DictionaryVariables
+280
+0
+  1
+0.0 @ 2000-01-01T00:00:00.000000+00:00
+  0
+ENDSEC
+  0
+EOF
diff --git a/crates/exav-viewer/demo/examples/files/converted/deck.fodp b/crates/exav-viewer/demo/examples/files/converted/deck.fodp
new file mode 100644
index 00000000..27e4ca5a
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/converted/deck.fodp
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.presentation">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Harbour review</dc:title><dc:subject>A deck made for the exav demo (CC0-1.0)</dc:subject><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:font-face-decls><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"/></office:font-face-decls>
+<office:styles>
+<draw:gradient draw:name="Sea" draw:style="linear" draw:start-color="#0b4f6c" draw:end-color="#3fa7d6" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" draw:border="0%"/>
+<draw:gradient draw:name="Sun" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#f6a01a" draw:end-color="#c0392b" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/>
+<draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20z"/>
+<style:style style:name="standard" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#3465a4" draw:fill="solid" draw:fill-color="#729fcf"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="18pt"/></style:style>
+<style:style style:name="pr-title" style:family="presentation"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:auto-grow-width="false" draw:textarea-vertical-align="middle"/></style:style>
+<style:style style:name="pr-body" style:family="presentation"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:auto-grow-width="false"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="28cm" fo:page-height="15.75cm" style:print-orientation="landscape"/></style:page-layout>
+<style:style style:name="dp-title" style:family="drawing-page"><style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" draw:fill="gradient" draw:fill-gradient-name="Sea" presentation:transition-type="automatic" presentation:transition-style="fade-from-center" presentation:duration="PT00H00M01S" smil:type="fade"/></style:style>
+<style:style style:name="dp-plain" style:family="drawing-page"><style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" draw:fill="solid" draw:fill-color="#fbfaf7" smil:type="slideWipe" smil:subtype="fromLeft"/></style:style>
+<style:style style:name="gr-none" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none"/></style:style>
+<style:style style:name="gr-grad" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Sea" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/><style:text-properties fo:color="#ffffff"/></style:style>
+<style:style style:name="gr-fill2" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#1c6e3e" svg:stroke-width="0.08cm" draw:fill="solid" draw:fill-color="#7bc67e" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="gr-fill3" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#7a5c00" draw:stroke-dash="dash" draw:fill="solid" draw:fill-color="#ffe08a" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="gr-fill4" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Sun" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/><style:text-properties fo:color="#ffffff"/></style:style>
+<style:style style:name="gr-arrow" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-width="0.1cm" svg:stroke-color="#333333" draw:marker-end="Arrow" draw:marker-end-width="0.3cm"/></style:style>
+<style:style style:name="gr-callout" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#c0392b" draw:fill="solid" draw:fill-color="#fdecea" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="P-title" style:family="paragraph"><style:paragraph-properties fo:text-align="start"/><style:text-properties fo:font-size="30pt" fo:font-weight="bold" fo:color="#0b4f6c"/></style:style>
+<style:style style:name="P-big" style:family="paragraph"><style:text-properties fo:font-size="48pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="P-sub" style:family="paragraph"><style:text-properties fo:font-size="24pt" fo:color="#dbe9f4"/></style:style>
+<style:style style:name="P-body" style:family="paragraph"><style:text-properties fo:font-size="22pt"/></style:style>
+<style:style style:name="P-center" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt"/></style:style>
+<style:style style:name="P-th" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="P-td" style:family="paragraph"><style:text-properties fo:font-size="16pt"/></style:style>
+<text:list-style style:name="L-bul"><text:list-level-style-bullet text:level="1" text:bullet-char="●"><style:list-level-properties text:min-label-width="0.6cm"/><style:text-properties fo:color="#146c94"/></text:list-level-style-bullet><text:list-level-style-bullet text:level="2" text:bullet-char="–"><style:list-level-properties text:space-before="0.8cm" text:min-label-width="0.6cm"/></text:list-level-style-bullet><text:list-level-style-bullet text:level="3" text:bullet-char="•"><style:list-level-properties text:space-before="1.6cm" text:min-label-width="0.6cm"/></text:list-level-style-bullet></text:list-style>
+<style:style style:name="tb1" style:family="table"><style:table-properties style:width="16cm" table:align="left"/></style:style>
+<style:style style:name="tcol1" style:family="table-column"><style:table-column-properties style:column-width="6cm"/></style:style>
+<style:style style:name="tcol2" style:family="table-column"><style:table-column-properties style:column-width="5cm"/></style:style>
+<style:style style:name="tc" style:family="table-cell"><style:table-cell-properties fo:padding="0.15cm" fo:border="0.5pt solid #8aa6b4" fo:background-color="#ffffff"/></style:style>
+<style:style style:name="tc-head" style:family="table-cell"><style:table-cell-properties fo:padding="0.15cm" fo:border="0.5pt solid #8aa6b4" fo:background-color="#0b4f6c"/></style:style>
+<presentation:presentation-page-layout style:name="AL1"/>
+<presentation:presentation-page-layout style:name="AL2"/>
+</office:automatic-styles>
+<office:master-styles>
+<draw:layer-set><draw:layer draw:name="layout"/><draw:layer draw:name="background"/><draw:layer draw:name="backgroundobjects"/></draw:layer-set>
+<style:master-page style:name="Master" style:page-layout-name="pm1" draw:style-name="dp-plain">
+<draw:rect draw:style-name="gr-grad" draw:layer="backgroundobjects" svg:width="28cm" svg:height="0.5cm" svg:x="0cm" svg:y="15.25cm"/>
+<draw:frame presentation:style-name="pr-body" draw:layer="backgroundobjects" svg:width="12cm" svg:height="0.9cm" svg:x="1cm" svg:y="14.2cm" presentation:class="footer"><draw:text-box><text:p><presentation:footer/></text:p></draw:text-box></draw:frame>
+<draw:frame presentation:style-name="pr-body" draw:layer="backgroundobjects" svg:width="3cm" svg:height="0.9cm" svg:x="24cm" svg:y="14.2cm" presentation:class="page-number"><draw:text-box><text:p><text:page-number>1</text:page-number></text:p></draw:text-box></draw:frame>
+</style:master-page>
+</office:master-styles>
+<office:body><office:presentation>
+<draw:page draw:name="Title" draw:style-name="dp-title" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL1"><draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="3cm" svg:x="2cm" svg:y="4.5cm" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-big">Harbour review</text:p></draw:text-box></draw:frame><draw:frame presentation:style-name="pr-body" draw:layer="layout" svg:width="24cm" svg:height="2cm" svg:x="2cm" svg:y="8cm" presentation:class="subtitle"><draw:text-box><text:p text:style-name="P-sub">The east quay, first half of the year</text:p></draw:text-box></draw:frame><draw:ellipse draw:style-name="gr-grad" draw:layer="layout" svg:width="7cm" svg:height="7cm" svg:x="19cm" svg:y="9.5cm"><text:p text:style-name="P-center">exav</text:p></draw:ellipse><presentation:notes><draw:page-thumbnail presentation:class="page" draw:layer="layout" svg:width="14.8cm" svg:height="8.3cm" svg:x="3.2cm" svg:y="2cm"/><draw:frame presentation:class="notes" draw:layer="layout" svg:width="17cm" svg:height="12cm" svg:x="2cm" svg:y="11cm"><draw:text-box><text:p>Welcome. These notes are speaker notes: the viewer does not show them.</text:p></draw:text-box></draw:frame></presentation:notes></draw:page><draw:page draw:name="Agenda" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2"><draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="2.4cm" svg:x="2cm" svg:y="0.8cm" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-title">Agenda</text:p></draw:text-box></draw:frame><draw:frame presentation:style-name="pr-body" draw:layer="layout" svg:width="24cm" svg:height="10cm" svg:x="2cm" svg:y="3.8cm" presentation:class="outline"><draw:text-box><text:list text:style-name="L-bul"><text:list-item><text:p text:style-name="P-body">Where we are</text:p></text:list-item><text:list-item><text:list><text:list-item><text:p text:style-name="P-body">berths let</text:p></text:list-item><text:list-item><text:list><text:list-item><text:p text:style-name="P-body">by length</text:p></text:list-item><text:list-item><text:p text:style-name="P-body">by season</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="P-body">visitors</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="P-body">What the figures say</text:p></text:list-item><text:list-item><text:p text:style-name="P-body">What we do next</text:p></text:list-item><text:list-item><text:list><text:list-item><text:p text:style-name="P-body">order the new chain</text:p></text:list-item><text:list-item><text:p text:style-name="P-body">paint the numbers</text:p></text:list-item></text:list></text:list-item></text:list></draw:text-box></draw:frame><presentation:notes><draw:page-thumbnail presentation:class="page" draw:layer="layout" svg:width="14.8cm" svg:height="8.3cm" svg:x="3.2cm" svg:y="2cm"/><draw:frame presentation:class="notes" draw:layer="layout" svg:width="17cm" svg:height="12cm" svg:x="2cm" svg:y="11cm"><draw:text-box><text:p>Four items.</text:p></draw:text-box></draw:frame></presentation:notes></draw:page><draw:page draw:name="Chart" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2"><draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="2.4cm" svg:x="2cm" svg:y="0.8cm" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-title">Berths let, month by month</text:p></draw:text-box></draw:frame><draw:frame draw:style-name="gr-none" draw:layer="layout" svg:width="19cm" svg:height="11cm" svg:x="2cm" svg:y="3.6cm"><draw:object><office:document office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"><office:automatic-styles><style:style style:name="chs0" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#146c94" draw:fill-color="#146c94"/></style:style><style:style style:name="chs1" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#f6a01a" draw:fill-color="#f6a01a"/></style:style><style:style style:name="chs2" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#2c7a4b" draw:fill-color="#2c7a4b"/></style:style><style:style style:name="chs3" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#c0392b" draw:fill-color="#c0392b"/></style:style></office:automatic-styles><office:body><office:chart>
+<chart:chart chart:class="chart:bar" svg:width="15cm" svg:height="8.5cm"><chart:title><text:p>Berths let by month</text:p></chart:title><chart:legend chart:legend-position="end"/>
+<chart:plot-area table:cell-range-address="local-table.$A$1:.$C$7" chart:data-source-has-labels="both"><chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="local-table.$A$2:.$A$7"/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y"><chart:grid chart:class="major"/></chart:axis><chart:series chart:values-cell-range-address="local-table.$B$2:.$B$7" chart:label-cell-address="local-table.$B$1" chart:class="chart:bar" chart:style-name="chs0"><chart:data-point chart:repeated="1"/></chart:series><chart:series chart:values-cell-range-address="local-table.$C$2:.$C$7" chart:label-cell-address="local-table.$C$1" chart:class="chart:bar" chart:style-name="chs1"><chart:data-point chart:repeated="1"/></chart:series></chart:plot-area><table:table table:name="local-table"><table:table-header-columns><table:table-column/></table:table-header-columns><table:table-columns><table:table-column table:number-columns-repeated="2"/></table:table-columns><table:table-header-rows><table:table-row><table:table-cell><text:p/></table:table-cell><table:table-cell office:value-type="string"><text:p>This year</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Last year</text:p></table:table-cell></table:table-row></table:table-header-rows><table:table-rows><table:table-row><table:table-cell office:value-type="string"><text:p>Jan</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="20"><text:p>20</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="18"><text:p>18</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell office:value-type="string"><text:p>Feb</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="26"><text:p>26</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="23"><text:p>23</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell office:value-type="string"><text:p>Mar</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="32"><text:p>32</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="28"><text:p>28</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell office:value-type="string"><text:p>Apr</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="33"><text:p>33</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell office:value-type="string"><text:p>May</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="44"><text:p>44</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell office:value-type="string"><text:p>Jun</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="50"><text:p>50</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="43"><text:p>43</text:p></table:table-cell></table:table-row></table:table-rows></table:table></chart:chart></office:chart></office:body></office:document></draw:object></draw:frame><draw:custom-shape draw:style-name="gr-callout" draw:layer="layout" svg:width="5.5cm" svg:height="3cm" svg:x="21.5cm" svg:y="5cm"><text:p text:style-name="P-center">Up 40% on last year</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="round-rectangular-callout" draw:enhanced-path="M 3590 0 X 0 3590 L 0 14370 Y 3590 17960 L 7200 17960 L 5400 21600 L 10800 17960 L 18010 17960 X 21600 14370 L 21600 3590 Y 18010 0 Z N"/></draw:custom-shape><presentation:notes><draw:page-thumbnail presentation:class="page" draw:layer="layout" svg:width="14.8cm" svg:height="8.3cm" svg:x="3.2cm" svg:y="2cm"/><draw:frame presentation:class="notes" draw:layer="layout" svg:width="17cm" svg:height="12cm" svg:x="2cm" svg:y="11cm"><draw:text-box><text:p>The chart is a native chart, with its data inside the slide.</text:p></draw:text-box></draw:frame></presentation:notes></draw:page><draw:page draw:name="Table" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2"><draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="2.4cm" svg:x="2cm" svg:y="0.8cm" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-title">Fees</text:p></draw:text-box></draw:frame><draw:frame draw:layer="layout" svg:width="16cm" svg:height="8cm" svg:x="2cm" svg:y="4cm"><table:table table:style-name="tb1"><table:table-column table:style-name="tcol1"/><table:table-column table:style-name="tcol2"/><table:table-column table:style-name="tcol2"/><table:table-row><table:table-cell table:style-name="tc-head" office:value-type="string"><text:p text:style-name="P-th">Length</text:p></table:table-cell><table:table-cell table:style-name="tc-head" office:value-type="string"><text:p text:style-name="P-th">Berths</text:p></table:table-cell><table:table-cell table:style-name="tc-head" office:value-type="string"><text:p text:style-name="P-th">Fee</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">up to 6 m</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">12</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">18.00</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">6 to 8 m</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">18</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">24.50</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">8 to 10 m</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">14</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">31.00</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">over 10 m</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">16</text:p></table:table-cell><table:table-cell table:style-name="tc" office:value-type="string"><text:p text:style-name="P-td">48.00</text:p></table:table-cell></table:table-row></table:table></draw:frame><draw:frame presentation:style-name="pr-body" draw:layer="layout" svg:width="8cm" svg:height="8cm" svg:x="19cm" svg:y="4cm" presentation:class="outline"><draw:text-box><text:list text:style-name="L-bul"><text:list-item><text:p text:style-name="P-body">Season fee includes water</text:p></text:list-item><text:list-item><text:p text:style-name="P-body">Power is metered</text:p></text:list-item><text:list-item><text:p text:style-name="P-body">Visitors pay by the night</text:p></text:list-item></text:list></draw:text-box></draw:frame></draw:page><draw:page draw:name="Picture" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2"><draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="2.4cm" svg:x="2cm" svg:y="0.8cm" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-title">A picture and shapes</text:p></draw:text-box></draw:frame><draw:frame draw:layer="layout" svg:width="12.8cm" svg:height="7.2cm" svg:x="2cm" svg:y="4cm"><draw:image><office:binary-data>iVBORw0KGgoAAAANSUhEUgAAAyAAAAHCCAIAAACYATqfAAAVJ0lEQVR42u3caZhU1YGA4VvdBSiKICCggIIIooi44RYCgnHQgOIKURCXwQ13RGcykpmJSybJmBijwhiBBh1HcYNAFKPiMuIICAjtFhZZVBZtQMEVETo/emybbmh7OdV1q+p9n/4hWF1dfe+pc7/n3EMl9u18TQQAQDh5DgEAgMACABBYAAACCwCAGktGCQcBACAkK1gAAAILAEBgAQAILAAAas4mdwCAwKxgAQAElowsYQEABGUFCwAgsKT1KwCAwIHlDiEAQFhuEQIACCwAAIEFACCwAACoOZvcAQBCB5a+AgAIyy1CAACBBQAgsAAAckoyStiFBQAQkhUsAACBBQAQbz6mAQAgMCtYAACB+SR3AIDArGABAAgsAACBBQCQU/wrQgCA0IFlkzsAQFhuEQIACCwAAIEFAJBTkgmbsAAAwgaWvgIACMstQgAAgQUAILAAAHKKT3IHAAgdWDa5AwCE5RYhAIDAAgAQWAAAOcUmdwCA0IFlkzsAQFhuEQIACCwAgHizBwsAIDArWAAAgdnkDgAQPLAUFgBA2MCSVwAAYdmDBQAgsAAA4s0mdwCA0IGlrwAAwnKLEABAYAEACCwAgJySTNiEBQAQlBUsAACBBQAgsAAAcorPwQIACB1YPskdACAstwgBAAQWAEC82YMFABCYFSwAgMCSkY9yBwAIygoWAEBg9mABAARmBQsAQGABAMRb0h53AICwrGABAAgsAACBBQCQU3xMAwBA6MCKFBYAQFBuEQIABOYWIQBAYFawAAAEFgBAvNnkDgAQOrD0FQBAWG4RAgAILACAeHOLEAAgdGDZ5A4AEJZbhAAAgblFCAAQmBUsAACBBQAQb8mEe4QAAEFZwQIAEFgAAPGWjHwQFgBA2MCSVwAAgQPLAhYAQFj2YAEABOYWIQBAYFawAAAEFgBAvPkkdwCAwKxgAQAILACAePOvCAEAArOCBQAQmE9yBwAIHVj6CgAgLLcIAQAEFgBAvLlFCAAQOrBscgcACMstQgCAwNwiBAAIzAoWAEBgVrAAAEIHlk3uAABhuUUIABCYW4QAAIFZwQIAEFgAAPGWTLhHCAAQlBUsAACBBQAQb/4VIQBAYFawAAAC80nuAAChA0tfAQCE5RYhAEBgVrAAAAKzggUAEJhN7gAAoQNLXwEAhOUWIQCAwAIAiDe3CAEAQgeWTe4AAIEDS18BAIRlDxYAgMACAIg3twgBAEIHlk3uAACBA0tfAQCEZQ8WAIDAAgCIN7cIAQBCB5ZN7gAAYblFCAAQmFuEAACBWcECAAjMChYAQOjAsskdACAstwgBAAJzixAAIDArWAAAgVnBAgAIHVg2uQMAhOUWIQBAYG4RAgAEZgULACAwK1gAAKEDyyZ3AIDAgaWvAADCsgcLAEBgAQDEm1uEAAChA8smdwCAwIGlrwAAwrIHCwBAYAEAxJtbhAAAoQPLJncAgMCBpa8AAMKyBwsAIDArWAAAgVnBAgAIzCZ3AIDQgaWvAADCcosQACAwK1gAAIFZwQIACCyZsIQFABCUFSwAAIEFABBvNrkDAARmBQsAIDCb3AEAArOCBQAQWDIRFTsKAAABWcECAAjMvyIEAAgdWJHCAgAIyi1CAIDA3CIEAAjMChYAQGBWsAAAQgeWTe4AAIEDS18BAIRlDxYAQGBWsAAAArOCBQAQmE3uAAChA0tfAQCE5RYhAEBgVrAAAAKzggUAEFgyYQkLACBsYDkEANS9ggeGVf6Ai4aOdZTI4MCygAVA3Rj/Q1G1swK7WGyRcYHlEAAQq7Sq5NuVFhkTWFawAEiRcbXrqp2V1j/KLOIfWD7JHYCU1NXEYal65pLMukBmEePA0lcAhDU2ZWlVMeCGySxiyedgAZB5dZWuHwdVZAULgDDuT1PrjJ047BLrWMSMFSwAMriu4vDToaJklCh2FACoVd9MuCQOhXfJhfc7F8QlsNwiBKA2/hSDuirtvEs1FvHgFiGQMWa8ucBBUFeZ9XrIWVawgNh5fuchVa6xftL1MIeLio11mXUs0i1x6TkjHAVScYF05aPGFVVjRl0duy/Gy0Uai/RKJixhEdRzhQvKXj5POtQFz5BYUGc/q1y0GX4p9V8Fsb4Z5+pGmkfgZQOtYJHyS6nrnJCKA+MwpwIriqLLL7q/ikPX2CA4e7AI49lKL66ll95/MItl9YnOrAQ0GmtjTEEG7CVPVHkwlx0bBgZhht/lVrCo84uu+UtIxZBhmX2BFUXRFTtaxKr68DYqqDErWNTKX2t0GS6Z3fqaubLonGZfUxqflRhdkDEfhZCo3dguOyoMCao39q4YZAWLml6JFwa4EvftZs7KqhOarQzU7QJrfCZ91lSHI680GEhDYA2PZWA9s3DByUZwjD0T+krsdGfZCc16uTxi782cugqeVkYCmR1YLt45ezF2pqSV3hJYGdFVhgE/HFhXxiywpsd7uj8lt98/dXZ2TjFP5fx7LUPlwtC9J8aBla60MokR98DKlBk/B985aTk1ZihppbTUVWZ1lamM7wPrqp/FJbCeXpBhk/5PD8uV90x6T03uHGdvsayUZQP47nExCqyYd5UJTWDFIrAyeurP4jdMfM6LWUlaKS2BldFpZU7LucC6OgaB9VRWzP79su7dEsPz0s+UlJNvriyT0cP4j2kNrCzoKjObwHIByOn3ScxPislIWpkuciqwsrWrzG9ZHljXpDWw/pKl14D+mfwOyaCT0t9MlEtvqyyWKSP5rjqvq5xKK1NcbSa9GB6rxDXnXp+2I/LGwix/bxzeLcPGaGaekYw7zs4gGTqY7xp7qa4yPGI718Xt+CSuTVNgTcuZK8GpmfCWyILTcWpuTz3TpJVJI/X+kPrAklZmvNrMcrE6LOkJrNy8GMT2/ZBNp8Okg0kjEwNLV5n6Qk1u8TkUievqPLCm5vb14LQ4vQ2y9VyclhuZNVVamTfq1p2hA0tXmQBTNK3F4SAIrNx9A2T9icjizPImMnVkemBJKzNhqmeztP/iievPq9PA+vN8F4bvDTgiPac/185Cuo6zc0eWjerf31/bwNJVJsO6nMfS+/vWaWC5NsRhBOTsWcj0zPL2IQ4Du5LGEk8GTwynrzTO/IkRdRVYU1weKnV66geBU1A3x9lZI8vGtkFo/GT0sEnXtF9HgeX9mfah4BRkXH45ZdTBMDbMCDUZxnkspWVuT9yQ+sCa7A1cfWeEGw2OfwxPilMGZMHUl0GT1Rl13liJGwanNrAmz3OpqMWAOLKbg58jJ8spA4j/LF2NwBqZysB60tUihDNrNCYc/Mw6ic4XQGwvqfEKLBeMdI0JRx4A0ttYeYkoSsWXa3wqgvXJeQsdeQCo5fU0RfGz3deNKVjBesI1PvXOqhDgDjsA1PgyGlZeIhGF/XKZrxtPzFv4xLyFDjsA1OwyGjyBtvu6ach1AV/u43MLnTMAICOcfdShKXrmkHuw1BUAkEEen1uYoj1YeaFe4mPqCgDINI/NLUxFw4RZwVJXAEBGZ1boFaxaP8ej6goAyHCPzi0MWFi1XcF69HV1BQBkRWO9XhiLPViT1BUAkEVCtU3NV7DUFQCQlY2VthWsR9QVAJClat85yUSi2t/z8Bx1BQBkf2Ode3QNP4m02itY6goAyBE1zp7q7cFSVwBArjVWavdg/Y+6AgByTw0SqKorWOoKAMjlxqruJ7kXV+kLACCHPTSnsKrVlCiu0grWQ7PfdFgBgFxvrNlvBtuD9d/qCgCgOl2UrPxjsB5UVwAAFRrr/GO6VvKYPHUFAFBdlWdSXiIR7fBLXQEAVN5YO+uoHW9yf2CWugIA+AEPzHqzqpvcJ6orAICq2WE4lV/BUlcAANVtrMpWsCaoKwCA6isXUcnEd5/TUPCaugIAqFVjXXRc16h0BUtdAQDUXklT5SXUFQBA0MZKtDl2iAMBABBQnkMAACCwAAAEFgCAwAIAQGABAAgsAACBBQCAwAIAEFgAAAILAACBBQAgsAAABBYAgMACAEBgAQAILAAAgQUAgMACABBYAAACCwAAgQUAILAAAAQWAAACCwBAYAEACCwAAIEFAIDAAgAQWAAAAgsAAIEFACCwAAAEFgAAAgsAQGABAAgsAAAEFgCAwAIAEFgAAAILAACBBQAgsAAABBYAAAILAEBgAQAILAAABBYAgMACABBYAAAILAAAgQUAILAAAAQWAAACCwBAYAEACCwAAAQWAIDAAgAQWAAACCwAAIEFACCwAAAEFgAAAgsAQGABAAgsAAAEFgCAwAIAEFgAAAgsAACBBQAgsAAAEFgAAAILAEBgAQAILAAABBYAgMACABBYAAAILAAAgQUAILAAABBYAAACCwBAYAEAILAAAAQWAIDAAgAQWAAACCwAAIEFACCwAAAQWAAAAgsAQGABACCwAAAEFgCAwAIAQGABAAgsAACBBQAgsAAAEFgAAAILAEBgAQAgsAAABBYAgMACAEBgAQAILAAAgQUAILAAABBYAAACCwBAYAEAILAAAAQWAIDAAgBAYAEACCwAAIEFAIDAAgAQWAAAAgsAQGABACCwAAAEFgCAwAIAQGABAAgsAACBBQCAwAIAEFgAAAILAACBBQAgsAAAsjCwOrdv+cefn/VywdVvTf7nZ++7YvigHsnk/z/Domk3jx51Tsl/T7rjwmFnHVfJ84wedc6iaTcH/2V+8OcCAMQrsHoddcCTd16czM/75ZhnLr/l0RdfX3LVeT1vvapfxUfWr5dfP5lf979MtX5uiiIPACBZ9YfeeGGflWs+uer2x7cVF0dRNPONZV9v/vbygT+aNH3+gkWryj7yzOvGFRen4ZdJ188FAKhhYO27954LF6/eViZhJr9Q2Ll9y5bNGpV75N+m3jxj9uLhtz1W8sddd6k3fFCPfj27NG+y24cfffrw9PnlHl/ygP49u7Ro2mjt+k1PPL/wvkdf3bqtfCstmnbzjNmLH/rL3GuG9Oq0315btmyd+cbyOybMWF20acc/t0G9Kwb16N+rS/Mmu636eOPUF98cP2X25m++LXmq0ueMoujAU28vff7Sb4+iaPSoc048plPZ/ztz/rLrzz+h4M+zRz8ys+qvHAAQWDu29P2iIzq3Oa5bu9cWrij5mxWrNlx2y6TKv2uX+skHfzWk034txkyaWbh49UH7t7x2cK8vvtpc+oB6yfyCWwe3adF49KSZy1etP+zA1pcP6tGq2R7/eu/TFZ+tbcsmv7/pjIIps//w4Esd2ja/bsgJRxzcZsA1Yzd+9lW5R9avl19w63md9295z8OvvL10zeGd21x57o87t2957W+ejKJo0MgJIy/s0/2QfQeNnFD1I3BA2+bdOu1zzyOvvDRnSXVfOQAgsHbg9vufG/fLcyfcNvj1t95/ed7Sl+e+t3jFxz/4XRcMOLprx32u/c2Tz8x8N4qiVxcsf2vp2om3D/7+Aad1P7Tj3gOuHbtkZVEURa8tXLFl67aRF/QZP2XWilUbyj1bp3YtLhz1UEnhvbZwxbpPv7jrn8687Jzjfzt+RsWfe/hBbYbf9tiM2YtLHhwlomsH9+o2pfXCRasWLFq16Yuvoygqd3Ozcm333vPsEQVvL11Tg1cOAOSOamxyn/fOB30vH1MwZXar5nuMvKDPtLsveex3F3XtuE/l33VKj4PXrtv011ffLf2bWYUrln24vvSP/XsdUrhkzbIP1+fn55V8vThnSSIRHdu1XcVnW7FqQ+n6WRRFz776t6INn594dKeKj+zfs8vqjzeW1FWJR6bP/+34Gd9+u7XGB2vJyqLSuqruKwcAckeyWo/+aP1nvx73/K/HPd9x370G9O469LTuD/7HkLOuH//eB+t29i3tWjctXLS63N7zD9Z+sn+bZiX/3b5Ns13qJ9+Z8vNy39i0ccOKz/b+2k/K/nFbcfHy1RsOO7B1xUe2b91s/rsflv2bDRu/HDd5VrV+30QiUfaPq4s2bvcjqvPKAQCB9QOWvF90x8QXFq346I6Rp//s5MNvv/+5nf6A/LztKyWKoqhB/e9/bl4iMe+dD341tvwzrF33WcVnK674rwSLi7du3VbxkXl5ifz8an+MarlX2qhhg+16bvvd69V65QBA7qhqggw6+fAn77y4S4dWZf/yhTlLoijaq2mjSr5xddGmdq2blmusfVvtWfrfa4o2Ntyl/ltL1pR+ff7l5t7dO+62a/2Kz9amZZPteigR7bdP0+Wr11d85JqiTW1bbffgJo127d29Y8V/81hq67bihtv/0P3bNqvkV6vWKwcABFZ5i1cWdTlg72sG9yq7HlXSW5VvdX9xzuIWTRv1KbNNqnf3jvu0aFz6x5fnLu3cvuUBbZuX/s2FA465YuCPPtn0ZcVn69C2+dFd9yv94yk9Dm7ZrNH0V96t+MiZbyzbu/kevY46oPRvLjn7+DG/GJj8blmrZDGs9JPooyj6eMNnnfZrUe+7jyrtccT+zRrvVsmvVq1XDgDkjvw92hxalcetXbep+Z67n9qrS/cu+27e8m3TJg37Ht951GV9167bNOqep77ZsnX4oB5bt257dcHyjZ9/ffV5PZevWv/U/74TRdE77609tdchp/Q46POvvtl91wb9eh58wwV9Plj7SbMmu93z8CtRFL277KP+vbqceVK3L77a3Hj3Xc/v331wv6PufPCl/1uwvNxruPq8nmvXbTq9T9dtW4sb7lKvX88uPx920ttL1/zb6OkldwnL/txFKz4e0LvrT3988NebtzTctf7AvocPO+vYB6bOefq7Gjv+sPZdOrTasmVrfn7eqo82RlHUZI+GPY/scGD7Fp9u+urIg9uOurTvqo83Nv/udZZ98hJVf+UAQE6pxh6sfx89/ZV57w09rfu/DDtp990afPjRpw89NW/85FlffPVNFEWTXyg87YSuY34xsN/w+8p+14aNX55708QbLzpxxNATkvl5i1cWjfjPyeef2r1TuxYlD1j36ReDRk4YMbT3iKG9G9RPvvf+uht/N2Xay2/v8DW8/d7aWYUrh/Q7cp8WjYs2fD5x6pzRj8ws+ezQikU4cGTBiKG9rz6vZ716+StXb7hlzDOTnnmj9AETp8457MDWV53b8+tvthw56I4oiu5+6OXibcVn/OTQe0eds+zD9bf/6dkBfboe+N3rrKharxwAyB2JNscOyZTXWvGT1gEAYijPIQAAEFgAAAILACCXZNIeLACAjGAFCwBAYAEACCwAAIEFAIDAAgAQWAAAAgsAgCr5O4kk04EqXgwyAAAAAElFTkSuQmCC</office:binary-data></draw:image><svg:title>A lake at dusk</svg:title></draw:frame><draw:rect draw:style-name="gr-grad" draw:layer="layout" svg:width="4cm" svg:height="2.4cm" svg:x="16cm" svg:y="4cm"><text:p text:style-name="P-center">Start</text:p></draw:rect><draw:line draw:style-name="gr-arrow" draw:layer="layout" svg:x1="20cm" svg:y1="5.2cm" svg:x2="22.5cm" svg:y2="5.2cm"/><draw:ellipse draw:style-name="gr-fill2" draw:layer="layout" svg:width="3.4cm" svg:height="2.4cm" svg:x="22.8cm" svg:y="4cm"><text:p text:style-name="P-center">Moor</text:p></draw:ellipse><draw:line draw:style-name="gr-arrow" draw:layer="layout" svg:x1="24.5cm" svg:y1="6.4cm" svg:x2="24.5cm" svg:y2="8.4cm"/><draw:polygon draw:style-name="gr-fill3" draw:layer="layout" svg:width="4cm" svg:height="3cm" svg:x="22.5cm" svg:y="8.5cm" svg:viewBox="0 0 4000 3000" draw:points="2000,0 4000,1500 2000,3000 0,1500"><text:p text:style-name="P-center">Pay?</text:p></draw:polygon><draw:custom-shape draw:style-name="gr-fill4" draw:layer="layout" svg:width="4cm" svg:height="3cm" svg:x="16.5cm" svg:y="8.5cm"><text:p text:style-name="P-center">Star</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="star5" draw:enhanced-path="M 10800 0 L 8270 8260 0 8260 6720 13360 4200 21600 10800 16500 17400 21600 14880 13360 21600 8260 13330 8260 Z N"/></draw:custom-shape><presentation:notes><draw:page-thumbnail presentation:class="page" draw:layer="layout" svg:width="14.8cm" svg:height="8.3cm" svg:x="3.2cm" svg:y="2cm"/><draw:frame presentation:class="notes" draw:layer="layout" svg:width="17cm" svg:height="12cm" svg:x="2cm" svg:y="11cm"><draw:text-box><text:p>Shapes with gradients, arrows and text.</text:p></draw:text-box></draw:frame></presentation:notes></draw:page>
+<presentation:settings presentation:full-screen="false"/>
+</office:presentation></office:body>
+</office:document>
diff --git a/crates/exav-viewer/demo/examples/files/converted/deck.odp b/crates/exav-viewer/demo/examples/files/converted/deck.odp
new file mode 100644
index 00000000..2fdb16ba
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/deck.odp differ
diff --git a/crates/exav-viewer/demo/examples/files/converted/deck.ppt b/crates/exav-viewer/demo/examples/files/converted/deck.ppt
new file mode 100644
index 00000000..f3f914c4
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/deck.ppt differ
diff --git a/crates/exav-viewer/demo/examples/files/converted/diagram.fodg b/crates/exav-viewer/demo/examples/files/converted/diagram.fodg
new file mode 100644
index 00000000..5dad6ee6
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/converted/diagram.fodg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.graphics">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Flowchart</dc:title><dc:subject>A drawing made for the exav demo (CC0-1.0)</dc:subject><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:font-face-decls><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"/></office:font-face-decls>
+<office:styles>
+<draw:gradient draw:name="Steel" draw:style="linear" draw:start-color="#c7d9e6" draw:end-color="#6f93ad" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0deg" draw:border="0%"/>
+<draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20z"/>
+<style:default-style style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#3465a4" draw:fill="solid" draw:fill-color="#729fcf"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="14pt"/></style:default-style>
+<style:style style:name="st-box" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#0b4f6c" draw:fill="solid" draw:fill-color="#dbe9f4" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center" draw:shadow="visible" draw:shadow-offset-x="0.1cm" draw:shadow-offset-y="0.1cm" draw:shadow-color="#999999"/></style:style>
+<style:style style:name="st-start" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#1c6e3e" draw:fill="solid" draw:fill-color="#bfe8c4" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-end" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#8a1c1c" draw:fill="solid" draw:fill-color="#f5c2c0" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-decision" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#7a5c00" draw:stroke-dash="dash" draw:fill="solid" draw:fill-color="#ffe9a8" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-grad" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Steel" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-line" style:family="graphic"><style:graphic-properties draw:fill="none" svg:stroke-width="0.08cm" svg:stroke-color="#333333" draw:marker-end="Arrow" draw:marker-end-width="0.35cm"/></style:style>
+<style:style style:name="st-curve" style:family="graphic"><style:graphic-properties draw:fill="none" svg:stroke-width="0.1cm" svg:stroke-color="#c0392b"/></style:style>
+<style:style style:name="st-note" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/><style:text-properties fo:font-style="italic" fo:color="#555555"/></style:style>
+<style:style style:name="st-legend" style:family="graphic"><style:graphic-properties svg:stroke-width="0.03cm" svg:stroke-color="#999999" draw:fill="solid" draw:fill-color="#ffffff"/></style:style>
+<style:style style:name="st-text" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="24cm" fo:page-height="19cm" style:print-orientation="portrait"/></style:page-layout>
+<style:style style:name="dp1" style:family="drawing-page"><style:drawing-page-properties draw:background-size="border" draw:fill="solid" draw:fill-color="#fbfaf7"/></style:style>
+<style:style style:name="P-c" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="13pt"/></style:style>
+<style:style style:name="P-s" style:family="paragraph"><style:text-properties fo:font-size="10pt"/></style:style>
+</office:automatic-styles>
+<office:master-styles><draw:layer-set><draw:layer draw:name="Boxes"/><draw:layer draw:name="Lines"/><draw:layer draw:name="Notes"/><draw:layer draw:name="Hidden" draw:display="none"/></draw:layer-set><style:master-page style:name="Default" style:page-layout-name="pm1" draw:style-name="dp1"/></office:master-styles>
+<office:body><office:drawing><draw:page draw:name="Mooring" draw:style-name="dp1" draw:master-page-name="Default"><draw:ellipse draw:id="n1" draw:style-name="st-start" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="9cm" svg:y="1cm"><text:p text:style-name="P-c">Boat calls the office</text:p></draw:ellipse><draw:rect draw:id="n2" draw:style-name="st-decision" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="9cm" svg:y="4cm" draw:corner-radius="0.2cm"><text:p text:style-name="P-c">Is a berth free?</text:p></draw:rect><draw:rect draw:id="n3" draw:style-name="st-box" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="2cm" svg:y="7.5cm" draw:corner-radius="0.2cm"><text:p text:style-name="P-c">Give berth number</text:p></draw:rect><draw:rect draw:id="n4" draw:style-name="st-box" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="16cm" svg:y="7.5cm" draw:corner-radius="0.2cm"><text:p text:style-name="P-c">Offer the waiting list</text:p></draw:rect><draw:rect draw:id="n5" draw:style-name="st-box" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="2cm" svg:y="11cm" draw:corner-radius="0.2cm"><text:p text:style-name="P-c">Boat moors</text:p></draw:rect><draw:ellipse draw:id="n6" draw:style-name="st-end" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="9cm" svg:y="14.5cm"><text:p text:style-name="P-c">Pay at the office</text:p></draw:ellipse><draw:rect draw:id="n7" draw:style-name="st-box" draw:layer="Boxes" svg:width="6cm" svg:height="1.6cm" svg:x="16cm" svg:y="11cm" draw:corner-radius="0.2cm"><text:p text:style-name="P-c">Boat waits at anchor</text:p></draw:rect><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="standard" draw:start-shape="n1" draw:start-glue-point="2" draw:end-shape="n2" draw:end-glue-point="0" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="standard" draw:start-shape="n2" draw:start-glue-point="3" draw:end-shape="n3" draw:end-glue-point="0" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="standard" draw:start-shape="n2" draw:start-glue-point="3" draw:end-shape="n4" draw:end-glue-point="0" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="standard" draw:start-shape="n3" draw:start-glue-point="2" draw:end-shape="n5" draw:end-glue-point="0" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="standard" draw:start-shape="n4" draw:start-glue-point="2" draw:end-shape="n7" draw:end-glue-point="0" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="standard" draw:start-shape="n5" draw:start-glue-point="2" draw:end-shape="n6" draw:end-glue-point="1" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="curve" draw:start-shape="n7" draw:start-glue-point="1" draw:end-shape="n2" draw:end-glue-point="3" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/><draw:custom-shape draw:style-name="st-note" draw:layer="Notes" svg:width="1.6cm" svg:height="0.9cm" svg:x="5.2cm" svg:y="5.2cm"><text:p text:style-name="P-c">yes</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 Z N"/></draw:custom-shape><draw:custom-shape draw:style-name="st-note" draw:layer="Notes" svg:width="1.6cm" svg:height="0.9cm" svg:x="16.2cm" svg:y="5.2cm"><text:p text:style-name="P-c">no</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 Z N"/></draw:custom-shape><draw:g draw:layer="Notes"><draw:rect draw:style-name="st-legend" svg:width="5.5cm" svg:height="3.4cm" svg:x="0.8cm" svg:y="0.6cm"/><draw:rect draw:style-name="st-start" svg:width="0.7cm" svg:height="0.5cm" svg:x="1.1cm" svg:y="1.1cm"/><draw:frame draw:style-name="st-text" svg:width="3.8cm" svg:height="0.6cm" svg:x="2cm" svg:y="1.05cm"><draw:text-box><text:p text:style-name="P-s">start or end</text:p></draw:text-box></draw:frame><draw:rect draw:style-name="st-box" svg:width="0.7cm" svg:height="0.5cm" svg:x="1.1cm" svg:y="2cm"/><draw:frame draw:style-name="st-text" svg:width="3.8cm" svg:height="0.6cm" svg:x="2cm" svg:y="1.95cm"><draw:text-box><text:p text:style-name="P-s">step</text:p></draw:text-box></draw:frame><draw:rect draw:style-name="st-decision" svg:width="0.7cm" svg:height="0.5cm" svg:x="1.1cm" svg:y="2.9cm"/><draw:frame draw:style-name="st-text" svg:width="3.8cm" svg:height="0.6cm" svg:x="2cm" svg:y="2.85cm"><draw:text-box><text:p text:style-name="P-s">decision</text:p></draw:text-box></draw:frame></draw:g><draw:path draw:style-name="st-curve" draw:layer="Notes" svg:width="6cm" svg:height="2.5cm" svg:x="17cm" svg:y="15cm" svg:viewBox="0 0 6000 2500" svg:d="M 0 2000 C 1500 -500 3000 4500 6000 500"/><draw:frame draw:style-name="st-text" draw:layer="Notes" svg:width="14cm" svg:height="1cm" svg:x="0.8cm" svg:y="17.4cm"><draw:text-box><text:p text:style-name="P-s">Flowchart for the exav demo (CC0-1.0). Connectors follow their shapes.</text:p></draw:text-box></draw:frame></draw:page><draw:page draw:name="Blocks" draw:style-name="dp1" draw:master-page-name="Default"><draw:g draw:layer="Boxes"><draw:rect draw:id="b0" draw:style-name="st-box" svg:width="6cm" svg:height="3cm" svg:x="1.5cm" svg:y="2cm"><text:p text:style-name="P-c">Harbour office</text:p></draw:rect><draw:ellipse draw:style-name="st-start" svg:width="0.8cm" svg:height="0.8cm" svg:x="6.9cm" svg:y="2.2cm"><text:p text:style-name="P-s">1</text:p></draw:ellipse></draw:g><draw:g draw:layer="Boxes"><draw:rect draw:id="b1" draw:style-name="st-box" svg:width="6cm" svg:height="3cm" svg:x="9.5cm" svg:y="2cm"><text:p text:style-name="P-c">Berth register</text:p></draw:rect><draw:ellipse draw:style-name="st-start" svg:width="0.8cm" svg:height="0.8cm" svg:x="14.9cm" svg:y="2.2cm"><text:p text:style-name="P-s">2</text:p></draw:ellipse></draw:g><draw:g draw:layer="Boxes"><draw:rect draw:id="b2" draw:style-name="st-box" svg:width="6cm" svg:height="3cm" svg:x="17.5cm" svg:y="2cm"><text:p text:style-name="P-c">Billing</text:p></draw:rect><draw:ellipse draw:style-name="st-start" svg:width="0.8cm" svg:height="0.8cm" svg:x="22.9cm" svg:y="2.2cm"><text:p text:style-name="P-s">3</text:p></draw:ellipse></draw:g><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="line" draw:start-shape="b0" draw:start-glue-point="3" draw:end-shape="b1" draw:end-glue-point="1" svg:x1="7.5cm" svg:y1="3.5cm" svg:x2="9.5cm" svg:y2="3.5cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="line" draw:start-shape="b1" draw:start-glue-point="3" draw:end-shape="b2" draw:end-glue-point="1" svg:x1="15.5cm" svg:y1="3.5cm" svg:x2="17.5cm" svg:y2="3.5cm"/><draw:rect draw:style-name="st-grad" draw:layer="Boxes" svg:width="14cm" svg:height="1.4cm" svg:x="5cm" svg:y="7.0cm"><text:p text:style-name="P-c">Layer 1</text:p></draw:rect><draw:rect draw:style-name="st-grad" draw:layer="Boxes" svg:width="12cm" svg:height="1.4cm" svg:x="6cm" svg:y="8.6cm"><text:p text:style-name="P-c">Layer 2</text:p></draw:rect><draw:rect draw:style-name="st-grad" draw:layer="Boxes" svg:width="10cm" svg:height="1.4cm" svg:x="7cm" svg:y="10.2cm"><text:p text:style-name="P-c">Layer 3</text:p></draw:rect><draw:rect draw:style-name="st-grad" draw:layer="Boxes" svg:width="8cm" svg:height="1.4cm" svg:x="8cm" svg:y="11.8cm"><text:p text:style-name="P-c">Layer 4</text:p></draw:rect><draw:rect draw:style-name="st-box" draw:layer="Hidden" svg:width="8cm" svg:height="1.4cm" svg:x="2cm" svg:y="15cm"><text:p text:style-name="P-c">On a hidden layer</text:p></draw:rect><draw:polyline draw:style-name="st-curve" draw:layer="Notes" svg:width="8cm" svg:height="3cm" svg:x="14cm" svg:y="14cm" svg:viewBox="0 0 8000 3000" draw:points="0,3000 2000,500 4000,2500 6000,0 8000,2000"/></draw:page></office:drawing></office:body>
+</office:document>
diff --git a/crates/exav-viewer/demo/examples/files/converted/diagram.odg b/crates/exav-viewer/demo/examples/files/converted/diagram.odg
new file mode 100644
index 00000000..aefe2197
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/diagram.odg differ
diff --git a/crates/exav-viewer/demo/examples/files/converted/handbook.doc b/crates/exav-viewer/demo/examples/files/converted/handbook.doc
new file mode 100644
index 00000000..b5ead741
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/handbook.doc differ
diff --git a/crates/exav-viewer/demo/examples/files/converted/handbook.fodt b/crates/exav-viewer/demo/examples/files/converted/handbook.fodt
new file mode 100644
index 00000000..f54b1c3f
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/converted/handbook.fodt
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Harbour handbook</dc:title><dc:subject>A document made for the exav demo (CC0-1.0)</dc:subject><meta:keyword>demo</meta:keyword><dc:language>en-US</dc:language><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:font-face-decls>
+<style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+<style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
+<style:font-face style:name="Liberation Mono" svg:font-family="'Liberation Mono'" style:font-family-generic="modern" style:font-pitch="fixed"/>
+</office:font-face-decls>
+<office:styles>
+<style:default-style style:family="paragraph"><style:paragraph-properties fo:orphans="2" fo:widows="2" style:tab-stop-distance="1.25cm"/><style:text-properties style:font-name="Liberation Serif" fo:font-size="11pt" fo:language="en" fo:country="US"/></style:default-style>
+<style:style style:name="Standard" style:family="paragraph" style:class="text"/>
+<style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"><style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.22cm" fo:line-height="125%"/></style:style>
+<style:style style:name="Title" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Subtitle" style:class="chapter"><style:paragraph-properties fo:margin-top="3cm" fo:margin-bottom="0.3cm" fo:text-align="start"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="30pt" fo:font-weight="bold" fo:color="#0b4f6c"/></style:style>
+<style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Standard" style:class="chapter"><style:paragraph-properties fo:margin-bottom="0.6cm"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="16pt" fo:color="#555555"/></style:style>
+<style:style style:name="Author" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-bottom="0.1cm"/><style:text-properties fo:font-size="10pt" fo:color="#666666"/></style:style>
+<style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text"><style:paragraph-properties fo:margin-top="0.45cm" fo:margin-bottom="0.2cm" fo:keep-with-next="always"/><style:text-properties style:font-name="Liberation Sans" fo:font-weight="bold"/></style:style>
+<style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="1" style:list-style-name="Outline" style:class="text"><style:text-properties fo:font-size="17pt" fo:color="#0b4f6c"/></style:style>
+<style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="2" style:list-style-name="Outline" style:class="text"><style:text-properties fo:font-size="13pt" fo:color="#146c94"/></style:style>
+<style:style style:name="Heading_20_1_20_Landscape" style:display-name="Heading 1 Landscape" style:family="paragraph" style:parent-style-name="Heading_20_1"><style:paragraph-properties style:page-number="auto" style:master-page-name="Landscape" fo:break-before="page"/></style:style>
+<style:style style:name="Contents_20_Heading" style:display-name="Contents Heading" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-top="1.5cm" fo:margin-bottom="0.3cm"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="15pt" fo:font-weight="bold"/></style:style>
+<style:style style:name="Contents_20_1" style:display-name="Contents 1" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-bottom="0.1cm"/></style:style>
+<style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm" fo:margin-top="0.2cm" fo:margin-bottom="0.3cm" fo:padding="0.15cm" fo:border-left="2.25pt solid #146c94" fo:border-top="none" fo:border-bottom="none" fo:border-right="none"/><style:text-properties fo:font-style="italic" fo:color="#333333"/></style:style>
+<style:style style:name="Justified" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:text-align="justify"/></style:style>
+<style:style style:name="Centered" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:text-align="center"/></style:style>
+<style:style style:name="Right" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:text-align="end"/></style:style>
+<style:style style:name="Indented" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:margin-left="1.5cm" fo:border-left="1pt solid #999999" fo:padding-left="0.2cm"/></style:style>
+<style:style style:name="Code" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-left="0.5cm" fo:margin-bottom="0cm" fo:background-color="#f0f0f0" fo:padding="0.08cm"/><style:text-properties style:font-name="Liberation Mono" fo:font-size="9.5pt"/></style:style>
+<style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0.2cm"/><style:text-properties fo:font-size="9pt" fo:font-style="italic" fo:color="#444444"/></style:style>
+<style:style style:name="Footnote" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-left="0.5cm" fo:text-indent="-0.5cm"/><style:text-properties fo:font-size="9pt"/></style:style>
+<style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:text-properties fo:font-size="9pt" fo:color="#666666"/></style:style>
+<style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="9pt" fo:color="#666666"/></style:style>
+<style:style style:name="List_20_Contents" style:display-name="List Contents" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-bottom="0.08cm"/></style:style>
+<style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard"/>
+<style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="Table_20_Right" style:display-name="Table Right" style:family="paragraph" style:parent-style-name="Table_20_Contents"><style:paragraph-properties fo:text-align="end"/></style:style>
+<style:style style:name="Strong" style:family="text"><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="Emphasis" style:family="text"><style:text-properties fo:font-style="italic"/></style:style>
+<style:style style:name="Underline" style:family="text"><style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/></style:style>
+<style:style style:name="Strike" style:family="text"><style:text-properties style:text-line-through-style="solid"/></style:style>
+<style:style style:name="Red" style:family="text"><style:text-properties fo:color="#c0392b"/></style:style>
+<style:style style:name="Highlight" style:family="text"><style:text-properties fo:background-color="#ffeb3b"/></style:style>
+<style:style style:name="SmallCaps" style:family="text"><style:text-properties fo:font-variant="small-caps"/></style:style>
+<style:style style:name="Big" style:family="text"><style:text-properties fo:font-size="15pt"/></style:style>
+<style:style style:name="Mono" style:family="text"><style:text-properties style:font-name="Liberation Mono" fo:font-size="10pt"/></style:style>
+<style:style style:name="Sub" style:family="text"><style:text-properties style:text-position="sub 58%"/></style:style>
+<style:style style:name="Super" style:family="text"><style:text-properties style:text-position="super 58%"/></style:style>
+<style:style style:name="Internet_20_link" style:display-name="Internet link" style:family="text"><style:text-properties fo:color="#0645ad" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/></style:style>
+<style:style style:name="Visited_20_Internet_20_Link" style:display-name="Visited Internet Link" style:family="text"><style:text-properties fo:color="#6a1b9a" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/></style:style>
+<style:style style:name="Index_20_Link" style:display-name="Index Link" style:family="text"/>
+<text:outline-style style:name="Outline">
+<text:outline-level-style text:level="1" style:num-format="1" style:num-suffix=". "><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9cm" fo:text-indent="-0.9cm" fo:margin-left="0.9cm"/></style:list-level-properties></text:outline-level-style>
+<text:outline-level-style text:level="2" style:num-format="1" text:display-levels="2" style:num-suffix=" "><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.2cm" fo:text-indent="-1.2cm" fo:margin-left="1.2cm"/></style:list-level-properties></text:outline-level-style>
+</text:outline-style>
+<text:list-style style:name="L1">
+<text:list-level-style-bullet text:level="1" text:bullet-char="•"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9cm" fo:text-indent="-0.5cm" fo:margin-left="0.9cm"/></style:list-level-properties></text:list-level-style-bullet>
+<text:list-level-style-bullet text:level="2" text:bullet-char="◦"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.7cm" fo:text-indent="-0.5cm" fo:margin-left="1.7cm"/></style:list-level-properties></text:list-level-style-bullet>
+<text:list-level-style-bullet text:level="3" text:bullet-char="▪"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.5cm" fo:text-indent="-0.5cm" fo:margin-left="2.5cm"/></style:list-level-properties></text:list-level-style-bullet>
+</text:list-style>
+<text:list-style style:name="L2">
+<text:list-level-style-number text:level="1" style:num-suffix="." style:num-format="1"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9cm" fo:text-indent="-0.6cm" fo:margin-left="0.9cm"/></style:list-level-properties></text:list-level-style-number>
+<text:list-level-style-number text:level="2" style:num-suffix=")" style:num-format="a"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.8cm" fo:text-indent="-0.6cm" fo:margin-left="1.8cm"/></style:list-level-properties></text:list-level-style-number>
+</text:list-style>
+<text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
+<text:linenumbering-configuration text:number-lines="false"/>
+<style:style style:name="fr1" style:family="graphic"><style:graphic-properties style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="right" style:horizontal-rel="paragraph" fo:margin-left="0.3cm" fo:margin-bottom="0.2cm" fo:border="0.5pt solid #999999"/></style:style>
+<style:style style:name="fr2" style:family="graphic"><style:graphic-properties style:vertical-pos="top" style:vertical-rel="baseline" fo:border="0.5pt solid #999999"/></style:style>
+<style:style style:name="gr1" style:family="graphic"><style:graphic-properties draw:fill="solid" draw:fill-color="#dbe9f4" draw:stroke="solid" svg:stroke-color="#146c94" svg:stroke-width="0.06cm" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<number:date-style style:name="N10"><number:day number:style="long"/><number:text>/</number:text><number:month number:style="long"/><number:text>/</number:text><number:year number:style="long"/></number:date-style>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="21cm" fo:page-height="29.7cm" style:print-orientation="portrait" fo:margin-top="1.5cm" fo:margin-bottom="1.2cm" fo:margin-left="2.2cm" fo:margin-right="2.2cm"/><style:header-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-bottom="0.4cm"/></style:header-style><style:footer-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-top="0.4cm"/></style:footer-style></style:page-layout>
+<style:page-layout style:name="pm2"><style:page-layout-properties fo:page-width="29.7cm" fo:page-height="21cm" style:print-orientation="landscape" fo:margin-top="1.5cm" fo:margin-bottom="1.2cm" fo:margin-left="2.2cm" fo:margin-right="2.2cm"/><style:header-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-bottom="0.4cm"/></style:header-style><style:footer-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-top="0.4cm"/></style:footer-style></style:page-layout>
+<style:style style:name="Sect1" style:family="section"><style:section-properties text:dont-balance-text-columns="false" style:editable="false"><style:columns fo:column-count="0" fo:column-gap="0cm"/></style:section-properties></style:style>
+<style:style style:name="Sect2" style:family="section"><style:section-properties text:dont-balance-text-columns="false" style:editable="false"><style:columns fo:column-count="2" fo:column-gap="0.8cm"><style:column-sep style:width="0.5pt" style:color="#999999" style:height="100%"/><style:column style:rel-width="1*" fo:start-indent="0cm" fo:end-indent="0.4cm"/><style:column style:rel-width="1*" fo:start-indent="0.4cm" fo:end-indent="0cm"/></style:columns></style:section-properties></style:style>
+<style:style style:name="Tbl1" style:family="table"><style:table-properties style:width="14cm" table:align="left" fo:margin-top="0.2cm" fo:margin-bottom="0.3cm"/></style:style>
+<style:style style:name="TblWide" style:family="table"><style:table-properties style:width="24.5cm" table:align="left"/></style:style>
+<style:style style:name="TcolA" style:family="table-column"><style:table-column-properties style:column-width="4.5cm"/></style:style>
+<style:style style:name="TcolB" style:family="table-column"><style:table-column-properties style:column-width="3cm"/></style:style>
+<style:style style:name="TcolC" style:family="table-column"><style:table-column-properties style:column-width="3.5cm"/></style:style>
+<style:style style:name="TcolD" style:family="table-column"><style:table-column-properties style:column-width="3cm"/></style:style>
+<style:style style:name="TcolW" style:family="table-column"><style:table-column-properties style:column-width="2.04cm"/></style:style>
+<style:style style:name="Tc" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:border="0.5pt solid #8aa6b4"/></style:style>
+<style:style style:name="TcR" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:border="0.5pt solid #8aa6b4"/></style:style>
+<style:style style:name="Th" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:background-color="#0b4f6c" fo:border="0.5pt solid #8aa6b4"/></style:style>
+<style:style style:name="TcTotal" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:background-color="#e8f1f5" fo:border="0.5pt solid #8aa6b4" fo:border-top="1.5pt solid #000000"/></style:style>
+<style:style style:name="TcTotalR" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:background-color="#e8f1f5" fo:border="0.5pt solid #8aa6b4" fo:border-top="1.5pt solid #000000"/></style:style>
+</office:automatic-styles>
+<office:master-styles>
+<style:master-page style:name="Standard" style:page-layout-name="pm1"><style:header><text:p text:style-name="Header">Harbour handbook<text:tab/><text:tab/>exav demo</text:p></style:header><style:footer><text:p text:style-name="Footer">Page <text:page-number text:select-page="current">1</text:page-number> of <text:page-count>1</text:page-count></text:p></style:footer></style:master-page>
+<style:master-page style:name="Landscape" style:page-layout-name="pm2"><style:header><text:p text:style-name="Header">Harbour handbook (landscape section)</text:p></style:header><style:footer><text:p text:style-name="Footer">Page <text:page-number text:select-page="current">1</text:page-number></text:p></style:footer></style:master-page>
+</office:master-styles>
+<office:body><office:text>
+<text:tracked-changes text:track-changes="false">
+<text:changed-region text:id="ct1"><text:insertion><office:change-info><dc:creator>exav</dc:creator><dc:date>2000-01-01T00:00:00</dc:date></office:change-info></text:insertion></text:changed-region>
+<text:changed-region text:id="ct2"><text:deletion><office:change-info><dc:creator>exav</dc:creator><dc:date>2000-01-01T00:00:00</dc:date></office:change-info><text:p text:style-name="Text_20_body">some deleted words </text:p></text:deletion></text:changed-region>
+</text:tracked-changes>
+<text:p text:style-name="Title">Harbour handbook</text:p><text:p text:style-name="Subtitle">The east quay: rules, figures and notes</text:p><text:p text:style-name="Author">exav project, written for the demo (CC0-1.0)</text:p><text:p text:style-name="Author">1 January 2000</text:p><text:table-of-content text:style-name="Sect1" text:protected="true" text:name="Table of Contents1"><text:table-of-content-source text:outline-level="2"><text:index-title-template text:style-name="Contents_20_Heading">Contents</text:index-title-template></text:table-of-content-source><text:index-body><text:index-title text:style-name="Sect1" text:name="Table of Contents1_Head"><text:p text:style-name="Contents_20_Heading">Contents</text:p></text:index-title><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#intro" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">1. Introduction</text:a></text:p><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#text" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">2. Text and styles</text:a></text:p><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#lists" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">3. Lists</text:a></text:p><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#tables" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">4. Tables</text:a></text:p><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#pictures" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">5. Pictures and shapes</text:a></text:p><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#links" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">6. Links, fields and notes</text:a></text:p><text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#wide" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">7. Wide table (landscape)</text:a></text:p></text:index-body></text:table-of-content><text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark text:name="intro"/>Introduction</text:h><text:p text:style-name="Text_20_body">The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell.</text:p><text:p text:style-name="Text_20_body">Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master. <text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">The register of 2000 lists sixty berths.</text:p></text:note-body></text:note></text:p><text:p text:style-name="Quotations">“A harbour is a promise that the sea will wait.” </text:p><text:p text:style-name="Text_20_body">Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay.</text:p><text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark text:name="text"/>Text and styles</text:h><text:h text:style-name="Heading_20_2" text:outline-level="2">Character formatting</text:h><text:p text:style-name="Text_20_body"><text:span text:style-name="Strong">Bold</text:span>, <text:span text:style-name="Emphasis">italic</text:span>, <text:span text:style-name="Underline">underlined</text:span>, <text:span text:style-name="Strike">struck through</text:span>, <text:span text:style-name="Red">red</text:span>, <text:span text:style-name="Highlight">highlighted</text:span>, <text:span text:style-name="SmallCaps">small capitals</text:span>, <text:span text:style-name="Big">large</text:span> and <text:span text:style-name="Mono">monospaced</text:span> text; H<text:span text:style-name="Sub">2</text:span>O and 10<text:span text:style-name="Super">3</text:span>; a <text:span text:style-name="Emphasis">mixed</text:span> style.</text:p><text:h text:style-name="Heading_20_2" text:outline-level="2">Paragraph formatting</text:h><text:p text:style-name="Justified">The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master.</text:p><text:p text:style-name="Centered">A centred line</text:p><text:p text:style-name="Right">A line aligned to the right</text:p><text:p text:style-name="Indented">An indented paragraph with a left border: Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay.</text:p><text:p text:style-name="Code">moor --boat Aurora --length 6.5</text:p><text:p text:style-name="Code">berth 14 free until 06:00</text:p><text:h text:style-name="Heading_20_2" text:outline-level="2">A section in two columns</text:h><text:section text:style-name="Sect2" text:name="Columns"><text:p text:style-name="Text_20_body">The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master. Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay. The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell.</text:p></text:section><text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark text:name="lists"/>Lists</text:h><text:list text:style-name="L1"><text:list-item><text:p text:style-name="List_20_Contents">Water at every berth</text:p></text:list-item><text:list-item><text:list text:style-name="L1"><text:list-item><text:p text:style-name="List_20_Contents">cold, from the quay</text:p></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">hot, in the shower block</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">Electricity</text:p></text:list-item><text:list-item><text:list text:style-name="L1"><text:list-item><text:p text:style-name="List_20_Contents">16 A at berths 1 to 40</text:p></text:list-item><text:list-item><text:list text:style-name="L1"><text:list-item><text:p text:style-name="List_20_Contents">with a meter</text:p></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">without a meter</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">32 A at the east pontoon</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">Wi-Fi on the quay</text:p></text:list-item></text:list><text:p text:style-name="Text_20_body">Numbered, with other numbering styles at each level:</text:p><text:list text:style-name="L2"><text:list-item><text:p text:style-name="List_20_Contents">Call the office on channel 9</text:p></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">Give the length and the draught</text:p></text:list-item><text:list-item><text:list text:style-name="L2"><text:list-item><text:p text:style-name="List_20_Contents">length over all, in metres</text:p></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">draught, in metres</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">Take the berth you are given</text:p></text:list-item><text:list-item><text:list text:style-name="L2"><text:list-item><text:p text:style-name="List_20_Contents">tie up bow first</text:p></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">tie up stern first</text:p></text:list-item></text:list></text:list-item><text:list-item><text:p text:style-name="List_20_Contents">Pay at the office</text:p></text:list-item></text:list><text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark text:name="tables"/>Tables</text:h><text:p text:style-name="Caption">Table <text:sequence text:ref-name="refTable0" text:name="Table" text:formula="ooow:Table+1" style:num-format="1">1</text:sequence>: berths by length, with merged cells and a repeated header row</text:p><table:table table:name="Table1" table:style-name="Tbl1"><table:table-column table:style-name="TcolA"/><table:table-column table:style-name="TcolB"/><table:table-column table:style-name="TcolC"/><table:table-column table:style-name="TcolD"/><table:table-header-rows><table:table-row><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Length</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berths</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Let by</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Fee (EUR)</text:p></table:table-cell></table:table-row></table:table-header-rows><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">up to 6 m</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="12"><text:p text:style-name="Table_20_Right">12</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">week</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="18.0"><text:p text:style-name="Table_20_Right">18.00</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">6 to 8 m</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="18"><text:p text:style-name="Table_20_Right">18</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">season</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="24.5"><text:p text:style-name="Table_20_Right">24.50</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">8 to 10 m</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="14"><text:p text:style-name="Table_20_Right">14</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">season</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="31.0"><text:p text:style-name="Table_20_Right">31.00</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">10 to 12 m</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">year</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="42.0"><text:p text:style-name="Table_20_Right">42.00</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">over 12 m</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">year</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="58.5"><text:p text:style-name="Table_20_Right">58.50</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="TcTotal" office:value-type="string"><text:p text:style-name="Table_20_Contents"><text:span text:style-name="Strong">Total</text:span></text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="60"><text:p text:style-name="Table_20_Right">60</text:p></table:table-cell><table:table-cell table:style-name="TcTotal" office:value-type="string" table:number-columns-spanned="2"><text:p text:style-name="Table_20_Contents"></text:p></table:table-cell><table:covered-table-cell/></table:table-row></table:table><text:p text:style-name="Text_20_body"></text:p><table:table table:name="Table2" table:style-name="Tbl1"><table:table-column table:style-name="TcolA"/><table:table-column table:style-name="TcolB"/><table:table-column table:style-name="TcolC"/><table:table-row><table:table-cell table:style-name="Th" office:value-type="string" table:number-columns-spanned="2"><text:p text:style-name="Table_20_Heading">Merged across two columns</text:p></table:table-cell><table:covered-table-cell/><table:table-cell table:style-name="Tc" office:value-type="string" table:number-rows-spanned="2"><text:p text:style-name="Table_20_Contents">Merged down two rows</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">a</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">b</text:p></table:table-cell><table:covered-table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">c</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">d</text:p></table:table-cell><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">e</text:p></table:table-cell></table:table-row></table:table><text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark text:name="pictures"/>Pictures and shapes</text:h><text:p text:style-name="Text_20_body"><draw:frame draw:style-name="fr1" draw:name="Picture 1" text:anchor-type="paragraph" svg:width="8cm" svg:height="4.5cm"><draw:image><office:binary-data>iVBORw0KGgoAAAANSUhEUgAAAoAAAAFoCAIAAABIUN0GAAAUj0lEQVR42u3dd5wU5f0H8FnuDjiUoiCggIooYKGJBUHBGoxCCETBgiUKGhsgQQ3RmPxiTHsZEyNiB2yxRelojIgKiUIUKaJBpBg9pB16KAoi3O+PhfPou8fu7O7N+/26P7hjbnbmu/M8H77z7C6xA1sOCACAcFVRAgAQwAAggAGA9MgPYooAADpgABDAAIAABoBKwhowAOiAASAqHbAWGADCD2DxCwCZ6IAlMACEzhowAAhgABDAAECaWAMGgEwEsPwFgPC5BQ0AAhgAoiE/iLkJDQA6YACIQges/wUAHTAARKMD9j5gANABA4AABgDSw4uwACATAWwNGADC5xY0AAhgAIiG/Jh70AAQfgDLXwAIn1vQACCAASAavA8YADIRwNaAASB8bkEDgAAGgGiwBgwAmQhga8AAED63oAEgEx2wBhgAdMAAEI0OOIjpgQFABwwAUeiA9b8AoAMGgGh0wN4HDAAZCGD5CwDhcwsaAAQwAERDvrcBA4AOGAAEMAAggAGg0rAGDAA6YAAQwABAmvgkLADIRAD7/4ABQAcMAJFgDRgABDAARIP3AQOADhgABDAAkCZeBQ0AmQjgQAIDQOjcggaATHTAGmAA0AEDQDQ6YGvAAJCBAJa/ABA+t6ABQAcMABEJYGvAABA+t6ABIBMdsAYYAHTAABCRDlgLDAA6YACIRAcceBk0AIQfwOIXADLRAUtgANABA0AUeBEWAAhgAIgG7wMGAB0wAESlA1YDANABA0AkOmDvAwaADASw/AWA8LkFDQA6YACISABbAwYAHTAARII1YAAQwAAQDT4LGgB0wAAQlQ5YDQBABwwA0eiAtcAAoAMGgGh0wGoAADpgAIhGB6wFBgAdMAAIYAAgLbwICwAyEcD+P2AA0AEDQCRYAwYAHTAARCSArQEDgA4YACLBGjAA6IABICIBbA0YAHTAABAJ1oABQAcMABEJYGvAAKADBoBIsAYMADpgAIhIAFsDBgAdMABEgjVgANABA0BEAtgaMADogAEgEqwBA4AOGAAiEsDWgAFABwwAkWANGAB0wAAQkQC2BgwAOmAAiARrwACgAwaAiASwNWAA0AEDQCRYAwYAHTAARCSArQEDgA4YAAQwAJAeXoQFABnpgLXAAKADBoBodMBqAAA6YACIRgesBQYAHTAARKMDDkpVAQB0wAAQhQ7YGjAAZCCA1QAAQucWNADogAEgIgHs/wMGAB0wAESCNWAA0AEDQFQCWAIDQOjcggaAjHTAagAAOmAAiEYHrAUGgPADWAkAEjHy0X673ebHFz+kUCTcAasBwM6NSCB3tw/pyyQxAhigAh5OJnd3FtuXi2F2EcA+Cxpg2/R9pF9q9hOP4UvEMDpggF16KEXRu02c95PBbMfbkADSmL5le07fztEBA+SwB9MfkA890q+/VpjvAjhWqgpATpg8d9ZprdqmY88PjOofWsxfcemDnkoCt6CBXIneyXNnxf+Qu+mbkYcja8WuOHewKgBZ6+WdJO7pKWqF789QHF6pD9YBKwGQtdH78s773ZdT0Qrfrxklc3wWNJB1/jknoXCNZ/AZrdvm4jneP6r/T36sCdYBkzUTCkR8mMS/whlc943McPub8QMg0x2wGqTfS3NmxaeJ7+XmP9UhnDGyh//ATWp83Zsd4WcGjrLYVb29CCuN/rGjaaWrGIZdjpEKS3xwDc+a7vNqN6Ij2wH7B1gaZ5bZs3Y243RtI4MxQGalfp9zZgVBsNvxNXxENt37NQlHNoA99enw4u5mlvjUc6YYxgBJT7Tn0OAyCUdW7Jo+bkGn2AvJTC7fl8EYHWmzs/E1bER2vfrp2svchc7wZZmRqdiroDM8v4Q8H1XWeZacuCTCvyp2+IjZlr7GbzZclhk5Ze8DTplJs2btybV+Vtu2lawOu76gK835kr6hkcIsyfLrLePz8PbPUSWblxI85ZDPN3bteW5BZ8sUUwmu9VRNteLZuEi5sovq7oezsQO+7vIHs/mpqXwdQjacqRdhpcDEFM0yk2bNOjtnr/KJKZ1qdz1IzhbP5cqendWYmE3RW/6iytqLJ5bdz0iWVy+FFQhzHo4N0AHvgQnpmWW65dRVPiHLptpuEYjnRGqekTpMyL7c3d7Ct+/JwqMamOoOOH3PRc4NsQqUIpxzjA04/3o5WsEn9Z3ZaUyRdm0iXoGI1DD8mqepLFl+MWR/DA/s90DOPQXZP8T2pCYhnF1soABO3viwLvTuWXx9j8+dCbd77idxCNWucJXG51r0ZmcGD0o+gLOk8lk4vlJVmXSfWsYCePw7s3N0Wgz5oq/EF7eZIidKvYui5e6VkIUxnEgAZ3PBs2RwpbxEaT2v2KBMBPC4cjX6QU7NieMyMQCyp0TjKsWEmxOXXOUotQxO3PU7CuBcvAwyNb7SV6v0nVHs+gvCDuCxM3dcph5HZ/W0uLPDDk1m65Px0698JY1OncVwIgb3f6AyXQBhDq4Qipam0wk1gBMpU3bGcJaMikwVp9KnQsavOrkb2Qxu1v4agysnBk46TiQ2OKwAHpNkpX6YNUk8Jpsmx5DLMiZiwRD+VTdG9EYshit94oYwsjI1alI+P8R+GkoAj65ovXpmNIZHZ+vkGEJZRkc7GNJd4dFyNzIZHM3ETdOwyvjASe3MEPvphWkP4NFvp6BkPduHncQpOew0XgdpK0iWn3hO11ltoxDDEjcdwyp7xk4K54TYkHQG8POpLlmvUGL4+dyZJVNekOclRHpKrbCVOIMlblrHVBaOnVRNvGkM4LRWLX1JnHMTZapKISHSUW1VrZQxLHFDGFNZPnZSMvHGbkhPAD8XSu1+lOoYfi43p8s9rMNzQiLVNVdSqPCYypXhs+cBFLuxb+oD+O9vhV2+c45pk3PHnA1FqARnnW1lV1KI7PCvQAAPSmn0zsloLVrn4mFnqgKV5qwBci53giCI3ZS6AH42ayb0c5OpyLOVK4cSOfdnRS9AJhJnqwD+WYoC+Jnsm9N7764oz1TeHNrZuT8jegFCj5udBPBFKQjgZ/6T1dN672Nb59wxp/ysK/35AmRb0OwmgIfuWQA/nTvTep8t1Xk6SlEUP+unpS9AWCmTaAD/fA8C+CnTOgBscV4yGVxF+gJASiSVjFVisaACX9IXAHaYwQkmadId8JMz5jw5Q/oCwE6DMrEOOAgS/xK9AJBIBu82UpMI4L9JXwBIzN92l8FVglhpIl9PSF8ASMYTM+bsIljzY7v7/cenz1VEAKhIBk+f2/f4Vjv8q93cgpa+ALAnHp8+dye3oHfuMekLAHtsh3m60/cBS18ASGEGb5OzO1gDfuRN0QsAKfbom3Mv6fDdenAV6QsA4Sgfslu9CEv6AkC6M3jLB3FsuRk9SvoCQPqNenNuLBbkB0Ew8g3RCwDhGfnG3FjjDn0VAgBCVkUJAEAAA4AABgAEMAAIYABAAAOAAAYABDAACGAAQAADgAAGAAEMAAhgABDAAIAABgABDAAIYAAQwACAAAYAAQwAAhgAEMAAIIABAAEMAAIYABDAACCAAQABDAACGAAEMAAggAFAAAMAAhgABDAAIIABQAADAAIYAAQwAAhgAEAAA4AABgAEMAAIYABAAAOAAAYABDAACGAAEMAAgAAGAAEMAAhgABDAAIAABgABDAAIYAAQwAAggAEAAQwAAhgAEMAAIIABAAEMAAIYABDAACCAAUAAAwACGAAEMAAggAFAAAMAAhgABDAAIIABQAADgAAGAAQwAAhgAEAAA4AABgAEMAAIYABAAAOAAAYAAQwACGAAEMAAgAAGAAEMAAhgABDAAIAABgABDAAIYAAQwAAggAEAAQwAAhgAEMAAIIABAAEMAAIYABDAACCAAUAAAwBplFercWtVSIn5428+olnDia+/l9rdPn3HpXVqFs58/xMVBtABE56qBXlV8/MS3Hj4LefOH3+zogFkv3wlyHK9Bj1cWqoMABEO4MLqBVf3ObFb5yPr71tzWfGa516eff8z/9q4qfTOG3qe2allz0EPz1+yIr7lX3/W66T2zbpf++Anyz8PguDA/fcZfPEpxxzRZO+9qn20dPWosTNGT54TBMHouy6vW3uvLj/+a/mAueumXh3bNu140V82fLsxrY8eBMH88TdPnv7B/CUr+pzZrrBawSszFvzi7kkd2za94dJTG+5X64MlK341/IV5C5eV3/iJCW8N6Nul+UH7bdiwcdo7i+8YNXnpyjVJlWubzXa72/+Ou3ny9A+u/s2zm3dbreCqPid263JkvTp7Fa0oGTdl7ogx09d/8218V2X7DIKgRffby/Zf9uvxLvm045uX/9tpMxddf9HJI8dOH/7UtMSPHIAwArggP2/kbRc2rl97+NPTFhcVt23R6Cd9TmxYt9at90z69X0vHt/6oP+75qzzbxxVWhp0bt+sa6fDb71nUjz/9qlV4/HfXbTmy3W/vv8fa79a37f7sb8f1H3lZ19Om7lo7CvvDu13etuWjd/ZssBZrWp+l2MOHffqu9ukbzoePb7now7dv7BawU1/Ht+h9cH9enWoXjX/sIPq3/nolOpV82+5out9t/Y++bJhGzduim/cpEGdO2/sOXLM9L889mqzJvUG9T356CMa9xjwUMkXXyderu1rm/huqxbkjbztgpaHNBj25NR5H37armXja84/qWXTBgP/8HwQBH2GjBpy6anHHnVgnyGjEr8CDm1Sr03zA4Y9NfXVGQuSPXIA0h7Al/zg2NaH7d9j4EMLPloZBMEbs5ds2LhpyCWnjhjz5pKi1b8a/sKwn5/Tu2u7sa/MvfUnZ059e+HTL74T/8WzTjqiQd2a19z+97kLlgZB8P7i5W88fv0ZJ7SYNnPRhNfn3XjZaWd2alkWwCcd3aywesHYKXNDePT4Bvvtu3fPgQ8Xl6yd+vbC049vfnqHFrfcPfHFae8HQXBok/36n3PCUYfuP3t+UXzj5gfXv/SWJ96YvSR+DKs+X3vXTb2uPLfjH0dMTuqAt9k4id32OK7d4Y2v/s2zk6d/EN84iAUDL+zSZkyj2fOLZs0vWrN2XRAEs7YccCKa7L/POYNHzvvw0wocOQAVluiLsLp1OWrOgk8XfVKcl1cl/jVlxoJYLOjQ6uAgCP75xvwJr88bcsmpQ/ufUXvv6j//68SyX5zynwV9howqm98/W/NVvDENgmDVZ1/++51FXTsdHott3rhrx5ZFK0pmvv9xCI8et+CjlcUla+N//njZZ5tTLQiCIIj30PuW23hJ0eqyvw2C4KV//Xfl6i9PO655suXaRhK77Xzk0hUl8fSNe+qFmX8cMfnbrW8YJGXBRyvL6pPskQOQ9g64aeO61avmvzdm6DY/37f25ny67b5/TBx+5XlnHn3DnWNXrP6ibIOlK0oa1K15+8BuRzVrWG+fvatXyw+CID9vc/CPffXdO37ao3XzRrPnFxXk551y3GGPTfjP9q85StOjB0Gw6vO1ZX+O3/cu3vKT+LdVqsTKNvjfss/KP/qm0tLFS1e3bdGoAuUqL4ndNqq7zfuRVpd89fDoN5N6ymOxWPlvl64sqfCRA5D2AK4Si7393se/feif2/x82arNaVejsGphtYIgCBrWrVV+gx+d3ub2Ad1ee+vDPz/+WrzFnDDsirK/ffmN+V+t++bMTofPnl90QpuDa+5VbdyUd0N79CAI1q3fUPbneO5/veUnpaWl28RV6fb/NCgtLVshTuqAt95HwrutEsvLS/qdY7Gtv61Zo9pWeb/1q6uSOnIA0h7An64sqVG96rsLvrtXeXCjfbt3OWrcq++u+iyIxYLfDuj2yfLPp85cdN0FnSdP/2Dhx6vim117/kkLP1l11W3PbCotDYJgr8Kq5Xf79foNL/17ftdOLf8w4uWunVq+u+DTxUXFoT16sho3qLN1KxkcdMC+i5cmfcB7sNs1TRputXGdmoXtWjZ+b9Gy5cU7DsiNm0prbH3WhzSpW+EnGoBUSbSdeu2tD1s2bXBok3plP7m0x/FX9e4UX1W94KxjOrQ++Jf3TLr7ideWF3/xu4Hd8rbcua1Tq3D152s3bWnyTmjTdJu2cuyUuY3q127botFpxzff/uVX6X70pDRrUu+4VgeVffv9E49oULfmC1PfT/aAK7zbae8s2r9erS7HHFr2k/7ndLz3F73LbqrHm+n8/O+e1hWrv2h+UP2CLR/lceLRh9StvVeFn2gAUiXRj6J8f9Hybl2O7HVGm7Vfr6+9d+FF3Y698Oxj/vzYq/+etfjA/fcZNvSc5yfPefKFmd9u3LSoqPiKczp+te6b+Gplq8MOOPHoQ9Z/820sFuvcvtmV53bcu7BayRfrnn95dnzPRctLzv1e23aHN27ScJ+hd034utw94XQ/+nUXdF5cVFz24ZFndz7ykMZ1hz05Nf7t4Yc0OL1Di0lT31v0SXF842Wr1vzw1FabNpbWqF5wducjh/Y7Y96Hn/5y+Avx28VX9zlx48ZN/5q1uOTLdbs44G1Obbe7LX+Q85es6HFKq7NOOmLd+g01Cqv27tqu3486PDpuxqQtad2xbdMjmzXcsGFjXl6VouUlQRDUqVWjc/tmLZrW/3zN1+2PaHLLFV2LVpTUq7NX/DS3qcCuS220AKRQoregV32+ts+QUYMvPmXwxadUq5q/8H+rbvjTmPGvzasSi/1+UPev1n9zxyOvbO7SZi6aNPW9ARd2mTx9weKi4lvunvjFV+sv79mh8LyCRUXFfxo1ZWj/M/apVVi2502lpeNfm9evV4fX315Y9oLk0B49KfMWLntzzkd9z25/QP3aK1d/+ci4GcOfmhb/EIwgCEa/MucHJ7e69xe9z776/p0dcAV2W96yVWt6Dxk5+OJTrrugc0FB3kdLV//63hfL3nMVBMEj42a0bdHo2vM7r/tmQ/s+dwRBcPcTr5VuKu15eut7bjl30SfFtz/wUo9TW7U4uH6yT7ShApBascYd+qpCIrb/SKls3i0AWc5/xgAAAhgABDAAkCbWgAFABwwAAhgAEMAAIIABAAEMAAIYABDAAJB9/h/jQKerSTk5XAAAAABJRU5ErkJggg==</office:binary-data></draw:image><svg:title>A lake at dusk</svg:title><svg:desc>A made-up picture of a lake and a hill at dusk.</svg:desc></draw:frame>The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master. Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay. The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. </text:p><text:p text:style-name="Caption">Figure <text:sequence text:ref-name="refFigure0" text:name="Figure" text:formula="ooow:Figure+1" style:num-format="1">1</text:sequence>: a picture that text flows around</text:p><text:p text:style-name="Centered"><draw:frame draw:style-name="fr2" draw:name="Picture 2" text:anchor-type="as-char" svg:width="6cm" svg:height="3.375cm"><draw:image><office:binary-data>iVBORw0KGgoAAAANSUhEUgAAAeAAAAEOCAIAAADe+FMwAAARDUlEQVR42u3de1zUZb7A8We4KZhCgKACKqBEEiAqZsVC0rZaqFQaqKBYaamZlmvbafOcfW3mXm3dzpq+SgXMOqmlkVrqmrcVV/HGxdS4iKByURCDvKQIc/741exwG2ZgLs8Mn/eLPwQG/P2emfnw9WFmVPUPni8AAPKxYwkAgEADAAzgIFQsAgAwQQMACDQAWDu2OABA2kBTaACQM9DkGQBknaApNABIiV8SAgCBBgAYgi0OAJA10PQZAOTEFgcAyDpBCxUzNAAwQQMA9J+gmZ8BQNJA8ygOAJATWxwAIOsEzQANAJIGmi0OAJATWxwAIOsEzQANAJIGmieqAICc2OIAAFknaOZnAJA00DyKAwDkxBYHAMg6QTNAA4CkgWaLAwDkxBYHAMg6QTNAA4CkgeaJKgAgJ7Y4AEDWCZr5GQAkDTSP4gAAJmgAgAHYgwYAaSdoRmgAYIIGABBoALB6bHEAABM0AMCwCZo1AAA5A81rcQAAEzQAwADsQQOAtBM0IzQAMEEDAAyZoFkDAJAz0LzcKADIiS0OAJB1gmaABgBJA80WBwAwQQMADMAeNABIO0EzQgOApIFmDQBASmxxAIC0EzQjNAAwQQMADJmgeSA0AMgZaPoMANJO0AAAGbEHDQDSTtCM0ADABA0AMGSCZg0AQM5A8ygOAGCCBgAQaACwgUCzxQEATNAAAAPwMDsAkHaCZoQGAEkDzRoAgJTY4gAAaSdoRmgAYIIGABgyQbMGACBpoCk0AEiJLQ4AkHaCZg0AQM5A81ocAMAEDQAg0ABgA4FmiwMAmKABAAQaAGwg0GxxAAATNACAQAOADQSaLQ4AYIIGABiAF0sCAGknaEZoAJA00KwBAEiJLQ4AkHaCZoQGAEkDzRoAAIEGABgQaJ6oAgBM0AAAAg0ANhBotjgAgAkaAECgAcAGAs0WBwAwQQMACDQA2EKgKTQASIlXswMAaSdo1gAAJA00hQYAKbHFAQDSTtCsAQBIGmgKDQBM0AAAAwIthJpVAAApJ2hGaACQNNCsAQAQaACAAYHm5UYBgAkaAECgAcAWAk2hAUBKvBYHAEg7QbMGACBpoCk0ADBBAzCn1I9m6r7A89PXsEpSB5olALpgmptdjFLLOkEzQgM2ZO26mR34KqXUL6SQadkCzRoANmFNh9LcLO4zaTSBBmBcqztdZ03lZ9FoiQKt4vWgAev2Yfos47b+xRmrWVUZ8EQVgDqb43uiI4FWCcGbGd72nMphEXgz+pvpSvph+iyW1+JvPIrDHHbn5QghvjmVI4R4PGwoCwKr8EH6rNnPsddhSfyS0OT+mZfTMta/ItMmW+2us7ar0ky+EUEfLEs1J2Ehq2Aiu5qmuaUxZNpkq90V1nZlmjl2iucyRFtwguZHpKl6kZujf1PGhFNqIy/1rrwc217Vlanm+j0eibDgBD03kQna+HbqUeeWxpJpEyy1ra7q+6nme6DFy88zRFtoguano9Ht6FCdNa15gkwbdZ135uawpMzQVhto1t54vs7J6fw3Ubrz5FCaYrR1tr0l/cdasz5OmUowQVu9r4xR52YNirNoU77KyYmTLGqdWeSv5TsdJmi0s/KvTGYPWro6N2O2rOg4CxnSZqxFtoFM/+9acz/Tb/4Lq812LfNzVGuC5rU4Om17dq4ZwjQuItyCR266YzD/Clv2XKx1lGsaCpPe5jU/ibmOrG+LY1t2rhBivBzX3DYTp7nVu0Rnzr2TB2yUY5Bkhbdn546n0foH2mpv89a97K9Oec2KDndr0xvHBItebVvNeEttSc9zN/VBmu4qMNvyTrD0nX9rdq6hx7B8zYtmPsjA4S/LUIAJXazUqtemyh7oL0+2f0eNHxYu4VGZQcsTt9SBGfcqMPNZmP/209Y56nkkf1ttvkBLkmYZrjILBHqh3IHOMOSO+pS5rrMMOeosoc5fBRZcWzPcfvQ/O90H867pAy1nly14ryfQxrmLmvQKI82muxYkWVtT3H46c2qtHo9JA20tae4KpVb9OkmuQH9xwmj30qeHh0t7bF2HPteCbAtrrFuOcc+r2VEt+9DIjbbSLpvhjm/JQC+SINBbTHn/fMZI19YW6myaK0Lahe3YLccMp6Mc2F+NF2ibSbOJ7vuWDPTrlg70ZrPcPyd27qraTJ1NcEXIv6r632wsci7nTrxPl81w97dkoH+TbIFAf37cMvfMSSPCreVQIQ8dNxtJbh6GlrrrpLnzBbBwoN9IftXMf+Vnx/MsftrPjgizlkOFDLRvMDLfKnSXust2ufMpsFig/8ssgd4k5W06Qed1s4k6w2o1KzVpNlYWzB7oaSYP9KZjUpcuITLM6o4ZgGUTYaZAv2myQG+0tsYlRoZZ42EDsEgrzBHo35og0BtoHICuZLJpkm3M/1Hl06N0GUBXpJlKp4w0ZqmN83Kj/0eaAeDnOXWqkTLdqUB/QpcBoO2ZNalzpe7g/6jycdYprgMA0HOKTX4wtCOBpssAYGqaeBpUan23ONaTZgAwUqmn6Zfpdh7F8dERugwARqYZeaePCu3IBL2ONAOAiWmG4JTWSt080Ol0GQDMTjMTz9Aq9X+2ONIOk2YAsDBlSn7uoVAhhMp3VDIrAgASsmMJAIBAAwAINAAQaAAAgQYAAg0AINAAAAINAAQaAECgAYBAAwAINACAQAMAgQYAEGgAINAAAAINAAQaAECgAQAEGgAINACAQAMAgQYAEGgAAIEGAAINACDQAECgAQAEGgAINACAQAMACDQAEGgAAIEGAAINACDQAAACDQAEGgBAoAGAQAMACDQAEGgAAIEGABBoACDQAAACDQAEGgBAoAEABBoACDQAgEADAIEGABBoAACBBgACDQAg0ABAoAEABBoACDQAgEADAAg0ABBoAACBBgACDQAg0AAAAg0ABBoAQKABgEADAAg0ABBoAACBBgDowcGgSwf7e8+dHBUe1M/DrUf5ldqMvac+3Pzvu3cbJTyxlYuffezBoPvGLzX0Czcum7H7cP6azYe5cQCwmgk6ZsSgLcufd7C3+/2qnbPf3rTvWOG8qdFL5sXZ2Io4Odo7Odjr/2Mgf9tb3IwAWHiCfn1GbGnFtXlLP29Uq4UQmdnFP96+OzvhkY07Tubkl9nMijzz6lq1mhsGAKsKdP++9+YWlDdq1euLvXnB/t7eHj2Vd527O85NjBoXHeLl3rPyat3mb3I/2HSoofGnyzt3c5yTGDUuJsTTrUfZldqt+06lZmTdvnNX+Wx3J4eZEx+Kiw7x9Xa7U3/3bPHldVuP7j6cr3w2f9tbe7IKPt+d+3JiVKCf57W6mxl7T63YcLChoVH7r46LDvF063Hp8vef7jjZ1lko3+qT7cfnJ8cEDehdX9+QmX1+Wfqe8qo65QLfbX1rT1bB3Hc+a/ewNbOz8gdlO0X5/povF003W5TPZp4sfm3ao2lfZq3ckNnuugEg0O0rulA1LNj3ofCBh3NLlI+UlNW89PZG5c+ODvZpS5J8vVxXbsw8X3Z16H0+sxOj+nj0+p/3v1b2DdKWTA0O8F7x6cHTRRURwb4vT/lFsL/3gj9vEUI4ONilLpkaHuSTlpF1MPtcj+5OCWMjVvx20l/T9qzZckT5/v16uy6Z9+R7Hx+4WHltwujQuZOjhBDvfXJAifv6PyQHDfBatTEzr6D8/gDvBUkxN27dbutE/Lzd/vabp9Mysv6+fn+gn+eryY8OG+IbP39N7Q+3Wm536DjsxEXpi2bERj7QP3FRuv7LOMjPMzyo34oNB/cfLWx33QAQaL0sXb177e+npL+TdOzbCwdOFB04fq6g5IrmsykTIsMG941fsKawtEoIcTi3pL6hcVFKbGrGkZKympT4kRH3+85957M9WQXKZ4VKLEiKCc/wyc0vmz4+cvgQvyUf7Pp4+3Hlu+07Vpj69tSFKbG7D+eXVlwTQtwf4D1nyaa9RwuFEFl5paPCBj4VG6oEOiV+ZOjgfgv+vGVn5lkhxKGc898WVa5bmtTWiQQN9Jqx+BPlx8zh3JLq72+898YzLz378F9S9zS7pO7Dzskvq7vxoxDCoB0ev773TlqYdrqoQp914wYKdGUG/JLwxJmLY2avSsvI6uPZa1FK7LZ/zPrs3edCB/dTPjsu5oG8woriS1ft7e2Ut31HC1UqMSp0oBBiXHRI+ZVaJXOKDTtO/iV1z927DUKICY+G1tTe1N6XUKvFqo2Z9naqcTEPKB+pqb2571ih8udGtbroQpW3Zy/l3SeihlRW1+06dFbz5UfySoovXW3rRErKajT/CBBC/PPQd1U11x8bGdTykroPu2MKS6s0dW533QAwQevr8tUf/rT2mz+t/WZw/97xo0OnT4hc/8fkia+lnrtY7e/r0d3J4UzGm82+xN3VRQjh7+Nx8uwl7Y/X1N5c+8VP2xcBvh55BeWaDWVFfmmVECLAz+OnDZaL1dq/u6u/22Bvp1L+PNDHPS+/vNlv9i5WXgvw9Wj1LC5UXtN+t1GtPl9eM/Q+n5aX1H3YelKpVNrvllfVNvkrdK4bAAJt+Bh4oWrZur35JZeXLXpq8tiIpat326lUJ85c/MOa3c0uWVn9gxDCzk5lb2/Yk2LUarUySiuu32xzT9nB3q5pA4UQopuTg+7v3OxDzX48/PTvC8MPWwjR7Fh6unRr8vOg6W//dK8bALY42pc4NmLL8udDAvtof1DZEe7t3lMIUVFV69Ld6dvCCs3b9Zu3R0cO7uHsJISoqKrz6+Om/bVuPZ1HRw5WHgFSfOlqoJ+ng0OTgwn29xZCnP95p0Ld9mPfyqvqBvq4N2t0/z73tnV5X2+3phOuGNDP/Xx5K1siug+7VQ2NahdnJ+2PaP4R0Crd6waAQLevoLQqZFDf+Ukx2sOq0mvlV4UHjhcF+3sP8vPUfHZG/INzEh65VndTCJGZXdzXs1fMiEGaz86a9PCq/05wsLcTQmzdf8rd1WXy2GHa0ZyT8EhDo3r7gW/bPbZ9Rwu83HvGam0ij44c3M/Lta3LB/p5jgwdoHn3iagh3h49dxw82/KSug9b82ND+0fLlZofggZ4Of78VJeoYQEerj10HLzudQPQldn38g3T53KV1XWe994zPiYkMqT/7fq77m4uYx4OXvzSmMrqusUrvrpT33C2+PK4mJBnHg+/ceu26z3O08ZFJsWNWL5+/79zzgsh8kuuxI8OffIXQ368Xe/i7JQwJmLmxFEfbT369cGzQohTRRWjwgZOenyoc3fHRrU6qL/XGy/8Mnp44Lvpe/cdKxJCvDI1+nzZ1a/+dUZzPHHRIQG+His+PSiEOHOucnzMA09E3X/91p17nLvFRQ/5dUrsxcprHm49lAtoe2VqdGV13VOxoY0NapfujnHRIW/OfPx0UcXvVu5Qdjm0/y7dhy2EeHiof0hgn/r6Bnt7u7LLtUIIt14u0cMD7/P3+r7u1vAhfotfHFN2pdbz5yNpeSK61w1AV6byHZWs/6UfezBo+oTIQF/Pe3p0u3T5+12Hvkv94siNW3eUz/b17LVw+ujoEYHdnBzOXahO/zJr24HTmq/16+O2cProqIgAR0f70vKaDTtObtyZrXnai3M3x5kTH4qLHuLr7abkPv3LrGZPVGnr2R9CCB8v19efe+yRCH8He7uC0qq/r98/bXxkq6/FoXyrI3mlyXHD+3m5VtVc3/6v0ys3ZN66Xd/q36X7sAcP6L389af9fTx+vFM/PHGZEMLeTjVvSvTTvwxz6+lcfOnqB5sOxceGNnuiivaJtLtuAAh0V9FqIgFAQrzcKAAQaAAAgQYAG9Dl9qABgAkaAECgAYBAAwAINAAQaAAAgQYAEGgAsHr/D8Hg2xT5E4m1AAAAAElFTkSuQmCC</office:binary-data></draw:image><svg:title>The second picture</svg:title></draw:frame></text:p><text:p text:style-name="Text_20_body"><draw:custom-shape draw:style-name="gr1" draw:name="Callout" text:anchor-type="paragraph" svg:width="6cm" svg:height="2cm" svg:x="2cm" svg:y="0.2cm"><text:p text:style-name="Centered">A shape with text in it</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="round-rectangle" draw:enhanced-path="M 3600 0 X 0 3600 L 0 18000 Y 3600 21600 L 18000 21600 X 21600 18000 L 21600 3600 Y 18000 0 Z N"/></draw:custom-shape>A line of text beside a shape.</text:p><text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark text:name="links"/>Links, fields and notes</text:h><text:p text:style-name="Text_20_body">An external link: <text:a xlink:type="simple" xlink:href="https://exav.org/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">exav.org</text:a>. An internal link: <text:a xlink:type="simple" xlink:href="#intro" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">back to the introduction</text:a>. A reference to a bookmark: <text:bookmark-ref text:reference-format="text" text:ref-name="tables">Tables</text:bookmark-ref>.</text:p><text:p text:style-name="Text_20_body">Fields: this document is titled “<text:title>Harbour handbook</text:title>”, and this line is on page <text:page-number text:select-page="current">1</text:page-number>. A fixed date: <text:date style:data-style-name="N10" text:date-value="2000-01-01" text:fixed="true">01/01/2000</text:date>.</text:p><text:p text:style-name="Text_20_body">A comment is attached to this word<office:annotation><dc:creator>exav</dc:creator><dc:date>2000-01-01T00:00:00</dc:date><text:p>A comment: the viewer shows or ignores it.</text:p></office:annotation>. A change that was tracked: <text:change-start text:change-id="ct1"/>this text was inserted<text:change-end text:change-id="ct1"/>, <text:change text:change-id="ct2"/>and some text was deleted before this one.</text:p><text:p text:style-name="Text_20_body">Citations [1] [2]. <text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">A second footnote, with <text:span text:style-name="Emphasis">emphasis</text:span>.</text:p></text:note-body></text:note></text:p><text:h text:style-name="Heading_20_1_20_Landscape" text:outline-level="1"><text:bookmark text:name="wide"/>Wide table (landscape)</text:h><table:table table:name="Table3" table:style-name="TblWide"><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-column table:style-name="TcolW"/><table:table-header-rows><table:table-row><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Month</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 1</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 2</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 3</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 4</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 5</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 6</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 7</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 8</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 9</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Berth 10</text:p></table:table-cell><table:table-cell table:style-name="Th" office:value-type="string"><text:p text:style-name="Table_20_Heading">Total</text:p></table:table-cell></table:table-row></table:table-header-rows><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Jan</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="46"><text:p text:style-name="Table_20_Right">46</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Feb</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="53"><text:p text:style-name="Table_20_Right">53</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Mar</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="51"><text:p text:style-name="Table_20_Right">51</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Apr</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="49"><text:p text:style-name="Table_20_Right">49</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">May</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="47"><text:p text:style-name="Table_20_Right">47</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Jun</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="54"><text:p text:style-name="Table_20_Right">54</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Jul</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="52"><text:p text:style-name="Table_20_Right">52</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Aug</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="50"><text:p text:style-name="Table_20_Right">50</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Sep</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="48"><text:p text:style-name="Table_20_Right">48</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Oct</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="46"><text:p text:style-name="Table_20_Right">46</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Nov</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="53"><text:p text:style-name="Table_20_Right">53</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="Tc" office:value-type="string"><text:p text:style-name="Table_20_Contents">Dec</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="2"><text:p text:style-name="Table_20_Right">2</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="7"><text:p text:style-name="Table_20_Right">7</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="3"><text:p text:style-name="Table_20_Right">3</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="8"><text:p text:style-name="Table_20_Right">8</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="4"><text:p text:style-name="Table_20_Right">4</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="9"><text:p text:style-name="Table_20_Right">9</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="5"><text:p text:style-name="Table_20_Right">5</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="1"><text:p text:style-name="Table_20_Right">1</text:p></table:table-cell><table:table-cell table:style-name="TcR" office:value-type="float" office:value="6"><text:p text:style-name="Table_20_Right">6</text:p></table:table-cell><table:table-cell table:style-name="TcTotalR" office:value-type="float" office:value="51"><text:p text:style-name="Table_20_Right">51</text:p></table:table-cell></table:table-row></table:table><text:p text:style-name="Text_20_body">Nights let at each berth, by month.</text:p>
+</office:text></office:body>
+</office:document>
diff --git a/crates/exav-viewer/demo/examples/files/converted/handbook.odt b/crates/exav-viewer/demo/examples/files/converted/handbook.odt
new file mode 100644
index 00000000..ebd0b157
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/handbook.odt differ
diff --git a/crates/exav-viewer/demo/examples/files/converted/handbook.rtf b/crates/exav-viewer/demo/examples/files/converted/handbook.rtf
new file mode 100644
index 00000000..39371eec
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/converted/handbook.rtf
@@ -0,0 +1,620 @@
+{\rtf1\ansi\deff3\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\fmodern\fprq1\fcharset0 Liberation Mono{\*\falt Courier New};}{\f5\fswiss\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f6\fswiss\fprq0\fcharset128 FreeSans;}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red192\green57\blue43;\red6\green69\blue173;\red106\green27\blue154;\red11\green79\blue108;\red20\green108\blue148;\red232\green241\blue245;\red255\green235\blue59;\red219\green233\blue244;\red240\green240\blue240;\pagebb}
+{\stylesheet{\s0\snext0\rtlch\af8\afs24\alang1081 \ltrch\lang1033\langfe2052\hich\af3\loch\widctlpar\hyphpar0\ltrpar\cf0\f3\fs22\lang1033\kerning1\dbch\af7\langfe2052 Normal;}
+{\s1\sbasedon33\snext34\loch\ilvl0\outlinelevel0\cf20\fs34 heading 1;}
+{\s2\sbasedon33\snext34\loch\ilvl1\outlinelevel1\cf21\fs26 heading 2;}
+{\*\cs15\snext15\loch\b Strong;}
+{\*\cs16\snext16\loch\i Emphasis;}
+{\*\cs17\snext17\loch\ul\ulc0 Underline;}
+{\*\cs18\snext18\loch\strike Strike;}
+{\*\cs19\snext19\loch\cf17 Red;}
+{\*\cs20\snext20\loch\chcbpat23 Highlight;}
+{\*\cs21\snext21\loch\scaps SmallCaps;}
+{\*\cs22\snext22\loch\fs30 Big;}
+{\*\cs23\snext23\hich\af4\loch\f4\fs20 Mono;}
+{\*\cs24\snext24\loch\sub Sub;}
+{\*\cs25\snext25\loch\super Super;}
+{\*\cs26\snext26\loch\cf18\ul\ulc0 Hyperlink;}
+{\*\cs27\snext27\loch\cf19\ul\ulc0 FollowedHyperlink;}
+{\*\cs28\snext28 Index Link;}
+{\*\cs29\snext29 Footnote Characters;}
+{\*\cs30\snext30\loch\super footnote reference;}
+{\*\cs31\snext31\loch\super endnote reference;}
+{\*\cs32\snext32 Endnote Characters;}
+{\s33\sbasedon0\snext34\hich\af5\loch\sb255\sa113\keepn\f5\b Heading;}
+{\s34\sbasedon0\snext34\loch\sl300\slmult1\sb0\sa125 Body Text;}
+{\s35\sbasedon34\snext35\rtlch\af6 \ltrch List;}
+{\s36\sbasedon0\snext36\loch\sb57\sa113\cf0\fs18\i caption;}
+{\s37\sbasedon0\snext37\rtlch\af6 \ltrch\loch\noline Index;}
+{\s38\sbasedon0\snext39\hich\af5\loch\ql\sb1701\sa170\cf20\f5\fs60\b Title;}
+{\s39\sbasedon0\snext39\hich\af5\loch\sb0\sa340\cf0\f5\fs32 Subtitle;}
+{\s40\sbasedon0\snext40\loch\sb0\sa57\cf0\fs20 Author;}
+{\s41\sbasedon1\snext41 Heading 1 Landscape;}
+{\s42\sbasedon33\snext42\rtlch\afs32\ab \ltrch\loch\fi0\li0\lin0\noline\fs32\b index heading;}
+{\s43\sbasedon0\snext43\hich\af5\loch\sb850\sa170\f5\fs30\b TOC Heading;}
+{\s44\sbasedon0\snext44\loch\sb0\sa57 toc 1;}
+{\s45\sbasedon0\snext45\loch\li567\lin567\ri567\rin567\sb113\sa170\brdrt\brdrnone\brdrl\brdrs\brdrw45\brdrcf21\brsp85\brdrb\brdrnone\brdrr\brdrnone\cf0\i Block Quotation;}
+{\s46\sbasedon34\snext46\loch\qj Justified;}
+{\s47\sbasedon34\snext47\loch\qc Centered;}
+{\s48\sbasedon34\snext48\loch\qr Right;}
+{\s49\sbasedon34\snext49\loch\li850\lin850\brdrt\brdrnone\brdrl\brdrs\brdrw20\brdrcf0\brsp113\brdrb\brdrnone\brdrr\brdrnone Indented;}
+{\s50\sbasedon0\snext50\hich\af4\loch\li283\lin283\sb0\sa0\brdrt\brdrnone\brdrl\brdrnone\brdrb\brdrnone\brdrr\brdrnone\cbpat25\f4\fs19 Code;}
+{\s51\sbasedon0\snext51\loch\fi-283\li283\lin283\fs18 footnote text;}
+{\s52\sbasedon0\snext52\loch\tqc\tx4819\tqr\tx9638\noline Header and Footer;}
+{\s53\sbasedon0\snext53\loch\cf0\fs18 header;}
+{\s54\sbasedon0\snext54\loch\qc\cf0\fs18 footer;}
+{\s55\sbasedon0\snext55\loch\sb0\sa45 List Contents;}
+{\s56\sbasedon0\snext56 Table Contents;}
+{\s57\sbasedon56\snext57\loch\qc\cf8\b Table Heading;}
+{\s58\sbasedon56\snext58\loch\qr Table Right;}
+}{\*\listtable{\list\listtemplateid1
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'03\'00. ;}{\levelnumbers\'01;}\fi-510\li510}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'04\'00.\'01 ;}{\levelnumbers\'01\'03;}\fi-680\li680}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
+{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}\listid1}
+{\list\listtemplateid2
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f9\fi-283\li510}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f9\fi-283\li964}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f9\fi-283\li1417}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'03.;}{\levelnumbers\'01;}\fi-360\li1800}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'04.;}{\levelnumbers\'01;}\fi-360\li2160}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'05.;}{\levelnumbers\'01;}\fi-360\li2520}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'06.;}{\levelnumbers\'01;}\fi-360\li2880}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'07.;}{\levelnumbers\'01;}\fi-360\li3240}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'08.;}{\levelnumbers\'01;}\fi-360\li3600}\listid2}
+{\list\listtemplateid3
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'00.;}{\levelnumbers\'01;}\fi-340\li510}
+{\listlevel\levelnfc4\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'01);}{\levelnumbers\'01;}\fi-340\li1020}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'02.;}{\levelnumbers\'01;}\fi-360\li1440}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'03.;}{\levelnumbers\'01;}\fi-360\li1800}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'04.;}{\levelnumbers\'01;}\fi-360\li2160}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'05.;}{\levelnumbers\'01;}\fi-360\li2520}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'06.;}{\levelnumbers\'01;}\fi-360\li2880}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'07.;}{\levelnumbers\'01;}\fi-360\li3240}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'08.;}{\levelnumbers\'01;}\fi-360\li3600}\listid3}
+}{\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}{\*\revtbl {Unknown;}{exav;}}
+{\*\generator LibreOffice/25.2.3.2$Linux_AARCH64 LibreOffice_project/520$Build-2}{\info{\title Harbour handbook}{\subject A document made for the exav demo (CC0-1.0)}{\keywords demo}{\author exav project}{\creatim\yr2000\mo1\dy1\hr0\min0}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709
+\hyphauto1\viewscale100\formprot\formshade\nobrkwrptbl\paperh16838\paperw11906\margl1247\margr1247\margt850\margb680\sectd\sbknone\sftnnar\saftnnrlc\sectunlocked1\pgwsxn11906\pghsxn16838\marglsxn1247\margrsxn1247\margtsxn1284\headery850\margbsxn1114\footery680{\header\pard\plain \s53\loch\cf0\fs18\ql\ltrpar{\loch
+Harbour handbook\tab \tab exav demo}
+\par }{\footer\pard\plain \s54\loch\qc\cf0\fs18\qc\ltrpar{\loch
+Page }{\loch
+{\field{\*\fldinst  PAGE }{\fldrslt 5}}}{\loch
+ of }{\loch
+{\field{\*\fldinst  NUMPAGES }{\fldrslt 5}}}
+\par }\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\fet\aftnrstcont\aftnstart1\aftnnrlc
+{\*\ftnsep\chftnsep}\pgndec\pard\plain \s38\hich\af5\loch\ql\sb1701\sa170\cf20\f5\fs60\b\ql\sb1701\sa170\ltrpar{\loch
+Harbour handbook}
+\par \pard\plain \s39\hich\af5\loch\sb0\sa340\cf0\f5\fs32\ql\sb0\sa340\ltrpar{\loch
+The east quay: rules, figures and notes}
+\par \pard\plain \s40\loch\sb0\sa57\cf0\fs20\ql\sb0\sa57\ltrpar{\loch
+exav project, written for the demo (CC0-1.0)}
+\par \pard\plain \s40\loch\sb0\sa57\cf0\fs20\ql\sb0\sa57\ltrpar{\loch
+1 January 2000}
+\par \pard\plain \s43\hich\af5\loch\sb850\sa170\f5\fs30\b\ql\sb850\sa170\ltrpar{\loch\fs30\b\loch
+Contents}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar
+{\field{\*\fldinst { TOC \\f \\o "1-2" \\h}}{\fldrslt {{{\field{\*\fldinst HYPERLINK "#intro" }{\fldrslt {\loch
+1. Introduction}}}}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar{{\field{\*\fldinst HYPERLINK "#text" }{\fldrslt {\loch
+2. Text and styles}}}}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar{{\field{\*\fldinst HYPERLINK "#lists" }{\fldrslt {\loch
+3. Lists}}}}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar{{\field{\*\fldinst HYPERLINK "#tables" }{\fldrslt {\loch
+4. Tables}}}}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar{{\field{\*\fldinst HYPERLINK "#pictures" }{\fldrslt {\loch
+5. Pictures and shapes}}}}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar{{\field{\*\fldinst HYPERLINK "#links" }{\fldrslt {\loch
+6. Links, fields and notes}}}}
+\par \pard\plain \s44\loch\sb0\sa57\ql\sb0\sa57\ltrpar{{\field{\*\fldinst HYPERLINK "#wide" }{\fldrslt {\loch
+7. Wide table (landscape)}}}}}}}
+\par \pard\plain \s1\loch\ilvl0\outlinelevel0\cf20\fs34{\listtext\pard\plain  1. \tab}\ls1 \fi-510\li510\lin510\ql\fi0\li0\lin0\ltrpar{\loch
+{\*\bkmkstart intro}{\*\bkmkend intro}Introduction}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell.}
+\par \ql\fi-283\li283\lin283\ltrpar\pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master. }{{\super \loch \chftn{\*\footnote \chftn\pard\plain \s51\loch\fi-283\li283\lin283\fs18{\loch
+\tab The register of 2000 lists sixty berths.}
+}}
+}
+\par \pard\plain \s45\loch\li567\lin567\ri567\rin567\sb113\sa170\brdrt\brdrnone\brdrl\brdrs\brdrw45\brdrcf21\brsp85\brdrb\brdrnone\brdrr\brdrnone\cf0\i\ql\li567\lin567\ri567\rin567\sb113\sa170\brdrt\brdrnone\brdrl\brdrs\brdrw45\brdrcf21\brsp85\brdrb\brdrnone\brdrr\brdrnone\ltrpar{
+\u8220\'93}{\loch
+A harbour is a promise that the sea will wait.\u8221\'94 }
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay.}
+\par \pard\plain \s1\loch\ilvl0\outlinelevel0\cf20\fs34{\listtext\pard\plain  2. \tab}\ls1 \fi-510\li510\lin510\ql\fi0\li0\lin0\ltrpar{\loch
+{\*\bkmkstart text}{\*\bkmkend text}Text and styles}
+\par \pard\plain \s2\loch\ilvl1\outlinelevel1\cf21\fs26{\listtext\pard\plain  2.1 \tab}\ls1 \fi-680\li680\lin680\ql\fi0\li0\lin0\ltrpar{\loch
+Character formatting}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch\cs15\loch\b\loch
+Bold}{\loch
+, }{\loch\cs16\loch\i\loch
+italic}{\loch
+, }{\loch\cs17\loch\ul\ulc0\loch
+underlined}{\loch
+, }{\loch\cs18\loch\strike\loch
+struck through}{\loch
+, }{\loch\cs19\loch\cf17\loch
+red}{\loch
+, }{\loch\cs20\loch\chcbpat23\loch
+highlighted}{\loch
+, }{\loch\cs21\loch\scaps\loch
+small capitals}{\loch
+, }{\loch\cs22\loch\fs30\loch
+large}{\loch
+ and }{\loch\cs23\hich\af4\loch\f4\fs20\loch
+monospaced}{\loch
+ text; H}{\loch\cs24\loch\sub\loch
+2}{\loch
+O and 10}{\loch\cs25\loch\super\loch
+3}{\loch
+; a }{\loch\cs16\loch\i\loch
+mixed}{\loch
+ style.}
+\par \pard\plain \s2\loch\ilvl1\outlinelevel1\cf21\fs26{\listtext\pard\plain  2.2 \tab}\ls1 \fi-680\li680\lin680\ql\fi0\li0\lin0\ltrpar{\loch
+Paragraph formatting}
+\par \pard\plain \s46\loch\qj\qj\ltrpar{\loch
+The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master.}
+\par \pard\plain \s47\loch\qc\qc\ltrpar{\loch
+A centred line}
+\par \pard\plain \s48\loch\qr\qr\ltrpar{\loch
+A line aligned to the right}
+\par \pard\plain \s49\loch\li850\lin850\brdrt\brdrnone\brdrl\brdrs\brdrw20\brdrcf0\brsp113\brdrb\brdrnone\brdrr\brdrnone\ql\li850\lin850\brdrt\brdrnone\brdrl\brdrs\brdrw20\brdrcf0\brsp113\brdrb\brdrnone\brdrr\brdrnone\ltrpar{\loch
+An indented paragraph with a left border: Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay.}
+\par \pard\plain \s50\hich\af4\loch\li283\lin283\sb0\sa0\brdrt\brdrnone\brdrl\brdrnone\brdrb\brdrnone\brdrr\brdrnone\cbpat25\f4\fs19\ql\li283\lin283\sb0\sa0\brdrt\brdrnone\brdrl\brdrnone\brdrb\brdrnone\brdrr\brdrnone\ltrpar\cbpat25{\loch
+moor --boat Aurora --length 6.5}
+\par \pard\plain \s50\hich\af4\loch\li283\lin283\sb0\sa0\brdrt\brdrnone\brdrl\brdrnone\brdrb\brdrnone\brdrr\brdrnone\cbpat25\f4\fs19\ql\li283\lin283\sb0\sa0\brdrt\brdrnone\brdrl\brdrnone\brdrb\brdrnone\brdrr\brdrnone\ltrpar\cbpat25{\loch
+berth 14 free until 06:00}
+\par \pard\plain \s2\loch\ilvl1\outlinelevel1\cf21\fs26{\listtext\pard\plain  2.3 \tab}\ls1 \fi-680\li680\lin680\ql\fi0\li0\lin0\ltrpar{\loch
+A section in two columns}
+\par \sect\sectd\sftnnar\saftnnrlc\sectunlocked1\pgwsxn11906\pghsxn16838\marglsxn1247\margrsxn1247\margtsxn1284\headery850\margbsxn1114\footery680\cols2\linebetcol\colsx454\ltrsect\sbknone\pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master. Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay. The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell.}
+\par \sect\sectd\sftnnar\saftnnrlc\sectunlocked1\pgwsxn11906\pghsxn16838\marglsxn1247\margrsxn1247\margtsxn1284\headery850\margbsxn1114\footery680\pgndec\sbknone\pard\plain \s1\loch\ilvl0\outlinelevel0\cf20\fs34{\listtext\pard\plain  3. \tab}\ls1 \fi-510\li510\lin510\ql\fi0\li0\lin0\ltrpar{\loch
+{\*\bkmkstart lists}{\*\bkmkend lists}Lists}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u8226\'95\tab}\ilvl0\ls2 \fi-283\li510\lin510\ql\ltrpar{\loch
+Water at every berth}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u9702\'3f\tab}\ilvl1\ls2 \fi-283\li964\lin964\ql\ltrpar{\loch
+cold, from the quay}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u9702\'3f\tab}\ilvl1\ls2 \fi-283\li964\lin964\ql\ltrpar{\loch
+hot, in the shower block}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u8226\'95\tab}\ilvl0\ls2 \fi-283\li510\lin510\ql\ltrpar{\loch
+Electricity}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u9702\'3f\tab}\ilvl1\ls2 \fi-283\li964\lin964\ql\ltrpar{\loch
+16 A at berths 1 to 40}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u9642\'3f\tab}\ilvl2\ls2 \fi-283\li1417\lin1417\ql\ltrpar{\loch
+with a meter}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u9642\'3f\tab}\ilvl2\ls2 \fi-283\li1417\lin1417\ql\ltrpar{\loch
+without a meter}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u9702\'3f\tab}\ilvl1\ls2 \fi-283\li964\lin964\ql\ltrpar{\loch
+32 A at the east pontoon}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  \u8226\'95\tab}\ilvl0\ls2 \fi-283\li510\lin510\ql\ltrpar{\loch
+Wi-Fi on the quay}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+Numbered, with other numbering styles at each level:}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  1.\tab}\ilvl0\ls3 \fi-340\li510\lin510\ql\ltrpar{\loch
+Call the office on channel 9}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  2.\tab}\ilvl0\ls3 \fi-340\li510\lin510\ql\ltrpar{\loch
+Give the length and the draught}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  a)\tab}\ilvl1\ls3 \fi-340\li1020\lin1020\ql\ltrpar{\loch
+length over all, in metres}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  b)\tab}\ilvl1\ls3 \fi-340\li1020\lin1020\ql\ltrpar{\loch
+draught, in metres}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  3.\tab}\ilvl0\ls3 \fi-340\li510\lin510\ql\ltrpar{\loch
+Take the berth you are given}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  a)\tab}\ilvl1\ls3 \fi-340\li1020\lin1020\ql\ltrpar{\loch
+tie up bow first}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  b)\tab}\ilvl1\ls3 \fi-340\li1020\lin1020\ql\ltrpar{\loch
+tie up stern first}
+\par \pard\plain \s55\loch\sb0\sa45{\listtext\pard\plain  4.\tab}\ilvl0\ls3 \fi-340\li510\lin510\ql\ltrpar{\loch
+Pay at the office}
+\par \pard\plain \s1\loch\ilvl0\outlinelevel0\cf20\fs34{\listtext\pard\plain  4. \tab}\ls1 \fi-510\li510\lin510\ql\fi0\li0\lin0\ltrpar{\loch
+{\*\bkmkstart tables}{\*\bkmkend tables}Tables}
+\par \pard\plain \s36\loch\sb57\sa113\cf0\fs18\i\ql\sb57\sa113\ltrpar{\loch
+Table }{\loch
+{\field{\*\fldinst  SEQ Table \\* ARABIC }{\fldrslt 1}}}{\loch
+: berths by length, with merged cells and a repeated header row}
+\par \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx2551\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx4252\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx6236\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx7937\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Length}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berths}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Let by}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Fee (EUR)}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2551\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4252\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6236\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+up to 6 m}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+12}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+week}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+18.00}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2551\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4252\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6236\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+6 to 8 m}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+18}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+season}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+24.50}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2551\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4252\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6236\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+8 to 10 m}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+14}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+season}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+31.00}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2551\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4252\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6236\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+10 to 12 m}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+year}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+42.00}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2551\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4252\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6236\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+over 12 m}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+year}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+58.50}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx2551\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx4252\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch\cs15\loch\b\loch
+Total}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+60}\cell\pard\plain \s56\intbl\ql\ltrpar\loch
+\cell\row\pard \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar\loch
+
+\par \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx5410\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clvmgf\cellx7937\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Merged across two columns}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+Merged down two rows}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3246\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5410\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clvmrg\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+a}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+b}\cell\pard\plain \s0\rtlch\af8\afs24\alang1081 \ltrch\lang1033\langfe2052\hich\af3\loch\widctlpar\hyphpar0\ltrpar\cf0\f3\fs22\lang1033\kerning1\dbch\af7\langfe2052\intbl\ql\ltrpar\loch
+\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3246\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5410\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx7937\pard\plain \s56\intbl\ql\ltrpar{\loch
+c}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+d}\cell\pard\plain \s56\intbl\ql\ltrpar{\loch
+e}\cell\row\pard \pard\plain \s1\loch\ilvl0\outlinelevel0\cf20\fs34{\listtext\pard\plain  5. \tab}\ls1 \fi-510\li510\lin510\ql\fi0\li0\lin0\ltrpar{\loch
+{\*\bkmkstart pictures}{\*\bkmkend pictures}Pictures and shapes}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+{\shp{\*\shpinst\shpwr2\shpwrk0\shpbypara\shpbyignore\shptop0\shpbottom2551\shpbxcolumn\shpbxignore\shpleft4877\shpright9412{\sp{\sn shapeType}{\sv 75}}{\sp{\sn wzDescription}{\sv A made-up picture of a lake and a hill at dusk.}}{\sp{\sn wzName}{\sv A lake at dusk}}{\sp{\sn pib}{\sv {\pict\picscalex47\picscaley47\piccropl0\piccropr0\piccropt0\piccropb0\picw640\pich360\picwgoal9600\pichgoal5400\pngblip
+89504e470d0a1a0a0000000d49484452000002800000016808020000004850dd060000148f4944415478daeddd779c14e5fd07f059ee0e3894a220a0808a2860
+a1890541c11a8c420844c182250a1a1b20410dd198fc624c7b19132362076cb145e9688c880a89421429a241a4183da41d7a280a22dcef8f85f3e8bbc7eeecee
+cdfbfdba3fb8636e76e6bbf33c1fbef3ec2eb1035b0e080080705551020010c00020800180f4c80f628a00003a600010c000800006804ac21a3000e88001202a
+1db0161800c20f60f10b0099e88025300084ce1a300008600010c000409a580306804c04b0fc0580f0b9050d00021800a2213f88b9090d003a6000884207acff
+05001d300044a303f63e6000d0010380000600d2c38bb0002013016c0d1800c2e71634000860008886fc987bd000107e00cb5f00089f5bd000208001201abc0f
+18003211c0d68001207c6e41038000068068b0060c009908606bc000103eb7a00120131db006180074c000108d0e3888e9810140070c0051e880f5bf00a00306
+806874c0de070c00190860f90b00e1730b1a000430004443beb70103800e1800043000208001a0d2b0060c003a600010c000409af8242c00c84400fbff800140
+070c0091600d18000430004483f70103800e180004300090265e050d009908e040020340e8dc8206804c74c01a6000d0010340343a606bc00090810096bf0010
+3eb7a00140070c001109606bc000103eb7a00120131db006180074c00010910e580b0c003a60008844071c78193400841fc0e2170032d1014b6000d001034014
+781116000860008806ef0306001d300044a503560300d0010340243a60ef0306800c04b0fc0580f0b9050d003a60008848005b0306001d3000448235600010c0
+00100d3e0b1a0074c00010950e580d0040070c00d1e880b5c000a00306806874c06a00003a6000884607ac0506001d3000086000202dbc080b003211c0fe3f60
+00d001034024580306001d3000442480ad0103800e180022c11a3000e880012022016c0d180074c0001009d6800140070c001109606bc000a003068048b0060c
+003a60008848005b0306001d30004482356000d00103404402d81a3000e880012012ac0103800e18002212c0d6800140070c0091600d180074c000109100b606
+0c003a600088046bc000a00306808804b0356000d001034024580306001d3000442480ad0103800e1800043000901e5e84050019e980b5c000a00306806874c0
+6a00003a6000884607ac0506001d300044a3030e4a55010074c00010850ed81a3000642080d5000042e7163400e88001202201ecff0306001d30004482356000
+d0010340540258020340e8dc8206808c74c06a00003a6000884607ac050680f0035809001231f2d17ebbdde6c7173fa45024dc01ab01c0ce8d482077b70fe9cb
+24310218a0021e4e26777716db978b617611c03e0b1a60dbf47da45f6af6138fe14bc4303a60805d7a2845d1bb4d9cf793c16cc7db9000d298be657b4edfced1
+0103e4b007d31f900f3dd2afbf5698ef023856aa0a404e983c77d669addaa663cf0f8cea1f5acc5f71e9839e4a02b7a0815c89dec97367c5ff90bbe99b918723
+6bc5ae3877b02a0059ebe59d24eee9296a85efcf501c5ea90fd6012b0190b5d1fbf2cefbdd9753d10adfaf1925737c16349075fe3927a1708d67f019addbe6e2
+39de3faaff4f7eac09d6019335130a447c98c4bfc2195cf78dcc70fb9bf10320d31db01aa4df4b7366c5a789efe5e63fd5219c31b287ffc04d6a7cdd9b1de167
+068eb2d855bdbd082b8dfeb1a369a5ab18865d8e910a4b7c700dcf9aeef36a37a223db01fb07581a6796d9b37636e3746d2383314066a57e9f73660541b0dbf1
+357c4436ddfb35094736803df5e9f0e2ee6696f8d473a618c600494fb4e7d0e032094756ec9a3e6e41a7d80bc94c2edf97c1181d69b3b3f1356c4476bdfae9da
+cbdc85cef0659991a9d8aba0333cbf843c1f55d679969cb824c2bf2a76f888d996bec66f365c96193965ef034e9949b366edc9b57e56dbb695ac0ebbbea02bcd
+f992bea191c22cc9f2eb2de3f3f0f6cf51259b97123ce590cf3776ed796e4167cb145309aef5544db5e2d9b848b9b28beaee87b3b103beeef207b3f9a9a97c1d
+42369ca91761a5c0c414cd329366cd3a3b67aff289299d6a773d48ce16cfe5ca9e9dd598984dd15bfea2cada8b2796ddcf4896572f851508731e8e0dd001ef81
+09e99965bae5d4553e21cba6da6e1188e7446a9e913a4cc8bedcdddec2b7efc9c2a31a98ea0e387dcf45ce0db10a94229c738c0d38ff7a395ac127f59dd9694c
+91766d225e8188d430fc9aa7a92c597e31647f0c0fecf740ce3d05d93fc4f6a426219c5d6ca0004edef8b02ef4ee597c7d8fcf9d09b77bee277108d5ae7095c6
+e75af46667060f4a3e80b3a4f25938be525599749f5ac60278fc3bb373745a0cf9a2afc417b79922274abd8ba2e5ee959085319c48006773c1b36470a5bc4469
+3dafd8a04c04f0b87235fa414ecd89e3323100b2a744e32ac5849b13975ce528b50c4edcf53b0ae05cbc0c3235bed257abf49d51ecfa0bc20ee0b133775ca61e
+4767f5b4b8b3c30e4d66eb93f1d3af7c258d4e9dc5702206f77fa0325d00610eae108a96a6d309358013295376c670968c8a4c15a7d2a742c6af3ab91bd90c6e
+d6fe1a832b27064e3a4e243638ac001e9364a57e9835493c269b26c790cb322662c110fe553746f4462c862b7de28630b232356a523e3fc47e1a4a008fae68bd
+7a6634864767ebe418425946473b18d25de1d1723732191ccdc44dd3b0caf8c049edcc10fbe985690fe0d16fa7a0643ddb879dc42939ec345e07692b48969f78
+4ed7596da310c312371dc32a7bc64e0ae784d8907406f0f3a92e59af5062f8f9dc9925535e90e725447a4aadb0953883256e5ac754168e9d544dbc690ce0b456
+2d7d499c731365aa4a2121d2516d55ad94312c71431853593e765232f1c66e484f003f174aed7e94ea187e2e37a7cb3dacc3734222d5355752a8f098ca95e1b3
+e70114bbb16fea03f8ef6f855dbe738e699373c79c0d45a804679d6d65575288ecf0af40000f4a69f4cec9682d5ae7e26167aa0295e6ac01722e77822088dd94
+ba007e366b26f47393a9c8b3952b871239f767452f40261267ab00fe598a02f899ec9bd37befae28cf54de1cdad9b93f237a01428f9b9d04f0452908e067fe93
+d5d37aef635be7dc31a7fcac2bfdf902645bd0ec268087ee59003f9d3bd37a9f2dd5793a4a51143feba7a52f405829936800ff7c0f02f829d33a006c715e3219
+5c45fa02404a24958c5562b1a0025fd217007698c1092669d21df09333e63c3943fa02c04e8332b10e380812ff12bd00904806ef36529308e0bf495f0048ccdf
+7697c155825869225f4f485f0048c61333e6ec2258f363bbfbfdc7a7cf554400a848064f9fdbf7f8563bfcabdddc8296be00b0271e9f3e7727b7a077ee31e90b
+007b6c8779bad3f7014b5f004861066f93b33b58037ee44dd10b0029f6e89b732fe9f0dd7a7015e90b00e1281fb25bbd084bfa0240ba3378cb07716cb9193d4a
+fa0240fa8d7a736e2c16e4074130f20dd10b00e119f9c6dc58e30e7d150200425645090040000380000600043000086000400003800006000430000860004000
+0380000600010c0008600010c00080000600010c0008600010c00080000600010c0002180010c00020800100010c0002180010c00020800100010c0002180004
+30002080014000030002180004300020800140000300021800043000086000400003800006000430000860004000038000060004300008600010c00080000600
+010c0008600010c00080000600010c0008600010c00020800100010c0002180010c00020800100010c0002180010c00020800140000300021800043000208001
+40000300021800043000208001400003800006000430000860004000038000060004300008600040000380000600010c0008600010c00080000600010c000860
+0010c00080000600010c0008600010c00020800100010c0002180010c00020800100010c0002180010c00020800140000300699457ab716b554889f9e36f3ea2
+59c389afbf97dadd3e7dc7a5756a16ce7cff131506d001139eaa057955f3f312dc78f82de7ce1f7fb3a20164bf7c25c872bd063d5c5aaa0c00110ee0c2ea0557
+f739b15be723ebef5b7359f19ae75e9e7dff33ffdab8a9f4ce1b7a9ed9a965cf410fcf5fb222bee55f7fd6eba4f6cdba5ffbe027cb3f0f82e0c0fdf7197cf129
+c71cd164efbdaa7db474f5a8b133464f9e1304c1e8bb2eaf5b7baf2e3ffe6bf980b9eba65e1ddb36ed78d15f367cbb31ad8f1e04c1fcf1374f9efec1fc252bfa
+9cd9aeb05ac12b3316fce2ee491ddb36bde1d2531bee57eb83252b7e35fc85790b9795dff889096f0de8dba5f941fb6dd8b071da3b8bef183579e9ca3549956b
+9bcd76bbdbff8ebb79f2f40faefecdb39b775bade0aa3e2776eb7264bd3a7b15ad28193765ee8831d3d77ff36d7c5765fb0c82a045f7dbcbf65ff6ebf12ef9b4
+e39b97ffdb6933175d7fd1c923c74e1ffed4b4c48f1c803002b8203f6fe46d1736ae5f7bf8d3d3161715b76dd1e8277d4e6c58b7d6adf74cfaf57d2f1edffaa0
+ffbbe6acf36f1c555a1a746edfac6ba7c36fbd67523cfff6a955e3f1df5db4e6cb75bfbeff1f6bbf5adfb7fbb1bf1fd47de5675f4e9bb968ec2bef0eed777adb
+968ddfd9b2c059ad6a7e97630e1df7eabbdba46f3a1e3dbee7a30eddbfb05ac14d7f1edfa1f5c1fd7a75a85e35ffb083eadff9e894ea55f36fb9a2eb7db7f63e
+f9b2611b376e8a6fdca4419d3b6fec3972ccf4bf3cf66ab326f506f53df9e8231af718f050c9175f275eaeed6b9bf86eab16e48dbced8296873418f6e4d4791f
+7edaae65e36bce3fa965d30603fff07c10047d868c1a72e9a9c71e75609f21a312bf020e6d52af4df303863d35f5d5190b923d7200d21ec097fce0d8d687eddf
+63e0430b3e5a1904c11bb3976cd8b869c825a78e18f3e692a2d5bf1afec2b09f9fd3bb6bbbb1afccbdf527674e7d7be1d32fbe13ffc5b34e3aa241dd9ad7dcfe
+f7b90b960641f0fee2e56f3c7efd1927b4983673d184d7e7dd78d96967766a5916c0271dddacb07ac1d829734378f4f806fbedbb77cf810f1797ac9dfaf6c2d3
+8f6f7e7a8716b7dc3df1c569ef0741706893fdfa9f73c25187ee3f7b7e517ce3e607d7bff49627de98bd247e0cab3e5f7bd74dbdae3cb7e31f474c4eea80b7d9
+3889ddf638aedde18daffecdb393a77f10df388805032fecd2664ca3d9f38b66cd2f5ab3765d1004b3b61c70229aecbfcf398347cefbf0d30a1c39001596e88b
+b0ba75396ace824f177d529c975725fe3565c682582ce8d0eae02008fef9c6fc09afcf1b72c9a943fb9f517befea3fffebc4b25f9cf29f057d868c2a9bdf3f5b
+f355bc310d8260d5675ffefb9d455d3b1d1e8b6ddeb86bc796452b4a66beff71088f1eb7e0a395c5256be37ffe78d9679b532d08822088f7d0fb96db7849d1ea
+b2bf0d82e0a57ffd77e5ea2f4f3bae79b2e5da4612bbed7ce4d21525f1f48d7bea85997f1c31f9dbad6f182465c1472bcbea93ec910390f60eb869e3bad5abe6
+bf3766e8363fdfb7f6e67cbaedbe7f4c1c7ee579671e7dc39d6357acfea26c83a52b4a1ad4ad79fbc06e47356b586f9fbdab57cb0f82203f6f73f08f7df5dd3b
+7edaa375f346b3e71715e4e79d72dc618f4df8cff6af394ad3a30741b0eaf3b5657f8edff72edef293f8b755aac4ca36f8dfb2cfca3ffaa6d2d2c54b57b76dd1
+a802e52a2f89dd36aabbcdfb9156977cf5f0e837937aca63b158f96f97ae2ca9f0910390f600ae128bbdfddec7bf7de89fdbfc7cd9aacd6957a3b06a61b58220
+081ad6ad557e831f9ddee6f601dd5e7bebc33f3ffe5abcc59c30ec8ab2bf7df98df95fadfbe6cc4e87cf9e5f74429b836bee556ddc9477437bf42008d6addf50
+f6e778ee7fbde527a5a5a5dbc455e9f6ff34282d2d5b214eea80b7de47c2bbad12cbcb4bfa9d63b1adbfad59a3da5679bff5abab923a7200d21ec09fae2ca951
+bdeabb0bbebb577970a37dbb77396adcabefaefa2c88c582df0ee8f6c9f2cfa7ce5c74dd059d274fff60e1c7abe29b5d7bfe490b3f5975d56dcf6c2a2d0d8260
+afc2aae577fbf5fa0d2ffd7b7ed74e2dff30e2e5ae9d5abebbe0d3c545c5a13d7ab21a37a8b3752b191c74c0be8b97267dc07bb0db354d1a6eb5719d9a85ed5a
+367e6fd1b2e5c53b0ec88d9b4a6b6c7dd68734a95be1271a805449b49d7aedad0f5b366d7068937a653fb9b4c7f157f5ee145f55bde0ac633ab43ef897f74cba
+fb89d796177ff1bb81ddf2b6dcb9ad53ab70f5e76b376d69f24e68d3749bb672ec94b98dead76edba2d169c737dffee557e97ef4a4346b52efb85607957dfbfd
+138f6850b7e60b53df4ff6802bbcdb69ef2cdabf5ead2ec71c5af693fee774bcf717bdcb6eaac79be9fcfcef9ed615abbf687e50fd822d1fe571e2d187d4adbd
+57859f68005225d18fa27c7fd1f26e5d8eec75469bb55fafafbd77e145dd8ebdf0ec63fefcd8abff9eb5f8c0fdf71936f49ce727cf79f28599df6edcb4a8a8f8
+8a733a7eb5ee9bf86a65abc30e38f1e843d67ff36d2c16ebdcbed995e776dcbbb05ac917eb9e7f79767ccf45cb4bcefd5edb7687376ed2709fa1774df8badc3d
+e1743ffa7517745e5c545cf6e19167773ef290c675873d3935feede1873438bd438b4953df5bf449717ce365abd6fcf0d4569b3696d6a85e7076e72387f63b63
+de879ffe72f80bf1dbc557f73971e3c64dff9ab5b8e4cb75bb38e06d4e6db7bb2d7f90f397ace8714aabb34e3a62ddfa0d350aabf6eedaaedf8f3a3c3a6ec6a4
+2d69ddb16dd3239b35dcb061635e5e95a2e5254110d4a955a373fb662d9ad6ff7ccdd7ed8f6872cb155d8b5694d4abb357fc34b7a9c0ae4b6db400a450a2b7a0
+577dbeb6cf9051832f3e65f0c5a754ab9abff07fab6ef8d398f1afcdab128bfd7e50f7afd67f73c723af6ceed2662e9a34f5bd011776993c7dc1e2a2e25bee9e
+f8c557eb2fefd9a1f0bc824545c57f1a356568ff33f6a95558b6e74da5a5e35f9bd7af5787d7df5e58f682e4d01e3d29f3162e7b73ce477dcf6e7f40fdda2b57
+7ff9c8b819c39f9a16ff108c200846bf32e70727b7baf717bdcfbefafe9d1d7005765bdeb2556b7a0f1939f8e253aebba0734141de474b57fffade17cbde7315
+04c123e366b46dd1e8daf33baffb6643fb3e77044170f713af956e2aed797aeb7b6e3977d127c5b73ff0528f535bb538b87eb24fb4a102905ab1c61dfaaa4222
+b6ff48a96cde2d0059ce7fc600000218000430009026d6800140070c0002180010c00020800100010c0002180010c000907dfe1fe340a7ab4939395c00000000
+49454e44ae426082}}}}}
+The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master. Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay. The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell. }
+\par \pard\plain \s36\loch\sb57\sa113\cf0\fs18\i\ql\sb57\sa113\ltrpar{\loch
+Figure }{\loch
+{\field{\*\fldinst  SEQ Figure \\* ARABIC }{\fldrslt 1}}}{\loch
+: a picture that text flows around}
+\par \pard\plain \s47\loch\qc\qc\ltrpar{
+{\pict{\*\picprop{\sp{\sn wzDescription}{\sv }}{\sp{\sn wzName}{\sv The second picture}}}\picscalex47\picscaley47\piccropl0\piccropr0\piccropt0\piccropb0\picw480\pich270\picwgoal7200\pichgoal4050\pngblip
+89504e470d0a1a0a0000000d49484452000001e00000010e0802000000def853300000110d4944415478daeddd7b5cd465bec0f167b829984280a0022aa04412
+202a66c542d2b65aa8541aa8a05869a999966bdb69f39c7d6de65e6dddce9abe4a05cc3aa9a5915aea9ab71557f1c6c5d4b888a072511083bca40873fef8d5ec
+701b66602ecf0c9ff78b3f0406fcfd9e99f9f0f5616654f50f9e2f0000f2b1630900804003000ce020542c020030410300083400583bb6380040da4053680090
+33d0e41900649da029340048895f12020081060018822d0e009035d0f41900e4c4160700c83a410b1533340030410300f49fa0999f0140d240f3280e0090135b
+1c0020eb04cd000d0092069a2d0e0090135b1c0020eb04cd000d0092069a27aa00809cd8e20000592768e667009034d03c8a0300e4c4160700c83a4133400380
+a481668b0300e4c4160700c83a4133400380a481e6892a002027b6380040d6099af91900240d348fe200002668008001d8830600692768466800608206001068
+00b07a6c710000133400c0b0099a3500003903cd6b710000133400c000ec410380b41334233400304103000c99a05903009033d0bcdc2800c8892d0e00907582
+668006004903cd160700304103000cc01e3400483b4133420380a481660d00404a6c710080b41334233400304103000c99a079203400c81968fa0c00d24ed000
+0019b1070d00d24ed08cd000c0040d00306482660d0040ce40f3280e0060820600106800b08140b3c501004cd0000003f0303b00907682668406004903cd1a00
+8094d8e2000069276846680060820600183241b306002069a029340048892d0e00907682660d0040ce40f35a1c00c0040d0020d000600381668b030098a00100
+041a006c20d06c710000133400804003800d049a2d0e00608206001880174b02006927684668009034d0ac010048892d0e00907682668406004903cd1a000081
+06001810689ea802004cd00000020d00361068b6380080091a0040a001c00602cd16070030410300083400d842a0293400488957b30300692768d60000240d34
+85060029b1c50100d24ed0ac0100481a680a0d004cd0000003022d849a5500002927684668009034d0ac0100106800800181e6e5460180091a0040a001c01602
+4da101404abc160700483b41b306002069a029340030410330a7d48f66eabec0f3d3d7b04a52079a2500ba609a9b5d8c52cb3a413342033664edba991df82aa5
+d42fa49069d902cd1a0036614d87d2dc2cee3369348106605cab3b5d674de567d1688902ade2f5a001ebf661fa2ce3b6fec519ab595519f04415803a9be37ba2
+23815609c19b19def69cca61117833fa9be94afa61fa2c96d7e26f3c8ac31c76e7e50821be39952384783c6c280b02abf041faacd9cfb1d76149fc92d0e4fe99
+97d332d6bf22d3265bedaeb3b6abd24cbe11411f2c4b35276121ab6022bb9aa6b9a53164da64abdd15d676659a39768ae732445b7082e647a4a97a919ba37f53
+c684536a232ff5aebc1cdb5ed595a9e6fa3d1e89b0e0043d379109daf876ea51e796c69269132cb5adaeeafba9e67ba0c5cbcf33445b6882e6a7a3d1ede8509d
+35ad79824c1b759d77e6e6b0a4ccd0561b68d6de78becec9e9fc3751baf3e4509a62b475b6bd25fdc75ab33e4e994a30415bbdaf8c51e7660d8ab36853becac9
+89932c6a9d59e4afe53b1d2668b4b3f2af4c660f5aba3a3763b6ace8380b19d266ac45b6814cffef5a733fd36ffe0babcd762df373546b82e6b5383a6d7b76ae
+19c2342e22dc82476eba6330ff0a5bf65cac75946b1a0a93dee6353f89b98eac6f8b635b76ae1062bc1cd7dc3613a7b9d5bb4467cebd93076c9463906485b767
+e78ea7d1fa07da6a6ff3d6bdecaf4e79cd8a0e776bd31bc7048b5e6d5bcd784b6d49cf7337f5419aee2a30dbf24eb0f49d7f6b76aea1c7b07ccd8b663ec8c0e1
+2fcb5080095dacd4aad7a6ca1ee82f4fb67f478d1f162ee1519941cb13b7d48119f72a30f35998fff6d3d639ea79247f5b6dbe404b926619ae320b047aa1dc81
+ce30e48efa94b9aeb30c39ea2ca1ce5f05165c5b33dc7ef43f3bdd07f3aee9032d67972d78af27d0c6b98b9af40a23cda6bb1624595b53dc7e3a736aad1e8f49
+036d2d69ee0aa556fd3a49ae407f71c268f7d2a787874b7b6c5d873ed7826c0b6bac5b8e71cfabd9512dfbd0c88db6d22e9be18e6fc9402f9220d05b4c79ff7c
+c648d7d616ea6c9a2b42da85edd82dc70ca7a31cd85f8d17689b49b389eefb960cf4eb960ef466b3dc3f2776eeaada4c9d4d7045c8bfaafadf6c2c722ee74ebc
+4f97cd70f7b764a07f936c81407f7edc32f7cc4923c2ade550210f1d371b496e1e8696baeba4b9f305b070a0df487ed5cc7fe567c7f32c7edacf8e08b3964385
+0cb46f3032df2a7497bacb76b9f329b058a0ffcb2c81de24e56d3a41e775b3893ac36a352b3569365616cc1ee869260ff4a66352972e2132ccea8e1980651361
+a640bf69b2406fb4b6c625468659e36103b0482bcc11e8df9a20d01b681c80ae64b269926dccff51e5d3a374194057a4994aa78c3466a98df372a3ff479a01e0
+e73975aa9132dda9407f429701a0ed9935a973a5eee0ffa8f271d629ae0300d0738a4d7e30b42381a6cb00606a9a781a546a7db738d69366003052a9a7e997e9
+761ec5f1d111ba0c0046a61979a78f0aedc804bd8e340380896986e094d64add3cd0e9741900cc4e3313cfd02af57fb638d20e936600b030654a7eeea1502184
+ca7754322b020012b26309008040030008340010680000810600020d0020d00000020d00041a0040a001804003000834008040030081060010680020d0000002
+0d00041a0040a00100041a000834008040030081060010680000810600020d0020d00040a00100041a000834008040030008340010680000810600020d0020d0
+0000020d00041a0040a001804003000834001068000081060010680020d00000020d00041a0040a00100041a000834008040030081060010680000810600020d
+0020d00040a00100041a000834008040030008340010680000810600020d0020d00000020d00041a0040a0018040030008340010680000810600e8c1c1a04b07
+fb7bcf9d1c151ed4cfc3ad47f995da8cbda73edcfcefbb771b253cb1958b9f7decc1a0fbc62f35f40b372e9bb1fb70fe9acd87b97100b09a093a66c4a02dcb9f
+77b0b7fbfdaa9db3dfdeb4ef58e1bca9d14be6c5d9d88a3839da3b39d8ebff63207fdb5bdc8c005878827e7d466c69c5b5794b3f6f54ab851099d9c53fdebe3b
+3be1918d3b4ee6e497d9cc8a3cf3ea5ab59a1b0600ab0a74ffbef7e61694376ad5eb8bbd79c1fedede1e3d95779dbb3bce4d8c1a171de2e5deb3f26adde66f72
+3fd874a8a1f1a7cb3b77739c9318352e26c4d3ad47d995daadfb4ea56664ddbe7357f96c77278799131f8a8b0ef1f576bb537ff76cf1e5755b8fee3e9caf7c36
+7fdb5b7bb20a3edf9dfb726254a09fe7b5ba9b197b4fadd870b0a1a151fbaf8e8b0ef174eb71e9f2f79fee38d9d65928dfea93edc7e727c7040de85d5fdf9099
+7d7e59fa9ef2aa3ae502df6d7d6b4f56c1dc773e6bf7b035b3b3f207653b45f9fe9a2f174d375b94cf669e2c7e6ddaa3695f66addc90d9eeba0120d0ed2bba50
+352cd8f7a1f08187734b948f9494d5bcf4f646e5cf8e0ef6694b927cbd5c576ecc3c5f7675e87d3eb313a3fa78f4fa9ff7bf56f60dd2964c0d0ef05ef1e9c1d3
+451511c1be2f4ff945b0bff7823f6f11423838d8a52e991a1ee49396917530fb5c8fee4e09632356fc76d25fd3f6acd97244f9fefd7abb2e99f7e47b1f1fb858
+796dc2e8d0b993a38410ef7d724089fbfa3f24070df05ab53133afa0fcfe00ef054931376edd6eeb44fcbcddfef69ba7d332b2febe7e7fa09fe7abc98f0e1be2
+1b3f7f4ded0fb75a6e77e838ecc445e98b66c4463ed03f7151bafecb38c8cf333ca8df8a0d07f71f2d6c77dd001068bd2c5dbd7bedefa7a4bf9374ecdb0b074e
+141d387eaea0e48ae6b3291322c306f78d5fb0a6b0b44a087138b7a4bea171514a6c6ac69192b29a94f89111f7fbce7de7b33d5905ca67854a2c488a09cff0c9
+cd2f9b3e3e72f810bf251fecfa78fb71e5bbed3b5698faf6d48529b1bb0fe797565c1342dc1fe03d67c9a6bd470b85105979a5a3c2063e151baa043a257e64e8
+e07e0bfebc6567e65921c4a19cf3df1655ae5b9ad4d689040df49ab1f813e5c7cce1dc92eaef6fbcf7c6332f3dfbf05f52f734bba4eec3cec92fabbbf1a310c2
+a01d1ebfbef74e5a9876baa8429f75e3060a746506fc92f0c4998b6366af4acbc8eae3d96b514aecb67fccfaecdde74207f7533e3b2ee681bcc28ae24b57eded
+ed94b77d470b552a312a74a010625c7448f9955a25738a0d3b4efe2575cfddbb0d4288098f86d6d4ded4de9750abc5aa8d99f676aa71310f281fa9a9bdb9ef58
+a1f2e746b5bae84295b7672fe5dd27a2865456d7ed3a7456f3e547f24a8a2f5d6deb444aca6a34ff081042fcf3d0775535d71f1b19d4f292ba0fbb630a4bab34
+756e77dd003041ebebf2d51ffeb4f69b3fadfd6670ffdef1a343a74f885cffc7e489afa59ebb58edefebd1ddc9e14cc69bcdbec4ddd54508e1efe371f2ec25ed
+8fd7d4de5cfbc54fdb1701be1e7905e59a0d65457e69951022c0cfe3a70d968bd5dabfbbabbfdb606fa752fe3cd0c73d2fbfbcd96ff62e565e0bf0f568f52c2e
+545ed37eb751ad3e5f5e33f43e9f9697d47dd87a52a954daef9657d536f92b74ae1b00026df81878a16ad9babdf92597972d7a6af2d888a5ab77dba95427ce5c
+fcc39addcd2e5959fd8310c2ce4e656f6fd89362d46ab5324a2baedf6c734fd9c1deae69038510a29b9383eeefdcec43cd7e3cfcf4ef0bc30f5b08d1ec587aba
+746bf2f3a0e96fff74af1b00b638da97383662cbf2e74302fb687f50d911eeedde5308515155ebd2dde9dbc20acddbf59bb747470eeee1ec2484a8a8aaf3ebe3
+a6fdb56e3d9d47470e561e01527ce96aa09fa78343938309f6f716429cff79a742ddf663dfcaabea06fab8376b74ff3ef7b675795f6fb7a613ae18d0cffd7c79
+2b5b22ba0fbb550d8d6a176727ed8f68fe11d02addeb068040b7afa0b42a6450dff94931dac3aad26be55785078e1705fb7b0ff2f3d47c7646fc8373121eb956
+77530891995ddcd7b357cc88419acfce9af4f0aaff4e70b0b713426cdd7fcaddd565f2d861dad19c93f04843a37afb816fdb3db67d470bbcdc7bc66a6d228f8e
+1cdccfcbb5adcb07fa798e0c1da079f789a821de1e3d771c3cdbf292ba0f5bf36343fb47cb959a1f82067839fefc5497a861011eae3d741cbcee7503d095d9f7
+f20dd3e77295d5759ef7de333e262432a4ffedfabbee6e2e631e0e5efcd298caeabac52bbeba53df70b6f8f2b89890671e0fbf71ebb6eb3dced3c64526c58d58
+be7effbf73ce0b21f24baec48f0e7df217437ebc5defe2ec94302662e6c4511f6d3dfaf5c1b34288534515a3c2064e7a7ca87377c746b53aa8bfd71b2ffc327a
+78e0bbe97bf71d2b1242bc3235fa7cd9d5affe7546733c71d12101be1e2b3e3d28843873ae727ccc034f44dd7ffdd69d7b9cbbc5450ff9754aecc5ca6b1e6e3d
+940b687b656a746575dd53b1a18d0d6a97ee8e71d1216fce7cfc7451c5ef56ee507639b4ff2edd872d847878a87f48609ffafa067b7bbbb2cbb54208b75e2ed1
+c303eff3f7fabeeed6f0217e8b5f1c5376a5d6f3e723697922bad70d4057a6f21d95acffa51f7b3068fa84c8405fcf7b7a74bb74f9fb5d87be4bfde2c88d5b77
+94cff6f5ecb570fae8e81181dd9c1cce5da84eff326bdb81d39aaff5ebe3b670fae8a888004747fbd2f29a0d3b4e6edc99ad79da8b7337c799131f8a8b1ee2eb
+eda6e43efdcbac664f5469ebd91f42081f2fd7d79f7bec91087f077bbb82d2aabfafdf3f6d7c64abafc5a17cab2379a5c971c3fb79b956d55cdffeafd32b3764
+deba5ddfeadfa5fbb0070fe8bdfcf5a7fd7d3c7ebc533f3c719910c2de4e356f4af4d3bf0c73ebe95c7ce9ea079b0ec5c786367ba28af689b4bb6e00087457d1
+6a22014042bcdc2800106800008106001bd0e5f6a00180091a0040a0018040030008340010680000810600106800b07aff0fc1e0db14f91389b5000000004945
+4e44ae426082}
+}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+{\field{\*\fldinst SHAPE }{\fldrslt{\shp{\*\shpinst\shpleft1838\shptop113\shpright3830\shpbottom394\shpwr3\shpbxignore\shpbyignore\shpz2{\sp{\sn shapeType}{\sv 2}}{\sp{\sn posrelh}{\sv 3}}{\sp{\sn pVerticies}{\sv 8;4;(3600,0);(0,3600);(0,18000);(3600,21600)}}{\sp{\sn pSegmentInfo}{\sv 2;10;16384;42753;1;43009;1;42753;1;43009;24577;32768}}{\sp{\sn lineJoinStyle}{\sv 2}}{\sp{\sn lineColor}{\sv 10773812}}{\sp{\sn lineBackColor}{\sv 6003403}}{\sp{\sn geoTop}{\sv 0}}{\sp{\sn geoRight}{\sv 21600}}{\sp{\sn geoLeft}{\sv 0}}{\sp{\sn geoBottom}{\sv 21600}}{\sp{\sn fshadowObscured}{\sv 1}}{\sp{\sn fillColor}{\sv 13606770}}{\sp{\sn fillBackColor}{\sv 3170445}}{\sp{\sn fNoFillHitTest}{\sv 1}}{\sp{\sn dyTextTop}{\sv 0}}{\sp{\sn dyTextBottom}{\sv 0}}{\sp{\sn dxTextRight}{\sv 0}}{\sp{\sn dxTextLeft}{\sv 0}}{\sp{\sn anchorText}{\sv 0}}{\sp{\sn adjustValue}{\sv 3600}}{\sp{\sn wzDescription}{\sv }}{\sp{\sn wzName}{\sv Callout}}{\sp{\sn gtextUNICODE}{\sv A shape with text in it}}{\sp{\sn gtextFont}{\sv Liberation Serif}}{\sp{\sn gtextSize}{\sv 720896}}{\sp{\sn rotation}{\sv 0}}}}}}A line of text beside a shape.}
+\par \pard\plain \s1\loch\ilvl0\outlinelevel0\cf20\fs34{\listtext\pard\plain  6. \tab}\ls1 \fi-510\li510\lin510\ql\fi0\li0\lin0\ltrpar{\loch
+{\*\bkmkstart links}{\*\bkmkend links}Links, fields and notes}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+An external link: }{{\field{\*\fldinst HYPERLINK "https://exav.org/" }{\fldrslt {\loch\loch\cf18\ul\ulc0\loch
+exav.org}{}}}\loch
+. An internal link: }{{\field{\*\fldinst HYPERLINK "#intro" }{\fldrslt {\loch\loch\cf18\ul\ulc0\loch
+back to the introduction}{}}}\loch
+. A reference to a bookmark: }{\loch
+{\field{\*\fldinst  REF tables \\h }{\fldrslt }}}{\loch
+.}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+Fields: this document is titled \u8220\'93}{\loch
+{\field{\*\fldinst  TITLE }{\fldrslt Harbour handbook}}}{\loch
+\u8221\'94, and this line is on page }{\loch
+{\field{\*\fldinst  PAGE }{\fldrslt 4}}}{\loch
+. A fixed date: }{\loch
+{\field\fldlock{\*\fldinst  DATE \\@"dd/MM/yyyy" }{\fldrslt 01/01/2000}}}{\loch
+.}
+\par \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+A comment is attached to this word}{
+{\*\atnid }{\*\atnauthor exav}\chatn{\*\annotation{\*\atndate -968816640}\loch\ltrpar\loch{\rtlch\af10\alang1023 \ltrch\lang1023\langfe1023\loch\lang1023\kerning0\fs24\dbch\langfe1023\af10\loch
+A comment: the viewer shows or ignores it.}}}{\loch
+. A change that was tracked: }{\revised\revauth1\revdttm-968816640 \loch
+this text was inserted}{\loch
+, }{\deleted\revauthdel1\revdttmdel-968816640 \loch
+some deleted words }{\loch
+and some text was deleted before this one.}
+\par \ql\fi-283\li283\lin283\ltrpar\pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+Citations [1] [2]. }{{\super \loch \chftn{\*\footnote \chftn\pard\plain \s51\loch\fi-283\li283\lin283\fs18{\loch
+\tab A second footnote, with }{\loch\cs16\loch\i\loch
+emphasis}{\loch
+.}
+}}
+}
+\par \pard\plain \s41\ql\ltrpar{\loch
+{\*\bkmkstart wide}{\*\bkmkend wide}Wide table (landscape)}
+\par \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx12727\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat20\cellx13890\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Month}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 1}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 2}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 3}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 4}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 5}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 6}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 7}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 8}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 9}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Berth 10}\cell\pard\plain \s57\loch\qc\cf8\b\intbl\qc\ltrpar{\loch
+Total}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Jan}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+46}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Feb}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+53}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Mar}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+51}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Apr}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+49}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+May}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+47}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Jun}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+54}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Jul}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+52}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Aug}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+50}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Sep}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+48}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Oct}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+46}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Nov}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+53}\cell\row\pard \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx1157\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx2314\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx3471\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx4628\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx5785\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx6942\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx8099\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx9256\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx10413\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx11570\clbrdrt\brdrs\brdrw10\brdrcf0\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\cellx12727\clbrdrt\brdrs\brdrw30\brdrcf1\clpadfl3\clpadl57\clbrdrl\brdrs\brdrw10\brdrcf0\clpadft3\clpadt57\clbrdrb\brdrs\brdrw10\brdrcf0\clpadfb3\clpadb57\clbrdrr\brdrs\brdrw10\brdrcf0\clpadfr3\clpadr57\clcbpat22\cellx13890\pard\plain \s56\intbl\ql\ltrpar{\loch
+Dec}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+2}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+7}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+3}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+8}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+4}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+9}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+5}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+1}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+6}\cell\pard\plain \s58\loch\qr\intbl\qr\ltrpar{\loch
+51}\cell\row\pard \pard\plain \s34\loch\sl300\slmult1\sb0\sa125\sl300\slmult1\ql\sb0\sa125\ltrpar{\loch
+Nights let at each berth, by month.}
+\par }
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/converted/workbook.fods b/crates/exav-viewer/demo/examples/files/converted/workbook.fods
new file mode 100644
index 00000000..51e83c59
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/converted/workbook.fods
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Harbour workbook</dc:title><dc:subject>A workbook made for the exav demo (CC0-1.0)</dc:subject><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry>
+<config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
+<config:config-item-map-named config:name="Tables"><config:config-item-map-entry config:name="Budget">
+<config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>
+<config:config-item config:name="VerticalSplitPosition" config:type="int">3</config:config-item><config:config-item config:name="PositionBottom" config:type="int">3</config:config-item>
+</config:config-item-map-entry><config:config-item-map-entry config:name="Data">
+<config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>
+<config:config-item config:name="VerticalSplitPosition" config:type="int">1</config:config-item><config:config-item config:name="PositionBottom" config:type="int">1</config:config-item>
+</config:config-item-map-entry></config:config-item-map-named></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set></office:settings>
+<office:font-face-decls><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"/></office:font-face-decls>
+<office:styles>
+<style:default-style style:family="table-cell"><style:text-properties style:font-name="Liberation Sans" fo:font-size="10pt"/></style:default-style>
+<number:currency-style style:name="NEUR"><number:currency-symbol number:language="en" number:country="IE">€</number:currency-symbol><number:number number:decimal-places="0" number:min-integer-digits="1" number:grouping="true"/></number:currency-style>
+<number:currency-style style:name="NEUR2"><number:currency-symbol number:language="en" number:country="IE">€</number:currency-symbol><number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:currency-style>
+<number:percentage-style style:name="NPCT"><number:number number:decimal-places="1" number:min-integer-digits="1"/><number:text>%</number:text></number:percentage-style>
+<number:date-style style:name="NDATE"><number:day number:style="long"/><number:text>/</number:text><number:month number:style="long"/><number:text>/</number:text><number:year number:style="long"/></number:date-style>
+<style:style style:name="Default" style:family="table-cell"/>
+<style:style style:name="title" style:family="table-cell"><style:table-cell-properties fo:background-color="#0b4f6c" style:vertical-align="middle"/><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="note" style:family="table-cell"><style:text-properties fo:font-style="italic" fo:color="#666666"/></style:style>
+<style:style style:name="head" style:family="table-cell"><style:table-cell-properties fo:background-color="#146c94" fo:border-bottom="1.5pt solid #000000"/><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="label" style:family="table-cell"><style:table-cell-properties fo:border-bottom="0.5pt solid #cccccc"/></style:style>
+<style:style style:name="labelb" style:family="table-cell"><style:table-cell-properties fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="input" style:family="table-cell"><style:table-cell-properties fo:background-color="#fff6cc" fo:border="0.5pt solid #d6b656"/></style:style>
+<style:style style:name="eur" style:family="table-cell" style:data-style-name="NEUR"><style:table-cell-properties fo:border-bottom="0.5pt solid #cccccc"/></style:style>
+<style:style style:name="eurb" style:family="table-cell" style:data-style-name="NEUR"><style:table-cell-properties fo:background-color="#e8f1f5" fo:border-bottom="0.5pt solid #cccccc"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="eurtot" style:family="table-cell" style:data-style-name="NEUR"><style:table-cell-properties fo:background-color="#e8f1f5" fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="eur2" style:family="table-cell" style:data-style-name="NEUR2"/>
+<style:style style:name="pct" style:family="table-cell" style:data-style-name="NPCT"><style:table-cell-properties fo:border-bottom="0.5pt solid #cccccc"/></style:style>
+<style:style style:name="pcttot" style:family="table-cell" style:data-style-name="NPCT"><style:table-cell-properties fo:background-color="#e8f1f5" fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="date" style:family="table-cell" style:data-style-name="NDATE"/>
+<style:style style:name="bad" style:family="table-cell"><style:table-cell-properties fo:background-color="#f8d7da"/><style:text-properties fo:color="#842029"/></style:style>
+<style:style style:name="good" style:family="table-cell"><style:table-cell-properties fo:background-color="#d1e7dd"/><style:text-properties fo:color="#0f5132"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<style:style style:name="co-a" style:family="table-column"><style:table-column-properties style:column-width="4.2cm"/></style:style>
+<style:style style:name="co-n" style:family="table-column"><style:table-column-properties style:column-width="2.4cm"/></style:style>
+<style:style style:name="co-t" style:family="table-column"><style:table-column-properties style:column-width="2.8cm"/></style:style>
+<style:style style:name="co-p" style:family="table-column"><style:table-column-properties style:column-width="2cm"/></style:style>
+<style:style style:name="co-d" style:family="table-column"><style:table-column-properties style:column-width="2.6cm"/></style:style>
+<style:style style:name="ro-title" style:family="table-row"><style:table-row-properties style:row-height="1.1cm"/></style:style>
+<style:style style:name="ta1" style:family="table" style:master-page-name="Default"><style:table-properties table:display="true" style:writing-mode="lr-tb"/></style:style>
+<style:style style:name="gr1" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none"/></style:style>
+</office:automatic-styles>
+<office:master-styles><style:master-page style:name="Default" style:page-layout-name="pm1"/></office:master-styles>
+<office:body><office:spreadsheet>
+<table:content-validations><table:content-validation table:name="val1" table:condition="of:cell-content-is-in-list(&quot;Berths let&quot;;&quot;Visitors&quot;;&quot;Shop&quot;;&quot;Fuel&quot;;&quot;Repairs&quot;)" table:allow-empty-cell="true" table:display-list="unsorted" table:base-cell-address="Budget.B14"><table:error-message table:display="true" table:message-type="stop" table:title="Not a category">Choose one of the five categories.</table:error-message></table:content-validation></table:content-validations>
+<table:table table:name="Budget" table:style-name="ta1"><table:table-column table:style-name="co-a"/><table:table-column table:style-name="co-n" table:number-columns-repeated="6"/><table:table-column table:style-name="co-t"/><table:table-column table:style-name="co-p"/><table:table-row table:style-name="ro-title"><table:table-cell table:style-name="title" table:number-columns-spanned="9" table:number-rows-spanned="1" office:value-type="string"><text:p>Harbour budget, first half</text:p></table:table-cell><table:covered-table-cell/><table:covered-table-cell/><table:covered-table-cell/><table:covered-table-cell/><table:covered-table-cell/><table:covered-table-cell/><table:covered-table-cell/><table:covered-table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="note" office:value-type="string"><text:p>Amounts in euros; the totals are formulas.</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="head" office:value-type="string"><text:p>Category</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Jan</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Feb</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Mar</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Apr</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>May</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Jun</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Total</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Share</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Berths let</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="11200"><text:p>11200</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="11800"><text:p>11800</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="12100"><text:p>12100</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="15400"><text:p>15400</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="21800"><text:p>21800</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="24900"><text:p>24900</text:p></table:table-cell><table:table-cell table:style-name="eurb" table:formula="of:=SUM([.B4:.G4])" office:value-type="float" office:value="97200"><text:p>97200</text:p></table:table-cell><table:table-cell table:style-name="pct" table:formula="of:=[.H4]/[.H$9]" office:value-type="float" office:value="0.572775486152033"><text:p>0.572775486152033</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Visitors</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="3100"><text:p>3100</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="3300"><text:p>3300</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="4800"><text:p>4800</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="8200"><text:p>8200</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="15600"><text:p>15600</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="19200"><text:p>19200</text:p></table:table-cell><table:table-cell table:style-name="eurb" table:formula="of:=SUM([.B5:.G5])" office:value-type="float" office:value="54200"><text:p>54200</text:p></table:table-cell><table:table-cell table:style-name="pct" table:formula="of:=[.H5]/[.H$9]" office:value-type="float" office:value="0.319387153800825"><text:p>0.319387153800825</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="1200"><text:p>1200</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="1100"><text:p>1100</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="1500"><text:p>1500</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="2600"><text:p>2600</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="4100"><text:p>4100</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="5200"><text:p>5200</text:p></table:table-cell><table:table-cell table:style-name="eurb" table:formula="of:=SUM([.B6:.G6])" office:value-type="float" office:value="15700"><text:p>15700</text:p></table:table-cell><table:table-cell table:style-name="pct" table:formula="of:=[.H6]/[.H$9]" office:value-type="float" office:value="0.09251620506776664"><text:p>0.09251620506776664</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="900"><text:p>900</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="800"><text:p>800</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="1100"><text:p>1100</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="1900"><text:p>1900</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="3300"><text:p>3300</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="4400"><text:p>4400</text:p></table:table-cell><table:table-cell table:style-name="eurb" table:formula="of:=SUM([.B7:.G7])" office:value-type="float" office:value="12400"><text:p>12400</text:p></table:table-cell><table:table-cell table:style-name="pct" table:formula="of:=[.H7]/[.H$9]" office:value-type="float" office:value="0.07307012374779022"><text:p>0.07307012374779022</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Repairs</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="-2100"><text:p>-2100</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="-900"><text:p>-900</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="-3300"><text:p>-3300</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="-1500"><text:p>-1500</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="-800"><text:p>-800</text:p></table:table-cell><table:table-cell table:style-name="eur" office:value-type="float" office:value="-1200"><text:p>-1200</text:p></table:table-cell><table:table-cell table:style-name="eurb" table:formula="of:=SUM([.B8:.G8])" office:value-type="float" office:value="-9800"><text:p>-9800</text:p></table:table-cell><table:table-cell table:style-name="pct" table:formula="of:=[.H8]/[.H$9]" office:value-type="float" office:value="-0.05774896876841485"><text:p>-0.05774896876841485</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="labelb" office:value-type="string"><text:p>Net</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.B4:.B8])" office:value-type="float" office:value="14300"><text:p>14300</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.C4:.C8])" office:value-type="float" office:value="16100"><text:p>16100</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.D4:.D8])" office:value-type="float" office:value="16200"><text:p>16200</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.E4:.E8])" office:value-type="float" office:value="26600"><text:p>26600</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.F4:.F8])" office:value-type="float" office:value="44000"><text:p>44000</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.G4:.G8])" office:value-type="float" office:value="52500"><text:p>52500</text:p></table:table-cell><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.H4:.H8])" office:value-type="float" office:value="169700"><text:p>169700</text:p></table:table-cell><table:table-cell table:style-name="pcttot" table:formula="of:=SUM([.I4:.I8])" office:value-type="float" office:value="1"><text:p>1</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="labelb" office:value-type="string"><text:p>Averages and checks</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Average a month</text:p></table:table-cell><table:table-cell table:style-name="eur" table:formula="of:=AVERAGE([.B9:.G9])" office:value-type="float" office:value="28283.333333333332"><text:p>28283.333333333332</text:p></table:table-cell><table:table-cell table:style-name="label" office:value-type="string"><text:p>Best month</text:p></table:table-cell><table:table-cell table:formula="of:=INDEX([.B3:.G3];MATCH(MAX([.B9:.G9]);[.B9:.G9];0))" office:value-type="string" office:string-value="Jun"><text:p>Jun</text:p></table:table-cell><table:table-cell table:style-name="label" office:value-type="string"><text:p>Months in credit</text:p></table:table-cell><table:table-cell table:formula='of:=COUNTIF([.B9:.G9];"&gt;0")' office:value-type="float" office:value="6"><text:p>6</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Largest item</text:p></table:table-cell><table:table-cell table:style-name="eur" table:formula="of:=MAX([.B4:.G8])" office:value-type="float" office:value="24900"><text:p>24900</text:p></table:table-cell><table:table-cell table:style-name="label" office:value-type="string"><text:p>Rounded share of fuel</text:p></table:table-cell><table:table-cell table:style-name="pct" table:formula="of:=ROUND([.I7];3)" office:value-type="float" office:value="0.073"><text:p>0.073</text:p></table:table-cell><table:table-cell table:style-name="label" office:value-type="string"><text:p>Status</text:p></table:table-cell><table:table-cell table:formula='of:=IF([.H9]&gt;0;"surplus";"deficit")' office:value-type="string" office:string-value="surplus"><text:p>surplus</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Lookup: category</text:p></table:table-cell><table:table-cell table:style-name="input" table:content-validation-name="val1" office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell table:style-name="label" office:value-type="string"><text:p>its total</text:p></table:table-cell><table:table-cell table:style-name="eur" table:formula="of:=VLOOKUP([.B14];[.A4:.H8];8;0)" office:value-type="float" office:value="15700"><text:p>15700</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row><table:table-row><table:table-cell table:style-name="label" office:value-type="string"><text:p>Link</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p><text:a xlink:href="https://exav.org/viewer/" xlink:type="simple">exav.org/viewer</text:a></text:p></table:table-cell><table:table-cell table:style-name="label" office:value-type="string"><text:p>Note on a cell</text:p></table:table-cell><table:table-cell office:value-type="string"><office:annotation><dc:creator>exav</dc:creator><text:p>This cell has a comment.</text:p></office:annotation><text:p>hover me</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/><table:table-cell/></table:table-row></table:table>
+<table:table table:name="Data" table:style-name="ta1"><table:table-column table:style-name="co-d"/><table:table-column table:style-name="co-n" table:number-columns-repeated="5"/><table:table-row><table:table-cell table:style-name="head" office:value-type="string"><text:p>Date</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Region</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Product</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Units</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Unit price</text:p></table:table-cell><table:table-cell table:style-name="head" office:value-type="string"><text:p>Amount</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-01"><text:p>01/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="32"><text:p>32</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="15.74"><text:p>15.74</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D2]*[.E2]" office:value-type="float" office:value="503.68"><text:p>503.68</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-02"><text:p>02/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="4"><text:p>4</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="48.47"><text:p>48.47</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D3]*[.E3]" office:value-type="float" office:value="193.88"><text:p>193.88</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-03"><text:p>03/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="34"><text:p>34</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="7.46"><text:p>7.46</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D4]*[.E4]" office:value-type="float" office:value="253.64"><text:p>253.64</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-04"><text:p>04/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="23"><text:p>23</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="27.12"><text:p>27.12</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D5]*[.E5]" office:value-type="float" office:value="623.76"><text:p>623.76</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-06"><text:p>06/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="11.26"><text:p>11.26</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D6]*[.E6]" office:value-type="float" office:value="281.5"><text:p>281.5</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-07"><text:p>07/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="19"><text:p>19</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="44.61"><text:p>44.61</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D7]*[.E7]" office:value-type="float" office:value="847.59"><text:p>847.59</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-08"><text:p>08/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="2"><text:p>2</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="24.69"><text:p>24.69</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D8]*[.E8]" office:value-type="float" office:value="49.38"><text:p>49.38</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-09"><text:p>09/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="31.97"><text:p>31.97</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D9]*[.E9]" office:value-type="float" office:value="159.85"><text:p>159.85</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-11"><text:p>11/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="17"><text:p>17</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="36.03"><text:p>36.03</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D10]*[.E10]" office:value-type="float" office:value="612.51"><text:p>612.51</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-12"><text:p>12/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="17"><text:p>17</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="44.79"><text:p>44.79</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D11]*[.E11]" office:value-type="float" office:value="761.43"><text:p>761.43</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-13"><text:p>13/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="30"><text:p>30</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="18.48"><text:p>18.48</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D12]*[.E12]" office:value-type="float" office:value="554.4"><text:p>554.4</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-14"><text:p>14/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="39.62"><text:p>39.62</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D13]*[.E13]" office:value-type="float" office:value="1505.56"><text:p>1505.56</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-16"><text:p>16/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="26"><text:p>26</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="18.98"><text:p>18.98</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D14]*[.E14]" office:value-type="float" office:value="493.48"><text:p>493.48</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-17"><text:p>17/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="28"><text:p>28</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="2.09"><text:p>2.09</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D15]*[.E15]" office:value-type="float" office:value="58.52"><text:p>58.52</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-18"><text:p>18/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="3"><text:p>3</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="19.31"><text:p>19.31</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D16]*[.E16]" office:value-type="float" office:value="57.93"><text:p>57.93</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-19"><text:p>19/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="20.21"><text:p>20.21</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D17]*[.E17]" office:value-type="float" office:value="767.98"><text:p>767.98</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-21"><text:p>21/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="2"><text:p>2</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="35.94"><text:p>35.94</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D18]*[.E18]" office:value-type="float" office:value="71.88"><text:p>71.88</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-22"><text:p>22/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="35"><text:p>35</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="29.34"><text:p>29.34</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D19]*[.E19]" office:value-type="float" office:value="1026.9"><text:p>1026.9</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-23"><text:p>23/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="8"><text:p>8</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="3.76"><text:p>3.76</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D20]*[.E20]" office:value-type="float" office:value="30.08"><text:p>30.08</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-24"><text:p>24/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="31"><text:p>31</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="43.0"><text:p>43.0</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D21]*[.E21]" office:value-type="float" office:value="1333.0"><text:p>1333.0</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-26"><text:p>26/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="21"><text:p>21</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="7.27"><text:p>7.27</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D22]*[.E22]" office:value-type="float" office:value="152.67"><text:p>152.67</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-27"><text:p>27/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="15"><text:p>15</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="40.31"><text:p>40.31</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D23]*[.E23]" office:value-type="float" office:value="604.65"><text:p>604.65</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-01-28"><text:p>28/01/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="21"><text:p>21</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="14.02"><text:p>14.02</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D24]*[.E24]" office:value-type="float" office:value="294.42"><text:p>294.42</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-01"><text:p>01/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="37"><text:p>37</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="38.55"><text:p>38.55</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D25]*[.E25]" office:value-type="float" office:value="1426.35"><text:p>1426.35</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-03"><text:p>03/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="10"><text:p>10</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="45.02"><text:p>45.02</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D26]*[.E26]" office:value-type="float" office:value="450.2"><text:p>450.2</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-04"><text:p>04/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="12"><text:p>12</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="43.89"><text:p>43.89</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D27]*[.E27]" office:value-type="float" office:value="526.68"><text:p>526.68</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-05"><text:p>05/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="26"><text:p>26</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="50.13"><text:p>50.13</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D28]*[.E28]" office:value-type="float" office:value="1303.38"><text:p>1303.38</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-06"><text:p>06/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="9"><text:p>9</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="40.14"><text:p>40.14</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D29]*[.E29]" office:value-type="float" office:value="361.26"><text:p>361.26</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-08"><text:p>08/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="1"><text:p>1</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="49.56"><text:p>49.56</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D30]*[.E30]" office:value-type="float" office:value="49.56"><text:p>49.56</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-09"><text:p>09/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="27"><text:p>27</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="26.86"><text:p>26.86</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D31]*[.E31]" office:value-type="float" office:value="725.22"><text:p>725.22</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-10"><text:p>10/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="52.95"><text:p>52.95</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D32]*[.E32]" office:value-type="float" office:value="2012.1"><text:p>2012.1</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-11"><text:p>11/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="30"><text:p>30</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="7.93"><text:p>7.93</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D33]*[.E33]" office:value-type="float" office:value="237.9"><text:p>237.9</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-13"><text:p>13/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="24"><text:p>24</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="24.85"><text:p>24.85</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D34]*[.E34]" office:value-type="float" office:value="596.4"><text:p>596.4</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-14"><text:p>14/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="34"><text:p>34</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="29.82"><text:p>29.82</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D35]*[.E35]" office:value-type="float" office:value="1013.88"><text:p>1013.88</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-15"><text:p>15/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="16"><text:p>16</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="42.51"><text:p>42.51</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D36]*[.E36]" office:value-type="float" office:value="680.16"><text:p>680.16</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-16"><text:p>16/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="6"><text:p>6</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="18.93"><text:p>18.93</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D37]*[.E37]" office:value-type="float" office:value="113.58"><text:p>113.58</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-18"><text:p>18/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="17.97"><text:p>17.97</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D38]*[.E38]" office:value-type="float" office:value="449.25"><text:p>449.25</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-19"><text:p>19/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="34"><text:p>34</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="34.58"><text:p>34.58</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D39]*[.E39]" office:value-type="float" office:value="1175.72"><text:p>1175.72</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-20"><text:p>20/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="16"><text:p>16</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="37.55"><text:p>37.55</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D40]*[.E40]" office:value-type="float" office:value="600.8"><text:p>600.8</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-21"><text:p>21/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="16"><text:p>16</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="13.41"><text:p>13.41</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D41]*[.E41]" office:value-type="float" office:value="214.56"><text:p>214.56</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-23"><text:p>23/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="32"><text:p>32</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="45.32"><text:p>45.32</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D42]*[.E42]" office:value-type="float" office:value="1450.24"><text:p>1450.24</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-24"><text:p>24/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="8"><text:p>8</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="45.63"><text:p>45.63</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D43]*[.E43]" office:value-type="float" office:value="365.04"><text:p>365.04</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-25"><text:p>25/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="13"><text:p>13</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="55.42"><text:p>55.42</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D44]*[.E44]" office:value-type="float" office:value="720.46"><text:p>720.46</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-26"><text:p>26/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="23"><text:p>23</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="13.93"><text:p>13.93</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D45]*[.E45]" office:value-type="float" office:value="320.39"><text:p>320.39</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-02-28"><text:p>28/02/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="10"><text:p>10</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="11.8"><text:p>11.8</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D46]*[.E46]" office:value-type="float" office:value="118.0"><text:p>118.0</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-01"><text:p>01/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="34"><text:p>34</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="57.93"><text:p>57.93</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D47]*[.E47]" office:value-type="float" office:value="1969.62"><text:p>1969.62</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-02"><text:p>02/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="37.2"><text:p>37.2</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D48]*[.E48]" office:value-type="float" office:value="1413.6"><text:p>1413.6</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-03"><text:p>03/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="58.29"><text:p>58.29</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D49]*[.E49]" office:value-type="float" office:value="1457.25"><text:p>1457.25</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-05"><text:p>05/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="24"><text:p>24</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="47.82"><text:p>47.82</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D50]*[.E50]" office:value-type="float" office:value="1147.68"><text:p>1147.68</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-06"><text:p>06/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="31"><text:p>31</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="5.14"><text:p>5.14</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D51]*[.E51]" office:value-type="float" office:value="159.34"><text:p>159.34</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-07"><text:p>07/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="21"><text:p>21</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="6.92"><text:p>6.92</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D52]*[.E52]" office:value-type="float" office:value="145.32"><text:p>145.32</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-08"><text:p>08/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="15"><text:p>15</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="13.22"><text:p>13.22</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D53]*[.E53]" office:value-type="float" office:value="198.3"><text:p>198.3</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-10"><text:p>10/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="28"><text:p>28</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="51.8"><text:p>51.8</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D54]*[.E54]" office:value-type="float" office:value="1450.4"><text:p>1450.4</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-11"><text:p>11/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="9"><text:p>9</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="9.35"><text:p>9.35</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D55]*[.E55]" office:value-type="float" office:value="84.15"><text:p>84.15</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-12"><text:p>12/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="3"><text:p>3</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="30.59"><text:p>30.59</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D56]*[.E56]" office:value-type="float" office:value="91.77"><text:p>91.77</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-13"><text:p>13/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="12"><text:p>12</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="51.27"><text:p>51.27</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D57]*[.E57]" office:value-type="float" office:value="615.24"><text:p>615.24</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-15"><text:p>15/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="23"><text:p>23</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="43.07"><text:p>43.07</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D58]*[.E58]" office:value-type="float" office:value="990.61"><text:p>990.61</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-16"><text:p>16/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="38"><text:p>38</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="14.39"><text:p>14.39</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D59]*[.E59]" office:value-type="float" office:value="546.82"><text:p>546.82</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-17"><text:p>17/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="30"><text:p>30</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="42.95"><text:p>42.95</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D60]*[.E60]" office:value-type="float" office:value="1288.5"><text:p>1288.5</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-18"><text:p>18/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="22"><text:p>22</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="5.01"><text:p>5.01</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D61]*[.E61]" office:value-type="float" office:value="110.22"><text:p>110.22</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-20"><text:p>20/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="12"><text:p>12</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="23.36"><text:p>23.36</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D62]*[.E62]" office:value-type="float" office:value="280.32"><text:p>280.32</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-21"><text:p>21/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="27"><text:p>27</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="36.2"><text:p>36.2</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D63]*[.E63]" office:value-type="float" office:value="977.4"><text:p>977.4</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-22"><text:p>22/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="4"><text:p>4</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="40.81"><text:p>40.81</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D64]*[.E64]" office:value-type="float" office:value="163.24"><text:p>163.24</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-23"><text:p>23/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="27"><text:p>27</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="32.34"><text:p>32.34</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D65]*[.E65]" office:value-type="float" office:value="873.18"><text:p>873.18</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-25"><text:p>25/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="12"><text:p>12</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="13.49"><text:p>13.49</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D66]*[.E66]" office:value-type="float" office:value="161.88"><text:p>161.88</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-26"><text:p>26/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="22"><text:p>22</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="30.72"><text:p>30.72</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D67]*[.E67]" office:value-type="float" office:value="675.84"><text:p>675.84</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-27"><text:p>27/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="29.88"><text:p>29.88</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D68]*[.E68]" office:value-type="float" office:value="747.0"><text:p>747.0</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-03-28"><text:p>28/03/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="33.1"><text:p>33.1</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D69]*[.E69]" office:value-type="float" office:value="165.5"><text:p>165.5</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-02"><text:p>02/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="29"><text:p>29</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="24.83"><text:p>24.83</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D70]*[.E70]" office:value-type="float" office:value="720.07"><text:p>720.07</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-03"><text:p>03/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="31"><text:p>31</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="3.14"><text:p>3.14</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D71]*[.E71]" office:value-type="float" office:value="97.34"><text:p>97.34</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-04"><text:p>04/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="13.9"><text:p>13.9</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D72]*[.E72]" office:value-type="float" office:value="347.5"><text:p>347.5</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-05"><text:p>05/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="21"><text:p>21</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="44.99"><text:p>44.99</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D73]*[.E73]" office:value-type="float" office:value="944.79"><text:p>944.79</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-07"><text:p>07/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="27"><text:p>27</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="24.07"><text:p>24.07</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D74]*[.E74]" office:value-type="float" office:value="649.89"><text:p>649.89</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-08"><text:p>08/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="16"><text:p>16</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="54.75"><text:p>54.75</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D75]*[.E75]" office:value-type="float" office:value="876.0"><text:p>876.0</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-09"><text:p>09/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="4"><text:p>4</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="22.23"><text:p>22.23</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D76]*[.E76]" office:value-type="float" office:value="88.92"><text:p>88.92</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-10"><text:p>10/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="16"><text:p>16</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="22.19"><text:p>22.19</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D77]*[.E77]" office:value-type="float" office:value="355.04"><text:p>355.04</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-12"><text:p>12/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="20"><text:p>20</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="7.41"><text:p>7.41</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D78]*[.E78]" office:value-type="float" office:value="148.2"><text:p>148.2</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-13"><text:p>13/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="19"><text:p>19</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="33.71"><text:p>33.71</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D79]*[.E79]" office:value-type="float" office:value="640.49"><text:p>640.49</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-14"><text:p>14/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="3"><text:p>3</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="34.65"><text:p>34.65</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D80]*[.E80]" office:value-type="float" office:value="103.95"><text:p>103.95</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-15"><text:p>15/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="36"><text:p>36</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="45.15"><text:p>45.15</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D81]*[.E81]" office:value-type="float" office:value="1625.4"><text:p>1625.4</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-17"><text:p>17/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="1"><text:p>1</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="50.84"><text:p>50.84</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D82]*[.E82]" office:value-type="float" office:value="50.84"><text:p>50.84</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-18"><text:p>18/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="37"><text:p>37</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="45.15"><text:p>45.15</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D83]*[.E83]" office:value-type="float" office:value="1670.55"><text:p>1670.55</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-19"><text:p>19/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="6"><text:p>6</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="49.57"><text:p>49.57</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D84]*[.E84]" office:value-type="float" office:value="297.42"><text:p>297.42</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-20"><text:p>20/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="32"><text:p>32</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="16.72"><text:p>16.72</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D85]*[.E85]" office:value-type="float" office:value="535.04"><text:p>535.04</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-22"><text:p>22/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="22"><text:p>22</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="21.88"><text:p>21.88</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D86]*[.E86]" office:value-type="float" office:value="481.36"><text:p>481.36</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-23"><text:p>23/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="19"><text:p>19</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="17.18"><text:p>17.18</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D87]*[.E87]" office:value-type="float" office:value="326.42"><text:p>326.42</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-24"><text:p>24/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="20"><text:p>20</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="20.44"><text:p>20.44</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D88]*[.E88]" office:value-type="float" office:value="408.8"><text:p>408.8</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-25"><text:p>25/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="23"><text:p>23</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="37.88"><text:p>37.88</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D89]*[.E89]" office:value-type="float" office:value="871.24"><text:p>871.24</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-27"><text:p>27/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="7"><text:p>7</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="8.06"><text:p>8.06</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D90]*[.E90]" office:value-type="float" office:value="56.42"><text:p>56.42</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-04-28"><text:p>28/04/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="23"><text:p>23</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="27.66"><text:p>27.66</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D91]*[.E91]" office:value-type="float" office:value="636.18"><text:p>636.18</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-01"><text:p>01/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="37"><text:p>37</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="42.99"><text:p>42.99</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D92]*[.E92]" office:value-type="float" office:value="1590.63"><text:p>1590.63</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-02"><text:p>02/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="16"><text:p>16</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="7.11"><text:p>7.11</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D93]*[.E93]" office:value-type="float" office:value="113.76"><text:p>113.76</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-04"><text:p>04/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="31.73"><text:p>31.73</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D94]*[.E94]" office:value-type="float" office:value="158.65"><text:p>158.65</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-05"><text:p>05/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="7"><text:p>7</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="25.47"><text:p>25.47</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D95]*[.E95]" office:value-type="float" office:value="178.29"><text:p>178.29</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-06"><text:p>06/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="35"><text:p>35</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="21.31"><text:p>21.31</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D96]*[.E96]" office:value-type="float" office:value="745.85"><text:p>745.85</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-07"><text:p>07/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="26"><text:p>26</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="13.44"><text:p>13.44</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D97]*[.E97]" office:value-type="float" office:value="349.44"><text:p>349.44</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-09"><text:p>09/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="34"><text:p>34</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="16.15"><text:p>16.15</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D98]*[.E98]" office:value-type="float" office:value="549.1"><text:p>549.1</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-10"><text:p>10/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="37"><text:p>37</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="10.53"><text:p>10.53</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D99]*[.E99]" office:value-type="float" office:value="389.61"><text:p>389.61</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-11"><text:p>11/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="6"><text:p>6</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="21.7"><text:p>21.7</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D100]*[.E100]" office:value-type="float" office:value="130.2"><text:p>130.2</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-12"><text:p>12/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="11"><text:p>11</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="15.06"><text:p>15.06</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D101]*[.E101]" office:value-type="float" office:value="165.66"><text:p>165.66</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-14"><text:p>14/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="25"><text:p>25</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="56.34"><text:p>56.34</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D102]*[.E102]" office:value-type="float" office:value="1408.5"><text:p>1408.5</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-15"><text:p>15/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="21"><text:p>21</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="9.31"><text:p>9.31</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D103]*[.E103]" office:value-type="float" office:value="195.51"><text:p>195.51</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-16"><text:p>16/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="31"><text:p>31</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="40.75"><text:p>40.75</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D104]*[.E104]" office:value-type="float" office:value="1263.25"><text:p>1263.25</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-17"><text:p>17/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="17"><text:p>17</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="53.31"><text:p>53.31</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D105]*[.E105]" office:value-type="float" office:value="906.27"><text:p>906.27</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-19"><text:p>19/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="37"><text:p>37</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="10.33"><text:p>10.33</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D106]*[.E106]" office:value-type="float" office:value="382.21"><text:p>382.21</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-20"><text:p>20/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="39"><text:p>39</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="33.16"><text:p>33.16</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D107]*[.E107]" office:value-type="float" office:value="1293.24"><text:p>1293.24</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-21"><text:p>21/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="4"><text:p>4</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="5.08"><text:p>5.08</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D108]*[.E108]" office:value-type="float" office:value="20.32"><text:p>20.32</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-22"><text:p>22/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="35"><text:p>35</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="36.12"><text:p>36.12</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D109]*[.E109]" office:value-type="float" office:value="1264.2"><text:p>1264.2</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-24"><text:p>24/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="2"><text:p>2</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="46.53"><text:p>46.53</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D110]*[.E110]" office:value-type="float" office:value="93.06"><text:p>93.06</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-25"><text:p>25/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="7"><text:p>7</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="56.38"><text:p>56.38</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D111]*[.E111]" office:value-type="float" office:value="394.66"><text:p>394.66</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-26"><text:p>26/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="12"><text:p>12</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="2.52"><text:p>2.52</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D112]*[.E112]" office:value-type="float" office:value="30.24"><text:p>30.24</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-05-27"><text:p>27/05/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="21"><text:p>21</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="5.73"><text:p>5.73</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D113]*[.E113]" office:value-type="float" office:value="120.33"><text:p>120.33</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-01"><text:p>01/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="51.14"><text:p>51.14</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D114]*[.E114]" office:value-type="float" office:value="255.7"><text:p>255.7</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-02"><text:p>02/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="17"><text:p>17</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="15.73"><text:p>15.73</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D115]*[.E115]" office:value-type="float" office:value="267.41"><text:p>267.41</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-03"><text:p>03/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="25.51"><text:p>25.51</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D116]*[.E116]" office:value-type="float" office:value="127.55"><text:p>127.55</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-04"><text:p>04/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Mooring</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="27"><text:p>27</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="17.38"><text:p>17.38</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D117]*[.E117]" office:value-type="float" office:value="469.26"><text:p>469.26</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-06"><text:p>06/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>West</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Power</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="39"><text:p>39</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="19.88"><text:p>19.88</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D118]*[.E118]" office:value-type="float" office:value="775.32"><text:p>775.32</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-07"><text:p>07/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>East</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Fuel</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="28"><text:p>28</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="23.57"><text:p>23.57</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D119]*[.E119]" office:value-type="float" office:value="659.96"><text:p>659.96</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-08"><text:p>08/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>North</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Shop</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="18"><text:p>18</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="30.72"><text:p>30.72</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D120]*[.E120]" office:value-type="float" office:value="552.96"><text:p>552.96</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-06-09"><text:p>09/06/2000</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>South</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Water</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="30"><text:p>30</text:p></table:table-cell><table:table-cell table:style-name="eur2" office:value-type="float" office:value="47.47"><text:p>47.47</text:p></table:table-cell><table:table-cell table:style-name="eur2" table:formula="of:=[.D121]*[.E121]" office:value-type="float" office:value="1424.1"><text:p>1424.1</text:p></table:table-cell></table:table-row><table:table-row><table:table-cell table:style-name="labelb" office:value-type="string"><text:p>Total</text:p></table:table-cell><table:table-cell/><table:table-cell/><table:table-cell table:style-name="eurtot" table:formula="of:=SUM([.D2:.D121])" office:value-type="float" office:value="2479"><text:p>2479</text:p></table:table-cell><table:table-cell/><table:table-cell table:style-name="eurtot" table:formula="of:=SUBTOTAL(9;[.F2:.F121])" office:value-type="float" office:value="70070.1"><text:p>70070.1</text:p></table:table-cell></table:table-row></table:table>
+<table:table table:name="Charts" table:style-name="ta1"><table:shapes><draw:frame draw:style-name="gr1" draw:name="Bar chart" table:end-cell-address="Charts.H19" table:end-x="0.3cm" table:end-y="0.3cm" svg:width="14cm" svg:height="8cm" svg:x="0.5cm" svg:y="0.5cm"><draw:object><office:document office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"><office:automatic-styles><style:style style:name="chs0" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#146c94" draw:fill-color="#146c94"/></style:style><style:style style:name="chs1" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#f6a01a" draw:fill-color="#f6a01a"/></style:style><style:style style:name="chs2" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#2c7a4b" draw:fill-color="#2c7a4b"/></style:style><style:style style:name="chs3" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#c0392b" draw:fill-color="#c0392b"/></style:style></office:automatic-styles><office:body><office:chart>
+<chart:chart chart:class="chart:bar" svg:width="15cm" svg:height="8.5cm"><chart:title><text:p>Spending by category</text:p></chart:title><chart:legend chart:legend-position="end"/>
+<chart:plot-area table:cell-range-address="Budget.$A$3:.$G$7" chart:data-source-has-labels="both"><chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="Budget.$A$4:.$A$7"/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y"><chart:grid chart:class="major"/></chart:axis><chart:series chart:values-cell-range-address="Budget.$B$4:.$B$7" chart:label-cell-address="Budget.$B$3" chart:class="chart:bar" chart:style-name="chs0"><chart:data-point chart:repeated="1"/></chart:series><chart:series chart:values-cell-range-address="Budget.$G$4:.$G$7" chart:label-cell-address="Budget.$G$3" chart:class="chart:bar" chart:style-name="chs1"><chart:data-point chart:repeated="1"/></chart:series></chart:plot-area></chart:chart></office:chart></office:body></office:document></draw:object></draw:frame><draw:frame draw:style-name="gr1" draw:name="Line chart" table:end-cell-address="Charts.P19" table:end-x="0.3cm" table:end-y="0.3cm" svg:width="14cm" svg:height="8cm" svg:x="15cm" svg:y="0.5cm"><draw:object><office:document office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"><office:automatic-styles><style:style style:name="chs0" style:family="chart"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#146c94" draw:fill-color="#146c94"/></style:style><style:style style:name="chs1" style:family="chart"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#f6a01a" draw:fill-color="#f6a01a"/></style:style><style:style style:name="chs2" style:family="chart"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#2c7a4b" draw:fill-color="#2c7a4b"/></style:style><style:style style:name="chs3" style:family="chart"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#c0392b" draw:fill-color="#c0392b"/></style:style></office:automatic-styles><office:body><office:chart>
+<chart:chart chart:class="chart:line" svg:width="15cm" svg:height="8.5cm"><chart:title><text:p>Net income by month</text:p></chart:title><chart:legend chart:legend-position="end"/>
+<chart:plot-area table:cell-range-address="Budget.$A$3:.$G$3" chart:data-source-has-labels="both"><chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="Budget.$B$3:.$G$3"/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y"><chart:grid chart:class="major"/></chart:axis><chart:series chart:values-cell-range-address="Budget.$B$9:.$G$9" chart:label-cell-address="Budget.$A$9" chart:class="chart:line" chart:style-name="chs0"><chart:data-point chart:repeated="1"/></chart:series></chart:plot-area></chart:chart></office:chart></office:body></office:document></draw:object></draw:frame><draw:frame draw:style-name="gr1" draw:name="Pie chart" table:end-cell-address="Charts.H38" table:end-x="0.3cm" table:end-y="0.3cm" svg:width="14cm" svg:height="8cm" svg:x="0.5cm" svg:y="9cm"><draw:object><office:document office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"><office:automatic-styles><style:style style:name="chs0" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#146c94" draw:fill-color="#146c94"/></style:style><style:style style:name="chs1" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#f6a01a" draw:fill-color="#f6a01a"/></style:style><style:style style:name="chs2" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#2c7a4b" draw:fill-color="#2c7a4b"/></style:style><style:style style:name="chs3" style:family="chart"><style:graphic-properties draw:stroke="none" svg:stroke-color="#c0392b" draw:fill-color="#c0392b"/></style:style><style:style style:name="pt0" style:family="chart"><style:graphic-properties draw:fill-color="#146c94"/></style:style><style:style style:name="pt1" style:family="chart"><style:graphic-properties draw:fill-color="#f6a01a"/></style:style><style:style style:name="pt2" style:family="chart"><style:graphic-properties draw:fill-color="#2c7a4b"/></style:style><style:style style:name="pt3" style:family="chart"><style:graphic-properties draw:fill-color="#c0392b"/></style:style><style:style style:name="pt4" style:family="chart"><style:graphic-properties draw:fill-color="#8e44ad"/></style:style></office:automatic-styles><office:body><office:chart>
+<chart:chart chart:class="chart:circle" svg:width="15cm" svg:height="8.5cm"><chart:title><text:p>Share of the total</text:p></chart:title><chart:legend chart:legend-position="end"/>
+<chart:plot-area table:cell-range-address="Budget.$A$4:.$A$8" chart:data-source-has-labels="both"><chart:series chart:values-cell-range-address="Budget.$I$4:.$I$8" chart:label-cell-address="Budget.$I$3" chart:class="chart:circle" chart:style-name="chs0"><chart:data-point chart:style-name="pt0"/><chart:data-point chart:style-name="pt1"/><chart:data-point chart:style-name="pt2"/><chart:data-point chart:style-name="pt3"/><chart:data-point chart:style-name="pt4"/></chart:series></chart:plot-area></chart:chart></office:chart></office:body></office:document></draw:object></draw:frame></table:shapes><table:table-column/><table:table-row><table:table-cell office:value-type="string"><text:p/></table:table-cell></table:table-row></table:table>
+<table:named-expressions><table:named-range table:name="Spending" table:base-cell-address="$Budget.$B$4" table:cell-range-address="$Budget.$B$4:.$G$8"/><table:named-range table:name="NetByMonth" table:base-cell-address="$Budget.$B$9" table:cell-range-address="$Budget.$B$9:.$G$9"/></table:named-expressions>
+<table:database-ranges><table:database-range table:name="SalesData" table:target-range-address="Data.A1:.F121" table:display-filter-buttons="true" table:contains-header="true"/></table:database-ranges>
+</office:spreadsheet></office:body>
+</office:document>
diff --git a/crates/exav-viewer/demo/examples/files/converted/workbook.ods b/crates/exav-viewer/demo/examples/files/converted/workbook.ods
new file mode 100644
index 00000000..7633e613
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/workbook.ods differ
diff --git a/crates/exav-viewer/demo/examples/files/converted/workbook.xls b/crates/exav-viewer/demo/examples/files/converted/workbook.xls
new file mode 100644
index 00000000..d6792cf7
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/converted/workbook.xls differ
diff --git a/crates/exav-viewer/demo/examples/files/ifc/house.ifc b/crates/exav-viewer/demo/examples/files/ifc/house.ifc
new file mode 100644
index 00000000..4d68171b
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/ifc/house.ifc
@@ -0,0 +1,1438 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
+FILE_NAME('house.ifc','2000-01-01T00:00:00',('exav'),('exav'),'exav make-ifc.py','exav make-ifc.py','');
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCCARTESIANPOINT((0.0,0.0,0.0));
+#2=IFCAXIS2PLACEMENT3D(#1,$,$);
+#3=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,#2,$);
+#4=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#3,$,.MODEL_VIEW.,$);
+#5=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
+#6=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
+#7=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
+#8=IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.);
+#9=IFCUNITASSIGNMENT((#5,#6,#7,#8));
+#10=IFCPROJECT('0iiDjLHJDU6JvG2gAu0Vub',$,'Example house',$,$,$,$,(#3),#9);
+#11=IFCAXIS2PLACEMENT3D(#1,$,$);
+#12=IFCLOCALPLACEMENT($,#11);
+#13=IFCSITE('2KMASZqYy2AlEWEkUMXo6G',$,'Site',$,$,#12,$,$,.ELEMENT.,$,$,$,$,$);
+#14=IFCAXIS2PLACEMENT3D(#1,$,$);
+#15=IFCLOCALPLACEMENT(#12,#14);
+#16=IFCBUILDING('2FwUvlYrJqXdTAReyC5SSO',$,'House',$,$,#15,$,$,.ELEMENT.,$,$,$);
+#17=IFCAXIS2PLACEMENT3D(#1,$,$);
+#18=IFCLOCALPLACEMENT(#15,#17);
+#19=IFCBUILDINGSTOREY('09NtmAGcpl5Gr$RW07XYjX',$,'Ground floor',$,$,#18,$,$,.ELEMENT.,0.0);
+#20=IFCCARTESIANPOINT((0.0,0.0,3.0));
+#21=IFCAXIS2PLACEMENT3D(#20,$,$);
+#22=IFCLOCALPLACEMENT(#15,#21);
+#23=IFCBUILDINGSTOREY('1galn8M2KF8wHmG39RqQr2',$,'First floor',$,$,#22,$,$,.ELEMENT.,3.0);
+#24=IFCRELAGGREGATES('2sYclOCbti5hhc7FQxED0l',$,$,$,#10,(#13));
+#25=IFCRELAGGREGATES('2_Pl7nDxC1Hp2Ec1PpnkOB',$,$,$,#13,(#16));
+#26=IFCRELAGGREGATES('3rIlw0cwcrgHJsm1Z0AedM',$,$,$,#16,(#19,#23));
+#27=IFCMATERIAL('Brick, rendered');
+#28=IFCDIRECTION((0.0,0.0,1.0));
+#29=IFCDIRECTION((1.0,0.0,0.0));
+#30=IFCAXIS2PLACEMENT3D(#1,#28,#29);
+#31=IFCLOCALPLACEMENT(#18,#30);
+#32=IFCCARTESIANPOINT((5.0,0.0));
+#33=IFCAXIS2PLACEMENT2D(#32,$);
+#34=IFCRECTANGLEPROFILEDEF(.AREA.,$,#33,10.0,0.3);
+#35=IFCAXIS2PLACEMENT3D(#1,$,$);
+#36=IFCDIRECTION((0.0,0.0,1.0));
+#37=IFCEXTRUDEDAREASOLID(#34,#35,#36,2.8);
+#38=IFCCOLOURRGB($,0.93,0.9,0.82);
+#39=IFCSURFACESTYLERENDERING(#38,0.0,$,$,$,$,$,$,.FLAT.);
+#40=IFCSURFACESTYLE('Render',.BOTH.,(#39));
+#41=IFCSTYLEDITEM(#37,(#40),$);
+#42=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#37));
+#43=IFCPRODUCTDEFINITIONSHAPE($,$,(#42));
+#44=IFCWALL('1jv90fDbLSS0zj$PR7F36D',$,'G-South',$,$,#31,#43,$,.STANDARD.);
+#45=IFCCARTESIANPOINT((1.6,0.0,0.9));
+#46=IFCAXIS2PLACEMENT3D(#45,$,$);
+#47=IFCLOCALPLACEMENT(#31,#46);
+#48=IFCCARTESIANPOINT((0.0,0.0));
+#49=IFCAXIS2PLACEMENT2D(#48,$);
+#50=IFCRECTANGLEPROFILEDEF(.AREA.,$,#49,1.2,0.5);
+#51=IFCAXIS2PLACEMENT3D(#1,$,$);
+#52=IFCDIRECTION((0.0,0.0,1.0));
+#53=IFCEXTRUDEDAREASOLID(#50,#51,#52,1.3);
+#54=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#53));
+#55=IFCPRODUCTDEFINITIONSHAPE($,$,(#54));
+#56=IFCOPENINGELEMENT('2tx3XkEeRvnV9Jw3rqVVqa',$,'Opening G-South 1',$,$,#47,#55,$,.OPENING.);
+#57=IFCRELVOIDSELEMENT('3EXGoG4S8oR6WagG$aChFm',$,$,$,#44,#56);
+#58=IFCAXIS2PLACEMENT3D(#45,$,$);
+#59=IFCLOCALPLACEMENT(#31,#58);
+#60=IFCAXIS2PLACEMENT2D(#48,$);
+#61=IFCRECTANGLEPROFILEDEF(.AREA.,$,#60,1.2,0.1);
+#62=IFCAXIS2PLACEMENT3D(#1,$,$);
+#63=IFCDIRECTION((0.0,0.0,1.0));
+#64=IFCEXTRUDEDAREASOLID(#61,#62,#63,1.3);
+#65=IFCCOLOURRGB($,0.95,0.95,0.95);
+#66=IFCSURFACESTYLERENDERING(#65,0.0,$,$,$,$,$,$,.FLAT.);
+#67=IFCSURFACESTYLE('Frame',.BOTH.,(#66));
+#68=IFCSTYLEDITEM(#64,(#67),$);
+#69=IFCAXIS2PLACEMENT2D(#48,$);
+#70=IFCRECTANGLEPROFILEDEF(.AREA.,$,#69,1.08,0.04);
+#71=IFCCARTESIANPOINT((0.0,0.0,0.06));
+#72=IFCAXIS2PLACEMENT3D(#71,$,$);
+#73=IFCDIRECTION((0.0,0.0,1.0));
+#74=IFCEXTRUDEDAREASOLID(#70,#72,#73,1.1800000000000002);
+#75=IFCCOLOURRGB($,0.55,0.78,0.92);
+#76=IFCSURFACESTYLERENDERING(#75,0.55,$,$,$,$,$,$,.FLAT.);
+#77=IFCSURFACESTYLE('Glass',.BOTH.,(#76));
+#78=IFCSTYLEDITEM(#74,(#77),$);
+#79=IFCAXIS2PLACEMENT2D(#48,$);
+#80=IFCRECTANGLEPROFILEDEF(.AREA.,$,#79,0.05,0.12);
+#81=IFCAXIS2PLACEMENT3D(#1,$,$);
+#82=IFCDIRECTION((0.0,0.0,1.0));
+#83=IFCEXTRUDEDAREASOLID(#80,#81,#82,1.3);
+#84=IFCSTYLEDITEM(#83,(#67),$);
+#85=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#64,#74,#83));
+#86=IFCPRODUCTDEFINITIONSHAPE($,$,(#85));
+#87=IFCWINDOW('0k7vnn7mWSodkjPeo9hnOL',$,'Window G-South 1',$,$,#59,#86,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#88=IFCRELFILLSELEMENT('2RMS4yJ$3Ov9e_FWsCNrjn',$,$,$,#56,#87);
+#89=IFCCARTESIANPOINT((4.2,0.0,0.9));
+#90=IFCAXIS2PLACEMENT3D(#89,$,$);
+#91=IFCLOCALPLACEMENT(#31,#90);
+#92=IFCAXIS2PLACEMENT2D(#48,$);
+#93=IFCRECTANGLEPROFILEDEF(.AREA.,$,#92,1.2,0.5);
+#94=IFCAXIS2PLACEMENT3D(#1,$,$);
+#95=IFCDIRECTION((0.0,0.0,1.0));
+#96=IFCEXTRUDEDAREASOLID(#93,#94,#95,1.3);
+#97=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#96));
+#98=IFCPRODUCTDEFINITIONSHAPE($,$,(#97));
+#99=IFCOPENINGELEMENT('0$chDW1fT87UzE$p4vq45Y',$,'Opening G-South 2',$,$,#91,#98,$,.OPENING.);
+#100=IFCRELVOIDSELEMENT('0dTBEaLKSStc9jhDzzvHPK',$,$,$,#44,#99);
+#101=IFCAXIS2PLACEMENT3D(#89,$,$);
+#102=IFCLOCALPLACEMENT(#31,#101);
+#103=IFCAXIS2PLACEMENT2D(#48,$);
+#104=IFCRECTANGLEPROFILEDEF(.AREA.,$,#103,1.2,0.1);
+#105=IFCAXIS2PLACEMENT3D(#1,$,$);
+#106=IFCDIRECTION((0.0,0.0,1.0));
+#107=IFCEXTRUDEDAREASOLID(#104,#105,#106,1.3);
+#108=IFCSTYLEDITEM(#107,(#67),$);
+#109=IFCAXIS2PLACEMENT2D(#48,$);
+#110=IFCRECTANGLEPROFILEDEF(.AREA.,$,#109,1.08,0.04);
+#111=IFCAXIS2PLACEMENT3D(#71,$,$);
+#112=IFCDIRECTION((0.0,0.0,1.0));
+#113=IFCEXTRUDEDAREASOLID(#110,#111,#112,1.1800000000000002);
+#114=IFCSTYLEDITEM(#113,(#77),$);
+#115=IFCAXIS2PLACEMENT2D(#48,$);
+#116=IFCRECTANGLEPROFILEDEF(.AREA.,$,#115,0.05,0.12);
+#117=IFCAXIS2PLACEMENT3D(#1,$,$);
+#118=IFCDIRECTION((0.0,0.0,1.0));
+#119=IFCEXTRUDEDAREASOLID(#116,#117,#118,1.3);
+#120=IFCSTYLEDITEM(#119,(#67),$);
+#121=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#107,#113,#119));
+#122=IFCPRODUCTDEFINITIONSHAPE($,$,(#121));
+#123=IFCWINDOW('1HZ74_qNMwPbIgyj4du78g',$,'Window G-South 2',$,$,#102,#122,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#124=IFCRELFILLSELEMENT('2hslLgUM3$Y49_YKHOr29Z',$,$,$,#99,#123);
+#125=IFCCARTESIANPOINT((7.25,0.0,0.0));
+#126=IFCAXIS2PLACEMENT3D(#125,$,$);
+#127=IFCLOCALPLACEMENT(#31,#126);
+#128=IFCAXIS2PLACEMENT2D(#48,$);
+#129=IFCRECTANGLEPROFILEDEF(.AREA.,$,#128,1.1,0.5);
+#130=IFCAXIS2PLACEMENT3D(#1,$,$);
+#131=IFCDIRECTION((0.0,0.0,1.0));
+#132=IFCEXTRUDEDAREASOLID(#129,#130,#131,2.1);
+#133=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#132));
+#134=IFCPRODUCTDEFINITIONSHAPE($,$,(#133));
+#135=IFCOPENINGELEMENT('0HgAoBlkU8r1t7BofrmrGR',$,'Opening G-South 3',$,$,#127,#134,$,.OPENING.);
+#136=IFCRELVOIDSELEMENT('3vD_FU1pSEsJLe2aFg2Brc',$,$,$,#44,#135);
+#137=IFCAXIS2PLACEMENT3D(#125,$,$);
+#138=IFCLOCALPLACEMENT(#31,#137);
+#139=IFCAXIS2PLACEMENT2D(#48,$);
+#140=IFCRECTANGLEPROFILEDEF(.AREA.,$,#139,1.0,0.06);
+#141=IFCAXIS2PLACEMENT3D(#1,$,$);
+#142=IFCDIRECTION((0.0,0.0,1.0));
+#143=IFCEXTRUDEDAREASOLID(#140,#141,#142,2.0500000000000003);
+#144=IFCCOLOURRGB($,0.45,0.28,0.14);
+#145=IFCSURFACESTYLERENDERING(#144,0.0,$,$,$,$,$,$,.FLAT.);
+#146=IFCSURFACESTYLE('Door',.BOTH.,(#145));
+#147=IFCSTYLEDITEM(#143,(#146),$);
+#148=IFCAXIS2PLACEMENT2D(#48,$);
+#149=IFCRECTANGLEPROFILEDEF(.AREA.,$,#148,0.08,0.14);
+#150=IFCCARTESIANPOINT((0.35000000000000003,0.0,1.0));
+#151=IFCAXIS2PLACEMENT3D(#150,$,$);
+#152=IFCDIRECTION((0.0,0.0,1.0));
+#153=IFCEXTRUDEDAREASOLID(#149,#151,#152,0.08);
+#154=IFCSTYLEDITEM(#153,(#67),$);
+#155=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#143,#153));
+#156=IFCPRODUCTDEFINITIONSHAPE($,$,(#155));
+#157=IFCDOOR('127wtWXZdGDL8xBstF2f1M',$,'Door G-South 3',$,$,#138,#156,$,2.1,1.1,.DOOR.,.NOTDEFINED.,$);
+#158=IFCRELFILLSELEMENT('0wKT_koxWhGVhAJtZ_mWqI',$,$,$,#135,#157);
+#159=IFCCARTESIANPOINT((10.0,0.0,0.0));
+#160=IFCDIRECTION((0.0,0.0,1.0));
+#161=IFCDIRECTION((0.0,1.0,0.0));
+#162=IFCAXIS2PLACEMENT3D(#159,#160,#161);
+#163=IFCLOCALPLACEMENT(#18,#162);
+#164=IFCCARTESIANPOINT((4.0,0.0));
+#165=IFCAXIS2PLACEMENT2D(#164,$);
+#166=IFCRECTANGLEPROFILEDEF(.AREA.,$,#165,8.0,0.3);
+#167=IFCAXIS2PLACEMENT3D(#1,$,$);
+#168=IFCDIRECTION((0.0,0.0,1.0));
+#169=IFCEXTRUDEDAREASOLID(#166,#167,#168,2.8);
+#170=IFCSTYLEDITEM(#169,(#40),$);
+#171=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#169));
+#172=IFCPRODUCTDEFINITIONSHAPE($,$,(#171));
+#173=IFCWALL('0qk0kq6a8AV2GIUo7T4G1J',$,'G-East',$,$,#163,#172,$,.STANDARD.);
+#174=IFCCARTESIANPOINT((2.05,0.0,0.9));
+#175=IFCAXIS2PLACEMENT3D(#174,$,$);
+#176=IFCLOCALPLACEMENT(#163,#175);
+#177=IFCAXIS2PLACEMENT2D(#48,$);
+#178=IFCRECTANGLEPROFILEDEF(.AREA.,$,#177,1.3,0.5);
+#179=IFCAXIS2PLACEMENT3D(#1,$,$);
+#180=IFCDIRECTION((0.0,0.0,1.0));
+#181=IFCEXTRUDEDAREASOLID(#178,#179,#180,1.3);
+#182=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#181));
+#183=IFCPRODUCTDEFINITIONSHAPE($,$,(#182));
+#184=IFCOPENINGELEMENT('139w4z2NUPM6f02o5RLGf4',$,'Opening G-East 1',$,$,#176,#183,$,.OPENING.);
+#185=IFCRELVOIDSELEMENT('0zHoDqcPl8c9r_1YaR3wI5',$,$,$,#173,#184);
+#186=IFCAXIS2PLACEMENT3D(#174,$,$);
+#187=IFCLOCALPLACEMENT(#163,#186);
+#188=IFCAXIS2PLACEMENT2D(#48,$);
+#189=IFCRECTANGLEPROFILEDEF(.AREA.,$,#188,1.3,0.1);
+#190=IFCAXIS2PLACEMENT3D(#1,$,$);
+#191=IFCDIRECTION((0.0,0.0,1.0));
+#192=IFCEXTRUDEDAREASOLID(#189,#190,#191,1.3);
+#193=IFCSTYLEDITEM(#192,(#67),$);
+#194=IFCAXIS2PLACEMENT2D(#48,$);
+#195=IFCRECTANGLEPROFILEDEF(.AREA.,$,#194,1.1800000000000002,0.04);
+#196=IFCAXIS2PLACEMENT3D(#71,$,$);
+#197=IFCDIRECTION((0.0,0.0,1.0));
+#198=IFCEXTRUDEDAREASOLID(#195,#196,#197,1.1800000000000002);
+#199=IFCSTYLEDITEM(#198,(#77),$);
+#200=IFCAXIS2PLACEMENT2D(#48,$);
+#201=IFCRECTANGLEPROFILEDEF(.AREA.,$,#200,0.05,0.12);
+#202=IFCAXIS2PLACEMENT3D(#1,$,$);
+#203=IFCDIRECTION((0.0,0.0,1.0));
+#204=IFCEXTRUDEDAREASOLID(#201,#202,#203,1.3);
+#205=IFCSTYLEDITEM(#204,(#67),$);
+#206=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#192,#198,#204));
+#207=IFCPRODUCTDEFINITIONSHAPE($,$,(#206));
+#208=IFCWINDOW('2bzrq0o36QD$kmJ_0Ouqn1',$,'Window G-East 1',$,$,#187,#207,$,1.3,1.3,.WINDOW.,.NOTDEFINED.,$);
+#209=IFCRELFILLSELEMENT('20dGdEg6fNRR1GxAUiq7ZD',$,$,$,#184,#208);
+#210=IFCCARTESIANPOINT((5.65,0.0,0.9));
+#211=IFCAXIS2PLACEMENT3D(#210,$,$);
+#212=IFCLOCALPLACEMENT(#163,#211);
+#213=IFCAXIS2PLACEMENT2D(#48,$);
+#214=IFCRECTANGLEPROFILEDEF(.AREA.,$,#213,1.3,0.5);
+#215=IFCAXIS2PLACEMENT3D(#1,$,$);
+#216=IFCDIRECTION((0.0,0.0,1.0));
+#217=IFCEXTRUDEDAREASOLID(#214,#215,#216,1.3);
+#218=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#217));
+#219=IFCPRODUCTDEFINITIONSHAPE($,$,(#218));
+#220=IFCOPENINGELEMENT('3sJK8Ff8kYCctpDoeIXd0e',$,'Opening G-East 2',$,$,#212,#219,$,.OPENING.);
+#221=IFCRELVOIDSELEMENT('0V5SO6JX_r3Ehgn1GMrcv5',$,$,$,#173,#220);
+#222=IFCAXIS2PLACEMENT3D(#210,$,$);
+#223=IFCLOCALPLACEMENT(#163,#222);
+#224=IFCAXIS2PLACEMENT2D(#48,$);
+#225=IFCRECTANGLEPROFILEDEF(.AREA.,$,#224,1.3,0.1);
+#226=IFCAXIS2PLACEMENT3D(#1,$,$);
+#227=IFCDIRECTION((0.0,0.0,1.0));
+#228=IFCEXTRUDEDAREASOLID(#225,#226,#227,1.3);
+#229=IFCSTYLEDITEM(#228,(#67),$);
+#230=IFCAXIS2PLACEMENT2D(#48,$);
+#231=IFCRECTANGLEPROFILEDEF(.AREA.,$,#230,1.1800000000000002,0.04);
+#232=IFCAXIS2PLACEMENT3D(#71,$,$);
+#233=IFCDIRECTION((0.0,0.0,1.0));
+#234=IFCEXTRUDEDAREASOLID(#231,#232,#233,1.1800000000000002);
+#235=IFCSTYLEDITEM(#234,(#77),$);
+#236=IFCAXIS2PLACEMENT2D(#48,$);
+#237=IFCRECTANGLEPROFILEDEF(.AREA.,$,#236,0.05,0.12);
+#238=IFCAXIS2PLACEMENT3D(#1,$,$);
+#239=IFCDIRECTION((0.0,0.0,1.0));
+#240=IFCEXTRUDEDAREASOLID(#237,#238,#239,1.3);
+#241=IFCSTYLEDITEM(#240,(#67),$);
+#242=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#228,#234,#240));
+#243=IFCPRODUCTDEFINITIONSHAPE($,$,(#242));
+#244=IFCWINDOW('0Sa7fPbj7b6xbsiUCJrYmA',$,'Window G-East 2',$,$,#223,#243,$,1.3,1.3,.WINDOW.,.NOTDEFINED.,$);
+#245=IFCRELFILLSELEMENT('0tVCZn0Q8PPDVhRp9m8tNN',$,$,$,#220,#244);
+#246=IFCCARTESIANPOINT((10.0,8.0,0.0));
+#247=IFCDIRECTION((0.0,0.0,1.0));
+#248=IFCDIRECTION((-1.0,0.0,0.0));
+#249=IFCAXIS2PLACEMENT3D(#246,#247,#248);
+#250=IFCLOCALPLACEMENT(#18,#249);
+#251=IFCAXIS2PLACEMENT2D(#32,$);
+#252=IFCRECTANGLEPROFILEDEF(.AREA.,$,#251,10.0,0.3);
+#253=IFCAXIS2PLACEMENT3D(#1,$,$);
+#254=IFCDIRECTION((0.0,0.0,1.0));
+#255=IFCEXTRUDEDAREASOLID(#252,#253,#254,2.8);
+#256=IFCSTYLEDITEM(#255,(#40),$);
+#257=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#255));
+#258=IFCPRODUCTDEFINITIONSHAPE($,$,(#257));
+#259=IFCWALL('26TpQmJG3YDhZhOG2PXDnr',$,'G-North',$,$,#250,#258,$,.STANDARD.);
+#260=IFCCARTESIANPOINT((1.9,0.0,0.9));
+#261=IFCAXIS2PLACEMENT3D(#260,$,$);
+#262=IFCLOCALPLACEMENT(#250,#261);
+#263=IFCAXIS2PLACEMENT2D(#48,$);
+#264=IFCRECTANGLEPROFILEDEF(.AREA.,$,#263,1.4,0.5);
+#265=IFCAXIS2PLACEMENT3D(#1,$,$);
+#266=IFCDIRECTION((0.0,0.0,1.0));
+#267=IFCEXTRUDEDAREASOLID(#264,#265,#266,1.3);
+#268=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#267));
+#269=IFCPRODUCTDEFINITIONSHAPE($,$,(#268));
+#270=IFCOPENINGELEMENT('3019NCAwz8XX_nFDGXexp5',$,'Opening G-North 1',$,$,#262,#269,$,.OPENING.);
+#271=IFCRELVOIDSELEMENT('2_vQbbkkkCFlk5Rrkd3COT',$,$,$,#259,#270);
+#272=IFCAXIS2PLACEMENT3D(#260,$,$);
+#273=IFCLOCALPLACEMENT(#250,#272);
+#274=IFCAXIS2PLACEMENT2D(#48,$);
+#275=IFCRECTANGLEPROFILEDEF(.AREA.,$,#274,1.4,0.1);
+#276=IFCAXIS2PLACEMENT3D(#1,$,$);
+#277=IFCDIRECTION((0.0,0.0,1.0));
+#278=IFCEXTRUDEDAREASOLID(#275,#276,#277,1.3);
+#279=IFCSTYLEDITEM(#278,(#67),$);
+#280=IFCAXIS2PLACEMENT2D(#48,$);
+#281=IFCRECTANGLEPROFILEDEF(.AREA.,$,#280,1.2799999999999998,0.04);
+#282=IFCAXIS2PLACEMENT3D(#71,$,$);
+#283=IFCDIRECTION((0.0,0.0,1.0));
+#284=IFCEXTRUDEDAREASOLID(#281,#282,#283,1.1800000000000002);
+#285=IFCSTYLEDITEM(#284,(#77),$);
+#286=IFCAXIS2PLACEMENT2D(#48,$);
+#287=IFCRECTANGLEPROFILEDEF(.AREA.,$,#286,0.05,0.12);
+#288=IFCAXIS2PLACEMENT3D(#1,$,$);
+#289=IFCDIRECTION((0.0,0.0,1.0));
+#290=IFCEXTRUDEDAREASOLID(#287,#288,#289,1.3);
+#291=IFCSTYLEDITEM(#290,(#67),$);
+#292=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#278,#284,#290));
+#293=IFCPRODUCTDEFINITIONSHAPE($,$,(#292));
+#294=IFCWINDOW('0oS0jKMLo82LoGhKedPaOa',$,'Window G-North 1',$,$,#273,#293,$,1.3,1.4,.WINDOW.,.NOTDEFINED.,$);
+#295=IFCRELFILLSELEMENT('1i5hThQM6VBK4BP_6OKO1K',$,$,$,#270,#294);
+#296=IFCCARTESIANPOINT((4.8999999999999995,0.0,0.9));
+#297=IFCAXIS2PLACEMENT3D(#296,$,$);
+#298=IFCLOCALPLACEMENT(#250,#297);
+#299=IFCAXIS2PLACEMENT2D(#48,$);
+#300=IFCRECTANGLEPROFILEDEF(.AREA.,$,#299,1.6,0.5);
+#301=IFCAXIS2PLACEMENT3D(#1,$,$);
+#302=IFCDIRECTION((0.0,0.0,1.0));
+#303=IFCEXTRUDEDAREASOLID(#300,#301,#302,1.3);
+#304=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#303));
+#305=IFCPRODUCTDEFINITIONSHAPE($,$,(#304));
+#306=IFCOPENINGELEMENT('3SAsukmp4NAjv2s$PDeNXo',$,'Opening G-North 2',$,$,#298,#305,$,.OPENING.);
+#307=IFCRELVOIDSELEMENT('0aT3X54zxxpC6xWPNbWCXJ',$,$,$,#259,#306);
+#308=IFCAXIS2PLACEMENT3D(#296,$,$);
+#309=IFCLOCALPLACEMENT(#250,#308);
+#310=IFCAXIS2PLACEMENT2D(#48,$);
+#311=IFCRECTANGLEPROFILEDEF(.AREA.,$,#310,1.6,0.1);
+#312=IFCAXIS2PLACEMENT3D(#1,$,$);
+#313=IFCDIRECTION((0.0,0.0,1.0));
+#314=IFCEXTRUDEDAREASOLID(#311,#312,#313,1.3);
+#315=IFCSTYLEDITEM(#314,(#67),$);
+#316=IFCAXIS2PLACEMENT2D(#48,$);
+#317=IFCRECTANGLEPROFILEDEF(.AREA.,$,#316,1.48,0.04);
+#318=IFCAXIS2PLACEMENT3D(#71,$,$);
+#319=IFCDIRECTION((0.0,0.0,1.0));
+#320=IFCEXTRUDEDAREASOLID(#317,#318,#319,1.1800000000000002);
+#321=IFCSTYLEDITEM(#320,(#77),$);
+#322=IFCAXIS2PLACEMENT2D(#48,$);
+#323=IFCRECTANGLEPROFILEDEF(.AREA.,$,#322,0.05,0.12);
+#324=IFCAXIS2PLACEMENT3D(#1,$,$);
+#325=IFCDIRECTION((0.0,0.0,1.0));
+#326=IFCEXTRUDEDAREASOLID(#323,#324,#325,1.3);
+#327=IFCSTYLEDITEM(#326,(#67),$);
+#328=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#314,#320,#326));
+#329=IFCPRODUCTDEFINITIONSHAPE($,$,(#328));
+#330=IFCWINDOW('1DN3Cqgy2JDku2yCl19HgH',$,'Window G-North 2',$,$,#309,#329,$,1.3,1.6,.WINDOW.,.NOTDEFINED.,$);
+#331=IFCRELFILLSELEMENT('17UEcDlHpXkczj6$lPqKXc',$,$,$,#306,#330);
+#332=IFCCARTESIANPOINT((7.8,0.0,0.9));
+#333=IFCAXIS2PLACEMENT3D(#332,$,$);
+#334=IFCLOCALPLACEMENT(#250,#333);
+#335=IFCAXIS2PLACEMENT2D(#48,$);
+#336=IFCRECTANGLEPROFILEDEF(.AREA.,$,#335,1.2,0.5);
+#337=IFCAXIS2PLACEMENT3D(#1,$,$);
+#338=IFCDIRECTION((0.0,0.0,1.0));
+#339=IFCEXTRUDEDAREASOLID(#336,#337,#338,1.3);
+#340=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#339));
+#341=IFCPRODUCTDEFINITIONSHAPE($,$,(#340));
+#342=IFCOPENINGELEMENT('1GvQj4CBkJ4WWgKqT2uSC0',$,'Opening G-North 3',$,$,#334,#341,$,.OPENING.);
+#343=IFCRELVOIDSELEMENT('0JU_wg7qwvlp1otF98NblZ',$,$,$,#259,#342);
+#344=IFCAXIS2PLACEMENT3D(#332,$,$);
+#345=IFCLOCALPLACEMENT(#250,#344);
+#346=IFCAXIS2PLACEMENT2D(#48,$);
+#347=IFCRECTANGLEPROFILEDEF(.AREA.,$,#346,1.2,0.1);
+#348=IFCAXIS2PLACEMENT3D(#1,$,$);
+#349=IFCDIRECTION((0.0,0.0,1.0));
+#350=IFCEXTRUDEDAREASOLID(#347,#348,#349,1.3);
+#351=IFCSTYLEDITEM(#350,(#67),$);
+#352=IFCAXIS2PLACEMENT2D(#48,$);
+#353=IFCRECTANGLEPROFILEDEF(.AREA.,$,#352,1.08,0.04);
+#354=IFCAXIS2PLACEMENT3D(#71,$,$);
+#355=IFCDIRECTION((0.0,0.0,1.0));
+#356=IFCEXTRUDEDAREASOLID(#353,#354,#355,1.1800000000000002);
+#357=IFCSTYLEDITEM(#356,(#77),$);
+#358=IFCAXIS2PLACEMENT2D(#48,$);
+#359=IFCRECTANGLEPROFILEDEF(.AREA.,$,#358,0.05,0.12);
+#360=IFCAXIS2PLACEMENT3D(#1,$,$);
+#361=IFCDIRECTION((0.0,0.0,1.0));
+#362=IFCEXTRUDEDAREASOLID(#359,#360,#361,1.3);
+#363=IFCSTYLEDITEM(#362,(#67),$);
+#364=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#350,#356,#362));
+#365=IFCPRODUCTDEFINITIONSHAPE($,$,(#364));
+#366=IFCWINDOW('1l1WYJnbe4sk7iu_FPFvbX',$,'Window G-North 3',$,$,#345,#365,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#367=IFCRELFILLSELEMENT('1MBhC2ioH0LniEYsYMNQBf',$,$,$,#342,#366);
+#368=IFCCARTESIANPOINT((0.0,8.0,0.0));
+#369=IFCDIRECTION((0.0,0.0,1.0));
+#370=IFCDIRECTION((0.0,-1.0,0.0));
+#371=IFCAXIS2PLACEMENT3D(#368,#369,#370);
+#372=IFCLOCALPLACEMENT(#18,#371);
+#373=IFCAXIS2PLACEMENT2D(#164,$);
+#374=IFCRECTANGLEPROFILEDEF(.AREA.,$,#373,8.0,0.3);
+#375=IFCAXIS2PLACEMENT3D(#1,$,$);
+#376=IFCDIRECTION((0.0,0.0,1.0));
+#377=IFCEXTRUDEDAREASOLID(#374,#375,#376,2.8);
+#378=IFCSTYLEDITEM(#377,(#40),$);
+#379=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#377));
+#380=IFCPRODUCTDEFINITIONSHAPE($,$,(#379));
+#381=IFCWALL('2$5HCGzNGbNfTCNWZlSpES',$,'G-West',$,$,#372,#380,$,.STANDARD.);
+#382=IFCCARTESIANPOINT((2.3,0.0,0.9));
+#383=IFCAXIS2PLACEMENT3D(#382,$,$);
+#384=IFCLOCALPLACEMENT(#372,#383);
+#385=IFCAXIS2PLACEMENT2D(#48,$);
+#386=IFCRECTANGLEPROFILEDEF(.AREA.,$,#385,1.4,0.5);
+#387=IFCAXIS2PLACEMENT3D(#1,$,$);
+#388=IFCDIRECTION((0.0,0.0,1.0));
+#389=IFCEXTRUDEDAREASOLID(#386,#387,#388,1.3);
+#390=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#389));
+#391=IFCPRODUCTDEFINITIONSHAPE($,$,(#390));
+#392=IFCOPENINGELEMENT('0gCNDsyjpqOqEDutl0fz1J',$,'Opening G-West 1',$,$,#384,#391,$,.OPENING.);
+#393=IFCRELVOIDSELEMENT('0seu3$M405XcR77mnfTqHU',$,$,$,#381,#392);
+#394=IFCAXIS2PLACEMENT3D(#382,$,$);
+#395=IFCLOCALPLACEMENT(#372,#394);
+#396=IFCAXIS2PLACEMENT2D(#48,$);
+#397=IFCRECTANGLEPROFILEDEF(.AREA.,$,#396,1.4,0.1);
+#398=IFCAXIS2PLACEMENT3D(#1,$,$);
+#399=IFCDIRECTION((0.0,0.0,1.0));
+#400=IFCEXTRUDEDAREASOLID(#397,#398,#399,1.3);
+#401=IFCSTYLEDITEM(#400,(#67),$);
+#402=IFCAXIS2PLACEMENT2D(#48,$);
+#403=IFCRECTANGLEPROFILEDEF(.AREA.,$,#402,1.2799999999999998,0.04);
+#404=IFCAXIS2PLACEMENT3D(#71,$,$);
+#405=IFCDIRECTION((0.0,0.0,1.0));
+#406=IFCEXTRUDEDAREASOLID(#403,#404,#405,1.1800000000000002);
+#407=IFCSTYLEDITEM(#406,(#77),$);
+#408=IFCAXIS2PLACEMENT2D(#48,$);
+#409=IFCRECTANGLEPROFILEDEF(.AREA.,$,#408,0.05,0.12);
+#410=IFCAXIS2PLACEMENT3D(#1,$,$);
+#411=IFCDIRECTION((0.0,0.0,1.0));
+#412=IFCEXTRUDEDAREASOLID(#409,#410,#411,1.3);
+#413=IFCSTYLEDITEM(#412,(#67),$);
+#414=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#400,#406,#412));
+#415=IFCPRODUCTDEFINITIONSHAPE($,$,(#414));
+#416=IFCWINDOW('3n545Kq$Z$fA4BAquBsjMl',$,'Window G-West 1',$,$,#395,#415,$,1.3,1.4,.WINDOW.,.NOTDEFINED.,$);
+#417=IFCRELFILLSELEMENT('3_67_H0UzhZqzd1VHkDhHB',$,$,$,#392,#416);
+#418=IFCCARTESIANPOINT((5.7,0.0,0.9));
+#419=IFCAXIS2PLACEMENT3D(#418,$,$);
+#420=IFCLOCALPLACEMENT(#372,#419);
+#421=IFCAXIS2PLACEMENT2D(#48,$);
+#422=IFCRECTANGLEPROFILEDEF(.AREA.,$,#421,1.4,0.5);
+#423=IFCAXIS2PLACEMENT3D(#1,$,$);
+#424=IFCDIRECTION((0.0,0.0,1.0));
+#425=IFCEXTRUDEDAREASOLID(#422,#423,#424,1.3);
+#426=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#425));
+#427=IFCPRODUCTDEFINITIONSHAPE($,$,(#426));
+#428=IFCOPENINGELEMENT('23fstwY$XueauzWc36rbIu',$,'Opening G-West 2',$,$,#420,#427,$,.OPENING.);
+#429=IFCRELVOIDSELEMENT('3Tp6w8__ErAA6ElBP084AX',$,$,$,#381,#428);
+#430=IFCAXIS2PLACEMENT3D(#418,$,$);
+#431=IFCLOCALPLACEMENT(#372,#430);
+#432=IFCAXIS2PLACEMENT2D(#48,$);
+#433=IFCRECTANGLEPROFILEDEF(.AREA.,$,#432,1.4,0.1);
+#434=IFCAXIS2PLACEMENT3D(#1,$,$);
+#435=IFCDIRECTION((0.0,0.0,1.0));
+#436=IFCEXTRUDEDAREASOLID(#433,#434,#435,1.3);
+#437=IFCSTYLEDITEM(#436,(#67),$);
+#438=IFCAXIS2PLACEMENT2D(#48,$);
+#439=IFCRECTANGLEPROFILEDEF(.AREA.,$,#438,1.2799999999999998,0.04);
+#440=IFCAXIS2PLACEMENT3D(#71,$,$);
+#441=IFCDIRECTION((0.0,0.0,1.0));
+#442=IFCEXTRUDEDAREASOLID(#439,#440,#441,1.1800000000000002);
+#443=IFCSTYLEDITEM(#442,(#77),$);
+#444=IFCAXIS2PLACEMENT2D(#48,$);
+#445=IFCRECTANGLEPROFILEDEF(.AREA.,$,#444,0.05,0.12);
+#446=IFCAXIS2PLACEMENT3D(#1,$,$);
+#447=IFCDIRECTION((0.0,0.0,1.0));
+#448=IFCEXTRUDEDAREASOLID(#445,#446,#447,1.3);
+#449=IFCSTYLEDITEM(#448,(#67),$);
+#450=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#436,#442,#448));
+#451=IFCPRODUCTDEFINITIONSHAPE($,$,(#450));
+#452=IFCWINDOW('063tGBYLFfwrEegUINghwH',$,'Window G-West 2',$,$,#431,#451,$,1.3,1.4,.WINDOW.,.NOTDEFINED.,$);
+#453=IFCRELFILLSELEMENT('2gmXv3u1D4lBiK6BofrCBs',$,$,$,#428,#452);
+#454=IFCCARTESIANPOINT((6.0,0.15,0.0));
+#455=IFCDIRECTION((0.0,0.0,1.0));
+#456=IFCDIRECTION((0.0,1.0,0.0));
+#457=IFCAXIS2PLACEMENT3D(#454,#455,#456);
+#458=IFCLOCALPLACEMENT(#18,#457);
+#459=IFCCARTESIANPOINT((3.8499999999999996,0.0));
+#460=IFCAXIS2PLACEMENT2D(#459,$);
+#461=IFCRECTANGLEPROFILEDEF(.AREA.,$,#460,7.699999999999999,0.15);
+#462=IFCAXIS2PLACEMENT3D(#1,$,$);
+#463=IFCDIRECTION((0.0,0.0,1.0));
+#464=IFCEXTRUDEDAREASOLID(#461,#462,#463,2.8);
+#465=IFCSTYLEDITEM(#464,(#40),$);
+#466=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#464));
+#467=IFCPRODUCTDEFINITIONSHAPE($,$,(#466));
+#468=IFCWALL('1_zKZXP$5GnkYHpaJR3Bok',$,'G-Partition A',$,$,#458,#467,$,.STANDARD.);
+#469=IFCCARTESIANPOINT((1.95,0.0,0.0));
+#470=IFCAXIS2PLACEMENT3D(#469,$,$);
+#471=IFCLOCALPLACEMENT(#458,#470);
+#472=IFCAXIS2PLACEMENT2D(#48,$);
+#473=IFCRECTANGLEPROFILEDEF(.AREA.,$,#472,0.9,0.35);
+#474=IFCAXIS2PLACEMENT3D(#1,$,$);
+#475=IFCDIRECTION((0.0,0.0,1.0));
+#476=IFCEXTRUDEDAREASOLID(#473,#474,#475,2.05);
+#477=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#476));
+#478=IFCPRODUCTDEFINITIONSHAPE($,$,(#477));
+#479=IFCOPENINGELEMENT('2Ktw7Uh8$_RS8ZDn3YpkjP',$,'Opening G-Partition A 1',$,$,#471,#478,$,.OPENING.);
+#480=IFCRELVOIDSELEMENT('3TtEeNIix$_gqAI9qUH3xu',$,$,$,#468,#479);
+#481=IFCAXIS2PLACEMENT3D(#469,$,$);
+#482=IFCLOCALPLACEMENT(#458,#481);
+#483=IFCAXIS2PLACEMENT2D(#48,$);
+#484=IFCRECTANGLEPROFILEDEF(.AREA.,$,#483,0.8,0.06);
+#485=IFCAXIS2PLACEMENT3D(#1,$,$);
+#486=IFCDIRECTION((0.0,0.0,1.0));
+#487=IFCEXTRUDEDAREASOLID(#484,#485,#486,1.9999999999999998);
+#488=IFCSTYLEDITEM(#487,(#146),$);
+#489=IFCAXIS2PLACEMENT2D(#48,$);
+#490=IFCRECTANGLEPROFILEDEF(.AREA.,$,#489,0.08,0.14);
+#491=IFCCARTESIANPOINT((0.25,0.0,1.0));
+#492=IFCAXIS2PLACEMENT3D(#491,$,$);
+#493=IFCDIRECTION((0.0,0.0,1.0));
+#494=IFCEXTRUDEDAREASOLID(#490,#492,#493,0.08);
+#495=IFCSTYLEDITEM(#494,(#67),$);
+#496=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#487,#494));
+#497=IFCPRODUCTDEFINITIONSHAPE($,$,(#496));
+#498=IFCDOOR('2LRwR_QGebxnxP4w0ovXsU',$,'Door G-Partition A 1',$,$,#482,#497,$,2.05,0.9,.DOOR.,.NOTDEFINED.,$);
+#499=IFCRELFILLSELEMENT('0L07NwfSRO86g_eFux3$Io',$,$,$,#479,#498);
+#500=IFCCARTESIANPOINT((5.45,0.0,0.0));
+#501=IFCAXIS2PLACEMENT3D(#500,$,$);
+#502=IFCLOCALPLACEMENT(#458,#501);
+#503=IFCAXIS2PLACEMENT2D(#48,$);
+#504=IFCRECTANGLEPROFILEDEF(.AREA.,$,#503,0.9,0.35);
+#505=IFCAXIS2PLACEMENT3D(#1,$,$);
+#506=IFCDIRECTION((0.0,0.0,1.0));
+#507=IFCEXTRUDEDAREASOLID(#504,#505,#506,2.05);
+#508=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#507));
+#509=IFCPRODUCTDEFINITIONSHAPE($,$,(#508));
+#510=IFCOPENINGELEMENT('3_sf3G4$baqZDY1cO4hHVC',$,'Opening G-Partition A 2',$,$,#502,#509,$,.OPENING.);
+#511=IFCRELVOIDSELEMENT('3gRHN6Sk3cWrbFbUBIYwwT',$,$,$,#468,#510);
+#512=IFCAXIS2PLACEMENT3D(#500,$,$);
+#513=IFCLOCALPLACEMENT(#458,#512);
+#514=IFCAXIS2PLACEMENT2D(#48,$);
+#515=IFCRECTANGLEPROFILEDEF(.AREA.,$,#514,0.8,0.06);
+#516=IFCAXIS2PLACEMENT3D(#1,$,$);
+#517=IFCDIRECTION((0.0,0.0,1.0));
+#518=IFCEXTRUDEDAREASOLID(#515,#516,#517,1.9999999999999998);
+#519=IFCSTYLEDITEM(#518,(#146),$);
+#520=IFCAXIS2PLACEMENT2D(#48,$);
+#521=IFCRECTANGLEPROFILEDEF(.AREA.,$,#520,0.08,0.14);
+#522=IFCAXIS2PLACEMENT3D(#491,$,$);
+#523=IFCDIRECTION((0.0,0.0,1.0));
+#524=IFCEXTRUDEDAREASOLID(#521,#522,#523,0.08);
+#525=IFCSTYLEDITEM(#524,(#67),$);
+#526=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#518,#524));
+#527=IFCPRODUCTDEFINITIONSHAPE($,$,(#526));
+#528=IFCDOOR('2Ir$8YdjkSgzAJtMARCZiF',$,'Door G-Partition A 2',$,$,#513,#527,$,2.05,0.9,.DOOR.,.NOTDEFINED.,$);
+#529=IFCRELFILLSELEMENT('1RQEGsUydtIqbrsa0HlRw7',$,$,$,#510,#528);
+#530=IFCCARTESIANPOINT((0.15,4.0,0.0));
+#531=IFCDIRECTION((0.0,0.0,1.0));
+#532=IFCDIRECTION((1.0,0.0,0.0));
+#533=IFCAXIS2PLACEMENT3D(#530,#531,#532);
+#534=IFCLOCALPLACEMENT(#18,#533);
+#535=IFCCARTESIANPOINT((2.925,0.0));
+#536=IFCAXIS2PLACEMENT2D(#535,$);
+#537=IFCRECTANGLEPROFILEDEF(.AREA.,$,#536,5.85,0.15);
+#538=IFCAXIS2PLACEMENT3D(#1,$,$);
+#539=IFCDIRECTION((0.0,0.0,1.0));
+#540=IFCEXTRUDEDAREASOLID(#537,#538,#539,2.8);
+#541=IFCSTYLEDITEM(#540,(#40),$);
+#542=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#540));
+#543=IFCPRODUCTDEFINITIONSHAPE($,$,(#542));
+#544=IFCWALL('2ovn4oyBVFdbrWEG1M3Q88',$,'G-Partition B',$,$,#534,#543,$,.STANDARD.);
+#545=IFCCARTESIANPOINT((1.45,0.0,0.0));
+#546=IFCAXIS2PLACEMENT3D(#545,$,$);
+#547=IFCLOCALPLACEMENT(#534,#546);
+#548=IFCAXIS2PLACEMENT2D(#48,$);
+#549=IFCRECTANGLEPROFILEDEF(.AREA.,$,#548,0.9,0.35);
+#550=IFCAXIS2PLACEMENT3D(#1,$,$);
+#551=IFCDIRECTION((0.0,0.0,1.0));
+#552=IFCEXTRUDEDAREASOLID(#549,#550,#551,2.05);
+#553=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#552));
+#554=IFCPRODUCTDEFINITIONSHAPE($,$,(#553));
+#555=IFCOPENINGELEMENT('0XfmV4cd$rC2fZoPux72SI',$,'Opening G-Partition B 1',$,$,#547,#554,$,.OPENING.);
+#556=IFCRELVOIDSELEMENT('2GvAGiwPzlvFeOlNOhu1ng',$,$,$,#544,#555);
+#557=IFCAXIS2PLACEMENT3D(#545,$,$);
+#558=IFCLOCALPLACEMENT(#534,#557);
+#559=IFCAXIS2PLACEMENT2D(#48,$);
+#560=IFCRECTANGLEPROFILEDEF(.AREA.,$,#559,0.8,0.06);
+#561=IFCAXIS2PLACEMENT3D(#1,$,$);
+#562=IFCDIRECTION((0.0,0.0,1.0));
+#563=IFCEXTRUDEDAREASOLID(#560,#561,#562,1.9999999999999998);
+#564=IFCSTYLEDITEM(#563,(#146),$);
+#565=IFCAXIS2PLACEMENT2D(#48,$);
+#566=IFCRECTANGLEPROFILEDEF(.AREA.,$,#565,0.08,0.14);
+#567=IFCAXIS2PLACEMENT3D(#491,$,$);
+#568=IFCDIRECTION((0.0,0.0,1.0));
+#569=IFCEXTRUDEDAREASOLID(#566,#567,#568,0.08);
+#570=IFCSTYLEDITEM(#569,(#67),$);
+#571=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#563,#569));
+#572=IFCPRODUCTDEFINITIONSHAPE($,$,(#571));
+#573=IFCDOOR('0p1yVrvamivbkLPsXW5OIR',$,'Door G-Partition B 1',$,$,#558,#572,$,2.05,0.9,.DOOR.,.NOTDEFINED.,$);
+#574=IFCRELFILLSELEMENT('1x_8sow6ezjuOZk2uzYlWD',$,$,$,#555,#573);
+#575=IFCDIRECTION((0.0,0.0,1.0));
+#576=IFCDIRECTION((1.0,0.0,0.0));
+#577=IFCAXIS2PLACEMENT3D(#1,#575,#576);
+#578=IFCLOCALPLACEMENT(#22,#577);
+#579=IFCAXIS2PLACEMENT2D(#32,$);
+#580=IFCRECTANGLEPROFILEDEF(.AREA.,$,#579,10.0,0.3);
+#581=IFCAXIS2PLACEMENT3D(#1,$,$);
+#582=IFCDIRECTION((0.0,0.0,1.0));
+#583=IFCEXTRUDEDAREASOLID(#580,#581,#582,2.8);
+#584=IFCSTYLEDITEM(#583,(#40),$);
+#585=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#583));
+#586=IFCPRODUCTDEFINITIONSHAPE($,$,(#585));
+#587=IFCWALL('2$pTCPsWilX768UT$2Dprk',$,'F-South',$,$,#578,#586,$,.STANDARD.);
+#588=IFCAXIS2PLACEMENT3D(#45,$,$);
+#589=IFCLOCALPLACEMENT(#578,#588);
+#590=IFCAXIS2PLACEMENT2D(#48,$);
+#591=IFCRECTANGLEPROFILEDEF(.AREA.,$,#590,1.2,0.5);
+#592=IFCAXIS2PLACEMENT3D(#1,$,$);
+#593=IFCDIRECTION((0.0,0.0,1.0));
+#594=IFCEXTRUDEDAREASOLID(#591,#592,#593,1.3);
+#595=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#594));
+#596=IFCPRODUCTDEFINITIONSHAPE($,$,(#595));
+#597=IFCOPENINGELEMENT('0KOk7mETOuhrXWQzkve9wf',$,'Opening F-South 1',$,$,#589,#596,$,.OPENING.);
+#598=IFCRELVOIDSELEMENT('0d84PoY2VZwasiBw9lrcIq',$,$,$,#587,#597);
+#599=IFCAXIS2PLACEMENT3D(#45,$,$);
+#600=IFCLOCALPLACEMENT(#578,#599);
+#601=IFCAXIS2PLACEMENT2D(#48,$);
+#602=IFCRECTANGLEPROFILEDEF(.AREA.,$,#601,1.2,0.1);
+#603=IFCAXIS2PLACEMENT3D(#1,$,$);
+#604=IFCDIRECTION((0.0,0.0,1.0));
+#605=IFCEXTRUDEDAREASOLID(#602,#603,#604,1.3);
+#606=IFCSTYLEDITEM(#605,(#67),$);
+#607=IFCAXIS2PLACEMENT2D(#48,$);
+#608=IFCRECTANGLEPROFILEDEF(.AREA.,$,#607,1.08,0.04);
+#609=IFCAXIS2PLACEMENT3D(#71,$,$);
+#610=IFCDIRECTION((0.0,0.0,1.0));
+#611=IFCEXTRUDEDAREASOLID(#608,#609,#610,1.1800000000000002);
+#612=IFCSTYLEDITEM(#611,(#77),$);
+#613=IFCAXIS2PLACEMENT2D(#48,$);
+#614=IFCRECTANGLEPROFILEDEF(.AREA.,$,#613,0.05,0.12);
+#615=IFCAXIS2PLACEMENT3D(#1,$,$);
+#616=IFCDIRECTION((0.0,0.0,1.0));
+#617=IFCEXTRUDEDAREASOLID(#614,#615,#616,1.3);
+#618=IFCSTYLEDITEM(#617,(#67),$);
+#619=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#605,#611,#617));
+#620=IFCPRODUCTDEFINITIONSHAPE($,$,(#619));
+#621=IFCWINDOW('2zTLDJyCWWLb0bQ3sPyhWg',$,'Window F-South 1',$,$,#600,#620,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#622=IFCRELFILLSELEMENT('1a0CL_q8ENRUQ3TtF2D6LH',$,$,$,#597,#621);
+#623=IFCAXIS2PLACEMENT3D(#89,$,$);
+#624=IFCLOCALPLACEMENT(#578,#623);
+#625=IFCAXIS2PLACEMENT2D(#48,$);
+#626=IFCRECTANGLEPROFILEDEF(.AREA.,$,#625,1.2,0.5);
+#627=IFCAXIS2PLACEMENT3D(#1,$,$);
+#628=IFCDIRECTION((0.0,0.0,1.0));
+#629=IFCEXTRUDEDAREASOLID(#626,#627,#628,1.3);
+#630=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#629));
+#631=IFCPRODUCTDEFINITIONSHAPE($,$,(#630));
+#632=IFCOPENINGELEMENT('1yGAU7ZsBkP37y10YsugjN',$,'Opening F-South 2',$,$,#624,#631,$,.OPENING.);
+#633=IFCRELVOIDSELEMENT('1XZmCcTzggoekzw8fxlwFn',$,$,$,#587,#632);
+#634=IFCAXIS2PLACEMENT3D(#89,$,$);
+#635=IFCLOCALPLACEMENT(#578,#634);
+#636=IFCAXIS2PLACEMENT2D(#48,$);
+#637=IFCRECTANGLEPROFILEDEF(.AREA.,$,#636,1.2,0.1);
+#638=IFCAXIS2PLACEMENT3D(#1,$,$);
+#639=IFCDIRECTION((0.0,0.0,1.0));
+#640=IFCEXTRUDEDAREASOLID(#637,#638,#639,1.3);
+#641=IFCSTYLEDITEM(#640,(#67),$);
+#642=IFCAXIS2PLACEMENT2D(#48,$);
+#643=IFCRECTANGLEPROFILEDEF(.AREA.,$,#642,1.08,0.04);
+#644=IFCAXIS2PLACEMENT3D(#71,$,$);
+#645=IFCDIRECTION((0.0,0.0,1.0));
+#646=IFCEXTRUDEDAREASOLID(#643,#644,#645,1.1800000000000002);
+#647=IFCSTYLEDITEM(#646,(#77),$);
+#648=IFCAXIS2PLACEMENT2D(#48,$);
+#649=IFCRECTANGLEPROFILEDEF(.AREA.,$,#648,0.05,0.12);
+#650=IFCAXIS2PLACEMENT3D(#1,$,$);
+#651=IFCDIRECTION((0.0,0.0,1.0));
+#652=IFCEXTRUDEDAREASOLID(#649,#650,#651,1.3);
+#653=IFCSTYLEDITEM(#652,(#67),$);
+#654=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#640,#646,#652));
+#655=IFCPRODUCTDEFINITIONSHAPE($,$,(#654));
+#656=IFCWINDOW('1iqUJP_dvw5DyvqFy4O8d0',$,'Window F-South 2',$,$,#635,#655,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#657=IFCRELFILLSELEMENT('05EN1L4FtKBS$kHcPAJpFH',$,$,$,#632,#656);
+#658=IFCCARTESIANPOINT((7.5,0.0,0.9));
+#659=IFCAXIS2PLACEMENT3D(#658,$,$);
+#660=IFCLOCALPLACEMENT(#578,#659);
+#661=IFCAXIS2PLACEMENT2D(#48,$);
+#662=IFCRECTANGLEPROFILEDEF(.AREA.,$,#661,1.2,0.5);
+#663=IFCAXIS2PLACEMENT3D(#1,$,$);
+#664=IFCDIRECTION((0.0,0.0,1.0));
+#665=IFCEXTRUDEDAREASOLID(#662,#663,#664,1.3);
+#666=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#665));
+#667=IFCPRODUCTDEFINITIONSHAPE($,$,(#666));
+#668=IFCOPENINGELEMENT('37bkjf70edmKDECiviecVM',$,'Opening F-South 3',$,$,#660,#667,$,.OPENING.);
+#669=IFCRELVOIDSELEMENT('16u2Awk_33CIXbMdgrkw5z',$,$,$,#587,#668);
+#670=IFCAXIS2PLACEMENT3D(#658,$,$);
+#671=IFCLOCALPLACEMENT(#578,#670);
+#672=IFCAXIS2PLACEMENT2D(#48,$);
+#673=IFCRECTANGLEPROFILEDEF(.AREA.,$,#672,1.2,0.1);
+#674=IFCAXIS2PLACEMENT3D(#1,$,$);
+#675=IFCDIRECTION((0.0,0.0,1.0));
+#676=IFCEXTRUDEDAREASOLID(#673,#674,#675,1.3);
+#677=IFCSTYLEDITEM(#676,(#67),$);
+#678=IFCAXIS2PLACEMENT2D(#48,$);
+#679=IFCRECTANGLEPROFILEDEF(.AREA.,$,#678,1.08,0.04);
+#680=IFCAXIS2PLACEMENT3D(#71,$,$);
+#681=IFCDIRECTION((0.0,0.0,1.0));
+#682=IFCEXTRUDEDAREASOLID(#679,#680,#681,1.1800000000000002);
+#683=IFCSTYLEDITEM(#682,(#77),$);
+#684=IFCAXIS2PLACEMENT2D(#48,$);
+#685=IFCRECTANGLEPROFILEDEF(.AREA.,$,#684,0.05,0.12);
+#686=IFCAXIS2PLACEMENT3D(#1,$,$);
+#687=IFCDIRECTION((0.0,0.0,1.0));
+#688=IFCEXTRUDEDAREASOLID(#685,#686,#687,1.3);
+#689=IFCSTYLEDITEM(#688,(#67),$);
+#690=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#676,#682,#688));
+#691=IFCPRODUCTDEFINITIONSHAPE($,$,(#690));
+#692=IFCWINDOW('331kvpvGfQe36OyJxNqwg6',$,'Window F-South 3',$,$,#671,#691,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#693=IFCRELFILLSELEMENT('1FR1EDrBglHPU4dC53_BZl',$,$,$,#668,#692);
+#694=IFCDIRECTION((0.0,0.0,1.0));
+#695=IFCDIRECTION((0.0,1.0,0.0));
+#696=IFCAXIS2PLACEMENT3D(#159,#694,#695);
+#697=IFCLOCALPLACEMENT(#22,#696);
+#698=IFCAXIS2PLACEMENT2D(#164,$);
+#699=IFCRECTANGLEPROFILEDEF(.AREA.,$,#698,8.0,0.3);
+#700=IFCAXIS2PLACEMENT3D(#1,$,$);
+#701=IFCDIRECTION((0.0,0.0,1.0));
+#702=IFCEXTRUDEDAREASOLID(#699,#700,#701,2.8);
+#703=IFCSTYLEDITEM(#702,(#40),$);
+#704=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#702));
+#705=IFCPRODUCTDEFINITIONSHAPE($,$,(#704));
+#706=IFCWALL('0qgiqCUxAtkftKs1Y$lDcW',$,'F-East',$,$,#697,#705,$,.STANDARD.);
+#707=IFCAXIS2PLACEMENT3D(#174,$,$);
+#708=IFCLOCALPLACEMENT(#697,#707);
+#709=IFCAXIS2PLACEMENT2D(#48,$);
+#710=IFCRECTANGLEPROFILEDEF(.AREA.,$,#709,1.3,0.5);
+#711=IFCAXIS2PLACEMENT3D(#1,$,$);
+#712=IFCDIRECTION((0.0,0.0,1.0));
+#713=IFCEXTRUDEDAREASOLID(#710,#711,#712,1.3);
+#714=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#713));
+#715=IFCPRODUCTDEFINITIONSHAPE($,$,(#714));
+#716=IFCOPENINGELEMENT('3D0nqdnuRXaOio90htvOZ9',$,'Opening F-East 1',$,$,#708,#715,$,.OPENING.);
+#717=IFCRELVOIDSELEMENT('0c3ZX0SPCtvrrGQt6voxwR',$,$,$,#706,#716);
+#718=IFCAXIS2PLACEMENT3D(#174,$,$);
+#719=IFCLOCALPLACEMENT(#697,#718);
+#720=IFCAXIS2PLACEMENT2D(#48,$);
+#721=IFCRECTANGLEPROFILEDEF(.AREA.,$,#720,1.3,0.1);
+#722=IFCAXIS2PLACEMENT3D(#1,$,$);
+#723=IFCDIRECTION((0.0,0.0,1.0));
+#724=IFCEXTRUDEDAREASOLID(#721,#722,#723,1.3);
+#725=IFCSTYLEDITEM(#724,(#67),$);
+#726=IFCAXIS2PLACEMENT2D(#48,$);
+#727=IFCRECTANGLEPROFILEDEF(.AREA.,$,#726,1.1800000000000002,0.04);
+#728=IFCAXIS2PLACEMENT3D(#71,$,$);
+#729=IFCDIRECTION((0.0,0.0,1.0));
+#730=IFCEXTRUDEDAREASOLID(#727,#728,#729,1.1800000000000002);
+#731=IFCSTYLEDITEM(#730,(#77),$);
+#732=IFCAXIS2PLACEMENT2D(#48,$);
+#733=IFCRECTANGLEPROFILEDEF(.AREA.,$,#732,0.05,0.12);
+#734=IFCAXIS2PLACEMENT3D(#1,$,$);
+#735=IFCDIRECTION((0.0,0.0,1.0));
+#736=IFCEXTRUDEDAREASOLID(#733,#734,#735,1.3);
+#737=IFCSTYLEDITEM(#736,(#67),$);
+#738=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#724,#730,#736));
+#739=IFCPRODUCTDEFINITIONSHAPE($,$,(#738));
+#740=IFCWINDOW('002llom_twcEPYR5Y4kBNH',$,'Window F-East 1',$,$,#719,#739,$,1.3,1.3,.WINDOW.,.NOTDEFINED.,$);
+#741=IFCRELFILLSELEMENT('2Z0gnMHzIq$phuTBrzhDie',$,$,$,#716,#740);
+#742=IFCAXIS2PLACEMENT3D(#210,$,$);
+#743=IFCLOCALPLACEMENT(#697,#742);
+#744=IFCAXIS2PLACEMENT2D(#48,$);
+#745=IFCRECTANGLEPROFILEDEF(.AREA.,$,#744,1.3,0.5);
+#746=IFCAXIS2PLACEMENT3D(#1,$,$);
+#747=IFCDIRECTION((0.0,0.0,1.0));
+#748=IFCEXTRUDEDAREASOLID(#745,#746,#747,1.3);
+#749=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#748));
+#750=IFCPRODUCTDEFINITIONSHAPE($,$,(#749));
+#751=IFCOPENINGELEMENT('0c4NidDPHU72Kza7upjM_d',$,'Opening F-East 2',$,$,#743,#750,$,.OPENING.);
+#752=IFCRELVOIDSELEMENT('0FODem1ph_HwU64RfJ0hZD',$,$,$,#706,#751);
+#753=IFCAXIS2PLACEMENT3D(#210,$,$);
+#754=IFCLOCALPLACEMENT(#697,#753);
+#755=IFCAXIS2PLACEMENT2D(#48,$);
+#756=IFCRECTANGLEPROFILEDEF(.AREA.,$,#755,1.3,0.1);
+#757=IFCAXIS2PLACEMENT3D(#1,$,$);
+#758=IFCDIRECTION((0.0,0.0,1.0));
+#759=IFCEXTRUDEDAREASOLID(#756,#757,#758,1.3);
+#760=IFCSTYLEDITEM(#759,(#67),$);
+#761=IFCAXIS2PLACEMENT2D(#48,$);
+#762=IFCRECTANGLEPROFILEDEF(.AREA.,$,#761,1.1800000000000002,0.04);
+#763=IFCAXIS2PLACEMENT3D(#71,$,$);
+#764=IFCDIRECTION((0.0,0.0,1.0));
+#765=IFCEXTRUDEDAREASOLID(#762,#763,#764,1.1800000000000002);
+#766=IFCSTYLEDITEM(#765,(#77),$);
+#767=IFCAXIS2PLACEMENT2D(#48,$);
+#768=IFCRECTANGLEPROFILEDEF(.AREA.,$,#767,0.05,0.12);
+#769=IFCAXIS2PLACEMENT3D(#1,$,$);
+#770=IFCDIRECTION((0.0,0.0,1.0));
+#771=IFCEXTRUDEDAREASOLID(#768,#769,#770,1.3);
+#772=IFCSTYLEDITEM(#771,(#67),$);
+#773=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#759,#765,#771));
+#774=IFCPRODUCTDEFINITIONSHAPE($,$,(#773));
+#775=IFCWINDOW('23m5s1YUU3_tH_BBzjajvY',$,'Window F-East 2',$,$,#754,#774,$,1.3,1.3,.WINDOW.,.NOTDEFINED.,$);
+#776=IFCRELFILLSELEMENT('2ES9o5HtjbyIN5hvgYPcy1',$,$,$,#751,#775);
+#777=IFCDIRECTION((0.0,0.0,1.0));
+#778=IFCDIRECTION((-1.0,0.0,0.0));
+#779=IFCAXIS2PLACEMENT3D(#246,#777,#778);
+#780=IFCLOCALPLACEMENT(#22,#779);
+#781=IFCAXIS2PLACEMENT2D(#32,$);
+#782=IFCRECTANGLEPROFILEDEF(.AREA.,$,#781,10.0,0.3);
+#783=IFCAXIS2PLACEMENT3D(#1,$,$);
+#784=IFCDIRECTION((0.0,0.0,1.0));
+#785=IFCEXTRUDEDAREASOLID(#782,#783,#784,2.8);
+#786=IFCSTYLEDITEM(#785,(#40),$);
+#787=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#785));
+#788=IFCPRODUCTDEFINITIONSHAPE($,$,(#787));
+#789=IFCWALL('3zgU70GqTpMKnrvDjPqJnZ',$,'F-North',$,$,#780,#788,$,.STANDARD.);
+#790=IFCAXIS2PLACEMENT3D(#260,$,$);
+#791=IFCLOCALPLACEMENT(#780,#790);
+#792=IFCAXIS2PLACEMENT2D(#48,$);
+#793=IFCRECTANGLEPROFILEDEF(.AREA.,$,#792,1.4,0.5);
+#794=IFCAXIS2PLACEMENT3D(#1,$,$);
+#795=IFCDIRECTION((0.0,0.0,1.0));
+#796=IFCEXTRUDEDAREASOLID(#793,#794,#795,1.3);
+#797=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#796));
+#798=IFCPRODUCTDEFINITIONSHAPE($,$,(#797));
+#799=IFCOPENINGELEMENT('0WZrhOah6iFLrcoVGqx4ms',$,'Opening F-North 1',$,$,#791,#798,$,.OPENING.);
+#800=IFCRELVOIDSELEMENT('3KqU$zffwZS1Kx$H_h2cGd',$,$,$,#789,#799);
+#801=IFCAXIS2PLACEMENT3D(#260,$,$);
+#802=IFCLOCALPLACEMENT(#780,#801);
+#803=IFCAXIS2PLACEMENT2D(#48,$);
+#804=IFCRECTANGLEPROFILEDEF(.AREA.,$,#803,1.4,0.1);
+#805=IFCAXIS2PLACEMENT3D(#1,$,$);
+#806=IFCDIRECTION((0.0,0.0,1.0));
+#807=IFCEXTRUDEDAREASOLID(#804,#805,#806,1.3);
+#808=IFCSTYLEDITEM(#807,(#67),$);
+#809=IFCAXIS2PLACEMENT2D(#48,$);
+#810=IFCRECTANGLEPROFILEDEF(.AREA.,$,#809,1.2799999999999998,0.04);
+#811=IFCAXIS2PLACEMENT3D(#71,$,$);
+#812=IFCDIRECTION((0.0,0.0,1.0));
+#813=IFCEXTRUDEDAREASOLID(#810,#811,#812,1.1800000000000002);
+#814=IFCSTYLEDITEM(#813,(#77),$);
+#815=IFCAXIS2PLACEMENT2D(#48,$);
+#816=IFCRECTANGLEPROFILEDEF(.AREA.,$,#815,0.05,0.12);
+#817=IFCAXIS2PLACEMENT3D(#1,$,$);
+#818=IFCDIRECTION((0.0,0.0,1.0));
+#819=IFCEXTRUDEDAREASOLID(#816,#817,#818,1.3);
+#820=IFCSTYLEDITEM(#819,(#67),$);
+#821=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#807,#813,#819));
+#822=IFCPRODUCTDEFINITIONSHAPE($,$,(#821));
+#823=IFCWINDOW('2wOOChS6nnhKUrpK6Dq1Gh',$,'Window F-North 1',$,$,#802,#822,$,1.3,1.4,.WINDOW.,.NOTDEFINED.,$);
+#824=IFCRELFILLSELEMENT('3U6OjNOYKjtM12uu4t0Wxf',$,$,$,#799,#823);
+#825=IFCAXIS2PLACEMENT3D(#296,$,$);
+#826=IFCLOCALPLACEMENT(#780,#825);
+#827=IFCAXIS2PLACEMENT2D(#48,$);
+#828=IFCRECTANGLEPROFILEDEF(.AREA.,$,#827,1.6,0.5);
+#829=IFCAXIS2PLACEMENT3D(#1,$,$);
+#830=IFCDIRECTION((0.0,0.0,1.0));
+#831=IFCEXTRUDEDAREASOLID(#828,#829,#830,1.3);
+#832=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#831));
+#833=IFCPRODUCTDEFINITIONSHAPE($,$,(#832));
+#834=IFCOPENINGELEMENT('2BM$FRnGUjT0nR8MOFUwgr',$,'Opening F-North 2',$,$,#826,#833,$,.OPENING.);
+#835=IFCRELVOIDSELEMENT('2t_bTVgk_QcDDZyGonp6s4',$,$,$,#789,#834);
+#836=IFCAXIS2PLACEMENT3D(#296,$,$);
+#837=IFCLOCALPLACEMENT(#780,#836);
+#838=IFCAXIS2PLACEMENT2D(#48,$);
+#839=IFCRECTANGLEPROFILEDEF(.AREA.,$,#838,1.6,0.1);
+#840=IFCAXIS2PLACEMENT3D(#1,$,$);
+#841=IFCDIRECTION((0.0,0.0,1.0));
+#842=IFCEXTRUDEDAREASOLID(#839,#840,#841,1.3);
+#843=IFCSTYLEDITEM(#842,(#67),$);
+#844=IFCAXIS2PLACEMENT2D(#48,$);
+#845=IFCRECTANGLEPROFILEDEF(.AREA.,$,#844,1.48,0.04);
+#846=IFCAXIS2PLACEMENT3D(#71,$,$);
+#847=IFCDIRECTION((0.0,0.0,1.0));
+#848=IFCEXTRUDEDAREASOLID(#845,#846,#847,1.1800000000000002);
+#849=IFCSTYLEDITEM(#848,(#77),$);
+#850=IFCAXIS2PLACEMENT2D(#48,$);
+#851=IFCRECTANGLEPROFILEDEF(.AREA.,$,#850,0.05,0.12);
+#852=IFCAXIS2PLACEMENT3D(#1,$,$);
+#853=IFCDIRECTION((0.0,0.0,1.0));
+#854=IFCEXTRUDEDAREASOLID(#851,#852,#853,1.3);
+#855=IFCSTYLEDITEM(#854,(#67),$);
+#856=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#842,#848,#854));
+#857=IFCPRODUCTDEFINITIONSHAPE($,$,(#856));
+#858=IFCWINDOW('1ljo0GQZqFlIj4dXF6QxiE',$,'Window F-North 2',$,$,#837,#857,$,1.3,1.6,.WINDOW.,.NOTDEFINED.,$);
+#859=IFCRELFILLSELEMENT('371qgXisk_XHZSavQa9hM$',$,$,$,#834,#858);
+#860=IFCAXIS2PLACEMENT3D(#332,$,$);
+#861=IFCLOCALPLACEMENT(#780,#860);
+#862=IFCAXIS2PLACEMENT2D(#48,$);
+#863=IFCRECTANGLEPROFILEDEF(.AREA.,$,#862,1.2,0.5);
+#864=IFCAXIS2PLACEMENT3D(#1,$,$);
+#865=IFCDIRECTION((0.0,0.0,1.0));
+#866=IFCEXTRUDEDAREASOLID(#863,#864,#865,1.3);
+#867=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#866));
+#868=IFCPRODUCTDEFINITIONSHAPE($,$,(#867));
+#869=IFCOPENINGELEMENT('3y2jAgq7jtBgZm_SAx8LgS',$,'Opening F-North 3',$,$,#861,#868,$,.OPENING.);
+#870=IFCRELVOIDSELEMENT('0gkGeOwDFEXZehxMk1jwOQ',$,$,$,#789,#869);
+#871=IFCAXIS2PLACEMENT3D(#332,$,$);
+#872=IFCLOCALPLACEMENT(#780,#871);
+#873=IFCAXIS2PLACEMENT2D(#48,$);
+#874=IFCRECTANGLEPROFILEDEF(.AREA.,$,#873,1.2,0.1);
+#875=IFCAXIS2PLACEMENT3D(#1,$,$);
+#876=IFCDIRECTION((0.0,0.0,1.0));
+#877=IFCEXTRUDEDAREASOLID(#874,#875,#876,1.3);
+#878=IFCSTYLEDITEM(#877,(#67),$);
+#879=IFCAXIS2PLACEMENT2D(#48,$);
+#880=IFCRECTANGLEPROFILEDEF(.AREA.,$,#879,1.08,0.04);
+#881=IFCAXIS2PLACEMENT3D(#71,$,$);
+#882=IFCDIRECTION((0.0,0.0,1.0));
+#883=IFCEXTRUDEDAREASOLID(#880,#881,#882,1.1800000000000002);
+#884=IFCSTYLEDITEM(#883,(#77),$);
+#885=IFCAXIS2PLACEMENT2D(#48,$);
+#886=IFCRECTANGLEPROFILEDEF(.AREA.,$,#885,0.05,0.12);
+#887=IFCAXIS2PLACEMENT3D(#1,$,$);
+#888=IFCDIRECTION((0.0,0.0,1.0));
+#889=IFCEXTRUDEDAREASOLID(#886,#887,#888,1.3);
+#890=IFCSTYLEDITEM(#889,(#67),$);
+#891=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#877,#883,#889));
+#892=IFCPRODUCTDEFINITIONSHAPE($,$,(#891));
+#893=IFCWINDOW('0dO3MxU3q2fqdzvRsS0QhI',$,'Window F-North 3',$,$,#872,#892,$,1.3,1.2,.WINDOW.,.NOTDEFINED.,$);
+#894=IFCRELFILLSELEMENT('3AukMzNDA5myYT7ws$MPel',$,$,$,#869,#893);
+#895=IFCDIRECTION((0.0,0.0,1.0));
+#896=IFCDIRECTION((0.0,-1.0,0.0));
+#897=IFCAXIS2PLACEMENT3D(#368,#895,#896);
+#898=IFCLOCALPLACEMENT(#22,#897);
+#899=IFCAXIS2PLACEMENT2D(#164,$);
+#900=IFCRECTANGLEPROFILEDEF(.AREA.,$,#899,8.0,0.3);
+#901=IFCAXIS2PLACEMENT3D(#1,$,$);
+#902=IFCDIRECTION((0.0,0.0,1.0));
+#903=IFCEXTRUDEDAREASOLID(#900,#901,#902,2.8);
+#904=IFCSTYLEDITEM(#903,(#40),$);
+#905=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#903));
+#906=IFCPRODUCTDEFINITIONSHAPE($,$,(#905));
+#907=IFCWALL('3RKLb7TIZW5$F3WSTt6aUT',$,'F-West',$,$,#898,#906,$,.STANDARD.);
+#908=IFCAXIS2PLACEMENT3D(#382,$,$);
+#909=IFCLOCALPLACEMENT(#898,#908);
+#910=IFCAXIS2PLACEMENT2D(#48,$);
+#911=IFCRECTANGLEPROFILEDEF(.AREA.,$,#910,1.4,0.5);
+#912=IFCAXIS2PLACEMENT3D(#1,$,$);
+#913=IFCDIRECTION((0.0,0.0,1.0));
+#914=IFCEXTRUDEDAREASOLID(#911,#912,#913,1.3);
+#915=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#914));
+#916=IFCPRODUCTDEFINITIONSHAPE($,$,(#915));
+#917=IFCOPENINGELEMENT('2hD0dFWUVDlBvttDgrqeNj',$,'Opening F-West 1',$,$,#909,#916,$,.OPENING.);
+#918=IFCRELVOIDSELEMENT('1qkV45hHoA2KsX2TkNDyWj',$,$,$,#907,#917);
+#919=IFCAXIS2PLACEMENT3D(#382,$,$);
+#920=IFCLOCALPLACEMENT(#898,#919);
+#921=IFCAXIS2PLACEMENT2D(#48,$);
+#922=IFCRECTANGLEPROFILEDEF(.AREA.,$,#921,1.4,0.1);
+#923=IFCAXIS2PLACEMENT3D(#1,$,$);
+#924=IFCDIRECTION((0.0,0.0,1.0));
+#925=IFCEXTRUDEDAREASOLID(#922,#923,#924,1.3);
+#926=IFCSTYLEDITEM(#925,(#67),$);
+#927=IFCAXIS2PLACEMENT2D(#48,$);
+#928=IFCRECTANGLEPROFILEDEF(.AREA.,$,#927,1.2799999999999998,0.04);
+#929=IFCAXIS2PLACEMENT3D(#71,$,$);
+#930=IFCDIRECTION((0.0,0.0,1.0));
+#931=IFCEXTRUDEDAREASOLID(#928,#929,#930,1.1800000000000002);
+#932=IFCSTYLEDITEM(#931,(#77),$);
+#933=IFCAXIS2PLACEMENT2D(#48,$);
+#934=IFCRECTANGLEPROFILEDEF(.AREA.,$,#933,0.05,0.12);
+#935=IFCAXIS2PLACEMENT3D(#1,$,$);
+#936=IFCDIRECTION((0.0,0.0,1.0));
+#937=IFCEXTRUDEDAREASOLID(#934,#935,#936,1.3);
+#938=IFCSTYLEDITEM(#937,(#67),$);
+#939=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#925,#931,#937));
+#940=IFCPRODUCTDEFINITIONSHAPE($,$,(#939));
+#941=IFCWINDOW('0jFVZnl4$Tgb5qecjO$9JC',$,'Window F-West 1',$,$,#920,#940,$,1.3,1.4,.WINDOW.,.NOTDEFINED.,$);
+#942=IFCRELFILLSELEMENT('3l_P2i$TyMZZqei1lgnmpZ',$,$,$,#917,#941);
+#943=IFCAXIS2PLACEMENT3D(#418,$,$);
+#944=IFCLOCALPLACEMENT(#898,#943);
+#945=IFCAXIS2PLACEMENT2D(#48,$);
+#946=IFCRECTANGLEPROFILEDEF(.AREA.,$,#945,1.4,0.5);
+#947=IFCAXIS2PLACEMENT3D(#1,$,$);
+#948=IFCDIRECTION((0.0,0.0,1.0));
+#949=IFCEXTRUDEDAREASOLID(#946,#947,#948,1.3);
+#950=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#949));
+#951=IFCPRODUCTDEFINITIONSHAPE($,$,(#950));
+#952=IFCOPENINGELEMENT('0kawJDw0PEeeccgkLgP$M4',$,'Opening F-West 2',$,$,#944,#951,$,.OPENING.);
+#953=IFCRELVOIDSELEMENT('1AVhqB0s0HSb1L74eOpLcr',$,$,$,#907,#952);
+#954=IFCAXIS2PLACEMENT3D(#418,$,$);
+#955=IFCLOCALPLACEMENT(#898,#954);
+#956=IFCAXIS2PLACEMENT2D(#48,$);
+#957=IFCRECTANGLEPROFILEDEF(.AREA.,$,#956,1.4,0.1);
+#958=IFCAXIS2PLACEMENT3D(#1,$,$);
+#959=IFCDIRECTION((0.0,0.0,1.0));
+#960=IFCEXTRUDEDAREASOLID(#957,#958,#959,1.3);
+#961=IFCSTYLEDITEM(#960,(#67),$);
+#962=IFCAXIS2PLACEMENT2D(#48,$);
+#963=IFCRECTANGLEPROFILEDEF(.AREA.,$,#962,1.2799999999999998,0.04);
+#964=IFCAXIS2PLACEMENT3D(#71,$,$);
+#965=IFCDIRECTION((0.0,0.0,1.0));
+#966=IFCEXTRUDEDAREASOLID(#963,#964,#965,1.1800000000000002);
+#967=IFCSTYLEDITEM(#966,(#77),$);
+#968=IFCAXIS2PLACEMENT2D(#48,$);
+#969=IFCRECTANGLEPROFILEDEF(.AREA.,$,#968,0.05,0.12);
+#970=IFCAXIS2PLACEMENT3D(#1,$,$);
+#971=IFCDIRECTION((0.0,0.0,1.0));
+#972=IFCEXTRUDEDAREASOLID(#969,#970,#971,1.3);
+#973=IFCSTYLEDITEM(#972,(#67),$);
+#974=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#960,#966,#972));
+#975=IFCPRODUCTDEFINITIONSHAPE($,$,(#974));
+#976=IFCWINDOW('0Tftab_icdnHrieaUXNTy6',$,'Window F-West 2',$,$,#955,#975,$,1.3,1.4,.WINDOW.,.NOTDEFINED.,$);
+#977=IFCRELFILLSELEMENT('387Uk216V_6AQDuTnSrlTs',$,$,$,#952,#976);
+#978=IFCDIRECTION((0.0,0.0,1.0));
+#979=IFCDIRECTION((0.0,1.0,0.0));
+#980=IFCAXIS2PLACEMENT3D(#454,#978,#979);
+#981=IFCLOCALPLACEMENT(#22,#980);
+#982=IFCAXIS2PLACEMENT2D(#459,$);
+#983=IFCRECTANGLEPROFILEDEF(.AREA.,$,#982,7.699999999999999,0.15);
+#984=IFCAXIS2PLACEMENT3D(#1,$,$);
+#985=IFCDIRECTION((0.0,0.0,1.0));
+#986=IFCEXTRUDEDAREASOLID(#983,#984,#985,2.8);
+#987=IFCSTYLEDITEM(#986,(#40),$);
+#988=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#986));
+#989=IFCPRODUCTDEFINITIONSHAPE($,$,(#988));
+#990=IFCWALL('1cqN1nF4rR22Cfk9xtU0Ed',$,'F-Partition A',$,$,#981,#989,$,.STANDARD.);
+#991=IFCAXIS2PLACEMENT3D(#469,$,$);
+#992=IFCLOCALPLACEMENT(#981,#991);
+#993=IFCAXIS2PLACEMENT2D(#48,$);
+#994=IFCRECTANGLEPROFILEDEF(.AREA.,$,#993,0.9,0.35);
+#995=IFCAXIS2PLACEMENT3D(#1,$,$);
+#996=IFCDIRECTION((0.0,0.0,1.0));
+#997=IFCEXTRUDEDAREASOLID(#994,#995,#996,2.05);
+#998=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#997));
+#999=IFCPRODUCTDEFINITIONSHAPE($,$,(#998));
+#1000=IFCOPENINGELEMENT('1A7Jx9Rc_bCKL8WXfiMKGo',$,'Opening F-Partition A 1',$,$,#992,#999,$,.OPENING.);
+#1001=IFCRELVOIDSELEMENT('33SN7gElzYmGXOKqISIqCA',$,$,$,#990,#1000);
+#1002=IFCAXIS2PLACEMENT3D(#469,$,$);
+#1003=IFCLOCALPLACEMENT(#981,#1002);
+#1004=IFCAXIS2PLACEMENT2D(#48,$);
+#1005=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1004,0.8,0.06);
+#1006=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1007=IFCDIRECTION((0.0,0.0,1.0));
+#1008=IFCEXTRUDEDAREASOLID(#1005,#1006,#1007,1.9999999999999998);
+#1009=IFCSTYLEDITEM(#1008,(#146),$);
+#1010=IFCAXIS2PLACEMENT2D(#48,$);
+#1011=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1010,0.08,0.14);
+#1012=IFCAXIS2PLACEMENT3D(#491,$,$);
+#1013=IFCDIRECTION((0.0,0.0,1.0));
+#1014=IFCEXTRUDEDAREASOLID(#1011,#1012,#1013,0.08);
+#1015=IFCSTYLEDITEM(#1014,(#67),$);
+#1016=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1008,#1014));
+#1017=IFCPRODUCTDEFINITIONSHAPE($,$,(#1016));
+#1018=IFCDOOR('0fef_ZKXAjXWfcIzwdMFtE',$,'Door F-Partition A 1',$,$,#1003,#1017,$,2.05,0.9,.DOOR.,.NOTDEFINED.,$);
+#1019=IFCRELFILLSELEMENT('24avWnKV6QfEdOyOlVrIVb',$,$,$,#1000,#1018);
+#1020=IFCAXIS2PLACEMENT3D(#500,$,$);
+#1021=IFCLOCALPLACEMENT(#981,#1020);
+#1022=IFCAXIS2PLACEMENT2D(#48,$);
+#1023=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1022,0.9,0.35);
+#1024=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1025=IFCDIRECTION((0.0,0.0,1.0));
+#1026=IFCEXTRUDEDAREASOLID(#1023,#1024,#1025,2.05);
+#1027=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1026));
+#1028=IFCPRODUCTDEFINITIONSHAPE($,$,(#1027));
+#1029=IFCOPENINGELEMENT('2Ia3e1oW2LLwQLqE9RhVwf',$,'Opening F-Partition A 2',$,$,#1021,#1028,$,.OPENING.);
+#1030=IFCRELVOIDSELEMENT('3ifvMT1yUoC7ZDWDbtOB8v',$,$,$,#990,#1029);
+#1031=IFCAXIS2PLACEMENT3D(#500,$,$);
+#1032=IFCLOCALPLACEMENT(#981,#1031);
+#1033=IFCAXIS2PLACEMENT2D(#48,$);
+#1034=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1033,0.8,0.06);
+#1035=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1036=IFCDIRECTION((0.0,0.0,1.0));
+#1037=IFCEXTRUDEDAREASOLID(#1034,#1035,#1036,1.9999999999999998);
+#1038=IFCSTYLEDITEM(#1037,(#146),$);
+#1039=IFCAXIS2PLACEMENT2D(#48,$);
+#1040=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1039,0.08,0.14);
+#1041=IFCAXIS2PLACEMENT3D(#491,$,$);
+#1042=IFCDIRECTION((0.0,0.0,1.0));
+#1043=IFCEXTRUDEDAREASOLID(#1040,#1041,#1042,0.08);
+#1044=IFCSTYLEDITEM(#1043,(#67),$);
+#1045=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1037,#1043));
+#1046=IFCPRODUCTDEFINITIONSHAPE($,$,(#1045));
+#1047=IFCDOOR('3dTXGyheoV$V3_9RdivWVr',$,'Door F-Partition A 2',$,$,#1032,#1046,$,2.05,0.9,.DOOR.,.NOTDEFINED.,$);
+#1048=IFCRELFILLSELEMENT('0Cov0_Zpt9Rs9u4dv7fsf2',$,$,$,#1029,#1047);
+#1049=IFCDIRECTION((0.0,0.0,1.0));
+#1050=IFCDIRECTION((1.0,0.0,0.0));
+#1051=IFCAXIS2PLACEMENT3D(#530,#1049,#1050);
+#1052=IFCLOCALPLACEMENT(#22,#1051);
+#1053=IFCAXIS2PLACEMENT2D(#535,$);
+#1054=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1053,5.85,0.15);
+#1055=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1056=IFCDIRECTION((0.0,0.0,1.0));
+#1057=IFCEXTRUDEDAREASOLID(#1054,#1055,#1056,2.8);
+#1058=IFCSTYLEDITEM(#1057,(#40),$);
+#1059=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1057));
+#1060=IFCPRODUCTDEFINITIONSHAPE($,$,(#1059));
+#1061=IFCWALL('1hq$nFp8YYtC3UTELD_Uv7',$,'F-Partition B',$,$,#1052,#1060,$,.STANDARD.);
+#1062=IFCAXIS2PLACEMENT3D(#545,$,$);
+#1063=IFCLOCALPLACEMENT(#1052,#1062);
+#1064=IFCAXIS2PLACEMENT2D(#48,$);
+#1065=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1064,0.9,0.35);
+#1066=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1067=IFCDIRECTION((0.0,0.0,1.0));
+#1068=IFCEXTRUDEDAREASOLID(#1065,#1066,#1067,2.05);
+#1069=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1068));
+#1070=IFCPRODUCTDEFINITIONSHAPE($,$,(#1069));
+#1071=IFCOPENINGELEMENT('2c83NhPnPXLIbej7lXvPXw',$,'Opening F-Partition B 1',$,$,#1063,#1070,$,.OPENING.);
+#1072=IFCRELVOIDSELEMENT('0W72NcfsqpExiWuS17yp5l',$,$,$,#1061,#1071);
+#1073=IFCAXIS2PLACEMENT3D(#545,$,$);
+#1074=IFCLOCALPLACEMENT(#1052,#1073);
+#1075=IFCAXIS2PLACEMENT2D(#48,$);
+#1076=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1075,0.8,0.06);
+#1077=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1078=IFCDIRECTION((0.0,0.0,1.0));
+#1079=IFCEXTRUDEDAREASOLID(#1076,#1077,#1078,1.9999999999999998);
+#1080=IFCSTYLEDITEM(#1079,(#146),$);
+#1081=IFCAXIS2PLACEMENT2D(#48,$);
+#1082=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1081,0.08,0.14);
+#1083=IFCAXIS2PLACEMENT3D(#491,$,$);
+#1084=IFCDIRECTION((0.0,0.0,1.0));
+#1085=IFCEXTRUDEDAREASOLID(#1082,#1083,#1084,0.08);
+#1086=IFCSTYLEDITEM(#1085,(#67),$);
+#1087=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1079,#1085));
+#1088=IFCPRODUCTDEFINITIONSHAPE($,$,(#1087));
+#1089=IFCDOOR('1dNPk$DGVG$_TfbF1v2zh9',$,'Door F-Partition B 1',$,$,#1074,#1088,$,2.05,0.9,.DOOR.,.NOTDEFINED.,$);
+#1090=IFCRELFILLSELEMENT('1H$h4uimJ_fnSqpROw3nhT',$,$,$,#1071,#1089);
+#1091=IFCCARTESIANPOINT((5.0,4.0));
+#1092=IFCAXIS2PLACEMENT2D(#1091,$);
+#1093=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1092,10.3,8.3);
+#1094=IFCCARTESIANPOINT((0.0,0.0,-0.2));
+#1095=IFCAXIS2PLACEMENT3D(#1094,$,$);
+#1096=IFCDIRECTION((0.0,0.0,1.0));
+#1097=IFCEXTRUDEDAREASOLID(#1093,#1095,#1096,0.2);
+#1098=IFCCOLOURRGB($,0.62,0.62,0.6);
+#1099=IFCSURFACESTYLERENDERING(#1098,0.0,$,$,$,$,$,$,.FLAT.);
+#1100=IFCSURFACESTYLE('Concrete',.BOTH.,(#1099));
+#1101=IFCSTYLEDITEM(#1097,(#1100),$);
+#1102=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1103=IFCLOCALPLACEMENT(#18,#1102);
+#1104=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1097));
+#1105=IFCPRODUCTDEFINITIONSHAPE($,$,(#1104));
+#1106=IFCSLAB('3uW8_5KuqrHFDQqcV_sUwS',$,'Ground slab',$,$,#1103,#1105,$,.BASESLAB.);
+#1107=IFCCARTESIANPOINT((-0.15,-0.15));
+#1108=IFCCARTESIANPOINT((10.15,-0.15));
+#1109=IFCCARTESIANPOINT((10.15,8.15));
+#1110=IFCCARTESIANPOINT((-0.15,8.15));
+#1111=IFCPOLYLINE((#1107,#1108,#1109,#1110,#1107));
+#1112=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#1111);
+#1113=IFCCARTESIANPOINT((0.0,0.0,2.8));
+#1114=IFCAXIS2PLACEMENT3D(#1113,$,$);
+#1115=IFCDIRECTION((0.0,0.0,1.0));
+#1116=IFCEXTRUDEDAREASOLID(#1112,#1114,#1115,0.2);
+#1117=IFCSTYLEDITEM(#1116,(#1100),$);
+#1118=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1119=IFCLOCALPLACEMENT(#18,#1118);
+#1120=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1116));
+#1121=IFCPRODUCTDEFINITIONSHAPE($,$,(#1120));
+#1122=IFCSLAB('1JroyyVJjHzn1vqdj4iASO',$,'Floor slab',$,$,#1119,#1121,$,.FLOOR.);
+#1123=IFCCARTESIANPOINT((8.2,-0.8));
+#1124=IFCAXIS2PLACEMENT2D(#1123,$);
+#1125=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1124,4.0,1.4);
+#1126=IFCAXIS2PLACEMENT3D(#1113,$,$);
+#1127=IFCDIRECTION((0.0,0.0,1.0));
+#1128=IFCEXTRUDEDAREASOLID(#1125,#1126,#1127,0.15);
+#1129=IFCSTYLEDITEM(#1128,(#1100),$);
+#1130=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1131=IFCLOCALPLACEMENT(#18,#1130);
+#1132=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1128));
+#1133=IFCPRODUCTDEFINITIONSHAPE($,$,(#1132));
+#1134=IFCSLAB('0_KD9qIz8ZVasBE2JIVZf7',$,'Porch roof',$,$,#1131,#1133,$,.ROOF.);
+#1135=IFCAXIS2PLACEMENT2D(#48,$);
+#1136=IFCCIRCLEPROFILEDEF(.AREA.,$,#1135,0.15);
+#1137=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1138=IFCDIRECTION((0.0,0.0,1.0));
+#1139=IFCEXTRUDEDAREASOLID(#1136,#1137,#1138,2.8);
+#1140=IFCCOLOURRGB($,0.9,0.9,0.9);
+#1141=IFCSURFACESTYLERENDERING(#1140,0.0,$,$,$,$,$,$,.FLAT.);
+#1142=IFCSURFACESTYLE('Column',.BOTH.,(#1141));
+#1143=IFCSTYLEDITEM(#1139,(#1142),$);
+#1144=IFCCARTESIANPOINT((6.4,-1.3,0.0));
+#1145=IFCAXIS2PLACEMENT3D(#1144,$,$);
+#1146=IFCLOCALPLACEMENT(#18,#1145);
+#1147=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1139));
+#1148=IFCPRODUCTDEFINITIONSHAPE($,$,(#1147));
+#1149=IFCCOLUMN('0jBmRafpDIHsHe86WbER21',$,'Porch column 1',$,$,#1146,#1148,$,.COLUMN.);
+#1150=IFCAXIS2PLACEMENT2D(#48,$);
+#1151=IFCCIRCLEPROFILEDEF(.AREA.,$,#1150,0.15);
+#1152=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1153=IFCDIRECTION((0.0,0.0,1.0));
+#1154=IFCEXTRUDEDAREASOLID(#1151,#1152,#1153,2.8);
+#1155=IFCSTYLEDITEM(#1154,(#1142),$);
+#1156=IFCCARTESIANPOINT((10.0,-1.3,0.0));
+#1157=IFCAXIS2PLACEMENT3D(#1156,$,$);
+#1158=IFCLOCALPLACEMENT(#18,#1157);
+#1159=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1154));
+#1160=IFCPRODUCTDEFINITIONSHAPE($,$,(#1159));
+#1161=IFCCOLUMN('0oREbHPhoml9VoeBJ0D39C',$,'Porch column 2',$,$,#1158,#1160,$,.COLUMN.);
+#1162=IFCCARTESIANPOINT((-0.6,0.0));
+#1163=IFCCARTESIANPOINT((8.6,0.0));
+#1164=IFCCARTESIANPOINT((4.0,2.7));
+#1165=IFCPOLYLINE((#1162,#1163,#1164,#1162));
+#1166=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#1165);
+#1167=IFCDIRECTION((1.0,0.0,0.0));
+#1168=IFCDIRECTION((0.0,1.0,0.0));
+#1169=IFCAXIS2PLACEMENT3D(#1,#1167,#1168);
+#1170=IFCDIRECTION((0.0,0.0,1.0));
+#1171=IFCEXTRUDEDAREASOLID(#1166,#1169,#1170,11.2);
+#1172=IFCCOLOURRGB($,0.7,0.28,0.2);
+#1173=IFCSURFACESTYLERENDERING(#1172,0.0,$,$,$,$,$,$,.FLAT.);
+#1174=IFCSURFACESTYLE('Tiles',.BOTH.,(#1173));
+#1175=IFCSTYLEDITEM(#1171,(#1174),$);
+#1176=IFCCARTESIANPOINT((-0.6,0.0,3.0));
+#1177=IFCAXIS2PLACEMENT3D(#1176,$,$);
+#1178=IFCLOCALPLACEMENT(#22,#1177);
+#1179=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1171));
+#1180=IFCPRODUCTDEFINITIONSHAPE($,$,(#1179));
+#1181=IFCROOF('1BQq88wgrCSySlkWj6H5xP',$,'Gable roof',$,$,#1178,#1180,$,.GABLE_ROOF.);
+#1182=IFCCARTESIANPOINT((0.0,0.14));
+#1183=IFCAXIS2PLACEMENT2D(#1182,$);
+#1184=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1183,1.0,0.28);
+#1185=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1186=IFCDIRECTION((0.0,0.0,1.0));
+#1187=IFCEXTRUDEDAREASOLID(#1184,#1185,#1186,0.25);
+#1188=IFCCOLOURRGB($,0.6,0.42,0.25);
+#1189=IFCSURFACESTYLERENDERING(#1188,0.0,$,$,$,$,$,$,.FLAT.);
+#1190=IFCSURFACESTYLE('Wood',.BOTH.,(#1189));
+#1191=IFCSTYLEDITEM(#1187,(#1190),$);
+#1192=IFCCARTESIANPOINT((0.0,0.42000000000000004));
+#1193=IFCAXIS2PLACEMENT2D(#1192,$);
+#1194=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1193,1.0,0.28);
+#1195=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1196=IFCDIRECTION((0.0,0.0,1.0));
+#1197=IFCEXTRUDEDAREASOLID(#1194,#1195,#1196,0.5);
+#1198=IFCSTYLEDITEM(#1197,(#1190),$);
+#1199=IFCCARTESIANPOINT((0.0,0.7000000000000001));
+#1200=IFCAXIS2PLACEMENT2D(#1199,$);
+#1201=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1200,1.0,0.28);
+#1202=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1203=IFCDIRECTION((0.0,0.0,1.0));
+#1204=IFCEXTRUDEDAREASOLID(#1201,#1202,#1203,0.75);
+#1205=IFCSTYLEDITEM(#1204,(#1190),$);
+#1206=IFCCARTESIANPOINT((0.0,0.9800000000000001));
+#1207=IFCAXIS2PLACEMENT2D(#1206,$);
+#1208=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1207,1.0,0.28);
+#1209=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1210=IFCDIRECTION((0.0,0.0,1.0));
+#1211=IFCEXTRUDEDAREASOLID(#1208,#1209,#1210,1.0);
+#1212=IFCSTYLEDITEM(#1211,(#1190),$);
+#1213=IFCCARTESIANPOINT((0.0,1.2600000000000002));
+#1214=IFCAXIS2PLACEMENT2D(#1213,$);
+#1215=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1214,1.0,0.28);
+#1216=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1217=IFCDIRECTION((0.0,0.0,1.0));
+#1218=IFCEXTRUDEDAREASOLID(#1215,#1216,#1217,1.25);
+#1219=IFCSTYLEDITEM(#1218,(#1190),$);
+#1220=IFCCARTESIANPOINT((0.0,1.54));
+#1221=IFCAXIS2PLACEMENT2D(#1220,$);
+#1222=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1221,1.0,0.28);
+#1223=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1224=IFCDIRECTION((0.0,0.0,1.0));
+#1225=IFCEXTRUDEDAREASOLID(#1222,#1223,#1224,1.5);
+#1226=IFCSTYLEDITEM(#1225,(#1190),$);
+#1227=IFCCARTESIANPOINT((0.0,1.8200000000000003));
+#1228=IFCAXIS2PLACEMENT2D(#1227,$);
+#1229=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1228,1.0,0.28);
+#1230=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1231=IFCDIRECTION((0.0,0.0,1.0));
+#1232=IFCEXTRUDEDAREASOLID(#1229,#1230,#1231,1.75);
+#1233=IFCSTYLEDITEM(#1232,(#1190),$);
+#1234=IFCCARTESIANPOINT((0.0,2.1));
+#1235=IFCAXIS2PLACEMENT2D(#1234,$);
+#1236=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1235,1.0,0.28);
+#1237=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1238=IFCDIRECTION((0.0,0.0,1.0));
+#1239=IFCEXTRUDEDAREASOLID(#1236,#1237,#1238,2.0);
+#1240=IFCSTYLEDITEM(#1239,(#1190),$);
+#1241=IFCCARTESIANPOINT((0.0,2.3800000000000003));
+#1242=IFCAXIS2PLACEMENT2D(#1241,$);
+#1243=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1242,1.0,0.28);
+#1244=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1245=IFCDIRECTION((0.0,0.0,1.0));
+#1246=IFCEXTRUDEDAREASOLID(#1243,#1244,#1245,2.25);
+#1247=IFCSTYLEDITEM(#1246,(#1190),$);
+#1248=IFCCARTESIANPOINT((0.0,2.6600000000000006));
+#1249=IFCAXIS2PLACEMENT2D(#1248,$);
+#1250=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1249,1.0,0.28);
+#1251=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1252=IFCDIRECTION((0.0,0.0,1.0));
+#1253=IFCEXTRUDEDAREASOLID(#1250,#1251,#1252,2.5);
+#1254=IFCSTYLEDITEM(#1253,(#1190),$);
+#1255=IFCCARTESIANPOINT((0.0,2.9400000000000004));
+#1256=IFCAXIS2PLACEMENT2D(#1255,$);
+#1257=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1256,1.0,0.28);
+#1258=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1259=IFCDIRECTION((0.0,0.0,1.0));
+#1260=IFCEXTRUDEDAREASOLID(#1257,#1258,#1259,2.75);
+#1261=IFCSTYLEDITEM(#1260,(#1190),$);
+#1262=IFCCARTESIANPOINT((6.9,4.3,0.0));
+#1263=IFCAXIS2PLACEMENT3D(#1262,$,$);
+#1264=IFCLOCALPLACEMENT(#18,#1263);
+#1265=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1187,#1197,#1204,#1211,#1218,#1225,#1232,#1239,#1246,#1253,#1260));
+#1266=IFCPRODUCTDEFINITIONSHAPE($,$,(#1265));
+#1267=IFCSTAIR('2S8F5STq7u_$iRCyHmIalm',$,'Stair',$,$,#1264,#1266,$,.STRAIGHT_RUN_STAIR.);
+#1268=IFCAXIS2PLACEMENT2D(#48,$);
+#1269=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1268,0.45,0.45);
+#1270=IFCCARTESIANPOINT((0.0,0.0,0.45));
+#1271=IFCAXIS2PLACEMENT3D(#1270,$,$);
+#1272=IFCDIRECTION((0.0,0.0,1.0));
+#1273=IFCEXTRUDEDAREASOLID(#1269,#1271,#1272,0.05);
+#1274=IFCCOLOURRGB($,0.75,0.2,0.2);
+#1275=IFCSURFACESTYLERENDERING(#1274,0.0,$,$,$,$,$,$,.FLAT.);
+#1276=IFCSURFACESTYLE('Chair',.BOTH.,(#1275));
+#1277=IFCSTYLEDITEM(#1273,(#1276),$);
+#1278=IFCCARTESIANPOINT((0.0,-0.2));
+#1279=IFCAXIS2PLACEMENT2D(#1278,$);
+#1280=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1279,0.45,0.05);
+#1281=IFCCARTESIANPOINT((0.0,0.0,0.5));
+#1282=IFCAXIS2PLACEMENT3D(#1281,$,$);
+#1283=IFCDIRECTION((0.0,0.0,1.0));
+#1284=IFCEXTRUDEDAREASOLID(#1280,#1282,#1283,0.5);
+#1285=IFCSTYLEDITEM(#1284,(#1276),$);
+#1286=IFCCARTESIANPOINT((-0.19,-0.19));
+#1287=IFCAXIS2PLACEMENT2D(#1286,$);
+#1288=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1287,0.05,0.05);
+#1289=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1290=IFCDIRECTION((0.0,0.0,1.0));
+#1291=IFCEXTRUDEDAREASOLID(#1288,#1289,#1290,0.45);
+#1292=IFCCOLOURRGB($,0.3,0.2,0.15);
+#1293=IFCSURFACESTYLERENDERING(#1292,0.0,$,$,$,$,$,$,.FLAT.);
+#1294=IFCSURFACESTYLE('Chair legs',.BOTH.,(#1293));
+#1295=IFCSTYLEDITEM(#1291,(#1294),$);
+#1296=IFCCARTESIANPOINT((-0.19,0.19));
+#1297=IFCAXIS2PLACEMENT2D(#1296,$);
+#1298=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1297,0.05,0.05);
+#1299=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1300=IFCDIRECTION((0.0,0.0,1.0));
+#1301=IFCEXTRUDEDAREASOLID(#1298,#1299,#1300,0.45);
+#1302=IFCSTYLEDITEM(#1301,(#1294),$);
+#1303=IFCCARTESIANPOINT((0.19,-0.19));
+#1304=IFCAXIS2PLACEMENT2D(#1303,$);
+#1305=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1304,0.05,0.05);
+#1306=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1307=IFCDIRECTION((0.0,0.0,1.0));
+#1308=IFCEXTRUDEDAREASOLID(#1305,#1306,#1307,0.45);
+#1309=IFCSTYLEDITEM(#1308,(#1294),$);
+#1310=IFCCARTESIANPOINT((0.19,0.19));
+#1311=IFCAXIS2PLACEMENT2D(#1310,$);
+#1312=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1311,0.05,0.05);
+#1313=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1314=IFCDIRECTION((0.0,0.0,1.0));
+#1315=IFCEXTRUDEDAREASOLID(#1312,#1313,#1314,0.45);
+#1316=IFCSTYLEDITEM(#1315,(#1294),$);
+#1317=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1273,#1284,#1291,#1301,#1308,#1315));
+#1318=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1319=IFCREPRESENTATIONMAP(#1318,#1317);
+#1320=IFCAXIS2PLACEMENT2D(#48,$);
+#1321=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1320,1.6,0.9);
+#1322=IFCCARTESIANPOINT((0.0,0.0,0.72));
+#1323=IFCAXIS2PLACEMENT3D(#1322,$,$);
+#1324=IFCDIRECTION((0.0,0.0,1.0));
+#1325=IFCEXTRUDEDAREASOLID(#1321,#1323,#1324,0.06);
+#1326=IFCSTYLEDITEM(#1325,(#1190),$);
+#1327=IFCCARTESIANPOINT((-0.72,-0.36));
+#1328=IFCAXIS2PLACEMENT2D(#1327,$);
+#1329=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1328,0.07,0.07);
+#1330=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1331=IFCDIRECTION((0.0,0.0,1.0));
+#1332=IFCEXTRUDEDAREASOLID(#1329,#1330,#1331,0.72);
+#1333=IFCSTYLEDITEM(#1332,(#1190),$);
+#1334=IFCCARTESIANPOINT((-0.72,0.36));
+#1335=IFCAXIS2PLACEMENT2D(#1334,$);
+#1336=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1335,0.07,0.07);
+#1337=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1338=IFCDIRECTION((0.0,0.0,1.0));
+#1339=IFCEXTRUDEDAREASOLID(#1336,#1337,#1338,0.72);
+#1340=IFCSTYLEDITEM(#1339,(#1190),$);
+#1341=IFCCARTESIANPOINT((0.72,-0.36));
+#1342=IFCAXIS2PLACEMENT2D(#1341,$);
+#1343=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1342,0.07,0.07);
+#1344=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1345=IFCDIRECTION((0.0,0.0,1.0));
+#1346=IFCEXTRUDEDAREASOLID(#1343,#1344,#1345,0.72);
+#1347=IFCSTYLEDITEM(#1346,(#1190),$);
+#1348=IFCCARTESIANPOINT((0.72,0.36));
+#1349=IFCAXIS2PLACEMENT2D(#1348,$);
+#1350=IFCRECTANGLEPROFILEDEF(.AREA.,$,#1349,0.07,0.07);
+#1351=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1352=IFCDIRECTION((0.0,0.0,1.0));
+#1353=IFCEXTRUDEDAREASOLID(#1350,#1351,#1352,0.72);
+#1354=IFCSTYLEDITEM(#1353,(#1190),$);
+#1355=IFCSHAPEREPRESENTATION(#4,'Body','SweptSolid',(#1325,#1332,#1339,#1346,#1353));
+#1356=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1357=IFCREPRESENTATIONMAP(#1356,#1355);
+#1358=IFCCARTESIANPOINT((3.0,6.0,0.0));
+#1359=IFCAXIS2PLACEMENT3D(#1358,$,$);
+#1360=IFCLOCALPLACEMENT(#18,#1359);
+#1361=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#1,1.0,$);
+#1362=IFCMAPPEDITEM(#1357,#1361);
+#1363=IFCSHAPEREPRESENTATION(#4,'Body','MappedRepresentation',(#1362));
+#1364=IFCPRODUCTDEFINITIONSHAPE($,$,(#1363));
+#1365=IFCFURNISHINGELEMENT('23emMOrFixFBz6b1LSbkTz',$,'Table',$,$,#1360,#1364,$);
+#1366=IFCCARTESIANPOINT((2.4,6.0,0.0));
+#1367=IFCDIRECTION((0.0,0.0,1.0));
+#1368=IFCDIRECTION((6.123233995736766e-17,1.0,0.0));
+#1369=IFCAXIS2PLACEMENT3D(#1366,#1367,#1368);
+#1370=IFCLOCALPLACEMENT(#18,#1369);
+#1371=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#1,1.0,$);
+#1372=IFCMAPPEDITEM(#1319,#1371);
+#1373=IFCSHAPEREPRESENTATION(#4,'Body','MappedRepresentation',(#1372));
+#1374=IFCPRODUCTDEFINITIONSHAPE($,$,(#1373));
+#1375=IFCFURNISHINGELEMENT('3G$SrKgftfRZnuLGl2A24u',$,'Chair 1',$,$,#1370,#1374,$);
+#1376=IFCCARTESIANPOINT((3.6,6.0,0.0));
+#1377=IFCDIRECTION((0.0,0.0,1.0));
+#1378=IFCDIRECTION((6.123233995736766e-17,-1.0,0.0));
+#1379=IFCAXIS2PLACEMENT3D(#1376,#1377,#1378);
+#1380=IFCLOCALPLACEMENT(#18,#1379);
+#1381=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#1,1.0,$);
+#1382=IFCMAPPEDITEM(#1319,#1381);
+#1383=IFCSHAPEREPRESENTATION(#4,'Body','MappedRepresentation',(#1382));
+#1384=IFCPRODUCTDEFINITIONSHAPE($,$,(#1383));
+#1385=IFCFURNISHINGELEMENT('3eSe6_fq7qr1vguEGIUDoM',$,'Chair 2',$,$,#1380,#1384,$);
+#1386=IFCCARTESIANPOINT((3.0,5.2,0.0));
+#1387=IFCDIRECTION((0.0,0.0,1.0));
+#1388=IFCDIRECTION((-1.0,1.2246467991473532e-16,0.0));
+#1389=IFCAXIS2PLACEMENT3D(#1386,#1387,#1388);
+#1390=IFCLOCALPLACEMENT(#18,#1389);
+#1391=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#1,1.0,$);
+#1392=IFCMAPPEDITEM(#1319,#1391);
+#1393=IFCSHAPEREPRESENTATION(#4,'Body','MappedRepresentation',(#1392));
+#1394=IFCPRODUCTDEFINITIONSHAPE($,$,(#1393));
+#1395=IFCFURNISHINGELEMENT('0d$KI4yAjD7xYvVgT8q4zG',$,'Chair 3',$,$,#1390,#1394,$);
+#1396=IFCCARTESIANPOINT((3.0,6.8,0.0));
+#1397=IFCDIRECTION((0.0,0.0,1.0));
+#1398=IFCDIRECTION((1.0,0.0,0.0));
+#1399=IFCAXIS2PLACEMENT3D(#1396,#1397,#1398);
+#1400=IFCLOCALPLACEMENT(#18,#1399);
+#1401=IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,#1,1.0,$);
+#1402=IFCMAPPEDITEM(#1319,#1401);
+#1403=IFCSHAPEREPRESENTATION(#4,'Body','MappedRepresentation',(#1402));
+#1404=IFCPRODUCTDEFINITIONSHAPE($,$,(#1403));
+#1405=IFCFURNISHINGELEMENT('0KudeHLcXeHkPVKDQ4sVh1',$,'Chair 4',$,$,#1400,#1404,$);
+#1406=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1407=IFCLOCALPLACEMENT(#18,#1406);
+#1408=IFCSPACE('2KNKWx9yNmqWh_dBhsSwYr',$,'Living room',$,$,#1407,$,$,.ELEMENT.,.INTERNAL.,$);
+#1409=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1410=IFCLOCALPLACEMENT(#18,#1409);
+#1411=IFCSPACE('0f2Avw7pTSvALFiOeiSXIX',$,'Kitchen',$,$,#1410,$,$,.ELEMENT.,.INTERNAL.,$);
+#1412=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1413=IFCLOCALPLACEMENT(#18,#1412);
+#1414=IFCSPACE('0EOHNmkQ4Z8RvOIEJDWAaL',$,'Hall',$,$,#1413,$,$,.ELEMENT.,.INTERNAL.,$);
+#1415=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1416=IFCLOCALPLACEMENT(#22,#1415);
+#1417=IFCSPACE('1x4u81T7gJE8bMsUhdF3CW',$,'Bedroom',$,$,#1416,$,$,.ELEMENT.,.INTERNAL.,$);
+#1418=IFCAXIS2PLACEMENT3D(#1,$,$);
+#1419=IFCLOCALPLACEMENT(#22,#1418);
+#1420=IFCSPACE('1ayJFSQ8Utto_pkXiX9oEX',$,'Bath',$,$,#1419,$,$,.ELEMENT.,.INTERNAL.,$);
+#1421=IFCRELAGGREGATES('2szUB7fVbu2CEN4ckI58jC',$,$,$,#19,(#1408,#1411,#1414));
+#1422=IFCRELAGGREGATES('1yGO1uoLb4mNBKRmU$T6EQ',$,$,$,#23,(#1417,#1420));
+#1423=IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.T.),$);
+#1424=IFCPROPERTYSINGLEVALUE('FireRating',$,IFCLABEL('REI 60'),$);
+#1425=IFCPROPERTYSET('0RRZV4WWZWebmvRwxlAQ_q',$,'Pset_WallCommon',$,(#1423,#1424));
+#1426=IFCRELDEFINESBYPROPERTIES('1YEys40ud$n1qd689ytAX4',$,$,$,(#44,#173,#259,#381),#1425);
+#1427=IFCRELASSOCIATESMATERIAL('068JfRdA0RlTPo3hAQRmU6',$,$,$,(#44,#173,#259,#381,#468,#544,#587,#706,#789,#907,#990,#1061),#27);
+#1428=IFCRELCONTAINEDINSPATIALSTRUCTURE('3WgMEO8b_SdrznzovE6AH2',$,$,$,(#44,#87,#123,#157,#173,#208,#244,#259,#294,#330,#366,#381,#416,#452,#468,#498,#528,#544,#573,#1106,#1122,#1134,#1149,#1161,#1267,#1365,#1375,#1385,#1395,#1405),#19);
+#1429=IFCRELCONTAINEDINSPATIALSTRUCTURE('2YZ2VvhXdDGsswuOVwGmcq',$,$,$,(#587,#621,#656,#692,#706,#740,#775,#789,#823,#858,#893,#907,#941,#976,#990,#1018,#1047,#1061,#1089,#1181),#23);
+ENDSEC;
+END-ISO-10303-21;
diff --git a/crates/exav-viewer/demo/examples/files/images/bounce.gif b/crates/exav-viewer/demo/examples/files/images/bounce.gif
new file mode 100644
index 00000000..30fd84be
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/bounce.gif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/bounce.jxl b/crates/exav-viewer/demo/examples/files/images/bounce.jxl
new file mode 100644
index 00000000..0bbdca14
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/bounce.jxl differ
diff --git a/crates/exav-viewer/demo/examples/files/images/bounce.png b/crates/exav-viewer/demo/examples/files/images/bounce.png
new file mode 100644
index 00000000..01c991ab
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/bounce.png differ
diff --git a/crates/exav-viewer/demo/examples/files/images/bounce.webp b/crates/exav-viewer/demo/examples/files/images/bounce.webp
new file mode 100644
index 00000000..b5ece6eb
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/bounce.webp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/fax-g3-1d.tif b/crates/exav-viewer/demo/examples/files/images/fax-g3-1d.tif
new file mode 100644
index 00000000..49466f81
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/fax-g3-1d.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/fax-g4-3pages.tif b/crates/exav-viewer/demo/examples/files/images/fax-g4-3pages.tif
new file mode 100644
index 00000000..7dedd655
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/fax-g4-3pages.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/fax-g4.tif b/crates/exav-viewer/demo/examples/files/images/fax-g4.tif
new file mode 100644
index 00000000..6a78d9e4
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/fax-g4.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/gradient-grey16.png b/crates/exav-viewer/demo/examples/files/images/gradient-grey16.png
new file mode 100644
index 00000000..98a80f4e
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/gradient-grey16.png differ
diff --git a/crates/exav-viewer/demo/examples/files/images/gradient-grey16.tif b/crates/exav-viewer/demo/examples/files/images/gradient-grey16.tif
new file mode 100644
index 00000000..a2813949
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/gradient-grey16.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/icon-legacy.ico b/crates/exav-viewer/demo/examples/files/images/icon-legacy.ico
new file mode 100644
index 00000000..896bbce5
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/icon-legacy.ico differ
diff --git a/crates/exav-viewer/demo/examples/files/images/icon.ico b/crates/exav-viewer/demo/examples/files/images/icon.ico
new file mode 100644
index 00000000..9501b503
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/icon.ico differ
diff --git a/crates/exav-viewer/demo/examples/files/images/page-generic.jb2 b/crates/exav-viewer/demo/examples/files/images/page-generic.jb2
new file mode 100644
index 00000000..1fc9b92f
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/page-generic.jb2 differ
diff --git a/crates/exav-viewer/demo/examples/files/images/page-symbol.jb2 b/crates/exav-viewer/demo/examples/files/images/page-symbol.jb2
new file mode 100644
index 00000000..37998881
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/page-symbol.jb2 differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-1bit.bmp b/crates/exav-viewer/demo/examples/files/images/scene-1bit.bmp
new file mode 100644
index 00000000..0043fc2d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-1bit.bmp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-24.bmp b/crates/exav-viewer/demo/examples/files/images/scene-24.bmp
new file mode 100644
index 00000000..0ea356df
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-24.bmp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-32.bmp b/crates/exav-viewer/demo/examples/files/images/scene-32.bmp
new file mode 100644
index 00000000..02109d35
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-32.bmp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-8.bmp b/crates/exav-viewer/demo/examples/files/images/scene-8.bmp
new file mode 100644
index 00000000..78da7617
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-8.bmp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-alpha.jp2 b/crates/exav-viewer/demo/examples/files/images/scene-alpha.jp2
new file mode 100644
index 00000000..f2144a68
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-alpha.jp2 differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-alpha.jxl b/crates/exav-viewer/demo/examples/files/images/scene-alpha.jxl
new file mode 100644
index 00000000..2742bd2d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-alpha.jxl differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-alpha.pam b/crates/exav-viewer/demo/examples/files/images/scene-alpha.pam
new file mode 100644
index 00000000..66f2ce5a
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-alpha.pam differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-alpha.png b/crates/exav-viewer/demo/examples/files/images/scene-alpha.png
new file mode 100644
index 00000000..d009fdfd
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-alpha.png differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-alpha.qoi b/crates/exav-viewer/demo/examples/files/images/scene-alpha.qoi
new file mode 100644
index 00000000..ed184913
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-alpha.qoi differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-alpha.webp b/crates/exav-viewer/demo/examples/files/images/scene-alpha.webp
new file mode 100644
index 00000000..3aa27ad5
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-alpha.webp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-ascii.ppm b/crates/exav-viewer/demo/examples/files/images/scene-ascii.ppm
new file mode 100644
index 00000000..3e0f6c0c
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/images/scene-ascii.ppm
@@ -0,0 +1,40 @@
+P3
+# an ASCII pixmap
+48 36
+255
+29 31 92 30 32 93 30 31 92 30 31 92 30 31 92 29 31 92 29 31 92 29 31 92 29 31 92 32 34 95 30 32 93 29 31 92 30 31 92 29 31 92 29 31 92 29 31 92 30 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 30 32 92 29 31 92 30 32 93 30 32 93 30 32 93 30 32 93 29 31 92 29 31 92 29 31 92 30 32 93 30 32 93 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92 29 31 92
+42 35 93 43 36 94 42 35 94 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 94 43 36 94 42 35 93 42 35 94 43 36 94 42 35 93 42 35 93 43 36 95 43 37 95 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 94 42 35 93 42 36 94 43 36 94 43 37 94 42 36 94 42 35 94 42 35 94 42 35 93 42 35 94 43 36 94 42 36 94 42 35 93 43 36 94 42 35 94 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93 42 35 93
+55 40 95 56 40 96 55 39 95 56 40 96 56 40 96 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95 56 40 96 55 40 95 55 39 95 55 39 95 55 39 95 55 39 95 56 40 95 56 40 95 55 39 95 55 39 95 55 39 95 55 39 95 56 40 95 55 39 95 55 39 95 55 39 95 56 40 96 57 41 96 55 39 94 55 40 95 56 41 96 55 39 95 55 40 95 56 41 96 56 41 96 56 40 95 55 39 95 56 40 95 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95 55 39 95
+68 44 96 68 44 97 68 44 96 69 45 97 71 46 99 68 43 96 68 43 96 68 43 96 68 43 96 68 43 96 68 43 96 69 44 97 68 44 97 69 45 97 68 44 96 68 43 96 68 43 96 68 44 96 70 45 97 68 43 96 68 43 96 68 44 96 68 43 96 69 45 97 69 44 97 69 44 97 68 43 96 68 43 96 68 44 96 68 43 96 68 43 96 68 43 96 68 44 97 68 44 96 68 43 96 69 45 97 68 44 96 68 43 96 68 43 96 68 44 96 68 43 96 68 44 96 68 44 96 68 43 96 68 43 96 68 44 96 68 43 96 68 43 96
+81 47 97 81 47 97 81 47 97 81 48 98 81 48 98 81 47 97 81 48 98 81 47 97 81 47 97 81 48 98 81 48 98 81 47 97 81 47 97 81 47 97 81 47 97 80 47 97 82 48 98 81 47 97 81 48 98 82 49 99 82 49 99 81 47 97 81 47 97 81 47 97 81 48 98 82 48 98 81 48 98 81 47 97 81 48 97 81 48 98 81 48 98 81 47 97 82 48 98 81 48 98 81 47 97 80 47 97 81 47 97 81 48 98 81 48 98 81 47 97 81 47 97 81 48 98 81 48 98 81 48 98 81 48 98 81 47 97 81 48 98 81 48 98
+94 51 99 94 52 99 94 52 99 94 51 99 94 51 99 94 51 99 94 51 99 94 52 99 94 52 99 94 51 99 94 51 99 94 51 99 94 52 99 95 52 100 95 52 100 95 53 100 94 52 99 94 51 99 94 51 99 94 51 99 94 52 99 94 51 99 94 51 99 95 53 100 94 52 99 93 51 99 95 53 100 94 52 99 94 52 99 96 54 101 94 52 99 94 52 99 94 51 99 94 51 99 94 51 99 94 52 100 94 52 99 94 51 99 94 52 99 94 51 99 94 52 99 95 52 100 94 51 99 94 52 99 94 52 99 94 51 99 94 51 99 94 52 99
+107 56 100 107 56 100 107 55 100 107 56 100 109 58 103 107 56 101 106 55 100 107 56 101 107 56 101 107 56 101 107 56 101 106 55 100 107 56 100 107 56 100 108 57 101 108 57 102 107 56 100 106 55 100 107 56 100 107 56 100 107 56 100 107 56 100 107 56 100 107 56 101 107 56 100 107 56 100 106 55 100 106 55 100 107 56 100 107 56 100 107 56 100 107 56 100 107 56 100 107 56 100 107 56 100 107 56 101 107 56 101 107 56 100 107 56 100 107 56 100 107 56 100 107 56 101 107 56 100 106 56 100 106 56 100 107 56 100 108 57 101 107 56 100
+120 61 102 119 60 101 119 59 101 120 60 102 120 61 103 119 60 101 119 59 101 120 61 103 120 60 102 120 60 102 119 60 101 119 60 101 119 59 101 120 60 102 120 61 102 119 59 101 120 60 102 120 60 102 120 60 102 120 60 102 119 60 101 119 60 101 119 60 101 119 59 101 119 60 102 119 60 101 120 60 102 121 61 102 121 60 102 121 61 102 122 62 102 123 63 103 123 61 102 122 61 102 122 61 102 122 61 102 121 60 102 120 60 102 120 60 102 120 60 102 119 59 101 119 60 101 119 60 101 119 60 102 119 60 101 120 60 102 120 60 102 119 60 101
+132 64 103 132 64 103 132 64 103 132 63 103 132 63 103 132 64 103 133 65 104 132 63 103 133 64 103 133 65 104 132 63 103 133 64 103 133 64 103 132 64 103 132 64 103 132 64 103 133 64 103 133 64 103 132 63 103 132 64 103 132 64 103 132 64 103 132 64 103 132 64 103 132 64 103 132 64 103 134 65 103 135 65 104 137 67 105 138 67 104 138 67 104 139 68 104 140 68 104 141 69 105 140 68 105 138 68 104 136 66 103 135 65 103 134 64 103 133 65 103 133 65 104 132 64 103 132 64 103 132 64 103 132 64 103 133 64 104 133 64 103 132 64 103
+145 68 104 146 68 105 146 69 105 146 69 105 145 68 104 145 68 104 145 68 104 146 69 105 146 69 105 145 67 104 145 68 104 146 68 105 146 68 105 145 68 104 145 68 105 145 68 104 145 68 104 145 67 104 147 70 106 146 69 105 145 68 104 145 68 104 145 68 104 145 68 104 146 68 105 147 69 105 148 69 105 150 71 105 153 73 106 155 74 107 157 75 107 157 75 106 158 75 106 158 75 107 157 74 106 155 74 106 153 73 106 151 71 105 149 70 105 148 71 106 147 69 105 145 68 104 145 68 104 145 68 104 145 68 104 145 68 104 145 68 104 145 68 104
+159 72 106 158 72 106 158 72 106 159 74 107 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 105 159 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 105 159 72 106 159 73 106 160 73 106 162 75 107 165 76 107 168 79 108 170 79 107 174 81 109 175 82 108 177 83 109 177 83 109 177 83 109 176 82 108 174 81 108 172 80 109 169 78 108 166 76 107 163 74 107 160 73 106 159 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106 158 72 106
+171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 172 77 107 174 78 107 177 80 108 181 82 109 185 84 109 189 86 110 193 88 111 196 90 111 198 92 111 199 92 112 198 92 111 196 91 111 194 89 111 190 87 110 186 85 109 182 82 109 178 80 108 175 78 108 173 77 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107 171 76 107
+184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108 185 80 108 187 81 109 190 83 109 194 85 110 198 88 111 203 91 112 209 94 112 214 97 113 218 99 114 220 101 114 222 102 115 221 102 115 218 100 114 215 98 114 210 95 113 205 92 112 200 89 111 195 86 110 191 83 109 187 82 109 185 80 109 184 80 108 184 80 108 184 80 108 184 80 108 184 80 108
+196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 195 85 110 196 85 110 196 85 110 195 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110 197 86 110 200 88 110 204 90 111 209 93 112 215 96 113 221 100 114 227 104 115 234 107 116 240 111 117 244 113 117 246 114 118 245 114 117 241 111 117 235 108 116 229 104 115 222 101 114 216 97 113 210 93 112 205 90 111 201 88 110 198 86 110 196 85 110 196 85 110 196 85 110 196 85 110 196 85 110
+203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 205 96 108 203 97 110 204 97 109 205 96 108 203 96 110 202 96 111 203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 203 96 110 203 97 110 205 98 110 209 100 110 213 103 111 219 106 112 226 110 113 233 114 115 242 119 116 250 124 117 254 128 119 255 132 120 255 134 122 255 133 121 255 129 119 251 125 118 244 120 116 235 116 115 228 111 114 220 107 113 214 103 112 210 100 111 206 98 110 203 97 111 203 96 110 203 96 110 203 96 110 203 96 110
+209 109 110 209 109 110 209 109 110 209 109 110 209 109 110 209 109 110 209 108 110 210 108 110 211 109 109 194 111 126 181 115 141 183 114 140 196 110 123 210 108 108 211 109 108 209 108 110 208 108 110 208 108 110 209 108 110 209 109 110 209 109 110 210 109 110 213 111 110 217 113 111 222 116 112 228 120 113 236 124 114 246 129 116 254 135 117 255 141 119 255 147 121 255 149 118 255 148 115 254 147 116 255 148 121 255 143 119 254 136 118 247 130 116 237 125 115 233 121 112 227 118 110 218 114 111 216 112 108 213 110 108 209 108 110 209 108 111 209 108 111 209 108 110
+216 120 110 216 120 110 216 120 110 216 120 110 216 120 110 216 120 110 216 120 110 217 121 109 189 117 134 178 120 153 179 119 150 177 118 150 180 121 153 188 118 138 206 118 117 216 120 109 220 122 108 221 123 109 217 121 109 215 120 110 215 120 111 217 121 110 220 123 110 224 125 111 230 129 112 237 133 113 246 137 115 253 143 116 254 149 118 255 157 121 255 162 119 255 185 143 254 217 187 255 203 161 255 167 121 252 158 122 255 154 117 255 148 114 253 142 113 227 130 119 194 120 135 183 118 142 189 118 135 205 119 119 218 121 109 219 122 107 219 122 108 217 121 109
+222 132 110 223 132 110 223 132 110 223 132 110 222 132 110 223 133 110 224 133 108 191 121 135 178 120 153 159 105 133 124 82 109 119 79 106 139 92 119 169 113 145 184 121 153 190 122 143 189 119 129 195 119 117 217 130 115 228 136 111 226 134 107 227 135 108 228 135 110 231 137 111 237 140 112 245 145 113 255 151 114 255 160 115 255 167 117 255 172 120 254 180 124 255 243 213 255 255 243 235 218 206 192 129 143 184 122 144 198 129 140 211 134 133 201 127 137 177 117 147 173 116 149 173 115 147 175 117 150 179 119 151 183 118 138 196 122 130 205 125 123 216 130 114
+229 144 110 228 143 110 227 143 110 227 142 110 227 143 108 229 144 107 194 126 136 178 119 153 144 95 122 102 69 94 101 68 94 107 71 97 108 71 98 80 57 79 59 47 66 103 71 98 118 79 110 106 71 101 119 79 104 174 113 128 207 132 132 216 136 118 231 146 112 241 151 109 248 156 110 254 159 112 248 158 118 235 155 124 238 162 125 252 181 120 255 198 123 253 244 209 218 190 191 173 111 143 171 112 146 173 115 146 171 113 147 170 113 148 172 115 148 176 117 147 176 116 145 187 123 154 174 115 144 161 108 136 187 124 157 175 117 151 175 117 150 180 119 147
+238 158 110 242 160 111 244 162 110 245 163 110 248 164 116 205 134 141 171 114 149 134 89 115 100 67 93 105 71 96 110 73 100 92 63 88 43 38 56 10 20 34 4 16 29 12 20 34 52 42 60 99 67 91 104 70 96 103 69 98 156 104 137 181 120 152 181 119 142 193 127 137 199 131 135 194 128 137 179 119 144 173 115 148 173 115 147 183 124 143 198 140 138 191 135 150 178 114 148 185 122 152 187 124 154 187 123 153 187 123 153 187 123 152 183 120 150 179 118 148 185 122 152 139 95 121 43 39 56 20 26 40 107 76 99 173 114 143 175 115 145 170 112 143
+130 87 99 139 94 100 167 113 106 197 135 107 139 99 95 120 82 114 126 83 109 105 70 96 112 74 101 113 75 102 82 58 81 42 37 54 23 27 42 14 22 36 17 24 38 14 22 36 27 29 45 47 40 58 93 64 88 107 71 97 106 71 96 156 103 132 181 120 152 177 117 151 177 117 152 182 120 155 183 121 153 181 119 149 184 122 152 184 121 154 177 115 152 168 109 142 153 102 130 129 87 113 108 73 98 104 70 95 103 69 95 83 58 81 57 45 64 66 47 69 62 49 68 13 21 35 7 18 31 11 20 34 6 17 31 41 37 54 89 62 86 111 74 100
+104 70 99 102 68 99 76 54 83 29 28 51 1 14 31 9 19 31 56 44 64 90 63 86 47 39 58 74 54 76 108 72 99 84 59 82 28 29 45 13 22 35 15 22 37 13 21 35 40 36 53 95 65 90 107 72 98 108 72 99 108 72 98 109 73 99 139 92 120 159 105 133 151 100 128 124 83 109 91 62 86 73 51 73 88 60 84 100 68 92 88 60 83 67 47 69 46 33 54 38 29 49 37 28 48 38 28 48 25 24 41 7 17 31 5 17 30 11 19 34 21 23 39 21 25 40 15 23 37 14 22 36 20 25 40 61 47 67 92 63 88 104 70 96
+87 59 82 85 58 81 52 41 59 20 26 39 15 23 36 15 23 37 15 22 36 17 23 37 7 18 31 11 20 34 53 41 60 71 51 73 53 43 62 14 22 36 13 21 35 20 25 40 52 41 60 56 41 62 65 45 67 60 42 64 65 45 67 77 53 76 82 56 80 77 53 76 56 39 61 39 29 49 40 29 49 42 30 51 40 29 49 39 28 49 41 30 50 44 32 52 48 34 55 50 35 56 50 36 57 50 36 57 38 31 50 19 24 39 15 22 36 22 25 40 35 30 48 25 26 42 13 22 36 13 22 36 18 23 38 59 45 65 109 73 99 111 74 100
+40 31 53 41 31 53 37 32 52 19 24 40 13 22 35 14 22 36 25 27 44 24 26 43 14 22 36 19 24 39 34 29 49 44 34 55 27 28 46 15 22 37 14 22 35 16 23 38 28 28 46 43 33 54 41 32 53 42 32 54 41 32 53 39 31 52 40 31 53 40 31 53 43 33 55 46 35 57 45 35 57 45 34 56 45 35 57 46 35 57 45 34 56 45 34 56 44 34 55 44 33 55 44 33 55 44 34 56 42 33 54 21 25 41 12 21 35 26 27 44 42 33 55 24 26 44 14 22 37 14 22 35 20 25 41 37 31 52 58 42 66 85 59 85
+41 36 61 41 36 61 42 37 61 30 31 49 13 21 35 15 22 37 28 28 49 25 27 47 13 22 36 19 24 41 35 32 56 45 38 64 41 37 59 14 22 36 14 22 36 17 23 38 36 33 56 34 32 56 32 31 55 32 30 54 32 31 55 36 33 57 40 35 60 36 33 57 32 31 55 34 32 56 36 33 57 36 33 57 36 33 57 36 33 57 35 33 57 35 33 57 35 32 56 34 32 56 34 32 56 34 32 56 35 33 57 25 27 46 13 21 34 29 29 50 36 33 57 29 29 50 17 23 38 14 22 37 23 26 44 42 37 62 63 49 76 69 53 81
+76 57 85 78 58 85 82 61 89 51 43 65 13 22 36 21 26 42 60 48 73 60 48 74 11 17 28 39 36 56 74 56 84 79 59 87 68 53 79 32 32 51 9 19 32 42 38 58 71 54 81 70 54 81 62 49 75 60 47 73 62 49 75 71 54 81 73 55 83 73 56 84 60 48 74 36 33 57 30 28 52 28 28 51 29 28 52 30 29 52 30 29 53 31 29 53 33 31 54 36 32 56 36 33 57 36 33 57 38 33 58 33 30 52 17 20 32 36 32 57 37 33 57 32 31 54 14 21 36 7 17 29 50 42 65 81 60 88 80 60 88 78 59 87
+73 55 86 71 54 85 72 54 86 67 53 80 12 19 33 29 30 46 77 58 86 80 60 89 45 37 56 70 53 79 80 60 89 77 58 86 78 58 87 34 33 51 9 16 26 46 40 62 81 60 89 78 59 87 80 60 88 80 60 88 78 59 87 82 61 89 110 80 109 122 88 117 123 88 117 114 82 111 90 67 95 77 59 86 91 68 95 96 71 98 85 64 91 66 52 78 44 38 63 33 30 54 29 28 52 29 28 52 29 28 52 28 27 51 25 25 45 30 29 53 29 28 52 38 34 59 55 45 65 41 35 51 73 56 83 75 57 85 75 57 84 75 57 85
+101 74 88 107 79 89 134 98 91 160 117 96 88 67 65 84 62 91 95 70 98 73 55 83 81 60 89 78 58 87 76 58 86 77 58 86 76 58 86 74 56 83 59 46 69 78 58 87 76 58 85 77 58 86 77 58 86 75 57 84 80 60 88 119 85 114 129 92 123 124 89 122 124 89 122 126 90 123 131 93 125 133 94 125 133 94 124 129 92 124 125 90 125 126 89 122 122 88 117 106 78 106 93 69 97 92 68 96 90 67 95 80 61 88 64 51 77 56 45 70 75 58 84 117 84 114 126 90 120 123 88 117 112 81 111 83 62 90 82 61 89 83 62 89
+170 119 97 174 122 95 174 122 96 173 121 95 171 120 96 145 102 114 125 89 123 98 72 100 73 56 83 77 58 86 78 58 86 77 58 86 78 58 87 78 58 87 78 59 88 76 57 85 77 58 85 78 58 86 75 57 85 76 58 88 114 82 115 127 91 123 128 92 117 139 98 113 142 100 112 137 97 115 129 92 118 123 88 120 121 87 120 135 95 117 154 106 113 139 101 121 124 88 120 130 93 123 133 94 125 132 94 124 133 94 124 133 95 124 131 93 123 130 92 123 132 94 124 129 92 122 126 90 120 127 91 121 128 91 121 126 90 120 124 89 119 127 91 117
+161 109 96 163 109 95 162 109 95 162 109 95 164 110 95 163 110 94 136 95 113 126 91 124 101 73 102 73 55 83 76 57 85 76 57 85 74 56 84 77 58 85 82 61 89 83 62 91 77 58 88 73 57 87 82 61 89 119 85 109 145 100 111 154 104 101 164 111 97 173 116 94 177 118 95 181 120 96 182 121 99 177 118 104 183 122 106 207 135 103 225 148 105 191 179 162 152 138 149 123 84 115 123 88 119 125 89 119 122 88 120 121 87 120 123 89 120 126 90 119 125 89 119 125 90 120 126 90 120 126 90 119 125 89 120 124 89 121 124 89 122 128 91 119
+159 103 95 159 103 95 159 103 95 159 103 95 159 103 95 160 103 94 158 103 95 132 92 115 127 91 123 107 77 106 81 61 89 81 60 89 90 67 95 115 83 113 123 89 121 128 91 118 127 88 110 129 88 103 151 99 98 161 104 97 161 104 93 163 105 94 163 105 95 165 106 96 169 108 96 175 112 97 182 116 98 192 122 98 201 127 100 208 130 101 214 138 107 185 181 169 182 194 184 160 151 156 130 92 120 126 90 120 136 95 117 143 98 115 133 93 117 124 89 121 125 90 121 126 90 120 125 90 120 124 90 122 129 91 118 134 93 114 140 95 109 153 100 99
+155 95 95 156 96 95 156 96 96 156 96 96 156 96 96 155 96 96 157 96 95 153 96 97 130 91 117 128 93 125 125 89 119 124 89 118 127 93 124 130 93 121 142 93 108 154 96 98 159 98 96 160 98 95 158 97 95 155 95 95 155 95 95 156 95 95 158 97 95 161 99 95 165 101 96 170 104 97 176 107 98 183 111 99 191 116 101 199 122 103 211 125 101 203 151 131 184 178 168 201 165 146 204 125 106 191 117 105 193 118 102 188 115 99 178 109 98 153 98 106 130 91 118 126 90 121 128 91 118 140 92 108 153 95 97 157 96 94 158 96 93 157 96 94
+151 88 95 149 85 93 147 82 91 148 84 92 148 83 92 149 85 93 147 82 91 149 84 91 145 83 94 127 83 110 122 87 119 123 87 118 129 84 110 145 84 95 150 83 89 149 84 91 148 83 92 147 83 92 147 82 91 150 86 94 151 88 95 152 88 95 154 89 95 157 91 95 160 93 96 165 96 97 171 99 98 177 103 99 184 107 100 192 112 101 199 116 103 207 118 101 209 121 104 208 117 100 203 117 102 197 114 101 186 108 100 178 104 99 173 100 98 169 97 96 161 94 97 151 91 100 152 90 97 155 89 93 152 88 94 151 88 95 150 87 95 151 88 95
+145 78 93 155 93 104 166 109 116 161 102 111 163 104 112 156 94 105 165 107 115 161 102 111 165 106 113 167 111 117 154 107 121 164 116 126 165 106 113 159 98 107 166 111 117 164 106 114 165 108 116 160 101 110 167 110 117 153 89 101 146 79 94 148 81 95 149 82 95 152 83 95 155 85 96 159 88 97 164 91 97 170 94 98 176 98 99 183 101 100 189 105 101 193 107 103 195 108 103 193 108 103 189 105 102 184 102 101 178 98 100 172 95 99 166 91 98 160 88 97 156 86 96 154 84 94 150 82 94 147 81 95 147 80 95 147 80 95 147 80 95 147 80 95
+140 68 92 159 97 112 176 122 131 171 116 126 172 117 127 159 97 113 174 120 129 171 115 125 176 123 131 169 112 123 180 126 132 175 119 128 171 115 126 171 115 125 176 123 131 167 109 121 170 113 124 172 116 126 174 119 129 154 88 107 141 69 93 143 73 96 144 73 95 146 75 95 149 76 96 153 79 96 157 81 97 162 84 98 168 87 99 173 90 100 178 93 100 181 95 101 182 95 101 181 95 101 178 93 100 174 91 100 169 88 99 164 85 98 159 82 97 154 79 96 150 77 96 147 75 95 145 73 95 143 73 95 143 72 95 143 72 95 143 72 95 143 72 95
+138 67 95 136 64 92 134 61 91 135 63 92 135 62 91 135 64 92 134 62 91 135 63 91 135 62 91 134 61 91 138 68 95 135 63 92 134 62 91 139 69 96 134 62 91 135 63 92 135 63 92 135 63 92 134 61 90 136 65 93 138 67 95 137 67 94 139 67 94 140 68 95 142 70 95 146 71 96 150 74 96 154 76 97 158 79 98 162 81 98 165 83 99 168 84 99 169 85 100 169 85 99 166 83 99 163 81 99 159 79 98 155 77 97 150 74 96 146 72 96 143 70 95 141 68 95 139 67 94 138 67 94 137 67 94 137 67 94 137 67 94 137 67 94
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-bc1.dds b/crates/exav-viewer/demo/examples/files/images/scene-bc1.dds
new file mode 100644
index 00000000..82a08efc
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-bc1.dds differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-bc3.dds b/crates/exav-viewer/demo/examples/files/images/scene-bc3.dds
new file mode 100644
index 00000000..cbf0d71d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-bc3.dds differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-cmyk-packbits.tif b/crates/exav-viewer/demo/examples/files/images/scene-cmyk-packbits.tif
new file mode 100644
index 00000000..c8994cbe
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-cmyk-packbits.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-cmyk.jpg b/crates/exav-viewer/demo/examples/files/images/scene-cmyk.jpg
new file mode 100644
index 00000000..7bf40493
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-cmyk.jpg differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-grey.jp2 b/crates/exav-viewer/demo/examples/files/images/scene-grey.jp2
new file mode 100644
index 00000000..ddfcf039
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-grey.jp2 differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-grey.jpg b/crates/exav-viewer/demo/examples/files/images/scene-grey.jpg
new file mode 100644
index 00000000..d3cc8ac9
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-grey.jpg differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-grey16.pgm b/crates/exav-viewer/demo/examples/files/images/scene-grey16.pgm
new file mode 100644
index 00000000..cb72f392
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/images/scene-grey16.pgm
@@ -0,0 +1,4 @@
+P5
+128 96
+65535
+$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$((,,$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$))$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&''--**&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&%%--''&&&&&&))&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&))))))))))(())))))))))))))))))))))))))))))))))))(((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))(())))))))((,,))))))))(())))))))))))))))))))))((..++(())))))))))))))))))))))))))))))))))))))))))))++++++..11**++++++++++++++++++++++++++++++++++++++++++++++++**++++++++++**,,--**++++++++++++****++--**++++++++++++++++++++++++++++++++++++++++++++++****++++,,66**++++++++**++++++++++++++++++**++++++++++******++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------..11------------//11--------------1144--22------------------------------------------------0033----....------------------------------11..--------..//--------------------------------------------------00000000000000000000000000000000000000000000000000000000000077//0000000000////000000000000000000////0000000000000000000000000000000000000000000000000022000000//0000000000000000000000330000//7700000000//1133//0000000000000000000000000000000000000000000000002222223333222222222222222222222222222222222222222222222222221122222222222222222222222222222222222222222222222222222222222222222222222222222222222222443322222222222222::3322222222222299332222112222222222222222222222222222222222222222222222222222222222222222444444;;884444444444997744444444444444444444444444444444444444444444444444444444444444444444444433444444444444444444444444444444444444444444444444449977444444444444444444444444444444444444555544444444444444444444444444444444444444444444444444444444444444447777777777777766>>7766==::777777777777777777777777777777777777??77777777::6677777777777777777777??77777777777777777777777766::==667777777777777777776666777777777777777777777777777777777766>>;;6677777777777777777777777777777777777777777777777777777777777777999999::::999999::9999==@@999999999999999999999999999999999999::999999::AA9999999999999999999999>>::999999999999999999999999;;<<99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<;;<<<<<<<<<<<<;;;;<<<<<<;;;;<<<<<<;;<<<<<<<<<<<<<<<<;;;;<<;;@@<<AA<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<;;??==<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>;;<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>CC??>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>BB@@>>>>>>>>>>CC@@==????>>>>>>>>>>>>>>>>>>>>>>AA>>??>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>==DDAA>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>CC>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>AAAAAAAAAAAAAAAAAAAA@@AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA@@CCAA@@AAAAAAAA@@@@@@GGDD@@AAAAAAAAAAAA@@@@AAAA@@@@AAAA@@@@AAAAAAAAAA@@AA@@@@AAAAAAAAAAAA@@@@AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA@@@@AA@@AAAAAAAA@@@@AAAAAAAAAAAAAAAAAACCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCBBCCCCCCCCCCCCCCCCDDFFCCCCCCCCCCCCIIFFCCCCCCCCCCDDCCGGCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCDDDDCCCCCCCCCCCCGGEECCCCCCCCCCCCCCCCCCEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEGGHHEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFGGEEEEEEEEEEDDHHGGEEEEEEEEEEPPGGIIEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEHHGGDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEGGGGGGGGGGGGGGGGGGGGGGGGGGHHGGGGGGGGGGGGGGGGHHGGGGGGGGGGGGGGGGGGGGGGJJMMGGGGMMJJNNHHHHGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGHHGGGGGGGGGGGGHHGGGGGGGGGGGGHHGGIIKKGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGOOLLGGGGGGGGGGGGGGGGGGGGGGHHGGGGGGHHGGGGGGGGHHHHGGGGGGGGGGGGGGGGGGJJJJJJJJJJJJJJJJJJJJJJKKJJJJJJJJJJJJJJJJKKSSJJJJJJJJKKJJJJJJJJJJJJJJJJJJJJJJLLLLMMKKTTIIJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJRRKKJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJKKJJJJJJJJJJJJJJJJJJJJJJJJJJJJKKOOJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJLLLLLLLLLLLLLLLLLLLLLLUUNNRRLLLLLLLLLLLLLLMMLLLLLLLLUUMMLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMMMMMMMMMMMMMMMMMMMMLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLMMLLLLLLLLLLLLLLLLLLLLLLOORRKKLLLLOOOOOOOOOOOOOOOOOOOOPPQQOORROOOOOOOOOOOONNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONNOOOOOOOOOOOOOOOOOOOOOOOOQQOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPPPPPPPPPOOOOOOOOOOOOOOOOOOOONNNNOONNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOQQRRNNOOOOXXQQQQQQQQQQQQQQQQPPTTWWPPQQQQQQQQQQQQRRXXQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQPPXXUUPPQQQQQQQQPPQQQQQQQQRRUUQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQRRRRRRRRRRRRRRRRTTUURRSSSSSSSSSSSSSSRRRRRRRRRRRRRRRRQQQQQQQQUUSSPPQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQTTTTSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSTTWWTTSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSTTTTSSSSSSSSSSYYTTSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSUUWWTTTTTTTTUUUUUUVVVVXX[[UUVVVVVVVVVVVVVVUUUUUUUUUUTTTTTTTTTTTTSSVVTTSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSUUVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVUUVVVVVVVVVVVVYYUUVVVVVVVVVVVVVVVVVVVVVVUUVVVVVVVVVVUUYYVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVYY\\WWWWXXWWWWYYYYYYYYXXXXYYYYZZZZYYYYYYYYYYYYXXXXWWWWXXWWWWWWWWVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV[[UUVVVVVVVVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXYYYYXXXXXXXXXXYY^^XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXYYYYXXYYYYYYZZZZZZ[[cc[[[[\\\\\\]]]]]]]]]]]]bb\\\\]]dd[[[[[[[[[[ZZZZYYYYYYXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXYY[[XXXXXXXXXXZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ__aaZZZZZZZZZZZZZZ[[ZZZZZZZZZZ\\\\ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ[[[[[[[[\\[[\\\\\\]]^^^^________````````aaaaaaaaddee``__________^^]]^^\\\\\\[[[[]]]]__]]ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ]]]]]]]]]]\\]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]^^]]]]]]]]]]]]]]]]]]aacc]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]\\\\]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]^^^^__````````hheeaabbcceeccddddddddddddddddddccccccccbbaaaaaa``__````__^^aabb__^^]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]````````__hh````````__``````````````````__ii``````````````````____``````____````````````````````__cckk^^````````````````````````````__``aaaabbccccccddddeeeeeeffkkgggggghhhhhhhhhhhhgghhggggffffeeeeeeddccccccaaaaaa````````````````````````````````````````````ccddbbbbbbccbbbbeehhaabbbbbbbbbbbbbbbbbbbbaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbffbbbbbbbbbbbbbbbbbbbbbbccffbbbbbbbbbbbbbbbbbbbbaabbbbbbbbjjddddddeeffeeffgghhiiiinnjjjjkkllkkllllllllllllkkllkkjjjjiiiiiiggggffffffddjjggccccccbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbffhhddddddddddddddiiggddddddddddddddddddddddddddddddddddddddddddddddddddeeggddddddddddddddddddddddddddddddddddddddddddddddjjeeeeeeeeiigggggggghhppjjjjkkllmmppnnnnooooppppppqqqqppppppoooonnnnmmssookkjjkkllhhggggffffeeeeeeeeeeddddddddddddddddddddddddddddddddffffggffffffffffffiihhffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffggjjgggghhhhhhiijjkkkkllppnnnnooppqqqqrrssssssttuuuuuuuuuuuuttssssssrrqqppppoonnnnnnllkkkkjjiihhhhhhggggggggffffffffffffffffffffffffffffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiijjjjkkllllllnnooooppqqrrssssttuuvvwwwwxxxxyyyyyyyyyyyyxxxxwwwwvvuuttssssrrppppoooonnllllllkkjjjjiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiillllllllllllllllllkkkkllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllkkllllmmmmmmooooooqqrrrrttuuvvwwwwyyzzzz{{{{||||}}}}~~~~}}}}||||{{{{zzzzyywwwwvvuuttrrqqqqppoooommmmmmllllkkllllllllllllllllllllllllllllnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnooooooppqqqqrrssttuuvvwwyyzz{{||}}~~������������������������~~}}||{{zzxxwwvvuuttssrrqqqqppoooooonnnnnnnnnnnnnnnnnnnnnnnnnnnnnnppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppqqqqrrrrssttuuuuwwxxyyzz{{||}}~~��������������������������������������������~~}}||zzzzyyxxwwuuuuttssrrrrqqqqpppppppppppppppppppppppppppprrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrssssssssttuuuuvvvvxxxxzz{{||}}~~��������������������������������������������������������~~}}||{{zzxxxxvvvvuuuuttssssssssrrrrrrrrrrrrrrrrrrrrrruuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuvvvvwwxxxxzzzz||}}~~����������������������������������������������������������������~~}}||zzzzxxxxwwvvvvuuuuuuuuuuuuuuuuuuuuuuuuuuuuwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwxxxxxxxxyyzzzz{{||}}~~������������������������������������������������������������������������������~~}}||{{zzzzyyxxxxxxxxwwwwwwwwwwwwwwwwwwwwzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz{{{{||||}}}}~~����������������������������������������������������������������������������������������~~}}}}||||{{{{zzzzzzzzzzzzzzzzzzzzzz}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}~~~~������������������������������������������������������������������������������������������������������������~~~~}}}}}}}}}}}}}}}}}}}}�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������Ż�������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������||}}�����������������������������������������������������������������������������������������������������������������������ỻ����������������������������������������������������������������������������������������������������������������������������vv^^UUSSTTXXeeww�����������������������������������������������������������������������������������������������������������������Ə���������������������������������������������������������������������������������������������������������������������������``RRRRTTTTTTSSRRRR]]pp������������������}}����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������vvWWRRTTTTTTTTTTTTTTTTSSRRYY^^ZZoorrppii__XXTTRRTTZZoo��������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������rrSSSSTTTTTTTTTTTTTTTTTTVVUU>>""EETTSSSSSSTTTTTTSSRRZZzz���������������������������������������������������������������������̏���������������������������������������������������������������������������������������������������������������������������jjRRTTTTTTTTTTTTTTTTTTUUWWII''00PPWWTTTTTTTTTTTTSSTTuu���������������������������������������������������������������毯��������������������������������������������������������EE66ww��������������������������������������������������������������ffRRTTTTTTTTTTTTTTTTTTWWPP44==TTVVTTTTTTTTTTSSTTuu��������������������������������������������������������������������������������������������������������������������^^""NN����������������������������������������������������������^^RRTTTTTTTTTTTTTTTTVVVV??%%GGWWUUTTTTTTTTSSTTuu��������������������������������������������������������������������������������������������������������������rr33&&bb��������������������������������������������������ssWWRRTTTTTTTTTTTTTTUUWWII''00PPWWTTTTTTTTSSTTuu��������������������������������������������������������������������������������������������vvqqqqppuu����GG77[[ddccbbbbbbbbRRRRUU\\]]ll����������lluu��rr^^RRTTTTTTTTTTTTTTTTUUNN11::QQUUTTTTTTSSTTuu������������������������������������������������������������������ssjjYYYYYYYYZZXXDDCC::++$$''&&))..!!22OOUUSSRRRRTTTTTTSSSSQQPPQQUU__aa;;88PPUUTTTTTTTTTTVVVVTTTTSS??224455557711556655554433EEUUTTTTTTTTSSSSll����������������������������������������������������wwoo__NN??//''&&$$$$$$$$$$$$&&$$!!$$==TTTTTTTTTTTTTTTTTTTTWWSS88  BBVVVVTTUUWWJJDDWWUUTTVVWWWWWWZZII!!**QQYYWWWWWWUUTTTTTTTTTTTTTTRRcc����������������������~~oo[[XX``qq~~����ttgg]]PPBB44))%%%%''(((((((((((())((!!$$$$$$!!22FFEEDDCCCCRRTTTTTTTTTTTTTTUUWWDD##++KKXXSS66--NNWWUUTTUUUU99CCVVUUTTTTTTTTTTTTTTTTTTTTRRVVeevv}}||}}ssppccVV==--&&$$$$$$&&--228833222211**&&&&''((((((((((((((((((##&&""33UUXXVVVVTTTTTTTTTTTTTTVVMM,,11!!99SSWWKK$$//RRWWVVUUUUUUUUVVVVVVUUTTSSRRSSSSTTUUQQAA..&&&&''((((((((((''''&&''''''''((((((((((((((((((((((((&&  ""IIUUTTTTTTTTTTVVVVWW@@  ""CC>>44555566..337777660077@@774444443399AALLRRUUUUVVVVUUPPCC00&&''(((((((((((((((((((((((((((((((((((((((((((((((((((((())**&&''$$))JJUUTTTTTT1199>>AABBBBHHNN99  99NNVVZZII''LLGG9900))&&&&''''''''&&'')),,3377??9933++''''((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((%%''**(('';;OOWWUUTTTTTTTT''&&&&''(())**""!!&&))''((1188&&''((((((((((((((((((((((''''&&&&&&''''(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())((!!))(())''##++88IIUUVVUUTT(((((((())&&%%))(($$))(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())(())$$!!''((22CCPPUU--$$%%%%%%$$####$$  $$$$##$$%%%%%%$$%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%####$$##%%!!          $$$$"""",,CC''$$$$$$$$$$$$##$$!!$$$$$$####''&&$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$%%%%  %%%%$$##,,44::AA<<))""""######$$##""##########**99;;--####$$$$$$$$$$$$$$$$$$$$$$######""####$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$##      $$$$$$$$!!##$$33DDDDDDCC@@//223355::::<<??@@@@""""++$$!!##!!%%--44;;CCCC  **66))%%##""##############$$)),,1133,,))$$####$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$%%  %%$$$$$$$$11==DDCCCCCCCC>>CCDDDDDDDDDDDDDDEE((11AA::44,,##%%..>>DDDDDDDD;;++,,--$$--,,--@@DD??::4411,,,,,,,,,,44>>BBDDDDDDCCBB>>77//$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$  $$$$$$$$$$$$$$##  ++@@EEDDCCCCCCCCCCBBCCCCCCCCCCCCCCDD44<<EEEEDD""

==EEDDCCCCCCCCDDEEFF@@##EEEEEECCCCDDDDDDDDCCCCCCCCCCDDDDCCCCCCCCBBBBBBBBBB..""""##$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$%%%%$$$$$$$$$$$$%%BBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC????>>$$AA??AACCCC??--))::DDCCCCCCCCCCCCCCEE''11EECCCCCCCCCCCCCCCCCCCCCCCCCCCCCCBBAAEELLUUUUVVSSLLCC::--!!!!""""!!!!""##%%$$%%&&&&####$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$%%%%$$$$$$$$$$$$!!00DDCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCDDEE,,77EECCCCCCDDFFAADDCCCCCCCCCCCCCCEE55

==DDCCCCCCCCCCCCCCCCCCCCCCCCCCBBMM]]cchhjjjjjjiiiihhggccPP==5555AAHHUUWWYYQQHHAA??55))##""##$$$$$$$$$$$$$$$$$$$$$$$$$$!!""$$$$$$$$$$$$$$  ((LL  5566::CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCBBAA@@<<$$DDCCCCCCCCCC8855AACCCCCCCCCCCCCCCCDD44++--$$--++::DDCCCCCCCCCCCCCCCCCCCCCCCCBBCCYYjjiihhhhhhhhhhhhhhhhiikkkkjjjjkkkkjjjjjjjjiiaa]]VVMM??55++!!!!""##############$$$$$$$$%%$$$$$$$$$$$$!!""((FFmm$$\\RRDDCCCCCCCCCCCCCCCCCCBBBBBBAAAAAAGGTTbbggllWWIIBBBBBBCCCCCCCCDDEECCCCCCCCCCCCCCCCCCCCDDEEHH))		66GGEEDDCCCCCCCCCCCCCCCCCCCCCCCCCCTTcchhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhiiiijjiiff``^^QQ==55,,))))))))))))##""""""""########!!&&==SScciiiiWWRRhhccFFBBBBCCCCCCCCCCCCCCHHHHHHQQTTii����������}}##kkee\\HHBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCDD<<44??DDCCCCCCCCCCCCCCCCCCCCCCCCCCBBCC__jjhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhiiiiiijjjjjjddccccccccccbbWWWWQQ7722))))))))22VVkkkkiihhhhjjkkhhhhee\\FFAAAAAAAAAAAAAA������������������������__WWhhiijj]]DDBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCDDEEDDCCCCCCCCCCCCCCCCCCCCCCCCCCBBNNbbgghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiijjjjjjjjhhcccccccchhjjhhhhhhhhhhhhhhhhhhiijjbbVVVVVVVVVVUU__}}��������������������������oogghhiieeXXDDBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCBBBBZZjjhhhhhhhhhhggggggggffgggggghhhhhhhhhhhhhhhhhhhhggffeeeegghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhiiiiiiiihhhhhhhhhhhhhhhhhhhhhhhhhhiijjjjjjjjjjjjkk����������������������������rrhhhhhhiiccIIBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCBBII``hhhhhhhhggggiioouuwwxxxxxxrrlljjggffggggggggggffhhtt��}}ppjjeegghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhooyy~~zzkkhhhhiiff[[DDBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCRRiihhgghhjjnntt||��������������������{{rrkkkkkkrrzz����������������jjgghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhii||}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}nnhhhhhhiihhKKBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCBBBBBBBBBBCCCCCCCCCCCCAAII``ggggkkuuxx||~~����������������������������������������������������}}ffgghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhmmvv{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{zzttiihhhhiigg[[DDBBCCCCCCCCCCCCCCCCCCAABBFFKKMMLLMMKKEEAAAAAABBBBHHXXllnnttzz||{{||||||}}~~��������������������������������������������������ssffhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhggiixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyywwkkhhhhhhhhiiQQCCAACCCCCCCCCCCCBBBBRR__eehhiiiiiihhcc[[UUTT\\ffrrwwxxyyyyyyxxyyyyzzzz{{||}}}}~~������������������������������������������������ggffhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhggggllssvvwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwvvoohhhhhhhhii``PPAABBBBBBBBCCGGRRggiiiihhhhhhhhhhiikkllnnssxxxxwwwwwwwwwwwwwwxxxxxxyyzzzz||||}}~~������������������������������������������������eeggggggggffgghhkkkkkkgggghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhiikklloouuwwwwttttttttttttttttttttttttttttttttttttttrriihhhhhhhhiiggVVMMLLQQZZ``ffiihhhhhhhhhhjjmmppqqssttuuttttttttttttttttuuuuuuuuvvwwwwyyyy{{||}}~~��������������������������������������������wwnnkkkkooyy����������wwnniihhhhhhhhhhhhhhhhhhhhhhhhhhmmppqqssttttuuttttttrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrllhhhhhhhhhhjjiihhjjiiiihhhhhhhhhhiikkqqssssrrrrrrrrrrrrrrrrrrrrrrrrssrrssttssttuuvvwwxxyyzz||}}~~��������������������������������������������������������������������}}qqffhhhhhhhhhhhhhhhhhhiinnssssrrrrrrrrrrrrrrrrpppppppppppppppppppppppppppppppppppppppppplliihhhhhhhhhhhhhhhhhhhhhhhhhhiinnooppppppppppppppppppppppppppppppppppqqqqqqrrrrssttuuvvwwxxzz{{}}~~��������������������������������������������������������������}}}}xxmmjjhhhhhhhhhhhhkkooqqppppppppppppppppppppppnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnmmjjhhhhhhhhhhhhhhhhhhhhhhiillnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnoonnooppppppqqrrssttuuvvxxyyzz||~~��������������������������������������������������������}}{{zzyywwuuqqmmkkkkkkmmoooooonnnnnnnnnnnnnnnnnnnnnnlllllllllllllllllllllllllllllllllllllllllllllljjiihhhhhhhhhhhhhhhhhhjjllllllllllllllllllllllllllllllllllllllllllllmmmmnnnnooppqqrrrrssuuvvxxyy{{||~~��������������������������������������������������}}{{zzxxwwvvttssrrqqppppoonnmmmmllmmlllllllllllllllllllliiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiijjiiiiiihhhhhhggffhhiijjiiiiiiiiiijjjjiiiijjiiiiiiiiiijjiiiiiiiijjjjjjjjjjkkllmmnnooooppqqssttuuwwyyzz||~~������������������������������������������||{{zzxxvvuussrrqqoooonnmmllllkkjjkkjjjjiiiiiiiiiiiiiiiiiihhhhhhhhggeeffffffggeeggffggffhheeeeffggggffeeggeeeeeeggeeddlluuffeegghheeeehhkkffeegghhffggffffeeffeehhhhhhhhhhhhiiiiiijjjjjjllllmmnnooqqrrssuuwwxxzz{{}}������������������������������������~~||zzyyxxvvttssqqppoonnnnllkkkkjjiiiihhhhhhhhhhhhhhhhhhhhhhhhhhffffffeell��rrppssnnppsshhttcczzxxuullssvvyynn��zzll~~xx��hh��jjhh~~��rr��qqyy��ssiissvvzzrr~~ffeeffffffffffgggggghhhhiijjkkkkmmnnpppprrttttvvxxzz{{||~~����������������������������}}{{zzxxwwuussssqqppoommllkkjjiiiiiiggggffffffffffffffffffffffffffccccccaa����������{{����������ww��������zz����������������������������pp������������������rr������������``ccccccccccddeeeeeeffggggiijjkkllmmnnooqqrrttuuvvxxyyzz||}}~~����������~~}}{{zzyywwuuttssqqppoommllkkjjiihhhhffffeeeeddccccccccccccccccccccccccccaaaaaaaa��������������������ff����������zz����������������yy����������oo��yy������qq����������{{������^^aaaaaabbbbbbbbcccccceeeeffgghhiijjllmmmmoopprrssttuuwwxxyyzz{{||||||||||||||{{zzyywwvvttssrrqqppnnmmllkkiihhggffeeeeddccccbbbbbbbbaaaaaaaaaaaaaaaaaaaa______^^ss��{{vvzz{{��}}ii��\\bb����}}pp||����zzqq{{oo������nn��ss��llmm����ppxx~~��kk��tt����{{ff||��ff^^____________````aaaabbcccceeeegghhhhiikkllmmooppqqrrssttuuvvwwwwxxxxxxxxxxwwvvuuttssrrppoonnmmlljjiihhggffeeddddbbbbaaaa``````________________________]]]]]]]][[ZZZZ[[[[[[YY[[\\YY]]\\ZZZZZZ[[[[ZZYY[[[[ZZZZddxxXX[[ZZ[[ZZ[[ffwwWW[[[[ZZYY\\ZZ[[YYZZZZ\\ZZYY\\]]]]]]]]]]]]]]^^^^^^____``aabbbbccddffffhhiijjkkllmmooppppqqrrssssttttttttttssssqqqqppoonnmmkkjjiihhggeeeeddbbbbaa``______^^]]^^]]]]]]]]]]]]]]]]]]]]]]]][[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[YY[[[[[[[[[[[[[[YY[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[\\\\\\]]]]^^__````aabbddddeeggggiijjkkllmmmmooooppppppppppppppoooonnmmllkkkkiihhggffeeddccbbaa``__^^^^]]]]\\\\\\[[[[[[[[[[[[[[[[[[[[[[[[[[ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ[[[[[[[[\\^^^^____aabbbbddddeeffgghhiijjkkllllmmmmmmmmmmmmmmllkkjjiiiihhggffeeddccbbbb``____^^]]\\\\\\[[ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-indexed.png b/crates/exav-viewer/demo/examples/files/images/scene-indexed.png
new file mode 100644
index 00000000..8000ff63
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-indexed.png differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-jpeg.tif b/crates/exav-viewer/demo/examples/files/images/scene-jpeg.tif
new file mode 100644
index 00000000..7d5071b2
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-jpeg.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-lossless.jxl b/crates/exav-viewer/demo/examples/files/images/scene-lossless.jxl
new file mode 100644
index 00000000..5b8e86d0
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-lossless.jxl differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-lossless.webp b/crates/exav-viewer/demo/examples/files/images/scene-lossless.webp
new file mode 100644
index 00000000..d6b2f4b9
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-lossless.webp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-lossy.jxl b/crates/exav-viewer/demo/examples/files/images/scene-lossy.jxl
new file mode 100644
index 00000000..689ab28d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-lossy.jxl differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-lzw.tif b/crates/exav-viewer/demo/examples/files/images/scene-lzw.tif
new file mode 100644
index 00000000..f24dda63
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-lzw.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-orientation6.jpg b/crates/exav-viewer/demo/examples/files/images/scene-orientation6.jpg
new file mode 100644
index 00000000..a4cecc4c
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-orientation6.jpg differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-pages.tif b/crates/exav-viewer/demo/examples/files/images/scene-pages.tif
new file mode 100644
index 00000000..ae661825
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-pages.tif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-progressive.jpg b/crates/exav-viewer/demo/examples/files/images/scene-progressive.jpg
new file mode 100644
index 00000000..62537ea9
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-progressive.jpg differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene-rle8.bmp b/crates/exav-viewer/demo/examples/files/images/scene-rle8.bmp
new file mode 100644
index 00000000..5be0f4ce
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene-rle8.bmp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.ff b/crates/exav-viewer/demo/examples/files/images/scene.ff
new file mode 100644
index 00000000..ced27a42
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.ff differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.gif b/crates/exav-viewer/demo/examples/files/images/scene.gif
new file mode 100644
index 00000000..6258014d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.gif differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.j2k b/crates/exav-viewer/demo/examples/files/images/scene.j2k
new file mode 100644
index 00000000..242e061c
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.j2k differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.jp2 b/crates/exav-viewer/demo/examples/files/images/scene.jp2
new file mode 100644
index 00000000..641aa672
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.jp2 differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.jpg b/crates/exav-viewer/demo/examples/files/images/scene.jpg
new file mode 100644
index 00000000..b4d2d4ae
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.jpg differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.pbm b/crates/exav-viewer/demo/examples/files/images/scene.pbm
new file mode 100644
index 00000000..a18f24ba
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.pbm differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.png b/crates/exav-viewer/demo/examples/files/images/scene.png
new file mode 100644
index 00000000..faf9cd8b
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.png differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.ppm b/crates/exav-viewer/demo/examples/files/images/scene.ppm
new file mode 100644
index 00000000..2baa2fec
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/images/scene.ppm
@@ -0,0 +1,23 @@
+P6
+# exav example
+128 96
+255
+\\\\\\\\\\\\\\\\\\\\\\\\\#a"&d[\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\[\\\\$b]\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \ \\\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \\ ]%'c"$`\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \\%&c ]\ \\!#_ \\ \ \ \ \ \ \ \ \ \\ ] \\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \#!]#!]#!]$"]$"^#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]" [" \#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]"!\#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]" \#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]" \#!]#!]#!]#!]#!]'%a#"]#!]#!]#!]" \#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]" \(&b&$`" \#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!]#!](#](#]'"\+&a.)d'!\(#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#]("]'!\(#](#](#](#](#]'"])$_*%`'"](#](#](#](#](#](#]'"]'"\(#^+&`("](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#]'"\'!\(#]("])$^3.g'"\(#](#](#](#]'"\("](#](#](#](#](#](#](#](#]'!\("](#](#](#](#]("]'"]'"]("](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#](#]-$^-$^-$^,$^,$]-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^,$^-%^1)b,$^-$^-$^-$^-$^,$]/'a1)c,#]-$^-$^-$^-$^-$^,#]1(b4+e,#]2*d,$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^,#]0(a3+d+#]-$^-$^.&_,$^-$^-$^,$^-$^-$^-$^-$^-$^-$^-$^,#],$^-$^,$^1)b-%^,$^-$^-$^,$^.%_/&`,$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^-$^1&^1&^1&^1%^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1%^2'_:.f1%^2&^1&^1&^1&^2&^1%^1%]2&^1&^1&^1&^1&^1&^1%^2&_2'_1%^0%]1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1%^3'_5)a1%^1&^1&^1%^1&^1&^1%^2'_2&^1&^1&^1&^1&^2&^1%^6*b2&_1&^1%^9.f2'_1%^1&^1&^1%^3'`5)b1%^2&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^1&^6'_6'_6'_7(`7(_6'_6'_6'_6'_6'_6'^6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_5&]7(_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_7(_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'^9*a7(`6'_6'_6'_6'_6'_6'_6&^>/g7(`6'_6'_6'_6'_6'_6'^>.f7(`6'_6'_5%]6'_6'_6'_6'_6'_6'_6'^6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_6'_;)_;)_:'^C0g@-c:(^;)_;)_;(_:'^@.d>+a:(^;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_<)_:(^;(_;)_;)_;(_:(^;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_:'^;(_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_:(^:'^;)_;)_;)_;)_;)_;)_;)_;)_;)_:(^@.d>,b:(^;)_;)_;)_;)_;)_;)_;(^;(_;)_;)_;)_;)_;)_;)_:'^;(_;(_<*`<)`;(_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_;)_@*`@*`@*`?*_@*`@*`@*`?)_H2hA+a?)_G1gC-c?)_@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`?)_I3hA+a@*`@*`A+`D.d@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`?)_I3gA+a@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`?)_D.cG1f?)_@*`@*`@*`@*`@*`@*`@*`@*`@*`?)_?*_@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`?)^H2gE/d?)_@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`@*`E,`E,`E,`E,`E,`E,`E,`E,`F-aE,aC*_I0eL3gC*_E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`F-aE,`E,`E,`F-aL3hD+`E,`E,`E,`E,`E,`E,`E,`E,`E,`D+`J1dE-aE,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`D+`G.bI0cD+_E,`D+_E,`D+`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`D+_D+`E,`E,`E,`E,`E,`D+_D+`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`D+_E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`E,`J-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aI-aJ-aJ.bJ.aJ.bI-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aI-aJ-aJ-aJ-aI-aH,_J-aJ-aJ-aJ-aJ-aJ-aI,`I-`J-aJ-aJ-aH,`I-aJ.bJ.aJ-aI-aI-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aI-`I,`J.aI-aO3fJ-aO3fJ.bI-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aI,`M1dL/cI-`J-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aI-aJ.aL0dI-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aJ-aN/aN/aN/aN/aN/aN/aN/aN/aN/aN.aT4fO/bN.aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aO/aN/aN/aN/aN/aO/aN.`S3eQ1dN.aN/aN/aO/aM.`S4fQ2dM.`O0bO/bN/aN/aN/aN/aN/aN/aN/aO/aO/aN/aN/aR2dO/aO/bN/aO/aO/aN/aN/aN/aN/aN/aN/aN/aO/aN/aN/aN/aN/aN/aO/aM-`U6gR3dM.`O/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aO/bS4fN.aO/aN/aN/aO/aN/aN/aN/aN/aN/aN/aN/aN/aN/aN/aS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0aS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0aV3dU2cS0bS0bS0bS0bS0bS0aS0bR/a[8iX5fR/aS0bS0bS0bS0bS0bS0bS0bS0aS0bS0bR/aS0bS0bS0bR/aS/aS0bS0bS0bS0bS0bS0bS0bR/aS0bS0bS0bS0bS0bS0bS0bR/aR/aS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bS0aS0bS0bR/aS0bS0bS0bS0bS0aS0bS0bS0bS0bS0bS0bS0bS0bS0bS0bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX1bW1aX2bX2bX2bX2bX2bX2bX2bW1aX1bX2bX2bX2bX2bX2bX2bX2bX2bW1aX1bX2bX2bX2bX2bX2bX2bW1bZ4d[5fW1aX2bX2bX2bX2bW0a^9h[6eW1aX2bX2bX2bX2bY4dW1a]7gY3cX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX2bX1bZ4dY3cX2bX2bX2bX2bX2bW1a]7g[5eW1aX2bX2bX2bX2bX2bX2bX2bX2b]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3b_5e`6f\2b]4c\2b\3b\2b]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c^4d_5e]3b]3c]3c]3c]3c\2ba7f_5e]3b]3c]3c]3c\2bg?l_6eb8h]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c\2b]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c]3c\2ba7g_5e]3b]3c]3c]3c]3c]3c^4d]4c]3c]3c]3c]3c]3c]3c]3c]3c]3cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb4cb5cb5cb5cb5cb5cb5cb5cb5cb5ca4bb5cb5cb5cb5cb4cb5cb5cb5cb5cb5cb5ca4be8fg:ia4ba4bh;id8fh;jc6dc6db5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cc6da4cb5cb5cb5cb5cb5cb5ca4ba4cb5cb5cb5cb5cb5c`3bd7ee8fa4bb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5c`3bi>jf:ga4bb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5ca4ba4ca4cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cb5cg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dh8eg6de5cg7dg6dg6dg6dg6df6dh8ep@mf5cg7dg6dg6dh8eg7dg6dg6dg6dg6dg6dg7df6cf5cg7df6cj:gh8ej:gh8fpBmf5cg7dg6dg6dg6dg6dg6dg7dg6dg6dg6dg6dg6dg6dg6dg6dg6dg7df6co?lh7ef6dg6dg6dg6dg6dg6dg7dg7dg6dg6dg6dg6dg6dg7df6cf6cg7dg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg7dg7dg6dh8eg7df6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg6dg7el<if6cg6dg6dg6dg6dg6dg6dg6dg6dg6dg7df6cf5cg7dg6dg6dl8dk8dk8dk8dk8dk8dk8dk8dk8dl8dj7cs@lm:fr>jk7dl8dk8dk8dk8dk8dl8el9ek8dk8dl8dk7ctAml9ek8dk8dk8dk8dk8dk8dl8dl8dk8dl8dk7ck7dk7ck8dk7ck8dk8dk8dk8dk8dk8dk8dk7dk8dk8dk8dk8dk8dk8dk8dk8dk8dk8dk8dk7ck8dk8dk8dk8dk8dk8dk8dk8dk8dk8dk8dk8dk8dl8dl8dl8dl8dl8dl8dl9dl9dl8el9el9el9el9el9el9dl8dl8dl8dl8dk8dk8dl8dk8dk8dk8dk8dk8dk8dl8dk8dk8dk8dk8dk8dk8dl9ek8dk8dk8dk8dk8dk8dk8dk8dk8dl8dk7cn<gq?jj6cl8dk8dp9dp9ep9ep9ep9ep9ep9ep9ep:ep9dr<gr<gp9et=ip9ep:ep9ep9ep9ep9eo8cp9ep9ep9ep9ep9eo9dp9ep9ep9ep9ep9ep9ep9ep9ep9ep:ep9dp9ep:ep:ep9ep:ep9ep:ep9ep9ep9ep9eq:es<gp9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep:ep9ep9ep9ep9ep9ep9ep9ep9ep9ep:ep9ep:eq:eq:eq:eq:eq:eq:er:eq9eq:dr;er:er;er;er;er;er;er:er:eq:eq:eq:eq:eq:eq:ep:ep9ep9ep9ep:eo9dp9dp:ep9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep9ep:ep9dr<gs>hp9dp:ep9e|Blv<fu;eu;eu;eu;eu;eu;eu;et:dx?hzBkt9dt:du;eu;eu;eu;eu;ev<f{Clt:eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;et9d{Bly?it:du;eu;eu;eu;et:du;eu;eu;eu;ev;fy?iu:eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu:ev;ev;ev;fv;ev;ew<ew<fw<fw;ey?hz@iw<ex=fx=fx=fx=fx=fw=fw<fw<fw<fw<fw<ev;ev;ev;fv;ev;eu;eu;et:dy?iw=ht:eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu;eu:et:du;eu;eu;e{=gz=fz<fz<fz<fz<fz<fz<fz<fz=fy<ey;ez=fz=fz<fz<fz<fz<fz<fz=f}Ajy<fz=fz<fy;ez=fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<f{=gz=fz<fz<fz<fz=fy<e�Bl{=gz<fz<fz<fz<fy<ez<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<e|?h}@iz<e{=f{=f|>f|>f|>f}>f}>g|=f�Bj�El}=e~?g~?g~>g~?g~?g}>f~?f}>f}>f}>f|>f|=f|>f{>f{=f{=f{=fz=fz<e|?h{>gy<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fz<fy;ez=fz=fz<fz<fz<f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f~=e>f>f>g�Bj~>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f~>f�Ai>g>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f=f�Bj�El>e�?g�@g�?g�?f�@g�@g�@g�Ag�@f�?f�Ag�Ag�Ag�Ag�Ag�@f�Ag�Ag�Ag�Bh�@g�@g�@g�@g�@g�?g�?f�>f�>f>f~=f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f>f�?g�Dl~=f>f>f>f>f�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�@g�@h�?g�?g�@g�?g�?g�@h�Fn�?f�@g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?f�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�@g�@g�@g�@g�@f�?f�Ag�Ag�Ag�Bh�Jo�Bg�Ch�Ch�Ch�Ch�Dh�Ch�Ch�Ch�Ch�Di�In�Bg�Ch�Di�Kp�Bg�Bh�Bg�Bh�Bg�Ag�Ag�Ag�Ag�@g�@g�?g�?f�>f�?f�@g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�?g�@g�Cj�?g�?g�?g�?g�?g�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ah�@f�Fk�Jn�?f�Ah�Ag�Ag�Ag�Ag�@f�Ag�Ag�Ag�Ag�Ag�Ag�Bh�Bh�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ah�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Bh�Bg�Bh�Ch�Ch�Ch�Ch�Di�Ei�Ei�Dh�Eh�Dh�Ei�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Jm�Kn�Eh�Eh�Dh�Ei�Dh�Dh�Dh�Ch�Ch�Ch�Ch�Ch�Bh�Ag�Dj�Ci�Gl�Ek�@g�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�Ag�@f�Ag�Ag�Ag�Ag�Ag�Ch�Ch�Bh�Bh�Ch�Bg�Bh�Ch�Bh�Bh�Ch�Bh�Bh�Bh�Bh�Ch�Bh�Bg�Ch�Ch�Bh�Di�Ch�Bh�Ch�Bh�Ch�Bh�Bh�Ch�Bg�Gl�Jo�Ag�Ch�Bh�Ch�Ch�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Ch�Bg�Af�Ch�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Ch�Ch�Ch�Ch�Ch�Ch�Ch�Ch�Dh�Eh�Di�Ei�Dg�Mp�Km�Fh�Gi�Hj�Kl�Hi�Hj�Hj�Ii�Ii�Ii�Ij�Ii�Hi�Ij�Hi�Hi�Hi�Gi�Gi�Gi�Fi�Fi�Fi�Eh�Di�Dh�Dh�Cg�Gk�Hm�Ej�Ej�Bh�Ch�Ch�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Bh�Ch�Ch�Bh�Ch�Bh�Bh�Bh�Dh�Dh�Dh�Dh�Ch�Nq�Ej�Dh�Ei�Ei�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Di�Ch�Oq�Ei�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Ch�Dh�Dh�Dh�Dh�Cg�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Di�Cg�Im�Rv�Bf�Di�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Di�Dh�Dh�Dh�Ei�Cg�Ei�Ei�Fi�Fi�Fi�Gi�Gi�Hj�Hi�Hi�Ij�Hi�Kk�Oo�Jj�Kj�Kj�Kk�Kk�Kk�Kj�Kk�Kk�Kj�Kj�Kj�Jj�Jj�Jj�Ij�Ij�Hi�Hj�Gi�Gi�Gi�Fi�Fj�Eh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Dh�Gj�Gk�Ei�Fi�Ei�Gj�Fi�Dh�Km�Mo�Cg�Fi�Ei�Fi�Fi�Fi�Fi�Fi�Fi�Ei�Fi�Eh�Ei�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Ei�Fi�Fi�Ei�Fi�Ei�Fj�Jm�Ei�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Ei�Fj�Jn�Ei�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Ei�Fi�Dh�Ei�Fi�Fi�Eh�Op�Hj�Gi�Hj�Hi�Ij�Gi�Jj�Jj�Kj�Kj�Lk�Qp�Lj�Lj�Nk�Nk�Nk�Nk�Ok�Nl�Nl�Ok�Nk�Nk�Nk�Nk�Mk�Mk�Lk�Ml�Lk�Jj�Jj�Ij�Hi�Ij�Gh�Np�Km�Fh�Gi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Fi�Ik�Jm�Fh�Gi�Gi�Gi�Gi�Gj�Eh�Mn�Kl�Fh�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gj�Il�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Fh�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Fi�Np�Hj�Gi�Hj�Hi�Mn�Jj�Ij�Ij�Jk�Jj�Tr�Ml�Lk�Mk�Nk�Ol�Ro�Ol�Pl�Pl�Ql�Ql�Ql�Ql�Rl�Rl�Ql�Ql�Ql�Ql�Pl�Pl�Pl�Mj�Wr�So�Lj�Lk�Nm�On�Jj�Kj�Ij�Ij�Ij�Ij�Hj�Hj�Gj�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Gi�Hj�Hi�Ij�Hj�Hj�Ij�Ij�Ij�Hi�Mm�Kl�Hj�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Hj�Hi�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Hj�Ij�Ij�Hj�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Hj�Mn�Ij�Ij�Jj�Jj�Ii�Jj�Kk�Lk�Mk�Mk�So�Ol�Ol�Pl�Ql�Ql�Ql�Sm�Sm�Sm�Tm�Tm�Tm�Um�Um�Um�Um�Tm�Tm�Tm�Sm�Sm�Rm�Rm�Ql�Pl�Pl�Ok�Pm�Pm�Mk�Mk�Lk�Kk�Kj�Jj�Jj�Jj�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Ij�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Ii�Ij�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Ii�Jj�Kk�Kk�Lk�Lk�Lk�Mk�Nk�Ol�Pl�Ok�Ql�Rm�Rm�Sm�Tm�Un�Vn�Vn�Wn�Wn�Xn�Xn�Xn�Xn�Xn�Xn�Xn�Xn�Wn�Wn�Vn�Vn�Um�Tm�Tm�Rm�Rm�Ql�Pl�Pl�Ol�Nk�Mk�Lk�Lk�Lk�Kk�Kk�Jk�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Jj�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Kk�Lk�Lk�Kk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Mk�Mk�Ml�Nl�Ol�Pl�Pl�Qm�Rm�Sm�Tm�Tn�Vn�Vn�Wn�Xo�Yn�Yo�Zo�Zo�[o�[o�[o�[o�[o�[o�[o�[o�Zo�Zo�Yo�Yn�Xo�Wn�Vn�Vn�Tn�Tm�Sm�Rm�Qm�Pl�Pl�Ol�Nl�Ml�Mk�Mk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Lk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Ml�Nl�Nl�Ol�Ol�Ol�Pl�Qm�Rm�Sm�Tm�Tn�Vn�Vn�Wn�Xn�Yo�Zo�[o�\o�]p�]p�^p�^p�^p�_q�_q�_q�_q�^p�^p�^p�]p�]p�\o�[o�Zo�Yo�Xn�Wn�Vn�Vn�Tn�Tm�Sm�Rm�Qm�Pl�Ol�Ol�Ol�Nl�Nl�Ml�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Mk�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Pl�Pl�Pl�Ql�Rm�Sm�Sm�Tn�Un�Vn�Wn�Xn�Yo�Zo�[p�\p�]p�^p�_q�`q�aq�bq�bq�cr�br�br�br�br�cr�bq�bq�aq�`q�_q�^p�]p�\p�[p�Zo�Yo�Xn�Wn�Vn�Un�Tn�Sm�Sm�Rm�Ql�Pl�Pl�Pl�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Ol�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Qm�Qm�Qm�Rm�Rm�Sm�Tn�Tn�Un�Wn�Xn�Xo�Zo�[p�\p�]p�^q�_q�aq�bq�cr�dr�dr�er�es�fs�gs�gs�gs�gs�fs�es�er�dr�dr�cr�bq�`q�_q�^q�]p�\p�[p�Yo�Xo�Xn�Wn�Un�Tn�Tn�Sm�Rm�Rm�Qm�Qm�Qm�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Pl�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Sm�Sn�Tn�Un�Vn�Wn�Xo�Yo�Zo�[o�\p�]p�^q�`q�aq�cr�dr�er�fs�gs�hs�it�jt�jt�kt�jt�jt�kt�jt�jt�it�hs�gs�fs�er�dr�cr�aq�`q�^q�]p�\p�[o�Zo�Yo�Xo�Wn�Vn�Un�Tn�Sn�Sm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Rm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Tm�Tn�Un�Un�Vn�Vn�Wo�Xo�Yo�Zo�[p�\p�]p�_q�`q�br�cr�dr�fs�gs�ht�it�jt�ku�mu�mu�nu�nu�ou�ou�nu�nu�mu�mu�ku�jt�it�ht�gs�fs�dr�cr�ar�`q�_q�]p�\p�[p�Zo�Yo�Xo�Wo�Vn�Vn�Un�Un�Tn�Tm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Sm�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Xn�Xn�Yn�Yn�Zn�[o�\o�]o�^p�_p�ap�bq�cq�er�fr�hr�is�ks�lt�nt�ot�pu�ru�sv�tv�tv�uv�uv�uv�uv�tv�tv�sv�ru�pu�ot�nt�lt�ks�is�hr�fr�er�cq�bq�ap�_p�^p�]o�\o�[o�Zn�Yn�Yn�Xn�Xn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�Wn�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�]n�]n�^n�^n�_o�`o�ao�bo�cp�ep�fq�gq�iq�kr�lr�ns�ps�qt�st�tu�vu�xv�yv�zv�{w�{w�|w�|w�|w�|w�{w�{w�zv�yv�wv�vu�tu�st�qt�ps�ns�lr�kr�iq�gq�fq�ep�cp�bo�ao�`o�_o�^n�]n�]n�]n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�\n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`o�`n�`n�`o�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�an�an�bn�bn�cn�do�eo�fo�gp�ip�jp�kq�mq�or�pr�rs�ss�ut�wt�yu�{u�}v�~v�w��w��w��x��x��x��x��x��x��w��w�w�~v�}v�{u�yu�wt�ut�ss�rs�pr�or�mq�kq�jp�ip�gp�fo�eo�do�cn�bn�bn�an�an�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�`n�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�do�dl�dk�dl�dl�dk�dl�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�en�en�en�fn�fn�gn�ho�io�jo�ko�lp�np�oq�qq�rr�tr�vs�ws�yt�{t�}u�u��v��v��w��w��x��x��x��x��y��y��x��x��x��x��w��w��v��v�u�}u�{t�yt�ws�vr�tr�rr�qq�oq�np�lp�ko�jo�io�ho�gn�fn�fn�en�en�en�dn�dn�dn�dn�dn�dn�dn�dn�dn�dn�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�io�hm�hk�kv�o��r��r��p��kx�hl�hl�io�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�in�jn�jn�kn�ln�mo�no�oo�pp�qp�sp�tq�vq�wr�yr�{s�}s�t��t��u��v��v��w��x��x��x��y��y��z��y��y��z��y��y��x��x��x��w��v��v��u��t�t�}s�{s�yr�wr�vq�tq�sp�qp�pp�oo�no�mo�ln�kn�jn�jn�in�in�in�in�in�in�in�in�in�in�in�in�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�ml�np�r��u��v��v��v��v��u��s��ow�mk�mm�mo�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�nn�nn�nn�on�pn�pn�qo�ro�to�up�vp�xq�yq�{q�}r�~r�s��t��t��u��v��v��w��x��x��y��y��z��z��{��|��|��{��z��z��y��y��x��x��w��v��v��u��t��t�s�~r�}r�{q�yq�xq�vp�uq�to�rn�qn�pn�oo�on�nn�nn�nn�mn�mn�mn�mn�mn�mn�mn�mn�mn�mn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qo�rk�rv�u��v��u��u��u��u��u��u��u��u��s��rp�rk�qn�qo�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�qn�rn�rn�sn�sn�sn�tn�uo�vo�wo�xo�zp�{p�}q�~q�r��r�s��s��t��u��u��v��w��w��x��y��y��z��{��|��y��v��v��y��|��{��z��y��y��x��w��w��v��u��u��t��s�s��r�r�~q�|q�|n�zn�xp�wr�vq�un�uk�tm�so�rn�rn�rn�qn�qn�qn�qn�qn�qn�qn�qn�qn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vo�wk�v|�u��u��u��u��u��u��t��t��u��u��u��u��u��u|�vl�wl�vn�vo�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�wn�wn�wn�xn�yn�zo�{o�|o�}p�~p�p�q�q��r�r��s��s��t��u��u��v��w��x��x��y��z��{��{��u��������������u��{��{��z��y��y��x��w��v��u��u��t��s��s�r�s��p�o�}y�x��v��u��u��v��w�xq�xl�wl�vo�vn�vn�vn�vn�vn�vn�vn�vn�vn�vn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zn�zo�{k�x|�u��u��u��u��t��u��w��x��w��v��t��t��u��u��u��v��yw�{m�{k�{l�{n�zn�zo�zn�zn�zn�zn�zn�zn�zn�zn�zn�{n�{n�{n�|n�|n�}n�~n�~o�o�o�p�p�p�q��q�r��s��s��t��t��u��v��w��w��x��y��z��{��{��z�ԯ�������������Ԯ��y��z��y��x��w��v��v��v��v��u��u��t��s��q��o�x�y��t��t��u��u��u��u��u��u��w��{s�|k�{l�{n�zn�zo�zn�zn�zn�zn�zn�zn�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�o߀k�{|�u��u��u��t��u��x��u��m��i��j��r��w��x��u��t��u��u��u��v��z�|u�oހl߀k�k�l�~n�n�n�n�n�n�n�n܀n݀nހnހn߁n�n�o�o�o�p�p�q��q�q��r��r��s��t��u��u��v��w��x��x��y��z��}��u�֮�������������������߳��x���׏�׎�܏��}��x��t��s��r��r��r�x�~��u��t��u��u��u��u��u��u��u��u��u��u��x��|w�oހl߀kހl�m�n�o�n�nބnބnބnބnބnބnބnބnބnބnބnބnބnބnބnބnރn݃o�k�~|�t��u��u��t��w��u��c�vOijGafE^hE_nJd~To�e��u��x��w��t��t��t��t��t��v��y��}�Ձzޅu�n�l��kރn݃oރnރnރn߄n߄n��n�n�n�n�o�o�o�p�p��q�q��q��r��s��s��t��t��u��v��w��x��x��z��{��y����������������������������w��q��q��q��r��t��z�ʃ�؊�؈�ׇ��}��u��s��u��u��u��u��u��u��u��u��u��u��u��u��t��u��v��y��}~Ӏwقrބn�k�lބn�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n��o�k΀|�t��u��u��t��x��m�wPjeD]gE_jGakHbkGaiF`fD^fD^tMh�^z�n��x��{��x��x��y��x��u��q��k��i��p�|ۆz�o�j�l�m��n��o�n�n�n�n�n�o�o�o�p�p�q��q��q��r��s��s��t��u��u��v��w��x��y��y��|��v�̗������������������Ř��l��t��v��v��v��v��u��t��r��r��r��r��s��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��t��t��t��v��x��{�ԃw�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�n�o�kЃ|�t��u��u��u��y��d�kGafE^kHbkGajGajGajGajGakHbkHbgE_dC\sLfwPjnMe�_|�`}�^z�YtxPjoJdjF`fD_fEbnJi�]{�v�˂�Ӆx��p�l�k�l�n�o�o�n�o�o�o�p�p��q��q��q��r��s��s��t��u��t��v��w��x��y��y��|��v�З��������������Һ���m��w��u��u��u��u��u��u��u��v��v��v��v��u��u��u��u��u��u��u��u��u��u��u��t��t��t��t��u��u��u��u��u��u��u��t��t��u��y��n�n�n�n�n�n�n�n�n�n�n�n�n�n�o�kц|�t��u��u��u��w��a}gE^iF`kHbjGajGajGajGajGajGajGahF`nIdpJeK7M)
/S:QkGbgE_eD^iF`jGakHakGaiF_eD]nJf�g��w��v��}�τ~یu�o�l�k�m�o�o�p�q��q��r��r��q��q��q��q��t��w��w��x��v��v��w��y��{��z�ɇ�����������òw��p��x��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��s��w��y��x��y��s��u��u��u��u��u��u��u��u��u��t��n�n�n�n�n�n�n�n�n�n�n�n�n�o�kӉ|�t��u��t��v��x��YudC\kGajGajGajGajGajGajGajGahF`kHbqKe\@X'#5	!#&
+"$6,?fE_qKfjGaiG`jGajGajGakHbiF_gE]�c�x��s��s��u��x�Ɓ�֊|�t�o��m��l��m��m��n��o��q��v�~͈����y��y��y�Ņ�ז���~��z��y��{��s�����ˡ��m��s��w��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��u��t��t��|��q�N;P7.@�g��|��v��s��u��u��u��u��u��u��u��u��n�n�n�n�n�n�n�n�n�n�n�n�o�kԋ|�s��u��t��w��s��VqfD^kHbjGajGajGajGajGajGaiG`iF`pJegF_:.A$	!%%$%$ )H5JmIcnIdiF`jGajGajGakHbjGafE^�c�y��u��u��t��s��s��u��{�ǂ�ӊ�ԋ�Ջ�׍�·��~��w��r��q��s��t��t��t��r��p��s��~�Ƌ�ם�ӛ�����v��m��v��v��u��u��u��u��u��u��u��u��u��u��u��u��u��u��t��t��t��t��t��u��u��s��y��x�tRj-$\DY�r��{��t��t��u��u��u��u��u��u���o��o�o�n�n�n�n�n�n�n�n�o�iԍ{�s��t��u��y��m�uNieD]kHbjGajGajGajGajGajGahF`mIcoJdL7M+$%$$$$$%# $"2X=UqKekHbhF`jGajGajGajGafE^�c��y��t��u��u��u��u��t��r��r��r��r��q��r��s��t��v��v��u��u��u��u��v��v��u��s��q��o��o��q��u��w��u��u��u��u��t��t��t��t��t��t��t��t��t��t��u��v��x��z��y��z��y��u��w��|��c~5->"&%$
""2{Vn�z��y��v��w��w��w��w��w�΋k̊jԏk�m�m��n��o��o��o�n�n�i����v��u��y��u��b~kHbgE_lHbjGajGajGajGajGajGamHcrLf^AY)$6
+"
#&$$$$$$$$%&"$7,?gE_rKfkGbjGajGajGajGafE^�c��y��t��u��u��u��u��v��v��v��v��v��v��u��u��u��u��u��u��u��u��u��u��u��u��v��v��v��v��u��t��t��t��u��w��y��z��{��{��{��{��{��{��y��y��t��p��e��_{�`|�_z�c�t��p�S>S"&%$$$&	 <1CtOi�Vq~To{Rm|Sn|Sn|SndC`cB`hFasMbuNb�^d�pg��iוk�l��o䚄�Yw�d�t��`|tNheD^iG`kHbjGajGaiG`iF`jGajGakHb`BZ3*=  $$$$$$$$
#  $A1FfE^kGajGajGajGajGafE^�c�y��u��t��u��u��u��u��u��u��u��u��u��u��t��t��t��t��t��t��t��u��u��t��t��t��u��v��x��x��x��z��x��n��b~�ZuoKdpLepLepLepLenJcQ8OR8PG0G/$8+%0,4*3, 55)=.$&$$$$$$%%
+!7,?dD]mHcfD^fD^fE^kHakHajGahEagEacB``@``@_hFayQf|V`B3I &@1EeD]mHcjGaiGajGajGahF`mIcoJdiF`iGajGaJ6L4*=<.B=/C:.AA1F8,@'
$$$$$$#,?0E>0D;.B>/D:-A5+>T<SlHbjGajGajGajGajGagE^�[w�w��w��t��t��t��t��t��t��t��u��t��u��w��z��{��{��{��z��w��v��v��w��x��w��u��o��f��_{xPkaB[M5L7'<*4(2%0%0%0%0%0%0*3&1)"#&#1*!5)	!%$$$$$$$$$$"")H6KkGbkHakGajGajGajGakGakGakHakH`qKelHbA0G
&%
#.Q:QoJdmIchF`jGarKgZ?VQ:PqKflHbhF`nIdsLgpJepJexOj]@Y  0
#$$$$$$$$-'9jGawNioJdqKfrKglHcjGajGajGajGajGajGajGaeD]}Sn�n��x��x��w��w��w��x��x��w��y��v��l��^ysMgnJcxQk�`|�k��r��s��l��c�XswOjdC]O6N;)@.!6'1)2-!60#81#81#91#91#91#94$:2$9%1'
#$%
$#%,*!4( 3) 3"0%
$$$$$$
$9-@Y>VS;QS;RO9ON8OfE^kHajGajGajGajGajGaiF`lHbqKeT<S! 0 #&$$%"	!-&8_AYrKfjGa>/D&
+"1(;cC\qKeiG`gE_lHbnIdB2F#"%$$$$$$$% )R:QpJejGagE_iF`jGaiGaiGaiGaiF`iF`jGakHbfE^kHaUp�d��j��i��i��a}�_{~TomIcI2I4%:(2&0%0&1)33%:;*@C.E;*@9(>:)?9(>1#8, 5-!5/"71#80#80"7/"7/"7/"7/"7/"7/"7%1&	!
#$$$$$
##*-"6%1%$$$$$$$$%</CrKfsLgoJdpJekGajGajGajGaiF`iF`iF`nId`B[.':	!%$$$$$%$'8-@/
#% 'C2GlHbqJe[?W/ 	!$$$$$$
$  0(;hF`oJemIcmIcmIcmIcmIcnIdnJdmIckGbkGaiF`eD]eD]fE_hF`kHbeD^N6M5&;)3)3.!60#81#81#91#80#8.!6, 5+4, 5-!6-!5-!5/"70#80#8/"7/"7/"7/"7/"7/"7/"7/"70"7+ 5-- /'
$$$$
$)"/+
$""#$$$$$$
#
+"-Y>VkHbhF`jGajGajGakHbnIdnJdpKeM8N-%),&
$$$$$
#(&	!
+!%$$%#.R:QI6K9-@>/D:.AA1F3*=$$$$$
#(<.B@1E@1E@1F2)<@/DQ7OA-D=+A>+B>,B=+AE0GQ7O^?XgE_lHbmIcpKenJdmIceD^T9Q:(>, 5.!60#80#8/"7/"7/"7/"7/"7/"7/"70"80#80"80"70"80"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"72#9,!5)#$$$$
$$+,))))$$$$$$'.+&7#!2'#4Z>WlIciGajGajGa;)?F0GM5LO6NQ9PR9P\?WfD^E4I&
$$$$$
#*.!/"0(
$$$
$& /,+F1HgD^oJeyOk_AZ-
$$$$$$#*%7eD]\=VH1I=*A0"7*4, 5, 5, 5, 5, 5+ 4+4.!64%;=+AB.DN5ME0G=+A2$9+4-!50#80"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"70"7) 4)()$$$
$%*'+."72#9/"7*
$$$$$$'-"6K3JfD^qKflHbjGaiF`jGajGa-!5+ 4*4+ 4/"7/"71#8"1""$$$$$$"%$1-#$$$$#(-!63#9*4+ 5:(>C0F'	 %$$$$$$!&)3, 5, 5/"70#80"80"80"80"80"70#80#8/"7.!6, 5+ 4*4+ 4, 5.!60#8/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7/"7."70#81#8,#$$$
$#03$9/"70#8."6(#$$$$$$#$$01"8C/E[>VlHbnJdkHbjGa.!61#81#80#80#8,!5)
#%&$$$$$%&$$$($$$$(()* 41#80#8- "
#
#$$$$$
#
#"%( 31#8/"70"70"70"70"70"70"70"70"70"70"70#70#81#80#80#70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"70"7."6)$%$$$%$-1#8(2%"#$$$$$$##$"/, 4.!6=*@S9PeD]kGa1'@% 7'!8&!8&!8$ 7#6% 7'!9/#$$$$% 3&!8% 7% 7+
#$$
#(' 7(!9& 7'!8% 6./..*
#$$$$-./-/&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8&!8% 7# 6% 7'
$$
#+& 8"6&!84234+
#$$
#(4333'!9% 7 3 3.&=P:U(#<# 8# 9# 9# 8# 9$ 9# 8.#
#$$$$
#%2# 9*$%$$%%&5$!9# 9# 8# 8"7(#<(#;&$$$$
#*%!:# 8%!:%!:" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8# 8# 8# 9# 9# 8# 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8" 8# 8$ 9+"$$$"/$!9" 8$ 9$!9%!: 5$$$$$
#1&";%!:$!9 6-'@:.IB3NK9UA3N)#<5 6 6!7!6# 8/%('
$$$$%#$1# 8"7'
#$$4# 8"6!6 6!6+%>A2MG6Q.
#%$$$%"/1(B!6!6# 8$ 8$ 8$ 8$ 8$ 8$ 8$ 8$ 8$ 8# 8"7!6 6 6!6"7# 8$ 8$ 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8"723&
$)42# 8# 8# 8# 8 5
#"
$$$$
#"0!7!68-GO;XP<XO;WO;WJ8T3*C7,F8-G;/IC4OB3ND5PH7RI8SM:V! 3!%$
#! 4.'@" 75!7'
+!%%
#$5$!90(A9.HB3NM;WO<W.
+!#$$$"	!*&:>0K*$=$!9!6 6 6!6!6!6!6!6 6# 8*$=.'@5,E8-G/'@*$=# 8 6 6# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8&!;.
 3%!:# 8# 8# 8$ 9-(*'$$%)'.5+ED5PO;WM:VL:UL:VM:VG6RN;WP<XP<XP<XO;XO;XO;WN;WQ=Z($8	 $$$
#"7-DM:VA3N8-F.(?$!7.%"90)AG6RO<XP<XO;WO;XA3L*&;.(=0*?."$"#"50)?-'<-'=K9TO;XH7RA3N9.H5+E-&?.'@.'@.'?.'@9.HG6QM:VO;WP<XP<XP<XN;VG7R>1L3*C$ 9# 8$!9$ 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 71!'3$ 8# 8# 8# 8# 8# 8$!9# 8&$%$4-&@J8TQ<YO;WM:VM:VM:VM:VM:VK9UM:VL:UL:UL:VM:VL:VL9UP<X7-D
$(&#$'&(D5OQ=YP<XR=Z1

+#G6QR=ZN;WL:VL:UM:VM:VN;WR=ZS>[M:V)
#&!"!4T>\Q=ZR=ZM:VM:VN;WO;XP<XP<XO;WO;WO;WO;WO;WP<XO;WM:VM:VM:VL9UJ8TI8SK9TL9UM:V/(A5 6!6$!9$!9$!9$!9$!9%!9$!9$ 9# 8# 8# 8" 7" 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 7&"<(1%";# 8# 8# 8# 8# 8# 8%!9.$

"/O;WM;WL:UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VG7RI8SI8S+
$#$"5N;WG7QI8SM:VM:VF7Q-(= )%9A3LN;WL:UM:VM:VM:VM:VM:VK9TR=Z&#7
+!"$	!5-CQ=ZK9TM:VM:VM:VL:VL:UL:VM:VM:VM:VM:VM:VL:VM:VM:VK9UJ8TN;WXA^eJgeJgeJgbHdYB^M:VA2M/'@44553355# 8"8$ 8&":&":"7!7# 8$ 9# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 8# 7%!;&/$!:# 8# 8# 8# 8# 8$!9 5" 
+
+
"2+AQ<YL:UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN;VO;VT?[0)>	 

#>2JR=ZM:VM:VM:VM:UU?]$N;WP<XM:VM:VM:VM:VM:VM:VL:UP<Y:/F
+"	
+

+ $F6QN;WM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN;WK9UYB^pQnxVt[y�]{�\{�\{�\z�\z[y~ZxyWu^FbD5O:.H:.HJ9TS?ZeJfhLilNk`GcT?[I8SH6R:.H)$<!7 6!7$!9$!9$!9$ 8# 8# 8# 8# 8# 8# 8# 8# 8$ 9 4.!6# 9# 8# 8# 8# 8$!9%!:3%"7\E`"*
+;/G:/GA3LN;WM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN;VN;VN;VL9VH6UG6VA3R*
$
+$  3O<XM:VM:VM:VM:VM:V@1I</FK9TM:VM:VM:VM:VM:VM:VM:VL:VO;X8.E+&:1*A*%"40*?*&:@3LO;XL:UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VK9TJ9TkMk�^}~Zx~Zx}Yw}Yw}Yw}Zx}Zx~Zx~Zx[y�^|�^|�\{�]{�^|�^}�]|�]{�\{�]{�[yuTroPngKh[C`H7R9.H,%>445!6"7!7!7!7!7"7$ 9$!9$!9%!:%";$ 9# 8# 8# 8$!9# 835&":Q=X�d�"+tSpcHfN:WM:VM:VM:VM:VM:VM:VM:VM:VM:VK9VK9VL9VI7VH6VH7VR>WdJXwXZ^X�c_jMg
 )YB^J8SJ8TL9UM:VM:VM:VM:VP<YQ<YM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VP<XQ<YW@_-$8
+@1IV?]Q<YO;WM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN:VL:UcIexVt~Zx}Zw~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Yw}Yw}Yw}Yw}Yw|Yw}Yw}Yw}Yw}Yw~Zx�[y�\z�\z�[y|YwuTrsSp`GcD5O:/H.'?(#<)$<)$<)$<)$<(#< 65545"7!7!7"75$!9E6PcIexVt�[y~ZxgKd`G_�[ywVsO;WJ8TL9UN;WN;WN;WN;WN;WN;WN;VS>WS?WR>WaHXdJX�_[�x^��_��`��`��b�v`#+�`~{XvpPnR=YK9TN;WM:VM:VL:UL9UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VL:VL9UM:VD4N:.DH7RM:VL9UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VK9TK9TsSq�]{}Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Zx}Yw~Zx~Zx�[y�\z�^|�]|�]{{XvxVtxVtxVtxVtxVtwUshLhhLh_Fc<0I6,E(#<)$<)$<(#<5+EgKh�_~�]{[y}Zx~Zx�]|�^}~Zx}Zx{XvoPnP<XH7SJ8TI8SI8SI8SI8SI7T�v^�v^�u^�{_�}_�}_�|_�y_�y_�y_�y_�z\vVSeJf~Zz~Zx�^|pQnM:UK9TM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VO;XQ=ZN;WM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN;WK9U[C_wUs|Yw~Zx~Zx~Zx~ZxZxZx[x[x[x[xZx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx[x[x�[x[xZx~Zx~Zx}Zx}Zx}Yw}Yw}Yw[y�[y�[y�[y�[y[y�[y�]{�]{�]|�]{[yxVtxVtxVtxVt�[y�\z|Yw}Yw~Zx~Zx~Zx}Yw}Yw~Zx~ZxZx�]{wUseJgfJgfJgfJgfJgdIgsTb�qf�y^�x_�w_�v_�v_�v_�w_�w_�w_�w_�w_�|c�ug�aq}Yy~Zw[y{XvhLiN;VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VL9UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VL:VH8RmOl�]|}Yw~Zx~ZxZx~Zx|Yy{XzzXzzXzzXzzXz{Xy|Yy~ZxZx[xZx~Zx~Zx~ZxZx[xZxzXyxVywUyxVy{Xx~Zx[y~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Yw}Yw}Yw}Yw~Zx�[y�[y�[y�[y~Zx}Yw~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Yw[y�\{�\{�\{�\{�\{�\{�^y�s`�u_�t_�t_�u_�u_�u_�u_�u_�u_�u_�t_�s^�v]�en{Xz~Zx}Zw�\zyWuS>ZJ8TM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN:VK9UT>[tSr~Zx~Zw~Zx}Zy|YyzXz[w�ar�gm�jl�jl�jl�jm�dr�^u�[w{XyzWz{Xy}Yx}Yx}Yx{XyxWy{Xy�et�pq�yp�ms�aw~[y{Tt~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Yw}Yw}Yw}Yw~Yw|Yx�ap�ke�r^�q_�q_�q_�q_�q_�q_�q_�q_�q_�q_�q_�q_�q`�ld�]u}Zx~Zx~Zx}YwmOlL:UM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN:VN:VN:VM:VM:VM:VM:VM:VM:VM:VN:VM:VJ8SaGc�\z}Yy|Yy}Zx�\v�`q�fl�oc�u^�w^�x^�y^�z^�{_�{`�zb�xd�sh�lm�cs�]v�]w�]w�ct�kq�{kُfߓf�g�e՜z������~[x~Zx~[x~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx�[w�n`�o_�o_�o_�o_�o_�o_�o_�o_�o_�o_�o_�o_�o_�o_�p^�_q{Yz~Zx~Zx[y[yWA]I7SM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VM:VN:VM:VL:VK9TJ8TJ8TJ8TK9TM:VN:VN;WN;WN:VO:VI7SS>[tTs|Yz{Yy�]u�gh�kd�o`�q^�r]�r^�q_�r`�s`�t`�t`�va�wa�ya�{a�~a��a€b�e��eÁf͇eՋe؍e֌gَiߎeӞ����������r�{Tu}Yw~[x~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Zx�_r�hf�m^�l_�l_�l_�l_�l_�l_�l_�l_�l_�l_�l_�l_�l_�l_�l`�eh}Zx~Zx~Zx~Zx~ZxmOlL:UL9UN:VM:VM:VM:VM:VM:VM:VM:VN:VJ8TK9TP<XWA]ZC_YB_ZC_WA]N;WJ8TJ8SJ8SJ8TJ8VQ=\kMj�_w�_p�eh�l_�m]�m^�m_�m_�m_�n_�o_�o_�p`�q`�r`�sa�ta�ua�wb�xb�yc�{c�}c�dǁdɃe˄fφfԉg׋h܍gܓn����������������e|Wv\y~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~ZxZw}Yy|Yz[w�h`�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i_�i`�\t{Yy~Zx~Zx[y�\z`FcK8TJ8TN;WN:VN:VN:WN:WM:VL9UI8SaGdsSpzXu[y�\z�[y�\y[yyWtmOmdIhcIimPm�Yh�dg�he�h^�j]�j]�i_�i_�i_�i_�j_�j_�k_�l_�l`�m`�n`�o`�pa�ra�sa�tb�vb�wc�yc�zd�|d�eɁe̓fЅgԇg؊iߊeɤ�������������������{Tu}Vv�[x~Zx~Zx~ZxZx[xZx~Zx}Yx}Yx}ZxZxZx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Zy|Yy|YyzYz�]s�df�fc�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�g_�f_�g_�g_�`m|Yz~Zx~Zx~Zx�[zuTr]DaH7RJ8TJ8TJ8TJ8TL9UR=YaGdZy�\z[y~Zx~Zw}Yx{Yz|Yy~[z�]y�_v�`s�di�i_�h]�g^�g_�f_�f_�g_�g_�g_�g_�h_�h_�i_�i_�j_�k`�l`�m`�na�oa�pa�rb�sb�tb�vc�xc�yd�{d�}e�f́fуgԆgهgَo����������������������|�vSw}Zy}Yx}Yx{YyyXyzXy}Zx�\w�\w�\w{Yy{Yy~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx|Yz|Yy}Zx�[v�]r�^p�`k�ea�h]�g^�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�c_�d^�bd�[w~Zx~Zx~Zx}Zx�\zZxfJgZC_YB^_FblNktSq|Yw�\z~Zx}Yw~Zx~Zx|Yz�[u�^m�`g�ae�ba�c^�d]�d]�c_�c_�c_�c_�c_�c_�c_�c_�d_�d_�d_�e_�e_�f_�g`�h`�i`�j`�ka�la�ma�ob�pb�rc�sc�ud�wd�yd�{e�}f�fЁgӃhلfՏt�������������������������do�_x�\w�\w�_u�ip�ok�qh�te�rd�qd�gk�^s[x}YyZx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Zy}Zx�^m�`g�ad�c`�d^�d^�d]�d_�c_�c_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�\p|YzZx~Zx}Zx~Zx�\z�\z�[y�\z�\z�[y~Zx}Zw~Zx~Zx}Zy�Zv�[q�`a�b]�a]�a^�a^�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�a_�b_�b_�b_�c_�d_�e`�e`�f`�ga�ia�ja�kb�mb�nb�oc�qc�sd�ud�ve�ye�{f�}f�gӁhׂh׈n������������������Ƞ���eрj�}i�{h�|f�|d�zd�wd�td�sc�qc�pa�na�kc�aoyX{~Zy~ZxZx~Zx~Zx~Zx~Zx|Zy}Zy�Zv�^j�b\�a]�a^�a_�a_�a_�`_�a_�a_�a_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^^�\jZw}Zy~Zx~Zx~Zx}Yw}Zx~Zx}Zx}Zw~Zx~Zx~Zx|ZyZw�\f�]a�^^�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�__�__�`_�`_�a`�b`�c`�d`�ea�fa�ha�ib�jb�lc�mc�oc�qd�rd�te�ve�xf�zg�|g�~hԀi�fǝ����������ä�ԉrցi�~h�}g�|g�zf�we�te�se�qd�pd�nc�mc�kb�ib�i`�fd�]q�[v|Zy|Zz|Zy|Zy|Zz{Zz�[p�^d�^`�^^�^_�^_�^_�^_�^_�^_�^_�^_�^_�^_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[^�[`�Zr|Zz~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx~Zx}Zy�Zt�[h�[]�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�\_�\_�]_�]_�^_�_`�_`�``�a`�ca�da�ea�fb�gb�ic�kc�ld�nd�pe�qe�se�uf�vf�xg�zg�|h�ze�}gԃnԃn�}g�{e�|h�{h�yg�wg�uf�tf�re�pe�od�md�kc�jc�hb�gb�eb�da�d`�bb�_f�\m�[r�[r�[q�\h�]^�\^�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�[_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X]�YjZw}Zy~Zx~Zx~Zx~Zx~Zx~[y}Zy}Zy�Yh�Y_�Y^�X_�X_�Y_�X_�X_�Y_�Y_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�X_�Y_�Y_�Y_�Y_�Z_�Z_�[_�[_�\`�]`�^`�_a�`a�ba�cb�db�fb�gc�hc�jd�ld�me�oe�qf�rf�tf�vg�wg�xh�zi�zh�zg�zg�zh�yi�xg�wg�ug�sf�rf�pe�ne�md�kd�ic�hc�fc�eb�cb�ba�aa�`a�_`�^_�]^�\_�[^�[^�Z]�Z_�Y_�Y_�Y_�Y_�X_�X_�X_�X_�X_�X_�X_�X_�X_�U_�U_�U_�U_�V_�W`�V`�V_�V_�V_�V`�V_�V_�U_�V`�U_�V`�V`�V`�V_�V_�V`�V`�V^�Wa�Xj~\z}[y~[y\z|Zy|Wu�Zt�Yl�U^�U_�V`�W`�U_�T^�V`�V`�U_�V_�V`�U_�V`�V`�V`�V_�V`�U_�U_�U_�U_�U_�V_�V_�V_�W_�W_�X_�X_�Y`�Z`�Z`�\`�\a�^a�_a�`b�ab�cb�dc�ec�gd�id�jd�le�me�of�pf�qg�sg�tg�ug�uh�uh�uh�tg�sg�rg�qf�of�nf�le�ke�id�hd�fc�ec�cc�bb�ab�_a�^a�]a�\`�[`�Z`�Y`�X_�W_�W_�V_�V_�V_�V_�U_�U_�U_�U_�U_�U_�U_�U_�U_�U_�S_�S_�S_�S_�Q^�LZ�O]�P]�P]�P]�MZ�P]�P]�R_�O\�T`�M[�N\�O]�Q^�O]�O\�N[�Q^�KY�MY�Pf�Xs|TqyQq�\t�do�O\�LX�R_�R_�LZ�KZ�S_�Wb�O\�KZ�Q^�P]�N\�R^�P]�N\�N[�P]�LZ�S_�S_�S_�S_�S_�S_�S_�T_�T_�T_�U_�U_�V`�W`�X`�Y`�Za�[a�\a�]b�_b�`b�ac�cc�dd�fd�gd�ie�je�kf�mf�nf�og�pg�pg�pg�pg�pg�og�nf�mf�lf�ke�ie�he�fd�ed�cc�bc�ac�_b�^b�]a�[a�Za�Y`�X`�W`�W`�V_�U_�T_�T_�T_�S_�S_�S_�S_�S_�S_�S_�S_�S_�S_�S_�S_�S_�P_�P_�P_�N^�Uc�ov�`k�[g�^j�\h�mt�]i�^i�R`�bl�J[�hq�eo�ak�Wd�ak�cm�fp�We�tz�hq�mt�Vc�ow�mv�gp����L]�sy�Sb�Q`�ov�ov�_j�sy�[g�qx�ir—��]i�Wd�^j�dn�hq�\h�nu�O^�P_�P_�P_�P_�P_�P_�Q_�Q_�Q_�R_�R_�S_�T`�U`�U`�V`�Wa�Xa�Za�[b�\b�]b�^c�`c�bc�cd�dd�fe�ge�he�if�jf�kf�kf�lf�lg�kf�kf�jf�if�hf�ge�fe�ed�cd�bd�ac�_c�]c�\b�[b�Zb�Ya�Xa�Wa�V`�U`�T`�S`�R_�R_�Q_�Q_�Q_�P_�P_�P_�P_�P_�P_�P_�P_�P_�P_�P_�P_�M_�M_�N`�I\����������������boȠ��������t{�w}�bnś�������ʢ��dp���Ǟ����–�Ě�������Ę��v}ś��~�����������[jʢ��u}Ø��������rz����������bn���ę�����������v}�EZ�O`�M_�M_�M_�M_�M_�N_�N_�N_�O_�P_�P`�Q`�R`�S`�Ta�Ua�Va�Wb�Yb�Zb�[c�\c�^c�_d�`d�ad�be�ce�de�ef�ff�ff�ff�ff�ff�ff�ee�de�ce�be�ad�`d�^c�]c�\c�[b�Yb�Xb�Wa�Va�Ua�T`�S`�R`�Q`�P`�P_�O_�N_�N_�N_�M_�M_�M_�M_�M_�M_�M_�M_�M_�M_�M_�M_�M_�J_�J_�K`�G]Ƞ�����~�Ě�����wǟ�����ozϪ��H]�r{Ƞ�����|�Ь��ht���Ɲ�����s|����q{�������bpˤ����Ù�����~��Zk����aoȠ�ę�����Wh�s|�������y�Ø�����kvȟ�����r{�CZ�L`�J_�J_�K_�K_�K_�K_�L_�L_�L_�M_�N_�O`�O`�P`�Q`�Ra�Sa�Ta�Ub�Vb�Xb�Yc�Zc�[c�\d�]d�^d�`e�`e�ae�be�be�be�be�be�be�ae�ae�`e�_d�^d�]d�\c�Zc�Yc�Xb�Wb�Ub�Ta�Sa�Ra�Qa�P`�O`�N`�N`�M_�L_�L_�K_�K_�K_�K_�J_�J_�J_�J_�J_�J_�J_�J_�J_�J_�J_�G_�G_�H`�C\�\n�y��iw�`q�ds�jx���gu�Qf�x��B[�I`�t~�mz�iw�[m�jx�r}�y��gv�^o�et�Zl�t~̥��v��Yl�o{�Zl�~��Rf�XkЫ��u�]n�cr�iw����Ui�t�_p����s~�hv�Pe�et�x��Mc�F^�G_�G_�G_�G_�G_�H_�H_�H_�H_�I_�J_�J_�K`�L`�M`�N`�Oa�Pa�Qa�Rb�Sb�Tb�Ub�Vc�Wc�Xc�Yd�Zd�[d�\d�\e�]e�]e�]e�]e�]e�]e�\d�\d�Zd�Yd�Yc�Xc�Wc�Vc�Ub�Tb�Rb�Qa�Pa�Oa�Na�M`�L`�L`�K`�J_�J_�I_�I_�H_�H_�H_�G_�G_�G_�G_�G_�G_�G_�G_�G_�G_�G_�G_�D_�D_�D_�E_�A\�>[�?[�@\�@\�?[�=Z�?[�C^�<Y�E`�C^�>[�?[�?[�A\�?[�>[�=Z�?[�A]�@\�>Z�Le�ct�8V�B]�?[�A]�>Z�>[�Qh�bt�8W�B]�@\�?[�<Y�A]�>[�@\�<Y�=Z�?\�C^�@\�>Z�C^�E_�D_�D_�D_�D_�E_�E_�E_�E_�F_�F_�G_�G_�H_�H`�I`�J`�K`�La�Ma�Na�Oa�Pb�Qb�Rb�Sc�Tc�Uc�Vc�Vd�Wd�Xd�Xd�Yd�Yd�Yd�Yd�Xd�Xd�Xd�Wd�Vd�Uc�Tc�Sc�Rb�Qb�Pb�Ob�Na�Ma�La�Ka�J`�J`�I`�H`�G_�G_�F_�F_�F_�E_�E_�E_�E_�D_�D_�D_�D_�D_�D_�D_�D_�D_�D_�C^�C^�C^�C^�D_�D_�D_�D_�D_�D_�E_�D_�C^�D_�C^�C^�D_�D_�D_�D_�D_�D_�D_�D_�D_�D_�D_�B]�>[�E`�C_�D_�D_�D_�D_�A]�?[�E`�C_�D_�D_�D_�C^�D_�D_�E_�D_�D_�C^�D_�D_�C^�C^�C^�C^�C^�C^�C^�C^�C^�D_�D_�D_�E_�E_�F_�G_�G`�H`�I`�J`�Ka�La�Ma�Na�Ob�Ob�Qb�Qc�Rc�Sc�Tc�Td�Ud�Ud�Ud�Vd�Vd�Ud�Ud�Ud�Tc�Tc�Sc�Rc�Qb�Pb�Ob�Nb�Ma�La�Ka�K`�I`�I`�H`�G`�G_�F_�E_�E_�D_�D_�D^�C^�C^�C^�C^�C^�C^�C^�C^�C^�C^�C^�C^�C^�C^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�C_�B^�B^�B^�B^�B^�B^�B^�C_�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�C^�C^�D_�D_�E_�F_�F_�G`�H`�I`�I`�J`�Ka�La�Ma�Na�Nb�Ob�Pb�Qb�Qb�Rc�Rc�Sc�Sc�Sc�Sc�Sc�Rc�Rb�Qc�Pb�Pb�Ob�Nb�Ma�Ma�La�Ka�J`�I`�H`�G`�G`�F_�E_�D_�D_�C_�C^�C^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^�B^
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.qoi b/crates/exav-viewer/demo/examples/files/images/scene.qoi
new file mode 100644
index 00000000..c1adea3e
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.qoi differ
diff --git a/crates/exav-viewer/demo/examples/files/images/scene.webp b/crates/exav-viewer/demo/examples/files/images/scene.webp
new file mode 100644
index 00000000..6c586470
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/scene.webp differ
diff --git a/crates/exav-viewer/demo/examples/files/images/sunset-flat.hdr b/crates/exav-viewer/demo/examples/files/images/sunset-flat.hdr
new file mode 100644
index 00000000..c136e96d
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/images/sunset-flat.hdr
@@ -0,0 +1,7 @@
+#?RADIANCE
+# written by exav's make-images.py
+FORMAT=32-bit_rle_rgbe
+EXPOSURE=1.0
+
+-Y 96 +X 128
+�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}�}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}' �}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}bY��1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}1$�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}E:��<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}<%�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}F)�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}S+�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}b/�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}r1�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�5�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�7�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�<�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�>�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�C�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}���F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�W���F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�F�}�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�%�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�(�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�'�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�*�~�*�~�*�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�*�~�*�~�*�~�*�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�)�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�k���+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�,�~�,�~�,�~�,�~�-�~�-�~�-�~�-�~�-�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�-�~�-�~�-�~�-�~�-�~�-�~�,�~�,�~�,�~�,�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�+�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�0�~�0�~�0�~�0�~�0�~�1�~�3�~�{���3�~�3�~�3�~�3�~�3�~�3�~�3�~�3�~�1�~�1�~�0�~�0�~�0�~�0�~�0�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�.�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�1�~�1�~�h���1�~�1�~�2�~�3�~�4�~�4�~�5�~�5�~�7�~�8�~�8�~�8�~�9�~�9�~�9�~�9�~�9�~�8�~�8�~�8�~�7�~�5�~�5�~�4�~�4�~�3�~�1�~�1�~�1�~�1�~�1�~�1�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�/�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�3�~�3�~�4�~�5�~�5�~�6�~�8�~�9�~�J�K�L�M�O�P� Q� Q� R� R� R� Q�Q�P�O�M�K�J�I�8�~�8�~�5�~�5�~�5�~�4�~�3�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�2�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�6�~�6�~�6�~�6�~�6�~�F�I�I�K�L�M�!O�!Q�"R�#T�$U�%W�%X�&Y�&Y�&Y�&Y�&X�%W�%V�#U�#S�"R�!P� O�M�L�J�I�H�F�6�~�6�~�6�~�6�~�6�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�4�~�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�G�G�G�H�H�I�J�L�!N�"R�$T�%V�&Y�([�*^�+`�+b�,c�.e�.e�.f�.e�.d�,c�+a�*_�)]�'[�&X�%V�#S�"Q�!M�L�J�I�H�G�G�c���F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�G�G�G�H�J�K�!M�"O�$Q�%T�(W�)[�+`�.d�0g�3k�4n�8��9��:��;��;��;��:��9��8��4m�1j�/g�-c�+_�)Z�&V�%S�$Q�"N�!M�K�J�H�G�G�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�F�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�I� I�!J�"L�#N�%R�'U�)Y�,]�.a�2f�5��9��<��>�� @��!B��"D��#E��#F��#F��#F��"E��"D��!B�� @��=��;��7��3j�0e�-`�*\�(X�&T�$P�"M�!L�!J�I�I�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�`���H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H� H� H� H� H� I�!K�"L�$N�%P�'S�)W�,[�/b�4��7��:�� >��"A��$F��&J��)M��*O��+R��,S��-T��-T��-T��,S��+Q��*O��'L��&I��$D��!@��=��9��6��3��.a�,Z�)V�'R�%P�$M�"L�!K� I� H� H� H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�H�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�"J�"J�"K�$L�%N�'Q�)V�,Z�0_�2��6��;��!?��$D��(I��*N��.R��1X��.��0��1��2��3��3��3��2��1��/��.��0W��-Q��*L��&G��#C�� >��:��5��2��.^�+Y�(U�'P�%N�$L�"K�"J�"J�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�!I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�#I�#I�#J�#J�$L�%N�'P�(S�+V�/[�1��5��9��">��$C��)J��-P��+��.��1��5��!8��#;��$=��&>��&?��&?��&?��%>��$<��":��!7��4��1��-��0U��,N��(H��$A�� <��8��4��0��-Z�+U�(R�'O�%M�$L�#J�#J�#I�#I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�"I�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�%K�%K�%L�'N�(P�*R�.X�.��2��6��!;��$A��(G��-N��+��/��4��"8��%<��(A��+E��-H��0J��&��&��'��&��&��/J��,G��*D��'?��%;��!7��2��.��*��,L��'E��#?��9��4��1��.��,W�*R�(O�'M�%L�%K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�$K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�&K�&K�&K�'L�(O�*Q�+T�,��.��3��7��"<��&B��+K��)��.��2��#9��(>��+C��$��'��*��,��.�� /��!/��!0��!/��.��-��+��)��&��/G��*B��&=��"7��1��,��(��*I��%A��!;��6��2��-��+��+S�*P�(N�'L�&K�&K�&K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�%K�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�(M�(M�)N�+P�)��,��/��2��7��#=��(D��&��*��0��"6��'<��-D��%��)��,��!0��$3��&6��(8��*:��*:��*;��*:��)9��(7��&5��$2��!/��+��(��$��+B��%:��!4��/��)��,J��&B��"<��5��1��.��+��)��*P�(N�(M�(M�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�'L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)M�)M�*O�(��)��+��.��2�� 7��$=��)D��&��+��1��$9��+@��#��(��-��#1��'5��+;����!��"��#��$��$��$��#��"�� ��-=��*:��'4��#0��,��&��"��)>��#7��0��*��%��(B��#;��6��0��-��+��)��(��*O�)M�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�)L�'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��(��)��+��.��1�� 6��$;��)C��&��+��!2��&9�� ��%��*��#0��(6��-;�� ��#��&�� (��!*��#+��$,��$-��$,��#+��!)�� '��%��#����+:��'4��".��)��$��+?��%7�� 0��*��%��(A��#:��4��0��-��*��)��(��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��(��)��+��-��0�� 5��%:��*A��%��+��!1��(:��!��&�� ,��&2��+9�� ��#�� '��#*��&.��)0��+3��.5��������-5��+2��(0��&-��"*��&��"����*6��$0��*��$�� ��&8�� /��)��$��(?��#9��4��/��,��*��)��(��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��(��(��)��*��,��/��!3��%8��*?��$��)��"/��(8�� ��&��",��)2����!�� &��$*��).��-3�������� �� ��!�� �� ��������,2��'-��#)��$�� ����&1��!*��%����'6�� .��(��#��)=��$7�� 2��.��+��)��(��(��(��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��(��(��(��)��+��-��"1��&5��,;��"��'��#-��*6����%��$+��+2����!��$'��)+��01������! ��$#��&$��(&��)'��*'��('��'%��%$��#"��  ������-0��(*��"%�� ����*0��#)��#����(3��!+��&��!��*:��%4��"0��,��*��)��(��(��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��(��(��)��*��!+��$/��(3��-8����%��#*��+2����"��%)��-0���� !��''��.,������# ��'#��,&��/)��3+��5-��7.��7.��7.��4-��2+��/(��*%��&"��!����31��,+��%%�� ����,.��$'��!��19��(/��")��#����,7��'2��#-��!+��)��(��(��(��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'��'�� (��!(��!)��#*��&,��)0��.5��4;��"��#'��+.��47�� ��&'��..����" ��(&��0+����"��'!��-$��2)��9,����!��#��$��$��$��#��!����7,��1(��+#��% �� ����/*��'$�� ��54��-,��$%����24��),��"&��!��29��,4��(/��%,��#*��!)��!(�� (��'��'��'��'��'��'��'��'��'��'��'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"(��#(��$(��%)��(+��+-��.2��47����#$��**��32����&#��.*��82��"��)$��2*����#��*!��1%��8*��A/��$��(��+��-��/ ��0 ��/ ��-��*��'��#��?.��7)��/$��( ��"��:0��0(��("��!��60��,(��#!����0/��((��"#����25��-1��)-��&*��%)��$(��#(��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��"'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��[��[��[��[��[��[��[��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��&(��&(��((��**��++��//��43����#!��)&��1,��<5��$ ��,&��7.��"��)!��2'����$��+ ��4$��=*��#��(��.��2 ��7#��;%��>&��>&��<&��:%��7#��1 ��,��'��D.��:)��2#��*��#��:,��/&��'�� ��4,��*%��"��83��/*��&$��!��97��32��.-��++��()��'(��&(��&(��&'��&'��&'��&'��&'��&'��&'��&'��&'��&'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��[��[��[��[��[��[��[��[��[��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��*(��*(��,)��-*��0,��50��;5��!��'"��/(��8/��"��*"��4)�� ��'��0$��;+��$��,��4#��?)��J/��+��2��9"��@%��F(��L+��O-��P-��N,��J+��E(��>%��7!��0��*��G-��<'��2"��)��"��9)��."��&��=/��2'��( �� ��6-��,&��%!�� ��93��4/��0+��-*��+(��*(��)(��)'��)'��)'��)'��)'��)'��)'��)'��)'��)'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��[��[��[��[��[��[��[��[��[��[��[��[��[��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��,'��-'��-'��-(��/(��0)��2*��6-��;1��B6��&��,#��5)��@2��'��0$��<,��%��. ��9&��#��*��4 ��>&��K-��,��4��="��F&��P+��Y.��`2��2��3��2��^2��V.��M*��D%��;!��2��*��G+��;$��1��(��B,��6%��,��#��9)��."��%��=/��2(��*"��Bl��;a��6X��4,��2*��/)��.(��-(��-'��-'��,'��,'��,'��,'��,'��,'��,'��,'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��1'��2(��2(��4)��6+��:-��@2��$��*��2$��;+��$��-��7&��D.��*��4!��A)��(��0��;#��H)��+��4��> ��I%��T+��a0��6���k���p���q���o��;��5��^.��R*��F$��;��1��S.��E(��8!��.��%��='��2 ��(��A,��4#��*��5X��[���M��Co��<b��6Z��f��a��4)��2(��2(��0'��0'��0'��0'��0'��0'��0'��0'��0'��0'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��[��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��4'��5'��5'��5(��7(��8)��;+��@.��G2��(��. ��7%��B,��(��1 ��='��&��/��;#��I*��-��7��C$��R+��1��<��G#��U(��d.��:���n���x����������}���v���l��8��`-��Q'��D!��9��/��N*��@#��4��+��E(��8!��-��I-��P���Bm��7[��]���O���Eq��=d��7[��f��a��^��\��5(��5'��4'��4'��4'��4'��4'��4'��4'��4'��4'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��[��[��[��[��[��[��[��[��@z~�@z~�@z~�@z~�[��[��[��[��[��[��[��[��[��[��[��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9'��9(��:(��;(��=)��A+��E/��L3��,��3 ��<&��I-��,��7!��D(��*��4��A$��Q,��2��= ��K&��[-��7��C��P%��_+��s2���k���x���������¹������������t��@��V���K|��Bl��9]��b���T���G$��:��/��M*��>"��;a��c���R���Do��8]��_���Q���Fs��=e��7[��3T��b��^��\��[��[��[��9'��9'��9'��9'��9'��9'��9'��9'��='��='��='��='��='��='��='��='��='��='��='��='��='��='��='��='��='��='��='��[��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��[��[��[��[��[��[��[��[��[��='��='��='��='��='��='��='��='��='��>(��>(��@(��B)��E+��K/��)��/��6!��A&��O-��0��<!��J)��.��9��G%��,��6��B!��R'��d.��<��I ��X&��j-��?���p���������ɞ��ѥ��Ě������:_��f���Y���N���Co��:`��d���V���Ix��>e��4U��W���Iw��<c��d���S���Eq��9^��`���Q���Fs��>f��8\��3U��b��^��\��[��[��[��[��[��[��[��[��='��='��='��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��B'��[��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�[��[��B'��B'��B'��B'��B'��B(��C(��D(��G)��K+��P/��,��3��;!��F&��U.��3��@!��O)��1��=��L%��/��:��G!��X'��k.��A��N!��^&��q-��D���q�����º���ҥ��䳆�ˠ��Cn��;`��3U��Z���N���Dp��;`��e���V���Ix��>f��4V��W���Ix��<c��d���S���Eq��9^��`���R���Ft��>f��8\��4U��b��^��\��[��[��[��[��[��[��[��[��[��[��[��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��F'��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��F'��F'��G(��G(��J(��K)��P+��V/��/��6��>!��K&��-��7��D!��S)��4��A��P%��1��=��J ��['��o.��C��Q ��b&��v,��F���o���}������Ě��ˠ��Gu��@j��9^��e���Y���M��Cn��:_��d���U���Iw��=e��4U��W���Hw��<c��d���S���Dp��9^��`���Q���Fs��>f��8\��3U��b��^��\��[��[��[��[��[��[��[��[��[��[��[��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��K'��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��[��[��[��N(��Q)��U+��[/��2��8��B ��N&��/��9��G!��X(��6��C��S$��Y���5W��?g��^%��r-��E��S��c%��u+���2��Q���v������Ak��Cn��@j��<b��6Y��`���U���K{��Ak��8]��a���S���Gt��<c��e���U���Gu��;a��b���Q���Co��8\��^���P���Er��=e��7[��g��a�%D�{�\��[��[��[��[��[��[��[��[��[��[��[��P'��P'��P'��P'��P'��P'��P'��P'��P'��P'��P'��P'��P'��P'��P'��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��[��[��\��_��b��4U��5��<��E��Q%��1��;��I ��S���d���<c��Hv��V���f���<c��Gu��S���a���8\��a#��s(��.��M��f���7Z��:_��;`��9^��6Y��c���Z���P���Ft��>f��6X��]���P���Dp��:_��b���R���Eq��9^��_���O���Bl��7Z��]���O���Dp��=d��7Z��f�&F�{%D�{$B�{�[��[��[��[��[��[��[��[��[��[��[��V'��V'��V'��V'��V'��V'��V'��V'��V'��V'��V'��V'��V'��V'��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��[��\��^��b��3T��7[��=e��Er��P���^���7[��Bm��P���`���9_��Eq��R���b���9^��Co��O���[���4V��<b��Do��L}��T���\���b���f���3U��e���`���Z���R���Jy��Al��:_��e���X���L|��Aj��7[��]���O���Bl��7Z��\���L}��?h��5W��Z���M��Cn��<b�+N�{(I�{&F�{%C�{$B�{$B�{$A�{�[��[��[��[��[��[��[��[��[��['��['��['��['��['��['��['��['��['��['��['��['��['��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��[��\��^��a��f��7Z��<c��Co��M��Z���5X��@i��L}��[���6Z��Ak��N���\���6Y��?h��Iy��U���a���7Z��>e��Eq��K|��Q���V���Y���Z���Y���U���P���Jy��Cn��<b��5W��^���R���Gt��=d��4U��X���Jz��>f��4V��W���Iw��=d��f���W���K{�3^�{.T�{*M�{'H�{&E�{$C�{$B�{$A�{$A�{#A�{#A�{�[��[��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�a'��a'��a'��a'��a'��a'��a'��[��[��[��[��[��@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��\��]��`��e��6X��;`��Al��K{��W���f���<c��Hv��V���g���=d��Hw��V���d���:`��Do��N���X���d���8[��=e��Cn��Hv��K|��N���O���M��K{��Ft��Al��<b��6Y��a���V���K{��Ak��8\��`���R���d�~�T�~~F�~i;�~�c�}�S�}}F�}�S��9h�{2\�{-S�{)L�{'G�{%E�{$C�{$B�{$A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[�#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�[��[��]��_��c��4V��9^��?h��Hv��S���a���9]��Co��P���`���8]��Cn��O���\���5X��=e��Ft��P���Y���c���6Y��;a��?g��Bl��Co��Dp��Cn��^���YՀ�Sǀ�M��|E��o>��c7���b��U��J�q?�a6�2]�}+N�}$B�}b7�~�]�}�N�}$C�|?s�{7d�{0Y�{,Q�{)K�{&G�{%D�{$C�{$B�{$A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�A{~�\��^��b��3U��7[��=d��Dq��N���[���5W��?g��Jz��X���4U��=d��Hv��S���a���7[��?h��Gu��O���X���`���I���M���Q���Tɀ�Uˀ�TȀ�Q€�M���I��xC��m=��c7���c��X��M�wC�g:�6c�}.U�}'H�}!=�}8g�|/W�|(J�|"?�|<m�{4`�{/V�{+N�{(I�{&F�{%D�{$B�{$B�{$A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@{~�A|~�^��a��e��6Y��;a��Ak��Jz��U���c���:_��b�}g:�~yD�~�P�~�]�~`6�o>�G��O���Y���c���mρ�;p�r@��yD��}F���H���H���H��|F��wC��p?��h;��`6���b��X��N�zE�!<�~9h�}1Z�}*M�}$A�}=o�|3^�|,P�|%D�| ;�|�g�|�[�|�S�|*L�{'H�{%E�{$C�{$B�{$A�{$A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�A{~�B}~�C�~�F�~�J�~�P�~�X�~�c�~�8kuB�}�M�}�Z�}�i�}m=�~H�~�S�~�`�~b7�p?�~G��O��X��`��h�b7��g:��k<��n>��n>��m=��j<��f9��a6���f��^��U��M�%E�~!=�~:k�}3]�},P�}&E�} ;�}7e�|/V�|(J�|#?�|<o�{5b�{0X�{,P�{(J�{&G�{%D�{$C�{$B�{$A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@{~�A|~�C~�E�~�H�~�M�~�T�~�_�|�k�|l=�}}F�}�Q�}�_�}b7�~r@�~�J�~�U�~�a�~b7�n>�zE��L��S��Y��_��c��g��i��j��i��f��b��]��W��Q��J�wC�k<��k�~�^�~-R�}'G�}!=�}:j�|2[�|+N�|%D�|h;�}�g�|2\�{.T�{*M�{'I�{&E�{%C�{$B�{$B�{$A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~tA�|�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�@z~�@z~�@z~�@z~tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|�@z~�@z~�A{~�B}~�D�~H�|�L�|�Q�|�Y�|�c�|d8�}r@�}�I�}�U�}�b�}e8�~tA�~�J�~�U�~�`�~_5�i;�tA�~G��L��P��T��W��Y��Y��X��V��S��O��J�{E�q?�g:��h�~�]�~-R�}'H�}"?�}<m�|4_�|-R�|'G�|">�|;m�{5a�{�W�|�P�|�J�|~G�|%D�{$C�{$B�{$A�{$A�{#A�{#A�{tA�|�@z~�@z~�@z~�@z~�@z~�@z~�@z~�@z~tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|�@z~�@z~#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|uB�|vB�|yD�|}F�|�I�|�N�|�T�|�]�|�g�|h:�}vB�}�L�}�W�}�d�}e9�~sA�~�I�~�R�~�\�~�f�~c7�k<�r@�yD�G��I��K��K��J��I�}F�wC�q?�i;�a6��c�~�Y�~�P�~G�~p?�~<o�|5a�|.T�|(I�|#@�|d8�}�d�|�Z�|�R�|�M�|�H�|&E�{%C�{$B�{$B�{$A�{#A�{#A�{#A�{#A�{tA�|tA�|�@z~�@z~�@z~�@z~�@z~�@z~tA�|tA�|tA�|tA�|tA�|tA�|tA�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|uB�|wC�|zE�|G�|�K�|�P�|�W�|�`�|�k�|j<�}yD�}�M�}�X�}�c�}d8�~q?�~~G�~�N�~�V�~�^�~�f�~`6�f9�j<�m=�o>�p?�o>�m=�i;�d8�_5��d�~�\�~�T�~�L�~zE�~m=�~<m�|5a�|.U�|)K�|$B�| :�|9h�{3]�{�U�|�N�|�J�|&G�{%D�{$C�{$B�{$A�{$A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|�@z~�@z~�@z~tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|tA�|uB�|vB�|xC�||E�|�H�|�L�|�R�|�Y�|�b�|`6�}l<�}yD�}�M�}�V�}�a�}a6�~l<�~wC�~�I�~�O�~�V�~�[�~�`�~�d�~�g�~�h�~�i�~�h�~�f�~�c�~�_�~�Z�~�T�~�N�~G�~tA�~i;�~�j�}�^�}�T�})K�|$B�| ;�|:j�{�_�|�W�|�P�|�K�|'H�{&E�{%C�{$B�{$B�{$A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{tA�|tA�|tA�|tA�|tA�|�@z~�V�}D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|E;�|E;�|F<�|G=�|J?�|MB�|QF�|WK�|^Q�|hY�|91�}?6�}G=�}OD�}XL�}bT�}6.�~;3�~A8�~F<�~KA�~PE�~TH�~WK�~ZM�~[N�~\O�~[N�~YM�~VJ�~SG�~OD�~J@�~E;�~?6�~:2�~j[�}_R�}VJ�}(I�|$B�| ;�|:j�{5`�{\O�|UI�|PE�|LA�|I?�|G=�|F<�|$B�{$A�{$A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|D;�|D;�|�V�}�V�}D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|�V�}#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|E;�|E;�|F<�|H>�|J@�|NC�|RF�|XK�|_Q�|gY�|91�}>6�}E;�}LA�}TH�}\O�}eW�}7/�~;3�~?6�~C9�~F<�~H>�~J@�~KA�~LA�~KA�~J?�~H>�~E;�~B8�~>5�~:2�~k\�}cU�}ZM�}RF�}'G�|#@�| :�|:j�{5`�{0Y�{-R�{QE�|MB�|J?�|G=�|F<�|E;�|$B�{$A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|�V�}�V�}�V�}�V�}�V�}�V�}D;�|D;�|D;�|D;�|D;�|D;�|�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|�V�}�V�}�V�}#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|E;�|E;�|F<�|G=�|H>�|K@�|NC�|RG�|XK�|^Q�|fX�|7/�}=4�}B9�}H>�}OD�}VJ�}]O�}cU�}j[�}70�~:2�~<3�~=5�~>6�~?6�~>5�~=4�~;3�~91�~7/�~hY�}aT�}[N�}TH�}MB�}G=�}A8�};3�}9h�{4_�{0X�{VJ�|QF�|MB�|J?�|H>�|F<�|E;�|$B�{$A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|D;�|�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{#A�{#A�{�V�}�V�}D;�|D;�|#A�{#A�{#A�{#A�{#A�{#A�{#A�{D;�|�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�V�}�V�}�V�}D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|D;�|�V�}�V�}�V�}�V�}�V�}�V�}�V�}E;�|F<�|G=�|H>�|K@�|NC�|RF�|WK�|]P�|dV�|l\�|:2�}?6�}D:�}I?�}NC�}TH�}XL�}]P�}aS�}dV�}fX�}hY�}hY�}gY�}fW�}cU�}`R�}\O�}WK�}RG�}MB�}H>�}B9�}=5�}91�}i[�|3]�{B_�z>Y�z*M�{MB�|J@�|H>�|F<�|E<�|E;�|E;�|D;�|D;�|#A�{#A�{#A�{D;�|D;�|D;�|�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{#A�{#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}#A�{1G�z#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�W�}�W�}�X�}G=�|H>�|K@�|MB�|QF�|UI�|[N�|`S�|gY�|7/�};2�}?6�}C9�}G=�}K@�}NC�}QF�}SH�}UI�}VJ�}WJ�}VJ�}UI�}SG�}PE�}MB�}J?�}F<�}B8�}>5�}:2�}6.�}eW�|_Q�|YM�|=X�z:T�zMB�|J?�|H>�|F=�|F<�|E;�|E;�|D;�|D;�|#A�{#A�{#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{1G�z#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�W�}�W�}�X�}G=�|H>�|J@�|MB�|PD�|SH�|XK�|]P�|bT�|hY�|7/�}:1�}=4�}?6�}B9�}D;�}F<�}G=�}H>�}H>�}H>�}G=�}F<�}D:�}A8�}?6�}<3�}91�}l]�|fX�|aS�|[N�|WJ�|RG�|9R�z7O�zJ?�|H>�|F<�|F<�|E;�|E;�|D;�|D;�|#A�{#A�{#A�{1G�z#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}1G�z�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{1G�z1G�z#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�i�~�i�~�j�~�l�~�Z�}I?�|LA�|NC�|QF�|UI�|YL�|]P�|k=�~p@�~uB�~zE�~~G�~:2�}<3�}=4�}=5�}=5�}=5�}<4�};3�}:2�}80�}6/�}iZ�|dV�|`R�|\O�|XK�|TH�|PE�|MC�|6N�z5L�zG=�|F<�|E<�|E;�|E;�|D;�|D;�|D;�|#A�{#A�{#A�{1G�z#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{1G�z1G�z#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}1G�z�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}#A�{#A�{#A�{1G�z1G�z#A�{#A�{#A�{�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�i�~�j�~�k�~�m�~�o�~�q�~�u�~�x�~�|�~�@v�Bz�E�G��I�n>�~q@�~sA�~tB�~j[�|j[�|j[�|iZ�|gY�|eW�|cU�|`R�|]P�|ZM�|WJ�|TH�|QE�|NC�|LA�|J?�|H>�|G=�|F<�|E;�|E;�|E;�|D;�|D;�|D;�|D;�|D;�|�h�~�h�~1G�z�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}1G�z1G�z�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}1G�z1G�z�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�i�~�j�~�k�~�l�~�m�~�o�~�r�~�u�~�x�~�{�~�?t�@w�Bz�C|�E�F��G�g;�~h;�~]P�|]P�|\O�|ZM�|XL�|VJ�|TH�|RG�|PE�|NC�|LA�|J@�|I>�|G=�|F<�|F<�|E;�|E;�|E;�|D;�|D;�|D;�|D;�|�h�~�h�~�h�~�h�~1G�z�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�j:�j:�j:�j:�j:1G�z1G�z�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}1G�z1G�z�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�i�~�j�~�k�~�l�~�n�~�o�~�q�~�s�~�u�~�x�~�z�~�|�~�?s�?u�@v�@v�@v�@v�@u�?t�>s�{�~�y�~�w�~�u�~�s�~�q�~I>�|H=�|G=�|F<�|E<�|E;�|E;�|D;�|D;�|D;�|D;�|�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�e:�e:�e:�e:�e:�e:�e:�e:�e:�e:�e:�e:1G�z1G�z�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�i�~�i�~�j�~�k�~�l�~�m�~�n�~�p�~�q�~�r�~�t�~�u�~�v�~�w�~�w�~�w�~�w�~�v�~�v�~�u�~�s�~�r�~�q�~�o�~�n�~�m�~�l�~�k�~�j�~�i�~�i�~�i�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�`:�`:�`:�`:�`:�`:�`:�`:�`:�`:�`:�`:�`:�`:�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�i�~�i�~�j�~�k�~�k�~�l�~�m�~�n�~�n�~�o�~�p�~�p�~�p�~�p�~�p�~�p�~�p�~�o�~�n�~�m�~�m�~�l�~�k�~�j�~�j�~�i�~�i�~�i�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�\:�\:�\:�\:�\:�\:�\:�\:�\:�\:�\:�\:�\:�\:�\:�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�i�~�i�~�j�~�j�~�j�~�k�~�k�~�l�~�l�~�l�~�l�~�l�~�l�~�l�~�l�~�l�~�k�~�k�~�j�~�j�~�i�~�i�~�i�~�i�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�W:�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�[:�\:�^;�^;�`;�a;�c=�g=�i=�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�i�~�E"��G"��J#��L#��P$�����j�~�j�~�j�~�j�~�j�~�j�~�j�~�i�~�i�~�i�~�i�~�i�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�Q:�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�R:�R:�T:�T:�V:�W:�W;�Y;�[;�\;�^=�a=�c>�e>�i>�5��7��9 ��; ��=!��>!��A"��C"��E"��G#��I#��������������i�~�i�~�i�~�i�~�i�~�i�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�N:�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�N:�N:�N:�O:�O:�O:�Q:�R:�R:�T;�V;�W;�Y;�[=�\=�`>�a>�e>�3��5��7 ��8 ��:!��<!��>"��A"��C"��E#��H$�����������������h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�I:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�h�~�h�~�I:�I:�I:�I:�I:�I:�K:�K:�K:�L:�N:�N:�O;�Q;�R;�T;�V=�W=�[>�\>�`>�a?�2��4 ��5 ��7!��9!��;"��>"��@"��B#��E$��������������������h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�F:�F:�F:�F:�F:�F:�F:�F:�F:�F:�H:�H:�I:�I:�K:�L;�N;�O;�Q;�R=�T=�V>�Y>�[>�^?�0��1 ��3 ��5!��7!��9"��;"��>"��@#��B$�����������������������h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�F:�F:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�V�}�V�}�V�}�V�}�V�}�V�}�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�B:�D:�D:�E:�F:�H;�H;�I;�K;�N=�O=�Q>�T>�V>�Y?�[?�/ ��0 ��2!��4!��6"��8"��:"��<#��?$��������������������������h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�0 ��. ��[?�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�B:�B:�B:�B:�B:�B:�B:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�=:�>:�>:�>:�?:�?:�A:�A:�B;�D;�E;�F;�H=�I=�K=�N>�O>�R?�T?�WA�- ��/!��0!��2"��4"��6"��8"��:#��<$�����������������������=$��;#��8#��6"��4"��2"��0!��/!��- ��, ��V?�R?�Q>�N>�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�>:�=:�=:�=:�=:�=:�=:�=:�=:�=:�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�::�;:�;:�;:�=:�>:�>:�?;�A;�B;�D;�E=�F=�I>�K>�L>�O?�R?�TA�+ ��-!��/!��0"��2"��4"��6#��8#��:$��������������������:$��8#��6#��4"��2"��0"��/!��-!��, ��VA�R?�O?�N>�K>�I>�H=�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�;:�::�::�::�::�::�::�::�::�::�::�::�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�8:�8:�9:�9:�::�:;�;;�=;�>;�?=�A=�D=�E>�F>�I>�K?�N?�QA�) ��+!��,!��."��0"��0"��2"��4#��5#��7$��8$��8$��8$��7$��6#��4#��3#��1"��0"��."��,!��+!��* ��QA�N?�L?�I?�H>�E>�D=�B=�?=�h�~�h�~�h�~�h�~�h�~�h�~�9:�8:�8:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�6:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�5:�5:�6:�8:�8;�9;�:;�;;�==�>=�A=�B>�D>�F?�H?�K?�LA�OA�)!��+!��+"��-"��/"��0"��1#��2#��3#��4$��4$��3#��2#��1#��0"��/"��."��,"��+!��)!��(!��NA�KA�I?�F?�E>�B>�A=�?=�>=�;;�:;�9;�9;�8:�6:�6:�5:�5:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�4:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�h�~�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�/:�0:�0:�0:�0:�1:�1:�3:�4:�4;�5;�6;�8;�9=�;=�==�>>�?>�B?�D?�F?�HA�KA�'!��'!��)"��*"��+"��,"��-"��.#��/#��/#��/#��/#��."��-"��+"��+"��)"��(!��'!��KA�IA�FA�E?�B?�A>�>>�=>�;=�:=�9=�6;�6;�5;�4:�3:�3:�1:�1:�0:�0:�0:�0:�/:�/:�/:�/:�/:�/:�/:�/:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�h�~�h�~�h�~�h�~�h�~�h�~�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�-:�-:�-:�-:�.:�.:�/:�0:�1;�1;�3;�4;�5=�8=�9=�:>�;>�>?�??�B?�DA�FA�HB�%!��&"��'"��("��)"��*"��*"��+"��+"��*"��*"��)"��("��'"��&"��%!��HB�FA�DA�BA�??�>?�=>�:>�9>�8=�6=�5=�4;�3;�1;�0;�/:�/:�.:�.:�-:�-:�-:�,:�,:�,:�,:�,:�,:�,:�,:�,:�,:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�Ԥ��*:�*:�*:�*:�*:�*:�*:ēz��*:�*:�*:�LI��*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�+:�+:�,:�,:�-:�.;�.;�/;�0;�1=�3=�4=�6>�8>�9>�:?�=?�>?�AA�BA�EB�FB�$!��$"��%"��&"��'"��'"��'"��'"��'"��'"��&"��%"��$!��FB�EB�BA�AA�?A�=?�;?�9>�8>�6>�5=�4=�1=�0;�/;�/;�.;�-:�,:�,:�+:�+:�+:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�*:�':�':�':�':�':’y��У�߷���':�':�Ȝ��Ԥ��JI��':�Ԥ��':�\U��KI��':�4F�Ԥ��*=�~��':ẕ�У���VQ��f]��Ԥ��KI���q��Ԥ��':’y��У��':�Ԥ��KI���q��Ԥ��':������ẕ��':�':�':�':Ԩ���':�GF��gp�':�':�':�':�':�':�':�(:�(:�):�):�*:�+;�,;�,;�-;�.=�/=�1=�3>�4>�5>�6?�9?�:?�;A�>A�?B�AB�BB�DB�""��#"��#"��#"��#"��#"��#"��""��DB�BB�AB�?A�=A�;A�:?�8?�6?�5>�4>�1>�0=�/=�.=�-;�,;�+;�+;�*:�):�):�(:�(:�':�':�':�':�':�':�':�':�':�':�':�':�':�%:�%:�%:�%:�%:�Ԥ��Ԥ��%:ʞ���%:�Ԥ��Ȝ��%:�%:�AR�%:�Ԥ��Ԥ��QN��QO��%:�1F�|l��%:گ���%:�%:�Ԥ��Ԥ��%:߹���Ԥ��%:�Ԥ��Ԥ��%:�Ԥ��%:߹���Ԥ��С��%:�%:د���%:�%:�%:�%:�%:�С��Ԥ��Ԥ��%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�':�':�(;�);�*;�+;�,=�-=�.=�/=�0>�1>�3>�5?�6?�8A�9A�:A�=B�>B�>B�?B�AB�AD�AD�AD�AD�AB�?B�>B�=B�;A�:A�9A�8?�6?�4?�3>�1>�0>�/=�-=�,=�+;�*;�*;�);�(:�':�':�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�%:�!:�!:�!:�!:�!:�pe��ң��Ɯ��!:�!:��q�ح���!:�ң��!:�!:��q��FH��!:�";�Ԥ��h`��PO��)Bح���!:�!:�Ԥ��Ԥ��CF��]X��ʞ��!:�pe��ң��!:�Ԥ��CF��]X��Ԥ��$=�x��^n��v��!:ẕ�̞���!:�!:�#;�|��r~�!:�!:�!:�!:�!:�":�":�":�#:�#:�#:�$:�%:�%;�%;�';�(;�)=�*=�+=�,>�->�.>�/?�1?�3?�4?�5A�6A�8A�9B�9B�:B�:B�:B�:B�:B�:B�9B�8A�8A�6A�5A�4?�1?�0?�/>�.>�->�,=�+=�*=�)=�(;�';�%;�%;�%:�$:�#:�#:�":�":�":�":�!:�!:�!:�!:�!:�!:�!:�!:�!:�!:�!:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�Ԥ��:�:�:�:�:�:�:�Ԥ��:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:�:� :� :�!:�!:�";�#;�#;�$;�%;�%=�'=�(=�)>�*>�+>�,?�-?�.?�/?�0A�1A�3A�3A�4A�4A�4A�4A�4A�4A�3A�3A�1A�0A�/?�.?�-?�,>�+>�*>�)>�(=�'=�%=�%;�$;�#;�";�";�!:�!:� :� :�:�:�:�:�:�:�:�:�:�:�:�:�:�:�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�9�:�:�:�:�:�:�:� :� ;�!;�";�#;�$=�$=�%=�%=�'>�(>�)>�*>�+?�,?�-?�.?�.A�/A�/A�0A�0A�0A�/A�/A�/A�.A�-?�-?�,?�+?�*>�)>�(>�'>�%=�%=�$=�#;�";�";�!;� ;�:�:�:�:�:�:�:�:�9�9�9�9�9�9�9�9�9�9�9�9�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�9�9�9�:�:�:�:�:�:� ;�!;�";�#;�$=�$=�%=�%=�'>�(>�)>�*>�*>�+?�,?�,?�,?�-?�-?�-?�-?�,?�,?�+?�+?�*>�)>�)>�(>�'=�%=�%=�$=�#;�";�";�!;� ;�:�:�:�:�:�9�9�9�9�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~�7r~
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/images/sunset.hdr b/crates/exav-viewer/demo/examples/files/images/sunset.hdr
new file mode 100644
index 00000000..4e99f890
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/images/sunset.hdr differ
diff --git a/crates/exav-viewer/demo/examples/files/media/canon.flac b/crates/exav-viewer/demo/examples/files/media/canon.flac
new file mode 100644
index 00000000..3bfd35f2
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/canon.flac differ
diff --git a/crates/exav-viewer/demo/examples/files/media/canon.m4a b/crates/exav-viewer/demo/examples/files/media/canon.m4a
new file mode 100644
index 00000000..aac119b0
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/canon.m4a differ
diff --git a/crates/exav-viewer/demo/examples/files/media/canon.mp3 b/crates/exav-viewer/demo/examples/files/media/canon.mp3
new file mode 100644
index 00000000..a8a5fdd5
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/canon.mp3 differ
diff --git a/crates/exav-viewer/demo/examples/files/media/canon.ogg b/crates/exav-viewer/demo/examples/files/media/canon.ogg
new file mode 100644
index 00000000..8a153fba
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/canon.ogg differ
diff --git a/crates/exav-viewer/demo/examples/files/media/canon.opus b/crates/exav-viewer/demo/examples/files/media/canon.opus
new file mode 100644
index 00000000..e12cb949
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/canon.opus differ
diff --git a/crates/exav-viewer/demo/examples/files/media/canon.wav b/crates/exav-viewer/demo/examples/files/media/canon.wav
new file mode 100644
index 00000000..484a9dd9
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/canon.wav differ
diff --git a/crates/exav-viewer/demo/examples/files/media/testcard.mp4 b/crates/exav-viewer/demo/examples/files/media/testcard.mp4
new file mode 100644
index 00000000..49a7b38a
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/testcard.mp4 differ
diff --git a/crates/exav-viewer/demo/examples/files/media/testcard.webm b/crates/exav-viewer/demo/examples/files/media/testcard.webm
new file mode 100644
index 00000000..23b44b25
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/media/testcard.webm differ
diff --git a/crates/exav-viewer/demo/examples/files/models/arm.glb b/crates/exav-viewer/demo/examples/files/models/arm.glb
new file mode 100644
index 00000000..4b57871e
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/models/arm.glb differ
diff --git a/crates/exav-viewer/demo/examples/files/models/bracket-ascii.stl b/crates/exav-viewer/demo/examples/files/models/bracket-ascii.stl
new file mode 100644
index 00000000..31f3f09f
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/models/bracket-ascii.stl
@@ -0,0 +1,254 @@
+solid bracket
+  facet normal 0.000000e+00 0.000000e+00 -1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 0.000000e+00
+      vertex 0.000000e+00 2.500000e+01 0.000000e+00
+      vertex 4.000000e+01 2.500000e+01 0.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 -1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 0.000000e+00
+      vertex 4.000000e+01 2.500000e+01 0.000000e+00
+      vertex 4.000000e+01 0.000000e+00 0.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+01 0.000000e+00 4.000000e+00
+      vertex 4.000000e+01 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+01 2.500000e+01 4.000000e+00
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 -1.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 0.000000e+00
+      vertex 4.000000e+01 0.000000e+00 0.000000e+00
+      vertex 4.000000e+01 0.000000e+00 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 -1.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 0.000000e+00
+      vertex 4.000000e+01 0.000000e+00 4.000000e+00
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+    endloop
+  endfacet
+  facet normal 1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+01 0.000000e+00 0.000000e+00
+      vertex 4.000000e+01 2.500000e+01 0.000000e+00
+      vertex 4.000000e+01 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+01 0.000000e+00 0.000000e+00
+      vertex 4.000000e+01 2.500000e+01 4.000000e+00
+      vertex 4.000000e+01 0.000000e+00 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 1.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+01 2.500000e+01 0.000000e+00
+      vertex 0.000000e+00 2.500000e+01 0.000000e+00
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 1.000000e+00 -0.000000e+00
+    outer loop
+      vertex 4.000000e+01 2.500000e+01 0.000000e+00
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+01 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal -1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 2.500000e+01 0.000000e+00
+      vertex 0.000000e+00 0.000000e+00 0.000000e+00
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+    endloop
+  endfacet
+  facet normal -1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 2.500000e+01 0.000000e+00
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 -1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 -1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 3.000000e+01
+      vertex 4.000000e+00 0.000000e+00 3.000000e+01
+      vertex 4.000000e+00 2.500000e+01 3.000000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 1.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 3.000000e+01
+      vertex 4.000000e+00 2.500000e+01 3.000000e+01
+      vertex 0.000000e+00 2.500000e+01 3.000000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 -1.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 3.000000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 -1.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 3.000000e+01
+      vertex 0.000000e+00 0.000000e+00 3.000000e+01
+    endloop
+  endfacet
+  facet normal 1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 3.000000e+01
+    endloop
+  endfacet
+  facet normal 1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 3.000000e+01
+      vertex 4.000000e+00 0.000000e+00 3.000000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 1.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+      vertex 0.000000e+00 2.500000e+01 3.000000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 1.000000e+00 -0.000000e+00
+    outer loop
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 0.000000e+00 2.500000e+01 3.000000e+01
+      vertex 4.000000e+00 2.500000e+01 3.000000e+01
+    endloop
+  endfacet
+  facet normal -1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+      vertex 0.000000e+00 0.000000e+00 4.000000e+00
+      vertex 0.000000e+00 0.000000e+00 3.000000e+01
+    endloop
+  endfacet
+  facet normal -1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 0.000000e+00 2.500000e+01 4.000000e+00
+      vertex 0.000000e+00 0.000000e+00 3.000000e+01
+      vertex 0.000000e+00 2.500000e+01 3.000000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 -1.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 6.000000e+00 2.500000e+01 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 -1.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 6.000000e+00 2.500000e+01 4.000000e+00
+      vertex 6.000000e+00 0.000000e+00 4.000000e+00
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 1.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 1.200000e+01
+      vertex 6.000000e+00 0.000000e+00 1.200000e+01
+      vertex 6.000000e+00 2.500000e+01 1.200000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 0.000000e+00 1.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 1.200000e+01
+      vertex 6.000000e+00 2.500000e+01 1.200000e+01
+      vertex 4.000000e+00 2.500000e+01 1.200000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 -1.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 6.000000e+00 0.000000e+00 4.000000e+00
+      vertex 6.000000e+00 0.000000e+00 1.200000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 -1.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 6.000000e+00 0.000000e+00 1.200000e+01
+      vertex 4.000000e+00 0.000000e+00 1.200000e+01
+    endloop
+  endfacet
+  facet normal 1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 6.000000e+00 0.000000e+00 4.000000e+00
+      vertex 6.000000e+00 2.500000e+01 4.000000e+00
+      vertex 6.000000e+00 2.500000e+01 1.200000e+01
+    endloop
+  endfacet
+  facet normal 1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 6.000000e+00 0.000000e+00 4.000000e+00
+      vertex 6.000000e+00 2.500000e+01 1.200000e+01
+      vertex 6.000000e+00 0.000000e+00 1.200000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 1.000000e+00 0.000000e+00
+    outer loop
+      vertex 6.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 1.200000e+01
+    endloop
+  endfacet
+  facet normal 0.000000e+00 1.000000e+00 -0.000000e+00
+    outer loop
+      vertex 6.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 2.500000e+01 1.200000e+01
+      vertex 6.000000e+00 2.500000e+01 1.200000e+01
+    endloop
+  endfacet
+  facet normal -1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 1.200000e+01
+    endloop
+  endfacet
+  facet normal -1.000000e+00 0.000000e+00 0.000000e+00
+    outer loop
+      vertex 4.000000e+00 2.500000e+01 4.000000e+00
+      vertex 4.000000e+00 0.000000e+00 1.200000e+01
+      vertex 4.000000e+00 2.500000e+01 1.200000e+01
+    endloop
+  endfacet
+endsolid bracket
diff --git a/crates/exav-viewer/demo/examples/files/models/gear.stl b/crates/exav-viewer/demo/examples/files/models/gear.stl
new file mode 100644
index 00000000..fade3959
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/models/gear.stl differ
diff --git a/crates/exav-viewer/demo/examples/files/models/icosphere-ascii.ply b/crates/exav-viewer/demo/examples/files/models/icosphere-ascii.ply
new file mode 100644
index 00000000..7bacbe7a
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/models/icosphere-ascii.ply
@@ -0,0 +1,499 @@
+ply
+format ascii 1.0
+comment an icosphere, colours from the position
+element vertex 162
+property float x
+property float y
+property float z
+property float nx
+property float ny
+property float nz
+property uchar red
+property uchar green
+property uchar blue
+property uchar alpha
+element face 320
+property list uchar uint vertex_indices
+end_header
+-0.52573 0.85065 0.00000 -0.52573 0.85065 0.00000 60 235 127 255
+0.52573 0.85065 0.00000 0.52573 0.85065 0.00000 194 235 127 255
+-0.52573 -0.85065 0.00000 -0.52573 -0.85065 0.00000 60 19 127 255
+0.52573 -0.85065 0.00000 0.52573 -0.85065 0.00000 194 19 127 255
+0.00000 -0.52573 0.85065 0.00000 -0.52573 0.85065 127 60 235 255
+0.00000 0.52573 0.85065 0.00000 0.52573 0.85065 127 194 235 255
+0.00000 -0.52573 -0.85065 0.00000 -0.52573 -0.85065 127 60 19 255
+0.00000 0.52573 -0.85065 0.00000 0.52573 -0.85065 127 194 19 255
+0.85065 0.00000 -0.52573 0.85065 0.00000 -0.52573 235 127 60 255
+0.85065 0.00000 0.52573 0.85065 0.00000 0.52573 235 127 194 255
+-0.85065 0.00000 -0.52573 -0.85065 0.00000 -0.52573 19 127 60 255
+-0.85065 0.00000 0.52573 -0.85065 0.00000 0.52573 19 127 194 255
+-0.80902 0.50000 0.30902 -0.80902 0.50000 0.30902 24 191 166 255
+-0.50000 0.30902 0.80902 -0.50000 0.30902 0.80902 63 166 230 255
+-0.30902 0.80902 0.50000 -0.30902 0.80902 0.50000 88 230 191 255
+0.30902 0.80902 0.50000 0.30902 0.80902 0.50000 166 230 191 255
+0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 127 255 127 255
+0.30902 0.80902 -0.50000 0.30902 0.80902 -0.50000 166 230 63 255
+-0.30902 0.80902 -0.50000 -0.30902 0.80902 -0.50000 88 230 63 255
+-0.50000 0.30902 -0.80902 -0.50000 0.30902 -0.80902 63 166 24 255
+-0.80902 0.50000 -0.30902 -0.80902 0.50000 -0.30902 24 191 88 255
+-1.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 0 127 127 255
+0.50000 0.30902 0.80902 0.50000 0.30902 0.80902 191 166 230 255
+0.80902 0.50000 0.30902 0.80902 0.50000 0.30902 230 191 166 255
+-0.50000 -0.30902 0.80902 -0.50000 -0.30902 0.80902 63 88 230 255
+0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 127 127 255 255
+-0.80902 -0.50000 -0.30902 -0.80902 -0.50000 -0.30902 24 63 88 255
+-0.80902 -0.50000 0.30902 -0.80902 -0.50000 0.30902 24 63 166 255
+0.00000 0.00000 -1.00000 0.00000 0.00000 -1.00000 127 127 0 255
+-0.50000 -0.30902 -0.80902 -0.50000 -0.30902 -0.80902 63 88 24 255
+0.80902 0.50000 -0.30902 0.80902 0.50000 -0.30902 230 191 88 255
+0.50000 0.30902 -0.80902 0.50000 0.30902 -0.80902 191 166 24 255
+0.80902 -0.50000 0.30902 0.80902 -0.50000 0.30902 230 63 166 255
+0.50000 -0.30902 0.80902 0.50000 -0.30902 0.80902 191 88 230 255
+0.30902 -0.80902 0.50000 0.30902 -0.80902 0.50000 166 24 191 255
+-0.30902 -0.80902 0.50000 -0.30902 -0.80902 0.50000 88 24 191 255
+0.00000 -1.00000 0.00000 0.00000 -1.00000 0.00000 127 0 127 255
+-0.30902 -0.80902 -0.50000 -0.30902 -0.80902 -0.50000 88 24 63 255
+0.30902 -0.80902 -0.50000 0.30902 -0.80902 -0.50000 166 24 63 255
+0.50000 -0.30902 -0.80902 0.50000 -0.30902 -0.80902 191 88 24 255
+0.80902 -0.50000 -0.30902 0.80902 -0.50000 -0.30902 230 63 88 255
+1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 255 127 127 255
+-0.69378 0.70205 0.16062 -0.69378 0.70205 0.16062 39 217 147 255
+-0.58779 0.68819 0.42533 -0.58779 0.68819 0.42533 52 215 181 255
+-0.43389 0.86267 0.25989 -0.43389 0.86267 0.25989 72 237 160 255
+-0.70205 0.16062 0.69378 -0.70205 0.16062 0.69378 37 147 215 255
+-0.68819 0.42533 0.58779 -0.68819 0.42533 0.58779 39 181 202 255
+-0.86267 0.25989 0.43389 -0.86267 0.25989 0.43389 17 160 182 255
+-0.16062 0.69378 0.70205 -0.16062 0.69378 0.70205 107 215 217 255
+-0.42533 0.58779 0.68819 -0.42533 0.58779 0.68819 73 202 215 255
+-0.25989 0.43389 0.86267 -0.25989 0.43389 0.86267 94 182 237 255
+-0.16246 0.95106 0.26287 -0.16246 0.95106 0.26287 106 248 161 255
+-0.27327 0.96194 0.00000 -0.27327 0.96194 0.00000 92 250 127 255
+0.16062 0.69378 0.70205 0.16062 0.69378 0.70205 147 215 217 255
+0.00000 0.85065 0.52573 0.00000 0.85065 0.52573 127 235 194 255
+0.27327 0.96194 0.00000 0.27327 0.96194 0.00000 162 250 127 255
+0.16246 0.95106 0.26287 0.16246 0.95106 0.26287 148 248 161 255
+0.43389 0.86267 0.25989 0.43389 0.86267 0.25989 182 237 160 255
+-0.16246 0.95106 -0.26287 -0.16246 0.95106 -0.26287 106 248 93 255
+-0.43389 0.86267 -0.25989 -0.43389 0.86267 -0.25989 72 237 94 255
+0.43389 0.86267 -0.25989 0.43389 0.86267 -0.25989 182 237 94 255
+0.16246 0.95106 -0.26287 0.16246 0.95106 -0.26287 148 248 93 255
+-0.16062 0.69378 -0.70205 -0.16062 0.69378 -0.70205 107 215 37 255
+0.00000 0.85065 -0.52573 0.00000 0.85065 -0.52573 127 235 60 255
+0.16062 0.69378 -0.70205 0.16062 0.69378 -0.70205 147 215 37 255
+-0.58779 0.68819 -0.42533 -0.58779 0.68819 -0.42533 52 215 73 255
+-0.69378 0.70205 -0.16062 -0.69378 0.70205 -0.16062 39 217 107 255
+-0.25989 0.43389 -0.86267 -0.25989 0.43389 -0.86267 94 182 17 255
+-0.42533 0.58779 -0.68819 -0.42533 0.58779 -0.68819 73 202 39 255
+-0.86267 0.25989 -0.43389 -0.86267 0.25989 -0.43389 17 160 72 255
+-0.68819 0.42533 -0.58779 -0.68819 0.42533 -0.58779 39 181 52 255
+-0.70205 0.16062 -0.69378 -0.70205 0.16062 -0.69378 37 147 39 255
+-0.85065 0.52573 0.00000 -0.85065 0.52573 0.00000 19 194 127 255
+-0.96194 0.00000 -0.27327 -0.96194 0.00000 -0.27327 4 127 92 255
+-0.95106 0.26287 -0.16246 -0.95106 0.26287 -0.16246 6 161 106 255
+-0.95106 0.26287 0.16246 -0.95106 0.26287 0.16246 6 161 148 255
+-0.96194 0.00000 0.27327 -0.96194 0.00000 0.27327 4 127 162 255
+0.58779 0.68819 0.42533 0.58779 0.68819 0.42533 202 215 181 255
+0.69378 0.70205 0.16062 0.69378 0.70205 0.16062 215 217 147 255
+0.25989 0.43389 0.86267 0.25989 0.43389 0.86267 160 182 237 255
+0.42533 0.58779 0.68819 0.42533 0.58779 0.68819 181 202 215 255
+0.86267 0.25989 0.43389 0.86267 0.25989 0.43389 237 160 182 255
+0.68819 0.42533 0.58779 0.68819 0.42533 0.58779 215 181 202 255
+0.70205 0.16062 0.69378 0.70205 0.16062 0.69378 217 147 215 255
+-0.26287 0.16246 0.95106 -0.26287 0.16246 0.95106 93 148 248 255
+0.00000 0.27327 0.96194 0.00000 0.27327 0.96194 127 162 250 255
+-0.70205 -0.16062 0.69378 -0.70205 -0.16062 0.69378 37 107 215 255
+-0.52573 0.00000 0.85065 -0.52573 0.00000 0.85065 60 127 235 255
+0.00000 -0.27327 0.96194 0.00000 -0.27327 0.96194 127 92 250 255
+-0.26287 -0.16246 0.95106 -0.26287 -0.16246 0.95106 93 106 248 255
+-0.25989 -0.43389 0.86267 -0.25989 -0.43389 0.86267 94 72 237 255
+-0.95106 -0.26287 0.16246 -0.95106 -0.26287 0.16246 6 93 148 255
+-0.86267 -0.25989 0.43389 -0.86267 -0.25989 0.43389 17 94 182 255
+-0.86267 -0.25989 -0.43389 -0.86267 -0.25989 -0.43389 17 94 72 255
+-0.95106 -0.26287 -0.16246 -0.95106 -0.26287 -0.16246 6 93 106 255
+-0.69378 -0.70205 0.16062 -0.69378 -0.70205 0.16062 39 37 147 255
+-0.85065 -0.52573 0.00000 -0.85065 -0.52573 0.00000 19 60 127 255
+-0.69378 -0.70205 -0.16062 -0.69378 -0.70205 -0.16062 39 37 107 255
+-0.52573 0.00000 -0.85065 -0.52573 0.00000 -0.85065 60 127 19 255
+-0.70205 -0.16062 -0.69378 -0.70205 -0.16062 -0.69378 37 107 39 255
+0.00000 0.27327 -0.96194 0.00000 0.27327 -0.96194 127 162 4 255
+-0.26287 0.16246 -0.95106 -0.26287 0.16246 -0.95106 93 148 6 255
+-0.25989 -0.43389 -0.86267 -0.25989 -0.43389 -0.86267 94 72 17 255
+-0.26287 -0.16246 -0.95106 -0.26287 -0.16246 -0.95106 93 106 6 255
+0.00000 -0.27327 -0.96194 0.00000 -0.27327 -0.96194 127 92 4 255
+0.42533 0.58779 -0.68819 0.42533 0.58779 -0.68819 181 202 39 255
+0.25989 0.43389 -0.86267 0.25989 0.43389 -0.86267 160 182 17 255
+0.69378 0.70205 -0.16062 0.69378 0.70205 -0.16062 215 217 107 255
+0.58779 0.68819 -0.42533 0.58779 0.68819 -0.42533 202 215 73 255
+0.70205 0.16062 -0.69378 0.70205 0.16062 -0.69378 217 147 39 255
+0.68819 0.42533 -0.58779 0.68819 0.42533 -0.58779 215 181 52 255
+0.86267 0.25989 -0.43389 0.86267 0.25989 -0.43389 237 160 72 255
+0.69378 -0.70205 0.16062 0.69378 -0.70205 0.16062 215 37 147 255
+0.58779 -0.68819 0.42533 0.58779 -0.68819 0.42533 202 39 181 255
+0.43389 -0.86267 0.25989 0.43389 -0.86267 0.25989 182 17 160 255
+0.70205 -0.16062 0.69378 0.70205 -0.16062 0.69378 217 107 215 255
+0.68819 -0.42533 0.58779 0.68819 -0.42533 0.58779 215 73 202 255
+0.86267 -0.25989 0.43389 0.86267 -0.25989 0.43389 237 94 182 255
+0.16062 -0.69378 0.70205 0.16062 -0.69378 0.70205 147 39 217 255
+0.42533 -0.58779 0.68819 0.42533 -0.58779 0.68819 181 52 215 255
+0.25989 -0.43389 0.86267 0.25989 -0.43389 0.86267 160 72 237 255
+0.16246 -0.95106 0.26287 0.16246 -0.95106 0.26287 148 6 161 255
+0.27327 -0.96194 0.00000 0.27327 -0.96194 0.00000 162 4 127 255
+-0.16062 -0.69378 0.70205 -0.16062 -0.69378 0.70205 107 39 217 255
+0.00000 -0.85065 0.52573 0.00000 -0.85065 0.52573 127 19 194 255
+-0.27327 -0.96194 0.00000 -0.27327 -0.96194 0.00000 92 4 127 255
+-0.16246 -0.95106 0.26287 -0.16246 -0.95106 0.26287 106 6 161 255
+-0.43389 -0.86267 0.25989 -0.43389 -0.86267 0.25989 72 17 160 255
+0.16246 -0.95106 -0.26287 0.16246 -0.95106 -0.26287 148 6 93 255
+0.43389 -0.86267 -0.25989 0.43389 -0.86267 -0.25989 182 17 94 255
+-0.43389 -0.86267 -0.25989 -0.43389 -0.86267 -0.25989 72 17 94 255
+-0.16246 -0.95106 -0.26287 -0.16246 -0.95106 -0.26287 106 6 93 255
+0.16062 -0.69378 -0.70205 0.16062 -0.69378 -0.70205 147 39 37 255
+0.00000 -0.85065 -0.52573 0.00000 -0.85065 -0.52573 127 19 60 255
+-0.16062 -0.69378 -0.70205 -0.16062 -0.69378 -0.70205 107 39 37 255
+0.58779 -0.68819 -0.42533 0.58779 -0.68819 -0.42533 202 39 73 255
+0.69378 -0.70205 -0.16062 0.69378 -0.70205 -0.16062 215 37 107 255
+0.25989 -0.43389 -0.86267 0.25989 -0.43389 -0.86267 160 72 17 255
+0.42533 -0.58779 -0.68819 0.42533 -0.58779 -0.68819 181 52 39 255
+0.86267 -0.25989 -0.43389 0.86267 -0.25989 -0.43389 237 94 72 255
+0.68819 -0.42533 -0.58779 0.68819 -0.42533 -0.58779 215 73 52 255
+0.70205 -0.16062 -0.69378 0.70205 -0.16062 -0.69378 217 107 39 255
+0.85065 -0.52573 0.00000 0.85065 -0.52573 0.00000 235 60 127 255
+0.96194 0.00000 -0.27327 0.96194 0.00000 -0.27327 250 127 92 255
+0.95106 -0.26287 -0.16246 0.95106 -0.26287 -0.16246 248 93 106 255
+0.95106 -0.26287 0.16246 0.95106 -0.26287 0.16246 248 93 148 255
+0.96194 0.00000 0.27327 0.96194 0.00000 0.27327 250 127 162 255
+0.26287 -0.16246 0.95106 0.26287 -0.16246 0.95106 161 106 248 255
+0.52573 0.00000 0.85065 0.52573 0.00000 0.85065 194 127 235 255
+0.26287 0.16246 0.95106 0.26287 0.16246 0.95106 161 148 248 255
+-0.58779 -0.68819 0.42533 -0.58779 -0.68819 0.42533 52 39 181 255
+-0.42533 -0.58779 0.68819 -0.42533 -0.58779 0.68819 73 52 215 255
+-0.68819 -0.42533 0.58779 -0.68819 -0.42533 0.58779 39 73 202 255
+-0.42533 -0.58779 -0.68819 -0.42533 -0.58779 -0.68819 73 52 39 255
+-0.58779 -0.68819 -0.42533 -0.58779 -0.68819 -0.42533 52 39 73 255
+-0.68819 -0.42533 -0.58779 -0.68819 -0.42533 -0.58779 39 73 52 255
+0.52573 0.00000 -0.85065 0.52573 0.00000 -0.85065 194 127 19 255
+0.26287 -0.16246 -0.95106 0.26287 -0.16246 -0.95106 161 106 6 255
+0.26287 0.16246 -0.95106 0.26287 0.16246 -0.95106 161 148 6 255
+0.95106 0.26287 0.16246 0.95106 0.26287 0.16246 248 161 148 255
+0.95106 0.26287 -0.16246 0.95106 0.26287 -0.16246 248 161 106 255
+0.85065 0.52573 0.00000 0.85065 0.52573 0.00000 235 194 127 255
+3 0 42 44
+3 12 43 42
+3 14 44 43
+3 42 43 44
+3 11 45 47
+3 13 46 45
+3 12 47 46
+3 45 46 47
+3 5 48 50
+3 14 49 48
+3 13 50 49
+3 48 49 50
+3 12 46 43
+3 13 49 46
+3 14 43 49
+3 46 49 43
+3 0 44 52
+3 14 51 44
+3 16 52 51
+3 44 51 52
+3 5 53 48
+3 15 54 53
+3 14 48 54
+3 53 54 48
+3 1 55 57
+3 16 56 55
+3 15 57 56
+3 55 56 57
+3 14 54 51
+3 15 56 54
+3 16 51 56
+3 54 56 51
+3 0 52 59
+3 16 58 52
+3 18 59 58
+3 52 58 59
+3 1 60 55
+3 17 61 60
+3 16 55 61
+3 60 61 55
+3 7 62 64
+3 18 63 62
+3 17 64 63
+3 62 63 64
+3 16 61 58
+3 17 63 61
+3 18 58 63
+3 61 63 58
+3 0 59 66
+3 18 65 59
+3 20 66 65
+3 59 65 66
+3 7 67 62
+3 19 68 67
+3 18 62 68
+3 67 68 62
+3 10 69 71
+3 20 70 69
+3 19 71 70
+3 69 70 71
+3 18 68 65
+3 19 70 68
+3 20 65 70
+3 68 70 65
+3 0 66 42
+3 20 72 66
+3 12 42 72
+3 66 72 42
+3 10 73 69
+3 21 74 73
+3 20 69 74
+3 73 74 69
+3 11 47 76
+3 12 75 47
+3 21 76 75
+3 47 75 76
+3 20 74 72
+3 21 75 74
+3 12 72 75
+3 74 75 72
+3 1 57 78
+3 15 77 57
+3 23 78 77
+3 57 77 78
+3 5 79 53
+3 22 80 79
+3 15 53 80
+3 79 80 53
+3 9 81 83
+3 23 82 81
+3 22 83 82
+3 81 82 83
+3 15 80 77
+3 22 82 80
+3 23 77 82
+3 80 82 77
+3 5 50 85
+3 13 84 50
+3 25 85 84
+3 50 84 85
+3 11 86 45
+3 24 87 86
+3 13 45 87
+3 86 87 45
+3 4 88 90
+3 25 89 88
+3 24 90 89
+3 88 89 90
+3 13 87 84
+3 24 89 87
+3 25 84 89
+3 87 89 84
+3 11 76 92
+3 21 91 76
+3 27 92 91
+3 76 91 92
+3 10 93 73
+3 26 94 93
+3 21 73 94
+3 93 94 73
+3 2 95 97
+3 27 96 95
+3 26 97 96
+3 95 96 97
+3 21 94 91
+3 26 96 94
+3 27 91 96
+3 94 96 91
+3 10 71 99
+3 19 98 71
+3 29 99 98
+3 71 98 99
+3 7 100 67
+3 28 101 100
+3 19 67 101
+3 100 101 67
+3 6 102 104
+3 29 103 102
+3 28 104 103
+3 102 103 104
+3 19 101 98
+3 28 103 101
+3 29 98 103
+3 101 103 98
+3 7 64 106
+3 17 105 64
+3 31 106 105
+3 64 105 106
+3 1 107 60
+3 30 108 107
+3 17 60 108
+3 107 108 60
+3 8 109 111
+3 31 110 109
+3 30 111 110
+3 109 110 111
+3 17 108 105
+3 30 110 108
+3 31 105 110
+3 108 110 105
+3 3 112 114
+3 32 113 112
+3 34 114 113
+3 112 113 114
+3 9 115 117
+3 33 116 115
+3 32 117 116
+3 115 116 117
+3 4 118 120
+3 34 119 118
+3 33 120 119
+3 118 119 120
+3 32 116 113
+3 33 119 116
+3 34 113 119
+3 116 119 113
+3 3 114 122
+3 34 121 114
+3 36 122 121
+3 114 121 122
+3 4 123 118
+3 35 124 123
+3 34 118 124
+3 123 124 118
+3 2 125 127
+3 36 126 125
+3 35 127 126
+3 125 126 127
+3 34 124 121
+3 35 126 124
+3 36 121 126
+3 124 126 121
+3 3 122 129
+3 36 128 122
+3 38 129 128
+3 122 128 129
+3 2 130 125
+3 37 131 130
+3 36 125 131
+3 130 131 125
+3 6 132 134
+3 38 133 132
+3 37 134 133
+3 132 133 134
+3 36 131 128
+3 37 133 131
+3 38 128 133
+3 131 133 128
+3 3 129 136
+3 38 135 129
+3 40 136 135
+3 129 135 136
+3 6 137 132
+3 39 138 137
+3 38 132 138
+3 137 138 132
+3 8 139 141
+3 40 140 139
+3 39 141 140
+3 139 140 141
+3 38 138 135
+3 39 140 138
+3 40 135 140
+3 138 140 135
+3 3 136 112
+3 40 142 136
+3 32 112 142
+3 136 142 112
+3 8 143 139
+3 41 144 143
+3 40 139 144
+3 143 144 139
+3 9 117 146
+3 32 145 117
+3 41 146 145
+3 117 145 146
+3 40 144 142
+3 41 145 144
+3 32 142 145
+3 144 145 142
+3 4 120 88
+3 33 147 120
+3 25 88 147
+3 120 147 88
+3 9 83 115
+3 22 148 83
+3 33 115 148
+3 83 148 115
+3 5 85 79
+3 25 149 85
+3 22 79 149
+3 85 149 79
+3 33 148 147
+3 22 149 148
+3 25 147 149
+3 148 149 147
+3 2 127 95
+3 35 150 127
+3 27 95 150
+3 127 150 95
+3 4 90 123
+3 24 151 90
+3 35 123 151
+3 90 151 123
+3 11 92 86
+3 27 152 92
+3 24 86 152
+3 92 152 86
+3 35 151 150
+3 24 152 151
+3 27 150 152
+3 151 152 150
+3 6 134 102
+3 37 153 134
+3 29 102 153
+3 134 153 102
+3 2 97 130
+3 26 154 97
+3 37 130 154
+3 97 154 130
+3 10 99 93
+3 29 155 99
+3 26 93 155
+3 99 155 93
+3 37 154 153
+3 26 155 154
+3 29 153 155
+3 154 155 153
+3 8 141 109
+3 39 156 141
+3 31 109 156
+3 141 156 109
+3 6 104 137
+3 28 157 104
+3 39 137 157
+3 104 157 137
+3 7 106 100
+3 31 158 106
+3 28 100 158
+3 106 158 100
+3 39 157 156
+3 28 158 157
+3 31 156 158
+3 157 158 156
+3 9 146 81
+3 41 159 146
+3 23 81 159
+3 146 159 81
+3 8 111 143
+3 30 160 111
+3 41 143 160
+3 111 160 143
+3 1 78 107
+3 23 161 78
+3 30 107 161
+3 78 161 107
+3 41 160 159
+3 30 161 160
+3 23 159 161
+3 160 161 159
diff --git a/crates/exav-viewer/demo/examples/files/models/knot.obj b/crates/exav-viewer/demo/examples/files/models/knot.obj
new file mode 100644
index 00000000..f2f5f665
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/models/knot.obj
@@ -0,0 +1,2944 @@
+# A trefoil knot with a colour per vertex, and a base: two objects.
+o knot
+v 3.3200 0.0006 0.0000 1.000 0.000 0.000
+v 3.2587 0.0846 -0.1682 1.000 0.000 0.000
+v 3.0986 0.1363 -0.2722 1.000 0.000 0.000
+v 2.9009 0.1359 -0.2722 1.000 0.000 0.000
+v 2.7410 0.0837 -0.1682 1.000 0.000 0.000
+v 2.6800 -0.0006 -0.0000 1.000 0.000 0.000
+v 2.7413 -0.0846 0.1682 1.000 0.000 0.000
+v 2.9014 -0.1363 0.2722 1.000 0.000 0.000
+v 3.0991 -0.1359 0.2722 1.000 0.000 0.000
+v 3.2590 -0.0837 0.1682 1.000 0.000 0.000
+v 3.2596 0.4923 0.2079 1.000 0.067 0.000
+v 3.1801 0.5577 0.0390 1.000 0.067 0.000
+v 3.0125 0.5684 -0.0654 1.000 0.067 0.000
+v 2.8207 0.5203 -0.0654 1.000 0.067 0.000
+v 2.6779 0.4318 0.0390 1.000 0.067 0.000
+v 2.6388 0.3366 0.2079 1.000 0.067 0.000
+v 2.7182 0.2713 0.3768 1.000 0.067 0.000
+v 2.8858 0.2606 0.4812 1.000 0.067 0.000
+v 3.0776 0.3087 0.4812 1.000 0.067 0.000
+v 3.2204 0.3972 0.3768 1.000 0.067 0.000
+v 3.0834 0.9529 0.4067 1.000 0.133 0.000
+v 2.9926 0.9938 0.2359 1.000 0.133 0.000
+v 2.8285 0.9618 0.1303 1.000 0.133 0.000
+v 2.6537 0.8692 0.1303 1.000 0.133 0.000
+v 2.5351 0.7513 0.2359 1.000 0.133 0.000
+v 2.5179 0.6532 0.4067 1.000 0.133 0.000
+v 2.6088 0.6124 0.5776 1.000 0.133 0.000
+v 2.7729 0.6444 0.6832 1.000 0.133 0.000
+v 2.9476 0.7370 0.6832 1.000 0.133 0.000
+v 3.0662 0.8549 0.5776 1.000 0.133 0.000
+v 2.8057 1.3547 0.5878 1.000 0.200 0.000
+v 2.7125 1.3678 0.4139 1.000 0.200 0.000
+v 2.5634 1.2948 0.3064 1.000 0.200 0.000
+v 2.4153 1.1637 0.3064 1.000 0.200 0.000
+v 2.3249 1.0245 0.4139 1.000 0.200 0.000
+v 2.3266 0.9304 0.5878 1.000 0.200 0.000
+v 2.4198 0.9173 0.7617 1.000 0.200 0.000
+v 2.5689 0.9902 0.8692 1.000 0.200 0.000
+v 2.7170 1.1213 0.8692 1.000 0.200 0.000
+v 2.8075 1.2605 0.7617 1.000 0.200 0.000
+v 2.4482 1.6758 0.7431 1.000 0.267 0.000
+v 2.3626 1.6614 0.5654 1.000 0.267 0.000
+v 2.2392 1.5527 0.4556 1.000 0.267 0.000
+v 2.1251 1.3911 0.4556 1.000 0.267 0.000
+v 2.0639 1.2385 0.5654 1.000 0.267 0.000
+v 2.0789 1.1531 0.7431 1.000 0.267 0.000
+v 2.1645 1.1675 0.9209 1.000 0.267 0.000
+v 2.2879 1.2762 1.0307 1.000 0.267 0.000
+v 2.4020 1.4377 1.0307 1.000 0.267 0.000
+v 2.4632 1.5903 0.9209 1.000 0.267 0.000
+v 2.0373 1.9027 0.8660 1.000 0.333 0.000
+v 1.9694 1.8647 0.6842 1.000 0.333 0.000
+v 1.8807 1.7282 0.5719 1.000 0.333 0.000
+v 1.8051 1.5454 0.5719 1.000 0.333 0.000
+v 1.7716 1.3861 0.6842 1.000 0.333 0.000
+v 1.7929 1.3112 0.8660 1.000 0.333 0.000
+v 1.8609 1.3493 1.0478 1.000 0.333 0.000
+v 1.9495 1.4857 1.1602 1.000 0.333 0.000
+v 2.0251 1.6685 1.1602 1.000 0.333 0.000
+v 2.0586 1.8278 1.0478 1.000 0.333 0.000
+v 1.6017 2.0309 0.9511 1.000 0.400 0.000
+v 1.5599 1.9763 0.7656 1.000 0.400 0.000
+v 1.5123 1.8223 0.6510 1.000 0.400 0.000
+v 1.4773 1.6277 0.6510 1.000 0.400 0.000
+v 1.4681 1.4667 0.7656 1.000 0.400 0.000
+v 1.4883 1.4010 0.9511 1.000 0.400 0.000
+v 1.5302 1.4556 1.1365 1.000 0.400 0.000
+v 1.5777 1.6096 1.2511 1.000 0.400 0.000
+v 1.6128 1.8042 1.2511 1.000 0.400 0.000
+v 1.6219 1.9651 1.1365 1.000 0.400 0.000
+v 1.1690 2.0646 0.9945 1.000 0.467 0.000
+v 1.1592 2.0033 0.8068 1.000 0.467 0.000
+v 1.1562 1.8431 0.6907 1.000 0.467 0.000
+v 1.1611 1.6454 0.6907 1.000 0.467 0.000
+v 1.1720 1.4856 0.8068 1.000 0.467 0.000
+v 1.1847 1.4248 0.9945 1.000 0.467 0.000
+v 1.1945 1.4862 1.1823 1.000 0.467 0.000
+v 1.1975 1.6463 1.2983 1.000 0.467 0.000
+v 1.1926 1.8440 1.2983 1.000 0.467 0.000
+v 1.1817 2.0038 1.1823 1.000 0.467 0.000
+v 0.7629 2.0163 0.9945 1.000 0.533 0.000
+v 0.7880 1.9592 0.8068 1.000 0.533 0.000
+v 0.8295 1.8045 0.6908 1.000 0.533 0.000
+v 0.8715 1.6113 0.6908 1.000 0.533 0.000
+v 0.8981 1.4533 0.8068 1.000 0.533 0.000
+v 0.8990 1.3910 0.9945 1.000 0.533 0.000
+v 0.8739 1.4480 1.1822 1.000 0.533 0.000
+v 0.8324 1.6028 1.2982 1.000 0.533 0.000
+v 0.7903 1.7960 1.2982 1.000 0.533 0.000
+v 0.7638 1.9540 1.1822 1.000 0.533 0.000
+v 0.4015 1.9045 0.9511 1.000 0.600 0.000
+v 0.4605 1.8625 0.7670 1.000 0.600 0.000
+v 0.5432 1.7235 0.6533 1.000 0.600 0.000
+v 0.6180 1.5404 0.6533 1.000 0.600 0.000
+v 0.6563 1.3832 0.7670 1.000 0.600 0.000
+v 0.6436 1.3120 0.9511 1.000 0.600 0.000
+v 0.5846 1.3539 1.1351 1.000 0.600 0.000
+v 0.5019 1.4930 1.2489 1.000 0.600 0.000
+v 0.4271 1.6760 1.2489 1.000 0.600 0.000
+v 0.3888 1.8332 1.1351 1.000 0.600 0.000
+v 0.0959 1.7516 0.8660 1.000 0.667 0.000
+v 0.1845 1.7335 0.6902 1.000 0.667 0.000
+v 0.3022 1.6175 0.5815 1.000 0.667 0.000
+v 0.4039 1.4479 0.5815 1.000 0.667 0.000
+v 0.4508 1.2895 0.6902 1.000 0.667 0.000
+v 0.4250 1.2028 0.8660 1.000 0.667 0.000
+v 0.3364 1.2209 1.0419 1.000 0.667 0.000
+v 0.2188 1.3369 1.1506 1.000 0.667 0.000
+v 0.1171 1.5065 1.1506 1.000 0.667 0.000
+v 0.0701 1.6649 1.0419 1.000 0.667 0.000
+v -0.1505 1.5823 0.7431 1.000 0.733 0.000
+v -0.0386 1.5922 0.5804 1.000 0.733 0.000
+v 0.1059 1.5019 0.4799 1.000 0.733 0.000
+v 0.2276 1.3461 0.4799 1.000 0.733 0.000
+v 0.2801 1.1841 0.5804 1.000 0.733 0.000
+v 0.2434 1.0779 0.7431 1.000 0.733 0.000
+v 0.1315 1.0680 0.9059 1.000 0.733 0.000
+v -0.0130 1.1582 1.0064 1.000 0.733 0.000
+v -0.1347 1.3140 1.0064 1.000 0.733 0.000
+v -0.1873 1.4760 0.9059 1.000 0.733 0.000
+v -0.3408 1.4203 0.5878 1.000 0.800 0.000
+v -0.2116 1.4559 0.4424 1.000 0.800 0.000
+v -0.0491 1.3879 0.3525 1.000 0.800 0.000
+v 0.0846 1.2421 0.3525 1.000 0.800 0.000
+v 0.1385 1.0744 0.4424 1.000 0.800 0.000
+v 0.0918 0.9487 0.5878 1.000 0.800 0.000
+v -0.0374 0.9130 0.7332 1.000 0.800 0.000
+v -0.1999 0.9811 0.8230 1.000 0.800 0.000
+v -0.3336 1.1268 0.8230 1.000 0.800 0.000
+v -0.3874 1.2946 0.7332 1.000 0.800 0.000
+v -0.4823 1.2870 0.4067 1.000 0.863 0.000
+v -0.3390 1.3381 0.2803 1.000 0.863 0.000
+v -0.1667 1.2807 0.2022 1.000 0.863 0.000
+v -0.0310 1.1368 0.2022 1.000 0.863 0.000
+v 0.0161 0.9613 0.2803 1.000 0.863 0.000
+v -0.0434 0.8213 0.4067 1.000 0.863 0.000
+v -0.1866 0.7703 0.5331 1.000 0.863 0.000
+v -0.3590 0.8277 0.6113 1.000 0.863 0.000
+v -0.4947 0.9716 0.6113 1.000 0.863 0.000
+v -0.5418 1.1470 0.5331 1.000 0.863 0.000
+v -0.5838 1.1964 0.2079 1.000 0.933 0.000
+v -0.4271 1.2444 0.0973 1.000 0.933 0.000
+v -0.2534 1.1790 0.0289 1.000 0.933 0.000
+v -0.1292 1.0251 0.0289 1.000 0.933 0.000
+v -0.1018 0.8416 0.0973 1.000 0.933 0.000
+v -0.1818 0.6985 0.2079 1.000 0.933 0.000
+v -0.3385 0.6505 0.3185 1.000 0.933 0.000
+v -0.5122 0.7159 0.3869 1.000 0.933 0.000
+v -0.6364 0.8697 0.3869 1.000 0.933 0.000
+v -0.6638 1.0533 0.3185 1.000 0.933 0.000
+v -0.6597 1.1434 0.0000 1.000 1.000 0.000
+v -0.4935 1.1685 -0.1043 1.000 1.000 0.000
+v -0.3299 1.0781 -0.1688 1.000 1.000 0.000
+v -0.2312 0.9067 -0.1688 1.000 1.000 0.000
+v -0.2352 0.7197 -0.1043 1.000 1.000 0.000
+v -0.3403 0.5887 0.0000 1.000 1.000 0.000
+v -0.5065 0.5636 0.1043 1.000 1.000 0.000
+v -0.6701 0.6540 0.1688 1.000 1.000 0.000
+v -0.7688 0.8254 0.1688 1.000 1.000 0.000
+v -0.7648 1.0123 0.1043 1.000 1.000 0.000
+v -0.7437 1.1040 -0.2079 0.933 1.000 0.000
+v -0.5799 1.1014 -0.3187 0.933 1.000 0.000
+v -0.4349 0.9856 -0.3872 0.933 1.000 0.000
+v -0.3641 0.8009 -0.3872 0.933 1.000 0.000
+v -0.3945 0.6179 -0.3187 0.933 1.000 0.000
+v -0.5146 0.5064 -0.2079 0.933 1.000 0.000
+v -0.6783 0.5091 -0.0971 0.933 1.000 0.000
+v -0.8233 0.6249 -0.0286 0.933 1.000 0.000
+v -0.8941 0.8095 -0.0286 0.933 1.000 0.000
+v -0.8637 0.9925 -0.0971 0.933 1.000 0.000
+v -0.8733 1.0613 -0.4067 0.867 1.000 0.000
+v -0.7226 1.0426 -0.5334 0.867 1.000 0.000
+v -0.5944 0.9140 -0.6117 0.867 1.000 0.000
+v -0.5376 0.7245 -0.6117 0.867 1.000 0.000
+v -0.5741 0.5466 -0.5334 0.867 1.000 0.000
+v -0.6897 0.4482 -0.4067 0.867 1.000 0.000
+v -0.8405 0.4668 -0.2801 0.867 1.000 0.000
+v -0.9687 0.5954 -0.2018 0.867 1.000 0.000
+v -1.0254 0.7849 -0.2018 0.867 1.000 0.000
+v -0.9890 0.9628 -0.2801 0.867 1.000 0.000
+v -1.0598 1.0052 -0.5878 0.796 1.000 0.000
+v -0.9279 0.9827 -0.7334 0.796 1.000 0.000
+v -0.8096 0.8523 -0.8235 0.796 1.000 0.000
+v -0.7501 0.6637 -0.8235 0.796 1.000 0.000
+v -0.7721 0.4890 -0.7334 0.796 1.000 0.000
+v -0.8673 0.3949 -0.5878 0.796 1.000 0.000
+v -0.9991 0.4173 -0.4421 0.796 1.000 0.000
+v -1.1174 0.5478 -0.3521 0.796 1.000 0.000
+v -1.1769 0.7364 -0.3521 0.796 1.000 0.000
+v -1.1549 0.9111 -0.4421 0.796 1.000 0.000
+v -1.2954 0.9213 -0.7431 0.733 1.000 0.000
+v -1.1854 0.9000 -0.9061 0.733 1.000 0.000
+v -1.0714 0.7736 -1.0068 0.733 1.000 0.000
+v -0.9970 0.5904 -1.0068 0.733 1.000 0.000
+v -0.9907 0.4203 -0.9061 0.733 1.000 0.000
+v -1.0547 0.3283 -0.7431 0.733 1.000 0.000
+v -1.1648 0.3496 -0.5802 0.733 1.000 0.000
+v -1.2787 0.4760 -0.4795 0.733 1.000 0.000
+v -1.3531 0.6593 -0.4795 0.733 1.000 0.000
+v -1.3595 0.8293 -0.5802 0.733 1.000 0.000
+v -1.5655 0.7925 -0.8660 0.667 1.000 0.000
+v -1.4778 0.7714 -1.0420 0.667 1.000 0.000
+v -1.3641 0.6517 -1.1508 0.667 1.000 0.000
+v -1.2677 0.4790 -1.1508 0.667 1.000 0.000
+v -1.2255 0.3193 -1.0420 0.667 1.000 0.000
+v -1.2536 0.2336 -0.8660 0.667 1.000 0.000
+v -1.3413 0.2547 -0.6900 0.667 1.000 0.000
+v -1.4550 0.3744 -0.5812 0.667 1.000 0.000
+v -1.5514 0.5471 -0.5812 0.667 1.000 0.000
+v -1.5936 0.7068 -0.6900 0.667 1.000 0.000
+v -1.8507 0.6040 -0.9511 0.600 1.000 0.000
+v -1.7828 0.5794 -1.1352 0.600 1.000 0.000
+v -1.6658 0.4677 -1.2490 0.600 1.000 0.000
+v -1.5443 0.3117 -1.2490 0.600 1.000 0.000
+v -1.4647 0.1709 -1.1352 0.600 1.000 0.000
+v -1.4574 0.0991 -0.9511 0.600 1.000 0.000
+v -1.5252 0.1238 -0.7669 0.600 1.000 0.000
+v -1.6423 0.2354 -0.6531 0.600 1.000 0.000
+v -1.7638 0.3914 -0.6531 0.600 1.000 0.000
+v -1.8434 0.5322 -0.7669 0.600 1.000 0.000
+v -2.1282 0.3469 -0.9945 0.533 1.000 0.000
+v -2.0748 0.3148 -1.1822 0.533 1.000 0.000
+v -1.9511 0.2130 -1.2982 0.533 1.000 0.000
+v -1.8045 0.0803 -1.2982 0.533 1.000 0.000
+v -1.6908 -0.0325 -1.1822 0.533 1.000 0.000
+v -1.6535 -0.0824 -0.9945 0.533 1.000 0.000
+v -1.7069 -0.0504 -0.8068 0.533 1.000 0.000
+v -1.8306 0.0515 -0.6908 0.533 1.000 0.000
+v -1.9772 0.1841 -0.6908 0.533 1.000 0.000
+v -2.0909 0.2970 -0.8068 0.533 1.000 0.000
+v -2.3730 0.0192 -0.9945 0.467 1.000 0.000
+v -2.3267 -0.0224 -1.1823 0.467 1.000 0.000
+v -2.1937 -0.1115 -1.2983 0.467 1.000 0.000
+v -2.0246 -0.2141 -1.2983 0.467 1.000 0.000
+v -1.8841 -0.2910 -1.1823 0.467 1.000 0.000
+v -1.8258 -0.3128 -0.9945 0.467 1.000 0.000
+v -1.8721 -0.2712 -0.8068 0.467 1.000 0.000
+v -2.0052 -0.1821 -0.6908 0.467 1.000 0.000
+v -2.1742 -0.0795 -0.6908 0.467 1.000 0.000
+v -2.3147 -0.0026 -0.8068 0.467 1.000 0.000
+v -2.5600 -0.3726 -0.9511 0.396 1.000 0.000
+v -2.5131 -0.4231 -1.1364 0.396 1.000 0.000
+v -2.3690 -0.4953 -1.2510 0.396 1.000 0.000
+v -2.1827 -0.5617 -1.2510 0.396 1.000 0.000
+v -2.0254 -0.5970 -1.1364 0.396 1.000 0.000
+v -1.9571 -0.5875 -0.9511 0.396 1.000 0.000
+v -2.0040 -0.5371 -0.7657 0.396 1.000 0.000
+v -2.1481 -0.4648 -0.6511 0.396 1.000 0.000
+v -2.3344 -0.3984 -0.6511 0.396 1.000 0.000
+v -2.4917 -0.3632 -0.7657 0.396 1.000 0.000
+v -2.6666 -0.8140 -0.8660 0.329 1.000 0.000
+v -2.6122 -0.8699 -1.0478 0.329 1.000 0.000
+v -2.4574 -0.9202 -1.1601 0.329 1.000 0.000
+v -2.2612 -0.9455 -1.1601 0.329 1.000 0.000
+v -2.0987 -0.9363 -1.0478 0.329 1.000 0.000
+v -2.0319 -0.8961 -0.8660 0.329 1.000 0.000
+v -2.0863 -0.8402 -0.6843 0.329 1.000 0.000
+v -2.2411 -0.7899 -0.5720 0.329 1.000 0.000
+v -2.4372 -0.7646 -0.5720 0.329 1.000 0.000
+v -2.5998 -0.7738 -0.6843 0.329 1.000 0.000
+v -2.6753 -1.2833 -0.7431 0.267 1.000 0.000
+v -2.6086 -1.3390 -0.9208 0.267 1.000 0.000
+v -2.4457 -1.3619 -1.0306 0.267 1.000 0.000
+v -2.2488 -1.3432 -1.0306 0.267 1.000 0.000
+v -2.0931 -1.2901 -0.9208 0.267 1.000 0.000
+v -2.0381 -1.2228 -0.7431 0.267 1.000 0.000
+v -2.1048 -1.1671 -0.5655 0.267 1.000 0.000
+v -2.2677 -1.1443 -0.4557 0.267 1.000 0.000
+v -2.4646 -1.1630 -0.4557 0.267 1.000 0.000
+v -2.6203 -1.2161 -0.5655 0.267 1.000 0.000
+v -2.5757 -1.7535 -0.5878 0.200 1.000 0.000
+v -2.4948 -1.8019 -0.7617 0.200 1.000 0.000
+v -2.3291 -1.7927 -0.8691 0.200 1.000 0.000
+v -2.1417 -1.7294 -0.8691 0.200 1.000 0.000
+v -2.0043 -1.6362 -0.7617 0.200 1.000 0.000
+v -1.9694 -1.5487 -0.5878 0.200 1.000 0.000
+v -2.0502 -1.5003 -0.4139 0.200 1.000 0.000
+v -2.2160 -1.5095 -0.3065 0.200 1.000 0.000
+v -2.4034 -1.5728 -0.3065 0.200 1.000 0.000
+v -2.5408 -1.6660 -0.4139 0.200 1.000 0.000
+v -2.3664 -2.1948 -0.4067 0.129 1.000 0.000
+v -2.2727 -2.2287 -0.5776 0.129 1.000 0.000
+v -2.1115 -2.1844 -0.6832 0.129 1.000 0.000
+v -1.9442 -2.0788 -0.6832 0.129 1.000 0.000
+v -1.8349 -1.9522 -0.5776 0.129 1.000 0.000
+v -1.8253 -1.8531 -0.4067 0.129 1.000 0.000
+v -1.9190 -1.8192 -0.2359 0.129 1.000 0.000
+v -2.0802 -1.8635 -0.1303 0.129 1.000 0.000
+v -2.2474 -1.9691 -0.1303 0.129 1.000 0.000
+v -2.3567 -2.0956 -0.2359 0.129 1.000 0.000
+v -2.0553 -2.5775 -0.2079 0.063 1.000 0.000
+v -1.9533 -2.5908 -0.3768 0.063 1.000 0.000
+v -1.8055 -2.5109 -0.4812 0.063 1.000 0.000
+v -1.6684 -2.3684 -0.4812 0.063 1.000 0.000
+v -1.5944 -2.2176 -0.3768 0.063 1.000 0.000
+v -1.6117 -2.1162 -0.2079 0.063 1.000 0.000
+v -1.7138 -2.1028 -0.0390 0.063 1.000 0.000
+v -1.8615 -2.1827 0.0654 0.063 1.000 0.000
+v -1.9986 -2.3253 0.0654 0.063 1.000 0.000
+v -2.0726 -2.4760 -0.0390 0.063 1.000 0.000
+v -1.6595 -2.8755 -0.0000 0.000 1.000 0.000
+v -1.5561 -2.8644 -0.1682 0.000 1.000 0.000
+v -1.4313 -2.7516 -0.2722 0.000 1.000 0.000
+v -1.3327 -2.5802 -0.2722 0.000 1.000 0.000
+v -1.2980 -2.4156 -0.1682 0.000 1.000 0.000
+v -1.3405 -2.3207 -0.0000 0.000 1.000 0.000
+v -1.4439 -2.3317 0.1682 0.000 1.000 0.000
+v -1.5687 -2.4445 0.2722 0.000 1.000 0.000
+v -1.6673 -2.6160 0.2722 0.000 1.000 0.000
+v -1.7020 -2.7806 0.1682 0.000 1.000 0.000
+v -1.2034 -3.0690 0.2079 0.000 1.000 0.063
+v -1.1071 -3.0329 0.0390 0.000 1.000 0.063
+v -1.0140 -2.8931 -0.0654 0.000 1.000 0.063
+v -0.9598 -2.7029 -0.0654 0.000 1.000 0.063
+v -0.9650 -2.5350 0.0390 0.000 1.000 0.063
+v -1.0278 -2.4536 0.2079 0.000 1.000 0.063
+v -1.1242 -2.4896 0.3768 0.000 1.000 0.063
+v -1.2172 -2.6295 0.4812 0.000 1.000 0.063
+v -1.2715 -2.8197 0.4812 0.000 1.000 0.063
+v -1.2662 -2.9875 0.3768 0.000 1.000 0.063
+v -0.7164 -3.1468 0.4067 0.000 1.000 0.129
+v -0.6357 -3.0886 0.2359 0.000 1.000 0.129
+v -0.5813 -2.9304 0.1303 0.000 1.000 0.129
+v -0.5742 -2.7328 0.1303 0.000 1.000 0.129
+v -0.6169 -2.5711 0.2359 0.000 1.000 0.129
+v -0.6933 -2.5072 0.4067 0.000 1.000 0.129
+v -0.7740 -2.5654 0.5776 0.000 1.000 0.129
+v -0.8284 -2.7236 0.6832 0.000 1.000 0.129
+v -0.8355 -2.9212 0.6832 0.000 1.000 0.129
+v -0.7928 -3.0829 0.5776 0.000 1.000 0.129
+v -0.2297 -3.1072 0.5878 0.000 1.000 0.196
+v -0.1717 -3.0330 0.4139 0.000 1.000 0.196
+v -0.1603 -2.8674 0.3064 0.000 1.000 0.196
+v -0.1998 -2.6736 0.3064 0.000 1.000 0.196
+v -0.2752 -2.5257 0.4139 0.000 1.000 0.196
+v -0.3575 -2.4801 0.5878 0.000 1.000 0.196
+v -0.4155 -2.5543 0.7617 0.000 1.000 0.196
+v -0.4269 -2.7199 0.8692 0.000 1.000 0.196
+v -0.3874 -2.9137 0.8692 0.000 1.000 0.196
+v -0.3121 -3.0616 0.7617 0.000 1.000 0.196
+v 0.2272 -2.9581 0.7431 0.000 1.000 0.263
+v 0.2575 -2.8768 0.5654 0.000 1.000 0.263
+v 0.2250 -2.7156 0.4556 0.000 1.000 0.263
+v 0.1422 -2.5360 0.4556 0.000 1.000 0.263
+v 0.0406 -2.4066 0.5654 0.000 1.000 0.263
+v -0.0409 -2.3769 0.7431 0.000 1.000 0.263
+v -0.0712 -2.4582 0.9209 0.000 1.000 0.263
+v -0.0387 -2.6194 1.0307 0.000 1.000 0.263
+v 0.0441 -2.7990 1.0307 0.000 1.000 0.263
+v 0.1457 -2.9284 0.9209 0.000 1.000 0.263
+v 0.6291 -2.7157 0.8660 0.000 1.000 0.333
+v 0.6302 -2.6379 0.6842 0.000 1.000 0.333
+v 0.5563 -2.4928 0.5719 0.000 1.000 0.333
+v 0.4358 -2.3360 0.5719 0.000 1.000 0.333
+v 0.3146 -2.2273 0.6842 0.000 1.000 0.333
+v 0.2391 -2.2083 0.8660 0.000 1.000 0.333
+v 0.2381 -2.2862 1.0478 0.000 1.000 0.333
+v 0.3119 -2.4312 1.1602 0.000 1.000 0.333
+v 0.4324 -2.5880 1.1602 0.000 1.000 0.333
+v 0.5536 -2.6967 1.0478 0.000 1.000 0.333
+v 0.9579 -2.4026 0.9511 0.000 1.000 0.400
+v 0.9316 -2.3390 0.7656 0.000 1.000 0.400
+v 0.8220 -2.2209 0.6510 0.000 1.000 0.400
+v 0.6709 -2.0932 0.6510 0.000 1.000 0.400
+v 0.5362 -2.0048 0.7656 0.000 1.000 0.400
+v 0.4691 -1.9894 0.9511 0.000 1.000 0.400
+v 0.4955 -2.0530 1.1365 0.000 1.000 0.400
+v 0.6051 -2.1711 1.2511 0.000 1.000 0.400
+v 0.7561 -2.2988 1.2511 0.000 1.000 0.400
+v 0.8909 -2.3872 1.1365 0.000 1.000 0.400
+v 1.2035 -2.0447 0.9945 0.000 1.000 0.467
+v 1.1553 -2.0055 0.8068 0.000 1.000 0.467
+v 1.0181 -1.9229 0.6907 0.000 1.000 0.467
+v 0.8444 -1.8282 0.6907 0.000 1.000 0.467
+v 0.7006 -1.7578 0.8068 0.000 1.000 0.467
+v 0.6416 -1.7384 0.9945 0.000 1.000 0.467
+v 0.6899 -1.7775 1.1823 0.000 1.000 0.467
+v 0.8270 -1.8602 1.2983 0.000 1.000 0.467
+v 1.0007 -1.9548 1.2983 0.000 1.000 0.467
+v 1.1445 -2.0253 1.1823 0.000 1.000 0.467
+v 1.3647 -1.6688 0.9945 0.000 1.000 0.529
+v 1.3028 -1.6620 0.8068 0.000 1.000 0.529
+v 1.1480 -1.6206 0.6908 0.000 1.000 0.529
+v 0.9596 -1.5604 0.6908 0.000 1.000 0.529
+v 0.8096 -1.5044 0.8068 0.000 1.000 0.529
+v 0.7551 -1.4740 0.9945 0.000 1.000 0.529
+v 0.8171 -1.4808 1.1822 0.000 1.000 0.529
+v 0.9718 -1.5222 1.2982 0.000 1.000 0.529
+v 1.1602 -1.5824 1.2982 0.000 1.000 0.529
+v 1.3103 -1.6384 1.1822 0.000 1.000 0.529
+v 1.4485 -1.3000 0.9511 0.000 1.000 0.600
+v 1.3827 -1.3301 0.7670 0.000 1.000 0.600
+v 1.2210 -1.3322 0.6533 0.000 1.000 0.600
+v 1.0250 -1.3054 0.6533 0.000 1.000 0.600
+v 0.8697 -1.2600 0.7670 0.000 1.000 0.600
+v 0.8144 -1.2133 0.9511 0.000 1.000 0.600
+v 0.8802 -1.1832 1.1351 0.000 1.000 0.600
+v 1.0420 -1.1811 1.2489 0.000 1.000 0.600
+v 1.2380 -1.2079 1.2489 0.000 1.000 0.600
+v 1.3932 -1.2533 1.1351 0.000 1.000 0.600
+v 1.4690 -0.9589 0.8660 0.000 1.000 0.663
+v 1.4090 -1.0266 0.6902 0.000 1.000 0.663
+v 1.2497 -1.0705 0.5815 0.000 1.000 0.663
+v 1.0520 -1.0737 0.5815 0.000 1.000 0.663
+v 0.8913 -1.0352 0.6902 0.000 1.000 0.663
+v 0.8291 -0.9695 0.8660 0.000 1.000 0.663
+v 0.8891 -0.9018 1.0419 0.000 1.000 0.663
+v 1.0484 -0.8579 1.1506 0.000 1.000 0.663
+v 1.2461 -0.8546 1.1506 0.000 1.000 0.663
+v 1.4068 -0.8932 1.0419 0.000 1.000 0.663
+v 1.4455 -0.6608 0.7431 0.000 1.000 0.733
+v 1.3981 -0.7627 0.5804 0.000 1.000 0.733
+v 1.2478 -0.8427 0.4799 0.000 1.000 0.733
+v 1.0519 -0.8702 0.4799 0.000 1.000 0.733
+v 0.8854 -0.8347 0.5804 0.000 1.000 0.733
+v 0.8117 -0.7497 0.7431 0.000 1.000 0.733
+v 0.8592 -0.6478 0.9059 0.000 1.000 0.733
+v 1.0095 -0.5678 1.0064 0.000 1.000 0.733
+v 1.2053 -0.5403 1.0064 0.000 1.000 0.733
+v 1.3719 -0.5758 0.9059 0.000 1.000 0.733
+v 1.4004 -0.4150 0.5878 0.000 1.000 0.796
+v 1.3666 -0.5447 0.4424 0.000 1.000 0.796
+v 1.2264 -0.6514 0.3525 0.000 1.000 0.796
+v 1.0334 -0.6944 0.3525 0.000 1.000 0.796
+v 0.8612 -0.6571 0.4424 0.000 1.000 0.796
+v 0.7756 -0.5539 0.5878 0.000 1.000 0.796
+v 0.8094 -0.4241 0.7332 0.000 1.000 0.796
+v 0.9496 -0.3174 0.8230 0.000 1.000 0.796
+v 1.1426 -0.2745 0.8230 0.000 1.000 0.796
+v 1.3148 -0.3117 0.7332 0.000 1.000 0.796
+v 1.3558 -0.2258 0.4067 0.000 1.000 0.867
+v 1.3284 -0.3754 0.2803 0.000 1.000 0.867
+v 1.1925 -0.4960 0.2022 0.000 1.000 0.867
+v 1.0000 -0.5415 0.2022 0.000 1.000 0.867
+v 0.8245 -0.4946 0.2803 0.000 1.000 0.867
+v 0.7330 -0.3731 0.4067 0.000 1.000 0.867
+v 0.7604 -0.2235 0.5331 0.000 1.000 0.867
+v 0.8963 -0.1029 0.6113 0.000 1.000 0.867
+v 1.0887 -0.0574 0.6113 0.000 1.000 0.867
+v 1.2643 -0.1043 0.5331 0.000 1.000 0.867
+v 1.3280 -0.0926 0.2079 0.000 1.000 0.929
+v 1.2913 -0.2523 0.0973 0.000 1.000 0.929
+v 1.1478 -0.3700 0.0289 0.000 1.000 0.929
+v 0.9524 -0.4007 0.0289 0.000 1.000 0.929
+v 0.7797 -0.3326 0.0973 0.000 1.000 0.929
+v 0.6958 -0.1918 0.2079 0.000 1.000 0.929
+v 0.7326 -0.0321 0.3185 0.000 1.000 0.929
+v 0.8761 0.0856 0.3869 0.000 1.000 0.929
+v 1.0714 0.1163 0.3869 0.000 1.000 0.929
+v 1.2441 0.0482 0.3185 0.000 1.000 0.929
+v 1.3200 -0.0004 0.0000 0.000 1.000 1.000
+v 1.2587 -0.1568 -0.1043 0.000 1.000 1.000
+v 1.0986 -0.2533 -0.1688 0.000 1.000 1.000
+v 0.9008 -0.2531 -0.1688 0.000 1.000 1.000
+v 0.7409 -0.1562 -0.1043 0.000 1.000 1.000
+v 0.6800 0.0004 0.0000 0.000 1.000 1.000
+v 0.7413 0.1568 0.1043 0.000 1.000 1.000
+v 0.9014 0.2533 0.1688 0.000 1.000 1.000
+v 1.0992 0.2531 0.1688 0.000 1.000 1.000
+v 1.2591 0.1562 0.1043 0.000 1.000 1.000
+v 1.3279 0.0920 -0.2079 0.000 0.933 1.000
+v 1.2438 -0.0485 -0.3187 0.000 0.933 1.000
+v 1.0710 -0.1162 -0.3872 0.000 0.933 1.000
+v 0.8757 -0.0852 -0.3872 0.000 0.933 1.000
+v 0.7324 0.0327 -0.3187 0.000 0.933 1.000
+v 0.6959 0.1924 -0.2079 0.000 0.933 1.000
+v 0.7801 0.3329 -0.0971 0.000 0.933 1.000
+v 0.9528 0.4006 -0.0286 0.000 0.933 1.000
+v 1.1481 0.3696 -0.0286 0.000 0.933 1.000
+v 1.2914 0.2517 -0.0971 0.000 0.933 1.000
+v 1.3557 0.2257 -0.4067 0.000 0.863 1.000
+v 1.2642 0.1045 -0.5334 0.000 0.863 1.000
+v 1.0887 0.0578 -0.6117 0.000 0.863 1.000
+v 0.8963 0.1033 -0.6117 0.000 0.863 1.000
+v 0.7604 0.2238 -0.5334 0.000 0.863 1.000
+v 0.7330 0.3732 -0.4067 0.000 0.863 1.000
+v 0.8245 0.4944 -0.2801 0.000 0.863 1.000
+v 1.0000 0.5412 -0.2018 0.000 0.863 1.000
+v 1.1925 0.4956 -0.2018 0.000 0.863 1.000
+v 1.3283 0.3751 -0.2801 0.000 0.863 1.000
+v 1.4004 0.4152 -0.5878 0.000 0.796 1.000
+v 1.3150 0.3122 -0.7334 0.000 0.796 1.000
+v 1.1429 0.2750 -0.8235 0.000 0.796 1.000
+v 0.9498 0.3178 -0.8235 0.000 0.796 1.000
+v 0.8095 0.4242 -0.7334 0.000 0.796 1.000
+v 0.7756 0.5536 -0.5878 0.000 0.796 1.000
+v 0.8610 0.6566 -0.4421 0.000 0.796 1.000
+v 1.0331 0.6938 -0.3521 0.000 0.796 1.000
+v 1.2262 0.6510 -0.3521 0.000 0.796 1.000
+v 1.3665 0.5446 -0.4421 0.000 0.796 1.000
+v 1.4456 0.6612 -0.7431 0.000 0.733 1.000
+v 1.3721 0.5766 -0.9061 0.000 0.733 1.000
+v 1.2057 0.5411 -1.0068 0.000 0.733 1.000
+v 1.0098 0.5683 -1.0068 0.000 0.733 1.000
+v 0.8593 0.6478 -0.9061 0.000 0.733 1.000
+v 0.8117 0.7493 -0.7431 0.000 0.733 1.000
+v 0.8851 0.8339 -0.5802 0.000 0.733 1.000
+v 1.0516 0.8694 -0.4795 0.000 0.733 1.000
+v 1.2475 0.8422 -0.4795 0.000 0.733 1.000
+v 1.3980 0.7627 -0.5802 0.000 0.733 1.000
+v 1.4690 0.9595 -0.8660 0.000 0.663 1.000
+v 1.4070 0.8941 -1.0420 0.000 0.663 1.000
+v 1.2464 0.8555 -1.1508 0.000 0.663 1.000
+v 1.0486 0.8584 -1.1508 0.000 0.663 1.000
+v 0.8892 0.9017 -1.0420 0.000 0.663 1.000
+v 0.8291 0.9689 -0.8660 0.000 0.663 1.000
+v 0.8912 1.0343 -0.6900 0.000 0.663 1.000
+v 1.0518 1.0729 -0.5812 0.000 0.663 1.000
+v 1.2495 1.0700 -0.5812 0.000 0.663 1.000
+v 1.4089 1.0267 -0.6900 0.000 0.663 1.000
+v 1.4484 1.3007 -0.9511 0.000 0.600 1.000
+v 1.3932 1.2543 -1.1352 0.000 0.600 1.000
+v 1.2380 1.2088 -1.2490 0.000 0.600 1.000
+v 1.0421 1.1815 -1.2490 0.000 0.600 1.000
+v 0.8804 1.1830 -1.1352 0.000 0.600 1.000
+v 0.8145 1.2126 -0.9511 0.000 0.600 1.000
+v 0.8698 1.2590 -0.7669 0.000 0.600 1.000
+v 1.0250 1.3045 -0.6531 0.000 0.600 1.000
+v 1.2209 1.3318 -0.6531 0.000 0.600 1.000
+v 1.3826 1.3303 -0.7669 0.000 0.600 1.000
+v 1.3645 1.6696 -0.9945 0.000 0.533 1.000
+v 1.3100 1.6394 -1.1822 0.000 0.533 1.000
+v 1.1600 1.5833 -1.2982 0.000 0.533 1.000
+v 0.9718 1.5226 -1.2982 0.000 0.533 1.000
+v 0.8172 1.4805 -1.1822 0.000 0.533 1.000
+v 0.7554 1.4732 -0.9945 0.000 0.533 1.000
+v 0.8099 1.5034 -0.8068 0.000 0.533 1.000
+v 0.9599 1.5596 -0.6908 0.000 0.533 1.000
+v 1.1481 1.6203 -0.6908 0.000 0.533 1.000
+v 1.3026 1.6623 -0.8068 0.000 0.533 1.000
+v 1.2031 2.0455 -0.9945 0.000 0.467 1.000
+v 1.1440 2.0262 -1.1823 0.000 0.467 1.000
+v 1.0003 1.9555 -1.2983 0.000 0.467 1.000
+v 0.8269 1.8604 -1.2983 0.000 0.467 1.000
+v 0.6900 1.7772 -1.1823 0.000 0.467 1.000
+v 0.6420 1.7376 -0.9945 0.000 0.467 1.000
+v 0.7012 1.7569 -0.8068 0.000 0.467 1.000
+v 0.8449 1.8276 -0.6908 0.000 0.467 1.000
+v 1.0183 1.9227 -0.6908 0.000 0.467 1.000
+v 1.1551 2.0059 -0.8068 0.000 0.467 1.000
+v 0.9573 2.4033 -0.9511 0.000 0.400 1.000
+v 0.8901 2.3879 -1.1364 0.000 0.400 1.000
+v 0.7555 2.2993 -1.2510 0.000 0.400 1.000
+v 0.6049 2.1711 -1.2510 0.000 0.400 1.000
+v 0.4957 2.0525 -1.1364 0.000 0.400 1.000
+v 0.4697 1.9887 -0.9511 0.000 0.400 1.000
+v 0.5369 2.0041 -0.7657 0.000 0.400 1.000
+v 0.6715 2.0928 -0.6511 0.000 0.400 1.000
+v 0.8222 2.2209 -0.6511 0.000 0.400 1.000
+v 0.9313 2.3395 -0.7657 0.000 0.400 1.000
+v 0.6283 2.7163 -0.8660 0.000 0.329 1.000
+v 0.5527 2.6972 -1.0478 0.000 0.329 1.000
+v 0.4318 2.5882 -1.1601 0.000 0.329 1.000
+v 0.3117 2.4311 -1.1601 0.000 0.329 1.000
+v 0.2385 2.2857 -1.0478 0.000 0.329 1.000
+v 0.2399 2.2077 -0.8660 0.000 0.329 1.000
+v 0.3155 2.2268 -0.6843 0.000 0.329 1.000
+v 0.4365 2.3358 -0.5720 0.000 0.329 1.000
+v 0.5565 2.4930 -0.5720 0.000 0.329 1.000
+v 0.6298 2.6383 -0.6843 0.000 0.329 1.000
+v 0.2262 2.9585 -0.7431 0.000 0.263 1.000
+v 0.1447 2.9286 -0.9208 0.000 0.263 1.000
+v 0.0434 2.7990 -1.0306 0.000 0.263 1.000
+v -0.0388 2.6191 -1.0306 0.000 0.263 1.000
+v -0.0707 2.4577 -0.9208 0.000 0.263 1.000
+v -0.0399 2.3765 -0.7431 0.000 0.263 1.000
+v 0.0416 2.4064 -0.5655 0.000 0.263 1.000
+v 0.1429 2.5360 -0.4557 0.000 0.263 1.000
+v 0.2251 2.7159 -0.4557 0.000 0.263 1.000
+v 0.2570 2.8773 -0.5655 0.000 0.263 1.000
+v -0.2308 3.1074 -0.5878 0.000 0.200 1.000
+v -0.3131 3.0616 -0.7617 0.000 0.200 1.000
+v -0.3880 2.9134 -0.8691 0.000 0.200 1.000
+v -0.4269 2.7195 -0.8691 0.000 0.200 1.000
+v -0.4148 2.5539 -0.7617 0.000 0.200 1.000
+v -0.3565 2.4799 -0.5878 0.000 0.200 1.000
+v -0.2741 2.5257 -0.4139 0.000 0.200 1.000
+v -0.1992 2.6739 -0.3065 0.000 0.200 1.000
+v -0.1604 2.8678 -0.3065 0.000 0.200 1.000
+v -0.1724 3.0334 -0.4139 0.000 0.200 1.000
+v -0.7175 3.1467 -0.4067 0.000 0.129 1.000
+v -0.7937 3.0826 -0.5776 0.000 0.129 1.000
+v -0.8360 2.9208 -0.6832 0.000 0.129 1.000
+v -0.8282 2.7231 -0.6832 0.000 0.129 1.000
+v -0.7732 2.5652 -0.5776 0.000 0.129 1.000
+v -0.6922 2.5073 -0.4067 0.000 0.129 1.000
+v -0.6160 2.5714 -0.2359 0.000 0.129 1.000
+v -0.5737 2.7332 -0.1303 0.000 0.129 1.000
+v -0.5815 2.9309 -0.1303 0.000 0.129 1.000
+v -0.6365 3.0888 -0.2359 0.000 0.129 1.000
+v -1.2045 3.0687 -0.2079 0.000 0.063 1.000
+v -1.2670 2.9870 -0.3768 0.000 0.063 1.000
+v -1.2718 2.8191 -0.4812 0.000 0.063 1.000
+v -1.2168 2.6291 -0.4812 0.000 0.063 1.000
+v -1.1233 2.4896 -0.3768 0.000 0.063 1.000
+v -1.0268 2.4539 -0.2079 0.000 0.063 1.000
+v -0.9642 2.5356 -0.0390 0.000 0.063 1.000
+v -0.9595 2.7035 0.0654 0.000 0.063 1.000
+v -1.0144 2.8935 0.0654 0.000 0.063 1.000
+v -1.1080 3.0330 -0.0390 0.000 0.063 1.000
+v -1.6605 2.8749 -0.0000 0.000 0.000 1.000
+v -1.7026 2.7799 -0.1682 0.000 0.000 1.000
+v -1.6673 2.6154 -0.2722 0.000 0.000 1.000
+v -1.5682 2.4443 -0.2722 0.000 0.000 1.000
+v -1.4429 2.3319 -0.1682 0.000 0.000 1.000
+v -1.3395 2.3212 -0.0000 0.000 0.000 1.000
+v -1.2974 2.4163 0.1682 0.000 0.000 1.000
+v -1.3327 2.5808 0.2722 0.000 0.000 1.000
+v -1.4318 2.7519 0.2722 0.000 0.000 1.000
+v -1.5571 2.8642 0.1682 0.000 0.000 1.000
+v -2.0561 2.5767 0.2079 0.063 0.000 1.000
+v -2.0731 2.4752 0.0390 0.063 0.000 1.000
+v -1.9985 2.3247 -0.0654 0.063 0.000 1.000
+v -1.8609 2.1826 -0.0654 0.063 0.000 1.000
+v -1.7129 2.1033 0.0390 0.063 0.000 1.000
+v -1.6109 2.1169 0.2079 0.063 0.000 1.000
+v -1.5940 2.2184 0.3768 0.063 0.000 1.000
+v -1.6686 2.3689 0.4812 0.063 0.000 1.000
+v -1.8061 2.5110 0.4812 0.063 0.000 1.000
+v -1.9542 2.5904 0.3768 0.063 0.000 1.000
+v -2.3670 2.1938 0.4067 0.129 0.000 1.000
+v -2.3569 2.0948 0.2359 0.129 0.000 1.000
+v -2.2472 1.9686 0.1303 0.129 0.000 1.000
+v -2.0796 1.8636 0.1303 0.129 0.000 1.000
+v -1.9182 1.8198 0.2359 0.129 0.000 1.000
+v -1.8247 1.8540 0.4067 0.129 0.000 1.000
+v -1.8347 1.9531 0.5776 0.129 0.000 1.000
+v -1.9445 2.0792 0.6832 0.129 0.000 1.000
+v -2.1121 2.1842 0.6832 0.129 0.000 1.000
+v -2.2735 2.2280 0.5776 0.129 0.000 1.000
+v -2.5760 1.7525 0.5878 0.196 0.000 1.000
+v -2.5408 1.6652 0.4139 0.196 0.000 1.000
+v -2.4031 1.5725 0.3064 0.196 0.000 1.000
+v -2.2155 1.5099 0.3064 0.196 0.000 1.000
+v -2.0497 1.5011 0.4139 0.196 0.000 1.000
+v -1.9690 1.5497 0.5878 0.196 0.000 1.000
+v -2.0043 1.6370 0.7617 0.196 0.000 1.000
+v -2.1420 1.7297 0.8692 0.196 0.000 1.000
+v -2.3296 1.7923 0.8692 0.196 0.000 1.000
+v -2.4954 1.8011 0.7617 0.196 0.000 1.000
+v -2.6754 1.2823 0.7431 0.263 0.000 1.000
+v -2.6201 1.2154 0.5654 0.263 0.000 1.000
+v -2.4643 1.1629 0.4556 0.263 0.000 1.000
+v -2.2673 1.1448 0.4556 0.263 0.000 1.000
+v -2.1045 1.1681 0.5654 0.263 0.000 1.000
+v -2.0380 1.2239 0.7431 0.263 0.000 1.000
+v -2.0933 1.2908 0.9209 0.263 0.000 1.000
+v -2.2491 1.3433 1.0307 0.263 0.000 1.000
+v -2.4461 1.3613 1.0307 0.263 0.000 1.000
+v -2.6089 1.3380 0.9209 0.263 0.000 1.000
+v -2.6665 0.8130 0.8660 0.329 0.000 1.000
+v -2.5995 0.7732 0.6842 0.329 0.000 1.000
+v -2.4370 0.7646 0.5719 0.329 0.000 1.000
+v -2.2409 0.7906 0.5719 0.329 0.000 1.000
+v -2.0862 0.8412 0.6842 0.329 0.000 1.000
+v -2.0320 0.8971 0.8660 0.329 0.000 1.000
+v -2.0989 0.9369 1.0478 0.329 0.000 1.000
+v -2.2615 0.9455 1.1602 0.329 0.000 1.000
+v -2.4575 0.9195 1.1602 0.329 0.000 1.000
+v -2.6122 0.8689 1.0478 0.329 0.000 1.000
+v -2.5597 0.3717 0.9511 0.396 0.000 1.000
+v -2.4915 0.3627 0.7656 0.396 0.000 1.000
+v -2.3343 0.3986 0.6510 0.396 0.000 1.000
+v -2.1482 0.4656 0.6510 0.396 0.000 1.000
+v -2.0043 0.5381 0.7656 0.396 0.000 1.000
+v -1.9575 0.5884 0.9511 0.396 0.000 1.000
+v -2.0256 0.5974 1.1365 0.396 0.000 1.000
+v -2.1828 0.5616 1.2511 0.396 0.000 1.000
+v -2.3689 0.4946 1.2511 0.396 0.000 1.000
+v -2.5128 0.4221 1.1365 0.396 0.000 1.000
+v -2.3725 -0.0200 0.9945 0.467 0.000 1.000
+v -2.3145 0.0023 0.8068 0.467 0.000 1.000
+v -2.1743 0.0797 0.6907 0.467 0.000 1.000
+v -2.0055 0.1828 0.6907 0.467 0.000 1.000
+v -1.8726 0.2721 0.8068 0.467 0.000 1.000
+v -1.8263 0.3136 0.9945 0.467 0.000 1.000
+v -1.8843 0.2913 1.1823 0.467 0.000 1.000
+v -2.0245 0.2139 1.2983 0.467 0.000 1.000
+v -2.1933 0.1108 1.2983 0.467 0.000 1.000
+v -2.3262 0.0215 1.1823 0.467 0.000 1.000
+v -2.1276 -0.3475 0.9945 0.529 0.000 1.000
+v -2.0907 -0.2972 0.8068 0.529 0.000 1.000
+v -1.9775 -0.1839 0.6908 0.529 0.000 1.000
+v -1.8312 -0.0509 0.6908 0.529 0.000 1.000
+v -1.7076 0.0511 0.8068 0.529 0.000 1.000
+v -1.6541 0.0831 0.9945 0.529 0.000 1.000
+v -1.6910 0.0328 1.1822 0.529 0.000 1.000
+v -1.8042 -0.0805 1.2982 0.529 0.000 1.000
+v -1.9505 -0.2136 1.2982 0.529 0.000 1.000
+v -2.0741 -0.3155 1.1822 0.529 0.000 1.000
+v -1.8501 -0.6045 0.9511 0.600 0.000 1.000
+v -1.8433 -0.5324 0.7670 0.600 0.000 1.000
+v -1.7642 -0.3913 0.6533 0.600 0.000 1.000
+v -1.6430 -0.2350 0.6533 0.600 0.000 1.000
+v -1.5261 -0.1232 0.7670 0.600 0.000 1.000
+v -1.4580 -0.0987 0.9511 0.600 0.000 1.000
+v -1.4648 -0.1707 1.1351 0.600 0.000 1.000
+v -1.5439 -0.3118 1.2489 0.600 0.000 1.000
+v -1.6650 -0.4682 1.2489 0.600 0.000 1.000
+v -1.7820 -0.5799 1.1351 0.600 0.000 1.000
+v -1.5649 -0.7928 0.8660 0.667 0.000 1.000
+v -1.5936 -0.7070 0.6902 0.667 0.000 1.000
+v -1.5519 -0.5471 0.5815 0.667 0.000 1.000
+v -1.4559 -0.3742 0.5815 0.667 0.000 1.000
+v -1.3421 -0.2543 0.6902 0.667 0.000 1.000
+v -1.2542 -0.2333 0.8660 0.667 0.000 1.000
+v -1.2255 -0.3191 1.0419 0.667 0.000 1.000
+v -1.2672 -0.4790 1.1506 0.667 0.000 1.000
+v -1.3632 -0.6519 1.1506 0.667 0.000 1.000
+v -1.4769 -0.7717 1.0419 0.667 0.000 1.000
+v -1.2950 -0.9215 0.7431 0.733 0.000 1.000
+v -1.3596 -0.8295 0.5804 0.733 0.000 1.000
+v -1.3537 -0.6593 0.4799 0.733 0.000 1.000
+v -1.2795 -0.4759 0.4799 0.733 0.000 1.000
+v -1.1655 -0.3494 0.5804 0.733 0.000 1.000
+v -1.0552 -0.3281 0.7431 0.733 0.000 1.000
+v -0.9906 -0.4201 0.9059 0.733 0.000 1.000
+v -0.9965 -0.5903 1.0064 0.733 0.000 1.000
+v -1.0706 -0.7737 1.0064 0.733 0.000 1.000
+v -1.1846 -0.9002 0.9059 0.733 0.000 1.000
+v -1.0596 -1.0053 0.5878 0.800 0.000 1.000
+v -1.1551 -0.9112 0.4424 0.800 0.000 1.000
+v -1.1774 -0.7364 0.3525 0.800 0.000 1.000
+v -1.1180 -0.5478 0.3525 0.800 0.000 1.000
+v -0.9997 -0.4173 0.4424 0.800 0.000 1.000
+v -0.8675 -0.3948 0.5878 0.800 0.000 1.000
+v -0.7720 -0.4889 0.7332 0.800 0.000 1.000
+v -0.7497 -0.6637 0.8230 0.800 0.000 1.000
+v -0.8090 -0.8523 0.8230 0.800 0.000 1.000
+v -0.9274 -0.9828 0.7332 0.800 0.000 1.000
+v -0.8735 -1.0612 0.4067 0.867 0.000 1.000
+v -0.9893 -0.9627 0.2803 0.867 0.000 1.000
+v -1.0258 -0.7847 0.2022 0.867 0.000 1.000
+v -0.9690 -0.5953 0.2022 0.867 0.000 1.000
+v -0.8406 -0.4667 0.2803 0.867 0.000 1.000
+v -0.6896 -0.4482 0.4067 0.867 0.000 1.000
+v -0.5737 -0.5468 0.5331 0.867 0.000 1.000
+v -0.5373 -0.7247 0.6113 0.867 0.000 1.000
+v -0.5941 -0.9142 0.6113 0.867 0.000 1.000
+v -0.7225 -1.0427 0.5331 0.867 0.000 1.000
+v -0.7442 -1.1038 0.2079 0.933 0.000 1.000
+v -0.8642 -0.9921 0.0973 0.933 0.000 1.000
+v -0.8943 -0.8090 0.0289 0.933 0.000 1.000
+v -0.8232 -0.6244 0.0289 0.933 0.000 1.000
+v -0.6779 -0.5090 0.0973 0.933 0.000 1.000
+v -0.5140 -0.5066 0.2079 0.933 0.000 1.000
+v -0.3941 -0.6184 0.3185 0.933 0.000 1.000
+v -0.3639 -0.8015 0.3869 0.933 0.000 1.000
+v -0.4350 -0.9860 0.3869 0.933 0.000 1.000
+v -0.5803 -1.1015 0.3185 0.933 0.000 1.000
+v -0.6603 -1.1430 0.0000 1.000 0.000 1.000
+v -0.7652 -1.0116 -0.1043 1.000 0.000 1.000
+v -0.7687 -0.8247 -0.1688 1.000 0.000 1.000
+v -0.6696 -0.6536 -0.1688 1.000 0.000 1.000
+v -0.5057 -0.5636 -0.1043 1.000 0.000 1.000
+v -0.3397 -0.5891 0.0000 1.000 0.000 1.000
+v -0.2348 -0.7204 0.1043 1.000 0.000 1.000
+v -0.2313 -0.9073 0.1688 1.000 0.000 1.000
+v -0.3304 -1.0785 0.1688 1.000 0.000 1.000
+v -0.4943 -1.1685 0.1043 1.000 0.000 1.000
+v -0.5843 -1.1961 -0.2079 1.000 0.000 0.933
+v -0.6639 -1.0529 -0.3187 1.000 0.000 0.933
+v -0.6361 -0.8694 -0.3872 1.000 0.000 0.933
+v -0.5116 -0.7158 -0.3872 1.000 0.000 0.933
+v -0.3379 -0.6506 -0.3187 1.000 0.000 0.933
+v -0.1813 -0.6988 -0.2079 1.000 0.000 0.933
+v -0.1017 -0.8420 -0.0971 1.000 0.000 0.933
+v -0.1295 -1.0255 -0.0286 1.000 0.000 0.933
+v -0.2540 -1.1791 -0.0286 1.000 0.000 0.933
+v -0.4277 -1.2443 -0.0971 1.000 0.000 0.933
+v -0.4824 -1.2870 -0.4067 1.000 0.000 0.867
+v -0.5416 -1.1471 -0.5334 1.000 0.000 0.867
+v -0.4943 -0.9717 -0.6117 1.000 0.000 0.867
+v -0.3586 -0.8279 -0.6117 1.000 0.000 0.867
+v -0.1863 -0.7705 -0.5334 1.000 0.000 0.867
+v -0.0433 -0.8214 -0.4067 1.000 0.000 0.867
+v 0.0159 -0.9613 -0.2801 1.000 0.000 0.867
+v -0.0313 -1.1366 -0.2018 1.000 0.000 0.867
+v -0.1670 -1.2805 -0.2018 1.000 0.000 0.867
+v -0.3393 -1.3379 -0.2801 1.000 0.000 0.867
+v -0.3406 -1.4204 -0.5878 1.000 0.000 0.796
+v -0.3871 -1.2950 -0.7334 1.000 0.000 0.796
+v -0.3333 -1.1273 -0.8235 1.000 0.000 0.796
+v -0.1997 -0.9815 -0.8235 1.000 0.000 0.796
+v -0.0374 -0.9132 -0.7334 1.000 0.000 0.796
+v 0.0917 -0.9485 -0.5878 1.000 0.000 0.796
+v 0.1381 -1.0739 -0.4421 1.000 0.000 0.796
+v 0.0843 -1.2416 -0.3521 1.000 0.000 0.796
+v -0.0493 -1.3874 -0.3521 1.000 0.000 0.796
+v -0.2116 -1.4557 -0.4421 1.000 0.000 0.796
+v -0.1502 -1.5825 -0.7431 1.000 0.000 0.733
+v -0.1867 -1.4766 -0.9061 1.000 0.000 0.733
+v -0.1343 -1.3147 -1.0068 1.000 0.000 0.733
+v -0.0127 -1.1586 -1.0068 1.000 0.000 0.733
+v 0.1314 -1.0681 -0.9061 1.000 0.000 0.733
+v 0.2430 -1.0776 -0.7431 1.000 0.000 0.733
+v 0.2796 -1.1835 -0.5802 1.000 0.000 0.733
+v 0.2271 -1.3454 -0.4795 1.000 0.000 0.733
+v 0.1056 -1.5015 -0.4795 1.000 0.000 0.733
+v -0.0385 -1.5920 -0.5802 1.000 0.000 0.733
+v 0.0964 -1.7520 -0.8660 1.000 0.000 0.667
+v 0.0708 -1.6655 -1.0420 1.000 0.000 0.667
+v 0.1177 -1.5071 -1.1508 1.000 0.000 0.667
+v 0.2191 -1.3373 -1.1508 1.000 0.000 0.667
+v 0.3362 -1.2209 -1.0420 1.000 0.000 0.667
+v 0.4245 -1.2024 -0.8660 1.000 0.000 0.667
+v 0.4501 -1.2889 -0.6900 1.000 0.000 0.667
+v 0.4033 -1.4473 -0.5812 1.000 0.000 0.667
+v 0.3019 -1.6171 -0.5812 1.000 0.000 0.667
+v 0.1847 -1.7335 -0.6900 1.000 0.000 0.667
+v 0.4022 -1.9047 -0.9511 1.000 0.000 0.596
+v 0.3896 -1.8337 -1.1352 1.000 0.000 0.596
+v 0.4278 -1.6765 -1.2490 1.000 0.000 0.596
+v 0.5022 -1.4932 -1.2490 1.000 0.000 0.596
+v 0.5843 -1.3539 -1.1352 1.000 0.000 0.596
+v 0.6429 -1.3117 -0.9511 1.000 0.000 0.596
+v 0.6554 -1.3828 -0.7669 1.000 0.000 0.596
+v 0.6173 -1.5399 -0.6531 1.000 0.000 0.596
+v 0.5429 -1.7232 -0.6531 1.000 0.000 0.596
+v 0.4608 -1.8625 -0.7669 1.000 0.000 0.596
+v 0.7637 -2.0165 -0.9945 1.000 0.000 0.529
+v 0.7648 -1.9542 -1.1822 1.000 0.000 0.529
+v 0.7911 -1.7962 -1.2982 1.000 0.000 0.529
+v 0.8327 -1.6029 -1.2982 1.000 0.000 0.529
+v 0.8736 -1.4480 -1.1822 1.000 0.000 0.529
+v 0.8982 -1.3908 -0.9945 1.000 0.000 0.529
+v 0.8971 -1.4531 -0.8068 1.000 0.000 0.529
+v 0.8707 -1.6110 -0.6908 1.000 0.000 0.529
+v 0.8292 -1.8044 -0.6908 1.000 0.000 0.529
+v 0.7883 -1.9593 -0.8068 1.000 0.000 0.529
+v 1.1699 -2.0647 -0.9945 1.000 0.000 0.467
+v 1.1828 -2.0038 -1.1823 1.000 0.000 0.467
+v 1.1934 -1.8440 -1.2983 1.000 0.000 0.467
+v 1.1977 -1.6463 -1.2983 1.000 0.000 0.467
+v 1.1941 -1.4862 -1.1823 1.000 0.000 0.467
+v 1.1838 -1.4248 -0.9945 1.000 0.000 0.467
+v 1.1709 -1.4857 -0.8068 1.000 0.000 0.467
+v 1.1603 -1.6455 -0.6908 1.000 0.000 0.467
+v 1.1560 -1.8432 -0.6908 1.000 0.000 0.467
+v 1.1596 -2.0033 -0.8068 1.000 0.000 0.467
+v 1.6027 -2.0307 -0.9511 1.000 0.000 0.400
+v 1.6229 -1.9649 -1.1364 1.000 0.000 0.400
+v 1.6135 -1.8039 -1.2510 1.000 0.000 0.400
+v 1.5778 -1.6094 -1.2510 1.000 0.000 0.400
+v 1.5297 -1.4556 -1.1364 1.000 0.000 0.400
+v 1.4874 -1.4012 -0.9511 1.000 0.000 0.400
+v 1.4671 -1.4670 -0.7657 1.000 0.000 0.400
+v 1.4766 -1.6279 -0.6511 1.000 0.000 0.400
+v 1.5122 -1.8225 -0.6511 1.000 0.000 0.400
+v 1.5604 -1.9763 -0.7657 1.000 0.000 0.400
+v 2.0383 -1.9023 -0.8660 1.000 0.000 0.333
+v 2.0595 -1.8273 -1.0478 1.000 0.000 0.333
+v 2.0256 -1.6680 -1.1601 1.000 0.000 0.333
+v 1.9495 -1.4855 -1.1601 1.000 0.000 0.333
+v 1.8602 -1.3494 -1.0478 1.000 0.000 0.333
+v 1.7920 -1.3116 -0.8660 1.000 0.000 0.333
+v 1.7707 -1.3867 -0.6843 1.000 0.000 0.333
+v 1.8046 -1.5459 -0.5720 1.000 0.000 0.333
+v 1.8807 -1.7284 -0.5720 1.000 0.000 0.333
+v 1.9700 -1.8646 -0.6843 1.000 0.000 0.333
+v 2.4490 -1.6752 -0.7431 1.000 0.000 0.263
+v 2.4639 -1.5896 -0.9208 1.000 0.000 0.263
+v 2.4023 -1.4371 -1.0306 1.000 0.000 0.263
+v 2.2876 -1.2759 -1.0306 1.000 0.000 0.263
+v 2.1638 -1.1677 -0.9208 1.000 0.000 0.263
+v 2.0781 -1.1537 -0.7431 1.000 0.000 0.263
+v 2.0632 -1.2393 -0.5655 1.000 0.000 0.263
+v 2.1248 -1.3918 -0.4557 1.000 0.000 0.263
+v 2.2395 -1.5529 -0.4557 1.000 0.000 0.263
+v 2.3633 -1.6612 -0.5655 1.000 0.000 0.263
+v 2.8065 -1.3539 -0.5878 1.000 0.000 0.200
+v 2.8079 -1.2596 -0.7617 1.000 0.000 0.200
+v 2.7171 -1.1207 -0.8691 1.000 0.000 0.200
+v 2.5686 -0.9901 -0.8691 1.000 0.000 0.200
+v 2.4191 -0.9177 -0.7617 1.000 0.000 0.200
+v 2.3259 -0.9312 -0.5878 1.000 0.000 0.200
+v 2.3244 -1.0254 -0.4139 1.000 0.000 0.200
+v 2.4153 -1.1644 -0.3065 1.000 0.000 0.200
+v 2.5638 -1.2950 -0.3065 1.000 0.000 0.200
+v 2.7132 -1.3674 -0.4139 1.000 0.000 0.200
+v 3.0839 -0.9520 -0.4067 1.000 0.000 0.133
+v 3.0664 -0.8539 -0.5776 1.000 0.000 0.133
+v 2.9475 -0.7364 -0.6832 1.000 0.000 0.133
+v 2.7724 -0.6444 -0.6832 1.000 0.000 0.133
+v 2.6081 -0.6130 -0.5776 1.000 0.000 0.133
+v 2.5174 -0.6542 -0.4067 1.000 0.000 0.133
+v 2.5349 -0.7523 -0.2359 1.000 0.000 0.133
+v 2.6539 -0.8698 -0.1303 1.000 0.000 0.133
+v 2.8290 -0.9618 -0.1303 1.000 0.000 0.133
+v 2.9932 -0.9932 -0.2359 1.000 0.000 0.133
+v 3.2598 -0.4912 -0.2079 1.000 0.000 0.063
+v 3.2203 -0.3962 -0.3768 1.000 0.000 0.063
+v 3.0773 -0.3082 -0.4812 1.000 0.000 0.063
+v 2.8853 -0.2607 -0.4812 1.000 0.000 0.063
+v 2.7177 -0.2720 -0.3768 1.000 0.000 0.063
+v 2.6385 -0.3377 -0.2079 1.000 0.000 0.063
+v 2.6780 -0.4327 -0.0390 1.000 0.000 0.063
+v 2.8210 -0.5208 0.0654 1.000 0.000 0.063
+v 3.0130 -0.5682 0.0654 1.000 0.000 0.063
+v 3.1806 -0.5569 -0.0390 1.000 0.000 0.063
+vn 1.0000 0.0017 -0.0000
+vn 0.8086 0.2643 -0.5257
+vn 0.3083 0.4259 -0.8507
+vn -0.3098 0.4248 -0.8507
+vn -0.8095 0.2614 -0.5257
+vn -1.0000 -0.0017 -0.0000
+vn -0.8086 -0.2643 0.5257
+vn -0.3083 -0.4259 0.8507
+vn 0.3098 -0.4248 0.8507
+vn 0.8095 -0.2614 0.5257
+vn 0.9700 0.2432 -0.0000
+vn 0.7218 0.4476 -0.5279
+vn 0.1980 0.4810 -0.8541
+vn -0.4015 0.3306 -0.8541
+vn -0.8476 0.0540 -0.5279
+vn -0.9700 -0.2432 -0.0000
+vn -0.7218 -0.4476 0.5279
+vn -0.1980 -0.4810 0.8541
+vn 0.4015 -0.3306 0.8541
+vn 0.8476 -0.0540 0.5279
+vn 0.8836 0.4683 -0.0000
+vn 0.5998 0.5959 -0.5340
+vn 0.0869 0.4959 -0.8640
+vn -0.4592 0.2065 -0.8640
+vn -0.8299 -0.1618 -0.5340
+vn -0.8836 -0.4683 -0.0000
+vn -0.5998 -0.5959 0.5340
+vn -0.0869 -0.4959 0.8640
+vn 0.4592 -0.2065 0.8640
+vn 0.8299 0.1618 0.5340
+vn 0.7487 0.6629 -0.0000
+vn 0.4574 0.7039 -0.5435
+vn -0.0087 0.4760 -0.8794
+vn -0.4714 0.0663 -0.8794
+vn -0.7541 -0.3687 -0.5435
+vn -0.7487 -0.6629 -0.0000
+vn -0.4574 -0.7039 0.5435
+vn 0.0087 -0.4760 0.8794
+vn 0.4714 -0.0663 0.8794
+vn 0.7541 0.3687 0.5435
+vn 0.5770 0.8167 -0.0000
+vn 0.3096 0.7718 -0.5554
+vn -0.0760 0.4320 -0.8986
+vn -0.4326 -0.0727 -0.8986
+vn -0.6240 -0.5497 -0.5554
+vn -0.5770 -0.8167 -0.0000
+vn -0.3096 -0.7718 0.5554
+vn 0.0760 -0.4320 0.8986
+vn 0.4326 0.0727 0.8986
+vn 0.6240 0.5497 0.5554
+vn 0.3819 0.9242 -0.0000
+vn 0.1696 0.8053 -0.5681
+vn -0.1076 0.3788 -0.9192
+vn -0.3436 -0.1924 -0.9192
+vn -0.4484 -0.6901 -0.5681
+vn -0.3819 -0.9242 -0.0000
+vn -0.1696 -0.8053 0.5681
+vn 0.1076 -0.3788 0.9192
+vn 0.3436 0.1924 0.9192
+vn 0.4484 0.6901 0.5681
+vn 0.1772 0.9842 -0.0000
+vn 0.0464 0.8137 -0.5795
+vn -0.1022 0.3324 -0.9376
+vn -0.2117 -0.2759 -0.9376
+vn -0.2403 -0.7788 -0.5795
+vn -0.1772 -0.9842 -0.0000
+vn -0.0464 -0.8137 0.5795
+vn 0.1022 -0.3324 0.9376
+vn 0.2117 0.2759 0.9376
+vn 0.2403 0.7788 0.5795
+vn -0.0246 0.9997 0.0000
+vn -0.0551 0.8079 -0.5867
+vn -0.0645 0.3075 -0.9494
+vn -0.0493 -0.3103 -0.9494
+vn -0.0152 -0.8096 -0.5867
+vn 0.0246 -0.9997 -0.0000
+vn 0.0551 -0.8079 0.5867
+vn 0.0645 -0.3075 0.9494
+vn 0.0493 0.3103 0.9494
+vn 0.0152 0.8096 0.5867
+vn -0.2127 0.9771 0.0000
+vn -0.1342 0.7987 -0.5865
+vn -0.0045 0.3153 -0.9490
+vn 0.1269 -0.2886 -0.9490
+vn 0.2099 -0.7823 -0.5865
+vn 0.2127 -0.9771 -0.0000
+vn 0.1342 -0.7987 0.5865
+vn 0.0045 -0.3153 0.9490
+vn -0.1269 0.2886 0.9490
+vn -0.2099 0.7823 0.5865
+vn -0.3782 0.9257 0.0000
+vn -0.1938 0.7948 -0.5752
+vn 0.0646 0.3602 -0.9306
+vn 0.2983 -0.2119 -0.9306
+vn 0.4181 -0.7031 -0.5752
+vn 0.3782 -0.9257 -0.0000
+vn 0.1938 -0.7948 0.5752
+vn -0.0646 -0.3602 0.9306
+vn -0.2983 0.2119 0.9306
+vn -0.4181 0.7031 0.5752
+vn -0.5143 0.8576 0.0000
+vn -0.2373 0.8010 -0.5496
+vn 0.1303 0.4385 -0.8892
+vn 0.4482 -0.0916 -0.8892
+vn 0.5948 -0.5866 -0.5496
+vn 0.5143 -0.8576 -0.0000
+vn 0.2373 -0.8010 0.5496
+vn -0.1303 -0.4385 0.8892
+vn -0.4482 0.0916 0.8892
+vn -0.5948 0.5866 0.5496
+vn -0.6155 0.7881 0.0000
+vn -0.2657 0.8190 -0.5085
+vn 0.1857 0.5371 -0.8228
+vn 0.5661 0.0501 -0.8228
+vn 0.7303 -0.4561 -0.5085
+vn 0.6155 -0.7881 -0.0000
+vn 0.2657 -0.8190 0.5085
+vn -0.1857 -0.5371 0.8228
+vn -0.5661 -0.0501 0.8228
+vn -0.7303 0.4561 0.5085
+vn -0.6760 0.7369 0.0000
+vn -0.2721 0.8483 -0.4543
+vn 0.2357 0.6356 -0.7351
+vn 0.6535 0.1802 -0.7351
+vn 0.8217 -0.3440 -0.4543
+vn 0.6760 -0.7369 -0.0000
+vn 0.2721 -0.8483 0.4543
+vn -0.2357 -0.6356 0.7351
+vn -0.6535 -0.1802 0.7351
+vn -0.8217 0.3440 0.4543
+vn -0.6859 0.7277 0.0000
+vn -0.2382 0.8873 -0.3950
+vn 0.3005 0.7079 -0.6392
+vn 0.7244 0.2582 -0.6392
+vn 0.8716 -0.2902 -0.3950
+vn 0.6859 -0.7277 -0.0000
+vn 0.2382 -0.8873 0.3950
+vn -0.3005 -0.7079 0.6392
+vn -0.7244 -0.2582 0.6392
+vn -0.8716 0.2902 0.3950
+vn -0.6283 0.7780 0.0000
+vn -0.1384 0.9281 -0.3457
+vn 0.4043 0.7236 -0.5594
+vn 0.7925 0.2428 -0.5594
+vn 0.8781 -0.3308 -0.3457
+vn 0.6283 -0.7780 -0.0000
+vn 0.1384 -0.9281 0.3457
+vn -0.4043 -0.7236 0.5594
+vn -0.7925 -0.2428 0.5594
+vn -0.8781 0.3308 0.3457
+vn -0.4989 0.8666 0.0000
+vn 0.0202 0.9451 -0.3260
+vn 0.5316 0.6626 -0.5276
+vn 0.8400 0.1270 -0.5276
+vn 0.8275 -0.4571 -0.3260
+vn 0.4989 -0.8666 -0.0000
+vn -0.0202 -0.9451 0.3260
+vn -0.5316 -0.6626 0.5276
+vn -0.8400 -0.1270 0.5276
+vn -0.8275 0.4571 0.3260
+vn -0.3580 0.9337 0.0000
+vn 0.1539 0.9254 -0.3463
+vn 0.6069 0.5637 -0.5603
+vn 0.8282 -0.0134 -0.5603
+vn 0.7331 -0.5854 -0.3463
+vn 0.3580 -0.9337 -0.0000
+vn -0.1539 -0.9254 0.3463
+vn -0.6069 -0.5637 0.5603
+vn -0.8282 0.0134 0.5603
+vn -0.7331 0.5854 0.3463
+vn -0.2869 0.9580 0.0000
+vn 0.1841 0.8997 -0.3959
+vn 0.5848 0.4977 -0.6405
+vn 0.7621 -0.0943 -0.6405
+vn 0.6483 -0.6504 -0.3959
+vn 0.2869 -0.9580 -0.0000
+vn -0.1841 -0.8997 0.3959
+vn -0.5848 -0.4977 0.6405
+vn -0.7621 0.0943 0.6405
+vn -0.6483 0.6504 0.3959
+vn -0.3009 0.9537 0.0000
+vn 0.1113 0.8834 -0.4552
+vn 0.4809 0.4757 -0.7365
+vn 0.6668 -0.1137 -0.7365
+vn 0.5981 -0.6596 -0.4552
+vn 0.3009 -0.9537 -0.0000
+vn -0.1113 -0.8834 0.4552
+vn -0.4809 -0.4757 0.7365
+vn -0.6668 0.1137 0.7365
+vn -0.5981 0.6596 0.4552
+vn -0.3761 0.9266 0.0000
+vn -0.0323 0.8600 -0.5092
+vn 0.3239 0.4650 -0.8239
+vn 0.5564 -0.1076 -0.8239
+vn 0.5763 -0.6392 -0.5092
+vn 0.3761 -0.9266 -0.0000
+vn 0.0323 -0.8600 0.5092
+vn -0.3239 -0.4650 0.8239
+vn -0.5564 0.1076 0.8239
+vn -0.5763 0.6392 0.5092
+vn -0.4873 0.8732 0.0000
+vn -0.2133 0.8074 -0.5501
+vn 0.1421 0.4332 -0.8900
+vn 0.4433 -0.1065 -0.8900
+vn 0.5752 -0.6055 -0.5501
+vn 0.4873 -0.8732 -0.0000
+vn 0.2133 -0.8074 0.5501
+vn -0.1421 -0.4332 0.8900
+vn -0.4433 0.1065 0.8900
+vn -0.5752 0.6055 0.5501
+vn -0.6145 0.7889 0.0000
+vn -0.4025 0.7119 -0.5754
+vn -0.0368 0.3630 -0.9311
+vn 0.3430 -0.1246 -0.9311
+vn 0.5917 -0.5646 -0.5754
+vn 0.6145 -0.7889 -0.0000
+vn 0.4025 -0.7119 0.5754
+vn 0.0368 -0.3630 0.9311
+vn -0.3430 0.1246 0.9311
+vn -0.5917 0.5646 0.5754
+vn -0.7416 0.6708 0.0000
+vn -0.5748 0.5705 -0.5866
+vn -0.1884 0.2524 -0.9491
+vn 0.2700 -0.1622 -0.9491
+vn 0.6252 -0.5148 -0.5866
+vn 0.7416 -0.6708 -0.0000
+vn 0.5748 -0.5705 0.5866
+vn 0.1884 -0.2524 0.9491
+vn -0.2700 0.1622 0.9491
+vn -0.6252 0.5148 0.5866
+vn -0.8549 0.5188 0.0000
+vn -0.7104 0.3888 -0.5867
+vn -0.2945 0.1103 -0.9493
+vn 0.2338 -0.2103 -0.9493
+vn 0.6729 -0.4506 -0.5867
+vn 0.8549 -0.5188 -0.0000
+vn 0.7104 -0.3888 0.5867
+vn 0.2945 -0.1103 0.9493
+vn -0.2338 0.2103 0.9493
+vn -0.6729 0.4506 0.5867
+vn -0.9419 0.3358 0.0000
+vn -0.7954 0.1781 -0.5793
+vn -0.3451 -0.0477 -0.9374
+vn 0.2371 -0.2552 -0.9374
+vn 0.7287 -0.3653 -0.5793
+vn 0.9419 -0.3358 -0.0000
+vn 0.7954 -0.1781 0.5793
+vn 0.3451 0.0477 0.9374
+vn -0.2371 0.2552 0.9374
+vn -0.7287 0.3653 0.5793
+vn -0.9917 0.1282 0.0000
+vn -0.8218 -0.0466 -0.5679
+vn -0.3379 -0.2035 -0.9189
+vn 0.2750 -0.2828 -0.9189
+vn 0.7829 -0.2540 -0.5679
+vn 0.9917 -0.1282 -0.0000
+vn 0.8218 0.0466 0.5679
+vn 0.3379 0.2035 0.9189
+vn -0.2750 0.2828 0.9189
+vn -0.7829 0.2540 0.5679
+vn -0.9955 -0.0946 0.0000
+vn -0.7871 -0.2686 -0.5552
+vn -0.2781 -0.3400 -0.8984
+vn 0.3372 -0.2816 -0.8984
+vn 0.8236 -0.1156 -0.5552
+vn 0.9955 0.0946 -0.0000
+vn 0.7871 0.2686 0.5552
+vn 0.2781 0.3400 0.8984
+vn -0.3372 0.2816 0.8984
+vn -0.8236 0.1156 0.5552
+vn -0.9474 -0.3201 0.0000
+vn -0.6947 -0.4714 -0.5434
+vn -0.1766 -0.4426 -0.8792
+vn 0.4089 -0.2447 -0.8792
+vn 0.8382 0.0466 -0.5434
+vn 0.9474 0.3201 -0.0000
+vn 0.6947 0.4714 0.5434
+vn 0.1766 0.4426 0.8792
+vn -0.4089 0.2447 0.8792
+vn -0.8382 -0.0466 0.5434
+vn -0.8455 -0.5339 0.0000
+vn -0.5527 -0.6399 -0.5339
+vn -0.0488 -0.5014 -0.8638
+vn 0.4737 -0.1714 -0.8638
+vn 0.8153 0.2240 -0.5339
+vn 0.8455 0.5339 -0.0000
+vn 0.5527 0.6399 0.5339
+vn 0.0488 0.5014 0.8638
+vn -0.4737 0.1714 0.8638
+vn -0.8153 -0.2240 0.5339
+vn -0.6931 -0.7208 0.0000
+vn -0.3743 -0.7625 -0.5278
+vn 0.0875 -0.5129 -0.8540
+vn 0.5159 -0.0674 -0.8540
+vn 0.7472 0.4038 -0.5278
+vn 0.6931 0.7208 -0.0000
+vn 0.3743 0.7625 0.5278
+vn -0.0875 0.5129 0.8540
+vn -0.5159 0.0674 0.8540
+vn -0.7472 -0.4038 0.5278
+vn -0.4985 -0.8669 0.0000
+vn -0.1754 -0.8324 -0.5257
+vn 0.2147 -0.4799 -0.8507
+vn 0.5228 0.0559 -0.8507
+vn 0.6312 0.5703 -0.5257
+vn 0.4985 0.8669 -0.0000
+vn 0.1754 0.8324 0.5257
+vn -0.2147 0.4799 0.8507
+vn -0.5228 -0.0559 0.8507
+vn -0.6312 -0.5703 0.5257
+vn -0.2743 -0.9616 0.0000
+vn 0.0267 -0.8489 -0.5279
+vn 0.3175 -0.4119 -0.8541
+vn 0.4871 0.1824 -0.8541
+vn 0.4706 0.7070 -0.5279
+vn 0.2743 0.9616 -0.0000
+vn -0.0267 0.8489 0.5279
+vn -0.3175 0.4119 0.8541
+vn -0.4871 -0.1824 0.8541
+vn -0.4706 -0.7070 0.5279
+vn -0.0362 -0.9993 0.0000
+vn 0.2162 -0.8174 -0.5340
+vn 0.3860 -0.3232 -0.8640
+vn 0.4084 0.2944 -0.8640
+vn 0.2748 0.7996 -0.5340
+vn 0.0362 0.9993 -0.0000
+vn -0.2162 0.8174 0.5340
+vn -0.3860 0.3232 0.8640
+vn -0.4084 -0.2944 0.8640
+vn -0.2748 -0.7996 0.5340
+vn 0.1997 -0.9798 0.0000
+vn 0.3809 -0.7480 -0.5435
+vn 0.4165 -0.2305 -0.8794
+vn 0.2931 0.3751 -0.8794
+vn 0.0577 0.8374 -0.5435
+vn -0.1997 0.9798 -0.0000
+vn -0.3809 0.7480 0.5435
+vn -0.4165 0.2305 0.8794
+vn -0.2931 -0.3751 0.8794
+vn -0.0577 -0.8374 0.5435
+vn 0.4188 -0.9081 0.0000
+vn 0.5136 -0.6540 -0.5554
+vn 0.4122 -0.1502 -0.8986
+vn 0.1533 0.4110 -0.8986
+vn -0.1641 0.8152 -0.5554
+vn -0.4188 0.9081 -0.0000
+vn -0.5136 0.6540 0.5554
+vn -0.4122 0.1502 0.8986
+vn -0.1533 -0.4110 0.8986
+vn 0.1641 -0.8152 0.5554
+vn 0.6094 -0.7929 0.0000
+vn 0.6126 -0.5495 -0.5681
+vn 0.3819 -0.0962 -0.9192
+vn 0.0052 0.3938 -0.9192
+vn -0.3734 0.7334 -0.5681
+vn -0.6094 0.7929 -0.0000
+vn -0.6126 0.5495 0.5681
+vn -0.3819 0.0962 0.9192
+vn -0.0052 -0.3938 0.9192
+vn 0.3734 -0.7334 0.5681
+vn 0.7637 -0.6455 0.0000
+vn 0.6815 -0.4470 -0.5795
+vn 0.3389 -0.0777 -0.9376
+vn -0.1331 0.3212 -0.9376
+vn -0.5543 0.5975 -0.5795
+vn -0.7637 0.6455 -0.0000
+vn -0.6815 0.4470 0.5795
+vn -0.3389 0.0777 0.9376
+vn 0.1331 -0.3212 0.9376
+vn 0.5543 -0.5975 0.5795
+vn 0.8781 -0.4785 0.0000
+vn 0.7272 -0.3562 -0.5867
+vn 0.2986 -0.0979 -0.9494
+vn -0.2441 0.1978 -0.9494
+vn -0.6936 0.4180 -0.5867
+vn -0.8781 0.4785 -0.0000
+vn -0.7272 0.3562 0.5867
+vn -0.2986 0.0979 0.9494
+vn 0.2441 -0.1978 0.9494
+vn 0.6936 -0.4180 0.5867
+vn 0.9525 -0.3044 0.0000
+vn 0.7588 -0.2831 -0.5865
+vn 0.2753 -0.1537 -0.9490
+vn -0.3134 0.0344 -0.9490
+vn -0.7824 0.2094 -0.5865
+vn -0.9525 0.3044 -0.0000
+vn -0.7588 0.2831 0.5865
+vn -0.2753 0.1537 0.9490
+vn 0.3134 -0.0344 0.9490
+vn 0.7824 -0.2094 0.5865
+vn 0.9908 -0.1354 0.0000
+vn 0.7852 -0.2296 -0.5752
+vn 0.2796 -0.2360 -0.9306
+vn -0.3327 -0.1524 -0.9306
+vn -0.8180 -0.0105 -0.5752
+vn -0.9908 0.1354 -0.0000
+vn -0.7852 0.2296 0.5752
+vn -0.2796 0.2360 0.9306
+vn 0.3327 0.1524 0.9306
+vn 0.8180 0.0105 0.5752
+vn 0.9999 0.0166 -0.0000
+vn 0.8124 -0.1950 -0.5496
+vn 0.3146 -0.3321 -0.8892
+vn -0.3034 -0.3423 -0.8892
+vn -0.8054 -0.2218 -0.5496
+vn -0.9999 -0.0166 -0.0000
+vn -0.8124 0.1950 0.5496
+vn -0.3146 0.3321 0.8892
+vn 0.3034 0.3423 0.8892
+vn 0.8054 0.2218 0.5496
+vn 0.9903 0.1390 -0.0000
+vn 0.8421 -0.1795 -0.5085
+vn 0.3723 -0.4294 -0.8228
+vn -0.2397 -0.5153 -0.8228
+vn -0.7602 -0.4044 -0.5085
+vn -0.9903 -0.1390 -0.0000
+vn -0.8421 0.1795 0.5085
+vn -0.3723 0.4294 0.8228
+vn 0.2397 0.5153 0.8228
+vn 0.7602 0.4044 0.5085
+vn 0.9762 0.2170 -0.0000
+vn 0.8707 -0.1885 -0.4543
+vn 0.4326 -0.5220 -0.7351
+vn -0.1707 -0.6561 -0.7351
+vn -0.7088 -0.5396 -0.4543
+vn -0.9762 -0.2170 -0.0000
+vn -0.8707 0.1885 0.4543
+vn -0.4326 0.5220 0.7351
+vn 0.1707 0.6561 0.7351
+vn 0.7088 0.5396 0.4543
+vn 0.9732 0.2301 -0.0000
+vn 0.8875 -0.2374 -0.3950
+vn 0.4628 -0.6142 -0.6392
+vn -0.1386 -0.7565 -0.6392
+vn -0.6871 -0.6098 -0.3950
+vn -0.9732 -0.2301 -0.0000
+vn -0.8875 0.2374 0.3950
+vn -0.4628 0.6142 0.6392
+vn 0.1386 0.7565 0.6392
+vn 0.6871 0.6098 0.3950
+vn 0.9879 0.1551 -0.0000
+vn 0.8729 -0.3441 -0.3457
+vn 0.4246 -0.7119 -0.5594
+vn -0.1860 -0.8078 -0.5594
+vn -0.7255 -0.5951 -0.3457
+vn -0.9879 -0.1551 -0.0000
+vn -0.8729 0.3441 0.3457
+vn -0.4246 0.7119 0.5594
+vn 0.1860 0.8078 0.5594
+vn 0.7255 0.5951 0.3457
+vn 1.0000 -0.0012 0.0000
+vn 0.8084 -0.4901 -0.3260
+vn 0.3080 -0.7917 -0.5276
+vn -0.3100 -0.7909 -0.5276
+vn -0.8096 -0.4881 -0.3260
+vn -1.0000 0.0012 -0.0000
+vn -0.8084 0.4901 0.3260
+vn -0.3080 0.7917 0.5276
+vn 0.3100 0.7909 0.5276
+vn 0.8096 0.4881 0.3260
+vn 0.9876 -0.1568 0.0000
+vn 0.7245 -0.5960 -0.3463
+vn 0.1847 -0.8075 -0.5603
+vn -0.4257 -0.7105 -0.5603
+vn -0.8735 -0.3422 -0.3463
+vn -0.9876 0.1568 -0.0000
+vn -0.7245 0.5960 0.3463
+vn -0.1847 0.8075 0.5603
+vn 0.4257 0.7105 0.5603
+vn 0.8735 0.3422 0.3463
+vn 0.9731 -0.2305 0.0000
+vn 0.6871 -0.6093 -0.3959
+vn 0.1386 -0.7553 -0.6405
+vn -0.4628 -0.6129 -0.6405
+vn -0.8874 -0.2363 -0.3959
+vn -0.9731 0.2305 -0.0000
+vn -0.6871 0.6093 0.3959
+vn -0.1386 0.7553 0.6405
+vn 0.4628 0.6129 0.6405
+vn 0.8874 0.2363 0.3959
+vn 0.9763 -0.2163 0.0000
+vn 0.7094 -0.5381 -0.4552
+vn 0.1716 -0.6543 -0.7365
+vn -0.4319 -0.5207 -0.7365
+vn -0.8703 -0.1881 -0.4552
+vn -0.9763 0.2163 -0.0000
+vn -0.7094 0.5381 0.4552
+vn -0.1716 0.6543 0.7365
+vn 0.4319 0.5207 0.7365
+vn 0.8703 0.1881 0.4552
+vn 0.9905 -0.1376 0.0000
+vn 0.7609 -0.4021 -0.5092
+vn 0.2407 -0.5130 -0.8239
+vn -0.3714 -0.4280 -0.8239
+vn -0.8417 -0.1795 -0.5092
+vn -0.9905 0.1376 -0.0000
+vn -0.7609 0.4021 0.5092
+vn -0.2407 0.5130 0.8239
+vn 0.3714 0.4280 0.8239
+vn 0.8417 0.1795 0.5092
+vn 0.9999 -0.0146 0.0000
+vn 0.8059 -0.2190 -0.5501
+vn 0.3041 -0.3397 -0.8900
+vn -0.3139 -0.3307 -0.8900
+vn -0.8120 -0.1954 -0.5501
+vn -0.9999 0.0146 -0.0000
+vn -0.8059 0.2190 0.5501
+vn -0.3041 0.3397 0.8900
+vn 0.3139 0.3307 0.8900
+vn 0.8120 0.1954 0.5501
+vn 0.9905 0.1377 -0.0000
+vn 0.8178 -0.0074 -0.5754
+vn 0.3328 -0.1496 -0.9311
+vn -0.2794 -0.2347 -0.9311
+vn -0.7848 -0.2302 -0.5754
+vn -0.9905 -0.1377 -0.0000
+vn -0.8178 0.0074 0.5754
+vn -0.3328 0.1496 0.9311
+vn 0.2794 0.2347 0.9311
+vn 0.7848 0.2302 0.5754
+vn 0.9517 0.3069 -0.0000
+vn 0.7815 0.2125 -0.5866
+vn 0.3128 0.0370 -0.9491
+vn -0.2755 -0.1527 -0.9491
+vn -0.7585 -0.2840 -0.5866
+vn -0.9517 -0.3069 -0.0000
+vn -0.7815 -0.2125 0.5866
+vn -0.3128 -0.0370 0.9491
+vn 0.2755 0.1527 0.9491
+vn 0.7585 0.2840 0.5866
+vn 0.8767 0.4810 -0.0000
+vn 0.6919 0.4208 -0.5867
+vn 0.2428 0.1999 -0.9493
+vn -0.2991 -0.0973 -0.9493
+vn -0.7267 -0.3574 -0.5867
+vn -0.8767 -0.4810 -0.0000
+vn -0.6919 -0.4208 0.5867
+vn -0.2428 -0.1999 0.9493
+vn 0.2991 0.0973 0.9493
+vn 0.7267 0.3574 0.5867
+vn 0.7618 0.6478 -0.0000
+vn 0.5519 0.5998 -0.5793
+vn 0.1313 0.3227 -0.9374
+vn -0.3396 -0.0777 -0.9374
+vn -0.6807 -0.4484 -0.5793
+vn -0.7618 -0.6478 -0.0000
+vn -0.5519 -0.5998 0.5793
+vn -0.1313 -0.3227 0.9374
+vn 0.3396 0.0777 0.9374
+vn 0.6807 0.4484 0.5793
+vn 0.6069 0.7948 -0.0000
+vn 0.3706 0.7349 -0.5679
+vn -0.0073 0.3944 -0.9189
+vn -0.3824 -0.0968 -0.9189
+vn -0.6114 -0.5510 -0.5679
+vn -0.6069 -0.7948 -0.0000
+vn -0.3706 -0.7349 0.5679
+vn 0.0073 -0.3944 0.9189
+vn 0.3824 0.0968 0.9189
+vn 0.6114 0.5510 0.5679
+vn 0.4159 0.9094 -0.0000
+vn 0.1610 0.8160 -0.5552
+vn -0.1554 0.4109 -0.8984
+vn -0.4124 -0.1512 -0.8984
+vn -0.5119 -0.6555 -0.5552
+vn -0.4159 -0.9094 -0.0000
+vn -0.1610 -0.8160 0.5552
+vn 0.1554 -0.4109 0.8984
+vn 0.4124 0.1512 0.8984
+vn 0.5119 0.6555 0.5552
+vn 0.1965 0.9805 -0.0000
+vn -0.0609 0.8373 -0.5434
+vn -0.2950 0.3743 -0.8792
+vn -0.4164 -0.2317 -0.8792
+vn -0.3787 -0.7492 -0.5434
+vn -0.1965 -0.9805 -0.0000
+vn 0.0609 -0.8373 0.5434
+vn 0.2950 -0.3743 0.8792
+vn 0.4164 0.2317 0.8792
+vn 0.3787 0.7492 0.5434
+vn -0.0396 0.9992 0.0000
+vn -0.2778 0.7986 -0.5339
+vn -0.4098 0.2930 -0.8638
+vn -0.3853 -0.3245 -0.8638
+vn -0.2137 -0.8181 -0.5339
+vn 0.0396 -0.9992 -0.0000
+vn 0.2778 -0.7986 0.5339
+vn 0.4098 -0.2930 0.8638
+vn 0.3853 0.3245 0.8638
+vn 0.2137 0.8181 0.5339
+vn -0.2777 0.9607 0.0000
+vn -0.4732 0.7054 -0.5278
+vn -0.4879 0.1806 -0.8540
+vn -0.3163 -0.4131 -0.8540
+vn -0.0239 -0.8490 -0.5278
+vn 0.2777 -0.9607 -0.0000
+vn 0.4732 -0.7054 0.5278
+vn 0.4879 -0.1806 0.8540
+vn 0.3163 0.4131 0.8540
+vn 0.0239 0.8490 0.5278
+vn -0.5015 0.8651 0.0000
+vn -0.6332 0.5681 -0.5257
+vn -0.5229 0.0540 -0.8507
+vn -0.2130 -0.4807 -0.8507
+vn 0.1783 -0.8318 -0.5257
+vn 0.5015 -0.8651 -0.0000
+vn 0.6332 -0.5681 0.5257
+vn 0.5229 -0.0540 0.8507
+vn 0.2130 0.4807 0.8507
+vn -0.1783 0.8318 0.5257
+vn -0.6956 0.7184 0.0000
+vn -0.7485 0.4013 -0.5279
+vn -0.5155 -0.0690 -0.8541
+vn -0.0856 -0.5130 -0.8541
+vn 0.3770 -0.7611 -0.5279
+vn 0.6956 -0.7184 -0.0000
+vn 0.7485 -0.4013 0.5279
+vn 0.5155 0.0690 0.8541
+vn 0.0856 0.5130 0.8541
+vn -0.3770 0.7611 0.5279
+vn -0.8474 0.5310 0.0000
+vn -0.8160 0.2214 -0.5340
+vn -0.4729 -0.1727 -0.8640
+vn 0.0508 -0.5009 -0.8640
+vn 0.5551 -0.6378 -0.5340
+vn 0.8474 -0.5310 -0.0000
+vn 0.8160 -0.2214 0.5340
+vn 0.4729 0.1727 0.8640
+vn -0.0508 0.5009 0.8640
+vn -0.5551 0.6378 0.5340
+vn -0.9484 0.3169 0.0000
+vn -0.8382 0.0441 -0.5435
+vn -0.4079 -0.2455 -0.8794
+vn 0.1783 -0.4414 -0.8794
+vn 0.6964 -0.4687 -0.5435
+vn 0.9484 -0.3169 -0.0000
+vn 0.8382 -0.0441 0.5435
+vn 0.4079 0.2455 0.8794
+vn -0.1783 0.4414 0.8794
+vn -0.6964 0.4687 0.5435
+vn -0.9958 0.0913 0.0000
+vn -0.8232 -0.1177 -0.5554
+vn -0.3362 -0.2818 -0.8986
+vn 0.2793 -0.3383 -0.8986
+vn 0.7881 -0.2655 -0.5554
+vn 0.9958 -0.0913 -0.0000
+vn 0.8232 0.1177 0.5554
+vn 0.3362 0.2818 0.8986
+vn -0.2793 0.3383 0.8986
+vn -0.7881 0.2655 0.5554
+vn -0.9913 -0.1313 0.0000
+vn -0.7822 -0.2558 -0.5681
+vn -0.2743 -0.2826 -0.9192
+vn 0.3384 -0.2014 -0.9192
+vn 0.8218 -0.0433 -0.5681
+vn 0.9913 0.1313 -0.0000
+vn 0.7822 0.2558 0.5681
+vn 0.2743 0.2826 0.9192
+vn -0.3384 0.2014 0.9192
+vn -0.8218 0.0433 0.5681
+vn -0.9409 -0.3387 0.0000
+vn -0.7278 -0.3667 -0.5795
+vn -0.2368 -0.2547 -0.9376
+vn 0.3448 -0.0454 -0.9376
+vn 0.7946 0.1813 -0.5795
+vn 0.9409 0.3387 -0.0000
+vn 0.7278 0.3667 0.5795
+vn 0.2368 0.2547 0.9376
+vn -0.3448 0.0454 0.9376
+vn -0.7946 -0.1813 0.5795
+vn -0.8534 -0.5212 0.0000
+vn -0.6721 -0.4517 -0.5867
+vn -0.2341 -0.2096 -0.9494
+vn 0.2934 0.1125 -0.9494
+vn 0.7088 0.3916 -0.5867
+vn 0.8534 0.5212 -0.0000
+vn 0.6721 0.4517 0.5867
+vn 0.2341 0.2096 0.9494
+vn -0.2934 -0.1125 0.9494
+vn -0.7088 -0.3916 0.5867
+vn -0.7399 -0.6727 0.0000
+vn -0.6246 -0.5156 -0.5865
+vn -0.2708 -0.1616 -0.9490
+vn 0.1865 0.2542 -0.9490
+vn 0.5726 0.5729 -0.5865
+vn 0.7399 0.6727 -0.0000
+vn 0.6246 0.5156 0.5865
+vn 0.2708 0.1616 0.9490
+vn -0.1865 -0.2542 0.9490
+vn -0.5726 -0.5729 0.5865
+vn -0.6126 -0.7904 0.0000
+vn -0.5914 -0.5652 -0.5752
+vn -0.3442 -0.1241 -0.9306
+vn 0.0344 0.3643 -0.9306
+vn 0.3999 0.7136 -0.5752
+vn 0.6126 0.7904 -0.0000
+vn 0.5914 0.5652 0.5752
+vn 0.3442 0.1241 0.9306
+vn -0.0344 -0.3643 0.9306
+vn -0.3999 -0.7136 0.5752
+vn -0.4856 -0.8742 0.0000
+vn -0.5751 -0.6060 -0.5496
+vn -0.4449 -0.1064 -0.8892
+vn -0.1448 0.4339 -0.8892
+vn 0.2106 0.8085 -0.5496
+vn 0.4856 0.8742 -0.0000
+vn 0.5751 0.6060 0.5496
+vn 0.4449 0.1064 0.8892
+vn 0.1448 -0.4339 0.8892
+vn -0.2106 -0.8085 0.5496
+vn -0.3747 -0.9271 0.0000
+vn -0.5765 -0.6396 -0.5085
+vn -0.5580 -0.1078 -0.8228
+vn -0.3264 0.4652 -0.8228
+vn 0.0299 0.8605 -0.5085
+vn 0.3747 0.9271 -0.0000
+vn 0.5765 0.6396 0.5085
+vn 0.5580 0.1078 0.8228
+vn 0.3264 -0.4652 0.8228
+vn -0.0299 -0.8605 0.5085
+vn -0.3002 -0.9539 0.0000
+vn -0.5986 -0.6598 -0.4543
+vn -0.6683 -0.1137 -0.7351
+vn -0.4828 0.4759 -0.7351
+vn -0.1129 0.8836 -0.4543
+vn 0.3002 0.9539 -0.0000
+vn 0.5986 0.6598 0.4543
+vn 0.6683 0.1137 0.7351
+vn 0.4828 -0.4759 0.7351
+vn 0.1129 -0.8836 0.4543
+vn -0.2873 -0.9578 0.0000
+vn -0.6493 -0.6499 -0.3950
+vn -0.7633 -0.0937 -0.6392
+vn -0.5858 0.4983 -0.6392
+vn -0.1845 0.9000 -0.3950
+vn 0.2873 0.9578 -0.0000
+vn 0.6493 0.6499 0.3950
+vn 0.7633 0.0937 0.6392
+vn 0.5858 -0.4983 0.6392
+vn 0.1845 -0.9000 0.3950
+vn -0.3597 -0.9331 0.0000
+vn -0.7345 -0.5839 -0.3457
+vn -0.8288 -0.0117 -0.5594
+vn -0.6065 0.5650 -0.5594
+vn -0.1526 0.9258 -0.3457
+vn 0.3597 0.9331 -0.0000
+vn 0.7345 0.5839 0.3457
+vn 0.8288 0.0117 0.5594
+vn 0.6065 -0.5650 0.5594
+vn 0.1526 -0.9258 0.3457
+vn -0.5011 -0.8654 0.0000
+vn -0.8286 -0.4551 -0.3260
+vn -0.8397 0.1291 -0.5276
+vn -0.5300 0.6639 -0.5276
+vn -0.0179 0.9452 -0.3260
+vn 0.5011 0.8654 -0.0000
+vn 0.8286 0.4551 0.3260
+vn 0.8397 -0.1291 0.5276
+vn 0.5300 -0.6639 0.5276
+vn 0.0179 -0.9452 0.3260
+vn -0.6296 -0.7769 0.0000
+vn -0.8784 -0.3295 -0.3463
+vn -0.7916 0.2438 -0.5603
+vn -0.4025 0.7239 -0.5603
+vn 0.1404 0.9276 -0.3463
+vn 0.6296 0.7769 -0.0000
+vn 0.8784 0.3295 0.3463
+vn 0.7916 -0.2438 0.5603
+vn 0.4025 -0.7239 0.5603
+vn -0.1404 -0.9276 0.3463
+vn -0.6862 -0.7274 0.0000
+vn -0.8712 -0.2904 -0.3959
+vn -0.7235 0.2576 -0.6405
+vn -0.2994 0.7072 -0.6405
+vn 0.2390 0.8867 -0.3959
+vn 0.6862 0.7274 -0.0000
+vn 0.8712 0.2904 0.3959
+vn 0.7235 -0.2576 0.6405
+vn 0.2994 -0.7072 0.6405
+vn -0.2390 -0.8867 0.3959
+vn -0.6755 -0.7374 0.0000
+vn -0.8207 -0.3453 -0.4552
+vn -0.6525 0.1786 -0.7365
+vn -0.2350 0.6343 -0.7365
+vn 0.2722 0.8478 -0.4552
+vn 0.6755 0.7374 -0.0000
+vn 0.8207 0.3453 0.4552
+vn 0.6525 -0.1786 0.7365
+vn 0.2350 -0.6343 0.7365
+vn -0.2722 -0.8478 0.4552
+vn -0.6144 -0.7890 0.0000
+vn -0.7287 -0.4579 -0.5092
+vn -0.5647 0.0480 -0.8239
+vn -0.1850 0.5357 -0.8239
+vn 0.2654 0.8187 -0.5092
+vn 0.6144 0.7890 -0.0000
+vn 0.7287 0.4579 0.5092
+vn 0.5647 -0.0480 0.8239
+vn 0.1850 -0.5357 0.8239
+vn -0.2654 -0.8187 0.5092
+vn -0.5126 -0.8586 0.0000
+vn -0.5926 -0.5885 -0.5501
+vn -0.4462 -0.0935 -0.8900
+vn -0.1294 0.4372 -0.8900
+vn 0.2368 0.8009 -0.5501
+vn 0.5126 0.8586 -0.0000
+vn 0.5926 0.5885 0.5501
+vn 0.4462 0.0935 0.8900
+vn 0.1294 -0.4372 0.8900
+vn -0.2368 -0.8009 0.5501
+vn -0.3760 -0.9266 0.0000
+vn -0.4153 -0.7046 -0.5754
+vn -0.2960 -0.2134 -0.9311
+vn -0.0636 0.3593 -0.9311
+vn 0.1931 0.7947 -0.5754
+vn 0.3760 0.9266 -0.0000
+vn 0.4153 0.7046 0.5754
+vn 0.2960 0.2134 0.9311
+vn 0.0636 -0.3593 0.9311
+vn -0.1931 -0.7947 0.5754
+vn -0.2101 -0.9777 0.0000
+vn -0.2067 -0.7831 -0.5866
+vn -0.1244 -0.2893 -0.9491
+vn 0.0055 0.3149 -0.9491
+vn 0.1333 0.7989 -0.5866
+vn 0.2101 0.9777 -0.0000
+vn 0.2067 0.7831 0.5866
+vn 0.1244 0.2893 0.9491
+vn -0.0055 -0.3149 0.9491
+vn -0.1333 -0.7989 0.5866
+vn -0.0218 -0.9998 0.0000
+vn 0.0185 -0.8096 -0.5867
+vn 0.0517 -0.3102 -0.9493
+vn 0.0652 0.3077 -0.9493
+vn 0.0538 0.8080 -0.5867
+vn 0.0218 0.9998 -0.0000
+vn -0.0185 0.8096 0.5867
+vn -0.0517 0.3102 0.9493
+vn -0.0652 -0.3077 0.9493
+vn -0.0538 -0.8080 0.5867
+vn 0.1801 -0.9836 0.0000
+vn 0.2435 -0.7779 -0.5793
+vn 0.2138 -0.2750 -0.9374
+vn 0.1025 0.3329 -0.9374
+vn -0.0480 0.8137 -0.5793
+vn -0.1801 0.9836 -0.0000
+vn -0.2435 0.7779 0.5793
+vn -0.2138 0.2750 0.9374
+vn -0.1025 -0.3329 0.9374
+vn 0.0480 -0.8137 0.5793
+vn 0.3848 -0.9230 0.0000
+vn 0.4512 -0.6884 -0.5679
+vn 0.3452 -0.1909 -0.9189
+vn 0.1074 0.3796 -0.9189
+vn -0.1715 0.8050 -0.5679
+vn -0.3848 0.9230 -0.0000
+vn -0.4512 0.6884 0.5679
+vn -0.3452 0.1909 0.9189
+vn -0.1074 -0.3796 0.9189
+vn 0.1715 -0.8050 0.5679
+vn 0.5797 -0.8149 0.0000
+vn 0.6262 -0.5474 -0.5552
+vn 0.4335 -0.0708 -0.8984
+vn 0.0753 0.4328 -0.8984
+vn -0.3117 0.7711 -0.5552
+vn -0.5797 0.8149 -0.0000
+vn -0.6262 0.5474 0.5552
+vn -0.4335 0.0708 0.8984
+vn -0.0753 -0.4328 0.8984
+vn 0.3117 -0.7711 0.5552
+vn 0.7509 -0.6604 0.0000
+vn 0.7556 -0.3659 -0.5434
+vn 0.4716 0.0683 -0.8792
+vn 0.0075 0.4765 -0.8792
+vn -0.4595 0.7026 -0.5434
+vn -0.7509 0.6604 -0.0000
+vn -0.7556 0.3659 0.5434
+vn -0.4716 -0.0683 0.8792
+vn -0.0075 -0.4765 0.8792
+vn 0.4595 -0.7026 0.5434
+vn 0.8852 -0.4653 0.0000
+vn 0.8305 -0.1587 -0.5339
+vn 0.4587 0.2084 -0.8638
+vn -0.0884 0.4960 -0.8638
+vn -0.6017 0.5941 -0.5339
+vn -0.8852 0.4653 -0.0000
+vn -0.8305 0.1587 0.5339
+vn -0.4587 -0.2084 0.8638
+vn 0.0884 -0.4960 0.8638
+vn 0.6017 -0.5941 0.5339
+vn 0.9708 -0.2399 0.0000
+vn 0.8474 0.0571 -0.5278
+vn 0.4004 0.3322 -0.8540
+vn -0.1996 0.4805 -0.8540
+vn -0.7234 0.4452 -0.5278
+vn -0.9708 0.2399 -0.0000
+vn -0.8474 -0.0571 0.5278
+vn -0.4004 -0.3322 0.8540
+vn 0.1996 -0.4805 0.8540
+vn 0.7234 -0.4452 0.5278
+f 1//1 2//2 12//12 11//11
+f 2//2 3//3 13//13 12//12
+f 3//3 4//4 14//14 13//13
+f 4//4 5//5 15//15 14//14
+f 5//5 6//6 16//16 15//15
+f 6//6 7//7 17//17 16//16
+f 7//7 8//8 18//18 17//17
+f 8//8 9//9 19//19 18//18
+f 9//9 10//10 20//20 19//19
+f 10//10 1//1 11//11 20//20
+f 11//11 12//12 22//22 21//21
+f 12//12 13//13 23//23 22//22
+f 13//13 14//14 24//24 23//23
+f 14//14 15//15 25//25 24//24
+f 15//15 16//16 26//26 25//25
+f 16//16 17//17 27//27 26//26
+f 17//17 18//18 28//28 27//27
+f 18//18 19//19 29//29 28//28
+f 19//19 20//20 30//30 29//29
+f 20//20 11//11 21//21 30//30
+f 21//21 22//22 32//32 31//31
+f 22//22 23//23 33//33 32//32
+f 23//23 24//24 34//34 33//33
+f 24//24 25//25 35//35 34//34
+f 25//25 26//26 36//36 35//35
+f 26//26 27//27 37//37 36//36
+f 27//27 28//28 38//38 37//37
+f 28//28 29//29 39//39 38//38
+f 29//29 30//30 40//40 39//39
+f 30//30 21//21 31//31 40//40
+f 31//31 32//32 42//42 41//41
+f 32//32 33//33 43//43 42//42
+f 33//33 34//34 44//44 43//43
+f 34//34 35//35 45//45 44//44
+f 35//35 36//36 46//46 45//45
+f 36//36 37//37 47//47 46//46
+f 37//37 38//38 48//48 47//47
+f 38//38 39//39 49//49 48//48
+f 39//39 40//40 50//50 49//49
+f 40//40 31//31 41//41 50//50
+f 41//41 42//42 52//52 51//51
+f 42//42 43//43 53//53 52//52
+f 43//43 44//44 54//54 53//53
+f 44//44 45//45 55//55 54//54
+f 45//45 46//46 56//56 55//55
+f 46//46 47//47 57//57 56//56
+f 47//47 48//48 58//58 57//57
+f 48//48 49//49 59//59 58//58
+f 49//49 50//50 60//60 59//59
+f 50//50 41//41 51//51 60//60
+f 51//51 52//52 62//62 61//61
+f 52//52 53//53 63//63 62//62
+f 53//53 54//54 64//64 63//63
+f 54//54 55//55 65//65 64//64
+f 55//55 56//56 66//66 65//65
+f 56//56 57//57 67//67 66//66
+f 57//57 58//58 68//68 67//67
+f 58//58 59//59 69//69 68//68
+f 59//59 60//60 70//70 69//69
+f 60//60 51//51 61//61 70//70
+f 61//61 62//62 72//72 71//71
+f 62//62 63//63 73//73 72//72
+f 63//63 64//64 74//74 73//73
+f 64//64 65//65 75//75 74//74
+f 65//65 66//66 76//76 75//75
+f 66//66 67//67 77//77 76//76
+f 67//67 68//68 78//78 77//77
+f 68//68 69//69 79//79 78//78
+f 69//69 70//70 80//80 79//79
+f 70//70 61//61 71//71 80//80
+f 71//71 72//72 82//82 81//81
+f 72//72 73//73 83//83 82//82
+f 73//73 74//74 84//84 83//83
+f 74//74 75//75 85//85 84//84
+f 75//75 76//76 86//86 85//85
+f 76//76 77//77 87//87 86//86
+f 77//77 78//78 88//88 87//87
+f 78//78 79//79 89//89 88//88
+f 79//79 80//80 90//90 89//89
+f 80//80 71//71 81//81 90//90
+f 81//81 82//82 92//92 91//91
+f 82//82 83//83 93//93 92//92
+f 83//83 84//84 94//94 93//93
+f 84//84 85//85 95//95 94//94
+f 85//85 86//86 96//96 95//95
+f 86//86 87//87 97//97 96//96
+f 87//87 88//88 98//98 97//97
+f 88//88 89//89 99//99 98//98
+f 89//89 90//90 100//100 99//99
+f 90//90 81//81 91//91 100//100
+f 91//91 92//92 102//102 101//101
+f 92//92 93//93 103//103 102//102
+f 93//93 94//94 104//104 103//103
+f 94//94 95//95 105//105 104//104
+f 95//95 96//96 106//106 105//105
+f 96//96 97//97 107//107 106//106
+f 97//97 98//98 108//108 107//107
+f 98//98 99//99 109//109 108//108
+f 99//99 100//100 110//110 109//109
+f 100//100 91//91 101//101 110//110
+f 101//101 102//102 112//112 111//111
+f 102//102 103//103 113//113 112//112
+f 103//103 104//104 114//114 113//113
+f 104//104 105//105 115//115 114//114
+f 105//105 106//106 116//116 115//115
+f 106//106 107//107 117//117 116//116
+f 107//107 108//108 118//118 117//117
+f 108//108 109//109 119//119 118//118
+f 109//109 110//110 120//120 119//119
+f 110//110 101//101 111//111 120//120
+f 111//111 112//112 122//122 121//121
+f 112//112 113//113 123//123 122//122
+f 113//113 114//114 124//124 123//123
+f 114//114 115//115 125//125 124//124
+f 115//115 116//116 126//126 125//125
+f 116//116 117//117 127//127 126//126
+f 117//117 118//118 128//128 127//127
+f 118//118 119//119 129//129 128//128
+f 119//119 120//120 130//130 129//129
+f 120//120 111//111 121//121 130//130
+f 121//121 122//122 132//132 131//131
+f 122//122 123//123 133//133 132//132
+f 123//123 124//124 134//134 133//133
+f 124//124 125//125 135//135 134//134
+f 125//125 126//126 136//136 135//135
+f 126//126 127//127 137//137 136//136
+f 127//127 128//128 138//138 137//137
+f 128//128 129//129 139//139 138//138
+f 129//129 130//130 140//140 139//139
+f 130//130 121//121 131//131 140//140
+f 131//131 132//132 142//142 141//141
+f 132//132 133//133 143//143 142//142
+f 133//133 134//134 144//144 143//143
+f 134//134 135//135 145//145 144//144
+f 135//135 136//136 146//146 145//145
+f 136//136 137//137 147//147 146//146
+f 137//137 138//138 148//148 147//147
+f 138//138 139//139 149//149 148//148
+f 139//139 140//140 150//150 149//149
+f 140//140 131//131 141//141 150//150
+f 141//141 142//142 152//152 151//151
+f 142//142 143//143 153//153 152//152
+f 143//143 144//144 154//154 153//153
+f 144//144 145//145 155//155 154//154
+f 145//145 146//146 156//156 155//155
+f 146//146 147//147 157//157 156//156
+f 147//147 148//148 158//158 157//157
+f 148//148 149//149 159//159 158//158
+f 149//149 150//150 160//160 159//159
+f 150//150 141//141 151//151 160//160
+f 151//151 152//152 162//162 161//161
+f 152//152 153//153 163//163 162//162
+f 153//153 154//154 164//164 163//163
+f 154//154 155//155 165//165 164//164
+f 155//155 156//156 166//166 165//165
+f 156//156 157//157 167//167 166//166
+f 157//157 158//158 168//168 167//167
+f 158//158 159//159 169//169 168//168
+f 159//159 160//160 170//170 169//169
+f 160//160 151//151 161//161 170//170
+f 161//161 162//162 172//172 171//171
+f 162//162 163//163 173//173 172//172
+f 163//163 164//164 174//174 173//173
+f 164//164 165//165 175//175 174//174
+f 165//165 166//166 176//176 175//175
+f 166//166 167//167 177//177 176//176
+f 167//167 168//168 178//178 177//177
+f 168//168 169//169 179//179 178//178
+f 169//169 170//170 180//180 179//179
+f 170//170 161//161 171//171 180//180
+f 171//171 172//172 182//182 181//181
+f 172//172 173//173 183//183 182//182
+f 173//173 174//174 184//184 183//183
+f 174//174 175//175 185//185 184//184
+f 175//175 176//176 186//186 185//185
+f 176//176 177//177 187//187 186//186
+f 177//177 178//178 188//188 187//187
+f 178//178 179//179 189//189 188//188
+f 179//179 180//180 190//190 189//189
+f 180//180 171//171 181//181 190//190
+f 181//181 182//182 192//192 191//191
+f 182//182 183//183 193//193 192//192
+f 183//183 184//184 194//194 193//193
+f 184//184 185//185 195//195 194//194
+f 185//185 186//186 196//196 195//195
+f 186//186 187//187 197//197 196//196
+f 187//187 188//188 198//198 197//197
+f 188//188 189//189 199//199 198//198
+f 189//189 190//190 200//200 199//199
+f 190//190 181//181 191//191 200//200
+f 191//191 192//192 202//202 201//201
+f 192//192 193//193 203//203 202//202
+f 193//193 194//194 204//204 203//203
+f 194//194 195//195 205//205 204//204
+f 195//195 196//196 206//206 205//205
+f 196//196 197//197 207//207 206//206
+f 197//197 198//198 208//208 207//207
+f 198//198 199//199 209//209 208//208
+f 199//199 200//200 210//210 209//209
+f 200//200 191//191 201//201 210//210
+f 201//201 202//202 212//212 211//211
+f 202//202 203//203 213//213 212//212
+f 203//203 204//204 214//214 213//213
+f 204//204 205//205 215//215 214//214
+f 205//205 206//206 216//216 215//215
+f 206//206 207//207 217//217 216//216
+f 207//207 208//208 218//218 217//217
+f 208//208 209//209 219//219 218//218
+f 209//209 210//210 220//220 219//219
+f 210//210 201//201 211//211 220//220
+f 211//211 212//212 222//222 221//221
+f 212//212 213//213 223//223 222//222
+f 213//213 214//214 224//224 223//223
+f 214//214 215//215 225//225 224//224
+f 215//215 216//216 226//226 225//225
+f 216//216 217//217 227//227 226//226
+f 217//217 218//218 228//228 227//227
+f 218//218 219//219 229//229 228//228
+f 219//219 220//220 230//230 229//229
+f 220//220 211//211 221//221 230//230
+f 221//221 222//222 232//232 231//231
+f 222//222 223//223 233//233 232//232
+f 223//223 224//224 234//234 233//233
+f 224//224 225//225 235//235 234//234
+f 225//225 226//226 236//236 235//235
+f 226//226 227//227 237//237 236//236
+f 227//227 228//228 238//238 237//237
+f 228//228 229//229 239//239 238//238
+f 229//229 230//230 240//240 239//239
+f 230//230 221//221 231//231 240//240
+f 231//231 232//232 242//242 241//241
+f 232//232 233//233 243//243 242//242
+f 233//233 234//234 244//244 243//243
+f 234//234 235//235 245//245 244//244
+f 235//235 236//236 246//246 245//245
+f 236//236 237//237 247//247 246//246
+f 237//237 238//238 248//248 247//247
+f 238//238 239//239 249//249 248//248
+f 239//239 240//240 250//250 249//249
+f 240//240 231//231 241//241 250//250
+f 241//241 242//242 252//252 251//251
+f 242//242 243//243 253//253 252//252
+f 243//243 244//244 254//254 253//253
+f 244//244 245//245 255//255 254//254
+f 245//245 246//246 256//256 255//255
+f 246//246 247//247 257//257 256//256
+f 247//247 248//248 258//258 257//257
+f 248//248 249//249 259//259 258//258
+f 249//249 250//250 260//260 259//259
+f 250//250 241//241 251//251 260//260
+f 251//251 252//252 262//262 261//261
+f 252//252 253//253 263//263 262//262
+f 253//253 254//254 264//264 263//263
+f 254//254 255//255 265//265 264//264
+f 255//255 256//256 266//266 265//265
+f 256//256 257//257 267//267 266//266
+f 257//257 258//258 268//268 267//267
+f 258//258 259//259 269//269 268//268
+f 259//259 260//260 270//270 269//269
+f 260//260 251//251 261//261 270//270
+f 261//261 262//262 272//272 271//271
+f 262//262 263//263 273//273 272//272
+f 263//263 264//264 274//274 273//273
+f 264//264 265//265 275//275 274//274
+f 265//265 266//266 276//276 275//275
+f 266//266 267//267 277//277 276//276
+f 267//267 268//268 278//278 277//277
+f 268//268 269//269 279//279 278//278
+f 269//269 270//270 280//280 279//279
+f 270//270 261//261 271//271 280//280
+f 271//271 272//272 282//282 281//281
+f 272//272 273//273 283//283 282//282
+f 273//273 274//274 284//284 283//283
+f 274//274 275//275 285//285 284//284
+f 275//275 276//276 286//286 285//285
+f 276//276 277//277 287//287 286//286
+f 277//277 278//278 288//288 287//287
+f 278//278 279//279 289//289 288//288
+f 279//279 280//280 290//290 289//289
+f 280//280 271//271 281//281 290//290
+f 281//281 282//282 292//292 291//291
+f 282//282 283//283 293//293 292//292
+f 283//283 284//284 294//294 293//293
+f 284//284 285//285 295//295 294//294
+f 285//285 286//286 296//296 295//295
+f 286//286 287//287 297//297 296//296
+f 287//287 288//288 298//298 297//297
+f 288//288 289//289 299//299 298//298
+f 289//289 290//290 300//300 299//299
+f 290//290 281//281 291//291 300//300
+f 291//291 292//292 302//302 301//301
+f 292//292 293//293 303//303 302//302
+f 293//293 294//294 304//304 303//303
+f 294//294 295//295 305//305 304//304
+f 295//295 296//296 306//306 305//305
+f 296//296 297//297 307//307 306//306
+f 297//297 298//298 308//308 307//307
+f 298//298 299//299 309//309 308//308
+f 299//299 300//300 310//310 309//309
+f 300//300 291//291 301//301 310//310
+f 301//301 302//302 312//312 311//311
+f 302//302 303//303 313//313 312//312
+f 303//303 304//304 314//314 313//313
+f 304//304 305//305 315//315 314//314
+f 305//305 306//306 316//316 315//315
+f 306//306 307//307 317//317 316//316
+f 307//307 308//308 318//318 317//317
+f 308//308 309//309 319//319 318//318
+f 309//309 310//310 320//320 319//319
+f 310//310 301//301 311//311 320//320
+f 311//311 312//312 322//322 321//321
+f 312//312 313//313 323//323 322//322
+f 313//313 314//314 324//324 323//323
+f 314//314 315//315 325//325 324//324
+f 315//315 316//316 326//326 325//325
+f 316//316 317//317 327//327 326//326
+f 317//317 318//318 328//328 327//327
+f 318//318 319//319 329//329 328//328
+f 319//319 320//320 330//330 329//329
+f 320//320 311//311 321//321 330//330
+f 321//321 322//322 332//332 331//331
+f 322//322 323//323 333//333 332//332
+f 323//323 324//324 334//334 333//333
+f 324//324 325//325 335//335 334//334
+f 325//325 326//326 336//336 335//335
+f 326//326 327//327 337//337 336//336
+f 327//327 328//328 338//338 337//337
+f 328//328 329//329 339//339 338//338
+f 329//329 330//330 340//340 339//339
+f 330//330 321//321 331//331 340//340
+f 331//331 332//332 342//342 341//341
+f 332//332 333//333 343//343 342//342
+f 333//333 334//334 344//344 343//343
+f 334//334 335//335 345//345 344//344
+f 335//335 336//336 346//346 345//345
+f 336//336 337//337 347//347 346//346
+f 337//337 338//338 348//348 347//347
+f 338//338 339//339 349//349 348//348
+f 339//339 340//340 350//350 349//349
+f 340//340 331//331 341//341 350//350
+f 341//341 342//342 352//352 351//351
+f 342//342 343//343 353//353 352//352
+f 343//343 344//344 354//354 353//353
+f 344//344 345//345 355//355 354//354
+f 345//345 346//346 356//356 355//355
+f 346//346 347//347 357//357 356//356
+f 347//347 348//348 358//358 357//357
+f 348//348 349//349 359//359 358//358
+f 349//349 350//350 360//360 359//359
+f 350//350 341//341 351//351 360//360
+f 351//351 352//352 362//362 361//361
+f 352//352 353//353 363//363 362//362
+f 353//353 354//354 364//364 363//363
+f 354//354 355//355 365//365 364//364
+f 355//355 356//356 366//366 365//365
+f 356//356 357//357 367//367 366//366
+f 357//357 358//358 368//368 367//367
+f 358//358 359//359 369//369 368//368
+f 359//359 360//360 370//370 369//369
+f 360//360 351//351 361//361 370//370
+f 361//361 362//362 372//372 371//371
+f 362//362 363//363 373//373 372//372
+f 363//363 364//364 374//374 373//373
+f 364//364 365//365 375//375 374//374
+f 365//365 366//366 376//376 375//375
+f 366//366 367//367 377//377 376//376
+f 367//367 368//368 378//378 377//377
+f 368//368 369//369 379//379 378//378
+f 369//369 370//370 380//380 379//379
+f 370//370 361//361 371//371 380//380
+f 371//371 372//372 382//382 381//381
+f 372//372 373//373 383//383 382//382
+f 373//373 374//374 384//384 383//383
+f 374//374 375//375 385//385 384//384
+f 375//375 376//376 386//386 385//385
+f 376//376 377//377 387//387 386//386
+f 377//377 378//378 388//388 387//387
+f 378//378 379//379 389//389 388//388
+f 379//379 380//380 390//390 389//389
+f 380//380 371//371 381//381 390//390
+f 381//381 382//382 392//392 391//391
+f 382//382 383//383 393//393 392//392
+f 383//383 384//384 394//394 393//393
+f 384//384 385//385 395//395 394//394
+f 385//385 386//386 396//396 395//395
+f 386//386 387//387 397//397 396//396
+f 387//387 388//388 398//398 397//397
+f 388//388 389//389 399//399 398//398
+f 389//389 390//390 400//400 399//399
+f 390//390 381//381 391//391 400//400
+f 391//391 392//392 402//402 401//401
+f 392//392 393//393 403//403 402//402
+f 393//393 394//394 404//404 403//403
+f 394//394 395//395 405//405 404//404
+f 395//395 396//396 406//406 405//405
+f 396//396 397//397 407//407 406//406
+f 397//397 398//398 408//408 407//407
+f 398//398 399//399 409//409 408//408
+f 399//399 400//400 410//410 409//409
+f 400//400 391//391 401//401 410//410
+f 401//401 402//402 412//412 411//411
+f 402//402 403//403 413//413 412//412
+f 403//403 404//404 414//414 413//413
+f 404//404 405//405 415//415 414//414
+f 405//405 406//406 416//416 415//415
+f 406//406 407//407 417//417 416//416
+f 407//407 408//408 418//418 417//417
+f 408//408 409//409 419//419 418//418
+f 409//409 410//410 420//420 419//419
+f 410//410 401//401 411//411 420//420
+f 411//411 412//412 422//422 421//421
+f 412//412 413//413 423//423 422//422
+f 413//413 414//414 424//424 423//423
+f 414//414 415//415 425//425 424//424
+f 415//415 416//416 426//426 425//425
+f 416//416 417//417 427//427 426//426
+f 417//417 418//418 428//428 427//427
+f 418//418 419//419 429//429 428//428
+f 419//419 420//420 430//430 429//429
+f 420//420 411//411 421//421 430//430
+f 421//421 422//422 432//432 431//431
+f 422//422 423//423 433//433 432//432
+f 423//423 424//424 434//434 433//433
+f 424//424 425//425 435//435 434//434
+f 425//425 426//426 436//436 435//435
+f 426//426 427//427 437//437 436//436
+f 427//427 428//428 438//438 437//437
+f 428//428 429//429 439//439 438//438
+f 429//429 430//430 440//440 439//439
+f 430//430 421//421 431//431 440//440
+f 431//431 432//432 442//442 441//441
+f 432//432 433//433 443//443 442//442
+f 433//433 434//434 444//444 443//443
+f 434//434 435//435 445//445 444//444
+f 435//435 436//436 446//446 445//445
+f 436//436 437//437 447//447 446//446
+f 437//437 438//438 448//448 447//447
+f 438//438 439//439 449//449 448//448
+f 439//439 440//440 450//450 449//449
+f 440//440 431//431 441//441 450//450
+f 441//441 442//442 452//452 451//451
+f 442//442 443//443 453//453 452//452
+f 443//443 444//444 454//454 453//453
+f 444//444 445//445 455//455 454//454
+f 445//445 446//446 456//456 455//455
+f 446//446 447//447 457//457 456//456
+f 447//447 448//448 458//458 457//457
+f 448//448 449//449 459//459 458//458
+f 449//449 450//450 460//460 459//459
+f 450//450 441//441 451//451 460//460
+f 451//451 452//452 462//462 461//461
+f 452//452 453//453 463//463 462//462
+f 453//453 454//454 464//464 463//463
+f 454//454 455//455 465//465 464//464
+f 455//455 456//456 466//466 465//465
+f 456//456 457//457 467//467 466//466
+f 457//457 458//458 468//468 467//467
+f 458//458 459//459 469//469 468//468
+f 459//459 460//460 470//470 469//469
+f 460//460 451//451 461//461 470//470
+f 461//461 462//462 472//472 471//471
+f 462//462 463//463 473//473 472//472
+f 463//463 464//464 474//474 473//473
+f 464//464 465//465 475//475 474//474
+f 465//465 466//466 476//476 475//475
+f 466//466 467//467 477//477 476//476
+f 467//467 468//468 478//478 477//477
+f 468//468 469//469 479//479 478//478
+f 469//469 470//470 480//480 479//479
+f 470//470 461//461 471//471 480//480
+f 471//471 472//472 482//482 481//481
+f 472//472 473//473 483//483 482//482
+f 473//473 474//474 484//484 483//483
+f 474//474 475//475 485//485 484//484
+f 475//475 476//476 486//486 485//485
+f 476//476 477//477 487//487 486//486
+f 477//477 478//478 488//488 487//487
+f 478//478 479//479 489//489 488//488
+f 479//479 480//480 490//490 489//489
+f 480//480 471//471 481//481 490//490
+f 481//481 482//482 492//492 491//491
+f 482//482 483//483 493//493 492//492
+f 483//483 484//484 494//494 493//493
+f 484//484 485//485 495//495 494//494
+f 485//485 486//486 496//496 495//495
+f 486//486 487//487 497//497 496//496
+f 487//487 488//488 498//498 497//497
+f 488//488 489//489 499//499 498//498
+f 489//489 490//490 500//500 499//499
+f 490//490 481//481 491//491 500//500
+f 491//491 492//492 502//502 501//501
+f 492//492 493//493 503//503 502//502
+f 493//493 494//494 504//504 503//503
+f 494//494 495//495 505//505 504//504
+f 495//495 496//496 506//506 505//505
+f 496//496 497//497 507//507 506//506
+f 497//497 498//498 508//508 507//507
+f 498//498 499//499 509//509 508//508
+f 499//499 500//500 510//510 509//509
+f 500//500 491//491 501//501 510//510
+f 501//501 502//502 512//512 511//511
+f 502//502 503//503 513//513 512//512
+f 503//503 504//504 514//514 513//513
+f 504//504 505//505 515//515 514//514
+f 505//505 506//506 516//516 515//515
+f 506//506 507//507 517//517 516//516
+f 507//507 508//508 518//518 517//517
+f 508//508 509//509 519//519 518//518
+f 509//509 510//510 520//520 519//519
+f 510//510 501//501 511//511 520//520
+f 511//511 512//512 522//522 521//521
+f 512//512 513//513 523//523 522//522
+f 513//513 514//514 524//524 523//523
+f 514//514 515//515 525//525 524//524
+f 515//515 516//516 526//526 525//525
+f 516//516 517//517 527//527 526//526
+f 517//517 518//518 528//528 527//527
+f 518//518 519//519 529//529 528//528
+f 519//519 520//520 530//530 529//529
+f 520//520 511//511 521//521 530//530
+f 521//521 522//522 532//532 531//531
+f 522//522 523//523 533//533 532//532
+f 523//523 524//524 534//534 533//533
+f 524//524 525//525 535//535 534//534
+f 525//525 526//526 536//536 535//535
+f 526//526 527//527 537//537 536//536
+f 527//527 528//528 538//538 537//537
+f 528//528 529//529 539//539 538//538
+f 529//529 530//530 540//540 539//539
+f 530//530 521//521 531//531 540//540
+f 531//531 532//532 542//542 541//541
+f 532//532 533//533 543//543 542//542
+f 533//533 534//534 544//544 543//543
+f 534//534 535//535 545//545 544//544
+f 535//535 536//536 546//546 545//545
+f 536//536 537//537 547//547 546//546
+f 537//537 538//538 548//548 547//547
+f 538//538 539//539 549//549 548//548
+f 539//539 540//540 550//550 549//549
+f 540//540 531//531 541//541 550//550
+f 541//541 542//542 552//552 551//551
+f 542//542 543//543 553//553 552//552
+f 543//543 544//544 554//554 553//553
+f 544//544 545//545 555//555 554//554
+f 545//545 546//546 556//556 555//555
+f 546//546 547//547 557//557 556//556
+f 547//547 548//548 558//558 557//557
+f 548//548 549//549 559//559 558//558
+f 549//549 550//550 560//560 559//559
+f 550//550 541//541 551//551 560//560
+f 551//551 552//552 562//562 561//561
+f 552//552 553//553 563//563 562//562
+f 553//553 554//554 564//564 563//563
+f 554//554 555//555 565//565 564//564
+f 555//555 556//556 566//566 565//565
+f 556//556 557//557 567//567 566//566
+f 557//557 558//558 568//568 567//567
+f 558//558 559//559 569//569 568//568
+f 559//559 560//560 570//570 569//569
+f 560//560 551//551 561//561 570//570
+f 561//561 562//562 572//572 571//571
+f 562//562 563//563 573//573 572//572
+f 563//563 564//564 574//574 573//573
+f 564//564 565//565 575//575 574//574
+f 565//565 566//566 576//576 575//575
+f 566//566 567//567 577//577 576//576
+f 567//567 568//568 578//578 577//577
+f 568//568 569//569 579//579 578//578
+f 569//569 570//570 580//580 579//579
+f 570//570 561//561 571//571 580//580
+f 571//571 572//572 582//582 581//581
+f 572//572 573//573 583//583 582//582
+f 573//573 574//574 584//584 583//583
+f 574//574 575//575 585//585 584//584
+f 575//575 576//576 586//586 585//585
+f 576//576 577//577 587//587 586//586
+f 577//577 578//578 588//588 587//587
+f 578//578 579//579 589//589 588//588
+f 579//579 580//580 590//590 589//589
+f 580//580 571//571 581//581 590//590
+f 581//581 582//582 592//592 591//591
+f 582//582 583//583 593//593 592//592
+f 583//583 584//584 594//594 593//593
+f 584//584 585//585 595//595 594//594
+f 585//585 586//586 596//596 595//595
+f 586//586 587//587 597//597 596//596
+f 587//587 588//588 598//598 597//597
+f 588//588 589//589 599//599 598//598
+f 589//589 590//590 600//600 599//599
+f 590//590 581//581 591//591 600//600
+f 591//591 592//592 602//602 601//601
+f 592//592 593//593 603//603 602//602
+f 593//593 594//594 604//604 603//603
+f 594//594 595//595 605//605 604//604
+f 595//595 596//596 606//606 605//605
+f 596//596 597//597 607//607 606//606
+f 597//597 598//598 608//608 607//607
+f 598//598 599//599 609//609 608//608
+f 599//599 600//600 610//610 609//609
+f 600//600 591//591 601//601 610//610
+f 601//601 602//602 612//612 611//611
+f 602//602 603//603 613//613 612//612
+f 603//603 604//604 614//614 613//613
+f 604//604 605//605 615//615 614//614
+f 605//605 606//606 616//616 615//615
+f 606//606 607//607 617//617 616//616
+f 607//607 608//608 618//618 617//617
+f 608//608 609//609 619//619 618//618
+f 609//609 610//610 620//620 619//619
+f 610//610 601//601 611//611 620//620
+f 611//611 612//612 622//622 621//621
+f 612//612 613//613 623//623 622//622
+f 613//613 614//614 624//624 623//623
+f 614//614 615//615 625//625 624//624
+f 615//615 616//616 626//626 625//625
+f 616//616 617//617 627//627 626//626
+f 617//617 618//618 628//628 627//627
+f 618//618 619//619 629//629 628//628
+f 619//619 620//620 630//630 629//629
+f 620//620 611//611 621//621 630//630
+f 621//621 622//622 632//632 631//631
+f 622//622 623//623 633//633 632//632
+f 623//623 624//624 634//634 633//633
+f 624//624 625//625 635//635 634//634
+f 625//625 626//626 636//636 635//635
+f 626//626 627//627 637//637 636//636
+f 627//627 628//628 638//638 637//637
+f 628//628 629//629 639//639 638//638
+f 629//629 630//630 640//640 639//639
+f 630//630 621//621 631//631 640//640
+f 631//631 632//632 642//642 641//641
+f 632//632 633//633 643//643 642//642
+f 633//633 634//634 644//644 643//643
+f 634//634 635//635 645//645 644//644
+f 635//635 636//636 646//646 645//645
+f 636//636 637//637 647//647 646//646
+f 637//637 638//638 648//648 647//647
+f 638//638 639//639 649//649 648//648
+f 639//639 640//640 650//650 649//649
+f 640//640 631//631 641//641 650//650
+f 641//641 642//642 652//652 651//651
+f 642//642 643//643 653//653 652//652
+f 643//643 644//644 654//654 653//653
+f 644//644 645//645 655//655 654//654
+f 645//645 646//646 656//656 655//655
+f 646//646 647//647 657//657 656//656
+f 647//647 648//648 658//658 657//657
+f 648//648 649//649 659//659 658//658
+f 649//649 650//650 660//660 659//659
+f 650//650 641//641 651//651 660//660
+f 651//651 652//652 662//662 661//661
+f 652//652 653//653 663//663 662//662
+f 653//653 654//654 664//664 663//663
+f 654//654 655//655 665//665 664//664
+f 655//655 656//656 666//666 665//665
+f 656//656 657//657 667//667 666//666
+f 657//657 658//658 668//668 667//667
+f 658//658 659//659 669//669 668//668
+f 659//659 660//660 670//670 669//669
+f 660//660 651//651 661//661 670//670
+f 661//661 662//662 672//672 671//671
+f 662//662 663//663 673//673 672//672
+f 663//663 664//664 674//674 673//673
+f 664//664 665//665 675//675 674//674
+f 665//665 666//666 676//676 675//675
+f 666//666 667//667 677//677 676//676
+f 667//667 668//668 678//678 677//677
+f 668//668 669//669 679//679 678//678
+f 669//669 670//670 680//680 679//679
+f 670//670 661//661 671//671 680//680
+f 671//671 672//672 682//682 681//681
+f 672//672 673//673 683//683 682//682
+f 673//673 674//674 684//684 683//683
+f 674//674 675//675 685//685 684//684
+f 675//675 676//676 686//686 685//685
+f 676//676 677//677 687//687 686//686
+f 677//677 678//678 688//688 687//687
+f 678//678 679//679 689//689 688//688
+f 679//679 680//680 690//690 689//689
+f 680//680 671//671 681//681 690//690
+f 681//681 682//682 692//692 691//691
+f 682//682 683//683 693//693 692//692
+f 683//683 684//684 694//694 693//693
+f 684//684 685//685 695//695 694//694
+f 685//685 686//686 696//696 695//695
+f 686//686 687//687 697//697 696//696
+f 687//687 688//688 698//698 697//697
+f 688//688 689//689 699//699 698//698
+f 689//689 690//690 700//700 699//699
+f 690//690 681//681 691//691 700//700
+f 691//691 692//692 702//702 701//701
+f 692//692 693//693 703//703 702//702
+f 693//693 694//694 704//704 703//703
+f 694//694 695//695 705//705 704//704
+f 695//695 696//696 706//706 705//705
+f 696//696 697//697 707//707 706//706
+f 697//697 698//698 708//708 707//707
+f 698//698 699//699 709//709 708//708
+f 699//699 700//700 710//710 709//709
+f 700//700 691//691 701//701 710//710
+f 701//701 702//702 712//712 711//711
+f 702//702 703//703 713//713 712//712
+f 703//703 704//704 714//714 713//713
+f 704//704 705//705 715//715 714//714
+f 705//705 706//706 716//716 715//715
+f 706//706 707//707 717//717 716//716
+f 707//707 708//708 718//718 717//717
+f 708//708 709//709 719//719 718//718
+f 709//709 710//710 720//720 719//719
+f 710//710 701//701 711//711 720//720
+f 711//711 712//712 722//722 721//721
+f 712//712 713//713 723//723 722//722
+f 713//713 714//714 724//724 723//723
+f 714//714 715//715 725//725 724//724
+f 715//715 716//716 726//726 725//725
+f 716//716 717//717 727//727 726//726
+f 717//717 718//718 728//728 727//727
+f 718//718 719//719 729//729 728//728
+f 719//719 720//720 730//730 729//729
+f 720//720 711//711 721//721 730//730
+f 721//721 722//722 732//732 731//731
+f 722//722 723//723 733//733 732//732
+f 723//723 724//724 734//734 733//733
+f 724//724 725//725 735//735 734//734
+f 725//725 726//726 736//736 735//735
+f 726//726 727//727 737//737 736//736
+f 727//727 728//728 738//738 737//737
+f 728//728 729//729 739//739 738//738
+f 729//729 730//730 740//740 739//739
+f 730//730 721//721 731//731 740//740
+f 731//731 732//732 742//742 741//741
+f 732//732 733//733 743//743 742//742
+f 733//733 734//734 744//744 743//743
+f 734//734 735//735 745//745 744//744
+f 735//735 736//736 746//746 745//745
+f 736//736 737//737 747//747 746//746
+f 737//737 738//738 748//748 747//747
+f 738//738 739//739 749//749 748//748
+f 739//739 740//740 750//750 749//749
+f 740//740 731//731 741//741 750//750
+f 741//741 742//742 752//752 751//751
+f 742//742 743//743 753//753 752//752
+f 743//743 744//744 754//754 753//753
+f 744//744 745//745 755//755 754//754
+f 745//745 746//746 756//756 755//755
+f 746//746 747//747 757//757 756//756
+f 747//747 748//748 758//758 757//757
+f 748//748 749//749 759//759 758//758
+f 749//749 750//750 760//760 759//759
+f 750//750 741//741 751//751 760//760
+f 751//751 752//752 762//762 761//761
+f 752//752 753//753 763//763 762//762
+f 753//753 754//754 764//764 763//763
+f 754//754 755//755 765//765 764//764
+f 755//755 756//756 766//766 765//765
+f 756//756 757//757 767//767 766//766
+f 757//757 758//758 768//768 767//767
+f 758//758 759//759 769//769 768//768
+f 759//759 760//760 770//770 769//769
+f 760//760 751//751 761//761 770//770
+f 761//761 762//762 772//772 771//771
+f 762//762 763//763 773//773 772//772
+f 763//763 764//764 774//774 773//773
+f 764//764 765//765 775//775 774//774
+f 765//765 766//766 776//776 775//775
+f 766//766 767//767 777//777 776//776
+f 767//767 768//768 778//778 777//777
+f 768//768 769//769 779//779 778//778
+f 769//769 770//770 780//780 779//779
+f 770//770 761//761 771//771 780//780
+f 771//771 772//772 782//782 781//781
+f 772//772 773//773 783//783 782//782
+f 773//773 774//774 784//784 783//783
+f 774//774 775//775 785//785 784//784
+f 775//775 776//776 786//786 785//785
+f 776//776 777//777 787//787 786//786
+f 777//777 778//778 788//788 787//787
+f 778//778 779//779 789//789 788//788
+f 779//779 780//780 790//790 789//789
+f 780//780 771//771 781//781 790//790
+f 781//781 782//782 792//792 791//791
+f 782//782 783//783 793//793 792//792
+f 783//783 784//784 794//794 793//793
+f 784//784 785//785 795//795 794//794
+f 785//785 786//786 796//796 795//795
+f 786//786 787//787 797//797 796//796
+f 787//787 788//788 798//798 797//797
+f 788//788 789//789 799//799 798//798
+f 789//789 790//790 800//800 799//799
+f 790//790 781//781 791//791 800//800
+f 791//791 792//792 802//802 801//801
+f 792//792 793//793 803//803 802//802
+f 793//793 794//794 804//804 803//803
+f 794//794 795//795 805//805 804//804
+f 795//795 796//796 806//806 805//805
+f 796//796 797//797 807//807 806//806
+f 797//797 798//798 808//808 807//807
+f 798//798 799//799 809//809 808//808
+f 799//799 800//800 810//810 809//809
+f 800//800 791//791 801//801 810//810
+f 801//801 802//802 812//812 811//811
+f 802//802 803//803 813//813 812//812
+f 803//803 804//804 814//814 813//813
+f 804//804 805//805 815//815 814//814
+f 805//805 806//806 816//816 815//815
+f 806//806 807//807 817//817 816//816
+f 807//807 808//808 818//818 817//817
+f 808//808 809//809 819//819 818//818
+f 809//809 810//810 820//820 819//819
+f 810//810 801//801 811//811 820//820
+f 811//811 812//812 822//822 821//821
+f 812//812 813//813 823//823 822//822
+f 813//813 814//814 824//824 823//823
+f 814//814 815//815 825//825 824//824
+f 815//815 816//816 826//826 825//825
+f 816//816 817//817 827//827 826//826
+f 817//817 818//818 828//828 827//827
+f 818//818 819//819 829//829 828//828
+f 819//819 820//820 830//830 829//829
+f 820//820 811//811 821//821 830//830
+f 821//821 822//822 832//832 831//831
+f 822//822 823//823 833//833 832//832
+f 823//823 824//824 834//834 833//833
+f 824//824 825//825 835//835 834//834
+f 825//825 826//826 836//836 835//835
+f 826//826 827//827 837//837 836//836
+f 827//827 828//828 838//838 837//837
+f 828//828 829//829 839//839 838//838
+f 829//829 830//830 840//840 839//839
+f 830//830 821//821 831//831 840//840
+f 831//831 832//832 842//842 841//841
+f 832//832 833//833 843//843 842//842
+f 833//833 834//834 844//844 843//843
+f 834//834 835//835 845//845 844//844
+f 835//835 836//836 846//846 845//845
+f 836//836 837//837 847//847 846//846
+f 837//837 838//838 848//848 847//847
+f 838//838 839//839 849//849 848//848
+f 839//839 840//840 850//850 849//849
+f 840//840 831//831 841//841 850//850
+f 841//841 842//842 852//852 851//851
+f 842//842 843//843 853//853 852//852
+f 843//843 844//844 854//854 853//853
+f 844//844 845//845 855//855 854//854
+f 845//845 846//846 856//856 855//855
+f 846//846 847//847 857//857 856//856
+f 847//847 848//848 858//858 857//857
+f 848//848 849//849 859//859 858//858
+f 849//849 850//850 860//860 859//859
+f 850//850 841//841 851//851 860//860
+f 851//851 852//852 862//862 861//861
+f 852//852 853//853 863//863 862//862
+f 853//853 854//854 864//864 863//863
+f 854//854 855//855 865//865 864//864
+f 855//855 856//856 866//866 865//865
+f 856//856 857//857 867//867 866//866
+f 857//857 858//858 868//868 867//867
+f 858//858 859//859 869//869 868//868
+f 859//859 860//860 870//870 869//869
+f 860//860 851//851 861//861 870//870
+f 861//861 862//862 872//872 871//871
+f 862//862 863//863 873//873 872//872
+f 863//863 864//864 874//874 873//873
+f 864//864 865//865 875//875 874//874
+f 865//865 866//866 876//876 875//875
+f 866//866 867//867 877//877 876//876
+f 867//867 868//868 878//878 877//877
+f 868//868 869//869 879//879 878//878
+f 869//869 870//870 880//880 879//879
+f 870//870 861//861 871//871 880//880
+f 871//871 872//872 882//882 881//881
+f 872//872 873//873 883//883 882//882
+f 873//873 874//874 884//884 883//883
+f 874//874 875//875 885//885 884//884
+f 875//875 876//876 886//886 885//885
+f 876//876 877//877 887//887 886//886
+f 877//877 878//878 888//888 887//887
+f 878//878 879//879 889//889 888//888
+f 879//879 880//880 890//890 889//889
+f 880//880 871//871 881//881 890//890
+f 881//881 882//882 892//892 891//891
+f 882//882 883//883 893//893 892//892
+f 883//883 884//884 894//894 893//893
+f 884//884 885//885 895//895 894//894
+f 885//885 886//886 896//896 895//895
+f 886//886 887//887 897//897 896//896
+f 887//887 888//888 898//898 897//897
+f 888//888 889//889 899//899 898//898
+f 889//889 890//890 900//900 899//899
+f 890//890 881//881 891//891 900//900
+f 891//891 892//892 2//2 1//1
+f 892//892 893//893 3//3 2//2
+f 893//893 894//894 4//4 3//3
+f 894//894 895//895 5//5 4//4
+f 895//895 896//896 6//6 5//5
+f 896//896 897//897 7//7 6//6
+f 897//897 898//898 8//8 7//7
+f 898//898 899//899 9//9 8//8
+f 899//899 900//900 10//10 9//9
+f 900//900 891//891 1//1 10//10
+o base
+v 4.2000 0.0000 -1.6 0.35 0.35 0.4
+v 4.2000 0.0000 -1.2 0.6 0.6 0.65
+v 4.1641 0.5482 -1.6 0.35 0.35 0.4
+v 4.1641 0.5482 -1.2 0.6 0.6 0.65
+v 4.0569 1.0870 -1.6 0.35 0.35 0.4
+v 4.0569 1.0870 -1.2 0.6 0.6 0.65
+v 3.8803 1.6073 -1.6 0.35 0.35 0.4
+v 3.8803 1.6073 -1.2 0.6 0.6 0.65
+v 3.6373 2.1000 -1.6 0.35 0.35 0.4
+v 3.6373 2.1000 -1.2 0.6 0.6 0.65
+v 3.3321 2.5568 -1.6 0.35 0.35 0.4
+v 3.3321 2.5568 -1.2 0.6 0.6 0.65
+v 2.9698 2.9698 -1.6 0.35 0.35 0.4
+v 2.9698 2.9698 -1.2 0.6 0.6 0.65
+v 2.5568 3.3321 -1.6 0.35 0.35 0.4
+v 2.5568 3.3321 -1.2 0.6 0.6 0.65
+v 2.1000 3.6373 -1.6 0.35 0.35 0.4
+v 2.1000 3.6373 -1.2 0.6 0.6 0.65
+v 1.6073 3.8803 -1.6 0.35 0.35 0.4
+v 1.6073 3.8803 -1.2 0.6 0.6 0.65
+v 1.0870 4.0569 -1.6 0.35 0.35 0.4
+v 1.0870 4.0569 -1.2 0.6 0.6 0.65
+v 0.5482 4.1641 -1.6 0.35 0.35 0.4
+v 0.5482 4.1641 -1.2 0.6 0.6 0.65
+v 0.0000 4.2000 -1.6 0.35 0.35 0.4
+v 0.0000 4.2000 -1.2 0.6 0.6 0.65
+v -0.5482 4.1641 -1.6 0.35 0.35 0.4
+v -0.5482 4.1641 -1.2 0.6 0.6 0.65
+v -1.0870 4.0569 -1.6 0.35 0.35 0.4
+v -1.0870 4.0569 -1.2 0.6 0.6 0.65
+v -1.6073 3.8803 -1.6 0.35 0.35 0.4
+v -1.6073 3.8803 -1.2 0.6 0.6 0.65
+v -2.1000 3.6373 -1.6 0.35 0.35 0.4
+v -2.1000 3.6373 -1.2 0.6 0.6 0.65
+v -2.5568 3.3321 -1.6 0.35 0.35 0.4
+v -2.5568 3.3321 -1.2 0.6 0.6 0.65
+v -2.9698 2.9698 -1.6 0.35 0.35 0.4
+v -2.9698 2.9698 -1.2 0.6 0.6 0.65
+v -3.3321 2.5568 -1.6 0.35 0.35 0.4
+v -3.3321 2.5568 -1.2 0.6 0.6 0.65
+v -3.6373 2.1000 -1.6 0.35 0.35 0.4
+v -3.6373 2.1000 -1.2 0.6 0.6 0.65
+v -3.8803 1.6073 -1.6 0.35 0.35 0.4
+v -3.8803 1.6073 -1.2 0.6 0.6 0.65
+v -4.0569 1.0870 -1.6 0.35 0.35 0.4
+v -4.0569 1.0870 -1.2 0.6 0.6 0.65
+v -4.1641 0.5482 -1.6 0.35 0.35 0.4
+v -4.1641 0.5482 -1.2 0.6 0.6 0.65
+v -4.2000 0.0000 -1.6 0.35 0.35 0.4
+v -4.2000 0.0000 -1.2 0.6 0.6 0.65
+v -4.1641 -0.5482 -1.6 0.35 0.35 0.4
+v -4.1641 -0.5482 -1.2 0.6 0.6 0.65
+v -4.0569 -1.0870 -1.6 0.35 0.35 0.4
+v -4.0569 -1.0870 -1.2 0.6 0.6 0.65
+v -3.8803 -1.6073 -1.6 0.35 0.35 0.4
+v -3.8803 -1.6073 -1.2 0.6 0.6 0.65
+v -3.6373 -2.1000 -1.6 0.35 0.35 0.4
+v -3.6373 -2.1000 -1.2 0.6 0.6 0.65
+v -3.3321 -2.5568 -1.6 0.35 0.35 0.4
+v -3.3321 -2.5568 -1.2 0.6 0.6 0.65
+v -2.9698 -2.9698 -1.6 0.35 0.35 0.4
+v -2.9698 -2.9698 -1.2 0.6 0.6 0.65
+v -2.5568 -3.3321 -1.6 0.35 0.35 0.4
+v -2.5568 -3.3321 -1.2 0.6 0.6 0.65
+v -2.1000 -3.6373 -1.6 0.35 0.35 0.4
+v -2.1000 -3.6373 -1.2 0.6 0.6 0.65
+v -1.6073 -3.8803 -1.6 0.35 0.35 0.4
+v -1.6073 -3.8803 -1.2 0.6 0.6 0.65
+v -1.0870 -4.0569 -1.6 0.35 0.35 0.4
+v -1.0870 -4.0569 -1.2 0.6 0.6 0.65
+v -0.5482 -4.1641 -1.6 0.35 0.35 0.4
+v -0.5482 -4.1641 -1.2 0.6 0.6 0.65
+v -0.0000 -4.2000 -1.6 0.35 0.35 0.4
+v -0.0000 -4.2000 -1.2 0.6 0.6 0.65
+v 0.5482 -4.1641 -1.6 0.35 0.35 0.4
+v 0.5482 -4.1641 -1.2 0.6 0.6 0.65
+v 1.0870 -4.0569 -1.6 0.35 0.35 0.4
+v 1.0870 -4.0569 -1.2 0.6 0.6 0.65
+v 1.6073 -3.8803 -1.6 0.35 0.35 0.4
+v 1.6073 -3.8803 -1.2 0.6 0.6 0.65
+v 2.1000 -3.6373 -1.6 0.35 0.35 0.4
+v 2.1000 -3.6373 -1.2 0.6 0.6 0.65
+v 2.5568 -3.3321 -1.6 0.35 0.35 0.4
+v 2.5568 -3.3321 -1.2 0.6 0.6 0.65
+v 2.9698 -2.9698 -1.6 0.35 0.35 0.4
+v 2.9698 -2.9698 -1.2 0.6 0.6 0.65
+v 3.3321 -2.5568 -1.6 0.35 0.35 0.4
+v 3.3321 -2.5568 -1.2 0.6 0.6 0.65
+v 3.6373 -2.1000 -1.6 0.35 0.35 0.4
+v 3.6373 -2.1000 -1.2 0.6 0.6 0.65
+v 3.8803 -1.6073 -1.6 0.35 0.35 0.4
+v 3.8803 -1.6073 -1.2 0.6 0.6 0.65
+v 4.0569 -1.0870 -1.6 0.35 0.35 0.4
+v 4.0569 -1.0870 -1.2 0.6 0.6 0.65
+v 4.1641 -0.5482 -1.6 0.35 0.35 0.4
+v 4.1641 -0.5482 -1.2 0.6 0.6 0.65
+v 0 0 -1.2 0.6 0.6 0.65
+f 901 903 904 902
+f 902 904 997
+f 903 905 906 904
+f 904 906 997
+f 905 907 908 906
+f 906 908 997
+f 907 909 910 908
+f 908 910 997
+f 909 911 912 910
+f 910 912 997
+f 911 913 914 912
+f 912 914 997
+f 913 915 916 914
+f 914 916 997
+f 915 917 918 916
+f 916 918 997
+f 917 919 920 918
+f 918 920 997
+f 919 921 922 920
+f 920 922 997
+f 921 923 924 922
+f 922 924 997
+f 923 925 926 924
+f 924 926 997
+f 925 927 928 926
+f 926 928 997
+f 927 929 930 928
+f 928 930 997
+f 929 931 932 930
+f 930 932 997
+f 931 933 934 932
+f 932 934 997
+f 933 935 936 934
+f 934 936 997
+f 935 937 938 936
+f 936 938 997
+f 937 939 940 938
+f 938 940 997
+f 939 941 942 940
+f 940 942 997
+f 941 943 944 942
+f 942 944 997
+f 943 945 946 944
+f 944 946 997
+f 945 947 948 946
+f 946 948 997
+f 947 949 950 948
+f 948 950 997
+f 949 951 952 950
+f 950 952 997
+f 951 953 954 952
+f 952 954 997
+f 953 955 956 954
+f 954 956 997
+f 955 957 958 956
+f 956 958 997
+f 957 959 960 958
+f 958 960 997
+f 959 961 962 960
+f 960 962 997
+f 961 963 964 962
+f 962 964 997
+f 963 965 966 964
+f 964 966 997
+f 965 967 968 966
+f 966 968 997
+f 967 969 970 968
+f 968 970 997
+f 969 971 972 970
+f 970 972 997
+f 971 973 974 972
+f 972 974 997
+f 973 975 976 974
+f 974 976 997
+f 975 977 978 976
+f 976 978 997
+f 977 979 980 978
+f 978 980 997
+f 979 981 982 980
+f 980 982 997
+f 981 983 984 982
+f 982 984 997
+f 983 985 986 984
+f 984 986 997
+f 985 987 988 986
+f 986 988 997
+f 987 989 990 988
+f 988 990 997
+f 989 991 992 990
+f 990 992 997
+f 991 993 994 992
+f 992 994 997
+f 993 995 996 994
+f 994 996 997
+f 995 901 902 996
+f 996 902 997
+f 903 901 997
+f 905 903 997
+f 907 905 997
+f 909 907 997
+f 911 909 997
+f 913 911 997
+f 915 913 997
+f 917 915 997
+f 919 917 997
+f 921 919 997
+f 923 921 997
+f 925 923 997
+f 927 925 997
+f 929 927 997
+f 931 929 997
+f 933 931 997
+f 935 933 997
+f 937 935 997
+f 939 937 997
+f 941 939 997
+f 943 941 997
+f 945 943 997
+f 947 945 997
+f 949 947 997
+f 951 949 997
+f 953 951 997
+f 955 953 997
+f 957 955 997
+f 959 957 997
+f 961 959 997
+f 963 961 997
+f 965 963 997
+f 967 965 997
+f 969 967 997
+f 971 969 997
+f 973 971 997
+f 975 973 997
+f 977 975 997
+f 979 977 997
+f 981 979 997
+f 983 981 997
+f 985 983 997
+f 987 985 997
+f 989 987 997
+f 991 989 997
+f 993 991 997
+f 995 993 997
+f 901 995 997
diff --git a/crates/exav-viewer/demo/examples/files/models/table.gltf b/crates/exav-viewer/demo/examples/files/models/table.gltf
new file mode 100644
index 00000000..76b667c4
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/models/table.gltf
@@ -0,0 +1 @@
+{"asset":{"version":"2.0","generator":"exav make-models.py","copyright":"CC0-1.0"},"scene":0,"scenes":[{"nodes":[4,11,18]}],"nodes":[{"mesh":1,"translation":[-0.74,-0.39,-0.38],"name":"leg 0"},{"mesh":1,"translation":[0.74,-0.39,-0.38],"name":"leg 1"},{"mesh":1,"translation":[-0.74,-0.39,0.38],"name":"leg 2"},{"mesh":1,"translation":[0.74,-0.39,0.38],"name":"leg 3"},{"mesh":0,"translation":[0,0.74,0],"name":"table","children":[0,1,2,3]},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[-0.19,-0.2,-0.19],"name":"chair leg 0"},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[0.19,-0.2,-0.19],"name":"chair leg 1"},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[-0.19,-0.2,0.19],"name":"chair leg 2"},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[0.19,-0.2,0.19],"name":"chair leg 3"},{"mesh":3,"translation":[0,0.28,-0.2],"name":"back"},{"mesh":2,"translation":[0,0.45,0],"name":"seat","children":[5,6,7,8,9]},{"name":"chair a","translation":[-0.4,0,0.85],"children":[10]},{"mesh":3,"translation":[0,0.28,-0.2],"name":"back b"},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[-0.19,-0.2,-0.19]},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[0.19,-0.2,-0.19]},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[-0.19,-0.2,0.19]},{"mesh":1,"scale":[0.8,0.6,0.8],"translation":[0.19,-0.2,0.19]},{"mesh":2,"translation":[0,0.45,0],"name":"seat b","children":[12,13,14,15,16]},{"name":"chair b","translation":[0.5,0,-0.85],"rotation":[0.0,1.0,0.0,6.123233995736766e-17],"children":[17]}],"meshes":[{"name":"top","primitives":[{"attributes":{"POSITION":0,"NORMAL":1},"indices":2,"material":0,"mode":4}]},{"name":"leg","primitives":[{"attributes":{"POSITION":3,"NORMAL":4},"indices":5,"material":0,"mode":4}]},{"name":"seat","primitives":[{"attributes":{"POSITION":6,"NORMAL":7},"indices":8,"material":1,"mode":4}]},{"name":"back","primitives":[{"attributes":{"POSITION":9,"NORMAL":10},"indices":11,"material":1,"mode":4}]}],"materials":[{"name":"wood","pbrMetallicRoughness":{"baseColorFactor":[0.55,0.35,0.18,1],"metallicFactor":0.0,"roughnessFactor":0.7}},{"name":"cloth","pbrMetallicRoughness":{"baseColorFactor":[0.8,0.15,0.15,1],"metallicFactor":0.0,"roughnessFactor":0.9}}],"accessors":[{"bufferView":0,"componentType":5126,"count":24,"type":"VEC3","min":[-0.800000011920929,-0.03999999910593033,-0.44999998807907104],"max":[0.800000011920929,0.03999999910593033,0.44999998807907104]},{"bufferView":1,"componentType":5126,"count":24,"type":"VEC3"},{"bufferView":2,"componentType":5123,"count":36,"type":"SCALAR"},{"bufferView":3,"componentType":5126,"count":24,"type":"VEC3","min":[-0.03999999910593033,-0.3499999940395355,-0.03999999910593033],"max":[0.03999999910593033,0.3499999940395355,0.03999999910593033]},{"bufferView":4,"componentType":5126,"count":24,"type":"VEC3"},{"bufferView":5,"componentType":5123,"count":36,"type":"SCALAR"},{"bufferView":6,"componentType":5126,"count":24,"type":"VEC3","min":[-0.22499999403953552,-0.029999999329447746,-0.22499999403953552],"max":[0.22499999403953552,0.029999999329447746,0.22499999403953552]},{"bufferView":7,"componentType":5126,"count":24,"type":"VEC3"},{"bufferView":8,"componentType":5123,"count":36,"type":"SCALAR"},{"bufferView":9,"componentType":5126,"count":24,"type":"VEC3","min":[-0.22499999403953552,-0.25,-0.02500000037252903],"max":[0.22499999403953552,0.25,0.02500000037252903]},{"bufferView":10,"componentType":5126,"count":24,"type":"VEC3"},{"bufferView":11,"componentType":5123,"count":36,"type":"SCALAR"}],"bufferViews":[{"buffer":0,"byteOffset":0,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":288,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":576,"byteLength":72,"target":34963},{"buffer":0,"byteOffset":648,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":936,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":1224,"byteLength":72,"target":34963},{"buffer":0,"byteOffset":1296,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":1584,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":1872,"byteLength":72,"target":34963},{"buffer":0,"byteOffset":1944,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":2232,"byteLength":288,"target":34962},{"buffer":0,"byteOffset":2520,"byteLength":72,"target":34963}],"buffers":[{"byteLength":2592,"uri":"data:application/octet-stream;base64,zcxMvwrXI71mZua+zcxMvwrXIz1mZua+zcxMvwrXIz1mZuY+zcxMvwrXI71mZuY+zcxMPwrXI71mZua+zcxMPwrXIz1mZua+zcxMPwrXIz1mZuY+zcxMPwrXI71mZuY+zcxMvwrXI71mZua+zcxMvwrXI71mZuY+zcxMPwrXI71mZuY+zcxMPwrXI71mZua+zcxMvwrXIz1mZua+zcxMvwrXIz1mZuY+zcxMPwrXIz1mZuY+zcxMPwrXIz1mZua+zcxMvwrXI71mZua+zcxMPwrXI71mZua+zcxMPwrXIz1mZua+zcxMvwrXIz1mZua+zcxMvwrXI71mZuY+zcxMPwrXI71mZuY+zcxMPwrXIz1mZuY+zcxMvwrXIz1mZuY+AACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcACtcjvTMzs74K1yO9CtcjvTMzsz4K1yO9CtcjvTMzsz4K1yM9CtcjvTMzs74K1yM9CtcjPTMzs74K1yO9CtcjPTMzsz4K1yO9CtcjPTMzsz4K1yM9CtcjPTMzs74K1yM9CtcjvTMzs74K1yO9CtcjvTMzs74K1yM9CtcjPTMzs74K1yM9CtcjPTMzs74K1yO9CtcjvTMzsz4K1yO9CtcjvTMzsz4K1yM9CtcjPTMzsz4K1yM9CtcjPTMzsz4K1yO9CtcjvTMzs74K1yO9CtcjPTMzs74K1yO9CtcjPTMzsz4K1yO9CtcjvTMzsz4K1yO9CtcjvTMzs74K1yM9CtcjPTMzs74K1yM9CtcjPTMzsz4K1yM9CtcjvTMzsz4K1yM9AACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcAZmZmvo/C9bxmZma+ZmZmvo/C9TxmZma+ZmZmvo/C9TxmZmY+ZmZmvo/C9bxmZmY+ZmZmPo/C9bxmZma+ZmZmPo/C9TxmZma+ZmZmPo/C9TxmZmY+ZmZmPo/C9bxmZmY+ZmZmvo/C9bxmZma+ZmZmvo/C9bxmZmY+ZmZmPo/C9bxmZmY+ZmZmPo/C9bxmZma+ZmZmvo/C9TxmZma+ZmZmvo/C9TxmZmY+ZmZmPo/C9TxmZmY+ZmZmPo/C9TxmZma+ZmZmvo/C9bxmZma+ZmZmPo/C9bxmZma+ZmZmPo/C9TxmZma+ZmZmvo/C9TxmZma+ZmZmvo/C9bxmZmY+ZmZmPo/C9bxmZmY+ZmZmPo/C9TxmZmY+ZmZmvo/C9TxmZmY+AACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcAZmZmvgAAgL7NzMy8ZmZmvgAAgD7NzMy8ZmZmvgAAgD7NzMw8ZmZmvgAAgL7NzMw8ZmZmPgAAgL7NzMy8ZmZmPgAAgD7NzMy8ZmZmPgAAgD7NzMw8ZmZmPgAAgL7NzMw8ZmZmvgAAgL7NzMy8ZmZmvgAAgL7NzMw8ZmZmPgAAgL7NzMw8ZmZmPgAAgL7NzMy8ZmZmvgAAgD7NzMy8ZmZmvgAAgD7NzMw8ZmZmPgAAgD7NzMw8ZmZmPgAAgD7NzMy8ZmZmvgAAgL7NzMy8ZmZmPgAAgL7NzMy8ZmZmPgAAgD7NzMy8ZmZmvgAAgD7NzMy8ZmZmvgAAgL7NzMw8ZmZmPgAAgL7NzMw8ZmZmPgAAgD7NzMw8ZmZmvgAAgD7NzMw8AACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcA"}]}
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/models/terrain.ply b/crates/exav-viewer/demo/examples/files/models/terrain.ply
new file mode 100644
index 00000000..0f93c577
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/models/terrain.ply differ
diff --git a/crates/exav-viewer/demo/examples/files/office/deck.pptx b/crates/exav-viewer/demo/examples/files/office/deck.pptx
new file mode 100644
index 00000000..257d3ec6
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/office/deck.pptx differ
diff --git a/crates/exav-viewer/demo/examples/files/office/handbook.docx b/crates/exav-viewer/demo/examples/files/office/handbook.docx
new file mode 100644
index 00000000..931b4e2d
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/office/handbook.docx differ
diff --git a/crates/exav-viewer/demo/examples/files/office/workbook.xlsx b/crates/exav-viewer/demo/examples/files/office/workbook.xlsx
new file mode 100644
index 00000000..75a5e28e
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/office/workbook.xlsx differ
diff --git a/crates/exav-viewer/demo/examples/files/pdf/annotations.pdf b/crates/exav-viewer/demo/examples/files/pdf/annotations.pdf
new file mode 100644
index 00000000..a5b28199
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/pdf/annotations.pdf differ
diff --git a/crates/exav-viewer/demo/examples/files/pdf/application-form.pdf b/crates/exav-viewer/demo/examples/files/pdf/application-form.pdf
new file mode 100644
index 00000000..6adc5309
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/pdf/application-form.pdf differ
diff --git a/crates/exav-viewer/demo/examples/files/pdf/field-report.pdf b/crates/exav-viewer/demo/examples/files/pdf/field-report.pdf
new file mode 100644
index 00000000..0aed9e7b
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/pdf/field-report.pdf differ
diff --git a/crates/exav-viewer/demo/examples/files/pdf/handbook-tagged.pdf b/crates/exav-viewer/demo/examples/files/pdf/handbook-tagged.pdf
new file mode 100644
index 00000000..fd6c8342
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/pdf/handbook-tagged.pdf differ
diff --git a/crates/exav-viewer/demo/examples/files/pdf/scan-mixed.pdf b/crates/exav-viewer/demo/examples/files/pdf/scan-mixed.pdf
new file mode 100644
index 00000000..02d8a9ee
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/pdf/scan-mixed.pdf differ
diff --git a/crates/exav-viewer/demo/examples/files/pdf/vector-art.pdf b/crates/exav-viewer/demo/examples/files/pdf/vector-art.pdf
new file mode 100644
index 00000000..4a51e543
Binary files /dev/null and b/crates/exav-viewer/demo/examples/files/pdf/vector-art.pdf differ
diff --git a/crates/exav-viewer/demo/examples/files/text/bits.c b/crates/exav-viewer/demo/examples/files/text/bits.c
new file mode 100644
index 00000000..01703964
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/bits.c
@@ -0,0 +1,51 @@
+/* Bit tricks on 32-bit words. CC0-1.0, exav project. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* The number of set bits, by the parallel sum. */
+static unsigned popcount32(uint32_t x) {
+    x = x - ((x >> 1) & 0x55555555u);
+    x = (x & 0x33333333u) + ((x >> 2) & 0x33333333u);
+    x = (x + (x >> 4)) & 0x0f0f0f0fu;
+    return (x * 0x01010101u) >> 24;
+}
+
+/* The index of the highest set bit, or -1 for zero. */
+static int high_bit(uint32_t x) {
+    int n = -1;
+    while (x) {
+        n++;
+        x >>= 1;
+    }
+    return n;
+}
+
+/* The next power of two that is not below x. */
+static uint32_t next_pow2(uint32_t x) {
+    if (x <= 1) return 1;
+    x--;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+    return x + 1;
+}
+
+/* The bits of x in reverse order. */
+static uint32_t reverse32(uint32_t x) {
+    x = ((x >> 1) & 0x55555555u) | ((x & 0x55555555u) << 1);
+    x = ((x >> 2) & 0x33333333u) | ((x & 0x33333333u) << 2);
+    x = ((x >> 4) & 0x0f0f0f0fu) | ((x & 0x0f0f0f0fu) << 4);
+    x = ((x >> 8) & 0x00ff00ffu) | ((x & 0x00ff00ffu) << 8);
+    return (x >> 16) | (x << 16);
+}
+
+int main(void) {
+    const uint32_t samples[] = {0u, 1u, 255u, 1000u, 0xdeadbeefu};
+    for (size_t i = 0; i < sizeof samples / sizeof samples[0]; i++) {
+        uint32_t v = samples[i];
+        printf("%10u: bits %2u, high %2d, pow2 %10u, reversed %08x\n", v, popcount32(v), high_bit(v), next_pow2(v), reverse32(v));
+    }
+    return 0;
+}
diff --git a/crates/exav-viewer/demo/examples/files/text/changes.diff b/crates/exav-viewer/demo/examples/files/text/changes.diff
new file mode 100644
index 00000000..9098ae3e
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/changes.diff
@@ -0,0 +1,31 @@
+diff --git a/src/berths.py b/src/berths.py
+index 3f2a1c4..9b7d0e8 100644
+--- a/src/berths.py
++++ b/src/berths.py
+@@ -10,12 +10,16 @@ class Berth:
+     number: int
+     length_m: float
++    max_draught_m: float = 1.5
+
+     def fits(self, boat):
+-        return boat.length_m <= self.length_m
++        return boat.length_m <= self.length_m and boat.draught_m <= self.max_draught_m
+
+     def label(self):
+-        return "Berth %d" % self.number
++        return f"Berth {self.number} ({self.length_m:.1f} m)"
+@@ -40,7 +44,7 @@ def free_berths(register, boat):
+     for berth in register:
+         if berth.fits(boat):
+             yield berth
+-    return
++    return None
+diff --git a/README.md b/README.md
+index 1e2d3f4..5a6b7c8 100644
+--- a/README.md
++++ b/README.md
+@@ -1,4 +1,5 @@
+ # Harbour register
+
+ The mooring register of the east quay.
++Berths now have a maximum draught.
diff --git a/crates/exav-viewer/demo/examples/files/text/config.yaml b/crates/exav-viewer/demo/examples/files/text/config.yaml
new file mode 100644
index 00000000..cee2b1da
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/config.yaml
@@ -0,0 +1,28 @@
+# A configuration file, to show YAML as text.
+service:
+  name: harbour-register
+  port: 8080
+  debug: false
+  tags: [boats, berths, "quay east"]
+  limits:
+    requests_per_minute: 600
+    body_bytes: 1048576
+database:
+  url: postgres://register@localhost:5432/harbour
+  pool: {min: 2, max: 10}
+berths:
+  - number: 1
+    length_m: 6.5
+    vessel: Aurora
+  - number: 2
+    length_m: 8.2
+    vessel: Brise
+notes: |
+  A block of text that keeps
+  its line breaks.
+folded: >
+  A block of text that is
+  folded into one line.
+anchors:
+  base: &base {retries: 3, timeout_s: 30}
+  copy: *base
diff --git a/crates/exav-viewer/demo/examples/files/text/deploy.sh b/crates/exav-viewer/demo/examples/files/text/deploy.sh
new file mode 100644
index 00000000..bf71a01e
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/deploy.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Build, check and copy a static site. CC0-1.0, exav project.
+set -euo pipefail
+
+SITE_DIR="${SITE_DIR:-./public}"
+REMOTE="${REMOTE:-deploy@example.invalid:/var/www/site}"
+LOG="$(mktemp)"
+
+cleanup() {
+  local status=$?
+  rm -f "$LOG"
+  if [ "$status" -ne 0 ]; then
+    echo "deploy failed with status $status" >&2
+  fi
+}
+trap cleanup EXIT
+
+log() { printf '[%s] %s\n' "$(date +%H:%M:%S)" "$*"; }
+
+build() {
+  log "building"
+  npm ci --silent >"$LOG" 2>&1 || { cat "$LOG" >&2; return 1; }
+  npm run build --silent
+}
+
+check() {
+  local broken=0
+  while IFS= read -r -d '' file; do
+    if ! grep -q '</html>' "$file"; then
+      log "incomplete page: $file"
+      broken=$((broken + 1))
+    fi
+  done < <(find "$SITE_DIR" -name '*.html' -print0)
+  return "$broken"
+}
+
+case "${1:-all}" in
+  build) build ;;
+  check) check ;;
+  all)   build && check && rsync -az --delete "$SITE_DIR/" "$REMOTE" && log "done" ;;
+  *)     echo "usage: $0 [build|check|all]" >&2; exit 2 ;;
+esac
diff --git a/crates/exav-viewer/demo/examples/files/text/feed.xml b/crates/exav-viewer/demo/examples/files/text/feed.xml
new file mode 100644
index 00000000..b931bb90
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/feed.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- An Atom feed, to show XML as text. -->
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
+  <title>Notes from the east quay</title>
+  <subtitle type="html">Moorings, tides &amp; weather</subtitle>
+  <link href="https://example.invalid/feed.xml" rel="self"/>
+  <link href="https://example.invalid/"/>
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+  <updated>2000-01-03T12:00:00Z</updated>
+  <author><name>The harbour office</name><email>office@example.invalid</email></author>
+  <entry>
+    <title>New berths on the east quay</title>
+    <link href="https://example.invalid/2000/01/berths"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <updated>2000-01-03T12:00:00Z</updated>
+    <summary>Twelve berths for visiting boats open on 1 March.</summary>
+    <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>The <b>east quay</b> is longer by 40&#160;metres.</p></div></content>
+    <category term="moorings"/>
+  </entry>
+  <entry>
+    <title>Tide tables for the year</title>
+    <link href="https://example.invalid/2000/01/tides"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6b</id>
+    <updated>2000-01-01T08:00:00Z</updated>
+    <summary><![CDATA[High water at 06:12 & 18:34; low water at <12:00.]]></summary>
+  </entry>
+</feed>
diff --git a/crates/exav-viewer/demo/examples/files/text/field-guide.md b/crates/exav-viewer/demo/examples/files/text/field-guide.md
new file mode 100644
index 00000000..4488dfa0
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/field-guide.md
@@ -0,0 +1,124 @@
+# Field guide to Markdown
+
+A short document that uses most of what Markdown can say. It is written for the
+exav demo and is in the public domain (CC0-1.0).
+
+## Emphasis and spans
+
+Text can be **bold**, *italic*, ***both***, ~~struck through~~ or `code`. A line
+that ends with two spaces
+breaks without starting a paragraph. A [link with a title](https://exav.org/ "exav.org"),
+an autolink <https://exav.org/viewer/>, and a reference link: [the demo][demo].
+
+[demo]: https://exav.org/viewer/demo/
+
+Escapes: \*not italic\*, 2 \< 3, a literal backtick \`, and entities: &copy; &amp; &eacute;.
+Unicode goes through unchanged: café, naïve, Ωmega, Жук, 日本語, مرحبا, ☃.
+
+## Headings
+
+### Third level
+#### Fourth level
+##### Fifth level
+###### Sixth level
+
+Setext heading
+==============
+
+Another one
+-----------
+
+## Lists
+
+- A bullet
+- Another, with a nested list:
+  - second level
+    - third level
+  - back to the second
+- And a last one
+
+1. Numbered
+2. Items
+   1. Nested numbers
+   2. Continue
+3. Done
+
+7. A list that starts at seven
+8. and goes on
+
+- [x] A finished task
+- [ ] An open task
+- [ ] Another open task, with `code` in it
+
+Loose list:
+
+- First paragraph.
+
+  A second paragraph inside the same item.
+
+- Next item.
+
+## Quotes
+
+> A quotation, which can wrap over several lines and holds
+> *other* **formatting**.
+>
+> > A quotation inside it.
+>
+> - and a list
+
+## Tables
+
+| Left | Centre | Right |
+| :--- | :----: | ----: |
+| a | b | c |
+| `code` | **bold** | 1,234.50 |
+| A longer cell that holds more words | x | 7 |
+
+## Code
+
+Inline `let x = 1;` and a fenced block with a language:
+
+```rust
+fn fib(n: u32) -> u64 {
+    let (mut a, mut b) = (0u64, 1u64);
+    for _ in 0..n {
+        (a, b) = (b, a + b);
+    }
+    a
+}
+```
+
+```python
+def fib(n):
+    a, b = 0, 1
+    for _ in range(n):
+        a, b = b, a + b
+    return a
+```
+
+```diff
+- old line
++ new line
+```
+
+An indented block:
+
+    four spaces make this code
+    and it keeps   its spacing
+
+## Rules, HTML and footnotes
+
+---
+
+Inline HTML such as <kbd>Ctrl</kbd> + <kbd>C</kbd> and <sub>sub</sub> and <sup>sup</sup> is
+shown as text or ignored, never run: <script>alert(1)</script> does nothing.
+
+A sentence with a footnote.[^1] And another one.[^note]
+
+[^1]: The first footnote.
+[^note]: A second, with *formatting*.
+
+![An image reference](https://example.invalid/not-fetched.png)
+
+The end.
diff --git a/crates/exav-viewer/demo/examples/files/text/field-notes.txt b/crates/exav-viewer/demo/examples/files/text/field-notes.txt
new file mode 100644
index 00000000..6c15e686
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/field-notes.txt
@@ -0,0 +1,30 @@
+Field notes
+===========
+
+Plain text is shown as it is written: line breaks, indentation, tabs and
+long lines are kept.
+
+	A line that starts with a tab.
+        A line that starts with eight spaces.
+
+A very long line, to see how the viewer wraps or scrolls it: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Pangrams, one for each script:
+
+  English   The quick brown fox jumps over the lazy dog.
+  Français Portez ce vieux whisky au juge blond qui fume.
+  Deutsch   Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich.
+  Español  El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío.
+  Ελληνικά   Ξεσκεπάζω την ψυχοφθόρα βδελυγμία.
+  Русский   Съешь же ещё этих мягких французских булок да выпей чаю.
+  日本語    いろはにほへと ちりぬるを わかよたれそ つねならむ
+  العربية   نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومزخرف
+  עברית    דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה
+
+Symbols and box drawing:
+
+  ┌──────┬──────┐   ← ↑ → ↓   ✓ ✗   ½ ⅓ ¾   ± × ÷ ≠ ≤ ≥ ∞
+  │ a    │ b    │   € £ ¥ ₿   © ® ™   ☀ ☁ ☂ ☃
+  └──────┴──────┘
+
+The last line has no newline at the end.
\ No newline at end of file
diff --git a/crates/exav-viewer/demo/examples/files/text/harbour-log.csv b/crates/exav-viewer/demo/examples/files/text/harbour-log.csv
new file mode 100644
index 00000000..d2845fb0
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/harbour-log.csv
@@ -0,0 +1,332 @@
+date,vessel,type,length_m,beam_m,berth,nights,fee_eur,notes
+2000-01-01,Hirondelle,motor yacht,9.7,3.2,33,5,117.60,"Arrived late, ""quiet"" night"
+2000-01-01,Hirondelle,dinghy,6.6,2.18,40,5,92.80,
+2000-01-01,Calypso,sloop,5.6,1.85,35,3,50.88,
+2000-01-01,Hirondelle,dinghy,11.3,3.73,48,4,104.32,
+2000-01-01,Brise,sloop,11.7,3.86,3,5,133.60,"Arrived late, ""quiet"" night"
+2000-01-01,Aurora,motor yacht,14.6,4.82,21,5,156.80,Café voucher given
+2000-01-01,Iroise,ketch,11.3,3.73,41,2,52.16,Bill sent; paid by cheque
+2000-01-01,Hirondelle,dinghy,10.2,3.37,18,1,24.32,"Two nights,
+left at dawn"
+2000-01-01,La Mouette,trawler,16.0,5.28,21,1,33.60,"Arrived late, ""quiet"" night"
+2000-01-01,Brise,catamaran,10.4,3.43,50,1,24.64,
+2000-01-02,Goeland,sloop,9.1,3.0,2,3,67.68,
+2000-01-02,Hirondelle,motor yacht,7.0,2.31,46,1,19.20,"Two nights,
+left at dawn"
+2000-01-02,Kerguelen,ketch,9.3,3.07,50,5,114.40,Bill sent; paid by cheque
+2000-01-02,Fauvette,sloop,8.4,2.77,27,3,64.32,
+2000-01-02,Aurora,sloop,6.0,1.98,30,1,17.60,Café voucher given
+2000-01-02,Dorade,motor yacht,6.5,2.15,33,5,92.00,"Arrived late, ""quiet"" night"
+2000-01-02,Goeland,dinghy,15.8,5.21,25,2,66.56,
+2000-01-02,Aurora,trawler,9.0,2.97,56,2,44.80,Bill sent; paid by cheque
+2000-01-02,Dorade,ketch,16.0,5.28,26,1,33.60,
+2000-01-02,Dorade,motor yacht,5.0,1.65,17,2,32.00,
+2000-01-03,Etoile,motor yacht,13.4,4.42,5,3,88.32,
+2000-01-03,Kerguelen,ketch,5.5,1.82,1,5,84.00,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-03,Calypso,catamaran,8.8,2.9,31,4,88.32,
+2000-01-03,Kerguelen,ketch,14.5,4.79,20,2,62.40,"Arrived late, ""quiet"" night"
+2000-01-03,La Mouette,ketch,13.9,4.59,11,2,60.48,
+2000-01-03,Hirondelle,catamaran,6.8,2.24,6,4,75.52,"Two nights,
+left at dawn"
+2000-01-03,Aurora,catamaran,5.0,1.65,17,1,16.00,"Arrived late, ""quiet"" night"
+2000-01-03,Etoile,motor yacht,13.0,4.29,53,4,115.20,Café voucher given
+2000-01-03,La Mouette,sloop,7.9,2.61,9,2,41.28,"Arrived late, ""quiet"" night"
+2000-01-03,Jolie Brise,sloop,10.0,3.3,18,5,120.00,"Arrived late, ""quiet"" night"
+2000-01-04,La Mouette,sloop,15.0,4.95,5,2,64.00,Bill sent; paid by cheque
+2000-01-04,Aurora,sloop,9.2,3.04,12,2,45.44,Bill sent; paid by cheque
+2000-01-04,Calypso,sloop,8.7,2.87,24,5,109.60,
+2000-01-04,Kerguelen,dinghy,14.7,4.85,45,3,94.56,
+2000-01-04,Jolie Brise,sloop,11.2,3.7,60,2,51.84,
+2000-01-04,La Mouette,trawler,10.0,3.3,3,3,72.00,
+2000-01-04,Hirondelle,sloop,11.4,3.76,47,1,26.24,Bill sent; paid by cheque
+2000-01-04,Brise,motor yacht,8.2,2.71,35,1,21.12,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-04,Fauvette,trawler,13.0,4.29,6,2,57.60,Café voucher given
+2000-01-04,Aurora,motor yacht,14.9,4.92,37,4,127.36,
+2000-01-05,Goeland,catamaran,11.7,3.86,1,4,106.88,
+2000-01-05,Etoile 3,motor yacht,5.4,1.78,47,1,16.64,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-05,Hirondelle 3,motor yacht,9.0,2.97,30,5,112.00,
+2000-01-05,Aurora 3,trawler,5.5,1.82,39,5,84.00,
+2000-01-05,La Mouette 3,sloop,10.0,3.3,32,2,48.00,Café voucher given
+2000-01-05,Fauvette 3,trawler,7.4,2.44,10,1,19.84,"Arrived late, ""quiet"" night"
+2000-01-05,Kerguelen 3,motor yacht,10.5,3.47,32,3,74.40,"Arrived late, ""quiet"" night"
+2000-01-05,Dorade 3,dinghy,8.3,2.74,28,3,63.84,"Arrived late, ""quiet"" night"
+2000-01-05,Dorade 3,catamaran,14.6,4.82,59,4,125.44,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-05,Hirondelle 3,trawler,6.9,2.28,54,2,38.08,
+2000-01-06,Calypso 3,sloop,12.7,4.19,29,3,84.96,Café voucher given
+2000-01-06,Goeland 3,motor yacht,7.7,2.54,41,2,40.64,
+2000-01-06,La Mouette 3,catamaran,10.2,3.37,29,3,72.96,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-06,Etoile 3,catamaran,5.4,1.78,3,1,16.64,Bill sent; paid by cheque
+2000-01-06,Kerguelen 3,catamaran,11.1,3.66,2,3,77.28,
+2000-01-06,Aurora 3,trawler,9.2,3.04,16,2,45.44,
+2000-01-06,Hirondelle 3,sloop,13.7,4.52,41,1,29.92,
+2000-01-06,Brise 3,dinghy,12.0,3.96,13,3,81.60,"Arrived late, ""quiet"" night"
+2000-01-06,Calypso 3,dinghy,14.0,4.62,1,3,91.20,Café voucher given
+2000-01-06,Calypso 3,ketch,10.7,3.53,18,1,25.12,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-07,Iroise 3,catamaran,10.7,3.53,49,5,125.60,
+2000-01-07,Brise 3,motor yacht,9.0,2.97,60,2,44.80,"Two nights,
+left at dawn"
+2000-01-07,Dorade 3,dinghy,6.0,1.98,57,4,70.40,
+2000-01-07,Kerguelen 3,catamaran,8.8,2.9,51,5,110.40,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-07,Brise 3,dinghy,9.8,3.23,56,2,47.36,
+2000-01-07,Brise 3,trawler,7.0,2.31,35,4,76.80,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-07,Fauvette 3,catamaran,7.5,2.48,6,1,20.00,
+2000-01-07,Goeland 3,trawler,9.6,3.17,32,5,116.80,
+2000-01-07,Goeland 3,sloop,7.0,2.31,12,1,19.20,
+2000-01-07,Hirondelle 3,ketch,8.4,2.77,34,2,42.88,
+2000-01-08,Hirondelle 3,catamaran,14.2,4.69,45,4,122.88,
+2000-01-08,Iroise 3,catamaran,13.2,4.36,19,4,116.48,
+2000-01-08,Iroise 3,catamaran,11.8,3.89,17,5,134.40,Bill sent; paid by cheque
+2000-01-08,Dorade 3,trawler,12.2,4.03,55,5,137.60,
+2000-01-08,Etoile 3,catamaran,15.6,5.15,32,5,164.80,"Arrived late, ""quiet"" night"
+2000-01-08,Iroise 3,sloop,9.2,3.04,39,1,22.72,"Two nights,
+left at dawn"
+2000-01-08,Iroise 3,motor yacht,4.8,1.58,35,1,15.68,
+2000-01-08,Brise 3,catamaran,10.1,3.33,30,2,48.32,"Two nights,
+left at dawn"
+2000-01-08,Etoile 3,ketch,15.1,4.98,31,4,128.64,Café voucher given
+2000-01-08,Hirondelle 3,catamaran,6.0,1.98,21,4,70.40,
+2000-01-09,Aurora 4,trawler,6.7,2.21,9,5,93.60,
+2000-01-09,Dorade 4,sloop,4.9,1.62,44,2,31.68,Bill sent; paid by cheque
+2000-01-09,Dorade 4,catamaran,8.2,2.71,32,3,63.36,
+2000-01-09,Brise 4,catamaran,10.2,3.37,40,5,121.60,Bill sent; paid by cheque
+2000-01-09,Goeland 4,sloop,12.8,4.22,25,5,142.40,"Two nights,
+left at dawn"
+2000-01-09,Calypso 4,catamaran,14.0,4.62,14,5,152.00,
+2000-01-09,Dorade 4,catamaran,11.8,3.89,40,5,134.40,
+2000-01-09,Calypso 4,trawler,7.2,2.38,39,3,58.56,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-09,Dorade 4,ketch,14.7,4.85,57,2,63.04,
+2000-01-09,Calypso 4,dinghy,6.0,1.98,6,2,35.20,Bill sent; paid by cheque
+2000-01-10,Goeland 4,catamaran,9.0,2.97,51,4,89.60,
+2000-01-10,Brise 4,ketch,6.8,2.24,37,1,18.88,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-10,Brise 4,dinghy,15.0,4.95,33,3,96.00,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-10,Brise 4,motor yacht,10.3,3.4,7,2,48.96,
+2000-01-10,Jolie Brise 4,catamaran,4.9,1.62,58,5,79.20,Café voucher given
+2000-01-10,Brise 4,ketch,6.2,2.05,12,2,35.84,
+2000-01-10,Jolie Brise 4,sloop,15.9,5.25,9,1,33.44,Café voucher given
+2000-01-10,Fauvette 4,motor yacht,5.4,1.78,30,1,16.64,"Two nights,
+left at dawn"
+2000-01-10,Dorade 4,catamaran,10.4,3.43,24,4,98.56,
+2000-01-10,Dorade 4,ketch,11.8,3.89,27,1,26.88,Café voucher given
+2000-01-11,Goeland 4,ketch,8.6,2.84,39,3,65.28,
+2000-01-11,Fauvette 4,sloop,5.6,1.85,52,1,16.96,"Two nights,
+left at dawn"
+2000-01-11,Iroise 4,catamaran,11.1,3.66,22,2,51.52,Bill sent; paid by cheque
+2000-01-11,La Mouette 4,dinghy,7.7,2.54,50,1,20.32,
+2000-01-11,Calypso 4,trawler,13.9,4.59,57,4,120.96,
+2000-01-11,Calypso 4,motor yacht,12.5,4.12,14,4,112.00,
+2000-01-11,Etoile 4,motor yacht,5.3,1.75,7,3,49.44,
+2000-01-11,Aurora 4,ketch,14.7,4.85,18,5,157.60,Bill sent; paid by cheque
+2000-01-11,Jolie Brise 4,ketch,8.4,2.77,35,4,85.76,
+2000-01-11,Kerguelen 4,ketch,9.0,2.97,45,4,89.60,
+2000-01-12,Aurora 4,sloop,13.3,4.39,40,5,146.40,
+2000-01-12,Hirondelle 4,motor yacht,13.0,4.29,33,3,86.40,
+2000-01-12,Aurora 4,sloop,13.3,4.39,17,4,117.12,Bill sent; paid by cheque
+2000-01-12,Iroise 4,catamaran,7.7,2.54,33,3,60.96,"Two nights,
+left at dawn"
+2000-01-12,Brise 4,dinghy,15.6,5.15,29,5,164.80,
+2000-01-12,Goeland 4,ketch,10.8,3.56,25,1,25.28,Café voucher given
+2000-01-12,Iroise 4,catamaran,15.7,5.18,39,4,132.48,
+2000-01-12,Goeland 4,trawler,9.4,3.1,34,4,92.16,"Two nights,
+left at dawn"
+2000-01-12,Iroise 4,trawler,11.4,3.76,31,3,78.72,Bill sent; paid by cheque
+2000-01-12,Kerguelen 4,dinghy,10.9,3.6,48,3,76.32,Bill sent; paid by cheque
+2000-01-13,Jolie Brise 5,sloop,4.8,1.58,41,2,31.36,
+2000-01-13,Aurora 5,trawler,9.2,3.04,48,4,90.88,"Two nights,
+left at dawn"
+2000-01-13,Brise 5,ketch,5.1,1.68,28,3,48.48,Café voucher given
+2000-01-13,Aurora 5,catamaran,7.4,2.44,7,2,39.68,Café voucher given
+2000-01-13,Jolie Brise 5,dinghy,6.2,2.05,8,2,35.84,
+2000-01-13,Brise 5,ketch,11.7,3.86,56,4,106.88,
+2000-01-13,Brise 5,trawler,8.6,2.84,29,2,43.52,
+2000-01-13,Jolie Brise 5,trawler,12.2,4.03,41,4,110.08,"Two nights,
+left at dawn"
+2000-01-13,Calypso 5,trawler,8.7,2.87,47,5,109.60,
+2000-01-13,Iroise 5,trawler,7.2,2.38,51,1,19.52,
+2000-01-14,Etoile 5,trawler,11.7,3.86,40,3,80.16,"Arrived late, ""quiet"" night"
+2000-01-14,Dorade 5,ketch,11.8,3.89,33,2,53.76,"Arrived late, ""quiet"" night"
+2000-01-14,Kerguelen 5,sloop,14.6,4.82,1,1,31.36,Bill sent; paid by cheque
+2000-01-14,Jolie Brise 5,sloop,7.5,2.48,7,1,20.00,"Arrived late, ""quiet"" night"
+2000-01-14,Brise 5,dinghy,10.7,3.53,11,1,25.12,
+2000-01-14,Hirondelle 5,motor yacht,7.2,2.38,23,3,58.56,"Arrived late, ""quiet"" night"
+2000-01-14,La Mouette 5,ketch,8.4,2.77,54,4,85.76,
+2000-01-14,Jolie Brise 5,ketch,13.7,4.52,29,4,119.68,"Two nights,
+left at dawn"
+2000-01-14,Calypso 5,trawler,13.1,4.32,10,4,115.84,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-14,Goeland 5,dinghy,7.8,2.57,24,2,40.96,
+2000-01-15,Brise 5,catamaran,9.8,3.23,6,3,71.04,"Two nights,
+left at dawn"
+2000-01-15,Kerguelen 5,motor yacht,11.0,3.63,20,4,102.40,
+2000-01-15,Kerguelen 5,catamaran,5.4,1.78,6,2,33.28,Bill sent; paid by cheque
+2000-01-15,Etoile 5,ketch,10.2,3.37,15,3,72.96,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-15,Fauvette 5,sloop,12.1,3.99,21,3,82.08,Café voucher given
+2000-01-15,Hirondelle 5,catamaran,11.0,3.63,52,3,76.80,Bill sent; paid by cheque
+2000-01-15,Goeland 5,dinghy,9.8,3.23,58,2,47.36,
+2000-01-15,Fauvette 5,sloop,7.4,2.44,24,3,59.52,"Two nights,
+left at dawn"
+2000-01-15,La Mouette 5,catamaran,11.2,3.7,24,2,51.84,"Two nights,
+left at dawn"
+2000-01-15,Jolie Brise 5,ketch,10.7,3.53,12,5,125.60,
+2000-01-16,Aurora 5,ketch,13.2,4.36,34,3,87.36,
+2000-01-16,Etoile 5,sloop,10.8,3.56,42,5,126.40,"Two nights,
+left at dawn"
+2000-01-16,Etoile 5,catamaran,5.2,1.72,6,5,81.60,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-16,Fauvette 5,sloop,5.4,1.78,2,1,16.64,
+2000-01-16,Dorade 5,dinghy,5.6,1.85,15,4,67.84,Café voucher given
+2000-01-16,Fauvette 5,motor yacht,13.3,4.39,26,5,146.40,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-16,Kerguelen 5,ketch,8.4,2.77,32,3,64.32,Café voucher given
+2000-01-16,La Mouette 5,catamaran,10.7,3.53,59,1,25.12,
+2000-01-16,Aurora 5,motor yacht,9.2,3.04,54,3,68.16,
+2000-01-16,Kerguelen 5,sloop,14.7,4.85,34,5,157.60,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-17,Goeland 6,motor yacht,12.7,4.19,59,1,28.32,
+2000-01-17,Kerguelen 6,motor yacht,7.3,2.41,44,2,39.36,
+2000-01-17,Goeland 6,catamaran,8.2,2.71,19,4,84.48,Bill sent; paid by cheque
+2000-01-17,Hirondelle 6,trawler,15.7,5.18,47,1,33.12,
+2000-01-17,Calypso 6,sloop,8.0,2.64,49,2,41.60,Café voucher given
+2000-01-17,Aurora 6,trawler,4.7,1.55,7,4,62.08,"Arrived late, ""quiet"" night"
+2000-01-17,Jolie Brise 6,ketch,6.6,2.18,39,2,37.12,Café voucher given
+2000-01-17,Hirondelle 6,ketch,11.3,3.73,58,2,52.16,Bill sent; paid by cheque
+2000-01-17,Kerguelen 6,catamaran,9.1,3.0,53,3,67.68,
+2000-01-17,Hirondelle 6,motor yacht,10.0,3.3,59,3,72.00,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-18,Hirondelle 6,ketch,12.1,3.99,26,1,27.36,
+2000-01-18,Goeland 6,catamaran,7.0,2.31,51,2,38.40,
+2000-01-18,Kerguelen 6,ketch,13.4,4.42,58,1,29.44,
+2000-01-18,Hirondelle 6,ketch,14.6,4.82,46,3,94.08,"Two nights,
+left at dawn"
+2000-01-18,Goeland 6,ketch,11.5,3.8,50,2,52.80,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-18,Calypso 6,dinghy,6.2,2.05,48,5,89.60,Bill sent; paid by cheque
+2000-01-18,Calypso 6,catamaran,10.4,3.43,50,1,24.64,
+2000-01-18,Calypso 6,sloop,4.5,1.49,23,2,30.40,Bill sent; paid by cheque
+2000-01-18,Brise 6,motor yacht,11.6,3.83,45,5,132.80,Café voucher given
+2000-01-18,Iroise 6,catamaran,5.5,1.82,20,5,84.00,
+2000-01-19,Dorade 6,dinghy,13.6,4.49,6,4,119.04,Café voucher given
+2000-01-19,Goeland 6,catamaran,6.9,2.28,32,5,95.20,
+2000-01-19,Fauvette 6,trawler,15.4,5.08,26,3,97.92,
+2000-01-19,Kerguelen 6,dinghy,10.9,3.6,5,4,101.76,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-19,Brise 6,dinghy,5.4,1.78,26,2,33.28,Café voucher given
+2000-01-19,Kerguelen 6,motor yacht,13.1,4.32,1,1,28.96,"Two nights,
+left at dawn"
+2000-01-19,Dorade 6,trawler,12.7,4.19,37,4,113.28,
+2000-01-19,La Mouette 6,ketch,9.8,3.23,58,1,23.68,
+2000-01-19,Iroise 6,dinghy,7.8,2.57,20,4,81.92,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-19,Kerguelen 6,sloop,13.2,4.36,17,5,145.60,"Arrived late, ""quiet"" night"
+2000-01-20,Fauvette 6,trawler,6.8,2.24,18,1,18.88,Café voucher given
+2000-01-20,Hirondelle 6,motor yacht,12.8,4.22,6,3,85.44,
+2000-01-20,Calypso 6,dinghy,6.1,2.01,41,1,17.76,
+2000-01-20,Aurora 6,motor yacht,6.6,2.18,38,4,74.24,
+2000-01-20,Calypso 6,sloop,5.7,1.88,28,1,17.12,"Two nights,
+left at dawn"
+2000-01-20,Goeland 6,catamaran,13.4,4.42,9,3,88.32,"Arrived late, ""quiet"" night"
+2000-01-20,Hirondelle 6,trawler,13.3,4.39,59,4,117.12,"Two nights,
+left at dawn"
+2000-01-20,Jolie Brise 6,dinghy,11.7,3.86,21,4,106.88,"Arrived late, ""quiet"" night"
+2000-01-20,Iroise 6,sloop,12.1,3.99,17,5,136.80,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-20,Kerguelen 6,motor yacht,6.7,2.21,7,3,56.16,
+2000-01-21,Fauvette 7,trawler,8.8,2.9,53,5,110.40,
+2000-01-21,Etoile 7,catamaran,11.5,3.8,58,2,52.80,Bill sent; paid by cheque
+2000-01-21,Jolie Brise 7,catamaran,10.8,3.56,33,3,75.84,
+2000-01-21,Iroise 7,dinghy,11.1,3.66,46,2,51.52,"Arrived late, ""quiet"" night"
+2000-01-21,Kerguelen 7,dinghy,11.0,3.63,13,1,25.60,
+2000-01-21,Jolie Brise 7,motor yacht,6.1,2.01,45,4,71.04,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-21,Etoile 7,motor yacht,8.3,2.74,57,3,63.84,
+2000-01-21,Dorade 7,catamaran,9.7,3.2,35,2,47.04,
+2000-01-21,Etoile 7,ketch,10.9,3.6,59,5,127.20,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-21,Aurora 7,trawler,11.4,3.76,44,1,26.24,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-22,Fauvette 7,ketch,7.3,2.41,12,5,98.40,
+2000-01-22,Aurora 7,motor yacht,13.8,4.55,12,4,120.32,
+2000-01-22,Jolie Brise 7,catamaran,8.0,2.64,41,4,83.20,
+2000-01-22,Hirondelle 7,sloop,6.3,2.08,10,4,72.32,
+2000-01-22,Goeland 7,ketch,8.9,2.94,22,5,111.20,
+2000-01-22,Jolie Brise 7,trawler,6.0,1.98,4,2,35.20,
+2000-01-22,Goeland 7,motor yacht,12.8,4.22,39,2,56.96,
+2000-01-22,Jolie Brise 7,dinghy,9.9,3.27,37,4,95.36,"Two nights,
+left at dawn"
+2000-01-22,Hirondelle 7,dinghy,13.1,4.32,27,4,115.84,"Two nights,
+left at dawn"
+2000-01-22,Iroise 7,trawler,5.8,1.91,34,1,17.28,
+2000-01-23,Fauvette 7,sloop,9.5,3.14,19,1,23.20,"Two nights,
+left at dawn"
+2000-01-23,Fauvette 7,trawler,12.9,4.26,57,5,143.20,
+2000-01-23,Dorade 7,catamaran,7.3,2.41,56,4,78.72,"Two nights,
+left at dawn"
+2000-01-23,La Mouette 7,sloop,15.7,5.18,34,4,132.48,"Arrived late, ""quiet"" night"
+2000-01-23,Dorade 7,sloop,10.8,3.56,59,4,101.12,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-23,Jolie Brise 7,ketch,14.5,4.79,15,4,124.80,"Two nights,
+left at dawn"
+2000-01-23,Brise 7,catamaran,11.0,3.63,51,1,25.60,
+2000-01-23,Jolie Brise 7,motor yacht,5.9,1.95,1,5,87.20,Bill sent; paid by cheque
+2000-01-23,Aurora 7,trawler,7.3,2.41,12,3,59.04,
+2000-01-23,Iroise 7,motor yacht,9.6,3.17,10,4,93.44,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-24,Aurora 7,trawler,12.5,4.12,2,2,56.00,Café voucher given
+2000-01-24,Fauvette 7,motor yacht,14.8,4.88,10,3,95.04,Café voucher given
+2000-01-24,Etoile 7,dinghy,14.6,4.82,58,2,62.72,
+2000-01-24,Hirondelle 7,sloop,6.7,2.21,12,3,56.16,
+2000-01-24,Dorade 7,sloop,6.8,2.24,42,2,37.76,
+2000-01-24,Etoile 7,motor yacht,8.0,2.64,46,3,62.40,
+2000-01-24,Goeland 7,sloop,8.4,2.77,11,4,85.76,"Arrived late, ""quiet"" night"
+2000-01-24,La Mouette 7,dinghy,14.4,4.75,13,1,31.04,Bill sent; paid by cheque
+2000-01-24,Iroise 7,dinghy,6.6,2.18,19,2,37.12,Bill sent; paid by cheque
+2000-01-24,Brise 7,catamaran,8.8,2.9,34,5,110.40,"Arrived late, ""quiet"" night"
+2000-01-25,Kerguelen 8,ketch,15.7,5.18,18,2,66.24,
+2000-01-25,Hirondelle 8,sloop,11.9,3.93,29,1,27.04,
+2000-01-25,Aurora 8,catamaran,5.3,1.75,38,1,16.48,Bill sent; paid by cheque
+2000-01-25,Jolie Brise 8,sloop,10.7,3.53,11,4,100.48,Bill sent; paid by cheque
+2000-01-25,Dorade 8,ketch,15.9,5.25,18,2,66.88,
+2000-01-25,Aurora 8,catamaran,4.8,1.58,30,2,31.36,"Two nights,
+left at dawn"
+2000-01-25,Aurora 8,ketch,4.5,1.49,5,4,60.80,
+2000-01-25,Fauvette 8,dinghy,13.4,4.42,31,3,88.32,
+2000-01-25,Kerguelen 8,dinghy,10.4,3.43,34,5,123.20,
+2000-01-25,Brise 8,catamaran,6.5,2.15,28,2,36.80,"Arrived late, ""quiet"" night"
+2000-01-26,Etoile 8,dinghy,12.2,4.03,51,5,137.60,"Arrived late, ""quiet"" night"
+2000-01-26,Dorade 8,catamaran,7.5,2.48,39,5,100.00,Café voucher given
+2000-01-26,Jolie Brise 8,dinghy,7.5,2.48,4,2,40.00,Café voucher given
+2000-01-26,Fauvette 8,ketch,14.5,4.79,39,2,62.40,
+2000-01-26,Iroise 8,motor yacht,11.5,3.8,47,4,105.60,Bill sent; paid by cheque
+2000-01-26,Brise 8,sloop,14.4,4.75,59,1,31.04,
+2000-01-26,Jolie Brise 8,dinghy,11.0,3.63,16,5,128.00,
+2000-01-26,Aurora 8,dinghy,5.1,1.68,21,4,64.64,
+2000-01-26,Hirondelle 8,sloop,13.5,4.46,42,5,148.00,
+2000-01-26,Dorade 8,ketch,6.5,2.15,32,3,55.20,Café voucher given
+2000-01-27,Hirondelle 8,trawler,5.2,1.72,45,4,65.28,"Arrived late, ""quiet"" night"
+2000-01-27,Calypso 8,motor yacht,12.6,4.16,49,1,28.16,
+2000-01-27,Iroise 8,dinghy,6.2,2.05,3,4,71.68,
+2000-01-27,Calypso 8,sloop,7.3,2.41,26,5,98.40,
+2000-01-27,Brise 8,sloop,7.9,2.61,44,4,82.56,"Arrived late, ""quiet"" night"
+2000-01-27,Iroise 8,ketch,7.9,2.61,27,1,20.64,Café voucher given
+2000-01-27,Fauvette 8,trawler,5.5,1.82,22,2,33.60,"Arrived late, ""quiet"" night"
+2000-01-27,Jolie Brise 8,dinghy,5.0,1.65,4,4,64.00,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-27,Calypso 8,motor yacht,11.0,3.63,56,5,128.00,"Two nights,
+left at dawn"
+2000-01-27,Goeland 8,motor yacht,15.3,5.05,51,2,64.96,
+2000-01-28,Dorade 8,ketch,7.0,2.31,51,3,57.60,
+2000-01-28,Dorade 8,motor yacht,13.7,4.52,14,4,119.68,Café voucher given
+2000-01-28,Hirondelle 8,motor yacht,13.2,4.36,41,4,116.48,
+2000-01-28,Iroise 8,motor yacht,14.4,4.75,27,2,62.08,
+2000-01-28,Fauvette 8,trawler,5.0,1.65,40,3,48.00,
+2000-01-28,Iroise 8,motor yacht,10.5,3.47,37,3,74.40,"Arrived late, ""quiet"" night"
+2000-01-28,Aurora 8,ketch,7.6,2.51,47,3,60.48,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-28,La Mouette 8,sloop,6.1,2.01,2,2,35.52,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-01-28,Brise 8,motor yacht,14.1,4.65,21,4,122.24,Bill sent; paid by cheque
+2000-01-28,Kerguelen 8,sloop,13.4,4.42,20,5,147.20,"Two nights,
+left at dawn"
+2000-02-01,Aurora 9,ketch,11.5,3.8,10,4,105.60,
+2000-02-01,Dorade 9,trawler,11.3,3.73,27,1,26.08,"Two nights,
+left at dawn"
+2000-02-01,Iroise 9,dinghy,10.0,3.3,36,2,48.00,Bill sent; paid by cheque
+2000-02-01,Kerguelen 9,motor yacht,8.1,2.67,10,4,83.84,"Arrived late, ""quiet"" night"
+2000-02-01,La Mouette 9,motor yacht,14.1,4.65,26,5,152.80,
+2000-02-01,Dorade 9,sloop,8.9,2.94,19,3,66.72,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-02-01,Calypso 9,sloop,8.5,2.81,55,2,43.20,
+2000-02-01,Jolie Brise 9,sloop,13.1,4.32,52,4,115.84,Bill sent; paid by cheque
+2000-02-01,Dorade 9,catamaran,12.1,3.99,45,1,27.36,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-02-01,Dorade 9,dinghy,12.2,4.03,17,3,82.56,
+2000-02-02,Goeland 9,motor yacht,13.7,4.52,4,1,29.92,Café voucher given
+2000-02-02,Etoile 9,motor yacht,8.9,2.94,46,3,66.72,Bill sent; paid by cheque
+2000-02-02,Dorade 9,motor yacht,7.0,2.31,50,4,76.80,
+2000-02-02,Iroise 9,sloop,8.5,2.81,48,2,43.20,"Owner: M. Le Gall, tel. 02 98 00 00 00"
+2000-02-02,Hirondelle 9,catamaran,14.9,4.92,17,2,63.68,
+2000-02-02,Goeland 9,sloop,8.0,2.64,24,1,20.80,
+2000-02-02,Aurora 9,motor yacht,15.0,4.95,32,3,96.00,Bill sent; paid by cheque
+2000-02-02,Etoile 9,sloop,9.9,3.27,2,3,71.52,
+2000-02-02,Jolie Brise 9,trawler,8.5,2.81,17,3,64.80,
+2000-02-02,Jolie Brise 9,trawler,11.9,3.93,58,4,108.16,"Owner: M. Le Gall, tel. 02 98 00 00 00"
diff --git a/crates/exav-viewer/demo/examples/files/text/life.py b/crates/exav-viewer/demo/examples/files/text/life.py
new file mode 100644
index 00000000..b5942abc
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/life.py
@@ -0,0 +1,34 @@
+"""Conway's Game of Life on a torus, printed as text. CC0-1.0, exav project."""
+import random
+import sys
+
+WIDTH, HEIGHT = 40, 16
+
+
+def step(cells):
+    """The next generation of a set of (x, y) cells on a WIDTH by HEIGHT torus."""
+    counts = {}
+    for (x, y) in cells:
+        for dx in (-1, 0, 1):
+            for dy in (-1, 0, 1):
+                if dx or dy:
+                    key = ((x + dx) % WIDTH, (y + dy) % HEIGHT)
+                    counts[key] = counts.get(key, 0) + 1
+    return {cell for cell, n in counts.items() if n == 3 or (n == 2 and cell in cells)}
+
+
+def show(cells):
+    return "\n".join("".join("#" if (x, y) in cells else "." for x in range(WIDTH)) for y in range(HEIGHT))
+
+
+def main(generations=20, seed=7):
+    rng = random.Random(seed)
+    cells = {(x, y) for x in range(WIDTH) for y in range(HEIGHT) if rng.random() < 0.25}
+    for g in range(generations):
+        print(f"generation {g}: {len(cells)} cells")
+        print(show(cells))
+        cells = step(cells)
+
+
+if __name__ == "__main__":
+    main(*(int(a) for a in sys.argv[1:3]))
diff --git a/crates/exav-viewer/demo/examples/files/text/lru.rs b/crates/exav-viewer/demo/examples/files/text/lru.rs
new file mode 100644
index 00000000..da9bfd9d
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/lru.rs
@@ -0,0 +1,57 @@
+//! A small least-recently-used cache. CC0-1.0, exav project.
+use std::collections::HashMap;
+use std::hash::Hash;
+
+/// A cache that keeps at most `capacity` entries and drops the one used longest ago.
+pub struct Lru<K, V> {
+    capacity: usize,
+    tick: u64,
+    entries: HashMap<K, (V, u64)>,
+}
+
+impl<K: Hash + Eq + Clone, V> Lru<K, V> {
+    pub fn new(capacity: usize) -> Self {
+        assert!(capacity > 0, "a cache holds at least one entry");
+        Lru { capacity, tick: 0, entries: HashMap::with_capacity(capacity) }
+    }
+
+    pub fn get(&mut self, key: &K) -> Option<&V> {
+        self.tick += 1;
+        let tick = self.tick;
+        self.entries.get_mut(key).map(|(v, used)| {
+            *used = tick;
+            &*v
+        })
+    }
+
+    pub fn put(&mut self, key: K, value: V) -> Option<V> {
+        self.tick += 1;
+        if !self.entries.contains_key(&key) && self.entries.len() == self.capacity {
+            let oldest = self.entries.iter().min_by_key(|(_, (_, used))| *used).map(|(k, _)| k.clone());
+            if let Some(k) = oldest {
+                self.entries.remove(&k);
+            }
+        }
+        self.entries.insert(key, (value, self.tick)).map(|(v, _)| v)
+    }
+
+    pub fn len(&self) -> usize {
+        self.entries.len()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn drops_the_least_recently_used() {
+        let mut c = Lru::new(2);
+        c.put("a", 1);
+        c.put("b", 2);
+        assert_eq!(c.get(&"a"), Some(&1));
+        c.put("c", 3);
+        assert_eq!(c.get(&"b"), None);
+        assert_eq!(c.len(), 2);
+    }
+}
diff --git a/crates/exav-viewer/demo/examples/files/text/page.html b/crates/exav-viewer/demo/examples/files/text/page.html
new file mode 100644
index 00000000..566f2406
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/page.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>A page, shown as its source</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="style.css">
+  <style>.note { font-style: italic; }</style>
+</head>
+<body>
+  <!-- HTML is shown as text: nothing in this file runs. CC0-1.0, exav project. -->
+  <header><h1>Harbour office</h1><nav><a href="#berths">Berths</a> <a href="#tides">Tides</a></nav></header>
+  <main>
+    <section id="berths">
+      <h2>Berths</h2>
+      <table>
+        <thead><tr><th scope="col">Berth</th><th scope="col">Length</th></tr></thead>
+        <tbody><tr><td>1</td><td>6.5&nbsp;m</td></tr><tr><td>2</td><td>8.2&nbsp;m</td></tr></tbody>
+      </table>
+      <p class="note">Lengths are over all, in metres.</p>
+    </section>
+    <form action="/search" method="get"><label>Boat <input name="q" type="search" required></label> <button>Search</button></form>
+  </main>
+  <script>
+    document.querySelectorAll("nav a").forEach((a) => a.addEventListener("click", () => console.log(a.hash)));
+  </script>
+</body>
+</html>
diff --git a/crates/exav-viewer/demo/examples/files/text/places.kml b/crates/exav-viewer/demo/examples/files/text/places.kml
new file mode 100644
index 00000000..503b0380
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/places.kml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+  <Document>
+    <name>Places (made up)</name>
+    <Style id="harbour"><IconStyle><color>ff0000ff</color><scale>1.2</scale></IconStyle><PolyStyle><color>7f00ff00</color></PolyStyle></Style>
+    <Placemark>
+      <name>East quay</name>
+      <description><![CDATA[<b>Moorings</b> for 60 boats.]]></description>
+      <styleUrl>#harbour</styleUrl>
+      <Point><coordinates>-4.4860,48.3830,0</coordinates></Point>
+    </Placemark>
+    <Placemark>
+      <name>Breakwater</name>
+      <LineString><tessellate>1</tessellate><coordinates>-4.4900,48.3790,0 -4.4850,48.3820,0 -4.4800,48.3835,0</coordinates></LineString>
+    </Placemark>
+    <Placemark>
+      <name>Anchorage</name>
+      <styleUrl>#harbour</styleUrl>
+      <Polygon><outerBoundaryIs><LinearRing><coordinates>-4.4950,48.3850,0 -4.4900,48.3850,0 -4.4900,48.3900,0 -4.4950,48.3900,0 -4.4950,48.3850,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
+    </Placemark>
+  </Document>
+</kml>
diff --git a/crates/exav-viewer/demo/examples/files/text/prix.csv b/crates/exav-viewer/demo/examples/files/text/prix.csv
new file mode 100644
index 00000000..1ceb0b02
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/prix.csv
@@ -0,0 +1,7 @@
+Région;Produit;Quantité;Prix unitaire (€);Total (€)
+Bretagne;Cidre;120;3,50;420,00
+Bretagne;Galettes;300;1,20;360,00
+Normandie;Cidre;90;3,80;342,00
+Normandie;Camembert;200;4,10;820,00
+Alsace;Riesling;150;7,90;1185,00
+Alsace;Bretzels;500;0,60;300,00
diff --git a/crates/exav-viewer/demo/examples/files/text/pyproject.toml b/crates/exav-viewer/demo/examples/files/text/pyproject.toml
new file mode 100644
index 00000000..54ae757b
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/pyproject.toml
@@ -0,0 +1,22 @@
+# A project file, to show TOML as text.
+[project]
+name = "harbour-register"
+version = "1.4.0"
+description = "The mooring register of the east quay"
+requires-python = ">=3.11"
+dependencies = ["httpx>=0.27", "pydantic>=2"]
+
+[project.optional-dependencies]
+test = ["pytest", "pytest-cov"]
+
+[tool.ruff]
+line-length = 100
+select = ["E", "F", "I"]
+
+[[tool.harbour.berths]]
+number = 1
+length = 6.5
+
+[[tool.harbour.berths]]
+number = 2
+length = 8.2
diff --git a/crates/exav-viewer/demo/examples/files/text/recipes.json b/crates/exav-viewer/demo/examples/files/text/recipes.json
new file mode 100644
index 00000000..72c9a84e
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/recipes.json
@@ -0,0 +1,133 @@
+{
+  "title": "A small recipe book",
+  "version": 3,
+  "published": true,
+  "updated": null,
+  "tags": [
+    "cooking",
+    "demo",
+    "café",
+    "日本語"
+  ],
+  "numbers": {
+    "integer": 42,
+    "negative": -7,
+    "float": 3.14159,
+    "exponent": 6.02e+23,
+    "tiny": 1e-09,
+    "zero": 0
+  },
+  "recipes": [
+    {
+      "name": "Crepes",
+      "serves": 4,
+      "time": {
+        "prep_min": 10,
+        "rest_min": 30,
+        "cook_min": 20
+      },
+      "ingredients": [
+        {
+          "item": "flour",
+          "amount": 250,
+          "unit": "g"
+        },
+        {
+          "item": "milk",
+          "amount": 0.5,
+          "unit": "l"
+        },
+        {
+          "item": "eggs",
+          "amount": 3,
+          "unit": null
+        },
+        {
+          "item": "salt",
+          "amount": "a pinch"
+        }
+      ],
+      "steps": [
+        "Whisk the flour and eggs.",
+        "Add the milk slowly.",
+        "Rest for 30 minutes.",
+        "Cook in a hot pan, a minute a side."
+      ],
+      "nutrition": {
+        "kcal": 210,
+        "protein_g": 8.5,
+        "vegetarian": true
+      }
+    },
+    {
+      "name": "Ratatouille",
+      "serves": 6,
+      "time": {
+        "prep_min": 25,
+        "cook_min": 60
+      },
+      "ingredients": [
+        {
+          "item": "aubergine",
+          "amount": 2
+        },
+        {
+          "item": "courgette",
+          "amount": 3
+        },
+        {
+          "item": "tomatoes",
+          "amount": 500,
+          "unit": "g"
+        },
+        {
+          "item": "olive oil",
+          "amount": 4,
+          "unit": "tbsp"
+        }
+      ],
+      "steps": [
+        "Dice the vegetables.",
+        "Fry each in turn.",
+        "Stew together for an hour."
+      ],
+      "nutrition": {
+        "kcal": 160,
+        "protein_g": 3.1,
+        "vegetarian": true,
+        "vegan": true
+      }
+    }
+  ],
+  "nested": {
+    "a": {
+      "b": {
+        "c": {
+          "d": {
+            "e": [
+              1,
+              [
+                2,
+                [
+                  3,
+                  [
+                    4,
+                    [
+                      5
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          }
+        }
+      }
+    }
+  },
+  "escapes": "quote \" backslash \\ slash / newline \n tab \t unicode é 中 😀",
+  "empty": {
+    "object": {},
+    "array": [],
+    "string": ""
+  }
+}
diff --git a/crates/exav-viewer/demo/examples/files/text/report.sql b/crates/exav-viewer/demo/examples/files/text/report.sql
new file mode 100644
index 00000000..8bc1a099
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/report.sql
@@ -0,0 +1,43 @@
+-- Moorings by month, with window functions. CC0-1.0, exav project.
+CREATE TABLE vessel (
+    id        INTEGER PRIMARY KEY,
+    name      TEXT NOT NULL UNIQUE,
+    length_m  REAL NOT NULL CHECK (length_m > 0),
+    kind      TEXT NOT NULL DEFAULT 'sloop'
+);
+
+CREATE TABLE stay (
+    id        INTEGER PRIMARY KEY,
+    vessel_id INTEGER NOT NULL REFERENCES vessel (id),
+    berth     INTEGER NOT NULL,
+    arrived   DATE NOT NULL,
+    nights    INTEGER NOT NULL,
+    fee_eur   NUMERIC(8, 2)
+);
+
+CREATE INDEX stay_by_arrival ON stay (arrived);
+
+WITH monthly AS (
+    SELECT strftime('%Y-%m', arrived) AS month,
+           count(*)                    AS stays,
+           sum(nights)                 AS nights,
+           sum(fee_eur)                AS income
+    FROM stay
+    GROUP BY 1
+)
+SELECT month,
+       stays,
+       income,
+       income - lag(income) OVER (ORDER BY month) AS change,
+       round(100.0 * income / sum(income) OVER (), 1) AS share_pct,
+       rank() OVER (ORDER BY income DESC) AS income_rank
+FROM monthly
+ORDER BY month;
+
+-- The ten longest boats that stayed more than three nights.
+SELECT v.name, v.length_m, s.nights
+FROM vessel AS v
+JOIN stay AS s ON s.vessel_id = v.id
+WHERE s.nights > 3 AND v.kind IN ('ketch', 'trawler')
+ORDER BY v.length_m DESC
+LIMIT 10;
diff --git a/crates/exav-viewer/demo/examples/files/text/route.gpx b/crates/exav-viewer/demo/examples/files/text/route.gpx
new file mode 100644
index 00000000..0daf6321
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/route.gpx
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx version="1.1" creator="exav make-text.py" xmlns="http://www.topografix.com/GPX/1/1">
+  <metadata><name>Coastal walk (made up)</name><desc>A made-up track, 60 points.</desc></metadata>
+  <wpt lat="48.3794" lon="-4.4900"><name>Start</name><sym>Flag</sym></wpt>
+  <wpt lat="48.4100" lon="-4.4300"><name>Viewpoint</name><desc>Seals on the rocks, in winter.</desc></wpt>
+  <trk>
+    <name>Morning walk</name>
+    <trkseg>
+      <trkpt lat="48.37940" lon="-4.48000"><ele>20.0</ele><time>2000-01-01T08:00:00Z</time></trkpt>
+      <trkpt lat="48.38211" lon="-4.47905"><ele>22.4</ele><time>2000-01-01T08:01:00Z</time></trkpt>
+      <trkpt lat="48.38480" lon="-4.47825"><ele>24.8</ele><time>2000-01-01T08:02:00Z</time></trkpt>
+      <trkpt lat="48.38745" lon="-4.47758"><ele>27.1</ele><time>2000-01-01T08:03:00Z</time></trkpt>
+      <trkpt lat="48.39005" lon="-4.47704"><ele>29.3</ele><time>2000-01-01T08:04:00Z</time></trkpt>
+      <trkpt lat="48.39258" lon="-4.47662"><ele>31.2</ele><time>2000-01-01T08:05:00Z</time></trkpt>
+      <trkpt lat="48.39502" lon="-4.47633"><ele>32.9</ele><time>2000-01-01T08:06:00Z</time></trkpt>
+      <trkpt lat="48.39736" lon="-4.47614"><ele>34.3</ele><time>2000-01-01T08:07:00Z</time></trkpt>
+      <trkpt lat="48.39957" lon="-4.47604"><ele>35.4</ele><time>2000-01-01T08:08:00Z</time></trkpt>
+      <trkpt lat="48.40165" lon="-4.47603"><ele>36.2</ele><time>2000-01-01T08:09:00Z</time></trkpt>
+      <trkpt lat="48.40358" lon="-4.47608"><ele>36.7</ele><time>2000-01-01T08:10:00Z</time></trkpt>
+      <trkpt lat="48.40535" lon="-4.47619"><ele>36.8</ele><time>2000-01-01T08:11:00Z</time></trkpt>
+      <trkpt lat="48.40695" lon="-4.47633"><ele>36.5</ele><time>2000-01-01T08:12:00Z</time></trkpt>
+      <trkpt lat="48.40836" lon="-4.47650"><ele>35.9</ele><time>2000-01-01T08:13:00Z</time></trkpt>
+      <trkpt lat="48.40958" lon="-4.47666"><ele>35.0</ele><time>2000-01-01T08:14:00Z</time></trkpt>
+      <trkpt lat="48.41061" lon="-4.47682"><ele>33.8</ele><time>2000-01-01T08:15:00Z</time></trkpt>
+      <trkpt lat="48.41142" lon="-4.47695"><ele>32.4</ele><time>2000-01-01T08:16:00Z</time></trkpt>
+      <trkpt lat="48.41203" lon="-4.47703"><ele>30.7</ele><time>2000-01-01T08:17:00Z</time></trkpt>
+      <trkpt lat="48.41242" lon="-4.47705"><ele>28.8</ele><time>2000-01-01T08:18:00Z</time></trkpt>
+      <trkpt lat="48.41260" lon="-4.47699"><ele>26.8</ele><time>2000-01-01T08:19:00Z</time></trkpt>
+      <trkpt lat="48.41256" lon="-4.47685"><ele>24.7</ele><time>2000-01-01T08:20:00Z</time></trkpt>
+      <trkpt lat="48.41231" lon="-4.47660"><ele>22.6</ele><time>2000-01-01T08:21:00Z</time></trkpt>
+      <trkpt lat="48.41184" lon="-4.47625"><ele>20.5</ele><time>2000-01-01T08:22:00Z</time></trkpt>
+      <trkpt lat="48.41118" lon="-4.47577"><ele>18.5</ele><time>2000-01-01T08:23:00Z</time></trkpt>
+      <trkpt lat="48.41031" lon="-4.47516"><ele>16.6</ele><time>2000-01-01T08:24:00Z</time></trkpt>
+      <trkpt lat="48.40925" lon="-4.47442"><ele>14.9</ele><time>2000-01-01T08:25:00Z</time></trkpt>
+      <trkpt lat="48.40800" lon="-4.47354"><ele>13.4</ele><time>2000-01-01T08:26:00Z</time></trkpt>
+      <trkpt lat="48.40658" lon="-4.47252"><ele>12.1</ele><time>2000-01-01T08:27:00Z</time></trkpt>
+      <trkpt lat="48.40500" lon="-4.47136"><ele>11.2</ele><time>2000-01-01T08:28:00Z</time></trkpt>
+      <trkpt lat="48.40327" lon="-4.47006"><ele>10.5</ele><time>2000-01-01T08:29:00Z</time></trkpt>
+      <trkpt lat="48.40140" lon="-4.46863"><ele>10.2</ele><time>2000-01-01T08:30:00Z</time></trkpt>
+      <trkpt lat="48.39942" lon="-4.46707"><ele>10.3</ele><time>2000-01-01T08:31:00Z</time></trkpt>
+      <trkpt lat="48.39732" lon="-4.46539"><ele>10.6</ele><time>2000-01-01T08:32:00Z</time></trkpt>
+      <trkpt lat="48.39514" lon="-4.46359"><ele>11.4</ele><time>2000-01-01T08:33:00Z</time></trkpt>
+      <trkpt lat="48.39288" lon="-4.46170"><ele>12.4</ele><time>2000-01-01T08:34:00Z</time></trkpt>
+      <trkpt lat="48.39057" lon="-4.45972"><ele>13.8</ele><time>2000-01-01T08:35:00Z</time></trkpt>
+      <trkpt lat="48.38822" lon="-4.45766"><ele>15.4</ele><time>2000-01-01T08:36:00Z</time></trkpt>
+      <trkpt lat="48.38585" lon="-4.45554"><ele>17.3</ele><time>2000-01-01T08:37:00Z</time></trkpt>
+      <trkpt lat="48.38348" lon="-4.45338"><ele>19.4</ele><time>2000-01-01T08:38:00Z</time></trkpt>
+      <trkpt lat="48.38113" lon="-4.45119"><ele>21.7</ele><time>2000-01-01T08:39:00Z</time></trkpt>
+      <trkpt lat="48.37881" lon="-4.44899"><ele>24.1</ele><time>2000-01-01T08:40:00Z</time></trkpt>
+      <trkpt lat="48.37654" lon="-4.44679"><ele>26.5</ele><time>2000-01-01T08:41:00Z</time></trkpt>
+      <trkpt lat="48.37435" lon="-4.44461"><ele>29.0</ele><time>2000-01-01T08:42:00Z</time></trkpt>
+      <trkpt lat="48.37224" lon="-4.44248"><ele>31.4</ele><time>2000-01-01T08:43:00Z</time></trkpt>
+      <trkpt lat="48.37024" lon="-4.44039"><ele>33.7</ele><time>2000-01-01T08:44:00Z</time></trkpt>
+      <trkpt lat="48.36835" lon="-4.43837"><ele>35.9</ele><time>2000-01-01T08:45:00Z</time></trkpt>
+      <trkpt lat="48.36660" lon="-4.43644"><ele>37.8</ele><time>2000-01-01T08:46:00Z</time></trkpt>
+      <trkpt lat="48.36500" lon="-4.43460"><ele>39.6</ele><time>2000-01-01T08:47:00Z</time></trkpt>
+      <trkpt lat="48.36356" lon="-4.43287"><ele>41.1</ele><time>2000-01-01T08:48:00Z</time></trkpt>
+      <trkpt lat="48.36228" lon="-4.43125"><ele>42.2</ele><time>2000-01-01T08:49:00Z</time></trkpt>
+      <trkpt lat="48.36120" lon="-4.42976"><ele>43.1</ele><time>2000-01-01T08:50:00Z</time></trkpt>
+      <trkpt lat="48.36030" lon="-4.42840"><ele>43.6</ele><time>2000-01-01T08:51:00Z</time></trkpt>
+      <trkpt lat="48.35960" lon="-4.42718"><ele>43.8</ele><time>2000-01-01T08:52:00Z</time></trkpt>
+      <trkpt lat="48.35911" lon="-4.42610"><ele>43.6</ele><time>2000-01-01T08:53:00Z</time></trkpt>
+      <trkpt lat="48.35883" lon="-4.42516"><ele>43.1</ele><time>2000-01-01T08:54:00Z</time></trkpt>
+      <trkpt lat="48.35876" lon="-4.42436"><ele>42.2</ele><time>2000-01-01T08:55:00Z</time></trkpt>
+      <trkpt lat="48.35891" lon="-4.42369"><ele>41.1</ele><time>2000-01-01T08:56:00Z</time></trkpt>
+      <trkpt lat="48.35927" lon="-4.42316"><ele>39.7</ele><time>2000-01-01T08:57:00Z</time></trkpt>
+      <trkpt lat="48.35985" lon="-4.42275"><ele>38.0</ele><time>2000-01-01T08:58:00Z</time></trkpt>
+      <trkpt lat="48.36063" lon="-4.42246"><ele>36.2</ele><time>2000-01-01T08:59:00Z</time></trkpt>
+    </trkseg>
+  </trk>
+</gpx>
diff --git a/crates/exav-viewer/demo/examples/files/text/server.log b/crates/exav-viewer/demo/examples/files/text/server.log
new file mode 100644
index 00000000..85849460
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/server.log
@@ -0,0 +1,120 @@
+2000-01-01T08:00:00Z INFO request id=1000 path=/berths/1 status=200 ms=12
+2000-01-01T08:01:07Z INFO request id=1001 path=/berths/2 status=200 ms=49
+2000-01-01T08:02:14Z INFO request id=1002 path=/berths/3 status=304 ms=86
+2000-01-01T08:03:21Z WARN request id=1003 path=/berths/4 status=404 ms=123
+2000-01-01T08:04:28Z ERROR request id=1004 path=/berths/5 status=500 ms=160
+2000-01-01T08:05:35Z INFO request id=1005 path=/berths/6 status=200 ms=197
+2000-01-01T08:06:42Z INFO request id=1006 path=/berths/7 status=200 ms=234
+2000-01-01T08:07:49Z INFO request id=1007 path=/berths/8 status=304 ms=21
+2000-01-01T08:08:56Z WARN request id=1008 path=/berths/9 status=404 ms=58
+2000-01-01T08:09:03Z ERROR request id=1009 path=/berths/10 status=500 ms=95
+2000-01-01T08:10:10Z INFO request id=1010 path=/berths/11 status=200 ms=132
+2000-01-01T08:11:17Z INFO request id=1011 path=/berths/12 status=200 ms=169
+2000-01-01T08:12:24Z INFO request id=1012 path=/berths/13 status=304 ms=206
+2000-01-01T08:13:31Z WARN request id=1013 path=/berths/14 status=404 ms=243
+2000-01-01T08:14:38Z ERROR request id=1014 path=/berths/15 status=500 ms=30
+2000-01-01T08:15:45Z INFO request id=1015 path=/berths/16 status=200 ms=67
+2000-01-01T08:16:52Z INFO request id=1016 path=/berths/17 status=200 ms=104
+2000-01-01T08:17:59Z INFO request id=1017 path=/berths/18 status=304 ms=141
+2000-01-01T08:18:06Z WARN request id=1018 path=/berths/19 status=404 ms=178
+2000-01-01T08:19:13Z ERROR request id=1019 path=/berths/20 status=500 ms=215
+2000-01-01T08:20:20Z INFO request id=1020 path=/berths/21 status=200 ms=252
+2000-01-01T08:21:27Z INFO request id=1021 path=/berths/22 status=200 ms=39
+2000-01-01T08:22:34Z INFO request id=1022 path=/berths/23 status=304 ms=76
+2000-01-01T08:23:41Z WARN request id=1023 path=/berths/24 status=404 ms=113
+2000-01-01T08:24:48Z ERROR request id=1024 path=/berths/25 status=500 ms=150
+2000-01-01T08:25:55Z INFO request id=1025 path=/berths/26 status=200 ms=187
+2000-01-01T08:26:02Z INFO request id=1026 path=/berths/27 status=200 ms=224
+2000-01-01T08:27:09Z INFO request id=1027 path=/berths/28 status=304 ms=261
+2000-01-01T08:28:16Z WARN request id=1028 path=/berths/29 status=404 ms=48
+2000-01-01T08:29:23Z ERROR request id=1029 path=/berths/30 status=500 ms=85
+2000-01-01T08:30:30Z INFO request id=1030 path=/berths/31 status=200 ms=122
+2000-01-01T08:31:37Z INFO request id=1031 path=/berths/32 status=200 ms=159
+2000-01-01T08:32:44Z INFO request id=1032 path=/berths/33 status=304 ms=196
+2000-01-01T08:33:51Z WARN request id=1033 path=/berths/34 status=404 ms=233
+2000-01-01T08:34:58Z ERROR request id=1034 path=/berths/35 status=500 ms=20
+2000-01-01T08:35:05Z INFO request id=1035 path=/berths/36 status=200 ms=57
+2000-01-01T08:36:12Z INFO request id=1036 path=/berths/37 status=200 ms=94
+2000-01-01T08:37:19Z INFO request id=1037 path=/berths/38 status=304 ms=131
+2000-01-01T08:38:26Z WARN request id=1038 path=/berths/39 status=404 ms=168
+2000-01-01T08:39:33Z ERROR request id=1039 path=/berths/40 status=500 ms=205
+2000-01-01T08:40:40Z INFO request id=1040 path=/berths/41 status=200 ms=242
+2000-01-01T08:41:47Z INFO request id=1041 path=/berths/42 status=200 ms=29
+2000-01-01T08:42:54Z INFO request id=1042 path=/berths/43 status=304 ms=66
+2000-01-01T08:43:01Z WARN request id=1043 path=/berths/44 status=404 ms=103
+2000-01-01T08:44:08Z ERROR request id=1044 path=/berths/45 status=500 ms=140
+2000-01-01T08:45:15Z INFO request id=1045 path=/berths/46 status=200 ms=177
+2000-01-01T08:46:22Z INFO request id=1046 path=/berths/47 status=200 ms=214
+2000-01-01T08:47:29Z INFO request id=1047 path=/berths/48 status=304 ms=251
+2000-01-01T08:48:36Z WARN request id=1048 path=/berths/49 status=404 ms=38
+2000-01-01T08:49:43Z ERROR request id=1049 path=/berths/50 status=500 ms=75
+2000-01-01T08:50:50Z INFO request id=1050 path=/berths/51 status=200 ms=112
+2000-01-01T08:51:57Z INFO request id=1051 path=/berths/52 status=200 ms=149
+2000-01-01T08:52:04Z INFO request id=1052 path=/berths/53 status=304 ms=186
+2000-01-01T08:53:11Z WARN request id=1053 path=/berths/54 status=404 ms=223
+2000-01-01T08:54:18Z ERROR request id=1054 path=/berths/55 status=500 ms=260
+2000-01-01T08:55:25Z INFO request id=1055 path=/berths/56 status=200 ms=47
+2000-01-01T08:56:32Z INFO request id=1056 path=/berths/57 status=200 ms=84
+2000-01-01T08:57:39Z INFO request id=1057 path=/berths/58 status=304 ms=121
+2000-01-01T08:58:46Z WARN request id=1058 path=/berths/59 status=404 ms=158
+2000-01-01T08:59:53Z ERROR request id=1059 path=/berths/60 status=500 ms=195
+2000-01-01T09:00:00Z INFO request id=1060 path=/berths/1 status=200 ms=232
+2000-01-01T09:01:07Z INFO request id=1061 path=/berths/2 status=200 ms=19
+2000-01-01T09:02:14Z INFO request id=1062 path=/berths/3 status=304 ms=56
+2000-01-01T09:03:21Z WARN request id=1063 path=/berths/4 status=404 ms=93
+2000-01-01T09:04:28Z ERROR request id=1064 path=/berths/5 status=500 ms=130
+2000-01-01T09:05:35Z INFO request id=1065 path=/berths/6 status=200 ms=167
+2000-01-01T09:06:42Z INFO request id=1066 path=/berths/7 status=200 ms=204
+2000-01-01T09:07:49Z INFO request id=1067 path=/berths/8 status=304 ms=241
+2000-01-01T09:08:56Z WARN request id=1068 path=/berths/9 status=404 ms=28
+2000-01-01T09:09:03Z ERROR request id=1069 path=/berths/10 status=500 ms=65
+2000-01-01T09:10:10Z INFO request id=1070 path=/berths/11 status=200 ms=102
+2000-01-01T09:11:17Z INFO request id=1071 path=/berths/12 status=200 ms=139
+2000-01-01T09:12:24Z INFO request id=1072 path=/berths/13 status=304 ms=176
+2000-01-01T09:13:31Z WARN request id=1073 path=/berths/14 status=404 ms=213
+2000-01-01T09:14:38Z ERROR request id=1074 path=/berths/15 status=500 ms=250
+2000-01-01T09:15:45Z INFO request id=1075 path=/berths/16 status=200 ms=37
+2000-01-01T09:16:52Z INFO request id=1076 path=/berths/17 status=200 ms=74
+2000-01-01T09:17:59Z INFO request id=1077 path=/berths/18 status=304 ms=111
+2000-01-01T09:18:06Z WARN request id=1078 path=/berths/19 status=404 ms=148
+2000-01-01T09:19:13Z ERROR request id=1079 path=/berths/20 status=500 ms=185
+2000-01-01T09:20:20Z INFO request id=1080 path=/berths/21 status=200 ms=222
+2000-01-01T09:21:27Z INFO request id=1081 path=/berths/22 status=200 ms=259
+2000-01-01T09:22:34Z INFO request id=1082 path=/berths/23 status=304 ms=46
+2000-01-01T09:23:41Z WARN request id=1083 path=/berths/24 status=404 ms=83
+2000-01-01T09:24:48Z ERROR request id=1084 path=/berths/25 status=500 ms=120
+2000-01-01T09:25:55Z INFO request id=1085 path=/berths/26 status=200 ms=157
+2000-01-01T09:26:02Z INFO request id=1086 path=/berths/27 status=200 ms=194
+2000-01-01T09:27:09Z INFO request id=1087 path=/berths/28 status=304 ms=231
+2000-01-01T09:28:16Z WARN request id=1088 path=/berths/29 status=404 ms=18
+2000-01-01T09:29:23Z ERROR request id=1089 path=/berths/30 status=500 ms=55
+2000-01-01T09:30:30Z INFO request id=1090 path=/berths/31 status=200 ms=92
+2000-01-01T09:31:37Z INFO request id=1091 path=/berths/32 status=200 ms=129
+2000-01-01T09:32:44Z INFO request id=1092 path=/berths/33 status=304 ms=166
+2000-01-01T09:33:51Z WARN request id=1093 path=/berths/34 status=404 ms=203
+2000-01-01T09:34:58Z ERROR request id=1094 path=/berths/35 status=500 ms=240
+2000-01-01T09:35:05Z INFO request id=1095 path=/berths/36 status=200 ms=27
+2000-01-01T09:36:12Z INFO request id=1096 path=/berths/37 status=200 ms=64
+2000-01-01T09:37:19Z INFO request id=1097 path=/berths/38 status=304 ms=101
+2000-01-01T09:38:26Z WARN request id=1098 path=/berths/39 status=404 ms=138
+2000-01-01T09:39:33Z ERROR request id=1099 path=/berths/40 status=500 ms=175
+2000-01-01T09:40:40Z INFO request id=1100 path=/berths/41 status=200 ms=212
+2000-01-01T09:41:47Z INFO request id=1101 path=/berths/42 status=200 ms=249
+2000-01-01T09:42:54Z INFO request id=1102 path=/berths/43 status=304 ms=36
+2000-01-01T09:43:01Z WARN request id=1103 path=/berths/44 status=404 ms=73
+2000-01-01T09:44:08Z ERROR request id=1104 path=/berths/45 status=500 ms=110
+2000-01-01T09:45:15Z INFO request id=1105 path=/berths/46 status=200 ms=147
+2000-01-01T09:46:22Z INFO request id=1106 path=/berths/47 status=200 ms=184
+2000-01-01T09:47:29Z INFO request id=1107 path=/berths/48 status=304 ms=221
+2000-01-01T09:48:36Z WARN request id=1108 path=/berths/49 status=404 ms=258
+2000-01-01T09:49:43Z ERROR request id=1109 path=/berths/50 status=500 ms=45
+2000-01-01T09:50:50Z INFO request id=1110 path=/berths/51 status=200 ms=82
+2000-01-01T09:51:57Z INFO request id=1111 path=/berths/52 status=200 ms=119
+2000-01-01T09:52:04Z INFO request id=1112 path=/berths/53 status=304 ms=156
+2000-01-01T09:53:11Z WARN request id=1113 path=/berths/54 status=404 ms=193
+2000-01-01T09:54:18Z ERROR request id=1114 path=/berths/55 status=500 ms=230
+2000-01-01T09:55:25Z INFO request id=1115 path=/berths/56 status=200 ms=17
+2000-01-01T09:56:32Z INFO request id=1116 path=/berths/57 status=200 ms=54
+2000-01-01T09:57:39Z INFO request id=1117 path=/berths/58 status=304 ms=91
+2000-01-01T09:58:46Z WARN request id=1118 path=/berths/59 status=404 ms=128
+2000-01-01T09:59:53Z ERROR request id=1119 path=/berths/60 status=500 ms=165
diff --git a/crates/exav-viewer/demo/examples/files/text/style.css b/crates/exav-viewer/demo/examples/files/text/style.css
new file mode 100644
index 00000000..013affe1
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/style.css
@@ -0,0 +1,50 @@
+/* A small stylesheet with custom properties, grid and a media query. CC0-1.0, exav project. */
+:root {
+  --ink: #1b2430;
+  --paper: #fbfaf7;
+  --accent: #0b7285;
+  --radius: 0.5rem;
+  --gap: clamp(0.75rem, 2vw, 1.5rem);
+  color-scheme: light dark;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root { --ink: #e7edf3; --paper: #12171d; --accent: #66d9e8; }
+}
+
+*, *::before, *::after { box-sizing: border-box; }
+
+body {
+  margin: 0;
+  background: var(--paper);
+  color: var(--ink);
+  font: 1rem/1.55 system-ui, sans-serif;
+}
+
+.cards {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(14rem, 1fr));
+  gap: var(--gap);
+  padding: var(--gap);
+}
+
+.card {
+  padding: 1rem;
+  border: 1px solid color-mix(in srgb, var(--ink) 20%, transparent);
+  border-radius: var(--radius);
+  transition: transform 120ms ease, box-shadow 120ms ease;
+}
+
+.card:hover,
+.card:focus-within {
+  transform: translateY(-2px);
+  box-shadow: 0 6px 18px rgb(0 0 0 / 0.12);
+}
+
+.card > h2::after { content: " \2192"; color: var(--accent); }
+
+a:not([class]) { color: var(--accent); text-underline-offset: 0.2em; }
+
+@media (max-width: 40rem) {
+  .cards { grid-template-columns: 1fr; }
+}
diff --git a/crates/exav-viewer/demo/examples/files/text/subtitles.srt b/crates/exav-viewer/demo/examples/files/text/subtitles.srt
new file mode 100644
index 00000000..6630bd3e
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/subtitles.srt
@@ -0,0 +1,23 @@
+1
+00:00:02,000 --> 00:00:03,800
+The tide is coming in.
+
+2
+00:00:04,000 --> 00:00:05,800
+Berth fourteen is free.
+
+3
+00:00:06,000 --> 00:00:07,800
+<i>A gull laughs.</i>
+
+4
+00:00:08,000 --> 00:00:09,800
+Take the line, please.
+
+5
+00:00:10,000 --> 00:00:11,800
+Engine off, thank you.
+
+6
+00:00:12,000 --> 00:00:13,800
+Welcome to the east quay.
diff --git a/crates/exav-viewer/demo/examples/files/text/tides.tsv b/crates/exav-viewer/demo/examples/files/text/tides.tsv
new file mode 100644
index 00000000..989f0389
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/tides.tsv
@@ -0,0 +1,29 @@
+day	high_1	height_1_m	low_1	height_2_m	coefficient
+1	05.80	5.01	11.80	1.98	78
+2	06.60	5.49	12.60	1.93	86
+3	07.40	5.93	13.40	1.84	93
+4	08.20	6.30	14.20	1.73	100
+5	09.00	6.60	15.00	1.59	104
+6	09.80	6.80	15.80	1.43	108
+7	10.60	6.89	16.60	1.27	109
+8	11.40	6.88	17.40	1.10	109
+9	12.20	6.76	18.20	0.93	107
+10	13.00	6.54	19.00	0.78	103
+11	13.80	6.22	19.80	0.64	98
+12	14.60	5.83	20.60	0.53	92
+13	15.40	5.38	21.40	0.46	84
+14	16.20	4.89	22.20	0.41	76
+15	17.00	4.38	23.00	0.40	68
+16	17.80	3.88	23.80	0.43	59
+17	18.60	3.40	00.60	0.49	51
+18	19.40	2.98	01.40	0.58	44
+19	20.20	2.62	02.20	0.70	38
+20	21.00	2.35	03.00	0.85	34
+21	21.80	2.17	03.80	1.01	31
+22	22.60	2.10	04.60	1.17	30
+23	23.40	2.14	05.40	1.34	30
+24	00.20	2.28	06.20	1.51	33
+25	01.00	2.53	07.00	1.66	37
+26	01.80	2.86	07.80	1.78	42
+27	02.60	3.27	08.60	1.89	49
+28	03.40	3.73	09.40	1.96	57
diff --git a/crates/exav-viewer/demo/examples/files/text/tokens.ts b/crates/exav-viewer/demo/examples/files/text/tokens.ts
new file mode 100644
index 00000000..3756dc21
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/files/text/tokens.ts
@@ -0,0 +1,54 @@
+// An arithmetic tokenizer and evaluator. CC0-1.0, exav project.
+type Token = { kind: "num"; value: number } | { kind: "op"; value: "+" | "-" | "*" | "/" | "^" } | { kind: "paren"; value: "(" | ")" };
+
+export function tokenize(source: string): Token[] {
+  const tokens: Token[] = [];
+  const re = /\s*(?:(\d+(?:\.\d+)?)|([-+*/^])|([()]))/y;
+  let match: RegExpExecArray | null;
+  while (re.lastIndex < source.length && (match = re.exec(source))) {
+    if (match[1] !== undefined) tokens.push({ kind: "num", value: Number(match[1]) });
+    else if (match[2]) tokens.push({ kind: "op", value: match[2] as "+" });
+    else tokens.push({ kind: "paren", value: match[3] as "(" });
+  }
+  if (re.lastIndex < source.trimEnd().length) throw new SyntaxError(`unexpected character at ${re.lastIndex}`);
+  return tokens;
+}
+
+const PRECEDENCE: Record<string, [number, "left" | "right"]> = { "+": [1, "left"], "-": [1, "left"], "*": [2, "left"], "/": [2, "left"], "^": [3, "right"] };
+
+/** Evaluates with the shunting-yard algorithm. */
+export function evaluate(source: string): number {
+  const out: number[] = [];
+  const ops: string[] = [];
+  const apply = (op: string) => {
+    const b = out.pop();
+    const a = out.pop();
+    if (a === undefined || b === undefined) throw new SyntaxError("missing operand");
+    out.push(op === "+" ? a + b : op === "-" ? a - b : op === "*" ? a * b : op === "/" ? a / b : a ** b);
+  };
+  for (const t of tokenize(source)) {
+    if (t.kind === "num") out.push(t.value);
+    else if (t.kind === "op") {
+      const [p, assoc] = PRECEDENCE[t.value]!;
+      while (ops.length) {
+        const top = ops[ops.length - 1]!;
+        const [tp] = PRECEDENCE[top] ?? [-1];
+        if (top !== "(" && (tp > p || (tp === p && assoc === "left"))) apply(ops.pop()!);
+        else break;
+      }
+      ops.push(t.value);
+    } else if (t.value === "(") ops.push("(");
+    else {
+      while (ops.length && ops[ops.length - 1] !== "(") apply(ops.pop()!);
+      if (ops.pop() !== "(") throw new SyntaxError("unbalanced parenthesis");
+    }
+  }
+  while (ops.length) {
+    const op = ops.pop()!;
+    if (op === "(") throw new SyntaxError("unbalanced parenthesis");
+    apply(op);
+  }
+  return out[0] ?? NaN;
+}
+
+console.log(evaluate("2 + 3 * (4 - 1) ^ 2"));
diff --git a/crates/exav-viewer/demo/examples/generate/catalog.json b/crates/exav-viewer/demo/examples/generate/catalog.json
new file mode 100644
index 00000000..92d354f6
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/catalog.json
@@ -0,0 +1,376 @@
+{
+  "refs": {
+    "pixls": { "author": "Uploader to raw.pixls.us (the site gives no name)", "source": "https://raw.pixls.us/#repo", "evidence": "https://raw.pixls.us/json/getrepository.php?set=all", "evidence_quote": "Creative Commons 0 - Public Domain", "evidence_row": "sha256", "licence": "CC0-1.0", "attribution": "" },
+    "bsi": { "author": "buildingSMART International Ltd.", "source": "https://github.com/buildingSMART/Sample-Test-Files", "evidence": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/LICENSE", "evidence_quote": "This work is licensed under the Creative Commons Attribution 4.0 International License.", "licence": "CC-BY-4.0", "attribution": "buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes." },
+    "barraca": { "author": "Òscar Selfa", "source": "https://zenodo.org/records/14293897", "evidence": "https://zenodo.org/records/14293897", "evidence_quote": "Creative Commons Attribution 4.0 International", "licence": "CC-BY-4.0", "attribution": "Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes." },
+    "ezdxf": { "author": "Manfred Moitzi (ezdxf)", "source": "https://github.com/mozman/ezdxf", "evidence": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/LICENSE", "evidence_quote": "Copyright (c) 2020 Manfred Moitzi", "licence": "MIT", "attribution": "Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes." },
+    "khronos": { "author": "Khronos glTF Sample Assets (the model's own README names the author)", "source": "https://github.com/KhronosGroup/glTF-Sample-Assets", "licence": "CC-BY-4.0" },
+    "poi": { "author": "Apache POI committers", "source": "https://github.com/apache/poi/tree/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data", "evidence": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/legal/LICENSE", "evidence_quote": "Version 2.0, January 2004", "licence": "Apache-2.0", "attribution": "Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes." },
+    "tika": { "author": "Apache Tika committers", "source": "https://github.com/apache/tika/tree/f58e44c022a9952252f3e094dcc40abd931f7ecd", "evidence": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/LICENSE.txt", "evidence_quote": "Version 2.0, January 2004", "licence": "Apache-2.0", "attribution": "Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes." },
+    "docx4j": { "author": "Jason Harrop and the docx4j contributors", "source": "https://github.com/plutext/docx4j", "evidence": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/legals/LICENSE", "evidence_quote": "Version 2.0, January 2004", "licence": "Apache-2.0", "attribution": "docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes." },
+    "odfdo": { "author": "Jérôme Dumonteil (odfdo)", "source": "https://github.com/jdum/odfdo", "evidence": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/LICENSE", "evidence_quote": "Version 2.0, January 2004", "licence": "Apache-2.0", "attribution": "Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes." },
+    "gsa508": { "author": "U.S. General Services Administration and the agencies that wrote the documents (Section508.gov)", "source": "https://github.com/GSA/Assets.Section508.gov", "evidence": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/LICENSE.md", "evidence_quote": "this project is in the public domain within the United States of America. Additionally, we waive copyright and", "licence": "CC0-1.0", "attribution": "" },
+    "cleveland": { "author": "Cleveland Museum of Art", "licence": "CC0-1.0", "evidence_quote": "\"share_license_status\":\"CC0\"", "attribution": "" },
+    "zenodo": { "licence": "CC-BY-4.0", "evidence_quote": "Creative Commons Attribution 4.0 International" }
+  },
+  "blocks": [
+    {
+      "group": "images",
+      "source": "generated",
+      "gen": "make-images.py",
+      "dir": "images",
+      "files": [
+        { "file": "scene.png", "family": "png", "title": "Dusk landscape, PNG", "features": "8-bit RGB, optimised" },
+        { "file": "scene-alpha.png", "family": "png", "title": "Landscape fading to transparent, PNG", "features": "RGBA: the viewer shows its chequerboard through the alpha" },
+        { "file": "scene-indexed.png", "family": "png", "title": "Landscape in 32 colours, PNG", "features": "palette (indexed) PNG" },
+        { "file": "gradient-grey16.png", "family": "png", "title": "Grey ramp, 16-bit PNG", "features": "16-bit greyscale" },
+        { "file": "bounce.png", "family": "apng", "title": "Bouncing ball, animated PNG", "features": "24 frames, APNG" },
+        { "file": "scene.jpg", "family": "jpeg", "title": "Dusk landscape, JPEG", "features": "baseline 4:2:0 with EXIF description and copyright" },
+        { "file": "scene-progressive.jpg", "family": "jpeg", "title": "Dusk landscape, progressive JPEG", "features": "progressive scans, optimised Huffman tables" },
+        { "file": "scene-orientation6.jpg", "family": "jpeg", "title": "JPEG stored on its side with EXIF orientation 6", "features": "shown upright through the EXIF orientation" },
+        { "file": "scene-grey.jpg", "family": "jpeg", "title": "Landscape in grey, JPEG", "features": "single-component JPEG" },
+        { "file": "scene-cmyk.jpg", "family": "jpeg", "title": "Landscape as a CMYK JPEG", "features": "four components (Adobe inverted CMYK)" },
+        { "file": "bounce.gif", "family": "gif", "title": "Bouncing ball, animated GIF", "features": "24 frames with a palette each" },
+        { "file": "scene.gif", "family": "gif", "title": "Dusk landscape, dithered GIF", "features": "256 colours, Floyd-Steinberg dithering" },
+        { "file": "scene.webp", "family": "webp", "title": "Dusk landscape, lossy WebP", "features": "VP8" },
+        { "file": "scene-lossless.webp", "family": "webp", "title": "Dusk landscape, lossless WebP", "features": "VP8L" },
+        { "file": "scene-alpha.webp", "family": "webp", "title": "Landscape fading to transparent, WebP", "features": "lossy colour with an alpha plane (VP8X, ALPH)" },
+        { "file": "bounce.webp", "family": "webp", "title": "Bouncing ball, animated WebP", "features": "24 frames" },
+        { "file": "scene-lzw.tif", "family": "tiff", "title": "Dusk landscape, TIFF with LZW", "features": "RGB, LZW, 300 dpi" },
+        { "file": "scene-jpeg.tif", "family": "tiff", "title": "Dusk landscape, TIFF with JPEG compression", "features": "JPEG in TIFF (compression 7)" },
+        { "file": "scene-cmyk-packbits.tif", "family": "tiff", "title": "Landscape as a CMYK TIFF", "features": "four inks, PackBits" },
+        { "file": "gradient-grey16.tif", "family": "tiff", "title": "Grey ramp, 16-bit TIFF", "features": "16-bit greyscale, Deflate" },
+        { "file": "scene-pages.tif", "family": "tiff", "title": "Three-page TIFF", "features": "pages of 512, 256 and 128 pixels, the last in grey, Deflate" },
+        { "file": "fax-g4.tif", "family": "tiff-fax", "title": "Fax cover sheet and register, CCITT Group 4 TIFF", "features": "1-bit, 1728 by 2200 at 204 by 196 dpi, T.6" },
+        { "file": "fax-g4-3pages.tif", "family": "tiff-fax", "title": "Three-page fax, CCITT Group 4 TIFF", "features": "three pages, T.6" },
+        { "file": "fax-g3-1d.tif", "group": "unsupported", "family": "tiff-fax", "title": "Fax page, CCITT Group 3 (T.4, one-dimensional) TIFF", "features": "kept to show the error: the TIFF decoder reads Group 4 only" },
+        { "file": "scene-24.bmp", "family": "bmp", "title": "Dusk landscape, 24-bit BMP", "features": "BI_RGB, bottom-up" },
+        { "file": "scene-8.bmp", "family": "bmp", "title": "Dusk landscape, 8-bit BMP", "features": "256-colour palette" },
+        { "file": "scene-32.bmp", "family": "bmp", "title": "Dusk landscape, 32-bit BMP", "features": "four channels" },
+        { "file": "scene-1bit.bmp", "family": "bmp", "title": "Dusk landscape, 1-bit BMP", "features": "two-colour palette" },
+        { "file": "scene-rle8.bmp", "family": "bmp", "title": "Dusk landscape, 8-bit BMP with RLE compression", "features": "BI_RLE8 with encoded and absolute runs" },
+        { "file": "icon.ico", "family": "ico", "title": "Icon with seven sizes", "features": "16 to 256 pixels, PNG-coded images" },
+        { "file": "icon-legacy.ico", "family": "ico", "title": "Icon in the legacy bitmap coding", "features": "32-bit and 8-bit DIBs with AND masks, and one PNG image" },
+        { "file": "scene.ppm", "family": "pnm", "title": "Dusk landscape, PPM (P6)", "features": "binary pixmap with a comment" },
+        { "file": "scene-ascii.ppm", "family": "pnm", "title": "Dusk landscape, ASCII PPM (P3)", "features": "text pixmap, 48 by 36" },
+        { "file": "scene-grey16.pgm", "family": "pnm", "title": "Landscape in grey, 16-bit PGM (P5)", "features": "maxval 65535" },
+        { "file": "scene.pbm", "family": "pnm", "title": "Landscape as a bitmap, PBM (P4)", "features": "1 bit a pixel" },
+        { "file": "scene-alpha.pam", "family": "pnm", "title": "Landscape with alpha, PAM (P7)", "features": "RGB_ALPHA tuples" },
+        { "file": "scene.qoi", "family": "qoi", "title": "Dusk landscape, QOI", "features": "three channels" },
+        { "file": "scene-alpha.qoi", "family": "qoi", "title": "Landscape with alpha, QOI", "features": "four channels" },
+        { "file": "scene.ff", "family": "farbfeld", "title": "Landscape with alpha, farbfeld", "features": "16-bit RGBA, big-endian" },
+        { "file": "sunset.hdr", "family": "hdr", "title": "Sunset with a sun far brighter than the sky, Radiance HDR", "features": "RGBE with run-length scanlines; the sun is 60 times white" },
+        { "file": "sunset-flat.hdr", "family": "hdr", "title": "Sunset, uncompressed Radiance HDR", "features": "flat RGBE scanlines" },
+        { "file": "scene-bc1.dds", "family": "dds", "title": "Dusk landscape, DDS with BC1 (DXT1)", "features": "full mipmap chain" },
+        { "file": "scene-bc3.dds", "family": "dds", "title": "Landscape with alpha, DDS with BC3 (DXT5)", "features": "full mipmap chain, alpha blocks" },
+        { "file": "scene.jp2", "family": "jpeg2000", "title": "Dusk landscape, JPEG 2000 (JP2)", "features": "lossy, 3 quality layers, 5 resolutions, 256-pixel tiles, RPCL progression" },
+        { "file": "scene.j2k", "family": "jpeg2000", "title": "Dusk landscape, bare JPEG 2000 codestream", "features": "no JP2 boxes" },
+        { "file": "scene-grey.jp2", "family": "jpeg2000", "title": "Landscape in grey, JPEG 2000", "features": "one component" },
+        { "file": "scene-alpha.jp2", "family": "jpeg2000", "title": "Landscape with alpha, JPEG 2000", "features": "four components with an alpha channel" },
+        { "file": "page-generic.jb2", "family": "jbig2", "title": "Fax page as a JBIG2 file, generic region", "features": "1-bit page of 1240 by 1579, arithmetic coding" },
+        { "file": "page-symbol.jb2", "family": "jbig2", "title": "Fax page as a JBIG2 file, symbol coding", "features": "text region over a symbol dictionary" },
+        { "file": "scene-lossy.jxl", "family": "jpeg-xl", "title": "Dusk landscape, JPEG XL, lossy", "features": "VarDCT at distance 1" },
+        { "file": "scene-lossless.jxl", "family": "jpeg-xl", "title": "Dusk landscape, JPEG XL, lossless", "features": "modular mode" },
+        { "file": "scene-alpha.jxl", "family": "jpeg-xl", "title": "Landscape with alpha, JPEG XL", "features": "lossless with an extra alpha channel" },
+        { "file": "bounce.jxl", "family": "jpeg-xl", "title": "Bouncing ball, animated JPEG XL", "features": "24 frames" }
+      ]
+    },
+    {
+      "group": "cad",
+      "source": "generated",
+      "gen": "make-cad.py",
+      "dir": "cad",
+      "files": [
+        { "file": "house-plan.dxf", "family": "dxf", "title": "House, ground floor plan (DXF 2018)", "features": "walls cut at openings with pattern hatches, door blocks with attributes, window and furniture blocks, axes with bubbles, room labels, linear, aligned, radius and angular dimensions, stair, north arrow, 17 layers, paper-space sheet with a viewport and a title block" },
+        { "file": "house-plan-r2000.dxf", "family": "dxf", "title": "House, ground floor plan (DXF 2000)", "features": "the same plan written as an AutoCAD 2000 file" },
+        { "file": "house-elevations.dxf", "family": "dxf", "title": "House, four elevations and a section in 2D", "features": "gabled roofs with roof-tile hatches, plaster hatches, ground hatching, windows with transparent glass, steps, level marks, height dimensions, a hatched section with a stair" },
+        { "file": "hatch-gallery.dxf", "family": "dxf", "title": "Hatch gallery", "features": "about a hundred predefined patterns, nine gradient types, islands in the three hatch styles, boundaries of lines, arcs, ellipses and splines, pattern angle and scale" },
+        { "file": "dimensions.dxf", "family": "dxf", "title": "Dimension types", "features": "linear, aligned, diameter, radius, arc length, angular (two lines and three points), ordinate, leaders, a multileader, tolerances, text override, three dimension styles" },
+        { "file": "linetypes.dxf", "family": "dxf", "title": "Linetypes, line weights and polylines", "features": "the standard linetypes, custom ones with text inside, 12 line weights, per-entity scale, linetype generation, polylines with widths, circles, arcs, ellipses and splines in dashed styles" },
+        { "file": "text-styles.dxf", "family": "dxf", "title": "Text styles and MTEXT", "features": "ten text styles (width and oblique factors, mirrored, upside down), justifications, rotation, special codes, Unicode, MTEXT colours, fonts, stacked fractions, underline, columns, background, nine attachment points" },
+        { "file": "blocks.dxf", "family": "dxf", "title": "Blocks, nested inserts and arrays", "features": "a block inside a block inside a block with attributes, mirrored, scaled and rotated inserts, a 3 by 8 array, BYBLOCK colours" },
+        { "file": "bracket.dxf", "family": "dxf", "title": "Mechanical part: an L bracket in three views", "features": "centre and hidden lines, a section with hatching, dimensions with tolerances, diameter and radius dimensions, a leader, an A4 sheet with a title block" },
+        { "file": "site-plan.dxf", "family": "dxf", "title": "Site plan with contour lines", "features": "closed spline contours, wide polyline roads, parcels with areas, hatched buildings, a gradient pond, spot heights, trees, scale bar, legend and north arrow" },
+        { "file": "legacy-r12.dxf", "family": "dxf", "title": "Gear in the R12 format", "features": "POLYLINE, CIRCLE, ARC, TEXT, SOLID, 3DFACE and INSERT entities of the 1992 format" }
+      ]
+    },
+    {
+      "group": "3d",
+      "source": "generated",
+      "gen": "make-models.py",
+      "dir": "models",
+      "files": [
+        { "file": "gear.stl", "family": "stl", "title": "Spur gear, binary STL with facet colours", "features": "864 facets, orange teeth and blue hub through the VisCAM colour attribute" },
+        { "file": "bracket-ascii.stl", "family": "stl", "title": "L bracket, ASCII STL", "features": "text STL, three overlapping boxes" },
+        { "file": "knot.obj", "family": "obj", "title": "Trefoil knot and base, OBJ with vertex colours", "features": "two objects (knot, base), a colour and a normal per vertex, quads, a rainbow along the knot" },
+        { "file": "terrain.ply", "family": "ply", "title": "Height field, binary PLY with colours", "features": "2304 vertices with normals and a hypsometric colour each, 4418 triangles" },
+        { "file": "icosphere-ascii.ply", "family": "ply", "title": "Icosphere, ASCII PLY with colours", "features": "text PLY with normals and RGBA per vertex" },
+        { "file": "arm.glb", "family": "glb", "title": "Articulated arm in a glass dome, GLB", "features": "node tree with rotations and scales, five materials, a metallic and a transparent one, vertex colours on the floor" },
+        { "file": "table.gltf", "family": "gltf", "title": "Table and two chairs, glTF with an embedded buffer", "features": "17 nodes, a data URI buffer, shared meshes instanced under several nodes" }
+      ]
+    },
+    {
+      "group": "pdf",
+      "source": "generated",
+      "gen": "make-pdf.py",
+      "dir": "pdf",
+      "files": [
+        { "file": "field-report.pdf", "family": "pdf", "title": "Field report, six pages", "features": "a table of contents whose lines are links, a two-level outline, roman and arabic page labels, internal and external links, a table, bar, line and pie charts as vectors, a JPEG, standard and embedded fonts (Latin, Greek, Cyrillic), document information" },
+        { "file": "application-form.pdf", "family": "pdf-form", "title": "Berth application form (AcroForm)", "features": "text fields (multiline, maximum length, password, read-only), check boxes, radio buttons, a drop-down list, a list box, some filled in" },
+        { "file": "annotations.pdf", "family": "pdf-annotations", "title": "Annotations without appearance streams", "features": "links to a URL, a page and a named destination, highlight, underline, strike-out, squiggly, note, free text, square, circle, line with arrows, polygon, polyline, ink, stamp, file attachment, an outline and a named destination" },
+        { "file": "scan-mixed.pdf", "family": "pdf-scan", "title": "Scanned letters, one page for each scanner image filter", "features": "four pages: DCTDecode (JPEG), CCITTFaxDecode (Group 4), JBIG2Decode and JPXDecode (JPEG 2000), each with an invisible OCR text layer; the viewer decodes the last three with its own decoders", "tools": ["opj_compress", "jbig2", "tiffcp"] },
+        { "file": "vector-art.pdf", "family": "pdf", "title": "Vector art", "features": "axial and radial shadings, transparency, a clipping path, dashes, caps and joins, Bezier curves, an even-odd fill, text with render modes, rotated and scaled text" }
+      ]
+    },
+    {
+      "group": "office",
+      "source": "generated",
+      "gen": "make-office.py",
+      "tools": ["soffice"],
+      "files": [
+        { "file": "handbook.docx", "dir": "office", "family": "docx", "title": "Harbour handbook (Word)", "features": "title page, table of contents with links, outline numbering, character and paragraph styles, bulleted and numbered lists of three levels, tables with merged cells and a repeated header, two pictures (one floating with wrapped text), a shape, footnotes, hyperlinks, bookmarks, fields, a comment, tracked changes, a two-column section, a landscape section with a wide table, headers and footers with page numbers" },
+        { "file": "workbook.xlsx", "dir": "office", "family": "xlsx", "title": "Harbour workbook (Excel)", "features": "three sheets: a budget with formulas (SUM, AVERAGE, INDEX, MATCH, COUNTIF, IF, VLOOKUP, ROUND), currency, percent and date formats, merged title, frozen header rows, a validation list, a comment, a hyperlink and named ranges; 120 rows of sales with an autofilter; a bar, a line and a pie chart" },
+        { "file": "deck.pptx", "dir": "office", "family": "pptx", "title": "Harbour review (PowerPoint)", "features": "five slides: a gradient title slide, nested bullets, a native bar chart with a callout, a table, a picture with shapes, gradients and arrows; a master with footer and slide number; speaker notes (not shown) and transitions" },
+        { "file": "handbook-tagged.pdf", "dir": "pdf", "group": "pdf", "family": "pdf", "title": "Harbour handbook as a tagged PDF/A-2", "features": "bookmarks from the headings, hyperlinks, tags, footnotes, a landscape section, embedded Liberation fonts" },
+        { "file": "handbook.doc", "dir": "converted", "group": "converted", "family": "doc", "title": "Harbour handbook (Word 97 to 2003)", "features": "the handbook as a binary .doc" },
+        { "file": "handbook.odt", "dir": "converted", "group": "converted", "family": "odt", "title": "Harbour handbook (OpenDocument text)", "features": "the handbook as .odt" },
+        { "file": "handbook.fodt", "dir": "converted", "group": "converted", "family": "fodt", "title": "Harbour handbook (flat OpenDocument text)", "features": "one XML file, pictures in base64; written by hand, not converted", "tools": [] },
+        { "file": "handbook.rtf", "dir": "converted", "group": "converted", "family": "rtf", "title": "Harbour handbook (Rich Text Format)", "features": "the handbook as .rtf" },
+        { "file": "workbook.xls", "dir": "converted", "group": "converted", "family": "xls", "title": "Harbour workbook (Excel 97 to 2003)", "features": "the workbook as a binary .xls" },
+        { "file": "workbook.ods", "dir": "converted", "group": "converted", "family": "ods", "title": "Harbour workbook (OpenDocument spreadsheet)", "features": "the workbook as .ods" },
+        { "file": "workbook.fods", "dir": "converted", "group": "converted", "family": "fods", "title": "Harbour workbook (flat OpenDocument spreadsheet)", "features": "one XML file; written by hand, not converted", "tools": [] },
+        { "file": "deck.ppt", "dir": "converted", "group": "converted", "family": "ppt", "title": "Harbour review (PowerPoint 97 to 2003)", "features": "the deck as a binary .ppt (its thumbnail makes it large)" },
+        { "file": "deck.odp", "dir": "converted", "group": "converted", "family": "odp", "title": "Harbour review (OpenDocument presentation)", "features": "the deck as .odp" },
+        { "file": "deck.fodp", "dir": "converted", "group": "converted", "family": "fodp", "title": "Harbour review (flat OpenDocument presentation)", "features": "one XML file; written by hand, not converted", "tools": [] },
+        { "file": "diagram.odg", "dir": "converted", "group": "converted", "family": "odg", "title": "Flowchart (OpenDocument drawing)", "features": "two pages, layers (one hidden), connectors glued to shapes, groups, gradients, a curve and a polyline, shadows, dashes" },
+        { "file": "diagram.fodg", "dir": "converted", "group": "converted", "family": "fodg", "title": "Flowchart (flat OpenDocument drawing)", "features": "one XML file; written by hand, not converted", "tools": [] }
+      ]
+    },
+    {
+      "group": "text",
+      "source": "generated",
+      "gen": "make-text.py",
+      "dir": "text",
+      "files": [
+        { "file": "field-guide.md", "family": "markdown", "title": "Field guide to Markdown", "features": "headings of six levels, nested and task lists, quotes, an aligned table, fenced code with languages, footnotes, links and references, inline HTML, Unicode" },
+        { "file": "field-notes.txt", "family": "text", "title": "Plain text with tabs, a long line and pangrams in nine scripts", "features": "Latin, Greek, Cyrillic, Japanese, Arabic and Hebrew text, box drawing, symbols, no final newline" },
+        { "file": "recipes.json", "family": "json", "title": "A small recipe book as JSON", "features": "nested objects and arrays, numbers of every kind, null, booleans, escapes, empty values" },
+        { "file": "config.yaml", "family": "yaml", "title": "Configuration file, YAML", "features": "mappings, lists, block scalars, anchors and aliases, comments" },
+        { "file": "pyproject.toml", "family": "toml", "title": "Project file, TOML", "features": "tables, arrays of tables, inline values" },
+        { "file": "feed.xml", "family": "xml", "title": "Atom feed", "features": "namespaces, CDATA, an XHTML content element, entities, comments" },
+        { "file": "route.gpx", "family": "xml", "title": "Coastal walk, GPX track", "features": "60 track points with elevation and time, two waypoints" },
+        { "file": "places.kml", "family": "xml", "title": "Places, KML", "features": "a point, a line and a polygon, a shared style, HTML in CDATA" },
+        { "file": "harbour-log.csv", "family": "csv", "title": "Harbour log, 300 rows of CSV", "features": "nine columns, quoted fields with commas, quotes and line breaks, accents" },
+        { "file": "tides.tsv", "family": "csv", "title": "Tide table, tab-separated values", "features": "28 rows, six columns" },
+        { "file": "prix.csv", "family": "csv", "title": "Price list in the European style", "features": "semicolon separator, decimal commas, accented headers" },
+        { "file": "life.py", "family": "source", "title": "Conway's Game of Life, Python", "features": "docstrings, comprehensions, f-strings, a main guard" },
+        { "file": "lru.rs", "family": "source", "title": "A least-recently-used cache, Rust", "features": "generics, trait bounds, closures, a test module" },
+        { "file": "tokens.ts", "family": "source", "title": "Arithmetic tokenizer and evaluator, TypeScript", "features": "union types, a sticky regular expression, the shunting-yard algorithm" },
+        { "file": "bits.c", "family": "source", "title": "Bit tricks on 32-bit words, C", "features": "static functions, hexadecimal literals, printf formats" },
+        { "file": "report.sql", "family": "source", "title": "Monthly report with window functions, SQL", "features": "DDL, a CTE, lag, rank and sum over windows, joins" },
+        { "file": "deploy.sh", "family": "source", "title": "Build and deploy script, Bash", "features": "strict mode, traps, functions, process substitution, a case statement" },
+        { "file": "style.css", "family": "source", "title": "A small stylesheet, CSS", "features": "custom properties, grid, clamp, color-mix, a dark mode and a media query" },
+        { "file": "page.html", "family": "html", "title": "A page, shown as its source, HTML", "features": "semantic elements, a table, a form, a style and a script that do not run" },
+        { "file": "changes.diff", "family": "diff", "title": "A unified diff of two files", "features": "two files, three hunks, added and removed lines" },
+        { "file": "subtitles.srt", "family": "text", "title": "Subtitles, SubRip", "features": "six cues with a tag" },
+        { "file": "server.log", "family": "text", "title": "A server log of 120 lines", "features": "INFO, WARN and ERROR lines" }
+      ]
+    },
+    {
+      "group": "archives",
+      "source": "generated",
+      "gen": "make-archives.py",
+      "dir": "archives",
+      "tools": ["7z", "genisoimage", "zstd", "gcab", "dpkg-deb", "cpio", "ar"],
+      "files": [
+        { "file": "sample.zip", "family": "zip", "title": "Zip with folders, stored and deflated members, Unicode names and a comment", "features": "9 files in 5 folders, an empty folder", "tools": [] },
+        { "file": "sample.tar", "family": "tar", "title": "Tar (ustar) with folders and a symbolic link", "features": "16 entries", "tools": [] },
+        { "file": "sample.tar.gz", "family": "tar.gz", "title": "Tar compressed with gzip", "features": "the tar opens inside the gzip", "tools": [] },
+        { "file": "sample.tar.bz2", "family": "tar.bz2", "title": "Tar compressed with bzip2", "features": "the tar opens inside the bzip2 stream", "tools": [] },
+        { "file": "sample.tar.xz", "family": "tar.xz", "title": "Tar compressed with xz", "features": "the tar opens inside the xz stream", "tools": [] },
+        { "file": "sample.tar.zst", "family": "tar.zst", "title": "Tar compressed with Zstandard", "features": "level 19", "tools": ["zstd"] },
+        { "file": "server.log.gz", "family": "gz", "title": "A log compressed with gzip", "features": "one member, no tar", "tools": [] },
+        { "file": "server.log.bz2", "family": "bz2", "title": "A log compressed with bzip2", "features": "one member, no tar", "tools": [] },
+        { "file": "server.log.xz", "family": "xz", "title": "A log compressed with xz", "features": "one member, no tar", "tools": [] },
+        { "file": "sample.7z", "family": "7z", "title": "7z with LZMA2", "features": "a solid archive of 9 files", "tools": ["7z"] },
+        { "file": "sample.rar", "family": "rar", "title": "RAR 5 with stored members", "features": "folders, CRC32 and Unix modes, written by the script from the format's documentation (no RAR program)", "tools": [] },
+        { "file": "sample.iso", "family": "iso", "title": "ISO 9660 image with Joliet and Rock Ridge", "features": "volume EXAV_EXAMPLE, long and Unicode names", "tools": ["genisoimage"] },
+        { "file": "matryoshka.zip", "family": "zip", "title": "Nested archives: a zip holding a tar.gz holding a 7z holding a zip", "features": "four levels, opened in place one after the other", "tools": ["7z"] },
+        { "file": "encrypted-aes.zip", "family": "zip", "title": "Zip encrypted with AES-256, password: exav", "features": "names are listed, each member says it is encrypted", "tools": ["7z"] },
+        { "file": "encrypted-zipcrypto.zip", "family": "zip", "title": "Zip encrypted with the traditional ZipCrypto, password: exav", "features": "names are listed, each member says it is encrypted", "tools": ["7z"] },
+        { "file": "encrypted.7z", "family": "7z", "title": "7z encrypted with AES-256, password: exav", "features": "file names visible, contents encrypted", "tools": ["7z"] },
+        { "file": "example.jar", "family": "jar", "title": "A jar (a zip with a manifest)", "features": "META-INF/MANIFEST.MF, a source file, a properties file", "tools": [] },
+        { "file": "pages.cbz", "family": "cbz", "title": "Comic book archive (zip of pages)", "features": "two page images and ComicInfo.xml", "tools": [] },
+        { "file": "sample.cab", "family": "cab", "title": "Microsoft cabinet", "features": "four files, MSZIP", "tools": ["gcab"] },
+        { "file": "exav-example.deb", "family": "deb", "title": "Debian package", "features": "an ar archive of debian-binary, control.tar.xz and data.tar.xz", "tools": ["dpkg-deb"] },
+        { "file": "libexample.a", "family": "ar", "title": "Unix ar archive", "features": "two members", "tools": ["ar"] },
+        { "file": "sample.cpio", "family": "cpio", "title": "cpio archive (newc)", "features": "four files", "tools": ["cpio"] }
+      ]
+    },
+    {
+      "group": "media",
+      "source": "generated",
+      "gen": "make-media.py",
+      "dir": "media",
+      "tools": ["ffmpeg"],
+      "files": [
+        { "file": "canon.wav", "family": "wav", "title": "A four-voice canon, WAV", "features": "8 kHz mono 16-bit, 8.4 seconds, synthesised" },
+        { "file": "canon.mp3", "family": "mp3", "title": "The canon as MP3", "features": "24 kbit/s" },
+        { "file": "canon.flac", "family": "flac", "title": "The canon as FLAC", "features": "lossless, level 8" },
+        { "file": "canon.ogg", "family": "ogg", "title": "The canon as Ogg Vorbis", "features": "quality 2" },
+        { "file": "canon.opus", "family": "opus", "title": "The canon as Opus", "features": "16 kbit/s" },
+        { "file": "canon.m4a", "family": "m4a", "title": "The canon as AAC in MP4", "features": "24 kbit/s" },
+        { "file": "testcard.mp4", "family": "mp4", "title": "Test card with a clock, H.264 and AAC in MP4", "features": "256 by 192, 12 frames a second, 4 seconds, with the canon as sound" },
+        { "file": "testcard.webm", "family": "webm", "title": "Test card with a clock, VP9 and Opus in WebM", "features": "256 by 192, 12 frames a second, 4 seconds, with the canon as sound" }
+      ]
+    },
+    {
+      "group": "3d",
+      "source": "generated",
+      "gen": "make-ifc.py",
+      "dir": "ifc",
+      "files": [
+        { "file": "house.ifc", "family": "ifc", "title": "Two-storey house (IFC4)", "features": "walls with openings filled by windows and doors, slabs, a gable roof, porch columns, a stair of eleven steps, a table and chairs sharing a mapped representation, spaces, a property set, a material and colours" }
+      ]
+    },
+    {
+      "group": "raw",
+      "source": "fetched",
+      "ref": "pixls",
+      "files": [
+        { "file": "canon-eos-40d-sraw.cr2", "family": "raw-cr2", "title": "Canon EOS 40D, sRAW (CR2)", "features": "TIFF-based CR2 with a 1936 by 1288 JPEG preview", "fetched": "https://raw.pixls.us/getfile.php/2102/nice/Canon%20-%20EOS%2040D%20-%20sRAW2%20%28sRAW%29%20%283%3A2%29.CR2", "bytes": 5805950, "sha256": "ba644e7dd2abe74eca260e67f0206ff113bf0f62e710f8130611e964d6be5bf1" },
+        { "file": "canon-eos-r6.cr3", "family": "raw-cr3", "title": "Canon EOS R6, C-RAW (CR3)", "features": "ISO base media CR3 with a 3408 by 2272 JPEG in its second track; its EXIF names Johannes Kimmel as artist and states CC0", "author": "Uploader to raw.pixls.us; EXIF artist Johannes Kimmel", "fetched": "https://raw.pixls.us/getfile.php/4659/nice/Canon%20-%20EOS%20R6%20-%203%3A2.CR3", "bytes": 5273174, "sha256": "74abb0a113d075ad9887a058082f40dd2a938c4813a08474d82356f11a027778" },
+        { "file": "canon-powershot-g1.crw", "family": "raw-crw", "title": "Canon PowerShot G1 (CRW)", "features": "the 2000 CIFF/HEAP container with a 640 by 480 JPEG", "fetched": "https://raw.pixls.us/getfile.php/2073/nice/Canon%20-%20PowerShot%20G1%20-%20RAW%20%284%3A3%29.crw", "bytes": 2300702, "sha256": "f39be5acf14057ce04527fd8d0574e57ec8ed5fed082d7bfaff763075a44ee8a" },
+        { "file": "nikon-d70s.nef", "family": "raw-nef", "title": "Nikon D70s (NEF)", "features": "TIFF-based NEF with a 3008 by 2000 JPEG in a SubIFD", "fetched": "https://raw.pixls.us/getfile.php/1117/nice/Nikon%20-%20D70s%20-%2012bit%2012bit%20compressed%20%28Lossy%20%28type%201%29%29%20%283%3A2%29.NEF", "bytes": 5193213, "sha256": "6c46f9854033e7623ebbb5de8c951df6762ca44f05d45035ccc5cb7e9f4e5692" },
+        { "file": "sony-ilce-7s.arw", "family": "raw-arw", "title": "Sony A7S (ARW)", "features": "TIFF-based ARW with a 1616 by 1080 JPEG preview", "fetched": "https://raw.pixls.us/getfile.php/1582/nice/Sony%20-%20ILCE-7S%20-%2014bit%2014bit%20compressed%20%283%3A2%29.ARW", "bytes": 6160384, "sha256": "a35ebb2fbec929daa5beb20d1ce5c15a8aac7b1a7a231455387f3df8a7442e07" },
+        { "file": "olympus-c5060wz.orf", "family": "raw-orf", "title": "Olympus C5060WZ (ORF)", "features": "the only picture inside is a 160 by 120 thumbnail", "fetched": "https://raw.pixls.us/getfile.php/1799/nice/Olympus%20-%20C5060WZ%20-%2012bit%20%284%3A3%29.ORF", "bytes": 7646208, "sha256": "3fc12bc3f6320cfab456111d7805b446e329fdd1907680be55e2e163e5e084bd" },
+        { "file": "panasonic-dmc-lx7.rw2", "family": "raw-rw2", "title": "Panasonic Lumix DMC-LX7 (RW2)", "features": "RW2 with a 1920 by 1280 JPEG", "fetched": "https://raw.pixls.us/getfile.php/7010/nice/Panasonic%20-%20DMC-LX7%20-%203%3A2.RW2", "bytes": 3394560, "sha256": "18dfc3877e944020299635a8c2fad61fca2485b1c9b67645a495ee870a86e599" },
+        { "file": "fujifilm-finepix-s5000.raf", "family": "raw-raf", "title": "Fujifilm FinePix S5000 (RAF)", "features": "RAF container with a 1280 by 960 JPEG", "fetched": "https://raw.pixls.us/getfile.php/2726/nice/Fujifilm%20-%20FinePix%20S5000%20-%204%3A3.RAF", "bytes": 6851240, "sha256": "dabd5e74521a6980156be9fd4b88d0c37b0fe4d0e0e6f5c12db8cffff1b76297" },
+        { "file": "minolta-dimage-5.mrw", "group": "unsupported", "family": "raw-mrw", "title": "Minolta DiMAGE 5 (MRW)", "features": "MRW with a 640 by 480 preview whose first byte is stored as zero: the viewer finds no preview in it (kept to show the message)", "fetched": "https://raw.pixls.us/getfile.php/7795/nice/Minolta%20-%20DiMAGE%205%20-%204%3A3.MRW", "bytes": 6422144, "sha256": "d60bfd80bcb1f7b9c88b14a5e46ea27885bbf92d990ab30b3939288678fea0d9" },
+        { "file": "adobe-dng-canon-5d3.dng", "family": "raw-dng", "title": "Canon EOS 5D Mark III converted to DNG (lossy JPEG)", "features": "DNG with previews of 256, 1024 and 3960 pixels; converted by Adobe DNG Converter, not straight from a camera", "author": "Uploader to raw.pixls.us; EXIF artist Simon Harhues", "fetched": "https://raw.pixls.us/getfile.php/1033/nice/Adobe%20DNG%20Converter%20-%20Canon%20EOS%205D%20Mark%20III%20-%20Lossy%20JPEG%20compression%2C%20rgb%20%283%3A2%29.DNG", "bytes": 2484836, "sha256": "b22f1e36331f679abb8b13e433b9bbde3988723adf10fee7aa0dda6381016a98" }
+      ]
+    },
+    {
+      "group": "cad",
+      "source": "fetched",
+      "files": [
+        { "file": "barraca-valenciana-0100-r2010.dwg", "ref": "barraca", "family": "dwg", "title": "Barraca Valenciana, ground floor plan (DWG 2010, Revit export)", "features": "walls, doors, glazing, stairs, furniture, hatches, areas, 24 layers, 56 blocks, extra layouts with title block and viewports", "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-P00-PLA-ARQ-0100-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1", "bytes": 284266, "sha256": "fcd3eef78cbd568e3f8a8262378670495a3ea6b8e091cb162fe8ef9c3c9add13" },
+        { "file": "barraca-valenciana-0300-r2010.dwg", "ref": "barraca", "family": "dwg", "title": "Barraca Valenciana, elevations (DWG 2010, Revit export)", "features": "elevations drawn as 2D linework with hatches, topography and planting, no 3D", "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-PLA-ARQ-0300-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1", "bytes": 1069565, "sha256": "93a211cfb797525a94b5b41aeae3ecf33e61442eea07cadae056463cc400a3e5" },
+        { "file": "barraca-valenciana-0400-r2010.dwg", "ref": "barraca", "family": "dwg", "title": "Barraca Valenciana, sections and details (DWG 2010, Revit export)", "features": "42 layers, hatches, arcs, splines, ellipses, 61 blocks", "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-PLA-ARQ-0400-tipologiaGen%C3%A8rica-A1-P2.dwg?download=1", "bytes": 511114, "sha256": "a09c492dc34ead8df619d6d618049298afffb050a8436c470055923a90f4b61c" },
+        { "file": "building-survey-plans-r2000.dwg", "ref": "zenodo", "family": "dwg", "title": "Survey of a small building: plans, elevations and details (DWG 2000)", "features": "Italian drawing with room names and areas, over 120 layers, 890 blocks, 567 dimensions, 492 hatches", "author": "Giovanni De Gasperis, Sante Dino Facchini, Asif Saeed", "source": "https://zenodo.org/records/15076037", "evidence": "https://zenodo.org/records/15076037", "attribution": "De Gasperis, G., Facchini, S. D., Saeed, A., Building Ledger Dossier: Seismic Prevention and Building Documentation Tracking through a Digital Twin Approach (4_Architectural_Building_Survey.dwg), Zenodo, doi:10.5281/zenodo.15076037, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/records/15076037/files/4_Architectural_Building_Survey.dwg?download=1", "bytes": 2097350, "sha256": "2f096b44cd5b60ded2ad8b12c2f46116db8b1fda1c980f7bb02660a85782ab1d" },
+        { "file": "golden-tile-palace-r2004.dwg", "family": "dwg", "title": "Golden Tile Palace: front elevation and section (DWG 2004)", "features": "elevation and section with level marks and Chinese titles, 4393 polylines, 841 arcs, 328 splines, 26 dimensions, 24 hatches", "author": "Jing Zhang, Yunying Ren, Xiaofan An", "source": "https://figshare.com/articles/dataset/Figure_of_surveying_and_mapping_of_Golden_Tile_Palace_/21374221", "evidence": "https://api.figshare.com/v2/articles/21374221", "evidence_quote": "\"name\": \"CC BY 4.0\"", "licence": "CC-BY-4.0", "attribution": "Jing Zhang, Yunying Ren, Xiaofan An, Figure of surveying and mapping of Golden Tile Palace, supplementary file S1 of PLOS ONE doi:10.1371/journal.pone.0262155, figshare, CC BY 4.0. No changes.", "fetched": "https://ndownloader.figshare.com/files/37930432", "bytes": 763903, "sha256": "14d128397f89c1af652b2cd3c9d523db98ae539b1bc061d4f06fba6d21501ae9" },
+        { "file": "residential-site-plan-r2007.dwg", "family": "dwg", "title": "Site plan of an old residential community in Beijing (DWG 2007)", "features": "58 layers, 79 blocks, buildings, roads, 2865 polylines, 656 texts, 125 hatches, 39 dimensions", "author": "Yijun Fan", "source": "https://figshare.com/articles/dataset/Drainage_System_Layout_of_Old_Urban_Residential_Communities_In_Beijing/28188725", "evidence": "https://api.figshare.com/v2/articles/28188725", "evidence_quote": "\"name\": \"CC BY 4.0\"", "licence": "CC-BY-4.0", "attribution": "Yijun Fan, Drainage System Layout of Old Urban Residential Communities In Beijing (Site Plan.dwg), figshare, doi:10.6084/m9.figshare.28188725.v1, CC BY 4.0. No changes.", "fetched": "https://ndownloader.figshare.com/files/51611078", "bytes": 948192, "sha256": "37b03757172e5360a03cc26da473cde84e85dbd61914b67741c94a40f7f0db2f" },
+        { "file": "hospital-floor-plan-r2013.dwg", "ref": "zenodo", "family": "dwg", "title": "Furnished hospital floor plan (DWG 2013)", "features": "section and level marks, 109 dimensions, 429 block definitions of furniture and plants, 19 layers", "author": "Toka Ehab", "source": "https://zenodo.org/records/10520508", "evidence": "https://zenodo.org/records/10520508", "attribution": "Toka Ehab, Nanotechnology Applications in Interior Design of hospitals to enhance thermal comfort and decrease the infection spread for the occupants (Elite hospital plan.dwg), Zenodo, doi:10.5281/zenodo.10520508, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/records/10520508/files/Elite%20hospital%20plan.dwg?download=1", "bytes": 1249695, "sha256": "b618207b01a1759142e038e1edf762ab8efbe11804bb2e84fc6f472e7e040fb9" },
+        { "file": "commercial-building-hvac-plans-r2018.dwg", "ref": "zenodo", "family": "dwg", "title": "Air-conditioning plans of a commercial building (DWG 2018)", "features": "48 layers, 320 blocks, 316 dimensions, 125 hatches, 112 wipeouts", "author": "Kevin Anthony do Bem", "source": "https://zenodo.org/records/10407941", "evidence": "https://zenodo.org/records/10407941", "attribution": "Kevin Anthony do Bem, Projeto de Climatização de um Edifício de Comércio e Serviços (F04 Plantas- Rede aerolica.dwg), Zenodo, doi:10.5281/zenodo.10407941, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/records/10407941/files/F04%20Plantas-%20Rede%20aerolica.dwg?download=1", "bytes": 506884, "sha256": "bcf3b92e0afdf29bb75e7632e8193f881918ddabb4de67a1331b5eda34ee9be2" },
+        { "file": "ezdxf-dim-linear-tutorial-r2013.dwg", "ref": "ezdxf", "family": "dwg", "title": "ezdxf documentation: linear dimension tutorial (DWG 2013)", "features": "16 dimensions, 16 multileaders, 13 dimension styles, 27 text styles", "source": "https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg", "fetched": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg", "bytes": 36391, "sha256": "88037b595bd46d81c5c98ce7aa428ce6b8506d1aa4602e976811cfb154005155" },
+        { "file": "hospital-ward-wing-plan-section.dxf", "family": "dxf", "title": "Hospital ward wing, plan and section (DXF 2010)", "features": "542 polylines, 17 layers of the A-* scheme, 3 blocks, a paper-space viewport", "author": "Innerscene (original model)", "source": "https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd", "evidence": "https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd", "evidence_quote": "Original Innerscene model, released CC0.", "licence": "CC0-1.0", "attribution": "", "fetched": "https://www.innerscene.com/api/library/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd/download", "bytes": 307408, "sha256": "4fabf62d6d7bbc7c8bdc5f3c9d292d4980c3ec504281b0bd77f487d3c6bb9ba3" },
+        { "file": "grocery-store-plan-section.dxf", "family": "dxf", "title": "Grocery store, plan and section (DXF 2010)", "features": "234 lines, 150 polylines, 17 layers, 3 blocks, a viewport", "author": "Innerscene (original model)", "source": "https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041", "evidence": "https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041", "evidence_quote": "Original Innerscene model, released CC0.", "licence": "CC0-1.0", "attribution": "", "fetched": "https://www.innerscene.com/api/library/grocery-store-600-square-metres-plan-and-section-2a67d041/download", "bytes": 130840, "sha256": "0b875304e1769e0f7c9377abf270f1fb4d103547cc27a3795a57c34fb4619d30" },
+        { "file": "ezdxf-uncommon-entities.dxf", "ref": "ezdxf", "family": "dxf", "title": "ezdxf example: uncommon entities (DXF 2018)", "features": "13 dimensions, 2 multileaders, large radial dimensions, rays, construction lines, splines, 33 blocks, 2 extra layouts", "source": "https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf", "fetched": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf", "bytes": 343110, "sha256": "5efdd671e3b6d8c45bd0688b1d6479d523f2290f0b390f1584348bf46e34c965" },
+        { "file": "ezdxf-hatches-1.dxf", "ref": "ezdxf", "family": "dxf", "title": "ezdxf example: solid hatches (DXF 2018)", "features": "ten solid hatches over polylines and arcs", "source": "https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf", "fetched": "https://raw.githubusercontent.com/mozman/ezdxf/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf", "bytes": 130334, "sha256": "2dc2930b4f7d5fb16698437e4f6972986e580a81b2b5d36a780b4311f85fb326" }
+      ]
+    },
+    {
+      "group": "3d",
+      "source": "fetched",
+      "files": [
+        { "file": "bsi-building-architecture-ifc2x3.ifc", "ref": "bsi", "family": "ifc", "title": "buildingSMART Simple-Scene Building-Architecture (IFC2X3)", "features": "a small SketchUp house: walls, slabs, a roof, spaces, materials with colours, quantity and property sets; faceted breps", "fetched": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%202.3.0.1%20%28IFC%202x3%20TC1%29/Simple-Scene/Building-Architecture.ifc", "bytes": 92542, "sha256": "c4db65ba847f6b369a95d6c54fa11f4750cbe6d59f021934e8923d8d578e5885" },
+        { "file": "bsi-building-architecture-ifc4x3.ifc", "ref": "bsi", "family": "ifc", "title": "buildingSMART Simple-Scene Building-Architecture (IFC4X3_ADD2)", "features": "the same house in IFC 4.3, with triangulated faces", "fetched": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%204.3.2.0%20%28IFC%204.3%20ADD2%29/Simple-Scene/Building-Architecture.ifc", "bytes": 141965, "sha256": "96e7103812b15b65eb1fd7802d36b9962833485dce5ead4f440bbf529530881d" },
+        { "file": "bsi-wall-with-opening-and-window-ifc4.ifc", "ref": "bsi", "family": "ifc", "title": "buildingSMART reference view: a wall with an opening and a window (IFC4)", "features": "a wall with a material layer set, an opening element and a window with its type", "author": "Peter Bonsma, RDF Ltd. (file header), distributed by buildingSMART International Ltd.", "fetched": "https://raw.githubusercontent.com/buildingSMART/Sample-Test-Files/80d976a9b193a26a8e928c3e79bff67af1de68a8/IFC%204.0.2.1%20%28IFC%204%20ADD2%20TC1%29/ISO%20Spec%20-%20ReferenceView_V1.2/wall-with-opening-and-window.ifc", "bytes": 12492, "sha256": "73b0e45d931d5dc13bfee5fdc7bd80f796526445458b2de74c4168d209097832" },
+        { "file": "duplex-apartment-ifc2x3.ifc", "family": "ifc", "title": "Duplex Apartment (IFC2X3, Revit export)", "features": "four storeys: 57 walls, 24 windows, 14 doors, 2 stairs, 21 spaces, furniture, 18 materials", "author": "Provided to the US Army Construction Engineering Research Laboratory, republished by buildingSMART International", "source": "https://github.com/buildingsmart-community/Community-Sample-Test-Files/tree/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20(IFC%202x3)/Duplex%20Apartment", "evidence": "https://raw.githubusercontent.com/buildingsmart-community/Community-Sample-Test-Files/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20%28IFC%202x3%29/Duplex%20Apartment/README.md", "evidence_quote": "Creative Commons (CC BY 4.0). You are free (1) to copy and resitribute this material any way you like", "licence": "CC-BY-4.0", "attribution": "BSI (2020) Duplex Apartment Test Files, buildingSMART International, https://github.com/buildingsmart-community/Community-Sample-Test-Files, CC BY 4.0. No changes.", "fetched": "https://media.githubusercontent.com/media/buildingsmart-community/Community-Sample-Test-Files/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20%28IFC%202x3%29/Duplex%20Apartment/Duplex_A_20110907.ifc", "bytes": 2380763, "sha256": "b347a2c8aa8fff6db896a4417a9c50c22ac0ccd7c5cfc22b99b8d29336c606ed" },
+        { "file": "barraca-valenciana-ifc4.ifc", "ref": "barraca", "family": "ifc", "title": "Barraca Valenciana de Llauradors, BIM model (IFC4, Revit export)", "features": "a traditional farmhouse: 2 storeys, 16 walls, 5 slabs, 2 roofs, a stair, 27 beams, 28 materials", "fetched": "https://zenodo.org/records/14293897/files/BRC-OSP-XXX-ZZZ-M3D-ARQ-0001-tipologiaGen%C3%A8rica-S3-0001.ifc?download=1", "bytes": 1584183, "sha256": "b6f8828e9bd2491dc452b2ab78f9f9e28f39bd81a5f2f4e2cdb2d81668287193" },
+        { "file": "office-archetype-1970-ifc4x3.ifc", "ref": "zenodo", "family": "ifc", "title": "Office archetype of 1970 (IFC4X3_ADD2)", "features": "four storeys: 88 walls, 167 windows, 49 doors, 16 curtain walls, 48 spaces", "author": "Verena Dannapfel, Moritz Müller, Rita Streblow, Dirk Müller et al., RWTH Aachen University", "source": "https://zenodo.org/records/21820756", "evidence": "https://zenodo.org/records/21820756", "attribution": "Dannapfel, V., Müller, M., Streblow, R., Müller, D. et al., Archetypes for German Office Buildings of Construction Years 1970, 1998 and 2026, Zenodo, doi:10.5281/zenodo.21820756, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/records/21820756/files/2026-07_Klassiqua_Office_Archetype_Construction_Year_1970.ifc?download=1", "bytes": 1471699, "sha256": "a5f12304d33fe5da9174c8ea9827d2f322706646b3da2766dff0ab278c65df3c" },
+        { "file": "fox.glb", "ref": "khronos", "family": "glb", "title": "Fox, skinned and animated (GLB)", "features": "a low-poly fox with a skin, three animations and a texture", "author": "PixelMannen (model, CC0), tomkranis (rigging and animation, CC BY 4.0), glTF conversion by Asobo Studio and the Khronos Group", "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox", "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox/README.md", "evidence_quote": "&copy; 2014, tomkranis. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)", "attribution": "Fox: model by PixelMannen (CC0, https://opengameart.org/content/fox-and-shiba), rigging and animation by tomkranis (CC BY 4.0, https://sketchfab.com/3d-models/low-poly-fox-by-pixelmannen-animated-371dea88d7e04a76af5763f2a36866bc), glTF conversion by Asobo Studio and the Khronos Group. Unmodified.", "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox/glTF-Binary/Fox.glb", "bytes": 162852, "sha256": "d97044e701822bac5a62696459b27d7b375aada5de8574ed4362edbba94771f7" },
+        { "file": "riggedfigure.gltf", "ref": "khronos", "family": "gltf", "title": "Rigged Figure (glTF with an embedded buffer)", "features": "a skinned figure, a data URI buffer", "author": "Cesium", "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure", "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure/README.md", "evidence_quote": "&copy; 2017, Cesium. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)", "attribution": "Rigged Figure by Cesium, CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/RiggedFigure. Unmodified.", "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure/glTF-Embedded/RiggedFigure.gltf", "bytes": 99902, "sha256": "354572cfef17b136b437ac9749da0fa316fd6e42ee7d62fe50a696b25f5047e9" },
+        { "file": "vertexcolortest.glb", "ref": "khronos", "family": "glb", "title": "Vertex Color Test (GLB)", "features": "COLOR_0 vertex colours, tangents, two textures", "author": "Ed Mackey, Analytical Graphics, Inc. (Cesium)", "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest", "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest/README.md", "evidence_quote": "&copy; 2018, Analytical Graphics, Inc.. [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)", "attribution": "Vertex Color Test by Ed Mackey, Copyright 2018 Analytical Graphics, Inc., CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/VertexColorTest. Unmodified.", "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest/glTF-Binary/VertexColorTest.glb", "bytes": 26220, "sha256": "58006bdcff8084339da0f6e24400160890638c16dbcb83c362ccaf150e8c6e10" },
+        { "file": "metalroughspheres.glb", "ref": "khronos", "family": "glb", "title": "Metal-Rough spheres (GLB)", "features": "119 nodes and 98 materials of growing metalness and roughness", "author": "Krill Gavrilov / Draw Harness script (Open CASCADE Technology)", "licence": "CC0-1.0", "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures", "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures/README.md", "evidence_quote": "&copy; 2019, Public. [Creative Commons Zero v1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)", "attribution": "", "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures/glTF-Binary/MetalRoughSpheresNoTextures.glb", "bytes": 291316, "sha256": "5e677f260ec0f366967a6e9545de2f3dab2a160e307b9bcb9d050cd2028f63f8" },
+        { "file": "iridescencesuzanne.glb", "ref": "khronos", "family": "glb", "title": "Iridescence Suzanne (GLB)", "features": "Suzanne with the iridescence, transmission and volume extensions", "author": "Mathias Kanzler (UX3D), Pascal Schoen", "licence": "CC0-1.0", "source": "https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne", "evidence": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne/README.md", "evidence_quote": "&copy; 2022, UX3D. [Creative Commons Zero v1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)", "attribution": "", "fetched": "https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Assets/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne/glTF-Binary/IridescenceSuzanne.glb", "bytes": 507608, "sha256": "866762602d60a0942b7608bfabf4e8686a29033636224f4b55c5e56abe8abf8f" },
+        { "file": "ratchet-cam.stl", "family": "stl", "title": "Apollo 11 hatch, stationary ratchet cam (binary STL)", "features": "1536 triangles, a mechanical part", "author": "NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons", "source": "https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl", "evidence": "https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl", "evidence_quote": "CC0 1.0 Universal Public Domain Dedication", "licence": "CC0-1.0", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/e/e0/Stationary_Ratchet_Cam_v11_%28Hatch%2C_Crew%2C_Apollo_11_by_NASA_and_Smithsonian_Institution%29.stl", "bytes": 76884, "sha256": "b42d79fb357413b118b973f3fa40b76ae2999451537cd991bebce18b486c581f" },
+        { "file": "ratchet-spur-gear.stl", "family": "stl", "title": "Apollo 11 hatch, stationary ratchet spur gear (binary STL)", "features": "3026 triangles, a gear with 19 teeth", "author": "NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons", "source": "https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl", "evidence": "https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl", "evidence_quote": "CC0 1.0 Universal Public Domain Dedication", "licence": "CC0-1.0", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/c/cb/N%3D19%2C_P%3D28_-_Stat._Ratchet_Spur_Gear_v13_%28Hatch%2C_Crew%2C_Apollo_11_by_NASA_and_Smithsonian_Institution%29.stl", "bytes": 151384, "sha256": "c99eca56ab40ed6b2e9dfc49b88c23c6fbef982ff18813ba593d3e138ef1f51d" },
+        { "file": "petri-dish-holder-base.stl", "ref": "zenodo", "family": "stl", "title": "Petri dish holder base of a spore capture device (ASCII STL)", "features": "566 facets as text", "author": "Kevin A. Adkins, Kaiyu Li, M. N. Blasko, J. L. Cabrera, B. H. Neal, James et al.", "source": "https://zenodo.org/records/12193898", "evidence": "https://zenodo.org/api/records/12193898", "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}", "attribution": "Components of the spore capture device in A simple mechanism for uncrewed aircraft bioaerosol sampling in the lower atmosphere (Inspire1Petri_Dish_Holder_Base.stl), Kevin A. Adkins et al., Zenodo 2024, doi:10.5281/zenodo.12193898, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/api/records/12193898/files/Inspire1Petri_Dish_Holder_Base.stl/content", "bytes": 151270, "sha256": "d654bf60064e79675acd9694726282c70251905d77391ad45c29d3ba3ecaf93e" },
+        { "file": "chickpea-mesh.ply", "ref": "zenodo", "family": "ply", "title": "Photogrammetric mesh of a chickpea plant (binary PLY with colours)", "features": "8788 triangles, RGBA per vertex", "author": "William T. Salter, Arjina Shrestha, Margaret M. Barbour", "source": "https://zenodo.org/records/4018242", "evidence": "https://zenodo.org/api/records/4018242", "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}", "attribution": "3D photogrammetric reconstructions of individual chickpea plants (PBASlasher_S3s_Wk1_meshed.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/api/records/4018242/files/PBASlasher_S3s_Wk1_meshed.ply/content", "bytes": 202701, "sha256": "ef9cd2141897781c8e3e6a72ac316056b991d4d0fae99e053c4695fceea8cb75" },
+        { "file": "ruthwell-lamb-of-god.ply", "ref": "zenodo", "family": "ply", "title": "Lamb of God panel of the Ruthwell Cross (binary PLY with normals and colours)", "features": "33020 triangles, a scanned stone carving", "author": "Gurpreet Singh", "source": "https://zenodo.org/records/3348342", "evidence": "https://zenodo.org/api/records/3348342", "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}", "attribution": "Small Panel PLY (Lamb of God panel from the Ruthwell Cross), Gurpreet Singh, Zenodo 2019, doi:10.5281/zenodo.3348342, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/api/records/3348342/files/Small_Lamb_Of_God_North_Ruthwell_Cross.ply/content", "bytes": 893893, "sha256": "0d40a4305885932596afce091891a8f4b212b0c012b742db10d4487351c2457a" },
+        { "file": "chickpea-pointcloud-ascii.ply", "group": "unsupported", "ref": "zenodo", "family": "ply", "title": "Point cloud of a chickpea plant (ASCII PLY without faces)", "features": "53195 coloured points and no faces: kept to show what the viewer says about a point cloud", "author": "William T. Salter, Arjina Shrestha, Margaret M. Barbour", "source": "https://zenodo.org/records/4018242", "evidence": "https://zenodo.org/api/records/4018242", "evidence_quote": "\"license\": {\"id\": \"cc-by-4.0\"}", "attribution": "3D photogrammetric reconstructions of individual chickpea plants (SonSla_3_groundtruth_pointcloud.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.", "fetched": "https://zenodo.org/api/records/4018242/files/SonSla_3_groundtruth_pointcloud.ply/content", "bytes": 3455582, "sha256": "53a08f6e1c831ac58c42342ee257c97730bcf6997e246c88198478f9aeba4fe0" }
+      ]
+    },
+    {
+      "group": "pdf",
+      "source": "fetched",
+      "files": [
+        { "file": "arxiv-rational-cherednik-torus-knots.pdf", "family": "pdf", "title": "Rational Cherednik Algebras and Torus Knot Invariants (arXiv:2402.18770)", "features": "28 pages of mathematics, 24 outline entries, 256 links, set in LaTeX", "author": "Xinchun Ma", "source": "https://arxiv.org/abs/2402.18770v1", "evidence": "https://arxiv.org/abs/2402.18770v1", "evidence_quote": "href=\"http://creativecommons.org/licenses/by/4.0/\" title=\"Rights to this article\"", "licence": "CC-BY-4.0", "attribution": "Xinchun Ma, Rational Cherednik Algebras and Torus Knot Invariants, arXiv:2402.18770v1, CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/). Not modified.", "fetched": "https://arxiv.org/pdf/2402.18770v1", "bytes": 430745, "sha256": "2b22841d8a64b271d7def6fa15aa0b5b98f533ae259e4108eb7104320f07cf10" },
+        { "file": "nist-sp-800-63-4-digital-identity.pdf", "family": "pdf", "title": "NIST SP 800-63-4, Digital Identity Guidelines", "features": "96 tagged pages, 54 outline entries, 227 links", "author": "David Temoshok, Diana Proud-Madruga, Yee-Yin Choong et al., NIST", "source": "https://csrc.nist.gov/pubs/sp/800/63/4/final", "evidence": "https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63-4.pdf", "evidence_quote": "is not subject to copyright in the United States.", "licence": "public-domain (US federal government work, 17 U.S.C. 105; the PDF says so itself)", "attribution": "", "fetched": "https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63-4.pdf", "bytes": 858054, "sha256": "2f5b107de218a0fc3fe7f7e91b2ece5babb001eda5745b7c568a3cc876002f2d" },
+        { "file": "scan-cfa-minutes-1971.pdf", "family": "pdf-scan", "title": "Minutes of the U.S. Commission of Fine Arts, 1970 to 1972 (scan)", "features": "40 scanned pages: JPEG 2000 pictures and JBIG2 masks, an OCR text layer, PDF/A-2B", "author": "U.S. Commission of Fine Arts; scanned by the Internet Archive", "source": "https://archive.org/details/cfaminutes21april1971", "evidence": "https://commons.wikimedia.org/wiki/File:July_8_1970_to_May_19_1972_(IA_cfaminutes21april1971).pdf", "evidence_quote": "This work is in the public domain in the United States because it is a work prepared by an officer o", "licence": "public-domain (US federal government work, 17 U.S.C. 105)", "attribution": "", "fetched": "https://archive.org/download/cfaminutes21april1971/cfaminutes21april1971.pdf", "bytes": 1104628, "sha256": "2fc5edb8a4f303b89449443dcb5a32249c79b2a8d67253348025d0e7eea5f94b" },
+        { "file": "scan-blm-land-survey-records.pdf", "family": "pdf-scan", "title": "Land and survey records, Bureau of Land Management (scan)", "features": "40 pages scanned at about 500 ppi: JPEG 2000 and JBIG2 images, an OCR text layer, PDF/A-2B", "author": "United States Bureau of Land Management; scanned by the Internet Archive", "source": "https://archive.org/details/landsurveyrecord00unit", "evidence": "https://commons.wikimedia.org/wiki/File:Land_%26_survey_records_-_record_preservation_%26_service_through_microfilm_(IA_landsurveyrecord00unit).pdf", "evidence_quote": "This work is in the public domain in the United States because it is a work prepared by an officer o", "licence": "public-domain (US federal government work, 17 U.S.C. 105)", "attribution": "", "fetched": "https://archive.org/download/landsurveyrecord00unit/landsurveyrecord00unit.pdf", "bytes": 2192413, "sha256": "d9a9e6583d0afb1688a043ef59a8d2e236e20c58d4ba76ff625d7c11a181c16c" },
+        { "file": "form-uscis-i9.pdf", "family": "pdf-form", "title": "USCIS Form I-9, Employment Eligibility Verification", "features": "115 text fields, 5 drop-down lists, 8 check boxes, links; a tagged government form", "author": "U.S. Citizenship and Immigration Services (DHS)", "source": "https://www.uscis.gov/i-9", "evidence": "https://www.uscis.gov/website-policies", "evidence_quote": "Information presented on this WWW site is considered public information and may be distributed or co", "licence": "public-domain (US federal government work, 17 U.S.C. 105)", "attribution": "", "fetched": "https://www.uscis.gov/sites/default/files/document/forms/i-9.pdf", "bytes": 524095, "sha256": "780f348c34df694bb0b4dbbfaf9f22b99b9757b80d16a37ba89aadf069597281" },
+        { "file": "map-nps-canyonlands.pdf", "family": "pdf-map", "title": "Canyonlands National Park, Island in the Sky: roads and trails", "features": "two tagged pages of vector map", "author": "National Park Service", "source": "https://home.nps.gov/cany/planyourvisit/maps.htm", "evidence": "https://www.nps.gov/aboutus/disclaimer.htm", "evidence_quote": "material created by the National Park Service and presented on this website, unless otherwise indica", "licence": "public-domain (US federal government work, 17 U.S.C. 105)", "attribution": "", "fetched": "https://home.nps.gov/cany/planyourvisit/upload/IslandRoadsandTrailsUpdated24-508forweb.pdf", "bytes": 349001, "sha256": "b29a639d9bc0d2e37ca41b68c21bcddba7637b1727dce86980c3373715610d55" },
+        { "file": "slides-unige-open-access.pdf", "ref": "zenodo", "family": "pdf", "title": "Open Access publishing at no cost thanks to UNIGE agreements (slides)", "features": "ten slides with outline, links, tags and pictures", "author": "Floriane Muller, Anouk Santos (University of Geneva)", "source": "https://zenodo.org/records/23478694", "evidence": "https://zenodo.org/records/23478694", "attribution": "Floriane Muller and Anouk Santos, Open Access publishing at no cost thanks to UNIGE agreements, in 15 minutes, Zenodo, https://doi.org/10.5281/zenodo.23478694, CC BY 4.0. Not modified.", "fetched": "https://zenodo.org/api/records/23478694/files/2026-10-20_Read_and_publish_en15min_EN_zenodo.pdf/content", "bytes": 800339, "sha256": "03356ed569a80f7d7dc1d96fcbfd75a2fbc663c63f6d74f4e89eb2390bb5ee64" },
+        { "file": "paper-ja-labor-law.pdf", "ref": "zenodo", "family": "pdf", "title": "A paper in Japanese on labour law and the constitution", "features": "25 pages with embedded MS Mincho fonts", "author": "Takashi Fujiki (藤木 貴史)", "source": "https://zenodo.org/records/23469422", "evidence": "https://zenodo.org/records/23469422", "attribution": "藤木 貴史, アメリカ労働法からみた憲法の影響, アメリカ憲法の理論と実践 創刊号, Zenodo, https://doi.org/10.5281/zenodo.23469422, CC BY 4.0. Not modified.", "fetched": "https://zenodo.org/api/records/23469422/files/%E3%82%A2%E3%83%A1%E3%83%AA%E3%82%AB%E5%8A%B4%E5%83%8D%E6%B3%95%E3%81%8B%E3%82%89%E3%81%BF%E3%81%9F%E6%86%B2%E6%B3%95%E3%81%AE%E5%BD%B1%E9%9F%BF.pdf/content", "bytes": 881101, "sha256": "08b2be3ebc781107f71003344ccf8b230229079e978687f1e0da2329bef1cbe9" }
+      ]
+    },
+    {
+      "group": "images",
+      "source": "fetched",
+      "files": [
+        { "file": "monet-gardeners-house-antibes.jpg", "ref": "cleveland", "family": "jpeg", "title": "Claude Monet, The Gardener's House at Antibes (1888)", "features": "a painting, JPEG from the museum's web size", "author": "Claude Monet, Cleveland Museum of Art (open access)", "source": "https://clevelandart.org/art/1916.1044", "evidence": "https://clevelandart.org/art/1916.1044", "fetched": "https://openaccess-cdn.clevelandart.org/1916.1044/1916.1044_web.jpg", "bytes": 404254, "sha256": "95142eba48d54f01352eb4ef6f04260cb3df3bcb1d9c86000c1284a7817674ca" },
+        { "file": "queen-mab-cave.jpg", "ref": "cleveland", "family": "jpeg", "title": "Queen Mab's Cave, in the manner of Turner", "features": "a painting", "author": "Imitator of J. M. W. Turner, Cleveland Museum of Art (open access)", "source": "https://clevelandart.org/art/1916.1036", "evidence": "https://clevelandart.org/art/1916.1036", "fetched": "https://openaccess-cdn.clevelandart.org/1916.1036/1916.1036_web.jpg", "bytes": 218321, "sha256": "b84e005332288229d808172a7610b501d9977c0b4668e333faea5ff780157223" },
+        { "file": "rembrandt-st-francis.jpg", "ref": "cleveland", "family": "jpeg", "title": "Rembrandt, Saint Francis Beneath a Tree Praying (etching)", "features": "an etching, fine line work", "author": "Rembrandt van Rijn, Cleveland Museum of Art (open access)", "source": "https://clevelandart.org/art/2024.64", "evidence": "https://clevelandart.org/art/2024.64", "fetched": "https://openaccess-cdn.clevelandart.org/2024.64/2024.64_web.jpg", "bytes": 370411, "sha256": "74b37aa3738914dd66c07533b3758f7694fefbaa918d2f23c263205cf987db7b" },
+        { "file": "nolli-rome-plate.jpg", "ref": "cleveland", "family": "jpeg", "title": "Nolli's map of Rome (1748), a plate", "features": "an engraved city plan", "author": "Giovanni Battista Nolli et al., Cleveland Museum of Art (open access)", "source": "https://clevelandart.org/art/2020.276.3", "evidence": "https://clevelandart.org/art/2020.276.3", "fetched": "https://openaccess-cdn.clevelandart.org/2020.276.3/2020.276.3_web.jpg", "bytes": 322943, "sha256": "7643c9e59f7706ebe62518a51daf7d72129acc8092dde7afc65516d3d11b6c77" },
+        { "file": "pallid-swift.jpg", "family": "jpeg", "title": "Pallid swift in flight (photograph)", "features": "a camera JPEG with EXIF data (Canon EOS R6 Mark II)", "author": "Hobbyfotowiki", "source": "https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg", "evidence": "https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg", "evidence_quote": "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Dedication.", "licence": "CC0-1.0", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/d/df/Pallid_swift_%28in_flight%29.jpg", "bytes": 356572, "sha256": "9d0f79f12dcc236f549cdefb66dc468f25335d444ebd26e98805efdd94afecbd" },
+        { "file": "cyclotron-patent.png", "family": "png", "title": "Drawing from Lawrence's cyclotron patent", "features": "a black and white technical drawing", "author": "Ernest O. Lawrence (US Patent Office)", "source": "https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png", "evidence": "https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png", "evidence_quote": "The text and illustrations of US patents published before March 1, 1989 are in the public domain unl", "licence": "public-domain (US patent text and drawings published before 1989)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/4/42/Cyclotron_patent_p1.png", "bytes": 207304, "sha256": "0be9b59ae21bbadeb8a13fafde5e0bcfb6d470ba516244eab0ec1c74afd7394f" },
+        { "file": "mature-flower-diagram.svg", "family": "svg", "title": "Diagram of a mature flower", "features": "85 texts, about 90 gradient references, many paths", "author": "Mariana Ruiz Villarreal (LadyofHats)", "source": "https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg", "evidence": "https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg", "evidence_quote": "This work has been released into the public domain by its author, LadyofHats.", "licence": "public-domain (released by its author)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/7/7f/Mature_flower_diagram.svg", "bytes": 123527, "sha256": "b40bd4e188c0a99e51e994b4f39f931d3fca28093ecb6454aa2bd93c575ea999" },
+        { "file": "entamoeba-life-cycle.svg", "family": "svg", "title": "Life cycle of Entamoeba histolytica", "features": "547 paths, text and arrows", "author": "Mariana Ruiz Villarreal (LadyofHats)", "source": "https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg", "evidence": "https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg", "evidence_quote": "This work has been released into the public domain by its author, LadyofHats.", "licence": "public-domain (released by its author)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/a/a1/Entamoeba_histolytica_life_cycle-en.svg", "bytes": 273234, "sha256": "68a4a92289d81f0e7e9361abbba2da9a8c8b4e440e3ad9de5c420646eb133eaa" },
+        { "file": "sieve-of-eratosthenes.svg", "family": "svg", "title": "Sieve of Eratosthenes, animated", "features": "SMIL animation with 179 animate elements", "author": "Ricordisamoa, with later edits by Jc86035, HereToHelp and Glrx", "source": "https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg", "evidence": "https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg", "evidence_quote": "This work is ineligible for copyright and therefore in the public domain because it consists entirel", "licence": "public-domain (ineligible for copyright, Wikimedia Commons PD-ineligible)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/0/0b/Sieve_of_Eratosthenes_animation.svg", "bytes": 22054, "sha256": "d8f1d6d0a4b5710ebe1e7766eab30b766b10dc9380c1058ccb39baccd7d51586" },
+        { "file": "muybridge-horse.gif", "family": "gif", "title": "Muybridge's horse in motion, animated GIF", "features": "15 frames", "author": "Eadweard Muybridge (photographs, 1887); animation by Waugsberg", "source": "https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif", "evidence": "https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif", "evidence_quote": "The author died in 1904, so this work is in the public domain in its country of origin and other cou", "licence": "public-domain (the author died in 1904)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/d/dd/Muybridge_race_horse_animated.gif", "bytes": 568203, "sha256": "eb40bebc1f039e7c2a121673c3b55d4aa73582f858053dbbcca9ebce9e2b479d" },
+        { "file": "geneva-mechanism.gif", "family": "gif", "title": "Geneva mechanism with six spokes, animated GIF", "features": "101 frames", "author": "Mike1024", "source": "https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif", "evidence": "https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif", "evidence_quote": "I, the copyright holder of this work, release this work into the public domain.", "licence": "public-domain (released by its author)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/9/9b/Geneva_mechanism_6spoke_animation.gif", "bytes": 229346, "sha256": "d7df5c9984109c2ca60f7aab1a51db1f0b578cddcdede5d43be9f67536e2a1ee" },
+        { "file": "abundance-nemo-g4-6pages.tif", "family": "tiff-fax", "title": "Les grans et merveilleux faictz du seigneur Nemo (scan, six pages, CCITT Group 4)", "features": "a multi-page bilevel TIFF scanned from a 16th-century book", "author": "Jean d'Abundance (16th century); scanned by the Bibliothèque nationale de France", "source": "https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif", "evidence": "https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif", "evidence_quote": "This file is in the public domain because it is a mere mechanical scan or photocopy of a public doma", "licence": "public-domain (a mechanical scan of a public domain book, Wikimedia Commons PD-scan)", "attribution": "", "fetched": "https://upload.wikimedia.org/wikipedia/commons/b/b5/Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif", "bytes": 330420, "sha256": "38bab27c6d559e11468d6c7e4222f0bb1bee4ba0044540adcebfc012930e00d1" }
+      ]
+    },
+    {
+      "group": "office",
+      "source": "fetched",
+      "files": [
+        { "file": "docx4j-getting-started.docx", "ref": "docx4j", "family": "docx", "title": "docx4j Getting Started (Word)", "features": "a manual with styles, tables, pictures and links", "source": "https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx", "fetched": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx", "bytes": 156287, "sha256": "a518cffcbef0b60cf5c95930acd9af9a56484e47376c5f0c4d6e3a15a0799941" },
+        { "file": "docx4j-two-charts.docx", "ref": "docx4j", "family": "docx", "title": "docx4j chart test: two charts (Word)", "features": "two native charts in a document", "source": "https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx", "fetched": "https://raw.githubusercontent.com/plutext/docx4j/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx", "bytes": 41590, "sha256": "e0bc29916de415c53c03dcee14817bbd1e3eeea8f54a2b76629fe6754e6c641e" },
+        { "file": "gsa-policy-review-template.xlsx", "ref": "gsa508", "family": "xlsx", "title": "Section508.gov Policy Review Template (Excel)", "features": "a government workbook with formatted tables", "source": "https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx", "fetched": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx", "bytes": 222164, "sha256": "840661eba4653879dca24f209bca1619f7b168ef1232b595df5713741b2465bd" },
+        { "file": "closedxml-pivot-tables.xlsx", "family": "xlsx", "title": "ClosedXML example: pivot tables (Excel)", "features": "pivot tables over a data sheet", "author": "ClosedXML contributors", "source": "https://github.com/ClosedXML/ClosedXML/blob/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx", "evidence": "https://raw.githubusercontent.com/ClosedXML/ClosedXML/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/LICENSE", "evidence_quote": "MIT License Copyright (c) 2016 ClosedXML", "licence": "MIT", "attribution": "Copyright (c) 2016 ClosedXML, MIT, https://github.com/ClosedXML/ClosedXML. No changes.", "fetched": "https://raw.githubusercontent.com/ClosedXML/ClosedXML/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx", "bytes": 30912, "sha256": "d13f149091c804cfe9b02c81301ea7ce13d20d1f3311cac799151541d0467d02" },
+        { "file": "xlsxwriter-bar-chart.xlsx", "family": "xlsx", "title": "XlsxWriter test file: a bar chart (Excel)", "features": "a native bar chart saved in Excel", "author": "John McNamara (XlsxWriter)", "source": "https://github.com/jmcnamara/XlsxWriter/blob/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx", "evidence": "https://raw.githubusercontent.com/jmcnamara/XlsxWriter/5d4606d89a955226d2d0825a0f44309043ae7251/LICENSE.txt", "evidence_quote": "BSD 2-Clause License Copyright (c) 2013-2025, John McNamara", "licence": "BSD-2-Clause", "attribution": "Copyright (c) 2013-2025, John McNamara, BSD-2-Clause, https://github.com/jmcnamara/XlsxWriter. No changes.", "fetched": "https://raw.githubusercontent.com/jmcnamara/XlsxWriter/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx", "bytes": 13879, "sha256": "c4ed1e8117b4a0e014b95f42361c7e060728b398d4ea650395d902557429cdd2" },
+        { "file": "python-pptx-chart-types.pptx", "family": "pptx", "title": "python-pptx test file: one slide for each chart type (PowerPoint)", "features": "many native chart types", "author": "Steve Canny (python-pptx)", "source": "https://github.com/scanny/python-pptx/blob/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx", "evidence": "https://raw.githubusercontent.com/scanny/python-pptx/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/LICENSE", "evidence_quote": "The MIT License (MIT) Copyright (c) 2013 Steve Canny", "licence": "MIT", "attribution": "Copyright (c) 2013 Steve Canny, MIT, https://github.com/scanny/python-pptx. No changes.", "fetched": "https://raw.githubusercontent.com/scanny/python-pptx/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx", "bytes": 1393564, "sha256": "d0a7979d05970aa83fd8406f0829cd0019853a7bc4e16f8cda814586fc2eaccc" },
+        { "file": "cdc-lifecycle-508.pptx", "ref": "gsa508", "family": "pptx", "title": "Integrating Section 508 Requirements in the Development Lifecycle (PowerPoint)", "features": "a government deck with pictures and diagrams", "author": "Mark D. Urban, CDC Section 508 Coordinator (US federal government)", "source": "https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx", "fetched": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx", "bytes": 611924, "sha256": "51c7d6af2e6682e5ee66204b813a45488e62b0e6e13cecc9207a982fdeb1720a" }
+      ]
+    },
+    {
+      "group": "converted",
+      "source": "fetched",
+      "files": [
+        { "file": "poi-sample.doc", "ref": "poi", "family": "doc", "title": "Apache POI test document (Word 97)", "features": "a binary .doc", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc", "bytes": 27136, "sha256": "717585c0a88f20862c86220163dd03da87cd743970354c6b29add32725f2e833" },
+        { "file": "poi-word95.doc", "ref": "poi", "family": "doc", "title": "Apache POI test document (Word 6 and 95 format)", "features": "the pre-1997 Word format", "author": "Nick Burch (Apache POI)", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc", "bytes": 102400, "sha256": "a7b9557e917daf29cfee6baaa90226fbfa7900ffa05cc35bdc03aafdefef5789" },
+        { "file": "dhs-directive-139-02.doc", "ref": "gsa508", "family": "doc", "title": "DHS Directive 139-02 (Word 97)", "features": "a government directive in the binary .doc format", "author": "U.S. Department of Homeland Security", "source": "https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc", "fetched": "https://raw.githubusercontent.com/GSA/Assets.Section508.gov/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc", "bytes": 82432, "sha256": "48d1c85456d6b515ce8e3db6b43024f90bac69be86a3e78c1ae08406d4cad493" },
+        { "file": "poi-formula-eval.xls", "ref": "poi", "family": "xls", "title": "Apache POI test workbook of formulas (Excel 97)", "features": "hundreds of formula cases", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls", "bytes": 178176, "sha256": "c2040c1fac1088f1e112abef197ae1f9bcb03547861783b89c1d4281a42049d1" },
+        { "file": "poi-conditional-formats.xls", "ref": "poi", "family": "xls", "title": "Apache POI test workbook of conditional formats (Excel 97)", "features": "colour scales, icon sets and data bars", "author": "Nick Burch (Apache POI)", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls", "bytes": 44544, "sha256": "899a29aa6ce35fee0268847ff8b5d9459e6ce34d5e2ff462fd42ee9b80837b87" },
+        { "file": "poi-excel5.xls", "ref": "poi", "family": "xls", "title": "Apache POI test workbook (Excel 5 and 95 format)", "features": "the BIFF5 format of 1993 to 1995", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls", "bytes": 7680, "sha256": "ac0ce3a2eff43e32e56d6b789df6aaa1645ae846d22fa3a2fe3057391d0f1cae" },
+        { "file": "poi-sample-show.ppt", "ref": "poi", "family": "ppt", "title": "Apache POI test presentation (PowerPoint 97)", "features": "a binary .ppt", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt", "bytes": 125440, "sha256": "64275a6685b8f267827178037dcc59de927475e56385725916f4c6039c7ce7f6" },
+        { "file": "tika-rtf-various.rtf", "ref": "tika", "family": "rtf", "title": "Apache Tika test document: various RTF features", "features": "fonts, colours, tables and lists in RTF", "author": "Michael McCandless (Apache Tika)", "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf", "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf", "bytes": 65517, "sha256": "cf00c56fe7099d14b820a0d751324e415f2c09af580f2c96f08614a2aec42c1e" },
+        { "file": "tdf-thesis-template.odt", "family": "odt", "title": "Thesis template in Spanish (OpenDocument text)", "features": "styles, a table of contents, headers", "author": "Phorious (Document Foundation wiki user)", "source": "https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt", "evidence": "https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt", "evidence_quote": "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Ded", "licence": "CC0-1.0", "attribution": "", "fetched": "https://wiki.documentfoundation.org/images/5/54/Tesis-v1.0.4.odt", "bytes": 67249, "sha256": "ec323e9fde67103a7f0039d8a59625bd7e2c5afa9e057563f5064c6b68d442a1" },
+        { "file": "tika-odt-ooo3.odt", "ref": "tika", "family": "odt", "title": "Apache Tika test document written with OpenOffice 3 (OpenDocument text)", "features": "an .odt of 2009", "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt", "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt", "bytes": 24286, "sha256": "b6cd74b570a98fcb6d838dd85ab869604e0711812d9533d5ecde0000b24ba7ef" },
+        { "file": "tdf-household-budget.ods", "family": "ods", "title": "Household budget book (OpenDocument spreadsheet)", "features": "formulas, charts and several sheets", "author": "Hrbrgr (Document Foundation wiki user)", "source": "https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods", "evidence": "https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods", "evidence_quote": "This work is licensed under the Attribution 3.0 Unported License", "licence": "CC-BY-3.0", "attribution": "Hrbrgr (Document Foundation wiki user), Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, CC BY 3.0. No changes.", "fetched": "https://wiki.documentfoundation.org/images/b/bc/Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods", "bytes": 21595, "sha256": "aacd76666860f7bf879e1518a07b90d535815ce92d076ea26c835061b8aff854" },
+        { "file": "odfdo-flat.fods", "ref": "odfdo", "family": "fods", "title": "odfdo test sample (flat OpenDocument spreadsheet)", "features": "one XML file", "source": "https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods", "fetched": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods", "bytes": 33177, "sha256": "4966023bf427dbc9c975dc9b11816b4a90158f7dab452c59104b8800fb27ec36" },
+        { "file": "tdf-presentation-template.odp", "family": "odp", "title": "Presentation template (OpenDocument presentation)", "features": "master slides, pictures and layouts", "author": "Phorious (Document Foundation wiki user)", "source": "https://wiki.documentfoundation.org/File:Presenta.odp", "evidence": "https://wiki.documentfoundation.org/File:Presenta.odp", "evidence_quote": "This file is made available under the Creative Commons CC0 1.0 Universal Public Domain Ded", "licence": "CC0-1.0", "attribution": "", "fetched": "https://wiki.documentfoundation.org/images/5/51/Presenta.odp", "bytes": 412768, "sha256": "147ca9c6dbcdd45470627b84c04824c7f3e07de57485a8190018eea5f23c64b3" },
+        { "file": "odfdo-example.odp", "ref": "odfdo", "family": "odp", "title": "odfdo test sample (OpenDocument presentation)", "features": "slides with text and shapes", "source": "https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp", "fetched": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp", "bytes": 55687, "sha256": "9075b87e36bb4618bdc9a8a6138bcaaf31b2b81e089e9006ac906e66a94f912b" },
+        { "file": "tdf-diagram-gallery.odg", "family": "odg", "title": "A gallery of diagrams (OpenDocument drawing)", "features": "several diagram types", "author": "Hrbrgr (Document Foundation wiki user)", "source": "https://wiki.documentfoundation.org/File:Diagramme.odg", "evidence": "https://wiki.documentfoundation.org/File:Diagramme.odg", "evidence_quote": "This work is licensed under the Attribution 3.0 Unported License", "licence": "CC-BY-3.0", "attribution": "Hrbrgr (Document Foundation wiki user), Diagramme.odg, https://wiki.documentfoundation.org/File:Diagramme.odg, CC BY 3.0. No changes.", "fetched": "https://wiki.documentfoundation.org/images/0/07/Diagramme.odg", "bytes": 91383, "sha256": "2e5f43734db7c600256e0670f6ec9da9428eb6b7a074c4742fd506e32c833a5a" },
+        { "file": "odfdo-shapes.odg", "ref": "odfdo", "family": "odg", "title": "odfdo test sample: basic shapes (OpenDocument drawing)", "features": "rectangles, ellipses, lines and polygons", "source": "https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg", "fetched": "https://raw.githubusercontent.com/jdum/odfdo/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg", "bytes": 10351, "sha256": "dfe6a6c83ba5caec340889d6c77a899e420060d55f4b08fd9a1fb7b36e0b799f" },
+        { "file": "tika-keynote09.key", "ref": "tika", "family": "keynote", "title": "Apache Tika test presentation (Keynote '09)", "features": "an XML Keynote document (index.apxl)", "author": "Jukka Zitting (Apache Tika)", "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key", "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key", "bytes": 221745, "sha256": "4a270c2427f11d77f82fae696e3fd6eda945bae0422ae87c5fac6cf2bd06015c" },
+        { "file": "tika-keynote2013.key", "ref": "tika", "family": "keynote", "title": "Apache Tika test presentation (Keynote 2013, IWA format)", "features": "a Keynote document in the iWork archive format", "author": "Tim Allison (Apache Tika)", "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key", "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key", "bytes": 274397, "sha256": "8da93f6b566bc9eb22f4791bbfd5f2179162f39bf80968187b164c33d31824db" },
+        { "file": "tika-numbers09-charts.numbers", "ref": "tika", "family": "numbers", "title": "Apache Tika test spreadsheet with charts (Numbers '09)", "features": "an XML Numbers document with charts", "author": "Michael McCandless (Apache Tika)", "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers", "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers", "bytes": 104547, "sha256": "f4430f2aa0ddab186e7e32f15552b58b7b03abada7a978dfbcd51e5548757789" },
+        { "file": "numbers-formulas.numbers", "family": "numbers", "title": "numbers-parser test spreadsheet of formulas (Numbers)", "features": "formulas across tables", "author": "Jon Connell (numbers-parser)", "source": "https://github.com/masaccio/numbers-parser/blob/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers", "evidence": "https://raw.githubusercontent.com/masaccio/numbers-parser/a6affe5599c8373f575192ac5777d0c6426da696/LICENSE.rst", "evidence_quote": "Permission is hereby granted, free of charge, to any person obtaining a copy of this softw", "licence": "MIT", "attribution": "Copyright 2021 Jon Connell, numbers-parser, MIT, https://github.com/masaccio/numbers-parser. No changes.", "fetched": "https://raw.githubusercontent.com/masaccio/numbers-parser/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers", "bytes": 330282, "sha256": "9371c5b1d6ee4dfa17569097f064eba9c67f804d88b48638efbbeeb459d07dd4" }
+      ]
+    },
+    {
+      "group": "unsupported",
+      "source": "fetched",
+      "files": [
+        { "file": "poi-network.vsdx", "group": "converted", "ref": "poi", "family": "visio", "title": "Apache POI test diagram (Visio): a network", "features": "a use-case diagram: actors, ovals and connecting lines", "author": "A reporter of Apache POI bug 60489 (committed by Tim Allison)", "source": "https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx", "fetched": "https://raw.githubusercontent.com/apache/poi/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx", "bytes": 44426, "sha256": "15494702ecb5554c1dfaee2c09ac35e2ea656e2eed7ba4ba0cf1039e6125fbe1" },
+        { "file": "vsdx-house.vsdx", "group": "converted", "family": "visio", "title": "vsdx library test drawing (Visio): a house", "features": "boxes and house shapes with text", "author": "Dave Howard (vsdx library)", "source": "https://github.com/dave-howard/vsdx/blob/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx", "evidence": "https://raw.githubusercontent.com/dave-howard/vsdx/6703e6c2c906bea4051f43525ec9af9dcf735c13/LICENSE", "evidence_quote": "BSD 3-Clause License Copyright (c) 2020, Dave Howard", "licence": "BSD-3-Clause", "attribution": "Copyright (c) 2020, Dave Howard, BSD-3-Clause, https://github.com/dave-howard/vsdx. No changes.", "fetched": "https://raw.githubusercontent.com/dave-howard/vsdx/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx", "bytes": 20914, "sha256": "e454217e49d1ec2aaa7c9b8f38b148ffc0d028ce44ba096fe3386e9894b1775f" },
+        { "file": "tika-pages09-layout.pages", "ref": "tika", "family": "pages", "title": "Apache Tika test document (Pages '09)", "features": "kept to show what the viewer says about Pages files, which it does not list yet", "author": "Michael McCandless (Apache Tika)", "source": "https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages", "fetched": "https://raw.githubusercontent.com/apache/tika/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages", "bytes": 66480, "sha256": "6157fe7a95f7bc7d42251872f990d2f2d589f7f5e25a52b58e25c14cc447a4b2" }
+      ]
+    }
+  ]
+}
diff --git a/crates/exav-viewer/demo/examples/generate/make-archives.py b/crates/exav-viewer/demo/examples/generate/make-archives.py
new file mode 100644
index 00000000..635e26f2
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-archives.py
@@ -0,0 +1,279 @@
+#!/usr/bin/env python3
+"""Writes the demo's archive examples into ../files/archives/.
+
+    python3 -I make-archives.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. The members
+are files of this demo (../files/text and ../files/images, so run make-text.py
+and make-images.py first) and short texts written here.
+
+Needs: Python 3, and the programs 7z (p7zip-full), genisoimage, zstd, gcab,
+dpkg-deb, cpio and ar. A file whose program is missing is skipped.
+
+Written by Python alone: the zip, the tar family (tar, gz, bz2, xz), the jar,
+the comic book archive (cbz), and the RAR 5 file, which is built here from the
+published format (stored members: no program writes RAR without the
+proprietary rar). The encrypted ones use 7z; their password is in the file
+name's credit: "exav".
+
+Same bytes on every run, except the ISO image (genisoimage stamps the time) and
+the encrypted files (7z picks a random salt).
+"""
+import bz2
+import gzip
+import io
+import lzma
+import os
+import shutil
+import struct
+import subprocess
+import sys
+import tarfile
+import tempfile
+import time
+import zipfile
+import zlib
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+FILES = os.path.join(HERE, "..", "files")
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(FILES, "archives")
+os.makedirs(OUT, exist_ok=True)
+EPOCH = 946684800  # 2000-01-01 00:00:00 UTC
+DATE = (2000, 1, 1, 0, 0, 0)
+PASSWORD = "exav"
+
+
+def have(tool):
+    return shutil.which(tool) is not None
+
+
+def read(*parts):
+    with open(os.path.join(FILES, *parts), "rb") as f:
+        return f.read()
+
+
+README = """Example archive
+===============
+
+This archive holds a few files of the exav demo. It is in the public domain
+(CC0-1.0). Look at the folders: docs, data, images, src, an empty one, and a
+folder with accented and Japanese names.
+""".encode()
+
+MEMBERS = [
+    ("README.txt", README, True),
+    ("docs/field-guide.md", read("text", "field-guide.md"), True),
+    ("docs/field-notes.txt", read("text", "field-notes.txt"), True),
+    ("data/harbour-log.csv", read("text", "harbour-log.csv"), True),
+    ("data/recipes.json", read("text", "recipes.json"), True),
+    ("images/scene-indexed.png", read("images", "scene-indexed.png"), False),
+    ("src/life.py", read("text", "life.py"), True),
+    ("src/lru.rs", read("text", "lru.rs"), True),
+    ("café/日本語.txt", "Names with accents and Japanese characters.\n".encode(), True),
+]
+DIRS = ["docs", "data", "images", "src", "src/empty", "café"]
+
+
+def stage(root):
+    """The members as files on disk with fixed times, for the programs that read a folder."""
+    for d in DIRS:
+        os.makedirs(os.path.join(root, d), exist_ok=True)
+    for name, data, _ in MEMBERS:
+        path = os.path.join(root, name)
+        with open(path, "wb") as f:
+            f.write(data)
+        os.chmod(path, 0o644)
+    for p, dirs, files in os.walk(root):
+        for n in dirs + files:
+            os.utime(os.path.join(p, n), (EPOCH, EPOCH))
+        os.utime(p, (EPOCH, EPOCH))
+
+
+# ---------------------------------------------------------------------- zip
+
+
+def make_zip(path, members=MEMBERS, dirs=DIRS, comment=b"exav example archive, CC0-1.0"):
+    with zipfile.ZipFile(path, "w") as z:
+        z.comment = comment
+        for d in dirs:
+            zi = zipfile.ZipInfo(d + "/", DATE)
+            zi.external_attr = (0o40755 << 16) | 0x10
+            zi.create_system = 3
+            z.writestr(zi, b"")
+        for name, data, deflate in members:
+            zi = zipfile.ZipInfo(name, DATE)
+            zi.external_attr = 0o100644 << 16
+            zi.create_system = 3
+            zi.compress_type = zipfile.ZIP_DEFLATED if deflate else zipfile.ZIP_STORED
+            z.writestr(zi, data, compresslevel=9)
+
+
+def zip_bytes(members, dirs=()):
+    buf = io.BytesIO()
+    make_zip(buf, members, dirs, comment=b"")
+    return buf.getvalue()
+
+
+# ---------------------------------------------------------------------- tar
+
+
+def tar_bytes():
+    buf = io.BytesIO()
+    with tarfile.open(fileobj=buf, mode="w", format=tarfile.USTAR_FORMAT) as t:
+        def info(name, kind=tarfile.REGTYPE, size=0, mode=0o644, link=""):
+            ti = tarfile.TarInfo(name)
+            ti.type, ti.size, ti.mode, ti.mtime, ti.uid, ti.gid, ti.uname, ti.gname, ti.linkname = kind, size, mode, EPOCH, 0, 0, "", "", link
+            return ti
+
+        for d in DIRS:
+            t.addfile(info(d + "/", tarfile.DIRTYPE, mode=0o755))
+        for name, data, _ in MEMBERS:
+            t.addfile(info(name, size=len(data)), io.BytesIO(data))
+        t.addfile(info("link-to-readme", tarfile.SYMTYPE, link="README.txt", mode=0o777))
+    return buf.getvalue()
+
+
+def gz(data):
+    buf = io.BytesIO()
+    with gzip.GzipFile(fileobj=buf, mode="wb", mtime=0, compresslevel=9) as f:
+        f.write(data)
+    return buf.getvalue()
+
+
+def write(name, data):
+    with open(os.path.join(OUT, name), "wb") as f:
+        f.write(data)
+
+
+# ------------------------------------------------------------------ RAR 5
+
+
+def vint(n):
+    out = bytearray()
+    while True:
+        b = n & 0x7F
+        n >>= 7
+        if n:
+            out.append(b | 0x80)
+        else:
+            out.append(b)
+            return bytes(out)
+
+
+def rar_block(htype, fields, data=b"", flags=0):
+    """One RAR 5 block: CRC32, header size, type, flags, [data size], fields, then the data."""
+    body = vint(htype) + vint(flags | (2 if data else 0)) + (vint(len(data)) if data else b"") + fields
+    size = vint(len(body))
+    return struct.pack("<I", zlib.crc32(size + body)) + size + body + data
+
+
+def rar5(members, dirs):
+    out = bytearray(b"Rar!\x1a\x07\x01\x00")
+    out += rar_block(1, vint(0))
+    for d in dirs:
+        name = d.encode()
+        out += rar_block(2, vint(0x1 | 0x2) + vint(0) + vint(0o40755) + struct.pack("<I", EPOCH) + vint(0) + vint(1) + vint(len(name)) + name)
+    for n, data, _ in members:
+        name = n.encode()
+        out += rar_block(2, vint(0x2 | 0x4) + vint(len(data)) + vint(0o100644) + struct.pack("<I", EPOCH) + struct.pack("<I", zlib.crc32(data)) + vint(0) + vint(1) + vint(len(name)) + name, data)
+    out += rar_block(5, vint(0))
+    return bytes(out)
+
+
+# --------------------------------------------------------------------- main
+
+make_zip(os.path.join(OUT, "sample.zip"))
+tar = tar_bytes()
+write("sample.tar", tar)
+write("sample.tar.gz", gz(tar))
+write("sample.tar.bz2", bz2.compress(tar, 9))
+write("sample.tar.xz", lzma.compress(tar, format=lzma.FORMAT_XZ, preset=9))
+log = read("text", "server.log")
+write("server.log.gz", gz(log))
+write("server.log.bz2", bz2.compress(log, 9))
+write("server.log.xz", lzma.compress(log, format=lzma.FORMAT_XZ, preset=9))
+write("sample.rar", rar5(MEMBERS, DIRS))
+
+# A jar and a comic book archive are zips under other names.
+jar_members = [
+    ("META-INF/MANIFEST.MF", b"Manifest-Version: 1.0\r\nCreated-By: exav make-archives.py\r\nMain-Class: example.Main\r\n\r\n", True),
+    ("example/Main.java", b"package example;\n\npublic class Main {\n    public static void main(String[] args) {\n        System.out.println(\"hello from a jar\");\n    }\n}\n", True),
+    ("example/messages.properties", b"greeting=hello\nfarewell=goodbye\n", True),
+]
+make_zip(os.path.join(OUT, "example.jar"), jar_members, ["META-INF", "example"], comment=b"")
+pages = [(f"page-{i:02d}.png", read("images", n), False) for i, n in enumerate(["scene-indexed.png", "scene-indexed.png"], 1)]
+comic = pages + [("ComicInfo.xml", b'<?xml version="1.0"?>\n<ComicInfo><Title>Two pages</Title><Series>exav examples</Series><PageCount>2</PageCount></ComicInfo>\n', True)]
+make_zip(os.path.join(OUT, "pages.cbz"), comic, [], comment=b"")
+
+# The nested one: a zip holding a tar.gz holding a 7z holding a zip.
+with tempfile.TemporaryDirectory() as tmp:
+    stage_dir = os.path.join(tmp, "stage")
+    stage(stage_dir)
+    inner_zip = zip_bytes([("deep.txt", b"Four archives down.\n", True), ("field-guide.md", read("text", "field-guide.md"), True), ("scene-indexed.png", read("images", "scene-indexed.png"), False)])
+    if have("7z"):
+        work = os.path.join(tmp, "inner")
+        os.makedirs(work)
+        with open(os.path.join(work, "inner.zip"), "wb") as f:
+            f.write(inner_zip)
+        os.utime(os.path.join(work, "inner.zip"), (EPOCH, EPOCH))
+        subprocess.run(["7z", "a", "-t7z", "-mx=9", "-bd", "-y", os.path.join(tmp, "inner.7z"), "inner.zip"], cwd=work, check=True, capture_output=True)
+        with open(os.path.join(tmp, "inner.7z"), "rb") as f:
+            inner_7z = f.read()
+        buf = io.BytesIO()
+        with tarfile.open(fileobj=buf, mode="w", format=tarfile.USTAR_FORMAT) as t:
+            ti = tarfile.TarInfo("inner.7z")
+            ti.size, ti.mtime, ti.mode = len(inner_7z), EPOCH, 0o644
+            t.addfile(ti, io.BytesIO(inner_7z))
+            ti = tarfile.TarInfo("note.txt")
+            note = b"This tar.gz holds a 7z that holds a zip.\n"
+            ti.size, ti.mtime, ti.mode = len(note), EPOCH, 0o644
+            t.addfile(ti, io.BytesIO(note))
+        outer = gz(buf.getvalue())
+        make_zip(os.path.join(OUT, "matryoshka.zip"), [("README.txt", b"A zip, holding a tar.gz, holding a 7z, holding a zip. Open them in turn.\n", True), ("inner.tar.gz", outer, False)], [], comment=b"")
+
+    # Programs that read a folder.
+    if have("7z"):
+        for name, args in [
+            ("sample.7z", ["-t7z", "-mx=9"]),
+            ("encrypted-aes.zip", ["-tzip", f"-p{PASSWORD}", "-mem=AES256"]),
+            ("encrypted-zipcrypto.zip", ["-tzip", f"-p{PASSWORD}", "-mem=ZipCrypto"]),
+            ("encrypted.7z", ["-t7z", "-mx=5", f"-p{PASSWORD}", "-mhe=off"]),
+        ]:
+            target = os.path.join(OUT, name)
+            if os.path.exists(target):
+                os.remove(target)
+            subprocess.run(["7z", "a", *args, "-bd", "-y", target, "."], cwd=stage_dir, check=True, capture_output=True)
+    if have("genisoimage"):
+        subprocess.run(["genisoimage", "-quiet", "-no-pad", "-R", "-J", "-joliet-long", "-V", "EXAV_EXAMPLE", "-input-charset", "utf-8", "-o", os.path.join(OUT, "sample.iso"), stage_dir], check=True, capture_output=True)
+    if have("zstd"):
+        subprocess.run(["zstd", "-q", "-19", "-f", "-o", os.path.join(OUT, "sample.tar.zst"), "-"], input=tar, check=True, capture_output=True)
+    if have("gcab"):
+        target = os.path.join(OUT, "sample.cab")
+        if os.path.exists(target):
+            os.remove(target)
+        files = ["README.txt", "docs/field-guide.md", "data/recipes.json", "src/life.py"]
+        subprocess.run(["gcab", "-c", "-n", target, *files], cwd=stage_dir, check=True, capture_output=True)
+    if have("ar"):
+        target = os.path.join(OUT, "libexample.a")
+        if os.path.exists(target):
+            os.remove(target)
+        subprocess.run(["ar", "rcsD", target, "README.txt"], cwd=stage_dir, check=True, capture_output=True)
+        for name in ("docs/field-notes.txt",):
+            subprocess.run(["ar", "rD", target, name], cwd=stage_dir, check=True, capture_output=True)
+    if have("cpio"):
+        names = "\n".join(["README.txt", "docs/field-guide.md", "data/recipes.json", "src/life.py"]) + "\n"
+        data = subprocess.run(["cpio", "-o", "-H", "newc", "--quiet", "--reproducible"], input=names.encode(), cwd=stage_dir, check=True, capture_output=True).stdout
+        write("sample.cpio", data)
+    if have("dpkg-deb"):
+        pkg = os.path.join(tmp, "pkg")
+        os.makedirs(os.path.join(pkg, "DEBIAN"))
+        os.makedirs(os.path.join(pkg, "usr", "share", "doc", "exav-example"))
+        with open(os.path.join(pkg, "DEBIAN", "control"), "w") as f:
+            f.write("Package: exav-example\nVersion: 1.0\nSection: misc\nPriority: optional\nArchitecture: all\nMaintainer: exav project <noreply@example.invalid>\nDescription: an example package\n A package that holds a README, for the exav demo (CC0-1.0).\n")
+        shutil.copy(os.path.join(stage_dir, "README.txt"), os.path.join(pkg, "usr", "share", "doc", "exav-example", "README"))
+        shutil.copy(os.path.join(stage_dir, "docs", "field-guide.md"), os.path.join(pkg, "usr", "share", "doc", "exav-example", "field-guide.md"))
+        for p, dirs, files in os.walk(pkg):
+            for n in dirs + files:
+                os.utime(os.path.join(p, n), (EPOCH, EPOCH))
+        env = dict(os.environ, SOURCE_DATE_EPOCH=str(EPOCH))
+        subprocess.run(["dpkg-deb", "--root-owner-group", "-Zxz", "-b", pkg, os.path.join(OUT, "exav-example.deb")], check=True, capture_output=True, env=env)
diff --git a/crates/exav-viewer/demo/examples/generate/make-attributions.mjs b/crates/exav-viewer/demo/examples/generate/make-attributions.mjs
new file mode 100644
index 00000000..bf6a3b64
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-attributions.mjs
@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+// Writes the credits of the demo's examples from examples.json:
+//
+//   - ../NOTICE.md, the list with every fact of the manifest, and
+//   - www/src/content/docs/viewer/examples.md, the page of the site.
+//
+//     node generate/make-attributions.mjs            # write both
+//     node generate/make-attributions.mjs --check    # fail if either is out of date
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const root = path.join(here, "..");
+const repo = path.join(root, "..", "..", "..", "..");
+const check = process.argv.includes("--check");
+
+const { examples } = JSON.parse(fs.readFileSync(path.join(root, "examples.json"), "utf8"));
+const showcase = fs.readFileSync(path.join(root, "..", "src", "showcase.ts"), "utf8");
+const groups = [...showcase.matchAll(/^\s+(?:"([\w-]+)"|(\w+)): \{ en: "([^"]+)"/gm)].map((m) => ({ id: m[1] ?? m[2], label: m[3] }));
+
+const kb = (n) => (n < 1024 ? `${n} B` : n < 1024 * 1024 ? `${(n / 1024).toFixed(n < 10240 ? 1 : 0)} KB` : `${(n / 1024 / 1024).toFixed(1)} MB`);
+const cell = (s) => String(s).replace(/\|/g, "\\|").replace(/\n/g, " ");
+const host = (u) => new URL(u).hostname.replace(/^www\./, "");
+const SPDX_URL = (id) => {
+  if (id === "CC0-1.0") return "https://creativecommons.org/publicdomain/zero/1.0/";
+  const m = /^CC-BY(-SA)?-(\d\.\d)$/.exec(id);
+  if (m) return `https://creativecommons.org/licenses/by${m[1] ? "-sa" : ""}/${m[2]}/`;
+  if (/^(MIT|BSD-2-Clause|BSD-3-Clause|Apache-2\.0)$/.test(id)) return `https://spdx.org/licenses/${id}.html`;
+  return null;
+};
+const origin = (e) => {
+  if (e.generated) return `generated by \`${e.generated.script}\`${e.generated.args.length ? ` ${e.generated.args.join(" ")}` : ""}${e.generated.tools ? ` (with ${e.generated.tools.join(", ")})` : ""}`;
+  if (e.fixture) return `a fixture of this repository, \`${e.fixture}\``;
+  return `downloaded from ${e.fetched}`;
+};
+
+const ordered = [...groups.map((g) => g.id), ...new Set(examples.map((e) => e.group))].filter((g, i, a) => a.indexOf(g) === i);
+const byGroup = (id) => examples.filter((e) => e.group === id);
+const label = (id) => groups.find((g) => g.id === id)?.label ?? id;
+
+const total = (list) => list.reduce((n, e) => n + e.bytes, 0);
+const committed = examples.filter((e) => e.committed);
+
+// ----------------------------------------------------------------- NOTICE.md
+const notice = [
+  "# Notices of the example files",
+  "",
+  "The demo of `@exav/viewer` lists the files of this directory's `examples.json`. Each has a free licence",
+  "that was read at the page named under \"Evidence\", or is made by a script of this repository and",
+  "given to the public domain (CC0-1.0). This file is written by `generate/make-attributions.mjs`; do not edit it.",
+  "",
+  `${examples.length} files: ${committed.length} are committed under \`files/\` (${kb(total(committed))}); ${examples.length - committed.length} are downloaded by \`npm run demo:examples\` (${kb(total(examples.filter((e) => !e.committed)))}).`,
+  "",
+  "To rebuild: run the scripts of `generate/` (each lists what it needs; `python3 -I generate/make-images.py`, `make-cad.py`,",
+  "`make-models.py`, `make-ifc.py`, `make-text.py`, `make-archives.py`, `make-media.py`, `make-pdf.py`, `make-office.py`), then",
+  "`node generate/make-manifest.mjs` and `node generate/make-attributions.mjs`. `node check.mjs` checks the manifest and the",
+  "files, `node verify-open.mjs` opens every example with the viewer's own engines, and `node generate/verify-evidence.mjs`",
+  "reads the licence pages again. `catalog.json` is where each example is described by hand.",
+  "",
+  "Where the pictures made here hold text, it is set in Aileron, the font Pillow bundles, which its author gives to the",
+  "public domain (CC0-1.0, \"No Rights Reserved\": https://dotcolon.net/font/aileron/). Drawings name their fonts and",
+  "embed none; documents that embed fonts embed the Liberation fonts (SIL OFL 1.1, which lets documents embed them).",
+  "",
+];
+for (const id of ordered) {
+  const list = byGroup(id);
+  if (!list.length) continue;
+  notice.push(`## ${label(id)}`, "");
+  for (const e of list) {
+    notice.push(`### ${e.file}`, "");
+    notice.push(`- What: ${e.title} (${e.family}, ${kb(e.bytes)})`);
+    if (e.features) notice.push(`- Shows: ${e.features}`);
+    notice.push(`- Author: ${e.author}`);
+    notice.push(`- Source: ${e.source}`);
+    notice.push(`- Licence: ${e.licence}`);
+    notice.push(`- Evidence: ${e.evidence}`);
+    notice.push(`- Words read there: "${e.evidence_quote}"`);
+    if (e.attribution) notice.push(`- Attribution: ${e.attribution}`);
+    if (e.derived) notice.push(`- Changes: ${e.derived}`);
+    notice.push(`- Origin: ${origin(e)}`);
+    notice.push(`- SHA-256: ${e.sha256}`, "");
+  }
+}
+
+// ------------------------------------------------------------------ the page
+const page = [
+  "---",
+  "title: Example files",
+  "description: \"The files of the @exav/viewer demo: what each is, who made it, where it comes from and its licence.\"",
+  "---",
+  "",
+  "<!-- Written by crates/exav-viewer/demo/examples/generate/make-attributions.mjs from examples.json. Do not edit. -->",
+  "",
+  `The [demo](/viewer/demo/) lists ${examples.length} example files, one or more for each format the viewer reads. Each is public domain, CC0,`,
+  "CC-BY, or an MIT, BSD or Apache test file, and its licence was read at the source page named below.",
+  "Most are made for the demo by scripts of the repository and given to the public domain (CC0-1.0); the others",
+  "are credited here and in the demo's licence notice. A file is downloaded only when it is opened.",
+  "",
+  "The facts are in [`examples.json`](https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/examples.json)",
+  "and [`NOTICE.md`](https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/NOTICE.md): the page",
+  "that states each licence, the words read there, the SHA-256 of the file, and how it was made or fetched.",
+  "",
+];
+for (const id of ordered) {
+  const list = byGroup(id);
+  if (!list.length) continue;
+  page.push(`## ${label(id)}`, "", "| File | Format | Size | Author | Source | Licence |", "| --- | --- | ---: | --- | --- | --- |");
+  for (const e of list) {
+    const lic = SPDX_URL(e.licence) ? `[${cell(e.licence)}](${SPDX_URL(e.licence)})` : cell(e.licence);
+    const what = e.generated ? "made for the demo" : `[${host(e.source)}](${e.source})`;
+    page.push(`| \`${e.file}\` | ${cell(e.family)} | ${kb(e.bytes)} | ${cell(e.author)} | ${what} | ${lic} |`);
+  }
+  page.push("");
+}
+const credited = examples.filter((e) => e.attribution);
+if (credited.length) {
+  page.push("## Attributions", "", "The lines the licences ask to keep:", "");
+  for (const e of credited) page.push(`- \`${e.file}\`: ${e.attribution}`);
+  page.push("");
+}
+
+const targets = [
+  [path.join(root, "NOTICE.md"), `${notice.join("\n")}\n`],
+  [path.join(repo, "www", "src", "content", "docs", "viewer", "examples.md"), `${page.join("\n")}\n`],
+];
+let stale = false;
+for (const [file, text] of targets) {
+  const now = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : null;
+  if (check) {
+    if (now !== text) {
+      console.error(`${path.relative(repo, file)} is out of date: run node generate/make-attributions.mjs`);
+      stale = true;
+    }
+  } else if (now !== text) {
+    fs.writeFileSync(file, text);
+    console.log(`wrote ${path.relative(repo, file)}`);
+  }
+}
+if (stale) process.exit(1);
diff --git a/crates/exav-viewer/demo/examples/generate/make-cad.py b/crates/exav-viewer/demo/examples/generate/make-cad.py
new file mode 100644
index 00000000..88f90574
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-cad.py
@@ -0,0 +1,970 @@
+#!/usr/bin/env python3
+"""Writes the demo's DXF drawing examples into ../files/cad/.
+
+    python3 -I make-cad.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. Every
+drawing is made here from scratch with ezdxf (MIT licence; tested with
+1.4.1), with no outside drawing or block library. Two runs draw the same
+drawing; the bytes differ in the order of a few table objects (ezdxf's
+dictionaries follow the hash seed). The dates and GUIDs are fixed.
+
+Needs: Python 3 and ezdxf 1.4.
+
+- house-plan.dxf (2018), house-plan-r2000.dxf: a two-room-wide house plan,
+  walls with openings, door and window blocks with attributes, furniture
+  blocks, axes with bubbles, room labels, linear, aligned, radius and angular
+  dimensions, hatches, a paper-space sheet with a title block and a viewport.
+- house-elevations.dxf: four elevations and a section in 2D, with ground
+  hatching, roof, windows, levels and height dimensions.
+- hatch-gallery.dxf: the predefined patterns, gradients, solid fills, islands
+  and boundaries made of arcs, ellipses and splines.
+- dimensions.dxf: every dimension type, in two dimension styles.
+- linetypes.dxf: the standard and custom linetypes (text and shapes inside),
+  line weights, line type scales, wide and generated polylines.
+- text-styles.dxf: fonts, width and oblique factors, mirrored and rotated
+  text, MTEXT formatting, columns, background, special characters.
+- blocks.dxf: nested blocks, attributes, arrays, mirrored and scaled inserts.
+- bracket.dxf: a mechanical part with centre and hidden lines, a section,
+  dimensions with tolerances and a title block.
+- site-plan.dxf: contour lines (splines and polylines), parcels, points with
+  heights, a legend and a north arrow.
+- legacy-r12.dxf: a drawing in the R12 format.
+"""
+import math
+import os
+import sys
+
+import ezdxf
+from ezdxf import colors, zoom
+from ezdxf.enums import TextEntityAlignment
+from ezdxf.math import Vec2
+from ezdxf.render.mleader import ConnectionSide
+from ezdxf.tools import pattern
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "cad")
+os.makedirs(OUT, exist_ok=True)
+
+# Fixed dates, GUIDs and creator line in the files, so that two runs give the same bytes.
+ezdxf.options.write_fixed_meta_data_for_testing = True
+
+
+def new(version="R2018", units=4):
+    doc = ezdxf.new(version, setup=["linetypes"])
+    doc.units = units
+    return doc
+
+
+def save(doc, name, extents=True):
+    if extents:
+        zoom.extents(doc.modelspace(), factor=1.05)
+    doc.saveas(os.path.join(OUT, name))
+
+
+def layer(doc, name, color=7, linetype="Continuous", weight=25, **kw):
+    return doc.layers.add(name, color=color, linetype=linetype, lineweight=weight, **kw)
+
+
+def text_style(doc, name, font, **kw):
+    style = doc.styles.add(name, font=font)
+    for key, value in kw.items():
+        setattr(style.dxf, key, value)
+    return style
+
+
+def dimstyle(doc, name, scale_text=125, **over):
+    ds = doc.dimstyles.new(name)
+    ds.dxf.dimtxt = scale_text
+    ds.dxf.dimasz = scale_text * 0.8
+    ds.dxf.dimexe = scale_text * 0.6
+    ds.dxf.dimexo = scale_text * 0.8
+    ds.dxf.dimgap = scale_text * 0.3
+    ds.dxf.dimdec = 0
+    ds.dxf.dimtad = 1
+    ds.dxf.dimclrd = 3
+    ds.dxf.dimclre = 3
+    ds.dxf.dimclrt = 2
+    for k, v in over.items():
+        setattr(ds.dxf, k, v)
+    return ds
+
+
+def rect(msp, x0, y0, x1, y1, **attr):
+    return msp.add_lwpolyline([(x0, y0), (x1, y0), (x1, y1), (x0, y1)], close=True, dxfattribs=attr)
+
+
+# ----------------------------------------------------------------- blocks
+
+
+def make_blocks(doc):
+    door = doc.blocks.new("DOOR")
+    # A leaf 900 wide, open to 90 degrees, with its swing.
+    door.add_line((0, 0), (0, 900), dxfattribs={"layer": "A-DOOR"})
+    door.add_arc((0, 0), 900, 0, 90, dxfattribs={"layer": "A-DOOR", "linetype": "DASHED"})
+    door.add_lwpolyline([(0, 0), (900, 0), (900, 40), (0, 40)], close=True, dxfattribs={"layer": "A-DOOR"})
+    door.add_attdef("TAG", (350, -330), text="D-000", height=110, dxfattribs={"layer": "A-ANNO"})
+    win = doc.blocks.new("WINDOW")
+    # Unit width; the frame is scaled in x to the opening and in y to the wall.
+    for y in (0.0, 0.35, 0.65, 1.0):
+        win.add_line((0, y), (1, y), dxfattribs={"layer": "A-WIND"})
+    win.add_line((0, 0), (0, 1), dxfattribs={"layer": "A-WIND"})
+    win.add_line((1, 0), (1, 1), dxfattribs={"layer": "A-WIND"})
+    bed = doc.blocks.new("BED")
+    rect(bed, 0, 0, 1600, 2000, layer="A-FURN")
+    rect(bed, 80, 1300, 760, 1920, layer="A-FURN")
+    rect(bed, 840, 1300, 1520, 1920, layer="A-FURN")
+    bed.add_line((0, 1200), (1600, 1200), dxfattribs={"layer": "A-FURN"})
+    table = doc.blocks.new("TABLE")
+    rect(table, 0, 0, 1800, 900, layer="A-FURN")
+    for i in range(4):
+        x = 150 + i * 450
+        rect(table, x, -450, x + 400, -50, layer="A-FURN")
+        rect(table, x, 950, x + 400, 1350, layer="A-FURN")
+    sofa = doc.blocks.new("SOFA")
+    rect(sofa, 0, 0, 2200, 950, layer="A-FURN")
+    rect(sofa, 0, 0, 2200, 250, layer="A-FURN")
+    for i in range(3):
+        rect(sofa, 120 + i * 650, 300, 120 + i * 650 + 600, 900, layer="A-FURN")
+    wc = doc.blocks.new("WC")
+    rect(wc, 0, 0, 400, 200, layer="A-FIXT")
+    wc.add_ellipse((200, -250), major_axis=(0, 230), ratio=0.8, dxfattribs={"layer": "A-FIXT"})
+    sink = doc.blocks.new("SINK")
+    rect(sink, 0, 0, 600, 450, layer="A-FIXT")
+    sink.add_circle((300, 225), 160, dxfattribs={"layer": "A-FIXT"})
+    sink.add_circle((300, 225), 25, dxfattribs={"layer": "A-FIXT"})
+    bath = doc.blocks.new("BATH")
+    rect(bath, 0, 0, 1700, 750, layer="A-FIXT")
+    bath.add_lwpolyline([(100, 100), (1500, 100), (1600, 375), (1500, 650), (100, 650)], close=True, dxfattribs={"layer": "A-FIXT"})
+    bubble = doc.blocks.new("AXIS")
+    bubble.add_circle((0, 0), 300, dxfattribs={"layer": "A-GRID"})
+    bubble.add_attdef("ID", (0, 0), text="A", height=300, dxfattribs={"layer": "A-GRID", "halign": 4, "valign": 0, "align_point": (0, 0)})
+    north = doc.blocks.new("NORTH")
+    north.add_circle((0, 0), 500, dxfattribs={"layer": "A-ANNO"})
+    north.add_solid([(0, 650), (-170, -400), (0, -200), (170, -400)], dxfattribs={"layer": "A-ANNO", "color": 7})
+    north.add_text("N", height=300, dxfattribs={"layer": "A-ANNO"}).set_placement((0, 800), align=TextEntityAlignment.BOTTOM_CENTER)
+    level = doc.blocks.new("LEVEL")
+    level.add_lwpolyline([(-250, 250), (0, 0), (250, 250)], close=True, dxfattribs={"layer": "A-ANNO"})
+    level.add_line((-250, 250), (900, 250), dxfattribs={"layer": "A-ANNO"})
+    level.add_attdef("H", (320, 290), text="+0.00", height=120, dxfattribs={"layer": "A-ANNO"})
+
+
+def wall(msp, p1, p2, t, openings=(), layer="A-WALL", hatch=True):
+    """A wall along p1 to p2 of thickness t (centre line), cut at the openings
+    [(offset, width)]. Each piece is a closed polyline with its hatch."""
+    v = Vec2(p2) - Vec2(p1)
+    length = v.magnitude
+    d = v.normalize()
+    n = Vec2(-d.y, d.x) * (t / 2)
+    cuts = sorted(openings)
+    pos = 0.0
+    pieces = []
+    for off, width in cuts:
+        pieces.append((pos, off))
+        pos = off + width
+    pieces.append((pos, length))
+    for a, b in pieces:
+        if b - a < 1:
+            continue
+        pts = [Vec2(p1) + d * a + n, Vec2(p1) + d * b + n, Vec2(p1) + d * b - n, Vec2(p1) + d * a - n]
+        msp.add_lwpolyline(pts, close=True, dxfattribs={"layer": layer})
+        if hatch:
+            h = msp.add_hatch(color=8, dxfattribs={"layer": "A-WALL-PAT"})
+            h.set_pattern_fill("ANSI31", color=8, scale=40)
+            h.paths.add_polyline_path([(p.x, p.y) for p in pts], is_closed=True)
+    # Door and window jambs.
+    for off, width in cuts:
+        for o in (off, off + width):
+            msp.add_line(Vec2(p1) + d * o + n, Vec2(p1) + d * o - n, dxfattribs={"layer": layer})
+
+
+# ------------------------------------------------------------- the house
+
+
+W, D = 10000, 8000  # outer size (centre lines of the outer walls)
+EXT, INT = 300, 150
+
+
+def house_layers(doc):
+    layer(doc, "A-WALL", 7, weight=50)
+    layer(doc, "A-WALL-PAT", 8, weight=9)
+    layer(doc, "A-DOOR", 3, weight=25)
+    layer(doc, "A-WIND", 5, weight=25)
+    layer(doc, "A-FURN", 9, weight=13)
+    layer(doc, "A-FIXT", 4, weight=18)
+    layer(doc, "A-GRID", 1, linetype="CENTER", weight=9)
+    layer(doc, "A-ANNO", 2, weight=18)
+    layer(doc, "A-DIMS", 3, weight=13)
+    layer(doc, "A-AREA", 6, weight=9)
+    layer(doc, "A-FLOR", 252, weight=9)
+    layer(doc, "A-SLAB", 254, weight=9)
+    layer(doc, "A-STAIR", 30, weight=18)
+    layer(doc, "A-SHEET", 7, weight=35)
+    layer(doc, "A-VPORT", 7, weight=9, plot=False)
+
+
+def house_plan(version, name):
+    doc = new(version)
+    house_layers(doc)
+    doc.ltscale = 50
+    text_style(doc, "ARCH-TEXT", "arial.ttf")
+    text_style(doc, "ARCH-TITLE", "times.ttf", width=1.0)
+    text_style(doc, "ARCH-NOTE", "arial.ttf", oblique=15, width=0.9)
+    dimstyle(doc, "PLAN50", 220, dimtxsty="ARCH-TEXT")
+    make_blocks(doc)
+    msp = doc.modelspace()
+
+    ow, od = W, D
+    # Floor slab, under the walls.
+    h = msp.add_hatch(color=254, dxfattribs={"layer": "A-SLAB"})
+    h.set_solid_fill(color=254)
+    h.paths.add_polyline_path([(0, 0), (ow, 0), (ow, od), (0, od)], is_closed=True)
+
+    # Outer walls with the front door and windows.
+    wall(msp, (0, 0), (ow, 0), EXT, [(1400, 1500), (3600, 900), (6200, 900), (8200, 1200)])
+    wall(msp, (ow, 0), (ow, od), EXT, [(1500, 1300), (4800, 1300)])
+    wall(msp, (ow, od), (0, od), EXT, [(1200, 1400), (3600, 1600), (6600, 1200)])
+    wall(msp, (0, od), (0, 0), EXT, [(1600, 1400), (5000, 1400)])
+    # Inner walls: a hall in the middle, a bathroom and two bedrooms.
+    wall(msp, (0, 4200), (6200, 4200), INT, [(600, 900), (2700, 900), (4800, 900)])
+    wall(msp, (6200, 0), (6200, 4200), INT, [(1700, 900)])
+    wall(msp, (6200, 4200), (6200, od), INT, [(6000 - 4200 + 300, 900)])
+    wall(msp, (3500, 0), (3500, 4200), INT, [(2400, 900)])
+    wall(msp, (6200, 4200), (ow, 4200), INT, [])
+    wall(msp, (8200, 4200), (8200, od), INT, [(1600, 900)])
+
+    # Doors: block, rotated and mirrored to swing the right way.
+    msp.add_blockref("DOOR", (1700, 150), dxfattribs={"layer": "A-DOOR", "rotation": 0}).add_auto_attribs({"TAG": "D-101"})
+    msp.add_blockref("DOOR", (6275, 1700), dxfattribs={"layer": "A-DOOR", "rotation": 90}).add_auto_attribs({"TAG": "D-102"})
+    msp.add_blockref("DOOR", (3575, 2400), dxfattribs={"layer": "A-DOOR", "rotation": 90}).add_auto_attribs({"TAG": "D-103"})
+    msp.add_blockref("DOOR", (700, 4275), dxfattribs={"layer": "A-DOOR", "rotation": 0, "yscale": -1.0}).add_auto_attribs({"TAG": "D-104"})
+    msp.add_blockref("DOOR", (2800, 4275), dxfattribs={"layer": "A-DOOR", "rotation": 0}).add_auto_attribs({"TAG": "D-105"})
+    msp.add_blockref("DOOR", (4900, 4275), dxfattribs={"layer": "A-DOOR", "rotation": 0, "yscale": -1.0}).add_auto_attribs({"TAG": "D-106"})
+    msp.add_blockref("DOOR", (8275, 5800), dxfattribs={"layer": "A-DOOR", "rotation": 90}).add_auto_attribs({"TAG": "D-107"})
+
+    # Windows: the unit block stretched over each opening and the wall's thickness.
+    def window(p, width, vertical, thick=EXT):
+        x, y = p
+        if vertical:
+            msp.add_blockref("WINDOW", (x + thick / 2, y), dxfattribs={"layer": "A-WIND", "xscale": width, "yscale": thick, "rotation": 90})
+        else:
+            msp.add_blockref("WINDOW", (x, y - thick / 2), dxfattribs={"layer": "A-WIND", "xscale": width, "yscale": thick})
+
+    for x, w in [(3600, 900), (6200, 900), (8200, 1200)]:
+        window((x, 0), w, False)
+    for y, w in [(4800, 1300)]:
+        window((ow, y), w, True)
+    for x, w in [(1200, 1400), (3600, 1600), (6600, 1200)]:
+        window((x, od), w, False)
+    for y, w in [(5000, 1400)]:
+        window((0, y), w, True)
+
+    # Furniture and fixtures.
+    msp.add_blockref("SOFA", (1200, 6900), dxfattribs={"layer": "A-FURN"})
+    msp.add_blockref("TABLE", (3900, 5300), dxfattribs={"layer": "A-FURN", "rotation": 0})
+    msp.add_blockref("BED", (4300, 400), dxfattribs={"layer": "A-FURN", "xscale": 1.0})
+    msp.add_blockref("BED", (500, 600), dxfattribs={"layer": "A-FURN", "rotation": 0, "xscale": 0.8, "yscale": 0.9})
+    msp.add_blockref("BATH", (7000 - 200, 300), dxfattribs={"layer": "A-FIXT"})
+    msp.add_blockref("WC", (8300, 3200), dxfattribs={"layer": "A-FIXT", "rotation": 90})
+    msp.add_blockref("SINK", (6500, 3350), dxfattribs={"layer": "A-FIXT"})
+
+    # A straight stair in the hall: treads, a walking line and the cut line.
+    sx, sy = 6400, 4400
+    for i in range(12):
+        msp.add_line((sx, sy + i * 280), (sx + 1000, sy + i * 280), dxfattribs={"layer": "A-STAIR"})
+    msp.add_lwpolyline([(sx, sy), (sx + 1000, sy), (sx + 1000, sy + 12 * 280), (sx, sy + 12 * 280)], close=True, dxfattribs={"layer": "A-STAIR"})
+    msp.add_lwpolyline([(sx + 500, sy + 100), (sx + 500, sy + 3300)], dxfattribs={"layer": "A-STAIR"})
+    msp.add_leader([(sx + 500, sy + 3300), (sx + 420, sy + 3000), (sx + 580, sy + 3000)], dxfattribs={"layer": "A-STAIR"})
+    msp.add_text("UP", height=150, dxfattribs={"layer": "A-STAIR", "style": "ARCH-TEXT"}).set_placement((sx + 550, sy + 200))
+
+    # Axes and bubbles.
+    for i, x in enumerate((0, 3500, 6200, ow)):
+        msp.add_line((x, -1700), (x, od + 1200), dxfattribs={"layer": "A-GRID"})
+        msp.add_blockref("AXIS", (x, -2000), dxfattribs={"layer": "A-GRID"}).add_auto_attribs({"ID": str(i + 1)})
+    for i, y in enumerate((0, 4200, od)):
+        msp.add_line((-1700, y), (ow + 1200, y), dxfattribs={"layer": "A-GRID"})
+        msp.add_blockref("AXIS", (-2000, y), dxfattribs={"layer": "A-GRID"}).add_auto_attribs({"ID": "ABC"[i]})
+
+    # Room names and areas.
+    rooms = [("Bedroom 1", (1750, 2100), 3.5 * 4.2), ("Bedroom 2", (4850, 2100), 2.7 * 4.2), ("Bath", (7500, 2100), 3.8 * 4.2),
+             ("Living room", (3100, 6100), 6.2 * 3.8), ("Kitchen", (7150, 6100), 3.8 * 3.8), ("Hall", (1500, 4650), 0.0)]
+    for label, (x, y), area in rooms:
+        t = r"\fArial|b1;" + label.upper() + (r"\P\fArial|b0;" + f"{area:.1f} m²" if area else "")
+        m = msp.add_mtext(t, dxfattribs={"layer": "A-AREA", "style": "ARCH-TEXT", "char_height": 260, "attachment_point": 5})
+        m.set_location((x, y))
+        m.dxf.width = 2600
+
+    # Dimensions.
+    msp.add_linear_dim(base=(0, -3100), p1=(0, 0), p2=(ow, 0), dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(0, -2600), p1=(0, 0), p2=(3500, 0), dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(0, -2600), p1=(3500, 0), p2=(6200, 0), dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(0, -2600), p1=(6200, 0), p2=(ow, 0), dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(-3100, 0), p1=(0, 0), p2=(0, od), angle=90, dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(-2600, 0), p1=(0, 0), p2=(0, 4200), angle=90, dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(-2600, 0), p1=(0, 4200), p2=(0, od), angle=90, dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    # A boundary fence beside the house: an aligned dimension and an angle against the house's wall.
+    msp.add_lwpolyline([(ow + 1500, 500), (ow + 4500, 3500)], dxfattribs={"layer": "A-WALL", "linetype": "DASHED"})
+    msp.add_aligned_dim(p1=(ow + 1500, 500), p2=(ow + 4500, 3500), distance=-700, dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_line((ow + 1500, 500), (ow + 4500, 500), dxfattribs={"layer": "A-GRID"})
+    msp.add_angular_dim_2l(base=(ow + 2300, 700), line1=((ow + 1500, 500), (ow + 4500, 3500)), line2=((ow + 1500, 500), (ow + 4500, 500)), dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_radius_dim(center=(6275, 1700), radius=900, angle=45, dimstyle="PLAN50", dxfattribs={"layer": "A-DIMS"}).render()
+
+    # North arrow, level marks, title text.
+    msp.add_blockref("NORTH", (ow + 2200, od + 700), dxfattribs={"layer": "A-ANNO", "xscale": 1.0})
+    msp.add_blockref("LEVEL", (5000, 3400), dxfattribs={"layer": "A-ANNO"}).add_auto_attribs({"H": "±0.00"})
+    t = msp.add_text("GROUND FLOOR PLAN  1:50", height=330, dxfattribs={"layer": "A-ANNO", "style": "ARCH-TITLE"})
+    t.set_placement((0, -4700))
+    msp.add_line((0, -4900), (4500, -4900), dxfattribs={"layer": "A-ANNO", "lineweight": 70})
+    msp.add_text("Drawn for the exav demo. Dimensions in millimetres.", height=130, dxfattribs={"layer": "A-ANNO", "style": "ARCH-NOTE"}).set_placement((0, -5200))
+
+    # A sheet in paper space: title block, a viewport on the plan.
+    lay = doc.layouts.new("A3 Plan")
+    lay.page_setup(size=(420, 297), margins=(10, 10, 10, 10), units="mm")
+    rect(lay, 10, 10, 410, 287, layer="A-SHEET")
+    rect(lay, 5, 5, 415, 292, layer="A-SHEET")
+    rect(lay, 260, 10, 410, 60, layer="A-SHEET")
+    lay.add_line((260, 35), (410, 35), dxfattribs={"layer": "A-SHEET"})
+    lay.add_line((335, 10), (335, 35), dxfattribs={"layer": "A-SHEET"})
+    lay.add_text("HOUSE, GROUND FLOOR", height=7, dxfattribs={"layer": "A-SHEET", "style": "ARCH-TITLE"}).set_placement((265, 45))
+    lay.add_text("Scale 1:50", height=4, dxfattribs={"layer": "A-SHEET", "style": "ARCH-TEXT"}).set_placement((265, 18))
+    lay.add_text("Sheet A-101", height=4, dxfattribs={"layer": "A-SHEET", "style": "ARCH-TEXT"}).set_placement((340, 18))
+    vp = lay.add_viewport(center=(135, 160), size=(250, 200), view_center_point=(ow / 2, od / 2 - 600), view_height=200 * 50, status=1)
+    vp.dxf.layer = "A-VPORT"
+    vp.dxf.flags |= 0
+    save(doc, name)
+
+
+# ------------------------------------------------------------ elevations
+
+
+def window_elev(msp, x, y, w, h, layer="A-WIND"):
+    rect(msp, x, y, x + w, y + h, layer=layer)
+    rect(msp, x + 60, y + 60, x + w - 60, y + h - 60, layer=layer)
+    msp.add_line((x + w / 2, y + 60), (x + w / 2, y + h - 60), dxfattribs={"layer": layer})
+    hh = msp.add_hatch(color=5, dxfattribs={"layer": layer, "transparency": colors.float2transparency(0.6)})
+    hh.set_solid_fill(color=5)
+    hh.paths.add_polyline_path([(x + 60, y + 60), (x + w - 60, y + 60), (x + w - 60, y + h - 60), (x + 60, y + h - 60)], is_closed=True)
+    rect(msp, x - 80, y - 90, x + w + 80, y, layer=layer)
+
+
+def elevation(msp, ox, oy, name, width, windows, door, label):
+    """A gabled house front: ground, walls, roof, windows, door, levels."""
+    wall_h, ridge = 5400, 8300
+    layer_ = "E-WALL"
+    # Ground and its hatch.
+    msp.add_lwpolyline([(ox - 1500, oy), (ox + width + 1500, oy)], dxfattribs={"layer": "E-GROUND", "lineweight": 70})
+    hh = msp.add_hatch(color=3, dxfattribs={"layer": "E-GROUND"})
+    hh.set_pattern_fill("EARTH", color=3, scale=60)
+    hh.paths.add_polyline_path([(ox - 1500, oy - 600), (ox + width + 1500, oy - 600), (ox + width + 1500, oy), (ox - 1500, oy)], is_closed=True)
+    # Walls with a render hatch, plinth, roof.
+    rect(msp, ox, oy, ox + width, oy + wall_h, layer=layer_)
+    hw = msp.add_hatch(color=252, dxfattribs={"layer": "E-RENDER"})
+    hw.set_pattern_fill("AR-SAND", color=8, scale=15)
+    hw.paths.add_polyline_path([(ox, oy), (ox + width, oy), (ox + width, oy + wall_h), (ox, oy + wall_h)], is_closed=True)
+    rect(msp, ox, oy, ox + width, oy + 450, layer="E-PLINTH")
+    roof = [(ox - 450, oy + wall_h), (ox + width / 2, oy + ridge), (ox + width + 450, oy + wall_h)]
+    msp.add_lwpolyline(roof, close=True, dxfattribs={"layer": "E-ROOF", "lineweight": 50})
+    hr = msp.add_hatch(color=1, dxfattribs={"layer": "E-ROOF"})
+    hr.set_pattern_fill("AR-RROOF", color=1, scale=60)
+    hr.paths.add_polyline_path(roof, is_closed=True)
+    # A floor line at 2700.
+    msp.add_line((ox, oy + 2700), (ox + width, oy + 2700), dxfattribs={"layer": "E-FLOOR", "linetype": "DASHDOT"})
+    for wx, wy, w, h in windows:
+        window_elev(msp, ox + wx, oy + wy, w, h)
+    if door:
+        dx, dw, dh = door
+        rect(msp, ox + dx, oy, ox + dx + dw, oy + dh, layer="E-DOOR")
+        rect(msp, ox + dx + 100, oy + 100, ox + dx + dw - 100, oy + dh - 100, layer="E-DOOR")
+        msp.add_circle((ox + dx + dw - 200, oy + 1000), 40, dxfattribs={"layer": "E-DOOR"})
+        for i in range(3):
+            rect(msp, ox + dx - 150 - i * 120, oy + 450 - 150 * i - 150, ox + dx + dw + 150 + i * 120, oy + 450 - 150 * i, layer="E-STEP")
+    # Levels and heights.
+    for lv, txt in [(0, "+0.00"), (2700, "+2.70"), (wall_h, "+5.40"), (ridge, "+8.30")]:
+        b = msp.add_blockref("LEVEL", (ox + width + 1900, oy + lv), dxfattribs={"layer": "A-ANNO"})
+        b.add_auto_attribs({"H": txt})
+        msp.add_line((ox + width, oy + lv), (ox + width + 1900, oy + lv), dxfattribs={"layer": "A-ANNO", "linetype": "DASHED"})
+    msp.add_linear_dim(base=(ox - 1900, oy), p1=(ox, oy), p2=(ox, oy + wall_h), angle=90, dimstyle="ELEV50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(ox - 1900, oy), p1=(ox, oy + wall_h), p2=(ox, oy + ridge), angle=90, dimstyle="ELEV50", dxfattribs={"layer": "A-DIMS"}).render()
+    msp.add_linear_dim(base=(ox, oy - 1100), p1=(ox, oy), p2=(ox + width, oy), dimstyle="ELEV50", dxfattribs={"layer": "A-DIMS"}).render()
+    t = msp.add_text(label, height=300, dxfattribs={"layer": "A-ANNO", "style": "ARCH-TITLE"})
+    t.set_placement((ox, oy - 2100))
+    msp.add_line((ox, oy - 2250), (ox + 3600, oy - 2250), dxfattribs={"layer": "A-ANNO", "lineweight": 70})
+
+
+def house_elevations():
+    doc = new("R2018")
+    for n, c, lt, w in [("E-GROUND", 3, "Continuous", 50), ("E-WALL", 7, "Continuous", 35), ("E-RENDER", 8, "Continuous", 9),
+                        ("E-PLINTH", 8, "Continuous", 25), ("E-ROOF", 1, "Continuous", 35), ("E-FLOOR", 9, "DASHDOT", 9),
+                        ("E-DOOR", 30, "Continuous", 25), ("E-STEP", 8, "Continuous", 18), ("A-WIND", 5, "Continuous", 25),
+                        ("A-ANNO", 2, "Continuous", 18), ("A-DIMS", 3, "Continuous", 13), ("A-FIXT", 4, "Continuous", 18)]:
+        layer(doc, n, c, lt, w)
+    doc.ltscale = 80
+    text_style(doc, "ARCH-TEXT", "arial.ttf")
+    text_style(doc, "ARCH-TITLE", "times.ttf")
+    dimstyle(doc, "ELEV50", 160, dimtxsty="ARCH-TEXT")
+    make_blocks(doc)
+    msp = doc.modelspace()
+    # South (the front, with the door), east, north, west; widths 10000, 8000, 10000, 8000.
+    south = ([(3600, 1100, 900, 1300), (6200, 1100, 900, 1300), (8200, 1100, 1200, 1300), (800, 3400, 1000, 1400), (3600, 3400, 900, 1400), (6200, 3400, 900, 1400)], (1400, 1500, 2300))
+    east = ([(1500, 1100, 1300, 1300), (4800, 1100, 1300, 1300), (1500, 3400, 1300, 1400), (4800, 3400, 1300, 1400)], None)
+    north = ([(1200, 1100, 1400, 1300), (3600, 1100, 1600, 1300), (6600, 1100, 1200, 1300), (3600, 3400, 1600, 1400)], None)
+    west = ([(1600, 1100, 1400, 1300), (5000, 1100, 1400, 1300), (3000, 3400, 1200, 1400)], None)
+    elevation(msp, 0, 0, "south", 10000, *south, "SOUTH ELEVATION  1:50")
+    elevation(msp, 16000, 0, "east", 8000, *east, "EAST ELEVATION  1:50")
+    elevation(msp, 0, -17000, "north", 10000, *north, "NORTH ELEVATION  1:50")
+    elevation(msp, 16000, -17000, "west", 8000, *west, "WEST ELEVATION  1:50")
+    # A section: floors, walls, roof, stair opening, hatched cuts.
+    ox, oy = 32000, 0
+    for (x0, x1) in [(ox, ox + 300), (ox + 9700, ox + 10000)]:
+        rect(msp, x0, oy, x1, oy + 5400, layer="E-WALL")
+        hh = msp.add_hatch(color=8, dxfattribs={"layer": "E-WALL"})
+        hh.set_pattern_fill("ANSI31", color=8, scale=60)
+        hh.paths.add_polyline_path([(x0, oy), (x1, oy), (x1, oy + 5400), (x0, oy + 5400)], is_closed=True)
+    for y in (0, 2700, 5100):
+        rect(msp, ox, oy + y - 100 if y else oy - 300, ox + 10000, oy + y + (200 if y else 0), layer="E-WALL")
+    sec = [(ox - 450, oy + 5400), (ox + 5000, oy + 8300), (ox + 10450, oy + 5400), (ox + 10450, oy + 5250), (ox + 5000, oy + 8150), (ox - 450, oy + 5250)]
+    msp.add_lwpolyline(sec, close=True, dxfattribs={"layer": "E-ROOF", "lineweight": 50})
+    hr = msp.add_hatch(color=1, dxfattribs={"layer": "E-ROOF"})
+    hr.set_solid_fill(color=1)
+    hr.paths.add_polyline_path(sec, is_closed=True)
+    msp.add_lwpolyline([(ox - 1500, oy - 300), (ox + 11500, oy - 300)], dxfattribs={"layer": "E-GROUND", "lineweight": 70})
+    for i in range(10):
+        msp.add_line((ox + 6300 + i * 300, oy + i * 270), (ox + 6600 + i * 300, oy + i * 270), dxfattribs={"layer": "E-STEP"})
+        msp.add_line((ox + 6600 + i * 300, oy + i * 270), (ox + 6600 + i * 300, oy + (i + 1) * 270), dxfattribs={"layer": "E-STEP"})
+    t = msp.add_text("SECTION A-A  1:50", height=300, dxfattribs={"layer": "A-ANNO", "style": "ARCH-TITLE"})
+    t.set_placement((ox, oy - 2100))
+    save(doc, "house-elevations.dxf")
+
+
+# ---------------------------------------------------------- hatch gallery
+
+
+def hatch_gallery():
+    doc = new("R2018")
+    layer(doc, "PATTERNS", 7)
+    layer(doc, "GRADIENTS", 5)
+    layer(doc, "ISLANDS", 1)
+    layer(doc, "EDGES", 3)
+    layer(doc, "LABELS", 2)
+    text_style(doc, "LABEL", "arial.ttf")
+    msp = doc.modelspace()
+    names = [n for n in pattern.load() if n.startswith(("ANSI", "AR-", "BRICK", "CLAY", "CORK", "CROSS", "DOTS", "EARTH", "GRASS", "GRAVEL", "HEX", "HONEY", "LINE", "NET", "SQUARE", "STEEL", "STARS", "TRIANG", "ZIGZAG", "ESCHER", "DOLMIT", "SWAMP", "INSUL", "MUDST", "PLAST", "BOX", "BRASS", "CONCRETE"))]
+    cols = 8
+    size, gap = 100, 40
+    for i, name in enumerate(names):
+        cx, cy = (i % cols) * (size + gap), -(i // cols) * (size + gap + 25)
+        h = msp.add_hatch(color=7, dxfattribs={"layer": "PATTERNS"})
+        h.set_pattern_fill(name, color=7, scale=1.0)
+        h.paths.add_polyline_path([(cx, cy), (cx + size, cy), (cx + size, cy + size), (cx, cy + size)], is_closed=True)
+        rect(msp, cx, cy, cx + size, cy + size, layer="PATTERNS", color=8)
+        msp.add_text(name, height=9, dxfattribs={"layer": "LABELS", "style": "LABEL"}).set_placement((cx, cy - 14))
+    y0 = -(len(names) // cols + 1) * (size + gap + 25) - 100
+    # Gradients.
+    kinds = ["LINEAR", "CYLINDER", "INVCYLINDER", "SPHERICAL", "INVSPHERICAL", "HEMISPHERICAL", "INVHEMISPHERICAL", "CURVED", "INVCURVED"]
+    for i, k in enumerate(kinds):
+        cx = (i % cols) * (size + gap)
+        cy = y0 - (i // cols) * (size + gap + 25)
+        h = msp.add_hatch(dxfattribs={"layer": "GRADIENTS"})
+        h.set_gradient((255, 220, 80), (20, 60, 140), rotation=30 if i % 2 else 0, name=k)
+        h.paths.add_polyline_path([(cx, cy), (cx + size, cy), (cx + size, cy + size), (cx, cy + size)], is_closed=True)
+        msp.add_text(k.lower(), height=9, dxfattribs={"layer": "LABELS", "style": "LABEL"}).set_placement((cx, cy - 14))
+    y1 = y0 - 2 * (size + gap + 25) - 100
+    # Islands: an outer square with a circle and a triangle inside, the three hatch styles.
+    for i, (style, label) in enumerate([(0, "normal: nested islands"), (1, "outer only"), (2, "ignore: all filled")]):
+        cx, cy = i * (size * 2 + gap), y1
+        h = msp.add_hatch(color=1, dxfattribs={"layer": "ISLANDS", "hatch_style": style})
+        h.set_pattern_fill("ANSI31", color=1, scale=1.4)
+        h.paths.add_polyline_path([(cx, cy), (cx + 2 * size, cy), (cx + 2 * size, cy + 2 * size), (cx, cy + 2 * size)], is_closed=True, flags=1 | 16)
+        ep = h.paths.add_edge_path(flags=16)
+        ep.add_arc((cx + size, cy + size), 70, 0, 360, ccw=True)
+        h.paths.add_polyline_path([(cx + size - 25, cy + size - 20), (cx + size + 25, cy + size - 20), (cx + size, cy + size + 28)], is_closed=True, flags=16)
+        msp.add_text(label, height=9, dxfattribs={"layer": "LABELS", "style": "LABEL"}).set_placement((cx, cy - 14))
+    # A boundary of line, arc, ellipse and spline edges.
+    cx, cy = 3 * (size * 2 + gap), y1
+    h = msp.add_hatch(color=3, dxfattribs={"layer": "EDGES"})
+    h.set_pattern_fill("HONEY", color=3, scale=1.0)
+    ep = h.paths.add_edge_path(flags=1)
+    ep.add_line((cx, cy), (cx + 160, cy))
+    ep.add_arc((cx + 160, cy + 40), 40, 270, 90, ccw=True)
+    ep.add_line((cx + 160, cy + 80), (cx + 120, cy + 80))
+    ep.add_spline([(cx + 120, cy + 80), (cx + 100, cy + 140), (cx + 60, cy + 40), (cx + 40, cy + 120), (cx, cy + 100)], degree=3)
+    ep.add_line((cx, cy + 100), (cx, cy))
+    msp.add_text("edges: line, arc, spline", height=9, dxfattribs={"layer": "LABELS", "style": "LABEL"}).set_placement((cx, cy - 14))
+    cx = 3 * (size * 2 + gap) + 220
+    h = msp.add_hatch(color=6, dxfattribs={"layer": "EDGES"})
+    h.set_solid_fill(color=6)
+    ep = h.paths.add_edge_path(flags=1)
+    ep.add_ellipse((cx + 70, cy + 70), major_axis=(70, 0), ratio=0.55, start_angle=0, end_angle=360, ccw=True)
+    msp.add_text("ellipse, solid", height=9, dxfattribs={"layer": "LABELS", "style": "LABEL"}).set_placement((cx, cy - 14))
+    # A pattern with its own angle and scale, and one with a seed point and a user-defined pattern.
+    cx = 3 * (size * 2 + gap) + 400
+    h = msp.add_hatch(color=2, dxfattribs={"layer": "EDGES"})
+    h.set_pattern_fill("ANSI37", color=2, angle=15, scale=2.5)
+    h.paths.add_polyline_path([(cx, cy), (cx + 140, cy), (cx + 140, cy + 140), (cx, cy + 140)], is_closed=True)
+    msp.add_text("angle 15, scale 2.5", height=9, dxfattribs={"layer": "LABELS", "style": "LABEL"}).set_placement((cx, cy - 14))
+    save(doc, "hatch-gallery.dxf")
+
+
+# -------------------------------------------------------------- dimensions
+
+
+def dimensions():
+    doc = new("R2018")
+    layer(doc, "OBJECT", 7, weight=35)
+    layer(doc, "DIMS", 3, weight=13)
+    layer(doc, "NOTE", 2, weight=13)
+    text_style(doc, "DIM-TEXT", "arial.ttf")
+    dimstyle(doc, "METRIC", 3.5, dimtxsty="DIM-TEXT", dimdec=1)
+    dimstyle(doc, "TOL", 3.5, dimtxsty="DIM-TEXT", dimdec=2, dimtol=1, dimtp=0.05, dimtm=0.02, dimtfac=0.7, dimtolj=1)
+    dimstyle(doc, "ARCH", 3.5, dimtxsty="DIM-TEXT", dimdec=0, dimtad=0, dimtih=1, dimtix=0, dimscale=1.0)
+    msp = doc.modelspace()
+    A = {"layer": "DIMS"}
+    rect(msp, 0, 0, 80, 50, layer="OBJECT")
+    msp.add_linear_dim(base=(0, -12), p1=(0, 0), p2=(80, 0), dimstyle="METRIC", dxfattribs=A).render()
+    msp.add_linear_dim(base=(-14, 0), p1=(0, 0), p2=(0, 50), angle=90, dimstyle="METRIC", dxfattribs=A).render()
+    msp.add_linear_dim(base=(0, 62), p1=(0, 50), p2=(80, 50), dimstyle="TOL", dxfattribs=A, text="<>").render()
+    msp.add_linear_dim(base=(0, 70), p1=(0, 50), p2=(80, 50), dimstyle="METRIC", dxfattribs=A, text="80 overall (text override)").render()
+    msp.add_aligned_dim(p1=(80, 0), p2=(110, 50), distance=12, dimstyle="METRIC", dxfattribs=A).render()
+    # Circles and arcs.
+    msp.add_circle((150, 25), 25, dxfattribs={"layer": "OBJECT"})
+    msp.add_diameter_dim(center=(150, 25), radius=25, angle=40, dimstyle="METRIC", dxfattribs=A).render()
+    msp.add_circle((220, 25), 18, dxfattribs={"layer": "OBJECT"})
+    msp.add_radius_dim(center=(220, 25), radius=18, angle=-60, dimstyle="METRIC", dxfattribs=A).render()
+    msp.add_arc((290, 0), 40, 20, 140, dxfattribs={"layer": "OBJECT"})
+    msp.add_arc_dim_3p(base=(290 + 48 * math.cos(math.radians(80)), 48 * math.sin(math.radians(80))), center=(290, 0), p1=(290 + 40 * math.cos(math.radians(20)), 40 * math.sin(math.radians(20))), p2=(290 + 40 * math.cos(math.radians(140)), 40 * math.sin(math.radians(140))), dimstyle="METRIC", dxfattribs=A).render()
+    # Angles.
+    msp.add_line((0, -60), (60, -60), dxfattribs={"layer": "OBJECT"})
+    msp.add_line((0, -60), (45, -20), dxfattribs={"layer": "OBJECT"})
+    msp.add_angular_dim_2l(base=(30, -56), line1=((0, -60), (60, -60)), line2=((0, -60), (45, -20)), dimstyle="METRIC", dxfattribs=A).render()
+    msp.add_angular_dim_3p(base=(140, -60), center=(130, -80), p1=(150, -45), p2=(170, -80), dimstyle="METRIC", dxfattribs=A).render()
+    msp.add_line((130, -80), (170, -80), dxfattribs={"layer": "OBJECT"})
+    msp.add_line((130, -80), (150, -45), dxfattribs={"layer": "OBJECT"})
+    # Ordinate dimensions from an origin.
+    msp.add_lwpolyline([(220, -90), (320, -90), (320, -40), (260, -40), (260, -60), (220, -60)], close=True, dxfattribs={"layer": "OBJECT"})
+    for x in (220, 260, 320):
+        msp.add_ordinate_x_dim(feature_location=(x, -90), offset=(0, -12), origin=(220, -90), dimstyle="METRIC", dxfattribs=A).render()
+    for y in (-90, -60, -40):
+        msp.add_ordinate_y_dim(feature_location=(320, y), offset=(14, 0), origin=(220, -90), dimstyle="METRIC", dxfattribs=A).render()
+    # Leaders and multileaders.
+    ml = msp.add_multileader_mtext("Standard")
+    ml.set_content("Chamfer 2 x 45°", char_height=3.5)
+    ml.add_leader_line(ConnectionSide.left, [Vec2(75, 45)])
+    ml.build(insert=Vec2(100, 85))
+    msp.add_leader([(15, 15), (30, 30), (40, 30)], dimstyle="METRIC", dxfattribs={"layer": "NOTE"})
+    msp.add_text("hole 5", height=3.5, dxfattribs={"layer": "NOTE", "style": "DIM-TEXT"}).set_placement((41, 29))
+    # Styles shown side by side.
+    msp.add_text("METRIC style (left), TOL style with tolerances, ARCH (text horizontal)", height=4, dxfattribs={"layer": "NOTE", "style": "DIM-TEXT"}).set_placement((0, 110))
+    rect(msp, 0, -160, 60, -130, layer="OBJECT")
+    msp.add_linear_dim(base=(0, -168), p1=(0, -160), p2=(60, -160), dimstyle="ARCH", dxfattribs=A).render()
+    msp.add_linear_dim(base=(0, -178), p1=(0, -160), p2=(60, -160), dimstyle="TOL", dxfattribs=A).render()
+    save(doc, "dimensions.dxf")
+
+
+# --------------------------------------------------------------- linetypes
+
+
+def linetypes():
+    doc = new("R2018")
+    doc.ltscale = 1.0
+    text_style(doc, "LT-TEXT", "arial.ttf")
+    # Custom linetypes: simple, with text and with a shape-like arrow.
+    doc.linetypes.add("EXAV_DASH3", pattern=[10.0, 6.0, -3.0, 0.0, -3.0, 0.0, -3.0], description="Dash and three dots")
+    doc.linetypes.add("GAS_LINE", pattern='A,5,-2,["GAS",LT-TEXT,S=1.5,U=0.0,X=-1.0,Y=-0.75],-4', description="Gas line ---- GAS ----")
+    doc.linetypes.add("HOT_WATER", pattern='A,6,-1.5,["HW",LT-TEXT,S=1.5,R=0.0,X=-1.0,Y=-0.75],-3', description="Hot water ---- HW ----")
+    doc.linetypes.add("FENCE", pattern='A,4,-2,["x",LT-TEXT,S=1.4,U=0.0,X=-0.5,Y=-0.7],-2', description="Fence ---- x ----")
+    msp = doc.modelspace()
+    names = ["Continuous", "DASHED", "DASHED2", "DASHEDX2", "HIDDEN" if "HIDDEN" in doc.linetypes else "DASHED", "CENTER", "CENTER2", "CENTERX2", "PHANTOM", "PHANTOM2", "DASHDOT", "DASHDOT2", "DOT", "DOT2", "DIVIDE", "DIVIDE2", "EXAV_DASH3", "GAS_LINE", "HOT_WATER", "FENCE"]
+    y = 0
+    for i, n in enumerate(names):
+        layer(doc, f"LT-{i:02d}", (i % 7) + 1, linetype=n, weight=25)
+        msp.add_line((0, y), (220, y), dxfattribs={"layer": f"LT-{i:02d}", "linetype": "BYLAYER"})
+        msp.add_text(n, height=3, dxfattribs={"style": "LT-TEXT", "color": 7}).set_placement((230, y - 1))
+        y -= 8
+    y -= 6
+    # Line weights.
+    msp.add_text("Line weights (mm)", height=4, dxfattribs={"style": "LT-TEXT", "color": 7}).set_placement((0, y + 6))
+    for i, w in enumerate([0, 5, 9, 13, 18, 25, 35, 50, 70, 100, 140, 200]):
+        msp.add_line((0, y), (220, y), dxfattribs={"lineweight": w, "color": 7})
+        msp.add_text(f"{w / 100:.2f}", height=3, dxfattribs={"style": "LT-TEXT", "color": 7}).set_placement((230, y - 1))
+        y -= 5
+    y -= 10
+    # Per-entity linetype scale and BYBLOCK.
+    for i, s in enumerate([0.25, 0.5, 1, 2, 4]):
+        msp.add_line((0, y), (220, y), dxfattribs={"linetype": "DASHED", "ltscale": s, "color": 4})
+        msp.add_text(f"DASHED, ltscale {s}", height=3, dxfattribs={"style": "LT-TEXT", "color": 7}).set_placement((230, y - 1))
+        y -= 6
+    y -= 8
+    # Polylines: linetype generation on and off, wide segments.
+    pts = [(0, y), (40, y - 12), (80, y), (120, y - 12), (160, y), (200, y - 12)]
+    for gen in (True, False):
+        p = msp.add_lwpolyline(pts, dxfattribs={"linetype": "PHANTOM", "color": 1 if gen else 3})
+        p.dxf.flags = 128 if gen else 0
+        msp.add_text(f"lwpolyline, linetype generation {'on' if gen else 'off'}", height=3, dxfattribs={"style": "LT-TEXT", "color": 7}).set_placement((230, y - 1))
+        pts = [(a, b - 25) for a, b in pts]
+        y -= 25
+    y -= 6
+    msp.add_lwpolyline([(0, y, 0, 6, 0), (50, y, 6, 1, 0), (100, y - 15, 1, 6, 0), (150, y, 6, 6, 0), (200, y - 8, 0, 0, 0)], format="xyseb", dxfattribs={"color": 6})
+    msp.add_text("lwpolyline with start and end widths per segment", height=3, dxfattribs={"style": "LT-TEXT", "color": 7}).set_placement((230, y - 1))
+    y -= 30
+    msp.add_circle((30, y), 15, dxfattribs={"linetype": "CENTER", "color": 1, "lineweight": 35})
+    msp.add_arc((90, y), 15, 30, 300, dxfattribs={"linetype": "HIDDEN" if "HIDDEN" in doc.linetypes else "DASHED", "color": 3})
+    msp.add_ellipse((150, y), major_axis=(25, 0), ratio=0.5, dxfattribs={"linetype": "PHANTOM", "color": 5})
+    msp.add_spline([(190, y - 10), (200, y + 12), (215, y - 14), (225, y + 10)], dxfattribs={"linetype": "DASHDOT", "color": 6})
+    save(doc, "linetypes.dxf")
+
+
+# ------------------------------------------------------------- text styles
+
+
+def text_styles():
+    doc = new("R2018")
+    layer(doc, "TEXT", 7)
+    layer(doc, "NOTE", 8)
+    fonts = [("S-ARIAL", "arial.ttf", {}), ("S-TIMES", "times.ttf", {}), ("S-COURIER", "cour.ttf", {}), ("S-NARROW", "arial.ttf", {"width": 0.6}),
+             ("S-WIDE", "arial.ttf", {"width": 1.6}), ("S-SLANT", "times.ttf", {"oblique": 20}), ("S-ROMANS", "romans.shx", {}), ("S-SIMPLEX", "simplex.shx", {}),
+             ("S-BACKWARDS", "arial.ttf", {}), ("S-UPSIDE", "arial.ttf", {})]
+    for n, f, kw in fonts:
+        st = text_style(doc, n, f, **kw)
+    doc.styles.get("S-BACKWARDS").dxf.flags |= 2
+    doc.styles.get("S-UPSIDE").dxf.flags |= 4
+    msp = doc.modelspace()
+    y = 0
+    sample = "Sphinx of black quartz, judge my vow 0123456789"
+    for n, f, kw in fonts:
+        msp.add_text(f"{n} ({f}): {sample}", height=6, dxfattribs={"style": n, "layer": "TEXT"}).set_placement((0, y))
+        y -= 12
+    y -= 6
+    for i, (halign, name) in enumerate([(TextEntityAlignment.TOP_LEFT, "TOP_LEFT"), (TextEntityAlignment.MIDDLE_CENTER, "MIDDLE_CENTER"), (TextEntityAlignment.BOTTOM_RIGHT, "BOTTOM_RIGHT"), (TextEntityAlignment.ALIGNED, "ALIGNED"), (TextEntityAlignment.FIT, "FIT")]):
+        x = 20 + i * 130
+        msp.add_line((x - 5, y), (x + 5, y), dxfattribs={"color": 1})
+        msp.add_line((x, y - 5), (x, y + 5), dxfattribs={"color": 1})
+        t = msp.add_text(name, height=6, dxfattribs={"style": "S-ARIAL", "layer": "TEXT"})
+        if halign in (TextEntityAlignment.ALIGNED, TextEntityAlignment.FIT):
+            t.set_placement((x, y), (x + 70, y), align=halign)
+        else:
+            t.set_placement((x, y), align=halign)
+    y -= 24
+    for angle in (0, 30, 60, 90):
+        msp.add_text(f"rotated {angle} degrees", height=6, rotation=angle, dxfattribs={"style": "S-TIMES", "layer": "TEXT"}).set_placement((20 + angle * 1.5, y))
+    y -= 70
+    msp.add_text("Special: %%d degree 45%%d, %%p plus/minus 0.5, %%c diameter 25, %%%% percent, %%u under%%u, %%o over%%o", height=5, dxfattribs={"style": "S-ARIAL", "layer": "TEXT"}).set_placement((0, y))
+    y -= 10
+    msp.add_text("Unicode: éèê üöä ß ñ ΔΩπ Жя € ½ ²³", height=5, dxfattribs={"style": "S-ARIAL", "layer": "TEXT"}).set_placement((0, y))
+    y -= 20
+    # MTEXT formatting.
+    def mt(text, x, yy, w=110, h=4, **kw):
+        m = msp.add_mtext(text, dxfattribs={"style": "S-ARIAL", "char_height": h, "layer": "TEXT", **kw})
+        m.set_location((x, yy))
+        m.dxf.width = w
+        return m
+    mt(r"{\C1;Red}, {\C3;green}, {\C5;blue} and {\c16744192;orange by RGB}.\P"
+       r"{\fTimes New Roman|b1;Bold serif}, {\fArial|i1;italic sans}, {\fCourier New|b1|i1;bold italic mono}.\P"
+       r"Underline \Lis on\l, overline \Ois on\o, \Kstrike-through\k.\P"
+       r"Height \H2x;doubles\H1x; and returns; width \W2;wide\W1; and back; slant \Q20;oblique\Q0;.\P"
+       r"Stacked: \S1/2; \S1#2; \S1^2; \S\U+00B1 0.1^ -0.1; and x\S2^;, H\S2^ ;.\P"
+       r"Tab\Pstops: A\tB\tC", 0, y, 120)
+    mt(r"{\L\C2;Paragraph 1}\PA justified-looking paragraph with a long text that wraps inside the box of the entity, "
+       r"set at width 90, to see how line breaks are made by the viewer.", 130, y, 90, 4.2)
+    m = mt("Background box, with a border in the text colour: the viewer fills the box behind the text.", 230, y, 70, 4.2)
+    m.set_bg_color((255, 235, 140), scale=1.5)
+    y -= 70
+    cols = msp.add_mtext_static_columns(["Column one text, a short paragraph that sits at the left.", "Column two: more text, in the middle.", "Column three at the right."], width=40, gutter_width=6, height=40, dxfattribs={"style": "S-ARIAL", "char_height": 3.5, "layer": "TEXT"})
+    cols.set_location((0, y))
+    msp.add_text("MTEXT in three static columns", height=3, dxfattribs={"layer": "NOTE", "style": "S-ARIAL"}).set_placement((0, y - 44))
+    for i, ap in enumerate(range(1, 10)):
+        m = msp.add_mtext(f"AP {ap}", dxfattribs={"style": "S-ARIAL", "char_height": 4, "layer": "TEXT", "attachment_point": ap})
+        m.set_location((150 + (i % 3) * 40, y - (i // 3) * 14))
+        m.dxf.width = 30
+        msp.add_circle((150 + (i % 3) * 40, y - (i // 3) * 14), 0.8, dxfattribs={"color": 1})
+    save(doc, "text-styles.dxf")
+
+
+# ------------------------------------------------------------------ blocks
+
+
+def blocks():
+    doc = new("R2018")
+    layer(doc, "PARTS", 7)
+    layer(doc, "NOTE", 8)
+    layer(doc, "RED", 1)
+    text_style(doc, "BL-TEXT", "arial.ttf")
+    msp = doc.modelspace()
+    # A bolt: cap, shank and a thread hatch.
+    bolt = doc.blocks.new("BOLT")
+    bolt.add_lwpolyline([(-6, 0), (6, 0), (6, 4), (-6, 4)], close=True)
+    bolt.add_lwpolyline([(-3, 0), (3, 0), (3, -22), (-3, -22)], close=True)
+    for i in range(7):
+        bolt.add_line((-3, -4 - i * 2.5), (3, -6.5 - i * 2.5))
+    bolt.add_attdef("SIZE", (8, 1), text="M6", height=2.5)
+    # A plate with four BOLT inserts in a nested block.
+    plate = doc.blocks.new("PLATE")
+    plate.add_lwpolyline([(0, 0), (100, 0), (100, 60), (0, 60)], close=True)
+    for x, y in [(15, 15), (85, 15), (15, 45), (85, 45)]:
+        plate.add_circle((x, y), 4)
+        plate.add_blockref("BOLT", (x, y), dxfattribs={"layer": "RED"}).add_auto_attribs({"SIZE": "M6"})
+    plate.add_attdef("MARK", (50, 30), text="P-1", height=6, dxfattribs={"halign": 4, "valign": 0, "align_point": (50, 30)})
+    # A frame that nests the plate twice at different scales.
+    frame = doc.blocks.new("FRAME")
+    frame.add_lwpolyline([(-10, -10), (330, -10), (330, 90), (-10, 90)], close=True)
+    frame.add_blockref("PLATE", (0, 0)).add_auto_attribs({"MARK": "A"})
+    frame.add_blockref("PLATE", (120, 0), dxfattribs={"xscale": 0.7, "yscale": 0.7, "rotation": 0}).add_auto_attribs({"MARK": "B"})
+    frame.add_blockref("PLATE", (230, 70), dxfattribs={"rotation": -90, "xscale": 0.6, "yscale": 0.6}).add_auto_attribs({"MARK": "C"})
+    msp.add_blockref("FRAME", (0, 0), dxfattribs={"layer": "PARTS"})
+    msp.add_text("FRAME: nested PLATE, BOLT blocks, attributes", height=4, dxfattribs={"layer": "NOTE", "style": "BL-TEXT"}).set_placement((0, -20))
+    # Inserts: rotated, scaled, mirrored in x and y.
+    y = -80
+    for i, (sx, sy, rot, label) in enumerate([(1, 1, 0, "scale 1"), (-1, 1, 0, "xscale -1"), (1, -1, 0, "yscale -1"), (1.5, 0.6, 0, "1.5 by 0.6"), (1, 1, 30, "rotated 30")]):
+        x = i * 130
+        msp.add_blockref("PLATE", (x + (100 if sx < 0 else 0), y + (60 if sy < 0 else 0)), dxfattribs={"xscale": sx, "yscale": sy, "rotation": rot}).add_auto_attribs({"MARK": label})
+        msp.add_text(label, height=4, dxfattribs={"layer": "NOTE", "style": "BL-TEXT"}).set_placement((x, y - 20))
+    # Arrays: a MINSERT of bolts (rows and columns), spaced.
+    y -= 120
+    arr = msp.add_blockref("BOLT", (0, y), dxfattribs={"layer": "PARTS"})
+    arr.dxf.row_count = 3
+    arr.dxf.column_count = 8
+    arr.dxf.row_spacing = 35
+    arr.dxf.column_spacing = 20
+    arr.add_auto_attribs({"SIZE": "M6"})
+    msp.add_text("MINSERT: 3 rows by 8 columns of BOLT", height=4, dxfattribs={"layer": "NOTE", "style": "BL-TEXT"}).set_placement((0, y - 110))
+    # A block on a layer that is on, BYBLOCK colours.
+    sym = doc.blocks.new("SYMBOL")
+    sym.add_circle((0, 0), 10, dxfattribs={"color": 0})
+    sym.add_line((-10, 0), (10, 0), dxfattribs={"color": 0})
+    sym.add_line((0, -10), (0, 10), dxfattribs={"color": 256})
+    for i, c in enumerate([1, 3, 5, 6]):
+        msp.add_blockref("SYMBOL", (200 + i * 30, y - 20), dxfattribs={"color": c})
+    msp.add_text("BYBLOCK circle and cross, BYLAYER vertical line: insert colour 1, 3, 5, 6", height=3, dxfattribs={"layer": "NOTE", "style": "BL-TEXT"}).set_placement((200, y - 40))
+    save(doc, "blocks.dxf")
+
+
+# ----------------------------------------------------------------- bracket
+
+
+def bracket():
+    doc = new("R2018")
+    layer(doc, "OUTLINE", 7, weight=50)
+    layer(doc, "HIDDEN", 4, linetype="DASHED", weight=25)
+    layer(doc, "CENTER", 1, linetype="CENTER", weight=18)
+    layer(doc, "SECTION", 8, weight=9)
+    layer(doc, "DIMS", 3, weight=18)
+    layer(doc, "SHEET", 7, weight=35)
+    layer(doc, "TEXT", 2, weight=18)
+    doc.ltscale = 1.0
+    text_style(doc, "MECH", "arial.ttf")
+    dimstyle(doc, "MECH", 3.5, dimtxsty="MECH", dimdec=1)
+    dimstyle(doc, "MECHTOL", 3.5, dimtxsty="MECH", dimdec=2, dimtol=1, dimtp=0.1, dimtm=0.0, dimtfac=0.7, dimtolj=1)
+    msp = doc.modelspace()
+    O, Hd, C = {"layer": "OUTLINE"}, {"layer": "HIDDEN"}, {"layer": "CENTER"}
+    # Front view: an L bracket with two holes in the base and a slot in the upright.
+    # Base 100 x 60, thickness 12; upright 60 high; fillet radius 8.
+    pts = [(0, 0), (100, 0), (100, 12), (20, 12), (12, 12), (12, 72), (0, 72)]
+    msp.add_lwpolyline(pts, close=True, dxfattribs=O)
+    msp.add_arc((20, 20), 8, 180, 270, dxfattribs=O)
+    msp.add_line((12, 12), (12, 20), dxfattribs={"layer": "OUTLINE", "color": 8})
+    msp.add_line((0, 0), (100, 0), dxfattribs=O)
+    # The holes seen from the front: hidden.
+    for x in (35, 80):
+        msp.add_line((x - 4, 0), (x - 4, 12), dxfattribs=Hd)
+        msp.add_line((x + 4, 0), (x + 4, 12), dxfattribs=Hd)
+        msp.add_line((x, -6), (x, 18), dxfattribs=C)
+    msp.add_line((-6, 52), (18, 52), dxfattribs=C)
+    # The upright's slot, hidden.
+    msp.add_line((0, 45), (12, 45), dxfattribs=Hd)
+    msp.add_line((0, 59), (12, 59), dxfattribs=Hd)
+    # Top view: below the front view.
+    oy = -90
+    msp.add_lwpolyline([(0, oy), (100, oy), (100, oy - 60), (0, oy - 60)], close=True, dxfattribs=O)
+    msp.add_line((12, oy), (12, oy - 60), dxfattribs=O)
+    for x in (35, 80):
+        msp.add_circle((x, oy - 30), 4, dxfattribs=O)
+        msp.add_line((x - 8, oy - 30), (x + 8, oy - 30), dxfattribs=C)
+        msp.add_line((x, oy - 22), (x, oy - 38), dxfattribs=C)
+    msp.add_lwpolyline([(0, oy - 20), (12, oy - 20)], dxfattribs=Hd)
+    msp.add_lwpolyline([(0, oy - 40), (12, oy - 40)], dxfattribs=Hd)
+    msp.add_lwpolyline([(0, oy - 20, 0, 0, 0), (0, oy - 40, 0, 0, 0)], format="xyseb", dxfattribs={"layer": "OUTLINE", "color": 8})
+    # Section A-A through a hole, to the right: hatched cut.
+    sx = 150
+    cut = [(sx, 0), (sx + 60, 0), (sx + 60, 12), (sx + 42, 12), (sx + 42, 0 + 12), (sx + 38, 12), (sx + 12, 12), (sx + 12, 72), (sx, 72)]
+    sec = [(sx, 0), (sx + 31, 0), (sx + 31, 12), (sx + 39, 12), (sx + 39, 0), (sx + 60, 0), (sx + 60, 12), (sx + 12, 12), (sx + 12, 72), (sx, 72)]
+    msp.add_lwpolyline([(sx, 0), (sx + 31, 0), (sx + 31, 12), (sx + 12, 12), (sx + 12, 72), (sx, 72)], close=True, dxfattribs=O)
+    msp.add_lwpolyline([(sx + 39, 0), (sx + 60, 0), (sx + 60, 12), (sx + 39, 12)], close=True, dxfattribs=O)
+    h = msp.add_hatch(color=8, dxfattribs={"layer": "SECTION"})
+    h.set_pattern_fill("ANSI31", color=8, scale=2.0)
+    h.paths.add_polyline_path([(sx, 0), (sx + 31, 0), (sx + 31, 12), (sx + 12, 12), (sx + 12, 72), (sx, 72)], is_closed=True)
+    h2 = msp.add_hatch(color=8, dxfattribs={"layer": "SECTION"})
+    h2.set_pattern_fill("ANSI31", color=8, scale=2.0)
+    h2.paths.add_polyline_path([(sx + 39, 0), (sx + 60, 0), (sx + 60, 12), (sx + 39, 12)], is_closed=True)
+    msp.add_line((sx + 35, -6), (sx + 35, 18), dxfattribs=C)
+    msp.add_text("SECTION A-A", height=5, dxfattribs={"layer": "TEXT", "style": "MECH"}).set_placement((sx, -14))
+    # Cutting plane line in the top view.
+    msp.add_lwpolyline([(-8, oy - 30), (108, oy - 30)], dxfattribs={"layer": "CENTER", "lineweight": 50})
+    msp.add_text("A", height=6, dxfattribs={"layer": "TEXT", "style": "MECH"}).set_placement((-14, oy - 33))
+    msp.add_text("A", height=6, dxfattribs={"layer": "TEXT", "style": "MECH"}).set_placement((112, oy - 33))
+    # Dimensions, two with tolerances.
+    D = {"layer": "DIMS"}
+    msp.add_linear_dim(base=(0, -12), p1=(0, 0), p2=(100, 0), dimstyle="MECH", dxfattribs=D).render()
+    msp.add_linear_dim(base=(-12, 0), p1=(0, 0), p2=(0, 72), angle=90, dimstyle="MECHTOL", dxfattribs=D).render()
+    msp.add_linear_dim(base=(0, -24), p1=(35, 0), p2=(80, 0), dimstyle="MECHTOL", dxfattribs=D).render()
+    msp.add_radius_dim(center=(20, 20), radius=8, angle=225, dimstyle="MECH", dxfattribs=D).render()
+    msp.add_linear_dim(base=(0, oy + 12), p1=(0, oy), p2=(100, oy), dimstyle="MECH", dxfattribs=D).render()
+    msp.add_diameter_dim(center=(80, oy - 30), radius=4, angle=35, dimstyle="MECH", dxfattribs=D, text="2x ⌀<>").render()
+    msp.add_linear_dim(base=(sx + 70, 0), p1=(sx + 60, 0), p2=(sx + 60, 12), angle=90, dimstyle="MECH", dxfattribs=D).render()
+    msp.add_leader([(sx + 5, 60), (sx - 12, 80), (sx - 40, 80)], dxfattribs={"layer": "DIMS"})
+    msp.add_text("slot 14 x 12", height=3.5, dxfattribs={"layer": "TEXT", "style": "MECH"}).set_placement((sx - 40, 82))
+    # A sheet: layout with a viewport and a title block.
+    lay = doc.layouts.new("A4 Sheet")
+    lay.page_setup(size=(297, 210), margins=(5, 5, 5, 5), units="mm")
+    rect(lay, 5, 5, 292, 205, layer="SHEET")
+    rect(lay, 137, 5, 292, 45, layer="SHEET")
+    lay.add_line((137, 25), (292, 25), dxfattribs={"layer": "SHEET"})
+    lay.add_line((200, 5), (200, 25), dxfattribs={"layer": "SHEET"})
+    lay.add_line((250, 5), (250, 25), dxfattribs={"layer": "SHEET"})
+    for txt, x, y, hgt in [("L-BRACKET 100 x 72 x 60", 142, 33, 6), ("Material: steel S235", 142, 15, 3.5), ("Scale 1:1", 205, 15, 3.5), ("Sheet 1/1", 255, 15, 3.5), ("Drawn: exav demo", 142, 8, 3)]:
+        lay.add_text(txt, height=hgt, dxfattribs={"layer": "SHEET", "style": "MECH"}).set_placement((x, y))
+    vp = lay.add_viewport(center=(130, 120), size=(250, 140), view_center_point=(90, -30), view_height=140, status=1)
+    save(doc, "bracket.dxf")
+
+
+# --------------------------------------------------------------- site plan
+
+
+def site_plan():
+    doc = new("R2018", units=6)
+    layer(doc, "CONTOUR-MINOR", 8, weight=9)
+    layer(doc, "CONTOUR-MAJOR", 30, weight=25)
+    layer(doc, "PARCEL", 1, linetype="DASHDOT", weight=35)
+    layer(doc, "BUILDING", 7, weight=50)
+    layer(doc, "ROAD", 9, weight=18)
+    layer(doc, "WATER", 5, weight=18)
+    layer(doc, "TREES", 3, weight=9)
+    layer(doc, "SPOT", 2, weight=9)
+    layer(doc, "TEXT", 2, weight=13)
+    layer(doc, "LEGEND", 7, weight=13)
+    text_style(doc, "SITE", "arial.ttf")
+    doc.ltscale = 6
+    make_blocks(doc)
+    msp = doc.modelspace()
+
+    def height(x, y):
+        return 100 + 18 * math.sin(x / 38) * math.cos(y / 47) + 8 * math.sin((x + y) / 21) + (x - 160) * 0.05
+
+    # Contours: marching squares would be long; use closed hill rings as splines at several heights.
+    for k, hgt in enumerate(range(94, 134, 2)):
+        r = 12 + k * 7
+        cx, cy = 150 + 3 * k, 110 - 2 * k
+        pts = []
+        for i in range(24):
+            a = i * 2 * math.pi / 24
+            rr = r * (1 + 0.12 * math.sin(3 * a + k * 0.3) + 0.06 * math.cos(5 * a))
+            pts.append((cx + rr * math.cos(a), cy + rr * 0.75 * math.sin(a)))
+        major = hgt % 10 == 0
+        lyr = "CONTOUR-MAJOR" if major else "CONTOUR-MINOR"
+        msp.add_spline(pts + pts[:1], degree=3, dxfattribs={"layer": lyr})
+        if major:
+            msp.add_text(f"{hgt}", height=3, dxfattribs={"layer": "TEXT", "style": "SITE"}).set_placement((pts[0][0] + 1, pts[0][1]), align=TextEntityAlignment.MIDDLE_LEFT)
+    # Roads: two polylines with a width, a roundabout.
+    msp.add_lwpolyline([(-40, 40), (60, 50), (140, 20), (260, 30), (360, 70)], dxfattribs={"layer": "ROAD", "const_width": 9})
+    msp.add_lwpolyline([(140, 20), (150, -40), (130, -90)], dxfattribs={"layer": "ROAD", "const_width": 6})
+    msp.add_circle((140, 20), 12, dxfattribs={"layer": "ROAD"})
+    # Parcels with their numbers and areas.
+    parcels = [[(20, 60), (120, 66), (116, 150), (14, 140)], [(120, 66), (230, 62), (240, 160), (116, 150)], [(230, 62), (330, 80), (320, 170), (240, 160)]]
+    for i, p in enumerate(parcels):
+        msp.add_lwpolyline(p, close=True, dxfattribs={"layer": "PARCEL"})
+        cx = sum(a for a, _ in p) / 4
+        cy = sum(b for _, b in p) / 4
+        area = 0.5 * abs(sum(p[j][0] * p[(j + 1) % 4][1] - p[(j + 1) % 4][0] * p[j][1] for j in range(4)))
+        m = msp.add_mtext(rf"Parcel {101 + i}\P{area:.0f} m²", dxfattribs={"layer": "TEXT", "style": "SITE", "char_height": 5, "attachment_point": 5})
+        m.set_location((cx, cy - 40))
+    # Buildings with a hatch.
+    for x, y, w, d in [(40, 90, 40, 26), (150, 95, 34, 30), (262, 110, 44, 28)]:
+        msp.add_lwpolyline([(x, y), (x + w, y), (x + w, y + d), (x, y + d)], close=True, dxfattribs={"layer": "BUILDING"})
+        h = msp.add_hatch(color=252, dxfattribs={"layer": "BUILDING"})
+        h.set_pattern_fill("ANSI31", color=8, scale=3)
+        h.paths.add_polyline_path([(x, y), (x + w, y), (x + w, y + d), (x, y + d)], is_closed=True)
+    # A pond (hatched gradient), trees as circles and points with heights.
+    pond = [(280, -10), (310, -25), (340, -5), (325, 20), (295, 18)]
+    msp.add_lwpolyline(pond, close=True, dxfattribs={"layer": "WATER"})
+    h = msp.add_hatch(dxfattribs={"layer": "WATER"})
+    h.set_gradient((140, 200, 255), (30, 90, 170), rotation=90, name="LINEAR")
+    h.paths.add_polyline_path(pond, is_closed=True)
+    import random
+    rnd = random.Random(5)
+    for _ in range(60):
+        x, y = rnd.uniform(-20, 340), rnd.uniform(-110, 40)
+        if 270 < x < 350 and -30 < y < 25:
+            continue
+        msp.add_circle((x, y), rnd.uniform(1.5, 3.2), dxfattribs={"layer": "TREES"})
+    for i in range(30):
+        x, y = rnd.uniform(0, 330), rnd.uniform(-90, 170)
+        msp.add_point((x, y), dxfattribs={"layer": "SPOT", "color": 2})
+        msp.add_text(f"{height(x, y):.2f}", height=1.8, dxfattribs={"layer": "SPOT", "style": "SITE"}).set_placement((x + 1.5, y + 0.5))
+    # North arrow, scale bar, legend.
+    msp.add_blockref("NORTH", (370, 180), dxfattribs={"layer": "LEGEND", "xscale": 0.02, "yscale": 0.02, "zscale": 0.02})
+    for i in range(5):
+        msp.add_lwpolyline([(0 + i * 20, -130), (20 + i * 20, -130), (20 + i * 20, -125), (0 + i * 20, -125)], close=True, dxfattribs={"layer": "LEGEND", "color": 7 if i % 2 else 8})
+        h = msp.add_hatch(color=7 if i % 2 else 252, dxfattribs={"layer": "LEGEND"})
+        h.set_solid_fill(color=7 if i % 2 else 252)
+        h.paths.add_polyline_path([(0 + i * 20, -130), (20 + i * 20, -130), (20 + i * 20, -125), (0 + i * 20, -125)], is_closed=True)
+    for i, v in enumerate((0, 20, 40, 60, 80, 100)):
+        msp.add_text(f"{v}", height=3, dxfattribs={"layer": "LEGEND", "style": "SITE"}).set_placement((v, -138), align=TextEntityAlignment.TOP_CENTER)
+    msp.add_text("m", height=3, dxfattribs={"layer": "LEGEND", "style": "SITE"}).set_placement((108, -138))
+    ly = 170
+    for lyr, label in [("CONTOUR-MINOR", "Contour, 2 m"), ("CONTOUR-MAJOR", "Contour, 10 m"), ("PARCEL", "Parcel boundary"), ("BUILDING", "Building"), ("ROAD", "Road"), ("WATER", "Water"), ("TREES", "Tree")]:
+        msp.add_line((300 + 70, ly), (320 + 70, ly), dxfattribs={"layer": lyr})
+        msp.add_text(label, height=3, dxfattribs={"layer": "LEGEND", "style": "SITE"}).set_placement((324 + 70, ly - 1))
+        ly -= 8
+    msp.add_text("SITE PLAN  1:1000", height=8, dxfattribs={"layer": "TEXT", "style": "SITE"}).set_placement((0, -160))
+    save(doc, "site-plan.dxf")
+
+
+# --------------------------------------------------------------- R12 drawing
+
+
+def legacy_r12():
+    doc = ezdxf.new("R12")
+    doc.layers.add("GEAR", color=7)
+    doc.layers.add("AXES", color=1, linetype="CENTER") if "CENTER" in doc.linetypes else doc.layers.add("AXES", color=1)
+    doc.layers.add("TEXT", color=2)
+    doc.layers.add("DIMS", color=3)
+    msp = doc.modelspace()
+    teeth, r_out, r_in = 20, 40.0, 33.0
+    pts = []
+    for i in range(teeth):
+        a0 = i * 2 * math.pi / teeth
+        step = 2 * math.pi / teeth
+        for da, r in [(0.0, r_in), (step * 0.2, r_out), (step * 0.55, r_out), (step * 0.75, r_in)]:
+            pts.append((r * math.cos(a0 + da), r * math.sin(a0 + da)))
+    msp.add_polyline2d(pts, close=True, dxfattribs={"layer": "GEAR"})
+    msp.add_circle((0, 0), 10, dxfattribs={"layer": "GEAR"})
+    msp.add_circle((0, 0), 4, dxfattribs={"layer": "GEAR"})
+    for i in range(6):
+        a = i * math.pi / 3
+        msp.add_circle((20 * math.cos(a), 20 * math.sin(a)), 4, dxfattribs={"layer": "GEAR"})
+    msp.add_line((-50, 0), (50, 0), dxfattribs={"layer": "AXES"})
+    msp.add_line((0, -50), (0, 50), dxfattribs={"layer": "AXES"})
+    msp.add_arc((0, 0), r_in - 3, 30, 150, dxfattribs={"layer": "GEAR", "color": 4})
+    msp.add_text("GEAR, 20 TEETH (R12 FILE)", height=4, dxfattribs={"layer": "TEXT"}).set_placement((-45, -58))
+    msp.add_text("module 4, pitch diameter 80", height=3, dxfattribs={"layer": "TEXT"}).set_placement((-45, -64))
+    msp.add_point((0, 0), dxfattribs={"layer": "AXES"})
+    msp.add_solid([(55, 40), (65, 40), (55, 46), (65, 46)], dxfattribs={"layer": "DIMS"})
+    msp.add_3dface([(55, -10, 0), (70, -10, 0), (70, 5, 0), (55, 5, 0)], dxfattribs={"layer": "DIMS", "color": 5})
+    blk = doc.blocks.new("TAG")
+    blk.add_circle((0, 0), 5)
+    blk.add_text("1", dxfattribs={"height": 5}).set_placement((-1.5, -2))
+    for i in range(3):
+        msp.add_blockref("TAG", (60, 20 - i * 15), dxfattribs={"layer": "DIMS", "xscale": 1 + i * 0.3, "yscale": 1 + i * 0.3})
+    save(doc, "legacy-r12.dxf")
+
+
+if __name__ == "__main__":
+    house_plan("R2018", "house-plan.dxf")
+    house_plan("R2000", "house-plan-r2000.dxf")
+    house_elevations()
+    hatch_gallery()
+    dimensions()
+    linetypes()
+    text_styles()
+    blocks()
+    bracket()
+    site_plan()
+    legacy_r12()
diff --git a/crates/exav-viewer/demo/examples/generate/make-ifc.py b/crates/exav-viewer/demo/examples/generate/make-ifc.py
new file mode 100644
index 00000000..0e0225f8
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-ifc.py
@@ -0,0 +1,282 @@
+#!/usr/bin/env python3
+"""Writes the demo's IFC example into ../files/ifc/.
+
+    python3 -I make-ifc.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. The model is
+written here as STEP text, entity by entity, with no IFC library and no
+outside model.
+
+Needs: Python 3.
+
+house.ifc (IFC4): a two-storey house, 10 by 8 metres. Per storey: outer and
+inner walls (extruded rectangles), openings cut by IfcRelVoidsElement and
+filled by windows and doors (IfcRelFillsElement) with separate frame and glass
+colours, a floor slab; a gable roof (an extruded triangle), a porch with
+columns, a straight stair (a step per solid), a table and four chairs that
+share one mapped representation, spaces, a material and a property set, and
+colours through IfcStyledItem.
+"""
+import hashlib
+import math
+import os
+import sys
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "ifc")
+os.makedirs(OUT, exist_ok=True)
+
+ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$"
+
+
+def guid(n):
+    num = int.from_bytes(hashlib.md5(f"exav-house-{n}".encode()).digest(), "big")
+    chars = [ALPHABET[num >> 126]]
+    for i in range(21):
+        chars.append(ALPHABET[(num >> (120 - 6 * i)) & 63])
+    return "".join(chars)
+
+
+def f(x):
+    s = repr(float(x))
+    return s if "e" in s or "." in s else s + "."
+
+
+class Step:
+    def __init__(self):
+        self.lines = []
+        self.n = 0
+        self.g = 0
+
+    def add(self, text):
+        self.n += 1
+        self.lines.append(f"#{self.n}={text};")
+        return f"#{self.n}"
+
+    def gid(self):
+        self.g += 1
+        return f"'{guid(self.g)}'"
+
+
+S = Step()
+pt_cache = {}
+
+
+def point(x, y, z=None):
+    key = (round(x, 6), round(y, 6), None if z is None else round(z, 6))
+    if key not in pt_cache:
+        pt_cache[key] = S.add(f"IFCCARTESIANPOINT(({f(x)},{f(y)}" + (f",{f(z)}))" if z is not None else "))"))
+    return pt_cache[key]
+
+
+def direction(x, y, z=None):
+    return S.add(f"IFCDIRECTION(({f(x)},{f(y)}" + (f",{f(z)}))" if z is not None else "))"))
+
+
+def axis3(origin=(0, 0, 0), z=None, x=None):
+    return S.add(f"IFCAXIS2PLACEMENT3D({point(*origin)}," + (direction(*z) if z else "$") + "," + (direction(*x) if x else "$") + ")")
+
+
+def axis2(origin=(0, 0), x=None):
+    return S.add(f"IFCAXIS2PLACEMENT2D({point(*origin)}," + (direction(*x) if x else "$") + ")")
+
+
+def placement(rel, origin=(0, 0, 0), z=None, x=None):
+    return S.add(f"IFCLOCALPLACEMENT({rel if rel else '$'},{axis3(origin, z, x)})")
+
+
+def rect_profile(w, d, centre=(0, 0)):
+    return S.add(f"IFCRECTANGLEPROFILEDEF(.AREA.,$,{axis2(centre)},{f(w)},{f(d)})")
+
+
+def circle_profile(r):
+    return S.add(f"IFCCIRCLEPROFILEDEF(.AREA.,$,{axis2()},{f(r)})")
+
+
+def poly_profile(points):
+    pl = S.add("IFCPOLYLINE((" + ",".join(point(*p) for p in points + [points[0]]) + "))")
+    return S.add(f"IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,{pl})")
+
+
+def extrude(profile, depth, origin=(0, 0, 0), z=None, x=None):
+    return S.add(f"IFCEXTRUDEDAREASOLID({profile},{axis3(origin, z, x)},{direction(0, 0, 1)},{f(depth)})")
+
+
+# ------------------------------------------------------------------ styles
+
+style_cache = {}
+
+
+def style(name, rgb, transparency=0.0):
+    if name not in style_cache:
+        col = S.add(f"IFCCOLOURRGB($,{f(rgb[0])},{f(rgb[1])},{f(rgb[2])})")
+        rend = S.add(f"IFCSURFACESTYLERENDERING({col},{f(transparency)},$,$,$,$,$,$,.FLAT.)")
+        style_cache[name] = S.add(f"IFCSURFACESTYLE('{name}',.BOTH.,({rend}))")
+    return style_cache[name]
+
+
+def styled(item, name, rgb, transparency=0.0):
+    S.add(f"IFCSTYLEDITEM({item},({style(name, rgb, transparency)}),$)")
+    return item
+
+
+# --------------------------------------------------------------- the model
+
+origin_axis = axis3()
+ctx = S.add(f"IFCGEOMETRICREPRESENTATIONCONTEXT($,'Model',3,1.E-05,{origin_axis},$)")
+body = S.add(f"IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,{ctx},$,.MODEL_VIEW.,$)")
+length = S.add("IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.)")
+area = S.add("IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.)")
+volume = S.add("IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.)")
+angle = S.add("IFCSIUNIT(*,.PLANEANGLEUNIT.,$,.RADIAN.)")
+units = S.add(f"IFCUNITASSIGNMENT(({length},{area},{volume},{angle}))")
+project = S.add(f"IFCPROJECT({S.gid()},$,'Example house',$,$,$,$,({ctx}),{units})")
+
+site_pl = placement(None)
+site = S.add(f"IFCSITE({S.gid()},$,'Site',$,$,{site_pl},$,$,.ELEMENT.,$,$,$,$,$)")
+bld_pl = placement(site_pl)
+building = S.add(f"IFCBUILDING({S.gid()},$,'House',$,$,{bld_pl},$,$,.ELEMENT.,$,$,$)")
+STOREY_H = 3.0
+storeys = []
+for i, name in enumerate(["Ground floor", "First floor"]):
+    pl = placement(bld_pl, (0, 0, i * STOREY_H))
+    storeys.append((S.add(f"IFCBUILDINGSTOREY({S.gid()},$,'{name}',$,$,{pl},$,$,.ELEMENT.,{f(i * STOREY_H)})"), pl))
+S.add(f"IFCRELAGGREGATES({S.gid()},$,$,$,{project},({site}))")
+S.add(f"IFCRELAGGREGATES({S.gid()},$,$,$,{site},({building}))")
+S.add(f"IFCRELAGGREGATES({S.gid()},$,$,$,{building},({storeys[0][0]},{storeys[1][0]}))")
+
+contained = {s[0]: [] for s in storeys}
+walls_all = []
+brick = S.add("IFCMATERIAL('Brick, rendered')")
+WALL_RGB, FRAME_RGB, GLASS_RGB, DOOR_RGB = (0.93, 0.9, 0.82), (0.95, 0.95, 0.95), (0.55, 0.78, 0.92), (0.45, 0.28, 0.14)
+
+
+def shape(items, kind="SweptSolid"):
+    rep = S.add(f"IFCSHAPEREPRESENTATION({body},'Body','{kind}',({','.join(items)}))")
+    return S.add(f"IFCPRODUCTDEFINITIONSHAPE($,$,({rep}))")
+
+
+def add_wall(storey, p1, p2, t, h, openings, name):
+    """openings: [(kind, offset along the wall, width, sill, height)]."""
+    sidx = storey
+    sto, sto_pl = storeys[sidx]
+    dx, dy = p2[0] - p1[0], p2[1] - p1[1]
+    L = math.hypot(dx, dy)
+    ux, uy = dx / L, dy / L
+    pl = placement(sto_pl, (p1[0], p1[1], 0), (0, 0, 1), (ux, uy, 0))
+    solid = styled(extrude(rect_profile(L, t, (L / 2, 0)), h), "Render", WALL_RGB)
+    wall = S.add(f"IFCWALL({S.gid()},$,'{name}',$,$,{pl},{shape([solid])},$,.STANDARD.)")
+    contained[sto].append(wall)
+    walls_all.append(wall)
+    for k, (kind, off, w, sill, oh) in enumerate(openings):
+        opl = placement(pl, (off + w / 2, 0, sill))
+        hole = extrude(rect_profile(w, t + 0.2), oh)
+        opening = S.add(f"IFCOPENINGELEMENT({S.gid()},$,'Opening {name} {k + 1}',$,$,{opl},{shape([hole])},$,.OPENING.)")
+        S.add(f"IFCRELVOIDSELEMENT({S.gid()},$,$,$,{wall},{opening})")
+        fpl = placement(pl, (off + w / 2, 0, sill))
+        if kind == "window":
+            frame = styled(extrude(rect_profile(w, 0.1), oh), "Frame", FRAME_RGB)
+            glass = styled(extrude(rect_profile(w - 0.12, 0.04), oh - 0.12, (0, 0, 0.06)), "Glass", GLASS_RGB, 0.55)
+            bar = styled(extrude(rect_profile(0.05, 0.12), oh), "Frame", FRAME_RGB)
+            el = S.add(f"IFCWINDOW({S.gid()},$,'Window {name} {k + 1}',$,$,{fpl},{shape([frame, glass, bar])},$,{f(oh)},{f(w)},.WINDOW.,.NOTDEFINED.,$)")
+        else:
+            leaf = styled(extrude(rect_profile(w - 0.1, 0.06), oh - 0.05), "Door", DOOR_RGB)
+            knob = styled(extrude(rect_profile(0.08, 0.14), 0.08, (w / 2 - 0.2, 0, 1.0)), "Frame", FRAME_RGB)
+            el = S.add(f"IFCDOOR({S.gid()},$,'Door {name} {k + 1}',$,$,{fpl},{shape([leaf, knob])},$,{f(oh)},{f(w)},.DOOR.,.NOTDEFINED.,$)")
+        S.add(f"IFCRELFILLSELEMENT({S.gid()},$,$,$,{opening},{el})")
+        contained[sto].append(el)
+    return wall
+
+
+H = 2.8
+for sidx in (0, 1):
+    tag = "G" if sidx == 0 else "F"
+    door_south = [("door", 6.7, 1.1, 0.0, 2.1)] if sidx == 0 else [("window", 6.9, 1.2, 0.9, 1.3)]
+    add_wall(sidx, (0, 0), (10, 0), 0.3, H, [("window", 1.0, 1.2, 0.9, 1.3), ("window", 3.6, 1.2, 0.9, 1.3)] + door_south, f"{tag}-South")
+    add_wall(sidx, (10, 0), (10, 8), 0.3, H, [("window", 1.4, 1.3, 0.9, 1.3), ("window", 5.0, 1.3, 0.9, 1.3)], f"{tag}-East")
+    add_wall(sidx, (10, 8), (0, 8), 0.3, H, [("window", 1.2, 1.4, 0.9, 1.3), ("window", 4.1, 1.6, 0.9, 1.3), ("window", 7.2, 1.2, 0.9, 1.3)], f"{tag}-North")
+    add_wall(sidx, (0, 8), (0, 0), 0.3, H, [("window", 1.6, 1.4, 0.9, 1.3), ("window", 5.0, 1.4, 0.9, 1.3)], f"{tag}-West")
+    add_wall(sidx, (6, 0.15), (6, 7.85), 0.15, H, [("door", 1.5, 0.9, 0.0, 2.05), ("door", 5.0, 0.9, 0.0, 2.05)], f"{tag}-Partition A")
+    add_wall(sidx, (0.15, 4), (6, 4), 0.15, H, [("door", 1.0, 0.9, 0.0, 2.05)], f"{tag}-Partition B")
+
+# Slabs: ground slab under the house, a floor slab between the storeys, a porch slab.
+ground, ground_pl = storeys[0]
+first, first_pl = storeys[1]
+slab1 = styled(extrude(rect_profile(10.3, 8.3, (5, 4)), 0.2, (0, 0, -0.2)), "Concrete", (0.62, 0.62, 0.6))
+s1 = S.add(f"IFCSLAB({S.gid()},$,'Ground slab',$,$,{placement(ground_pl)},{shape([slab1])},$,.BASESLAB.)")
+slab2 = styled(extrude(poly_profile([(-0.15, -0.15), (10.15, -0.15), (10.15, 8.15), (-0.15, 8.15)]), 0.2, (0, 0, H)), "Concrete", (0.7, 0.7, 0.68))
+s2 = S.add(f"IFCSLAB({S.gid()},$,'Floor slab',$,$,{placement(ground_pl)},{shape([slab2])},$,.FLOOR.)")
+porch = styled(extrude(rect_profile(4.0, 1.4, (8.2, -0.8)), 0.15, (0, 0, H)), "Concrete", (0.7, 0.7, 0.68))
+s3 = S.add(f"IFCSLAB({S.gid()},$,'Porch roof',$,$,{placement(ground_pl)},{shape([porch])},$,.ROOF.)")
+contained[ground] += [s1, s2, s3]
+for k, (cx, cy) in enumerate([(6.4, -1.3), (10.0, -1.3)]):
+    col = styled(extrude(circle_profile(0.15), H, (0, 0, 0)), "Column", (0.9, 0.9, 0.9))
+    contained[ground].append(S.add(f"IFCCOLUMN({S.gid()},$,'Porch column {k + 1}',$,$,{placement(ground_pl, (cx, cy, 0))},{shape([col])},$,.COLUMN.)"))
+
+# Roof: a triangle in the YZ plane, extruded along X.
+tri = poly_profile([(-0.6, 0.0), (8.6, 0.0), (4.0, 2.7)])
+roof_solid = styled(extrude(tri, 11.2, (0, 0, 0), (1, 0, 0), (0, 1, 0)), "Tiles", (0.7, 0.28, 0.2))
+roof_pl = placement(first_pl, (-0.6, 0, 2.8 + 0.2))
+roof = S.add(f"IFCROOF({S.gid()},$,'Gable roof',$,$,{roof_pl},{shape([roof_solid])},$,.GABLE_ROOF.)")
+contained[first].append(roof)
+
+# A straight stair in the hall: eleven steps, each a block up to its tread.
+steps = []
+for k in range(11):
+    top = 0.25 * (k + 1)
+    steps.append(styled(extrude(rect_profile(1.0, 0.28, (0.0, 0.14 + 0.28 * k)), top), "Wood", (0.6, 0.42, 0.25)))
+stair = S.add(f"IFCSTAIR({S.gid()},$,'Stair',$,$,{placement(ground_pl, (6.9, 4.3, 0))},{shape(steps)},$,.STRAIGHT_RUN_STAIR.)")
+contained[ground].append(stair)
+
+# A table and four chairs sharing one mapped representation.
+def furniture_map(parts, name):
+    rep = S.add(f"IFCSHAPEREPRESENTATION({body},'Body','SweptSolid',({','.join(parts)}))")
+    return S.add(f"IFCREPRESENTATIONMAP({axis3()},{rep})")
+
+
+chair_parts = [styled(extrude(rect_profile(0.45, 0.45, (0, 0)), 0.05, (0, 0, 0.45)), "Chair", (0.75, 0.2, 0.2)),
+               styled(extrude(rect_profile(0.45, 0.05, (0, -0.2)), 0.5, (0, 0, 0.5)), "Chair", (0.75, 0.2, 0.2))]
+for dx in (-0.19, 0.19):
+    for dy in (-0.19, 0.19):
+        chair_parts.append(styled(extrude(rect_profile(0.05, 0.05, (dx, dy)), 0.45), "Chair legs", (0.3, 0.2, 0.15)))
+chair_map = furniture_map(chair_parts, "Chair")
+table_parts = [styled(extrude(rect_profile(1.6, 0.9, (0, 0)), 0.06, (0, 0, 0.72)), "Wood", (0.6, 0.42, 0.25))]
+for dx in (-0.72, 0.72):
+    for dy in (-0.36, 0.36):
+        table_parts.append(styled(extrude(rect_profile(0.07, 0.07, (dx, dy)), 0.72), "Wood", (0.5, 0.35, 0.2)))
+table_map = furniture_map(table_parts, "Table")
+
+
+def mapped(rep_map, scale=1.0):
+    op = S.add(f"IFCCARTESIANTRANSFORMATIONOPERATOR3D($,$,{point(0, 0, 0)},{f(scale)},$)")
+    item = S.add(f"IFCMAPPEDITEM({rep_map},{op})")
+    return shape([item], "MappedRepresentation")
+
+
+contained[ground].append(S.add(f"IFCFURNISHINGELEMENT({S.gid()},$,'Table',$,$,{placement(ground_pl, (3.0, 6.0, 0))},{mapped(table_map)},$)"))
+for k, (cx, cy, rot) in enumerate([(2.4, 6.0, 90), (3.6, 6.0, -90), (3.0, 5.2, 180), (3.0, 6.8, 0)]):
+    a = math.radians(rot)
+    contained[ground].append(S.add(f"IFCFURNISHINGELEMENT({S.gid()},$,'Chair {k + 1}',$,$,{placement(ground_pl, (cx, cy, 0), (0, 0, 1), (math.cos(a), math.sin(a), 0))},{mapped(chair_map)},$)"))
+
+# Spaces (no geometry), a property set and the material on the walls.
+spaces = []
+for name, plc in [("Living room", ground_pl), ("Kitchen", ground_pl), ("Hall", ground_pl), ("Bedroom", first_pl), ("Bath", first_pl)]:
+    spaces.append(S.add(f"IFCSPACE({S.gid()},$,'{name}',$,$,{placement(plc)},$,$,.ELEMENT.,.INTERNAL.,$)"))
+S.add(f"IFCRELAGGREGATES({S.gid()},$,$,$,{ground},({spaces[0]},{spaces[1]},{spaces[2]}))")
+S.add(f"IFCRELAGGREGATES({S.gid()},$,$,$,{first},({spaces[3]},{spaces[4]}))")
+prop_ext = S.add("IFCPROPERTYSINGLEVALUE('IsExternal',$,IFCBOOLEAN(.T.),$)")
+prop_fire = S.add("IFCPROPERTYSINGLEVALUE('FireRating',$,IFCLABEL('REI 60'),$)")
+pset = S.add(f"IFCPROPERTYSET({S.gid()},$,'Pset_WallCommon',$,({prop_ext},{prop_fire}))")
+S.add(f"IFCRELDEFINESBYPROPERTIES({S.gid()},$,$,$,({','.join(walls_all[:4])}),{pset})")
+S.add(f"IFCRELASSOCIATESMATERIAL({S.gid()},$,$,$,({','.join(walls_all)}),{brick})")
+for sto, items in contained.items():
+    S.add(f"IFCRELCONTAINEDINSPATIALSTRUCTURE({S.gid()},$,$,$,({','.join(items)}),{sto})")
+
+text = (
+    "ISO-10303-21;\nHEADER;\n"
+    "FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');\n"
+    "FILE_NAME('house.ifc','2000-01-01T00:00:00',('exav'),('exav'),'exav make-ifc.py','exav make-ifc.py','');\n"
+    "FILE_SCHEMA(('IFC4'));\nENDSEC;\nDATA;\n" + "\n".join(S.lines) + "\nENDSEC;\nEND-ISO-10303-21;\n"
+)
+with open(os.path.join(OUT, "house.ifc"), "w", newline="\n") as fh:
+    fh.write(text)
diff --git a/crates/exav-viewer/demo/examples/generate/make-images.py b/crates/exav-viewer/demo/examples/generate/make-images.py
new file mode 100644
index 00000000..90e94cfd
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-images.py
@@ -0,0 +1,593 @@
+#!/usr/bin/env python3
+"""Writes the demo's raster image examples into ../files/images/.
+
+    python3 -I make-images.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. Every
+picture is drawn here from scratch with numpy and Pillow (text in Pillow's
+bundled Aileron font, CC0): no outside image is used.
+
+Needs: Python 3, Pillow 10 or later (with libtiff, WebP and OpenJPEG),
+numpy; the programs opj_compress (libopenjp2-tools), jbig2 (jbig2enc),
+cjxl (libjxl-tools) and tiffcp (libtiff-tools) for the JPEG 2000, JBIG2,
+JPEG XL and fax files. Without a program, the files it makes are skipped.
+
+The encoders for QOI, farbfeld, Radiance HDR, DDS (BC1 and BC3), BMP with
+RLE8 and the legacy ICO are written here, so that no encoder under another
+licence is involved.
+"""
+import io
+import math
+import os
+import shutil
+import struct
+import subprocess
+import sys
+import tempfile
+
+import numpy as np
+from PIL import Image, ImageDraw, ImageFont
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "images")
+WORK = tempfile.mkdtemp()
+os.makedirs(OUT, exist_ok=True)
+
+
+def font(size):
+    return ImageFont.load_default(size)
+
+
+def out(name):
+    return os.path.join(OUT, name)
+
+
+def tool(name):
+    return shutil.which(name) is not None
+
+
+# ---------------------------------------------------------------- the picture
+
+
+def ridge(w, seed, base, amp):
+    """A mountain line: heights in 0..1 from the top, one per column."""
+    rng = np.random.default_rng(seed)
+    x = np.linspace(0, 1, w)
+    y = np.zeros(w)
+    for k in range(1, 9):
+        y += (amp / k**1.15) * np.sin(2 * math.pi * (k * 0.9 + rng.random()) * x + rng.random() * 6.28)
+    return base + y
+
+
+def scene(w=512, h=384):
+    """A dusk landscape: sky, stars, sun, three ridges, a lake, pines, a caption.
+    Returns the 8-bit RGB image and the sun's glow (0..1 per pixel)."""
+    yy = np.linspace(0, 1, h)[:, None] * np.ones((1, w))
+    xx = np.linspace(0, 1, w)[None, :] * np.ones((h, 1))
+    horizon = 0.62
+    t = np.clip(yy / horizon, 0, 1)
+    top, mid, low = np.array([24, 30, 92.0]), np.array([196, 84, 110.0]), np.array([255, 190, 110.0])
+    sky = np.where((t < 0.6)[..., None], top + (mid - top) * (t / 0.6)[..., None], mid + (low - mid) * ((t - 0.6) / 0.4)[..., None])
+    sx, sy, sr = 0.68, 0.5, 0.045
+    d = np.hypot((xx - sx) * w / h, yy - sy)
+    glow = np.clip(1 - d / 0.35, 0, 1) ** 2
+    sky += glow[..., None] * np.array([120, 70, 20.0])
+    sky = np.where((d < sr)[..., None], np.array([255, 250, 225.0]), sky)
+    rng = np.random.default_rng(3)
+    for _ in range(90):
+        px, py = rng.integers(0, w), rng.integers(0, int(h * 0.3))
+        sky[py, px] = np.minimum(255, sky[py, px] + rng.integers(90, 200))
+    img = sky.copy()
+    haze = np.array([230, 150, 130.0])
+    for i, (base, amp, col) in enumerate([(0.50, 0.05, (120, 80, 120)), (0.56, 0.05, (80, 55, 95)), (0.61, 0.035, (40, 32, 70))]):
+        line = ridge(w, 10 + i, base, amp)
+        mask = yy > line[None, :]
+        shade = np.array(col, float) * (0.9 - 0.15 * i) + haze * (0.3 - 0.1 * i)
+        img = np.where(mask[..., None] & (yy <= 0.7)[..., None], shade, img)
+    # The lake: the sky and ridges mirrored about the horizon, with ripples.
+    lake_top = int(h * 0.66)
+    for row in range(lake_top, h):
+        k = row - lake_top
+        src = max(0, lake_top - 1 - int(k * 0.9))
+        shift = int(3 * math.sin(k * 0.8))
+        line = np.roll(img[src], shift, axis=0)
+        img[row] = line * 0.7 + np.array([10, 30, 60.0]) * 0.3
+    img = np.clip(img, 0, 255).astype(np.uint8)
+    im = Image.fromarray(img, "RGB")
+    dr = ImageDraw.Draw(im)
+    for cx, base_y, size in [(0.1, 0.75, 70), (0.18, 0.72, 50), (0.3, 0.74, 90), (0.9, 0.73, 80), (0.8, 0.71, 55)]:
+        bx, by = int(cx * w), int(base_y * h)
+        for tier in range(5):
+            half = int(size * (0.18 + 0.1 * (4 - tier) * 0.8))
+            top_y = by - size + tier * int(size * 0.18)
+            dr.polygon([(bx, top_y), (bx - half, top_y + int(size * 0.3)), (bx + half, top_y + int(size * 0.3))], fill=(14, 22, 36))
+        dr.rectangle((bx - 3, by - 6, bx + 3, by + 8), fill=(10, 14, 22))
+    dr.text((16, h - 34), "exav example picture", font=font(20), fill=(250, 235, 210))
+    return im, glow
+
+
+def bounce_frames(n=24, w=192, h=144):
+    frames = []
+    for i in range(n):
+        im = Image.new("RGB", (w, h))
+        px = np.zeros((h, w, 3), np.uint8)
+        gy = np.linspace(0, 1, h)[:, None]
+        # Every pixel changes a little in every frame (the tint below), so
+        # that encoders keep full frames: cjxl reads no cropped ones.
+        pulse = 14 * math.sin(2 * math.pi * i / n)
+        px[..., 0] = 20 + 40 * gy
+        px[..., 1] = 40 + 60 * gy
+        px[..., 2] = 90 + 120 * gy
+        im = Image.fromarray(px, "RGB")
+        d = ImageDraw.Draw(im)
+        d.rectangle((0, h - 24, w, h), fill=(46, 120, 66))
+        phase = i / n
+        x = 20 + phase * (w - 40)
+        y = h - 24 - 14 - abs(math.sin(math.pi * phase * 2)) * 80
+        rx, ry = 14 * (1 + (0.3 if y > h - 42 else 0)), 14 * (1 - (0.3 if y > h - 42 else 0))
+        d.ellipse((x - 12, h - 26, x + 12, h - 20), fill=(30, 80, 45))
+        d.ellipse((x - rx, y - ry, x + rx, y + ry), fill=(240, 200, 40), outline=(160, 110, 10))
+        d.text((6, 6), f"{i + 1}/{n}", font=font(14), fill=(255, 255, 255))
+        tint = np.array(im).astype(int)
+        tint[..., 0] += int(pulse)
+        tint[..., 2] -= int(pulse)
+        frames.append(Image.fromarray(np.clip(tint, 0, 255).astype(np.uint8), "RGB"))
+    return frames
+
+
+def png_path(im, name):
+    p = os.path.join(WORK, name)
+    im.save(p)
+    return p
+
+
+# --------------------------------------------------------------- fax page
+
+
+def fax_page(w=1728, h=2200, number=1):
+    """A fax cover sheet and a letter, black on white, at fax size."""
+    im = Image.new("L", (w, h), 255)
+    d = ImageDraw.Draw(im)
+    d.rectangle((60, 60, w - 60, 200), outline=0, width=6)
+    d.text((100, 85), "FACSIMILE TRANSMISSION", font=font(72), fill=0)
+    rows = [("To:", "Records office, harbour authority"), ("From:", "exav example generator"),
+            ("Date:", "1 January 2000 (a fixed date)"), ("Pages:", "3 including this one"), ("Re:", "Mooring register, east quay")]
+    y = 260
+    for k, v in rows:
+        d.text((100, y), k, font=font(44), fill=0)
+        d.text((330, y), v, font=font(44), fill=0)
+        d.line((330, y + 56, w - 100, y + 56), fill=0, width=2)
+        y += 96
+    d.line((60, y + 20, w - 60, y + 20), fill=0, width=8)
+    body = [
+        "Dear colleagues,", "",
+        "The register of moorings on the east quay is attached. Each berth has a",
+        "number, a length in metres and the name of the vessel that holds it. Please",
+        "check the entries against your own list and send back a corrected copy",
+        "before the end of the month.", "",
+        "Berths 1 to 12 are for visiting boats and are not let by the season.",
+        "Berths 13 to 40 are let by the season; the fee is the same for every length.", "",
+        "This page and the next are sent in the fine mode (204 by 196 dots to the",
+        "inch). If anything is unreadable, ask for the page to be sent again.", "",
+        "With thanks,",
+    ]
+    y += 70
+    for line in body:
+        d.text((100, y), line, font=font(40), fill=0)
+        y += 62
+    # A table of berths.
+    y += 40
+    rows = 5
+    cols = [100, 330, 700, 1100, w - 100]
+    for r in range(rows + 1):
+        top = y + r * 70
+        d.line((cols[0], top, cols[-1], top), fill=0, width=3 if r else 6)
+        if r < rows:
+            vals = ["Berth", "Length (m)", "Vessel", "Let by"] if r == 0 else [str(12 + number * r), f"{6 + (r * 7 + number) % 9}.{(r * 3) % 10}", ["Aurora", "Brise", "Calypso", "Dorade", "Etoile", "Fauvette", "Goeland"][(r + number) % 7], ["season", "week", "year"][r % 3]]
+            for c, v in enumerate(vals):
+                d.text((cols[c] + 12, top + 10), v, font=font(40), fill=0)
+    for c in cols:
+        d.line((c, y, c, y + rows * 70), fill=0, width=3)
+    # A signature scribble, a stamp, and the page number.
+    base = y + rows * 70
+    pts = [(120 + i * 6, base + 110 + int(40 * math.sin(i * 0.5) * math.cos(i * 0.13))) for i in range(70)]
+    d.line(pts, fill=0, width=5)
+    d.ellipse((1150, base + 40, 1450, base + 240), outline=0, width=8)
+    d.text((1190, base + 115), "RECEIVED", font=font(36), fill=0)
+    d.text((100, h - 100), f"Page {number} of 3", font=font(40), fill=0)
+    return im
+
+
+# ------------------------------------------------------------------ encoders
+
+
+def qoi_encode(arr):
+    """QOI (qoiformat.org/qoi-specification.pdf) from an HxWx3 or HxWx4 uint8 array."""
+    h, w, ch = arr.shape
+    out_ = bytearray(b"qoif" + struct.pack(">IIBB", w, h, ch, 0))
+    index = [(0, 0, 0, 0)] * 64
+    prev = (0, 0, 0, 255)
+    run = 0
+    flat = arr.reshape(-1, ch)
+    for i, px in enumerate(flat):
+        px = (int(px[0]), int(px[1]), int(px[2]), int(px[3]) if ch == 4 else 255)
+        if px == prev:
+            run += 1
+            if run == 62 or i == len(flat) - 1:
+                out_.append(0xC0 | (run - 1))
+                run = 0
+            continue
+        if run:
+            out_.append(0xC0 | (run - 1))
+            run = 0
+        h_ = (px[0] * 3 + px[1] * 5 + px[2] * 7 + px[3] * 11) % 64
+        if index[h_] == px:
+            out_.append(h_)
+        else:
+            index[h_] = px
+            if px[3] == prev[3]:
+                dr, dg, db = (px[0] - prev[0] + 256) % 256, (px[1] - prev[1] + 256) % 256, (px[2] - prev[2] + 256) % 256
+                sr, sg, sb = dr - 256 if dr > 127 else dr, dg - 256 if dg > 127 else dg, db - 256 if db > 127 else db
+                if -2 <= sr <= 1 and -2 <= sg <= 1 and -2 <= sb <= 1:
+                    out_.append(0x40 | (sr + 2) << 4 | (sg + 2) << 2 | (sb + 2))
+                else:
+                    drg, dbg = sr - sg, sb - sg
+                    if -32 <= sg <= 31 and -8 <= drg <= 7 and -8 <= dbg <= 7:
+                        out_.append(0x80 | (sg + 32))
+                        out_.append((drg + 8) << 4 | (dbg + 8))
+                    else:
+                        out_ += bytes([0xFE, px[0], px[1], px[2]])
+            else:
+                out_ += bytes([0xFF, px[0], px[1], px[2], px[3]])
+        prev = px
+    out_ += b"\x00\x00\x00\x00\x00\x00\x00\x01"
+    return bytes(out_)
+
+
+def farbfeld(rgba8):
+    h, w, _ = rgba8.shape
+    wide = rgba8.astype(np.uint16) * 257
+    return b"farbfeld" + struct.pack(">II", w, h) + wide.astype(">u2").tobytes()
+
+
+def rgbe(linear):
+    """Radiance RGBE bytes from an HxWx3 float array."""
+    m = linear.max(axis=2)
+    mant, ex = np.frexp(m)
+    scale = np.where(m > 1e-32, mant * 256.0 / np.maximum(m, 1e-32), 0)
+    px = np.zeros(linear.shape[:2] + (4,), np.uint8)
+    px[..., :3] = np.clip(linear * scale[..., None], 0, 255).astype(np.uint8)
+    px[..., 3] = np.where(m > 1e-32, ex + 128, 0).astype(np.uint8)
+    return px
+
+
+def hdr_file(px, rle):
+    h, w, _ = px.shape
+    data = bytearray(b"#?RADIANCE\n# written by exav's make-images.py\nFORMAT=32-bit_rle_rgbe\nEXPOSURE=1.0\n\n")
+    data += f"-Y {h} +X {w}\n".encode()
+    for row in px:
+        if not rle:
+            data += row.tobytes()
+            continue
+        data += bytes([2, 2, w >> 8, w & 255])
+        for c in range(4):
+            ch = row[:, c].tolist()
+            i = 0
+            while i < w:
+                j = i
+                while j < w and ch[j] == ch[i] and j - i < 127:
+                    j += 1
+                if j - i >= 4:
+                    data += bytes([128 + j - i, ch[i]])
+                    i = j
+                else:
+                    k = i
+                    while k < w and k - i < 128 and not (k + 3 < w and ch[k] == ch[k + 1] == ch[k + 2] == ch[k + 3]):
+                        k += 1
+                    k = max(k, i + 1)
+                    data += bytes([k - i]) + bytes(ch[i:k])
+                    i = k
+    return bytes(data)
+
+
+def bc_blocks(arr, fmt):
+    """Greatly simplified BC1 / BC3 encoder: endpoints are the block's
+    darkest and brightest colours; indices are the nearest of four."""
+    h, w, _ = arr.shape
+    out_ = bytearray()
+
+    def to565(c):
+        return ((int(c[0]) >> 3) << 11) | ((int(c[1]) >> 2) << 5) | (int(c[2]) >> 3)
+
+    def from565(v):
+        return np.array([((v >> 11) & 31) * 255 // 31, ((v >> 5) & 63) * 255 // 63, (v & 31) * 255 // 31], float)
+
+    for by in range(0, h, 4):
+        for bx in range(0, w, 4):
+            blk = arr[by:by + 4, bx:bx + 4].reshape(-1, arr.shape[2])
+            rgb = blk[:, :3].astype(float)
+            lum = rgb @ np.array([0.3, 0.59, 0.11])
+            c0, c1 = rgb[lum.argmax()], rgb[lum.argmin()]
+            e0, e1 = to565(c0), to565(c1)
+            if e0 < e1:
+                e0, e1 = e1, e0
+            if fmt == "bc3":
+                a = blk[:, 3].astype(int)
+                a0, a1 = int(a.max()), int(a.min())
+                if a0 == a1:
+                    a_idx = [0] * 16
+                else:
+                    pal = [a0, a1] + [((6 - i) * a0 + i * a1) // 7 for i in range(1, 7)]
+                    a_idx = [int(np.argmin([abs(v - p) for p in pal])) for v in a]
+                bits = 0
+                for i, v in enumerate(a_idx):
+                    bits |= v << (3 * i)
+                out_ += bytes([a0, a1]) + bits.to_bytes(6, "little")
+            if e0 == e1:
+                idx = [0] * 16
+            else:
+                p0, p1 = from565(e0), from565(e1)
+                pal = [p0, p1, (2 * p0 + p1) / 3, (p0 + 2 * p1) / 3]
+                idx = [int(np.argmin([np.sum((px - p) ** 2) for p in pal])) for px in rgb]
+            bits = 0
+            for i, v in enumerate(idx):
+                bits |= v << (2 * i)
+            out_ += struct.pack("<HHI", e0, e1, bits)
+    return bytes(out_)
+
+
+def dds_file(im, fmt):
+    """DDS with a full mip chain. fmt: 'bc1' (DXT1) or 'bc3' (DXT5)."""
+    w, h = im.size
+    levels = []
+    cur = im
+    while True:
+        levels.append(cur)
+        if cur.size[0] <= 4 and cur.size[1] <= 4:
+            break
+        cur = cur.resize((max(4, cur.size[0] // 2), max(4, cur.size[1] // 2)), Image.LANCZOS)
+    flags = 0x1 | 0x2 | 0x4 | 0x1000 | 0x20000 | 0x80000
+    pf = struct.pack("<II4sIIIII", 32, 0x4, b"DXT1" if fmt == "bc1" else b"DXT5", 0, 0, 0, 0, 0)
+    pitch = max(1, w // 4) * (8 if fmt == "bc1" else 16)
+    head = b"DDS " + struct.pack("<7I", 124, flags, h, w, pitch, 0, len(levels)) + b"\0" * 44 + pf + struct.pack("<5I", 0x1000 | 0x400000 | 0x8, 0, 0, 0, 0)
+    body = b"".join(bc_blocks(np.array(lv.convert("RGBA")), fmt) for lv in levels)
+    return head + body
+
+
+def bmp_rle8(im):
+    """An 8-bit BMP with RLE8 compression (a palette picture)."""
+    p = im.convert("P", palette=Image.ADAPTIVE, colors=64)
+    w, h = p.size
+    pal = p.getpalette()[: 64 * 3]
+    rows = []
+    px = np.array(p)
+    for y in range(h - 1, -1, -1):
+        row = px[y].tolist()
+        enc = bytearray()
+        i = 0
+        while i < w:
+            j = i
+            while j < w and row[j] == row[i] and j - i < 255:
+                j += 1
+            n = j - i
+            if n >= 2:
+                enc += bytes([n, row[i]])
+                i = j
+            else:
+                k = i + 1
+                while k < w and k - i < 255 and (k + 1 >= w or row[k] != row[k + 1]):
+                    k += 1
+                n = k - i
+                if n >= 3:
+                    enc += bytes([0, n]) + bytes(row[i:k]) + (b"\0" if n % 2 else b"")
+                else:
+                    for v in row[i:k]:
+                        enc += bytes([1, v])
+                i = k
+        enc += b"\x00\x00"
+        rows.append(bytes(enc))
+    data = b"".join(rows)[:-2] + b"\x00\x01"
+    palette = b"".join(bytes([pal[i * 3 + 2], pal[i * 3 + 1], pal[i * 3], 0]) for i in range(64))
+    off = 14 + 40 + len(palette)
+    info = struct.pack("<IiiHHIIiiII", 40, w, h, 1, 8, 1, len(data), 2835, 2835, 64, 64)
+    return b"BM" + struct.pack("<IHHI", off + len(data), 0, 0, off) + info + palette + data
+
+
+def ico_legacy(src):
+    """An ICO of BMP-coded images (16 and 32 pixels at 32 bits, 48 at 8 bits) with
+    AND masks, and a 64-pixel one coded as PNG."""
+    entries = []
+    for size, bits in [(16, 32), (32, 32), (48, 8)]:
+        im = src.resize((size, size), Image.LANCZOS).convert("RGBA")
+        a = np.array(im)
+        mask_rows = bytearray()
+        row_bytes = ((size + 31) // 32) * 4
+        for y in range(size - 1, -1, -1):
+            bits_row = bytearray(row_bytes)
+            for x in range(size):
+                if a[y, x, 3] < 128:
+                    bits_row[x // 8] |= 0x80 >> (x % 8)
+            mask_rows += bits_row
+        if bits == 32:
+            pix = a[::-1][..., [2, 1, 0, 3]].tobytes()
+            pal = b""
+        else:
+            p = im.convert("RGB").convert("P", palette=Image.ADAPTIVE, colors=256)
+            pp = p.getpalette()[:768]
+            pal = b"".join(bytes([pp[i * 3 + 2], pp[i * 3 + 1], pp[i * 3], 0]) for i in range(256))
+            pix = b"".join(bytes(np.array(p)[y].tolist()) for y in range(size - 1, -1, -1))
+        head = struct.pack("<IiiHHIIiiII", 40, size, size * 2, 1, bits, 0, len(pix) + len(mask_rows), 0, 0, 256 if bits == 8 else 0, 0)
+        entries.append((size, bits, head + pal + pix + bytes(mask_rows)))
+    buf = io.BytesIO()
+    src.resize((64, 64), Image.LANCZOS).convert("RGBA").save(buf, "PNG")
+    entries.append((64, 32, buf.getvalue()))
+    out_ = struct.pack("<HHH", 0, 1, len(entries))
+    off = 6 + 16 * len(entries)
+    for size, bits, data in entries:
+        out_ += struct.pack("<BBBBHHII", size, size, 0, 0, 1, bits, len(data), off)
+        off += len(data)
+    return out_ + b"".join(e[2] for e in entries)
+
+
+def run(*cmd, **kw):
+    subprocess.run(cmd, check=True, capture_output=True, **kw)
+
+
+# ---------------------------------------------------------------------- main
+
+img, glow = scene()
+big, _ = scene(1024, 768)
+exif_ifd = Image.Exif()
+exif_ifd[0x010E] = "A dusk landscape drawn by exav's make-images.py"
+exif_ifd[0x8298] = "CC0-1.0, exav project"
+exif_ifd[0x0131] = "exav make-images.py"
+
+# PNG
+img.save(out("scene.png"), optimize=True)
+rgba = img.convert("RGBA")
+a = np.array(rgba)
+yy, xx = np.mgrid[0 : a.shape[0], 0 : a.shape[1]]
+a[..., 3] = np.clip(255 - np.hypot(xx - 256, yy - 192) * 1.15, 0, 255).astype(np.uint8)
+Image.fromarray(a, "RGBA").save(out("scene-alpha.png"), optimize=True)
+img.convert("P", palette=Image.ADAPTIVE, colors=32).save(out("scene-indexed.png"), optimize=True)
+grey16 = (np.linspace(0, 65535, 256)[None, :] * np.ones((192, 1)) * (0.6 + 0.4 * np.sin(np.linspace(0, 12, 192))[:, None])).clip(0, 65535).astype(np.uint16)
+Image.fromarray(grey16, "I;16").save(out("gradient-grey16.png"))
+frames = bounce_frames()
+frames[0].save(out("bounce.png"), save_all=True, append_images=frames[1:], duration=60, loop=0, optimize=False)
+
+# JPEG
+img.save(out("scene.jpg"), quality=88, subsampling=2, exif=exif_ifd.tobytes())
+img.save(out("scene-progressive.jpg"), quality=85, progressive=True, optimize=True)
+rot = img.transpose(Image.ROTATE_270)
+e6 = Image.Exif()
+e6[0x0112] = 6
+e6[0x010E] = "Stored rotated, EXIF orientation 6: shown upright"
+rot.save(out("scene-orientation6.jpg"), quality=85, exif=e6.tobytes())
+img.convert("L").save(out("scene-grey.jpg"), quality=85)
+img.convert("CMYK").save(out("scene-cmyk.jpg"), quality=85)
+
+# GIF
+frames[0].save(out("bounce.gif"), save_all=True, append_images=frames[1:], duration=60, loop=0, optimize=False)
+img.convert("P", palette=Image.ADAPTIVE, colors=256, dither=Image.FLOYDSTEINBERG).save(out("scene.gif"), optimize=True)
+
+# WebP
+img.save(out("scene.webp"), quality=80, method=6)
+rgba.save(out("scene-lossless.webp"), lossless=True, method=6)
+Image.fromarray(a, "RGBA").save(out("scene-alpha.webp"), quality=85, method=6)
+frames[0].save(out("bounce.webp"), save_all=True, append_images=frames[1:], duration=60, loop=0, quality=75, method=4)
+
+# TIFF
+dpi = (300, 300)
+img.save(out("scene-lzw.tif"), compression="tiff_lzw", dpi=dpi)
+img.save(out("scene-jpeg.tif"), compression="jpeg", quality=88, dpi=dpi)
+img.resize((256, 192), Image.LANCZOS).convert("CMYK").save(out("scene-cmyk-packbits.tif"), compression="packbits", dpi=dpi)
+# PackBits does not shrink a picture of smooth colours: the CMYK one is kept small.
+Image.open(out("scene-cmyk-packbits.tif")).resize((128, 96), Image.LANCZOS).save(out("scene-cmyk-packbits.tif"), compression="packbits", dpi=dpi)
+Image.fromarray(grey16, "I;16").save(out("gradient-grey16.tif"), compression="tiff_adobe_deflate")
+pages = [img, img.resize((256, 192), Image.LANCZOS), img.resize((128, 96), Image.LANCZOS).convert("L")]
+pages[0].save(out("scene-pages.tif"), save_all=True, append_images=pages[1:], compression="tiff_adobe_deflate", dpi=dpi)
+
+# BMP
+half = img.resize((160, 120), Image.LANCZOS)
+half.save(out("scene-24.bmp"))
+half.convert("P", palette=Image.ADAPTIVE, colors=256).save(out("scene-8.bmp"))
+half.convert("RGBA").save(out("scene-32.bmp"))
+img.convert("1").save(out("scene-1bit.bmp"))
+with open(out("scene-rle8.bmp"), "wb") as f:
+    f.write(bmp_rle8(img))
+
+# ICO
+icon = Image.new("RGBA", (256, 256), (0, 0, 0, 0))
+d = ImageDraw.Draw(icon)
+d.rounded_rectangle((12, 12, 244, 244), radius=48, fill=(32, 64, 128, 255))
+d.ellipse((60, 60, 196, 196), fill=(250, 200, 50, 255))
+d.polygon([(128, 20), (150, 100), (236, 128), (150, 156), (128, 236), (106, 156), (20, 128), (106, 100)], outline=(255, 255, 255, 255), width=8)
+icon.save(out("icon.ico"), sizes=[(16, 16), (24, 24), (32, 32), (48, 48), (64, 64), (128, 128), (256, 256)])
+with open(out("icon-legacy.ico"), "wb") as f:
+    f.write(ico_legacy(icon))
+
+# PNM
+small = img.resize((256, 192), Image.LANCZOS)
+sa = np.array(img.resize((128, 96), Image.LANCZOS))
+with open(out("scene.ppm"), "wb") as f:
+    f.write(b"P6\n# exav example\n128 96\n255\n" + sa.tobytes())
+tiny = np.array(img.resize((48, 36), Image.LANCZOS))
+with open(out("scene-ascii.ppm"), "w") as f:
+    f.write("P3\n# an ASCII pixmap\n48 36\n255\n" + "\n".join(" ".join(str(int(v)) for v in row.reshape(-1)) for row in tiny) + "\n")
+g = np.array(small.convert("L").resize((128, 96)))
+g16 = (g.astype(np.uint16) * 257).astype(">u2")
+with open(out("scene-grey16.pgm"), "wb") as f:
+    f.write(b"P5\n128 96\n65535\n" + g16.tobytes())
+bw = np.array(small.convert("1")) > 0
+rows = []
+for row in bw:
+    rows.append(np.packbits(~row).tobytes())
+with open(out("scene.pbm"), "wb") as f:
+    f.write(b"P4\n256 192\n" + b"".join(rows))
+al = np.array(img.resize((128, 96), Image.LANCZOS).convert("RGBA"))
+al[..., 3] = np.clip(255 - np.hypot(np.arange(128)[None, :] - 64, np.arange(96)[:, None] - 48) * 3.6, 0, 255)
+with open(out("scene-alpha.pam"), "wb") as f:
+    f.write(b"P7\nWIDTH 128\nHEIGHT 96\nDEPTH 4\nMAXVAL 255\nTUPLTYPE RGB_ALPHA\nENDHDR\n" + al.tobytes())
+
+# QOI, farbfeld, HDR, DDS
+with open(out("scene.qoi"), "wb") as f:
+    f.write(qoi_encode(np.array(img)))
+with open(out("scene-alpha.qoi"), "wb") as f:
+    f.write(qoi_encode(np.array(Image.fromarray(a, "RGBA").resize((192, 144), Image.LANCZOS))))
+with open(out("scene.ff"), "wb") as f:
+    f.write(farbfeld(np.array(Image.fromarray(a, "RGBA").resize((96, 72), Image.LANCZOS))))
+srgb = np.array(img, float) / 255
+lin = np.where(srgb <= 0.04045, srgb / 12.92, ((srgb + 0.055) / 1.055) ** 2.4)
+lin = lin * (1 + 60 * glow[..., None] ** 2)
+with open(out("sunset.hdr"), "wb") as f:
+    f.write(hdr_file(rgbe(lin[::2, ::2]), True))
+with open(out("sunset-flat.hdr"), "wb") as f:
+    f.write(hdr_file(rgbe(lin[::4, ::4]), False))
+with open(out("scene-bc1.dds"), "wb") as f:
+    f.write(dds_file(img.resize((256, 192), Image.LANCZOS), "bc1"))
+with open(out("scene-bc3.dds"), "wb") as f:
+    f.write(dds_file(Image.fromarray(a, "RGBA").resize((256, 192), Image.LANCZOS), "bc3"))
+
+# JPEG 2000
+if tool("opj_compress"):
+    src = png_path(img, "scene.png")
+    srca = png_path(Image.fromarray(a, "RGBA"), "scene-alpha.png")
+    srcg = png_path(img.convert("L"), "scene-grey.png")
+    run("opj_compress", "-i", src, "-o", out("scene.jp2"), "-r", "16,8,4", "-n", "5", "-p", "RPCL", "-t", "256,256", "-SOP", "-EPH")
+    run("opj_compress", "-i", src, "-o", out("scene.j2k"), "-r", "12", "-n", "4")
+    run("opj_compress", "-i", srcg, "-o", out("scene-grey.jp2"), "-r", "10")
+    run("opj_compress", "-i", srca, "-o", out("scene-alpha.jp2"), "-r", "10")
+
+# JBIG2
+page = fax_page(1728, 2200, 1).resize((1240, 1579), Image.LANCZOS).point(lambda v: 255 if v > 140 else 0).convert("1")
+if tool("jbig2"):
+    pb = os.path.join(WORK, "page.png")
+    page.save(pb)
+    for name, args in [("page-generic.jb2", []), ("page-symbol.jb2", ["-s"])]:
+        with open(out(name), "wb") as f:
+            subprocess.run(["jbig2", *args, pb], stdout=f, check=True, stderr=subprocess.DEVNULL)
+
+# Fax TIFF (CCITT): Pillow writes the uncompressed bilevel page, tiffcp codes it.
+if tool("tiffcp"):
+    pages = []
+    for n in (1, 2, 3):
+        p = os.path.join(WORK, f"fax{n}.tif")
+        fax_page(1728, 2200, n).convert("1").save(p, dpi=(204, 196))
+        pages.append(p)
+    # Group 3 is written to show what the viewer says about it: its TIFF decoder reads Group 4 only.
+    for name, mode in [("fax-g4.tif", "g4"), ("fax-g3-1d.tif", "g3:1d")]:
+        run("tiffcp", "-c", mode, "-r", "2200", pages[0], out(name))
+    run("tiffcp", "-c", "g4", "-r", "2200", *pages, out("fax-g4-3pages.tif"))
+
+# JPEG XL
+if tool("cjxl"):
+    src = png_path(img, "jxl-scene.png")
+    srca = png_path(Image.fromarray(a, "RGBA"), "jxl-scene-alpha.png")
+    gif = os.path.join(WORK, "bounce.gif")
+    frames[0].save(gif, save_all=True, append_images=frames[1:], duration=60, loop=0)
+    run("cjxl", src, out("scene-lossy.jxl"), "-d", "1.0", "-e", "7")
+    run("cjxl", src, out("scene-lossless.jxl"), "-d", "0", "-e", "7")
+    run("cjxl", srca, out("scene-alpha.jxl"), "-d", "0", "-e", "7")
+    run("cjxl", gif, out("bounce.jxl"), "-d", "1.0", "-e", "6")
+
+shutil.rmtree(WORK)
diff --git a/crates/exav-viewer/demo/examples/generate/make-manifest.mjs b/crates/exav-viewer/demo/examples/generate/make-manifest.mjs
new file mode 100644
index 00000000..c628d128
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-manifest.mjs
@@ -0,0 +1,82 @@
+#!/usr/bin/env node
+// Writes ../examples.json from catalog.json and the files in ../files/.
+//
+//     node generate/make-manifest.mjs
+//
+// catalog.json lists what each example is (title, features, author, licence,
+// where it came from); this script adds what the bytes say (size, SHA-256) and
+// fills the facts that every generated file shares. A file that is fetched and
+// not committed keeps the size and hash the catalog gives.
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const root = path.join(here, "..");
+const REPO = "https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples";
+
+const catalog = JSON.parse(fs.readFileSync(path.join(here, "catalog.json"), "utf8"));
+const examples = [];
+const seen = new Set();
+
+for (const block of catalog.blocks) {
+  for (const f of block.files) {
+    const e = { file: f.file, group: f.group ?? block.group, family: f.family ?? block.family, title: f.title };
+    if (f.features) e.features = f.features;
+    const kind = f.source ?? block.source;
+    if (kind === "generated") {
+      const script = f.gen ?? block.gen;
+      const e0 = { script: `generate/${script}`, args: f.args ?? block.args ?? [] };
+      const tools = f.tools ?? block.tools;
+      if (tools) e0.tools = tools;
+      Object.assign(e, {
+        path: `${f.dir ?? block.dir}/${f.file}`,
+        committed: true,
+        author: f.author ?? "exav project",
+        source: `${REPO}/generate/${script}`,
+        evidence: `${REPO}/generate/${script}`,
+        evidence_quote: "Output: CC0-1.0, a public domain dedication by the exav project.",
+        licence: "CC0-1.0",
+        attribution: "",
+        generated: e0,
+      });
+    } else {
+      // A `ref` names facts that several files share (the author, the page that states the licence, ...).
+      const ref = f.ref ?? block.ref;
+      if (ref && !catalog.refs?.[ref]) throw new Error(`${f.file}: unknown ref ${ref}`);
+      const g = { ...(ref ? catalog.refs[ref] : {}), ...f };
+      for (const k of ["author", "source", "evidence", "evidence_quote", "licence", "attribution"]) {
+        if (g[k] === undefined) throw new Error(`${f.file}: no ${k}`);
+        e[k] = g[k];
+      }
+      for (const k of ["fetched", "fixture", "generated"]) if (g[k] !== undefined) e[k] = g[k];
+      if (g.derived) e.derived = g.derived;
+      if (g.evidence_row) e.evidence_row = g.evidence_row;
+      if (f.path) {
+        e.path = f.path;
+        e.committed = true;
+      } else {
+        e.committed = false;
+      }
+    }
+    if (seen.has(e.file)) throw new Error(`${e.file}: listed twice`);
+    seen.add(e.file);
+    if (e.committed) {
+      const data = fs.readFileSync(path.join(root, "files", e.path));
+      e.bytes = data.length;
+      e.sha256 = crypto.createHash("sha256").update(data).digest("hex");
+    } else {
+      if (!f.bytes || !f.sha256) throw new Error(`${f.file}: a fetched file needs bytes and sha256 in the catalog`);
+      e.bytes = f.bytes;
+      e.sha256 = f.sha256;
+    }
+    examples.push(e);
+  }
+}
+
+const out = { version: 1, examples };
+fs.writeFileSync(path.join(root, "examples.json"), `${JSON.stringify(out, null, 2)}\n`);
+const committed = examples.filter((e) => e.committed);
+const total = (list) => list.reduce((n, e) => n + e.bytes, 0);
+console.log(`${examples.length} examples: ${committed.length} committed (${total(committed)} bytes), ${examples.length - committed.length} fetched (${total(examples.filter((e) => !e.committed))} bytes)`);
diff --git a/crates/exav-viewer/demo/examples/generate/make-media.py b/crates/exav-viewer/demo/examples/generate/make-media.py
new file mode 100644
index 00000000..9699daf6
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-media.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+"""Writes the demo's audio and video examples into ../files/media/.
+
+    python3 -I make-media.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. The tune is
+composed and synthesised here (a four-voice canon on a pentatonic scale, sine
+waves with a few harmonics and an envelope); the picture is ffmpeg's own
+"testsrc2" pattern with a clock.
+
+Needs: Python 3, numpy, and ffmpeg (with libx264, libvpx-vp9, libopus,
+libvorbis, libmp3lame and the native aac and flac encoders). The files that
+use a missing encoder are skipped.
+"""
+import math
+import os
+import shutil
+import struct
+import subprocess
+import sys
+import tempfile
+import wave
+
+import numpy as np
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "media")
+os.makedirs(OUT, exist_ok=True)
+RATE = 8000
+SCALE = [0, 2, 4, 7, 9]  # a major pentatonic scale
+MELODY = [0, 2, 4, 2, 3, 4, 6, 4, 2, 0, 1, 2, 4, 3, 2, 1]  # degrees; the scale repeats over octaves
+
+
+def freq(degree, base=261.63):
+    octave, step = divmod(degree, len(SCALE))
+    return base * 2 ** ((SCALE[step] + 12 * octave) / 12)
+
+
+def voice(delay_beats, octave, beat=0.3, seconds=8.4):
+    t = np.arange(int(RATE * seconds)) / RATE
+    out = np.zeros_like(t)
+    for i, degree in enumerate(MELODY):
+        start = (delay_beats + i) * beat
+        if start >= seconds:
+            break
+        f = freq(degree + octave * len(SCALE))
+        n = np.clip(t - start, 0, None)
+        env = (t >= start) * np.exp(-n * 5.0) * np.minimum(n / 0.01, 1.0)
+        out += env * (np.sin(2 * math.pi * f * t) + 0.35 * np.sin(4 * math.pi * f * t) + 0.12 * np.sin(6 * math.pi * f * t))
+    return out
+
+
+def tune():
+    mix = voice(0, 0) + voice(4, 1) * 0.8 + voice(8, 0) * 0.7 + voice(12, -1) * 0.9
+    mix /= np.abs(mix).max() * 1.1
+    fade = np.minimum(1.0, (len(mix) - np.arange(len(mix))) / (RATE * 0.5))
+    return (mix * fade * 32000).astype("<i2")
+
+
+def ffmpeg(*args):
+    subprocess.run(["ffmpeg", "-hide_banner", "-loglevel", "error", "-y", *args], check=True)
+
+
+samples = tune()
+with tempfile.TemporaryDirectory() as tmp:
+    wav = os.path.join(tmp, "tune.wav")
+    with wave.open(wav, "wb") as w:
+        w.setnchannels(1)
+        w.setsampwidth(2)
+        w.setframerate(RATE)
+        w.writeframes(samples.tobytes())
+    shutil.copy(wav, os.path.join(OUT, "canon.wav"))
+    if shutil.which("ffmpeg"):
+        flags = ["-map_metadata", "-1", "-fflags", "+bitexact", "-flags:a", "+bitexact"]
+        ffmpeg("-i", wav, *flags, "-c:a", "libmp3lame", "-b:a", "24k", "-id3v2_version", "0", "-write_id3v1", "0", os.path.join(OUT, "canon.mp3"))
+        ffmpeg("-i", wav, *flags, "-c:a", "flac", "-compression_level", "8", os.path.join(OUT, "canon.flac"))
+        ffmpeg("-i", wav, *flags, "-c:a", "libvorbis", "-q:a", "2", os.path.join(OUT, "canon.ogg"))
+        ffmpeg("-i", wav, *flags, "-c:a", "libopus", "-b:a", "16k", os.path.join(OUT, "canon.opus"))
+        ffmpeg("-i", wav, *flags, "-c:a", "aac", "-b:a", "24k", "-movflags", "+faststart", os.path.join(OUT, "canon.m4a"))
+        video = ["-f", "lavfi", "-i", "testsrc2=size=256x192:rate=12:duration=4", "-i", wav, "-t", "4", "-shortest"]
+        ffmpeg(*video, *flags, "-c:v", "libx264", "-profile:v", "baseline", "-pix_fmt", "yuv420p", "-crf", "34", "-preset", "veryslow", "-c:a", "aac", "-b:a", "24k", "-movflags", "+faststart", os.path.join(OUT, "testcard.mp4"))
+        ffmpeg(*video, *flags, "-c:v", "libvpx-vp9", "-crf", "46", "-b:v", "0", "-pix_fmt", "yuv420p", "-c:a", "libopus", "-b:a", "16k", os.path.join(OUT, "testcard.webm"))
diff --git a/crates/exav-viewer/demo/examples/generate/make-models.py b/crates/exav-viewer/demo/examples/generate/make-models.py
new file mode 100644
index 00000000..b75a05e4
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-models.py
@@ -0,0 +1,458 @@
+#!/usr/bin/env python3
+"""Writes the demo's 3D model examples into ../files/models/.
+
+    python3 -I make-models.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. Every model
+is computed here from scratch with numpy; no mesh library or outside model is
+used.
+
+Needs: Python 3 and numpy.
+
+- gear.stl: a spur gear, binary STL with a colour per facet (VisCAM
+  convention): orange teeth, blue hub, grey faces.
+- bracket-ascii.stl: an L bracket as ASCII STL.
+- knot.obj: a trefoil knot tube with a colour per vertex, and a base, as two
+  OBJ objects.
+- terrain.ply: a height field, binary little-endian PLY with vertex colours
+  and normals.
+- icosphere-ascii.ply: an icosphere as ASCII PLY with vertex colours.
+- arm.glb: an articulated arm, a node tree with rotations and scales, five
+  materials, vertex colours on one mesh, in a GLB.
+- table.gltf: a table and a chair, a .gltf with its buffer as a data URI.
+"""
+import base64
+import json
+import math
+import os
+import struct
+import sys
+
+import numpy as np
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "models")
+os.makedirs(OUT, exist_ok=True)
+
+
+def out(name):
+    return os.path.join(OUT, name)
+
+
+def normal(a, b, c):
+    n = np.cross(b - a, c - a)
+    length = np.linalg.norm(n)
+    return n / length if length else n
+
+
+# ---------------------------------------------------------------- the gear
+
+
+def gear_facets(teeth=18, r_root=14.0, r_tip=17.0, r_bore=5.0, thick=8.0, hub_r=8.0):
+    """Facets (a, b, c, colour) of a spur gear: z from 0 to thick."""
+    outline = []
+    step = 2 * math.pi / teeth
+    for i in range(teeth):
+        a0 = i * step
+        for da, r in [(0.0, r_root), (0.18 * step, r_tip), (0.5 * step, r_tip), (0.68 * step, r_root)]:
+            outline.append((a0 + da, r))
+    n = len(outline)
+    bore = [(outline[i][0], r_bore) for i in range(n)]
+    hub = [(outline[i][0], hub_r) for i in range(n)]
+
+    def p(ang_r, z):
+        return np.array([ang_r[1] * math.cos(ang_r[0]), ang_r[1] * math.sin(ang_r[0]), z])
+
+    ORANGE, BLUE, GREY = (255, 140, 30), (40, 100, 220), (170, 170, 175)
+    facets = []
+
+    def quad(a, b, c, d, colour):
+        facets.append((a, b, c, colour))
+        facets.append((a, c, d, colour))
+
+    for i in range(n):
+        j = (i + 1) % n
+        # Top and bottom: the ring between the bore and the outline, the hub ring in blue.
+        for z, flip in ((thick, False), (0.0, True)):
+            ring = [(bore[i], bore[j], hub[j], hub[i], BLUE), (hub[i], hub[j], outline[j], outline[i], ORANGE if z else GREY)]
+            for a, b, c, d, col in ring:
+                pts = [p(a, z), p(b, z), p(c, z), p(d, z)]
+                if flip:
+                    pts = pts[::-1]
+                quad(*pts, col)
+        # The tooth walls and the bore wall.
+        quad(p(outline[i], 0), p(outline[j], 0), p(outline[j], thick), p(outline[i], thick), ORANGE)
+        quad(p(bore[j], 0), p(bore[i], 0), p(bore[i], thick), p(bore[j], thick), GREY)
+    return facets
+
+
+def stl_binary(path, facets, header):
+    out_ = bytearray(header.ljust(80, b" ")[:80])
+    out_ += struct.pack("<I", len(facets))
+    for a, b, c, colour in facets:
+        nrm = normal(a, b, c)
+        attr = 0x8000 | ((colour[0] >> 3) << 10) | ((colour[1] >> 3) << 5) | (colour[2] >> 3) if colour else 0
+        out_ += struct.pack("<12fH", *nrm, *a, *b, *c, attr)
+    with open(path, "wb") as f:
+        f.write(out_)
+
+
+def box_facets(lo, hi):
+    x0, y0, z0 = lo
+    x1, y1, z1 = hi
+    v = [np.array(c, float) for c in [(x0, y0, z0), (x1, y0, z0), (x1, y1, z0), (x0, y1, z0), (x0, y0, z1), (x1, y0, z1), (x1, y1, z1), (x0, y1, z1)]]
+    quads = [(0, 3, 2, 1), (4, 5, 6, 7), (0, 1, 5, 4), (1, 2, 6, 5), (2, 3, 7, 6), (3, 0, 4, 7)]
+    tris = []
+    for a, b, c, d in quads:
+        tris.append((v[a], v[b], v[c]))
+        tris.append((v[a], v[c], v[d]))
+    return tris
+
+
+def stl_ascii(path, tris, name):
+    lines = [f"solid {name}"]
+    for a, b, c in tris:
+        n = normal(a, b, c)
+        lines.append(f"  facet normal {n[0]:.6e} {n[1]:.6e} {n[2]:.6e}")
+        lines.append("    outer loop")
+        for v in (a, b, c):
+            lines.append(f"      vertex {v[0]:.6e} {v[1]:.6e} {v[2]:.6e}")
+        lines.append("    endloop")
+        lines.append("  endfacet")
+    lines.append(f"endsolid {name}")
+    with open(path, "w") as f:
+        f.write("\n".join(lines) + "\n")
+
+
+stl_binary(out("gear.stl"), gear_facets(), b"exav example gear, colours as VisCAM attributes")
+stl_ascii(out("bracket-ascii.stl"), box_facets((0, 0, 0), (40, 25, 4)) + box_facets((0, 0, 4), (4, 25, 30)) + box_facets((4, 0, 4), (6, 25, 12)), "bracket")
+
+# ------------------------------------------------------------------- the knot
+
+
+def hsv(h):
+    h6 = (h % 1.0) * 6
+    i = int(h6)
+    f = h6 - i
+    q, t = 1 - f, f
+    r, g, b = [(1, t, 0), (q, 1, 0), (0, 1, t), (0, q, 1), (t, 0, 1), (1, 0, q)][i % 6]
+    return int(r * 255), int(g * 255), int(b * 255)
+
+
+def knot_obj(path, segs=90, ring=10):
+    def centre(t):
+        return np.array([(2 + math.cos(3 * t)) * math.cos(2 * t), (2 + math.cos(3 * t)) * math.sin(2 * t), math.sin(3 * t)])
+
+    verts, colours, normals, faces = [], [], [], []
+    for i in range(segs):
+        t = 2 * math.pi * i / segs
+        c = centre(t)
+        tan = centre(t + 1e-3) - c
+        tan /= np.linalg.norm(tan)
+        up = np.array([0.0, 0.0, 1.0])
+        nrm = np.cross(tan, up)
+        nrm /= np.linalg.norm(nrm)
+        bin_ = np.cross(tan, nrm)
+        for k in range(ring):
+            a = 2 * math.pi * k / ring
+            d = math.cos(a) * nrm + math.sin(a) * bin_
+            verts.append(c + 0.32 * d)
+            normals.append(d)
+            colours.append(hsv(i / segs))
+    for i in range(segs):
+        for k in range(ring):
+            a = i * ring + k
+            b = i * ring + (k + 1) % ring
+            c = ((i + 1) % segs) * ring + (k + 1) % ring
+            d = ((i + 1) % segs) * ring + k
+            faces.append((a, b, c, d))
+    lines = ["# A trefoil knot with a colour per vertex, and a base: two objects.", "o knot"]
+    for v, col in zip(verts, colours):
+        lines.append(f"v {v[0]:.4f} {v[1]:.4f} {v[2]:.4f} {col[0] / 255:.3f} {col[1] / 255:.3f} {col[2] / 255:.3f}")
+    for n in normals:
+        lines.append(f"vn {n[0]:.4f} {n[1]:.4f} {n[2]:.4f}")
+    for f in faces:
+        lines.append("f " + " ".join(f"{i + 1}//{i + 1}" for i in f))
+    base = len(verts)
+    lines.append("o base")
+    ring_n = 48
+    for k in range(ring_n):
+        a = 2 * math.pi * k / ring_n
+        lines.append(f"v {4.2 * math.cos(a):.4f} {4.2 * math.sin(a):.4f} -1.6 0.35 0.35 0.4")
+        lines.append(f"v {4.2 * math.cos(a):.4f} {4.2 * math.sin(a):.4f} -1.2 0.6 0.6 0.65")
+    lines.append(f"v 0 0 -1.2 0.6 0.6 0.65")
+    centre_i = base + 2 * ring_n + 1
+    for k in range(ring_n):
+        j = (k + 1) % ring_n
+        lo0, hi0, lo1, hi1 = base + 2 * k + 1, base + 2 * k + 2, base + 2 * j + 1, base + 2 * j + 2
+        lines.append(f"f {lo0} {lo1} {hi1} {hi0}")
+        lines.append(f"f {hi0} {hi1} {centre_i}")
+    # Faces counted from the end, as OBJ allows: the base's bottom disc.
+    for k in range(ring_n):
+        j = (k + 1) % ring_n
+        lines.append(f"f {base + 2 * j + 1} {base + 2 * k + 1} {base + 2 * ring_n + 1}")
+    with open(path, "w") as f:
+        f.write("\n".join(lines) + "\n")
+
+
+knot_obj(out("knot.obj"))
+
+# -------------------------------------------------------------------- terrain
+
+
+def terrain_ply(path, n=48):
+    xs = np.linspace(-1, 1, n)
+    X, Y = np.meshgrid(xs, xs)
+    Z = 0.35 * np.exp(-((X - 0.3) ** 2 + (Y + 0.2) ** 2) * 6) + 0.25 * np.exp(-((X + 0.5) ** 2 + (Y - 0.4) ** 2) * 9) + 0.04 * np.sin(9 * X) * np.cos(7 * Y) - 0.1
+    verts = np.stack([X * 50, Y * 50, Z * 50], axis=-1).reshape(-1, 3).astype("<f4")
+    gx, gy = np.gradient(Z * 50, 100 / (n - 1))
+    nrm = np.stack([-gx, -gy, np.ones_like(gx)], axis=-1)
+    nrm /= np.linalg.norm(nrm, axis=-1, keepdims=True)
+    nrm = nrm.reshape(-1, 3).astype("<f4")
+    h = (Z.reshape(-1) - Z.min()) / (Z.max() - Z.min())
+    stops = np.array([[30, 70, 160], [60, 150, 90], [190, 180, 90], [140, 100, 70], [250, 250, 250]], float)
+    pos = h * (len(stops) - 1)
+    lo = np.clip(pos.astype(int), 0, len(stops) - 2)
+    frac = (pos - lo)[:, None]
+    col = (stops[lo] * (1 - frac) + stops[lo + 1] * frac).astype(np.uint8)
+    faces = []
+    for j in range(n - 1):
+        for i in range(n - 1):
+            a = j * n + i
+            faces.append((a, a + 1, a + n + 1))
+            faces.append((a, a + n + 1, a + n))
+    header = (
+        "ply\nformat binary_little_endian 1.0\ncomment a height field with a colour per vertex\n"
+        f"element vertex {len(verts)}\nproperty float x\nproperty float y\nproperty float z\n"
+        "property float nx\nproperty float ny\nproperty float nz\nproperty uchar red\nproperty uchar green\nproperty uchar blue\n"
+        f"element face {len(faces)}\nproperty list uchar int vertex_indices\nend_header\n"
+    )
+    body = bytearray()
+    for v, nn, c in zip(verts, nrm, col):
+        body += struct.pack("<6f3B", *v, *nn, *c)
+    for f in faces:
+        body += struct.pack("<B3i", 3, *f)
+    with open(path, "wb") as fh:
+        fh.write(header.encode() + bytes(body))
+
+
+terrain_ply(out("terrain.ply"))
+
+
+def icosphere(level=2):
+    t = (1 + 5**0.5) / 2
+    v = [(-1, t, 0), (1, t, 0), (-1, -t, 0), (1, -t, 0), (0, -1, t), (0, 1, t), (0, -1, -t), (0, 1, -t), (t, 0, -1), (t, 0, 1), (-t, 0, -1), (-t, 0, 1)]
+    verts = [np.array(a, float) / np.linalg.norm(a) for a in v]
+    faces = [(0, 11, 5), (0, 5, 1), (0, 1, 7), (0, 7, 10), (0, 10, 11), (1, 5, 9), (5, 11, 4), (11, 10, 2), (10, 7, 6), (7, 1, 8),
+             (3, 9, 4), (3, 4, 2), (3, 2, 6), (3, 6, 8), (3, 8, 9), (4, 9, 5), (2, 4, 11), (6, 2, 10), (8, 6, 7), (9, 8, 1)]
+    cache = {}
+
+    def mid(a, b):
+        key = (min(a, b), max(a, b))
+        if key not in cache:
+            m = verts[a] + verts[b]
+            verts.append(m / np.linalg.norm(m))
+            cache[key] = len(verts) - 1
+        return cache[key]
+
+    for _ in range(level):
+        new = []
+        for a, b, c in faces:
+            ab, bc, ca = mid(a, b), mid(b, c), mid(c, a)
+            new += [(a, ab, ca), (b, bc, ab), (c, ca, bc), (ab, bc, ca)]
+        faces = new
+    return verts, faces
+
+
+def sphere_ply(path):
+    verts, faces = icosphere(2)
+    lines = ["ply", "format ascii 1.0", "comment an icosphere, colours from the position", f"element vertex {len(verts)}",
+             "property float x", "property float y", "property float z", "property float nx", "property float ny", "property float nz",
+             "property uchar red", "property uchar green", "property uchar blue", "property uchar alpha", f"element face {len(faces)}",
+             "property list uchar uint vertex_indices", "end_header"]
+    for v in verts:
+        col = [int(127.5 + 127.5 * c) for c in v]
+        lines.append(f"{v[0]:.5f} {v[1]:.5f} {v[2]:.5f} {v[0]:.5f} {v[1]:.5f} {v[2]:.5f} {col[0]} {col[1]} {col[2]} 255")
+    for f in faces:
+        lines.append(f"3 {f[0]} {f[1]} {f[2]}")
+    with open(path, "w") as fh:
+        fh.write("\n".join(lines) + "\n")
+
+
+sphere_ply(out("icosphere-ascii.ply"))
+
+# ----------------------------------------------------------------------- glTF
+
+
+class Gltf:
+    def __init__(self):
+        self.buf = bytearray()
+        self.views, self.accessors, self.meshes, self.nodes, self.materials = [], [], [], [], []
+
+    def _view(self, data, target=None):
+        while len(self.buf) % 4:
+            self.buf.append(0)
+        self.views.append({"buffer": 0, "byteOffset": len(self.buf), "byteLength": len(data), **({"target": target} if target else {})})
+        self.buf += data
+        return len(self.views) - 1
+
+    def accessor(self, array, ctype, kind, target=None, minmax=False):
+        a = np.ascontiguousarray(array)
+        acc = {"bufferView": self._view(a.tobytes(), target), "componentType": ctype, "count": len(a), "type": kind}
+        if minmax:
+            acc["min"] = [float(x) for x in a.min(axis=0)]
+            acc["max"] = [float(x) for x in a.max(axis=0)]
+        self.accessors.append(acc)
+        return len(self.accessors) - 1
+
+    def material(self, rgba, metallic=0.0, rough=0.8, emissive=None, name=""):
+        m = {"name": name, "pbrMetallicRoughness": {"baseColorFactor": list(rgba), "metallicFactor": metallic, "roughnessFactor": rough}}
+        if emissive:
+            m["emissiveFactor"] = list(emissive)
+        if rgba[3] < 1:
+            m["alphaMode"] = "BLEND"
+        self.materials.append(m)
+        return len(self.materials) - 1
+
+    def mesh(self, pos, nrm, idx, material, colors=None, name=""):
+        attrs = {"POSITION": self.accessor(pos.astype("<f4"), 5126, "VEC3", 34962, True), "NORMAL": self.accessor(nrm.astype("<f4"), 5126, "VEC3", 34962)}
+        if colors is not None:
+            attrs["COLOR_0"] = self.accessor(colors.astype("<f4"), 5126, "VEC3", 34962)
+        prim = {"attributes": attrs, "indices": self.accessor(idx.astype("<u2" if idx.max() < 65535 else "<u4").reshape(-1), 5123 if idx.max() < 65535 else 5125, "SCALAR", 34963), "material": material, "mode": 4}
+        self.meshes.append({"name": name, "primitives": [prim]})
+        return len(self.meshes) - 1
+
+    def node(self, **kw):
+        self.nodes.append(kw)
+        return len(self.nodes) - 1
+
+    def document(self, roots, uri=None):
+        doc = {"asset": {"version": "2.0", "generator": "exav make-models.py", "copyright": "CC0-1.0"}, "scene": 0, "scenes": [{"nodes": roots}],
+               "nodes": self.nodes, "meshes": self.meshes, "materials": self.materials, "accessors": self.accessors, "bufferViews": self.views,
+               "buffers": [{"byteLength": len(self.buf), **({"uri": uri} if uri else {})}]}
+        return doc
+
+
+def box_mesh(sx, sy, sz):
+    pos, nrm, idx = [], [], []
+    for axis in range(3):
+        for sign in (-1, 1):
+            n = np.zeros(3)
+            n[axis] = sign
+            u, v = np.zeros(3), np.zeros(3)
+            u[(axis + 1) % 3] = 1
+            v[(axis + 2) % 3] = 1
+            base = len(pos)
+            for du, dv in [(-1, -1), (1, -1), (1, 1), (-1, 1)]:
+                pos.append((n + du * u + dv * v) * 0.5 * np.array([sx, sy, sz]))
+                nrm.append(n)
+            order = [0, 1, 2, 0, 2, 3] if sign * np.dot(np.cross(u, v), n) > 0 else [0, 2, 1, 0, 3, 2]
+            idx += [base + o for o in order]
+    return np.array(pos), np.array(nrm), np.array(idx)
+
+
+def uv_sphere(r, rings=12, segs=20):
+    pos, nrm, idx = [], [], []
+    for i in range(rings + 1):
+        phi = math.pi * i / rings
+        for j in range(segs + 1):
+            th = 2 * math.pi * j / segs
+            n = np.array([math.sin(phi) * math.cos(th), math.cos(phi), math.sin(phi) * math.sin(th)])
+            pos.append(n * r)
+            nrm.append(n)
+    for i in range(rings):
+        for j in range(segs):
+            a = i * (segs + 1) + j
+            idx += [a, a + segs + 1, a + 1, a + 1, a + segs + 1, a + segs + 2]
+    return np.array(pos), np.array(nrm), np.array(idx)
+
+
+def cylinder(r, h, segs=20):
+    pos, nrm, idx = [], [], []
+    for j in range(segs + 1):
+        th = 2 * math.pi * j / segs
+        n = np.array([math.cos(th), 0, math.sin(th)])
+        pos += [n * r + [0, 0, 0], n * r + [0, h, 0]]
+        nrm += [n, n]
+    for j in range(segs):
+        a = 2 * j
+        idx += [a, a + 2, a + 1, a + 1, a + 2, a + 3]
+    c0 = len(pos)
+    pos.append(np.array([0, h, 0.0]))
+    nrm.append(np.array([0, 1.0, 0]))
+    for j in range(segs + 1):
+        th = 2 * math.pi * j / segs
+        pos.append(np.array([math.cos(th) * r, h, math.sin(th) * r]))
+        nrm.append(np.array([0, 1.0, 0]))
+    for j in range(segs):
+        idx += [c0, c0 + 2 + j, c0 + 1 + j]
+    return np.array(pos), np.array(nrm), np.array(idx)
+
+
+def quat(axis, deg):
+    a = np.array(axis, float)
+    a /= np.linalg.norm(a)
+    s = math.sin(math.radians(deg) / 2)
+    return [float(a[0] * s), float(a[1] * s), float(a[2] * s), math.cos(math.radians(deg) / 2)]
+
+
+def arm_glb(path):
+    g = Gltf()
+    steel = g.material((0.7, 0.72, 0.78, 1), 0.9, 0.35, name="steel")
+    orange = g.material((0.95, 0.45, 0.1, 1), 0.2, 0.5, name="paint")
+    blue = g.material((0.1, 0.3, 0.8, 1), 0.1, 0.6, name="blue")
+    glass = g.material((0.4, 0.8, 1.0, 0.45), 0.0, 0.1, name="glass")
+    glow = g.material((0.1, 0.1, 0.1, 1), 0.0, 0.5, emissive=(1.0, 0.3, 0.1), name="lamp")
+    base_m = g.mesh(*cylinder(0.6, 0.25), steel, name="base")
+    link_m = g.mesh(*box_mesh(0.22, 1.0, 0.22), orange, name="link")
+    joint_m = g.mesh(*uv_sphere(0.17), blue, name="joint")
+    dome_m = g.mesh(*uv_sphere(0.9, 10, 16), glass, name="dome")
+    lamp_m = g.mesh(*uv_sphere(0.1, 8, 12), glow, name="lamp")
+    pos, nrm, idx = box_mesh(2.4, 0.05, 2.4)
+    colors = np.array([[0.9, 0.9, 0.9] if (int(p[0] * 2.5 + 100) + int(p[2] * 2.5 + 100)) % 2 else [0.3, 0.3, 0.35] for p in pos])
+    floor_m = g.mesh(pos, nrm, idx, g.material((1, 1, 1, 1), 0.0, 0.9, name="floor"), colors=colors, name="floor")
+    # A tree: base > joint1 > link1 > joint2 > link2 > joint3 > link3 > lamp.
+    lamp = g.node(mesh=lamp_m, translation=[0, 0.55, 0], name="lamp")
+    link3 = g.node(mesh=link_m, scale=[0.7, 0.6, 0.7], translation=[0, 0.3, 0], name="link3", children=[lamp])
+    joint3 = g.node(mesh=joint_m, translation=[0, 1.0, 0], rotation=quat([0, 0, 1], -50), name="joint3", children=[link3])
+    link2 = g.node(mesh=link_m, translation=[0, 0.5, 0], name="link2", children=[joint3])
+    joint2 = g.node(mesh=joint_m, translation=[0, 1.0, 0], rotation=quat([0, 0, 1], 65), name="joint2", children=[link2])
+    link1 = g.node(mesh=link_m, translation=[0, 0.5, 0], name="link1", children=[joint2])
+    joint1 = g.node(mesh=joint_m, translation=[0, 0.25, 0], rotation=quat([0, 1, 0], 40), name="joint1", children=[link1])
+    base = g.node(mesh=base_m, name="base", children=[joint1])
+    dome = g.node(mesh=dome_m, translation=[0, 0.0, 0], name="dome")
+    floor = g.node(mesh=floor_m, translation=[0, -0.03, 0], name="floor")
+    root = g.node(name="arm cell", children=[floor, base, dome], rotation=quat([0, 1, 0], -20))
+    doc = g.document([root])
+    js = json.dumps(doc, separators=(",", ":")).encode()
+    js += b" " * (-len(js) % 4)
+    binary = bytes(g.buf) + b"\0" * (-len(g.buf) % 4)
+    blob = struct.pack("<4sII", b"glTF", 2, 12 + 8 + len(js) + 8 + len(binary)) + struct.pack("<I4s", len(js), b"JSON") + js + struct.pack("<I4s", len(binary), b"BIN\0") + binary
+    with open(path, "wb") as f:
+        f.write(blob)
+
+
+arm_glb(out("arm.glb"))
+
+
+def table_gltf(path):
+    g = Gltf()
+    wood = g.material((0.55, 0.35, 0.18, 1), 0.0, 0.7, name="wood")
+    cloth = g.material((0.8, 0.15, 0.15, 1), 0.0, 0.9, name="cloth")
+    top_m = g.mesh(*box_mesh(1.6, 0.08, 0.9), wood, name="top")
+    leg_m = g.mesh(*box_mesh(0.08, 0.7, 0.08), wood, name="leg")
+    seat_m = g.mesh(*box_mesh(0.45, 0.06, 0.45), cloth, name="seat")
+    back_m = g.mesh(*box_mesh(0.45, 0.5, 0.05), cloth, name="back")
+    legs = [g.node(mesh=leg_m, translation=[x, -0.39, z], name=f"leg {i}") for i, (x, z) in enumerate([(-0.74, -0.38), (0.74, -0.38), (-0.74, 0.38), (0.74, 0.38)])]
+    table = g.node(mesh=top_m, translation=[0, 0.74, 0], name="table", children=legs)
+    chair_legs = [g.node(mesh=leg_m, scale=[0.8, 0.6, 0.8], translation=[x, -0.2, z], name=f"chair leg {i}") for i, (x, z) in enumerate([(-0.19, -0.19), (0.19, -0.19), (-0.19, 0.19), (0.19, 0.19)])]
+    back = g.node(mesh=back_m, translation=[0, 0.28, -0.2], name="back")
+    seat = g.node(mesh=seat_m, translation=[0, 0.45, 0], name="seat", children=chair_legs + [back])
+    chair_a = g.node(name="chair a", translation=[-0.4, 0, 0.85], children=[seat])
+    chair_b = g.node(name="chair b", translation=[0.5, 0, -0.85], rotation=quat([0, 1, 0], 180), children=[g.node(mesh=seat_m, translation=[0, 0.45, 0], name="seat b", children=[g.node(mesh=back_m, translation=[0, 0.28, -0.2], name="back b")] + [g.node(mesh=leg_m, scale=[0.8, 0.6, 0.8], translation=[x, -0.2, z]) for x, z in [(-0.19, -0.19), (0.19, -0.19), (-0.19, 0.19), (0.19, 0.19)]])])
+    doc = g.document([table, chair_a, chair_b], uri="data:application/octet-stream;base64," + base64.b64encode(bytes(g.buf)).decode())
+    with open(path, "w") as f:
+        json.dump(doc, f, separators=(",", ":"))
+
+
+table_gltf(out("table.gltf"))
diff --git a/crates/exav-viewer/demo/examples/generate/make-office.py b/crates/exav-viewer/demo/examples/generate/make-office.py
new file mode 100644
index 00000000..a1da4e7a
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-office.py
@@ -0,0 +1,801 @@
+#!/usr/bin/env python3
+"""Writes the demo's Office and OpenDocument examples into ../files/office/,
+../files/converted/ and ../files/pdf/.
+
+    python3 -I make-office.py [OUT_DIR]      # OUT_DIR holds office/, converted/ and pdf/
+
+Output: CC0-1.0, a public domain dedication by the exav project. The four
+documents (a handbook, a workbook, a deck and a diagram) are written here as
+flat OpenDocument XML, by hand, with their text, their numbers and their
+pictures made up for the demo. LibreOffice (soffice) is then used as a black
+box that only converts those four documents into the other formats; it adds
+nothing of its own to them.
+
+Needs: Python 3, Pillow, numpy, and LibreOffice 7.5 or later (soffice).
+
+- handbook: .fodt (flat), .odt, .docx, .doc, .rtf, and a tagged PDF with
+  bookmarks and links. Styles, outline numbering, a table of contents, lists,
+  tables with merged cells and a repeated header, pictures, footnotes,
+  hyperlinks, bookmarks, fields, comments, tracked changes, columns, a
+  landscape section, headers and footers with page numbers.
+- workbook: .fods (flat), .ods, .xlsx, .xls. Three sheets with formulas,
+  number formats, merged cells, a frozen header, conditional formatting, a
+  validation list, named ranges, comments, hyperlinks, and bar, line and pie
+  charts.
+- deck: .fodp (flat), .odp, .pptx, .ppt. Slides with a master (footer, slide
+  number), pictures, a table, a native chart, shapes with gradients and
+  arrows, bulleted text of several levels, speaker notes (not shown by the
+  viewer) and transitions.
+- diagram: .fodg (flat) and .odg. A flowchart on two pages with layers,
+  connectors that follow their shapes, groups, gradients, curves, text.
+"""
+import base64
+import io
+import math
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+from xml.sax.saxutils import escape, quoteattr
+
+import numpy as np
+from PIL import Image, ImageDraw, ImageFont
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files")
+for d in ("office", "converted", "pdf"):
+    os.makedirs(os.path.join(OUT, d), exist_ok=True)
+
+NS = (
+    'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" '
+    'xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" '
+    'xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" '
+    'xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" '
+    'xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" '
+    'xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" '
+    'xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" '
+    'xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" '
+    'xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" '
+    'xmlns:ooo="http://openoffice.org/2004/office"'
+)
+
+
+def aileron(size):
+    return ImageFont.load_default(size)
+
+
+def png_b64(im):
+    buf = io.BytesIO()
+    im.save(buf, "PNG", optimize=True)
+    return base64.b64encode(buf.getvalue()).decode()
+
+
+def picture(w=640, h=360, seed=1, label="exav example picture"):
+    """A made-up picture: a lake at dusk, drawn with numpy and Pillow."""
+    y = np.linspace(0, 1, h)[:, None]
+    x = np.linspace(0, 1, w)[None, :]
+    px = np.zeros((h, w, 3), float)
+    px[..., 0] = 30 + 200 * y ** 1.5
+    px[..., 1] = 40 + 90 * y
+    px[..., 2] = 110 + 40 * y - 60 * y ** 2
+    sun = np.hypot((x - 0.7) * w / h, y - 0.55) < 0.07
+    px[sun] = (255, 245, 215)
+    im = Image.fromarray(np.clip(px, 0, 255).astype(np.uint8), "RGB")
+    d = ImageDraw.Draw(im)
+    rng = np.random.default_rng(seed)
+    pts = [(0, int(h * 0.64))] + [(i * w // 16, int(h * (0.5 + 0.1 * rng.random()))) for i in range(1, 16)] + [(w, int(h * 0.64)), (w, h), (0, h)]
+    d.polygon(pts, fill=(34, 40, 66))
+    d.rectangle((0, int(h * 0.64), w, h), fill=(28, 56, 92))
+    d.text((12, h - 30), label, font=aileron(18), fill=(245, 235, 215))
+    return im
+
+
+# ======================================================================
+# The handbook (text document)
+# ======================================================================
+
+LOREM = [
+    "The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell.",
+    "Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master.",
+    "Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and its draught, and to say how many nights they plan to stay.",
+]
+
+
+def t(text):
+    return escape(text)
+
+
+def span(style, text):
+    return f'<text:span text:style-name="{style}">{t(text)}</text:span>'
+
+
+def para(style, *content):
+    return f'<text:p text:style-name="{style}">{"".join(c if c.startswith("<") else t(c) for c in content)}</text:p>'
+
+
+def heading(level, text, bookmark=None):
+    b = f'<text:bookmark text:name="{bookmark}"/>' if bookmark else ""
+    return f'<text:h text:style-name="Heading_20_{level}" text:outline-level="{level}">{b}{t(text)}</text:h>'
+
+
+def list_(style, items, level=1):
+    out = [f'<text:list text:style-name="{style}">']
+    for it in items:
+        if isinstance(it, list):
+            out.append("<text:list-item>" + list_(style, it, level + 1) + "</text:list-item>")
+        else:
+            out.append(f'<text:list-item><text:p text:style-name="List_20_Contents">{it if it.startswith("<") else t(it)}</text:p></text:list-item>')
+    out.append("</text:list>")
+    return "".join(out)
+
+
+def table(name, style, widths, rows, header_rows=1):
+    cols = "".join(f'<table:table-column table:style-name="{w}"/>' for w in widths)
+    head, body = rows[:header_rows], rows[header_rows:]
+    out = [f'<table:table table:name="{name}" table:style-name="{style}">', cols]
+    if header_rows:
+        out.append("<table:table-header-rows>" + "".join(row for row in head) + "</table:table-header-rows>")
+    out.append("".join(body))
+    out.append("</table:table>")
+    return "".join(out)
+
+
+def cell(text, style="Tc", pstyle="Table_20_Contents", span_=1, rowspan=1, value=None):
+    attrs = f' table:style-name="{style}" office:value-type="string"'
+    if span_ > 1:
+        attrs += f' table:number-columns-spanned="{span_}"'
+    if rowspan > 1:
+        attrs += f' table:number-rows-spanned="{rowspan}"'
+    if value is not None:
+        attrs = attrs.replace('office:value-type="string"', f'office:value-type="float" office:value="{value}"')
+    return f'<table:table-cell{attrs}><text:p text:style-name="{pstyle}">{text if text.startswith("<") else t(text)}</text:p></table:table-cell>'
+
+
+def covered(n=1):
+    return "<table:covered-table-cell/>" * n
+
+
+def row(*cells):
+    return "<table:table-row>" + "".join(cells) + "</table:table-row>"
+
+
+def handbook_fodt():
+    pic = picture(640, 360)
+    pic2 = picture(480, 270, 4, "Second picture")
+    cites = " ".join([f"[{i}]" for i in range(1, 3)])
+    headings = [("Introduction", 1, "intro"), ("Text and styles", 1, "text"), ("Lists", 1, "lists"), ("Tables", 1, "tables"), ("Pictures and shapes", 1, "pictures"), ("Links, fields and notes", 1, "links"), ("Wide table (landscape)", 1, "wide")]
+    toc_entries = "".join(
+        f'<text:p text:style-name="Contents_20_1"><text:a xlink:type="simple" xlink:href="#{b}" text:style-name="Index_20_Link" text:visited-style-name="Index_20_Link">{i}. {t(h)}</text:a></text:p>'
+        for i, (h, _, b) in enumerate(headings, 1)
+    )
+    body = []
+    # Title page.
+    body.append(para("Title", "Harbour handbook"))
+    body.append(para("Subtitle", "The east quay: rules, figures and notes"))
+    body.append(para("Author", "exav project, written for the demo (CC0-1.0)"))
+    body.append(para("Author", "1 January 2000"))
+    body.append(
+        '<text:table-of-content text:style-name="Sect1" text:protected="true" text:name="Table of Contents1"><text:table-of-content-source text:outline-level="2">'
+        '<text:index-title-template text:style-name="Contents_20_Heading">Contents</text:index-title-template></text:table-of-content-source>'
+        f'<text:index-body><text:index-title text:style-name="Sect1" text:name="Table of Contents1_Head"><text:p text:style-name="Contents_20_Heading">Contents</text:p></text:index-title>{toc_entries}</text:index-body></text:table-of-content>'
+    )
+    # 1 Introduction.
+    body.append(heading(1, "Introduction", "intro"))
+    body.append(para("Text_20_body", LOREM[0]))
+    body.append(para("Text_20_body", LOREM[1] + " ", f'<text:note text:id="ftn1" text:note-class="footnote"><text:note-citation>1</text:note-citation><text:note-body><text:p text:style-name="Footnote">The register of 2000 lists sixty berths.</text:p></text:note-body></text:note>'))
+    body.append(para("Quotations", "“A harbour is a promise that the sea will wait.” "))
+    body.append(para("Text_20_body", LOREM[2]))
+    # 2 Text and styles.
+    body.append(heading(1, "Text and styles", "text"))
+    body.append(heading(2, "Character formatting"))
+    body.append(
+        para(
+            "Text_20_body",
+            span("Strong", "Bold"), ", ", span("Emphasis", "italic"), ", ", span("Underline", "underlined"), ", ", span("Strike", "struck through"), ", ", span("Red", "red"), ", ", span("Highlight", "highlighted"),
+            ", ", span("SmallCaps", "small capitals"), ", ", span("Big", "large"), " and ", span("Mono", "monospaced"), " text; H", span("Sub", "2"), "O and 10", span("Super", "3"), "; a ", span("Emphasis", "mixed"), " style.",
+        )
+    )
+    body.append(heading(2, "Paragraph formatting"))
+    body.append(para("Justified", LOREM[0] + " " + LOREM[1]))
+    body.append(para("Centered", "A centred line"))
+    body.append(para("Right", "A line aligned to the right"))
+    body.append(para("Indented", "An indented paragraph with a left border: " + LOREM[2]))
+    body.append(para("Code", "moor --boat Aurora --length 6.5"))
+    body.append(para("Code", "berth 14 free until 06:00"))
+    body.append(heading(2, "A section in two columns"))
+    body.append(
+        '<text:section text:style-name="Sect2" text:name="Columns">'
+        + para("Text_20_body", LOREM[0] + " " + LOREM[1] + " " + LOREM[2] + " " + LOREM[0])
+        + "</text:section>"
+    )
+    # 3 Lists.
+    body.append(heading(1, "Lists", "lists"))
+    body.append(list_("L1", ["Water at every berth", ["cold, from the quay", "hot, in the shower block"], "Electricity", ["16 A at berths 1 to 40", ["with a meter", "without a meter"], "32 A at the east pontoon"], "Wi-Fi on the quay"]))
+    body.append(para("Text_20_body", "Numbered, with other numbering styles at each level:"))
+    body.append(list_("L2", ["Call the office on channel 9", "Give the length and the draught", ["length over all, in metres", "draught, in metres"], "Take the berth you are given", ["tie up bow first", "tie up stern first"], "Pay at the office"]))
+    # 4 Tables.
+    body.append(heading(1, "Tables", "tables"))
+    body.append(para("Caption", "Table ", '<text:sequence text:ref-name="refTable0" text:name="Table" text:formula="ooow:Table+1" style:num-format="1">1</text:sequence>', ": berths by length, with merged cells and a repeated header row"))
+    rows = [row(cell("Length", "Th", "Table_20_Heading"), cell("Berths", "Th", "Table_20_Heading"), cell("Let by", "Th", "Table_20_Heading"), cell("Fee (EUR)", "Th", "Table_20_Heading"))]
+    for a, b, c, d in [("up to 6 m", 12, "week", 18.0), ("6 to 8 m", 18, "season", 24.5), ("8 to 10 m", 14, "season", 31.0), ("10 to 12 m", 9, "year", 42.0), ("over 12 m", 7, "year", 58.5)]:
+        rows.append(row(cell(a), cell(str(b), "TcR", "Table_20_Right", value=b), cell(c), cell(f"{d:.2f}", "TcR", "Table_20_Right", value=d)))
+    rows.append(row(cell("<text:span text:style-name=\"Strong\">Total</text:span>", "TcTotal", span_=1), cell("60", "TcTotalR", "Table_20_Right", value=60), cell("", "TcTotal", span_=2), covered()))
+    body.append(table("Table1", "Tbl1", ["TcolA", "TcolB", "TcolC", "TcolD"], rows))
+    body.append(para("Text_20_body", ""))
+    rows = [
+        row(cell("Merged across two columns", "Th", "Table_20_Heading", span_=2), covered(), cell("Merged down two rows", "Tc", rowspan=2), ),
+        row(cell("a"), cell("b"), covered()),
+        row(cell("c"), cell("d"), cell("e")),
+    ]
+    body.append(table("Table2", "Tbl1", ["TcolA", "TcolB", "TcolC"], rows, header_rows=0))
+    # 5 Pictures and shapes.
+    body.append(heading(1, "Pictures and shapes", "pictures"))
+    body.append(
+        '<text:p text:style-name="Text_20_body"><draw:frame draw:style-name="fr1" draw:name="Picture 1" text:anchor-type="paragraph" svg:width="8cm" svg:height="4.5cm">'
+        f'<draw:image><office:binary-data>{png_b64(pic)}</office:binary-data></draw:image><svg:title>A lake at dusk</svg:title><svg:desc>A made-up picture of a lake and a hill at dusk.</svg:desc></draw:frame>'
+        + t(LOREM[0] + " " + LOREM[1] + " " + LOREM[2] + " ")
+        + t(LOREM[0] + " ")
+        + "</text:p>"
+    )
+    body.append(para("Caption", "Figure ", '<text:sequence text:ref-name="refFigure0" text:name="Figure" text:formula="ooow:Figure+1" style:num-format="1">1</text:sequence>', ": a picture that text flows around"))
+    body.append(
+        '<text:p text:style-name="Centered"><draw:frame draw:style-name="fr2" draw:name="Picture 2" text:anchor-type="as-char" svg:width="6cm" svg:height="3.375cm">'
+        f'<draw:image><office:binary-data>{png_b64(pic2)}</office:binary-data></draw:image><svg:title>The second picture</svg:title></draw:frame></text:p>'
+    )
+    body.append(
+        '<text:p text:style-name="Text_20_body"><draw:custom-shape draw:style-name="gr1" draw:name="Callout" text:anchor-type="paragraph" svg:width="6cm" svg:height="2cm" svg:x="2cm" svg:y="0.2cm">'
+        '<text:p text:style-name="Centered">A shape with text in it</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="round-rectangle" draw:enhanced-path="M 3600 0 X 0 3600 L 0 18000 Y 3600 21600 L 18000 21600 X 21600 18000 L 21600 3600 Y 18000 0 Z N"/></draw:custom-shape>'
+        "A line of text beside a shape.</text:p>"
+    )
+    # 6 Links, fields and notes.
+    body.append(heading(1, "Links, fields and notes", "links"))
+    body.append(
+        para(
+            "Text_20_body",
+            "An external link: ", '<text:a xlink:type="simple" xlink:href="https://exav.org/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">exav.org</text:a>',
+            ". An internal link: ", '<text:a xlink:type="simple" xlink:href="#intro" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">back to the introduction</text:a>',
+            ". A reference to a bookmark: ", '<text:bookmark-ref text:reference-format="text" text:ref-name="tables">Tables</text:bookmark-ref>', ".",
+        )
+    )
+    body.append(
+        para(
+            "Text_20_body", "Fields: this document is titled “", '<text:title>Harbour handbook</text:title>', "”, and this line is on page ",
+            '<text:page-number text:select-page="current">1</text:page-number>', ". A fixed date: ", '<text:date style:data-style-name="N10" text:date-value="2000-01-01" text:fixed="true">01/01/2000</text:date>', ".",
+        )
+    )
+    body.append(
+        para(
+            "Text_20_body", "A comment is attached to this word", '<office:annotation><dc:creator>exav</dc:creator><dc:date>2000-01-01T00:00:00</dc:date><text:p>A comment: the viewer shows or ignores it.</text:p></office:annotation>',
+            ". A change that was tracked: ", '<text:change-start text:change-id="ct1"/>this text was inserted<text:change-end text:change-id="ct1"/>', ", ", '<text:change text:change-id="ct2"/>', "and some text was deleted before this one.",
+        )
+    )
+    body.append(para("Text_20_body", f"Citations {cites}. ", '<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>2</text:note-citation><text:note-body><text:p text:style-name="Footnote">A second footnote, with <text:span text:style-name="Emphasis">emphasis</text:span>.</text:p></text:note-body></text:note>'))
+    # 7 A wide table in landscape.
+    body.append('<text:h text:style-name="Heading_20_1_20_Landscape" text:outline-level="1"><text:bookmark text:name="wide"/>Wide table (landscape)</text:h>')
+    heads = ["Month"] + [f"Berth {i}" for i in range(1, 11)] + ["Total"]
+    rows = [row(*[cell(h, "Th", "Table_20_Heading") for h in heads])]
+    for m, name in enumerate(["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]):
+        vals = [(m * 7 + i * 5) % 9 + 1 for i in range(10)]
+        rows.append(row(cell(name), *[cell(str(v), "TcR", "Table_20_Right", value=v) for v in vals], cell(str(sum(vals)), "TcTotalR", "Table_20_Right", value=sum(vals))))
+    body.append(table("Table3", "TblWide", ["TcolW"] * 12, rows))
+    body.append(para("Text_20_body", "Nights let at each berth, by month."))
+
+    return f"""<?xml version="1.0" encoding="UTF-8"?>
+<office:document {NS} office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Harbour handbook</dc:title><dc:subject>A document made for the exav demo (CC0-1.0)</dc:subject><meta:keyword>demo</meta:keyword><dc:language>en-US</dc:language><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:font-face-decls>
+<style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+<style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
+<style:font-face style:name="Liberation Mono" svg:font-family="'Liberation Mono'" style:font-family-generic="modern" style:font-pitch="fixed"/>
+</office:font-face-decls>
+<office:styles>
+<style:default-style style:family="paragraph"><style:paragraph-properties fo:orphans="2" fo:widows="2" style:tab-stop-distance="1.25cm"/><style:text-properties style:font-name="Liberation Serif" fo:font-size="11pt" fo:language="en" fo:country="US"/></style:default-style>
+<style:style style:name="Standard" style:family="paragraph" style:class="text"/>
+<style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"><style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.22cm" fo:line-height="125%"/></style:style>
+<style:style style:name="Title" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Subtitle" style:class="chapter"><style:paragraph-properties fo:margin-top="3cm" fo:margin-bottom="0.3cm" fo:text-align="start"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="30pt" fo:font-weight="bold" fo:color="#0b4f6c"/></style:style>
+<style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Standard" style:class="chapter"><style:paragraph-properties fo:margin-bottom="0.6cm"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="16pt" fo:color="#555555"/></style:style>
+<style:style style:name="Author" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-bottom="0.1cm"/><style:text-properties fo:font-size="10pt" fo:color="#666666"/></style:style>
+<style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text"><style:paragraph-properties fo:margin-top="0.45cm" fo:margin-bottom="0.2cm" fo:keep-with-next="always"/><style:text-properties style:font-name="Liberation Sans" fo:font-weight="bold"/></style:style>
+<style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="1" style:list-style-name="Outline" style:class="text"><style:text-properties fo:font-size="17pt" fo:color="#0b4f6c"/></style:style>
+<style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Text_20_body" style:default-outline-level="2" style:list-style-name="Outline" style:class="text"><style:text-properties fo:font-size="13pt" fo:color="#146c94"/></style:style>
+<style:style style:name="Heading_20_1_20_Landscape" style:display-name="Heading 1 Landscape" style:family="paragraph" style:parent-style-name="Heading_20_1"><style:paragraph-properties style:page-number="auto" style:master-page-name="Landscape" fo:break-before="page"/></style:style>
+<style:style style:name="Contents_20_Heading" style:display-name="Contents Heading" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-top="1.5cm" fo:margin-bottom="0.3cm"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="15pt" fo:font-weight="bold"/></style:style>
+<style:style style:name="Contents_20_1" style:display-name="Contents 1" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-bottom="0.1cm"/></style:style>
+<style:style style:name="Quotations" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm" fo:margin-top="0.2cm" fo:margin-bottom="0.3cm" fo:padding="0.15cm" fo:border-left="2.25pt solid #146c94" fo:border-top="none" fo:border-bottom="none" fo:border-right="none"/><style:text-properties fo:font-style="italic" fo:color="#333333"/></style:style>
+<style:style style:name="Justified" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:text-align="justify"/></style:style>
+<style:style style:name="Centered" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:text-align="center"/></style:style>
+<style:style style:name="Right" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:text-align="end"/></style:style>
+<style:style style:name="Indented" style:family="paragraph" style:parent-style-name="Text_20_body"><style:paragraph-properties fo:margin-left="1.5cm" fo:border-left="1pt solid #999999" fo:padding-left="0.2cm"/></style:style>
+<style:style style:name="Code" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-left="0.5cm" fo:margin-bottom="0cm" fo:background-color="#f0f0f0" fo:padding="0.08cm"/><style:text-properties style:font-name="Liberation Mono" fo:font-size="9.5pt"/></style:style>
+<style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0.2cm"/><style:text-properties fo:font-size="9pt" fo:font-style="italic" fo:color="#444444"/></style:style>
+<style:style style:name="Footnote" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-left="0.5cm" fo:text-indent="-0.5cm"/><style:text-properties fo:font-size="9pt"/></style:style>
+<style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:text-properties fo:font-size="9pt" fo:color="#666666"/></style:style>
+<style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="9pt" fo:color="#666666"/></style:style>
+<style:style style:name="List_20_Contents" style:display-name="List Contents" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:margin-bottom="0.08cm"/></style:style>
+<style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard"/>
+<style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="Table_20_Right" style:display-name="Table Right" style:family="paragraph" style:parent-style-name="Table_20_Contents"><style:paragraph-properties fo:text-align="end"/></style:style>
+<style:style style:name="Strong" style:family="text"><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="Emphasis" style:family="text"><style:text-properties fo:font-style="italic"/></style:style>
+<style:style style:name="Underline" style:family="text"><style:text-properties style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/></style:style>
+<style:style style:name="Strike" style:family="text"><style:text-properties style:text-line-through-style="solid"/></style:style>
+<style:style style:name="Red" style:family="text"><style:text-properties fo:color="#c0392b"/></style:style>
+<style:style style:name="Highlight" style:family="text"><style:text-properties fo:background-color="#ffeb3b"/></style:style>
+<style:style style:name="SmallCaps" style:family="text"><style:text-properties fo:font-variant="small-caps"/></style:style>
+<style:style style:name="Big" style:family="text"><style:text-properties fo:font-size="15pt"/></style:style>
+<style:style style:name="Mono" style:family="text"><style:text-properties style:font-name="Liberation Mono" fo:font-size="10pt"/></style:style>
+<style:style style:name="Sub" style:family="text"><style:text-properties style:text-position="sub 58%"/></style:style>
+<style:style style:name="Super" style:family="text"><style:text-properties style:text-position="super 58%"/></style:style>
+<style:style style:name="Internet_20_link" style:display-name="Internet link" style:family="text"><style:text-properties fo:color="#0645ad" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/></style:style>
+<style:style style:name="Visited_20_Internet_20_Link" style:display-name="Visited Internet Link" style:family="text"><style:text-properties fo:color="#6a1b9a" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/></style:style>
+<style:style style:name="Index_20_Link" style:display-name="Index Link" style:family="text"/>
+<text:outline-style style:name="Outline">
+<text:outline-level-style text:level="1" style:num-format="1" style:num-suffix=". "><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9cm" fo:text-indent="-0.9cm" fo:margin-left="0.9cm"/></style:list-level-properties></text:outline-level-style>
+<text:outline-level-style text:level="2" style:num-format="1" text:display-levels="2" style:num-suffix=" "><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.2cm" fo:text-indent="-1.2cm" fo:margin-left="1.2cm"/></style:list-level-properties></text:outline-level-style>
+</text:outline-style>
+<text:list-style style:name="L1">
+<text:list-level-style-bullet text:level="1" text:bullet-char="•"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9cm" fo:text-indent="-0.5cm" fo:margin-left="0.9cm"/></style:list-level-properties></text:list-level-style-bullet>
+<text:list-level-style-bullet text:level="2" text:bullet-char="◦"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.7cm" fo:text-indent="-0.5cm" fo:margin-left="1.7cm"/></style:list-level-properties></text:list-level-style-bullet>
+<text:list-level-style-bullet text:level="3" text:bullet-char="▪"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.5cm" fo:text-indent="-0.5cm" fo:margin-left="2.5cm"/></style:list-level-properties></text:list-level-style-bullet>
+</text:list-style>
+<text:list-style style:name="L2">
+<text:list-level-style-number text:level="1" style:num-suffix="." style:num-format="1"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="0.9cm" fo:text-indent="-0.6cm" fo:margin-left="0.9cm"/></style:list-level-properties></text:list-level-style-number>
+<text:list-level-style-number text:level="2" style:num-suffix=")" style:num-format="a"><style:list-level-properties text:list-level-position-and-space-mode="label-alignment"><style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.8cm" fo:text-indent="-0.6cm" fo:margin-left="1.8cm"/></style:list-level-properties></text:list-level-style-number>
+</text:list-style>
+<text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
+<text:linenumbering-configuration text:number-lines="false"/>
+<style:style style:name="fr1" style:family="graphic"><style:graphic-properties style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="right" style:horizontal-rel="paragraph" fo:margin-left="0.3cm" fo:margin-bottom="0.2cm" fo:border="0.5pt solid #999999"/></style:style>
+<style:style style:name="fr2" style:family="graphic"><style:graphic-properties style:vertical-pos="top" style:vertical-rel="baseline" fo:border="0.5pt solid #999999"/></style:style>
+<style:style style:name="gr1" style:family="graphic"><style:graphic-properties draw:fill="solid" draw:fill-color="#dbe9f4" draw:stroke="solid" svg:stroke-color="#146c94" svg:stroke-width="0.06cm" style:wrap="none" style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<number:date-style style:name="N10"><number:day number:style="long"/><number:text>/</number:text><number:month number:style="long"/><number:text>/</number:text><number:year number:style="long"/></number:date-style>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="21cm" fo:page-height="29.7cm" style:print-orientation="portrait" fo:margin-top="1.5cm" fo:margin-bottom="1.2cm" fo:margin-left="2.2cm" fo:margin-right="2.2cm"/><style:header-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-bottom="0.4cm"/></style:header-style><style:footer-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-top="0.4cm"/></style:footer-style></style:page-layout>
+<style:page-layout style:name="pm2"><style:page-layout-properties fo:page-width="29.7cm" fo:page-height="21cm" style:print-orientation="landscape" fo:margin-top="1.5cm" fo:margin-bottom="1.2cm" fo:margin-left="2.2cm" fo:margin-right="2.2cm"/><style:header-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-bottom="0.4cm"/></style:header-style><style:footer-style><style:header-footer-properties fo:min-height="0.5cm" fo:margin-top="0.4cm"/></style:footer-style></style:page-layout>
+<style:style style:name="Sect1" style:family="section"><style:section-properties text:dont-balance-text-columns="false" style:editable="false"><style:columns fo:column-count="0" fo:column-gap="0cm"/></style:section-properties></style:style>
+<style:style style:name="Sect2" style:family="section"><style:section-properties text:dont-balance-text-columns="false" style:editable="false"><style:columns fo:column-count="2" fo:column-gap="0.8cm"><style:column-sep style:width="0.5pt" style:color="#999999" style:height="100%"/><style:column style:rel-width="1*" fo:start-indent="0cm" fo:end-indent="0.4cm"/><style:column style:rel-width="1*" fo:start-indent="0.4cm" fo:end-indent="0cm"/></style:columns></style:section-properties></style:style>
+<style:style style:name="Tbl1" style:family="table"><style:table-properties style:width="14cm" table:align="left" fo:margin-top="0.2cm" fo:margin-bottom="0.3cm"/></style:style>
+<style:style style:name="TblWide" style:family="table"><style:table-properties style:width="24.5cm" table:align="left"/></style:style>
+<style:style style:name="TcolA" style:family="table-column"><style:table-column-properties style:column-width="4.5cm"/></style:style>
+<style:style style:name="TcolB" style:family="table-column"><style:table-column-properties style:column-width="3cm"/></style:style>
+<style:style style:name="TcolC" style:family="table-column"><style:table-column-properties style:column-width="3.5cm"/></style:style>
+<style:style style:name="TcolD" style:family="table-column"><style:table-column-properties style:column-width="3cm"/></style:style>
+<style:style style:name="TcolW" style:family="table-column"><style:table-column-properties style:column-width="2.04cm"/></style:style>
+<style:style style:name="Tc" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:border="0.5pt solid #8aa6b4"/></style:style>
+<style:style style:name="TcR" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:border="0.5pt solid #8aa6b4"/></style:style>
+<style:style style:name="Th" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:background-color="#0b4f6c" fo:border="0.5pt solid #8aa6b4"/></style:style>
+<style:style style:name="TcTotal" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:background-color="#e8f1f5" fo:border="0.5pt solid #8aa6b4" fo:border-top="1.5pt solid #000000"/></style:style>
+<style:style style:name="TcTotalR" style:family="table-cell"><style:table-cell-properties fo:padding="0.1cm" fo:background-color="#e8f1f5" fo:border="0.5pt solid #8aa6b4" fo:border-top="1.5pt solid #000000"/></style:style>
+</office:automatic-styles>
+<office:master-styles>
+<style:master-page style:name="Standard" style:page-layout-name="pm1"><style:header><text:p text:style-name="Header">Harbour handbook<text:tab/><text:tab/>exav demo</text:p></style:header><style:footer><text:p text:style-name="Footer">Page <text:page-number text:select-page="current">1</text:page-number> of <text:page-count>1</text:page-count></text:p></style:footer></style:master-page>
+<style:master-page style:name="Landscape" style:page-layout-name="pm2"><style:header><text:p text:style-name="Header">Harbour handbook (landscape section)</text:p></style:header><style:footer><text:p text:style-name="Footer">Page <text:page-number text:select-page="current">1</text:page-number></text:p></style:footer></style:master-page>
+</office:master-styles>
+<office:body><office:text>
+<text:tracked-changes text:track-changes="false">
+<text:changed-region text:id="ct1"><text:insertion><office:change-info><dc:creator>exav</dc:creator><dc:date>2000-01-01T00:00:00</dc:date></office:change-info></text:insertion></text:changed-region>
+<text:changed-region text:id="ct2"><text:deletion><office:change-info><dc:creator>exav</dc:creator><dc:date>2000-01-01T00:00:00</dc:date></office:change-info><text:p text:style-name="Text_20_body">some deleted words </text:p></text:deletion></text:changed-region>
+</text:tracked-changes>
+{"".join(body)}
+</office:text></office:body>
+</office:document>
+"""
+
+
+# ======================================================================
+# The workbook (spreadsheet)
+# ======================================================================
+
+
+def chart(kind, title, ranges, cats, series, width="15cm", height="8.5cm", legend=True):
+    """An embedded chart object. series: [(name cell, values range)]; ranges: the whole data range."""
+    ser = "".join(
+        f'<chart:series chart:values-cell-range-address="{v}" chart:label-cell-address="{n}" chart:class="chart:{kind}" chart:style-name="chs{i}"><chart:data-point chart:repeated="1"/></chart:series>'
+        for i, (n, v) in enumerate(series)
+    )
+    styles = "".join(
+        f'<style:style style:name="chs{i}" style:family="chart"><style:graphic-properties draw:stroke="{"solid" if kind == "line" else "none"}" svg:stroke-color="{c}" draw:fill-color="{c}"/></style:style>'
+        for i, c in enumerate(["#146c94", "#f6a01a", "#2c7a4b", "#c0392b"])
+    )
+    pie_styles = ""
+    if kind == "circle":
+        pie_styles = "".join(f'<style:style style:name="pt{i}" style:family="chart"><style:graphic-properties draw:fill-color="{c}"/></style:style>' for i, c in enumerate(["#146c94", "#f6a01a", "#2c7a4b", "#c0392b", "#8e44ad"]))
+        ser = ser.replace('<chart:data-point chart:repeated="1"/>', "".join(f'<chart:data-point chart:style-name="pt{i}"/>' for i in range(5)))
+    axes = (
+        f'<chart:axis chart:dimension="x" chart:name="primary-x"><chart:categories table:cell-range-address="{cats}"/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y"><chart:grid chart:class="major"/></chart:axis>'
+        if kind != "circle"
+        else ""
+    )
+    return f"""<draw:object><office:document office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"><office:automatic-styles>{styles}{pie_styles}</office:automatic-styles><office:body><office:chart>
+<chart:chart chart:class="chart:{kind}" svg:width="{width}" svg:height="{height}"><chart:title><text:p>{t(title)}</text:p></chart:title>{'<chart:legend chart:legend-position="end"/>' if legend else ""}
+<chart:plot-area table:cell-range-address="{ranges}" chart:data-source-has-labels="both">{axes}{ser}</chart:plot-area></chart:chart></office:chart></office:body></office:document></draw:object>"""
+
+
+def workbook_fods():
+    months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun"]
+    cats = ["Berths let", "Visitors", "Shop", "Fuel", "Repairs"]
+    values = [[11200, 11800, 12100, 15400, 21800, 24900], [3100, 3300, 4800, 8200, 15600, 19200], [1200, 1100, 1500, 2600, 4100, 5200], [900, 800, 1100, 1900, 3300, 4400], [-2100, -900, -3300, -1500, -800, -1200]]
+
+    def fcell(v, style=None):
+        return f'<table:table-cell{f" table:style-name={quoteattr(style)}" if style else ""} office:value-type="float" office:value="{v}"><text:p>{v}</text:p></table:table-cell>'
+
+    def scell(s, style=None, extra=""):
+        return f'<table:table-cell{f" table:style-name={quoteattr(style)}" if style else ""}{extra} office:value-type="string"><text:p>{t(s)}</text:p></table:table-cell>'
+
+    def fm(formula, style=None, value=None, vtype="float"):
+        key = "office:string-value" if vtype == "string" else "office:value"
+        v = f' office:value-type="{vtype}"' + (f' {key}="{value}"' if value is not None else "")
+        return f'<table:table-cell{f" table:style-name={quoteattr(style)}" if style else ""} table:formula={quoteattr(formula)}{v}><text:p>{value if value is not None else ""}</text:p></table:table-cell>'
+
+    # Sheet 1: Budget (rows 1 title, 2 note, 3 header, 4-8 data, 9 total, then a lookup block).
+    rows = []
+    rows.append('<table:table-row table:style-name="ro-title">' + scell("Harbour budget, first half", "title", ' table:number-columns-spanned="9" table:number-rows-spanned="1"') + "<table:covered-table-cell/>" * 8 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Amounts in euros; the totals are formulas.", "note") + "<table:table-cell/>" * 8 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Category", "head") + "".join(scell(m, "head") for m in months) + scell("Total", "head") + scell("Share", "head") + "</table:table-row>")
+    # Every formula carries the value it gives, as a spreadsheet saves it.
+    grand = sum(sum(v) for v in values)
+    nets = [sum(v[i] for v in values) for i in range(6)]
+    for i, (name, vals) in enumerate(zip(cats, values)):
+        r = 4 + i
+        total = sum(vals)
+        rows.append(
+            "<table:table-row>" + scell(name, "label") + "".join(fcell(v, "eur") for v in vals)
+            + fm(f"of:=SUM([.B{r}:.G{r}])", "eurb", total) + fm(f"of:=[.H{r}]/[.H$9]", "pct", total / grand) + "</table:table-row>"
+        )
+    rows.append(
+        "<table:table-row>" + scell("Net", "labelb") + "".join(fm(f"of:=SUM([.{c}4:.{c}8])", "eurtot", nets[i]) for i, c in enumerate("BCDEFG")) + fm("of:=SUM([.H4:.H8])", "eurtot", grand) + fm("of:=SUM([.I4:.I8])", "pcttot", 1) + "</table:table-row>"
+    )
+    rows.append("<table:table-row>" + "<table:table-cell/>" * 9 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Averages and checks", "labelb") + "<table:table-cell/>" * 8 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Average a month", "label") + fm("of:=AVERAGE([.B9:.G9])", "eur", grand / 6) + scell("Best month", "label") + fm("of:=INDEX([.B3:.G3];MATCH(MAX([.B9:.G9]);[.B9:.G9];0))", None, months[nets.index(max(nets))], "string") + scell("Months in credit", "label") + fm("of:=COUNTIF([.B9:.G9];\">0\")", None, sum(1 for n in nets if n > 0)) + "<table:table-cell/>" * 3 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Largest item", "label") + fm("of:=MAX([.B4:.G8])", "eur", max(max(v) for v in values)) + scell("Rounded share of fuel", "label") + fm("of:=ROUND([.I7];3)", "pct", round(sum(values[3]) / grand, 3)) + scell("Status", "label") + fm('of:=IF([.H9]>0;"surplus";"deficit")', None, "surplus" if grand > 0 else "deficit", "string") + "<table:table-cell/>" * 3 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Lookup: category", "label") + scell("Shop", "input") + scell("its total", "label") + fm("of:=VLOOKUP([.B14];[.A4:.H8];8;0)", "eur", sum(values[2])) + "<table:table-cell/>" * 5 + "</table:table-row>")
+    rows.append("<table:table-row>" + scell("Link", "label") + '<table:table-cell office:value-type="string"><text:p><text:a xlink:href="https://exav.org/viewer/" xlink:type="simple">exav.org/viewer</text:a></text:p></table:table-cell>' + scell("Note on a cell", "label") + '<table:table-cell office:value-type="string"><office:annotation><dc:creator>exav</dc:creator><text:p>This cell has a comment.</text:p></office:annotation><text:p>hover me</text:p></table:table-cell>' + "<table:table-cell/>" * 5 + "</table:table-row>")
+    budget_cols = '<table:table-column table:style-name="co-a"/><table:table-column table:style-name="co-n" table:number-columns-repeated="6"/><table:table-column table:style-name="co-t"/><table:table-column table:style-name="co-p"/>'
+    budget = '<table:table table:name="Budget" table:style-name="ta1">' + budget_cols + "".join(rows) + "</table:table>"
+
+    # Sheet 2: Data, 120 rows, with an autofilter.
+    rng = np.random.default_rng(3)
+    regions, products = ["West", "East", "North", "South"], ["Mooring", "Fuel", "Water", "Power", "Shop"]
+    drows = ["<table:table-row>" + "".join(scell(h, "head") for h in ["Date", "Region", "Product", "Units", "Unit price", "Amount"]) + "</table:table-row>"]
+    units_sum, amount_sum = 0, 0.0
+    for i in range(120):
+        day = 1 + i * 150 // 120
+        month, dd = 1 + (day - 1) // 28, 1 + (day - 1) % 28
+        units = int(rng.integers(1, 40))
+        price = round(float(rng.uniform(2, 60)), 2)
+        units_sum += units
+        amount_sum += round(units * price, 2)
+        r = i + 2
+        drows.append(
+            "<table:table-row>"
+            f'<table:table-cell table:style-name="date" office:value-type="date" office:date-value="2000-{month:02d}-{dd:02d}"><text:p>{dd:02d}/{month:02d}/2000</text:p></table:table-cell>'
+            + scell(regions[i % 4]) + scell(products[(i * 3) % 5]) + fcell(units) + fcell(price, "eur2") + fm(f"of:=[.D{r}]*[.E{r}]", "eur2", round(units * price, 2)) + "</table:table-row>"
+        )
+    drows.append("<table:table-row>" + scell("Total", "labelb") + "<table:table-cell/>" * 2 + fm("of:=SUM([.D2:.D121])", "eurtot", units_sum) + "<table:table-cell/>" + fm("of:=SUBTOTAL(9;[.F2:.F121])", "eurtot", round(amount_sum, 2)) + "</table:table-row>")
+    data = (
+        '<table:table table:name="Data" table:style-name="ta1"><table:table-column table:style-name="co-d"/><table:table-column table:style-name="co-n" table:number-columns-repeated="5"/>'
+        + "".join(drows) + "</table:table>"
+    )
+
+    # Sheet 3: Charts.
+    c1 = chart("bar", "Spending by category", "Budget.$A$3:.$G$7", "Budget.$A$4:.$A$7", [("Budget.$B$3", "Budget.$B$4:.$B$7"), ("Budget.$G$3", "Budget.$G$4:.$G$7")])
+    c2 = chart("line", "Net income by month", "Budget.$A$3:.$G$3", "Budget.$B$3:.$G$3", [("Budget.$A$9", "Budget.$B$9:.$G$9")])
+    c3 = chart("circle", "Share of the total", "Budget.$A$4:.$A$8", "Budget.$A$4:.$A$8", [("Budget.$I$3", "Budget.$I$4:.$I$8")])
+    charts = (
+        '<table:table table:name="Charts" table:style-name="ta1"><table:shapes>'
+        f'<draw:frame draw:style-name="gr1" draw:name="Bar chart" table:end-cell-address="Charts.H19" table:end-x="0.3cm" table:end-y="0.3cm" svg:width="14cm" svg:height="8cm" svg:x="0.5cm" svg:y="0.5cm">{c1}</draw:frame>'
+        f'<draw:frame draw:style-name="gr1" draw:name="Line chart" table:end-cell-address="Charts.P19" table:end-x="0.3cm" table:end-y="0.3cm" svg:width="14cm" svg:height="8cm" svg:x="15cm" svg:y="0.5cm">{c2}</draw:frame>'
+        f'<draw:frame draw:style-name="gr1" draw:name="Pie chart" table:end-cell-address="Charts.H38" table:end-x="0.3cm" table:end-y="0.3cm" svg:width="14cm" svg:height="8cm" svg:x="0.5cm" svg:y="9cm">{c3}</draw:frame>'
+        '</table:shapes><table:table-column/><table:table-row><table:table-cell office:value-type="string"><text:p/></table:table-cell></table:table-row></table:table>'
+    )
+
+    settings = """<office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry>
+<config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
+<config:config-item-map-named config:name="Tables"><config:config-item-map-entry config:name="Budget">
+<config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>
+<config:config-item config:name="VerticalSplitPosition" config:type="int">3</config:config-item><config:config-item config:name="PositionBottom" config:type="int">3</config:config-item>
+</config:config-item-map-entry><config:config-item-map-entry config:name="Data">
+<config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>
+<config:config-item config:name="VerticalSplitPosition" config:type="int">1</config:config-item><config:config-item config:name="PositionBottom" config:type="int">1</config:config-item>
+</config:config-item-map-entry></config:config-item-map-named></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set></office:settings>"""
+
+    return f"""<?xml version="1.0" encoding="UTF-8"?>
+<office:document {NS} office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Harbour workbook</dc:title><dc:subject>A workbook made for the exav demo (CC0-1.0)</dc:subject><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+{settings}
+<office:font-face-decls><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"/></office:font-face-decls>
+<office:styles>
+<style:default-style style:family="table-cell"><style:text-properties style:font-name="Liberation Sans" fo:font-size="10pt"/></style:default-style>
+<number:currency-style style:name="NEUR"><number:currency-symbol number:language="en" number:country="IE">€</number:currency-symbol><number:number number:decimal-places="0" number:min-integer-digits="1" number:grouping="true"/></number:currency-style>
+<number:currency-style style:name="NEUR2"><number:currency-symbol number:language="en" number:country="IE">€</number:currency-symbol><number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:currency-style>
+<number:percentage-style style:name="NPCT"><number:number number:decimal-places="1" number:min-integer-digits="1"/><number:text>%</number:text></number:percentage-style>
+<number:date-style style:name="NDATE"><number:day number:style="long"/><number:text>/</number:text><number:month number:style="long"/><number:text>/</number:text><number:year number:style="long"/></number:date-style>
+<style:style style:name="Default" style:family="table-cell"/>
+<style:style style:name="title" style:family="table-cell"><style:table-cell-properties fo:background-color="#0b4f6c" style:vertical-align="middle"/><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="note" style:family="table-cell"><style:text-properties fo:font-style="italic" fo:color="#666666"/></style:style>
+<style:style style:name="head" style:family="table-cell"><style:table-cell-properties fo:background-color="#146c94" fo:border-bottom="1.5pt solid #000000"/><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="label" style:family="table-cell"><style:table-cell-properties fo:border-bottom="0.5pt solid #cccccc"/></style:style>
+<style:style style:name="labelb" style:family="table-cell"><style:table-cell-properties fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="input" style:family="table-cell"><style:table-cell-properties fo:background-color="#fff6cc" fo:border="0.5pt solid #d6b656"/></style:style>
+<style:style style:name="eur" style:family="table-cell" style:data-style-name="NEUR"><style:table-cell-properties fo:border-bottom="0.5pt solid #cccccc"/></style:style>
+<style:style style:name="eurb" style:family="table-cell" style:data-style-name="NEUR"><style:table-cell-properties fo:background-color="#e8f1f5" fo:border-bottom="0.5pt solid #cccccc"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="eurtot" style:family="table-cell" style:data-style-name="NEUR"><style:table-cell-properties fo:background-color="#e8f1f5" fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="eur2" style:family="table-cell" style:data-style-name="NEUR2"/>
+<style:style style:name="pct" style:family="table-cell" style:data-style-name="NPCT"><style:table-cell-properties fo:border-bottom="0.5pt solid #cccccc"/></style:style>
+<style:style style:name="pcttot" style:family="table-cell" style:data-style-name="NPCT"><style:table-cell-properties fo:background-color="#e8f1f5" fo:border-top="1.5pt solid #000000"/><style:text-properties fo:font-weight="bold"/></style:style>
+<style:style style:name="date" style:family="table-cell" style:data-style-name="NDATE"/>
+<style:style style:name="bad" style:family="table-cell"><style:table-cell-properties fo:background-color="#f8d7da"/><style:text-properties fo:color="#842029"/></style:style>
+<style:style style:name="good" style:family="table-cell"><style:table-cell-properties fo:background-color="#d1e7dd"/><style:text-properties fo:color="#0f5132"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<style:style style:name="co-a" style:family="table-column"><style:table-column-properties style:column-width="4.2cm"/></style:style>
+<style:style style:name="co-n" style:family="table-column"><style:table-column-properties style:column-width="2.4cm"/></style:style>
+<style:style style:name="co-t" style:family="table-column"><style:table-column-properties style:column-width="2.8cm"/></style:style>
+<style:style style:name="co-p" style:family="table-column"><style:table-column-properties style:column-width="2cm"/></style:style>
+<style:style style:name="co-d" style:family="table-column"><style:table-column-properties style:column-width="2.6cm"/></style:style>
+<style:style style:name="ro-title" style:family="table-row"><style:table-row-properties style:row-height="1.1cm"/></style:style>
+<style:style style:name="ta1" style:family="table" style:master-page-name="Default"><style:table-properties table:display="true" style:writing-mode="lr-tb"/></style:style>
+<style:style style:name="gr1" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none"/></style:style>
+</office:automatic-styles>
+<office:master-styles><style:master-page style:name="Default" style:page-layout-name="pm1"/></office:master-styles>
+<office:body><office:spreadsheet>
+<table:content-validations><table:content-validation table:name="val1" table:condition="of:cell-content-is-in-list(&quot;Berths let&quot;;&quot;Visitors&quot;;&quot;Shop&quot;;&quot;Fuel&quot;;&quot;Repairs&quot;)" table:allow-empty-cell="true" table:display-list="unsorted" table:base-cell-address="Budget.B14"><table:error-message table:display="true" table:message-type="stop" table:title="Not a category">Choose one of the five categories.</table:error-message></table:content-validation></table:content-validations>
+{budget.replace('<table:table-cell table:style-name="input" office:value-type="string"><text:p>Shop</text:p>', '<table:table-cell table:style-name="input" table:content-validation-name="val1" office:value-type="string"><text:p>Shop</text:p>')}
+{data}
+{charts}
+<table:named-expressions><table:named-range table:name="Spending" table:base-cell-address="$Budget.$B$4" table:cell-range-address="$Budget.$B$4:.$G$8"/><table:named-range table:name="NetByMonth" table:base-cell-address="$Budget.$B$9" table:cell-range-address="$Budget.$B$9:.$G$9"/></table:named-expressions>
+<table:database-ranges><table:database-range table:name="SalesData" table:target-range-address="Data.A1:.F121" table:display-filter-buttons="true" table:contains-header="true"/></table:database-ranges>
+</office:spreadsheet></office:body>
+</office:document>
+"""
+
+
+# ======================================================================
+# The deck (presentation)
+# ======================================================================
+
+
+def deck_fodp():
+    pic = picture(800, 450, 2, "Slide picture")
+    c = chart("bar", "Berths let by month", "local-table.$A$1:.$C$7", "local-table.$A$2:.$A$7", [("local-table.$B$1", "local-table.$B$2:.$B$7"), ("local-table.$C$1", "local-table.$C$2:.$C$7")])
+    months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun"]
+    local = '<table:table table:name="local-table"><table:table-header-columns><table:table-column/></table:table-header-columns><table:table-columns><table:table-column table:number-columns-repeated="2"/></table:table-columns><table:table-header-rows><table:table-row><table:table-cell><text:p/></table:table-cell><table:table-cell office:value-type="string"><text:p>This year</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Last year</text:p></table:table-cell></table:table-row></table:table-header-rows><table:table-rows>'
+    for i, m in enumerate(months):
+        local += f'<table:table-row><table:table-cell office:value-type="string"><text:p>{m}</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="{20 + i * 6}"><text:p>{20 + i * 6}</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="{18 + i * 5}"><text:p>{18 + i * 5}</text:p></table:table-cell></table:table-row>'
+    local += "</table:table-rows></table:table>"
+    c = c.replace("</chart:chart>", local + "</chart:chart>")
+
+    def title(text, y="0.8cm"):
+        return f'<draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="2.4cm" svg:x="2cm" svg:y="{y}" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-title">{t(text)}</text:p></draw:text-box></draw:frame>'
+
+    def bullets(items, y="3.8cm", w="24cm", h="10cm", x="2cm"):
+        def li(it, lv=1):
+            if isinstance(it, list):
+                return "<text:list-item><text:list>" + "".join(li(i, lv + 1) for i in it) + "</text:list></text:list-item>"
+            return f'<text:list-item><text:p text:style-name="P-body">{t(it)}</text:p></text:list-item>'
+
+        return f'<draw:frame presentation:style-name="pr-body" draw:layer="layout" svg:width="{w}" svg:height="{h}" svg:x="{x}" svg:y="{y}" presentation:class="outline"><draw:text-box><text:list text:style-name="L-bul">' + "".join(li(i) for i in items) + "</text:list></draw:text-box></draw:frame>"
+
+    def notes(text):
+        return f'<presentation:notes><draw:page-thumbnail presentation:class="page" draw:layer="layout" svg:width="14.8cm" svg:height="8.3cm" svg:x="3.2cm" svg:y="2cm"/><draw:frame presentation:class="notes" draw:layer="layout" svg:width="17cm" svg:height="12cm" svg:x="2cm" svg:y="11cm"><draw:text-box><text:p>{t(text)}</text:p></draw:text-box></draw:frame></presentation:notes>'
+
+    slides = []
+    slides.append(
+        f'<draw:page draw:name="Title" draw:style-name="dp-title" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL1">'
+        f'<draw:frame presentation:style-name="pr-title" draw:layer="layout" svg:width="24cm" svg:height="3cm" svg:x="2cm" svg:y="4.5cm" presentation:class="title" presentation:user-transformed="true"><draw:text-box><text:p text:style-name="P-big">Harbour review</text:p></draw:text-box></draw:frame>'
+        f'<draw:frame presentation:style-name="pr-body" draw:layer="layout" svg:width="24cm" svg:height="2cm" svg:x="2cm" svg:y="8cm" presentation:class="subtitle"><draw:text-box><text:p text:style-name="P-sub">The east quay, first half of the year</text:p></draw:text-box></draw:frame>'
+        f'<draw:ellipse draw:style-name="gr-grad" draw:layer="layout" svg:width="5.5cm" svg:height="5.5cm" svg:x="20cm" svg:y="8.2cm"><text:p text:style-name="P-white">exav</text:p></draw:ellipse>'
+        f'{notes("Welcome. These notes are speaker notes: the viewer does not show them.")}</draw:page>'
+    )
+    slides.append(
+        f'<draw:page draw:name="Agenda" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2">{title("Agenda")}'
+        + bullets(["Where we are", ["berths let", ["by length", "by season"], "visitors"], "What the figures say", "What we do next", ["order the new chain", "paint the numbers"]])
+        + notes("Four items.") + "</draw:page>"
+    )
+    slides.append(
+        f'<draw:page draw:name="Chart" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2">{title("Berths let, month by month")}'
+        f'<draw:frame draw:style-name="gr-none" draw:layer="layout" svg:width="19cm" svg:height="11cm" svg:x="2cm" svg:y="3.6cm">{c}</draw:frame>'
+        '<draw:custom-shape draw:style-name="gr-callout" draw:layer="layout" svg:width="5.5cm" svg:height="3cm" svg:x="21.5cm" svg:y="5cm"><text:p text:style-name="P-center">Up 40% on last year</text:p>'
+        '<draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="round-rectangular-callout" draw:enhanced-path="M 3590 0 X 0 3590 L 0 14370 Y 3590 17960 L 7200 17960 L 5400 21600 L 10800 17960 L 18010 17960 X 21600 14370 L 21600 3590 Y 18010 0 Z N"/></draw:custom-shape>'
+        + notes("The chart is a native chart, with its data inside the slide.") + "</draw:page>"
+    )
+    rows = ""
+    for r in [("Length", "Berths", "Fee"), ("up to 6 m", "12", "18.00"), ("6 to 8 m", "18", "24.50"), ("8 to 10 m", "14", "31.00"), ("over 10 m", "16", "48.00")]:
+        head = r[0] == "Length"
+        rows += "<table:table-row>" + "".join(f'<table:table-cell table:style-name="{"tc-head" if head else "tc"}" office:value-type="string"><text:p text:style-name="{"P-th" if head else "P-td"}">{t(v)}</text:p></table:table-cell>' for v in r) + "</table:table-row>"
+    slides.append(
+        f'<draw:page draw:name="Table" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2">{title("Fees")}'
+        '<draw:frame draw:layer="layout" svg:width="16cm" svg:height="8cm" svg:x="2cm" svg:y="4cm"><table:table table:style-name="tb1"><table:table-column table:style-name="tcol1"/><table:table-column table:style-name="tcol2"/><table:table-column table:style-name="tcol2"/>'
+        f"{rows}</table:table></draw:frame>"
+        + bullets(["Season fee includes water", "Power is metered", "Visitors pay by the night"], y="4cm", w="8cm", h="8cm", x="19cm") + "</draw:page>"
+    )
+    slides.append(
+        f'<draw:page draw:name="Picture" draw:style-name="dp-plain" draw:master-page-name="Master" presentation:presentation-page-layout-name="AL2">{title("A picture and shapes")}'
+        f'<draw:frame draw:layer="layout" svg:width="12.8cm" svg:height="7.2cm" svg:x="2cm" svg:y="4cm"><draw:image><office:binary-data>{png_b64(pic)}</office:binary-data></draw:image><svg:title>A lake at dusk</svg:title></draw:frame>'
+        '<draw:rect draw:style-name="gr-grad" draw:layer="layout" svg:width="4cm" svg:height="2.4cm" svg:x="16cm" svg:y="4cm"><text:p text:style-name="P-center">Start</text:p></draw:rect>'
+        '<draw:line draw:style-name="gr-arrow" draw:layer="layout" svg:x1="20cm" svg:y1="5.2cm" svg:x2="22.5cm" svg:y2="5.2cm"/>'
+        '<draw:ellipse draw:style-name="gr-fill2" draw:layer="layout" svg:width="3.4cm" svg:height="2.4cm" svg:x="22.8cm" svg:y="4cm"><text:p text:style-name="P-center">Moor</text:p></draw:ellipse>'
+        '<draw:line draw:style-name="gr-arrow" draw:layer="layout" svg:x1="24.5cm" svg:y1="6.4cm" svg:x2="24.5cm" svg:y2="8.4cm"/>'
+        '<draw:polygon draw:style-name="gr-fill3" draw:layer="layout" svg:width="4cm" svg:height="3cm" svg:x="22.5cm" svg:y="8.5cm" svg:viewBox="0 0 4000 3000" draw:points="2000,0 4000,1500 2000,3000 0,1500"><text:p text:style-name="P-center">Pay?</text:p></draw:polygon>'
+        '<draw:custom-shape draw:style-name="gr-fill4" draw:layer="layout" svg:width="4cm" svg:height="3cm" svg:x="16.5cm" svg:y="8.5cm"><text:p text:style-name="P-center">Star</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="star5" draw:enhanced-path="M 10800 0 L 8270 8260 0 8260 6720 13360 4200 21600 10800 16500 17400 21600 14880 13360 21600 8260 13330 8260 Z N"/></draw:custom-shape>'
+        + notes("Shapes with gradients, arrows and text.") + "</draw:page>"
+    )
+    return f"""<?xml version="1.0" encoding="UTF-8"?>
+<office:document {NS} office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.presentation">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Harbour review</dc:title><dc:subject>A deck made for the exav demo (CC0-1.0)</dc:subject><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:font-face-decls><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"/></office:font-face-decls>
+<office:styles>
+<draw:gradient draw:name="Sea" draw:style="linear" draw:start-color="#0b4f6c" draw:end-color="#3fa7d6" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" draw:border="0%"/>
+<draw:gradient draw:name="Sun" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#f6a01a" draw:end-color="#c0392b" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/>
+<draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20z"/>
+<style:style style:name="standard" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#3465a4" draw:fill="solid" draw:fill-color="#729fcf"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="18pt"/></style:style>
+<style:style style:name="pr-title" style:family="presentation"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:auto-grow-width="false" draw:textarea-vertical-align="middle"/></style:style>
+<style:style style:name="pr-body" style:family="presentation"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:auto-grow-width="false"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="28cm" fo:page-height="15.75cm" style:print-orientation="landscape"/></style:page-layout>
+<style:style style:name="dp-title" style:family="drawing-page"><style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" draw:fill="gradient" draw:fill-gradient-name="Sea" presentation:transition-type="automatic" presentation:transition-style="fade-from-center" presentation:duration="PT00H00M01S" smil:type="fade"/></style:style>
+<style:style style:name="dp-plain" style:family="drawing-page"><style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" draw:fill="solid" draw:fill-color="#fbfaf7" smil:type="slideWipe" smil:subtype="fromLeft"/></style:style>
+<style:style style:name="gr-none" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none"/></style:style>
+<style:style style:name="gr-grad" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Sea" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/><style:text-properties fo:color="#ffffff"/></style:style>
+<style:style style:name="gr-fill2" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#1c6e3e" svg:stroke-width="0.08cm" draw:fill="solid" draw:fill-color="#7bc67e" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="gr-fill3" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#7a5c00" draw:stroke-dash="dash" draw:fill="solid" draw:fill-color="#ffe08a" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="gr-fill4" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Sun" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/><style:text-properties fo:color="#ffffff"/></style:style>
+<style:style style:name="gr-arrow" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-width="0.1cm" svg:stroke-color="#333333" draw:marker-end="Arrow" draw:marker-end-width="0.3cm"/></style:style>
+<style:style style:name="gr-callout" style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#c0392b" draw:fill="solid" draw:fill-color="#fdecea" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="P-title" style:family="paragraph"><style:paragraph-properties fo:text-align="start"/><style:text-properties fo:font-size="30pt" fo:font-weight="bold" fo:color="#0b4f6c"/></style:style>
+<style:style style:name="P-big" style:family="paragraph"><style:text-properties fo:font-size="48pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="P-sub" style:family="paragraph"><style:text-properties fo:font-size="24pt" fo:color="#dbe9f4"/></style:style>
+<style:style style:name="P-body" style:family="paragraph"><style:text-properties fo:font-size="22pt"/></style:style>
+<style:style style:name="P-center" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt"/></style:style>
+<style:style style:name="P-white" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="20pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="P-th" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt" fo:font-weight="bold" fo:color="#ffffff"/></style:style>
+<style:style style:name="P-td" style:family="paragraph"><style:text-properties fo:font-size="16pt"/></style:style>
+<text:list-style style:name="L-bul"><text:list-level-style-bullet text:level="1" text:bullet-char="●"><style:list-level-properties text:min-label-width="0.6cm"/><style:text-properties fo:color="#146c94"/></text:list-level-style-bullet><text:list-level-style-bullet text:level="2" text:bullet-char="–"><style:list-level-properties text:space-before="0.8cm" text:min-label-width="0.6cm"/></text:list-level-style-bullet><text:list-level-style-bullet text:level="3" text:bullet-char="•"><style:list-level-properties text:space-before="1.6cm" text:min-label-width="0.6cm"/></text:list-level-style-bullet></text:list-style>
+<style:style style:name="tb1" style:family="table"><style:table-properties style:width="16cm" table:align="left"/></style:style>
+<style:style style:name="tcol1" style:family="table-column"><style:table-column-properties style:column-width="6cm"/></style:style>
+<style:style style:name="tcol2" style:family="table-column"><style:table-column-properties style:column-width="5cm"/></style:style>
+<style:style style:name="tc" style:family="table-cell"><style:table-cell-properties fo:padding="0.15cm" fo:border="0.5pt solid #8aa6b4" fo:background-color="#ffffff"/></style:style>
+<style:style style:name="tc-head" style:family="table-cell"><style:table-cell-properties fo:padding="0.15cm" fo:border="0.5pt solid #8aa6b4" fo:background-color="#0b4f6c"/></style:style>
+<presentation:presentation-page-layout style:name="AL1"/>
+<presentation:presentation-page-layout style:name="AL2"/>
+</office:automatic-styles>
+<office:master-styles>
+<draw:layer-set><draw:layer draw:name="layout"/><draw:layer draw:name="background"/><draw:layer draw:name="backgroundobjects"/></draw:layer-set>
+<style:master-page style:name="Master" style:page-layout-name="pm1" draw:style-name="dp-plain">
+<draw:rect draw:style-name="gr-grad" draw:layer="backgroundobjects" svg:width="28cm" svg:height="0.5cm" svg:x="0cm" svg:y="15.25cm"/>
+<draw:frame presentation:style-name="pr-body" draw:layer="backgroundobjects" svg:width="12cm" svg:height="0.9cm" svg:x="1cm" svg:y="14.2cm" presentation:class="footer"><draw:text-box><text:p><presentation:footer/></text:p></draw:text-box></draw:frame>
+<draw:frame presentation:style-name="pr-body" draw:layer="backgroundobjects" svg:width="3cm" svg:height="0.9cm" svg:x="24cm" svg:y="14.2cm" presentation:class="page-number"><draw:text-box><text:p><text:page-number>1</text:page-number></text:p></draw:text-box></draw:frame>
+</style:master-page>
+</office:master-styles>
+<office:body><office:presentation>
+{"".join(slides)}
+<presentation:settings presentation:full-screen="false"/>
+</office:presentation></office:body>
+</office:document>
+"""
+
+
+# ======================================================================
+# The diagram (drawing)
+# ======================================================================
+
+
+def diagram_fodg():
+    def node(i, x, y, w, h, text, style="st-box", shape="rect"):
+        tag = "draw:rect" if shape == "rect" else "draw:ellipse"
+        return f'<{tag} draw:id="n{i}" draw:style-name="{style}" draw:layer="Boxes" svg:width="{w}cm" svg:height="{h}cm" svg:x="{x}cm" svg:y="{y}cm" draw:corner-radius="0.2cm"><text:p text:style-name="P-c">{t(text)}</text:p></{tag}>' if shape == "rect" else f'<{tag} draw:id="n{i}" draw:style-name="{style}" draw:layer="Boxes" svg:width="{w}cm" svg:height="{h}cm" svg:x="{x}cm" svg:y="{y}cm"><text:p text:style-name="P-c">{t(text)}</text:p></{tag}>'
+
+    def conn(a, b, sa=2, sb=0, kind="standard", style="st-line", label=None):
+        return f'<draw:connector draw:style-name="{style}" draw:layer="Lines" draw:type="{kind}" draw:start-shape="n{a}" draw:start-glue-point="{sa}" draw:end-shape="n{b}" draw:end-glue-point="{sb}" svg:x1="0cm" svg:y1="0cm" svg:x2="1cm" svg:y2="1cm"/>'
+
+    p1 = [
+        node(1, 9, 1, 6, 1.6, "Boat calls the office", "st-start", "ell"),
+        node(2, 9, 4, 6, 1.6, "Is a berth free?", "st-decision"),
+        node(3, 2, 7.5, 6, 1.6, "Give berth number"),
+        node(4, 16, 7.5, 6, 1.6, "Offer the waiting list"),
+        node(5, 2, 11, 6, 1.6, "Boat moors"),
+        node(6, 9, 14.5, 6, 1.6, "Pay at the office", "st-end", "ell"),
+        node(7, 16, 11, 6, 1.6, "Boat waits at anchor"),
+    ]
+    links = [conn(1, 2), conn(2, 3, 3, 0, "standard"), conn(2, 4, 3, 0), conn(3, 5), conn(4, 7), conn(5, 6, 2, 1), conn(7, 2, 1, 3, "curve")]
+    labels = '<draw:custom-shape draw:style-name="st-note" draw:layer="Notes" svg:width="1.6cm" svg:height="0.9cm" svg:x="5.2cm" svg:y="5.2cm"><text:p text:style-name="P-c">yes</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 Z N"/></draw:custom-shape>' + '<draw:custom-shape draw:style-name="st-note" draw:layer="Notes" svg:width="1.6cm" svg:height="0.9cm" svg:x="16.2cm" svg:y="5.2cm"><text:p text:style-name="P-c">no</text:p><draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 Z N"/></draw:custom-shape>'
+    legend = (
+        '<draw:g draw:layer="Notes"><draw:rect draw:style-name="st-legend" svg:width="5.5cm" svg:height="3.4cm" svg:x="0.8cm" svg:y="0.6cm"/>'
+        '<draw:rect draw:style-name="st-start" svg:width="0.7cm" svg:height="0.5cm" svg:x="1.1cm" svg:y="1.1cm"/><draw:frame draw:style-name="st-text" svg:width="3.8cm" svg:height="0.6cm" svg:x="2cm" svg:y="1.05cm"><draw:text-box><text:p text:style-name="P-s">start or end</text:p></draw:text-box></draw:frame>'
+        '<draw:rect draw:style-name="st-box" svg:width="0.7cm" svg:height="0.5cm" svg:x="1.1cm" svg:y="2cm"/><draw:frame draw:style-name="st-text" svg:width="3.8cm" svg:height="0.6cm" svg:x="2cm" svg:y="1.95cm"><draw:text-box><text:p text:style-name="P-s">step</text:p></draw:text-box></draw:frame>'
+        '<draw:rect draw:style-name="st-decision" svg:width="0.7cm" svg:height="0.5cm" svg:x="1.1cm" svg:y="2.9cm"/><draw:frame draw:style-name="st-text" svg:width="3.8cm" svg:height="0.6cm" svg:x="2cm" svg:y="2.85cm"><draw:text-box><text:p text:style-name="P-s">decision</text:p></draw:text-box></draw:frame></draw:g>'
+    )
+    curve = '<draw:path draw:style-name="st-curve" draw:layer="Notes" svg:width="6cm" svg:height="2.5cm" svg:x="17cm" svg:y="15cm" svg:viewBox="0 0 6000 2500" svg:d="M 0 2000 C 1500 -500 3000 4500 6000 500"/>'
+    page1 = f'<draw:page draw:name="Mooring" draw:style-name="dp1" draw:master-page-name="Default">{"".join(p1)}{"".join(links)}{labels}{legend}{curve}<draw:frame draw:style-name="st-text" draw:layer="Notes" svg:width="14cm" svg:height="1cm" svg:x="0.8cm" svg:y="17.4cm"><draw:text-box><text:p text:style-name="P-s">Flowchart for the exav demo (CC0-1.0). Connectors follow their shapes.</text:p></draw:text-box></draw:frame></draw:page>'
+    # Page 2: a block diagram with groups and a hidden layer.
+    blocks = ""
+    for i, (x, label) in enumerate([(1.5, "Harbour office"), (9.5, "Berth register"), (17.5, "Billing")]):
+        blocks += f'<draw:g draw:layer="Boxes"><draw:rect draw:id="b{i}" draw:style-name="st-box" svg:width="6cm" svg:height="3cm" svg:x="{x}cm" svg:y="2cm"><text:p text:style-name="P-c">{label}</text:p></draw:rect><draw:ellipse draw:style-name="st-start" svg:width="0.8cm" svg:height="0.8cm" svg:x="{x + 5.4}cm" svg:y="2.2cm"><text:p text:style-name="P-s">{i + 1}</text:p></draw:ellipse></draw:g>'
+    blocks += '<draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="line" draw:start-shape="b0" draw:start-glue-point="3" draw:end-shape="b1" draw:end-glue-point="1" svg:x1="7.5cm" svg:y1="3.5cm" svg:x2="9.5cm" svg:y2="3.5cm"/><draw:connector draw:style-name="st-line" draw:layer="Lines" draw:type="line" draw:start-shape="b1" draw:start-glue-point="3" draw:end-shape="b2" draw:end-glue-point="1" svg:x1="15.5cm" svg:y1="3.5cm" svg:x2="17.5cm" svg:y2="3.5cm"/>'
+    stack = "".join(f'<draw:rect draw:style-name="st-grad" draw:layer="Boxes" svg:width="{14 - i * 2}cm" svg:height="1.4cm" svg:x="{5 + i}cm" svg:y="{7 + i * 1.6}cm"><text:p text:style-name="P-c">Layer {i + 1}</text:p></draw:rect>' for i in range(4))
+    hidden = '<draw:rect draw:style-name="st-box" draw:layer="Hidden" svg:width="8cm" svg:height="1.4cm" svg:x="2cm" svg:y="15cm"><text:p text:style-name="P-c">On a hidden layer</text:p></draw:rect>'
+    page2 = f'<draw:page draw:name="Blocks" draw:style-name="dp1" draw:master-page-name="Default">{blocks}{stack}{hidden}<draw:polyline draw:style-name="st-curve" draw:layer="Notes" svg:width="8cm" svg:height="3cm" svg:x="14cm" svg:y="14cm" svg:viewBox="0 0 8000 3000" draw:points="0,3000 2000,500 4000,2500 6000,0 8000,2000"/></draw:page>'
+    return f"""<?xml version="1.0" encoding="UTF-8"?>
+<office:document {NS} office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.graphics">
+<office:meta><meta:initial-creator>exav project</meta:initial-creator><dc:title>Flowchart</dc:title><dc:subject>A drawing made for the exav demo (CC0-1.0)</dc:subject><meta:creation-date>2000-01-01T00:00:00</meta:creation-date></office:meta>
+<office:font-face-decls><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss"/></office:font-face-decls>
+<office:styles>
+<draw:gradient draw:name="Steel" draw:style="linear" draw:start-color="#c7d9e6" draw:end-color="#6f93ad" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0deg" draw:border="0%"/>
+<draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20z"/>
+<style:default-style style:family="graphic"><style:graphic-properties draw:stroke="solid" svg:stroke-color="#3465a4" draw:fill="solid" draw:fill-color="#729fcf"/><style:text-properties style:font-name="Liberation Sans" fo:font-size="14pt"/></style:default-style>
+<style:style style:name="st-box" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#0b4f6c" draw:fill="solid" draw:fill-color="#dbe9f4" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center" draw:shadow="visible" draw:shadow-offset-x="0.1cm" draw:shadow-offset-y="0.1cm" draw:shadow-color="#999999"/></style:style>
+<style:style style:name="st-start" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#1c6e3e" draw:fill="solid" draw:fill-color="#bfe8c4" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-end" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#8a1c1c" draw:fill="solid" draw:fill-color="#f5c2c0" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-decision" style:family="graphic"><style:graphic-properties svg:stroke-width="0.06cm" svg:stroke-color="#7a5c00" draw:stroke-dash="dash" draw:fill="solid" draw:fill-color="#ffe9a8" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-grad" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Steel" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/></style:style>
+<style:style style:name="st-line" style:family="graphic"><style:graphic-properties draw:fill="none" svg:stroke-width="0.08cm" svg:stroke-color="#333333" draw:marker-end="Arrow" draw:marker-end-width="0.35cm"/></style:style>
+<style:style style:name="st-curve" style:family="graphic"><style:graphic-properties draw:fill="none" svg:stroke-width="0.1cm" svg:stroke-color="#c0392b"/></style:style>
+<style:style style:name="st-note" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle" draw:textarea-horizontal-align="center"/><style:text-properties fo:font-style="italic" fo:color="#555555"/></style:style>
+<style:style style:name="st-legend" style:family="graphic"><style:graphic-properties svg:stroke-width="0.03cm" svg:stroke-color="#999999" draw:fill="solid" draw:fill-color="#ffffff"/></style:style>
+<style:style style:name="st-text" style:family="graphic"><style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false"/></style:style>
+</office:styles>
+<office:automatic-styles>
+<style:page-layout style:name="pm1"><style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="24cm" fo:page-height="19cm" style:print-orientation="portrait"/></style:page-layout>
+<style:style style:name="dp1" style:family="drawing-page"><style:drawing-page-properties draw:background-size="border" draw:fill="solid" draw:fill-color="#fbfaf7"/></style:style>
+<style:style style:name="P-c" style:family="paragraph"><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="13pt"/></style:style>
+<style:style style:name="P-s" style:family="paragraph"><style:text-properties fo:font-size="10pt"/></style:style>
+</office:automatic-styles>
+<office:master-styles><draw:layer-set><draw:layer draw:name="Boxes"/><draw:layer draw:name="Lines"/><draw:layer draw:name="Notes"/><draw:layer draw:name="Hidden" draw:display="none"/></draw:layer-set><style:master-page style:name="Default" style:page-layout-name="pm1" draw:style-name="dp1"/></office:master-styles>
+<office:body><office:drawing>{page1}{page2}</office:drawing></office:body>
+</office:document>
+"""
+
+
+# ======================================================================
+# Conversion
+# ======================================================================
+
+TARGETS = {
+    "handbook": [("fodt", "converted", None), ("odt", "converted", "odt:writer8"), ("docx", "office", 'docx:MS Word 2007 XML'), ("doc", "converted", "doc:MS Word 97"), ("rtf", "converted", "rtf:Rich Text Format")],
+    "workbook": [("fods", "converted", None), ("ods", "converted", "ods:calc8"), ("xlsx", "office", "xlsx:Calc MS Excel 2007 XML"), ("xls", "converted", "xls:MS Excel 97")],
+    "deck": [("fodp", "converted", None), ("odp", "converted", "odp:impress8"), ("pptx", "office", "pptx:Impress MS PowerPoint 2007 XML"), ("ppt", "converted", "ppt:MS PowerPoint 97")],
+    "diagram": [("fodg", "converted", None), ("odg", "converted", "odg:draw8")],
+}
+
+
+def convert(src, filt, outdir, profile):
+    ext, name = filt.split(":", 1)
+    subprocess.run(
+        ["soffice", f"-env:UserInstallation=file://{profile}", "--headless", "--norestore", "--convert-to", f"{ext}:{name}", "--outdir", outdir, src],
+        check=True, capture_output=True, timeout=300,
+    )
+
+
+def main():
+    docs = {"handbook": ("fodt", handbook_fodt()), "workbook": ("fods", workbook_fods()), "deck": ("fodp", deck_fodp()), "diagram": ("fodg", diagram_fodg())}
+    if not shutil.which("soffice"):
+        print("soffice is missing: only the flat files are written", file=sys.stderr)
+    with tempfile.TemporaryDirectory() as tmp:
+        profile = os.path.join(tmp, "profile")
+        for base, (ext, xml) in docs.items():
+            src_dir = os.path.join(tmp, base)
+            os.makedirs(src_dir)
+            src = os.path.join(src_dir, f"{base}.{ext}")
+            with open(src, "w", encoding="utf-8") as f:
+                f.write(xml)
+            for target, folder, filt in TARGETS[base]:
+                dest = os.path.join(OUT, folder, f"{base}.{target}")
+                if filt is None:
+                    shutil.copy(src, dest)
+                elif shutil.which("soffice"):
+                    out_dir = os.path.join(tmp, f"out-{base}-{target}")
+                    os.makedirs(out_dir)
+                    convert(src, filt, out_dir, profile)
+                    shutil.copy(os.path.join(out_dir, f"{base}.{target}"), dest)
+            if base == "handbook" and shutil.which("soffice"):
+                out_dir = os.path.join(tmp, "out-pdf")
+                os.makedirs(out_dir)
+                opts = '{"UseTaggedPDF":{"type":"boolean","value":"true"},"ExportBookmarks":{"type":"boolean","value":"true"},"ExportNotes":{"type":"boolean","value":"false"},"SelectPdfVersion":{"type":"long","value":"2"}}'
+                subprocess.run(["soffice", f"-env:UserInstallation=file://{profile}", "--headless", "--norestore", "--convert-to", f"pdf:writer_pdf_Export:{opts}", "--outdir", out_dir, src], check=True, capture_output=True, timeout=300)
+                shutil.copy(os.path.join(out_dir, "handbook.pdf"), os.path.join(OUT, "pdf", "handbook-tagged.pdf"))
+
+
+main()
diff --git a/crates/exav-viewer/demo/examples/generate/make-pdf.py b/crates/exav-viewer/demo/examples/generate/make-pdf.py
new file mode 100644
index 00000000..7cf90498
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-pdf.py
@@ -0,0 +1,643 @@
+#!/usr/bin/env python3
+"""Writes the demo's PDF examples into ../files/pdf/.
+
+    python3 -I make-pdf.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. Every file
+is made here from scratch.
+
+Needs: Python 3, reportlab 4 (BSD licence), Pillow, numpy; the programs
+opj_compress (libopenjp2-tools) and jbig2 (jbig2enc) and tiffcp (libtiff-tools)
+for the scan; the Liberation fonts (SIL OFL 1.1, which lets documents embed
+them) for the embedded-font page. The pictures' text is set in Pillow's
+bundled Aileron font (CC0). A part whose program is missing is skipped.
+
+- field-report.pdf: six pages of a report written for the demo: a table of
+  contents whose entries are links, an outline of two levels, roman and
+  arabic page labels, internal and external links, tables, bar, line and pie
+  charts drawn as vectors, a raster picture, text in the 14 standard fonts
+  and in embedded Liberation fonts (Latin, Greek, Cyrillic), footnote
+  references, running heads, document information.
+- application-form.pdf: an AcroForm with text fields (one multiline, one
+  with a maximum length), check boxes, radio buttons, a drop-down list, a
+  list box and a push button, some filled in.
+- annotations.pdf: link annotations (URI, page, named destination) and
+  markup annotations (note, highlight, underline, strike-out, squiggly, free
+  text, square, circle, line, polygon, ink, stamp) without appearance
+  streams, an outline and a named destination: written by the small PDF
+  writer below.
+- scan-mixed.pdf: a four-page scanned letter, one page for each image filter
+  a scanner's PDF uses: DCTDecode (JPEG), CCITTFaxDecode (Group 4),
+  JBIG2Decode and JPXDecode (JPEG 2000), each with an invisible text layer
+  (an OCR result).
+- vector-art.pdf: gradients (axial and radial shadings), transparency,
+  clipping, dashes, caps and joins, Bezier curves, rotated and scaled text.
+"""
+import io
+import math
+import os
+import shutil
+import struct
+import subprocess
+import sys
+import tempfile
+import zlib
+
+import numpy as np
+from PIL import Image, ImageDraw, ImageFilter, ImageFont
+from reportlab import rl_config
+
+rl_config.invariant = 1
+
+from reportlab.graphics.charts.barcharts import VerticalBarChart
+from reportlab.graphics.charts.legends import Legend
+from reportlab.graphics.charts.lineplots import LinePlot
+from reportlab.graphics.charts.piecharts import Pie
+from reportlab.graphics.shapes import Drawing, String
+from reportlab.lib import colors
+from reportlab.lib.enums import TA_JUSTIFY
+from reportlab.lib.pagesizes import A4
+from reportlab.lib.styles import ParagraphStyle, getSampleStyleSheet
+from reportlab.lib.units import cm, mm
+from reportlab.pdfbase import pdfmetrics
+from reportlab.pdfbase.ttfonts import TTFont
+from reportlab.pdfgen import canvas
+from reportlab.platypus import BaseDocTemplate, Frame, Image as RLImage, KeepTogether, PageBreak, PageTemplate, Paragraph, Spacer, Table, TableStyle
+from reportlab.platypus.tableofcontents import TableOfContents
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "pdf")
+os.makedirs(OUT, exist_ok=True)
+FONTS = "/usr/share/fonts/truetype/liberation"
+EMBED = os.path.exists(os.path.join(FONTS, "LiberationSans-Regular.ttf"))
+if EMBED:
+    for name, f in [("LibSans", "LiberationSans-Regular"), ("LibSerif", "LiberationSerif-Regular"), ("LibSerif-Italic", "LiberationSerif-Italic"), ("LibMono", "LiberationMono-Regular")]:
+        pdfmetrics.registerFont(TTFont(name, os.path.join(FONTS, f + ".ttf")))
+        # Names the font by itself so that <b> and <i> stay in the family.
+    pdfmetrics.registerFontFamily("LibSerif", normal="LibSerif", italic="LibSerif-Italic", bold="LibSerif", boldItalic="LibSerif-Italic")
+
+
+def aileron(size):
+    return ImageFont.load_default(size)
+
+
+# ------------------------------------------------------------ field report
+
+
+def diagram_image():
+    """A small raster picture: a gradient with circles, for the report."""
+    w, h = 480, 260
+    y = np.linspace(0, 1, h)[:, None]
+    x = np.linspace(0, 1, w)[None, :]
+    px = np.zeros((h, w, 3), np.uint8)
+    px[..., 0] = 40 + 160 * x
+    px[..., 1] = 80 + 100 * y
+    px[..., 2] = 200 - 120 * x
+    im = Image.fromarray(px, "RGB")
+    d = ImageDraw.Draw(im)
+    for i in range(7):
+        r = 14 + i * 7
+        d.ellipse((60 + i * 60 - r, 130 - r, 60 + i * 60 + r, 130 + r), outline=(255, 255, 255), width=3)
+    d.text((16, 14), "A raster picture in the report", font=aileron(22), fill=(255, 255, 255))
+    buf = io.BytesIO()
+    im.save(buf, "JPEG", quality=88)
+    buf.seek(0)
+    return buf
+
+
+class Report(BaseDocTemplate):
+    def __init__(self, path):
+        super().__init__(path, pagesize=A4, leftMargin=2.2 * cm, rightMargin=2.2 * cm, topMargin=2.5 * cm, bottomMargin=2.2 * cm,
+                         title="Field report: the east quay", author="exav project", subject="A report written for the exav demo (CC0-1.0)",
+                         keywords="demo, report, links, outline, charts", creator="exav make-pdf.py", pageCompression=1)
+        frame = Frame(self.leftMargin, self.bottomMargin, self.width, self.height, id="body")
+        self.addPageTemplates([PageTemplate(id="all", frames=[frame], onPage=self.decorate)])
+
+    def decorate(self, c, doc):
+        c.saveState()
+        if doc.page == 1:
+            # The cover and the contents are i and ii; the body starts again at 1.
+            c.addPageLabel(0, "ROMAN_LOWER", 1)
+            c.addPageLabel(2, "ARABIC", 1)
+        c.setFont("Helvetica", 8)
+        c.setFillColor(colors.HexColor("#555555"))
+        if doc.page > 1:
+            c.drawString(self.leftMargin, A4[1] - 1.5 * cm, "Field report: the east quay")
+            c.drawRightString(A4[0] - self.rightMargin, A4[1] - 1.5 * cm, "exav demo, CC0-1.0")
+            c.setStrokeColor(colors.HexColor("#999999"))
+            c.line(self.leftMargin, A4[1] - 1.7 * cm, A4[0] - self.rightMargin, A4[1] - 1.7 * cm)
+            c.drawCentredString(A4[0] / 2, 1.2 * cm, f"page {doc.page}")
+            c.linkURL("https://exav.org/viewer/", (A4[0] - self.rightMargin - 3 * cm, A4[1] - 1.6 * cm, A4[0] - self.rightMargin, A4[1] - 1.3 * cm), relative=0)
+        c.restoreState()
+
+    def afterFlowable(self, fl):
+        if isinstance(fl, Paragraph) and fl.style.name in ("H1", "H2"):
+            level = 0 if fl.style.name == "H1" else 1
+            text = fl.getPlainText()
+            key = "h" + "".join(c if c.isalnum() else "-" for c in text)
+            self.canv.bookmarkPage(key)
+            self.canv.addOutlineEntry(text, key, level, closed=False)
+            self.notify("TOCEntry", (level, text, self.page, key))
+
+
+def field_report(path):
+    ss = getSampleStyleSheet()
+    body_font, serif_font = ("LibSans", "LibSerif") if EMBED else ("Helvetica", "Times-Roman")
+    body = ParagraphStyle("Body", parent=ss["BodyText"], fontName=serif_font, fontSize=10.5, leading=14.5, alignment=TA_JUSTIFY, spaceAfter=6)
+    h1 = ParagraphStyle("H1", parent=ss["Heading1"], fontName="Helvetica-Bold", fontSize=18, spaceBefore=14, spaceAfter=8, textColor=colors.HexColor("#0b4f6c"))
+    h2 = ParagraphStyle("H2", parent=ss["Heading2"], fontName="Helvetica-Bold", fontSize=13, spaceBefore=10, spaceAfter=5, textColor=colors.HexColor("#146c94"))
+    small = ParagraphStyle("Small", parent=body, fontSize=8.5, leading=11, alignment=0)
+    mono = ParagraphStyle("Mono", parent=body, fontName="Courier", fontSize=9, leading=11.5, alignment=0, backColor=colors.HexColor("#f2f2f2"), borderPadding=4, spaceBefore=4, spaceAfter=8)
+
+    lorem = [
+        "The east quay was built in three stages. The first stage, a timber jetty of twenty berths, dates from the start of the register; the second doubled it in stone, and the third, the long breakwater, shelters both from the south-west swell.",
+        "Every berth has a number, a length in metres and a holder. The register is kept on paper and in a table; the two are compared each spring, and the differences are explained in the notes of the harbour master.",
+        "Visitors are asked to call the harbour office on channel 9 before they come in, to give the length of their boat and the draught, and to say how many nights they plan to stay. The office will give a berth number and, when the tide is low, the best line of approach.",
+        "A note on the figures. Lengths are over all, in metres, to one decimal. Fees are in euros and include the tax. Where a table gives a total, it is the sum of the rows above it, rounded once, at the end.",
+    ]
+
+    def paras(n, start=0):
+        return [Paragraph(lorem[(start + i) % len(lorem)], body) for i in range(n)]
+
+    story = []
+    # The cover page.
+    story += [Spacer(1, 5 * cm), Paragraph("Field report", ParagraphStyle("Title", parent=h1, fontSize=34, leading=40, textColor=colors.HexColor("#0b4f6c"))),
+              Paragraph("The east quay: berths, tides and visitors", ParagraphStyle("Sub", parent=body, fontName="Helvetica", fontSize=16, leading=20, alignment=0)), Spacer(1, 1.2 * cm),
+              Paragraph("A document made for the exav demo. It has a table of contents whose lines are links, an outline in the side panel, page labels, charts drawn as vectors, tables, a picture, and text in embedded fonts. It is in the public domain (CC0-1.0).", body),
+              Spacer(1, 1 * cm), Paragraph('Project page: <a href="https://exav.org/viewer/" color="blue">https://exav.org/viewer/</a>', body), PageBreak()]
+    toc = TableOfContents()
+    toc.levelStyles = [ParagraphStyle("t0", fontName="Helvetica-Bold", fontSize=11, leading=16, leftIndent=0, firstLineIndent=0), ParagraphStyle("t1", fontName="Helvetica", fontSize=10, leading=14, leftIndent=18, firstLineIndent=0)]
+    story += [Paragraph("Contents", ParagraphStyle("TocTitle", parent=h1)), toc, PageBreak()]
+
+    story += [Paragraph("1. The quay", h1), Paragraph("1.1 History", h2)] + paras(3)
+    story += [Paragraph("1.2 Today", h2)] + paras(2, 1)
+    story += [Paragraph("Notes: see <a href=\"#fig1\" color=\"blue\">the picture</a> and <a href=\"#tab1\" color=\"blue\">the first table</a> in section 2.<super>1</super>", small)]
+    story += [Paragraph("2. Figures", h1), Paragraph("2.1 Berths by length", h2)]
+    data = [["Length (m)", "Berths", "Let by", "Fee (EUR)", "Income (EUR)"]]
+    rows = [("up to 6", 12, "week", 18.0), ("6 to 8", 18, "season", 24.5), ("8 to 10", 14, "season", 31.0), ("10 to 12", 9, "year", 42.0), ("over 12", 7, "year", 58.5)]
+    for a, b, c, d in rows:
+        data.append([a, b, c, f"{d:.2f}", f"{b * d:.2f}"])
+    data.append(["Total", sum(r[1] for r in rows), "", "", f"{sum(r[1] * r[3] for r in rows):.2f}"])
+    t = Table(data, colWidths=[3.2 * cm, 2.4 * cm, 2.6 * cm, 3 * cm, 3.4 * cm], repeatRows=1)
+    t.setStyle(TableStyle([("BACKGROUND", (0, 0), (-1, 0), colors.HexColor("#0b4f6c")), ("TEXTCOLOR", (0, 0), (-1, 0), colors.white), ("FONTNAME", (0, 0), (-1, 0), "Helvetica-Bold"),
+                           ("FONTNAME", (0, -1), (-1, -1), "Helvetica-Bold"), ("ROWBACKGROUNDS", (0, 1), (-1, -2), [colors.white, colors.HexColor("#e8f1f5")]),
+                           ("ALIGN", (1, 0), (-1, -1), "RIGHT"), ("GRID", (0, 0), (-1, -1), 0.4, colors.HexColor("#8aa6b4")), ("LINEABOVE", (0, -1), (-1, -1), 1.2, colors.black)]))
+    story += [Paragraph('<a name="tab1"/>Table 1. Berths by length, with the season\'s fee.', small), t, Spacer(1, 0.4 * cm)]
+    story += [Paragraph("2.2 Charts", h2)]
+    bar = Drawing(420, 200)
+    chart = VerticalBarChart()
+    chart.x, chart.y, chart.width, chart.height = 40, 30, 360, 150
+    chart.data = [[12, 18, 14, 9, 7], [10, 17, 15, 8, 5]]
+    chart.categoryAxis.categoryNames = [r[0] for r in rows]
+    chart.valueAxis.valueMin, chart.valueAxis.valueMax, chart.valueAxis.valueStep = 0, 20, 5
+    chart.bars[0].fillColor = colors.HexColor("#146c94")
+    chart.bars[1].fillColor = colors.HexColor("#f6a01a")
+    chart.barLabelFormat = "%d"
+    chart.barLabels.nudge = 7
+    bar.add(chart)
+    bar.add(String(40, 188, "Berths let, this year and last", fontName="Helvetica-Bold", fontSize=10))
+    story += [bar]
+    line = Drawing(420, 190)
+    lp = LinePlot()
+    lp.x, lp.y, lp.width, lp.height = 40, 25, 360, 140
+    months = list(range(1, 13))
+    lp.data = [[(m, 40 + 35 * math.sin((m - 3) / 12 * 2 * math.pi) + 5 * m / 12) for m in months], [(m, 28 + 22 * math.sin((m - 3) / 12 * 2 * math.pi)) for m in months]]
+    lp.lines[0].strokeColor, lp.lines[1].strokeColor = colors.HexColor("#c0392b"), colors.HexColor("#2c7a4b")
+    lp.lines[0].strokeWidth = lp.lines[1].strokeWidth = 2
+    lp.lines[0].symbol = lp.lines[1].symbol = None
+    lp.xValueAxis.valueMin, lp.xValueAxis.valueMax, lp.xValueAxis.valueStep = 1, 12, 1
+    line.add(lp)
+    line.add(String(40, 175, "Boats a day, by month (visitors and holders)", fontName="Helvetica-Bold", fontSize=10))
+    story += [line]
+    pie = Drawing(420, 180)
+    p = Pie()
+    p.x, p.y, p.width, p.height = 40, 15, 140, 140
+    p.data = [41, 27, 18, 9, 5]
+    p.labels = ["sail", "motor", "fishing", "rowing", "other"]
+    for i, c in enumerate(["#146c94", "#f6a01a", "#2c7a4b", "#c0392b", "#8e44ad"]):
+        p.slices[i].fillColor = colors.HexColor(c)
+    p.slices[0].popout = 8
+    pie.add(p)
+    leg = Legend()
+    leg.x, leg.y, leg.alignment = 230, 120, "right"
+    leg.colorNamePairs = [(colors.HexColor(c), f"{n} ({v}%)") for c, n, v in zip(["#146c94", "#f6a01a", "#2c7a4b", "#c0392b", "#8e44ad"], p.labels, p.data)]
+    pie.add(leg)
+    story += [pie]
+    story += [Paragraph("2.3 A picture", h2), Paragraph('<a name="fig1"/>Figure 1. A raster picture, embedded as a JPEG.', small), RLImage(diagram_image(), width=12 * cm, height=6.5 * cm)]
+    story += [Paragraph("3. Fonts and text", h1), Paragraph("3.1 The standard fonts", h2)]
+    for fam, label in [("Helvetica", "Helvetica"), ("Times-Roman", "Times Roman"), ("Courier", "Courier"), ("Helvetica-Oblique", "Helvetica Oblique"), ("Times-BoldItalic", "Times Bold Italic"), ("Symbol", "Symbol: abgd"), ("ZapfDingbats", "abcdef")]:
+        story.append(Paragraph(f"{label}: The quick brown fox jumps over the lazy dog 0123456789", ParagraphStyle("f", parent=body, fontName=fam, fontSize=10.5, alignment=0, spaceAfter=2)))
+    if EMBED:
+        story += [Paragraph("3.2 Embedded fonts (Liberation, SIL OFL 1.1)", h2),
+                  Paragraph("Latin: café, naïve, Zürich, Łódź, ångström, €12,50. Greek: Αθήνα, π ≈ 3,14159. Cyrillic: Москва, живой язык.", ParagraphStyle("u", parent=body, fontName="LibSerif", alignment=0)),
+                  Paragraph("Sans: Portez ce vieux whisky au juge blond qui fume. 0123456789", ParagraphStyle("u2", parent=body, fontName="LibSans", alignment=0)),
+                  Paragraph("def moor(boat): return berth_for(boat.length)", ParagraphStyle("u3", parent=body, fontName="LibMono", fontSize=9.5, alignment=0))]
+    story += [Paragraph("3.3 Preformatted text and a list", h2), Paragraph("moor --boat Aurora --length 6.5\nberth 14 free until 06:00\n    (tide table on page 6)", mono)]
+    bullets = [Paragraph(f"• {t}", ParagraphStyle("b", parent=body, leftIndent=14, firstLineIndent=-10, spaceAfter=2, alignment=0)) for t in ["Call the office on channel 9.", "Give the length, the draught and the number of nights.", "Take the berth you are given."]]
+    story += bullets
+    story += [Paragraph("4. Links", h1), Paragraph("4.1 Where they go", h2),
+              Paragraph('An external link: <a href="https://exav.org/" color="blue">exav.org</a>. A link to another page of this file: <a href="#h1--The-quay" color="blue">back to section 1</a>. A link on a picture, and one around a long phrase that wraps at the end of a line to the next, so that its box is two rectangles: <a href="https://github.com/sylvinus/exav" color="blue">the source of the demo is on GitHub, and this phrase is long enough to wrap</a>.', body)] + paras(2, 2)
+    story += [Paragraph("Footnote 1: the table's totals are exact; the charts are rounded.", small)]
+    doc = Report(path)
+    doc.multiBuild(story)
+
+
+# ------------------------------------------------------------------- forms
+
+
+def application_form(path):
+    c = canvas.Canvas(path, pagesize=A4, pageCompression=1)
+    c.setTitle("Berth application form")
+    c.setAuthor("exav project")
+    form = c.acroForm
+    w, h = A4
+    c.setFont("Helvetica-Bold", 20)
+    c.drawString(2 * cm, h - 2.5 * cm, "Berth application")
+    c.setFont("Helvetica", 9)
+    c.drawString(2 * cm, h - 3.1 * cm, "A form for the exav demo (CC0-1.0). Some fields are filled in.")
+    y = h - 4.5 * cm
+
+    def label(text, yy):
+        c.setFont("Helvetica", 10)
+        c.setFillColor(colors.black)
+        c.drawString(2 * cm, yy + 3, text)
+
+    label("Full name", y)
+    form.textfield(name="name", tooltip="Full name", value="Anne Le Gall", x=6 * cm, y=y - 3, width=9 * cm, height=0.7 * cm, borderStyle="inset", fillColor=colors.HexColor("#fffbe6"), fontSize=11)
+    y -= 1.2 * cm
+    label("Boat's name", y)
+    form.textfield(name="boat", tooltip="Boat's name", value="Hirondelle", x=6 * cm, y=y - 3, width=9 * cm, height=0.7 * cm, borderStyle="inset", fontSize=11)
+    y -= 1.2 * cm
+    label("Length (m), 5 characters", y)
+    form.textfield(name="length", tooltip="Length", value="9.4", maxlen=5, x=6.5 * cm, y=y - 3, width=2.2 * cm, height=0.7 * cm, borderStyle="inset", fontSize=11)
+    y -= 1.2 * cm
+    label("Type of boat", y)
+    form.choice(name="kind", tooltip="Type of boat", value="sloop", options=["sloop", "ketch", "trawler", "motor yacht", "catamaran"], x=6 * cm, y=y - 3, width=5 * cm, height=0.7 * cm, fieldFlags="combo", borderStyle="inset", fontSize=11)
+    y -= 1.2 * cm
+    label("Services", y)
+    for i, (n, t) in enumerate([("water", "Water"), ("power", "Shore power"), ("wifi", "Wi-Fi")]):
+        form.checkbox(name=n, tooltip=t, checked=(i != 2), x=6 * cm + i * 4 * cm, y=y - 2, size=14, buttonStyle="check", borderColor=colors.black, fillColor=colors.white, textColor=colors.black)
+        c.drawString(6 * cm + i * 4 * cm + 20, y + 1, t)
+    y -= 1.2 * cm
+    label("Stay", y)
+    for i, (v, t) in enumerate([("night", "One night"), ("week", "A week"), ("season", "The season")]):
+        form.radio(name="stay", tooltip=t, value=v, selected=(v == "week"), x=6 * cm + i * 4 * cm, y=y - 2, size=14, buttonStyle="circle", borderColor=colors.black, fillColor=colors.white, textColor=colors.black)
+        c.drawString(6 * cm + i * 4 * cm + 20, y + 1, t)
+    y -= 1.2 * cm
+    label("Arrival month", y)
+    form.listbox(name="month", tooltip="Arrival month", value="June", options=["April", "May", "June", "July", "August", "September"], x=6 * cm, y=y - 2.4 * cm, width=4 * cm, height=2.4 * cm + 0.5 * cm, borderStyle="inset", fontSize=10)
+    y -= 3.6 * cm
+    label("Remarks", y)
+    form.textfield(name="remarks", tooltip="Remarks", value="Arriving after sunset.\nDraught 1.4 m.", x=6 * cm, y=y - 2 * cm, width=10 * cm, height=2.4 * cm, borderStyle="inset", fieldFlags="multiline", fontSize=10)
+    y -= 3.4 * cm
+    label("Password (hidden)", y)
+    form.textfield(name="secret", tooltip="A password field shows dots", value="berth", x=6 * cm, y=y - 3, width=5 * cm, height=0.7 * cm, borderStyle="inset", fieldFlags="password", fontSize=11)
+    y -= 1.6 * cm
+    form.textfield(name="readonly", tooltip="Read only", value="Application no. 2000-0001 (read only)", x=2 * cm, y=y - 3, width=9 * cm, height=0.7 * cm, borderStyle="solid", fieldFlags="readOnly", fontSize=10, fillColor=colors.HexColor("#eeeeee"))
+    c.setFont("Helvetica-Oblique", 8)
+    c.drawString(2 * cm, 2 * cm, "Fill the fields in the viewer; nothing is sent anywhere.")
+    c.showPage()
+    c.save()
+
+
+# --------------------------------------------------------- a tiny PDF writer
+
+
+class Pdf:
+    def __init__(self):
+        self.objs = []
+
+    def reserve(self):
+        self.objs.append(None)
+        return len(self.objs)
+
+    def set(self, n, body):
+        self.objs[n - 1] = body if isinstance(body, bytes) else body.encode("latin-1")
+
+    def add(self, body):
+        n = self.reserve()
+        self.set(n, body)
+        return n
+
+    def stream(self, entries, data, compress=False):
+        if compress:
+            data = zlib.compress(data, 9)
+            entries += " /Filter /FlateDecode"
+        return self.add(f"<< {entries} /Length {len(data)} >>\nstream\n".encode("latin-1") + data + b"\nendstream")
+
+    def write(self, path, root, info=None):
+        out = bytearray(b"%PDF-1.7\n%\xe2\xe3\xcf\xd3\n")
+        offsets = []
+        for i, body in enumerate(self.objs, 1):
+            offsets.append(len(out))
+            out += f"{i} 0 obj\n".encode() + body + b"\nendobj\n"
+        xref = len(out)
+        out += f"xref\n0 {len(self.objs) + 1}\n0000000000 65535 f \n".encode()
+        for o in offsets:
+            out += f"{o:010d} 00000 n \n".encode()
+        out += f"trailer\n<< /Size {len(self.objs) + 1} /Root {root} 0 R {f'/Info {info} 0 R' if info else ''} /ID [<6578617620657861> <6578617620657861>] >>\nstartxref\n{xref}\n%%EOF\n".encode()
+        with open(path, "wb") as f:
+            f.write(out)
+
+
+def pdf_str(s):
+    return "(" + s.replace("\\", "\\\\").replace("(", "\\(").replace(")", "\\)") + ")"
+
+
+def annotations(path):
+    p = Pdf()
+    catalog, pages = p.reserve(), p.reserve()
+    page1, page2 = p.reserve(), p.reserve()
+    font = p.add("<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >>")
+    bold = p.add("<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding >>")
+    attach = p.stream("/Type /EmbeddedFile /Subtype /text#2Fplain /Params << /Size 38 >>", b"An attached file, inside the annotation.\n", False)
+    spec = p.add(f"<< /Type /Filespec /F (note.txt) /UF (note.txt) /EF << /F {attach} 0 R >> /Desc (A file attached to the page) >>")
+
+    lines = []
+    annots = []
+
+    def text(x, y, s, f="F1", size=11):
+        lines.append(f"BT /{f} {size} Tf {x} {y} Td {pdf_str(s)} Tj ET")
+
+    def annot(body):
+        annots.append(p.add(body))
+
+    text(50, 790, "Annotations", "F2", 22)
+    text(50, 770, "Every mark below is an annotation of the page, drawn from its own entry.", "F1", 10)
+    rows = [
+        ("Link to a web address", "<< /Type /Annot /Subtype /Link /Rect [200 722 330 740] /Border [0 0 1] /C [0 0 1] /A << /S /URI /URI (https://exav.org/viewer/) >> >>"),
+        ("Link to page 2", f"<< /Type /Annot /Subtype /Link /Rect [200 692 330 710] /Border [0 0 1] /C [0 0.5 0] /Dest [{page2} 0 R /XYZ 50 760 0] >>"),
+        ("Link to a named place", "<< /Type /Annot /Subtype /Link /Rect [200 662 330 680] /Border [0 0 1] /C [0.6 0 0.6] /Dest (target) >>"),
+    ]
+    y = 730
+    for label, body in rows:
+        text(50, y, label)
+        text(205, y, "click here")
+        annot(body)
+        y -= 30
+    y = 630
+    marks = [
+        ("Highlight", "Highlight", "/C [1 1 0]"),
+        ("Underline", "Underline", "/C [0 0.6 0]"),
+        ("Strike-out", "StrikeOut", "/C [1 0 0]"),
+        ("Squiggly", "Squiggly", "/C [0.6 0 0.8]"),
+    ]
+    for label, sub, extra in marks:
+        text(50, y, f"{label}: marked text in a line")
+        x0, x1 = 50, 50 + 7.0 * len(f"{label}: marked text in a line") * 0.82
+        annot(f"<< /Type /Annot /Subtype /{sub} /Rect [{x0} {y - 3} {x1} {y + 11}] /QuadPoints [{x0} {y + 11} {x1} {y + 11} {x0} {y - 3} {x1} {y - 3}] {extra} /T (exav) /Contents ({label} annotation) /F 4 >>")
+        y -= 24
+    text(50, 520, "Text note (sticky note), free text, shapes:")
+    annot("<< /Type /Annot /Subtype /Text /Rect [60 470 80 490] /Name /Comment /Contents (A note. Its text is in the annotation.) /T (exav) /C [1 0.8 0] /Open false /F 28 >>")
+    annot("<< /Type /Annot /Subtype /FreeText /Rect [100 450 300 495] /Contents (Free text in a box) /DA (/Helv 12 Tf 0 0 1 rg) /DS (font: Helvetica 12pt) /C [1 1 0.8] /IC [1 1 0.8] /BS << /W 1 >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /Square /Rect [320 450 400 495] /C [1 0 0] /IC [1 0.9 0.9] /BS << /W 2 >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /Circle /Rect [420 450 500 495] /C [0 0 1] /IC [0.9 0.9 1] /BS << /W 2 /S /D /D [4 2] >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /Line /Rect [50 390 250 430] /L [60 400 240 420] /LE [/OpenArrow /ClosedArrow] /C [0 0.5 0] /BS << /W 2 >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /Polygon /Rect [280 380 380 430] /Vertices [290 390 370 390 380 420 300 425] /C [0.5 0 0.5] /IC [0.95 0.85 0.95] /BS << /W 1.5 >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /PolyLine /Rect [400 380 500 430] /Vertices [410 390 440 425 470 392 495 420] /C [0 0.4 0.4] /BS << /W 2 >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /Ink /Rect [50 310 250 370] /InkList [[60 320 90 360 120 320 150 360 180 320 210 360 240 330]] /C [0.8 0.3 0] /BS << /W 2.5 >> /F 4 >>")
+    annot("<< /Type /Annot /Subtype /Stamp /Rect [280 310 400 370] /Name /Approved /Contents (A stamp) /C [0 0.6 0] /F 4 >>")
+    annot(f"<< /Type /Annot /Subtype /FileAttachment /Rect [430 330 450 350] /FS {spec} 0 R /Name /Paperclip /Contents (An attached file) /C [0.3 0.3 0.3] /F 28 >>")
+    text(50, 280, "The page also holds a link under a rotated line of text, below.", "F1", 10)
+    lines.append("q 0.866 0.5 -0.5 0.866 80 150 cm BT /F1 12 Tf 0 0 Td (A rotated line with a link over it) Tj ET Q")
+    annot("<< /Type /Annot /Subtype /Link /Rect [80 150 330 230] /Border [0 0 0] /QuadPoints [80 150 80 150 80 150 80 150] /A << /S /URI /URI (https://exav.org/) >> >>")
+    content1 = p.stream("", "\n".join(lines).encode("latin-1"), True)
+
+    lines2 = []
+    lines2.append("BT /F2 22 Tf 50 790 Td (Page 2: the target) Tj ET")
+    lines2.append("BT /F1 11 Tf 50 760 Td (The named destination \"target\" points here, and so does the second line of the outline.) Tj ET")
+    lines2.append("0.9 0.95 1 rg 50 600 300 120 re f 0 0 0.6 RG 50 600 300 120 re S")
+    lines2.append("BT /F1 11 Tf 60 700 Td (A framed box.) Tj ET")
+    content2 = p.stream("", "\n".join(lines2).encode("latin-1"), True)
+
+    res = f"<< /Font << /F1 {font} 0 R /F2 {bold} 0 R /Helv {font} 0 R >> >>"
+    p.set(page1, f"<< /Type /Page /Parent {pages} 0 R /MediaBox [0 0 595 842] /Resources {res} /Contents {content1} 0 R /Annots [{' '.join(f'{a} 0 R' for a in annots)}] >>")
+    p.set(page2, f"<< /Type /Page /Parent {pages} 0 R /MediaBox [0 0 595 842] /Resources {res} /Contents {content2} 0 R >>")
+    p.set(pages, f"<< /Type /Pages /Kids [{page1} 0 R {page2} 0 R] /Count 2 >>")
+    outlines, o1, o2, o3 = p.reserve(), p.reserve(), p.reserve(), p.reserve()
+    p.set(outlines, f"<< /Type /Outlines /First {o1} 0 R /Last {o2} 0 R /Count 3 >>")
+    p.set(o1, f"<< /Title (Annotations) /Parent {outlines} 0 R /Next {o2} 0 R /Dest [{page1} 0 R /Fit] >>")
+    p.set(o2, f"<< /Title (The target) /Parent {outlines} 0 R /Prev {o1} 0 R /First {o3} 0 R /Last {o3} 0 R /Count 1 /Dest [{page2} 0 R /XYZ 50 760 0] >>")
+    p.set(o3, f"<< /Title (A box on that page) /Parent {o2} 0 R /A << /S /GoTo /D [{page2} 0 R /FitR 50 600 350 720] >> >>")
+    info = p.add("<< /Title (Annotations) /Author (exav project) /Subject (CC0-1.0) /Creator (exav make-pdf.py) >>")
+    p.set(catalog, f"<< /Type /Catalog /Pages {pages} 0 R /Outlines {outlines} 0 R /Names << /Dests << /Names [(target) [{page2} 0 R /XYZ 50 760 0]] >> >> /PageMode /UseOutlines /ViewerPreferences << /DisplayDocTitle true >> /Lang (en) >>")
+    p.write(path, catalog, info)
+
+
+# ------------------------------------------------------------------- scan
+
+LETTER = [
+    ["Harbour office, East quay", "", "Report of the harbour master", "for the month of March", "", "Berths let this month: 41 of 60.", "Visitors: 63 boats, of which 18 stayed more than two nights.", "",
+     "The breakwater light was out for three nights; it is repaired.", "The pontoon at berth 24 needs a new chain; quote attached.", "", "Weather: four days of gale from the south-west, no damage."],
+    ["Tide notes", "", "High water at the quay was at 06:12 and 18:34 on the first.", "The spring tides of the 14th and 15th reached 7.4 metres.", "Boats drawing more than 1.8 metres should wait for the", "top of the tide before they come in.", "", "The fairway buoy has been moved 50 metres to the east."],
+    ["Visitors' book (extract)", "", "Aurora, sloop 9.4 m, two nights.", "Brise, ketch 12.1 m, one night.", "Calypso, trawler 14.0 m, a week.", "Dorade, sloop 8.2 m, one night.", "", "Thanks to the office for the loan of the bicycle."],
+    ["Notes for the next month", "", "Order a new chain for berth 24.", "Paint the numbers on the east pontoon.", "Check the shore power at berths 30 to 40.", "", "Signed, the harbour master"],
+]
+
+
+def letter_page(n, w=1240, h=1754):
+    """A scanned-looking letter: paper tone, text a little off the straight, noise, a shadow."""
+    rng = np.random.default_rng(n)
+    page = Image.new("L", (w, h), 255)
+    d = ImageDraw.Draw(page)
+    words = []
+    y = 160
+    for i, line in enumerate(LETTER[n]):
+        size = 54 if i == 0 else 38
+        d.text((130, y), line, font=aileron(size), fill=25)
+        if line:
+            words.append((130, y, line, size))
+        y += 88 if i == 0 else 62
+    d.line((130, 140, w - 130, 140), fill=40, width=3)
+    d.rectangle((w - 420, h - 420, w - 140, h - 170), outline=60, width=4)
+    d.text((w - 400, h - 330), "STAMP", font=aileron(48), fill=60)
+    page = page.rotate(0.5 + 0.25 * n, resample=Image.BICUBIC, fillcolor=255, expand=False)
+    return page, words
+
+
+def scan_variants(n):
+    page, words = letter_page(n)
+    arr = np.array(page).astype(float)
+    yy, xx = np.mgrid[0 : arr.shape[0], 0 : arr.shape[1]]
+    paper = 232 - 18 * (xx / arr.shape[1]) ** 3 - 14 * (yy / arr.shape[0]) ** 2
+    grey = arr / 255 * paper + np.random.default_rng(100 + n).normal(0, 3.0, arr.shape)
+    scan_grey = Image.fromarray(np.clip(grey, 0, 255).astype(np.uint8), "L").filter(ImageFilter.GaussianBlur(0.6))
+    bilevel = page.point(lambda v: 255 if v > 150 else 0).convert("1")
+    return scan_grey, bilevel, words
+
+
+def scan_pdf(path):
+    if not (shutil.which("opj_compress") and shutil.which("jbig2") and shutil.which("tiffcp")):
+        print("scan-mixed.pdf skipped: opj_compress, jbig2 or tiffcp is missing", file=sys.stderr)
+        return
+    p = Pdf()
+    catalog, pages = p.reserve(), p.reserve()
+    font = p.add("<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >>")
+    kids = []
+    W, H = 1240, 1754
+    with tempfile.TemporaryDirectory() as tmp:
+        for n in range(4):
+            grey, bilevel, words = scan_variants(n)
+            if n == 0:
+                buf = io.BytesIO()
+                grey.save(buf, "JPEG", quality=70, dpi=(150, 150))
+                img = p.stream(f"/Type /XObject /Subtype /Image /Width {W} /Height {H} /ColorSpace /DeviceGray /BitsPerComponent 8 /Filter /DCTDecode", buf.getvalue())
+            elif n == 1:
+                src = os.path.join(tmp, "p.tif")
+                inv = bilevel.convert("L").point(lambda v: 255 - v).convert("1")
+                inv.save(src)
+                dst = os.path.join(tmp, "g4.tif")
+                subprocess.run(["tiffcp", "-c", "g4", "-r", str(H), src, dst], check=True, capture_output=True)
+                raw = open(dst, "rb").read()
+                e = "<" if raw[:2] == b"II" else ">"
+                ifd = struct.unpack(e + "I", raw[4:8])[0]
+                tags = {}
+                for i in range(struct.unpack(e + "H", raw[ifd : ifd + 2])[0]):
+                    tag, kind, count, value = struct.unpack(e + "HHII", raw[ifd + 2 + 12 * i : ifd + 14 + 12 * i])
+                    if kind == 3 and count == 1:
+                        value = value & 0xFFFF if e == "<" else value >> 16
+                    tags[tag] = value
+                strip = raw[tags[273] : tags[273] + tags[279]]
+                img = p.stream(f"/Type /XObject /Subtype /Image /Width {W} /Height {H} /ColorSpace /DeviceGray /BitsPerComponent 1 /Filter /CCITTFaxDecode /DecodeParms << /K -1 /Columns {W} /Rows {H} >>", strip)
+            elif n == 2:
+                src = os.path.join(tmp, "p.png")
+                bilevel.save(src)
+                data = subprocess.run(["jbig2", "-p", src], check=True, capture_output=True).stdout
+                img = p.stream(f"/Type /XObject /Subtype /Image /Width {W} /Height {H} /ColorSpace /DeviceGray /BitsPerComponent 1 /Filter /JBIG2Decode", data)
+            else:
+                src = os.path.join(tmp, "p.png")
+                grey.save(src)
+                dst = os.path.join(tmp, "p.jp2")
+                subprocess.run(["opj_compress", "-i", src, "-o", dst, "-r", "30", "-n", "5"], check=True, capture_output=True)
+                img = p.stream(f"/Type /XObject /Subtype /Image /Width {W} /Height {H} /ColorSpace /DeviceGray /BitsPerComponent 8 /Filter /JPXDecode", open(dst, "rb").read())
+            # The page is A4 at 150 dpi: 595 by 842 points. The invisible text sits over each line.
+            sx = 595.0 / W
+            ops = [f"q {595} 0 0 {842} 0 0 cm /Im0 Do Q", "BT 3 Tr"]
+            for x, y, line, size in words:
+                ops.append(f"/F1 {size * sx * 0.95:.1f} Tf 1 0 0 1 {x * sx:.1f} {842 - (y + size) * sx:.1f} Tm {pdf_str(line)} Tj")
+            ops.append("ET")
+            content = p.stream("", "\n".join(ops).encode("latin-1"), True)
+            kids.append(p.add(f"<< /Type /Page /Parent {pages} 0 R /MediaBox [0 0 595 842] /Resources << /Font << /F1 {font} 0 R >> /XObject << /Im0 {img} 0 R >> >> /Contents {content} 0 R >>"))
+    p.set(pages, f"<< /Type /Pages /Kids [{' '.join(f'{k} 0 R' for k in kids)}] /Count {len(kids)} >>")
+    p.set(catalog, f"<< /Type /Catalog /Pages {pages} 0 R /Lang (en) >>")
+    info = p.add("<< /Title (Scanned letters) /Author (exav project) /Subject (CC0-1.0) /Creator (exav make-pdf.py) >>")
+    p.write(path, catalog, info)
+
+
+# ------------------------------------------------------------ vector art
+
+
+def vector_art(path):
+    c = canvas.Canvas(path, pagesize=A4, pageCompression=1)
+    c.setTitle("Vector art")
+    c.setAuthor("exav project")
+    w, h = A4
+    c.setFont("Helvetica-Bold", 18)
+    c.drawString(40, h - 50, "Vector art")
+    c.setFont("Helvetica", 9)
+    c.drawString(40, h - 64, "Gradients, transparency, clipping, dashes, joins, curves and transformed text (CC0-1.0).")
+    # Axial and radial shadings.
+    # A shading paints everywhere inside the clip, so each is clipped to its box.
+    c.saveState()
+    box = c.beginPath()
+    box.roundRect(40, h - 200, 200, 110, 14)
+    c.clipPath(box, stroke=0, fill=0)
+    c.linearGradient(40, h - 200, 240, h - 90, (colors.HexColor("#0b4f6c"), colors.HexColor("#f6a01a"), colors.HexColor("#c0392b")), (0, 0.5, 1))
+    c.restoreState()
+    c.saveState()
+    disc = c.beginPath()
+    disc.circle(400, h - 145, 70)
+    c.clipPath(disc, stroke=0, fill=0)
+    c.radialGradient(400, h - 145, 70, (colors.white, colors.HexColor("#146c94"), colors.black), (0, 0.6, 1))
+    c.restoreState()
+    # Transparency: three overlapping discs.
+    for i, (cx, col) in enumerate([(80, "#c0392b"), (130, "#2c7a4b"), (105, "#146c94")]):
+        c.saveState()
+        c.setFillAlpha(0.55)
+        c.setFillColor(colors.HexColor(col))
+        c.circle(cx, h - 290 + (i == 2) * 40, 45, stroke=0, fill=1)
+        c.restoreState()
+    # Clipping: a star clips a striped rectangle.
+    c.saveState()
+    p = c.beginPath()
+    cx, cy, r1, r2 = 330, h - 280, 60, 25
+    for i in range(10):
+        a = math.pi / 5 * i - math.pi / 2
+        r = r1 if i % 2 == 0 else r2
+        (p.moveTo if i == 0 else p.lineTo)(cx + r * math.cos(a), cy + r * math.sin(a))
+    p.close()
+    c.clipPath(p, stroke=0, fill=0)
+    for i in range(14):
+        c.setFillColor(colors.HexColor("#f6a01a") if i % 2 else colors.HexColor("#0b4f6c"))
+        c.rect(cx - 70 + i * 10, cy - 70, 10, 140, stroke=0, fill=1)
+    c.restoreState()
+    # Dashes, caps and joins.
+    y = h - 380
+    for i, (dash, cap, join) in enumerate([((), 0, 0), ((6, 3), 1, 1), ((12, 4, 2, 4), 2, 2), ((1, 5), 1, 0)]):
+        c.saveState()
+        c.setLineWidth(10 if i != 3 else 3)
+        c.setDash(list(dash), 0)
+        c.setLineCap(cap)
+        c.setLineJoin(join)
+        c.setStrokeColor(colors.HexColor("#146c94"))
+        pth = c.beginPath()
+        pth.moveTo(50 + i * 130, y)
+        pth.lineTo(90 + i * 130, y - 50)
+        pth.lineTo(130 + i * 130, y)
+        c.drawPath(pth, stroke=1, fill=0)
+        c.restoreState()
+    # Bezier curves.
+    c.saveState()
+    c.setStrokeColor(colors.HexColor("#c0392b"))
+    c.setLineWidth(2)
+    pth = c.beginPath()
+    pth.moveTo(40, h - 500)
+    pth.curveTo(120, h - 400, 200, h - 600, 280, h - 500)
+    pth.curveTo(340, h - 440, 400, h - 560, 480, h - 480)
+    c.drawPath(pth, stroke=1, fill=0)
+    c.setFillColor(colors.HexColor("#8e44ad"))
+    c.setFillAlpha(0.4)
+    pth = c.beginPath()
+    pth.moveTo(60, h - 600)
+    pth.curveTo(60, h - 540, 160, h - 540, 160, h - 600)
+    pth.curveTo(160, h - 660, 60, h - 660, 60, h - 600)
+    c.drawPath(pth, stroke=1, fill=1)
+    c.restoreState()
+    # Even-odd fill: a ring.
+    c.saveState()
+    c.setFillColor(colors.HexColor("#2c7a4b"))
+    pth = c.beginPath()
+    pth.circle(260, h - 600, 50)
+    pth.circle(260, h - 600, 28)
+    c.drawPath(pth, stroke=0, fill=1, fillMode=0)
+    c.restoreState()
+    # Text: rotated, scaled, with a stroke and a fill (render modes).
+    c.saveState()
+    c.translate(420, h - 640)
+    c.rotate(25)
+    c.setFont("Times-BoldItalic", 34)
+    t = c.beginText(0, 0)
+    t.setTextRenderMode(2)
+    t.setFillColor(colors.HexColor("#f6a01a"))
+    t.setStrokeColor(colors.HexColor("#0b4f6c"))
+    t.textOut("exav")
+    c.drawText(t)
+    c.restoreState()
+    c.saveState()
+    c.setFont("Helvetica", 14)
+    for i, s in enumerate([1.0, 0.8, 0.6]):
+        c.saveState()
+        c.translate(40, h - 720 - i * 22)
+        c.scale(s * 1.5, s)
+        c.drawString(0, 0, "Scaled text: the horizontal scale and the size change.")
+        c.restoreState()
+    c.restoreState()
+    c.showPage()
+    c.save()
+
+
+field_report(os.path.join(OUT, "field-report.pdf"))
+application_form(os.path.join(OUT, "application-form.pdf"))
+annotations(os.path.join(OUT, "annotations.pdf"))
+scan_pdf(os.path.join(OUT, "scan-mixed.pdf"))
+vector_art(os.path.join(OUT, "vector-art.pdf"))
diff --git a/crates/exav-viewer/demo/examples/generate/make-text.py b/crates/exav-viewer/demo/examples/generate/make-text.py
new file mode 100644
index 00000000..05be95d1
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/make-text.py
@@ -0,0 +1,800 @@
+#!/usr/bin/env python3
+"""Writes the demo's text examples into ../files/text/.
+
+    python3 -I make-text.py [OUT_DIR]
+
+Output: CC0-1.0, a public domain dedication by the exav project. Everything
+here is written for the demo: the prose, the data (made up, from a seeded
+random generator) and the programs.
+
+Needs: Python 3.
+"""
+import json
+import math
+import os
+import random
+import sys
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+OUT = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(HERE, "..", "files", "text")
+os.makedirs(OUT, exist_ok=True)
+
+
+def write(name, text):
+    with open(os.path.join(OUT, name), "w", encoding="utf-8", newline="\n") as f:
+        f.write(text)
+
+
+FILES = {}
+
+FILES["field-guide.md"] = r"""# Field guide to Markdown
+
+A short document that uses most of what Markdown can say. It is written for the
+exav demo and is in the public domain (CC0-1.0).
+
+## Emphasis and spans
+
+Text can be **bold**, *italic*, ***both***, ~~struck through~~ or `code`. A line
+that ends with two spaces
+breaks without starting a paragraph. A [link with a title](https://exav.org/ "exav.org"),
+an autolink <https://exav.org/viewer/>, and a reference link: [the demo][demo].
+
+[demo]: https://exav.org/viewer/demo/
+
+Escapes: \*not italic\*, 2 \< 3, a literal backtick \`, and entities: &copy; &amp; &eacute;.
+Unicode goes through unchanged: café, naïve, Ωmega, Жук, 日本語, مرحبا, ☃.
+
+## Headings
+
+### Third level
+#### Fourth level
+##### Fifth level
+###### Sixth level
+
+Setext heading
+==============
+
+Another one
+-----------
+
+## Lists
+
+- A bullet
+- Another, with a nested list:
+  - second level
+    - third level
+  - back to the second
+- And a last one
+
+1. Numbered
+2. Items
+   1. Nested numbers
+   2. Continue
+3. Done
+
+7. A list that starts at seven
+8. and goes on
+
+- [x] A finished task
+- [ ] An open task
+- [ ] Another open task, with `code` in it
+
+Loose list:
+
+- First paragraph.
+
+  A second paragraph inside the same item.
+
+- Next item.
+
+## Quotes
+
+> A quotation, which can wrap over several lines and holds
+> *other* **formatting**.
+>
+> > A quotation inside it.
+>
+> - and a list
+
+## Tables
+
+| Left | Centre | Right |
+| :--- | :----: | ----: |
+| a | b | c |
+| `code` | **bold** | 1,234.50 |
+| A longer cell that holds more words | x | 7 |
+
+## Code
+
+Inline `let x = 1;` and a fenced block with a language:
+
+```rust
+fn fib(n: u32) -> u64 {
+    let (mut a, mut b) = (0u64, 1u64);
+    for _ in 0..n {
+        (a, b) = (b, a + b);
+    }
+    a
+}
+```
+
+```python
+def fib(n):
+    a, b = 0, 1
+    for _ in range(n):
+        a, b = b, a + b
+    return a
+```
+
+```diff
+- old line
++ new line
+```
+
+An indented block:
+
+    four spaces make this code
+    and it keeps   its spacing
+
+## Rules, HTML and footnotes
+
+---
+
+Inline HTML such as <kbd>Ctrl</kbd> + <kbd>C</kbd> and <sub>sub</sub> and <sup>sup</sup> is
+shown as text or ignored, never run: <script>alert(1)</script> does nothing.
+
+A sentence with a footnote.[^1] And another one.[^note]
+
+[^1]: The first footnote.
+[^note]: A second, with *formatting*.
+
+![An image reference](https://example.invalid/not-fetched.png)
+
+The end.
+"""
+
+FILES["field-notes.txt"] = """Field notes
+===========
+
+Plain text is shown as it is written: line breaks, indentation, tabs and
+long lines are kept.
+
+	A line that starts with a tab.
+        A line that starts with eight spaces.
+
+A very long line, to see how the viewer wraps or scrolls it: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Pangrams, one for each script:
+
+  English   The quick brown fox jumps over the lazy dog.
+  Français Portez ce vieux whisky au juge blond qui fume.
+  Deutsch   Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich.
+  Español  El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío.
+  Ελληνικά   Ξεσκεπάζω την ψυχοφθόρα βδελυγμία.
+  Русский   Съешь же ещё этих мягких французских булок да выпей чаю.
+  日本語    いろはにほへと ちりぬるを わかよたれそ つねならむ
+  العربية   نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومزخرف
+  עברית    דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה
+
+Symbols and box drawing:
+
+  ┌──────┬──────┐   ← ↑ → ↓   ✓ ✗   ½ ⅓ ¾   ± × ÷ ≠ ≤ ≥ ∞
+  │ a    │ b    │   € £ ¥ ₿   © ® ™   ☀ ☁ ☂ ☃
+  └──────┴──────┘
+
+The last line has no newline at the end."""
+
+FILES["recipes.json"] = json.dumps(
+    {
+        "title": "A small recipe book",
+        "version": 3,
+        "published": True,
+        "updated": None,
+        "tags": ["cooking", "demo", "café", "日本語"],
+        "numbers": {"integer": 42, "negative": -7, "float": 3.14159, "exponent": 6.02e23, "tiny": 1e-9, "zero": 0},
+        "recipes": [
+            {
+                "name": "Crepes",
+                "serves": 4,
+                "time": {"prep_min": 10, "rest_min": 30, "cook_min": 20},
+                "ingredients": [{"item": "flour", "amount": 250, "unit": "g"}, {"item": "milk", "amount": 0.5, "unit": "l"}, {"item": "eggs", "amount": 3, "unit": None}, {"item": "salt", "amount": "a pinch"}],
+                "steps": ["Whisk the flour and eggs.", "Add the milk slowly.", "Rest for 30 minutes.", "Cook in a hot pan, a minute a side."],
+                "nutrition": {"kcal": 210, "protein_g": 8.5, "vegetarian": True},
+            },
+            {
+                "name": "Ratatouille",
+                "serves": 6,
+                "time": {"prep_min": 25, "cook_min": 60},
+                "ingredients": [{"item": "aubergine", "amount": 2}, {"item": "courgette", "amount": 3}, {"item": "tomatoes", "amount": 500, "unit": "g"}, {"item": "olive oil", "amount": 4, "unit": "tbsp"}],
+                "steps": ["Dice the vegetables.", "Fry each in turn.", "Stew together for an hour."],
+                "nutrition": {"kcal": 160, "protein_g": 3.1, "vegetarian": True, "vegan": True},
+            },
+        ],
+        "nested": {"a": {"b": {"c": {"d": {"e": [1, [2, [3, [4, [5]]]]]}}}}},
+        "escapes": "quote \" backslash \\ slash / newline \n tab \t unicode é 中 😀",
+        "empty": {"object": {}, "array": [], "string": ""},
+    },
+    indent=2,
+    ensure_ascii=False,
+) + "\n"
+
+FILES["config.yaml"] = """# A configuration file, to show YAML as text.
+service:
+  name: harbour-register
+  port: 8080
+  debug: false
+  tags: [boats, berths, "quay east"]
+  limits:
+    requests_per_minute: 600
+    body_bytes: 1048576
+database:
+  url: postgres://register@localhost:5432/harbour
+  pool: {min: 2, max: 10}
+berths:
+  - number: 1
+    length_m: 6.5
+    vessel: Aurora
+  - number: 2
+    length_m: 8.2
+    vessel: Brise
+notes: |
+  A block of text that keeps
+  its line breaks.
+folded: >
+  A block of text that is
+  folded into one line.
+anchors:
+  base: &base {retries: 3, timeout_s: 30}
+  copy: *base
+"""
+
+FILES["pyproject.toml"] = """# A project file, to show TOML as text.
+[project]
+name = "harbour-register"
+version = "1.4.0"
+description = "The mooring register of the east quay"
+requires-python = ">=3.11"
+dependencies = ["httpx>=0.27", "pydantic>=2"]
+
+[project.optional-dependencies]
+test = ["pytest", "pytest-cov"]
+
+[tool.ruff]
+line-length = 100
+select = ["E", "F", "I"]
+
+[[tool.harbour.berths]]
+number = 1
+length = 6.5
+
+[[tool.harbour.berths]]
+number = 2
+length = 8.2
+"""
+
+FILES["feed.xml"] = """<?xml version="1.0" encoding="UTF-8"?>
+<!-- An Atom feed, to show XML as text. -->
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
+  <title>Notes from the east quay</title>
+  <subtitle type="html">Moorings, tides &amp; weather</subtitle>
+  <link href="https://example.invalid/feed.xml" rel="self"/>
+  <link href="https://example.invalid/"/>
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+  <updated>2000-01-03T12:00:00Z</updated>
+  <author><name>The harbour office</name><email>office@example.invalid</email></author>
+  <entry>
+    <title>New berths on the east quay</title>
+    <link href="https://example.invalid/2000/01/berths"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <updated>2000-01-03T12:00:00Z</updated>
+    <summary>Twelve berths for visiting boats open on 1 March.</summary>
+    <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>The <b>east quay</b> is longer by 40&#160;metres.</p></div></content>
+    <category term="moorings"/>
+  </entry>
+  <entry>
+    <title>Tide tables for the year</title>
+    <link href="https://example.invalid/2000/01/tides"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6b</id>
+    <updated>2000-01-01T08:00:00Z</updated>
+    <summary><![CDATA[High water at 06:12 & 18:34; low water at <12:00.]]></summary>
+  </entry>
+</feed>
+"""
+
+
+def gpx():
+    pts = []
+    for i in range(60):
+        t = i / 59
+        lat = 48.3794 + 0.03 * math.sin(t * 5) + 0.01 * t
+        lon = -4.4900 + 0.06 * t + 0.01 * math.cos(t * 7)
+        ele = 20 + 15 * math.sin(t * 9) + 10 * t
+        pts.append(f'      <trkpt lat="{lat:.5f}" lon="{lon:.5f}"><ele>{ele:.1f}</ele><time>2000-01-01T{8 + i // 60:02d}:{i % 60:02d}:00Z</time></trkpt>')
+    return (
+        '<?xml version="1.0" encoding="UTF-8"?>\n'
+        '<gpx version="1.1" creator="exav make-text.py" xmlns="http://www.topografix.com/GPX/1/1">\n'
+        "  <metadata><name>Coastal walk (made up)</name><desc>A made-up track, 60 points.</desc></metadata>\n"
+        '  <wpt lat="48.3794" lon="-4.4900"><name>Start</name><sym>Flag</sym></wpt>\n'
+        '  <wpt lat="48.4100" lon="-4.4300"><name>Viewpoint</name><desc>Seals on the rocks, in winter.</desc></wpt>\n'
+        "  <trk>\n    <name>Morning walk</name>\n    <trkseg>\n" + "\n".join(pts) + "\n    </trkseg>\n  </trk>\n</gpx>\n"
+    )
+
+
+FILES["route.gpx"] = gpx()
+
+FILES["places.kml"] = """<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+  <Document>
+    <name>Places (made up)</name>
+    <Style id="harbour"><IconStyle><color>ff0000ff</color><scale>1.2</scale></IconStyle><PolyStyle><color>7f00ff00</color></PolyStyle></Style>
+    <Placemark>
+      <name>East quay</name>
+      <description><![CDATA[<b>Moorings</b> for 60 boats.]]></description>
+      <styleUrl>#harbour</styleUrl>
+      <Point><coordinates>-4.4860,48.3830,0</coordinates></Point>
+    </Placemark>
+    <Placemark>
+      <name>Breakwater</name>
+      <LineString><tessellate>1</tessellate><coordinates>-4.4900,48.3790,0 -4.4850,48.3820,0 -4.4800,48.3835,0</coordinates></LineString>
+    </Placemark>
+    <Placemark>
+      <name>Anchorage</name>
+      <styleUrl>#harbour</styleUrl>
+      <Polygon><outerBoundaryIs><LinearRing><coordinates>-4.4950,48.3850,0 -4.4900,48.3850,0 -4.4900,48.3900,0 -4.4950,48.3900,0 -4.4950,48.3850,0</coordinates></LinearRing></outerBoundaryIs></Polygon>
+    </Placemark>
+  </Document>
+</kml>
+"""
+
+
+def harbour_csv():
+    rng = random.Random(11)
+    boats = ["Aurora", "Brise", "Calypso", "Dorade", "Etoile", "Fauvette", "Goeland", "Hirondelle", "Iroise", "Jolie Brise", "Kerguelen", "La Mouette"]
+    kinds = ["sloop", "ketch", "trawler", "motor yacht", "catamaran", "dinghy"]
+    notes = ["", "", "", "Arrived late, \"quiet\" night", "Bill sent; paid by cheque", "Owner: M. Le Gall, tel. 02 98 00 00 00", "Two nights,\nleft at dawn", "Café voucher given", ""]
+    rows = ["date,vessel,type,length_m,beam_m,berth,nights,fee_eur,notes"]
+
+    def q(s):
+        s = str(s)
+        return '"' + s.replace('"', '""') + '"' if any(c in s for c in ',"\n') else s
+
+    for i in range(300):
+        d = 1 + i // 10
+        month = 1 + (d - 1) // 28
+        day = 1 + (d - 1) % 28
+        length = round(rng.uniform(4.5, 16.0), 1)
+        nights = rng.randint(1, 5)
+        rows.append(",".join(q(v) for v in [f"2000-{month:02d}-{day:02d}", rng.choice(boats) + (f" {i // 40 + 2}" if i > 40 else ""), rng.choice(kinds), length, round(length * 0.33, 2), rng.randint(1, 60), nights, f"{nights * (8 + length * 1.6):.2f}", rng.choice(notes)]))
+    return "\n".join(rows) + "\n"
+
+
+FILES["harbour-log.csv"] = harbour_csv()
+
+FILES["tides.tsv"] = "day\thigh_1\theight_1_m\tlow_1\theight_2_m\tcoefficient\n" + "\n".join(
+    f"{d}\t{(5 + d * 0.8) % 24:05.2f}\t{4.5 + 2.4 * math.sin(d / 4.7):.2f}\t{(11 + d * 0.8) % 24:05.2f}\t{1.2 + 0.8 * math.cos(d / 4.7):.2f}\t{int(70 + 40 * math.sin(d / 4.7))}" for d in range(1, 29)
+) + "\n"
+
+FILES["prix.csv"] = "Région;Produit;Quantité;Prix unitaire (€);Total (€)\n" + "\n".join(
+    f"{r};{p};{q};{u:.2f}".replace(".", ",") + ";" + f"{q * u:.2f}".replace(".", ",")
+    for r, p, q, u in [("Bretagne", "Cidre", 120, 3.5), ("Bretagne", "Galettes", 300, 1.2), ("Normandie", "Cidre", 90, 3.8), ("Normandie", "Camembert", 200, 4.1), ("Alsace", "Riesling", 150, 7.9), ("Alsace", "Bretzels", 500, 0.6)]
+) + "\n"
+
+FILES["life.py"] = '''"""Conway's Game of Life on a torus, printed as text. CC0-1.0, exav project."""
+import random
+import sys
+
+WIDTH, HEIGHT = 40, 16
+
+
+def step(cells):
+    """The next generation of a set of (x, y) cells on a WIDTH by HEIGHT torus."""
+    counts = {}
+    for (x, y) in cells:
+        for dx in (-1, 0, 1):
+            for dy in (-1, 0, 1):
+                if dx or dy:
+                    key = ((x + dx) % WIDTH, (y + dy) % HEIGHT)
+                    counts[key] = counts.get(key, 0) + 1
+    return {cell for cell, n in counts.items() if n == 3 or (n == 2 and cell in cells)}
+
+
+def show(cells):
+    return "\\n".join("".join("#" if (x, y) in cells else "." for x in range(WIDTH)) for y in range(HEIGHT))
+
+
+def main(generations=20, seed=7):
+    rng = random.Random(seed)
+    cells = {(x, y) for x in range(WIDTH) for y in range(HEIGHT) if rng.random() < 0.25}
+    for g in range(generations):
+        print(f"generation {g}: {len(cells)} cells")
+        print(show(cells))
+        cells = step(cells)
+
+
+if __name__ == "__main__":
+    main(*(int(a) for a in sys.argv[1:3]))
+'''
+
+FILES["lru.rs"] = '''//! A small least-recently-used cache. CC0-1.0, exav project.
+use std::collections::HashMap;
+use std::hash::Hash;
+
+/// A cache that keeps at most `capacity` entries and drops the one used longest ago.
+pub struct Lru<K, V> {
+    capacity: usize,
+    tick: u64,
+    entries: HashMap<K, (V, u64)>,
+}
+
+impl<K: Hash + Eq + Clone, V> Lru<K, V> {
+    pub fn new(capacity: usize) -> Self {
+        assert!(capacity > 0, "a cache holds at least one entry");
+        Lru { capacity, tick: 0, entries: HashMap::with_capacity(capacity) }
+    }
+
+    pub fn get(&mut self, key: &K) -> Option<&V> {
+        self.tick += 1;
+        let tick = self.tick;
+        self.entries.get_mut(key).map(|(v, used)| {
+            *used = tick;
+            &*v
+        })
+    }
+
+    pub fn put(&mut self, key: K, value: V) -> Option<V> {
+        self.tick += 1;
+        if !self.entries.contains_key(&key) && self.entries.len() == self.capacity {
+            let oldest = self.entries.iter().min_by_key(|(_, (_, used))| *used).map(|(k, _)| k.clone());
+            if let Some(k) = oldest {
+                self.entries.remove(&k);
+            }
+        }
+        self.entries.insert(key, (value, self.tick)).map(|(v, _)| v)
+    }
+
+    pub fn len(&self) -> usize {
+        self.entries.len()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn drops_the_least_recently_used() {
+        let mut c = Lru::new(2);
+        c.put("a", 1);
+        c.put("b", 2);
+        assert_eq!(c.get(&"a"), Some(&1));
+        c.put("c", 3);
+        assert_eq!(c.get(&"b"), None);
+        assert_eq!(c.len(), 2);
+    }
+}
+'''
+
+FILES["tokens.ts"] = '''// An arithmetic tokenizer and evaluator. CC0-1.0, exav project.
+type Token = { kind: "num"; value: number } | { kind: "op"; value: "+" | "-" | "*" | "/" | "^" } | { kind: "paren"; value: "(" | ")" };
+
+export function tokenize(source: string): Token[] {
+  const tokens: Token[] = [];
+  const re = /\\s*(?:(\\d+(?:\\.\\d+)?)|([-+*/^])|([()]))/y;
+  let match: RegExpExecArray | null;
+  while (re.lastIndex < source.length && (match = re.exec(source))) {
+    if (match[1] !== undefined) tokens.push({ kind: "num", value: Number(match[1]) });
+    else if (match[2]) tokens.push({ kind: "op", value: match[2] as "+" });
+    else tokens.push({ kind: "paren", value: match[3] as "(" });
+  }
+  if (re.lastIndex < source.trimEnd().length) throw new SyntaxError(`unexpected character at ${re.lastIndex}`);
+  return tokens;
+}
+
+const PRECEDENCE: Record<string, [number, "left" | "right"]> = { "+": [1, "left"], "-": [1, "left"], "*": [2, "left"], "/": [2, "left"], "^": [3, "right"] };
+
+/** Evaluates with the shunting-yard algorithm. */
+export function evaluate(source: string): number {
+  const out: number[] = [];
+  const ops: string[] = [];
+  const apply = (op: string) => {
+    const b = out.pop();
+    const a = out.pop();
+    if (a === undefined || b === undefined) throw new SyntaxError("missing operand");
+    out.push(op === "+" ? a + b : op === "-" ? a - b : op === "*" ? a * b : op === "/" ? a / b : a ** b);
+  };
+  for (const t of tokenize(source)) {
+    if (t.kind === "num") out.push(t.value);
+    else if (t.kind === "op") {
+      const [p, assoc] = PRECEDENCE[t.value]!;
+      while (ops.length) {
+        const top = ops[ops.length - 1]!;
+        const [tp] = PRECEDENCE[top] ?? [-1];
+        if (top !== "(" && (tp > p || (tp === p && assoc === "left"))) apply(ops.pop()!);
+        else break;
+      }
+      ops.push(t.value);
+    } else if (t.value === "(") ops.push("(");
+    else {
+      while (ops.length && ops[ops.length - 1] !== "(") apply(ops.pop()!);
+      if (ops.pop() !== "(") throw new SyntaxError("unbalanced parenthesis");
+    }
+  }
+  while (ops.length) {
+    const op = ops.pop()!;
+    if (op === "(") throw new SyntaxError("unbalanced parenthesis");
+    apply(op);
+  }
+  return out[0] ?? NaN;
+}
+
+console.log(evaluate("2 + 3 * (4 - 1) ^ 2"));
+'''
+
+FILES["bits.c"] = '''/* Bit tricks on 32-bit words. CC0-1.0, exav project. */
+#include <stdint.h>
+#include <stdio.h>
+
+/* The number of set bits, by the parallel sum. */
+static unsigned popcount32(uint32_t x) {
+    x = x - ((x >> 1) & 0x55555555u);
+    x = (x & 0x33333333u) + ((x >> 2) & 0x33333333u);
+    x = (x + (x >> 4)) & 0x0f0f0f0fu;
+    return (x * 0x01010101u) >> 24;
+}
+
+/* The index of the highest set bit, or -1 for zero. */
+static int high_bit(uint32_t x) {
+    int n = -1;
+    while (x) {
+        n++;
+        x >>= 1;
+    }
+    return n;
+}
+
+/* The next power of two that is not below x. */
+static uint32_t next_pow2(uint32_t x) {
+    if (x <= 1) return 1;
+    x--;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+    return x + 1;
+}
+
+/* The bits of x in reverse order. */
+static uint32_t reverse32(uint32_t x) {
+    x = ((x >> 1) & 0x55555555u) | ((x & 0x55555555u) << 1);
+    x = ((x >> 2) & 0x33333333u) | ((x & 0x33333333u) << 2);
+    x = ((x >> 4) & 0x0f0f0f0fu) | ((x & 0x0f0f0f0fu) << 4);
+    x = ((x >> 8) & 0x00ff00ffu) | ((x & 0x00ff00ffu) << 8);
+    return (x >> 16) | (x << 16);
+}
+
+int main(void) {
+    const uint32_t samples[] = {0u, 1u, 255u, 1000u, 0xdeadbeefu};
+    for (size_t i = 0; i < sizeof samples / sizeof samples[0]; i++) {
+        uint32_t v = samples[i];
+        printf("%10u: bits %2u, high %2d, pow2 %10u, reversed %08x\\n", v, popcount32(v), high_bit(v), next_pow2(v), reverse32(v));
+    }
+    return 0;
+}
+'''
+
+FILES["report.sql"] = """-- Moorings by month, with window functions. CC0-1.0, exav project.
+CREATE TABLE vessel (
+    id        INTEGER PRIMARY KEY,
+    name      TEXT NOT NULL UNIQUE,
+    length_m  REAL NOT NULL CHECK (length_m > 0),
+    kind      TEXT NOT NULL DEFAULT 'sloop'
+);
+
+CREATE TABLE stay (
+    id        INTEGER PRIMARY KEY,
+    vessel_id INTEGER NOT NULL REFERENCES vessel (id),
+    berth     INTEGER NOT NULL,
+    arrived   DATE NOT NULL,
+    nights    INTEGER NOT NULL,
+    fee_eur   NUMERIC(8, 2)
+);
+
+CREATE INDEX stay_by_arrival ON stay (arrived);
+
+WITH monthly AS (
+    SELECT strftime('%Y-%m', arrived) AS month,
+           count(*)                    AS stays,
+           sum(nights)                 AS nights,
+           sum(fee_eur)                AS income
+    FROM stay
+    GROUP BY 1
+)
+SELECT month,
+       stays,
+       income,
+       income - lag(income) OVER (ORDER BY month) AS change,
+       round(100.0 * income / sum(income) OVER (), 1) AS share_pct,
+       rank() OVER (ORDER BY income DESC) AS income_rank
+FROM monthly
+ORDER BY month;
+
+-- The ten longest boats that stayed more than three nights.
+SELECT v.name, v.length_m, s.nights
+FROM vessel AS v
+JOIN stay AS s ON s.vessel_id = v.id
+WHERE s.nights > 3 AND v.kind IN ('ketch', 'trawler')
+ORDER BY v.length_m DESC
+LIMIT 10;
+"""
+
+FILES["deploy.sh"] = """#!/usr/bin/env bash
+# Build, check and copy a static site. CC0-1.0, exav project.
+set -euo pipefail
+
+SITE_DIR="${SITE_DIR:-./public}"
+REMOTE="${REMOTE:-deploy@example.invalid:/var/www/site}"
+LOG="$(mktemp)"
+
+cleanup() {
+  local status=$?
+  rm -f "$LOG"
+  if [ "$status" -ne 0 ]; then
+    echo "deploy failed with status $status" >&2
+  fi
+}
+trap cleanup EXIT
+
+log() { printf '[%s] %s\\n' "$(date +%H:%M:%S)" "$*"; }
+
+build() {
+  log "building"
+  npm ci --silent >"$LOG" 2>&1 || { cat "$LOG" >&2; return 1; }
+  npm run build --silent
+}
+
+check() {
+  local broken=0
+  while IFS= read -r -d '' file; do
+    if ! grep -q '</html>' "$file"; then
+      log "incomplete page: $file"
+      broken=$((broken + 1))
+    fi
+  done < <(find "$SITE_DIR" -name '*.html' -print0)
+  return "$broken"
+}
+
+case "${1:-all}" in
+  build) build ;;
+  check) check ;;
+  all)   build && check && rsync -az --delete "$SITE_DIR/" "$REMOTE" && log "done" ;;
+  *)     echo "usage: $0 [build|check|all]" >&2; exit 2 ;;
+esac
+"""
+
+FILES["style.css"] = """/* A small stylesheet with custom properties, grid and a media query. CC0-1.0, exav project. */
+:root {
+  --ink: #1b2430;
+  --paper: #fbfaf7;
+  --accent: #0b7285;
+  --radius: 0.5rem;
+  --gap: clamp(0.75rem, 2vw, 1.5rem);
+  color-scheme: light dark;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root { --ink: #e7edf3; --paper: #12171d; --accent: #66d9e8; }
+}
+
+*, *::before, *::after { box-sizing: border-box; }
+
+body {
+  margin: 0;
+  background: var(--paper);
+  color: var(--ink);
+  font: 1rem/1.55 system-ui, sans-serif;
+}
+
+.cards {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(14rem, 1fr));
+  gap: var(--gap);
+  padding: var(--gap);
+}
+
+.card {
+  padding: 1rem;
+  border: 1px solid color-mix(in srgb, var(--ink) 20%, transparent);
+  border-radius: var(--radius);
+  transition: transform 120ms ease, box-shadow 120ms ease;
+}
+
+.card:hover,
+.card:focus-within {
+  transform: translateY(-2px);
+  box-shadow: 0 6px 18px rgb(0 0 0 / 0.12);
+}
+
+.card > h2::after { content: " \\2192"; color: var(--accent); }
+
+a:not([class]) { color: var(--accent); text-underline-offset: 0.2em; }
+
+@media (max-width: 40rem) {
+  .cards { grid-template-columns: 1fr; }
+}
+"""
+
+FILES["page.html"] = """<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>A page, shown as its source</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="style.css">
+  <style>.note { font-style: italic; }</style>
+</head>
+<body>
+  <!-- HTML is shown as text: nothing in this file runs. CC0-1.0, exav project. -->
+  <header><h1>Harbour office</h1><nav><a href="#berths">Berths</a> <a href="#tides">Tides</a></nav></header>
+  <main>
+    <section id="berths">
+      <h2>Berths</h2>
+      <table>
+        <thead><tr><th scope="col">Berth</th><th scope="col">Length</th></tr></thead>
+        <tbody><tr><td>1</td><td>6.5&nbsp;m</td></tr><tr><td>2</td><td>8.2&nbsp;m</td></tr></tbody>
+      </table>
+      <p class="note">Lengths are over all, in metres.</p>
+    </section>
+    <form action="/search" method="get"><label>Boat <input name="q" type="search" required></label> <button>Search</button></form>
+  </main>
+  <script>
+    document.querySelectorAll("nav a").forEach((a) => a.addEventListener("click", () => console.log(a.hash)));
+  </script>
+</body>
+</html>
+"""
+
+FILES["changes.diff"] = """diff --git a/src/berths.py b/src/berths.py
+index 3f2a1c4..9b7d0e8 100644
+--- a/src/berths.py
++++ b/src/berths.py
+@@ -10,12 +10,16 @@ class Berth:
+     number: int
+     length_m: float
++    max_draught_m: float = 1.5
+
+     def fits(self, boat):
+-        return boat.length_m <= self.length_m
++        return boat.length_m <= self.length_m and boat.draught_m <= self.max_draught_m
+
+     def label(self):
+-        return "Berth %d" % self.number
++        return f"Berth {self.number} ({self.length_m:.1f} m)"
+@@ -40,7 +44,7 @@ def free_berths(register, boat):
+     for berth in register:
+         if berth.fits(boat):
+             yield berth
+-    return
++    return None
+diff --git a/README.md b/README.md
+index 1e2d3f4..5a6b7c8 100644
+--- a/README.md
++++ b/README.md
+@@ -1,4 +1,5 @@
+ # Harbour register
+
+ The mooring register of the east quay.
++Berths now have a maximum draught.
+"""
+
+FILES["subtitles.srt"] = "\n".join(
+    f"{i}\n00:00:{2 * i:02d},000 --> 00:00:{2 * i + 1:02d},800\n{line}\n"
+    for i, line in enumerate(["The tide is coming in.", "Berth fourteen is free.", "<i>A gull laughs.</i>", "Take the line, please.", "Engine off, thank you.", "Welcome to the east quay."], 1)
+)
+
+FILES["server.log"] = "".join(
+    f'2000-01-01T{8 + i // 60:02d}:{i % 60:02d}:{(i * 7) % 60:02d}Z {["INFO", "INFO", "INFO", "WARN", "ERROR"][i % 5]} request id={1000 + i} path=/berths/{i % 60 + 1} status={[200, 200, 304, 404, 500][i % 5]} ms={12 + (i * 37) % 250}\n' for i in range(120)
+)
+
+for name, text in FILES.items():
+    write(name, text)
diff --git a/crates/exav-viewer/demo/examples/generate/verify-evidence.mjs b/crates/exav-viewer/demo/examples/generate/verify-evidence.mjs
new file mode 100644
index 00000000..76081104
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/generate/verify-evidence.mjs
@@ -0,0 +1,96 @@
+#!/usr/bin/env node
+// Fetches the page that states each third-party example's licence and checks
+// that the words recorded in examples.json (`evidence_quote`) are on it.
+//
+//     node generate/verify-evidence.mjs [name-fragment ...]
+//
+// A name fragment also matches the evidence address (`commons.wikimedia.org`).
+// It needs the network and is slow on purpose (one request at a time, with a
+// pause), so it is not part of the demo build. A page that is a PDF is read with
+// pdftotext, and a web page is read without its tags. An entry with `evidence_row` names a field (the file's SHA-256) that
+// must sit in the same row of a JSON table as the quote. Exit 1 when a quote is
+// missing or a page cannot be read.
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const { examples } = JSON.parse(fs.readFileSync(path.join(here, "..", "examples.json"), "utf8"));
+const only = process.argv.slice(2);
+const USER_AGENT = "exav-examples/1.0 (https://github.com/sylvinus/exav)";
+
+const norm = (s) =>
+  s
+    .replace(/\\\//g, "/")
+    .replace(/&amp;/g, "&")
+    .replace(/&quot;/g, '"')
+    .replace(/&#0?39;|&apos;/g, "'")
+    .replace(/&nbsp;/g, " ")
+    .replace(/\\"/g, '"')
+    .replace(/\s+/g, " ")
+    .replace(/ ([.,;:!?)])/g, "$1");
+
+const cache = new Map();
+async function page(url) {
+  if (cache.has(url)) return cache.get(url);
+  let last;
+  for (let attempt = 1; attempt <= 4; attempt++) {
+    try {
+      const res = await fetch(url, { headers: { "User-Agent": USER_AGENT, Accept: "*/*" }, redirect: "follow" });
+      if (res.ok) {
+        const buf = Buffer.from(await res.arrayBuffer());
+        let raw;
+        const texts = [];
+        if (buf.subarray(0, 5).toString() === "%PDF-") {
+          const tmp = path.join(os.tmpdir(), `exav-evidence-${process.pid}.pdf`);
+          fs.writeFileSync(tmp, buf);
+          raw = execFileSync("pdftotext", [tmp, "-"], { maxBuffer: 1 << 28 }).toString();
+          fs.rmSync(tmp);
+        } else {
+          raw = buf.toString("utf8");
+          // A web page is also read as a person sees it, tags apart.
+          if (/<html[\s>]/i.test(raw.slice(0, 2000)) || /^\s*<!doctype html/i.test(raw)) {
+            texts.push(raw.replace(/<(script|style)[\s\S]*?<\/\1>/gi, " ").replace(/<[^>]*>/g, " "));
+          }
+        }
+        texts.push(raw);
+        cache.set(url, texts);
+        return texts;
+      }
+      last = new Error(`HTTP ${res.status}`);
+      if (res.status !== 429 && res.status < 500) break;
+    } catch (e) {
+      last = e;
+    }
+    await new Promise((r) => setTimeout(r, 2000 * attempt));
+  }
+  throw new Error(`${url}: ${last?.message ?? last}`);
+}
+
+let failed = 0;
+let checked = 0;
+for (const e of examples) {
+  if (e.generated || (only.length && !only.some((o) => e.file.includes(o) || e.evidence.includes(o)))) continue;
+  checked++;
+  try {
+    const texts = await page(e.evidence);
+    const quote = norm(e.evidence_quote);
+    let ok;
+    if (e.evidence_row) {
+      const row = norm(texts.at(-1)).split(/\],\s?\[/).find((r) => r.includes(e[e.evidence_row]));
+      ok = Boolean(row) && row.includes(quote);
+    } else {
+      ok = texts.some((t) => norm(t).includes(quote));
+    }
+    console.log(`${ok ? "ok  " : "FAIL"} ${e.file}: ${e.evidence}`);
+    if (!ok) failed++;
+  } catch (err) {
+    console.log(`FAIL ${e.file}: ${err.message}`);
+    failed++;
+  }
+  await new Promise((r) => setTimeout(r, 400));
+}
+console.log(`${checked} pages checked, ${failed} failed`);
+process.exit(failed ? 1 : 0);
diff --git a/crates/exav-viewer/demo/examples/verify-open.mjs b/crates/exav-viewer/demo/examples/verify-open.mjs
new file mode 100644
index 00000000..dbe2549f
--- /dev/null
+++ b/crates/exav-viewer/demo/examples/verify-open.mjs
@@ -0,0 +1,205 @@
+#!/usr/bin/env node
+// Checks that the viewer's own engines read every example, in Node, without a browser:
+//
+//     node demo/examples/verify-open.mjs [name-fragment ...]
+//
+// For each example (from demo/public/examples/ after `npm run demo:examples`, else
+// the committed files/), it asks the viewer's detection (dist/core, from `npm run
+// build`) which format claims it, and then reads it with the engine for that
+// format: the wasm decoders and converters of wasm/ (`npm run build:wasm`),
+// @exav/unpack-wasm for archives and pdf.js for PDF. A file of the `unsupported`
+// group must fail; any other must open. Exit 1 on a surprise.
+//
+// What it does not check: that the picture drawn is right (it counts what the
+// engine returns), and the browser-only formats (the browser draws PNG, JPEG,
+// GIF, WebP and SVG; its media players play audio and video): those are checked
+// by their signature.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+const pkg = path.join(here, "..", "..");
+const only = process.argv.slice(2);
+const { examples } = JSON.parse(fs.readFileSync(path.join(here, "examples.json"), "utf8"));
+
+const wasm = (name) => path.join(pkg, "wasm", name);
+const need = (p) => {
+  if (!fs.existsSync(p)) throw new Error(`${path.relative(pkg, p)} is missing: run npm run build:wasm and npm run build first`);
+  return p;
+};
+const load = async (name) => {
+  const mod = await import(pathToFileURL(need(wasm(`exav_viewer_${name}.js`))).href);
+  mod.initSync({ module: fs.readFileSync(wasm(`exav_viewer_${name}_bg.wasm`)) });
+  return mod;
+};
+const cache = {};
+const engine = async (name) => (cache[name] ??= await load(name));
+
+const formats = await import(pathToFileURL(need(path.join(pkg, "dist", "core", "formats.js"))).href);
+const { createDetector } = await import(pathToFileURL(path.join(pkg, "dist", "core", "detect.js")).href);
+const merge = (a, b) => ({ ...a, types: [...(a.types ?? []), ...(b.types ?? [])], extensions: [...(a.extensions ?? []), ...(b.extensions ?? [])], extensionOverrides: [...(a.extensionOverrides ?? []), ...(b.extensionOverrides ?? [])] });
+const detector = createDetector(formats.BUILTIN_ORDER.map((id) => ({ id, match: id === "image" ? merge(formats.MATCHERS.image, formats.WASM_IMAGES) : formats.MATCHERS[id] })));
+
+let unpack;
+const archive = async () => {
+  if (!unpack) {
+    const dir = path.join(pkg, "..", "exav-unpack-wasm", "pkg");
+    unpack = await import(pathToFileURL(need(path.join(dir, "exav_unpack_wasm.js"))).href);
+    unpack.initSync({ module: fs.readFileSync(path.join(dir, "exav_unpack_wasm_bg.wasm")) });
+  }
+  return unpack;
+};
+
+let pdfjs;
+const pdf = async () => (pdfjs ??= await import(pathToFileURL(path.join(pkg, "node_modules", "pdfjs-dist", "legacy", "build", "pdf.mjs")).href));
+
+const ext = (name) => path.extname(name).slice(1).toLowerCase();
+const GB = 1 << 30;
+
+/** One check per detected format: returns a short description, or throws. */
+const READ = {
+  async image(name, bytes) {
+    const e = ext(name);
+    if (["png", "jpg", "jpeg", "gif", "webp"].includes(e)) {
+      const type = detector.sniff(bytes.subarray(0, 512));
+      if (!type.startsWith("image/")) throw new Error(`sniffed as "${type}"`);
+      return `browser draws it (${type})`;
+    }
+    if (e === "svg") {
+      if (!/<svg[\s>]/.test(new TextDecoder().decode(bytes.subarray(0, 4096)))) throw new Error("no <svg> element at the start");
+      return "browser draws it (SVG)";
+    }
+    const m = await engine("image");
+    const d = m.decodeImage(bytes, 1 << 29);
+    const px = d.takeRgba();
+    let sum = 0;
+    for (let i = 0; i < px.length; i += 4) sum += px[i] + px[i + 1] + px[i + 2];
+    if (px.length === 0 || sum === 0) throw new Error("decoded to nothing, or all black");
+    return `${m.imageFormat(bytes.subarray(0, 512)) ?? "?"} ${d.width}x${d.height}`;
+  },
+  async dwg(name, bytes) {
+    const m = await engine("dwg");
+    const doc = m.parseDrawing(bytes, GB / 2);
+    const layouts = JSON.parse(doc.layoutsJson());
+    let best = 0;
+    for (const l of layouts) {
+      const d = doc.tessellate(l.name, new Uint8Array([255, 255, 255]), 50_000_000);
+      best = Math.max(best, d.opaqueStrokes() + d.opaqueFills());
+    }
+    if (!best) throw new Error("nothing drawn");
+    return `${layouts.length} layout(s), ${best} strokes and fills`;
+  },
+  async model(name, bytes, id) {
+    const m = await engine("model");
+    const model = { stl: m.parseStl, obj: m.parseObj, ply: m.parsePly, gltf: m.parseGltf, ifc: m.parseIfc }[id](bytes, 20_000_000);
+    const meta = JSON.parse(model.metaJson());
+    const tris = meta.batches.reduce((n, b) => n + b.indices / 3, 0);
+    if (!tris) throw new Error("no triangles");
+    return `${tris} triangles, ${meta.elements.length} element(s)`;
+  },
+  async ooxml(name, bytes, id) {
+    const a = (await archive()).Archive.open(bytes);
+    const names = a.list().map((e) => e.name);
+    const part = { docx: "word/document.xml", xlsx: "xl/workbook.xml", pptx: "ppt/presentation.xml" }[id];
+    if (!names.includes(part)) throw new Error(`no ${part}`);
+    return `${names.length} parts`;
+  },
+  async docs(name, bytes) {
+    const c = (await engine("docs")).convertDocs(bytes, ext(name), 1e6, GB);
+    return `${c.paragraphs} paragraphs, ${c.takeDocx().length} bytes of DOCX`;
+  },
+  async sheets(name, bytes) {
+    const c = (await engine("sheets")).convertSheets(bytes, ext(name), 1e7, GB);
+    return `${c.takeXlsx().length} bytes of XLSX`;
+  },
+  async slides(name, bytes) {
+    const c = (await engine("slides")).convertSlides(bytes, ext(name), 1e6, GB, Infinity);
+    return `${c.slides} slide(s)`;
+  },
+  async pdf(name, bytes) {
+    const lib = await pdf();
+    const task = lib.getDocument({ data: new Uint8Array(bytes), useSystemFonts: false, isEvalSupported: false, verbosity: 0 });
+    try {
+      const doc = await task.promise;
+      const outline = await doc.getOutline();
+      const page = await doc.getPage(1);
+      const annots = (await page.getAnnotations()).length;
+      return `${doc.numPages} page(s), ${outline?.length ?? 0} outline entries, ${annots} annotations on page 1`;
+    } finally {
+      await task.destroy();
+    }
+  },
+  async text(name, bytes) {
+    const text = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+    if (["json", "geojson"].includes(ext(name))) JSON.parse(text);
+    if (["md", "markdown"].includes(ext(name))) {
+      const doc = JSON.parse((await engine("text")).parseMarkdown(text));
+      return `markdown, ${JSON.stringify(doc).length} bytes of tree`;
+    }
+    return `${text.split("\n").length} lines`;
+  },
+  async csv(name, bytes) {
+    const text = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+    const lines = text.split(/\r?\n/).filter(Boolean);
+    if (lines.length < 2) throw new Error("fewer than two rows");
+    return `${lines.length} lines`;
+  },
+  async archive(name, bytes) {
+    const a = (await archive()).Archive.open(bytes);
+    const list = a.list();
+    if (!list.length) throw new Error("no members");
+    return `${a.format()}, ${list.length} member(s)${list.some((m) => m.encrypted) ? ", encrypted" : ""}`;
+  },
+  async media(name, bytes) {
+    // The browser's players decode them; here only that the head is a media container's or an MP3 frame's.
+    const type = detector.sniff(bytes.subarray(0, 512));
+    const mp3Frame = bytes[0] === 0xff && (bytes[1] & 0xe0) === 0xe0;
+    if (!/^(audio|video|application\/ogg)/.test(type) && !mp3Frame) throw new Error(`sniffed as "${type}"`);
+    return `plays in the browser (${type || "MP3 frames"})`;
+  },
+};
+
+const ROUTE = {
+  image: READ.image, dwg: READ.dwg, dxf: READ.dwg, ifc: (n, b) => READ.model(n, b, "ifc"), stl: (n, b) => READ.model(n, b, "stl"), obj: (n, b) => READ.model(n, b, "obj"),
+  ply: (n, b) => READ.model(n, b, "ply"), gltf: (n, b) => READ.model(n, b, "gltf"), docx: (n, b) => READ.ooxml(n, b, "docx"), xlsx: (n, b) => READ.ooxml(n, b, "xlsx"),
+  pptx: (n, b) => READ.ooxml(n, b, "pptx"), rtf: READ.docs, doc: READ.docs, odt: READ.docs, xls: READ.sheets, ods: READ.sheets, numbers: READ.sheets,
+  ppt: READ.slides, odp: READ.slides, keynote: READ.slides, odg: READ.slides, visio: READ.slides, pdf: READ.pdf, text: READ.text, csv: READ.csv,
+  archive: READ.archive, video: READ.media, audio: READ.media,
+};
+
+let surprises = 0;
+let count = 0;
+for (const e of examples) {
+  if (only.length && !only.some((o) => e.file.includes(o))) continue;
+  const served = path.join(pkg, "demo", "public", "examples", e.file);
+  const file = fs.existsSync(served) ? served : e.path ? path.join(here, "files", e.path) : null;
+  if (!file || !fs.existsSync(file)) {
+    console.log(`skip ${e.file}: not downloaded`);
+    continue;
+  }
+  count++;
+  const bytes = new Uint8Array(fs.readFileSync(file));
+  // As the demo does it: a file given by its address has a name and no type.
+  const id = detector.detect({ type: "", name: e.file, path: e.file });
+  const expectFail = e.group === "unsupported";
+  let result;
+  try {
+    if (!id) throw new Error("no plugin claims it");
+    if (["pages", "coreldraw", "publisher", "pagemaker", "freehand", "quarkxpress", "zonerdraw", "wpg"].includes(id)) throw new Error(`${id} needs an external converter`);
+    if (!ROUTE[id]) throw new Error(`no check for ${id}`);
+    result = { ok: true, text: `${id}: ${await ROUTE[id](e.file, bytes)}` };
+  } catch (err) {
+    result = { ok: false, text: `${id ?? "none"}: ${String(err.message ?? err).slice(0, 120)}` };
+  }
+  // The ODG converter is newer than some builds of wasm/: say so rather than fail.
+  if (!result.ok && id === "odg" && /unsupported/.test(result.text) && !expectFail) {
+    console.log(`warn ${e.file.padEnd(44)} ${result.text} (wasm/ may predate ODG: run npm run build:wasm)`);
+    continue;
+  }
+  const fine = result.ok !== expectFail;
+  if (!fine) surprises++;
+  console.log(`${fine ? "ok  " : "FAIL"} ${e.file.padEnd(44)} ${expectFail ? "(unsupported on purpose) " : ""}${result.text}`);
+}
+console.log(`${count} examples read, ${surprises} surprise${surprises === 1 ? "" : "s"}`);
+process.exit(surprises ? 1 : 0);
diff --git a/crates/exav-viewer/demo/headless.html b/crates/exav-viewer/demo/headless.html
new file mode 100644
index 00000000..59d0e579
--- /dev/null
+++ b/crates/exav-viewer/demo/headless.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <!-- Every file in the sandboxed frame: the page itself runs no engine, and needs no 'unsafe-inline' nor 'wasm-unsafe-eval'. -->
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' blob:; frame-src 'self'; connect-src 'self'; object-src 'none'; base-uri 'self'; form-action 'none'"
+    />
+    <title>exav viewer, the host's own controls</title>
+  </head>
+  <body>
+    <header>
+      <h1>The host's own controls</h1>
+      <p>Each file in the sandboxed frame; every button on this page is the page's, driven by the session's controllers. No React.</p>
+      <input type="file" data-testid="file-input" />
+      <button type="button" id="scheme">Dark</button>
+      <span id="status" aria-live="polite"></span>
+    </header>
+    <main>
+      <nav id="thumbs" aria-label="Pages"></nav>
+      <section id="viewer">
+        <div id="stage"></div>
+        <div id="sheets" role="tablist" aria-label="Sheets"></div>
+        <div id="controls"></div>
+      </section>
+    </main>
+    <ol id="keys" aria-label="Keys this page heard"></ol>
+    <script type="module" src="./src/headless.ts"></script>
+  </body>
+</html>
diff --git a/crates/exav-viewer/demo/src/App.tsx b/crates/exav-viewer/demo/src/App.tsx
index e58f2d1b..6bfa8e56 100644
--- a/crates/exav-viewer/demo/src/App.tsx
+++ b/crates/exav-viewer/demo/src/App.tsx
@@ -1,37 +1,118 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type DragEvent, type ReactNode } from "react";
 
-import type { ViewerFile } from "@exav/viewer";
+import { BUILTIN_ORDER, type FileTree, type Session, type ViewerFile } from "@exav/viewer";
 import { allPlugins } from "@exav/viewer/all";
+import {
+  coreldraw,
+  doc,
+  freehand,
+  keynote,
+  numbers,
+  odg,
+  odp,
+  ods,
+  odt,
+  pagemaker,
+  ppt,
+  publisher,
+  quarkxpress,
+  rtf,
+  visio,
+  wpg,
+  xls,
+  zonerdraw,
+} from "@exav/viewer/office";
 import { ViewerBody, ViewerProvider } from "@exav/viewer/react";
 import { SandboxedViewerProvider } from "@exav/viewer/react/sandbox";
 
-import { GROUPS, type Sample } from "./showcase.js";
+import { ExportImage } from "./ExportImage.js";
+import { credit, GROUPS, type Example, type Sample } from "./showcase.js";
 
 type Locale = "en" | "fr";
 
 /** A file in the list, shown by its name. */
 type Item = ViewerFile;
 
+/** A file chosen or dropped, and where it is in the folder it came from. */
+interface Picked {
+  file: File;
+  path: string;
+}
+
+const picked = (files: FileList | File[]): Picked[] => Array.from(files).map((file) => ({ file, path: file.webkitRelativePath || file.name }));
+
+/**
+ * What a drop holds, folders walked: the files by their path from the
+ * dropped folder's parent. `entries` are read before the first await, which
+ * is when the browser lets them be.
+ */
+async function dropped(data: DataTransfer): Promise<Picked[]> {
+  const entries = Array.from(data.items ?? [])
+    .map((i) => i.webkitGetAsEntry?.())
+    .filter((e): e is FileSystemEntry => !!e);
+  if (!entries.length) return picked(data.files);
+  const out: Picked[] = [];
+  const walk = async (entry: FileSystemEntry): Promise<void> => {
+    if (entry.isFile) {
+      const file = await new Promise<File>((resolve, reject) => (entry as FileSystemFileEntry).file(resolve, reject));
+      out.push({ file, path: entry.fullPath.replace(/^\//, "") });
+    } else if (entry.isDirectory) {
+      const reader = (entry as FileSystemDirectoryEntry).createReader();
+      // A directory is read in batches until one is empty.
+      for (;;) {
+        const batch = await new Promise<FileSystemEntry[]>((resolve, reject) => reader.readEntries(resolve, reject));
+        if (!batch.length) break;
+        for (const e of batch) await walk(e);
+      }
+    }
+  };
+  for (const e of entries) await walk(e);
+  return out;
+}
+
+/** The files of a batch, each seen as one of them: a drawing finds the files it refers to among the others. */
+function around(batch: Picked[], at: Picked): FileTree | undefined {
+  if (batch.length < 2) return undefined;
+  return {
+    path: at.path,
+    paths: batch.map((b) => b.path),
+    open: async (path) => {
+      const hit = batch.find((b) => b.path === path);
+      if (!hit) throw new Error(`no ${path} in the folder`);
+      return { blob: hit.file };
+    },
+  };
+}
+
+/** A sample or an example in the sidebar: its section, and who made it, under what licence. */
+interface Listed {
+  group: string;
+  note: string;
+  item: Item;
+}
+
 const TEXT = {
   en: {
     tagline: "Files viewed in the browser. Nothing you open here leaves your device.",
     yours: "Your files",
     open: "Open one of your files",
-    drop: "Drop files to view them",
+    folder: "Open a folder",
+    drop: "Drop files or a folder to view them",
     docs: "Documentation",
     licences: "Licences",
     upload: "Drop files here, or click to choose",
-    formats: "PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint, CSV, IFC and STL models, video, audio and archives. Or pick a sample on the left.",
+    formats: "PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint, CSV, text, Markdown, JSON and XML, IFC, STL, OBJ, PLY and glTF models, video, audio and archives. Or pick a sample on the left.",
   },
   fr: {
     tagline: "Des fichiers affichés dans le navigateur. Rien de ce que vous ouvrez ici ne quitte votre appareil.",
     yours: "Vos fichiers",
     open: "Ouvrir un de vos fichiers",
-    drop: "Déposez des fichiers pour les afficher",
+    folder: "Ouvrir un dossier",
+    drop: "Déposez des fichiers ou un dossier pour les afficher",
     docs: "Documentation",
     licences: "Licences",
     upload: "Déposez des fichiers ici, ou cliquez pour les choisir",
-    formats: "PDF, images, plans DWG et DXF, Word, Excel, PowerPoint, CSV, maquettes IFC et STL, vidéo, audio et archives. Ou choisissez un exemple à gauche.",
+    formats: "PDF, images, plans DWG et DXF, Word, Excel, PowerPoint, CSV, texte, Markdown, JSON et XML, maquettes IFC, STL, OBJ, PLY et glTF, vidéo, audio et archives. Ou choisissez un exemple à gauche.",
   },
 } satisfies Record<Locale, Record<string, string>>;
 
@@ -47,21 +128,54 @@ const IN_PAGE = QUERY.get("mode") === "page";
 
 /** Where the demo is deployed (vite.config.ts): the frame may show media and fetch from it. */
 declare const __DEMO_ORIGIN__: string;
+/** The external converter the demo was built with (`EXAV_EXTERNAL_CONVERTER`), or null. */
+declare const __EXTERNAL_CONVERTER__: string | null;
 
 /**
  * The frame's delivery per kind of file, defaults unless `?delivery=pdf:url,media:blob`
  * says otherwise (the browser tests).
  */
 const DELIVERY = Object.fromEntries((QUERY.get("delivery") ?? "").split(",").filter(Boolean).map((d) => d.split(":")));
+
+// Every format, the converted Office ones included: where no external
+// converter was copied in, a format only it reads ends in "needs_converter".
+/**
+ * `?converter=exav` or `?converter=external` (the browser tests): without
+ * it, text documents (DOC, ODT, RTF) go to the external converter when the
+ * demo has one, else to exav-render's `docs`.
+ */
+const CONVERTER = {
+  ...(QUERY.get("converter") === "exav" || QUERY.get("converter") === "external" ? { converter: QUERY.get("converter") as "exav" | "external" } : {}),
+  // `?timeoutMs=500&maxMemory=5000000` (the browser tests).
+  ...(QUERY.get("timeoutMs") ? { timeoutMs: Number(QUERY.get("timeoutMs")) } : {}),
+  ...(QUERY.get("maxMemory") ? { maxMemory: Number(QUERY.get("maxMemory")) } : {}),
+  // `?externalConverter=/e2e/fake-converter.js`: a converter by its URL (the browser tests).
+  ...(QUERY.get("externalConverter") || __EXTERNAL_CONVERTER__ ? { externalConverter: QUERY.get("externalConverter") ?? __EXTERNAL_CONVERTER__! } : {}),
+};
+
 const SANDBOX = {
   url: `${BASE}frame/index.html`,
+  options: { conversion: CONVERTER },
   origins: { media: [__DEMO_ORIGIN__], connect: [__DEMO_ORIGIN__] },
   delivery: DELIVERY,
+  formats: BUILTIN_ORDER,
 };
 
 /** `?url=<address>`: a file by its address, opened first. */
 const LINKED = QUERY.get("url");
 
+/** `?cad=monochrome`: drawings in ink, as plotted; `?rasterTile=64`: pictures drawn in small tiles (the browser tests). */
+const CAD = {
+  ...(QUERY.get("cad") === "monochrome" ? { monochrome: true } : {}),
+  ...(QUERY.get("rasterTile") ? { rasterTile: Number(QUERY.get("rasterTile")) } : {}),
+};
+
+/** `?rasterTile=64` and `?rasterSupersample=2`: the models' pictures drawn in small tiles, or supersampled (the browser tests). */
+const MODEL = {
+  ...(QUERY.get("rasterTile") ? { rasterTile: Number(QUERY.get("rasterTile")) } : {}),
+  ...(QUERY.get("rasterSupersample") ? { rasterSupersample: Number(QUERY.get("rasterSupersample")) } : {}),
+};
+
 /** The engines in the page (`?mode=page`), or each file in a sandboxed frame, the default. */
 function Provider({ plugins, locale, children }: { plugins: ReturnType<typeof allPlugins>; locale: Locale; children: ReactNode }) {
   return IN_PAGE ? (
@@ -81,57 +195,90 @@ function initialLocale(): Locale {
   return navigator.language.toLowerCase().startsWith("fr") ? "fr" : "en";
 }
 
+/** Hands the viewer's session to the page around it, and takes it back when the file goes. */
+function SessionOut({ session, onSession }: { session: Session | null; onSession: (s: Session | null) => void }) {
+  useEffect(() => {
+    onSession(session);
+    return () => onSession(null);
+  }, [session, onSession]);
+  return null;
+}
+
 export function App() {
   const [locale, setLocale] = useState<Locale>(initialLocale);
   const [own, setOwn] = useState<Item[]>([]);
   // Nothing open until a file is chosen, unless the address names one.
   const [selected, setSelected] = useState<string | null>(() => (LINKED ? "linked" : QUERY.get("file")));
   const [dragging, setDragging] = useState(false);
+  // The session of the file on screen, for the host's controls beside its name.
+  const [session, setSession] = useState<Session | null>(null);
   const input = useRef<HTMLInputElement>(null);
+  const folder = useRef<HTMLInputElement>(null);
   const counter = useRef(0);
   const t = TEXT[locale];
 
   // One plugin list for the page: `ViewerProvider` starts a viewer per list.
-  const plugins = useMemo(() => allPlugins(), []);
-  // The sidebar's files, from showcase/samples.json (`npm run demo:showcase`);
-  // none when it was not copied in.
+  const plugins = useMemo(
+    () => [
+      ...allPlugins({ cad: CAD, ifc: MODEL, model: MODEL }),
+      ...[rtf(CONVERTER), doc(CONVERTER), odt(CONVERTER), ppt(CONVERTER), odp(CONVERTER), keynote(CONVERTER), xls(CONVERTER), ods(CONVERTER), numbers(CONVERTER)],
+      ...[odg(CONVERTER), visio(CONVERTER), coreldraw(CONVERTER), publisher(CONVERTER), pagemaker(CONVERTER), freehand(CONVERTER), quarkxpress(CONVERTER), zonerdraw(CONVERTER), wpg(CONVERTER)],
+    ],
+    [],
+  );
+  // The sidebar's files, from showcase/samples.json (`npm run demo:showcase`)
+  // and examples/examples.json (`npm run demo:examples`); none when they were
+  // not copied in. A file is fetched only when it is selected.
   const [samples, setSamples] = useState<Sample[]>([]);
+  const [examples, setExamples] = useState<Example[]>([]);
   useEffect(() => {
     fetch(`${BASE}showcase/samples.json`)
       .then((r) => (r.ok ? r.json() : { samples: [] }))
       .then((j: { samples: Sample[] }) => setSamples(j.samples))
       .catch(() => setSamples([]));
+    fetch(`${BASE}examples/examples.json`)
+      .then((r) => (r.ok ? r.json() : { examples: [] }))
+      .then((j: { examples: Example[] }) => setExamples(j.examples))
+      .catch(() => setExamples([]));
   }, []);
-  const showcase = useMemo(
-    () => samples.map((s): Item => ({ id: `showcase:${s.file}`, name: s.file, source: { url: `${BASE}showcase/${s.file}` } })),
-    [samples],
-  );
+  const showcase = useMemo((): Listed[] => {
+    // An example wins over a sample of the same file name.
+    const named = new Set(examples.map((e) => e.file));
+    return [
+      ...samples
+        .filter((s) => !named.has(s.file))
+        .map((s): Listed => ({ group: s.group, note: `${s.credit}. ${s.licence}`, item: { id: `showcase:${s.file}`, name: s.file, source: { url: `${BASE}showcase/${s.file}` } } })),
+      ...examples.map((e): Listed => ({ group: e.group, note: e.attribution || `${credit(e)}. ${e.licence}`, item: { id: `example:${e.file}`, name: e.file, source: { url: `${BASE}examples/${e.file}` } } })),
+    ];
+  }, [samples, examples]);
   // Known groups in their order, then any other, in the order they come.
-  const groups = useMemo(() => [...new Set([...Object.keys(GROUPS), ...samples.map((s) => s.group)])], [samples]);
+  const groups = useMemo(() => [...new Set([...Object.keys(GROUPS), ...showcase.map((l) => l.group)])], [showcase]);
   const linked = useMemo((): Item[] => {
     if (!LINKED) return [];
     const name = decodeURIComponent(new URL(LINKED, location.href).pathname.split("/").pop() || "file");
     return [{ id: "linked", name, source: { url: LINKED } }];
   }, []);
-  const items = useMemo(() => [...linked, ...own, ...showcase], [linked, own, showcase]);
+  const items = useMemo(() => [...linked, ...own, ...showcase.map((l) => l.item)], [linked, own, showcase]);
   const current = items.find((i) => i.id === selected) ?? null;
+  const note = showcase.find((l) => l.item.id === selected)?.note;
 
   useEffect(() => {
     document.documentElement.lang = locale;
   }, [locale]);
 
   const add = useCallback(
-    (files: FileList | File[]) => {
-      const picked = Array.from(files);
-      if (!picked.length) return;
+    (batch: Picked[]) => {
+      if (!batch.length) return;
       // A file given again under the name of one already listed is the same
       // document with other bytes: it replaces it in place, and the viewer
       // keeps the zoom and scroll position where it can.
       const next = [...own];
       const added: Item[] = [];
       const shown: string[] = [];
-      for (const f of picked) {
-        const fields = { name: f.name, type: f.type, size: f.size, source: { blob: f } };
+      for (const p of batch) {
+        const f = p.file;
+        const tree = around(batch, p);
+        const fields = { name: f.name, type: f.type, size: f.size, source: { blob: f }, ...(tree && { tree }) };
         const same = next.findIndex((i) => i.name === f.name);
         if (same >= 0) {
           next[same] = { ...next[same]!, ...fields };
@@ -151,12 +298,12 @@ export function App() {
   const onDrop = (e: DragEvent) => {
     e.preventDefault();
     setDragging(false);
-    add(e.dataTransfer.files);
+    void dropped(e.dataTransfer).then(add);
   };
 
-  const entry = (item: Item) => (
+  const entry = (item: Item, note?: string) => (
     <li key={item.id}>
-      <button type="button" className={`demo-file${item.id === selected ? " is-selected" : ""}`} aria-current={item.id === selected} onClick={() => setSelected(item.id)}>
+      <button type="button" className={`demo-file${item.id === selected ? " is-selected" : ""}`} aria-current={item.id === selected} title={note} onClick={() => setSelected(item.id)}>
         {item.name}
       </button>
     </li>
@@ -202,24 +349,37 @@ export function App() {
             hidden
             data-testid="file-input"
             onChange={(e) => {
-              if (e.target.files) add(e.target.files);
+              if (e.target.files) add(picked(e.target.files));
+              e.target.value = "";
+            }}
+          />
+          <button type="button" className="demo-open" onClick={() => folder.current?.click()}>
+            {t.folder}
+          </button>
+          <input
+            ref={folder}
+            type="file"
+            {...{ webkitdirectory: "" }}
+            hidden
+            data-testid="folder-input"
+            onChange={(e) => {
+              if (e.target.files) add(picked(e.target.files));
               e.target.value = "";
             }}
           />
           {own.length > 0 && (
             <>
               <h2>{t.yours}</h2>
-              <ul>{own.map(entry)}</ul>
+              <ul>{own.map((item) => entry(item))}</ul>
             </>
           )}
           {groups.map((group) => {
-            // `showcase` follows `samples`' order.
-            const list = showcase.filter((_, i) => samples[i]!.group === group);
+            const list = showcase.filter((l) => l.group === group);
             return (
               list.length > 0 && (
                 <section key={group}>
                   <h2>{GROUPS[group]?.[locale] ?? group}</h2>
-                  <ul>{list.map(entry)}</ul>
+                  <ul>{list.map((l) => entry(l.item, l.note))}</ul>
                 </section>
               )
             );
@@ -229,12 +389,20 @@ export function App() {
           {current ? (
             <>
               <div className="demo-bar">
-                <h1>
-                  {current.name}
-                </h1>
+                <div className="demo-title">
+                  <h1>{current.name}</h1>
+                  <ExportImage session={session} name={current.name} />
+                </div>
+                {note && (
+                  <a className="demo-credit" href={`${BASE}licenses/README.txt`} title={note}>
+                    {note}
+                  </a>
+                )}
               </div>
               <div className="demo-frame">
-                <ViewerBody key={current.id} file={current} />
+                <ViewerBody key={current.id} file={current}>
+                  {({ session }) => <SessionOut session={session} onSession={setSession} />}
+                </ViewerBody>
               </div>
             </>
           ) : (
diff --git a/crates/exav-viewer/demo/src/ExportImage.tsx b/crates/exav-viewer/demo/src/ExportImage.tsx
new file mode 100644
index 00000000..26841ee2
--- /dev/null
+++ b/crates/exav-viewer/demo/src/ExportImage.tsx
@@ -0,0 +1,184 @@
+/**
+ * "Export image": the session's pictures (`controllers.pictures`) saved as a
+ * file, for any format that draws something. A button beside the file's name,
+ * as it belongs to the host and not to the viewer, opening a dialog of
+ * options. The region is the whole page or what the viewer shows when the
+ * dialog opens (`controllers.viewport`). `window.exavDemo` is for the
+ * browser tests.
+ */
+import { useEffect, useId, useRef, useState } from "react";
+
+import { RasterError, type Raster, type RasterOptions, type RasterType, type Session } from "@exav/viewer";
+import { useStore } from "@exav/viewer/react";
+
+type Result = { url: string; name: string; info: string } | { error: string };
+
+/** The session of the file on screen, or of the member of an archive that is open in it. */
+function Export({ session, base }: { session: Session; base: string }) {
+  const controllers = useStore(session.controllers);
+  const opened = useStore(controllers?.archive)?.opened;
+  const pictures = controllers?.pictures;
+  const count = useStore(pictures)?.count ?? 0;
+  const space = useStore(pictures)?.space;
+  const [page, setPage] = useState(1);
+  const [longEdge, setLongEdge] = useState(1600);
+  const [region, setRegion] = useState<"whole" | "current">("whole");
+  const dialog = useRef<HTMLDialogElement>(null);
+  const titleId = useId();
+  const [open, setOpen] = useState(false);
+  // Working out the viewport costs: it is followed only while the dialog shows "What I see".
+  const viewport = useStore(open && region === "current" ? controllers?.viewport : undefined);
+  const [type, setType] = useState<RasterType>("png");
+  const [background, setBackground] = useState<"default" | "transparent" | "white">("default");
+  const [fit, setFit] = useState<"contain" | "cover">("contain");
+  const [lineweight, setLineweight] = useState<"screen" | "scaled">("screen");
+  const [busy, setBusy] = useState<AbortController | null>(null);
+  const [result, setResult] = useState<Result | null>(null);
+  useEffect(() => () => void (result && "url" in result && URL.revokeObjectURL(result.url)), [result]);
+  // The page in view follows the viewer when the region is what it shows.
+  const shown = region === "current" && viewport ? viewport.page : page;
+
+  if (opened) return <Export session={opened.session} base={base} />;
+  if (!pictures || count < 1) return null;
+
+  const run = async () => {
+    const abort = new AbortController();
+    setBusy(abort);
+    setResult(null);
+    const options: RasterOptions & { type: RasterType } = {
+      longEdge,
+      fit,
+      type,
+      signal: abort.signal,
+      ...(region === "current" && { region: "current" as const }),
+      ...(background !== "default" && { background: background === "white" ? "#ffffff" : "transparent" }),
+      ...(space === "drawing" && { lineweight }),
+      ...(region === "current" && viewport?.layout !== undefined && { layout: viewport.layout }),
+    };
+    try {
+      const { blob, ...raster } = await pictures.toBlob(shown, options);
+      const info = describe(raster);
+      setResult({ url: URL.createObjectURL(blob), name: `${base}-${shown}.${type === "jpeg" ? "jpg" : type}`, info });
+    } catch (error) {
+      setResult({ error: error instanceof RasterError ? `${error.code}: ${error.message}` : String(error) });
+    } finally {
+      setBusy(null);
+    }
+  };
+
+  return (
+    <>
+      <button type="button" className="demo-export-open" data-testid="export-open" onClick={() => {
+          setOpen(true);
+          dialog.current?.showModal();
+        }}>
+        Export image
+      </button>
+      <dialog
+        ref={dialog}
+        className="demo-export"
+        aria-labelledby={titleId}
+        onClose={() => setOpen(false)}
+        onClick={(e) => e.target === e.currentTarget && dialog.current?.close()}
+      >
+        <div className="demo-export-head">
+          <h2 id={titleId}>Export image</h2>
+          <button type="button" className="demo-export-close" aria-label="Close" onClick={() => dialog.current?.close()}>
+            &times;
+          </button>
+        </div>
+        <div className="demo-export-body">
+        <label>
+          Page
+          <select data-testid="export-page" value={shown} disabled={region === "current"} onChange={(e) => setPage(Number(e.target.value))}>
+            {Array.from({ length: Math.min(count, 200) }, (_, i) => (
+              <option key={i} value={i + 1}>
+                {i + 1}
+              </option>
+            ))}
+          </select>
+        </label>
+        <label>
+          Long edge (px)
+          <input data-testid="export-long-edge" type="number" min={1} max={16384} value={longEdge} onChange={(e) => setLongEdge(Number(e.target.value))} />
+        </label>
+        <label>
+          Region
+          <select data-testid="export-region" value={region} onChange={(e) => setRegion(e.target.value as "whole" | "current")}>
+            <option value="whole">Whole page</option>
+            <option value="current" disabled={!controllers?.viewport}>
+              What I see
+            </option>
+          </select>
+        </label>
+        <label>
+          Type
+          <select data-testid="export-type" value={type} onChange={(e) => setType(e.target.value as RasterType)}>
+            <option value="png">PNG</option>
+            <option value="jpeg">JPEG</option>
+            <option value="webp">WebP</option>
+          </select>
+        </label>
+        <label>
+          Background
+          <select data-testid="export-background" value={background} onChange={(e) => setBackground(e.target.value as typeof background)}>
+            <option value="default">Default</option>
+            <option value="white">White</option>
+            <option value="transparent">Transparent</option>
+          </select>
+        </label>
+        <label>
+          Fit
+          <select data-testid="export-fit" value={fit} onChange={(e) => setFit(e.target.value as "contain" | "cover")}>
+            <option value="contain">Contain</option>
+            <option value="cover">Cover</option>
+          </select>
+        </label>
+        {space === "drawing" && (
+          <label>
+            Line weights
+            <select data-testid="export-lineweight" value={lineweight} onChange={(e) => setLineweight(e.target.value as "screen" | "scaled")}>
+              <option value="screen">As on screen</option>
+              <option value="scaled">Scaled to the picture</option>
+            </select>
+          </label>
+        )}
+        {busy ? (
+          <button type="button" data-testid="export-cancel" onClick={() => busy.abort()}>
+            Cancel
+          </button>
+        ) : (
+          <button type="button" data-testid="export-run" onClick={() => void run()}>
+            Export
+          </button>
+        )}
+        {result &&
+          ("error" in result ? (
+            <p role="alert" data-testid="export-error">
+              {result.error}
+            </p>
+          ) : (
+            <p>
+              <a data-testid="export-result" href={result.url} download={result.name}>
+                {result.name}
+              </a>{" "}
+              <span data-testid="export-info">{result.info}</span>
+            </p>
+          ))}
+        </div>
+      </dialog>
+    </>
+  );
+}
+
+function describe(r: Omit<Raster, "bitmap">): string {
+  const region = r.region ? ` of ${JSON.stringify(r.region, (_, v) => (typeof v === "number" ? Math.round(v * 1000) / 1000 : v))}` : "";
+  return `${r.width} x ${r.height} px, page ${r.page}${r.layout !== undefined ? ` (${r.layout})` : ""}${region}`;
+}
+
+export function ExportImage({ session, name }: { session: Session | null; name: string }) {
+  useEffect(() => {
+    Object.assign(window, { exavDemo: { session: () => session } });
+  }, [session]);
+  return session ? <Export session={session} base={name.replace(/\.[^.]*$/, "") || "export"} /> : null;
+}
diff --git a/crates/exav-viewer/demo/src/demo.css b/crates/exav-viewer/demo/src/demo.css
index 69f46a63..bd801da9 100644
--- a/crates/exav-viewer/demo/src/demo.css
+++ b/crates/exav-viewer/demo/src/demo.css
@@ -19,18 +19,18 @@
     --demo-selected: #134e4a;
     color-scheme: dark;
   }
-  .demo .exv-body,
-  .exv-dialog {
-    --exv-surface: #1e293b;
-    --exv-panel: #111827;
-    --exv-border: #334155;
-    --exv-text: #cbd5e1;
-    --exv-text-strong: #f8fafc;
-    --exv-muted: #94a3b8;
-    --exv-hover: #1f2937;
-    --exv-active: #334155;
-    --exv-accent: #5eead4;
-    --exv-on-accent: #0f172a;
+  .demo .exav-viewer-body,
+  .exav-viewer-dialog {
+    --exav-viewer-surface: #1e293b;
+    --exav-viewer-panel: #111827;
+    --exav-viewer-border: #334155;
+    --exav-viewer-text: #cbd5e1;
+    --exav-viewer-text-strong: #f8fafc;
+    --exav-viewer-muted: #94a3b8;
+    --exav-viewer-hover: #1f2937;
+    --exav-viewer-active: #334155;
+    --exav-viewer-accent: #5eead4;
+    --exav-viewer-on-accent: #0f172a;
   }
 }
 
@@ -156,12 +156,23 @@ body {
   padding: 0.5rem 1rem;
 }
 .demo-bar h1 {
+  min-width: 0;
   margin: 0;
   overflow: hidden;
   font-size: 1.125rem;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.demo-credit {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--demo-muted);
+  font-size: 0.75rem;
+  text-align: right;
+  text-decoration: none;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .demo-frame {
   flex: 1;
   min-height: 0;
@@ -170,6 +181,83 @@ body {
   border: 1px solid var(--demo-border);
   border-radius: 0.5rem;
 }
+.demo-title {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  min-width: 0;
+}
+.demo-export-open {
+  flex: none;
+  padding: 0.25rem 0.75rem;
+  border: 1px solid var(--demo-border);
+  border-radius: 0.375rem;
+  background: var(--demo-panel);
+  color: var(--demo-text);
+  font: inherit;
+  font-size: 0.8125rem;
+  cursor: pointer;
+}
+.demo-export-open:hover,
+.demo-export-open:focus-visible {
+  border-color: var(--demo-accent);
+}
+.demo-export {
+  width: 36rem;
+  max-width: calc(100% - 32px);
+  padding: 0;
+  border: 1px solid var(--demo-border);
+  border-radius: 0.5rem;
+  background: var(--demo-panel);
+  color: var(--demo-text);
+  font-size: 0.8125rem;
+}
+.demo-export::backdrop {
+  background: rgb(15 23 42 / 0.45);
+}
+.demo-export-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5rem 0.5rem 0.5rem 1rem;
+  border-bottom: 1px solid var(--demo-border);
+}
+.demo-export-head h2 {
+  margin: 0;
+  font-size: 1rem;
+}
+.demo-export-close {
+  width: 2rem;
+  height: 2rem;
+  border: 0;
+  border-radius: 0.375rem;
+  background: transparent;
+  color: var(--demo-muted);
+  font-size: 1.25rem;
+  line-height: 1;
+  cursor: pointer;
+}
+.demo-export-close:hover,
+.demo-export-close:focus-visible {
+  color: var(--demo-text);
+}
+.demo-export-body {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr));
+  gap: 0.75rem;
+  max-height: 70vh;
+  padding: 1rem;
+  overflow: auto;
+}
+.demo-export-body label {
+  display: grid;
+  gap: 0.125rem;
+}
+.demo-export-body p {
+  grid-column: 1 / -1;
+  margin: 0;
+  overflow-wrap: anywhere;
+}
 .demo-upload {
   display: flex;
   flex: 1;
diff --git a/crates/exav-viewer/demo/src/headless.css b/crates/exav-viewer/demo/src/headless.css
new file mode 100644
index 00000000..947659eb
--- /dev/null
+++ b/crates/exav-viewer/demo/src/headless.css
@@ -0,0 +1,110 @@
+/* The page's own look: the frame is given these values (`theme: "inherit"`). */
+:root {
+  color-scheme: light;
+  --page-bg: #fbfaf7;
+  --page-text: #2b2a27;
+  --exav-viewer-surface: #ece8df;
+  --exav-viewer-panel: #fffdf8;
+  --exav-viewer-text: #3d3a33;
+  --exav-viewer-text-strong: #1d1b17;
+  --exav-viewer-border: #d9d2c3;
+  --exav-viewer-accent: #9a3412;
+  --exav-viewer-pager-room: 1rem;
+  --exav-viewer-font: Georgia, serif;
+}
+:root.dark {
+  color-scheme: dark;
+  --page-bg: #17161a;
+  --page-text: #e8e6ef;
+  --exav-viewer-surface: #212026;
+  --exav-viewer-panel: #2a2930;
+  --exav-viewer-text: #d6d3df;
+  --exav-viewer-text-strong: #f4f2fa;
+  --exav-viewer-border: #3b3944;
+  --exav-viewer-accent: #f59e0b;
+}
+body {
+  margin: 0;
+  padding: 1rem;
+  background: var(--page-bg);
+  color: var(--page-text);
+  font: 0.9375rem/1.5 system-ui, sans-serif;
+}
+h1 {
+  margin: 0;
+  font-size: 1.25rem;
+}
+main {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  gap: 1rem;
+  margin-top: 1rem;
+}
+#thumbs {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  max-height: 75vh;
+  overflow-y: auto;
+}
+#thumbs:empty {
+  display: none;
+}
+#thumbs button {
+  padding: 0;
+  border: 1px solid var(--exav-viewer-border);
+  background: white;
+  cursor: pointer;
+}
+#thumbs canvas {
+  display: block;
+  max-width: 80px;
+  height: auto;
+}
+#viewer {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  background: var(--exav-viewer-surface);
+}
+#stage {
+  position: relative;
+  height: 65vh;
+}
+#viewer:fullscreen #stage {
+  height: auto;
+  flex: 1;
+}
+#sheets {
+  display: flex;
+  gap: 0.25rem;
+  overflow-x: auto;
+}
+#sheets button[aria-selected="true"] {
+  border-bottom: 2px solid var(--exav-viewer-accent);
+  font-weight: 600;
+}
+#controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.75rem;
+  padding: 0.5rem;
+  background: var(--exav-viewer-panel);
+}
+#controls .group {
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+#controls input[type="number"] {
+  width: 4rem;
+}
+.members {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+#keys {
+  font-size: 0.8125rem;
+  opacity: 0.7;
+}
diff --git a/crates/exav-viewer/demo/src/headless.ts b/crates/exav-viewer/demo/src/headless.ts
new file mode 100644
index 00000000..d27ed05b
--- /dev/null
+++ b/crates/exav-viewer/demo/src/headless.ts
@@ -0,0 +1,234 @@
+/**
+ * A host that draws its own UI: each file in the sandboxed frame, and every
+ * control on this page, made from the session's controllers. The frame
+ * draws the document alone (the player's controls too are this page's:
+ * `media.controls: "none"`), takes this page's colours (`theme`, read from
+ * its CSS custom properties) and hands back the keys the document does not
+ * use. `window.headless` is for the browser tests.
+ */
+import "./headless.css";
+
+import { builtinTranslate, printPictures, type Controllers, type MessageKey, type Session, type Status, type Store } from "@exav/viewer";
+import { createSandboxedViewer } from "@exav/viewer/frame";
+
+declare const __DEMO_ORIGIN__: string;
+
+const BASE = import.meta.env.BASE_URL;
+const t = builtinTranslate(new URLSearchParams(location.search).get("lang") ?? navigator.language);
+
+const viewer = createSandboxedViewer({
+  url: `${BASE}frame/index.html`,
+  origins: { media: [__DEMO_ORIGIN__], connect: [__DEMO_ORIGIN__] },
+  options: { media: { controls: "none" } },
+});
+
+const $ = (id: string) => document.getElementById(id)!;
+const stage = $("stage");
+const controls = $("controls");
+const sheetTabs = $("sheets");
+const thumbs = $("thumbs");
+const statusLine = $("status");
+
+function el<K extends keyof HTMLElementTagNameMap>(tag: K, props: Partial<HTMLElementTagNameMap[K]> = {}, ...children: (Node | string)[]): HTMLElementTagNameMap[K] {
+  const e = Object.assign(document.createElement(tag), props);
+  e.append(...children);
+  return e;
+}
+
+const button = (label: string, onclick: () => void, title = label) => el("button", { type: "button", textContent: label, title, onclick });
+
+/** Calls `draw` with the store's value now and on each change; returns the unsubscribe. */
+function follow<T>(store: Store<T> | undefined, draw: (value: T) => void): () => void {
+  if (!store) return () => {};
+  draw(store.get());
+  return store.subscribe(draw);
+}
+
+function statusText(s: Status): string {
+  switch (s.phase) {
+    case "loading":
+    case "converting":
+      return t("loading");
+    case "error":
+      return t(s.error.code === "pdf" ? "error" : (`error_${s.error.code}` as MessageKey));
+    case "empty":
+      return t("empty_model");
+    default:
+      return "";
+  }
+}
+
+const seconds = (s: number) => (Number.isFinite(s) ? `${Math.floor(s / 60)}:${String(Math.floor(s % 60)).padStart(2, "0")}` : "∞");
+
+let session: Session | null = null;
+/** What follows the file on screen, dropped on each redraw. */
+let widgets: (() => void)[] = [];
+let thumbsAbort: AbortController | null = null;
+
+const clearWidgets = () => {
+  for (const stop of widgets) stop();
+  widgets = [];
+  thumbsAbort?.abort();
+  controls.replaceChildren();
+  sheetTabs.replaceChildren();
+  thumbs.replaceChildren();
+};
+
+/**
+ * The controls of the session shown: an archive's open member, down as many
+ * levels as are open, drawn again when anything on the way changes.
+ */
+function render(root: Session) {
+  clearWidgets();
+  let scheduled = false;
+  const redraw = () => {
+    if (scheduled) return;
+    scheduled = true;
+    queueMicrotask(() => session === root && render(root));
+  };
+  let shown = root;
+  let back: Controllers["archive"] | null = null;
+  for (;;) {
+    const c = shown.controllers.get();
+    widgets.push(shown.controllers.subscribe(redraw));
+    const opened = c.archive?.get().opened;
+    if (c.archive) {
+      // Redrawn when a member opens or closes, not on each extraction step.
+      const was = opened;
+      widgets.push(c.archive.subscribe((a) => a.opened !== was && redraw()));
+    }
+    if (!opened) break;
+    back = c.archive!;
+    shown = opened.session;
+  }
+  widgets.push(follow(shown.status, (status) => (statusLine.textContent = statusText(status))));
+  draw(shown.controllers.get(), back);
+}
+
+function draw(c: Controllers, archiveOf: Controllers["archive"] | null) {
+  const bar = (...children: (Node | string)[]) => controls.append(el("div", { className: "group" }, ...children));
+  if (archiveOf) bar(button(t("archive_back"), () => archiveOf.back()));
+  if (c.archive) {
+    const list = el("ul", { className: "members" });
+    widgets.push(
+      follow(c.archive, (a) =>
+        list.replaceChildren(
+          ...a.members.map((m) => el("li", {}, button(m.name, () => void c.archive!.open(m.index)))),
+          ...(a.refused ? [el("li", { textContent: t(a.refused.key) })] : []),
+        ),
+      ),
+    );
+    bar(list);
+  }
+  if (c.pages) {
+    const pages = c.pages;
+    const field = el("input", { type: "number", min: "1", ariaLabel: t("page_short", { page: "" }).trim() });
+    const total = el("span");
+    field.onchange = () => pages.goTo?.(Number(field.value));
+    widgets.push(
+      follow(pages, (p) => {
+        if (document.activeElement !== field) field.value = String(p?.current ?? "");
+        total.textContent = `/ ${p?.total ?? "…"}`;
+      }),
+    );
+    bar(...(pages.prev ? [button("‹", () => void pages.prev!(), t("prev"))] : []), field, total, ...(pages.next ? [button("›", () => void pages.next!(), t("next"))] : []));
+  }
+  if (c.zoom) {
+    const zoom = c.zoom;
+    const label = el("span", { className: "zoom" });
+    widgets.push(follow(zoom, (z) => (label.textContent = `${Math.round(z.scale * 100)} %`)));
+    bar(button("−", () => zoom.setScale(zoom.get().scale / 1.25), t("zoom_out")), label, button("+", () => zoom.setScale(zoom.get().scale * 1.25), t("zoom_in")), button("⤢", () => zoom.fit(), t("zoom_fit")));
+  }
+  if (c.media) {
+    const media = c.media;
+    const play = button("▶", () => void (media.get().paused ? media.play() : media.pause()));
+    play.dataset.testid = "play";
+    const time = el("input", { type: "range", min: "0", step: "0.1", ariaLabel: "Time" });
+    const clock = el("span", { className: "clock" });
+    const mute = button("🔊", () => media.setMuted(!media.get().muted));
+    time.oninput = () => media.seek(Number(time.value));
+    widgets.push(
+      follow(media, (m) => {
+        play.textContent = m.paused ? "▶" : "⏸";
+        time.max = String(Number.isFinite(m.duration) ? m.duration : 0);
+        time.value = String(m.currentTime);
+        clock.textContent = `${seconds(m.currentTime)} / ${seconds(m.duration)}`;
+        mute.textContent = m.muted ? "🔇" : "🔊";
+      }),
+    );
+    // Fullscreen is the page's: the frame may not, the element holding it may.
+    bar(play, time, clock, mute, button("⛶", () => void $("viewer").requestFullscreen()));
+  }
+  if (c.sheets) {
+    const sheets = c.sheets;
+    widgets.push(
+      follow(sheets, (s) =>
+        sheetTabs.replaceChildren(
+          ...s.items.map((sheet) => {
+            const tab = button(sheet.name, () => void sheets.select(sheet.index));
+            tab.role = "tab";
+            tab.ariaSelected = String(sheet.index === s.current);
+            return tab;
+          }),
+        ),
+      ),
+    );
+  }
+  if (c.pictures) {
+    const pictures = c.pictures;
+    bar(button("⎙", () => void printPictures(pictures), "Print"));
+    drawThumbs(pictures, c.pages);
+  }
+}
+
+/** A picture of each page (the first 50), drawn one after the other, a click going to it. */
+function drawThumbs(pictures: NonNullable<Controllers["pictures"]>, pages: Controllers["pages"]) {
+  const abort = new AbortController();
+  thumbsAbort = abort;
+  const count = Math.min(pictures.get().count, 50);
+  if (count < 2) return;
+  void (async () => {
+    for (let page = 1; page <= count && !abort.signal.aborted; page++) {
+      const bitmap = await pictures.render(page, 160 * Math.min(devicePixelRatio || 1, 2));
+      if (!bitmap) continue;
+      if (abort.signal.aborted) {
+        bitmap.close();
+        return;
+      }
+      const canvas = el("canvas", { width: bitmap.width, height: bitmap.height });
+      canvas.getContext("bitmaprenderer")?.transferFromImageBitmap(bitmap);
+      thumbs.append(el("button", { type: "button", title: t("page_short", { page }), onclick: () => pages?.goTo?.(page) }, canvas));
+    }
+  })();
+}
+
+function showFile(file: File) {
+  session?.destroy();
+  clearWidgets();
+  session = viewer.mount(stage, { id: `${file.name}:${file.size}:${file.lastModified}`, name: file.name, type: file.type, source: { blob: file } });
+  render(session);
+}
+
+$("scheme").onclick = () => {
+  const dark = document.documentElement.classList.toggle("dark");
+  $("scheme").textContent = dark ? "Light" : "Dark";
+  viewer.restyle();
+};
+
+(document.querySelector('[data-testid="file-input"]') as HTMLInputElement).onchange = (e) => {
+  const file = (e.target as HTMLInputElement).files?.[0];
+  if (file) showFile(file);
+};
+
+// The keys the frame hands back reach this page's listeners as the page's own.
+document.addEventListener("keydown", (e) => {
+  $("keys").append(el("li", { textContent: `${e.key}${e.isTrusted ? "" : " (from the frame)"}` }));
+  if (e.key === "Escape" && session) {
+    session.destroy();
+    session = null;
+    clearWidgets();
+    statusLine.textContent = "";
+  }
+});
+
+Object.assign(window, { headless: { viewer, session: () => session } });
diff --git a/crates/exav-viewer/demo/src/showcase.ts b/crates/exav-viewer/demo/src/showcase.ts
index 7f186a73..9e391095 100644
--- a/crates/exav-viewer/demo/src/showcase.ts
+++ b/crates/exav-viewer/demo/src/showcase.ts
@@ -1,14 +1,22 @@
 /**
  * The files the demo lists: demo/public/showcase/, copied from
  * github.com/sylvinus/exav-samples by `npm run demo:showcase`, and described
- * by its samples.json. The browser tests use the generated files of
- * e2e/.out/samples/ instead (e2e/fixtures/make-samples.mjs).
+ * by its samples.json; and demo/public/examples/, put there by `npm run
+ * demo:examples` and described by examples.json (demo/examples/). When both
+ * have a file of the same name, the example is listed and the sample is not.
+ * The browser tests use the generated files of e2e/.out/samples/ instead
+ * (e2e/fixtures/make-samples.mjs).
  */
 
 /** The sidebar's sections, in this order; a group not named here comes last, under its own name. */
 export const GROUPS: Record<string, { en: string; fr: string }> = {
   documents: { en: "Documents", fr: "Documents" },
+  pdf: { en: "PDF", fr: "PDF" },
+  office: { en: "Word, Excel, PowerPoint", fr: "Word, Excel, PowerPoint" },
+  converted: { en: "Other office formats", fr: "Autres formats bureautiques" },
+  text: { en: "Text and code", fr: "Texte et code" },
   images: { en: "Images", fr: "Images" },
+  raw: { en: "Camera RAW", fr: "Photos RAW" },
   cad: { en: "CAD", fr: "CAO" },
   "3d": { en: "3D", fr: "3D" },
   media: { en: "Audio and video", fr: "Audio et vidéo" },
@@ -29,3 +37,24 @@ export interface Sample {
   bytes: number;
   sha256: string;
 }
+
+/** One entry of examples.json (demo/examples/): the facts the demo shows, a few of those it keeps. */
+export interface Example {
+  file: string;
+  group: string;
+  family: string;
+  title: string;
+  author: string;
+  source: string;
+  /** The SPDX id, or "public-domain (reason)". */
+  licence: string;
+  /** The line CC-BY, MIT, BSD and Apache ask to keep; "" for the others. */
+  attribution: string;
+  bytes: number;
+  sha256: string;
+}
+
+/** Who made a file and what it is, one line (the line the licence asks to keep is `attribution`). */
+export function credit(e: Example): string {
+  return `${e.author}: ${e.title}`;
+}
diff --git a/crates/exav-viewer/demo/vite.config.ts b/crates/exav-viewer/demo/vite.config.ts
index 8eca8e07..ca2d43c2 100644
--- a/crates/exav-viewer/demo/vite.config.ts
+++ b/crates/exav-viewer/demo/vite.config.ts
@@ -12,7 +12,7 @@ import { fileURLToPath } from "node:url";
 import { defineConfig, type Plugin } from "vite";
 
 import { exavViewer } from "../dist/vite/index.js";
-import type { Sample } from "./src/showcase.js";
+import type { Example, Sample } from "./src/showcase.js";
 
 const pkgDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const pkg = JSON.parse(fs.readFileSync(path.join(pkgDir, "package.json"), "utf8"));
@@ -29,6 +29,14 @@ const nodeModules = fs.realpathSync(path.join(pkgDir, "node_modules"));
 // A `file:` dependency resolves outside node_modules (to its crate), and the
 // dev server serves its worker and wasm from there.
 const unpackWasm = fs.realpathSync(path.join(nodeModules, "@exav", "unpack-wasm"));
+/**
+ * An external converter for the formats the package's own converters do not
+ * read: the name of an installed package, from `EXAV_EXTERNAL_CONVERTER` when
+ * the demo is built. None by default.
+ */
+const externalConverter = process.env.EXAV_EXTERNAL_CONVERTER || undefined;
+// Its files are served from where it is installed (a `file:` dependency lives outside node_modules).
+const externalDir = externalConverter && fs.existsSync(path.join(nodeModules, externalConverter)) ? fs.realpathSync(path.join(nodeModules, externalConverter)) : undefined;
 
 /** The packages the demo bundles or copies, whose licences travel with it. */
 const ENGINES = ["pdfjs-dist", "three", "@silurus/ooxml", "@exav/unpack-wasm", "react", "react-dom"];
@@ -58,12 +66,25 @@ function licenceFiles(): Map<string, Buffer> {
     "Of pdfjs-dist's wasm/, only its ICC engine (qcms, MIT; LICENSE_QCMS beside it under exav-viewer/pdfjs/) is in the build.",
     "Its OpenJPEG and PDFium image decoders are not: @exav/viewer's own decoders take their place (see its NOTICE).",
   );
-  // The samples copied in by `npm run demo:showcase`, if they were.
+  // The example files copied in by `npm run demo:examples`, if they were (an
+  // example replaces a sample of the same file name in the list), and the samples
+  // copied in by `npm run demo:showcase`.
+  const examplesList = path.join(pkgDir, "demo", "public", "examples", "examples.json");
+  const examples = fs.existsSync(examplesList) ? (JSON.parse(fs.readFileSync(examplesList, "utf8")) as { examples: Example[] }).examples : [];
+  if (examples.length) {
+    index.push("", "The example files, under examples/ (the full list is examples-NOTICE.md; one that has the name of a sample replaces it):");
+    for (const e of examples) {
+      index.push("", e.file, `  ${e.author}: ${e.title}`, `  ${e.source}`, `  ${e.licence}`);
+      if (e.attribution) index.push(`  ${e.attribution}`);
+    }
+    add("examples-NOTICE.md", path.join(pkgDir, "demo", "examples", "NOTICE.md"));
+  }
   const list = path.join(pkgDir, "demo", "public", "showcase", "samples.json");
   if (fs.existsSync(list)) {
     const { samples } = JSON.parse(fs.readFileSync(list, "utf8")) as { samples: Sample[] };
+    const replaced = new Set(examples.map((e) => e.file));
     index.push("", "The sample files, under showcase/, from https://github.com/sylvinus/exav-samples:");
-    for (const s of samples) index.push("", s.file, `  ${s.credit}`, `  ${s.source}`, `  ${s.licence}`);
+    for (const s of samples) index.push("", s.file, `  ${s.credit}`, `  ${s.source}`, `  ${s.licence}`, ...(replaced.has(s.file) ? ["  Not listed: an example of the same name replaces it."] : []));
   }
   files.set("README.txt", Buffer.from(`${index.join("\n")}\n`));
   return files;
@@ -102,7 +123,7 @@ function licences(): Plugin {
  */
 function e2eFiles(): Plugin {
   const dir = path.join(pkgDir, "e2e", ".out");
-  const TYPES: Record<string, string> = { ".pdf": "application/pdf", ".zip": "application/zip", ".webm": "video/webm", ".png": "image/png" };
+  const TYPES: Record<string, string> = { ".pdf": "application/pdf", ".zip": "application/zip", ".webm": "video/webm", ".png": "image/png", ".js": "text/javascript" };
   // A third above clip.webm's bitrate (10 MB for 13 s): it plays without stalling.
   const PACE = 1024 * 1024;
   const send = (file: string, res: ServerResponse, paced: boolean, range?: { start: number; end: number }) => {
@@ -167,11 +188,12 @@ export default defineConfig({
   base: process.env.DEMO_BASE ?? "/",
   resolve: { alias },
   esbuild: { jsx: "automatic" },
-  define: { __DEMO_ORIGIN__: JSON.stringify(origin) },
+  define: { __DEMO_ORIGIN__: JSON.stringify(origin), __EXTERNAL_CONVERTER__: JSON.stringify(externalConverter ?? null) },
   // The sandboxed frame at `${base}frame/`, served with its headers by `vite
   // preview`. It may play the demo's own media by URL and fetch from it.
-  plugins: [exavViewer({ frameDir: "frame", frameOrigin: origin, mediaOrigins: [origin], connectOrigins: [origin] }), licences(), e2eFiles()],
+  plugins: [exavViewer({ frameDir: "frame", frameOrigin: origin, mediaOrigins: [origin], connectOrigins: [origin], externalConverter }), licences(), e2eFiles()],
   // Beside the docs site's 4321.
-  server: { port: 4322, strictPort: true, host: true, fs: { allow: [pkgDir, nodeModules, unpackWasm] } },
-  build: { outDir: "dist", emptyOutDir: true, target: "es2022" },
+  server: { port: 4322, strictPort: true, host: true, fs: { allow: [pkgDir, nodeModules, unpackWasm, ...(externalDir ? [externalDir] : [])] } },
+  // headless.html: a host drawing its own controls, without React.
+  build: { outDir: "dist", emptyOutDir: true, target: "es2022", rollupOptions: { input: { main: path.join(pkgDir, "demo", "index.html"), headless: path.join(pkgDir, "demo", "headless.html") } } },
 });
diff --git a/crates/exav-viewer/e2e/cad-raster.spec.ts b/crates/exav-viewer/e2e/cad-raster.spec.ts
new file mode 100644
index 00000000..779a64f8
--- /dev/null
+++ b/crates/exav-viewer/e2e/cad-raster.spec.ts
@@ -0,0 +1,684 @@
+// Pictures of DWG and DXF drawings (`controllers.pictures`) and the viewport
+// store: drawn again from the vectors in a context of their own, at the asked
+// size and region, whatever the viewer shows. In the page (`mode=page`), where
+// `rasterTile=64` forces tiles; the sandboxed frame is the last test.
+import { expect, test, type Locator, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { decodePng, difference, find, type Pixels } from "./pixels.js";
+import { openSample, sample } from "./samples.js";
+
+failOnViolations();
+
+interface Info {
+  width: number;
+  height: number;
+  page: number;
+  layout?: string;
+  space: string;
+  region: { x: number; y: number; width: number; height: number };
+}
+interface Picture extends Pixels {
+  info: Info;
+}
+
+type Options = Record<string, unknown>;
+
+/** `pictures.raster(page, options)` in the page, its bitmap read back as pixels. */
+async function raster(page: Page, n: number, options: Options): Promise<Picture> {
+  const out = await page.evaluate(
+    async ([n, options]) => {
+      const session = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: object): Promise<{ bitmap: ImageBitmap } & Record<string, unknown>> } } } } } }).exavDemo.session();
+      const r = await session.controllers.get().pictures.raster(n, options as object);
+      const canvas = new OffscreenCanvas(r.bitmap.width, r.bitmap.height);
+      canvas.getContext("2d")!.drawImage(r.bitmap, 0, 0);
+      r.bitmap.close();
+      const bytes = new Uint8Array(await (await canvas.convertToBlob({ type: "image/png" })).arrayBuffer());
+      let binary = "";
+      for (let i = 0; i < bytes.length; i += 0x8000) binary += String.fromCharCode(...bytes.subarray(i, i + 0x8000));
+      const { bitmap: _bitmap, ...info } = r;
+      return { png: btoa(binary), info };
+    },
+    [n, options] as const,
+  );
+  return { ...decodePng(Buffer.from(out.png, "base64")), info: out.info as unknown as Info };
+}
+
+/** The code of the RasterError a raster is refused with. */
+async function refused(page: Page, n: number, options: Options): Promise<string> {
+  return page.evaluate(
+    async ([n, options]) => {
+      const session = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: object): Promise<unknown> } } } } } }).exavDemo.session();
+      try {
+        await session.controllers.get().pictures.raster(n, options as object);
+        return "none";
+      } catch (e) {
+        return (e as { code?: string }).code ?? String(e);
+      }
+    },
+    [n, options] as const,
+  );
+}
+
+interface View {
+  space: string;
+  page: number;
+  layout?: string;
+  region: { x: number; y: number; width: number; height: number };
+}
+const viewport = (page: Page) =>
+  page.evaluate(() => {
+    const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { viewport: { get(): unknown } } } } } }).exavDemo.session();
+    return s.controllers.get().viewport.get() as View | null;
+  });
+
+async function shot(target: Locator): Promise<Pixels> {
+  const tools = target.page().locator(".exav-viewer-tools");
+  await tools.evaluateAll((els) => els.forEach((e) => ((e as HTMLElement).style.visibility = "hidden")));
+  try {
+    return decodePng(await target.screenshot({ animations: "disabled" }));
+  } finally {
+    await tools.evaluateAll((els) => els.forEach((e) => ((e as HTMLElement).style.visibility = "")));
+  }
+}
+
+/** Two screenshots in a row that agree: the canvas has settled. */
+async function settled(target: Locator): Promise<Pixels> {
+  // A zoom scales the canvas as drawn until it pauses: its box is not its own.
+  await expect.poll(() => target.evaluate((e) => (e as HTMLElement).style.transform)).toBe("");
+  let last = await shot(target);
+  for (let i = 0; i < 20; i++) {
+    await target.page().waitForTimeout(150);
+    const next = await shot(target);
+    if (difference(last, next) === 0) return next;
+    last = next;
+  }
+  return last;
+}
+
+async function open(page: Page, name: string, params: Record<string, string> = {}): Promise<Locator> {
+  await openSample(page, name, { mode: "page", ...params });
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+  await expect.poll(() => viewport(page)).not.toBeNull();
+  const canvas = page.locator(".demo-frame .exav-viewer-cad-canvas");
+  // A whole number of pixels, so that a screenshot of the canvas is its own pixels.
+  await page.locator(".demo-frame .exav-viewer-cad").evaluate((e) => Object.assign(e.style, { position: "fixed", left: "0px", top: "0px", zIndex: "10", flex: "none", width: "700px", height: "500px" }));
+  await expect.poll(() => canvas.evaluate((c: HTMLCanvasElement) => [c.width, c.height])).toEqual([700, 500]);
+  return canvas;
+}
+
+/** The page a layout is: its place in the layouts controller, model space first. */
+const pageOf = (page: Page, id: string) =>
+  page.evaluate((id) => {
+    const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { layouts: { get(): { items: { id: string }[] } } } } } } }).exavDemo.session();
+    return s.controllers.get().layouts.get().items.findIndex((l) => l.id === id) + 1;
+  }, id);
+
+async function layout(page: Page, name: string): Promise<void> {
+  // By the DOM: the canvas is fixed over the corner of the page (see `open`).
+  await page.locator(".exav-viewer-layouts").getByRole("button", { name }).evaluate((b) => (b as HTMLElement).click());
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+  await expect.poll(async () => (await viewport(page))?.layout).toBe(name);
+}
+
+const at = (p: Pixels, x: number, y: number): [number, number, number, number] => {
+  const i = (y * p.width + x) * 4;
+  return [p.data[i]!, p.data[i + 1]!, p.data[i + 2]!, p.data[i + 3]!];
+};
+const near = (a: readonly number[], b: readonly number[], tolerance = 24) => a.every((v, i) => Math.abs(v - b[i]!) <= tolerance);
+const ink = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+/** The largest difference of any channel of any pixel. */
+function worst(a: Pixels, b: Pixels): number {
+  expect([a.width, a.height]).toEqual([b.width, b.height]);
+  let m = 0;
+  for (let i = 0; i < a.data.length; i++) m = Math.max(m, Math.abs(a.data[i]! - b.data[i]!));
+  return m;
+}
+/** Rows from `from` to `to` (inclusive) of column `x` that `test` accepts. */
+function column(p: Pixels, x: number, test: (r: number, g: number, b: number) => boolean): number[] {
+  const rows: number[] = [];
+  for (let y = 0; y < p.height; y++) {
+    const [r, g, b] = at(p, x, y);
+    if (test(r, g, b)) rows.push(y);
+  }
+  return rows;
+}
+function row(p: Pixels, y: number, test: (r: number, g: number, b: number) => boolean): number[] {
+  const cols: number[] = [];
+  for (let x = 0; x < p.width; x++) {
+    const [r, g, b] = at(p, x, y);
+    if (test(r, g, b)) cols.push(x);
+  }
+  return cols;
+}
+
+const red = (r: number, g: number, b: number) => r > 200 && g < 80 && b < 80;
+const cyan = (r: number, g: number, b: number) => r < 80 && g > 200 && b > 200;
+const notWhite = (r: number, g: number, b: number) => r < 250 || g < 250 || b < 250;
+
+test.describe("a region of the drawing", () => {
+  // colours.dxf: a yellow line (y 0), a red one (y 20), both 100 long and 2.11 mm
+  // wide, and a cyan band from y 40 to 60, all from x 0 to 100.
+  test("is drawn where its drawing units are: x to the right, y up", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    // 200 x 50 units in 800 x 200 px: 4 px a unit, x from -50, y from 15 to 65.
+    const p = await raster(page, 1, { region: { x: -50, y: 15, width: 200, height: 50 }, width: 800, height: 200 });
+    expect(p.info).toMatchObject({ width: 800, height: 200, page: 1, layout: "", space: "drawing" });
+    expect(p.info.region).toMatchObject({ x: -50, y: 15, width: 200, height: 50 });
+    // The band, from y 60 (row 20) to 40 (row 100), across x 0..100 (columns 200..600).
+    const band = find(p, cyan).box!;
+    expect(band.minX).toBeGreaterThanOrEqual(198);
+    expect(band.maxX).toBeLessThanOrEqual(602);
+    expect(Math.abs(band.minY - 20)).toBeLessThanOrEqual(2);
+    expect(Math.abs(band.maxY - 100)).toBeLessThanOrEqual(2);
+    // The red line at y 20: row 180, below the band. Round caps reach 4 px past its ends.
+    const line = find(p, red).box!;
+    expect(Math.abs((line.minY + line.maxY) / 2 - 180)).toBeLessThanOrEqual(2);
+    expect(Math.abs(line.minX - 196)).toBeLessThanOrEqual(3);
+    expect(Math.abs(line.maxX - 604)).toBeLessThanOrEqual(3);
+    // The paper outside is the ground.
+    expect(near(at(p, 20, 100), [255, 255, 255, 255], 2)).toBe(true);
+    expect(near(at(p, 700, 20), [255, 255, 255, 255], 2)).toBe(true);
+  });
+
+  test("is widened to the picture's shape (contain) or narrowed to it (cover), and reported as drawn", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    const region = { x: 0, y: 40, width: 100, height: 20 };
+    const wide = await raster(page, 1, { region, width: 400, height: 400 });
+    expect(wide.info.region.width).toBeCloseTo(100, 6);
+    expect(wide.info.region.height).toBeCloseTo(100, 6);
+    expect(wide.info.region.x).toBeCloseTo(0, 6);
+    expect(wide.info.region.y).toBeCloseTo(0, 6);
+    // The band is in the middle of the picture, a fifth of its height.
+    const band = find(wide, cyan).box!;
+    expect(Math.abs(band.minY - 160)).toBeLessThanOrEqual(2);
+    expect(Math.abs(band.maxY - 240)).toBeLessThanOrEqual(2);
+    const cover = await raster(page, 1, { region, width: 400, height: 400, fit: "cover" });
+    expect(cover.info.region.width).toBeCloseTo(20, 6);
+    expect(cover.info.region.height).toBeCloseTo(20, 6);
+    expect(cover.info.region.x).toBeCloseTo(40, 6);
+    // Cover: the band fills the picture.
+    expect(find(cover, cyan).count).toBe(400 * 400);
+  });
+
+  test("takes its shape from a longEdge alone, and refuses what is no size or region", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    const p = await raster(page, 1, { region: { x: 0, y: 0, width: 100, height: 25 }, longEdge: 200 });
+    expect([p.width, p.height]).toEqual([200, 50]);
+    expect(p.info.region.width / p.info.region.height).toBeCloseTo(4, 2);
+    expect(await refused(page, 1, { longEdge: 0 })).toBe("invalid");
+    expect(await refused(page, 1, { longEdge: 100, region: { x: 0, y: 0, width: 0, height: 5 } })).toBe("invalid");
+    expect(await refused(page, 1, { longEdge: 100, lineweight: "heavy" })).toBe("invalid");
+    expect(await refused(page, 1, { longEdge: 100, background: "url(x)" })).toBe("invalid");
+    expect(await refused(page, 1, { width: 20000, height: 20000 })).toBe("too-large");
+    expect(await refused(page, 99, { longEdge: 100 })).toBe("invalid");
+    expect(await refused(page, 1, { longEdge: 100, layout: "Nope" })).toBe("invalid");
+    // So close that the f32 coordinates cannot place it.
+    expect(await refused(page, 1, { longEdge: 100, region: { x: 0, y: 0, width: 1e-9, height: 1e-9 } })).toBe("invalid");
+  });
+
+  test("the whole layout by default, on the viewer's ground", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    const p = await raster(page, 1, { longEdge: 600 });
+    expect(p.info.region.width / p.info.region.height).toBeGreaterThan(1.5);
+    // The extents with the viewer's margin around them: the drawing is inside, the edge is ground.
+    const box = find(p, notWhite).box!;
+    expect(box.minX).toBeGreaterThan(5);
+    expect(box.maxX).toBeLessThan(p.width - 5);
+    expect(near(at(p, 0, 0), [255, 255, 255, 255], 2)).toBe(true);
+  });
+});
+
+test.describe("the viewport", () => {
+  test("follows the camera, in drawing units, and 'current' draws it as the viewer shows it", async ({ page }) => {
+    const canvas = await open(page, "cad-colours.dxf");
+    const box = (await canvas.boundingBox())!;
+    const fitted = (await viewport(page))!;
+    expect(fitted).toMatchObject({ space: "drawing", page: 1, layout: "" });
+    // The drawing's extents (x 0..100, y 0..60 less the band's edge) are inside it.
+    expect(fitted.region.x).toBeLessThan(0);
+    expect(fitted.region.x + fitted.region.width).toBeGreaterThan(100);
+    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+    await page.mouse.wheel(0, -500);
+    await expect.poll(async () => (await viewport(page))!.region.width).toBeLessThan(fitted.region.width * 0.6);
+    const screen = await settled(canvas);
+    const view = (await viewport(page))!;
+    const [cw, ch] = await canvas.evaluate((c: HTMLCanvasElement) => [c.width, c.height]);
+    expect([screen.width, screen.height]).toEqual([cw, ch]);
+    const p = await raster(page, 1, { region: "current", width: cw, height: ch });
+    expect(p.info.region.x).toBeCloseTo(view.region.x, 6);
+    expect(p.info.region.y).toBeCloseTo(view.region.y, 6);
+    expect(p.info.region.width).toBeCloseTo(view.region.width, 6);
+    expect(p.info.region.height).toBeCloseTo(view.region.height, 6);
+    expect(difference(screen, p)).toBeLessThan(0.5);
+    expect(worst(screen, p)).toBeLessThan(80);
+  });
+
+  test("a drawing with text: 'current' at the canvas's size is the picture on screen", async ({ page }) => {
+    const canvas = await open(page, "plan.dxf");
+    const box = (await canvas.boundingBox())!;
+    await page.mouse.move(box.x + box.width * 0.25, box.y + box.height * 0.5);
+    await page.mouse.wheel(0, -600);
+    await page.waitForTimeout(600);
+    const screen = await settled(canvas);
+    const [cw, ch] = await canvas.evaluate((c: HTMLCanvasElement) => [c.width, c.height]);
+    const p = await raster(page, 1, { region: "current", width: cw, height: ch });
+    // Another glyph atlas, at the size the picture wants: a hair apart.
+    expect(difference(screen, p)).toBeLessThan(1.5);
+    expect(find(p, notWhite).count).toBeGreaterThan(200);
+  });
+
+  test("is a pan, a zoom and a resize away from where it was, and dedupes", async ({ page }) => {
+    const canvas = await open(page, "cad-colours.dxf");
+    const seen = await page.evaluate(() => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { viewport: { subscribe(f: (v: unknown) => void): () => void } } } } } }).exavDemo.session();
+      const log: unknown[] = [];
+      (window as unknown as { log: unknown[] }).log = log;
+      s.controllers.get().viewport.subscribe((v) => log.push(v));
+      return log.length;
+    });
+    expect(seen).toBe(0);
+    const before = (await viewport(page))!;
+    const box = (await canvas.boundingBox())!;
+    await page.mouse.move(box.x + 100, box.y + 100);
+    await page.mouse.down();
+    await page.mouse.move(box.x + 160, box.y + 100, { steps: 4 });
+    await page.mouse.up();
+    const after = (await viewport(page))!;
+    expect(after.region.width).toBeCloseTo(before.region.width, 6);
+    // Dragged to the right by 60 px: the view moves left.
+    expect(after.region.x).toBeLessThan(before.region.x);
+    const notified = await page.evaluate(() => (window as unknown as { log: unknown[] }).log.length);
+    expect(notified).toBeGreaterThan(0);
+    // A store set again with what it had does not notify.
+    await page.evaluate(() => window.dispatchEvent(new Event("resize")));
+    await page.waitForTimeout(300);
+    expect(await page.evaluate(() => (window as unknown as { log: unknown[] }).log.length)).toBe(notified);
+  });
+
+  test("is the sheet's, in paper units, once a layout is shown; 'current' is refused for the layout not shown", async ({ page }) => {
+    await open(page, "cad-sheets.dxf");
+    const metric = await pageOf(page, "Metric");
+    const imperial = await pageOf(page, "Imperial");
+    expect(await refused(page, metric, { longEdge: 100, region: "current" })).toBe("invalid");
+    await layout(page, "Metric");
+    const view = (await viewport(page))!;
+    expect(view).toMatchObject({ space: "drawing", page: metric, layout: "Metric" });
+    // A sheet of 297 by 210 mm is inside the view.
+    expect(view.region.width).toBeGreaterThan(297);
+    const p = await raster(page, metric, { region: "current", longEdge: 300 });
+    expect(p.info.layout).toBe("Metric");
+    // The sheet's view, to the hair a picture of whole pixels widens it by.
+    expect(Math.abs(p.info.region.width / view.region.width - 1)).toBeLessThan(0.01);
+    expect(await refused(page, 1, { longEdge: 100, region: "current" })).toBe("invalid");
+    expect(await refused(page, imperial, { longEdge: 100, region: "current" })).toBe("invalid");
+  });
+});
+
+test.describe("layouts", () => {
+  // sheets.dxf: model space holds a line; "Metric" and "Imperial" are sheets
+  // (A4 in mm, letter in inches) with a square of an inch and, below it, a line
+  // 2.11 mm wide: the square is 25.4 units on the first, 1 on the other.
+  test("a paper layout is drawn as its sheet: the paper on a surround, in paper units", async ({ page }) => {
+    const canvas = await open(page, "cad-sheets.dxf");
+    const before = await settled(canvas);
+    const p = await raster(page, await pageOf(page, "Metric"), { longEdge: 900 });
+    expect(p.info).toMatchObject({ page: await pageOf(page, "Metric"), layout: "Metric" });
+    const surround = (r: number, g: number, b: number) => Math.abs(r - 224) < 8 && Math.abs(g - 224) < 8 && Math.abs(b - 224) < 8;
+    const white = (r: number, g: number, b: number) => r > 250 && g > 250 && b > 250;
+    expect(find(p, surround).count).toBeGreaterThan(1000);
+    const sheet = find(p, white).box!;
+    expect(sheet.width / sheet.height).toBeGreaterThan(1.37);
+    expect(sheet.width / sheet.height).toBeLessThan(1.46);
+    // Paper units: the sheet is 297 wide, so it is that many units of the region.
+    const unit = p.width / p.info.region.width;
+    expect(sheet.width / unit).toBeGreaterThan(290);
+    expect(sheet.width / unit).toBeLessThan(300);
+    // What the viewer shows was not touched.
+    expect(await refused(page, 1, { longEdge: 50 })).toBe("none");
+    expect(difference(before, await settled(canvas))).toBe(0);
+    expect((await viewport(page))!.layout).toBe("");
+  });
+
+  test("the layout option selects by id and wins over the page", async ({ page }) => {
+    await open(page, "cad-sheets.dxf");
+    const p = await raster(page, 1, { layout: "Imperial", longEdge: 200 });
+    expect(p.info).toMatchObject({ page: await pageOf(page, "Imperial"), layout: "Imperial" });
+    const q = await raster(page, 2, { layout: "", longEdge: 200 });
+    expect(q.info).toMatchObject({ page: 1, layout: "" });
+  });
+
+  test("a lineweight on a sheet is millimetres on the page; screen follows the viewer, scaled the picture", async ({ page }) => {
+    const canvas = await open(page, "cad-sheets.dxf");
+    // Metric: 10 px a unit; the line, 2.11 mm wide, at y -25.4: row 554.
+    const region = { x: -10, y: -30, width: 60, height: 60 };
+    const size = { width: 600, height: 600 };
+    const thickness = (p: Pixels) => column(p, 250, ink).length;
+    const scaled = await raster(page, 1, { layout: "Metric", region, ...size, lineweight: "scaled" });
+    const lines = column(scaled, 250, ink);
+    // The line is the lowest ink in the column.
+    const bottom = lines.filter((y) => y > 450);
+    expect(bottom.length).toBeGreaterThan(18);
+    expect(bottom.length).toBeLessThan(24);
+    expect(Math.abs((bottom[0]! + bottom.at(-1)!) / 2 - 554)).toBeLessThanOrEqual(3);
+    // On screen: the width the viewer would have when its canvas shows the region.
+    const screen = await raster(page, 1, { layout: "Metric", region, ...size });
+    const cw = (await canvas.evaluate((c: HTMLCanvasElement) => [c.width, c.height])) as [number, number];
+    const k = Math.max(60 / cw[0], 60 / cw[1]) / 0.1;
+    const wanted = 21.1 / k;
+    const got = column(screen, 250, ink).filter((y) => y > 450).length;
+    expect(Math.abs(got - Math.max(wanted, 1))).toBeLessThanOrEqual(3);
+    expect(thickness(scaled)).toBeGreaterThan(got);
+  });
+
+  test("a viewport's content is clipped to its window, as the viewer shows it", async ({ page }) => {
+    // A text 60 long and a viewport onto x -10 to 30 of it, 40 by 20 on the sheet.
+    await open(page, "cad-viewport_text.dxf");
+    const p = await raster(page, 1, { layout: "Sheet", longEdge: 1200 });
+    expect(p.info.layout).toBe("Sheet");
+    const box = find(p, ink).box!;
+    expect(box.width / box.height).toBeGreaterThan(4.5);
+    expect(box.width / box.height).toBeLessThan(7);
+    // The model itself has all the text, and the other one far to the right.
+    const model = await raster(page, 1, { longEdge: 1200 });
+    expect(find(model, ink).box!.width / find(model, ink).box!.height).toBeGreaterThan(10);
+  });
+});
+
+test.describe("tiles", () => {
+  /** The same picture in one pass, and in tiles of 64 px (the page's `rasterTile`). */
+  async function both(browserPage: Page, name: string, n: number, options: Options) {
+    // The tiles drawn: one GL canvas read back each.
+    await browserPage.addInitScript(() => {
+      if ((window as unknown as { tiles?: number }).tiles !== undefined) return;
+      (window as unknown as { tiles: number }).tiles = 0;
+      const original = OffscreenCanvas.prototype.transferToImageBitmap;
+      OffscreenCanvas.prototype.transferToImageBitmap = function (this: OffscreenCanvas) {
+        (window as unknown as { tiles: number }).tiles++;
+        return original.call(this);
+      };
+    });
+    const drawn = () => browserPage.evaluate(() => (window as unknown as { tiles: number }).tiles);
+    await open(browserPage, name);
+    const whole = await raster(browserPage, n, options);
+    const single = await drawn();
+    await open(browserPage, name, { rasterTile: "64" });
+    const tiled = await raster(browserPage, n, options);
+    // Tiles of 64 px, so many of them: the tiled picture is not the single pass. (One more read, of the composed picture.)
+    expect([single - 1, (await drawn()) - 1]).toEqual([1, Math.ceil(tiled.width / 64) * Math.ceil(tiled.height / 64)]);
+    return { whole, tiled };
+  }
+
+  test("a picture drawn in small tiles is the picture drawn in one pass, no gap and no line twice at the seams", async ({ page }) => {
+    const { whole, tiled } = await both(page, "cad-halo.dxf", 1, { longEdge: 500 });
+    expect([tiled.width, tiled.height]).toEqual([whole.width, whole.height]);
+    expect(tiled.info.region).toEqual(whole.info.region);
+    // A red band 8 px wide and a thin line cross the seams every 64 px.
+    expect(find(whole, red).count).toBeGreaterThan(500);
+    expect(worst(whole, tiled)).toBeLessThanOrEqual(2);
+    expect(difference(whole, tiled)).toBeLessThan(0.01);
+  });
+
+  test("with text, fills and the sheet's paper", async ({ page }) => {
+    const text = await both(page, "plan.dxf", 1, { longEdge: 600 });
+    expect(find(text.whole, ink).count).toBeGreaterThan(300);
+    expect(worst(text.whole, text.tiled)).toBeLessThanOrEqual(6);
+    expect(difference(text.whole, text.tiled)).toBeLessThan(0.05);
+    const sheet = await both(page, "cad-sheets.dxf", 1, { layout: "Metric", longEdge: 700 });
+    expect(worst(sheet.whole, sheet.tiled)).toBeLessThanOrEqual(2);
+    expect(difference(sheet.whole, sheet.tiled)).toBeLessThan(0.01);
+    const fills = await both(page, "cad-colours.dxf", 1, { region: { x: 10, y: 30, width: 50, height: 40 }, width: 330, height: 270 });
+    expect(find(fills.whole, cyan).count).toBeGreaterThan(1000);
+    expect(worst(fills.whole, fills.tiled)).toBeLessThanOrEqual(2);
+  });
+
+  test("a picture past the default tile, over two sides, is composed", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    // 2600 px wide: two tiles of 2048 across.
+    const p = await raster(page, 1, { region: { x: 0, y: 0, width: 100, height: 60 }, width: 2600, height: 1560 });
+    expect([p.width, p.height]).toEqual([2600, 1560]);
+    const band = find(p, cyan).box!;
+    // x 0..100 is the whole width; y 40..60 is the top third of the region.
+    expect(band.minX).toBeLessThanOrEqual(1);
+    expect(band.maxX).toBeGreaterThanOrEqual(2598);
+    expect(Math.abs(band.minY - 0)).toBeLessThanOrEqual(2);
+    expect(Math.abs(band.maxY - 520)).toBeLessThanOrEqual(2);
+    // Across the tile seam at column 2048, nothing is missing.
+    expect(column(p, 2047, cyan).length).toBe(column(p, 2048, cyan).length);
+    expect(column(p, 2047, cyan).length).toBeGreaterThan(500);
+  });
+});
+
+test.describe("sharpness", () => {
+  test("a hairline stays a pixel wide at four times the zoom on screen", async ({ page }) => {
+    const canvas = await open(page, "cad-halo.dxf");
+    const screen = await settled(canvas);
+    const view = (await viewport(page))!;
+    // halo.dxf: a thin vertical line at x 50 below a wide red one.
+    const w = screen.width * 4;
+    const h = screen.height * 4;
+    const p = await raster(page, 1, { region: "current", width: w, height: h });
+    const y = Math.round(h * 0.85);
+    const touched = (r: number, g: number, b: number) => r < 235 || g < 235 || b < 235;
+    // How much ink a row has, in pixels of the line's colour (a grey of 51: 204 under white).
+    const inkOf = (q: Pixels) => row(q, y, touched).reduce((n, x) => n + (255 - at(q, x, y)[0]) / 204, 0);
+    const dark = row(p, y, touched);
+    expect(dark.length).toBeGreaterThan(0);
+    expect(dark.length).toBeLessThanOrEqual(3);
+    // One pixel of ink, not an upscaled one's four.
+    expect(inkOf(p)).toBeGreaterThan(0.75);
+    expect(inkOf(p)).toBeLessThan(1.35);
+    // In the picture where the line is: the middle of the region.
+    const centre = Math.round(((50 - view.region.x) / view.region.width) * w);
+    expect(Math.abs(dark[0]! - centre)).toBeLessThanOrEqual(3);
+    // Scaled with the picture it is four times as wide.
+    const scaled = await raster(page, 1, { region: "current", width: w, height: h, lineweight: "scaled" });
+    expect(inkOf(scaled)).toBeGreaterThan(3.4);
+    expect(inkOf(scaled)).toBeLessThan(4.7);
+  });
+
+  test("text is drawn at the picture's scale, not magnified: edges a pixel or two wide", async ({ page }) => {
+    await open(page, "cad-text_many.dxf");
+    const view = (await viewport(page))!;
+    // The middle of the drawing, zoomed thirty times.
+    const cx = view.region.x + view.region.width / 2;
+    const cy = view.region.y + view.region.height / 2;
+    const w = view.region.width / 30;
+    const p = await raster(page, 1, { region: { x: cx - w / 2, y: cy - w / 4, width: w, height: w / 2 }, width: 1200, height: 600 });
+    const lum = (r: number, g: number, b: number) => (r + g + b) / 3;
+    const dark = find(p, (r, g, b) => lum(r, g, b) < 80).count;
+    const edge = find(p, (r, g, b) => lum(r, g, b) >= 80 && lum(r, g, b) < 200).count;
+    expect(dark).toBeGreaterThan(2000);
+    expect(edge / dark).toBeLessThan(0.15);
+  });
+});
+
+test.describe("the ground", () => {
+  test("is any CSS colour, the viewer's ground by default", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    const p = await raster(page, 1, { region: { x: 200, y: 200, width: 10, height: 10 }, width: 20, height: 20, background: "rgb(10 200 30)" });
+    expect(near(at(p, 10, 10), [10, 200, 30, 255], 1)).toBe(true);
+    const q = await raster(page, 1, { region: { x: 200, y: 200, width: 10, height: 10 }, width: 20, height: 20, background: "#ff000080" });
+    expect(near(at(q, 10, 10), [255, 0, 0, 128], 2)).toBe(true);
+    // The dark ground of the session: a drawing resolved against it.
+    const dark = await raster(page, 1, { region: { x: 200, y: 200, width: 10, height: 10 }, width: 20, height: 20, background: "#212830" });
+    expect(near(at(dark, 3, 3), [0x21, 0x28, 0x30, 255], 1)).toBe(true);
+  });
+
+  test("transparent has no ground, and its edges and text are premultiplied right", async ({ page }) => {
+    await open(page, "plan.dxf");
+    const options = { longEdge: 700 };
+    const opaque = await raster(page, 1, { ...options, background: "#ffffff" });
+    const clear = await raster(page, 1, { ...options, background: "transparent" });
+    expect(at(clear, 0, 0)[3]).toBe(0);
+    let partial = 0;
+    let solid = 0;
+    for (let i = 0; i < clear.data.length; i += 4) {
+      const a = clear.data[i + 3]!;
+      if (a === 255) solid++;
+      else if (a > 0) partial++;
+    }
+    expect(solid).toBeGreaterThan(300);
+    expect(partial).toBeGreaterThan(300);
+    // The picture on white is the picture with a white ground: a premultiplied edge
+    // read as straight, or a glyph's twice over, would darken or lighten it.
+    const over = new Uint8Array(clear.data.length);
+    for (let i = 0; i < over.length; i += 4) {
+      const a = clear.data[i + 3]! / 255;
+      for (let c = 0; c < 3; c++) over[i + c] = Math.round(clear.data[i + c]! * a + 255 * (1 - a));
+      over[i + 3] = 255;
+    }
+    const composed = { width: clear.width, height: clear.height, data: over };
+    expect(difference(composed, opaque)).toBeLessThan(0.1);
+    expect(worst(composed, opaque)).toBeLessThanOrEqual(24);
+    // A pixel that is part ink keeps the ink's own colour (the circle's cyan, 0 194 194 on a light ground), not a darker one.
+    let tinted = 0;
+    for (let i = 0; i < clear.data.length; i += 4) {
+      const a = clear.data[i + 3]!;
+      if (a > 60 && a < 200 && clear.data[i]! < 20 && Math.abs(clear.data[i + 1]! - 194) < 8 && Math.abs(clear.data[i + 2]! - 194) < 8) tinted++;
+    }
+    expect(tinted).toBeGreaterThan(20);
+  });
+
+  test("a sheet on transparency is its content alone, without paper or surround", async ({ page }) => {
+    await open(page, "cad-sheets.dxf");
+    const p = await raster(page, 1, { layout: "Metric", longEdge: 400, background: "transparent" });
+    expect(at(p, 2, 2)[3]).toBe(0);
+    expect(at(p, p.width / 2, p.height / 2)[3]).toBe(0);
+  });
+});
+
+test.describe("resources", () => {
+  /** Records the WebGL2 contexts of off screen canvases (the exports'), and how many were live when each was made. */
+  async function track(page: Page) {
+    await page.addInitScript(() => {
+      const log: { gl: WebGL2RenderingContext; before: number }[] = [];
+      (window as unknown as { exports: typeof log }).exports = log;
+      const original = OffscreenCanvas.prototype.getContext;
+      OffscreenCanvas.prototype.getContext = function (this: OffscreenCanvas, kind: string, ...rest: unknown[]) {
+        const gl = (original as (...a: unknown[]) => unknown).call(this, kind, ...rest);
+        if (kind === "webgl2" && gl) log.push({ gl: gl as WebGL2RenderingContext, before: log.filter((e) => !e.gl.isContextLost()).length });
+        return gl;
+      } as typeof original;
+    });
+  }
+  const contexts = (page: Page) =>
+    page.evaluate(() => {
+      const log = (window as unknown as { exports: { gl: WebGL2RenderingContext; before: number }[] }).exports;
+      return { made: log.length, live: log.filter((e) => !e.gl.isContextLost()).length, before: log.map((e) => e.before) };
+    });
+
+  test("a context is made for a picture and given back, on success and on error", async ({ page }) => {
+    await track(page);
+    await open(page, "cad-colours.dxf");
+    await raster(page, 1, { longEdge: 300 });
+    expect(await contexts(page)).toMatchObject({ made: 1, live: 0 });
+    expect(await refused(page, 1, { longEdge: 300, region: { x: 0, y: 0, width: 1e-9, height: 1e-9 } })).toBe("invalid");
+    expect(await contexts(page)).toMatchObject({ live: 0 });
+  });
+
+  test("pictures are drawn one at a time", async ({ page }) => {
+    await track(page);
+    await open(page, "cad-colours.dxf", { rasterTile: "64" });
+    const sizes = await page.evaluate(async () => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: object): Promise<{ bitmap: ImageBitmap; width: number }> } } } } } }).exavDemo.session();
+      const p = s.controllers.get().pictures;
+      const all = await Promise.all([p.raster(1, { longEdge: 300 }), p.raster(1, { longEdge: 200 }), p.raster(1, { longEdge: 100 })]);
+      all.forEach((r) => r.bitmap.close());
+      return all.map((r) => r.width);
+    });
+    expect(sizes).toEqual([300, 200, 100]);
+    const { made, before, live } = await contexts(page);
+    expect(made).toBe(3);
+    expect(before).toEqual([0, 0, 0]);
+    expect(live).toBe(0);
+  });
+
+  test("an abort in the middle of tiles stops the drawing and frees the context", async ({ page }) => {
+    await track(page);
+    await open(page, "plan.dxf", { rasterTile: "32" });
+    const result = await page.evaluate(async () => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: object): Promise<unknown> } } } } } }).exavDemo.session();
+      const abort = new AbortController();
+      const started = performance.now();
+      const done = s.controllers.get().pictures.raster(1, { width: 1500, height: 1000, signal: abort.signal }).then(
+        () => "drawn",
+        (e: { code?: string }) => e.code ?? String(e),
+      );
+      // Once the first context has been made, the tiles are being drawn.
+      const log = (window as unknown as { exports: unknown[] }).exports;
+      while (log.length === 0 && performance.now() - started < 20000) await new Promise((r) => setTimeout(r, 5));
+      await new Promise((r) => setTimeout(r, 150));
+      abort.abort();
+      return { code: await done, ms: performance.now() - started };
+    });
+    expect(result.code).toBe("aborted");
+    await page.waitForTimeout(200);
+    expect(await contexts(page)).toMatchObject({ made: 1, live: 0 });
+    // The session goes on, and a picture can be asked again.
+    const p = await raster(page, 1, { longEdge: 100 });
+    expect(p.width).toBe(100);
+  });
+
+  test("an abort while the worker draws the layout is at once, before any context", async ({ page }) => {
+    await track(page);
+    await open(page, "cad-sheets.dxf");
+    const code = await page.evaluate(async () => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: object): Promise<unknown> } } } } } }).exavDemo.session();
+      const abort = new AbortController();
+      const done = s.controllers.get().pictures.raster(2, { longEdge: 300, signal: abort.signal }).then(
+        () => "drawn",
+        (e: { code?: string }) => e.code ?? String(e),
+      );
+      abort.abort();
+      return done;
+    });
+    expect(code).toBe("aborted");
+    const p = await raster(page, 1, { layout: "Metric", longEdge: 100 });
+    expect(p.width).toBeGreaterThan(0);
+    expect((await contexts(page)).live).toBe(0);
+  });
+
+  test("the visible canvas keeps no drawing buffer", async ({ page }) => {
+    const canvas = await open(page, "cad-colours.dxf");
+    expect(await canvas.evaluate((c: HTMLCanvasElement) => c.getContext("webgl2")!.getContextAttributes()!.preserveDrawingBuffer)).toBe(false);
+    await raster(page, 1, { longEdge: 200 });
+    expect(await canvas.evaluate((c: HTMLCanvasElement) => c.getContext("webgl2")!.getContextAttributes()!.preserveDrawingBuffer)).toBe(false);
+  });
+});
+
+test.describe("in the sandboxed frame", () => {
+  test("a picture has the size, region and pixels it has in the page", async ({ page }) => {
+    await open(page, "cad-colours.dxf");
+    const options = { region: { x: -50, y: 15, width: 200, height: 50 }, width: 800, height: 200 };
+    const inPage = await raster(page, 1, options);
+
+    await page.goto("./headless.html?lang=en");
+    await page.getByTestId("file-input").setInputFiles({ name: "cad-colours.dxf", mimeType: "", buffer: sample("cad-colours.dxf") });
+    await expect
+      .poll(() => page.evaluate(() => (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session()?.status.get().phase))
+      .toBe("ready");
+    const out = await page.evaluate(async (options) => {
+      const s = (window as unknown as { headless: { session(): { controllers: { get(): { pictures: { raster(n: number, o: object): Promise<{ bitmap: ImageBitmap } & Record<string, unknown>> }; viewport: { get(): unknown } } } } } }).headless.session();
+      let c = s.controllers.get();
+      for (let i = 0; i < 100 && !(c.pictures && c.viewport.get()); i++) {
+        await new Promise((r) => setTimeout(r, 100));
+        c = s.controllers.get();
+      }
+      const r = await c.pictures.raster(1, options);
+      const canvas = new OffscreenCanvas(r.bitmap.width, r.bitmap.height);
+      canvas.getContext("2d")!.drawImage(r.bitmap, 0, 0);
+      r.bitmap.close();
+      const bytes = new Uint8Array(await (await canvas.convertToBlob({ type: "image/png" })).arrayBuffer());
+      let binary = "";
+      for (let i = 0; i < bytes.length; i += 0x8000) binary += String.fromCharCode(...bytes.subarray(i, i + 0x8000));
+      const { bitmap: _bitmap, ...info } = r;
+      return { png: btoa(binary), info, view: c.viewport.get() };
+    }, options);
+    const inFrame = decodePng(Buffer.from(out.png, "base64"));
+    expect([inFrame.width, inFrame.height]).toEqual([inPage.width, inPage.height]);
+    expect(out.info).toMatchObject({ width: 800, height: 200, page: 1, layout: "", space: "drawing", region: options.region });
+    expect(out.view).toMatchObject({ space: "drawing", page: 1, layout: "" });
+    expect(difference(inPage, inFrame)).toBeLessThan(0.05);
+  });
+});
diff --git a/crates/exav-viewer/e2e/cad.spec.ts b/crates/exav-viewer/e2e/cad.spec.ts
new file mode 100644
index 00000000..76d1246a
--- /dev/null
+++ b/crates/exav-viewer/e2e/cad.spec.ts
@@ -0,0 +1,372 @@
+// What the DWG and DXF renderer draws its own way, on exav-render's drawings
+// built to show each thing (its tests/fixtures/dwg/make.py, copied as
+// cad-*.dxf by make-samples.mjs), measured on the picture. In the page: the
+// sandboxed frame draws the same pixels (demo.spec.ts compares the two).
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type Locator, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { bands, decodePng, difference, find, type Pixels } from "./pixels.js";
+import { openSample, sample } from "./samples.js";
+
+failOnViolations();
+
+const ink = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+
+/** One of the demo's example drawings (demo/examples/generate/make-cad.py). */
+const HOUSE = fileURLToPath(new URL("../demo/examples/files/cad/house-plan.dxf", import.meta.url));
+
+async function shot(target: Locator): Promise<Pixels> {
+  const page = target.page();
+  // The viewer's tools float over the canvas.
+  const tools = page.locator(".exav-viewer-tools");
+  await tools.evaluateAll((els) => els.forEach((e) => ((e as HTMLElement).style.visibility = "hidden")));
+  try {
+    return decodePng(await target.screenshot({ animations: "disabled" }));
+  } finally {
+    await tools.evaluateAll((els) => els.forEach((e) => ((e as HTMLElement).style.visibility = "")));
+  }
+}
+
+/** Two screenshots in a row that agree: the canvas has settled. */
+async function settled(target: Locator): Promise<Pixels> {
+  // A zoom scales the canvas as drawn until it pauses: its box is not its own.
+  await expect.poll(() => target.evaluate((e) => (e as HTMLElement).style.transform)).toBe("");
+  let last = await shot(target);
+  for (let i = 0; i < 20; i++) {
+    await target.page().waitForTimeout(150);
+    const next = await shot(target);
+    if (difference(last, next) === 0) return next;
+    last = next;
+  }
+  return last;
+}
+
+async function open(page: Page, name: string): Promise<Locator> {
+  await openSample(page, name, { mode: "page" });
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+  return page.locator(".demo-frame .exav-viewer-cad-canvas");
+}
+
+async function layout(page: Page, name: string): Promise<void> {
+  await page.locator(".exav-viewer-layouts").getByRole("button", { name }).click();
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+}
+
+test.describe("clipping", () => {
+  // A viewport onto model x -10 to 30 of a text 5 high running from 0 to
+  // about 66: 30 of it shows, some 6 times its height, not 13.
+  test("text crossing a viewport's edge is cut at the edge", async ({ page }) => {
+    const canvas = await open(page, "cad-viewport_text.dxf");
+    await layout(page, "Sheet");
+    const box = find(await settled(canvas), ink).box!;
+    expect(box.width / box.height).toBeGreaterThan(4.5);
+    expect(box.width / box.height).toBeLessThan(7);
+  });
+});
+
+type Test = (r: number, g: number, b: number) => boolean;
+
+/** The pixels `test` accepts inside `box`, less `inset` on every side. */
+function countIn(p: Pixels, box: { minX: number; minY: number; maxX: number; maxY: number }, inset: number, test: Test): number {
+  let n = 0;
+  for (let y = box.minY + inset; y <= box.maxY - inset; y++)
+    for (let x = box.minX + inset; x <= box.maxX - inset; x++) {
+      const i = (y * p.width + x) * 4;
+      if (test(p.data[i]!, p.data[i + 1]!, p.data[i + 2]!)) n++;
+    }
+  return n;
+}
+
+const near = (v: number, to: number) => Math.abs(v - to) < 32;
+
+test.describe("transparency", () => {
+  // Each at half opacity: a red hatch over a green line, a blue V, a cyan
+  // hatch over magenta text, each drawn after what it covers.
+  test("an opaque line behind a translucent hatch shows through it", async ({ page }) => {
+    const p = await settled(await open(page, "cad-transparency.dxf"));
+    const pink = find(p, (r, g, b) => r > 220 && near(g, 128) && near(b, 128)).box!;
+    expect(countIn(p, pink, 2, (r, g, b) => near(r, 128) && near(g, 128) && b < 40)).toBeGreaterThan(0);
+    expect(countIn(p, pink, 2, (r, g, b) => g > 200 && r < 60 && b < 60)).toBe(0);
+  });
+
+  test("a translucent polyline is no darker where its segments meet", async ({ page }) => {
+    const p = await settled(await open(page, "cad-transparency.dxf"));
+    expect(find(p, (r, g, b) => near(r, 128) && near(g, 128) && b > 220).count).toBeGreaterThan(0);
+    expect(find(p, (r, g, b) => r < 90 && g < 90 && b > 200).count).toBe(0);
+  });
+
+  test("text behind a translucent hatch is tinted by it", async ({ page }) => {
+    const p = await settled(await open(page, "cad-transparency.dxf"));
+    const cyan = find(p, (r, g, b) => near(r, 128) && g > 220 && b > 220).box!;
+    expect(countIn(p, cyan, 2, (r, g, b) => near(r, 128) && near(g, 128) && b > 220)).toBeGreaterThan(0);
+    expect(countIn(p, cyan, 2, (r, g, b) => r > 200 && g < 60 && b > 200)).toBe(0);
+  });
+});
+
+test.describe("what is not drawn", () => {
+  test("is said by type, and the files the drawing points at by name", async ({ page }) => {
+    await open(page, "cad-not_drawn.dxf");
+    const warnings = page.locator(".demo-frame .exav-viewer-warnings");
+    await expect(warnings).toContainText("3 objects are of a kind not drawn here. 3DSOLID (2), REGION");
+    await expect(warnings).toContainText("3 external references are not drawn. photo.png, walls.dwg");
+  });
+
+  test("a drawing with nothing drawn here keeps the thumbnail it was saved with", async ({ page }) => {
+    await open(page, "cad-solid_only.dxf");
+    const preview = page.locator(".demo-frame .exav-viewer-cad-preview");
+    await expect(preview).toHaveCount(1);
+    expect(await preview.evaluate((img: HTMLImageElement) => [img.naturalWidth, img.naturalHeight])).toEqual([8, 8]);
+    await expect(page.locator(".demo-frame .exav-viewer-warnings")).toContainText("the picture saved with it is shown");
+  });
+});
+
+test.describe("antialiasing", () => {
+  // A thin dark line drawn before the wide red one it crosses in front of:
+  // its anti-aliased edges blend over the red, not over the paper.
+  test("a line's soft edge shows what lies behind it, not the background", async ({ page }) => {
+    const p = await settled(await open(page, "cad-halo.dxf"));
+    const band = find(p, (r, g, b) => r > 200 && g < 80 && b < 80).box!;
+    const grey = (r: number, g: number, b: number) =>
+      Math.max(r, g, b) - Math.min(r, g, b) < 30 && r > 70 && r < 235;
+    expect(countIn(p, band, 2, grey)).toBe(0);
+    // The dark line is there, across the band: red darkened by it.
+    expect(countIn(p, band, 2, (r, g, b) => r < 210 && g < 70 && b < 70)).toBeGreaterThan(0);
+  });
+
+  // Nothing but filled bands: ink and paper only, but where a pixel is part
+  // of each, which a slanted or curved edge has all along it.
+  test("a fill's edge is anti-aliased, and no wider for it", async ({ page }) => {
+    const p = await settled(await open(page, "cad-wide.dxf"));
+    const grey = (r: number, g: number, b: number) => r > 60 && r < 200 && Math.max(r, g, b) - Math.min(r, g, b) < 30;
+    const dark = (r: number, g: number, b: number) => r < 60 && g < 60 && b < 60;
+    expect(find(p, grey).count).toBeGreaterThan(60);
+    // Partly covered pixels outside the bands, at most half each: the ink
+    // stays where it was.
+    expect(find(p, grey).count).toBeLessThan(find(p, dark).count / 2);
+  });
+});
+
+test.describe("curves", () => {
+  // Zoomed thirtyfold onto a circle's rightmost point, its edge runs down
+  // the canvas: a true arc leaves the vertical by about six pixels by the
+  // canvas's top and bottom, the seventy-sided polygon it used to be by
+  // fifteen on at least one side. Deeper, the pixel the zoom anchors on
+  // sends the edge off the canvas.
+  test("a circle stays round however close the view", async ({ page }) => {
+    const canvas = await open(page, "cad-circle.dxf");
+    const fitted = await settled(canvas);
+    const ring = find(fitted, ink).box!;
+    const box = (await canvas.boundingBox())!;
+    const right = { x: ring.maxX, y: Math.round((ring.minY + ring.maxY) / 2) };
+    await page.mouse.move(box.x + right.x, box.y + right.y);
+    await page.mouse.wheel(0, -1100);
+    const p = await settled(canvas);
+    const inkAt = (y: number) => {
+      let x = -1;
+      for (let i = 0; i < p.width; i++) {
+        const o = (y * p.width + i) * 4;
+        if (ink(p.data[o]!, p.data[o + 1]!, p.data[o + 2]!)) x = i;
+      }
+      return x;
+    };
+    const middle = inkAt(right.y);
+    const top = inkAt(4);
+    const bottom = inkAt(p.height - 5);
+    expect(middle).toBeGreaterThan(0);
+    expect(top).toBeGreaterThan(0);
+    expect(bottom).toBeGreaterThan(0);
+    expect(middle - top).toBeLessThan(10);
+    expect(middle - bottom).toBeLessThan(10);
+  });
+});
+
+test.describe("colours", () => {
+  const brightYellow = (r: number, g: number, b: number) => r > 220 && g > 220 && b < 90;
+  const darkYellow = (r: number, g: number, b: number) => r > 110 && g > 110 && b < 60 && r < 200;
+  const cyan = (r: number, g: number, b: number) => r < 60 && g > 220 && b > 220;
+  const red = (r: number, g: number, b: number) => r > 200 && g < 60 && b < 60;
+
+  test("a yellow line on white is darkened to be seen; a fill keeps its colour", async ({ page }) => {
+    const p = await settled(await open(page, "cad-colours.dxf"));
+    expect(find(p, brightYellow).count).toBe(0);
+    expect(find(p, darkYellow).count).toBeGreaterThan(100);
+    expect(find(p, cyan).count).toBeGreaterThan(1000);
+  });
+
+  test("monochrome draws everything in ink", async ({ page }) => {
+    await openSample(page, "cad-colours.dxf", { mode: "page", cad: "monochrome" });
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    const p = await settled(page.locator(".demo-frame .exav-viewer-cad-canvas"));
+    expect(find(p, red).count + find(p, cyan).count + find(p, darkYellow).count).toBe(0);
+    expect(find(p, (r, g, b) => r < 40 && g < 40 && b < 40).count).toBeGreaterThan(1000);
+  });
+});
+
+test.describe("context", () => {
+  test("a lost GL context comes back with the drawing on it", async ({ page }) => {
+    const canvas = await open(page, "cad-halo.dxf");
+    const before = await settled(canvas);
+    await canvas.evaluate(async (c: HTMLCanvasElement) => {
+      const lose = c.getContext("webgl2")!.getExtension("WEBGL_lose_context")!;
+      lose.loseContext();
+      await new Promise((r) => setTimeout(r, 300));
+      lose.restoreContext();
+    });
+    await page.waitForTimeout(1500);
+    expect(difference(before, await settled(canvas))).toBeLessThan(1);
+  });
+});
+
+test.describe("text", () => {
+  // Twelve faces' worth of characters, more than the atlas budget affords
+  // at the em a close view wants: "HE" in the middle, zoomed into, keeps
+  // edges a pixel or two wide rather than the blur of a magnified bitmap.
+  test("a character set too large for the atlas stays sharp zoomed in", async ({ page }) => {
+    const canvas = await open(page, "cad-text_many.dxf");
+    const box = (await canvas.boundingBox())!;
+    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+    await page.mouse.wheel(0, -1400);
+    await page.waitForTimeout(1000);
+    const p = await settled(canvas);
+    const lum = (r: number, g: number, b: number) => (r + g + b) / 3;
+    const dark = find(p, (r, g, b) => lum(r, g, b) < 80).count;
+    const edge = find(p, (r, g, b) => lum(r, g, b) >= 80 && lum(r, g, b) < 200).count;
+    expect(dark).toBeGreaterThan(2000);
+    expect(edge / dark).toBeLessThan(0.15);
+  });
+
+  // A drawing of a house, zoomed into by ten: the glyph page for that view is
+  // made of distance fields, which take the better part of a second. Made a
+  // slice at a time, the page keeps answering while they are (the longest
+  // wait was 940 ms in one piece, 95 ms in slices, in software GL).
+  test("the glyph page made for a closer view does not stop the page", async ({ page }) => {
+    await page.goto("./?lang=en&mode=page");
+    await page.getByTestId("file-input").setInputFiles(HOUSE);
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    const canvas = page.locator(".demo-frame .exav-viewer-cad-canvas");
+    // What loading left to do is done.
+    await settled(canvas);
+    const box = (await canvas.boundingBox())!;
+    await page.mouse.move(box.x + box.width * 0.6, box.y + box.height * 0.45);
+    await page.evaluate(() => {
+      const w = window as unknown as { gaps: number[] };
+      w.gaps = [];
+      let last = performance.now();
+      setInterval(() => {
+        const now = performance.now();
+        w.gaps.push(now - last);
+        last = now;
+      }, 5);
+    });
+    await page.mouse.wheel(0, -1000);
+    await page.waitForTimeout(2500);
+    const gaps = await page.evaluate(() => (window as unknown as { gaps: number[] }).gaps);
+    expect(gaps.length).toBeGreaterThan(100);
+    expect(Math.max(...gaps)).toBeLessThan(300);
+  });
+});
+
+test.describe("paper", () => {
+  test("a layout is drawn on its sheet of paper, model space on the ground", async ({ page }) => {
+    const canvas = await open(page, "cad-sheets.dxf");
+    const surround = (r: number, g: number, b: number) => Math.abs(r - 224) < 8 && Math.abs(g - 224) < 8 && Math.abs(b - 224) < 8;
+    const white = (r: number, g: number, b: number) => r > 250 && g > 250 && b > 250;
+    expect(find(await settled(canvas), surround).count).toBe(0);
+    await layout(page, "Metric");
+    const p = await settled(canvas);
+    expect(find(p, surround).count).toBeGreaterThan(1000);
+    // A4 in landscape: the white sheet is 297 by 210.
+    const sheet = find(p, white).box!;
+    expect(sheet.width / sheet.height).toBeGreaterThan(1.37);
+    expect(sheet.width / sheet.height).toBeLessThan(1.46);
+  });
+});
+
+test.describe("sheets", () => {
+  // Each layout has a square an inch across and, below it, a line 2.11 mm
+  // wide: a twelfth of the square on either sheet, whatever its units.
+  for (const name of ["Metric", "Imperial"]) {
+    test(`a lineweight on a sheet in ${name.toLowerCase()} units is millimetres on the page`, async ({ page }) => {
+      const canvas = await open(page, "cad-sheets.dxf");
+      await layout(page, name);
+      const p = await settled(canvas);
+      // Rows with ink most of the way across: the square's two edges and the line.
+      const rows = bands(p, ink, 20);
+      expect(rows.length).toBe(3);
+      const [top, bottom, line] = rows as [{ from: number; to: number }, { from: number; to: number }, { from: number; to: number }];
+      const side = bottom.from - top.from;
+      const width = line.to - line.from + 1;
+      expect(width / side).toBeGreaterThan(0.05);
+      expect(width / side).toBeLessThan(0.13);
+    });
+  }
+});
+
+// A drawing shown with the files it refers to (cad-xref_*: the sheet refers to
+// title.dwg, which refers to part.dwg). The viewer's file input takes several
+// files at once, and a folder: they are one tree.
+test.describe("files that refer to others", () => {
+  const red = (r: number, g: number, b: number) => r > 215 && g < 140 && b < 140;
+  const green = (r: number, g: number, b: number) => g > 180 && r < 120 && b < 120;
+  const files = [
+    ["sheet.dxf", "cad-xref_sheet.dxf"],
+    ["title.dwg", "cad-xref_title.dxf"],
+    ["part.dwg", "cad-xref_part.dxf"],
+  ] as const;
+
+  for (const mode of ["page", "sandbox"] as const) {
+    // The drawing is in the frame in one mode and in the page in the other; the warnings are the page's in both.
+    const canvas = (page: Page) => (mode === "sandbox" ? page.frameLocator(".demo-frame iframe.exav-viewer-sandbox") : page.locator(".demo-frame")).locator(".exav-viewer-cad-canvas");
+    const warnings = (page: Page) => page.locator(".demo-frame .exav-viewer-warnings");
+    const start = async (page: Page, input: "file-input" | "folder-input", given: Parameters<Locator["setInputFiles"]>[0]) => {
+      await page.goto(`./?${new URLSearchParams({ lang: "en", ...(mode === "page" ? { mode } : {}) })}`);
+      await page.getByTestId(input).setInputFiles(given);
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    };
+    const picture = async (page: Page) => settled(canvas(page));
+
+    test(`in the ${mode}: the reference is drawn from the files given with it`, async ({ page }) => {
+      await start(page, "file-input", files.map(([name, from]) => ({ name, mimeType: "", buffer: sample(from) })));
+      const p = await picture(page);
+      expect(find(p, red).count, "the frame of title.dwg").toBeGreaterThan(20);
+      expect(find(p, green).count, "part.dwg, which title.dwg refers to").toBeGreaterThan(0);
+      await expect(warnings(page)).toHaveCount(0);
+    });
+
+    test(`in the ${mode}: alone, it says what it could not draw`, async ({ page }) => {
+      await start(page, "file-input", [{ name: "sheet.dxf", mimeType: "", buffer: sample("cad-xref_sheet.dxf") }]);
+      expect(find(await picture(page), red).count).toBe(0);
+      await expect(warnings(page)).toContainText("title.dwg");
+    });
+
+    test(`in the ${mode}: a reference not among the files is said, the others are drawn`, async ({ page }) => {
+      await start(page, "file-input", files.slice(0, 2).map(([name, from]) => ({ name, mimeType: "", buffer: sample(from) })));
+      expect(find(await picture(page), red).count).toBeGreaterThan(20);
+      await expect(warnings(page)).toContainText("part.dwg");
+    });
+
+    test(`in the ${mode}: it is found among the members of the archive the drawing is in`, async ({ page }) => {
+      await start(page, "file-input", [{ name: "project.zip", mimeType: "", buffer: sample("project.zip") }]);
+      await page.locator(".demo-frame").getByRole("button", { name: /sheet\.dxf/ }).click();
+      // The canvas is first made for the box beside the member list and then
+      // for the one without it: a shot is taken until it has the frame.
+      await expect(canvas(page)).toHaveCount(1);
+      await expect.poll(async () => find(await shot(canvas(page)), red).count).toBeGreaterThan(20);
+    });
+
+    test(`in the ${mode}: it is found in a folder, below the drawing's own`, async ({ page }, info) => {
+      const dir = info.outputPath("project");
+      for (const [name, from] of files) {
+        const at = path.join(dir, name === "sheet.dxf" ? "plans" : path.join("plans", "xrefs"), name);
+        fs.mkdirSync(path.dirname(at), { recursive: true });
+        fs.writeFileSync(at, sample(from));
+      }
+      await start(page, "folder-input", dir);
+      expect(find(await picture(page), red).count).toBeGreaterThan(20);
+    });
+  }
+});
diff --git a/crates/exav-viewer/e2e/converted.spec.ts b/crates/exav-viewer/e2e/converted.spec.ts
new file mode 100644
index 00000000..00f6bdc7
--- /dev/null
+++ b/crates/exav-viewer/e2e/converted.spec.ts
@@ -0,0 +1,134 @@
+// The converted Office formats of `@exav/viewer/office` (`rtf()`, `doc()`...)
+// with a real external converter, shown by the viewer's PDF and XLSX plugins,
+// in the page and in the sandboxed frame. The converter is a package that
+// exports the contract (see `ExternalConverter`) and carries its fixtures in
+// `tests/fixtures`: name it in EXAV_EXTERNAL_CONVERTER when you build the demo
+// (`EXAV_EXTERNAL_CONVERTER=<package> npm run demo:build`) and run these tests.
+// Skipped, saying why, when it is not set or the demo was built without it;
+// external.spec.ts checks the contract itself with a converter of its own.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type FrameLocator, type Locator, type Page } from "@playwright/test";
+
+import { failOnViolations, screenshotting } from "./csp.js";
+import { decodePng, find } from "./pixels.js";
+
+const CONVERTER = process.env.EXAV_EXTERNAL_CONVERTER;
+
+/** The converter's own fixtures: a short letter, a two-slide presentation, a two-page drawing, a small table, and Keynote, Numbers and CorelDRAW files. */
+const FIXTURES = CONVERTER ? path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "node_modules", ...CONVERTER.split("/"), "tests", "fixtures") : "";
+
+failOnViolations();
+
+test.beforeEach(async ({ page }) => {
+  test.skip(!CONVERTER, "no real external converter: set EXAV_EXTERNAL_CONVERTER to an installed converter package, and build the demo with it");
+  await page.goto("./?lang=en");
+  const manifest = await page.evaluate(() => fetch("./exav-viewer/manifest.json").then((r) => r.json()));
+  test.skip(!manifest.converters?.[CONVERTER!], `the demo was built without ${CONVERTER}: build it with EXAV_EXTERNAL_CONVERTER=${CONVERTER}`);
+});
+
+const ink = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+
+for (const mode of ["sandbox", "page"] as const) {
+  async function open(page: Page, name: string, as = name, params: Record<string, string> = {}) {
+    await page.goto(`./?${new URLSearchParams({ lang: "en", ...params, ...(mode === "page" && { mode }) })}`);
+    await page.getByTestId("file-input").setInputFiles({ name: as, mimeType: "", buffer: fs.readFileSync(path.join(FIXTURES, name)) });
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready", { timeout: 60_000 });
+  }
+
+  /** Dark pixels on the surface: the document is drawn, not a blank page. */
+  const drawn = async (page: Page) => {
+    screenshotting(page);
+    return find(decodePng(await page.locator(".demo-frame .exav-viewer-surface").screenshot()), ink).count;
+  };
+
+  /** What the engine put on screen: in the frame's document, or in the page's. */
+  const engine = (page: Page): FrameLocator | Locator =>
+    mode === "sandbox" ? page.frameLocator(".demo-frame iframe.exav-viewer-sandbox") : page.locator(".demo-frame");
+
+  test.describe(mode, () => {
+    test("a Word 97 document is converted to PDF and shown page by page", async ({ page }) => {
+      await open(page, "sample.doc");
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(2);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("a conversion shows its steps, with a bar for those it counts", async ({ page }) => {
+      await page.goto(`./?${new URLSearchParams({ lang: "en", ...(mode === "page" && { mode }) })}`);
+      // Every message the status overlay shows, and whether a bar came with it.
+      await page.evaluate(() => {
+        const seen = new Set<string>();
+        (window as unknown as { steps: Set<string> }).steps = seen;
+        new MutationObserver(() => {
+          const status = document.querySelector(".demo-frame .exav-viewer-status");
+          const text = status?.querySelector("p")?.textContent;
+          if (text) seen.add(`${text}${status!.querySelector('[role="progressbar"]') ? " [bar]" : ""}`);
+        }).observe(document.body, { subtree: true, childList: true, characterData: true, attributes: true });
+      });
+      await page.getByTestId("file-input").setInputFiles({ name: "sample.doc", mimeType: "", buffer: fs.readFileSync(path.join(FIXTURES, "sample.doc")) });
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready", { timeout: 60_000 });
+      const steps = await page.evaluate(() => [...(window as unknown as { steps: Set<string> }).steps]);
+      expect(steps).toContain("Downloading the viewer… [bar]");
+      expect(steps).toContain("Starting the viewer…");
+      expect(steps).toContain("Converting the document… [bar]");
+    });
+
+    test("an RTF saved under .doc is read as the RTF it is", async ({ page }) => {
+      await open(page, "sample.rtf", "letter.doc");
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(2);
+    });
+
+    test("an OpenDocument presentation is converted by exav-render's slides and shown as slides", async ({ page }) => {
+      await open(page, "sample.odp");
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(0);
+      await expect(engine(page).locator("canvas").first()).toBeVisible();
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("a Keynote 1 presentation is converted by exav-render's slides and shown as slides, not as PDF", async ({ page }) => {
+      await open(page, "keynote1.key");
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(0);
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 1 / 2");
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("an OpenDocument drawing is converted by exav-render's slides, a page to a slide, not to PDF", async ({ page }) => {
+      await open(page, "sample.odg");
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(0);
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 1 / 2");
+      await expect.poll(() => drawn(page)).toBeGreaterThan(50);
+    });
+
+    test("an OpenDocument drawing is converted to PDF, a page per page, when the external converter is asked for", async ({ page }) => {
+      await open(page, "sample.odg", "sample.odg", { converter: "external" });
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(2);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(50);
+    });
+
+    test("a CorelDRAW drawing is converted to PDF", async ({ page }) => {
+      await open(page, "corel.cdr");
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(1);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("a Numbers spreadsheet is converted to XLSX and shown as a workbook", async ({ page }) => {
+      await open(page, "sample.numbers");
+      await expect(engine(page).locator("canvas").first()).toBeVisible();
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("an Excel 97 workbook is converted to XLSX and shown as a workbook", async ({ page }) => {
+      await open(page, "sample.xls");
+      await expect(engine(page).locator("canvas").first()).toBeVisible();
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(0);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("an XLSX named .xls is shown as it is", async ({ page }) => {
+      await open(page, "sample.xlsx", "renamed.xls");
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+  });
+}
diff --git a/crates/exav-viewer/e2e/csp.ts b/crates/exav-viewer/e2e/csp.ts
index 688b3968..b68dba7e 100644
--- a/crates/exav-viewer/e2e/csp.ts
+++ b/crates/exav-viewer/e2e/csp.ts
@@ -6,12 +6,25 @@
 import { expect, test, type Page } from "@playwright/test";
 
 const seen = new WeakMap<Page, string[]>();
+const screenshots = new WeakMap<Page, number>();
 
 /** The violations reported so far on `page`. */
 export function violations(page: Page): string[] {
   return seen.get(page) ?? [];
 }
 
+/**
+ * Says a screenshot of `page` is taken. In WebKit, Playwright adds a
+ * `<style>` to every frame and removes it first, to sync animations
+ * (`shouldToggleStyleSheetToSyncAnimations`, screenshotter.ts), whatever the
+ * options: a sandboxed frame's policy refuses it, twice a screenshot.
+ */
+export function screenshotting(page: Page): void {
+  screenshots.set(page, (screenshots.get(page) ?? 0) + 1);
+}
+
+const SCREENSHOT_STYLE = /\/frame\/index\.html: style-src-elem inline$/;
+
 /** Installs the collection before each test and fails the test on any violation. */
 export function failOnViolations(): void {
   test.beforeEach(async ({ page }) => {
@@ -25,7 +38,8 @@ export function failOnViolations(): void {
       });
     });
   });
-  test.afterEach(async ({ page }) => {
-    expect(violations(page)).toEqual([]);
+  test.afterEach(async ({ page, browserName }) => {
+    let allowed = browserName === "webkit" ? 2 * (screenshots.get(page) ?? 0) : 0;
+    expect(violations(page).filter((v) => !(allowed > 0 && SCREENSHOT_STYLE.test(v) && allowed--))).toEqual([]);
   });
 }
diff --git a/crates/exav-viewer/e2e/delivery-setup.ts b/crates/exav-viewer/e2e/delivery-setup.ts
index 385ffe37..78887666 100644
--- a/crates/exav-viewer/e2e/delivery-setup.ts
+++ b/crates/exav-viewer/e2e/delivery-setup.ts
@@ -139,6 +139,8 @@ export default async function setup(): Promise<void> {
   fs.writeFileSync(path.join(OUT, "big.pdf"), bigPdf());
   fs.writeFileSync(path.join(OUT, "big.zip"), bigZip());
   fs.writeFileSync(path.join(OUT, "spaced.zip"), spacedZip());
+  // The external converter of external.spec.ts, served at /e2e/fake-converter.js.
+  fs.copyFileSync(path.join(here, "fixtures", "fake-converter.js"), path.join(OUT, "fake-converter.js"));
   // Recorded in real time: kept once made (delete e2e/.out/ to remake it).
   const clip = path.join(OUT, "clip.webm");
   if (!fs.existsSync(clip)) await recordClip(clip);
diff --git a/crates/exav-viewer/e2e/delivery.spec.ts b/crates/exav-viewer/e2e/delivery.spec.ts
index e176a910..c8a6a3dc 100644
--- a/crates/exav-viewer/e2e/delivery.spec.ts
+++ b/crates/exav-viewer/e2e/delivery.spec.ts
@@ -54,21 +54,21 @@ const total = (seen: Fetched[]) => seen.reduce((n, f) => n + f.length, 0);
 
 async function open(page: Page, query: string, phase = "ready"): Promise<void> {
   await page.goto(`./?lang=en&${query}`);
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", phase);
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", phase);
 }
 
 async function inside(page: Page): Promise<Frame> {
-  const frame = await (await page.locator(".demo-frame iframe.exv-sandbox").elementHandle())!.contentFrame();
+  const frame = await (await page.locator(".demo-frame iframe.exav-viewer-sandbox").elementHandle())!.contentFrame();
   if (!frame) throw new Error("no frame");
   return frame;
 }
 
 /** The first page's bitmap, once pdf.js has drawn into it (300 x 150 is a new canvas's size). */
 async function firstPageDrawn(page: Page): Promise<void> {
-  const frame = page.frameLocator(".demo-frame iframe.exv-sandbox");
-  const canvas = frame.locator(".exv-pdf-bitmap").first();
+  const frame = page.frameLocator(".demo-frame iframe.exav-viewer-sandbox");
+  const canvas = frame.locator(".exav-viewer-pdf-bitmap").first();
   await expect.poll(() => canvas.evaluate((c: HTMLCanvasElement) => `${c.width}x${c.height}`)).not.toBe("300x150");
-  await expect(frame.locator(".exv-pdf-page")).toHaveCount(PDF_PAGES);
+  await expect(frame.locator(".exav-viewer-pdf-page")).toHaveCount(PDF_PAGES);
 }
 
 test.describe("media by URL", () => {
@@ -76,7 +76,7 @@ test.describe("media by URL", () => {
 
   /** Plays, then seeks near the end and plays on. */
   async function playAndSeek(frame: Frame): Promise<void> {
-    const video = frame.locator(".exv-media video");
+    const video = frame.locator(".exav-viewer-media video");
     await expect.poll(() => video.evaluate((v: HTMLVideoElement) => v.readyState)).toBeGreaterThanOrEqual(1);
     const duration = await video.evaluate((v: HTMLVideoElement) => v.duration);
     expect(duration).toBeGreaterThan(8);
@@ -106,7 +106,7 @@ test.describe("media by URL", () => {
     await open(page, "url=/e2e/paced/clip.webm");
     const frame = await inside(page);
     test.skip(!(await playable(frame)), "this browser plays no VP8");
-    expect(await frame.locator(".exv-media video").evaluate((v: HTMLVideoElement) => v.src)).toBe(new URL("/e2e/paced/clip.webm", page.url()).href);
+    expect(await frame.locator(".exav-viewer-media video").evaluate((v: HTMLVideoElement) => v.src)).toBe(new URL("/e2e/paced/clip.webm", page.url()).href);
     await playAndSeek(frame);
     expect(seen.length).toBeGreaterThan(0);
     for (const f of seen) {
@@ -126,7 +126,7 @@ test.describe("media by URL", () => {
     await open(page, "url=/e2e/clip.webm&delivery=media:blob");
     const frame = await inside(page);
     test.skip(!(await playable(frame)), "this browser plays no VP8");
-    expect(await frame.locator(".exv-media video").evaluate((v: HTMLVideoElement) => v.src)).toMatch(/^blob:/);
+    expect(await frame.locator(".exav-viewer-media video").evaluate((v: HTMLVideoElement) => v.src)).toMatch(/^blob:/);
     await playAndSeek(frame);
     expect(seen.map((f) => [f.byFrame, f.status])).toEqual([[false, 200]]);
     expect(total(seen)).toBe(size("clip.webm"));
@@ -137,7 +137,7 @@ test.describe("media by URL", () => {
     const asked: string[] = [];
     page.on("request", (r) => r.url().startsWith(other) && asked.push(r.url()));
     await open(page, `url=${other}/e2e/clip.webm&delivery=media:url`, "error");
-    await expect(page.locator(".demo-frame iframe.exv-sandbox")).toHaveCount(0);
+    await expect(page.locator(".demo-frame iframe.exav-viewer-sandbox")).toHaveCount(0);
     expect(asked).toEqual([]);
 
     // Given to an element in the frame all the same, it is not fetched.
@@ -159,12 +159,12 @@ test.describe("media by URL", () => {
     const seen = record(page, "/e2e/samples/landscape.png");
     await open(page, "url=/e2e/samples/landscape.png");
     const frame = await inside(page);
-    const img = frame.locator(".exv-image-picture");
+    const img = frame.locator(".exav-viewer-image-picture");
     expect(await img.evaluate((i: HTMLImageElement) => [i.src, i.crossOrigin, i.naturalWidth > 0])).toEqual([new URL("/e2e/samples/landscape.png", page.url()).href, null, true]);
     expect(seen.map((f) => f.byFrame)).toEqual([true]);
     // Drawn into a canvas, it taints it: nothing in the frame reads its pixels.
     const read = await frame.evaluate(() => {
-      const i = document.querySelector<HTMLImageElement>(".exv-image-picture")!;
+      const i = document.querySelector<HTMLImageElement>(".exav-viewer-image-picture")!;
       const c = document.createElement("canvas");
       c.width = c.height = 4;
       const ctx = c.getContext("2d")!;
@@ -180,7 +180,7 @@ test.describe("media by URL", () => {
     // The surface zooms it as any picture.
     const scale = () => img.evaluate((i) => getComputedStyle(i.parentElement!).transform);
     const before = await scale();
-    const box = (await page.locator(".demo-frame iframe.exv-sandbox").boundingBox())!;
+    const box = (await page.locator(".demo-frame iframe.exav-viewer-sandbox").boundingBox())!;
     await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
     await page.mouse.wheel(0, -300);
     await expect.poll(scale).not.toBe(before);
@@ -207,7 +207,7 @@ test.describe("PDF", () => {
     expect(seen.map((f) => [f.byFrame, f.status])).toEqual([[false, 200]]);
     expect(total(seen)).toBe(size("big.pdf"));
     expect(warned.some((w) => w.includes("does not answer range requests"))).toBe(true);
-    await expect(page.locator(".demo-frame .exv-warnings")).toHaveText("The server does not send parts of the file: all of it was downloaded.");
+    await expect(page.locator(".demo-frame .exav-viewer-warnings")).toHaveText("The server does not send parts of the file: all of it was downloaded.");
   });
 
   test('by "url": pdf.js in the frame fetches it from the connect origin', async ({ page }) => {
@@ -269,7 +269,8 @@ test.describe("PDF", () => {
             out[m.id] = m.data ? `${m.data.byteLength} bytes` : m.error!;
             if (Object.keys(out).length === 6) setTimeout(() => resolve(out), 300);
           });
-          for (const [id, offset, length] of reads) port.postMessage({ type: "read", id, offset, length });
+          // Generation 0 is the first document the frame was opened with.
+          for (const [id, offset, length] of reads) port.postMessage({ type: "read", id, generation: 0, offset, length });
         }),
       [file],
     );
@@ -283,15 +284,15 @@ test.describe("archives", () => {
     const seen = record(page, "/e2e/big.zip");
     await open(page, "url=/e2e/big.zip");
     const body = page.locator(".demo-frame");
-    await expect(body.locator(".exv-archive-head")).toHaveText("16 files");
+    await expect(body.locator(".exav-viewer-archive-head")).toHaveText("16 files");
     expect(seen.every((f) => !f.byFrame && f.status === 206)).toBe(true);
     // Its start, its end, the 64 KiB block of each member's local header.
     expect(total(seen)).toBeLessThan(size("big.zip") * 0.1);
     await body.getByRole("button", { name: new RegExp(ZIP_PICTURE.replace(".", "\\.")) }).click();
-    await expect(page.locator(".demo-frame .exv-body").last()).toHaveAttribute("data-phase", "ready");
-    await expect(page.frameLocator(".demo-frame iframe.exv-sandbox").locator(".exv-image-picture")).toHaveCount(1);
+    await expect(page.locator(".demo-frame .exav-viewer-body").last()).toHaveAttribute("data-phase", "ready");
+    await expect(page.frameLocator(".demo-frame iframe.exav-viewer-sandbox").locator(".exav-viewer-image-picture")).toHaveCount(1);
     expect(total(seen)).toBeLessThan(size("big.zip") * 0.2);
-    await expect(page.locator(".demo-frame .exv-warnings")).toHaveCount(0);
+    await expect(page.locator(".demo-frame .exav-viewer-warnings")).toHaveCount(0);
   });
 
   test("a ZIP the ranged reader cannot list is read whole instead, and listed", async ({ page }) => {
@@ -299,7 +300,7 @@ test.describe("archives", () => {
     page.on("console", (m) => m.type() === "warning" && warned.push(m.text()));
     const seen = record(page, "/e2e/spaced.zip");
     await open(page, "url=/e2e/spaced.zip");
-    await expect(page.locator(".demo-frame .exv-archive-head")).toHaveText(`${SPACED_MEMBERS} files`);
+    await expect(page.locator(".demo-frame .exav-viewer-archive-head")).toHaveText(`${SPACED_MEMBERS} files`);
     expect(warned.some((w) => w.includes("could not be read by ranges"))).toBe(true);
     // Still read by the host, by ranges: the server answers them. All of it, this time.
     expect(seen.every((f) => !f.byFrame && f.status === 206)).toBe(true);
diff --git a/crates/exav-viewer/e2e/demo.spec.ts b/crates/exav-viewer/e2e/demo.spec.ts
index 34f78505..1e73ccc7 100644
--- a/crates/exav-viewer/e2e/demo.spec.ts
+++ b/crates/exav-viewer/e2e/demo.spec.ts
@@ -16,7 +16,10 @@ import { expect, test, type FrameLocator, type Locator, type Page } from "@playw
 import { failOnViolations } from "./csp.js";
 import { bands, decodePng, difference, find, type Pixels } from "./pixels.js";
 import { openSample, pick, sample } from "./samples.js";
-import { storedZip, tar } from "./zip.js";
+import { ar, cpio, storedZip, tar } from "./zip.js";
+
+/** exav-unpack's fixtures: real files of the formats the archive plugin opens, made by their own tools. */
+const UNPACK_FIXTURES = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-unpack", "tests", "fixtures");
 
 /** The requests a page made, by URL. */
 function recordRequests(page: Page): string[] {
@@ -27,12 +30,12 @@ function recordRequests(page: Page): string[] {
 
 /**
  * Runs `read` with the zoom buttons hidden: they sit over a corner of the
- * surface, which is not what the pixels are read for. Hidden through the
- * element's style, which the frame's policy has no say over (a `style` given to
- * the screenshot is an inline sheet it refuses).
+ * surface, which is not what the pixels are read for.
+ * Hidden through the element's style, which the frame's policy has no say over
+ * (a `style` given to the screenshot is an inline sheet it refuses).
  */
 async function withoutTools<T>(page: Page, read: () => Promise<T>): Promise<T> {
-  const set = (value: string) => page.locator(".exv-tools").evaluateAll((els, v) => els.forEach((e) => ((e as HTMLElement).style.visibility = v)), value);
+  const set = (value: string) => page.locator(".exav-viewer-tools").evaluateAll((els, v) => els.forEach((e) => ((e as HTMLElement).style.visibility = v)), value);
   await set("hidden");
   try {
     return await read();
@@ -68,18 +71,18 @@ for (const mode of ["sandbox", "page"] as const) {
 
   async function open(page: Page, name: string, lang = "en") {
     await openSample(page, name, { lang, ...(mode === "page" && { mode }) });
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
   }
 
   /** What the engine put on screen: in the frame's document, or in the page's. */
   const engine = (page: Page, within = ".demo-frame"): FrameLocator | Locator =>
-    mode === "sandbox" ? page.frameLocator(`${within} iframe.exv-sandbox`) : page.locator(within);
+    mode === "sandbox" ? page.frameLocator(`${within} iframe.exav-viewer-sandbox`) : page.locator(within);
 
   test.describe(mode, () => {
     test.describe("drawings", () => {
       test("a DWG plan is drawn whole, in its proportions, beside its rails", async ({ page }) => {
         await open(page, "plan.dwg");
-        const canvas = engine(page).locator(".exv-cad-canvas");
+        const canvas = engine(page).locator(".exav-viewer-cad-canvas");
         const p = await settled(canvas);
         // The outer walls are a 12 m by 8 m rectangle, black on the light ground:
         // the dark pixels' box is that rectangle.
@@ -95,9 +98,9 @@ for (const mode of ["sandbox", "page"] as const) {
 
       test("the layer rail lists the file's layer table, and a layer turned off is not drawn", async ({ page }) => {
         await open(page, "plan.dwg");
-        const rows = page.locator(".exv-layer");
+        const rows = page.locator(".exav-viewer-layer");
         await expect(rows).toHaveText(["0", "WALLS", "DOORS", "FURNITURE", "TEXT", "COLUMNS"]);
-        const canvas = engine(page).locator(".exv-cad-canvas");
+        const canvas = engine(page).locator(".exav-viewer-cad-canvas");
         // FURNITURE is colour 4, cyan, and the only cyan in the plan.
         expect(find(await settled(canvas), cyan).count).toBeGreaterThan(200);
         await rows.filter({ hasText: "FURNITURE" }).getByRole("checkbox").uncheck();
@@ -108,9 +111,9 @@ for (const mode of ["sandbox", "page"] as const) {
 
       test("the DXF the DWG plan was converted from draws the same picture", async ({ page }) => {
         await open(page, "plan.dwg");
-        const fromDwg = await settled(engine(page).locator(".exv-cad-canvas"));
+        const fromDwg = await settled(engine(page).locator(".exav-viewer-cad-canvas"));
         await open(page, "plan.dxf");
-        const fromDxf = await settled(engine(page).locator(".exv-cad-canvas"));
+        const fromDxf = await settled(engine(page).locator(".exav-viewer-cad-canvas"));
         expect(find(fromDxf, dark).box).toEqual(find(fromDwg, dark).box);
         expect(difference(fromDwg, fromDxf)).toBeLessThan(1);
       });
@@ -123,7 +126,7 @@ for (const mode of ["sandbox", "page"] as const) {
           const log: { event: string; at: number; width?: number; height?: number }[] = [];
           (window as unknown as { thumbnailLog: typeof log }).thumbnailLog = log;
           const at = () => performance.timeOrigin + performance.now();
-          const thumbnail = (n: Node): n is HTMLImageElement => n instanceof HTMLImageElement && n.classList.contains("exv-cad-preview");
+          const thumbnail = (n: Node): n is HTMLImageElement => n instanceof HTMLImageElement && n.classList.contains("exav-viewer-cad-preview");
           new MutationObserver((records) => {
             for (const r of records) {
               if (r.type === "attributes" && r.target instanceof Element && r.target.getAttribute("data-phase") === "ready") log.push({ event: "ready", at: at() });
@@ -141,16 +144,16 @@ for (const mode of ["sandbox", "page"] as const) {
         const dwg = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-unpack", "tests", "fixtures", "dwg", "preview", "R2018.dwg.gz");
         await page.goto(`./?lang=en${query}`);
         await page.getByTestId("file-input").setInputFiles({ name: "thumbnail.dwg", mimeType: "", buffer: zlib.gunzipSync(fs.readFileSync(dwg)) });
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
         await expect.poll(async () => (await logs()).map((e) => e.event)).toEqual(["shown", "gone", "ready"]);
         const [shown] = await logs();
         expect([shown!.width, shown!.height]).toEqual([4, 2]);
-        await expect(engine(page).locator(".exv-cad-preview")).toHaveCount(0);
+        await expect(engine(page).locator(".exav-viewer-cad-preview")).toHaveCount(0);
         // A drawing saved without one shows none (in sandbox mode, in a frame
         // of its own).
         const before = Date.now();
         await pick(page, "plan.dwg");
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
         await expect.poll(async () => (await logs()).filter((e) => e.event === "ready").length).toBe(2);
         expect((await logs()).filter((e) => e.event === "shown" && e.at > before)).toHaveLength(0);
       });
@@ -161,25 +164,25 @@ for (const mode of ["sandbox", "page"] as const) {
         const dwg = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "cad", "proxy", "dwg", "R2018", "proxy.dwg.gz");
         await page.goto(`./?lang=en${query}`);
         await page.getByTestId("file-input").setInputFiles({ name: "proxy.dwg", mimeType: "", buffer: zlib.gunzipSync(fs.readFileSync(dwg)) });
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-        await expect(page.locator(".exv-warnings")).toHaveText(
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".exav-viewer-warnings")).toHaveText(
           "2 custom objects were saved without their graphics: only the application that made them can show them.",
         );
-        expect(find(await settled(engine(page).locator(".exv-cad-canvas")), ink).count).toBeGreaterThan(100);
+        expect(find(await settled(engine(page).locator(".exav-viewer-cad-canvas")), ink).count).toBeGreaterThan(100);
         // The notice covers a corner of the drawing: it can be put away.
-        await page.getByRole("button", { name: "Close" }).and(page.locator(".exv-warnings button")).click();
-        await expect(page.locator(".exv-warnings")).toHaveCount(0);
+        await page.getByRole("button", { name: "Close" }).and(page.locator(".exav-viewer-warnings button")).click();
+        await expect(page.locator(".exav-viewer-warnings")).toHaveCount(0);
       });
 
       test("a truncated drawing is an error the page survives", async ({ page }) => {
         await page.goto(`./?lang=en${query}`);
         await page.getByTestId("file-input").setInputFiles({ name: "broken.dwg", mimeType: "", buffer: sample("plan.dwg").subarray(0, 3000) });
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "error");
-        await expect(page.locator(".exv-status-error")).toHaveText("The drawing could not be shown.");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "error");
+        await expect(page.locator(".exav-viewer-status-error")).toHaveText("The drawing could not be shown.");
         // The next drawing opens.
         await pick(page, "plan.dwg");
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-        await expect(page.locator(".exv-layer")).toHaveCount(6);
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".exav-viewer-layer")).toHaveCount(6);
       });
 
       test("a drawing older than R13 says so instead of failing to draw", async ({ page }) => {
@@ -188,21 +191,21 @@ for (const mode of ["sandbox", "page"] as const) {
         const dwg = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-unpack", "tests", "fixtures", "dwg", "pre-r13", "R12.dwg.gz");
         await page.goto(`./?lang=en${query}`);
         await page.getByTestId("file-input").setInputFiles({ name: "r12.dwg", mimeType: "", buffer: zlib.gunzipSync(fs.readFileSync(dwg)) });
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "error");
-        await expect(page.locator(".exv-status-error")).toHaveText(
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "error");
+        await expect(page.locator(".exav-viewer-status-error")).toHaveText(
           "This drawing is saved in a format older than AutoCAD R13, which cannot be shown here.",
         );
         // The next drawing opens.
         await pick(page, "plan.dwg");
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
       });
 
       test("switching the ground keeps the view the user zoomed to", async ({ page }) => {
         await open(page, "plan.dwg");
         // The column alone, found as whatever differs from the ground.
         await page.getByRole("button", { name: "None" }).click();
-        await page.locator(".exv-layer", { hasText: "COLUMNS" }).getByRole("checkbox").check();
-        const canvas = engine(page).locator(".exv-cad-canvas");
+        await page.locator(".exav-viewer-layer", { hasText: "COLUMNS" }).getByRole("checkbox").check();
+        const canvas = engine(page).locator(".exav-viewer-cad-canvas");
         /** The column's box, and the ground's brightness. */
         const look = async () => {
           // Inside the canvas's edge, which the frame's border reaches.
@@ -243,31 +246,30 @@ for (const mode of ["sandbox", "page"] as const) {
     });
 
     test.describe("images", () => {
-      test("the same picture given again replaces the one shown, in the page at the zoom it was at, and the frame starts over", async ({ page }) => {
+      test("the same picture given again replaces the one shown, at the zoom it was at, in the page and in the frame", async ({ page }) => {
         await open(page, "landscape.png");
-        const tools = page.locator(".demo-frame .exv-tools");
-        const stage = engine(page).locator(".exv-image-stage");
-        await settled(page.locator(".demo-frame .exv-surface"));
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
+        const stage = engine(page).locator(".exav-viewer-image-stage");
+        await settled(page.locator(".demo-frame .exav-viewer-surface"));
         for (let i = 0; i < 2; i++) await tools.getByRole("button", { name: "Zoom in" }).click();
         // Both clicks applied: the second reaches the surface a frame after the
         // first, and a read between them saw one step (`scale(1.25)`) on CI.
         await expect.poll(() => stage.evaluate((el) => el.style.transform)).toMatch(/scale\(1\.56/);
         const zoomed = await stage.evaluate((el) => el.style.transform);
-        const picture = engine(page).locator(".exv-image-picture");
+        const picture = engine(page).locator(".exav-viewer-image-picture");
         const before = await picture.evaluate((el) => (el as HTMLImageElement).src);
         // The file again, as the user gives it: another object, the same name.
         await pick(page, "landscape.png");
         await expect.poll(async () => picture.evaluate((el) => (el as HTMLImageElement).src)).not.toBe(before);
-        await settled(page.locator(".demo-frame .exv-surface"));
+        await settled(page.locator(".demo-frame .exav-viewer-surface"));
         const now = await stage.evaluate((el) => el.style.transform);
-        if (mode === "page") expect(now).toBe(zoomed);
-        else expect(now).toMatch(/scale\(1\)/);
+        expect(now).toBe(zoomed);
       });
 
       test("a TIFF, decoded in WebAssembly, looks as the same picture as a PNG the browser decodes", async ({ page }) => {
         const requests = recordRequests(page);
         await open(page, "landscape.png");
-        const surface = page.locator(".demo-frame .exv-surface");
+        const surface = page.locator(".demo-frame .exav-viewer-surface");
         const png = await settled(surface);
         expect(requests.some((u) => u.includes("exav_viewer_image"))).toBe(false);
         await open(page, "landscape.tif");
@@ -278,19 +280,20 @@ for (const mode of ["sandbox", "page"] as const) {
         expect(find(tif, (r, g, b) => r > 235 && g > 185 && g < 215 && b < 100).count).toBeGreaterThan(1000);
       });
 
-      test("JPEG 2000 and JBIG2 files, decoded in WebAssembly, look as the PNGs they were encoded from", async ({ page }) => {
-        // exav-render's fixtures, encoded losslessly by opj_compress and jbig2enc
-        // (crates/exav-render/tests/fixtures/images/make.py).
+      test("JPEG 2000, JBIG2 and JPEG XL files, decoded in WebAssembly, look as the PNGs they were encoded from", async ({ page }) => {
+        // exav-render's fixtures, encoded losslessly by opj_compress, jbig2enc
+        // and cjxl (crates/exav-render/tests/fixtures/images/make.py; the
+        // JPEG XL ones with `cjxl x.png x.jxl -d 0 -e 7`).
         const fixtures = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "images");
-        const surface = page.locator(".demo-frame .exv-surface");
+        const surface = page.locator(".demo-frame .exav-viewer-surface");
         const show = async (name: string) => {
           await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: fs.readFileSync(path.join(fixtures, name)) });
-          await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+          await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
           return settled(surface);
         };
         await page.goto(`./?lang=en${query}`);
         for (const [png, others] of [
-          ["rgb.png", ["rgb.jp2", "rgb.j2k"]],
+          ["rgb.png", ["rgb.jp2", "rgb.j2k", "rgb.jxl"]],
           ["bilevel.png", ["generic.jb2"]],
         ] as const) {
           const want = await show(png);
@@ -302,17 +305,23 @@ for (const mode of ["sandbox", "page"] as const) {
     test.describe("documents", () => {
       test("a PDF zoomed with the buttons is moved by dragging the page, and selects text once the toggle says so", async ({ page }) => {
         await open(page, "report.pdf");
-        const tools = page.locator(".demo-frame .exv-tools");
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
         const hand = tools.getByRole("button", { name: "Move the page" });
         const text = tools.getByRole("button", { name: "Select text" });
-        const scroller = engine(page).locator(".exv-pdf-scroller");
+        const scroller = engine(page).locator(".exav-viewer-pdf-scroller");
         const position = () => scroller.evaluate((el) => [el.scrollLeft, el.scrollTop]);
         const selection = () => scroller.evaluate((el) => el.ownerDocument.getSelection()?.toString() ?? "");
         // The page fits: nothing to choose, and the zoom buttons are there.
         await expect(tools.getByRole("button", { name: "Zoom in" })).toBeVisible();
         await expect(hand).toHaveCount(0);
-        await expect(tools.getByRole("button", { name: "Zoom out" })).toBeDisabled();
+        await expect(tools.getByRole("button", { name: "Zoom out" })).toBeEnabled();
+        await expect(tools.getByRole("button", { name: "Fit to the window" })).toHaveCount(0);
+        const zoomInAt = async () => (await tools.getByRole("button", { name: "Zoom in" }).boundingBox())!.x;
+        const stable = await zoomInAt();
         for (let i = 0; i < 3; i++) await tools.getByRole("button", { name: "Zoom in" }).click();
+        await expect(tools.getByRole("button", { name: "Fit to the window" })).toBeVisible();
+        // The fit button came in on the left: the others did not move.
+        expect(await zoomInAt()).toBe(stable);
         await expect(hand).toBeVisible();
         await expect(hand).toHaveAttribute("aria-pressed", "true");
         await expect(tools.getByRole("button", { name: "Zoom out" })).toBeEnabled();
@@ -331,7 +340,7 @@ for (const mode of ["sandbox", "page"] as const) {
         // Chosen to select, the same drag, across the first line, selects it and moves nothing.
         await text.click();
         await expect(text).toHaveAttribute("aria-pressed", "true");
-        const run = engine(page).locator(".exv-pdf-text span", { hasText: "The north facade" });
+        const run = engine(page).locator(".exav-viewer-pdf-text span", { hasText: "The north facade" });
         await run.scrollIntoViewIfNeeded();
         const a = (await run.boundingBox())!;
         const held = await position();
@@ -349,11 +358,67 @@ for (const mode of ["sandbox", "page"] as const) {
         await expect(hand).toHaveCount(0);
       });
 
-      test("the same file given again replaces the document: in the page a zoomed PDF keeps its zoom and place, and the frame starts over", async ({ page }) => {
+      test("a PDF zooms out past the width to a whole page, where there is nothing to pan, and back", async ({ page }) => {
         await open(page, "report.pdf");
-        const tools = page.locator(".demo-frame .exv-tools");
-        const pages = engine(page).locator(".exv-pdf-page");
-        const scroller = engine(page).locator(".exv-pdf-scroller");
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
+        const scroller = engine(page).locator(".exav-viewer-pdf-scroller");
+        const pageBox = engine(page).locator(".exav-viewer-pdf-page").first();
+        const zoomOut = tools.getByRole("button", { name: "Zoom out" });
+        const fitted = (await pageBox.boundingBox())!;
+        const view = (await scroller.boundingBox())!;
+        // The page at the width is taller than the viewer.
+        expect(fitted.height).toBeGreaterThan(view.height);
+        for (let i = 0; i < 4; i++) await zoomOut.click();
+        await expect.poll(async () => (await pageBox.boundingBox())!.height).toBeLessThan(view.height);
+        const small = (await pageBox.boundingBox())!;
+        // Centred, in a viewer wider than it is.
+        expect(Math.abs(small.x + small.width / 2 - (view.x + view.width / 2))).toBeLessThan(12);
+        await expect(tools.getByRole("button", { name: "Move the page" })).toHaveCount(0);
+        await tools.getByRole("button", { name: "Fit to the window" }).click();
+        await expect.poll(async () => Math.round((await pageBox.boundingBox())!.width)).toBe(Math.round(fitted.width));
+        await expect(tools.getByRole("button", { name: "Fit to the window" })).toHaveCount(0);
+      });
+
+      test("a Word document opens fitted to the width: the fit button comes with a zoom, goes with the fit, and survives a resize", async ({ page }) => {
+        await open(page, "notes.docx");
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
+        const fit = tools.getByRole("button", { name: "Fit to the window" });
+        await expect(tools.getByRole("button", { name: "Zoom in" })).toBeVisible();
+        await expect(fit).toHaveCount(0);
+        // Resized while fitted, the page refits: still the fitted view.
+        await page.setViewportSize({ width: 1000, height: 800 });
+        await page.waitForTimeout(500);
+        await expect(fit).toHaveCount(0);
+        await tools.getByRole("button", { name: "Zoom in" }).click();
+        await expect(fit).toBeVisible();
+        // The zoom keeps its ratio to the fit across a resize.
+        await page.setViewportSize({ width: 1280, height: 800 });
+        await page.waitForTimeout(500);
+        await expect(fit).toBeVisible();
+        await fit.click();
+        await expect(fit).toHaveCount(0);
+      });
+
+      test("the full screen button puts the viewer's box in full screen, frame and tools with it, and leaves it", async ({ page }) => {
+        await open(page, "report.pdf");
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
+        const inFullscreen = () => page.evaluate(() => document.fullscreenElement?.className ?? null);
+        expect(await inFullscreen()).toBeNull();
+        await tools.getByRole("button", { name: "Full screen" }).click();
+        await expect.poll(inFullscreen).toContain("exav-viewer-body");
+        // The viewer fills the screen, and its tools are still there to leave it.
+        const box = (await page.locator(".demo-frame .exav-viewer-body").boundingBox())!;
+        expect(box).toMatchObject({ x: 0, y: 0, width: 1280, height: 800 });
+        await tools.getByRole("button", { name: "Leave full screen" }).click();
+        await expect.poll(inFullscreen).toBeNull();
+        await expect(tools.getByRole("button", { name: "Full screen" })).toBeVisible();
+      });
+
+      test("the same file given again replaces the document: a zoomed PDF keeps its zoom and place, in the page and in the frame", async ({ page }) => {
+        await open(page, "report.pdf");
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
+        const pages = engine(page).locator(".exav-viewer-pdf-page");
+        const scroller = engine(page).locator(".exav-viewer-pdf-scroller");
         const position = () => scroller.evaluate((el) => [el.scrollLeft, el.scrollTop]);
         await expect(pages).toHaveCount(3);
         for (let i = 0; i < 3; i++) await tools.getByRole("button", { name: "Zoom in" }).click();
@@ -368,20 +433,16 @@ for (const mode of ["sandbox", "page"] as const) {
         const longer = fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), ".out", "big.pdf"));
         await page.getByTestId("file-input").setInputFiles({ name: "report.pdf", mimeType: "", buffer: longer });
         await expect(pages).toHaveCount(12);
-        if (mode === "page") {
-          await expect.poll(position).toEqual([60, 200]);
-          await expect(tools.getByRole("button", { name: "Zoom out" })).toBeEnabled();
-        } else {
-          await expect(tools.getByRole("button", { name: "Zoom out" })).toBeDisabled();
-        }
+        await expect.poll(position).toEqual([60, 200]);
+        await expect(tools.getByRole("button", { name: "Zoom out" })).toBeEnabled();
       });
 
       test("a PDF opens on its first page, and its outline goes to the page of each section", async ({ page }) => {
         await open(page, "report.pdf");
-        const outline = page.locator(".exv-outline-entry");
+        const outline = page.locator(".exav-viewer-outline-entry");
         await expect(outline).toHaveText(["Scope", "Findings", "Actions"]);
         // Scope, Findings and Actions start pages 1, 2 and 3.
-        const pages = engine(page).locator(".exv-pdf-page");
+        const pages = engine(page).locator(".exav-viewer-pdf-page");
         await expect(pages).toHaveCount(3);
         await expect(pages.nth(0)).toBeInViewport({ ratio: 0.5 });
         await outline.filter({ hasText: "Actions" }).click();
@@ -395,7 +456,7 @@ for (const mode of ["sandbox", "page"] as const) {
       test("a PDF's text lies over the drawn text, at any zoom", async ({ page }) => {
         await open(page, "report.pdf");
         const sentence = "The north facade, the roof and the stairwell were inspected.";
-        const run = engine(page).locator(".exv-pdf-text span", { hasText: sentence });
+        const run = engine(page).locator(".exav-viewer-pdf-text span", { hasText: sentence });
         /** The drawn ink beside the run, in the run's band: it starts and ends where the run does. */
         const lined = async () => {
           let width = 0;
@@ -428,13 +489,13 @@ for (const mode of ["sandbox", "page"] as const) {
       test("a PDF's links go to their place in it, or open their address as any link the document follows", async ({ page, context }) => {
         await context.route("https://example.com/**", (route) => route.fulfill({ contentType: "text/plain", body: "guide" }));
         await open(page, "report.pdf");
-        const pages = engine(page).locator(".exv-pdf-page");
-        const links = pages.nth(0).locator(".exv-pdf-link");
+        const pages = engine(page).locator(".exav-viewer-pdf-page");
+        const links = pages.nth(0).locator(".exav-viewer-pdf-link");
         await expect(links).toHaveCount(2);
         // "See 3. Actions": to the third page's heading.
         await links.nth(0).click();
         await expect(pages.nth(2)).toBeInViewport({ ratio: 0.5 });
-        await page.locator(".exv-outline-entry", { hasText: "Scope" }).click();
+        await page.locator(".exav-viewer-outline-entry", { hasText: "Scope" }).click();
         await expect(pages.nth(0)).toBeInViewport({ ratio: 0.5 });
         // The address: in the frame, the host asks first; in the page, it opens as any link would.
         const asked: string[] = [];
@@ -453,7 +514,7 @@ for (const mode of ["sandbox", "page"] as const) {
 
       test("a Word document shows the seven paragraphs of its first page", async ({ page }) => {
         await open(page, "notes.docx");
-        const p = await settled(page.locator(".demo-frame .exv-surface"));
+        const p = await settled(page.locator(".demo-frame .exav-viewer-surface"));
         // One band of ink per paragraph, title included.
         expect(bands(p, ink, 3).length).toBe(7);
       });
@@ -465,7 +526,7 @@ for (const mode of ["sandbox", "page"] as const) {
         const first = runs.filter({ hasText: /^1\. $/ });
         const last = runs.filter({ hasText: /^spring\.$/ });
         await expect(first).toHaveCount(1);
-        await settled(page.locator(".demo-frame .exv-surface"));
+        await settled(page.locator(".demo-frame .exav-viewer-surface"));
         const a = (await first.boundingBox())!;
         const b = (await last.boundingBox())!;
         // The ink of the line, in its runs' band: it starts and ends where they do.
@@ -525,7 +586,7 @@ for (const mode of ["sandbox", "page"] as const) {
         const first = runs.filter({ hasText: /^Roof inspected\.$/ });
         const second = runs.filter({ hasText: /^Gutter replaced\.$/ });
         await expect(first).toHaveCount(1);
-        await settled(page.locator(".demo-frame .exv-surface"));
+        await settled(page.locator(".demo-frame .exav-viewer-surface"));
         const a = (await first.boundingBox())!;
         const b = (await second.boundingBox())!;
         // The ink of the first point, in its run's band: it starts and ends where the run does.
@@ -546,14 +607,14 @@ for (const mode of ["sandbox", "page"] as const) {
       test("a deck with a byte after its end record, which the engine's strict check refuses, still opens", async ({ page }) => {
         await page.goto(`./?lang=en${query}`);
         await page.getByTestId("file-input").setInputFiles({ name: "tail.pptx", mimeType: "", buffer: Buffer.concat([sample("visit.pptx"), Buffer.from("\n")]) });
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
         await expect(engine(page).locator("[data-ooxml-selection-run]", { hasText: /^Roof inspected\.$/ })).toHaveCount(1);
       });
 
       test("a slide is shown whole, at its own proportions, centred on the surface, and fitted again when the view changes size", async ({ page }) => {
         await open(page, "visit.pptx");
-        const slide = engine(page).locator("canvas.exv-office-canvas");
-        const surface = page.locator(".demo-frame .exv-surface");
+        const slide = engine(page).locator("canvas.exav-viewer-office-canvas");
+        const surface = page.locator(".demo-frame .exav-viewer-surface");
         const check = async () => {
           const s = (await slide.boundingBox())!;
           const v = (await surface.boundingBox())!;
@@ -601,17 +662,17 @@ for (const mode of ["sandbox", "page"] as const) {
 
       test("a spreadsheet and a semicolon CSV of the same quote both render", async ({ page }) => {
         await open(page, "quote.xlsx");
-        expect(find(await settled(page.locator(".demo-frame .exv-surface")), ink).count).toBeGreaterThan(500);
+        expect(find(await settled(page.locator(".demo-frame .exav-viewer-surface")), ink).count).toBeGreaterThan(500);
         await open(page, "quote.csv");
-        expect(find(await settled(page.locator(".demo-frame .exv-surface")), ink).count).toBeGreaterThan(500);
+        expect(find(await settled(page.locator(".demo-frame .exav-viewer-surface")), ink).count).toBeGreaterThan(500);
       });
     });
 
     test.describe("models and media", () => {
       test("an IFC model is drawn, lists its categories, and names what is tapped", async ({ page }) => {
         await open(page, "house.ifc");
-        await expect(page.locator(".exv-layer")).toHaveText(["IFCSLAB", "IFCWALL"]);
-        const canvas = engine(page).locator(".exv-model-canvas");
+        await expect(page.locator(".exav-viewer-layer")).toHaveText(["IFCSLAB", "IFCWALL"]);
+        const canvas = engine(page).locator(".exav-viewer-model-canvas");
         // The house fills a good part of the view in its categories'
         // colours (the file gives none), framed whole: the ground shows on
         // every side. The ground, the grid and the outline are greys.
@@ -625,22 +686,22 @@ for (const mode of ["sandbox", "page"] as const) {
         expect(house.box!.maxY).toBeLessThan(p.height - 3);
         // Seen from above the walls, the middle of the view is the slab's top.
         await canvas.click();
-        const rail = page.locator(".exv-rail-section", { hasText: "Element" });
-        await expect(rail.locator(".exv-strong")).toHaveText("Ground slab");
-        await expect(rail.locator(".exv-muted")).toHaveText(["IFCSLAB", "Ground floor"]);
+        const rail = page.locator(".exav-viewer-rail-section", { hasText: "Element" });
+        await expect(rail.locator(".exav-viewer-strong")).toHaveText("Ground slab");
+        await expect(rail.locator(".exav-viewer-muted")).toHaveText(["IFCSLAB", "Ground floor"]);
         // Hidden, the slab is not drawn and cannot be tapped: the ray goes
         // through to nothing.
-        await page.locator(".exv-layer", { hasText: "IFCSLAB" }).getByRole("checkbox").uncheck();
+        await page.locator(".exav-viewer-layer", { hasText: "IFCSLAB" }).getByRole("checkbox").uncheck();
         await canvas.click();
         await expect(rail.getByText("Tap an element to identify it.")).toBeVisible();
         // Everything hidden: only the grey floor grid is left.
-        await page.locator(".exv-layer", { hasText: "IFCWALL" }).getByRole("checkbox").uncheck();
+        await page.locator(".exav-viewer-layer", { hasText: "IFCWALL" }).getByRole("checkbox").uncheck();
         expect(find(await settled(canvas), coloured).count).toBe(0);
       });
 
       test("an IFC model with a beam left a kilometre away is framed on the house, and zooms where the pointer is", async ({ page }) => {
         await open(page, "stray.ifc");
-        const canvas = engine(page).locator(".exv-model-canvas");
+        const canvas = engine(page).locator(".exav-viewer-model-canvas");
         const coloured = (r: number, g: number, b: number) => Math.max(r, g, b) - Math.min(r, g, b) > 50;
         // Framed as the house alone is (above): it fills a good part of the view, whole.
         const p = await settled(canvas);
@@ -662,7 +723,7 @@ for (const mode of ["sandbox", "page"] as const) {
 
       test("an STL zooms where the pointer is, as an IFC model does", async ({ page }) => {
         await open(page, "house.stl");
-        const canvas = engine(page).locator(".exv-model-canvas");
+        const canvas = engine(page).locator(".exav-viewer-model-canvas");
         // The grey of the surface against the light ground, which is lighter everywhere.
         const surface = (r: number) => r < 180;
         const first = find(await settled(canvas), (r) => surface(r));
@@ -677,10 +738,12 @@ for (const mode of ["sandbox", "page"] as const) {
         expect(Math.abs(after.box!.minX - first.box!.minX)).toBeLessThan(12);
       });
 
-      test("an STL reports its triangle count", async ({ page }) => {
+      test("an STL reports its triangle count through its info controller", async ({ page }) => {
         await open(page, "house.stl");
         // Two boxes of twelve, two gable ends, two roof slopes of two.
-        await expect(page.locator(".exv-badge")).toHaveText("30 triangles");
+        await expect
+          .poll(() => page.evaluate(() => (window as any).exavDemo.session()?.controllers.get().info?.get().triangles))
+          .toBe(30);
       });
 
       test("a WAV plays for the two seconds it holds", async ({ page }) => {
@@ -696,14 +759,14 @@ for (const mode of ["sandbox", "page"] as const) {
       test("members open in place, an archive inside an archive too, with their own rails", async ({ page }) => {
         await open(page, "delivery.zip");
         const frame = page.locator(".demo-frame");
-        await expect(frame.locator(".exv-archive-head")).toHaveText("4 files");
-        const names = frame.locator(".exv-member-name > .exv-truncate:first-child");
+        await expect(frame.locator(".exav-viewer-archive-head")).toHaveText("4 files");
+        const names = frame.locator(".exav-viewer-member-name > .exav-viewer-truncate:first-child");
         await expect(names).toHaveText(["report.pdf", "quote.csv", "plan.dwg", "photos.zip"]);
-        await expect(frame.locator(".exv-member-folder")).toHaveText(["documents", "documents", "drawings"]);
+        await expect(frame.locator(".exav-viewer-member-folder")).toHaveText(["documents", "documents", "drawings"]);
 
         await frame.getByRole("button", { name: /report\.pdf/ }).click();
         // The member's outline goes to the rail, one level down.
-        await expect(frame.locator(".exv-outline-entry")).toHaveText(["Scope", "Findings", "Actions"]);
+        await expect(frame.locator(".exav-viewer-outline-entry")).toHaveText(["Scope", "Findings", "Actions"]);
         await frame.getByRole("button", { name: "Back to the archive" }).click();
 
         await frame.getByRole("button", { name: /photos\.zip/ }).click();
@@ -712,7 +775,7 @@ for (const mode of ["sandbox", "page"] as const) {
         const back = frame.getByRole("button", { name: "Back to the archive" });
         await expect(back).toHaveCount(2);
         // The sun of the landscape, drawn two archives down.
-        await expect.poll(async () => find(await shot(frame.locator(".exv-stage")), (r, g, b) => r > 235 && g > 185 && g < 215 && b < 100).count).toBeGreaterThan(1000);
+        await expect.poll(async () => find(await shot(frame.locator(".exav-viewer-stage")), (r, g, b) => r > 235 && g > 185 && g < 215 && b < 100).count).toBeGreaterThan(1000);
         await back.last().click();
         await expect(names).toHaveText(["landscape.tif"]);
         // Out of the inner archive, whose list fills the stage, by the outer bar.
@@ -723,19 +786,68 @@ for (const mode of ["sandbox", "page"] as const) {
       test("a .tar.gz lists the files of its tar, and a .gz the file it holds, by its name", async ({ page }) => {
         await page.goto(`./?lang=en${query}`);
         const frame = page.locator(".demo-frame");
-        const names = frame.locator(".exv-member-name > .exv-truncate:first-child");
+        const names = frame.locator(".exav-viewer-member-name > .exav-viewer-truncate:first-child");
         const tarball = zlib.gzipSync(tar([["documents/report.pdf", sample("report.pdf")], ["quote.csv", sample("quote.csv")]]));
         await page.getByTestId("file-input").setInputFiles({ name: "bundle.tar.gz", mimeType: "application/gzip", buffer: tarball });
         await expect(names).toHaveText(["report.pdf", "quote.csv"]);
-        await expect(frame.locator(".exv-member-folder")).toHaveText(["documents"]);
+        await expect(frame.locator(".exav-viewer-member-folder")).toHaveText(["documents"]);
         await frame.getByRole("button", { name: /report\.pdf/ }).click();
-        await expect(frame.locator(".exv-outline-entry")).toHaveText(["Scope", "Findings", "Actions"]);
+        await expect(frame.locator(".exav-viewer-outline-entry")).toHaveText(["Scope", "Findings", "Actions"]);
 
         await page.getByTestId("file-input").setInputFiles({ name: "quote.csv.gz", mimeType: "application/gzip", buffer: zlib.gzipSync(sample("quote.csv")) });
         await expect(names).toHaveText(["quote.csv"]);
         await frame.getByRole("button", { name: /quote\.csv/ }).click();
         await expect(frame.getByRole("button", { name: "Back to the archive" })).toBeVisible();
-        await expect(frame.locator(".exv-body").last()).toHaveAttribute("data-phase", "ready");
+        await expect(frame.locator(".exav-viewer-body").last()).toHaveAttribute("data-phase", "ready");
+      });
+
+      // Each file is opened by its name alone, as a download folder has it: the
+      // type is the one a browser gives a file it does not know.
+      const OTHER_FORMATS: [file: string, members: string[]][] = [
+        ["cab/mszip_lzx_qtm.cab", ["mszip.txt", "lzx.txt", "qtm.txt"]],
+        ["sample.arj", ["payload.txt"]],
+        ["wim/hard_LZX.wim", ["code.bin", "rand.bin"]],
+        ["zoo/default.zoo", ["license"]],
+        ["arc/microsoft_testdata.arc", ["TestFile.txt"]],
+        ["egg/directories.egg", ["test.txt"]],
+        ["dmg/hfs_plus_udzo.dmg", ["test.txt"]],
+        // In the archive's table order.
+        ["ishieldz/demo.z", ["hello.txt", "test.txt"]],
+        // A compressed stream holds one file, which is named after the stream.
+        ["lz4/one.lz4", ["one"]],
+        ["lzip_simple.lz", ["lzip_simple"]],
+        ["lzw/repetitive.b16.Z", ["repetitive.b16"]],
+        ["xz/simple.xz", ["simple"]],
+      ];
+      for (const [file, members] of OTHER_FORMATS) {
+        test(`${path.basename(file)} lists its files`, async ({ page }) => {
+          await page.goto(`./?lang=en${query}`);
+          const names = page.locator(".demo-frame .exav-viewer-member-name > .exav-viewer-truncate:first-child");
+          await page.getByTestId("file-input").setInputFiles({ name: path.basename(file), mimeType: "", buffer: fs.readFileSync(path.join(UNPACK_FIXTURES, file)) });
+          await expect(names).toHaveText(members);
+        });
+      }
+
+      test("a .deb, a cpio and a .tar.zst list their files, and the tar inside the zstd is shown as a tar", async ({ page }) => {
+        await page.goto(`./?lang=en${query}`);
+        const frame = page.locator(".demo-frame");
+        const names = frame.locator(".exav-viewer-member-name > .exav-viewer-truncate:first-child");
+        const files: [string, Uint8Array][] = [["documents/report.pdf", sample("report.pdf")], ["quote.csv", sample("quote.csv")]];
+        const give = (name: string, buffer: Buffer) => page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer });
+
+        await give("tool.deb", ar([["debian-binary", Buffer.from("2.0\n")], ["data.tar", tar(files)]]));
+        await expect(names).toHaveText(["debian-binary", "data.tar"]);
+        // A member that is an archive opens as one.
+        await frame.getByRole("button", { name: /data\.tar/ }).click();
+        await expect(names).toHaveText(["report.pdf", "quote.csv"]);
+
+        await give("initrd.cpio", cpio(files));
+        await expect(names).toHaveText(["report.pdf", "quote.csv"]);
+
+        await give("bundle.tar.zst", zlib.zstdCompressSync(tar(files)));
+        await expect(names).toHaveText(["report.pdf", "quote.csv"]);
+        await frame.getByRole("button", { name: /report\.pdf/ }).click();
+        await expect(frame.locator(".exav-viewer-outline-entry")).toHaveText(["Scope", "Findings", "Actions"]);
       });
 
       test("a member that cannot be shown leaves the way back to the archive open", async ({ page }) => {
@@ -747,10 +859,177 @@ for (const mode of ["sandbox", "page"] as const) {
         await page.getByTestId("file-input").setInputFiles({ name: "mixed.zip", mimeType: "application/zip", buffer: zip });
         const frame = page.locator(".demo-frame");
         await frame.getByRole("button", { name: /broken\.dwg/ }).click();
-        await expect(frame.locator(".exv-status-error")).toHaveText("The drawing could not be shown.");
+        await expect(frame.locator(".exav-viewer-status-error")).toHaveText("The drawing could not be shown.");
         await frame.getByRole("button", { name: "Back to the archive" }).click();
         await frame.getByRole("button", { name: /plan\.dxf/ }).click();
-        await expect(frame.locator(".exv-layer")).toHaveCount(6);
+        await expect(frame.locator(".exav-viewer-layer")).toHaveCount(6);
+      });
+    });
+
+    test.describe("text", () => {
+      const text = (page: Page) => engine(page).locator(".exav-viewer-text");
+      /** The text shown is exactly this: whitespace counts, which `toHaveText` ignores. */
+      const exactly = (page: Page, expected: string) => expect.poll(async () => await text(page).textContent()).toBe(expected);
+      /** Requests to anywhere but the demo's own origin or an object URL. */
+      const outside = (page: Page, requests: string[]) => {
+        const origin = `${new URL(page.url()).origin}/`;
+        return requests.filter((u) => !u.startsWith(origin) && !u.startsWith("blob:") && !u.startsWith("about:") && !u.startsWith("data:"));
+      };
+
+      test("a text file is shown as written, markup in it is only text, and its text selects", async ({ page }) => {
+        await open(page, "notes.txt");
+        const shown = "Site visit, north facade\n\tRender cracked above the windows.\n\nNext visit: Monday <b>not bold</b> & more";
+        await exactly(page, shown);
+        await expect(text(page).locator("b")).toHaveCount(0);
+        // A drag across a line, then the whole text, as the browser's selection reads them.
+        await text(page).locator(".exav-viewer-text-chunk").click({ clickCount: 3, position: { x: 40, y: 29 } });
+        const line = (await text(page).evaluate(() => String(getSelection()))).trim();
+        expect(line.length).toBeGreaterThan(0);
+        expect(shown).toContain(line);
+        const all = await text(page).evaluate((el) => {
+          const selection = getSelection()!;
+          selection.selectAllChildren(el);
+          return String(selection);
+        });
+        expect(all.trim()).toBe(shown);
+      });
+
+      test("Markdown shows its headings, emphasis, lists, table and code, and a link with the address it goes to", async ({ page }) => {
+        await open(page, "survey.md");
+        await expect(text(page).locator("h1")).toHaveText("Site survey");
+        await expect(text(page).locator("strong")).toHaveText("north facade");
+        await expect(text(page).locator("em")).toHaveText("repointing");
+        await expect(text(page).locator(".exav-viewer-text-link")).toHaveText("guide");
+        await expect(text(page).locator(".exav-viewer-text-url")).toHaveText(" (https://example.com/guide)");
+        await expect(text(page).locator("li")).toHaveText(["render", "gutter jointnorth-east corner", "north-east corner"]);
+        await expect(text(page).locator("th")).toHaveText(["Item", "Qty"]);
+        await expect(text(page).locator("td")).toHaveText(["Render", "120"]);
+        await expect(text(page).locator("pre")).toHaveText("make survey");
+        await expect(text(page).locator("a")).toHaveCount(0);
+      });
+
+      test("Markdown is read by its own wasm module, fetched only when one is opened", async ({ page }) => {
+        const requests = recordRequests(page);
+        await open(page, "notes.txt");
+        await expect(text(page)).toContainText("Site visit");
+        expect(requests.filter((u) => u.includes("exav_viewer_text"))).toEqual([]);
+        await open(page, "survey.md");
+        await expect(text(page).locator("h1")).toHaveText("Site survey");
+        expect(requests.filter((u) => u.includes("exav_viewer_text_bg") && u.includes(".wasm")).length).toBeGreaterThan(0);
+        expect(outside(page, requests)).toEqual([]);
+      });
+
+      test("a Markdown link opens its address as any link the document follows", async ({ page, context }) => {
+        await open(page, "survey.md");
+        // In the frame the host asks first; in the page it opens as any link would.
+        const asked: string[] = [];
+        page.on("dialog", (d) => {
+          asked.push(d.message());
+          void d.accept();
+        });
+        const popup = context.waitForEvent("page");
+        await text(page).locator(".exav-viewer-text-link").click();
+        const opened = await popup;
+        expect(opened.url()).toBe("https://example.com/guide");
+        expect(await opened.evaluate(() => window.opener)).toBeNull();
+        expect(asked).toEqual(mode === "sandbox" ? ["The document links to https://example.com/guide. Open it in a new tab?"] : []);
+        await opened.close();
+        // The document itself did not navigate.
+        await expect(text(page).locator("h1")).toHaveText("Site survey");
+      });
+
+      test("a hostile Markdown file runs nothing, loads nothing and links nowhere", async ({ page }) => {
+        const requests = recordRequests(page);
+        await open(page, "hostile.md");
+        const body = text(page);
+        await expect(body.locator("h1")).toContainText("<img src=x onerror=");
+        await expect(body).toContainText("<script>document.title = 'pwned'</script>");
+        await expect(body).toContainText("[tracker]");
+        await expect(body.locator("a, img, script, iframe, svg, object, embed")).toHaveCount(0);
+        // The label stays, the unsafe targets go: the only link is the safe one.
+        await expect(body).toContainText("run and data and relative");
+        await expect(body.locator(".exav-viewer-text-link")).toHaveText(["site"]);
+        await page.waitForTimeout(300);
+        expect(await page.title()).not.toContain("pwned");
+        expect(requests.filter((u) => u.includes("evil.example"))).toEqual([]);
+        expect(outside(page, requests)).toEqual([]);
+      });
+
+      test("JSON is indented with its numbers as they were written, and XML is indented as text", async ({ page }) => {
+        await open(page, "data.json");
+        await expect(text(page)).toContainText('"id": 12345678901234567890,');
+        await expect(text(page)).toContainText('"price": 1.10,');
+        await expect(text(page).locator(".exav-viewer-text-key")).toHaveCount(8);
+        expect((await text(page).textContent())!.split("\n").slice(0, 3)).toEqual(["{", '  "id": 12345678901234567890,', '  "price": 1.10,']);
+        await open(page, "feed.xml");
+        await exactly(
+          page,
+          ['<?xml version="1.0"?>', "<feed>", '  <entry id="1">', "    <title>Render</title>", "    <summary>Cracked &amp; loose</summary>", "  </entry>", '  <entry id="2"/>', "</feed>"].join("\n"),
+        );
+      });
+
+      test("a UTF-16 file is read by its mark", async ({ page }) => {
+        await open(page, "utf16.txt");
+        await exactly(page, "Zażółć gęślą jaźń\nsecond line");
+      });
+
+      test("a file that is not text is refused as such", async ({ page }) => {
+        await openSample(page, "photo.txt", { lang: "en", ...(mode === "page" && { mode }) });
+        await expect(page.locator(".demo-frame .exav-viewer-status-error")).toHaveText("This file is not text, so it cannot be shown here.");
+        await expect(text(page)).toHaveCount(0);
+      });
+
+      test("a file past the size limit shows its beginning and says so", async ({ page }) => {
+        await open(page, "huge.log");
+        await expect(page.locator(".demo-frame .exav-viewer-warnings")).toHaveText("The file is too large to show whole: only its beginning is shown.");
+        await expect(text(page).locator(".exav-viewer-text-chunk").first()).toContainText("line 1: inspection entry");
+        // 2 MiB of 51-byte lines, 200 lines to a block: about 205 blocks, never the 600 of the whole file.
+        await expect.poll(async () => await text(page).locator(".exav-viewer-text-chunk").count(), { timeout: 30_000 }).toBeGreaterThan(150);
+        expect(await text(page).locator(".exav-viewer-text-chunk").count()).toBeLessThanOrEqual(250);
+        await expect(text(page)).not.toContainText("line 120000:");
+      });
+
+      test("HTML is shown as its source and nothing in it runs or loads", async ({ page }) => {
+        const requests = recordRequests(page);
+        await open(page, "page.html");
+        await expect(page.locator(".demo-frame .exav-viewer-warnings")).toHaveText("HTML is shown as source text, not as a page.");
+        await expect(text(page)).toContainText('<script src="https://evil.example/x.js"></script>');
+        await expect(text(page).locator("script, img, p, body")).toHaveCount(0);
+        await page.waitForTimeout(300);
+        expect(await page.title()).not.toContain("pwned");
+        expect(requests.filter((u) => u.includes("evil.example"))).toEqual([]);
+      });
+
+      test("a diff colours its added and removed lines", async ({ page }) => {
+        await open(page, "fix.patch");
+        await expect(text(page).locator(".exav-viewer-text-add")).toHaveText("+repointed");
+        await expect(text(page).locator(".exav-viewer-text-del")).toHaveText("-cracked");
+        await expect(text(page).locator(".exav-viewer-text-hunk")).toHaveText("@@ -1,2 +1,2 @@");
+      });
+
+      test("text members of an archive open with the text viewer, and a binary one is refused", async ({ page }) => {
+        await page.goto(`./?lang=en${query}`);
+        const zip = storedZip([
+          ["docs/notes.txt", sample("notes.txt")],
+          ["data.json", sample("data.json")],
+          // No signature the detector knows: only its name says what it is.
+          ["fake.log", Uint8Array.from({ length: 400 }, (_, i) => (i * 37) % 256)],
+        ]);
+        await page.getByTestId("file-input").setInputFiles({ name: "texts.zip", mimeType: "application/zip", buffer: zip });
+        const frame = page.locator(".demo-frame");
+        await frame.getByRole("button", { name: /notes\.txt/ }).click();
+        await expect(text(page)).toContainText("Render cracked above the windows.");
+        await frame.getByRole("button", { name: "Back to the archive" }).click();
+        await frame.getByRole("button", { name: /data\.json/ }).click();
+        await expect(text(page)).toContainText('"price": 1.10,');
+        await frame.getByRole("button", { name: "Back to the archive" }).click();
+        await frame.getByRole("button", { name: /fake\.log/ }).click();
+        await expect(frame.locator(".exav-viewer-status-error")).toHaveText("This file is not text, so it cannot be shown here.");
+      });
+
+      test("the French locale words the notices", async ({ page }) => {
+        await open(page, "huge.log", "fr");
+        await expect(page.locator(".demo-frame .exav-viewer-warnings")).toHaveText("Le fichier est trop grand pour être affiché en entier : seul son début est affiché.");
       });
     });
 
@@ -759,9 +1038,9 @@ for (const mode of ["sandbox", "page"] as const) {
         const requests = recordRequests(page);
         await page.goto(`./?lang=en${query}`);
         await page.getByTestId("file-input").setInputFiles({ name: "mine.dxf", mimeType: "", buffer: sample("plan.dxf") });
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
         await expect(page.getByRole("heading", { name: "Your files" })).toBeVisible();
-        await expect(page.locator(".exv-layer")).toHaveCount(6);
+        await expect(page.locator(".exav-viewer-layer")).toHaveCount(6);
         // Every request went to the demo's own origin, or to an object URL
         // the page or the frame made, and none carried the file.
         const origin = `${new URL(page.url()).origin}/`;
@@ -779,40 +1058,50 @@ for (const mode of ["sandbox", "page"] as const) {
         const loaded = async (marker: string) => (await Promise.all(scripts)).some((s) => s.includes(marker));
         const requests = recordRequests(page);
         await open(page, "report.pdf");
-        for (const marker of ["exv-cad-canvas", "exv-model-canvas", "exv-archive-member", "exv-office exv-office-"]) expect(await loaded(marker), marker).toBe(false);
+        for (const marker of ["exav-viewer-cad-canvas", "exav-viewer-model-canvas", "exav-viewer-archive-member", "exav-viewer-office exav-viewer-office-"]) expect(await loaded(marker), marker).toBe(false);
         expect(requests.filter((u) => /\.wasm$/.test(u) && !u.includes("/pdfjs/"))).toEqual([]);
         await pick(page, "plan.dwg");
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-        expect(await loaded("exv-cad-canvas")).toBe(true);
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+        expect(await loaded("exav-viewer-cad-canvas")).toBe(true);
         expect(requests.some((u) => /exav_viewer_dwg_bg.*\.wasm/.test(u))).toBe(true);
-        for (const marker of ["exv-model-canvas", "exv-archive-member", "exv-office exv-office-"]) expect(await loaded(marker), marker).toBe(false);
+        for (const marker of ["exav-viewer-model-canvas", "exav-viewer-archive-member", "exav-viewer-office exav-viewer-office-"]) expect(await loaded(marker), marker).toBe(false);
       });
 
       test("the French locale translates the viewer's own strings", async ({ page }) => {
         await open(page, "plan.dwg", "fr");
-        await expect(page.locator(".exv-rail-label", { hasText: "Calques" })).toBeVisible();
+        await expect(page.locator(".exav-viewer-rail-label", { hasText: "Calques" })).toBeVisible();
       });
     });
   });
 }
 
-test("the sidebar lists each sample of samples.json once, and each is served and credited", async ({ page, request }) => {
-  const dir = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "demo", "public", "showcase");
+test("the sidebar lists each sample of samples.json and each example of examples.json once, and each is served and credited", async ({ page, request }) => {
+  const pub = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "demo", "public");
+  const dir = path.join(pub, "showcase");
   const json = path.join(dir, "samples.json");
   expect(fs.existsSync(json), "no samples: run npm run demo:showcase").toBe(true);
   const samples = (JSON.parse(fs.readFileSync(json, "utf8")) as { samples: { file: string }[] }).samples.map((s) => s.file).sort();
   // Every file copied in is in the list, and nothing else is.
   expect(fs.readdirSync(dir).filter((f) => !f.startsWith(".") && f !== "samples.json").sort()).toEqual(samples);
+  // The examples (npm run demo:examples), if they were copied in; one named like a sample replaces it.
+  const exampleDir = path.join(pub, "examples");
+  const exampleJson = path.join(exampleDir, "examples.json");
+  const examples = fs.existsSync(exampleJson) ? (JSON.parse(fs.readFileSync(exampleJson, "utf8")) as { examples: { file: string }[] }).examples.map((e) => e.file) : [];
+  expect(new Set(examples).size).toBe(examples.length);
+  const shown = [...samples.filter((s) => !examples.includes(s)), ...examples].sort();
   await page.goto("./?lang=en");
-  await expect(page.locator(".demo-side .demo-file")).toHaveCount(samples.length);
+  await expect(page.locator(".demo-side .demo-file")).toHaveCount(shown.length);
   const listed = (await page.locator(".demo-side .demo-file").allTextContents()).sort();
-  expect(listed).toEqual(samples);
+  expect(listed).toEqual(shown);
   const credits = await (await request.get("licenses/README.txt")).text();
-  for (const name of samples) {
-    const served = await request.get(`showcase/${name}`);
-    expect(served.ok(), name).toBe(true);
-    expect((await served.body()).length, name).toBe(fs.statSync(path.join(dir, name)).size);
-    expect(credits, name).toContain(`\n${name}\n`);
+  for (const [folder, root, names] of [["showcase", dir, samples], ["examples", exampleDir, examples]] as const) {
+    for (const name of names) {
+      const served = await request.get(`${folder}/${name}`);
+      expect(served.ok(), name).toBe(true);
+      // The preview server sends a .gz with Content-Encoding: gzip, and the request decodes it.
+      if (served.headers()["content-encoding"] !== "gzip") expect((await served.body()).length, name).toBe(fs.statSync(path.join(root, name)).size);
+      expect(credits, name).toContain(`\n${name}\n`);
+    }
   }
 });
 
diff --git a/crates/exav-viewer/e2e/docs.spec.ts b/crates/exav-viewer/e2e/docs.spec.ts
new file mode 100644
index 00000000..4196e011
--- /dev/null
+++ b/crates/exav-viewer/e2e/docs.spec.ts
@@ -0,0 +1,53 @@
+// Text documents converted by exav-render's `docs` (exav_viewer_docs.wasm)
+// when the page asks for `converter: "exav"` (`?converter=exav` in the demo),
+// shown by the DOCX plugin, in the page and in the sandboxed frame: a Word 97
+// file, an OpenDocument text, a flat one and an RTF, with nothing of an
+// external converter fetched.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations, screenshotting } from "./csp.js";
+import { decodePng, find } from "./pixels.js";
+
+/** exav-render's `docs` fixtures (see their README for where they come from). */
+const FIXTURES = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "office", "docs");
+
+failOnViolations();
+
+const ink = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+
+for (const mode of ["sandbox", "page"] as const) {
+  test.describe(mode, () => {
+    /** Opens a fixture; returns the URLs the page and its frames fetched for it. */
+    async function open(page: Page, name: string): Promise<string[]> {
+      const fetched: string[] = [];
+      page.on("request", (r) => fetched.push(r.url()));
+      await page.goto(`./?${new URLSearchParams({ lang: "en", converter: "exav", ...(mode === "page" && { mode }) })}`);
+      fetched.length = 0;
+      await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: fs.readFileSync(path.join(FIXTURES, name)) });
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready", { timeout: 60_000 });
+      return fetched;
+    }
+
+    /** Dark pixels on the surface: the page is drawn, not a blank canvas. */
+    const drawn = async (page: Page) => {
+      screenshotting(page);
+      return find(decodePng(await page.locator(".demo-frame .exav-viewer-surface").screenshot()), ink).count;
+    };
+
+    const byExav = (fetched: string[]) => {
+      expect(fetched.some((u) => /exav_viewer_docs_bg[^/]*\.wasm/.test(u))).toBe(true);
+      expect(fetched.filter((u) => /converters\/|exav_office_/.test(u))).toEqual([]);
+    };
+
+    for (const name of ["sample.doc", "sample.odt", "sample.fodt", "sample.rtf"]) {
+      test(`${name} is converted and its page drawn`, async ({ page }) => {
+        byExav(await open(page, name));
+        await expect.poll(() => drawn(page)).toBeGreaterThan(300);
+      });
+    }
+  });
+}
diff --git a/crates/exav-viewer/e2e/external.spec.ts b/crates/exav-viewer/e2e/external.spec.ts
new file mode 100644
index 00000000..31d9da27
--- /dev/null
+++ b/crates/exav-viewer/e2e/external.spec.ts
@@ -0,0 +1,99 @@
+// The external converter's contract, with a converter of its own
+// (fixtures/fake-converter.js, served at /e2e/fake-converter.js): a module
+// loaded from a URL, in the page and in the sandboxed frame, whose PDF is shown
+// by the viewer's PDF plugin, with its progress, its errors, its abort, the
+// timeout and the memory option. A format no converter of the package reads
+// ends in the needs-converter error where none is set.
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+
+failOnViolations();
+
+const FAKE = "/e2e/fake-converter.js";
+
+for (const mode of ["sandbox", "page"] as const) {
+  test.describe(mode, () => {
+    /** Opens `text` as a Visio file, which only an external converter reads. */
+    async function open(page: Page, text: string, params: Record<string, string> = {}, name = "plan.vsd") {
+      await page.goto(`./?${new URLSearchParams({ lang: "en", ...params, ...(mode === "page" && { mode }) })}`);
+      await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: Buffer.from(text) });
+    }
+
+    const body = (page: Page) => page.locator(".demo-frame .exav-viewer-body");
+    const engine = (page: Page) => (mode === "sandbox" ? page.frameLocator(".demo-frame iframe.exav-viewer-sandbox") : page.locator(".demo-frame"));
+
+    test("a format only an external converter reads is converted by it and shown as PDF", async ({ page }) => {
+      await open(page, "hello visio", { externalConverter: FAKE });
+      await expect(body(page)).toHaveAttribute("data-phase", "ready", { timeout: 30_000 });
+      await expect(engine(page).locator(".exav-viewer-pdf-page")).toHaveCount(1);
+      // The hint, the file's size, and no memory option.
+      await expect(engine(page).locator(".exav-viewer-pdf-text span", { hasText: "fake converter: visio, 11 bytes, memory unset" })).toBeVisible();
+    });
+
+    test("is handed the memory option the host set", async ({ page }) => {
+      await open(page, "hello", { externalConverter: FAKE, maxMemory: "5000000" });
+      await expect(engine(page).locator(".exav-viewer-pdf-text span", { hasText: "visio, 5 bytes, memory 5000000" })).toBeVisible({ timeout: 30_000 });
+    });
+
+    test("shows the converter's steps while it works", async ({ page }) => {
+      await page.goto(`./?${new URLSearchParams({ lang: "en", externalConverter: FAKE, ...(mode === "page" && { mode }) })}`);
+      await page.evaluate(() => {
+        const seen = new Set<string>();
+        (window as unknown as { steps: Set<string> }).steps = seen;
+        new MutationObserver(() => {
+          const status = document.querySelector(".demo-frame .exav-viewer-status");
+          const text = status?.querySelector("p")?.textContent;
+          if (text) seen.add(`${text}${status!.querySelector('[role="progressbar"]') ? " [bar]" : ""}`);
+        }).observe(document.body, { subtree: true, childList: true, characterData: true, attributes: true });
+      });
+      await page.getByTestId("file-input").setInputFiles({ name: "plan.vsd", mimeType: "", buffer: Buffer.from("hello") });
+      await expect(body(page)).toHaveAttribute("data-phase", "ready", { timeout: 30_000 });
+      const steps = await page.evaluate(() => [...(window as unknown as { steps: Set<string> }).steps]);
+      expect(steps).toContain("Downloading the viewer… [bar]");
+      expect(steps).toContain("Starting the viewer…");
+      expect(steps).toContain("Converting the document… [bar]");
+    });
+
+    test("a converter that fails ends in the document's error, and the viewer goes on", async ({ page }) => {
+      await open(page, "FAIL please", { externalConverter: FAKE });
+      await expect(body(page)).toHaveAttribute("data-phase", "error", { timeout: 30_000 });
+      await expect(page.locator(".demo-frame .exav-viewer-status")).toContainText("This document could not be shown.");
+      // The next file opens.
+      await page.getByTestId("file-input").setInputFiles({ name: "plan.vsd", mimeType: "", buffer: Buffer.from("fine") });
+      await expect(body(page)).toHaveAttribute("data-phase", "ready", { timeout: 30_000 });
+    });
+
+    test("a converter that never answers is stopped at the timeout, even if it ignores its signal", async ({ page }) => {
+      await open(page, "DEAF forever", { externalConverter: FAKE, timeoutMs: "700" });
+      await expect(body(page)).toHaveAttribute("data-phase", "error", { timeout: 30_000 });
+    });
+
+    test("a converter that answers what the contract does not allow ends in the document's error", async ({ page }) => {
+      await open(page, "BAD answer", { externalConverter: FAKE });
+      await expect(body(page)).toHaveAttribute("data-phase", "error", { timeout: 30_000 });
+    });
+
+    test("without an external converter the format ends in the needs-converter error", async ({ page }) => {
+      test.skip(!!process.env.EXAV_EXTERNAL_CONVERTER, "the demo was built with a default external converter");
+      await open(page, "hello visio");
+      await expect(body(page)).toHaveAttribute("data-phase", "error", { timeout: 30_000 });
+      await expect(page.locator(".demo-frame .exav-viewer-status")).toContainText("only be shown with a converter that is not installed here");
+    });
+
+    test("with converter: external, a file the package reads goes to the external converter too", async ({ page }) => {
+      await open(page, "not really a spreadsheet", { externalConverter: FAKE, converter: "external" }, "table.xls");
+      await expect(engine(page).locator(".exav-viewer-pdf-text span", { hasText: "fake converter: xls," })).toBeVisible({ timeout: 30_000 });
+    });
+  });
+}
+
+test("closing the file aborts the converter's signal (in the page)", async ({ page }) => {
+  await page.goto(`./?${new URLSearchParams({ lang: "en", externalConverter: FAKE, mode: "page" })}`);
+  await page.getByTestId("file-input").setInputFiles({ name: "plan.vsd", mimeType: "", buffer: Buffer.from("HANG forever") });
+  // It is waiting for its signal; open another file in its place.
+  await expect.poll(() => page.evaluate(() => (window as unknown as { fakeConverterCalled?: number }).fakeConverterCalled ?? 0), { timeout: 10_000 }).toBe(1);
+  expect(await page.evaluate(() => (window as unknown as { fakeConverterAborted?: number }).fakeConverterAborted ?? 0)).toBe(0);
+  await page.getByTestId("file-input").setInputFiles({ name: "note.txt", mimeType: "text/plain", buffer: Buffer.from("plain") });
+  await expect.poll(() => page.evaluate(() => (window as unknown as { fakeConverterAborted?: number }).fakeConverterAborted ?? 0), { timeout: 10_000 }).toBe(1);
+});
diff --git a/crates/exav-viewer/e2e/fixtures/fake-converter.js b/crates/exav-viewer/e2e/fixtures/fake-converter.js
new file mode 100644
index 00000000..cdc52347
--- /dev/null
+++ b/crates/exav-viewer/e2e/fixtures/fake-converter.js
@@ -0,0 +1,71 @@
+// A minimal external converter, for the tests of the contract (see
+// `ExternalConverter` in ts/office/external.ts). It reads the file's first
+// word to know what to do, and answers with a one-page PDF that says what it
+// was given, so that a test can see the hint, the size and the memory option
+// arrive.
+//
+//   FAIL...   rejects with an error
+//   HANG...   waits for the signal, and rejects with its reason
+//   DEAF...   never answers and never looks at the signal
+//   SHEET...  answers an XLSX (empty bytes: for tests that do not draw it)
+//   BAD...    answers what the contract does not allow
+//   anything else: a PDF.
+//
+// A call is counted in `globalThis.fakeConverterCalled` and a signal that
+// aborts in `globalThis.fakeConverterAborted`, for a test that reads them in
+// the page.
+
+/** A PDF of one page holding `text`, its cross-reference table written out. */
+function pdf(text) {
+  const objects = [
+    "<< /Type /Catalog /Pages 2 0 R >>",
+    "<< /Type /Pages /Kids [3 0 R] /Count 1 >>",
+    "<< /Type /Page /Parent 2 0 R /MediaBox [0 0 400 200] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> >> >>",
+    undefined,
+    "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>",
+  ];
+  const content = `BT /F1 14 Tf 20 100 Td (${text.replace(/[()\\]/g, "")}) Tj ET`;
+  objects[3] = `<< /Length ${content.length} >>\nstream\n${content}\nendstream`;
+  let out = "%PDF-1.4\n";
+  const offsets = [];
+  objects.forEach((body, i) => {
+    offsets.push(out.length);
+    out += `${i + 1} 0 obj\n${body}\nendobj\n`;
+  });
+  const xref = out.length;
+  out += `xref\n0 ${objects.length + 1}\n0000000000 65535 f \n`;
+  for (const o of offsets) out += `${String(o).padStart(10, "0")} 00000 n \n`;
+  out += `trailer\n<< /Size ${objects.length + 1} /Root 1 0 R >>\nstartxref\n${xref}\n%%EOF\n`;
+  return new TextEncoder().encode(out);
+}
+
+const tick = () => new Promise((resolve) => setTimeout(resolve, 80));
+
+export async function convert(bytes, { hint, maxMemory, signal, onProgress } = {}) {
+  globalThis.fakeConverterCalled = (globalThis.fakeConverterCalled ?? 0) + 1;
+  signal?.addEventListener("abort", () => (globalThis.fakeConverterAborted = (globalThis.fakeConverterAborted ?? 0) + 1), { once: true });
+  const word = new TextDecoder().decode(bytes.subarray(0, 8));
+  onProgress?.({ stage: "download", loaded: 1, total: 2 });
+  await tick();
+  onProgress?.({ stage: "download", loaded: 2, total: 2 });
+  onProgress?.({ stage: "start" });
+  await tick();
+  onProgress?.({ stage: "load", done: 1, total: 2 });
+  await tick();
+  if (word.startsWith("FAIL")) throw new Error("the fake converter was asked to fail");
+  if (word.startsWith("HANG")) {
+    await new Promise((_, reject) => {
+      if (signal?.aborted) reject(signal.reason);
+      signal?.addEventListener("abort", () => reject(signal.reason), { once: true });
+    });
+  }
+  if (word.startsWith("DEAF")) await new Promise(() => {});
+  if (word.startsWith("BAD")) return { format: "docx", bytes: new Uint8Array(1) };
+  onProgress?.({ stage: "export", done: 1, total: 1 });
+  if (word.startsWith("SHEET")) return { format: "xlsx", bytes: new Uint8Array(0) };
+  return { format: "pdf", bytes: pdf(`fake converter: ${hint}, ${bytes.length} bytes, memory ${maxMemory ?? "unset"}`) };
+}
+
+export function prefetch(hint) {
+  return [`fake-data-${hint}.bin`];
+}
diff --git a/crates/exav-viewer/e2e/fixtures/make-samples.mjs b/crates/exav-viewer/e2e/fixtures/make-samples.mjs
index 5d86fa2b..e8fca79e 100644
--- a/crates/exav-viewer/e2e/fixtures/make-samples.mjs
+++ b/crates/exav-viewer/e2e/fixtures/make-samples.mjs
@@ -4,6 +4,7 @@
 // work and nobody's data. The Playwright setup runs it.
 //
 //     node e2e/fixtures/make-samples.mjs
+import { execFileSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -286,7 +287,8 @@ function pptx() {
     ["ppt/slides/_rels/slide2.xml.rels", relsOf([["rId1", "slideLayout", "../slideLayouts/slideLayout1.xml"]])],
   ]);
 }
-function xlsx() {
+/** `notes`: a second sheet, "Notes", after "Quote". */
+function xlsx({ notes = false } = {}) {
   const rows = [
     ["Item", "Quantity", "Unit price", "Total"],
     ["Render", 120, 18.5, 2220],
@@ -297,14 +299,18 @@ function xlsx() {
     const ref = `${"ABCD"[c]}${r + 1}`;
     return typeof v === "number" ? `<c r="${ref}"><v>${v}</v></c>` : `<c r="${ref}" t="inlineStr"><is><t>${v}</t></is></c>`;
   };
-  const sheet = rows.map((row, r) => `<row r="${r + 1}">${row.map((v, c) => cell(v, r, c)).join("")}</row>`).join("");
+  const sheetData = (data) => data.map((row, r) => `<row r="${r + 1}">${row.map((v, c) => cell(v, r, c)).join("")}</row>`).join("");
+  const sheet = sheetData(rows);
   const REL = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+  const WORKSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml";
+  const worksheet = (data) => `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><cols><col min="1" max="1" width="22" customWidth="1"/><col min="2" max="4" width="12" customWidth="1"/></cols><sheetData>${data}</sheetData></worksheet>`;
   return zip([
-    ["[Content_Types].xml", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/worksheets/sheet1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/></Types>`],
+    ["[Content_Types].xml", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/worksheets/sheet1.xml" ContentType="${WORKSHEET}"/>${notes ? `<Override PartName="/xl/worksheets/sheet2.xml" ContentType="${WORKSHEET}"/>` : ""}<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/></Types>`],
     ["_rels/.rels", rels("xl/workbook.xml", "officeDocument")],
-    ["xl/workbook.xml", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="${REL}"><sheets><sheet name="Quote" sheetId="1" r:id="rId1"/></sheets></workbook>`],
-    ["xl/_rels/workbook.xml.rels", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="${REL}/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="${REL}/styles" Target="styles.xml"/></Relationships>`],
-    ["xl/worksheets/sheet1.xml", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><cols><col min="1" max="1" width="22" customWidth="1"/><col min="2" max="4" width="12" customWidth="1"/></cols><sheetData>${sheet}</sheetData></worksheet>`],
+    ["xl/workbook.xml", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="${REL}"><sheets><sheet name="Quote" sheetId="1" r:id="rId1"/>${notes ? '<sheet name="Notes" sheetId="2" r:id="rId3"/>' : ""}</sheets></workbook>`],
+    ["xl/_rels/workbook.xml.rels", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="${REL}/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="${REL}/styles" Target="styles.xml"/>${notes ? `<Relationship Id="rId3" Type="${REL}/worksheet" Target="worksheets/sheet2.xml"/>` : ""}</Relationships>`],
+    ["xl/worksheets/sheet1.xml", worksheet(sheet)],
+    ...(notes ? [["xl/worksheets/sheet2.xml", worksheet(sheetData([["Note"], ["Access by the north gate"]]))]] : []),
     ["xl/styles.xml", `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><fonts count="1"><font><sz val="11"/><name val="Arial"/></font></fonts><fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills><borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders><cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/></cellXfs></styleSheet>`],
   ]);
 }
@@ -333,6 +339,151 @@ function stl() {
   return `solid house\n${facets.map((t) => `facet normal 0 0 0\n outer loop\n${t.map((v) => `  vertex ${v.map(f).join(" ")}`).join("\n")}\n endloop\nendfacet`).join("\n")}\nendsolid house\n`;
 }
 
+// ── OBJ, PLY, glTF: the same house, in two parts, Y up ─────────────────────
+// Thirty triangles as the STL has: the main part's 18 and the annex's 12,
+// written as the polygons they are drawn from.
+const ANNEX_AT = [40, 0, -5];
+function houseParts({ local = false } = {}) {
+  const up = (x, y, z) => [x, z, -y];
+  const box = (x0, y0, z0, x1, y1, z1) => {
+    const v = [[x0, y0, z0], [x1, y0, z0], [x1, y1, z0], [x0, y1, z0], [x0, y0, z1], [x1, y0, z1], [x1, y1, z1], [x0, y1, z1]].map((p) => up(...p));
+    return [[v[0], v[3], v[2], v[1]], [v[4], v[5], v[6], v[7]], [v[0], v[1], v[5], v[4]], [v[1], v[2], v[6], v[5]], [v[2], v[3], v[7], v[6]], [v[3], v[0], v[4], v[7]]];
+  };
+  const r = up;
+  const gable = [
+    [r(0, 0, 25), r(40, 0, 25), r(20, 0, 40)],
+    [r(0, 30, 25), r(20, 30, 40), r(40, 30, 25)],
+    [r(0, 0, 25), r(20, 0, 40), r(20, 30, 40), r(0, 30, 25)],
+    [r(40, 0, 25), r(40, 30, 25), r(20, 30, 40), r(20, 0, 40)],
+  ];
+  const annex = box(40, 5, 0, 60, 25, 15);
+  const shift = (polygons) => polygons.map((poly) => poly.map((p) => p.map((v, k) => v - ANNEX_AT[k])));
+  return [
+    { name: "main", color: [0.85, 0.6, 0.4], polygons: [...box(0, 0, 0, 40, 30, 25), ...gable] },
+    { name: "annex", color: [0.4, 0.6, 0.85], polygons: local ? shift(annex) : annex },
+  ];
+}
+
+/** Vertices shared inside a part, and each polygon as indices into them. */
+function indexed(parts) {
+  const vertices = [];
+  const faces = [];
+  parts.forEach((part, p) => {
+    const seen = new Map();
+    for (const polygon of part.polygons) {
+      faces.push({ part: p, ids: polygon.map((v) => {
+        const key = v.join(",");
+        if (!seen.has(key)) {
+          seen.set(key, vertices.length);
+          vertices.push({ v, part: p });
+        }
+        return seen.get(key);
+      }) });
+    }
+  });
+  return { vertices, faces };
+}
+
+function obj() {
+  const parts = houseParts();
+  const { vertices, faces } = indexed(parts);
+  const lines = ["# exav sample: a small house, Y up", "mtllib house.mtl", "o house"];
+  for (const { v } of vertices) lines.push(`v ${v.join(" ")}`);
+  parts.forEach((part, p) => {
+    lines.push(`g ${part.name}`, `usemtl ${part.name}`);
+    for (const f of faces.filter((f) => f.part === p)) lines.push(`f ${f.ids.map((i) => i + 1).join(" ")}`);
+  });
+  return lines.join("\n") + "\n";
+}
+
+function ply() {
+  const parts = houseParts();
+  const { vertices, faces } = indexed(parts);
+  const header = `ply\nformat binary_little_endian 1.0\ncomment exav sample: a small house, Y up\nelement vertex ${vertices.length}\nproperty float x\nproperty float y\nproperty float z\nproperty uchar red\nproperty uchar green\nproperty uchar blue\nelement face ${faces.length}\nproperty list uchar int vertex_indices\nend_header\n`;
+  const body = Buffer.alloc(vertices.length * 15 + faces.reduce((n, f) => n + 1 + 4 * f.ids.length, 0));
+  let at = 0;
+  for (const { v, part } of vertices) {
+    for (const c of v) at = body.writeFloatLE(c, at);
+    for (const c of parts[part].color) at = body.writeUInt8(Math.round(c * 255), at);
+  }
+  for (const f of faces) {
+    at = body.writeUInt8(f.ids.length, at);
+    for (const i of f.ids) at = body.writeInt32LE(i, at);
+  }
+  return Buffer.concat([Buffer.from(header), body]);
+}
+
+/** The glTF document and its binary buffer; the annex is a node of its own, moved. */
+function gltfParts() {
+  const parts = houseParts({ local: true });
+  const chunks = [];
+  const views = [];
+  const accessors = [];
+  const meshes = [];
+  let length = 0;
+  const add = (data, target) => {
+    views.push({ buffer: 0, byteOffset: length, byteLength: data.length, target });
+    chunks.push(data);
+    length += data.length;
+    return views.length - 1;
+  };
+  parts.forEach((part) => {
+    const { vertices, faces } = indexed([part]);
+    const positions = Buffer.alloc(vertices.length * 12);
+    vertices.forEach(({ v }, i) => v.forEach((c, k) => positions.writeFloatLE(c, i * 12 + k * 4)));
+    const triangles = faces.flatMap((f) => f.ids.slice(2).map((_, k) => [f.ids[0], f.ids[k + 1], f.ids[k + 2]])).flat();
+    const indices = Buffer.alloc(triangles.length * 2);
+    triangles.forEach((i, k) => indices.writeUInt16LE(i, k * 2));
+    const lo = [0, 1, 2].map((k) => Math.min(...vertices.map(({ v }) => v[k])));
+    const hi = [0, 1, 2].map((k) => Math.max(...vertices.map(({ v }) => v[k])));
+    accessors.push({ bufferView: add(positions, 34962), componentType: 5126, count: vertices.length, type: "VEC3", min: lo, max: hi });
+    accessors.push({ bufferView: add(indices, 34963), componentType: 5123, count: triangles.length, type: "SCALAR" });
+    meshes.push({ name: part.name, primitives: [{ attributes: { POSITION: accessors.length - 2 }, indices: accessors.length - 1, material: meshes.length }] });
+    if (indices.length % 4) chunks.push(Buffer.alloc(4 - (indices.length % 4))), (length += 4 - (indices.length % 4));
+  });
+  const bin = Buffer.concat(chunks);
+  const json = {
+    asset: { version: "2.0", generator: "exav test samples" },
+    scene: 0,
+    scenes: [{ nodes: [0, 1] }],
+    nodes: [
+      { name: "main", mesh: 0 },
+      { name: "annex", mesh: 1, translation: ANNEX_AT },
+    ],
+    meshes,
+    materials: parts.map((p) => ({ pbrMetallicRoughness: { baseColorFactor: [...p.color.map((c) => c ** 2.2), 1] } })),
+    accessors,
+    bufferViews: views,
+    buffers: [{ byteLength: bin.length }],
+  };
+  return { json, bin };
+}
+
+function glb() {
+  const { json, bin } = gltfParts();
+  const text = Buffer.from(JSON.stringify(json));
+  const jsonChunk = Buffer.concat([text, Buffer.alloc((4 - (text.length % 4)) % 4, 0x20)]);
+  const binChunk = Buffer.concat([bin, Buffer.alloc((4 - (bin.length % 4)) % 4)]);
+  const head = Buffer.alloc(12);
+  head.write("glTF", 0);
+  head.writeUInt32LE(2, 4);
+  head.writeUInt32LE(12 + 8 + jsonChunk.length + 8 + binChunk.length, 8);
+  const chunk = (type, data) => {
+    const h = Buffer.alloc(8);
+    h.writeUInt32LE(data.length, 0);
+    h.writeUInt32LE(type, 4);
+    return Buffer.concat([h, data]);
+  };
+  return Buffer.concat([head, chunk(0x4e4f534a, jsonChunk), chunk(0x004e4942, binChunk)]);
+}
+
+/** The same house with its buffer embedded, or, when `external`, left in a file that is not fetched. */
+function gltf({ external = false } = {}) {
+  const { json, bin } = gltfParts();
+  json.buffers = [{ byteLength: bin.length, uri: external ? "house.bin" : `data:application/octet-stream;base64,${bin.toString("base64")}` }];
+  return JSON.stringify(json, null, 1);
+}
+
 // ── WAV: a two-second chime ─────────────────────────────────────────────────
 function wav() {
   const rate = 22050;
@@ -423,15 +574,136 @@ write("landscape.png", png(px));
 write("landscape.tif", tiff(px));
 write("quote.csv", "Item;Quantity;Unit price;Total\nRender;120;18,50;2220,00\nGutter joint;1;95,00;95,00\nHandrail fixings;12;4,20;50,40\n");
 write("notes.docx", docx());
+// Text: Markdown with a link, a hostile Markdown, JSON with a number a parse would round, XML, UTF-16, a binary named .txt, a file past the size limit.
+write("notes.txt", "Site visit, north facade\n\tRender cracked above the windows.\n\nNext visit: Monday <b>not bold</b> & more\n");
+write(
+  "survey.md",
+  [
+    "# Site survey",
+    "",
+    "The **north facade** needs *repointing*; see the [guide](https://example.com/guide).",
+    "",
+    "- render",
+    "- gutter joint",
+    "  - north-east corner",
+    "",
+    "| Item | Qty |",
+    "|:-----|----:|",
+    "| Render | 120 |",
+    "",
+    "```",
+    "make survey",
+    "```",
+    "",
+  ].join("\n"),
+);
+write(
+  "hostile.md",
+  [
+    "# Hostile <img src=x onerror=\"document.title='pwned'\">",
+    "",
+    "<script>document.title = 'pwned'</script>",
+    "",
+    "[run](javascript:document.title='pwned') and [data](data:text/html,x) and [relative](/etc/passwd)",
+    "",
+    "![tracker](https://evil.example/pixel.png)",
+    "",
+    "<iframe src=\"https://evil.example/frame\"></iframe>",
+    "",
+    "Safe: [site](https://example.com/site)",
+    "",
+  ].join("\n"),
+);
+write("data.json", '{"id":12345678901234567890,"price":1.10,"items":[{"name":"render","qty":120},{"name":"gutter","qty":1}],"empty":{}}');
+write("feed.xml", '<?xml version="1.0"?><feed><entry id="1"><title>Render</title><summary>Cracked &amp; loose</summary></entry><entry id="2"/></feed>');
+{
+  const text = "Zażółć gęślą jaźń\nsecond line\n";
+  const body = Buffer.alloc(text.length * 2);
+  for (let i = 0; i < text.length; i++) body.writeUInt16LE(text.charCodeAt(i), i * 2);
+  write("utf16.txt", Buffer.concat([Buffer.from([0xff, 0xfe]), body]));
+}
+write("photo.txt", png(px));
+write("page.html", '<!doctype html><html><body onload="document.title=\'pwned\'"><script src="https://evil.example/x.js"></script><img src="https://evil.example/p.png"><p>Hello</p></body></html>');
+write("fix.patch", "--- a/walls.txt\n+++ b/walls.txt\n@@ -1,2 +1,2 @@\n north\n-cracked\n+repointed\n");
+write("huge.log", Array.from({ length: 120_000 }, (_, i) => `line ${i + 1}: inspection entry for the north facade`).join("\n") + "\n");
 write("visit.pptx", pptx());
 write("quote.xlsx", xlsx());
+write("book.xlsx", xlsx({ notes: true }));
+// An SVG with only a viewBox, a script and an image from elsewhere: drawn, neither run nor fetched.
+write(
+  "logo.svg",
+  '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 200 100"><script>parent.postMessage("pwned", "*")</script><rect width="200" height="100" fill="#0a7"/><circle cx="100" cy="50" r="30" fill="#fff"/><image href="https://evil.example/p.png" width="10" height="10"/></svg>',
+);
 write("house.stl", stl());
+write("house.obj", obj());
+write("house.ply", ply());
+write("house.glb", glb());
+write("house.gltf", gltf());
+// Files that must show the error state: a glTF whose buffer is another file,
+// a PLY with no faces, an OBJ that is a binary file.
+write("external.gltf", gltf({ external: true }));
+// Its buffer: given beside it, the model is drawn.
+write("house.bin", gltfParts().bin);
+write("cloud.ply", "ply\nformat ascii 1.0\nelement vertex 3\nproperty float x\nproperty float y\nproperty float z\nend_header\n0 0 0\n1 0 0\n0 1 0\n");
+write("object.obj", Buffer.from([0x4c, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00]));
 write("chime.wav", wav());
 write("house.ifc", ifc());
 write("stray.ifc", ifc({ stray: true }));
 const plan = fs.readFileSync(path.join(here, "plan.dwg"));
 write("plan.dxf", fs.readFileSync(path.join(here, "plan.dxf")));
 write("plan.dwg", plan);
+// exav-render's drawings of what the renderer draws its own way (cad.spec.ts),
+// generated by its tests/fixtures/dwg/make.py.
+const engineDrawings = path.join(here, "..", "..", "..", "exav-render", "tests", "fixtures", "dwg");
+for (const name of ["wide", "sheets", "viewport_text", "transparency", "not_drawn", "solid_only", "text_many", "halo", "circle", "colours", "xref_sheet", "xref_title", "xref_part", "wipeout_triangle"]) {
+  write(`cad-${name}.dxf`, zlib.gunzipSync(fs.readFileSync(path.join(engineDrawings, `${name}.dxf.gz`))));
+}
+// Split archives (volumes.spec.ts): RAR sets written by the official tool
+// (exav-unpack's fixtures; their members are noise.bin and text.txt), a ZIP cut
+// in two at a byte, and, where `zip` exists, one it spans over three files.
+const rarSets = path.join(here, "..", "..", "..", "exav-unpack", "tests", "fixtures", "rar_volumes");
+for (const f of fs.readdirSync(rarSets)) write(f, fs.readFileSync(path.join(rarSets, f)));
+const pair = zip([
+  ["one.txt", "hello"],
+  ["two.txt", "world"],
+]);
+write("docs.zip.001", pair.subarray(0, pair.length >> 1));
+write("docs.zip.002", pair.subarray(pair.length >> 1));
+{
+  const scratch = fs.mkdtempSync(path.join(out, "span-"));
+  try {
+    // Incompressible, so that three parts come of it.
+    let x = 0x9e3779b9;
+    const big = Buffer.alloc(300_000).map(() => ((x = (Math.imul(x, 1664525) + 1013904223) >>> 0), x >>> 24));
+    fs.writeFileSync(path.join(scratch, "big.bin"), big);
+    fs.writeFileSync(path.join(scratch, "small.txt"), "hello\n");
+    execFileSync("zip", ["-q", "-s", "100k", "span.zip", "big.bin", "small.txt"], { cwd: scratch, stdio: "ignore" });
+    for (const f of ["span.z01", "span.z02", "span.zip"]) write(f, fs.readFileSync(path.join(scratch, f)));
+  } catch {
+    console.warn("no zip: the spanned ZIP sample is not written");
+  } finally {
+    fs.rmSync(scratch, { recursive: true, force: true });
+  }
+}
+// A drawing and the files it refers to, in an archive (cad.spec.ts): the
+// references are found among the members, below the drawing's own folder.
+write(
+  "project.zip",
+  zip([
+    ["plans/sheet.dxf", fs.readFileSync(path.join(out, "cad-xref_sheet.dxf"))],
+    ["plans/xrefs/title.dwg", fs.readFileSync(path.join(out, "cad-xref_title.dxf"))],
+    ["plans/xrefs/part.dwg", fs.readFileSync(path.join(out, "cad-xref_part.dxf"))],
+  ]),
+);
+// A glTF and the buffer it names, in an archive (meshes.spec.ts): in folders,
+// the buffer below the document's own.
+write(
+  "models.zip",
+  zip([
+    ["models/scene.gltf", gltf({ external: true }).replace('"house.bin"', '"data/house.bin"')],
+    ["models/data/house.bin", gltfParts().bin],
+  ]),
+);
 const inner = zip([["photos/landscape.tif", tiff(px)]]);
 write(
   "delivery.zip",
diff --git a/crates/exav-viewer/e2e/fonts.conf b/crates/exav-viewer/e2e/fonts.conf
index bfa9a5cc..15ebbd02 100644
--- a/crates/exav-viewer/e2e/fonts.conf
+++ b/crates/exav-viewer/e2e/fonts.conf
@@ -5,9 +5,17 @@
   Subpixel antialiasing, which GitHub's Ubuntu runner has, gives text coloured
   fringes the pixel tests take for the colour they look for, and thins small
   glyphs below their ink threshold.
+
+  The generic families are the ones Chromium picks by itself (Times New Roman,
+  Arial, Courier New, which fontconfig maps to the Liberation fonts): Firefox
+  and WebKit ask fontconfig for a bare `serif`, which is DejaVu Serif here, a
+  third wider, and the pixel tests expect Chromium's text.
 -->
 <fontconfig>
   <include ignore_missing="yes">/etc/fonts/fonts.conf</include>
+  <alias binding="same"><family>serif</family><prefer><family>Liberation Serif</family></prefer></alias>
+  <alias binding="same"><family>sans-serif</family><prefer><family>Liberation Sans</family></prefer></alias>
+  <alias binding="same"><family>monospace</family><prefer><family>Liberation Mono</family></prefer></alias>
   <match target="font">
     <edit name="rgba" mode="assign"><const>none</const></edit>
   </match>
diff --git a/crates/exav-viewer/e2e/frame-protocol.spec.ts b/crates/exav-viewer/e2e/frame-protocol.spec.ts
new file mode 100644
index 00000000..ba5bd8d9
--- /dev/null
+++ b/crates/exav-viewer/e2e/frame-protocol.spec.ts
@@ -0,0 +1,223 @@
+// Messages over the sandboxed frame's port that the other specs do not see.
+// The viewport is worked out only while something follows or reads it: a
+// session that does not use it costs nothing for it (no second copy of the
+// workbook, no layout measured), and the host asks the frame to follow it
+// (`watch`) from the first listener to the last (`unwatch`). A request for a
+// picture that is none is answered `invalid`.
+//
+// The host's side of the port is recorded from the page: every message it
+// sends and every message it gets.
+import { expect, test, type Frame, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { openSample } from "./samples.js";
+
+failOnViolations();
+
+interface Message {
+  type?: string;
+  key?: string;
+  session?: number;
+  id?: number;
+  result?: { ok: boolean; code?: string };
+}
+interface Recorded {
+  __sent: Message[];
+  __got: Message[];
+  __port: MessagePort | undefined;
+  __seen: unknown[];
+  __stops: (() => void)[];
+  exavDemo: { session(): { controllers: { get(): Controllers } } };
+}
+interface Controllers {
+  viewport: { get(): Viewport; subscribe(f: (v: Viewport) => void): () => void };
+  zoom?: { setScale(n: number): void };
+}
+type Viewport = { space: string; page: number; region: { x: number; y: number; width: number; height: number } } | null;
+
+test.beforeEach(async ({ page }) => {
+  await page.addInitScript(() => {
+    // The page only: the frame has the same script run in it.
+    if (window !== window.top) return;
+    const w = window as unknown as Recorded;
+    w.__sent = [];
+    w.__got = [];
+    w.__seen = [];
+    w.__stops = [];
+    const post = MessagePort.prototype.postMessage as (this: MessagePort, ...a: unknown[]) => void;
+    const listening = new WeakSet<MessagePort>();
+    (MessagePort.prototype as unknown as { postMessage: unknown }).postMessage = function (this: MessagePort, ...args: unknown[]) {
+      const m = args[0] as Message | null;
+      if (m && typeof m === "object" && typeof m.type === "string") {
+        w.__sent.push({ type: m.type, key: m.key, session: m.session, id: m.id });
+        w.__port = this;
+        if (!listening.has(this)) {
+          listening.add(this);
+          this.addEventListener("message", (e) => {
+            const d = e.data as Message | null;
+            if (d && typeof d === "object") w.__got.push({ type: d.type, key: d.key, session: d.session, id: d.id, result: d.result });
+          });
+        }
+      }
+      return post.apply(this, args);
+    };
+  });
+});
+
+/** What the host sent of `types`, with the frame's numbers. */
+const sent = (page: Page, ...types: string[]) =>
+  page.evaluate((types) => (window as unknown as Recorded).__sent.filter((m) => types.includes(m.type!)).map((m) => `${m.type}:${m.session}:${m.key}`), types);
+
+/** The `state` messages for the viewport the frame has sent. */
+const reported = (page: Page) => page.evaluate(() => (window as unknown as Recorded).__got.filter((m) => m.type === "state" && m.key === "viewport").length);
+
+async function open(page: Page, name: string): Promise<void> {
+  await openSample(page, name);
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+  await page.waitForFunction(() => !!(window as unknown as Recorded).exavDemo?.session()?.controllers.get().viewport);
+}
+
+const frameOf = async (page: Page): Promise<Frame> => {
+  const frame = await (await page.locator(".demo-frame iframe.exav-viewer-sandbox").elementHandle())!.contentFrame();
+  if (!frame) throw new Error("no frame");
+  return frame;
+};
+
+/** Follows the viewport as a consumer would; `n` is the listener's number. */
+const follow = (page: Page) =>
+  page.evaluate(() => {
+    const w = window as unknown as Recorded;
+    w.__stops.push(w.exavDemo.session().controllers.get().viewport.subscribe((v) => w.__seen.push(v)));
+    return w.__stops.length;
+  });
+const leave = (page: Page, n: number) => page.evaluate((n) => (window as unknown as Recorded).__stops[n - 1]!(), n);
+const zoom = (page: Page, scale: number) => page.evaluate((scale) => (window as unknown as Recorded).exavDemo.session().controllers.get().zoom!.setScale(scale), scale);
+
+const FILES = ["report.pdf", "notes.docx", "visit.pptx", "quote.xlsx", "quote.csv", "landscape.png", "plan.dxf"];
+
+for (const name of FILES) {
+  test(`${name}: a session that does not use the viewport never watches it`, async ({ page }) => {
+    await open(page, name);
+    await page.waitForTimeout(1000);
+    expect(await sent(page, "watch", "unwatch")).toEqual([]);
+    expect(await reported(page)).toBe(0);
+  });
+}
+
+test("a spreadsheet opens no second copy of the workbook until its viewport is wanted", async ({ page }) => {
+  const workers: string[] = [];
+  page.on("worker", (w) => workers.push(w.url()));
+  await open(page, "quote.xlsx");
+  await page.waitForTimeout(1500);
+  await zoom(page, 1.5);
+  await page.waitForTimeout(500);
+  expect(workers).toHaveLength(1);
+  await follow(page);
+  await expect.poll(() => workers.length).toBe(2);
+});
+
+test("a Word document measures no page until its viewport is wanted", async ({ page }) => {
+  await open(page, "notes.docx");
+  const frame = await frameOf(page);
+  // The text layers the view is read from.
+  await frame.evaluate(() => {
+    const w = window as unknown as { __reads: number };
+    w.__reads = 0;
+    const original = Element.prototype.getBoundingClientRect;
+    Element.prototype.getBoundingClientRect = function (this: Element) {
+      if ((this as HTMLElement).dataset?.overlay === "text") w.__reads++;
+      return original.call(this);
+    };
+  });
+  const reads = () => frame.evaluate(() => (window as unknown as { __reads: number }).__reads);
+  await zoom(page, 1.5);
+  await frame.evaluate(() => document.querySelector(".exav-viewer-office")!.dispatchEvent(new Event("scroll")));
+  await page.waitForTimeout(500);
+  expect(await reads()).toBe(0);
+  const stop = await follow(page);
+  await expect.poll(reads).toBeGreaterThan(0);
+  await leave(page, stop);
+  await expect.poll(() => sent(page, "unwatch")).toHaveLength(1);
+  const after = await reads();
+  await zoom(page, 1);
+  await frame.evaluate(() => document.querySelector(".exav-viewer-office")!.dispatchEvent(new Event("scroll")));
+  await page.waitForTimeout(500);
+  expect(await reads()).toBe(after);
+});
+
+test("the frame follows the viewport from the first listener to the last, and not after", async ({ page }) => {
+  await open(page, "quote.xlsx");
+  const first = await follow(page);
+  await expect.poll(() => sent(page, "watch", "unwatch")).toEqual(["watch:0:viewport"]);
+  // Measured on the second copy, then reported.
+  await expect.poll(() => page.evaluate(() => (window as unknown as Recorded).__seen.at(-1) as Viewport)).toMatchObject({ space: "page", page: 1 });
+  const second = await follow(page);
+  await page.waitForTimeout(300);
+  expect(await sent(page, "watch", "unwatch")).toEqual(["watch:0:viewport"]);
+  // Followed: the zoom moves the view, and the host hears of it.
+  const before = await reported(page);
+  await zoom(page, 2);
+  await expect.poll(() => reported(page)).toBeGreaterThan(before);
+  await leave(page, first);
+  await page.waitForTimeout(300);
+  expect(await sent(page, "unwatch")).toEqual([]);
+  await leave(page, second);
+  await expect.poll(() => sent(page, "watch", "unwatch")).toEqual(["watch:0:viewport", "unwatch:0:viewport"]);
+  // Nobody follows: the frame says nothing more of it.
+  await page.waitForTimeout(500);
+  const quiet = await reported(page);
+  await zoom(page, 1);
+  await page.waitForTimeout(1000);
+  expect(await reported(page)).toBe(quiet);
+  // Followed again later: watched again.
+  await follow(page);
+  await expect.poll(() => sent(page, "watch")).toHaveLength(2);
+});
+
+test("a read with no listener has the viewport, each read asking the frame for the next", async ({ page }) => {
+  await open(page, "report.pdf");
+  const read = () => page.evaluate(() => (window as unknown as Recorded).exavDemo.session().controllers.get().viewport.get());
+  // The first read has what the frame has not told yet; the next has the answer.
+  await expect.poll(read).toMatchObject({ space: "page", page: 1 });
+  const view = (await read())!;
+  expect(view.region.x).toBeGreaterThanOrEqual(0);
+  expect(view.region.y).toBeGreaterThanOrEqual(0);
+  expect(view.region.width).toBeGreaterThan(0);
+  expect(view.region.x + view.region.width).toBeLessThanOrEqual(1.0001);
+  expect(view.region.y + view.region.height).toBeLessThanOrEqual(1.0001);
+  const told = await sent(page, "watch", "unwatch");
+  expect(told.length).toBeGreaterThanOrEqual(2);
+  expect(told.length % 2).toBe(0);
+  // Each read asked and let go at once: they pair up.
+  expect(told.filter((m) => m.startsWith("watch")).length).toBe(told.filter((m) => m.startsWith("unwatch")).length);
+  expect(told.every((m, i) => m === (i % 2 === 0 ? "watch:0:viewport" : "unwatch:0:viewport"))).toBe(true);
+  expect(await reported(page)).toBeGreaterThan(0);
+});
+
+test("a request for a picture that is none is answered invalid, not left waiting", async ({ page }) => {
+  await open(page, "report.pdf");
+  const answers = await page.evaluate(async () => {
+    const w = window as unknown as Recorded;
+    const port = w.__port!;
+    const ask = (id: number, message: Record<string, unknown>) =>
+      new Promise<string>((resolve) => {
+        const timer = setTimeout(() => resolve("no answer"), 5000);
+        port.addEventListener("message", function listener(e) {
+          const d = e.data as Message;
+          if (d?.type !== "rastered" || d.id !== id) return;
+          clearTimeout(timer);
+          port.removeEventListener("message", listener);
+          resolve(d.result!.ok ? "drawn" : d.result!.code!);
+        });
+        port.postMessage({ type: "raster", id, session: 0, page: 1, ...message });
+      });
+    return {
+      size: await ask(9001, { options: { longEdge: -5 } }),
+      colour: await ask(9002, { options: { longEdge: 100, background: "url(https://example.test/x)" } }),
+      none: await ask(9003, {}),
+      page: await ask(9004, { page: 0, options: { longEdge: 100 } }),
+      fine: await ask(9005, { options: { longEdge: 100 } }),
+    };
+  });
+  expect(answers).toEqual({ size: "invalid", colour: "invalid", none: "invalid", page: "invalid", fine: "drawn" });
+});
diff --git a/crates/exav-viewer/e2e/frame.spec.ts b/crates/exav-viewer/e2e/frame.spec.ts
index 7ca089f0..06cb76d7 100644
--- a/crates/exav-viewer/e2e/frame.spec.ts
+++ b/crates/exav-viewer/e2e/frame.spec.ts
@@ -26,13 +26,13 @@ failOnViolations();
 
 async function open(page: Page, name: string): Promise<Frame> {
   await openSample(page, name);
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
   return inside(page);
 }
 
 /** The document of the frame the demo shows. */
 async function inside(page: Page): Promise<Frame> {
-  const frame = await (await page.locator(".demo-frame iframe.exv-sandbox").elementHandle())!.contentFrame();
+  const frame = await (await page.locator(".demo-frame iframe.exav-viewer-sandbox").elementHandle())!.contentFrame();
   if (!frame) throw new Error("no frame");
   return frame;
 }
@@ -67,9 +67,9 @@ for (const served of ["headers", "meta"] as const) {
 
     test("the frame is an iframe sandboxed to scripts, in an opaque origin", async ({ page }) => {
       const frame = await open(page, "report.pdf");
-      const iframe = page.locator(".demo-frame iframe.exv-sandbox");
+      const iframe = page.locator(".demo-frame iframe.exav-viewer-sandbox");
       await expect(iframe).toHaveAttribute("sandbox", "allow-scripts");
-      await expect(iframe).toHaveAttribute("allow", "");
+      await expect(iframe).toHaveAttribute("allow", "autoplay");
       await expect(iframe).toHaveAttribute("referrerpolicy", "no-referrer");
       expect(await frame.evaluate(() => [self.origin, document.referrer])).toEqual(["null", ""]);
     });
@@ -227,15 +227,15 @@ test.describe("the host", () => {
   test("a frame that navigates itself away is dropped", async ({ page }) => {
     const frame = await open(page, "report.pdf");
     await frame.evaluate(() => (location.href = "/frame/licenses/README.txt"));
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "error");
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "error");
   });
 
   test("one frame per file: the next file gets a new one, the last is gone", async ({ page }) => {
     await open(page, "report.pdf");
     const first = await inside(page);
     await pick(page, "landscape.tif");
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-    await expect(page.locator("iframe.exv-sandbox")).toHaveCount(1);
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    await expect(page.locator("iframe.exav-viewer-sandbox")).toHaveCount(1);
     expect(first.isDetached()).toBe(true);
   });
 });
@@ -273,8 +273,8 @@ test.describe("formats", () => {
     const draw = async (pdf: string, query: string, inFrame: boolean): Promise<Pixels> => {
       await page.goto(`./?lang=en${query}`);
       await page.getByTestId("file-input").setInputFiles({ name: pdf, mimeType: "application/pdf", buffer: fs.readFileSync(path.join(fixtures, pdf)) });
-      await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-      const canvas = (inFrame ? page.frameLocator(".demo-frame iframe.exv-sandbox") : page.locator(".demo-frame")).locator(".exv-pdf-bitmap").first();
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+      const canvas = (inFrame ? page.frameLocator(".demo-frame iframe.exav-viewer-sandbox") : page.locator(".demo-frame")).locator(".exav-viewer-pdf-bitmap").first();
       const read = async () => decodePng(Buffer.from((await canvas.evaluate((c: HTMLCanvasElement) => c.toDataURL("image/png"))).split(",")[1]!, "base64"));
       // Sized once pdf.js has drawn into it: 300 x 150 is a new canvas's.
       await expect.poll(() => canvas.evaluate((c: HTMLCanvasElement) => `${c.width}x${c.height}`)).not.toBe("300x150");
diff --git a/crates/exav-viewer/e2e/headless.spec.ts b/crates/exav-viewer/e2e/headless.spec.ts
new file mode 100644
index 00000000..204112c1
--- /dev/null
+++ b/crates/exav-viewer/e2e/headless.spec.ts
@@ -0,0 +1,126 @@
+// A host that draws its own controls (demo/headless.html): every button is
+// the page's, driven by the session's controllers; the frame draws the
+// document alone, takes the page's colours, and hands back the keys the
+// document does not use.
+import { expect, test, type Frame, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { sample } from "./samples.js";
+
+failOnViolations();
+
+type Phase = "loading" | "ready" | "error" | "empty" | "none";
+
+const phase = (page: Page) =>
+  page.evaluate(() => {
+    const s = (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session();
+    return (s?.status.get().phase ?? "none") as Phase;
+  });
+
+async function open(page: Page, name: string, mimeType = ""): Promise<Frame> {
+  await page.goto("./headless.html?lang=en");
+  await page.getByTestId("file-input").setInputFiles({ name, mimeType, buffer: sample(name) });
+  await expect.poll(() => phase(page), { timeout: 30_000 }).toBe("ready");
+  const frame = await (await page.locator("#stage iframe").elementHandle())!.contentFrame();
+  if (!frame) throw new Error("no frame");
+  return frame;
+}
+
+const heard = (page: Page) => page.locator("#keys li");
+
+test("a PDF: the page's page field, zoom and thumbnails drive it", async ({ page }) => {
+  const frame = await open(page, "report.pdf");
+  const field = page.locator('#controls input[type="number"]');
+  await expect(field).toHaveValue("1");
+  await expect(page.locator("#controls")).toContainText("/ 3");
+  // A picture of each page, from the frame, drawn on this page's canvases.
+  await expect(page.locator("#thumbs canvas")).toHaveCount(3);
+  const size = await page.locator("#thumbs canvas").first().evaluate((c: HTMLCanvasElement) => [c.width, c.height]);
+  expect(size[1]).toBeGreaterThan(size[0]!);
+  await page.locator("#thumbs button").nth(2).click();
+  await expect(field).toHaveValue("3");
+  await field.fill("2");
+  await field.dispatchEvent("change");
+  await expect(field).toHaveValue("2");
+  const zoom = page.locator("#controls .zoom");
+  const before = await zoom.textContent();
+  await page.getByTitle("Zoom in").click();
+  await expect(zoom).not.toHaveText(before!);
+  await expect(frame.locator(".exav-viewer-pdf-page").first()).toBeVisible();
+});
+
+test("keys the document does not use reach the page; those it uses stay in the frame", async ({ page }) => {
+  const frame = await open(page, "report.pdf");
+  // The focus in the frame, on the document.
+  await frame.locator(".exav-viewer-pdf-page").first().click();
+  await page.keyboard.press("ArrowDown");
+  await page.keyboard.press("ArrowRight");
+  await expect(heard(page)).toHaveText(["ArrowRight (from the frame)"]);
+  // Down is the document's while it can scroll: it scrolled.
+  expect(await frame.locator(".exav-viewer-pdf-scroller").evaluate((s) => s.scrollTop)).toBeGreaterThan(0);
+  // Never a key that types or a shortcut.
+  await page.keyboard.press("Delete");
+  await page.keyboard.press("Control+ArrowLeft");
+  await expect(heard(page)).toHaveCount(1);
+  // Escape closes the file, as the page's own listener does.
+  await page.keyboard.press("Escape");
+  await expect(page.locator("#stage iframe")).toHaveCount(0);
+  await expect(heard(page).last()).toHaveText("Escape (from the frame)");
+});
+
+test("the frame takes the page's colours, and again when they change", async ({ page }) => {
+  const frame = await open(page, "notes.txt");
+  const look = () =>
+    frame.locator(".exav-viewer-text").evaluate((e) => {
+      const s = getComputedStyle(e);
+      return [s.backgroundColor, s.color, getComputedStyle(document.documentElement).colorScheme];
+    });
+  expect(await look()).toEqual(["rgb(255, 253, 248)", "rgb(29, 27, 23)", "light"]);
+  await page.locator("#scheme").click();
+  await expect.poll(look).toEqual(["rgb(42, 41, 48)", "rgb(244, 242, 250)", "dark"]);
+});
+
+test("a player with no controls of its own, played and paused by the page's", async ({ page }) => {
+  const frame = await open(page, "chime.wav");
+  const audio = frame.locator("audio");
+  expect(await audio.evaluate((a: HTMLAudioElement) => a.controls)).toBe(false);
+  await expect(page.locator("#controls .clock")).toHaveText("0:00 / 0:02");
+  await page.getByTestId("play").click();
+  await expect(page.getByTestId("play")).toHaveText("⏸");
+  expect(await audio.evaluate((a: HTMLAudioElement) => a.paused)).toBe(false);
+  await page.getByTestId("play").click();
+  await expect(page.getByTestId("play")).toHaveText("▶");
+  await page.locator('#controls input[type="range"]').fill("1");
+  await expect.poll(() => audio.evaluate((a: HTMLAudioElement) => Math.round(a.currentTime))).toBe(1);
+});
+
+test("a workbook's sheets are the page's tabs", async ({ page }) => {
+  await open(page, "book.xlsx");
+  const tabs = page.locator("#sheets button");
+  await expect(tabs).toHaveText(["Quote", "Notes"]);
+  await expect(tabs.first()).toHaveAttribute("aria-selected", "true");
+  await tabs.nth(1).click();
+  await expect(tabs.nth(1)).toHaveAttribute("aria-selected", "true");
+  await expect(tabs.first()).toHaveAttribute("aria-selected", "false");
+});
+
+test("an SVG is drawn, its script not run and its image not fetched", async ({ page }) => {
+  const messages: unknown[] = [];
+  await page.exposeFunction("heardMessage", (m: unknown) => void messages.push(m));
+  await page.addInitScript(() => addEventListener("message", (e) => (window as unknown as { heardMessage(m: unknown): void }).heardMessage(e.data)));
+  const requests: string[] = [];
+  page.on("request", (r) => requests.push(r.url()));
+  // Typed as nothing in particular: the name says SVG, and an `<img>` draws SVG only when typed so.
+  const frame = await open(page, "logo.svg", "application/octet-stream");
+  const drawn = await frame.locator(".exav-viewer-image-picture").evaluate((img: HTMLImageElement) => [img.tagName, img.naturalWidth > 0 || img.complete]);
+  expect(drawn).toEqual(["IMG", true]);
+  // Its size is its viewBox's: a picture of it has its proportions.
+  const picture = await page.evaluate(async () => {
+    const s = (window as unknown as { headless: { session(): { controllers: { get(): { pictures?: { render(p: number, e: number): Promise<ImageBitmap | null> } } } } } }).headless.session();
+    const b = await s.controllers.get().pictures!.render(1, 400);
+    return b && [b.width, b.height];
+  });
+  expect(picture).toEqual([400, 200]);
+  expect(messages).not.toContain("pwned");
+  expect(requests.filter((u) => u.includes("evil.example"))).toEqual([]);
+});
diff --git a/crates/exav-viewer/e2e/lifetime.spec.ts b/crates/exav-viewer/e2e/lifetime.spec.ts
index 7059124e..681989fd 100644
--- a/crates/exav-viewer/e2e/lifetime.spec.ts
+++ b/crates/exav-viewer/e2e/lifetime.spec.ts
@@ -41,7 +41,7 @@ test.beforeEach(async ({ page }) => {
 
 async function show(page: Page, button: RegExp) {
   await page.getByRole("button", { name: button }).first().click();
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
 }
 
 const ROUND = [/plan\.dwg/, /house\.stl/, /plan\.dxf/, /house\.ifc/, /landscape\.tif/];
@@ -51,10 +51,10 @@ test("walking through drawings and models leaves one context and no stray worker
   // The engines in the page: in the sandboxed frame, a file's workers and
   // contexts go with its frame (frame.spec.ts).
   await openSample(page, "report.pdf", { mode: "page" });
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
   // Opened by the user, the files are listed in the sidebar, one button each.
   await pick(page, "plan.dwg", "house.stl", "plan.dxf", "house.ifc", "landscape.tif", "report.pdf");
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
 
   // One round first: each engine's lasting pieces (pdf.js's worker, which
   // every PDF shares) are then in place.
diff --git a/crates/exav-viewer/e2e/meshes.spec.ts b/crates/exav-viewer/e2e/meshes.spec.ts
new file mode 100644
index 00000000..68c1975c
--- /dev/null
+++ b/crates/exav-viewer/e2e/meshes.spec.ts
@@ -0,0 +1,135 @@
+// OBJ, PLY and glTF in the demo, in the sandboxed frame and in the page. The
+// samples are one house (fixtures/make-samples.mjs): the STL's thirty
+// triangles, written as polygons in Y-up coordinates for OBJ and PLY, and as
+// two nodes of a glTF, one moved. Drawn by the same camera, each silhouette is
+// the STL's: a transform read wrongly, a polygon left out or a Z-up file
+// stood on its side would change it.
+import { expect, test, type FrameLocator, type Locator, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { decodePng, difference, find, type Pixels } from "./pixels.js";
+import { openSample, pick } from "./samples.js";
+
+failOnViolations();
+
+/** The triangle count the session reports (`controllers.info`), once it has. */
+const triangles =(page: Page) =>
+  page.evaluate(() => (window as unknown as { exavDemo: { session(): { controllers: { get(): { info?: { get(): { triangles: number } } } } } | null } }).exavDemo.session()?.controllers.get().info?.get().triangles);
+
+async function shot(target: Locator): Promise<Pixels> {
+  const set = (value: string) => target.page().locator(".exav-viewer-tools").evaluateAll((els, v) => els.forEach((e) => ((e as HTMLElement).style.visibility = v)), value);
+  await set("hidden");
+  try {
+    return decodePng(await target.screenshot({ animations: "disabled" }));
+  } finally {
+    await set("");
+  }
+}
+
+async function settled(target: Locator): Promise<Pixels> {
+  let last = await shot(target);
+  for (let i = 0; i < 20; i++) {
+    await target.page().waitForTimeout(150);
+    const next = await shot(target);
+    if (difference(last, next) === 0) return next;
+    last = next;
+  }
+  return last;
+}
+
+/** What differs from the ground by more than a shadow does. */
+function body(p: Pixels) {
+  const [r0, g0, b0] = [p.data[0]!, p.data[1]!, p.data[2]!];
+  return find(p, (r, g, b) => Math.max(Math.abs(r - r0), Math.abs(g - g0), Math.abs(b - b0)) > 70);
+}
+
+for (const mode of ["sandbox", "page"] as const) {
+  const engine = (page: Page): FrameLocator | Locator => (mode === "sandbox" ? page.frameLocator(".demo-frame iframe.exav-viewer-sandbox") : page.locator(".demo-frame"));
+  const phase = (page: Page) => page.locator(".demo-frame .exav-viewer-body");
+
+  async function open(page: Page, name: string) {
+    await openSample(page, name, mode === "page" ? { mode } : {});
+    await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+  }
+
+  test.describe(mode, () => {
+    for (const name of ["house.obj", "house.ply", "house.glb", "house.gltf"]) {
+      test(`${name} has the house's thirty triangles and the STL's silhouette`, async ({ page }) => {
+        await open(page, "house.stl");
+        const reference = body(await settled(engine(page).locator(".exav-viewer-model-canvas")));
+        expect(reference.count).toBeGreaterThan(10_000);
+
+        await pick(page, name);
+        await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+        await expect.poll(() => triangles(page)).toBe(30);
+        // No warning: nothing was left out.
+        await expect(page.locator(".exav-viewer-warnings")).toHaveCount(0);
+        const canvas = engine(page).locator(".exav-viewer-model-canvas");
+        const pixels = await settled(canvas);
+        const found = body(pixels);
+        // Framed whole: not cut by an edge (the camera frames as it does an STL's).
+        const box = found.box!;
+        expect(box.minX).toBeGreaterThan(pixels.width * 0.03);
+        expect(box.minY).toBeGreaterThan(pixels.height * 0.03);
+        expect(box.maxX).toBeLessThan(pixels.width * 0.97);
+        expect(box.maxY).toBeLessThan(pixels.height - 1);
+        // The STL's silhouette, give or take the edge pixels (another colour tests differently against the ground).
+        const ref = reference.box!;
+        for (const k of ["minX", "minY", "maxX", "maxY"] as const) expect(Math.abs(box[k] - ref[k]), k).toBeLessThanOrEqual(6);
+        expect(found.count).toBeGreaterThan(10_000);
+      });
+    }
+
+    test("vertex colours and material colours show, and a file with none is grey", async ({ page }) => {
+      const warm = (r: number, g: number, b: number) => r - b > 60;
+      const cool = (r: number, g: number, b: number) => b - r > 60;
+      for (const [name, coloured] of [["house.ply", true], ["house.glb", true], ["house.obj", false]] as const) {
+        await open(page, name === "house.ply" ? "house.obj" : name);
+        if (name === "house.ply") {
+          await pick(page, name);
+          await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+        }
+        const p = await settled(engine(page).locator(".exav-viewer-model-canvas"));
+        expect(find(p, warm).count > 500, `${name} warm`).toBe(coloured);
+        expect(find(p, cool).count > 500, `${name} cool`).toBe(coloured);
+      }
+    });
+
+    test("a glTF whose buffer is another file is drawn when that file is given with it", async ({ page }) => {
+      await page.goto(`./?${new URLSearchParams({ lang: "en", ...(mode === "page" ? { mode } : {}) })}`);
+      await pick(page, "external.gltf", "house.bin");
+      await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+      await expect.poll(() => triangles(page)).toBe(30);
+    });
+
+    test("a glTF in an archive is drawn from the buffer file in the archive, in a folder below it", async ({ page }) => {
+      await openSample(page, "models.zip", mode === "page" ? { mode } : {});
+      await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+      await page.locator(".demo-frame").getByRole("button", { name: /scene\.gltf/ }).click();
+      await expect(engine(page).locator(".exav-viewer-model-canvas")).toHaveCount(1);
+      const p = await settled(engine(page).locator(".exav-viewer-model-canvas"));
+      // The house, as when it is opened on its own.
+      expect(find(p, (r, g, b) => r < 200 || g < 200 || b < 200).count).toBeGreaterThan(500);
+      await expect(page.locator(".demo-frame .exav-viewer-status-error")).toHaveCount(0);
+    });
+
+    for (const [name, why] of [
+      ["external.gltf", "a glTF whose buffer is another file"],
+      ["cloud.ply", "a PLY without faces"],
+      ["object.obj", "an OBJ that is a binary file"],
+    ] as const) {
+      test(`${why} shows the error and the viewer goes on`, async ({ page }) => {
+        const requests: string[] = [];
+        page.on("request", (r) => requests.push(r.url()));
+        await openSample(page, name, mode === "page" ? { mode } : {});
+        await expect(phase(page)).toHaveAttribute("data-phase", "error");
+        await expect(page.locator(".exav-viewer-status-error")).toHaveText("This model could not be shown.");
+        // Nothing named by the file was asked for.
+        expect(requests.filter((u) => u.includes("house.bin"))).toEqual([]);
+        await pick(page, "house.obj");
+        await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+        await expect.poll(() => triangles(page)).toBe(30);
+      });
+    }
+  });
+}
diff --git a/crates/exav-viewer/e2e/model-raster.spec.ts b/crates/exav-viewer/e2e/model-raster.spec.ts
new file mode 100644
index 00000000..f8796575
--- /dev/null
+++ b/crates/exav-viewer/e2e/model-raster.spec.ts
@@ -0,0 +1,642 @@
+// The pictures and the viewport of 3D models (IFC, STL, OBJ): drawn again from
+// the geometry by an off-screen renderer at any size, in tiles when needed,
+// from a camera in the file's own coordinates.
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { decodePng, difference, find, type Pixels } from "./pixels.js";
+import { openSample, pick } from "./samples.js";
+
+failOnViolations();
+
+type Which = "exavDemo" | "headless";
+type Camera = {
+  position: number[];
+  target: number[];
+  up?: number[];
+  projection: { type: "perspective"; fov: number } | { type: "orthographic"; height: number };
+  aspect: number;
+};
+type Info = { width: number; height: number; page: number; space: string; region: Camera };
+type Options = Record<string, unknown>;
+
+declare global {
+  interface Window {
+    glContexts: { ctx: WebGLRenderingContext | WebGL2RenderingContext; offscreen: boolean }[];
+    viewports: string[];
+  }
+}
+
+test.beforeEach(async ({ page }) => {
+  // Each picture builds its own context, lights and shaders: seconds on a software GPU.
+  test.setTimeout(600_000);
+  await page.addInitScript(() => {
+    // Every WebGL context made, and the size of every viewport set: to see what is freed and how a picture is cut.
+    window.glContexts = [];
+    window.viewports = [];
+    const watch = (proto: { getContext: (...a: never[]) => unknown }, offscreen: boolean) => {
+      const real = proto.getContext;
+      proto.getContext = function (this: unknown, ...a: never[]) {
+        const ctx = real.apply(this, a) as WebGLRenderingContext | null;
+        if (ctx && typeof (ctx as WebGLRenderingContext).viewport === "function" && !window.glContexts.some((g) => g.ctx === ctx)) window.glContexts.push({ ctx, offscreen });
+        return ctx;
+      } as never;
+    };
+    watch(HTMLCanvasElement.prototype as never, false);
+    if (typeof OffscreenCanvas === "function") watch(OffscreenCanvas.prototype as never, true);
+    for (const C of [WebGLRenderingContext, typeof WebGL2RenderingContext === "function" ? WebGL2RenderingContext : null]) {
+      if (!C) continue;
+      const real = C.prototype.viewport;
+      C.prototype.viewport = function (this: WebGLRenderingContext, x: number, y: number, w: number, h: number) {
+        window.viewports.push(`${w}x${h}`);
+        return real.call(this, x, y, w, h);
+      };
+    }
+  });
+});
+
+const phase = (page: Page) => page.locator(".demo-frame .exav-viewer-body");
+
+async function open(page: Page, name: string, params: Record<string, string> = { mode: "page" }) {
+  await openSample(page, name, params);
+  await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+}
+
+const canvas = (page: Page) => page.locator(".demo-frame .exav-viewer-model-canvas");
+
+async function shot(page: Page): Promise<Pixels> {
+  const set = (value: string) => page.locator(".exav-viewer-tools").evaluateAll((els, v) => els.forEach((e) => ((e as HTMLElement).style.visibility = v)), value);
+  await set("hidden");
+  try {
+    return decodePng(await canvas(page).screenshot({ animations: "disabled" }));
+  } finally {
+    await set("");
+  }
+}
+
+async function settled(page: Page): Promise<Pixels> {
+  let last = await shot(page);
+  for (let i = 0; i < 30; i++) {
+    await page.waitForTimeout(150);
+    const next = await shot(page);
+    if (difference(last, next) === 0) return next;
+    last = next;
+  }
+  return last;
+}
+
+/** The picture as the session's `toBlob` gives it (PNG), read here. */
+async function exportPng(page: Page, options: Options, which: Which = "exavDemo"): Promise<{ px: Pixels; info: Info }> {
+  const started = Date.now();
+  const out = await page.evaluate(
+    async ([which, options]) => {
+      const session = (window as unknown as Record<string, { session(): { controllers: { get(): { pictures: { toBlob(p: number, o: unknown): Promise<{ blob: Blob } & Record<string, unknown>> } } } } }>)[which as string]!.session();
+      const { blob, ...info } = await session.controllers.get().pictures.toBlob(1, { ...(options as object), type: "png" });
+      const bytes = new Uint8Array(await blob.arrayBuffer());
+      let s = "";
+      for (let i = 0; i < bytes.length; i += 0x8000) s += String.fromCharCode(...bytes.subarray(i, i + 0x8000));
+      return { b64: btoa(s), info };
+    },
+    [which, options] as const,
+  );
+  console.log(`picture ${out.info.width}x${out.info.height}: ${Date.now() - started} ms`);
+  return { px: decodePng(Buffer.from(out.b64, "base64")), info: out.info as unknown as Info };
+}
+
+/** The error code a picture is refused with, or "none". */
+const failure = (page: Page, options: Options, which: Which = "exavDemo") =>
+  page.evaluate(
+    async ([which, options]) => {
+      const session = (window as unknown as Record<string, { session(): { controllers: { get(): { pictures: { raster(p: number, o: unknown): Promise<{ bitmap: ImageBitmap }> } } } } }>)[which as string]!.session();
+      try {
+        (await session.controllers.get().pictures.raster(1, options)).bitmap.close();
+        return "none";
+      } catch (e) {
+        return (e as { code?: string }).code ?? String(e);
+      }
+    },
+    [which, options] as const,
+  );
+
+const viewport = (page: Page, which: Which = "exavDemo") =>
+  page.evaluate((which) => {
+    const s = (window as unknown as Record<string, { session(): { controllers: { get(): { viewport: { get(): unknown } } } } }>)[which]!.session();
+    return s.controllers.get().viewport.get() as { space: string; page: number; region: Camera } | null;
+  }, which);
+
+const at = (p: Pixels, x: number, y: number) => {
+  const i = (Math.floor(y) * p.width + Math.floor(x)) * 4;
+  return [p.data[i]!, p.data[i + 1]!, p.data[i + 2]!, p.data[i + 3]!];
+};
+
+const RED = [255, 0, 0, 255];
+const isRed = (c: number[]) => c[0]! > 250 && c[1]! < 5 && c[2]! < 5 && c[3] === 255;
+
+/** The mask of what is not the picture's corner colour. */
+const body = (p: Pixels) => find(p, (r, g, b) => Math.max(Math.abs(r - p.data[0]!), Math.abs(g - p.data[1]!), Math.abs(b - p.data[2]!)) > 40);
+
+/** Top view of the STL house (x 0..60, y 0..30, Z up), 10 px a unit at 600 x 400, the ground red. */
+const STL_TOP: Camera = { position: [30, 15, 100], target: [30, 15, 0], up: [0, 1, 0], projection: { type: "orthographic", height: 40 }, aspect: 1.5 };
+/** The IFC house (x 0..12, y 0..8, walls 3 m high on a slab). */
+const IFC_TOP: Camera = { position: [6, 4, 50], target: [6, 4, 0], up: [0, 1, 0], projection: { type: "orthographic", height: 12 }, aspect: 1.5 };
+
+test.describe("the picture is the viewer's view", () => {
+  for (const name of ["house.stl", "house.ifc"]) {
+    test(`${name}: region "current" equals a screenshot of the canvas, also after the user orbits`, async ({ page }) => {
+      await open(page, name);
+      const reference = await settled(page);
+      const view = (await viewport(page))!;
+      expect(view.space).toBe("camera");
+      expect(view.page).toBe(1);
+      expect(view.region.aspect).toBeCloseTo(reference.width / reference.height, 2);
+      expect(view.region.up).toBeDefined();
+      const { px, info } = await exportPng(page, { width: reference.width, height: reference.height, region: "current" });
+      expect([px.width, px.height]).toEqual([reference.width, reference.height]);
+      expect(info).toMatchObject({ width: reference.width, height: reference.height, page: 1, space: "camera" });
+      // The camera used is the one in view.
+      info.region.position.forEach((v, i) => expect(v).toBeCloseTo(view.region.position[i]!, 6));
+      info.region.target.forEach((v, i) => expect(v).toBeCloseTo(view.region.target[i]!, 6));
+      expect(info.region.projection.type).toBe("perspective");
+      // The picture's pixels round the canvas's shape, which moves the field of view by a fraction of a degree.
+      expect((info.region.projection as { fov: number }).fov).toBeCloseTo((view.region.projection as { fov: number }).fov, 0);
+      const diff = difference(reference, px);
+      console.log(name, "mean difference", diff);
+      expect(diff).toBeLessThan(3);
+      // Only silhouette pixels (and the IFC's floor grid, which the picture leaves out) may differ much.
+      let far = 0;
+      for (let i = 0; i < reference.data.length; i += 4) if (Math.max(Math.abs(reference.data[i]! - px.data[i]!), Math.abs(reference.data[i + 1]! - px.data[i + 1]!), Math.abs(reference.data[i + 2]! - px.data[i + 2]!)) > 40) far++;
+      console.log(name, "pixels differing by more than 40:", far, "of", reference.width * reference.height);
+      // (The IFC's grid lines are about 1% of its pixels.)
+      expect(far).toBeLessThan(reference.width * reference.height * (name === "house.ifc" ? 0.012 : 0.002));
+
+      // The user orbits: the viewport follows, and the picture follows it.
+      const box = (await canvas(page).boundingBox())!;
+      await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+      await page.mouse.down();
+      await page.mouse.move(box.x + box.width / 2 + 120, box.y + box.height / 2 - 40, { steps: 8 });
+      await page.mouse.up();
+      await expect.poll(async () => (await viewport(page))!.region.position[0]).not.toBeCloseTo(view.region.position[0]!, 3);
+      // Damping has settled: the screenshot stops changing, and the viewport is at the final camera.
+      const moved = await settled(page);
+      await page.waitForTimeout(300);
+      const again = await exportPng(page, { width: moved.width, height: moved.height, region: "current" });
+      const diff2 = difference(moved, again.px);
+      console.log(name, "mean difference after orbit", diff2);
+      expect(diff2).toBeLessThan(3);
+      expect(difference(reference, moved)).toBeGreaterThan(difference(moved, again.px));
+    });
+  }
+
+  test("a viewport read back is the same view as 'current'", async ({ page }) => {
+    await open(page, "house.stl");
+    await settled(page);
+    const view = (await viewport(page))!;
+    const a = await exportPng(page, { width: 300, height: 200, region: "current" });
+    const b = await exportPng(page, { width: 300, height: 200, region: view.region });
+    expect(difference(a.px, b.px)).toBeLessThan(0.5);
+  });
+
+  test("with no region the picture is the model framed as the viewer opens it, in the canvas's shape", async ({ page }) => {
+    await open(page, "house.stl");
+    const reference = await settled(page);
+    const { px, info } = await exportPng(page, { longEdge: 500 });
+    expect(px.width).toBe(500);
+    expect(px.height / px.width).toBeCloseTo(reference.height / reference.width, 1);
+    expect(info.region.aspect).toBeCloseTo(reference.width / reference.height, 2);
+    // Whole in the picture, not cut by an edge.
+    const box = body(px).box!;
+    expect(box.minX).toBeGreaterThan(2);
+    expect(box.minY).toBeGreaterThan(2);
+    expect(box.maxX).toBeLessThan(px.width - 3);
+    expect(box.maxY).toBeLessThan(px.height - 3);
+  });
+});
+
+test.describe("a known camera", () => {
+  test("STL from above: the colours are where the camera says, in both fits", async ({ page }) => {
+    await open(page, "house.stl");
+    const { px, info } = await exportPng(page, { width: 600, height: 400, region: STL_TOP, background: "#ff0000" });
+    expect(info.region.projection).toEqual({ type: "orthographic", height: 40 });
+    expect(info.region.aspect).toBeCloseTo(1.5, 9);
+    // Beyond the house, south of it where no shadow falls: the ground asked for, to the pixel.
+    expect(at(px, 5, 395)).toEqual(RED);
+    expect(at(px, 200, 360)).toEqual(RED);
+    expect(at(px, 500, 330)).toEqual(RED);
+    expect(at(px, 595, 395)).toEqual(RED);
+    expect(at(px, 590, 5)).toEqual(RED);
+    // The roof and the annex.
+    for (const [x, y] of [
+      [200, 200],
+      [100, 150],
+      [300, 320],
+      [500, 200],
+      [450, 120],
+    ] as const) {
+      const c = at(px, x, y);
+      expect(isRed(c), `${x},${y}`).toBe(false);
+      expect(c[3]).toBe(255);
+      // The grey-blue of the surface: blue over red.
+      expect(c[2]! - c[0]!, `${x},${y}`).toBeGreaterThan(5);
+    }
+    // The silhouette: the house is 40 x 30 units, the annex 20 x 20, at 10 px a unit.
+    const box = find(px, (r, _g, b) => b - r > 5).box!;
+    expect(box.minX).toBeLessThanOrEqual(1);
+    expect(box.maxX).toBeGreaterThanOrEqual(598);
+    expect(Math.abs(box.minY - 50)).toBeLessThanOrEqual(1);
+    expect(Math.abs(box.maxY - 349)).toBeLessThanOrEqual(1);
+
+    // A square picture of a 3:2 camera: "contain" keeps its width (a taller view), "cover" its height.
+    const contain = await exportPng(page, { width: 600, height: 600, region: STL_TOP, background: "#ff0000", fit: "contain" });
+    const cover = await exportPng(page, { width: 600, height: 600, region: STL_TOP, background: "#ff0000", fit: "cover" });
+    expect(contain.info.region.projection).toEqual({ type: "orthographic", height: 60 });
+    expect(cover.info.region.projection).toEqual({ type: "orthographic", height: 40 });
+    expect([contain.info.region.aspect, cover.info.region.aspect]).toEqual([1, 1]);
+    // x 0..60 over 600 px, y -15..45 (row = 45 - y, times 10): the house spans rows 150..450, the annex ends at x 60.
+    expect(isRed(at(contain.px, 200, 500))).toBe(true);
+    expect(isRed(at(contain.px, 200, 440))).toBe(false);
+    expect(isRed(at(contain.px, 590, 500))).toBe(true);
+    expect(isRed(at(contain.px, 590, 300))).toBe(false);
+    // x 10..50 over 600 px (15 px a unit), y -5..35 (row = 35 - y, times 15): the annex, y 5..25, is rows 150..450 and reaches the right edge.
+    expect(isRed(at(cover.px, 590, 180))).toBe(false);
+    expect(isRed(at(cover.px, 590, 570))).toBe(true);
+    // The house is 40 units wide: from x 10 it fills the left, 450 px of the 600.
+    expect(isRed(at(cover.px, 400, 300))).toBe(false);
+    expect(isRed(at(cover.px, 455, 560))).toBe(true);
+    // The picture's own shape, when one side is given.
+    const wide = await exportPng(page, { height: 200, region: STL_TOP, background: "#ff0000" });
+    expect([wide.px.width, wide.px.height]).toEqual([300, 200]);
+  });
+
+  test("IFC from above, in the model's metres", async ({ page }) => {
+    await open(page, "house.ifc");
+    const { px, info } = await exportPng(page, { width: 600, height: 400, region: IFC_TOP, background: "#ff0000" });
+    expect(info.region.position).toEqual(IFC_TOP.position);
+    // x -3..15 over 600 px (33.3 px a unit), y -2..10: the slab is x 0..12, y 0..8.
+    expect(at(px, 20, 20)).toEqual(RED);
+    expect(at(px, 580, 380)).toEqual(RED);
+    expect(at(px, 300, 200)[3]).toBe(255);
+    expect(isRed(at(px, 300, 200))).toBe(false);
+    const box = find(px, (r, g, b) => !(r > 250 && g < 5 && b < 5)).box!;
+    expect(Math.abs(box.minX - 100)).toBeLessThanOrEqual(2);
+    expect(Math.abs(box.maxX - 500)).toBeLessThanOrEqual(2);
+    expect(Math.abs(box.minY - 67)).toBeLessThanOrEqual(2);
+    expect(Math.abs(box.maxY - 333)).toBeLessThanOrEqual(2);
+  });
+
+  test("a perspective camera looks at its target, and the model's up is Z for the STL", async ({ page }) => {
+    await open(page, "house.stl");
+    const region: Camera = { position: [30, -90, 20], target: [30, 15, 20], projection: { type: "perspective", fov: 30 }, aspect: 1.5 };
+    const withDefault = await exportPng(page, { width: 300, height: 200, region });
+    const withUp = await exportPng(page, { width: 300, height: 200, region: { ...region, up: [0, 0, 1] } });
+    expect(difference(withDefault.px, withUp.px)).toBe(0);
+    expect(withDefault.info.region.up).toEqual([0, 0, 1]);
+    // The house is close to the ground's colour, so what is looked at is where the pixels step by more than the ground's gradient does.
+    const edges = (p: Pixels) => {
+      const step = (i: number, j: number) => Math.max(Math.abs(p.data[i]! - p.data[j]!), Math.abs(p.data[i + 1]! - p.data[j + 1]!), Math.abs(p.data[i + 2]! - p.data[j + 2]!));
+      let n = 0;
+      let rows = 0;
+      for (let y = 0; y < p.height - 1; y++)
+        for (let x = 0; x < p.width - 1; x++) {
+          const i = (y * p.width + x) * 4;
+          if (step(i, i + 4) > 8 || step(i, i + p.width * 4) > 8) {
+            n++;
+            rows += y;
+          }
+        }
+      return { n, meanY: rows / n };
+    };
+    // Upright: the roof ridge (z 40) is above the eaves (z 25) in the picture, and the ground below the house: the lines are mostly in the lower half.
+    const upright = edges(withDefault.px);
+    expect(upright.n).toBeGreaterThan(300);
+    expect(upright.meanY).toBeGreaterThan(110);
+    // With the opposite up the picture is upside down: the same lines, turned about the picture's centre.
+    const flipped = await exportPng(page, { width: 300, height: 200, region: { ...region, up: [0, 0, -1] } });
+    // (The lighting and the ground's gradient do not turn with it, hence the margin; the picture not turned is 40 rows away.)
+    expect(Math.abs(edges(flipped.px).meanY - (199 - upright.meanY))).toBeLessThanOrEqual(10);
+  });
+
+  test("the same view in the OBJ's own Y-up coordinates is the STL's picture", async ({ page }) => {
+    await open(page, "house.stl");
+    const stl = await exportPng(page, { width: 600, height: 400, region: STL_TOP, background: "#ff0000" });
+    // (x, y, z) of the STL is (x, z, -y) in the OBJ.
+    await pick(page, "house.obj");
+    await expect(phase(page)).toHaveAttribute("data-phase", "ready");
+    const OBJ_TOP: Camera = { position: [30, 100, -15], target: [30, 0, -15], up: [0, 0, -1], projection: { type: "orthographic", height: 40 }, aspect: 1.5 };
+    const obj = await exportPng(page, { width: 600, height: 400, region: OBJ_TOP, background: "#ff0000" });
+    const mask = (p: Pixels) => find(p, (r, g, b) => !(r > 250 && g < 5 && b < 5));
+    const a = mask(stl.px);
+    const b = mask(obj.px);
+    expect(Math.abs(a.count - b.count) / a.count).toBeLessThan(0.01);
+    for (const k of ["minX", "minY", "maxX", "maxY"] as const) expect(Math.abs(a.box![k] - b.box![k]), k).toBeLessThanOrEqual(1);
+    // No up given: a Y-up file takes Y, and the picture is the same as with it said.
+    const side: Camera = { position: [30, 15, 100], target: [30, 15, 0], projection: { type: "perspective", fov: 40 }, aspect: 1.5 };
+    const implicit = await exportPng(page, { width: 150, height: 100, region: side });
+    const explicit = await exportPng(page, { width: 150, height: 100, region: { ...side, up: [0, 1, 0] } });
+    expect(difference(implicit.px, explicit.px)).toBe(0);
+    expect(implicit.info.region.up).toEqual([0, 1, 0]);
+  });
+});
+
+test.describe("sharp at any size", () => {
+  test("a picture bigger than a tile has a one pixel silhouette, and agrees with a small one", async ({ page }) => {
+    await open(page, "house.stl");
+    const small = await exportPng(page, { width: 300, height: 200, region: STL_TOP, background: "#ff0000" });
+    await page.evaluate(() => (window.viewports.length = 0));
+    const big = await exportPng(page, { width: 3000, height: 2000, region: STL_TOP, background: "#ff0000" });
+    expect([big.px.width, big.px.height]).toEqual([3000, 2000]);
+    // More than one tile: no viewport as large as the picture.
+    const sizes = await page.evaluate(() => [...new Set(window.viewports)]);
+    expect(sizes).not.toContain("3000x2000");
+    expect(sizes.some((s) => s.startsWith("2048x"))).toBe(true);
+    // The house's south edge (y 0) is at row 1750 of 2000, where no shadow falls: red to model within two pixels, down a column.
+    const column = (x: number) => Array.from({ length: 12 }, (_, i) => at(big.px, x, 1744 + i));
+    const inBetween = column(600).filter((c) => !isRed(c) && !(c[2]! - c[0]! > 5 && c[3] === 255)).length;
+    expect(inBetween).toBeLessThanOrEqual(2);
+    // The seam of the two tiles (column 2048): not a line.
+    const row = Array.from({ length: 8 }, (_, i) => at(big.px, 2044 + i, 1000));
+    const first = row[0]!;
+    for (const c of row) for (let k = 0; k < 3; k++) expect(Math.abs(c[k]! - first[k]!)).toBeLessThanOrEqual(6);
+    // Averaged down to the small picture's size, they agree.
+    const down: Pixels = { width: 300, height: 200, data: new Uint8Array(300 * 200 * 4) };
+    for (let y = 0; y < 200; y++)
+      for (let x = 0; x < 300; x++)
+        for (let k = 0; k < 4; k++) {
+          let sum = 0;
+          for (let j = 0; j < 10; j++) for (let i = 0; i < 10; i++) sum += big.px.data[((y * 10 + j) * 3000 + x * 10 + i) * 4 + k]!;
+          down.data[(y * 300 + x) * 4 + k] = Math.round(sum / 100);
+        }
+    const diff = difference(small.px, down);
+    console.log("big against small", diff);
+    expect(diff).toBeLessThan(4);
+  });
+});
+
+test.describe("tiles", () => {
+  const region: Camera = { position: [90, -80, 70], target: [30, 15, 12], projection: { type: "perspective", fov: 35 }, aspect: 4 / 3 };
+  for (const [name, camera] of [
+    ["house.stl", region],
+    ["house.ifc", { position: [20, -16, 14], target: [6, 4, 1], projection: { type: "perspective" as const, fov: 40 }, aspect: 4 / 3 }],
+  ] as const) {
+    test(`${name}: a picture in tiles of 64 px is the picture in one pass, with no seams`, async ({ page }) => {
+      await open(page, name);
+      const single = await exportPng(page, { width: 400, height: 300, region: camera });
+      const sizes = await page.evaluate(() => [...new Set(window.viewports)]);
+      expect(sizes).toContain("400x300");
+
+      await open(page, name, { mode: "page", rasterTile: "64" });
+      await page.evaluate(() => (window.viewports.length = 0));
+      const tiled = await exportPng(page, { width: 400, height: 300, region: camera });
+      const tileSizes = await page.evaluate(() => [...new Set(window.viewports)]);
+      expect(tileSizes).toContain("64x64");
+      expect(tileSizes).not.toContain("400x300");
+      // The same picture: a pixel may differ where an edge falls on a tile's border.
+      expect(difference(single.px, tiled.px)).toBeLessThan(0.3);
+      let far = 0;
+      let worst = 0;
+      for (let i = 0; i < single.px.data.length; i += 4) {
+        const d = Math.max(Math.abs(single.px.data[i]! - tiled.px.data[i]!), Math.abs(single.px.data[i + 1]! - tiled.px.data[i + 1]!), Math.abs(single.px.data[i + 2]! - tiled.px.data[i + 2]!));
+        worst = Math.max(worst, d);
+        if (d > 40) far++;
+      }
+      console.log(name, "tiles: mean", difference(single.px, tiled.px), "worst", worst, "far", far);
+      expect(far).toBeLessThanOrEqual(20);
+      // Along the tile borders (columns 63/64, 127/128, ... and rows alike) nothing is a line.
+      let seam = 0;
+      for (let x = 64; x < 400; x += 64)
+        for (let y = 0; y < 300; y++) {
+          const a = at(tiled.px, x - 1, y);
+          const b = at(tiled.px, x, y);
+          const s = at(single.px, x - 1, y);
+          const t = at(single.px, x, y);
+          for (let k = 0; k < 3; k++) if (Math.abs(a[k]! - b[k]!) - Math.abs(s[k]! - t[k]!) > 30) seam++;
+        }
+      expect(seam).toBeLessThanOrEqual(6);
+    });
+  }
+
+  test("a picture needing more tiles than the limit is refused before anything is drawn", async ({ page }) => {
+    await open(page, "house.stl", { mode: "page", rasterTile: "2" });
+    const before = await page.evaluate(() => window.glContexts.length);
+    expect(await failure(page, { width: 400, height: 300 })).toBe("too-large");
+    // The context was made and freed.
+    expect(await page.evaluate((from) => window.glContexts.slice(from).every((g) => g.ctx.isContextLost()), before)).toBe(true);
+  });
+
+  test("without multisampling a picture is drawn at twice the size and averaged down", async ({ page }) => {
+    await open(page, "house.stl");
+    const single = await exportPng(page, { width: 300, height: 200, region: STL_TOP, background: "#ff0000" });
+    await open(page, "house.stl", { mode: "page", rasterSupersample: "2" });
+    await page.evaluate(() => (window.viewports.length = 0));
+    const super2 = await exportPng(page, { width: 300, height: 200, region: STL_TOP, background: "#ff0000" });
+    const sizes = await page.evaluate(() => [...new Set(window.viewports)]);
+    expect(sizes).toContain("600x400");
+    expect(difference(single.px, super2.px)).toBeLessThan(2);
+    expect(isRed(at(super2.px, 5, 195))).toBe(true);
+  });
+});
+
+test.describe("the ground and transparency", () => {
+  test("transparent has no alpha outside the model, and an edge is the model's colour at a fraction of its alpha", async ({ page }) => {
+    await open(page, "house.stl");
+    // Off the pixel grid: the house's south edge (y 0) falls in the middle of a row.
+    const shifted: Camera = { ...STL_TOP, position: [30, 15.03, 100], target: [30, 15.03, 0] };
+    const { px } = await exportPng(page, { width: 600, height: 400, region: shifted, background: "transparent" });
+    // South of the house and east of the annex: no model, no shadow.
+    expect(at(px, 5, 395)[3]).toBe(0);
+    expect(at(px, 590, 10)[3]).toBe(0);
+    expect(at(px, 590, 390)[3]).toBe(0);
+    expect(at(px, 200, 200)[3]).toBe(255);
+    // The edges are partly covered pixels (the sky of the silhouette).
+    let partial = 0;
+    for (let i = 3; i < px.data.length; i += 4) if (px.data[i]! > 20 && px.data[i]! < 235) partial++;
+    expect(partial).toBeGreaterThan(100);
+    // The picture on transparency, composed over red, is the picture on red: no clear colour bleeds into the edges.
+    const red = await exportPng(page, { width: 600, height: 400, region: shifted, background: "#ff0000" });
+    let worst = 0;
+    let off = 0;
+    for (let i = 0; i < px.data.length; i += 4) {
+      const a = px.data[i + 3]! / 255;
+      const over = [px.data[i]! * a + 255 * (1 - a), px.data[i + 1]! * a, px.data[i + 2]! * a];
+      const d = Math.max(Math.abs(over[0]! - red.px.data[i]!), Math.abs(over[1]! - red.px.data[i + 1]!), Math.abs(over[2]! - red.px.data[i + 2]!));
+      worst = Math.max(worst, d);
+      if (d > 12) off++;
+    }
+    console.log("transparent over red against red: worst", worst, "pixels off", off, "partial", partial);
+    expect(off).toBeLessThanOrEqual(10);
+  });
+
+  test("a colour with alpha is composed over the picture, and the viewer's ground is the default", async ({ page }) => {
+    await open(page, "house.stl");
+    const half = await exportPng(page, { width: 300, height: 200, region: STL_TOP, background: "rgba(255, 0, 0, 0.5)" });
+    const c = at(half.px, 295, 195);
+    expect(c[0]).toBeGreaterThan(250);
+    expect(c[3]).toBeGreaterThan(120);
+    expect(c[3]).toBeLessThan(135);
+    // The default is the surface the canvas is drawn on (`--exav-viewer-model-bg`: a circle about 50% 30% from
+    // white to #cbd5e1 at the farthest corner), not transparent. The model is small in this view.
+    const far: Camera = { ...STL_TOP, projection: { type: "orthographic", height: 400 } };
+    const ground = await exportPng(page, { width: 300, height: 200, region: far });
+    const middle = at(ground.px, 150, 60);
+    const corner = at(ground.px, 299, 199);
+    expect(middle[3]).toBe(255);
+    for (let k = 0; k < 3; k++) expect(middle[k]).toBeGreaterThan(252);
+    for (let k = 0; k < 3; k++) expect(Math.abs(corner[k]! - [203, 213, 225][k]!)).toBeLessThanOrEqual(4);
+    expect(await failure(page, { longEdge: 100, background: "url(http://example.org/a.png)" })).toBe("invalid");
+  });
+
+  test("the IFC's default ground is its light or dark colour", async ({ page }) => {
+    await open(page, "house.ifc");
+    const light = await exportPng(page, { width: 300, height: 200, region: IFC_TOP });
+    expect(at(light.px, 3, 3)).toEqual([255, 255, 255, 255]);
+    await page.evaluate(() => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { ground: { set(g: string): void } } } } } }).exavDemo.session();
+      s.controllers.get().ground.set("dark");
+    });
+    const dark = await exportPng(page, { width: 300, height: 200, region: IFC_TOP });
+    expect(at(dark.px, 3, 3)).toEqual([0x21, 0x28, 0x30, 255]);
+  });
+});
+
+test.describe("what the viewer shows", () => {
+  test("a hidden category stays hidden, and the selection and the floor grid are not drawn", async ({ page }) => {
+    await open(page, "house.ifc");
+    const all = await exportPng(page, { width: 600, height: 400, region: IFC_TOP, background: "#ff0000" });
+    // The north wall's top (y 7.8..8, x 0..12) is at rows 67..73.
+    const wall = at(all.px, 300, 69);
+    const slab = at(all.px, 300, 200);
+    expect(wall.slice(0, 3)).not.toEqual(slab.slice(0, 3));
+    await page.evaluate(() => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { layers: { setVisible(id: string, v: boolean): void } } } } } }).exavDemo.session();
+      s.controllers.get().layers.setVisible("IFCWALL", false);
+    });
+    const hidden = await exportPng(page, { width: 600, height: 400, region: IFC_TOP, background: "#ff0000" });
+    expect(at(hidden.px, 300, 69).slice(0, 3)).toEqual(at(hidden.px, 300, 200).slice(0, 3));
+    expect(isRed(at(hidden.px, 300, 40))).toBe(true);
+
+    // A tap picks an element: the viewer highlights it, the picture does not.
+    await page.evaluate(() => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { layers: { setAll(v: boolean): void } } } } } }).exavDemo.session();
+      s.controllers.get().layers.setAll(true);
+    });
+    const before = await exportPng(page, { width: 300, height: 200 });
+    const box = (await canvas(page).boundingBox())!;
+    await page.mouse.click(box.x + box.width / 2, box.y + box.height / 2);
+    await expect
+      .poll(() => page.evaluate(() => (window as unknown as { exavDemo: { session(): { controllers: { get(): { selection: { get(): unknown } } } } } }).exavDemo.session().controllers.get().selection.get()))
+      .not.toBeNull();
+    const after = await exportPng(page, { width: 300, height: 200 });
+    expect(difference(before.px, after.px)).toBe(0);
+  });
+});
+
+test.describe("freeing the GPU", () => {
+  test("every picture's context is lost when it is done, failed or stopped", async ({ page }) => {
+    await open(page, "house.stl", { mode: "page", rasterTile: "16" });
+    const live = () => page.evaluate(() => window.glContexts.filter((g) => !g.ctx.isContextLost()).length);
+    const made = () => page.evaluate(() => window.glContexts.length);
+    const baseline = await live();
+    const first = await made();
+
+    // Stopped while it draws: 600 x 600 in tiles of 16.
+    const code = await page.evaluate(async () => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(p: number, o: unknown): Promise<unknown> } } } } } }).exavDemo.session();
+      const stop = new AbortController();
+      setTimeout(() => stop.abort(), 200);
+      try {
+        await s.controllers.get().pictures.raster(1, { width: 600, height: 600, signal: stop.signal });
+        return "none";
+      } catch (e) {
+        return (e as { code?: string }).code ?? String(e);
+      }
+    });
+    expect(code).toBe("aborted");
+    expect(await made()).toBe(first + 1);
+    // The promise rejects at once; the drawing stops and frees its context at the next tile.
+    await expect.poll(live).toBe(baseline);
+
+    // Done, refused after the context was made (too many tiles), and refused before.
+    await exportPng(page, { width: 40, height: 30 });
+    expect(await failure(page, { width: 4000, height: 4000 })).toBe("too-large");
+    expect(await failure(page, { width: 40, height: 30, fit: "stretch" })).toBe("invalid");
+    expect(await made()).toBe(first + 3);
+    expect(await live()).toBe(baseline);
+    // Made off screen where the browser has it, and never attached to the page.
+    expect(await page.evaluate((from) => window.glContexts.slice(from).every((g) => g.offscreen), first)).toBe(true);
+    expect(await page.evaluate(() => document.querySelectorAll("canvas").length)).toBe(1);
+  });
+
+  test("pictures asked together are drawn one after another", async ({ page }) => {
+    await open(page, "house.stl");
+    const baseline = await page.evaluate(() => window.glContexts.filter((g) => !g.ctx.isContextLost()).length);
+    const most = await page.evaluate(async () => {
+      const s = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(p: number, o: unknown): Promise<{ bitmap: ImageBitmap }> } } } } } }).exavDemo.session();
+      let most = 0;
+      const timer = setInterval(() => (most = Math.max(most, window.glContexts.filter((g) => !g.ctx.isContextLost()).length)), 1);
+      const all = await Promise.all([1, 2, 3, 4].map(() => s.controllers.get().pictures.raster(1, { longEdge: 400 })));
+      clearInterval(timer);
+      all.forEach((r) => r.bitmap.close());
+      return most;
+    });
+    expect(most).toBeLessThanOrEqual(baseline + 1);
+  });
+
+  test("the visible canvas keeps no drawing buffer", async ({ page }) => {
+    await open(page, "house.stl");
+    const kept = await page.evaluate(() => {
+      const c = document.querySelector<HTMLCanvasElement>(".exav-viewer-model-canvas")!;
+      const gl = (c.getContext("webgl2") ?? c.getContext("webgl")) as WebGLRenderingContext;
+      return gl.getContextAttributes()!.preserveDrawingBuffer;
+    });
+    expect(kept).toBe(false);
+  });
+});
+
+test.describe("through the sandboxed frame", () => {
+  for (const name of ["house.stl", "house.ifc"]) {
+    test(`${name}: the same size and camera, and the viewport crosses the frame`, async ({ page }) => {
+      // The page's own session, for the camera the model opens on.
+      await open(page, name);
+      const own = await exportPng(page, { width: 300, height: 200 });
+
+      await page.goto("./headless.html?lang=en");
+      await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: (await import("./samples.js")).sample(name) });
+      await expect
+        .poll(() => page.evaluate(() => (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session()?.status.get().phase), { timeout: 30_000 })
+        .toBe("ready");
+      await expect.poll(() => viewport(page, "headless")).not.toBeNull();
+      const view = (await viewport(page, "headless"))!;
+      expect(view.space).toBe("camera");
+      expect(view.region.up).toBeDefined();
+      const framed = await exportPng(page, { width: 300, height: 200 }, "headless");
+      expect([framed.px.width, framed.px.height]).toEqual([300, 200]);
+      expect(framed.info).toMatchObject({ width: 300, height: 200, page: 1, space: "camera" });
+      // The camera the model opens on, wherever it is shown.
+      framed.info.region.position.forEach((v, i) => expect(v).toBeCloseTo(own.info.region.position[i]!, 5));
+      framed.info.region.target.forEach((v, i) => expect(v).toBeCloseTo(own.info.region.target[i]!, 5));
+      expect(framed.info.region.aspect).toBeCloseTo(1.5, 9);
+      expect(body(framed.px).count).toBeGreaterThan(500);
+
+      // "current" resolves in the frame to the viewport it reports.
+      const current = await exportPng(page, { width: 300, height: 200, region: "current" }, "headless");
+      current.info.region.position.forEach((v, i) => expect(v).toBeCloseTo(view.region.position[i]!, 5));
+      const viaViewport = await exportPng(page, { width: 300, height: 200, region: view.region }, "headless");
+      expect(difference(current.px, viaViewport.px)).toBeLessThan(0.5);
+    });
+  }
+
+  test("the user orbits in the frame and the viewport follows", async ({ page }) => {
+    await page.goto("./headless.html?lang=en");
+    await page.getByTestId("file-input").setInputFiles({ name: "house.stl", mimeType: "", buffer: (await import("./samples.js")).sample("house.stl") });
+    await expect
+      .poll(() => page.evaluate(() => (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session()?.status.get().phase), { timeout: 30_000 })
+      .toBe("ready");
+    await expect.poll(() => viewport(page, "headless")).not.toBeNull();
+    const before = (await viewport(page, "headless"))!;
+    const box = (await page.locator("#stage iframe").boundingBox())!;
+    await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+    await page.mouse.down();
+    await page.mouse.move(box.x + box.width / 2 + 100, box.y + box.height / 2, { steps: 6 });
+    await page.mouse.up();
+    await expect.poll(async () => (await viewport(page, "headless"))!.region.position[0]).not.toBeCloseTo(before.region.position[0]!, 3);
+  });
+});
diff --git a/crates/exav-viewer/e2e/model.spec.ts b/crates/exav-viewer/e2e/model.spec.ts
index 8aba5c07..ef59bffb 100644
--- a/crates/exav-viewer/e2e/model.spec.ts
+++ b/crates/exav-viewer/e2e/model.spec.ts
@@ -42,10 +42,10 @@ for (const file of ["house.ifc", "house.stl"]) {
   test(`closing ${file} while it is read stops its worker`, async ({ page }) => {
     await openSample(page, file, { mode: "page" });
     await expect.poll(() => page.evaluate(() => window.modelWorkers().live)).toBe(1);
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "loading");
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "loading");
     // Another file, as the user picks one.
     await pick(page, "report.pdf");
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
     expect(await page.evaluate(() => window.modelWorkers())).toEqual({ started: 1, live: 0 });
   });
 }
diff --git a/crates/exav-viewer/e2e/office-raster.spec.ts b/crates/exav-viewer/e2e/office-raster.spec.ts
new file mode 100644
index 00000000..d83391e1
--- /dev/null
+++ b/crates/exav-viewer/e2e/office-raster.spec.ts
@@ -0,0 +1,536 @@
+// Pictures of Word, PowerPoint, Excel, CSV and video (`controllers.pictures`)
+// and the viewport store: drawn again from the document's data by a second
+// copy of it, at the size and region asked, whatever the viewer shows. In the
+// page (`mode=page`), the converted formats too, and the sandboxed frame.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { decodePng, difference, find, type Pixels } from "./pixels.js";
+import { openSample, sample } from "./samples.js";
+
+failOnViolations();
+
+const FIXTURES = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "office");
+const OUT = path.join(path.dirname(fileURLToPath(import.meta.url)), ".out");
+
+interface Region {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+interface Info {
+  width: number;
+  height: number;
+  page: number;
+  space: string;
+  region?: Region;
+}
+interface Picture extends Pixels {
+  info: Info;
+}
+type Options = Record<string, unknown>;
+interface Controllers {
+  pictures: { get(): { count: number; space: string }; raster(n: number, o: object): Promise<{ bitmap: ImageBitmap } & Record<string, unknown>> };
+  viewport: { get(): unknown; subscribe(f: (v: unknown) => void): () => void };
+  zoom?: { setScale(n: number): void };
+}
+type Where = "exavDemo" | "headless";
+
+/** The session's controllers, in the page of the demo or of the headless host (the frame). */
+const session = (w: Where) => `(window).${w}.session()`;
+
+/** `pictures.raster(page, options)`, its bitmap read back as pixels. */
+async function raster(page: Page, n: number, options: Options, where: Where = "exavDemo"): Promise<Picture> {
+  const out = await page.evaluate(
+    async ([n, options, where]) => {
+      const s = (window as unknown as Record<string, { session(): { controllers: { get(): Controllers } } }>)[where]!.session();
+      const r = await s.controllers.get().pictures.raster(n, options as object);
+      const canvas = new OffscreenCanvas(r.bitmap.width, r.bitmap.height);
+      canvas.getContext("2d")!.drawImage(r.bitmap, 0, 0);
+      r.bitmap.close();
+      const bytes = new Uint8Array(await (await canvas.convertToBlob({ type: "image/png" })).arrayBuffer());
+      let binary = "";
+      for (let i = 0; i < bytes.length; i += 0x8000) binary += String.fromCharCode(...bytes.subarray(i, i + 0x8000));
+      const { bitmap: _bitmap, ...info } = r;
+      return { png: btoa(binary), info };
+    },
+    [n, options, where] as const,
+  );
+  const png = Buffer.from(out.png, "base64");
+  return { ...decodePng(png), info: out.info as unknown as Info };
+}
+
+/** The code of the RasterError a raster is refused with. */
+async function refused(page: Page, n: number, options: Options, where: Where = "exavDemo"): Promise<string> {
+  return page.evaluate(
+    async ([n, options, where]) => {
+      const s = (window as unknown as Record<string, { session(): { controllers: { get(): Controllers } } }>)[where]!.session();
+      try {
+        const r = await s.controllers.get().pictures.raster(n, options as object);
+        r.bitmap.close();
+        return "none";
+      } catch (e) {
+        return (e as { code?: string }).code ?? String(e);
+      }
+    },
+    [n, options, where] as const,
+  );
+}
+
+const controllers = <T>(page: Page, fn: string, where: Where = "exavDemo") =>
+  page.evaluate(`(async () => { const c = ${session(where)}.controllers.get(); return (${fn})(c); })()`) as Promise<T>;
+
+/** Waits for the viewport to be a page and a region (a sheet's is worked out once asked for: subscribing asks). */
+async function viewport(page: Page, where: Where = "exavDemo"): Promise<{ page: number; space: string; region: Region } | null> {
+  return controllers(page, `(c) => { c.viewport.subscribe(() => {}); return c.viewport.get(); }`, where);
+}
+
+const inkAt = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+
+/** Dark pixels in the rectangle `[x0, x1) x [y0, y1)` of `p`. */
+function ink(p: Pixels, x0 = 0, y0 = 0, x1 = p.width, y1 = p.height): number {
+  let n = 0;
+  for (let y = Math.max(0, y0); y < Math.min(p.height, y1); y++)
+    for (let x = Math.max(0, x0); x < Math.min(p.width, x1); x++) {
+      const i = (y * p.width + x) * 4;
+      if (p.data[i + 3]! > 128 && inkAt(p.data[i]!, p.data[i + 1]!, p.data[i + 2]!)) n++;
+    }
+  return n;
+}
+
+function crop(p: Pixels, x: number, y: number, width: number, height: number): Pixels {
+  const data = new Uint8Array(width * height * 4);
+  for (let r = 0; r < height; r++) data.set(p.data.subarray(((y + r) * p.width + x) * 4, ((y + r) * p.width + x + width) * 4), r * width * 4);
+  return { width, height, data };
+}
+
+/** The mean difference of two pictures cut to the size they share (one of them may be a pixel larger). */
+function close(a: Pixels, b: Pixels): number {
+  const w = Math.min(a.width, b.width);
+  const h = Math.min(a.height, b.height);
+  expect(Math.abs(a.width - b.width) + Math.abs(a.height - b.height)).toBeLessThanOrEqual(2);
+  return difference(crop(a, 0, 0, w, h), crop(b, 0, 0, w, h));
+}
+
+/** A screenshot of a rectangle of the page, in CSS px. */
+async function shot(page: Page, clip: Region): Promise<Pixels> {
+  // The viewer's tools lie over the surface.
+  const tools = page.locator(".exav-viewer-tools");
+  await tools.evaluateAll((els) => els.forEach((e) => ((e as HTMLElement).style.visibility = "hidden")));
+  try {
+    // A box on a fraction of a pixel is cut at the pixel the engines draw it on: Chromium rounds it, Firefox and WebKit floor it.
+    const png = await page.screenshot({ clip: { ...clip, x: Math.round(clip.x), y: Math.round(clip.y) }, animations: "disabled" });
+    return decodePng(png);
+  } finally {
+    await tools.evaluateAll((els) => els.forEach((e) => ((e as HTMLElement).style.visibility = "")));
+  }
+}
+
+async function open(page: Page, name: string, params: Record<string, string> = {}): Promise<void> {
+  await openSample(page, name, { mode: "page", ...params });
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready", { timeout: 60_000 });
+}
+
+async function openFixture(page: Page, dir: string, name: string): Promise<void> {
+  await page.goto(`./?${new URLSearchParams({ lang: "en", converter: "exav", mode: "page" })}`);
+  await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: fs.readFileSync(path.join(FIXTURES, dir, name)) });
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready", { timeout: 60_000 });
+}
+
+/** The pictures controller exists and has its pages (the count follows the viewer's). */
+const pages = (page: Page, where: Where = "exavDemo") => expect.poll(() => controllers<number>(page, `(c) => c.pictures.get().count`, where), { timeout: 30_000 });
+
+/** The box of the first page's canvas on screen, once it is drawn. */
+const docCanvas = (page: Page) => page.locator(".demo-frame .exav-viewer-office-docx canvas").first();
+const sheetCanvas = (page: Page) => page.locator(".demo-frame .exav-viewer-office-canvas").first();
+
+test.describe("a Word document", () => {
+  test("is drawn whole at the width asked, on white, with its heading at the top left", async ({ page }) => {
+    await open(page, "notes.docx");
+    await pages(page).toBe(2);
+    const p = await raster(page, 1, { width: 800 });
+    expect([p.width, p.height, p.info.space, p.info.page]).toEqual([800, 1131, "page", 1]);
+    expect(p.info.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+    expect(ink(p, 0, 0, 400, 283)).toBeGreaterThan(500);
+    expect(ink(p, 400, 0, 800, 1131)).toBe(0);
+    expect(ink(p, 0, 283, 800, 1131)).toBe(0);
+    // Opaque white.
+    expect([...p.data.subarray(0, 4)]).toEqual([255, 255, 255, 255]);
+    // Page 2 is another page.
+    const second = await raster(page, 2, { width: 400 });
+    expect(second.info.page).toBe(2);
+    expect(difference(second, await raster(page, 1, { width: 400 }))).toBeGreaterThan(0.2);
+  });
+
+  test("a region is the same pixels as that part of the whole page at the same scale", async ({ page }) => {
+    await open(page, "notes.docx");
+    await pages(page).toBe(2);
+    const whole = await raster(page, 1, { width: 800 });
+    // The top left quarter, 400 px wide: the page at 800.
+    const quarter = await raster(page, 1, { width: 400, region: { x: 0, y: 0, width: 0.5, height: 0.25 } });
+    expect([quarter.width, quarter.height]).toEqual([400, 283]);
+    expect(quarter.info.region).toMatchObject({ x: 0, y: 0, width: 0.5 });
+    expect(difference(quarter, crop(whole, 0, 0, 400, 283))).toBe(0);
+    expect(ink(quarter)).toBeGreaterThan(500);
+    // The bottom right has no ink.
+    const empty = await raster(page, 1, { width: 400, region: { x: 0.5, y: 0.5, width: 0.5, height: 0.5 } });
+    expect(ink(empty)).toBe(0);
+    // A region off the page shows the background there.
+    const beyond = await raster(page, 1, { width: 200, height: 200, background: "#ff0000", region: { x: 0, y: 0, width: 1, height: 1 } });
+    // The page is taller than wide: contain widens the region at the sides.
+    expect(beyond.info.region!.x).toBeLessThan(0);
+    expect([...beyond.data.subarray(0, 3)]).toEqual([255, 0, 0]);
+    expect([...beyond.data.subarray((100 * 200 + 100) * 4, (100 * 200 + 100) * 4 + 4)]).toEqual([255, 255, 255, 255]);
+  });
+
+  test("the whole page at the on-screen width is what the viewer shows", async ({ page }) => {
+    await open(page, "notes.docx");
+    await pages(page).toBe(2);
+    const canvas = docCanvas(page);
+    await expect.poll(() => canvas.evaluate((c: HTMLCanvasElement) => c.width)).toBeGreaterThan(300);
+    await canvas.scrollIntoViewIfNeeded();
+    const box = (await canvas.boundingBox())!;
+    const p = await raster(page, 1, { width: Math.round(box.width) });
+    // The visible canvas is drawn at the display's pixel density; the screenshot is that bitmap scaled to the box.
+    const part = { x: box.x, y: box.y, width: box.width, height: Math.min(box.height, 700) };
+    const screen = await shot(page, { ...part, width: Math.round(part.width), height: Math.round(part.height) });
+    expect(close(screen, crop(p, 0, 0, screen.width, Math.min(screen.height, p.height)))).toBeLessThan(6);
+  });
+
+  test("region current is what is in view: the page most in view and the part showing", async ({ page }) => {
+    await open(page, "notes.docx");
+    await pages(page).toBe(2);
+    await expect.poll(() => viewport(page)).not.toBeNull();
+    expect((await viewport(page))!.page).toBe(1);
+    // Scroll down so the second page takes over.
+    await page.locator(".demo-frame .exav-viewer-office-docx > div > div").first().evaluate((el) => {
+      el.scrollTop = el.scrollHeight - el.clientHeight;
+    });
+    await expect.poll(async () => (await viewport(page))?.page).toBe(2);
+    const v = (await viewport(page))!;
+    expect(v.space).toBe("page");
+    expect(v.region.y).toBeLessThan(0.5);
+    const current = await raster(page, 2, { width: 300, region: "current" });
+    expect(current.info.region!.y).toBeCloseTo(v.region.y, 1);
+    expect(current.info.page).toBe(2);
+    // Another page than the one in view has none.
+    expect(await refused(page, 1, { width: 300, region: "current" })).toBe("invalid");
+  });
+
+  test("a transparent background is not drawn, and a too small region is refused before drawing", async ({ page }) => {
+    await open(page, "notes.docx");
+    await pages(page).toBe(2);
+    expect(await refused(page, 1, { width: 100, background: "transparent" })).toBe("unsupported");
+    expect(await refused(page, 1, { width: 400, region: { x: 0, y: 0, width: 0.01, height: 0.01 } })).toBe("too-large");
+    expect(await refused(page, 1, { width: 20000 })).toBe("too-large");
+    expect(await refused(page, 3, { width: 100 })).toBe("invalid");
+    expect(await refused(page, 1, { width: 100, background: "url(x)" })).toBe("invalid");
+  });
+
+  test("a drawing is stopped by its signal, and the next is not harmed", async ({ page }) => {
+    await open(page, "notes.docx");
+    await pages(page).toBe(2);
+    const out = await page.evaluate(async () => {
+      const c = (window as unknown as { exavDemo: { session(): { controllers: { get(): Controllers } } } }).exavDemo.session().controllers.get();
+      const abort = new AbortController();
+      const first = c.pictures.raster(1, { width: 2000, signal: abort.signal }).then(
+        () => "none",
+        (e: { code: string }) => e.code,
+      );
+      abort.abort();
+      const already = new AbortController();
+      already.abort();
+      const second = await c.pictures.raster(1, { width: 2000, signal: already.signal }).then(
+        () => "none",
+        (e: { code: string }) => e.code,
+      );
+      // Three at once are drawn one after the other, each whole.
+      const three = await Promise.all([300, 200, 100].map((width) => c.pictures.raster(1, { width }).then((r) => [r.width, (r.bitmap.close(), "ok")])));
+      return { first: await first, second, three };
+    });
+    expect(out).toEqual({ first: "aborted", second: "aborted", three: [[300, "ok"], [200, "ok"], [100, "ok"]] });
+    expect(ink(await raster(page, 1, { width: 400 }))).toBeGreaterThan(300);
+  });
+});
+
+test.describe("a PowerPoint deck", () => {
+  test("is drawn slide by slide, the heading at the top left", async ({ page }) => {
+    await open(page, "visit.pptx");
+    await pages(page).toBe(2);
+    const one = await raster(page, 1, { width: 960 });
+    expect([one.width, one.height]).toEqual([960, 540]);
+    expect(ink(one, 0, 0, 480, 135)).toBeGreaterThan(100);
+    expect(ink(one, 480, 0, 960, 540)).toBe(0);
+    const quarter = await raster(page, 1, { width: 480, region: { x: 0, y: 0, width: 0.5, height: 0.5 } });
+    expect(difference(quarter, crop(one, 0, 0, 480, 270))).toBe(0);
+    const two = await raster(page, 2, { width: 480 });
+    expect(two.info.page).toBe(2);
+    expect(difference(two, await raster(page, 1, { width: 480 }))).toBeGreaterThan(0.1);
+    expect(await refused(page, 1, { width: 100, background: "transparent" })).toBe("unsupported");
+  });
+
+  test("the whole slide at the on-screen size is what the viewer shows, and the viewport is the slide", async ({ page }) => {
+    await open(page, "visit.pptx");
+    await pages(page).toBe(2);
+    const canvas = page.locator(".demo-frame .exav-viewer-office-stage canvas");
+    await expect.poll(() => canvas.evaluate((c: HTMLCanvasElement) => c.width)).toBeGreaterThan(300);
+    await page.waitForTimeout(500);
+    const box = (await canvas.boundingBox())!;
+    const p = await raster(page, 1, { width: Math.round(box.width) });
+    const screen = await shot(page, { x: box.x, y: box.y, width: Math.round(box.width), height: Math.round(box.height) });
+    expect(close(screen, p)).toBeLessThan(6);
+    expect(await viewport(page)).toEqual({ space: "page", page: 1, region: { x: 0, y: 0, width: 1, height: 1 } });
+    await page.getByRole("button", { name: /next/i }).first().click();
+    await expect.poll(async () => (await viewport(page))?.page).toBe(2);
+    const current = await raster(page, 2, { width: 200, region: "current" });
+    expect(current.info.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+  });
+});
+
+test.describe("a spreadsheet", () => {
+  test("is its used area without the headers, one picture for each sheet", async ({ page }) => {
+    await open(page, "book.xlsx");
+    await pages(page).toBe(2);
+    // Sheet 1: A1:D4, 464 x 80 at 100 %; its first row is Item, Quantity, Unit price, Total.
+    const whole = await raster(page, 1, { width: 464 });
+    expect([whole.width, whole.height]).toEqual([464, 80]);
+    expect(whole.info.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+    expect(ink(whole, 0, 0, 464, 20)).toBeGreaterThan(80);
+    // No header band: inside the first cell, white.
+    expect([...whole.data.subarray((5 * 464 + 100) * 4, (5 * 464 + 100) * 4 + 3)]).toEqual([255, 255, 255]);
+    const bigger = await raster(page, 1, { width: 928 });
+    expect(bigger.height).toBe(160);
+    // Sheet 2 is another sheet: its own size, and "Note" in its first row.
+    const note = await raster(page, 2, { width: 600 });
+    expect([note.info.page, note.width, note.height]).toEqual([2, 600, 136]);
+    expect(ink(note, 0, 0, 300, 68)).toBeGreaterThan(300);
+  });
+
+  test("a region is drawn from the cells it covers, the same pixels as that part of the whole", async ({ page }) => {
+    await open(page, "book.xlsx");
+    await pages(page).toBe(2);
+    const whole = await raster(page, 1, { width: 928 });
+    // Columns A and B (176 + 96 of 464) and the first two rows, at 2x.
+    const part = await raster(page, 1, { width: 544, region: { x: 0, y: 0, width: 272 / 464, height: 0.5 } });
+    expect([part.width, part.height]).toEqual([544, 80]);
+    expect(close(part, crop(whole, 0, 0, 544, 80))).toBeLessThan(3);
+    // Only the right-hand column D: the numbers are right-aligned, the left is blank.
+    const total = await raster(page, 1, { width: 192, region: { x: 368 / 464, y: 0, width: 96 / 464, height: 1 } });
+    expect(ink(total, 0, 0, 96, 160)).toBeLessThan(ink(total, 96, 0, 192, 160));
+    // Beyond the used area is the background.
+    const beyond = await raster(page, 1, { width: 464, region: { x: 0.5, y: 0, width: 1, height: 1 }, background: "#00ff00" });
+    expect([...beyond.data.subarray(((40 * beyond.width) + beyond.width - 5) * 4, ((40 * beyond.width) + beyond.width - 5) * 4 + 3)]).toEqual([0, 255, 0]);
+  });
+
+  test("a small picture of a sheet is the sheet scaled down, and a refused one says why", async ({ page }) => {
+    await open(page, "book.xlsx");
+    await pages(page).toBe(2);
+    const small = await raster(page, 1, { width: 116 });
+    expect([small.width, small.height]).toEqual([116, 20]);
+    expect(ink(small)).toBeGreaterThan(10);
+    expect(await refused(page, 1, { width: 100, background: "transparent" })).toBe("unsupported");
+    expect(await refused(page, 1, { width: 464, region: { x: 0, y: 0, width: 1e-6, height: 1e-6 } })).toBe("too-large");
+    expect(await refused(page, 3, { width: 100 })).toBe("invalid");
+  });
+
+  test("the cells at the on-screen scale are what the viewer shows", async ({ page }) => {
+    await open(page, "quote.xlsx");
+    await pages(page).toBe(1);
+    const canvas = sheetCanvas(page);
+    await page.waitForTimeout(800);
+    const box = (await canvas.boundingBox())!;
+    // A1:D4 starts under the 50 x 22 headers.
+    const screen = await shot(page, { x: box.x + 50, y: box.y + 22, width: 464, height: 80 });
+    const p = await raster(page, 1, { width: 464 });
+    expect(close(screen, p)).toBeLessThan(6);
+  });
+
+  test("the viewport is the part of the used area in view, and region current draws it", async ({ page }) => {
+    await open(page, "quote.xlsx");
+    await pages(page).toBe(1);
+    await page.waitForTimeout(800);
+    // Everything is in view at 100 %.
+    await expect.poll(() => viewport(page)).toEqual({ space: "page", page: 1, region: { x: 0, y: 0, width: 1, height: 1 } });
+    // Zoomed to 4x the 464 px of cells are 1856: part of them show.
+    await controllers(page, `(c) => c.zoom.setScale(4)`);
+    await expect.poll(async () => (await viewport(page))?.region.width ?? 1).toBeLessThan(0.9);
+    await page.waitForTimeout(800);
+    const v = (await viewport(page))!;
+    const canvas = sheetCanvas(page);
+    const box = (await canvas.boundingBox())!;
+    // Cells show from under the headers (200 x 88 at 4x) to the canvas edge.
+    const clip = { x: box.x + 200, y: box.y + 88, width: Math.round(box.width - 200), height: Math.round(Math.min(box.height - 88, 80 * 4)) };
+    const screen = await shot(page, clip);
+    const current = await raster(page, 1, { width: clip.width, height: clip.height, region: "current" });
+    expect(current.info.region!.x).toBeCloseTo(v.region.x, 2);
+    expect(current.info.region!.width).toBeCloseTo(v.region.width, 1);
+    expect(close(screen, current)).toBeLessThan(8);
+  });
+});
+
+test.describe("a CSV", () => {
+  test("is one sheet drawn as the viewer shows it, from its own cells", async ({ page }) => {
+    await open(page, "quote.csv");
+    await pages(page).toBe(1);
+    await page.waitForTimeout(800);
+    const box = (await sheetCanvas(page).boundingBox())!;
+    // Four rows of 20 under the 50 x 22 headers, and four columns as wide as
+    // the machine's font makes them (59 in one, 67 in another).
+    const shape = await raster(page, 1, { width: 1000 });
+    const width = Math.round((shape.width / shape.height) * 80);
+    const screen = await shot(page, { x: box.x + 50, y: box.y + 22, width, height: 80 });
+    const p = await raster(page, 1, { width });
+    expect([p.width, p.height]).toEqual([width, 80]);
+    expect(close(screen, p)).toBeLessThan(6);
+    const left = await raster(page, 1, { width: 118, region: { x: 0, y: 0, width: 0.5, height: 1 } });
+    expect(ink(left)).toBeGreaterThan(50);
+    expect(await refused(page, 2, { width: 100 })).toBe("invalid");
+    await expect.poll(async () => (await viewport(page))?.page).toBe(1);
+  });
+});
+
+test.describe("the converted formats", () => {
+  test("a spreadsheet, a deck and a text document are drawn by the engines that show them", async ({ page }) => {
+    await openFixture(page, "sheets", "sample.xls");
+    await pages(page).toBe(2);
+    expect(ink(await raster(page, 1, { width: 400 }))).toBeGreaterThan(50);
+    expect(ink(await raster(page, 2, { width: 400 }))).toBeGreaterThan(50);
+    await expect.poll(() => viewport(page)).not.toBeNull();
+    await openFixture(page, "slides", "sample.ppt");
+    await pages(page).toBeGreaterThanOrEqual(1);
+    const slide = await raster(page, 1, { width: 480 });
+    expect(slide.height).toBeGreaterThan(200);
+    expect(ink(slide)).toBeGreaterThan(50);
+    expect((await viewport(page))!.page).toBe(1);
+    await openFixture(page, "docs", "sample.doc");
+    await pages(page).toBeGreaterThanOrEqual(1);
+    const doc = await raster(page, 1, { width: 500 });
+    expect(ink(doc)).toBeGreaterThan(300);
+    expect(await refused(page, 1, { width: 100, background: "transparent" })).toBe("unsupported");
+  });
+});
+
+test.describe("in the sandboxed frame", () => {
+  async function headless(page: Page, name: string, bytes: Buffer): Promise<void> {
+    await page.goto("./headless.html?lang=en");
+    await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: bytes });
+    await expect
+      .poll(() => page.evaluate(() => (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session()?.status.get().phase), { timeout: 60_000 })
+      .toBe("ready");
+    await expect.poll(() => controllers<boolean>(page, `(c) => !!c.pictures && c.pictures.get().count > 0`, "headless"), { timeout: 30_000 }).toBe(true);
+  }
+
+  for (const [name, width] of [
+    ["notes.docx", 400],
+    ["visit.pptx", 480],
+    ["book.xlsx", 464],
+    ["quote.csv", 236],
+  ] as const) {
+    test(`${name}: a picture has the size and the pixels it has in the page, and the viewport comes through`, async ({ page }) => {
+      await open(page, name);
+      await pages(page).toBeGreaterThanOrEqual(1);
+      const inPage = await raster(page, 1, { width });
+      await headless(page, name, sample(name));
+      const inFrame = await raster(page, 1, { width }, "headless");
+      expect([inFrame.width, inFrame.height]).toEqual([inPage.width, inPage.height]);
+      expect(close(inFrame, inPage)).toBeLessThan(1);
+      expect(inFrame.info.region).toEqual(inPage.info.region);
+      await expect.poll(() => viewport(page, "headless")).not.toBeNull();
+      expect(await refused(page, 1, { width: 50, background: "transparent" }, "headless")).toBe("unsupported");
+    });
+  }
+});
+
+test.describe("video", () => {
+  const playable = (page: Page) => page.evaluate(() => document.createElement("video").canPlayType('video/webm; codecs="vp8"') !== "");
+  const clip = () => fs.readFileSync(path.join(OUT, "clip.webm"));
+
+  async function drawnFrame(page: Page, where: Where, selector: string) {
+    return controllers<{ equal: number; width: number; height: number; transparent: number }>(
+      page,
+      `async (c) => {
+        const v = document.querySelector(${JSON.stringify(selector)});
+        v.pause();
+        v.currentTime = 1;
+        await new Promise((r) => (v.seeking ? v.addEventListener("seeked", r, { once: true }) : r()));
+        // The new frame is presented a moment after the seek ends.
+        await new Promise((r) => setTimeout(r, 300));
+        const r = await c.pictures.raster(1, { width: 160 });
+        const canvas = new OffscreenCanvas(r.width, r.height);
+        const ctx = canvas.getContext("2d");
+        // The clip is noise: only the same resampling gives the same pixels.
+        ctx.imageSmoothingQuality = "high";
+        ctx.drawImage(v, 0, 0, r.width, r.height);
+        const want = ctx.getImageData(0, 0, r.width, r.height).data;
+        const got = new OffscreenCanvas(r.width, r.height);
+        const g = got.getContext("2d");
+        g.drawImage(r.bitmap, 0, 0);
+        r.bitmap.close();
+        const have = g.getImageData(0, 0, r.width, r.height).data;
+        let diff = 0, transparent = 0;
+        for (let i = 0; i < have.length; i += 4) { diff += Math.abs(have[i] - want[i]) + Math.abs(have[i + 1] - want[i + 1]) + Math.abs(have[i + 2] - want[i + 2]); if (have[i + 3] < 255) transparent++; }
+        return { equal: diff / (have.length / 4 * 3), width: r.width, height: r.height, transparent, space: r.space };
+      }`,
+      where,
+    );
+  }
+
+  test("the frame being shown is a picture, drawn at the size asked", async ({ page }) => {
+    await page.goto("./?lang=en&mode=page");
+    test.skip(!(await playable(page)), "this browser cannot play VP8 WebM");
+    await page.getByTestId("file-input").setInputFiles({ name: "clip.webm", mimeType: "video/webm", buffer: clip() });
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    const video = page.locator(".demo-frame .exav-viewer-media video");
+    await expect.poll(() => video.evaluate((v: HTMLVideoElement) => v.readyState)).toBeGreaterThanOrEqual(2);
+    expect(await controllers(page, `(c) => c.pictures.get()`)).toEqual({ count: 1, space: "frame" });
+    const frame = await drawnFrame(page, "exavDemo", ".demo-frame .exav-viewer-media video");
+    expect(frame.transparent).toBe(0);
+    expect(frame.equal).toBeLessThan(2);
+    const p = await raster(page, 1, { longEdge: 64 });
+    expect(Math.max(p.width, p.height)).toBe(64);
+    expect(p.info.space).toBe("frame");
+    expect(p.info.region).toBeUndefined();
+    // A frame has no region, and a size is needed.
+    expect(await refused(page, 1, { width: 10, region: { x: 0, y: 0, width: 1, height: 1 } })).toBe("invalid");
+    expect(await refused(page, 1, { width: 10, region: "current" })).toBe("invalid");
+    expect(await refused(page, 1, {})).toBe("invalid");
+    expect(await refused(page, 2, { width: 10 })).toBe("invalid");
+    // Shaped by a width and a height, never stretched, the bars transparent.
+    const boxed = await raster(page, 1, { width: 100, height: 100 });
+    expect([boxed.width, boxed.height]).toEqual([100, 100]);
+    expect(boxed.data[3]).toBe(0);
+    expect(await controllers(page, `(c) => !!c.viewport`)).toBe(false);
+  });
+
+  test("in the frame, a video delivered as a blob is drawn, and one delivered by URL is refused", async ({ page }) => {
+    await page.goto("./headless.html?lang=en");
+    test.skip(!(await playable(page)), "this browser cannot play VP8 WebM");
+    await page.getByTestId("file-input").setInputFiles({ name: "clip.webm", mimeType: "video/webm", buffer: clip() });
+    await expect
+      .poll(() => page.evaluate(() => (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session()?.status.get().phase), { timeout: 60_000 })
+      .toBe("ready");
+    await expect.poll(() => controllers<boolean>(page, `(c) => !!c.pictures`, "headless")).toBe(true);
+    // A video with no frame yet is refused ("failed"): Firefox and WebKit take longer to decode the first.
+    await expect.poll(() => page.frameLocator("#stage iframe").locator("video").evaluate((v: HTMLVideoElement) => v.readyState)).toBeGreaterThanOrEqual(2);
+    const p = await raster(page, 1, { width: 64 }, "headless");
+    expect(p.width).toBe(64);
+    expect(find(p, (r, g, b) => r + g + b > 30).count).toBeGreaterThan(0);
+  });
+
+  // The frame's own origin is opaque, so a video it is given by address is another origin to it: unreadable, and said so.
+  test("in the frame, a video delivered by URL is refused as unsupported, not drawn blank", async ({ page }) => {
+    await page.goto("./?lang=en");
+    test.skip(!(await playable(page)), "this browser cannot play VP8 WebM");
+    await page.goto("./?lang=en&url=/e2e/clip.webm");
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    const frame = page.frameLocator(".demo-frame iframe.exav-viewer-sandbox");
+    await expect.poll(() => frame.locator("video").evaluate((v: HTMLVideoElement) => v.readyState)).toBeGreaterThanOrEqual(2);
+    await expect.poll(() => controllers<boolean>(page, `(c) => !!c.pictures`)).toBe(true);
+    expect(await refused(page, 1, { width: 64 })).toBe("unsupported");
+  });
+});
diff --git a/crates/exav-viewer/e2e/pdf-decoders.spec.ts b/crates/exav-viewer/e2e/pdf-decoders.spec.ts
index b37ea229..a146fc57 100644
--- a/crates/exav-viewer/e2e/pdf-decoders.spec.ts
+++ b/crates/exav-viewer/e2e/pdf-decoders.spec.ts
@@ -60,8 +60,8 @@ async function draw(page: Page, pdf: string, original: boolean) {
   }
   await page.goto("./?lang=en&mode=page");
   await page.getByTestId("file-input").setInputFiles({ name: pdf, mimeType: "application/pdf", buffer: fs.readFileSync(path.join(FIXTURES, pdf)) });
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-  const pixels = await settled(page.locator(".demo-frame .exv-pdf-page").first());
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+  const pixels = await settled(page.locator(".demo-frame .exav-viewer-pdf-page").first());
   return { pixels, requests, served };
 }
 
@@ -103,8 +103,8 @@ test.describe("pdf.js's image decoders, replaced", () => {
     });
     await page.goto("./?lang=en&mode=page");
     await page.getByTestId("file-input").setInputFiles({ name: "icc.pdf", mimeType: "application/pdf", buffer: fs.readFileSync(path.join(FIXTURES, "icc.pdf")) });
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-    await settled(page.locator(".demo-frame .exv-pdf-page").first());
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+    await settled(page.locator(".demo-frame .exav-viewer-pdf-page").first());
     await expect.poll(() => qcms).toEqual(["200 application/wasm"]);
   });
 
diff --git a/crates/exav-viewer/e2e/pinch.spec.ts b/crates/exav-viewer/e2e/pinch.spec.ts
index a77dd0b5..89a76053 100644
--- a/crates/exav-viewer/e2e/pinch.spec.ts
+++ b/crates/exav-viewer/e2e/pinch.spec.ts
@@ -18,7 +18,7 @@ const COLUMN: Test = (r, g, b) => r < 160 && g < 160 && b < 160;
 async function open(page: Page, name: string) {
   // The engines in the page, whose elements the tests read.
   await openSample(page, name, { mode: "page" });
-  await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
   await page.waitForTimeout(500);
 }
 
@@ -28,8 +28,8 @@ async function open(page: Page, name: string) {
  */
 async function locate(frame: Locator, test: Test) {
   const at = (await frame.boundingBox())!;
-  // Without the zoom buttons, which sit over a corner of it.
-  const tools = frame.page().locator(".exv-tools");
+  // Without the zoom buttons, which sit over its corner.
+  const tools = frame.page().locator(".exav-viewer-tools");
   const hide = (v: string) => tools.evaluateAll((els, value) => els.forEach((e) => ((e as HTMLElement).style.visibility = value)), v);
   const until = Date.now() + 15_000;
   let box: ReturnType<typeof find>["box"] = null;
@@ -95,30 +95,89 @@ async function zoomsAbout(page: Page, frame: Locator, feature: Test, dx: number,
 
 test("a pinch on an image zooms about the fingers", async ({ page }) => {
   await open(page, "landscape.png");
-  const frame = page.locator(".demo-frame .exv-surface");
+  const frame = page.locator(".demo-frame .exav-viewer-surface");
   const sun = await locate(frame, SUN);
   await zoomsAbout(page, frame, SUN, sun.width / 2, true);
 });
 
 test("a pinch on a PDF zooms about the fingers", async ({ page }) => {
   await open(page, "report.pdf");
-  await zoomsAbout(page, page.locator(".demo-frame .exv-surface"), RULE, 30, false);
+  await zoomsAbout(page, page.locator(".demo-frame .exav-viewer-surface"), RULE, 30, false);
 });
 
 test("a pinch on a drawing zooms about the fingers", async ({ page }) => {
   await open(page, "plan.dwg");
   // The column alone: the walls' antialiased edges are as grey as it is.
   await page.getByRole("button", { name: "None" }).click();
-  await page.locator(".exv-layer", { hasText: "COLUMNS" }).getByRole("checkbox").check();
+  await page.locator(".exav-viewer-layer", { hasText: "COLUMNS" }).getByRole("checkbox").check();
   await page.waitForTimeout(300);
   // About a point well left of the column, which sits near the middle of the
   // canvas, where zooming about the fingers and about the centre agree.
-  await zoomsAbout(page, page.locator(".demo-frame .exv-cad-canvas"), COLUMN, -150, true);
+  await zoomsAbout(page, page.locator(".demo-frame .exav-viewer-cad-canvas"), COLUMN, -150, true);
+});
+
+// A frame drawn per event queues behind the last on a large drawing, and the
+// zoom lags seconds behind the fingers: while the events go on the canvas is
+// scaled where it is (a CSS transform), and a sharp frame follows the pause.
+test("a ctrl and wheel zoom on a drawing scales the canvas, and draws sharp once it pauses", async ({ page }) => {
+  await open(page, "plan.dwg");
+  const result = await page.evaluate(async () => {
+    const canvas = document.querySelector<HTMLCanvasElement>(".demo-frame .exav-viewer-cad-canvas")!;
+    const gl = canvas.getContext("webgl2")!;
+    // A frame clears colour and depth together; nothing else here does.
+    let frames = 0;
+    const clear = gl.clear.bind(gl);
+    gl.clear = (mask: number) => {
+      if (mask & gl.DEPTH_BUFFER_BIT) frames++;
+      clear(mask);
+    };
+    const at = canvas.getBoundingClientRect();
+    const init = { deltaY: -3, ctrlKey: true, clientX: at.left + at.width / 2, clientY: at.top + at.height / 2, bubbles: true, cancelable: true };
+    // A third of a second of events, a frame apart: short of the pause after which a sharp frame is drawn anyway.
+    for (let i = 0; i < 20; i++) {
+      canvas.dispatchEvent(new WheelEvent("wheel", init));
+      await new Promise((r) => setTimeout(r, 17));
+    }
+    const during = { frames, transform: canvas.style.transform };
+    await new Promise((r) => setTimeout(r, 500));
+    return { during, after: { frames, transform: canvas.style.transform } };
+  });
+  // Not a frame per event, but the canvas moved to where the camera is.
+  expect(result.during.frames).toBeLessThanOrEqual(2);
+  expect(result.during.transform).toMatch(/^translate\(.*\) scale\(1\.[0-9]+\)$/);
+  // Then one sharp frame, and the canvas as drawn.
+  expect(result.after.frames - result.during.frames).toBeGreaterThanOrEqual(1);
+  expect(result.after.frames - result.during.frames).toBeLessThanOrEqual(2);
+  expect(result.after.transform).toBe("");
+});
+
+// Safari reports a trackpad pinch as gesture events, whose scale is the total
+// since the start, and may send ctrl+wheel events for the same pinch.
+test("Safari's gesture events zoom a drawing by their scale, once", async ({ page }) => {
+  await open(page, "plan.dwg");
+  const scale = await page.evaluate(async () => {
+    const canvas = document.querySelector<HTMLCanvasElement>(".demo-frame .exav-viewer-cad-canvas")!;
+    const at = canvas.getBoundingClientRect();
+    const pos = { clientX: at.left + at.width / 2, clientY: at.top + at.height / 2, bubbles: true, cancelable: true };
+    const gesture = (type: string, scale: number) =>
+      canvas.dispatchEvent(Object.assign(new Event(type, { bubbles: true, cancelable: true }), { scale, clientX: pos.clientX, clientY: pos.clientY }));
+    gesture("gesturestart", 1);
+    for (let i = 1; i <= 10; i++) {
+      gesture("gesturechange", 1 + i * 0.1);
+      canvas.dispatchEvent(new WheelEvent("wheel", { ...pos, deltaY: -3, ctrlKey: true }));
+      await new Promise((r) => setTimeout(r, 17));
+    }
+    const k = /scale\(([0-9.]+)\)/.exec(canvas.style.transform)?.[1];
+    gesture("gestureend", 2);
+    return Number(k);
+  });
+  expect(scale).toBeGreaterThan(1.9);
+  expect(scale).toBeLessThan(2.1);
 });
 
 test("ctrl and the wheel, a desktop trackpad's pinch, zoom a PDF about the cursor and not the page", async ({ page }) => {
   await open(page, "report.pdf");
-  const frame = page.locator(".demo-frame .exv-surface");
+  const frame = page.locator(".demo-frame .exav-viewer-surface");
   const before = await locate(frame, RULE);
   await page.mouse.move(before.cx, before.cy);
   await page.keyboard.down("Control");
diff --git a/crates/exav-viewer/e2e/progressive.spec.ts b/crates/exav-viewer/e2e/progressive.spec.ts
new file mode 100644
index 00000000..269c106a
--- /dev/null
+++ b/crates/exav-viewer/e2e/progressive.spec.ts
@@ -0,0 +1,44 @@
+// A long Word document is laid out progressively: the viewer is ready on its
+// first pages, and the page count grows as the rest is laid out. Opened
+// through the headless demo, whose page field shows the count the session
+// reports.
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { storedZip } from "./zip.js";
+
+failOnViolations();
+
+const PAGES = 200;
+
+/** A document of `pages` pages: a heading and five paragraphs on each, then a page break. */
+function longDocument(pages: number): Buffer {
+  const WORDS = "the quick brown fox jumps over the lazy dog while a gentle breeze moves across quiet fields and distant hills".split(" ");
+  const paragraph = (seed: number) => `<w:p><w:r><w:t xml:space="preserve">${Array.from({ length: 90 }, (_, i) => WORDS[(seed * 7 + i * 3) % WORDS.length]).join(" ")}.</w:t></w:r></w:p>`;
+  const body = Array.from(
+    { length: pages },
+    (_, p) => `<w:p><w:r><w:rPr><w:b/><w:sz w:val="32"/></w:rPr><w:t>Section ${p}</w:t></w:r></w:p>${[0, 1, 2, 3, 4].map((k) => paragraph(p + k)).join("")}<w:p><w:r><w:br w:type="page"/></w:r></w:p>`,
+  ).join("");
+  const text = (s: string) => new TextEncoder().encode(s);
+  return storedZip([
+    ["[Content_Types].xml", text(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/></Types>`)],
+    ["_rels/.rels", text(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/></Relationships>`)],
+    ["word/document.xml", text(`<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body>${body}<w:sectPr><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="708" w:footer="708" w:gutter="0"/></w:sectPr></w:body></w:document>`)],
+  ]);
+}
+
+/** The page count the headless demo's page field reports. */
+const total = async (page: Page) => Number(/\/ (\d+)/.exec(await page.locator("#controls").innerText())?.[1] ?? 0);
+
+test("a long document is ready on its first pages and the page count grows as the rest is laid out", async ({ page }) => {
+  test.setTimeout(240_000);
+  await page.goto("./headless.html?lang=en");
+  await page.getByTestId("file-input").setInputFiles({ name: "long.docx", mimeType: "", buffer: longDocument(PAGES) });
+  await expect
+    .poll(() => page.evaluate(() => (window as unknown as { headless: { session(): { status: { get(): { phase: string } } } | null } }).headless.session()?.status.get().phase), { timeout: 120_000 })
+    .toBe("ready");
+  const first = await total(page);
+  expect(first).toBeGreaterThan(0);
+  expect(first).toBeLessThan(PAGES);
+  await expect.poll(() => total(page), { timeout: 180_000 }).toBeGreaterThanOrEqual(PAGES);
+});
diff --git a/crates/exav-viewer/e2e/raster-frame.spec.ts b/crates/exav-viewer/e2e/raster-frame.spec.ts
new file mode 100644
index 00000000..8a38f4cd
--- /dev/null
+++ b/crates/exav-viewer/e2e/raster-frame.spec.ts
@@ -0,0 +1,284 @@
+// Pictures of pages (`controllers.pictures`, `controllers.viewport`) for a PDF
+// and an image, with each file in the sandboxed frame and with the engines in
+// the page: the size and region asked for, the region drawn back, the
+// viewport, the encoding done by the page, and the errors. The expectations
+// come from how the samples were made (fixtures/make-samples.mjs): a PDF page
+// of 595 x 842 points with a blue rule across it 750 points up, and a 640 x
+// 420 picture with a sun of radius 55 at (480, 110).
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { decodePng, find, type Pixels } from "./pixels.js";
+import { openSample } from "./samples.js";
+
+failOnViolations();
+
+interface Drawn {
+  width: number;
+  height: number;
+  page: number;
+  space: string;
+  region?: { x: number; y: number; width: number; height: number };
+  layout?: string;
+  pixels: Pixels;
+}
+
+type Failed = { error: string };
+
+/** The rule's blue, or a lighter one where a thin line is anti-aliased into white. */
+const blue = (r: number, _g: number, b: number) => b > 150 && b - r > 40;
+const at = (p: Pixels, x: number, y: number): [number, number, number, number] => {
+  const i = (y * p.width + x) * 4;
+  return [p.data[i]!, p.data[i + 1]!, p.data[i + 2]!, p.data[i + 3]!];
+};
+const isWhite = (p: Pixels, x: number, y: number) => at(p, x, y).every((c) => c > 245);
+
+/** `pictures.raster(page, options)`, the bitmap read back as pixels; or the code of its `RasterError`. */
+async function raster(page: Page, n: number, options: Record<string, unknown>): Promise<Drawn | Failed> {
+  const result = await page.evaluate(
+    async ([n, options]) => {
+      const pictures = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: unknown): Promise<any> } } } } } }).exavDemo.session().controllers.get().pictures;
+      try {
+        const { bitmap, ...rest } = await pictures.raster(n, options);
+        const canvas = document.createElement("canvas");
+        canvas.width = bitmap.width;
+        canvas.height = bitmap.height;
+        canvas.getContext("2d")!.drawImage(bitmap, 0, 0);
+        bitmap.close();
+        return { ...rest, png: canvas.toDataURL("image/png").split(",")[1] };
+      } catch (e) {
+        return { error: (e as { code?: string }).code ?? String(e) };
+      }
+    },
+    [n, options] as const,
+  );
+  if ("error" in result) return result as Failed;
+  const { png, ...rest } = result as { png: string };
+  return { ...(rest as Omit<Drawn, "pixels">), pixels: decodePng(Buffer.from(png, "base64")) };
+}
+
+const ok = (r: Drawn | Failed): Drawn => {
+  if ("error" in r) throw new Error(`the picture failed: ${r.error}`);
+  return r;
+};
+
+/** The first and last row and column where `match` holds. */
+const extent = (p: Pixels, match: (r: number, g: number, b: number) => boolean) => find(p, match).box;
+
+for (const mode of ["sandbox", "page"] as const) {
+  test.describe(mode, () => {
+    async function open(page: Page, name: string) {
+      await openSample(page, name, mode === "page" ? { mode } : {});
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+      await page.waitForFunction(() => !!(window as unknown as { exavDemo?: { session(): { controllers: { get(): { pictures?: unknown } } } | null } }).exavDemo?.session()?.controllers.get().pictures);
+    }
+
+    test("a PDF page is drawn to a longest side, whole, on white, with its region reported", async ({ page }) => {
+      await open(page, "report.pdf");
+      const r = ok(await raster(page, 1, { longEdge: 420 }));
+      expect([r.width, r.height, r.page, r.space]).toEqual([297, 420, 1, "page"]);
+      expect(r.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+      expect(at(r.pixels, 2, 2)).toEqual([255, 255, 255, 255]);
+      // The rule 750 points up: 92 of 842 from the top, across 56 to 539 of 595.
+      const rule = extent(r.pixels, blue)!;
+      expect(rule.minY).toBeGreaterThan(420 * (91 / 842) - 3);
+      expect(rule.minY).toBeLessThan(420 * (93 / 842) + 3);
+      expect(rule.minX / 297).toBeCloseTo(56 / 595, 1);
+      expect(rule.maxX / 297).toBeCloseTo(539 / 595, 1);
+    });
+
+    test("a region of a page is exactly that part, at the size asked for", async ({ page }) => {
+      await open(page, "report.pdf");
+      // A strip 0.02 of the page's height, from 0.1 down: 595 x 16.84 points at one pixel a point.
+      const strip = ok(await raster(page, 1, { width: 595, region: { x: 0, y: 0.1, width: 1, height: 0.02 } }));
+      expect([strip.width, strip.height]).toEqual([595, 17]);
+      expect(strip.region).toEqual({ x: 0, y: 0.1, width: 1, height: 0.02 });
+      // The rule is 7.8 points below the strip's top and 2 thick.
+      const rule = extent(strip.pixels, blue)!;
+      expect(rule.minY).toBeGreaterThanOrEqual(6);
+      expect(rule.maxY).toBeLessThanOrEqual(10);
+      expect(rule.minX).toBeGreaterThanOrEqual(54);
+      expect(rule.minX).toBeLessThanOrEqual(58);
+      expect(rule.maxX).toBeGreaterThanOrEqual(537);
+      expect(rule.maxX).toBeLessThanOrEqual(541);
+      expect(isWhite(strip.pixels, 20, 8)).toBe(true);
+      expect(isWhite(strip.pixels, 300, 1)).toBe(true);
+      // The same strip cut out of the whole page is the same picture.
+      const whole = ok(await raster(page, 1, { width: 595 }));
+      const y0 = Math.round(0.1 * whole.height);
+      let worst = 0;
+      for (let y = 0; y < strip.height; y++) for (let x = 0; x < 595; x += 3) worst = Math.max(worst, Math.abs(at(strip.pixels, x, y)[2] - at(whole.pixels, x, y0 + y)[2]));
+      expect(worst).toBeLessThan(40);
+    });
+
+    test("a region of another shape than the picture is widened (contain) or cut (cover), never stretched, and the region drawn is reported", async ({ page }) => {
+      await open(page, "report.pdf");
+      const region = { x: 0.25, y: 0, width: 0.5, height: 0.5 };
+      // 297.5 x 421 points into a square.
+      const contain = ok(await raster(page, 1, { width: 200, height: 200, region }));
+      expect(contain.region!.width).toBeCloseTo(421 / 595, 6);
+      expect(contain.region!.height).toBeCloseTo(0.5, 6);
+      expect(contain.region!.x + contain.region!.width / 2).toBeCloseTo(0.5, 6);
+      const cover = ok(await raster(page, 1, { width: 200, height: 200, region, fit: "cover" }));
+      expect(cover.region!.width).toBeCloseTo(0.5, 6);
+      expect(cover.region!.height).toBeCloseTo(297.5 / 842, 6);
+      expect(cover.region!.y + cover.region!.height / 2).toBeCloseTo(0.25, 6);
+    });
+
+    test("what the user sees is the viewport, and 'current' draws it", async ({ page }) => {
+      await open(page, "report.pdf");
+      const tools = page.locator(".demo-frame .exav-viewer-tools");
+      for (let i = 0; i < 3; i++) await tools.getByRole("button", { name: "Zoom in" }).click();
+      const viewport = () => page.evaluate(() => (window as unknown as { exavDemo: { session(): { controllers: { get(): { viewport: { get(): unknown } } } } } }).exavDemo.session().controllers.get().viewport.get());
+      await expect.poll(async () => ((await viewport()) as { region: { width: number } } | null)?.region.width ?? 1).toBeLessThan(0.8);
+      // Still: the last zoom has settled when two reads agree.
+      let last = "";
+      await expect
+        .poll(async () => {
+          const now = JSON.stringify(await viewport());
+          const same = now === last;
+          last = now;
+          return same;
+        })
+        .toBe(true);
+      const seen = (await viewport()) as { space: string; page: number; region: { x: number; y: number; width: number; height: number } };
+      expect(seen.space).toBe("page");
+      const r = ok(await raster(page, seen.page, { width: 400, region: "current" }));
+      // The viewport can move between the two reads by a pixel or two of scrolling; it does not here.
+      for (const k of ["x", "y", "width", "height"] as const) expect(r.region![k]).toBeCloseTo(seen.region[k], 2);
+      expect(r.pixels.width).toBe(400);
+      // It is a narrower part of the page than the whole of it.
+      expect(r.region!.width).toBeLessThan(0.8);
+    });
+
+    test("a picture is drawn from the document again at any size, not read off the screen", async ({ page }) => {
+      await open(page, "report.pdf");
+      const small = ok(await raster(page, 1, { width: 300, region: { x: 0, y: 0.1, width: 0.2, height: 0.02 } }));
+      const big = ok(await raster(page, 1, { width: 3000, region: { x: 0, y: 0.1, width: 0.2, height: 0.02 } }));
+      expect(big.width).toBe(3000);
+      // The region is 119 x 16.84 points.
+      expect(Math.abs(big.height - 3000 / (119 / 16.84))).toBeLessThanOrEqual(1);
+      // The rule is two points thick: about ten times as many pixels at ten times the size, with an edge as sharp.
+      const thick = (p: Pixels) => {
+        const column = Math.floor(p.width * 0.5);
+        let n = 0;
+        for (let y = 0; y < p.height; y++) if (blue(...(at(p, column, y).slice(0, 3) as [number, number, number]))) n++;
+        return n;
+      };
+      expect(thick(big.pixels) / thick(small.pixels)).toBeGreaterThan(7);
+      expect(thick(big.pixels) / thick(small.pixels)).toBeLessThan(13);
+    });
+
+    test("an image's region is pixels of the source, and what lies outside it takes the background", async ({ page }) => {
+      await open(page, "landscape.png");
+      const sun = ok(await raster(page, 1, { width: 110, height: 110, region: { x: 425, y: 55, width: 110, height: 110 } }));
+      expect(sun.space).toBe("pixels");
+      expect(sun.region).toEqual({ x: 425, y: 55, width: 110, height: 110 });
+      expect(at(sun.pixels, 55, 55)).toEqual([250, 200, 80, 255]);
+      expect(at(sun.pixels, 2, 2)[2]).toBeGreaterThan(150);
+      // Twice as wide: contain widens the region about its centre, the sun stays in the middle.
+      const wide = ok(await raster(page, 1, { width: 220, height: 110, region: { x: 425, y: 55, width: 110, height: 110 } }));
+      expect(wide.region).toEqual({ x: 370, y: 55, width: 220, height: 110 });
+      expect(at(wide.pixels, 110, 55)).toEqual([250, 200, 80, 255]);
+      // Cover cuts the height instead.
+      const cover = ok(await raster(page, 1, { width: 220, height: 110, fit: "cover", region: { x: 425, y: 55, width: 110, height: 110 } }));
+      expect(cover.region).toEqual({ x: 425, y: 82.5, width: 110, height: 55 });
+      // Past the left edge: transparent by default, any colour asked for, and the picture where it is.
+      const past = ok(await raster(page, 1, { width: 740, region: { x: -100, y: 0, width: 740, height: 420 } }));
+      expect(at(past.pixels, 50, 200)[3]).toBe(0);
+      expect(at(past.pixels, 100 + 480, 110)).toEqual([250, 200, 80, 255]);
+      const red = ok(await raster(page, 1, { width: 740, background: "#ff0000", region: { x: -100, y: 0, width: 740, height: 420 } }));
+      expect(at(red.pixels, 50, 200)).toEqual([255, 0, 0, 255]);
+    });
+
+    test("an image is sharp when drawn larger than its pixels, from the source", async ({ page }) => {
+      await open(page, "logo.svg");
+      const r = ok(await raster(page, 1, { longEdge: 1600 }));
+      expect(Math.max(r.width, r.height)).toBe(1600);
+      // The whole drawing: its white circle in the middle of the green.
+      expect(at(r.pixels, r.width / 2, r.height / 2)).toEqual([255, 255, 255, 255]);
+      expect(at(r.pixels, r.width - 10, r.height - 10)).toEqual([0, 170, 119, 255]);
+      // A vector drawing keeps hard edges at any size: a colour change over one pixel at most.
+      let soft = 0;
+      let hard = 0;
+      for (let x = 1; x < r.width; x++) {
+        const y = Math.floor(r.height / 2);
+        const d = Math.abs(at(r.pixels, x, y)[0] - at(r.pixels, x - 1, y)[0]);
+        if (d > 120) hard++;
+        else if (d > 30) soft++;
+      }
+      expect(hard).toBeGreaterThan(0);
+      expect(soft).toBeLessThanOrEqual(hard * 2 + 4);
+    });
+
+    test("toBlob encodes in the page, and says when a type cannot be", async ({ page }) => {
+      await open(page, "report.pdf");
+      const out = await page.evaluate(async () => {
+        const pictures = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { toBlob(n: number, o: unknown): Promise<any> } } } } } }).exavDemo.session().controllers.get().pictures;
+        const one = async (type: string) => {
+          try {
+            const r = await pictures.toBlob(1, { longEdge: 200, type, quality: 0.8 });
+            const bitmap = await createImageBitmap(r.blob);
+            const info = { type: r.blob.type, size: r.blob.size, width: bitmap.width, height: bitmap.height, region: r.region, bitmap: "bitmap" in r };
+            bitmap.close();
+            return info;
+          } catch (e) {
+            return { error: (e as { code?: string }).code ?? String(e) };
+          }
+        };
+        return { png: await one("png"), jpeg: await one("jpeg"), webp: await one("webp"), gif: await one("gif") };
+      });
+      expect(out.png).toMatchObject({ type: "image/png", width: 141, height: 200, region: { x: 0, y: 0, width: 1, height: 1 }, bitmap: false });
+      expect(out.jpeg).toMatchObject({ type: "image/jpeg", width: 141, height: 200 });
+      // Safari has no WebP encoder: it says so, and does not hand back a PNG.
+      if ("error" in out.webp) expect(out.webp).toEqual({ error: "unsupported" });
+      else expect(out.webp).toMatchObject({ type: "image/webp" });
+      expect(out.gif).toEqual({ error: "invalid" });
+    });
+
+    test("a request that is none is refused, a picture too large is, and one aborted stops", async ({ page }) => {
+      await open(page, "report.pdf");
+      expect(await raster(page, 99, { longEdge: 100 })).toEqual({ error: "invalid" });
+      expect(await raster(page, 1, {})).toEqual({ error: "invalid" });
+      expect(await raster(page, 1, { longEdge: -5 })).toEqual({ error: "invalid" });
+      expect(await raster(page, 1, { longEdge: 100, background: "url(https://example.test/x)" })).toEqual({ error: "invalid" });
+      expect(await raster(page, 1, { longEdge: 100, fit: "stretch" })).toEqual({ error: "invalid" });
+      expect(await raster(page, 1, { longEdge: 100, region: "current", layout: "x".repeat(2000) })).toEqual({ error: "invalid" });
+      expect(await raster(page, 1, { width: 20_000, height: 20_000 })).toEqual({ error: "too-large" });
+      expect(await raster(page, 1, { width: 16_384, height: 16_384 })).toEqual({ error: "too-large" });
+      const code = await page.evaluate(async () => {
+        const pictures = (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures: { raster(n: number, o: unknown): Promise<unknown> } } } } } }).exavDemo.session().controllers.get().pictures;
+        const abort = new AbortController();
+        const drawn = pictures.raster(1, { longEdge: 4000, signal: abort.signal }).then(
+          () => "drawn",
+          (e: { code?: string }) => e.code,
+        );
+        abort.abort();
+        return drawn;
+      });
+      expect(code).toBe("aborted");
+    });
+
+    test("text has no pictures", async ({ page }) => {
+      await openSample(page, "notes.txt", mode === "page" ? { mode } : {});
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+      expect(await page.evaluate(() => (window as unknown as { exavDemo: { session(): { controllers: { get(): { pictures?: unknown } } } } }).exavDemo.session().controllers.get().pictures === undefined)).toBe(true);
+    });
+
+    test("the demo's Export image control saves what the options say", async ({ page }) => {
+      await open(page, "report.pdf");
+      // The host's own control, beside the file's name and not over the viewer, and opening a dialog.
+      await expect(page.locator(".demo-frame").getByTestId("export-open")).toHaveCount(0);
+      await page.locator(".demo-bar").getByTestId("export-open").click();
+      await expect(page.getByRole("dialog", { name: "Export image" })).toBeVisible();
+      await page.getByTestId("export-long-edge").fill("500");
+      await page.getByTestId("export-type").selectOption("jpeg");
+      await page.getByTestId("export-run").click();
+      await expect(page.getByTestId("export-result")).toHaveAttribute("download", "report-1.jpg");
+      await expect(page.getByTestId("export-info")).toContainText("353 x 500 px, page 1");
+      const href = await page.getByTestId("export-result").getAttribute("href");
+      const type = await page.evaluate(async (u) => (await (await fetch(u!)).blob()).type, href);
+      expect(type).toBe("image/jpeg");
+    });
+  });
+}
diff --git a/crates/exav-viewer/e2e/raw.spec.ts b/crates/exav-viewer/e2e/raw.spec.ts
new file mode 100644
index 00000000..1d1505dc
--- /dev/null
+++ b/crates/exav-viewer/e2e/raw.spec.ts
@@ -0,0 +1,135 @@
+// Camera RAW files in the demo, decoded in WebAssembly: each is a synthetic
+// container of its family (exav-render's tests/fixtures/raw/make.py) that
+// carries a JPEG of four colour quadrants, so that what is on screen says which
+// preview was chosen and how it was turned.
+//
+// Every test runs twice: with each file in the sandboxed frame (the demo's
+// default) and with the engines in the page (`?mode=page`).
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type Locator, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { decodePng, find, type Pixels } from "./pixels.js";
+
+const FIXTURES = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "raw");
+
+const COLOURS = {
+  red: (r: number, g: number, b: number) => r > 200 && g < 70 && b < 70,
+  green: (r: number, g: number, b: number) => g > 200 && r < 70 && b < 70,
+  blue: (r: number, g: number, b: number) => b > 200 && r < 70 && g < 70,
+  yellow: (r: number, g: number, b: number) => r > 200 && g > 200 && b < 70,
+};
+
+/** The four colours in the order they sit on screen: top left, top right, bottom left, bottom right. */
+function layout(p: Pixels): { order: string[]; width: number; height: number } {
+  const found = Object.entries(COLOURS).map(([name, test]) => ({ name, ...find(p, test) }));
+  for (const c of found) expect(c.count, `${c.name} is on screen`).toBeGreaterThan(100);
+  const centre = (c: (typeof found)[number]) => ({ x: (c.box!.minX + c.box!.maxX) / 2, y: (c.box!.minY + c.box!.maxY) / 2 });
+  const byY = [...found].sort((a, b) => centre(a).y - centre(b).y);
+  const rows = [byY.slice(0, 2), byY.slice(2)].map((row) => row.sort((a, b) => centre(a).x - centre(b).x));
+  const [minX, maxX] = [Math.min(...found.map((c) => c.box!.minX)), Math.max(...found.map((c) => c.box!.maxX))];
+  const [minY, maxY] = [Math.min(...found.map((c) => c.box!.minY)), Math.max(...found.map((c) => c.box!.maxY))];
+  return { order: rows.flat().map((c) => c.name), width: maxX - minX + 1, height: maxY - minY + 1 };
+}
+
+failOnViolations();
+
+for (const mode of ["sandbox", "page"] as const) {
+  const query = mode === "page" ? "&mode=page" : "";
+
+  /** Gives the demo a fixture under `name` (which the type is left out of, as a desktop often does). */
+  async function show(page: Page, fixture: string, name = fixture): Promise<void> {
+    await page.goto(`./?lang=en${query}`);
+    await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: fs.readFileSync(path.join(FIXTURES, fixture)) });
+  }
+
+  async function picture(page: Page, what = "the file"): Promise<Pixels> {
+    const body = page.locator(".demo-frame .exav-viewer-body");
+    await expect(body, what).toHaveAttribute("data-phase", "ready");
+    const surface: Locator = page.locator(".demo-frame .exav-viewer-surface");
+    // The surface is drawn once the canvas has its pixels: read until two screenshots agree.
+    let last = decodePng(await surface.screenshot({ animations: "disabled" }));
+    for (let i = 0; i < 20; i++) {
+      await page.waitForTimeout(150);
+      const next = decodePng(await surface.screenshot({ animations: "disabled" }));
+      if (next.data.length === last.data.length && next.data.every((v, k) => v === last.data[k])) return next;
+      last = next;
+    }
+    return last;
+  }
+
+  test.describe(mode, () => {
+    test("a CR2 shows its largest preview, as it was stored", async ({ page }) => {
+      await show(page, "canon.cr2", "IMG_0001.CR2");
+      const p = layout(await picture(page));
+      expect(p.order).toEqual(["red", "green", "blue", "yellow"]);
+      // 96 by 64: the JPEG of the first directory, not the thumbnail or the RGB preview.
+      expect(p.width / p.height).toBeCloseTo(96 / 64, 1);
+    });
+
+    test("a RAF is turned by the orientation its JPEG carries", async ({ page }) => {
+      await show(page, "fujifilm-o6.raf", "DSCF0001.RAF");
+      const p = layout(await picture(page));
+      expect(p.order).toEqual(["blue", "red", "yellow", "green"]);
+      // 64 by 48 stored, turned a quarter.
+      expect(p.width / p.height).toBeCloseTo(48 / 64, 1);
+    });
+
+    test("a CR3 is turned by the orientation of its metadata boxes", async ({ page }) => {
+      await show(page, "canon-o8.cr3", "IMG_0002.CR3");
+      const p = layout(await picture(page));
+      expect(p.order).toEqual(["green", "yellow", "red", "blue"]);
+      // The full-size JPEG, 128 by 96 stored, turned a quarter.
+      expect(p.width / p.height).toBeCloseTo(96 / 128, 1);
+    });
+
+    test("every family opens: the preview is where the maker keeps it", async ({ page }) => {
+      const files: [string, string][] = [
+        ["preview-jpeg.dng", "a.DNG"],
+        ["preview-rgb.dng", "b.dng"],
+        ["nikon.nef", "DSC_0001.NEF"],
+        ["sony.arw", "DSC00001.ARW"],
+        ["pentax.pef", "IMGP0001.PEF"],
+        ["samsung.srw", "SAM_0001.SRW"],
+        ["hasselblad.3fr", "B0001.3FR"],
+        ["kodak16-be.dcr", "K0001.DCR"],
+        ["olympus.orf", "P1000001.ORF"],
+        ["panasonic.rw2", "P1000001.RW2"],
+        ["phaseone.iiq", "C0001.IIQ"],
+        ["sigma.x3f", "SDIM0001.X3F"],
+        ["canon.crw", "IMG_0003.CRW"],
+      ];
+      for (const [fixture, name] of files) {
+        await show(page, fixture, name);
+        const p = layout(await picture(page, name));
+        // Turned or not, the four quadrants sit in the corners of a rectangle.
+        expect(p.order.length, name).toBe(4);
+      }
+    });
+
+    test("a RAW file is a RAW file whatever its name says", async ({ page }) => {
+      // The name says nothing, the type says RAW: the bytes of an Olympus file.
+      await page.goto(`./?lang=en${query}`);
+      await page.getByTestId("file-input").setInputFiles({ name: "photo", mimeType: "image/x-olympus-orf", buffer: fs.readFileSync(path.join(FIXTURES, "olympus-be.orf")) });
+      expect(layout(await picture(page)).order).toEqual(["red", "green", "blue", "yellow"]);
+    });
+
+    test("a RAW file with no preview says so", async ({ page }) => {
+      await show(page, "no-preview.dng", "phone.dng");
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "error");
+      await expect(page.locator(".exav-viewer-status-error")).toHaveText("This camera RAW file holds no preview to show.");
+    });
+
+    test("a damaged RAW file is an image that could not be shown", async ({ page }) => {
+      // The first directory only: no preview in it, and the JPEG streams are cut.
+      const raw = fs.readFileSync(path.join(FIXTURES, "nikon.nef"));
+      await page.goto(`./?lang=en${query}`);
+      await page.getByTestId("file-input").setInputFiles({ name: "cut.NEF", mimeType: "", buffer: raw.subarray(0, 40) });
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "error");
+      await expect(page.locator(".exav-viewer-status-error")).toHaveText("The image could not be shown.");
+    });
+  });
+}
diff --git a/crates/exav-viewer/e2e/selection.spec.ts b/crates/exav-viewer/e2e/selection.spec.ts
index 703c6ed9..8b2e62dd 100644
--- a/crates/exav-viewer/e2e/selection.spec.ts
+++ b/crates/exav-viewer/e2e/selection.spec.ts
@@ -19,9 +19,9 @@ const DOCS: Doc[] = [
     file: "report.pdf",
     line: "The north facade, the roof and the stairwell were inspected.",
     find: (root) => {
-      const run = root.locator(".exv-pdf-text span", { hasText: "The north facade" });
+      const run = root.locator(".exav-viewer-pdf-text span", { hasText: "The north facade" });
       // Laid out: its last element comes once every run is placed.
-      return { start: run, end: run, sheet: root.locator(".exv-pdf-page").first(), ready: root.locator(".exv-pdf-text-end").first() };
+      return { start: run, end: run, sheet: root.locator(".exav-viewer-pdf-page").first(), ready: root.locator(".exav-viewer-pdf-text-end").first() };
     },
   },
   {
@@ -51,7 +51,7 @@ for (const mode of ["sandbox", "page"] as const) {
     // What Chromium grants a page on a key press, which its headless mode does not.
     if (browserName === "chromium") await context.grantPermissions(["clipboard-write"]);
     await openSample(page, "quote.xlsx", mode === "page" ? { mode } : {});
-    await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
+    await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
     await page.waitForTimeout(500);
     // Something else on the clipboard first: the browser keeps it from test to test.
     const paste = page.locator("#paste");
@@ -64,7 +64,7 @@ for (const mode of ["sandbox", "page"] as const) {
     await paste.selectText();
     await page.keyboard.press("ControlOrMeta+c");
     // From A1 to B3: past the row numbers and the column letters, then two columns across and three rows down.
-    const s = (await page.locator(".demo-frame .exv-surface").boundingBox())!;
+    const s = (await page.locator(".demo-frame .exav-viewer-surface").boundingBox())!;
     await page.mouse.move(s.x + 80, s.y + 35);
     await page.mouse.down();
     await page.mouse.move(s.x + 300, s.y + 80, { steps: 8 });
@@ -88,20 +88,29 @@ for (const doc of DOCS) {
     test.describe(`${doc.file}, ${mode}`, () => {
       async function open(page: Page) {
         await openSample(page, doc.file, mode === "page" ? { mode } : {});
-        await expect(page.locator(".demo-frame .exv-body")).toHaveAttribute("data-phase", "ready");
-        const root = mode === "sandbox" ? page.frameLocator(".demo-frame iframe.exv-sandbox") : page.locator(".demo-frame");
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+        const root = mode === "sandbox" ? page.frameLocator(".demo-frame iframe.exav-viewer-sandbox") : page.locator(".demo-frame");
         const found = doc.find(root);
         await expect(found.start).toHaveCount(1);
         await expect(found.ready).toBeAttached();
+        // Placed: an attached run has no box until the layout reaches it.
+        await expect(found.start).toBeVisible();
         return found;
       }
 
       const selection = (inside: Locator) => inside.evaluate((el) => el.ownerDocument.getSelection()?.toString() ?? "");
 
+      // WebKit has no box for a run for a moment after the page is laid out again.
+      async function boxOf(place: Locator) {
+        let box = null as { x: number; y: number; width: number; height: number } | null;
+        await expect.poll(async () => (box = await place.boundingBox())).not.toBeNull();
+        return box!;
+      }
+
       test("a line dragged across, from its first letter to its last, is selected as written", async ({ page }) => {
         const { start, end } = await open(page);
-        const a = (await start.boundingBox())!;
-        const b = (await end.boundingBox())!;
+        const a = await boxOf(start);
+        const b = await boxOf(end);
         const y = a.y + a.height / 2;
         await page.mouse.move(a.x + 1, y);
         await page.mouse.down();
@@ -113,8 +122,8 @@ for (const doc of DOCS) {
 
       test("a selection dragged on into the blank beside the text keeps its start", async ({ page }) => {
         const { start, sheet } = await open(page);
-        const a = (await start.boundingBox())!;
-        const s = (await sheet.boundingBox())!;
+        const a = await boxOf(start);
+        const s = await boxOf(sheet);
         await page.mouse.move(a.x + 1, a.y + a.height / 2);
         await page.mouse.down();
         // Three lines down, at the right of the page, where there is no text.
diff --git a/crates/exav-viewer/e2e/sheets.spec.ts b/crates/exav-viewer/e2e/sheets.spec.ts
new file mode 100644
index 00000000..585df48b
--- /dev/null
+++ b/crates/exav-viewer/e2e/sheets.spec.ts
@@ -0,0 +1,84 @@
+// Spreadsheets converted by exav-render's `sheets` (exav_viewer_sheets.wasm),
+// shown by the XLSX plugin, in the page and in the sandboxed frame: an Excel
+// 97 workbook, an OpenDocument spreadsheet, Numbers documents, and an XML
+// Spreadsheet, an HTML table and a SYLK file named .xls, with nothing of an
+// external converter fetched.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations, screenshotting } from "./csp.js";
+import { decodePng, find } from "./pixels.js";
+
+/** exav-render's `sheets` fixtures (see their README for where they come from). */
+const FIXTURES = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "office", "sheets");
+
+failOnViolations();
+
+const ink = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+
+for (const mode of ["sandbox", "page"] as const) {
+  test.describe(mode, () => {
+    /** Opens a fixture; returns the URLs the page and its frames fetched for it. */
+    async function open(page: Page, name: string, as = name): Promise<string[]> {
+      const fetched: string[] = [];
+      page.on("request", (r) => fetched.push(r.url()));
+      await page.goto(`./?${new URLSearchParams({ lang: "en", ...(mode === "page" && { mode }) })}`);
+      fetched.length = 0;
+      await page.getByTestId("file-input").setInputFiles({ name: as, mimeType: "", buffer: fs.readFileSync(path.join(FIXTURES, name)) });
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready", { timeout: 60_000 });
+      return fetched;
+    }
+
+    /** Dark pixels on the surface: the sheet is drawn, not a blank canvas. */
+    const drawn = async (page: Page) => {
+      screenshotting(page);
+      return find(decodePng(await page.locator(".demo-frame .exav-viewer-surface").screenshot()), ink).count;
+    };
+
+    const byExav = (fetched: string[]) => {
+      expect(fetched.some((u) => /exav_viewer_sheets_bg[^/]*\.wasm/.test(u))).toBe(true);
+      expect(fetched.filter((u) => /converters\/|exav_office_/.test(u))).toEqual([]);
+    };
+
+    test("an Excel 97 workbook is converted and shown with its two sheets", async ({ page }) => {
+      byExav(await open(page, "sample.xls"));
+      await expect(page.locator(".exav-viewer-sheet-tab")).toHaveText(["Budget", "Notes"]);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+      await page.locator(".exav-viewer-sheet-tab", { hasText: "Notes" }).click();
+      await expect(page.locator(".exav-viewer-sheet-tab", { hasText: "Notes" })).toHaveAttribute("aria-selected", "true");
+    });
+
+    test("an OpenDocument spreadsheet is converted and shown with its two sheets", async ({ page }) => {
+      byExav(await open(page, "sample.ods"));
+      await expect(page.locator(".exav-viewer-sheet-tab")).toHaveText(["Budget", "Notes"]);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("a Numbers document is converted and its table shown", async ({ page }) => {
+      byExav(await open(page, "sample.numbers"));
+      await expect.poll(() => drawn(page)).toBeGreaterThan(100);
+    });
+
+    test("a Numbers '09 document is converted with its tables as sheets", async ({ page }) => {
+      byExav(await open(page, "numbers09.numbers"));
+      await expect(page.locator(".exav-viewer-sheet-tab")).toHaveText(["Checking - Account Categories", "Checking - Transactions", "Second sheet"]);
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    // A workbook of one sheet shows no tabs.
+    for (const [name, tabs] of [
+      ["sample-2003.xml", ["Budget", "Notes"]],
+      ["sample.html", []],
+      ["sample.slk", []],
+    ] as const) {
+      test(`${name} saved as .xls is converted by exav-render's sheets`, async ({ page }) => {
+        byExav(await open(page, name, "budget.xls"));
+        await expect(page.locator(".exav-viewer-sheet-tab")).toHaveText([...tabs]);
+        await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+      });
+    }
+  });
+}
diff --git a/crates/exav-viewer/e2e/slides.spec.ts b/crates/exav-viewer/e2e/slides.spec.ts
new file mode 100644
index 00000000..a038b216
--- /dev/null
+++ b/crates/exav-viewer/e2e/slides.spec.ts
@@ -0,0 +1,131 @@
+// Presentations and drawings converted by exav-render's `slides`
+// (exav_viewer_slides.wasm), shown by the PPTX plugin, in the page and in the
+// sandboxed frame: a PowerPoint 97 file, an OpenDocument presentation and a
+// Keynote document, an OpenDocument drawing, a Visio drawing, with nothing of an external
+// converter fetched.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations, screenshotting } from "./csp.js";
+import { decodePng, find } from "./pixels.js";
+import { storedZip } from "./zip.js";
+
+/** exav-render's `slides` fixtures (see their README for where they come from). */
+const FIXTURES = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "office", "slides");
+
+/** The drawing fixtures (a flat one, and the ODG saved from it). */
+const DRAW = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "exav-render", "tests", "fixtures", "office", "draw");
+
+failOnViolations();
+
+/**
+ * A Keynote 2 to 5 package of one slide: a 400 by 300 point page, a black
+ * square and a title, in `index.apxl`. The format is not documented: this
+ * is the smallest document the converter reads (see
+ * tests/office_slides_keynote_xml.rs in exav-render, which builds a fuller
+ * one).
+ */
+function keynoteXml(): Buffer {
+  const color = (v: number) => `<sf:color sfa:r="${v}" sfa:g="${v}" sfa:b="${v}" sfa:a="1"/>`;
+  const geometry = (x: number, y: number, w: number, h: number) => `<sf:geometry><sf:size sfa:w="${w}" sfa:h="${h}"/><sf:position sfa:x="${x}" sfa:y="${y}"/></sf:geometry>`;
+  const xml = `<?xml version="1.0" encoding="UTF-8"?>
+<key:presentation xmlns:key="http://developer.apple.com/namespaces/keynote2" xmlns:sf="http://developer.apple.com/namespaces/sf" xmlns:sfa="http://developer.apple.com/namespaces/sfa">
+ <key:size sfa:w="400" sfa:h="300"/>
+ <key:theme-list><key:theme sfa:ID="th"><key:stylesheet sfa:ID="ss"><sf:styles>
+  <sf:shape-style sfa:ID="black" sf:ident="black"><sf:property-map><sf:fill>${color(0)}</sf:fill></sf:property-map></sf:shape-style>
+  <sf:paragraphstyle sfa:ID="big" sf:ident="big"><sf:property-map><sf:fontSize><sf:number sfa:number="48"/></sf:fontSize><sf:fontColor>${color(0)}</sf:fontColor></sf:property-map></sf:paragraphstyle>
+ </sf:styles></key:stylesheet></key:theme></key:theme-list>
+ <key:slide-list><key:slide sfa:ID="s1"><key:page><sf:layers><sf:layer><sf:drawables>
+  <sf:shape sfa:ID="sq">${geometry(40, 150, 100, 100)}<sf:style><sf:shape-style-ref sfa:IDREF="black"/></sf:style></sf:shape>
+  <sf:shape sfa:ID="tx">${geometry(40, 30, 320, 80)}<sf:text><sf:text-storage><sf:stylesheet-ref sfa:IDREF="ss"/><sf:text-body><sf:p sf:style="big">Title<sf:br/></sf:p></sf:text-body></sf:text-storage></sf:text></sf:shape>
+ </sf:drawables></sf:layer></sf:layers></key:page></key:slide></key:slide-list>
+</key:presentation>`;
+  return storedZip([["index.apxl", new TextEncoder().encode(xml)]]);
+}
+
+const ink = (r: number, g: number, b: number) => r < 160 && g < 160 && b < 160;
+
+for (const mode of ["sandbox", "page"] as const) {
+  test.describe(mode, () => {
+    /** Opens a fixture; returns the URLs the page and its frames fetched for it. */
+    async function open(page: Page, name: string, buffer?: Buffer, phase = "ready"): Promise<string[]> {
+      const fetched: string[] = [];
+      page.on("request", (r) => fetched.push(r.url()));
+      await page.goto(`./?${new URLSearchParams({ lang: "en", ...(mode === "page" && { mode }) })}`);
+      fetched.length = 0;
+      await page.getByTestId("file-input").setInputFiles({ name, mimeType: "", buffer: buffer ?? fs.readFileSync(path.join(FIXTURES, name)) });
+      await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", phase, { timeout: 60_000 });
+      return fetched;
+    }
+
+    /** Dark pixels on the surface: the slide is drawn, not a blank canvas. */
+    const drawn = async (page: Page) => {
+      screenshotting(page);
+      return find(decodePng(await page.locator(".demo-frame .exav-viewer-surface").screenshot()), ink).count;
+    };
+
+    const byExav = (fetched: string[]) => {
+      expect(fetched.some((u) => /exav_viewer_slides_bg[^/]*\.wasm/.test(u))).toBe(true);
+      expect(fetched.filter((u) => /converters\/|exav_office_/.test(u))).toEqual([]);
+    };
+
+    test("a PowerPoint 97 presentation is converted and shown with its two slides", async ({ page }) => {
+      byExav(await open(page, "sample.ppt"));
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 1 / 2");
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+      await page.locator(".exav-viewer-pager button").last().click();
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 2 / 2");
+    });
+
+    test("an OpenDocument presentation is converted and shown with its two slides", async ({ page }) => {
+      byExav(await open(page, "sample.odp"));
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 1 / 2");
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+    });
+
+    test("a Keynote document is converted and its slide shown", async ({ page }) => {
+      byExav(await open(page, "sample.key"));
+      await expect.poll(() => drawn(page)).toBeGreaterThan(100);
+    });
+
+    test("a Keynote 2 to 5 document (XML in a package) is converted and its slide shown", async ({ page }) => {
+      byExav(await open(page, "xml.key", keynoteXml()));
+      // The black square and the title's text.
+      await expect.poll(() => drawn(page)).toBeGreaterThan(500);
+    });
+
+    test("a Visio drawing (VSDX) is converted and shown a page to a slide", async ({ page }) => {
+      byExav(await open(page, "sample.vsdx", fs.readFileSync(path.join(DRAW, "sample.vsdx"))));
+      // The background page is not a slide.
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 1 / 2");
+      await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+      await page.locator(".exav-viewer-pager button").last().click();
+      await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 2 / 2");
+    });
+
+    for (const name of ["sample.fodg", "sample.odg"]) {
+      test(`${name}, an OpenDocument drawing, is converted and shown a page to a slide`, async ({ page }) => {
+        byExav(await open(page, name, fs.readFileSync(path.join(DRAW, name))));
+        await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 1 / 2");
+        await expect.poll(() => drawn(page)).toBeGreaterThan(200);
+        await page.locator(".exav-viewer-pager button").last().click();
+        await expect(page.locator(".exav-viewer-pager span")).toHaveText("Slide 2 / 2");
+      });
+    }
+
+    test("a Visio file, which no converter of the package reads, says it needs a converter", async ({ page }) => {
+      const fetched = await open(page, "plan.vsd", Buffer.from("Visio (TM) Drawing\r\n"), "error");
+      await expect(page.locator(".demo-frame .exav-viewer-status")).toContainText("only be shown with a converter that is not installed here");
+      expect(fetched.filter((u) => /converters\/|exav_office_/.test(u))).toEqual([]);
+    });
+
+    test("a PowerPoint 3 file is reported as unsupported, not handed to an external converter", async ({ page }) => {
+      const header = Buffer.from([0xed, 0xde, 0xad, 0x0b, 3, 0, 0, 0, ...new Array(64).fill(1)]);
+      const fetched = await open(page, "old.ppt", header, "error");
+      expect(fetched.filter((u) => /converters\/|exav_office_/.test(u))).toEqual([]);
+    });
+  });
+}
diff --git a/crates/exav-viewer/e2e/tools.spec.ts b/crates/exav-viewer/e2e/tools.spec.ts
new file mode 100644
index 00000000..0e0b5b57
--- /dev/null
+++ b/crates/exav-viewer/e2e/tools.spec.ts
@@ -0,0 +1,54 @@
+// The buttons over the viewer's corner: the panel's toggle sits with the zoom
+// buttons, and a touch screen keeps it while the buttons for a mouse go.
+import { expect, test, type Page } from "@playwright/test";
+
+import { openSample } from "./samples.js";
+
+async function open(page: Page, mode: "page" | "sandbox") {
+  await openSample(page, "plan.dwg", mode === "page" ? { mode } : {});
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+}
+
+for (const mode of ["sandbox", "page"] as const) {
+  test.describe(mode, () => {
+    test("the panel toggle folds and unfolds the rail, and stays where the zoom buttons are", async ({ page }) => {
+      await open(page, mode);
+      const tools = page.locator(".demo-frame .exav-viewer-tools");
+      const rail = page.locator(".demo-frame .exav-viewer-rail");
+      await expect(rail).toBeVisible();
+      const hide = tools.getByRole("button", { name: "Hide the panel" });
+      await expect(hide).toBeVisible();
+      // Next to the zoom buttons, on their right.
+      const zoom = (await tools.getByRole("button", { name: "Zoom in" }).boundingBox())!;
+      const toggle = (await hide.boundingBox())!;
+      expect(toggle.x).toBeGreaterThan(zoom.x);
+      expect(Math.abs(toggle.y - zoom.y)).toBeLessThan(2);
+      // In a group with full screen, to its right.
+      const full = (await tools.getByRole("button", { name: "Full screen" }).boundingBox())!;
+      expect(full.x).toBeLessThan(toggle.x);
+      expect(Math.abs(full.x - toggle.x)).toBeLessThan(60);
+      await expect(tools.locator(".exav-viewer-tool-end button")).toHaveCount(2);
+      await hide.click();
+      await expect(rail).toHaveCount(0);
+      await tools.getByRole("button", { name: "Drawing" }).click();
+      await expect(rail).toBeVisible();
+    });
+
+    test.describe("a touch screen", () => {
+      test.use({ hasTouch: true, isMobile: true });
+      test("keeps the panel toggle and drops the buttons for a mouse", async ({ page }) => {
+        await open(page, mode);
+        const tools = page.locator(".demo-frame .exav-viewer-tools");
+        await expect(tools.getByRole("button", { name: /Hide the panel|Drawing/ })).toBeVisible();
+        await expect(tools.getByRole("button", { name: "Zoom in" })).toBeHidden();
+        await expect(tools.getByRole("button", { name: "Full screen" })).toBeHidden();
+      });
+
+      test("shows no empty group when there is no panel", async ({ page }) => {
+        await openSample(page, "notes.docx", mode === "page" ? { mode } : {});
+        await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+        await expect(page.locator(".demo-frame .exav-viewer-tools .exav-viewer-tool-end")).toBeHidden();
+      });
+    });
+  });
+}
diff --git a/crates/exav-viewer/e2e/volumes.spec.ts b/crates/exav-viewer/e2e/volumes.spec.ts
new file mode 100644
index 00000000..53efcf97
--- /dev/null
+++ b/crates/exav-viewer/e2e/volumes.spec.ts
@@ -0,0 +1,45 @@
+// A split archive opens when the files given with it have its other parts: the
+// parts of a set are told by their names, in the same folder, and the set is
+// the archive (fixtures/make-samples.mjs writes the sets).
+import fs from "node:fs";
+import path from "node:path";
+
+import { expect, test, type Page } from "@playwright/test";
+
+import { failOnViolations } from "./csp.js";
+import { SAMPLES, sample } from "./samples.js";
+
+failOnViolations();
+
+async function give(page: Page, mode: "page" | "sandbox", names: string[]) {
+  await page.goto(`./?${new URLSearchParams({ lang: "en", ...(mode === "page" ? { mode } : {}) })}`);
+  await page.getByTestId("file-input").setInputFiles(names.map((name) => ({ name, mimeType: "", buffer: sample(name) })));
+  await expect(page.locator(".demo-frame .exav-viewer-body")).toHaveAttribute("data-phase", "ready");
+}
+
+const members = (page: Page) => page.locator(".demo-frame .exav-viewer-member-name > .exav-viewer-truncate:first-child");
+
+// The members, and the size of one that a part alone cannot give: a RAR member
+// that continues in the next volume has none until the set is joined.
+const SETS: [string, string[], string[], [string, string]][] = [
+  ["RAR volumes, part1 to part3", ["set5.part1.rar", "set5.part2.rar", "set5.part3.rar"], ["noise.bin", "text.txt"], ["noise.bin", "20 KB"]],
+  ["RAR volumes, .rar then .r00 and .r01", ["set4.rar", "set4.r00", "set4.r01"], ["noise.bin", "text.txt"], ["noise.bin", "20 KB"]],
+  ["a ZIP cut in two by bytes", ["docs.zip.001", "docs.zip.002"], ["one.txt", "two.txt"], ["two.txt", "5 B"]],
+  ["a ZIP spanned over three files", ["span.z01", "span.z02", "span.zip"], ["big.bin", "small.txt"], ["big.bin", "293 KB"]],
+];
+
+for (const mode of ["page", "sandbox"] as const) {
+  test.describe(`in the ${mode}: split archives`, () => {
+    for (const [what, parts, listed, [member, size]] of SETS) {
+      test(`${what}: opens as the one archive`, async ({ page }) => {
+        test.skip(!parts.every((p) => fs.existsSync(path.join(SAMPLES, p))), "no sample: there is no `zip` here");
+        await give(page, mode, parts);
+        await expect(page.locator(".demo-frame .exav-viewer-archive-head")).toHaveText(`${listed.length} files`);
+        // In the order of the archive, whichever it is.
+        await expect(members(page)).toHaveCount(listed.length);
+        expect((await members(page).allInnerTexts()).sort()).toEqual([...listed].sort());
+        await expect(page.locator(".demo-frame .exav-viewer-member", { hasText: member }).locator(".exav-viewer-member-size")).toHaveText(size);
+      });
+    }
+  });
+}
diff --git a/crates/exav-viewer/e2e/webpack.spec.ts b/crates/exav-viewer/e2e/webpack.spec.ts
index 3fd9ea09..e47f5124 100644
--- a/crates/exav-viewer/e2e/webpack.spec.ts
+++ b/crates/exav-viewer/e2e/webpack.spec.ts
@@ -44,9 +44,11 @@ import { image } from "@exav/viewer/image";
 const params = new URLSearchParams(location.search);
 const budget = params.get("maxPrimitives");
 const expand = params.get("maxDecompressedBytes");
+const entities = params.get("maxEntities");
 const cad = {};
 if (budget) cad.maxPrimitives = Number(budget);
 if (expand) cad.maxDecompressedBytes = Number(expand);
+if (entities) cad.maxEntities = Number(entities);
 const viewer = createViewer({ plugins: [dwg(cad), image({ wasmDecoders: true })] });
 const name = params.get("file");
 const session = viewer.mount(document.getElementById("host"), { id: name, name, source: { url: "./" + name } });
@@ -131,6 +133,17 @@ test("maxDecompressedBytes reaches the engine: below what the plan's sections ex
   await expect(page.locator("body")).toHaveAttribute("data-phase", "error");
 });
 
+// plan.dwg holds about twenty entities: more than 10, fewer than 100000.
+test("maxEntities reaches the engine: below what the plan holds, the rest is left out and said so", async ({ page }) => {
+  await page.goto(`${base}?file=plan.dwg&maxEntities=100000`);
+  await expect(page.locator("body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator("body")).not.toHaveAttribute("data-warnings", /scene_truncated/);
+
+  await page.goto(`${base}?file=plan.dwg&maxEntities=10`);
+  await expect(page.locator("body")).toHaveAttribute("data-phase", "ready");
+  await expect(page.locator("body")).toHaveAttribute("data-warnings", /scene_truncated/);
+});
+
 test("webpack, unconfigured, emits the image decoders and a TIFF is drawn", async ({ page }) => {
   await page.goto(`${base}?file=landscape.tif`);
   await expect(page.locator("body")).toHaveAttribute("data-phase", "ready");
diff --git a/crates/exav-viewer/e2e/zip.ts b/crates/exav-viewer/e2e/zip.ts
index ee05103d..c38d6138 100644
--- a/crates/exav-viewer/e2e/zip.ts
+++ b/crates/exav-viewer/e2e/zip.ts
@@ -54,6 +54,37 @@ export function storedZip(files: [string, Uint8Array][], gap = 0): Buffer {
   return Buffer.concat([...parts, directory, end]);
 }
 
+/** A Unix `ar` archive, GNU style (what a `.deb` is made of), for the same tests. */
+export function ar(files: [string, Uint8Array][]): Buffer {
+  const parts: Buffer[] = [Buffer.from("!<arch>\n")];
+  for (const [name, data] of files) {
+    const header = Buffer.alloc(60, " ");
+    header.write(`${name}/`, 0, 16);
+    header.write("0", 16);
+    header.write("0", 28);
+    header.write("0", 34);
+    header.write("100644", 40);
+    header.write(String(data.length), 48);
+    header.write("`\n", 58);
+    parts.push(header, Buffer.from(data), Buffer.alloc(data.length % 2, "\n"));
+  }
+  return Buffer.concat(parts);
+}
+
+/** A cpio archive in the "new ASCII" format (what an initramfs and an RPM payload are). */
+export function cpio(files: [string, Uint8Array][]): Buffer {
+  const parts: Buffer[] = [];
+  const entry = (name: string, data: Uint8Array, mode: number) => {
+    const fields = [1, mode, 0, 0, 1, 0, data.length, 0, 0, 0, 0, name.length + 1, 0];
+    const header = Buffer.from(`070701${fields.map((f) => f.toString(16).padStart(8, "0")).join("")}${name}\0`);
+    const pad = (n: number) => Buffer.alloc((4 - (n % 4)) % 4);
+    parts.push(header, pad(header.length), Buffer.from(data), pad(data.length));
+  };
+  for (const [name, data] of files) entry(name, data, 0o100644);
+  entry("TRAILER!!!", new Uint8Array(), 0);
+  return Buffer.concat(parts);
+}
+
 /** A ustar archive of regular files (POSIX.1-1988), for the same tests. */
 export function tar(files: [string, Uint8Array][]): Buffer {
   const blocks: Buffer[] = [];
diff --git a/crates/exav-viewer/package-lock.json b/crates/exav-viewer/package-lock.json
index 858f0d6b..7db2cdd3 100644
--- a/crates/exav-viewer/package-lock.json
+++ b/crates/exav-viewer/package-lock.json
@@ -1,37 +1,37 @@
 {
   "name": "@exav/viewer",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@exav/viewer",
-      "version": "0.0.2",
+      "version": "0.0.3",
       "license": "MIT",
       "bin": {
         "exav-viewer-assets": "dist/vite/cli.js"
       },
       "devDependencies": {
         "@exav/unpack-wasm": "file:../exav-unpack-wasm",
-        "@playwright/test": "1.61.1",
-        "@silurus/ooxml": "^0.88.0",
-        "@types/node": "^22.20.5",
+        "@playwright/test": "^1.61.1",
+        "@silurus/ooxml": "^0.89.3",
+        "@types/node": "^26.6.5",
         "@types/react": "^19.3.0",
         "@types/react-dom": "^19.3.0",
         "@types/three": "^0.186.0",
         "esbuild": "0.28.2",
-        "jsdom": "^26.1.0",
+        "jsdom": "^30.1.3",
         "pdfjs-dist": "^6.4.299",
-        "react": "^19.3.0",
-        "react-dom": "^19.3.0",
+        "react": "^19.3.1",
+        "react-dom": "^19.3.1",
         "three": "^0.186.1",
-        "typescript": "^5.9.3",
-        "vite": "^7.3.6",
-        "vitest": "^3.2.7",
-        "webpack": "5.111.1"
+        "typescript": "^6.0.3",
+        "vite": "^8.3.5",
+        "vitest": "^5.0.5",
+        "webpack": "5.112.2"
       },
       "peerDependencies": {
-        "@exav/unpack-wasm": ">=0.0.2",
+        "@exav/unpack-wasm": ">=0.0.3",
         "@silurus/ooxml": ">=0.87.0 <1",
         "pdfjs-dist": ">=5.0.0 <7",
         "react": "^19.0.0",
@@ -61,40 +61,65 @@
     },
     "../exav-unpack-wasm": {
       "name": "@exav/unpack-wasm",
-      "version": "0.0.2",
+      "version": "0.0.3",
       "dev": true,
       "license": "MIT",
       "devDependencies": {
-        "@playwright/test": "^1.61.1",
+        "@playwright/test": "^1.64.1",
         "serve": "^14.2.6",
-        "vitest": "^4.1.9"
+        "vitest": "^5.0.5"
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
-      "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-7.1.7.tgz",
+      "integrity": "sha512-Q7ioeear07HwixdIitIn9KS1LZi97CEDFCSjPNm9v+y8KNbsu9q4Lrd4zUQW4faED+E7qxvfeVnbNRW46wFKuw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.3",
-        "@csstools/css-color-parser": "^3.0.9",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "lru-cache": "^10.4.3"
+        "@csstools/css-calc": "^3.4.3",
+        "@csstools/css-color-parser": "^4.2.6",
+        "@csstools/css-parser-algorithms": "^4.0.2",
+        "@csstools/css-tokenizer": "^4.0.2",
+        "lru-cache": "^11.5.3"
+      },
+      "engines": {
+        "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
       }
     },
-    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+    "node_modules/@asamuzakjp/dom-selector": {
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-10.0.5.tgz",
+      "integrity": "sha512-EgmJ7oEaGQECTn3H3wmnQpEy4hKY66VvM7VQndwPIQob3p877BgbyOUE3EX0LgXQCciF2H8KMdR+RznqjMNOLw==",
       "dev": true,
-      "license": "ISC"
+      "license": "MIT",
+      "dependencies": {
+        "bidi-js": "^1.1.0",
+        "css-tree": "^3.2.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "lru-cache": "^11.5.3"
+      },
+      "engines": {
+        "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
+      }
+    },
+    "node_modules/@bramus/specificity": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.3.tgz",
+      "integrity": "sha512-0GEz8qJWokkUVYQYRukmkSHIFNoBH8QTreeHrAFbvz1XFYc3Y+puhMs8PQ5x8GNugiC2l5jvDBXKLbBIByeSBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-tree": "^3.2.1"
+      },
+      "bin": {
+        "specificity": "bin/cli.js"
+      }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
-      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.1.2.tgz",
+      "integrity": "sha512-grhRy3OKmniaAEKXMjua5z/EODX0MSqBGjunw8+j/3HQjOnahs2AGhvEOIYVUWcU6ScApbhLhVrQTX8XqrMrow==",
       "dev": true,
       "funding": [
         {
@@ -108,13 +133,13 @@
       ],
       "license": "MIT-0",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
-      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.4.3.tgz",
+      "integrity": "sha512-iex20d8CHVkyvg6B7UKV7uHnI2Bqo9g+EFfT9E0y+GvTvhZ/DwONJ+9aKb1dlqm0ZiGsL5RXjp0fCoJYnkeDjA==",
       "dev": true,
       "funding": [
         {
@@ -128,17 +153,17 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-parser-algorithms": "^4.0.2",
+        "@csstools/css-tokenizer": "^4.0.2"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
-      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.2.6.tgz",
+      "integrity": "sha512-iiPQ3iRWwnJkeEn6RIu6SJPr7hYrLz6XZ9s/QZl+2/LI5KQVjpl2fdmDSZKuD4xP6GMmMPgHFFXg6k1Wkz0Trg==",
       "dev": true,
       "funding": [
         {
@@ -152,21 +177,21 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^5.1.0",
-        "@csstools/css-calc": "^2.1.4"
+        "@csstools/color-helpers": "^6.1.2",
+        "@csstools/css-calc": "^3.4.3"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-parser-algorithms": "^4.0.2",
+        "@csstools/css-tokenizer": "^4.0.2"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
-      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.2.tgz",
+      "integrity": "sha512-40cSKyMvK+tq4qz6Awrlye2WGuOKt3FwPgtGg6KTfbHOWNw+Rk1rzbAtZnZ6IBhsY491HLRnDXwoyBAijmmILA==",
       "dev": true,
       "funding": [
         {
@@ -180,16 +205,41 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.4"
+        "@csstools/css-tokenizer": "^4.0.2"
+      }
+    },
+    "node_modules/@csstools/css-syntax-patches-for-csstree": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.15.tgz",
+      "integrity": "sha512-J0u7HkVl2nzSlhsiTOp4AmwcUQ3D+mGEEKfBy/7To5/y7F2OHwyLrXfrhR0SMgr4p5Lo+eaMVSeai24zUcBIxA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "peerDependencies": {
+        "css-tree": "^3.2.1"
+      },
+      "peerDependenciesMeta": {
+        "css-tree": {
+          "optional": true
+        }
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
-      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.2.tgz",
+      "integrity": "sha512-OoKoR0f76dCY666JlcbhmVTs2drYj1GUXZTYTcbUgJjh9Nv41aFfZ21bPQTERm5+L5cBDo466NltB2lplS5GBw==",
       "dev": true,
       "funding": [
         {
@@ -203,7 +253,7 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       }
     },
     "node_modules/@dimforge/rapier3d-compat": {
@@ -659,6 +709,24 @@
       "resolved": "../exav-unpack-wasm",
       "link": true
     },
+    "node_modules/@exodus/bytes": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.16.0.tgz",
+      "integrity": "sha512-IcpW84uEn3N7ETtNZMlxKhfl6Pec8rUNGOTBtWbK1FKhJxIFAptZyVrvVRVBimAJxJCgc3PxepxkdWWG4DVzfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@noble/hashes": "^1.8.0 || ^2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@noble/hashes": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.13",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -986,24 +1054,14 @@
         "url": "https://github.com/sponsors/Brooooooklyn"
       }
     },
-    "node_modules/@napi-rs/lzma-linux-x64-gnu": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz",
-      "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@oxc-project/types": {
+      "version": "0.155.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.155.0.tgz",
+      "integrity": "sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==",
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^22.20 || ^24.12 || >=25"
+      "funding": {
+        "url": "https://github.com/sponsors/oxc-project"
       }
     },
     "node_modules/@playwright/test": {
@@ -1022,10 +1080,10 @@
         "node": ">=18"
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.64.0.tgz",
-      "integrity": "sha512-FLLpX941CD/7aBvX3GqLGBM9OvY5PGXTryPJkG5r5/OuBpZpV5k45Uo3RxAvqd35tsyc3hH1bhtz921IKzoIzg==",
+    "node_modules/@rolldown/binding-android-arm-eabi": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.15.tgz",
+      "integrity": "sha512-aLcgK9gIJ3YRvrrtfSBbRa27F5WrpiTaPulnFpsHPxpUHgFlSgnU4854MHwoRGEBhfRJDWCS2WQ7lIjskE9Olw==",
       "cpu": [
         "arm"
       ],
@@ -1034,12 +1092,15 @@
       "optional": true,
       "os": [
         "android"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.64.0.tgz",
-      "integrity": "sha512-iI32XM/jnDYJsvx5ai/za/7gWO9XoSeFFtU06/ZCaRgyilfJOjaopD3nOpk2WrTCGOyeDt4hleUiGOAnd5tHNg==",
+    "node_modules/@rolldown/binding-android-arm64": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.15.tgz",
+      "integrity": "sha512-xD7DdZCrbThKuxNg7ooQmvp07ys4J/pnSEMTG3/OdOWl6daC67m/Q4fL78sRHMxTH/N4fGUbYhcPM0MF5WFHkg==",
       "cpu": [
         "arm64"
       ],
@@ -1048,12 +1109,15 @@
       "optional": true,
       "os": [
         "android"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.64.0.tgz",
-      "integrity": "sha512-dRBZlbt2sEtF8Mn4MODThze9fIPdDoOhVSlXMAKy5dQbOYK9pOOoPY4Fat3OTtr0+8zbJo5TTZwlsfxY/kDNJg==",
+    "node_modules/@rolldown/binding-darwin-arm64": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.15.tgz",
+      "integrity": "sha512-m2WuQ6r0B4OTYxyPpNLtXaMRbRDUbG8YQV2Q3KTdSSK8Th6KHCnC8jVCJt8bvYeSB5WivkkNbc85mKadaSdOxA==",
       "cpu": [
         "arm64"
       ],
@@ -1062,12 +1126,15 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.64.0.tgz",
-      "integrity": "sha512-Y3whrJOMucfkhgNkvcM93M6j8C53iEAMmPMYD99C6G1kUy4ELigLWk9ar2/4aCBSRgsql0zdlOemLgW2m5GZgQ==",
+    "node_modules/@rolldown/binding-darwin-x64": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.15.tgz",
+      "integrity": "sha512-5RtnsHM36nodM9WbMy+zip0LGS/G+y5wro5RHrpOlr4ac24+1zSi9kiV2MP1myZeZ/ifEHfulQcWjnAXzc2C2A==",
       "cpu": [
         "x64"
       ],
@@ -1076,26 +1143,15 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.64.0.tgz",
-      "integrity": "sha512-S6S1GEzPjFF6IONYJX3AKt/799+8RgBgCcwRnUo+Ep1IvBxUbw5M51iU0TDdK2NWWVnSvCQ8yi6Em0fGASMOng==",
-      "cpu": [
-        "arm64"
       ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.64.0.tgz",
-      "integrity": "sha512-Ed1DPoFENkXj4IGzSB12SesV40iP6LxCCrbTIkSGIQBpOOxpBM+0kj62lmaeIHfMWTDoddqTOtqc7s8LYfn+Pw==",
+    "node_modules/@rolldown/binding-freebsd-x64": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.15.tgz",
+      "integrity": "sha512-g3l09pyFqhu+135JKkbkwiKGQmwU5hUMUPJ4VdBADvuqR8d33L6H578rh8m7rtxbdp+VmX/+nzI7nvhSZlzpUQ==",
       "cpu": [
         "x64"
       ],
@@ -1104,84 +1160,36 @@
       "optional": true,
       "os": [
         "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.64.0.tgz",
-      "integrity": "sha512-J/6xhutJPtFyIkmHdf4olOdHHKH5kOJNumojdWn+Elv5ICEYTVOa362Vw27TxsK0BLzb1le3EDlO3UbvFK1lnQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
       ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.64.0.tgz",
-      "integrity": "sha512-G4L/Nnx59d2LvDoV/P4S5lZ7oVLT6hodOHMacqjiq2LL2gts86KbkEBTYL53+fBt0odhf7XPIbIATGoYiJctxg==",
+    "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.15.tgz",
+      "integrity": "sha512-nIe3VugI97nGQtspPxDqA4sXMUpeiocKIP/CqpY/u/vgbT+alX+cVxu1C/oVBPKg4feNTmYovE91v4DgXvXNwQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.64.0.tgz",
-      "integrity": "sha512-zF16pvJDEUksGYRbfnXne7pdklAyj2XDmJeYKgP93oq0cUyX9Y8O7lUo1R+IY1GagP/YBvCEDCe7eEcAKpw//g==",
-      "cpu": [
-        "arm64"
       ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.64.0.tgz",
-      "integrity": "sha512-nIggWn8n+w12+R5lsV+PYYoUY8vuObxPAQqJI7WES+9v0qspYuAHoZMfYM0yLxlipasT5BY9ht5W8t5c/rSCkg==",
+    "node_modules/@rolldown/binding-linux-arm64-gnu": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.15.tgz",
+      "integrity": "sha512-iTBjXx+B5QSvgI89lJfmqh4wTh8NabR1YZIIN3hNx4zSG0EVfVqkOvLulNpG4251pbd6/IAmZ/LefVk1Y4rPhw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.64.0.tgz",
-      "integrity": "sha512-WLOTiHPzszP0dxIMsHpFeDSOSB5I49Mj8K4+yKE3H1X/D0JRG5XZ5jrctJLMjnUc/LUzaKiwq6EHWNJ8pup8PA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
       "libc": [
         "glibc"
       ],
@@ -1189,14 +1197,17 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.64.0.tgz",
-      "integrity": "sha512-35RK9aRhh7g7Pmeu5gQ01aCvrhXzj9LoBE6xtUcEH1ns+nyTaSzxSpADmBQINu4QiTDGvmQYwo1j5hlg1rRXFw==",
+    "node_modules/@rolldown/binding-linux-arm64-musl": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.15.tgz",
+      "integrity": "sha512-uN26XOnVR7rqQupG3V9oAG2EGGatWjcJHOeDOHUFCh4TBWmP2tHTFoVN13aYbwfm0aHqJAEmcwhAu6sooIjfqQ==",
       "cpu": [
-        "loong64"
+        "arm64"
       ],
       "dev": true,
       "libc": [
@@ -1206,50 +1217,19 @@
       "optional": true,
       "os": [
         "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.64.0.tgz",
-      "integrity": "sha512-RqTfnpoTjuWfPAmqK5p2edt2AMCDJWm6oTn7sKfmyx+6tRga0ip05SJ977o6udTcIiDeF/CJMUfkaN4gtWt6Aw==",
-      "cpu": [
-        "ppc64"
       ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.64.0.tgz",
-      "integrity": "sha512-RQjZPigjxFvFZDijG6rjlSXxhRaTf9zLYVpGK+lVcga64oMqP1GbgVqCb46eHTTceSIgp89Ja0y5aPe3GFBYHg==",
+    "node_modules/@rolldown/binding-linux-ppc64-gnu": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.15.tgz",
+      "integrity": "sha512-9nWkcdd+H+XhaA3fQIwpHnKIrfx/PQ6rO0pivr78Og07tXlUlctBBJoEYLPfhTmCR/QxEVdn6uPjHV5SymPhdw==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.64.0.tgz",
-      "integrity": "sha512-tjL58mgQcTRnDRpeky+Sth1MKQeYi2Ct6r3Luq9E5aTSjnM/i/JbozqZkKqp9thM5+oDSZxo+05f9kdQedfTGA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
       "libc": [
         "glibc"
       ],
@@ -1257,29 +1237,15 @@
       "optional": true,
       "os": [
         "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.64.0.tgz",
-      "integrity": "sha512-ictoRyVaoZ8C67myHef+8hhCa6IplXJJ/xUCkVCxziV4zxMZh+jvhkhGsPBLqj1S72fnqD0QH5zL4lcaa4X7DQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
       ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.64.0.tgz",
-      "integrity": "sha512-8aVvZ2hfr9RLFzBQkQNmYeHLDja8fLeQAmLt757zdKN/B+8L809KlLJKctQjS22wZotptV8G6o7fVPuAs8S1tQ==",
+    "node_modules/@rolldown/binding-linux-s390x-gnu": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.15.tgz",
+      "integrity": "sha512-Ggh0ciFjLwIusLSLz7LZYEaGdxOAUJXI+Qu5JCbhPJJHEt8vP+IjRATTJheiJsdzzTYgUiHUiw3X1Ea3ZpMBdA==",
       "cpu": [
         "s390x"
       ],
@@ -1291,12 +1257,15 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.64.0.tgz",
-      "integrity": "sha512-2dEF8GAcDKwshUfydD+GhosppNyBzhVUHkdFF3CXd3FpOkzj/RZzF5aoEtzklujklT5qFVRU2GK/cFeLaTNKVg==",
+    "node_modules/@rolldown/binding-linux-x64-gnu": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.15.tgz",
+      "integrity": "sha512-FHg60rS6DBePAYZ9X9F67x+JObFdmgn6tupA1C/a3B+CufFmTD4mX+e8M75tCiAO3foR/6xwVBI0KQiI7sn/rw==",
       "cpu": [
         "x64"
       ],
@@ -1308,12 +1277,15 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.64.0.tgz",
-      "integrity": "sha512-3XHTvoo2hKkh0MiOfS7SkhHjMaaWF7P4F3drocZZaho/Z8w7h/jpnuBHm91BOQLfvrKHs1yR+zir4E8RI3XzTQ==",
+    "node_modules/@rolldown/binding-linux-x64-musl": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.15.tgz",
+      "integrity": "sha512-/cvV/7v5VGz/moiz0XKRj2dE8DzsKyhIu1KpOvJGPjRywg3yscON889UGvAe8zfiJLHup7VLjBduoGWi3HusWQ==",
       "cpu": [
         "x64"
       ],
@@ -1325,26 +1297,15 @@
       "optional": true,
       "os": [
         "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.64.0.tgz",
-      "integrity": "sha512-HKtkzodL4a3KFWDXDoO61cRynAWTR3LnAE0oGtfG9lcNFpNuVYUFOByxDgNqEvic9rvaQbAj+SFwTEWDptRaIw==",
-      "cpu": [
-        "x64"
       ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.64.0.tgz",
-      "integrity": "sha512-JBsxqiY16uyyCujtoC3s7zL+SrYyNElptD7K4V+KUoJ2V8/XG3hPWpheK+SuPwNh1cikJvIZmIdsrYXvD6PLJw==",
+    "node_modules/@rolldown/binding-openharmony-arm64": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.15.tgz",
+      "integrity": "sha512-MyzC5Hrv/sm+Z7TSGKP/j8001RO2xQm1zOpCNVL4j0cY/VhBZviludA2YFQ7i4lH6ZAXxQm0lcMdBzM+99mE7w==",
       "cpu": [
         "arm64"
       ],
@@ -1353,12 +1314,15 @@
       "optional": true,
       "os": [
         "openharmony"
-      ]
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.64.0.tgz",
-      "integrity": "sha512-S5Qrijh37qhnUYQ0ay8WN3LuWeKjow7wTUyCOPMZtnXiBXYXdsZETI6ZLfYnQAKovltckPLBFdNeD61P2rJc7g==",
+    "node_modules/@rolldown/binding-win32-arm64-msvc": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.15.tgz",
+      "integrity": "sha512-+PgYiS+AH5omy6L45ZLxybasauJaj3M8buoT83D+nzPmCayXlxUV9hydhciCKVyIg0B/v0BtXPDE1uGqNwCPpg==",
       "cpu": [
         "arm64"
       ],
@@ -1367,26 +1331,15 @@
       "optional": true,
       "os": [
         "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.64.0.tgz",
-      "integrity": "sha512-zbZ6iMmLFEsCtTdc2/y1F/cDFVNNCPF7Ae8PCT/wdPE//hGwYp6r+MyCLMFX+kOeIe09Pz6ASfnnfpSTN1FJQQ==",
-      "cpu": [
-        "ia32"
       ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
     },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.64.0.tgz",
-      "integrity": "sha512-L6Hw69oNpuYaOr1zCG30v0/DqKYCSRwodPGwIcVZ/6f8SOzq9rxtL/xNVI5MO4wjli+Ko0ErK9uHJL3mNPt8wQ==",
+    "node_modules/@rolldown/binding-win32-x64-msvc": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.15.tgz",
+      "integrity": "sha512-HFZd2QNQYn1JbIi+Hpd7H+r/lkWxcfIu28nirZ6eCn2LafuvmExMlb/P96Sfx5tf7pPArw39IdhmCF8vmV+NhQ==",
       "cpu": [
         "x64"
       ],
@@ -1395,26 +1348,22 @@
       "optional": true,
       "os": [
         "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.64.0.tgz",
-      "integrity": "sha512-nl+CTWIgOGszQmUz/kanfgrfFZ4qiwxKIfT/ryl3N3Ewk5tqizmYtNXiqb7Bu/fDtNgu1kyxdFiAUJNur3iysg==",
-      "cpu": [
-        "x64"
       ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
+      "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
+      "license": "MIT"
     },
     "node_modules/@silurus/ooxml": {
-      "version": "0.88.0",
-      "resolved": "https://registry.npmjs.org/@silurus/ooxml/-/ooxml-0.88.0.tgz",
-      "integrity": "sha512-dhMs1/U5fB5bh/Hv8BNTgCsHVNOl+qkquohsROblku7jghsmd1BZAE//LR6omB7aCVLGJ3sp4IqzqdkgT5wicQ==",
+      "version": "0.89.3",
+      "resolved": "https://registry.npmjs.org/@silurus/ooxml/-/ooxml-0.89.3.tgz",
+      "integrity": "sha512-uP5btKMGQrctr/kfz/9zV7hn3zxfFwUWkpC7kpjYAXaBdTHaDbLSz+xKQFHnYk4tfr0M1nClMXz/6vriP57WJg==",
       "dev": true,
       "license": "MIT"
     },
@@ -1458,13 +1407,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.20.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz",
-      "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==",
+      "version": "26.6.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz",
+      "integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.21.0"
+        "undici-types": "~8.9.0"
       }
     },
     "node_modules/@types/react": {
@@ -1516,40 +1465,24 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@vitest/expect": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.7.tgz",
-      "integrity": "sha512-E8eBXaKibuvH2pSZErOjdVb5vF4PbKYcrnluBTYxEk1l/VhhwZg1kZQsdtjq+CsF5CFydf2Rdkz7jDHKSisi3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/chai": "^5.2.2",
-        "@vitest/spy": "3.2.7",
-        "@vitest/utils": "3.2.7",
-        "chai": "^5.2.0",
-        "tinyrainbow": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/@vitest/mocker": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.7.tgz",
-      "integrity": "sha512-Trr0hYO9CM3Wj6ksWHRhK9IZpIY6wTMO5u/MqXurMxT57sWBaOPEtP3Oq60ihZuh5JsiagKfz95OcxdEP6dBrA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-5.0.5.tgz",
+      "integrity": "sha512-xLL3lkDegJZw+MGoGaCCsFayDZthGgpAtr3Vziyfc4p7xH89K7KRPcRBBh/kEYm0Aqkt5DtTmkYpBtRV/FrHZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.2.7",
+        "@jridgewell/trace-mapping": "0.3.31",
+        "@vitest/spy": "5.0.5",
         "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.17"
+        "magic-string": "^1.4.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+        "msw": "^2.4.9 || ^3.0.0",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -1560,92 +1493,31 @@
         }
       }
     },
-    "node_modules/@vitest/pretty-format": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.7.tgz",
-      "integrity": "sha512-KUHlwqVu0sRlhCdyPdQ/wBoTfRahjUky1MubOmYw9fWfIZy1gNoHpuaaQBPAaMaVYdQYHJLurzj8ECCj5OwTqA==",
+    "node_modules/@vitest/spy": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-5.0.5.tgz",
+      "integrity": "sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "tinyrainbow": "^2.0.0"
-      },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/runner": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.7.tgz",
-      "integrity": "sha512-sB9y4ovltoQP+WaUPwmSxO9WIg9Ig694Di5PalVPsYHklAdE027mehpWF2SQSVq+k6sFgaivbTjTJwZLSHbedA==",
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.2.7",
-        "pathe": "^2.0.3",
-        "strip-literal": "^3.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
-    "node_modules/@vitest/snapshot": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.7.tgz",
-      "integrity": "sha512-7C+MwShwtBSI5Buwoyg3s/iY1eHL9PKAf+O1wVh/TdnjXUtkoL/9YQtre90i4MtNXM6edP1wJ2zOBpfCyhIS7g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/pretty-format": "3.2.7",
-        "magic-string": "^0.30.17",
-        "pathe": "^2.0.3"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/spy": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.7.tgz",
-      "integrity": "sha512-Q2eQGI6d2L/hBtZ0qNuKcAGid68XK6cv1xsoaIma6PaJhHPoqcEJhYpXZ/5myCMqkNgtP6UKuBhbc0nHKnrkuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tinyspy": "^4.0.3"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@vitest/utils": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.7.tgz",
-      "integrity": "sha512-x6BDOd7dyo3PFLY3I9/HJ25X/6OurhGXk2/B9gOZNPF7XDVjeBK4k01lQE5uvDpbuheErh91qYuE1E2OEjK3Rw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/pretty-format": "3.2.7",
-        "loupe": "^3.1.4",
-        "tinyrainbow": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true,
       "license": "MIT"
     },
@@ -1819,16 +1691,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/agent-base": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/ajv": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
@@ -1900,6 +1762,16 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/bidi-js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.1.0.tgz",
+      "integrity": "sha512-fX1Onk0tdVPC7obPWB5EbJ1z7NVhLq4m2xZLq2YXBkxzMXIGRpNMU88n0EPgWseKl12J7zXs7qrDxPK4sRs2fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "require-from-string": "^2.0.2"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.29.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.3.tgz",
@@ -1941,16 +1813,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001814",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001814.tgz",
@@ -1973,32 +1835,15 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
-      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz",
+      "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "assertion-error": "^2.0.1",
-        "check-error": "^2.1.1",
-        "deep-eql": "^5.0.1",
-        "loupe": "^3.1.0",
-        "pathval": "^2.0.0"
-      },
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/check-error": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
-      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 16"
-      }
-    },
     "node_modules/chrome-trace-event": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
@@ -2016,18 +1861,18 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cssstyle": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz",
-      "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==",
+    "node_modules/css-tree": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
+      "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^3.2.0",
-        "rrweb-cssom": "^0.8.0"
+        "mdn-data": "2.27.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
     "node_modules/csstype": {
@@ -2038,35 +1883,17 @@
       "license": "MIT"
     },
     "node_modules/data-urls": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
-      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-8.0.0.tgz",
+      "integrity": "sha512-JQUCCK+/CAGbGGx618PlFZMXH81Jtj7t73CHv9dd/zVWvxgGT2zLFRjnKb+Ng46GIwcy+f7f88qd4duqllK+WQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.0.0"
+        "whatwg-mimetype": "^5.0.0",
+        "whatwg-url": "^17.1.2"
       },
       "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": "^22.14.0 || >=24.0.0"
       }
     },
     "node_modules/decimal.js": {
@@ -2076,14 +1903,14 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/deep-eql": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
-      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/electron-to-chromium": {
@@ -2108,22 +1935,22 @@
       }
     },
     "node_modules/entities": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-8.1.0.tgz",
+      "integrity": "sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=0.12"
+        "node": ">=20.19.0"
       },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz",
+      "integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==",
       "dev": true,
       "license": "MIT"
     },
@@ -2291,57 +2118,16 @@
       }
     },
     "node_modules/html-encoding-sniffer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
-      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-encoding": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-7.0.0.tgz",
+      "integrity": "sha512-UikN5yr7xsCDAq87Or5or0PAlD3HJJOKVzM05az588WnpDJ4Ux7a2A53Qi6gofGg2/EtvF/H4hCi/TXfCW4Y6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "@exodus/bytes": "^1.15.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^22.13.0 || >=24.0.0"
       }
     },
     "node_modules/is-potential-custom-element-name": {
@@ -2366,46 +2152,39 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/js-tokens": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
-      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jsdom": {
-      "version": "26.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
-      "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
+      "version": "30.1.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-30.1.3.tgz",
+      "integrity": "sha512-hQMUPvRgN7KxsfIytDQji7bimuJeRQa6Qo5+iuiZQk5CafeRxLIA10/cG5YCBFNpD9RO3oqIiN4CO1Y44kxqXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cssstyle": "^4.2.1",
-        "data-urls": "^5.0.0",
-        "decimal.js": "^10.5.0",
-        "html-encoding-sniffer": "^4.0.0",
-        "http-proxy-agent": "^7.0.2",
-        "https-proxy-agent": "^7.0.6",
+        "@asamuzakjp/css-color": "^7.1.3",
+        "@asamuzakjp/dom-selector": "^10.0.3",
+        "@bramus/specificity": "^2.4.2",
+        "@csstools/css-syntax-patches-for-csstree": "^1.1.15",
+        "@exodus/bytes": "^1.16.0",
+        "css-tree": "^3.2.1",
+        "data-urls": "^8.0.0",
+        "decimal.js": "^10.6.0",
+        "html-encoding-sniffer": "^7.0.0",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.16",
-        "parse5": "^7.2.1",
-        "rrweb-cssom": "^0.8.0",
+        "lru-cache": "^11.5.3",
+        "parse5": "^8.0.1",
         "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^5.1.1",
-        "w3c-xmlserializer": "^5.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^3.1.1",
-        "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.1.1",
-        "ws": "^8.18.0",
+        "tough-cookie": "^6.0.2",
+        "undici": "^8.12.1",
+        "w3c-xmlserializer": "^6.0.0",
+        "webidl-conversions": "^8.0.1",
+        "whatwg-mimetype": "^5.0.0",
+        "whatwg-url": "^17.2.0",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
       },
       "peerDependencies": {
-        "canvas": "^3.0.0"
+        "canvas": "^3.2.3"
       },
       "peerDependenciesMeta": {
         "canvas": {
@@ -2420,23 +2199,306 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/loupe": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
-      "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
+    "node_modules/lightningcss": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
+      "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MPL-2.0",
+      "dependencies": {
+        "detect-libc": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-android-arm64": "1.33.0",
+        "lightningcss-darwin-arm64": "1.33.0",
+        "lightningcss-darwin-x64": "1.33.0",
+        "lightningcss-freebsd-x64": "1.33.0",
+        "lightningcss-linux-arm-gnueabihf": "1.33.0",
+        "lightningcss-linux-arm64-gnu": "1.33.0",
+        "lightningcss-linux-arm64-musl": "1.33.0",
+        "lightningcss-linux-x64-gnu": "1.33.0",
+        "lightningcss-linux-x64-musl": "1.33.0",
+        "lightningcss-win32-arm64-msvc": "1.33.0",
+        "lightningcss-win32-x64-msvc": "1.33.0"
+      }
+    },
+    "node_modules/lightningcss-android-arm64": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz",
+      "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz",
+      "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz",
+      "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz",
+      "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz",
+      "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz",
+      "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz",
+      "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz",
+      "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz",
+      "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz",
+      "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
+      "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "11.5.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz",
+      "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
     },
     "node_modules/magic-string": {
-      "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.3.tgz",
+      "integrity": "sha512-z12OxmaPGE0F4xlpGdjuAUckipLpQlTAuAmyGhNoD7ODpYUzvDfvtxUbjM/jwznyP178oju/KDdyi220wNJ0RQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.5"
+        "@jridgewell/sourcemap-codec": "^1.6.0"
       }
     },
+    "node_modules/mdn-data": {
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2534,17 +2596,10 @@
         }
       }
     },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/nanoid": {
-      "version": "3.3.19",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz",
-      "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==",
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
       "dev": true,
       "funding": [
         {
@@ -2570,43 +2625,33 @@
         "node": ">=18"
       }
     },
-    "node_modules/nwsapi": {
-      "version": "2.2.28",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.28.tgz",
-      "integrity": "sha512-IlVB7OS7qrOsVYlpnFIkETjMwT9jwvmocJmmM+GZU/PAB3uGi9Ezd7vcWhWBUnSc0ya4ppmQITOyP1ez9gg8cg==",
+    "node_modules/obug": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-3.0.0.tgz",
+      "integrity": "sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==",
       "dev": true,
-      "license": "MIT"
+      "funding": [
+        "https://github.com/sponsors/sxzz",
+        "https://opencollective.com/debug"
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20.0"
+      }
     },
     "node_modules/parse5": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
-      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.1.tgz",
+      "integrity": "sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^6.0.0"
+        "entities": "^8.0.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/pathval": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
-      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.16"
-      }
-    },
     "node_modules/pdfjs-dist": {
       "version": "6.4.299",
       "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-6.4.299.tgz",
@@ -2673,9 +2718,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.28",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz",
-      "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==",
+      "version": "8.5.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.31.tgz",
+      "integrity": "sha512-YUbWYCgErwnMAVkjUnYa+KlMBzGpHwiIt/DE7f0G33AuX2LH9UcTk6KgWxd3zRU+pN3u/C+Xl3EnMLM4Hea7Sg==",
       "dev": true,
       "funding": [
         {
@@ -2693,9 +2738,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.18",
+        "nanoid": "^3.3.20",
         "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "source-map-js": "^1.2.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -2712,9 +2757,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.3.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz",
-      "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==",
+      "version": "19.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.3.1.tgz",
+      "integrity": "sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2722,16 +2767,16 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "19.3.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz",
-      "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==",
+      "version": "19.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.1.tgz",
+      "integrity": "sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.28.0"
       },
       "peerDependencies": {
-        "react": "^19.3.0"
+        "react": "^19.3.1"
       }
     },
     "node_modules/require-from-string": {
@@ -2744,65 +2789,39 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rollup": {
-      "version": "4.64.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.64.0.tgz",
-      "integrity": "sha512-gjA/kFeDfffII8COoPsvLPvE16hWDTEc1+0QKQNKUkuV8iJjqsC4xXs8/FzuL0v9EV39kuxTbAgcFoTRyy2TGQ==",
+    "node_modules/rolldown": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.15.tgz",
+      "integrity": "sha512-6odND+fel5zVw3I4Yc2e69gvguDnX0CAAGiNDZSq4ik5WUcaLrkD2GLuog0XcODbor31hZ5ayEMgVDno+KPV5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.9"
+        "@oxc-project/types": "=0.155.0",
+        "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
-        "rollup": "dist/bin/rollup"
+        "rolldown": "bin/cli.mjs"
       },
       "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@napi-rs/lzma-linux-x64-gnu": "1.5.1",
-        "@rollup/rollup-android-arm-eabi": "4.64.0",
-        "@rollup/rollup-android-arm64": "4.64.0",
-        "@rollup/rollup-darwin-arm64": "4.64.0",
-        "@rollup/rollup-darwin-x64": "4.64.0",
-        "@rollup/rollup-freebsd-arm64": "4.64.0",
-        "@rollup/rollup-freebsd-x64": "4.64.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.64.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.64.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.64.0",
-        "@rollup/rollup-linux-arm64-musl": "4.64.0",
-        "@rollup/rollup-linux-loong64-gnu": "4.64.0",
-        "@rollup/rollup-linux-loong64-musl": "4.64.0",
-        "@rollup/rollup-linux-ppc64-gnu": "4.64.0",
-        "@rollup/rollup-linux-ppc64-musl": "4.64.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.64.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.64.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.64.0",
-        "@rollup/rollup-linux-x64-gnu": "4.64.0",
-        "@rollup/rollup-linux-x64-musl": "4.64.0",
-        "@rollup/rollup-openbsd-x64": "4.64.0",
-        "@rollup/rollup-openharmony-arm64": "4.64.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.64.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.64.0",
-        "@rollup/rollup-win32-x64-gnu": "4.64.0",
-        "@rollup/rollup-win32-x64-msvc": "4.64.0",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/rrweb-cssom": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
-      "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
-      "license": "MIT"
+        "@rolldown/binding-android-arm-eabi": "1.2.15",
+        "@rolldown/binding-android-arm64": "1.2.15",
+        "@rolldown/binding-darwin-arm64": "1.2.15",
+        "@rolldown/binding-darwin-x64": "1.2.15",
+        "@rolldown/binding-freebsd-x64": "1.2.15",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.2.15",
+        "@rolldown/binding-linux-arm64-gnu": "1.2.15",
+        "@rolldown/binding-linux-arm64-musl": "1.2.15",
+        "@rolldown/binding-linux-ppc64-gnu": "1.2.15",
+        "@rolldown/binding-linux-s390x-gnu": "1.2.15",
+        "@rolldown/binding-linux-x64-gnu": "1.2.15",
+        "@rolldown/binding-linux-x64-musl": "1.2.15",
+        "@rolldown/binding-openharmony-arm64": "1.2.15",
+        "@rolldown/binding-win32-arm64-msvc": "1.2.15",
+        "@rolldown/binding-win32-x64-msvc": "1.2.15"
+      }
     },
     "node_modules/saxes": {
       "version": "6.0.0",
@@ -2825,9 +2844,9 @@
       "license": "MIT"
     },
     "node_modules/schema-utils": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.5.0.tgz",
-      "integrity": "sha512-zJlMCZ0cAR5p/Y4oVpRoqioDMJcGxaXRrQ/4rP4WyR84vc5z/DolXdbvXeDpTwbtocDFr2rhPqHPErDCUtz2kA==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.8.1.tgz",
+      "integrity": "sha512-x39pYlJPyH7Uge5QO64B9XGP9zLDc9WNmiQZc+CE3IzZPvMu3lHOuAMGpYNoPixEL7MSWlGhYTg5UlLSL8G6iw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2836,21 +2855,25 @@
         "ajv-formats": "^3.0.1",
         "ajv-keywords": "^5.1.0"
       },
+      "bin": {
+        "schema-utils": "bin/schema-utils.js"
+      },
       "engines": {
         "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.112.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        }
       }
     },
-    "node_modules/siginfo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -2882,33 +2905,13 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/stackback": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/std-env": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
-      "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.3.0.tgz",
+      "integrity": "sha512-OtU/EgQ1kIm5KwqQpBC6ZEMXrZRui11w8zgfTWp8cdO9B8OaPsbA8bTHO2P+HNo1VlUTGMVBwPhydu6poeXiag==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/strip-literal": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.1.0.tgz",
-      "integrity": "sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^9.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -2925,13 +2928,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tapable": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
@@ -2973,18 +2969,24 @@
       "license": "MIT"
     },
     "node_modules/tinybench": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
-      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-6.2.2.tgz",
+      "integrity": "sha512-nIZ2N2dFpjBsg2hgitKu7mA+FvsIJuGJOwysRngmVRRmWgR/UyPjwJj8c/fT/dhm8EkHnF5EOogRf+0Z2qrimA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
     },
     "node_modules/tinyexec": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.1.tgz",
+      "integrity": "sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/tinyglobby": {
       "version": "0.2.17",
@@ -3003,86 +3005,56 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
-    "node_modules/tinypool": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
-      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      }
-    },
-    "node_modules/tinyrainbow": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
-      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/tinyspy": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.6.tgz",
-      "integrity": "sha512-u8KszXvGfU68hVcZpRHKG28T0krMuv2G5nDhiHaMLen/gIuFEgIJhaJuO69qjnXg5paSrbPMFfx3brNuN8eVSg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/tldts": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
-      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
+      "version": "7.4.19",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.19.tgz",
+      "integrity": "sha512-48dH6aSpQnpbzDUc4vIQZ1VjB8tkK+e8c1yx05/SZK+rkssgjEOlxDd/yU8/a4vGYQ9vRgJr9dwMq9TJ0b3X2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.86"
+        "tldts-core": "^7.4.19"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.86",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
-      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+      "version": "7.4.19",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.19.tgz",
+      "integrity": "sha512-goNXV6Ho9TIOfpJZanTd6CKG5DyYgYAL+k+22T0SLh8l6+KHIfBUPFuePuSZv05UttIaaLmI9tb7TmGIdK5AkQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tough-cookie": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
-      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.2.tgz",
+      "integrity": "sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "tldts": "^6.1.32"
+        "tldts": "^7.0.5"
       },
       "engines": {
         "node": ">=16"
       }
     },
     "node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-7.0.0.tgz",
+      "integrity": "sha512-BcDSDW+SIGWVOns1Zm6Yg91q9AEj7eaID0QDY9oIqJD1A8dscNwMcl9Sms2DeuWCNov1X0/oXanHGYQBSLwZsg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^22.14.0 || >=24.0.0"
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -3093,10 +3065,20 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici": {
+      "version": "8.12.3",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-8.12.3.tgz",
+      "integrity": "sha512-+fdndUTwBP86cVjihTp21hZHo7d6oj1c/47XPA3lL8mM0XHs+C4EkcjmgRsFnFk2f/UONGDy9ItBItmXsLOQHw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=22.19.0"
+      }
+    },
     "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz",
+      "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==",
       "dev": true,
       "license": "MIT"
     },
@@ -3132,18 +3114,17 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz",
-      "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==",
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz",
+      "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.27.0 || ^0.28.0",
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.3",
-        "postcss": "^8.5.6",
-        "rollup": "^4.43.0",
-        "tinyglobby": "^0.2.15"
+        "lightningcss": "^1.33.0",
+        "picomatch": "^4.0.7",
+        "postcss": "^8.5.30",
+        "rolldown": "~1.2.14",
+        "tinyglobby": "^0.2.17"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -3159,9 +3140,10 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
+        "@vitejs/devtools": "^0.7.1 || ^0.8.0",
+        "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
-        "lightningcss": "^1.21.0",
         "sass": "^1.70.0",
         "sass-embedded": "^1.70.0",
         "stylus": ">=0.54.8",
@@ -3174,13 +3156,16 @@
         "@types/node": {
           "optional": true
         },
-        "jiti": {
+        "@vitejs/devtools": {
           "optional": true
         },
-        "less": {
+        "esbuild": {
           "optional": true
         },
-        "lightningcss": {
+        "jiti": {
+          "optional": true
+        },
+        "less": {
           "optional": true
         },
         "sass": {
@@ -3206,29 +3191,6 @@
         }
       }
     },
-    "node_modules/vite-node": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
-      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cac": "^6.7.14",
-        "debug": "^4.4.1",
-        "es-module-lexer": "^1.7.0",
-        "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
-      },
-      "bin": {
-        "vite-node": "vite-node.mjs"
-      },
-      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
     "node_modules/vite/node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -3245,65 +3207,72 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.7.tgz",
-      "integrity": "sha512-KrxIJ62Fd89gfysR4WotlgZABiz2dqFPgqGzX7s+CwsqLFomRH7777ZcrOD6+WVAh7khPQP41A+BKbpcJFrdEg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-5.0.5.tgz",
+      "integrity": "sha512-cPODOMF8YnkiiYtDdHo6n4wWmBrOBBbOIYH2d33M4l3CdNn72h+qMmO6uXffUN6A5AZFXNND/d+krS9mgkXRfg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/chai": "^5.2.2",
-        "@vitest/expect": "3.2.7",
-        "@vitest/mocker": "3.2.7",
-        "@vitest/pretty-format": "^3.2.7",
-        "@vitest/runner": "3.2.7",
-        "@vitest/snapshot": "3.2.7",
-        "@vitest/spy": "3.2.7",
-        "@vitest/utils": "3.2.7",
-        "chai": "^5.2.0",
-        "debug": "^4.4.1",
-        "expect-type": "^1.2.1",
-        "magic-string": "^0.30.17",
-        "pathe": "^2.0.3",
-        "picomatch": "^4.0.2",
-        "std-env": "^3.9.0",
-        "tinybench": "^2.9.0",
-        "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.14",
-        "tinypool": "^1.1.1",
-        "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
-        "vite-node": "3.2.4",
-        "why-is-node-running": "^2.3.0"
+        "@vitest/mocker": "5.0.5",
+        "chai": "^6.3.0",
+        "es-module-lexer": "^2.3.2",
+        "expect-type": "^1.4.0",
+        "magic-string": "^1.4.3",
+        "obug": "^3.0.0",
+        "picomatch": "^4.0.7",
+        "std-env": "^4.3.0",
+        "tinybench": "^6.2.2",
+        "tinyexec": "^1.3.1",
+        "tinyglobby": "^0.2.17",
+        "why-is-node-running": "3.2.1"
       },
       "bin": {
         "vitest": "vitest.mjs"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^22.12.0 || ^24.0.0 || >=26.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "@edge-runtime/vm": "*",
-        "@types/debug": "^4.1.12",
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.2.7",
-        "@vitest/ui": "3.2.7",
+        "@opentelemetry/api": "^1.9.0",
+        "@types/node": "^22.0.0 || >=24.0.0",
+        "@vitest/browser-playwright": "5.0.5",
+        "@vitest/browser-preview": "5.0.5",
+        "@vitest/browser-webdriverio": "^5.0.0-beta.5 || >=5.0.0",
+        "@vitest/coverage-istanbul": "5.0.5",
+        "@vitest/coverage-v8": "5.0.5",
+        "@vitest/ui": "5.0.5",
         "happy-dom": "*",
-        "jsdom": "*"
+        "jsdom": "*",
+        "vite": "^6.4.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "@edge-runtime/vm": {
           "optional": true
         },
-        "@types/debug": {
+        "@opentelemetry/api": {
           "optional": true
         },
         "@types/node": {
           "optional": true
         },
-        "@vitest/browser": {
+        "@vitest/browser-playwright": {
+          "optional": true
+        },
+        "@vitest/browser-preview": {
+          "optional": true
+        },
+        "@vitest/browser-webdriverio": {
+          "optional": true
+        },
+        "@vitest/coverage-istanbul": {
+          "optional": true
+        },
+        "@vitest/coverage-v8": {
           "optional": true
         },
         "@vitest/ui": {
@@ -3314,26 +3283,29 @@
         },
         "jsdom": {
           "optional": true
+        },
+        "vite": {
+          "optional": false
         }
       }
     },
     "node_modules/w3c-xmlserializer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
-      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-6.0.0.tgz",
+      "integrity": "sha512-4Nsy8K5Tr6SPDH9jhKJOHf7ChDrc1zufZTVSF7x72hwuEXBqxqk9G6cK+K2NRUtB3iELRJqjXb4JPDMBjMTl2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^22.22.2 || ^24.15.0 || >=26.0.0"
       }
     },
     "node_modules/watchpack": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz",
-      "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.6.3.tgz",
+      "integrity": "sha512-s3NZy0QpTY9qGqzc0wtz4qI28z3+5qKbbAec4MV4G9N3CfgZ9wgvQRr0cl2jh/tqkWG1NWHkmVMHZpCamev5Wg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3344,19 +3316,19 @@
       }
     },
     "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz",
+      "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=12"
+        "node": ">=20"
       }
     },
     "node_modules/webpack": {
-      "version": "5.111.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.111.1.tgz",
-      "integrity": "sha512-cNypaz0RP+S4cvQVi1M/3bRUkvNP0xZpL0TjFx+c6jg64VbxD+2weWDgY9UnjRI6dhZgtaj8DU76GGFcJ79xPQ==",
+      "version": "5.112.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.112.2.tgz",
+      "integrity": "sha512-B2tp1LI9D8GVpPDqprdt12ukTkXXahj9MzqSWJq4faSPgOUM7CdZaGAB6HrL/8E6UwbBpdj4vzWDbKoFnVoU6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3367,16 +3339,16 @@
         "@webassemblyjs/wasm-parser": "^1.14.1",
         "browserslist": "^4.28.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.25.0",
+        "enhanced-resolve": "^5.26.0",
         "es-module-lexer": "^2.1.0",
         "events": "^3.2.0",
         "graceful-fs": "^4.2.11",
         "mime-db": "^1.54.0",
-        "minimizer-webpack-plugin": "^5.7.0",
-        "schema-utils": "^4.5.0",
+        "minimizer-webpack-plugin": "^5.13.0",
+        "schema-utils": "^4.8.1",
         "tapable": "^2.3.0",
-        "watchpack": "^2.5.2",
-        "webpack-sources": "^3.5.1"
+        "watchpack": "^2.6.3",
+        "webpack-sources": "^3.6.0"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -3404,88 +3376,42 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/webpack/node_modules/es-module-lexer": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.2.tgz",
-      "integrity": "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
-      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/whatwg-mimetype": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
-      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
+      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/whatwg-url": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
-      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "version": "17.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-17.3.0.tgz",
+      "integrity": "sha512-KwOAJrpf+GTgBvcBQJcP38sMF0DsQKdwtG+TxM2pW44P6E5k0hDbWrDmyuJDIF0Uef0aQq0ZoJs+5oI+k8ddhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tr46": "^5.1.0",
-        "webidl-conversions": "^7.0.0"
+        "@exodus/bytes": "^1.16.0",
+        "tr46": "^7.0.0",
+        "webidl-conversions": "^8.0.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^22.14.0 || >=24.0.0"
       }
     },
     "node_modules/why-is-node-running": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
-      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-3.2.1.tgz",
+      "integrity": "sha512-Tb2FUhB4vUsGQlfSquQLYkApkuPAFQXGFzxWKHHumVz2dK+X1RUm/HnID4+TfIGYJ1kTcwOaCk/buYCEJr6YjQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "siginfo": "^2.0.0",
-        "stackback": "0.0.2"
-      },
       "bin": {
         "why-is-node-running": "cli.js"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.22.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.22.0.tgz",
-      "integrity": "sha512-Ydggc987+RO0AnWtZ/7Wq9FtNvcrL1b/RO0ud9mWjUPgDrsAAwQSF51sm2hm1XofbU/4jkpGEsLFsZZxU+1DOg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+        "node": ">=20.11"
       }
     },
     "node_modules/xml-name-validator": {
diff --git a/crates/exav-viewer/package.json b/crates/exav-viewer/package.json
index 781a4d4d..2f1471df 100644
--- a/crates/exav-viewer/package.json
+++ b/crates/exav-viewer/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@exav/viewer",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
-  "description": "An embeddable file viewer for the browser: PDF, images (TIFF, BMP and more through memory-safe WebAssembly), DWG and DXF drawings, Word, Excel, PowerPoint, CSV, IFC and STL models, video, audio, and what is inside an archive. Each format's engine loads only when a file of that format is opened.",
+  "description": "An embeddable file viewer for the browser: PDF, images (TIFF, BMP and more through memory-safe WebAssembly), DWG and DXF drawings, Word, Excel, PowerPoint, CSV, text, Markdown, JSON and XML, IFC, STL, OBJ, PLY and glTF models, video, audio, and what is inside an archive. Each format's engine loads only when a file of that format is opened.",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -77,6 +77,10 @@
       "types": "./dist/media/index.d.ts",
       "default": "./dist/media/index.js"
     },
+    "./text": {
+      "types": "./dist/text/index.d.ts",
+      "default": "./dist/text/index.js"
+    },
     "./archive": {
       "types": "./dist/archive/index.d.ts",
       "default": "./dist/archive/index.js"
@@ -117,12 +121,13 @@
     "test:e2e": "playwright test",
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p demo/tsconfig.json && tsc -p e2e/tsconfig.json",
     "demo": "vite --config demo/vite.config.ts",
-    "demo:build": "vite build --config demo/vite.config.ts",
+    "demo:build": "node scripts/sync-examples.mjs && vite build --config demo/vite.config.ts",
+    "demo:examples": "node scripts/sync-examples.mjs",
     "demo:showcase": "node scripts/sync-samples.mjs",
     "prepublishOnly": "node scripts/check-package.mjs"
   },
   "peerDependencies": {
-    "@exav/unpack-wasm": ">=0.0.2",
+    "@exav/unpack-wasm": ">=0.0.3",
     "@silurus/ooxml": ">=0.87.0 <1",
     "pdfjs-dist": ">=5.0.0 <7",
     "react": "^19.0.0",
@@ -130,31 +135,43 @@
     "three": ">=0.170.0 <1"
   },
   "peerDependenciesMeta": {
-    "@exav/unpack-wasm": { "optional": true },
-    "@silurus/ooxml": { "optional": true },
-    "pdfjs-dist": { "optional": true },
-    "react": { "optional": true },
-    "react-dom": { "optional": true },
-    "three": { "optional": true }
+    "@exav/unpack-wasm": {
+      "optional": true
+    },
+    "@silurus/ooxml": {
+      "optional": true
+    },
+    "pdfjs-dist": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    },
+    "three": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@exav/unpack-wasm": "file:../exav-unpack-wasm",
-    "@playwright/test": "1.61.1",
-    "@silurus/ooxml": "^0.88.0",
-    "@types/node": "^22.20.5",
+    "@playwright/test": "^1.61.1",
+    "@silurus/ooxml": "^0.89.3",
+    "@types/node": "^26.6.5",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
     "@types/three": "^0.186.0",
     "esbuild": "0.28.2",
-    "jsdom": "^26.1.0",
+    "jsdom": "^30.1.3",
     "pdfjs-dist": "^6.4.299",
-    "react": "^19.3.0",
-    "react-dom": "^19.3.0",
+    "react": "^19.3.1",
+    "react-dom": "^19.3.1",
     "three": "^0.186.1",
-    "typescript": "^5.9.3",
-    "vite": "^7.3.6",
-    "vitest": "^3.2.7",
-    "webpack": "5.111.1"
+    "typescript": "^6.0.3",
+    "vite": "^8.3.5",
+    "vitest": "^5.0.5",
+    "webpack": "5.112.2"
   },
   "publishConfig": {
     "access": "public"
diff --git a/crates/exav-viewer/playwright.config.ts b/crates/exav-viewer/playwright.config.ts
index f4d51bbc..4d9776f6 100644
--- a/crates/exav-viewer/playwright.config.ts
+++ b/crates/exav-viewer/playwright.config.ts
@@ -8,6 +8,10 @@ import { defineConfig } from "@playwright/test";
 // ("http://localhost:8000/viewer/demo/"); without it, `vite preview` serves it.
 const external = process.env.E2E_BASE_URL;
 
+// Text without subpixel antialiasing on Linux, and the generic families the
+// Liberation fonts (e2e/fonts.conf), in every engine.
+const fonts = { ...process.env, FONTCONFIG_FILE: fileURLToPath(new URL("./e2e/fonts.conf", import.meta.url)) };
+
 export default defineConfig({
   testDir: "./e2e",
   // The large files the delivery tests open.
@@ -34,18 +38,20 @@ export default defineConfig({
   projects: [
     {
       name: "chromium",
-      // WebGL in a headless Chromium without a GPU, and text without subpixel
-      // antialiasing on Linux (e2e/fonts.conf).
+      // WebGL in a headless Chromium without a GPU.
       use: {
         browserName: "chromium",
-        launchOptions: {
-          args: ["--use-angle=swiftshader", "--enable-unsafe-swiftshader"],
-          env: { ...process.env, FONTCONFIG_FILE: fileURLToPath(new URL("./e2e/fonts.conf", import.meta.url)) },
-        },
+        launchOptions: { args: ["--use-angle=swiftshader", "--enable-unsafe-swiftshader"], env: fonts },
       },
     },
-    // The sandboxed frame's guarantees, and text selection, in the other engines.
-    { name: "firefox", testMatch: /(frame|delivery|selection)\.spec\.ts/, use: { browserName: "firefox" } },
-    { name: "webkit", testMatch: /(frame|delivery|selection)\.spec\.ts/, use: { browserName: "webkit" } },
+    // The sandboxed frame's guarantees, text selection, the converted Office
+    // formats and the pictures of Office documents in the other engines (in
+    // WebKit, in the page only: it refuses the workers of a frame served
+    // isolated). Headless Firefox here has no WebGL, so the model pictures run
+    // in WebKit only. The CAD specs stay on Chromium: WebKit on Linux shows
+    // nothing for a WebGL canvas made with `antialias: false`, which CAD
+    // drawings need (docs/BACKLOG.md, "Cross-browser").
+    { name: "firefox", testMatch: /(frame|delivery|selection|converted|office-raster)\.spec\.ts/, use: { browserName: "firefox", launchOptions: { env: fonts } } },
+    { name: "webkit", testMatch: /(frame|delivery|selection|converted|office-raster|model-raster)\.spec\.ts/, use: { browserName: "webkit", launchOptions: { env: fonts } } },
   ],
 });
diff --git a/crates/exav-viewer/scripts/build-frame.mjs b/crates/exav-viewer/scripts/build-frame.mjs
index b1fb7360..0f674ea0 100644
--- a/crates/exav-viewer/scripts/build-frame.mjs
+++ b/crates/exav-viewer/scripts/build-frame.mjs
@@ -83,13 +83,19 @@ await esbuild.build({
 
 // Each worker, where the code above will ask for it.
 const ooxml = pkg("@silurus/ooxml");
+// No external converter is shipped in the package: the host's build adds
+// its own from its node_modules (`frameFiles(root, name)`), licence included.
 const { assets, manifest } = collectAssets(root);
 const WORKERS = [
   ["cad.worker.js", path.join(root, "ts", "cad", "cad.worker.ts")],
   ["decode.worker.js", path.join(root, "ts", "image", "decode.worker.ts")],
+  ["markdown.worker.js", path.join(root, "ts", "text", "markdown.worker.ts")],
   ["model.worker.js", path.join(root, "ts", "model", "model.worker.ts")],
   ["pdfjs.worker.js", path.join(root, "ts", "pdf", "pdfjs.worker.ts")],
   ["ranges.worker.js", path.join(root, "ts", "archive", "ranges.worker.ts")],
+  ["sheets.worker.js", path.join(root, "ts", "office", "sheets.worker.ts")],
+  ["slides.worker.js", path.join(root, "ts", "office", "slides.worker.ts")],
+  ["docs.worker.js", path.join(root, "ts", "office", "docs.worker.ts")],
   ["worker.js", path.join(pkg("@exav/unpack-wasm"), "js", "worker.js")],
   ...fs
     .readdirSync(path.join(ooxml, "dist", "assets"))
@@ -112,7 +118,7 @@ const copy = (from, to) => {
 };
 
 // The wasm, where each module's glue resolves it from.
-for (const f of ["exav_viewer_dwg_bg.wasm", "exav_viewer_image_bg.wasm", "exav_viewer_model_bg.wasm"]) copy(path.join(root, "wasm", f), f);
+for (const f of ["exav_viewer_dwg_bg.wasm", "exav_viewer_image_bg.wasm", "exav_viewer_model_bg.wasm", "exav_viewer_text_bg.wasm", "exav_viewer_sheets_bg.wasm", "exav_viewer_slides_bg.wasm", "exav_viewer_docs_bg.wasm"]) copy(path.join(root, "wasm", f), f);
 copy(path.join(pkg("@exav/unpack-wasm"), "pkg", "exav_unpack_wasm_bg.wasm"), "exav_unpack_wasm_bg.wasm");
 for (const f of fs.readdirSync(path.join(ooxml, "dist")).filter((f) => f.endsWith(".wasm"))) copy(path.join(ooxml, "dist", f), f);
 
@@ -154,7 +160,7 @@ const html = `<!doctype html>
     <script type="module" src="./app.js"></script>
   </head>
   <body>
-    <div id="root" class="exv-frame-root"></div>
+    <div id="root" class="exav-viewer-frame-root"></div>
   </body>
 </html>
 `;
diff --git a/crates/exav-viewer/scripts/build-wasm.sh b/crates/exav-viewer/scripts/build-wasm.sh
index fd9f1825..6916ede4 100755
--- a/crates/exav-viewer/scripts/build-wasm.sh
+++ b/crates/exav-viewer/scripts/build-wasm.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 # Build the WebAssembly modules into wasm/: exav_viewer_image (raster
-# decoders), exav_viewer_dwg (DWG and DXF) and exav_viewer_model (IFC and
-# STL), and the two decoders pdf.js
+# decoders), exav_viewer_dwg (DWG and DXF) and exav_viewer_model (IFC, STL,
+# OBJ, PLY and glTF), exav_viewer_text (Markdown), exav_viewer_sheets (XLS,
+# ODS and Numbers to XLSX), exav_viewer_slides (PPT, ODP, Keynote, ODG and
+# VSDX to PPTX), exav_viewer_docs (DOC, ODT, RTF and Pages to DOCX), and the
+# two decoders pdf.js
 # loads in place of its C and C++ ones, each embedded in its fallback module
 # (openjpeg_nowasm_fallback.js, jbig2_nowasm_fallback.js; see
 # build-pdf-decoders.mjs). Needs the wasm32-unknown-unknown target and
@@ -37,18 +40,31 @@ optimise() {
 #   at 1.2 GiB.
 # - model: 3 GiB. The file, its index, and the meshes twice (the scene and
 #   the buffers handed over) for the default 6 million triangles fit in 1.5.
+# - text: 256 MiB. A file read is at most 2 MiB; its tree is bounded at
+#   100000 nodes and is written out once as JSON.
+# - sheets: 2 GiB. The file, and the workbook and the XLSX the converter
+#   counts against its own limit (1 GiB by default, ts/office/sheets.ts).
+# - slides: 2 GiB. The file, and the presentation and the PPTX the
+#   converter counts against its own limit (1 GiB by default,
+#   ts/office/slides.ts).
+# - docs: 2 GiB. The file, and the document and the DOCX the converter
+#   counts against its own limit (1 GiB by default, ts/office/docs.ts).
 # - pdf-jpx, pdf-jbig2: 1 GiB for one image of a PDF.
 cap() {
   case "$1" in
+    text) echo $((256 * 1024 * 1024)) ;;
     image) echo $((1024 * 1024 * 1024)) ;;
     dwg) echo $((2048 * 1024 * 1024)) ;;
+    sheets) echo $((2048 * 1024 * 1024)) ;;
+    slides) echo $((2048 * 1024 * 1024)) ;;
+    docs) echo $((2048 * 1024 * 1024)) ;;
     model) echo $((3072 * 1024 * 1024)) ;;
     pdf-jpx | pdf-jbig2) echo $((1024 * 1024 * 1024)) ;;
   esac
 }
 
 mkdir -p "$OUT" "$PDF"
-for feature in image dwg model pdf-jpx pdf-jbig2; do
+for feature in image dwg model text sheets slides docs pdf-jpx pdf-jbig2; do
   # The cdylib's file has no hash in its name, so every feature writes the
   # same one, and a feature cargo finds up to date would leave the module
   # another feature built last: it is removed, so that it is linked again.
diff --git a/crates/exav-viewer/scripts/build.mjs b/crates/exav-viewer/scripts/build.mjs
index a486975d..a983b45b 100644
--- a/crates/exav-viewer/scripts/build.mjs
+++ b/crates/exav-viewer/scripts/build.mjs
@@ -17,6 +17,14 @@ for (const f of [
   "exav_viewer_dwg_bg.wasm",
   "exav_viewer_model.js",
   "exav_viewer_model_bg.wasm",
+  "exav_viewer_text.js",
+  "exav_viewer_text_bg.wasm",
+  "exav_viewer_sheets.js",
+  "exav_viewer_sheets_bg.wasm",
+  "exav_viewer_slides.js",
+  "exav_viewer_slides_bg.wasm",
+  "exav_viewer_docs.js",
+  "exav_viewer_docs_bg.wasm",
   "openjpeg_nowasm_fallback.js",
   "jbig2_nowasm_fallback.js",
   "pdf_decoders.js",
diff --git a/crates/exav-viewer/scripts/check-bundle-sinks.mjs b/crates/exav-viewer/scripts/check-bundle-sinks.mjs
index 680ec01b..836b17a6 100644
--- a/crates/exav-viewer/scripts/check-bundle-sinks.mjs
+++ b/crates/exav-viewer/scripts/check-bundle-sinks.mjs
@@ -15,24 +15,26 @@ export const SINKS = /\binnerHTML\b|\bouterHTML\b|insertAdjacentHTML|document\.w
 
 /** The reviewed occurrences: which sink, the code around it, and why it is safe. */
 export const ALLOWED = [
-  { sink: "innerHTML", around: /\binnerHTML=""/, why: "an element cleared (@silurus/ooxml, React)" },
+  // The minifier writes a string with double quotes or as a template literal,
+  // whichever the version of the bundler picks, so each entry takes both.
+  { sink: "innerHTML", around: /\binnerHTML=(""|``)/, why: "an element cleared (@silurus/ooxml, React)" },
   {
     sink: "innerHTML",
     around: /\.innerHTML=`<svg width="\$\{\w+\}" height="\$\{\w+\}" viewBox="0 0 10 6"/,
     why: "@silurus/ooxml: the spreadsheet's validation arrow, a constant SVG sized by a number",
   },
-  { sink: "innerHTML", around: /\.innerHTML='<svg viewBox="0 0 24 24" width="100%" height="100%" aria-h/, why: "@silurus/ooxml: the comment icon, a constant SVG" },
-  { sink: "innerHTML", around: /\.innerHTML="<script><\\\/script>"/, why: "React: makes an inert script element to clone" },
+  { sink: "innerHTML", around: /\.innerHTML=['`]<svg viewBox="0 0 24 24" width="100%" height="100%" aria-h/, why: "@silurus/ooxml: the comment icon, a constant SVG" },
+  { sink: "innerHTML", around: /\.innerHTML=["`]<script><\\\/script>["`]/, why: "React: makes an inert script element to clone" },
   { sink: "innerHTML", around: /__html!==\w+&&\(\w+\.innerHTML=\w+\)/, why: "React: dangerouslySetInnerHTML, which no component of the package uses (check-sinks.mjs)" },
-  { sink: "innerHTML", around: /case"innerHTML":/, why: "React: a prop name it skips" },
-  { sink: "dangerouslySetInnerHTML", around: /"dangerouslySetInnerHTML"|\.dangerouslySetInnerHTML[=!.]/, why: "React: its own handling of the prop, unused by the package" },
-  { sink: "javascript:", around: /"javascript:throw new Error\('(React has blocked a javascript: URL|A React form was unexpectedly submitted)/, why: "React: the URLs it puts in place of a javascript: URL" },
+  { sink: "innerHTML", around: /case["`]innerHTML["`]:/, why: "React: a prop name it skips" },
+  { sink: "dangerouslySetInnerHTML", around: /["`]dangerouslySetInnerHTML["`]|\.dangerouslySetInnerHTML[=!.]/, why: "React: its own handling of the prop, unused by the package" },
+  { sink: "javascript:", around: /["`]javascript:throw new Error\('(React has blocked a javascript: URL|A React form was unexpectedly submitted)/, why: "React: the URLs it puts in place of a javascript: URL" },
   { sink: "Function(", around: /`Function\(\$\{\w+\}\)`/, why: "wasm-bindgen's debug string of a function: text" },
   { sink: "importScripts", around: /importScripts\(p \? p\.createScriptURL\(\$\{/, why: "@exav/viewer's frame: the text of a worker's blob (ts/frame/app/workers.ts)" },
   { sink: "parseFromString", around: /parseFromString\(\w+\)\{if\(this\._currentFragment=\[\]/, why: "pdf.js's own XML parser, a method of its class: no DOM" },
   { sink: "parseFromString", around: /new \w+\(\{(lowerCaseName|hasAttributes):!0\}\)\.parseFromString\(/, why: "pdf.js's own XML parser" },
-  { sink: "parseFromString", around: /\w+\.parseFromString\(\w+\["xdp:xdp"\]\)/, why: "pdf.js's own XML parser (XFA, which is off)" },
-  { sink: "parseFromString", around: /case"document":return \w+\.text\(\)\.then\(\w+=>new DOMParser\(\)\.parseFromString\(\w+,\w+\)\)/, why: "three's FileLoader for responseType document, which no loader the package uses asks for" },
+  { sink: "parseFromString", around: /\w+\.parseFromString\(\w+\[["`]xdp:xdp["`]\]\)/, why: "pdf.js's own XML parser (XFA, which is off)" },
+  { sink: "parseFromString", around: /case["`]document["`]:return \w+\.text\(\)\.then\(\w+=>new DOMParser\(\)\.parseFromString\(\w+,\w+\)\)/, why: "three's FileLoader for responseType document, which no loader the package uses asks for" },
 ];
 
 const WINDOW = 60;
diff --git a/crates/exav-viewer/scripts/check-package.mjs b/crates/exav-viewer/scripts/check-package.mjs
index a73b43f1..a54d6d1c 100644
--- a/crates/exav-viewer/scripts/check-package.mjs
+++ b/crates/exav-viewer/scripts/check-package.mjs
@@ -63,7 +63,7 @@ for (const file of files) {
 }
 
 // The frame app: its page, its policy, its code, its workers and its licences.
-for (const file of ["index.html", "app.js", "styles.css", "frame.css", "cad.worker.js", "decode.worker.js", "model.worker.js", "pdfjs.worker.js", "worker.js", "exav-viewer/manifest.json", "licenses/README.txt"]) {
+for (const file of ["index.html", "app.js", "styles.css", "frame.css", "cad.worker.js", "decode.worker.js", "markdown.worker.js", "model.worker.js", "pdfjs.worker.js", "sheets.worker.js", "slides.worker.js", "docs.worker.js", "worker.js", "exav-viewer/manifest.json", "licenses/README.txt"]) {
   need(`dist/frame/app/${file}`, "the frame app");
 }
 for (const file of files) {
diff --git a/crates/exav-viewer/scripts/check-sinks.mjs b/crates/exav-viewer/scripts/check-sinks.mjs
index 24b1489c..d21b3b91 100644
--- a/crates/exav-viewer/scripts/check-sinks.mjs
+++ b/crates/exav-viewer/scripts/check-sinks.mjs
@@ -35,6 +35,12 @@ export const ALLOWED = [
     code: "frame.src = config.url",
     why: "the frame app's URL, from the host's own configuration",
   },
+  {
+    file: "ts/office/external.ts",
+    rule: "import() of a variable",
+    code: "import(/* @vite-ignore */ /* webpackIgnore: true */ url)",
+    why: "the external converter's module: the URL the host set in its own options, or the path the asset manifest the copy step wrote names under the host's assetBase: never from the file",
+  },
   {
     file: "ts/frame/app/main.ts",
     rule: "window.open",
@@ -53,6 +59,12 @@ export const ALLOWED = [
     code: 'a.href = "url" in link ? link.url : "#"',
     why: "the same absolute http(s) address, shown on hover; a click is handled by the line above",
   },
+  {
+    file: "ts/text/markdown-view.ts",
+    rule: "window.open",
+    code: 'window.open(url, "_blank", "noopener,noreferrer")',
+    why: "a Markdown link the user clicked: the reader keeps only absolute http, https and mailto targets without credentials, safeTarget checks the address again with the browser's URL reader, and the click handler is set for http and https alone; in the frame, a request to the host (linkTarget), which asks first",
+  },
   {
     file: "ts/react/ViewerDialog.tsx",
     rule: "href from a variable",
@@ -77,6 +89,12 @@ export const ALLOWED = [
     code: "el.src = url",
     why: "the file's own URL or an object URL of its bytes, played as media",
   },
+  {
+    file: "ts/core/print.ts",
+    rule: "src from a variable",
+    code: "img.src = url",
+    why: "an object URL of a PNG this page encoded from a page's picture, in a frame made to print it",
+  },
 ];
 
 /** The rule an expression breaks, or null. */
diff --git a/crates/exav-viewer/scripts/check-wasm-imports.mjs b/crates/exav-viewer/scripts/check-wasm-imports.mjs
index 4de27949..7313e19a 100644
--- a/crates/exav-viewer/scripts/check-wasm-imports.mjs
+++ b/crates/exav-viewer/scripts/check-wasm-imports.mjs
@@ -24,7 +24,16 @@ export const LISTS = {
   // This package's: pure computation on the bytes handed in.
   exav_viewer_image_bg: { imports: BINDGEN, why: "exav-render's image decoders" },
   exav_viewer_dwg_bg: { imports: BINDGEN, why: "exav-render's DWG and DXF engine" },
-  exav_viewer_model_bg: { imports: BINDGEN, why: "exav-render's IFC and STL meshes" },
+  // `parseGltfWith` takes the names of a glTF's buffer files as an array of
+  // strings: wasm-bindgen reads each and drops the reference it made.
+  exav_viewer_model_bg: {
+    imports: [...BINDGEN, "glue.__wbg___wbindgen_string_get", "glue.__wbindgen_object_drop_ref"],
+    why: "exav-render's IFC, STL and glTF meshes",
+  },
+  exav_viewer_text_bg: { imports: BINDGEN, why: "exav-render's Markdown reader" },
+  exav_viewer_sheets_bg: { imports: BINDGEN, why: "exav-render's XLS, ODS and Numbers converter" },
+  exav_viewer_slides_bg: { imports: BINDGEN, why: "exav-render's PPT, ODP, Keynote and ODG converter" },
+  exav_viewer_docs_bg: { imports: BINDGEN, why: "exav-render's DOC, ODT and RTF converter" },
   exav_viewer_pdf_jpx_bg: { imports: BINDGEN, why: "the JPEG 2000 decoder given to pdf.js" },
   exav_viewer_pdf_jbig2_bg: { imports: BINDGEN, why: "the JBIG2 and CCITT decoder given to pdf.js" },
   exav_unpack_wasm_bg: {
@@ -74,6 +83,10 @@ export const MEMORY_CAPS = {
   exav_viewer_image_bg: 16384,
   exav_viewer_dwg_bg: 32768,
   exav_viewer_model_bg: 49152,
+  exav_viewer_text_bg: 4096,
+  exav_viewer_sheets_bg: 32768,
+  exav_viewer_slides_bg: 32768,
+  exav_viewer_docs_bg: 32768,
   exav_viewer_pdf_jpx_bg: 16384,
   exav_viewer_pdf_jbig2_bg: 16384,
 };
diff --git a/crates/exav-viewer/scripts/check-wasm-imports.test.mjs b/crates/exav-viewer/scripts/check-wasm-imports.test.mjs
index 1e4dc81c..d7775a70 100644
--- a/crates/exav-viewer/scripts/check-wasm-imports.test.mjs
+++ b/crates/exav-viewer/scripts/check-wasm-imports.test.mjs
@@ -80,7 +80,7 @@ describe("the modules built here", () => {
       for (const f of m[1].split("|").map((s) => s.trim())) caps[`exav_viewer_${f.replace("-", "_")}_bg`] = (Number(m[2]) * 1024 * 1024) / 65536;
     }
     expect(caps).toEqual(MEMORY_CAPS);
-    for (const name of ["exav_viewer_image_bg", "exav_viewer_dwg_bg", "exav_viewer_model_bg"]) {
+    for (const name of ["exav_viewer_image_bg", "exav_viewer_dwg_bg", "exav_viewer_model_bg", "exav_viewer_text_bg", "exav_viewer_sheets_bg", "exav_viewer_slides_bg", "exav_viewer_docs_bg"]) {
       expect(memoryLimits(fs.readFileSync(path.join(wasmDir, `${name}.wasm`)))?.max, name).toBe(MEMORY_CAPS[name]);
     }
   });
diff --git a/crates/exav-viewer/scripts/sync-examples.mjs b/crates/exav-viewer/scripts/sync-examples.mjs
new file mode 100644
index 00000000..a79cfb91
--- /dev/null
+++ b/crates/exav-viewer/scripts/sync-examples.mjs
@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+// Put the demo's example files in demo/public/examples/ (not committed): the
+// small ones are copied from demo/examples/files/, the others are downloaded
+// from the pinned URLs demo/examples/examples.json gives, and each is checked
+// against its size and SHA-256. The licence of every file is in that manifest
+// and in demo/examples/NOTICE.md.
+//
+//     npm run demo:examples               # copy and download
+//     npm run demo:examples -- --offline  # copy only; the files that need a download are left out of the list
+//
+// A file already in demo/public/examples/ with the right hash is not fetched again.
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const pkg = path.join(path.dirname(fileURLToPath(import.meta.url)), "..");
+const from = path.join(pkg, "demo", "examples");
+const out = path.join(pkg, "demo", "public", "examples");
+const offline = process.argv.includes("--offline") || process.env.EXAV_EXAMPLES_OFFLINE === "1";
+const USER_AGENT = "exav-examples/1.0 (https://github.com/sylvinus/exav)";
+
+const sha256 = (data) => crypto.createHash("sha256").update(data).digest("hex");
+const { examples } = JSON.parse(fs.readFileSync(path.join(from, "examples.json"), "utf8"));
+
+async function download(url) {
+  let last;
+  for (let attempt = 1; attempt <= 4; attempt++) {
+    try {
+      const res = await fetch(url, { headers: { "User-Agent": USER_AGENT }, redirect: "follow", signal: AbortSignal.timeout(180_000) });
+      if (res.ok) return Buffer.from(await res.arrayBuffer());
+      last = new Error(`HTTP ${res.status}`);
+      if (res.status !== 429 && res.status < 500) break;
+    } catch (e) {
+      last = e;
+    }
+    await new Promise((r) => setTimeout(r, 1500 * attempt));
+  }
+  throw new Error(`${url}: ${last?.message ?? last}`);
+}
+
+fs.mkdirSync(out, { recursive: true });
+const bad = [];
+const present = [];
+let copied = 0;
+let downloaded = 0;
+let kept = 0;
+let skipped = 0;
+
+for (const e of examples) {
+  if (e.file !== path.basename(e.file)) {
+    bad.push(`${e.file}: not a plain file name`);
+    continue;
+  }
+  const target = path.join(out, e.file);
+  const check = (data, what) => {
+    if (data.length === e.bytes && sha256(data) === e.sha256) return true;
+    bad.push(`${e.file} (${what}): ${data.length} bytes, sha256 ${sha256(data)}`);
+    return false;
+  };
+  if (e.committed) {
+    const data = fs.readFileSync(path.join(from, "files", e.path));
+    if (!check(data, "committed copy")) continue;
+    fs.writeFileSync(target, data);
+    copied++;
+  } else {
+    if (fs.existsSync(target)) {
+      const data = fs.readFileSync(target);
+      if (data.length === e.bytes && sha256(data) === e.sha256) {
+        present.push(e);
+        kept++;
+        continue;
+      }
+    }
+    if (offline) {
+      skipped++;
+      continue;
+    }
+    const url = e.fetched;
+    if (typeof url !== "string") {
+      bad.push(`${e.file}: neither committed nor fetched`);
+      continue;
+    }
+    let data;
+    try {
+      data = await download(url);
+    } catch (err) {
+      bad.push(String(err.message ?? err));
+      continue;
+    }
+    if (!check(data, url)) continue;
+    fs.writeFileSync(target, data);
+    downloaded++;
+  }
+  present.push(e);
+}
+
+if (bad.length) {
+  console.error(`examples that do not match demo/examples/examples.json:\n  ${bad.join("\n  ")}`);
+  process.exitCode = 1;
+}
+
+// Only what is here is listed, and what is not in the manifest any more is removed.
+const names = new Set(present.map((e) => e.file));
+for (const f of fs.readdirSync(out)) {
+  if (f !== "examples.json" && !names.has(f) && !f.startsWith(".fuse_hidden")) fs.rmSync(path.join(out, f), { recursive: true, force: true });
+}
+fs.writeFileSync(path.join(out, "examples.json"), `${JSON.stringify({ version: 1, examples: present })}\n`);
+console.log(`${present.length} examples in ${path.relative(process.cwd(), out) || "."}: ${copied} copied, ${downloaded} downloaded, ${kept} already there${skipped ? `, ${skipped} left out (offline)` : ""}`);
diff --git a/crates/exav-viewer/src/docs.rs b/crates/exav-viewer/src/docs.rs
new file mode 100644
index 00000000..6f172854
--- /dev/null
+++ b/crates/exav-viewer/src/docs.rs
@@ -0,0 +1,59 @@
+//! exav-render's `docs`: DOC, ODT, FODT, RTF and the other word-processing
+//! formats converted to DOCX, which the document engine shows.
+
+use exav_render::docs::{Error, Format, Limits, convert};
+use wasm_bindgen::prelude::*;
+
+/// A converted document.
+#[wasm_bindgen]
+pub struct ConvertedDocs {
+    docx: Vec<u8>,
+    paragraphs: usize,
+    warnings: Vec<String>,
+}
+
+#[wasm_bindgen]
+impl ConvertedDocs {
+    /// The DOCX package. Moves it out: a second call returns nothing.
+    #[wasm_bindgen(js_name = takeDocx)]
+    pub fn take_docx(&mut self) -> Vec<u8> {
+        std::mem::take(&mut self.docx)
+    }
+
+    /// Paragraphs in the body.
+    #[wasm_bindgen(getter)]
+    pub fn paragraphs(&self) -> u32 {
+        self.paragraphs.min(u32::MAX as usize) as u32
+    }
+
+    /// What was left out or could not be read, one line each.
+    #[wasm_bindgen(getter)]
+    pub fn warnings(&self) -> String {
+        self.warnings.join("\n")
+    }
+}
+
+/// Converts `bytes`, a document of `format` ("doc", "odt", "fodt", "rtf",
+/// "wml2003", "pages" or "html"), within `max_paragraphs` paragraphs and `max_memory`
+/// bytes. Fails with the error's kind as message: "not-format", "encrypted",
+/// "unsupported", "too-large" or "malformed".
+#[wasm_bindgen(js_name = convertDocs)]
+pub fn convert_docs(
+    bytes: &[u8],
+    format: &str,
+    max_paragraphs: f64,
+    max_memory: f64,
+) -> Result<ConvertedDocs, JsError> {
+    let format = Format::from_extension(format).ok_or_else(|| JsError::new("unsupported"))?;
+    // Saturating: Infinity is no limit but the module's memory, NaN and
+    // anything not positive refuse every document.
+    let limits = Limits::default()
+        .with_max_paragraphs(max_paragraphs as u64)
+        .with_max_memory(max_memory as u64);
+    let c = convert(bytes, format, &limits).map_err(|e: Error| JsError::new(e.kind()))?;
+    Ok(ConvertedDocs {
+        docx: c.docx,
+        paragraphs: c.paragraphs,
+        warnings: c.warnings,
+    })
+}
diff --git a/crates/exav-viewer/src/lib.rs b/crates/exav-viewer/src/lib.rs
index 936e4371..f0fe9b26 100644
--- a/crates/exav-viewer/src/lib.rs
+++ b/crates/exav-viewer/src/lib.rs
@@ -1,6 +1,10 @@
-//! The WebAssembly half of `@exav/viewer`. Built five times (see
+//! The WebAssembly half of `@exav/viewer`. Built nine times (see
 //! `Cargo.toml`): with `image`, exav-render's raster decoders; with `dwg`,
-//! its DWG and DXF engine; with `model`, its IFC and STL meshes; with
+//! its DWG and DXF engine; with `model`, its IFC, STL, OBJ, PLY and glTF meshes;
+//! with `text`, its Markdown reader; with `sheets`, its
+//! XLS, ODS and Numbers to XLSX converter; with `slides`,
+//! its PPT, ODP, Keynote, ODG and VSDX to PPTX converter; with `docs`,
+//! its DOC, ODT, RTF, Word 2003 XML and Pages to DOCX converter; with
 //! `pdf-jpx` and `pdf-jbig2`, the image
 //! decoders pdf.js loads in place of its C and C++ ones. Each runs in a
 //! worker, and only finished pixels or vertex buffers cross back to the
@@ -10,7 +14,7 @@
 
 #[cfg(feature = "image")]
 mod image {
-    use exav_render::image::{decode_any, Error, Format};
+    use exav_render::image::{Error, Format, decode_any};
     use wasm_bindgen::prelude::*;
 
     /// A decoded image, as RGBA8.
@@ -58,6 +62,7 @@ mod image {
             JsError::new(match e {
                 Error::Unsupported => "unsupported",
                 Error::TooLarge => "too-large",
+                Error::NoPreview => "no-preview",
                 _ => "undecodable",
             })
         })?;
@@ -111,6 +116,11 @@ mod dwg {
             std::mem::take(&mut self.0.text_strings)
         }
 
+        #[wasm_bindgen(js_name = takeClips)]
+        pub fn take_clips(&mut self) -> Vec<u8> {
+            std::mem::take(&mut self.0.clips)
+        }
+
         #[wasm_bindgen(js_name = takeStrokeTiles)]
         pub fn take_stroke_tiles(&mut self) -> Vec<u8> {
             std::mem::take(&mut self.0.stroke_tiles)
@@ -121,6 +131,11 @@ mod dwg {
             std::mem::take(&mut self.0.fill_tiles)
         }
 
+        #[wasm_bindgen(js_name = takeTranslucentRuns)]
+        pub fn take_translucent_runs(&mut self) -> Vec<u8> {
+            std::mem::take(&mut self.0.translucent_runs)
+        }
+
         pub fn origin(&self) -> Vec<f64> {
             self.0.origin.to_vec()
         }
@@ -163,6 +178,11 @@ mod dwg {
         pub fn warnings_json(&self) -> String {
             self.0.warnings_json()
         }
+
+        #[wasm_bindgen(js_name = sheetJson)]
+        pub fn sheet_json(&self) -> String {
+            self.0.sheet_json()
+        }
     }
 
     /// A parsed DWG or DXF.
@@ -177,6 +197,29 @@ mod dwg {
             self.0.layouts_json()
         }
 
+        /// The files external references name that are not bound yet, as a
+        /// JSON array of the paths the drawing wrote.
+        #[wasm_bindgen(js_name = xrefPathsJson)]
+        pub fn xref_paths_json(&self) -> String {
+            self.0.xref_paths_json()
+        }
+
+        /// Bind the drawing in `bytes`, the file `path` names, into the
+        /// references to it; how many blocks it filled.
+        #[wasm_bindgen(js_name = attachXref)]
+        pub fn attach_xref(
+            &mut self,
+            path: &str,
+            bytes: &[u8],
+            max_decompressed_bytes: f64,
+            max_entities: f64,
+        ) -> Result<u32, JsError> {
+            self.0
+                .attach_xref(path, bytes, &limits(max_decompressed_bytes, max_entities))
+                .map(|n| u32::try_from(n).unwrap_or(u32::MAX))
+                .map_err(|e| JsError::new(&e.to_string()))
+        }
+
         /// One layout; none, empty or unknown is model space. `background` is
         /// the RGB the drawing is shown on, which indexed colours resolve
         /// against. Stops at `max_primitives` strokes and fill vertices.
@@ -228,19 +271,28 @@ mod dwg {
     }
 
     /// Parse a DWG or a DXF, told apart by its first bytes. A DWG whose
-    /// compressed sections expand past `max_decompressed_bytes` is refused.
+    /// compressed sections expand past `max_decompressed_bytes` is refused,
+    /// and so is a drawing of more than `max_entities` entities.
     #[wasm_bindgen(js_name = parseDrawing)]
-    pub fn parse_drawing(bytes: &[u8], max_decompressed_bytes: f64) -> Result<Document, JsError> {
-        // Saturating: Infinity is no limit, NaN and anything not positive
-        // refuse every compressed section.
-        let limits = exav_render::cad::Limits {
-            max_decompressed_bytes: max_decompressed_bytes as u64,
-            ..exav_render::cad::Limits::default()
-        };
-        dwg::Document::parse_with(bytes, &limits)
+    pub fn parse_drawing(
+        bytes: &[u8],
+        max_decompressed_bytes: f64,
+        max_entities: f64,
+    ) -> Result<Document, JsError> {
+        dwg::Document::parse_with(bytes, &limits(max_decompressed_bytes, max_entities))
             .map(Document)
             .map_err(|e| JsError::new(&e.to_string()))
     }
+
+    /// The limits of a drawing. Saturating: Infinity is no limit, NaN and
+    /// anything not positive refuse every compressed section and every entity.
+    fn limits(max_decompressed_bytes: f64, max_entities: f64) -> exav_render::cad::Limits {
+        exav_render::cad::Limits {
+            max_decompressed_bytes: max_decompressed_bytes as u64,
+            max_entities: max_entities as usize,
+            ..exav_render::cad::Limits::default()
+        }
+    }
 }
 
 #[cfg(feature = "model")]
@@ -292,10 +344,12 @@ mod model {
             std::mem::take(&mut self.colors)
         }
 
-        /// `{origin, bounds, batches: [{class, color, vertex, vertices,
+        /// `{origin, bounds, batches: [{class, color, storey, vertex, vertices,
         /// index, indices, edge, edges, color0}], elements: [{id,
-        /// globalId, class, name, node, ranges: [[batch, first, count]]}],
-        /// nodes: [{id, class, name, parent}], warnings}`; offsets in
+        /// globalId, class, name, node, storey, ranges: [[batch, first,
+        /// count]]}], nodes: [{id, class, name, parent, elevation}],
+        /// warnings}` (`storey` and `parent` index `nodes`; `elevation`
+        /// is a storey's, in metres, or null); offsets in
         /// elements of their arrays (`color0` in bytes, -1 for none).
         #[wasm_bindgen(js_name = metaJson)]
         pub fn meta_json(&self) -> String {
@@ -385,6 +439,10 @@ mod model {
                 }
                 None => -1,
             };
+            match b.storey {
+                Some(s) => o.push_str(&format!(",\"storey\":{s}")),
+                None => o.push_str(",\"storey\":null"),
+            }
             o.push_str(&format!(
                 ",\"vertex\":{},\"vertices\":{},\"index\":{},\"indices\":{},\"edge\":{},\"edges\":{},\"color0\":{}}}",
                 m.positions.len() / 3,
@@ -415,6 +473,10 @@ mod model {
                 Some(n) => o.push_str(&format!(",\"node\":{n}")),
                 None => o.push_str(",\"node\":null"),
             }
+            match e.storey {
+                Some(s) => o.push_str(&format!(",\"storey\":{s}")),
+                None => o.push_str(",\"storey\":null"),
+            }
             o.push_str(",\"ranges\":[");
             for (k, r) in e.ranges.iter().enumerate() {
                 if k > 0 {
@@ -434,8 +496,12 @@ mod model {
             o.push_str(",\"name\":");
             string(o, &n.name);
             match n.parent {
-                Some(p) => o.push_str(&format!(",\"parent\":{p}}}")),
-                None => o.push_str(",\"parent\":null}"),
+                Some(p) => o.push_str(&format!(",\"parent\":{p}")),
+                None => o.push_str(",\"parent\":null"),
+            }
+            match n.elevation {
+                Some(e) => o.push_str(&format!(",\"elevation\":{e}}}")),
+                None => o.push_str(",\"elevation\":null}"),
             }
         }
         let w = &scene.warnings;
@@ -478,6 +544,92 @@ mod model {
             .map(pack)
             .map_err(|e| JsError::new(&e.to_string()))
     }
+
+    /// Reads a Wavefront OBJ within `max_triangles`.
+    #[wasm_bindgen(js_name = parseObj)]
+    pub fn parse_obj(bytes: &[u8], max_triangles: f64) -> Result<Model, JsError> {
+        exav_render::obj::read(bytes, budget(max_triangles))
+            .map(pack)
+            .map_err(|e| JsError::new(&e.to_string()))
+    }
+
+    /// Reads a Stanford PLY, ASCII or binary, within `max_triangles`.
+    #[wasm_bindgen(js_name = parsePly)]
+    pub fn parse_ply(bytes: &[u8], max_triangles: f64) -> Result<Model, JsError> {
+        exav_render::ply::read(bytes, budget(max_triangles))
+            .map(pack)
+            .map_err(|e| JsError::new(&e.to_string()))
+    }
+
+    /// Reads a glTF 2.0 document or GLB file within `max_triangles`.
+    #[wasm_bindgen(js_name = parseGltf)]
+    pub fn parse_gltf(bytes: &[u8], max_triangles: f64) -> Result<Model, JsError> {
+        exav_render::gltf::read(bytes, budget(max_triangles))
+            .map(pack)
+            .map_err(|e| JsError::new(&e.to_string()))
+    }
+
+    /// The files a glTF document's buffers are in, as the URIs it writes
+    /// them: a JSON array of strings, empty when it needs none.
+    #[wasm_bindgen(js_name = gltfBuffers)]
+    pub fn gltf_buffers(bytes: &[u8]) -> Result<String, JsError> {
+        let names =
+            exav_render::gltf::external_buffers(bytes).map_err(|e| JsError::new(&e.to_string()))?;
+        let quoted: Vec<String> = names
+            .iter()
+            .map(|n| {
+                let mut o = String::new();
+                string(&mut o, n);
+                o
+            })
+            .collect();
+        Ok(format!("[{}]", quoted.join(",")))
+    }
+
+    /// [`parse_gltf`], given the buffer files: `names[i]` is the URI whose
+    /// bytes are the `lengths[i]` bytes of `files` after those before.
+    #[wasm_bindgen(js_name = parseGltfWith)]
+    pub fn parse_gltf_with(
+        bytes: &[u8],
+        max_triangles: f64,
+        names: Vec<String>,
+        files: &[u8],
+        lengths: Vec<u32>,
+    ) -> Result<Model, JsError> {
+        let mut at = 0usize;
+        let mut given: Vec<(&str, &[u8])> = Vec::new();
+        for (name, len) in names.iter().zip(&lengths) {
+            let end = at
+                .checked_add(*len as usize)
+                .filter(|e| *e <= files.len())
+                .ok_or_else(|| JsError::new("a buffer file is longer than the bytes given"))?;
+            given.push((name.as_str(), files.get(at..end).unwrap_or(&[])));
+            at = end;
+        }
+        exav_render::gltf::read_with(bytes, budget(max_triangles), &given)
+            .map(pack)
+            .map_err(|e| JsError::new(&e.to_string()))
+    }
+}
+
+#[cfg(feature = "sheets")]
+mod sheets;
+
+#[cfg(feature = "slides")]
+mod slides;
+
+#[cfg(feature = "docs")]
+mod docs;
+
+#[cfg(feature = "text")]
+mod text {
+    use wasm_bindgen::prelude::*;
+
+    /// Reads Markdown into the JSON of `exav_render::markdown::Document`.
+    #[wasm_bindgen(js_name = parseMarkdown)]
+    pub fn parse_markdown(source: &str) -> String {
+        exav_render::markdown::parse(source).to_json()
+    }
 }
 
 /// Most bytes a pdf.js image decode may take in the module.
@@ -488,7 +640,7 @@ const PDF_IMAGE_MAX: u64 = 1 << 30;
 /// `_jp2_decode`.
 #[cfg(feature = "pdf-jpx")]
 mod pdf_jpx {
-    use exav_render::pdf_image::{decode_jpx, JpxParams};
+    use exav_render::pdf_image::{JpxParams, decode_jpx};
     use wasm_bindgen::prelude::*;
 
     /// The pixels pdf.js reads, or `undefined` where its decoder gives none.
@@ -517,7 +669,7 @@ mod pdf_jpx {
 /// `_jbig2_decode` and `_ccitt_decode`.
 #[cfg(feature = "pdf-jbig2")]
 mod pdf_jbig2 {
-    use exav_render::pdf_image::{decode_ccitt, decode_jbig2, CcittParams};
+    use exav_render::pdf_image::{CcittParams, decode_ccitt, decode_jbig2};
     use wasm_bindgen::prelude::*;
 
     /// Rows of 1-bit pixels, 1 for white. Empty `globals` is none.
diff --git a/crates/exav-viewer/src/sheets.rs b/crates/exav-viewer/src/sheets.rs
new file mode 100644
index 00000000..a15e994f
--- /dev/null
+++ b/crates/exav-viewer/src/sheets.rs
@@ -0,0 +1,51 @@
+//! exav-render's `sheets`: XLS, ODS, FODS and Numbers converted to XLSX, which
+//! the spreadsheet engine shows.
+
+use exav_render::sheets::{Error, Format, Limits, convert};
+use wasm_bindgen::prelude::*;
+
+/// A converted spreadsheet.
+#[wasm_bindgen]
+pub struct Converted {
+    xlsx: Vec<u8>,
+    warnings: Vec<String>,
+}
+
+#[wasm_bindgen]
+impl Converted {
+    /// The XLSX package. Moves it out: a second call returns nothing.
+    #[wasm_bindgen(js_name = takeXlsx)]
+    pub fn take_xlsx(&mut self) -> Vec<u8> {
+        std::mem::take(&mut self.xlsx)
+    }
+
+    /// What was left out or could not be read, one line each.
+    #[wasm_bindgen(getter)]
+    pub fn warnings(&self) -> String {
+        self.warnings.join("\n")
+    }
+}
+
+/// Converts `bytes`, a document of `format` ("xls", "ods", "fods",
+/// "numbers", "xml" for Excel's XML Spreadsheet, "html" or "slk"), within `max_cells` cells and `max_memory` bytes. Fails with
+/// the error's kind as message: "not-format", "encrypted", "unsupported",
+/// "too-large" or "malformed".
+#[wasm_bindgen(js_name = convertSheets)]
+pub fn convert_sheets(
+    bytes: &[u8],
+    format: &str,
+    max_cells: f64,
+    max_memory: f64,
+) -> Result<Converted, JsError> {
+    let format = Format::from_extension(format).ok_or_else(|| JsError::new("unsupported"))?;
+    // Saturating: Infinity is no limit but the module's memory, NaN and
+    // anything not positive refuse every document.
+    let limits = Limits::default()
+        .with_max_cells(max_cells as u64)
+        .with_max_memory(max_memory as u64);
+    let c = convert(bytes, format, &limits).map_err(|e: Error| JsError::new(e.kind()))?;
+    Ok(Converted {
+        xlsx: c.xlsx,
+        warnings: c.warnings,
+    })
+}
diff --git a/crates/exav-viewer/src/slides.rs b/crates/exav-viewer/src/slides.rs
new file mode 100644
index 00000000..32af6e77
--- /dev/null
+++ b/crates/exav-viewer/src/slides.rs
@@ -0,0 +1,72 @@
+//! exav-render's `slides`: PPT, ODP, FODP and Keynote converted to PPTX, which
+//! the presentation engine shows.
+
+use exav_render::slides::{Error, Format, Limits, convert_first};
+use wasm_bindgen::prelude::*;
+
+/// A converted presentation.
+#[wasm_bindgen]
+pub struct ConvertedSlides {
+    pptx: Vec<u8>,
+    slides: usize,
+    total_slides: usize,
+    warnings: Vec<String>,
+}
+
+#[wasm_bindgen]
+impl ConvertedSlides {
+    /// The PPTX package. Moves it out: a second call returns nothing.
+    #[wasm_bindgen(js_name = takePptx)]
+    pub fn take_pptx(&mut self) -> Vec<u8> {
+        std::mem::take(&mut self.pptx)
+    }
+
+    /// Slides in the PPTX.
+    #[wasm_bindgen(getter)]
+    pub fn slides(&self) -> u32 {
+        self.slides.min(u32::MAX as usize) as u32
+    }
+
+    /// Slides in the document: more than `slides` when `first` left some
+    /// out.
+    #[wasm_bindgen(getter, js_name = totalSlides)]
+    pub fn total_slides(&self) -> u32 {
+        self.total_slides.min(u32::MAX as usize) as u32
+    }
+
+    /// What was left out or could not be read, one line each.
+    #[wasm_bindgen(getter)]
+    pub fn warnings(&self) -> String {
+        self.warnings.join("\n")
+    }
+}
+
+/// Converts `bytes`, a document of `format` ("ppt", "odp", "fodp" or
+/// "key"), within `max_shapes` shapes and `max_memory` bytes: its masters
+/// and its `first` slides (Infinity for all). Fails with the error's kind as
+/// message: "not-format", "encrypted", "unsupported", "too-large" or
+/// "malformed".
+#[wasm_bindgen(js_name = convertSlides)]
+pub fn convert_slides(
+    bytes: &[u8],
+    format: &str,
+    max_shapes: f64,
+    max_memory: f64,
+    first: f64,
+) -> Result<ConvertedSlides, JsError> {
+    let format = Format::from_extension(format).ok_or_else(|| JsError::new("unsupported"))?;
+    // Saturating: Infinity is no limit but the module's memory, NaN and
+    // anything not positive refuse every document.
+    let limits = Limits::default()
+        .with_max_shapes(max_shapes as u64)
+        .with_max_memory(max_memory as u64);
+    // Saturating too: NaN converts no slide.
+    let c = convert_first(bytes, format, &limits, first as usize)
+        .map_err(|e: Error| JsError::new(e.kind()))?;
+    Ok(ConvertedSlides {
+        pptx: c.pptx,
+        slides: c.slides,
+        total_slides: c.total_slides,
+        warnings: c.warnings,
+    })
+}
diff --git a/crates/exav-viewer/ts/all.ts b/crates/exav-viewer/ts/all.ts
index ba4f0e77..5a5cd3bb 100644
--- a/crates/exav-viewer/ts/all.ts
+++ b/crates/exav-viewer/ts/all.ts
@@ -10,9 +10,10 @@ import type { FormatPlugin } from "./core/types.js";
 import { ifc, type IfcOptions } from "./ifc/index.js";
 import { image, type ImageOptions } from "./image/index.js";
 import { audio, video } from "./media/index.js";
-import { stl, type ModelOptions } from "./model/index.js";
+import { gltf, obj, ply, stl, type ModelOptions } from "./model/index.js";
 import { csv, docx, pptx, xlsx, type OfficeOptions } from "./office/index.js";
 import { pdf, type PdfOptions } from "./pdf/index.js";
+import { text } from "./text/index.js";
 
 export interface AllOptions {
   pdf?: PdfOptions;
@@ -34,10 +35,14 @@ export function allPlugins(o: AllOptions = {}): FormatPlugin<any>[] {
     audio(),
     ifc(o.ifc),
     stl(o.model),
+    obj(o.model),
+    ply(o.model),
+    gltf(o.model),
     docx(o.office),
     xlsx(o.office),
     pptx(o.office),
     csv(o.office),
+    text(),
     archive(o.archive),
   ];
 }
diff --git a/crates/exav-viewer/ts/archive/index.ts b/crates/exav-viewer/ts/archive/index.ts
index 663fae0d..7d3ba400 100644
--- a/crates/exav-viewer/ts/archive/index.ts
+++ b/crates/exav-viewer/ts/archive/index.ts
@@ -1,7 +1,9 @@
 /**
  * `@exav/viewer/archive`: what is inside an archive, on `@exav/unpack-wasm`
- * (a peer dependency): zip, 7z, rar, and tar and its compressions (gz, bz2,
- * xz), or plain gz, bz2 and xz. Members open with whatever plugin fits them, in the
+ * (a peer dependency): zip, 7z, rar, tar and its compressions (gz, bz2, xz,
+ * zst, lz4, lz, Z), cab, lzh, arj, ar and deb, cpio, xar and pkg, the packages
+ * that are zips (jar, apk...), comic books, chm, `winmail.dat`, and the iso, dmg,
+ * wim and virtual disk images. Members open with whatever plugin fits them, in the
  * same viewer, an archive inside an archive included.
  */
 import { MATCHERS } from "../core/formats.js";
diff --git a/crates/exav-viewer/ts/archive/names.test.ts b/crates/exav-viewer/ts/archive/names.test.ts
index 39fe702d..b74fee38 100644
--- a/crates/exav-viewer/ts/archive/names.test.ts
+++ b/crates/exav-viewer/ts/archive/names.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import { decompressedName, STREAM_MEMBER } from "./names.js";
+import { decompressedName, folderOf, memberPath, STREAM_MEMBER } from "./names.js";
 
 describe("what a compressed stream's file is called", () => {
   // The names gunzip, bunzip2, unxz and unzstd give what they decompress.
@@ -16,6 +16,26 @@ describe("what a compressed stream's file is called", () => {
     expect(decompressedName("site.tgz", "gzip-content")).toBe("site.tar");
     expect(decompressedName("site.tbz2", "bzip2-content")).toBe("site.tar");
     expect(decompressedName("site.txz", "xz-content")).toBe("site.tar");
+    expect(decompressedName("site.tzst", "zstd-content")).toBe("site.tar");
+    expect(decompressedName("site.tlz", "lzip-content")).toBe("site.tar");
+    expect(decompressedName("site.tar.lzma", "lzma-content")).toBe("site.tar");
+    expect(decompressedName("notes.txt.lzma", "lzma-content")).toBe("notes.txt");
+    expect(decompressedName("site.taz", "lzw-content")).toBe("site.tar");
+    expect(decompressedName("site.tbz", "bzip2-content")).toBe("site.tar");
+  });
+
+  it("drops the suffix of the other compressions too", () => {
+    expect(decompressedName("dump.sql.lz4", "lz4-content")).toBe("dump.sql");
+    expect(decompressedName("dump.sql.lz", "lzip-content")).toBe("dump.sql");
+    expect(decompressedName("DUMP.SQL.Z", "lzw-content")).toBe("DUMP.SQL");
+  });
+
+  it("lists the members of a disk image or a help file as relative paths", () => {
+    expect(memberPath("/docs/index.html")).toBe("docs/index.html");
+    expect(memberPath("/test.txt")).toBe("test.txt");
+    expect(memberPath("docs/a.txt")).toBe("docs/a.txt");
+    expect(memberPath("\\a.txt")).toBe("a.txt");
+    expect(folderOf(memberPath("/docs/index.html"))).toBe("docs");
   });
 
   it("falls back when the name says nothing", () => {
@@ -24,7 +44,7 @@ describe("what a compressed stream's file is called", () => {
   });
 
   it("is told by the library's name for it, and only that", () => {
-    for (const n of ["gzip-content", "bzip2-content", "xz-content", "zstd-content", "lzip-content", "lz4-content", "lzw-content"]) {
+    for (const n of ["gzip-content", "bzip2-content", "xz-content", "zstd-content", "lzip-content", "lzma-content", "lz4-content", "lzw-content"]) {
       expect(STREAM_MEMBER.test(n), n).toBe(true);
     }
     for (const n of ["content", "gzip-content.txt", "docs/gzip-content", "zip-content"]) {
diff --git a/crates/exav-viewer/ts/archive/names.ts b/crates/exav-viewer/ts/archive/names.ts
index 556cb430..e5862168 100644
--- a/crates/exav-viewer/ts/archive/names.ts
+++ b/crates/exav-viewer/ts/archive/names.ts
@@ -14,12 +14,12 @@ export function safeFileName(name: string, fallback = "file"): string {
 }
 
 /** The name @exav/unpack-wasm gives the one member of a compressed stream: "gzip-content". */
-export const STREAM_MEMBER = /^(gzip|bzip2|xz|zstd|lzip|lz4|lzw)-content$/;
+export const STREAM_MEMBER = /^(gzip|bzip2|xz|zstd|lzip|lzma|lz4|lzw)-content$/;
 
 /** A compressed file's name, and what it is called once decompressed. */
 const SUFFIXES: [RegExp, string][] = [
   [/\.(tgz|taz|tbz2?|txz|tzst|tlz)$/i, ".tar"],
-  [/\.(gz|bz2|xz|zst|lz|lz4|z)$/i, ""],
+  [/\.(gz|bz2|xz|zst|lz|lzma|lz4|z)$/i, ""],
 ];
 
 /**
@@ -38,6 +38,15 @@ export function decompressedName(name: string, fallback: string): string {
   return fallback;
 }
 
+/**
+ * A member's name as the list shows it: relative. A disk image (dmg) and a
+ * help file (chm) name their members from a root, `/docs/index.html`, which
+ * would read as a folder called "" in the tree.
+ */
+export function memberPath(name: string): string {
+  return name.replace(/^[/\\]+/, "");
+}
+
 /** The folder part of a member's name, or "". */
 export function folderOf(name: string): string {
   const i = name.lastIndexOf("/");
diff --git a/crates/exav-viewer/ts/archive/renderer.ts b/crates/exav-viewer/ts/archive/renderer.ts
index 621b0982..23d8616f 100644
--- a/crates/exav-viewer/ts/archive/renderer.ts
+++ b/crates/exav-viewer/ts/archive/renderer.ts
@@ -1,8 +1,9 @@
 import { writable } from "../core/store.js";
 import type { ArchiveController, ArchiveMember, Renderer, Session, ViewerFile } from "../core/types.js";
 import type { ArchiveOptions } from "./index.js";
-import { decompressedName, STREAM_MEMBER } from "./names.js";
+import { decompressedName, memberPath, STREAM_MEMBER } from "./names.js";
 import { isZip, openRanged, type RangedArchive } from "./ranged.js";
+import { volumesAround, type Volumes } from "./volumes.js";
 
 /**
  * What one archive may cost. The library enforces them: an archive is
@@ -30,7 +31,7 @@ export const renderer: Renderer<ArchiveOptions> = {
         // Directories are left out: the tree is in the names.
         return (await archive.list())
           .filter((m) => !m.name.endsWith("/"))
-          .map((m) => ({ index: m.index, name: m.name, uncompressedSize: m.uncompressedSize, encrypted: m.encrypted }));
+          .map((m) => ({ index: m.index, name: memberPath(m.name), uncompressedSize: m.uncompressedSize, encrypted: m.encrypted }));
       } catch (error) {
         // The archive and its worker are closed whatever went wrong.
         void archive.close();
@@ -45,7 +46,23 @@ export const renderer: Renderer<ArchiveOptions> = {
     const ranges = given && "ranges" in given ? given.ranges : null;
     let chosen: RangedArchive | null = null;
     let members: ArchiveMember[] = [];
-    if (ranges && isZip(await ranges.read(0, Math.min(4, ranges.size), ctx.signal))) {
+    // One part of a split archive is nothing on its own: with the other
+    // parts among the files around it, the set is the archive.
+    let volumes: Volumes = null;
+    if (ctx.file.tree) {
+      try {
+        volumes = await volumesAround(ctx.file.tree, ctx.signal);
+      } catch (error) {
+        if (ctx.signal.aborted) throw error;
+        console.warn("archive: the volumes of the set could not be read", error);
+      }
+      if (volumes?.kind === "incomplete") console.warn(`archive: ${ctx.file.name} is a part of a set that is not whole among the files around it`);
+    }
+    if (volumes?.kind === "joined") {
+      const { Archive } = await import("@exav/unpack-wasm");
+      chosen = await Archive.open(volumes.data, limits);
+      members = await list(chosen);
+    } else if (ranges && isZip(await ranges.read(0, Math.min(4, ranges.size), ctx.signal))) {
       try {
         chosen = await openRanged(ranges, limits, ctx.signal);
         members = await list(chosen);
@@ -92,7 +109,7 @@ export const renderer: Renderer<ArchiveOptions> = {
     const archive = chosen;
 
     const surface = document.createElement("div");
-    surface.className = "exv-archive-member";
+    surface.className = "exav-viewer-archive-member";
     host.append(surface);
 
     const state = writable<State>({ members, opening: null, opened: null, refused: null });
@@ -133,6 +150,19 @@ export const renderer: Renderer<ArchiveOptions> = {
             path: member.name,
             format,
             source: { bytes: entry.bytes },
+            // The other members are the files around it: a drawing finds
+            // the ones it refers to among them, extracted when asked for.
+            tree: {
+              path: member.name,
+              paths: members.map((m) => m.name),
+              async open(path) {
+                const other = members.find((m) => m.name === path);
+                if (!other) throw new Error(`no ${path} in the archive`);
+                const extracted = await archive.extract(other.index);
+                if (extracted.unsupported) throw new Error(`${path}: ${extracted.unsupported}`);
+                return { bytes: extracted.bytes };
+              },
+            },
           };
           const session = ctx.mountNested(surface, file);
           nested = session;
diff --git a/crates/exav-viewer/ts/archive/volumes.ts b/crates/exav-viewer/ts/archive/volumes.ts
new file mode 100644
index 00000000..07314fdb
--- /dev/null
+++ b/crates/exav-viewer/ts/archive/volumes.ts
@@ -0,0 +1,49 @@
+import { createSourceReader } from "../core/source.js";
+import type { FileTree } from "../core/types.js";
+
+/** The bytes of all the volumes of a set the viewer holds at once. */
+export const MAX_VOLUME_BYTES = 1024 * 1024 * 1024;
+
+const dirOf = (p: string) => (p.includes("/") ? p.slice(0, p.lastIndexOf("/")) : "");
+const baseOf = (p: string) => p.slice(p.lastIndexOf("/") + 1);
+
+export type Volumes =
+  /** The set made whole: what `Archive.open` takes. */
+  | { kind: "joined"; data: Blob | Uint8Array; parts: string[] }
+  /** A part of a set with volumes missing from the files around it. */
+  | { kind: "incomplete"; missing: boolean }
+  /** Not a part of a set: the file is an archive on its own. */
+  | null;
+
+/**
+ * The volumes of the split archive the file is one of, read from the files
+ * beside it in the tree (the same folder: a set is named by its stem), and
+ * made one archive. Byte-split volumes (`big.7z.001`) are a Blob of the
+ * parts, which the archive reader reads where it needs; RAR and ZIP volumes
+ * (`x.part1.rar`, `x.rar` and `x.r00`, `x.z01` and `x.zip`) go through the
+ * decoders' joiners, in memory.
+ */
+export async function volumesAround(tree: FileTree, signal: AbortSignal): Promise<Volumes> {
+  const dir = dirOf(tree.path);
+  const beside = tree.paths.filter((p) => dirOf(p) === dir).map(baseOf);
+  const unpack = await import("@exav/unpack-wasm");
+  await unpack.default();
+  const set = unpack.volumeSet(baseOf(tree.path), beside);
+  if (!set) return null;
+  if (!set.complete) return { kind: "incomplete", missing: true };
+  const bytes: Uint8Array[] = [];
+  let held = 0;
+  for (const name of set.parts) {
+    const reader = createSourceReader(await tree.open(dir ? `${dir}/${name}` : name, signal), signal);
+    try {
+      const part = (await reader.bytes()).slice();
+      held += part.length;
+      if (held > MAX_VOLUME_BYTES) return { kind: "incomplete", missing: false };
+      bytes.push(part);
+    } finally {
+      reader.dispose();
+    }
+  }
+  const data = set.scheme === "split" ? new Blob(bytes as BlobPart[]) : unpack.joinSet(set.scheme, bytes);
+  return { kind: "joined", data, parts: set.parts };
+}
diff --git a/crates/exav-viewer/ts/cad/cad.worker.ts b/crates/exav-viewer/ts/cad/cad.worker.ts
index eead1521..e46b376a 100644
--- a/crates/exav-viewer/ts/cad/cad.worker.ts
+++ b/crates/exav-viewer/ts/cad/cad.worker.ts
@@ -3,7 +3,7 @@
 import init, { drawingPreview, parseDrawing, unsupportedDrawingVersion, type Document } from "../../wasm/exav_viewer_dwg.js";
 
 import { serve } from "../core/worker-host.js";
-import type { DrawingPreview, LayerInfo, LayoutInfo, ParsedDrawing, Warnings } from "./types.js";
+import type { DrawingPreview, LayerInfo, LayoutInfo, ParsedDrawing, Sheet, Warnings } from "./types.js";
 
 export type CadRequest =
   /**
@@ -13,7 +13,12 @@ export type CadRequest =
    * (`unsupported`), and not kept.
    */
   | { kind: "load"; bytes: ArrayBuffer }
-  /** Parse a DWG or DXF (the bytes given, else those loaded) and draw a layout; "" is model space. */
+  /**
+   * Parse a DWG or DXF (the bytes given, else those loaded) and draw a
+   * layout; "" is model space. With `draw: false` nothing is drawn: the
+   * answer is the files its external references name (`xrefs`), to be
+   * attached before the first `layout`.
+   */
   | {
       kind: "parse";
       bytes?: ArrayBuffer;
@@ -21,11 +26,19 @@ export type CadRequest =
       background: Uint8Array;
       maxPrimitives: number;
       maxDecompressedBytes: number;
+      maxEntities: number;
+      draw?: boolean;
     }
   /** Draw another layout of the file already parsed. */
-  | { kind: "layout"; layout: string; background: Uint8Array; maxPrimitives: number };
+  | { kind: "layout"; layout: string; background: Uint8Array; maxPrimitives: number }
+  /**
+   * Bind the drawing in `bytes`, the file `path` names (as the parsed
+   * drawing wrote it), into the references to it. Answers how many blocks it
+   * filled and the files still named.
+   */
+  | { kind: "attach"; path: string; bytes: ArrayBuffer; maxDecompressedBytes: number; maxEntities: number };
 
-export type CadAnswer = ParsedDrawing | { preview: DrawingPreview | null; unsupported: string | null };
+export type CadAnswer = ParsedDrawing | { preview: DrawingPreview | null; unsupported: string | null } | { xrefs: string[]; attached: number };
 
 let ready: Promise<unknown> | null = null;
 // The parsed document outlives a request, so a layout switch costs only a
@@ -42,14 +55,17 @@ function draw(d: Document, r: { layout: string; background: Uint8Array; maxPrimi
       fills: drawing.takeFills().buffer as ArrayBuffer,
       texts: drawing.takeTexts().buffer as ArrayBuffer,
       textStrings: drawing.takeTextStrings().buffer as ArrayBuffer,
+      clips: drawing.takeClips().buffer as ArrayBuffer,
       strokeTiles: drawing.takeStrokeTiles().buffer as ArrayBuffer,
       fillTiles: drawing.takeFillTiles().buffer as ArrayBuffer,
+      translucentRuns: drawing.takeTranslucentRuns().buffer as ArrayBuffer,
       layers: JSON.parse(drawing.layersJson()) as LayerInfo[],
       layouts: JSON.parse(d.layoutsJson()) as LayoutInfo[],
       layout: drawing.layout,
       origin: Array.from(drawing.origin()) as [number, number],
       extents: Array.from(drawing.extents()) as [number, number, number, number],
       warnings: JSON.parse(drawing.warningsJson()) as Warnings,
+      sheet: JSON.parse(drawing.sheetJson()) as Sheet,
       maxOrder: drawing.maxOrder(),
       opaqueStrokes: drawing.opaqueStrokes(),
       opaqueFills: drawing.opaqueFills(),
@@ -59,7 +75,16 @@ function draw(d: Document, r: { layout: string; background: Uint8Array; maxPrimi
     };
     return {
       value: out,
-      transfer: [out.strokes, out.fills, out.texts, out.textStrings, out.strokeTiles, out.fillTiles],
+      transfer: [
+        out.strokes,
+        out.fills,
+        out.texts,
+        out.textStrings,
+        out.clips,
+        out.strokeTiles,
+        out.fillTiles,
+        out.translucentRuns,
+      ],
     };
   } finally {
     drawing.free();
@@ -92,9 +117,14 @@ serve<CadRequest, CadAnswer>(async (r) => {
     const bytes = r.bytes ? new Uint8Array(r.bytes) : loaded;
     loaded = null;
     if (!bytes) throw new Error("no drawing loaded");
-    doc = parseDrawing(bytes, r.maxDecompressedBytes);
+    doc = parseDrawing(bytes, r.maxDecompressedBytes, r.maxEntities);
+    if (r.draw === false) return { value: { xrefs: JSON.parse(doc.xrefPathsJson()) as string[], attached: 0 } };
     return draw(doc, r, started);
   }
   if (!doc) throw new Error("no drawing loaded");
+  if (r.kind === "attach") {
+    const attached = doc.attachXref(r.path, new Uint8Array(r.bytes), r.maxDecompressedBytes, r.maxEntities);
+    return { value: { xrefs: JSON.parse(doc.xrefPathsJson()) as string[], attached } };
+  }
   return draw(doc, r, started);
 });
diff --git a/crates/exav-viewer/ts/cad/export.ts b/crates/exav-viewer/ts/cad/export.ts
new file mode 100644
index 00000000..98b6c235
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/export.ts
@@ -0,0 +1,159 @@
+/**
+ * A drawing drawn again as a picture (`pictures.raster`): the layout's
+ * geometry in a WebGL2 context of its own, at the picture's pixel size and
+ * region, never the visible canvas. A picture past what the GPU holds is drawn
+ * in tiles and composed on a 2D canvas.
+ *
+ * The geometry is tessellated again by the worker for each picture (the page
+ * keeps none of it after the visible upload), uploaded to this context, and
+ * the page's copy dropped before anything is drawn: while a picture is drawn
+ * the memory is the visible renderer's buffers plus this context's, not a
+ * third copy on the CPU. Everything the picture allocated is freed on
+ * success, error and abort.
+ */
+import { asRasterError, RasterError, throwIfAborted, tilePlan } from "../core/pictures.js";
+import { drawTiled, release } from "../core/raster.js";
+import { glTile, tileEdge, type ExportView } from "./raster.js";
+import { familiesFor, loadFamilies } from "./renderer/fonts.js";
+import { Renderer } from "./renderer/renderer.js";
+import { facesUsed } from "./renderer/text-layout.js";
+import type { ParsedDrawing } from "./types.js";
+
+type Surface = HTMLCanvasElement | OffscreenCanvas;
+
+/** A CSS colour as 0..1 RGB and an opacity; null for what CSS rejects. */
+export function parseColor(css: string): { rgb: [number, number, number]; alpha: number } | null {
+  const canvas = document.createElement("canvas");
+  canvas.width = canvas.height = 1;
+  const ctx = canvas.getContext("2d", { willReadFrequently: true });
+  if (!ctx) return null;
+  // A colour the canvas rejects leaves its fill as it was: read twice from two
+  // starting points, it gives away that it was not taken.
+  const read = (start: string) => {
+    ctx.fillStyle = start;
+    ctx.fillStyle = css;
+    ctx.clearRect(0, 0, 1, 1);
+    ctx.fillRect(0, 0, 1, 1);
+    return ctx.getImageData(0, 0, 1, 1).data;
+  };
+  const a = read("#010203");
+  const b = read("#fcfdfe");
+  if (a.some((v, i) => v !== b[i])) return null;
+  return { rgb: [a[0]! / 255, a[1]! / 255, a[2]! / 255], alpha: a[3]! / 255 };
+}
+
+const yieldToBrowser = () => new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+/** A canvas with a WebGL2 context: off screen where the browser can, else a detached element. */
+function openRenderer(alpha: boolean): { renderer: Renderer; surface: Surface } {
+  const makers: (() => Surface)[] = [];
+  if (typeof OffscreenCanvas === "function") makers.push(() => new OffscreenCanvas(1, 1));
+  makers.push(() => document.createElement("canvas"));
+  let last: unknown;
+  for (const make of makers) {
+    const surface = make();
+    try {
+      return { renderer: new Renderer(surface, { alpha }), surface };
+    } catch (error) {
+      last = error;
+      surface.width = surface.height = 0;
+    }
+  }
+  throw new RasterError("unsupported", "WebGL2 is not available", { cause: last });
+}
+
+function resize(surface: Surface, renderer: Renderer, width: number, height: number): void {
+  if (surface.width !== width) surface.width = width;
+  if (surface.height !== height) surface.height = height;
+  const [w, h] = renderer.drawingBufferSize();
+  if (w !== width || h !== height) throw new RasterError("too-large", `the GPU cannot hold a ${width} x ${height} px picture`);
+}
+
+/** The canvas's pixels as a bitmap that owns them; the canvas is left empty. */
+async function takeBitmap(surface: Surface): Promise<ImageBitmap> {
+  if ("transferToImageBitmap" in surface && typeof surface.transferToImageBitmap === "function") return surface.transferToImageBitmap();
+  return createImageBitmap(surface);
+}
+
+export interface Picture {
+  /** The layout as the worker tessellated it. Its geometry buffers are dropped once uploaded. */
+  drawing: ParsedDrawing;
+  /** Layer visibility, by layer index. */
+  visible: boolean[];
+  /** What the picture shows, in drawing units. */
+  view: ExportView;
+  width: number;
+  height: number;
+  /** The ground, as 0..1 RGB. With `alpha` under 1 it is the colour that decides the ink (and a wipeout's), and is not drawn. */
+  ground: [number, number, number];
+  /** 1: opaque. 0: transparent. In between: translucent. */
+  alpha: number;
+  lineweights: "drawing" | "always" | "never";
+  monochrome: boolean;
+  /** Device pixels per CSS pixel the line widths are for, and the factors on them (`lineweightFactors`). */
+  dpr: number;
+  factors: { pixel: number; paper: number };
+  /** The plugin's `rasterTile`. */
+  tile?: number;
+  signal?: AbortSignal;
+}
+
+/** Draws `picture`; the bitmap is the caller's to close. */
+export async function drawPicture(picture: Picture): Promise<ImageBitmap> {
+  const { drawing: d, view, width, height, signal } = picture;
+  throwIfAborted(signal);
+  // Canvas falls back to a system font, silently, when asked for one that is
+  // not loaded (see `loadFamilies`).
+  await loadFamilies(familiesFor(facesUsed(d.texts)), (file, err) => console.warn(`dwg: could not load ${file}; its text is drawn with another face`, err));
+  throwIfAborted(signal);
+
+  const { renderer, surface } = openRenderer(picture.alpha < 1);
+  try {
+    const edge = tileEdge(renderer.limits(), picture.tile);
+    const whole = width <= edge && height <= edge;
+    // Too many tiles is refused before anything is uploaded.
+    if (!whole) tilePlan(width, height, edge);
+
+    renderer.background = picture.ground;
+    renderer.backgroundAlpha = picture.alpha;
+    renderer.lineweights = picture.lineweights;
+    renderer.monochrome = picture.monochrome;
+    renderer.pixelRatio = picture.dpr * picture.factors.pixel;
+    renderer.paperWidthScale = picture.factors.paper;
+    // The glyph atlas is sized from the whole picture's view: the same text
+    // resolution in every tile.
+    renderer.setPictureView({ cx: view.cx - d.origin[0], cy: view.cy - d.origin[1], scale: view.scale, width, height });
+    renderer.setDrawing(d, picture.visible, false);
+    d.strokes = d.fills = d.strokeTiles = d.fillTiles = new ArrayBuffer(0);
+    if (renderer.isLost()) throw new RasterError("failed", "the GPU context was lost");
+
+    // Lets a pending abort (or the page) in before the drawing.
+    await yieldToBrowser();
+    throwIfAborted(signal);
+
+    // A picture in one pass is one tile. Its pixels are copied to a 2D canvas
+    // before the context goes: a bitmap taken from a WebGL canvas is still
+    // backed by that context.
+    return await drawTiled(
+      width,
+      height,
+      whole ? Math.max(width, height) : edge,
+      async (tile) => {
+        await yieldToBrowser();
+        throwIfAborted(signal);
+        resize(surface, renderer, tile.width, tile.height);
+        renderer.showTile(glTile({ height }, tile));
+        renderer.paint();
+        if (renderer.isLost()) throw new RasterError("failed", "the GPU context was lost");
+        return takeBitmap(surface);
+      },
+      { signal },
+    );
+  } catch (error) {
+    throw asRasterError(error, signal);
+  } finally {
+    renderer.dispose();
+    renderer.loseContext();
+    release(surface);
+  }
+}
diff --git a/crates/exav-viewer/ts/cad/plugin.ts b/crates/exav-viewer/ts/cad/plugin.ts
index bf965edd..1bca264d 100644
--- a/crates/exav-viewer/ts/cad/plugin.ts
+++ b/crates/exav-viewer/ts/cad/plugin.ts
@@ -27,7 +27,7 @@ export interface CadOptions {
   /**
    * Most strokes and fill vertices one layout may produce. Past it the
    * remaining entities are left out and the `scene_truncated` warning shown.
-   * Default 8_000_000: about 220 MB of vertex buffers, four times the largest
+   * Default 8_000_000: up to 256 MB of vertex buffers, four times the largest
    * real drawing measured. Lower it for memory-constrained devices.
    */
   maxPrimitives?: number;
@@ -38,9 +38,36 @@ export interface CadOptions {
    * keep the reader expanding up to the limit.
    */
   maxDecompressedBytes?: number;
+  /**
+   * Most entities read from a drawing, block contents included; the rest are
+   * left out and the `scene_truncated` warning shown. Default 1_000_000: an
+   * entity takes about 512 bytes of the module's memory, so the default is
+   * about 512 MiB, and a small hostile file can declare millions. The
+   * largest drawing in a sweep of about 1,100 public DWG and DXF files has
+   * about 360,000.
+   */
+  maxEntities?: number;
+  /**
+   * Lines at their lineweights: "drawing" as the drawing was saved
+   * (`$LWDISPLAY`, AutoCAD's lineweight button), "always", or "never", every
+   * line one pixel. Default "drawing".
+   */
+  lineweights?: "drawing" | "always" | "never";
+  /**
+   * Everything in ink, black on a light ground and white on a dark one, as
+   * a drawing plotted with monochrome.ctb. Default false.
+   */
+  monochrome?: boolean;
+  /**
+   * The side, in pixels, of the tiles `pictures.raster` draws a large picture
+   * in. Default 2048; never more than 4096 or what the GPU holds. A tuning
+   * and testing knob: a small value makes pictures that would fit in one pass
+   * come out tiled (the same pixels, but each tile is a draw of the drawing).
+   */
+  rasterTile?: number;
 }
 
-const CAPABILITIES = ["layers", "layouts", "ground", "zoom"] as const;
+const CAPABILITIES = ["layers", "layouts", "ground", "zoom", "pictures", "viewport"] as const;
 
 export function dwg(options: CadOptions = {}): FormatPlugin<CadOptions> {
   return {
diff --git a/crates/exav-viewer/ts/cad/raster.test.ts b/crates/exav-viewer/ts/cad/raster.test.ts
new file mode 100644
index 00000000..1ae48cf6
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/raster.test.ts
@@ -0,0 +1,367 @@
+import { describe, expect, it } from "vitest";
+
+import { RasterError, tilePlan, tileRect } from "../core/pictures.js";
+import type { Viewport } from "../core/types.js";
+import {
+  abortable,
+  checkScale,
+  currentFor,
+  DEFAULT_TILE,
+  defaultRegion,
+  exportView,
+  glTile,
+  layoutFor,
+  lineweightFactors,
+  linked,
+  MAX_TILE,
+  minScaleFor,
+  planExport,
+  referenceCanvas,
+  serial,
+  tileCamera,
+  tileEdge,
+  viewportRegion,
+} from "./raster.js";
+import { FIT_MARGIN } from "./renderer/camera.js";
+
+const code = (f: () => unknown) => {
+  try {
+    f();
+  } catch (e) {
+    return e instanceof RasterError ? e.code : `not a RasterError: ${String(e)}`;
+  }
+  return "none";
+};
+const codeOf = async (p: Promise<unknown>) => {
+  try {
+    await p;
+  } catch (e) {
+    return e instanceof RasterError ? e.code : `not a RasterError: ${String(e)}`;
+  }
+  return "none";
+};
+
+const layouts = [
+  { id: "", name: "Model", isModel: true },
+  { id: "Sheet A", name: "Sheet A", isModel: false },
+  { id: "Sheet B", name: "Sheet B", isModel: false },
+];
+
+describe("the layout a page is", () => {
+  it("is the layout of that place in the layouts controller, model space first", () => {
+    expect(layoutFor(layouts, 1, {})).toEqual({ id: "", page: 1 });
+    expect(layoutFor(layouts, 3, {})).toEqual({ id: "Sheet B", page: 3 });
+  });
+
+  it("is the layout asked for by its id, which wins over the page", () => {
+    expect(layoutFor(layouts, 1, { layout: "Sheet A" })).toEqual({ id: "Sheet A", page: 2 });
+    expect(layoutFor(layouts, 3, { layout: "" })).toEqual({ id: "", page: 1 });
+  });
+
+  it("is refused for an id that no layout has, or a page past the list", () => {
+    expect(code(() => layoutFor(layouts, 1, { layout: "Model" }))).toBe("invalid");
+    expect(code(() => layoutFor(layouts, 1, { layout: 3 as never }))).toBe("invalid");
+    expect(code(() => layoutFor(layouts, 4, {}))).toBe("invalid");
+  });
+});
+
+describe("the viewport as a region", () => {
+  const camera = { cx: 10, cy: -20, scale: 0.5, width: 800, height: 600 };
+
+  it("is what the camera shows, in drawing units: the origin added back to the local view", () => {
+    expect(viewportRegion(camera, [1000, 2000])).toEqual({ x: 1000 + 10 - 200, y: 2000 - 20 - 150, width: 400, height: 300 });
+    expect(viewportRegion(camera, [0, 0])).toEqual({ x: -190, y: -170, width: 400, height: 300 });
+  });
+
+  it("is the region of its layout alone", () => {
+    const viewport: Viewport = { space: "drawing", page: 2, layout: "Sheet A", region: { x: 1, y: 2, width: 3, height: 4 } };
+    expect(currentFor(viewport, "Sheet A")).toEqual({ x: 1, y: 2, width: 3, height: 4 });
+    expect(currentFor(viewport, "")).toBeNull();
+    expect(currentFor(null, "")).toBeNull();
+    expect(currentFor({ ...viewport, space: "pixels" }, "Sheet A")).toBeNull();
+  });
+
+  it("drawn at the canvas's own size is the same view, to the pixel", () => {
+    const region = viewportRegion(camera, [1000, 2000]);
+    const view = exportView({ width: 800, height: 600, region });
+    expect(view.scale).toBeCloseTo(0.5, 12);
+    expect(view.cx - 1000).toBeCloseTo(10, 9);
+    expect(view.cy - 2000).toBeCloseTo(-20, 9);
+    expect(view.region.x).toBeCloseTo(region.x, 9);
+    expect(view.region.height).toBeCloseTo(300, 9);
+  });
+});
+
+describe("what is drawn when no region is asked", () => {
+  it("is the extents with the margin the viewer's fit leaves, about their centre", () => {
+    const r = defaultRegion([-50, -25, 50, 25], [1000, 500]);
+    expect(r.width).toBeCloseTo(100 * (1 + 2 * FIT_MARGIN), 9);
+    expect(r.height).toBeCloseTo(50 * (1 + 2 * FIT_MARGIN), 9);
+    expect(r.x + r.width / 2).toBeCloseTo(1000, 9);
+    expect(r.y + r.height / 2).toBeCloseTo(500, 9);
+  });
+
+  it("gives a line some height and an empty layout a unit", () => {
+    const line = defaultRegion([0, 0, 100, 0], [0, 0]);
+    expect(line.height).toBeCloseTo(1 * (1 + 2 * FIT_MARGIN), 9);
+    expect(line.width).toBeCloseTo(100 * (1 + 2 * FIT_MARGIN), 9);
+    const empty = defaultRegion([0, 0, 0, 0], [5, 6]);
+    expect(empty.width).toBeCloseTo(1 + 2 * FIT_MARGIN, 9);
+    expect(empty.x + empty.width / 2).toBeCloseTo(5, 9);
+    expect(defaultRegion([NaN, 0, NaN, 0], [0, 0]).width).toBeGreaterThan(0);
+  });
+});
+
+describe("planning a picture of a drawing", () => {
+  const full = { x: 0, y: 0, width: 200, height: 100 };
+
+  it("waits for the extents when no region is asked, and does not otherwise", () => {
+    expect(planExport({ longEdge: 100 }, null, null, "#ffffff")).toBeNull();
+    expect(planExport({ longEdge: 100, region: { x: 1, y: 2, width: 3, height: 4 } }, null, null, "#ffffff")).toMatchObject({ width: 75, height: 100 });
+    expect(planExport({ longEdge: 100, region: "current" }, null, { x: 0, y: 0, width: 4, height: 2 }, "#ffffff")).toMatchObject({ width: 100, height: 50 });
+  });
+
+  it("draws the extents on the ground by default, the picture taking their shape", () => {
+    expect(planExport({ longEdge: 400 }, full, null, "#212830")).toEqual({ width: 400, height: 200, region: full, background: "#212830" });
+  });
+
+  it("widens the region to a picture of another shape (contain) or narrows it (cover), about its centre", () => {
+    expect(planExport({ width: 100, height: 100 }, full, null, "#fff")!.region).toEqual({ x: 0, y: -50, width: 200, height: 200 });
+    expect(planExport({ width: 100, height: 100, fit: "cover" }, full, null, "#fff")!.region).toEqual({ x: 50, y: 0, width: 100, height: 100 });
+  });
+
+  it("refuses 'current' where no region is in view, a camera region, a bad lineweight, background or size", () => {
+    expect(code(() => planExport({ longEdge: 10, region: "current" }, full, null, "#fff"))).toBe("invalid");
+    const camera = { position: [0, 0, 1], target: [0, 0, 0], projection: { type: "perspective", fov: 50 }, aspect: 1 } as const;
+    expect(code(() => planExport({ longEdge: 10, region: camera }, full, null, "#fff"))).toBe("invalid");
+    expect(code(() => planExport({ longEdge: 10, lineweight: "heavy" as never }, null, null, "#fff"))).toBe("invalid");
+    expect(code(() => planExport({ longEdge: 10, background: "url(x)" }, full, null, "#fff"))).toBe("invalid");
+    expect(code(() => planExport({ longEdge: 0 }, full, null, "#fff"))).toBe("invalid");
+    expect(code(() => planExport({ width: 20000, height: 2 }, full, null, "#fff"))).toBe("too-large");
+  });
+});
+
+describe("the view of a picture", () => {
+  it("is the region as the picture's pixels make it: the same scale along both axes, about the region's centre", () => {
+    // 100 x 50 units in 1000 x 501 px: a hair taller than the region's shape.
+    const view = exportView({ width: 1000, height: 501, region: { x: 10, y: 20, width: 100, height: 50 } });
+    expect(view.scale).toBeCloseTo(0.1, 12);
+    expect(view.region.width / 1000).toBeCloseTo(view.region.height / 501, 12);
+    expect(view.region.height).toBeCloseTo(50.1, 9);
+    expect(view.cx).toBe(60);
+    expect(view.cy).toBe(45);
+    expect(view.region.x + view.region.width / 2).toBeCloseTo(60, 9);
+    expect(view.region.y + view.region.height / 2).toBeCloseTo(45, 9);
+    // The region asked is inside the one drawn.
+    expect(view.region.height).toBeGreaterThanOrEqual(50);
+  });
+
+  it("refuses a region with no size", () => {
+    expect(code(() => exportView({ width: 10, height: 10, region: { x: 0, y: 0, width: 0, height: 0 } }))).toBe("invalid");
+    expect(code(() => exportView({ width: 10, height: 10, region: { x: 0, y: 0, width: Infinity, height: 5 } }))).toBe("invalid");
+    expect(code(() => planExport({ longEdge: 10, region: { x: 0, y: 0, width: 0, height: 5 } }, null, null, "#fff"))).toBe("invalid");
+  });
+
+  it("is refused closer than the f32 coordinates can place, as the viewer's zoom is", () => {
+    const extents = [-500, -500, 500, 500] as const;
+    const min = minScaleFor(extents);
+    expect(min).toBeCloseTo(1000 * 2 ** -21, 12);
+    expect(code(() => checkScale(min * 0.9, extents))).toBe("invalid");
+    expect(code(() => checkScale(min * 1.1, extents))).toBe("none");
+    // A drawing far from its origin has less precision to give.
+    expect(minScaleFor([1e6, 1e6, 1e6 + 10, 1e6 + 10])).toBeGreaterThan(minScaleFor([0, 0, 10, 10]));
+  });
+});
+
+describe("tiles of a picture", () => {
+  it("are at most the plugin's, the default's or the GPU's, whichever is least, and never past 4096", () => {
+    const gpu = { texture: 16384, renderbuffer: 16384, viewport: [16384, 16384] as const };
+    expect(tileEdge(gpu)).toBe(DEFAULT_TILE);
+    expect(tileEdge(gpu, 64)).toBe(64);
+    expect(tileEdge(gpu, 100000)).toBe(MAX_TILE);
+    expect(tileEdge({ texture: 8192, renderbuffer: 1024, viewport: [8192, 8192] }, 4096)).toBe(1024);
+    expect(tileEdge({ texture: 8192, renderbuffer: 8192, viewport: [8192, 512] })).toBe(512);
+    for (const bad of [0, -3, 1.5, NaN, Infinity]) expect(tileEdge(gpu, bad), String(bad)).toBe(DEFAULT_TILE);
+  });
+
+  it("have each the camera that shows its part of the picture: the same scale, centred where the tile is", () => {
+    const whole = { cx: 100, cy: 50, scale: 0.25, width: 400, height: 200 };
+    // The picture's own tile.
+    expect(tileCamera(whole, { x: 0, y: 0, width: 400, height: 200 })).toEqual(whole);
+    // The bottom left 100 x 100 px: 150 px left of the centre horizontally, 50 below it.
+    expect(tileCamera(whole, { x: 0, y: 0, width: 100, height: 100 })).toEqual({ cx: 100 - 150 * 0.25, cy: 50 - 50 * 0.25, scale: 0.25, width: 100, height: 100 });
+  });
+
+  it("turn the picture's rows (first at the top) into GL's (first at the bottom)", () => {
+    expect(glTile({ height: 200 }, { x: 0, y: 0, width: 100, height: 100 })).toEqual({ x: 0, y: 100, width: 100, height: 100 });
+    expect(glTile({ height: 120 }, { x: 100, y: 100, width: 50, height: 20 })).toEqual({ x: 100, y: 0, width: 50, height: 20 });
+  });
+
+  it("show together the picture's view, each pixel at the same place in the drawing whichever tile has it", () => {
+    const size = { width: 250, height: 130 };
+    const view = exportView({ ...size, region: { x: 1000, y: -400, width: 25, height: 13 } });
+    const whole = { cx: view.cx, cy: view.cy, scale: view.scale, ...size };
+    const world = (cam: { cx: number; scale: number; width: number }, px: number) => cam.cx + (px - cam.width / 2) * cam.scale;
+    const worldY = (cam: { cy: number; scale: number; height: number }, py: number) => cam.cy + (py - cam.height / 2) * cam.scale;
+    const tiles = tilePlan(size.width, size.height, 64);
+    expect(tiles.length).toBe(4 * 3);
+    for (const tile of tiles) {
+      const gl = glTile(size, tile);
+      const cam = tileCamera(whole, gl);
+      // The tile's left and bottom edges in the drawing: the same as the whole picture's pixel there.
+      expect(world(cam, 0)).toBeCloseTo(world(whole, gl.x), 9);
+      expect(worldY(cam, 0)).toBeCloseTo(worldY(whole, gl.y), 9);
+      // And the same as `tileRect`, which the core tests: the tile's rectangle of the region.
+      const r = tileRect(view.region, size, tile, true);
+      expect(world(cam, 0)).toBeCloseTo(r.x, 9);
+      expect(worldY(cam, 0)).toBeCloseTo(r.y, 9);
+      expect(cam.width * cam.scale).toBeCloseTo(r.width, 9);
+      expect(cam.height * cam.scale).toBeCloseTo(r.height, 9);
+    }
+    // The first row of the picture is the top of the region.
+    const top = glTile(size, tiles[0]!);
+    expect(worldY(tileCamera(whole, top), top.height)).toBeCloseTo(view.region.y + view.region.height, 9);
+  });
+});
+
+describe("line weights in a picture", () => {
+  const canvas = { width: 800, height: 600 };
+  const region = { x: 0, y: 0, width: 400, height: 300 };
+
+  it("are the viewer's own by default: the pixel widths as they are, a sheet's at the viewer's zoom on the region", () => {
+    // The viewer fits 400 units in 800 px: 0.5 units per pixel. A picture of 1600 px: 0.25.
+    expect(lineweightFactors(undefined, region, 0.25, canvas)).toEqual({ pixel: 1, paper: 0.5 });
+    expect(lineweightFactors("screen", region, 0.5, canvas)).toEqual({ pixel: 1, paper: 1 });
+    expect(lineweightFactors("screen", region, 1, canvas)).toEqual({ pixel: 1, paper: 2 });
+  });
+
+  it("scaled grow with the picture: as the viewer's zoom raised until the region fills it", () => {
+    // Twice the pixels along a side: twice the width in pixels, and a sheet's lineweight at its real width.
+    expect(lineweightFactors("scaled", region, 0.25, canvas)).toEqual({ pixel: 2, paper: 1 });
+    expect(lineweightFactors("scaled", region, 0.5, canvas)).toEqual({ pixel: 1, paper: 1 });
+    expect(lineweightFactors("scaled", region, 2, canvas)).toEqual({ pixel: 0.25, paper: 1 });
+  });
+
+  it("are the same either way for what the viewer shows, at its own size", () => {
+    const viewer = viewportRegion({ cx: 3, cy: 4, scale: 0.7, ...canvas }, [0, 0]);
+    const view = exportView({ ...canvas, region: viewer });
+    const screen = lineweightFactors("screen", view.region, view.scale, canvas);
+    const scaled = lineweightFactors("scaled", view.region, view.scale, canvas);
+    expect(screen.pixel).toBeCloseTo(1, 12);
+    expect(screen.paper).toBeCloseTo(1, 12);
+    expect(scaled.pixel).toBeCloseTo(1, 12);
+    expect(scaled.paper).toBeCloseTo(1, 12);
+  });
+
+  it("measure the region against the viewer's canvas by the longer side it needs, so that it fits", () => {
+    // A tall region in a wide canvas: the height decides.
+    const tall = { x: 0, y: 0, width: 100, height: 600 };
+    expect(lineweightFactors("scaled", tall, 0.5, canvas).pixel).toBeCloseTo(2, 12);
+  });
+
+  it("take an ordinary screen for a canvas not laid out", () => {
+    expect(referenceCanvas({ width: 1, height: 1 })).toEqual({ width: 1024, height: 768 });
+    expect(referenceCanvas({ width: 63, height: 500 })).toEqual({ width: 1024, height: 768 });
+    expect(referenceCanvas({ width: 64, height: 64 })).toEqual({ width: 64, height: 64 });
+    const hidden = lineweightFactors("scaled", { x: 0, y: 0, width: 1024, height: 768 }, 1, { width: 1, height: 1 });
+    expect(hidden.pixel).toBe(1);
+  });
+});
+
+describe("one picture at a time", () => {
+  const defer = <T = void>() => {
+    let resolve!: (v: T) => void;
+    let reject!: (e: unknown) => void;
+    const promise = new Promise<T>((res, rej) => ((resolve = res), (reject = rej)));
+    return { promise, resolve, reject };
+  };
+  const tick = () => new Promise((r) => setTimeout(r, 0));
+
+  it("runs jobs in order, the next after the last has let go", async () => {
+    const run = serial();
+    const log: string[] = [];
+    const first = defer();
+    const a = run(undefined, async () => (log.push("a start"), await first.promise, log.push("a end"), "a"));
+    const b = run(undefined, async () => (log.push("b"), "b"));
+    await tick();
+    expect(log).toEqual(["a start"]);
+    first.resolve();
+    expect(await Promise.all([a, b])).toEqual(["a", "b"]);
+    expect(log).toEqual(["a start", "a end", "b"]);
+  });
+
+  it("goes on after a job that failed", async () => {
+    const run = serial();
+    const a = run(undefined, () => Promise.reject(new Error("no")));
+    await expect(a).rejects.toThrow("no");
+    expect(await run(undefined, async () => 2)).toBe(2);
+  });
+
+  it("rejects a job aborted while it waits, at once, and never runs it", async () => {
+    const run = serial();
+    const first = defer();
+    const a = run(undefined, () => first.promise);
+    const abort = new AbortController();
+    let ran = false;
+    const b = run(abort.signal, async () => ((ran = true), 1));
+    abort.abort();
+    expect(await codeOf(b)).toBe("aborted");
+    first.resolve();
+    await a;
+    await tick();
+    expect(ran).toBe(false);
+  });
+
+  it("rejects a job aborted while it runs at once, and lets the next start only when it has let go", async () => {
+    const run = serial();
+    const abort = new AbortController();
+    const working = defer();
+    const log: string[] = [];
+    const a = run(abort.signal, async () => (await working.promise, log.push("a freed")));
+    const b = run(undefined, async () => (log.push("b"), "b"));
+    await tick();
+    abort.abort();
+    expect(await codeOf(a)).toBe("aborted");
+    await tick();
+    expect(log).toEqual([]);
+    working.resolve();
+    expect(await b).toBe("b");
+    expect(log).toEqual(["a freed", "b"]);
+  });
+
+  it("does not run a job whose signal was aborted before it was asked", async () => {
+    const run = serial();
+    const abort = new AbortController();
+    abort.abort();
+    let ran = false;
+    expect(await codeOf(run(abort.signal, async () => ((ran = true), 1)))).toBe("aborted");
+    expect(ran).toBe(false);
+  });
+
+  it("drops the answer of work that went on after its abort, without an unhandled rejection", async () => {
+    const abort = new AbortController();
+    const work = defer<number>();
+    const p = abortable(work.promise, abort.signal);
+    abort.abort();
+    expect(await codeOf(p)).toBe("aborted");
+    work.reject(new Error("late"));
+    await tick();
+  });
+
+  it("links signals, and lets go of them", () => {
+    const one = new AbortController();
+    const two = new AbortController();
+    const both = linked([one.signal, undefined, two.signal]);
+    expect(both.signal.aborted).toBe(false);
+    two.abort();
+    expect(both.signal.aborted).toBe(true);
+    const three = new AbortController();
+    const detached = linked([three.signal]);
+    detached.dispose();
+    three.abort();
+    expect(detached.signal.aborted).toBe(false);
+    const done = new AbortController();
+    done.abort();
+    expect(linked([done.signal]).signal.aborted).toBe(true);
+  });
+});
diff --git a/crates/exav-viewer/ts/cad/raster.ts b/crates/exav-viewer/ts/cad/raster.ts
new file mode 100644
index 00000000..ea14af96
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/raster.ts
@@ -0,0 +1,275 @@
+/**
+ * The arithmetic of a drawing's pictures (`pictures.raster`) and of its
+ * viewport: no DOM, no GL.
+ *
+ * Regions are rectangles in drawing units, y up: the file's own coordinates
+ * in model space, the sheet's in a paper layout. A layout is its own space:
+ * the model, the sheet and each viewport (a window onto the model, scaled and
+ * clipped) do not share coordinates. The buffers and the camera work in
+ * "local" coordinates, the drawing's `origin` less; the functions here take
+ * and give drawing units unless they say otherwise.
+ */
+import { planRect, RasterError, type RectPlan, type Tile } from "../core/pictures.js";
+import type { RasterOptions, RasterRect, Viewport } from "../core/types.js";
+import { FIT_MARGIN } from "./renderer/camera.js";
+
+/** The tiles a picture is cut in unless the plugin says otherwise, and the most it may say (px a side). */
+export const DEFAULT_TILE = 2048;
+export const MAX_TILE = 4096;
+
+/** What the GPU holds: the smallest of these is the largest drawing buffer. */
+export interface GpuLimits {
+  texture: number;
+  renderbuffer: number;
+  viewport: readonly [number, number];
+}
+
+/**
+ * The side, in pixels, of the tiles a picture is drawn in: `forced` (the
+ * plugin's `rasterTile`) when it is a whole number of pixels, else
+ * `DEFAULT_TILE`, never past `MAX_TILE` or what the GPU holds.
+ */
+export function tileEdge(limits: GpuLimits, forced?: number): number {
+  const gpu = Math.min(limits.texture, limits.renderbuffer, limits.viewport[0], limits.viewport[1]);
+  const wanted = Number.isSafeInteger(forced) && (forced as number) >= 1 ? (forced as number) : DEFAULT_TILE;
+  return Math.max(1, Math.min(wanted, MAX_TILE, gpu));
+}
+
+/** Where a layout is drawn, and which pages are which layouts. */
+export interface LayoutRef {
+  id: string;
+  name: string;
+  isModel: boolean;
+}
+
+/**
+ * The layout a request is for and its page. `options.layout` (an id of the
+ * layouts controller: "" is model space) wins over `page`, which is the
+ * layout's place in that list plus one.
+ */
+export function layoutFor(layouts: readonly LayoutRef[], page: number, options: Pick<RasterOptions, "layout">): { id: string; page: number } {
+  if (options.layout !== undefined) {
+    const i = typeof options.layout === "string" ? layouts.findIndex((l) => l.id === options.layout) : -1;
+    if (i < 0) throw new RasterError("invalid", `no layout ${JSON.stringify(options.layout)}`);
+    return { id: layouts[i]!.id, page: i + 1 };
+  }
+  const found = layouts[page - 1];
+  if (!found) throw new RasterError("invalid", `no page ${String(page)}`);
+  return { id: found.id, page };
+}
+
+/** The viewport's rectangle when it is that of layout `id`, else null. */
+export function currentFor(viewport: Viewport | null, id: string): RasterRect | null {
+  if (!viewport || viewport.space !== "drawing" || viewport.layout !== id) return null;
+  const r = viewport.region;
+  return "width" in r ? { x: r.x, y: r.y, width: r.width, height: r.height } : null;
+}
+
+/**
+ * What the drawing shows when no region is asked: its extents (`[minX, minY,
+ * maxX, maxY]` relative to `origin`) with the margin the viewer's fit leaves.
+ * A line has no height, nor a point any size: a side is at least a hundredth
+ * of the longer one, and an empty layout is one unit wide.
+ */
+export function defaultRegion(extents: readonly [number, number, number, number], origin: readonly [number, number]): RasterRect {
+  const [minX, minY, maxX, maxY] = extents;
+  let w = maxX - minX;
+  let h = maxY - minY;
+  const longest = Math.max(w, h);
+  if (!(longest > 0) || !Number.isFinite(longest)) {
+    w = h = 1;
+  } else {
+    w = Math.max(w, longest / 100);
+    h = Math.max(h, longest / 100);
+  }
+  const width = w * (1 + 2 * FIT_MARGIN);
+  const height = h * (1 + 2 * FIT_MARGIN);
+  const cx = origin[0] + (minX + maxX) / 2;
+  const cy = origin[1] + (minY + maxY) / 2;
+  return { x: cx - width / 2, y: cy - height / 2, width, height };
+}
+
+/**
+ * The size, region and ground of a picture; null while the region is not
+ * known (no region asked, and the layout's extents not read yet): then
+ * `full` is needed.
+ */
+export function planExport(options: RasterOptions, full: RasterRect | null, current: RasterRect | null, ground: string): RectPlan | null {
+  if (options.lineweight !== undefined && options.lineweight !== "screen" && options.lineweight !== "scaled") {
+    throw new RasterError("invalid", "lineweight is screen or scaled");
+  }
+  if (options.region === undefined && !full) return null;
+  return planRect(options, full ?? { x: 0, y: 0, width: 1, height: 1 }, { x: 1, y: 1 }, current, ground);
+}
+
+/** What is drawn: the plan's region as the picture's pixels make it. */
+export interface ExportView {
+  /** The rectangle the picture shows, exactly: `width` and `height` pixels of `scale` units each. */
+  region: RasterRect;
+  /** Its centre. */
+  cx: number;
+  cy: number;
+  /** Drawing units per pixel, the same along both axes. */
+  scale: number;
+}
+
+/**
+ * The view of a picture of `width` by `height` px that shows the plan's
+ * region. A picture rounded to whole pixels is a hair off the region's
+ * shape, and the renderer has one scale: the region is widened by that hair
+ * (about its centre), and the result is what `Raster.region` reports.
+ */
+export function exportView(plan: Pick<RectPlan, "width" | "height" | "region">): ExportView {
+  const { width, height, region } = plan;
+  const scale = Math.max(region.width / width, region.height / height);
+  if (!(scale > 0) || !Number.isFinite(scale)) throw new RasterError("invalid", "the region has no size");
+  const cx = region.x + region.width / 2;
+  const cy = region.y + region.height / 2;
+  return { region: { x: cx - (width * scale) / 2, y: cy - (height * scale) / 2, width: width * scale, height: height * scale }, cx, cy, scale };
+}
+
+/**
+ * How near the picture may be to the drawing: past a few f32 steps of its
+ * coordinates per pixel (the viewer's own zoom limit) vertices snap and lines
+ * wobble. `extents` and the view are in local coordinates' units.
+ */
+export function minScaleFor(extents: readonly [number, number, number, number]): number {
+  const [minX, minY, maxX, maxY] = extents;
+  const size = Math.max(maxX - minX, maxY - minY, 1e-9);
+  const reach = Math.max(Math.abs(minX), Math.abs(minY), Math.abs(maxX), Math.abs(maxY), size);
+  return reach * 2 ** -21;
+}
+
+/** Refuses a picture closer than the f32 coordinates can place. */
+export function checkScale(scale: number, extents: readonly [number, number, number, number]): void {
+  const min = minScaleFor(extents);
+  if (scale < min) throw new RasterError("invalid", `the region is too small for the drawing's precision (${scale} units per pixel, at least ${min})`);
+}
+
+/** A tile as GL counts pixels: from the picture's bottom left. */
+export function glTile(size: { height: number }, tile: Tile): Tile {
+  return { x: tile.x, y: size.height - tile.y - tile.height, width: tile.width, height: tile.height };
+}
+
+/**
+ * The camera that shows a tile of a picture, given the camera of the whole
+ * picture (centre and scale in local units, size in pixels) and the tile in
+ * GL pixels (`glTile`): the same scale, centred where the tile is.
+ */
+export function tileCamera(
+  whole: { cx: number; cy: number; scale: number; width: number; height: number },
+  tile: Tile,
+): { cx: number; cy: number; scale: number; width: number; height: number } {
+  return {
+    cx: whole.cx + (tile.x + tile.width / 2 - whole.width / 2) * whole.scale,
+    cy: whole.cy + (tile.y + tile.height / 2 - whole.height / 2) * whole.scale,
+    scale: whole.scale,
+    width: tile.width,
+    height: tile.height,
+  };
+}
+
+/**
+ * The viewer's canvas, in device pixels, that "scaled" line weights are
+ * measured against; a canvas not laid out (hidden, a pixel wide) is taken as
+ * an ordinary screen.
+ */
+export function referenceCanvas(canvas: { width: number; height: number }): { width: number; height: number } {
+  return canvas.width >= 64 && canvas.height >= 64 ? { width: canvas.width, height: canvas.height } : { width: 1024, height: 768 };
+}
+
+/**
+ * How line widths are drawn in a picture, as two factors on the viewer's own:
+ * `pixel` on the widths that are in pixels (model space, and every line's
+ * minimum of one pixel), `paper` on the widths that are on the sheet (a
+ * layout's lineweights, drawing units per hundredth of a millimetre).
+ *
+ * "screen" (default): lines are as many pixels wide as the viewer draws them
+ * when its canvas shows `region` (the zoom that fits the region in the
+ * canvas), whatever the picture's size. "scaled": as if the viewer's zoom were
+ * raised from there until the region filled the picture, which is `k` times
+ * the pixels per unit, `k = fit scale / scale` (the units per pixel the
+ * viewer has when it fits `region`, over the picture's): every width in
+ * pixels grows `k` times, and a sheet's lineweights keep their real width on
+ * the page. With `region: "current"` at the canvas's size `k` is 1, and the
+ * two are the same.
+ */
+export function lineweightFactors(
+  mode: "screen" | "scaled" | undefined,
+  region: RasterRect,
+  scale: number,
+  canvas: { width: number; height: number },
+): { pixel: number; paper: number } {
+  const ref = referenceCanvas(canvas);
+  const fit = Math.max(region.width / ref.width, region.height / ref.height);
+  const k = fit / scale;
+  return mode === "scaled" ? { pixel: k, paper: 1 } : { pixel: 1, paper: 1 / k };
+}
+
+/**
+ * The region a camera shows, in drawing units: its centre and scale are in
+ * local coordinates, `origin` is added back.
+ */
+export function viewportRegion(camera: { cx: number; cy: number; scale: number; width: number; height: number }, origin: readonly [number, number]): RasterRect {
+  const width = camera.width * camera.scale;
+  const height = camera.height * camera.scale;
+  return { x: origin[0] + camera.cx - width / 2, y: origin[1] + camera.cy - height / 2, width, height };
+}
+
+const nothing = () => {};
+
+/**
+ * `promise`, or a `RasterError` "aborted" as soon as `signal` aborts: the
+ * work behind the promise goes on until it can stop (a worker's tessellation
+ * cannot be interrupted), its result dropped.
+ */
+export function abortable<T>(promise: Promise<T>, signal: AbortSignal | undefined): Promise<T> {
+  if (!signal) return promise;
+  if (signal.aborted) {
+    promise.catch(nothing);
+    return Promise.reject(new RasterError("aborted", "aborted"));
+  }
+  return new Promise<T>((resolve, reject) => {
+    const abort = () => reject(new RasterError("aborted", "aborted"));
+    signal.addEventListener("abort", abort, { once: true });
+    promise.then(resolve, reject).finally(() => signal.removeEventListener("abort", abort));
+  });
+}
+
+/**
+ * A queue that runs its jobs one at a time, in order: one picture at a time
+ * per session, whatever the number asked for. A job aborted while it waits
+ * is rejected at once and never runs; one aborted while it runs is rejected
+ * at once too, and the next job starts when it has let go of what it holds.
+ */
+export function serial(): <T>(signal: AbortSignal | undefined, job: () => Promise<T>) => Promise<T> {
+  let tail: Promise<unknown> = Promise.resolve();
+  return (signal, job) => {
+    const run = tail.then(() => {
+      if (signal?.aborted) throw new RasterError("aborted", "aborted");
+      return job();
+    });
+    tail = run.then(nothing, nothing);
+    return abortable(run, signal);
+  };
+}
+
+/** A signal that aborts when any of `signals` does; `dispose` detaches it from them. */
+export function linked(signals: readonly (AbortSignal | undefined)[]): { signal: AbortSignal; dispose(): void } {
+  const control = new AbortController();
+  const hooks: [AbortSignal, () => void][] = [];
+  for (const s of signals) {
+    if (!s) continue;
+    if (s.aborted) control.abort();
+    else {
+      const abort = () => control.abort();
+      s.addEventListener("abort", abort, { once: true });
+      hooks.push([s, abort]);
+    }
+  }
+  return { signal: control.signal, dispose: () => hooks.forEach(([s, abort]) => s.removeEventListener("abort", abort)) };
+}
+
+export function sameRect(a: RasterRect, b: RasterRect): boolean {
+  return a.x === b.x && a.y === b.y && a.width === b.width && a.height === b.height;
+}
diff --git a/crates/exav-viewer/ts/cad/renderer/camera.test.ts b/crates/exav-viewer/ts/cad/renderer/camera.test.ts
index 0f0df6ad..63e1de50 100644
--- a/crates/exav-viewer/ts/cad/renderer/camera.test.ts
+++ b/crates/exav-viewer/ts/cad/renderer/camera.test.ts
@@ -68,6 +68,18 @@ describe('Camera', () => {
     expect(c.scale).toBeCloseTo(4, 6)
   })
 
+  it('zooms no closer than f32 allows the drawing, nor further than twenty fits', () => {
+    const c = cam()
+    // A plan 100 across, 1,000,000 from its origin.
+    const extents: [number, number, number, number] = [1e6, 1e6, 1e6 + 100, 1e6 + 100]
+    c.fit(extents)
+    c.limit(extents)
+    for (let i = 0; i < 200; i++) c.zoomAt(10, 10, 2)
+    expect(c.scale).toBeCloseTo((1e6 + 100) * 2 ** -21, 9)
+    for (let i = 0; i < 200; i++) c.zoomAt(10, 10, 0.5)
+    expect(c.scale).toBeCloseTo((100 * 20) / Math.min(c.width, c.height), 9)
+  })
+
   it('pans by exactly the pixel delta given', () => {
     const c = cam()
     c.scale = 0.5
diff --git a/crates/exav-viewer/ts/cad/renderer/camera.ts b/crates/exav-viewer/ts/cad/renderer/camera.ts
index 82e72af8..976ed28f 100644
--- a/crates/exav-viewer/ts/cad/renderer/camera.ts
+++ b/crates/exav-viewer/ts/cad/renderer/camera.ts
@@ -1,3 +1,6 @@
+/** What `Camera.fit` leaves free on each side of the extents, as a fraction of their size. */
+export const FIT_MARGIN = 0.04
+
 /**
  * Orthographic 2D camera.
  *
@@ -15,8 +18,25 @@ export class Camera {
   width = 1
   height = 1
 
-  /** Frame the given extents with a margin, as a fraction of the view. */
-  fit(extents: [number, number, number, number], margin = 0.04) {
+  /** How far the view may zoom in and out, as bounds on `scale`. */
+  minScale = 0
+  maxScale = Infinity
+
+  /**
+   * Bound the zoom for a drawing of these extents: in, to where a pixel is
+   * still a few f32 steps of its coordinates (past it, vertices snap and
+   * lines wobble); out, to twenty times the view that fits it.
+   */
+  limit(extents: [number, number, number, number]) {
+    const [minX, minY, maxX, maxY] = extents
+    const size = Math.max(maxX - minX, maxY - minY, 1e-9)
+    const reach = Math.max(Math.abs(minX), Math.abs(minY), Math.abs(maxX), Math.abs(maxY), size)
+    this.minScale = reach * 2 ** -21
+    this.maxScale = (size * 20) / Math.max(1, Math.min(this.width, this.height))
+  }
+
+  /** Frame the given extents with a margin on each side, as a fraction of their size. */
+  fit(extents: [number, number, number, number], margin = FIT_MARGIN) {
     const [minX, minY, maxX, maxY] = extents
     const w = Math.max(maxX - minX, 1e-9)
     const h = Math.max(maxY - minY, 1e-9)
@@ -48,7 +68,7 @@ export class Camera {
    */
   zoomAt(sx: number, sy: number, factor: number) {
     const [bx, by] = this.toLocal(sx, sy)
-    this.scale /= factor
+    this.scale = Math.min(this.maxScale, Math.max(this.minScale, this.scale / factor))
     const [ax, ay] = this.toLocal(sx, sy)
     this.cx += bx - ax
     this.cy += by - ay
diff --git a/crates/exav-viewer/ts/cad/renderer/fonts.ts b/crates/exav-viewer/ts/cad/renderer/fonts.ts
index 05d58856..3fa053b8 100644
--- a/crates/exav-viewer/ts/cad/renderer/fonts.ts
+++ b/crates/exav-viewer/ts/cad/renderer/fonts.ts
@@ -89,6 +89,17 @@ export const CAP_RATIO: Record<FamilyName, number> = {
   mono: 0.658691, // Cousine, 1349 / 2048
 }
 
+/**
+ * How far below the baseline each family's descenders reach, in cap heights
+ * (OS/2 sTypoDescender over sCapHeight): where Bottom alignment puts the
+ * baseline. `descent` in crates/exav-render/src/formats/dwg/text.rs has the same.
+ */
+export const DESCENT: Record<FamilyName, number> = {
+  sans: 434 / 1409,
+  serif: 442 / 1341,
+  mono: 615 / 1349,
+}
+
 export interface Face {
   family: FamilyName
   bold: boolean
diff --git a/crates/exav-viewer/ts/cad/renderer/glyph-atlas.ts b/crates/exav-viewer/ts/cad/renderer/glyph-atlas.ts
index 2decd9cc..41a632c7 100644
--- a/crates/exav-viewer/ts/cad/renderer/glyph-atlas.ts
+++ b/crates/exav-viewer/ts/cad/renderer/glyph-atlas.ts
@@ -19,7 +19,8 @@
  * could not honour.
  */
 
-import { CAP_RATIO, cssFont, decodeFace, type Face } from './fonts.js'
+import { CAP_RATIO, DESCENT, cssFont, decodeFace, type Face } from './fonts.js'
+import { convertCells } from './sdf.js'
 
 /**
  * Smallest and largest em to rasterise at.
@@ -42,6 +43,8 @@ const MAX_ATLAS_WIDTH = 4096
 const DEFAULT_MAX_SIZE = 4096
 /** Space between cells, so linear filtering cannot bleed one into the next. */
 const PAD = 3
+/** Longest the distance fields are made without giving the thread back, in ms (`buildAsync`). */
+const FIELD_SLICE_MS = 8
 
 /**
  * Bring an em into the range the atlas will rasterise at.
@@ -127,6 +130,14 @@ export class GlyphAtlas {
     overflowed: boolean,
     contexts: Map<number, CanvasRenderingContext2D>,
     private emPx: number,
+    private fields = false,
+    private fieldWork: {
+      ctx: CanvasRenderingContext2D
+      cells: Cell[]
+      spread: number
+      width: number
+      height: number
+    } | null = null,
   ) {
     this.canvas = canvas
     this.glyphs = glyphs
@@ -150,6 +161,11 @@ export class GlyphAtlas {
     return CAP_RATIO[decodeFace(faceByte).family]
   }
 
+  /** How far the face's descenders reach below the baseline, in cap heights. */
+  descent(faceByte: number): number {
+    return DESCENT[decodeFace(faceByte).family]
+  }
+
   /**
    * Extra advance between two characters, in em units.
    *
@@ -200,18 +216,48 @@ export class GlyphAtlas {
     requests: Iterable<GlyphRequest>,
     maxSize = DEFAULT_MAX_SIZE,
     targetEm = 256,
+    sdf = false,
   ): GlyphAtlas {
+    const atlas = GlyphAtlas.fit(requests, maxSize, targetEm, sdf)
+    for (const _ of atlas.convertFields(Infinity)) void _
+    return atlas
+  }
+
+  /**
+   * `build`, giving the thread back through `pause` while the distance fields
+   * are made, which takes longer than a frame: for an atlas built while the
+   * page is in use.
+   */
+  static async buildAsync(
+    requests: Iterable<GlyphRequest>,
+    maxSize: number,
+    targetEm: number,
+    sdf: boolean,
+    pause: () => Promise<void>,
+  ): Promise<GlyphAtlas> {
+    const atlas = GlyphAtlas.fit(requests, maxSize, targetEm, sdf)
+    for (const _ of atlas.convertFields(FIELD_SLICE_MS)) await pause()
+    return atlas
+  }
+
+  /** The page, before its distance fields. */
+  private static fit(requests: Iterable<GlyphRequest>, maxSize: number, targetEm: number, sdf: boolean): GlyphAtlas {
     const unique = [...requests]
     const width = Math.min(maxSize, MAX_ATLAS_WIDTH)
     let em = clampEm(targetEm)
-    let atlas = GlyphAtlas.pack(unique, em, width, maxSize)
+    let atlas = GlyphAtlas.pack(unique, em, width, maxSize, sdf)
     while (atlas.overflowed && em > MIN_EM) {
       em = Math.max(MIN_EM, Math.floor(em / 2))
-      atlas = GlyphAtlas.pack(unique, em, width, maxSize)
+      atlas = GlyphAtlas.pack(unique, em, width, maxSize, sdf)
     }
     return atlas
   }
 
+  /** The cells hold distance fields (`sdf.ts`) rather than coverage. */
+  get sdf(): boolean {
+    return this.fields
+  }
+
   /** Em size this page was rasterised at. */
   get em(): number {
     return this.emPx
@@ -222,7 +268,10 @@ export class GlyphAtlas {
     emPx: number,
     atlasWidth: number,
     maxHeight: number,
+    sdf: boolean,
   ): GlyphAtlas {
+    // A field needs room around the ink for the distances it stores.
+    const margin = sdf ? Math.max(2, Math.ceil(emPx / 8)) : INK_MARGIN
     // Deduplicate and order, so an atlas is the same whatever order the runs
     // arrived in.
     const wanted = new Map<string, GlyphRequest>()
@@ -270,8 +319,8 @@ export class GlyphAtlas {
       const inkDescent = m.actualBoundingBoxDescent ?? 0
       const inkW = Math.ceil(inkLeft + inkRight)
       const inkH = Math.ceil(inkAscent + inkDescent)
-      const w = inkW + INK_MARGIN * 2
-      const h = inkH + INK_MARGIN * 2
+      const w = inkW + margin * 2
+      const h = inkH + margin * 2
 
       // Whitespace is judged on the ink, not the padded box, which is never
       // empty.
@@ -325,7 +374,7 @@ export class GlyphAtlas {
     const canvas = document.createElement('canvas')
     canvas.width = atlasWidth
     canvas.height = height
-    const ctx = canvas.getContext('2d')!
+    const ctx = canvas.getContext('2d', { willReadFrequently: sdf })!
     // Opaque black ground: coverage then lands in the red channel.
     ctx.fillStyle = '#000'
     ctx.fillRect(0, 0, atlasWidth, height)
@@ -342,7 +391,7 @@ export class GlyphAtlas {
         currentFace = c.faceByte
       }
       // Inset by the margin, so the ink has blank rows on every side of it.
-      ctx.fillText(c.ch, c.x + INK_MARGIN + c.inkLeft, c.y + INK_MARGIN + c.inkAscent)
+      ctx.fillText(c.ch, c.x + margin + c.inkLeft, c.y + margin + c.inkAscent)
       // The quad covers the whole cell, margin included, so the glyph keeps its
       // place. All four scale about the pen on the baseline, so correcting the
       // rasteriser's size does not move the glyph off it. The advance is not
@@ -353,14 +402,31 @@ export class GlyphAtlas {
         v0: c.y / height,
         u1: (c.x + c.w) / atlasWidth,
         v1: (c.y + c.h) / height,
-        left: (-(c.inkLeft + INK_MARGIN) / emPx) * s,
-        bottom: (-(c.inkDescent + INK_MARGIN) / emPx) * s,
+        left: (-(c.inkLeft + margin) / emPx) * s,
+        bottom: (-(c.inkDescent + margin) / emPx) * s,
         width: (c.w / emPx) * s,
         height: (c.h / emPx) * s,
         advance: c.advance / emPx,
       })
     }
 
-    return new GlyphAtlas(canvas, glyphs, overflowed, contexts, emPx)
+    // Each cell's coverage, in the red channel, becomes its field: `convertFields`.
+    const fields = sdf && cells.length > 0 ? { ctx, cells, spread: margin / 2, width: atlasWidth, height } : null
+    return new GlyphAtlas(canvas, glyphs, overflowed, contexts, emPx, sdf, fields)
+  }
+
+  /**
+   * Turns the page's coverage into distance fields, if it is to hold them. The
+   * page is not to be used before the generator is done. It yields about every
+   * `sliceMs`, for a caller that lets the page run between slices.
+   */
+  *convertFields(sliceMs: number): Generator<void> {
+    const work = this.fieldWork
+    this.fieldWork = null
+    if (!work) return
+    const image = work.ctx.getImageData(0, 0, work.width, work.height)
+    yield
+    yield* convertCells(image.data, work.width, work.cells, work.spread, sliceMs)
+    work.ctx.putImageData(image, 0, 0)
   }
 }
diff --git a/crates/exav-viewer/ts/cad/renderer/renderer.ts b/crates/exav-viewer/ts/cad/renderer/renderer.ts
index bdef8f14..a9cf9432 100644
--- a/crates/exav-viewer/ts/cad/renderer/renderer.ts
+++ b/crates/exav-viewer/ts/cad/renderer/renderer.ts
@@ -1,15 +1,34 @@
+import { tileCamera } from '../raster.js'
 import { Camera } from './camera.js'
 import { GlyphAtlas, clampEm, type GlyphRequest } from './glyph-atlas.js'
-import { FILL_FRAG, FILL_VERT, STROKE_FRAG, STROKE_VERT, TEXT_FRAG, TEXT_VERT } from './shaders.js'
+import { CLIP_FRAG, CLIP_VERT, FILL_FRAG, FILL_VERT, STROKE_FRAG, STROKE_VERT, TEXT_FRAG, TEXT_VERT } from './shaders.js'
 import { GLYPH_BYTES, glyphsNeeded, layoutText } from './text-layout.js'
-import { targetEmFor } from './text-resolution.js'
-import { decodeTiles, rangeTotal, viewMargin, visibleRanges, type Range, type Tile } from './tiles.js'
+import { cappedByBudget, targetEmFor } from './text-resolution.js'
+import {
+  decodeRuns,
+  decodeTiles,
+  rangeTotal,
+  viewMargin,
+  visibleRanges,
+  wholeTiles,
+  type Range,
+  type Run,
+  type Tile,
+} from './tiles.js'
 import { FILL_BYTES, STROKE_BYTES, type ParsedDrawing } from '../types.js'
 
 /** Device pixels per 1/100 mm at 100% zoom, before `lineweightScale`. */
 const PX_PER_HUNDREDTH_MM = 0.0378
 /** Width of the layer visibility texture; `layerVisible` in shaders.ts indexes by it. */
 const LAYER_ROW = 256
+/** `uStrokePass` in shaders.ts: every pixel, the fully covered core, the fringe. */
+const STROKE_WHOLE = 0
+const STROKE_CORES = 1
+const STROKE_FRINGES = 2
+/** `uTextPass` in shaders.ts: every glyph pixel, those at least half covered, the others. */
+const TEXT_WHOLE = 0
+const TEXT_CORES = 1
+const TEXT_EDGES = 2
 
 function compile(gl: WebGL2RenderingContext, type: number, src: string): WebGLShader {
   const sh = gl.createShader(type)!
@@ -76,6 +95,15 @@ export class Renderer {
   private textVao: WebGLVertexArrayObject | null = null
   private atlasTex: WebGLTexture | null = null
   glyphCount = 0
+  /** Glyph instances by clip region, 0 (none) first; see text-layout.ts. */
+  private glyphRanges: { clip: number; start: number; count: number }[] = []
+
+  // Clip regions: their triangles in one buffer, and each region's vertices in it.
+  private clipProg: WebGLProgram
+  private clipU: Uniforms
+  private clipBuf: WebGLBuffer | null = null
+  private clipVao: WebGLVertexArrayObject | null = null
+  private clipRegions: { first: number; count: number }[] = []
 
   // Kept so the atlas can be rasterised again at a different size when the
   // zoom changes. See `text-resolution.ts`.
@@ -84,17 +112,20 @@ export class Renderer {
   private glyphRequests: GlyphRequest[] = []
   /** Em the current atlas was rasterised at, or 0 when there is none. */
   private atlasEm = 0
+  /** The atlas holds distance fields: the budget capped its em. */
+  private atlasSdf = false
   /** Pending debounced check, so a pinch rebuilds once when it settles. */
   private textResolutionTimer = 0
+  /** A page is being made by `refreshText`. */
+  private refreshing = false
+  /** Counts the drawings whose text was set, to tell a page made for an earlier one. */
+  private textDrawing = 0
 
   private layerTex: WebGLTexture
   private layerVis = new Uint8Array(LAYER_ROW)
 
   private strokeCount = 0
   private fillCount = 0
-  /** Leading, opaque part of each buffer; the rest draws without depth writes. */
-  private opaqueStrokes = 0
-  private opaqueFills = 0
   private maxOrder = 1
 
   // Spatial buckets, so a view only draws what it touches. See tiles.ts.
@@ -103,6 +134,8 @@ export class Renderer {
   /** Leading tiles of each table that cover the opaque half. */
   private opaqueStrokeTiles = 0
   private opaqueFillTiles = 0
+  /** The translucent tiles, fills and strokes, in draw order. */
+  private translucentRuns: Run[] = []
   /** What the last frame actually submitted, for diagnostics. */
   drawnStrokes = 0
   drawnFills = 0
@@ -110,15 +143,39 @@ export class Renderer {
   drawCalls = 0
 
   background: [number, number, number] = [1, 1, 1]
-  lineweights = true
+  /** "drawing" follows the drawing's `$LWDISPLAY`; the others override it. */
+  lineweights: 'drawing' | 'always' | 'never' = 'drawing'
+  /** Everything in ink, as monochrome.ctb plots it. */
+  monochrome = false
   /** The drawing on screen is a paper-space sheet, not model space. */
   paperSpace = false
   lineweightScale = 1
+  /** From the drawing: its lineweights are shown, and a sheet's millimetres per unit. */
+  private drawingLineweights = true
+  private mmPerUnit = 1
+  /** A layout's paper, drawn under it (`drawPaper`); null in model space. */
+  private paper: [number, number, number, number] | null = null
   /** Runs whose glyphs could not be rasterised, from the last setDrawing(). */
   skippedTextRuns = 0
 
+  /** A renderer for one picture (see the constructor). */
+  private readonly picture: boolean
+  /** Device pixels per CSS pixel that line widths are drawn for; null follows the window. */
+  pixelRatio: number | null = null
+  /** Factor on the widths that are on a sheet (`lineWorld`); see `lineweightFactors` in ../raster.ts. */
+  paperWidthScale = 1
+  /** The ground's opacity: 0 draws on transparency, and then no sheet or surround is drawn. */
+  backgroundAlpha = 1
+  /** A picture drawn in tiles: the view of the whole picture, and where the tile drawn is in it (from the bottom left). */
+  private whole: { cx: number; cy: number; scale: number; width: number; height: number } | null = null
+  private tileOrigin: [number, number] = [0, 0]
+
   private frame = 0
   private disposed = false
+  /** The camera of the last frame drawn: what the canvas shows. */
+  readonly drawn = { cx: 0, cy: 0, scale: 1, width: 1, height: 1 }
+  /** Called after each frame is drawn, with `drawn` up to date. */
+  onDraw: (() => void) | null = null
   /** First stroke the per-instance attributes currently point at. */
   private strokeInstanceOffset = 0
 
@@ -139,15 +196,28 @@ export class Renderer {
     gl.vertexAttribPointer(3, 4, gl.UNSIGNED_BYTE, true, STROKE_BYTES, base + 16)
     gl.vertexAttribIPointer(4, 1, gl.UNSIGNED_INT, STROKE_BYTES, base + 20)
     gl.vertexAttribIPointer(5, 1, gl.UNSIGNED_INT, STROKE_BYTES, base + 24)
+    gl.vertexAttribPointer(6, 1, gl.FLOAT, false, STROKE_BYTES, base + 28)
   }
 
-  constructor(private canvas: HTMLCanvasElement) {
-    const gl = canvas.getContext('webgl2', {
-      alpha: false,
+  /**
+   * With `picture`, a renderer for one picture of the drawing (an export) on
+   * a canvas of its own: nothing is drawn until `paint`, the camera is set by
+   * the caller, and the context has an alpha channel when `alpha` is true
+   * (premultiplied, as the browser composites it).
+   */
+  constructor(
+    private canvas: HTMLCanvasElement | OffscreenCanvas,
+    picture?: { alpha: boolean },
+  ) {
+    this.picture = picture !== undefined
+    const gl = (canvas as HTMLCanvasElement).getContext('webgl2', {
+      alpha: picture?.alpha ?? false,
+      premultipliedAlpha: true,
       antialias: false,
       depth: true,
-      stencil: false,
-      desynchronized: true,
+      // Clip regions mask the text that crosses them.
+      stencil: true,
+      desynchronized: !picture,
       powerPreference: 'high-performance',
       preserveDrawingBuffer: false,
     })
@@ -157,15 +227,18 @@ export class Renderer {
     this.strokeProg = link(gl, STROKE_VERT, STROKE_FRAG)
     this.fillProg = link(gl, FILL_VERT, FILL_FRAG)
     this.textProg = link(gl, TEXT_VERT, TEXT_FRAG)
-    const common = ['uCenter', 'uScale', 'uViewport', 'uLayerVis', 'uBgLuma', 'uMaxOrder']
+    this.clipProg = link(gl, CLIP_VERT, CLIP_FRAG)
+    this.clipU = uniforms(gl, this.clipProg, ['uCenter', 'uScale', 'uViewport'])
+    const common = ['uCenter', 'uScale', 'uViewport', 'uLayerVis', 'uBgLuma', 'uMaxOrder', 'uMono']
     this.strokeU = uniforms(gl, this.strokeProg, [
       ...common,
       'uLineScale',
       'uMinWidth',
       'uLineWorld',
+      'uStrokePass',
     ])
     this.fillU = uniforms(gl, this.fillProg, [...common, 'uBackground'])
-    this.textU = uniforms(gl, this.textProg, [...common, 'uAtlas'])
+    this.textU = uniforms(gl, this.textProg, [...common, 'uAtlas', 'uTextPass', 'uSdf'])
 
     // Unit quad as a triangle strip, shared by every stroke instance.
     this.quadBuf = gl.createBuffer()!
@@ -221,14 +294,42 @@ export class Renderer {
     const gl = this.gl
     this.strokeCount = d.strokes.byteLength / STROKE_BYTES
     this.fillCount = d.fills.byteLength / FILL_BYTES
-    this.opaqueStrokes = Math.min(d.opaqueStrokes, this.strokeCount)
-    this.opaqueFills = Math.min(d.opaqueFills, this.fillCount)
+    const opaqueStrokes = Math.min(d.opaqueStrokes, this.strokeCount)
+    const opaqueFills = Math.min(d.opaqueFills, this.fillCount)
     this.strokeTiles = d.strokeTiles ? decodeTiles(d.strokeTiles) : []
     this.fillTiles = d.fillTiles ? decodeTiles(d.fillTiles) : []
     this.opaqueStrokeTiles = Math.min(d.opaqueStrokeTiles ?? 0, this.strokeTiles.length)
     this.opaqueFillTiles = Math.min(d.opaqueFillTiles ?? 0, this.fillTiles.length)
+    if (this.strokeTiles.length === 0) {
+      this.strokeTiles = wholeTiles(this.strokeCount, opaqueStrokes)
+      this.opaqueStrokeTiles = opaqueStrokes > 0 ? 1 : 0
+    }
+    if (this.fillTiles.length === 0) {
+      this.fillTiles = wholeTiles(this.fillCount, opaqueFills)
+      this.opaqueFillTiles = opaqueFills > 0 ? 1 : 0
+    }
+    this.translucentRuns = d.translucentRuns ? decodeRuns(d.translucentRuns) : []
+    if (this.translucentRuns.length === 0) {
+      // Without the tessellator's order: the fills, then the strokes.
+      for (const [fills, from, to] of [
+        [true, this.opaqueFillTiles, this.fillTiles.length],
+        [false, this.opaqueStrokeTiles, this.strokeTiles.length],
+      ] as const) {
+        if (to > from) this.translucentRuns.push({ fills, from, to })
+      }
+    }
+    // A run past its table is a damaged answer: drawn as far as the table goes.
+    for (const r of this.translucentRuns) {
+      const n = (r.fills ? this.fillTiles : this.strokeTiles).length
+      r.to = Math.min(r.to, n)
+      r.from = Math.min(r.from, r.to)
+    }
     this.paperSpace = d.layout !== ''
+    this.drawingLineweights = d.sheet?.lineweights ?? true
+    this.mmPerUnit = d.sheet?.mmPerUnit > 0 ? d.sheet.mmPerUnit : 1
+    this.paper = d.sheet?.paper ?? null
     this.maxOrder = Math.max(1, d.maxOrder)
+    this.setClips(d.clips)
 
     if (this.strokeVao) gl.deleteVertexArray(this.strokeVao)
     if (this.fillVao) gl.deleteVertexArray(this.fillVao)
@@ -246,7 +347,7 @@ export class Renderer {
     this.strokeBuf = gl.createBuffer()
     gl.bindBuffer(gl.ARRAY_BUFFER, this.strokeBuf)
     gl.bufferData(gl.ARRAY_BUFFER, d.strokes, gl.STATIC_DRAW)
-    // f32 x0,y0 | f32 x1,y1 | ubyte4 rgba | uint32 attr
+    // f32 x0,y0 | f32 x1,y1 | ubyte4 rgba | uint32 attr | uint32 order | f32 bulge
     gl.enableVertexAttribArray(1)
     gl.vertexAttribPointer(1, 2, gl.FLOAT, false, STROKE_BYTES, 0)
     gl.vertexAttribDivisor(1, 1)
@@ -262,6 +363,9 @@ export class Renderer {
     gl.enableVertexAttribArray(5)
     gl.vertexAttribIPointer(5, 1, gl.UNSIGNED_INT, STROKE_BYTES, 24)
     gl.vertexAttribDivisor(5, 1)
+    gl.enableVertexAttribArray(6)
+    gl.vertexAttribPointer(6, 1, gl.FLOAT, false, STROKE_BYTES, 28)
+    gl.vertexAttribDivisor(6, 1)
 
     this.strokeInstanceOffset = 0
 
@@ -287,6 +391,7 @@ export class Renderer {
     // first page against whatever the camera happened to be showing before.
     this.resize()
     if (fit) this.camera.fit(d.extents)
+    this.camera.limit(d.extents)
 
     this.buildTextPipeline(d)
     this.check('setDrawing:textVao')
@@ -307,11 +412,13 @@ export class Renderer {
    * the geometry: 750 KB of records for a site plan's 15,642 runs.
    */
   private buildTextPipeline(d: ParsedDrawing) {
+    this.textDrawing++
     this.releaseText()
     this.textRecords = null
     this.textStrings = null
     this.glyphRequests = []
     this.atlasEm = 0
+    this.atlasSdf = false
 
     const strings = new Uint8Array(d.textStrings)
     if (d.texts.byteLength === 0 || strings.length === 0) return
@@ -319,7 +426,50 @@ export class Renderer {
     this.textRecords = d.texts
     this.textStrings = strings
     this.glyphRequests = glyphsNeeded(d.texts, strings)
-    this.rebuildText(this.targetEm())
+    const target = this.targetEm()
+    this.rebuildText(target.em, target.sdf)
+  }
+
+  /** Upload the clip regions: per region a `u32` triangle count, then its corners. */
+  private setClips(clips: ArrayBuffer | undefined) {
+    const gl = this.gl
+    if (this.clipVao) gl.deleteVertexArray(this.clipVao)
+    if (this.clipBuf) gl.deleteBuffer(this.clipBuf)
+    this.clipVao = null
+    this.clipBuf = null
+    this.clipRegions = []
+    if (!clips || clips.byteLength === 0) return
+    const view = new DataView(clips)
+    const corners: number[] = []
+    for (let at = 0; at + 4 <= clips.byteLength; ) {
+      const triangles = view.getUint32(at, true)
+      at += 4
+      const vertices = Math.min(triangles * 3, Math.floor((clips.byteLength - at) / 8))
+      this.clipRegions.push({ first: corners.length / 2, count: vertices })
+      for (let i = 0; i < vertices; i++, at += 8) corners.push(view.getFloat32(at, true), view.getFloat32(at + 4, true))
+    }
+    this.clipVao = gl.createVertexArray()
+    gl.bindVertexArray(this.clipVao)
+    this.clipBuf = gl.createBuffer()
+    gl.bindBuffer(gl.ARRAY_BUFFER, this.clipBuf)
+    gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(corners), gl.STATIC_DRAW)
+    gl.enableVertexAttribArray(0)
+    gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0)
+    gl.bindVertexArray(null)
+  }
+
+  /** Point the glyph instance attributes at instance `first`: instancing has no first-instance argument. */
+  private setTextInstanceOffset(first: number) {
+    const gl = this.gl
+    const base = first * GLYPH_BYTES
+    gl.bindBuffer(gl.ARRAY_BUFFER, this.textBuf)
+    gl.vertexAttribPointer(1, 2, gl.FLOAT, false, GLYPH_BYTES, base)
+    gl.vertexAttribPointer(2, 2, gl.FLOAT, false, GLYPH_BYTES, base + 8)
+    gl.vertexAttribPointer(3, 2, gl.FLOAT, false, GLYPH_BYTES, base + 16)
+    gl.vertexAttribPointer(4, 4, gl.UNSIGNED_SHORT, true, GLYPH_BYTES, base + 24)
+    gl.vertexAttribPointer(5, 4, gl.UNSIGNED_BYTE, true, GLYPH_BYTES, base + 32)
+    gl.vertexAttribIPointer(6, 1, gl.UNSIGNED_INT, GLYPH_BYTES, base + 36)
+    gl.vertexAttribIPointer(7, 1, gl.UNSIGNED_INT, GLYPH_BYTES, base + 40)
   }
 
   /** Drop the GPU objects the text pipeline owns. */
@@ -350,47 +500,58 @@ export class Renderer {
    * is the failure a bounding-box test invites.
    */
   private cullMargin(): number {
-    const dpr = Math.min(window.devicePixelRatio || 1, 2)
+    const dpr = this.dpr()
     return viewMargin({
       scale: this.camera.scale,
-      lineScale: this.lineweights ? PX_PER_HUNDREDTH_MM * this.lineweightScale * dpr : 0,
-      lineWorld: this.lineweights && this.paperSpace ? 0.01 * this.lineweightScale : 0,
+      lineScale: this.lineScale(dpr),
+      lineWorld: this.lineWorld(),
       minWidthPx: dpr,
     })
   }
 
+  /** Device pixels per CSS pixel: the window's, at most 2, unless a picture sets its own. */
+  private dpr(): number {
+    return this.pixelRatio ?? Math.min(window.devicePixelRatio || 1, 2)
+  }
+
+  private showLineweights(): boolean {
+    return this.lineweights === 'always' || (this.lineweights === 'drawing' && this.drawingLineweights)
+  }
+
+  /** Device pixels per hundredth of a millimetre, in model space. */
+  private lineScale(dpr: number): number {
+    return this.showLineweights() ? PX_PER_HUNDREDTH_MM * this.lineweightScale * dpr : 0
+  }
+
+  /**
+   * Drawing units per hundredth of a millimetre on a sheet, where a
+   * lineweight is a width on the page and grows with zoom: a hundredth of a
+   * unit on a sheet in millimetres, 1/2540 on one in inches.
+   */
+  private lineWorld(): number {
+    return this.showLineweights() && this.paperSpace ? (0.01 * this.lineweightScale * this.paperWidthScale) / this.mmPerUnit : 0
+  }
+
   private strokeRanges(from: number, to: number): Range[] {
-    if (this.strokeTiles.length === 0) {
-      // No table: draw the half outright, which is what the buffer says.
-      const start = from === 0 ? 0 : this.opaqueStrokes
-      const count = from === 0 ? this.opaqueStrokes : this.strokeCount - this.opaqueStrokes
-      return count > 0 ? [{ start, count }] : []
-    }
     return visibleRanges(this.strokeTiles, from, to, this.viewRect(), this.cullMargin())
   }
 
   private fillRanges(from: number, to: number): Range[] {
-    if (this.fillTiles.length === 0) {
-      const start = from === 0 ? 0 : this.opaqueFills
-      const count = from === 0 ? this.opaqueFills : this.fillCount - this.opaqueFills
-      return count > 0 ? [{ start, count }] : []
-    }
     return visibleRanges(this.fillTiles, from, to, this.viewRect(), this.cullMargin())
   }
 
-  /** The atlas em this view wants, quantised. */
-  private targetEm(): number {
-    if (!this.textRecords) return 0
+  /** The atlas em this view wants, quantised, and whether the budget caps it. */
+  private targetEm(): { em: number; sdf: boolean } {
+    if (!this.textRecords) return { em: 0, sdf: false }
     const cam = this.camera
     const [minX, minY] = cam.toLocal(0, 0)
     const [maxX, maxY] = cam.toLocal(cam.width, cam.height)
-    return clampEm(
-      targetEmFor(
-        this.textRecords,
-        { minX, minY, maxX, maxY, scale: cam.scale },
-        this.glyphRequests.length,
-      ),
-    )
+    const view = { minX, minY, maxX, maxY, scale: cam.scale }
+    const cells = this.glyphRequests.length
+    return {
+      em: clampEm(targetEmFor(this.textRecords, view, cells)),
+      sdf: cappedByBudget(this.textRecords, view, cells),
+    }
   }
 
   /**
@@ -401,7 +562,7 @@ export class Renderer {
    * rasterised at. Only the texture and the UVs change, which is what makes
    * this safe to do mid-session.
    */
-  private rebuildText(em: number) {
+  private rebuildText(em: number, sdf: boolean) {
     const gl = this.gl
     this.releaseText()
     this.skippedTextRuns = 0
@@ -410,12 +571,17 @@ export class Renderer {
     // The caller has already loaded and awaited the faces these runs name.
     // Rasterising before they are ready would silently fall back to a system
     // font, which is the machine-dependence the bundle exists to remove.
-    const atlas = GlyphAtlas.build(
-      this.glyphRequests,
-      gl.getParameter(gl.MAX_TEXTURE_SIZE) as number,
-      em,
+    this.installText(
+      GlyphAtlas.build(this.glyphRequests, gl.getParameter(gl.MAX_TEXTURE_SIZE) as number, em, sdf),
     )
+  }
+
+  /** Lay the text out against `atlas` and put both on the GPU. The old text is gone: see `releaseText`. */
+  private installText(atlas: GlyphAtlas) {
+    const gl = this.gl
+    if (!this.textRecords || !this.textStrings) return
     this.atlasEm = atlas.em
+    this.atlasSdf = atlas.sdf
     const laid = layoutText(this.textRecords, this.textStrings, atlas)
     this.skippedTextRuns = laid.skippedRuns
     if (laid.glyphCount === 0) return
@@ -426,6 +592,9 @@ export class Renderer {
     // White glyphs on opaque black (glyph-atlas.ts): the red channel is the coverage.
     gl.texImage2D(gl.TEXTURE_2D, 0, gl.R8, gl.RED, gl.UNSIGNED_BYTE, atlas.canvas)
     gl.generateMipmap(gl.TEXTURE_2D)
+    // The texture holds it now: the canvas's pixels are freed rather than left to the collector.
+    atlas.canvas.width = 0
+    atlas.canvas.height = 0
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR_MIPMAP_LINEAR)
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
     gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
@@ -465,6 +634,7 @@ export class Renderer {
     gl.vertexAttribDivisor(7, 1)
 
     this.glyphCount = laid.glyphCount
+    this.glyphRanges = laid.clipRanges
   }
 
   /**
@@ -499,25 +669,30 @@ export class Renderer {
 
   /** Match the framebuffer to the element's CSS size. Returns true if changed. */
   resize(): boolean {
+    // A picture's canvas is sized by whoever draws it.
+    if (this.picture) return false
+    const canvas = this.canvas as HTMLCanvasElement
     const dpr = Math.min(window.devicePixelRatio || 1, 2)
-    const w = Math.max(1, Math.round(this.canvas.clientWidth * dpr))
-    const h = Math.max(1, Math.round(this.canvas.clientHeight * dpr))
-    if (this.canvas.width === w && this.canvas.height === h) return false
-    this.canvas.width = w
-    this.canvas.height = h
+    const w = Math.max(1, Math.round(canvas.clientWidth * dpr))
+    const h = Math.max(1, Math.round(canvas.clientHeight * dpr))
+    // A renderer made again on a canvas already sized (after a lost context)
+    // still has to give its camera that size.
+    if (canvas.width === w && canvas.height === h && this.camera.width === w && this.camera.height === h) {
+      return false
+    }
+    if (canvas.width !== w || canvas.height !== h) {
+      canvas.width = w
+      canvas.height = h
+    }
     this.camera.width = w
     this.camera.height = h
     return true
   }
 
   requestDraw() {
-    if (this.disposed) return
+    if (this.disposed || this.picture) return
     this.scheduleTextResolutionCheck()
-    if (this.frame) return
-    this.frame = requestAnimationFrame(() => {
-      this.frame = 0
-      this.draw()
-    })
+    this.scheduleFrame()
   }
 
   /**
@@ -546,20 +721,96 @@ export class Renderer {
   private scheduleTextResolutionCheck() {
     if (!this.textRecords) return
     clearTimeout(this.textResolutionTimer)
-    this.textResolutionTimer = setTimeout(() => {
-      if (this.disposed || !this.textRecords) return
-      const want = this.targetEm()
-      // 0 means nothing is on screen to size against; leave the page alone
-      // rather than rebuild it twice while panning across empty paper.
-      if (want === 0 || want <= this.atlasEm) return
-      this.rebuildText(want)
-      if (!this.frame) {
-        this.frame = requestAnimationFrame(() => {
-          this.frame = 0
-          this.draw()
-        })
-      }
-    }, Renderer.TEXT_SETTLE_MS) as unknown as number
+    this.textResolutionTimer = setTimeout(() => void this.refreshText(), Renderer.TEXT_SETTLE_MS) as unknown as number
+  }
+
+  /**
+   * The page rasterised again for the view, if it wants a bigger one. The
+   * distance fields it may hold take longer than a frame, so the page is made
+   * a slice at a time (`GlyphAtlas.buildAsync`) while the old one stays on
+   * screen, and swapped in when done.
+   */
+  private async refreshText() {
+    if (this.disposed || !this.textRecords || this.glyphRequests.length === 0 || this.refreshing) return
+    const want = this.targetEm()
+    // 0 means nothing is on screen to size against; leave the page alone
+    // rather than rebuild it twice while panning across empty paper. A
+    // page the budget caps is rebuilt once more, as distance fields.
+    if (want.em === 0 || (want.em <= this.atlasEm && (!want.sdf || this.atlasSdf))) return
+    const drawing = this.textDrawing
+    this.refreshing = true
+    let atlas: GlyphAtlas
+    try {
+      atlas = await GlyphAtlas.buildAsync(
+        this.glyphRequests,
+        this.gl.getParameter(this.gl.MAX_TEXTURE_SIZE) as number,
+        want.em,
+        want.sdf,
+        () => new Promise((resolve) => setTimeout(resolve)),
+      )
+    } finally {
+      this.refreshing = false
+    }
+    if (this.disposed) return
+    // A page for a drawing that was replaced meanwhile is of no use.
+    if (drawing === this.textDrawing) {
+      this.releaseText()
+      this.installText(atlas)
+      this.scheduleFrame()
+    }
+    // The view may have moved on while the page was made.
+    this.scheduleTextResolutionCheck()
+  }
+
+  private scheduleFrame() {
+    if (this.frame) return
+    this.frame = requestAnimationFrame(() => {
+      this.frame = 0
+      this.draw()
+    })
+  }
+
+  /** Draws now, for a picture: the canvas then holds it until the caller takes it. */
+  paint() {
+    this.draw()
+  }
+
+  /** The GPU took the context away (a reset): what it holds is gone. */
+  isLost(): boolean {
+    return this.gl.isContextLost()
+  }
+
+  /** The drawing buffer's size, which a canvas the GPU cannot hold gets less of. */
+  drawingBufferSize(): [number, number] {
+    return [this.gl.drawingBufferWidth, this.gl.drawingBufferHeight]
+  }
+
+  /** The largest drawing buffer, texture and viewport the GPU has. */
+  limits(): { texture: number; renderbuffer: number; viewport: [number, number] } {
+    const gl = this.gl
+    const view = gl.getParameter(gl.MAX_VIEWPORT_DIMS) as Int32Array
+    return {
+      texture: gl.getParameter(gl.MAX_TEXTURE_SIZE) as number,
+      renderbuffer: gl.getParameter(gl.MAX_RENDERBUFFER_SIZE) as number,
+      viewport: [view[0]!, view[1]!],
+    }
+  }
+
+  /**
+   * A picture: the view of the whole picture (`cx`, `cy`, `scale` in local
+   * coordinates, `width` and `height` its pixels), before the drawing is set
+   * (the glyph atlas is sized from it).
+   */
+  setPictureView(whole: { cx: number; cy: number; scale: number; width: number; height: number }) {
+    this.whole = { ...whole }
+    this.showTile({ x: 0, y: 0, width: whole.width, height: whole.height })
+  }
+
+  /** Aim the camera at a tile of the picture (pixels from its bottom left, as GL counts them). */
+  showTile(tile: { x: number; y: number; width: number; height: number }) {
+    if (!this.whole) return
+    Object.assign(this.camera, tileCamera(this.whole, tile))
+    this.tileOrigin = [tile.x, tile.y]
   }
 
   private draw() {
@@ -573,8 +824,11 @@ export class Renderer {
     this.drawCalls = 0
 
     gl.viewport(0, 0, cam.width, cam.height)
-    gl.clearColor(this.background[0], this.background[1], this.background[2], 1)
+    // Premultiplied, as a context with an alpha channel holds it.
+    const a = this.backgroundAlpha
+    gl.clearColor(this.background[0] * a, this.background[1] * a, this.background[2] * a, a)
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT)
+    if (this.paper && a === 1) this.drawPaper(this.paper)
 
     // Drives the shader's contrast fix, which flips whichever of black or
     // white would otherwise vanish into the background.
@@ -591,81 +845,174 @@ export class Renderer {
       gl.uniform1i(u.uLayerVis, 0)
       gl.uniform1f(u.uBgLuma, bgLuma)
       gl.uniform1f(u.uMaxOrder, this.maxOrder)
+      gl.uniform1i(u.uMono, this.monochrome ? 1 : 0)
     }
 
-    // Fills first: hatches sit under the linework that bounds them. Each
-    // buffer is opaque up front and translucent after; the tail draws with
-    // depth writes off, so geometry behind it still blends through instead of
-    // being rejected by depth it should never have written.
-    if (this.fillCount > 0 && this.fillVao) {
+    const fills = this.fillCount > 0 && this.fillVao !== null
+    const strokes = this.strokeCount > 0 && this.strokeVao !== null
+    const text = this.glyphCount > 0 && this.textVao !== null && this.atlasTex !== null
+    if (fills) {
       gl.useProgram(this.fillProg)
       setCommon(this.fillU)
       gl.uniform3f(this.fillU.uBackground, ...this.background)
-      gl.bindVertexArray(this.fillVao)
-      const opaque = this.fillRanges(0, this.opaqueFillTiles)
-      for (const r of opaque) gl.drawArrays(gl.TRIANGLES, r.start, r.count)
-      const rest = this.fillRanges(this.opaqueFillTiles, this.fillTiles.length)
-      if (rest.length > 0) {
-        gl.depthMask(false)
-        for (const r of rest) gl.drawArrays(gl.TRIANGLES, r.start, r.count)
-        gl.depthMask(true)
-      }
-      this.drawnFills = rangeTotal(opaque) + rangeTotal(rest)
-      this.drawCalls += opaque.length + rest.length
     }
-
-    if (this.strokeCount > 0 && this.strokeVao) {
+    if (strokes) {
       gl.useProgram(this.strokeProg)
       setCommon(this.strokeU)
-      const dpr = Math.min(window.devicePixelRatio || 1, 2)
-      gl.uniform1f(
-        this.strokeU.uLineScale,
-        this.lineweights ? PX_PER_HUNDREDTH_MM * this.lineweightScale * dpr : 0,
-      )
+      const dpr = this.dpr()
+      gl.uniform1f(this.strokeU.uLineScale, this.lineScale(dpr))
       gl.uniform1f(this.strokeU.uMinWidth, dpr)
-      // On a sheet a lineweight is a width on the page, so it grows with zoom.
-      // A hundredth of a millimetre is a hundredth of a paper unit, since a
-      // layout's units are millimetres.
-      gl.uniform1f(
-        this.strokeU.uLineWorld,
-        this.lineweights && this.paperSpace ? 0.01 * this.lineweightScale : 0,
-      )
-      gl.bindVertexArray(this.strokeVao)
-      // Instancing has no first-instance argument, so each range is reached by
-      // re-pointing the per-instance attributes at its start.
-      const opaque = this.strokeRanges(0, this.opaqueStrokeTiles)
-      for (const r of opaque) {
-        this.setStrokeInstanceOffset(r.start)
-        gl.drawArraysInstanced(gl.TRIANGLE_STRIP, 0, 4, r.count)
-      }
-      const rest = this.strokeRanges(this.opaqueStrokeTiles, this.strokeTiles.length)
-      if (rest.length > 0) {
-        gl.depthMask(false)
-        for (const r of rest) {
-          this.setStrokeInstanceOffset(r.start)
-          gl.drawArraysInstanced(gl.TRIANGLE_STRIP, 0, 4, r.count)
-        }
-        gl.depthMask(true)
-      }
-      this.setStrokeInstanceOffset(0)
-      this.drawnStrokes = rangeTotal(opaque) + rangeTotal(rest)
-      this.drawCalls += opaque.length + rest.length
+      gl.uniform1f(this.strokeU.uLineWorld, this.lineWorld())
     }
-
-    // Text is submitted last, but depth still places each run where the
-    // drawing puts it.
-    if (this.glyphCount > 0 && this.textVao && this.atlasTex) {
+    if (text) {
       gl.useProgram(this.textProg)
       setCommon(this.textU)
-      gl.activeTexture(gl.TEXTURE1)
-      gl.bindTexture(gl.TEXTURE_2D, this.atlasTex)
       gl.uniform1i(this.textU.uAtlas, 1)
-      gl.bindVertexArray(this.textVao)
-      gl.drawArraysInstanced(gl.TRIANGLE_STRIP, 0, 4, this.glyphCount)
-      gl.activeTexture(gl.TEXTURE0)
     }
 
+    // The opaque halves first, fills under the linework that bounds them,
+    // then the translucent halves in draw order, blending over whatever lies
+    // behind. Both write depth: an entity's own overlaps (two segments at a
+    // vertex) are then drawn once instead of blending twice.
+    if (fills) this.drawFills(this.fillRanges(0, this.opaqueFillTiles))
+    // Opaque strokes in two passes: every fully covered core, then the
+    // anti-aliased fringes. A fringe drawn with the cores would write depth
+    // over what lies behind it before that was drawn, leaving a halo of
+    // background around a line crossing another, and a seam where a
+    // polyline's segments meet.
+    if (strokes) {
+      const opaque = this.strokeRanges(0, this.opaqueStrokeTiles)
+      this.drawStrokes(opaque, STROKE_CORES)
+      this.drawStrokes(opaque, STROKE_FRINGES)
+      this.drawnStrokes -= rangeTotal(opaque)
+    }
+    const translucent = this.translucentRuns.some((r) => r.to > r.from)
+    // Text behind translucent geometry has to be there before it, and its
+    // edges blended over it after: the glyphs' solid cores now, their edges
+    // last, so each pixel of a glyph is still drawn once.
+    if (text && translucent) this.drawText(TEXT_CORES)
+    for (const r of this.translucentRuns) {
+      if (r.fills && fills) this.drawFills(this.fillRanges(r.from, r.to))
+      if (!r.fills && strokes) this.drawStrokes(this.strokeRanges(r.from, r.to))
+    }
+    if (text) this.drawText(translucent ? TEXT_EDGES : TEXT_WHOLE)
+
     gl.bindVertexArray(null)
+    Object.assign(this.drawn, { cx: cam.cx, cy: cam.cy, scale: cam.scale, width: cam.width, height: cam.height })
+    this.onDraw?.()
+  }
+
+  /**
+   * A layout's paper, as AutoCAD shows it: the sheet in the ground's colour
+   * on a surround a shade away from it, with a shadow. Cleared through the
+   * scissor, so nothing is drawn: the geometry goes on top. The edges are
+   * placed in the pixels of the whole picture and cut to the tile after, so
+   * that every tile puts them on the same pixel.
+   */
+  private drawPaper([minX, minY, maxX, maxY]: [number, number, number, number]) {
+    const gl = this.gl
+    const view = this.whole ? Object.assign(new Camera(), this.whole) : this.camera
+    const [ox, oy] = this.tileOrigin
+    const [x0, y0] = view.toScreen(minX, minY)
+    const [x1, y1] = view.toScreen(maxX, maxY)
+    const [r, g, b] = this.background
+    const light = 0.2126 * r + 0.7152 * g + 0.0722 * b > 0.5
+    const shade = (k: number) => (light ? [r * k, g * k, b * k] : [r + (1 - r) * (1 - k), g + (1 - g) * (1 - k), b + (1 - b) * (1 - k)])
+    const clear = ([cr, cg, cb]: number[], ax: number, ay: number, bx: number, by: number) => {
+      const left = Math.max(0, Math.floor(ax) - ox)
+      const bottom = Math.max(0, Math.floor(ay) - oy)
+      const right = Math.min(this.camera.width, Math.ceil(bx) - ox)
+      const top = Math.min(this.camera.height, Math.ceil(by) - oy)
+      if (right <= left || top <= bottom) return
+      gl.scissor(left, bottom, right - left, top - bottom)
+      gl.clearColor(cr!, cg!, cb!, 1)
+      gl.clear(gl.COLOR_BUFFER_BIT)
+    }
+    gl.enable(gl.SCISSOR_TEST)
+    clear(shade(0.88), 0, 0, view.width, view.height)
+    const d = Math.max(2, Math.round(Math.min(view.width, view.height) / 200))
+    clear(shade(0.7), x0 + d, y0 - d, x1 + d, y1 - d)
+    clear([r, g, b], x0, y0, x1, y1)
+    gl.disable(gl.SCISSOR_TEST)
+  }
+
+  private drawFills(ranges: Range[]) {
+    const gl = this.gl
+    gl.useProgram(this.fillProg)
+    gl.bindVertexArray(this.fillVao)
+    for (const r of ranges) gl.drawArrays(gl.TRIANGLES, r.start, r.count)
+    this.drawnFills += rangeTotal(ranges)
+    this.drawCalls += ranges.length
+  }
+
+  private drawStrokes(ranges: Range[], pass = STROKE_WHOLE) {
+    const gl = this.gl
+    gl.useProgram(this.strokeProg)
+    gl.uniform1i(this.strokeU.uStrokePass, pass)
+    gl.bindVertexArray(this.strokeVao)
+    // Instancing has no first-instance argument, so each range is reached by
+    // re-pointing the per-instance attributes at its start.
+    for (const r of ranges) {
+      this.setStrokeInstanceOffset(r.start)
+      gl.drawArraysInstanced(gl.TRIANGLE_STRIP, 0, 4, r.count)
+    }
+    this.setStrokeInstanceOffset(0)
+    this.drawnStrokes += rangeTotal(ranges)
+    this.drawCalls += ranges.length
+  }
+
+  /** The glyphs, or the part of each `pass` names; depth places each run where the drawing puts it. */
+  private drawText(pass: number) {
+    const gl = this.gl
+    const cam = this.camera
+    gl.useProgram(this.textProg)
+    gl.uniform1i(this.textU.uTextPass, pass)
+    gl.uniform1i(this.textU.uSdf, this.atlasSdf ? 1 : 0)
+    gl.activeTexture(gl.TEXTURE1)
+    gl.bindTexture(gl.TEXTURE_2D, this.atlasTex)
+    gl.bindVertexArray(this.textVao)
+    const clipped = this.glyphRanges.some((r) => r.clip > 0)
+    if (!clipped) {
+      gl.drawArraysInstanced(gl.TRIANGLE_STRIP, 0, 4, this.glyphCount)
+    } else {
+      // Each clip region into the stencil, then its runs where it is.
+      for (const r of this.glyphRanges) {
+        const region = this.clipRegions[r.clip - 1]
+        if (r.clip > 0) {
+          if (!region || !this.clipVao) continue
+          gl.enable(gl.STENCIL_TEST)
+          gl.clear(gl.STENCIL_BUFFER_BIT)
+          gl.stencilFunc(gl.ALWAYS, 1, 0xff)
+          gl.stencilOp(gl.KEEP, gl.KEEP, gl.REPLACE)
+          gl.colorMask(false, false, false, false)
+          gl.depthMask(false)
+          gl.disable(gl.DEPTH_TEST)
+          gl.useProgram(this.clipProg)
+          gl.uniform2f(this.clipU.uCenter, cam.cx, cam.cy)
+          gl.uniform1f(this.clipU.uScale, cam.scale)
+          gl.uniform2f(this.clipU.uViewport, cam.width, cam.height)
+          gl.bindVertexArray(this.clipVao)
+          gl.drawArrays(gl.TRIANGLES, region.first, region.count)
+          gl.colorMask(true, true, true, true)
+          gl.depthMask(true)
+          gl.enable(gl.DEPTH_TEST)
+          gl.stencilFunc(gl.EQUAL, 1, 0xff)
+          gl.stencilOp(gl.KEEP, gl.KEEP, gl.KEEP)
+          gl.useProgram(this.textProg)
+          gl.bindVertexArray(this.textVao)
+        }
+        this.setTextInstanceOffset(r.start)
+        gl.drawArraysInstanced(gl.TRIANGLE_STRIP, 0, 4, r.count)
+        if (r.clip > 0) gl.disable(gl.STENCIL_TEST)
+      }
+      this.setTextInstanceOffset(0)
+    }
+    gl.activeTexture(gl.TEXTURE0)
+  }
+
+  /** Gives the context back to the browser now, which holds only a few: after `dispose`, for a canvas about to be dropped. */
+  loseContext() {
+    this.gl.getExtension('WEBGL_lose_context')?.loseContext()
   }
 
   dispose() {
@@ -689,5 +1036,8 @@ export class Renderer {
     gl.deleteProgram(this.strokeProg)
     gl.deleteProgram(this.fillProg)
     gl.deleteProgram(this.textProg)
+    if (this.clipVao) gl.deleteVertexArray(this.clipVao)
+    if (this.clipBuf) gl.deleteBuffer(this.clipBuf)
+    gl.deleteProgram(this.clipProg)
   }
 }
diff --git a/crates/exav-viewer/ts/cad/renderer/sdf.test.ts b/crates/exav-viewer/ts/cad/renderer/sdf.test.ts
new file mode 100644
index 00000000..be0e6c5c
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/renderer/sdf.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from 'vitest'
+
+import { convertCells, distanceField } from './sdf'
+
+/** A `size` square grid with a solid block from `lo` to `hi` (exclusive) in both axes. */
+function block(size: number, lo: number, hi: number): Uint8Array {
+  const g = new Uint8Array(size * size)
+  for (let y = lo; y < hi; y++) for (let x = lo; x < hi; x++) g[y * size + x] = 255
+  return g
+}
+
+describe('distanceField', () => {
+  const size = 21
+  const field = distanceField(block(size, 5, 16), size, size, 4)
+  const at = (x: number, y: number) => field[y * size + x]!
+
+  it('is above the edge value inside, below it outside', () => {
+    expect(at(10, 10)).toBeGreaterThan(128)
+    expect(at(0, 10)).toBeLessThan(128)
+  })
+
+  it('measures distance in texels, 64 per spread, centre to centre', () => {
+    // Texel 2 is 3 from the first ink texel, texel 7 3 from the last blank one.
+    expect(at(2, 10)).toBe(128 - 48)
+    expect(at(7, 10)).toBe(128 + 48)
+    // So the edge value falls halfway between texels 4 and 5, on the edge.
+    expect((at(4, 10) + at(5, 10)) / 2).toBe(128)
+  })
+
+  it('is Euclidean, not taxicab, off a corner', () => {
+    // From texel (1, 1) the nearest ink is the corner texel (5, 5).
+    expect(at(1, 1)).toBe(Math.round(128 - (Math.hypot(4, 4) / 4) * 64))
+  })
+
+  it('puts a half-covered texel on the edge', () => {
+    const g = new Uint8Array(9)
+    g[4] = 128
+    expect(distanceField(g, 3, 3, 4)[4]).toBe(128)
+  })
+
+  it('is uniform where there is no ink', () => {
+    const empty = distanceField(new Uint8Array(16), 4, 4, 2)
+    expect(new Set(empty).size).toBe(1)
+    expect(empty[0]).toBe(0)
+  })
+})
+
+describe('convertCells', () => {
+  /** An RGBA atlas 40 texels wide holding two 12 by 12 cells of ink, coverage in red. */
+  function atlas() {
+    const width = 40
+    const px = new Uint8ClampedArray(width * 14 * 4)
+    const cells = [
+      { x: 1, y: 1, w: 12, h: 12 },
+      { x: 20, y: 1, w: 12, h: 12 },
+    ]
+    for (const c of cells)
+      for (let y = 3; y < 9; y++) for (let x = 3; x < 9; x++) px[((c.y + y) * width + c.x + x) * 4] = 255
+    return { width, px, cells }
+  }
+
+  it('writes each cell its field in all three colour channels, and leaves the rest alone', () => {
+    const { width, px, cells } = atlas()
+    const before = Uint8ClampedArray.from(px)
+    for (const _ of convertCells(px, width, cells, 2, Infinity)) void _
+    for (const c of cells) {
+      const coverage = new Uint8Array(c.w * c.h)
+      for (let y = 0; y < c.h; y++) for (let x = 0; x < c.w; x++) coverage[y * c.w + x] = before[((c.y + y) * width + c.x + x) * 4]!
+      const field = distanceField(coverage, c.w, c.h, 2)
+      for (let y = 0; y < c.h; y++)
+        for (let x = 0; x < c.w; x++) {
+          const i = ((c.y + y) * width + c.x + x) * 4
+          expect([px[i], px[i + 1], px[i + 2]]).toEqual([field[y * c.w + x], field[y * c.w + x], field[y * c.w + x]])
+        }
+    }
+    // Between the cells, and in alpha, nothing changed.
+    expect(px[(1 * width + 15) * 4]).toBe(before[(1 * width + 15) * 4])
+    expect(px[3]).toBe(before[3])
+  })
+
+  it('yields once a slice has passed, and not before', () => {
+    const { width, px, cells } = atlas()
+    // Each cell takes 5 ms (the clock reads 5 ms later at every call): a slice of 8 ms ends after the second.
+    const run = (sliceMs: number) => {
+      let clock = 0
+      const gen = convertCells(px, width, cells, 2, sliceMs, () => (clock += 5))
+      let yields = 0
+      while (!gen.next().done) yields++
+      return yields
+    }
+    expect(run(Infinity)).toBe(0)
+    expect(run(8)).toBe(1)
+    expect(run(0)).toBe(2)
+  })
+})
diff --git a/crates/exav-viewer/ts/cad/renderer/sdf.ts b/crates/exav-viewer/ts/cad/renderer/sdf.ts
new file mode 100644
index 00000000..cbe7165e
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/renderer/sdf.ts
@@ -0,0 +1,128 @@
+/**
+ * Signed distance fields for glyph cells.
+ *
+ * A bitmap glyph is sharp only up to the size it was rasterised at; a page of
+ * thousands of glyphs (a drawing in Chinese) cannot afford a large one, so
+ * zooming in blurs its text. A distance field stores, for each texel, how far
+ * it is from the glyph's edge, and the shader cuts the edge again at any
+ * scale. Fields are computed from the rasterised coverage with the exact
+ * Euclidean distance transform of Felzenszwalb and Huttenlocher (2012), run
+ * once along columns and once along rows, the coverage of an edge texel
+ * giving its sub-pixel offset.
+ */
+
+const FAR = 1e20
+
+/**
+ * Squared distance to the nearest zero of `f`, along one line, in place.
+ * `v`, `z` and `d` are scratch of at least `n`, `n + 1` and `n`.
+ */
+function transform(f: Float64Array, n: number, v: Int32Array, z: Float64Array, d: Float64Array) {
+  let k = 0
+  v[0] = 0
+  z[0] = -FAR
+  z[1] = FAR
+  for (let q = 1; q < n; q++) {
+    let s = 0
+    do {
+      const r = v[k]!
+      s = (f[q]! + q * q - (f[r]! + r * r)) / (2 * q - 2 * r)
+    } while (s <= z[k]! && --k > -1)
+    k++
+    v[k] = q
+    z[k] = s
+    z[k + 1] = FAR
+  }
+  k = 0
+  for (let q = 0; q < n; q++) {
+    while (z[k + 1]! < q) k++
+    const r = v[k]!
+    d[q] = (q - r) * (q - r) + f[r]!
+  }
+  for (let q = 0; q < n; q++) f[q] = d[q]!
+}
+
+/** Both passes over a `w` by `h` grid of squared distances, in place. */
+function transform2d(grid: Float64Array, w: number, h: number) {
+  const n = Math.max(w, h)
+  const f = new Float64Array(n)
+  const d = new Float64Array(n)
+  const v = new Int32Array(n)
+  const z = new Float64Array(n + 1)
+  for (let x = 0; x < w; x++) {
+    for (let y = 0; y < h; y++) f[y] = grid[y * w + x]!
+    transform(f, h, v, z, d)
+    for (let y = 0; y < h; y++) grid[y * w + x] = f[y]!
+  }
+  for (let y = 0; y < h; y++) {
+    for (let x = 0; x < w; x++) f[x] = grid[y * w + x]!
+    transform(f, w, v, z, d)
+    for (let x = 0; x < w; x++) grid[y * w + x] = f[x]!
+  }
+}
+
+/** A cell of an atlas, in texels. */
+export interface FieldCell {
+  x: number
+  y: number
+  w: number
+  h: number
+}
+
+/**
+ * Replaces the coverage in each cell's red channel (an RGBA atlas `width`
+ * texels wide) with its field, in all three colour channels. A field takes
+ * a while, hundreds of milliseconds for a page of text: the generator yields
+ * once `sliceMs` has passed since it started or last yielded, so that a caller
+ * can give the thread back before going on.
+ */
+export function* convertCells(
+  px: Uint8ClampedArray,
+  width: number,
+  cells: readonly FieldCell[],
+  spread: number,
+  sliceMs: number,
+  now: () => number = () => performance.now(),
+): Generator<void> {
+  let from = now()
+  for (const c of cells) {
+    const coverage = new Uint8Array(c.w * c.h)
+    for (let y = 0; y < c.h; y++)
+      for (let x = 0; x < c.w; x++) coverage[y * c.w + x] = px[((c.y + y) * width + c.x + x) * 4]!
+    const field = distanceField(coverage, c.w, c.h, spread)
+    for (let y = 0; y < c.h; y++)
+      for (let x = 0; x < c.w; x++) {
+        const i = ((c.y + y) * width + c.x + x) * 4
+        px[i] = px[i + 1] = px[i + 2] = field[y * c.w + x]!
+      }
+    if (now() - from >= sliceMs) {
+      yield
+      from = now()
+    }
+  }
+}
+
+/**
+ * The field of a cell from its coverage (0 to 255, row-major), as bytes:
+ * 128 on the edge, rising inside and falling outside by 64 per `spread`
+ * texels, so `spread` texels either side of the edge are represented.
+ */
+export function distanceField(coverage: ArrayLike<number>, w: number, h: number, spread: number): Uint8Array {
+  const outside = new Float64Array(w * h)
+  const inside = new Float64Array(w * h)
+  for (let i = 0; i < w * h; i++) {
+    const a = coverage[i]! / 255
+    // A partly covered texel lies half a texel minus its coverage off the
+    // edge, on the side its coverage puts it.
+    outside[i] = a >= 1 ? 0 : a <= 0 ? FAR : Math.max(0, 0.5 - a) ** 2
+    inside[i] = a >= 1 ? FAR : a <= 0 ? 0 : Math.max(0, a - 0.5) ** 2
+  }
+  transform2d(outside, w, h)
+  transform2d(inside, w, h)
+  const out = new Uint8Array(w * h)
+  for (let i = 0; i < w * h; i++) {
+    const signed = Math.sqrt(inside[i]!) - Math.sqrt(outside[i]!)
+    out[i] = Math.max(0, Math.min(255, Math.round(128 + (signed / spread) * 64)))
+  }
+  return out
+}
diff --git a/crates/exav-viewer/ts/cad/renderer/shaders.ts b/crates/exav-viewer/ts/cad/renderer/shaders.ts
index 785a0fda..c7bde9bd 100644
--- a/crates/exav-viewer/ts/cad/renderer/shaders.ts
+++ b/crates/exav-viewer/ts/cad/renderer/shaders.ts
@@ -65,6 +65,22 @@ vec3 contrastFix(vec3 rgb, float bgLuma, uint flags) {
   if (bgLuma <= 0.5 && luma < 0.07) return vec3(1.0);
   return rgb;
 }
+
+// Everything in ink, as monochrome.ctb plots: black on a light ground,
+// white on a dark one.
+uniform bool uMono;
+
+// Lines and text keep some contrast with the ground, their hue kept:
+// yellow, cyan and the lightest indexed colours darkened on a light ground,
+// the darkest blues lightened on a dark one. Fills keep their colours.
+vec3 legible(vec3 rgb, float bgLuma, uint flags) {
+  if (uMono) return bgLuma > 0.5 ? vec3(0.0) : vec3(1.0);
+  rgb = contrastFix(rgb, bgLuma, flags);
+  float luma = dot(rgb, vec3(0.2126, 0.7152, 0.0722));
+  if (bgLuma > 0.5 && luma > 0.6) return rgb * (0.6 / luma);
+  if (bgLuma <= 0.5 && luma < 0.25) return mix(rgb, vec3(1.0), (0.25 - luma) / (1.0 - luma));
+  return rgb;
+}
 `
 
 /**
@@ -86,6 +102,7 @@ layout(location = 2) in vec2  aP1;
 layout(location = 3) in vec4  aColor;   // normalised UNSIGNED_BYTE
 layout(location = 4) in uint  aAttr;    // layer | lineweight | flags
 layout(location = 5) in uint  aOrder;
+layout(location = 6) in float aBulge;   // 0 a line; an arc's tan(sweep / 4)
 ${COMMON}
 
 uniform float uLineScale;  // device px per 1/100 mm
@@ -104,6 +121,13 @@ out vec2  vP1;
 out vec4  vColor;
 out float vHalf;
 flat out uint vFlags;
+flat out float vBulge;
+flat out int vEdge;
+
+// The lineweight code of a fill's edge (FILL_EDGE in scene.rs): no width, so
+// that its fringe is the coverage of the pixels just outside the fill, 0.5
+// on its edge to none half a pixel out.
+const uint FILL_EDGE = 255u;
 
 /**
  * Hatch pattern lines carry their spacing in the flags byte.
@@ -117,7 +141,8 @@ flat out uint vFlags;
 float spacingFade(uint attr, float unitsPerPixel) {
   uint code = (attr >> 24) & 0x7Fu;
   if (code == 0u) return 1.0;
-  float spacingWorld = exp2(float(code) / 8.0);
+  // Five steps to the octave from 2^-9 (encode_fade_spacing in scene.rs).
+  float spacingWorld = exp2(float(code) / 5.0 - 9.0);
   return clamp(spacingWorld / unitsPerPixel, 0.08, 1.0);
 }
 
@@ -131,9 +156,10 @@ void main() {
   vec2 s0 = toFb(aP0);
   vec2 s1 = toFb(aP1);
 
+  bool edge = ((aAttr >> 16) & 0xFFu) == FILL_EDGE;
   float lw = float((aAttr >> 16) & 0xFFu);
   float widthPx = uLineWorld > 0.0 ? lw * uLineWorld / uScale : lw * uLineScale;
-  float halfW = max(uMinWidth, widthPx) * 0.5;
+  float halfW = edge ? 0.0 : max(uMinWidth, widthPx) * 0.5;
 
   vec2 d = s1 - s0;
   float len = length(d);
@@ -142,13 +168,18 @@ void main() {
 
   float pad = halfW + 1.0;
   vec2 mid = (s0 + s1) * 0.5;
-  vec2 pos = mid + t * aCorner.x * (len * 0.5 + pad) + n * aCorner.y * pad;
+  // An arc stands off its chord by its sagitta, on one side; the quad
+  // covers both, which costs little at a quarter turn's at most.
+  float sag = abs(aBulge) * len * 0.5;
+  vec2 pos = mid + t * aCorner.x * (len * 0.5 + pad) + n * aCorner.y * (pad + sag);
 
   vP0 = s0;
   vP1 = s1;
+  vBulge = aBulge;
   vColor = vec4(aColor.rgb, aColor.a * spacingFade(aAttr, uScale));
   vFlags = (aAttr >> 24) & 0xFFu;
   vHalf = halfW;
+  vEdge = edge ? 1 : 0;
   gl_Position = toClip(pos, aOrder);
 }
 `
@@ -161,6 +192,8 @@ in vec2  vP1;
 in vec4  vColor;
 in float vHalf;
 flat in uint vFlags;
+flat in float vBulge;
+flat in int vEdge;
 ${CONTRAST}
 
 // AutoCAD colour 7 renders white on a dark background and black on a light
@@ -177,12 +210,44 @@ float segDistance(vec2 p, vec2 a, vec2 b) {
   return length(pa - ba * h);
 }
 
+float cross2(vec2 a, vec2 b) {
+  return a.x * b.y - a.y * b.x;
+}
+
+// Distance to the arc from a to b of this bulge (tan of a quarter of its
+// sweep, positive counter-clockwise, at most a quarter turn's): to its
+// circle within its sector, else to the nearer end.
+float arcDistance(vec2 p, vec2 a, vec2 b, float bulge) {
+  vec2 c = b - a;
+  float len = length(c);
+  if (abs(bulge) < 1e-6 || len < 1e-6) return segDistance(p, a, b);
+  vec2 n = vec2(-c.y, c.x) / len;
+  float s = len * 0.5;
+  float h = bulge * s;
+  float r = (s * s + h * h) / (2.0 * h);
+  vec2 centre = (a + b) * 0.5 + n * (r - h);
+  vec2 q = p - centre;
+  float turn = sign(h);
+  if (turn * cross2(a - centre, q) >= 0.0 && turn * cross2(q, b - centre) >= 0.0) {
+    return abs(length(q) - abs(r));
+  }
+  return min(length(p - a), length(p - b));
+}
+
+// 0 every pixel, 1 the fully covered core, 2 the anti-aliased fringe.
+uniform int uStrokePass;
+
 void main() {
-  float d = segDistance(gl_FragCoord.xy, vP0, vP1);
+  float d = arcDistance(gl_FragCoord.xy, vP0, vP1, vBulge);
   float cov = 1.0 - smoothstep(vHalf - 0.5, vHalf + 0.5, d);
   if (cov <= 0.0) discard;
+  if ((uStrokePass == 1 && cov < 1.0) || (uStrokePass == 2 && cov >= 1.0)) discard;
 
-  outColor = vec4(contrastFix(vColor.rgb, uBgLuma, vFlags), vColor.a * cov);
+  // A fill's edge takes the fill's colour, as FILL_FRAG gives it.
+  vec3 rgb = vEdge == 1
+    ? (uMono ? (uBgLuma > 0.5 ? vec3(0.0) : vec3(1.0)) : contrastFix(vColor.rgb, uBgLuma, vFlags))
+    : legible(vColor.rgb, uBgLuma, vFlags);
+  outColor = vec4(rgb, vColor.a * cov);
 }
 `
 
@@ -229,7 +294,9 @@ void main() {
     outColor = vec4(uBackground, 1.0);
     return;
   }
-  outColor = vec4(contrastFix(vColor.rgb, uBgLuma, vFlags), vColor.a);
+  vec3 rgb = contrastFix(vColor.rgb, uBgLuma, vFlags);
+  if (uMono) rgb = uBgLuma > 0.5 ? vec3(0.0) : vec3(1.0);
+  outColor = vec4(rgb, vColor.a);
 }
 `
 
@@ -282,13 +349,48 @@ flat in uint vFlags;
 
 uniform sampler2D uAtlas;
 uniform float uBgLuma;
+// 0 every pixel of a glyph, 1 those at least half covered, 2 the others.
+uniform int uTextPass;
+// The atlas holds distance fields (sdf.ts): the edge is cut here, a pixel
+// wide whatever the zoom.
+uniform bool uSdf;
 ${CONTRAST}
 
 out vec4 outColor;
 
 void main() {
   float a = texture(uAtlas, vUv).r;
+  if (uSdf) {
+    float w = max(fwidth(a), 1e-4) * 0.5;
+    a = smoothstep(0.5 - w, 0.5 + w, a);
+  }
   if (a <= 0.004) discard;
-  outColor = vec4(contrastFix(vColor.rgb, uBgLuma, vFlags), vColor.a * a);
+  if ((uTextPass == 1 && a < 0.5) || (uTextPass == 2 && a >= 0.5)) discard;
+  outColor = vec4(legible(vColor.rgb, uBgLuma, vFlags), vColor.a * a);
+}
+`
+
+/**
+ * A clip region, drawn into the stencil buffer only: the text runs that
+ * cross a viewport's edge or an XCLIP boundary are then drawn where it is.
+ */
+export const CLIP_VERT = /* glsl */ `#version 300 es
+precision highp float;
+
+layout(location = 0) in vec2 aPos;
+${COMMON}
+
+void main() {
+  gl_Position = vec4(toFb(aPos) / uViewport * 2.0 - 1.0, 0.0, 1.0);
+}
+`
+
+export const CLIP_FRAG = /* glsl */ `#version 300 es
+precision highp float;
+
+out vec4 outColor;
+
+void main() {
+  outColor = vec4(0.0);
 }
 `
diff --git a/crates/exav-viewer/ts/cad/renderer/text-layout.test.ts b/crates/exav-viewer/ts/cad/renderer/text-layout.test.ts
index f5ecfa5f..981d3eab 100644
--- a/crates/exav-viewer/ts/cad/renderer/text-layout.test.ts
+++ b/crates/exav-viewer/ts/cad/renderer/text-layout.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
 
-import { TEXT_RECORD_BYTES, facesUsed, glyphsNeeded } from './text-layout'
+import type { GlyphAtlas } from './glyph-atlas'
+import { GLYPH_BYTES, TEXT_RECORD_BYTES, facesUsed, glyphsNeeded, layoutText } from './text-layout'
 
 /**
  * Build a text record the way `text::encode` in `crates/exav-render/src/formats/dwg/text.rs`
@@ -12,15 +13,21 @@ function record(opts: {
   faceByte: number
   hAlign?: number
   vAlign?: number
+  clip?: number
+  x?: number
+  u?: [number, number]
+  v?: [number, number]
 }): ArrayBuffer {
   const buf = new ArrayBuffer(TEXT_RECORD_BYTES)
   const v = new DataView(buf)
-  v.setFloat32(0, 0, true) // x
+  const [ux, uy] = opts.u ?? [2.5, 0]
+  const [vx, vy] = opts.v ?? [0, 2.5]
+  v.setFloat32(0, opts.x ?? 0, true) // x
   v.setFloat32(4, 0, true) // y
-  v.setFloat32(8, 2.5, true) // height
-  v.setFloat32(12, 0, true) // rotation
-  v.setFloat32(16, 1, true) // widthFactor
-  v.setFloat32(20, 0, true) // oblique
+  v.setFloat32(8, ux, true)
+  v.setFloat32(12, uy, true)
+  v.setFloat32(16, vx, true)
+  v.setFloat32(20, vy, true)
   v.setUint32(24, 0xffffffff, true) // rgba
   v.setUint32(28, 0, true) // attr
   v.setUint32(32, opts.strOffset, true)
@@ -29,9 +36,78 @@ function record(opts: {
   v.setUint8(39, opts.vAlign ?? 0)
   v.setUint32(40, 1, true) // order
   v.setUint8(44, opts.faceByte)
+  v.setUint16(46, opts.clip ?? 0, true)
   return buf
 }
 
+/** An atlas whose every glyph is a unit cell, an em wide. */
+const unitAtlas = {
+  glyph: () => ({ width: 1, height: 1, left: 0, bottom: 0, advance: 1, u0: 0, v0: 0, u1: 1, v1: 1 }),
+  capRatio: () => 1,
+  descent: () => 0.25,
+  measure: (_face: number, text: string) => [...text].length,
+  kern: () => 0,
+} as unknown as GlyphAtlas
+
+/** The glyph instances: origin, edge along, edge up. */
+function quads(laid: { buffer: ArrayBuffer; glyphCount: number }) {
+  const d = new DataView(laid.buffer)
+  return Array.from({ length: laid.glyphCount }, (_, i) => {
+    const f = (k: number) => d.getFloat32(i * GLYPH_BYTES + k * 4, true)
+    return { origin: [f(0), f(1)], along: [f(2), f(3)], up: [f(4), f(5)] }
+  })
+}
+
+describe('layoutText frames', () => {
+  const strings = encode('AB')
+
+  it('mirrors a run whose frame is mirrored, about its anchor', () => {
+    const laid = layoutText(record({ strOffset: 0, strLen: 2, faceByte: 0, u: [-1, 0], v: [0, 1] }), strings, unitAtlas)
+    expect(quads(laid)).toEqual([
+      { origin: [0, 0], along: [-1, 0], up: [0, 1] },
+      { origin: [-1, 0], along: [-1, 0], up: [0, 1] },
+    ])
+  })
+
+  it('stretches along the baseline only, for a block scaled in x', () => {
+    const laid = layoutText(record({ strOffset: 0, strLen: 2, faceByte: 0, u: [2, 0], v: [0, 1] }), strings, unitAtlas)
+    expect(quads(laid).map((q) => [q.origin[0], q.along[0], q.up[1]])).toEqual([
+      [0, 2, 1],
+      [2, 2, 1],
+    ])
+  })
+
+  it('puts the descenders on the anchor for Bottom, and centres capitals and descenders for Middle', () => {
+    const y = (hAlign: number, vAlign: number) =>
+      quads(layoutText(record({ strOffset: 0, strLen: 1, faceByte: 0, hAlign, vAlign, u: [1, 0], v: [0, 1] }), strings, unitAtlas))[0]!.origin[1]
+    expect(y(0, 1)).toBe(0.25)
+    expect(y(0, 2)).toBe(-0.5)
+    expect(y(0, 3)).toBe(-1)
+    // MIDDLE: from the descenders' bottom (-0.25) to the capitals' top (1).
+    expect(y(4, 0)).toBe(-0.375)
+  })
+})
+
+describe('layoutText', () => {
+  it('puts each clip region\'s glyphs together, unclipped first, and says where', () => {
+    const strings = encode('AAABBC')
+    const records = concat(
+      record({ strOffset: 0, strLen: 3, faceByte: 0, clip: 2, x: 1 }),
+      record({ strOffset: 3, strLen: 2, faceByte: 0, clip: 0, x: 2 }),
+      record({ strOffset: 5, strLen: 1, faceByte: 0, clip: 1, x: 3 }),
+    )
+    const laid = layoutText(records, strings, unitAtlas)
+    expect(laid.clipRanges).toEqual([
+      { clip: 0, start: 0, count: 2 },
+      { clip: 1, start: 2, count: 1 },
+      { clip: 2, start: 3, count: 3 },
+    ])
+    // The glyphs in those places are those runs': the first two at x 2.
+    const x = (i: number) => new DataView(laid.buffer).getFloat32(i * GLYPH_BYTES, true)
+    expect([x(0), x(2), x(3)]).toEqual([2, 3, 1])
+  })
+})
+
 function concat(...parts: ArrayBuffer[]): ArrayBuffer {
   const out = new Uint8Array(parts.reduce((n, p) => n + p.byteLength, 0))
   let at = 0
diff --git a/crates/exav-viewer/ts/cad/renderer/text-layout.ts b/crates/exav-viewer/ts/cad/renderer/text-layout.ts
index def0d11e..72159d59 100644
--- a/crates/exav-viewer/ts/cad/renderer/text-layout.ts
+++ b/crates/exav-viewer/ts/cad/renderer/text-layout.ts
@@ -12,7 +12,7 @@ const H_ALIGNED = 3
 const H_MIDDLE = 4
 const H_FIT = 5
 
-const V_BASELINE = 0
+// Vertical alignment; 0 is the baseline.
 const V_BOTTOM = 1
 const V_MIDDLE = 2
 const V_TOP = 3
@@ -24,6 +24,11 @@ export interface TextLayoutResult {
   glyphCount: number
   /** Runs skipped because no glyph in the run had a rasterised cell. */
   skippedRuns: number
+  /**
+   * The glyphs of each clip region, in glyph instances: those of clip 0
+   * (none) first, then each region's, in increasing id.
+   */
+  clipRanges: { clip: number; start: number; count: number }[]
 }
 
 /**
@@ -71,9 +76,11 @@ export function facesUsed(records: ArrayBuffer): Set<number> {
 /**
  * Turn placement records into positioned glyph quads.
  *
- * Each instance carries an origin plus two edge vectors, so rotation, width
- * factor and oblique slant all fall out of the same two vectors and the shader
- * stays a single multiply-add.
+ * A record's frame is two vectors, `u` one cap height of advance along the
+ * baseline and `v` one cap height up, which carry its rotation, width factor,
+ * slant, mirroring and a block's non-uniform scale. The run is laid out in
+ * cap heights and the frame places it; each instance is an origin plus two
+ * edge vectors, so the shader stays a single multiply-add.
  */
 export function layoutText(
   records: ArrayBuffer,
@@ -89,16 +96,17 @@ export function layoutText(
     text: string
     x: number
     y: number
-    height: number
-    rotation: number
-    widthFactor: number
-    oblique: number
+    ux: number
+    uy: number
+    vx: number
+    vy: number
     rgba: number
     attr: number
     hAlign: number
     vAlign: number
     order: number
     faceByte: number
+    clip: number
   }[] = []
   let glyphTotal = 0
 
@@ -114,16 +122,17 @@ export function layoutText(
       text,
       x: view.getFloat32(o + 0, true),
       y: view.getFloat32(o + 4, true),
-      height: view.getFloat32(o + 8, true),
-      rotation: view.getFloat32(o + 12, true),
-      widthFactor: view.getFloat32(o + 16, true),
-      oblique: view.getFloat32(o + 20, true),
+      ux: view.getFloat32(o + 8, true),
+      uy: view.getFloat32(o + 12, true),
+      vx: view.getFloat32(o + 16, true),
+      vy: view.getFloat32(o + 20, true),
       rgba: view.getUint32(o + 24, true),
       attr: view.getUint32(o + 28, true),
       hAlign: view.getUint8(o + 38),
       vAlign: view.getUint8(o + 39),
       order: view.getUint32(o + 40, true),
       faceByte: view.getUint8(o + 44),
+      clip: view.getUint16(o + 46, true),
     })
     const faceByte = view.getUint8(o + 44)
     for (const ch of text) {
@@ -136,22 +145,25 @@ export function layoutText(
   const out = new DataView(buffer)
   let n = 0
   let skippedRuns = 0
+  // Each clip region's runs together, so it is masked once: the depth test
+  // still puts each glyph in the drawing's order.
+  runs.sort((a, b) => a.clip - b.clip)
+  const clipRanges: TextLayoutResult['clipRanges'] = []
 
   for (const run of runs) {
-    // DWG text height is cap height; the atlas is in em units, and the ratio
-    // between them belongs to the face this run is drawn with.
-    const em = run.height / atlas.capRatio(run.faceByte)
-    if (!(em > 0)) {
+    const last = clipRanges[clipRanges.length - 1]
+    if (!last || last.clip !== run.clip) clipRanges.push({ clip: run.clip, start: n, count: 0 })
+    if (!(Math.hypot(run.vx, run.vy) > 0) || !(Math.hypot(run.ux, run.uy) > 0)) {
       skippedRuns++
       continue
     }
+    // DWG text height is cap height; the atlas is in em units, and the ratio
+    // between them belongs to the face this run is drawn with.
+    const capsPerEm = 1 / atlas.capRatio(run.faceByte)
+    const runWidth = atlas.measure(run.faceByte, run.text) * capsPerEm
 
-    const widthFactor = run.widthFactor > 0 ? run.widthFactor : 1
-    const advanceScale = em * widthFactor
-    const runWidth = atlas.measure(run.faceByte, run.text) * advanceScale
-
-    // Horizontal anchor. Aligned and Fit stretch between two points, which we
-    // do not have here, so they fall back to centred.
+    // Horizontal anchor. Aligned and Fit arrive stretched and left-aligned;
+    // without their second point they fall back to centred.
     let dx = 0
     switch (run.hAlign) {
       case H_CENTER:
@@ -168,27 +180,16 @@ export function layoutText(
         dx = 0
     }
 
-    // Vertical anchor, measured from the baseline.
+    // Where the baseline sits from the anchor: Bottom puts the descenders on
+    // it, Middle centres the capitals, Top their tops, and the Middle
+    // alignment (TEXT's MIDDLE, unlike Middle Center) capitals and descenders
+    // together. `baseline_offset` in text.rs does the same for stroke text.
+    const descent = atlas.descent(run.faceByte)
     let dy = 0
-    switch (run.vAlign) {
-      case V_BOTTOM:
-        dy = 0
-        break
-      case V_MIDDLE:
-        dy = -run.height / 2
-        break
-      case V_TOP:
-        dy = -run.height
-        break
-      case V_BASELINE:
-      default:
-        dy = 0
-    }
-
-    const cos = Math.cos(run.rotation)
-    const sin = Math.sin(run.rotation)
-    // Oblique leans the vertical edge; positive slants to the right.
-    const tanO = Math.tan(run.oblique || 0)
+    if (run.hAlign === H_MIDDLE) dy = -(1 - descent) / 2
+    else if (run.vAlign === V_BOTTOM) dy = descent
+    else if (run.vAlign === V_MIDDLE) dy = -0.5
+    else if (run.vAlign === V_TOP) dy = -1
 
     let pen = dx
     let drew = false
@@ -199,34 +200,22 @@ export function layoutText(
       if (!g) continue
       // Kerning has to move the pen as well as the measured width, or the
       // glyphs stop matching the box the alignment was computed from.
-      if (prev) pen += atlas.kern(run.faceByte, prev, ch) * advanceScale
+      if (prev) pen += atlas.kern(run.faceByte, prev, ch) * capsPerEm
       prev = ch
       if (g.width > 0) {
-        // Glyph box in the run's own unrotated frame.
-        const gx = pen + g.left * advanceScale
-        const gy = dy + g.bottom * em
-        const gw = g.width * advanceScale
-        const gh = g.height * em
-
-        // Skew shifts x by the height above the baseline.
-        const skewLo = gy * tanO
-        const skewHi = (gy + gh) * tanO
-
-        // Origin is the bottom-left corner; the two edges span the quad.
-        const ox = gx + skewLo
-        const oy = gy
-        const ex = gw
-        const ey = 0
-        const fx = skewHi - skewLo
-        const fy = gh
+        // Glyph box in cap heights, along `u` and up `v`.
+        const a = pen + g.left * capsPerEm
+        const b0 = dy + g.bottom * capsPerEm
+        const w = g.width * capsPerEm
+        const h = g.height * capsPerEm
 
         const b = n * GLYPH_BYTES
-        out.setFloat32(b + 0, run.x + ox * cos - oy * sin, true)
-        out.setFloat32(b + 4, run.y + ox * sin + oy * cos, true)
-        out.setFloat32(b + 8, ex * cos - ey * sin, true)
-        out.setFloat32(b + 12, ex * sin + ey * cos, true)
-        out.setFloat32(b + 16, fx * cos - fy * sin, true)
-        out.setFloat32(b + 20, fx * sin + fy * cos, true)
+        out.setFloat32(b + 0, run.x + a * run.ux + b0 * run.vx, true)
+        out.setFloat32(b + 4, run.y + a * run.uy + b0 * run.vy, true)
+        out.setFloat32(b + 8, w * run.ux, true)
+        out.setFloat32(b + 12, w * run.uy, true)
+        out.setFloat32(b + 16, h * run.vx, true)
+        out.setFloat32(b + 20, h * run.vy, true)
         out.setUint16(b + 24, Math.round(g.u0 * 65535), true)
         out.setUint16(b + 26, Math.round(g.v0 * 65535), true)
         out.setUint16(b + 28, Math.round(g.u1 * 65535), true)
@@ -237,11 +226,12 @@ export function layoutText(
         n++
         drew = true
       }
-      pen += g.advance * advanceScale
+      pen += g.advance * capsPerEm
     }
 
     if (!drew) skippedRuns++
+    clipRanges[clipRanges.length - 1]!.count = n - clipRanges[clipRanges.length - 1]!.start
   }
 
-  return { buffer, glyphCount: n, skippedRuns }
+  return { buffer, glyphCount: n, skippedRuns, clipRanges: clipRanges.filter((r) => r.count > 0) }
 }
diff --git a/crates/exav-viewer/ts/cad/renderer/text-resolution.test.ts b/crates/exav-viewer/ts/cad/renderer/text-resolution.test.ts
index 5d66a00b..bcfc0472 100644
--- a/crates/exav-viewer/ts/cad/renderer/text-resolution.test.ts
+++ b/crates/exav-viewer/ts/cad/renderer/text-resolution.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 
 import { clampEm } from './glyph-atlas'
 import { TEXT_RECORD_BYTES } from './text-layout'
-import { affordableEm, neededEm, targetEmFor, type ViewRect } from './text-resolution'
+import { affordableEm, cappedByBudget, neededEm, targetEmFor, type ViewRect } from './text-resolution'
 
 /** A text record as `text::encode` writes it; only the fields this reads. */
 function run(opts: { x: number; y: number; height: number; len: number }): ArrayBuffer {
@@ -10,7 +10,9 @@ function run(opts: { x: number; y: number; height: number; len: number }): Array
   const v = new DataView(buf)
   v.setFloat32(0, opts.x, true)
   v.setFloat32(4, opts.y, true)
+  // The frame: a cap height of advance along x, a cap height up.
   v.setFloat32(8, opts.height, true)
+  v.setFloat32(20, opts.height, true)
   v.setUint16(36, opts.len, true)
   return buf
 }
@@ -33,6 +35,12 @@ describe('neededEm', () => {
     expect(neededEm(new ArrayBuffer(0), VIEW)).toBe(0)
   })
 
+  it('sizes a stretched run by its longer unit', () => {
+    const records = run({ x: 0, y: 0, height: 10, len: 4 })
+    new DataView(records).setFloat32(8, 30, true)
+    expect(neededEm(records, VIEW)).toBe(neededEm(run({ x: 0, y: 0, height: 30, len: 4 }), VIEW))
+  })
+
   it('is zero when every run is empty', () => {
     expect(neededEm(run({ x: 0, y: 0, height: 10, len: 0 }), VIEW)).toBe(0)
   })
@@ -112,6 +120,19 @@ describe('affordableEm', () => {
   })
 })
 
+describe('cappedByBudget', () => {
+  const records = run({ x: 0, y: 0, height: 10, len: 4 })
+
+  it('is set when the page the view wants is past the budget', () => {
+    expect(cappedByBudget(records, VIEW, 40)).toBe(false)
+    expect(cappedByBudget(records, VIEW, 100_000)).toBe(true)
+  })
+
+  it('is never set with nothing to size against', () => {
+    expect(cappedByBudget(new ArrayBuffer(0), VIEW, 100_000)).toBe(false)
+  })
+})
+
 describe('targetEmFor', () => {
   it('rounds what the view needs up, and banks headroom beyond it', () => {
     const records = run({ x: 0, y: 0, height: 10, len: 4 })
diff --git a/crates/exav-viewer/ts/cad/renderer/text-resolution.ts b/crates/exav-viewer/ts/cad/renderer/text-resolution.ts
index 643dae3e..638deedb 100644
--- a/crates/exav-viewer/ts/cad/renderer/text-resolution.ts
+++ b/crates/exav-viewer/ts/cad/renderer/text-resolution.ts
@@ -82,7 +82,12 @@ export function neededEm(records: ArrayBuffer, view: ViewRect): number {
     const o = i * TEXT_RECORD_BYTES
     const len = v.getUint16(o + 36, true)
     if (len === 0) continue
-    const height = v.getFloat32(o + 8, true)
+    // The longer unit of the run's frame: a cap height, or a cap height of
+    // advance stretched by a width factor or a block's scale.
+    const height = Math.max(
+      Math.hypot(v.getFloat32(o + 8, true), v.getFloat32(o + 12, true)),
+      Math.hypot(v.getFloat32(o + 16, true), v.getFloat32(o + 20, true)),
+    )
     if (!(height > 0) || height <= tallest) continue
 
     // A run's reach from its anchor, generously: `len` is a byte count, so it
@@ -145,3 +150,13 @@ export function targetEmFor(records: ArrayBuffer, view: ViewRect, cells: number)
   const wanted = 2 ** Math.ceil(Math.log2(needed * ZOOM_HEADROOM))
   return Math.min(wanted, affordableEm(cells))
 }
+
+/**
+ * Whether the budget, not the view, sets the em: a page too small for the
+ * view is then rasterised as distance fields, which stay sharp magnified.
+ */
+export function cappedByBudget(records: ArrayBuffer, view: ViewRect, cells: number): boolean {
+  const needed = neededEm(records, view)
+  if (needed === 0) return false
+  return 2 ** Math.ceil(Math.log2(needed * ZOOM_HEADROOM)) > affordableEm(cells)
+}
diff --git a/crates/exav-viewer/ts/cad/renderer/tiles.test.ts b/crates/exav-viewer/ts/cad/renderer/tiles.test.ts
index 86b7135a..ebae8260 100644
--- a/crates/exav-viewer/ts/cad/renderer/tiles.test.ts
+++ b/crates/exav-viewer/ts/cad/renderer/tiles.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { TILE_BYTES, decodeTiles, rangeTotal, viewMargin, visibleRanges, type Tile } from './tiles'
+import { TILE_BYTES, decodeRuns, decodeTiles, rangeTotal, viewMargin, visibleRanges, wholeTiles, type Tile } from './tiles'
 
 function tile(start: number, count: number, box: [number, number, number, number]): Tile {
   return { start, count, minX: box[0], minY: box[1], maxX: box[2], maxY: box[3] }
@@ -31,6 +31,30 @@ describe('decodeTiles', () => {
   })
 })
 
+describe('decodeRuns', () => {
+  it('reads the translucent runs scene.rs writes, a partial one left out', () => {
+    const words = new Uint32Array([1, 0, 2, 0, 3, 5, 1])
+    expect(decodeRuns(words.buffer)).toEqual([
+      { fills: true, from: 0, to: 2 },
+      { fills: false, from: 3, to: 5 },
+    ])
+  })
+})
+
+describe('wholeTiles', () => {
+  it('covers the opaque half and the translucent tail, each one tile seen from anywhere', () => {
+    const t = wholeTiles(10, 4)
+    expect(t.map((x) => [x.start, x.count])).toEqual([
+      [0, 4],
+      [4, 6],
+    ])
+    const view = { minX: 1e9, minY: 1e9, maxX: 1e9 + 1, maxY: 1e9 + 1 }
+    expect(visibleRanges(t, 1, 2, view, NO_MARGIN)).toEqual([{ start: 4, count: 6 }])
+    expect(wholeTiles(3, 3)).toHaveLength(1)
+    expect(wholeTiles(3, 0).map((x) => x.start)).toEqual([0])
+  })
+})
+
 describe('visibleRanges', () => {
   it('returns only the tiles the view overlaps', () => {
     const tiles = row(10)
diff --git a/crates/exav-viewer/ts/cad/renderer/tiles.ts b/crates/exav-viewer/ts/cad/renderer/tiles.ts
index 9b67d952..76bf0ec1 100644
--- a/crates/exav-viewer/ts/cad/renderer/tiles.ts
+++ b/crates/exav-viewer/ts/cad/renderer/tiles.ts
@@ -47,6 +47,31 @@ export interface Range {
   count: number
 }
 
+/** Tiles `from` to `to` of the fill or the stroke table, one run of the translucent pass. */
+export interface Run {
+  fills: boolean
+  from: number
+  to: number
+}
+
+export function decodeRuns(bytes: ArrayBuffer): Run[] {
+  const v = new DataView(bytes)
+  const out: Run[] = []
+  for (let o = 0; o + 12 <= bytes.byteLength; o += 12) {
+    out.push({ fills: v.getUint32(o, true) === 1, from: v.getUint32(o + 4, true), to: v.getUint32(o + 8, true) })
+  }
+  return out
+}
+
+/** One tile over the whole buffer, then one over its translucent tail, for a drawing without a table. */
+export function wholeTiles(count: number, opaque: number): Tile[] {
+  const box = { minX: -Infinity, minY: -Infinity, maxX: Infinity, maxY: Infinity }
+  const out: Tile[] = []
+  if (opaque > 0) out.push({ start: 0, count: opaque, ...box })
+  if (count > opaque) out.push({ start: opaque, count: count - opaque, ...box })
+  return out
+}
+
 export function decodeTiles(bytes: ArrayBuffer): Tile[] {
   const v = new DataView(bytes)
   const n = Math.floor(bytes.byteLength / TILE_BYTES)
diff --git a/crates/exav-viewer/ts/cad/types.ts b/crates/exav-viewer/ts/cad/types.ts
index 283276de..b06d990b 100644
--- a/crates/exav-viewer/ts/cad/types.ts
+++ b/crates/exav-viewer/ts/cad/types.ts
@@ -27,8 +27,9 @@ export interface Warnings {
   hatchPatternsMissing: number
   hatchPatternsTruncated: number
   /**
-   * Images, underlays and OLE objects whose content lives in a file the viewer
-   * was not given. Only their frame is drawn.
+   * Xref inserts, images, underlays and OLE objects whose content lives in a
+   * file the viewer was not given. An xref's path is drawn where it is
+   * inserted, the others' frames.
    */
   externalReferences: number
   depthExceeded: number
@@ -40,6 +41,24 @@ export interface Warnings {
    * them can show them.
    */
   proxyWithoutGraphics: number
+  /** What `unknownEntities` counts, by DXF type (at most 16 types). */
+  notDrawn: Record<string, number>
+  /** The files external references name: xrefs, images, underlays (at most 16). */
+  externalFiles: string[]
+}
+
+/** What a tab is drawn on, beyond its geometry. */
+export interface Sheet {
+  /**
+   * Millimetres per drawing unit, which a lineweight on a layout is a width
+   * in: 25.4 for a sheet in inches. 0 for model space, where a lineweight is
+   * a width on the screen.
+   */
+  mmPerUnit: number
+  /** `$LWDISPLAY`: the drawing is shown with its lineweights. */
+  lineweights: boolean
+  /** A layout's paper, `[minX, minY, maxX, maxY]` relative to `origin`; null in model space. */
+  paper: [number, number, number, number] | null
 }
 
 /** The thumbnail a drawing was saved with: a PNG or a BMP file. */
@@ -64,6 +83,11 @@ export interface ParsedDrawing {
   texts: ArrayBuffer
   /** UTF-8 blob the text records index into. */
   textStrings: ArrayBuffer
+  /**
+   * The regions text runs are clipped to, which a record's clip id numbers
+   * from 1: for each, `u32` triangle count, then `f32 x, y` per corner.
+   */
+  clips: ArrayBuffer
   layers: LayerInfo[]
   /** The drawing's tabs, model space first. */
   layouts: LayoutInfo[]
@@ -74,31 +98,38 @@ export interface ParsedDrawing {
   /** [minX, minY, maxX, maxY], relative to `origin`. */
   extents: [number, number, number, number]
   warnings: Warnings
+  sheet: Sheet
   /** Highest draw-order index, for normalising depth. */
   maxOrder: number
   /**
    * Leading strokes and fill vertices that are opaque. Everything after them
-   * is translucent and is drawn without writing depth, so what lies behind
-   * still blends through.
+   * is translucent, in draw order, and is drawn after all of them.
    */
   opaqueStrokes: number
   opaqueFills: number
   /**
-   * Spatial buckets over `strokes`, so a view can skip what it does not touch:
-   * `u32 start, count | f32 minX, minY, maxX, maxY`, 24 bytes each. The box is
-   * the true extent of the bucket's contents in the same origin-relative frame
-   * as the vertex buffers, and can reach outside its own grid square because a
-   * long line belongs to one bucket and crosses many.
+   * Tiles over `strokes`, so a view can skip what it does not touch: `u32
+   * start, count | f32 minX, minY, maxX, maxY`, 24 bytes each. The opaque
+   * half's are spatial buckets, the translucent half's runs of it in draw
+   * order. The box is the true extent of the tile's contents in the same
+   * origin-relative frame as the vertex buffers, and can reach outside its
+   * own grid square because a long line belongs to one bucket and crosses
+   * many.
    */
   strokeTiles: ArrayBuffer
   /** The same over `fills`, with `start` and `count` counted in vertices. */
   fillTiles: ArrayBuffer
   /**
    * Leading entries of each table that cover the opaque half. The two halves
-   * are separate passes, so their buckets must not be interleaved.
+   * are separate passes, so their tiles must not be interleaved.
    */
   opaqueStrokeTiles: number
   opaqueFillTiles: number
+  /**
+   * The translucent pass in draw order: `u32 kind (1 fills, 0 strokes),
+   * first tile, end tile` per run, indices into that kind's table.
+   */
+  translucentRuns: ArrayBuffer
   /** Milliseconds spent in the worker. */
   parseMs: number
 }
@@ -108,5 +139,6 @@ export interface Layer extends LayerInfo {
   visible: boolean
 }
 
-export const STROKE_BYTES = 28
+/** `f32 x0, y0, x1, y1 | u32 rgba, attr, order | f32 bulge` (scene.rs). */
+export const STROKE_BYTES = 32
 export const FILL_BYTES = 20
diff --git a/crates/exav-viewer/ts/cad/view.ts b/crates/exav-viewer/ts/cad/view.ts
index 9f943b4e..072b2e92 100644
--- a/crates/exav-viewer/ts/cad/view.ts
+++ b/crates/exav-viewer/ts/cad/view.ts
@@ -3,27 +3,60 @@
  * (`exav_viewer_dwg.wasm`), drawn by the WebGL2 renderer.
  *
  * Pan with one finger or the mouse, pinch or wheel to zoom (a trackpad pinch
- * is ctrl+wheel), double-click to fit. Layer toggles never re-tessellate;
+ * is ctrl+wheel, or Safari's gesture events), double-click to fit. A zoom scales the canvas as drawn and
+ * draws sharp once it pauses (`./zoom-gesture.ts`), and `zoom` and `viewport`
+ * follow it once per animation frame. Layer toggles never re-tessellate;
  * switching layout, or the ground between light and dark (indexed colours
  * resolve against it, as in AutoCAD), tessellates again from the parsed
  * document without reading the file again.
+ *
+ * `pictures` draws any layout again at a requested size and region
+ * (`./export.ts`), and `viewport` is the region of the layout in the canvas,
+ * both in drawing units (`./raster.ts`).
  */
+import { RasterError, throwIfAborted } from "../core/pictures.js";
+import { createPictures } from "../core/raster.js";
+import { createSourceReader } from "../core/source.js";
 import { writable } from "../core/store.js";
-import type { GroundController, LayersController, LayoutsController, Renderer as PluginRenderer, ZoomController } from "../core/types.js";
+import { isColor } from "../core/theme.js";
+import { resolveInTree } from "../core/tree.js";
+import type { FileTree, GroundController, LayersController, LayoutsController, Raster, RasterOptions, Renderer as PluginRenderer, Viewport, Warning, ZoomController } from "../core/types.js";
 import { createWorkerHost } from "../core/worker-host.js";
+import { drawPicture, parseColor } from "./export.js";
 import type { CadOptions } from "./plugin.js";
+import {
+  abortable,
+  checkScale,
+  currentFor,
+  defaultRegion,
+  exportView,
+  layoutFor,
+  lineweightFactors,
+  linked,
+  planExport,
+  sameRect,
+  serial,
+  viewportRegion,
+} from "./raster.js";
 import { familiesFor, loadFamilies, setFontsUrl } from "./renderer/fonts.js";
 import { Renderer } from "./renderer/renderer.js";
 import { facesUsed } from "./renderer/text-layout.js";
 import type { DrawingPreview, ParsedDrawing } from "./types.js";
+import { cadWarnings } from "./warnings.js";
+import { createZoomGesture, viewTransform } from "./zoom-gesture.js";
 import type { CadAnswer, CadRequest } from "./cad.worker.js";
 
 export const GROUNDS = { light: "#ffffff", dark: "#212830" } as const;
 
+/** The external references bound from the files around a drawing: those it names, and those they name. */
+const MAX_BOUND_REFERENCES = 64;
+
 /** exav-render's `SCENE_BUDGET`. */
 const DEFAULT_MAX_PRIMITIVES = 8_000_000;
 /** 512 MiB: half the native reader's default, the module's memory being smaller. */
 const DEFAULT_MAX_DECOMPRESSED_BYTES = 512 * 1024 * 1024;
+/** About 512 MiB of the module's memory, at the 512 bytes an entity takes. */
+const DEFAULT_MAX_ENTITIES = 1_000_000;
 
 /** WebGL2, which the renderer needs. */
 export function isCadSupported(): boolean {
@@ -69,13 +102,24 @@ export const renderer: PluginRenderer<CadOptions> = {
     if (ctx.options.fontsUrl !== undefined) setFontsUrl(ctx.options.fontsUrl);
 
     const root = document.createElement("div");
-    root.className = "exv-cad";
+    root.className = "exav-viewer-cad";
     const canvas = document.createElement("canvas");
-    canvas.className = "exv-cad-canvas";
+    canvas.className = "exav-viewer-cad-canvas";
     root.append(canvas);
     host.append(root);
 
-    const gl = new Renderer(canvas);
+    // A zoom gesture moves the canvas as drawn (`./zoom-gesture.ts`); a frame
+    // drawn from the camera puts it back.
+    canvas.style.transformOrigin = "0 0";
+    const wire = (r: Renderer) => {
+      r.onDraw = () => {
+        if (canvas.style.transform) canvas.style.transform = "";
+      };
+    };
+    let gl = new Renderer(canvas);
+    wire(gl);
+    gl.lineweights = ctx.options.lineweights ?? "drawing";
+    gl.monochrome = ctx.options.monochrome ?? false;
     const engine = createWorkerHost<CadRequest, CadAnswer>(
       () => new Worker(new URL("./cad.worker.js", import.meta.url), { type: "module" }),
     );
@@ -83,6 +127,7 @@ export const renderer: PluginRenderer<CadOptions> = {
     const timeoutMs = ctx.options.timeoutMs ?? 120_000;
     const maxPrimitives = ctx.options.maxPrimitives ?? DEFAULT_MAX_PRIMITIVES;
     const maxDecompressedBytes = ctx.options.maxDecompressedBytes ?? DEFAULT_MAX_DECOMPRESSED_BYTES;
+    const maxEntities = ctx.options.maxEntities ?? DEFAULT_MAX_ENTITIES;
     let drawing: ParsedDrawing | null = null;
     let visible: boolean[] = [];
     let destroyed = false;
@@ -98,7 +143,9 @@ export const renderer: PluginRenderer<CadOptions> = {
     });
     const layoutsStore = writable<{ items: readonly { id: string; name: string; isModel: boolean }[]; current: string }>({ items: [], current: "" });
     const zoomStore = writable({ scale: 1, min: 0, max: Infinity });
-    const warnings = writable<readonly { key: string; count: number }[]>([]);
+    const warnings = writable<readonly Warning[]>([]);
+    // The part of the layout in the canvas, in drawing units (see `./raster.ts`).
+    const viewportStore = writable<Viewport | null>(null);
 
     const applyGround = () => {
       const c = rgb(colors[ground]) ?? [1, 1, 1];
@@ -127,7 +174,23 @@ export const renderer: PluginRenderer<CadOptions> = {
       Object.assign(gl.camera, { cx, cy, scale });
       return fitted;
     };
-    const publishZoom = () => zoomStore.set({ scale: fitScale() / gl.camera.scale, min: 0, max: Infinity });
+    /** The viewport follows the camera; a store is set only when the region moved. */
+    const publishView = () => {
+      const d = drawing;
+      if (!d) return;
+      const region = viewportRegion(gl.camera, d.origin);
+      const now = viewportStore.get();
+      const before = now && "width" in now.region ? now.region : null;
+      if (now && now.layout === d.layout && before && sameRect(before, region)) return;
+      const page = Math.max(1, d.layouts.findIndex((l) => (l.isModel ? "" : l.name) === d.layout) + 1);
+      viewportStore.set({ space: "drawing", page, layout: d.layout, region });
+    };
+    const publishZoom = () => {
+      const fit = fitScale();
+      const { scale, minScale, maxScale } = gl.camera;
+      zoomStore.set({ scale: fit / scale, min: fit / maxScale, max: minScale > 0 ? fit / minScale : Infinity });
+      publishView();
+    };
 
     // The drawing's thumbnail while it parses, when it has one.
     let placeholder: HTMLImageElement | null = null;
@@ -139,7 +202,7 @@ export const renderer: PluginRenderer<CadOptions> = {
     };
     const showPreview = async (p: DrawingPreview) => {
       const img = document.createElement("img");
-      img.className = "exv-cad-preview";
+      img.className = "exav-viewer-cad-preview";
       img.alt = "";
       img.src = URL.createObjectURL(new Blob([p.data], { type: p.mime }));
       try {
@@ -177,42 +240,89 @@ export const renderer: PluginRenderer<CadOptions> = {
       if (reframe) fitted = true;
       gl.setDrawing(d, visible, reframe);
       gl.requestDraw();
-      dropPreview();
+      // A drawing with nothing this viewer draws (a 3D model) keeps the
+      // thumbnail it was saved with.
+      const blank = d.strokes.byteLength === 0 && d.fills.byteLength === 0 && d.texts.byteLength === 0;
+      // The geometry is on the GPU now: the page keeps only what describes
+      // it. A lost context asks the worker for it again (`onRestored`).
+      d.strokes = d.fills = d.strokeTiles = d.fillTiles = new ArrayBuffer(0);
+      const previewShown = blank && placeholder !== null;
+      if (!previewShown) dropPreview();
       publishLayers();
       layoutsStore.set({
         items: d.layouts.map((l) => ({ id: l.isModel ? "" : l.name, name: l.name, isModel: l.isModel })),
         current: d.layout,
       });
-      warnings.set([
-        ...(d.warnings.externalReferences > 0 ? [{ key: "external_references", count: d.warnings.externalReferences }] : []),
-        ...(d.warnings.sceneTruncated > 0 ? [{ key: "scene_truncated", count: d.warnings.sceneTruncated }] : []),
-        ...(d.warnings.proxyWithoutGraphics > 0 ? [{ key: "proxy_without_graphics", count: d.warnings.proxyWithoutGraphics }] : []),
-      ]);
+      if (pictures.state.get().count !== d.layouts.length) pictures.state.set({ count: d.layouts.length, space: "drawing" });
+      warnings.set(cadWarnings(d.warnings, previewShown));
       publishZoom();
       ctx.status({ phase: "ready" });
     };
 
     // ── input ──
     const dpr = () => Math.min(window.devicePixelRatio || 1, 2);
+    // The root's box, which is the canvas's: the canvas's own moves with a zoom gesture.
     const toFb = (e: { clientX: number; clientY: number }): [number, number] => {
-      const r = canvas.getBoundingClientRect();
+      const r = root.getBoundingClientRect();
       return [(e.clientX - r.left) * dpr(), (r.bottom - e.clientY) * dpr()];
     };
+    const zoomGesture = createZoomGesture({
+      settleMs: 100,
+      staleMs: 500,
+      frame() {
+        const { drawn, camera } = gl;
+        if (drawn.width !== camera.width || drawn.height !== camera.height) {
+          // Nothing drawn at this size yet.
+          gl.requestDraw();
+        } else {
+          const t = viewTransform(drawn, camera, dpr());
+          canvas.style.transform = `translate(${t.x}px, ${t.y}px) scale(${t.k})`;
+        }
+        publishZoom();
+      },
+      draw: () => gl.requestDraw(),
+    });
+    /** A frame drawn from the camera is on its way: what a gesture had pending is over. */
+    const settled = () => {
+      zoomGesture.flush();
+      zoomGesture.cancel();
+    };
     const pointers = new Map<number, { x: number; y: number }>();
     let lastPinch = 0;
     const pinchDistance = () => {
       const [a, b] = [...pointers.values()];
       return a && b ? Math.hypot(a.x - b.x, a.y - b.y) : 0;
     };
+    // Safari's trackpad pinch: gesture events, whose `scale` is the total since the start.
+    let gestureScale = 0;
+    const onGestureStart = (e: Event) => {
+      e.preventDefault();
+      gestureScale = 1;
+    };
+    const onGestureChange = (e: Event) => {
+      e.preventDefault();
+      const g = e as Event & { scale: number; clientX: number; clientY: number };
+      if (!drawing || !gestureScale || !(g.scale > 0)) return;
+      const [sx, sy] = toFb(g);
+      gl.camera.zoomAt(sx, sy, g.scale / gestureScale);
+      gestureScale = g.scale;
+      fitted = false;
+      zoomGesture.touch();
+    };
+    const onGestureEnd = (e: Event) => {
+      e.preventDefault();
+      gestureScale = 0;
+    };
     const onWheel = (e: WheelEvent) => {
       if (!drawing) return;
       e.preventDefault();
+      // Safari reports the same pinch as a ctrl+wheel too: the gesture is the one that counts.
+      if (gestureScale && e.ctrlKey) return;
       const [sx, sy] = toFb(e);
       const unit = e.deltaMode === 1 ? 16 : e.deltaMode === 2 ? 100 : 1;
       gl.camera.zoomAt(sx, sy, Math.exp((-e.deltaY * unit) / 320));
       fitted = false;
-      gl.requestDraw();
-      publishZoom();
+      zoomGesture.touch();
     };
     const onDown = (e: PointerEvent) => {
       try {
@@ -236,7 +346,9 @@ export const renderer: PluginRenderer<CadOptions> = {
         gl.camera.panPixels(x - prev.x, y - prev.y);
         if (x !== prev.x || y !== prev.y) fitted = false;
         pointers.set(e.pointerId, { x, y });
+        settled();
         gl.requestDraw();
+        publishView();
         return;
       }
       pointers.set(e.pointerId, { x, y });
@@ -246,14 +358,14 @@ export const renderer: PluginRenderer<CadOptions> = {
           const [a, b] = [...pointers.values()];
           gl.camera.zoomAt((a!.x + b!.x) / 2, (a!.y + b!.y) / 2, dist / lastPinch);
           fitted = false;
-          gl.requestDraw();
-          publishZoom();
+          zoomGesture.touch();
         }
         lastPinch = dist;
       }
     };
     const fit = () => {
       if (!drawing) return;
+      zoomGesture.cancel();
       gl.resize();
       gl.camera.fit(drawing.extents);
       fitted = true;
@@ -262,28 +374,31 @@ export const renderer: PluginRenderer<CadOptions> = {
     };
     const onResize = () => {
       if (!gl.resize()) return;
+      zoomGesture.cancel();
       if (drawing && fitted) gl.camera.fit(drawing.extents);
       gl.requestDraw();
       publishZoom();
     };
-    // Safari's trackpad pinch would otherwise zoom the page.
-    const cancel = (e: Event) => e.preventDefault();
     canvas.addEventListener("wheel", onWheel, { passive: false });
     canvas.addEventListener("pointerdown", onDown);
     canvas.addEventListener("pointermove", onMove);
     canvas.addEventListener("pointerup", onUp);
     canvas.addEventListener("pointercancel", onUp);
     canvas.addEventListener("dblclick", fit);
-    canvas.addEventListener("gesturestart", cancel);
-    canvas.addEventListener("gesturechange", cancel);
+    canvas.addEventListener("gesturestart", onGestureStart);
+    canvas.addEventListener("gesturechange", onGestureChange);
+    canvas.addEventListener("gestureend", onGestureEnd);
     const ro = new ResizeObserver(onResize);
     ro.observe(root);
 
     const destroy = () => {
       if (destroyed) return;
       destroyed = true;
+      zoomGesture.cancel();
       ro.disconnect();
       engine.destroy();
+      canvas.removeEventListener("webglcontextlost", onLost);
+      canvas.removeEventListener("webglcontextrestored", onRestored);
       gl.dispose();
       // Give the context back now: a browser holds about sixteen, and a
       // folder of drawings walked with the arrows would exhaust them.
@@ -342,11 +457,37 @@ export const renderer: PluginRenderer<CadOptions> = {
         } else gl.requestDraw();
       },
     };
+    // A lost context (a GPU reset, too many contexts, a phone putting the
+    // tab away) takes every buffer with it. When it comes back, the renderer
+    // is made again with the view as it was, and the worker, which keeps the
+    // document, tessellates the layout again.
+    const onLost = (e: Event) => {
+      e.preventDefault();
+      // Now, while every GL call is a no-op: deleting the dead objects on
+      // the restored context would leave an error for the next check.
+      gl.dispose();
+    };
+    const onRestored = () => {
+      if (destroyed) return;
+      const { camera, background, lineweights, monochrome } = gl;
+      gl = new Renderer(canvas);
+      wire(gl);
+      Object.assign(gl, { background, lineweights, monochrome });
+      Object.assign(gl.camera, { cx: camera.cx, cy: camera.cy, scale: camera.scale });
+      if (!drawing) return;
+      void show(engine.call({ kind: "layout", layout: drawing.layout, background: backgroundBytes(), maxPrimitives }, [], timeoutMs), true).catch(
+        (error) => !destroyed && ctx.status({ phase: "error", error: { code: "drawing", cause: error } }),
+      );
+    };
+    canvas.addEventListener("webglcontextlost", onLost);
+    canvas.addEventListener("webglcontextrestored", onRestored);
+
     const zoom: ZoomController = {
       ...zoomStore,
       setScale(scale, anchor) {
         if (!drawing) return;
-        const r = canvas.getBoundingClientRect();
+        zoomGesture.cancel();
+        const r = root.getBoundingClientRect();
         const a = anchor ?? { x: r.width / 2, y: r.height / 2 };
         gl.camera.zoomAt(a.x * dpr(), (r.height - a.y) * dpr(), scale / (fitScale() / gl.camera.scale));
         fitted = false;
@@ -356,12 +497,116 @@ export const renderer: PluginRenderer<CadOptions> = {
       fit,
     };
 
+    // ── pictures ──
+    // A layout drawn again at the picture's size, in a context of its own
+    // (`./export.ts`); `./raster.ts` has the semantics of regions and line
+    // weights. One picture at a time.
+    const queue = serial();
+    const picture = async (page: number, options: RasterOptions, signal: AbortSignal): Promise<Raster> => {
+      if (destroyed || !drawing) throw new RasterError("failed", "nothing is drawn");
+      const { id, page: at } = layoutFor(layoutsStore.get().items, page, options);
+      // The ground: the session's, or the picture's own.
+      const sessionGround = gl.background;
+      const hex = (bytes: Uint8Array) => `#${[...bytes].map((b) => b.toString(16).padStart(2, "0")).join("")}`;
+      const background = options.background ?? hex(backgroundBytes());
+      const parsed = typeof background === "string" ? parseColor(background) : null;
+      if (!parsed || !isColor(background)) throw new RasterError("invalid", "background is a colour or transparent");
+      // What indexed colours are resolved against, and the ink chosen for: the
+      // picture's ground, or the session's when the picture has none.
+      const ground = parsed.alpha === 0 ? sessionGround : parsed.rgb;
+      const bytes = new Uint8Array(ground.map((v) => Math.round(Math.max(0, Math.min(1, v)) * 255)));
+      // A zoom gesture publishes once per frame: the camera is the truth.
+      publishView();
+      const current = currentFor(viewportStore.get(), id);
+      const early = planExport(options, null, current, hex(backgroundBytes()));
+
+      const answer = await abortable(engine.call({ kind: "layout", layout: id, background: bytes, maxPrimitives }, [], timeoutMs), signal);
+      const d = answer as ParsedDrawing;
+      throwIfAborted(signal);
+      if (d.layout !== id) throw new RasterError("failed", "the layout could not be drawn");
+      const plan = early ?? planExport(options, defaultRegion(d.extents, d.origin), current, hex(backgroundBytes()))!;
+      const view = exportView(plan);
+      checkScale(view.scale, d.extents);
+      // The layers as the viewer shows them where it shows this layout, else as the file has them.
+      const shown = drawing;
+      const layerVisible = shown && shown.layout === id && visible.length === d.layers.length ? [...visible] : d.layers.map((l) => !l.off && !l.frozen);
+      const bitmap = await drawPicture({
+        drawing: d,
+        visible: layerVisible,
+        view,
+        width: plan.width,
+        height: plan.height,
+        ground,
+        alpha: parsed.alpha,
+        lineweights: gl.lineweights,
+        monochrome: gl.monochrome,
+        dpr: dpr(),
+        factors: lineweightFactors(options.lineweight, view.region, view.scale, gl.camera),
+        tile: ctx.options.rasterTile,
+        signal,
+      });
+      if (signal.aborted) {
+        bitmap.close();
+        throw new RasterError("aborted", "aborted");
+      }
+      return { bitmap, width: plan.width, height: plan.height, page: at, layout: id, space: "drawing", region: view.region };
+    };
+    const pictures = createPictures({
+      count: 0,
+      space: "drawing",
+      async raster(page, options) {
+        const { signal, dispose } = linked([options.signal, ctx.signal]);
+        try {
+          return await queue(signal, () => picture(page, options, signal));
+        } finally {
+          dispose();
+        }
+      },
+    });
+    const viewport = { get: viewportStore.get, subscribe: viewportStore.subscribe };
+
+    /**
+     * Binds the files the parsed drawing's references name that the tree has,
+     * and those they name in turn. A reference the tree does not have, or a
+     * file that does not read, stays as it is: its path drawn where it is
+     * inserted, and counted in the warnings.
+     */
+    const bindReferences = async (tree: FileTree, named: string[]) => {
+      const tried = new Set<string>();
+      let wanted = named;
+      for (let n = 0; n < MAX_BOUND_REFERENCES; ) {
+        const path = wanted.find((p) => !tried.has(p.toLowerCase()));
+        if (path === undefined) return;
+        tried.add(path.toLowerCase());
+        const found = resolveInTree(tree, path, [".dwg"]);
+        if (found === null) continue;
+        n++;
+        try {
+          const reader = createSourceReader(await tree.open(found, ctx.signal), ctx.signal);
+          let bytes: Uint8Array;
+          try {
+            bytes = (await reader.bytes()).slice();
+          } finally {
+            reader.dispose();
+          }
+          const answer = (await engine.call({ kind: "attach", path, bytes: bytes.buffer as ArrayBuffer, maxDecompressedBytes, maxEntities }, [bytes.buffer as ArrayBuffer], timeoutMs)) as {
+            xrefs: string[];
+          };
+          wanted = answer.xrefs;
+        } catch (error) {
+          if (destroyed || ctx.signal.aborted) throw error;
+          console.warn(`cad: could not bind ${path} from ${found}`, error);
+        }
+      }
+    };
+
     // A session closed while the file is still being read or parsed: the
     // worker is stopped now, not when it would have finished.
     ctx.signal.addEventListener("abort", destroy, { once: true });
     try {
       const bytes = (await ctx.source.bytes()).slice();
       if (ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+      ctx.status({ phase: "loading", step: "read" });
       // The file goes to the worker once, which answers its thumbnail at
       // once; the thumbnail is up before the parse starts. Should the load
       // fail (a module that traps is replaced, the file with it), the parse
@@ -386,21 +631,33 @@ export const renderer: PluginRenderer<CadOptions> = {
         ctx.status({ phase: "error", error: { code: "drawing_version" } });
         return { controllers: {}, resize: onResize, destroy };
       }
-      await show(
-        engine.call(
-          { kind: "parse", bytes: again, layout: "", background: backgroundBytes(), maxPrimitives, maxDecompressedBytes },
+      const tree = ctx.file.tree;
+      if (tree) {
+        // The files around the drawing are bound in before it is drawn.
+        const parsed = (await engine.call(
+          { kind: "parse", bytes: again, layout: "", background: backgroundBytes(), maxPrimitives, maxDecompressedBytes, maxEntities, draw: false },
           again ? [again] : [],
           timeoutMs,
-        ),
-        false,
-      );
+        )) as { xrefs: string[] };
+        await bindReferences(tree, parsed.xrefs);
+        await show(engine.call({ kind: "layout", layout: "", background: backgroundBytes(), maxPrimitives }, [], timeoutMs), false);
+      } else {
+        await show(
+          engine.call(
+            { kind: "parse", bytes: again, layout: "", background: backgroundBytes(), maxPrimitives, maxDecompressedBytes, maxEntities },
+            again ? [again] : [],
+            timeoutMs,
+          ),
+          false,
+        );
+      }
     } catch (error) {
       destroy();
       throw error;
     }
 
     return {
-      controllers: { layers, layouts, ground: groundController, zoom, warnings },
+      controllers: { layers, layouts, ground: groundController, zoom, warnings, pictures: pictures.controller, viewport },
       resize: onResize,
       destroy,
     };
diff --git a/crates/exav-viewer/ts/cad/warnings.test.ts b/crates/exav-viewer/ts/cad/warnings.test.ts
new file mode 100644
index 00000000..1450b8a9
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/warnings.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+
+import type { Warnings } from "./types";
+import { cadWarnings } from "./warnings";
+
+const none: Warnings = {
+  unknownEntities: 0,
+  missingBlocks: 0,
+  textRuns: 0,
+  strokeGlyphs: 0,
+  hatchPatternsMissing: 0,
+  hatchPatternsTruncated: 0,
+  externalReferences: 0,
+  depthExceeded: 0,
+  sceneTruncated: 0,
+  proxyWithoutGraphics: 0,
+  notDrawn: {},
+  externalFiles: [],
+};
+
+describe("cadWarnings", () => {
+  it("is empty for a drawing drawn whole", () => {
+    expect(cadWarnings(none, false)).toEqual([]);
+  });
+
+  it("names the types left out and the files referenced", () => {
+    const w = { ...none, unknownEntities: 3, notDrawn: { "3DSOLID": 2, REGION: 1 }, externalReferences: 2, externalFiles: ["walls.dwg"] };
+    expect(cadWarnings(w, false)).toEqual([
+      { key: "unknown_entities", count: 3, names: ["3DSOLID (2)", "REGION"] },
+      { key: "external_references", count: 2, names: ["walls.dwg"] },
+    ]);
+  });
+
+  it("says first that the thumbnail stands in for the drawing", () => {
+    const w = { ...none, unknownEntities: 1, notDrawn: { "3DSOLID": 1 } };
+    expect(cadWarnings(w, true).map((x) => x.key)).toEqual(["preview_shown", "unknown_entities"]);
+  });
+
+  it("leaves names out when there are none, as an OLE object's", () => {
+    expect(cadWarnings({ ...none, externalReferences: 1 }, false)).toEqual([{ key: "external_references", count: 1 }]);
+  });
+});
diff --git a/crates/exav-viewer/ts/cad/warnings.ts b/crates/exav-viewer/ts/cad/warnings.ts
new file mode 100644
index 00000000..69b1fbff
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/warnings.ts
@@ -0,0 +1,19 @@
+import type { Warning } from "../core/types.js";
+import type { Warnings } from "./types.js";
+
+/** What a drawing's tab tells the user it left out; `previewShown` when its thumbnail stands in for it. */
+export function cadWarnings(w: Warnings, previewShown: boolean): Warning[] {
+  const out: Warning[] = [];
+  if (previewShown) out.push({ key: "preview_shown", count: 0 });
+  if (w.unknownEntities > 0) {
+    const names = Object.entries(w.notDrawn ?? {}).map(([type, n]) => (n > 1 ? `${type} (${n})` : type));
+    out.push({ key: "unknown_entities", count: w.unknownEntities, ...(names.length > 0 ? { names } : {}) });
+  }
+  if (w.externalReferences > 0) {
+    const names = w.externalFiles ?? [];
+    out.push({ key: "external_references", count: w.externalReferences, ...(names.length > 0 ? { names } : {}) });
+  }
+  if (w.sceneTruncated > 0) out.push({ key: "scene_truncated", count: w.sceneTruncated });
+  if (w.proxyWithoutGraphics > 0) out.push({ key: "proxy_without_graphics", count: w.proxyWithoutGraphics });
+  return out;
+}
diff --git a/crates/exav-viewer/ts/cad/zoom-gesture.test.ts b/crates/exav-viewer/ts/cad/zoom-gesture.test.ts
new file mode 100644
index 00000000..3f79a0ca
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/zoom-gesture.test.ts
@@ -0,0 +1,130 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { Camera } from "./renderer/camera.js";
+import { createZoomGesture, viewTransform } from "./zoom-gesture.js";
+
+function camera(init: Partial<Camera>) {
+  return Object.assign(new Camera(), { width: 800, height: 600 }, init);
+}
+
+describe("viewTransform", () => {
+  it("is the identity for the camera that drew", () => {
+    const c = camera({ cx: 12, cy: -3, scale: 0.5 });
+    const t = viewTransform(c, c, 2);
+    expect(t.k).toBe(1);
+    expect(Math.abs(t.x)).toBe(0);
+    expect(Math.abs(t.y)).toBe(0);
+  });
+
+  it("puts every point where the new camera would draw it, in CSS pixels", () => {
+    const dpr = 2;
+    const drawn = camera({ cx: 100, cy: 50, scale: 0.25 });
+    const now = camera({ cx: 130, cy: 20, scale: 0.1 });
+    const t = viewTransform(drawn, now, dpr);
+    for (const [lx, ly] of [
+      [100, 50],
+      [90, 60],
+      [150, -10],
+    ] as const) {
+      // Device pixels, y up, to CSS pixels, y down.
+      const css = (c: Camera) => {
+        const [sx, sy] = c.toScreen(lx, ly);
+        return [sx / dpr, (c.height - sy) / dpr] as const;
+      };
+      const [x0, y0] = css(drawn);
+      const [x1, y1] = css(now);
+      expect(t.k * x0 + t.x).toBeCloseTo(x1, 6);
+      expect(t.k * y0 + t.y).toBeCloseTo(y1, 6);
+    }
+  });
+
+  it("scales about the point a zoom held fixed", () => {
+    const drawn = camera({ cx: 0, cy: 0, scale: 1 });
+    const now = camera({ cx: 0, cy: 0, scale: 1 });
+    // A 2x zoom about device pixel (600, 200), y up.
+    now.zoomAt(600, 200, 2);
+    const t = viewTransform(drawn, now, 1);
+    expect(t.k).toBe(2);
+    // The same point in CSS pixels, y down: (600, 400).
+    expect(t.k * 600 + t.x).toBeCloseTo(600, 6);
+    expect(t.k * 400 + t.y).toBeCloseTo(400, 6);
+  });
+});
+
+describe("a zoom gesture", () => {
+  beforeEach(() => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "requestAnimationFrame", "cancelAnimationFrame", "performance"] });
+  });
+  afterEach(() => vi.useRealTimers());
+
+  function make() {
+    const frame = vi.fn();
+    const draw = vi.fn();
+    return { frame, draw, gesture: createZoomGesture({ settleMs: 100, staleMs: 500, frame, draw }) };
+  }
+
+  it("shows the canvas moved once per animation frame, however many events there are", () => {
+    const { gesture, frame, draw } = make();
+    for (let i = 0; i < 10; i++) gesture.touch();
+    expect(frame).not.toHaveBeenCalled();
+    vi.advanceTimersByTime(16);
+    expect(frame).toHaveBeenCalledTimes(1);
+    for (let i = 0; i < 10; i++) gesture.touch();
+    vi.advanceTimersByTime(16);
+    expect(frame).toHaveBeenCalledTimes(2);
+    expect(draw).not.toHaveBeenCalled();
+  });
+
+  it("draws sharp once, when the events stop", () => {
+    const { gesture, draw } = make();
+    for (let t = 0; t < 300; t += 16) {
+      gesture.touch();
+      vi.advanceTimersByTime(16);
+    }
+    expect(draw).not.toHaveBeenCalled();
+    // The last event was 16 ms ago.
+    vi.advanceTimersByTime(83);
+    expect(draw).not.toHaveBeenCalled();
+    vi.advanceTimersByTime(2);
+    expect(draw).toHaveBeenCalledTimes(1);
+    vi.advanceTimersByTime(1000);
+    expect(draw).toHaveBeenCalledTimes(1);
+  });
+
+  it("draws sharp now and then while it goes on", () => {
+    const { gesture, draw } = make();
+    for (let t = 0; t < 1200; t += 16) {
+      gesture.touch();
+      vi.advanceTimersByTime(16);
+    }
+    // At 500 and 1000 ms, not at every event.
+    expect(draw.mock.calls.length).toBeGreaterThanOrEqual(2);
+    expect(draw.mock.calls.length).toBeLessThanOrEqual(3);
+  });
+
+  it("publishes what is pending when asked to, and not again", () => {
+    const { gesture, frame } = make();
+    gesture.touch();
+    gesture.flush();
+    expect(frame).toHaveBeenCalledTimes(1);
+    vi.advanceTimersByTime(16);
+    expect(frame).toHaveBeenCalledTimes(1);
+    gesture.flush();
+    expect(frame).toHaveBeenCalledTimes(1);
+  });
+
+  it("does nothing more once cancelled", () => {
+    const { gesture, frame, draw } = make();
+    gesture.touch();
+    gesture.cancel();
+    vi.advanceTimersByTime(1000);
+    expect(frame).not.toHaveBeenCalled();
+    expect(draw).not.toHaveBeenCalled();
+    // And a later gesture starts afresh.
+    gesture.touch();
+    vi.advanceTimersByTime(16);
+    expect(frame).toHaveBeenCalledTimes(1);
+    vi.advanceTimersByTime(200);
+    expect(draw).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/crates/exav-viewer/ts/cad/zoom-gesture.ts b/crates/exav-viewer/ts/cad/zoom-gesture.ts
new file mode 100644
index 00000000..1e1d2d57
--- /dev/null
+++ b/crates/exav-viewer/ts/cad/zoom-gesture.ts
@@ -0,0 +1,104 @@
+/**
+ * A zoom gesture (a pinch, ctrl and the wheel) on the drawing's canvas.
+ *
+ * Drawing a frame costs the GPU time in proportion to what is in view, which
+ * on a large drawing is more than a frame of the display. A frame drawn per
+ * event queues behind the last one and the zoom lags seconds behind the
+ * fingers. So while the gesture goes on, the canvas already drawn is moved and
+ * scaled by the compositor (`viewTransform`) to where the camera now is, at
+ * most once per animation frame, and the drawing is drawn sharp once the
+ * gesture pauses (and now and then if it does not).
+ */
+
+/** What `Camera` holds: where it looks, and the framebuffer it looks through. */
+export interface View {
+  cx: number;
+  cy: number;
+  /** Local units per device pixel. */
+  scale: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * The CSS transform, with its origin at the canvas's top left, that shows a
+ * canvas drawn from `drawn` as it would look drawn from `now`. `dpr` is the
+ * device pixels per CSS pixel the framebuffer was made for.
+ */
+export function viewTransform(drawn: View, now: View, dpr: number): { k: number; x: number; y: number } {
+  const k = drawn.scale / now.scale;
+  const width = drawn.width / dpr;
+  const height = drawn.height / dpr;
+  return {
+    k,
+    x: (width * (1 - k)) / 2 + (drawn.cx - now.cx) / (now.scale * dpr),
+    // The camera's y is up, a CSS y is down.
+    y: (height * (1 - k)) / 2 - (drawn.cy - now.cy) / (now.scale * dpr),
+  };
+}
+
+export interface ZoomGesture {
+  /** The camera moved by a zoom event. */
+  touch(): void;
+  /** Runs the pending `frame` now, so that what it publishes is up to date. */
+  flush(): void;
+  /** The view is drawn sharp by someone else: nothing is pending. */
+  cancel(): void;
+}
+
+export interface ZoomGestureOptions {
+  /** Time without a zoom event after which the gesture is over, in ms. */
+  settleMs: number;
+  /** The longest a gesture goes on showing the same frame scaled, in ms. */
+  staleMs: number;
+  /** Once per animation frame while the camera moves: shows the frame already drawn where the camera is. */
+  frame(): void;
+  /** Asks for a sharp frame at the camera. */
+  draw(): void;
+}
+
+export function createZoomGesture(o: ZoomGestureOptions): ZoomGesture {
+  let raf = 0;
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  let moving = false;
+  // When a sharp frame was last asked for.
+  let sharpAt = 0;
+
+  const run = () => {
+    raf = 0;
+    o.frame();
+    if (moving && performance.now() - sharpAt >= o.staleMs) {
+      sharpAt = performance.now();
+      o.draw();
+    }
+  };
+  const stop = () => {
+    clearTimeout(timer);
+    timer = undefined;
+    moving = false;
+  };
+  return {
+    touch() {
+      if (!moving) {
+        moving = true;
+        sharpAt = performance.now();
+      }
+      if (!raf) raf = requestAnimationFrame(run);
+      clearTimeout(timer);
+      timer = setTimeout(() => {
+        stop();
+        o.draw();
+      }, o.settleMs);
+    },
+    flush() {
+      if (!raf) return;
+      cancelAnimationFrame(raf);
+      run();
+    },
+    cancel() {
+      stop();
+      if (raf) cancelAnimationFrame(raf);
+      raf = 0;
+    },
+  };
+}
diff --git a/crates/exav-viewer/ts/core/assets.ts b/crates/exav-viewer/ts/core/assets.ts
index f7bfb451..bf110d65 100644
--- a/crates/exav-viewer/ts/core/assets.ts
+++ b/crates/exav-viewer/ts/core/assets.ts
@@ -11,6 +11,12 @@ export interface AssetManifest {
   };
   /** Single files, relative to `assetBase`, by name. */
   files: Record<string, string>;
+  /**
+   * The external converters copied (`externalConverter`), by package name:
+   * the path of the module each exports `convert` from, relative to
+   * `assetBase`.
+   */
+  converters?: Record<string, string>;
   /** Every file copied, relative to `assetBase`, for prefetching. */
   all: readonly string[];
 }
diff --git a/crates/exav-viewer/ts/core/detect.test.ts b/crates/exav-viewer/ts/core/detect.test.ts
index 46f68b64..285a7b47 100644
--- a/crates/exav-viewer/ts/core/detect.test.ts
+++ b/crates/exav-viewer/ts/core/detect.test.ts
@@ -27,6 +27,17 @@ describe("what the viewer can show", () => {
     expect(kind({ path: "x/survey.DXF" })).toBe("dxf");
   });
 
+  it("plays FLAC, by its type, its name or its bytes", () => {
+    expect(kind({ type: "audio/flac" })).toBe("audio");
+    expect(kind({ path: "valse.FLAC" })).toBe("audio");
+    expect(detector.detectBytes("track", new TextEncoder().encode("fLaC\0\0\0\x22"))).toBe("audio");
+  });
+
+  it("shows SVG as an image, never as text", () => {
+    expect(kind({ path: "logo.svg" })).toBe("image");
+    expect(kind({ type: "image/svg+xml" })).toBe("image");
+  });
+
   it("does not claim a HEIC photograph: there is no HEIC plugin", () => {
     expect(kind({ type: "image/heic" })).toBeNull();
     expect(kind({ path: "documents/IMG_4021.HEIC" })).toBeNull();
@@ -48,9 +59,10 @@ describe("what the viewer can show", () => {
     expect(kind({ type: "text/tab-separated-values" })).toBe("csv");
     expect(kind({ type: "text/csv; charset=utf-8" })).toBe("csv");
     expect(kind({ type: "application/vnd.ms-excel", path: "x/table.CSV" })).toBe("csv");
-    expect(kind({ type: "application/vnd.ms-excel", path: "x/table.xls" })).toBeNull();
+    expect(kind({ type: "application/vnd.ms-excel", path: "x/table.xls" })).toBe("xls");
     expect(kind({ type: "text/plain", path: "x/lots.csv" })).toBe("csv");
-    expect(kind({ type: "text/plain", path: "x/notes.txt" })).toBeNull();
+    expect(kind({ type: "text/plain", path: "x/notes.txt" })).toBe("text");
+    expect(kind({ type: "text/plain", path: "x/notes" })).toBeNull();
     expect(kind({ path: "x/export.TSV" })).toBe("csv");
   });
 
@@ -72,6 +84,50 @@ describe("what the viewer can show", () => {
     expect(kind({ type: "application/zip", path: "x/plan.pdf" })).toBe("archive");
   });
 
+  it("opens the archives, packages and images a person looks inside, by name or by type", () => {
+    const named = [
+      "a.tar.zst", "a.tzst", "a.zst", "a.lz4", "a.lz", "a.tlz", "a.Z", "a.taz", "a.tbz",
+      "setup.cab", "help.chm", "disc.ISO", "old.lzh", "old.lha", "old.arj", "libx.a", "x.ar", "tool.deb", "tool.udeb",
+      "initrd.cpio", "app.xar", "app.pkg", "Xcode.xip", "Install.dmg", "install.wim", "install.esd",
+      "winmail.dat", "dir/WINMAIL.DAT", "disk.vhd", "disk.vhdx", "disk.vmdk", "disk.qcow2", "vm.ova",
+      "old.zoo", "old.arc", "kr.alz", "kr.egg",
+      "lib.jar", "site.war", "app.apk", "split.apks", "store.xapk", "bundle.aab", "app.ipa", "ext.xpi", "pkg.whl", "pkg.nupkg", "ext.vsix", "map.kmz",
+      "app.appx", "app.appxbundle", "app.msix", "app.msixbundle", "sd-card.img",
+      "comic.cbz", "comic.cbr", "comic.cb7", "comic.cbt",
+      "big.7z.001", "docs.ZIP.001", "set.rar.001", "set.tar.001", "span.z01",
+    ];
+    for (const path of named) {
+      expect(kind({ path }), path).toBe("archive");
+      expect(kind({ type: "application/octet-stream", path }), path).toBe("archive");
+    }
+    const typed = [
+      "application/zstd", "application/x-lz4", "application/x-lzip", "application/x-lzma", "application/x-rpm", "application/x-compress", "application/vnd.ms-cab-compressed",
+      "application/x-iso9660-image", "application/x-lzh-compressed", "application/x-arj", "application/x-archive",
+      "application/vnd.debian.binary-package", "application/x-cpio", "application/x-xar", "application/x-apple-diskimage",
+      "application/x-ms-wim", "application/vnd.ms-tnef", "application/java-archive", "application/vnd.android.package-archive",
+      "application/vnd.comicbook+zip", "application/vnd.comicbook-rar",
+    ];
+    for (const type of typed) expect(kind({ type }), type).toBe("archive");
+    // What a desktop's own tables give by extension (shared-mime-info, Windows, Playwright's).
+    const desktop: [string, string][] = [
+      ["application/x-compressed-tar", "a.tgz"], ["application/x-xz-compressed-tar", "a.txz"],
+      ["application/x-bzip2-compressed-tar", "a.tbz2"], ["application/x-zstd-compressed-tar", "a.tzst"],
+      ["application/x-tarz", "a.taz"], ["application/x-compressed", "a.tgz"],
+      ["application/vnd.efi.iso", "a.iso"], ["application/x-sega-cd-rom", "a.iso"], ["application/x-gamecube-rom", "a.iso"],
+      ["application/x-freearc", "a.arc"], ["application/x-newton-compatible-pkg", "a.pkg"], ["application/ovf", "a.ova"],
+      ["application/x-vhd-disk", "a.vhd"], ["application/x-vhdx-disk", "a.vhdx"], ["application/x-vmdk-disk", "a.vmdk"],
+    ];
+    for (const [type, path] of desktop) expect(kind({ type, path }), `${type} ${path}`).toBe("archive");
+    // VHDL source is not a virtual disk.
+    expect(kind({ type: "text/x-vhdl", path: "alu.vhd" })).toBeNull();
+    // Documents that are zips, and what another reader opens, are not archives to a viewer.
+    for (const path of ["a.epub", "a.msg", "a.eml", "a.sit", "a.ace", "a.exe"]) {
+      expect(kind({ type: "application/octet-stream", path }), path).toBeNull();
+    }
+    for (const path of ["a.odt", "a.ods", "a.doc"]) expect(kind({ type: "application/octet-stream", path }), path).toBe(path.slice(2));
+    expect(kind({ type: "application/zip", path: "a.odp" })).toBe("odp");
+  });
+
   it("opens a model and a mesh", () => {
     expect(kind({ path: "x/building.ifc" })).toBe("ifc");
     expect(kind({ type: "model/ifc" })).toBe("ifc");
@@ -81,10 +137,133 @@ describe("what the viewer can show", () => {
     expect(kind({ path: "x/building.ifczip" })).toBeNull();
   });
 
+  it("opens OBJ, PLY and glTF by type, and by extension where the type is unknown or plain text", () => {
+    expect(kind({ type: "model/obj" })).toBe("obj");
+    expect(kind({ path: "x/chair.OBJ" })).toBe("obj");
+    expect(kind({ type: "text/plain", path: "x/chair.obj" })).toBe("obj");
+    expect(kind({ type: "application/x-tgif", path: "x/chair.obj" })).toBe("obj");
+    expect(kind({ type: "model/ply" })).toBe("ply");
+    expect(kind({ type: "application/x-ply" })).toBe("ply");
+    expect(kind({ type: "text/plain", path: "scan.ply" })).toBe("ply");
+    expect(kind({ type: "model/gltf+json" })).toBe("gltf");
+    expect(kind({ type: "model/gltf-binary" })).toBe("gltf");
+    expect(kind({ path: "x/chair.gltf" })).toBe("gltf");
+    expect(kind({ type: "application/octet-stream", path: "x/chair.glb" })).toBe("gltf");
+    // Plain text is claimed by name only, and only for these extensions.
+    expect(kind({ type: "text/plain", path: "x/chair.txt" })).not.toBe("obj");
+    expect(kind({ type: "text/plain" })).toBeNull();
+    expect(kind({ type: "image/png", path: "x/chair.obj" })).toBe("image");
+  });
+
+  it("opens text by its name or its type, and only a name or a type it knows", () => {
+    for (const path of ["a.txt", "a.LOG", "README.md", "a.markdown", "a.json", "a.xml", "a.kml", "a.gpx", "a.yaml", "a.yml", "a.toml", "a.ini", "a.conf", "a.js", "a.ts", "a.py", "a.sh", "a.css", "a.c", "a.h", "a.rs", "a.go", "a.java", "a.html", "a.htm", "a.srt", "a.vtt", "a.diff", "a.patch"]) {
+      expect(kind({ path }), path).toBe("text");
+      expect(kind({ type: "application/octet-stream", path }), path).toBe("text");
+      expect(kind({ type: "text/plain", path }), path).toBe("text");
+    }
+    for (const type of ["text/markdown", "application/json", "text/xml", "application/xml", "application/atom+xml", "text/html", "text/vtt", "application/yaml", "text/x-diff", "text/css"]) {
+      expect(kind({ type }), type).toBe("text");
+    }
+    // Browsers type .ts as an MPEG transport stream and .js as a script.
+    expect(kind({ type: "video/mp2t", path: "src/app.ts" })).toBe("text");
+    expect(kind({ type: "text/javascript", path: "src/app.js" })).toBe("text");
+    // A file is not text because it happens to be: an unknown name stays unclaimed.
+    expect(kind({ type: "text/plain", path: "a.xyz" })).toBeNull();
+    expect(kind({ type: "text/plain", path: "LICENSE" })).toBeNull();
+    expect(kind({ type: "text/plain" })).toBeNull();
+    expect(kind({ type: "application/octet-stream", path: "a.bin" })).toBeNull();
+    // SVG is a document that can carry scripts: drawn as an image, never shown as XML.
+    expect(kind({ type: "text/plain", path: "a.svg" })).toBeNull();
+    expect(kind({ type: "image/svg+xml", path: "a.svg" })).toBe("image");
+    // The table reader keeps its files.
+    expect(kind({ type: "text/plain", path: "a.csv" })).toBe("csv");
+    expect(kind({ path: "a.tsv" })).toBe("csv");
+  });
+
+  it("opens a text member by its name, and believes the bytes over the name", () => {
+    const text = new TextEncoder().encode("hello\n");
+    expect(detector.detectBytes("docs/notes.txt", text)).toBe("text");
+    expect(detector.detectBytes("data.json", text)).toBe("text");
+    expect(detector.detectBytes("notes", text)).toBeNull();
+    expect(detector.detectBytes("notes.txt", new TextEncoder().encode("%PDF-1.4\n"))).toBe("pdf");
+    expect(detector.detectBytes("table.csv", text)).toBe("csv");
+  });
+
+  it("claims the Office formats no browser engine reads, which are converted", () => {
+    expect(kind({ type: "application/msword" })).toBe("doc");
+    expect(kind({ type: "text/rtf" })).toBe("rtf");
+    expect(kind({ path: "x/letter.RTF" })).toBe("rtf");
+    expect(kind({ type: "application/vnd.oasis.opendocument.text" })).toBe("odt");
+    expect(kind({ type: "application/vnd.ms-powerpoint" })).toBe("ppt");
+    expect(kind({ path: "x/show.pps" })).toBe("ppt");
+    expect(kind({ type: "application/vnd.oasis.opendocument.presentation" })).toBe("odp");
+    expect(kind({ type: "application/vnd.oasis.opendocument.spreadsheet" })).toBe("ods");
+    expect(kind({ type: "application/x-msexcel" })).toBe("xls");
+    // Windows types every .csv so when Excel is installed: the 1997 workbook needs its extension.
+    expect(kind({ type: "application/vnd.ms-excel" })).toBeNull();
+    expect(kind({ type: "application/vnd.ms-excel", path: "x/quote.xls" })).toBe("xls");
+    // Templates, slide shows and flat XML, with their documents.
+    for (const [path, format] of [
+      ["x/letter.dot", "doc"],
+      ["x/letter.ott", "odt"],
+      ["x/letter.fodt", "odt"],
+      ["x/deck.pps", "ppt"],
+      ["x/deck.pot", "ppt"],
+      ["x/deck.otp", "odp"],
+      ["x/deck.fodp", "odp"],
+      ["x/sheet.xlt", "xls"],
+      ["x/sheet.ots", "ods"],
+      ["x/sheet.fods", "ods"],
+    ]) expect(kind({ path }), path).toBe(format);
+    expect(kind({ type: "application/vnd.oasis.opendocument.text-flat-xml" })).toBe("odt");
+    expect(kind({ type: "application/vnd.oasis.opendocument.spreadsheet-template" })).toBe("ods");
+    // Apple's, zipped: by type, or by name over a zip type.
+    expect(kind({ type: "application/vnd.apple.keynote" })).toBe("keynote");
+    expect(kind({ type: "application/zip", path: "x/talk.key" })).toBe("keynote");
+    expect(kind({ type: "application/x-iwork-numbers-sffnumbers" })).toBe("numbers");
+    expect(kind({ path: "x/budget.numbers" })).toBe("numbers");
+  });
+
+  it("claims the drawing and page layout formats, which are converted", () => {
+    expect(kind({ type: "application/vnd.oasis.opendocument.graphics" })).toBe("odg");
+    expect(kind({ type: "application/vnd.visio" })).toBe("visio");
+    expect(kind({ type: "application/vnd.ms-visio.drawing.macroEnabled.main+xml" })).toBe("visio");
+    expect(kind({ type: "application/x-coreldraw" })).toBe("coreldraw");
+    expect(kind({ type: "application/vnd.ms-publisher" })).toBe("publisher");
+    expect(kind({ type: "application/x-pagemaker" })).toBe("pagemaker");
+    expect(kind({ type: "application/x-wpg" })).toBe("wpg");
+    for (const [path, format] of [
+      ["x/plan.otg", "odg"],
+      ["x/plan.fodg", "odg"],
+      ["x/plan.vsd", "visio"],
+      ["x/plan.vdx", "visio"],
+      ["x/plan.vstx", "visio"],
+      ["x/logo.cmx", "coreldraw"],
+      ["x/flyer.pub", "publisher"],
+      ["x/flyer.p65", "pagemaker"],
+      ["x/logo.fh11", "freehand"],
+      ["x/flyer.qxd", "quarkxpress"],
+      ["x/logo.zmf", "zonerdraw"],
+      ["x/clip.wpg", "wpg"],
+    ]) expect(kind({ path }), path).toBe(format);
+    // Zips by name: Open XML Visio, CorelDRAW X4 and later, Zoner Draw 5.
+    expect(kind({ type: "application/zip", path: "x/plan.vsdx" })).toBe("visio");
+    expect(kind({ type: "application/zip", path: "x/logo.cdr" })).toBe("coreldraw");
+    expect(kind({ type: "application/zip", path: "x/logo.zmf" })).toBe("zonerdraw");
+    expect(kind({ type: "application/zip", path: "x/plan.odg" })).toBe("odg");
+  });
+
+  it("opens Open XML templates and slide shows as their documents, unconverted", () => {
+    expect(kind({ path: "x/letter.dotx" })).toBe("docx");
+    expect(kind({ type: "application/zip", path: "x/show.ppsx" })).toBe("pptx");
+    expect(kind({ path: "x/deck.potx" })).toBe("pptx");
+    expect(kind({ type: "application/vnd.openxmlformats-officedocument.presentationml.slideshow" })).toBe("pptx");
+  });
+
   it("leaves everything else to the browser", () => {
     expect(kind({ type: "application/vnd.ms-excel" })).toBeNull();
-    expect(kind({ type: "application/msword" })).toBeNull();
-    expect(kind({ type: "image/svg+xml" })).toBeNull();
+    expect(kind({ type: "application/vnd.ms-project" })).toBeNull();
+    expect(kind({ type: "application/x-iwork-pages-sffpages" })).toBeNull();
   });
 
   it("follows a link rather than drawing it", () => {
@@ -94,9 +273,13 @@ describe("what the viewer can show", () => {
   it("falls back to the extension only where the type says nothing", () => {
     expect(kind({ path: "documents/old.PDF" })).toBe("pdf");
     expect(kind({ path: "documents/old.JPG" })).toBe("image");
-    expect(kind({ path: "documents/quote.xls" })).toBeNull();
+    expect(kind({ path: "documents/quote.xls" })).toBe("xls");
+    expect(kind({ path: "documents/plan.mpp" })).toBeNull();
     expect(kind({ type: "application/octet-stream", path: "documents/photo.jpg" })).toBe("image");
-    expect(kind({ type: "application/octet-stream", path: "documents/notes.rtf" })).toBeNull();
+    expect(kind({ type: "application/octet-stream", path: "documents/notes.rtf" })).toBe("rtf");
+    expect(kind({ type: "application/octet-stream", path: "documents/notes.pages" })).toBeNull();
+    // RTF is text, and typed so by some systems.
+    expect(kind({ type: "text/plain", path: "documents/notes.rtf" })).toBe("rtf");
     // A picture named plan.pdf is a picture: the type is believed.
     expect(kind({ type: "image/png", path: "documents/plan.pdf" })).toBe("image");
     expect(kind({ type: "application/pdf", path: "x/scan.png" })).toBe("pdf");
@@ -134,13 +317,110 @@ describe("what the first bytes say", () => {
     expect(sniff(bytes([0xff, 0x4f, 0xff, 0x51, 0, 0x2f]))).toBe("image/j2c");
     expect(sniff(bytes([0x97], "JB2", [0x0d, 0x0a, 0x1a, 0x0a, 1]))).toBe("image/x-jbig2");
     const wasm = createDetector([{ id: "image", match: { types: [...MATCHERS.image.types!, ...WASM_IMAGES.types!], extensions: [...MATCHERS.image.extensions!, ...WASM_IMAGES.extensions!] } }]);
-    for (const name of ["scan.jp2", "scan.jpf", "scan.jpx", "scan.j2k", "scan.j2c", "fax.jb2", "fax.jbig2"]) {
+    expect(sniff(bytes([0, 0, 0, 0x0c], "JXL ", [0x0d, 0x0a, 0x87, 0x0a, 0, 0, 0, 0x14]))).toBe("image/jxl");
+    expect(sniff(bytes([0xff, 0x0a, 0x4c]))).toBe("image/jxl");
+    expect(sniff(bytes([0xff, 0xd8, 0xff, 0xe0]))).toBe("image/jpeg");
+    for (const name of ["scan.jp2", "scan.jpf", "scan.jpx", "scan.j2k", "scan.j2c", "fax.jb2", "fax.jbig2", "photo.jxl"]) {
       expect(wasm.detect({ name, type: "" }), name).toBe("image");
       expect(detector.detect({ name, type: "" }), name).toBeNull();
     }
     expect(wasm.detectBytes("scan", bytes([0, 0, 0, 0x0c], "jP  ", [0x0d, 0x0a, 0x87, 0x0a]))).toBe("image");
   });
 
+  it("knows the camera RAW files that are not TIFF underneath, and takes a CR3 for a photograph, not a video", () => {
+    // What exav-render's fixtures start with (tests/fixtures/raw/make.py).
+    const cases: [string, Uint8Array][] = [
+      ["image/x-olympus-orf", bytes("IIRO", [8, 0, 0, 0])],
+      ["image/x-olympus-orf", bytes("IIRS", [8, 0, 0, 0])],
+      ["image/x-olympus-orf", bytes("MMOR", [0, 0, 0, 8])],
+      ["image/x-panasonic-rw2", bytes("IIU", [0, 8, 0, 0, 0])],
+      ["image/x-fuji-raf", bytes("FUJIFILMCCD-RAW 0201FF129504")],
+      ["image/x-sigma-x3f", bytes("FOVb", [2, 0, 2, 0])],
+      ["image/x-canon-crw", bytes("II", [0x1a, 0, 0, 0], "HEAPCCDR")],
+      ["image/x-minolta-mrw", bytes([0], "MRM", [0, 1, 0, 0])],
+      ["image/x-canon-cr3", bytes([0, 0, 0, 0x18], "ftyp", "crx ", [0, 0, 0, 1], "crx ")],
+    ];
+    for (const [type, head] of cases) expect(sniff(head), type).toBe(type);
+    // Another brand is the video it was.
+    expect(sniff(bytes([0, 0, 0, 0x18], "ftyp", "isom", [0, 0, 0, 1]))).toBe("video/mp4");
+    // The TIFF-structured ones (DNG, CR2, NEF, ARW, PEF...) start as a TIFF.
+    expect(sniff(bytes("II*", [0, 0x10, 0, 0, 0], "CR", [2, 0]))).toBe("image/tiff");
+    expect(sniff(bytes("MM", [0], "*", [0, 0, 0, 8]))).toBe("image/tiff");
+  });
+
+  it("opens camera RAW files in the image plugin with WebAssembly decoders, by name, type or bytes, and by no other", () => {
+    const wasm = createDetector([
+      {
+        id: "image",
+        match: {
+          types: [...MATCHERS.image.types!, ...WASM_IMAGES.types!],
+          extensions: [...MATCHERS.image.extensions!, ...WASM_IMAGES.extensions!],
+          extensionOverrides: WASM_IMAGES.extensionOverrides!,
+        },
+      },
+    ]);
+    const names = [
+      "IMG_0001.CR2", "IMG_0001.CR3", "IMG_0001.crw", "DSC_0001.NEF", "DSC_0001.NRW", "DSC_0001.ARW", "DSC_0001.SR2", "DSC_0001.SRF", "P1000001.ORF", "P1000001.RW2",
+      "P1000001.RAW", "P1000001.RWL", "DSCF0001.RAF", "IMGP0001.PEF", "SAM_0001.SRW", "B0001.3FR", "C0001.IIQ", "SDIM0001.X3F", "photo.dng", "PHOTO.GPR", "DiMAGE.MRW",
+    ];
+    for (const name of names) {
+      expect(wasm.detect({ name, type: "" }), name).toBe("image");
+      expect(detector.detect({ name, type: "" }), name).toBeNull();
+    }
+    for (const type of ["image/x-adobe-dng", "image/x-canon-cr2", "image/x-nikon-nef", "image/x-sony-arw", "image/x-fuji-raf", "image/x-canon-cr3"]) {
+      expect(wasm.detect({ name: "file", type }), type).toBe("image");
+    }
+    // A desktop types a Kodak .dcr as the Shockwave file it also is: the name answers.
+    expect(wasm.detect({ name: "K0001.DCR", type: "application/x-director" })).toBe("image");
+    expect(wasm.detect({ name: "movie.dir", type: "application/x-director" })).toBeNull();
+    // Their bytes alone, under a name that says nothing.
+    expect(wasm.detectBytes("download", bytes("FUJIFILMCCD-RAW 0201"))).toBe("image");
+    expect(wasm.detectBytes("download", bytes([0, 0, 0, 0x18], "ftyp", "crx ", [0, 0, 0, 1]))).toBe("image");
+    expect(wasm.detectBytes("download", bytes("IIRO", [8, 0, 0, 0]))).toBe("image");
+    expect(wasm.detectBytes("download", bytes("II*", [0, 8, 0, 0, 0]))).toBe("image");
+  });
+
+  it("knows the archives and compressed streams by their first bytes", () => {
+    const at = (offset: number, ...parts: (string | number[])[]) => bytes(new Array(offset).fill(0), ...parts);
+    const cases: [string, Uint8Array][] = [
+      ["application/x-bzip2", bytes("BZh9", "1AY&SY")],
+      ["application/x-xz", bytes([0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0, 4])],
+      ["application/zstd", bytes([0x28, 0xb5, 0x2f, 0xfd, 0x24])],
+      ["application/x-lz4", bytes([0x04, 0x22, 0x4d, 0x18, 0x64])],
+      ["application/x-lzip", bytes("LZIP", [1, 12])],
+      ["application/x-rpm", bytes([0xed, 0xab, 0xee, 0xdb, 3, 0])],
+      ["application/x-compress", bytes([0x1f, 0x9d, 0x90])],
+      ["application/x-tar", at(257, "ustar", [0], "00")],
+      ["application/vnd.ms-cab-compressed", bytes("MSCF", [0, 0, 0, 0, 0x10])],
+      ["application/vnd.ms-htmlhelp", bytes("ITSF", [3, 0, 0, 0])],
+      ["application/x-lzh-compressed", bytes([0x20, 0x4f], "-lh5-", [0])],
+      ["application/x-lzh-compressed", bytes([0x20, 0x4f], "-lzs-", [0])],
+      ["application/x-arj", bytes([0x60, 0xea, 0x2e, 0x00])],
+      ["application/x-archive", bytes("!<arch>\n", "debian-binary   ")],
+      ["application/x-cpio", bytes("070701", "00000001")],
+      ["application/x-xar", bytes("xar!", [0, 0x1c])],
+      ["application/x-ms-wim", bytes("MSWIM", [0, 0, 0, 0xd0, 0])],
+      ["application/vnd.ms-tnef", bytes([0x78, 0x9f, 0x3e, 0x22, 1, 0])],
+      ["application/x-vhdx", bytes("vhdxfile")],
+      ["application/x-vmdk", bytes("KDMV", [1, 0, 0, 0])],
+      ["application/x-qemu-disk", bytes([0x51, 0x46, 0x49, 0xfb, 0, 0, 0, 3])],
+    ];
+    for (const [type, head] of cases) {
+      expect(sniff(head), type).toBe(type);
+      expect(detector.detectBytes("member", head), type).toBe("archive");
+    }
+  });
+
+  it("does not take text for an archive", () => {
+    // Magic numbers that start with letters: a note that begins the same way is a note.
+    for (const text of ["BZh is the bzip2 header", "LZIP is a format", "xar! is a shout", "MSCF is a type", "MSWIM is a word", "ITSF is not it"]) {
+      expect(detector.detectBytes("notes.txt", bytes(text)), text).toBe("text");
+      expect(detector.detectBytes("notes", bytes(text)), text).toBeNull();
+    }
+    expect(sniff(bytes("-lh5- at the front"))).toBe("");
+    expect(sniff(bytes("MSCF", [0, 0, 0, 1]))).toBe("");
+  });
+
   it("tells a film from a photograph, both being ftyp boxes", () => {
     expect(sniff(isoBmff("qt  "))).toBe("video/quicktime");
     expect(sniff(isoBmff("isom"))).toBe("video/mp4");
@@ -155,6 +435,26 @@ describe("what the first bytes say", () => {
 describe("which plugin opens a member of an archive", () => {
   const member = (name: string, b: Uint8Array) => detector.detectBytes(name, b);
 
+  it("recognises a PLY by its header and a GLB by its magic, and leaves other text alone", () => {
+    const ply = bytes("ply\nformat ascii 1.0\nelement vertex 3\n");
+    expect(member("scan", ply)).toBe("ply");
+    expect(member("scan.bin", bytes("ply\r\nformat binary_little_endian 1.0\n"))).toBe("ply");
+    expect(member("scan.ply", bytes("whatever"))).toBe("ply");
+    // A note that starts with the word is a note.
+    expect(member("notes.txt", bytes("ply\nthe plywood order\n"))).toBe("text");
+    expect(member("notes", bytes("ply\nthe plywood order\n"))).toBeNull();
+    const glb = bytes([0x67, 0x6c, 0x54, 0x46, 2, 0, 0, 0, 0x20, 0, 0, 0]);
+    expect(member("chair", glb)).toBe("gltf");
+    expect(member("chair.glb", bytes([1, 2, 3]))).toBe("gltf");
+    // "glTF" with another version, or as text.
+    expect(member("chair", bytes([0x67, 0x6c, 0x54, 0x46, 1, 0, 0, 0]))).toBeNull();
+    expect(member("notes", bytes("glTF is a format"))).toBeNull();
+    // Text with no signature: the name.
+    expect(member("chair.obj", bytes("v 0 0 0\n"))).toBe("obj");
+    expect(member("chair.gltf", bytes('{"asset":{}}'))).toBe("gltf");
+    expect(member("chair", bytes("v 0 0 0\n"))).toBeNull();
+  });
+
   it("believes the bytes over the name", () => {
     expect(member("plan.pdf", bytes([0xff, 0xd8, 0xff, 0xe0]))).toBe("image");
     expect(member("quote", bytes("%PDF-1.4"))).toBe("pdf");
diff --git a/crates/exav-viewer/ts/core/formats.ts b/crates/exav-viewer/ts/core/formats.ts
index 4f6f5238..f964eb00 100644
--- a/crates/exav-viewer/ts/core/formats.ts
+++ b/crates/exav-viewer/ts/core/formats.ts
@@ -9,7 +9,7 @@ const ascii = (text: string) => [...text].map((c) => c.charCodeAt(0));
 
 /**
  * What the first bytes prove, in order, first match wins. Formats with no
- * signature (DXF, CSV, STL) are told apart by their name alone.
+ * signature (DXF, CSV, STL, OBJ, glTF) are told apart by their name alone.
  */
 export const SIGNATURES: readonly Signature[] = [
   { type: "application/pdf", prefix: ascii("%PDF-") },
@@ -27,6 +27,22 @@ export const SIGNATURES: readonly Signature[] = [
   { type: "image/jp2", prefix: [0, 0, 0, 0x0c, ...ascii("jP  "), 0x0d, 0x0a, 0x87, 0x0a] },
   { type: "image/j2c", prefix: [0xff, 0x4f, 0xff, 0x51] },
   { type: "image/x-jbig2", prefix: [0x97, ...ascii("JB2"), 0x0d, 0x0a, 0x1a, 0x0a] },
+  // JPEG XL: its signature box, and a bare codestream's two bytes.
+  { type: "image/jxl", prefix: [0, 0, 0, 0x0c, ...ascii("JXL "), 0x0d, 0x0a, 0x87, 0x0a] },
+  { type: "image/jxl", prefix: [0xff, 0x0a] },
+  // Camera RAW files that are not TIFF underneath (the TIFF-structured ones,
+  // DNG, CR2, NEF, ARW, PEF and the rest, sniff as `image/tiff`): Olympus
+  // (IIRO, IIRS, MMOR), Panasonic, Fujifilm, Sigma, Canon CRW and Minolta.
+  { type: "image/x-olympus-orf", prefix: ascii("IIRO") },
+  { type: "image/x-olympus-orf", prefix: ascii("IIRS") },
+  { type: "image/x-olympus-orf", prefix: ascii("MMOR") },
+  { type: "image/x-panasonic-rw2", prefix: [0x49, 0x49, 0x55, 0x00] },
+  { type: "image/x-fuji-raf", prefix: ascii("FUJIFILMCCD-RAW") },
+  { type: "image/x-sigma-x3f", prefix: ascii("FOVb") },
+  { type: "image/x-canon-crw", prefix: [0x49, 0x49, 0x1a, 0, 0, 0], also: ascii("HEAPCCDR"), alsoOffset: 6 },
+  { type: "image/x-minolta-mrw", prefix: [0, ...ascii("MRM")] },
+  // Canon CR3, an ISO-BMFF file: named before the MP4 catch-all below.
+  { type: "image/x-canon-cr3", prefix: ascii("ftyp"), offset: 4, also: ascii("crx "), alsoOffset: 8 },
   // Named so that the MP4 catch-all below does not take a photograph for a
   // video. No plugin claims HEIC.
   { type: "image/heic", prefix: ascii("ftyp"), offset: 4, also: ascii("heic"), alsoOffset: 8 },
@@ -38,15 +54,50 @@ export const SIGNATURES: readonly Signature[] = [
   { type: "video/mp4", prefix: ascii("ftyp"), offset: 4 },
   { type: "video/webm", prefix: [0x1a, 0x45, 0xdf, 0xa3] },
   { type: "audio/mpeg", prefix: ascii("ID3") },
+  { type: "audio/flac", prefix: ascii("fLaC") },
   { type: "application/ogg", prefix: ascii("OggS") },
   { type: "image/vnd.dwg", prefix: ascii("AC10") },
   // A STEP file; the schema line, a few hundred bytes in, says whether it is
   // an IFC model (`ifc`'s `confirmSniff`).
   { type: "model/ifc", prefix: ascii("ISO-10303-21;") },
+  // A PLY header's first line (`ply`'s `confirmSniff` reads the second), and
+  // a GLB's magic with its version 2.
+  { type: "model/ply", prefix: ascii("ply\n") },
+  { type: "model/ply", prefix: ascii("ply\r\n") },
+  { type: "model/gltf-binary", prefix: ascii("glTF"), also: [2, 0, 0, 0], alsoOffset: 4 },
   { type: "application/zip", prefix: [0x50, 0x4b, 0x03, 0x04] },
   { type: "application/x-7z-compressed", prefix: [0x37, 0x7a, 0xbc, 0xaf, 0x27, 0x1c] },
   { type: "application/gzip", prefix: [0x1f, 0x8b] },
   { type: "application/x-rar-compressed", prefix: ascii("Rar!") },
+  // The rest of what the archive plugin opens, for a member whose name says
+  // nothing. A signature is only as long as it must be to leave text alone:
+  // bzip2's is its "BZh" and the pi that opens its first block, a cabinet's
+  // its zeroed reserved word. A tar says "ustar" at 257, an ISO 9660 image
+  // "CD001" at 32769 (past the head read) and a disk image (dmg) at its end:
+  // those are told by their names.
+  { type: "application/x-bzip2", prefix: ascii("BZh"), also: ascii("1AY&SY"), alsoOffset: 4 },
+  { type: "application/x-xz", prefix: [0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00] },
+  { type: "application/zstd", prefix: [0x28, 0xb5, 0x2f, 0xfd] },
+  { type: "application/x-lz4", prefix: [0x04, 0x22, 0x4d, 0x18] },
+  { type: "application/x-lzip", prefix: ascii("LZIP"), also: [1], alsoOffset: 4 },
+  { type: "application/x-rpm", prefix: [0xed, 0xab, 0xee, 0xdb] },
+  { type: "application/x-compress", prefix: [0x1f, 0x9d] },
+  { type: "application/x-tar", prefix: ascii("ustar"), offset: 257 },
+  { type: "application/vnd.ms-cab-compressed", prefix: ascii("MSCF"), also: [0, 0, 0, 0], alsoOffset: 4 },
+  { type: "application/vnd.ms-htmlhelp", prefix: ascii("ITSF"), also: [0, 0, 0], alsoOffset: 5 },
+  { type: "application/x-lzh-compressed", prefix: ascii("-lh"), offset: 2 },
+  { type: "application/x-lzh-compressed", prefix: ascii("-lz"), offset: 2 },
+  { type: "application/x-arj", prefix: [0x60, 0xea] },
+  { type: "application/x-archive", prefix: ascii("!<arch>\n") },
+  { type: "application/x-cpio", prefix: ascii("070701") },
+  { type: "application/x-cpio", prefix: ascii("070702") },
+  { type: "application/x-cpio", prefix: ascii("070707") },
+  { type: "application/x-xar", prefix: ascii("xar!"), also: [0], alsoOffset: 4 },
+  { type: "application/x-ms-wim", prefix: ascii("MSWIM"), also: [0, 0, 0], alsoOffset: 5 },
+  { type: "application/vnd.ms-tnef", prefix: [0x78, 0x9f, 0x3e, 0x22] },
+  { type: "application/x-vhdx", prefix: ascii("vhdxfile") },
+  { type: "application/x-vmdk", prefix: ascii("KDMV") },
+  { type: "application/x-qemu-disk", prefix: [0x51, 0x46, 0x49, 0xfb] },
 ];
 
 /** Types that say nothing: the extension decides. */
@@ -54,6 +105,13 @@ export const UNKNOWN_TYPES: readonly string[] = ["", "application/octet-stream",
 
 const ZIP_TYPES = ["application/zip", "application/x-zip-compressed"];
 
+/** A file that says `ply` and then its format, or one named `.ply`. */
+function isPly(head: Uint8Array, name: string): boolean {
+  if (name.toLowerCase().endsWith(".ply")) return true;
+  const text = new TextDecoder("latin1").decode(head.subarray(0, 64));
+  return /^ply\r?\nformat (ascii|binary_little_endian|binary_big_endian) /.test(text);
+}
+
 /** A STEP file whose schema says IFC, or one named `.ifc`. */
 function isIfc(head: Uint8Array, name: string): boolean {
   if (name.toLowerCase().endsWith(".ifc")) return true;
@@ -61,16 +119,67 @@ function isIfc(head: Uint8Array, name: string): boolean {
   return text.includes("FILE_SCHEMA") && text.includes("IFC");
 }
 
+/**
+ * The text formats and how each is shown. Only these names and types are
+ * claimed: a file with another name is not opened as text because it happens
+ * to be. `.svg` is absent on purpose: it is an image; HTML
+ * is shown as its source.
+ */
+export const TEXT_KINDS: Record<"plain" | "markdown" | "json" | "xml" | "html" | "diff", { extensions: readonly string[]; types: readonly string[] }> = {
+  markdown: { extensions: [".md", ".markdown"], types: ["text/markdown", "text/x-markdown"] },
+  json: {
+    extensions: [".json", ".geojson"],
+    types: ["application/json", "text/json", "application/ld+json", "application/geo+json"],
+  },
+  xml: {
+    extensions: [".xml", ".xsd", ".xsl", ".xslt", ".rss", ".atom", ".kml", ".gpx", ".rdf", ".wsdl", ".plist"],
+    types: [
+      "application/xml",
+      "text/xml",
+      "application/atom+xml",
+      "application/rss+xml",
+      "application/xslt+xml",
+      "application/gpx+xml",
+      "application/vnd.google-earth.kml+xml",
+    ],
+  },
+  html: { extensions: [".html", ".htm", ".xhtml"], types: ["text/html", "application/xhtml+xml"] },
+  diff: { extensions: [".diff", ".patch"], types: ["text/x-diff", "text/x-patch"] },
+  plain: {
+    extensions: [
+      ".txt", ".text", ".log", ".jsonl", ".ndjson", ".srt", ".vtt", ".yaml", ".yml", ".toml", ".ini", ".cfg", ".conf", ".properties",
+      ".js", ".mjs", ".cjs", ".jsx", ".ts", ".tsx", ".mts", ".cts", ".css", ".scss", ".py", ".sh", ".bash", ".zsh", ".bat", ".ps1",
+      ".c", ".h", ".cc", ".cpp", ".hpp", ".cs", ".rs", ".go", ".java", ".kt", ".swift", ".rb", ".php", ".pl", ".lua", ".sql",
+    ],
+    types: [
+      "text/vtt",
+      "application/x-subrip",
+      "application/x-yaml",
+      "application/yaml",
+      "text/yaml",
+      "text/x-yaml",
+      "application/toml",
+      "application/x-ndjson",
+      "text/css",
+      "text/javascript",
+      "application/javascript",
+      "application/x-sh",
+      "text/x-python",
+    ],
+  },
+};
+
+const textKinds = Object.values(TEXT_KINDS);
+
 export const MATCHERS: Record<BuiltinFormat, FormatMatcher> = {
   pdf: { types: ["application/pdf"], extensions: [".pdf"] },
   /**
-   * What every browser's `<img>` draws. SVG is deliberately absent: it has no
-   * intrinsic size to fit, and it is a document that can carry scripts.
-   * `WASM_IMAGES` adds what exav-render decodes.
+   * What every browser's `<img>` draws. SVG in an `<img>` runs no script and
+   * loads nothing. `WASM_IMAGES` adds what exav-render decodes.
    */
   image: {
-    types: ["image/png", "image/jpeg", "image/webp", "image/gif"],
-    extensions: [".png", ".jpg", ".jpeg", ".webp", ".gif"],
+    types: ["image/png", "image/jpeg", "image/webp", "image/gif", "image/svg+xml"],
+    extensions: [".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg"],
   },
   /** The registered type, and what CAD applications are seen sending. */
   dwg: {
@@ -92,14 +201,16 @@ export const MATCHERS: Record<BuiltinFormat, FormatMatcher> = {
   /**
    * Open XML, macro-enabled twins included (nothing here runs a macro). Every
    * one is a zip, so the extension answers over a zip type. The 1997 binary
-   * formats are absent: no browser engine reads them.
+   * formats, RTF and OpenDocument are below: they are converted
+   * (`CONVERTED_FORMATS`).
    */
   docx: {
     types: [
       "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
       "application/vnd.ms-word.document.macroenabled.12",
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
     ],
-    extensions: [".docx", ".docm"],
+    extensions: [".docx", ".docm", ".dotx"],
     extensionOverrides: ["container"],
   },
   xlsx: {
@@ -114,8 +225,10 @@ export const MATCHERS: Record<BuiltinFormat, FormatMatcher> = {
     types: [
       "application/vnd.openxmlformats-officedocument.presentationml.presentation",
       "application/vnd.ms-powerpoint.presentation.macroenabled.12",
+      "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+      "application/vnd.openxmlformats-officedocument.presentationml.template",
     ],
-    extensions: [".pptx", ".pptm"],
+    extensions: [".pptx", ".pptm", ".ppsx", ".potx"],
     extensionOverrides: ["container"],
   },
   /**
@@ -129,14 +242,125 @@ export const MATCHERS: Record<BuiltinFormat, FormatMatcher> = {
     extensions: [".csv", ".tsv"],
     extensionOverrides: ["application/vnd.ms-excel", "text/plain"],
   },
+  /**
+   * What `@exav/viewer/office` converts. Within each kind (text, presentation,
+   * spreadsheet) the plugin reads what the bytes really are: Word saves RTF
+   * under .doc, and an .xls is often an XLSX renamed. The OpenDocument ones
+   * are zips, so the extension answers over a zip type.
+   */
+  rtf: { types: ["application/rtf", "text/rtf", "application/x-rtf"], extensions: [".rtf"], extensionOverrides: ["text/plain"] },
+  /** Also what Windows types an .rtf as, with Word installed: the bytes then say RTF. Word 6.0 and 95 too. */
+  doc: { types: ["application/msword"], extensions: [".doc", ".dot"] },
+  /** With templates and flat XML (one XML file, not a zip). */
+  odt: {
+    types: ["application/vnd.oasis.opendocument.text", "application/vnd.oasis.opendocument.text-template", "application/vnd.oasis.opendocument.text-flat-xml"],
+    extensions: [".odt", ".ott", ".fodt"],
+    extensionOverrides: ["container"],
+  },
+  ppt: { types: ["application/vnd.ms-powerpoint"], extensions: [".ppt", ".pps", ".pot"] },
+  odp: {
+    types: [
+      "application/vnd.oasis.opendocument.presentation",
+      "application/vnd.oasis.opendocument.presentation-template",
+      "application/vnd.oasis.opendocument.presentation-flat-xml",
+    ],
+    extensions: [".odp", ".otp", ".fodp"],
+    extensionOverrides: ["container"],
+  },
+  /** Keynote 1 to 6, zipped (the 2013 format, and the XML one before it). */
+  keynote: {
+    types: ["application/vnd.apple.keynote", "application/x-iwork-keynote-sffkey"],
+    extensions: [".key"],
+    extensionOverrides: ["container"],
+  },
+  /**
+   * The 1997 workbook's type is not claimed outright: Windows gives it to
+   * every .csv when Excel is installed (`csv`). With the extension it is.
+   * Excel 5.0/95 and 4.0 too.
+   */
+  xls: { types: ["application/x-msexcel", "application/x-excel"], extensions: [".xls", ".xlt"], extensionOverrides: ["application/vnd.ms-excel"] },
+  ods: {
+    types: [
+      "application/vnd.oasis.opendocument.spreadsheet",
+      "application/vnd.oasis.opendocument.spreadsheet-template",
+      "application/vnd.oasis.opendocument.spreadsheet-flat-xml",
+    ],
+    extensions: [".ods", ".ots", ".fods"],
+    extensionOverrides: ["container"],
+  },
+  /** Numbers, zipped. */
+  numbers: {
+    types: ["application/vnd.apple.numbers", "application/x-iwork-numbers-sffnumbers"],
+    extensions: [".numbers"],
+    extensionOverrides: ["container"],
+  },
+  /** Drawings, converted to PDF like the presentations. With templates and flat XML. */
+  odg: {
+    types: [
+      "application/vnd.oasis.opendocument.graphics",
+      "application/vnd.oasis.opendocument.graphics-template",
+      "application/vnd.oasis.opendocument.graphics-flat-xml",
+    ],
+    extensions: [".odg", ".otg", ".fodg"],
+    extensionOverrides: ["container"],
+  },
+  /** Visio: binary, XML (.vdx) and Open XML, with templates. */
+  visio: {
+    types: [
+      "application/vnd.visio",
+      "application/vnd.ms-visio.drawing",
+      "application/vnd.ms-visio.drawing.main+xml",
+      "application/vnd.ms-visio.drawing.macroenabled.main+xml",
+      "application/vnd.ms-visio.template.main+xml",
+      "application/vnd.ms-visio.template.macroenabled.main+xml",
+    ],
+    extensions: [".vsd", ".vst", ".vdx", ".vtx", ".vsdx", ".vsdm", ".vstx", ".vstm"],
+    extensionOverrides: ["container"],
+  },
+  /** CorelDRAW, and its exchange format (.cmx). */
+  coreldraw: {
+    types: [
+      "application/vnd.corel-draw",
+      "application/cdr",
+      "application/coreldraw",
+      "application/x-cdr",
+      "application/x-coreldraw",
+      "image/cdr",
+      "image/x-cdr",
+      "image/x-cmx",
+    ],
+    extensions: [".cdr", ".cmx"],
+    extensionOverrides: ["container"],
+  },
+  publisher: { types: ["application/vnd.ms-publisher", "application/x-mspublisher"], extensions: [".pub"] },
+  /** PageMaker 6 to 7. */
+  pagemaker: { types: ["application/x-pagemaker"], extensions: [".pmd", ".pm6", ".p65"] },
+  /** FreeHand 3 to 11. */
+  freehand: { types: ["image/x-freehand"], extensions: [".fh", ".fh3", ".fh4", ".fh5", ".fh7", ".fh8", ".fh9", ".fh10", ".fh11"] },
+  /** QuarkXPress 3.1 to 4.1. */
+  quarkxpress: { types: ["application/vnd.quark.quarkxpress"], extensions: [".qxd", ".qxt"] },
+  /** Zoner Draw 4 and 5, zipped or not. */
+  zonerdraw: { extensions: [".zmf"], extensionOverrides: ["container"] },
+  /** WordPerfect Graphics 1 and 2. */
+  wpg: { types: ["application/x-wpg", "image/x-wpg"], extensions: [".wpg"] },
+  /**
+   * Text, by name or type (`TEXT_KINDS`). Browsers type source files as plain
+   * text, as scripts or, for `.ts`, as MPEG transport streams, so the
+   * extension answers over those; the bytes are checked when it is opened.
+   */
+  text: {
+    types: textKinds.flatMap((k) => k.types),
+    extensions: textKinds.flatMap((k) => k.extensions),
+    extensionOverrides: ["text/plain", "text/javascript", "application/javascript", "text/css", "application/x-sh", "text/x-python", "video/mp2t"],
+  },
   /** What browsers play. Listing what they cannot decode buys a black rectangle. */
   video: {
     types: ["video/mp4", "video/quicktime", "video/webm", "video/ogg"],
     extensions: [".mp4", ".m4v", ".mov", ".webm", ".ogv"],
   },
   audio: {
-    types: ["audio/mpeg", "audio/mp4", "audio/x-m4a", "audio/aac", "audio/wav", "audio/x-wav", "audio/ogg", "audio/webm"],
-    extensions: [".mp3", ".m4a", ".aac", ".wav", ".ogg", ".oga", ".opus"],
+    types: ["audio/mpeg", "audio/mp4", "audio/x-m4a", "audio/aac", "audio/wav", "audio/x-wav", "audio/ogg", "audio/webm", "audio/flac", "audio/x-flac"],
+    extensions: [".mp3", ".m4a", ".aac", ".wav", ".ogg", ".oga", ".opus", ".flac"],
   },
   /** `.ifczip` is an archive: its model opens as a member. */
   ifc: {
@@ -149,7 +373,37 @@ export const MATCHERS: Record<BuiltinFormat, FormatMatcher> = {
     types: ["model/stl", "model/x.stl-binary", "model/x.stl-ascii", "application/sla", "application/vnd.ms-pki.stl", "application/x-navistyle"],
     extensions: [".stl"],
   },
-  /** A zip is asked about after the extensions: an Open XML document is a zip too. */
+  /**
+   * Text with no signature: only the extension names it. `application/x-tgif`
+   * is what older desktops type `.obj` as (and compiled object files are
+   * `.obj` too: the reader refuses what is not Wavefront text).
+   */
+  obj: {
+    types: ["model/obj"],
+    extensions: [".obj"],
+    extensionOverrides: ["text/plain", "application/x-tgif"],
+  },
+  ply: {
+    types: ["model/ply", "application/x-ply"],
+    extensions: [".ply"],
+    extensionOverrides: ["text/plain"],
+    confirmSniff: isPly,
+  },
+  /** A `.gltf` document or a `.glb` container. */
+  gltf: {
+    types: ["model/gltf+json", "model/gltf-binary"],
+    extensions: [".gltf", ".glb"],
+    extensionOverrides: ["text/plain"],
+  },
+  /**
+   * A zip is asked about after the extensions: an Open XML document is a zip
+   * too. What is here is what a person opens to see the files inside: the
+   * archives, the compressed streams, the packages that are zips (a jar, an
+   * apk), the comic book archives, the installers' containers (a cabinet, a
+   * pkg, a deb, a wim), the optical and virtual disk images, `winmail.dat`.
+   * Documents that happen to be zips (OpenDocument, EPUB) and the formats
+   * another reader opens (PDF, Office, email) are not.
+   */
   archive: {
     types: [
       "application/x-7z-compressed",
@@ -160,9 +414,98 @@ export const MATCHERS: Record<BuiltinFormat, FormatMatcher> = {
       "application/x-tar",
       "application/x-bzip2",
       "application/x-xz",
+      "application/zstd",
+      "application/x-zstd",
+      "application/x-lz4",
+      "application/x-lzip",
+      "application/x-lzma",
+      "application/x-rpm",
+      "application/x-redhat-package-manager",
+      "application/x-compress",
+      "application/vnd.ms-cab-compressed",
+      "application/x-cab",
+      "application/vnd.ms-htmlhelp",
+      "application/x-chm",
+      "application/x-iso9660-image",
+      "application/x-cd-image",
+      "application/x-lzh-compressed",
+      "application/x-lzh",
+      "application/x-lha",
+      "application/x-arj",
+      "application/arj",
+      "application/x-archive",
+      "application/x-unix-archive",
+      "application/vnd.debian.binary-package",
+      "application/x-debian-package",
+      "application/x-cpio",
+      "application/x-xar",
+      "application/x-apple-diskimage",
+      "application/x-ms-wim",
+      "application/vnd.ms-tnef",
+      "application/x-vhd",
+      "application/x-vhdx",
+      "application/x-vmdk",
+      "application/x-qemu-disk",
+      "application/x-zoo",
+      "application/x-arc",
+      "application/x-alz",
+      "application/java-archive",
+      "application/x-java-archive",
+      "application/vnd.android.package-archive",
+      "application/x-xpinstall",
+      "application/vnd.google-earth.kmz",
+      "application/vnd.comicbook+zip",
+      "application/vnd.comicbook-rar",
+      "application/x-cbz",
+      "application/x-cbr",
+      "application/x-cb7",
+      "application/x-cbt",
+      // What a desktop gives a file by its extension: a tarball is its own
+      // type there (shared-mime-info), and Windows has one for .tgz.
+      "application/x-compressed-tar",
+      "application/x-bzip-compressed-tar",
+      "application/x-bzip1-compressed-tar",
+      "application/x-bzip2-compressed-tar",
+      "application/x-xz-compressed-tar",
+      "application/x-zstd-compressed-tar",
+      "application/x-lzma-compressed-tar",
+      "application/x-lzip-compressed-tar",
+      "application/x-tarz",
+      "application/x-gtar",
+      "application/x-compressed",
+      "application/vnd.efi.iso",
+      "application/x-vhd-disk",
+      "application/x-vhdx-disk",
+      "application/x-vmdk-disk",
     ],
     containerTypes: ZIP_TYPES,
-    extensions: [".zip", ".7z", ".rar", ".tar", ".gz", ".tgz", ".bz2", ".tbz2", ".xz", ".txz"],
+    // Types a desktop gives these extensions that are not an archive's: FreeArc
+    // for `.arc`, the game consoles' disc images for `.iso`, `.pkg` as Newton's,
+    // the OVF descriptor for `.ova`. (`.vhd`, VHDL source for a desktop, is not
+    // here: a text file named so is a text file.)
+    extensionOverrides: [
+      "application/x-freearc",
+      "application/x-sega-cd-rom",
+      "application/x-sega-pico-rom",
+      "application/x-saturn-rom",
+      "application/x-dreamcast-rom",
+      "application/x-wii-rom",
+      "application/x-gamecube-rom",
+      "application/x-newton-compatible-pkg",
+      "application/ovf",
+    ],
+    extensions: [
+      ".zip", ".7z", ".rar", ".tar", ".gz", ".tgz", ".bz2", ".tbz", ".tbz2", ".xz", ".txz",
+      ".zst", ".tzst", ".lz4", ".lz", ".tlz", ".lzma", ".rpm", ".z", ".taz",
+      ".cab", ".chm", ".iso", ".lzh", ".lha", ".arj", ".ar", ".a", ".deb", ".udeb", ".cpio",
+      ".xar", ".pkg", ".xip", ".dmg", ".wim", ".esd", "winmail.dat", ".tnef",
+      ".vhd", ".vhdx", ".vmdk", ".qcow2", ".ova", ".zoo", ".arc", ".alz", ".egg",
+      ".img",
+      ".jar", ".war", ".ear", ".apk", ".apks", ".xapk", ".aab", ".ipa", ".xpi", ".whl", ".nupkg", ".vsix", ".kmz",
+      ".appx", ".appxbundle", ".msix", ".msixbundle",
+      ".cbz", ".cbr", ".cb7", ".cbt",
+      ".7z.001", ".zip.001", ".rar.001", ".tar.001", ".z01",
+    ],
   },
 };
 
@@ -174,24 +517,56 @@ export const WASM_IMAGES: FormatMatcher = {
     "image/x-ms-bmp",
     "image/x-icon",
     "image/vnd.microsoft.icon",
+    "image/x-win-bitmap",
     "image/x-portable-anymap",
     "image/x-portable-bitmap",
     "image/x-portable-graymap",
     "image/x-portable-pixmap",
     "image/qoi",
     "image/vnd-ms.dds",
+    "image/x-tga",
+    "image/x-targa",
     "image/vnd.radiance",
     "image/jp2",
     "image/jpx",
     "image/j2c",
     "image/x-jbig2",
     "image/jbig2",
+    "image/jxl",
+    // Camera RAW files, shown by their embedded preview, under the names
+    // desktops give them and the ones `SIGNATURES` sniffs.
+    "image/x-adobe-dng",
+    "image/dng",
+    "image/x-canon-cr2",
+    "image/x-canon-cr3",
+    "image/x-canon-crw",
+    "image/x-nikon-nef",
+    "image/x-nikon-nrw",
+    "image/x-sony-arw",
+    "image/x-sony-sr2",
+    "image/x-sony-srf",
+    "image/x-olympus-orf",
+    "image/x-panasonic-rw2",
+    "image/x-panasonic-raw",
+    "image/x-fuji-raf",
+    "image/x-pentax-pef",
+    "image/x-samsung-srw",
+    "image/x-sigma-x3f",
+    "image/x-minolta-mrw",
+    "image/x-kodak-dcr",
+    "image/x-kodak-kdc",
+    "image/x-epson-erf",
+    "image/x-mamiya-mef",
+    "image/x-leaf-mos",
+    "image/x-hasselblad-3fr",
+    "image/x-phaseone-iiq",
   ],
   extensions: [
     ".tif",
     ".tiff",
     ".bmp",
     ".ico",
+    ".cur",
     ".pbm",
     ".pgm",
     ".ppm",
@@ -199,6 +574,8 @@ export const WASM_IMAGES: FormatMatcher = {
     ".pam",
     ".qoi",
     ".dds",
+    ".tga",
+    ".icb",
     ".ff",
     ".hdr",
     ".jp2",
@@ -208,9 +585,65 @@ export const WASM_IMAGES: FormatMatcher = {
     ".j2c",
     ".jb2",
     ".jbig2",
+    ".jxl",
+    // Camera RAW: Adobe DNG (and GoPro's GPR), Canon, Nikon, Sony, Olympus,
+    // Panasonic and Leica, Fujifilm, Pentax, Samsung, Hasselblad, Phase One,
+    // Sigma, Minolta, Kodak, Epson, Mamiya, Leaf.
+    ".dng",
+    ".gpr",
+    ".cr2",
+    ".cr3",
+    ".crw",
+    ".nef",
+    ".nrw",
+    ".arw",
+    ".sr2",
+    ".srf",
+    ".orf",
+    ".ori",
+    ".rw2",
+    ".rwl",
+    ".raw",
+    ".raf",
+    ".pef",
+    ".srw",
+    ".3fr",
+    ".fff",
+    ".iiq",
+    ".x3f",
+    ".mrw",
+    ".dcr",
+    ".kdc",
+    ".erf",
+    ".mef",
+    ".mos",
   ],
+  // Desktops type a Kodak .dcr as the Shockwave Director file it also is.
+  extensionOverrides: ["application/x-director"],
 };
 
+/** What `@exav/viewer/office` converts before showing it (`rtf()`, `doc()`...). */
+export const CONVERTED_FORMATS: readonly BuiltinFormat[] = [
+  "rtf",
+  "doc",
+  "odt",
+  "ppt",
+  "odp",
+  "keynote",
+  "xls",
+  "ods",
+  "numbers",
+  "odg",
+  "visio",
+  "coreldraw",
+  "publisher",
+  "pagemaker",
+  "freehand",
+  "quarkxpress",
+  "zonerdraw",
+  "wpg",
+];
+
 /**
  * The built-in formats. Their order does not change an answer: no two of them
  * claim the same type or extension (asserted in the tests).
@@ -224,9 +657,31 @@ export const BUILTIN_ORDER: readonly BuiltinFormat[] = [
   "audio",
   "ifc",
   "stl",
+  "obj",
+  "ply",
+  "gltf",
   "docx",
   "xlsx",
   "pptx",
   "csv",
+  "rtf",
+  "doc",
+  "odt",
+  "ppt",
+  "odp",
+  "keynote",
+  "xls",
+  "ods",
+  "numbers",
+  "odg",
+  "visio",
+  "coreldraw",
+  "publisher",
+  "pagemaker",
+  "freehand",
+  "quarkxpress",
+  "zonerdraw",
+  "wpg",
+  "text",
   "archive",
 ];
diff --git a/crates/exav-viewer/ts/core/index.ts b/crates/exav-viewer/ts/core/index.ts
index 7b98b293..2d2df9aa 100644
--- a/crates/exav-viewer/ts/core/index.ts
+++ b/crates/exav-viewer/ts/core/index.ts
@@ -5,8 +5,27 @@
  * `@exav/viewer/react`.
  */
 export * from "./types.js";
-export { writable, derived, type WritableStore } from "./store.js";
+export { writable, derived, type Store, type WritableStore } from "./store.js";
 export { createViewer, errorCode } from "./viewer.js";
 export { createDetector, sniff, HEAD_BYTES } from "./detect.js";
-export { MATCHERS, WASM_IMAGES, SIGNATURES, UNKNOWN_TYPES, BUILTIN_ORDER } from "./formats.js";
+export { MATCHERS, WASM_IMAGES, SIGNATURES, UNKNOWN_TYPES, BUILTIN_ORDER, CONVERTED_FORMATS } from "./formats.js";
 export { canOpenInTab, createSourceReader, sameSource, type OwnedSourceReader } from "./source.js";
+export { resolveInTree } from "./tree.js";
+export {
+  fitCamera,
+  fitRect,
+  MAX_PICTURE_EDGE,
+  MAX_PICTURE_PIXELS,
+  planRect,
+  RasterError,
+  rasterSize,
+  tilePlan,
+  tileRect,
+  type RasterErrorCode,
+  type RectPlan,
+  type Tile,
+} from "./pictures.js";
+export { createPictures, drawTiled, encodeBitmap, picturesOver } from "./raster.js";
+export { TOKENS, themeOf, type FrameTheme, type Token } from "./theme.js";
+export { builtinTranslate, MESSAGES, type MessageKey, type Translate } from "./messages.js";
+export { printPictures, type PrintOptions } from "./print.js";
diff --git a/crates/exav-viewer/ts/core/messages.test.ts b/crates/exav-viewer/ts/core/messages.test.ts
new file mode 100644
index 00000000..b5e9ef34
--- /dev/null
+++ b/crates/exav-viewer/ts/core/messages.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+
+import { builtinLanguage, builtinTranslate, MESSAGES } from "./messages.js";
+
+describe("the built-in strings", () => {
+  it("are complete in every language, with the same placeholders", () => {
+    const keys = Object.keys(MESSAGES.en).sort();
+    const holes = (s: string) => [...s.matchAll(/\{\{(\w+)\}\}/g)].map((m) => m[1]).sort();
+    for (const [lang, table] of Object.entries(MESSAGES)) {
+      expect(Object.keys(table).sort(), lang).toEqual(keys);
+      for (const key of keys) expect(holes((table as Record<string, string>)[key]!), `${lang} ${key}`).toEqual(holes((MESSAGES.en as Record<string, string>)[key]!));
+    }
+  });
+
+  it("are picked by the locale's language, English otherwise", () => {
+    expect(builtinLanguage("de-AT")).toBe("de");
+    expect(builtinLanguage("es_ES")).toBe("es");
+    expect(builtinLanguage("NL")).toBe("nl");
+    expect(builtinLanguage("fr-CA")).toBe("fr");
+    expect(builtinLanguage("it")).toBe("en");
+    // Not a key of the object's prototype.
+    expect(builtinLanguage("constructor")).toBe("en");
+    expect(builtinTranslate("de")("archive_members", { count: 1 })).toBe("1 Datei");
+    expect(builtinTranslate("nl")("archive_members", { count: 3 })).toBe("3 bestanden");
+    expect(builtinTranslate("es")("zoom_in")).toBe("Ampliar");
+  });
+});
diff --git a/crates/exav-viewer/ts/core/messages.ts b/crates/exav-viewer/ts/core/messages.ts
new file mode 100644
index 00000000..7652e470
--- /dev/null
+++ b/crates/exav-viewer/ts/core/messages.ts
@@ -0,0 +1,505 @@
+/**
+ * The built-in strings: English, French, German, Spanish and Dutch. A host
+ * with its own i18n passes `translate` instead. Plural keys are written
+ * without their `_one`/`_other` suffix and receive `count`.
+ */
+export const MESSAGES = {
+  en: {
+    archive_back: "Back to the archive",
+    archive_failed_member: "This file could not be extracted.",
+    archive_member_encrypted: "This file is encrypted.",
+    archive_member_unsupported: "This file could not be read out of the archive.",
+    archive_members_one: "{{count}} file",
+    archive_members_other: "{{count}} files",
+    archive_no_reader: "This file cannot be shown here.",
+    background: "Background",
+    background_dark: "Dark",
+    background_light: "Light",
+    categories: "Categories",
+    close: "Close",
+    converting_model: "Preparing the model… {{percent}}%",
+    counter: "{{current}} / {{total}}",
+    download: "Download",
+    drag_pan: "Move the page",
+    drag_select: "Select text",
+    drawing: "Preparing the image…",
+    drawing_panel: "Drawing",
+    empty_model: "This model has nothing to show.",
+    error: "The preview could not be shown.",
+    error_archive: "This archive could not be opened.",
+    error_drawing: "The drawing could not be shown.",
+    error_drawing_version: "This drawing is saved in a format older than AutoCAD R13, which cannot be shown here.",
+    error_file: "This file could not be shown.",
+    error_image: "The image could not be shown.",
+    error_image_no_preview: "This camera RAW file holds no preview to show.",
+    error_media: "This device cannot play this file.",
+    error_model: "This model could not be shown.",
+    error_needs_converter: "This format can only be shown with a converter that is not installed here.",
+    error_office: "This document could not be shown.",
+    error_text: "This text could not be shown.",
+    error_text_binary: "This file is not text, so it cannot be shown here.",
+    fullscreen: "Full screen",
+    fullscreen_exit: "Leave full screen",
+    layers: "Layers",
+    layers_all: "All",
+    layers_none: "None",
+    layouts: "Layouts",
+    link_confirm: "The document links to {{url}}. Open it in a new tab?",
+    loading: "Loading the document…",
+    loading_model: "Loading the model…",
+    model_panel: "Model",
+    model_space: "Model space",
+    next: "Next",
+    open_in_tab: "Open in a new tab",
+    page_of: "Page {{current}} / {{total}}",
+    page_short: "Page {{page}}",
+    panel_hide: "Hide the panel",
+    prev: "Previous",
+    sections: "Sections",
+    sections_hide: "Hide the sections",
+    selection: "Element",
+    selection_none: "Tap an element to identify it.",
+    selection_unnamed: "Unnamed",
+    sheets: "Sheets",
+    slide_of: "Slide {{current}} / {{total}}",
+    step_convert: "Converting the document…",
+    step_engine: "Downloading the viewer…",
+    step_file: "Downloading the document…",
+    step_read: "Reading the document…",
+    step_render: "Drawing the document…",
+    step_start: "Starting the viewer…",
+    storeys: "Storeys",
+    unavailable_offline: "Not available offline",
+    warning_external_references_one: "{{count}} external reference is not drawn.",
+    warning_external_references_other: "{{count}} external references are not drawn.",
+    warning_model_damaged: "The file is damaged: what could be read is shown.",
+    warning_model_partial: "The model is too large to show whole: part of it is left out.",
+    warning_model_truncated_one: "The model is too large to show whole: {{count}} element is left out.",
+    warning_model_truncated_other: "The model is too large to show whole: {{count}} elements are left out.",
+    warning_model_unsupported_one: "{{count}} piece of geometry is of a kind not drawn here.",
+    warning_model_unsupported_other: "{{count}} pieces of geometry are of a kind not drawn here.",
+    warning_preview_shown: "Nothing in this drawing is of a kind drawn here: the picture saved with it is shown.",
+    warning_proxy_without_graphics_one:
+      "{{count}} custom object was saved without its graphics: only the application that made it can show it.",
+    warning_proxy_without_graphics_other:
+      "{{count}} custom objects were saved without their graphics: only the application that made them can show them.",
+    warning_scene_truncated: "The drawing is too large to show whole: part of it is left out.",
+    warning_source_read_whole: "The server does not send parts of the file: all of it was downloaded.",
+    warning_text_html_source: "HTML is shown as source text, not as a page.",
+    warning_text_long_lines_one: "{{count}} very long line is cut.",
+    warning_text_long_lines_other: "{{count}} very long lines are cut.",
+    warning_text_markdown_failed: "The Markdown could not be read: it is shown as plain text.",
+    warning_text_not_json: "This is not valid JSON: it is shown as plain text.",
+    warning_text_not_xml: "This is not well-formed XML: it is shown as well as it can be read.",
+    warning_text_truncated: "The file is too large to show whole: only its beginning is shown.",
+    warning_unknown_entities_one: "{{count}} object is of a kind not drawn here.",
+    warning_unknown_entities_other: "{{count}} objects are of a kind not drawn here.",
+    zoom_fit: "Fit to the window",
+    zoom_in: "Zoom in",
+    zoom_out: "Zoom out",
+  },
+  fr: {
+    archive_back: "Retour à l'archive",
+    archive_failed_member: "Ce fichier n'a pas pu être extrait.",
+    archive_member_encrypted: "Ce fichier est chiffré.",
+    archive_member_unsupported: "Ce fichier n'a pas pu être lu dans l'archive.",
+    archive_members_one: "{{count}} fichier",
+    archive_members_other: "{{count}} fichiers",
+    archive_no_reader: "Ce fichier ne peut pas être affiché ici.",
+    background: "Fond",
+    background_dark: "Sombre",
+    background_light: "Clair",
+    categories: "Catégories",
+    close: "Fermer",
+    converting_model: "Préparation de la maquette… {{percent}} %",
+    counter: "{{current}} / {{total}}",
+    download: "Télécharger",
+    drag_pan: "Déplacer la page",
+    drag_select: "Sélectionner le texte",
+    drawing: "Préparation de l'image…",
+    drawing_panel: "Dessin",
+    empty_model: "Cette maquette ne contient aucun élément à afficher.",
+    error: "L'aperçu n'a pas pu s'afficher.",
+    error_archive: "Cette archive n'a pas pu être ouverte.",
+    error_drawing: "Le dessin n'a pas pu s'afficher.",
+    error_drawing_version: "Ce dessin est enregistré dans un format antérieur à AutoCAD R13, qui ne peut pas être affiché ici.",
+    error_file: "Ce fichier n'a pas pu s'afficher.",
+    error_image: "L'image n'a pas pu s'afficher.",
+    error_image_no_preview: "Ce fichier RAW d'appareil photo ne contient aucun aperçu à afficher.",
+    error_media: "Cet appareil ne sait pas lire ce fichier.",
+    error_model: "Cette maquette n'a pas pu s'afficher.",
+    error_needs_converter: "Ce format ne peut être affiché qu'avec un convertisseur qui n'est pas installé ici.",
+    error_office: "Ce document n'a pas pu s'afficher.",
+    error_text: "Ce texte n'a pas pu s'afficher.",
+    error_text_binary: "Ce fichier n'est pas du texte : il ne peut pas être affiché ici.",
+    fullscreen: "Plein écran",
+    fullscreen_exit: "Quitter le plein écran",
+    layers: "Calques",
+    layers_all: "Tous",
+    layers_none: "Aucun",
+    layouts: "Présentations",
+    link_confirm: "Le document renvoie vers {{url}}. L'ouvrir dans un nouvel onglet ?",
+    loading: "Chargement du document…",
+    loading_model: "Chargement de la maquette…",
+    model_panel: "Maquette",
+    model_space: "Espace objet",
+    next: "Suivant",
+    open_in_tab: "Ouvrir dans un nouvel onglet",
+    page_of: "Page {{current}} / {{total}}",
+    page_short: "Page {{page}}",
+    panel_hide: "Masquer le panneau",
+    prev: "Précédent",
+    sections: "Sections",
+    sections_hide: "Masquer les sections",
+    selection: "Élément",
+    selection_none: "Touchez un élément pour l'identifier.",
+    selection_unnamed: "Sans nom",
+    sheets: "Feuilles",
+    slide_of: "Diapositive {{current}} / {{total}}",
+    step_convert: "Conversion du document…",
+    step_engine: "Téléchargement de la visionneuse…",
+    step_file: "Téléchargement du document…",
+    step_read: "Lecture du document…",
+    step_render: "Affichage du document…",
+    step_start: "Démarrage de la visionneuse…",
+    storeys: "Étages",
+    unavailable_offline: "Non disponible hors ligne",
+    warning_external_references_one: "{{count}} référence externe n'est pas dessinée.",
+    warning_external_references_other: "{{count}} références externes ne sont pas dessinées.",
+    warning_model_damaged: "Le fichier est endommagé : ce qui a pu être lu est affiché.",
+    warning_model_partial: "La maquette est trop grande pour être affichée en entier : une partie en est omise.",
+    warning_model_truncated_one: "La maquette est trop grande pour être affichée en entier : {{count}} élément est omis.",
+    warning_model_truncated_other: "La maquette est trop grande pour être affichée en entier : {{count}} éléments sont omis.",
+    warning_model_unsupported_one: "{{count}} géométrie d'un type non pris en charge n'est pas dessinée.",
+    warning_model_unsupported_other: "{{count}} géométries d'un type non pris en charge ne sont pas dessinées.",
+    warning_preview_shown: "Rien dans ce dessin n'est d'un type dessiné ici : l'image enregistrée avec lui est affichée.",
+    warning_proxy_without_graphics_one:
+      "{{count}} objet personnalisé a été enregistré sans son graphisme : seule l'application qui l'a créé peut l'afficher.",
+    warning_proxy_without_graphics_other:
+      "{{count}} objets personnalisés ont été enregistrés sans leur graphisme : seule l'application qui les a créés peut les afficher.",
+    warning_scene_truncated: "Le dessin est trop grand pour être affiché en entier : une partie en est omise.",
+    warning_source_read_whole: "Le serveur n'envoie pas le fichier par parties : il a été téléchargé en entier.",
+    warning_text_html_source: "Le HTML est affiché comme du texte source, pas comme une page.",
+    warning_text_long_lines_one: "{{count}} ligne très longue est coupée.",
+    warning_text_long_lines_other: "{{count}} lignes très longues sont coupées.",
+    warning_text_markdown_failed: "Le Markdown n'a pas pu être lu : il est affiché comme du texte brut.",
+    warning_text_not_json: "Ce JSON n'est pas valide : il est affiché comme du texte brut.",
+    warning_text_not_xml: "Ce XML n'est pas bien formé : il est affiché au mieux.",
+    warning_text_truncated: "Le fichier est trop grand pour être affiché en entier : seul son début est affiché.",
+    warning_unknown_entities_one: "{{count}} objet d'un type non pris en charge n'est pas dessiné.",
+    warning_unknown_entities_other: "{{count}} objets d'un type non pris en charge ne sont pas dessinés.",
+    zoom_fit: "Ajuster à la fenêtre",
+    zoom_in: "Agrandir",
+    zoom_out: "Réduire",
+  },
+  de: {
+    archive_back: "Zurück zum Archiv",
+    archive_failed_member: "Diese Datei konnte nicht entpackt werden.",
+    archive_member_encrypted: "Diese Datei ist verschlüsselt.",
+    archive_member_unsupported: "Diese Datei konnte nicht aus dem Archiv gelesen werden.",
+    archive_members_one: "{{count}} Datei",
+    archive_members_other: "{{count}} Dateien",
+    archive_no_reader: "Diese Datei kann hier nicht angezeigt werden.",
+    background: "Hintergrund",
+    background_dark: "Dunkel",
+    background_light: "Hell",
+    categories: "Kategorien",
+    close: "Schließen",
+    converting_model: "Modell wird vorbereitet… {{percent}} %",
+    counter: "{{current}} / {{total}}",
+    download: "Herunterladen",
+    drag_pan: "Seite verschieben",
+    drag_select: "Text auswählen",
+    drawing: "Bild wird vorbereitet…",
+    drawing_panel: "Zeichnung",
+    empty_model: "Dieses Modell enthält nichts, was angezeigt werden kann.",
+    error: "Die Vorschau konnte nicht angezeigt werden.",
+    error_archive: "Dieses Archiv konnte nicht geöffnet werden.",
+    error_drawing: "Die Zeichnung konnte nicht angezeigt werden.",
+    error_drawing_version: "Diese Zeichnung ist in einem Format vor AutoCAD R13 gespeichert, das hier nicht angezeigt werden kann.",
+    error_file: "Diese Datei konnte nicht angezeigt werden.",
+    error_image: "Das Bild konnte nicht angezeigt werden.",
+    error_image_no_preview: "Diese RAW-Datei einer Kamera enthält keine Vorschau, die angezeigt werden könnte.",
+    error_media: "Dieses Gerät kann diese Datei nicht abspielen.",
+    error_model: "Dieses Modell konnte nicht angezeigt werden.",
+    error_needs_converter: "Dieses Format lässt sich nur mit einem Konverter anzeigen, der hier nicht installiert ist.",
+    error_office: "Dieses Dokument konnte nicht angezeigt werden.",
+    error_text: "Dieser Text konnte nicht angezeigt werden.",
+    error_text_binary: "Diese Datei ist kein Text und kann hier nicht angezeigt werden.",
+    fullscreen: "Vollbild",
+    fullscreen_exit: "Vollbild beenden",
+    layers: "Ebenen",
+    layers_all: "Alle",
+    layers_none: "Keine",
+    layouts: "Layouts",
+    link_confirm: "Das Dokument verweist auf {{url}}. In einem neuen Tab öffnen?",
+    loading: "Dokument wird geladen…",
+    loading_model: "Modell wird geladen…",
+    model_panel: "Modell",
+    model_space: "Modellbereich",
+    next: "Weiter",
+    open_in_tab: "In neuem Tab öffnen",
+    page_of: "Seite {{current}} / {{total}}",
+    page_short: "Seite {{page}}",
+    panel_hide: "Bereich ausblenden",
+    prev: "Zurück",
+    sections: "Abschnitte",
+    sections_hide: "Abschnitte ausblenden",
+    selection: "Element",
+    selection_none: "Tippen Sie auf ein Element, um es zu identifizieren.",
+    selection_unnamed: "Ohne Namen",
+    sheets: "Tabellenblätter",
+    slide_of: "Folie {{current}} / {{total}}",
+    step_convert: "Dokument wird konvertiert…",
+    step_engine: "Anzeige wird heruntergeladen…",
+    step_file: "Dokument wird heruntergeladen…",
+    step_read: "Dokument wird gelesen…",
+    step_render: "Dokument wird dargestellt…",
+    step_start: "Anzeige wird gestartet…",
+    storeys: "Geschosse",
+    unavailable_offline: "Offline nicht verfügbar",
+    warning_external_references_one: "{{count}} externe Referenz wird nicht gezeichnet.",
+    warning_external_references_other: "{{count}} externe Referenzen werden nicht gezeichnet.",
+    warning_model_damaged: "Die Datei ist beschädigt: Angezeigt wird, was gelesen werden konnte.",
+    warning_model_partial: "Das Modell ist zu groß, um vollständig angezeigt zu werden: Ein Teil fehlt.",
+    warning_model_truncated_one: "Das Modell ist zu groß, um vollständig angezeigt zu werden: {{count}} Element fehlt.",
+    warning_model_truncated_other: "Das Modell ist zu groß, um vollständig angezeigt zu werden: {{count}} Elemente fehlen.",
+    warning_model_unsupported_one: "{{count}} Geometrie ist von einer Art, die hier nicht gezeichnet wird.",
+    warning_model_unsupported_other: "{{count}} Geometrien sind von einer Art, die hier nicht gezeichnet wird.",
+    warning_preview_shown:
+      "Nichts in dieser Zeichnung ist von einer Art, die hier gezeichnet wird: Das mit ihr gespeicherte Bild wird angezeigt.",
+    warning_proxy_without_graphics_one:
+      "{{count}} benutzerdefiniertes Objekt wurde ohne seine Grafik gespeichert: Nur die Anwendung, die es erstellt hat, kann es anzeigen.",
+    warning_proxy_without_graphics_other:
+      "{{count}} benutzerdefinierte Objekte wurden ohne ihre Grafik gespeichert: Nur die Anwendung, die sie erstellt hat, kann sie anzeigen.",
+    warning_scene_truncated: "Die Zeichnung ist zu groß, um vollständig angezeigt zu werden: Ein Teil fehlt.",
+    warning_source_read_whole: "Der Server sendet die Datei nicht in Teilen: Sie wurde vollständig heruntergeladen.",
+    warning_text_html_source: "HTML wird als Quelltext angezeigt, nicht als Seite.",
+    warning_text_long_lines_one: "{{count}} sehr lange Zeile ist abgeschnitten.",
+    warning_text_long_lines_other: "{{count}} sehr lange Zeilen sind abgeschnitten.",
+    warning_text_markdown_failed: "Das Markdown konnte nicht gelesen werden: Es wird als reiner Text angezeigt.",
+    warning_text_not_json: "Dies ist kein gültiges JSON: Es wird als reiner Text angezeigt.",
+    warning_text_not_xml: "Dies ist kein wohlgeformtes XML: Es wird so gut wie möglich angezeigt.",
+    warning_text_truncated: "Die Datei ist zu groß, um vollständig angezeigt zu werden: Nur ihr Anfang wird angezeigt.",
+    warning_unknown_entities_one: "{{count}} Objekt ist von einer Art, die hier nicht gezeichnet wird.",
+    warning_unknown_entities_other: "{{count}} Objekte sind von einer Art, die hier nicht gezeichnet wird.",
+    zoom_fit: "An Fenster anpassen",
+    zoom_in: "Vergrößern",
+    zoom_out: "Verkleinern",
+  },
+  es: {
+    archive_back: "Volver al archivo comprimido",
+    archive_failed_member: "No se ha podido extraer este archivo.",
+    archive_member_encrypted: "Este archivo está cifrado.",
+    archive_member_unsupported: "No se ha podido leer este archivo del archivo comprimido.",
+    archive_members_one: "{{count}} archivo",
+    archive_members_other: "{{count}} archivos",
+    archive_no_reader: "Este archivo no se puede mostrar aquí.",
+    background: "Fondo",
+    background_dark: "Oscuro",
+    background_light: "Claro",
+    categories: "Categorías",
+    close: "Cerrar",
+    converting_model: "Preparando el modelo… {{percent}} %",
+    counter: "{{current}} / {{total}}",
+    download: "Descargar",
+    drag_pan: "Mover la página",
+    drag_select: "Seleccionar texto",
+    drawing: "Preparando la imagen…",
+    drawing_panel: "Dibujo",
+    empty_model: "Este modelo no tiene nada que mostrar.",
+    error: "No se ha podido mostrar la vista previa.",
+    error_archive: "No se ha podido abrir este archivo comprimido.",
+    error_drawing: "No se ha podido mostrar el dibujo.",
+    error_drawing_version: "Este dibujo está guardado en un formato anterior a AutoCAD R13, que no se puede mostrar aquí.",
+    error_file: "No se ha podido mostrar este archivo.",
+    error_image: "No se ha podido mostrar la imagen.",
+    error_image_no_preview: "Este archivo RAW de cámara no contiene ninguna vista previa que mostrar.",
+    error_media: "Este dispositivo no puede reproducir este archivo.",
+    error_model: "No se ha podido mostrar este modelo.",
+    error_needs_converter: "Este formato solo se puede mostrar con un conversor que no está instalado aquí.",
+    error_office: "No se ha podido mostrar este documento.",
+    error_text: "No se ha podido mostrar este texto.",
+    error_text_binary: "Este archivo no es texto, así que no se puede mostrar aquí.",
+    fullscreen: "Pantalla completa",
+    fullscreen_exit: "Salir de pantalla completa",
+    layers: "Capas",
+    layers_all: "Todas",
+    layers_none: "Ninguna",
+    layouts: "Presentaciones",
+    link_confirm: "El documento enlaza a {{url}}. ¿Abrirlo en una pestaña nueva?",
+    loading: "Cargando el documento…",
+    loading_model: "Cargando el modelo…",
+    model_panel: "Modelo",
+    model_space: "Espacio modelo",
+    next: "Siguiente",
+    open_in_tab: "Abrir en una pestaña nueva",
+    page_of: "Página {{current}} / {{total}}",
+    page_short: "Página {{page}}",
+    panel_hide: "Ocultar el panel",
+    prev: "Anterior",
+    sections: "Secciones",
+    sections_hide: "Ocultar las secciones",
+    selection: "Elemento",
+    selection_none: "Toque un elemento para identificarlo.",
+    selection_unnamed: "Sin nombre",
+    sheets: "Hojas",
+    slide_of: "Diapositiva {{current}} / {{total}}",
+    step_convert: "Convirtiendo el documento…",
+    step_engine: "Descargando el visor…",
+    step_file: "Descargando el documento…",
+    step_read: "Leyendo el documento…",
+    step_render: "Mostrando el documento…",
+    step_start: "Iniciando el visor…",
+    storeys: "Plantas",
+    unavailable_offline: "No disponible sin conexión",
+    warning_external_references_one: "{{count}} referencia externa no se dibuja.",
+    warning_external_references_other: "{{count}} referencias externas no se dibujan.",
+    warning_model_damaged: "El archivo está dañado: se muestra lo que se ha podido leer.",
+    warning_model_partial: "El modelo es demasiado grande para mostrarlo entero: se omite una parte.",
+    warning_model_truncated_one: "El modelo es demasiado grande para mostrarlo entero: se omite {{count}} elemento.",
+    warning_model_truncated_other: "El modelo es demasiado grande para mostrarlo entero: se omiten {{count}} elementos.",
+    warning_model_unsupported_one: "{{count}} geometría es de un tipo que no se dibuja aquí.",
+    warning_model_unsupported_other: "{{count}} geometrías son de un tipo que no se dibuja aquí.",
+    warning_preview_shown: "Nada en este dibujo es de un tipo que se dibuje aquí: se muestra la imagen guardada con él.",
+    warning_proxy_without_graphics_one:
+      "{{count}} objeto personalizado se guardó sin sus gráficos: solo la aplicación que lo creó puede mostrarlo.",
+    warning_proxy_without_graphics_other:
+      "{{count}} objetos personalizados se guardaron sin sus gráficos: solo la aplicación que los creó puede mostrarlos.",
+    warning_scene_truncated: "El dibujo es demasiado grande para mostrarlo entero: se omite una parte.",
+    warning_source_read_whole: "El servidor no envía el archivo por partes: se ha descargado entero.",
+    warning_text_html_source: "El HTML se muestra como texto fuente, no como una página.",
+    warning_text_long_lines_one: "{{count}} línea muy larga está cortada.",
+    warning_text_long_lines_other: "{{count}} líneas muy largas están cortadas.",
+    warning_text_markdown_failed: "No se ha podido leer el Markdown: se muestra como texto sin formato.",
+    warning_text_not_json: "Esto no es un JSON válido: se muestra como texto sin formato.",
+    warning_text_not_xml: "Esto no es un XML bien formado: se muestra lo mejor posible.",
+    warning_text_truncated: "El archivo es demasiado grande para mostrarlo entero: solo se muestra el principio.",
+    warning_unknown_entities_one: "{{count}} objeto es de un tipo que no se dibuja aquí.",
+    warning_unknown_entities_other: "{{count}} objetos son de un tipo que no se dibuja aquí.",
+    zoom_fit: "Ajustar a la ventana",
+    zoom_in: "Ampliar",
+    zoom_out: "Reducir",
+  },
+  nl: {
+    archive_back: "Terug naar het archief",
+    archive_failed_member: "Dit bestand kon niet worden uitgepakt.",
+    archive_member_encrypted: "Dit bestand is versleuteld.",
+    archive_member_unsupported: "Dit bestand kon niet uit het archief worden gelezen.",
+    archive_members_one: "{{count}} bestand",
+    archive_members_other: "{{count}} bestanden",
+    archive_no_reader: "Dit bestand kan hier niet worden weergegeven.",
+    background: "Achtergrond",
+    background_dark: "Donker",
+    background_light: "Licht",
+    categories: "Categorieën",
+    close: "Sluiten",
+    converting_model: "Model wordt voorbereid… {{percent}}%",
+    counter: "{{current}} / {{total}}",
+    download: "Downloaden",
+    drag_pan: "Pagina verplaatsen",
+    drag_select: "Tekst selecteren",
+    drawing: "Afbeelding wordt voorbereid…",
+    drawing_panel: "Tekening",
+    empty_model: "Dit model heeft niets om weer te geven.",
+    error: "Het voorbeeld kon niet worden weergegeven.",
+    error_archive: "Dit archief kon niet worden geopend.",
+    error_drawing: "De tekening kon niet worden weergegeven.",
+    error_drawing_version: "Deze tekening is opgeslagen in een formaat ouder dan AutoCAD R13, dat hier niet kan worden weergegeven.",
+    error_file: "Dit bestand kon niet worden weergegeven.",
+    error_image: "De afbeelding kon niet worden weergegeven.",
+    error_image_no_preview: "Dit RAW-bestand van een camera bevat geen voorbeeld om weer te geven.",
+    error_media: "Dit apparaat kan dit bestand niet afspelen.",
+    error_model: "Dit model kon niet worden weergegeven.",
+    error_needs_converter: "Dit formaat kan alleen worden weergegeven met een converter die hier niet is geïnstalleerd.",
+    error_office: "Dit document kon niet worden weergegeven.",
+    error_text: "Deze tekst kon niet worden weergegeven.",
+    error_text_binary: "Dit bestand is geen tekst en kan hier dus niet worden weergegeven.",
+    fullscreen: "Volledig scherm",
+    fullscreen_exit: "Volledig scherm verlaten",
+    layers: "Lagen",
+    layers_all: "Alle",
+    layers_none: "Geen",
+    layouts: "Lay-outs",
+    link_confirm: "Het document verwijst naar {{url}}. In een nieuw tabblad openen?",
+    loading: "Document wordt geladen…",
+    loading_model: "Model wordt geladen…",
+    model_panel: "Model",
+    model_space: "Modelruimte",
+    next: "Volgende",
+    open_in_tab: "Openen in een nieuw tabblad",
+    page_of: "Pagina {{current}} / {{total}}",
+    page_short: "Pagina {{page}}",
+    panel_hide: "Paneel verbergen",
+    prev: "Vorige",
+    sections: "Secties",
+    sections_hide: "Secties verbergen",
+    selection: "Element",
+    selection_none: "Tik op een element om het te herkennen.",
+    selection_unnamed: "Naamloos",
+    sheets: "Werkbladen",
+    slide_of: "Dia {{current}} / {{total}}",
+    step_convert: "Document wordt geconverteerd…",
+    step_engine: "Viewer wordt gedownload…",
+    step_file: "Document wordt gedownload…",
+    step_read: "Document wordt gelezen…",
+    step_render: "Document wordt weergegeven…",
+    step_start: "Viewer wordt gestart…",
+    storeys: "Verdiepingen",
+    unavailable_offline: "Niet offline beschikbaar",
+    warning_external_references_one: "{{count}} externe verwijzing wordt niet getekend.",
+    warning_external_references_other: "{{count}} externe verwijzingen worden niet getekend.",
+    warning_model_damaged: "Het bestand is beschadigd: wat kon worden gelezen, wordt weergegeven.",
+    warning_model_partial: "Het model is te groot om volledig weer te geven: een deel ontbreekt.",
+    warning_model_truncated_one: "Het model is te groot om volledig weer te geven: {{count}} element ontbreekt.",
+    warning_model_truncated_other: "Het model is te groot om volledig weer te geven: {{count}} elementen ontbreken.",
+    warning_model_unsupported_one: "{{count}} geometrie is van een soort die hier niet wordt getekend.",
+    warning_model_unsupported_other: "{{count}} geometrieën zijn van een soort die hier niet wordt getekend.",
+    warning_preview_shown:
+      "Niets in deze tekening is van een soort die hier wordt getekend: de afbeelding die ermee is opgeslagen, wordt weergegeven.",
+    warning_proxy_without_graphics_one:
+      "{{count}} aangepast object is opgeslagen zonder zijn grafische weergave: alleen de toepassing die het heeft gemaakt, kan het weergeven.",
+    warning_proxy_without_graphics_other:
+      "{{count}} aangepaste objecten zijn opgeslagen zonder hun grafische weergave: alleen de toepassing die ze heeft gemaakt, kan ze weergeven.",
+    warning_scene_truncated: "De tekening is te groot om volledig weer te geven: een deel ontbreekt.",
+    warning_source_read_whole: "De server verstuurt het bestand niet in delen: het is volledig gedownload.",
+    warning_text_html_source: "HTML wordt weergegeven als brontekst, niet als pagina.",
+    warning_text_long_lines_one: "{{count}} zeer lange regel is afgekapt.",
+    warning_text_long_lines_other: "{{count}} zeer lange regels zijn afgekapt.",
+    warning_text_markdown_failed: "De Markdown kon niet worden gelezen: deze wordt als platte tekst weergegeven.",
+    warning_text_not_json: "Dit is geen geldige JSON: het wordt als platte tekst weergegeven.",
+    warning_text_not_xml: "Dit is geen goedgevormde XML: het wordt zo goed mogelijk weergegeven.",
+    warning_text_truncated: "Het bestand is te groot om volledig weer te geven: alleen het begin wordt weergegeven.",
+    warning_unknown_entities_one: "{{count}} object is van een soort die hier niet wordt getekend.",
+    warning_unknown_entities_other: "{{count}} objecten zijn van een soort die hier niet wordt getekend.",
+    zoom_fit: "Aanpassen aan venster",
+    zoom_in: "Inzoomen",
+    zoom_out: "Uitzoomen",
+  },
+} as const;
+
+type Strings = (typeof MESSAGES)["en"];
+type Base<K> = K extends `${infer B}_one` | `${infer B}_other` ? B : K;
+
+/** Every message key, plural keys without their suffix. */
+export type MessageKey = Base<keyof Strings>;
+
+export type Translate = (key: MessageKey, vars?: Record<string, string | number>) => string;
+
+/** The language of `locale` among the built-in ones ("fr-CA" is "fr"), English otherwise. */
+export function builtinLanguage(locale = "en"): keyof typeof MESSAGES {
+  const lang = locale.toLowerCase().split(/[-_]/)[0];
+  return lang && Object.hasOwn(MESSAGES, lang) ? (lang as keyof typeof MESSAGES) : "en";
+}
+
+/** The built-in strings for `locale` ("fr", "de-AT"...; English otherwise). */
+export function builtinTranslate(locale = "en"): Translate {
+  const lang = builtinLanguage(locale);
+  const table = MESSAGES[lang] as Record<string, string>;
+  const plural = new Intl.PluralRules(lang);
+  return (key, vars = {}) => {
+    const count = typeof vars.count === "number" ? vars.count : undefined;
+    const template = (count !== undefined && table[`${key}_${plural.select(count) === "one" ? "one" : "other"}`]) || table[key] || key;
+    return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) => String(vars[name] ?? ""));
+  };
+}
diff --git a/crates/exav-viewer/ts/core/pictures.test.ts b/crates/exav-viewer/ts/core/pictures.test.ts
new file mode 100644
index 00000000..5e862757
--- /dev/null
+++ b/crates/exav-viewer/ts/core/pictures.test.ts
@@ -0,0 +1,210 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  checkRasterOptions,
+  fitCamera,
+  fitRect,
+  isPage,
+  MAX_PICTURE_EDGE,
+  MAX_PICTURE_PIXELS,
+  pictureSize,
+  planRect,
+  RasterError,
+  rasterSize,
+  tilePlan,
+  tileRect,
+} from "./pictures.js";
+
+it("sizes a picture by its longest side, held to the largest picture", () => {
+  expect(pictureSize(600, 800, 200)).toEqual({ width: 150, height: 200 });
+  expect(pictureSize(800, 600, 200)).toEqual({ width: 200, height: 150 });
+  // Past the edge limit and the pixel budget of a tall page: the budget decides.
+  const tall = pictureSize(600, 800, 1e9)!;
+  expect(tall.height).toBeLessThan(MAX_PICTURE_EDGE);
+  expect(tall.width * tall.height).toBeLessThanOrEqual(MAX_PICTURE_PIXELS);
+  expect(tall.width * tall.height).toBeGreaterThan(MAX_PICTURE_PIXELS * 0.99);
+  expect(tall.height / tall.width).toBeCloseTo(800 / 600, 2);
+  // A thin page reaches the edge limit before the budget.
+  expect(pictureSize(100, 400, 1e9)).toEqual({ width: 4096, height: MAX_PICTURE_EDGE });
+  // A sliver keeps a pixel.
+  expect(pictureSize(10_000, 1, 100)).toEqual({ width: 100, height: 1 });
+  expect(pictureSize(0, 800, 200)).toBeNull();
+  expect(pictureSize(600, NaN, 200)).toBeNull();
+  expect(pictureSize(600, 800, Infinity)).toBeNull();
+});
+
+it("knows a page by its number", () => {
+  expect(isPage(1, 3)).toBe(true);
+  expect(isPage(3, 3)).toBe(true);
+  for (const p of [0, 4, 1.5, "1", NaN]) expect(isPage(p, 3), String(p)).toBe(false);
+});
+
+const code = (f: () => unknown) => {
+  try {
+    f();
+  } catch (e) {
+    return e instanceof RasterError ? e.code : `not a RasterError: ${String(e)}`;
+  }
+  return "none";
+};
+
+describe("the size of a raster", () => {
+  it("takes the other side from the region's shape when only one is given", () => {
+    expect(rasterSize({ width: 300 }, 1.5)).toEqual({ width: 300, height: 200 });
+    expect(rasterSize({ height: 200 }, 1.5)).toEqual({ width: 300, height: 200 });
+    expect(rasterSize({ width: 100, height: 70 }, 1.5)).toEqual({ width: 100, height: 70 });
+    expect(rasterSize({ longEdge: 300 }, 1.5)).toEqual({ width: 300, height: 200 });
+    expect(rasterSize({ longEdge: 300 }, 0.5)).toEqual({ width: 150, height: 300 });
+    // Whole pixels, at least one.
+    expect(rasterSize({ width: 10.4 }, 1000)).toEqual({ width: 10, height: 1 });
+    expect(rasterSize({ longEdge: 0.2 }, 1)).toEqual({ width: 1, height: 1 });
+  });
+
+  it("holds a longEdge to the limits, and refuses a width and height past them", () => {
+    expect(rasterSize({ longEdge: 1e9 }, 1000)).toEqual({ width: MAX_PICTURE_EDGE, height: 16 });
+    const wide = rasterSize({ longEdge: 1e9 }, 1);
+    expect(wide.width * wide.height).toBeLessThanOrEqual(MAX_PICTURE_PIXELS);
+    expect(wide.width).toBe(wide.height);
+    expect(code(() => rasterSize({ width: MAX_PICTURE_EDGE + 1, height: 1 }, 1))).toBe("too-large");
+    expect(code(() => rasterSize({ width: MAX_PICTURE_EDGE, height: MAX_PICTURE_EDGE }, 1))).toBe("too-large");
+    expect(code(() => rasterSize({ width: MAX_PICTURE_EDGE }, 0.001))).toBe("too-large");
+    // Exactly the budget is allowed.
+    expect(rasterSize({ width: 8192, height: 8192 }, 1)).toEqual({ width: 8192, height: 8192 });
+  });
+
+  it("refuses what is no size", () => {
+    for (const o of [{}, { longEdge: 0 }, { longEdge: -1 }, { longEdge: NaN }, { longEdge: Infinity }, { width: 0 }, { height: NaN }, { width: 10, height: -3 }, { longEdge: 10, width: 10 }]) {
+      expect(code(() => rasterSize(o, 1)), JSON.stringify(o)).toBe("invalid");
+    }
+    for (const aspect of [0, -1, NaN, Infinity]) expect(code(() => rasterSize({ longEdge: 10 }, aspect)), String(aspect)).toBe("invalid");
+  });
+});
+
+describe("fitting a region to a picture's shape", () => {
+  const square = { x: 10, y: 20, width: 100, height: 100 };
+
+  it("widens the region to a wider picture (contain) and heightens it for a taller one, about its centre", () => {
+    expect(fitRect(square, 2, "contain")).toEqual({ x: -40, y: 20, width: 200, height: 100 });
+    expect(fitRect(square, 0.5, "contain")).toEqual({ x: 10, y: -30, width: 100, height: 200 });
+    expect(fitRect(square, 1, "contain")).toEqual(square);
+    // The default is contain.
+    expect(fitRect(square, 2)).toEqual(fitRect(square, 2, "contain"));
+  });
+
+  it("narrows it for cover, so that the picture is filled", () => {
+    expect(fitRect(square, 2, "cover")).toEqual({ x: 10, y: 45, width: 100, height: 50 });
+    expect(fitRect(square, 0.5, "cover")).toEqual({ x: 35, y: 20, width: 50, height: 100 });
+  });
+
+  it("sees the shape on the paper, not in the coordinates: a page's fractions are as long as the page is", () => {
+    // A landscape page, 400 x 200 pt: the whole page is 2:1 and fits a 2:1 picture as it is.
+    const page = { x: 0, y: 0, width: 1, height: 1 };
+    expect(fitRect(page, 2, "contain", { x: 400, y: 200 })).toEqual(page);
+    // A square picture: contain adds height, in fractions of the page's height.
+    expect(fitRect(page, 1, "contain", { x: 400, y: 200 })).toEqual({ x: 0, y: -0.5, width: 1, height: 2 });
+    expect(fitRect(page, 1, "cover", { x: 400, y: 200 })).toEqual({ x: 0.25, y: 0, width: 0.5, height: 1 });
+  });
+
+  it("does not move the region it is given", () => {
+    const copy = { ...square };
+    fitRect(square, 3, "cover");
+    expect(square).toEqual(copy);
+  });
+
+  it("fits a camera: contain keeps all of what it framed, cover fills the picture with it", () => {
+    const ortho = { position: [0, 0, 10], target: [0, 0, 0], projection: { type: "orthographic", height: 10 }, aspect: 2 } as const;
+    // Wider picture: contain keeps the vertical extent (the width grows with the aspect).
+    expect(fitCamera(ortho, 4, "contain")).toMatchObject({ aspect: 4, projection: { type: "orthographic", height: 10 } });
+    // Narrower picture: contain keeps the horizontal extent (20 wide), so the height grows.
+    expect(fitCamera(ortho, 1, "contain")).toMatchObject({ aspect: 1, projection: { type: "orthographic", height: 20 } });
+    // Cover is the other way about.
+    expect(fitCamera(ortho, 1, "cover")).toMatchObject({ projection: { height: 10 } });
+    expect(fitCamera(ortho, 4, "cover")).toMatchObject({ projection: { height: 5 } });
+    expect(fitCamera(ortho, 2, "cover")).toMatchObject({ aspect: 2, projection: { height: 10 } });
+    // A perspective camera widens by the tangent of the half angle, not the angle.
+    const persp = { ...ortho, projection: { type: "perspective", fov: 60 } } as const;
+    const narrow = fitCamera(persp, 1, "contain").projection as { fov: number };
+    expect(Math.tan((narrow.fov * Math.PI) / 360)).toBeCloseTo(Math.tan(Math.PI / 6) * 2, 9);
+    expect((fitCamera(persp, 4, "contain").projection as { fov: number }).fov).toBeCloseTo(60, 9);
+  });
+});
+
+describe("tiles", () => {
+  it("cover the picture once, row by row, the last ones cut", () => {
+    const tiles = tilePlan(250, 120, 100);
+    expect(tiles).toHaveLength(6);
+    expect(tiles[0]).toEqual({ x: 0, y: 0, width: 100, height: 100 });
+    expect(tiles[2]).toEqual({ x: 200, y: 0, width: 50, height: 100 });
+    expect(tiles[5]).toEqual({ x: 200, y: 100, width: 50, height: 20 });
+    // Every pixel exactly once.
+    expect(tiles.reduce((n, t) => n + t.width * t.height, 0)).toBe(250 * 120);
+    expect(tilePlan(100, 100, 100)).toHaveLength(1);
+    expect(tilePlan(1, 1, 4096)).toEqual([{ x: 0, y: 0, width: 1, height: 1 }]);
+  });
+
+  it("are at most MAX_TILES, and at least a pixel", () => {
+    expect(code(() => tilePlan(MAX_PICTURE_EDGE, MAX_PICTURE_EDGE, 128))).toBe("too-large");
+    expect(tilePlan(MAX_PICTURE_EDGE, 4096, 256)).toHaveLength(64 * 16);
+    for (const t of [0, -1, 1.5, NaN]) expect(code(() => tilePlan(10, 10, t)), String(t)).toBe("invalid");
+  });
+
+  it("show the part of the region they cover, the y axis of a drawing going up", () => {
+    const region = { x: 0, y: 0, width: 200, height: 100 };
+    const size = { width: 400, height: 200 };
+    const tile = { x: 100, y: 50, width: 100, height: 100 };
+    expect(tileRect(region, size, tile)).toEqual({ x: 50, y: 25, width: 50, height: 50 });
+    // Up: the picture's top row is the region's top (largest y).
+    expect(tileRect(region, size, tile, true)).toEqual({ x: 50, y: 25, width: 50, height: 50 });
+    expect(tileRect(region, size, { x: 0, y: 0, width: 100, height: 50 }, true)).toEqual({ x: 0, y: 75, width: 50, height: 25 });
+    expect(tileRect(region, size, { x: 0, y: 0, width: 100, height: 50 })).toEqual({ x: 0, y: 0, width: 50, height: 25 });
+  });
+});
+
+describe("planning a raster of a rectangle format", () => {
+  const full = { x: 0, y: 0, width: 1, height: 1 };
+  const page = { x: 400, y: 200 };
+
+  it("draws the whole page by default, on white, at the size of its shape", () => {
+    expect(planRect({ longEdge: 800 }, full, page, null)).toEqual({ width: 800, height: 400, region: full, background: "#ffffff" });
+  });
+
+  it("takes the viewport for 'current', and refuses it where there is none", () => {
+    const here = { x: 0.5, y: 0, width: 0.5, height: 1 };
+    expect(planRect({ longEdge: 100, region: "current" }, full, page, here).region).toEqual(here);
+    expect(code(() => planRect({ longEdge: 100, region: "current" }, full, page, null))).toBe("invalid");
+  });
+
+  it("changes the region to the picture's shape only when both sides are given", () => {
+    const region = { x: 0, y: 0, width: 0.5, height: 1 };
+    // 200 x 200 pt region.
+    expect(planRect({ longEdge: 100, region }, full, page, null).region).toEqual(region);
+    expect(planRect({ width: 100, region }, full, page, null)).toMatchObject({ width: 100, height: 100, region });
+    // Both sides, a 2:1 picture of a square region (200 x 200 pt): contain widens it past the page's left edge, cover cuts its height.
+    expect(planRect({ width: 200, height: 100, region }, full, page, null).region).toEqual({ x: -0.25, y: 0, width: 1, height: 1 });
+    expect(planRect({ width: 200, height: 100, region, fit: "cover" }, full, page, null).region).toEqual({ x: 0, y: 0.25, width: 0.5, height: 0.5 });
+  });
+
+  it("refuses a region of another kind, a bad background, a bad fit", () => {
+    const camera = { position: [0, 0, 1], target: [0, 0, 0], projection: { type: "perspective", fov: 50 }, aspect: 1 } as const;
+    expect(code(() => planRect({ longEdge: 10, region: camera }, full, page, null))).toBe("invalid");
+    expect(code(() => planRect({ longEdge: 10, region: { x: 0, y: 0, width: 0, height: 1 } }, full, page, null))).toBe("invalid");
+    expect(code(() => planRect({ longEdge: 10, background: "url(x)" }, full, page, null))).toBe("invalid");
+    expect(code(() => planRect({ longEdge: 10, fit: "stretch" as never }, full, page, null))).toBe("invalid");
+    expect(planRect({ longEdge: 10, background: "transparent" }, full, page, null).background).toBe("transparent");
+    expect(planRect({ longEdge: 10 }, full, page, null, "transparent").background).toBe("transparent");
+  });
+});
+
+describe("options that cross a message", () => {
+  it("keep the known fields and drop the rest", () => {
+    expect(checkRasterOptions({ longEdge: 5, extra: 1, signal: {} })).toEqual({ longEdge: 5 });
+    expect(checkRasterOptions({})).toEqual({});
+    expect(checkRasterOptions({ region: { x: 1, y: 2, width: 3, height: 4, z: 5 } })).toEqual({ region: { x: 1, y: 2, width: 3, height: 4 } });
+  });
+
+  it("are null when any field is wrong", () => {
+    for (const bad of [null, [], "x", { longEdge: "5" }, { width: 1e10 }, { region: { x: 1e16, y: 0, width: 1, height: 1 } }, { layout: 3 }, { fit: "fill" }, { background: "expression(1)" }]) {
+      expect(checkRasterOptions(bad), JSON.stringify(bad)).toBeNull();
+    }
+  });
+});
diff --git a/crates/exav-viewer/ts/core/pictures.ts b/crates/exav-viewer/ts/core/pictures.ts
new file mode 100644
index 00000000..38ec49a0
--- /dev/null
+++ b/crates/exav-viewer/ts/core/pictures.ts
@@ -0,0 +1,325 @@
+/** Pages drawn as pictures (`PicturesController`): sizes, limits, regions. No DOM. */
+import { isColor } from "./theme.js";
+import type { CameraRegion, RasterFit, RasterOptions, RasterRect, RasterRegion } from "./types.js";
+
+/** The longest side of a picture: a drawing of a sheet at 300 dpi is 14,000 px. */
+export const MAX_PICTURE_EDGE = 16_384;
+
+/**
+ * The most pixels in a picture, whatever its sides (an RGBA bitmap of this
+ * size is 256 MiB). Raising the edge limit is only sound with this one.
+ */
+export const MAX_PICTURE_PIXELS = 64 * 1024 * 1024;
+
+/** The most tiles one picture is drawn in. */
+export const MAX_TILES = 4096;
+
+export type RasterErrorCode =
+  /** The format cannot draw this (a transparent ground, a region of a kind it has no coordinates for). */
+  | "unsupported"
+  /** Past `MAX_PICTURE_EDGE` or `MAX_PICTURE_PIXELS`, or more than the device can hold. */
+  | "too-large"
+  | "aborted"
+  /** The request is not one: a size, a region, a page that does not exist. */
+  | "invalid"
+  | "failed";
+
+export class RasterError extends Error {
+  constructor(
+    readonly code: RasterErrorCode,
+    message: string = code,
+    options?: { cause?: unknown },
+  ) {
+    super(message, options);
+    this.name = "RasterError";
+  }
+}
+
+export function isRasterErrorCode(v: unknown): v is RasterErrorCode {
+  return v === "unsupported" || v === "too-large" || v === "aborted" || v === "invalid" || v === "failed";
+}
+
+/** The `RasterError` for whatever a drawing threw. */
+export function asRasterError(error: unknown, signal?: AbortSignal): RasterError {
+  if (error instanceof RasterError) return error;
+  if (signal?.aborted || (error instanceof DOMException && error.name === "AbortError")) return new RasterError("aborted", "aborted");
+  return new RasterError("failed", error instanceof Error ? error.message : "could not draw", { cause: error });
+}
+
+export function throwIfAborted(signal: AbortSignal | undefined): void {
+  if (signal?.aborted) throw new RasterError("aborted", "aborted");
+}
+
+/** A page number a picture can be asked of: 1..count. */
+export function isPage(page: unknown, count: number): page is number {
+  return Number.isSafeInteger(page) && (page as number) >= 1 && (page as number) <= count;
+}
+
+const positive = (v: unknown): v is number => typeof v === "number" && Number.isFinite(v) && v > 0;
+
+export interface SizeLimits {
+  edge: number;
+  pixels: number;
+}
+
+export const DEFAULT_LIMITS: SizeLimits = { edge: MAX_PICTURE_EDGE, pixels: MAX_PICTURE_PIXELS };
+
+/**
+ * The size of a picture of something whose width over height is `aspect`.
+ * `longEdge` is held to the limits; a `width` and `height` beyond them are
+ * refused (the caller asked for those pixels). One of `width` and `height`
+ * alone takes the other from `aspect`. Whole pixels, at least one.
+ */
+export function rasterSize(
+  options: Pick<RasterOptions, "longEdge" | "width" | "height">,
+  aspect: number,
+  limits: SizeLimits = DEFAULT_LIMITS,
+): { width: number; height: number } {
+  const { longEdge, width, height } = options;
+  if (!positive(aspect)) throw new RasterError("invalid", "the region has no size");
+  const given = (v: unknown, what: string) => {
+    if (!positive(v)) throw new RasterError("invalid", `${what} must be a positive number`);
+    return v;
+  };
+  if (width !== undefined || height !== undefined) {
+    if (longEdge !== undefined) throw new RasterError("invalid", "longEdge, or width and height, not both");
+    let w: number;
+    let h: number;
+    if (width !== undefined && height !== undefined) {
+      w = Math.round(given(width, "width"));
+      h = Math.round(given(height, "height"));
+    } else if (width !== undefined) {
+      w = Math.round(given(width, "width"));
+      h = Math.round(w / aspect);
+    } else {
+      h = Math.round(given(height, "height"));
+      w = Math.round(h * aspect);
+    }
+    w = Math.max(1, w);
+    h = Math.max(1, h);
+    if (w > limits.edge || h > limits.edge || w * h > limits.pixels) throw new RasterError("too-large", `${w} x ${h} px is past the limits (${limits.edge} px a side, ${limits.pixels} px in all)`);
+    return { width: w, height: h };
+  }
+  if (longEdge === undefined) throw new RasterError("invalid", "a size is needed: longEdge, or width and/or height");
+  const edge = Math.min(limits.edge, Math.max(1, Math.round(given(longEdge, "longEdge"))));
+  let w = aspect >= 1 ? edge : Math.max(1, Math.round(edge * aspect));
+  let h = aspect >= 1 ? Math.max(1, Math.round(edge / aspect)) : edge;
+  if (w * h > limits.pixels) {
+    const k = Math.sqrt(limits.pixels / (w * h));
+    w = Math.max(1, Math.floor(w * k));
+    h = Math.max(1, Math.floor(h * k));
+  }
+  return { width: w, height: h };
+}
+
+/**
+ * The size of a picture of something `width` by `height` whose longest side
+ * is `longEdge` px, held to the limits. Whole pixels, at least one; null for
+ * a size that is not one.
+ */
+export function pictureSize(width: number, height: number, longEdge: number): { width: number; height: number } | null {
+  if (!positive(width) || !positive(height) || !Number.isFinite(longEdge)) return null;
+  try {
+    return rasterSize({ longEdge }, width / height);
+  } catch {
+    return null;
+  }
+}
+
+const SAME = 1e-9;
+
+/**
+ * `rect`, changed to the shape of a picture whose width over height is
+ * `aspect`, about its centre. `unit` is how long one unit of x and of y are
+ * on the paper or the screen (a page's fractions: its width and height), so
+ * that the shape is the one seen. "contain" grows the region, "cover" cuts
+ * it. A region already of that shape is returned as it is.
+ */
+export function fitRect(rect: RasterRect, aspect: number, fit: RasterFit = "contain", unit: { x: number; y: number } = { x: 1, y: 1 }): RasterRect {
+  const w = rect.width * unit.x;
+  const h = rect.height * unit.y;
+  const have = w / h;
+  if (!(w > 0 && h > 0) || Math.abs(have - aspect) <= SAME * aspect) return { ...rect };
+  // Keep the height and set the width from it, or the reverse.
+  const fromHeight = fit === "contain" ? aspect > have : aspect < have;
+  const nw = fromHeight ? h * aspect : w;
+  const nh = fromHeight ? h : w / aspect;
+  const width = nw / unit.x;
+  const height = nh / unit.y;
+  return { x: rect.x + (rect.width - width) / 2, y: rect.y + (rect.height - height) / 2, width, height };
+}
+
+/**
+ * A camera, changed to a picture of `aspect`. The vertical field of view (or
+ * extent) is kept, and the horizontal one follows, unless that would cut what
+ * the camera framed: "contain" then widens the vertical one, "cover" keeps
+ * the camera's own horizontal one when it cuts less.
+ */
+export function fitCamera(camera: CameraRegion, aspect: number, fit: RasterFit = "contain"): CameraRegion {
+  const have = camera.aspect;
+  if (!positive(have) || Math.abs(have - aspect) <= SAME * aspect) return { ...camera, aspect };
+  // The view's size along the dimension that is kept: contain keeps all of the
+  // camera's view in the picture, cover fills the picture with it.
+  const keepWidth = fit === "contain" ? aspect < have : aspect > have;
+  if (!keepWidth) return { ...camera, aspect };
+  const scale = have / aspect;
+  if (camera.projection.type === "orthographic") return { ...camera, aspect, projection: { type: "orthographic", height: camera.projection.height * scale } };
+  // Widths are tangents of the half angle, not angles.
+  const half = Math.tan((camera.projection.fov * Math.PI) / 360) * scale;
+  const fov = (2 * Math.atan(half) * 180) / Math.PI;
+  return { ...camera, aspect, projection: { type: "perspective", fov } };
+}
+
+/** What a request resolves to for a format whose regions are rectangles. */
+export interface RectPlan {
+  width: number;
+  height: number;
+  /** What is drawn: the request's region, changed to the picture's shape when the size gave both sides. */
+  region: RasterRect;
+  /** A CSS colour, or "transparent". */
+  background: string;
+}
+
+/**
+ * The size, region and ground of a picture of a rectangle format.
+ * `full`: the whole page, image or drawing extents, which is the region by
+ * default; `unit`: the length of one unit of x and y (see `fitRect`);
+ * `current`: the viewport's region, or null when there is none for this
+ * page (then "current" is refused); `ground`: the default background.
+ */
+export function planRect(options: RasterOptions, full: RasterRect, unit: { x: number; y: number }, current: RasterRect | null, ground = "#ffffff"): RectPlan {
+  let region: RasterRect;
+  if (options.region === undefined) region = full;
+  else if (options.region === "current") {
+    if (!current) throw new RasterError("invalid", "nothing is in view to draw");
+    region = current;
+  } else if (isRect(options.region)) region = options.region;
+  else throw new RasterError("invalid", "this format takes a rectangle for a region");
+  if (options.fit !== undefined && options.fit !== "contain" && options.fit !== "cover") throw new RasterError("invalid", "fit is contain or cover");
+  const aspect = (region.width * unit.x) / (region.height * unit.y);
+  const size = rasterSize(options, aspect);
+  const both = options.width !== undefined && options.height !== undefined;
+  const shaped = both ? fitRect(region, size.width / size.height, options.fit, unit) : { ...region };
+  const background = options.background ?? ground;
+  if (!isColor(background)) throw new RasterError("invalid", "background is a colour or transparent");
+  return { ...size, region: shaped, background };
+}
+
+export interface Tile {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/** `width` by `height` cut in tiles of at most `tile` px a side, row by row. */
+export function tilePlan(width: number, height: number, tile: number): Tile[] {
+  if (!Number.isSafeInteger(tile) || tile < 1) throw new RasterError("invalid", "a tile is at least a pixel");
+  const columns = Math.ceil(width / tile);
+  const rows = Math.ceil(height / tile);
+  if (columns * rows > MAX_TILES) throw new RasterError("too-large", `${columns * rows} tiles`);
+  const out: Tile[] = [];
+  for (let y = 0; y < height; y += tile) {
+    for (let x = 0; x < width; x += tile) out.push({ x, y, width: Math.min(tile, width - x), height: Math.min(tile, height - y) });
+  }
+  return out;
+}
+
+/**
+ * The part of `region` that `tile` of a picture of `size` shows. For a
+ * rectangle region the tile is cut in the same proportions; the y axis of a
+ * drawing goes up, a page's down, so `up` flips it.
+ */
+export function tileRect(region: RasterRect, size: { width: number; height: number }, tile: Tile, up = false): RasterRect {
+  const kx = region.width / size.width;
+  const ky = region.height / size.height;
+  const y = up ? region.y + region.height - (tile.y + tile.height) * ky : region.y + tile.y * ky;
+  return { x: region.x + tile.x * kx, y, width: tile.width * kx, height: tile.height * ky };
+}
+
+// ── What a message may carry ─────────────────────────────────────────────────
+
+/** Coordinates of a document or a drawing: finite, and nothing a sum could overflow. */
+const BOUND = 1e15;
+const coordinate = (v: unknown): v is number => typeof v === "number" && Number.isFinite(v) && Math.abs(v) <= BOUND;
+
+export function isRect(v: unknown): v is RasterRect {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return false;
+  const r = v as Record<string, unknown>;
+  return coordinate(r.x) && coordinate(r.y) && coordinate(r.width) && coordinate(r.height) && (r.width as number) > 0 && (r.height as number) > 0;
+}
+
+const vector = (v: unknown): v is [number, number, number] => Array.isArray(v) && v.length === 3 && v.every(coordinate);
+
+export function isCamera(v: unknown): v is CameraRegion {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return false;
+  const c = v as Record<string, unknown>;
+  if (!vector(c.position) || !vector(c.target) || (c.up !== undefined && !vector(c.up)) || !positive(c.aspect) || (c.aspect as number) > 1e6) return false;
+  const p = c.projection;
+  if (typeof p !== "object" || p === null) return false;
+  const { type, fov, height } = p as Record<string, unknown>;
+  if (type === "perspective") return positive(fov) && (fov as number) < 180;
+  return type === "orthographic" && positive(height) && (height as number) <= BOUND;
+}
+
+export function isRegion(v: unknown): v is RasterRegion {
+  return isRect(v) || isCamera(v);
+}
+
+const copyRegion = (r: RasterRegion): RasterRegion =>
+  "projection" in r
+    ? { position: [...r.position], target: [...r.target], ...(r.up && { up: [...r.up] }), projection: { ...r.projection }, aspect: r.aspect }
+    : { x: r.x, y: r.y, width: r.width, height: r.height };
+
+/** A region taken out of a message: a fresh copy, or undefined if it is none. */
+export function checkRegion(v: unknown): RasterRegion | undefined {
+  return isRegion(v) ? copyRegion(v) : undefined;
+}
+
+/**
+ * The options of a request that crossed a message, without the `signal`:
+ * known fields of the right kind, or null when one is wrong. A colour is a
+ * hex value or a colour function, never a `url(...)`.
+ */
+export function checkRasterOptions(v: unknown): Omit<RasterOptions, "signal"> | null {
+  if (typeof v !== "object" || v === null || Array.isArray(v)) return null;
+  const o = v as Record<string, unknown>;
+  const out: Omit<RasterOptions, "signal"> = {};
+  for (const key of ["longEdge", "width", "height"] as const) {
+    if (o[key] === undefined) continue;
+    if (!positive(o[key]) || (o[key] as number) > 1e9) return null;
+    out[key] = o[key] as number;
+  }
+  if (o.region !== undefined) {
+    if (o.region === "current") out.region = "current";
+    else {
+      const region = checkRegion(o.region);
+      if (!region) return null;
+      out.region = region;
+    }
+  }
+  if (o.layout !== undefined) {
+    if (typeof o.layout !== "string" || o.layout.length > 1024) return null;
+    out.layout = o.layout;
+  }
+  if (o.fit !== undefined) {
+    if (o.fit !== "contain" && o.fit !== "cover") return null;
+    out.fit = o.fit;
+  }
+  if (o.lineweight !== undefined) {
+    if (o.lineweight !== "screen" && o.lineweight !== "scaled") return null;
+    out.lineweight = o.lineweight;
+  }
+  if (o.background !== undefined) {
+    if (!isColor(o.background)) return null;
+    out.background = o.background;
+  }
+  return out;
+}
+
+/** The region type the viewport of a space has: used to check what a frame reports. */
+export function regionMatches(space: string, region: unknown): boolean {
+  if (space === "camera") return isCamera(region);
+  if (space === "frame") return region === undefined;
+  return isRect(region);
+}
diff --git a/crates/exav-viewer/ts/core/print.ts b/crates/exav-viewer/ts/core/print.ts
new file mode 100644
index 00000000..70d4baaf
--- /dev/null
+++ b/crates/exav-viewer/ts/core/print.ts
@@ -0,0 +1,94 @@
+/**
+ * Printing what a session shows, from its pages drawn as pictures: the
+ * sandboxed frame cannot open the print dialog, and a format the browser
+ * does not draw (TIFF, JPEG 2000, a PDF in most of them) cannot be printed
+ * from its URL.
+ */
+import type { PicturesController } from "./types.js";
+
+export interface PrintOptions {
+  /** Longest side of each page, in px. Default 2480 (A4 at 300 dpi). */
+  longEdge?: number;
+  /** The pages to print, 1-based. Default all of them. */
+  pages?: readonly number[];
+  /** Stops drawing the pages; nothing is printed. */
+  signal?: AbortSignal;
+  /** Each page drawn, for a progress bar. */
+  onProgress?: (done: number, total: number) => void;
+}
+
+/** As PNG; null when it cannot be read back (an image shown from another origin without CORS). */
+function toBlob(bitmap: ImageBitmap): Promise<Blob | null> {
+  const canvas = document.createElement("canvas");
+  canvas.width = bitmap.width;
+  canvas.height = bitmap.height;
+  canvas.getContext("2d")?.drawImage(bitmap, 0, 0);
+  return new Promise<Blob | null>((resolve) => canvas.toBlob(resolve, "image/png"))
+    .catch(() => null)
+    .finally(() => {
+      canvas.width = 0;
+      canvas.height = 0;
+    });
+}
+
+/**
+ * Draws the pages, then opens the browser's print dialog on them in a hidden
+ * frame of this page, built element by element. Resolves once the dialog
+ * has closed, false when nothing was printed (no page drawn, or aborted).
+ * A page that cannot be read back (an image the frame showed from another
+ * origin without CORS) is left out. The page's policy must allow `blob:`
+ * images.
+ */
+export async function printPictures(pictures: PicturesController, options: PrintOptions = {}): Promise<boolean> {
+  const count = pictures.get().count;
+  const pages = (options.pages ?? Array.from({ length: count }, (_, i) => i + 1)).filter((p) => Number.isSafeInteger(p) && p >= 1 && p <= count);
+  const urls: string[] = [];
+  const frame = document.createElement("iframe");
+  try {
+    for (const [i, page] of pages.entries()) {
+      if (options.signal?.aborted) return false;
+      const bitmap = await pictures.render(page, options.longEdge ?? 2480);
+      if (bitmap) {
+        const blob = await toBlob(bitmap);
+        bitmap.close();
+        if (blob) urls.push(URL.createObjectURL(blob));
+      }
+      options.onProgress?.(i + 1, pages.length);
+    }
+    if (!urls.length || options.signal?.aborted) return false;
+
+    frame.setAttribute("aria-hidden", "true");
+    frame.tabIndex = -1;
+    Object.assign(frame.style, { position: "fixed", width: "0", height: "0", border: "0", visibility: "hidden" });
+    document.body.append(frame);
+    const doc = frame.contentDocument;
+    const win = frame.contentWindow;
+    if (!doc || !win) return false;
+    Object.assign(doc.body.style, { margin: "0" });
+    const loads: Promise<unknown>[] = [];
+    for (const [i, url] of urls.entries()) {
+      const img = doc.createElement("img");
+      Object.assign(img.style, { display: "block", maxWidth: "100%", maxHeight: "100vh", margin: "0 auto", breakAfter: i < urls.length - 1 ? "page" : "auto" });
+      loads.push(img.decode().catch(() => undefined));
+      img.src = url;
+      doc.body.append(img);
+    }
+    await Promise.all(loads);
+    if (options.signal?.aborted) return false;
+    await new Promise<void>((resolve) => {
+      win.addEventListener("afterprint", () => resolve(), { once: true });
+      win.focus();
+      const start = performance.now();
+      win.print();
+      // A `print` that blocked until the dialog closed is over, `afterprint` or not.
+      if (performance.now() - start > 500) resolve();
+    });
+    return true;
+  } finally {
+    // After the dialog: some browsers read the images while it is open.
+    setTimeout(() => {
+      frame.remove();
+      for (const u of urls) URL.revokeObjectURL(u);
+    }, 1000);
+  }
+}
diff --git a/crates/exav-viewer/ts/core/raster.test.ts b/crates/exav-viewer/ts/core/raster.test.ts
new file mode 100644
index 00000000..2af4879c
--- /dev/null
+++ b/crates/exav-viewer/ts/core/raster.test.ts
@@ -0,0 +1,266 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { RasterError } from "./pictures.js";
+import { createPictures, drawTiled, encodeBitmap } from "./raster.js";
+import type { Raster } from "./types.js";
+
+/** A canvas that records what is drawn on it. */
+class FakeCanvas {
+  static made: FakeCanvas[] = [];
+  /** What `convertToBlob` answers, as the mime type of the blob. */
+  static encodes: (type: string) => string = (type) => type;
+  draws: unknown[][] = [];
+  fills: unknown[][] = [];
+  fillStyle = "";
+  transferred = 0;
+  /** The size it was made at. */
+  readonly made: [number, number];
+  constructor(
+    public width: number,
+    public height: number,
+  ) {
+    this.made = [width, height];
+    FakeCanvas.made.push(this);
+  }
+  getContext() {
+    const canvas = this;
+    return {
+      drawImage: (...a: unknown[]) => this.draws.push(a),
+      fillRect: (...a: unknown[]) => this.fills.push([this.fillStyle, ...a]),
+      set fillStyle(v: string) {
+        canvas.fillStyle = v;
+      },
+    };
+  }
+  transferToImageBitmap() {
+    this.transferred++;
+    return new FakeBitmap(this.width, this.height);
+  }
+  async convertToBlob(o: { type: string; quality?: number }) {
+    return new Blob(["x"], { type: FakeCanvas.encodes(o.type) });
+  }
+}
+
+class FakeBitmap {
+  closed = false;
+  constructor(
+    public width: number,
+    public height: number,
+  ) {}
+  close() {
+    this.closed = true;
+  }
+}
+
+beforeEach(() => {
+  FakeCanvas.made = [];
+  FakeCanvas.encodes = (t) => t;
+  vi.stubGlobal("OffscreenCanvas", FakeCanvas);
+  vi.stubGlobal("ImageBitmap", FakeBitmap);
+});
+afterEach(() => vi.unstubAllGlobals());
+
+const bitmap = (w: number, h: number) => new FakeBitmap(w, h) as unknown as ImageBitmap;
+const code = async (p: Promise<unknown>) => p.then(() => "none", (e) => (e instanceof RasterError ? e.code : `other: ${String(e)}`));
+
+describe("a picture drawn in tiles", () => {
+  it("has each tile copied where it belongs, then freed, and its canvas given away whole", async () => {
+    const drawn: FakeBitmap[] = [];
+    const result = await drawTiled(250, 120, 100, async (t) => {
+      const b = new FakeBitmap(t.width, t.height);
+      drawn.push(b);
+      return b as unknown as ImageBitmap;
+    });
+    const canvas = FakeCanvas.made[0]!;
+    expect(canvas.made).toEqual([250, 120]);
+    expect(canvas.draws.map((a) => a.slice(1))).toEqual([
+      [0, 0],
+      [100, 0],
+      [200, 0],
+      [0, 100],
+      [100, 100],
+      [200, 100],
+    ]);
+    expect(drawn).toHaveLength(6);
+    expect(drawn.every((b) => b.closed)).toBe(true);
+    expect(canvas.transferred).toBe(1);
+    expect(result).toMatchObject({ width: 250, height: 120 });
+    // The canvas the result came from is released: the bitmap owns the pixels.
+    expect([canvas.width, canvas.height]).toEqual([0, 0]);
+  });
+
+  it("is filled with the ground first when it has one", async () => {
+    await drawTiled(10, 10, 10, async (t) => new FakeBitmap(t.width, t.height) as unknown as ImageBitmap, { background: "#123456" });
+    expect(FakeCanvas.made[0]!.fills).toEqual([["#123456", 0, 0, 10, 10]]);
+    await drawTiled(10, 10, 10, async (t) => new FakeBitmap(t.width, t.height) as unknown as ImageBitmap);
+    expect(FakeCanvas.made[1]!.fills).toEqual([]);
+  });
+
+  it("stops between tiles when aborted, frees the canvas and the tile in hand", async () => {
+    const abort = new AbortController();
+    const drawn: FakeBitmap[] = [];
+    const p = drawTiled(
+      300,
+      100,
+      100,
+      async (t) => {
+        const b = new FakeBitmap(t.width, t.height);
+        drawn.push(b);
+        if (drawn.length === 2) abort.abort();
+        return b as unknown as ImageBitmap;
+      },
+      { signal: abort.signal },
+    );
+    expect(await code(p)).toBe("aborted");
+    // The third tile was never asked for; the two that were are closed; the canvas is empty again.
+    expect(drawn).toHaveLength(2);
+    expect(drawn.every((b) => b.closed)).toBe(true);
+    expect(FakeCanvas.made[0]).toMatchObject({ width: 0, height: 0, transferred: 0 });
+  });
+
+  it("fails with a tile that is not the size it was drawn for, or a drawing that throws, and frees as before", async () => {
+    const wrong = new FakeBitmap(99, 100);
+    expect(await code(drawTiled(200, 100, 100, async (t) => (t.x === 0 ? (wrong as unknown as ImageBitmap) : bitmap(t.width, t.height))))).toBe("failed");
+    expect(wrong.closed).toBe(true);
+    expect(FakeCanvas.made[0]).toMatchObject({ width: 0, height: 0 });
+    expect(await code(drawTiled(200, 100, 100, async () => Promise.reject(new Error("lost context"))))).toBe("failed");
+    expect(FakeCanvas.made[1]).toMatchObject({ width: 0, height: 0 });
+  });
+
+  it("is refused before anything is allocated when it is past the limits", async () => {
+    expect(await code(drawTiled(20_000, 10, 100, async () => bitmap(1, 1)))).toBe("too-large");
+    expect(await code(drawTiled(10_000, 10_000, 4096, async () => bitmap(1, 1)))).toBe("too-large");
+    expect(FakeCanvas.made).toHaveLength(0);
+  });
+});
+
+describe("a picture encoded", () => {
+  it("is a file of the type asked for", async () => {
+    const png = await encodeBitmap(bitmap(4, 3));
+    expect(png.type).toBe("image/png");
+    expect((await encodeBitmap(bitmap(4, 3), { type: "jpeg", quality: 0.5 })).type).toBe("image/jpeg");
+    // A canvas made for the encoding is released.
+    expect(FakeCanvas.made.every((c) => c.width === 0)).toBe(true);
+  });
+
+  it("draws a JPEG on white, or on the ground asked for, never on transparency", async () => {
+    await encodeBitmap(bitmap(4, 3), { type: "jpeg" });
+    await encodeBitmap(bitmap(4, 3), { type: "jpeg", background: "#102030" });
+    await encodeBitmap(bitmap(4, 3), { type: "jpeg", background: "transparent" });
+    await encodeBitmap(bitmap(4, 3), { type: "png" });
+    expect(FakeCanvas.made.map((c) => c.fills.length)).toEqual([1, 1, 1, 0]);
+  });
+
+  it("says so when the browser cannot encode a type, instead of handing back a PNG under its name", async () => {
+    FakeCanvas.encodes = (t) => (t === "image/webp" ? "image/png" : t);
+    expect(await code(encodeBitmap(bitmap(4, 3), { type: "webp" }))).toBe("unsupported");
+  });
+
+  it("says a picture from another origin, which taints the canvas, cannot be read back", async () => {
+    vi.spyOn(FakeCanvas.prototype, "convertToBlob").mockRejectedValue(new DOMException("tainted", "SecurityError"));
+    try {
+      expect(await code(encodeBitmap(bitmap(4, 3)))).toBe("unsupported");
+    } finally {
+      vi.restoreAllMocks();
+    }
+  });
+
+  it("refuses a type and a quality that are none", async () => {
+    expect(await code(encodeBitmap(bitmap(4, 3), { type: "gif" as never }))).toBe("invalid");
+    for (const quality of [-0.1, 1.1, NaN]) expect(await code(encodeBitmap(bitmap(4, 3), { quality })), String(quality)).toBe("invalid");
+  });
+});
+
+describe("the pictures of a plugin", () => {
+  const raster = (over: Partial<Raster> = {}): Raster => ({ bitmap: bitmap(10, 5), width: 10, height: 5, page: 1, space: "page", ...over });
+
+  it("are drawn for a page that exists only, and the plugin is asked nothing else", async () => {
+    const draw = vi.fn(async () => raster());
+    const { controller } = createPictures({ count: 3, space: "page", raster: draw });
+    expect(controller.get()).toEqual({ count: 3, space: "page" });
+    for (const page of [0, 4, 1.5, NaN]) expect(await code(controller.raster(page, { longEdge: 10 })), String(page)).toBe("invalid");
+    expect(draw).not.toHaveBeenCalled();
+    await controller.raster(3, { longEdge: 10 });
+    expect(draw).toHaveBeenCalledWith(3, { longEdge: 10 });
+  });
+
+  it("are asked of the plugin with options that check, and refused before it otherwise", async () => {
+    const draw = vi.fn(async () => raster());
+    const { controller } = createPictures({ count: 1, space: "page", raster: draw });
+    const signal = new AbortController().signal;
+    await controller.raster(1, { longEdge: 10, extra: 1, signal } as never);
+    expect(draw).toHaveBeenCalledWith(1, { longEdge: 10, signal });
+    for (const bad of [{ longEdge: "10" }, { longEdge: 10, layout: "x".repeat(2000) }, { longEdge: 10, background: "url(x)" }, { longEdge: 10, region: { x: 0, y: 0, width: 0, height: 1 } }]) {
+      expect(await code(controller.raster(1, bad as never)), JSON.stringify(bad)).toBe("invalid");
+    }
+    expect(draw).toHaveBeenCalledTimes(1);
+  });
+
+  it("follow a document replaced by another of more pages", async () => {
+    const { controller, state } = createPictures({ count: 1, space: "page", raster: async () => raster() });
+    expect(await code(controller.raster(2))).toBe("invalid");
+    state.set({ count: 2, space: "page" });
+    expect(await code(controller.raster(2))).toBe("none");
+  });
+
+  it("are not drawn when already aborted, and a picture that arrives after the abort is closed", async () => {
+    const abort = new AbortController();
+    abort.abort();
+    const draw = vi.fn(async () => raster());
+    const { controller } = createPictures({ count: 1, space: "page", raster: draw });
+    expect(await code(controller.raster(1, { longEdge: 10, signal: abort.signal }))).toBe("aborted");
+    expect(draw).not.toHaveBeenCalled();
+
+    const late = new AbortController();
+    const arrived = raster();
+    const slow = createPictures({
+      count: 1,
+      space: "page",
+      raster: async () => {
+        late.abort();
+        return arrived;
+      },
+    }).controller;
+    expect(await code(slow.raster(1, { longEdge: 10, signal: late.signal }))).toBe("aborted");
+    expect((arrived.bitmap as unknown as FakeBitmap).closed).toBe(true);
+  });
+
+  it("fail as RasterErrors, whatever the plugin threw", async () => {
+    const throwing = (e: unknown) => createPictures({ count: 1, space: "page", raster: async () => Promise.reject(e) }).controller;
+    expect(await code(throwing(new Error("boom")).raster(1))).toBe("failed");
+    expect(await code(throwing("text").raster(1))).toBe("failed");
+    expect(await code(throwing(new RasterError("too-large")).raster(1))).toBe("too-large");
+    expect(await code(throwing(new DOMException("x", "AbortError")).raster(1))).toBe("aborted");
+  });
+
+  it("render a page by its longest edge, and give null where a raster is refused", async () => {
+    const draw = vi.fn(async () => raster());
+    const { controller } = createPictures({ count: 1, space: "page", raster: draw });
+    const b = await controller.render(1, 300);
+    expect(b).toBeTruthy();
+    expect(draw).toHaveBeenCalledWith(1, { longEdge: 300 });
+    expect(await controller.render(2, 300)).toBeNull();
+  });
+
+  it("encode a raster through toBlob, with its region and without the bitmap, and close the bitmap", async () => {
+    const region = { x: 0, y: 0, width: 1, height: 1 };
+    const drawn = raster({ region });
+    const { controller } = createPictures({ count: 1, space: "page", raster: async () => drawn });
+    const out = await controller.toBlob(1, { longEdge: 10, type: "webp", quality: 0.8 });
+    expect(out.blob.type).toBe("image/webp");
+    expect(out).toMatchObject({ width: 10, height: 5, page: 1, space: "page", region });
+    expect("bitmap" in out).toBe(false);
+    expect((drawn.bitmap as unknown as FakeBitmap).closed).toBe(true);
+    // Refused before the plugin is asked.
+    const draw = vi.fn(async () => raster());
+    const again = createPictures({ count: 1, space: "page", raster: draw }).controller;
+    expect(await code(again.toBlob(1, { longEdge: 10, type: "tiff" as never }))).toBe("invalid");
+    expect(draw).not.toHaveBeenCalled();
+  });
+
+  it("do not let a host change the count: the store is read-only", () => {
+    const { controller } = createPictures({ count: 1, space: "page", raster: async () => raster() });
+    expect("set" in controller).toBe(false);
+    expect("update" in controller).toBe(false);
+  });
+});
diff --git a/crates/exav-viewer/ts/core/raster.ts b/crates/exav-viewer/ts/core/raster.ts
new file mode 100644
index 00000000..9ec5bdc3
--- /dev/null
+++ b/crates/exav-viewer/ts/core/raster.ts
@@ -0,0 +1,215 @@
+/**
+ * The canvas side of pictures: a surface to draw tiles on, encoding to a
+ * file, and the controller every plugin's `raster` is wrapped in.
+ */
+import {
+  asRasterError,
+  checkRasterOptions,
+  isPage,
+  MAX_PICTURE_EDGE,
+  MAX_PICTURE_PIXELS,
+  RasterError,
+  tilePlan,
+  throwIfAborted,
+  type Tile,
+} from "./pictures.js";
+import { writable, type Store } from "./store.js";
+import type { EncodeOptions, PicturesController, Raster, RasterBlob, RasterOptions, RasterType, RegionSpace } from "./types.js";
+
+type Surface = HTMLCanvasElement | OffscreenCanvas;
+type Context = CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D;
+
+/**
+ * A 2D canvas of `width` by `height`, off screen where the browser has them;
+ * `element`: always an HTMLCanvasElement (for an engine that takes no other).
+ */
+export function createCanvas(width: number, height: number, element = false): { canvas: Surface; ctx: Context } {
+  if (!(Number.isSafeInteger(width) && Number.isSafeInteger(height) && width >= 1 && height >= 1 && width <= MAX_PICTURE_EDGE && height <= MAX_PICTURE_EDGE && width * height <= MAX_PICTURE_PIXELS)) {
+    throw new RasterError("too-large", `${width} x ${height} px`);
+  }
+  const canvas: Surface = !element && typeof OffscreenCanvas === "function" ? new OffscreenCanvas(width, height) : Object.assign(document.createElement("canvas"), { width, height });
+  // A canvas the device cannot hold has no context.
+  const ctx = canvas.getContext("2d") as Context | null;
+  if (!ctx) throw new RasterError("too-large", `a canvas of ${width} x ${height} px`);
+  return { canvas, ctx };
+}
+
+/** Frees a canvas's pixels now. */
+export function release(canvas: Surface): void {
+  canvas.width = 0;
+  canvas.height = 0;
+}
+
+/** The canvas as a bitmap that owns its pixels. */
+export async function bitmapOf(canvas: Surface): Promise<ImageBitmap> {
+  try {
+    if ("transferToImageBitmap" in canvas && typeof canvas.transferToImageBitmap === "function") return canvas.transferToImageBitmap();
+    return await createImageBitmap(canvas);
+  } finally {
+    release(canvas);
+  }
+}
+
+/** What a tile is drawn as: closed (a bitmap) or released (a canvas) once copied. */
+export type TileSource = ImageBitmap | Surface;
+
+export interface TiledOptions {
+  signal?: AbortSignal;
+  /** Fills the picture before the tiles are drawn (a ground, or nothing when transparent). */
+  background?: string;
+}
+
+/**
+ * A picture of `width` by `height` drawn as tiles of at most `tile` px
+ * a side, for a renderer whose surface (a WebGL drawing buffer) is smaller
+ * than the picture. `draw` makes one tile: its pixels come back at the
+ * tile's own size. Tiles are copied in one at a time and freed.
+ */
+export async function drawTiled(width: number, height: number, tile: number, draw: (tile: Tile) => Promise<TileSource>, options: TiledOptions = {}): Promise<ImageBitmap> {
+  const tiles = tilePlan(width, height, tile);
+  const { canvas, ctx } = createCanvas(width, height);
+  try {
+    if (options.background) {
+      ctx.fillStyle = options.background;
+      ctx.fillRect(0, 0, width, height);
+    }
+    for (const t of tiles) {
+      throwIfAborted(options.signal);
+      const part = await draw(t);
+      try {
+        const w = "width" in part ? part.width : 0;
+        const h = "height" in part ? part.height : 0;
+        if (w !== t.width || h !== t.height) throw new RasterError("failed", `a tile of ${w} x ${h} px, not ${t.width} x ${t.height}`);
+        ctx.drawImage(part, t.x, t.y);
+      } finally {
+        if (part instanceof ImageBitmap) part.close();
+        else release(part);
+      }
+    }
+    throwIfAborted(options.signal);
+    return await bitmapOf(canvas);
+  } catch (error) {
+    release(canvas);
+    throw asRasterError(error, options.signal);
+  }
+}
+
+const TYPES: Record<RasterType, string> = { png: "image/png", jpeg: "image/jpeg", webp: "image/webp" };
+
+export function isRasterType(v: unknown): v is RasterType {
+  return typeof v === "string" && Object.hasOwn(TYPES, v);
+}
+
+/**
+ * `bitmap` as an image file, in this page. JPEG has no transparency: it
+ * is drawn on `background`, or white. A browser that cannot encode the type
+ * (Safari has no WebP encoder) is an "unsupported" error, not a PNG under
+ * another name.
+ */
+export async function encodeBitmap(bitmap: ImageBitmap, options: EncodeOptions & { background?: string } = {}): Promise<Blob> {
+  const type = options.type ?? "png";
+  if (!isRasterType(type)) throw new RasterError("invalid", `no image type ${String(type)}`);
+  const quality = options.quality;
+  if (quality !== undefined && !(typeof quality === "number" && quality >= 0 && quality <= 1)) throw new RasterError("invalid", "quality is between 0 and 1");
+  const { canvas, ctx } = createCanvas(bitmap.width, bitmap.height);
+  try {
+    if (type === "jpeg") {
+      ctx.fillStyle = options.background && options.background !== "transparent" ? options.background : "#ffffff";
+      ctx.fillRect(0, 0, bitmap.width, bitmap.height);
+    }
+    ctx.drawImage(bitmap, 0, 0);
+    const mime = TYPES[type];
+    const blob =
+      "convertToBlob" in canvas
+        ? await canvas.convertToBlob({ type: mime, quality })
+        : await new Promise<Blob | null>((resolve) => (canvas as HTMLCanvasElement).toBlob(resolve, mime, quality));
+    if (!blob) throw new RasterError("failed", "the browser could not encode the picture");
+    if (blob.type !== mime) throw new RasterError("unsupported", `this browser cannot encode ${mime}`);
+    return blob;
+  } catch (error) {
+    // Pixels of an image shown from another origin without CORS cannot be read back.
+    if (error instanceof DOMException && error.name === "SecurityError") throw new RasterError("unsupported", "the picture comes from another origin and cannot be read back", { cause: error });
+    throw error;
+  } finally {
+    release(canvas);
+  }
+}
+
+/** What a plugin gives `createPictures`. */
+export interface PicturesSource {
+  /** The number of pages, kept up to date. */
+  count: number;
+  space: RegionSpace;
+  /**
+   * Draws page `page` (1-based). Called only with a valid page and well-formed
+   * options; throws `RasterError` (or anything: it becomes "failed", and
+   * "aborted" when the signal is).
+   */
+  raster(page: number, options: RasterOptions): Promise<Raster>;
+}
+
+/**
+ * The controller of a plugin whose pages can be drawn: its store of
+ * `{ count, space }`, and `raster`, `toBlob` and `render` over the plugin's
+ * own drawing. Checks the page, and gives back a `RasterError` for anything
+ * that goes wrong. The store is returned too: `count` changes with a
+ * replaced document.
+ */
+export function createPictures(source: PicturesSource) {
+  const state = writable({ count: source.count, space: source.space });
+  return { controller: picturesOver(state, source.raster), state };
+}
+
+/**
+ * The controller over a store of `{ count, space }` and a function that draws
+ * a page: the page and the signal are checked here, `toBlob` encodes in this
+ * page, `render` is a `raster` that gives null where it would reject.
+ */
+export function picturesOver(state: Store<{ count: number; space: RegionSpace }>, draw: (page: number, options: RasterOptions) => Promise<Raster>): PicturesController {
+  const checked = async (page: number, options: RasterOptions = {}): Promise<Raster> => {
+    const count = state.get().count;
+    if (!isPage(page, count)) throw new RasterError("invalid", `no page ${String(page)} (1 to ${count})`);
+    throwIfAborted(options.signal);
+    // Whatever the caller wrote: the plugin, or the frame across the port, gets the options that check.
+    const clean = checkRasterOptions(options);
+    if (!clean) throw new RasterError("invalid", "the options are not a size, a region, a fit, a colour...");
+    try {
+      const r = await draw(page, { ...clean, ...(options.signal && { signal: options.signal }) });
+      if (options.signal?.aborted) {
+        r.bitmap.close();
+        throw new RasterError("aborted", "aborted");
+      }
+      return r;
+    } catch (error) {
+      throw asRasterError(error, options.signal);
+    }
+  };
+  return {
+    get: state.get,
+    subscribe: state.subscribe,
+    raster: checked,
+    async toBlob(page, options = {}) {
+      const { type, quality, ...rest } = options;
+      // Before anything is drawn.
+      if (type !== undefined && !isRasterType(type)) throw new RasterError("invalid", `no image type ${String(type)}`);
+      if (quality !== undefined && !(typeof quality === "number" && quality >= 0 && quality <= 1)) throw new RasterError("invalid", "quality is between 0 and 1");
+      const { bitmap, ...info } = await checked(page, rest);
+      try {
+        const blob = await encodeBitmap(bitmap, { type, quality, background: rest.background });
+        throwIfAborted(options.signal);
+        return { ...info, blob };
+      } finally {
+        bitmap.close();
+      }
+    },
+    async render(page, longEdge) {
+      try {
+        return (await checked(page, { longEdge })).bitmap;
+      } catch {
+        return null;
+      }
+    },
+  };
+}
+
+export type { RasterBlob };
diff --git a/crates/exav-viewer/ts/core/registry.test.ts b/crates/exav-viewer/ts/core/registry.test.ts
new file mode 100644
index 00000000..d5e06c6f
--- /dev/null
+++ b/crates/exav-viewer/ts/core/registry.test.ts
@@ -0,0 +1,72 @@
+// The viewer's matchers and signatures against the format registry
+// (formats/registry.json, checked against the rest of the code by
+// scripts/formats.mjs): the registry is where a format's names live, and the
+// viewer must claim exactly what it says the viewer claims.
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { describe, expect, it } from "vitest";
+
+import { BUILTIN_ORDER, MATCHERS, SIGNATURES, WASM_IMAGES } from "./formats.js";
+
+interface Entry {
+  id: string;
+  ext: string[];
+  mime: string[];
+  /** Types the viewer sniffs from the bytes that its matcher does not claim. */
+  sniffs?: string[];
+  magic?: string[][];
+  viewer: string | null;
+}
+
+const file = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "..", "..", "formats", "registry.json");
+const entries: Entry[] = JSON.parse(fs.readFileSync(file, "utf8")).formats;
+
+const hex = (bytes: readonly number[]) => bytes.map((b) => b.toString(16).padStart(2, "0")).join("");
+
+/**
+ * What the plugin's matcher names, with the images exav-render decodes for
+ * the image plugin: its types, those it takes after the extension, and those
+ * the extension answers over.
+ */
+function claimed(plugin: string) {
+  const matchers = plugin === "image" ? [MATCHERS.image, WASM_IMAGES] : [MATCHERS[plugin as keyof typeof MATCHERS]];
+  return {
+    extensions: new Set(matchers.flatMap((m) => m.extensions ?? [])),
+    types: new Set(matchers.flatMap((m) => [...(m.types ?? []), ...(m.containerTypes ?? []), ...(m.extensionOverrides ?? [])])),
+  };
+}
+
+describe("the viewer's matchers against the registry", () => {
+  for (const plugin of BUILTIN_ORDER) {
+    it(`${plugin} claims the extensions of its registry entries, and no other`, () => {
+      const mine = entries.filter((e) => e.viewer === plugin);
+      const registered = new Set(mine.flatMap((e) => e.ext));
+      const { extensions } = claimed(plugin);
+      expect([...registered].filter((e) => !extensions.has(e)), "in the registry, not claimed by the viewer").toEqual([]);
+      expect([...extensions].filter((e) => !registered.has(e)), "claimed by the viewer, not in the registry").toEqual([]);
+    });
+
+    it(`${plugin} claims the types of its registry entries`, () => {
+      const registered = entries.filter((e) => e.viewer === plugin).flatMap((e) => e.mime);
+      const { types } = claimed(plugin);
+      expect(registered.filter((t) => !types.has(t))).toEqual([]);
+    });
+  }
+
+  it("has an entry for every plugin", () => {
+    for (const plugin of BUILTIN_ORDER) expect(entries.some((e) => e.viewer === plugin), plugin).toBe(true);
+  });
+
+  it("sniffs the bytes the registry gives its format", () => {
+    for (const s of SIGNATURES) {
+      const conditions = [`${s.offset ?? 0}:${hex(s.prefix)}`, ...(s.also ? [`${s.alsoOffset ?? 0}:${hex(s.also)}`] : [])];
+      const entry = entries.find((e) => e.mime.includes(s.type) || e.sniffs?.includes(s.type));
+      expect(entry, `a registry entry typed ${s.type}`).toBeDefined();
+      // The registry may give more bytes than the viewer reads (RAR's seven, the viewer's four).
+      const same = (alt: string[]) => alt.length === conditions.length && conditions.every((c, i) => alt[i] === c || (i === 0 && alt[i]!.startsWith(c)));
+      expect(entry!.magic?.some(same), `${s.type}: ${conditions.join(" ")} among the magic of ${entry!.id}`).toBe(true);
+    }
+  });
+});
diff --git a/crates/exav-viewer/ts/core/store.test.ts b/crates/exav-viewer/ts/core/store.test.ts
index 7cb366d9..609f52b9 100644
--- a/crates/exav-viewer/ts/core/store.test.ts
+++ b/crates/exav-viewer/ts/core/store.test.ts
@@ -1,6 +1,63 @@
 import { describe, expect, it } from "vitest";
 
-import { derived, writable } from "./store.js";
+import { derived, onDemand, writable } from "./store.js";
+
+describe("onDemand", () => {
+  function make() {
+    const source = writable(0);
+    const log: string[] = [];
+    const store = onDemand(source, {
+      start() {
+        log.push("start");
+        return () => void log.push("stop");
+      },
+      once() {
+        log.push("once");
+        source.set(source.get() + 1);
+      },
+    });
+    return { source, log, store };
+  }
+
+  it("does nothing until it is read or followed", () => {
+    expect(make().log).toEqual([]);
+  });
+
+  it("works once for each read with no listener, and the read has its result", () => {
+    const { store, log } = make();
+    expect(store.get()).toBe(1);
+    expect(store.get()).toBe(2);
+    expect(log).toEqual(["once", "once"]);
+  });
+
+  it("starts with the first listener and stops with the last, however many come between", () => {
+    const { store, source, log } = make();
+    const seen: number[] = [];
+    const a = store.subscribe((v) => seen.push(v));
+    const b = store.subscribe(() => {});
+    expect(log).toEqual(["start"]);
+    source.set(10);
+    expect(seen).toEqual([10]);
+    a();
+    a();
+    expect(log).toEqual(["start"]);
+    b();
+    expect(log).toEqual(["start", "stop"]);
+    // Followed again: a new start.
+    store.subscribe(() => {})();
+    expect(log).toEqual(["start", "stop", "start", "stop"]);
+  });
+
+  it("does not work for a read while it has a listener", () => {
+    const { store, log } = make();
+    const stop = store.subscribe(() => {});
+    expect(store.get()).toBe(0);
+    expect(log).toEqual(["start"]);
+    stop();
+    expect(store.get()).toBe(1);
+    expect(log).toEqual(["start", "stop", "once"]);
+  });
+});
 
 describe("derived", () => {
   it("returns the same value until its source changes", () => {
diff --git a/crates/exav-viewer/ts/core/store.ts b/crates/exav-viewer/ts/core/store.ts
index 750e1171..d7cc516d 100644
--- a/crates/exav-viewer/ts/core/store.ts
+++ b/crates/exav-viewer/ts/core/store.ts
@@ -30,6 +30,39 @@ export function writable<T>(initial: T): WritableStore<T> {
   };
 }
 
+/**
+ * `source`, kept up to date only while it is wanted. `start` runs when the
+ * first listener arrives and returns the `stop` that runs when the last one
+ * leaves. `get` with no listener runs `once` first, to bring `source` up to
+ * date for that read. Work that cannot finish inside `once` (it is async)
+ * shows in `source` later: the next `get` has it.
+ */
+export function onDemand<T>(source: Store<T>, work: { start(): () => void; once(): void }): Store<T> {
+  let listeners = 0;
+  let stop: (() => void) | null = null;
+  return {
+    get() {
+      if (listeners === 0) work.once();
+      return source.get();
+    },
+    subscribe(listener) {
+      if (listeners++ === 0) stop = work.start();
+      const unsubscribe = source.subscribe(listener);
+      let left = false;
+      return () => {
+        if (left) return;
+        left = true;
+        unsubscribe();
+        if (--listeners === 0) {
+          const end = stop;
+          stop = null;
+          end?.();
+        }
+      };
+    },
+  };
+}
+
 /**
  * A store derived from another, recomputed when its source changes, and
  * only then: `get` returns the same value until it does, which React's
diff --git a/crates/exav-viewer/ts/core/theme.ts b/crates/exav-viewer/ts/core/theme.ts
new file mode 100644
index 00000000..28303aa5
--- /dev/null
+++ b/crates/exav-viewer/ts/core/theme.ts
@@ -0,0 +1,116 @@
+/**
+ * The CSS custom properties the stylesheet draws with, and the theme a host
+ * hands the sandboxed frame: its document does not inherit the page's
+ * styles, so the values are read from the page and sent as plain data.
+ */
+
+/** Each property, its default, and what a value of it may be. */
+const TOKEN_DEFS = {
+  "--exav-viewer-surface": ["#f1f5f9", "color"],
+  "--exav-viewer-panel": ["#ffffff", "color"],
+  "--exav-viewer-border": ["#e2e8f0", "color"],
+  "--exav-viewer-text": ["#334155", "color"],
+  "--exav-viewer-text-strong": ["#0f172a", "color"],
+  "--exav-viewer-muted": ["#64748b", "color"],
+  "--exav-viewer-faint": ["#94a3b8", "color"],
+  "--exav-viewer-hover": ["#f8fafc", "color"],
+  "--exav-viewer-active": ["#f1f5f9", "color"],
+  "--exav-viewer-accent": ["#0f172a", "color"],
+  "--exav-viewer-on-accent": ["#ffffff", "color"],
+  "--exav-viewer-error": ["#b91c1c", "color"],
+  "--exav-viewer-warning": ["#b45309", "color"],
+  "--exav-viewer-media-bg": ["#0f172a", "color"],
+  // A colour too, in a theme: a gradient is not sent to the frame.
+  "--exav-viewer-model-bg": ["radial-gradient(circle at 50% 30%, #ffffff 0%, #e2e8f0 55%, #cbd5e1 100%)", "color"],
+  "--exav-viewer-radius": ["0.375rem", "length"],
+  "--exav-viewer-rail-width": ["15rem", "length"],
+  "--exav-viewer-tap": ["2.75rem", "length"],
+  /** Kept free below a slide, for a pager drawn over it. */
+  "--exav-viewer-pager-room": ["4.5rem", "length"],
+  "--exav-viewer-font": ["inherit", "font"],
+} as const;
+
+export type Token = keyof typeof TOKEN_DEFS;
+
+/**
+ * The CSS custom properties of the default UI and of the engines' surfaces,
+ * with their default values. Set any of them on an ancestor (or `:root`) to
+ * restyle.
+ */
+export const TOKENS = Object.fromEntries(Object.entries(TOKEN_DEFS).map(([k, [v]]) => [k, v])) as { readonly [K in Token]: (typeof TOKEN_DEFS)[K][0] };
+
+/** What the frame is given: values it checks, and the color scheme for its controls and scrollbars. */
+export interface FrameTheme {
+  tokens: Partial<Record<Token, string>>;
+  scheme: "light" | "dark" | null;
+}
+
+/**
+ * A colour the frame and the host may put in a style: hex, or a colour
+ * function of plain numbers (what `getComputedStyle` writes). Anything else
+ * could be `url(...)`, a request.
+ */
+export function isColor(v: unknown): v is string {
+  if (typeof v !== "string" || v.length > 96) return false;
+  if (/^#[0-9a-f]{3,8}$/i.test(v) || v === "transparent") return true;
+  const args = String.raw`\s*-?[\d.]+(e-?\d+)?(%|deg)?(\s*[\s,/]\s*-?[\d.]+(e-?\d+)?(%|deg)?){2,3}\s*`;
+  if (new RegExp(`^(rgb|hsl|hwb|lab|lch|oklab|oklch)a?\\(${args}\\)$`, "i").test(v)) return true;
+  return new RegExp(`^color\\(\\s*(srgb|srgb-linear|display-p3|a98-rgb|prophoto-rgb|rec2020|xyz|xyz-d50|xyz-d65)\\s${args}\\)$`, "i").test(v);
+}
+
+const isLength = (v: string) => /^\d{1,5}(\.\d{1,4})?(px|rem|em|%)$/.test(v) || v === "0";
+/** Family names and generic families, nothing that loads. */
+const isFont = (v: string) => v.length <= 256 && /^[\w\s,"'.-]+$/.test(v);
+
+/** The theme as the frame takes it: known properties whose value is of their kind, the rest dropped. */
+export function checkTheme(v: unknown): FrameTheme {
+  const out: FrameTheme = { tokens: {}, scheme: null };
+  if (typeof v !== "object" || v === null) return out;
+  const { tokens, scheme } = v as { tokens?: unknown; scheme?: unknown };
+  if (scheme === "light" || scheme === "dark") out.scheme = scheme;
+  if (typeof tokens !== "object" || tokens === null) return out;
+  for (const [name, [, kind]] of Object.entries(TOKEN_DEFS) as [Token, readonly [string, string]][]) {
+    const value = (tokens as Record<string, unknown>)[name];
+    if (typeof value !== "string") continue;
+    if (kind === "color" ? isColor(value) : kind === "length" ? isLength(value) : isFont(value)) out.tokens[name] = value;
+  }
+  return out;
+}
+
+/**
+ * The theme in force at `element`: each property set on it or an ancestor,
+ * resolved to a plain value (a colour as `rgb()`), and its color scheme
+ * when it is light or dark alone. Properties not set are left out, so that
+ * the frame keeps its defaults.
+ */
+export function themeOf(element: Element): FrameTheme {
+  const view = element.ownerDocument.defaultView;
+  if (!view) return { tokens: {}, scheme: null };
+  const style = view.getComputedStyle(element);
+  const probe = element.ownerDocument.createElement("span");
+  probe.setAttribute("aria-hidden", "true");
+  Object.assign(probe.style, { position: "absolute", visibility: "hidden", pointerEvents: "none" });
+  element.append(probe);
+  const tokens: FrameTheme["tokens"] = {};
+  try {
+    for (const [name, [, kind]] of Object.entries(TOKEN_DEFS) as [Token, readonly [string, string]][]) {
+      const raw = style.getPropertyValue(name).trim();
+      if (!raw) continue;
+      if (kind === "font") {
+        if (isFont(raw)) tokens[name] = raw;
+        continue;
+      }
+      if (typeof CSS !== "undefined" && !CSS.supports(kind === "color" ? "color" : "width", raw)) continue;
+      const property = kind === "color" ? "color" : "width";
+      probe.style.setProperty(property, raw);
+      const value = view.getComputedStyle(probe).getPropertyValue(property).trim();
+      probe.style.removeProperty(property);
+      if (kind === "color" ? isColor(value) : isLength(value)) tokens[name] = value;
+    }
+  } finally {
+    probe.remove();
+  }
+  const words = style.colorScheme?.split(/\s+/) ?? [];
+  const scheme = words.includes("dark") && !words.includes("light") ? "dark" : words.includes("light") && !words.includes("dark") ? "light" : null;
+  return { tokens, scheme };
+}
diff --git a/crates/exav-viewer/ts/core/tree.test.ts b/crates/exav-viewer/ts/core/tree.test.ts
new file mode 100644
index 00000000..452f76ce
--- /dev/null
+++ b/crates/exav-viewer/ts/core/tree.test.ts
@@ -0,0 +1,50 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveInTree } from "./tree.js";
+
+const tree = (path: string, paths: string[]) => ({ path, paths: [path, ...paths] });
+
+describe("the file a reference names", () => {
+  const site = tree("Site/Plans/ground.dwg", ["Site/Plans/Xref/title block.dwg", "Site/Plans/Xref/Notes.dwg", "Site/survey.dwg", "Other/survey.dwg", "Site/Plans/readme.txt"]);
+
+  it("is found as a path from the file's folder, either slash", () => {
+    expect(resolveInTree(site, ".\\Xref\\title block.dwg")).toBe("Site/Plans/Xref/title block.dwg");
+    expect(resolveInTree(site, "Xref/Notes.dwg")).toBe("Site/Plans/Xref/Notes.dwg");
+    expect(resolveInTree(site, "..\\survey.dwg")).toBe("Site/survey.dwg");
+  });
+
+  it("is found by the end of a path written for another machine", () => {
+    expect(resolveInTree(site, "C:\\Projects\\site\\Plans\\Xref\\title block.dwg")).toBe("Site/Plans/Xref/title block.dwg");
+    expect(resolveInTree(site, "D:\\x\\y\\title block.dwg")).toBe("Site/Plans/Xref/title block.dwg");
+  });
+
+  it("does not tell case or the form of an accent apart", () => {
+    const accents = tree("a.dwg", ["Plans/la Colline\u0300re.dwg", "Plans/Caf\u00e9.dwg"]);
+    expect(resolveInTree(accents, "PLANS\\LA COLLIN\u00c8RE.DWG")).toBe("Plans/la Colline\u0300re.dwg");
+    expect(resolveInTree(accents, "plans/cafe\u0301.dwg")).toBe("Plans/Caf\u00e9.dwg");
+  });
+
+  it("takes the nearest of several with the same name", () => {
+    expect(resolveInTree(tree("Site/Plans/ground.dwg", ["Site/survey.dwg", "Other/survey.dwg"]), "E:\\survey.dwg")).toBe("Site/survey.dwg");
+    expect(resolveInTree(tree("Other/ground.dwg", ["Site/survey.dwg", "Other/survey.dwg"]), "E:\\survey.dwg")).toBe("Other/survey.dwg");
+  });
+
+  it("is tried with an extension when the reference has none", () => {
+    expect(resolveInTree(site, "Notes", [".dwg"])).toBe("Site/Plans/Xref/Notes.dwg");
+    expect(resolveInTree(site, "Notes")).toBeNull();
+    expect(resolveInTree(site, "readme", [".dwg"])).toBeNull();
+  });
+
+  it("is not the file itself, and is null when nothing has the name", () => {
+    expect(resolveInTree(site, "ground.dwg")).toBeNull();
+    expect(resolveInTree(site, "missing.dwg")).toBeNull();
+    expect(resolveInTree(site, "")).toBeNull();
+    expect(resolveInTree(site, "..\\..\\..\\..\\..\\missing.dwg")).toBeNull();
+  });
+
+  it("does not leave the tree for a reference that climbs out of it", () => {
+    const flat = tree("a.dwg", ["b.dwg"]);
+    // Past the root, it is still looked for by its name.
+    expect(resolveInTree(flat, "..\\..\\b.dwg")).toBe("b.dwg");
+  });
+});
diff --git a/crates/exav-viewer/ts/core/tree.ts b/crates/exav-viewer/ts/core/tree.ts
new file mode 100644
index 00000000..463151e1
--- /dev/null
+++ b/crates/exav-viewer/ts/core/tree.ts
@@ -0,0 +1,66 @@
+import type { FileTree } from "./types.js";
+
+/** Case and accents the way a file system compares names: macOS stores them decomposed, Windows does not mind case. */
+const key = (s: string) => s.normalize("NFC").toLowerCase();
+
+/** The parts of a path a document wrote on its own machine: either slash, no drive, no `.`. */
+function parts(reference: string): string[] {
+  return reference
+    .replace(/\\/g, "/")
+    .replace(/^[A-Za-z]:/, "")
+    .split("/")
+    .filter((s) => s !== "" && s !== ".");
+}
+
+/** Leading directories two paths share. */
+function shared(a: string[], b: string[]): number {
+  let n = 0;
+  while (n < a.length && n < b.length && key(a[n]!) === key(b[n]!)) n++;
+  return n;
+}
+
+/**
+ * The file of `tree` a reference found in another file names, or null. A
+ * reference is written for the machine that made the file: `.\Plans\x.dwg`,
+ * `C:\Projects\site\x.dwg`, `..\x`, or just `x`. It is looked for beside the
+ * file, as a path from it, and else by the end of its path, down to the file's
+ * name alone: the nearest of several wins. Case, accents' form and either
+ * slash are not told apart. `extensions` are tried after a name that has none.
+ */
+export function resolveInTree(tree: Pick<FileTree, "path" | "paths">, reference: string, extensions: readonly string[] = []): string | null {
+  const asked = parts(reference);
+  const last = asked[asked.length - 1];
+  if (last === undefined) return null;
+  const variants = [asked];
+  if (!last.includes(".")) for (const e of extensions) variants.push([...asked.slice(0, -1), last + e]);
+
+  const here = tree.path.split("/").filter(Boolean);
+  const where = here.slice(0, -1);
+  const files = tree.paths.filter((p) => p !== tree.path).map((p) => ({ path: p, key: key(p), dir: p.split("/").filter(Boolean).slice(0, -1) }));
+  const byKey = new Map(files.map((f) => [f.key, f.path]));
+
+  for (const variant of variants) {
+    // As a path from the file's own folder.
+    const from = [...where];
+    let outside = false;
+    for (const s of variant) {
+      if (s === "..") {
+        if (from.pop() === undefined) outside = true;
+      } else from.push(s);
+    }
+    if (!outside) {
+      const exact = byKey.get(key(from.join("/")));
+      if (exact !== undefined) return exact;
+    }
+    // By the end of the path, the longest first.
+    const named = variant.filter((s) => s !== "..");
+    for (let k = 0; k < named.length; k++) {
+      const tail = key(named.slice(k).join("/"));
+      const hits = files.filter((f) => f.key === tail || f.key.endsWith("/" + tail));
+      if (hits.length === 0) continue;
+      hits.sort((a, b) => shared(where, b.dir) - shared(where, a.dir) || a.dir.length - b.dir.length || (a.path < b.path ? -1 : 1));
+      return hits[0]!.path;
+    }
+  }
+  return null;
+}
diff --git a/crates/exav-viewer/ts/core/types.ts b/crates/exav-viewer/ts/core/types.ts
index 39203af4..0d516fab 100644
--- a/crates/exav-viewer/ts/core/types.ts
+++ b/crates/exav-viewer/ts/core/types.ts
@@ -17,10 +17,32 @@ export type BuiltinFormat =
   | "xlsx"
   | "pptx"
   | "csv"
+  | "rtf"
+  | "doc"
+  | "odt"
+  | "ppt"
+  | "odp"
+  | "keynote"
+  | "xls"
+  | "ods"
+  | "numbers"
+  | "odg"
+  | "visio"
+  | "coreldraw"
+  | "publisher"
+  | "pagemaker"
+  | "freehand"
+  | "quarkxpress"
+  | "zonerdraw"
+  | "wpg"
+  | "text"
   | "dwg"
   | "dxf"
   | "ifc"
   | "stl"
+  | "obj"
+  | "ply"
+  | "gltf"
   | "video"
   | "audio"
   | "archive";
@@ -70,9 +92,25 @@ export interface FileInfo {
   size?: number;
 }
 
+/**
+ * The files around the one shown: a folder the user opened, the members of an
+ * archive. A format that points at other files (a drawing's external
+ * references) finds them here instead of asking the user for each.
+ */
+export interface FileTree {
+  /** The path of the file shown, `/` separated, from the root of the tree. */
+  path: string;
+  /** Every file of the tree, this one included, by the same kind of path. */
+  paths: readonly string[];
+  /** The bytes of one of `paths`. */
+  open(path: string, signal: AbortSignal): Promise<FileSource>;
+}
+
 export interface ViewerFile<Meta = unknown> extends FileInfo {
   /** `null` while the host has nothing to show yet; see `placeholder`. */
   source: FileSource | null;
+  /** The files around this one, for the files it refers to. */
+  tree?: FileTree;
   /**
    * Shown instead of a surface while `source` is null. "pending": the bytes
    * will arrive. "unavailable": they will not on this device. `label`
@@ -166,12 +204,17 @@ export type Capability =
   | "drag"
   | "outline"
   | "layers"
+  | "storeys"
   | "layouts"
   | "ground"
   | "selection"
   | "info"
   | "image-surface"
-  | "nested";
+  | "nested"
+  | "media"
+  | "sheets"
+  | "pictures"
+  | "viewport";
 
 export interface FormatPlugin<Options = unknown> {
   id: FormatId;
@@ -244,15 +287,35 @@ export interface RendererHandle {
 
 // ── Status ───────────────────────────────────────────────────────────────────
 
+/**
+ * What a load is doing, for a progress display; `progress` is the share of
+ * that step done, absent when the step does not count. Steps come in this
+ * order and a plugin goes through those it has: the engine's download, say,
+ * only the first time.
+ */
+export type LoadStep =
+  /** The file's bytes arrive. */
+  | "file"
+  /** The engine's code and data arrive: an external converter's, tens of MB. */
+  | "engine"
+  /** The engine starts. */
+  | "start"
+  /** The document is read. */
+  | "read"
+  /** It is converted to what is shown. */
+  | "convert"
+  /** What is shown is drawn. */
+  | "render";
+
 export type Status =
   /**
    * `label`: what the plugin is doing, worded for the user in the host's
    * language, shown instead of the stock message (a host's plugin decoding
    * a photo is not "preparing the model").
    */
-  | { phase: "loading"; progress?: number; label?: string }
+  | { phase: "loading"; progress?: number; label?: string; step?: LoadStep }
   /** A step after the fetch that takes seconds and reports its progress. */
-  | { phase: "converting"; progress?: number; label?: string }
+  | { phase: "converting"; progress?: number; label?: string; step?: LoadStep }
   /**
    * `partial`: something reached the screen and the engine then failed (an
    * Office file that lays out seven pages and throws on an embedded object).
@@ -264,7 +327,7 @@ export type Status =
   | { phase: "error"; error: ViewerError };
 
 /** The codes the built-in plugins report; a plugin of the host may use its own. */
-export type BuiltinErrorCode = "pdf" | "image" | "drawing" | "drawing_version" | "office" | "media" | "model" | "archive" | "file";
+export type BuiltinErrorCode = "pdf" | "image" | "image_no_preview" | "drawing" | "drawing_version" | "office" | "needs_converter" | "media" | "model" | "archive" | "text" | "text_binary" | "file";
 
 export interface ViewerError {
   /**
@@ -272,7 +335,10 @@ export interface ViewerError {
    * in the host's `translate` like any other: a host's own code, `heic`, is
    * worded by its table's `error_heic` (or by `message`, below).
    * `drawing_version`: a DWG of a release the engine does not read (R12
-   * and older).
+   * and older). `image_no_preview`: a camera RAW file that embeds no
+   * preview. `needs_converter`: a format only an external converter reads,
+   * and none is set (the cause is a `NeedsConverterError`, `kind`
+   * "needs-converter", with the format's name).
    */
   code: BuiltinErrorCode | (string & {});
   /** Worded for the user in the host's language, shown instead of the stock message for `code`. */
@@ -288,12 +354,17 @@ export interface Controllers {
   drag?: DragController;
   outline?: OutlineController;
   layers?: LayersController;
+  storeys?: StoreysController;
   layouts?: LayoutsController;
   ground?: GroundController;
   selection?: Store<Selection | null>;
   info?: Store<Record<string, number>>;
   image?: ImageSurface;
   archive?: ArchiveController;
+  media?: MediaController;
+  sheets?: SheetsController;
+  pictures?: PicturesController;
+  viewport?: ViewportController;
   /**
    * What the user should know about what is shown, as message keys
    * (`warning_<key>`) and counts: what is left out of the picture (a
@@ -301,10 +372,21 @@ export interface Controllers {
    * sandboxed frame, that a file to be read by ranges was downloaded whole
    * (`source_read_whole`).
    */
-  warnings?: Store<readonly { key: string; count: number }[]>;
+  warnings?: Store<readonly Warning[]>;
+}
+
+/**
+ * A warning: the message `warning_<key>` with its count, and what it is
+ * about when the view can name it (a drawing's entity types left out, the
+ * files its external references point at), as written in the file.
+ */
+export interface Warning {
+  key: string;
+  count: number;
+  names?: readonly string[];
 }
 
-/** PDF and DOCX report pages; PPTX reports slides and is stepped by buttons. */
+/** PDF and DOCX report pages; PPTX reports slides. */
 export interface PagesController
   extends Store<{
     unit: "page" | "slide";
@@ -317,6 +399,11 @@ export interface PagesController
   prev?(): Promise<void>;
 }
 
+/**
+ * `scale` is 1 at the fitted view (what `fit()` goes back to), more when zoomed
+ * in and less when zoomed out, so a button to go back is wanted when it is not
+ * 1; `min` and `max` are its bounds, `max` possibly `Infinity`.
+ */
 export interface ZoomController extends Store<{ scale: number; min: number; max: number }> {
   /** `anchor` in container pixels; the centre by default. */
   setScale(scale: number, anchor?: { x: number; y: number }): void;
@@ -369,6 +456,21 @@ export interface LayersController
   setAll(visible: boolean): void;
 }
 
+export interface StoreyItem {
+  /** What `setVisible` takes. */
+  id: string;
+  name: string;
+  /** The storey's elevation in metres, when the file gives one. */
+  elevation: number | null;
+  visible: boolean;
+}
+
+/** IFC: the building storeys of a model, highest first, shown or hidden. */
+export interface StoreysController extends Store<{ items: readonly StoreyItem[] }> {
+  setVisible(id: string, visible: boolean): void;
+  setAll(visible: boolean): void;
+}
+
 export interface LayoutsController
   extends Store<{
     items: readonly { id: string; name: string; isModel: boolean }[];
@@ -420,6 +522,212 @@ export interface ArchiveController
   back(): void;
 }
 
+export interface MediaState {
+  kind: "video" | "audio";
+  paused: boolean;
+  ended: boolean;
+  /** In seconds. */
+  currentTime: number;
+  /** In seconds: 0 until known, Infinity for a live stream. */
+  duration: number;
+  /** Where the buffered range that holds `currentTime` ends, in seconds. */
+  buffered: number;
+  /** 0..1. */
+  volume: number;
+  muted: boolean;
+  rate: number;
+  /** Stalled for want of data. */
+  waiting: boolean;
+  /**
+   * The browser refused to start playing without a click on the player
+   * itself; a click on the surface plays it.
+   */
+  blocked: boolean;
+}
+
+/** Video and audio: for a host that draws its own player controls (`controls: "none"`). */
+export interface MediaController extends Store<MediaState> {
+  play(): Promise<void>;
+  pause(): void;
+  seek(seconds: number): void;
+  setVolume(volume: number): void;
+  setMuted(muted: boolean): void;
+  setRate(rate: number): void;
+}
+
+/** XLSX: the workbook's sheets, the shown one by its `index`. */
+export interface SheetsController
+  extends Store<{
+    items: readonly { index: number; name: string }[];
+    current: number;
+  }> {
+  select(index: number): Promise<void>;
+}
+
+// ── Rasters ──────────────────────────────────────────────────────────────────
+
+/**
+ * The coordinates a format's regions are written in:
+ *
+ * - "page": fractions of a page (0..1, origin at the top left): PDF, Word,
+ *   PowerPoint and the other office pages, a sheet.
+ * - "pixels": pixels of the source image (origin at the top left).
+ * - "drawing": drawing units of a CAD layout (y up), see `RasterOptions.layout`.
+ * - "camera": a 3D camera.
+ * - "frame": the whole picture (video): no region.
+ */
+export type RegionSpace = "page" | "pixels" | "drawing" | "camera" | "frame";
+
+/** A rectangle: `RegionSpace` "page", "pixels" or "drawing" regions. */
+export interface RasterRect {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * A 3D camera, "camera" regions. `aspect` is the width over the height the
+ * camera was framed for (a viewer's canvas): what `fit` keeps of it when the
+ * picture has another.
+ */
+export interface CameraRegion {
+  /** World coordinates, in the model's axes. */
+  position: readonly [number, number, number];
+  target: readonly [number, number, number];
+  /** Default (0, 1, 0), or (0, 0, 1) for a model the viewer shows Z up. */
+  up?: readonly [number, number, number];
+  projection: { type: "perspective"; fov: number } | { type: "orthographic"; height: number };
+  aspect: number;
+}
+
+export type RasterRegion = RasterRect | CameraRegion;
+
+/** How a picture of another shape than its region is made. */
+export type RasterFit = "contain" | "cover";
+
+/**
+ * What a raster is asked for. The size: `longEdge`, or `width` and `height`
+ * (one of the two alone takes the other from the region's shape). Past the
+ * limits (`MAX_PICTURE_EDGE` on a side, `MAX_PICTURE_PIXELS` in all) a
+ * `longEdge` is brought down to them; a `width` and `height` are refused with
+ * a `RasterError` "too-large".
+ */
+export interface RasterOptions {
+  longEdge?: number;
+  width?: number;
+  height?: number;
+  /**
+   * What to draw, in the coordinates of the controller's `space`; the whole
+   * page, image or drawing extents when absent. "current": what the session
+   * shows now (`Controllers.viewport`).
+   */
+  region?: RasterRegion | "current";
+  /** CAD: the layout (`LayoutsController` id) the region and the page are those of. Default: the one shown. */
+  layout?: string;
+  /**
+   * When the picture's shape is not the region's: "contain" (default) widens
+   * the region to the picture's shape, so that all of it is drawn; "cover"
+   * narrows it, so that the picture is filled. Never stretches.
+   */
+  fit?: RasterFit;
+  /**
+   * CAD: "screen" (default) draws lines as many pixels wide as the viewer
+   * does at its own zoom; "scaled" scales them with the picture, as if the
+   * viewer's zoom were brought up to the picture's size.
+   */
+  lineweight?: "screen" | "scaled";
+  /**
+   * A CSS colour (the formats check it: hex or a colour function) or
+   * "transparent". Default: white for a document, the viewer's ground for
+   * CAD and 3D. A format that cannot draw on transparency says so
+   * (`RasterError` "unsupported") rather than ignore it.
+   */
+  background?: string;
+  /** Stops the drawing: the promise rejects with a `RasterError` "aborted". */
+  signal?: AbortSignal;
+}
+
+/** A picture drawn, and where from. */
+export interface Raster {
+  /** The caller owns it and closes it. */
+  bitmap: ImageBitmap;
+  width: number;
+  height: number;
+  page: number;
+  /** CAD: the layout drawn. */
+  layout?: string;
+  space: RegionSpace;
+  /** The region actually drawn, in the same coordinates as the one asked for: map picture pixels back with it. Absent for "frame". */
+  region?: RasterRegion;
+}
+
+export type RasterType = "png" | "jpeg" | "webp";
+
+export interface EncodeOptions {
+  /** Default "png". JPEG has no transparency: it is drawn on `background`, or white. */
+  type?: RasterType;
+  /** 0..1 for "jpeg" and "webp". */
+  quality?: number;
+}
+
+/** A raster encoded to an image file. */
+export interface RasterBlob extends Omit<Raster, "bitmap"> {
+  blob: Blob;
+}
+
+/**
+ * Pages drawn as pictures: for thumbnails, printing, saving or analysing
+ * what the session shows. A PDF's, Word's and PowerPoint's pages, a
+ * spreadsheet's sheets, an image (one page), a drawing or a model (one page
+ * for each layout / one for the model), a video (one page: the frame being
+ * shown). `count` is the number of pages. Text and archives have none.
+ */
+export interface PicturesController extends Store<{ count: number; space: RegionSpace }> {
+  /**
+   * Page `page` (1-based) drawn at the requested size and region. Rejects
+   * with a `RasterError`. The caller owns the bitmap and closes it. Drawn
+   * again from the document's own data (vectors, geometry), not read off the
+   * screen: sharp at any size, whatever the view's zoom.
+   */
+  raster(page: number, options?: RasterOptions): Promise<Raster>;
+  /**
+   * `raster`, then encoded by the page that owns the session (never by the
+   * document's own code, in the sandboxed frame).
+   */
+  toBlob(page: number, options?: RasterOptions & EncodeOptions): Promise<RasterBlob>;
+  /**
+   * Page `page`, its longest side `longEdge` px (held to
+   * `MAX_PICTURE_EDGE` and `MAX_PICTURE_PIXELS`), a document's page on white.
+   * Null when it cannot be drawn. The caller owns the bitmap and closes it.
+   */
+  render(page: number, longEdge: number): Promise<ImageBitmap | null>;
+}
+
+/** What the session shows now, as a region of one page of its pictures. */
+export interface Viewport {
+  space: RegionSpace;
+  /** 1-based; the page most in view. */
+  page: number;
+  /** CAD: the layout shown. */
+  layout?: string;
+  region: RasterRegion;
+}
+
+/**
+ * The part of the document in view, in the coordinates of `pictures.space`;
+ * null while nothing is drawn. Pass it as `region` to `pictures.raster`
+ * (with `region: "current"`, or change it first) to draw what the user sees.
+ *
+ * Worked out for the formats where that costs (Word, PowerPoint, Excel, CSV,
+ * PDF) only while the store has a listener, and once for each `get` without
+ * one. A spreadsheet's is measured on a second copy of the workbook: its `get`
+ * returns the last one measured and starts the next. In the sandboxed frame a
+ * `get` returns the last value the frame reported and asks it for a fresh
+ * one: subscribe to follow the viewport.
+ */
+export type ViewportController = Store<Viewport | null>;
+
 // ── Image surface ────────────────────────────────────────────────────────────
 
 /**
@@ -447,7 +755,7 @@ export interface ImageSurface extends Store<ViewState> {
   pick<T extends { x: number; y: number }>(markers: Iterable<T>, at: { x: number; y: number }, radius?: number): T | null;
   /**
    * Laid out in page pixels and transformed with the image: an overlay drawn
-   * here pans and zooms with it. `--exv-scale` keeps a marker's screen size.
+   * here pans and zooms with it. `--exav-viewer-scale` keeps a marker's screen size.
    */
   pageLayer: HTMLElement;
   /** Untransformed, above everything: HTML controls placed with `toScreen`. */
@@ -498,11 +806,12 @@ export interface Session {
   /**
    * Shows `file`, the same document under the same id with other bytes, in
    * place of the current one, keeping the zoom and scroll position where the
-   * format can (PDF, images). Resolves `true` when it did. `false`: this
-   * session cannot (another format, a plugin without `replace`, a document
-   * in a sandboxed frame), and nothing was changed: mount a new session, as
-   * for a new file. A new document that cannot be read ends in an error
-   * status.
+   * format can (PDF, images), in the page and in the sandboxed frame alike.
+   * Resolves `true` when it did. `false`: this session cannot (another
+   * format, a plugin without `replace`, a frame not started yet, a file
+   * delivered another way than the first), and nothing was changed: mount a
+   * new session, as for a new file. A new document that cannot be read ends
+   * in an error status.
    */
   replace(file: ViewerFile): Promise<boolean>;
   resize(): void;
diff --git a/crates/exav-viewer/ts/core/viewer.test.ts b/crates/exav-viewer/ts/core/viewer.test.ts
index ba2b5e2b..68a8a5ad 100644
--- a/crates/exav-viewer/ts/core/viewer.test.ts
+++ b/crates/exav-viewer/ts/core/viewer.test.ts
@@ -306,6 +306,22 @@ describe("a plugin that shows another file", () => {
     expect(Object.keys(s.controllers.get())).toEqual(["zoom"]);
   });
 
+  it("with forward, shows the nested session's loading as the drawing of the result", async () => {
+    const reading: FormatPlugin = {
+      ...inner,
+      load: async () => ({
+        async mount(_h: HTMLElement, c: RenderContext): Promise<RendererHandle> {
+          c.status({ phase: "loading", step: "read" });
+          return { controllers: {}, destroy() {} };
+        },
+      }),
+    };
+    const s = createViewer({ plugins: [wrapper(true), reading] }).mount(document.createElement("div"), { id: "w", name: "a.wrap", source: { bytes: new Uint8Array([1]) } });
+    await tick();
+    await tick();
+    expect(s.status.get()).toEqual({ phase: "loading", step: "render" });
+  });
+
   it("without it, wires nothing", async () => {
     const s = createViewer({ plugins: [wrapper(false), inner] }).mount(document.createElement("div"), { id: "w", name: "a.wrap", source: { bytes: new Uint8Array([1]) } });
     await tick();
@@ -316,6 +332,45 @@ describe("a plugin that shows another file", () => {
   });
 });
 
+describe("the file step", () => {
+  it("is the status while the file's bytes arrive and the plugin says nothing more precise", async () => {
+    let send!: (chunk: Uint8Array | null) => void;
+    const body = new ReadableStream<Uint8Array>({
+      start(controller) {
+        send = (chunk) => (chunk ? controller.enqueue(chunk) : controller.close());
+      },
+    });
+    vi.stubGlobal("fetch", vi.fn(async () => new Response(body, { headers: { "content-length": "4" } })));
+    const seen: Status[] = [];
+    const reading: FormatPlugin = {
+      id: "r",
+      match: { extensions: [".r"] },
+      capabilities: [],
+      options: {},
+      load: async () => ({
+        async mount(_h: HTMLElement, c: RenderContext): Promise<RendererHandle> {
+          c.status({ phase: "loading" });
+          await c.source.bytes();
+          c.status({ phase: "loading", step: "read" });
+          return { controllers: {}, destroy() {} };
+        },
+      }),
+    };
+    const s = createViewer({ plugins: [reading] }).mount(document.createElement("div"), { id: "r", name: "a.r", source: { url: "https://example.test/a.r" } });
+    s.status.subscribe((v) => seen.push(v));
+    await tick();
+    send(new Uint8Array([1, 2]));
+    await tick();
+    send(new Uint8Array([3, 4]));
+    send(null);
+    await tick();
+    await tick();
+    expect(seen).toContainEqual({ phase: "loading", step: "file", progress: 0.5 });
+    expect(s.status.get()).toEqual({ phase: "loading", step: "read" });
+    vi.unstubAllGlobals();
+  });
+});
+
 describe("a source", () => {
   it("is downloaded once whatever is asked of it, and reports its progress", async () => {
     const body = new Uint8Array([1, 2, 3, 4, 5]);
diff --git a/crates/exav-viewer/ts/core/viewer.ts b/crates/exav-viewer/ts/core/viewer.ts
index 7fd4c226..9c4c18f7 100644
--- a/crates/exav-viewer/ts/core/viewer.ts
+++ b/crates/exav-viewer/ts/core/viewer.ts
@@ -25,8 +25,30 @@ const ERROR_CODES: Record<string, ViewerError["code"]> = {
   xlsx: "office",
   pptx: "office",
   csv: "office",
+  rtf: "office",
+  doc: "office",
+  odt: "office",
+  ppt: "office",
+  odp: "office",
+  keynote: "office",
+  xls: "office",
+  ods: "office",
+  numbers: "office",
+  odg: "office",
+  visio: "office",
+  coreldraw: "office",
+  publisher: "office",
+  pagemaker: "office",
+  freehand: "office",
+  quarkxpress: "office",
+  zonerdraw: "office",
+  wpg: "office",
+  text: "text",
   ifc: "model",
   stl: "model",
+  obj: "model",
+  ply: "model",
+  gltf: "model",
   video: "media",
   audio: "media",
   archive: "archive",
@@ -104,6 +126,13 @@ export function createViewer(config: ViewerConfig): Viewer {
 
     if (plugin && doc.reader) {
       const first = doc;
+      // The file's bytes arriving, while the plugin says nothing more precise.
+      const stopFileProgress = first.reader!.progress.subscribe((p) => {
+        const s = status.get();
+        if (ended || !p || s.phase !== "loading" || s.label !== undefined || (s.step !== undefined && s.step !== "file")) return;
+        status.set(p.total !== null && p.loaded >= p.total ? { phase: "loading" } : { phase: "loading", step: "file", ...(p.total ? { progress: Math.min(1, p.loaded / p.total) } : {}) });
+      });
+      first.abort.signal.addEventListener("abort", stopFileProgress, { once: true });
       void (async () => {
         try {
           const renderer = await load(plugin);
@@ -127,8 +156,11 @@ export function createViewer(config: ViewerConfig): Viewer {
               const stops: (() => void)[] = [];
               if (options?.forward) {
                 forwarding = true;
+                // What the nested session loads is, here, the drawing of the result.
                 const follow = () => {
-                  if (!ended) status.set(s.status.get());
+                  if (ended) return;
+                  const n = s.status.get();
+                  status.set(n.phase === "loading" ? { phase: "loading", step: "render", ...(n.label !== undefined && { label: n.label }) } : n);
                 };
                 const mirror = () => {
                   if (!ended) controllers.set(s.controllers.get());
diff --git a/crates/exav-viewer/ts/frame/app/frame.css b/crates/exav-viewer/ts/frame/app/frame.css
index ca8a84d8..d2519514 100644
--- a/crates/exav-viewer/ts/frame/app/frame.css
+++ b/crates/exav-viewer/ts/frame/app/frame.css
@@ -6,7 +6,7 @@ body {
   overflow: hidden;
 }
 
-.exv-frame-root {
+.exav-viewer-frame-root {
   position: relative;
   width: 100%;
   height: 100%;
diff --git a/crates/exav-viewer/ts/frame/app/main.ts b/crates/exav-viewer/ts/frame/app/main.ts
index 0f4c8f3e..63ba4dcb 100644
--- a/crates/exav-viewer/ts/frame/app/main.ts
+++ b/crates/exav-viewer/ts/frame/app/main.ts
@@ -7,36 +7,77 @@
 import { archive } from "../../archive/index.js";
 // The plugins alone: `cad/index.ts` also re-exports the engine.
 import { dwg, dxf } from "../../cad/plugin.js";
-import { BUILTIN_ORDER } from "../../core/formats.js";
+import { BUILTIN_ORDER, CONVERTED_FORMATS } from "../../core/formats.js";
 import type { BuiltinFormat, Controllers, FormatPlugin, Session, Status } from "../../core/types.js";
 import { createViewer } from "../../core/viewer.js";
 import { ifc } from "../../ifc/index.js";
 import { image } from "../../image/index.js";
 import { audio, video } from "../../media/index.js";
-import { stl } from "../../model/index.js";
-import { csv, docx, pptx, xlsx } from "../../office/index.js";
+import { gltf, obj, ply, stl } from "../../model/index.js";
+import {
+  coreldraw,
+  csv,
+  doc,
+  docx,
+  freehand,
+  keynote,
+  numbers,
+  odg,
+  odp,
+  ods,
+  odt,
+  pagemaker,
+  ppt,
+  pptx,
+  publisher,
+  quarkxpress,
+  rtf,
+  visio,
+  wpg,
+  xls,
+  xlsx,
+  zonerdraw,
+} from "../../office/index.js";
 import { pdf } from "../../pdf/index.js";
+import { text } from "../../text/index.js";
 import type { FileSource } from "../../core/types.js";
 import { readPolicy } from "../policy.js";
+import type { FrameTheme } from "../../core/theme.js";
+import { asRasterError, RasterError } from "../../core/pictures.js";
 import {
   checkBytes,
   checkCommand,
   checkOpen,
+  checkRaster,
+  checkReplace,
+  checkThemeMessage,
+  checkUnraster,
+  checkWatch,
   CONTROLLER_KEYS,
   HELLO,
+  NAV_KEYS,
   PROTOCOL,
+  refusedRasterId,
+  WATCHED_KEYS,
   type ArchiveSnapshot,
   type CommandMessage,
   type ControllerKey,
+  type WatchedKey,
+  type WatchMessage,
+  type RasterMessage,
+  type RasterResult,
+  type ReplaceMessage,
   type ErrorCode,
   type FrameMessage,
   type FrameOptions,
+  type NavKey,
   type OpenSource,
   type Snapshots,
   type Statics,
   type StatusSnapshot,
 } from "../protocol.js";
 import { portRanges, type PortRanges } from "./ranges.js";
+import { portTree, type PortTree } from "./tree.js";
 import { installWorkers } from "./workers.js";
 
 const base = new URL("./", import.meta.url);
@@ -83,20 +124,44 @@ function plugins(formats: readonly BuiltinFormat[], o: FrameOptions, source: Ope
   const make: Record<BuiltinFormat, () => FormatPlugin<any>> = {
     pdf: () => pdf(o.pdf),
     // An image given by URL is shown without CORS: its pixels stay unreadable here.
-    image: () => image({ ...o.image, wasmDecoders: true, ...(source.kind === "url" && { crossOrigin: null }) }),
+    image: () => image({ ...o.image, wasmDecoders: true,...(source.kind === "url" && { crossOrigin: null }) }),
     dwg: () => dwg({ ...o.cad, fontsUrl: new URL("./fonts/", base).href }),
     dxf: () => dxf({ ...o.cad, fontsUrl: new URL("./fonts/", base).href }),
-    video,
-    audio,
+    video: () => video(o.media),
+    audio: () => audio(o.media),
     ifc: () => ifc(o.ifc),
     stl: () => stl(o.model),
+    obj: () => obj(o.model),
+    ply: () => ply(o.model),
+    gltf: () => gltf(o.model),
     docx: () => docx(office),
     xlsx: () => xlsx(office),
     pptx: () => pptx(office),
     csv: () => csv(office),
+    rtf: () => rtf(o.conversion),
+    doc: () => doc(o.conversion),
+    odt: () => odt(o.conversion),
+    ppt: () => ppt(o.conversion),
+    odp: () => odp(o.conversion),
+    keynote: () => keynote(o.conversion),
+    xls: () => xls(o.conversion),
+    ods: () => ods(o.conversion),
+    numbers: () => numbers(o.conversion),
+    odg: () => odg(o.conversion),
+    visio: () => visio(o.conversion),
+    coreldraw: () => coreldraw(o.conversion),
+    publisher: () => publisher(o.conversion),
+    pagemaker: () => pagemaker(o.conversion),
+    freehand: () => freehand(o.conversion),
+    quarkxpress: () => quarkxpress(o.conversion),
+    zonerdraw: () => zonerdraw(o.conversion),
+    wpg: () => wpg(o.conversion),
+    text,
     archive: () => archive(o.archive),
   };
-  return formats.map((f) => make[f]());
+  // A converted file is shown as a PDF or an XLSX: their plugins too.
+  const shown: BuiltinFormat[] = formats.some((f) => CONVERTED_FORMATS.includes(f)) ? ["pdf", "xlsx"] : [];
+  return [...formats, ...shown.filter((f) => !formats.includes(f))].map((f) => make[f]());
 }
 
 function statusOf(s: Status): StatusSnapshot {
@@ -107,7 +172,7 @@ function statusOf(s: Status): StatusSnapshot {
       return { phase: "error", code: s.error.code as ErrorCode };
     case "loading":
     case "converting":
-      return { phase: s.phase, ...(s.progress !== undefined && { progress: s.progress }) };
+      return { phase: s.phase, ...(s.progress !== undefined && { progress: s.progress }), ...(s.step !== undefined && { step: s.step }) };
     default:
       return s;
   }
@@ -170,17 +235,43 @@ function snapshot<K extends ControllerKey>(key: K, value: unknown, from: number)
   return out as Snapshots[K];
 }
 
+/** Follows or stops following a store the host asked for, by session (`WatchMessage`). */
+const watchers = new Map<number, (type: WatchMessage["type"], key: WatchedKey) => void>();
+
 function start(relay: Relay) {
   const { id, session } = relay;
   sessions.set(id, session);
   let stores: (() => void)[] = [];
+  let controllers: Controllers = {};
+  /** The stores the host watches, with the stop of the subscription to each (null while the session has none). */
+  const watched = new Map<WatchedKey, (() => void) | null>();
+  const follow = (key: WatchedKey) => {
+    const store = controllers[key];
+    if (!store) return;
+    watched.set(
+      key,
+      store.subscribe((v) => post({ type: "state", session: id, key, value: snapshot(key, v, id) })),
+    );
+    // After the subscription, which is what starts the work: this is the value the host reads first.
+    post({ type: "state", session: id, key, value: snapshot(key, store.get(), id) });
+  };
   const wire = (c: Controllers) => {
     for (const stop of stores) stop();
     stores = [];
+    for (const key of watched.keys()) {
+      watched.get(key)?.();
+      watched.set(key, null);
+    }
+    controllers = c;
     const values: Partial<Snapshots> = {};
     for (const key of CONTROLLER_KEYS) {
       const store = c[key];
       if (!store) continue;
+      // A watched store is not read until the host asks: its value is null until then.
+      if ((WATCHED_KEYS as readonly ControllerKey[]).includes(key)) {
+        (values as Record<string, unknown>)[key] = null;
+        continue;
+      }
       (values as Record<string, unknown>)[key] = snapshot(key, store.get(), id);
       stores.push(store.subscribe((v) => post({ type: "state", session: id, key, value: snapshot(key, v, id) })));
     }
@@ -189,7 +280,18 @@ function start(relay: Relay) {
       ...(c.ground && { ground: { ...c.ground.colors } }),
     };
     post({ type: "controllers", session: id, values, statics });
+    // The new stores of what the host still watches.
+    for (const key of [...watched.keys()]) follow(key);
   };
+  watchers.set(id, (type, key) => {
+    if (type === "unwatch") {
+      watched.get(key)?.();
+      watched.delete(key);
+    } else if (!watched.has(key)) {
+      watched.set(key, null);
+      follow(key);
+    }
+  });
   const stopStatus = session.status.subscribe((s) => post({ type: "status", session: id, status: statusOf(s) }));
   const stopControllers = session.controllers.subscribe(wire);
   post({ type: "status", session: id, status: statusOf(session.status.get()) });
@@ -198,6 +300,9 @@ function start(relay: Relay) {
     stopStatus();
     stopControllers();
     for (const stop of stores) stop();
+    for (const stop of watched.values()) stop?.();
+    watched.clear();
+    watchers.delete(id);
   };
 }
 
@@ -241,6 +346,12 @@ async function run(m: CommandMessage): Promise<void> {
     case "layers.setAll":
       if (typeof a === "boolean") c.layers?.setAll(a);
       return;
+    case "storeys.setVisible":
+      if (typeof a === "string" && typeof b === "boolean") c.storeys?.setVisible(a, b);
+      return;
+    case "storeys.setAll":
+      if (typeof a === "boolean") c.storeys?.setAll(a);
+      return;
     case "layouts.select":
       if (typeof a === "string") await c.layouts?.select(a);
       return;
@@ -252,35 +363,185 @@ async function run(m: CommandMessage): Promise<void> {
       return;
     case "archive.back":
       return c.archive?.back();
+    case "media.play":
+      return c.media?.play();
+    case "media.pause":
+      return c.media?.pause();
+    case "media.seek":
+      if (isNum(a)) c.media?.seek(a);
+      return;
+    case "media.setVolume":
+      if (isNum(a)) c.media?.setVolume(a);
+      return;
+    case "media.setMuted":
+      if (typeof a === "boolean") c.media?.setMuted(a);
+      return;
+    case "media.setRate":
+      if (isNum(a)) c.media?.setRate(a);
+      return;
+    case "sheets.select":
+      if (isInt(a)) await c.sheets?.select(a);
+      return;
+  }
+}
+
+/** The pictures being drawn, by the host's number for each: a request to stop aborts its signal. */
+const rasters = new Map<number, AbortController>();
+
+/** A page drawn as a picture, sent to the host, or why not. */
+async function raster(m: RasterMessage) {
+  const abort = new AbortController();
+  rasters.set(m.id, abort);
+  const pictures = sessions.get(m.session)?.controllers.get().pictures;
+  let result: RasterResult;
+  try {
+    if (!pictures) throw new RasterError("unsupported", "nothing here is drawn as a picture");
+    const r = await pictures.raster(m.page, { ...m.options, signal: abort.signal });
+    const { bitmap, ...rest } = r;
+    result = { ok: true, bitmap, ...rest };
+  } catch (error) {
+    const e = asRasterError(error, abort.signal);
+    if (e.code === "failed") console.warn("frame: a picture failed", error);
+    result = { ok: false, code: e.code };
   }
+  rasters.delete(m.id);
+  const bitmap = result.ok ? result.bitmap : null;
+  if (bitmap && !port) bitmap.close();
+  else port?.postMessage({ type: "rastered", id: m.id, result } satisfies FrameMessage, bitmap ? [bitmap] : []);
 }
 
+// ── The next document ────────────────────────────────────────────────────────
+
+/** The file's session: the one `replace` acts on. */
+let root: Session | null = null;
+
+async function replace(m: ReplaceMessage): Promise<boolean> {
+  const live = root;
+  if (!live) return false;
+  const s = m.source;
+  let source: FileSource;
+  let fresh: PortRanges | null = null;
+  if (s.kind === "ranges") {
+    fresh = portRanges(post, s.size, new Uint8Array(s.head), m.generation);
+    ranges.add(fresh);
+    source = { ranges: fresh };
+  } else source = s.kind === "url" ? { url: s.url } : { blob: s.blob };
+  const { name, type, path, format } = m.file;
+  let ok = false;
+  try {
+    ok = await live.replace({ id: "file", name, type, path, ...(format && { format }), source, ...(around && { tree: around.tree }) });
+  } catch (error) {
+    console.warn("frame: a replacement failed", error);
+  }
+  // The reads of the document that is gone were cancelled with it; the host forgets its bytes on this answer.
+  if (ok) {
+    ranges.clear();
+    if (fresh) ranges.add(fresh);
+  } else if (fresh) ranges.delete(fresh);
+  return ok;
+}
+
+// ── Theme ────────────────────────────────────────────────────────────────────
+
+let themed: readonly string[] = [];
+
+/** The host's values in place of the stylesheet's defaults, on the element they are declared on. */
+function applyTheme(theme: FrameTheme) {
+  const root = document.getElementById("root")!;
+  for (const name of themed) root.style.removeProperty(name);
+  themed = Object.keys(theme.tokens);
+  for (const [name, value] of Object.entries(theme.tokens)) root.style.setProperty(name, value);
+  // As the host's: browsers paint a frame whose scheme differs from its element's on an opaque ground.
+  document.documentElement.style.colorScheme = theme.scheme ?? "";
+}
+
+// ── Keys the document does not use, handed to the host ───────────────────────
+
+const VERTICAL: Partial<Record<NavKey, -1 | 1>> = { ArrowUp: -1, PageUp: -1, Home: -1, ArrowDown: 1, PageDown: 1, End: 1 };
+const HORIZONTAL: Partial<Record<NavKey, -1 | 1>> = { ArrowLeft: -1, ArrowRight: 1 };
+
+/** Where the user last pressed: the browser scrolls what is under it when nothing has the focus. */
+let lastPressed: Element | null = null;
+addEventListener("pointerdown", (e) => (lastPressed = e.target instanceof Element ? e.target : null), true);
+
+/** Whether `key` would scroll something from `start` up: then the document uses it. */
+function scrolls(start: Element | null, key: NavKey): boolean {
+  const v = VERTICAL[key];
+  const h = HORIZONTAL[key];
+  for (let el = start; el; el = el.parentElement) {
+    const style = getComputedStyle(el);
+    if (v && /(auto|scroll)/.test(style.overflowY) && (v < 0 ? el.scrollTop > 0 : el.scrollTop + el.clientHeight < el.scrollHeight - 1)) return true;
+    if (h && /(auto|scroll)/.test(style.overflowX) && (h < 0 ? el.scrollLeft > 0 : el.scrollLeft + el.clientWidth < el.scrollWidth - 1)) return true;
+  }
+  return false;
+}
+
+addEventListener("keydown", (e) => {
+  if (e.defaultPrevented || e.ctrlKey || e.altKey || e.metaKey || !(NAV_KEYS as readonly string[]).includes(e.key)) return;
+  const key = e.key as NavKey;
+  const target = e.target instanceof Element && e.target !== document.body ? e.target : lastPressed;
+  if (key !== "Escape") {
+    // A player's own controls take the arrows.
+    if (target instanceof HTMLMediaElement || target?.closest("input, textarea, select, [contenteditable]")) return;
+    if (scrolls(target, key)) return;
+  }
+  post({ type: "key", key, shift: e.shiftKey, repeat: e.repeat });
+});
+
 // ── The host ─────────────────────────────────────────────────────────────────
 
 let opened = false;
-let ranges: PortRanges | null = null;
+/** The files read by ranges that are alive: the document shown, and one replacing it. */
+const ranges = new Set<PortRanges>();
+/** The files around the one shown, when the host listed them. */
+let around: PortTree | null = null;
 
 function receive(data: unknown) {
   if (!opened) {
     const open = checkOpen(data, BUILTIN_ORDER);
     if (!open) return;
     opened = true;
+    applyTheme(open.theme);
     const viewer = createViewer({ plugins: plugins(open.formats, open.options, open.source), assetBase: new URL("./exav-viewer/", base).href });
     const host = document.getElementById("root")!;
     const { name, type, path, format } = open.file;
     const s = open.source;
     let source: FileSource;
     if (s.kind === "ranges") {
-      ranges = portRanges(post, s.size, new Uint8Array(s.head));
-      source = { ranges };
+      const first = portRanges(post, s.size, new Uint8Array(s.head));
+      ranges.add(first);
+      source = { ranges: first };
     } else source = s.kind === "url" ? { url: s.url } : { blob: s.blob };
-    const session = viewer.mount(host, { id: "file", name, type, path, ...(format && { format }), source });
+    if (open.tree) around = portTree(post, open.tree);
+    const session = viewer.mount(host, { id: "file", name, type, path, ...(format && { format }), source, ...(around && { tree: around.tree }) });
+    root = session;
     start({ id: 0, session, stop: () => {} });
     addEventListener("resize", () => session.resize());
     return;
   }
   const bytes = checkBytes(data);
-  if (bytes) return ranges?.receive(bytes);
+  // Each file ignores the ids it did not ask for.
+  if (bytes) {
+    for (const r of ranges) r.receive(bytes);
+    around?.receive(bytes);
+    return;
+  }
+  const theme = checkThemeMessage(data);
+  if (theme) return applyTheme(theme.theme);
+  const drawing = checkRaster(data);
+  if (drawing) return void raster(drawing);
+  // A request that is none is still answered: the host waits for it.
+  const refused = refusedRasterId(data);
+  if (refused !== null) return post({ type: "rastered", id: refused, result: { ok: false, code: "invalid" } });
+  const undrawing = checkUnraster(data);
+  if (undrawing) return void rasters.get(undrawing.id)?.abort();
+  const watching = checkWatch(data);
+  if (watching) return watchers.get(watching.session)?.(watching.type, watching.key);
+  const replacing = checkReplace(data, BUILTIN_ORDER);
+  if (replacing) {
+    void replace(replacing).then((ok) => post({ type: "replaced", call: replacing.call, ok }));
+    return;
+  }
   const command = checkCommand(data);
   if (!command) return;
   void run(command)
diff --git a/crates/exav-viewer/ts/frame/app/ranges.ts b/crates/exav-viewer/ts/frame/app/ranges.ts
index 41314b84..65b1e53b 100644
--- a/crates/exav-viewer/ts/frame/app/ranges.ts
+++ b/crates/exav-viewer/ts/frame/app/ranges.ts
@@ -21,8 +21,15 @@ interface Piece {
   reject(e: Error): void;
 }
 
-export function portRanges(post: (m: FrameMessage) => void, size: number, head: Uint8Array): PortRanges {
-  let next = 1;
+/** Read ids are unique over the frame's life: two documents' reads, and the files fetched, never share one. */
+let nextId = 1;
+export const takeId = () => nextId++;
+
+/**
+ * `generation`: the document these bytes are (see `ReplaceMessage`), named
+ * in each read.
+ */
+export function portRanges(post: (m: FrameMessage) => void, size: number, head: Uint8Array, generation = 0): PortRanges {
   const queue: Piece[] = [];
   const sent = new Map<number, Piece>();
   let bytes = 0;
@@ -33,13 +40,13 @@ export function portRanges(post: (m: FrameMessage) => void, size: number, head:
       p.sent = true;
       sent.set(p.id, p);
       bytes += p.length;
-      post({ type: "read", id: p.id, offset: p.offset, length: p.length });
+      post({ type: "read", id: p.id, generation, offset: p.offset, length: p.length });
     }
   };
 
   const piece = (offset: number, length: number, signal: AbortSignal) =>
     new Promise<Uint8Array>((resolve, reject) => {
-      const p: Piece = { id: next++, offset, length, sent: false, resolve, reject };
+      const p: Piece = { id: takeId(), offset, length, sent: false, resolve, reject };
       const abort = () => {
         if (p.sent) post({ type: "cancel", id: p.id });
         else queue.splice(queue.indexOf(p), 1);
diff --git a/crates/exav-viewer/ts/frame/app/tree.test.ts b/crates/exav-viewer/ts/frame/app/tree.test.ts
new file mode 100644
index 00000000..924f482c
--- /dev/null
+++ b/crates/exav-viewer/ts/frame/app/tree.test.ts
@@ -0,0 +1,69 @@
+import { describe, expect, it } from "vitest";
+
+import type { FrameMessage } from "../protocol.js";
+import { portRanges } from "./ranges.js";
+import { portTree } from "./tree.js";
+
+function setup() {
+  const sent: FrameMessage[] = [];
+  const port = portTree((m) => sent.push(m), { path: "a/plan.dwg", paths: ["a/plan.dwg", "a/title.dwg"] });
+  const fetches = () => sent.filter((m): m is Extract<FrameMessage, { type: "fetch" }> => m.type === "fetch");
+  return { sent, port, fetches };
+}
+
+describe("the files around the one shown, in the frame", () => {
+  it("are listed as the host listed them", () => {
+    const { port } = setup();
+    expect(port.tree.path).toBe("a/plan.dwg");
+    expect(port.tree.paths).toEqual(["a/plan.dwg", "a/title.dwg"]);
+  });
+
+  it("are asked of the host one fetch each, and come back as bytes", async () => {
+    const { port, fetches } = setup();
+    const signal = new AbortController().signal;
+    const one = port.tree.open("a/title.dwg", signal);
+    const two = port.tree.open("a/title.dwg", signal);
+    expect(fetches().map((f) => f.path)).toEqual(["a/title.dwg", "a/title.dwg"]);
+    expect(fetches()[0]!.id).not.toBe(fetches()[1]!.id);
+    // The answers come in any order, each to the one that asked.
+    port.receive({ type: "bytes", id: fetches()[1]!.id, data: new Uint8Array([2]).buffer });
+    port.receive({ type: "bytes", id: fetches()[0]!.id, data: new Uint8Array([1]).buffer });
+    expect(await one).toEqual({ bytes: new Uint8Array([1]) });
+    expect(await two).toEqual({ bytes: new Uint8Array([2]) });
+  });
+
+  it("fail with the host's reason", async () => {
+    const { port, fetches } = setup();
+    const refused = port.tree.open("a/title.dwg", new AbortController().signal);
+    port.receive({ type: "bytes", id: fetches()[0]!.id, error: "refused" });
+    await expect(refused).rejects.toThrow("refused");
+    const failed = port.tree.open("a/title.dwg", new AbortController().signal);
+    port.receive({ type: "bytes", id: fetches()[1]!.id, error: "failed" });
+    await expect(failed).rejects.toThrow("could not read");
+  });
+
+  it("are cancelled with the signal, and an answer that comes after is ignored", async () => {
+    const { port, sent, fetches } = setup();
+    const control = new AbortController();
+    const asked = port.tree.open("a/title.dwg", control.signal);
+    control.abort();
+    await expect(asked).rejects.toThrow("aborted");
+    expect(sent.at(-1)).toEqual({ type: "cancel", id: fetches()[0]!.id });
+    port.receive({ type: "bytes", id: fetches()[0]!.id, data: new ArrayBuffer(1) });
+    // Already aborted: nothing is asked.
+    const late = new AbortController();
+    late.abort();
+    await expect(port.tree.open("a/title.dwg", late.signal)).rejects.toThrow("aborted");
+    expect(fetches()).toHaveLength(1);
+  });
+
+  it("share their ids with the reads of a file by ranges, which never repeat over the frame's life", () => {
+    const { port, fetches, sent } = setup();
+    void port.tree.open("a/title.dwg", new AbortController().signal);
+    const ranges = portRanges((m) => sent.push(m), 1_000_000, new Uint8Array(10));
+    void ranges.read(500_000, 10, new AbortController().signal);
+    const ids = sent.map((m) => ("id" in m ? m.id : -1));
+    expect(new Set(ids).size).toBe(ids.length);
+    expect(fetches()).toHaveLength(1);
+  });
+});
diff --git a/crates/exav-viewer/ts/frame/app/tree.ts b/crates/exav-viewer/ts/frame/app/tree.ts
new file mode 100644
index 00000000..24a8999a
--- /dev/null
+++ b/crates/exav-viewer/ts/frame/app/tree.ts
@@ -0,0 +1,47 @@
+/**
+ * The files around the one shown, in the frame: it was told their paths, and
+ * asks the host for the bytes of one when a format needs it. The host answers
+ * only for a path it listed.
+ */
+import type { FileTree } from "../../core/types.js";
+import type { BytesMessage, FrameMessage } from "../protocol.js";
+import { takeId } from "./ranges.js";
+
+export interface PortTree {
+  tree: FileTree;
+  /** A `bytes` message from the host. */
+  receive(m: BytesMessage): void;
+}
+
+export function portTree(post: (m: FrameMessage) => void, listed: { path: string; paths: string[] }): PortTree {
+  const asked = new Map<number, { resolve(b: Uint8Array): void; reject(e: Error): void }>();
+  return {
+    tree: {
+      path: listed.path,
+      paths: listed.paths,
+      open(path, signal) {
+        return new Promise((resolve, reject) => {
+          if (signal.aborted) return reject(new DOMException("aborted", "AbortError"));
+          const id = takeId();
+          const abort = () => {
+            if (asked.delete(id)) post({ type: "cancel", id });
+            reject(new DOMException("aborted", "AbortError"));
+          };
+          signal.addEventListener("abort", abort, { once: true });
+          asked.set(id, {
+            resolve: (bytes) => (signal.removeEventListener("abort", abort), resolve({ bytes })),
+            reject: (e) => (signal.removeEventListener("abort", abort), reject(e)),
+          });
+          post({ type: "fetch", id, path });
+        });
+      },
+    },
+    receive(m) {
+      const p = asked.get(m.id);
+      if (!p) return;
+      asked.delete(m.id);
+      if ("error" in m) p.reject(new Error(`the host ${m.error === "refused" ? "refused" : "could not read"} the file`));
+      else p.resolve(new Uint8Array(m.data));
+    },
+  };
+}
diff --git a/crates/exav-viewer/ts/frame/host.test.ts b/crates/exav-viewer/ts/frame/host.test.ts
index 52d5305f..c624ea0b 100644
--- a/crates/exav-viewer/ts/frame/host.test.ts
+++ b/crates/exav-viewer/ts/frame/host.test.ts
@@ -3,11 +3,12 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import "../test/blob.js";
-import type { ByteRanges, Controllers, FileSource, Session } from "../core/types.js";
+import type { ByteRanges, Controllers, FileSource, FileTree, Session } from "../core/types.js";
 import { builtinTranslate } from "../react/messages.js";
-import { createSandboxedViewer, type SandboxConfig } from "./index.js";
+import type { FrameTheme } from "../core/theme.js";
+import { createSandboxedViewer, KEY_RATE, type SandboxConfig, type SandboxedViewer } from "./index.js";
 import { frameCsp, readPolicy, type FramePolicy } from "./policy.js";
-import { HELLO, PROTOCOL, READS } from "./protocol.js";
+import { HELLO, MAX_DRAWS, PROTOCOL, READS, TREE } from "./protocol.js";
 
 const tick = (ms = 0) => new Promise((r) => setTimeout(r, ms));
 
@@ -17,6 +18,8 @@ interface Frame {
   /** What the host sent over the port. */
   received: any[];
   send(message: unknown): Promise<void>;
+  /** As `send`, but handed to the host as it is: a port clones a message, which a bitmap cannot survive here. */
+  inject(message: unknown): Promise<void>;
   controllers(): Controllers;
 }
 
@@ -25,6 +28,7 @@ afterEach(() => {
   for (const h of hosts) h.remove();
   hosts = [];
   vi.restoreAllMocks();
+  vi.unstubAllGlobals();
 });
 beforeEach(() => {
   vi.spyOn(console, "warn").mockImplementation(() => {});
@@ -38,14 +42,35 @@ async function mount(
   source: FileSource = { bytes: new Uint8Array([1, 2, 3]) },
   policy: FramePolicy | null = null,
 ): Promise<Frame> {
-  const viewer = createSandboxedViewer({ url: "https://frame.test/index.html", ...config });
+  return mountWith(createSandboxedViewer({ url: "https://frame.test/index.html", ...config }), name, ready, source, policy);
+}
+
+async function mountWith(
+  viewer: SandboxedViewer,
+  name = "plan.dwg",
+  ready = true,
+  source: FileSource = { bytes: new Uint8Array([1, 2, 3]) },
+  policy: FramePolicy | null = null,
+  tree?: FileTree,
+): Promise<Frame> {
   const host = document.createElement("div");
   document.body.append(host);
   hosts.push(host);
-  const session = viewer.mount(host, { id: "f1", name, source });
+  const session = viewer.mount(host, { id: "f1", name, source, ...(tree && { tree }) });
   const iframe = host.querySelector("iframe")!;
   const hello: { message: any; target: string; transfer: MessagePort[] }[] = [];
   iframe.contentWindow!.postMessage = ((message: unknown, target: string, transfer: MessagePort[]) => hello.push({ message, target, transfer })) as never;
+  const Channel = globalThis.MessageChannel;
+  const channels: MessageChannel[] = [];
+  vi.stubGlobal(
+    "MessageChannel",
+    class extends Channel {
+      constructor() {
+        super();
+        channels.push(this);
+      }
+    },
+  );
   iframe.dispatchEvent(new Event("load"));
   expect(hello).toHaveLength(1);
   const port = hello[0]!.transfer[0]!;
@@ -59,6 +84,10 @@ async function mount(
       port.postMessage(message);
       await tick(5);
     },
+    async inject(message) {
+      channels[0]!.port1.onmessage?.({ data: message } as MessageEvent);
+      await tick(5);
+    },
     controllers: () => session.controllers.get(),
   };
   if (ready) await frame.send({ type: "ready", protocol: PROTOCOL, policy });
@@ -69,7 +98,7 @@ async function mount(
 const LAYERS = { kind: "layers", items: [{ id: "WALLS", name: "WALLS", color: "rgb(255 0 0)", visible: true }] };
 
 describe("the frame element", () => {
-  it("is sandboxed to scripts, with no features and no referrer, and gets the port alone", async () => {
+  it("is sandboxed to scripts, with no feature but autoplay and isolation and no referrer, and gets the port alone", async () => {
     const viewer = createSandboxedViewer({ url: "https://frame.test/index.html" });
     const host = document.createElement("div");
     document.body.append(host);
@@ -77,7 +106,9 @@ describe("the frame element", () => {
     viewer.mount(host, { id: "x", name: "a.pdf", source: { bytes: new Uint8Array(1) } });
     const iframe = host.querySelector("iframe")!;
     expect(iframe.getAttribute("sandbox")).toBe("allow-scripts");
-    expect(iframe.getAttribute("allow")).toBe("");
+    expect(iframe.getAttribute("allow")).toBe("autoplay");
+    // It fills its host without the stylesheet.
+    expect([iframe.style.width, iframe.style.height, iframe.style.display]).toEqual(["100%", "100%", "block"]);
     expect(iframe.getAttribute("referrerpolicy")).toBe("no-referrer");
     expect(iframe.getAttribute("src")).toBe("https://frame.test/index.html");
     const sent: unknown[][] = [];
@@ -261,6 +292,375 @@ describe("the controllers the host gets", () => {
     await f.send({ type: "state", session: 0, key: "archive", value: archive({ member, name: "x", format: null, session: 0 }) });
     expect(f.controllers().archive!.get().opened).toBeNull();
   });
+
+  const MEDIA = { kind: "video", paused: true, ended: false, currentTime: 0, duration: 12.5, buffered: 3, volume: 1, muted: false, rate: 1, waiting: false, blocked: false };
+
+  it("drive a player: its state from the frame, its commands to it", async () => {
+    const f = await mount({}, "clip.mp4");
+    await f.send({ type: "controllers", session: 0, values: { media: MEDIA }, statics: {} });
+    const media = f.controllers().media!;
+    expect(media.get()).toEqual(MEDIA);
+    let played = false;
+    void media.play().then(() => (played = true));
+    media.seek(4);
+    media.setVolume(0.5);
+    media.setMuted(true);
+    media.setRate(2);
+    media.pause();
+    await tick(5);
+    const commands = f.received.filter((m) => m.type === "command");
+    expect(commands.map(({ target, action, args }) => [target, action, args])).toEqual([
+      ["media", "play", []],
+      ["media", "seek", [4]],
+      ["media", "setVolume", [0.5]],
+      ["media", "setMuted", [true]],
+      ["media", "setRate", [2]],
+      ["media", "pause", []],
+    ]);
+    // `play` resolves once the frame has tried.
+    expect(played).toBe(false);
+    await f.send({ type: "done", call: commands[0].call, ok: true });
+    expect(played).toBe(true);
+    await f.send({ type: "state", session: 0, key: "media", value: { ...MEDIA, paused: false, currentTime: 4 } });
+    expect(media.get()).toMatchObject({ paused: false, currentTime: 4 });
+    // A volume past 1 is no state of a player.
+    await f.send({ type: "state", session: 0, key: "media", value: { ...MEDIA, volume: 3 } });
+    expect(media.get()).toMatchObject({ paused: false, volume: 1 });
+  });
+
+  it("switch sheets through the frame", async () => {
+    const f = await mount({}, "book.xlsx");
+    const sheets = { items: [{ index: 0, name: "Data" }, { index: 1, name: "Chart" }], current: 0 };
+    await f.send({ type: "controllers", session: 0, values: { sheets }, statics: {} });
+    const c = f.controllers().sheets!;
+    expect(c.get()).toEqual(sheets);
+    void c.select(1);
+    await tick(5);
+    expect(f.received.filter((m) => m.type === "command").map(({ target, action, args }) => [target, action, args])).toEqual([["sheets", "select", [1]]]);
+    await f.send({ type: "state", session: 0, key: "sheets", value: { ...sheets, current: 1 } });
+    expect(c.get().current).toBe(1);
+  });
+});
+
+describe("pictures of pages", () => {
+  const PAGE = { count: 3, space: "page" };
+  const RECT = { x: 0, y: 0, width: 1, height: 1 };
+  const asked = (f: Frame) => f.received.filter((m) => m.type === "raster");
+
+  /** A bitmap as the frame sends one: only its size is read. */
+  class FakeBitmap {
+    closed = false;
+    constructor(
+      public width: number,
+      public height: number,
+    ) {}
+    close() {
+      this.closed = true;
+    }
+  }
+  beforeEach(() => void vi.stubGlobal("ImageBitmap", FakeBitmap));
+  afterEach(() => void vi.unstubAllGlobals());
+  const done = (id: number, bitmap: FakeBitmap, extra: Record<string, unknown> = {}) => ({
+    type: "rastered",
+    id,
+    result: { ok: true, bitmap, width: bitmap.width, height: bitmap.height, page: 2, space: "page", region: RECT, ...extra },
+  });
+
+  it("are asked of the frame with their options, and come back with the region drawn", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    expect(pictures.get()).toEqual(PAGE);
+    const region = { x: 0.1, y: 0.1, width: 0.5, height: 0.5 };
+    const drawn = pictures.raster(2, { width: 40, height: 20, region, fit: "cover", background: "transparent" });
+    await tick(5);
+    const [m] = asked(f);
+    expect(m).toMatchObject({ type: "raster", session: 0, page: 2, options: { width: 40, height: 20, region, fit: "cover", background: "transparent" } });
+    // An answer to nothing asked is dropped (and its bitmap freed); the one asked for resolves.
+    const stray = new FakeBitmap(40, 20);
+    await f.inject(done(m.id + 100, stray));
+    expect(stray.closed).toBe(true);
+    const bitmap = new FakeBitmap(40, 20);
+    await f.inject(done(m.id, bitmap, { region: { x: 0.1, y: 0.2, width: 0.5, height: 0.25 } }));
+    expect(await drawn).toEqual({ bitmap, width: 40, height: 20, page: 2, space: "page", region: { x: 0.1, y: 0.2, width: 0.5, height: 0.25 } });
+    expect(bitmap.closed).toBe(false);
+  });
+
+  it("render a page by its longest side, and are null where a raster is an error", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    const drawn = pictures.render(2, 300);
+    await tick(5);
+    expect(asked(f)[0]).toMatchObject({ page: 2, options: { longEdge: 300 } });
+    await f.send({ type: "rastered", id: asked(f)[0].id, result: { ok: false, code: "failed" } });
+    expect(await drawn).toBeNull();
+  });
+
+  it("fail with the frame's own code, or as failed for a picture that is not the one asked for", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    const code = async (options: Parameters<typeof pictures.raster>[1], answer: (id: number) => unknown) => {
+      const p = pictures.raster(1, options).then(
+        () => "drawn",
+        (e) => (e as { code: string }).code,
+      );
+      await tick(5);
+      await f.inject(answer(asked(f).at(-1).id));
+      return p;
+    };
+    expect(await code({ longEdge: 10 }, (id) => ({ type: "rastered", id, result: { ok: false, code: "too-large" } }))).toBe("too-large");
+    expect(await code({ longEdge: 10 }, (id) => ({ type: "rastered", id, result: { ok: false, code: "nonsense" } }))).toBe("failed");
+    // Not the size asked for, the wrong space, past the long edge asked: freed, and failed.
+    for (const [options, bitmap, extra] of [
+      [{ width: 40, height: 20 }, new FakeBitmap(41, 20), {}],
+      [{ width: 40 }, new FakeBitmap(39, 20), {}],
+      [{ height: 20 }, new FakeBitmap(40, 21), {}],
+      [{ longEdge: 30 }, new FakeBitmap(31, 10), {}],
+      [{ longEdge: 30 }, new FakeBitmap(30, 10), { space: "drawing" }],
+    ] as const) {
+      expect(await code(options, (id) => done(id, bitmap, extra)), JSON.stringify([options, extra])).toBe("failed");
+      expect(bitmap.closed).toBe(true);
+    }
+    const good = new FakeBitmap(30, 10);
+    expect(await code({ longEdge: 30 }, (id) => done(id, good))).toBe("drawn");
+    expect(good.closed).toBe(false);
+  });
+
+  it("are stopped by the signal at once, the frame told, and a bitmap that comes later is freed", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    const abort = new AbortController();
+    const drawn = pictures.raster(1, { longEdge: 100, signal: abort.signal }).catch((e) => e.code);
+    await tick(5);
+    const id = asked(f)[0].id;
+    abort.abort();
+    expect(await drawn).toBe("aborted");
+    await tick(5);
+    expect(f.received.filter((m) => m.type === "unraster")).toEqual([{ type: "unraster", id }]);
+    const late = new FakeBitmap(100, 50);
+    await f.inject(done(id, late));
+    expect(late.closed).toBe(true);
+    // Already aborted: nothing is sent.
+    expect(await pictures.raster(1, { longEdge: 100, signal: abort.signal }).catch((e) => e.code)).toBe("aborted");
+    expect(asked(f)).toHaveLength(1);
+  });
+
+  it("are not asked beyond the limit, nor for what is no page, and end with the frame", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: { count: 99, space: "page" } }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    expect(await pictures.render(0, 300)).toBeNull();
+    expect(await pictures.render(1.5, 300)).toBeNull();
+    expect(await pictures.raster(100, { longEdge: 300 }).catch((e) => e.code)).toBe("invalid");
+    const waiting = Array.from({ length: MAX_DRAWS }, (_, i) => pictures.raster(i + 1, { longEdge: 100 }).catch((e) => e.code));
+    expect(await pictures.raster(50, { longEdge: 100 }).catch((e) => e.message)).toMatch(/more than 8 pictures/);
+    await tick(5);
+    expect(asked(f)).toHaveLength(MAX_DRAWS);
+    f.session.destroy();
+    expect(await Promise.all(waiting)).toEqual(Array(MAX_DRAWS).fill("aborted"));
+  });
+
+  it("are encoded by this page, from the bitmap the frame drew", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    // A type or a quality that is none is refused before the frame is asked.
+    expect(await pictures.toBlob(1, { longEdge: 10, type: "gif" as never }).catch((e) => e.code)).toBe("invalid");
+    expect(await pictures.toBlob(1, { longEdge: 10, quality: 2 }).catch((e) => e.code)).toBe("invalid");
+    expect(asked(f)).toHaveLength(0);
+    // jsdom has no canvas, so the encoding fails; the frame's bitmap is closed all the same.
+    const blob = pictures.toBlob(1, { longEdge: 10 }).catch((e) => e.code);
+    await tick(5);
+    const bitmap = new FakeBitmap(10, 5);
+    await f.inject(done(asked(f)[0].id, bitmap, { page: 1 }));
+    expect(await blob).toBe("too-large");
+    expect(bitmap.closed).toBe(true);
+  });
+
+  it("follow the viewport the frame reports, read-only", async () => {
+    const f = await mount({}, "report.pdf");
+    const viewport = { space: "page", page: 2, region: { x: 0, y: 0.5, width: 1, height: 0.5 } };
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE, viewport: null }, statics: {} });
+    const store = f.controllers().viewport!;
+    expect(store.get()).toBeNull();
+    await f.send({ type: "state", session: 0, key: "viewport", value: viewport });
+    expect(store.get()).toEqual(viewport);
+    await f.send({ type: "state", session: 0, key: "viewport", value: { ...viewport, space: "camera" } });
+    expect(store.get()).toEqual(viewport);
+    expect("set" in store).toBe(false);
+  });
+
+  it("fail as invalid where the frame refuses the request", async () => {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: PAGE }, statics: {} });
+    const pictures = f.controllers().pictures!;
+    const drawn = pictures.raster(1, { longEdge: 100 }).then(
+      () => "drawn",
+      (e) => e,
+    );
+    await tick(5);
+    await f.send({ type: "rastered", id: asked(f)[0].id, result: { ok: false, code: "invalid" } });
+    const error = await drawn;
+    expect(error).toMatchObject({ name: "RasterError", code: "invalid" });
+  });
+});
+
+describe("the viewport", () => {
+  const VIEW = { space: "page", page: 2, region: { x: 0, y: 0.5, width: 1, height: 0.5 } };
+  const told = (f: Frame) => f.received.filter((m) => m.type === "watch" || m.type === "unwatch");
+
+  async function withViewport() {
+    const f = await mount({}, "report.pdf");
+    await f.send({ type: "controllers", session: 0, values: { pictures: { count: 3, space: "page" }, viewport: null }, statics: {} });
+    return f;
+  }
+
+  it("is not asked of the frame by a session that does not use it", async () => {
+    const f = await withViewport();
+    expect(f.controllers().viewport).toBeDefined();
+    await f.send({ type: "state", session: 0, key: "zoom", value: { scale: 1, min: 0.5, max: 4 } });
+    expect(told(f)).toEqual([]);
+  });
+
+  it("is watched from the first listener to the last", async () => {
+    const f = await withViewport();
+    const store = f.controllers().viewport!;
+    const seen: unknown[] = [];
+    const a = store.subscribe((v) => seen.push(v));
+    await tick(5);
+    expect(told(f)).toEqual([{ type: "watch", session: 0, key: "viewport" }]);
+    const b = store.subscribe(() => {});
+    await f.send({ type: "state", session: 0, key: "viewport", value: VIEW });
+    expect(seen).toEqual([VIEW]);
+    a();
+    a();
+    await tick(5);
+    expect(told(f)).toHaveLength(1);
+    b();
+    await tick(5);
+    expect(told(f)).toEqual([
+      { type: "watch", session: 0, key: "viewport" },
+      { type: "unwatch", session: 0, key: "viewport" },
+    ]);
+    // Followed again later: watched again.
+    store.subscribe(() => {})();
+    await tick(5);
+    expect(told(f).map((m) => m.type)).toEqual(["watch", "unwatch", "watch", "unwatch"]);
+  });
+
+  it("is asked for once by a read with no listener, which has the last value the frame reported", async () => {
+    const f = await withViewport();
+    const store = f.controllers().viewport!;
+    expect(store.get()).toBeNull();
+    await tick(5);
+    expect(told(f).map((m) => m.type)).toEqual(["watch", "unwatch"]);
+    await f.send({ type: "state", session: 0, key: "viewport", value: VIEW });
+    expect(store.get()).toEqual(VIEW);
+    await tick(5);
+    expect(told(f)).toHaveLength(4);
+    // While it is followed, a read asks for nothing more.
+    const stop = store.subscribe(() => {});
+    store.get();
+    store.get();
+    await tick(5);
+    expect(told(f)).toHaveLength(5);
+    stop();
+  });
+
+  it("stays watched when the frame sends its controllers again, until the last listener of any of them leaves", async () => {
+    const f = await withViewport();
+    const first = f.controllers().viewport!;
+    const stopFirst = first.subscribe(() => {});
+    await f.send({ type: "controllers", session: 0, values: { pictures: { count: 3, space: "page" }, viewport: null }, statics: {} });
+    const second = f.controllers().viewport!;
+    expect(second).not.toBe(first);
+    // The new listener comes before the old one leaves.
+    const stopSecond = second.subscribe(() => {});
+    stopFirst();
+    await tick(5);
+    expect(told(f).map((m) => m.type)).toEqual(["watch"]);
+    stopSecond();
+    await tick(5);
+    expect(told(f).map((m) => m.type)).toEqual(["watch", "unwatch"]);
+  });
+
+  it("tells the frame nothing once the session has ended", async () => {
+    const f = await withViewport();
+    const store = f.controllers().viewport!;
+    const stop = store.subscribe(() => {});
+    await tick(5);
+    f.session.destroy();
+    stop();
+    store.get();
+    store.subscribe(() => {})();
+    await tick(5);
+    expect(told(f).map((m) => m.type)).toEqual(["watch"]);
+  });
+});
+
+describe("keys from the frame", () => {
+  const pressed = (f: Frame) => {
+    const keys: string[] = [];
+    f.iframe.ownerDocument.addEventListener("keydown", (e) => keys.push(`${e.key}${e.shiftKey ? "+shift" : ""}${e.target === f.iframe ? "" : "?"}`));
+    return keys;
+  };
+
+  it("reach this page's listeners from the frame element, when they are navigation keys", async () => {
+    const f = await mount();
+    const keys = pressed(f);
+    await f.send({ type: "key", key: "ArrowRight", shift: false, repeat: false });
+    await f.send({ type: "key", key: "Escape", shift: true, repeat: false });
+    // What could type or press a shortcut does not pass the check.
+    await f.send({ type: "key", key: "Delete", shift: false, repeat: false });
+    await f.send({ type: "key", key: "a", shift: false, repeat: false });
+    await f.send({ type: "key", key: "ArrowLeft" });
+    expect(keys).toEqual(["ArrowRight", "Escape+shift"]);
+  });
+
+  it(`are taken at most ${KEY_RATE} a second`, async () => {
+    const f = await mount();
+    const keys = pressed(f);
+    for (let i = 0; i < KEY_RATE + 10; i++) await f.send({ type: "key", key: "ArrowDown", shift: false, repeat: true });
+    expect(keys).toHaveLength(KEY_RATE);
+  });
+
+  it("are only those the host lists, or none", async () => {
+    const some = await mount({ keys: ["Escape"] });
+    const someKeys = pressed(some);
+    await some.send({ type: "key", key: "ArrowRight", shift: false, repeat: false });
+    await some.send({ type: "key", key: "Escape", shift: false, repeat: false });
+    expect(someKeys).toEqual(["Escape"]);
+    const none = await mount({ keys: false });
+    const noneKeys = pressed(none);
+    await none.send({ type: "key", key: "Escape", shift: false, repeat: false });
+    expect(noneKeys).toEqual([]);
+  });
+});
+
+describe("the theme", () => {
+  it("goes with the file, checked, and again on restyle", async () => {
+    const theme = { tokens: { "--exav-viewer-text": "#123456", "--exav-viewer-panel": "url(https://x.test/)", "--exav-viewer-radius": "4px" }, scheme: "dark" } as unknown as FrameTheme;
+    const viewer = createSandboxedViewer({ url: "https://frame.test/index.html", theme });
+    const f = await mountWith(viewer);
+    const open = f.received.find((m) => m.type === "open");
+    expect(open.theme).toEqual({ tokens: { "--exav-viewer-text": "#123456", "--exav-viewer-radius": "4px" }, scheme: "dark" });
+    viewer.restyle();
+    await tick(5);
+    expect(f.received.filter((m) => m.type === "theme")).toEqual([{ type: "theme", theme: open.theme }]);
+    // A frame that has ended is not restyled.
+    f.session.destroy();
+    viewer.restyle();
+    await tick(5);
+    expect(f.received.filter((m) => m.type === "theme")).toHaveLength(1);
+  });
+
+  it("is none with null", async () => {
+    const f = await mount({ theme: null });
+    expect(f.received.find((m) => m.type === "open").theme).toEqual({ tokens: {}, scheme: null });
+  });
 });
 
 describe("links", () => {
@@ -310,6 +710,68 @@ function heldRanges(size: number) {
 
 const answer = (f: Frame, id: number) => f.received.find((m) => m.type === "bytes" && m.id === id);
 
+describe("the files around the one shown", () => {
+  const files: Record<string, Uint8Array> = { "site/title.dwg": new Uint8Array([7, 8, 9]), "site/big.bin": new Uint8Array(TREE.maxFileBytes + 1) };
+  const opened: string[] = [];
+  const tree = (): FileTree => ({
+    path: "site/plan.dwg",
+    paths: ["site/plan.dwg", ...Object.keys(files), "site/gone.dwg"],
+    async open(path) {
+      opened.push(path);
+      const bytes = files[path];
+      if (!bytes) throw new Error("gone");
+      return { bytes };
+    },
+  });
+  const mountTree = () => mountWith(createSandboxedViewer({ url: "https://frame.test/index.html" }), "plan.dwg", true, { bytes: new Uint8Array([1]) }, null, tree());
+
+  it("are listed to the frame with the file", async () => {
+    const f = await mountTree();
+    expect(f.received.find((m) => m.type === "open").tree).toEqual({ path: "site/plan.dwg", paths: ["site/plan.dwg", "site/title.dwg", "site/big.bin", "site/gone.dwg"] });
+    const alone = await mount();
+    expect("tree" in alone.received.find((m) => m.type === "open")).toBe(false);
+  });
+
+  it("are given whole when the frame asks for one it was told of, and for no other", async () => {
+    opened.length = 0;
+    const f = await mountTree();
+    await f.send({ type: "fetch", id: 1, path: "site/title.dwg" });
+    expect([...new Uint8Array(answer(f, 1).data)]).toEqual([7, 8, 9]);
+    // Not in the list, and not a path of the list in another spelling: never opened.
+    await f.send({ type: "fetch", id: 2, path: "site/secret.dwg" });
+    await f.send({ type: "fetch", id: 3, path: "SITE/TITLE.DWG" });
+    expect(answer(f, 2)).toEqual({ type: "bytes", id: 2, error: "refused" });
+    expect(answer(f, 3)).toEqual({ type: "bytes", id: 3, error: "refused" });
+    expect(opened).toEqual(["site/title.dwg"]);
+    // Listed and unreadable, or past the size the host reads for the frame.
+    await f.send({ type: "fetch", id: 4, path: "site/gone.dwg" });
+    await f.send({ type: "fetch", id: 5, path: "site/big.bin" });
+    expect(answer(f, 4)).toEqual({ type: "bytes", id: 4, error: "failed" });
+    expect(answer(f, 5)).toEqual({ type: "bytes", id: 5, error: "refused" });
+  });
+
+  it("are refused to a file that has none", async () => {
+    const f = await mount();
+    await f.send({ type: "fetch", id: 1, path: "site/title.dwg" });
+    expect(answer(f, 1)).toEqual({ type: "bytes", id: 1, error: "refused" });
+  });
+
+  it("are read once for an id in use, and no more once the fetch is cancelled", async () => {
+    const signals: AbortSignal[] = [];
+    const slow: FileTree = { path: "a.dwg", paths: ["a.dwg", "b.dwg"], open: (_p, s) => (signals.push(s), new Promise(() => undefined)) };
+    const f = await mountWith(createSandboxedViewer({ url: "https://frame.test/index.html" }), "a.dwg", true, { bytes: new Uint8Array([1]) }, null, slow);
+    await f.send({ type: "fetch", id: 9, path: "b.dwg" });
+    await f.send({ type: "fetch", id: 9, path: "b.dwg" });
+    expect(signals).toHaveLength(1);
+    await f.send({ type: "cancel", id: 9 });
+    expect(signals[0]!.aborted).toBe(true);
+    // The ones that stay open are limited as reads are.
+    for (let i = 0; i < READS.maxReads; i++) await f.send({ type: "fetch", id: 100 + i, path: "b.dwg" });
+    await f.send({ type: "fetch", id: 200, path: "b.dwg" });
+    expect(answer(f, 200)).toEqual({ type: "bytes", id: 200, error: "refused" });
+  });
+});
+
 describe("a file read by ranges", () => {
   it("gives the frame its size and first bytes, then what it asks within the file and the limits", async () => {
     const size = 100 * 1024 * 1024;
@@ -328,25 +790,25 @@ describe("a file read by ranges", () => {
       [3, 0, 0],
       [4, 0, READS.maxLength + 1],
     ];
-    for (const [id, offset, length] of refusals) await f.send({ type: "read", id, offset, length });
+    for (const [id, offset, length] of refusals) await f.send({ type: "read", id, generation: 0, offset, length });
     for (const [id] of refusals) expect(answer(f, id), String(id)).toEqual({ type: "bytes", id, error: "refused" });
     expect(held.reads).toHaveLength(0);
 
     // As many bytes at once as the limit: the next is refused until one is answered.
     const big = READS.maxBytes / READS.maxLength;
-    for (let i = 0; i < big; i++) await f.send({ type: "read", id: 10 + i, offset: (i + 1) * READS.maxLength, length: READS.maxLength });
+    for (let i = 0; i < big; i++) await f.send({ type: "read", id: 10 + i, generation: 0, offset: (i + 1) * READS.maxLength, length: READS.maxLength });
     expect(held.reads).toHaveLength(big);
-    await f.send({ type: "read", id: 20, offset: 0, length: 1 });
+    await f.send({ type: "read", id: 20, generation: 0, offset: 0, length: 1 });
     expect(answer(f, 20)).toEqual({ type: "bytes", id: 20, error: "refused" });
     held.reads[0]!.release();
     await tick(5);
     expect(same(answer(f, 10).data, pattern(READS.maxLength, READS.maxLength))).toBe(true);
     // As many reads at once as the limit.
-    for (let i = 0; i < READS.maxReads - (big - 1); i++) await f.send({ type: "read", id: 30 + i, offset: 1000 + i, length: 1 });
-    await f.send({ type: "read", id: 40, offset: 0, length: 1 });
+    for (let i = 0; i < READS.maxReads - (big - 1); i++) await f.send({ type: "read", id: 30 + i, generation: 0, offset: 1000 + i, length: 1 });
+    await f.send({ type: "read", id: 40, generation: 0, offset: 0, length: 1 });
     expect(answer(f, 40)).toEqual({ type: "bytes", id: 40, error: "refused" });
     // An id in use is not read twice.
-    await f.send({ type: "read", id: 30, offset: 5, length: 1 });
+    await f.send({ type: "read", id: 30, generation: 0, offset: 5, length: 1 });
     expect(held.reads.filter((r) => r.offset === 5)).toHaveLength(0);
 
     // A cancelled read stops, and is answered.
@@ -361,9 +823,120 @@ describe("a file read by ranges", () => {
   it("is the only file a read is answered for", async () => {
     const f = await mount();
     expect(f.received.find((m) => m.type === "open").source.kind).toBe("blob");
-    await f.send({ type: "read", id: 1, offset: 0, length: 1 });
+    await f.send({ type: "read", id: 1, generation: 0, offset: 0, length: 1 });
     expect(answer(f, 1)).toEqual({ type: "bytes", id: 1, error: "refused" });
   });
+
+  it("is read for the document it names: after a replacement the old one's reads are refused, and the new one's answered from its bytes", async () => {
+    const size = 100 * 1024 * 1024;
+    const first = heldRanges(size);
+    const second = heldRanges(size + 1);
+    const f = await mount({}, "big.pdf", true, { ranges: first.ranges });
+    const replacing = f.session.replace({ id: "f1", name: "big.pdf", source: { ranges: second.ranges } });
+    await tick(5);
+    const message = f.received.find((m) => m.type === "replace");
+    expect(message).toMatchObject({ type: "replace", generation: 1, file: { name: "big.pdf", format: "pdf" }, source: { kind: "ranges", size: size + 1 } });
+    // Both alive until the frame answers: the document being replaced is still drawn from its own bytes.
+    await f.send({ type: "read", id: 1, generation: 0, offset: size - 5, length: 5 });
+    await f.send({ type: "read", id: 2, generation: 1, offset: size, length: 1 });
+    expect(first.reads.map((r) => r.offset)).toEqual([size - 5]);
+    expect(second.reads.map((r) => r.offset)).toEqual([size]);
+    await f.send({ type: "replaced", call: message.call, ok: true });
+    expect(await replacing).toBe(true);
+    // Now only the new one: the old generation, and one that was never given, are refused.
+    await f.send({ type: "read", id: 3, generation: 0, offset: 0, length: 1 });
+    await f.send({ type: "read", id: 4, generation: 7, offset: 0, length: 1 });
+    expect(answer(f, 3)).toEqual({ type: "bytes", id: 3, error: "refused" });
+    expect(answer(f, 4)).toEqual({ type: "bytes", id: 4, error: "refused" });
+    await f.send({ type: "read", id: 5, generation: 1, offset: size, length: 1 });
+    expect(second.reads.map((r) => r.offset)).toEqual([size, size]);
+    expect(first.reads.every((r) => r.signal.aborted === false)).toBe(true);
+  });
+});
+
+describe("replacing the document in the frame", () => {
+  const replacements = (f: Frame) => f.received.filter((m) => m.type === "replace");
+  const next = (name = "plan.dwg", bytes = [4, 5, 6]) => ({ id: "f1", name, source: { bytes: new Uint8Array(bytes) } });
+
+  it("sends the next file, and resolves true once the frame has shown it, with the file on the session", async () => {
+    const f = await mount();
+    const first = f.session.file;
+    const done = f.session.replace({ ...next(), type: "image/vnd.dwg" });
+    await tick(5);
+    const [m] = replacements(f);
+    expect(m).toMatchObject({ type: "replace", generation: 1, file: { name: "plan.dwg", type: "image/vnd.dwg", path: "plan.dwg", format: "dwg" }, source: { kind: "blob" } });
+    // Not the session's file until the frame has taken it.
+    expect(f.session.file).toBe(first);
+    await f.send({ type: "replaced", call: m.call, ok: true });
+    expect(await done).toBe(true);
+    expect(f.session.file.type).toBe("image/vnd.dwg");
+  });
+
+  it("resolves false and changes nothing when the frame cannot, and for what is no replacement", async () => {
+    const f = await mount();
+    const first = f.session.file;
+    const refused = f.session.replace(next());
+    await tick(5);
+    await f.send({ type: "replaced", call: replacements(f)[0].call, ok: false });
+    expect(await refused).toBe(false);
+    expect(f.session.file).toBe(first);
+    // Another format, or no bytes: the caller starts over, and the frame is not asked.
+    expect(await f.session.replace({ id: "f1", name: "report.pdf", source: { bytes: new Uint8Array(1) } })).toBe(false);
+    expect(await f.session.replace({ id: "f1", name: "plan.dwg", source: null })).toBe(false);
+    expect(replacements(f)).toHaveLength(1);
+  });
+
+  it("is refused before the frame has the first file, and after the session ended", async () => {
+    const early = await mount({}, "plan.dwg", false);
+    expect(await early.session.replace(next())).toBe(false);
+    const f = await mount();
+    const pending = f.session.replace(next());
+    await tick(5);
+    f.session.destroy();
+    expect(await pending).toBe(false);
+    expect(await f.session.replace(next())).toBe(false);
+  });
+
+  it("is one at a time: a newer call supersedes one still being read, and waits for one the frame has", async () => {
+    const f = await mount();
+    const one = f.session.replace(next("plan.dwg", [1]));
+    await tick(5);
+    expect(replacements(f)).toHaveLength(1);
+    // Two more while the first is with the frame: only the last is sent after it.
+    const two = f.session.replace(next("plan.dwg", [2]));
+    const three = f.session.replace(next("plan.dwg", [3]));
+    await tick(5);
+    expect(replacements(f)).toHaveLength(1);
+    await f.send({ type: "replaced", call: replacements(f)[0].call, ok: true });
+    await tick(5);
+    expect(replacements(f)).toHaveLength(2);
+    await f.send({ type: "replaced", call: replacements(f)[1].call, ok: true });
+    expect(await Promise.all([one, two, three])).toEqual([true, true, true]);
+    expect(replacements(f).map((m) => m.generation)).toEqual([1, 2]);
+  });
+
+  it("is not sent a delivery the frame was not made for: an image first given by URL stays a URL", async () => {
+    const origins = { media: ["https://media.test"] };
+    const viewer = createSandboxedViewer({ url: "https://frame.test/index.html", delivery: { images: "url" }, origins });
+    const f = await mountWith(viewer, "a.png", true, { url: "https://media.test/a.png" }, readPolicy(frameCsp(undefined, origins)));
+    expect(f.received.find((m) => m.type === "open").source.kind).toBe("url");
+    const blob = f.session.replace({ id: "f1", name: "a.png", source: { bytes: new Uint8Array([1]) } });
+    expect(await blob).toBe(false);
+    expect(replacements(f)).toHaveLength(0);
+    const url = f.session.replace({ id: "f1", name: "a.png", source: { url: "https://media.test/b.png" } });
+    await tick(5);
+    expect(replacements(f)[0]).toMatchObject({ source: { kind: "url", url: "https://media.test/b.png" } });
+    await f.send({ type: "replaced", call: replacements(f)[0].call, ok: true });
+    expect(await url).toBe(true);
+  });
+
+  it("is shown as an error, the old document staying, when the next one cannot be read", async () => {
+    const f = await mount();
+    const failing: FileSource = { resolve: async () => Promise.reject(new Error("offline")) };
+    expect(await f.session.replace({ id: "f1", name: "plan.dwg", source: failing })).toBe(true);
+    expect(f.session.status.get()).toMatchObject({ phase: "error", error: { code: "drawing" } });
+    expect(replacements(f)).toHaveLength(0);
+  });
 });
 
 describe("delivery by URL", () => {
diff --git a/crates/exav-viewer/ts/frame/index.ts b/crates/exav-viewer/ts/frame/index.ts
index 0d155295..9b3ef1a9 100644
--- a/crates/exav-viewer/ts/frame/index.ts
+++ b/crates/exav-viewer/ts/frame/index.ts
@@ -12,8 +12,12 @@
  * store, since the frame runs the code a hostile file would attack.
  */
 import { createDetector } from "../core/detect.js";
-import { BUILTIN_ORDER, MATCHERS, WASM_IMAGES } from "../core/formats.js";
+import { BUILTIN_ORDER, CONVERTED_FORMATS, MATCHERS, WASM_IMAGES } from "../core/formats.js";
+import { asRasterError, isPage, MAX_PICTURE_EDGE, MAX_PICTURE_PIXELS, RasterError } from "../core/pictures.js";
+import { picturesOver } from "../core/raster.js";
+import { createSourceReader } from "../core/source.js";
 import { derived, writable, type Store, type WritableStore } from "../core/store.js";
+import { checkTheme, themeOf, type FrameTheme } from "../core/theme.js";
 import type {
   ArchiveController,
   ArchiveMember,
@@ -22,6 +26,8 @@ import type {
   FormatId,
   FormatMatcher,
   OutlineEntry,
+  Raster,
+  RasterOptions,
   Session,
   Status,
   Viewer,
@@ -35,7 +41,11 @@ import {
   checkFrameMessage,
   HELLO,
   linkTarget,
+  MAX_DRAWS,
+  NAV_KEYS,
   PROTOCOL,
+  READS,
+  TREE,
   type ArchiveSnapshot,
   type BytesMessage,
   type CommandMessage,
@@ -43,14 +53,24 @@ import {
   type ControllerKey,
   type FrameMessage,
   type FrameOptions,
+  type NavKey,
   type OpenMessage,
   type OpenSource,
+  type RasterMessage,
+  type RasterResult,
+  type ReplaceMessage,
   type Snapshots,
   type Statics,
   type StatusSnapshot,
+  type ThemeMessage,
+  type UnrasterMessage,
+  type WatchedKey,
+  type WatchMessage,
 } from "./protocol.js";
 
-export type { FrameOptions } from "./protocol.js";
+export type { FrameOptions, NavKey } from "./protocol.js";
+export { NAV_KEYS } from "./protocol.js";
+export type { FrameTheme } from "../core/theme.js";
 export type { Delivery } from "./delivery.js";
 export { FRAME_CSP, FRAME_PERMISSIONS, frameCsp, frameHeaders, type FrameOrigins } from "./policy.js";
 
@@ -61,7 +81,13 @@ export interface SandboxConfig {
    * registrable domain of its own that sets no cookies.
    */
   url: string;
-  /** The formats the frame opens, in detection order. Default: every built-in one. */
+  /**
+   * The formats the frame opens, in detection order. Default: every built-in
+   * one but `CONVERTED_FORMATS`, which are named to be opened (and which
+   * need the frame built with an external converter for what the package's
+   * own converters do not read, `externalConverter`): `BUILTIN_ORDER` names
+   * them all.
+   */
   formats?: readonly BuiltinFormat[];
   /** Plugin options, as plain data. */
   options?: FrameOptions;
@@ -86,15 +112,46 @@ export interface SandboxConfig {
    * reports its policy when it starts: one that differs is refused.
    */
   origins?: FrameOrigins;
+  /**
+   * The keys handed back from the frame when the document does not use them
+   * (`NAV_KEYS`, by default all of them), dispatched as a `keydown` on the
+   * `<iframe>` that bubbles to this page's listeners. `false`: none. They
+   * come from the frame: at most `KEY_RATE` a second, never a key with a
+   * modifier but Shift, and `isTrusted` false.
+   */
+  keys?: readonly NavKey[] | false;
+  /**
+   * The frame's colours and sizes (`TOKENS`): "inherit" (default) reads the
+   * values in force where each file is mounted, so the page's own CSS
+   * custom properties reach the frame; a theme sets them; null leaves the
+   * frame's defaults. Read again on `restyle()`, and when the device's
+   * colour scheme changes.
+   */
+  theme?: "inherit" | FrameTheme | null;
+}
+
+/** A `Viewer` whose files run in sandboxed frames. */
+export interface SandboxedViewer extends Viewer {
+  /** Sends the theme again to every frame shown: after the page's theme changed. */
+  restyle(): void;
 }
 
+/** Keys taken from a frame in one second, at most. */
+export const KEY_RATE = 30;
+
 const ALL: readonly BuiltinFormat[] = BUILTIN_ORDER;
+/** The converted formats only when named: they need the converter. */
+const DEFAULT: readonly BuiltinFormat[] = ALL.filter((f) => !CONVERTED_FORMATS.includes(f));
 
 function matcher(id: BuiltinFormat): FormatMatcher {
   if (id !== "image") return MATCHERS[id];
   // The frame decodes what browsers do not draw.
-  const a = MATCHERS.image;
-  return { types: [...(a.types ?? []), ...(WASM_IMAGES.types ?? [])], extensions: [...(a.extensions ?? []), ...(WASM_IMAGES.extensions ?? [])] };
+  const all = [MATCHERS.image, WASM_IMAGES];
+  return {
+    types: all.flatMap((m) => m.types ?? []),
+    extensions: all.flatMap((m) => m.extensions ?? []),
+    extensionOverrides: all.flatMap((m) => m.extensionOverrides ?? []),
+  };
 }
 
 function toStatus(s: StatusSnapshot): Status {
@@ -103,12 +160,29 @@ function toStatus(s: StatusSnapshot): Status {
 
 const defaultConfirm = (url: string) => window.confirm(`Open this link in a new tab?\n\n${url}`);
 
+/**
+ * Why a picture from the frame is not the one asked for, or null. The size
+ * it was asked at is a promise the frame must keep: the host does not take
+ * a bitmap of another size for it.
+ */
+export function rasterMismatch(asked: Omit<RasterOptions, "signal">, got: Extract<RasterResult, { ok: true }>, space: string): string | null {
+  if (got.space !== space) return `a picture in the space ${got.space}, not ${space}`;
+  if (got.width > MAX_PICTURE_EDGE || got.height > MAX_PICTURE_EDGE || got.width * got.height > MAX_PICTURE_PIXELS) return "a picture past the limits";
+  const whole = (n: number) => Math.max(1, Math.round(n));
+  if (asked.width !== undefined && got.width !== whole(asked.width)) return `a picture ${got.width} px wide, not ${whole(asked.width)}`;
+  if (asked.height !== undefined && got.height !== whole(asked.height)) return `a picture ${got.height} px high, not ${whole(asked.height)}`;
+  if (asked.longEdge !== undefined && Math.max(got.width, got.height) > whole(asked.longEdge)) return `a picture longer than the ${whole(asked.longEdge)} px asked`;
+  return null;
+}
+
 /** The viewer's `plugins` are empty: they live in the frame. */
-export function createSandboxedViewer(config: SandboxConfig): Viewer {
+export function createSandboxedViewer(config: SandboxConfig): SandboxedViewer {
   checkDelivery(config.delivery, config.origins);
-  const formats = (config.formats ?? ALL).filter((f) => ALL.includes(f));
+  const formats = (config.formats ?? DEFAULT).filter((f) => ALL.includes(f));
   const detector = createDetector(formats.map((id) => ({ id, match: matcher(id) })));
-  const mount = (host: HTMLElement, file: ViewerFile): Session => mountFrame(config, formats, detector.detect(file), host, file);
+  /** Each frame shown, by what sends it its theme again. */
+  const shown = new Set<() => void>();
+  const mount = (host: HTMLElement, file: ViewerFile): Session => mountFrame(config, formats, detector.detect, host, file, shown);
   return {
     ...detector,
     plugins: [],
@@ -116,24 +190,48 @@ export function createSandboxedViewer(config: SandboxConfig): Viewer {
     mount,
     // The frame fetches its engines itself, from its own origin.
     prefetch: async () => {},
+    restyle: () => {
+      for (const restyle of shown) restyle();
+    },
   };
 }
 
+/** The theme for a frame in `host`, as `config.theme` says. */
+function themeFor(config: SandboxConfig, host: HTMLElement): FrameTheme {
+  const theme = config.theme === undefined ? "inherit" : config.theme;
+  if (theme === null) return { tokens: {}, scheme: null };
+  return theme === "inherit" ? themeOf(host) : checkTheme(theme);
+}
+
 interface Proxy {
   session: Session;
   status: WritableStore<Status>;
   controllers: WritableStore<Controllers>;
   stores: Partial<{ [K in ControllerKey]: WritableStore<Snapshots[K]> }>;
+  /** Listeners on the stores the frame follows only on request, over all the controllers the session has had. */
+  watchers: Record<WatchedKey, number>;
 }
 
-function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], detected: FormatId | null, host: HTMLElement, file: ViewerFile): Session {
-  const format = file.format ?? detected;
+function mountFrame(
+  config: SandboxConfig,
+  formats: readonly BuiltinFormat[],
+  detect: (file: ViewerFile) => FormatId | null,
+  host: HTMLElement,
+  file: ViewerFile,
+  shown: Set<() => void>,
+): Session {
+  const format = file.format ?? detect(file);
   const known = formats.find((f) => f === format) ?? null;
   const abort = new AbortController();
   let ended = false;
   /** The file as the frame will get it, read from the start. */
   let prepared: Promise<Prepared> | null = null;
-  let ranges: Extract<Prepared, { kind: "ranges" }>["ranges"] | null = null;
+  /** The file on screen: the one `replace` last took. */
+  let current = file;
+  /** The bytes of each file read by ranges that is alive, by the number the frame names it with (0 is the first). */
+  const documents = new Map<number, Extract<Prepared, { kind: "ranges" }>["ranges"]>();
+  /** How the first file was delivered: what the frame's engines were made for. */
+  let firstKind: Prepared["kind"] | null = null;
   /** The frame's reads not answered yet. */
   const reads = new Map<number, { length: number; abort: AbortController }>();
   let outstanding = 0;
@@ -145,6 +243,23 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
   let nextCall = 1;
   const pending = new Map<number, () => void>();
   const sessions = new Map<number, Proxy>();
+  /** Pictures asked of the frame, not drawn yet, with what each was asked for. */
+  const draws = new Map<number, { options: RasterOptions; space: string | null; done: (result: RasterResult) => void }>();
+  let nextDraw = 1;
+  /** Documents sent to replace the one shown, not answered yet (`replace`). */
+  const replacements = new Map<number, (ok: boolean) => void>();
+  /** Whether the frame has been given the file: only then can it take another. */
+  let started = false;
+  /** The newest `replace` call, and the one before it still to be answered. */
+  let latest = 0;
+  let superseding: AbortController | null = null;
+  let answered: Promise<unknown> = Promise.resolve();
+  let lastDocument = 0;
+  const keys = new Set<string>(config.keys === false ? [] : (config.keys ?? NAV_KEYS));
+  /** When the keys of the last second came. */
+  let keyTimes: number[] = [];
+  const restyle = () => port?.postMessage({ type: "theme", theme: themeFor(config, host) } satisfies ThemeMessage);
+  const scheme = typeof matchMedia === "function" ? matchMedia("(prefers-color-scheme: dark)") : null;
 
   const proxy = (id: number, info: { file: ViewerFile; format: FormatId | null }): Proxy => {
     const status = writable<Status>({ phase: "loading" });
@@ -153,13 +268,16 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
       status,
       controllers,
       stores: {},
+      watchers: { viewport: 0 },
       session: {
-        file: info.file,
+        get file() {
+          return id === 0 ? current : info.file;
+        },
         format: info.format,
         status,
         controllers,
-        // A frame holds one file: the next document gets a new frame.
-        replace: async () => false,
+        // A member shown by an archive is replaced by opening another.
+        replace: id === 0 ? (next) => replace(next) : async () => false,
         resize: () => {},
         // A member is closed through its archive's `back`.
         destroy: id === 0 ? () => end() : () => {},
@@ -190,6 +308,14 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
     port = null;
     for (const resolve of pending.values()) resolve();
     pending.clear();
+    for (const { done } of draws.values()) done({ ok: false, code: "aborted" });
+    draws.clear();
+    for (const resolve of replacements.values()) resolve(false);
+    replacements.clear();
+    superseding?.abort();
+    documents.clear();
+    shown.delete(restyle);
+    scheme?.removeEventListener("change", restyle);
   };
 
   const end = () => {
@@ -203,9 +329,10 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
   const reply = (m: BytesMessage) => port?.postMessage(m, "data" in m ? [m.data] : []);
 
   /** A read the frame asked for: checked, then answered with the bytes or a refusal. */
-  const read = (id: number, offset: number, length: number) => {
+  const read = (id: number, generation: number, offset: number, length: number) => {
     // An id already in use is the frame's confusion: its first read stands.
     if (reads.has(id)) return;
+    const ranges = documents.get(generation);
     const why = ranges ? readRefusal({ offset, length }, ranges.size, { count: reads.size, bytes: outstanding }) : "the file is not read by ranges";
     if (why) {
       // Said once: a frame could ask a thousand times.
@@ -237,6 +364,43 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
       });
   };
 
+  /**
+   * A whole file of the tree the frame was told of, answered with its bytes.
+   * Only a path the host listed is read: the frame names no other file.
+   */
+  const fetchFile = (id: number, path: string) => {
+    if (reads.has(id)) return;
+    const tree = current.tree;
+    const refuse = (why: string) => {
+      if (!refusedOnce) console.warn(`${format ?? "viewer"}: a file asked for by the sandboxed frame refused: ${why}`);
+      refusedOnce = true;
+      reply({ type: "bytes", id, error: "refused" });
+    };
+    if (!tree || !tree.paths.slice(0, TREE.maxPaths).includes(path)) return refuse("it is not in the tree");
+    if (reads.size >= READS.maxReads) return refuse("too many reads at once");
+    const own = new AbortController();
+    reads.set(id, { length: 0, abort: own });
+    const signal = AbortSignal.any([abort.signal, own.signal]);
+    let opened: ReturnType<typeof createSourceReader> | undefined;
+    void (async (): Promise<BytesMessage> => {
+      opened = createSourceReader(await tree.open(path, signal), signal);
+      const bytes = await opened.bytes();
+      if (bytes.byteLength > TREE.maxFileBytes) return { type: "bytes", id, error: "refused" };
+      // Its own buffer, to transfer: the source may keep the one it read.
+      return { type: "bytes", id, data: bytes.slice().buffer as ArrayBuffer };
+    })()
+      .catch((error): BytesMessage => {
+        if (!abort.signal.aborted && !own.signal.aborted) console.warn(`${format ?? "viewer"}: a file for the sandboxed frame could not be read`, error);
+        return { type: "bytes", id, error: "failed" };
+      })
+      .then((m) => {
+        opened?.dispose();
+        if (reads.get(id)?.abort !== own) return;
+        reads.delete(id);
+        reply(m);
+      });
+  };
+
   const command = (session: number, target: CommandTarget, action: string, args: unknown[] = []) =>
     new Promise<void>((resolve) => {
       if (!port) return resolve();
@@ -246,6 +410,44 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
       port.postMessage(message);
     });
 
+  /**
+   * A picture of a page, from the frame. Rejects with a `RasterError`: the
+   * frame's own, or "failed" when too many are being drawn, the frame ends
+   * first, or what it sent is not what was asked for.
+   */
+  const draw = (session: number, page: number, options: RasterOptions, space: string): Promise<Raster> =>
+    new Promise<Raster>((resolve, reject) => {
+      const { signal, ...plain } = options;
+      if (!port || signal?.aborted) return reject(new RasterError("aborted", "aborted"));
+      if (draws.size >= MAX_DRAWS) return reject(new RasterError("failed", `more than ${MAX_DRAWS} pictures at once`));
+      const id = nextDraw++;
+      let settled = false;
+      const onAbort = () => {
+        if (settled) return;
+        settled = true;
+        reject(new RasterError("aborted", "aborted"));
+        // The slot stays taken until the frame answers: a frame that never does cannot be asked for more.
+        port?.postMessage({ type: "unraster", id } satisfies UnrasterMessage);
+      };
+      const done = (result: RasterResult) => {
+        signal?.removeEventListener("abort", onAbort);
+        const bitmap = result.ok ? result.bitmap : null;
+        if (settled) return bitmap?.close();
+        settled = true;
+        if (!result.ok) return reject(new RasterError(result.code));
+        const wrong = rasterMismatch(plain, result, space);
+        if (wrong) {
+          result.bitmap.close();
+          return reject(new RasterError("failed", wrong));
+        }
+        const { ok: _ok, ...raster } = result;
+        resolve(raster);
+      };
+      signal?.addEventListener("abort", onAbort, { once: true });
+      draws.set(id, { options: plain, space, done });
+      port.postMessage({ type: "raster", id, session, page, options: plain } satisfies RasterMessage);
+    });
+
   /** The member session each archive session shows. */
   const children = new Map<number, number>();
   const forget = (id: number) => {
@@ -278,12 +480,53 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
   };
 
   /** What the host itself has to say about the file, after the frame's warnings. */
-  let hostWarnings: readonly { key: string; count: number }[] = [];
+  let hostWarnings: Snapshots["warnings"] = [];
+  /** The frame's own warnings for the file shown, as the frame sent them. */
+  let frameWarnings: Store<Snapshots["warnings"]> | null = null;
   const withHostWarnings = (id: number, frame: Store<Snapshots["warnings"]> | null): Store<Snapshots["warnings"]> | null => {
+    if (id === 0) frameWarnings = frame;
     if (id !== 0 || hostWarnings.length === 0) return frame;
     const own = hostWarnings;
     return frame ? derived(frame, (w) => [...w, ...own]) : writable(own);
   };
+  const setHostWarnings = (next: Snapshots["warnings"]) => {
+    hostWarnings = next;
+    root.controllers.update(({ warnings: _, ...rest }) => {
+      const w = withHostWarnings(0, frameWarnings);
+      return w ? { ...rest, warnings: w } : rest;
+    });
+  };
+
+  const watch = (session: number, type: WatchMessage["type"], key: WatchedKey) => port?.postMessage({ type, session, key } satisfies WatchMessage);
+
+  /**
+   * A store the frame follows only while someone listens (`WatchMessage`): it
+   * is watched from the first listener to the last, over all the controllers
+   * the session has. A read with no listener asks the frame to report it once
+   * and returns the last value it reported: the answer is for the next read.
+   */
+  const watchedStore = <K extends WatchedKey>(id: number, key: K, store: WritableStore<Snapshots[K]>): Store<Snapshots[K]> => ({
+    get() {
+      const p = sessions.get(id);
+      if (p && p.watchers[key] === 0) {
+        watch(id, "watch", key);
+        watch(id, "unwatch", key);
+      }
+      return store.get();
+    },
+    subscribe(listener) {
+      const p = sessions.get(id);
+      if (p && p.watchers[key]++ === 0) watch(id, "watch", key);
+      const unsubscribe = store.subscribe(listener);
+      let left = false;
+      return () => {
+        if (left) return;
+        left = true;
+        unsubscribe();
+        if (p && --p.watchers[key] === 0) watch(id, "unwatch", key);
+      };
+    },
+  });
 
   const buildControllers = (id: number, values: Partial<Snapshots>, statics: Statics): Controllers => {
     const p = sessions.get(id)!;
@@ -342,6 +585,19 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
           void command(id, "layers", "setAll", [visible]);
         },
       };
+    const storeys = store("storeys");
+    if (storeys)
+      c.storeys = {
+        ...storeys,
+        setVisible: (storey, visible) => {
+          storeys.update((s) => ({ ...s, items: s.items.map((i) => (i.id === storey ? { ...i, visible } : i)) }));
+          void command(id, "storeys", "setVisible", [storey, visible]);
+        },
+        setAll: (visible) => {
+          storeys.update((s) => ({ ...s, items: s.items.map((i) => ({ ...i, visible })) }));
+          void command(id, "storeys", "setAll", [visible]);
+        },
+      };
     const layouts = store("layouts");
     if (layouts) c.layouts = { ...layouts, select: (layout) => command(id, "layouts", "select", [layout]) };
     const ground = store("ground");
@@ -360,6 +616,23 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
     if (info) c.info = info;
     const warnings = withHostWarnings(id, store("warnings"));
     if (warnings) c.warnings = warnings;
+    const media = store("media");
+    if (media)
+      c.media = {
+        ...media,
+        play: () => command(id, "media", "play"),
+        pause: () => void command(id, "media", "pause"),
+        seek: (seconds) => void command(id, "media", "seek", [seconds]),
+        setVolume: (volume) => void command(id, "media", "setVolume", [volume]),
+        setMuted: (muted) => void command(id, "media", "setMuted", [muted]),
+        setRate: (rate) => void command(id, "media", "setRate", [rate]),
+      };
+    const sheets = store("sheets");
+    if (sheets) c.sheets = { ...sheets, select: (index) => command(id, "sheets", "select", [index]) };
+    const pictures = store("pictures");
+    if (pictures) c.pictures = picturesOver(pictures, (page, options) => draw(id, page, options, pictures.get().space));
+    const viewport = store("viewport");
+    if (viewport) c.viewport = watchedStore(id, "viewport", viewport);
     const archive = store("archive");
     if (archive) {
       const state = writable(archiveState(id, archive.get()));
@@ -387,7 +660,9 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
         return;
       }
       case "read":
-        return read(message.id, message.offset, message.length);
+        return read(message.id, message.generation, message.offset, message.length);
+      case "fetch":
+        return fetchFile(message.id, message.path);
       case "cancel":
         reads.get(message.id)?.abort.abort();
         return;
@@ -412,6 +687,30 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
         resolve?.();
         return;
       }
+      case "rastered": {
+        const asked = draws.get(message.id);
+        draws.delete(message.id);
+        // A picture not asked for is not kept.
+        if (asked) asked.done(message.result);
+        else if (message.result.ok) message.result.bitmap.close();
+        return;
+      }
+      case "replaced": {
+        // An answer to no call is ignored.
+        const resolve = replacements.get(message.call);
+        replacements.delete(message.call);
+        resolve?.(message.ok);
+        return;
+      }
+      case "key": {
+        if (!keys.has(message.key) || !iframe) return;
+        const now = performance.now();
+        keyTimes = keyTimes.filter((t) => now - t < 1000);
+        if (keyTimes.length >= KEY_RATE) return;
+        keyTimes.push(now);
+        iframe.dispatchEvent(new KeyboardEvent("keydown", { key: message.key, code: message.key, shiftKey: message.shift, repeat: message.repeat, bubbles: true, cancelable: true, composed: true }));
+        return;
+      }
       case "link": {
         const url = linkTarget(message.url);
         // One question at a time: a frame cannot queue a hundred.
@@ -429,35 +728,96 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
     }
   };
 
+  /** What the frame is given of a prepared file; a file read by ranges is kept as document `generation`. */
+  const sourceOf = (p: Prepared, generation: number, transfer: Transferable[]): OpenSource => {
+    if (p.kind === "ranges") {
+      documents.set(generation, p.ranges);
+      const head = p.ranges.head.slice().buffer as ArrayBuffer;
+      transfer.push(head);
+      return { kind: "ranges", size: p.ranges.size, head };
+    }
+    return p.kind === "url" ? { kind: "url", url: p.url } : { kind: "blob", blob: p.blob };
+  };
+
+  const readWhole = (p: Prepared): Snapshots["warnings"] => (p.kind === "blob" && p.readWhole ? [{ key: "source_read_whole", count: 1 }] : []);
+
   const send = async () => {
     try {
       const p = await prepared!;
       if (ended || !port) return;
-      if (p.kind === "blob" && p.readWhole) {
-        hostWarnings = [{ key: "source_read_whole", count: 1 }];
-        root.controllers.update((c) => ({ ...c, warnings: withHostWarnings(0, c.warnings ?? null)! }));
-      }
-      let source: OpenSource;
+      firstKind = p.kind;
+      if (readWhole(p).length) setHostWarnings(readWhole(p));
       const transfer: Transferable[] = [];
-      if (p.kind === "ranges") {
-        ranges = p.ranges;
-        const head = p.ranges.head.slice().buffer as ArrayBuffer;
-        transfer.push(head);
-        source = { kind: "ranges", size: p.ranges.size, head };
-      } else source = p.kind === "url" ? { kind: "url", url: p.url } : { kind: "blob", blob: p.blob };
       const message: OpenMessage = {
         type: "open",
         formats,
         file: { name: file.name, type: file.type ?? "", path: file.path ?? file.name, format: known },
-        source,
+        source: sourceOf(p, 0, transfer),
+        ...(file.tree ? { tree: { path: file.tree.path, paths: file.tree.paths.slice(0, TREE.maxPaths) } } : {}),
         options: config.options ?? {},
+        theme: themeFor(config, host),
       };
       port.postMessage(message, transfer);
+      started = true;
+      shown.add(restyle);
+      if (config.theme === undefined || config.theme === "inherit") scheme?.addEventListener("change", restyle);
     } catch (error) {
       if (!abort.signal.aborted) fail(errorCode(format), error);
     }
   };
 
+  /**
+   * `Session.replace` for the file's session. The frame takes one document
+   * at a time: a newer call while an older one is being read supersedes it
+   * (that one resolves true, as in the page), and while one is with the frame
+   * the next waits for its answer.
+   */
+  const replace = async (next: ViewerFile): Promise<boolean> => {
+    if (ended || !started || !port || !known || !next.source) return false;
+    if ((next.format ?? detect(next)) !== known) return false;
+    const mine = ++latest;
+    superseding?.abort();
+    const own = new AbortController();
+    superseding = own;
+    const signal = AbortSignal.any([abort.signal, own.signal]);
+    let p: Prepared;
+    try {
+      p = await prepare(next.source, known, next, { delivery: config.delivery, origins: config.origins, signal });
+    } catch (error) {
+      // Superseded, or the session ended: not a failure. Otherwise the old document stays, under the error.
+      if (signal.aborted) return true;
+      console.warn(`${format ?? "viewer"}: the next document could not be read`, error);
+      root.status.set({ phase: "error", error: { code: errorCode(format), cause: error } });
+      return true;
+    }
+    // The frame's engines were made for the way the first file came: an image shown from a URL is drawn without CORS.
+    if ((p.kind === "url") !== (firstKind === "url")) return false;
+    await answered;
+    if (mine !== latest || ended || !port) return true;
+    const generation = ++lastDocument;
+    const transfer: Transferable[] = [];
+    const message: ReplaceMessage = {
+      type: "replace",
+      call: nextCall++,
+      generation,
+      file: { name: next.name, type: next.type ?? "", path: next.path ?? next.name, format: known },
+      source: sourceOf(p, generation, transfer),
+    };
+    const reply = new Promise<boolean>((resolve) => replacements.set(message.call, resolve));
+    answered = reply;
+    port.postMessage(message, transfer);
+    const ok = await reply;
+    if (!ok) {
+      documents.delete(generation);
+      return false;
+    }
+    // The reads of the documents before this one are over with them.
+    for (const g of [...documents.keys()]) if (g !== generation) documents.delete(g);
+    current = next;
+    setHostWarnings(readWhole(p));
+    return true;
+  };
+
   if (!file.source) {
     // Nothing to show yet: the UI shows the placeholder.
   } else if (!known) {
@@ -469,18 +829,21 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
       delivery: config.delivery,
       origins: config.origins,
       signal: abort.signal,
-      progress: (share) => root.status.get().phase === "loading" && root.status.set({ phase: "loading", progress: share }),
+      progress: (share) => root.status.get().phase === "loading" && root.status.set({ phase: "loading", step: "file", progress: share }),
     });
     // Refused or failed: said at once, without waiting for the frame.
     prepared.catch((error) => !abort.signal.aborted && fail(errorCode(format), error));
     const frame = document.createElement("iframe");
     // Scripts only: an opaque origin, no popups, no navigation of this page,
-    // no downloads, no forms, no modal dialogs.
+    // no downloads, no forms, no modal dialogs. Of the powerful features,
+    // autoplay: a player started by this page's controls (`media.play`).
     frame.setAttribute("sandbox", "allow-scripts");
-    frame.setAttribute("allow", "");
+    frame.setAttribute("allow", "autoplay");
     frame.setAttribute("referrerpolicy", "no-referrer");
-    frame.className = "exv-sandbox";
+    frame.className = "exav-viewer-sandbox";
     frame.title = file.name;
+    // Filling the host element without the stylesheet too, for a host drawing its own UI.
+    Object.assign(frame.style, { display: "block", width: "100%", height: "100%", border: "0" });
     let loads = 0;
     frame.addEventListener("load", () => {
       loads += 1;
@@ -503,5 +866,15 @@ function mountFrame(config: SandboxConfig, formats: readonly BuiltinFormat[], de
     host.append(frame);
   }
 
-  return { ...root.session, destroy: end };
+  return {
+    get file() {
+      return current;
+    },
+    format: root.session.format,
+    status: root.session.status,
+    controllers: root.session.controllers,
+    replace,
+    resize: root.session.resize,
+    destroy: end,
+  };
 }
diff --git a/crates/exav-viewer/ts/frame/policy.ts b/crates/exav-viewer/ts/frame/policy.ts
index ec6480ba..2e477095 100644
--- a/crates/exav-viewer/ts/frame/policy.ts
+++ b/crates/exav-viewer/ts/frame/policy.ts
@@ -116,10 +116,8 @@ export function policyMismatch(policy: FramePolicy | null, origins: FrameOrigins
   return `the frame's policy does not match this viewer's origins (media: ${media.join(" ") || "none"}; connect: ${connect.join(" ") || "none"}): ${problems.join("; ")}`;
 }
 
-/** Every powerful feature, refused. */
-export const FRAME_PERMISSIONS = [
+const REFUSED = [
   "accelerometer",
-  "autoplay",
   "camera",
   "clipboard-read",
   "clipboard-write",
@@ -147,9 +145,13 @@ export const FRAME_PERMISSIONS = [
   "usb",
   "window-management",
   "xr-spatial-tracking",
-]
-  .map((f) => `${f}=()`)
-  .join(", ");
+];
+
+/**
+ * Every powerful feature refused, but autoplay: the host's own player
+ * controls start the player in the frame (the `<iframe>` allows it).
+ */
+export const FRAME_PERMISSIONS = ["autoplay=*", ...REFUSED.map((f) => `${f}=()`)].join(", ");
 
 /**
  * The headers for every file under the frame's directory. `frameAncestors`:
diff --git a/crates/exav-viewer/ts/frame/protocol.test.ts b/crates/exav-viewer/ts/frame/protocol.test.ts
index 5f0bb1bb..56b1d59d 100644
--- a/crates/exav-viewer/ts/frame/protocol.test.ts
+++ b/crates/exav-viewer/ts/frame/protocol.test.ts
@@ -1,7 +1,43 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
 import { BUILTIN_ORDER } from "../core/formats.js";
-import { checkBytes, checkCommand, checkFrameMessage, checkOpen, checkOptions, isColor, linkTarget, MAX_ITEMS, MAX_TEXT, PROTOCOL, READS } from "./protocol.js";
+import { MAX_PICTURE_EDGE, MAX_PICTURE_PIXELS } from "../core/pictures.js";
+import {
+  checkBytes,
+  checkCommand,
+  checkFrameMessage,
+  checkOpen,
+  checkOptions,
+  checkRaster,
+  checkReplace,
+  checkThemeMessage,
+  checkUnraster,
+  checkWatch,
+  isColor,
+  linkTarget,
+  MAX_ITEMS,
+  MAX_TEXT,
+  PROTOCOL,
+  MAX_PATH,
+  READS,
+  TREE,
+  refusedRasterId,
+} from "./protocol.js";
+
+describe("a status from the frame", () => {
+  const status = (s: unknown) => checkFrameMessage({ type: "status", session: 0, status: s });
+  it("keeps a load's step and progress", () => {
+    expect(status({ phase: "converting", step: "convert", progress: 0.25 })).toEqual({
+      type: "status",
+      session: 0,
+      status: { phase: "converting", step: "convert", progress: 0.25 },
+    });
+  });
+  it("is refused with a step that is none of the viewer's, or a progress out of range", () => {
+    expect(status({ phase: "loading", step: "mining" })).toBeNull();
+    expect(status({ phase: "loading", step: "file", progress: 2 })).toBeNull();
+  });
+});
 
 describe("colours the host puts in a style", () => {
   it("are hex, or rgb()/hsl() of numbers, as the engines write them", () => {
@@ -39,6 +75,18 @@ describe("frame messages", () => {
     expect(checkFrameMessage(layers(items(1, "x".repeat(MAX_TEXT + 1))))).toBeNull();
   });
 
+  it("carry the storeys of a model, each with its elevation or none, and refuse a malformed one", () => {
+    const state = (items: unknown[]) => ({ type: "state", session: 0, key: "storeys", value: { items } });
+    const item = { id: "3", name: "Level 1", elevation: 3, visible: true };
+    expect(checkFrameMessage(state([item, { ...item, id: "4", elevation: null }]))).toEqual(state([item, { ...item, id: "4", elevation: null }]));
+    for (const bad of [{ ...item, elevation: "3" }, { ...item, elevation: Infinity }, { ...item, elevation: undefined }, { ...item, visible: 1 }, { ...item, name: 7 }]) {
+      expect(checkFrameMessage(state([bad])), JSON.stringify(bad)).toBeNull();
+    }
+    expect(checkFrameMessage(state(Array.from({ length: MAX_ITEMS + 1 }, (_, i) => ({ ...item, id: String(i) }))))).toBeNull();
+    // A command to them.
+    expect(checkCommand({ type: "command", call: 1, session: 0, target: "storeys", action: "setVisible", args: ["3", false] })).not.toBeNull();
+  });
+
   it("are refused when a number is not one", () => {
     for (const value of [
       { unit: "page", current: 1.5, total: 2 },
@@ -59,6 +107,15 @@ describe("frame messages", () => {
     expect(checkFrameMessage({ type: "state", session: 0, key: "info", value: { constructor: 1 } })).toBeNull();
   });
 
+  it("carry the names a warning lists, as text, at most 16", () => {
+    const warning = (names: unknown) => ({ type: "state", session: 0, key: "warnings", value: [{ key: "external_references", count: 1, names }] });
+    expect(checkFrameMessage(warning(["walls.dwg"]))).toMatchObject({ value: [{ names: ["walls.dwg"] }] });
+    expect(checkFrameMessage(warning([1]))).toBeNull();
+    expect(checkFrameMessage(warning("walls.dwg"))).toBeNull();
+    expect(checkFrameMessage(warning(Array(17).fill("x")))).toBeNull();
+    expect(checkFrameMessage(warning(["x".repeat(257)]))).toBeNull();
+  });
+
   it("list a member of undeclared size, and refuse any other negative size", () => {
     // @exav/unpack-wasm gives -1 for a size a gzip or xz stream does not declare.
     const archive = (uncompressedSize: number) => ({
@@ -89,7 +146,7 @@ describe("links", () => {
 
 describe("reads and the policy the frame reports", () => {
   it("are whole numbers, checked for shape only: the host judges the range", () => {
-    expect(checkFrameMessage({ type: "read", id: 1, offset: 0, length: 10, extra: 1 })).toEqual({ type: "read", id: 1, offset: 0, length: 10 });
+    expect(checkFrameMessage({ type: "read", id: 1, generation: 0, offset: 0, length: 10, extra: 1 })).toEqual({ type: "read", id: 1, generation: 0, offset: 0, length: 10 });
     for (const [offset, length] of [
       [-1, 10],
       [0.5, 10],
@@ -98,12 +155,19 @@ describe("reads and the policy the frame reports", () => {
       [0, Infinity],
       [0, NaN],
     ]) {
-      expect(checkFrameMessage({ type: "read", id: 1, offset, length }), `${offset} ${length}`).toBeNull();
+      expect(checkFrameMessage({ type: "read", id: 1, generation: 0, offset, length }), `${offset} ${length}`).toBeNull();
     }
     expect(checkFrameMessage({ type: "cancel", id: 3 })).toEqual({ type: "cancel", id: 3 });
     expect(checkFrameMessage({ type: "cancel", id: "3" })).toBeNull();
   });
 
+  it("ask for a file of the tree by its path, or are null", () => {
+    expect(checkFrameMessage({ type: "fetch", id: 4, path: "a/b.dwg", extra: 1 })).toEqual({ type: "fetch", id: 4, path: "a/b.dwg" });
+    for (const m of [{ id: "4", path: "a" }, { id: -1, path: "a" }, { id: 4 }, { id: 4, path: 7 }, { id: 4, path: "x".repeat(MAX_PATH + 1) }]) {
+      expect(checkFrameMessage({ type: "fetch", ...m }), JSON.stringify(m).slice(0, 40)).toBeNull();
+    }
+  });
+
   it("come as lists of sources, or null", () => {
     const policy = { script: ["'self'"], connect: ["'self'", "https://a.test"], img: [], media: ["blob:"] };
     expect(checkFrameMessage({ type: "ready", protocol: PROTOCOL, policy })).toEqual({ type: "ready", protocol: PROTOCOL, policy });
@@ -134,6 +198,15 @@ describe("what the frame takes from the host", () => {
     expect(checkOpen(open({ file: { name: "a", type: "", path: "a", format: "evil" } }), BUILTIN_ORDER)).toBeNull();
   });
 
+  it("is an open that lists the files around it, within the limits, or null", () => {
+    const tree = { path: "a/a.dwg", paths: ["a/a.dwg", "a/b.dwg"] };
+    expect(checkOpen(open({ tree: { ...tree, extra: 1 } }), BUILTIN_ORDER)?.tree).toEqual(tree);
+    expect("tree" in checkOpen(open(), BUILTIN_ORDER)!).toBe(false);
+    for (const bad of [{ path: 1, paths: [] }, { path: "a", paths: "b" }, { path: "a", paths: [1] }, { path: "a", paths: new Array(TREE.maxPaths + 1).fill("a") }, { path: "a", paths: ["x".repeat(MAX_PATH + 1)] }, "a", null]) {
+      expect(checkOpen(open({ tree: bad }), BUILTIN_ORDER), JSON.stringify(bad)?.slice(0, 40)).toBeNull();
+    }
+  });
+
   it("is an open with an http(s) URL, or a size and the first bytes", () => {
     expect(checkOpen(open({ source: { kind: "url", url: "https://media.test/a.mp4" } }), BUILTIN_ORDER)?.source).toEqual({ kind: "url", url: "https://media.test/a.mp4" });
     for (const url of ["javascript:alert(1)", "/a.mp4", "blob:https://x/1"]) expect(checkOpen(open({ source: { kind: "url", url } }), BUILTIN_ORDER), url).toBeNull();
@@ -156,19 +229,32 @@ describe("what the frame takes from the host", () => {
     expect(
       checkOptions({
         pdf: { maxZoom: 4, minZoom: "1", prerenderMargin: "50%" },
-        cad: { ground: "dark", colors: { light: "#fff", dark: "url(x)" }, timeoutMs: Infinity, maxDecompressedBytes: 1e8 },
+        cad: { ground: "dark", colors: { light: "#fff", dark: "url(x)" }, timeoutMs: Infinity, maxDecompressedBytes: 1e8, maxEntities: 5e5 },
         image: { maxDecodeBytes: 1e6, detail: () => null },
         ifc: { highlight: "red" },
         evil: {},
       }),
-    ).toEqual({ pdf: { maxZoom: 4, prerenderMargin: "50%" }, cad: { ground: "dark", maxDecompressedBytes: 1e8 }, image: { maxDecodeBytes: 1e6 }, ifc: {} });
-    expect(checkOptions({ cad: { maxDecompressedBytes: "1e8" } })).toEqual({ cad: {} });
+    ).toEqual({ pdf: { maxZoom: 4, prerenderMargin: "50%" }, cad: { ground: "dark", maxDecompressedBytes: 1e8, maxEntities: 5e5 }, image: { maxDecodeBytes: 1e6 }, ifc: {} });
+    expect(checkOptions({ cad: { maxDecompressedBytes: "1e8", maxEntities: "5e5" } })).toEqual({ cad: {} });
+    expect(checkOptions({ cad: { monochrome: true, lineweights: "always" } })).toEqual({ cad: { monochrome: true, lineweights: "always" } });
+    expect(checkOptions({ cad: { monochrome: "yes", lineweights: "thick" } })).toEqual({ cad: {} });
     // The IFC and STL engine's limits reach the frame's plugins.
     expect(checkOptions({ ifc: { timeoutMs: 5000, maxTriangles: 1e6, more: 1 }, model: { maxTriangles: "9", timeoutMs: 10 } })).toEqual({
       ifc: { timeoutMs: 5000, maxTriangles: 1e6 },
       model: { timeoutMs: 10 },
     });
     expect(checkOptions({ pdf: { prerenderMargin: "1px; }" } })).toEqual({ pdf: {} });
+    expect(checkOptions({ conversion: { timeoutMs: 60_000, baseUrl: "https://evil.test/" } })).toEqual({ conversion: { timeoutMs: 60_000 } });
+    expect(checkOptions({ conversion: { timeoutMs: "1" } })).toEqual({ conversion: {} });
+    expect(checkOptions({ conversion: { converter: "external" } })).toEqual({ conversion: { converter: "external" } });
+    expect(checkOptions({ conversion: { converter: "excel" } })).toEqual({ conversion: {} });
+    // The external converter: a package name the manifest lists, a path or an http(s) URL; nothing else.
+    for (const ok of ["@acme/to-pdf", "to-pdf", "/conv/index.js", "./conv/index.js", "https://converter.example.com/index.js"]) {
+      expect(checkOptions({ conversion: { externalConverter: ok } }), ok).toEqual({ conversion: { externalConverter: ok } });
+    }
+    for (const bad of ["javascript:alert(1)", "data:text/javascript,1", "@Acme/To PDF", "a b", "", "x".repeat(600), "/a\nb", 5, null]) {
+      expect(checkOptions({ conversion: { externalConverter: bad } }), String(bad)).toEqual({ conversion: {} });
+    }
   });
 
   it("is a command of a known target with few arguments", () => {
@@ -176,5 +262,212 @@ describe("what the frame takes from the host", () => {
     expect(checkCommand({ type: "command", call: 1, session: 0, target: "drag", action: "choose", args: ["pan"] })).not.toBeNull();
     expect(checkCommand({ type: "command", call: 1, session: 0, target: "image", action: "x", args: [] })).toBeNull();
     expect(checkCommand({ type: "command", call: 1, session: 0, target: "zoom", action: "fit", args: [1, 2, 3, 4, 5] })).toBeNull();
+    expect(checkCommand({ type: "command", call: 1, session: 0, target: "media", action: "seek", args: [3] })).not.toBeNull();
+    expect(checkCommand({ type: "command", call: 1, session: 0, target: "sheets", action: "select", args: [1] })).not.toBeNull();
+  });
+
+  it("takes a player's controls as an option, and nothing else of it", () => {
+    expect(checkOptions({ media: { controls: "none", autoplay: true } })).toEqual({ media: { controls: "none" } });
+    expect(checkOptions({ media: { controls: "hidden" } })).toEqual({ media: {} });
+  });
+
+  it("takes the theme's known properties when their value is of their kind", () => {
+    const head = new ArrayBuffer(3);
+    const theme = {
+      tokens: {
+        "--exav-viewer-text": "rgb(1 2 3)",
+        "--exav-viewer-panel": "url(https://x.test/a.png)",
+        "--exav-viewer-surface": "var(--x)",
+        "--exav-viewer-radius": "6px",
+        "--exav-viewer-tap": "expression(1)",
+        "--exav-viewer-font": "Marianne, sans-serif",
+        "--exav-viewer-accent": "oklch(0.5 0.1 250)",
+        "--evil": "#fff",
+      },
+      scheme: "dark",
+    };
+    const m = checkOpen({ type: "open", formats: ["pdf"], file: { name: "a.pdf", type: "", path: "a.pdf", format: "pdf" }, source: { kind: "ranges", size: 3, head }, options: {}, theme }, BUILTIN_ORDER);
+    expect(m?.theme).toEqual({
+      tokens: { "--exav-viewer-text": "rgb(1 2 3)", "--exav-viewer-radius": "6px", "--exav-viewer-font": "Marianne, sans-serif", "--exav-viewer-accent": "oklch(0.5 0.1 250)" },
+      scheme: "dark",
+    });
+    expect(checkThemeMessage({ type: "theme", theme: { tokens: { "--exav-viewer-font": "x; background: url(y)" }, scheme: "dim" } })).toEqual({ type: "theme", theme: { tokens: {}, scheme: null } });
+  });
+
+  it("draws a page of a request whose options are well formed, and no other", () => {
+    const options = { width: 800, height: 600, region: { x: 0.1, y: 0.2, width: 0.5, height: 0.5 }, fit: "cover", background: "#fff" };
+    expect(checkRaster({ type: "raster", id: 1, session: 0, page: 2, options })).toEqual({ type: "raster", id: 1, session: 0, page: 2, options });
+    expect(checkRaster({ type: "raster", id: 1, session: 0, page: 2, options: { longEdge: 300, region: "current" } })?.options).toEqual({ longEdge: 300, region: "current" });
+    // A camera, as a model's region.
+    const camera = { position: [1, 2, 3], target: [0, 0, 0], projection: { type: "perspective", fov: 50 }, aspect: 1.5 };
+    expect(checkRaster({ type: "raster", id: 1, session: 0, page: 1, options: { longEdge: 10, region: camera } })?.options.region).toEqual(camera);
+    const bad: Record<string, unknown>[] = [
+      { longEdge: 0 },
+      { longEdge: Infinity },
+      { width: NaN },
+      { height: -1 },
+      { longEdge: 1e12 },
+      { longEdge: 10, region: { x: 0, y: 0, width: 0, height: 1 } },
+      { longEdge: 10, region: { x: NaN, y: 0, width: 1, height: 1 } },
+      { longEdge: 10, region: "all" },
+      { longEdge: 10, region: { ...camera, projection: { type: "perspective", fov: 180 } } },
+      { longEdge: 10, region: { ...camera, position: [1, 2] } },
+      { longEdge: 10, fit: "stretch" },
+      { longEdge: 10, lineweight: "thick" },
+      { longEdge: 10, layout: "x".repeat(2000) },
+      { longEdge: 10, background: "url(https://example.test/x)" },
+      { longEdge: 10, background: "red; background: url(x)" },
+    ];
+    for (const options of bad) expect(checkRaster({ type: "raster", id: 1, session: 0, page: 1, options }), JSON.stringify(options)).toBeNull();
+    expect(checkRaster({ type: "raster", id: 1, session: 0, page: 0, options: { longEdge: 100 } })).toBeNull();
+    expect(checkRaster({ type: "raster", id: -1, session: 0, page: 1, options: { longEdge: 100 } })).toBeNull();
+    expect(checkRaster({ type: "raster", id: 1, session: 0, page: 1 })).toBeNull();
+  });
+
+  it("owes an answer to a raster it refuses when it has a number, and to no other message", () => {
+    const refused = (m: unknown) => refusedRasterId(m);
+    expect(refused({ type: "raster", id: 7, session: 0, page: 1, options: { longEdge: -5 } })).toBe(7);
+    expect(refused({ type: "raster", id: 7, session: 0, page: 0, options: { longEdge: 100 } })).toBe(7);
+    expect(refused({ type: "raster", id: 7, session: 0, page: 1 })).toBe(7);
+    expect(refused({ type: "raster", id: 7, session: "0", page: 1, options: { longEdge: 100 } })).toBe(7);
+    // One that checks is answered by the drawing; no number, nobody to answer; not a raster, not ours.
+    expect(refused({ type: "raster", id: 7, session: 0, page: 1, options: { longEdge: 100 } })).toBeNull();
+    expect(refused({ type: "raster", id: -1, session: 0, page: 1, options: { longEdge: -5 } })).toBeNull();
+    expect(refused({ type: "raster", session: 0, page: 1, options: {} })).toBeNull();
+    expect(refused({ type: "unraster", id: 7 })).toBeNull();
+    expect(refused(null)).toBeNull();
+  });
+
+  it("follows a store on request, for the stores that are followed so", () => {
+    expect(checkWatch({ type: "watch", session: 0, key: "viewport" })).toEqual({ type: "watch", session: 0, key: "viewport" });
+    expect(checkWatch({ type: "unwatch", session: 3, key: "viewport", extra: 1 })).toEqual({ type: "unwatch", session: 3, key: "viewport" });
+    for (const bad of [
+      { type: "watch", session: 0, key: "zoom" },
+      { type: "watch", session: 0, key: "__proto__" },
+      { type: "watch", session: -1, key: "viewport" },
+      { type: "watch", key: "viewport" },
+      { type: "watching", session: 0, key: "viewport" },
+    ])
+      expect(checkWatch(bad), JSON.stringify(bad)).toBeNull();
+    expect(checkWatch("watch")).toBeNull();
+  });
+
+  it("stops a picture by its number, and takes the next document with its file and generation", () => {
+    expect(checkUnraster({ type: "unraster", id: 4 })).toEqual({ type: "unraster", id: 4 });
+    expect(checkUnraster({ type: "unraster", id: 1.5 })).toBeNull();
+    const file = { name: "a.pdf", type: "", path: "a.pdf", format: "pdf" };
+    const source = { kind: "blob", blob: new Blob(["x"]) };
+    expect(checkReplace({ type: "replace", call: 3, generation: 1, file, source }, BUILTIN_ORDER)).toEqual({ type: "replace", call: 3, generation: 1, file, source });
+    // Generation 0 is the document `open` gave.
+    expect(checkReplace({ type: "replace", call: 3, generation: 0, file, source }, BUILTIN_ORDER)).toBeNull();
+    expect(checkReplace({ type: "replace", call: 3, generation: 1, file: { ...file, format: "nope" }, source }, BUILTIN_ORDER)).toBeNull();
+    expect(checkReplace({ type: "replace", call: 3, generation: 1, file, source: { kind: "url", url: "javascript:alert(1)" } }, BUILTIN_ORDER)).toBeNull();
+    expect(checkReplace({ type: "replace", call: 3, generation: 1, file: { ...file, name: "x".repeat(5000) }, source }, BUILTIN_ORDER)).toBeNull();
+  });
+
+  it("names the document a read is for, and answers a replacement", () => {
+    expect(checkFrameMessage({ type: "read", id: 5, generation: 2, offset: 10, length: 20 })).toEqual({ type: "read", id: 5, generation: 2, offset: 10, length: 20 });
+    expect(checkFrameMessage({ type: "read", id: 5, offset: 10, length: 20 })).toBeNull();
+    expect(checkFrameMessage({ type: "read", id: 5, generation: -1, offset: 10, length: 20 })).toBeNull();
+    expect(checkFrameMessage({ type: "replaced", call: 3, ok: true })).toEqual({ type: "replaced", call: 3, ok: true });
+    expect(checkFrameMessage({ type: "replaced", call: 3, ok: "yes" })).toBeNull();
+    expect(checkFrameMessage({ type: "replaced", ok: true })).toBeNull();
+  });
+});
+
+describe("what the frame says of a player, of sheets and of pictures", () => {
+  const MEDIA = { kind: "audio", paused: true, ended: false, currentTime: 1, duration: Infinity, buffered: 2, volume: 0.5, muted: false, rate: 1, waiting: false, blocked: false };
+  const state = (key: string, value: unknown) => checkFrameMessage({ type: "state", session: 0, key, value });
+
+  it("is a player's state of numbers in their range", () => {
+    // A live stream lasts forever.
+    expect(state("media", { ...MEDIA, extra: 1 })).toEqual({ type: "state", session: 0, key: "media", value: MEDIA });
+    for (const bad of [{ volume: 2 }, { currentTime: -1 }, { currentTime: NaN }, { duration: NaN }, { rate: 0 }, { rate: 100 }, { kind: "image" }, { paused: "no" }, { blocked: undefined }]) {
+      expect(state("media", { ...MEDIA, ...bad }), JSON.stringify(bad)).toBeNull();
+    }
+  });
+
+  it("is sheets named in text no longer than the limit", () => {
+    expect(state("sheets", { items: [{ index: 0, name: "A" }], current: 0 })).not.toBeNull();
+    expect(state("sheets", { items: [{ index: 0, name: "x".repeat(MAX_TEXT + 1) }], current: 0 })).toBeNull();
+    expect(state("sheets", { items: [{ index: -1, name: "A" }], current: 0 })).toBeNull();
+    expect(state("pictures", { count: 3, space: "page" })).toEqual({ type: "state", session: 0, key: "pictures", value: { count: 3, space: "page" } });
+    expect(state("pictures", { count: 1.5, space: "page" })).toBeNull();
+    expect(state("pictures", { count: 3, space: "world" })).toBeNull();
+    expect(state("pictures", { count: 3 })).toBeNull();
+  });
+
+  it("is a viewport only in the coordinates its space has", () => {
+    const rect = { x: 0.1, y: 0.2, width: 0.5, height: 0.4 };
+    expect(state("viewport", null)).toEqual({ type: "state", session: 0, key: "viewport", value: null });
+    expect(state("viewport", { space: "page", page: 2, region: rect })).toEqual({ type: "state", session: 0, key: "viewport", value: { space: "page", page: 2, region: rect } });
+    expect(state("viewport", { space: "drawing", page: 1, layout: "A1", region: rect })).toMatchObject({ value: { layout: "A1" } });
+    const camera = { position: [1, 2, 3], target: [0, 0, 0], up: [0, 0, 1], projection: { type: "orthographic", height: 5 }, aspect: 2 };
+    expect(state("viewport", { space: "camera", page: 1, region: camera })).toMatchObject({ value: { space: "camera", region: camera } });
+    for (const bad of [
+      { space: "camera", page: 1, region: rect },
+      { space: "page", page: 1, region: camera },
+      { space: "page", page: 0, region: rect },
+      { space: "page", page: 1, region: { ...rect, width: -1 } },
+      { space: "page", page: 1 },
+      { space: "frame", page: 1, region: rect },
+      { space: "page", page: 1, layout: "x".repeat(MAX_TEXT + 1), region: rect },
+    ]) {
+      expect(state("viewport", bad), JSON.stringify(bad)).toBeNull();
+    }
+  });
+
+  it("is a picture only when it is a bitmap of a size the host takes", () => {
+    class FakeBitmap {
+      closed = false;
+      constructor(
+        public width: number,
+        public height: number,
+      ) {}
+      close() {
+        this.closed = true;
+      }
+    }
+    vi.stubGlobal("ImageBitmap", FakeBitmap);
+    const rect = { x: 0, y: 0, width: 1, height: 1 };
+    const result = (bitmap: unknown, extra: Record<string, unknown> = {}) =>
+      checkFrameMessage({ type: "rastered", id: 3, result: { ok: true, bitmap, width: (bitmap as FakeBitmap).width, height: (bitmap as FakeBitmap).height, page: 1, space: "page", region: rect, ...extra } });
+    const failed = { type: "rastered", id: 3, result: { ok: false, code: "failed" } };
+    try {
+      const ok = new FakeBitmap(10, 20);
+      expect(result(ok)).toEqual({ type: "rastered", id: 3, result: { ok: true, bitmap: ok, width: 10, height: 20, page: 1, space: "page", region: rect } });
+      expect(ok.closed).toBe(false);
+      // Past the edge, or past the pixels (both sides under the edge): refused, and freed.
+      const huge = new FakeBitmap(MAX_PICTURE_EDGE + 1, 10);
+      expect(result(huge)).toEqual(failed);
+      expect(huge.closed).toBe(true);
+      const wide = new FakeBitmap(MAX_PICTURE_EDGE, Math.floor(MAX_PICTURE_PIXELS / MAX_PICTURE_EDGE) + 1);
+      expect(result(wide)).toEqual(failed);
+      expect(wide.closed).toBe(true);
+      // A size that is not the bitmap's, a region of another kind, a page that is none, a space that is none.
+      for (const extra of [{ width: 11 }, { region: { position: [0, 0, 0] } }, { region: undefined }, { page: 0 }, { space: "world" }, { layout: "x".repeat(MAX_TEXT + 1) }, { region: { ...rect, width: 0 } }]) {
+        const bitmap = new FakeBitmap(10, 20);
+        expect(result(bitmap, extra), JSON.stringify(extra)).toEqual(failed);
+        expect(bitmap.closed, JSON.stringify(extra)).toBe(true);
+      }
+      expect(checkFrameMessage({ type: "rastered", id: 3, result: { ok: true, bitmap: { width: 10, height: 10 }, width: 10, height: 10, page: 1, space: "page", region: rect } })).toEqual(failed);
+      // A video frame has no region; the failure keeps its code.
+      expect(result(new FakeBitmap(4, 4), { space: "frame", region: undefined })).toMatchObject({ result: { ok: true, space: "frame" } });
+      expect(result(new FakeBitmap(4, 4), { space: "frame" })).toEqual(failed);
+      expect(checkFrameMessage({ type: "rastered", id: 3, result: { ok: false, code: "too-large" } })).toEqual({ type: "rastered", id: 3, result: { ok: false, code: "too-large" } });
+      expect(checkFrameMessage({ type: "rastered", id: 3, result: { ok: false, code: "boom" } })).toEqual(failed);
+      // No id: the bitmap is freed all the same.
+      const orphan = new FakeBitmap(10, 20);
+      expect(checkFrameMessage({ type: "rastered", result: { ok: true, bitmap: orphan } })).toBeNull();
+      expect(orphan.closed).toBe(true);
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+
+  it("is a key among the navigation keys", () => {
+    expect(checkFrameMessage({ type: "key", key: "PageDown", shift: false, repeat: true })).toEqual({ type: "key", key: "PageDown", shift: false, repeat: true });
+    for (const key of ["Delete", "Enter", " ", "a", "F5", "Tab"]) expect(checkFrameMessage({ type: "key", key, shift: false, repeat: false }), key).toBeNull();
+    expect(checkFrameMessage({ type: "key", key: "Escape", shift: "yes", repeat: false })).toBeNull();
   });
 });
diff --git a/crates/exav-viewer/ts/frame/protocol.ts b/crates/exav-viewer/ts/frame/protocol.ts
index 1e7d4a36..6a80d46f 100644
--- a/crates/exav-viewer/ts/frame/protocol.ts
+++ b/crates/exav-viewer/ts/frame/protocol.ts
@@ -7,11 +7,15 @@
  * the host treats every frame message as untrusted, since the frame runs the
  * parsers.
  */
-import type { BuiltinFormat, LayerItem, OutlineEntry, Selection } from "../core/types.js";
+import { checkRasterOptions, checkRegion, isRasterErrorCode, MAX_PICTURE_EDGE, MAX_PICTURE_PIXELS, regionMatches, type RasterErrorCode } from "../core/pictures.js";
+import { checkTheme, isColor, type FrameTheme } from "../core/theme.js";
+import type { BuiltinFormat, LayerItem, LoadStep, MediaState, OutlineEntry, RasterOptions, RasterRegion, RegionSpace, Selection, StoreyItem, Viewport, Warning } from "../core/types.js";
 import type { FramePolicy } from "./policy.js";
 
+export { isColor };
+
 /** Bumped on any change to the messages; both sides must agree. */
-export const PROTOCOL = 3;
+export const PROTOCOL = 5;
 
 /** The `type` of the one `window.postMessage`, which carries the port. */
 export const HELLO = "exav-frame/hello";
@@ -26,6 +30,17 @@ export const MAX_PATH = 4096;
 export const MAX_URL = 2048;
 /** Most items in one list (layers, members, outline entries...). */
 export const MAX_ITEMS = 100_000;
+/** Pictures the host waits for at once. */
+export const MAX_DRAWS = 8;
+
+/**
+ * The keys the frame hands back to the host when the document does not use
+ * them: moving between files, closing. Never one with Ctrl, Alt or Meta,
+ * never one that types: a frame that could send those could press a host's
+ * shortcuts.
+ */
+export const NAV_KEYS = ["Escape", "ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown", "PageUp", "PageDown", "Home", "End"] as const;
+export type NavKey = (typeof NAV_KEYS)[number];
 
 /**
  * A file read by ranges: what the frame may ask of the host at once. The
@@ -42,6 +57,14 @@ export const READS = {
   head: 65_536,
 };
 
+/** What the frame may know and ask of the files around the one it shows (`FileTree`). */
+export const TREE = {
+  /** Paths listed. */
+  maxPaths: 20_000,
+  /** Bytes of one file the host reads for the frame. */
+  maxFileBytes: 256 * 1024 * 1024,
+};
+
 // ── Host to frame ────────────────────────────────────────────────────────────
 
 /** Plugin options that are plain data, per plugin. Functions stay on the frame's side. */
@@ -64,10 +87,23 @@ export interface FrameOptions {
     detailMaxPixels?: number;
     maxDecodeBytes?: number;
   };
-  cad?: { ground?: "light" | "dark"; colors?: { light: string; dark: string }; timeoutMs?: number; maxPrimitives?: number; maxDecompressedBytes?: number };
+  cad?: {
+    ground?: "light" | "dark";
+    colors?: { light: string; dark: string };
+    timeoutMs?: number;
+    maxPrimitives?: number;
+    maxDecompressedBytes?: number;
+    maxEntities?: number;
+    lineweights?: "drawing" | "always" | "never";
+    monochrome?: boolean;
+  };
   ifc?: { ground?: "light" | "dark"; colors?: { light: string; dark: string }; highlight?: string; timeoutMs?: number; maxTriangles?: number };
   model?: { surface?: number; zUp?: boolean; timeoutMs?: number; maxTriangles?: number };
   archive?: { maxExtractedBytes?: number; maxMembers?: number; maxCompressionRatio?: number };
+  /** For the converted Office formats (`rtf()`, `doc()`...). */
+  conversion?: { timeoutMs?: number; maxMemory?: number; converter?: "exav" | "external"; externalConverter?: string };
+  /** "none": no player controls in the frame, for a host drawing its own (`MediaController`). */
+  media?: { controls?: "native" | "none" };
 }
 
 /**
@@ -83,13 +119,57 @@ export interface OpenMessage {
   formats: readonly BuiltinFormat[];
   file: { name: string; type: string; path: string; format: BuiltinFormat | null };
   source: OpenSource;
+  /** The files around it: their paths, which the frame asks for by a `fetch`. */
+  tree?: { path: string; paths: string[] };
   options: FrameOptions;
+  theme: FrameTheme;
 }
 
 /** The answer to a `read`: the bytes, exactly as many as asked (fewer only at the end of the file), or why not. */
 export type BytesMessage = { type: "bytes"; id: number; data: ArrayBuffer } | { type: "bytes"; id: number; error: "refused" | "failed" };
 
-export type CommandTarget = "pages" | "zoom" | "drag" | "outline" | "layers" | "layouts" | "ground" | "archive";
+/** The page's theme changed (`SandboxedViewer.restyle`). */
+export interface ThemeMessage {
+  type: "theme";
+  theme: FrameTheme;
+}
+
+/**
+ * A page drawn as a picture (`PicturesController.raster`), answered by a
+ * `rastered` with the same id. `options` are the request's, without its
+ * signal (`unraster` is that).
+ */
+export interface RasterMessage {
+  type: "raster";
+  id: number;
+  session: number;
+  page: number;
+  options: Omit<RasterOptions, "signal">;
+}
+
+/** A picture no longer wanted. Its `rastered` still comes. */
+export interface UnrasterMessage {
+  type: "unraster";
+  id: number;
+}
+
+/**
+ * The next document of the session: the file with other bytes, as `open`
+ * gave the first. `generation` numbers the documents (0 is the one `open`
+ * gave): the frame names it in each `read`, so that the host answers from the
+ * bytes of the document asked about while two are alive. Answered by a
+ * `replaced` with the same call.
+ */
+export interface ReplaceMessage {
+  type: "replace";
+  call: number;
+  generation: number;
+  file: OpenMessage["file"];
+  source: OpenSource;
+}
+
+export type CommandTarget = "pages" | "zoom" | "drag" | "outline" | "layers" | "storeys" | "layouts" | "ground" | "archive" | "media" | "sheets";
+const COMMAND_TARGETS: readonly CommandTarget[] = ["pages", "zoom", "drag", "outline", "layers", "storeys", "layouts", "ground", "archive", "media", "sheets"];
 
 export interface CommandMessage {
   type: "command";
@@ -101,17 +181,32 @@ export interface CommandMessage {
   args: readonly unknown[];
 }
 
-export type HostMessage = OpenMessage | CommandMessage | BytesMessage;
+/**
+ * The controllers whose store the frame follows only on request, because
+ * working its value out costs: the frame reports it (`state`) from a `watch`
+ * until the matching `unwatch`. Until then its value in `controllers` is null.
+ */
+export const WATCHED_KEYS = ["viewport"] as const satisfies readonly ControllerKey[];
+export type WatchedKey = (typeof WATCHED_KEYS)[number];
+
+/** Someone follows the store of `key` (a first listener, or a read), or no one does any more. */
+export interface WatchMessage {
+  type: "watch" | "unwatch";
+  session: number;
+  key: WatchedKey;
+}
+
+export type HostMessage = OpenMessage | CommandMessage | BytesMessage | ThemeMessage | RasterMessage | UnrasterMessage | ReplaceMessage | WatchMessage;
 
 // ── Frame to host ────────────────────────────────────────────────────────────
 
 export type StatusSnapshot =
-  | { phase: "loading" | "converting"; progress?: number }
+  | { phase: "loading" | "converting"; progress?: number; step?: LoadStep }
   | { phase: "ready"; partial?: boolean }
   | { phase: "empty" }
   | { phase: "error"; code: ErrorCode };
 
-export type ErrorCode = "pdf" | "image" | "drawing" | "drawing_version" | "office" | "media" | "model" | "archive" | "file";
+export type ErrorCode = "pdf" | "image" | "image_no_preview" | "drawing" | "drawing_version" | "office" | "needs_converter" | "media" | "model" | "archive" | "text" | "text_binary" | "file";
 
 export interface ArchiveSnapshot {
   members: readonly { index: number; name: string; uncompressedSize: number; encrypted: boolean }[];
@@ -128,17 +223,39 @@ export interface Snapshots {
   drag: { mode: "pan" | "select"; available: boolean };
   outline: readonly OutlineEntry[];
   layers: { kind: "layers" | "categories"; items: readonly LayerItem[] };
+  storeys: { items: readonly StoreyItem[] };
   layouts: { items: readonly { id: string; name: string; isModel: boolean }[]; current: string };
   ground: "light" | "dark";
   selection: Selection | null;
   info: Record<string, number>;
-  warnings: readonly { key: string; count: number }[];
+  warnings: readonly Warning[];
   archive: ArchiveSnapshot;
+  media: MediaState;
+  sheets: { items: readonly { index: number; name: string }[]; current: number };
+  pictures: { count: number; space: RegionSpace };
+  viewport: Viewport | null;
 }
 
 export type ControllerKey = keyof Snapshots;
 
-export const CONTROLLER_KEYS: readonly ControllerKey[] = ["pages", "zoom", "drag", "outline", "layers", "layouts", "ground", "selection", "info", "warnings", "archive"];
+export const CONTROLLER_KEYS: readonly ControllerKey[] = [
+  "pages",
+  "zoom",
+  "drag",
+  "outline",
+  "layers",
+  "storeys",
+  "layouts",
+  "ground",
+  "selection",
+  "info",
+  "warnings",
+  "archive",
+  "media",
+  "sheets",
+  "pictures",
+  "viewport",
+];
 
 /** What a controller has besides its store. */
 export interface Statics {
@@ -156,10 +273,26 @@ export type FrameMessage =
   | { type: "done"; call: number; ok: boolean }
   /** A link the user followed in the document. The host decides. */
   | { type: "link"; url: string }
-  /** Bytes of a file read by ranges, answered by a `bytes` with the same id. */
-  | { type: "read"; id: number; offset: number; length: number }
-  /** A read no longer wanted. Its `bytes` still comes. */
-  | { type: "cancel"; id: number };
+  /** Bytes of the document `generation` read by ranges, answered by a `bytes` with the same id (unique over the frame's life). */
+  | { type: "read"; id: number; generation: number; offset: number; length: number }
+  /**
+   * A whole file of the tree `open` listed, answered by a `bytes` with the
+   * same id; the id is from the same count as a `read`'s.
+   */
+  | { type: "fetch"; id: number; path: string }
+  /** A read or fetch no longer wanted. Its `bytes` still comes. */
+  | { type: "cancel"; id: number }
+  /** A key pressed in the frame that the document did not use. */
+  | { type: "key"; key: NavKey; shift: boolean; repeat: boolean }
+  /** The answer to a `raster`: the picture and what it shows, or why there is none. */
+  | { type: "rastered"; id: number; result: RasterResult }
+  /** The answer to a `replace`: whether the document was replaced. False: nothing changed. */
+  | { type: "replaced"; call: number; ok: boolean };
+
+/** The picture of a `rastered`, as the frame sends it. */
+export type RasterResult =
+  | { ok: true; bitmap: ImageBitmap; width: number; height: number; page: number; layout?: string; space: RegionSpace; region?: RasterRegion }
+  | { ok: false; code: RasterErrorCode };
 
 // ── Checks ───────────────────────────────────────────────────────────────────
 
@@ -174,25 +307,40 @@ const oneOf = <T extends string>(v: unknown, values: readonly T[]): v is T => ty
 /** A key the host may use as an object key or in a message key: a plain word, not one of Object's. */
 const isWord = (v: unknown): v is string => typeof v === "string" && /^[a-z_]{1,64}$/.test(v) && !["__proto__", "constructor", "prototype"].includes(v);
 
-/**
- * A colour the host may put in a style: hex, or rgb()/hsl() of plain
- * numbers. Anything else could be `url(...)`, a request the frame chose.
- */
-export function isColor(v: unknown): v is string {
-  if (typeof v !== "string" || v.length > 64) return false;
-  return /^#[0-9a-f]{3,8}$/i.test(v) || /^(rgb|hsl)a?\(\s*[\d.]+%?(\s*[\s,/]\s*[\d.]+%?){2,3}\s*\)$/i.test(v);
+/** A bitmap within the picture limits (`MAX_PICTURE_EDGE` a side, `MAX_PICTURE_PIXELS` in all); false where the platform has none. */
+function isPicture(v: unknown): v is ImageBitmap {
+  return (
+    typeof ImageBitmap !== "undefined" &&
+    v instanceof ImageBitmap &&
+    v.width >= 1 &&
+    v.height >= 1 &&
+    v.width <= MAX_PICTURE_EDGE &&
+    v.height <= MAX_PICTURE_EDGE &&
+    v.width * v.height <= MAX_PICTURE_PIXELS
+  );
 }
 
-const ERROR_CODES: readonly ErrorCode[] = ["pdf", "image", "drawing", "drawing_version", "office", "media", "model", "archive", "file"];
+const SPACES: readonly RegionSpace[] = ["page", "pixels", "drawing", "camera", "frame"];
+
+const ERROR_CODES: readonly ErrorCode[] = ["pdf", "image", "image_no_preview", "drawing", "drawing_version", "office", "needs_converter", "media", "model", "archive", "text", "text_binary", "file"];
 const REFUSALS = ["archive_no_reader", "archive_failed_member", "archive_member_encrypted", "archive_member_unsupported"] as const;
 
+const STEPS: readonly LoadStep[] = ["file", "engine", "start", "read", "convert", "render"];
+
 export function checkStatus(v: unknown): StatusSnapshot | null {
   if (!isObject(v)) return null;
   const progress = v.progress === undefined || (isFinite(v.progress) && v.progress >= 0 && v.progress <= 1);
+  const step = v.step === undefined || oneOf(v.step, STEPS);
   switch (v.phase) {
     case "loading":
     case "converting":
-      return progress ? { phase: v.phase, ...(v.progress !== undefined && { progress: v.progress as number }) } : null;
+      return progress && step
+        ? {
+            phase: v.phase,
+            ...(v.progress !== undefined && { progress: v.progress as number }),
+            ...(v.step !== undefined && { step: v.step as LoadStep }),
+          }
+        : null;
     case "ready":
       return v.partial === undefined || typeof v.partial === "boolean" ? { phase: "ready", ...(v.partial && { partial: true }) } : null;
     case "empty":
@@ -244,6 +392,16 @@ const CHECKS: { [K in ControllerKey]: (v: unknown) => Snapshots[K] | undefined }
     }
     return { kind: v.kind, items };
   },
+  storeys(v) {
+    if (!isObject(v) || !isList(v.items)) return undefined;
+    const items: StoreyItem[] = [];
+    for (const i of v.items) {
+      if (!isObject(i) || !isText(i.id) || !isText(i.name) || typeof i.visible !== "boolean") return undefined;
+      if (i.elevation !== null && !isFinite(i.elevation)) return undefined;
+      items.push({ id: i.id, name: i.name, elevation: i.elevation, visible: i.visible });
+    }
+    return { items };
+  },
   layouts(v) {
     if (!isObject(v) || !isList(v.items) || !isText(v.current)) return undefined;
     const items: { id: string; name: string; isModel: boolean }[] = [];
@@ -272,10 +430,15 @@ const CHECKS: { [K in ControllerKey]: (v: unknown) => Snapshots[K] | undefined }
   },
   warnings(v) {
     if (!isList(v, 64)) return undefined;
-    const out: { key: string; count: number }[] = [];
+    const out: Warning[] = [];
     for (const w of v) {
       if (!isObject(w) || !isWord(w.key) || !isInt(w.count)) return undefined;
-      out.push({ key: w.key, count: w.count });
+      if (w.names === undefined) {
+        out.push({ key: w.key, count: w.count });
+        continue;
+      }
+      if (!isList(w.names, 16) || !w.names.every((n) => isText(n, 256))) return undefined;
+      out.push({ key: w.key, count: w.count, names: w.names as string[] });
     }
     return out;
   },
@@ -302,6 +465,46 @@ const CHECKS: { [K in ControllerKey]: (v: unknown) => Snapshots[K] | undefined }
     }
     return { members, opening: v.opening, opened, refused };
   },
+  media(v) {
+    if (!isObject(v) || !oneOf(v.kind, ["video", "audio"] as const)) return undefined;
+    const flags = ["paused", "ended", "muted", "waiting", "blocked"] as const;
+    if (!flags.every((f) => typeof v[f] === "boolean")) return undefined;
+    const seconds = (n: unknown) => isFinite(n) && n >= 0;
+    if (!seconds(v.currentTime) || !seconds(v.buffered) || !(isNumber(v.duration) && v.duration >= 0)) return undefined;
+    if (!isFinite(v.volume) || v.volume < 0 || v.volume > 1 || !isFinite(v.rate) || v.rate <= 0 || v.rate > 16) return undefined;
+    return {
+      kind: v.kind,
+      paused: v.paused as boolean,
+      ended: v.ended as boolean,
+      currentTime: v.currentTime as number,
+      duration: v.duration,
+      buffered: v.buffered as number,
+      volume: v.volume,
+      muted: v.muted as boolean,
+      rate: v.rate,
+      waiting: v.waiting as boolean,
+      blocked: v.blocked as boolean,
+    };
+  },
+  sheets(v) {
+    if (!isObject(v) || !isList(v.items) || !isInt(v.current)) return undefined;
+    const items: { index: number; name: string }[] = [];
+    for (const i of v.items) {
+      if (!isObject(i) || !isInt(i.index) || !isText(i.name)) return undefined;
+      items.push({ index: i.index, name: i.name });
+    }
+    return { items, current: v.current };
+  },
+  pictures: (v) => (isObject(v) && isInt(v.count, 0, MAX_ITEMS) && oneOf(v.space, SPACES) ? { count: v.count, space: v.space } : undefined),
+  viewport(v) {
+    if (v === null) return null;
+    if (!isObject(v) || !oneOf(v.space, SPACES) || !isInt(v.page, 1, MAX_ITEMS) || !(v.layout === undefined || isText(v.layout))) return undefined;
+    if (!regionMatches(v.space, v.region)) return undefined;
+    const region = v.region === undefined ? undefined : checkRegion(v.region);
+    // Only a rectangle or a camera has a region; "frame" has none, and no viewport to follow.
+    if (!region) return undefined;
+    return { space: v.space, page: v.page, ...(v.layout !== undefined && { layout: v.layout }), region };
+  },
 };
 
 /** The value of `key` if it has the shape that controller's store has, else undefined. */
@@ -366,14 +569,61 @@ export function checkFrameMessage(v: unknown): FrameMessage | null {
       return isText(v.url, MAX_URL) ? { type: "link", url: v.url } : null;
     // Shapes only: whether a read is within the file and the limits is the host's to judge.
     case "read":
-      return isInt(v.id) && isInt(v.offset) && isInt(v.length) ? { type: "read", id: v.id, offset: v.offset, length: v.length } : null;
+      return isInt(v.id) && isInt(v.generation) && isInt(v.offset) && isInt(v.length)
+        ? { type: "read", id: v.id, generation: v.generation, offset: v.offset, length: v.length }
+        : null;
+    case "fetch":
+      return isInt(v.id) && isText(v.path, MAX_PATH) ? { type: "fetch", id: v.id, path: v.path } : null;
     case "cancel":
       return isInt(v.id) ? { type: "cancel", id: v.id } : null;
+    case "key":
+      return oneOf(v.key, NAV_KEYS) && typeof v.shift === "boolean" && typeof v.repeat === "boolean" ? { type: "key", key: v.key, shift: v.shift, repeat: v.repeat } : null;
+    case "replaced":
+      return isInt(v.call) && typeof v.ok === "boolean" ? { type: "replaced", call: v.call, ok: v.ok } : null;
+    case "rastered":
+      return isInt(v.id) ? { type: "rastered", id: v.id, result: checkRasterResult(v.result) } : (closeBitmap(isObject(v.result) ? v.result.bitmap : undefined), null);
     default:
       return null;
   }
 }
 
+function closeBitmap(v: unknown): void {
+  if (typeof ImageBitmap !== "undefined" && v instanceof ImageBitmap) v.close();
+}
+
+/**
+ * A picture the frame sent, or the failure it stands for: one that is not
+ * well formed (a bitmap that is none, past the limits, of another size than
+ * it says) is closed and is a "failed". The page of the host that asked
+ * checks the rest: its space, the size it asked for.
+ */
+function checkRasterResult(v: unknown): RasterResult {
+  const fail: RasterResult = { ok: false, code: "failed" };
+  if (!isObject(v)) return fail;
+  if (v.ok === false) return isRasterErrorCode(v.code) ? { ok: false, code: v.code } : fail;
+  const bad = (): RasterResult => (closeBitmap(v.bitmap), fail);
+  if (v.ok !== true || !isPicture(v.bitmap)) return bad();
+  const { bitmap } = v;
+  if (v.width !== bitmap.width || v.height !== bitmap.height || !isInt(v.page, 1, MAX_ITEMS) || !oneOf(v.space, SPACES)) return bad();
+  if (!(v.layout === undefined || isText(v.layout))) return bad();
+  let region: RasterRegion | undefined;
+  if (v.space !== "frame") {
+    if (!regionMatches(v.space, v.region)) return bad();
+    region = checkRegion(v.region);
+    if (!region) return bad();
+  } else if (v.region !== undefined) return bad();
+  return {
+    ok: true,
+    bitmap,
+    width: bitmap.width,
+    height: bitmap.height,
+    page: v.page,
+    ...(v.layout !== undefined && { layout: v.layout }),
+    space: v.space,
+    ...(region && { region }),
+  };
+}
+
 /** Lists of short words without markup: what a policy's sources look like. */
 function checkPolicy(v: unknown): FramePolicy | null {
   if (!isObject(v)) return null;
@@ -413,7 +663,7 @@ function defined<T extends Record<string, unknown>>(o: T): T {
 /** The options the frame will use: known keys of the right type, the rest dropped. */
 export function checkOptions(v: unknown): FrameOptions {
   const out: FrameOptions = {};
-  const { pdf, image, cad, ifc, model, archive } = isObject(v) ? v : {};
+  const { pdf, image, cad, ifc, model, archive, conversion, media } = isObject(v) ? v : {};
   if (isObject(pdf))
     out.pdf = defined({
       minZoom: num(pdf.minZoom),
@@ -441,6 +691,9 @@ export function checkOptions(v: unknown): FrameOptions {
       timeoutMs: num(cad.timeoutMs),
       maxPrimitives: num(cad.maxPrimitives),
       maxDecompressedBytes: num(cad.maxDecompressedBytes),
+      maxEntities: num(cad.maxEntities),
+      lineweights: oneOf(cad.lineweights, ["drawing", "always", "never"] as const) ? cad.lineweights : undefined,
+      monochrome: typeof cad.monochrome === "boolean" ? cad.monochrome : undefined,
     });
   if (isObject(ifc))
     out.ifc = defined({
@@ -463,6 +716,18 @@ export function checkOptions(v: unknown): FrameOptions {
       maxMembers: num(archive.maxMembers),
       maxCompressionRatio: num(archive.maxCompressionRatio),
     });
+  if (isObject(conversion)) {
+    const converter = oneOf(conversion.converter, ["exav", "external"] as const) ? conversion.converter : undefined;
+    // A package name the asset manifest lists, or a path or an http(s) URL.
+    const external = conversion.externalConverter;
+    const externalConverter =
+      typeof external === "string" &&
+      (/^(@[a-z0-9._-]{1,64}\/)?[a-z0-9._-]{1,64}$/.test(external) || /^(\.{0,2}\/|https?:\/\/)[^\s\u0000-\u001f\u007f]{1,500}$/.test(external))
+        ? external
+        : undefined;
+    out.conversion = defined({ timeoutMs: num(conversion.timeoutMs), maxMemory: num(conversion.maxMemory), converter, externalConverter });
+  }
+  if (isObject(media)) out.media = defined({ controls: oneOf(media.controls, ["native", "none"] as const) ? media.controls : undefined });
   return out;
 }
 
@@ -476,7 +741,19 @@ export function checkOpen(v: unknown, known: readonly BuiltinFormat[]): OpenMess
   if (!isText(f.name, MAX_PATH) || !isText(f.type, 256) || !isText(f.path, MAX_PATH)) return null;
   const format = f.format === null ? null : oneOf(f.format, known) ? f.format : undefined;
   if (format === undefined) return null;
-  return { type: "open", formats, file: { name: f.name, type: f.type, path: f.path, format }, source, options: checkOptions(v.options) };
+  const tree = v.tree === undefined ? undefined : checkTree(v.tree);
+  if (tree === null) return null;
+  return { type: "open", formats, file: { name: f.name, type: f.type, path: f.path, format }, source, ...(tree ? { tree } : {}), options: checkOptions(v.options), theme: checkTheme(v.theme) };
+}
+
+function checkTree(v: unknown): { path: string; paths: string[] } | null {
+  if (!isObject(v) || !isText(v.path, MAX_PATH) || !isList(v.paths, TREE.maxPaths)) return null;
+  const paths: string[] = [];
+  for (const p of v.paths) {
+    if (!isText(p, MAX_PATH)) return null;
+    paths.push(p);
+  }
+  return { path: v.path, paths };
 }
 
 function checkSource(v: unknown): OpenSource | null {
@@ -505,6 +782,45 @@ export function checkBytes(v: unknown): BytesMessage | null {
 
 export function checkCommand(v: unknown): CommandMessage | null {
   if (!isObject(v) || v.type !== "command" || !isInt(v.call) || !isInt(v.session) || !isText(v.action, 32) || !isList(v.args, 4)) return null;
-  if (!oneOf(v.target, ["pages", "zoom", "drag", "outline", "layers", "layouts", "ground", "archive"] as const)) return null;
+  if (!oneOf(v.target, COMMAND_TARGETS)) return null;
   return { type: "command", call: v.call, session: v.session, target: v.target, action: v.action, args: v.args };
 }
+
+export function checkThemeMessage(v: unknown): ThemeMessage | null {
+  return isObject(v) && v.type === "theme" ? { type: "theme", theme: checkTheme(v.theme) } : null;
+}
+
+/** A `raster`: a page and well-formed options; sizes are checked against the limits where the picture is drawn. */
+export function checkRaster(v: unknown): RasterMessage | null {
+  if (!isObject(v) || v.type !== "raster" || !isInt(v.id) || !isInt(v.session) || !isInt(v.page, 1)) return null;
+  const options = checkRasterOptions(v.options);
+  return options ? { type: "raster", id: v.id, session: v.session, page: v.page, options } : null;
+}
+
+/**
+ * The id of a message that claims to be a `raster` but is not one `checkRaster`
+ * takes, or null: the frame still owes it an answer.
+ */
+export function refusedRasterId(v: unknown): number | null {
+  return isObject(v) && v.type === "raster" && isInt(v.id) && !checkRaster(v) ? v.id : null;
+}
+
+export function checkUnraster(v: unknown): UnrasterMessage | null {
+  return isObject(v) && v.type === "unraster" && isInt(v.id) ? { type: "unraster", id: v.id } : null;
+}
+
+export function checkWatch(v: unknown): WatchMessage | null {
+  if (!isObject(v) || (v.type !== "watch" && v.type !== "unwatch") || !isInt(v.session) || !oneOf(v.key, WATCHED_KEYS)) return null;
+  return { type: v.type, session: v.session, key: v.key };
+}
+
+/** A `replace`, its file and source checked as an `open`'s are. */
+export function checkReplace(v: unknown, known: readonly BuiltinFormat[]): ReplaceMessage | null {
+  if (!isObject(v) || v.type !== "replace" || !isInt(v.call) || !isInt(v.generation, 1) || !isObject(v.file)) return null;
+  const source = checkSource(v.source);
+  const f = v.file;
+  if (!source || !isText(f.name, MAX_PATH) || !isText(f.type, 256) || !isText(f.path, MAX_PATH)) return null;
+  const format = f.format === null ? null : oneOf(f.format, known) ? f.format : undefined;
+  if (format === undefined) return null;
+  return { type: "replace", call: v.call, generation: v.generation, file: { name: f.name, type: f.type, path: f.path, format }, source };
+}
diff --git a/crates/exav-viewer/ts/ifc/index.ts b/crates/exav-viewer/ts/ifc/index.ts
index 24467f2e..7397440e 100644
--- a/crates/exav-viewer/ts/ifc/index.ts
+++ b/crates/exav-viewer/ts/ifc/index.ts
@@ -2,7 +2,16 @@
  * `@exav/viewer/ifc`: IFC models (IFC2X3, IFC4, IFC4X3) read and meshed by
  * exav's own engine (exav-render, Rust compiled to WebAssembly) in a
  * worker, drawn with three.js (a peer dependency). Categories can be
- * hidden, and a tapped element says what it is and where.
+ * hidden, and so can building storeys (`controllers.storeys`, when the model
+ * has two or more with something in them), and a tapped element says what it
+ * is and where.
+ *
+ * Pictures (`controllers.pictures`, one page: the model) are drawn again from
+ * the geometry at any size, by a renderer off screen, and the viewport is the
+ * camera in view. Both speak of a camera (`CameraRegion`) in the IFC's own
+ * coordinates (metres, Z up: `up` defaults to (0, 0, 1)), see `ModelFrame` in
+ * `../model/camera.ts`. A picture shows what the viewer shows (hidden
+ * categories stay hidden) and not its floor grid or selection.
  */
 import { MATCHERS } from "../core/formats.js";
 import type { FormatPlugin } from "../core/types.js";
@@ -26,13 +35,24 @@ export interface IfcOptions {
    * memory-constrained devices.
    */
   maxTriangles?: number;
+  /**
+   * Testing and tuning: the biggest tile (px a side) a picture
+   * (`controllers.pictures`) is drawn in. Never more than the GPU allows
+   * (and 2048); a picture needing more than 4096 tiles is refused.
+   */
+  rasterTile?: number;
+  /**
+   * Testing and tuning: pixels drawn along a side for each pixel of a picture,
+   * 1 to 8. Default 1 where the GPU antialiases, else 2.
+   */
+  rasterSupersample?: number;
 }
 
 export function ifc(options: IfcOptions = {}): FormatPlugin<IfcOptions> {
   return {
     id: "ifc",
     match: MATCHERS.ifc,
-    capabilities: ["layers", "ground", "selection"],
+    capabilities: ["layers", "storeys", "ground", "selection", "pictures", "viewport"],
     options,
     load: () => import("./renderer.js").then((m) => m.renderer),
   };
diff --git a/crates/exav-viewer/ts/ifc/renderer.ts b/crates/exav-viewer/ts/ifc/renderer.ts
index 3b36145f..66b516fc 100644
--- a/crates/exav-viewer/ts/ifc/renderer.ts
+++ b/crates/exav-viewer/ts/ifc/renderer.ts
@@ -4,6 +4,8 @@ import { writable } from "../core/store.js";
 import type { GroundController, LayersController, Renderer, Selection } from "../core/types.js";
 import { createModelEngine, DEFAULT_MAX_TRIANGLES, DEFAULT_TIMEOUT_MS, modelWarnings, type ParsedModel } from "../model/engine.js";
 import { elementBoxes, framingBox } from "../model/framing.js";
+import { createModelRaster } from "../model/raster.js";
+import { createStoreys, storeyShown } from "../model/storeys.js";
 import type { IfcOptions } from "./index.js";
 
 const GROUNDS = { light: "#ffffff", dark: "#212830" } as const;
@@ -55,19 +57,21 @@ export const renderer: Renderer<IfcOptions> = {
         ctx.source.bytes(),
       ]);
       if (destroyed || ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+      ctx.status({ phase: "loading", step: "read" });
       const bytes = source.slice();
-      const model: ParsedModel = await engine.call(
+      const model = (await engine.call(
         { kind: "ifc", bytes: bytes.buffer as ArrayBuffer, maxTriangles: ctx.options.maxTriangles ?? DEFAULT_MAX_TRIANGLES },
         [bytes.buffer as ArrayBuffer],
         ctx.options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-      );
+      )) as ParsedModel;
       // The engine's work is done: its memory goes back now.
       engine.destroy();
       if (destroyed || ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+      ctx.status({ phase: "loading", step: "render" });
       const { meta } = model;
 
       const root = document.createElement("div");
-      root.className = "exv-ifc";
+      root.className = "exav-viewer-ifc";
       host.append(root);
       disposers.push(() => root.remove());
 
@@ -79,7 +83,7 @@ export const renderer: Renderer<IfcOptions> = {
         gl.domElement.remove();
       });
       gl.setPixelRatio(Math.min(window.devicePixelRatio || 1, 2));
-      gl.domElement.className = "exv-model-canvas";
+      gl.domElement.className = "exav-viewer-model-canvas";
       root.append(gl.domElement);
 
       const scene = new three.Scene();
@@ -112,6 +116,9 @@ export const renderer: Renderer<IfcOptions> = {
 
       // One mesh (and one outline) per batch, grouped by class to hide.
       const byClass = new Map<string, Object3D[]>();
+      // The storey of each batch's objects, and the storeys hidden.
+      const storeyOf = new Map<Object3D, number | null>();
+      let hiddenStoreys: ReadonlySet<number> = new Set();
       const meshes: Mesh[] = [];
       /** Per batch, its triangle -> element. */
       const owner: Int32Array[] = meta.batches.map((b) => new Int32Array(b.indices / 3).fill(-1));
@@ -158,6 +165,7 @@ export const renderer: Renderer<IfcOptions> = {
           world.add(lines);
           objects.push(lines);
         }
+        for (const o of objects) storeyOf.set(o, b.storey ?? null);
         const list = byClass.get(b.class) ?? [];
         list.push(...objects);
         byClass.set(b.class, list);
@@ -166,7 +174,7 @@ export const renderer: Renderer<IfcOptions> = {
       const names = [...byClass.keys()].sort((a, b) => a.localeCompare(b));
       const visible = new Map(names.map((n) => [n, !HIDDEN_AT_FIRST.has(n)]));
       const applyVisibility = () => {
-        for (const [n, objects] of byClass) for (const o of objects) o.visible = visible.get(n) ?? true;
+        for (const [n, objects] of byClass) for (const o of objects) o.visible = (visible.get(n) ?? true) && storeyShown(storeyOf.get(o), hiddenStoreys);
       };
       applyVisibility();
 
@@ -204,6 +212,23 @@ export const renderer: Renderer<IfcOptions> = {
       controls.enableDamping = true;
       controls.update();
 
+      const raster = createModelRaster({
+        three,
+        scene,
+        camera,
+        controls,
+        renderer: gl,
+        // IFC is Z up in metres, the buffers are relative to the engine's origin.
+        frame: { zUp: true, origin: meta.origin, offset: [0, 0, 0] },
+        sphere: { center: [sphere.center.x, sphere.center.y, sphere.center.z], radius },
+        ground: () => ({ type: "solid", color: colors[ground] }),
+        // The viewer's own: the floor grid and the selection's highlight.
+        skip: (o) => o === grid || o === highlight,
+        tile: ctx.options.rasterTile,
+        supersample: ctx.options.rasterSupersample,
+      });
+      disposers.push(raster.destroy);
+
       let dirty = true;
       controls.addEventListener("change", () => (dirty = true));
       const paint = () => {
@@ -235,6 +260,7 @@ export const renderer: Renderer<IfcOptions> = {
       const tick = () => {
         frame = requestAnimationFrame(tick);
         controls.update();
+        raster.sync();
         if (!dirty) return;
         dirty = false;
         gl.render(scene, camera);
@@ -260,7 +286,9 @@ export const renderer: Renderer<IfcOptions> = {
         highlight = null;
       };
       disposers.push(clearHighlight);
+      let selected: number | null = null;
       const select = (index: number | null) => {
+        selected = index;
         clearHighlight();
         if (index === null) {
           selection.set(null);
@@ -325,6 +353,14 @@ export const renderer: Renderer<IfcOptions> = {
         setVisible: (id, v) => setVisible([id], v),
         setAll: (v) => setVisible(names, v),
       };
+      // Storeys: whole batches are hidden; a tapped element in a storey that goes is let go.
+      const storeys = createStoreys(meta, (hidden) => {
+        hiddenStoreys = hidden;
+        applyVisibility();
+        const storey = selected === null ? null : (meta.elements[selected]?.storey ?? null);
+        if (storey !== null && hidden.has(storey)) select(null);
+        dirty = true;
+      });
       const groundStore = writable(ground);
       const groundController: GroundController = {
         ...groundStore,
@@ -338,7 +374,7 @@ export const renderer: Renderer<IfcOptions> = {
       const warnings = writable(modelWarnings(meta, "ifc"));
       ctx.status(meta.elements.length > 0 ? { phase: "ready" } : { phase: "empty" });
       return {
-        controllers: { layers, ground: groundController, selection, warnings },
+        controllers: { layers, ...(storeys ? { storeys } : {}), ground: groundController, selection, warnings, pictures: raster.pictures, viewport: raster.viewport },
         resize,
         destroy,
       };
diff --git a/crates/exav-viewer/ts/image/index.ts b/crates/exav-viewer/ts/image/index.ts
index 78623b5d..42ea9a35 100644
--- a/crates/exav-viewer/ts/image/index.ts
+++ b/crates/exav-viewer/ts/image/index.ts
@@ -3,7 +3,8 @@
  * draws on (annotations, markers) and a way to redraw it sharp past its
  * resolution. With `wasmDecoders`, the formats browsers do not draw (TIFF in
  * most of them, BMP variants, ICO, PNM, QOI, DDS, farbfeld, HDR, JPEG 2000,
- * JBIG2) are decoded by exav-render's memory-safe decoders in WebAssembly.
+ * JBIG2, JPEG XL, and camera RAW files, shown by the largest preview they
+ * embed) are decoded by exav-render's memory-safe decoders in WebAssembly.
  */
 import { MATCHERS, WASM_IMAGES } from "../core/formats.js";
 import type { DetailSource, FormatMatcher, FormatPlugin, ImageSurface, OverlayHost, ViewerFile } from "../core/types.js";
@@ -56,15 +57,19 @@ export interface ImageOptions<Meta = unknown> {
   crossOrigin?: "anonymous" | "use-credentials" | null;
 }
 
-function merge(a: FormatMatcher, b: FormatMatcher): FormatMatcher {
-  return { types: [...(a.types ?? []), ...(b.types ?? [])], extensions: [...(a.extensions ?? []), ...(b.extensions ?? [])] };
+function merge(...matchers: FormatMatcher[]): FormatMatcher {
+  return {
+    types: matchers.flatMap((m) => m.types ?? []),
+    extensions: matchers.flatMap((m) => m.extensions ?? []),
+    extensionOverrides: matchers.flatMap((m) => m.extensionOverrides ?? []),
+  };
 }
 
 export function image<Meta = unknown>(options: ImageOptions<Meta> = {}): FormatPlugin<ImageOptions<Meta>> {
   return {
     id: "image",
     match: options.wasmDecoders ? merge(MATCHERS.image, WASM_IMAGES) : MATCHERS.image,
-    capabilities: ["zoom", "image-surface"],
+    capabilities: ["zoom", "image-surface", "pictures", "viewport"],
     options,
     load: () => import("./renderer.js").then((m) => m.renderer as never),
   };
diff --git a/crates/exav-viewer/ts/image/renderer.test.ts b/crates/exav-viewer/ts/image/renderer.test.ts
index 4cf01c7a..f47fca0b 100644
--- a/crates/exav-viewer/ts/image/renderer.test.ts
+++ b/crates/exav-viewer/ts/image/renderer.test.ts
@@ -1,9 +1,14 @@
 import { afterEach, beforeAll, expect, it, vi } from "vitest";
 
 import type { Controllers, RenderContext, Status } from "../core/types.js";
+import { decodeInWorker as decode } from "./decode.js";
 import type { ImageOptions } from "./index.js";
 import { renderer } from "./renderer.js";
 
+// The WebAssembly decoder runs in a worker: its answers are the test's.
+vi.mock("./decode.js", () => ({ decodeInWorker: vi.fn(), toCanvas: vi.fn() }));
+const decodeInWorker = vi.mocked(decode);
+
 beforeAll(() => {
   globalThis.ResizeObserver ??= class {
     observe() {}
@@ -58,19 +63,19 @@ it("shows the next document of the session in place of the first, keeping the zo
     status() {},
     controllers() {},
   } as unknown as RenderContext<ImageOptions>);
-  const root = host.querySelector<HTMLElement>(".exv-image")!;
+  const root = host.querySelector<HTMLElement>(".exav-viewer-image")!;
   Object.defineProperty(root, "clientWidth", { value: 200 });
   Object.defineProperty(root, "clientHeight", { value: 200 });
   handle.resize!();
   const surface = handle.controllers.image!;
   handle.controllers.zoom!.setScale(3, { x: 20, y: 20 });
-  const first = host.querySelector(".exv-image-picture");
+  const first = host.querySelector(".exav-viewer-image-picture");
 
   await handle.replace!({ file: file("wide-2.png", "two"), source: source("wide-2.png"), signal });
-  const second = host.querySelector<HTMLImageElement>(".exv-image-picture")!;
+  const second = host.querySelector<HTMLImageElement>(".exav-viewer-image-picture")!;
   expect(second).not.toBe(first);
   expect(second.src).toBe("wide-2.png");
-  expect(host.querySelectorAll(".exv-image-picture")).toHaveLength(1);
+  expect(host.querySelectorAll(".exav-viewer-image-picture")).toHaveLength(1);
   expect(surface.get().scale).toBe(3);
   expect(events).toEqual(["detail one", "overlay one", "detail two", "overlay gone one", "overlay two"]);
 
@@ -93,11 +98,11 @@ it("leaves the picture as it was when the next one cannot be read", async () =>
     status() {},
     controllers() {},
   } as unknown as RenderContext<ImageOptions>);
-  const shown = host.querySelector(".exv-image-picture");
+  const shown = host.querySelector(".exav-viewer-image-picture");
   const gone = new AbortController();
   gone.abort();
   await expect(handle.replace!({ file: { id: "a", name: "b", source: { url: "wide-2.png" } }, source: source("wide-2.png"), signal: gone.signal })).rejects.toThrow();
-  expect(host.querySelector(".exv-image-picture")).toBe(shown);
+  expect(host.querySelector(".exav-viewer-image-picture")).toBe(shown);
   handle.destroy();
 });
 
@@ -133,6 +138,53 @@ it("publishes its controllers before it says ready", async () => {
   const host = document.createElement("div");
   const handle = await renderer.mount(host, ctx);
   expect(events).toEqual(["status:loading", "controllers", "status:ready"]);
-  expect(Object.keys(published ?? {}).sort()).toEqual(["image", "zoom"]);
+  expect(Object.keys(published ?? {}).sort()).toEqual(["image", "pictures", "viewport", "zoom"]);
+  expect(published!.pictures!.get()).toEqual({ count: 1, space: "pixels" });
+  // One page: no other is drawn.
+  expect(await published!.pictures!.render(2, 100)).toBeNull();
+  await expect(published!.pictures!.raster(2, { longEdge: 100 })).rejects.toMatchObject({ code: "invalid" });
   handle.destroy();
 });
+
+/** A file the browser does not draw, so that exav-render's decoder is asked, and answers with `reason`. */
+async function mountUndrawable(reason: string) {
+  vi.stubGlobal("Image", function () {
+    const img = document.createElement("img");
+    Object.defineProperty(img, "src", {
+      get: () => "",
+      set: (value: string) => {
+        if (value) queueMicrotask(() => img.onerror?.(new Event("error")));
+      },
+    });
+    return img;
+  });
+  decodeInWorker.mockRejectedValue(new Error(reason));
+  const statuses: Status[] = [];
+  const ctx = {
+    options: { wasmDecoders: true },
+    file: { id: "a", name: "IMG_0001.CR3", source: { url: "a.cr3" } },
+    source: { url: async () => "a.cr3", bytes: async () => new Uint8Array([1, 2, 3]) },
+    signal: new AbortController().signal,
+    status: (s: Status) => statuses.push(s),
+    controllers() {},
+  } as unknown as RenderContext<ImageOptions>;
+  try {
+    return { statuses, handle: await renderer.mount(document.createElement("div"), ctx), error: undefined };
+  } catch (error) {
+    return { statuses, handle: undefined, error };
+  }
+}
+
+it("says a camera RAW file with no preview holds none, in a status of its own", async () => {
+  const { statuses, handle } = await mountUndrawable("no-preview");
+  expect(handle).toBeDefined();
+  expect(statuses).toEqual([{ phase: "loading" }, { phase: "error", error: { code: "image_no_preview", cause: expect.any(Error) } }]);
+});
+
+it("leaves every other decoder failure to the viewer's own error for an image", async () => {
+  for (const reason of ["undecodable", "too-large", "unsupported"]) {
+    const { statuses, error } = await mountUndrawable(reason);
+    expect(error, reason).toEqual(new Error(reason));
+    expect(statuses, reason).toEqual([{ phase: "loading" }]);
+  }
+});
diff --git a/crates/exav-viewer/ts/image/renderer.ts b/crates/exav-viewer/ts/image/renderer.ts
index 2c7ea618..eed25efb 100644
--- a/crates/exav-viewer/ts/image/renderer.ts
+++ b/crates/exav-viewer/ts/image/renderer.ts
@@ -1,7 +1,64 @@
-import type { Renderer, SourceReader, ViewerFile } from "../core/types.js";
+import { planRect, type RectPlan } from "../core/pictures.js";
+import { bitmapOf, createCanvas, createPictures, release } from "../core/raster.js";
+import { derived } from "../core/store.js";
+import type { DetailSource, RasterRect, Renderer, SourceReader, Viewport, ViewportController, ViewerFile } from "../core/types.js";
 import { decodeInWorker, toCanvas } from "./decode.js";
 import type { ImageOptions } from "./index.js";
 import { createSurface, SURFACE_DEFAULTS, type SurfaceOptions } from "./surface.js";
+import { isSvg, svgDetail, svgSize } from "./svg.js";
+
+type Picture = {
+  picture: HTMLImageElement | HTMLCanvasElement;
+  natural: { width: number; height: number };
+  /** An SVG the browser draws, at any size. */
+  vector: boolean;
+};
+
+/** The host's detail source, or for an SVG one that draws it again at the zoom's resolution. */
+function detailOf(o: ImageOptions<unknown>, file: ViewerFile<unknown>, shown: Picture): DetailSource | undefined {
+  const own = o.detail?.(file);
+  if (own) return own;
+  return shown.picture instanceof HTMLImageElement && isSvg(file) ? svgDetail(shown.picture, shown.natural) : undefined;
+}
+
+/**
+ * `shown` drawn as a picture: `region` (pixels of the picture) at the plan's
+ * size, on its background, which is transparent unless one was asked for.
+ */
+async function drawRegion(shown: Picture, plan: RectPlan): Promise<ImageBitmap> {
+  const { canvas, ctx } = createCanvas(plan.width, plan.height);
+  try {
+    if (plan.background !== "transparent") {
+      ctx.fillStyle = plan.background;
+      ctx.fillRect(0, 0, plan.width, plan.height);
+    }
+    ctx.imageSmoothingEnabled = true;
+    ctx.imageSmoothingQuality = "high";
+    const { x, y, width, height } = plan.region;
+    if (shown.vector) {
+      // The whole picture at the plan's scale, moved so the region falls on the canvas, which cuts it:
+      // browsers differ in what a source rectangle of an SVG with no size of its own is.
+      const kx = plan.width / width;
+      const ky = plan.height / height;
+      ctx.drawImage(shown.picture, -x * kx, -y * ky, shown.natural.width * kx, shown.natural.height * ky);
+      return await bitmapOf(canvas);
+    }
+    // A region reaching past the picture shows the background there: the source rectangle is cut to the picture, the target with it.
+    const sx = Math.max(0, x);
+    const sy = Math.max(0, y);
+    const sw = Math.min(shown.natural.width, x + width) - sx;
+    const sh = Math.min(shown.natural.height, y + height) - sy;
+    if (sw > 0 && sh > 0) {
+      const kx = plan.width / width;
+      const ky = plan.height / height;
+      ctx.drawImage(shown.picture, sx, sy, sw, sh, (sx - x) * kx, (sy - y) * ky, sw * kx, sh * ky);
+    }
+    return await bitmapOf(canvas);
+  } catch (error) {
+    release(canvas);
+    throw error;
+  }
+}
 
 const DEFAULT_MAX_DECODE = 256 * 1024 * 1024;
 
@@ -33,15 +90,19 @@ async function pictureOf(
   source: SourceReader,
   signal: AbortSignal,
   o: ImageOptions<unknown>,
-): Promise<{ picture: HTMLImageElement | HTMLCanvasElement; natural: { width: number; height: number } }> {
+): Promise<Picture> {
   let picture: HTMLImageElement | HTMLCanvasElement;
   let natural: { width: number; height: number };
+  let vector = false;
   try {
     // An `<img>` cannot send `init` (headers, credentials): such a URL is
-    // fetched by the source and shown from an object URL.
+    // fetched by the source and shown from an object URL. Nor does it sniff
+    // SVG: bytes the host gave are typed as what they were detected as.
     const given = file.source;
-    const fetched = !!given && "url" in given && !!given.init;
-    const src = fetched ? URL.createObjectURL(await source.blob()) : await source.url();
+    const byUrl = !!given && "url" in given;
+    const svg = isSvg(file) && !(byUrl && !given.init);
+    const fetched = (byUrl && !!given.init) || svg;
+    const src = fetched ? URL.createObjectURL(svg ? new Blob([(await source.bytes()).slice()], { type: "image/svg+xml" }) : await source.blob()) : await source.url();
     let img: HTMLImageElement;
     try {
       img = await loadImg(src, o.crossOrigin === undefined ? "anonymous" : o.crossOrigin, signal);
@@ -50,7 +111,10 @@ async function pictureOf(
       if (fetched) URL.revokeObjectURL(src);
     }
     picture = img;
+    vector = isSvg(file);
     natural = { width: img.naturalWidth, height: img.naturalHeight };
+    // An SVG may state no size, or one the browser does not report.
+    if (isSvg(file) && (!natural.width || !natural.height)) natural = svgSize(await source.bytes());
   } catch (error) {
     if (signal.aborted || !o.wasmDecoders) throw error;
     // What the browser does not draw, exav-render does. A copy is
@@ -59,10 +123,11 @@ async function pictureOf(
     const decoded = await decodeInWorker(bytes.buffer as ArrayBuffer, o.maxDecodeBytes ?? DEFAULT_MAX_DECODE, signal);
     if (signal.aborted) throw new DOMException("aborted", "AbortError");
     picture = toCanvas(decoded);
+    vector = false;
     natural = { width: decoded.width, height: decoded.height };
   }
   if (!natural.width || !natural.height) throw new Error("the image has no size");
-  return { picture, natural };
+  return { picture, natural, vector };
 }
 
 export const renderer: Renderer<ImageOptions<unknown>> = {
@@ -71,7 +136,19 @@ export const renderer: Renderer<ImageOptions<unknown>> = {
     let file = ctx.file as ViewerFile<unknown>;
     ctx.status({ phase: "loading" });
 
-    const first = await pictureOf(file, ctx.source, ctx.signal, o);
+    let first: Picture;
+    try {
+      first = await pictureOf(file, ctx.source, ctx.signal, o);
+    } catch (error) {
+      // A camera RAW file that embeds no preview is said so, not as an image
+      // that would not decode.
+      if (!ctx.signal.aborted && error instanceof Error && error.message === "no-preview") {
+        ctx.status({ phase: "error", error: { code: "image_no_preview", cause: error } });
+        return { controllers: {}, resize: () => {}, destroy: () => {} };
+      }
+      throw error;
+    }
+    let shown = first;
     let picture = first.picture;
 
     let surfaceRef: ReturnType<typeof createSurface> | null = null;
@@ -85,29 +162,54 @@ export const renderer: Renderer<ImageOptions<unknown>> = {
       ...(o.detailDelayMs !== undefined && { detailDelayMs: o.detailDelayMs }),
       ...(o.detailMargin !== undefined && { detailMargin: o.detailMargin }),
       ...(o.detailMaxPixels !== undefined && { detailMaxPixels: o.detailMaxPixels }),
-      detail: o.detail?.(file),
+      detail: detailOf(o, file, first),
       onTap: o.onTap && ((point, event, screen) => surfaceRef && o.onTap!(file, point, { surface: surfaceRef, event, screen })),
     };
     const surface = createSurface(host, picture, first.natural, surfaceOptions);
     surfaceRef = surface;
     let overlay = o.overlay?.(file)?.mount(surface);
+    const { controller: pictures } = createPictures({
+      count: 1,
+      space: "pixels",
+      async raster(page, options) {
+        const { width, height } = shown.natural;
+        const view = viewport.get();
+        const plan = planRect(options, { x: 0, y: 0, width, height }, { x: 1, y: 1 }, view ? (view.region as RasterRect) : null, "transparent");
+        return { bitmap: await drawRegion(shown, plan), width: plan.width, height: plan.height, page, space: "pixels", region: plan.region };
+      },
+    });
+    // What the surface shows, as pixels of the picture.
+    const viewport: ViewportController = derived(surface, (v): Viewport | null => {
+      const { width, height } = shown.natural;
+      if (!(v.page.width > 0 && v.page.height > 0 && v.scale > 0)) return null;
+      const w = v.page.width * v.scale;
+      const h = v.page.height * v.scale;
+      const left = Math.max(0, -v.x / w);
+      const top = Math.max(0, -v.y / h);
+      const right = Math.min(1, (v.container.width - v.x) / w);
+      const bottom = Math.min(1, (v.container.height - v.y) / h);
+      if (!(right > left && bottom > top)) return null;
+      return { space: "pixels", page: 1, region: { x: left * width, y: top * height, width: (right - left) * width, height: (bottom - top) * height } };
+    });
+    const controllers = { image: surface, zoom: surface.zoom, pictures, viewport };
     // Before "ready", as the plugin contract says: a plugin that shows this one
     // in a nested session follows the controllers from the status.
-    ctx.controllers({ image: surface, zoom: surface.zoom });
+    ctx.controllers(controllers);
     ctx.status({ phase: "ready" });
     return {
-      controllers: { image: surface, zoom: surface.zoom },
+      controllers,
       resize: surface.resize,
       // The same picture drawn again (marks added, a plan redrawn): the zoom
       // and position stay when its proportions do.
       async replace(next) {
-        const shown = await pictureOf(next.file as ViewerFile<unknown>, next.source, next.signal, o);
+        const incoming = await pictureOf(next.file as ViewerFile<unknown>, next.source, next.signal, o);
         if (next.signal.aborted) throw new DOMException("aborted", "AbortError");
         file = next.file as ViewerFile<unknown>;
-        surfaceOptions.detail = o.detail?.(file);
+        surfaceOptions.detail = detailOf(o, file, incoming);
         overlay?.destroy();
-        surface.replacePicture(shown.picture, shown.natural);
-        picture = shown.picture;
+        surface.replacePicture(incoming.picture, incoming.natural);
+        shown = incoming;
+        picture = incoming.picture;
         overlay = o.overlay?.(file)?.mount(surface);
       },
       destroy() {
diff --git a/crates/exav-viewer/ts/image/surface.test.ts b/crates/exav-viewer/ts/image/surface.test.ts
index 5d1ce752..73b7b655 100644
--- a/crates/exav-viewer/ts/image/surface.test.ts
+++ b/crates/exav-viewer/ts/image/surface.test.ts
@@ -50,7 +50,7 @@ describe("a surface's wheel", () => {
     const picture = document.createElement("canvas");
     const surface = createSurface(host, picture, { width: 100, height: 100 }, { ...SURFACE_DEFAULTS, ...options });
     open.push(surface);
-    const root = host.querySelector<HTMLElement>(".exv-image")!;
+    const root = host.querySelector<HTMLElement>(".exav-viewer-image")!;
     const send = (init: WheelEventInit) => root.dispatchEvent(new WheelEvent("wheel", { bubbles: true, cancelable: true, ...init }));
     return { surface, send, root };
   }
@@ -101,8 +101,8 @@ describe("a surface's wheel", () => {
     const before = surface.get();
     const next = document.createElement("canvas");
     surface.replacePicture(next, { width: 200, height: 200 });
-    expect(root.querySelector(".exv-image-picture")).toBe(next);
-    expect(root.querySelectorAll(".exv-image-picture")).toHaveLength(1);
+    expect(root.querySelector(".exav-viewer-image-picture")).toBe(next);
+    expect(root.querySelectorAll(".exav-viewer-image-picture")).toHaveLength(1);
     expect(surface.get()).toMatchObject({ scale: before.scale, x: before.x, y: before.y });
     // Another shape is fitted again.
     surface.replacePicture(document.createElement("canvas"), { width: 100, height: 200 });
diff --git a/crates/exav-viewer/ts/image/surface.ts b/crates/exav-viewer/ts/image/surface.ts
index 92bc74a7..a2532522 100644
--- a/crates/exav-viewer/ts/image/surface.ts
+++ b/crates/exav-viewer/ts/image/surface.ts
@@ -89,24 +89,24 @@ export function createSurface(
   options: SurfaceOptions,
 ): Surface {
   const root = document.createElement("div");
-  root.className = "exv-image";
+  root.className = "exav-viewer-image";
   root.style.touchAction = "none";
   const stage = document.createElement("div");
-  stage.className = "exv-image-stage";
-  picture.classList.add("exv-image-picture");
+  stage.className = "exav-viewer-image-stage";
+  picture.classList.add("exav-viewer-image-picture");
   picture.draggable = false;
   const detailCanvas = document.createElement("canvas");
-  detailCanvas.className = "exv-image-detail";
+  detailCanvas.className = "exav-viewer-image-detail";
   detailCanvas.setAttribute("aria-hidden", "true");
   const pageLayer = document.createElement("div");
-  pageLayer.className = "exv-image-page-layer";
+  pageLayer.className = "exav-viewer-image-page-layer";
   const screenLayer = document.createElement("div");
-  screenLayer.className = "exv-image-screen-layer";
+  screenLayer.className = "exav-viewer-image-screen-layer";
   stage.append(picture, detailCanvas, pageLayer);
   root.append(stage, screenLayer);
   host.append(root);
 
-  const slot = `exv-image-${++slots}`;
+  const slot = `exav-viewer-image-${++slots}`;
   const view = writable<ViewState>({ page: { width: 0, height: 0 }, container: { width: 0, height: 0 }, scale: 1, x: 0, y: 0 });
   const zoomState = writable({ scale: 1, min: options.minScale, max: options.maxScale });
   let frame = 0;
@@ -120,7 +120,7 @@ export function createSurface(
     stage.style.width = `${v.page.width}px`;
     stage.style.height = `${v.page.height}px`;
     stage.style.transform = `translate(${v.x}px, ${v.y}px) scale(${v.scale})`;
-    stage.style.setProperty("--exv-scale", String(v.scale));
+    stage.style.setProperty("--exav-viewer-scale", String(v.scale));
     zoomState.set({ scale: v.scale, min: options.minScale, max: options.maxScale });
   };
 
@@ -384,7 +384,7 @@ export function createSurface(
    */
   const replacePicture = (next: HTMLImageElement | HTMLCanvasElement, size: { width: number; height: number }) => {
     const sameShape = Math.abs(size.width / size.height - natural.width / natural.height) < 1e-3;
-    next.classList.add("exv-image-picture");
+    next.classList.add("exav-viewer-image-picture");
     next.draggable = false;
     const old = picture;
     old.replaceWith(next);
diff --git a/crates/exav-viewer/ts/image/svg.test.ts b/crates/exav-viewer/ts/image/svg.test.ts
new file mode 100644
index 00000000..6379126d
--- /dev/null
+++ b/crates/exav-viewer/ts/image/svg.test.ts
@@ -0,0 +1,23 @@
+import { expect, it } from "vitest";
+
+import { isSvg, svgSize } from "./svg.js";
+
+const size = (text: string) => svgSize(new TextEncoder().encode(text));
+
+it("reads the size an SVG states, its viewBox otherwise", () => {
+  expect(size('<svg xmlns="http://www.w3.org/2000/svg" width="40" height="30px">')).toEqual({ width: 40, height: 30 });
+  expect(size('<?xml version="1.0"?>\n<svg viewBox="0 0 200 100">')).toEqual({ width: 200, height: 100 });
+  expect(size("<svg viewBox='0,0,200,100' width='50'>")).toEqual({ width: 50, height: 25 });
+  expect(size('<svg viewBox="0 0 200 100" height="50">')).toEqual({ width: 100, height: 50 });
+  // A size in another unit or in percent says nothing in pixels.
+  expect(size('<svg width="100%" height="10cm" viewBox="0 0 4 3">')).toEqual({ width: 4, height: 3 });
+  expect(size('<svg width="10cm">')).toEqual({ width: 300, height: 150 });
+  expect(size("not an svg")).toEqual({ width: 300, height: 150 });
+  expect(size('<svg viewBox="0 0 -1 5">')).toEqual({ width: 300, height: 150 });
+});
+
+it("knows an SVG by its type or its name", () => {
+  expect(isSvg({ type: "image/svg+xml", name: "x" })).toBe(true);
+  expect(isSvg({ name: "Logo.SVG" })).toBe(true);
+  expect(isSvg({ name: "logo.svgz" })).toBe(false);
+});
diff --git a/crates/exav-viewer/ts/image/svg.ts b/crates/exav-viewer/ts/image/svg.ts
new file mode 100644
index 00000000..aa76a088
--- /dev/null
+++ b/crates/exav-viewer/ts/image/svg.ts
@@ -0,0 +1,57 @@
+/** SVG drawn by the browser from an `<img>`: its size, and its detail redrawn sharp. */
+import type { DetailSource, ViewerFile } from "../core/types.js";
+
+/** What browsers give an SVG that states no size at all. */
+const DEFAULT_SIZE = { width: 300, height: 150 };
+
+export function isSvg(file: Pick<ViewerFile, "type" | "name" | "path">): boolean {
+  return file.type === "image/svg+xml" || (file.path ?? file.name).toLowerCase().endsWith(".svg");
+}
+
+const length = (v: string | undefined) => {
+  const m = v === undefined ? null : /^\s*([\d.]+)\s*(px)?\s*$/.exec(v);
+  const n = m ? Number(m[1]) : NaN;
+  return n > 0 && Number.isFinite(n) ? n : null;
+};
+
+/**
+ * The size an SVG states on its root element: `width` and `height` in px,
+ * else its `viewBox`, else the browsers' default. Read from the first bytes,
+ * for an `<img>` that reports none (Firefox, for a `viewBox` alone).
+ */
+export function svgSize(head: Uint8Array): { width: number; height: number } {
+  const text = new TextDecoder().decode(head.subarray(0, 65_536));
+  const tag = /<svg\b([^>]*)>/i.exec(text)?.[1] ?? "";
+  const attr = (name: string) => new RegExp(`\\s${name}\\s*=\\s*("([^"]*)"|'([^']*)')`, "i").exec(tag)?.slice(2).find((v) => v !== undefined);
+  const width = length(attr("width"));
+  const height = length(attr("height"));
+  const box = attr("viewBox")
+    ?.trim()
+    .split(/[\s,]+/)
+    .map(Number);
+  const boxSize = box && box.length === 4 && box[2]! > 0 && box[3]! > 0 ? { width: box[2]!, height: box[3]! } : null;
+  if (width && height) return { width, height };
+  if (boxSize && width) return { width, height: (width * boxSize.height) / boxSize.width };
+  if (boxSize && height) return { width: (height * boxSize.width) / boxSize.height, height };
+  return boxSize ?? DEFAULT_SIZE;
+}
+
+/**
+ * The visible part drawn again at the zoom's resolution: an SVG is drawn at
+ * any size, where the `<img>` is scaled as a bitmap.
+ */
+export function svgDetail(img: HTMLImageElement, natural: { width: number; height: number }): DetailSource {
+  return async ({ pageWidth, region }) => {
+    const pageHeight = (pageWidth * natural.height) / natural.width;
+    const canvas = document.createElement("canvas");
+    canvas.width = Math.max(1, Math.round(region.width * pageWidth));
+    canvas.height = Math.max(1, Math.round(region.height * pageHeight));
+    try {
+      canvas.getContext("2d")?.drawImage(img, -region.x * pageWidth, -region.y * pageHeight, pageWidth, pageHeight);
+      return await createImageBitmap(canvas);
+    } finally {
+      canvas.width = 0;
+      canvas.height = 0;
+    }
+  };
+}
diff --git a/crates/exav-viewer/ts/media/index.ts b/crates/exav-viewer/ts/media/index.ts
index 061d0b21..385db9c6 100644
--- a/crates/exav-viewer/ts/media/index.ts
+++ b/crates/exav-viewer/ts/media/index.ts
@@ -5,25 +5,191 @@
  * still cannot play (HEVC outside Safari, say) is reported as such.
  */
 import { MATCHERS } from "../core/formats.js";
-import type { FormatPlugin, Renderer } from "../core/types.js";
+import { planRect, RasterError, throwIfAborted } from "../core/pictures.js";
+import { bitmapOf, createCanvas, createPictures, release } from "../core/raster.js";
+import { writable } from "../core/store.js";
+import type { FormatPlugin, MediaController, MediaState, Raster, RasterOptions, Renderer } from "../core/types.js";
 
-const player = (kind: "video" | "audio"): Renderer<Record<string, never>> => ({
+export interface MediaOptions {
+  /**
+   * "native" (default): the browser's player controls. "none": none, for a
+   * host that draws its own from the `media` controller; a click on a video
+   * plays or pauses it.
+   */
+  controls?: "native" | "none";
+}
+
+/** The end of the buffered range that holds `t`, or `t` when none does. */
+function bufferedAt(el: HTMLMediaElement, t: number): number {
+  const b = el.buffered;
+  for (let i = 0; i < b.length; i++) if (b.start(i) <= t && t <= b.end(i)) return b.end(i);
+  return t;
+}
+
+/** The element's state, every number a number the protocol takes. */
+export function stateOf(el: HTMLMediaElement, kind: "video" | "audio", blocked: boolean, waiting: boolean): MediaState {
+  const time = Number.isFinite(el.currentTime) && el.currentTime > 0 ? el.currentTime : 0;
+  const duration = el.duration === Infinity ? Infinity : Number.isFinite(el.duration) && el.duration > 0 ? el.duration : 0;
+  return {
+    kind,
+    paused: el.paused,
+    ended: el.ended,
+    currentTime: time,
+    duration,
+    buffered: bufferedAt(el, time),
+    volume: Math.min(1, Math.max(0, el.volume)),
+    muted: el.muted,
+    rate: el.playbackRate > 0 && el.playbackRate <= 16 ? el.playbackRate : 1,
+    waiting,
+    blocked,
+  };
+}
+
+/** How long a frame decoded but not yet presented is waited for. */
+const PRESENT_TRIES = 20;
+const PRESENT_WAIT_MS = 50;
+
+/**
+ * The frame `el` shows now, as a picture. The size is the frame's own unless
+ * one is asked for; a width and a height of another shape draw it whole
+ * (`fit` "contain", default) or filled ("cover"), never stretched, on
+ * `background` (transparent by default). A frame has no region. A video the
+ * page may not read (another origin that sends no CORS headers, which taints
+ * the canvas, or a URL given to the sandboxed frame, whose origin is opaque)
+ * is "unsupported", not a blank picture.
+ */
+export async function frameOf(el: Pick<HTMLVideoElement, "videoWidth" | "videoHeight" | "readyState"> & CanvasImageSource, page: number, options: RasterOptions): Promise<Raster> {
+  if (options.region !== undefined) throw new RasterError("invalid", "a video frame has no region");
+  const { videoWidth: width, videoHeight: height } = el;
+  if (el.readyState < 2 || !(width > 0 && height > 0)) throw new RasterError("failed", "the video has no frame to draw yet");
+  const plan = planRect(options, { x: 0, y: 0, width, height }, { x: 1, y: 1 }, null, "transparent");
+  const { canvas, ctx } = createCanvas(plan.width, plan.height);
+  try {
+    ctx.imageSmoothingQuality = "high";
+    const r = plan.region;
+    const sx = Math.max(0, r.x);
+    const sy = Math.max(0, r.y);
+    const sw = Math.min(width, r.x + r.width) - sx;
+    const sh = Math.min(height, r.y + r.height) - sy;
+    const kx = plan.width / r.width;
+    const ky = plan.height / r.height;
+    const [dx, dy, dw, dh] = [(sx - r.x) * kx, (sy - r.y) * ky, sw * kx, sh * ky];
+    for (let attempt = 0; ; attempt++) {
+      ctx.clearRect(0, 0, plan.width, plan.height);
+      ctx.drawImage(el, sx, sy, sw, sh, dx, dy, dw, dh);
+      let alpha: number;
+      try {
+        // A tainted canvas draws, and refuses to be read: ask for one pixel.
+        alpha = ctx.getImageData(Math.min(plan.width - 1, Math.floor(dx + dw / 2)), Math.min(plan.height - 1, Math.floor(dy + dh / 2)), 1, 1).data[3]!;
+      } catch {
+        throw new RasterError("unsupported", "this video cannot be read as a picture: it comes from another origin without CORS headers (or by URL to a sandboxed frame)");
+      }
+      if (alpha > 0) break;
+      // A frame decoded but not yet presented draws nothing, for a moment.
+      if (attempt >= PRESENT_TRIES) throw new RasterError("failed", "the video has not presented a frame to draw");
+      await new Promise((resolve) => setTimeout(resolve, PRESENT_WAIT_MS));
+      throwIfAborted(options.signal);
+    }
+    if (plan.background !== "transparent") {
+      ctx.globalCompositeOperation = "destination-over";
+      ctx.fillStyle = plan.background;
+      ctx.fillRect(0, 0, plan.width, plan.height);
+    }
+    return { bitmap: await bitmapOf(canvas), width: plan.width, height: plan.height, page, space: "frame" };
+  } catch (error) {
+    release(canvas);
+    throw error;
+  }
+}
+
+const EVENTS = ["play", "pause", "playing", "ended", "timeupdate", "durationchange", "loadedmetadata", "volumechange", "ratechange", "progress", "seeked", "emptied"];
+
+const player = (kind: "video" | "audio"): Renderer<MediaOptions> => ({
   async mount(host, ctx) {
     const url = await ctx.source.url();
+    const native = ctx.options.controls !== "none";
     const root = document.createElement("div");
-    root.className = `exv-media exv-media-${kind}`;
+    root.className = `exav-viewer-media exav-viewer-media-${kind}`;
     const el = document.createElement(kind);
-    el.controls = true;
+    el.controls = native;
     el.preload = "metadata";
     if (el instanceof HTMLVideoElement) el.playsInline = true;
+    let blocked = false;
+    let waiting = false;
+    const state = writable<MediaState>(stateOf(el, kind, blocked, waiting));
+    const sync = () => state.set(stateOf(el, kind, blocked, waiting));
+    const onWaiting = () => {
+      waiting = true;
+      sync();
+    };
+    const onFlowing = () => {
+      waiting = false;
+      sync();
+    };
+    for (const e of EVENTS) el.addEventListener(e, sync);
+    el.addEventListener("waiting", onWaiting);
+    el.addEventListener("playing", onFlowing);
+    el.addEventListener("canplay", onFlowing);
     el.onerror = () => ctx.status({ phase: "error", error: { code: "media", cause: el.error } });
+
+    const play = async () => {
+      try {
+        await el.play();
+        blocked = false;
+      } catch (error) {
+        // Refused for want of a click on the page, or the file cannot play
+        // (reported by `onerror`).
+        if (error instanceof DOMException && error.name === "NotAllowedError") blocked = true;
+      }
+      sync();
+    };
+    // Without the browser's controls, a click on the picture is the player's.
+    const toggle = () => void (el.paused || el.ended ? play() : el.pause());
+    if (!native) root.addEventListener("click", toggle);
+
     el.src = url;
     root.append(el);
     host.append(root);
     ctx.status({ phase: "ready" });
+    const media: MediaController = {
+      ...state,
+      play,
+      pause: () => el.pause(),
+      seek: (seconds) => {
+        if (!Number.isFinite(seconds)) return;
+        const end = Number.isFinite(el.duration) ? el.duration : Infinity;
+        el.currentTime = Math.min(Math.max(0, seconds), end);
+      },
+      setVolume: (volume) => {
+        if (Number.isFinite(volume)) el.volume = Math.min(1, Math.max(0, volume));
+      },
+      setMuted: (muted) => {
+        el.muted = muted;
+      },
+      setRate: (rate) => {
+        if (Number.isFinite(rate) && rate > 0) el.playbackRate = Math.min(16, Math.max(0.0625, rate));
+      },
+    };
+    // The picture is the frame on show; audio has none.
+    const pictures =
+      el instanceof HTMLVideoElement
+        ? createPictures({
+            count: 1,
+            space: "frame",
+            async raster(page, options) {
+              throwIfAborted(options.signal);
+              return frameOf(el, page, options);
+            },
+          }).controller
+        : undefined;
     return {
-      controllers: {},
+      controllers: { media, ...(pictures && { pictures }) },
       destroy() {
+        root.removeEventListener("click", toggle);
+        for (const e of EVENTS) el.removeEventListener(e, sync);
+        el.removeEventListener("waiting", onWaiting);
+        el.removeEventListener("playing", onFlowing);
+        el.removeEventListener("canplay", onFlowing);
         el.pause();
         el.removeAttribute("src");
         el.load();
@@ -33,10 +199,10 @@ const player = (kind: "video" | "audio"): Renderer<Record<string, never>> => ({
   },
 });
 
-export function video(): FormatPlugin<Record<string, never>> {
-  return { id: "video", match: MATCHERS.video, capabilities: [], options: {}, load: async () => player("video") };
+export function video(options: MediaOptions = {}): FormatPlugin<MediaOptions> {
+  return { id: "video", match: MATCHERS.video, capabilities: ["media", "pictures"], options, load: async () => player("video") };
 }
 
-export function audio(): FormatPlugin<Record<string, never>> {
-  return { id: "audio", match: MATCHERS.audio, capabilities: [], options: {}, load: async () => player("audio") };
+export function audio(options: MediaOptions = {}): FormatPlugin<MediaOptions> {
+  return { id: "audio", match: MATCHERS.audio, capabilities: ["media"], options, load: async () => player("audio") };
 }
diff --git a/crates/exav-viewer/ts/media/media.test.ts b/crates/exav-viewer/ts/media/media.test.ts
new file mode 100644
index 00000000..aaadb4a5
--- /dev/null
+++ b/crates/exav-viewer/ts/media/media.test.ts
@@ -0,0 +1,132 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { RasterError } from "../core/pictures.js";
+import { FakeCanvas, stubCanvas } from "../test/fake-canvas.js";
+import { frameOf, stateOf } from "./index.js";
+
+const ranges = (...r: [number, number][]) => ({ length: r.length, start: (i: number) => r[i]![0], end: (i: number) => r[i]![1] });
+const element = (over: Record<string, unknown>) =>
+  ({ paused: true, ended: false, currentTime: 0, duration: NaN, volume: 1, muted: false, playbackRate: 1, buffered: ranges(), ...over }) as unknown as HTMLMediaElement;
+
+it("reports a player's state in numbers the protocol takes", () => {
+  // Before its metadata, a player has no duration: 0.
+  expect(stateOf(element({}), "video", false, false)).toEqual({
+    kind: "video",
+    paused: true,
+    ended: false,
+    currentTime: 0,
+    duration: 0,
+    buffered: 0,
+    volume: 1,
+    muted: false,
+    rate: 1,
+    waiting: false,
+    blocked: false,
+  });
+  expect(stateOf(element({ duration: Infinity }), "audio", false, false).duration).toBe(Infinity);
+  expect(stateOf(element({ playbackRate: 0 }), "audio", false, false).rate).toBe(1);
+  expect(stateOf(element({ currentTime: NaN }), "audio", true, true)).toMatchObject({ currentTime: 0, blocked: true, waiting: true });
+});
+
+it("reports what is buffered from where it plays", () => {
+  const el = element({ currentTime: 12, duration: 60, buffered: ranges([0, 5], [10, 20], [30, 40]) });
+  expect(stateOf(el, "video", false, false).buffered).toBe(20);
+  expect(stateOf(element({ currentTime: 25, buffered: ranges([0, 5]) }), "video", false, false).buffered).toBe(25);
+});
+
+describe("the frame of a video as a picture", () => {
+  beforeEach(stubCanvas);
+  afterEach(() => vi.unstubAllGlobals());
+
+  const video = (over: Record<string, unknown> = {}) => ({ videoWidth: 640, videoHeight: 360, readyState: 4, ...over }) as unknown as HTMLVideoElement;
+  const code = (p: Promise<unknown>) => p.then(() => "none", (e) => (e instanceof RasterError ? e.code : `other: ${String(e)}`));
+
+  it("is the frame at its own size, or at the size asked with the shape kept", async () => {
+    const el = video();
+    const own = await frameOf(el, 1, { width: 640 });
+    expect([own.width, own.height, own.space, own.page, own.region]).toEqual([640, 360, "frame", 1, undefined]);
+    const canvas = FakeCanvas.made[0]!;
+    // Transparent unless a background is asked for.
+    expect(canvas.fills).toEqual([]);
+    expect(canvas.draws[0]).toEqual([el, 0, 0, 640, 360, 0, 0, 640, 360]);
+    const small = await frameOf(el, 1, { longEdge: 320 });
+    expect([small.width, small.height]).toEqual([320, 180]);
+  });
+
+  it("never stretches: contain draws it whole on the background, cover fills the picture", async () => {
+    const el = video();
+    await frameOf(el, 1, { width: 100, height: 100, background: "#000000" });
+    const contain = FakeCanvas.made[0]!;
+    expect(contain.fills[0]).toEqual(["#000000", 0, 0, 100, 100]);
+    const [, sx, sy, sw, sh, dx, dy, dw, dh] = contain.draws[0]!;
+    expect([sx, sy, sw, sh, dx, dw]).toEqual([0, 0, 640, 360, 0, 100]);
+    expect(dy).toBeCloseTo(21.875);
+    expect(dh).toBeCloseTo(56.25);
+    await frameOf(el, 1, { width: 100, height: 100, fit: "cover" });
+    const [, cx, cy, cw, ch, ...dest] = FakeCanvas.made[1]!.draws[0]!;
+    expect(cx).toBeCloseTo(140);
+    expect([cy, cw, ch]).toEqual([0, 360, 360]);
+    expect(dest).toEqual([0, 0, 100, 100]);
+  });
+
+  it("has no region", async () => {
+    expect(await code(frameOf(video(), 1, { width: 10, region: { x: 0, y: 0, width: 1, height: 1 } }))).toBe("invalid");
+    expect(await code(frameOf(video(), 1, { width: 10, region: "current" }))).toBe("invalid");
+    expect(FakeCanvas.made).toHaveLength(0);
+  });
+
+  it("is not drawn before there is a frame", async () => {
+    expect(await code(frameOf(video({ readyState: 1 }), 1, { width: 10 }))).toBe("failed");
+    expect(await code(frameOf(video({ videoWidth: 0 }), 1, { width: 10 }))).toBe("failed");
+  });
+
+  it("waits for a frame decoded but not yet presented, which draws nothing, and draws it again", async () => {
+    // Two reads of a transparent pixel, then the frame.
+    FakeCanvas.reads = [[0, 0, 0, 0], [0, 0, 0, 0]];
+    const r = await frameOf(video(), 1, { width: 64 });
+    const canvas = FakeCanvas.made[0]!;
+    expect(canvas.draws).toHaveLength(3);
+    expect(canvas.clears).toBe(3);
+    expect(r.width).toBe(64);
+  });
+
+  it("gives up on a frame that never comes, and stops waiting when aborted", async () => {
+    vi.useFakeTimers();
+    try {
+      FakeCanvas.reads = Array.from({ length: 100 }, () => [0, 0, 0, 0]);
+      const never = code(frameOf(video(), 1, { width: 64 }));
+      await vi.advanceTimersByTimeAsync(5000);
+      expect(await never).toBe("failed");
+      FakeCanvas.reads = Array.from({ length: 100 }, () => [0, 0, 0, 0]);
+      const abort = new AbortController();
+      const waiting = code(frameOf(video(), 1, { width: 64, signal: abort.signal }));
+      abort.abort();
+      await vi.advanceTimersByTimeAsync(100);
+      expect(await waiting).toBe("aborted");
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("puts the background behind the frame, so that it does not hide a frame not yet presented", async () => {
+    await frameOf(video(), 1, { width: 64, background: "#102030" });
+    const canvas = FakeCanvas.made[0]!;
+    expect(canvas.fills).toEqual([["#102030", 0, 0, 64, 36]]);
+    // Filled after the frame was drawn and read.
+    expect(canvas.draws).toHaveLength(1);
+  });
+
+  it("says unsupported for a video the page cannot read, and frees the canvas", async () => {
+    vi.spyOn(FakeCanvas.prototype, "getContext").mockReturnValue({
+      drawImage() {},
+      clearRect() {},
+      fillRect() {},
+      getImageData() {
+        throw new DOMException("tainted", "SecurityError");
+      },
+    } as never);
+    expect(await code(frameOf(video(), 1, { width: 64 }))).toBe("unsupported");
+    expect([FakeCanvas.made[0]!.width, FakeCanvas.made[0]!.height]).toEqual([0, 0]);
+    vi.restoreAllMocks();
+  });
+});
diff --git a/crates/exav-viewer/ts/model/buffers.ts b/crates/exav-viewer/ts/model/buffers.ts
new file mode 100644
index 00000000..0b9eb8a1
--- /dev/null
+++ b/crates/exav-viewer/ts/model/buffers.ts
@@ -0,0 +1,36 @@
+import { createSourceReader } from "../core/source.js";
+import { resolveInTree } from "../core/tree.js";
+import type { FileTree } from "../core/types.js";
+
+/** The bytes of the buffer files of a glTF held at once. */
+const MAX_BUFFER_BYTES = 1024 * 1024 * 1024;
+
+/**
+ * The buffer files a glTF names (`uris`, as the document writes them:
+ * relative, percent-encoded) that the tree has, by the URI that names each.
+ * One it does not have is left out, and the reader says so.
+ */
+export async function readBuffers(tree: FileTree, uris: string[], signal: AbortSignal): Promise<{ name: string; bytes: ArrayBuffer }[]> {
+  const out: { name: string; bytes: ArrayBuffer }[] = [];
+  let held = 0;
+  for (const uri of uris) {
+    let path = uri;
+    try {
+      path = decodeURIComponent(uri);
+    } catch {
+      // A name that is not valid percent-encoding is looked for as written.
+    }
+    const found = resolveInTree(tree, path);
+    if (found === null) continue;
+    const reader = createSourceReader(await tree.open(found, signal), signal);
+    try {
+      const bytes = (await reader.bytes()).slice();
+      held += bytes.byteLength;
+      if (held > MAX_BUFFER_BYTES) break;
+      out.push({ name: uri, bytes: bytes.buffer as ArrayBuffer });
+    } finally {
+      reader.dispose();
+    }
+  }
+  return out;
+}
diff --git a/crates/exav-viewer/ts/model/camera.test.ts b/crates/exav-viewer/ts/model/camera.test.ts
new file mode 100644
index 00000000..8d413b5d
--- /dev/null
+++ b/crates/exav-viewer/ts/model/camera.test.ts
@@ -0,0 +1,180 @@
+import { describe, expect, it } from "vitest";
+
+import { RasterError } from "../core/pictures.js";
+import type { CameraRegion } from "../core/types.js";
+import {
+  cameraRegion,
+  depthRange,
+  groundCircle,
+  MAX_TILE,
+  modelUp,
+  parseGround,
+  sameRegion,
+  sceneCamera,
+  supersampling,
+  tileSize,
+  toModelPoint,
+  toModelVector,
+  toScenePoint,
+  toSceneVector,
+  viewOffset,
+  type ModelFrame,
+  type Vec3,
+} from "./camera.js";
+
+const close = (a: readonly number[], b: readonly number[], digits = 9) => {
+  expect(a).toHaveLength(b.length);
+  a.forEach((v, i) => expect(v).toBeCloseTo(b[i]!, digits));
+};
+const code = (f: () => unknown) => {
+  try {
+    f();
+    return "none";
+  } catch (e) {
+    return e instanceof RasterError ? e.code : `other: ${String(e)}`;
+  }
+};
+
+const zUp: ModelFrame = { zUp: true, origin: [0, 0, 0], offset: [0, 0, 0] };
+const yUp: ModelFrame = { zUp: false, origin: [0, 0, 0], offset: [0, 0, 0] };
+
+describe("the model's coordinates against the scene's", () => {
+  it("stands a Z-up model up: model Z is scene Y, model Y is scene -Z", () => {
+    close(toScenePoint(zUp, [1, 2, 3]), [1, 3, -2]);
+    close(toSceneVector(zUp, [0, 0, 1]), [0, 1, 0]);
+    close(toSceneVector(zUp, [0, 1, 0]), [0, 0, -1]);
+    close(modelUp(zUp), [0, 0, 1]);
+  });
+
+  it("leaves a Y-up model's axes alone", () => {
+    close(toScenePoint(yUp, [1, 2, 3]), [1, 2, 3]);
+    close(modelUp(yUp), [0, 1, 0]);
+  });
+
+  it("subtracts the engine's origin, then adds the viewer's offset, and undoes both", () => {
+    const f: ModelFrame = { zUp: true, origin: [1000, 2000, 30], offset: [5, 6, 7] };
+    close(toScenePoint(f, [1001, 2002, 33]), [1 + 5, 3 + 6, -2 + 7]);
+    const p: Vec3 = [1234.5, 2345.25, 12.125];
+    close(toModelPoint(f, toScenePoint(f, p)), p, 9);
+    close(toModelVector(f, toSceneVector(f, [0.2, -0.3, 0.9])), [0.2, -0.3, 0.9]);
+  });
+});
+
+describe("a region as a camera", () => {
+  const region: CameraRegion = { position: [10, 0, 5], target: [0, 0, 0], projection: { type: "perspective", fov: 40 }, aspect: 1.5 };
+
+  it("takes the model's up axis when the region names none, and always names it going back", () => {
+    const c = sceneCamera(zUp, region);
+    close(c.up, [0, 1, 0]);
+    close(c.position, [10, 5, 0]);
+    const back = cameraRegion(zUp, c);
+    close(back.up!, [0, 0, 1]);
+    close(back.position, region.position);
+    close(back.target, region.target);
+    expect(back.projection).toEqual(region.projection);
+    expect(back.aspect).toBe(1.5);
+    // Y up: the default is Y.
+    close(sceneCamera(yUp, region).up, [0, 1, 0]);
+    close(cameraRegion(yUp, sceneCamera(yUp, region)).up!, [0, 1, 0]);
+  });
+
+  it("keeps an up the region gives", () => {
+    close(sceneCamera(zUp, { ...region, up: [0, 1, 0] }).up, [0, 0, -1]);
+  });
+
+  it("refuses a camera with no view", () => {
+    expect(code(() => sceneCamera(zUp, { ...region, target: region.position }))).toBe("invalid");
+    expect(code(() => sceneCamera(zUp, { ...region, position: [0, 0, 5], target: [0, 0, 0] }))).toBe("invalid");
+    expect(code(() => sceneCamera(zUp, { ...region, up: [0, 0, 0] }))).toBe("invalid");
+    expect(code(() => sceneCamera(zUp, { ...region, position: [0, 0, 5], target: [0, 0, 0], up: [0, 1, 0] }))).toBe("none");
+  });
+});
+
+describe("two views being one", () => {
+  const a: CameraRegion = { position: [10, 0, 5], target: [0, 0, 0], up: [0, 0, 1], projection: { type: "perspective", fov: 40 }, aspect: 1.5 };
+  it("ignores what a settling orbit leaves, and sees any real move", () => {
+    expect(sameRegion(a, { ...a, position: [10 + 1e-9, 0, 5] })).toBe(true);
+    expect(sameRegion(a, { ...a, position: [10.01, 0, 5] })).toBe(false);
+    expect(sameRegion(a, { ...a, target: [0, 0.01, 0] })).toBe(false);
+    expect(sameRegion(a, { ...a, aspect: 1.6 })).toBe(false);
+    expect(sameRegion(a, { ...a, projection: { type: "perspective", fov: 41 } })).toBe(false);
+    expect(sameRegion(a, { ...a, projection: { type: "orthographic", height: 3 } })).toBe(false);
+    expect(sameRegion(a, { ...a, up: [0, 1, 0] })).toBe(false);
+  });
+});
+
+describe("near and far planes", () => {
+  const sphere = { center: [0, 0, 0] as Vec3, radius: 1 };
+  const viewer = { near: 0.01, far: 100 };
+  const persp = (position: Vec3) => sceneCamera(yUp, { position, target: [0, 0, 0], projection: { type: "perspective", fov: 45 }, aspect: 1 });
+  it("keeps the viewer's for a perspective camera near the model, goes further for a far one", () => {
+    expect(depthRange(persp([0, 0, 5]), sphere, viewer)).toEqual({ near: 0.01, far: 100 });
+    expect(depthRange(persp([0, 0, 500]), sphere, viewer)).toEqual({ near: 0.01, far: 502 });
+  });
+  it("takes the model's depth for an orthographic one, behind the camera if need be", () => {
+    const o = sceneCamera(yUp, { position: [0, 0, 5], target: [0, 0, 0], projection: { type: "orthographic", height: 4 }, aspect: 1 });
+    expect(depthRange(o, sphere, viewer)).toEqual({ near: 3, far: 7 });
+    const inside = sceneCamera(yUp, { position: [0, 0, 0.5], target: [0, 0, -1], projection: { type: "orthographic", height: 4 }, aspect: 1 });
+    expect(depthRange(inside, sphere, viewer).near).toBeLessThan(0);
+  });
+});
+
+describe("tiles", () => {
+  const limits = { texture: 8192, renderbuffer: 4096, viewport: [16384, 16384] as const };
+  it("is the smallest limit, never past MAX_TILE, and less when each pixel takes samples", () => {
+    expect(MAX_TILE).toBe(2048);
+    expect(tileSize(limits, 1)).toBe(2048);
+    expect(tileSize({ ...limits, renderbuffer: 1000 }, 1)).toBe(1000);
+    expect(tileSize({ ...limits, viewport: [512, 16384] }, 1)).toBe(512);
+    expect(tileSize({ ...limits, texture: 1000 }, 2)).toBe(500);
+  });
+  it("can be forced smaller and never larger", () => {
+    expect(tileSize(limits, 1, 64)).toBe(64);
+    expect(tileSize(limits, 1, 100000)).toBe(2048);
+    expect(tileSize({ ...limits, renderbuffer: 300 }, 1, 1000)).toBe(300);
+    expect(code(() => tileSize(limits, 1, 0))).toBe("invalid");
+    expect(code(() => tileSize(limits, 1, 1.5))).toBe("invalid");
+    expect(code(() => tileSize(limits, 0))).toBe("invalid");
+    expect(code(() => tileSize({ texture: 0, renderbuffer: 4096, viewport: [4096, 4096] }, 1))).toBe("too-large");
+  });
+  it("supersamples where the context does not antialias", () => {
+    expect(supersampling(true)).toBe(1);
+    expect(supersampling(false)).toBe(2);
+    expect(supersampling(true, 3)).toBe(3);
+  });
+  it("places a tile within the picture in rendered pixels", () => {
+    expect(viewOffset(300, 200, { x: 128, y: 64, width: 100, height: 50 }, 2)).toEqual({ fullWidth: 600, fullHeight: 400, x: 256, y: 128, width: 200, height: 100 });
+  });
+});
+
+describe("the ground", () => {
+  const authored = "radial-gradient(circle at 50% 30%, #ffffff 0%, #e2e8f0 55%, #cbd5e1 100%)";
+  const computed = "radial-gradient(circle at 50% 30%, rgb(255, 255, 255) 0%, rgb(226, 232, 240) 55%, rgb(203, 213, 225) 100%)";
+  it("reads the viewer's gradient, as authored and as a browser computes it", () => {
+    for (const [image, first] of [
+      [authored, "#ffffff"],
+      [computed, "rgb(255, 255, 255)"],
+    ] as const) {
+      expect(parseGround(image, "rgba(0, 0, 0, 0)")).toEqual({
+        type: "radial",
+        at: [0.5, 0.3],
+        stops: [
+          { offset: 0, color: first },
+          { offset: 0.55, color: expect.any(String) },
+          { offset: 1, color: expect.any(String) },
+        ],
+      });
+    }
+  });
+  it("falls back to the middle colour for a gradient it does not read, and refuses a url", () => {
+    expect(parseGround("radial-gradient(#ffffff 0%, #e2e8f0 55%, #cbd5e1 100%)", "")).toEqual({ type: "solid", color: "#e2e8f0" });
+    expect(parseGround("url(http://x/y.png)", "")).toEqual({ type: "none" });
+    expect(parseGround("none", "rgb(1, 2, 3)")).toEqual({ type: "solid", color: "rgb(1, 2, 3)" });
+    expect(parseGround("none", "rgba(0, 0, 0, 0)")).toEqual({ type: "none" });
+  });
+  it("reaches the farthest corner", () => {
+    const c = groundCircle([0.5, 0.3], 200, 100);
+    expect([c.x, c.y]).toEqual([100, 30]);
+    expect(c.radius).toBeCloseTo(Math.hypot(100, 70), 9);
+  });
+});
diff --git a/crates/exav-viewer/ts/model/camera.ts b/crates/exav-viewer/ts/model/camera.ts
new file mode 100644
index 00000000..f245db6b
--- /dev/null
+++ b/crates/exav-viewer/ts/model/camera.ts
@@ -0,0 +1,234 @@
+/**
+ * The maths of a model's pictures, with no WebGL and no DOM: the model's
+ * coordinates against the scene's, the camera as a region, the limits of a
+ * tile, the ground. `raster.ts` draws with it.
+ */
+import { RasterError, type Tile } from "../core/pictures.js";
+import { isColor } from "../core/theme.js";
+import type { CameraRegion } from "../core/types.js";
+
+export type Vec3 = readonly [number, number, number];
+
+/**
+ * How the viewer places a model in its scene, which is three.js's: Y up.
+ * `scene = turn(point - origin) + offset`, where `turn` stands a Z-up model
+ * up ((x, y, z) -> (x, z, -y)) and does nothing to a Y-up one. The model's
+ * coordinates, those of `CameraRegion`, are the file's own: `origin` is the
+ * engine's offset (a georeferenced IFC, whose buffers are relative to it).
+ * Units are the same on both sides.
+ */
+export interface ModelFrame {
+  zUp: boolean;
+  origin: Vec3;
+  /** Where the viewer moved the model to (the part is stood on the middle of its floor). */
+  offset: Vec3;
+}
+
+const turn = (zUp: boolean, [x, y, z]: Vec3): Vec3 => (zUp ? [x, z, -y] : [x, y, z]);
+const unturn = (zUp: boolean, [x, y, z]: Vec3): Vec3 => (zUp ? [x, -z, y] : [x, y, z]);
+
+export function toScenePoint(f: ModelFrame, p: Vec3): Vec3 {
+  const [x, y, z] = turn(f.zUp, [p[0] - f.origin[0], p[1] - f.origin[1], p[2] - f.origin[2]]);
+  return [x + f.offset[0], y + f.offset[1], z + f.offset[2]];
+}
+
+export function toModelPoint(f: ModelFrame, p: Vec3): Vec3 {
+  const [x, y, z] = unturn(f.zUp, [p[0] - f.offset[0], p[1] - f.offset[1], p[2] - f.offset[2]]);
+  return [x + f.origin[0], y + f.origin[1], z + f.origin[2]];
+}
+
+export const toSceneVector = (f: ModelFrame, v: Vec3): Vec3 => turn(f.zUp, v);
+export const toModelVector = (f: ModelFrame, v: Vec3): Vec3 => unturn(f.zUp, v);
+
+/** The axis a model stands on, in its own coordinates: what `up` is when a region has none. */
+export const modelUp = (f: Pick<ModelFrame, "zUp">): Vec3 => (f.zUp ? [0, 0, 1] : [0, 1, 0]);
+
+/** A camera in the scene's coordinates. */
+export interface SceneCamera {
+  position: Vec3;
+  target: Vec3;
+  up: Vec3;
+  projection: CameraRegion["projection"];
+  aspect: number;
+}
+
+const sub = (a: Vec3, b: Vec3): Vec3 => [a[0] - b[0], a[1] - b[1], a[2] - b[2]];
+const dot = (a: Vec3, b: Vec3) => a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
+const length = (a: Vec3) => Math.hypot(a[0], a[1], a[2]);
+const cross = (a: Vec3, b: Vec3): Vec3 => [a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], a[0] * b[1] - a[1] * b[0]];
+
+/**
+ * The region, as a camera in the scene. A camera that looks at nothing, or
+ * along its own up axis, has no view: "invalid".
+ */
+export function sceneCamera(f: ModelFrame, region: CameraRegion): SceneCamera {
+  const position = toScenePoint(f, region.position);
+  const target = toScenePoint(f, region.target);
+  const up = toSceneVector(f, region.up ?? modelUp(f));
+  const look = sub(target, position);
+  const span = length(look);
+  if (!(span > 0)) throw new RasterError("invalid", "the camera looks at its own position");
+  if (!(length(up) > 0)) throw new RasterError("invalid", "the camera has no up axis");
+  if (!(length(cross(look, up)) > 1e-9 * span * length(up))) throw new RasterError("invalid", "the camera looks along its up axis");
+  return { position, target, up, projection: region.projection, aspect: region.aspect };
+}
+
+/** A camera of the scene, as the region that names it in the model's coordinates; `up` is always set. */
+export function cameraRegion(f: ModelFrame, c: SceneCamera): CameraRegion {
+  return {
+    position: toModelPoint(f, c.position),
+    target: toModelPoint(f, c.target),
+    up: toModelVector(f, c.up),
+    projection: { ...c.projection },
+    aspect: c.aspect,
+  };
+}
+
+/** Whether two views are one, give or take what a damped orbit leaves: less than a ten-millionth of the distance. */
+export function sameRegion(a: CameraRegion, b: CameraRegion): boolean {
+  if (a.projection.type !== b.projection.type) return false;
+  const reach = Math.max(length(sub(a.position, a.target)), 1e-9);
+  const near = (x: number, y: number, scale = reach) => Math.abs(x - y) <= 1e-7 * scale;
+  const same = (p: Vec3, q: Vec3) => p.every((v, i) => near(v, q[i]!));
+  const au = a.up ?? [0, 0, 0];
+  const bu = b.up ?? [0, 0, 0];
+  const lens =
+    a.projection.type === "perspective" && b.projection.type === "perspective"
+      ? near(a.projection.fov, b.projection.fov, 1)
+      : a.projection.type === "orthographic" && b.projection.type === "orthographic" && near(a.projection.height, b.projection.height, a.projection.height);
+  return lens && near(a.aspect, b.aspect, a.aspect) && same(a.position, b.position) && same(a.target, b.target) && au.every((v, i) => near(v, bu[i]!, 1));
+}
+
+/**
+ * The near and far planes for a camera. A perspective one keeps the viewer's
+ * own (so that a view read from the viewport is drawn as the viewer draws
+ * it), and goes further when the camera is far from the model; an
+ * orthographic one has no viewer's to keep: it takes the model's depth.
+ * `sphere` bounds the model, in the scene.
+ */
+export function depthRange(c: SceneCamera, sphere: { center: Vec3; radius: number }, viewer: { near: number; far: number }): { near: number; far: number } {
+  const radius = Math.max(sphere.radius, 1e-9);
+  const away = sub(sphere.center, c.position);
+  if (c.projection.type === "orthographic") {
+    const look = sub(c.target, c.position);
+    const along = dot(away, look) / length(look);
+    return { near: along - 2 * radius, far: along + 2 * radius };
+  }
+  return { near: viewer.near, far: Math.max(viewer.far, length(away) + 2 * radius) };
+}
+
+// ── Tiles ────────────────────────────────────────────────────────────────────
+
+/** The biggest side of a tile whatever the GPU allows: a multisampled one of 4096 px is half a gigabyte. */
+export const MAX_TILE = 2048;
+
+export interface GlLimits {
+  texture: number;
+  renderbuffer: number;
+  viewport: readonly [number, number];
+}
+
+/** Rendered pixels along a side for each pixel of the picture, where the context has no multisampling. */
+export const SUPERSAMPLE = 2;
+
+/** Samples along a side: one with a multisampled drawing buffer, else `SUPERSAMPLE`, or the forced value. */
+export function supersampling(multisampled: boolean, forced?: number): number {
+  if (forced !== undefined) return forced;
+  return multisampled ? 1 : SUPERSAMPLE;
+}
+
+/**
+ * A tile's side, in picture pixels: what the smallest limit allows once each
+ * picture pixel takes `samples` along a side, never past `MAX_TILE`; `forced`
+ * (a testing and tuning knob) can only make it smaller.
+ */
+export function tileSize(limits: GlLimits, samples: number, forced?: number): number {
+  if (!Number.isSafeInteger(samples) || samples < 1 || samples > 8) throw new RasterError("invalid", "rasterSupersample is a whole number from 1 to 8");
+  const edge = Math.min(limits.texture, limits.renderbuffer, limits.viewport[0], limits.viewport[1]);
+  const side = Math.min(MAX_TILE, Math.floor(edge / samples));
+  if (!(side >= 1)) throw new RasterError("too-large", "the GPU cannot hold a tile");
+  if (forced === undefined) return side;
+  if (!Number.isSafeInteger(forced) || forced < 1) throw new RasterError("invalid", "rasterTile is a whole number of pixels");
+  return Math.min(side, forced);
+}
+
+/**
+ * `setViewOffset`'s arguments for `tile` of a picture of `width` by `height`,
+ * drawn with `samples` rendered pixels along a side for each of its own: the
+ * full picture, then the tile within it, in rendered pixels.
+ */
+export function viewOffset(width: number, height: number, tile: Tile, samples: number) {
+  return {
+    fullWidth: width * samples,
+    fullHeight: height * samples,
+    x: tile.x * samples,
+    y: tile.y * samples,
+    width: tile.width * samples,
+    height: tile.height * samples,
+  };
+}
+
+// ── Ground ───────────────────────────────────────────────────────────────────
+
+/** What a picture's background is when none is asked for. */
+export type Ground =
+  | { type: "none" }
+  | { type: "solid"; color: string }
+  /** A circle about `at` (fractions of the picture), reaching the farthest corner. */
+  | { type: "radial"; at: readonly [number, number]; stops: readonly { offset: number; color: string }[] };
+
+/** `text` cut at the commas that are not inside brackets. */
+function split(text: string): string[] {
+  const out: string[] = [];
+  let depth = 0;
+  let from = 0;
+  for (let i = 0; i < text.length; i++) {
+    if (text[i] === "(") depth++;
+    else if (text[i] === ")") depth--;
+    else if (text[i] === "," && depth === 0) {
+      out.push(text.slice(from, i).trim());
+      from = i + 1;
+    }
+  }
+  out.push(text.slice(from).trim());
+  return out;
+}
+
+const NUMBER = String.raw`(\d+(?:\.\d+)?)`;
+const CIRCLE = new RegExp(`^circle(?:\\s+farthest-corner)?(?:\\s+at\\s+${NUMBER}%\\s+${NUMBER}%)?$`);
+const STOP = new RegExp(`^(.+?)\\s+${NUMBER}%$`);
+
+/**
+ * The ground a stylesheet gives the model's surface, from the computed
+ * `background-image` and `background-color`: a circular gradient to the
+ * farthest corner (the default `--exav-viewer-model-bg`), else its middle
+ * colour; a colour; else none.
+ */
+export function parseGround(image: string, color: string): Ground {
+  const text = image.trim();
+  if (text.startsWith("radial-gradient(") && text.endsWith(")")) {
+    const parts = split(text.slice("radial-gradient(".length, -1));
+    // The first part is a shape unless it is a colour stop; without one the shape is an ellipse, which is not read.
+    const hasShape = /^(circle|ellipse|closest|farthest|at\s)/.test(parts[0] ?? "");
+    const shape = hasShape ? CIRCLE.exec(parts[0] ?? "") : null;
+    const stops = parts.slice(hasShape ? 1 : 0).map((p) => STOP.exec(p));
+    const known = stops.every((s): s is RegExpExecArray => s !== null && isColor(s[1]));
+    if (known && stops.length >= 2) {
+      const list = stops.map((s) => ({ color: s![1]!, offset: Math.min(1, Number(s![2]) / 100) }));
+      if (shape && list.every((s, i) => i === 0 || s.offset >= list[i - 1]!.offset)) {
+        return { type: "radial", at: [shape[1] === undefined ? 0.5 : Number(shape[1]) / 100, shape[2] === undefined ? 0.5 : Number(shape[2]) / 100], stops: list };
+      }
+      // A shape not read: the colour in the middle stands for it.
+      return { type: "solid", color: list[Math.floor(list.length / 2)]!.color };
+    }
+  }
+  if (color && isColor(color) && !/^(transparent|rgba\(0,\s*0,\s*0,\s*0\))$/i.test(color.trim())) return { type: "solid", color };
+  return { type: "none" };
+}
+
+/** The circle of a radial ground on a picture of `width` by `height`: its centre and radius, in pixels. */
+export function groundCircle(at: readonly [number, number], width: number, height: number) {
+  const x = at[0] * width;
+  const y = at[1] * height;
+  return { x, y, radius: Math.hypot(Math.max(x, width - x), Math.max(y, height - y)) };
+}
diff --git a/crates/exav-viewer/ts/model/engine.test.ts b/crates/exav-viewer/ts/model/engine.test.ts
index 104aa964..e7610852 100644
--- a/crates/exav-viewer/ts/model/engine.test.ts
+++ b/crates/exav-viewer/ts/model/engine.test.ts
@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 
 import { beforeAll, describe, expect, it } from "vitest";
 
-import init, { parseIfc, parseStl } from "../../wasm/exav_viewer_model.js";
+import init, { gltfBuffers, parseGltf, parseGltfWith, parseIfc, parseObj, parsePly, parseStl } from "../../wasm/exav_viewer_model.js";
 import { modelWarnings, type ModelMeta } from "./engine.js";
 
 const root = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
@@ -57,4 +57,85 @@ describe("the model module", () => {
     expect(() => parseStl(new Uint8Array([1, 2, 3]), 10)).toThrow("not an STL file");
     expect(() => parseIfc(new TextEncoder().encode("%PDF-1.7"), 10)).toThrow("not a STEP file");
   });
+
+  // A tetrahedron of volume 1/6 with a square face on top: 4 + 2 triangles.
+  const obj = "g base\nv 0 0 0\nv 1 0 0\nv 0 1 0\nv 0 0 1\nf 1 3 2\nf 1 2 4\nf 1 4 3\nf 2 3 4\ng top\nv 0 0 2\nv 1 0 2\nv 1 1 2\nv 0 1 2\nf 5 6 7 8\n";
+  const bounds = (m: ReturnType<typeof parseObj>) => (JSON.parse(m.metaJson()) as ModelMeta).bounds;
+
+  it("reads an OBJ with its groups as elements, a polygon as triangles", () => {
+    const m = parseObj(new TextEncoder().encode(obj), 100);
+    const meta = JSON.parse(m.metaJson()) as ModelMeta;
+    expect(m.takeIndices().length / 3).toBe(6);
+    expect(meta.elements.map((e) => e.name)).toEqual(["base", "top"]);
+    expect(meta.elements.map((e) => e.ranges[0]![2])).toEqual([12, 6]);
+    expect(meta.bounds).toEqual([0, 0, 0, 1, 1, 2]);
+    expect(modelWarnings(meta, "obj")).toEqual([]);
+    m.free();
+    const part = parseObj(new TextEncoder().encode(obj), 4);
+    expect(modelWarnings(JSON.parse(part.metaJson()) as ModelMeta, "obj")).toEqual([{ key: "model_partial", count: 1 }]);
+    part.free();
+    expect(() => parseObj(new Uint8Array([0, 1, 2]), 10)).toThrow("not an OBJ file");
+    expect(bounds(parseObj(new TextEncoder().encode("v 0 0 0\nv 1 0 0\nv 0 1 0\nv nan 0 0\nf 1 2 3\nf 1 2 4\n"), 10))).toEqual([0, 0, 0, 1, 1, 0]);
+  });
+
+  it("reads a PLY and refuses a point cloud", () => {
+    const ply = "ply\nformat ascii 1.0\nelement vertex 4\nproperty float x\nproperty float y\nproperty float z\nproperty uchar red\nproperty uchar green\nproperty uchar blue\nelement face 1\nproperty list uchar int vertex_indices\nend_header\n0 0 0 255 0 0\n1 0 0 0 255 0\n1 1 0 0 0 255\n0 1 0 9 9 9\n4 0 1 2 3\n";
+    const m = parsePly(new TextEncoder().encode(ply), 100);
+    expect(m.takeIndices().length / 3).toBe(2);
+    // Six corners, each with its vertex's colour: red twice at least, the grey one in both triangles.
+    const c = Array.from(m.takeColors());
+    const corners = Array.from({ length: 6 }, (_, i) => c.slice(i * 3, i * 3 + 3).join(","));
+    expect(corners.filter((k) => k === "255,0,0").length).toBeGreaterThanOrEqual(1);
+    expect(corners.filter((k) => k === "9,9,9").length).toBeGreaterThanOrEqual(1);
+    expect(new Set(corners)).toEqual(new Set(["255,0,0", "0,255,0", "0,0,255", "9,9,9"]));
+    m.free();
+    const cloud = "ply\nformat ascii 1.0\nelement vertex 1\nproperty float x\nproperty float y\nproperty float z\nend_header\n0 0 0\n";
+    expect(() => parsePly(new TextEncoder().encode(cloud), 10)).toThrow("point cloud");
+    expect(() => parsePly(new TextEncoder().encode("hello"), 10)).toThrow("not a PLY file");
+  });
+
+  it("reads a glTF with a transformed node, and refuses one that points at another file", () => {
+    const f = new Float32Array([0, 0, 0, 1, 0, 0, 0, 1, 0]);
+    const data = Buffer.from(f.buffer).toString("base64");
+    const doc = (uri: string, node: string) =>
+      JSON.stringify({
+        asset: { version: "2.0" },
+        buffers: [{ uri, byteLength: 36 }],
+        bufferViews: [{ buffer: 0, byteLength: 36 }],
+        accessors: [{ bufferView: 0, componentType: 5126, count: 3, type: "VEC3" }],
+        meshes: [{ primitives: [{ attributes: { POSITION: 0 } }] }],
+        nodes: [{ mesh: 0, ...JSON.parse(node) }],
+        scenes: [{ nodes: [0] }],
+      });
+    const m = parseGltf(new TextEncoder().encode(doc(`data:application/octet-stream;base64,${data}`, '{"translation":[10,0,0],"scale":[2,2,2]}')), 10);
+    expect((JSON.parse(m.metaJson()) as ModelMeta).bounds).toEqual([10, 0, 0, 12, 2, 0]);
+    m.free();
+    expect(() => parseGltf(new TextEncoder().encode(doc("http://example.com/a.bin", "{}")), 10)).toThrow("references external files");
+    expect(() => parseGltf(new TextEncoder().encode("{}"), 10)).toThrow("not a glTF file");
+  });
+
+  it("reads a glTF whose buffer is a file it is given, by the name the document writes", () => {
+    const f = new Float32Array([0, 0, 0, 1, 0, 0, 0, 1, 0]);
+    const doc = new TextEncoder().encode(
+      JSON.stringify({
+        asset: { version: "2.0" },
+        buffers: [{ uri: "tri%20one.bin", byteLength: 36 }],
+        bufferViews: [{ buffer: 0, byteLength: 36 }],
+        accessors: [{ bufferView: 0, componentType: 5126, count: 3, type: "VEC3" }],
+        meshes: [{ primitives: [{ attributes: { POSITION: 0 } }] }],
+        nodes: [{ mesh: 0, translation: [10, 0, 0] }],
+        scenes: [{ nodes: [0] }],
+      }),
+    );
+    expect(JSON.parse(gltfBuffers(doc))).toEqual(["tri%20one.bin"]);
+    const bin = new Uint8Array(f.buffer);
+    // Two files given: the one the document names is the second.
+    const files = new Uint8Array([7, 7, 7, ...bin]);
+    const m = parseGltfWith(doc, 10, ["other.bin", "tri%20one.bin"], files, new Uint32Array([3, 36]));
+    expect((JSON.parse(m.metaJson()) as ModelMeta).bounds).toEqual([10, 0, 0, 11, 1, 0]);
+    m.free();
+    expect(() => parseGltfWith(doc, 10, ["other.bin"], files, new Uint32Array([3]))).toThrow("references external files");
+    expect(() => parseGltfWith(doc, 10, ["tri%20one.bin"], files, new Uint32Array([300]))).toThrow("longer than the bytes given");
+    expect(JSON.parse(gltfBuffers(new TextEncoder().encode(JSON.stringify({ asset: { version: "2.0" }, buffers: [{ uri: "data:;base64,AAAA", byteLength: 3 }] }))))).toEqual([]);
+  });
 });
diff --git a/crates/exav-viewer/ts/model/engine.ts b/crates/exav-viewer/ts/model/engine.ts
index c851cacd..d43a416e 100644
--- a/crates/exav-viewer/ts/model/engine.ts
+++ b/crates/exav-viewer/ts/model/engine.ts
@@ -1,7 +1,7 @@
 /**
- * The IFC and STL engine: exav-render's readers in a worker
- * (`exav_viewer_model.wasm`), which sends back finished vertex buffers,
- * transferred rather than copied. Shared by `@exav/viewer/ifc` and
+ * The model engine: exav-render's IFC, STL, OBJ, PLY and glTF readers in a
+ * worker (`exav_viewer_model.wasm`), which sends back finished vertex
+ * buffers, transferred rather than copied. Shared by `@exav/viewer/ifc` and
  * `@exav/viewer/model`.
  */
 import { createWorkerHost, type WorkerHost } from "../core/worker-host.js";
@@ -11,17 +11,31 @@ export const DEFAULT_MAX_TRIANGLES = 6_000_000;
 /** A damaged file can declare counts that keep the reader busy. */
 export const DEFAULT_TIMEOUT_MS = 120_000;
 
+/** What the engine reads. */
+export type ModelKind = "ifc" | "stl" | "obj" | "ply" | "gltf";
+
 export interface ModelRequest {
-  kind: "ifc" | "stl";
+  kind: ModelKind;
   bytes: ArrayBuffer;
   maxTriangles: number;
+  /**
+   * glTF: the files its buffers are in, by the URI the document writes them.
+   * With `list`, nothing is read: the answer is those URIs (`{ buffers }`).
+   */
+  files?: { name: string; bytes: ArrayBuffer }[];
+  list?: boolean;
 }
 
+/** What the engine answers: the model, or for a `list` request the buffer files a glTF names. */
+export type ModelAnswer = ParsedModel | { buffers: string[] };
+
 /** One class and colour's part of the buffers; offsets in vertices, indices and edge vertices. */
 export interface BatchMeta {
   class: string;
   /** RGBA in 0..1 (sRGB), or null when the file gives none. */
   color: [number, number, number, number] | null;
+  /** IFC: index into `nodes` of the storey all its elements are in, null for none. */
+  storey?: number | null;
   vertex: number;
   vertices: number;
   index: number;
@@ -39,6 +53,8 @@ export interface ElementMeta {
   name: string;
   /** Index into `nodes`. */
   node: number | null;
+  /** IFC: index into `nodes` of its building storey, null when it is in none. */
+  storey?: number | null;
   /** [batch, first index, index count]. */
   ranges: [number, number, number][];
 }
@@ -49,7 +65,8 @@ export interface ModelMeta {
   bounds: [number, number, number, number, number, number] | null;
   batches: BatchMeta[];
   elements: ElementMeta[];
-  nodes: { id: number; class: string; name: string; parent: number | null }[];
+  /** `elevation`: a storey's, in metres. */
+  nodes: { id: number; class: string; name: string; parent: number | null; elevation?: number | null }[];
   warnings: { unsupported: Record<string, number>; invalid: number; booleansSkipped: number; truncated: number; damaged: boolean };
 }
 
@@ -63,12 +80,12 @@ export interface ParsedModel {
   parseMs: number;
 }
 
-export function createModelEngine(): WorkerHost<ModelRequest, ParsedModel> {
-  return createWorkerHost<ModelRequest, ParsedModel>(() => new Worker(new URL("./model.worker.js", import.meta.url), { type: "module" }));
+export function createModelEngine(): WorkerHost<ModelRequest, ModelAnswer> {
+  return createWorkerHost<ModelRequest, ModelAnswer>(() => new Worker(new URL("./model.worker.js", import.meta.url), { type: "module" }));
 }
 
 /** What is missing from the picture, for the `warnings` controller. */
-export function modelWarnings(meta: ModelMeta, kind: "ifc" | "stl"): { key: string; count: number }[] {
+export function modelWarnings(meta: ModelMeta, kind: ModelKind): { key: string; count: number }[] {
   const w = meta.warnings;
   const unsupported = Object.values(w.unsupported).reduce((a, b) => a + b, 0);
   return [
diff --git a/crates/exav-viewer/ts/model/index.ts b/crates/exav-viewer/ts/model/index.ts
index a7ce54be..8b948835 100644
--- a/crates/exav-viewer/ts/model/index.ts
+++ b/crates/exav-viewer/ts/model/index.ts
@@ -1,8 +1,16 @@
 /**
- * `@exav/viewer/model`: an STL mesh (ASCII or binary) read by exav's own
+ * `@exav/viewer/model`: an STL (ASCII or binary), Wavefront OBJ, Stanford
+ * PLY (ASCII or binary) or glTF 2.0 (`.gltf`, `.glb`) mesh read by exav's own
  * engine (exav-render, compiled to WebAssembly) in a worker, drawn with
  * three.js (a peer dependency), lit by an environment, standing on a shadow
- * catcher. Orbit, pan, zoom, and the triangle count.
+ * catcher. Orbit, pan, zoom, and the triangle count. Nothing is fetched: a
+ * glTF whose buffers are other files is refused.
+ *
+ * Pictures (`controllers.pictures`, one page) are drawn again from the
+ * geometry at any size, by a renderer off screen, and the viewport is the
+ * camera in view. Both speak of a camera (`CameraRegion`) in the file's own
+ * coordinates, see `ModelFrame` in `./camera.ts`: `up` defaults to Z for the
+ * files shown Z up (STL by default, see `zUp`), else Y.
  */
 import { MATCHERS } from "../core/formats.js";
 import type { FormatPlugin } from "../core/types.js";
@@ -10,7 +18,10 @@ import type { FormatPlugin } from "../core/types.js";
 export interface ModelOptions {
   /** Mesh colour when the file carries none. Default 0x8c97a8. */
   surface?: number;
-  /** STL is Z-up and three.js Y-up. Default true. */
+  /**
+   * Whether the file's up axis is Z, and three.js is Y-up. Default true for
+   * STL, false for OBJ, PLY and glTF.
+   */
   zUp?: boolean;
   /** How long reading may take before the engine is stopped. Default 120_000 (ms). */
   timeoutMs?: number;
@@ -19,14 +30,62 @@ export interface ModelOptions {
    * `model_partial` warning shown. Default 6_000_000.
    */
   maxTriangles?: number;
+  /**
+   * Testing and tuning: the biggest tile (px a side) a picture
+   * (`controllers.pictures`) is drawn in. Never more than the GPU allows
+   * (and 2048); a picture needing more than 4096 tiles is refused.
+   */
+  rasterTile?: number;
+  /**
+   * Testing and tuning: pixels drawn along a side for each pixel of a picture,
+   * 1 to 8. Default 1 where the GPU antialiases, else 2.
+   */
+  rasterSupersample?: number;
 }
 
 export function stl(options: ModelOptions = {}): FormatPlugin<ModelOptions> {
   return {
     id: "stl",
     match: MATCHERS.stl,
-    capabilities: ["info"],
+    capabilities: ["info", "pictures", "viewport"],
+    options,
+    load: () => import("./stl.js").then((m) => m.rendererFor("stl")),
+  };
+}
+
+/** Wavefront OBJ: vertex colours and groups; materials and textures are not read. */
+export function obj(options: ModelOptions = {}): FormatPlugin<ModelOptions> {
+  return {
+    id: "obj",
+    match: MATCHERS.obj,
+    capabilities: ["info", "pictures", "viewport"],
+    options,
+    load: () => import("./stl.js").then((m) => m.rendererFor("obj")),
+  };
+}
+
+/** Stanford PLY with faces; a point cloud is refused. */
+export function ply(options: ModelOptions = {}): FormatPlugin<ModelOptions> {
+  return {
+    id: "ply",
+    match: MATCHERS.ply,
+    capabilities: ["info", "pictures", "viewport"],
+    options,
+    load: () => import("./stl.js").then((m) => m.rendererFor("ply")),
+  };
+}
+
+/**
+ * glTF 2.0, `.gltf` and `.glb`; textures and animations are not read. The
+ * buffers of a `.gltf` are embedded as `data:` URIs or files among the files
+ * around it (`ViewerFile.tree`); one that is neither is an error.
+ */
+export function gltf(options: ModelOptions = {}): FormatPlugin<ModelOptions> {
+  return {
+    id: "gltf",
+    match: MATCHERS.gltf,
+    capabilities: ["info", "pictures", "viewport"],
     options,
-    load: () => import("./stl.js").then((m) => m.renderer),
+    load: () => import("./stl.js").then((m) => m.rendererFor("gltf")),
   };
 }
diff --git a/crates/exav-viewer/ts/model/model.worker.ts b/crates/exav-viewer/ts/model/model.worker.ts
index 83e7b5dc..65ab2025 100644
--- a/crates/exav-viewer/ts/model/model.worker.ts
+++ b/crates/exav-viewer/ts/model/model.worker.ts
@@ -1,17 +1,31 @@
-// IFC and STL reading runs here, so the page never sees the file's
-// entities: only finished buffers come back, transferred.
-import init, { parseIfc, parseStl } from "../../wasm/exav_viewer_model.js";
+// Model reading runs here, so the page never sees the file's entities: only
+// finished buffers come back, transferred.
+import init, { gltfBuffers, parseGltf, parseGltfWith, parseIfc, parseObj, parsePly, parseStl } from "../../wasm/exav_viewer_model.js";
 
 import { serve } from "../core/worker-host.js";
-import type { ModelMeta, ModelRequest, ParsedModel } from "./engine.js";
+import type { ModelAnswer, ModelKind, ModelMeta, ModelRequest, ParsedModel } from "./engine.js";
 
 let ready: Promise<unknown> | null = null;
 
-serve<ModelRequest, ParsedModel>(async (r) => {
+const READERS: Record<ModelKind, typeof parseIfc> = { ifc: parseIfc, stl: parseStl, obj: parseObj, ply: parsePly, gltf: parseGltf };
+
+serve<ModelRequest, ModelAnswer>(async (r) => {
   const started = performance.now();
   ready ??= init();
   await ready;
-  const model = (r.kind === "ifc" ? parseIfc : parseStl)(new Uint8Array(r.bytes), r.maxTriangles);
+  const bytes = new Uint8Array(r.bytes);
+  if (r.list) return { value: { buffers: JSON.parse(gltfBuffers(bytes)) as string[] } };
+  let model: ReturnType<typeof parseIfc>;
+  if (r.kind === "gltf" && r.files?.length) {
+    const lengths = new Uint32Array(r.files.map((f) => f.bytes.byteLength));
+    const joined = new Uint8Array(lengths.reduce((a, b) => a + b, 0));
+    let at = 0;
+    for (const f of r.files) {
+      joined.set(new Uint8Array(f.bytes), at);
+      at += f.bytes.byteLength;
+    }
+    model = parseGltfWith(bytes, r.maxTriangles, r.files.map((f) => f.name), joined, lengths);
+  } else model = READERS[r.kind](bytes, r.maxTriangles);
   try {
     const out: ParsedModel = {
       positions: model.takePositions(),
diff --git a/crates/exav-viewer/ts/model/raster.test.ts b/crates/exav-viewer/ts/model/raster.test.ts
new file mode 100644
index 00000000..3b2c9c31
--- /dev/null
+++ b/crates/exav-viewer/ts/model/raster.test.ts
@@ -0,0 +1,613 @@
+import * as THREE from "three";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { RasterError, tilePlan } from "../core/pictures.js";
+import type { CameraRegion, RasterOptions } from "../core/types.js";
+import { sceneCamera, viewOffset, type ModelFrame, type Vec3 } from "./camera.js";
+import { cloneScene, createModelRaster, inTurn, makeCamera, planJob, VIEWPORT_INTERVAL_MS, type ModelRasterConfig } from "./raster.js";
+
+const code = async (p: unknown) => {
+  try {
+    await (typeof p === "function" ? p() : p);
+    return "none";
+  } catch (e) {
+    return e instanceof RasterError ? e.code : `other: ${String(e)}`;
+  }
+};
+
+const zUp: ModelFrame = { zUp: true, origin: [100, 200, 0], offset: [1, 2, 3] };
+const view: CameraRegion = { position: [110, 190, 8], target: [100, 200, 0], projection: { type: "perspective", fov: 40 }, aspect: 2 };
+const views = { current: () => ({ ...view, position: [120, 200, 0] as Vec3 }), whole: () => view };
+
+describe("planning a picture", () => {
+  it("takes the whole view by default, in the shape of its aspect, and the current one for 'current'", () => {
+    const whole = planJob({ longEdge: 400 }, zUp, views);
+    expect([whole.width, whole.height]).toEqual([400, 200]);
+    expect(whole.region.position).toEqual(view.position);
+    expect(whole.background).toBeUndefined();
+    const current = planJob({ longEdge: 400, region: "current" }, zUp, views);
+    expect(current.region.position).toEqual([120, 200, 0]);
+  });
+
+  it("reports the up it drew with: the model's own when the region gave none", () => {
+    expect(planJob({ longEdge: 100 }, zUp, views).region.up).toEqual([0, 0, 1]);
+    expect(planJob({ longEdge: 100 }, { ...zUp, zUp: false }, views).region.up).toEqual([0, 1, 0]);
+    expect(planJob({ longEdge: 100, region: { ...view, up: [0, 1, 0] } }, zUp, views).region.up).toEqual([0, 1, 0]);
+  });
+
+  it("keeps the region the caller gave, and reports the camera drawn with the picture's own aspect", () => {
+    const given: CameraRegion = { ...view, position: [130, 200, 0], aspect: 3 };
+    const job = planJob({ longEdge: 300, region: given }, zUp, views);
+    expect([job.width, job.height]).toEqual([300, 100]);
+    expect(job.region.position).toEqual([130, 200, 0]);
+    expect(job.region.aspect).toBeCloseTo(3, 9);
+    expect(job.camera.position[0]).toBeCloseTo(130 - 100 + 1, 9);
+  });
+
+  it("widens the view of a taller picture to contain it, and narrows it to cover", () => {
+    const contain = planJob({ width: 100, height: 100, fit: "contain" }, zUp, views);
+    const cover = planJob({ width: 100, height: 100, fit: "cover" }, zUp, views);
+    expect(contain.region.aspect).toBe(1);
+    expect(cover.region.aspect).toBe(1);
+    // Aspect 2 -> 1: containing keeps the width (a wider field vertically), covering keeps the height.
+    const half = (r: CameraRegion) => Math.tan(((r.projection as { fov: number }).fov * Math.PI) / 360);
+    expect(half(contain.region)).toBeCloseTo(Math.tan((40 * Math.PI) / 360) * 2, 9);
+    expect(half(cover.region)).toBeCloseTo(Math.tan((40 * Math.PI) / 360), 9);
+  });
+
+  it("scales an orthographic height with the same rule", () => {
+    const ortho: CameraRegion = { ...view, projection: { type: "orthographic", height: 10 } };
+    const contain = planJob({ width: 100, height: 100, region: ortho }, zUp, views);
+    expect(contain.region.projection).toEqual({ type: "orthographic", height: 20 });
+    expect(planJob({ width: 100, height: 100, region: ortho, fit: "cover" }, zUp, views).region.projection).toEqual({ type: "orthographic", height: 10 });
+  });
+
+  it("refuses what is not a request, before anything is made", async () => {
+    const bad = (o: RasterOptions) => code(() => planJob(o, zUp, views));
+    expect(await bad({})).toBe("invalid");
+    expect(await bad({ longEdge: 100, region: { x: 0, y: 0, width: 1, height: 1 } })).toBe("invalid");
+    expect(await bad({ longEdge: 100, region: { ...view, aspect: -1 } })).toBe("invalid");
+    expect(await bad({ longEdge: 100, region: { ...view, projection: { type: "perspective", fov: 180 } } })).toBe("invalid");
+    expect(await bad({ longEdge: 100, region: { ...view, target: view.position } })).toBe("invalid");
+    expect(await bad({ longEdge: 100, fit: "stretch" as never })).toBe("invalid");
+    expect(await bad({ longEdge: 100, background: "url(http://x/a.png)" })).toBe("invalid");
+    expect(await bad({ width: 100000, height: 100 })).toBe("too-large");
+    expect(await bad({ longEdge: 100, width: 10 })).toBe("invalid");
+    expect(await bad({ longEdge: 100, background: "transparent" })).toBe("none");
+    expect(await bad({ longEdge: 100, background: "rgba(10, 20, 30, 0.5)" })).toBe("none");
+  });
+
+  it("holds a longEdge to the pixel budget", () => {
+    const job = planJob({ longEdge: 1e9, region: { ...view, aspect: 1 } }, zUp, views);
+    expect(job.width).toBeLessThanOrEqual(16384);
+    expect(job.width * job.height).toBeLessThanOrEqual(64 * 1024 * 1024);
+  });
+});
+
+describe("tiles of a picture", () => {
+  // A world point to its pixel in a picture drawn with `samples` per pixel.
+  const pixel = (cam: THREE.Camera, p: THREE.Vector3, w: number, h: number) => {
+    const n = p.clone().project(cam);
+    return [((n.x + 1) / 2) * w, ((1 - n.y) / 2) * h] as const;
+  };
+  const points = [new THREE.Vector3(0, 0, 0), new THREE.Vector3(0.7, 0.4, -0.5), new THREE.Vector3(-1, 0.8, 0.3), new THREE.Vector3(0.1, -0.9, 0.2)];
+  const regions: CameraRegion[] = [
+    { position: [4, 3, 5], target: [0, 0, 0], up: [0, 1, 0], projection: { type: "perspective", fov: 50 }, aspect: 1.5 },
+    { position: [4, 3, 5], target: [0, 0, 0], up: [0, 1, 0], projection: { type: "orthographic", height: 4 }, aspect: 1.5 },
+  ];
+  const yUp: ModelFrame = { zUp: false, origin: [0, 0, 0], offset: [0, 0, 0] };
+
+  for (const region of regions) {
+    for (const samples of [1, 2]) {
+      it(`a tile's pixels are the picture's, shifted by the tile (${region.projection.type}, ${samples} per pixel)`, () => {
+        const W = 150;
+        const H = 100;
+        const cam = sceneCamera(yUp, region);
+        const depth = { near: 0.1, far: 50 };
+        const full = makeCamera(THREE, cam, depth);
+        full.setViewOffset(W * samples, H * samples, 0, 0, W * samples, H * samples);
+        const tiles = tilePlan(W, H, 64);
+        expect(tiles.length).toBe(6);
+        for (const t of tiles) {
+          const o = viewOffset(W, H, t, samples);
+          const tile = makeCamera(THREE, cam, depth);
+          tile.setViewOffset(o.fullWidth, o.fullHeight, o.x, o.y, o.width, o.height);
+          for (const p of points) {
+            const [fu, fv] = pixel(full, p, W * samples, H * samples);
+            const [tu, tv] = pixel(tile, p, o.width, o.height);
+            expect(tu).toBeCloseTo(fu - t.x * samples, 6);
+            expect(tv).toBeCloseTo(fv - t.y * samples, 6);
+          }
+        }
+      });
+    }
+  }
+
+  it("draws the camera where the region says: the target is in the middle", () => {
+    const cam = sceneCamera(yUp, regions[0]!);
+    const camera = makeCamera(THREE, cam, { near: 0.1, far: 50 });
+    const n = new THREE.Vector3(0, 0, 0).project(camera);
+    expect(n.x).toBeCloseTo(0, 9);
+    expect(n.y).toBeCloseTo(0, 9);
+  });
+});
+
+describe("a copy of the scene for another renderer", () => {
+  const build = () => {
+    const scene = new THREE.Scene();
+    scene.background = new THREE.Color("#ff0000");
+    scene.environment = new THREE.Texture();
+    const geometry = new THREE.BufferGeometry();
+    geometry.setAttribute("position", new THREE.BufferAttribute(new Float32Array(9), 3));
+    geometry.setIndex(new THREE.BufferAttribute(new Uint32Array([0, 1, 2]), 1));
+    geometry.drawRange = { start: 0, count: 3 };
+    const material = new THREE.MeshLambertMaterial({ color: 0x336699 });
+    const world = new THREE.Group();
+    world.rotation.x = -Math.PI / 2;
+    const a = new THREE.Mesh(geometry, material);
+    const b = new THREE.Mesh(geometry, material);
+    b.visible = false;
+    const grid = new THREE.GridHelper(2, 2);
+    world.add(a, b);
+    scene.add(world, grid, new THREE.DirectionalLight(0xffffff, 1));
+    return { scene, geometry, material, world, a, b, grid };
+  };
+
+  it("shares the vertex data but not the geometry or material objects, and keeps what is hidden hidden", () => {
+    const { scene, geometry, material, a, grid } = build();
+    const copy = cloneScene(THREE, scene, (o) => o === grid);
+    const world = copy.scene.children[0]!;
+    expect(world.rotation.x).toBeCloseTo(-Math.PI / 2, 9);
+    const [ca, cb] = world.children as THREE.Mesh[];
+    expect(ca!.geometry).not.toBe(geometry);
+    expect(ca!.geometry.attributes.position).toBe(geometry.attributes.position);
+    expect(ca!.geometry.index).toBe(geometry.index);
+    expect(ca!.geometry.drawRange).toEqual({ start: 0, count: 3 });
+    expect(ca!.material).not.toBe(material);
+    expect((ca!.material as THREE.MeshLambertMaterial).color.getHex()).toBe(0x336699);
+    // One material copy for the two meshes that shared one.
+    expect(ca!.material).toBe(cb!.material);
+    expect(ca!.visible).toBe(true);
+    expect(cb!.visible).toBe(false);
+    expect(a.visible).toBe(true);
+    // The viewer's helper is left out; the lamp is kept; neither ground nor environment comes along.
+    expect(copy.scene.children.some((c) => c.type === "GridHelper")).toBe(false);
+    expect(copy.scene.children.some((c) => (c as THREE.Light).isLight)).toBe(true);
+    expect(copy.scene.background).toBeNull();
+    expect(copy.scene.environment).toBeNull();
+  });
+
+  it("frees only its own geometry and materials", () => {
+    const { scene, geometry, material } = build();
+    const freed = { geometry: 0, material: 0 };
+    geometry.addEventListener("dispose", () => freed.geometry++);
+    material.addEventListener("dispose", () => freed.material++);
+    const copy = cloneScene(THREE, scene);
+    const [ca] = copy.scene.children[0]!.children as THREE.Mesh[];
+    const own = { geometry: 0, material: 0 };
+    ca!.geometry.addEventListener("dispose", () => own.geometry++);
+    (ca!.material as THREE.Material).addEventListener("dispose", () => own.material++);
+    copy.dispose();
+    expect(own).toEqual({ geometry: 1, material: 1 });
+    expect(freed).toEqual({ geometry: 0, material: 0 });
+  });
+});
+
+describe("one picture at a time", () => {
+  const gate = () => {
+    let open!: () => void;
+    const opened = new Promise<void>((r) => (open = r));
+    return { opened, open };
+  };
+
+  it("runs tasks in order, one at a time", async () => {
+    const log: string[] = [];
+    const g = gate();
+    const first = inTurn(undefined, async () => {
+      log.push("a start");
+      await g.opened;
+      log.push("a end");
+      return 1;
+    });
+    const second = inTurn(undefined, async () => {
+      log.push("b start");
+      return 2;
+    });
+    await Promise.resolve();
+    await new Promise((r) => setTimeout(r, 5));
+    expect(log).toEqual(["a start"]);
+    g.open();
+    expect(await Promise.all([first, second])).toEqual([1, 2]);
+    expect(log).toEqual(["a start", "a end", "b start"]);
+  });
+
+  it("rejects an aborted wait at once, without running the task", async () => {
+    const g = gate();
+    const first = inTurn(undefined, () => g.opened);
+    const stop = new AbortController();
+    let ran = false;
+    const second = inTurn(stop.signal, async () => {
+      ran = true;
+    });
+    stop.abort();
+    expect(await code(second)).toBe("aborted");
+    g.open();
+    await first;
+    await new Promise((r) => setTimeout(r, 5));
+    expect(ran).toBe(false);
+  });
+
+  it("hands a value produced after the abort to discard", async () => {
+    const g = gate();
+    const stop = new AbortController();
+    const discarded: number[] = [];
+    const run = inTurn(
+      stop.signal,
+      async () => {
+        await g.opened;
+        return 7;
+      },
+      (v) => discarded.push(v),
+    );
+    await new Promise((r) => setTimeout(r, 5));
+    stop.abort();
+    expect(await code(run)).toBe("aborted");
+    g.open();
+    await new Promise((r) => setTimeout(r, 5));
+    expect(discarded).toEqual([7]);
+  });
+
+  it("goes on after a task failed", async () => {
+    expect(await code(inTurn(undefined, () => Promise.reject(new RasterError("failed"))))).toBe("failed");
+    expect(await inTurn(undefined, async () => 3)).toBe(3);
+  });
+});
+
+// ── With a fake GPU ──────────────────────────────────────────────────────────
+
+class FakeCanvas {
+  static made: FakeCanvas[] = [];
+  constructor(
+    public width: number,
+    public height: number,
+  ) {
+    FakeCanvas.made.push(this);
+  }
+  getContext() {
+    return {
+      drawImage() {},
+      fillRect() {},
+      createRadialGradient: () => ({ addColorStop() {} }),
+      set fillStyle(_: unknown) {},
+      set imageSmoothingEnabled(_: unknown) {},
+      set imageSmoothingQuality(_: unknown) {},
+    };
+  }
+  transferToImageBitmap() {
+    return new FakeBitmap(this.width, this.height);
+  }
+}
+class FakeBitmap {
+  closed = false;
+  constructor(
+    public width: number,
+    public height: number,
+  ) {}
+  close() {
+    this.closed = true;
+  }
+}
+
+interface Gpu {
+  renderers: FakeRenderer[];
+  /** Throws on the n-th render (1-based). */
+  failAt?: number;
+  /** The drawing buffer is this much smaller than asked. */
+  shrink: number;
+  multisampled: boolean;
+  max: number;
+  /** Runs at each render. */
+  onRender?: (r: FakeRenderer) => void;
+  fail: boolean;
+}
+let gpu: Gpu;
+
+class FakeRenderer {
+  disposed = 0;
+  lost = 0;
+  rendered: { width: number; height: number; matrix: number[]; scene: THREE.Scene }[] = [];
+  size = { width: 1, height: 1 };
+  shadowMap = { enabled: false, type: 0, autoUpdate: true, needsUpdate: false };
+  clippingPlanes: THREE.Plane[] = [];
+  localClippingEnabled = false;
+  toneMapping = 0;
+  toneMappingExposure = 1;
+  outputColorSpace = "srgb";
+  sortObjects = true;
+  pixelRatio = 0;
+  contextLost = false;
+  constructor() {
+    if (gpu.fail) throw new Error("Error creating WebGL context.");
+    gpu.renderers.push(this);
+  }
+  setPixelRatio(v: number) {
+    this.pixelRatio = v;
+  }
+  setClearColor() {}
+  setSize(w: number, h: number) {
+    this.size = { width: w, height: h };
+  }
+  getContext() {
+    const self = this;
+    return {
+      MAX_TEXTURE_SIZE: 1,
+      MAX_RENDERBUFFER_SIZE: 2,
+      MAX_VIEWPORT_DIMS: 3,
+      getParameter: (p: number) => (p === 3 ? [gpu.max, gpu.max] : gpu.max),
+      getContextAttributes: () => ({ antialias: gpu.multisampled }),
+      get drawingBufferWidth() {
+        return self.size.width - gpu.shrink;
+      },
+      get drawingBufferHeight() {
+        return self.size.height - gpu.shrink;
+      },
+      isContextLost: () => this.contextLost,
+    };
+  }
+  render(scene: THREE.Scene, camera: THREE.Camera) {
+    this.rendered.push({ ...this.size, matrix: camera.projectionMatrix.toArray(), scene });
+    gpu.onRender?.(this);
+    if (gpu.failAt === this.rendered.length) throw new Error("render failed");
+  }
+  dispose() {
+    this.disposed++;
+  }
+  forceContextLoss() {
+    this.lost++;
+    this.contextLost = true;
+  }
+}
+
+const fakeThree = { ...THREE, WebGLRenderer: FakeRenderer } as unknown as typeof THREE;
+
+function config(over: Partial<ModelRasterConfig> = {}): ModelRasterConfig {
+  const scene = new THREE.Scene();
+  const mesh = new THREE.Mesh(new THREE.BufferGeometry(), new THREE.MeshBasicMaterial());
+  scene.add(mesh);
+  const camera = new THREE.PerspectiveCamera(45, 2, 0.1, 100);
+  camera.position.set(5, 4, 6);
+  const controls = { target: new THREE.Vector3(0, 0, 0) };
+  camera.lookAt(controls.target);
+  return {
+    three: fakeThree,
+    scene,
+    camera,
+    controls,
+    renderer: new FakeRenderer() as unknown as THREE.WebGLRenderer,
+    frame: { zUp: false, origin: [0, 0, 0], offset: [0, 0, 0] },
+    sphere: { center: [0, 0, 0], radius: 1 },
+    ground: () => ({ type: "none" }),
+    ...over,
+  };
+}
+
+beforeEach(() => {
+  FakeCanvas.made = [];
+  gpu = { renderers: [], shrink: 0, multisampled: true, max: 4096, fail: false };
+  vi.stubGlobal("OffscreenCanvas", FakeCanvas);
+  vi.stubGlobal("ImageBitmap", FakeBitmap);
+});
+afterEach(() => vi.unstubAllGlobals());
+
+/** The renderers a picture made, leaving out the stand-in for the viewer's own. */
+const made = () => gpu.renderers.slice(1);
+
+describe("drawing a picture", () => {
+  it("renders every tile on one renderer at the tile's size, then frees all of it", async () => {
+    const raster = createModelRaster(config({ tile: 64 }));
+    const r = await raster.pictures.raster(1, { width: 150, height: 100 });
+    expect(r).toMatchObject({ width: 150, height: 100, page: 1, space: "camera" });
+    expect(r.bitmap).toBeInstanceOf(FakeBitmap);
+    expect(made()).toHaveLength(1);
+    const g = made()[0]!;
+    expect(g.rendered.map((x) => [x.width, x.height])).toEqual([
+      [64, 64],
+      [64, 64],
+      [22, 64],
+      [64, 36],
+      [64, 36],
+      [22, 36],
+    ]);
+    expect(g.pixelRatio).toBe(1);
+    expect([g.disposed, g.lost]).toEqual([1, 1]);
+    // Its canvas is given back whole: 0 x 0.
+    expect(FakeCanvas.made[0]!.width).toBe(0);
+  });
+
+  it("renders the elements of the viewer's scene as they are now, on a copy", async () => {
+    const c = config();
+    const raster = createModelRaster(c);
+    c.scene.children[0]!.visible = false;
+    await raster.pictures.raster(1, { longEdge: 100 });
+    const copy = made()[0]!.rendered[0]!.scene;
+    expect(copy).not.toBe(c.scene);
+    expect(copy.children[0]!.visible).toBe(false);
+  });
+
+  it("uses one tile where the GPU holds the picture, and tiles where it does not", async () => {
+    gpu.max = 100;
+    const raster = createModelRaster(config());
+    await raster.pictures.raster(1, { width: 250, height: 100 });
+    expect(made()[0]!.rendered).toHaveLength(3);
+    expect(Math.max(...made()[0]!.rendered.map((x) => x.width))).toBe(100);
+  });
+
+  it("draws each picture pixel from more where the context has no multisampling", async () => {
+    gpu.multisampled = false;
+    const raster = createModelRaster(config({ tile: 50 }));
+    await raster.pictures.raster(1, { width: 100, height: 50 });
+    // Tiles of 50 px, drawn at 100.
+    expect(made()[0]!.rendered.map((x) => [x.width, x.height])).toEqual([
+      [100, 100],
+      [100, 100],
+    ]);
+  });
+
+  it("frees the renderer when a render fails", async () => {
+    gpu.failAt = 2;
+    const raster = createModelRaster(config({ tile: 64 }));
+    expect(await code(raster.pictures.raster(1, { width: 150, height: 100 }))).toBe("failed");
+    expect([made()[0]!.disposed, made()[0]!.lost]).toEqual([1, 1]);
+    expect(FakeCanvas.made.every((c) => c.width === 0)).toBe(true);
+  });
+
+  it("frees the renderer when the picture is stopped between tiles, and draws no more", async () => {
+    const stop = new AbortController();
+    gpu.onRender = (r) => {
+      if (r.rendered.length === 2) stop.abort();
+    };
+    const raster = createModelRaster(config({ tile: 64 }));
+    expect(await code(raster.pictures.raster(1, { width: 150, height: 100, signal: stop.signal }))).toBe("aborted");
+    // Give the interrupted drawing time to unwind.
+    await new Promise((r) => setTimeout(r, 30));
+    expect(made()[0]!.rendered).toHaveLength(2);
+    expect([made()[0]!.disposed, made()[0]!.lost]).toEqual([1, 1]);
+  });
+
+  it("does not make a renderer for a request that is refused or already stopped", async () => {
+    const raster = createModelRaster(config());
+    expect(await code(raster.pictures.raster(1, {}))).toBe("invalid");
+    expect(await code(raster.pictures.raster(2, { longEdge: 10 }))).toBe("invalid");
+    expect(await code(raster.pictures.raster(1, { longEdge: 10, signal: AbortSignal.abort() }))).toBe("aborted");
+    expect(made()).toHaveLength(0);
+  });
+
+  it("says unsupported where there is no WebGL, and too-large where the GPU gives a smaller buffer", async () => {
+    const raster = createModelRaster(config());
+    gpu.fail = true;
+    expect(await code(raster.pictures.raster(1, { longEdge: 10 }))).toBe("unsupported");
+    gpu.fail = false;
+    gpu.shrink = 1;
+    expect(await code(raster.pictures.raster(1, { longEdge: 10 }))).toBe("too-large");
+    expect([made()[0]!.disposed, made()[0]!.lost]).toEqual([1, 1]);
+  });
+
+  it("says failed when the context is lost while drawing", async () => {
+    gpu.onRender = (r) => (r.contextLost = true);
+    const raster = createModelRaster(config());
+    expect(await code(raster.pictures.raster(1, { longEdge: 10 }))).toBe("failed");
+    expect(made()[0]!.lost).toBeGreaterThanOrEqual(1);
+  });
+
+  it("makes one renderer at a time for pictures asked together", async () => {
+    let live = 0;
+    let most = 0;
+    gpu.onRender = () => {
+      live = made().filter((r) => r.lost === 0).length;
+      most = Math.max(most, live);
+    };
+    const raster = createModelRaster(config());
+    await Promise.all([1, 2, 3].map(() => raster.pictures.raster(1, { longEdge: 20 })));
+    expect(made()).toHaveLength(3);
+    expect(most).toBe(1);
+  });
+
+  it("stops what is drawing, and refuses more, once the viewer is closed", async () => {
+    const raster = createModelRaster(config({ tile: 16 }));
+    gpu.onRender = (r) => {
+      if (r.rendered.length === 1) raster.destroy();
+    };
+    expect(await code(raster.pictures.raster(1, { width: 100, height: 100 }))).toBe("aborted");
+    await new Promise((r) => setTimeout(r, 30));
+    expect([made()[0]!.disposed, made()[0]!.lost]).toEqual([1, 1]);
+    expect(await code(raster.pictures.raster(1, { longEdge: 10 }))).toBe("failed");
+  });
+});
+
+describe("the viewport", () => {
+  const setup = () => {
+    let clock = 0;
+    const c = config({ now: () => clock, frame: { zUp: true, origin: [10, 20, 30], offset: [0, 0, 0] } });
+    const raster = createModelRaster(c);
+    return { c, raster, tick: (ms: number) => (clock += ms) };
+  };
+
+  it("is the live camera in the model's coordinates, with an up and the canvas's aspect", () => {
+    const { c, raster } = setup();
+    const v = raster.viewport.get()!;
+    expect(v).toMatchObject({ space: "camera", page: 1 });
+    const region = v.region as CameraRegion;
+    expect(region.aspect).toBe(2);
+    expect(region.projection).toEqual({ type: "perspective", fov: expect.closeTo(45, 9) });
+    expect(region.up).toEqual([expect.closeTo(0, 9), expect.closeTo(0, 9), expect.closeTo(1, 9)]);
+    // Scene (5, 4, 6) is model (15, 14, 34): X as is, Y = -scene Z, Z = scene Y.
+    expect(region.position[0]).toBeCloseTo(5 + 10, 9);
+    expect(region.position[1]).toBeCloseTo(-6 + 20, 9);
+    expect(region.position[2]).toBeCloseTo(4 + 30, 9);
+    expect(c.camera.fov).toBe(45);
+  });
+
+  it("follows a zoomed camera as a narrower field of view", () => {
+    const { c, raster, tick } = setup();
+    c.camera.zoom = 2;
+    tick(1000);
+    raster.sync();
+    const fov = ((raster.viewport.get()!.region as CameraRegion).projection as { fov: number }).fov;
+    expect(Math.tan((fov * Math.PI) / 360)).toBeCloseTo(Math.tan((45 * Math.PI) / 360) / 2, 9);
+  });
+
+  it("is published when the view changes, at most every interval, and the last move still lands", () => {
+    const { c, raster, tick } = setup();
+    const seen: unknown[] = [];
+    raster.viewport.subscribe((v) => seen.push(v));
+    const start = seen.length;
+    raster.sync();
+    expect(seen.length).toBe(start);
+    c.camera.position.x += 1;
+    tick(10);
+    raster.sync();
+    expect(seen.length).toBe(start);
+    tick(VIEWPORT_INTERVAL_MS);
+    raster.sync();
+    expect(seen.length).toBe(start + 1);
+    c.camera.position.x += 1;
+    tick(VIEWPORT_INTERVAL_MS + 1);
+    raster.sync();
+    raster.sync();
+    expect(seen.length).toBe(start + 2);
+    expect((raster.viewport.get()!.region as CameraRegion).position[0]).toBeCloseTo(7 + 10, 9);
+  });
+
+  it("can only be read by the host", () => {
+    const { raster } = setup();
+    expect(Object.keys(raster.viewport).sort()).toEqual(["get", "subscribe"]);
+  });
+
+  it("read back as region 'current' is the same view", async () => {
+    const { c, raster, tick } = setup();
+    c.camera.position.set(-3, 2, 9);
+    c.camera.lookAt(c.controls.target);
+    tick(1000);
+    raster.sync();
+    const shown = raster.viewport.get()!.region as CameraRegion;
+    const viaCurrent = await raster.pictures.raster(1, { width: 40, height: 20, region: "current" });
+    const viaViewport = await raster.pictures.raster(1, { width: 40, height: 20, region: shown });
+    for (const r of [viaCurrent, viaViewport]) {
+      const got = r.region as CameraRegion;
+      expect(got.aspect).toBeCloseTo(2, 9);
+      shown.position.forEach((v, i) => expect(got.position[i]).toBeCloseTo(v, 9));
+      shown.target.forEach((v, i) => expect(got.target[i]).toBeCloseTo(v, 9));
+      expect((got.projection as { fov: number }).fov).toBeCloseTo((shown.projection as { fov: number }).fov, 9);
+    }
+    // The same projection went to the GPU both times.
+    expect(made()[0]!.rendered[0]!.matrix).toEqual(made()[1]!.rendered[0]!.matrix);
+  });
+
+  it("the default region is the view the viewer opened on, whatever it shows since", async () => {
+    const { c, raster } = setup();
+    const opened = (raster.viewport.get()!.region as CameraRegion).position;
+    c.camera.position.set(50, 50, 50);
+    const r = await raster.pictures.raster(1, { longEdge: 40 });
+    expect((r.region as CameraRegion).position).toEqual(opened);
+  });
+});
diff --git a/crates/exav-viewer/ts/model/raster.ts b/crates/exav-viewer/ts/model/raster.ts
new file mode 100644
index 00000000..214c5c70
--- /dev/null
+++ b/crates/exav-viewer/ts/model/raster.ts
@@ -0,0 +1,467 @@
+/**
+ * The pictures and the viewport of a 3D model (`@exav/viewer/ifc`, `/model`).
+ *
+ * A picture is drawn again from the model's geometry by a renderer of its
+ * own, off screen, at the picture's size, in tiles when that is more than
+ * the GPU holds; the viewer's canvas is never read. The renderer and
+ * everything on it are freed when the picture is done, failed or stopped.
+ *
+ * Regions are cameras (`CameraRegion`) in the model's own coordinates, see
+ * `ModelFrame`. `region: "current"` is the camera of the viewer now.
+ */
+import type * as THREE from "three";
+
+import { asRasterError, fitCamera, isCamera, RasterError, rasterSize, throwIfAborted } from "../core/pictures.js";
+import { createCanvas, createPictures, drawTiled, release } from "../core/raster.js";
+import { writable } from "../core/store.js";
+import { isColor } from "../core/theme.js";
+import type { CameraRegion, PicturesController, Raster, RasterOptions, Viewport, ViewportController } from "../core/types.js";
+import {
+  cameraRegion,
+  depthRange,
+  groundCircle,
+  modelUp,
+  sameRegion,
+  sceneCamera,
+  supersampling,
+  tileSize,
+  viewOffset,
+  type Ground,
+  type GlLimits,
+  type ModelFrame,
+  type SceneCamera,
+  type Vec3,
+} from "./camera.js";
+
+type Three = typeof THREE;
+type Canvas = HTMLCanvasElement | OffscreenCanvas;
+
+/** The viewport is published at most this often (ms) while the view moves, and once more when it stops. */
+export const VIEWPORT_INTERVAL_MS = 100;
+
+/** Shape of a picture when the viewer has no size yet. */
+const FALLBACK_ASPECT = 4 / 3;
+
+export interface ModelRasterConfig {
+  three: Three;
+  /** The scene as the viewer shows it: its objects (as they are now, hidden ones included) are what the pictures draw. */
+  scene: THREE.Scene;
+  /** The viewer's camera, and the point it orbits. */
+  camera: THREE.PerspectiveCamera;
+  controls: { target: THREE.Vector3 };
+  /** The viewer's renderer: read for tone mapping, shadows and clipping, never drawn with. */
+  renderer: THREE.WebGLRenderer;
+  frame: ModelFrame;
+  /** Bounds the model, in the scene. */
+  sphere: { center: Vec3; radius: number };
+  /** The background of a picture that asks for none: the viewer's ground. */
+  ground(): Ground;
+  /** Objects of the scene that are the viewer's own and not the model (a grid, a selection). */
+  skip?(object: THREE.Object3D): boolean;
+  /** The image-based light of the scene, made for the picture's renderer; freed with it. */
+  environment?(renderer: THREE.WebGLRenderer): { texture: THREE.Texture; dispose(): void };
+  /** Testing and tuning: a smaller tile than the GPU allows. */
+  tile?: number;
+  /** Testing and tuning: rendered pixels along a side for each picture pixel (default 1 with multisampling, else 2). */
+  supersample?: number;
+  /** For the viewport's throttle. */
+  now?(): number;
+}
+
+export interface ModelRaster {
+  pictures: PicturesController;
+  viewport: ViewportController;
+  /** Publishes the viewer's camera if it changed; the viewer's frame loop and resize call it. */
+  sync(): void;
+  /** Stops the pictures being drawn. */
+  destroy(): void;
+}
+
+// ── One picture at a time ────────────────────────────────────────────────────
+
+let tail: Promise<unknown> = Promise.resolve();
+
+/**
+ * Runs `task` after the ones before it, for all the sessions of the page:
+ * one picture holds a GPU context and up to a tile of memory, and N
+ * together would hold N times that. A `signal` that fires while it waits
+ * (or while it runs) rejects at once with "aborted"; a value the task
+ * still produces then goes to `discard`.
+ */
+export function inTurn<T>(signal: AbortSignal | undefined, task: () => Promise<T>, discard: (value: T) => void = () => {}): Promise<T> {
+  throwIfAborted(signal);
+  const run = tail.then(() => {
+    throwIfAborted(signal);
+    return task();
+  });
+  tail = run.then(
+    () => {},
+    () => {},
+  );
+  if (!signal) return run;
+  return new Promise<T>((resolve, reject) => {
+    let over = false;
+    const stop = () => {
+      if (over) return;
+      over = true;
+      reject(new RasterError("aborted", "aborted"));
+    };
+    signal.addEventListener("abort", stop, { once: true });
+    run.then(
+      (value) => {
+        signal.removeEventListener("abort", stop);
+        if (over) discard(value);
+        else {
+          over = true;
+          resolve(value);
+        }
+      },
+      (error) => {
+        signal.removeEventListener("abort", stop);
+        if (!over) {
+          over = true;
+          reject(error);
+        }
+      },
+    );
+  });
+}
+
+// ── The picture's renderer ───────────────────────────────────────────────────
+
+/** A WebGL renderer on a canvas of its own: off screen where the browser has it, else a canvas that is never attached. */
+function openRenderer(three: Three): { renderer: THREE.WebGLRenderer; canvas: Canvas } {
+  const make = (canvas: Canvas) =>
+    new three.WebGLRenderer({ canvas, antialias: true, alpha: true, premultipliedAlpha: true, preserveDrawingBuffer: false, stencil: false });
+  if (typeof OffscreenCanvas === "function") {
+    const canvas = new OffscreenCanvas(1, 1);
+    try {
+      return { renderer: make(canvas), canvas };
+    } catch {
+      release(canvas);
+    }
+  }
+  const canvas = Object.assign(document.createElement("canvas"), { width: 1, height: 1 });
+  try {
+    return { renderer: make(canvas), canvas };
+  } catch (error) {
+    release(canvas);
+    throw new RasterError("unsupported", "WebGL is not available", { cause: error });
+  }
+}
+
+function limitsOf(gl: WebGLRenderingContext | WebGL2RenderingContext): GlLimits {
+  const view = gl.getParameter(gl.MAX_VIEWPORT_DIMS) as ArrayLike<number>;
+  return {
+    texture: gl.getParameter(gl.MAX_TEXTURE_SIZE) as number,
+    renderbuffer: gl.getParameter(gl.MAX_RENDERBUFFER_SIZE) as number,
+    viewport: [view[0] ?? 0, view[1] ?? 0],
+  };
+}
+
+/** What the viewer's renderer is set to and the picture's must be too, so that it looks the same. */
+function matchRenderer(from: THREE.WebGLRenderer, to: THREE.WebGLRenderer): void {
+  // The size is explicit: the viewer's pixel ratio does not apply.
+  to.setPixelRatio(1);
+  to.setClearColor(0x000000, 0);
+  to.outputColorSpace = from.outputColorSpace;
+  to.toneMapping = from.toneMapping;
+  to.toneMappingExposure = from.toneMappingExposure;
+  to.sortObjects = from.sortObjects;
+  to.localClippingEnabled = from.localClippingEnabled;
+  to.clippingPlanes = from.clippingPlanes.map((p) => p.clone());
+  to.shadowMap.enabled = from.shadowMap.enabled;
+  to.shadowMap.type = from.shadowMap.type;
+  // The shadow does not depend on the camera: made for the first tile, kept for the others.
+  to.shadowMap.autoUpdate = false;
+}
+
+/** What `cloneScene` made and must free. */
+interface Copy {
+  scene: THREE.Scene;
+  dispose(): void;
+}
+
+/**
+ * The objects of `source` for another renderer: new objects, sharing the
+ * vertex data (no copy) but not the geometry or material objects, which hold
+ * a renderer's uploads and are freed with the copy. `skip`ped objects and
+ * what is under them are left out; visibility, draw ranges and clipping are
+ * kept as they are now.
+ */
+export function cloneScene(three: Three, source: THREE.Scene, skip?: (o: THREE.Object3D) => boolean): Copy {
+  const geometries: THREE.BufferGeometry[] = [];
+  const materials = new Map<THREE.Material, THREE.Material>();
+  const shadows: THREE.LightShadow[] = [];
+  const material = (m: THREE.Material) => {
+    let c = materials.get(m);
+    if (!c) {
+      c = m.clone();
+      c.onBeforeCompile = m.onBeforeCompile;
+      materials.set(m, c);
+    }
+    return c;
+  };
+  const geometry = (g: THREE.BufferGeometry) => {
+    const c = new three.BufferGeometry();
+    for (const [name, attribute] of Object.entries(g.attributes)) c.setAttribute(name, attribute);
+    if (g.index) c.setIndex(g.index);
+    c.groups = g.groups.map((x) => ({ ...x }));
+    c.drawRange = { ...g.drawRange };
+    c.boundingSphere = g.boundingSphere?.clone() ?? null;
+    c.boundingBox = g.boundingBox?.clone() ?? null;
+    geometries.push(c);
+    return c;
+  };
+  const copy = (o: THREE.Object3D): THREE.Object3D | null => {
+    if (skip?.(o)) return null;
+    const c = o.clone(false);
+    const drawn = o as THREE.Mesh;
+    if (drawn.isMesh || (o as THREE.Line).isLine || (o as THREE.Points).isPoints) {
+      const into = c as THREE.Mesh;
+      into.geometry = geometry(drawn.geometry);
+      into.material = Array.isArray(drawn.material) ? drawn.material.map(material) : material(drawn.material);
+    }
+    const shadow = (c as { shadow?: THREE.LightShadow }).shadow;
+    if (shadow) shadows.push(shadow);
+    for (const child of o.children) {
+      const k = copy(child);
+      if (k) c.add(k);
+    }
+    return c;
+  };
+  const scene = new three.Scene();
+  scene.environmentIntensity = source.environmentIntensity;
+  scene.environmentRotation.copy(source.environmentRotation);
+  for (const child of source.children) {
+    const k = copy(child);
+    if (k) scene.add(k);
+  }
+  return {
+    scene,
+    dispose() {
+      for (const g of geometries) g.dispose();
+      for (const m of materials.values()) m.dispose();
+      for (const s of shadows) s.dispose();
+    },
+  };
+}
+
+/** The camera a picture is drawn with: the viewer's near and far planes for a perspective one. */
+export function makeCamera(three: Three, c: SceneCamera, depth: { near: number; far: number }): THREE.PerspectiveCamera | THREE.OrthographicCamera {
+  let camera: THREE.PerspectiveCamera | THREE.OrthographicCamera;
+  if (c.projection.type === "perspective") camera = new three.PerspectiveCamera(c.projection.fov, c.aspect, depth.near, depth.far);
+  else {
+    const h = c.projection.height / 2;
+    const w = h * c.aspect;
+    camera = new three.OrthographicCamera(-w, w, h, -h, depth.near, depth.far);
+  }
+  camera.up.set(...c.up);
+  camera.position.set(...c.position);
+  camera.lookAt(...c.target);
+  camera.updateMatrixWorld();
+  camera.updateProjectionMatrix();
+  return camera;
+}
+
+/** The ground of a tile of the picture, drawn on the tile's canvas. */
+function paintGround(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, ground: Ground, picture: { width: number; height: number }, tile: { x: number; y: number; width: number; height: number }): void {
+  if (ground.type === "none") return;
+  if (ground.type === "solid") {
+    ctx.fillStyle = ground.color;
+  } else {
+    const c = groundCircle(ground.at, picture.width, picture.height);
+    const gradient = ctx.createRadialGradient(c.x - tile.x, c.y - tile.y, 0, c.x - tile.x, c.y - tile.y, c.radius);
+    try {
+      for (const s of ground.stops) gradient.addColorStop(s.offset, s.color);
+    } catch {
+      // A colour the browser does not take: the first one, flat.
+      ctx.fillStyle = ground.stops[0]?.color ?? "#ffffff";
+      ctx.fillRect(0, 0, tile.width, tile.height);
+      return;
+    }
+    ctx.fillStyle = gradient;
+  }
+  ctx.fillRect(0, 0, tile.width, tile.height);
+}
+
+const yieldToLoop = () => new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+/** What a request resolves to, before anything is allocated. */
+interface Job {
+  /** The camera as drawn, in the scene. */
+  camera: SceneCamera;
+  /** The same as a region, in the model's coordinates. */
+  region: CameraRegion;
+  width: number;
+  height: number;
+  /** A CSS colour or "transparent"; undefined for the viewer's ground. */
+  background: string | undefined;
+}
+
+/**
+ * Plans a request: the camera, the size, the ground. Throws `RasterError`
+ * "invalid" or "too-large" and has touched nothing.
+ */
+export function planJob(
+  options: RasterOptions,
+  frame: ModelFrame,
+  views: { current(): CameraRegion; whole(): CameraRegion },
+): Job {
+  let region: CameraRegion;
+  if (options.region === undefined) region = views.whole();
+  else if (options.region === "current") region = views.current();
+  else if (isCamera(options.region)) region = options.region;
+  else throw new RasterError("invalid", "a 3D model takes a camera for a region");
+  if (options.fit !== undefined && options.fit !== "contain" && options.fit !== "cover") throw new RasterError("invalid", "fit is contain or cover");
+  if (options.background !== undefined && !isColor(options.background)) throw new RasterError("invalid", "background is a colour or transparent");
+  const { width, height } = rasterSize(options, region.aspect);
+  // The picture's own shape, to the pixel: the camera is made for it.
+  const used = fitCamera(region, width / height, options.fit);
+  const camera = sceneCamera(frame, used);
+  // The up it was drawn with is the model's own when none was given.
+  return { camera, region: { ...used, up: used.up ?? modelUp(frame) }, width, height, background: options.background };
+}
+
+/** Draws the job. Everything made here is freed before it returns or throws. */
+async function drawJob(c: ModelRasterConfig, job: Job, signal: AbortSignal | undefined): Promise<ImageBitmap> {
+  const { three } = c;
+  const { renderer, canvas } = openRenderer(three);
+  let copy: Copy | null = null;
+  let environment: { dispose(): void } | null = null;
+  try {
+    throwIfAborted(signal);
+    const gl = renderer.getContext();
+    const samples = supersampling(gl.getContextAttributes()?.antialias === true, c.supersample);
+    const tile = tileSize(limitsOf(gl), samples, c.tile);
+    matchRenderer(c.renderer, renderer);
+    copy = cloneScene(three, c.scene, c.skip);
+    if (c.environment) {
+      const made = c.environment(renderer);
+      environment = made;
+      copy.scene.environment = made.texture;
+    }
+    const camera = makeCamera(three, job.camera, depthRange(job.camera, c.sphere, c.camera));
+    const ground: Ground = job.background === undefined ? c.ground() : job.background === "transparent" ? { type: "none" } : { type: "solid", color: job.background };
+    const picture = { width: job.width, height: job.height };
+    let first = true;
+    return await drawTiled(
+      job.width,
+      job.height,
+      tile,
+      async (t) => {
+        // Between tiles, so that an abort is heard.
+        await yieldToLoop();
+        throwIfAborted(signal);
+        const o = viewOffset(job.width, job.height, t, samples);
+        renderer.setSize(o.width, o.height, false);
+        if (gl.drawingBufferWidth !== o.width || gl.drawingBufferHeight !== o.height) throw new RasterError("too-large", `the GPU gave a ${gl.drawingBufferWidth} x ${gl.drawingBufferHeight} px buffer for ${o.width} x ${o.height}`);
+        camera.setViewOffset(o.fullWidth, o.fullHeight, o.x, o.y, o.width, o.height);
+        renderer.shadowMap.needsUpdate = first;
+        first = false;
+        renderer.render(copy!.scene, camera);
+        if (gl.isContextLost()) throw new RasterError("failed", "the GPU context was lost");
+        // Read in the same task as the render: the drawing buffer is not kept.
+        const { canvas: out, ctx } = createCanvas(t.width, t.height);
+        try {
+          paintGround(ctx, ground, picture, t);
+          ctx.imageSmoothingEnabled = true;
+          ctx.imageSmoothingQuality = "high";
+          ctx.drawImage(canvas, 0, 0, o.width, o.height, 0, 0, t.width, t.height);
+        } catch (error) {
+          release(out);
+          throw error;
+        }
+        return out;
+      },
+      { signal },
+    );
+  } finally {
+    // Each step on its own: the context must go whatever else fails.
+    for (const free of [() => copy?.dispose(), () => environment?.dispose(), () => renderer.dispose(), () => renderer.forceContextLoss()]) {
+      try {
+        free();
+      } catch {
+        // Nothing more can be done for it.
+      }
+    }
+    release(canvas);
+  }
+}
+
+// ── The controllers ──────────────────────────────────────────────────────────
+
+const toVec = (v: THREE.Vector3): Vec3 => [v.x, v.y, v.z];
+
+export function createModelRaster(config: ModelRasterConfig): ModelRaster {
+  const { camera, controls, frame } = config;
+  const now = config.now ?? (() => performance.now());
+
+  /** The viewer's camera, as a region. A zoomed camera is a narrower field of view. */
+  const current = (): CameraRegion => {
+    const fov = (2 * Math.atan(Math.tan((camera.fov * Math.PI) / 360) / (camera.zoom > 0 ? camera.zoom : 1)) * 180) / Math.PI;
+    return cameraRegion(frame, {
+      position: toVec(camera.position),
+      target: toVec(controls.target),
+      up: toVec(camera.up),
+      projection: { type: "perspective", fov },
+      aspect: camera.aspect > 0 ? camera.aspect : FALLBACK_ASPECT,
+    });
+  };
+  // The view the viewer opens on, as it is when this is made.
+  const initial = current();
+  const whole = (): CameraRegion => ({ ...initial, aspect: current().aspect });
+
+  const store = writable<Viewport | null>(null);
+  let published: CameraRegion | null = null;
+  let last = -Infinity;
+  const sync = () => {
+    const region = current();
+    if (published && sameRegion(published, region)) return;
+    const t = now();
+    // The frame loop calls again: what is held back here is published then.
+    if (published && t - last < VIEWPORT_INTERVAL_MS) return;
+    published = region;
+    last = t;
+    store.set({ space: "camera", page: 1, region });
+  };
+  sync();
+
+  const running = new Set<AbortController>();
+  let destroyed = false;
+  const { controller: pictures } = createPictures({
+    count: 1,
+    space: "camera",
+    async raster(page, options): Promise<Raster> {
+      if (destroyed) throw new RasterError("failed", "the viewer is closed");
+      const job = planJob(options, frame, { current, whole });
+      const stop = new AbortController();
+      const onAbort = () => stop.abort();
+      options.signal?.addEventListener("abort", onAbort, { once: true });
+      running.add(stop);
+      try {
+        const bitmap = await inTurn(
+          stop.signal,
+          () => drawJob(config, job, stop.signal),
+          (late) => late.close(),
+        );
+        return { bitmap, width: job.width, height: job.height, page, space: "camera", region: job.region };
+      } catch (error) {
+        throw asRasterError(error, stop.signal);
+      } finally {
+        options.signal?.removeEventListener("abort", onAbort);
+        running.delete(stop);
+      }
+    },
+  });
+
+  return {
+    pictures,
+    viewport: { get: store.get, subscribe: store.subscribe },
+    sync,
+    destroy() {
+      destroyed = true;
+      for (const stop of running) stop.abort();
+    },
+  };
+}
diff --git a/crates/exav-viewer/ts/model/stl.ts b/crates/exav-viewer/ts/model/stl.ts
index 35946507..00d4bf4f 100644
--- a/crates/exav-viewer/ts/model/stl.ts
+++ b/crates/exav-viewer/ts/model/stl.ts
@@ -1,7 +1,10 @@
 import { writable } from "../core/store.js";
 import type { Renderer } from "../core/types.js";
-import { createModelEngine, DEFAULT_MAX_TRIANGLES, DEFAULT_TIMEOUT_MS, modelWarnings } from "./engine.js";
+import { createModelEngine, DEFAULT_MAX_TRIANGLES, DEFAULT_TIMEOUT_MS, modelWarnings, type ModelKind, type ParsedModel } from "./engine.js";
+import { readBuffers } from "./buffers.js";
+import { parseGround } from "./camera.js";
 import type { ModelOptions } from "./index.js";
+import { createModelRaster } from "./raster.js";
 
 /**
  * A mid grey rather than white: the ground behind is pale, and a white part
@@ -9,7 +12,10 @@ import type { ModelOptions } from "./index.js";
  */
 const SURFACE = 0x8c97a8;
 
-export const renderer: Renderer<ModelOptions> = {
+/** STL is Z up. OBJ and PLY say nothing, and what three.js and Blender write is Y up; glTF is Y up. */
+const Z_UP: Record<Exclude<ModelKind, "ifc">, boolean> = { stl: true, obj: false, ply: false, gltf: false };
+
+export const rendererFor = (kind: Exclude<ModelKind, "ifc">): Renderer<ModelOptions> => ({
   async mount(host, ctx) {
     ctx.status({ phase: "loading" });
     const engine = createModelEngine();
@@ -30,27 +36,40 @@ export const renderer: Renderer<ModelOptions> = {
         ctx.source.bytes(),
       ]);
       if (disposed || ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+      ctx.status({ phase: "loading", step: "read" });
       const bytes = source.slice();
-      const model = await engine.call(
-        { kind: "stl", bytes: bytes.buffer as ArrayBuffer, maxTriangles: ctx.options.maxTriangles ?? DEFAULT_MAX_TRIANGLES },
-        [bytes.buffer as ArrayBuffer],
-        ctx.options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
-      );
+      const maxTriangles = ctx.options.maxTriangles ?? DEFAULT_MAX_TRIANGLES;
+      const timeout = ctx.options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+      // A glTF whose buffers are other files finds them among the files
+      // around it, when it has any.
+      let files: { name: string; bytes: ArrayBuffer }[] | undefined;
+      if (kind === "gltf" && ctx.file.tree) {
+        const listed = (await engine.call({ kind, bytes: bytes.slice().buffer as ArrayBuffer, maxTriangles, list: true }, [], timeout)) as { buffers: string[] };
+        files = await readBuffers(ctx.file.tree, listed.buffers, ctx.signal);
+      }
+      const model = (await engine.call(
+        { kind, bytes: bytes.buffer as ArrayBuffer, maxTriangles, ...(files?.length && { files }) },
+        [bytes.buffer as ArrayBuffer, ...(files ?? []).map((f) => f.bytes)],
+        timeout,
+      )) as ParsedModel;
       engine.destroy();
       if (disposed || ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+      ctx.status({ phase: "loading", step: "render" });
 
       const root = document.createElement("div");
-      root.className = "exv-model";
+      root.className = "exav-viewer-model";
       host.append(root);
       disposers.push(() => root.remove());
 
-      // The engine's facet normals, from the corners: some exporters write
-      // zeros in the file, which would light a mesh black.
+      // The engine's normals: the file's where it gives usable ones, else the
+      // facet's own from the corners (some exporters write zeros in the
+      // file, which would light a mesh black).
       const geometry = new three.BufferGeometry();
       geometry.setAttribute("position", new three.BufferAttribute(model.positions, 3));
       geometry.setAttribute("normal", new three.BufferAttribute(model.normals, 3));
       geometry.setIndex(new three.BufferAttribute(model.indices, 1));
-      // The VisCAM/SolidView or Magics facet colours, as sRGB bytes.
+      // The colours of the file's vertices or facets (STL: VisCAM, SolidView,
+      // Magics), as sRGB bytes.
       const coloured = (model.meta.batches[0]?.color0 ?? -1) >= 0;
       if (coloured) {
         const rgb = new Float32Array(model.colors.length);
@@ -65,7 +84,8 @@ export const renderer: Renderer<ModelOptions> = {
       }
       disposers.push(() => geometry.dispose());
       // Every CAD application and printer means Z up; three.js means Y.
-      if (ctx.options.zUp ?? true) geometry.rotateX(-Math.PI / 2);
+      const zUp = ctx.options.zUp ?? Z_UP[kind];
+      if (zUp) geometry.rotateX(-Math.PI / 2);
       geometry.computeBoundingBox();
       const box = geometry.boundingBox ?? new three.Box3();
       const size = box.getSize(new three.Vector3());
@@ -105,7 +125,7 @@ export const renderer: Renderer<ModelOptions> = {
       gl.shadowMap.type = three.PCFShadowMap;
       gl.toneMapping = three.ACESFilmicToneMapping;
       gl.toneMappingExposure = 0.95;
-      gl.domElement.className = "exv-model-canvas";
+      gl.domElement.className = "exav-viewer-model-canvas";
       root.append(gl.domElement);
 
       // An environment rather than lamps: a part is read by how its faces
@@ -154,6 +174,38 @@ export const renderer: Renderer<ModelOptions> = {
       controls.maxPolarAngle = Math.PI / 2 - 0.02;
       controls.update();
 
+      const raster = createModelRaster({
+        three,
+        scene,
+        camera,
+        controls,
+        renderer: gl,
+        frame: { zUp, origin: model.meta.origin, offset: [mesh.position.x, mesh.position.y, mesh.position.z] },
+        sphere: { center: [0, size.y / 2, 0], radius: size.length() / 2 },
+        // The surface the canvas is drawn over (`--exav-viewer-model-bg`).
+        ground: () => {
+          const style = getComputedStyle(root);
+          return parseGround(style.backgroundImage, style.backgroundColor);
+        },
+        // The lights of the picture's own renderer, as the viewer's.
+        environment: (renderer) => {
+          const pmrem = new three.PMREMGenerator(renderer);
+          const room = new RoomEnvironment();
+          const target = pmrem.fromScene(room, 0.04);
+          return {
+            texture: target.texture,
+            dispose() {
+              target.dispose();
+              room.dispose();
+              pmrem.dispose();
+            },
+          };
+        },
+        tile: ctx.options.rasterTile,
+        supersample: ctx.options.rasterSupersample,
+      });
+      disposers.push(raster.destroy);
+
       const resize = () => {
         const { clientWidth, clientHeight } = root;
         if (!clientWidth || !clientHeight) return;
@@ -170,6 +222,7 @@ export const renderer: Renderer<ModelOptions> = {
       const draw = () => {
         frame = requestAnimationFrame(draw);
         controls.update();
+        raster.sync();
         gl.render(scene, camera);
       };
       draw();
@@ -177,7 +230,7 @@ export const renderer: Renderer<ModelOptions> = {
 
       ctx.status(triangles > 0 ? { phase: "ready" } : { phase: "empty" });
       return {
-        controllers: { info: writable({ triangles }), warnings: writable(modelWarnings(model.meta, "stl")) },
+        controllers: { info: writable({ triangles }), warnings: writable(modelWarnings(model.meta, kind)), pictures: raster.pictures, viewport: raster.viewport },
         resize,
         destroy: dispose,
       };
@@ -187,4 +240,4 @@ export const renderer: Renderer<ModelOptions> = {
       throw error;
     }
   },
-};
+});
diff --git a/crates/exav-viewer/ts/model/storeys.test.ts b/crates/exav-viewer/ts/model/storeys.test.ts
new file mode 100644
index 00000000..c6456253
--- /dev/null
+++ b/crates/exav-viewer/ts/model/storeys.test.ts
@@ -0,0 +1,89 @@
+// @vitest-environment node
+import { describe, expect, it } from "vitest";
+
+import { createStoreys, storeyItems, storeyShown } from "./storeys.js";
+
+const node = (name: string, elevation: number | null, cls = "IFCBUILDINGSTOREY") => ({ id: 1, class: cls, name, parent: null, elevation });
+const element = (storey: number | null) => ({ id: 1, globalId: "", class: "IFCWALL", name: "w", node: storey, storey, ranges: [] as [number, number, number][] });
+
+/** A project, three storeys (listed low to high, one without an elevation) and a room. */
+const meta = {
+  nodes: [node("Project", null, "IFCPROJECT"), node("Level 0", 0), node("Level 2", 6), node("Level 1", 3), node("Roof", null), node("Unused", 9)],
+  elements: [element(1), element(1), element(2), element(3), element(4), element(null)],
+};
+
+describe("storeyItems", () => {
+  it("lists the storeys that hold an element, highest first and those without an elevation last", () => {
+    expect(storeyItems(meta).map((i) => [i.name, i.elevation])).toEqual([
+      ["Level 2", 6],
+      ["Level 1", 3],
+      ["Level 0", 0],
+      ["Roof", null],
+    ]);
+  });
+
+  it("gives each its node index as its id, shown", () => {
+    expect(storeyItems(meta).map((i) => [i.id, i.visible])).toEqual([
+      ["2", true],
+      ["3", true],
+      ["1", true],
+      ["4", true],
+    ]);
+  });
+
+  it("has nothing to filter in a model of one storey, or none", () => {
+    expect(storeyItems({ nodes: meta.nodes, elements: [element(1), element(1)] })).toEqual([]);
+    expect(storeyItems({ nodes: meta.nodes, elements: [element(null)] })).toEqual([]);
+    expect(createStoreys({ nodes: meta.nodes, elements: [] }, () => {})).toBeNull();
+  });
+
+  it("names a storey that has no name by its class", () => {
+    const nameless = { nodes: [node("", 0), node("B", 3)], elements: [element(0), element(1)] };
+    expect(storeyItems(nameless).map((i) => i.name)).toEqual(["B", "IFCBUILDINGSTOREY"]);
+  });
+});
+
+describe("storeyShown", () => {
+  it("draws what is in no storey, and what is in a storey that is not hidden", () => {
+    const hidden = new Set([2]);
+    expect(storeyShown(null, hidden)).toBe(true);
+    expect(storeyShown(undefined, hidden)).toBe(true);
+    expect(storeyShown(1, hidden)).toBe(true);
+    expect(storeyShown(2, hidden)).toBe(false);
+  });
+});
+
+describe("createStoreys", () => {
+  it("hides and shows a storey, telling which are hidden", () => {
+    const calls: number[][] = [];
+    const c = createStoreys(meta, (h) => calls.push([...h].sort()))!;
+    c.setVisible("3", false);
+    expect(calls.at(-1)).toEqual([3]);
+    expect(c.get().items.find((i) => i.id === "3")?.visible).toBe(false);
+    expect(c.get().items.filter((i) => !i.visible)).toHaveLength(1);
+    c.setVisible("2", false);
+    expect(calls.at(-1)).toEqual([2, 3]);
+    c.setVisible("3", true);
+    expect(calls.at(-1)).toEqual([2]);
+  });
+
+  it("hides and shows them all", () => {
+    const calls: number[][] = [];
+    const c = createStoreys(meta, (h) => calls.push([...h].sort()))!;
+    c.setAll(false);
+    expect(calls.at(-1)).toEqual([1, 2, 3, 4]);
+    expect(c.get().items.every((i) => !i.visible)).toBe(true);
+    c.setAll(true);
+    expect(calls.at(-1)).toEqual([]);
+  });
+
+  it("ignores a storey it does not have, and tells its listeners", () => {
+    const seen: boolean[][] = [];
+    const c = createStoreys(meta, () => {})!;
+    c.subscribe((s) => seen.push(s.items.map((i) => i.visible)));
+    c.setVisible("99", false);
+    expect(c.get().items.every((i) => i.visible)).toBe(true);
+    c.setVisible("2", false);
+    expect(seen.at(-1)).toEqual([false, true, true, true]);
+  });
+});
diff --git a/crates/exav-viewer/ts/model/storeys.ts b/crates/exav-viewer/ts/model/storeys.ts
new file mode 100644
index 00000000..7e243f8f
--- /dev/null
+++ b/crates/exav-viewer/ts/model/storeys.ts
@@ -0,0 +1,56 @@
+/**
+ * The storey filter of an IFC model: which building storeys have something
+ * drawn, and a controller that shows or hides them. The reader puts the
+ * elements of one storey in batches of their own (`BatchMeta.storey`), so
+ * hiding a storey hides whole batches, outlines included.
+ */
+import { writable } from "../core/store.js";
+import type { StoreyItem, StoreysController } from "../core/types.js";
+import type { ModelMeta } from "./engine.js";
+
+/**
+ * The storeys that hold an element, highest first; those without an
+ * elevation after them, by name. A model with fewer than two has nothing
+ * to filter: the list is empty.
+ */
+export function storeyItems(meta: Pick<ModelMeta, "nodes" | "elements">): StoreyItem[] {
+  const used = new Set<number>();
+  for (const e of meta.elements) if (e.storey != null) used.add(e.storey);
+  const items: StoreyItem[] = [];
+  for (const index of used) {
+    const node = meta.nodes[index];
+    if (!node) continue;
+    items.push({ id: String(index), name: node.name || node.class, elevation: node.elevation ?? null, visible: true });
+  }
+  if (items.length < 2) return [];
+  return items.sort((a, b) => {
+    if (a.elevation !== null && b.elevation !== null && a.elevation !== b.elevation) return b.elevation - a.elevation;
+    if ((a.elevation === null) !== (b.elevation === null)) return a.elevation === null ? 1 : -1;
+    return a.name.localeCompare(b.name);
+  });
+}
+
+/** Whether a batch of storey `storey` is drawn when the storeys `hidden` are not. */
+export function storeyShown(storey: number | null | undefined, hidden: ReadonlySet<number>): boolean {
+  return storey == null || !hidden.has(storey);
+}
+
+/**
+ * A controller over `meta`'s storeys, calling `apply` with the node indices
+ * of those hidden after each change. `null` when there is nothing to filter.
+ */
+export function createStoreys(meta: Pick<ModelMeta, "nodes" | "elements">, apply: (hidden: ReadonlySet<number>) => void): StoreysController | null {
+  const first = storeyItems(meta);
+  if (first.length === 0) return null;
+  const store = writable<{ items: readonly StoreyItem[] }>({ items: first });
+  const change = (visible: (item: StoreyItem) => boolean) => {
+    const items = store.get().items.map((i) => (visible(i) === i.visible ? i : { ...i, visible: visible(i) }));
+    store.set({ items });
+    apply(new Set(items.filter((i) => !i.visible).map((i) => Number(i.id))));
+  };
+  return {
+    ...store,
+    setVisible: (id, visible) => change((i) => (i.id === id ? visible : i.visible)),
+    setAll: (visible) => change(() => visible),
+  };
+}
diff --git a/crates/exav-viewer/ts/office/convert.test.ts b/crates/exav-viewer/ts/office/convert.test.ts
new file mode 100644
index 00000000..bf445bcf
--- /dev/null
+++ b/crates/exav-viewer/ts/office/convert.test.ts
@@ -0,0 +1,227 @@
+/**
+ * Which converter takes a file, and the external converter's contract: a
+ * module loaded from a URL, its progress shown as the viewer's steps, its
+ * errors, its abort, the memory option, and what it fetches for
+ * `Viewer.prefetch`.
+ */
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import type { RenderContext } from "../core/types.js";
+import { nativeFirst, prefetchUrls, rendererFor, statusOf } from "./convert.js";
+import { ExternalConversionError, externalUrl, loadExternal, NeedsConverterError } from "./external.js";
+import type { ConversionOptions, ConvertedFormat } from "./index.js";
+
+describe("the converter's progress", () => {
+  it("is the viewer's steps, with the share of each where it is counted", () => {
+    expect(statusOf({ stage: "download", loaded: 5, total: 20 })).toEqual({ phase: "loading", step: "engine", progress: 0.25 });
+    expect(statusOf({ stage: "download", loaded: 5, total: 0 })).toEqual({ phase: "loading", step: "engine" });
+    expect(statusOf({ stage: "start" })).toEqual({ phase: "converting", step: "start" });
+    expect(statusOf({ stage: "load", done: 1, total: 4 })).toEqual({ phase: "converting", step: "read", progress: 0.25 });
+    expect(statusOf({ stage: "export", done: 3, total: 4 })).toEqual({ phase: "converting", step: "convert", progress: 0.75 });
+  });
+});
+
+describe("which converter takes a file", () => {
+  const kinds = ["rtf", "doc", "odt", "ppt", "odp", "keynote", "xls", "ods", "numbers", "odg", "visio", "coreldraw", "publisher", "pagemaker", "freehand", "quarkxpress", "zonerdraw", "wpg"] as const;
+
+  it("is the package's own for spreadsheets, presentations and OpenDocument drawings, by default", () => {
+    for (const kind of ["xls", "ods", "numbers"] as const) expect(nativeFirst(kind, {})).toBe("sheets");
+    for (const kind of ["ppt", "odp", "keynote", "odg", "visio"] as const) expect(nativeFirst(kind, {})).toBe("slides");
+    // With an external converter too: it gets only what they do not read.
+    for (const kind of ["xls", "ppt", "odg"] as const) expect(nativeFirst(kind, { externalConverter: "x" })).not.toBeNull();
+  });
+
+  it("is the package's `docs` for text documents without an external converter, or when asked, the external one otherwise", () => {
+    for (const kind of ["doc", "odt", "rtf"] as const) {
+      expect(nativeFirst(kind, {})).toBe("docs");
+      expect(nativeFirst(kind, { externalConverter: "x" })).toBeNull();
+      expect(nativeFirst(kind, { converter: "exav", externalConverter: "x" })).toBe("docs");
+    }
+  });
+
+  it("is none for the formats nothing of the package reads, and for converter: external", () => {
+    for (const kind of ["coreldraw", "publisher", "pagemaker", "freehand", "quarkxpress", "zonerdraw", "wpg"] as const) {
+      expect(nativeFirst(kind, {})).toBeNull();
+      expect(nativeFirst(kind, { converter: "exav" })).toBeNull();
+    }
+    for (const kind of kinds) expect(nativeFirst(kind, { converter: "external" }), kind).toBeNull();
+  });
+});
+
+/** The contract's own fixture: an external converter in a file, imported by its URL. */
+const FAKE = pathToFileURL(path.join(import.meta.dirname, "..", "..", "e2e", "fixtures", "fake-converter.js")).href;
+
+const text = (s: string) => new TextEncoder().encode(s);
+
+let contexts = 0;
+
+function context(data: Uint8Array, options: ConversionOptions, signal = new AbortController().signal) {
+  const nested = vi.fn(() => ({ resize() {}, destroy() {} }));
+  const statuses: { phase: string; step?: string; progress?: number; error?: { code: string; cause?: unknown } }[] = [];
+  const ctx = {
+    file: { id: `f${contexts++}`, name: "a.vsdx" },
+    options,
+    source: { bytes: async () => data },
+    signal,
+    assetBase: "/assets/",
+    status: (s: (typeof statuses)[number]) => statuses.push(s),
+    controllers() {},
+    mountNested: nested,
+  } as unknown as RenderContext<ConversionOptions>;
+  return { ctx, nested, statuses };
+}
+
+const mount = async (kind: ConvertedFormat, ctx: RenderContext<ConversionOptions>) => rendererFor(kind).mount(document.createElement("div"), ctx);
+
+const shown = (nested: ReturnType<typeof vi.fn>) => (nested.mock.calls[0] as unknown as [unknown, { format: string; source: { bytes: Uint8Array } }])[1];
+
+afterEach(() => vi.unstubAllGlobals());
+
+describe("an external converter, loaded from a URL", () => {
+  it("is imported once and must export convert", async () => {
+    const a = await loadExternal(FAKE);
+    expect(await loadExternal(FAKE)).toBe(a);
+    expect(typeof a.convert).toBe("function");
+    await expect(loadExternal(`data:text/javascript,export const x = 1`)).rejects.toThrow(/does not export convert/);
+  });
+
+  it("converts what no converter of the package reads, and its PDF is shown", async () => {
+    const { ctx, nested } = context(text("hello"), { externalConverter: FAKE });
+    await mount("visio", ctx);
+    const file = shown(nested);
+    expect(file.format).toBe("pdf");
+    // The hint, the file's size and no memory option: what the converter was handed.
+    expect(new TextDecoder().decode(file.source.bytes)).toContain("fake converter: visio, 5 bytes, memory unset");
+  });
+
+  it("is handed the memory option, in bytes, when the host set one", async () => {
+    const { ctx, nested } = context(text("hello"), { externalConverter: FAKE, maxMemory: 123456 });
+    await mount("coreldraw", ctx);
+    expect(new TextDecoder().decode(shown(nested).source.bytes)).toContain("coreldraw, 5 bytes, memory 123456");
+  });
+
+  it("shows an XLSX result as an XLSX", async () => {
+    const { ctx, nested } = context(text("SHEET"), { externalConverter: FAKE });
+    await mount("wpg", ctx);
+    expect(shown(nested).format).toBe("xlsx");
+  });
+
+  it("has its progress shown as the viewer's steps", async () => {
+    const { ctx, statuses } = context(text("hello"), { externalConverter: FAKE });
+    await mount("visio", ctx);
+    expect(statuses).toContainEqual({ phase: "loading", step: "engine", progress: 0.5 });
+    expect(statuses).toContainEqual({ phase: "converting", step: "start" });
+    expect(statuses).toContainEqual({ phase: "converting", step: "read", progress: 0.5 });
+    expect(statuses).toContainEqual({ phase: "converting", step: "convert", progress: 1 });
+  });
+
+  it("fails with its own error as the cause, a failed conversion", async () => {
+    const { ctx, nested } = context(text("FAIL"), { externalConverter: FAKE });
+    const error = await mount("visio", ctx).then(
+      () => null,
+      (e: unknown) => e,
+    );
+    expect(error).toBeInstanceOf(ExternalConversionError);
+    expect(error).toMatchObject({ kind: "failed", format: "visio" });
+    expect(String((error as Error).cause)).toMatch(/asked to fail/);
+    expect(nested).not.toHaveBeenCalled();
+  });
+
+  it("is stopped with the session: the signal it was given is aborted", async () => {
+    const abort = new AbortController();
+    const { ctx, nested } = context(text("HANG"), { externalConverter: FAKE }, abort.signal);
+    const pending = mount("visio", ctx).then(
+      () => null,
+      (e: unknown) => e,
+    );
+    await new Promise((r) => setTimeout(r, 20));
+    abort.abort(new Error("closed"));
+    const error = await pending;
+    // Not a conversion failure: the viewer ignores what ends with its own session.
+    expect(error).not.toBeInstanceOf(ExternalConversionError);
+    expect(nested).not.toHaveBeenCalled();
+  });
+
+  it("ends after timeoutMs, with a timeout, even when the module never looks at its signal", async () => {
+    const { ctx } = context(text("DEAF"), { externalConverter: FAKE, timeoutMs: 30 });
+    const error = await mount("visio", ctx).then(
+      () => null,
+      (e: unknown) => e,
+    );
+    expect(error).toBeInstanceOf(ExternalConversionError);
+    expect(error).toMatchObject({ kind: "timeout" });
+  });
+
+  it("is aborted by the timeout too: a module that looks at its signal is told", async () => {
+    const { ctx } = context(text("HANG"), { externalConverter: FAKE, timeoutMs: 30 });
+    const error = await mount("visio", ctx).then(
+      () => null,
+      (e: unknown) => e,
+    );
+    expect(error).toMatchObject({ name: "ExternalConversionError", kind: "timeout" });
+  });
+
+  it("is refused when it resolves to something the contract does not allow", async () => {
+    const { ctx } = context(text("BAD"), { externalConverter: FAKE });
+    const error = await mount("visio", ctx).then(
+      () => null,
+      (e: unknown) => e,
+    );
+    expect(error).toBeInstanceOf(ExternalConversionError);
+    expect(String((error as Error).cause)).toMatch(/did not resolve/);
+  });
+
+  it("ends in the needs-converter error, naming the format, where none is set", async () => {
+    const { ctx, statuses, nested } = context(text("hello"), {});
+    await mount("freehand", ctx);
+    const last = statuses.at(-1)!;
+    expect(last.phase).toBe("error");
+    expect(last.error?.code).toBe("needs_converter");
+    expect(last.error?.cause).toBeInstanceOf(NeedsConverterError);
+    expect(last.error?.cause).toMatchObject({ kind: "needs-converter", format: "freehand" });
+    expect(nested).not.toHaveBeenCalled();
+  });
+});
+
+describe("where the module is", () => {
+  const serve = (manifest: unknown) =>
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async () => new Response(JSON.stringify(manifest), { status: 200 })),
+    );
+
+  it("is a URL as given, relative ones against the page", async () => {
+    expect(await externalUrl("https://c.test/x.js", "/a/")).toBe("https://c.test/x.js");
+    expect(await externalUrl("/conv/index.js", "/a/")).toBe(new URL("/conv/index.js", document.baseURI).href);
+    expect(await externalUrl("./conv/index.js", "/a/")).toBe(new URL("./conv/index.js", document.baseURI).href);
+  });
+
+  it("is the entry the asset manifest names for a package's name", async () => {
+    serve({ dirs: {}, files: {}, converters: { "@acme/to-pdf": "converters/acme__to-pdf/1.2.3/js/index.js" }, all: [] });
+    expect(await externalUrl("@acme/to-pdf", "/m1/")).toBe(new URL("/m1/converters/acme__to-pdf/1.2.3/js/index.js", document.baseURI).href);
+    await expect(externalUrl("@acme/other", "/m1/")).rejects.toThrow(/not in the asset manifest/);
+  });
+});
+
+describe("prefetching a converted format", () => {
+  it("names nothing for what the package's own converters take, whose modules are the viewer's", async () => {
+    for (const kind of ["xls", "ods", "numbers", "ppt", "odp", "keynote", "odg", "visio"] as const) {
+      expect(await prefetchUrls(kind, "/a/")).toEqual([]);
+      expect(await prefetchUrls(kind, "/a/", { externalConverter: FAKE })).toEqual([]);
+    }
+  });
+
+  it("names nothing for a kind without an external converter", async () => {
+    expect(await prefetchUrls("coreldraw", "/a/")).toEqual([]);
+  });
+
+  it("names the external converter's module and what it says it fetches, relative to the module", async () => {
+    expect(await prefetchUrls("coreldraw", "/a/", { externalConverter: FAKE })).toEqual([FAKE, new URL("fake-data-coreldraw.bin", FAKE).href]);
+    expect(await prefetchUrls("doc", "/a/", { externalConverter: FAKE })).toEqual([FAKE, new URL("fake-data-doc.bin", FAKE).href]);
+    // The package's own `docs` takes a text document when the options say so.
+    expect(await prefetchUrls("doc", "/a/", { converter: "exav", externalConverter: FAKE })).toEqual([]);
+  });
+});
diff --git a/crates/exav-viewer/ts/office/convert.ts b/crates/exav-viewer/ts/office/convert.ts
new file mode 100644
index 00000000..9a8eba0d
--- /dev/null
+++ b/crates/exav-viewer/ts/office/convert.ts
@@ -0,0 +1,188 @@
+/**
+ * Converts the formats the Office engines do not read, then shows the result
+ * in a nested session of the same viewer, whose status and controllers become
+ * this one's.
+ *
+ * Spreadsheets (XLS, ODS, Numbers) are converted to XLSX by exav-render's
+ * `sheets`, presentations and OpenDocument drawings (PPT, ODP, Keynote, ODG)
+ * to PPTX by `slides`, and, unless `converter: "external"`, text documents
+ * (DOC, ODT, RTF) to DOCX by `docs` where no external converter is set. A
+ * file such a converter recognises and cannot convert fails with its reason
+ * (`SheetConversionError`, `SlideConversionError`, `DocConversionError`),
+ * never going on to the external converter; one it does not recognise goes
+ * to the external converter (`external.ts`), or ends in a
+ * `NeedsConverterError` where there is none.
+ */
+import type { Renderer, RenderContext, ViewerFile } from "../core/types.js";
+import type { ConversionOptions, ConvertedFormat } from "./index.js";
+import { convertDocs, DocConversionError, sniffDocs } from "./docs.js";
+import { ExternalConversionError, externalUrl, loadExternal, NeedsConverterError, statusOf } from "./external.js";
+import { nativeFirst } from "./route.js";
+import { convertSheet, SheetConversionError, sniffSheet } from "./sheets.js";
+import { convertSlides, SlideConversionError, sniffSlides } from "./slides.js";
+
+export { statusOf };
+export { docsFirst, nativeFirst, slidesFirst } from "./route.js";
+
+/**
+ * What a file of `kind` fetches besides the viewer's code, for
+ * `Viewer.prefetch`: nothing where the package's own converter takes it,
+ * their modules being the viewer's; else the external converter's module and
+ * what it names (`prefetch`).
+ */
+export async function prefetchUrls(kind: ConvertedFormat, assetBase: string, options: ConversionOptions = {}): Promise<string[]> {
+  if (nativeFirst(kind, options) || options.externalConverter === undefined) return [];
+  const url = await externalUrl(options.externalConverter, assetBase);
+  const module = await loadExternal(url);
+  const named = (await module.prefetch?.(kind)) ?? [];
+  return [url, ...named.map((u) => new URL(u, url).href)];
+}
+
+/** The file as XLSX from `sheets`, or `null` when it is not one it reads. */
+async function bySheets(bytes: Uint8Array, ctx: RenderContext<ConversionOptions>): Promise<Uint8Array | null> {
+  const format = sniffSheet(bytes);
+  if (format === "xlsx") return bytes;
+  if (!format) return null;
+  ctx.status({ phase: "converting", step: "convert" });
+  let converted;
+  try {
+    converted = await convertSheet(bytes, format, { signal: ctx.signal, timeoutMs: ctx.options.timeoutMs, maxMemory: ctx.options.maxMemory });
+  } catch (error) {
+    if (ctx.signal.aborted) throw error;
+    throw new SheetConversionError(format, error);
+  }
+  const { xlsx, warnings } = converted;
+  if (warnings) console.warn(`office: ${format}: ${warnings.replaceAll("\n", "; ")}`);
+  return new Uint8Array(xlsx);
+}
+
+/** The file as PPTX from `slides`, or `null` when it is not a presentation or drawing it recognises. */
+async function bySlides(bytes: Uint8Array, ctx: RenderContext<ConversionOptions>): Promise<Uint8Array | null> {
+  const format = sniffSlides(bytes);
+  if (format === "pptx") return bytes;
+  if (!format) return null;
+  ctx.status({ phase: "converting", step: "convert" });
+  let converted;
+  try {
+    converted = await convertSlides(bytes, format, { signal: ctx.signal, timeoutMs: ctx.options.timeoutMs, maxMemory: ctx.options.maxMemory });
+  } catch (error) {
+    if (ctx.signal.aborted) throw error;
+    throw new SlideConversionError(format, error);
+  }
+  const { pptx, warnings } = converted;
+  if (warnings) console.warn(`office: ${format}: ${warnings.replaceAll("\n", "; ")}`);
+  return new Uint8Array(pptx);
+}
+
+/** The file as DOCX from `docs`, or `null` when it is not a document it recognises. */
+async function byDocs(bytes: Uint8Array, ctx: RenderContext<ConversionOptions>): Promise<Uint8Array | null> {
+  const format = sniffDocs(bytes);
+  if (format === "docx") return bytes;
+  if (!format) return null;
+  ctx.status({ phase: "converting", step: "convert" });
+  let converted;
+  try {
+    converted = await convertDocs(bytes, format, { signal: ctx.signal, timeoutMs: ctx.options.timeoutMs, maxMemory: ctx.options.maxMemory });
+  } catch (error) {
+    if (ctx.signal.aborted) throw error;
+    throw new DocConversionError(format, error);
+  }
+  const { docx, warnings } = converted;
+  if (warnings) console.warn(`office: ${format}: ${warnings.replaceAll("\n", "; ")}`);
+  return new Uint8Array(docx);
+}
+
+/** A conversion that takes longer than this is stopped, as the package's own converters are. */
+const DEFAULT_TIMEOUT_MS = 120_000;
+
+/**
+ * The file converted by the external converter: its progress shown as the
+ * viewer's steps, aborted with the session or when it takes too long, and
+ * ended at once then even if the module does not look at its signal.
+ */
+async function byExternal(kind: ConvertedFormat, bytes: Uint8Array, ctx: RenderContext<ConversionOptions>): Promise<{ format: "pdf" | "xlsx"; bytes: Uint8Array }> {
+  const spec = ctx.options.externalConverter;
+  if (spec === undefined) throw new NeedsConverterError(kind);
+  const url = await externalUrl(spec, ctx.assetBase);
+  const converter = await loadExternal(url);
+
+  const controller = new AbortController();
+  const follow = () => controller.abort(ctx.signal.reason);
+  if (ctx.signal.aborted) follow();
+  else ctx.signal.addEventListener("abort", follow, { once: true });
+  const timeoutMs = ctx.options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  const ended = new Promise<never>((_, reject) => {
+    timer = setTimeout(() => {
+      const error = new ExternalConversionError(kind, "timeout");
+      controller.abort(error);
+      reject(error);
+    }, timeoutMs);
+    controller.signal.addEventListener("abort", () => reject(controller.signal.reason ?? new DOMException("aborted", "AbortError")), { once: true });
+  });
+  ended.catch(() => {});
+  try {
+    // A copy: the caller keeps its bytes.
+    const result = await Promise.race([
+      converter.convert(bytes.slice(), {
+        hint: kind,
+        ...(ctx.options.maxMemory !== undefined && { maxMemory: ctx.options.maxMemory }),
+        signal: controller.signal,
+        onProgress: (p) => ctx.status(statusOf(p)),
+      }),
+      ended,
+    ]);
+    // Checked by shape: bytes made in another realm (a frame, a worker) are no `instanceof` Uint8Array.
+    const out = result?.bytes;
+    if (!result || (result.format !== "pdf" && result.format !== "xlsx") || !ArrayBuffer.isView(out) || (out as { BYTES_PER_ELEMENT?: number }).BYTES_PER_ELEMENT !== 1) {
+      throw new ExternalConversionError(kind, "failed", new Error('the converter did not resolve to { format: "pdf" | "xlsx", bytes: Uint8Array }'));
+    }
+    return { format: result.format, bytes: new Uint8Array(out.buffer, out.byteOffset, out.byteLength) };
+  } catch (error) {
+    if (ctx.signal.aborted || error instanceof ExternalConversionError) throw error;
+    throw new ExternalConversionError(kind, "failed", error);
+  } finally {
+    clearTimeout(timer);
+    ctx.signal.removeEventListener("abort", follow);
+  }
+}
+
+/** Shows `bytes`, of `format`, in a nested session. */
+function show(host: HTMLElement, ctx: RenderContext<ConversionOptions>, format: "pdf" | "xlsx" | "pptx" | "docx", bytes: Uint8Array) {
+  const file: ViewerFile = { id: `${ctx.file.id}#${format}`, name: ctx.file.name, source: { bytes }, format };
+  const session = ctx.mountNested(host, file, { forward: true });
+  return { controllers: {}, resize: () => session.resize(), destroy: () => session.destroy() };
+}
+
+export function rendererFor(kind: ConvertedFormat): Renderer<ConversionOptions> {
+  return {
+    async mount(host, ctx) {
+      ctx.status({ phase: "loading" });
+      const bytes = await ctx.source.bytes();
+      // What the package's own converter recognises is converted by it alone:
+      // its failure is the file's (its error, with its kind). The external
+      // converter gets only what it does not recognise.
+      const native = nativeFirst(kind, ctx.options);
+      if (native === "sheets") {
+        const xlsx = await bySheets(bytes, ctx);
+        if (xlsx) return show(host, ctx, "xlsx", xlsx);
+      } else if (native === "slides") {
+        const pptx = await bySlides(bytes, ctx);
+        if (pptx) return show(host, ctx, "pptx", pptx);
+      } else if (native === "docs") {
+        const docx = await byDocs(bytes, ctx);
+        if (docx) return show(host, ctx, "docx", docx);
+      }
+      let shown;
+      try {
+        shown = await byExternal(kind, bytes, ctx);
+      } catch (error) {
+        // Said as its own kind of failure: the viewer's message is about the converter.
+        if (!(error instanceof NeedsConverterError) || ctx.signal.aborted) throw error;
+        ctx.status({ phase: "error", error: { code: "needs_converter", cause: error } });
+        return { controllers: {}, resize: () => {}, destroy: () => {} };
+      }
+      return show(host, ctx, shown.format, shown.bytes);
+    },
+  };
+}
diff --git a/crates/exav-viewer/ts/office/docs-convert.test.ts b/crates/exav-viewer/ts/office/docs-convert.test.ts
new file mode 100644
index 00000000..bc1da7a4
--- /dev/null
+++ b/crates/exav-viewer/ts/office/docs-convert.test.ts
@@ -0,0 +1,70 @@
+/**
+ * What convertDocs asks of its worker: a copy of the file, the memory the
+ * module may take, the time it has, and the worker's end with the call or the
+ * session.
+ */
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const host = { call: vi.fn(), destroy: vi.fn() };
+vi.mock("../core/worker-host.js", () => ({ createWorkerHost: () => host }));
+
+import { convertDocs, DOC_LIMITS } from "./docs.js";
+
+afterEach(() => {
+  host.call.mockReset();
+  host.destroy.mockReset();
+  vi.unstubAllGlobals();
+});
+
+const answer = { docx: new ArrayBuffer(1), paragraphs: 1, warnings: "" };
+
+describe("convertDocs", () => {
+  it("sends a copy, so that the caller keeps its bytes", async () => {
+    host.call.mockResolvedValue(answer);
+    const bytes = new Uint8Array([1, 2, 3]);
+    await convertDocs(bytes, "doc");
+    const [request, transfer] = host.call.mock.calls[0] as [{ bytes: ArrayBuffer; format: string }, ArrayBuffer[]];
+    expect(request.format).toBe("doc");
+    expect(request.bytes).not.toBe(bytes.buffer);
+    expect([...new Uint8Array(request.bytes)]).toEqual([1, 2, 3]);
+    expect(transfer).toEqual([request.bytes]);
+    expect(bytes.byteLength).toBe(3);
+  });
+
+  it("limits the paragraphs, the memory and the time", async () => {
+    host.call.mockResolvedValue(answer);
+    await convertDocs(new Uint8Array(1), "odt");
+    let [request, , timeout] = host.call.mock.calls[0] as [{ maxParagraphs: number; maxMemory: number }, unknown, number];
+    expect(request.maxParagraphs).toBe(DOC_LIMITS.maxParagraphs);
+    expect(request.maxMemory).toBe(DOC_LIMITS.maxMemory);
+    expect(timeout).toBe(120_000);
+    // More than the module can hold is cut to what it can; less is kept.
+    await convertDocs(new Uint8Array(1), "odt", { maxMemory: 2 ** 40, timeoutMs: 5 });
+    [request, , timeout] = host.call.mock.calls[1] as [{ maxParagraphs: number; maxMemory: number }, unknown, number];
+    expect(request.maxMemory).toBe(1.5 * 2 ** 30);
+    expect(timeout).toBe(5);
+    await convertDocs(new Uint8Array(1), "odt", { maxMemory: 1 << 20 });
+    expect((host.call.mock.calls[2] as [{ maxMemory: number }])[0].maxMemory).toBe(1 << 20);
+  });
+
+  it("ends its worker with the call, whether it answered or not", async () => {
+    host.call.mockResolvedValue(answer);
+    await convertDocs(new Uint8Array(1), "rtf");
+    expect(host.destroy).toHaveBeenCalledTimes(1);
+    host.call.mockRejectedValue(new Error("malformed"));
+    await expect(convertDocs(new Uint8Array(1), "rtf")).rejects.toThrow("malformed");
+    expect(host.destroy).toHaveBeenCalledTimes(2);
+  });
+
+  it("ends its worker at once when the session aborts", async () => {
+    let finish: (v: typeof answer) => void = () => {};
+    host.call.mockReturnValue(new Promise((resolve) => (finish = resolve)));
+    const abort = new AbortController();
+    const done = convertDocs(new Uint8Array(1), "doc", { signal: abort.signal });
+    expect(host.destroy).not.toHaveBeenCalled();
+    abort.abort();
+    expect(host.destroy).toHaveBeenCalledTimes(1);
+    finish(answer);
+    await done;
+  });
+});
diff --git a/crates/exav-viewer/ts/office/docs.test.ts b/crates/exav-viewer/ts/office/docs.test.ts
new file mode 100644
index 00000000..9d1825e3
--- /dev/null
+++ b/crates/exav-viewer/ts/office/docs.test.ts
@@ -0,0 +1,254 @@
+/**
+ * Text documents go to exav-render's `docs` by their bytes when the options
+ * say `converter: "exav"`, or when no external converter is set; to the
+ * external converter when one is, and what `docs` does not recognise.
+ */
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import type { RenderContext } from "../core/types.js";
+import { DocConversionError, sniffDocs } from "./docs.js";
+import type { ConversionOptions } from "./index.js";
+
+const bytes = (...parts: (string | number[])[]) =>
+  new Uint8Array(parts.flatMap((p) => (typeof p === "string" ? [...p].map((c) => c.charCodeAt(0)) : p)));
+
+const utf16 = (s: string) => [...s].flatMap((c) => [c.charCodeAt(0), 0]);
+
+/** A ZIP's first local header (30 bytes), then `rest`. */
+const zip = (rest: string) => bytes([0x50, 0x4b, 0x03, 0x04, ...new Array(26).fill(0)], rest);
+
+const CFB = [0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1];
+
+/** A compound file directory entry: the name padded to 64 bytes, its length with the terminator, the type. */
+const entry = (name: string, type = 2) => {
+  const units = utf16(name);
+  return [...units, ...new Array(64 - units.length).fill(0), (name.length + 1) * 2, 0, type, 0];
+};
+
+const DOC = bytes(CFB, entry("1Table"), entry("WordDocument"));
+
+describe("what the bytes are", () => {
+  it("reads compound files with a Word document stream as DOC", () => {
+    expect(sniffDocs(DOC)).toBe("doc");
+    expect(sniffDocs(bytes(CFB, entry("wordDOCUMENT")))).toBe("doc");
+    // A workbook is not one, nor is a file that only mentions the name.
+    expect(sniffDocs(bytes(CFB, entry("Workbook")))).toBeNull();
+    expect(sniffDocs(bytes(CFB, utf16("WordDocument")))).toBeNull();
+    expect(sniffDocs(bytes(CFB, entry("WordDocument", 0)))).toBeNull();
+  });
+
+  it("reads RTF whatever the name, after white space or a byte order mark", () => {
+    expect(sniffDocs(bytes("{\\rtf1\\ansi "))).toBe("rtf");
+    expect(sniffDocs(bytes("\r\n  {\\rtf1"))).toBe("rtf");
+    expect(sniffDocs(bytes([0xef, 0xbb, 0xbf], "{\\rtf1"))).toBe("rtf");
+    expect(sniffDocs(bytes("{\\rt"))).toBeNull();
+  });
+
+  it("tells the packages apart by their members", () => {
+    expect(sniffDocs(zip("mimetypeapplication/vnd.oasis.opendocument.text"))).toBe("odt");
+    expect(sniffDocs(zip("mimetypeapplication/vnd.oasis.opendocument.text-template"))).toBe("odt");
+    expect(sniffDocs(zip("mimetypeapplication/vnd.oasis.opendocument.presentation"))).toBeNull();
+    expect(sniffDocs(zip("[Content_Types].xml ... word/document.xml"))).toBe("docx");
+    expect(sniffDocs(zip("[Content_Types].xml ... ppt/presentation.xml"))).toBeNull();
+    expect(sniffDocs(zip("Index/Document.iwa Index/DocumentStylesheet.iwa"))).toBe("pages");
+    expect(sniffDocs(zip("Index/Document.iwa Index/Tables/Tile.iwa"))).toBeNull();
+    expect(sniffDocs(zip("Index/Document.iwa Index/Slide-1.iwa"))).toBeNull();
+    // An OpenDocument package whose mimetype is not first: told by its members, unless they are a deck's or a workbook's.
+    expect(sniffDocs(zip("content.xml styles.xml META-INF/manifest.xml"))).toBe("odt");
+    expect(sniffDocs(zip("content.xml styles.xml ppt/slides/slide1.xml"))).toBeNull();
+    expect(sniffDocs(zip("content.xml styles.xml xl/workbook.xml"))).toBeNull();
+  });
+
+  it("reads flat OpenDocument text and Word 2003 XML, and nothing else as text", () => {
+    expect(sniffDocs(bytes('<?xml version="1.0"?>\n<office:document office:mimetype="application/vnd.oasis.opendocument.text">'))).toBe("fodt");
+    expect(sniffDocs(bytes('<office:document office:mimetype="application/vnd.oasis.opendocument.spreadsheet">'))).toBeNull();
+    expect(sniffDocs(bytes('<?xml version="1.0"?><w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml">'))).toBe("wml2003");
+    expect(sniffDocs(bytes("<html><body>"))).toBeNull();
+    expect(sniffDocs(new Uint8Array())).toBeNull();
+  });
+
+  it("reads Word's Web Page, alone or in its MIME message, and no other HTML", () => {
+    const word = '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word"><body>';
+    expect(sniffDocs(bytes(word))).toBe("html");
+    expect(sniffDocs(bytes(`<!DOCTYPE html>\n${word}`))).toBe("html");
+    expect(sniffDocs(bytes(`MIME-Version: 1.0\r\nContent-Type: multipart/related; boundary="b"\r\n\r\n--b\r\nContent-Type: text/html\r\n\r\n${word}`))).toBe("html");
+    // An Excel page, a plain page and a mail with no Word in it.
+    expect(sniffDocs(bytes('<html xmlns:x="urn:schemas-microsoft-com:office:excel"><body>'))).toBeNull();
+    expect(sniffDocs(bytes("MIME-Version: 1.0\r\nContent-Type: text/plain\r\n\r\nhello"))).toBeNull();
+  });
+});
+
+const convertDocs = vi.fn();
+vi.mock("./docs.js", async (original) => ({ ...(await original<typeof import("./docs.js")>()), convertDocs: (...a: unknown[]) => convertDocs(...a) }));
+
+// The external converter, a function the tests answer for.
+const convertExternal = vi.fn();
+vi.mock("./external.js", async (original) => ({
+  ...(await original<typeof import("./external.js")>()),
+  externalUrl: async (spec: string) => `https://converter.test/${spec}`,
+  loadExternal: async () => ({ convert: (...a: unknown[]) => convertExternal(...a), prefetch: () => ["pkg/data.br"] }),
+}));
+
+afterEach(() => {
+  convertDocs.mockReset();
+  convertExternal.mockReset();
+});
+
+/** A context over `data`, with an external converter set or not. */
+function context(data: Uint8Array, options: ConversionOptions, external: boolean) {
+  const nested = vi.fn(() => ({ resize() {}, destroy() {} }));
+  const statuses: unknown[] = [];
+  const ctx = {
+    file: { id: "f", name: "a.doc" },
+    options: { ...options, ...(external && { externalConverter: "ext" }) },
+    source: { bytes: async () => data },
+    signal: new AbortController().signal,
+    assetBase: "/assets/",
+    status: (s: unknown) => statuses.push(s),
+    controllers() {},
+    mountNested: nested,
+  } as unknown as RenderContext<ConversionOptions>;
+  return { ctx, nested, statuses };
+}
+
+const EXAV: ConversionOptions = { converter: "exav" };
+
+/** The error `mount` fails with. */
+const failure = async (kind: "doc" | "odt" | "rtf", ctx: RenderContext<ConversionOptions>) => {
+  const { rendererFor } = await import("./convert.js");
+  return Promise.resolve(rendererFor(kind).mount(document.createElement("div"), ctx)).then(
+    () => null,
+    (e: unknown) => e,
+  );
+};
+
+describe("a text document opened with converter: exav", () => {
+  it("is converted by exav-render's docs and shown as DOCX", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertDocs.mockResolvedValue({ docx: new Uint8Array([1, 2, 3]).buffer, paragraphs: 1, warnings: "" });
+    const { ctx, nested, statuses } = context(DOC, EXAV, false);
+    await rendererFor("doc").mount(document.createElement("div"), ctx);
+    expect(convertDocs).toHaveBeenCalledWith(DOC, "doc", expect.objectContaining({ signal: ctx.signal }));
+    const [, file] = nested.mock.calls[0] as unknown as [unknown, { format: string; source: { bytes: Uint8Array } }];
+    expect(file.format).toBe("docx");
+    expect([...file.source.bytes]).toEqual([1, 2, 3]);
+    expect(statuses).toContainEqual({ phase: "converting", step: "convert" });
+  });
+
+  it("fails with its converter's error and its kind when it recognised the file and could not read it", async () => {
+    for (const [reason, kind] of [
+      ["encrypted", "encrypted"],
+      ["too-large", "too-large"],
+      ["malformed", "malformed"],
+      ["unsupported", "unsupported"],
+      ["not-format", "not-format"],
+      ["no answer within 120000 ms", "timeout"],
+      ["unreachable", "crashed"],
+    ]) {
+      convertDocs.mockRejectedValue(new Error(reason));
+      // With an external converter set, as without: it never gets the file.
+      for (const external of [true, false]) {
+        const { ctx, nested } = context(DOC, EXAV, external);
+        const error = await failure("doc", ctx);
+        expect(error, reason).toBeInstanceOf(DocConversionError);
+        expect((error as DocConversionError).kind).toBe(kind);
+        expect(nested).not.toHaveBeenCalled();
+        expect(convertExternal).not.toHaveBeenCalled();
+      }
+    }
+  });
+
+  it("converts RTF under any name, and an ODT", async () => {
+    convertDocs.mockRejectedValue(new Error("unsupported"));
+    for (const [kind, data, format] of [
+      ["doc", bytes("{\\rtf1 x}"), "rtf"],
+      ["rtf", bytes("{\\rtf1 x}"), "rtf"],
+      ["odt", zip("mimetypeapplication/vnd.oasis.opendocument.text"), "odt"],
+    ] as const) {
+      const { ctx } = context(data, EXAV, true);
+      const error = await failure(kind, ctx);
+      expect(error).toBeInstanceOf(DocConversionError);
+      expect(convertDocs).toHaveBeenLastCalledWith(data, format, expect.anything());
+    }
+  });
+
+  it("fails with the abort, not with a conversion error, when the session was stopped", async () => {
+    convertDocs.mockRejectedValue(new Error("destroyed"));
+    const { ctx } = context(DOC, EXAV, false);
+    const abort = new AbortController();
+    abort.abort();
+    const error = await failure("doc", { ...ctx, signal: abort.signal } as RenderContext<ConversionOptions>);
+    expect(error).not.toBeInstanceOf(DocConversionError);
+    expect(String(error)).toMatch(/destroyed/);
+  });
+
+  it("goes to the external converter with what it does not recognise", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "pdf", bytes: new Uint8Array([5]) });
+    const { ctx, nested } = context(zip("something.bin"), EXAV, true);
+    await rendererFor("odt").mount(document.createElement("div"), ctx);
+    expect(convertDocs).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ hint: "odt" }));
+    expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("pdf");
+  });
+
+  it("ends in the needs-converter error with what it does not recognise and no external converter", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const { ctx, statuses } = context(zip("something.bin"), EXAV, false);
+    await rendererFor("odt").mount(document.createElement("div"), ctx);
+    const last = statuses.at(-1) as { error: { code: string; cause: { kind: string; format: string } } };
+    expect(last.error.code).toBe("needs_converter");
+    expect(last.error.cause).toMatchObject({ kind: "needs-converter", format: "odt" });
+  });
+
+  it("is shown as it is when it is a DOCX under another name", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const { ctx, nested } = context(zip("[Content_Types].xml word/document.xml"), EXAV, false);
+    await rendererFor("doc").mount(document.createElement("div"), ctx);
+    expect(convertDocs).not.toHaveBeenCalled();
+    expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("docx");
+  });
+});
+
+describe("prefetching a text document", () => {
+  it("names nothing for the kinds `docs` converts, whose module is the viewer's, but the external converter's files where it takes them", async () => {
+    const { prefetchUrls } = await import("./convert.js");
+    for (const kind of ["doc", "odt", "rtf"] as const) {
+      expect(await prefetchUrls(kind, "/assets/", EXAV)).toEqual([]);
+      expect(await prefetchUrls(kind, "/assets/", {})).toEqual([]);
+      // With an external converter set the kind goes to it by default: its module, and what it names.
+      expect(await prefetchUrls(kind, "/assets/", { externalConverter: "ext" })).toEqual(["https://converter.test/ext", "https://converter.test/pkg/data.br"]);
+      expect(await prefetchUrls(kind, "/assets/", { converter: "external", externalConverter: "ext" })).toHaveLength(2);
+      expect(await prefetchUrls(kind, "/assets/", { converter: "exav", externalConverter: "ext" })).toEqual([]);
+    }
+  });
+});
+
+describe("a text document opened by default", () => {
+  it("goes to the external converter when there is one, not to exav-render's docs", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "pdf", bytes: new Uint8Array([5]) });
+    const { ctx } = context(DOC, {}, true);
+    await rendererFor("doc").mount(document.createElement("div"), ctx);
+    expect(convertDocs).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalledWith(DOC, expect.objectContaining({ hint: "doc" }));
+  });
+
+  it("goes to exav-render's docs when there is no external converter", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertDocs.mockResolvedValue({ docx: new Uint8Array([1]).buffer, paragraphs: 1, warnings: "" });
+    const { ctx } = context(DOC, {}, false);
+    await rendererFor("doc").mount(document.createElement("div"), ctx);
+    expect(convertDocs).toHaveBeenCalled();
+    expect(convertExternal).not.toHaveBeenCalled();
+  });
+
+  it("goes to the external converter when the options say so", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "pdf", bytes: new Uint8Array([5]) });
+    const { ctx } = context(DOC, { converter: "external" }, true);
+    await rendererFor("doc").mount(document.createElement("div"), ctx);
+    expect(convertDocs).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalled();
+  });
+});
diff --git a/crates/exav-viewer/ts/office/docs.ts b/crates/exav-viewer/ts/office/docs.ts
new file mode 100644
index 00000000..9f7f7fce
--- /dev/null
+++ b/crates/exav-viewer/ts/office/docs.ts
@@ -0,0 +1,141 @@
+/**
+ * DOC, ODT, FODT, RTF, Word 2003 XML and Pages converted to DOCX by
+ * exav-render's `docs` (exav_viewer_docs.wasm), in a worker of its own for this
+ * one file, terminated when it is done: a wasm instance's memory never
+ * shrinks.
+ */
+import { createWorkerHost, type WorkerHost } from "../core/worker-host.js";
+
+/** What the converter reads. */
+export type DocFormat = "doc" | "odt" | "fodt" | "rtf" | "wml2003" | "pages" | "html";
+
+export interface DocRequest {
+  bytes: ArrayBuffer;
+  format: DocFormat;
+  maxParagraphs: number;
+  maxMemory: number;
+}
+
+export interface DocResult {
+  docx: ArrayBuffer;
+  paragraphs: number;
+  warnings: string;
+}
+
+/** Why a conversion failed: the converter's error kinds, a timeout, or a crash of its module. */
+export type DocErrorKind = "not-format" | "encrypted" | "unsupported" | "too-large" | "malformed" | "timeout" | "crashed";
+
+const KINDS: readonly string[] = ["not-format", "encrypted", "unsupported", "too-large", "malformed"];
+
+/** A document exav-render's `docs` recognised and could not convert. */
+export class DocConversionError extends Error {
+  readonly kind: DocErrorKind;
+  constructor(
+    readonly format: DocFormat,
+    cause: unknown,
+  ) {
+    const reason = cause instanceof Error ? cause.message : String(cause);
+    const kind: DocErrorKind = KINDS.includes(reason) ? (reason as DocErrorKind) : /^no answer within/.test(reason) ? "timeout" : "crashed";
+    super(`the ${format} file could not be converted: ${kind}`, { cause });
+    this.name = "DocConversionError";
+    this.kind = kind;
+  }
+}
+
+/** Paragraphs and memory a conversion may take: the converter's defaults. */
+export const DOC_LIMITS = { maxParagraphs: 5_000_000, maxMemory: 1 << 30 };
+
+/** The module may grow to 2 GiB; the converter's own count leaves room for the file and the output. */
+const MAX_MEMORY = 1.5 * 2 ** 30;
+
+const ascii = (bytes: Uint8Array, at: number, text: string) => {
+  if (at + text.length > bytes.length) return false;
+  for (let i = 0; i < text.length; i++) if (bytes[at + i] !== text.charCodeAt(i)) return false;
+  return true;
+};
+
+const contains = (bytes: Uint8Array, from: number, to: number, text: string) => {
+  const first = text.charCodeAt(0);
+  for (let i = Math.max(0, from); i <= Math.min(bytes.length, to) - text.length; i++) {
+    if (bytes[i] === first && ascii(bytes, i, text)) return true;
+  }
+  return false;
+};
+
+/**
+ * Whether a compound file has a directory entry (stream or storage) called
+ * `name`: its UTF-16LE name, padded to 64 bytes, then the name's length in
+ * bytes with the terminator, then the entry's type (1 storage, 2 stream, 5
+ * root).
+ */
+const hasEntry = (bytes: Uint8Array, name: string) => {
+  const fold = (c: number) => (c >= 0x61 && c <= 0x7a ? c - 32 : c);
+  for (let i = 0; i + 67 <= bytes.length; i += 2) {
+    if (bytes[i + 1] !== 0 || fold(bytes[i]!) !== fold(name.charCodeAt(0))) continue;
+    let k = 1;
+    while (k < name.length && fold(bytes[i + 2 * k]!) === fold(name.charCodeAt(k)) && bytes[i + 2 * k + 1] === 0) k++;
+    if (k !== name.length) continue;
+    const size = (name.length + 1) * 2;
+    if (bytes[i + 64] === size && bytes[i + 65] === 0 && [1, 2, 5].includes(bytes[i + 66]!)) return true;
+  }
+  return false;
+};
+
+/**
+ * What the bytes are: a document the converter reads, a DOCX shown as it is,
+ * or `null` for anything else (the external converter gets those).
+ */
+export function sniffDocs(bytes: Uint8Array): DocFormat | "docx" | null {
+  // A compound file with a Word document stream (Word 6 to 2003).
+  if (bytes[0] === 0xd0 && bytes[1] === 0xcf && bytes[2] === 0x11 && bytes[3] === 0xe0) {
+    return hasEntry(bytes, "WordDocument") ? "doc" : null;
+  }
+  // RTF, after any white space or a byte order mark.
+  let at = 0;
+  if (bytes[0] === 0xef && bytes[1] === 0xbb && bytes[2] === 0xbf) at = 3;
+  while (at < 16 && (bytes[at] === 0x20 || bytes[at] === 0x0a || bytes[at] === 0x0d || bytes[at] === 0x09)) at++;
+  if (ascii(bytes, at, "{\\rtf")) return "rtf";
+  if (bytes[0] === 0x50 && bytes[1] === 0x4b) {
+    // OpenDocument: the stored "mimetype" member first.
+    if (ascii(bytes, 30, "mimetype")) return contains(bytes, 38, 120, "opendocument.text") ? "odt" : null;
+    const from = bytes.length - (1 << 20);
+    const has = (t: string) => contains(bytes, from, bytes.length, t);
+    if (has("[Content_Types].xml") && has("word/")) return "docx";
+    if (has("Index/Document.iwa") || has("Index.zip")) return has("Index/Tables/") || has("Slide") ? null : "pages";
+    // A mimetype member that is not first or not stored: told by the members.
+    if (has("content.xml") && has("styles.xml") && !has("ppt/") && !has("xl/")) return "odt";
+    return null;
+  }
+  // Word's "Save as Web Page": an HTML page that declares Word's namespace,
+  // alone or in the MIME message of "Single File Web Page". Before the XML
+  // kinds, which look for the same namespace.
+  const mime = ascii(bytes, at, "MIME-Version:") || ascii(bytes, at, "MIME-version:") || ascii(bytes, at, "Mime-Version:");
+  const html = contains(bytes, 0, 4096, "<html") || contains(bytes, 0, 4096, "<HTML") || contains(bytes, 0, 4096, "<!DOCTYPE html") || contains(bytes, 0, 4096, "<!doctype html");
+  if ((html || mime) && contains(bytes, 0, mime ? 16384 : 4096, "schemas-microsoft-com:office:word")) return "html";
+  // XML: flat ODF text, or Word 2003 XML.
+  if (contains(bytes, 0, 2048, "office:document") && contains(bytes, 0, 4096, "opendocument.text")) return "fodt";
+  if (contains(bytes, 0, 4096, "w:wordDocument") || contains(bytes, 0, 4096, "schemas-microsoft-com:office:word")) return "wml2003";
+  return null;
+}
+
+/** Converts in a worker; `signal` (the session's) stops it at once. */
+export async function convertDocs(
+  bytes: Uint8Array,
+  format: DocFormat,
+  options: { signal?: AbortSignal; timeoutMs?: number; maxMemory?: number } = {},
+): Promise<DocResult> {
+  const host: WorkerHost<DocRequest, DocResult> = createWorkerHost(
+    () => new Worker(new URL("./docs.worker.js", import.meta.url), { type: "module" }),
+  );
+  const stop = () => host.destroy();
+  options.signal?.addEventListener("abort", stop, { once: true });
+  try {
+    // A copy: the caller keeps its bytes, for the external converter should this fail.
+    const copy = bytes.slice().buffer as ArrayBuffer;
+    const maxMemory = Math.min(options.maxMemory ?? DOC_LIMITS.maxMemory, MAX_MEMORY);
+    return await host.call({ bytes: copy, format, maxParagraphs: DOC_LIMITS.maxParagraphs, maxMemory }, [copy], options.timeoutMs ?? 120_000);
+  } finally {
+    options.signal?.removeEventListener("abort", stop);
+    host.destroy();
+  }
+}
diff --git a/crates/exav-viewer/ts/office/docs.worker.ts b/crates/exav-viewer/ts/office/docs.worker.ts
new file mode 100644
index 00000000..ecc7e259
--- /dev/null
+++ b/crates/exav-viewer/ts/office/docs.worker.ts
@@ -0,0 +1,22 @@
+// exav-render's docs module (exav_viewer_docs.wasm): the page gets back the DOCX.
+import init, { convertDocs } from "../../wasm/exav_viewer_docs.js";
+
+import { serve } from "../core/worker-host.js";
+import type { DocRequest, DocResult } from "./docs.js";
+
+let ready: Promise<unknown> | null = null;
+
+serve<DocRequest, DocResult>(async ({ bytes, format, maxParagraphs, maxMemory }) => {
+  ready ??= init();
+  await ready;
+  const converted = convertDocs(new Uint8Array(bytes), format, maxParagraphs, maxMemory);
+  try {
+    const docx = converted.takeDocx();
+    return {
+      value: { docx: docx.buffer as ArrayBuffer, paragraphs: converted.paragraphs, warnings: converted.warnings },
+      transfer: [docx.buffer as ArrayBuffer],
+    };
+  } finally {
+    converted.free();
+  }
+});
diff --git a/crates/exav-viewer/ts/office/export.test.ts b/crates/exav-viewer/ts/office/export.test.ts
new file mode 100644
index 00000000..1597a17e
--- /dev/null
+++ b/crates/exav-viewer/ts/office/export.test.ts
@@ -0,0 +1,273 @@
+/** The second document the pictures are drawn from, over fake engines. */
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { RasterError } from "../core/pictures.js";
+import { FakeBitmap, FakeCanvas, stubCanvas } from "../test/fake-canvas.js";
+import { docxExporter, pptxExporter, sheetExporter } from "./export.js";
+
+/** What the fake engines saw. */
+const seen = {
+  loads: [] as { source: unknown; options: unknown }[],
+  destroyed: [] as string[],
+  draws: [] as { engine: string; args: unknown[] }[],
+  inFlight: 0,
+  mostInFlight: 0,
+  bitmaps: [] as FakeBitmap[],
+  /** Holds the next drawing until released. */
+  hold: null as null | Promise<void>,
+  /** Holds the document's opening until released. */
+  holdLoad: null as null | Promise<void>,
+  failure: null as null | Error,
+  layout: [] as string[],
+};
+
+async function drawn(engine: string, args: unknown[], width: number, height: number) {
+  seen.draws.push({ engine, args });
+  seen.inFlight++;
+  seen.mostInFlight = Math.max(seen.mostInFlight, seen.inFlight);
+  try {
+    if (seen.hold) await seen.hold;
+    if (seen.failure) throw seen.failure;
+    const b = new FakeBitmap(width, height);
+    seen.bitmaps.push(b);
+    return b as unknown as ImageBitmap;
+  } finally {
+    seen.inFlight--;
+  }
+}
+
+vi.mock("@silurus/ooxml/docx", () => ({
+  DocxDocument: {
+    async load(source: unknown, options: unknown) {
+      seen.loads.push({ source, options });
+      if (seen.holdLoad) await seen.holdLoad;
+      return {
+        waitUntilLayoutComplete: async () => void seen.layout.push("docx layout"),
+        pageSize: () => ({ widthPt: 200, heightPt: 100 }),
+        renderPageToBitmap: (index: number, o: { width: number }) => drawn("docx", [index, o], o.width, Math.round(o.width / 2)),
+        destroy: () => seen.destroyed.push("docx"),
+      };
+    },
+  },
+}));
+
+vi.mock("@silurus/ooxml/pptx", () => ({
+  PptxPresentation: {
+    async load(source: unknown, options: unknown) {
+      seen.loads.push({ source, options });
+      return {
+        slideWidth: 9144000,
+        slideHeight: 6858000,
+        waitUntilLayoutComplete: async () => void seen.layout.push("pptx layout"),
+        renderSlideToBitmap: (index: number, o: { width: number }) => drawn("pptx", [index, o], o.width, Math.round((o.width * 3) / 4)),
+        destroy: () => seen.destroyed.push("pptx"),
+      };
+    },
+  },
+}));
+
+/** Columns 100, 60 and 100 wide and rows 20 high, the headers 50 by 22, as the viewer over a workbook reports them. */
+const sheetMeter = () => {
+  const visited: number[] = [];
+  const widths = [100, 60, 100];
+  const meter = {
+    goToSheet: async (i: number) => void visited.push(i),
+    getScale: () => 1,
+    getViewportOffset: () => ({ x: 0, y: 0 }),
+    getCellViewportRect: (name: string) => {
+      const m = /^([A-Z]+)(\d+)$/.exec(name)!;
+      const col = m[1]!.split("").reduce((n, c) => n * 26 + c.charCodeAt(0) - 64, 0);
+      const row = Number(m[2]);
+      const w = widths[col - 1] ?? 70;
+      return { x: 50 + widths.slice(0, col - 1).reduce((a, b) => a + b, 0), y: 22 + (row - 1) * 20, width: w, height: 20 };
+    },
+    destroy: () => seen.destroyed.push("meter"),
+  };
+  return { meter, visited };
+};
+let meters: ReturnType<typeof sheetMeter>;
+
+vi.mock("@silurus/ooxml/xlsx", () => ({
+  XlsxWorkbook: {
+    async load(source: unknown, options: unknown) {
+      seen.loads.push({ source, options });
+      return {
+        getWorksheet: async (i: number) => ({
+          rows: [{ index: 2 + i, cells: [{ col: 3, value: { type: "text" } }] }],
+          mergeCells: [],
+          images: [],
+          charts: [],
+        }),
+        renderViewportToBitmap: (index: number, viewport: unknown, o: { width: number; height: number }) => drawn("xlsx", [index, viewport, o], o.width, o.height),
+        destroy: () => seen.destroyed.push("xlsx"),
+      };
+    },
+  },
+  XlsxSheetViewer: { fromWorkbook: () => meters.meter },
+}));
+
+const bytes = () => async () => new ArrayBuffer(8);
+const never = () => null;
+const code = async (p: Promise<unknown>) => p.then(() => "none", (e) => (e instanceof RasterError ? e.code : `other: ${String(e)}`));
+
+beforeEach(() => {
+  stubCanvas();
+  Object.assign(seen, { loads: [], destroyed: [], draws: [], inFlight: 0, mostInFlight: 0, bitmaps: [], hold: null, holdLoad: null, failure: null, layout: [] });
+  meters = sheetMeter();
+});
+afterEach(() => vi.unstubAllGlobals());
+
+describe("pictures of a Word document", () => {
+  it("opens a second copy on the first picture only, with the viewer's options, and keeps it", async () => {
+    const options = { useGoogleFonts: false, resourceLimits: { maxArchiveEntries: 5 }, mode: "worker" };
+    const e = docxExporter(bytes(), options);
+    expect(seen.loads).toHaveLength(0);
+    await e.raster(1, { width: 200 }, never);
+    await e.raster(2, { width: 100 }, never);
+    expect(seen.loads).toHaveLength(1);
+    expect(seen.loads[0]!.options).toBe(options);
+    expect(seen.layout).toEqual(["docx layout"]);
+    // Each page at the width, one device pixel to a CSS one, page numbers from 0 for the engine.
+    expect(seen.draws.map((d) => d.args)).toEqual([
+      [0, { width: 200, dpr: 1 }],
+      [1, { width: 100, dpr: 1 }],
+    ]);
+  });
+
+  it("destroys the copy with the session, and never opens one that nobody asked for", async () => {
+    const unused = docxExporter(bytes(), {});
+    await unused.dispose();
+    expect(seen.loads).toHaveLength(0);
+    const e = docxExporter(bytes(), {});
+    await e.raster(1, { width: 50 }, never);
+    await e.dispose();
+    expect(seen.destroyed).toEqual(["docx"]);
+    expect(await code(e.raster(1, { width: 50 }, never))).toBe("failed");
+  });
+
+  it("draws one picture at a time", async () => {
+    const e = docxExporter(bytes(), {});
+    await Promise.all([1, 2, 1].map((p) => e.raster(p, { width: 100 }, never)));
+    expect(seen.draws).toHaveLength(3);
+    expect(seen.mostInFlight).toBe(1);
+  });
+
+  it("stops waiting for a drawing at once when aborted, closes its late bitmap, and the next one still draws", async () => {
+    let release!: () => void;
+    seen.hold = new Promise((r) => (release = r));
+    const e = docxExporter(bytes(), {});
+    const abort = new AbortController();
+    const first = e.raster(1, { width: 100, signal: abort.signal }, never);
+    await vi.waitFor(() => expect(seen.draws).toHaveLength(1));
+    const second = e.raster(1, { width: 60 }, never);
+    abort.abort();
+    expect(await code(first)).toBe("aborted");
+    // The second waits for the abandoned drawing, which cannot be stopped.
+    expect(seen.draws).toHaveLength(1);
+    seen.hold = null;
+    release();
+    const r = await second;
+    expect(r.width).toBe(60);
+    // The abandoned picture, drawn after nobody waited for it, is closed; the second's is the caller's.
+    expect(FakeCanvas.made[0]!.bitmaps[0]!.closed).toBe(true);
+    expect(FakeCanvas.made[1]!.bitmaps[0]!.closed).toBe(false);
+  });
+
+  it("never draws for a signal aborted while the document was opening", async () => {
+    let open!: () => void;
+    seen.holdLoad = new Promise((r) => (open = r));
+    const e = docxExporter(bytes(), {});
+    const abort = new AbortController();
+    const p = e.raster(1, { width: 100, signal: abort.signal }, never);
+    await vi.waitFor(() => expect(seen.loads).toHaveLength(1));
+    abort.abort();
+    expect(await code(p)).toBe("aborted");
+    seen.holdLoad = null;
+    open();
+    // The document is kept for the next picture, which is drawn.
+    expect((await e.raster(1, { width: 40 }, never)).width).toBe(40);
+    expect(seen.loads).toHaveLength(1);
+    expect(seen.draws).toHaveLength(1);
+  });
+
+  it("says too-large for the engine's resource limits, and failed for its other errors", async () => {
+    const e = docxExporter(bytes(), {});
+    seen.failure = Object.assign(new Error("image pixels over the limit"), { name: "OoxmlDecodedImageLimitError" });
+    const limit = await e.raster(1, { width: 100 }, never).catch((x: RasterError) => x);
+    expect([(limit as RasterError).code, (limit as RasterError).message]).toEqual(["too-large", "image pixels over the limit"]);
+    seen.failure = new Error("broken");
+    expect(await code(e.raster(1, { width: 100 }, never))).toBe("other: Error: broken");
+  });
+
+  it("hands the viewport to region current, for the page asked", async () => {
+    const e = docxExporter(bytes(), {});
+    const current = vi.fn((page: number) => (page === 1 ? { x: 0, y: 0.5, width: 1, height: 0.5 } : null));
+    const r = await e.raster(1, { width: 100, region: "current" }, current);
+    expect(r.region).toEqual({ x: 0, y: 0.5, width: 1, height: 0.5 });
+    expect(current).toHaveBeenCalledWith(1, null);
+    expect(await code(e.raster(2, { width: 100, region: "current" }, current))).toBe("invalid");
+    // Not asked for unless wanted.
+    current.mockClear();
+    await e.raster(1, { width: 100 }, current);
+    expect(current).not.toHaveBeenCalled();
+  });
+});
+
+describe("pictures of a PowerPoint deck", () => {
+  it("draws a slide by its shape, from the second copy", async () => {
+    const e = pptxExporter(bytes(), {});
+    const r = await e.raster(2, { width: 400 }, never);
+    expect([r.width, r.height]).toEqual([400, 300]);
+    expect(seen.draws[0]!.args).toEqual([1, { width: 400, dpr: 1 }]);
+    await e.dispose();
+    expect(seen.destroyed).toEqual(["pptx"]);
+  });
+});
+
+describe("pictures of a sheet", () => {
+  it("is measured by a viewer over the second copy, which the cells are asked of by name", async () => {
+    const e = sheetExporter(bytes(), {});
+    const grid = await e.measure(1, (g) => ({ header: g.header, rows: g.rows, cols: g.cols, edges: [1, 2, 3, 4].map(g.colEdge), rowEdges: [1, 2, 3].map(g.rowEdge) }));
+    // The cell at row 2, column 3 is the last with a value: the page is A1:C2.
+    expect(grid).toEqual({ header: { width: 50, height: 22 }, rows: 2, cols: 3, edges: [0, 100, 160, 260], rowEdges: [0, 20, 40] });
+    expect(meters.visited).toEqual([0]);
+    await e.measure(1, () => 0);
+    expect(meters.visited).toEqual([0]);
+    await e.measure(2, () => 0);
+    expect(meters.visited).toEqual([0, 1]);
+    expect(seen.loads).toHaveLength(1);
+  });
+
+  it("draws the cells of the region at the scale, with the viewer's own offsets", async () => {
+    const e = sheetExporter(bytes(), {});
+    // The page is 260 x 40 at 100 %: the right half of it, 130 px wide, is x 130..260, at 2x.
+    const r = await e.raster(1, { width: 260, region: { x: 0.5, y: 0, width: 0.5, height: 1 } }, never);
+    expect([r.width, r.height]).toEqual([260, 80]);
+    const [index, viewport, size] = seen.draws[0]!.args as [number, Record<string, number>, Record<string, number>];
+    expect(index).toBe(0);
+    expect(viewport).toEqual({ row: 1, col: 2, rows: 2, cols: 2 });
+    expect(size).toMatchObject({ width: 100 + 260, height: 44 + 80, dpr: 1, cellScale: 2, scrollOffsetX: 30, scrollOffsetY: 0 });
+    expect(FakeCanvas.made.length).toBeGreaterThan(0);
+  });
+
+  it("takes region current from the viewer with the grid, only for the sheet shown", async () => {
+    const e = sheetExporter(bytes(), {});
+    const current = vi.fn((page: number, grid: unknown) => (page === 1 && grid ? { x: 0, y: 0, width: 0.5, height: 1 } : null));
+    const r = await e.raster(1, { width: 130, region: "current" }, current);
+    expect(r.region).toEqual({ x: 0, y: 0, width: 0.5, height: 1 });
+    expect(await code(e.raster(2, { width: 130, region: "current" }, current))).toBe("invalid");
+  });
+
+  it("destroys the viewer and the workbook with the session", async () => {
+    const e = sheetExporter(bytes(), {});
+    await e.measure(1, () => 0);
+    await e.dispose();
+    expect(seen.destroyed.sort()).toEqual(["meter", "xlsx"]);
+  });
+
+  it("refuses a transparent background", async () => {
+    const e = sheetExporter(bytes(), {});
+    expect(await code(e.raster(1, { width: 100, background: "transparent" }, never))).toBe("unsupported");
+    expect(seen.draws).toHaveLength(0);
+  });
+});
diff --git a/crates/exav-viewer/ts/office/export.ts b/crates/exav-viewer/ts/office/export.ts
new file mode 100644
index 00000000..1035125e
--- /dev/null
+++ b/crates/exav-viewer/ts/office/export.ts
@@ -0,0 +1,205 @@
+/**
+ * The engine side of office pictures: a second copy of the document, opened
+ * the first time a picture is asked of it (or its viewport is wanted, for a
+ * sheet), kept for the next and destroyed with the session. The viewers own
+ * their own copy and nothing here touches their canvases; every drawing is on
+ * a canvas made here.
+ *
+ * Sharing the viewer's copy was not chosen: the engines take a borrowed
+ * document only for a viewer built over it (`fromDocument`, `fromPresentation`,
+ * `fromWorkbook`, the last of which draws nothing until a sheet is gone to),
+ * which would change how every office file is opened, and a delimited text
+ * has no document of its own to borrow. The price is that the file is
+ * parsed twice for as long as the session lives once a picture has been asked.
+ */
+import { RasterError, throwIfAborted } from "../core/pictures.js";
+import type { Raster, RasterOptions, RasterRect } from "../core/types.js";
+import {
+  cellName,
+  engineError,
+  lazy,
+  rasterPage,
+  rasterSheet,
+  serial,
+  usedArea,
+  type Grid,
+  type PageEngine,
+  type SheetEngine,
+  type SheetWindow,
+} from "./raster.js";
+
+/**
+ * What the viewport is for `region: "current"`: the region of page `page` in
+ * view, or null when that page is not the one in view. A sheet's needs its
+ * grid to be turned into fractions of the used area.
+ */
+export type Current = (page: number, grid: Grid | null) => RasterRect | null;
+
+/** What a format's pictures are drawn from, and how they are asked for. */
+export interface Exporter {
+  raster(page: number, options: RasterOptions, current: Current): Promise<Raster>;
+  dispose(): Promise<void>;
+}
+
+/** The options the viewers load a document with, given to the second copy too. */
+type Common = Record<string, unknown>;
+
+const close = (r: Raster) => r.bitmap.close();
+
+/** Runs `draw` in the queue, once the document is open. */
+function queued<D>(run: ReturnType<typeof serial>, document: { get(): Promise<D> }, draw: (d: D, page: number, options: RasterOptions, current: Current) => Promise<Raster>) {
+  return (page: number, options: RasterOptions, current: Current) =>
+    run(
+      async () => {
+        try {
+          const d = await document.get();
+          throwIfAborted(options.signal);
+          return await draw(d, page, options, current);
+        } catch (error) {
+          throw engineError(error);
+        }
+      },
+      options.signal,
+      close,
+    );
+}
+
+export function docxExporter(load: () => Promise<ArrayBuffer>, common: Common): Exporter {
+  const document = lazy(
+    async () => {
+      const { DocxDocument } = await import("@silurus/ooxml/docx");
+      const d = await DocxDocument.load(await load(), common);
+      try {
+        await d.waitUntilLayoutComplete();
+      } catch (error) {
+        d.destroy();
+        throw error;
+      }
+      return d;
+    },
+    (d) => d.destroy(),
+  );
+  const run = serial();
+  return {
+    raster: queued(run, document, (d, page, options, current) => {
+      const engine: PageEngine = {
+        size: (p) => {
+          const s = d.pageSize(p - 1);
+          return { width: s.widthPt, height: s.heightPt };
+        },
+        draw: (p, width) => d.renderPageToBitmap(p - 1, { width, dpr: 1 }),
+      };
+      return rasterPage(engine, page, options, options.region === "current" ? current(page, null) : null);
+    }),
+    dispose: () => document.dispose(),
+  };
+}
+
+export function pptxExporter(load: () => Promise<ArrayBuffer>, common: Common): Exporter {
+  const document = lazy(
+    async () => {
+      const { PptxPresentation } = await import("@silurus/ooxml/pptx");
+      const p = await PptxPresentation.load(await load(), common);
+      try {
+        await p.waitUntilLayoutComplete();
+      } catch (error) {
+        p.destroy();
+        throw error;
+      }
+      return p;
+    },
+    (p) => p.destroy(),
+  );
+  const run = serial();
+  return {
+    raster: queued(run, document, (p, page, options, current) => {
+      const engine: PageEngine = {
+        size: () => ({ width: p.slideWidth, height: p.slideHeight }),
+        draw: (s, width) => p.renderSlideToBitmap(s - 1, { width, dpr: 1 }),
+      };
+      return rasterPage(engine, page, options, options.region === "current" ? current(page, null) : null);
+    }),
+    dispose: () => document.dispose(),
+  };
+}
+
+/** A sheet exporter also tells where the viewer's cells are (the viewport of a sheet needs the used area). */
+export interface SheetExporter extends Exporter {
+  /** Runs `fn` with the grid of sheet `page` (1-based), the grid valid only inside it. */
+  measure<T>(page: number, fn: (grid: Grid) => T): Promise<T>;
+}
+
+export function sheetExporter(load: () => Promise<ArrayBuffer>, common: Common): SheetExporter {
+  const open = lazy(
+    async () => {
+      const { XlsxWorkbook, XlsxSheetViewer } = await import("@silurus/ooxml/xlsx");
+      const wb = await XlsxWorkbook.load(await load(), common);
+      // A viewer over the workbook that draws nowhere, to ask where its cells are.
+      const meter = XlsxSheetViewer.fromWorkbook(document.createElement("canvas"), wb, {});
+      return { wb, meter, on: -1 };
+    },
+    (m) => {
+      m.meter.destroy();
+      m.wb.destroy();
+    },
+  );
+  const areas = new Map<number, { rows: number; cols: number }>();
+  const lock = serial();
+  const run = serial();
+
+  const measure = <T>(page: number, fn: (grid: Grid) => T): Promise<T> =>
+    lock(async () => {
+      const m = await open.get();
+      const index = page - 1;
+      let area = areas.get(index);
+      if (!area) {
+        const ws = await m.wb.getWorksheet(index);
+        area = usedArea({ rows: ws.rows, mergeCells: ws.mergeCells, anchors: [...ws.images, ...ws.charts, ...(ws.shapeGroups ?? []), ...(ws.slicers ?? [])] });
+        areas.set(index, area);
+      }
+      if (m.on !== index) {
+        await m.meter.goToSheet(index);
+        m.on = index;
+      }
+      const rect = (col: number, row: number) => {
+        const r = m.meter.getCellViewportRect(cellName(col, row));
+        if (!r) throw new RasterError("failed", "the sheet's cells could not be measured");
+        return r;
+      };
+      const scale = m.meter.getScale();
+      const offset = m.meter.getViewportOffset();
+      const origin = rect(1, 1);
+      const { rows, cols } = area;
+      const edge = (at: (n: number) => { start: number; size: number }, count: number) => (n: number) => {
+        if (n <= count) return at(n).start;
+        const last = at(count);
+        return last.start + last.size;
+      };
+      const grid: Grid = {
+        header: { width: (origin.x + offset.x) / scale, height: (origin.y + offset.y) / scale },
+        rows,
+        cols,
+        colEdge: edge((c) => ({ start: (rect(c, 1).x - origin.x) / scale, size: rect(c, 1).width / scale }), cols),
+        rowEdge: edge((r) => ({ start: (rect(1, r).y - origin.y) / scale, size: rect(1, r).height / scale }), rows),
+      };
+      return fn(grid);
+    });
+
+  const engine: SheetEngine & { measure: typeof measure } = {
+    measure,
+    draw: async (page, window: Pick<SheetWindow, "row" | "col" | "rows" | "cols" | "offsetX" | "offsetY">, size) => {
+      const m = await open.get();
+      return m.wb.renderViewportToBitmap(
+        page - 1,
+        { row: window.row, col: window.col, rows: window.rows, cols: window.cols },
+        { width: size.width, height: size.height, dpr: 1, cellScale: size.scale, scrollOffsetX: window.offsetX, scrollOffsetY: window.offsetY },
+      );
+    },
+  };
+
+  return {
+    measure,
+    raster: queued(run, open, (_m, page, options, current) => rasterSheet(engine, page, options, (grid) => current(page, grid))),
+    dispose: () => open.dispose(),
+  };
+}
diff --git a/crates/exav-viewer/ts/office/external.ts b/crates/exav-viewer/ts/office/external.ts
new file mode 100644
index 00000000..efdf9942
--- /dev/null
+++ b/crates/exav-viewer/ts/office/external.ts
@@ -0,0 +1,136 @@
+/**
+ * The external converter: for the formats no converter of this package reads
+ * (a drawing format, a page layout format, an Office format a native reader
+ * refuses), a module the host installs, loaded where the host says. Any
+ * package can be one.
+ *
+ * The module exports `convert`, and may export `prefetch`:
+ *
+ * ```ts
+ * export function convert(bytes: Uint8Array, options: {
+ *   hint: string;                        // what the viewer took the file for
+ *   maxMemory?: number;                  // bytes the conversion may use
+ *   signal?: AbortSignal;                // abort: reject with the signal's reason
+ *   onProgress?: (p: ConvertProgress) => void;
+ * }): Promise<{ format: "pdf" | "xlsx"; bytes: Uint8Array }>;
+ * export function prefetch?(hint: string): string[] | Promise<string[]>;
+ * ```
+ *
+ * The result is shown by the viewer's own `pdf()` or `xlsx()` plugin.
+ */
+import { baseUrl, loadManifest } from "../core/assets.js";
+import type { Status } from "../core/types.js";
+
+/**
+ * How far a conversion is, in the order of the stages. A converter reports
+ * what it has: the viewer turns each stage into a step of its status, with a
+ * bar where a share is given.
+ */
+export type ConvertProgress =
+  /** The converter's code and data arrive: bytes loaded, of `total` (0 when not known). */
+  | { stage: "download"; loaded: number; total: number }
+  /** The converter starts. */
+  | { stage: "start" }
+  /** The document is read, then the output written: steps `done` of `total`. */
+  | { stage: "load" | "export"; done: number; total: number };
+
+/** What the viewer hands `convert`. */
+export interface ExternalConvertOptions {
+  /**
+   * What the viewer took the file for: "rtf", "doc", "odt", "ppt", "odp",
+   * "keynote", "xls", "ods", "numbers", "odg", "visio", "coreldraw",
+   * "publisher", "pagemaker", "freehand", "quarkxpress", "zonerdraw" or
+   * "wpg". A hint: the bytes decide, and a converter may refuse a file that
+   * is not what it was said to be.
+   */
+  hint: string;
+  /** The most memory the conversion may use, in bytes; absent when the host set none. */
+  maxMemory?: number;
+  /** Aborted when the file is closed or the conversion takes too long: reject. */
+  signal?: AbortSignal;
+  onProgress?: (progress: ConvertProgress) => void;
+}
+
+/** What `convert` resolves to: a PDF, or an XLSX for the spreadsheet engine. */
+export interface ExternalConvertResult {
+  format: "pdf" | "xlsx";
+  bytes: Uint8Array;
+}
+
+/** The module a host installs. */
+export interface ExternalConverter {
+  convert(bytes: Uint8Array, options: ExternalConvertOptions): Promise<ExternalConvertResult>;
+  /** URLs, absolute or relative to the module, that `Viewer.prefetch` fetches for `hint`. */
+  prefetch?(hint: string): string[] | Promise<string[]>;
+}
+
+/** The converter's progress as the viewer's steps. */
+export function statusOf(p: ConvertProgress): Status {
+  const share = (done: number, total: number) => (total > 0 ? { progress: Math.min(1, done / total) } : {});
+  switch (p.stage) {
+    case "download":
+      return { phase: "loading", step: "engine", ...share(p.loaded, p.total) };
+    case "start":
+      return { phase: "converting", step: "start" };
+    case "load":
+      return { phase: "converting", step: "read", ...share(p.done, p.total) };
+    case "export":
+      return { phase: "converting", step: "convert", ...share(p.done, p.total) };
+  }
+}
+
+/**
+ * A file the viewer recognises and no converter of this host reads: there is
+ * no `externalConverter`, or `converter: "external"` was asked for without
+ * one. `format` is the viewer's name for it.
+ */
+export class NeedsConverterError extends Error {
+  readonly kind = "needs-converter";
+  constructor(readonly format: string) {
+    super(`the ${format} file needs an external converter, and none is set`);
+    this.name = "NeedsConverterError";
+  }
+}
+
+/** The external converter failed: "timeout" when it did not answer in time, else "failed" (its error is the cause). */
+export class ExternalConversionError extends Error {
+  constructor(
+    readonly format: string,
+    readonly kind: "timeout" | "failed",
+    cause?: unknown,
+  ) {
+    super(`the ${format} file could not be converted: ${kind}`, { cause });
+    this.name = "ExternalConversionError";
+  }
+}
+
+// A scheme, a rooted path or a relative path: a URL. Anything else is a package name.
+const IS_URL = /^(?:[a-z][a-z0-9+.-]*:|\/|\.\.?\/)/i;
+
+/**
+ * Where the module is: a URL as it stands (relative ones against the page),
+ * or the entry of a package named in the asset manifest (`converters`),
+ * which the copy step of `@exav/viewer/vite` writes.
+ */
+export async function externalUrl(spec: string, assetBase: string): Promise<string> {
+  if (IS_URL.test(spec)) return new URL(spec, document.baseURI).href;
+  const entry = (await loadManifest(assetBase)).converters?.[spec];
+  if (!entry) throw new Error(`${spec} is not in the asset manifest: install it beside @exav/viewer and copy the assets again with its name (externalConverter)`);
+  return new URL(`${baseUrl(assetBase)}${entry}`, document.baseURI).href;
+}
+
+const modules = new Map<string, Promise<ExternalConverter>>();
+
+/** The module at `url`, imported once; a failed import is tried again next time. */
+export function loadExternal(url: string): Promise<ExternalConverter> {
+  let m = modules.get(url);
+  if (!m) {
+    m = (import(/* @vite-ignore */ /* webpackIgnore: true */ url) as Promise<Partial<ExternalConverter>>).then((mod) => {
+      if (typeof mod.convert !== "function") throw new Error(`${url} does not export convert()`);
+      return mod as ExternalConverter;
+    });
+    modules.set(url, m);
+    m.catch(() => modules.delete(url));
+  }
+  return m;
+}
diff --git a/crates/exav-viewer/ts/office/index.ts b/crates/exav-viewer/ts/office/index.ts
index f1d82053..f3a4db76 100644
--- a/crates/exav-viewer/ts/office/index.ts
+++ b/crates/exav-viewer/ts/office/index.ts
@@ -3,9 +3,32 @@
  * (a peer dependency, MIT), whose engines parse Open XML in WebAssembly and
  * paint a canvas. One engine per format, each its own import: opening a
  * spreadsheet does not download the presentation engine.
+ *
+ * And the formats no browser engine reads (RTF, the 1997 Office formats,
+ * OpenDocument, iWork, drawing and page layout formats), converted in the
+ * browser. Spreadsheets (XLS, ODS, Numbers) are converted to XLSX, and
+ * presentations and OpenDocument drawings (PPT, ODP, Keynote, ODG) to PPTX,
+ * by exav-render, which this package ships; text documents (DOC, ODT, RTF) to
+ * DOCX by it where no external converter is set. What no converter of the
+ * package reads goes to an external converter, an ES module the host
+ * installs and names (`externalConverter`, see `ExternalConverter`), which
+ * resolves to a PDF, shown by `pdf()`, or an XLSX, shown by `xlsx()`: the host
+ * registers those too. Without one, such a file ends in the "needs_converter"
+ * error.
+ *
+ * Pictures and viewport (`controllers.pictures`, `controllers.viewport`),
+ * regions in fractions of a page from its top left: a Word page, a slide, or
+ * a sheet, which is its used area at 100 % without the headers the engine
+ * draws around the cells (a CSV has one sheet). Page numbers are the viewer's
+ * (hidden slides and sheets count). Drawn again at the size asked from a
+ * second copy of the document, opened by the first picture or, for a sheet,
+ * the first read of its viewport (`export.ts`), one picture at a time; the paper is opaque, so a transparent background is
+ * refused. A region that needs a Word page or slide drawn past about 16
+ * million pixels is refused as too large: the engines draw whole pages only.
  */
 import { MATCHERS } from "../core/formats.js";
-import type { FormatPlugin } from "../core/types.js";
+import type { Capability, FormatPlugin } from "../core/types.js";
+import { docsFirst, slidesFirst } from "./route.js";
 
 export interface OfficeOptions {
   /** Must stay false under a CSP without fonts.googleapis.com. Default false. */
@@ -16,22 +39,164 @@ export interface OfficeOptions {
    * a worker started from a file, which is what the sandboxed frame can start.
    */
   mode?: "main" | "worker";
+  /**
+   * The most entries the ZIP of a document may list. Default 20000 (the
+   * engines' own is 4096, which a deck of about a thousand slides with
+   * pictures exceeds). The size a document may inflate to keeps its own
+   * limit.
+   */
+  maxArchiveEntries?: number;
+}
+
+/** The entry limit used when `OfficeOptions.maxArchiveEntries` is not given. */
+export const DEFAULT_MAX_ARCHIVE_ENTRIES = 20000;
+
+/** For the converted formats. */
+export interface ConversionOptions {
+  /** A conversion still running after this long is stopped. Default 120000. */
+  timeoutMs?: number;
+  /**
+   * The memory a conversion may take, in bytes, at most 4 GiB; past it, it
+   * fails. exav-render's converters count their own, 1 GiB by default and at
+   * most 1.5 GiB. Handed to the external converter as it is (absent when not
+   * set).
+   */
+  maxMemory?: number;
+  /**
+   * What converts: "exav" is the converters this package ships (exav-render,
+   * in WebAssembly), where there is one for the format; "external" is the
+   * external converter alone, for every format.
+   *
+   * Spreadsheets (XLS, ODS, Numbers), presentations (PPT of any version, ODP,
+   * Keynote of any version) and OpenDocument drawings (ODG, OTG, FODG) go to
+   * the package's converters by default. A file one recognises and cannot
+   * convert fails, its error's cause a `SheetConversionError`,
+   * `SlideConversionError` or `DocConversionError` saying why; a file it does
+   * not recognise (an HTML table saved as .xls, say) goes to the external
+   * converter, or ends in a `NeedsConverterError` ("needs_converter") where
+   * there is none.
+   *
+   * Text documents (DOC, ODT, RTF) go to the external converter when one is
+   * set, and to the package's `docs` converter when not, or when this says
+   * "exav". The other formats (CorelDRAW, Visio, Publisher and the like) go
+   * to the external converter, and end in "needs_converter" without one.
+   */
+  converter?: "exav" | "external";
+  /**
+   * The external converter: the URL of an ES module (absolute, rooted, or
+   * relative to the page), or the name of a package that
+   * `@exav/viewer/vite` copied beside the assets (`externalConverter` of its
+   * options, listed in the asset manifest). Default: none. See
+   * `ExternalConverter` for what the module exports.
+   */
+  externalConverter?: string;
 }
 
 type Kind = "docx" | "xlsx" | "pptx" | "csv";
 
+/** The formats `@exav/viewer/office` converts, by the viewer's name for them (the converter's `hint`). */
+export type ConvertedFormat =
+  | "rtf"
+  | "doc"
+  | "odt"
+  | "ppt"
+  | "odp"
+  | "keynote"
+  | "xls"
+  | "ods"
+  | "numbers"
+  | "odg"
+  | "visio"
+  | "coreldraw"
+  | "publisher"
+  | "pagemaker"
+  | "freehand"
+  | "quarkxpress"
+  | "zonerdraw"
+  | "wpg";
+
+const CAPABILITIES: Record<Kind, readonly Capability[]> = {
+  docx: ["pages", "zoom", "pictures", "viewport"],
+  xlsx: ["zoom", "sheets", "pictures", "viewport"],
+  pptx: ["pages", "pictures", "viewport"],
+  csv: ["zoom", "pictures", "viewport"],
+};
+
+/** What a converted file is shown with: the capabilities of `pdf()` and `xlsx()`. */
+const AS_PDF: readonly Capability[] = ["pages", "zoom", "drag", "outline", "pictures", "viewport"];
+
 const plugin = (kind: Kind, options: OfficeOptions): FormatPlugin<OfficeOptions> => ({
   id: kind,
   match: MATCHERS[kind],
-  capabilities: kind === "docx" || kind === "pptx" ? ["pages"] : [],
+  capabilities: CAPABILITIES[kind],
   options,
   load: () => import("./renderer.js").then((m) => m.rendererFor(kind)),
 });
 
+const converted = (kind: ConvertedFormat, options: ConversionOptions): FormatPlugin<ConversionOptions> => ({
+  id: kind,
+  match: MATCHERS[kind],
+  capabilities:
+    kind === "xls" || kind === "ods" || kind === "numbers"
+      ? CAPABILITIES.xlsx
+      : slidesFirst(kind, options)
+        ? CAPABILITIES.pptx
+        : docsFirst(kind, options)
+          ? CAPABILITIES.docx
+          : AS_PDF,
+  options,
+  load: () => import("./convert.js").then((m) => m.rendererFor(kind)),
+  prefetch: (assetBase) => import("./convert.js").then((m) => m.prefetchUrls(kind, assetBase, options)),
+});
+
 export const docx = (options: OfficeOptions = {}) => plugin("docx", options);
 export const xlsx = (options: OfficeOptions = {}) => plugin("xlsx", options);
 export const pptx = (options: OfficeOptions = {}) => plugin("pptx", options);
 /** The separator and the encoding are read off the bytes (`readingOf`). */
 export const csv = (options: OfficeOptions = {}) => plugin("csv", options);
 
+// Converted, templates and flat XML included. Within each kind (text,
+// presentation, spreadsheet) the bytes decide: Word saves RTF under .doc, and
+// an XLSX renamed .xls is shown as it is.
+export const rtf = (options: ConversionOptions = {}) => converted("rtf", options);
+/** Word 97 and later, 6.0 and 95. */
+export const doc = (options: ConversionOptions = {}) => converted("doc", options);
+export const odt = (options: ConversionOptions = {}) => converted("odt", options);
+export const ppt = (options: ConversionOptions = {}) => converted("ppt", options);
+export const odp = (options: ConversionOptions = {}) => converted("odp", options);
+/** Keynote 1 to 6. */
+export const keynote = (options: ConversionOptions = {}) => converted("keynote", options);
+/** Excel 97 and later, 5.0/95 and 4.0. */
+export const xls = (options: ConversionOptions = {}) => converted("xls", options);
+export const ods = (options: ConversionOptions = {}) => converted("ods", options);
+export const numbers = (options: ConversionOptions = {}) => converted("numbers", options);
+// Drawings (ODG, OTG, FODG by the package, as slides) and page layouts (the external converter, to PDF).
+export const odg = (options: ConversionOptions = {}) => converted("odg", options);
+/** Visio: binary, XML and Open XML. */
+export const visio = (options: ConversionOptions = {}) => converted("visio", options);
+/** CorelDRAW and Corel Presentation Exchange. */
+export const coreldraw = (options: ConversionOptions = {}) => converted("coreldraw", options);
+export const publisher = (options: ConversionOptions = {}) => converted("publisher", options);
+/** PageMaker 6 to 7. */
+export const pagemaker = (options: ConversionOptions = {}) => converted("pagemaker", options);
+/** FreeHand 3 to 11. */
+export const freehand = (options: ConversionOptions = {}) => converted("freehand", options);
+/** QuarkXPress 3.1 to 4.1. */
+export const quarkxpress = (options: ConversionOptions = {}) => converted("quarkxpress", options);
+/** Zoner Draw 4 and 5. */
+export const zonerdraw = (options: ConversionOptions = {}) => converted("zonerdraw", options);
+/** WordPerfect Graphics 1 and 2. */
+export const wpg = (options: ConversionOptions = {}) => converted("wpg", options);
+
 export { readingOf, type Reading } from "./delimited.js";
+export { SheetConversionError, type SheetErrorKind, type SheetFormat } from "./sheets.js";
+export { SlideConversionError, type SlideErrorKind, type SlideFormat } from "./slides.js";
+export { DocConversionError, type DocErrorKind, type DocFormat } from "./docs.js";
+export {
+  ExternalConversionError,
+  NeedsConverterError,
+  type ConvertProgress,
+  type ExternalConvertOptions,
+  type ExternalConvertResult,
+  type ExternalConverter,
+} from "./external.js";
diff --git a/crates/exav-viewer/ts/office/progressive.test.ts b/crates/exav-viewer/ts/office/progressive.test.ts
new file mode 100644
index 00000000..366864db
--- /dev/null
+++ b/crates/exav-viewer/ts/office/progressive.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, it } from "vitest";
+
+import { deckOf, documentOf, zipOf } from "../test/zip-members.js";
+import { PROGRESSIVE_DOCUMENT_BYTES, PROGRESSIVE_SLIDES, wantsProgressive, zipMembers } from "./progressive.js";
+
+describe("zipMembers", () => {
+  it("lists the members and their uncompressed sizes", () => {
+    expect(zipMembers(zipOf([["a/b.xml", 7], ["c", 0xfffff]]))).toEqual(new Map([["a/b.xml", 7], ["c", 0xfffff]]));
+  });
+
+  it("gives nothing for what is not a ZIP, or whose directory does not add up", () => {
+    expect(zipMembers(new Uint8Array(100))).toBeNull();
+    const bad = zipOf([["a", 1]]);
+    // The directory names more members than it holds.
+    new DataView(bad.buffer, bad.byteOffset).setUint16(bad.length - 22 + 10, 5, true);
+    expect(zipMembers(bad)).toBeNull();
+    // A name that runs past the directory.
+    const long = zipOf([["a", 1]]);
+    new DataView(long.buffer, long.byteOffset).setUint16(28, 4000, true);
+    expect(zipMembers(long)).toBeNull();
+  });
+
+  it("leaves a ZIP64 directory to the engine", () => {
+    const z = zipOf([["a", 1]]);
+    new DataView(z.buffer, z.byteOffset).setUint32(z.length - 22 + 16, 0xffffffff, true);
+    expect(zipMembers(z)).toBeNull();
+  });
+});
+
+describe("wantsProgressive", () => {
+  it("is for decks of PROGRESSIVE_SLIDES slides or more", () => {
+    expect(wantsProgressive("pptx", deckOf(PROGRESSIVE_SLIDES - 1))).toBe(false);
+    expect(wantsProgressive("pptx", deckOf(PROGRESSIVE_SLIDES))).toBe(true);
+  });
+
+  it("counts slide parts only", () => {
+    const parts = Array.from({ length: PROGRESSIVE_SLIDES }, (_, i): [string, number] => [`ppt/slideLayouts/slideLayout${i}.xml`, 10]);
+    expect(wantsProgressive("pptx", zipOf(parts))).toBe(false);
+  });
+
+  it("is for documents whose body is PROGRESSIVE_DOCUMENT_BYTES or more once inflated", () => {
+    expect(wantsProgressive("docx", documentOf(PROGRESSIVE_DOCUMENT_BYTES - 1))).toBe(false);
+    expect(wantsProgressive("docx", documentOf(PROGRESSIVE_DOCUMENT_BYTES))).toBe(true);
+    expect(wantsProgressive("docx", zipOf([["word/styles.xml", PROGRESSIVE_DOCUMENT_BYTES * 8]]))).toBe(false);
+  });
+
+  it("is not for what is not a ZIP", () => {
+    expect(wantsProgressive("pptx", new Uint8Array(64))).toBe(false);
+    expect(wantsProgressive("docx", new Uint8Array())).toBe(false);
+  });
+});
diff --git a/crates/exav-viewer/ts/office/progressive.ts b/crates/exav-viewer/ts/office/progressive.ts
new file mode 100644
index 00000000..72a6b9be
--- /dev/null
+++ b/crates/exav-viewer/ts/office/progressive.ts
@@ -0,0 +1,58 @@
+/**
+ * Whether a deck or a document is large enough for the engines' progressive
+ * layout: `load()` then resolves once the first slides or pages are laid
+ * out, and the rest follows in the background. On a short file it costs
+ * more than it saves (the first slide comes later), so it is only asked for
+ * past a size read off the ZIP's central directory, without inflating
+ * anything.
+ */
+
+/** Slides from which a deck is laid out progressively. */
+export const PROGRESSIVE_SLIDES = 32;
+
+/** Bytes of `word/document.xml`, uncompressed, from which a document is. */
+export const PROGRESSIVE_DOCUMENT_BYTES = 64 << 10;
+
+const EOCD = 22;
+const CENTRAL = 46;
+
+/**
+ * The uncompressed size of each member of a ZIP, by name, from its central
+ * directory; `null` for anything else (ZIP64, a damaged directory), which
+ * is left to the engine to judge.
+ */
+export function zipMembers(bytes: Uint8Array): Map<string, number> | null {
+  const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+  const lowest = Math.max(0, bytes.length - EOCD - 0xffff - 1024);
+  for (let at = bytes.length - EOCD; at >= lowest; at--) {
+    if (view.getUint32(at, true) !== 0x06054b50) continue;
+    const count = view.getUint16(at + 10, true);
+    const size = view.getUint32(at + 12, true);
+    const offset = view.getUint32(at + 16, true);
+    // A ZIP64 directory has 0xffffffff here, and is left to the engine.
+    if (offset + size > at) continue;
+    const members = new Map<string, number>();
+    const names = new TextDecoder();
+    let p = offset;
+    for (let i = 0; i < count; i++) {
+      if (p + CENTRAL > offset + size || view.getUint32(p, true) !== 0x02014b50) return null;
+      const nameLength = view.getUint16(p + 28, true);
+      const skip = nameLength + view.getUint16(p + 30, true) + view.getUint16(p + 32, true);
+      if (p + CENTRAL + skip > offset + size) return null;
+      members.set(names.decode(bytes.subarray(p + CENTRAL, p + CENTRAL + nameLength)), view.getUint32(p + 24, true));
+      p += CENTRAL + skip;
+    }
+    return members;
+  }
+  return null;
+}
+
+/** Whether the engine should lay `bytes`, a PPTX or a DOCX, out progressively. */
+export function wantsProgressive(kind: "pptx" | "docx", bytes: Uint8Array): boolean {
+  const members = zipMembers(bytes);
+  if (!members) return false;
+  if (kind === "docx") return (members.get("word/document.xml") ?? 0) >= PROGRESSIVE_DOCUMENT_BYTES;
+  let slides = 0;
+  for (const name of members.keys()) if (/^ppt\/slides\/slide\d+\.xml$/.test(name)) slides++;
+  return slides >= PROGRESSIVE_SLIDES;
+}
diff --git a/crates/exav-viewer/ts/office/raster.test.ts b/crates/exav-viewer/ts/office/raster.test.ts
new file mode 100644
index 00000000..42125ba1
--- /dev/null
+++ b/crates/exav-viewer/ts/office/raster.test.ts
@@ -0,0 +1,478 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { RasterError } from "../core/pictures.js";
+import type { RasterOptions } from "../core/types.js";
+import { FakeBitmap, FakeCanvas, stubCanvas } from "../test/fake-canvas.js";
+import {
+  cellName,
+  ENGINE_PIXELS,
+  engineError,
+  indexAt,
+  lazy,
+  pageInView,
+  rasterPage,
+  rasterSheet,
+  sameRegion,
+  serial,
+  sheetView,
+  sheetWindow,
+  usedArea,
+  visibleRegion,
+  type Grid,
+  type PageEngine,
+  type SheetEngine,
+} from "./raster.js";
+
+beforeEach(stubCanvas);
+afterEach(() => {
+  vi.unstubAllGlobals();
+  vi.restoreAllMocks();
+});
+
+const code = async (p: Promise<unknown>) => p.then(() => "none", (e) => (e instanceof RasterError ? e.code : `other: ${String(e)}`));
+
+/** A page 200 by 100 (units), drawn at any width. */
+function pages() {
+  const drawn: FakeBitmap[] = [];
+  const widths: number[] = [];
+  const engine: PageEngine = {
+    size: () => ({ width: 200, height: 100 }),
+    async draw(_page, width) {
+      widths.push(width);
+      const b = new FakeBitmap(width, Math.round(width / 2));
+      drawn.push(b);
+      return b as unknown as ImageBitmap;
+    },
+  };
+  return { engine, drawn, widths };
+}
+
+describe("a page drawn as a picture", () => {
+  it("is the whole page at the width asked, on white", async () => {
+    const { engine, drawn, widths } = pages();
+    const r = await rasterPage(engine, 1, { width: 400 }, null);
+    expect(widths).toEqual([400]);
+    expect([r.width, r.height, r.space, r.page]).toEqual([400, 200, "page", 1]);
+    expect(r.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+    const out = FakeCanvas.made[0]!;
+    expect(out.fills).toEqual([["#ffffff", 0, 0, 400, 200]]);
+    expect(out.draws).toEqual([[drawn[0], -0, -0]]);
+    // The whole-page bitmap is closed once copied.
+    expect(drawn[0]!.closed).toBe(true);
+  });
+
+  it("draws a region from the page drawn at the scale the region needs", async () => {
+    const { engine, widths } = pages();
+    // The right half, 300 px wide: the page at 600.
+    const r = await rasterPage(engine, 1, { width: 300, region: { x: 0.5, y: 0.25, width: 0.5, height: 0.5 } }, null);
+    expect(widths).toEqual([600]);
+    expect([r.width, r.height]).toEqual([300, 150]);
+    expect(FakeCanvas.made[0]!.draws[0]!.slice(1)).toEqual([-300, -75]);
+    expect(r.region).toEqual({ x: 0.5, y: 0.25, width: 0.5, height: 0.5 });
+  });
+
+  it("reports the region drawn, to the pixel", async () => {
+    const { engine } = pages();
+    // A third of the width is 133.33 px of a 400 px page: cut at whole pixels.
+    const r = await rasterPage(engine, 1, { width: 100, region: { x: 1 / 3, y: 0, width: 0.25, height: 0.25 } }, null);
+    expect(r.region).toEqual({ x: 133 / 400, y: 0, width: 100 / 400, height: 50 / 200 });
+  });
+
+  it("widens the region to the shape asked (contain) or narrows it (cover), the page shape being 2:1", async () => {
+    const { engine } = pages();
+    const contain = await rasterPage(engine, 1, { width: 100, height: 100 }, null);
+    expect(contain.region).toMatchObject({ x: 0, width: 1 });
+    expect((contain.region as { y: number }).y).toBeCloseTo(-0.5);
+    expect((contain.region as { height: number }).height).toBeCloseTo(2);
+    const cover = await rasterPage(engine, 1, { width: 100, height: 100, fit: "cover" }, null);
+    expect(cover.region).toMatchObject({ y: 0, height: 1 });
+    expect((cover.region as { width: number }).width).toBeCloseTo(0.5);
+  });
+
+  it("shows the background beyond the page and nothing else of it", async () => {
+    const { engine } = pages();
+    await rasterPage(engine, 1, { width: 100, height: 100, background: "#336699" }, null);
+    const out = FakeCanvas.made[0]!;
+    expect(out.fills[0]).toEqual(["#336699", 0, 0, 100, 100]);
+    // Contain: the page 100 px wide sits in the middle, 25 px down.
+    expect(out.draws[0]!.slice(1)).toEqual([-0, 25]);
+  });
+
+  it("refuses a transparent ground, as its pages are paper", async () => {
+    const { engine, widths } = pages();
+    expect(await code(rasterPage(engine, 1, { width: 100, background: "transparent" }, null))).toBe("unsupported");
+    expect(widths).toEqual([]);
+  });
+
+  it("refuses, before drawing, a region whose whole page is past what the engine draws", async () => {
+    const { engine, widths } = pages();
+    // The page would be drawn at 40000 px wide.
+    expect(await code(rasterPage(engine, 1, { width: 400, region: { x: 0, y: 0, width: 0.01, height: 0.01 } }, null))).toBe("too-large");
+    expect(widths).toEqual([]);
+    const limit = Math.floor(Math.sqrt(ENGINE_PIXELS * 2));
+    expect(await code(rasterPage(engine, 1, { width: limit + 100 }, null))).toBe("too-large");
+    expect(widths).toEqual([]);
+    expect(await code(rasterPage(engine, 1, { width: limit - 100 }, null))).toBe("none");
+  });
+
+  it("refuses a bitmap the engine quietly drew smaller, and closes it", async () => {
+    const small = new FakeBitmap(300, 150);
+    const engine: PageEngine = { size: () => ({ width: 200, height: 100 }), draw: async () => small as unknown as ImageBitmap };
+    expect(await code(rasterPage(engine, 1, { width: 400 }, null))).toBe("too-large");
+    expect(small.closed).toBe(true);
+    expect(FakeCanvas.made).toHaveLength(0);
+  });
+
+  it("draws what the viewport says for region current, and refuses when nothing is in view", async () => {
+    const { engine, widths } = pages();
+    const r = await rasterPage(engine, 1, { width: 100, region: "current" }, { x: 0, y: 0.5, width: 1, height: 0.5 });
+    expect(widths).toEqual([100]);
+    expect(r.region).toEqual({ x: 0, y: 0.5, width: 1, height: 0.5 });
+    expect(await code(rasterPage(engine, 1, { width: 100, region: "current" }, null))).toBe("invalid");
+  });
+
+  it("frees the whole-page bitmap and the picture's canvas when the copy fails", async () => {
+    const { engine, drawn } = pages();
+    vi.spyOn(FakeCanvas.prototype, "transferToImageBitmap").mockImplementation(() => {
+      throw new Error("no memory");
+    });
+    await expect(rasterPage(engine, 1, { width: 100 }, null)).rejects.toThrow("no memory");
+    expect(drawn[0]!.closed).toBe(true);
+    expect([FakeCanvas.made[0]!.width, FakeCanvas.made[0]!.height]).toEqual([0, 0]);
+  });
+
+  it("validates before drawing", async () => {
+    const { engine, widths } = pages();
+    for (const options of [{}, { width: -1 }, { longEdge: 10, width: 10 }, { width: 10, fit: "stretch" }, { width: 10, background: "url(x)" }] as RasterOptions[]) {
+      expect(await code(rasterPage(engine, 1, options, null))).toBe("invalid");
+    }
+    expect(widths).toEqual([]);
+  });
+});
+
+describe("the queue", () => {
+  const gate = () => {
+    let open!: () => void;
+    const promise = new Promise<void>((r) => (open = r));
+    return { promise, open };
+  };
+
+  it("runs tasks one at a time, in order", async () => {
+    const run = serial();
+    const log: string[] = [];
+    const g = gate();
+    const a = run(async () => {
+      log.push("a start");
+      await g.promise;
+      log.push("a end");
+      return 1;
+    });
+    const b = run(async () => {
+      log.push("b");
+      return 2;
+    });
+    await Promise.resolve();
+    expect(log).toEqual(["a start"]);
+    g.open();
+    expect(await Promise.all([a, b])).toEqual([1, 2]);
+    expect(log).toEqual(["a start", "a end", "b"]);
+  });
+
+  it("never starts a task whose signal aborted while it waited", async () => {
+    const run = serial();
+    const g = gate();
+    const first = run(() => g.promise.then(() => 1));
+    const abort = new AbortController();
+    const task = vi.fn(async () => 2);
+    const second = run(task, abort.signal);
+    abort.abort();
+    expect(await code(second)).toBe("aborted");
+    g.open();
+    await first;
+    expect(task).not.toHaveBeenCalled();
+  });
+
+  it("rejects at once when a running task is aborted, frees its late result, and keeps the next waiting for it", async () => {
+    const run = serial();
+    const g = gate();
+    const abort = new AbortController();
+    const disposed: number[] = [];
+    const running = run(async () => (await g.promise, 7), abort.signal, (v) => disposed.push(v));
+    await Promise.resolve();
+    const next = vi.fn(async () => 8);
+    const after = run(next);
+    abort.abort();
+    expect(await code(running)).toBe("aborted");
+    // The abandoned drawing is still going: the next one has not started.
+    await Promise.resolve();
+    expect(next).not.toHaveBeenCalled();
+    g.open();
+    expect(await after).toBe(8);
+    expect(disposed).toEqual([7]);
+  });
+
+  it("rejects at once for a signal already aborted, without running anything", async () => {
+    const run = serial();
+    const task = vi.fn(async () => 1);
+    const abort = new AbortController();
+    abort.abort();
+    expect(await code(run(task, abort.signal))).toBe("aborted");
+    expect(task).not.toHaveBeenCalled();
+  });
+
+  it("carries on after a task fails", async () => {
+    const run = serial();
+    await expect(run(async () => Promise.reject(new Error("boom")))).rejects.toThrow("boom");
+    expect(await run(async () => 3)).toBe(3);
+  });
+});
+
+describe("the second document", () => {
+  it("is opened once, on first use, and closed with the session", async () => {
+    const open = vi.fn(async () => ({ id: 1 }));
+    const close = vi.fn();
+    const doc = lazy(open, close);
+    expect(open).not.toHaveBeenCalled();
+    expect(doc.started).toBe(false);
+    const [a, b] = await Promise.all([doc.get(), doc.get()]);
+    expect(a).toBe(b);
+    expect(open).toHaveBeenCalledTimes(1);
+    await doc.dispose();
+    expect(close).toHaveBeenCalledWith({ id: 1 });
+    expect(await code(doc.get())).toBe("failed");
+  });
+
+  it("is opened again after a failed open", async () => {
+    const open = vi.fn().mockRejectedValueOnce(new Error("bad")).mockResolvedValueOnce("ok");
+    const doc = lazy(open, () => {});
+    await expect(doc.get()).rejects.toThrow("bad");
+    expect(await doc.get()).toBe("ok");
+  });
+
+  it("is closed when the session ends while it is still opening, and not otherwise", async () => {
+    let finish!: (v: string) => void;
+    const close = vi.fn();
+    const doc = lazy(() => new Promise<string>((r) => (finish = r)), close);
+    const got = doc.get();
+    const ended = doc.dispose();
+    finish("late");
+    await ended;
+    await got;
+    expect(close).toHaveBeenCalledWith("late");
+    // Nothing to close for a document never opened.
+    const unused = lazy(async () => "x", close);
+    await unused.dispose();
+    expect(close).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe("what an engine throws", () => {
+  it("is too-large for its resource limits, the message kept", () => {
+    const limit = Object.assign(new Error("archive entries 5000 > 4096"), { name: "OoxmlResourceLimitError" });
+    const e = engineError(limit) as RasterError;
+    expect([e.code, e.message]).toEqual(["too-large", "archive entries 5000 > 4096"]);
+    expect((engineError(Object.assign(new Error("x"), { name: "OoxmlDecodedImageLimitError" })) as RasterError).code).toBe("too-large");
+    const other = new Error("other");
+    expect(engineError(other)).toBe(other);
+  });
+});
+
+describe("what is in view", () => {
+  const box = (left: number, top: number, width: number, height: number) => ({ left, top, width, height });
+
+  it("is the part of a box inside the view, as fractions of the box", () => {
+    expect(visibleRegion(box(0, -100, 200, 400), box(0, 0, 200, 150))).toEqual({ x: 0, y: 0.25, width: 1, height: 0.375 });
+    expect(visibleRegion(box(50, 0, 100, 100), box(0, 0, 100, 100))).toEqual({ x: 0, y: 0, width: 0.5, height: 1 });
+    expect(visibleRegion(box(0, 200, 100, 100), box(0, 0, 100, 100))).toBeNull();
+    expect(visibleRegion(box(0, 0, 0, 100), box(0, 0, 100, 100))).toBeNull();
+  });
+
+  it("is the page with the most of it showing, the first on a tie", () => {
+    const view = box(0, 0, 100, 100);
+    // Page 0 shows 20 of 100 high, page 1 shows 80.
+    const boxes = [
+      { index: 0, box: box(0, -80, 100, 100) },
+      { index: 1, box: box(0, 20, 100, 100) },
+    ];
+    expect(pageInView(boxes, view)).toEqual({ index: 1, region: { x: 0, y: 0, width: 1, height: 0.8 } });
+    const tie = [
+      { index: 4, box: box(0, -50, 100, 100) },
+      { index: 5, box: box(0, 50, 100, 100) },
+    ];
+    expect(pageInView(tie, view)!.index).toBe(4);
+    expect(pageInView([{ index: 0, box: box(0, 500, 100, 100) }], view)).toBeNull();
+  });
+
+  it("compares regions to a ten-thousandth", () => {
+    const r = { x: 0.1, y: 0.2, width: 0.3, height: 0.4 };
+    expect(sameRegion(r, { ...r, x: 0.10005 })).toBe(true);
+    expect(sameRegion(r, { ...r, x: 0.1002 })).toBe(false);
+    expect(sameRegion(undefined, r)).toBe(false);
+  });
+});
+
+/** Columns of 100, 50 and a hidden one, then 100; rows of 20 and a hidden one. The headers are 50 by 22. */
+const grid = (): Grid => {
+  const widths = [100, 50, 0, 100];
+  const heights = [20, 20, 0, 20];
+  const edges = (sizes: number[]) => (n: number) => sizes.slice(0, n - 1).reduce((a, b) => a + b, 0);
+  return { header: { width: 50, height: 22 }, cols: 4, rows: 4, colEdge: edges(widths), rowEdge: edges(heights) };
+};
+
+describe("a sheet's cells", () => {
+  it("finds the cell holding a position, the visible one after hidden ones", () => {
+    const g = grid();
+    expect([0, 99.9, 100, 149, 150, 249.9].map((p) => indexAt(g.colEdge, g.cols, p))).toEqual([1, 1, 2, 2, 4, 4]);
+    expect(indexAt(g.colEdge, g.cols, -5)).toBe(1);
+  });
+
+  it("is the page's size from the used area, hidden columns taking none", () => {
+    const g = grid();
+    expect([g.colEdge(5), g.rowEdge(5)]).toEqual([250, 60]);
+  });
+
+  it("works out the cells a region covers, and how far into the first one it starts", () => {
+    const g = grid();
+    // x 110..230 of 250, y 10..50 of 60.
+    const w = sheetWindow(g, { x: 110 / 250, y: 10 / 60, width: 120 / 250, height: 40 / 60 })!;
+    // The hidden column and row are in the window: they take no room.
+    expect(w).toMatchObject({ col: 2, cols: 3, row: 1, rows: 4 });
+    expect(w.offsetX).toBeCloseTo(10);
+    expect(w.offsetY).toBeCloseTo(10);
+    expect([w.x0, w.x1]).toEqual([110, 230].map((v) => expect.closeTo(v, 6)));
+  });
+
+  it("ends a window on a cell edge in the cell before it", () => {
+    const w = sheetWindow(grid(), { x: 0, y: 0, width: 100 / 250, height: 20 / 60 })!;
+    expect([w.col, w.cols, w.row, w.rows]).toEqual([1, 1, 1, 1]);
+  });
+
+  it("cuts a region reaching past the page to the page, and is null when none of it is on it", () => {
+    const g = grid();
+    const w = sheetWindow(g, { x: -0.5, y: 0.5, width: 2, height: 2 })!;
+    expect([w.x0, w.x1, w.y0, w.y1]).toEqual([0, 250, 30, 60]);
+    expect(sheetWindow(g, { x: 1, y: 0, width: 1, height: 1 })).toBeNull();
+    expect(sheetWindow(g, { x: -2, y: 0, width: 1, height: 1 })).toBeNull();
+  });
+
+  it("names cells", () => {
+    expect([cellName(1, 1), cellName(26, 5), cellName(27, 1), cellName(702, 9), cellName(703, 2), cellName(16384, 1)]).toEqual(["A1", "Z5", "AA1", "ZZ9", "AAA2", "XFD1"]);
+  });
+
+  it("takes the used area from values, styles, merges and anchors, at least A1", () => {
+    expect(usedArea({ rows: [] })).toEqual({ rows: 1, cols: 1 });
+    const cell = (col: number, type = "text", styleIndex?: number) => ({ col, value: { type }, ...(styleIndex !== undefined && { styleIndex }) });
+    expect(usedArea({ rows: [{ index: 3, cells: [cell(2)] }, { index: 7, cells: [cell(9, "empty")] }, { index: 5, cells: [cell(4, "number")] }] })).toEqual({ rows: 5, cols: 4 });
+    // An empty cell with a style (a fill) is drawn.
+    expect(usedArea({ rows: [{ index: 6, cells: [cell(3, "empty", 2)] }] })).toEqual({ rows: 6, cols: 3 });
+    expect(usedArea({ rows: [], mergeCells: [{ bottom: 8, right: 5 }], anchors: [{ toRow: 11, toCol: 6 }] })).toEqual({ rows: 12, cols: 7 });
+    expect(usedArea({ rows: [{ index: 5_000_000, cells: [cell(99_999)] }] })).toEqual({ rows: 1_048_576, cols: 16_384 });
+  });
+});
+
+/** A sheet engine over `grid()`: each drawing is a bitmap of the size asked. */
+function sheets() {
+  const drawn: { page: number; window: unknown; size: { width: number; height: number; scale: number }; bitmap: FakeBitmap }[] = [];
+  const engine: SheetEngine = {
+    measure: async (_page, fn) => fn(grid()),
+    async draw(page, window, size) {
+      const bitmap = new FakeBitmap(size.width, size.height);
+      drawn.push({ page, window, size, bitmap });
+      return bitmap as unknown as ImageBitmap;
+    },
+  };
+  return { engine, drawn };
+}
+
+describe("a sheet drawn as a picture", () => {
+  it("is the used area, without the headers, at the scale of the width asked", async () => {
+    const { engine, drawn } = sheets();
+    const r = await rasterSheet(engine, 1, { width: 500 }, () => null);
+    // 250 x 60 at 100 %: twice that.
+    expect([r.width, r.height]).toEqual([500, 120]);
+    expect(drawn[0]!.size).toEqual({ width: 100 + 500, height: 44 + 120, scale: 2 });
+    expect(drawn[0]!.window).toMatchObject({ row: 1, col: 1, rows: 4, cols: 4, offsetX: 0, offsetY: 0 });
+    const out = FakeCanvas.made[0]!;
+    expect(out.fills[0]).toEqual(["#ffffff", 0, 0, 500, 120]);
+    expect(out.draws[0]!.slice(1)).toEqual([100, 44, 500, 120, 0, 0, 500, 120]);
+    expect(r.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+    expect(drawn[0]!.bitmap.closed).toBe(true);
+  });
+
+  it("draws a region as the cells it covers, scrolled to its start", async () => {
+    const { engine, drawn } = sheets();
+    // x 110..230, y 10..50: 120 x 40 at 100 %, drawn 3 times as large.
+    await rasterSheet(engine, 1, { width: 360, region: { x: 110 / 250, y: 10 / 60, width: 120 / 250, height: 40 / 60 } }, () => null);
+    expect(drawn[0]!.window).toMatchObject({ row: 1, col: 2, rows: 4, cols: 3 });
+    expect((drawn[0]!.window as { offsetX: number }).offsetX).toBeCloseTo(10);
+    expect(drawn[0]!.size).toEqual({ width: 50 * 3 + 360, height: 22 * 3 + 120, scale: 3 });
+  });
+
+  it("leaves the background where the region is off the used area, and draws nothing when all of it is", async () => {
+    const { engine, drawn } = sheets();
+    await rasterSheet(engine, 1, { width: 250, region: { x: 0.5, y: 0, width: 1, height: 1 }, background: "#eeeeee" }, () => null);
+    const out = FakeCanvas.made[0]!;
+    expect(out.fills[0]![0]).toBe("#eeeeee");
+    // Half the picture is cells: the left 125 px of the 250.
+    expect(out.draws[0]!.slice(5)).toEqual([0, 0, 125, 60]);
+    await rasterSheet(engine, 1, { width: 100, region: { x: 3, y: 3, width: 1, height: 1 } }, () => null);
+    expect(drawn).toHaveLength(1);
+    expect(FakeCanvas.made[1]!.draws).toEqual([]);
+  });
+
+  it("draws at the smallest scale the engine does and scales down below it, the region unchanged", async () => {
+    const { engine, drawn } = sheets();
+    const r = await rasterSheet(engine, 1, { width: 50 }, () => null);
+    expect(drawn[0]!.size.scale).toBe(0.5);
+    expect(drawn[0]!.size).toEqual({ width: 25 + 125, height: 11 + 30, scale: 0.5 });
+    // 125 x 30 drawn into 50 x 12.
+    expect(FakeCanvas.made[0]!.draws[0]!.slice(1)).toEqual([25, 11, 125, 30, 0, 0, 50, 12]);
+    expect(FakeCanvas.made[0]!.imageSmoothingQuality).toBe("high");
+    expect(r.region).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+  });
+
+  it("refuses a transparent ground before drawing", async () => {
+    const { engine, drawn } = sheets();
+    expect(await code(rasterSheet(engine, 1, { width: 100, background: "transparent" }, () => null))).toBe("unsupported");
+    expect(drawn).toHaveLength(0);
+  });
+
+  it("refuses what the engine would draw smaller, before drawing", async () => {
+    const { engine, drawn } = sheets();
+    expect(await code(rasterSheet(engine, 1, { width: 16000, height: 4000 }, () => null))).toBe("too-large");
+    expect(drawn).toHaveLength(0);
+  });
+
+  it("refuses a bitmap the engine drew at another size, and closes it", async () => {
+    const small = new FakeBitmap(10, 10);
+    const engine: SheetEngine = { measure: async (_p, fn) => fn(grid()), draw: async () => small as unknown as ImageBitmap };
+    expect(await code(rasterSheet(engine, 1, { width: 500 }, () => null))).toBe("too-large");
+    expect(small.closed).toBe(true);
+    expect([FakeCanvas.made[0]!.width, FakeCanvas.made[0]!.height]).toEqual([0, 0]);
+  });
+
+  it("takes region current from the viewer, with the grid it is measured against", async () => {
+    const { engine, drawn } = sheets();
+    const seen: Grid[] = [];
+    await rasterSheet(engine, 1, { width: 100, region: "current" }, (g) => (seen.push(g), { x: 0, y: 0, width: 0.4, height: 1 }));
+    expect(seen).toHaveLength(1);
+    expect(drawn[0]!.window).toMatchObject({ col: 1, cols: 1 });
+    expect(await code(rasterSheet(engine, 1, { width: 100, region: "current" }, () => null))).toBe("invalid");
+  });
+
+  it("says where the viewer is in the page", () => {
+    const g = grid();
+    // At 100 %, scrolled 30 px right and 10 down, in a 150 x 80 canvas: the cells in view are x 30..130, y 10..68, cut to the page's 60.
+    const v = sheetView(g, { x: 50 - 30, y: 22 - 10 }, 1, { width: 150, height: 80 })!;
+    expect(v.x).toBeCloseTo(30 / 250);
+    expect(v.width).toBeCloseTo(100 / 250);
+    expect(v.y).toBeCloseTo(10 / 60);
+    expect(v.height).toBeCloseTo(50 / 60);
+    // Zoomed 2x, nothing scrolled, a 250 x 144 canvas shows 75 x 50 of the page.
+    const z = sheetView(g, { x: 100, y: 44 }, 2, { width: 250, height: 144 })!;
+    expect(z).toEqual({ x: 0, y: 0, width: expect.closeTo(75 / 250, 6), height: expect.closeTo(50 / 60, 6) });
+    // Scrolled past the used area: none of it shows.
+    expect(sheetView(g, { x: -400, y: 22 }, 1, { width: 150, height: 80 })).toBeNull();
+    expect(sheetView(g, { x: 0, y: 0 }, 0, { width: 1, height: 1 })).toBeNull();
+  });
+});
diff --git a/crates/exav-viewer/ts/office/raster.ts b/crates/exav-viewer/ts/office/raster.ts
new file mode 100644
index 00000000..46b9656b
--- /dev/null
+++ b/crates/exav-viewer/ts/office/raster.ts
@@ -0,0 +1,402 @@
+/**
+ * Pictures of office pages and sheets, over what the engines can draw: a
+ * whole page at a width (Word, PowerPoint) or a cell range at a scale
+ * (spreadsheets), always on a canvas made here. No engine import: the
+ * engines are given as small interfaces.
+ *
+ * The engines have no way to stop a drawing and no sub-rectangle of a page,
+ * and they quietly draw a smaller bitmap than asked past a pixel budget
+ * (`ENGINE_PIXELS`). So a region of a page is cut out of a drawing of the
+ * whole page at the scale the region needs, and a request whose whole page
+ * would be past that budget is refused ("too-large") instead of coming
+ * back blurred. A sheet is drawn by cell range, so only the range the
+ * region covers is drawn.
+ */
+import { MAX_PICTURE_EDGE, planRect, RasterError } from "../core/pictures.js";
+import { bitmapOf, createCanvas, release } from "../core/raster.js";
+import type { Raster, RasterOptions, RasterRect } from "../core/types.js";
+
+/** The most pixels the engines draw in one bitmap: past it they return a smaller one. */
+export const ENGINE_PIXELS = 2 ** 24;
+
+/** The smallest cell scale a sheet is drawn at; a smaller picture is drawn at this and scaled down. */
+export const MIN_SHEET_SCALE = 0.5;
+
+const WHOLE: RasterRect = { x: 0, y: 0, width: 1, height: 1 };
+
+/** The `RasterError` for what an engine threw: its resource limits are "too-large". */
+export function engineError(error: unknown): unknown {
+  if (error instanceof RasterError) return error;
+  const name = (error as { name?: unknown } | null)?.name;
+  if (name === "OoxmlResourceLimitError" || name === "OoxmlDecodedImageLimitError") {
+    return new RasterError("too-large", error instanceof Error ? error.message : "past the engine's limits", { cause: error });
+  }
+  return error;
+}
+
+// ── Queue ────────────────────────────────────────────────────────────────────
+
+/**
+ * Runs tasks one at a time, in order. A task whose signal aborts rejects at
+ * once with "aborted"; if it had started, it is left to end (an engine's
+ * drawing cannot be stopped), its result passed to `dispose`, and the next
+ * task waits for it, so abandoned work never piles up.
+ */
+export function serial() {
+  let tail: Promise<unknown> = Promise.resolve();
+  return function run<T>(task: () => Promise<T>, signal?: AbortSignal, dispose?: (value: T) => void): Promise<T> {
+    return new Promise<T>((resolve, reject) => {
+      let settled = false;
+      const abort = () => {
+        if (settled) return;
+        settled = true;
+        reject(new RasterError("aborted", "aborted"));
+      };
+      if (signal?.aborted) return abort();
+      signal?.addEventListener("abort", abort, { once: true });
+      tail = tail
+        .then(async () => {
+          if (settled) return;
+          try {
+            const value = await task();
+            if (settled) dispose?.(value);
+            else {
+              settled = true;
+              resolve(value);
+            }
+          } catch (error) {
+            if (settled) return;
+            settled = true;
+            reject(error);
+          }
+        })
+        .finally(() => signal?.removeEventListener("abort", abort));
+    });
+  };
+}
+
+// ── The second document ──────────────────────────────────────────────────────
+
+/**
+ * A resource opened on first use (the second copy of a document the pictures
+ * are drawn from), kept for the next, and closed with the session. A failed
+ * open is tried again by the next use.
+ */
+export function lazy<D>(make: () => Promise<D>, close: (resource: D) => void) {
+  let current: Promise<D> | null = null;
+  let closed = false;
+  return {
+    get(): Promise<D> {
+      if (closed) return Promise.reject(new RasterError("failed", "the session is closed"));
+      current ??= make().catch((error) => {
+        current = null;
+        throw error;
+      });
+      return current;
+    },
+    /** Whether `get` has been called and not failed. */
+    get started() {
+      return current !== null;
+    },
+    async dispose(): Promise<void> {
+      closed = true;
+      const pending = current;
+      current = null;
+      if (!pending) return;
+      try {
+        close(await pending);
+      } catch {
+        // It never opened: nothing to close.
+      }
+    },
+  };
+}
+
+// ── A page drawn whole (Word, PowerPoint) ────────────────────────────────────
+
+export interface PageEngine {
+  /** The page's shape: width and height in any one unit. */
+  size(page: number): { width: number; height: number };
+  /** The whole page `width` px wide. The caller closes the bitmap. */
+  draw(page: number, width: number): Promise<ImageBitmap>;
+}
+
+/** What a transparent ground is refused with: the pages are opaque paper. */
+export const NO_TRANSPARENT = "this format draws its pages on opaque paper: a transparent background is not available";
+
+/**
+ * Page `page` as a picture. `region` is a rectangle of fractions of the page
+ * (top left origin); `current` is the viewport's, for `region: "current"`.
+ * The page is drawn whole at the width the region needs, and the region cut
+ * out of it (so a region cut out is exactly the pixels a full page at that
+ * width shows). What is outside the page is the background. The region
+ * returned is the one drawn, to the pixel.
+ */
+export async function rasterPage(engine: PageEngine, page: number, options: RasterOptions, current: RasterRect | null): Promise<Raster> {
+  const shape = engine.size(page);
+  const plan = planRect(options, WHOLE, { x: shape.width, y: shape.height }, current);
+  if (plan.background === "transparent") throw new RasterError("unsupported", NO_TRANSPARENT);
+  const width = Math.max(1, Math.round(plan.width / plan.region.width));
+  const height = Math.max(1, Math.round((width * shape.height) / shape.width));
+  if (!(width <= MAX_PICTURE_EDGE && height <= MAX_PICTURE_EDGE && width * height <= ENGINE_PIXELS)) {
+    throw new RasterError("too-large", `this region needs the whole page drawn at ${width} x ${height} px, past the ${ENGINE_PIXELS} px a page can be drawn at`);
+  }
+  const full = await engine.draw(page, width);
+  try {
+    if (Math.abs(full.width - width) > 1 || Math.abs(full.height - height) > 1) {
+      throw new RasterError("too-large", `the page was drawn at ${full.width} x ${full.height} px, not ${width} x ${height}`);
+    }
+    const x = Math.round(plan.region.x * full.width);
+    const y = Math.round(plan.region.y * full.height);
+    const { canvas, ctx } = createCanvas(plan.width, plan.height);
+    try {
+      ctx.fillStyle = plan.background;
+      ctx.fillRect(0, 0, plan.width, plan.height);
+      ctx.drawImage(full, -x, -y);
+      const bitmap = await bitmapOf(canvas);
+      return {
+        bitmap,
+        width: plan.width,
+        height: plan.height,
+        page,
+        space: "page",
+        region: { x: x / full.width, y: y / full.height, width: plan.width / full.width, height: plan.height / full.height },
+      };
+    } catch (error) {
+      release(canvas);
+      throw error;
+    }
+  } finally {
+    full.close();
+  }
+}
+
+// ── A box in view ────────────────────────────────────────────────────────────
+
+export interface Box {
+  left: number;
+  top: number;
+  width: number;
+  height: number;
+}
+
+/** The part of `box` inside `view`, as fractions of `box`; null when none of it is. */
+export function visibleRegion(box: Box, view: Box): RasterRect | null {
+  if (!(box.width > 0 && box.height > 0)) return null;
+  const left = Math.max(box.left, view.left);
+  const top = Math.max(box.top, view.top);
+  const right = Math.min(box.left + box.width, view.left + view.width);
+  const bottom = Math.min(box.top + box.height, view.top + view.height);
+  if (!(right > left && bottom > top)) return null;
+  return { x: (left - box.left) / box.width, y: (top - box.top) / box.height, width: (right - left) / box.width, height: (bottom - top) / box.height };
+}
+
+/**
+ * The page most in view of `boxes` (index and the visible region): the one
+ * with the most of its area inside `view`, the first on a tie. Null when
+ * none shows.
+ */
+export function pageInView(boxes: readonly { index: number; box: Box }[], view: Box): { index: number; region: RasterRect } | null {
+  let best: { index: number; region: RasterRect; area: number } | null = null;
+  for (const { index, box } of boxes) {
+    const region = visibleRegion(box, view);
+    if (!region) continue;
+    const area = region.width * region.height * box.width * box.height;
+    if (!best || area > best.area + 1e-6 || (Math.abs(area - best.area) <= 1e-6 && index < best.index)) best = { index, region, area };
+  }
+  return best && { index: best.index, region: best.region };
+}
+
+/** Whether two regions are the same to a ten-thousandth of the page. */
+export function sameRegion(a: RasterRect | undefined, b: RasterRect | undefined): boolean {
+  return !!a && !!b && (["x", "y", "width", "height"] as const).every((k) => Math.abs(a[k] - b[k]) < 1e-4);
+}
+
+// ── A sheet ──────────────────────────────────────────────────────────────────
+
+/**
+ * The geometry of a sheet at 100 %, in px, from the top left of cell A1.
+ * Its page is the used area: columns 1..`cols` and rows 1..`rows`.
+ */
+export interface Grid {
+  /** The column and row headers the engine draws around the cells. */
+  header: { width: number; height: number };
+  cols: number;
+  rows: number;
+  /** The left edge of column `c` (1-based); `cols + 1` is the right edge of the page. */
+  colEdge(c: number): number;
+  /** The top edge of row `r`; `rows + 1` is the bottom edge of the page. */
+  rowEdge(r: number): number;
+}
+
+/** The page's size at 100 %. */
+export const pageSize = (grid: Grid) => ({ width: grid.colEdge(grid.cols + 1), height: grid.rowEdge(grid.rows + 1) });
+
+/** The last index in 1..`count` whose edge is at or before `at` (the cell holding it); 1 when none. */
+export function indexAt(edge: (index: number) => number, count: number, at: number): number {
+  let low = 1;
+  let high = count;
+  while (low < high) {
+    const middle = Math.ceil((low + high) / 2);
+    if (edge(middle) <= at) low = middle;
+    else high = middle - 1;
+  }
+  return low;
+}
+
+/** What to ask the engine for to draw part of a sheet. */
+export interface SheetWindow {
+  row: number;
+  col: number;
+  rows: number;
+  cols: number;
+  /** How far into the first column and row the window starts, at 100 %. */
+  offsetX: number;
+  offsetY: number;
+  /** The window in the page, at 100 % (the part of the region that is on the page). */
+  x0: number;
+  y0: number;
+  x1: number;
+  y1: number;
+}
+
+/** The cells of `grid` that region `region` (fractions of the page) covers, or null when it is all off the page. */
+export function sheetWindow(grid: Grid, region: RasterRect): SheetWindow | null {
+  const page = pageSize(grid);
+  const x0 = Math.max(0, region.x * page.width);
+  const y0 = Math.max(0, region.y * page.height);
+  const x1 = Math.min(page.width, (region.x + region.width) * page.width);
+  const y1 = Math.min(page.height, (region.y + region.height) * page.height);
+  if (!(x1 > x0 && y1 > y0)) return null;
+  const col = indexAt(grid.colEdge, grid.cols, x0);
+  const row = indexAt(grid.rowEdge, grid.rows, y0);
+  const lastCol = indexAt(grid.colEdge, grid.cols, x1 - 1e-7);
+  const lastRow = indexAt(grid.rowEdge, grid.rows, y1 - 1e-7);
+  return { row, col, rows: lastRow - row + 1, cols: lastCol - col + 1, offsetX: x0 - grid.colEdge(col), offsetY: y0 - grid.rowEdge(row), x0, y0, x1, y1 };
+}
+
+export interface SheetEngine {
+  /** Runs `fn` with the grid of sheet `page` (1-based); the grid is good inside `fn` only. */
+  measure<T>(page: number, fn: (grid: Grid) => T): Promise<T>;
+  /**
+   * The cells of `window` with the headers, `width` by `height` px, the cells
+   * `scale` times their size at 100 % and scrolled `offsetX`, `offsetY`
+   * (100 % px) into the first cell. The caller closes the bitmap.
+   */
+  draw(page: number, window: Pick<SheetWindow, "row" | "col" | "rows" | "cols" | "offsetX" | "offsetY">, size: { width: number; height: number; scale: number }): Promise<ImageBitmap>;
+}
+
+/**
+ * Sheet `page` as a picture. The page is the sheet's used area at 100 %, and
+ * `region` fractions of it from the top left of cell A1; the headers the
+ * engine draws are not part of it. Where the region is off the used area is
+ * the background. The scale is the picture's width over the region's width
+ * at 100 %; the region is drawn exactly, to a pixel.
+ */
+export async function rasterSheet(engine: SheetEngine, page: number, options: RasterOptions, current: (grid: Grid) => RasterRect | null): Promise<Raster> {
+  const { full, header, plan, window } = await engine.measure(page, (grid) => {
+    const full = pageSize(grid);
+    const plan = planRect(options, WHOLE, { x: full.width, y: full.height }, options.region === "current" ? current(grid) : null);
+    if (plan.background === "transparent") throw new RasterError("unsupported", "a sheet is drawn on its own white cells: a transparent background is not available");
+    return { full, header: grid.header, plan, window: sheetWindow(grid, plan.region) };
+  });
+  const scale = plan.width / (plan.region.width * full.width);
+  const drawn = Math.max(scale, MIN_SHEET_SCALE);
+  const { canvas, ctx } = createCanvas(plan.width, plan.height);
+  try {
+    ctx.fillStyle = plan.background;
+    ctx.fillRect(0, 0, plan.width, plan.height);
+    if (window) {
+      // The engine's headers; the cells start where the viewer's do.
+      const headerX = Math.round(header.width * drawn);
+      const headerY = Math.round(header.height * drawn);
+      const cellsX = Math.max(1, Math.round((window.x1 - window.x0) * drawn));
+      const cellsY = Math.max(1, Math.round((window.y1 - window.y0) * drawn));
+      const width = headerX + cellsX;
+      const height = headerY + cellsY;
+      if (!(width <= MAX_PICTURE_EDGE && height <= MAX_PICTURE_EDGE && width * height <= ENGINE_PIXELS)) {
+        throw new RasterError("too-large", `this region needs ${width} x ${height} px drawn, past the ${ENGINE_PIXELS} px a sheet can be drawn at`);
+      }
+      const bitmap = await engine.draw(page, window, { width, height, scale: drawn });
+      try {
+        if (bitmap.width !== width || bitmap.height !== height) {
+          throw new RasterError("too-large", `the sheet was drawn at ${bitmap.width} x ${bitmap.height} px, not ${width} x ${height}`);
+        }
+        const dx = Math.round((window.x0 - plan.region.x * full.width) * scale);
+        const dy = Math.round((window.y0 - plan.region.y * full.height) * scale);
+        const dw = Math.max(1, Math.round((window.x1 - window.x0) * scale));
+        const dh = Math.max(1, Math.round((window.y1 - window.y0) * scale));
+        ctx.imageSmoothingQuality = "high";
+        ctx.drawImage(bitmap, headerX, headerY, cellsX, cellsY, dx, dy, dw, dh);
+      } finally {
+        bitmap.close();
+      }
+    }
+    const bitmap = await bitmapOf(canvas);
+    return { bitmap, width: plan.width, height: plan.height, page, space: "page", region: plan.region };
+  } catch (error) {
+    release(canvas);
+    throw error;
+  }
+}
+
+/**
+ * The part of a sheet in view, as fractions of its page: `corner` is where
+ * cell A1's top left is in the viewer (CSS px, negative when scrolled), `scale`
+ * the viewer's zoom, `canvas` its size in CSS px. Null when none of the used
+ * area shows.
+ */
+export function sheetView(grid: Grid, corner: { x: number; y: number }, scale: number, canvas: { width: number; height: number }): RasterRect | null {
+  if (!(scale > 0)) return null;
+  const page = pageSize(grid);
+  const left = grid.header.width - corner.x / scale;
+  const top = grid.header.height - corner.y / scale;
+  const right = left + canvas.width / scale - grid.header.width;
+  const bottom = top + canvas.height / scale - grid.header.height;
+  return visibleRegion({ left: 0, top: 0, width: page.width, height: page.height }, { left, top, width: right - left, height: bottom - top });
+}
+
+// ── Used area ────────────────────────────────────────────────────────────────
+
+/** The parts of a worksheet that give its used area. */
+export interface Extent {
+  rows: { index: number; cells: { col: number; styleIndex?: number; value: { type: string } }[] }[];
+  mergeCells?: { bottom: number; right: number }[];
+  /** Drawings and charts anchored to cells, 0-based. */
+  anchors?: { toRow: number; toCol: number }[];
+}
+
+const MAX_ROWS = 1_048_576;
+const MAX_COLS = 16_384;
+
+/** The used area of a worksheet: its last row and column that hold a value, a style, a merge or a drawing (at least A1). */
+export function usedArea(sheet: Extent): { rows: number; cols: number } {
+  let rows = 1;
+  let cols = 1;
+  for (const row of sheet.rows) {
+    for (const cell of row.cells) {
+      if (cell.value.type === "empty" && cell.styleIndex === undefined) continue;
+      rows = Math.max(rows, row.index);
+      cols = Math.max(cols, cell.col);
+    }
+  }
+  for (const m of sheet.mergeCells ?? []) {
+    rows = Math.max(rows, m.bottom);
+    cols = Math.max(cols, m.right);
+  }
+  for (const a of sheet.anchors ?? []) {
+    rows = Math.max(rows, a.toRow + 1);
+    cols = Math.max(cols, a.toCol + 1);
+  }
+  return { rows: Math.min(MAX_ROWS, rows), cols: Math.min(MAX_COLS, cols) };
+}
+
+/** A column's letters ("A", "AB"), 1-based. */
+export function columnName(col: number): string {
+  let name = "";
+  for (let c = col; c > 0; c = Math.floor((c - 1) / 26)) name = String.fromCharCode(65 + ((c - 1) % 26)) + name;
+  return name;
+}
+
+/** A cell's name ("A1"), 1-based. */
+export const cellName = (col: number, row: number) => columnName(col) + row;
diff --git a/crates/exav-viewer/ts/office/renderer-raster.test.ts b/crates/exav-viewer/ts/office/renderer-raster.test.ts
new file mode 100644
index 00000000..65c4b526
--- /dev/null
+++ b/crates/exav-viewer/ts/office/renderer-raster.test.ts
@@ -0,0 +1,433 @@
+/** What the office viewers give for pictures and the viewport, over fake engines and a fake second document. */
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { Raster, RasterOptions, RenderContext } from "../core/types.js";
+import { docx, xlsx, csv, pptx, rtf, xls } from "./index.js";
+import type { Current, Exporter, SheetExporter } from "./export.js";
+import type { Grid } from "./raster.js";
+
+type Options = Record<string, unknown>;
+const viewers: { engine: string; options: Options; canvas?: HTMLElement }[] = [];
+
+/** What the fake second document was asked. */
+const exported = {
+  rasters: [] as { kind: string; page: number; options: RasterOptions; current: Current }[],
+  disposed: [] as string[],
+  measured: [] as number[],
+  sources: [] as (() => Promise<ArrayBuffer>)[],
+  grid: null as Grid | null,
+  /** Measures wait for it: a test holds them to have one in flight. */
+  gate: Promise.resolve() as Promise<void>,
+};
+
+vi.mock("./export.js", () => {
+  const make = (kind: string, load: () => Promise<ArrayBuffer>): Exporter => {
+    exported.sources.push(load);
+    return {
+      raster: async (page, options, current) => {
+        exported.rasters.push({ kind, page, options, current });
+        return { bitmap: {} as ImageBitmap, width: 1, height: 1, page, space: "page" } as Raster;
+      },
+      dispose: async () => void exported.disposed.push(kind),
+    };
+  };
+  return {
+    docxExporter: (load: () => Promise<ArrayBuffer>) => make("docx", load),
+    pptxExporter: (load: () => Promise<ArrayBuffer>) => make("pptx", load),
+    sheetExporter: (load: () => Promise<ArrayBuffer>): SheetExporter => ({
+      ...make("sheet", load),
+      measure: async (page, fn) => {
+        exported.measured.push(page);
+        await exported.gate;
+        return fn(exported.grid!);
+      },
+    }),
+  };
+});
+
+vi.mock("@silurus/ooxml/docx", () => ({
+  DocxScrollViewer: class {
+    constructor(_root: HTMLElement, options: Options) {
+      viewers.push({ engine: "docx", options });
+    }
+    async load() {}
+    getScale() {
+      return 1;
+    }
+    destroy() {}
+  },
+}));
+vi.mock("@silurus/ooxml/pptx", () => ({
+  PptxViewer: class {
+    constructor(canvas: HTMLElement, options: Options) {
+      viewers.push({ engine: "pptx", options, canvas });
+    }
+    async load() {}
+    async fitPage() {}
+    getScale() {
+      return 1;
+    }
+    destroy() {}
+  },
+}));
+let sheetNames = ["Quote", "Notes"];
+let current = 0;
+let corner: { x: number; y: number } | null = { x: 50, y: 22 };
+vi.mock("@silurus/ooxml/xlsx", () => ({
+  XlsxSheetViewer: class {
+    sheetNames = sheetNames;
+    get sheetIndex() {
+      return current;
+    }
+    constructor(_canvas: HTMLElement, options: Options) {
+      viewers.push({ engine: "xlsx", options });
+    }
+    async load() {}
+    getScale() {
+      return 1;
+    }
+    getCellViewportRect() {
+      return corner && { ...corner, width: 100, height: 20 };
+    }
+    async goToSheet() {}
+    destroy() {}
+  },
+}));
+
+beforeEach(() => {
+  vi.stubGlobal("ResizeObserver", class { observe() {} disconnect() {} });
+  vi.spyOn(console, "warn").mockImplementation(() => {});
+  exported.grid = { header: { width: 50, height: 22 }, cols: 2, rows: 2, colEdge: (c) => (c - 1) * 100, rowEdge: (r) => (r - 1) * 20 };
+  current = 0;
+  corner = { x: 50, y: 22 };
+  // A canvas of 300 x 200 CSS px in the viewer.
+  Object.defineProperty(HTMLCanvasElement.prototype, "clientWidth", { configurable: true, get: () => 300 });
+  Object.defineProperty(HTMLCanvasElement.prototype, "clientHeight", { configurable: true, get: () => 200 });
+});
+afterEach(() => {
+  // A session left open keeps watching, into the next test.
+  for (const m of open.splice(0)) m.destroy();
+  delete (HTMLCanvasElement.prototype as { clientWidth?: number }).clientWidth;
+  delete (HTMLCanvasElement.prototype as { clientHeight?: number }).clientHeight;
+  viewers.length = 0;
+  Object.assign(exported, { rasters: [], disposed: [], measured: [], sources: [], gate: Promise.resolve() });
+  vi.unstubAllGlobals();
+  vi.restoreAllMocks();
+});
+
+const open: { destroy(): void }[] = [];
+
+async function mount(plugin: ReturnType<typeof docx>, bytes = new Uint8Array([1, 2, 3])) {
+  const host = document.createElement("div");
+  document.body.append(host);
+  const ctx = { options: {}, source: { bytes: async () => bytes }, signal: new AbortController().signal, status: () => {} } as unknown as RenderContext<Record<string, never>>;
+  const renderer = await plugin.load();
+  const mounted = await renderer.mount(host, ctx as never);
+  open.push(mounted);
+  return { host, mounted };
+}
+
+describe("what the office plugins offer", () => {
+  it("lists pictures and viewport for every format that draws, converted ones included", () => {
+    for (const p of [docx(), xlsx(), pptx(), csv(), xls(), rtf({ converter: "exav" })]) {
+      expect(p.capabilities, p.id).toEqual(expect.arrayContaining(["pictures", "viewport"]));
+    }
+  });
+});
+
+const rectOf = (r: [number, number, number, number]) => () => ({ left: r[0], top: r[1], width: r[2], height: r[3], right: r[0] + r[2], bottom: r[1] + r[3], x: r[0], y: r[1] }) as DOMRect;
+const later = (ms = 60) => new Promise((r) => setTimeout(r, ms));
+
+describe("a Word document", () => {
+  /** The scroll viewer's DOM as the engine lays it out: one page in a 600 x 400 scroller; `measured` counts the boxes read. */
+  function laidOut(host: HTMLElement) {
+    const root = host.querySelector<HTMLElement>(".exav-viewer-office")!;
+    const scroller = document.createElement("div");
+    scroller.getBoundingClientRect = rectOf([0, 0, 600, 400]);
+    Object.defineProperty(scroller, "clientWidth", { value: 600 });
+    Object.defineProperty(scroller, "clientHeight", { value: 400 });
+    const slot = document.createElement("div");
+    const layer = document.createElement("div");
+    layer.dataset.overlay = "text";
+    layer.dataset.pageIndex = "0";
+    const measured = vi.fn(rectOf([0, -100, 600, 1000]));
+    layer.getBoundingClientRect = measured;
+    slot.append(layer);
+    scroller.append(slot);
+    root.append(scroller);
+    return { root, measured };
+  }
+  const seen = { space: "page", page: 1, region: { x: 0, y: 0.1, width: 1, height: 0.4 } };
+
+  it("measures no view in a session that does not use the viewport", async () => {
+    const { mounted, host } = await mount(docx());
+    const { root, measured } = laidOut(host);
+    (viewers[0]!.options.onVisiblePageChange as (a: number, b: number, c: boolean) => void)(0, 2, true);
+    (viewers[0]!.options.onScaleChange as (s: number) => void)(1.5);
+    root.dispatchEvent(new Event("scroll"));
+    await later();
+    expect(measured).not.toHaveBeenCalled();
+    expect(mounted.controllers.pictures!.get().count).toBe(2);
+  });
+
+  it("measures the view while the viewport is followed, and stops when the last listener leaves", async () => {
+    const { mounted, host } = await mount(docx());
+    const { root, measured } = laidOut(host);
+    const store = mounted.controllers.viewport!;
+    const stop = store.subscribe(() => {});
+    expect(store.get()).toEqual(seen);
+    const after = measured.mock.calls.length;
+    expect(after).toBeGreaterThan(0);
+    root.dispatchEvent(new Event("scroll"));
+    await vi.waitFor(() => expect(measured.mock.calls.length).toBeGreaterThan(after));
+    stop();
+    await later();
+    const stopped = measured.mock.calls.length;
+    root.dispatchEvent(new Event("scroll"));
+    (viewers[0]!.options.onVisiblePageChange as (a: number, b: number, c: boolean) => void)(0, 2, true);
+    await later();
+    expect(measured.mock.calls.length).toBe(stopped);
+  });
+
+  it("measures the view once for a read with no listener, which has the current view", async () => {
+    const { mounted, host } = await mount(docx());
+    const { measured } = laidOut(host);
+    const store = mounted.controllers.viewport!;
+    expect(store.get()).toEqual(seen);
+    const once = measured.mock.calls.length;
+    expect(once).toBeGreaterThan(0);
+    expect(store.get()).toEqual(seen);
+    expect(measured.mock.calls.length).toBe(2 * once);
+  });
+
+  it("has pictures and a viewport, the page count following the pages the viewer lays out", async () => {
+    const { mounted } = await mount(docx());
+    const c = mounted.controllers;
+    expect(c.pictures!.get()).toEqual({ count: 0, space: "page" });
+    (viewers[0]!.options.onVisiblePageChange as (a: number, b: number, c: boolean) => void)(0, 3, true);
+    expect(c.pictures!.get()).toEqual({ count: 3, space: "page" });
+    expect(c.viewport!.get()).toBeNull();
+    // Nothing of the second document is opened by mounting, or by asking its count.
+    expect(exported.rasters).toEqual([]);
+  });
+
+  it("draws through the second document, handing it the viewer's view for region current", async () => {
+    const { mounted } = await mount(docx());
+    (viewers[0]!.options.onVisiblePageChange as (a: number, b: number, c: boolean) => void)(0, 2, true);
+    await mounted.controllers.pictures!.raster(2, { width: 100, region: "current" });
+    const call = exported.rasters[0]!;
+    expect([call.kind, call.page, call.options.width]).toEqual(["docx", 2, 100]);
+    // No page laid out in this DOM: nothing in view.
+    expect(call.current(2, null)).toBeNull();
+  });
+
+  it("refuses a page the document has not", async () => {
+    const { mounted } = await mount(docx());
+    await expect(mounted.controllers.pictures!.raster(1, { width: 10 })).rejects.toMatchObject({ code: "invalid" });
+    expect(exported.rasters).toEqual([]);
+  });
+
+  it("gives the second document the same bytes, fresh each time", async () => {
+    const { mounted } = await mount(docx());
+    const [a, b] = [await exported.sources[0]!(), await exported.sources[0]!()];
+    expect(a).not.toBe(b);
+    expect(new Uint8Array(a).length).toBeGreaterThan(0);
+    mounted.destroy();
+  });
+
+  it("closes the second document with the session", async () => {
+    const { mounted } = await mount(docx());
+    mounted.destroy();
+    expect(exported.disposed).toEqual(["docx"]);
+  });
+});
+
+describe("a deck", () => {
+  it("counts slides from the viewer and says the slide shown whole", async () => {
+    const { mounted, host } = await mount(pptx());
+    const stage = host.querySelector(".exav-viewer-office-stage") as HTMLElement;
+    const slide = viewers[0]!.canvas!;
+    const rect = (r: [number, number, number, number]) => () => ({ left: r[0], top: r[1], width: r[2], height: r[3], right: r[0] + r[2], bottom: r[1] + r[3], x: r[0], y: r[1] }) as DOMRect;
+    stage.getBoundingClientRect = rect([0, 0, 800, 600]);
+    slide.getBoundingClientRect = rect([100, 0, 600, 600]);
+    (viewers[0]!.options.onSlideChange as (i: number, n: number) => void)(1, 5);
+    expect(mounted.controllers.pictures!.get()).toEqual({ count: 5, space: "page" });
+    await vi.waitFor(() => expect(mounted.controllers.viewport!.get()).toEqual({ space: "page", page: 2, region: { x: 0, y: 0, width: 1, height: 1 } }));
+  });
+
+  /** A deck whose stage and slide count the times they are measured. */
+  async function measuredDeck() {
+    const { mounted, host } = await mount(pptx());
+    const stage = host.querySelector(".exav-viewer-office-stage") as HTMLElement;
+    const measured = vi.fn(rectOf([0, 0, 800, 600]));
+    stage.getBoundingClientRect = measured;
+    viewers[0]!.canvas!.getBoundingClientRect = rectOf([100, 0, 600, 600]);
+    const change = (slide: number) => (viewers[0]!.options.onSlideChange as (i: number, n: number) => void)(slide, 5);
+    return { mounted, measured, change };
+  }
+
+  it("measures no view in a session that does not use the viewport", async () => {
+    const { mounted, measured, change } = await measuredDeck();
+    change(1);
+    change(2);
+    await later();
+    expect(measured).not.toHaveBeenCalled();
+    expect(mounted.controllers.pictures!.get().count).toBe(5);
+  });
+
+  it("measures the view while the viewport is followed, and stops when the last listener leaves", async () => {
+    const { mounted, measured, change } = await measuredDeck();
+    const store = mounted.controllers.viewport!;
+    const seen: unknown[] = [];
+    change(1);
+    const stop = store.subscribe((v) => seen.push(v));
+    expect(measured).toHaveBeenCalled();
+    change(2);
+    await vi.waitFor(() => expect(seen).toEqual([{ space: "page", page: 3, region: { x: 0, y: 0, width: 1, height: 1 } }]));
+    stop();
+    await later();
+    const stopped = measured.mock.calls.length;
+    change(3);
+    await later();
+    expect(measured.mock.calls.length).toBe(stopped);
+    expect(seen).toHaveLength(1);
+  });
+
+  it("measures the view for a read with no listener, which has the current slide", async () => {
+    const { mounted, change } = await measuredDeck();
+    change(3);
+    expect(mounted.controllers.viewport!.get()).toEqual({ space: "page", page: 4, region: { x: 0, y: 0, width: 1, height: 1 } });
+    change(0);
+    expect(mounted.controllers.viewport!.get()?.page).toBe(1);
+  });
+});
+
+describe("a spreadsheet", () => {
+  it("counts its sheets, hidden ones included, as the sheets controller lists them", async () => {
+    sheetNames = ["Quote", "Notes", "Hidden"];
+    const { mounted } = await mount(xlsx());
+    expect(mounted.controllers.sheets!.get().items).toHaveLength(3);
+    expect(mounted.controllers.pictures!.get()).toEqual({ count: 3, space: "page" });
+    sheetNames = ["Quote", "Notes"];
+  });
+
+  it("measures its viewport only once someone asks for it, then keeps it up to date", async () => {
+    const { mounted } = await mount(xlsx());
+    await new Promise((r) => setTimeout(r, 50));
+    expect(exported.measured).toEqual([]);
+    const seen = vi.fn();
+    mounted.controllers.viewport!.subscribe(seen);
+    await vi.waitFor(() => expect(exported.measured).toEqual([1]));
+    await vi.waitFor(() => expect(mounted.controllers.viewport!.get()?.page).toBe(1));
+    // The viewer scrolls.
+    corner = { x: -50, y: 22 };
+    (viewers[0]!.options.onViewportChange as () => void)();
+    await vi.waitFor(() => expect(exported.measured.length).toBeGreaterThan(1));
+  });
+
+  it("measures nothing in a session that does not use the viewport", async () => {
+    const { mounted } = await mount(xlsx());
+    (viewers[0]!.options.onViewportChange as () => void)();
+    (viewers[0]!.options.onScaleChange as (s: number) => void)(2);
+    (viewers[0]!.options.onSheetChange as (i: number) => void)(1);
+    await later();
+    expect(exported.measured).toEqual([]);
+    expect(mounted.controllers.sheets!.get().current).toBe(1);
+  });
+
+  it("stops measuring when the last listener leaves, and starts again with the next", async () => {
+    const { mounted } = await mount(xlsx());
+    const store = mounted.controllers.viewport!;
+    const a = store.subscribe(() => {});
+    const b = store.subscribe(() => {});
+    await vi.waitFor(() => expect(exported.measured).toEqual([1]));
+    const scroll = () => (viewers[0]!.options.onViewportChange as () => void)();
+    a();
+    scroll();
+    await vi.waitFor(() => expect(exported.measured).toEqual([1, 1]));
+    b();
+    await later();
+    scroll();
+    (viewers[0]!.options.onScaleChange as (s: number) => void)(2);
+    await later();
+    expect(exported.measured).toEqual([1, 1]);
+    store.subscribe(() => {});
+    await vi.waitFor(() => expect(exported.measured).toEqual([1, 1, 1]));
+  });
+
+  it("does not measure again for a change that came while it measured, once the last listener has left", async () => {
+    let release = () => {};
+    exported.gate = new Promise<void>((resolve) => (release = resolve));
+    const { mounted } = await mount(xlsx());
+    const stop = mounted.controllers.viewport!.subscribe(() => {});
+    await vi.waitFor(() => expect(exported.measured).toEqual([1]));
+    // The viewer scrolls while the measure is out: one more is due.
+    (viewers[0]!.options.onViewportChange as () => void)();
+    await later();
+    stop();
+    release();
+    await later();
+    expect(exported.measured).toEqual([1]);
+  });
+
+  it("measures for a read with no listener, which has the last measure, without following the viewer", async () => {
+    const { mounted } = await mount(xlsx());
+    const store = mounted.controllers.viewport!;
+    const x = () => (store.get()!.region as { x: number }).x;
+    expect(store.get()).toBeNull();
+    await later();
+    expect(exported.measured).toEqual([1]);
+    const before = x();
+    await later();
+    expect(exported.measured).toEqual([1, 1]);
+    // The viewer scrolls: not followed, so the next read has the old view and starts the measure of the new one.
+    corner = { x: -50, y: 22 };
+    (viewers[0]!.options.onViewportChange as () => void)();
+    await later();
+    expect(exported.measured).toEqual([1, 1]);
+    expect(x()).toBe(before);
+    await later();
+    expect(x()).toBeGreaterThan(before);
+    expect(exported.measured).toEqual([1, 1, 1, 1]);
+  });
+
+  it("is the sheet shown, by its number", async () => {
+    const { mounted } = await mount(xlsx());
+    current = 1;
+    (viewers[0]!.options.onSheetChange as (i: number) => void)(1);
+    mounted.controllers.viewport!.subscribe(() => {});
+    await vi.waitFor(() => expect(exported.measured).toContain(2));
+    await vi.waitFor(() => expect(mounted.controllers.viewport!.get()?.page).toBe(2));
+  });
+
+  it("draws region current only for the sheet shown", async () => {
+    const { mounted } = await mount(xlsx());
+    await mounted.controllers.pictures!.raster(1, { width: 10, region: "current" });
+    const { current: view } = exported.rasters[0]!;
+    expect(view(1, exported.grid)).toEqual({ x: 0, y: 0, width: 1, height: 1 });
+    expect(view(2, exported.grid)).toBeNull();
+  });
+
+  it("closes the second document with the session, and stops measuring", async () => {
+    const { mounted } = await mount(xlsx());
+    mounted.controllers.viewport!.subscribe(() => {});
+    await vi.waitFor(() => expect(exported.measured.length).toBe(1));
+    mounted.destroy();
+    expect(exported.disposed).toEqual(["sheet"]);
+    const before = exported.measured.length;
+    (viewers[0]!.options.onViewportChange as () => void)();
+    await new Promise((r) => setTimeout(r, 50));
+    expect(exported.measured.length).toBe(before);
+  });
+});
+
+describe("a CSV", () => {
+  it("has one sheet, drawn from its table as a workbook", async () => {
+    const { mounted } = await mount(csv(), new TextEncoder().encode("a;b\n1;2\n"));
+    expect(mounted.controllers.pictures!.get()).toEqual({ count: 1, space: "page" });
+    const workbook = new Uint8Array(await exported.sources[0]!());
+    // A ZIP: the second copy is a workbook made of the table.
+    expect([...workbook.slice(0, 4)]).toEqual([0x50, 0x4b, 0x03, 0x04]);
+    expect(mounted.controllers.sheets).toBeUndefined();
+  });
+});
diff --git a/crates/exav-viewer/ts/office/renderer.test.ts b/crates/exav-viewer/ts/office/renderer.test.ts
new file mode 100644
index 00000000..c668c429
--- /dev/null
+++ b/crates/exav-viewer/ts/office/renderer.test.ts
@@ -0,0 +1,137 @@
+/**
+ * Large decks and documents are laid out progressively by the engines (the
+ * first slides or pages show while the rest is laid out); short ones are
+ * not, and a layout that fails once something is on screen leaves it there.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { RenderContext, Status } from "../core/types.js";
+import { deckOf, documentOf } from "../test/zip-members.js";
+import { DEFAULT_MAX_ARCHIVE_ENTRIES, type OfficeOptions } from "./index.js";
+import { PROGRESSIVE_DOCUMENT_BYTES, PROGRESSIVE_SLIDES } from "./progressive.js";
+
+type Options = Record<string, unknown>;
+
+/** The options each engine was constructed with, in order. */
+const made: { engine: "pptx" | "docx"; options: Options }[] = [];
+
+/** What the engine reports to `onLayoutComplete` while it loads, if anything. */
+let duringLoad: Error | undefined;
+
+vi.mock("@silurus/ooxml/pptx", () => ({
+  PptxViewer: class {
+    constructor(_canvas: HTMLCanvasElement, options: Options) {
+      made.push({ engine: "pptx", options });
+    }
+    async load() {
+      if (duringLoad) (made.at(-1)!.options.onLayoutComplete as (e: Error) => void)(duringLoad);
+    }
+    async fitPage() {}
+    destroy() {}
+  },
+}));
+
+vi.mock("@silurus/ooxml/docx", () => ({
+  DocxScrollViewer: class {
+    constructor(_root: HTMLElement, options: Options) {
+      made.push({ engine: "docx", options });
+    }
+    async load() {}
+    getScale() {
+      return 1;
+    }
+    destroy() {}
+  },
+}));
+
+beforeEach(() => {
+  vi.stubGlobal("ResizeObserver", class { observe() {} disconnect() {} });
+  vi.spyOn(console, "warn").mockImplementation(() => {});
+});
+
+afterEach(() => {
+  made.length = 0;
+  duringLoad = undefined;
+  vi.unstubAllGlobals();
+  vi.restoreAllMocks();
+});
+
+async function mount(kind: "pptx" | "docx", bytes: Uint8Array, given: OfficeOptions = {}) {
+  const { rendererFor } = await import("./renderer.js");
+  const statuses: Status[] = [];
+  const ctx = {
+    options: given,
+    source: { bytes: async () => bytes },
+    signal: new AbortController().signal,
+    status: (s: Status) => statuses.push(s),
+  } as unknown as RenderContext<OfficeOptions>;
+  const mounted = await rendererFor(kind).mount(document.createElement("div"), ctx);
+  return { mounted, statuses, options: made.at(-1)!.options };
+}
+
+describe("a deck", () => {
+  it("is laid out progressively from PROGRESSIVE_SLIDES slides", async () => {
+    const { options } = await mount("pptx", deckOf(PROGRESSIVE_SLIDES));
+    expect(options.progressiveLayout).toBe(true);
+    expect(options.onLayoutComplete).toBeTypeOf("function");
+  });
+
+  it("is laid out whole below that", async () => {
+    const { options } = await mount("pptx", deckOf(PROGRESSIVE_SLIDES - 1));
+    expect(options.progressiveLayout).toBeUndefined();
+    expect(options.onLayoutComplete).toBeUndefined();
+  });
+
+  it("stays on screen, flagged partial, when its layout fails afterwards", async () => {
+    const { statuses, options } = await mount("pptx", deckOf(PROGRESSIVE_SLIDES));
+    expect(statuses.at(-1)).toEqual({ phase: "ready" });
+    (options.onLayoutComplete as (e?: unknown) => void)(new Error("slide 40 is damaged"));
+    expect(statuses.at(-1)).toEqual({ phase: "ready", partial: true });
+    expect(console.warn).toHaveBeenCalledWith("office: pptx", expect.any(Error));
+  });
+
+  it("is flagged partial too when its layout fails before the viewer is ready", async () => {
+    duringLoad = new Error("slide 2 is damaged");
+    const { statuses } = await mount("pptx", deckOf(PROGRESSIVE_SLIDES));
+    expect(statuses).toEqual([{ phase: "loading" }, { phase: "ready", partial: true }]);
+  });
+
+  it("is not flagged when its layout completes", async () => {
+    const { statuses, options } = await mount("pptx", deckOf(PROGRESSIVE_SLIDES));
+    (options.onLayoutComplete as (e?: unknown) => void)();
+    expect(statuses).toEqual([{ phase: "loading" }, { phase: "ready" }]);
+  });
+});
+
+describe("a document", () => {
+  it("is laid out progressively from PROGRESSIVE_DOCUMENT_BYTES of body", async () => {
+    const { options } = await mount("docx", documentOf(PROGRESSIVE_DOCUMENT_BYTES));
+    expect(options.progressiveLayout).toBe(true);
+    expect(options.onLayoutComplete).toBeTypeOf("function");
+  });
+
+  it("is laid out whole below that", async () => {
+    const { options } = await mount("docx", documentOf(PROGRESSIVE_DOCUMENT_BYTES - 1));
+    expect(options.progressiveLayout).toBeUndefined();
+  });
+
+  it("stays on screen, flagged partial, when its layout fails afterwards", async () => {
+    const { statuses, options } = await mount("docx", documentOf(PROGRESSIVE_DOCUMENT_BYTES));
+    (options.onLayoutComplete as (e?: unknown) => void)(new Error("layout failed"));
+    expect(statuses.at(-1)).toEqual({ phase: "ready", partial: true });
+  });
+});
+
+describe("the archive entry limit", () => {
+  it("is DEFAULT_MAX_ARCHIVE_ENTRIES unless the host gives one", async () => {
+    const { options } = await mount("pptx", deckOf(1));
+    expect(options.resourceLimits).toEqual({ maxArchiveEntries: DEFAULT_MAX_ARCHIVE_ENTRIES });
+  });
+
+  it("is the host's maxArchiveEntries, for decks and documents", async () => {
+    const deck = await mount("pptx", deckOf(1), { maxArchiveEntries: 50000 });
+    expect(deck.options.resourceLimits).toEqual({ maxArchiveEntries: 50000 });
+    const doc = await mount("docx", documentOf(1), { maxArchiveEntries: 50000 });
+    expect(doc.options.resourceLimits).toEqual({ maxArchiveEntries: 50000 });
+  });
+});
diff --git a/crates/exav-viewer/ts/office/renderer.ts b/crates/exav-viewer/ts/office/renderer.ts
index faf5b65f..8c160dda 100644
--- a/crates/exav-viewer/ts/office/renderer.ts
+++ b/crates/exav-viewer/ts/office/renderer.ts
@@ -1,54 +1,211 @@
-import { writable } from "../core/store.js";
-import type { PagesController, Renderer } from "../core/types.js";
+import { RasterError } from "../core/pictures.js";
+import { createPictures } from "../core/raster.js";
+import { onDemand, writable } from "../core/store.js";
+import type { Controllers, PagesController, RasterRect, Renderer, SheetsController, ViewportController, ZoomController } from "../core/types.js";
 import { readingOf } from "./delimited.js";
-import type { OfficeOptions } from "./index.js";
+import { docxExporter, pptxExporter, sheetExporter, type Current, type Exporter, type SheetExporter } from "./export.js";
+import { DEFAULT_MAX_ARCHIVE_ENTRIES, type OfficeOptions } from "./index.js";
+import { wantsProgressive } from "./progressive.js";
+import { sheetView } from "./raster.js";
 import { textSelection } from "./selection.js";
+import { xlsxOfTable } from "./table.js";
+import { docxView, perFrame, slideView, viewportStore, type View } from "./viewport.js";
 import { trimZipTail } from "./zip-tail.js";
 
 interface Engine {
   destroy(): void;
 }
 
+/** What the engines that zoom have in common. */
+interface Zoomable {
+  getScale(): number;
+  setScale(scale: number): unknown;
+}
+
+/** `run` when `el` scrolls (any box inside it) or changes size; the stop. */
+function watchBoxes(el: HTMLElement, run: () => void): () => void {
+  el.addEventListener("scroll", run, { capture: true, passive: true });
+  const observer = typeof ResizeObserver === "function" ? new ResizeObserver(run) : null;
+  observer?.observe(el);
+  return () => {
+    el.removeEventListener("scroll", run, { capture: true });
+    observer?.disconnect();
+  };
+}
+
+/** Zoom range of the sheets and of Word's pages, as multiples of 100 %. */
+const ZOOM = { min: 0.25, max: 4 };
+
+/**
+ * A zoom controller over `engine`, its state set by the engine's `onScaleChange`.
+ * The controller's scale is 1 at the fitted view. A sheet's fit is the engine's
+ * own 1; a page's is the one that fills the width (`fitBox`, the box whose
+ * resizes refit it), which the engine reports as another number.
+ */
+function zoomOver(engine: () => Zoomable | null, fit: () => unknown, fitBox?: HTMLElement) {
+  const state = writable({ scale: 1, ...ZOOM });
+  // The engine's scale at the fitted view, and the last it reported.
+  let base = 1;
+  let last = 1;
+  // The box was resized since the engine last reported: it keeps its zoom
+  // relative to the fit, so the fit moved by as much as the report says.
+  let resized = false;
+  const publish = () => state.set({ scale: last / base, min: ZOOM.min / base, max: ZOOM.max / base });
+  const observer =
+    fitBox && typeof ResizeObserver === "function"
+      ? new ResizeObserver(() => {
+          resized = true;
+          requestAnimationFrame(() => (resized = false));
+        })
+      : null;
+  observer?.observe(fitBox!);
+  const controller: ZoomController = {
+    ...state,
+    // The anchor is the engine's to choose: it zooms about the top left.
+    setScale: (scale) => {
+      const e = engine();
+      if (e && Number.isFinite(scale)) void e.setScale(Math.min(ZOOM.max, Math.max(ZOOM.min, scale * base)));
+    },
+    fit: () =>
+      void Promise.resolve(fit()).then(() => {
+        if (!fitBox) return;
+        base = last = engine()?.getScale() ?? last;
+        publish();
+      }),
+  };
+  return {
+    controller,
+    report: (scale: number) => {
+      if (!Number.isFinite(scale)) return;
+      if (resized && last > 0) base *= scale / last;
+      last = scale;
+      publish();
+    },
+    /** The view as it is now is the fitted one (a document as it opens). */
+    fitted: () => {
+      if (!fitBox) return;
+      base = last;
+      publish();
+    },
+    stop: () => observer?.disconnect(),
+  };
+}
+
 export function rendererFor(kind: "docx" | "xlsx" | "pptx" | "csv"): Renderer<OfficeOptions> {
   return {
     async mount(host, ctx) {
       ctx.status({ phase: "loading" });
       const { mode } = ctx.options;
-      const common = { useGoogleFonts: ctx.options.useGoogleFonts ?? false, ...(mode && { mode }) };
+      const common = {
+        useGoogleFonts: ctx.options.useGoogleFonts ?? false,
+        resourceLimits: { maxArchiveEntries: ctx.options.maxArchiveEntries ?? DEFAULT_MAX_ARCHIVE_ENTRIES },
+        ...(mode && { mode }),
+      };
       const root = document.createElement("div");
-      root.className = `exv-office exv-office-${kind}`;
+      root.className = `exav-viewer-office exav-viewer-office-${kind}`;
       host.append(root);
       const pages = writable<{ unit: "page" | "slide"; current: number; total: number } | null>(null);
+      const sheetState = writable<{ items: readonly { index: number; name: string }[]; current: number }>({ items: [], current: 0 });
       // Each engine reports what it painted in its own way; a document can lay
       // out completely and still reject (on an embedded object it cannot
       // decode, say), and then what reached the screen stays.
       let painted = false;
       let engine: Engine | null = null;
-      let deck: { nextSlide(): Promise<void>; prevSlide(): Promise<void> } | null = null;
+      let zoomable: Zoomable | null = null;
+      let pager: Omit<PagesController, keyof typeof pages> = {};
+      let sheets: SheetsController | null = null;
       let stopSelection: (() => void) | null = null;
       const note = (error: unknown) => console.warn(`office: ${kind}`, error);
       const canvas = (parent: HTMLElement = root) => {
         const c = document.createElement("canvas");
-        c.className = "exv-office-canvas";
+        c.className = "exav-viewer-office-canvas";
         parent.append(c);
         return c;
       };
       let stopResize: (() => void) | null = null;
-      // Whole bytes, never a URL: the engines would read a zip's directory
-      // with a range request, which neither a `blob:` URL nor many signed
-      // URLs answer.
+      // Pictures are drawn from a second copy of the document (see
+      // `export.ts`), opened by the first one. What the viewport says is read
+      // off the viewer's own boxes, and only while someone follows or reads
+      // the viewport store (`viewportController`).
+      let exporter: Exporter | null = null;
+      let currentView: () => View | null = () => null;
+      const viewport = viewportStore();
+      const refreshView = perFrame(() => viewport.publish(currentView()));
+      let stopView: (() => void) | null = null;
+      /** Listens to the viewer's scroll and size, for the viewport of a Word document. */
+      let followBoxes: (() => () => void) | null = null;
+      let sheetProbe: ((page: number) => { corner: { x: number; y: number }; scale: number; canvas: { width: number; height: number } } | null) | null = null;
+      /** Whether the viewport store has a listener. */
+      let watched = false;
+      let gone = false;
+      const requestView = () => watched && refreshView.run();
+      const requestSheet = () => watched && sheetFrame.run();
+      /** The region `region: "current"` draws: the viewport now (not the published one, which may be a frame behind). */
+      const current: Current = (page, grid) => {
+        if (grid) {
+          const probe = sheetProbe?.(page);
+          return probe ? sheetView(grid, probe.corner, probe.scale, probe.canvas) : null;
+        }
+        const view = currentView();
+        return view && view.page === page ? view.region : null;
+      };
+      const stopEverything = () => {
+        gone = true;
+        stopResize?.();
+        zoom?.stop();
+        stopSelection?.();
+        stopView?.();
+        refreshView.cancel();
+        sheetFrame.cancel();
+        void exporter?.dispose();
+      };
+      // Whole bytes, never a URL: the source already holds them, and a ZIP
+      // may need its trailing bytes cut first. Given a URL, the engines
+      // fetch the whole file again.
       const bytes = async () => {
         // A ZIP with bytes after its end record is refused by the engines'
         // strict check, and read by everything else (see `trimZipTail`).
         const b = kind === "csv" ? await ctx.source.bytes() : trimZipTail(await ctx.source.bytes());
         return b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength) as ArrayBuffer;
       };
+      // A large deck or document is laid out progressively: `load` resolves
+      // with the first slides or pages, the rest follows. If that layout
+      // then fails, what is on screen stays.
+      let mounted = false;
+      let layoutFailed = false;
+      const laidOut = (error?: unknown) => {
+        if (error === undefined) return;
+        note(error);
+        layoutFailed = true;
+        if (mounted) ctx.status({ phase: "ready", partial: true });
+      };
+      const progressive = (data: ArrayBuffer) =>
+        kind === "docx" || kind === "pptx" ? wantsProgressive(kind, new Uint8Array(data)) && { progressiveLayout: true, onLayoutComplete: laidOut } : {};
+      const zoom =
+        kind === "pptx"
+          ? null
+          : zoomOver(() => zoomable, () => (kind === "docx" ? (zoomable as { fitWidth(): void } | null)?.fitWidth() : zoomable?.setScale(1)), kind === "docx" ? root : undefined);
+      // What a sheet's viewport is redone for, while it is watched.
+      const sheetFrame = perFrame(() => measureSheetView());
+      let measureSheetView = () => {};
+      const range = {
+        zoomMin: ZOOM.min,
+        zoomMax: ZOOM.max,
+        onScaleChange: (s: number) => {
+          zoom?.report(s);
+          requestView();
+          requestSheet();
+        },
+      };
 
       try {
         if (kind === "docx") {
           const { DocxScrollViewer } = await import("@silurus/ooxml/docx");
+          const data = await bytes();
           const v = new DocxScrollViewer(root, {
             ...common,
+            ...range,
+            ...progressive(data),
             refitOnResize: true,
             // Each page's text as transparent runs over the canvas, to select
             // and copy; its hyperlinks are clicked on them.
@@ -56,46 +213,120 @@ export function rendererFor(kind: "docx" | "xlsx" | "pptx" | "csv"): Renderer<Of
             onVisiblePageChange: (top: number, total: number) => {
               painted = true;
               pages.set({ unit: "page", current: top + 1, total });
+              requestView();
             },
             onError: note,
           });
           engine = v;
+          zoomable = v;
+          pager = { goTo: (page) => void v.scrollToPage(page - 1) };
           stopSelection = textSelection(root);
-          await v.load(await bytes());
-        } else if (kind === "xlsx") {
-          const { XlsxViewer } = await import("@silurus/ooxml/xlsx");
-          // It brings its own sheet tabs, hence a container, not a canvas.
-          const v = new XlsxViewer(root, { ...common, resizable: true, onReady: () => (painted = true), onError: note });
-          engine = v;
-          await v.load(await bytes());
-        } else if (kind === "csv") {
+          exporter = docxExporter(bytes, common);
+          currentView = () => docxView(root);
+          followBoxes = () => watchBoxes(root, refreshView.run);
+          await v.load(data);
+        } else if (kind === "xlsx" || kind === "csv") {
           const { XlsxSheetViewer } = await import("@silurus/ooxml/xlsx");
-          // The bare sheet: only it reads delimited text, and a CSV is one sheet.
-          const v = new XlsxSheetViewer(canvas(), { ...common, resizable: true, onReady: () => (painted = true), onError: note });
+          // The bare sheet: its tabs are the `sheets` controller's, drawn by
+          // the UI, and only it reads delimited text.
+          const surface = canvas();
+          const v = new XlsxSheetViewer(surface, {
+            ...common,
+            ...range,
+            resizable: true,
+            onReady: () => (painted = true),
+            onSheetChange: (index: number) => {
+              sheetState.update((s) => ({ ...s, current: index }));
+              requestSheet();
+            },
+            onViewportChange: requestSheet,
+            onError: note,
+          });
           engine = v;
-          const table = await bytes();
-          await v.load(table, { format: "delimited-text", ...readingOf(table) });
+          zoomable = v;
+          // A sheet's page is its used area, which only the document's model
+          // says: the viewport is worked out (from the second copy) when
+          // someone reads or follows it, and kept up to date while it is followed.
+          const asWorkbook = async () => {
+            const table = await bytes();
+            return xlsxOfTable(table, readingOf(table)).buffer as ArrayBuffer;
+          };
+          const sheetPictures = sheetExporter(kind === "csv" ? asWorkbook : bytes, common);
+          exporter = sheetPictures;
+          sheetProbe = (page) => {
+            if (page !== (kind === "csv" ? 1 : sheetState.get().current + 1)) return null;
+            const corner = v.getCellViewportRect("A1");
+            return corner && { corner, scale: v.getScale(), canvas: { width: surface.clientWidth, height: surface.clientHeight } };
+          };
+          let measuring = false;
+          let again = false;
+          measureSheetView = () => {
+            if (gone) return;
+            if (measuring) {
+              again = watched;
+              return;
+            }
+            measuring = true;
+            const page = kind === "csv" ? 1 : sheetState.get().current + 1;
+            sheetPictures
+              .measure(page, (grid) => {
+                const probe = sheetProbe?.(page);
+                const region = probe && sheetView(grid, probe.corner, probe.scale, probe.canvas);
+                return region ? { page, region } : null;
+              })
+              .then(
+                (view) => viewport.publish(view),
+                (error) => {
+                  note(error);
+                  viewport.publish(null);
+                },
+              )
+              .finally(() => {
+                measuring = false;
+                if (again && watched && !gone) {
+                  again = false;
+                  measureSheetView();
+                }
+              });
+          };
+          if (kind === "csv") {
+            const table = await bytes();
+            await v.load(table, { format: "delimited-text", ...readingOf(table) });
+          } else {
+            await v.load(await bytes());
+            sheetState.set({ items: v.sheetNames.map((name, index) => ({ index, name })), current: v.sheetIndex });
+            sheets = { ...sheetState, select: (index) => v.goToSheet(index) };
+          }
         } else {
           const { PptxViewer } = await import("@silurus/ooxml/pptx");
+          const data = await bytes();
           // The slide is fitted into the stage and centred in it, the
           // surface around it (see the stylesheet).
           const stage = document.createElement("div");
-          stage.className = "exv-office-stage";
+          stage.className = "exav-viewer-office-stage";
           root.append(stage);
           const v = new PptxViewer(canvas(stage), {
             ...common,
+            ...progressive(data),
             // As for Word: the slide's text over it, its hyperlinks clicked on it.
             enableTextSelection: true,
             onSlideChange: (index: number, total: number) => {
               painted = true;
               pages.set({ unit: "slide", current: index + 1, total });
+              requestView();
             },
             onError: note,
           });
           engine = v;
-          deck = v;
+          pager = { goTo: (slide) => void v.goToSlide(slide - 1), next: () => v.nextSlide(), prev: () => v.prevSlide() };
           stopSelection = textSelection(root);
-          await v.load(await bytes());
+          exporter = pptxExporter(bytes, common);
+          currentView = () => {
+            const slide = stage.querySelector("canvas");
+            const now = pages.get();
+            return slide && now ? slideView(stage, slide, now.current) : null;
+          };
+          await v.load(data);
           await v.fitPage();
           // Fitted again when the stage changes size: the engine does not.
           // Only then: a fit draws the slide and its text again.
@@ -107,7 +338,7 @@ export function rendererFor(kind: "docx" | "xlsx" | "pptx" | "csv"): Renderer<Of
               const size = `${stage.clientWidth}x${stage.clientHeight}`;
               if (size === fitted) return;
               fitted = size;
-              void v.fitPage();
+              void v.fitPage().then(requestView);
             });
           });
           observer.observe(stage);
@@ -116,11 +347,15 @@ export function rendererFor(kind: "docx" | "xlsx" | "pptx" | "csv"): Renderer<Of
             observer.disconnect();
           };
         }
-        ctx.status({ phase: "ready" });
+        if (zoomable) {
+          zoom?.report(zoomable.getScale());
+          zoom?.fitted();
+        }
+        ctx.status(layoutFailed ? { phase: "ready", partial: true } : { phase: "ready" });
+        mounted = true;
       } catch (error) {
         if (ctx.signal.aborted || !painted) {
-          stopResize?.();
-          stopSelection?.();
+          stopEverything();
           engine?.destroy();
           root.remove();
           throw error;
@@ -129,18 +364,55 @@ export function rendererFor(kind: "docx" | "xlsx" | "pptx" | "csv"): Renderer<Of
         ctx.status({ phase: "ready", partial: true });
       }
 
-      const pager: PagesController = {
-        ...pages,
-        ...(deck && {
-          next: () => deck!.nextSlide(),
-          prev: () => deck!.prevSlide(),
-        }),
+      // Pictures: the pages the viewer lays out, or the sheets it lists.
+      const { controller: pictures, state: count } = createPictures({
+        count: 0,
+        space: "page",
+        raster: (page, options) => {
+          if (!exporter) throw new RasterError("unsupported", "nothing is drawn");
+          return exporter.raster(page, options, current);
+        },
+      });
+      const pageCount = () => (kind === "docx" || kind === "pptx" ? (pages.get()?.total ?? 0) : kind === "csv" ? 1 : sheetState.get().items.length);
+      const countPages = () => count.set({ count: pageCount(), space: "page" });
+      countPages();
+      const stopCount = (kind === "docx" || kind === "pptx" ? pages : sheetState).subscribe(countPages);
+
+      const isSheet = kind === "xlsx" || kind === "csv";
+      // The viewport is worked out while the store has a listener, and once
+      // for each read without one. A Word or PowerPoint view is read at once;
+      // a sheet's is measured on the second copy, so a read has the last one
+      // measured and starts the next.
+      const readView = () => (isSheet ? measureSheetView() : viewport.publish(currentView()));
+      const viewportController: ViewportController = onDemand(viewport.controller, {
+        start() {
+          if (gone) return () => {};
+          watched = true;
+          stopView = followBoxes?.() ?? null;
+          readView();
+          return () => {
+            watched = false;
+            stopView?.();
+            stopView = null;
+            refreshView.cancel();
+            sheetFrame.cancel();
+          };
+        },
+        once: () => !gone && readView(),
+      });
+
+      const controllers: Controllers = {
+        ...((kind === "docx" || kind === "pptx") && { pages: { ...pages, ...pager } }),
+        ...(zoom && { zoom: zoom.controller }),
+        ...(sheets && { sheets }),
+        ...(exporter && { pictures, viewport: viewportController }),
       };
       return {
-        controllers: kind === "docx" || kind === "pptx" ? { pages: pager } : {},
+        controllers,
         destroy() {
-          stopResize?.();
-          stopSelection?.();
+          gone = true;
+          stopCount();
+          stopEverything();
           engine?.destroy();
           // The canvases are ours; `destroy` leaves them.
           root.remove();
diff --git a/crates/exav-viewer/ts/office/route.ts b/crates/exav-viewer/ts/office/route.ts
new file mode 100644
index 00000000..a2bfb494
--- /dev/null
+++ b/crates/exav-viewer/ts/office/route.ts
@@ -0,0 +1,39 @@
+/** Which converter takes a file: kept apart from the converters, so that the plugins' definitions load none of them. */
+import type { ConversionOptions, ConvertedFormat } from "./index.js";
+
+/** The package's own converter each kind goes to first, where it does. */
+export type Native = "sheets" | "slides" | "docs";
+
+const NATIVE: Partial<Record<ConvertedFormat, Native>> = {
+  xls: "sheets",
+  ods: "sheets",
+  numbers: "sheets",
+  ppt: "slides",
+  odp: "slides",
+  keynote: "slides",
+  odg: "slides",
+  // Visio 2013 and later (.vsdx); a binary .vsd is not recognised and goes on.
+  visio: "slides",
+  doc: "docs",
+  odt: "docs",
+  rtf: "docs",
+};
+
+/**
+ * Which of the package's converters a file of `kind` goes to first, if any:
+ * none with `converter: "external"`; text documents only with `converter:
+ * "exav"`, or where no external converter is set, since the external one
+ * is better at them where there is one.
+ */
+export function nativeFirst(kind: ConvertedFormat, options: ConversionOptions): Native | null {
+  const native = NATIVE[kind] ?? null;
+  if (!native || options.converter === "external") return null;
+  if (native === "docs") return options.converter === "exav" || options.externalConverter === undefined ? "docs" : null;
+  return native;
+}
+
+/** Whether a file of `kind` goes to exav-render's `slides` first. */
+export const slidesFirst = (kind: ConvertedFormat, options: ConversionOptions) => nativeFirst(kind, options) === "slides";
+
+/** Whether a file of `kind` goes to exav-render's `docs` first. */
+export const docsFirst = (kind: ConvertedFormat, options: ConversionOptions) => nativeFirst(kind, options) === "docs";
diff --git a/crates/exav-viewer/ts/office/selection.test.ts b/crates/exav-viewer/ts/office/selection.test.ts
index 81ef0187..98ddd851 100644
--- a/crates/exav-viewer/ts/office/selection.test.ts
+++ b/crates/exav-viewer/ts/office/selection.test.ts
@@ -133,11 +133,11 @@ describe("textSelection", () => {
     const surface = root.firstElementChild!;
     // A press elsewhere: no cover.
     root.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
-    expect(root.querySelector(".exv-office-text-end")).toBeNull();
+    expect(root.querySelector(".exav-viewer-office-text-end")).toBeNull();
     runs[0]!.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
-    expect(surface.firstElementChild?.className).toBe("exv-office-text-end");
+    expect(surface.firstElementChild?.className).toBe("exav-viewer-office-text-end");
     document.dispatchEvent(new Event("pointerup"));
-    expect(root.querySelector(".exv-office-text-end")).toBeNull();
+    expect(root.querySelector(".exav-viewer-office-text-end")).toBeNull();
     stop();
   });
 
@@ -158,8 +158,8 @@ describe("textSelection", () => {
     document.body.append(root);
     const stop = textSelection(root);
     shapes[0]!.firstElementChild!.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
-    for (const holder of [surface, ...shapes]) expect(holder.firstElementChild?.className).toBe("exv-office-text-end");
-    expect(root.querySelectorAll(".exv-office-text-end")).toHaveLength(3);
+    for (const holder of [surface, ...shapes]) expect(holder.firstElementChild?.className).toBe("exav-viewer-office-text-end");
+    expect(root.querySelectorAll(".exav-viewer-office-text-end")).toHaveLength(3);
     stop();
   });
 });
diff --git a/crates/exav-viewer/ts/office/selection.ts b/crates/exav-viewer/ts/office/selection.ts
index 43a31a8e..4c9d5842 100644
--- a/crates/exav-viewer/ts/office/selection.ts
+++ b/crates/exav-viewer/ts/office/selection.ts
@@ -24,7 +24,7 @@ export function textSelection(root: HTMLElement): () => void {
     for (const run of root.querySelectorAll("[data-ooxml-selection-run]")) if (run.parentElement) holders.add(run.parentElement);
     for (const holder of holders) {
       const cover = doc.createElement("div");
-      cover.className = "exv-office-text-end";
+      cover.className = "exav-viewer-office-text-end";
       // First: the runs after it are drawn, and hit, above it.
       holder.prepend(cover);
       covers.push(cover);
diff --git a/crates/exav-viewer/ts/office/sheets.test.ts b/crates/exav-viewer/ts/office/sheets.test.ts
new file mode 100644
index 00000000..a6d687e2
--- /dev/null
+++ b/crates/exav-viewer/ts/office/sheets.test.ts
@@ -0,0 +1,205 @@
+/**
+ * Spreadsheets go to exav-render's `sheets` by their bytes; to the external
+ * converter only what it does not recognise, or everything when the options
+ * say so.
+ */
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import type { RenderContext } from "../core/types.js";
+import type { ConversionOptions } from "./index.js";
+import { SheetConversionError, sniffSheet } from "./sheets.js";
+
+const bytes = (...parts: (string | number[])[]) =>
+  new Uint8Array(parts.flatMap((p) => (typeof p === "string" ? [...p].map((c) => c.charCodeAt(0)) : p)));
+
+/** A ZIP's first local header (30 bytes), then `rest`. */
+const zip = (rest: string) => bytes([0x50, 0x4b, 0x03, 0x04, ...new Array(26).fill(0)], rest);
+
+describe("what the bytes are", () => {
+  it("reads compound files and BIFF2 to BIFF4 worksheets as XLS", () => {
+    expect(sniffSheet(bytes([0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1]))).toBe("xls");
+    expect(sniffSheet(bytes([0x09, 0x00, 0x04, 0x00, 0x02, 0x00, 0x10, 0x00]))).toBe("xls");
+    expect(sniffSheet(bytes([0x09, 0x04, 0x06, 0x00, 0x00, 0x00, 0x10, 0x00]))).toBe("xls");
+  });
+
+  it("tells the packages apart by their members", () => {
+    expect(sniffSheet(zip("mimetypeapplication/vnd.oasis.opendocument.spreadsheet"))).toBe("ods");
+    expect(sniffSheet(zip("mimetypeapplication/vnd.oasis.opendocument.text"))).toBeNull();
+    // A deflated mimetype: the members tell.
+    const deflated = zip("mimetype\u0005Á\u0081 ... content.xml");
+    deflated[8] = 8;
+    expect(sniffSheet(deflated)).toBe("ods");
+    expect(sniffSheet(zip("[Content_Types].xml ... xl/workbook.xml"))).toBe("xlsx");
+    expect(sniffSheet(zip("Index/Document.iwa Index/Tables/Tile.iwa"))).toBe("numbers");
+    expect(sniffSheet(zip("Doc.numbers/Index.zip"))).toBe("numbers");
+    // Numbers '08 and '09.
+    expect(sniffSheet(zip("QuickLook/Thumbnail.jpg index.xml"))).toBe("numbers");
+    expect(sniffSheet(zip("Doc.numbers/index.xml.gz"))).toBe("numbers");
+    expect(sniffSheet(zip("word/document.xml"))).toBeNull();
+  });
+
+  it("reads flat OpenDocument and the text formats Excel opens, nothing else as text", () => {
+    const fods = '<?xml version="1.0"?>\n<office:document office:mimetype="application/vnd.oasis.opendocument.spreadsheet">';
+    expect(sniffSheet(bytes(fods))).toBe("fods");
+    expect(sniffSheet(bytes("\n<HTML><table>"))).toBe("html");
+    expect(sniffSheet(bytes("<table border=1><tr>"))).toBe("html");
+    const ssml = '<?xml version="1.0"?>\n<?mso-application progid="Excel.Sheet"?>\n<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40">';
+    expect(sniffSheet(bytes(ssml))).toBe("xml");
+    // UTF-16, as some exports are.
+    const utf16 = new Uint8Array([0xff, 0xfe, ...[...ssml].flatMap((c) => [c.charCodeAt(0), 0])]);
+    expect(sniffSheet(utf16)).toBe("xml");
+    expect(sniffSheet(bytes("ID;PWXL;N;E\r\nC;Y1;X1;K1\r\nE\r\n"))).toBe("slk");
+    expect(sniffSheet(bytes("ID,Name\n1,Ann"))).toBeNull();
+    expect(sniffSheet(bytes("a,b,c\n1,2,3"))).toBeNull();
+    expect(sniffSheet(bytes("<?xml version=\"1.0\"?><svg/>"))).toBeNull();
+    expect(sniffSheet(new Uint8Array())).toBeNull();
+  });
+});
+
+const convertSheet = vi.fn();
+vi.mock("./sheets.js", async (original) => ({ ...(await original<typeof import("./sheets.js")>()), convertSheet: (...a: unknown[]) => convertSheet(...a) }));
+
+// The external converter, a function the tests answer for.
+const convertExternal = vi.fn();
+vi.mock("./external.js", async (original) => ({
+  ...(await original<typeof import("./external.js")>()),
+  externalUrl: async (spec: string) => `https://converter.test/${spec}`,
+  loadExternal: async () => ({ convert: (...a: unknown[]) => convertExternal(...a) }),
+}));
+
+afterEach(() => {
+  convertSheet.mockReset();
+  convertExternal.mockReset();
+});
+
+/** A context over `data`, with an external converter set or not. */
+function context(data: Uint8Array, options: ConversionOptions, external: boolean) {
+  const nested = vi.fn(() => ({ resize() {}, destroy() {} }));
+  const statuses: unknown[] = [];
+  const ctx = {
+    file: { id: "f", name: "a.xls" },
+    options: { ...options, ...(external && { externalConverter: "ext" }) },
+    source: { bytes: async () => data },
+    signal: new AbortController().signal,
+    assetBase: "/assets/",
+    status: (s: unknown) => statuses.push(s),
+    controllers() {},
+    mountNested: nested,
+  } as unknown as RenderContext<ConversionOptions>;
+  return { ctx, nested, statuses };
+}
+
+const XLS = bytes([0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1]);
+
+describe("a spreadsheet opened", () => {
+  it("is converted by exav-render's sheets and shown as XLSX", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertSheet.mockResolvedValue({ xlsx: new Uint8Array([1, 2, 3]).buffer, warnings: "" });
+    const { ctx, nested, statuses } = context(XLS, {}, false);
+    await rendererFor("xls").mount(document.createElement("div"), ctx);
+    expect(convertSheet).toHaveBeenCalledWith(XLS, "xls", expect.objectContaining({ signal: ctx.signal }));
+    const [, file] = nested.mock.calls[0] as unknown as [unknown, { format: string; source: { bytes: Uint8Array } }];
+    expect(file.format).toBe("xlsx");
+    expect([...file.source.bytes]).toEqual([1, 2, 3]);
+    expect(statuses).toContainEqual({ phase: "converting", step: "convert" });
+  });
+
+  /** The error `mount` fails with. */
+  const failure = async (kind: "xls" | "ods", ctx: RenderContext<ConversionOptions>) => {
+    const { rendererFor } = await import("./convert.js");
+    return Promise.resolve(rendererFor(kind).mount(document.createElement("div"), ctx)).then(
+      () => null,
+      (e: unknown) => e,
+    );
+  };
+
+  it("fails with its converter's error and its kind, an external converter set or not", async () => {
+    for (const [reason, kind] of [
+      ["encrypted", "encrypted"],
+      ["too-large", "too-large"],
+      ["malformed", "malformed"],
+      ["unsupported", "unsupported"],
+      ["no answer within 120000 ms", "timeout"],
+      ["unreachable", "crashed"],
+    ]) {
+      for (const external of [false, true]) {
+        convertSheet.mockRejectedValue(new Error(reason));
+        const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+        const { ctx, nested } = context(XLS, {}, external);
+        const error = await failure("xls", ctx);
+        expect(error, `${reason}, external ${external}`).toBeInstanceOf(SheetConversionError);
+        expect((error as SheetConversionError).kind).toBe(kind);
+        expect((error as SheetConversionError).format).toBe("xls");
+        expect(nested).not.toHaveBeenCalled();
+        // The external converter never got the file.
+        expect(convertExternal).not.toHaveBeenCalled();
+        warn.mockRestore();
+      }
+    }
+  });
+
+  it("converts the text formats Excel opens from a .xls", async () => {
+    const { rendererFor } = await import("./convert.js");
+    for (const [text, format] of [
+      ["<html><table><tr><td>1</td></tr></table></html>", "html"],
+      ["ID;PWXL\nC;Y1;X1;K1\nE\n", "slk"],
+    ]) {
+      convertSheet.mockResolvedValue({ xlsx: new Uint8Array([1]).buffer, warnings: "" });
+      const data = bytes(text!);
+      const { ctx, nested } = context(data, {}, true);
+      await rendererFor("xls").mount(document.createElement("div"), ctx);
+      expect(convertSheet).toHaveBeenLastCalledWith(data, format, expect.anything());
+      expect(nested).toHaveBeenCalled();
+    }
+  });
+
+  const DIF = bytes('TABLE\r\n0,1\r\n""\r\nVECTORS\r\n0,1\r\n""\r\n');
+
+  it("goes to the external converter only with what it does not recognise", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "xlsx", bytes: new Uint8Array([9]) });
+    const { ctx, nested } = context(DIF, {}, true);
+    await rendererFor("xls").mount(document.createElement("div"), ctx);
+    expect(convertSheet).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalledWith(DIF, expect.objectContaining({ hint: "xls" }));
+    expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("xlsx");
+  });
+
+  it("ends in the needs-converter error with what it does not recognise and no external converter", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const { ctx, nested, statuses } = context(DIF, {}, false);
+    await rendererFor("xls").mount(document.createElement("div"), ctx);
+    const error = statuses.at(-1) as { phase: string; error: { code: string; cause: { kind: string; format: string } } };
+    expect(error.phase).toBe("error");
+    expect(error.error.code).toBe("needs_converter");
+    expect(error.error.cause).toMatchObject({ kind: "needs-converter", format: "xls" });
+    expect(convertSheet).not.toHaveBeenCalled();
+    expect(nested).not.toHaveBeenCalled();
+  });
+
+  it("is shown as it is when it is an XLSX under another name", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const data = zip("[Content_Types].xml xl/workbook.xml");
+    const { ctx, nested } = context(data, {}, false);
+    await rendererFor("ods").mount(document.createElement("div"), ctx);
+    expect(convertSheet).not.toHaveBeenCalled();
+    expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("xlsx");
+  });
+
+  it("goes to the external converter alone when the options say so", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "xlsx", bytes: new Uint8Array([9]) });
+    const { ctx } = context(XLS, { converter: "external" }, true);
+    await rendererFor("xls").mount(document.createElement("div"), ctx);
+    expect(convertSheet).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalledWith(XLS, expect.objectContaining({ hint: "xls" }));
+  });
+
+  it("ends in the needs-converter error when the options ask for an external converter and there is none", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const { ctx, statuses } = context(XLS, { converter: "external" }, false);
+    await rendererFor("xls").mount(document.createElement("div"), ctx);
+    expect((statuses.at(-1) as { error: { code: string } }).error.code).toBe("needs_converter");
+    expect(convertSheet).not.toHaveBeenCalled();
+  });
+});
diff --git a/crates/exav-viewer/ts/office/sheets.ts b/crates/exav-viewer/ts/office/sheets.ts
new file mode 100644
index 00000000..92f1ab81
--- /dev/null
+++ b/crates/exav-viewer/ts/office/sheets.ts
@@ -0,0 +1,138 @@
+/**
+ * XLS, ODS, FODS, Numbers, and the text formats Excel opens from a .xls
+ * file (XML Spreadsheet 2003, HTML tables, SYLK), converted to XLSX by
+ * exav-render's `sheets` (exav_viewer_sheets.wasm), in a worker of its own for
+ * this one file, terminated when it is done: a wasm instance's memory never
+ * shrinks.
+ */
+import { createWorkerHost, type WorkerHost } from "../core/worker-host.js";
+
+/** What the converter reads: "xml" is Excel's XML Spreadsheet 2003, "slk" SYLK. */
+export type SheetFormat = "xls" | "ods" | "fods" | "numbers" | "xml" | "html" | "slk";
+
+export interface SheetRequest {
+  bytes: ArrayBuffer;
+  format: SheetFormat;
+  maxCells: number;
+  maxMemory: number;
+}
+
+export interface SheetResult {
+  xlsx: ArrayBuffer;
+  warnings: string;
+}
+
+/**
+ * Why a conversion failed: the converter's error kinds, "timeout" when it
+ * did not answer in time, "crashed" when its module trapped.
+ */
+export type SheetErrorKind = "not-format" | "encrypted" | "unsupported" | "too-large" | "malformed" | "timeout" | "crashed";
+
+const KINDS: readonly string[] = ["not-format", "encrypted", "unsupported", "too-large", "malformed"];
+
+/** A spreadsheet exav-render's `sheets` recognised and could not convert. */
+export class SheetConversionError extends Error {
+  readonly kind: SheetErrorKind;
+  constructor(
+    readonly format: SheetFormat,
+    cause: unknown,
+  ) {
+    const reason = cause instanceof Error ? cause.message : String(cause);
+    const kind: SheetErrorKind = KINDS.includes(reason) ? (reason as SheetErrorKind) : /^no answer within/.test(reason) ? "timeout" : "crashed";
+    super(`the ${format} file could not be converted: ${kind}`, { cause });
+    this.name = "SheetConversionError";
+    this.kind = kind;
+  }
+}
+
+/** Cells and memory a conversion may take: the converter's defaults. */
+export const SHEET_LIMITS = { maxCells: 4_000_000, maxMemory: 1 << 30 };
+
+/** The module may grow to 2 GiB; the converter's own count leaves room for the file and the output. */
+const MAX_MEMORY = 1.5 * 2 ** 30;
+
+const ascii = (bytes: Uint8Array, at: number, text: string) => {
+  if (at + text.length > bytes.length) return false;
+  for (let i = 0; i < text.length; i++) if (bytes[at + i] !== text.charCodeAt(i)) return false;
+  return true;
+};
+
+const contains = (bytes: Uint8Array, from: number, to: number, text: string) => {
+  const first = text.charCodeAt(0);
+  for (let i = Math.max(0, from); i <= Math.min(bytes.length, to) - text.length; i++) {
+    if (bytes[i] === first && ascii(bytes, i, text)) return true;
+  }
+  return false;
+};
+
+/**
+ * The start of a text document as ASCII, lower case: UTF-16 by its BOM
+ * read a byte in two, a UTF-8 BOM and leading white space skipped.
+ */
+function textHead(bytes: Uint8Array, n = 4096): string {
+  let step = 1;
+  let at = 0;
+  if ((bytes[0] === 0xff && bytes[1] === 0xfe) || (bytes[0] === 0xfe && bytes[1] === 0xff)) {
+    step = 2;
+    at = bytes[0] === 0xff ? 2 : 3;
+  } else if (bytes[0] === 0xef && bytes[1] === 0xbb && bytes[2] === 0xbf) at = 3;
+  let s = "";
+  for (let i = at; i < bytes.length && s.length < n; i += step) s += String.fromCharCode(bytes[i]! < 0x80 ? bytes[i]! : 0x3f);
+  return s.trimStart().toLowerCase();
+}
+
+/**
+ * What the bytes are: a spreadsheet the converter reads, an XLSX shown as
+ * it is, or `null` for anything else (left to the external converter, which
+ * may read more: CSV, DIF, dBase and the like saved as .xls).
+ */
+export function sniffSheet(bytes: Uint8Array): SheetFormat | "xlsx" | null {
+  // A compound file, or a BIFF2 to BIFF4 worksheet's BOF record.
+  if (bytes[0] === 0xd0 && bytes[1] === 0xcf && bytes[2] === 0x11 && bytes[3] === 0xe0) return "xls";
+  if (bytes[0] === 0x09 && [0x00, 0x02, 0x04].includes(bytes[1]!) && bytes[2]! < 0x20 && bytes[3] === 0) return "xls";
+  if (bytes[0] === 0x50 && bytes[1] === 0x4b) {
+    // OpenDocument: the stored "mimetype" member first.
+    // Stored, as the specification asks; a deflated one (some tools zip it
+    // so) is told by the members below.
+    const stored = bytes[8] === 0 && bytes[9] === 0;
+    if (ascii(bytes, 30, "mimetype") && stored) return contains(bytes, 38, 120, "spreadsheet") ? "ods" : null;
+    // The central directory, at the end, names the members.
+    const from = bytes.length - (1 << 20);
+    if (contains(bytes, from, bytes.length, "[Content_Types].xml") && contains(bytes, from, bytes.length, "xl/")) return "xlsx";
+    if (contains(bytes, from, bytes.length, ".iwa") || contains(bytes, from, bytes.length, "Index.zip")) return "numbers";
+    // Numbers '08 and '09: index.xml, or index.xml.gz.
+    if (contains(bytes, from, bytes.length, "index.xml")) return "numbers";
+    if (contains(bytes, from, bytes.length, "content.xml")) return "ods";
+    return null;
+  }
+  // Flat OpenDocument, after a BOM and an XML declaration.
+  if (contains(bytes, 0, 2048, "office:document") && contains(bytes, 0, 4096, "opendocument.spreadsheet")) return "fods";
+  // The text formats Excel opens whatever their name says.
+  const head = textHead(bytes);
+  if (head.startsWith("id;")) return "slk";
+  if (head.includes("urn:schemas-microsoft-com:office:spreadsheet") && head.includes("workbook") && !head.includes("<html")) return "xml";
+  if (/<(html|table|!doctype html)[\s>]/.test(head)) return "html";
+  return null;
+}
+
+/** Converts in a worker; `signal` (the session's) stops it at once. */
+export async function convertSheet(
+  bytes: Uint8Array,
+  format: SheetFormat,
+  options: { signal?: AbortSignal; timeoutMs?: number; maxMemory?: number } = {},
+): Promise<SheetResult> {
+  const host: WorkerHost<SheetRequest, SheetResult> = createWorkerHost(
+    () => new Worker(new URL("./sheets.worker.js", import.meta.url), { type: "module" }),
+  );
+  const stop = () => host.destroy();
+  options.signal?.addEventListener("abort", stop, { once: true });
+  try {
+    // A copy: the caller keeps its bytes.
+    const copy = bytes.slice().buffer as ArrayBuffer;
+    const maxMemory = Math.min(options.maxMemory ?? SHEET_LIMITS.maxMemory, MAX_MEMORY);
+    return await host.call({ bytes: copy, format, maxCells: SHEET_LIMITS.maxCells, maxMemory }, [copy], options.timeoutMs ?? 120_000);
+  } finally {
+    options.signal?.removeEventListener("abort", stop);
+    host.destroy();
+  }
+}
diff --git a/crates/exav-viewer/ts/office/sheets.worker.ts b/crates/exav-viewer/ts/office/sheets.worker.ts
new file mode 100644
index 00000000..79afc1fa
--- /dev/null
+++ b/crates/exav-viewer/ts/office/sheets.worker.ts
@@ -0,0 +1,22 @@
+// exav-render's sheets module (exav_viewer_sheets.wasm): the page gets back the XLSX.
+import init, { convertSheets } from "../../wasm/exav_viewer_sheets.js";
+
+import { serve } from "../core/worker-host.js";
+import type { SheetRequest, SheetResult } from "./sheets.js";
+
+let ready: Promise<unknown> | null = null;
+
+serve<SheetRequest, SheetResult>(async ({ bytes, format, maxCells, maxMemory }) => {
+  ready ??= init();
+  await ready;
+  const converted = convertSheets(new Uint8Array(bytes), format, maxCells, maxMemory);
+  try {
+    const xlsx = converted.takeXlsx();
+    return {
+      value: { xlsx: xlsx.buffer as ArrayBuffer, warnings: converted.warnings },
+      transfer: [xlsx.buffer as ArrayBuffer],
+    };
+  } finally {
+    converted.free();
+  }
+});
diff --git a/crates/exav-viewer/ts/office/slides.test.ts b/crates/exav-viewer/ts/office/slides.test.ts
new file mode 100644
index 00000000..471db672
--- /dev/null
+++ b/crates/exav-viewer/ts/office/slides.test.ts
@@ -0,0 +1,250 @@
+/**
+ * Presentations and OpenDocument drawings go to exav-render's `slides` by
+ * their bytes; to the external converter what it does not recognise, or
+ * everything when the options say so.
+ */
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import type { RenderContext } from "../core/types.js";
+import type { ConversionOptions } from "./index.js";
+import { SlideConversionError, sniffSlides } from "./slides.js";
+
+const bytes = (...parts: (string | number[])[]) =>
+  new Uint8Array(parts.flatMap((p) => (typeof p === "string" ? [...p].map((c) => c.charCodeAt(0)) : p)));
+
+const utf16 = (s: string) => [...s].flatMap((c) => [c.charCodeAt(0), 0]);
+
+/** A ZIP's first local header (30 bytes), then `rest`. */
+const zip = (rest: string) => bytes([0x50, 0x4b, 0x03, 0x04, ...new Array(26).fill(0)], rest);
+
+const CFB = [0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1];
+
+/** A compound file directory entry: the name padded to 64 bytes, its length with the terminator, the type. */
+const entry = (name: string, type = 2) => {
+  const units = utf16(name);
+  return [...units, ...new Array(64 - units.length).fill(0), (name.length + 1) * 2, 0, type, 0];
+};
+
+const PPT = bytes(CFB, entry("Current User"), entry("PowerPoint Document"));
+
+describe("what the bytes are", () => {
+  it("reads compound files with a PowerPoint stream as PPT, whatever its version", () => {
+    expect(sniffSlides(PPT)).toBe("ppt");
+    // PowerPoint 95 has no "Current User" stream of that kind; PowerPoint 4 has a "PP40" stream.
+    expect(sniffSlides(bytes(CFB, entry("PowerPoint Document")))).toBe("ppt");
+    expect(sniffSlides(bytes(CFB, entry("PP40")))).toBe("ppt");
+    // A workbook is not one, nor is a file that only mentions the name.
+    expect(sniffSlides(bytes(CFB, entry("Workbook")))).toBeNull();
+    expect(sniffSlides(bytes(CFB, utf16("PowerPoint Document")))).toBeNull();
+    expect(sniffSlides(bytes(CFB, entry("PP40", 0)))).toBeNull();
+    // Names compare without regard to ASCII case, as the converter's reader does.
+    expect(sniffSlides(bytes(CFB, entry("PowerPoint DocUment")))).toBe("ppt");
+    expect(sniffSlides(bytes(CFB, entry("pp40")))).toBe("ppt");
+  });
+
+  it("reads PowerPoint 2 to 4 files, Windows and Macintosh, and their BinHex text", () => {
+    expect(sniffSlides(bytes([0xed, 0xde, 0xad, 0x0b, 2, 0, 0, 0]))).toBe("ppt");
+    expect(sniffSlides(bytes([0x0b, 0xad, 0xde, 0xed, 0, 0, 0, 3]))).toBe("ppt");
+    // The header of a BinHex 4.0 file named "powerpoint", type SLDS, creator PPNT.
+    const banner = "(This file must be converted with BinHex 4.0)\r\r:";
+    expect(sniffSlides(bytes(banner + `#R"[Gf9bF'pTER3!8da%8e"36P3!!!!!#DB!!!!!`))).toBe("ppt");
+    // A text file named "other", type TEXT, creator ttxt.
+    expect(sniffSlides(bytes(banner + `"@pdD'9b!&4&@&4dG(Kd!!!!!!QQ!!!!!!`))).toBeNull();
+    expect(sniffSlides(bytes("(not binhex)"))).toBeNull();
+  });
+
+  it("tells the packages apart by their members", () => {
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.presentation"))).toBe("odp");
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.presentation-template"))).toBe("odp");
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.text"))).toBeNull();
+    expect(sniffSlides(zip("[Content_Types].xml ... ppt/presentation.xml"))).toBe("pptx");
+    expect(sniffSlides(zip("Index/Document.iwa Index/Slide-1.iwa Index/MasterSlide.iwa"))).toBe("key");
+    expect(sniffSlides(zip("Doc.key/Index.zip"))).toBe("key");
+    // Keynote 1 to 5: XML, gzipped or not.
+    expect(sniffSlides(zip("index.apxl.gz"))).toBe("key");
+    expect(sniffSlides(zip("Contents/PkgInfo index.apxl"))).toBe("key");
+    expect(sniffSlides(zip("presentation.apxl"))).toBe("key");
+    expect(sniffSlides(zip("Index/Document.iwa Index/Tables/Tile.iwa"))).toBeNull();
+    expect(sniffSlides(zip("index.xml.gz"))).toBeNull();
+  });
+
+  it("reads flat OpenDocument presentations, and nothing else as text", () => {
+    const fodp = '<?xml version="1.0"?>\n<office:document office:mimetype="application/vnd.oasis.opendocument.presentation">';
+    expect(sniffSlides(bytes(fodp))).toBe("fodp");
+    expect(sniffSlides(bytes("<html><body>"))).toBeNull();
+    expect(sniffSlides(new Uint8Array())).toBeNull();
+  });
+
+  it("reads a Visio 2013 package by its visio/ directory, and not a PPTX or a binary Visio file", () => {
+    expect(sniffSlides(zip("[Content_Types].xml visio/document.xml visio/pages/page1.xml"))).toBe("vsdx");
+    expect(sniffSlides(zip("[Content_Types].xml ppt/presentation.xml"))).toBe("pptx");
+    expect(sniffSlides(zip("[Content_Types].xml word/document.xml"))).toBeNull();
+    expect(sniffSlides(bytes("Visio (TM) Drawing\r\n"))).toBeNull();
+  });
+
+  it("reads OpenDocument drawings, packaged or flat, and OpenOffice 1.x's media type", () => {
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.graphics"))).toBe("odg");
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.graphics-template"))).toBe("odg");
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.drawing"))).toBe("odg");
+    expect(sniffSlides(zip("mimetypeapplication/vnd.oasis.opendocument.text"))).toBeNull();
+    const fodg = '<?xml version="1.0"?>\n<office:document office:mimetype="application/vnd.oasis.opendocument.graphics">';
+    expect(sniffSlides(bytes(fodg))).toBe("fodg");
+    expect(sniffSlides(bytes(fodg.replace("graphics", "drawing")))).toBe("fodg");
+    expect(sniffSlides(bytes('<office:document office:mimetype="application/vnd.oasis.opendocument.text">'))).toBeNull();
+  });
+});
+
+const convertSlides = vi.fn();
+vi.mock("./slides.js", async (original) => ({ ...(await original<typeof import("./slides.js")>()), convertSlides: (...a: unknown[]) => convertSlides(...a) }));
+
+// The external converter, a function the tests answer for.
+const convertExternal = vi.fn();
+vi.mock("./external.js", async (original) => ({
+  ...(await original<typeof import("./external.js")>()),
+  externalUrl: async (spec: string) => `https://converter.test/${spec}`,
+  loadExternal: async () => ({ convert: (...a: unknown[]) => convertExternal(...a) }),
+}));
+
+afterEach(() => {
+  convertSlides.mockReset();
+  convertExternal.mockReset();
+});
+
+/** A context over `data`, with an external converter set or not. */
+function context(data: Uint8Array, options: ConversionOptions, external: boolean) {
+  const nested = vi.fn(() => ({ resize() {}, destroy() {} }));
+  const statuses: unknown[] = [];
+  const ctx = {
+    file: { id: "f", name: "a.ppt" },
+    options: { ...options, ...(external && { externalConverter: "ext" }) },
+    source: { bytes: async () => data },
+    signal: new AbortController().signal,
+    assetBase: "/assets/",
+    status: (s: unknown) => statuses.push(s),
+    controllers() {},
+    mountNested: nested,
+  } as unknown as RenderContext<ConversionOptions>;
+  return { ctx, nested, statuses };
+}
+
+/** The error `mount` fails with. */
+const failure = async (kind: "ppt" | "odp" | "keynote" | "odg", ctx: RenderContext<ConversionOptions>) => {
+  const { rendererFor } = await import("./convert.js");
+  return Promise.resolve(rendererFor(kind).mount(document.createElement("div"), ctx)).then(
+    () => null,
+    (e: unknown) => e,
+  );
+};
+
+describe("a presentation opened", () => {
+  it("is converted by exav-render's slides and shown as PPTX", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertSlides.mockResolvedValue({ pptx: new Uint8Array([1, 2, 3]).buffer, slides: 1, warnings: "" });
+    const { ctx, nested, statuses } = context(PPT, {}, false);
+    await rendererFor("ppt").mount(document.createElement("div"), ctx);
+    expect(convertSlides).toHaveBeenCalledWith(PPT, "ppt", expect.objectContaining({ signal: ctx.signal }));
+    const [, file] = nested.mock.calls[0] as unknown as [unknown, { format: string; source: { bytes: Uint8Array } }];
+    expect(file.format).toBe("pptx");
+    expect([...file.source.bytes]).toEqual([1, 2, 3]);
+    expect(statuses).toContainEqual({ phase: "converting", step: "convert" });
+  });
+
+  it("fails with its converter's error and its kind when it recognised the file and could not read it", async () => {
+    for (const [reason, kind] of [
+      ["encrypted", "encrypted"],
+      ["too-large", "too-large"],
+      ["malformed", "malformed"],
+      ["unsupported", "unsupported"],
+      ["not-format", "not-format"],
+      ["no answer within 120000 ms", "timeout"],
+      ["unreachable", "crashed"],
+    ]) {
+      convertSlides.mockRejectedValue(new Error(reason));
+      // With an external converter set, as without: it never gets the file.
+      for (const external of [true, false]) {
+        const { ctx, nested } = context(PPT, {}, external);
+        const error = await failure("ppt", ctx);
+        expect(error, reason).toBeInstanceOf(SlideConversionError);
+        expect((error as SlideConversionError).kind).toBe(kind);
+        expect(nested).not.toHaveBeenCalled();
+        expect(convertExternal).not.toHaveBeenCalled();
+      }
+    }
+  });
+
+  it("is converted as a drawing, a page to a slide, when it is an OpenDocument drawing", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertSlides.mockResolvedValue({ pptx: new Uint8Array([7]).buffer, slides: 2, warnings: "" });
+    for (const [data, format] of [
+      [zip("mimetypeapplication/vnd.oasis.opendocument.graphics"), "odg"],
+      [bytes('<office:document office:mimetype="application/vnd.oasis.opendocument.graphics">'), "fodg"],
+    ] as const) {
+      const { ctx, nested } = context(data, {}, false);
+      await rendererFor("odg").mount(document.createElement("div"), ctx);
+      expect(convertSlides).toHaveBeenLastCalledWith(data, format, expect.anything());
+      expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("pptx");
+    }
+    expect(convertExternal).not.toHaveBeenCalled();
+  });
+
+  it("fails with the converter's kind for a drawing it recognised and could not read", async () => {
+    convertSlides.mockRejectedValue(new Error("malformed"));
+    const { ctx } = context(zip("mimetypeapplication/vnd.oasis.opendocument.graphics"), {}, true);
+    const error = await failure("odg", ctx);
+    expect(error).toBeInstanceOf(SlideConversionError);
+    expect((error as SlideConversionError).kind).toBe("malformed");
+    expect((error as SlideConversionError).format).toBe("odg");
+    expect(convertExternal).not.toHaveBeenCalled();
+  });
+
+  it("fails the same way for a version of PowerPoint or of Keynote the converter does not read", async () => {
+    convertSlides.mockRejectedValue(new Error("unsupported"));
+    for (const [kind, data, format] of [
+      ["ppt", bytes([0xed, 0xde, 0xad, 0x0b, 2, 0, 0, 0]), "ppt"],
+      ["keynote", zip("index.apxl.gz"), "key"],
+    ] as const) {
+      const { ctx } = context(data, {}, true);
+      const error = await failure(kind, ctx);
+      expect(error).toBeInstanceOf(SlideConversionError);
+      expect(convertSlides).toHaveBeenLastCalledWith(data, format, expect.anything());
+      expect(convertExternal).not.toHaveBeenCalled();
+    }
+  });
+
+  it("goes to the external converter with what it does not recognise", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "pdf", bytes: new Uint8Array([5]) });
+    const { ctx, nested } = context(zip("something.bin"), {}, true);
+    await rendererFor("keynote").mount(document.createElement("div"), ctx);
+    expect(convertSlides).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ hint: "keynote" }));
+    expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("pdf");
+  });
+
+  it("ends in the needs-converter error with what it does not recognise and no external converter", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const { ctx, statuses } = context(zip("something.bin"), {}, false);
+    await rendererFor("keynote").mount(document.createElement("div"), ctx);
+    const last = statuses.at(-1) as { error: { code: string; cause: { kind: string; format: string } } };
+    expect(last.error.code).toBe("needs_converter");
+    expect(last.error.cause).toMatchObject({ kind: "needs-converter", format: "keynote" });
+    expect(convertSlides).not.toHaveBeenCalled();
+  });
+
+  it("is shown as it is when it is a PPTX under another name", async () => {
+    const { rendererFor } = await import("./convert.js");
+    const { ctx, nested } = context(zip("[Content_Types].xml ppt/presentation.xml"), {}, false);
+    await rendererFor("odp").mount(document.createElement("div"), ctx);
+    expect(convertSlides).not.toHaveBeenCalled();
+    expect((nested.mock.calls[0] as unknown as [unknown, { format: string }])[1].format).toBe("pptx");
+  });
+
+  it("goes to the external converter alone when the options say so", async () => {
+    const { rendererFor } = await import("./convert.js");
+    convertExternal.mockResolvedValue({ format: "pdf", bytes: new Uint8Array([5]) });
+    const { ctx } = context(PPT, { converter: "external" }, true);
+    await rendererFor("ppt").mount(document.createElement("div"), ctx);
+    expect(convertSlides).not.toHaveBeenCalled();
+    expect(convertExternal).toHaveBeenCalledWith(PPT, expect.objectContaining({ hint: "ppt" }));
+  });
+});
diff --git a/crates/exav-viewer/ts/office/slides.ts b/crates/exav-viewer/ts/office/slides.ts
new file mode 100644
index 00000000..b8371c67
--- /dev/null
+++ b/crates/exav-viewer/ts/office/slides.ts
@@ -0,0 +1,193 @@
+/**
+ * PPT, ODP, FODP and Keynote converted to PPTX by exav-render's `slides`
+ * (exav_viewer_slides.wasm), and OpenDocument drawings (ODG, OTG, FODG), a
+ * page to a slide, in a worker of its own for this one file, terminated when
+ * it is done: a wasm instance's memory never shrinks.
+ */
+import { createWorkerHost, type WorkerHost } from "../core/worker-host.js";
+
+/** What the converter reads. */
+export type SlideFormat = "ppt" | "odp" | "fodp" | "key" | "odg" | "fodg" | "vsdx";
+
+export interface SlideRequest {
+  bytes: ArrayBuffer;
+  format: SlideFormat;
+  maxShapes: number;
+  maxMemory: number;
+}
+
+export interface SlideResult {
+  pptx: ArrayBuffer;
+  slides: number;
+  warnings: string;
+}
+
+/** Why a conversion failed: the converter's error kinds, a timeout, or a crash of its module. */
+export type SlideErrorKind = "not-format" | "encrypted" | "unsupported" | "too-large" | "malformed" | "timeout" | "crashed";
+
+const KINDS: readonly string[] = ["not-format", "encrypted", "unsupported", "too-large", "malformed"];
+
+/** A presentation or drawing exav-render's `slides` recognised and could not convert. */
+export class SlideConversionError extends Error {
+  readonly kind: SlideErrorKind;
+  constructor(
+    readonly format: SlideFormat,
+    cause: unknown,
+  ) {
+    const reason = cause instanceof Error ? cause.message : String(cause);
+    const kind: SlideErrorKind = KINDS.includes(reason) ? (reason as SlideErrorKind) : /^no answer within/.test(reason) ? "timeout" : "crashed";
+    super(`the ${format} file could not be converted: ${kind}`, { cause });
+    this.name = "SlideConversionError";
+    this.kind = kind;
+  }
+}
+
+/** Shapes and memory a conversion may take: the converter's defaults. */
+export const SLIDE_LIMITS = { maxShapes: 1_000_000, maxMemory: 1 << 30 };
+
+/** The module may grow to 2 GiB; the converter's own count leaves room for the file and the output. */
+const MAX_MEMORY = 1.5 * 2 ** 30;
+
+const ascii = (bytes: Uint8Array, at: number, text: string) => {
+  if (at + text.length > bytes.length) return false;
+  for (let i = 0; i < text.length; i++) if (bytes[at + i] !== text.charCodeAt(i)) return false;
+  return true;
+};
+
+const contains = (bytes: Uint8Array, from: number, to: number, text: string) => {
+  const first = text.charCodeAt(0);
+  for (let i = Math.max(0, from); i <= Math.min(bytes.length, to) - text.length; i++) {
+    if (bytes[i] === first && ascii(bytes, i, text)) return true;
+  }
+  return false;
+};
+
+/**
+ * Whether a compound file has a directory entry (stream or storage) called
+ * `name`: its UTF-16LE name, padded to 64 bytes, then the name's length in
+ * bytes with the terminator, then the entry's type (1 storage, 2 stream, 5
+ * root).
+ */
+const hasEntry = (bytes: Uint8Array, names: readonly string[]) => {
+  // Names compare without regard to ASCII case, as in the file format.
+  const fold = (c: number) => (c >= 0x61 && c <= 0x7a ? c - 32 : c);
+  for (let i = 0; i + 67 <= bytes.length; i += 2) {
+    if (bytes[i + 1] !== 0) continue;
+    for (const name of names) {
+      if (fold(bytes[i]!) !== fold(name.charCodeAt(0))) continue;
+      let k = 1;
+      while (k < name.length && fold(bytes[i + 2 * k]!) === fold(name.charCodeAt(k)) && bytes[i + 2 * k + 1] === 0) k++;
+      if (k !== name.length) continue;
+      // The length field follows the name's 64 bytes.
+      const size = (name.length + 1) * 2;
+      if (bytes[i + 64] === size && bytes[i + 65] === 0 && [1, 2, 5].includes(bytes[i + 66]!)) return true;
+    }
+  }
+  return false;
+};
+
+/** BinHex 4.0's alphabet. */
+const BINHEX = '!"#$%&\'()*+,-012345689@ABCDEFGHIJKLMNPQRSTUVXYZ[`abcdefhijklmpqr';
+
+/**
+ * The type and creator of the Macintosh file a BinHex 4.0 text holds, from
+ * the header after its first colon (name, version, type, creator).
+ */
+function binhexHeader(bytes: Uint8Array): { type: string; creator: string } | null {
+  const head = String.fromCharCode(...bytes.subarray(0, 1024));
+  const at = head.indexOf(":");
+  if (at < 0 || !head.startsWith("(This file must be converted with BinHex")) return null;
+  const out: number[] = [];
+  let bits = 0;
+  let n = 0;
+  for (const c of head.slice(at + 1)) {
+    if (c === "\r" || c === "\n") continue;
+    const v = BINHEX.indexOf(c);
+    if (v < 0) break;
+    bits = ((bits << 6) | v) & 0xffff;
+    n += 6;
+    if (n >= 8) {
+      n -= 8;
+      out.push((bits >> n) & 0xff);
+    }
+    if (out.length > 64) break;
+  }
+  // Length-prefixed name, version, type, creator.
+  const p = 1 + (out[0] ?? 0);
+  if (out.length < p + 9) return null;
+  const text = (a: number, b: number) => String.fromCharCode(...out.slice(a, b));
+  return { type: text(p + 1, p + 5), creator: text(p + 5, p + 9) };
+}
+
+/**
+ * What the bytes are: a presentation the converter reads (or reports as one
+ * it does not), a PPTX shown as it is, or `null` for anything else.
+ *
+ * Every version is recognised: PowerPoint 2 to 4 (a file starting with
+ * 0xED 0xDE 0xAD 0x0B, or its Macintosh form, big endian, possibly as
+ * BinHex text, or a compound file with a "PP40" stream), PowerPoint 95 and
+ * 97 to 2003 (a "PowerPoint Document" stream), ODP, OTP and FODP, and
+ * Keynote 1 to 6 (its XML or its IWA archives in a ZIP).
+ */
+export function sniffSlides(bytes: Uint8Array): SlideFormat | "pptx" | null {
+  // A compound file holding a PowerPoint document stream.
+  if (bytes[0] === 0xd0 && bytes[1] === 0xcf && bytes[2] === 0x11 && bytes[3] === 0xe0) {
+    return hasEntry(bytes, ["PowerPoint Document", "PP40"]) ? "ppt" : null;
+  }
+  // PowerPoint 2 to 4, little endian (Windows) or big endian (Macintosh).
+  if (
+    (bytes[0] === 0xed && bytes[1] === 0xde && bytes[2] === 0xad && bytes[3] === 0x0b) ||
+    (bytes[0] === 0x0b && bytes[1] === 0xad && bytes[2] === 0xde && bytes[3] === 0xed)
+  ) {
+    return "ppt";
+  }
+  if (bytes[0] === 0x28) {
+    const h = binhexHeader(bytes);
+    return h && (h.creator === "PPNT" || h.type.startsWith("SLD") || h.type.startsWith("PPT")) ? "ppt" : null;
+  }
+  if (bytes[0] === 0x50 && bytes[1] === 0x4b) {
+    // OpenDocument: the stored "mimetype" member first.
+    if (ascii(bytes, 30, "mimetype")) {
+      if (contains(bytes, 38, 120, "presentation")) return "odp";
+      // "graphics", and "drawing" in OpenOffice 1.x files.
+      return contains(bytes, 38, 120, "graphics") || contains(bytes, 38, 120, "opendocument.drawing") ? "odg" : null;
+    }
+    // The central directory, at the end, names the members.
+    const from = bytes.length - (1 << 20);
+    const has = (t: string) => contains(bytes, from, bytes.length, t);
+    if (has("[Content_Types].xml") && has("ppt/")) return "pptx";
+    // Visio 2013 and later: an Open Packaging package with a visio/ directory.
+    if (has("[Content_Types].xml") && has("visio/document.xml")) return "vsdx";
+    if (has(".iwa") || has("Index.zip")) return has("Slide") || has("Index.zip") ? "key" : null;
+    // Keynote 1 to 5: index.apxl, presentation.apxl, gzipped or not.
+    if (has("index.apxl") || has("presentation.apxl")) return "key";
+    if (has("content.xml")) return "odp";
+    return null;
+  }
+  // Flat OpenDocument, after a BOM and an XML declaration.
+  if (contains(bytes, 0, 2048, "office:document") && contains(bytes, 0, 4096, "opendocument.presentation")) return "fodp";
+  if (contains(bytes, 0, 2048, "office:document") && (contains(bytes, 0, 4096, "opendocument.graphics") || contains(bytes, 0, 4096, "opendocument.drawing"))) return "fodg";
+  return null;
+}
+
+/** Converts in a worker; `signal` (the session's) stops it at once. */
+export async function convertSlides(
+  bytes: Uint8Array,
+  format: SlideFormat,
+  options: { signal?: AbortSignal; timeoutMs?: number; maxMemory?: number } = {},
+): Promise<SlideResult> {
+  const host: WorkerHost<SlideRequest, SlideResult> = createWorkerHost(
+    () => new Worker(new URL("./slides.worker.js", import.meta.url), { type: "module" }),
+  );
+  const stop = () => host.destroy();
+  options.signal?.addEventListener("abort", stop, { once: true });
+  try {
+    // A copy: the caller keeps its bytes, for the external converter should this fail.
+    const copy = bytes.slice().buffer as ArrayBuffer;
+    const maxMemory = Math.min(options.maxMemory ?? SLIDE_LIMITS.maxMemory, MAX_MEMORY);
+    return await host.call({ bytes: copy, format, maxShapes: SLIDE_LIMITS.maxShapes, maxMemory }, [copy], options.timeoutMs ?? 120_000);
+  } finally {
+    options.signal?.removeEventListener("abort", stop);
+    host.destroy();
+  }
+}
diff --git a/crates/exav-viewer/ts/office/slides.worker.ts b/crates/exav-viewer/ts/office/slides.worker.ts
new file mode 100644
index 00000000..e4a6c27c
--- /dev/null
+++ b/crates/exav-viewer/ts/office/slides.worker.ts
@@ -0,0 +1,22 @@
+// exav-render's slides module (exav_viewer_slides.wasm): the page gets back the PPTX.
+import init, { convertSlides } from "../../wasm/exav_viewer_slides.js";
+
+import { serve } from "../core/worker-host.js";
+import type { SlideRequest, SlideResult } from "./slides.js";
+
+let ready: Promise<unknown> | null = null;
+
+serve<SlideRequest, SlideResult>(async ({ bytes, format, maxShapes, maxMemory }) => {
+  ready ??= init();
+  await ready;
+  const converted = convertSlides(new Uint8Array(bytes), format, maxShapes, maxMemory, Infinity);
+  try {
+    const pptx = converted.takePptx();
+    return {
+      value: { pptx: pptx.buffer as ArrayBuffer, slides: converted.slides, warnings: converted.warnings },
+      transfer: [pptx.buffer as ArrayBuffer],
+    };
+  } finally {
+    converted.free();
+  }
+});
diff --git a/crates/exav-viewer/ts/office/table.test.ts b/crates/exav-viewer/ts/office/table.test.ts
new file mode 100644
index 00000000..590b85e1
--- /dev/null
+++ b/crates/exav-viewer/ts/office/table.test.ts
@@ -0,0 +1,122 @@
+import zlib from "node:zlib";
+
+import { describe, expect, it } from "vitest";
+
+import { parseTable, storedZip, xlsxOfRows, xlsxOfTable } from "./table.js";
+
+describe("a delimited text read as rows", () => {
+  it("splits on the separator and on every kind of line end", () => {
+    expect(parseTable("a;b\r\nc;d\ne;f\rg;h", ";")).toEqual([
+      ["a", "b"],
+      ["c", "d"],
+      ["e", "f"],
+      ["g", "h"],
+    ]);
+  });
+
+  it("keeps quoted separators, line ends and doubled quotes inside the field", () => {
+    expect(parseTable('"a,b",c\n"line\nbreak","say ""hi"""\n', ",")).toEqual([
+      ["a,b", "c"],
+      ["line\nbreak", 'say "hi"'],
+    ]);
+  });
+
+  it("keeps empty fields and leaves out blank lines", () => {
+    expect(parseTable("a,,c\n\n,,\n,b\n", ",")).toEqual([
+      ["a", "", "c"],
+      ["", "", ""],
+      ["", "b"],
+    ]);
+    expect(parseTable("", ",")).toEqual([]);
+    expect(parseTable('""\n', ",")).toEqual([[""]]);
+  });
+
+  it("refuses more fields than the engine draws a sheet of, counting blanks, as too large", () => {
+    expect(parseTable("a,b\nc,d\n", ",", 4)).toHaveLength(2);
+    expect(() => parseTable("a,b\nc,d,\n", ",", 4)).toThrowError(expect.objectContaining({ code: "too-large" }));
+    expect(() => parseTable(",".repeat(10), ",", 5)).toThrowError(expect.objectContaining({ code: "too-large" }));
+  });
+
+  it("takes a quote in the middle of a field as a character", () => {
+    expect(parseTable('5" pipe,x', ",")).toEqual([['5" pipe', "x"]]);
+  });
+});
+
+/** The members of a stored ZIP, read from its central directory. */
+function members(zip: Uint8Array): Record<string, Uint8Array> {
+  const view = new DataView(zip.buffer, zip.byteOffset, zip.byteLength);
+  const end = zip.length - 22;
+  expect(view.getUint32(end, true)).toBe(0x06054b50);
+  const count = view.getUint16(end + 10, true);
+  let at = view.getUint32(end + 16, true);
+  const out: Record<string, Uint8Array> = {};
+  for (let i = 0; i < count; i++) {
+    expect(view.getUint32(at, true)).toBe(0x02014b50);
+    const crc = view.getUint32(at + 16, true);
+    const size = view.getUint32(at + 24, true);
+    const nameLength = view.getUint16(at + 28, true);
+    const local = view.getUint32(at + 42, true);
+    const name = new TextDecoder().decode(zip.subarray(at + 46, at + 46 + nameLength));
+    expect(view.getUint32(local, true)).toBe(0x04034b50);
+    const start = local + 30 + view.getUint16(local + 26, true);
+    const data = zip.subarray(start, start + size);
+    expect(zlib.crc32(data)).toBe(crc);
+    out[name] = data;
+    at += 46 + nameLength;
+  }
+  return out;
+}
+
+describe("a stored ZIP", () => {
+  it("holds its members as given, with their checksums", () => {
+    const text = (s: string) => new TextEncoder().encode(s);
+    const zip = storedZip([
+      ["a.txt", text("hello")],
+      ["dir/b.bin", new Uint8Array([0, 1, 2, 255])],
+      ["empty", new Uint8Array(0)],
+    ]);
+    const m = members(zip);
+    expect(Object.keys(m)).toEqual(["a.txt", "dir/b.bin", "empty"]);
+    expect(new TextDecoder().decode(m["a.txt"])).toBe("hello");
+    expect([...m["dir/b.bin"]!]).toEqual([0, 1, 2, 255]);
+    expect(m["empty"]!.length).toBe(0);
+  });
+});
+
+describe("rows as a workbook", () => {
+  const sheet = (rows: string[][]) => new TextDecoder().decode(members(xlsxOfRows(rows))["xl/worksheets/sheet1.xml"]);
+
+  it("has the parts of a one-sheet workbook", () => {
+    const m = members(xlsxOfRows([["a"]]));
+    expect(Object.keys(m).sort()).toEqual(["[Content_Types].xml", "_rels/.rels", "xl/_rels/workbook.xml.rels", "xl/styles.xml", "xl/workbook.xml", "xl/worksheets/sheet1.xml"]);
+    expect(new TextDecoder().decode(m["xl/workbook.xml"])).toContain('<sheet name="Sheet1"');
+  });
+
+  it("writes each field as text in its cell, empty ones not at all", () => {
+    const xml = sheet([
+      ["Item", "", "3,5"],
+      ["", "x"],
+    ]);
+    expect(xml).toContain('<row r="1"><c r="A1" t="inlineStr"><is><t xml:space="preserve">Item</t></is></c><c r="C1" t="inlineStr"><is><t xml:space="preserve">3,5</t></is></c></row>');
+    expect(xml).toContain('<row r="2"><c r="B2"');
+    expect(xml).not.toContain('r="B1"');
+  });
+
+  it("escapes markup and drops what XML cannot carry", () => {
+    const xml = sheet([["a<b>&c\u0001d\ttab"]]);
+    expect(xml).toContain("a&lt;b&gt;&amp;cd\ttab");
+  });
+
+  it("names columns past Z", () => {
+    expect(sheet([Array.from({ length: 28 }, (_, i) => String(i))])).toContain('r="AB1"');
+  });
+
+  it("reads the bytes as the encoding says, without a byte order mark", () => {
+    const bytes = new TextEncoder().encode("libellé;qté\n1;2\n");
+    const xml = new TextDecoder().decode(members(xlsxOfTable(bytes.buffer, { delimiter: ";", encoding: "utf-8" }))["xl/worksheets/sheet1.xml"]);
+    expect(xml).toContain(">libellé<");
+    expect(xml).toContain('<c r="B2"');
+    const latin1 = Uint8Array.from([0x6c, 0x69, 0x62, 0x65, 0x6c, 0x6c, 0xe9]);
+    expect(new TextDecoder().decode(members(xlsxOfTable(latin1.buffer, { delimiter: ",", encoding: "windows-1252" }))["xl/worksheets/sheet1.xml"])).toContain(">libellé<");
+  });
+});
diff --git a/crates/exav-viewer/ts/office/table.ts b/crates/exav-viewer/ts/office/table.ts
new file mode 100644
index 00000000..bd019a17
--- /dev/null
+++ b/crates/exav-viewer/ts/office/table.ts
@@ -0,0 +1,174 @@
+/**
+ * A delimited text as a one-sheet XLSX, for the second copy of a CSV that
+ * its pictures are drawn from: the engines read delimited text only through
+ * the sheet viewer, which has no workbook to draw pictures with. Every field
+ * is text, as the viewer reads them.
+ */
+import { RasterError } from "../core/pictures.js";
+import type { Reading } from "./delimited.js";
+import { columnName } from "./raster.js";
+
+/**
+ * The most fields a table is read with: the engine's own limit on the cells
+ * of a sheet, counting blanks, which the viewer refuses a larger table for.
+ */
+export const MAX_FIELDS = 250_000;
+
+/**
+ * The rows of a delimited text, quoted fields unquoted (RFC 4180); blank
+ * lines are no rows. More than `maxFields` fields is refused ("too-large"),
+ * before they are all held.
+ */
+export function parseTable(text: string, delimiter: string, maxFields = MAX_FIELDS): string[][] {
+  const rows: string[][] = [];
+  let row: string[] = [];
+  let field = "";
+  let quoted = false;
+  let started = false;
+  let fields = 0;
+  const endField = () => {
+    if (++fields > maxFields) throw new RasterError("too-large", `the table has more than ${maxFields} cells`);
+    row.push(field);
+    field = "";
+  };
+  const endRow = () => {
+    if (started || row.length > 0) {
+      endField();
+      rows.push(row);
+    }
+    row = [];
+    started = false;
+  };
+  for (let i = 0; i < text.length; i++) {
+    const c = text[i]!;
+    if (quoted) {
+      if (c === '"') {
+        if (text[i + 1] === '"') {
+          field += '"';
+          i++;
+        } else quoted = false;
+      } else field += c;
+    } else if (c === '"' && field === "") {
+      quoted = true;
+      started = true;
+    } else if (c === delimiter) {
+      endField();
+      started = true;
+    } else if (c === "\n") endRow();
+    else if (c === "\r") {
+      if (text[i + 1] === "\n") i++;
+      endRow();
+    } else {
+      field += c;
+      started = true;
+    }
+  }
+  endRow();
+  return rows;
+}
+
+const CRC = new Uint32Array(256).map((_, n) => {
+  let c = n;
+  for (let k = 0; k < 8; k++) c = c & 1 ? 0xedb88320 ^ (c >>> 1) : c >>> 1;
+  return c >>> 0;
+});
+
+function crc32(data: Uint8Array): number {
+  let c = 0xffffffff;
+  for (const b of data) c = CRC[(c ^ b) & 0xff]! ^ (c >>> 8);
+  return (c ^ 0xffffffff) >>> 0;
+}
+
+/** A ZIP of stored (uncompressed) members. */
+export function storedZip(files: [string, Uint8Array][]): Uint8Array {
+  const names = files.map(([name]) => new TextEncoder().encode(name));
+  const size = files.reduce((n, [, data], i) => n + 30 + names[i]!.length + data.length + 46 + names[i]!.length, 22);
+  const out = new Uint8Array(size);
+  const view = new DataView(out.buffer);
+  let at = 0;
+  const offsets: number[] = [];
+  files.forEach(([, data], i) => {
+    offsets.push(at);
+    view.setUint32(at, 0x04034b50, true);
+    view.setUint16(at + 4, 20, true);
+    view.setUint32(at + 14, crc32(data), true);
+    view.setUint32(at + 18, data.length, true);
+    view.setUint32(at + 22, data.length, true);
+    view.setUint16(at + 26, names[i]!.length, true);
+    out.set(names[i]!, at + 30);
+    out.set(data, at + 30 + names[i]!.length);
+    at += 30 + names[i]!.length + data.length;
+  });
+  const directory = at;
+  files.forEach(([, data], i) => {
+    view.setUint32(at, 0x02014b50, true);
+    view.setUint16(at + 4, 20, true);
+    view.setUint16(at + 6, 20, true);
+    view.setUint32(at + 16, crc32(data), true);
+    view.setUint32(at + 20, data.length, true);
+    view.setUint32(at + 24, data.length, true);
+    view.setUint16(at + 28, names[i]!.length, true);
+    view.setUint32(at + 42, offsets[i]!, true);
+    out.set(names[i]!, at + 46);
+    at += 46 + names[i]!.length;
+  });
+  view.setUint32(at, 0x06054b50, true);
+  view.setUint16(at + 8, files.length, true);
+  view.setUint16(at + 10, files.length, true);
+  view.setUint32(at + 12, at - directory, true);
+  view.setUint32(at + 16, directory, true);
+  return out;
+}
+
+/** Characters XML 1.0 cannot carry are dropped; the rest is escaped. */
+const xml = (text: string) =>
+  text
+    // eslint-disable-next-line no-control-regex
+    .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f￾￿]/g, "")
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+
+const HEAD = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
+const NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+const REL = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
+
+/** The rows as a workbook of one sheet, "Sheet1". */
+export function xlsxOfRows(rows: string[][]): Uint8Array {
+  const body = rows
+    .map((fields, r) => {
+      const cells = fields
+        .map((text, c) => (text === "" ? "" : `<c r="${columnName(c + 1)}${r + 1}" t="inlineStr"><is><t xml:space="preserve">${xml(text)}</t></is></c>`))
+        .join("");
+      return `<row r="${r + 1}">${cells}</row>`;
+    })
+    .join("");
+  const enc = (text: string) => new TextEncoder().encode(HEAD + text);
+  return storedZip([
+    [
+      "[Content_Types].xml",
+      enc(
+        '<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/><Override PartName="/xl/worksheets/sheet1.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/></Types>',
+      ),
+    ],
+    ["_rels/.rels", enc(`<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="${REL}/officeDocument" Target="xl/workbook.xml"/></Relationships>`)],
+    ["xl/workbook.xml", enc(`<workbook xmlns="${NS}" xmlns:r="${REL}"><sheets><sheet name="Sheet1" sheetId="1" r:id="rId1"/></sheets></workbook>`)],
+    [
+      "xl/_rels/workbook.xml.rels",
+      enc(`<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="${REL}/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="${REL}/styles" Target="styles.xml"/></Relationships>`),
+    ],
+    [
+      "xl/styles.xml",
+      enc(
+        `<styleSheet xmlns="${NS}"><fonts count="1"><font><sz val="11"/><name val="Calibri"/></font></fonts><fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills><borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders><cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/></cellXfs></styleSheet>`,
+      ),
+    ],
+    ["xl/worksheets/sheet1.xml", enc(`<worksheet xmlns="${NS}"><sheetFormatPr defaultColWidth="8.43" defaultRowHeight="15"/><sheetData>${body}</sheetData></worksheet>`)],
+  ]);
+}
+
+/** The delimited text `bytes`, read as `reading` says, as a workbook. */
+export function xlsxOfTable(bytes: ArrayBuffer, reading: Reading): Uint8Array {
+  const text = new TextDecoder(reading.encoding).decode(bytes);
+  return xlsxOfRows(parseTable(text, reading.delimiter));
+}
diff --git a/crates/exav-viewer/ts/office/viewport.test.ts b/crates/exav-viewer/ts/office/viewport.test.ts
new file mode 100644
index 00000000..69e140fc
--- /dev/null
+++ b/crates/exav-viewer/ts/office/viewport.test.ts
@@ -0,0 +1,119 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { docxView, perFrame, slideView, viewportStore } from "./viewport.js";
+
+type Rect = [left: number, top: number, width: number, height: number];
+
+/** An element that reports the box it is given. */
+function box(rect: Rect, attributes: Record<string, string> = {}, client?: [number, number]): HTMLElement {
+  const el = document.createElement("div");
+  for (const [k, v] of Object.entries(attributes)) el.setAttribute(k, v);
+  el.getBoundingClientRect = () => ({ left: rect[0], top: rect[1], width: rect[2], height: rect[3], right: rect[0] + rect[2], bottom: rect[1] + rect[3], x: rect[0], y: rect[1] }) as DOMRect;
+  if (client) {
+    Object.defineProperty(el, "clientWidth", { value: client[0] });
+    Object.defineProperty(el, "clientHeight", { value: client[1] });
+  }
+  return el;
+}
+
+/** The scroll viewer's DOM: a scrolling box holding a box for each page near the view, with its canvas and its text layer. */
+function viewer(host: Rect, pages: [index: number, rect: Rect][], client: [number, number] = [host[2], host[3]]) {
+  const root = document.createElement("div");
+  const scroller = box(host, {}, client);
+  root.append(scroller);
+  for (const [index, rect] of pages) {
+    const slot = box(rect);
+    slot.append(box(rect), box(rect, { "data-overlay": "text", "data-page-index": String(index) }));
+    scroller.append(slot);
+  }
+  return root;
+}
+
+describe("the Word page in view", () => {
+  it("is the page with most of it showing, and the part of it that does", () => {
+    // A 600 x 400 scroller: page 0 (782 high) scrolled up by 700, page 1 starting at 82 and 782 high.
+    const root = viewer([0, 0, 600, 400], [
+      [0, [20, -700, 553, 782]],
+      [1, [20, 82, 553, 782]],
+    ]);
+    const v = docxView(root)!;
+    expect(v.page).toBe(2);
+    expect(v.region.x).toBeCloseTo(0);
+    expect(v.region.width).toBeCloseTo(1);
+    expect(v.region.y).toBeCloseTo(0);
+    expect(v.region.height).toBeCloseTo(318 / 782);
+  });
+
+  it("leaves out the scrollbars", () => {
+    const root = viewer([0, 0, 600, 400], [[0, [0, 0, 600, 1000]]], [585, 385]);
+    const v = docxView(root)!;
+    expect(v.region.width).toBeCloseTo(585 / 600);
+    expect(v.region.height).toBeCloseTo(385 / 1000);
+  });
+
+  it("counts pages from 1, however many are mounted before it", () => {
+    const root = viewer([0, 0, 600, 400], [[41, [0, 0, 500, 700]]]);
+    expect(docxView(root)!.page).toBe(42);
+  });
+
+  it("is null with no page laid out or none in view", () => {
+    expect(docxView(document.createElement("div"))).toBeNull();
+    expect(docxView(viewer([0, 0, 600, 400], [[0, [0, 900, 500, 700]]]))).toBeNull();
+  });
+});
+
+describe("the slide in its stage", () => {
+  it("is all of it when it fits, and the part showing when it overflows", () => {
+    const stage = box([0, 0, 800, 600]);
+    expect(slideView(stage, box([100, 50, 600, 400]), 3)).toEqual({ page: 3, region: { x: 0, y: 0, width: 1, height: 1 } });
+    expect(slideView(stage, box([-200, 0, 1000, 600]), 1)!.region).toEqual({ x: 0.2, y: 0, width: 0.8, height: 1 });
+    expect(slideView(stage, box([900, 0, 100, 100]), 1)).toBeNull();
+  });
+});
+
+describe("the viewport store", () => {
+  it("is set only on a change, to a ten-thousandth of the page", () => {
+    const { controller, publish } = viewportStore();
+    const seen = vi.fn();
+    controller.subscribe(seen);
+    expect(controller.get()).toBeNull();
+    publish({ page: 1, region: { x: 0, y: 0, width: 1, height: 0.5 } });
+    publish({ page: 1, region: { x: 0, y: 0, width: 1, height: 0.50001 } });
+    expect(seen).toHaveBeenCalledTimes(1);
+    expect(controller.get()).toEqual({ space: "page", page: 1, region: { x: 0, y: 0, width: 1, height: 0.5 } });
+    publish({ page: 2, region: { x: 0, y: 0, width: 1, height: 0.5 } });
+    publish({ page: 2, region: { x: 0, y: 0.1, width: 1, height: 0.5 } });
+    expect(seen).toHaveBeenCalledTimes(3);
+    publish(null);
+    publish(null);
+    expect(seen).toHaveBeenCalledTimes(4);
+    expect(controller.get()).toBeNull();
+  });
+
+  it("is read only to its reader", () => {
+    expect(Object.keys(viewportStore().controller).sort()).toEqual(["get", "subscribe"]);
+  });
+});
+
+describe("work done at most once a frame", () => {
+  afterEach(() => vi.unstubAllGlobals());
+
+  it("runs once however often asked, and not after it is cancelled", () => {
+    const frames: (() => void)[] = [];
+    vi.stubGlobal("requestAnimationFrame", (f: () => void) => frames.push(f));
+    vi.stubGlobal("cancelAnimationFrame", (n: number) => delete frames[n - 1]);
+    const fn = vi.fn();
+    const p = perFrame(fn);
+    p.run();
+    p.run();
+    p.run();
+    expect(frames).toHaveLength(1);
+    frames[0]!();
+    expect(fn).toHaveBeenCalledTimes(1);
+    p.run();
+    expect(frames).toHaveLength(2);
+    p.cancel();
+    frames[1]?.();
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/crates/exav-viewer/ts/office/viewport.ts b/crates/exav-viewer/ts/office/viewport.ts
new file mode 100644
index 00000000..eb5ffa49
--- /dev/null
+++ b/crates/exav-viewer/ts/office/viewport.ts
@@ -0,0 +1,82 @@
+/**
+ * What the office viewers show now, as a page and a region of it
+ * (`Controllers.viewport`), read off the boxes the engines lay out.
+ */
+import { writable } from "../core/store.js";
+import type { RasterRect, Viewport, ViewportController } from "../core/types.js";
+import { pageInView, sameRegion, visibleRegion, type Box } from "./raster.js";
+
+export type View = { page: number; region: RasterRect };
+
+const boxOf = (el: Element): Box => {
+  const r = el.getBoundingClientRect();
+  return { left: r.left, top: r.top, width: r.width, height: r.height };
+};
+
+/**
+ * The page of a Word scroll viewer most in view, and the part of it that
+ * shows. The viewer keeps the pages near the view only, each a box holding
+ * its canvas and, over it, the text layer that carries the page's index.
+ */
+export function docxView(root: Element): View | null {
+  const boxes: { index: number; box: Box }[] = [];
+  let host: Element | null = null;
+  for (const layer of root.querySelectorAll('[data-overlay="text"][data-page-index]')) {
+    const index = Number((layer as HTMLElement).dataset.pageIndex);
+    if (!Number.isSafeInteger(index) || index < 0) continue;
+    boxes.push({ index, box: boxOf(layer) });
+    host ??= layer.parentElement?.parentElement ?? null;
+  }
+  if (!host) return null;
+  // The scrolling box, less its scrollbars.
+  const view = { ...boxOf(host), width: host.clientWidth, height: host.clientHeight };
+  const found = pageInView(boxes, view);
+  return found && { page: found.index + 1, region: found.region };
+}
+
+/** The slide in its stage: all of it, or the part the stage shows when it overflows. */
+export function slideView(stage: Element, canvas: Element, page: number): View | null {
+  const region = visibleRegion(boxOf(canvas), boxOf(stage));
+  return region && { page, region };
+}
+
+/** A viewport store with what the engines would otherwise churn kept out: set only on a change. */
+export function viewportStore(): { controller: ViewportController; publish(next: View | null): void } {
+  const store = writable<Viewport | null>(null);
+  return {
+    controller: { get: store.get, subscribe: store.subscribe },
+    publish(next) {
+      const now = store.get();
+      if (!next) {
+        if (now) store.set(null);
+        return;
+      }
+      if (now && now.page === next.page && sameRegion(now.region as RasterRect, next.region)) return;
+      store.set({ space: "page", page: next.page, region: next.region });
+    },
+  };
+}
+
+/** `fn` run at most once a frame, however often asked. */
+export function perFrame(fn: () => void): { run(): void; cancel(): void } {
+  let handle = 0;
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  const fire = () => {
+    handle = 0;
+    timer = undefined;
+    fn();
+  };
+  return {
+    run() {
+      if (handle || timer !== undefined) return;
+      if (typeof requestAnimationFrame === "function") handle = requestAnimationFrame(fire);
+      else timer = setTimeout(fire, 16);
+    },
+    cancel() {
+      if (handle) cancelAnimationFrame(handle);
+      clearTimeout(timer);
+      handle = 0;
+      timer = undefined;
+    },
+  };
+}
diff --git a/crates/exav-viewer/ts/pdf/engine.ts b/crates/exav-viewer/ts/pdf/engine.ts
index fca60e98..01d6bf75 100644
--- a/crates/exav-viewer/ts/pdf/engine.ts
+++ b/crates/exav-viewer/ts/pdf/engine.ts
@@ -4,7 +4,9 @@
  */
 import type { PDFDocumentProxy } from "pdfjs-dist";
 
-import type { ByteRanges } from "../core/types.js";
+import { throwIfAborted } from "../core/pictures.js";
+import { bitmapOf, createCanvas, release } from "../core/raster.js";
+import type { ByteRanges, RasterRect } from "../core/types.js";
 import { linkTarget } from "../frame/protocol.js";
 import { pdfjsAssetDir, pdfjsWasmDir } from "./assets.js";
 
@@ -63,6 +65,13 @@ export interface LoadedPdf {
   pageAspect(page: number): Promise<number>;
   /** The page at `scale`, on white, as PNG. The canvas is freed at once. */
   renderPageToBlob(page: number, scale: number): Promise<Blob>;
+  /**
+   * `region` of the page (fractions of it, which may reach past its edges)
+   * drawn as a picture of `width` by `height` px on `background` (a CSS
+   * colour; transparent where the page draws nothing and it is transparent).
+   * Stops quietly-by-rejection when `signal` aborts.
+   */
+  renderPageRegion(page: number, view: { width: number; height: number; region: RasterRect; background: string; signal?: AbortSignal }): Promise<ImageBitmap>;
   /**
    * Draws `page` into `canvas` as if it were `cssWidth` CSS pixels wide, at
    * `renderDpr()`; with `region`, only that part (CSS pixels of the page at
@@ -262,6 +271,33 @@ function wrap(doc: PDFDocumentProxy, pdfjs: Pdfjs): LoadedPdf {
         canvas.height = 0;
       }
     },
+    async renderPageRegion(n, { width, height, region, background, signal }) {
+      throwIfAborted(signal);
+      const page = await doc.getPage(n);
+      const natural = page.getViewport({ scale: 1 });
+      // Whole pixels were chosen for the picture; the scale makes the region fill them.
+      const scale = width / (region.width * natural.width);
+      const viewport = page.getViewport({
+        scale,
+        offsetX: -region.x * natural.width * scale,
+        offsetY: -region.y * natural.height * scale,
+      });
+      const { canvas } = createCanvas(width, height, true);
+      try {
+        throwIfAborted(signal);
+        const task = page.render({ canvas: canvas as HTMLCanvasElement, viewport, background });
+        const stop = () => task.cancel();
+        signal?.addEventListener("abort", stop, { once: true });
+        try {
+          await task.promise;
+        } finally {
+          signal?.removeEventListener("abort", stop);
+        }
+        return await bitmapOf(canvas);
+      } finally {
+        release(canvas);
+      }
+    },
     renderPageTo(canvas, n, cssWidth, region) {
       const mine = claim(canvas);
       const run = (chain.get(canvas) ?? Promise.resolve()).catch(noop).then(async () => {
diff --git a/crates/exav-viewer/ts/pdf/index.ts b/crates/exav-viewer/ts/pdf/index.ts
index e57ce1e0..1886b184 100644
--- a/crates/exav-viewer/ts/pdf/index.ts
+++ b/crates/exav-viewer/ts/pdf/index.ts
@@ -35,7 +35,7 @@ export function pdf(options: PdfOptions = {}): FormatPlugin<PdfOptions> {
   return {
     id: "pdf",
     match: MATCHERS.pdf,
-    capabilities: ["pages", "zoom", "drag", "outline"],
+    capabilities: ["pages", "zoom", "drag", "outline", "pictures", "viewport"],
     options,
     load: () => import("./renderer.js").then((m) => m.renderer),
     async prefetch(assetBase) {
diff --git a/crates/exav-viewer/ts/pdf/reader.test.ts b/crates/exav-viewer/ts/pdf/reader.test.ts
index ad1e71ab..6b59f7c0 100644
--- a/crates/exav-viewer/ts/pdf/reader.test.ts
+++ b/crates/exav-viewer/ts/pdf/reader.test.ts
@@ -29,6 +29,7 @@ function fakeDoc(pages: number, log: string[] = [], links: PdfLink[] = []): Load
     pageSize: async () => ({ width: 600, height: 800 }),
     pageAspect: async () => 0.75,
     renderPageToBlob: async () => new Blob(),
+    renderPageRegion: async () => ({}) as ImageBitmap,
     renderPageTo: async () => true,
     cancelRender: () => void log.push("cancel"),
     outline: async () => [],
@@ -49,13 +50,13 @@ function make(doc: LoadedPdf, over: Partial<ReaderOptions> = {}) {
   document.body.append(host);
   const reader = createReader(host, doc, sizes(doc.numPages), { ...READER_DEFAULTS, ...over }, () => {});
   open.push(reader);
-  const scroller = host.querySelector<HTMLElement>(".exv-pdf-scroller")!;
+  const scroller = host.querySelector<HTMLElement>(".exav-viewer-pdf-scroller")!;
   // jsdom lays nothing out: the scroll position is a plain pair of numbers.
   let left = 0;
   let top = 0;
   // What the reader writes, since a browser empties the scroller when its content is replaced.
   const writes: { x: number[]; y: number[] } = { x: [], y: [] };
-  Object.defineProperty(scroller, "clientWidth", { value: 800 });
+  Object.defineProperty(scroller, "clientWidth", { value: 800, configurable: true });
   Object.defineProperty(scroller, "clientHeight", { value: 600 });
   Object.defineProperty(scroller, "scrollLeft", {
     get: () => left,
@@ -71,7 +72,7 @@ function make(doc: LoadedPdf, over: Partial<ReaderOptions> = {}) {
       writes.y.push(v);
     },
   });
-  const root = host.querySelector<HTMLElement>(".exv-pdf")!;
+  const root = host.querySelector<HTMLElement>(".exav-viewer-pdf")!;
   const mouse = (type: string, x: number, y: number, target: EventTarget = scroller, init: MouseEventInit = {}) =>
     target.dispatchEvent(new MouseEvent(type, { clientX: x, clientY: y, bubbles: true, cancelable: true, ...init }));
   return { reader, host, scroller, root, mouse, writes, scrollTo: (x: number, y: number) => ((left = x), (top = y)) };
@@ -105,8 +106,8 @@ describe("dragging with the mouse", () => {
     reader.zoom.setScale(2);
     scrollTo(100, 200);
     const text = document.createElement("span");
-    text.className = "exv-pdf-text";
-    host.querySelector(".exv-pdf-page")!.append(text);
+    text.className = "exav-viewer-pdf-text";
+    host.querySelector(".exav-viewer-pdf-page")!.append(text);
     const selecting = vi.fn();
     host.addEventListener("mousedown", selecting);
     const press = mouse("mousedown", 50, 50, text);
@@ -148,7 +149,7 @@ describe("dragging with the mouse", () => {
     return (async () => {
       // The overlay of a near page is made when the page is: let it be.
       await new Promise((r) => setTimeout(r, 0));
-      const link = host.querySelector<HTMLElement>(".exv-pdf-link");
+      const link = host.querySelector<HTMLElement>(".exav-viewer-pdf-link");
       if (!link) throw new Error("no link overlay");
       // A drag, then the click it ends with.
       mouse("mousedown", 10, 10, link);
@@ -167,17 +168,77 @@ describe("dragging with the mouse", () => {
   });
 });
 
+describe("the viewport", () => {
+  /**
+   * A reader with page 1 scrolled up by 200 in an 800 x 600 viewer. jsdom lays
+   * nothing out, so the boxes report fixed rectangles; `reads` counts the
+   * viewer's width being read, which only the viewport does.
+   */
+  function measured() {
+    const m = make(fakeDoc(3));
+    const rect = (l: number, t: number, w: number, h: number) => ({ left: l, top: t, width: w, height: h, right: l + w, bottom: t + h, x: l, y: t }) as DOMRect;
+    m.scroller.getBoundingClientRect = () => rect(0, 0, 800, 600);
+    const boxes = [...m.host.querySelectorAll<HTMLElement>(".exav-viewer-pdf-page")];
+    boxes[0]!.getBoundingClientRect = () => rect(100, -200, 600, 800);
+    boxes[1]!.getBoundingClientRect = () => rect(100, 620, 600, 800);
+    boxes[2]!.getBoundingClientRect = () => rect(100, 1440, 600, 800);
+    const reads = vi.fn(() => 800);
+    Object.defineProperty(m.scroller, "clientWidth", { get: reads, configurable: true });
+    return { ...m, reads };
+  }
+  const scroll = (scroller: HTMLElement) => scroller.dispatchEvent(new Event("scroll"));
+  const view = { space: "page", page: 1, region: { x: 0, y: 200 / 800, width: 1, height: 600 / 800 } };
+
+  it("is not measured by a reader that does not use it", () => {
+    const { reader, scroller, reads } = measured();
+    scroll(scroller);
+    reader.zoom.setScale(2);
+    expect(reads).not.toHaveBeenCalled();
+  });
+
+  it("is measured while followed, at each scroll, and no more once the last listener left", () => {
+    const { reader, scroller, reads } = measured();
+    const stop = reader.viewport.subscribe(() => {});
+    const other = reader.viewport.subscribe(() => {});
+    expect(reads).toHaveBeenCalled();
+    expect(reader.viewport.get()).toEqual(view);
+    const calls = reads.mock.calls.length;
+    scroll(scroller);
+    expect(reads.mock.calls.length).toBeGreaterThan(calls);
+    stop();
+    const kept = reads.mock.calls.length;
+    scroll(scroller);
+    expect(reads.mock.calls.length).toBeGreaterThan(kept);
+    other();
+    const left = reads.mock.calls.length;
+    scroll(scroller);
+    reader.zoom.setScale(2);
+    expect(reads.mock.calls.length).toBe(left);
+  });
+
+  it("is measured for each read with no listener, which has the current view", () => {
+    const { reader, scroller, reads } = measured();
+    expect(reader.viewport.get()).toEqual(view);
+    const once = reads.mock.calls.length;
+    expect(once).toBeGreaterThan(0);
+    scroll(scroller);
+    expect(reads.mock.calls.length).toBe(once);
+    expect(reader.viewport.get()).toEqual(view);
+    expect(reads.mock.calls.length).toBe(2 * once);
+  });
+});
+
 describe("replacing the document", () => {
   it("shows the new pages at the same zoom and scroll position, frees the old document's renders, and follows the new page count", () => {
     const log: string[] = [];
     const { reader, host, scrollTo, scroller, writes } = make(fakeDoc(3, log));
     reader.zoom.setScale(2);
     scrollTo(40, 500);
-    const before = host.querySelectorAll(".exv-pdf-page").length;
+    const before = host.querySelectorAll(".exav-viewer-pdf-page").length;
     expect(before).toBe(3);
     writes.x.length = writes.y.length = 0;
     reader.replace(fakeDoc(5), sizes(5));
-    expect(host.querySelectorAll(".exv-pdf-page")).toHaveLength(5);
+    expect(host.querySelectorAll(".exav-viewer-pdf-page")).toHaveLength(5);
     expect(reader.zoom.get().scale).toBe(2);
     // Put back where it was, after the new pages are laid out.
     expect([scroller.scrollLeft, scroller.scrollTop]).toEqual([40, 500]);
@@ -196,6 +257,6 @@ describe("replacing the document", () => {
     reader.replace(next, sizes(1));
     await new Promise((r) => setTimeout(r, 0));
     expect(reader.outline.get()).toEqual([{ title: "Intro", page: 1, depth: 0, offset: null }]);
-    expect(host.querySelector<HTMLAnchorElement>(".exv-pdf-link")?.href).toBe("https://example.test/new");
+    expect(host.querySelector<HTMLAnchorElement>(".exav-viewer-pdf-link")?.href).toBe("https://example.test/new");
   });
 });
diff --git a/crates/exav-viewer/ts/pdf/reader.ts b/crates/exav-viewer/ts/pdf/reader.ts
index a55a56f5..7b4d57e5 100644
--- a/crates/exav-viewer/ts/pdf/reader.ts
+++ b/crates/exav-viewer/ts/pdf/reader.ts
@@ -18,8 +18,8 @@
  * document scrolls there; one to an address calls `window.open`, which the
  * sandboxed frame turns into the host's question.
  */
-import { writable } from "../core/store.js";
-import type { DragController, OutlineEntry, PagesController, ZoomController, OutlineController } from "../core/types.js";
+import { onDemand, writable } from "../core/store.js";
+import type { DragController, OutlineEntry, PagesController, RasterRect, Viewport, ViewportController, ZoomController, OutlineController } from "../core/types.js";
 import { renderDpr, type LoadedPdf, type PageRegion, type PdfLink } from "./engine.js";
 
 export interface ReaderOptions {
@@ -35,7 +35,8 @@ export interface ReaderOptions {
 }
 
 export const READER_DEFAULTS: ReaderOptions = {
-  minZoom: 1,
+  // Zoom is a multiple of the page fitted to the width: a quarter shows a whole page, and more, on any screen.
+  minZoom: 0.25,
   maxZoom: 6,
   drag: "pan",
   prerenderMargin: "100%",
@@ -78,6 +79,8 @@ export interface Reader {
   zoom: ZoomController;
   drag: DragController;
   outline: OutlineController;
+  /** The part of the page in view. */
+  viewport: ViewportController;
   /**
    * Shows another document in place of this one, at the same zoom and scroll
    * position. The old `doc` is the caller's to destroy afterwards.
@@ -104,13 +107,13 @@ export function createReader(
   let sizes = initialSizes;
   let aspects = sizes.map((s) => s.width / s.height);
   const root = document.createElement("div");
-  root.className = "exv-pdf";
+  root.className = "exav-viewer-pdf";
   // Scrolling stays the browser's, zooming never is: its zoom takes the page.
   root.style.touchAction = "pan-x pan-y";
   const scroller = document.createElement("div");
-  scroller.className = "exv-pdf-scroller";
+  scroller.className = "exav-viewer-pdf-scroller";
   const content = document.createElement("div");
-  content.className = "exv-pdf-content";
+  content.className = "exav-viewer-pdf-content";
   scroller.append(content);
   root.append(scroller);
   host.append(root);
@@ -122,12 +125,12 @@ export function createReader(
   const build = () => {
     aspects.forEach((_, page) => {
       const box = document.createElement("div");
-      box.className = "exv-pdf-page";
+      box.className = "exav-viewer-pdf-page";
       box.dataset.page = String(page);
       const canvas = document.createElement("canvas");
-      canvas.className = "exv-pdf-bitmap";
+      canvas.className = "exav-viewer-pdf-bitmap";
       const detail = document.createElement("canvas");
-      detail.className = "exv-pdf-detail";
+      detail.className = "exav-viewer-pdf-detail";
       detail.setAttribute("aria-hidden", "true");
       box.append(canvas, detail);
       content.append(box);
@@ -153,13 +156,14 @@ export function createReader(
   });
   const zoomState = writable({ scale: 1, min: options.minZoom, max: options.maxZoom });
   const outline = writable<readonly OutlineEntry[]>([]);
+  const viewport = writable<Viewport | null>(null);
 
   // A drag pans where a page is larger than the viewer, if the user did not
   // choose to select; below that it selects, as there is nothing to pan.
   let choice = options.drag;
   const dragState = writable<{ mode: "pan" | "select"; available: boolean }>({ mode: "select", available: false });
   const updateDrag = () => {
-    const available = zoom > options.minZoom * ZOOMED;
+    const available = zoom > ZOOMED;
     const mode = available ? choice : "select";
     root.dataset.drag = mode;
     const now = dragState.get();
@@ -180,6 +184,7 @@ export function createReader(
       // What the text layer is sized by.
       box.style.setProperty("--scale-factor", String(w / (sizes[i]?.width || 1)));
     });
+    updateViewport();
   };
 
   // ── text and links ──
@@ -197,7 +202,7 @@ export function createReader(
 
   const linkElement = (link: PdfLink, area: PageRegion) => {
     const a = document.createElement("a");
-    a.className = "exv-pdf-link";
+    a.className = "exav-viewer-pdf-link";
     a.style.left = `${area.x * 100}%`;
     a.style.top = `${area.y * 100}%`;
     a.style.width = `${area.width * 100}%`;
@@ -216,9 +221,9 @@ export function createReader(
     const box = boxes[page];
     if (!box) return;
     const text = document.createElement("div");
-    text.className = "exv-pdf-text";
+    text.className = "exav-viewer-pdf-text";
     const links = document.createElement("div");
-    links.className = "exv-pdf-links";
+    links.className = "exav-viewer-pdf-links";
     box.append(text, links);
     let live = true;
     const task = doc.textLayer(page + 1, text);
@@ -226,7 +231,7 @@ export function createReader(
       () => {
         // What a selection dragged past the text lands on (see the stylesheet).
         const end = document.createElement("div");
-        end.className = "exv-pdf-text-end";
+        end.className = "exav-viewer-pdf-text-end";
         if (live) text.append(end);
       },
       // Without its text, the page is still shown.
@@ -258,10 +263,10 @@ export function createReader(
   // was: Firefox and WebKit otherwise move its start to the page's top (how
   // pdf.js's viewer does it).
   const onSelectStart = (e: MouseEvent) => {
-    (e.target as Element | null)?.closest?.(".exv-pdf-text")?.classList.add("exv-pdf-selecting");
+    (e.target as Element | null)?.closest?.(".exav-viewer-pdf-text")?.classList.add("exav-viewer-pdf-selecting");
   };
   const onSelectEnd = () => {
-    for (const layer of content.querySelectorAll(".exv-pdf-selecting")) layer.classList.remove("exv-pdf-selecting");
+    for (const layer of content.querySelectorAll(".exav-viewer-pdf-selecting")) layer.classList.remove("exav-viewer-pdf-selecting");
   };
 
   const draw = (page: number) => {
@@ -367,8 +372,30 @@ export function createReader(
     return page;
   };
 
+  /** Whether the viewport store has a listener: only then is it kept up to date. */
+  let following = false;
+  const updateViewport = () => following && measureViewport();
+  /** The part of the page in the middle of the viewer that is in view, in fractions of the page. */
+  const measureViewport = () => {
+    const page = currentPage();
+    const box = boxes[page - 1];
+    if (!box) return viewport.set(null);
+    const view = scroller.getBoundingClientRect();
+    const b = box.getBoundingClientRect();
+    const left = Math.max(b.left, view.left);
+    const top = Math.max(b.top, view.top);
+    const right = Math.min(b.right, view.left + scroller.clientWidth);
+    const bottom = Math.min(b.bottom, view.top + scroller.clientHeight);
+    if (!(b.width > 0 && b.height > 0 && right > left && bottom > top)) return viewport.set(null);
+    const next = { x: (left - b.left) / b.width, y: (top - b.top) / b.height, width: (right - left) / b.width, height: (bottom - top) / b.height };
+    const now = viewport.get();
+    const same = now && now.page === page && (["x", "y", "width", "height"] as const).every((k) => Math.abs((now.region as RasterRect)[k] - next[k]) < 1e-4);
+    if (!same) viewport.set({ space: "page", page, region: next });
+  };
+
   const onScroll = () => {
     pages.set({ unit: "page", current: currentPage(), total: aspects.length });
+    updateViewport();
     scheduleDetail();
   };
 
@@ -514,7 +541,7 @@ export function createReader(
   const onPanEnd = () => {
     const was = panning;
     panning = null;
-    root.classList.remove("exv-pdf-panning");
+    root.classList.remove("exav-viewer-pdf-panning");
     document.removeEventListener("mousemove", onPanMove);
     document.removeEventListener("mouseup", onPanEnd);
     if (!was?.moved) return;
@@ -532,7 +559,7 @@ export function createReader(
     e.preventDefault();
     e.stopPropagation();
     panning = { x: e.clientX, y: e.clientY, left: scroller.scrollLeft, top: scroller.scrollTop, moved: false };
-    root.classList.add("exv-pdf-panning");
+    root.classList.add("exav-viewer-pdf-panning");
     document.addEventListener("mousemove", onPanMove);
     document.addEventListener("mouseup", onPanEnd);
   };
@@ -626,6 +653,7 @@ export function createReader(
     scroller.scrollLeft = left;
     scroller.scrollTop = top;
     pages.set({ unit: "page", current: currentPage(), total: aspects.length });
+    updateViewport();
     refresh();
     scheduleDetail();
     loadOutline();
@@ -642,6 +670,14 @@ export function createReader(
       },
     },
     outline: { ...outline, goTo: (entry) => goTo(entry.page, entry.offset, true) },
+    viewport: onDemand(viewport, {
+      start() {
+        following = true;
+        measureViewport();
+        return () => void (following = false);
+      },
+      once: measureViewport,
+    }),
     replace,
     resize: measure,
     destroy() {
diff --git a/crates/exav-viewer/ts/pdf/renderer.ts b/crates/exav-viewer/ts/pdf/renderer.ts
index 59ecfcf1..6fe54882 100644
--- a/crates/exav-viewer/ts/pdf/renderer.ts
+++ b/crates/exav-viewer/ts/pdf/renderer.ts
@@ -1,4 +1,6 @@
-import type { FileSource, Renderer, SourceReader } from "../core/types.js";
+import { planRect } from "../core/pictures.js";
+import { createPictures } from "../core/raster.js";
+import type { FileSource, RasterRect, Renderer, SourceReader } from "../core/types.js";
 import { createPdfEngine, type LoadedPdf } from "./engine.js";
 import type { PdfOptions } from "./index.js";
 import { createReader, READER_DEFAULTS } from "./reader.js";
@@ -23,6 +25,7 @@ export const renderer: Renderer<PdfOptions> = {
       const streamed = !!given && "url" in given && !given.init;
       const source =
         given && "ranges" in given ? { ranges: given.ranges, onError: fail } : streamed ? { url: await reader.url() } : { data: await reader.bytes() };
+      if (reader === ctx.source) ctx.status({ phase: "loading", step: "read" });
       const doc = await engine.open(source, signal);
       if (signal.aborted) {
         doc.destroy();
@@ -57,9 +60,34 @@ export const renderer: Renderer<PdfOptions> = {
         ctx.status({ phase: "error", error: { code: "pdf", cause: error } });
       },
     );
+    const { controller: pictures, state: count } = createPictures({
+      count: current.doc.numPages,
+      space: "page",
+      async raster(page, options) {
+        const { doc, sizes } = current;
+        const size = sizes[page - 1]!;
+        const view = reader.viewport.get();
+        const here = view && view.space === "page" && view.page === page ? (view.region as RasterRect) : null;
+        const plan = planRect(options, { x: 0, y: 0, width: 1, height: 1 }, { x: size.width, y: size.height }, here);
+        try {
+          const bitmap = await doc.renderPageRegion(page, {
+            width: plan.width,
+            height: plan.height,
+            region: plan.region,
+            background: plan.background === "transparent" ? "rgba(0,0,0,0)" : plan.background,
+            signal: options.signal,
+          });
+          return { bitmap, width: plan.width, height: plan.height, page, space: "page", region: plan.region };
+        } catch (error) {
+          // Replaced or closed meanwhile, or a page pdf.js cannot draw.
+          if (doc === current.doc && !options.signal?.aborted) console.warn("pdf: could not draw a picture of a page", error);
+          throw error;
+        }
+      },
+    });
     ctx.status({ phase: "ready" });
     return {
-      controllers: { pages: reader.pages, zoom: reader.zoom, drag: reader.drag, outline: reader.outline },
+      controllers: { pages: reader.pages, zoom: reader.zoom, drag: reader.drag, outline: reader.outline, pictures, viewport: reader.viewport },
       resize: reader.resize,
       // The same document with other bytes (a report's preview after an
       // option changed): the zoom and scroll position stay.
@@ -68,6 +96,7 @@ export const renderer: Renderer<PdfOptions> = {
         const old = current;
         current = incoming;
         reader.replace(incoming.shown, incoming.sizes);
+        count.set({ count: incoming.doc.numPages, space: "page" });
         old.doc.destroy();
       },
       destroy() {
diff --git a/crates/exav-viewer/ts/react/ViewerBody.test.tsx b/crates/exav-viewer/ts/react/ViewerBody.test.tsx
index cf82fbe0..c91deea7 100644
--- a/crates/exav-viewer/ts/react/ViewerBody.test.tsx
+++ b/crates/exav-viewer/ts/react/ViewerBody.test.tsx
@@ -1,11 +1,12 @@
-import { act } from "react";
+import { act, useRef } from "react";
 import { createRoot } from "react-dom/client";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { writable } from "../core/store.js";
-import type { FormatPlugin, Status } from "../core/types.js";
+import type { FormatPlugin, Status, Warning } from "../core/types.js";
 import { createViewer } from "../core/viewer.js";
 import { ViewerProvider } from "./context.js";
+import { useFullscreen, usePanel } from "./hooks.js";
 import { ViewerBody } from "./ViewerBody.js";
 
 (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
@@ -113,7 +114,7 @@ it("a plugin's own label and error message replace the stock ones", async () =>
         </ViewerProvider>,
       ),
     );
-    return host.querySelector(".exv-status p")?.textContent;
+    return host.querySelector(".exav-viewer-status p")?.textContent;
   };
   expect(await said(saying("c", { phase: "converting", label: "Decoding the photo" }), "c")).toBe("Decoding the photo");
   expect(await said(saying("l", { phase: "loading", label: "Reading the HEIC" }), "l")).toBe("Reading the HEIC");
@@ -123,6 +124,11 @@ it("a plugin's own label and error message replace the stock ones", async () =>
   expect(await said(saying("f", { phase: "error", error: { code: "file" } }), "f")).not.toBe("Not a HEIC file");
   // A host's own code its table does not word shows the generic message, not the key.
   expect(await said(saying("h", { phase: "error", error: { code: "heic" } }), "h")).toBe("This file could not be shown.");
+  // A step: its message, and a bar when it counts.
+  expect(await said(saying("p", { phase: "converting", step: "convert", progress: 0.4 }), "p")).toBe("Converting the document…");
+  expect(host.querySelector('[role="progressbar"]')?.getAttribute("aria-valuenow")).toBe("40");
+  expect(await said(saying("q", { phase: "converting", step: "start" }), "q")).toBe("Starting the viewer…");
+  expect(host.querySelector('[role="progressbar"]')).toBeNull();
   await act(async () => root.unmount());
   host.remove();
 });
@@ -210,7 +216,7 @@ describe("the zoom buttons and the drag toggle", () => {
         </ViewerProvider>,
       ),
     );
-    const button = (label: string) => host.querySelector<HTMLButtonElement>(`.exv-tools button[aria-label="${label}"]`);
+    const button = (label: string) => host.querySelector<HTMLButtonElement>(`.exav-viewer-tools button[aria-label="${label}"]`);
     return { host, button, done: async () => (await act(async () => root.unmount()), host.remove()) };
   }
 
@@ -231,6 +237,202 @@ describe("the zoom buttons and the drag toggle", () => {
     await ui.done();
   });
 
+  it("the fit button is there once the view is not the fitted one, and not before", async () => {
+    const { zoom, withControls } = controls();
+    const ui = await show(withControls);
+    expect(ui.button("Fit to the window")).not.toBeNull();
+    // Leftmost: the buttons right of it do not move as it comes and goes.
+    expect(ui.button("Fit to the window")!.nextElementSibling).toBe(ui.button("Zoom out"));
+    await act(async () => zoom.set({ scale: 1.004, min: 0.25, max: 4 }));
+    expect(ui.button("Fit to the window")).toBeNull();
+    await act(async () => zoom.set({ scale: 0.5, min: 0.25, max: 4 }));
+    expect(ui.button("Fit to the window")).not.toBeNull();
+    await ui.done();
+  });
+
+  describe("the panel toggle", () => {
+    const entries = [
+      { title: "One", page: 1, depth: 0, offset: null },
+      { title: "Two", page: 2, depth: 0, offset: null },
+    ];
+    beforeEach(() => Object.defineProperty(document, "fullscreenEnabled", { configurable: true, get: () => true }));
+    afterEach(() => {
+      vi.unstubAllGlobals();
+      delete (document as unknown as Record<string, unknown>).fullscreenEnabled;
+    });
+    function withOutline(list: readonly (typeof entries)[number][]): FormatPlugin {
+      const { zoom, drag } = controls();
+      const outline = { ...writable(list), goTo: vi.fn() };
+      return {
+        ...plugin,
+        load: async () => ({
+          mount(host, c) {
+            c.controllers({ zoom, drag, outline });
+            c.status({ phase: "ready" });
+            return { controllers: { zoom, drag, outline }, destroy: () => {} };
+          },
+        }),
+      };
+    }
+
+    it("folds and unfolds the rail from the tools, beside the zoom buttons", async () => {
+      vi.stubGlobal("innerWidth", 1400);
+      const ui = await show(withOutline(entries));
+      const rail = () => ui.host.querySelector(".exav-viewer-rail");
+      expect(rail()).not.toBeNull();
+      // After the zoom buttons.
+      const toggle = ui.button("Hide the sections")!;
+      expect(toggle.getAttribute("aria-expanded")).toBe("true");
+      expect(toggle.closest(".exav-viewer-tool-group")!.previousElementSibling).toBe(ui.button("Zoom in")!.closest(".exav-viewer-tool-group"));
+      // In one group with full screen, at the right end of it.
+      expect([...toggle.parentElement!.children].map((b) => b.getAttribute("aria-label"))).toEqual(["Full screen", "Hide the sections"]);
+      await act(async () => toggle.click());
+      expect(rail()).toBeNull();
+      expect(ui.button("Hide the sections")).toBeNull();
+      await act(async () => ui.button("Sections")!.click());
+      expect(rail()).not.toBeNull();
+      expect(ui.button("Hide the sections")!.getAttribute("aria-expanded")).toBe("true");
+      await ui.done();
+    });
+
+    it("starts folded on a narrow screen, and is not there when the rail has nothing to show", async () => {
+      vi.stubGlobal("innerWidth", 800);
+      const narrow = await show(withOutline(entries));
+      expect(narrow.host.querySelector(".exav-viewer-rail")).toBeNull();
+      expect(narrow.button("Sections")!.getAttribute("aria-expanded")).toBe("false");
+      await narrow.done();
+      const alone = await show(withOutline(entries.slice(0, 1)));
+      expect(alone.button("Sections")).toBeNull();
+      expect(alone.button("Hide the sections")).toBeNull();
+      await alone.done();
+    });
+
+    it("a rail of the host's own, given its info to usePanel, brings the default toggle and follows the fold", async () => {
+      vi.stubGlobal("innerWidth", 1400);
+      const Mine = () => {
+        const { open } = usePanel({ title: "Mine", hideLabel: "Hide mine", icon: <i />, controls: "mine" });
+        return open ? <aside id="mine">mine</aside> : null;
+      };
+      const ui = await show(withOutline(entries), { OutlineRail: () => <Mine /> });
+      expect(ui.host.querySelector("#mine")).not.toBeNull();
+      await act(async () => ui.button("Hide mine")!.click());
+      expect(ui.host.querySelector("#mine")).toBeNull();
+      await act(async () => ui.button("Mine")!.click());
+      expect(ui.host.querySelector("#mine")).not.toBeNull();
+      await ui.done();
+    });
+
+    it("a toggle of the host's own reads and sets the state with usePanel", async () => {
+      vi.stubGlobal("innerWidth", 1400);
+      const Toggle = () => {
+        const { open, setOpen } = usePanel();
+        return (
+          <button id="mine" onClick={() => setOpen(!open)}>
+            {String(open)}
+          </button>
+        );
+      };
+      const ui = await show(withOutline(entries), { PanelToggle: Toggle });
+      const mine = () => ui.host.querySelector<HTMLButtonElement>("#mine")!;
+      expect(mine().textContent).toBe("true");
+      await act(async () => mine().click());
+      expect(mine().textContent).toBe("false");
+      expect(ui.host.querySelector(".exav-viewer-rail")).toBeNull();
+      await ui.done();
+    });
+
+    it("is always open outside a viewer", async () => {
+      let state!: ReturnType<typeof usePanel>;
+      const Probe = () => ((state = usePanel()), null);
+      const host = document.createElement("div");
+      const root = createRoot(host);
+      await act(async () => root.render(<Probe />));
+      expect(state.open).toBe(true);
+      expect(() => state.setOpen(false)).not.toThrow();
+      await act(async () => root.unmount());
+    });
+  });
+
+  describe("full screen", () => {
+    function support(enabled: boolean) {
+      const requestFullscreen = vi.fn(async () => {});
+      const exitFullscreen = vi.fn(async () => {});
+      let element: Element | null = null;
+      Object.defineProperties(document, {
+        fullscreenEnabled: { configurable: true, get: () => enabled },
+        fullscreenElement: { configurable: true, get: () => element },
+        exitFullscreen: { configurable: true, value: exitFullscreen },
+      });
+      HTMLElement.prototype.requestFullscreen = requestFullscreen;
+      return {
+        requestFullscreen,
+        exitFullscreen,
+        enter: (el: Element | null) => {
+          element = el;
+          document.dispatchEvent(new Event("fullscreenchange"));
+        },
+      };
+    }
+    afterEach(() => {
+      for (const k of ["fullscreenEnabled", "fullscreenElement", "exitFullscreen"]) delete (document as unknown as Record<string, unknown>)[k];
+      delete (HTMLElement.prototype as { requestFullscreen?: unknown }).requestFullscreen;
+    });
+
+    it("puts the viewer's box in full screen, and leaves it", async () => {
+      const full = support(true);
+      const { withControls } = controls();
+      const ui = await show(withControls);
+      await act(async () => ui.button("Full screen")!.click());
+      expect(full.requestFullscreen).toHaveBeenCalledTimes(1);
+      expect(full.requestFullscreen.mock.contexts[0]).toBe(ui.host.querySelector(".exav-viewer-body"));
+      await act(async () => full.enter(ui.host.querySelector(".exav-viewer-body")));
+      expect(ui.button("Full screen")).toBeNull();
+      await act(async () => ui.button("Leave full screen")!.click());
+      expect(full.exitFullscreen).toHaveBeenCalledTimes(1);
+      await act(async () => full.enter(null));
+      expect(ui.button("Full screen")).not.toBeNull();
+      await ui.done();
+    });
+
+    it("useFullscreen serves a box of the host's own", async () => {
+      const full = support(true);
+      let api!: ReturnType<typeof useFullscreen>;
+      const Box = () => {
+        const ref = useRef<HTMLDivElement>(null);
+        api = useFullscreen(() => ref.current);
+        return <div ref={ref} id="box" />;
+      };
+      const host = document.createElement("div");
+      document.body.append(host);
+      const root = createRoot(host);
+      await act(async () => root.render(<Box />));
+      const box = host.querySelector("#box");
+      expect(api.supported).toBe(true);
+      expect(api.active).toBe(false);
+      await act(async () => api.toggle());
+      expect(full.requestFullscreen.mock.contexts[0]).toBe(box);
+      await act(async () => full.enter(box));
+      expect(api.active).toBe(true);
+      // Another element in full screen is not this one.
+      await act(async () => full.enter(host));
+      expect(api.active).toBe(false);
+      await act(async () => full.enter(box));
+      await act(async () => api.toggle());
+      expect(full.exitFullscreen).toHaveBeenCalledTimes(1);
+      await act(async () => root.unmount());
+      host.remove();
+    });
+
+    it("is not offered where the browser has no full screen", async () => {
+      support(false);
+      const { withControls } = controls();
+      const ui = await show(withControls);
+      expect(ui.button("Full screen")).toBeNull();
+      expect(ui.button("Zoom in")).not.toBeNull();
+      await ui.done();
+    });
+  });
+
   it("the toggle shows the mode, switches it, and is not there when there is no choice", async () => {
     const { state, drag, withControls } = controls();
     const ui = await show(withControls);
@@ -249,7 +451,7 @@ describe("the zoom buttons and the drag toggle", () => {
     const { withControls } = controls();
     const ui = await show(withControls, { ZoomControls: () => null, DragToggle: () => <b id="mine">mine</b> });
     expect(ui.button("Zoom in")).toBeNull();
-    expect(ui.host.querySelector(".exv-tools #mine")).not.toBeNull();
+    expect(ui.host.querySelector(".exav-viewer-tools #mine")).not.toBeNull();
     await ui.done();
   });
 });
@@ -268,7 +470,7 @@ it("a provider given a viewer uses it as it is, whatever plugins it is also give
     ),
   );
   expect(mount).toHaveBeenCalledTimes(1);
-  expect(host.querySelector(".exv-body")?.getAttribute("data-phase")).toBe("ready");
+  expect(host.querySelector(".exav-viewer-body")?.getAttribute("data-phase")).toBe("ready");
   await act(async () => root.unmount());
   host.remove();
 });
@@ -295,9 +497,9 @@ it("the warnings can be dismissed, and come back when they change", async () =>
       </ViewerProvider>,
     ),
   );
-  const box = () => host.querySelector(".exv-warnings");
+  const box = () => host.querySelector(".exav-viewer-warnings");
   expect(box()?.textContent).toMatch(/3/);
-  await act(async () => host.querySelector<HTMLButtonElement>(".exv-warnings button")!.click());
+  await act(async () => host.querySelector<HTMLButtonElement>(".exav-viewer-warnings button")!.click());
   expect(box()).toBeNull();
   await act(async () => warnings.set([{ key: "proxy_without_graphics", count: 4 }]));
   expect(box()?.textContent).toMatch(/4/);
@@ -305,6 +507,35 @@ it("the warnings can be dismissed, and come back when they change", async () =>
   host.remove();
 });
 
+it("a warning lists the names it carries after its message", async () => {
+  const warnings = writable<Warning[]>([{ key: "external_references", count: 2, names: ["walls.dwg", "photo.png"] }]);
+  const plugin2: FormatPlugin = {
+    ...plugin,
+    load: async () => ({
+      mount(host, c) {
+        c.controllers({ warnings });
+        c.status({ phase: "ready" });
+        return { controllers: { warnings }, destroy: () => {} };
+      },
+    }),
+  };
+  const host = document.createElement("div");
+  document.body.append(host);
+  const root = createRoot(host);
+  await act(async () =>
+    root.render(
+      <ViewerProvider plugins={[plugin2]}>
+        <ViewerBody file={file("w")} />
+      </ViewerProvider>,
+    ),
+  );
+  const p = host.querySelector(".exav-viewer-warnings p");
+  expect(p?.textContent).toBe("2 external references are not drawn. walls.dwg, photo.png");
+  expect(p?.querySelector(".exav-viewer-warning-names")?.textContent).toBe(" walls.dwg, photo.png");
+  await act(async () => root.unmount());
+  host.remove();
+});
+
 it("the outline rail shows from two entries, not for one", async () => {
   const entry = (title: string) => ({ title, page: 1, depth: 0, offset: null });
   const outlined = (entries: ReturnType<typeof entry>[]): FormatPlugin => ({
@@ -329,7 +560,7 @@ it("the outline rail shows from two entries, not for one", async () => {
         </ViewerProvider>,
       ),
     );
-    return host.querySelectorAll(".exv-outline-entry").length;
+    return host.querySelectorAll(".exav-viewer-outline-entry").length;
   };
   expect(await shown([entry("Only")])).toBe(0);
   expect(await shown([entry("One"), entry("Two")])).toBe(2);
@@ -337,6 +568,45 @@ it("the outline rail shows from two entries, not for one", async () => {
   host.remove();
 });
 
+it("a workbook's sheets are tabs below it, from two sheets, the current one selected", async () => {
+  const selected: number[] = [];
+  const state = writable({ items: [{ index: 0, name: "Quote" }], current: 0 });
+  const sheets = { ...state, select: async (i: number) => void selected.push(i) };
+  const book: FormatPlugin = {
+    ...plugin,
+    load: async () => ({
+      mount(host, c) {
+        c.status({ phase: "ready" });
+        return { controllers: { sheets }, destroy: () => {} };
+      },
+    }),
+  };
+  const host = document.createElement("div");
+  document.body.append(host);
+  const root = createRoot(host);
+  await act(async () =>
+    root.render(
+      <ViewerProvider plugins={[book]} locale="de">
+        <ViewerBody file={file("book")} />
+      </ViewerProvider>,
+    ),
+  );
+  expect(host.querySelector(".exav-viewer-sheet-tabs")).toBeNull();
+  await act(async () => state.set({ items: [{ index: 0, name: "Quote" }, { index: 1, name: "Notes" }], current: 0 }));
+  const tabs = [...host.querySelectorAll<HTMLButtonElement>(".exav-viewer-sheet-tab")];
+  expect(tabs.map((t) => [t.textContent, t.getAttribute("aria-selected")])).toEqual([
+    ["Quote", "true"],
+    ["Notes", "false"],
+  ]);
+  expect(host.querySelector(".exav-viewer-sheet-tabs")!.getAttribute("aria-label")).toBe("Tabellenblätter");
+  // Below the surface, in the stage's flow: not over the sheet.
+  expect(host.querySelector(".exav-viewer-stage > .exav-viewer-sheet-tabs")).not.toBeNull();
+  await act(async () => tabs[1]!.click());
+  expect(selected).toEqual([1]);
+  await act(async () => root.unmount());
+  host.remove();
+});
+
 // A host's own buttons need the session's controllers (zoom, say), which
 // `onStatus` and `onPages` do not give.
 it("children are drawn in the stage, and a function of them gets the session's state", async () => {
@@ -371,8 +641,8 @@ it("children are drawn in the stage, and a function of them gets the session's s
       </ViewerProvider>,
     ),
   );
-  expect(host.querySelector(".exv-stage #mine")).not.toBeNull();
-  expect(host.querySelector(".exv-stage #plain")).not.toBeNull();
+  expect(host.querySelector(".exav-viewer-stage #mine")).not.toBeNull();
+  expect(host.querySelector(".exav-viewer-stage #plain")).not.toBeNull();
   expect(seen.at(-1)).toEqual({ phase: "ready", total: 3, session: true });
   await act(async () => root.unmount());
   host.remove();
diff --git a/crates/exav-viewer/ts/react/ViewerBody.tsx b/crates/exav-viewer/ts/react/ViewerBody.tsx
index 36f1aac0..56fd4709 100644
--- a/crates/exav-viewer/ts/react/ViewerBody.tsx
+++ b/crates/exav-viewer/ts/react/ViewerBody.tsx
@@ -1,8 +1,8 @@
-import { useEffect, useState, type ReactNode } from "react";
+import { useEffect, useMemo, useState, type ReactNode } from "react";
 import { createPortal } from "react-dom";
 
 import type { Controllers, Session, Status, ViewerFile } from "../core/types.js";
-import { useSession, useStore } from "./hooks.js";
+import { PanelContext, RAIL_FITS, useSession, useStore, type PanelInfo } from "./hooks.js";
 import { Piece } from "./parts.js";
 
 export interface ViewerBodyProps {
@@ -33,16 +33,19 @@ function Layer({ session, depth, rails, bars }: { session: Session; depth: numbe
   const status = useStore(session.status) ?? { phase: "loading" as const };
   const c = useStore(session.controllers) ?? {};
   const archive = useStore(c.archive);
-  const info = useStore(c.info);
   const warnings = useStore(c.warnings);
   const opened = archive?.opened;
+  // The rail's fold state is here, as its toggle is among the tools. Decided once: turning a tablet must not close it.
+  const [panelOpen, setPanelOpen] = useState(() => typeof window === "undefined" || window.innerWidth >= RAIL_FITS);
+  const [panel, setPanel] = useState<PanelInfo | null>(null);
+  const panelContext = useMemo(() => ({ open: panelOpen, setOpen: setPanelOpen, register: setPanel }), [panelOpen]);
   if (opened && c.archive) {
     return (
       <>
         {bars &&
           createPortal(
             // Portals into one element do not keep their order: `order` does.
-            <div className="exv-stack" style={{ order: depth }}>
+            <div className="exav-viewer-stack" style={{ order: depth }}>
               <Piece name="ArchiveBack" props={{ archive: c.archive, name: opened.member.name }} />
             </div>,
             bars,
@@ -51,17 +54,21 @@ function Layer({ session, depth, rails, bars }: { session: Session; depth: numbe
       </>
     );
   }
-  const drawing = c.layers || c.layouts || c.ground || c.selection;
+  const drawing = c.layers || c.storeys || c.layouts || c.ground || c.selection;
   return (
-    <>
+    <PanelContext.Provider value={panelContext}>
       {c.archive && <Piece name="ArchiveList" props={{ archive: c.archive }} />}
       {c.pages && <Piece name="SlidePager" props={{ pages: c.pages }} />}
-      {info && <Piece name="InfoBadge" props={{ format: session.format, info }} />}
+      {c.sheets && <Piece name="SheetTabs" props={{ sheets: c.sheets }} />}
       {warnings && <Piece name="Warnings" props={{ warnings }} />}
-      {(c.zoom || c.drag) && (
-        <div className="exv-tools">
+      {(c.zoom || c.drag || c.pictures || panel) && (
+        <div className="exav-viewer-tools">
           {c.drag && <Piece name="DragToggle" props={{ drag: c.drag }} />}
           {c.zoom && <Piece name="ZoomControls" props={{ zoom: c.zoom }} />}
+          <div className="exav-viewer-tool-group exav-viewer-tool-end" role="group">
+            <Piece name="FullscreenToggle" props={{}} />
+            {panel && <Piece name="PanelToggle" props={{ ...panel, open: panelOpen, toggle: () => setPanelOpen(!panelOpen) }} />}
+          </div>
         </div>
       )}
       <Piece name="StatusOverlay" props={{ status, format: session.format }} />
@@ -69,11 +76,11 @@ function Layer({ session, depth, rails, bars }: { session: Session; depth: numbe
         createPortal(
           <>
             {c.outline && <Piece name="OutlineRail" props={{ outline: c.outline }} />}
-            {drawing && <Piece name="DrawingRail" props={{ layers: c.layers, layouts: c.layouts, ground: c.ground, selection: c.selection }} />}
+            {drawing && <Piece name="DrawingRail" props={{ layers: c.layers, storeys: c.storeys, layouts: c.layouts, ground: c.ground, selection: c.selection }} />}
           </>,
           rails,
         )}
-    </>
+    </PanelContext.Provider>
   );
 }
 
@@ -116,19 +123,19 @@ export function ViewerBody({ file, chrome = "default", onStatus, onPages, classN
   const pending = !file.source;
   return (
     // `data-phase`: the session's phase, for a host's styles and tests.
-    <div className={`exv-body${className ? ` ${className}` : ""}`} data-phase={pending ? "pending" : status.phase}>
-      <div className="exv-main">
-        {chrome === "default" && <div ref={setBars} className="exv-bars" />}
+    <div className={`exav-viewer-body${className ? ` ${className}` : ""}`} data-phase={pending ? "pending" : status.phase}>
+      <div className="exav-viewer-main">
+        {chrome === "default" && <div ref={setBars} className="exav-viewer-bars" />}
         {/* The overlays cover the stage, never the bars above it. */}
-        <div className="exv-stage">
-          <div ref={ref} className="exv-surface" />
+        <div className="exav-viewer-stage">
+          <div ref={ref} className="exav-viewer-surface" />
           {pending && file.placeholder && <Piece name="Placeholder" props={{ state: file.placeholder.state, label: file.placeholder.label }} />}
           {pending && !file.placeholder && <Piece name="Placeholder" props={{ state: "unavailable" }} />}
           {chrome === "default" && session && <Layer session={session} depth={0} rails={rails} bars={bars} />}
           {typeof children === "function" ? children({ session, status, controllers }) : children}
         </div>
       </div>
-      {chrome === "default" && <div ref={setRails} className="exv-rails" />}
+      {chrome === "default" && <div ref={setRails} className="exav-viewer-rails" />}
       {session && onPages && <PagesOf session={session} onPages={onPages} />}
     </div>
   );
diff --git a/crates/exav-viewer/ts/react/ViewerDialog.test.tsx b/crates/exav-viewer/ts/react/ViewerDialog.test.tsx
index e2c083f6..38f12ccf 100644
--- a/crates/exav-viewer/ts/react/ViewerDialog.test.tsx
+++ b/crates/exav-viewer/ts/react/ViewerDialog.test.tsx
@@ -72,13 +72,13 @@ function Stack({ locale }: { locale: string }) {
   );
 }
 
-const title = () => document.querySelector(".exv-dialog-title")?.textContent;
-const counter = () => document.querySelector(".exv-counter")?.textContent;
+const title = () => document.querySelector(".exav-viewer-dialog-title")?.textContent;
+const counter = () => document.querySelector(".exav-viewer-counter")?.textContent;
 const key = (k: string) => act(async () => void window.dispatchEvent(new KeyboardEvent("keydown", { key: k })));
 
 it("walks the stack with the arrow keys, round from the first to the last", async () => {
   await act(async () => root.render(<Stack locale="en" />));
-  expect(document.querySelector<HTMLDialogElement>("dialog.exv-dialog")?.open).toBe(true);
+  expect(document.querySelector<HTMLDialogElement>("dialog.exav-viewer-dialog")?.open).toBe(true);
   expect([title(), counter()]).toEqual(["AFAKE", "1 / 3"]);
   await key("ArrowRight");
   expect([title(), counter()]).toEqual(["BFAKE", "2 / 3"]);
@@ -90,10 +90,20 @@ it("walks the stack with the arrow keys, round from the first to the last", asyn
 
 it("closes on Escape, which the browser sends to the dialog as cancel", async () => {
   await act(async () => root.render(<Stack locale="en" />));
-  const dialog = document.querySelector("dialog.exv-dialog")!;
+  const dialog = document.querySelector("dialog.exav-viewer-dialog")!;
   await act(async () => void dialog.dispatchEvent(new Event("cancel", { cancelable: true })));
   expect(changes).toEqual([null]);
-  expect(document.querySelector("dialog.exv-dialog")).toBeNull();
+  expect(document.querySelector("dialog.exav-viewer-dialog")).toBeNull();
+});
+
+it("closes on an Escape a sandboxed frame hands back, and on no other made-up one", async () => {
+  await act(async () => root.render(<Stack locale="en" />));
+  await key("Escape");
+  expect(changes).toEqual([]);
+  const frame = document.createElement("iframe");
+  document.querySelector("dialog.exav-viewer-dialog")!.append(frame);
+  await act(async () => void frame.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true })));
+  expect(changes).toEqual([null]);
 });
 
 it("speaks the provider's language", async () => {
diff --git a/crates/exav-viewer/ts/react/ViewerDialog.tsx b/crates/exav-viewer/ts/react/ViewerDialog.tsx
index 60aa2626..6af1bbc7 100644
--- a/crates/exav-viewer/ts/react/ViewerDialog.tsx
+++ b/crates/exav-viewer/ts/react/ViewerDialog.tsx
@@ -76,14 +76,16 @@ export function ViewerDialog<Meta = unknown>({ items, index, onIndexChange, widt
     [index, n, onIndexChange],
   );
   useEffect(() => {
-    if (!open || n < 2) return;
+    if (!open) return;
     const onKey = (e: KeyboardEvent) => {
       if (e.key === "ArrowLeft") go(-1);
       else if (e.key === "ArrowRight") go(1);
+      // Escape handed back by a sandboxed frame: the dialog closes only on one the browser saw.
+      else if (e.key === "Escape" && !e.isTrusted && e.target instanceof HTMLIFrameElement) onIndexChange(null);
     };
     window.addEventListener("keydown", onKey);
     return () => window.removeEventListener("keydown", onKey);
-  }, [open, n, go]);
+  }, [open, go, onIndexChange]);
 
   const url = item ? urlOf(item) : null;
   const save = () => {
@@ -98,7 +100,7 @@ export function ViewerDialog<Meta = unknown>({ items, index, onIndexChange, widt
   const title = item ? (
     <>
       {item.title}
-      {item.hint && <span className="exv-hint">{item.hint}</span>}
+      {item.hint && <span className="exav-viewer-hint">{item.hint}</span>}
     </>
   ) : null;
 
@@ -111,53 +113,53 @@ export function ViewerDialog<Meta = unknown>({ items, index, onIndexChange, widt
         title: item?.title ?? "",
         width,
         children: item && (
-          <div className="exv-dialog-inner">
-            <header className="exv-dialog-head">
-              <h2 className="exv-dialog-title">{title}</h2>
-              <button type="button" className="exv-icon-button" onClick={() => onIndexChange(null)} aria-label={t("close")}>
+          <div className="exav-viewer-dialog-inner">
+            <header className="exav-viewer-dialog-head">
+              <h2 className="exav-viewer-dialog-title">{title}</h2>
+              <button type="button" className="exav-viewer-icon-button" onClick={() => onIndexChange(null)} aria-label={t("close")}>
                 <Close />
               </button>
             </header>
             {notice}
-            <div className="exv-frame">
+            <div className="exav-viewer-frame">
               <ViewerBody key={item.id} file={item} onPages={onPages} />
             </div>
-            <footer className="exv-dialog-foot">
-              <div className="exv-foot-left">
+            <footer className="exav-viewer-dialog-foot">
+              <div className="exav-viewer-foot-left">
                 {n > 1 && (
                   <>
-                    <button type="button" className="exv-icon-button" onClick={() => go(-1)} aria-label={t("prev")}>
+                    <button type="button" className="exav-viewer-icon-button" onClick={() => go(-1)} aria-label={t("prev")}>
                       <ChevronLeft />
                     </button>
-                    <button type="button" className="exv-icon-button" onClick={() => go(1)} aria-label={t("next")}>
+                    <button type="button" className="exav-viewer-icon-button" onClick={() => go(1)} aria-label={t("next")}>
                       <ChevronRight />
                     </button>
-                    <span className="exv-counter" aria-live="polite">
+                    <span className="exav-viewer-counter" aria-live="polite">
                       {t("counter", { current: (index ?? 0) + 1, total: n })}
                     </span>
                   </>
                 )}
                 {pages && pages.total > 1 && (
-                  <span className={`exv-counter exv-muted${n > 1 ? " exv-separated" : ""}`} aria-live="polite">
+                  <span className={`exav-viewer-counter exav-viewer-muted${n > 1 ? " exav-viewer-separated" : ""}`} aria-live="polite">
                     {t("page_of", pages)}
                   </span>
                 )}
               </div>
-              <div className="exv-foot-right">
+              <div className="exav-viewer-foot-right">
                 {actions?.(item)}
                 {canOpenInTab(url) && (
-                  <a className="exv-button exv-button-outline" href={url ?? ""} target="_blank" rel="noreferrer">
+                  <a className="exav-viewer-button exav-viewer-button-outline" href={url ?? ""} target="_blank" rel="noreferrer">
                     <External />
                     {t("open_in_tab")}
                   </a>
                 )}
                 {item.download?.resolveUrl ? (
-                  <button type="button" className="exv-button" disabled={saving} onClick={save}>
+                  <button type="button" className="exav-viewer-button" disabled={saving} onClick={save}>
                     {saving ? <Spinner /> : <Download />}
                     {t("download")}
                   </button>
                 ) : url ? (
-                  <a className="exv-button" href={url} download={item.download?.fileName ?? true}>
+                  <a className="exav-viewer-button" href={url} download={item.download?.fileName ?? true}>
                     <Download />
                     {t("download")}
                   </a>
diff --git a/crates/exav-viewer/ts/react/hooks.ts b/crates/exav-viewer/ts/react/hooks.ts
index dd98750d..981ce806 100644
--- a/crates/exav-viewer/ts/react/hooks.ts
+++ b/crates/exav-viewer/ts/react/hooks.ts
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { createContext, useContext, useEffect, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
 
 import { sameSource } from "../core/source.js";
 import type { Store } from "../core/store.js";
@@ -70,3 +70,65 @@ export function useSession(file: ViewerFile | null) {
   const controllers: Controllers = useStore(session?.controllers) ?? {};
   return { session, status, controllers, ref: setHost };
 }
+
+// ── The tools' state, for the default pieces and for a host's own ───────────
+
+/** Below this width the side panel starts folded. Decided once: turning a tablet must not close it. */
+export const RAIL_FITS = 1024;
+
+/** What the panel's toggle says about the rail it folds. */
+export interface PanelInfo {
+  title: string;
+  hideLabel: string;
+  icon: ReactNode;
+  /** The rail's id, for the toggle's `aria-controls`. */
+  controls: string;
+}
+
+/** Shared by the rails and the toggle among the tools (`ViewerBody` provides it). */
+export const PanelContext = createContext<{ open: boolean; setOpen: (open: boolean) => void; register: (info: PanelInfo | null) => void } | null>(null);
+
+const NO_OP = () => {};
+
+/**
+ * The side panel's fold state, shared by the rails and the toggle among the
+ * tools; outside a viewer, always open. A rail of a host's own gives its
+ * `info` and shows the default toggle for as long as it is mounted; read
+ * `open` to draw or not.
+ */
+export function usePanel(info?: PanelInfo): { open: boolean; setOpen: (open: boolean) => void } {
+  const panel = useContext(PanelContext);
+  const register = panel?.register;
+  // The icon is the same for as long as the rail is: left out of the deps.
+  useEffect(() => {
+    if (!info) return undefined;
+    register?.(info);
+    return () => register?.(null);
+  }, [register, info?.title, info?.hideLabel, info?.controls]);
+  return { open: panel ? panel.open : true, setOpen: panel?.setOpen ?? NO_OP };
+}
+
+/**
+ * Full screen for the element `target` returns (a host's own box, or the
+ * viewer's `.exav-viewer-body`), asked for from the host page, so a sandboxed
+ * frame needs no permission. `supported` is false where the browser has none.
+ */
+export function useFullscreen(target: () => HTMLElement | null): { supported: boolean; active: boolean; toggle: () => void } {
+  const latest = useRef(target);
+  latest.current = target;
+  const [active, setActive] = useState(false);
+  useEffect(() => {
+    const sync = () => setActive(document.fullscreenElement !== null && document.fullscreenElement === latest.current());
+    document.addEventListener("fullscreenchange", sync);
+    sync();
+    return () => document.removeEventListener("fullscreenchange", sync);
+  }, []);
+  const supported = typeof document !== "undefined" && document.fullscreenEnabled === true;
+  const toggle = () => {
+    const el = latest.current();
+    if (!el) return;
+    // A refusal (a host page in a frame without `allow="fullscreen"`) leaves the view as it was.
+    void (active ? document.exitFullscreen() : el.requestFullscreen()).catch(() => {});
+  };
+  return { supported, active, toggle };
+}
diff --git a/crates/exav-viewer/ts/react/icons.tsx b/crates/exav-viewer/ts/react/icons.tsx
index a3b32536..8af36e77 100644
--- a/crates/exav-viewer/ts/react/icons.tsx
+++ b/crates/exav-viewer/ts/react/icons.tsx
@@ -33,7 +33,7 @@ export const External = () => (
   </Svg>
 );
 export const Spinner = () => (
-  <span className="exv-spinner" aria-hidden="true">
+  <span className="exav-viewer-spinner" aria-hidden="true">
     <Svg>
       <path d="M21 12a9 9 0 1 1-6.219-8.56" />
     </Svg>
@@ -65,11 +65,22 @@ export const Minus = () => (
     <path d="M5 12h14" />
   </Svg>
 );
-export const FitIcon = () => (
+/** A counter-clockwise arrow: back to the view the file opened in. */
+export const ResetIcon = () => (
+  <Svg size={18}>
+    <path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8M3 3v5h5" />
+  </Svg>
+);
+export const FullscreenIcon = () => (
   <Svg size={18}>
     <path d="M8 3H5a2 2 0 0 0-2 2v3M21 8V5a2 2 0 0 0-2-2h-3M3 16v3a2 2 0 0 0 2 2h3M16 21h3a2 2 0 0 0 2-2v-3" />
   </Svg>
 );
+export const FullscreenExitIcon = () => (
+  <Svg size={18}>
+    <path d="M8 3v3a2 2 0 0 1-2 2H3M21 8h-3a2 2 0 0 1-2-2V3M3 16h3a2 2 0 0 1 2 2v3M16 21v-3a2 2 0 0 1 2-2h3" />
+  </Svg>
+);
 export const Hand = () => (
   <Svg size={18}>
     <path d="M18 11V6a2 2 0 0 0-4 0M14 10V4a2 2 0 0 0-4 0v2M10 10.5V6a2 2 0 0 0-4 0v8M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.9-5.9-2.4L3.4 16a2 2 0 0 1 3.2-2.4L8 15" />
diff --git a/crates/exav-viewer/ts/react/index.ts b/crates/exav-viewer/ts/react/index.ts
index daacf0c7..e8085e70 100644
--- a/crates/exav-viewer/ts/react/index.ts
+++ b/crates/exav-viewer/ts/react/index.ts
@@ -9,33 +9,8 @@
 export { ViewerProvider, useViewer, type ViewerProviderProps } from "./context.js";
 export { ViewerBody, type ViewerBodyProps } from "./ViewerBody.js";
 export { ViewerDialog, type ViewerDialogItem, type ViewerDialogProps } from "./ViewerDialog.js";
-export { useSession, useStore } from "./hooks.js";
+export { useFullscreen, usePanel, useSession, useStore, type PanelInfo } from "./hooks.js";
 export { reactOverlay } from "./overlay.js";
-export { builtinTranslate, MESSAGES, type MessageKey, type Translate } from "./messages.js";
-export { formatBytes, type ViewerComponents, type ShellProps, type StatusOverlayProps, type PlaceholderProps, type OutlineRailProps, type DrawingRailProps, type SlidePagerProps, type ArchiveListProps, type ArchiveBackProps, type InfoBadgeProps, type WarningsProps, type ZoomControlsProps, type DragToggleProps } from "./parts.js";
-
-/**
- * The CSS custom properties of the default UI, with their default values.
- * Set any of them on an ancestor (or `:root`) to restyle.
- */
-export const TOKENS = {
-  "--exv-surface": "#f1f5f9",
-  "--exv-panel": "#ffffff",
-  "--exv-border": "#e2e8f0",
-  "--exv-text": "#334155",
-  "--exv-text-strong": "#0f172a",
-  "--exv-muted": "#64748b",
-  "--exv-faint": "#94a3b8",
-  "--exv-hover": "#f8fafc",
-  "--exv-active": "#f1f5f9",
-  "--exv-accent": "#0f172a",
-  "--exv-on-accent": "#ffffff",
-  "--exv-error": "#b91c1c",
-  "--exv-warning": "#b45309",
-  "--exv-media-bg": "#0f172a",
-  "--exv-model-bg": "radial-gradient(circle at 50% 30%, #ffffff 0%, #e2e8f0 55%, #cbd5e1 100%)",
-  "--exv-radius": "0.375rem",
-  "--exv-rail-width": "15rem",
-  "--exv-tap": "2.75rem",
-  "--exv-font": "inherit",
-} as const;
+export { builtinLanguage, builtinTranslate, MESSAGES, type MessageKey, type Translate } from "./messages.js";
+export { formatBytes, type ViewerComponents, type ShellProps, type StatusOverlayProps, type PlaceholderProps, type OutlineRailProps, type DrawingRailProps, type SlidePagerProps, type SheetTabsProps, type ArchiveListProps, type ArchiveBackProps, type WarningsProps, type ZoomControlsProps, type DragToggleProps, type FullscreenToggleProps, type PanelToggleProps } from "./parts.js";
+export { TOKENS } from "../core/theme.js";
diff --git a/crates/exav-viewer/ts/react/messages.ts b/crates/exav-viewer/ts/react/messages.ts
index 79c408c9..441bb433 100644
--- a/crates/exav-viewer/ts/react/messages.ts
+++ b/crates/exav-viewer/ts/react/messages.ts
@@ -1,171 +1,2 @@
-/**
- * The built-in strings, English and French. A host with its own i18n passes
- * `translate` instead. Plural keys are written without their `_one`/`_other`
- * suffix and receive `count`.
- */
-export const MESSAGES = {
-  en: {
-    archive_back: "Back to the archive",
-    archive_failed_member: "This file could not be extracted.",
-    archive_member_encrypted: "This file is encrypted.",
-    archive_member_unsupported: "This file could not be read out of the archive.",
-    archive_members_one: "{{count}} file",
-    archive_members_other: "{{count}} files",
-    archive_no_reader: "This file cannot be shown here.",
-    background: "Background",
-    background_dark: "Dark",
-    background_light: "Light",
-    categories: "Categories",
-    close: "Close",
-    converting_model: "Preparing the model… {{percent}}%",
-    counter: "{{current}} / {{total}}",
-    download: "Download",
-    drag_pan: "Move the page",
-    drag_select: "Select text",
-    drawing: "Preparing the image…",
-    drawing_panel: "Drawing",
-    empty_model: "This model has nothing to show.",
-    error: "The preview could not be shown.",
-    error_archive: "This archive could not be opened.",
-    error_drawing: "The drawing could not be shown.",
-    error_drawing_version: "This drawing is saved in a format older than AutoCAD R13, which cannot be shown here.",
-    error_file: "This file could not be shown.",
-    error_image: "The image could not be shown.",
-    error_media: "This device cannot play this file.",
-    error_model: "This model could not be shown.",
-    error_office: "This document could not be shown.",
-    layers: "Layers",
-    layers_all: "All",
-    layers_none: "None",
-    layouts: "Layouts",
-    link_confirm: "The document links to {{url}}. Open it in a new tab?",
-    loading: "Loading the document…",
-    loading_model: "Loading the model…",
-    model_panel: "Model",
-    model_space: "Model space",
-    next: "Next",
-    open_in_tab: "Open in a new tab",
-    page_of: "Page {{current}} / {{total}}",
-    page_short: "Page {{page}}",
-    panel_hide: "Hide the panel",
-    prev: "Previous",
-    sections: "Sections",
-    sections_hide: "Hide the sections",
-    selection: "Element",
-    selection_none: "Tap an element to identify it.",
-    selection_unnamed: "Unnamed",
-    slide_of: "Slide {{current}} / {{total}}",
-    stl_triangles_one: "{{count}} triangle",
-    stl_triangles_other: "{{count}} triangles",
-    unavailable_offline: "Not available offline",
-    warning_external_references_one: "{{count}} external reference is not drawn.",
-    warning_external_references_other: "{{count}} external references are not drawn.",
-    warning_model_damaged: "The file is damaged: what could be read is shown.",
-    warning_model_partial: "The model is too large to show whole: part of it is left out.",
-    warning_model_truncated_one: "The model is too large to show whole: {{count}} element is left out.",
-    warning_model_truncated_other: "The model is too large to show whole: {{count}} elements are left out.",
-    warning_model_unsupported_one: "{{count}} piece of geometry is of a kind not drawn here.",
-    warning_model_unsupported_other: "{{count}} pieces of geometry are of a kind not drawn here.",
-    warning_proxy_without_graphics_one:
-      "{{count}} custom object was saved without its graphics: only the application that made it can show it.",
-    warning_proxy_without_graphics_other:
-      "{{count}} custom objects were saved without their graphics: only the application that made them can show them.",
-    warning_scene_truncated: "The drawing is too large to show whole: part of it is left out.",
-    warning_source_read_whole: "The server does not send parts of the file: all of it was downloaded.",
-    zoom_fit: "Fit to the window",
-    zoom_in: "Zoom in",
-    zoom_out: "Zoom out",
-  },
-  fr: {
-    archive_back: "Retour à l'archive",
-    archive_failed_member: "Ce fichier n'a pas pu être extrait.",
-    archive_member_encrypted: "Ce fichier est chiffré.",
-    archive_member_unsupported: "Ce fichier n'a pas pu être lu dans l'archive.",
-    archive_members_one: "{{count}} fichier",
-    archive_members_other: "{{count}} fichiers",
-    archive_no_reader: "Ce fichier ne peut pas être affiché ici.",
-    background: "Fond",
-    background_dark: "Sombre",
-    background_light: "Clair",
-    categories: "Catégories",
-    close: "Fermer",
-    converting_model: "Préparation de la maquette… {{percent}} %",
-    counter: "{{current}} / {{total}}",
-    download: "Télécharger",
-    drag_pan: "Déplacer la page",
-    drag_select: "Sélectionner le texte",
-    drawing: "Préparation de l'image…",
-    drawing_panel: "Dessin",
-    empty_model: "Cette maquette ne contient aucun élément à afficher.",
-    error: "L'aperçu n'a pas pu s'afficher.",
-    error_archive: "Cette archive n'a pas pu être ouverte.",
-    error_drawing: "Le dessin n'a pas pu s'afficher.",
-    error_drawing_version: "Ce dessin est enregistré dans un format antérieur à AutoCAD R13, qui ne peut pas être affiché ici.",
-    error_file: "Ce fichier n'a pas pu s'afficher.",
-    error_image: "L'image n'a pas pu s'afficher.",
-    error_media: "Cet appareil ne sait pas lire ce fichier.",
-    error_model: "Cette maquette n'a pas pu s'afficher.",
-    error_office: "Ce document n'a pas pu s'afficher.",
-    layers: "Calques",
-    layers_all: "Tous",
-    layers_none: "Aucun",
-    layouts: "Présentations",
-    link_confirm: "Le document renvoie vers {{url}}. L'ouvrir dans un nouvel onglet ?",
-    loading: "Chargement du document…",
-    loading_model: "Chargement de la maquette…",
-    model_panel: "Maquette",
-    model_space: "Espace objet",
-    next: "Suivant",
-    open_in_tab: "Ouvrir dans un nouvel onglet",
-    page_of: "Page {{current}} / {{total}}",
-    page_short: "Page {{page}}",
-    panel_hide: "Masquer le panneau",
-    prev: "Précédent",
-    sections: "Sections",
-    sections_hide: "Masquer les sections",
-    selection: "Élément",
-    selection_none: "Touchez un élément pour l'identifier.",
-    selection_unnamed: "Sans nom",
-    slide_of: "Diapositive {{current}} / {{total}}",
-    stl_triangles_one: "{{count}} triangle",
-    stl_triangles_other: "{{count}} triangles",
-    unavailable_offline: "Non disponible hors ligne",
-    warning_external_references_one: "{{count}} référence externe n'est pas dessinée.",
-    warning_external_references_other: "{{count}} références externes ne sont pas dessinées.",
-    warning_model_damaged: "Le fichier est endommagé : ce qui a pu être lu est affiché.",
-    warning_model_partial: "La maquette est trop grande pour être affichée en entier : une partie en est omise.",
-    warning_model_truncated_one: "La maquette est trop grande pour être affichée en entier : {{count}} élément est omis.",
-    warning_model_truncated_other: "La maquette est trop grande pour être affichée en entier : {{count}} éléments sont omis.",
-    warning_model_unsupported_one: "{{count}} géométrie d'un type non pris en charge n'est pas dessinée.",
-    warning_model_unsupported_other: "{{count}} géométries d'un type non pris en charge ne sont pas dessinées.",
-    warning_proxy_without_graphics_one:
-      "{{count}} objet personnalisé a été enregistré sans son graphisme : seule l'application qui l'a créé peut l'afficher.",
-    warning_proxy_without_graphics_other:
-      "{{count}} objets personnalisés ont été enregistrés sans leur graphisme : seule l'application qui les a créés peut les afficher.",
-    warning_scene_truncated: "Le dessin est trop grand pour être affiché en entier : une partie en est omise.",
-    warning_source_read_whole: "Le serveur n'envoie pas le fichier par parties : il a été téléchargé en entier.",
-    zoom_fit: "Ajuster à la fenêtre",
-    zoom_in: "Agrandir",
-    zoom_out: "Réduire",
-  },
-} as const;
-
-type Strings = (typeof MESSAGES)["en"];
-type Base<K> = K extends `${infer B}_one` | `${infer B}_other` ? B : K;
-
-/** Every message key, plural keys without their suffix. */
-export type MessageKey = Base<keyof Strings>;
-
-export type Translate = (key: MessageKey, vars?: Record<string, string | number>) => string;
-
-/** The built-in strings for `locale` ("fr", "fr-CA"...; English otherwise). */
-export function builtinTranslate(locale = "en"): Translate {
-  const lang = locale.toLowerCase().startsWith("fr") ? "fr" : "en";
-  const table = MESSAGES[lang] as Record<string, string>;
-  const plural = new Intl.PluralRules(lang);
-  return (key, vars = {}) => {
-    const count = typeof vars.count === "number" ? vars.count : undefined;
-    const template = (count !== undefined && table[`${key}_${plural.select(count) === "one" ? "one" : "other"}`]) || table[key] || key;
-    return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) => String(vars[name] ?? ""));
-  };
-}
+// The strings live in the core, for hosts that draw their own UI without React.
+export { builtinLanguage, builtinTranslate, MESSAGES, type MessageKey, type Translate } from "../core/messages.js";
diff --git a/crates/exav-viewer/ts/react/overlay.tsx b/crates/exav-viewer/ts/react/overlay.tsx
index d4c6c127..d31107dd 100644
--- a/crates/exav-viewer/ts/react/overlay.tsx
+++ b/crates/exav-viewer/ts/react/overlay.tsx
@@ -14,7 +14,7 @@ export function reactOverlay(render: (surface: ImageSurface, view: ViewState) =>
   return {
     mount(surface) {
       const host = document.createElement("div");
-      host.className = "exv-overlay";
+      host.className = "exav-viewer-overlay";
       (options.layer === "screen" ? surface.screenLayer : surface.pageLayer).append(host);
       const root = createRoot(host);
       const draw = (view: ViewState) => root.render(render(surface, view));
diff --git a/crates/exav-viewer/ts/react/parts.tsx b/crates/exav-viewer/ts/react/parts.tsx
index e0f25d9a..0efd3cbe 100644
--- a/crates/exav-viewer/ts/react/parts.tsx
+++ b/crates/exav-viewer/ts/react/parts.tsx
@@ -3,7 +3,7 @@
  * `ViewerProvider`'s `components`; a replacement receives the default it
  * replaces as `Default`, to wrap it rather than rewrite it.
  */
-import { useId, useState, type ComponentProps, type ComponentType, type ReactNode } from "react";
+import { useId, useRef, useState, type ComponentProps, type ComponentType, type ReactNode } from "react";
 
 import type { Store } from "../core/store.js";
 import type {
@@ -16,13 +16,16 @@ import type {
   OutlineController,
   PagesController,
   Selection,
+  SheetsController,
   Status,
+  StoreysController,
+  Warning,
   ZoomController,
 } from "../core/types.js";
 import { folderOf } from "../archive/names.js";
 import { useViewerContext } from "./context.js";
-import { useStore } from "./hooks.js";
-import { ArrowLeft, ChevronLeft, ChevronRight, Close, FileIcon, FitIcon, FolderIcon, Hand, LayersIcon, ListIcon, Minus, PanelClose, Plus, Spinner, TextCursor } from "./icons.js";
+import { useFullscreen, usePanel, useStore, type PanelInfo } from "./hooks.js";
+import { ArrowLeft, ChevronLeft, ChevronRight, Close, FileIcon, FolderIcon, FullscreenExitIcon, FullscreenIcon, Hand, LayersIcon, ListIcon, Minus, PanelClose, Plus, ResetIcon, Spinner, TextCursor } from "./icons.js";
 import type { MessageKey } from "./messages.js";
 
 type Overridable<P> = ComponentType<P & { Default: ComponentType<P> }>;
@@ -48,6 +51,7 @@ export interface OutlineRailProps {
 }
 export interface DrawingRailProps {
   layers?: LayersController;
+  storeys?: StoreysController;
   layouts?: LayoutsController;
   ground?: GroundController;
   selection?: Store<Selection | null>;
@@ -55,6 +59,9 @@ export interface DrawingRailProps {
 export interface SlidePagerProps {
   pages: PagesController;
 }
+export interface SheetTabsProps {
+  sheets: SheetsController;
+}
 export interface ArchiveListProps {
   archive: ArchiveController;
 }
@@ -62,12 +69,8 @@ export interface ArchiveBackProps {
   archive: ArchiveController;
   name: string;
 }
-export interface InfoBadgeProps {
-  format: FormatId | null;
-  info: Record<string, number>;
-}
 export interface WarningsProps {
-  warnings: readonly { key: string; count: number }[];
+  warnings: readonly Warning[];
 }
 export interface ZoomControlsProps {
   zoom: ZoomController;
@@ -75,6 +78,11 @@ export interface ZoomControlsProps {
 export interface DragToggleProps {
   drag: DragController;
 }
+export type FullscreenToggleProps = Record<string, never>;
+export interface PanelToggleProps extends PanelInfo {
+  open: boolean;
+  toggle: () => void;
+}
 
 export interface ViewerComponents {
   /** The dialog itself: a native `<dialog>` by default. */
@@ -88,14 +96,18 @@ export interface ViewerComponents {
   DrawingRail: Overridable<DrawingRailProps>;
   /** PPTX: "Slide 2 / 9" with prev and next. */
   SlidePager: Overridable<SlidePagerProps>;
+  /** XLSX: a tab per sheet, below it, when there are several. */
+  SheetTabs: Overridable<SheetTabsProps>;
   ArchiveList: Overridable<ArchiveListProps>;
   ArchiveBack: Overridable<ArchiveBackProps>;
-  /** STL triangle count. */
-  InfoBadge: Overridable<InfoBadgeProps>;
   /** What is missing from the picture (a drawing's external references). */
   Warnings: Overridable<WarningsProps>;
-  /** Zoom out, zoom in and fit, for a mouse (shown for a fine pointer only: a touch screen pinches). */
+  /** Zoom out, zoom in, and back to the opening view once zoomed, for a mouse (shown for a fine pointer only: a touch screen pinches). */
   ZoomControls: Overridable<ZoomControlsProps>;
+  /** The viewer's box, full screen and back. Not shown where the browser has no full screen. */
+  FullscreenToggle: Overridable<FullscreenToggleProps>;
+  /** Folds and unfolds the side panel (sections, layers), beside the zoom buttons. Shown on a touch screen too. */
+  PanelToggle: Overridable<PanelToggleProps>;
   /** A PDF zoomed past the viewer: drag to move the page, or to select text. */
   DragToggle: Overridable<DragToggleProps>;
 }
@@ -121,7 +133,7 @@ function Shell({ open, onClose, title, width, children }: ShellProps) {
   return (
     <dialog
       ref={ref}
-      className={`exv-dialog exv-dialog-${width}`}
+      className={`exav-viewer-dialog exav-viewer-dialog-${width}`}
       aria-labelledby={id}
       onCancel={(e) => {
         e.preventDefault();
@@ -139,16 +151,21 @@ function Shell({ open, onClose, title, width, children }: ShellProps) {
 // ── Status ───────────────────────────────────────────────────────────────────
 
 function statusMessage(status: Status, format: FormatId | null, t: (k: MessageKey, v?: Record<string, string | number>) => string): { text: string; tone: "busy" | "error" | "plain" } | null {
-  const model = format === "ifc" || format === "stl";
+  const model = format === "ifc" || format === "stl" || format === "obj" || format === "ply" || format === "gltf";
   switch (status.phase) {
     case "ready":
       return null;
     case "loading":
       // A player shows its own controls at once.
       if (format === "video" || format === "audio") return null;
-      return { text: status.label ?? t(model ? "loading_model" : "loading"), tone: "busy" };
+      // A model is read and drawn as "the model".
+      if (model && (status.step === undefined || status.step === "read" || status.step === "render")) return { text: status.label ?? t("loading_model"), tone: "busy" };
+      return { text: status.label ?? (status.step ? t(`step_${status.step}`) : t("loading")), tone: "busy" };
     case "converting":
-      return { text: status.label ?? t("converting_model", { percent: Math.round((status.progress ?? 0) * 100) }), tone: "busy" };
+      return {
+        text: status.label ?? (status.step ? t(`step_${status.step}`) : t("converting_model", { percent: Math.round((status.progress ?? 0) * 100) })),
+        tone: "busy",
+      };
     case "empty":
       return { text: t("empty_model"), tone: "plain" };
     case "error": {
@@ -165,10 +182,19 @@ function StatusOverlay({ status, format }: StatusOverlayProps) {
   const { t } = useViewerContext();
   const m = statusMessage(status, format, t);
   if (!m) return null;
+  // A step that counts shows a bar; the stock "preparing the model" says its percentage.
+  const share = (status.phase === "loading" || status.phase === "converting") && status.step && status.progress !== undefined ? status.progress : null;
   return (
-    <div className={`exv-status exv-status-${m.tone}`} aria-live="polite">
+    <div className={`exav-viewer-status exav-viewer-status-${m.tone}`} aria-live="polite">
       {m.tone === "busy" && <Spinner />}
       <p>{m.text}</p>
+      {share !== null && (
+        <div className="exav-viewer-progress">
+          <div role="progressbar" aria-label={m.text} aria-valuemin={0} aria-valuemax={100} aria-valuenow={Math.round(share * 100)}>
+            <div style={{ width: `${share * 100}%` }} />
+          </div>
+        </div>
+      )}
     </div>
   );
 }
@@ -176,7 +202,7 @@ function StatusOverlay({ status, format }: StatusOverlayProps) {
 function Placeholder({ state, label }: PlaceholderProps) {
   const { t } = useViewerContext();
   return (
-    <div className="exv-status exv-status-plain" aria-live="polite">
+    <div className="exav-viewer-status exav-viewer-status-plain" aria-live="polite">
       {state === "pending" && <Spinner />}
       <p>{state === "pending" ? (label ?? t("drawing")) : (label ?? t("unavailable_offline"))}</p>
     </div>
@@ -185,27 +211,15 @@ function Placeholder({ state, label }: PlaceholderProps) {
 
 // ── Rails ────────────────────────────────────────────────────────────────────
 
-/** Below this width a rail starts folded. Decided once: turning a tablet must not close it. */
-const RAIL_FITS = 1024;
-
 function Rail({ title, hideLabel, icon, children }: { title: string; hideLabel: string; icon: ReactNode; children: ReactNode }) {
-  const [open, setOpen] = useState(() => typeof window === "undefined" || window.innerWidth >= RAIL_FITS);
   const id = useId();
-  if (!open) {
-    return (
-      <button type="button" className="exv-rail-unfold" onClick={() => setOpen(true)} aria-expanded={false} aria-controls={id} aria-label={title} title={title}>
-        {icon}
-      </button>
-    );
-  }
+  const { open } = usePanel({ title, hideLabel, icon, controls: id });
   // Unmounted when folded, not hidden: a `display: flex` beats `[hidden]`.
+  if (!open) return null;
   return (
-    <nav id={id} className="exv-rail" aria-label={title}>
-      <div className="exv-rail-head">
-        <span className="exv-rail-title">{title}</span>
-        <button type="button" className="exv-icon-button exv-icon-button-small" onClick={() => setOpen(false)} aria-label={hideLabel}>
-          <PanelClose />
-        </button>
+    <nav id={id} className="exav-viewer-rail" aria-label={title}>
+      <div className="exav-viewer-rail-head">
+        <span className="exav-viewer-rail-title">{title}</span>
       </div>
       {children}
     </nav>
@@ -219,12 +233,12 @@ function OutlineRail({ outline }: OutlineRailProps) {
   if (entries.length < 2) return null;
   return (
     <Rail title={t("sections")} hideLabel={t("sections_hide")} icon={<ListIcon />}>
-      <div className="exv-rail-scroll exv-outline">
+      <div className="exav-viewer-rail-scroll exav-viewer-outline">
         {entries.map((e, i) => (
           <button
             key={`${e.page}:${e.title}:${i}`}
             type="button"
-            className={`exv-outline-entry${e.depth === 0 ? " exv-outline-top" : ""}`}
+            className={`exav-viewer-outline-entry${e.depth === 0 ? " exav-viewer-outline-top" : ""}`}
             style={{ paddingLeft: `${e.depth * 12 + 8}px` }}
             onClick={() => outline.goTo(e)}
           >
@@ -236,9 +250,16 @@ function OutlineRail({ outline }: OutlineRailProps) {
   );
 }
 
-function DrawingRail({ layers, layouts, ground, selection }: DrawingRailProps) {
+/** A storey's elevation in metres: "+3.2 m", "0 m", "-1.5 m". */
+function formatElevation(metres: number): string {
+  const text = String(Math.round(metres * 100) / 100);
+  return `${metres > 0 ? "+" : ""}${text} m`;
+}
+
+function DrawingRail({ layers, storeys, layouts, ground, selection }: DrawingRailProps) {
   const { t } = useViewerContext();
   const layerState = useStore(layers);
+  const storeyState = useStore(storeys);
   const layoutState = useStore(layouts);
   const groundState = useStore(ground);
   const selected = useStore(selection);
@@ -246,18 +267,18 @@ function DrawingRail({ layers, layouts, ground, selection }: DrawingRailProps) {
   return (
     <Rail title={t(categories ? "model_panel" : "drawing_panel")} hideLabel={t("panel_hide")} icon={<LayersIcon />}>
       {layouts && layoutState && layoutState.items.length > 1 && (
-        <div className="exv-rail-section">
-          <p className="exv-rail-label">{t("layouts")}</p>
-          <div className="exv-layouts">
+        <div className="exav-viewer-rail-section">
+          <p className="exav-viewer-rail-label">{t("layouts")}</p>
+          <div className="exav-viewer-layouts">
             {layoutState.items.map((l) => (
               <button
                 key={l.id}
                 type="button"
-                className={`exv-row${l.id === layoutState.current ? " exv-row-current" : ""}`}
+                className={`exav-viewer-row${l.id === layoutState.current ? " exav-viewer-row-current" : ""}`}
                 aria-current={l.id === layoutState.current}
                 onClick={() => void layouts.select(l.id)}
               >
-                <span className="exv-truncate" title={l.isModel ? t("model_space") : l.name}>
+                <span className="exav-viewer-truncate" title={l.isModel ? t("model_space") : l.name}>
                   {l.isModel ? t("model_space") : l.name}
                 </span>
               </button>
@@ -266,31 +287,31 @@ function DrawingRail({ layers, layouts, ground, selection }: DrawingRailProps) {
         </div>
       )}
       {selection && (
-        <div className="exv-rail-section">
-          <p className="exv-rail-label">{t("selection")}</p>
+        <div className="exav-viewer-rail-section">
+          <p className="exav-viewer-rail-label">{t("selection")}</p>
           {selected ? (
             <>
-              <p className="exv-truncate exv-strong" title={selected.name}>
+              <p className="exav-viewer-truncate exav-viewer-strong" title={selected.name}>
                 {selected.name || t("selection_unnamed")}
               </p>
-              <p className="exv-truncate exv-muted" title={selected.category}>
+              <p className="exav-viewer-truncate exav-viewer-muted" title={selected.category}>
                 {selected.category}
               </p>
               {selected.storey && (
-                <p className="exv-truncate exv-muted" title={selected.storey}>
+                <p className="exav-viewer-truncate exav-viewer-muted" title={selected.storey}>
                   {selected.storey}
                 </p>
               )}
             </>
           ) : (
-            <p className="exv-faint">{t("selection_none")}</p>
+            <p className="exav-viewer-faint">{t("selection_none")}</p>
           )}
         </div>
       )}
       {ground && groundState && (
-        <div className="exv-rail-section exv-rail-inline">
-          <p className="exv-rail-label">{t("background")}</p>
-          <div className="exv-segmented">
+        <div className="exav-viewer-rail-section exav-viewer-rail-inline">
+          <p className="exav-viewer-rail-label">{t("background")}</p>
+          <div className="exav-viewer-segmented">
             {(["light", "dark"] as const).map((g) => (
               <button key={g} type="button" aria-pressed={groundState === g} onClick={() => ground.set(g)}>
                 {t(`background_${g}`)}
@@ -299,11 +320,37 @@ function DrawingRail({ layers, layouts, ground, selection }: DrawingRailProps) {
           </div>
         </div>
       )}
+      {storeys && storeyState && storeyState.items.length > 0 && (
+        <>
+          <div className="exav-viewer-rail-section exav-viewer-rail-inline">
+            <p className="exav-viewer-rail-label">{t("storeys")}</p>
+            <span className="exav-viewer-layer-all">
+              <button type="button" onClick={() => storeys.setAll(true)}>
+                {t("layers_all")}
+              </button>
+              <button type="button" onClick={() => storeys.setAll(false)}>
+                {t("layers_none")}
+              </button>
+            </span>
+          </div>
+          <div className="exav-viewer-rail-scroll exav-viewer-storeys">
+            {storeyState.items.map((s) => (
+              <label key={s.id} className="exav-viewer-layer">
+                <input type="checkbox" checked={s.visible} onChange={(e) => storeys.setVisible(s.id, e.target.checked)} />
+                <span className={`exav-viewer-truncate${s.visible ? "" : " exav-viewer-faint"}`} title={s.name}>
+                  {s.name}
+                </span>
+                {s.elevation !== null && <span className="exav-viewer-muted">{formatElevation(s.elevation)}</span>}
+              </label>
+            ))}
+          </div>
+        </>
+      )}
       {layers && layerState && (
         <>
-          <div className="exv-rail-section exv-rail-inline">
-            <p className="exv-rail-label">{t(categories ? "categories" : "layers")}</p>
-            <span className="exv-layer-all">
+          <div className="exav-viewer-rail-section exav-viewer-rail-inline">
+            <p className="exav-viewer-rail-label">{t(categories ? "categories" : "layers")}</p>
+            <span className="exav-viewer-layer-all">
               <button type="button" onClick={() => layers.setAll(true)}>
                 {t("layers_all")}
               </button>
@@ -312,12 +359,12 @@ function DrawingRail({ layers, layouts, ground, selection }: DrawingRailProps) {
               </button>
             </span>
           </div>
-          <div className="exv-rail-scroll">
+          <div className="exav-viewer-rail-scroll">
             {layerState.items.map((l) => (
-              <label key={l.id} className="exv-layer">
+              <label key={l.id} className="exav-viewer-layer">
                 <input type="checkbox" checked={l.visible} onChange={(e) => layers.setVisible(l.id, e.target.checked)} />
-                <span className="exv-swatch" style={{ background: l.color }} aria-hidden="true" />
-                <span className={`exv-truncate${l.visible ? "" : " exv-faint"}`} title={l.name}>
+                <span className="exav-viewer-swatch" style={{ background: l.color }} aria-hidden="true" />
+                <span className={`exav-viewer-truncate${l.visible ? "" : " exav-viewer-faint"}`} title={l.name}>
                   {l.name}
                 </span>
               </label>
@@ -336,22 +383,39 @@ function SlidePager({ pages }: SlidePagerProps) {
   const p = useStore(pages);
   if (!p || p.unit !== "slide" || p.total < 2) return null;
   return (
-    <div className="exv-pager">
-      <button type="button" className="exv-icon-button exv-icon-button-round" onClick={() => void pages.prev?.()} aria-label={t("prev")}>
+    <div className="exav-viewer-pager">
+      <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-round" onClick={() => void pages.prev?.()} aria-label={t("prev")}>
         <ChevronLeft />
       </button>
       <span aria-live="polite">{t("slide_of", { current: p.current, total: p.total })}</span>
-      <button type="button" className="exv-icon-button exv-icon-button-round" onClick={() => void pages.next?.()} aria-label={t("next")}>
+      <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-round" onClick={() => void pages.next?.()} aria-label={t("next")}>
         <ChevronRight />
       </button>
     </div>
   );
 }
 
-function InfoBadge({ format, info }: InfoBadgeProps) {
+function SheetTabs({ sheets }: SheetTabsProps) {
   const { t } = useViewerContext();
-  if (format !== "stl" || !info.triangles) return null;
-  return <p className="exv-badge">{t("stl_triangles", { count: info.triangles })}</p>;
+  const s = useStore(sheets);
+  if (!s || s.items.length < 2) return null;
+  return (
+    <div className="exav-viewer-sheet-tabs" role="tablist" aria-label={t("sheets")}>
+      {s.items.map((sheet) => (
+        <button
+          key={sheet.index}
+          type="button"
+          role="tab"
+          aria-selected={sheet.index === s.current}
+          className="exav-viewer-sheet-tab"
+          title={sheet.name}
+          onClick={() => void sheets.select(sheet.index)}
+        >
+          {sheet.name}
+        </button>
+      ))}
+    </div>
+  );
 }
 
 function Warnings({ warnings }: WarningsProps) {
@@ -361,13 +425,16 @@ function Warnings({ warnings }: WarningsProps) {
   const [dismissed, setDismissed] = useState<WarningsProps["warnings"] | null>(null);
   if (warnings.length === 0 || warnings === dismissed) return null;
   return (
-    <div className="exv-warnings" role="status">
+    <div className="exav-viewer-warnings" role="status">
       <div>
         {warnings.map((w) => (
-          <p key={w.key}>{t(`warning_${w.key}` as MessageKey, { count: w.count })}</p>
+          <p key={w.key}>
+            {t(`warning_${w.key}` as MessageKey, { count: w.count })}
+            {w.names && w.names.length > 0 && <span className="exav-viewer-warning-names"> {w.names.join(", ")}</span>}
+          </p>
         ))}
       </div>
-      <button type="button" className="exv-icon-button exv-icon-button-small" onClick={() => setDismissed(warnings)} aria-label={t("close")} title={t("close")}>
+      <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-small" onClick={() => setDismissed(warnings)} aria-label={t("close")} title={t("close")}>
         <Close />
       </button>
     </div>
@@ -385,30 +452,58 @@ function ZoomControls({ zoom }: ZoomControlsProps) {
   if (!state) return null;
   const { scale, min, max } = state;
   return (
-    <div className="exv-tool-group" role="group">
-      <button type="button" className="exv-icon-button exv-icon-button-small" onClick={() => zoom.setScale(scale / ZOOM_STEP)} disabled={scale <= min} aria-label={t("zoom_out")} title={t("zoom_out")}>
+    <div className="exav-viewer-tool-group" data-pointer-only role="group">
+      {/* First, as the tools are anchored at the right: the other buttons stay where they are as this one comes and goes. Nothing to go back to while the view is the one the file opened in. */}
+      {Math.abs(scale - 1) > FIT_TOLERANCE && (
+        <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-small" onClick={() => zoom.fit()} aria-label={t("zoom_fit")} title={t("zoom_fit")}>
+          <ResetIcon />
+        </button>
+      )}
+      <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-small" onClick={() => zoom.setScale(scale / ZOOM_STEP)} disabled={scale <= min} aria-label={t("zoom_out")} title={t("zoom_out")}>
         <Minus />
       </button>
-      <button type="button" className="exv-icon-button exv-icon-button-small" onClick={() => zoom.setScale(scale * ZOOM_STEP)} disabled={scale >= max} aria-label={t("zoom_in")} title={t("zoom_in")}>
+      <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-small" onClick={() => zoom.setScale(scale * ZOOM_STEP)} disabled={scale >= max} aria-label={t("zoom_in")} title={t("zoom_in")}>
         <Plus />
       </button>
-      <button type="button" className="exv-icon-button exv-icon-button-small" onClick={() => zoom.fit()} aria-label={t("zoom_fit")} title={t("zoom_fit")}>
-        <FitIcon />
-      </button>
     </div>
   );
 }
 
+/** A zoom within this of 1 is the fitted view (a drawing's scale is a ratio of floats). */
+const FIT_TOLERANCE = 0.01;
+
+function PanelToggle({ open, title, hideLabel, icon, controls, toggle }: PanelToggleProps) {
+  const label = open ? hideLabel : title;
+  return (
+    <button type="button" className="exav-viewer-icon-button exav-viewer-icon-button-small" onClick={toggle} aria-expanded={open} aria-controls={controls} aria-label={label} title={label}>
+      {open ? <PanelClose /> : icon}
+    </button>
+  );
+}
+
+function FullscreenToggle(_: FullscreenToggleProps) {
+  const { t } = useViewerContext();
+  const button = useRef<HTMLButtonElement>(null);
+  const { supported, active, toggle } = useFullscreen(() => button.current?.closest<HTMLElement>(".exav-viewer-body") ?? null);
+  if (!supported) return null;
+  const label = t(active ? "fullscreen_exit" : "fullscreen");
+  return (
+    <button ref={button} type="button" className="exav-viewer-icon-button exav-viewer-icon-button-small" data-pointer-only onClick={toggle} aria-label={label} title={label}>
+      {active ? <FullscreenExitIcon /> : <FullscreenIcon />}
+    </button>
+  );
+}
+
 function DragToggle({ drag }: DragToggleProps) {
   const { t } = useViewerContext();
   const state = useStore(drag);
   // Nothing to choose while the page fits: a drag selects.
   if (!state?.available) return null;
   return (
-    <div className="exv-tool-group" role="group">
+    <div className="exav-viewer-tool-group" data-pointer-only role="group">
       <button
         type="button"
-        className="exv-icon-button exv-icon-button-small"
+        className="exav-viewer-icon-button exav-viewer-icon-button-small"
         onClick={() => drag.choose("pan")}
         aria-pressed={state.mode === "pan"}
         aria-label={t("drag_pan")}
@@ -418,7 +513,7 @@ function DragToggle({ drag }: DragToggleProps) {
       </button>
       <button
         type="button"
-        className="exv-icon-button exv-icon-button-small"
+        className="exav-viewer-icon-button exav-viewer-icon-button-small"
         onClick={() => drag.choose("select")}
         aria-pressed={state.mode === "select"}
         aria-label={t("drag_select")}
@@ -450,26 +545,26 @@ function ArchiveList({ archive }: ArchiveListProps) {
   const s = useStore(archive);
   if (!s || s.opened) return null;
   return (
-    <div className="exv-archive">
-      <p className="exv-archive-head">{t("archive_members", { count: s.members.length })}</p>
-      {s.refused && <p className="exv-archive-refused">{t(s.refused.key)}</p>}
-      <ul className="exv-archive-list">
+    <div className="exav-viewer-archive">
+      <p className="exav-viewer-archive-head">{t("archive_members", { count: s.members.length })}</p>
+      {s.refused && <p className="exav-viewer-archive-refused">{t(s.refused.key)}</p>}
+      <ul className="exav-viewer-archive-list">
         {s.members.map((m) => {
           const folder = folderOf(m.name);
           return (
             <li key={m.index}>
-              <button type="button" className={`exv-member${m.encrypted ? " exv-member-locked" : ""}`} disabled={s.opening !== null || m.encrypted} onClick={() => void archive.open(m.index)}>
+              <button type="button" className={`exav-viewer-member${m.encrypted ? " exav-viewer-member-locked" : ""}`} disabled={s.opening !== null || m.encrypted} onClick={() => void archive.open(m.index)}>
                 {s.opening === m.index ? <Spinner /> : <FileIcon />}
-                <span className="exv-member-name">
-                  <span className="exv-truncate">{m.name.split("/").pop()}</span>
+                <span className="exav-viewer-member-name">
+                  <span className="exav-viewer-truncate">{m.name.split("/").pop()}</span>
                   {folder && (
-                    <span className="exv-member-folder exv-truncate">
+                    <span className="exav-viewer-member-folder exav-viewer-truncate">
                       <FolderIcon />
                       {folder}
                     </span>
                   )}
                 </span>
-                <span className="exv-member-size">{formatBytes(m.uncompressedSize)}</span>
+                <span className="exav-viewer-member-size">{formatBytes(m.uncompressedSize)}</span>
               </button>
             </li>
           );
@@ -482,12 +577,12 @@ function ArchiveList({ archive }: ArchiveListProps) {
 function ArchiveBack({ archive, name }: ArchiveBackProps) {
   const { t } = useViewerContext();
   return (
-    <div className="exv-archive-back">
+    <div className="exav-viewer-archive-back">
       <button type="button" onClick={() => archive.back()}>
         <ArrowLeft />
         {t("archive_back")}
       </button>
-      <span className="exv-truncate" title={name}>
+      <span className="exav-viewer-truncate" title={name}>
         {name}
       </span>
     </div>
@@ -501,10 +596,12 @@ const DEFAULTS: { [K in keyof ViewerComponents]: ComponentType<any> } = {
   OutlineRail,
   DrawingRail,
   SlidePager,
+  SheetTabs,
   ArchiveList,
   ArchiveBack,
-  InfoBadge,
   Warnings,
   ZoomControls,
   DragToggle,
+  FullscreenToggle,
+  PanelToggle,
 };
diff --git a/crates/exav-viewer/ts/react/styles.css b/crates/exav-viewer/ts/react/styles.css
index 24619bd9..a4ca048a 100644
--- a/crates/exav-viewer/ts/react/styles.css
+++ b/crates/exav-viewer/ts/react/styles.css
@@ -1,44 +1,46 @@
 /* @exav/viewer default UI. Every colour, radius and size is a custom property
-   (TOKENS in @exav/viewer/react); set them on an ancestor to restyle. */
+   (TOKENS in @exav/viewer); set them on an ancestor to restyle. The
+   sandboxed frame's page (`.exav-viewer-frame-root`) is given the host's values. */
 
-:where(.exv-body, .exv-dialog) {
-  --exv-surface: #f1f5f9;
-  --exv-panel: #ffffff;
-  --exv-border: #e2e8f0;
-  --exv-text: #334155;
-  --exv-text-strong: #0f172a;
-  --exv-muted: #64748b;
-  --exv-faint: #94a3b8;
-  --exv-hover: #f8fafc;
-  --exv-active: #f1f5f9;
-  --exv-accent: #0f172a;
-  --exv-on-accent: #ffffff;
-  --exv-error: #b91c1c;
-  --exv-warning: #b45309;
-  --exv-media-bg: #0f172a;
-  --exv-model-bg: radial-gradient(circle at 50% 30%, #ffffff 0%, #e2e8f0 55%, #cbd5e1 100%);
-  --exv-radius: 0.375rem;
-  --exv-rail-width: 15rem;
-  --exv-tap: 2.75rem;
-  --exv-font: inherit;
-  font-family: var(--exv-font);
-  color: var(--exv-text);
+:where(.exav-viewer-body, .exav-viewer-dialog, .exav-viewer-frame-root) {
+  --exav-viewer-surface: #f1f5f9;
+  --exav-viewer-panel: #ffffff;
+  --exav-viewer-border: #e2e8f0;
+  --exav-viewer-text: #334155;
+  --exav-viewer-text-strong: #0f172a;
+  --exav-viewer-muted: #64748b;
+  --exav-viewer-faint: #94a3b8;
+  --exav-viewer-hover: #f8fafc;
+  --exav-viewer-active: #f1f5f9;
+  --exav-viewer-accent: #0f172a;
+  --exav-viewer-on-accent: #ffffff;
+  --exav-viewer-error: #b91c1c;
+  --exav-viewer-warning: #b45309;
+  --exav-viewer-media-bg: #0f172a;
+  --exav-viewer-model-bg: radial-gradient(circle at 50% 30%, #ffffff 0%, #e2e8f0 55%, #cbd5e1 100%);
+  --exav-viewer-radius: 0.375rem;
+  --exav-viewer-rail-width: 15rem;
+  --exav-viewer-tap: 2.75rem;
+  --exav-viewer-pager-room: 4.5rem;
+  --exav-viewer-font: inherit;
+  font-family: var(--exav-viewer-font);
+  color: var(--exav-viewer-text);
 }
 
-.exv-body,
-.exv-body * {
+.exav-viewer-body,
+.exav-viewer-body * {
   box-sizing: border-box;
 }
 
 /* ── body ── */
-.exv-body {
+.exav-viewer-body {
   position: relative;
   display: flex;
   height: 100%;
   min-height: 0;
-  background: var(--exv-surface);
+  background: var(--exav-viewer-surface);
 }
-.exv-main {
+.exav-viewer-main {
   position: relative;
   display: flex;
   flex-direction: column;
@@ -46,26 +48,26 @@
   min-width: 0;
   min-height: 0;
 }
-.exv-bars {
+.exav-viewer-bars {
   display: flex;
   flex: none;
   flex-direction: column;
 }
-.exv-stage {
+.exav-viewer-stage {
   position: relative;
   display: flex;
   flex: 1;
   flex-direction: column;
   min-height: 0;
 }
-.exv-surface {
+.exav-viewer-surface {
   position: relative;
   flex: 1;
   min-height: 0;
   overflow: hidden;
 }
 /* The sandboxed frame (`@exav/viewer/frame`), filling the surface. */
-.exv-sandbox {
+.exav-viewer-sandbox {
   position: absolute;
   inset: 0;
   display: block;
@@ -73,19 +75,19 @@
   height: 100%;
   border: 0;
 }
-.exv-stack {
+.exav-viewer-stack {
   flex: none;
 }
-.exv-rails {
+.exav-viewer-rails {
   display: flex;
   flex: none;
 }
-.exv-rails:empty {
+.exav-viewer-rails:empty {
   display: none;
 }
 
 /* ── status ── */
-.exv-status {
+.exav-viewer-status {
   position: absolute;
   inset: 0;
   z-index: 3;
@@ -94,192 +96,201 @@
   justify-content: center;
   gap: 0.5rem;
   padding: 1.5rem;
-  background: var(--exv-surface);
+  background: var(--exav-viewer-surface);
   text-align: center;
   font-size: 0.875rem;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
 }
-.exv-status p {
+.exav-viewer-status p {
   margin: 0;
   max-width: 34rem;
 }
-.exv-status-error {
-  color: var(--exv-error);
+.exav-viewer-status-error {
+  color: var(--exav-viewer-error);
 }
-.exv-spinner {
+.exav-viewer-status-busy {
+  flex-wrap: wrap;
+  align-content: center;
+}
+/* A row of its own, below the message. */
+.exav-viewer-progress {
+  display: flex;
+  justify-content: center;
+  flex: 0 0 100%;
+}
+.exav-viewer-progress > [role="progressbar"] {
+  width: min(16rem, 100%);
+  height: 0.25rem;
+  overflow: hidden;
+  border-radius: 0.125rem;
+  background: var(--exav-viewer-border);
+}
+.exav-viewer-progress > [role="progressbar"] > div {
+  height: 100%;
+  background: var(--exav-viewer-accent);
+  transition: width 0.2s linear;
+}
+@media (prefers-reduced-motion: reduce) {
+  .exav-viewer-progress > [role="progressbar"] > div {
+    transition: none;
+  }
+}
+.exav-viewer-spinner {
   display: inline-flex;
-  animation: exv-spin 1s linear infinite;
+  animation: exav-viewer-spin 1s linear infinite;
 }
-@keyframes exv-spin {
+@keyframes exav-viewer-spin {
   to {
     transform: rotate(360deg);
   }
 }
 @media (prefers-reduced-motion: reduce) {
-  .exv-spinner {
+  .exav-viewer-spinner {
     animation-duration: 3s;
   }
 }
 
 /* ── buttons ── */
-.exv-icon-button {
+.exav-viewer-icon-button {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  width: var(--exv-tap);
-  height: var(--exv-tap);
+  width: var(--exav-viewer-tap);
+  height: var(--exav-viewer-tap);
   border: 0;
-  border-radius: var(--exv-radius);
+  border-radius: var(--exav-viewer-radius);
   background: transparent;
-  color: var(--exv-text);
+  color: var(--exav-viewer-text);
   cursor: pointer;
 }
-.exv-icon-button:hover {
-  background: var(--exv-active);
+.exav-viewer-icon-button:hover {
+  background: var(--exav-viewer-active);
 }
-.exv-icon-button-small {
+.exav-viewer-icon-button-small {
   width: 2rem;
   height: 2rem;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
 }
-.exv-icon-button-round {
+.exav-viewer-icon-button-round {
   width: 2.25rem;
   height: 2.25rem;
   border-radius: 999px;
 }
-.exv-button {
+.exav-viewer-button {
   display: inline-flex;
   align-items: center;
   gap: 0.5rem;
-  min-height: var(--exv-tap);
+  min-height: var(--exav-viewer-tap);
   padding: 0 1rem;
-  border: 1px solid var(--exv-accent);
-  border-radius: var(--exv-radius);
-  background: var(--exv-accent);
-  color: var(--exv-on-accent);
+  border: 1px solid var(--exav-viewer-accent);
+  border-radius: var(--exav-viewer-radius);
+  background: var(--exav-viewer-accent);
+  color: var(--exav-viewer-on-accent);
   font: inherit;
   font-size: 0.875rem;
   text-decoration: none;
   cursor: pointer;
 }
-.exv-button:disabled {
+.exav-viewer-button:disabled {
   opacity: 0.6;
   cursor: default;
 }
-.exv-button-outline {
-  background: var(--exv-panel);
-  border-color: var(--exv-border);
-  color: var(--exv-text);
+.exav-viewer-button-outline {
+  background: var(--exav-viewer-panel);
+  border-color: var(--exav-viewer-border);
+  color: var(--exav-viewer-text);
 }
 
 /* ── rails ── */
-.exv-rail {
+.exav-viewer-rail {
   display: flex;
   flex-direction: column;
-  width: var(--exv-rail-width);
+  width: var(--exav-viewer-rail-width);
   flex: none;
-  border-left: 1px solid var(--exv-border);
-  background: var(--exv-panel);
+  border-left: 1px solid var(--exav-viewer-border);
+  background: var(--exav-viewer-panel);
   min-height: 0;
 }
-.exv-rail-unfold {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 4;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: var(--exv-tap);
-  height: var(--exv-tap);
-  border: 0;
-  border-left: 1px solid var(--exv-border);
-  border-bottom: 1px solid var(--exv-border);
-  border-bottom-left-radius: var(--exv-radius);
-  background: var(--exv-panel);
-  color: var(--exv-text);
-  cursor: pointer;
-}
-.exv-rail-head {
+.exav-viewer-rail-head {
   display: flex;
   align-items: center;
   justify-content: space-between;
   gap: 0.5rem;
   padding: 0.375rem 0.5rem;
-  border-bottom: 1px solid var(--exv-border);
+  border-bottom: 1px solid var(--exav-viewer-border);
 }
-.exv-rail-title,
-.exv-rail-label {
+.exav-viewer-rail-title,
+.exav-viewer-rail-label {
   margin: 0;
   font-size: 0.75rem;
   font-weight: 500;
   letter-spacing: 0.04em;
   text-transform: uppercase;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.exv-rail-section {
+.exav-viewer-rail-section {
   flex: none;
   padding: 0.5rem 1rem;
-  border-bottom: 1px solid var(--exv-border);
+  border-bottom: 1px solid var(--exav-viewer-border);
   font-size: 0.875rem;
 }
-.exv-rail-section p {
+.exav-viewer-rail-section p {
   margin: 0;
 }
-.exv-rail-inline {
+.exav-viewer-rail-inline {
   display: flex;
   align-items: center;
   justify-content: space-between;
   gap: 0.5rem;
 }
-.exv-rail-scroll {
+.exav-viewer-rail-scroll {
   flex: 1;
   min-height: 0;
   overflow-y: auto;
   padding: 0.25rem 0;
 }
-.exv-layouts {
+.exav-viewer-layouts {
   max-height: 33vh;
   overflow-y: auto;
   margin-top: 0.25rem;
 }
-.exv-row {
+.exav-viewer-row {
   display: flex;
   width: 100%;
   min-height: 2.25rem;
   align-items: center;
   padding: 0.25rem 0.5rem;
   border: 0;
-  border-radius: var(--exv-radius);
+  border-radius: var(--exav-viewer-radius);
   background: transparent;
-  color: var(--exv-text);
+  color: var(--exav-viewer-text);
   font: inherit;
   font-size: 0.875rem;
   text-align: left;
   cursor: pointer;
 }
-.exv-row:hover {
-  background: var(--exv-hover);
+.exav-viewer-row:hover {
+  background: var(--exav-viewer-hover);
 }
-.exv-row-current {
-  background: var(--exv-active);
-  color: var(--exv-text-strong);
+.exav-viewer-row-current {
+  background: var(--exav-viewer-active);
+  color: var(--exav-viewer-text-strong);
   font-weight: 500;
 }
-.exv-outline {
+.exav-viewer-outline {
   padding: 0.5rem;
 }
-.exv-outline-entry {
+.exav-viewer-outline-entry {
   display: block;
   width: 100%;
   padding: 0.375rem 0.5rem;
   border: 0;
-  border-radius: var(--exv-radius);
+  border-radius: var(--exav-viewer-radius);
   background: transparent;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
   font: inherit;
   font-size: 0.875rem;
   text-align: left;
@@ -288,46 +299,46 @@
   white-space: nowrap;
   cursor: pointer;
 }
-.exv-outline-entry:hover {
-  background: var(--exv-active);
+.exav-viewer-outline-entry:hover {
+  background: var(--exav-viewer-active);
 }
-.exv-outline-top {
-  color: var(--exv-text-strong);
+.exav-viewer-outline-top {
+  color: var(--exav-viewer-text-strong);
   font-weight: 500;
 }
-.exv-segmented {
+.exav-viewer-segmented {
   display: flex;
   overflow: hidden;
-  border: 1px solid var(--exv-border);
-  border-radius: var(--exv-radius);
+  border: 1px solid var(--exav-viewer-border);
+  border-radius: var(--exav-viewer-radius);
 }
-.exv-segmented button {
+.exav-viewer-segmented button {
   padding: 0.25rem 0.5rem;
   border: 0;
-  background: var(--exv-panel);
-  color: var(--exv-muted);
+  background: var(--exav-viewer-panel);
+  color: var(--exav-viewer-muted);
   font: inherit;
   font-size: 0.75rem;
   cursor: pointer;
 }
-.exv-segmented button[aria-pressed="true"] {
-  background: var(--exv-accent);
-  color: var(--exv-on-accent);
+.exav-viewer-segmented button[aria-pressed="true"] {
+  background: var(--exav-viewer-accent);
+  color: var(--exav-viewer-on-accent);
 }
-.exv-layer-all button {
+.exav-viewer-layer-all button {
   padding: 0.25rem 0.5rem;
   border: 0;
-  border-radius: var(--exv-radius);
+  border-radius: var(--exav-viewer-radius);
   background: transparent;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
   font: inherit;
   font-size: 0.75rem;
   cursor: pointer;
 }
-.exv-layer-all button:hover {
-  background: var(--exv-active);
+.exav-viewer-layer-all button:hover {
+  background: var(--exav-viewer-active);
 }
-.exv-layer {
+.exav-viewer-layer {
   display: flex;
   align-items: center;
   gap: 0.5rem;
@@ -336,40 +347,40 @@
   font-size: 0.875rem;
   cursor: pointer;
 }
-.exv-layer:hover {
-  background: var(--exv-hover);
+.exav-viewer-layer:hover {
+  background: var(--exav-viewer-hover);
 }
-.exv-layer input {
+.exav-viewer-layer input {
   flex: none;
   width: 1rem;
   height: 1rem;
-  accent-color: var(--exv-accent);
+  accent-color: var(--exav-viewer-accent);
 }
-.exv-swatch {
+.exav-viewer-swatch {
   flex: none;
   width: 0.75rem;
   height: 0.75rem;
-  border: 1px solid var(--exv-faint);
+  border: 1px solid var(--exav-viewer-faint);
   border-radius: 2px;
 }
-.exv-truncate {
+.exav-viewer-truncate {
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.exv-strong {
-  color: var(--exv-text-strong);
+.exav-viewer-strong {
+  color: var(--exav-viewer-text-strong);
 }
-.exv-muted {
-  color: var(--exv-muted);
+.exav-viewer-muted {
+  color: var(--exav-viewer-muted);
 }
-.exv-faint {
-  color: var(--exv-faint);
+.exav-viewer-faint {
+  color: var(--exav-viewer-faint);
 }
 
 /* ── floating ── */
-.exv-pager {
+.exav-viewer-pager {
   position: absolute;
   bottom: 0.75rem;
   left: 50%;
@@ -379,27 +390,52 @@
   gap: 0.25rem;
   padding: 0.25rem;
   transform: translateX(-50%);
-  border: 1px solid var(--exv-border);
+  border: 1px solid var(--exav-viewer-border);
   border-radius: 999px;
-  background: color-mix(in srgb, var(--exv-panel) 95%, transparent);
+  background: color-mix(in srgb, var(--exav-viewer-panel) 95%, transparent);
   font-size: 0.875rem;
   font-variant-numeric: tabular-nums;
 }
-.exv-badge {
-  position: absolute;
-  bottom: 0.5rem;
-  left: 50%;
-  z-index: 2;
-  margin: 0;
-  padding: 0.25rem 0.75rem;
-  transform: translateX(-50%);
-  border-radius: 999px;
-  background: color-mix(in srgb, var(--exv-panel) 90%, transparent);
-  font-size: 0.75rem;
-  color: var(--exv-muted);
-  pointer-events: none;
+/* Below the sheet, not over it: the stage's last row stays in sight. */
+.exav-viewer-sheet-tabs {
+  display: flex;
+  flex: none;
+  gap: 0.125rem;
+  height: 2.25rem;
+  padding: 0 0.5rem;
+  overflow-x: auto;
+  border-top: 1px solid var(--exav-viewer-border);
+  background: var(--exav-viewer-panel);
+  scrollbar-width: thin;
 }
-.exv-warnings {
+.exav-viewer-sheet-tab {
+  flex: none;
+  max-width: 14rem;
+  padding: 0 0.875rem;
+  overflow: hidden;
+  border: 0;
+  border-bottom: 2px solid transparent;
+  background: none;
+  color: var(--exav-viewer-muted);
+  font: inherit;
+  font-size: 0.8125rem;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+}
+.exav-viewer-sheet-tab:hover {
+  background: var(--exav-viewer-hover);
+  color: var(--exav-viewer-text);
+}
+.exav-viewer-sheet-tab[aria-selected="true"] {
+  border-bottom-color: var(--exav-viewer-accent);
+  color: var(--exav-viewer-text-strong);
+  font-weight: 600;
+}
+.exav-viewer-stage:has(> .exav-viewer-sheet-tabs) > .exav-viewer-tools {
+  bottom: 3rem;
+}
+.exav-viewer-warnings {
   position: absolute;
   bottom: 0.5rem;
   left: 0.5rem;
@@ -409,80 +445,95 @@
   gap: 0.25rem;
   max-width: calc(100% - 1rem);
   padding: 0.25rem 0.25rem 0.25rem 0.75rem;
-  border: 1px solid var(--exv-border);
-  border-radius: var(--exv-radius);
-  background: var(--exv-panel);
+  border: 1px solid var(--exav-viewer-border);
+  border-radius: var(--exav-viewer-radius);
+  background: var(--exav-viewer-panel);
   font-size: 0.75rem;
-  color: var(--exv-warning);
+  color: var(--exav-viewer-warning);
 }
-.exv-warnings p {
+.exav-viewer-warnings p {
   margin: 0;
 }
+.exav-viewer-warning-names {
+  color: var(--exav-viewer-muted);
+  overflow-wrap: anywhere;
+}
 
-/* The zoom buttons and the drag toggle: for a mouse, or for a browser that
-   reports no pointer at all (a desktop without one detected, headless test
-   browsers). A touch screen pinches and scrolls, and its buttons would only
-   cover the page. The warnings keep clear of them, whose width this allows for. */
+/* The zoom buttons, the drag and full screen toggles: for a mouse, or for a
+   browser that reports no pointer at all (a desktop without one detected,
+   headless test browsers). A touch screen pinches and scrolls, and its buttons
+   would only cover the page; the panel's toggle stays. The warnings keep clear
+   of the tools, whose width this allows for. */
+.exav-viewer-warnings {
+  max-width: calc(100% - 1rem - 4rem);
+}
 @media (any-pointer: fine), (any-pointer: none) {
-  .exv-warnings {
-    max-width: calc(100% - 1rem - 12rem);
+  .exav-viewer-warnings {
+    max-width: calc(100% - 1rem - 19rem);
   }
 }
-.exv-tools {
+.exav-viewer-tools {
   position: absolute;
   right: 0.75rem;
   bottom: 0.75rem;
   z-index: 3;
-  display: none;
+  display: flex;
   gap: 0.375rem;
 }
-@media (any-pointer: fine), (any-pointer: none) {
-  .exv-tools {
-    display: flex;
+/* What carries `data-pointer-only` (the zoom and drag groups, full screen) is
+   for a mouse and goes on a touch screen. A group left with nothing else goes
+   too. A host's own piece sets the attribute for the same. */
+.exav-viewer-tool-end:empty {
+  display: none;
+}
+@media not ((any-pointer: fine) or (any-pointer: none)) {
+  .exav-viewer-tools [data-pointer-only],
+  .exav-viewer-tool-end:not(:has(> :not([data-pointer-only]))) {
+    display: none;
   }
 }
-.exv-tool-group {
+.exav-viewer-tool-group {
   display: flex;
   padding: 0.125rem;
-  border: 1px solid var(--exv-border);
-  border-radius: var(--exv-radius);
-  background: var(--exv-panel);
+  border: 1px solid var(--exav-viewer-border);
+  border-radius: var(--exav-viewer-radius);
+  background: var(--exav-viewer-panel);
   box-shadow: 0 1px 3px rgb(15 23 42 / 0.12);
 }
-.exv-tool-group .exv-icon-button[aria-pressed="true"] {
-  background: var(--exv-active);
-  color: var(--exv-text-strong);
+.exav-viewer-tool-group .exav-viewer-icon-button[aria-pressed="true"] {
+  background: var(--exav-viewer-active);
+  color: var(--exav-viewer-text-strong);
 }
-.exv-tool-group .exv-icon-button:disabled {
+.exav-viewer-tool-group .exav-viewer-icon-button:disabled {
   opacity: 0.4;
   cursor: default;
 }
 
 /* ── archive ── */
-.exv-archive {
+.exav-viewer-archive {
   position: absolute;
   inset: 0;
   z-index: 2;
   display: flex;
   flex-direction: column;
-  background: var(--exv-panel);
+  background: var(--exav-viewer-panel);
 }
-.exv-archive-head {
+.exav-viewer-archive-head {
   margin: 0;
   padding: 0.5rem 0.75rem;
-  border-bottom: 1px solid var(--exv-border);
+  border-bottom: 1px solid var(--exav-viewer-border);
   font-size: 0.75rem;
   letter-spacing: 0.04em;
   text-transform: uppercase;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
 }
-.exv-archive-refused {
+.exav-viewer-archive-refused {
   margin: 0;
   padding: 0.5rem 0.75rem;
   font-size: 0.75rem;
-  color: var(--exv-warning);
+  color: var(--exav-viewer-warning);
 }
-.exv-archive-list {
+.exav-viewer-archive-list {
   flex: 1;
   min-height: 0;
   margin: 0;
@@ -490,101 +541,101 @@
   list-style: none;
   overflow-y: auto;
 }
-.exv-archive-list li + li {
-  border-top: 1px solid var(--exv-hover);
+.exav-viewer-archive-list li + li {
+  border-top: 1px solid var(--exav-viewer-hover);
 }
-.exv-member {
+.exav-viewer-member {
   display: flex;
   width: 100%;
-  min-height: var(--exv-tap);
+  min-height: var(--exav-viewer-tap);
   align-items: center;
   gap: 0.5rem;
   padding: 0.375rem 0.75rem;
   border: 0;
   background: transparent;
-  color: var(--exv-text);
+  color: var(--exav-viewer-text);
   font: inherit;
   text-align: left;
   cursor: pointer;
 }
-.exv-member:hover:not(:disabled) {
-  background: var(--exv-hover);
+.exav-viewer-member:hover:not(:disabled) {
+  background: var(--exav-viewer-hover);
 }
-.exv-member:disabled {
+.exav-viewer-member:disabled {
   cursor: default;
 }
-.exv-member-locked {
+.exav-viewer-member-locked {
   opacity: 0.5;
 }
-.exv-member > svg,
-.exv-member > .exv-spinner {
+.exav-viewer-member > svg,
+.exav-viewer-member > .exav-viewer-spinner {
   flex: none;
-  color: var(--exv-faint);
+  color: var(--exav-viewer-faint);
 }
-.exv-member-name {
+.exav-viewer-member-name {
   display: flex;
   flex-direction: column;
   flex: 1;
   min-width: 0;
   font-size: 0.875rem;
 }
-.exv-member-folder {
+.exav-viewer-member-folder {
   display: flex;
   align-items: center;
   gap: 0.25rem;
   font-size: 0.75rem;
-  color: var(--exv-faint);
+  color: var(--exav-viewer-faint);
 }
-.exv-member-size {
+.exav-viewer-member-size {
   flex: none;
   font-size: 0.75rem;
   font-variant-numeric: tabular-nums;
-  color: var(--exv-faint);
+  color: var(--exav-viewer-faint);
 }
-.exv-archive-back {
+.exav-viewer-archive-back {
   display: flex;
   align-items: center;
   gap: 0.5rem;
   padding: 0.375rem 0.5rem;
-  border-bottom: 1px solid var(--exv-border);
-  background: var(--exv-panel);
+  border-bottom: 1px solid var(--exav-viewer-border);
+  background: var(--exav-viewer-panel);
   font-size: 0.875rem;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
 }
-.exv-archive-back button {
+.exav-viewer-archive-back button {
   display: inline-flex;
   align-items: center;
   gap: 0.25rem;
   min-height: 2.25rem;
   padding: 0 0.5rem;
   border: 0;
-  border-radius: var(--exv-radius);
+  border-radius: var(--exav-viewer-radius);
   background: transparent;
-  color: var(--exv-text);
+  color: var(--exav-viewer-text);
   font: inherit;
   cursor: pointer;
 }
-.exv-archive-back button:hover {
-  background: var(--exv-active);
+.exav-viewer-archive-back button:hover {
+  background: var(--exav-viewer-active);
 }
-.exv-archive-member {
+.exav-viewer-archive-member {
   position: absolute;
   inset: 0;
 }
 
 /* ── engines' surfaces ── */
-.exv-pdf {
+.exav-viewer-pdf {
   position: absolute;
   inset: 0;
   display: flex;
 }
-.exv-pdf-scroller {
+.exav-viewer-pdf-scroller {
   flex: 1;
   min-width: 0;
   overflow: auto;
   padding: 12px;
 }
-.exv-pdf-content {
+.exav-viewer-pdf-content {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -593,17 +644,17 @@
   min-width: 100%;
   margin: 0 auto;
 }
-.exv-pdf-page {
+.exav-viewer-pdf-page {
   position: relative;
   background: #ffffff;
   box-shadow: 0 1px 2px rgb(15 23 42 / 0.12);
 }
-.exv-pdf-bitmap {
+.exav-viewer-pdf-bitmap {
   display: block;
   width: 100%;
   height: 100%;
 }
-.exv-pdf-detail {
+.exav-viewer-pdf-detail {
   position: absolute;
   display: none;
   pointer-events: none;
@@ -612,7 +663,7 @@
    transparent, at its place and size on the page. pdf.js sets the layer's
    size, `--min-font-size`, and each run's `--font-height`, `--scale-x` and
    `--rotate`. */
-.exv-pdf-text {
+.exav-viewer-pdf-text {
   --scale-round-x: 1px;
   --scale-round-y: 1px;
   --min-font-size: 1;
@@ -632,7 +683,7 @@
   caret-color: CanvasText;
   z-index: 0;
 }
-.exv-pdf-text :is(span, br) {
+.exav-viewer-pdf-text :is(span, br) {
   position: absolute;
   color: transparent;
   white-space: pre;
@@ -642,17 +693,17 @@
   user-select: text;
 }
 /* A drag that pans: the hand, over the text and the links too. */
-.exv-pdf[data-drag="pan"] .exv-pdf-scroller,
-.exv-pdf[data-drag="pan"] .exv-pdf-text :is(span, br),
-.exv-pdf[data-drag="pan"] .exv-pdf-link {
+.exav-viewer-pdf[data-drag="pan"] .exav-viewer-pdf-scroller,
+.exav-viewer-pdf[data-drag="pan"] .exav-viewer-pdf-text :is(span, br),
+.exav-viewer-pdf[data-drag="pan"] .exav-viewer-pdf-link {
   cursor: grab;
 }
-.exv-pdf-panning .exv-pdf-scroller,
-.exv-pdf-panning .exv-pdf-text :is(span, br),
-.exv-pdf-panning .exv-pdf-link {
+.exav-viewer-pdf-panning .exav-viewer-pdf-scroller,
+.exav-viewer-pdf-panning .exav-viewer-pdf-text :is(span, br),
+.exav-viewer-pdf-panning .exav-viewer-pdf-link {
   cursor: grabbing !important;
 }
-.exv-pdf-text > span {
+.exav-viewer-pdf-text > span {
   z-index: 1;
   --font-height: 0;
   font-size: calc(var(--text-scale-factor) * var(--font-height));
@@ -660,26 +711,26 @@
   --rotate: 0deg;
   transform: rotate(var(--rotate)) scaleX(var(--scale-x)) scale(var(--min-font-size-inv));
 }
-.exv-pdf-text ::selection {
+.exav-viewer-pdf-text ::selection {
   background: rgb(0 0 255 / 0.25);
   background: color-mix(in srgb, AccentColor, transparent 50%);
   color: transparent;
 }
-.exv-pdf-text br::selection {
+.exav-viewer-pdf-text br::selection {
   background: transparent;
 }
-.exv-pdf-text[data-main-rotation="90"] {
+.exav-viewer-pdf-text[data-main-rotation="90"] {
   transform: rotate(90deg) translateY(-100%);
 }
-.exv-pdf-text[data-main-rotation="180"] {
+.exav-viewer-pdf-text[data-main-rotation="180"] {
   transform: rotate(180deg) translate(-100%, -100%);
 }
-.exv-pdf-text[data-main-rotation="270"] {
+.exav-viewer-pdf-text[data-main-rotation="270"] {
   transform: rotate(270deg) translateX(-100%);
 }
 /* Below the text, out of the way; over the whole layer while a selection
    is dragged, so that the space between runs moves nothing (reader.ts). */
-.exv-pdf-text-end {
+.exav-viewer-pdf-text-end {
   position: absolute;
   inset: 100% 0 0;
   z-index: 0;
@@ -687,66 +738,70 @@
   -webkit-user-select: none;
   user-select: none;
 }
-.exv-pdf-selecting .exv-pdf-text-end {
+.exav-viewer-pdf-selecting .exav-viewer-pdf-text-end {
   top: 0;
 }
-.exv-pdf-links {
+.exav-viewer-pdf-links {
   position: absolute;
   inset: 0;
   pointer-events: none;
 }
-.exv-pdf-link {
+.exav-viewer-pdf-link {
   position: absolute;
   pointer-events: auto;
 }
-.exv-pdf-link:hover {
+.exav-viewer-pdf-link:hover {
   background: rgb(250 204 21 / 0.2);
 }
-.exv-pdf-link:focus-visible {
-  outline: 2px solid var(--exv-accent);
+.exav-viewer-pdf-link:focus-visible {
+  outline: 2px solid var(--exav-viewer-accent);
 }
-.exv-image {
+.exav-viewer-image {
   position: absolute;
   inset: 0;
   overflow: hidden;
   user-select: none;
   -webkit-user-select: none;
 }
-.exv-image-stage {
+.exav-viewer-image-stage {
   position: absolute;
   top: 0;
   left: 0;
   transform-origin: 0 0;
 }
-.exv-image-picture {
+.exav-viewer-image-picture {
   display: block;
   width: 100%;
   height: 100%;
   pointer-events: none;
 }
-.exv-image-detail {
+.exav-viewer-image-detail {
   position: absolute;
   display: none;
   pointer-events: none;
 }
-.exv-image-page-layer,
-.exv-image-screen-layer {
+.exav-viewer-image-page-layer,
+.exav-viewer-image-screen-layer {
   position: absolute;
   inset: 0;
   pointer-events: none;
 }
-.exv-image-page-layer > *,
-.exv-image-screen-layer > * {
+.exav-viewer-image-page-layer > *,
+.exav-viewer-image-screen-layer > * {
   pointer-events: auto;
 }
-.exv-cad,
-.exv-ifc,
-.exv-model,
-.exv-office {
+.exav-viewer-cad,
+.exav-viewer-ifc,
+.exav-viewer-model,
+.exav-viewer-office {
   position: absolute;
   inset: 0;
 }
-.exv-cad-canvas {
+/* A zoom gesture scales the canvas under it, past the box. */
+.exav-viewer-cad {
+  overflow: hidden;
+}
+.exav-viewer-cad-canvas {
   display: block;
   width: 100%;
   height: 100%;
@@ -754,7 +809,7 @@
   outline: none;
 }
 /* The drawing's thumbnail, over the canvas while the drawing parses. */
-.exv-cad-preview {
+.exav-viewer-cad-preview {
   position: absolute;
   inset: 0;
   width: 100%;
@@ -762,41 +817,41 @@
   object-fit: contain;
   pointer-events: none;
 }
-.exv-model {
-  background: var(--exv-model-bg);
+.exav-viewer-model {
+  background: var(--exav-viewer-model-bg);
 }
-.exv-model-canvas {
+.exav-viewer-model-canvas {
   display: block;
   width: 100%;
   height: 100%;
 }
-.exv-office {
+.exav-viewer-office {
   background: #ffffff;
   overflow: hidden;
 }
-.exv-office-canvas {
+.exav-viewer-office-canvas {
   display: block;
   width: 100%;
   height: 100%;
 }
 /* A slide on the surface, as a PDF's pages are, centred in the stage it is
-   fitted to: clear of the slide pager below it. */
-.exv-office-pptx {
-  background: var(--exv-surface);
+   fitted to: clear of the slide pager below it (`--exav-viewer-pager-room`). */
+.exav-viewer-office-pptx {
+  background: var(--exav-viewer-surface);
 }
-.exv-office-stage {
+.exav-viewer-office-stage {
   position: absolute;
-  inset: 1rem 1rem 4.5rem;
+  inset: 1rem 1rem var(--exav-viewer-pager-room);
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.exv-office-stage .exv-office-canvas {
+.exav-viewer-office-stage .exav-viewer-office-canvas {
   box-shadow: 0 1px 3px rgb(15 23 42 / 0.18);
 }
 /* Under a Word page's or a slide's text runs while a selection is dragged
    (office/selection.ts). */
-.exv-office-text-end {
+.exav-viewer-office-text-end {
   position: absolute;
   inset: 0;
   pointer-events: auto;
@@ -804,7 +859,7 @@
   -webkit-user-select: none;
   user-select: none;
 }
-.exv-media {
+.exav-viewer-media {
   position: absolute;
   inset: 0;
   display: flex;
@@ -812,20 +867,170 @@
   justify-content: center;
   padding: 12px;
 }
-.exv-media-video {
-  background: var(--exv-media-bg);
+.exav-viewer-media-video {
+  background: var(--exav-viewer-media-bg);
 }
-.exv-media video {
+.exav-viewer-media video {
   max-width: 100%;
   max-height: 100%;
 }
-.exv-media audio {
+.exav-viewer-media audio {
   width: 100%;
   max-width: 36rem;
 }
 
+/* ── text (text/renderer.ts) ── */
+.exav-viewer-text {
+  position: absolute;
+  inset: 0;
+  overflow: auto;
+  padding: 1rem 1.25rem;
+  background: var(--exav-viewer-panel);
+  color: var(--exav-viewer-text-strong);
+  outline: none;
+}
+/* A block of lines the browser may skip while it is off screen. */
+.exav-viewer-text-chunk {
+  margin: 0;
+  font: 0.8125rem/1.5 ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", monospace;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  tab-size: 4;
+  content-visibility: auto;
+  contain-intrinsic-size: auto 300em;
+}
+.exav-viewer-text-key,
+.exav-viewer-text-tag {
+  color: #1d4ed8;
+}
+.exav-viewer-text-str {
+  color: #047857;
+}
+.exav-viewer-text-num,
+.exav-viewer-text-lit,
+.exav-viewer-text-attr {
+  color: #b45309;
+}
+.exav-viewer-text-comment,
+.exav-viewer-text-meta {
+  color: var(--exav-viewer-muted);
+}
+.exav-viewer-text-add {
+  background: #dcfce7;
+}
+.exav-viewer-text-del {
+  background: #fee2e2;
+}
+.exav-viewer-text-hunk {
+  color: #1d4ed8;
+  background: #eff6ff;
+}
+.exav-viewer-text-link {
+  color: #1d4ed8;
+  text-decoration: underline;
+}
+.exav-viewer-text-link[role="link"] {
+  cursor: pointer;
+}
+.exav-viewer-text-url,
+.exav-viewer-md-image {
+  color: var(--exav-viewer-muted);
+}
+.exav-viewer-text-markdown {
+  font: 0.9375rem/1.6 var(--exav-viewer-font);
+  overflow-wrap: anywhere;
+}
+.exav-viewer-text-markdown > * {
+  max-width: 52rem;
+  margin-left: auto;
+  margin-right: auto;
+}
+.exav-viewer-text-markdown :is(h1, h2, h3, h4, h5, h6) {
+  margin: 1.4em 0 0.5em;
+  line-height: 1.25;
+  color: var(--exav-viewer-text-strong);
+}
+.exav-viewer-text-markdown h1 {
+  font-size: 1.75rem;
+  border-bottom: 1px solid var(--exav-viewer-border);
+  padding-bottom: 0.3em;
+}
+.exav-viewer-text-markdown h2 {
+  font-size: 1.4rem;
+  border-bottom: 1px solid var(--exav-viewer-border);
+  padding-bottom: 0.3em;
+}
+.exav-viewer-text-markdown h3 {
+  font-size: 1.15rem;
+}
+.exav-viewer-text-markdown :is(h4, h5, h6) {
+  font-size: 1rem;
+}
+.exav-viewer-text-markdown p,
+.exav-viewer-text-markdown :is(ul, ol),
+.exav-viewer-text-markdown pre,
+.exav-viewer-text-markdown blockquote,
+.exav-viewer-text-markdown table {
+  margin-top: 0;
+  margin-bottom: 1em;
+}
+.exav-viewer-text-markdown :is(ul, ol) {
+  padding-left: 1.75rem;
+}
+.exav-viewer-text-markdown :is(ul, ol) :is(ul, ol) {
+  margin-bottom: 0;
+}
+.exav-viewer-text-markdown .exav-viewer-md-tight > li > :is(ul, ol) {
+  margin-top: 0.25em;
+}
+.exav-viewer-text-markdown blockquote {
+  padding: 0 1em;
+  border-left: 0.25rem solid var(--exav-viewer-border);
+  color: var(--exav-viewer-muted);
+}
+.exav-viewer-text-markdown code {
+  font: 0.875em ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", monospace;
+  padding: 0.15em 0.35em;
+  border-radius: var(--exav-viewer-radius);
+  background: var(--exav-viewer-active);
+}
+.exav-viewer-text-markdown pre {
+  padding: 0.75rem 1rem;
+  overflow: auto;
+  border-radius: var(--exav-viewer-radius);
+  background: var(--exav-viewer-active);
+}
+.exav-viewer-text-markdown pre code {
+  padding: 0;
+  background: none;
+  white-space: pre;
+}
+.exav-viewer-text-markdown hr {
+  border: 0;
+  border-top: 1px solid var(--exav-viewer-border);
+  margin: 1.5em auto;
+}
+.exav-viewer-text-markdown table {
+  display: block;
+  overflow-x: auto;
+  border-collapse: collapse;
+}
+.exav-viewer-text-markdown :is(th, td) {
+  padding: 0.35em 0.8em;
+  border: 1px solid var(--exav-viewer-border);
+}
+.exav-viewer-text-markdown .exav-viewer-md-center {
+  text-align: center;
+}
+.exav-viewer-text-markdown .exav-viewer-md-right {
+  text-align: right;
+}
+.exav-viewer-text-markdown .exav-viewer-md-raw {
+  white-space: pre-wrap;
+}
+
 /* ── dialog ── */
-.exv-dialog {
+.exav-viewer-dialog {
   height: calc(100dvh - 4rem);
   width: calc(100vw - 4rem);
   max-width: none;
@@ -833,79 +1038,79 @@
   margin: auto;
   padding: 1rem;
   border: 0;
-  border-radius: calc(var(--exv-radius) * 2);
-  background: var(--exv-panel);
+  border-radius: calc(var(--exav-viewer-radius) * 2);
+  background: var(--exav-viewer-panel);
   box-shadow: 0 10px 40px rgb(15 23 42 / 0.25);
   box-sizing: border-box;
 }
-.exv-dialog::backdrop {
+.exav-viewer-dialog::backdrop {
   background: rgb(15 23 42 / 0.6);
 }
 @media (min-width: 640px) {
-  .exv-dialog-page {
+  .exav-viewer-dialog-page {
     max-width: 72rem;
   }
 }
-.exv-dialog-inner {
+.exav-viewer-dialog-inner {
   display: flex;
   flex-direction: column;
   gap: 0.75rem;
   height: 100%;
 }
-.exv-dialog-head {
+.exav-viewer-dialog-head {
   display: flex;
   align-items: center;
   justify-content: space-between;
   gap: 0.5rem;
 }
-.exv-dialog-title {
+.exav-viewer-dialog-title {
   min-width: 0;
   margin: 0;
   font-size: 1.125rem;
   font-weight: 600;
-  color: var(--exv-text-strong);
+  color: var(--exav-viewer-text-strong);
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.exv-hint {
+.exav-viewer-hint {
   margin-left: 0.5rem;
   font-size: 0.875rem;
   font-weight: 400;
-  color: var(--exv-muted);
+  color: var(--exav-viewer-muted);
 }
-.exv-frame {
+.exav-viewer-frame {
   flex: 1;
   min-height: 0;
   overflow: hidden;
-  border: 1px solid var(--exv-border);
-  border-radius: var(--exv-radius);
-  background: var(--exv-surface);
+  border: 1px solid var(--exav-viewer-border);
+  border-radius: var(--exav-viewer-radius);
+  background: var(--exav-viewer-surface);
 }
-.exv-dialog-foot {
+.exav-viewer-dialog-foot {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
   justify-content: space-between;
   gap: 0.5rem;
 }
-.exv-foot-left,
-.exv-foot-right {
+.exav-viewer-foot-left,
+.exav-viewer-foot-right {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
   gap: 0.25rem;
 }
-.exv-foot-right {
+.exav-viewer-foot-right {
   gap: 0.5rem;
 }
-.exv-counter {
+.exav-viewer-counter {
   margin-left: 0.25rem;
   font-size: 0.875rem;
   font-variant-numeric: tabular-nums;
 }
-.exv-separated {
+.exav-viewer-separated {
   margin-left: 0.75rem;
   padding-left: 0.75rem;
-  border-left: 1px solid var(--exv-border);
+  border-left: 1px solid var(--exav-viewer-border);
 }
diff --git a/crates/exav-viewer/ts/test/fake-canvas.ts b/crates/exav-viewer/ts/test/fake-canvas.ts
new file mode 100644
index 00000000..13cc75b9
--- /dev/null
+++ b/crates/exav-viewer/ts/test/fake-canvas.ts
@@ -0,0 +1,63 @@
+import { vi } from "vitest";
+
+/** A canvas that records what is drawn on it (no drawing happens). */
+export class FakeCanvas {
+  static made: FakeCanvas[] = [];
+  /** Pixels the next reads give, before the canvas's own. */
+  static reads: number[][] = [];
+  draws: unknown[][] = [];
+  fills: unknown[][] = [];
+  fillStyle = "";
+  imageSmoothingQuality = "low";
+  constructor(
+    public width: number,
+    public height: number,
+  ) {
+    FakeCanvas.made.push(this);
+  }
+  /** What a read of one pixel gives (alpha last); opaque white. */
+  pixel = [255, 255, 255, 255];
+  clears = 0;
+  getContext() {
+    const canvas = this;
+    return {
+      drawImage: (...a: unknown[]) => this.draws.push(a),
+      fillRect: (...a: unknown[]) => this.fills.push([this.fillStyle, ...a]),
+      clearRect: () => this.clears++,
+      getImageData: () => ({ data: Uint8ClampedArray.from(FakeCanvas.reads.shift() ?? canvas.pixel) }),
+      globalCompositeOperation: "source-over",
+      set fillStyle(v: string) {
+        canvas.fillStyle = v;
+      },
+      set imageSmoothingQuality(v: string) {
+        canvas.imageSmoothingQuality = v;
+      },
+    };
+  }
+  /** The bitmaps handed out of it. */
+  bitmaps: FakeBitmap[] = [];
+  transferToImageBitmap() {
+    const b = new FakeBitmap(this.width, this.height);
+    this.bitmaps.push(b);
+    return b;
+  }
+}
+
+export class FakeBitmap {
+  closed = false;
+  constructor(
+    public width: number,
+    public height: number,
+  ) {}
+  close() {
+    this.closed = true;
+  }
+}
+
+/** Makes `OffscreenCanvas` and `ImageBitmap` the fakes; undo with `vi.unstubAllGlobals()`. */
+export function stubCanvas(): void {
+  FakeCanvas.made = [];
+  FakeCanvas.reads = [];
+  vi.stubGlobal("OffscreenCanvas", FakeCanvas);
+  vi.stubGlobal("ImageBitmap", FakeBitmap);
+}
diff --git a/crates/exav-viewer/ts/test/markdown.ts b/crates/exav-viewer/ts/test/markdown.ts
new file mode 100644
index 00000000..93d80464
--- /dev/null
+++ b/crates/exav-viewer/ts/test/markdown.ts
@@ -0,0 +1,17 @@
+// The Markdown reader as the tests run it: the wasm module in this process,
+// where the page has it in a worker (jsdom has none).
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+import init, { parseMarkdown } from "../../wasm/exav_viewer_text.js";
+import type { Parsed } from "../text/markdown.js";
+
+const wasm = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "wasm", "exav_viewer_text_bg.wasm");
+let ready: Promise<unknown> | null = null;
+
+export async function readMarkdown(source: string): Promise<Parsed> {
+  ready ??= init({ module_or_path: fs.readFileSync(wasm) });
+  await ready;
+  return JSON.parse(parseMarkdown(source)) as Parsed;
+}
diff --git a/crates/exav-viewer/ts/test/zip-members.ts b/crates/exav-viewer/ts/test/zip-members.ts
new file mode 100644
index 00000000..2e32f918
--- /dev/null
+++ b/crates/exav-viewer/ts/test/zip-members.ts
@@ -0,0 +1,29 @@
+/**
+ * A ZIP whose members are named and sized as given. Their bytes are not
+ * stored: only the central directory is, which is all `zipMembers` reads.
+ */
+export function zipOf(members: [string, number][]): Uint8Array {
+  const names = members.map(([n]) => new TextEncoder().encode(n));
+  const central = names.reduce((n, name) => n + 46 + name.length, 0);
+  const out = new Uint8Array(central + 22);
+  const v = new DataView(out.buffer);
+  let at = 0;
+  members.forEach(([, size], i) => {
+    v.setUint32(at, 0x02014b50, true);
+    v.setUint32(at + 24, size, true);
+    v.setUint16(at + 28, names[i]!.length, true);
+    out.set(names[i]!, at + 46);
+    at += 46 + names[i]!.length;
+  });
+  v.setUint32(at, 0x06054b50, true);
+  v.setUint16(at + 10, members.length, true);
+  v.setUint32(at + 12, central, true);
+  return out;
+}
+
+/** A PPTX's directory with `slides` slide parts. */
+export const deckOf = (slides: number) =>
+  zipOf([["[Content_Types].xml", 10], ["ppt/presentation.xml", 10], ...Array.from({ length: slides }, (_, i): [string, number] => [`ppt/slides/slide${i + 1}.xml`, 10])]);
+
+/** A DOCX's directory with a body of `bytes` once inflated. */
+export const documentOf = (bytes: number) => zipOf([["[Content_Types].xml", 10], ["word/document.xml", bytes]]);
diff --git a/crates/exav-viewer/ts/text/decode.test.ts b/crates/exav-viewer/ts/text/decode.test.ts
new file mode 100644
index 00000000..9f3e2d18
--- /dev/null
+++ b/crates/exav-viewer/ts/text/decode.test.ts
@@ -0,0 +1,134 @@
+import { describe, expect, it } from "vitest";
+
+import { clip, decodeText, MAX_LINE, sanitize, splitLines } from "./decode.js";
+
+const bytes = (...parts: (string | number[])[]) =>
+  Uint8Array.from(parts.flatMap((p) => (typeof p === "string" ? [...new TextEncoder().encode(p)] : p)));
+const ch = (code: number) => String.fromCharCode(code);
+
+/** UTF-16 of `s` with a byte-order mark. */
+function utf16(s: string, order: "le" | "be"): Uint8Array {
+  const out = [order === "le" ? 0xff : 0xfe, order === "le" ? 0xfe : 0xff];
+  for (let i = 0; i < s.length; i++) {
+    const c = s.charCodeAt(i);
+    out.push(...(order === "le" ? [c & 0xff, c >> 8] : [c >> 8, c & 0xff]));
+  }
+  return Uint8Array.from(out);
+}
+
+describe("decodeText", () => {
+  it("reads UTF-8, with or without a byte-order mark", () => {
+    expect(decodeText(bytes("naïve café ✓"))).toEqual({ text: "naïve café ✓", encoding: "utf-8" });
+    expect(decodeText(bytes([0xef, 0xbb, 0xbf], "hello"))?.text).toBe("hello");
+  });
+
+  it("reads UTF-16 by its mark, in both byte orders, astral characters included", () => {
+    const s = "Zażółć 😀 ok";
+    expect(decodeText(utf16(s, "le"))).toEqual({ text: s, encoding: "utf-16le" });
+    expect(decodeText(utf16(s, "be"))).toEqual({ text: s, encoding: "utf-16be" });
+  });
+
+  it("falls back to windows-1252 for bytes that are not UTF-8", () => {
+    // 0xE9 alone is not UTF-8; 0x80 is the euro sign in windows-1252.
+    expect(decodeText(bytes("caf", [0xe9], " ", [0x80]))).toEqual({ text: "café €", encoding: "windows-1252" });
+  });
+
+  it("does not take a character cut by the end of a partial read for an error", () => {
+    const whole = bytes("é"); // 0xC3 0xA9
+    expect(decodeText(whole.subarray(0, 1), true)?.encoding).toBe("utf-8");
+    expect(decodeText(bytes("ab", [0xc3]), true)).toEqual({ text: "ab", encoding: "utf-8" });
+    // Not partial: the same bytes are not UTF-8.
+    expect(decodeText(bytes("ab", [0xc3]))?.encoding).toBe("windows-1252");
+  });
+
+  it("refuses a file with a NUL in its head, and UTF-32", () => {
+    expect(decodeText(bytes("text", [0], "more"))).toBeNull();
+    // One NUL among many characters, too few for the control-character ratio to catch.
+    expect(decodeText(bytes("ordinary words ".repeat(200), [0], "and more words"))).toBeNull();
+    expect(decodeText(Uint8Array.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0, 0, 0, 0x0d]))).toBeNull();
+    expect(decodeText(Uint8Array.from([0xff, 0xfe, 0, 0, 0x41, 0, 0, 0]))).toBeNull();
+    expect(decodeText(Uint8Array.from([0, 0, 0xfe, 0xff, 0, 0, 0, 0x41]))).toBeNull();
+    // UTF-16 without a mark is all NULs for ASCII: not guessed.
+    expect(decodeText(Uint8Array.from([0x68, 0, 0x69, 0]))).toBeNull();
+  });
+
+  it("refuses bytes that are mostly control characters even with no NUL", () => {
+    const noise = Uint8Array.from({ length: 1000 }, (_, i) => 1 + (i % 7));
+    expect(decodeText(noise)).toBeNull();
+    // A few stray controls in a text are still a text.
+    expect(decodeText(bytes("a log line\u001b[0m\n".repeat(50)))).not.toBeNull();
+  });
+
+  it("accepts an empty file", () => {
+    expect(decodeText(new Uint8Array())).toEqual({ text: "", encoding: "utf-8" });
+  });
+});
+
+describe("sanitize", () => {
+  it("makes every bidirectional override, embedding and isolate visible", () => {
+    const hidden = [0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0x2066, 0x2067, 0x2068, 0x2069];
+    const text = `if (admin ${hidden.map(ch).join("")}) { // end`;
+    const out = sanitize(text);
+    for (const c of hidden) {
+      expect(out.includes(ch(c)), c.toString(16)).toBe(false);
+      expect(out).toContain(`<U+${c.toString(16).toUpperCase()}>`);
+    }
+    // The text around them is as it was.
+    expect(out.startsWith("if (admin ")).toBe(true);
+    expect(out.endsWith(") { // end")).toBe(true);
+  });
+
+  it("shows C0 controls and DEL as their Control Pictures, and C1 and separators as code points", () => {
+    expect(sanitize("a\u0001b")).toBe(`a${ch(0x2401)}b`);
+    expect(sanitize("a\u0000b")).toBe(`a${ch(0x2400)}b`);
+    expect(sanitize(`a${ch(0x7f)}b`)).toBe(`a${ch(0x2421)}b`);
+    expect(sanitize(`a${ch(0x85)}b`)).toBe("a<U+0085>b");
+    expect(sanitize(`a${ch(0x2028)}b${ch(0x2029)}c`)).toBe("a<U+2028>b<U+2029>c");
+  });
+
+  it("leaves tabs, line breaks and ordinary text, right-to-left included, alone", () => {
+    const text = "a\tb\r\nc\nd שלום مرحبا 日本語 😀";
+    expect(sanitize(text)).toBe(text);
+  });
+});
+
+describe("splitLines", () => {
+  it("splits on LF, CRLF and CR", () => {
+    expect(splitLines("a\nb\r\nc\rd").lines).toEqual(["a", "b", "c", "d"]);
+    expect(splitLines("a\n\nb").lines).toEqual(["a", "", "b"]);
+    expect(splitLines("").lines).toEqual([""]);
+    expect(splitLines("a\n").lines).toEqual(["a", ""]);
+  });
+
+  it("stops at the cap and says there was more", () => {
+    const text = Array.from({ length: 10 }, (_, i) => `l${i}`).join("\n");
+    expect(splitLines(text, 4)).toEqual({ lines: ["l0", "l1", "l2", "l3"], more: true });
+    expect(splitLines(text, 10).more).toBe(false);
+    expect(splitLines(text, 10).lines).toHaveLength(10);
+    // The newline that ends the text does not start a line.
+    expect(splitLines("a\nb\n", 2)).toEqual({ lines: ["a", "b"], more: false });
+    expect(splitLines("a\nb\nc", 2)).toEqual({ lines: ["a", "b"], more: true });
+  });
+
+  it("handles a million newlines in linear time", () => {
+    const t = performance.now();
+    const r = splitLines("\n".repeat(1_000_000), 50_000);
+    expect(r.lines).toHaveLength(50_000);
+    expect(r.more).toBe(true);
+    expect(performance.now() - t).toBeLessThan(1000);
+  });
+});
+
+describe("clip", () => {
+  it("leaves a line that fits and cuts one that does not, with an ellipsis", () => {
+    expect(clip("abc", 3)).toBe("abc");
+    expect(clip("abcd", 3)).toBe("abc…");
+    expect(clip("x".repeat(MAX_LINE + 1)).length).toBe(MAX_LINE + 1);
+  });
+
+  it("does not cut a surrogate pair in two", () => {
+    const s = "ab😀cd";
+    expect(clip(s, 3)).toBe("ab…");
+    expect(clip(s, 4)).toBe("ab😀…");
+  });
+});
diff --git a/crates/exav-viewer/ts/text/decode.ts b/crates/exav-viewer/ts/text/decode.ts
new file mode 100644
index 00000000..c0ddde0e
--- /dev/null
+++ b/crates/exav-viewer/ts/text/decode.ts
@@ -0,0 +1,139 @@
+/**
+ * Bytes to text that is safe to show: the encoding is read off the bytes, a
+ * file that is not text is refused, and what could make the text lie about
+ * itself (control characters, bidirectional overrides) is made visible.
+ */
+
+/** Bytes of a file that are read. */
+export const MAX_BYTES = 2 * 1024 * 1024;
+/** Lines shown. */
+export const MAX_LINES = 50_000;
+/** Characters shown of one line. */
+export const MAX_LINE = 10_000;
+
+/** How much of the head the binary check looks at. */
+const SNIFF = 64 * 1024;
+
+export interface Decoded {
+  text: string;
+  encoding: "utf-8" | "utf-16le" | "utf-16be" | "windows-1252";
+}
+
+/** One decode, `null` when the bytes are not valid in that encoding. */
+function strict(bytes: Uint8Array, encoding: string, partial: boolean): string | null {
+  try {
+    // `stream`: a character cut in half by the end of the bytes is held back, not an error.
+    return new TextDecoder(encoding, { fatal: true }).decode(bytes, { stream: partial });
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * The text of `bytes`, or `null` when they are not text. `partial`: the bytes
+ * are the start of a longer file.
+ *
+ * A byte-order mark settles the encoding (UTF-32 is refused). Otherwise a NUL
+ * in the head means binary, then UTF-8 if the bytes are valid in it, else
+ * windows-1252, which cannot fail and so comes last. A head where control
+ * characters or replacement characters are one in ten is binary too.
+ */
+export function decodeText(bytes: Uint8Array, partial = false): Decoded | null {
+  const [a = 0, b = 0, c = 0, d = 0] = bytes;
+  if ((a === 0xff && b === 0xfe && c === 0 && d === 0) || (a === 0 && b === 0 && c === 0xfe && d === 0xff)) return null;
+  let text: string | null;
+  let encoding: Decoded["encoding"];
+  if (a === 0xff && b === 0xfe) {
+    encoding = "utf-16le";
+    text = new TextDecoder(encoding).decode(bytes, { stream: partial });
+  } else if (a === 0xfe && b === 0xff) {
+    encoding = "utf-16be";
+    text = new TextDecoder(encoding).decode(bytes, { stream: partial });
+  } else {
+    const head = Math.min(bytes.length, SNIFF);
+    for (let i = 0; i < head; i++) if (bytes[i] === 0) return null;
+    text = strict(bytes, "utf-8", partial);
+    encoding = "utf-8";
+    if (text === null) {
+      text = new TextDecoder("windows-1252").decode(bytes);
+      encoding = "windows-1252";
+    }
+  }
+  return looksBinary(text.slice(0, SNIFF)) ? null : { text, encoding };
+}
+
+/** C0 controls but tab, line feed and carriage return, DEL, C1 controls, and U+FFFD. */
+const isOdd = (c: number) => (c < 0x20 && c !== 9 && c !== 10 && c !== 13) || (c >= 0x7f && c <= 0x9f) || c === 0xfffd;
+
+function looksBinary(sample: string): boolean {
+  let odd = 0;
+  for (let i = 0; i < sample.length; i++) if (isOdd(sample.charCodeAt(i))) odd++;
+  return odd * 10 > sample.length;
+}
+
+/**
+ * What is not shown as itself: C0 controls but tab, line feed and carriage
+ * return, DEL, C1 controls, the line and paragraph separators, and the
+ * bidirectional embeddings, overrides and isolates (CVE-2021-42574).
+ */
+const isHidden = (c: number) =>
+  (c < 0x20 && c !== 9 && c !== 10 && c !== 13) ||
+  (c >= 0x7f && c <= 0x9f) ||
+  c === 0x2028 ||
+  c === 0x2029 ||
+  (c >= 0x202a && c <= 0x202e) ||
+  (c >= 0x2066 && c <= 0x2069);
+
+/**
+ * C0 controls and DEL show as their Control Pictures glyph (U+2400 and up, one
+ * character each); the others show as `<U+XXXX>`.
+ */
+export function sanitize(text: string): string {
+  let out = "";
+  let from = 0;
+  for (let i = 0; i < text.length; i++) {
+    const c = text.charCodeAt(i);
+    if (!isHidden(c)) continue;
+    out += text.slice(from, i);
+    if (c < 0x20) out += String.fromCharCode(0x2400 + c);
+    else if (c === 0x7f) out += String.fromCharCode(0x2421);
+    else out += `<U+${c.toString(16).toUpperCase().padStart(4, "0")}>`;
+    from = i + 1;
+  }
+  return from === 0 ? text : out + text.slice(from);
+}
+
+export interface Lines {
+  lines: string[];
+  /** The text had more lines than `max`. */
+  more: boolean;
+}
+
+/** Splits on LF, CRLF and CR, stopping after `max` lines. */
+export function splitLines(text: string, max = MAX_LINES): Lines {
+  const lines: string[] = [];
+  let at = 0;
+  const n = text.length;
+  while (at <= n) {
+    if (lines.length === max) return { lines, more: at < n };
+    let end = at;
+    while (end < n) {
+      const c = text.charCodeAt(end);
+      if (c === 10 || c === 13) break;
+      end++;
+    }
+    lines.push(text.slice(at, end));
+    if (end >= n) break;
+    at = end + (text.charCodeAt(end) === 13 && text.charCodeAt(end + 1) === 10 ? 2 : 1);
+  }
+  return { lines, more: false };
+}
+
+/** `s` cut to `max` characters (not through a surrogate pair), with an ellipsis, or itself. */
+export function clip(s: string, max = MAX_LINE): string {
+  if (s.length <= max) return s;
+  let end = max;
+  const last = s.charCodeAt(end - 1);
+  if (last >= 0xd800 && last <= 0xdbff) end--;
+  return `${s.slice(0, end)}…`;
+}
diff --git a/crates/exav-viewer/ts/text/index.ts b/crates/exav-viewer/ts/text/index.ts
new file mode 100644
index 00000000..df923d14
--- /dev/null
+++ b/crates/exav-viewer/ts/text/index.ts
@@ -0,0 +1,25 @@
+/**
+ * `@exav/viewer/text`: plain text, Markdown, JSON, XML, and the text
+ * formats that need nothing more than a monospace page (YAML, TOML, INI,
+ * source code, subtitles, diffs). HTML is shown as its source, never
+ * drawn. Written in TypeScript here with no dependency, except Markdown,
+ * which exav-render reads in WebAssembly (`exav_viewer_text.wasm`, loaded
+ * when one is opened). What each name and type is shown as is `TEXT_KINDS`
+ * in the core.
+ *
+ * The file is read up to 2 MiB and 50,000 lines (the rest is left out, and
+ * the warning `text_truncated` says so); a file that is not text is refused
+ * (`text_binary`).
+ */
+import { MATCHERS } from "../core/formats.js";
+import type { FormatPlugin } from "../core/types.js";
+
+export const text = (): FormatPlugin<Record<string, never>> => ({
+  id: "text",
+  match: MATCHERS.text,
+  capabilities: [],
+  options: {},
+  load: () => import("./renderer.js").then((m) => m.renderer),
+});
+
+export { MAX_BYTES, MAX_LINES, MAX_LINE } from "./decode.js";
diff --git a/crates/exav-viewer/ts/text/json.test.ts b/crates/exav-viewer/ts/text/json.test.ts
new file mode 100644
index 00000000..007eed90
--- /dev/null
+++ b/crates/exav-viewer/ts/text/json.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from "vitest";
+
+import { formatJson, MAX_DEPTH } from "./json.js";
+import { lineText } from "./lines.js";
+
+const show = (text: string, max?: number) => {
+  const r = formatJson(text, max);
+  return r && r.lines.map(lineText).join("\n");
+};
+
+describe("formatJson", () => {
+  it("indents by two spaces, one value per line", () => {
+    expect(show('{"a":[1,2,{"b":null}],"c":"x","d":true}')).toBe(
+      ['{', '  "a": [', '    1,', '    2,', '    {', '      "b": null', '    }', '  ],', '  "c": "x",', '  "d": true', '}'].join("\n"),
+    );
+  });
+
+  it("keeps empty containers on one line", () => {
+    expect(show('{"a":{},"b":[ ],"c":[[]]}')).toBe(['{', '  "a": {},', '  "b": [],', '  "c": [', '    []', '  ]', '}'].join("\n"));
+  });
+
+  it("keeps the text of numbers and strings exactly", () => {
+    const src = '[12345678901234567890123,1.10,-0,1E+2,0.1e-7,"\\u00e9\\n\\/","é"]';
+    const out = show(src)!;
+    // JSON.parse would print 1.2345678901234568e+22, 1.1, 0 and decode the escapes.
+    for (const token of ["12345678901234567890123", "1.10", "-0", "1E+2", "0.1e-7", '"\\u00e9\\n\\/"', '"é"']) expect(out).toContain(token);
+  });
+
+  it("keeps key order and duplicate keys", () => {
+    expect(show('{"b":1,"a":2,"b":3}')).toBe('{\n  "b": 1,\n  "a": 2,\n  "b": 3\n}');
+  });
+
+  it("says the same thing as the input: parsing the output gives the parsed input", () => {
+    const samples = [
+      '{"menu":{"id":"file","items":[{"label":"New","shortcut":null},{"label":"Open","n":[1,2.5,-3e2]}],"on":false}}',
+      "[[],{},[[[]]],\"a\\\"b\"]",
+      '"just a string"',
+      "  42  ",
+      '{ "a" : 1 ,\n\t"b" : [ 1 , 2 ] }',
+    ];
+    for (const s of samples) expect(JSON.parse(show(s)!), s).toEqual(JSON.parse(s));
+  });
+
+  it("marks the parts so that they can be coloured, without changing the text", () => {
+    const r = formatJson('{"k":"v","n":1,"t":null}')!;
+    const segs = r.lines.flatMap((l) => (typeof l === "string" ? [] : l));
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-key").map((s) => s[0])).toEqual(['"k"', '"n"', '"t"']);
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-str").map((s) => s[0])).toEqual(['"v"']);
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-num").map((s) => s[0])).toEqual(["1"]);
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-lit").map((s) => s[0])).toEqual(["null"]);
+  });
+
+  it("refuses what is not strict JSON", () => {
+    const bad = [
+      "", "   ", "{", "}", "[1,]", "[,1]", "{\"a\":1,}", "{'a':1}", "{a:1}", "[1 2]", '{"a" 1}', '{"a":}', "[1]x", "[1][2]",
+      "// c\n[1]", "[1 /* c */]", "NaN", "[Infinity]", "[01]", "[1.]", "[.5]", "[+1]", "[1e]", "[-]", "[tru]", "[nulll]", "[True]",
+      '"unterminated', '"bad \\x escape"', '"\\u12G4"', '"raw\nnewline"', '"raw\ttab"', '{"a":1 "b":2}', '{"a":1:2}', '{1:2}', '[{]}',
+    ];
+    for (const s of bad) expect(formatJson(s), JSON.stringify(s)).toBeNull();
+  });
+
+  it("refuses nesting deeper than the limit, and accepts it at the limit", () => {
+    const deep = (n: number) => "[".repeat(n) + "]".repeat(n);
+    expect(formatJson(deep(MAX_DEPTH))).not.toBeNull();
+    expect(formatJson(deep(MAX_DEPTH + 1))).toBeNull();
+    const objects = (n: number) => '{"a":'.repeat(n) + "1" + "}".repeat(n);
+    expect(formatJson(objects(MAX_DEPTH))).not.toBeNull();
+    expect(formatJson(objects(MAX_DEPTH + 1))).toBeNull();
+  });
+
+  it("stops keeping lines at the cap and says so", () => {
+    const text = `[${Array.from({ length: 1000 }, (_, i) => i).join(",")}]`;
+    const r = formatJson(text, 100)!;
+    expect(r.lines).toHaveLength(100);
+    expect(r.more).toBe(true);
+    expect(r.lines.map(lineText).slice(0, 3)).toEqual(["[", "  0,", "  1,"]);
+    expect(formatJson(text, 5000)!.more).toBe(false);
+  });
+
+  it("is quick on hostile input", () => {
+    const t = performance.now();
+    for (const s of [
+      "[".repeat(2_000_000),
+      '{"a":'.repeat(400_000),
+      '["' + "\\".repeat(1_000_001),
+      "[" + "1,".repeat(1_000_000) + "1]",
+      "[" + '"x",'.repeat(500_000) + '"x"',
+      '"' + "a".repeat(2_000_000) + '"',
+      "[" + '{"a":[]},'.repeat(200_000) + "{}]",
+    ]) {
+      formatJson(s, 50_000);
+    }
+    expect(performance.now() - t).toBeLessThan(5000);
+  });
+});
diff --git a/crates/exav-viewer/ts/text/json.ts b/crates/exav-viewer/ts/text/json.ts
new file mode 100644
index 00000000..8e7dbbdd
--- /dev/null
+++ b/crates/exav-viewer/ts/text/json.ts
@@ -0,0 +1,161 @@
+/**
+ * A JSON pretty printer that works on the tokens and copies each one as it
+ * is written: numbers keep their text (2^70 or 1.10 are not rounded by a
+ * parse and a stringify), strings keep their escapes, key order and
+ * duplicates stay. Strict: a trailing comma, a comment or a bare word make the
+ * text invalid, and `null` is returned.
+ */
+import { MAX_LINES } from "./decode.js";
+import { LineBuilder, type Line } from "./lines.js";
+
+/** Deeper than this is refused: the output indents by two spaces per level. */
+export const MAX_DEPTH = 100;
+
+const ESCAPES = '"\\/bfnrtu';
+
+/** The lines of `text` indented, or `null` when it is not valid JSON (or nests deeper than `MAX_DEPTH`). */
+export function formatJson(text: string, maxLines = MAX_LINES): { lines: Line[]; more: boolean } | null {
+  const out = new LineBuilder(maxLines);
+  const n = text.length;
+  let i = 0;
+  /** true for an object, false for an array. */
+  const stack: boolean[] = [];
+  const indent = () => "  ".repeat(stack.length);
+  const ws = () => {
+    while (i < n) {
+      const c = text.charCodeAt(i);
+      if (c === 32 || c === 9 || c === 10 || c === 13) i++;
+      else break;
+    }
+  };
+
+  /** The end of the string starting at `i`, or -1. */
+  const stringEnd = (): number => {
+    let j = i + 1;
+    while (j < n) {
+      const c = text.charCodeAt(j);
+      if (c === 34) return j + 1;
+      if (c < 0x20) return -1;
+      if (c === 92) {
+        const e = text[j + 1];
+        if (e === undefined || !ESCAPES.includes(e)) return -1;
+        if (e === "u") {
+          if (!/^[0-9a-fA-F]{4}$/.test(text.slice(j + 2, j + 6))) return -1;
+          j += 6;
+        } else j += 2;
+      } else j++;
+    }
+    return -1;
+  };
+
+  const digits = (j: number): number => {
+    const start = j;
+    while (j < n && text.charCodeAt(j) >= 48 && text.charCodeAt(j) <= 57) j++;
+    return j === start ? -1 : j;
+  };
+
+  /** The end of the number starting at `i`, or -1. */
+  const numberEnd = (): number => {
+    let j = i;
+    if (text[j] === "-") j++;
+    if (text[j] === "0") j++;
+    else {
+      const d = digits(j);
+      if (d < 0) return -1;
+      j = d;
+    }
+    if (text[j] === ".") {
+      const d = digits(j + 1);
+      if (d < 0) return -1;
+      j = d;
+    }
+    if (text[j] === "e" || text[j] === "E") {
+      j++;
+      if (text[j] === "+" || text[j] === "-") j++;
+      const d = digits(j);
+      if (d < 0) return -1;
+      j = d;
+    }
+    return j;
+  };
+
+  type State = "value" | "key" | "after" | "end";
+  // Set by `valueDone` too: typed so that the flow analysis does not narrow it.
+  let state = "value" as State;
+
+  const valueDone = () => {
+    state = stack.length ? "after" : "end";
+  };
+
+  for (;;) {
+    ws();
+    if (i >= n) break;
+    const ch = text[i]!;
+    if (state === "end") return null;
+    if (state === "key") {
+      if (ch !== '"') return null;
+      const e = stringEnd();
+      if (e < 0) return null;
+      out.add(text.slice(i, e), "exav-viewer-text-key");
+      i = e;
+      ws();
+      if (text[i] !== ":") return null;
+      i++;
+      out.add(": ");
+      state = "value";
+    } else if (state === "after") {
+      const object = stack[stack.length - 1]!;
+      if (ch === ",") {
+        i++;
+        out.add(",");
+        out.end();
+        out.add(indent());
+        state = object ? "key" : "value";
+      } else if (ch === (object ? "}" : "]")) {
+        i++;
+        stack.pop();
+        out.end();
+        out.add(indent());
+        out.add(ch);
+        valueDone();
+      } else return null;
+    } else if (ch === "{" || ch === "[") {
+      if (stack.length >= MAX_DEPTH) return null;
+      i++;
+      ws();
+      const close = ch === "{" ? "}" : "]";
+      if (text[i] === close) {
+        i++;
+        out.add(ch + close);
+        valueDone();
+      } else {
+        stack.push(ch === "{");
+        out.add(ch);
+        out.end();
+        out.add(indent());
+        state = ch === "{" ? "key" : "value";
+      }
+    } else if (ch === '"') {
+      const e = stringEnd();
+      if (e < 0) return null;
+      out.add(text.slice(i, e), "exav-viewer-text-str");
+      i = e;
+      valueDone();
+    } else {
+      let e = -1;
+      let cls = "exav-viewer-text-lit";
+      for (const word of ["true", "false", "null"]) if (text.startsWith(word, i)) e = i + word.length;
+      if (e < 0) {
+        e = numberEnd();
+        cls = "exav-viewer-text-num";
+      }
+      if (e < 0) return null;
+      out.add(text.slice(i, e), cls);
+      i = e;
+      valueDone();
+    }
+  }
+  if (state !== "end") return null;
+  out.finish();
+  return { lines: out.lines, more: out.full };
+}
diff --git a/crates/exav-viewer/ts/text/lines.ts b/crates/exav-viewer/ts/text/lines.ts
new file mode 100644
index 00000000..2b2d56fe
--- /dev/null
+++ b/crates/exav-viewer/ts/text/lines.ts
@@ -0,0 +1,41 @@
+/** A piece of a line, with the class that colours it. */
+export type Seg = readonly [text: string, cls?: string];
+
+/** A line: plain text, or pieces. */
+export type Line = string | readonly Seg[];
+
+export const lineLength = (line: Line): number => (typeof line === "string" ? line.length : line.reduce((n, s) => n + s[0].length, 0));
+
+export const lineText = (line: Line): string => (typeof line === "string" ? line : line.map((s) => s[0]).join(""));
+
+/**
+ * Collects lines up to a cap. Past it, `full` is true and nothing more is
+ * kept, so that a producer can stop early.
+ */
+export class LineBuilder {
+  readonly lines: Line[] = [];
+  private current: Seg[] = [];
+  full = false;
+
+  constructor(private readonly max: number) {}
+
+  add(text: string, cls?: string): void {
+    if (text) this.current.push(cls ? [text, cls] : [text]);
+  }
+
+  /** Ends the line. */
+  end(): void {
+    if (this.lines.length >= this.max) {
+      this.full = true;
+      this.current = [];
+      return;
+    }
+    this.lines.push(this.current);
+    this.current = [];
+  }
+
+  /** Ends the line being written if it has anything. */
+  finish(): void {
+    if (this.current.length) this.end();
+  }
+}
diff --git a/crates/exav-viewer/ts/text/markdown-engine.ts b/crates/exav-viewer/ts/text/markdown-engine.ts
new file mode 100644
index 00000000..12488018
--- /dev/null
+++ b/crates/exav-viewer/ts/text/markdown-engine.ts
@@ -0,0 +1,22 @@
+import { createWorkerHost } from "../core/worker-host.js";
+import type { Parsed } from "./markdown.js";
+
+/** The reader is linear; a document it cannot finish in this time is not waited for. */
+const TIMEOUT_MS = 30_000;
+
+/**
+ * Reads Markdown with exav-render in a worker of its own for this one
+ * document, terminated when it is done: a wasm instance's memory never
+ * shrinks. `signal` (the session's) stops it at once.
+ */
+export async function readMarkdown(source: string, signal?: AbortSignal): Promise<Parsed> {
+  const host = createWorkerHost<string, string>(() => new Worker(new URL("./markdown.worker.js", import.meta.url), { type: "module" }));
+  const stop = () => host.destroy();
+  signal?.addEventListener("abort", stop, { once: true });
+  try {
+    return JSON.parse(await host.call(source, [], TIMEOUT_MS)) as Parsed;
+  } finally {
+    signal?.removeEventListener("abort", stop);
+    host.destroy();
+  }
+}
diff --git a/crates/exav-viewer/ts/text/markdown-view.ts b/crates/exav-viewer/ts/text/markdown-view.ts
new file mode 100644
index 00000000..992c55a3
--- /dev/null
+++ b/crates/exav-viewer/ts/text/markdown-view.ts
@@ -0,0 +1,151 @@
+/**
+ * Draws a parsed Markdown tree. Elements are made with `createElement` and
+ * given text with `textContent`: no markup string is ever parsed, and no
+ * attribute carries data from the file except a list's start number, which
+ * is a digit string made here. A link is its label with the address it goes
+ * to written out beside it. An http or https link is followed on a click or
+ * Enter by `window.open`, as a PDF's links are: in the frame a request the
+ * host confirms, in the page a new tab with no opener. It is not an anchor,
+ * so the document itself never navigates; a `mailto:` link is text, and so
+ * is a link whose address `safeTarget` refuses. The reader bounds how deep
+ * the tree goes.
+ */
+import { plain, safeTarget, type Block, type Inline } from "./markdown.js";
+
+function el(tag: string, cls?: string): HTMLElement {
+  const e = document.createElement(tag);
+  if (cls) e.className = cls;
+  return e;
+}
+
+function span(cls: string, text: string): HTMLElement {
+  const e = el("span", cls);
+  e.textContent = text;
+  return e;
+}
+
+export function drawInline(parent: Node, nodes: Inline[]): void {
+  for (const n of nodes) {
+    switch (n.t) {
+      case "text":
+        parent.appendChild(document.createTextNode(n.s));
+        break;
+      case "br":
+        parent.appendChild(el("br"));
+        break;
+      case "code": {
+        const e = el("code");
+        e.textContent = n.s;
+        parent.appendChild(e);
+        break;
+      }
+      case "image":
+        parent.appendChild(span("exav-viewer-md-image", n.alt ? `[${n.alt}]` : "[image]"));
+        break;
+      case "link": {
+        const url = safeTarget(n.url);
+        if (!url) {
+          drawInline(parent, n.c);
+          break;
+        }
+        const label = plain(n.c);
+        const a = el("span", "exav-viewer-text-link");
+        drawInline(a, n.c);
+        if (/^https?:/i.test(url)) {
+          const follow = () => window.open(url, "_blank", "noopener,noreferrer");
+          a.tabIndex = 0;
+          a.setAttribute("role", "link");
+          a.addEventListener("click", follow);
+          a.addEventListener("keydown", (e) => {
+            if (e.key === "Enter") follow();
+          });
+        }
+        parent.appendChild(a);
+        const bare = url.replace(/^mailto:/, "");
+        if (label !== url && label !== bare) parent.appendChild(span("exav-viewer-text-url", ` (${url})`));
+        break;
+      }
+      default: {
+        const e = el(n.t === "em" ? "em" : n.t === "strong" ? "strong" : "del");
+        drawInline(e, n.c);
+        parent.appendChild(e);
+      }
+    }
+  }
+}
+
+export function drawBlocks(parent: Node, blocks: Block[], tight = false): void {
+  for (const b of blocks) {
+    switch (b.t) {
+      case "p": {
+        if (tight) {
+          drawInline(parent, b.c);
+          break;
+        }
+        const e = el("p");
+        drawInline(e, b.c);
+        parent.appendChild(e);
+        break;
+      }
+      case "h": {
+        const e = el(`h${b.level}`);
+        drawInline(e, b.c);
+        parent.appendChild(e);
+        break;
+      }
+      case "code": {
+        const pre = el("pre");
+        const code = el("code");
+        code.textContent = b.s;
+        pre.appendChild(code);
+        parent.appendChild(pre);
+        break;
+      }
+      case "hr":
+        parent.appendChild(el("hr"));
+        break;
+      case "raw": {
+        const e = el("p", "exav-viewer-md-raw");
+        e.textContent = b.s;
+        parent.appendChild(e);
+        break;
+      }
+      case "quote": {
+        const e = el("blockquote");
+        drawBlocks(e, b.c);
+        parent.appendChild(e);
+        break;
+      }
+      case "list": {
+        const e = el(b.ordered ? "ol" : "ul", b.tight ? "exav-viewer-md-tight" : undefined);
+        if (b.ordered && b.start !== 1) e.setAttribute("start", String(Math.trunc(b.start)));
+        for (const item of b.items) {
+          const li = el("li");
+          drawBlocks(li, item, b.tight);
+          e.appendChild(li);
+        }
+        parent.appendChild(e);
+        break;
+      }
+      case "table": {
+        const table = el("table");
+        const row = (cells: Inline[][], tag: string) => {
+          const tr = el("tr");
+          cells.forEach((c, k) => {
+            const cell = el(tag, b.align[k] ? `exav-viewer-md-${b.align[k]}` : undefined);
+            drawInline(cell, c);
+            tr.appendChild(cell);
+          });
+          return tr;
+        };
+        const thead = el("thead");
+        thead.appendChild(row(b.head, "th"));
+        const tbody = el("tbody");
+        for (const r of b.rows) tbody.appendChild(row(r, "td"));
+        table.append(thead, tbody);
+        parent.appendChild(table);
+        break;
+      }
+    }
+  }
+}
diff --git a/crates/exav-viewer/ts/text/markdown.test.ts b/crates/exav-viewer/ts/text/markdown.test.ts
new file mode 100644
index 00000000..f0d73d94
--- /dev/null
+++ b/crates/exav-viewer/ts/text/markdown.test.ts
@@ -0,0 +1,241 @@
+// The reader's own behaviour is tested in exav-render (tests/markdown.rs). Here:
+// what the page makes of a tree, with the real module in this process.
+import { describe, expect, it } from "vitest";
+
+import { splitLines } from "./decode.js";
+import { safeTarget, type Block, type Inline } from "./markdown.js";
+import { drawBlocks } from "./markdown-view.js";
+import { readMarkdown } from "../test/markdown.js";
+
+const TAGS = new Set(["P", "H1", "H2", "H3", "H4", "H5", "H6", "PRE", "CODE", "HR", "BLOCKQUOTE", "UL", "OL", "LI", "TABLE", "THEAD", "TBODY", "TR", "TH", "TD", "EM", "STRONG", "DEL", "BR", "SPAN"]);
+
+async function render(md: string): Promise<HTMLElement> {
+  const root = document.createElement("div");
+  drawBlocks(root, (await readMarkdown(splitLines(md).lines.join("\n"))).blocks);
+  return root;
+}
+
+function drawTree(blocks: Block[]): HTMLElement {
+  const root = document.createElement("div");
+  drawBlocks(root, blocks);
+  return root;
+}
+
+/**
+ * What may be in the page after any Markdown: only these tags, and no attribute
+ * but a class, a list's start, and on a followable link the fixed `tabindex="0"`
+ * and `role="link"`.
+ */
+function expectInert(root: HTMLElement, label = "") {
+  for (const e of root.querySelectorAll("*")) {
+    expect(TAGS.has(e.tagName), `${label} <${e.tagName}>`).toBe(true);
+    for (const a of e.getAttributeNames()) expect(["class", "start", "tabindex", "role"].includes(a), `${label} ${e.tagName} ${a}`).toBe(true);
+    if (e.hasAttribute("tabindex")) expect([e.getAttribute("tabindex"), e.getAttribute("role"), e.className], label).toEqual(["0", "link", "exav-viewer-text-link"]);
+    if (e.hasAttribute("start")) expect(e.getAttribute("start")).toMatch(/^\d{1,9}$/);
+  }
+}
+
+const tags = (root: HTMLElement, selector: string) => [...root.querySelectorAll(selector)].map((e) => e.textContent);
+
+describe("a document, read and drawn", () => {
+  it("draws headings, emphasis, code, quotes, lists, rules and tables", async () => {
+    const r = await render("# One\n\nSome *em* and **strong** and ~~gone~~ and `co*de*`.\n\n> quoted\n\n- a\n- b\n\n3. three\n\n---\n\n| A | B |\n|:-|-:|\n| 1 | 2 |\n\n```\nfenced <b>\n```\n");
+    expect(tags(r, "h1")).toEqual(["One"]);
+    expect(tags(r, "em")).toEqual(["em"]);
+    expect(tags(r, "strong")).toEqual(["strong"]);
+    expect(tags(r, "del")).toEqual(["gone"]);
+    expect(tags(r, "code")).toEqual(["co*de*", "fenced <b>"]);
+    expect(tags(r, "blockquote")).toEqual(["quoted"]);
+    expect(tags(r, "ul > li")).toEqual(["a", "b"]);
+    expect(r.querySelector("ol")!.getAttribute("start")).toBe("3");
+    expect(r.querySelectorAll("hr").length).toBe(1);
+    expect(tags(r, "th")).toEqual(["A", "B"]);
+    expect(r.querySelectorAll("th")[1]!.className).toBe("exav-viewer-md-right");
+    expect(tags(r, "td")).toEqual(["1", "2"]);
+    expectInert(r);
+  });
+
+  it("makes a loose list of paragraphs and a tight one of bare text", async () => {
+    expect((await render("- a\n- b")).querySelectorAll("li > p").length).toBe(0);
+    expect((await render("- a\n\n- b")).querySelectorAll("li > p").length).toBe(2);
+  });
+
+  it("decodes entities and resolves reference links", async () => {
+    const r = await render("fish &amp; chips &lt;b&gt;\n\n[ref][1]\n\n[1]: https://example.com/r");
+    expect(r.textContent).toContain("fish & chips <b>");
+    expect(tags(r, ".exav-viewer-text-link")).toEqual(["ref"]);
+    expect(tags(r, ".exav-viewer-text-url")).toEqual([" (https://example.com/r)"]);
+  });
+});
+
+describe("links", () => {
+  const link = async (md: string) => {
+    const r = await render(md);
+    return { r, spans: tags(r, ".exav-viewer-text-link"), urls: tags(r, ".exav-viewer-text-url") };
+  };
+
+  it("keeps http, https and mailto targets, and writes the address out beside the label", async () => {
+    const a = await link("[docs](https://example.com/a?b=1)");
+    expect(a.spans).toEqual(["docs"]);
+    expect(a.urls).toEqual([" (https://example.com/a?b=1)"]);
+    expect((await link("[site](http://example.com)")).urls).toEqual([" (http://example.com/)"]);
+    expect((await link("[write](mailto:me@example.com)")).urls).toEqual([" (mailto:me@example.com)"]);
+    // A label that is the address says it once.
+    expect((await link("[https://example.com/](https://example.com/)")).urls).toEqual([]);
+    expect((await link("<https://example.com/x>")).spans).toEqual(["https://example.com/x"]);
+    expect((await link("<me@example.com>")).spans).toEqual(["me@example.com"]);
+  });
+
+  it("never makes an anchor, an image or a form", async () => {
+    const r = await render("[a](https://example.com) ![b](https://example.com/i.png) <a href='https://x'>c</a> <https://example.com>");
+    expect(r.querySelector("a,img,form,iframe,object,embed,input,button,script,link,style")).toBeNull();
+  });
+
+  it("keeps only the label of any other target", async () => {
+    const refused = [
+      "javascript:alert(1)", "JaVaScRiPt:alert(1)", "  javascript:alert(1)", "java\nscript:alert(1)", "java\tscript:alert(1)",
+      "&#106;avascript:alert(1)", "data:text/html,<script>alert(1)</script>", "vbscript:msgbox(1)", "file:///etc/passwd",
+      "ftp://example.com/x", "blob:https://example.com/1", "about:blank", "/relative/path", "../up", "page.html", "#anchor", "//evil.example/x",
+      "https://user:pass@example.com/", "https://google.com@evil.example/", "https://", "mailto:", "tel:+123",
+      `https://exa${String.fromCharCode(0x202e)}mple.com/`, "https://example.com/a b", "x".repeat(3000),
+    ];
+    for (const target of refused) {
+      // In angle brackets, which allow spaces, and bare, for a target with none.
+      const forms = [`[click me](<${target.replace(/[<>\n]/g, " ")}>)`, ...(/[\s()<>]/.test(target) ? [] : [`[click me](${target})`])];
+      for (const md of forms) {
+        const { r, spans, urls } = await link(md);
+        expect(spans, md).toEqual([]);
+        expect(urls, md).toEqual([]);
+        expect(r.textContent, md).toContain("click me");
+        expectInert(r, md);
+      }
+    }
+  });
+
+  it("checks the address again, whatever the tree says", () => {
+    const hostile = ["javascript:alert(1)", "https://user:pass@example.com/", "data:text/html,x", "/relative", "HTTPS://", "https://exa‮mple.com/"];
+    for (const url of hostile) {
+      const r = drawTree([{ t: "p", c: [{ t: "link", url, c: [{ t: "text", s: "label" }] }] }]);
+      expect(tags(r, ".exav-viewer-text-link"), url).toEqual([]);
+      expect(r.textContent, url).toBe("label");
+      expectInert(r, url);
+    }
+  });
+
+  it("uses the browser's own reading of the address, so a lookalike host is shown as it really is", () => {
+    expect(safeTarget("https://EXAMPLE.com:443/a")).toBe("https://example.com/a");
+    expect(safeTarget(`https://${String.fromCharCode(0x430)}pple.com/`)).toBe("https://xn--pple-43d.com/");
+  });
+
+  it("shows an image as its alt text, in brackets, and loads nothing", async () => {
+    const r = await render("![a diagram](https://example.com/d.png) ![](https://example.com/e.png) ![x](data:image/png;base64,AAAA)");
+    expect(r.querySelector("img")).toBeNull();
+    expect(tags(r, ".exav-viewer-md-image")).toEqual(["[a diagram]", "[image]", "[x]"]);
+    expect(r.textContent).not.toContain("example.com");
+    expect(r.textContent).not.toContain("base64");
+  });
+});
+
+describe("raw HTML is text", () => {
+  const hostile = [
+    "<script>alert(1)</script>",
+    "<img src=x onerror=alert(1)>",
+    "<svg onload=alert(1)><circle r=1></circle></svg>",
+    "<iframe src=javascript:alert(1)></iframe>",
+    "<a href=\"javascript:alert(1)\">x</a>",
+    "<style>*{background:url(https://evil.example/x)}</style>",
+    "<form action=https://evil.example><input name=p></form>",
+    "<details open ontoggle=alert(1)>",
+    "<!-- comment --><b>bold</b>",
+    "<math><mi xlink:href=data:x,alert(1)>",
+    "<meta http-equiv=refresh content='0;url=https://evil.example'>",
+    "<link rel=stylesheet href=https://evil.example/x.css>",
+    "<base href=https://evil.example/>",
+    "</p><script>alert(1)</script>",
+  ];
+
+  it("shows each of these as written and creates none of their elements", async () => {
+    for (const html of hostile) {
+      const r = await render(html);
+      expect(r.querySelector("script,img,svg,iframe,a,style,form,input,details,math,meta,link,base,b"), html).toBeNull();
+      expectInert(r, html);
+      expect(r.textContent, html).toBe(html);
+    }
+  });
+
+  it("does so inside every Markdown construct", async () => {
+    const html = "<img src=x onerror=alert(1)>";
+    const wrapped = [`# ${html}`, `> ${html}`, `- ${html}`, `1. ${html}`, `*${html}*`, `**${html}**`, `[${html}](https://example.com)`, `![${html}](https://example.com/i.png)`, `| ${html} |\n|---|\n| ${html} |`, `\`${html}\``, `\`\`\`\n${html}\n\`\`\``, `    ${html}`];
+    for (const md of wrapped) {
+      const r = await render(md);
+      expect(r.querySelector("img"), md).toBeNull();
+      expectInert(r, md);
+      expect(r.textContent, md).toContain(html.slice(0, 4));
+    }
+  });
+});
+
+describe("limits", () => {
+  const sizes = (n: number, s: string) => s.repeat(n);
+  const inputs: [string, string][] = [
+    ["100k stars", sizes(100_000, "*")],
+    ["closers only", sizes(40, `${sizes(3000, "a* ")}\n`)],
+    ["alternating emphasis", sizes(50_000, "*a_b")],
+    ["100k open brackets", sizes(100_000, "[")],
+    ["100k link openers", sizes(100_000, "[](")],
+    ["100k image openers", sizes(100_000, "![")],
+    ["nested links", sizes(20_000, "[a](") + sizes(20_000, ")")],
+    ["ascending backtick runs", Array.from({ length: 1500 }, (_, i) => "`".repeat(i + 1)).join(" ")],
+    ["autolink openers", sizes(30_000, "<http://a")],
+    ["one 1 MB line of words", sizes(200_000, "word ")],
+    ["10k nested quotes", sizes(10_000, "> ") + "deep"],
+    ["quote staircase", Array.from({ length: 2000 }, (_, i) => "> ".repeat(i % 40) + "x").join("\n")],
+    ["nested list on one line", sizes(10_000, "- ") + "deep"],
+    ["list staircase", Array.from({ length: 3000 }, (_, i) => " ".repeat(2 * (i % 60)) + "- item").join("\n")],
+    ["20k blank-separated items", sizes(20_000, "- a\n\n")],
+    ["50k headings", sizes(50_000, "# h\n")],
+    ["wide table", "|" + sizes(5000, "a|") + "\n|" + sizes(5000, "-|") + "\n" + sizes(2000, "|" + sizes(100, "x|") + "\n")],
+    ["long table", "|a|b|\n|-|-|\n" + sizes(50_000, "|1|2|\n")],
+    ["html storm", sizes(30_000, "<div><script>")],
+    ["emphasis inside a link inside a quote", sizes(5000, "> [*a **b ") + sizes(5000, "](x)")],
+  ];
+
+  for (const [name, md] of inputs) {
+    it(`bounds the work and the page for ${name}`, async () => {
+      const t = performance.now();
+      const lines = splitLines(md, 50_000).lines.map((l) => l.slice(0, 10_000));
+      const parsed = await readMarkdown(lines.join("\n"));
+      const elapsed = performance.now() - t;
+      expect(elapsed, `${elapsed | 0} ms`).toBeLessThan(3000);
+      const root = document.createElement("div");
+      drawBlocks(root, parsed.blocks);
+      expect(root.querySelectorAll("*").length).toBeLessThan(250_000);
+      expectInert(root, name);
+    });
+  }
+
+  it("stops nesting quotes and lists at the limit, and keeps the rest as text", async () => {
+    const r = await render(sizes(50, "> ") + "deep text");
+    expect(r.querySelectorAll("blockquote").length).toBe(10);
+    expect(r.querySelector(".exav-viewer-md-raw")!.textContent).toContain("deep text");
+    const list = await render(Array.from({ length: 50 }, (_, i) => `${"  ".repeat(i)}- level${i}`).join("\n"));
+    expect(list.querySelectorAll("ul").length).toBe(10);
+    expect(list.textContent).toContain("level49");
+  });
+
+  it("stops at the node limit and says it was cut", async () => {
+    const parsed = await readMarkdown(sizes(150_000, "x *y*\n\n"));
+    expect(parsed.truncated).toBe(true);
+    expect(parsed.blocks.length).toBeLessThan(150_000);
+    expect((await readMarkdown("# small")).truncated).toBe(false);
+  });
+
+  it("draws a deeper tree than the reader makes without failing", () => {
+    // The reader stops at 32 nested inlines; this is the page's own margin.
+    let inline: Inline = { t: "text", s: "x" };
+    for (let i = 0; i < 200; i++) inline = { t: "em", c: [inline] };
+    const r = drawTree([{ t: "p", c: [inline] }]);
+    expect(r.textContent).toBe("x");
+    expectInert(r);
+  });
+});
diff --git a/crates/exav-viewer/ts/text/markdown.ts b/crates/exav-viewer/ts/text/markdown.ts
new file mode 100644
index 00000000..7253591b
--- /dev/null
+++ b/crates/exav-viewer/ts/text/markdown.ts
@@ -0,0 +1,69 @@
+/**
+ * What the Markdown reader (exav-render's `markdown`, in `exav_viewer_text.wasm`)
+ * gives back: a tree of data, never markup. Raw HTML in a document is text
+ * in it, an image is its alt text, and a link is kept by the reader only
+ * when its target is an absolute http, https or mailto address; `safeTarget`
+ * checks it again with the browser's own URL reader, which is the one that
+ * will follow it.
+ */
+
+export type Inline =
+  | { t: "text"; s: string }
+  | { t: "code"; s: string }
+  | { t: "br" }
+  | { t: "em" | "strong" | "del"; c: Inline[] }
+  | { t: "link"; url: string; c: Inline[] }
+  | { t: "image"; alt: string };
+
+export type Block =
+  | { t: "p"; c: Inline[] }
+  | { t: "h"; level: number; c: Inline[] }
+  | { t: "code"; s: string }
+  | { t: "hr" }
+  | { t: "quote"; c: Block[] }
+  | { t: "list"; ordered: boolean; start: number; tight: boolean; items: Block[][] }
+  | { t: "table"; align: ("left" | "center" | "right" | null)[]; head: Inline[][]; rows: Inline[][][] }
+  | { t: "raw"; s: string };
+
+export interface Parsed {
+  blocks: Block[];
+  /** The node limit was reached: the rest of the document is left out. */
+  truncated: boolean;
+}
+
+/** The text of inlines, without their marks. */
+export function plain(nodes: Inline[]): string {
+  let s = "";
+  for (const n of nodes) {
+    if (n.t === "text" || n.t === "code") s += n.s;
+    else if (n.t === "image") s += n.alt;
+    else if (n.t !== "br") s += plain(n.c);
+  }
+  return s;
+}
+
+/** White space, controls, line and paragraph separators and bidirectional controls: none may be in a target. */
+function unsafeChar(c: number): boolean {
+  return c <= 0x20 || (c >= 0x7f && c <= 0x9f) || c === 0x2028 || c === 0x2029 || (c >= 0x202a && c <= 0x202e) || (c >= 0x2066 && c <= 0x2069);
+}
+
+/**
+ * The normalised address when `dest` is an absolute http, https or mailto URL
+ * without credentials (`https://bank.example@evil.example` is refused), else
+ * `null`. Relative paths, `javascript:`, `data:`, `file:`, `vbscript:` and
+ * every other scheme give `null`.
+ */
+export function safeTarget(dest: string): string | null {
+  if (dest.length === 0 || dest.length > 2048) return null;
+  for (let i = 0; i < dest.length; i++) if (unsafeChar(dest.charCodeAt(i))) return null;
+  let url: URL;
+  try {
+    url = new URL(dest);
+  } catch {
+    return null;
+  }
+  if (url.username || url.password) return null;
+  if (url.protocol === "mailto:") return url.pathname ? url.href : null;
+  if (url.protocol !== "http:" && url.protocol !== "https:") return null;
+  return url.hostname ? url.href : null;
+}
diff --git a/crates/exav-viewer/ts/text/markdown.worker.ts b/crates/exav-viewer/ts/text/markdown.worker.ts
new file mode 100644
index 00000000..b8acbfa4
--- /dev/null
+++ b/crates/exav-viewer/ts/text/markdown.worker.ts
@@ -0,0 +1,13 @@
+// exav-render's Markdown reader (exav_viewer_text.wasm): the page gets back
+// the finished tree as JSON, never the parser's state.
+import init, { parseMarkdown } from "../../wasm/exav_viewer_text.js";
+
+import { serve } from "../core/worker-host.js";
+
+let ready: Promise<unknown> | null = null;
+
+serve<string, string>(async (source) => {
+  ready ??= init();
+  await ready;
+  return { value: parseMarkdown(source) };
+});
diff --git a/crates/exav-viewer/ts/text/renderer.test.ts b/crates/exav-viewer/ts/text/renderer.test.ts
new file mode 100644
index 00000000..7477c65c
--- /dev/null
+++ b/crates/exav-viewer/ts/text/renderer.test.ts
@@ -0,0 +1,332 @@
+import { describe, expect, it, vi } from "vitest";
+
+import type { RenderContext, RendererHandle, Status } from "../core/types.js";
+import "../test/blob.js";
+import { MAX_BYTES, MAX_LINE, MAX_LINES } from "./decode.js";
+import { kindOf, renderer } from "./renderer.js";
+
+// The page reads Markdown in a worker, which jsdom has not: the same module, in this process.
+const engine = vi.hoisted(() => ({ fail: false }));
+vi.mock("./markdown-engine.js", async () => {
+  const real = (await import("../test/markdown.js")).readMarkdown;
+  return {
+    readMarkdown: async (source: string) => {
+      if (engine.fail) throw new Error("the engine stopped");
+      return real(source);
+    },
+  };
+});
+
+const ch = (code: number) => String.fromCharCode(code);
+const enc = (s: string) => new TextEncoder().encode(s);
+
+interface Opened {
+  host: HTMLElement;
+  statuses: Status[];
+  handle: RendererHandle;
+  warnings: { key: string; count: number }[];
+}
+
+/** Mounts the renderer on a file as the viewer would. */
+async function open(name: string, bytes: Uint8Array, type = ""): Promise<Opened> {
+  const host = document.createElement("div");
+  document.body.append(host);
+  const statuses: Status[] = [];
+  const blob = new Blob([bytes as BlobPart]);
+  const ctx = {
+    file: { id: "1", name, type, source: null },
+    options: {},
+    source: { blob: async () => blob, bytes: async () => bytes, url: async () => "", progress: { get: () => null, subscribe: () => () => {} } },
+    signal: new AbortController().signal,
+    assetBase: "",
+    status: (s: Status) => statuses.push(s),
+    controllers() {},
+  } as unknown as RenderContext<Record<string, never>>;
+  const handle = await renderer.mount(host, ctx);
+  const warnings = handle.controllers.warnings?.get() ?? [];
+  return { host, statuses, handle, warnings: [...warnings] };
+}
+
+/** Lets the chunks drawn after the first paint be drawn. */
+async function settle(): Promise<void> {
+  let seen = -1;
+  for (let i = 0; i < 100; i++) {
+    await new Promise((r) => setTimeout(r, 30));
+    const now = document.querySelectorAll(".exav-viewer-text-chunk").length;
+    if (now === seen) return;
+    seen = now;
+  }
+}
+
+/** The text on screen: each block is a line break apart, as a selection copied across them has it. */
+function shownText(host: HTMLElement): string {
+  const chunks = [...host.querySelectorAll(".exav-viewer-text-chunk")];
+  return chunks.length ? chunks.map((c) => c.textContent).join("\n") : (host.querySelector(".exav-viewer-text")?.textContent ?? "");
+}
+
+describe("kindOf", () => {
+  it("reads the name first, then the type, and shows anything else as plain text", () => {
+    expect(kindOf("a/README.MD")).toBe("markdown");
+    expect(kindOf("x.json")).toBe("json");
+    expect(kindOf("x.kml")).toBe("xml");
+    expect(kindOf("page.HTML")).toBe("html");
+    expect(kindOf("fix.patch")).toBe("diff");
+    expect(kindOf("main.rs")).toBe("plain");
+    expect(kindOf("notes", "application/json; charset=utf-8")).toBe("json");
+    expect(kindOf("notes", "text/markdown")).toBe("markdown");
+    expect(kindOf("notes.txt", "application/json")).toBe("plain");
+    expect(kindOf("notes")).toBe("plain");
+  });
+});
+
+describe("the text renderer", () => {
+  it("shows a text file exactly, tabs and blank lines included", async () => {
+    const o = await open("notes.txt", enc("line one\nline two\n\n\tindented <b>tag</b> & &amp;\n"));
+    expect(shownText(o.host)).toBe("line one\nline two\n\n\tindented <b>tag</b> & &amp;");
+    expect(o.host.querySelector("b")).toBeNull();
+    expect(o.statuses.at(-1)).toEqual({ phase: "ready" });
+    expect(o.warnings).toEqual([]);
+  });
+
+  it("reads UTF-16 and windows-1252 files as the text they hold", async () => {
+    const s = "Zażółć gęślą jaźń\nline 2 ✓";
+    const le = [0xff, 0xfe, ...[...s].flatMap((c) => [c.charCodeAt(0) & 0xff, c.charCodeAt(0) >> 8])];
+    expect(shownText((await open("u16.txt", Uint8Array.from(le))).host)).toBe(s);
+    const latin = Uint8Array.from([...enc("caf"), 0xe9, 0x20, 0x80]);
+    expect(shownText((await open("old.log", latin)).host)).toBe("café €");
+  });
+
+  it("makes bidirectional overrides and controls visible instead of obeying them", async () => {
+    const spoof = `access = "user${ch(0x202e)} ${ch(0x2066)}// admin${ch(0x2069)}${ch(0x202c)}";\u0007\u001b[31m`;
+    const o = await open("check.js", enc(spoof));
+    const shown = shownText(o.host);
+    for (const c of [0x202e, 0x2066, 0x2069, 0x202c]) expect(shown.includes(ch(c))).toBe(false);
+    expect(shown).toContain("<U+202E>");
+    expect(shown).toContain("<U+2066>");
+    expect(shown).toContain(ch(0x2407));
+    expect(shown).toContain(ch(0x241b));
+  });
+
+  it("refuses a file that is not text, and draws nothing", async () => {
+    const png = Uint8Array.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0, 0, 0, 13, 0x49, 0x48, 0x44, 0x52]);
+    for (const name of ["a.txt", "a.json", "a.md", "a.log"]) {
+      const o = await open(name, png);
+      expect(o.statuses.at(-1), name).toEqual({ phase: "error", error: { code: "text_binary" } });
+      expect(o.host.querySelector(".exav-viewer-text"), name).toBeNull();
+    }
+    // A text with a few NULs in it is not one either.
+    expect((await open("a.txt", enc("hello\0world"))).statuses.at(-1)).toMatchObject({ phase: "error" });
+  });
+
+  it("cuts a file past the byte limit, says so, and draws no more than the limit holds", async () => {
+    // 100-byte lines: 3 MiB of them is 31,000 lines, under the line limit.
+    const row = `${"x".repeat(98)}\n`;
+    const big = enc(row.repeat(Math.ceil((MAX_BYTES * 1.5) / 99)));
+    expect(big.length).toBeGreaterThan(MAX_BYTES);
+    const o = await open("big.log", big);
+    await settle();
+    expect(o.warnings.map((w) => w.key)).toEqual(["text_truncated"]);
+    const text = shownText(o.host);
+    expect(text.length).toBeLessThanOrEqual(MAX_BYTES);
+    expect(text.length).toBeGreaterThan(MAX_BYTES - 200);
+    expect(text.split("\n").length).toBeLessThan(MAX_LINES);
+    expect(text.startsWith(`${"x".repeat(98)}\n${"x".repeat(98)}`)).toBe(true);
+  });
+
+  it("cuts a file that is too long in lines though small in bytes", async () => {
+    const o = await open("lines.txt", enc("x\n".repeat(MAX_LINES + 500)));
+    await settle();
+    expect(o.warnings.map((w) => w.key)).toEqual(["text_truncated"]);
+    expect(shownText(o.host).split("\n").length).toBe(MAX_LINES);
+  });
+
+  it("draws a large file in blocks, the first at once and the others after", async () => {
+    const o = await open("many.txt", enc("row\n".repeat(5000)));
+    const blocks = () => o.host.querySelectorAll(".exav-viewer-text-chunk").length;
+    expect(blocks()).toBeLessThan(25);
+    expect(blocks()).toBeGreaterThan(0);
+    await settle();
+    expect(blocks()).toBe(25);
+    expect(shownText(o.host).split("\n").length).toBe(5000);
+  });
+
+  it("stops drawing when the file is closed", async () => {
+    const o = await open("many.txt", enc("row\n".repeat(20000)));
+    const root = o.host.querySelector(".exav-viewer-text")!;
+    const before = root.children.length;
+    expect(before).toBeLessThan(100);
+    o.handle.destroy();
+    await settle();
+    expect(o.host.querySelector(".exav-viewer-text")).toBeNull();
+    expect(root.children.length).toBe(before);
+  });
+
+  it("cuts a very long line and counts it", async () => {
+    const o = await open("one.txt", enc(`${"x".repeat(MAX_LINE * 5)}\nshort`));
+    expect(o.warnings).toContainEqual({ key: "text_long_lines", count: 1 });
+    const lines = shownText(o.host).split("\n");
+    expect(lines[0]!.length).toBe(MAX_LINE + 1);
+    expect(lines[0]!.endsWith("…")).toBe(true);
+    expect(lines[1]).toBe("short");
+  });
+
+  it("draws a single huge line without a hang", async () => {
+    const t = performance.now();
+    const o = await open("min.json", enc(`[${'"abc",'.repeat(MAX_BYTES / 3)}1]`));
+    await settle();
+    expect(performance.now() - t).toBeLessThan(5000);
+    expect(o.warnings.map((w) => w.key)).toContain("text_truncated");
+  });
+});
+
+describe("JSON", () => {
+  it("pretty prints, keeping each number as written", async () => {
+    const o = await open("data.json", enc('{"big":12345678901234567890123,"price":1.10,"list":[1,2],"empty":{}}'));
+    expect(shownText(o.host)).toBe(['{', '  "big": 12345678901234567890123,', '  "price": 1.10,', '  "list": [', '    1,', '    2', '  ],', '  "empty": {}', '}'].join("\n"));
+    expect(o.warnings).toEqual([]);
+    expect(o.host.querySelectorAll(".exav-viewer-text-key").length).toBe(4);
+  });
+
+  it("shows invalid JSON as it is, with a note", async () => {
+    const src = '{"a": 1,}\n// comment';
+    const o = await open("bad.json", enc(src));
+    expect(shownText(o.host)).toBe(src);
+    expect(o.warnings).toEqual([{ key: "text_not_json", count: 1 }]);
+  });
+
+  it("opens by type when the name says nothing", async () => {
+    const o = await open("download", enc('{"a":1}'), "application/json");
+    expect(shownText(o.host)).toBe('{\n  "a": 1\n}');
+  });
+});
+
+describe("XML", () => {
+  it("pretty prints, as text, with no element from the file", async () => {
+    const o = await open("feed.xml", enc('<?xml version="1.0"?><feed><script>alert(1)</script><entry id="1"><title>Hi &amp; bye</title></entry></feed>'));
+    expect(shownText(o.host)).toBe(
+      ['<?xml version="1.0"?>', "<feed>", "  <script>alert(1)</script>", '  <entry id="1">', "    <title>Hi &amp; bye</title>", "  </entry>", "</feed>"].join("\n"),
+    );
+    expect(o.host.querySelector("script,feed,entry,title")).toBeNull();
+    expect(o.warnings).toEqual([]);
+  });
+
+  it("notes markup that is not well formed", async () => {
+    const o = await open("bad.xml", enc("<a><b></a>"));
+    expect(o.warnings).toEqual([{ key: "text_not_xml", count: 1 }]);
+    const plain = await open("no.xml", enc("just words"));
+    expect(shownText(plain.host)).toBe("just words");
+    expect(plain.warnings).toEqual([{ key: "text_not_xml", count: 1 }]);
+  });
+
+  it("does not show a SVG that way unless it is named as XML, and never draws it", async () => {
+    const svg = '<svg xmlns="http://www.w3.org/2000/svg" onload="alert(1)"><script>alert(2)</script></svg>';
+    const o = await open("x.xml", enc(svg));
+    expect(o.host.querySelector("svg,script")).toBeNull();
+  });
+});
+
+describe("HTML", () => {
+  it("is source text, with a note, and nothing in it is live", async () => {
+    const html = '<!doctype html><html><body onload="alert(1)"><script src="https://evil.example/x.js"></script><img src="https://evil.example/p.png"><a href="javascript:alert(1)">x</a></body></html>';
+    for (const name of ["page.html", "page.htm", "page.xhtml"]) {
+      const o = await open(name, enc(html));
+      expect(shownText(o.host), name).toBe(html);
+      expect(o.warnings, name).toEqual([{ key: "text_html_source", count: 1 }]);
+      expect(o.host.querySelector("script,img,a,html,body,iframe,link,style"), name).toBeNull();
+    }
+  });
+});
+
+describe("Markdown", () => {
+  it("draws the document", async () => {
+    const o = await open("README.md", enc("# Title\n\nSome *text* with [a link](https://example.com).\n\n- one\n- two\n"));
+    expect(o.host.querySelector("h1")!.textContent).toBe("Title");
+    expect(o.host.querySelector("em")!.textContent).toBe("text");
+    expect(o.host.querySelector(".exav-viewer-text-link")!.textContent).toBe("a link");
+    expect(o.host.querySelectorAll("li").length).toBe(2);
+  });
+
+  it("follows an http or https link on a click or Enter, as a PDF's links are, and no other", async () => {
+    const opened: unknown[][] = [];
+    const real = window.open;
+    window.open = ((...args: unknown[]) => {
+      opened.push(args);
+      return null;
+    }) as typeof window.open;
+    try {
+      const o = await open("links.md", enc("[a](https://example.com/a) [b](http://example.com/b) <https://example.com/c> [m](mailto:me@example.com) [x](javascript:alert(1))\n"));
+      const links = [...o.host.querySelectorAll<HTMLElement>(".exav-viewer-text-link")];
+      expect(links.map((l) => l.textContent)).toEqual(["a", "b", "https://example.com/c", "m"]);
+      expect(links.map((l) => l.getAttribute("role"))).toEqual(["link", "link", "link", null]);
+      expect(o.host.querySelector("a")).toBeNull();
+      links[0]!.click();
+      links[1]!.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
+      links[1]!.dispatchEvent(new KeyboardEvent("keydown", { key: " ", bubbles: true }));
+      links[2]!.click();
+      // The mail address is only text, and nothing else is a link.
+      links[3]!.click();
+      expect(opened).toEqual([
+        ["https://example.com/a", "_blank", "noopener,noreferrer"],
+        ["http://example.com/b", "_blank", "noopener,noreferrer"],
+        ["https://example.com/c", "_blank", "noopener,noreferrer"],
+      ]);
+    } finally {
+      window.open = real;
+    }
+  });
+
+  it("makes nothing live of a hostile document", async () => {
+    const md = [
+      "# <img src=x onerror=alert(1)>",
+      "<script>alert(1)</script>",
+      "[x](javascript:alert(1)) [y](data:text/html,x) [z](/relative) [w](https://a.example@b.example/)",
+      "![tracker](https://evil.example/pixel.png) ![d](data:image/svg+xml;base64,PHN2Zz4=)",
+      "<iframe src=https://evil.example></iframe>",
+    ].join("\n\n");
+    const o = await open("evil.md", enc(md));
+    expect(o.host.querySelector("a,img,script,iframe,svg,object,embed,link,style,form")).toBeNull();
+    expect(o.host.querySelector(".exav-viewer-text-link")).toBeNull();
+    for (const e of o.host.querySelectorAll("*")) for (const a of e.getAttributeNames()) expect(["class", "tabindex", "role"], a).toContain(a);
+    expect(shownText(o.host)).toContain("<script>alert(1)</script>");
+    expect(shownText(o.host)).toContain("[tracker]");
+  });
+
+  it("shows the text as it is, and says so, when the reader fails", async () => {
+    engine.fail = true;
+    try {
+      const o = await open("broken.md", enc("# Title\n\n*text*\n"));
+      expect(o.warnings).toEqual([{ key: "text_markdown_failed", count: 1 }]);
+      expect(o.host.querySelector("h1,em")).toBeNull();
+      expect(shownText(o.host)).toBe("# Title\n\n*text*");
+      expect(o.statuses.at(-1)).toEqual({ phase: "ready" });
+    } finally {
+      engine.fail = false;
+    }
+  });
+
+  it("cuts a long line and says so", async () => {
+    const o = await open("long.md", enc(`${"word ".repeat(MAX_LINE)}\n\nend`));
+    expect(o.warnings).toContainEqual({ key: "text_long_lines", count: 1 });
+    expect(o.host.querySelector("p:last-child")!.textContent).toBe("end");
+  });
+});
+
+describe("diffs and subtitles", () => {
+  it("colours added, removed and hunk lines by class and leaves the text as it is", async () => {
+    const diff = ["diff --git a/f b/f", "index 1..2 100644", "--- a/f", "+++ b/f", "@@ -1,2 +1,2 @@", " same", "-old", "+new"].join("\n");
+    const o = await open("fix.patch", enc(diff));
+    expect(shownText(o.host)).toBe(diff);
+    const cls = (c: string) => [...o.host.querySelectorAll(`.${c}`)].map((e) => e.textContent);
+    expect(cls("exav-viewer-text-add")).toEqual(["+new"]);
+    expect(cls("exav-viewer-text-del")).toEqual(["-old"]);
+    expect(cls("exav-viewer-text-hunk")).toEqual(["@@ -1,2 +1,2 @@"]);
+    expect(cls("exav-viewer-text-meta")).toEqual(["diff --git a/f b/f", "index 1..2 100644", "--- a/f", "+++ b/f"]);
+  });
+
+  it("shows subtitles, YAML and source code as plain text", async () => {
+    const srt = "1\n00:00:01,000 --> 00:00:02,500\nHello <i>there</i>\n";
+    const o = await open("film.srt", enc(srt));
+    expect(shownText(o.host)).toBe(srt.trimEnd());
+    expect(o.host.querySelector("i")).toBeNull();
+  });
+});
diff --git a/crates/exav-viewer/ts/text/renderer.ts b/crates/exav-viewer/ts/text/renderer.ts
new file mode 100644
index 00000000..55df10fa
--- /dev/null
+++ b/crates/exav-viewer/ts/text/renderer.ts
@@ -0,0 +1,204 @@
+import { TEXT_KINDS } from "../core/formats.js";
+import { writable } from "../core/store.js";
+import type { Renderer } from "../core/types.js";
+import { clip, decodeText, MAX_BYTES, MAX_LINE, MAX_LINES, sanitize, splitLines } from "./decode.js";
+import { formatJson } from "./json.js";
+import { lineLength, type Line } from "./lines.js";
+import type { Parsed } from "./markdown.js";
+import { readMarkdown } from "./markdown-engine.js";
+import { drawBlocks } from "./markdown-view.js";
+import { formatXml } from "./xml.js";
+
+export type TextKind = keyof typeof TEXT_KINDS;
+
+/** How `path` (or, failing that, `type`) says the text is to be shown. */
+export function kindOf(path: string, type = ""): TextKind {
+  const p = path.toLowerCase();
+  const t = type.toLowerCase().split(";")[0]!.trim();
+  const kinds = Object.entries(TEXT_KINDS) as [TextKind, (typeof TEXT_KINDS)[TextKind]][];
+  return (
+    kinds.find(([, m]) => m.extensions.some((e) => p.endsWith(e)))?.[0] ?? kinds.find(([, m]) => m.types.includes(t))?.[0] ?? "plain"
+  );
+}
+
+/** Lines drawn together, in one element that the browser may skip while it is off screen. */
+const CHUNK = 200;
+/** Chunks drawn before the first paint; the others follow without blocking. */
+const FIRST_CHUNKS = 5;
+/** Time the following chunks may take before the page gets a turn. */
+const SLICE_MS = 12;
+
+/** A diff line's class: what it adds, removes or introduces. */
+function diffClass(line: string): string | undefined {
+  if (line.startsWith("+++") || line.startsWith("---") || line.startsWith("diff ") || line.startsWith("index ")) return "exav-viewer-text-meta";
+  if (line.startsWith("@@")) return "exav-viewer-text-hunk";
+  if (line[0] === "+") return "exav-viewer-text-add";
+  if (line[0] === "-") return "exav-viewer-text-del";
+  return undefined;
+}
+
+/** Draws `lines[from, to)` as one block of text. */
+function chunk(lines: Line[], from: number, to: number): HTMLElement {
+  const pre = document.createElement("pre");
+  pre.className = "exav-viewer-text-chunk";
+  let buffer = "";
+  const flush = () => {
+    if (buffer) pre.appendChild(document.createTextNode(buffer));
+    buffer = "";
+  };
+  for (let i = from; i < to; i++) {
+    if (i > from) buffer += "\n";
+    const line = lines[i]!;
+    if (typeof line === "string") {
+      buffer += line;
+      continue;
+    }
+    for (const [text, cls] of line) {
+      if (!cls) buffer += text;
+      else {
+        flush();
+        const span = document.createElement("span");
+        span.className = cls;
+        span.textContent = text;
+        pre.appendChild(span);
+      }
+    }
+  }
+  flush();
+  return pre;
+}
+
+/** `line` cut to `MAX_LINE` characters; null when it already fits. */
+function clipped(line: Line): Line | null {
+  if (lineLength(line) <= MAX_LINE) return null;
+  if (typeof line === "string") return clip(line);
+  const out: [string, string?][] = [];
+  let room = MAX_LINE;
+  for (const [text, cls] of line) {
+    if (room <= 0) break;
+    out.push([clip(text, room), cls]);
+    room -= text.length;
+  }
+  return out;
+}
+
+export const renderer: Renderer<Record<string, never>> = {
+  async mount(host, ctx) {
+    ctx.status({ phase: "loading" });
+    const blob = await ctx.source.blob();
+    const partial = blob.size > MAX_BYTES;
+    const bytes = new Uint8Array(await blob.slice(0, MAX_BYTES).arrayBuffer());
+    if (ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+    const decoded = decodeText(bytes, partial);
+    if (!decoded) {
+      ctx.status({ phase: "error", error: { code: "text_binary" } });
+      return { controllers: {}, destroy() {} };
+    }
+
+    const kind = kindOf(ctx.file.path ?? ctx.file.name, ctx.file.type);
+    const text = sanitize(decoded.text);
+    const warnings: { key: string; count: number }[] = [];
+    let truncated = partial;
+    let lines: Line[];
+    let markdown: Parsed | null = null;
+
+    const plain = () => {
+      const split = splitLines(text);
+      truncated ||= split.more;
+      return split.lines;
+    };
+    if (kind === "markdown") {
+      const split = splitLines(text);
+      truncated ||= split.more;
+      lines = split.lines.map((l) => clip(l));
+      try {
+        markdown = await readMarkdown((lines as string[]).join("\n"), ctx.signal);
+        truncated ||= markdown.truncated;
+      } catch {
+        if (ctx.signal.aborted) throw new DOMException("aborted", "AbortError");
+        // The reader failed (its worker was stopped, or the module did not load): the text is shown as it is.
+        warnings.push({ key: "text_markdown_failed", count: 1 });
+      }
+    } else if (kind === "json") {
+      // A cut file is not valid JSON: it is not judged.
+      const r = partial ? null : formatJson(text);
+      if (r) {
+        lines = r.lines;
+        truncated ||= r.more;
+      } else {
+        lines = plain();
+        if (!partial) warnings.push({ key: "text_not_json", count: 1 });
+      }
+    } else if (kind === "xml") {
+      const r = formatXml(text);
+      if (r) {
+        lines = r.lines;
+        truncated ||= r.more;
+        if (!r.wellFormed && !partial) warnings.push({ key: "text_not_xml", count: 1 });
+      } else {
+        lines = plain();
+        warnings.push({ key: "text_not_xml", count: 1 });
+      }
+    } else if (kind === "diff") {
+      lines = plain().map((l): Line => {
+        const cls = diffClass(l);
+        return cls ? [[l, cls]] : l;
+      });
+    } else {
+      lines = plain();
+      if (kind === "html") warnings.push({ key: "text_html_source", count: 1 });
+    }
+    // The newline that ends the file is not a line.
+    if (lines.length > 1 && lineLength(lines[lines.length - 1]!) === 0) lines.pop();
+
+    let cut = 0;
+    if (!markdown) {
+      lines = lines.map((l) => {
+        const c = clipped(l);
+        if (c) cut++;
+        return c ?? l;
+      });
+    } else cut = (lines as string[]).filter((l) => l.length > MAX_LINE).length;
+    if (truncated) warnings.push({ key: "text_truncated", count: Math.min(lines.length, MAX_LINES) });
+    if (cut) warnings.push({ key: "text_long_lines", count: cut });
+
+    const root = document.createElement("div");
+    root.className = `exav-viewer-text exav-viewer-text-${kind}`;
+    root.tabIndex = 0;
+    host.append(root);
+    let destroyed = false;
+    let timer: ReturnType<typeof setTimeout> | undefined;
+
+    if (markdown) drawBlocks(root, markdown.blocks);
+    else {
+      let at = 0;
+      const next = (count: number) => {
+        for (let k = 0; k < count && at < lines.length; k++) {
+          root.appendChild(chunk(lines, at, Math.min(at + CHUNK, lines.length)));
+          at += CHUNK;
+        }
+      };
+      next(FIRST_CHUNKS);
+      const more = () => {
+        timer = undefined;
+        if (destroyed || at >= lines.length) return;
+        // As many blocks as fit in a slice of time, so that the page stays responsive.
+        const start = performance.now();
+        do next(1);
+        while (at < lines.length && performance.now() - start < SLICE_MS);
+        timer = setTimeout(more, 0);
+      };
+      if (at < lines.length) timer = setTimeout(more, 0);
+    }
+
+    ctx.status({ phase: "ready" });
+    return {
+      controllers: { warnings: writable(warnings) },
+      destroy() {
+        destroyed = true;
+        if (timer !== undefined) clearTimeout(timer);
+        root.remove();
+      },
+    };
+  },
+};
diff --git a/crates/exav-viewer/ts/text/xml.test.ts b/crates/exav-viewer/ts/text/xml.test.ts
new file mode 100644
index 00000000..7c0fb48e
--- /dev/null
+++ b/crates/exav-viewer/ts/text/xml.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, it } from "vitest";
+
+import { lineText } from "./lines.js";
+import { formatXml } from "./xml.js";
+
+const show = (text: string, max?: number) => {
+  const r = formatXml(text, max);
+  return r && r.lines.map(lineText).join("\n");
+};
+
+describe("formatXml", () => {
+  it("indents elements and keeps text on its element's line", () => {
+    const out = show('<?xml version="1.0"?><feed><entry id="1" lang=\'fr\'><title>Hello</title><empty/><e></e></entry><!-- note --></feed>');
+    expect(out).toBe(
+      ['<?xml version="1.0"?>', "<feed>", '  <entry id="1" lang=\'fr\'>', "    <title>Hello</title>", "    <empty/>", "    <e></e>", "  </entry>", "  <!-- note -->", "</feed>"].join("\n"),
+    );
+  });
+
+  it("puts long or multi-line text on lines of its own", () => {
+    expect(show("<a>one\n   two</a>")).toBe(["<a>", "  one", "  two", "</a>"].join("\n"));
+    const long = "x".repeat(300);
+    expect(show(`<a>${long}</a>`)).toBe(["<a>", `  ${long}`, "</a>"].join("\n"));
+  });
+
+  it("shows CDATA, comments, processing instructions and a DOCTYPE as written", () => {
+    const out = show('<!DOCTYPE note [<!ENTITY a "x>y">]><note><![CDATA[<b>&a;</b>]]><?pi do it?></note>')!;
+    expect(out).toBe(['<!DOCTYPE note [<!ENTITY a "x>y">]>', "<note>", "  <![CDATA[<b>&a;</b>]]>", "  <?pi do it?>", "</note>"].join("\n"));
+  });
+
+  it("never expands an entity or follows an external one", () => {
+    const xxe = '<!DOCTYPE r [<!ENTITY xxe SYSTEM "file:///etc/passwd"><!ENTITY lol "lol"><!ENTITY lol2 "&lol;&lol;&lol;">]><r>&xxe; &lol2; &#60;script&#62;</r>';
+    const out = show(xxe)!;
+    expect(out).toContain('<!ENTITY xxe SYSTEM "file:///etc/passwd">');
+    expect(out).toContain("&xxe; &lol2; &#60;script&#62;");
+    expect(out).not.toContain("<script>");
+    expect(out).not.toContain("lollol");
+  });
+
+  it("keeps attribute values with a '>' in them inside their tag", () => {
+    expect(show('<a href="x>y" b=\'1>2\'>t</a>')).toBe('<a href="x>y" b=\'1>2\'>t</a>');
+  });
+
+  it("is not XML when it does not start with markup", () => {
+    expect(formatXml("hello <b>world</b>")).toBeNull();
+    expect(formatXml("")).toBeNull();
+    expect(formatXml("   \n")).toBeNull();
+    expect(formatXml("{}")).toBeNull();
+  });
+
+  it("says when the markup is not well formed, and still shows it all", () => {
+    const cases: [string, boolean][] = [
+      ["<a><b></b></a>", true],
+      ["<a><b></a></b>", false],
+      ["<a><b>", false],
+      ["<a></a></a>", false],
+      ["<a><!-- never closed", false],
+      ["<a x='1", false],
+      ["<a>1 < 2</a>", true],
+    ];
+    for (const [src, ok] of cases) {
+      const r = formatXml(src)!;
+      expect(r.wellFormed, src).toBe(ok);
+      // Everything typed is somewhere in the output, in order.
+      const flat = r.lines.map(lineText).join("").replace(/\s+/g, "");
+      expect(flat, src).toBe(src.replace(/\s+/g, ""));
+    }
+  });
+
+  it("marks tags, attributes and values for colour", () => {
+    const r = formatXml('<a k="v">t</a>')!;
+    const segs = r.lines.flatMap((l) => (typeof l === "string" ? [] : l));
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-tag").map((s) => s[0])).toEqual(["a", "a"]);
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-attr").map((s) => s[0])).toEqual(["k"]);
+    expect(segs.filter((s) => s[1] === "exav-viewer-text-str").map((s) => s[0])).toEqual(['"v"']);
+  });
+
+  it("stops at the line cap", () => {
+    const text = `<r>${"<i>1</i>".repeat(1000)}</r>`;
+    const r = formatXml(text, 10)!;
+    expect(r.lines).toHaveLength(10);
+    expect(r.more).toBe(true);
+  });
+
+  it("limits indentation however deep the document nests", () => {
+    const out = show("<a>".repeat(5000) + "x" + "</a>".repeat(5000), 6000)!;
+    const widest = Math.max(...out.split("\n").map((l) => l.length - l.trimStart().length));
+    expect(widest).toBeLessThanOrEqual(200);
+  });
+
+  it("is quick on hostile input", () => {
+    const t = performance.now();
+    for (const s of [
+      "<".repeat(1_000_000),
+      "<a ".repeat(500_000),
+      "<a>".repeat(600_000),
+      "<!--".repeat(500_000),
+      "<![CDATA[".repeat(200_000),
+      '<a b="'.repeat(300_000),
+      "<?".repeat(1_000_000),
+      "<!DOCTYPE [".repeat(200_000),
+      "<a>x</b>".repeat(250_000),
+      "<a></a>".repeat(250_000),
+      "<</>".repeat(500_000),
+    ]) {
+      formatXml(s, 50_000);
+    }
+    expect(performance.now() - t).toBeLessThan(6000);
+  });
+});
diff --git a/crates/exav-viewer/ts/text/xml.ts b/crates/exav-viewer/ts/text/xml.ts
new file mode 100644
index 00000000..ef55ebd7
--- /dev/null
+++ b/crates/exav-viewer/ts/text/xml.ts
@@ -0,0 +1,225 @@
+/**
+ * An XML pretty printer that only reads tokens: no DOM, no entity is
+ * expanded (a document's `&xxe;` or nested entities are shown as written), no
+ * DTD or stylesheet is fetched or even followed. Used for display, so
+ * markup is re-indented where that adds no text, and text is trimmed.
+ */
+import { MAX_LINES, splitLines } from "./decode.js";
+import { LineBuilder, type Line } from "./lines.js";
+
+type Kind = "text" | "comment" | "cdata" | "pi" | "decl" | "open" | "empty" | "close" | "bad";
+
+interface Token {
+  kind: Kind;
+  end: number;
+}
+
+/** A text longer than this is not put on its element's line. */
+const INLINE_TEXT = 200;
+/** Indentation stops growing here. */
+const MAX_INDENT = 100;
+
+const isSpace = (c: number) => c === 32 || c === 9 || c === 10 || c === 13;
+const isNameStart = (c: string | undefined) => c !== undefined && (/[A-Za-z_:]/.test(c) || c.charCodeAt(0) >= 0xc0);
+
+/**
+ * The token at `at`. A construct with no end becomes a `bad` token that takes
+ * the rest of the text, so that no construct is searched for twice.
+ */
+function token(s: string, at: number): Token {
+  const n = s.length;
+  if (s[at] !== "<") {
+    const next = s.indexOf("<", at);
+    return { kind: "text", end: next < 0 ? n : next };
+  }
+  const until = (kind: Kind, mark: string, from: number): Token => {
+    const e = s.indexOf(mark, from);
+    return e < 0 ? { kind: "bad", end: n } : { kind, end: e + mark.length };
+  };
+  if (s.startsWith("<!--", at)) return until("comment", "-->", at + 4);
+  if (s.startsWith("<![CDATA[", at)) return until("cdata", "]]>", at + 9);
+  if (s[at + 1] === "?") return until("pi", "?>", at + 2);
+  if (s[at + 1] === "!") {
+    // A declaration; its internal subset sits in brackets and may hold `>`.
+    let quote = "";
+    let brackets = 0;
+    for (let j = at + 2; j < n; j++) {
+      const ch = s[j]!;
+      if (quote) {
+        if (ch === quote) quote = "";
+      } else if (ch === '"' || ch === "'") quote = ch;
+      else if (ch === "[") brackets++;
+      else if (ch === "]") brackets = Math.max(0, brackets - 1);
+      else if (ch === ">" && brackets === 0) return { kind: "decl", end: j + 1 };
+    }
+    return { kind: "bad", end: n };
+  }
+  const closing = s[at + 1] === "/";
+  if (!isNameStart(s[at + (closing ? 2 : 1)])) return { kind: "text", end: at + 1 };
+  let quote = "";
+  for (let j = at + 2; j < n; j++) {
+    const ch = s[j]!;
+    if (quote) {
+      if (ch === quote) quote = "";
+    } else if (ch === '"' || ch === "'") quote = ch;
+    else if (ch === ">") return { kind: closing ? "close" : s[j - 1] === "/" ? "empty" : "open", end: j + 1 };
+  }
+  return { kind: "bad", end: n };
+}
+
+function nameOf(s: string, at: number): string {
+  let j = at + (s[at + 1] === "/" ? 2 : 1);
+  const start = j;
+  while (j < s.length && !isSpace(s.charCodeAt(j)) && s[j] !== "/" && s[j] !== ">") j++;
+  return s.slice(start, j);
+}
+
+/** Writes the tag in `s[at..end)` with its parts coloured. */
+function writeTag(out: LineBuilder, s: string, at: number, end: number): void {
+  const closing = s[at + 1] === "/";
+  const name = nameOf(s, at);
+  out.add(closing ? "</" : "<");
+  out.add(name, "exav-viewer-text-tag");
+  let j = at + (closing ? 2 : 1) + name.length;
+  const stop = end - 1;
+  while (j < stop) {
+    const c = s.charCodeAt(j);
+    if (isSpace(c)) {
+      j++;
+      continue;
+    }
+    if (s[j] === "/") break;
+    let k = j;
+    while (k < stop && !isSpace(s.charCodeAt(k)) && s[k] !== "=" && s[k] !== "/") k++;
+    if (k === j) k = j + 1;
+    out.add(" ");
+    out.add(s.slice(j, k), "exav-viewer-text-attr");
+    j = k;
+    while (j < stop && isSpace(s.charCodeAt(j))) j++;
+    if (s[j] !== "=") continue;
+    out.add("=");
+    j++;
+    while (j < stop && isSpace(s.charCodeAt(j))) j++;
+    const q = s[j];
+    let v = j;
+    if (q === '"' || q === "'") {
+      v = s.indexOf(q, j + 1);
+      v = v < 0 || v > stop ? stop : v + 1;
+    } else while (v < stop && !isSpace(s.charCodeAt(v))) v++;
+    out.add(s.slice(j, v), "exav-viewer-text-str");
+    j = Math.max(v, j + 1);
+  }
+  out.add(s[end - 2] === "/" && !closing ? "/>" : ">");
+}
+
+export interface Formatted {
+  lines: Line[];
+  more: boolean;
+  /** Every construct ended and every tag was closed by its own. */
+  wellFormed: boolean;
+}
+
+/** The lines of `text` indented, or `null` when it does not start with markup. */
+export function formatXml(text: string, maxLines = MAX_LINES): Formatted | null {
+  const n = text.length;
+  let pos = 0;
+  while (pos < n && isSpace(text.charCodeAt(pos))) pos++;
+  if (text[pos] !== "<") return null;
+
+  const out = new LineBuilder(maxLines);
+  const open: string[] = [];
+  let wellFormed = true;
+  let depth = 0;
+  const indent = () => out.add("  ".repeat(Math.min(depth, MAX_INDENT)));
+
+  /** Raw text that may span lines, the first at the indent. */
+  const raw = (s: string, cls: string) => {
+    const { lines } = splitLines(s, maxLines);
+    lines.forEach((l, k) => {
+      if (k === 0) indent();
+      out.add(l, cls);
+      out.end();
+    });
+  };
+
+  while (pos < n && !out.full) {
+    const t = token(text, pos);
+    const src = text.slice(pos, t.end);
+    switch (t.kind) {
+      case "text": {
+        const body = src.trim();
+        if (body) {
+          for (const l of splitLines(body, maxLines).lines) {
+            const line = l.trim();
+            if (!line) continue;
+            indent();
+            out.add(line);
+            out.end();
+          }
+        }
+        break;
+      }
+      case "comment":
+        raw(src, "exav-viewer-text-comment");
+        break;
+      case "cdata":
+        raw(src, "exav-viewer-text-str");
+        break;
+      case "pi":
+      case "decl":
+        raw(src, "exav-viewer-text-meta");
+        break;
+      case "bad":
+        wellFormed = false;
+        raw(src, "");
+        break;
+      case "empty":
+        indent();
+        writeTag(out, text, pos, t.end);
+        out.end();
+        break;
+      case "close": {
+        const name = nameOf(text, pos);
+        if (open.pop() !== name) wellFormed = false;
+        depth = Math.max(0, depth - 1);
+        indent();
+        writeTag(out, text, pos, t.end);
+        out.end();
+        break;
+      }
+      case "open": {
+        const name = nameOf(text, pos);
+        // `<a>text</a>` and `<a></a>` stay on one line.
+        const a = token(text, t.end);
+        const body = a.kind === "text" ? text.slice(t.end, a.end) : "";
+        const closeAt = a.kind === "text" ? a.end : t.end;
+        const c = token(text, closeAt);
+        if (
+          (a.kind === "text" || a.kind === "close") &&
+          c.kind === "close" &&
+          nameOf(text, closeAt) === name &&
+          body.length <= INLINE_TEXT &&
+          !/[\r\n]/.test(body.trim())
+        ) {
+          indent();
+          writeTag(out, text, pos, t.end);
+          out.add(body.trim());
+          writeTag(out, text, closeAt, c.end);
+          out.end();
+          pos = c.end;
+          continue;
+        }
+        indent();
+        writeTag(out, text, pos, t.end);
+        out.end();
+        open.push(name);
+        depth++;
+        break;
+      }
+    }
+    pos = t.end;
+  }
+  if (open.length) wellFormed = false;
+  out.finish();
+  return { lines: out.lines, more: out.full, wellFormed };
+}
diff --git a/crates/exav-viewer/ts/vite/assets.test.ts b/crates/exav-viewer/ts/vite/assets.test.ts
index b2b48ef4..231a380b 100644
--- a/crates/exav-viewer/ts/vite/assets.test.ts
+++ b/crates/exav-viewer/ts/vite/assets.test.ts
@@ -70,8 +70,9 @@ describe("collectAssets", () => {
     expect(fs.existsSync(path.join(packageDir("pdfjs-dist", root)!, "wasm", "quickjs-eval.wasm"))).toBe(true);
   });
 
-  it("copies nothing for the IFC and STL engines, which are the package's own", () => {
+  it("copies nothing for the IFC and STL engines, which are the package's own, nor any external converter by default", () => {
     expect([...copied].filter((p) => !p.startsWith("pdfjs/"))).toEqual([]);
+    expect(manifest.converters).toBeUndefined();
   });
 
   it("lists every copied file in the manifest, each copied from a file that exists", () => {
@@ -80,6 +81,49 @@ describe("collectAssets", () => {
   });
 });
 
+/**
+ * A project with an external converter installed: a package whose
+ * package.json says which files it publishes, and files that it does not.
+ */
+function projectWithConverter(pkg: Record<string, unknown> = {}) {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "converter-"));
+  const at = path.join(dir, "node_modules", "@acme", "to-pdf");
+  const put = (f: string, text = f) => {
+    fs.mkdirSync(path.dirname(path.join(at, f)), { recursive: true });
+    fs.writeFileSync(path.join(at, f), text);
+  };
+  put("package.json", JSON.stringify({ name: "@acme/to-pdf", version: "1.2.3", exports: { ".": { types: "./js/index.d.ts", default: "./js/index.js" } }, files: ["js", "pkg/data.bin", "LICENSE", "README.md"], ...pkg }));
+  for (const f of ["js/index.js", "js/run.js", "js/index.d.ts", "pkg/data.bin", "pkg/unpublished.bin", "LICENSE", "NOTICE", "README.md", "js/node_modules/dep/index.js", "tests/t.js"]) put(f);
+  return { dir, remove: () => fs.rmSync(dir, { recursive: true }) };
+}
+
+describe("an external converter's copy", () => {
+  it("copies what the package publishes, under its name and version, and records its entry", () => {
+    const { dir, remove } = projectWithConverter();
+    const { assets, manifest } = collectAssets(dir, { externalConverter: "@acme/to-pdf" });
+    const base = "converters/acme__to-pdf/1.2.3/";
+    expect(manifest.converters).toEqual({ "@acme/to-pdf": `${base}js/index.js` });
+    expect(assets.map((a) => a.path).sort()).toEqual(["js/index.js", "js/run.js", "pkg/data.bin", "LICENSE", "NOTICE"].map((f) => `${base}${f}`).sort());
+    expect(manifest.all).toEqual(assets.map((a) => a.path));
+    remove();
+  });
+
+  it("finds the entry in `exports` as a string, or in `main`", () => {
+    for (const pkg of [{ exports: "./js/index.js" }, { exports: { ".": "./js/index.js" } }, { exports: undefined, main: "js/index.js" }, { exports: { import: "./js/index.js" } }]) {
+      const { dir, remove } = projectWithConverter(pkg);
+      expect(collectAssets(dir, { externalConverter: "@acme/to-pdf" }).manifest.converters).toEqual({ "@acme/to-pdf": "converters/acme__to-pdf/1.2.3/js/index.js" });
+      remove();
+    }
+  });
+
+  it("fails when the package is not installed, or names no module", () => {
+    const { dir, remove } = projectWithConverter({ exports: undefined, main: undefined });
+    expect(() => collectAssets(dir, { externalConverter: "@acme/to-pdf" })).toThrow(/no entry module/);
+    expect(() => collectAssets(dir, { externalConverter: "@acme/absent" })).toThrow(/not installed/);
+    remove();
+  });
+});
+
 describe("the frame app's files", () => {
   /** A page and a script as build-frame.mjs writes them. */
   const built = () => {
@@ -115,5 +159,22 @@ describe("the frame app's files", () => {
   it.runIf(fs.existsSync(path.join(root, "dist", "frame", "app")))("are the built app, page and scripts", () => {
     const paths = frameFiles().map((f) => f.path);
     for (const f of ["index.html", "app.js", "cad.worker.js", "pdfjs.worker.js", "ranges.worker.js", "exav-viewer/manifest.json"]) expect(paths, f).toContain(f);
+    // No external converter is in the package's frame app: its host adds one.
+    expect(paths.some((p) => p.includes("converters/"))).toBe(false);
+  });
+
+  it.runIf(fs.existsSync(path.join(root, "dist", "frame", "app")))("get an external converter from the host's packages, and a manifest that names it", () => {
+    const { dir, remove } = projectWithConverter();
+    const files = frameFiles(dir, "@acme/to-pdf");
+    const base = "converters/acme__to-pdf/1.2.3/";
+    expect(files.map((f) => f.path)).toContain(`exav-viewer/${base}pkg/data.bin`);
+    const manifestFile = files.find((f) => f.path === "exav-viewer/manifest.json")!;
+    const m = JSON.parse(frameFileBytes(manifestFile).toString("utf8"));
+    expect(m.converters).toEqual({ "@acme/to-pdf": `${base}js/index.js` });
+    expect(m.dirs.pdfjs).toMatch(/^pdfjs\//);
+    expect(m.all).toContain(`${base}js/run.js`);
+    // Without a name, the app's own files alone.
+    expect(frameFiles(dir).some((f) => f.path.includes("converters/"))).toBe(false);
+    remove();
   });
 });
diff --git a/crates/exav-viewer/ts/vite/assets.ts b/crates/exav-viewer/ts/vite/assets.ts
index 6ab59818..13480091 100644
--- a/crates/exav-viewer/ts/vite/assets.ts
+++ b/crates/exav-viewer/ts/vite/assets.ts
@@ -45,6 +45,8 @@ export interface Asset {
   source: string;
   /** Where it goes, relative to `assetBase`. */
   path: string;
+  /** Its bytes, when they are not the source's as they are. */
+  bytes?: Buffer;
 }
 
 /** The directory of an installed package, looked up from `root` as Node would. */
@@ -71,8 +73,49 @@ function walk(dir: string): string[] {
   return out;
 }
 
-/** Everything to copy for the packages installed beside `root`, and the manifest describing it. */
-export function collectAssets(root: string): { assets: Asset[]; manifest: AssetManifest } {
+/** The module a package's `exports["."]` (or `main`) names, relative to the package. */
+function entryOf(manifest: { exports?: unknown; main?: string }): string | null {
+  let e: unknown = manifest.exports;
+  if (e && typeof e === "object" && !Array.isArray(e) && "." in e) e = (e as Record<string, unknown>)["."];
+  for (let depth = 0; depth < 4 && e && typeof e === "object" && !Array.isArray(e); depth++) {
+    const o = e as Record<string, unknown>;
+    e = o.import ?? o.browser ?? o.default;
+  }
+  const entry = typeof e === "string" ? e : manifest.main;
+  return entry ? path.posix.normalize(entry) : null;
+}
+
+/**
+ * An external converter, a package the host installed: what it publishes
+ * (`files` of its package.json, a directory whole, without the `.d.ts` and
+ * Markdown files; every file but node_modules when it lists none), laid out
+ * as it has them under `converters/<name>/<version>/`, with its licence and
+ * notices. The viewer loads it from there rather than bundle it; `entry` is
+ * the module its `exports["."]` or `main` names. Null when the package is not
+ * installed.
+ */
+function converterAssets(root: string, name: string): { dir: string; entry: string; assets: Asset[] } | null {
+  const pkg = packageDir(name, root);
+  if (!pkg) return null;
+  const manifest = JSON.parse(fs.readFileSync(path.join(pkg, "package.json"), "utf8")) as { version: string; files?: string[]; exports?: unknown; main?: string };
+  const entry = entryOf(manifest);
+  if (!entry || !fs.existsSync(path.join(pkg, entry))) throw new Error(`${name} has no entry module: its package.json needs "exports" or "main" naming a file that exists`);
+  const dir = `converters/${name.replace(/^@/, "").replace(/\//g, "__")}/${manifest.version}/`;
+  const listed = manifest.files?.map((f) => path.join(pkg, f)).filter((f) => fs.existsSync(f)) ?? [pkg];
+  const files = [
+    ...new Set([...listed.flatMap((f) => (fs.statSync(f).isDirectory() ? walk(f) : [f])), ...["LICENSE", "NOTICE"].map((f) => path.join(pkg, f)).filter((f) => fs.existsSync(f)), path.join(pkg, entry)]),
+  ].filter((f) => !f.endsWith(".d.ts") && !f.endsWith(".md") && !path.relative(pkg, f).split(path.sep).includes("node_modules"));
+  return { dir, entry, assets: files.map((source) => ({ source, path: `${dir}${path.relative(pkg, source).split(path.sep).join("/")}` })) };
+}
+
+/**
+ * Everything to copy for the packages installed beside `root`, and the
+ * manifest describing it. With `externalConverter`, the name of an installed
+ * package, its files are copied too and the manifest names its entry
+ * (`converters`); none by default (the frame app's own build: its host adds
+ * one, see `frameFiles`). A package that is not installed fails the copy.
+ */
+export function collectAssets(root: string, { externalConverter }: { externalConverter?: string } = {}): { assets: Asset[]; manifest: AssetManifest } {
   const assets: Asset[] = [];
   const manifest: AssetManifest = { dirs: {}, files: {}, all: [] };
 
@@ -98,6 +141,13 @@ export function collectAssets(root: string): { assets: Asset[]; manifest: AssetM
     for (const [name, source] of Object.entries(PDF_DECODER_FILES)) assets.push({ source, path: `${wasmDir}${name}` });
   }
 
+  if (externalConverter !== undefined) {
+    const external = converterAssets(root, externalConverter);
+    if (!external) throw new Error(`the external converter ${externalConverter} is not installed beside ${root}`);
+    manifest.converters = { [externalConverter]: `${external.dir}${external.entry}` };
+    assets.push(...external.assets);
+  }
+
   manifest.all = assets.map((a) => a.path);
   return { assets, manifest };
 }
@@ -105,12 +155,27 @@ export function collectAssets(root: string): { assets: Asset[]; manifest: AssetM
 /**
  * The sandboxed frame app's files (`dist/frame/app/`), relative to the
  * directory it is published in. Built with the package, not from the host's
- * node_modules: the frame carries its own engines.
+ * node_modules: the frame carries its own engines. No external converter:
+ * with `root` and `externalConverter`, the package installed there is added
+ * under the frame's `exav-viewer/`, and its manifest names it.
  */
-export function frameFiles(): Asset[] {
+export function frameFiles(root?: string, externalConverter?: string): Asset[] {
   const dir = own(path.join("dist", "frame", "app"));
   if (!fs.existsSync(dir)) throw new Error(`${dir} is missing: the package was built without its frame app`);
-  return walk(dir).map((source) => ({ source, path: path.relative(dir, source).split(path.sep).join("/") }));
+  const files: Asset[] = walk(dir).map((source) => ({ source, path: path.relative(dir, source).split(path.sep).join("/") }));
+  if (root === undefined || externalConverter === undefined) return files;
+  const external = converterAssets(root, externalConverter);
+  if (!external) throw new Error(`the external converter ${externalConverter} is not installed beside ${root}`);
+  const manifest = files.find((f) => f.path === "exav-viewer/manifest.json");
+  if (!manifest) throw new Error("the frame app has no exav-viewer/manifest.json");
+  const m = JSON.parse(fs.readFileSync(manifest.source, "utf8")) as AssetManifest;
+  const merged: AssetManifest = {
+    ...m,
+    converters: { ...m.converters, [externalConverter]: `${external.dir}${external.entry}` },
+    all: [...m.all, ...external.assets.map((a) => a.path)],
+  };
+  manifest.bytes = Buffer.from(JSON.stringify(merged));
+  return [...files, ...external.assets.map((a) => ({ ...a, path: `exav-viewer/${a.path}` }))];
 }
 
 /**
@@ -119,7 +184,7 @@ export function frameFiles(): Asset[] {
  * the page's meta policy names them.
  */
 export function frameFileBytes(asset: Asset, origin?: string, origins: FrameOrigins = {}): Buffer {
-  const bytes = fs.readFileSync(asset.source);
+  const bytes = asset.bytes ?? fs.readFileSync(asset.source);
   if (asset.path !== "index.html" || (!origin && !origins.media?.length && !origins.connect?.length)) return bytes;
   const html = bytes.toString("utf8");
   const meta = `content="${FRAME_CSP}"`;
diff --git a/crates/exav-viewer/ts/vite/cli.ts b/crates/exav-viewer/ts/vite/cli.ts
index 5437b007..9b03093e 100644
--- a/crates/exav-viewer/ts/vite/cli.ts
+++ b/crates/exav-viewer/ts/vite/cli.ts
@@ -1,13 +1,16 @@
 #!/usr/bin/env node
 /**
- * `exav-viewer-assets <dir> [--root <project>] [--frame <frame dir>
+ * `exav-viewer-assets <dir> [--root <project>] [--external-converter
+ * <package>] [--frame <frame dir>
  * [--frame-origin <origin>] [--media-origin <origin>]... [--connect-origin
  * <origin>]...]`: copies the engines' runtime files and `manifest.json` into
  * `<dir>`, which the host serves as the viewer's `assetBase`, and with
  * `--frame` the sandboxed frame app into `<frame dir>`. `--frame-origin`:
  * where it is served from, for Safari; `--media-origin`, `--connect-origin`:
- * what its policy allows besides (see `frameCsp`). For bundlers other than
- * Vite; `@exav/viewer/vite` does the same on its own.
+ * what its policy allows besides (see `frameCsp`). `--external-converter`: the
+ * name of an installed package that is an external converter, copied beside
+ * the assets (and into the frame app). For bundlers other than Vite;
+ * `@exav/viewer/vite` does the same on its own.
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -16,9 +19,9 @@ import { frameCsp } from "../frame/policy.js";
 import { collectAssets, frameFileBytes, frameFiles } from "./assets.js";
 
 const USAGE =
-  "usage: exav-viewer-assets <dir> [--root <project>] [--frame <frame dir> [--frame-origin <origin>] [--media-origin <origin>]... [--connect-origin <origin>]...]";
+  "usage: exav-viewer-assets <dir> [--root <project>] [--external-converter <package>] [--frame <frame dir> [--frame-origin <origin>] [--media-origin <origin>]... [--connect-origin <origin>]...]";
 const REPEATED = ["--media-origin", "--connect-origin"];
-const ONCE = ["--root", "--frame", "--frame-origin"];
+const ONCE = ["--root", "--external-converter", "--frame", "--frame-origin"];
 
 const args = process.argv.slice(2);
 const flags = new Map<string, string[]>();
@@ -37,6 +40,7 @@ for (let i = 0; i < args.length; i++) {
 }
 const one = (f: string) => flags.get(f)?.[0];
 const root = one("--root") ?? process.cwd();
+const externalConverter = one("--external-converter");
 const frameDir = one("--frame");
 const frameOrigin = one("--frame-origin");
 const origins = { media: flags.get("--media-origin") ?? [], connect: flags.get("--connect-origin") ?? [] };
@@ -59,12 +63,12 @@ const write = (to: string, bytes: Buffer) => {
   fs.writeFileSync(to, bytes);
 };
 
-const { assets, manifest } = collectAssets(root);
+const { assets, manifest } = collectAssets(root, { externalConverter });
 for (const a of assets) write(path.join(out, a.path), fs.readFileSync(a.source));
 write(path.join(out, "manifest.json"), Buffer.from(JSON.stringify(manifest)));
 console.log(`${assets.length} files in ${out}`);
 if (frameDir) {
-  const files = frameFiles();
+  const files = frameFiles(root, externalConverter);
   for (const f of files) write(path.join(frameDir, f.path), frameFileBytes(f, frameOrigin, origins));
   console.log(`${files.length} files of the frame app in ${frameDir}`);
   // The page carries the policy in a meta tag; headers must say the same.
diff --git a/crates/exav-viewer/ts/vite/index.ts b/crates/exav-viewer/ts/vite/index.ts
index 04f5ae23..266d83f3 100644
--- a/crates/exav-viewer/ts/vite/index.ts
+++ b/crates/exav-viewer/ts/vite/index.ts
@@ -50,6 +50,15 @@ export interface ExavViewerPluginOptions {
    * into its policy; give the viewer the same `origins.connect`.
    */
   connectOrigins?: string[];
+  /**
+   * The name of an installed package that is an external converter (see
+   * `ExternalConverter`): its files are copied beside the assets, and the
+   * manifest names its entry, so that the viewer's `externalConverter`
+   * option can take the package's name. With `frameDir`, the sandboxed frame
+   * gets the package too. None by default; the build fails when the package
+   * is not installed.
+   */
+  externalConverter?: string;
 }
 
 const trim = (dir: string) => `${dir.replace(/^\/+|\/+$/g, "")}/`;
@@ -95,18 +104,18 @@ export function exavViewer(options: ExavViewerPluginOptions = {}): Plugin {
       frameBase = frameDir && `${prefix}${frameDir}`;
     },
     generateBundle() {
-      const { assets, manifest } = collectAssets(root);
+      const { assets, manifest } = collectAssets(root, { externalConverter: options.externalConverter });
       for (const a of assets) this.emitFile({ type: "asset", fileName: `${dir}${a.path}`, source: fs.readFileSync(a.source) });
       this.emitFile({ type: "asset", fileName: `${dir}manifest.json`, source: JSON.stringify(manifest) });
-      if (frameDir) for (const f of frameFiles()) this.emitFile({ type: "asset", fileName: `${frameDir}${f.path}`, source: frameFileBytes(f, options.frameOrigin, origins) });
+      if (frameDir) for (const f of frameFiles(root, options.externalConverter)) this.emitFile({ type: "asset", fileName: `${frameDir}${f.path}`, source: frameFileBytes(f, options.frameOrigin, origins) });
     },
     configurePreviewServer(server) {
       server.middlewares.use(frame());
     },
     configureServer(server) {
-      const { assets, manifest } = collectAssets(root);
+      const { assets, manifest } = collectAssets(root, { externalConverter: options.externalConverter });
       const served = new Map<string, Asset>(assets.map((a) => [`${base}${a.path}`, a]));
-      if (frameDir) for (const f of frameFiles()) served.set(`${frameBase}${f.path}`, f);
+      if (frameDir) for (const f of frameFiles(root, options.externalConverter)) served.set(`${frameBase}${f.path}`, f);
       server.middlewares.use(frame());
       server.middlewares.use((req, res, next) => {
         const asked = (req.url ?? "").split("?")[0] ?? "";
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder-macros/Cargo.toml b/crates/exav-viewer/vendor/zenjxl-decoder-macros/Cargo.toml
new file mode 100644
index 00000000..9dcc120b
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder-macros/Cargo.toml
@@ -0,0 +1,68 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2024"
+rust-version = "1.89"
+name = "zenjxl-decoder-macros"
+version = "0.3.9"
+authors = [
+    "Luca Versari <veluca93@gmail.com>",
+    "Lilith River <lilith@imazen.io>",
+]
+build = false
+include = [
+    "/src/**",
+    "/LICENSE*",
+]
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
+description = "Proc macros for the zenjxl-decoder JPEG XL decoder"
+readme = "README.md"
+keywords = [
+    "jpeg-xl",
+    "decoder",
+]
+categories = ["multimedia::images"]
+license = "BSD-3-Clause"
+repository = "https://github.com/imazen/zenjxl-decoder"
+resolver = "2"
+
+[features]
+test = []
+
+[lib]
+name = "zenjxl_decoder_macros"
+path = "src/lib.rs"
+proc-macro = true
+
+[dependencies.proc-macro2]
+version = "1.0"
+
+[dependencies.quote]
+version = "1.0"
+
+[dependencies.syn]
+version = "2.0.90"
+features = [
+    "extra-traits",
+    "full",
+]
+
+[lints.clippy]
+missing_safety_doc = "deny"
+undocumented_unsafe_blocks = "deny"
+
+[lints.rust]
+unsafe_op_in_unsafe_fn = "deny"
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder-macros/EXAV.md b/crates/exav-viewer/vendor/zenjxl-decoder-macros/EXAV.md
new file mode 100644
index 00000000..ce6b2fca
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder-macros/EXAV.md
@@ -0,0 +1,22 @@
+# zenjxl-decoder-macros as exav ships it
+
+Version 0.3.9 of [zenjxl-decoder-macros](https://crates.io/crates/zenjxl-decoder-macros)
+(BSD-3-Clause, `LICENSE` beside this file), the derive macros of
+[zenjxl-decoder](../zenjxl-decoder/EXAV.md). Used by `@exav/viewer`'s image
+module, through `[patch.crates-io]` in `../../Cargo.toml`; nothing else of exav
+builds this copy.
+
+What differs from the published crate:
+
+- `proc-macro-error2` is gone: it is unmaintained (RUSTSEC-2026-0173), and
+  cargo reports it as code a future Rust will reject. `abort!` is a local macro
+  in `src/lib.rs` that panics with the same message, and `#[proc_macro_error]` is
+  removed. The macros only run on the decoder's own structs, so an error is a
+  mistake in the decoder's source and the message is what is needed; rustc no
+  longer points at the field.
+- `Cargo.toml.orig`, `Cargo.lock` and the dependency line of
+  `proc-macro-error2` are left out.
+
+Nothing else is changed. Checked by decoding the six JPEG XL files of the
+repository's fixtures and demo with this copy and with the published one: the
+pixels are identical.
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder-macros/LICENSE b/crates/exav-viewer/vendor/zenjxl-decoder-macros/LICENSE
new file mode 100644
index 00000000..c66034b1
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder-macros/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) the JPEG XL Project Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder-macros/README.md b/crates/exav-viewer/vendor/zenjxl-decoder-macros/README.md
new file mode 100644
index 00000000..67e5bc07
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder-macros/README.md
@@ -0,0 +1,247 @@
+# zenjxl-decoder [![CI](https://img.shields.io/github/actions/workflow/status/imazen/zenjxl-decoder/ci.yml?branch=main&style=flat-square&label=CI)](https://github.com/imazen/zenjxl-decoder/actions/workflows/ci.yml) [![crates.io](https://img.shields.io/crates/v/zenjxl-decoder?style=flat-square)](https://crates.io/crates/zenjxl-decoder) [![docs.rs](https://img.shields.io/docsrs/zenjxl-decoder?style=flat-square)](https://docs.rs/zenjxl-decoder) [![MSRV](https://img.shields.io/badge/MSRV-1.89-blue?style=flat-square)](https://doc.rust-lang.org/cargo/reference/manifest.html#the-rust-version-field) [![license](https://img.shields.io/crates/l/zenjxl-decoder?style=flat-square)](https://github.com/imazen/zenjxl-decoder#license)
+
+A JPEG XL decoder in safe Rust. Fork of [libjxl/jxl-rs](https://github.com/libjxl/jxl-rs) with security hardening, bug fixes, and parallel decoding.
+
+Maintained by [Lilith River](https://github.com/lilith) at [Imazen](https://github.com/imazen).
+
+```toml
+[dependencies]
+zenjxl-decoder = "0.3"
+```
+
+The Rust lib name is `jxl`, so you `use jxl::...` in code.
+
+If you find a conformant JXL file that decodes incorrectly (or not at all), [open an issue](https://github.com/imazen/zenjxl-decoder/issues/new).
+
+## What's different from upstream
+
+This fork fixes several decoding bugs, adds resource limits and cooperative cancellation, and wires up parallel decoding via rayon. All changes are BSD-3-Clause licensed under the Google CLA, intended for upstream contribution.
+
+### Bug Fixes
+
+| Bug | Description |
+|-----|-------------|
+| sRGB Transfer Function | Apply sRGB TF by default for XYB-encoded images (was outputting linear) |
+| RCT Overflow Panic | Wrapping arithmetic to prevent panic on edge-case pixel values |
+| Extra Channel Format Slots | Allocate format slots for all extra channels, not just first |
+| Progressive AC Validation | Fix inverted `last_pass` validation (must be strictly increasing) |
+| Extra Channel Bit Depth | Use extra channel's own `bit_depth` for modular-to-f32 conversion |
+| Noise Seeding (upsampling > 1) | Separate RNG seeds per subregion for upsampled frames |
+| CMYK Blending Order | Blend in CMYK space, then CMS-convert to RGB |
+
+### New Features
+
+| Feature | Description |
+|---------|-------------|
+| CMS-based CMYK to RGB | ICC profile-based CMYK conversion via optional `moxcms` backend |
+| Cooperative cancellation | `enough::Stop` trait — cancel or timeout decoding from any thread |
+| Resource limits | `JxlDecoderLimits` API — cap pixels, memory, ICC size, tree size, etc. |
+| Memory tracking | `max_memory_bytes` budget with atomic, lock-free tracking |
+| Fallible allocation | All significant allocations return `TryReserveError` instead of panicking |
+| Parallel decoding | Rayon-based parallel group decode and render (opt-in via `threads` feature) |
+
+## Usage
+
+### Basic decode
+
+```rust
+use jxl::api::{JxlDecoder, JxlDecoderOptions};
+
+let data = std::fs::read("image.jxl")?;
+let mut decoder = JxlDecoder::new(&data, JxlDecoderOptions::default());
+// ... process frames
+```
+
+### Resource limits
+
+```rust
+use jxl::api::{JxlDecoderLimits, JxlDecoderOptions};
+
+// For untrusted input
+let options = JxlDecoderOptions {
+    limits: JxlDecoderLimits::restrictive(),
+    ..Default::default()
+};
+```
+
+| Limit | Default | Restrictive |
+|-------|---------|-------------|
+| `max_pixels` | 2^30 (~1B) | 100M |
+| `max_extra_channels` | 256 | 16 |
+| `max_icc_size` | 256 MB | 1 MB |
+| `max_tree_size` | 4M nodes | 1M nodes |
+| `max_patches` | (derived) | 64K |
+| `max_spline_points` | 1M | 64K |
+| `max_reference_frames` | 4 | 2 |
+| `max_memory_bytes` | None | 1 GB |
+
+All limits return `Error::LimitExceeded { resource, actual, limit }` when exceeded.
+
+### Cancellation
+
+The decoder accepts any [`enough::Stop`](https://docs.rs/enough) implementation:
+
+```rust
+use almost_enough::Stopper;
+use std::sync::Arc;
+
+let stop = Arc::new(Stopper::new());
+let stop_clone = Arc::clone(&stop);
+
+// Cancel from another thread
+std::thread::spawn(move || {
+    std::thread::sleep(std::time::Duration::from_secs(5));
+    stop_clone.cancel();
+});
+
+let options = JxlDecoderOptions {
+    stop,
+    ..Default::default()
+};
+```
+
+Cancellation checks run inside parallel closures too, so a cancel request is noticed mid-batch.
+
+### Parallel decoding
+
+Enable the `threads` feature (on by default in `jxl_cli`):
+
+```toml
+[dependencies]
+zenjxl-decoder = { version = "0.3", features = ["threads"] }
+```
+
+Set `parallel: false` on `JxlDecoderOptions` to force single-threaded mode at runtime.
+
+## Features
+
+| Feature | Description |
+|---------|-------------|
+| `threads` | Rayon-based parallel group decode and render |
+| `cms` | moxcms CMS backend for ICC profile transforms |
+| `jpeg` | JPEG reconstruction from JXL containers |
+| `all-simd` | All SIMD backends (SSE4.2, AVX2, AVX-512, NEON, WASM128) |
+| `sse42` / `avx` / `avx512` / `neon` / `wasm128` | Individual SIMD targets |
+| `allow-unsafe` | Enable `unsafe` fast paths in the main crate (safe fallbacks used otherwise) |
+
+## Conformance
+
+Against [libjxl/conformance](https://github.com/libjxl/conformance) test suite (Level 5): **17/23 passing** (74%, as of December 2025).
+
+```bash
+cargo test --features cms conformance -- --ignored --nocapture
+```
+
+| Status | Tests |
+|--------|-------|
+| Pass | alpha_nonpremultiplied, alpha_triangles, bench_oriented_brg_5, bicycles, blendmodes_5, cafe_5, delta_palette, grayscale_5, grayscale_jpeg_5, grayscale_public_university, lz77_flower, noise_5, opsin_inverse_5, patches_5, patches_lossless, sunset_logo, upsampling_5 |
+| Skip | animation_icos4d_5, animation_newtons_cradle, animation_spline_5 (animation rendering not yet supported; animation metadata parsing is available via `JxlImageInfo::animation`) |
+| Fail | bike_5, progressive_5 (out-of-gamut/HDR values), spot (6-channel output not yet supported) |
+
+Against codec-corpus (184 JXL files with djxl reference output): **184/184 passing** (100%, as of December 2025).
+
+## Upstream Contributions
+
+Bug fixes reported to [libjxl/jxl-rs](https://github.com/libjxl/jxl-rs):
+
+| # | Type | Status | Description |
+|---|------|--------|-------------|
+| [#607](https://github.com/libjxl/jxl-rs/pull/607) | PR | Merged | ICC tag parsing overflow fix |
+| [#637](https://github.com/libjxl/jxl-rs/pull/637) | PR | Merged | Extra channel bit_depth fix (from our [#604](https://github.com/libjxl/jxl-rs/pull/604)) |
+| [#632](https://github.com/libjxl/jxl-rs/pull/632) | PR | Merged | RCT wrapping arithmetic (from our [#603](https://github.com/libjxl/jxl-rs/pull/603)) |
+| [#609](https://github.com/libjxl/jxl-rs/issues/609) | Issue | Fixed | Progressive AC last_pass validation bug |
+| [#610](https://github.com/libjxl/jxl-rs/issues/610) | Issue | Fixed | Noise seeding wrong when upsampling > 1 |
+| [#660](https://github.com/libjxl/jxl-rs/pull/660) | PR | Open | Conformance test infrastructure |
+| [#602](https://github.com/libjxl/jxl-rs/pull/602) | PR | Closed | Integer overflow handling (ICC part merged as #607; rest declined) |
+
+## Sister project
+
+[jxl-encoder](https://github.com/imazen/jxl-encoder) — a multithreaded JPEG XL encoder in Rust, also by Imazen.
+
+## Image tech I maintain
+
+| | |
+|:--|:--|
+| State of the art codecs* | [zenjpeg] · [zenpng] · [zenwebp] · [zengif] · [zenavif] ([rav1d-safe] · [zenrav1e] · [zenavif-parse] · [zenavif-serialize]) · [zenjxl] ([jxl-encoder] · **zenjxl-decoder**) · [zentiff] · [zenbitmaps] · [heic] · [zenraw] · [zenpdf] · [ultrahdr] · [mozjpeg-rs] · [webpx] |
+| Compression | [zenflate] · [zenzop] |
+| Processing | [zenresize] · [zenfilters] · [zenquant] · [zenblend] |
+| Metrics | [zensim] · [fast-ssim2] · [butteraugli] · [resamplescope-rs] · [codec-eval] · [codec-corpus] |
+| Pixel types & color | [zenpixels] · [zenpixels-convert] · [linear-srgb] · [garb] |
+| Pipeline | [zenpipe] · [zencodec] · [zencodecs] · [zenlayout] · [zennode] |
+| ImageResizer | [ImageResizer] (C#) — 24M+ NuGet downloads across all packages |
+| [Imageflow][] | Image optimization engine (Rust) — [.NET][imageflow-dotnet] · [node][imageflow-node] · [go][imageflow-go] — 9M+ NuGet downloads across all packages |
+| [Imageflow Server][] | [The fast, safe image server](https://www.imazen.io/) (Rust+C#) — 552K+ NuGet downloads, deployed by Fortune 500s and major brands |
+
+<sub>* as of 2026</sub>
+
+### General Rust awesomeness
+
+[archmage] · [magetypes] · [enough] · [whereat] · [zenbench] · [cargo-copter]
+
+[And other projects](https://www.imazen.io/open-source) · [GitHub @imazen](https://github.com/imazen) · [GitHub @lilith](https://github.com/lilith) · [lib.rs/~lilith](https://lib.rs/~lilith) · [NuGet](https://www.nuget.org/profiles/imazen) (over 30 million downloads / 87 packages)
+
+## License
+
+BSD-3-Clause. See [LICENSE](LICENSE).
+
+
+
+### Upstream Contribution
+
+This is a fork of [libjxl/jxl-rs](https://github.com/libjxl/jxl-rs) (BSD-3-Clause).
+We are willing to release our improvements under the original BSD-3-Clause
+license if upstream takes over maintenance of those improvements. We'd rather
+contribute back than maintain a parallel codebase. Open an issue or reach out.
+
+[zenjpeg]: https://github.com/imazen/zenjpeg
+[zenpng]: https://github.com/imazen/zenpng
+[zenwebp]: https://github.com/imazen/zenwebp
+[zengif]: https://github.com/imazen/zengif
+[zenavif]: https://github.com/imazen/zenavif
+[zenjxl]: https://github.com/imazen/zenjxl
+[zentiff]: https://github.com/imazen/zentiff
+[zenbitmaps]: https://github.com/imazen/zenbitmaps
+[heic]: https://github.com/imazen/heic-decoder-rs
+[zenraw]: https://github.com/imazen/zenraw
+[zenpdf]: https://github.com/imazen/zenpdf
+[ultrahdr]: https://github.com/imazen/ultrahdr
+[jxl-encoder]: https://github.com/imazen/jxl-encoder
+[rav1d-safe]: https://github.com/imazen/rav1d-safe
+[zenrav1e]: https://github.com/imazen/zenrav1e
+[mozjpeg-rs]: https://github.com/imazen/mozjpeg-rs
+[zenavif-parse]: https://github.com/imazen/zenavif-parse
+[zenavif-serialize]: https://github.com/imazen/zenavif-serialize
+[webpx]: https://github.com/imazen/webpx
+[zenflate]: https://github.com/imazen/zenflate
+[zenzop]: https://github.com/imazen/zenzop
+[zenresize]: https://github.com/imazen/zenresize
+[zenfilters]: https://github.com/imazen/zenfilters
+[zenquant]: https://github.com/imazen/zenquant
+[zenblend]: https://github.com/imazen/zenblend
+[zensim]: https://github.com/imazen/zensim
+[fast-ssim2]: https://github.com/imazen/fast-ssim2
+[butteraugli]: https://github.com/imazen/butteraugli
+[zenpixels]: https://github.com/imazen/zenpixels
+[zenpixels-convert]: https://github.com/imazen/zenpixels
+[linear-srgb]: https://github.com/imazen/linear-srgb
+[garb]: https://github.com/imazen/garb
+[zenpipe]: https://github.com/imazen/zenpipe
+[zencodec]: https://github.com/imazen/zencodec
+[zencodecs]: https://github.com/imazen/zencodecs
+[zenlayout]: https://github.com/imazen/zenlayout
+[zennode]: https://github.com/imazen/zennode
+[Imageflow]: https://github.com/imazen/imageflow
+[Imageflow Server]: https://github.com/imazen/imageflow-server
+[imageflow-dotnet]: https://github.com/imazen/imageflow-dotnet
+[imageflow-node]: https://github.com/imazen/imageflow-node
+[imageflow-go]: https://github.com/imazen/imageflow-go
+[ImageResizer]: https://github.com/imazen/resizer
+[archmage]: https://github.com/imazen/archmage
+[magetypes]: https://github.com/imazen/archmage
+[enough]: https://github.com/imazen/enough
+[whereat]: https://github.com/lilith/whereat
+[zenbench]: https://github.com/imazen/zenbench
+[cargo-copter]: https://github.com/imazen/cargo-copter
+[resamplescope-rs]: https://github.com/imazen/resamplescope-rs
+[codec-eval]: https://github.com/imazen/codec-eval
+[codec-corpus]: https://github.com/imazen/codec-corpus
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder-macros/src/lib.rs b/crates/exav-viewer/vendor/zenjxl-decoder-macros/src/lib.rs
new file mode 100644
index 00000000..442d2bdb
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder-macros/src/lib.rs
@@ -0,0 +1,782 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![forbid(unsafe_code)]
+
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use syn::{DeriveInput, Meta, parse_macro_input};
+
+/// Stops the expansion with a message, which rustc shows as the macro's error.
+/// The first argument is where upstream pointed the error; the macros only
+/// run on the decoder's own structs, so the message is all that is needed.
+macro_rules! abort {
+    ($at:expr, $($msg:tt)+) => {{
+        let _ = &$at;
+        panic!($($msg)+)
+    }};
+}
+
+fn get_bits(expr_call: &syn::ExprCall) -> syn::Expr {
+    if let syn::Expr::Path(ep) = &*expr_call.func {
+        if !ep.path.is_ident("Bits") {
+            abort!(
+                expr_call,
+                "Unexpected function name in coder: {}",
+                ep.path.get_ident().unwrap()
+            );
+        }
+        if expr_call.args.len() != 1 {
+            abort!(
+                expr_call,
+                "Unexpected number of arguments for Bits() in coder: {}",
+                expr_call.args.len()
+            );
+        }
+        return expr_call.args[0].clone();
+    }
+    abort!(expr_call, "Unexpected function call in coder");
+}
+
+fn parse_single_coder(input: &syn::Expr, extra_lit: Option<&syn::ExprLit>) -> TokenStream2 {
+    match &input {
+        syn::Expr::Lit(lit) => match extra_lit {
+            None => quote! {U32::Val(#lit)},
+            Some(elit) => quote! {U32::Val(#lit + #elit)},
+        },
+        syn::Expr::Call(expr_call) => {
+            let bits = get_bits(expr_call);
+            match extra_lit {
+                None => quote! {U32::Bits(#bits)},
+                Some(elit) => quote! {U32::BitsOffset{n: #bits, off: #elit}},
+            }
+        }
+        syn::Expr::Binary(syn::ExprBinary {
+            attrs: _,
+            left,
+            op: syn::BinOp::Add(_),
+            right,
+        }) => {
+            let (left, right) = if let syn::Expr::Lit(_) = **left {
+                (right, left)
+            } else {
+                (left, right)
+            };
+            match (&**left, &**right) {
+                (syn::Expr::Call(expr_call), syn::Expr::Lit(lit)) => {
+                    let bits = get_bits(expr_call);
+                    match extra_lit {
+                        None => quote! {U32::BitsOffset{n: #bits, off: #lit}},
+                        Some(elit) => quote! {U32::BitsOffset{n: #bits, off: #lit + #elit}},
+                    }
+                }
+                _ => abort!(
+                    input,
+                    "Unexpected expression in coder, must be Bits(a) + b, Bits(a), or b"
+                ),
+            }
+        }
+        _ => abort!(
+            input,
+            "Unexpected expression in coder, must be Bits(a) + b, Bits(a), or b"
+        ),
+    }
+}
+
+fn parse_coder(input: &syn::Expr) -> TokenStream2 {
+    let parse_u2s = |expr_call: &syn::ExprCall, lit: Option<&syn::ExprLit>| {
+        if let syn::Expr::Path(ep) = &*expr_call.func {
+            if !ep.path.is_ident("u2S") {
+                let coder = parse_single_coder(input, None);
+                return quote! {U32Coder::Direct(#coder)};
+            }
+            if expr_call.args.len() != 4 {
+                abort!(
+                    input,
+                    "Unexpected number of arguments for U32() in coder: {}",
+                    expr_call.args.len()
+                );
+            }
+            let args = vec![
+                parse_single_coder(&expr_call.args[0], lit),
+                parse_single_coder(&expr_call.args[1], lit),
+                parse_single_coder(&expr_call.args[2], lit),
+                parse_single_coder(&expr_call.args[3], lit),
+            ];
+            return quote! {U32Coder::Select(#(#args),*)};
+        }
+        abort!(input, "Unexpected function call in coder");
+    };
+
+    match &input {
+        syn::Expr::Call(expr_call) => parse_u2s(expr_call, None),
+        syn::Expr::Binary(syn::ExprBinary {
+            attrs: _,
+            left,
+            op: syn::BinOp::Add(_),
+            right,
+        }) => {
+            let (left, right) = if let syn::Expr::Lit(_) = **left {
+                (right, left)
+            } else {
+                (left, right)
+            };
+            match (&**left, &**right) {
+                (syn::Expr::Call(expr_call), syn::Expr::Lit(lit)) => {
+                    parse_u2s(expr_call, Some(lit))
+                }
+                _ => abort!(
+                    input,
+                    "Unexpected expression in coder, must be (u2S|Bits)(a) + b, (u2S|Bits)(a), or b"
+                ),
+            }
+        }
+        _ => parse_single_coder(input, None),
+    }
+}
+
+fn parse_size_coder(mut input: syn::Expr) -> TokenStream2 {
+    match input {
+        syn::Expr::Call(syn::ExprCall {
+            ref func,
+            ref mut args,
+            ..
+        }) => {
+            if args.len() != 1 {
+                abort!(input, "Expected 1 argument in sized_coder inner call");
+            }
+
+            match &**func {
+                syn::Expr::Path(expr_path) if expr_path.path.is_ident("implicit") => {
+                    let arg = args.first().unwrap().clone();
+                    parse_coder(&arg)
+                }
+                syn::Expr::Path(expr_path) if expr_path.path.is_ident("explicit") => {
+                    quote! { U32Coder::Direct(U32::Val(#args)) }
+                }
+                _ => abort!(
+                    input,
+                    "Unexpected expression in size_coder, must be 'implicit()' or 'explicit()'"
+                ),
+            }
+        }
+        _ => abort!(
+            input,
+            "Unexpected expression in size_coder, must be 'implicit()' or 'explicit()'"
+        ),
+    }
+}
+
+fn prettify_condition(cond: &syn::Expr) -> String {
+    (quote! {#cond})
+        .to_string()
+        .replace(" . ", ".")
+        .replace("! ", "!")
+        .replace(" :: ", "::")
+}
+
+#[derive(Debug)]
+struct Condition {
+    expr: Option<syn::Expr>,
+    has_all_default: bool,
+    pretty: String,
+}
+
+impl Condition {
+    fn get_expr(&self, all_default_field: &Option<syn::Ident>) -> Option<TokenStream2> {
+        if self.has_all_default {
+            let all_default = all_default_field.as_ref().unwrap();
+            match &self.expr {
+                Some(expr) => Some(quote! { !#all_default && (#expr) }),
+                None => Some(quote! { !#all_default }),
+            }
+        } else {
+            self.expr.as_ref().map(|expr| quote! {#expr})
+        }
+    }
+    fn get_pretty(&self, all_default_field: &Option<syn::Ident>) -> String {
+        if self.has_all_default {
+            let all_default = all_default_field.as_ref().unwrap();
+            let all_default = "!".to_owned() + &quote! {#all_default}.to_string();
+            match &self.expr {
+                Some(_) => all_default + " && (" + &self.pretty + ")",
+                None => all_default,
+            }
+        } else {
+            self.pretty.clone()
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+struct U32 {
+    coder: TokenStream2,
+}
+
+#[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+enum Coder {
+    WithoutConfig,
+    U32(U32),
+    Select(Condition, U32, U32),
+    Vector(U32, Box<Coder>),
+}
+
+impl Coder {
+    fn ty(&self) -> TokenStream2 {
+        match self {
+            Coder::WithoutConfig => quote! {()},
+            Coder::U32(..) => quote! {U32Coder},
+            Coder::Select(..) => quote! {U32Coder},
+            Coder::Vector(_, value_coder) => {
+                let value_coder_ty = value_coder.ty();
+                quote! {VectorCoder<#value_coder_ty>}
+            }
+        }
+    }
+
+    fn config(&self, all_default_field: &Option<syn::Ident>) -> TokenStream2 {
+        match self {
+            Coder::WithoutConfig => quote! { () },
+            Coder::U32(U32 { coder }) => quote! { #coder },
+            Coder::Select(condition, U32 { coder: coder_true }, U32 { coder: coder_false }) => {
+                let cnd = condition.get_expr(all_default_field).unwrap();
+                quote! {
+                    if #cnd { #coder_true } else { #coder_false }
+                }
+            }
+            Coder::Vector(U32 { coder }, value_coder) => {
+                let value_coder = value_coder.config(all_default_field);
+                quote! {VectorCoder{size_coder: #coder, value_coder: #value_coder}}
+            }
+        }
+    }
+}
+
+#[derive(Debug)]
+enum FieldKind {
+    Unconditional(Coder),
+    Conditional(Condition, Coder),
+    Defaulted(Condition, Coder),
+}
+
+#[derive(Debug)]
+struct Field {
+    name: proc_macro2::Ident,
+    kind: FieldKind,
+    ty: syn::Type,
+    default: Option<TokenStream2>,
+    default_element: Option<TokenStream2>,
+    nonserialized_inits: Vec<TokenStream2>,
+}
+
+impl Field {
+    fn parse(f: &syn::Field, num: usize, all_default_field: &mut Option<syn::Ident>) -> Field {
+        let mut condition = None;
+        let mut default = None;
+        let mut coder = None;
+
+        let mut select_coder = None;
+        let mut coder_true = None;
+        let mut coder_false = None;
+
+        let mut is_all_default = false;
+
+        let mut size_coder = None;
+
+        let mut nonserialized = vec![];
+
+        let mut default_element = None;
+
+        // Parse attributes.
+        for a in &f.attrs {
+            match a.path().get_ident().map(syn::Ident::to_string).as_deref() {
+                Some("coder") => {
+                    if coder.is_some() {
+                        abort!(f, "Repeated coder");
+                    }
+                    let coder_ast = a.parse_args::<syn::Expr>().unwrap();
+                    coder = Some(Coder::U32(U32 {
+                        coder: parse_coder(&coder_ast),
+                    }));
+                }
+                Some("default") => {
+                    if default.is_some() {
+                        abort!(f, "Repeated default");
+                    }
+                    let default_expr = a.parse_args::<syn::Expr>().unwrap();
+                    default = Some(quote! {#default_expr});
+                }
+                Some("default_element") => {
+                    if default_element.is_some() {
+                        abort!(f, "Repeated default_element")
+                    }
+                    let default_element_expr = a.parse_args::<syn::Expr>().unwrap();
+                    default_element = Some(quote! { #default_element_expr })
+                }
+                Some("condition") => {
+                    if condition.is_some() {
+                        abort!(f, "Repeated condition");
+                    }
+                    let condition_ast = a.parse_args::<syn::Expr>().unwrap();
+                    let pretty_cond = prettify_condition(&condition_ast);
+                    condition = Some(Condition {
+                        expr: Some(condition_ast),
+                        has_all_default: all_default_field.is_some(),
+                        pretty: pretty_cond,
+                    });
+                }
+                Some("all_default") => {
+                    if num != 0 {
+                        abort!(f, "all_default is not the first field");
+                    }
+                    if default.is_some() {
+                        abort!(f, "all_default has an implicit default");
+                    }
+                    is_all_default = true;
+                    default = Some(quote! { true });
+                }
+                Some("select_coder") => {
+                    if select_coder.is_some() {
+                        abort!(f, "Repeated select_coder");
+                    }
+                    let condition_ast = a.parse_args::<syn::Expr>().unwrap();
+                    let pretty_cond = prettify_condition(&condition_ast);
+                    select_coder = Some(Condition {
+                        expr: Some(condition_ast),
+                        has_all_default: false,
+                        pretty: pretty_cond,
+                    });
+                }
+                Some("coder_false") => {
+                    if coder_false.is_some() {
+                        abort!(f, "Repeated coder_false");
+                    }
+                    let coder_ast = a.parse_args::<syn::Expr>().unwrap();
+                    coder_false = Some(U32 {
+                        coder: parse_coder(&coder_ast),
+                    });
+                }
+                Some("coder_true") => {
+                    if coder_true.is_some() {
+                        abort!(f, "Repeated coder_true");
+                    }
+                    let coder_ast = a.parse_args::<syn::Expr>().unwrap();
+                    coder_true = Some(U32 {
+                        coder: parse_coder(&coder_ast),
+                    });
+                }
+                Some("size_coder") => {
+                    if size_coder.is_some() {
+                        abort!(f, "Repeated size_coder");
+                    }
+                    let coder_ast = a.parse_args::<syn::Expr>().unwrap();
+                    size_coder = Some(U32 {
+                        coder: parse_size_coder(coder_ast),
+                    });
+                }
+                Some("nonserialized") => {
+                    let Meta::List(ns) = &a.meta else {
+                        abort!(a, "Invalid attribute");
+                    };
+                    let stream = &ns.tokens;
+                    nonserialized.push(quote! {#stream});
+                }
+                _ => {}
+            }
+        }
+
+        if default.is_some() && default_element.is_some() {
+            abort!(f, "default is incompatible with default_element");
+        }
+
+        if let Some(select_coder) = select_coder {
+            if coder_true.is_none() || coder_false.is_none() {
+                abort!(
+                    f,
+                    "Invalid field, select_coder is set but coder_true or coder_false are not"
+                )
+            }
+            if coder.is_some() {
+                abort!(f, "Invalid field, select_coder and coder are both present")
+            }
+            coder = Some(Coder::Select(
+                select_coder,
+                coder_true.unwrap(),
+                coder_false.unwrap(),
+            ))
+        }
+
+        let condition = if condition.is_some() || all_default_field.is_none() {
+            condition
+        } else {
+            Some(Condition {
+                expr: None,
+                has_all_default: true,
+                pretty: String::new(),
+            })
+        };
+
+        // Assume nested field if no coder.
+        let mut coder = coder.unwrap_or_else(|| Coder::WithoutConfig);
+
+        if let Some(c) = size_coder {
+            if default.is_none() {
+                default = Some(quote! { Vec::new() });
+            }
+
+            coder = Coder::Vector(c, Box::new(coder))
+        }
+
+        let ident = f.ident.as_ref().unwrap();
+
+        let kind = match (condition, default.is_some()) {
+            (None, _) => FieldKind::Unconditional(coder),
+            (Some(cond), false) => FieldKind::Conditional(cond, coder),
+            (Some(cond), true) => FieldKind::Defaulted(cond, coder),
+        };
+        if is_all_default {
+            *all_default_field = Some(f.ident.as_ref().unwrap().clone());
+        }
+        Field {
+            name: ident.clone(),
+            kind,
+            ty: f.ty.clone(),
+            default,
+            default_element,
+            nonserialized_inits: nonserialized,
+        }
+    }
+
+    // Produces reading code (possibly with tracing).
+    fn read_fun(&self, all_default_field: &Option<syn::Ident>) -> TokenStream2 {
+        let ident = &self.name;
+        let ty = &self.ty;
+        let nonserialized_inits = &self.nonserialized_inits;
+        match &self.kind {
+            FieldKind::Unconditional(coder) => {
+                let cfg_ty = coder.ty();
+                let cfg = coder.config(all_default_field);
+                let trc = quote! {
+                    crate::util::tracing_wrappers::trace!("Setting {} to {:?}. total_bits_read: {}, peek: {:08b}", stringify!(#ident), #ident, br.total_bits_read(), br.peek(8));
+                };
+                quote! {
+                    let #ident = {
+                        let cfg = #cfg;
+                        type NS = <#ty as UnconditionalCoder<#cfg_ty>>::Nonserialized;
+                        let nonserialized = NS { #(#nonserialized_inits),* };
+                        <#ty>::read_unconditional(&cfg, br, &nonserialized)?
+                    };
+                    #trc
+                }
+            }
+            FieldKind::Conditional(condition, coder) => {
+                let cfg_ty = coder.ty();
+                let cfg = coder.config(all_default_field);
+                let cnd = condition.get_expr(all_default_field).unwrap();
+                let pretty_cnd = condition.get_pretty(all_default_field);
+                let trc = quote! {
+                    crate::util::tracing_wrappers::trace!("{} is {}, setting {} to {:?}. total_bits_read: {}, peek {:08b}", #pretty_cnd, #cnd, stringify!(#ident), #ident, br.total_bits_read(), br.peek(8));
+                };
+                quote! {
+                    let #ident = {
+                        let cond = #cnd;
+                        let cfg = #cfg;
+                        type NS = <#ty as ConditionalCoder<#cfg_ty>>::Nonserialized;
+                        let nonserialized = NS { #(#nonserialized_inits),* };
+                        <#ty>::read_conditional(&cfg, cond, br, &nonserialized)?
+                    };
+                    #trc
+                }
+            }
+            FieldKind::Defaulted(condition, coder) => {
+                let cfg_ty = coder.ty();
+                let cfg = coder.config(all_default_field);
+                let cnd = condition.get_expr(all_default_field).unwrap();
+                let pretty_cnd = condition.get_pretty(all_default_field);
+                let default = &self.default;
+                let trc = quote! {
+                    crate::util::tracing_wrappers::trace!("{} is {}, setting {} to {:?}. total_bits_read: {}, peek {:08b}", #pretty_cnd, #cnd, stringify!(#ident), #ident, br.total_bits_read(), br.peek(8));
+                };
+
+                let (read_fn, default) = if let Some(def) = &self.default_element {
+                    (quote! { read_defaulted_element }, Some(def))
+                } else {
+                    (quote! { read_defaulted }, default.as_ref())
+                };
+
+                quote! {
+                    let #ident = {
+                        let cond = #cnd;
+                        let cfg = #cfg;
+                        type NS = <#ty as DefaultedCoder<#cfg_ty>>::Nonserialized;
+                        let field_nonserialized = NS { #(#nonserialized_inits),* };
+                        let default = #default;
+                        <#ty>::#read_fn(&cfg, cond, default, br, &field_nonserialized)?
+                    };
+                    #trc
+                }
+            }
+        }
+    }
+
+    // Produces default code.
+    fn default_code(&self) -> TokenStream2 {
+        let ident = &self.name;
+        let ty = &self.ty;
+        let nonserialized_inits = &self.nonserialized_inits;
+        let default = &self.default;
+        match &self.kind {
+            FieldKind::Defaulted(_, coder) => {
+                let cfg_ty = coder.ty();
+                let default = &self.default;
+
+                quote! {
+                    let #ident = {
+                        type NS = <#ty as DefaultedCoder<#cfg_ty>>::Nonserialized;
+                        let field_nonserialized = NS { #(#nonserialized_inits),* };
+                        #default
+                    };
+                }
+            }
+            _ => quote! { let #ident = #default; },
+        }
+    }
+}
+
+fn derive_struct(input: &DeriveInput) -> TokenStream2 {
+    let name = &input.ident;
+
+    let validate = input.attrs.iter().any(|a| a.path().is_ident("validate"));
+    let nonserialized: Vec<_> = input
+        .attrs
+        .iter()
+        .filter_map(|a| {
+            if a.path().is_ident("nonserialized") {
+                Some(a.parse_args::<syn::Expr>().unwrap())
+            } else {
+                None
+            }
+        })
+        .collect();
+    if nonserialized.len() > 1 {
+        abort!(input, "repeated nonserialized");
+    }
+    let nonserialized = if nonserialized.is_empty() {
+        quote! {Empty}
+    } else {
+        let v = &nonserialized[0];
+        quote! {#v}
+    };
+
+    let data = if let syn::Data::Struct(struct_data) = &input.data {
+        struct_data
+    } else {
+        abort!(input, "derive_struct didn't get a struct");
+    };
+
+    let fields = if let syn::Fields::Named(syn::FieldsNamed {
+        brace_token: _,
+        named,
+    }) = &data.fields
+    {
+        named
+    } else {
+        abort!(data.fields, "only named fields are supported (for now?)");
+    };
+
+    let mut all_default_field = None;
+
+    let fields: Vec<_> = fields
+        .iter()
+        .enumerate()
+        .map(|(n, f)| Field::parse(f, n, &mut all_default_field))
+        .collect();
+    let fields_read = fields.iter().map(|x| x.read_fun(&all_default_field));
+    let fields_names = fields.iter().map(|x| &x.name);
+
+    let impl_default = if fields.iter().all(|x| x.default.is_some()) {
+        let field_init = fields.iter().map(Field::default_code);
+        let struct_init = fields.iter().map(|f| {
+            let ident = &f.name;
+            quote! { #ident }
+        });
+        quote! {
+            impl #name {
+                pub fn default(nonserialized: &#nonserialized) -> #name {
+                    #(#field_init)*
+                    #name {
+                        #(#struct_init),*
+                    }
+                }
+            }
+
+        }
+    } else {
+        quote! {}
+    };
+
+    let impl_validate = if validate {
+        quote! { return_value.check(nonserialized)?; }
+    } else {
+        quote! {}
+    };
+
+    let align = match input.attrs.iter().any(|a| a.path().is_ident("aligned")) {
+        true => quote! { br.jump_to_byte_boundary()?; },
+        false => quote! {},
+    };
+
+    quote! {
+        #impl_default
+        impl crate::headers::encodings::UnconditionalCoder<()> for #name {
+            type Nonserialized = #nonserialized;
+            #[cold]
+            #[inline(never)]
+            fn read_unconditional(_: &(), br: &mut BitReader, nonserialized: &Self::Nonserialized) -> Result<#name, Error> {
+                use crate::headers::encodings::UnconditionalCoder;
+                use crate::headers::encodings::ConditionalCoder;
+                use crate::headers::encodings::DefaultedCoder;
+                use crate::headers::encodings::DefaultedElementCoder;
+                #align
+                #(#fields_read)*
+                let return_value = #name {
+                    #(#fields_names),*
+                };
+                #impl_validate
+                Ok(return_value)
+            }
+        }
+    }
+}
+
+fn derive_enum(input: &DeriveInput) -> TokenStream2 {
+    let name = &input.ident;
+    quote! {
+        impl crate::headers::encodings::UnconditionalCoder<U32Coder> for #name {
+            type Nonserialized = Empty;
+            fn read_unconditional(config: &U32Coder, br: &mut BitReader, _: &Empty) -> Result<#name, Error> {
+                use num_traits::FromPrimitive;
+                let u = u32::read_unconditional(config, br, &Empty{})?;
+                if let Some(e) =  #name::from_u32(u) {
+                    Ok(e)
+                } else {
+                    Err(Error::InvalidEnum(u, stringify!(#name).to_string()))
+                }
+            }
+        }
+        impl crate::headers::encodings::UnconditionalCoder<()> for #name {
+            type Nonserialized = Empty;
+            fn read_unconditional(config: &(), br: &mut BitReader, nonserialized: &Empty) -> Result<#name, Error> {
+                #name::read_unconditional(
+                    &U32Coder::Select(
+                        U32::Val(0), U32::Val(1),
+                        U32::BitsOffset{n: 4, off: 2},
+                        U32::BitsOffset{n: 6, off: 18}), br, nonserialized)
+            }
+        }
+    }
+}
+
+#[proc_macro_derive(
+    UnconditionalCoder,
+    attributes(
+        coder,
+        condition,
+        default,
+        default_element,
+        all_default,
+        select_coder,
+        coder_true,
+        coder_false,
+        validate,
+        size_coder,
+        nonserialized,
+        aligned,
+    )
+)]
+pub fn derive_jxl_headers(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+
+    match &input.data {
+        syn::Data::Struct(_) => derive_struct(&input).into(),
+        syn::Data::Enum(_) => derive_enum(&input).into(),
+        _ => abort!(input, "Only implemented for struct"),
+    }
+}
+
+#[proc_macro_attribute]
+pub fn noop(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    item
+}
+
+#[cfg(feature = "test")]
+#[proc_macro]
+pub fn for_each_test_file(input: TokenStream) -> TokenStream {
+    use std::{fs, path::Path};
+    use syn::Ident;
+
+    let fn_name = parse_macro_input!(input as Ident);
+    let root_test_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("..")
+        .join("zenjxl-decoder")
+        .join("resources")
+        .join("test");
+    let conformance_test_dir = root_test_dir.join("conformance_test_images");
+
+    let mut tests = vec![];
+
+    for test_dir in [root_test_dir, conformance_test_dir] {
+        for entry in fs::read_dir(&test_dir).unwrap() {
+            let entry = entry.unwrap();
+            let path = entry.path();
+            if path.extension().is_some_and(|ext| ext == "jxl") {
+                let pathname = path.to_string_lossy();
+                let relative_path = path
+                    .strip_prefix(&test_dir)
+                    .unwrap()
+                    .to_string_lossy()
+                    .replace('/', "_slash_");
+                let test_name = format!(
+                    "{}_{}",
+                    fn_name,
+                    relative_path.strip_suffix(".jxl").unwrap()
+                );
+                let test_name = Ident::new(&test_name, fn_name.span());
+
+                // Large images (>1 MB compressed) decode to 100+ MB and
+                // exhaust the ~3 GB usable address space on 32-bit targets
+                // when multiple tests run in the same process.
+                let file_size = fs::metadata(&path).map(|m| m.len()).unwrap_or(0);
+                let large_image = file_size > 1_000_000;
+
+                if large_image {
+                    tests.push(quote! {
+                        #[test]
+                        #[cfg(target_pointer_width = "64")]
+                        fn #test_name() {
+                            #fn_name(&Path::new(#pathname)).unwrap()
+                        }
+                    });
+                } else {
+                    tests.push(quote! {
+                        #[test]
+                        fn #test_name() {
+                            #fn_name(&Path::new(#pathname)).unwrap()
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    quote! {
+        #(#tests)*
+    }
+    .into()
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/.cargo_vcs_info.json b/crates/exav-viewer/vendor/zenjxl-decoder/.cargo_vcs_info.json
new file mode 100644
index 00000000..8038cfe5
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/.cargo_vcs_info.json
@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "c6eca6420558f354f846c3f788ae2fece75e0d68"
+  },
+  "path_in_vcs": "zenjxl-decoder"
+}
\ No newline at end of file
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/Cargo.lock b/crates/exav-viewer/vendor/zenjxl-decoder/Cargo.lock
new file mode 100644
index 00000000..0759e438
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/Cargo.lock
@@ -0,0 +1,1815 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aligned-vec"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "alloca"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "almost-enough"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c8f3e651142e773f3eab1b8314ade013d5a3eef6dc2cd2af6dad9b0ede58f23"
+dependencies = [
+ "enough",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+
+[[package]]
+name = "arbtest"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a3be567977128c0f71ad1462d9624ccda712193d124e944252f0c5789a06d46"
+dependencies = [
+ "arbitrary",
+]
+
+[[package]]
+name = "archmage"
+version = "0.9.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "906d90739870dc217c19bac4b3d11541817679e875bc3ae03e66458f44ccac6b"
+dependencies = [
+ "archmage-macros",
+ "safe_unaligned_simd",
+]
+
+[[package]]
+name = "archmage-macros"
+version = "0.9.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2377968d27d15b6e6117b60026a12a76de7e79a40e1ac664158e2bc562d6d95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
+[[package]]
+name = "atomic_refcell"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "bitflags"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+
+[[package]]
+name = "brotli"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cc"
+version = "1.2.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "rand_core",
+]
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "criterion"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3"
+dependencies = [
+ "alloca",
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "itertools",
+ "num-traits",
+ "oorandom",
+ "page_size",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "enough"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521236efef7dcf4a95af2976e34b5b10780e8747eb78fa4742aa65b2ee189222"
+
+[[package]]
+name = "env_filter"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "log",
+]
+
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "fs4"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8640e34b88f7652208ce9e88b1a37a2ae95227d84abec377ccd3c5cfeb141ed4"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "rand_core",
+ "wasip2",
+ "wasip3",
+]
+
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "indexmap"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.1",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "js-sys"
+version = "0.3.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "libc"
+version = "0.2.184"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
+[[package]]
+name = "ntapi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
+[[package]]
+name = "oorandom"
+version = "11.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+
+[[package]]
+name = "page_size"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "plotters"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pxfm"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e6af7f3e25ded52c41df4e0b1af2d047e45896c2f3281792ed68a1c243daedb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+
+[[package]]
+name = "rand_xorshift"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rayon"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "safe_unaligned_simd"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9c874fb993656d484725d58fbfddb39dfcf98ebcadc1a1d09568aa6b39bafba"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.38.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
+dependencies = [
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "test-log"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d53ac171c92a39e4769491c4b4dde7022c60042254b5fc044ae409d34a24d4"
+dependencies = [
+ "env_logger",
+ "test-log-macros",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "test-log-macros"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be35209fd0781c5401458ab66e4f98accf63553e8fae7425503e92fdd319783b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
+ "sharded-slab",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core",
+ "windows-link",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "zenbench"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c270931cc788ca2d9a58e22042de041df91e051f4c57858ebae98e637cd666e4"
+dependencies = [
+ "clap",
+ "fs4",
+ "serde",
+ "serde_json",
+ "sysinfo",
+ "terminal_size",
+]
+
+[[package]]
+name = "zenjxl-decoder"
+version = "0.3.10"
+dependencies = [
+ "aligned-vec",
+ "almost-enough",
+ "arbtest",
+ "array-init",
+ "atomic_refcell",
+ "brotli",
+ "bytemuck",
+ "byteorder",
+ "criterion",
+ "enough",
+ "moxcms",
+ "num-derive",
+ "num-traits",
+ "paste",
+ "png",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "rayon",
+ "serde_json",
+ "smallvec",
+ "test-log",
+ "thiserror",
+ "tracing",
+ "zenbench",
+ "zenjxl-decoder-macros",
+ "zenjxl-decoder-simd",
+ "zenutils-fuzz",
+]
+
+[[package]]
+name = "zenjxl-decoder-macros"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d5f705a56b0a01d283503fbe7d5e3b3e51d7321b5f1bba7b07bdeea7e2c6f3d"
+dependencies = [
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zenjxl-decoder-simd"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237f3740d3d098854c6008515cdff29d8cbadcb6b4e3a1582e28dd3a04e3213e"
+dependencies = [
+ "archmage",
+ "paste",
+]
+
+[[package]]
+name = "zenutils-fuzz"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b899d74803c7deaca2fdc1345ef9c04b5d5a09a61acce0223805c66c5bc7c7"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/Cargo.toml b/crates/exav-viewer/vendor/zenjxl-decoder/Cargo.toml
new file mode 100644
index 00000000..902bdb7d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/Cargo.toml
@@ -0,0 +1,180 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2024"
+rust-version = "1.89"
+name = "zenjxl-decoder"
+version = "0.3.10"
+authors = [
+    "Luca Versari <veluca93@gmail.com>",
+    "Lilith River <lilith@imazen.io>",
+]
+build = false
+include = [
+    "/src/**",
+    "/tests/**",
+    "/benches/**",
+    "/LICENSE*",
+]
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
+description = "High performance Rust implementation of a JPEG XL decoder"
+readme = "README.md"
+keywords = [
+    "jpeg-xl",
+    "decoder",
+]
+categories = ["multimedia::images"]
+license = "BSD-3-Clause"
+repository = "https://github.com/imazen/zenjxl-decoder"
+resolver = "2"
+
+[features]
+all-simd = [
+    "jxl_simd/all-simd",
+    "sse42",
+    "avx",
+    "avx512",
+    "neon",
+    "wasm128",
+]
+allow-unsafe = []
+avx = ["jxl_simd/avx"]
+avx512 = ["jxl_simd/avx512"]
+cms = ["moxcms"]
+default = ["all-simd"]
+jpeg = ["dep:brotli"]
+neon = ["jxl_simd/neon"]
+profiling = []
+sse42 = ["jxl_simd/sse42"]
+threads = ["rayon"]
+wasm128 = ["jxl_simd/wasm128"]
+
+[lib]
+name = "zenjxl_decoder"
+path = "src/lib.rs"
+
+[dependencies.aligned-vec]
+version = "0.6"
+
+[dependencies.array-init]
+version = "2.0.0"
+
+[dependencies.atomic_refcell]
+version = "0.1"
+
+[dependencies.brotli]
+version = "8.0"
+features = ["std"]
+optional = true
+default-features = false
+
+[dependencies.bytemuck]
+version = "1"
+features = ["derive"]
+
+[dependencies.byteorder]
+version = "1.4.3"
+
+[dependencies.enough]
+version = "0.4"
+features = ["std"]
+
+[dependencies.jxl_macros]
+version = "=0.3.9"
+package = "zenjxl-decoder-macros"
+
+[dependencies.jxl_simd]
+version = "=0.3.9"
+package = "zenjxl-decoder-simd"
+
+[dependencies.moxcms]
+version = "0.8.1"
+features = [
+    "extended_range",
+    "options",
+]
+optional = true
+
+[dependencies.num-derive]
+version = "0.4"
+
+[dependencies.num-traits]
+version = "0.2.14"
+
+[dependencies.paste]
+version = "1"
+
+[dependencies.rayon]
+version = "1.10"
+optional = true
+
+[dependencies.smallvec]
+version = "1"
+
+[dependencies.thiserror]
+version = "2.0"
+
+[dependencies.tracing]
+version = "0.1.40"
+optional = true
+
+[dev-dependencies.almost-enough]
+version = "0.4"
+features = ["std"]
+
+[dev-dependencies.arbtest]
+version = "0.3.2"
+
+[dev-dependencies.criterion]
+version = "0.8.2"
+features = ["html_reports"]
+
+[dev-dependencies.jxl_macros]
+version = "=0.3.9"
+features = ["test"]
+package = "zenjxl-decoder-macros"
+
+[dev-dependencies.png]
+version = "0.18.1"
+
+[dev-dependencies.rand]
+version = "0.10.1"
+
+[dev-dependencies.rand_chacha]
+version = "0.10.0"
+
+[dev-dependencies.rand_xorshift]
+version = "0.5.0"
+
+[dev-dependencies.serde_json]
+version = "1.0"
+
+[dev-dependencies.test-log]
+version = "0.2.16"
+features = ["trace"]
+
+[dev-dependencies.zenbench]
+version = "0.1.2"
+
+[dev-dependencies.zenutils-fuzz]
+version = "0.1.0"
+
+[lints.clippy]
+missing_safety_doc = "deny"
+undocumented_unsafe_blocks = "deny"
+
+[lints.rust]
+unsafe_op_in_unsafe_fn = "deny"
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/EXAV.md b/crates/exav-viewer/vendor/zenjxl-decoder/EXAV.md
new file mode 100644
index 00000000..d1ff3854
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/EXAV.md
@@ -0,0 +1,21 @@
+# zenjxl-decoder as exav ships it
+
+Version 0.3.10 of [zenjxl-decoder](https://crates.io/crates/zenjxl-decoder)
+(BSD-3-Clause, `LICENSE` beside this file), itself a fork of the libjxl team's
+[jxl-rs](https://github.com/libjxl/jxl-rs). Used by `@exav/viewer`'s image
+module, through `[patch.crates-io]` in `../../Cargo.toml`; nothing else of
+exav builds this copy.
+
+What differs from the published crate:
+
+- `src/util/clock.rs` is new, and the decoder takes its `Instant` from it
+  (`src/api/inner/codestream_parser/sections.rs`, `src/frame/decode.rs`,
+  `src/frame/render.rs`). `std::time::Instant::now()` panics on
+  `wasm32-unknown-unknown`, and the decoder called it for every frame whether
+  or not phase timing (`JXL_PHASE_TIMING`) was asked for. On that target the
+  clock reads zero; everywhere else it is `std`'s.
+- `tests/`, `benches/` and `src/tests/` are left out, and their targets
+  removed from `Cargo.toml`.
+
+Nothing else is changed. The crate is `forbid(unsafe_code)` unless its
+`allow-unsafe` feature is on, which exav does not turn on.
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/LICENSE b/crates/exav-viewer/vendor/zenjxl-decoder/LICENSE
new file mode 100644
index 00000000..c66034b1
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) the JPEG XL Project Authors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/README.md b/crates/exav-viewer/vendor/zenjxl-decoder/README.md
new file mode 100644
index 00000000..67e5bc07
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/README.md
@@ -0,0 +1,247 @@
+# zenjxl-decoder [![CI](https://img.shields.io/github/actions/workflow/status/imazen/zenjxl-decoder/ci.yml?branch=main&style=flat-square&label=CI)](https://github.com/imazen/zenjxl-decoder/actions/workflows/ci.yml) [![crates.io](https://img.shields.io/crates/v/zenjxl-decoder?style=flat-square)](https://crates.io/crates/zenjxl-decoder) [![docs.rs](https://img.shields.io/docsrs/zenjxl-decoder?style=flat-square)](https://docs.rs/zenjxl-decoder) [![MSRV](https://img.shields.io/badge/MSRV-1.89-blue?style=flat-square)](https://doc.rust-lang.org/cargo/reference/manifest.html#the-rust-version-field) [![license](https://img.shields.io/crates/l/zenjxl-decoder?style=flat-square)](https://github.com/imazen/zenjxl-decoder#license)
+
+A JPEG XL decoder in safe Rust. Fork of [libjxl/jxl-rs](https://github.com/libjxl/jxl-rs) with security hardening, bug fixes, and parallel decoding.
+
+Maintained by [Lilith River](https://github.com/lilith) at [Imazen](https://github.com/imazen).
+
+```toml
+[dependencies]
+zenjxl-decoder = "0.3"
+```
+
+The Rust lib name is `jxl`, so you `use jxl::...` in code.
+
+If you find a conformant JXL file that decodes incorrectly (or not at all), [open an issue](https://github.com/imazen/zenjxl-decoder/issues/new).
+
+## What's different from upstream
+
+This fork fixes several decoding bugs, adds resource limits and cooperative cancellation, and wires up parallel decoding via rayon. All changes are BSD-3-Clause licensed under the Google CLA, intended for upstream contribution.
+
+### Bug Fixes
+
+| Bug | Description |
+|-----|-------------|
+| sRGB Transfer Function | Apply sRGB TF by default for XYB-encoded images (was outputting linear) |
+| RCT Overflow Panic | Wrapping arithmetic to prevent panic on edge-case pixel values |
+| Extra Channel Format Slots | Allocate format slots for all extra channels, not just first |
+| Progressive AC Validation | Fix inverted `last_pass` validation (must be strictly increasing) |
+| Extra Channel Bit Depth | Use extra channel's own `bit_depth` for modular-to-f32 conversion |
+| Noise Seeding (upsampling > 1) | Separate RNG seeds per subregion for upsampled frames |
+| CMYK Blending Order | Blend in CMYK space, then CMS-convert to RGB |
+
+### New Features
+
+| Feature | Description |
+|---------|-------------|
+| CMS-based CMYK to RGB | ICC profile-based CMYK conversion via optional `moxcms` backend |
+| Cooperative cancellation | `enough::Stop` trait — cancel or timeout decoding from any thread |
+| Resource limits | `JxlDecoderLimits` API — cap pixels, memory, ICC size, tree size, etc. |
+| Memory tracking | `max_memory_bytes` budget with atomic, lock-free tracking |
+| Fallible allocation | All significant allocations return `TryReserveError` instead of panicking |
+| Parallel decoding | Rayon-based parallel group decode and render (opt-in via `threads` feature) |
+
+## Usage
+
+### Basic decode
+
+```rust
+use jxl::api::{JxlDecoder, JxlDecoderOptions};
+
+let data = std::fs::read("image.jxl")?;
+let mut decoder = JxlDecoder::new(&data, JxlDecoderOptions::default());
+// ... process frames
+```
+
+### Resource limits
+
+```rust
+use jxl::api::{JxlDecoderLimits, JxlDecoderOptions};
+
+// For untrusted input
+let options = JxlDecoderOptions {
+    limits: JxlDecoderLimits::restrictive(),
+    ..Default::default()
+};
+```
+
+| Limit | Default | Restrictive |
+|-------|---------|-------------|
+| `max_pixels` | 2^30 (~1B) | 100M |
+| `max_extra_channels` | 256 | 16 |
+| `max_icc_size` | 256 MB | 1 MB |
+| `max_tree_size` | 4M nodes | 1M nodes |
+| `max_patches` | (derived) | 64K |
+| `max_spline_points` | 1M | 64K |
+| `max_reference_frames` | 4 | 2 |
+| `max_memory_bytes` | None | 1 GB |
+
+All limits return `Error::LimitExceeded { resource, actual, limit }` when exceeded.
+
+### Cancellation
+
+The decoder accepts any [`enough::Stop`](https://docs.rs/enough) implementation:
+
+```rust
+use almost_enough::Stopper;
+use std::sync::Arc;
+
+let stop = Arc::new(Stopper::new());
+let stop_clone = Arc::clone(&stop);
+
+// Cancel from another thread
+std::thread::spawn(move || {
+    std::thread::sleep(std::time::Duration::from_secs(5));
+    stop_clone.cancel();
+});
+
+let options = JxlDecoderOptions {
+    stop,
+    ..Default::default()
+};
+```
+
+Cancellation checks run inside parallel closures too, so a cancel request is noticed mid-batch.
+
+### Parallel decoding
+
+Enable the `threads` feature (on by default in `jxl_cli`):
+
+```toml
+[dependencies]
+zenjxl-decoder = { version = "0.3", features = ["threads"] }
+```
+
+Set `parallel: false` on `JxlDecoderOptions` to force single-threaded mode at runtime.
+
+## Features
+
+| Feature | Description |
+|---------|-------------|
+| `threads` | Rayon-based parallel group decode and render |
+| `cms` | moxcms CMS backend for ICC profile transforms |
+| `jpeg` | JPEG reconstruction from JXL containers |
+| `all-simd` | All SIMD backends (SSE4.2, AVX2, AVX-512, NEON, WASM128) |
+| `sse42` / `avx` / `avx512` / `neon` / `wasm128` | Individual SIMD targets |
+| `allow-unsafe` | Enable `unsafe` fast paths in the main crate (safe fallbacks used otherwise) |
+
+## Conformance
+
+Against [libjxl/conformance](https://github.com/libjxl/conformance) test suite (Level 5): **17/23 passing** (74%, as of December 2025).
+
+```bash
+cargo test --features cms conformance -- --ignored --nocapture
+```
+
+| Status | Tests |
+|--------|-------|
+| Pass | alpha_nonpremultiplied, alpha_triangles, bench_oriented_brg_5, bicycles, blendmodes_5, cafe_5, delta_palette, grayscale_5, grayscale_jpeg_5, grayscale_public_university, lz77_flower, noise_5, opsin_inverse_5, patches_5, patches_lossless, sunset_logo, upsampling_5 |
+| Skip | animation_icos4d_5, animation_newtons_cradle, animation_spline_5 (animation rendering not yet supported; animation metadata parsing is available via `JxlImageInfo::animation`) |
+| Fail | bike_5, progressive_5 (out-of-gamut/HDR values), spot (6-channel output not yet supported) |
+
+Against codec-corpus (184 JXL files with djxl reference output): **184/184 passing** (100%, as of December 2025).
+
+## Upstream Contributions
+
+Bug fixes reported to [libjxl/jxl-rs](https://github.com/libjxl/jxl-rs):
+
+| # | Type | Status | Description |
+|---|------|--------|-------------|
+| [#607](https://github.com/libjxl/jxl-rs/pull/607) | PR | Merged | ICC tag parsing overflow fix |
+| [#637](https://github.com/libjxl/jxl-rs/pull/637) | PR | Merged | Extra channel bit_depth fix (from our [#604](https://github.com/libjxl/jxl-rs/pull/604)) |
+| [#632](https://github.com/libjxl/jxl-rs/pull/632) | PR | Merged | RCT wrapping arithmetic (from our [#603](https://github.com/libjxl/jxl-rs/pull/603)) |
+| [#609](https://github.com/libjxl/jxl-rs/issues/609) | Issue | Fixed | Progressive AC last_pass validation bug |
+| [#610](https://github.com/libjxl/jxl-rs/issues/610) | Issue | Fixed | Noise seeding wrong when upsampling > 1 |
+| [#660](https://github.com/libjxl/jxl-rs/pull/660) | PR | Open | Conformance test infrastructure |
+| [#602](https://github.com/libjxl/jxl-rs/pull/602) | PR | Closed | Integer overflow handling (ICC part merged as #607; rest declined) |
+
+## Sister project
+
+[jxl-encoder](https://github.com/imazen/jxl-encoder) — a multithreaded JPEG XL encoder in Rust, also by Imazen.
+
+## Image tech I maintain
+
+| | |
+|:--|:--|
+| State of the art codecs* | [zenjpeg] · [zenpng] · [zenwebp] · [zengif] · [zenavif] ([rav1d-safe] · [zenrav1e] · [zenavif-parse] · [zenavif-serialize]) · [zenjxl] ([jxl-encoder] · **zenjxl-decoder**) · [zentiff] · [zenbitmaps] · [heic] · [zenraw] · [zenpdf] · [ultrahdr] · [mozjpeg-rs] · [webpx] |
+| Compression | [zenflate] · [zenzop] |
+| Processing | [zenresize] · [zenfilters] · [zenquant] · [zenblend] |
+| Metrics | [zensim] · [fast-ssim2] · [butteraugli] · [resamplescope-rs] · [codec-eval] · [codec-corpus] |
+| Pixel types & color | [zenpixels] · [zenpixels-convert] · [linear-srgb] · [garb] |
+| Pipeline | [zenpipe] · [zencodec] · [zencodecs] · [zenlayout] · [zennode] |
+| ImageResizer | [ImageResizer] (C#) — 24M+ NuGet downloads across all packages |
+| [Imageflow][] | Image optimization engine (Rust) — [.NET][imageflow-dotnet] · [node][imageflow-node] · [go][imageflow-go] — 9M+ NuGet downloads across all packages |
+| [Imageflow Server][] | [The fast, safe image server](https://www.imazen.io/) (Rust+C#) — 552K+ NuGet downloads, deployed by Fortune 500s and major brands |
+
+<sub>* as of 2026</sub>
+
+### General Rust awesomeness
+
+[archmage] · [magetypes] · [enough] · [whereat] · [zenbench] · [cargo-copter]
+
+[And other projects](https://www.imazen.io/open-source) · [GitHub @imazen](https://github.com/imazen) · [GitHub @lilith](https://github.com/lilith) · [lib.rs/~lilith](https://lib.rs/~lilith) · [NuGet](https://www.nuget.org/profiles/imazen) (over 30 million downloads / 87 packages)
+
+## License
+
+BSD-3-Clause. See [LICENSE](LICENSE).
+
+
+
+### Upstream Contribution
+
+This is a fork of [libjxl/jxl-rs](https://github.com/libjxl/jxl-rs) (BSD-3-Clause).
+We are willing to release our improvements under the original BSD-3-Clause
+license if upstream takes over maintenance of those improvements. We'd rather
+contribute back than maintain a parallel codebase. Open an issue or reach out.
+
+[zenjpeg]: https://github.com/imazen/zenjpeg
+[zenpng]: https://github.com/imazen/zenpng
+[zenwebp]: https://github.com/imazen/zenwebp
+[zengif]: https://github.com/imazen/zengif
+[zenavif]: https://github.com/imazen/zenavif
+[zenjxl]: https://github.com/imazen/zenjxl
+[zentiff]: https://github.com/imazen/zentiff
+[zenbitmaps]: https://github.com/imazen/zenbitmaps
+[heic]: https://github.com/imazen/heic-decoder-rs
+[zenraw]: https://github.com/imazen/zenraw
+[zenpdf]: https://github.com/imazen/zenpdf
+[ultrahdr]: https://github.com/imazen/ultrahdr
+[jxl-encoder]: https://github.com/imazen/jxl-encoder
+[rav1d-safe]: https://github.com/imazen/rav1d-safe
+[zenrav1e]: https://github.com/imazen/zenrav1e
+[mozjpeg-rs]: https://github.com/imazen/mozjpeg-rs
+[zenavif-parse]: https://github.com/imazen/zenavif-parse
+[zenavif-serialize]: https://github.com/imazen/zenavif-serialize
+[webpx]: https://github.com/imazen/webpx
+[zenflate]: https://github.com/imazen/zenflate
+[zenzop]: https://github.com/imazen/zenzop
+[zenresize]: https://github.com/imazen/zenresize
+[zenfilters]: https://github.com/imazen/zenfilters
+[zenquant]: https://github.com/imazen/zenquant
+[zenblend]: https://github.com/imazen/zenblend
+[zensim]: https://github.com/imazen/zensim
+[fast-ssim2]: https://github.com/imazen/fast-ssim2
+[butteraugli]: https://github.com/imazen/butteraugli
+[zenpixels]: https://github.com/imazen/zenpixels
+[zenpixels-convert]: https://github.com/imazen/zenpixels
+[linear-srgb]: https://github.com/imazen/linear-srgb
+[garb]: https://github.com/imazen/garb
+[zenpipe]: https://github.com/imazen/zenpipe
+[zencodec]: https://github.com/imazen/zencodec
+[zencodecs]: https://github.com/imazen/zencodecs
+[zenlayout]: https://github.com/imazen/zenlayout
+[zennode]: https://github.com/imazen/zennode
+[Imageflow]: https://github.com/imazen/imageflow
+[Imageflow Server]: https://github.com/imazen/imageflow-server
+[imageflow-dotnet]: https://github.com/imazen/imageflow-dotnet
+[imageflow-node]: https://github.com/imazen/imageflow-node
+[imageflow-go]: https://github.com/imazen/imageflow-go
+[ImageResizer]: https://github.com/imazen/resizer
+[archmage]: https://github.com/imazen/archmage
+[magetypes]: https://github.com/imazen/archmage
+[enough]: https://github.com/imazen/enough
+[whereat]: https://github.com/lilith/whereat
+[zenbench]: https://github.com/imazen/zenbench
+[cargo-copter]: https://github.com/imazen/cargo-copter
+[resamplescope-rs]: https://github.com/imazen/resamplescope-rs
+[codec-eval]: https://github.com/imazen/codec-eval
+[codec-corpus]: https://github.com/imazen/codec-corpus
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/color.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/color.rs
new file mode 100644
index 00000000..20ac643d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/color.rs
@@ -0,0 +1,2799 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{borrow::Cow, fmt};
+
+use crate::{
+    color::tf::{hlg_to_scene, linear_to_pq_precise, pq_to_linear_precise},
+    error::{Error, Result},
+    headers::color_encoding::{
+        ColorEncoding, ColorSpace, Primaries, RenderingIntent, TransferFunction, WhitePoint,
+    },
+    util::{Matrix3x3, Vector3, inv_3x3_matrix, mul_3x3_matrix, mul_3x3_vector},
+};
+
+// Bradford matrices for chromatic adaptation
+const K_BRADFORD: Matrix3x3<f64> = [
+    [0.8951, 0.2664, -0.1614],
+    [-0.7502, 1.7135, 0.0367],
+    [0.0389, -0.0685, 1.0296],
+];
+
+const K_BRADFORD_INV: Matrix3x3<f64> = [
+    [0.9869929, -0.1470543, 0.1599627],
+    [0.4323053, 0.5183603, 0.0492912],
+    [-0.0085287, 0.0400428, 0.9684867],
+];
+
+pub fn compute_md5(data: &[u8]) -> [u8; 16] {
+    let mut sum = [0u8; 16];
+    let mut data64 = data.to_vec();
+    data64.push(128);
+
+    // Add bytes such that ((size + 8) & 63) == 0
+    let extra = (64 - ((data64.len() + 8) & 63)) & 63;
+    data64.resize(data64.len() + extra, 0);
+
+    // Append length in bits as 64-bit little-endian
+    let bit_len = (data.len() as u64) << 3;
+    for i in (0..64).step_by(8) {
+        data64.push((bit_len >> i) as u8);
+    }
+
+    const SINEPARTS: [u32; 64] = [
+        0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, 0xf57c0faf, 0x4787c62a, 0xa8304613,
+        0xfd469501, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, 0x6b901122, 0xfd987193,
+        0xa679438e, 0x49b40821, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, 0xd62f105d,
+        0x02441453, 0xd8a1e681, 0xe7d3fbc8, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+        0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, 0xfffa3942, 0x8771f681, 0x6d9d6122,
+        0xfde5380c, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, 0x289b7ec6, 0xeaa127fa,
+        0xd4ef3085, 0x04881d05, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, 0xf4292244,
+        0x432aff97, 0xab9423a7, 0xfc93a039, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+        0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb,
+        0xeb86d391,
+    ];
+
+    const SHIFT: [u32; 64] = [
+        7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5,
+        9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10,
+        15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21,
+    ];
+
+    let mut a0: u32 = 0x67452301;
+    let mut b0: u32 = 0xefcdab89;
+    let mut c0: u32 = 0x98badcfe;
+    let mut d0: u32 = 0x10325476;
+
+    for i in (0..data64.len()).step_by(64) {
+        let mut a = a0;
+        let mut b = b0;
+        let mut c = c0;
+        let mut d = d0;
+
+        for j in 0..64 {
+            let (f, g) = if j < 16 {
+                ((b & c) | ((!b) & d), j)
+            } else if j < 32 {
+                ((d & b) | ((!d) & c), (5 * j + 1) & 0xf)
+            } else if j < 48 {
+                (b ^ c ^ d, (3 * j + 5) & 0xf)
+            } else {
+                (c ^ (b | (!d)), (7 * j) & 0xf)
+            };
+
+            let dg0 = data64[i + g * 4] as u32;
+            let dg1 = data64[i + g * 4 + 1] as u32;
+            let dg2 = data64[i + g * 4 + 2] as u32;
+            let dg3 = data64[i + g * 4 + 3] as u32;
+            let u = dg0 | (dg1 << 8) | (dg2 << 16) | (dg3 << 24);
+
+            let f = f.wrapping_add(a).wrapping_add(SINEPARTS[j]).wrapping_add(u);
+            a = d;
+            d = c;
+            c = b;
+            b = b.wrapping_add(f.rotate_left(SHIFT[j]));
+        }
+
+        a0 = a0.wrapping_add(a);
+        b0 = b0.wrapping_add(b);
+        c0 = c0.wrapping_add(c);
+        d0 = d0.wrapping_add(d);
+    }
+
+    sum[0] = a0 as u8;
+    sum[1] = (a0 >> 8) as u8;
+    sum[2] = (a0 >> 16) as u8;
+    sum[3] = (a0 >> 24) as u8;
+    sum[4] = b0 as u8;
+    sum[5] = (b0 >> 8) as u8;
+    sum[6] = (b0 >> 16) as u8;
+    sum[7] = (b0 >> 24) as u8;
+    sum[8] = c0 as u8;
+    sum[9] = (c0 >> 8) as u8;
+    sum[10] = (c0 >> 16) as u8;
+    sum[11] = (c0 >> 24) as u8;
+    sum[12] = d0 as u8;
+    sum[13] = (d0 >> 8) as u8;
+    sum[14] = (d0 >> 16) as u8;
+    sum[15] = (d0 >> 24) as u8;
+    sum
+}
+
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn primaries_to_xyz(
+    rx: f32,
+    ry: f32,
+    gx: f32,
+    gy: f32,
+    bx: f32,
+    by: f32,
+    wx: f32,
+    wy: f32,
+) -> Result<Matrix3x3<f64>, Error> {
+    // Validate white point coordinates
+    if !((0.0..=1.0).contains(&wx) && (wy > 0.0 && wy <= 1.0)) {
+        return Err(Error::IccInvalidWhitePoint(
+            wx,
+            wy,
+            "White point coordinates out of range ([0,1] for x, (0,1] for y)".to_string(),
+        ));
+    }
+    // Comment from libjxl:
+    // TODO(lode): also require rx, ry, gx, gy, bx, to be in range 0-1? ICC
+    // profiles in theory forbid negative XYZ values, but in practice the ACES P0
+    // color space uses a negative y for the blue primary.
+
+    // Construct the primaries matrix P. Its columns are the XYZ coordinates
+    // of the R, G, B primaries (derived from their chromaticities x, y, z=1-x-y).
+    // P = [[xr, xg, xb],
+    //      [yr, yg, yb],
+    //      [zr, zg, zb]]
+    let rz = 1.0 - rx as f64 - ry as f64;
+    let gz = 1.0 - gx as f64 - gy as f64;
+    let bz = 1.0 - bx as f64 - by as f64;
+    let p_matrix = [
+        [rx as f64, gx as f64, bx as f64],
+        [ry as f64, gy as f64, by as f64],
+        [rz, gz, bz],
+    ];
+
+    let p_inv_matrix = inv_3x3_matrix(&p_matrix)?;
+
+    // Convert reference white point (wx, wy) to XYZ form with Y=1
+    // This is WhitePoint_XYZ_wp = [wx/wy, 1, (1-wx-wy)/wy]
+    let x_over_y_wp = wx as f64 / wy as f64;
+    let z_over_y_wp = (1.0 - wx as f64 - wy as f64) / wy as f64;
+
+    if !x_over_y_wp.is_finite() || !z_over_y_wp.is_finite() {
+        return Err(Error::IccInvalidWhitePoint(
+            wx,
+            wy,
+            "Calculated X/Y or Z/Y for white point is not finite.".to_string(),
+        ));
+    }
+    let white_point_xyz_vec: Vector3<f64> = [x_over_y_wp, 1.0, z_over_y_wp];
+
+    // Calculate scaling factors S = [Sr, Sg, Sb] such that P * S = WhitePoint_XYZ_wp
+    // So, S = P_inv * WhitePoint_XYZ_wp
+    let s_vec = mul_3x3_vector(&p_inv_matrix, &white_point_xyz_vec);
+
+    // Construct diagonal matrix S_diag from s_vec
+    let s_diag_matrix = [
+        [s_vec[0], 0.0, 0.0],
+        [0.0, s_vec[1], 0.0],
+        [0.0, 0.0, s_vec[2]],
+    ];
+    // The final RGB-to-XYZ matrix is P * S_diag
+    let result_matrix = mul_3x3_matrix(&p_matrix, &s_diag_matrix);
+
+    Ok(result_matrix)
+}
+
+pub(crate) fn adapt_to_xyz_d50(wx: f32, wy: f32) -> Result<Matrix3x3<f64>, Error> {
+    if !((0.0..=1.0).contains(&wx) && (wy > 0.0 && wy <= 1.0)) {
+        return Err(Error::IccInvalidWhitePoint(
+            wx,
+            wy,
+            "White point coordinates out of range ([0,1] for x, (0,1] for y)".to_string(),
+        ));
+    }
+
+    // Convert white point (wx, wy) to XYZ with Y=1
+    let x_over_y = wx as f64 / wy as f64;
+    let z_over_y = (1.0 - wx as f64 - wy as f64) / wy as f64;
+
+    // Check for finiteness, as 1.0 / tiny float can overflow.
+    if !x_over_y.is_finite() || !z_over_y.is_finite() {
+        return Err(Error::IccInvalidWhitePoint(
+            wx,
+            wy,
+            "Calculated X/Y or Z/Y for white point is not finite.".to_string(),
+        ));
+    }
+    let w: Vector3<f64> = [x_over_y, 1.0, z_over_y];
+
+    // D50 white point in XYZ (Y=1 form)
+    // These are X_D50/Y_D50, 1.0, Z_D50/Y_D50
+    let w50: Vector3<f64> = [0.96422, 1.0, 0.82521];
+
+    // Transform to LMS color space
+    let lms_source = mul_3x3_vector(&K_BRADFORD, &w);
+    let lms_d50 = mul_3x3_vector(&K_BRADFORD, &w50);
+
+    // Check for invalid LMS values which would lead to division by zero
+    if lms_source.contains(&0.0) {
+        return Err(Error::IccInvalidWhitePoint(
+            wx,
+            wy,
+            "LMS components for source white point are zero, leading to division by zero."
+                .to_string(),
+        ));
+    }
+
+    // Create diagonal scaling matrix in LMS space
+    let mut a_diag_matrix: Matrix3x3<f64> = [[0.0; 3]; 3];
+    for i in 0..3 {
+        a_diag_matrix[i][i] = lms_d50[i] / lms_source[i];
+        if !a_diag_matrix[i][i].is_finite() {
+            return Err(Error::IccInvalidWhitePoint(
+                wx,
+                wy,
+                format!("Diagonal adaptation matrix component {i} is not finite."),
+            ));
+        }
+    }
+
+    // Combine transformations
+    let b_matrix = mul_3x3_matrix(&a_diag_matrix, &K_BRADFORD);
+    let final_adaptation_matrix = mul_3x3_matrix(&K_BRADFORD_INV, &b_matrix);
+
+    Ok(final_adaptation_matrix)
+}
+
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn primaries_to_xyz_d50(
+    rx: f32,
+    ry: f32,
+    gx: f32,
+    gy: f32,
+    bx: f32,
+    by: f32,
+    wx: f32,
+    wy: f32,
+) -> Result<Matrix3x3<f64>, Error> {
+    // Get the matrix to convert RGB to XYZ, adapted to its native white point (wx, wy).
+    let rgb_to_xyz_native_wp_matrix = primaries_to_xyz(rx, ry, gx, gy, bx, by, wx, wy)?;
+
+    // Get the chromatic adaptation matrix from the native white point (wx, wy) to D50.
+    let adaptation_to_d50_matrix = adapt_to_xyz_d50(wx, wy)?;
+    // This matrix converts XYZ values relative to white point (wx, wy)
+    // to XYZ values relative to D50.
+
+    // Combine the matrices: M_RGBtoD50XYZ = M_AdaptToD50 * M_RGBtoNativeXYZ
+    // Applying M_RGBtoNativeXYZ first gives XYZ relative to native white point.
+    // Then applying M_AdaptToD50 converts these XYZ values to be relative to D50.
+    let result_matrix = mul_3x3_matrix(&adaptation_to_d50_matrix, &rgb_to_xyz_native_wp_matrix);
+
+    Ok(result_matrix)
+}
+
+#[allow(clippy::too_many_arguments)]
+fn create_icc_rgb_matrix(
+    rx: f32,
+    ry: f32,
+    gx: f32,
+    gy: f32,
+    bx: f32,
+    by: f32,
+    wx: f32,
+    wy: f32,
+) -> Result<Matrix3x3<f32>, Error> {
+    // TODO: think about if we need/want to change precision to f64 for some calculations here
+    let result_f64 = primaries_to_xyz_d50(rx, ry, gx, gy, bx, by, wx, wy)?;
+    Ok(std::array::from_fn(|r_idx| {
+        std::array::from_fn(|c_idx| result_f64[r_idx][c_idx] as f32)
+    }))
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum JxlWhitePoint {
+    D65,
+    E,
+    DCI,
+    Chromaticity { wx: f32, wy: f32 },
+}
+
+impl fmt::Display for JxlWhitePoint {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            JxlWhitePoint::D65 => f.write_str("D65"),
+            JxlWhitePoint::E => f.write_str("EER"),
+            JxlWhitePoint::DCI => f.write_str("DCI"),
+            JxlWhitePoint::Chromaticity { wx, wy } => write!(f, "{wx:.7};{wy:.7}"),
+        }
+    }
+}
+
+impl JxlWhitePoint {
+    pub fn to_xy_coords(&self) -> (f32, f32) {
+        match self {
+            JxlWhitePoint::Chromaticity { wx, wy } => (*wx, *wy),
+            JxlWhitePoint::D65 => (0.3127, 0.3290),
+            JxlWhitePoint::DCI => (0.314, 0.351),
+            JxlWhitePoint::E => (1.0 / 3.0, 1.0 / 3.0),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum JxlPrimaries {
+    SRGB,
+    BT2100,
+    P3,
+    Chromaticities {
+        rx: f32,
+        ry: f32,
+        gx: f32,
+        gy: f32,
+        bx: f32,
+        by: f32,
+    },
+}
+
+impl fmt::Display for JxlPrimaries {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            JxlPrimaries::SRGB => f.write_str("SRG"),
+            JxlPrimaries::BT2100 => f.write_str("202"),
+            JxlPrimaries::P3 => f.write_str("DCI"),
+            JxlPrimaries::Chromaticities {
+                rx,
+                ry,
+                gx,
+                gy,
+                bx,
+                by,
+            } => write!(f, "{rx:.7},{ry:.7};{gx:.7},{gy:.7};{bx:.7},{by:.7}"),
+        }
+    }
+}
+
+impl JxlPrimaries {
+    pub fn to_xy_coords(&self) -> [(f32, f32); 3] {
+        match self {
+            JxlPrimaries::Chromaticities {
+                rx,
+                ry,
+                gx,
+                gy,
+                bx,
+                by,
+            } => [(*rx, *ry), (*gx, *gy), (*bx, *by)],
+            JxlPrimaries::SRGB => [
+                // libjxl has these weird numbers for some reason.
+                (0.639_998_7, 0.330_010_15),
+                //(0.640, 0.330), // R
+                (0.300_003_8, 0.600_003_36),
+                //(0.300, 0.600), // G
+                (0.150_002_05, 0.059_997_204),
+                //(0.150, 0.060), // B
+            ],
+            JxlPrimaries::BT2100 => [
+                (0.708, 0.292), // R
+                (0.170, 0.797), // G
+                (0.131, 0.046), // B
+            ],
+            JxlPrimaries::P3 => [
+                (0.680, 0.320), // R
+                (0.265, 0.690), // G
+                (0.150, 0.060), // B
+            ],
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum JxlTransferFunction {
+    BT709,
+    Linear,
+    SRGB,
+    PQ,
+    DCI,
+    HLG,
+    Gamma(f32),
+}
+
+impl fmt::Display for JxlTransferFunction {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            JxlTransferFunction::BT709 => f.write_str("709"),
+            JxlTransferFunction::Linear => f.write_str("Lin"),
+            JxlTransferFunction::SRGB => f.write_str("SRG"),
+            JxlTransferFunction::PQ => f.write_str("PeQ"),
+            JxlTransferFunction::DCI => f.write_str("DCI"),
+            JxlTransferFunction::HLG => f.write_str("HLG"),
+            JxlTransferFunction::Gamma(g) => write!(f, "g{g:.7}"),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum JxlColorEncoding {
+    RgbColorSpace {
+        white_point: JxlWhitePoint,
+        primaries: JxlPrimaries,
+        transfer_function: JxlTransferFunction,
+        rendering_intent: RenderingIntent,
+    },
+    GrayscaleColorSpace {
+        white_point: JxlWhitePoint,
+        transfer_function: JxlTransferFunction,
+        rendering_intent: RenderingIntent,
+    },
+    XYB {
+        rendering_intent: RenderingIntent,
+    },
+}
+
+impl fmt::Display for JxlColorEncoding {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::RgbColorSpace { .. } => f.write_str("RGB"),
+            Self::GrayscaleColorSpace { .. } => f.write_str("Gra"),
+            Self::XYB { .. } => f.write_str("XYB"),
+        }
+    }
+}
+
+impl JxlColorEncoding {
+    pub fn from_internal(internal: &ColorEncoding) -> Result<Self> {
+        let rendering_intent = internal.rendering_intent;
+        if internal.color_space == ColorSpace::XYB {
+            if rendering_intent != RenderingIntent::Perceptual {
+                return Err(Error::InvalidRenderingIntent);
+            }
+            return Ok(Self::XYB { rendering_intent });
+        }
+
+        let white_point = match internal.white_point {
+            WhitePoint::D65 => JxlWhitePoint::D65,
+            WhitePoint::E => JxlWhitePoint::E,
+            WhitePoint::DCI => JxlWhitePoint::DCI,
+            WhitePoint::Custom => {
+                let (wx, wy) = internal.white.as_f32_coords();
+                JxlWhitePoint::Chromaticity { wx, wy }
+            }
+        };
+        let transfer_function = if internal.tf.have_gamma {
+            JxlTransferFunction::Gamma(internal.tf.gamma())
+        } else {
+            match internal.tf.transfer_function {
+                TransferFunction::BT709 => JxlTransferFunction::BT709,
+                TransferFunction::Linear => JxlTransferFunction::Linear,
+                TransferFunction::SRGB => JxlTransferFunction::SRGB,
+                TransferFunction::PQ => JxlTransferFunction::PQ,
+                TransferFunction::DCI => JxlTransferFunction::DCI,
+                TransferFunction::HLG => JxlTransferFunction::HLG,
+                TransferFunction::Unknown => {
+                    return Err(Error::InvalidColorEncoding);
+                }
+            }
+        };
+
+        if internal.color_space == ColorSpace::Gray {
+            return Ok(Self::GrayscaleColorSpace {
+                white_point,
+                transfer_function,
+                rendering_intent,
+            });
+        }
+
+        let primaries = match internal.primaries {
+            Primaries::SRGB => JxlPrimaries::SRGB,
+            Primaries::BT2100 => JxlPrimaries::BT2100,
+            Primaries::P3 => JxlPrimaries::P3,
+            Primaries::Custom => {
+                let (rx, ry) = internal.custom_primaries[0].as_f32_coords();
+                let (gx, gy) = internal.custom_primaries[1].as_f32_coords();
+                let (bx, by) = internal.custom_primaries[2].as_f32_coords();
+                JxlPrimaries::Chromaticities {
+                    rx,
+                    ry,
+                    gx,
+                    gy,
+                    bx,
+                    by,
+                }
+            }
+        };
+
+        match internal.color_space {
+            ColorSpace::Gray | ColorSpace::XYB => unreachable!(),
+            ColorSpace::RGB => Ok(Self::RgbColorSpace {
+                white_point,
+                primaries,
+                transfer_function,
+                rendering_intent,
+            }),
+            ColorSpace::Unknown => Err(Error::InvalidColorSpace),
+        }
+    }
+
+    fn create_icc_cicp_tag_data(&self, tags_data: &mut Vec<u8>) -> Result<Option<TagInfo>, Error> {
+        let JxlColorEncoding::RgbColorSpace {
+            white_point,
+            primaries,
+            transfer_function,
+            ..
+        } = self
+        else {
+            return Ok(None);
+        };
+
+        // Determine the CICP value for primaries.
+        let primaries_val: u8 = match (white_point, primaries) {
+            (JxlWhitePoint::D65, JxlPrimaries::SRGB) => 1,
+            (JxlWhitePoint::D65, JxlPrimaries::BT2100) => 9,
+            (JxlWhitePoint::D65, JxlPrimaries::P3) => 12,
+            (JxlWhitePoint::DCI, JxlPrimaries::P3) => 11,
+            _ => return Ok(None),
+        };
+
+        let tf_val = match transfer_function {
+            JxlTransferFunction::BT709 => 1,
+            JxlTransferFunction::Linear => 8,
+            JxlTransferFunction::SRGB => 13,
+            JxlTransferFunction::PQ => 16,
+            JxlTransferFunction::DCI => 17,
+            JxlTransferFunction::HLG => 18,
+            // Custom gamma cannot be represented.
+            JxlTransferFunction::Gamma(_) => return Ok(None),
+        };
+
+        let signature = b"cicp";
+        let start_offset = tags_data.len() as u32;
+        tags_data.extend_from_slice(signature);
+        let data_len = tags_data.len();
+        tags_data.resize(tags_data.len() + 4, 0);
+        write_u32_be(tags_data, data_len, 0)?;
+        tags_data.push(primaries_val);
+        tags_data.push(tf_val);
+        // Matrix Coefficients (RGB is non-constant luminance)
+        tags_data.push(0);
+        // Video Full Range Flag
+        tags_data.push(1);
+
+        Ok(Some(TagInfo {
+            signature: *signature,
+            offset_in_tags_blob: start_offset,
+            size_unpadded: 12,
+        }))
+    }
+
+    fn can_tone_map_for_icc(&self) -> bool {
+        let JxlColorEncoding::RgbColorSpace {
+            white_point,
+            primaries,
+            transfer_function,
+            ..
+        } = self
+        else {
+            return false;
+        };
+        // This function determines if an ICC profile can be used for tone mapping.
+        // The logic is ported from the libjxl `CanToneMap` function.
+        // The core idea is that if the color space can be represented by a CICP tag
+        // in the ICC profile, then there's more freedom to use other parts of the
+        // profile (like the A2B0 LUT) for tone mapping. Otherwise, the profile must
+        // unambiguously describe the color space.
+
+        // The conditions for being able to tone map are:
+        // 1. The color space must be RGB.
+        // 2. The transfer function must be either PQ (Perceptual Quantizer) or HLG (Hybrid Log-Gamma).
+        // 3. The combination of primaries and white point must be one that is commonly
+        //    describable by a standard CICP value. This includes:
+        //    a) P3 primaries with either a D65 or DCI white point.
+        //    b) Any non-custom primaries, as long as the white point is D65.
+
+        if let JxlPrimaries::Chromaticities { .. } = primaries {
+            return false;
+        }
+
+        matches!(
+            transfer_function,
+            JxlTransferFunction::PQ | JxlTransferFunction::HLG
+        ) && (*white_point == JxlWhitePoint::D65
+            || (*white_point == JxlWhitePoint::DCI && *primaries == JxlPrimaries::P3))
+    }
+
+    pub fn get_color_encoding_description(&self) -> String {
+        // Handle special known color spaces first
+        if let Some(common_name) = match self {
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::SRGB,
+                transfer_function: JxlTransferFunction::SRGB,
+                rendering_intent: RenderingIntent::Perceptual,
+            } => Some("sRGB"),
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::P3,
+                transfer_function: JxlTransferFunction::SRGB,
+                rendering_intent: RenderingIntent::Perceptual,
+            } => Some("DisplayP3"),
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::BT2100,
+                transfer_function: JxlTransferFunction::PQ,
+                rendering_intent: RenderingIntent::Relative,
+            } => Some("Rec2100PQ"),
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::BT2100,
+                transfer_function: JxlTransferFunction::HLG,
+                rendering_intent: RenderingIntent::Relative,
+            } => Some("Rec2100HLG"),
+            _ => None,
+        } {
+            return common_name.to_string();
+        }
+
+        // Build the string part by part for other case
+        let mut d = String::with_capacity(64);
+
+        match self {
+            JxlColorEncoding::RgbColorSpace {
+                white_point,
+                primaries,
+                transfer_function,
+                rendering_intent,
+            } => {
+                d.push_str("RGB_");
+                d.push_str(&white_point.to_string());
+                d.push('_');
+                d.push_str(&primaries.to_string());
+                d.push('_');
+                d.push_str(&rendering_intent.to_string());
+                d.push('_');
+                d.push_str(&transfer_function.to_string());
+            }
+            JxlColorEncoding::GrayscaleColorSpace {
+                white_point,
+                transfer_function,
+                rendering_intent,
+            } => {
+                d.push_str("Gra_");
+                d.push_str(&white_point.to_string());
+                d.push('_');
+                d.push_str(&rendering_intent.to_string());
+                d.push('_');
+                d.push_str(&transfer_function.to_string());
+            }
+            JxlColorEncoding::XYB { rendering_intent } => {
+                d.push_str("XYB_");
+                d.push_str(&rendering_intent.to_string());
+            }
+        }
+
+        d
+    }
+
+    fn create_icc_header(&self) -> Result<Vec<u8>, Error> {
+        let mut header_data = vec![0u8; 128];
+
+        // Profile size - To be filled in at the end of profile creation.
+        write_u32_be(&mut header_data, 0, 0)?;
+        const CMM_TAG: &str = "jxl ";
+        // CMM Type
+        write_icc_tag(&mut header_data, 4, CMM_TAG)?;
+
+        // Profile version - ICC v4.4 (0x04400000)
+        // Conformance tests have v4.3, libjxl produces v4.4
+        write_u32_be(&mut header_data, 8, 0x04400000u32)?;
+
+        let profile_class_str = match self {
+            JxlColorEncoding::XYB { .. } => "scnr",
+            _ => "mntr",
+        };
+        write_icc_tag(&mut header_data, 12, profile_class_str)?;
+
+        // Data color space
+        let data_color_space_str = match self {
+            JxlColorEncoding::GrayscaleColorSpace { .. } => "GRAY",
+            _ => "RGB ",
+        };
+        write_icc_tag(&mut header_data, 16, data_color_space_str)?;
+
+        // PCS - Profile Connection Space
+        // Corresponds to: if (kEnable3DToneMapping && CanToneMap(c))
+        // Assuming kEnable3DToneMapping is true for this port for now.
+        const K_ENABLE_3D_ICC_TONEMAPPING: bool = true;
+        if K_ENABLE_3D_ICC_TONEMAPPING && self.can_tone_map_for_icc() {
+            write_icc_tag(&mut header_data, 20, "Lab ")?;
+        } else {
+            write_icc_tag(&mut header_data, 20, "XYZ ")?;
+        }
+
+        // Date and Time - Placeholder values from libjxl
+        write_u16_be(&mut header_data, 24, 2019)?; // Year
+        write_u16_be(&mut header_data, 26, 12)?; // Month
+        write_u16_be(&mut header_data, 28, 1)?; // Day
+        write_u16_be(&mut header_data, 30, 0)?; // Hours
+        write_u16_be(&mut header_data, 32, 0)?; // Minutes
+        write_u16_be(&mut header_data, 34, 0)?; // Seconds
+
+        write_icc_tag(&mut header_data, 36, "acsp")?;
+        write_icc_tag(&mut header_data, 40, "APPL")?;
+
+        // Profile flags
+        write_u32_be(&mut header_data, 44, 0)?;
+        // Device manufacturer
+        write_u32_be(&mut header_data, 48, 0)?;
+        // Device model
+        write_u32_be(&mut header_data, 52, 0)?;
+        // Device attributes
+        write_u32_be(&mut header_data, 56, 0)?;
+        write_u32_be(&mut header_data, 60, 0)?;
+
+        // Rendering Intent
+        let rendering_intent = match self {
+            JxlColorEncoding::RgbColorSpace {
+                rendering_intent, ..
+            }
+            | JxlColorEncoding::GrayscaleColorSpace {
+                rendering_intent, ..
+            }
+            | JxlColorEncoding::XYB { rendering_intent } => rendering_intent,
+        };
+        write_u32_be(&mut header_data, 64, *rendering_intent as u32)?;
+
+        // Whitepoint is fixed to D50 for ICC.
+        write_u32_be(&mut header_data, 68, 0x0000F6D6)?;
+        write_u32_be(&mut header_data, 72, 0x00010000)?;
+        write_u32_be(&mut header_data, 76, 0x0000D32D)?;
+
+        // Profile Creator
+        write_icc_tag(&mut header_data, 80, CMM_TAG)?;
+
+        // Profile ID (MD5 checksum) (offset 84) - 16 bytes.
+        // This is calculated at the end of profile creation and written here.
+
+        // Reserved (offset 100-127) - already zeroed here.
+
+        Ok(header_data)
+    }
+
+    pub fn maybe_create_profile(&self) -> Result<Option<Vec<u8>>, Error> {
+        if let JxlColorEncoding::XYB { rendering_intent } = self
+            && *rendering_intent != RenderingIntent::Perceptual
+        {
+            return Err(Error::InvalidRenderingIntent);
+        }
+        let header = self.create_icc_header()?;
+        let mut tags_data: Vec<u8> = Vec::new();
+        let mut collected_tags: Vec<TagInfo> = Vec::new();
+
+        // Create 'desc' (ProfileDescription) tag
+        let description_string = self.get_color_encoding_description();
+
+        let desc_tag_start_offset = tags_data.len() as u32; // 0 at this point ...
+        create_icc_mluc_tag(&mut tags_data, &description_string)?;
+        let desc_tag_unpadded_size = (tags_data.len() as u32) - desc_tag_start_offset;
+        pad_to_4_byte_boundary(&mut tags_data);
+        collected_tags.push(TagInfo {
+            signature: *b"desc",
+            offset_in_tags_blob: desc_tag_start_offset,
+            size_unpadded: desc_tag_unpadded_size,
+        });
+
+        // Create 'cprt' (Copyright) tag
+        let copyright_string = "CC0";
+        let cprt_tag_start_offset = tags_data.len() as u32;
+        create_icc_mluc_tag(&mut tags_data, copyright_string)?;
+        let cprt_tag_unpadded_size = (tags_data.len() as u32) - cprt_tag_start_offset;
+        pad_to_4_byte_boundary(&mut tags_data);
+        collected_tags.push(TagInfo {
+            signature: *b"cprt",
+            offset_in_tags_blob: cprt_tag_start_offset,
+            size_unpadded: cprt_tag_unpadded_size,
+        });
+
+        match self {
+            JxlColorEncoding::GrayscaleColorSpace { white_point, .. } => {
+                let (wx, wy) = white_point.to_xy_coords();
+                collected_tags.push(create_icc_xyz_tag(
+                    &mut tags_data,
+                    &cie_xyz_from_white_cie_xy(wx, wy)?,
+                )?);
+            }
+            _ => {
+                // Ok, in this case we will add the chad tag below
+                const D50: [f32; 3] = [0.964203f32, 1.0, 0.824905];
+                collected_tags.push(create_icc_xyz_tag(&mut tags_data, &D50)?);
+            }
+        }
+        pad_to_4_byte_boundary(&mut tags_data);
+        if !matches!(self, JxlColorEncoding::GrayscaleColorSpace { .. }) {
+            let (wx, wy) = match self {
+                JxlColorEncoding::GrayscaleColorSpace { .. } => unreachable!(),
+                JxlColorEncoding::RgbColorSpace { white_point, .. } => white_point.to_xy_coords(),
+                JxlColorEncoding::XYB { .. } => JxlWhitePoint::D65.to_xy_coords(),
+            };
+            let chad_matrix_f64 = adapt_to_xyz_d50(wx, wy)?;
+            let chad_matrix = std::array::from_fn(|r_idx| {
+                std::array::from_fn(|c_idx| chad_matrix_f64[r_idx][c_idx] as f32)
+            });
+            collected_tags.push(create_icc_chad_tag(&mut tags_data, &chad_matrix)?);
+            pad_to_4_byte_boundary(&mut tags_data);
+        }
+
+        if let JxlColorEncoding::RgbColorSpace {
+            white_point,
+            primaries,
+            ..
+        } = self
+        {
+            if let Some(tag_info) = self.create_icc_cicp_tag_data(&mut tags_data)? {
+                collected_tags.push(tag_info);
+                // Padding here not necessary, since we add 12 bytes to already 4-byte aligned
+                // buffer
+                // pad_to_4_byte_boundary(&mut tags_data);
+            }
+
+            // Get colorant and white point coordinates to build the conversion matrix.
+            let primaries_coords = primaries.to_xy_coords();
+            let (rx, ry) = primaries_coords[0];
+            let (gx, gy) = primaries_coords[1];
+            let (bx, by) = primaries_coords[2];
+            let (wx, wy) = white_point.to_xy_coords();
+
+            // Calculate the RGB to XYZD50 matrix.
+            let m = create_icc_rgb_matrix(rx, ry, gx, gy, bx, by, wx, wy)?;
+
+            // Extract the columns, which are the XYZ values for the R, G, and B primaries.
+            let r_xyz = [m[0][0], m[1][0], m[2][0]];
+            let g_xyz = [m[0][1], m[1][1], m[2][1]];
+            let b_xyz = [m[0][2], m[1][2], m[2][2]];
+
+            // Helper to create the raw data for any 'XYZ ' type tag.
+            let create_xyz_type_tag_data =
+                |tags: &mut Vec<u8>, xyz: &[f32; 3]| -> Result<u32, Error> {
+                    let start_offset = tags.len();
+                    // The tag *type* is 'XYZ ' for all three
+                    tags.extend_from_slice(b"XYZ ");
+                    tags.extend_from_slice(&0u32.to_be_bytes());
+                    for &val in xyz {
+                        append_s15_fixed_16(tags, val)?;
+                    }
+                    Ok((tags.len() - start_offset) as u32)
+                };
+
+            // Create the 'rXYZ' tag.
+            let r_xyz_tag_start_offset = tags_data.len() as u32;
+            let r_xyz_tag_unpadded_size = create_xyz_type_tag_data(&mut tags_data, &r_xyz)?;
+            pad_to_4_byte_boundary(&mut tags_data);
+            collected_tags.push(TagInfo {
+                signature: *b"rXYZ", // Making the *signature* is unique.
+                offset_in_tags_blob: r_xyz_tag_start_offset,
+                size_unpadded: r_xyz_tag_unpadded_size,
+            });
+
+            // Create the 'gXYZ' tag.
+            let g_xyz_tag_start_offset = tags_data.len() as u32;
+            let g_xyz_tag_unpadded_size = create_xyz_type_tag_data(&mut tags_data, &g_xyz)?;
+            pad_to_4_byte_boundary(&mut tags_data);
+            collected_tags.push(TagInfo {
+                signature: *b"gXYZ",
+                offset_in_tags_blob: g_xyz_tag_start_offset,
+                size_unpadded: g_xyz_tag_unpadded_size,
+            });
+
+            // Create the 'bXYZ' tag.
+            let b_xyz_tag_start_offset = tags_data.len() as u32;
+            let b_xyz_tag_unpadded_size = create_xyz_type_tag_data(&mut tags_data, &b_xyz)?;
+            pad_to_4_byte_boundary(&mut tags_data);
+            collected_tags.push(TagInfo {
+                signature: *b"bXYZ",
+                offset_in_tags_blob: b_xyz_tag_start_offset,
+                size_unpadded: b_xyz_tag_unpadded_size,
+            });
+        }
+        if self.can_tone_map_for_icc() {
+            // Create A2B0 tag for HDR tone mapping
+            if let JxlColorEncoding::RgbColorSpace {
+                white_point,
+                primaries,
+                transfer_function,
+                ..
+            } = self
+            {
+                let a2b0_start = tags_data.len() as u32;
+                create_icc_lut_atob_tag_for_hdr(
+                    transfer_function,
+                    primaries,
+                    white_point,
+                    &mut tags_data,
+                )?;
+                pad_to_4_byte_boundary(&mut tags_data);
+                let a2b0_size = (tags_data.len() as u32) - a2b0_start;
+                collected_tags.push(TagInfo {
+                    signature: *b"A2B0",
+                    offset_in_tags_blob: a2b0_start,
+                    size_unpadded: a2b0_size,
+                });
+
+                // Create B2A0 tag (no-op, required by Apple software including Safari/Preview)
+                let b2a0_start = tags_data.len() as u32;
+                create_icc_noop_btoa_tag(&mut tags_data)?;
+                pad_to_4_byte_boundary(&mut tags_data);
+                let b2a0_size = (tags_data.len() as u32) - b2a0_start;
+                collected_tags.push(TagInfo {
+                    signature: *b"B2A0",
+                    offset_in_tags_blob: b2a0_start,
+                    size_unpadded: b2a0_size,
+                });
+            }
+        } else {
+            match self {
+                JxlColorEncoding::XYB { .. } => {
+                    // Create A2B0 tag for XYB color space
+                    let a2b0_start = tags_data.len() as u32;
+                    create_icc_lut_atob_tag_for_xyb(&mut tags_data)?;
+                    pad_to_4_byte_boundary(&mut tags_data);
+                    let a2b0_size = (tags_data.len() as u32) - a2b0_start;
+                    collected_tags.push(TagInfo {
+                        signature: *b"A2B0",
+                        offset_in_tags_blob: a2b0_start,
+                        size_unpadded: a2b0_size,
+                    });
+
+                    // Create B2A0 tag (no-op, required by Apple software)
+                    let b2a0_start = tags_data.len() as u32;
+                    create_icc_noop_btoa_tag(&mut tags_data)?;
+                    pad_to_4_byte_boundary(&mut tags_data);
+                    let b2a0_size = (tags_data.len() as u32) - b2a0_start;
+                    collected_tags.push(TagInfo {
+                        signature: *b"B2A0",
+                        offset_in_tags_blob: b2a0_start,
+                        size_unpadded: b2a0_size,
+                    });
+                }
+                JxlColorEncoding::RgbColorSpace {
+                    transfer_function, ..
+                }
+                | JxlColorEncoding::GrayscaleColorSpace {
+                    transfer_function, ..
+                } => {
+                    let trc_tag_start_offset = tags_data.len() as u32;
+                    let trc_tag_unpadded_size = match transfer_function {
+                        JxlTransferFunction::Gamma(g) => {
+                            // Type 0 parametric curve: Y = X^gamma
+                            let gamma = 1.0 / g;
+                            create_icc_curv_para_tag(&mut tags_data, &[gamma], 0)?
+                        }
+                        JxlTransferFunction::SRGB => {
+                            // Type 3 parametric curve for sRGB standard.
+                            const PARAMS: [f32; 5] =
+                                [2.4, 1.0 / 1.055, 0.055 / 1.055, 1.0 / 12.92, 0.04045];
+                            create_icc_curv_para_tag(&mut tags_data, &PARAMS, 3)?
+                        }
+                        JxlTransferFunction::BT709 => {
+                            // Type 3 parametric curve for BT.709 standard.
+                            const PARAMS: [f32; 5] =
+                                [1.0 / 0.45, 1.0 / 1.099, 0.099 / 1.099, 1.0 / 4.5, 0.081];
+                            create_icc_curv_para_tag(&mut tags_data, &PARAMS, 3)?
+                        }
+                        JxlTransferFunction::Linear => {
+                            // Type 3 can also represent a linear response (gamma=1.0).
+                            const PARAMS: [f32; 5] = [1.0, 1.0, 0.0, 1.0, 0.0];
+                            create_icc_curv_para_tag(&mut tags_data, &PARAMS, 3)?
+                        }
+                        JxlTransferFunction::DCI => {
+                            // Type 3 can also represent a pure power curve (gamma=2.6).
+                            const PARAMS: [f32; 5] = [2.6, 1.0, 0.0, 1.0, 0.0];
+                            create_icc_curv_para_tag(&mut tags_data, &PARAMS, 3)?
+                        }
+                        JxlTransferFunction::HLG | JxlTransferFunction::PQ => {
+                            let params = create_table_curve(64, transfer_function, false)?;
+                            create_icc_curv_para_tag(&mut tags_data, params.as_slice(), 3)?
+                        }
+                    };
+                    pad_to_4_byte_boundary(&mut tags_data);
+
+                    match self {
+                        JxlColorEncoding::GrayscaleColorSpace { .. } => {
+                            // Grayscale profiles use a single 'kTRC' tag.
+                            collected_tags.push(TagInfo {
+                                signature: *b"kTRC",
+                                offset_in_tags_blob: trc_tag_start_offset,
+                                size_unpadded: trc_tag_unpadded_size,
+                            });
+                        }
+                        _ => {
+                            // For RGB, rTRC, gTRC, and bTRC all point to the same curve data,
+                            // an optimization to keep the profile size small.
+                            collected_tags.push(TagInfo {
+                                signature: *b"rTRC",
+                                offset_in_tags_blob: trc_tag_start_offset,
+                                size_unpadded: trc_tag_unpadded_size,
+                            });
+                            collected_tags.push(TagInfo {
+                                signature: *b"gTRC",
+                                offset_in_tags_blob: trc_tag_start_offset, // Same offset
+                                size_unpadded: trc_tag_unpadded_size,      // Same size
+                            });
+                            collected_tags.push(TagInfo {
+                                signature: *b"bTRC",
+                                offset_in_tags_blob: trc_tag_start_offset, // Same offset
+                                size_unpadded: trc_tag_unpadded_size,      // Same size
+                            });
+                        }
+                    }
+                }
+            }
+        }
+
+        // Construct the Tag Table bytes
+        let mut tag_table_bytes: Vec<u8> = Vec::new();
+        // First, the number of tags (u32)
+        tag_table_bytes.extend_from_slice(&(collected_tags.len() as u32).to_be_bytes());
+
+        let header_size = header.len() as u32;
+        // Each entry in the tag table on disk is 12 bytes: signature (4), offset (4), size (4)
+        let tag_table_on_disk_size = 4 + (collected_tags.len() as u32 * 12);
+
+        for tag_info in &collected_tags {
+            tag_table_bytes.extend_from_slice(&tag_info.signature);
+            // The offset in the tag table is absolute from the start of the ICC profile file
+            let final_profile_offset_for_tag =
+                header_size + tag_table_on_disk_size + tag_info.offset_in_tags_blob;
+            tag_table_bytes.extend_from_slice(&final_profile_offset_for_tag.to_be_bytes());
+            // In https://www.color.org/specification/ICC.1-2022-05.pdf, section 7.3.5 reads:
+            //
+            // "The value of the tag data element size shall be the number of actual data
+            // bytes and shall not include any padding at the end of the tag data element."
+            //
+            // The reference from conformance tests and libjxl use the padded size here instead.
+
+            tag_table_bytes.extend_from_slice(&tag_info.size_unpadded.to_be_bytes());
+            // In order to get byte_exact the same output as libjxl, remove the line above
+            // and uncomment the lines below
+            // let padded_size = tag_info.size_unpadded.next_multiple_of(4);
+            // tag_table_bytes.extend_from_slice(&padded_size.to_be_bytes());
+        }
+
+        // Assemble the final ICC profile parts: header + tag_table + tags_data
+        let mut final_icc_profile_data: Vec<u8> =
+            Vec::with_capacity(header.len() + tag_table_bytes.len() + tags_data.len());
+        final_icc_profile_data.extend_from_slice(&header);
+        final_icc_profile_data.extend_from_slice(&tag_table_bytes);
+        final_icc_profile_data.extend_from_slice(&tags_data);
+
+        // Update the profile size in the header (at offset 0)
+        let total_profile_size = final_icc_profile_data.len() as u32;
+        write_u32_be(&mut final_icc_profile_data, 0, total_profile_size)?;
+
+        // Assemble the final ICC profile parts: header + tag_table + tags_data
+        let mut final_icc_profile_data: Vec<u8> =
+            Vec::with_capacity(header.len() + tag_table_bytes.len() + tags_data.len());
+        final_icc_profile_data.extend_from_slice(&header);
+        final_icc_profile_data.extend_from_slice(&tag_table_bytes);
+        final_icc_profile_data.extend_from_slice(&tags_data);
+
+        // Update the profile size in the header (at offset 0)
+        let total_profile_size = final_icc_profile_data.len() as u32;
+        write_u32_be(&mut final_icc_profile_data, 0, total_profile_size)?;
+
+        // The MD5 checksum (Profile ID) must be computed on the profile with
+        // specific header fields zeroed out, as per the ICC specification.
+        let mut profile_for_checksum = final_icc_profile_data.clone();
+
+        if profile_for_checksum.len() >= 84 {
+            // Zero out Profile Flags at offset 44.
+            profile_for_checksum[44..48].fill(0);
+            // Zero out Rendering Intent at offset 64.
+            profile_for_checksum[64..68].fill(0);
+            // The Profile ID field at offset 84 is already zero at this stage.
+        }
+
+        // Compute the MD5 hash on the modified profile data.
+        let checksum = compute_md5(&profile_for_checksum);
+
+        // Write the 16-byte checksum into the "Profile ID" field of the *original*
+        // profile data buffer, starting at offset 84.
+        if final_icc_profile_data.len() >= 100 {
+            final_icc_profile_data[84..100].copy_from_slice(&checksum);
+        }
+
+        Ok(Some(final_icc_profile_data))
+    }
+
+    pub fn srgb(grayscale: bool) -> Self {
+        if grayscale {
+            JxlColorEncoding::GrayscaleColorSpace {
+                white_point: JxlWhitePoint::D65,
+                transfer_function: JxlTransferFunction::SRGB,
+                rendering_intent: RenderingIntent::Relative,
+            }
+        } else {
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::SRGB,
+                transfer_function: JxlTransferFunction::SRGB,
+                rendering_intent: RenderingIntent::Relative,
+            }
+        }
+    }
+
+    /// Creates linear sRGB color encoding (sRGB primaries with linear transfer function).
+    /// This is the fallback output color space for XYB images when the embedded
+    /// color profile cannot be output to without a CMS.
+    pub fn linear_srgb(grayscale: bool) -> Self {
+        if grayscale {
+            JxlColorEncoding::GrayscaleColorSpace {
+                white_point: JxlWhitePoint::D65,
+                transfer_function: JxlTransferFunction::Linear,
+                rendering_intent: RenderingIntent::Relative,
+            }
+        } else {
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::SRGB,
+                transfer_function: JxlTransferFunction::Linear,
+                rendering_intent: RenderingIntent::Relative,
+            }
+        }
+    }
+
+    /// Returns a copy of this encoding with linear transfer function.
+    /// For XYB encoding, returns linear sRGB as fallback.
+    pub fn with_linear_tf(&self) -> Self {
+        match self {
+            JxlColorEncoding::RgbColorSpace {
+                white_point,
+                primaries,
+                rendering_intent,
+                ..
+            } => JxlColorEncoding::RgbColorSpace {
+                white_point: white_point.clone(),
+                primaries: primaries.clone(),
+                transfer_function: JxlTransferFunction::Linear,
+                rendering_intent: *rendering_intent,
+            },
+            JxlColorEncoding::GrayscaleColorSpace {
+                white_point,
+                rendering_intent,
+                ..
+            } => JxlColorEncoding::GrayscaleColorSpace {
+                white_point: white_point.clone(),
+                transfer_function: JxlTransferFunction::Linear,
+                rendering_intent: *rendering_intent,
+            },
+            JxlColorEncoding::XYB { .. } => Self::linear_srgb(false),
+        }
+    }
+
+    /// Returns the number of color channels for this encoding.
+    /// RGB/XYB = 3, Grayscale = 1.
+    pub fn channels(&self) -> usize {
+        match self {
+            JxlColorEncoding::RgbColorSpace { .. } => 3,
+            JxlColorEncoding::GrayscaleColorSpace { .. } => 1,
+            JxlColorEncoding::XYB { .. } => 3,
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum JxlColorProfile {
+    Icc(Vec<u8>),
+    Simple(JxlColorEncoding),
+}
+
+impl JxlColorProfile {
+    /// Returns the ICC profile, panicking if unavailable.
+    ///
+    /// # Panics
+    /// Panics if the color encoding cannot generate an ICC profile.
+    /// Consider using `try_as_icc` for fallible conversion.
+    pub fn as_icc(&self) -> Cow<'_, Vec<u8>> {
+        match self {
+            Self::Icc(x) => Cow::Borrowed(x),
+            Self::Simple(encoding) => Cow::Owned(encoding.maybe_create_profile().unwrap().unwrap()),
+        }
+    }
+
+    /// Attempts to get an ICC profile, returning None if unavailable.
+    ///
+    /// Returns `None` for color encodings that cannot generate ICC profiles.
+    pub fn try_as_icc(&self) -> Option<Cow<'_, Vec<u8>>> {
+        match self {
+            Self::Icc(x) => Some(Cow::Borrowed(x)),
+            Self::Simple(encoding) => encoding
+                .maybe_create_profile()
+                .ok()
+                .flatten()
+                .map(Cow::Owned),
+        }
+    }
+
+    /// Returns true if both profiles represent the same color encoding.
+    ///
+    /// Two profiles are the same if they are both simple color encodings
+    /// with matching color space (primaries, white point) and transfer function,
+    /// or if they are both ICC profiles with identical bytes.
+    pub fn same_color_encoding(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Self::Simple(a), Self::Simple(b)) => {
+                use JxlColorEncoding::*;
+                match (a, b) {
+                    (
+                        RgbColorSpace {
+                            white_point: wp_a,
+                            primaries: prim_a,
+                            transfer_function: tf_a,
+                            ..
+                        },
+                        RgbColorSpace {
+                            white_point: wp_b,
+                            primaries: prim_b,
+                            transfer_function: tf_b,
+                            ..
+                        },
+                    ) => wp_a == wp_b && prim_a == prim_b && tf_a == tf_b,
+                    (
+                        GrayscaleColorSpace {
+                            white_point: wp_a,
+                            transfer_function: tf_a,
+                            ..
+                        },
+                        GrayscaleColorSpace {
+                            white_point: wp_b,
+                            transfer_function: tf_b,
+                            ..
+                        },
+                    ) => wp_a == wp_b && tf_a == tf_b,
+                    // Different color space types (RGB vs Gray vs XYB)
+                    _ => false,
+                }
+            }
+            // Identical ICC bytes means identical transform — CMS is a no-op.
+            // This is the dominant case for non-XYB images where no custom output
+            // profile is set (output is a clone of the embedded ICC profile).
+            // Exclude CMYK: CMS is always needed for CMYK even with identical
+            // profiles, because the pipeline may need to consume the K channel.
+            // This matches libjxl's `!cmyk && !other.cmyk` guard.
+            (Self::Icc(a), Self::Icc(b)) => a == b && !self.is_cmyk(),
+            // Mixed types (Simple vs Icc) always differ
+            _ => false,
+        }
+    }
+
+    /// Returns the transfer function if this is a simple color profile.
+    /// Returns None for ICC profiles or XYB.
+    pub fn transfer_function(&self) -> Option<&JxlTransferFunction> {
+        match self {
+            Self::Simple(JxlColorEncoding::RgbColorSpace {
+                transfer_function, ..
+            })
+            | Self::Simple(JxlColorEncoding::GrayscaleColorSpace {
+                transfer_function, ..
+            }) => Some(transfer_function),
+            _ => None,
+        }
+    }
+
+    /// Returns true if the decoder can output to this color profile without a CMS.
+    ///
+    /// This is the equivalent of libjxl's `CanOutputToColorEncoding`. Output is possible
+    /// when the profile is a simple encoding (not ICC) with a natively-supported transfer
+    /// function. For grayscale, the white point must be D65.
+    pub fn can_output_to(&self) -> bool {
+        match self {
+            Self::Icc(_) => false,
+            Self::Simple(JxlColorEncoding::RgbColorSpace { .. }) => true,
+            Self::Simple(JxlColorEncoding::GrayscaleColorSpace { white_point, .. }) => {
+                // libjxl requires D65 white point for grayscale output without CMS
+                *white_point == JxlWhitePoint::D65
+            }
+            Self::Simple(JxlColorEncoding::XYB { .. }) => {
+                // XYB as output doesn't make sense without further conversion
+                false
+            }
+        }
+    }
+
+    /// Returns a copy of this profile with linear transfer function.
+    /// For ICC profiles, returns None since we can't modify embedded ICC profiles.
+    /// This is used to create the CMS input profile for XYB images where XybStage
+    /// outputs linear data.
+    pub fn with_linear_tf(&self) -> Option<Self> {
+        match self {
+            Self::Icc(_) => None,
+            Self::Simple(encoding) => Some(Self::Simple(encoding.with_linear_tf())),
+        }
+    }
+
+    /// Returns the number of color channels (1 for grayscale, 3 for RGB, 4 for CMYK).
+    ///
+    /// For ICC profiles, this parses the profile header to determine the color space.
+    /// Falls back to 3 (RGB) if the ICC profile cannot be parsed.
+    pub fn channels(&self) -> usize {
+        match self {
+            Self::Simple(enc) => enc.channels(),
+            Self::Icc(icc_data) => {
+                // ICC color space signature is at bytes 16-19 in the header
+                if icc_data.len() >= 20 {
+                    match &icc_data[16..20] {
+                        b"GRAY" => 1,
+                        b"RGB " => 3,
+                        b"CMYK" => 4,
+                        _ => 3, // Default to RGB for unknown color spaces
+                    }
+                } else {
+                    3 // Default to RGB if profile is too short
+                }
+            }
+        }
+    }
+
+    /// Returns true if this profile is for a CMYK color space.
+    ///
+    /// For ICC profiles, this parses the profile header to check the color space.
+    /// Simple color encodings are never CMYK.
+    pub fn is_cmyk(&self) -> bool {
+        match self {
+            Self::Simple(_) => false, // Simple encodings are never CMYK
+            Self::Icc(icc_data) => {
+                // ICC color space signature is at bytes 16-19 in the header
+                if icc_data.len() >= 20 {
+                    &icc_data[16..20] == b"CMYK"
+                } else {
+                    false
+                }
+            }
+        }
+    }
+}
+
+impl fmt::Display for JxlColorProfile {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Icc(_) => f.write_str("ICC"),
+            Self::Simple(enc) => write!(f, "{}", enc),
+        }
+    }
+}
+
+pub trait JxlCmsTransformer {
+    /// Runs a single transform. The buffers each contain `num_pixels` x `num_channels` interleaved
+    /// floating point (0..1) samples, where `num_channels` is the number of color channels of
+    /// their respective color profiles. For CMYK data, 0 represents the maximum amount of ink
+    /// while 1 represents no ink.
+    fn do_transform(&mut self, input: &[f32], output: &mut [f32]) -> Result<()>;
+
+    /// Runs a single transform in-place. The buffer contains `num_pixels` x `num_channels`
+    /// interleaved floating point (0..1) samples, where `num_channels` is the number of color
+    /// channels of the input and output color profiles. For CMYK data, 0 represents the maximum
+    /// amount of ink while 1 represents no ink.
+    fn do_transform_inplace(&mut self, inout: &mut [f32]) -> Result<()>;
+}
+
+pub trait JxlCms {
+    /// Initializes `n` transforms (different transforms might be used in parallel) to
+    /// convert from color space `input` to colorspace `output`, assuming an intensity of 1.0 for
+    /// non-absolute luminance colorspaces of `intensity_target`.
+    /// It is an error to not return `n` transforms.
+    /// Returns the number of channels the ICC outputs, and the transforms.
+    fn initialize_transforms(
+        &self,
+        n: usize,
+        max_pixels_per_transform: usize,
+        input: JxlColorProfile,
+        output: JxlColorProfile,
+        intensity_target: f32,
+    ) -> Result<(usize, Vec<Box<dyn JxlCmsTransformer + Send + Sync>>)>;
+}
+
+/// Writes a u32 value in big-endian format to the slice at the given position.
+fn write_u32_be(slice: &mut [u8], pos: usize, value: u32) -> Result<(), Error> {
+    if pos.checked_add(4).is_none_or(|end| end > slice.len()) {
+        return Err(Error::IccWriteOutOfBounds);
+    }
+    slice[pos..pos + 4].copy_from_slice(&value.to_be_bytes());
+    Ok(())
+}
+
+/// Writes a u16 value in big-endian format to the slice at the given position.
+fn write_u16_be(slice: &mut [u8], pos: usize, value: u16) -> Result<(), Error> {
+    if pos.checked_add(2).is_none_or(|end| end > slice.len()) {
+        return Err(Error::IccWriteOutOfBounds);
+    }
+    slice[pos..pos + 2].copy_from_slice(&value.to_be_bytes());
+    Ok(())
+}
+
+/// Writes a 4-character ASCII tag string to the slice at the given position.
+fn write_icc_tag(slice: &mut [u8], pos: usize, tag_str: &str) -> Result<(), Error> {
+    if tag_str.len() != 4 || !tag_str.is_ascii() {
+        return Err(Error::IccInvalidTagString(tag_str.to_string()));
+    }
+    if pos.checked_add(4).is_none_or(|end| end > slice.len()) {
+        return Err(Error::IccWriteOutOfBounds);
+    }
+    slice[pos..pos + 4].copy_from_slice(tag_str.as_bytes());
+    Ok(())
+}
+
+/// Creates an ICC 'mluc' tag with a single "enUS" record.
+///
+/// The input `text` must be ASCII, as it will be encoded as UTF-16BE by prepending
+/// a null byte to each ASCII character.
+fn create_icc_mluc_tag(tags: &mut Vec<u8>, text: &str) -> Result<(), Error> {
+    // libjxl comments that "The input text must be ASCII".
+    // We enforce this.
+    if !text.is_ascii() {
+        return Err(Error::IccMlucTextNotAscii(text.to_string()));
+    }
+    // Tag signature 'mluc' (4 bytes)
+    tags.extend_from_slice(b"mluc");
+    // Reserved, must be 0 (4 bytes)
+    tags.extend_from_slice(&0u32.to_be_bytes());
+    // Number of records (u32, 4 bytes) - Hardcoded to 1.
+    tags.extend_from_slice(&1u32.to_be_bytes());
+    // Record size (u32, 4 bytes) - Each record descriptor is 12 bytes.
+    // (Language Code [2] + Country Code [2] + String Length [4] + String Offset [4])
+    tags.extend_from_slice(&12u32.to_be_bytes());
+    // Language Code (2 bytes) - "en" for English
+    tags.extend_from_slice(b"en");
+    // Country Code (2 bytes) - "US" for United States
+    tags.extend_from_slice(b"US");
+    // Length of the string (u32, 4 bytes)
+    // For ASCII text encoded as UTF-16BE, each char becomes 2 bytes.
+    let string_actual_byte_length = text.len() * 2;
+    tags.extend_from_slice(&(string_actual_byte_length as u32).to_be_bytes());
+    // Offset of the string (u32, 4 bytes)
+    // The string data for this record starts at offset 28.
+    tags.extend_from_slice(&28u32.to_be_bytes());
+    // The actual string data, encoded as UTF-16BE.
+    // For ASCII char 'X', UTF-16BE is 0x00 0x58.
+    for ascii_char_code in text.as_bytes() {
+        tags.push(0u8);
+        tags.push(*ascii_char_code);
+    }
+
+    Ok(())
+}
+
+struct TagInfo {
+    signature: [u8; 4],
+    // Offset of this tag's data relative to the START of the `tags_data` block
+    offset_in_tags_blob: u32,
+    // Unpadded size of this tag's actual data content.
+    size_unpadded: u32,
+}
+
+fn pad_to_4_byte_boundary(data: &mut Vec<u8>) {
+    data.resize(data.len().next_multiple_of(4), 0u8);
+}
+
+/// Converts an f32 to s15Fixed16 format and appends it as big-endian bytes.
+/// s15Fixed16 is a signed 32-bit number with 1 sign bit, 15 integer bits,
+/// and 16 fractional bits.
+fn append_s15_fixed_16(tags_data: &mut Vec<u8>, value: f32) -> Result<(), Error> {
+    // In libjxl, the following specific range check is used: (-32767.995f <= value) && (value <= 32767.995f)
+    // This is slightly tighter than the theoretical max positive s15.16 value.
+    // We replicate this for consistency.
+    if !(value.is_finite() && (-32767.995..=32767.995).contains(&value)) {
+        return Err(Error::IccValueOutOfRangeS15Fixed16(value));
+    }
+
+    // Multiply by 2^16 and round to nearest integer
+    let scaled_value = (value * 65536.0).round();
+    // Cast to i32 for correct two's complement representation
+    let int_value = scaled_value as i32;
+    tags_data.extend_from_slice(&int_value.to_be_bytes());
+    Ok(())
+}
+
+/// Creates the data for an ICC 'XYZ ' tag and appends it to `tags_data`.
+/// The 'XYZ ' tag contains three s15Fixed16Number values.
+fn create_icc_xyz_tag(tags_data: &mut Vec<u8>, xyz_color: &[f32; 3]) -> Result<TagInfo, Error> {
+    // Tag signature 'XYZ ' (4 bytes, note the trailing space)
+    let start_offset = tags_data.len() as u32;
+    let signature = b"XYZ ";
+    tags_data.extend_from_slice(signature);
+
+    // Reserved, must be 0 (4 bytes)
+    tags_data.extend_from_slice(&0u32.to_be_bytes());
+
+    // XYZ data (3 * s15Fixed16Number = 3 * 4 bytes)
+    for &val in xyz_color {
+        append_s15_fixed_16(tags_data, val)?;
+    }
+
+    Ok(TagInfo {
+        signature: *b"wtpt",
+        offset_in_tags_blob: start_offset,
+        size_unpadded: (tags_data.len() as u32) - start_offset,
+    })
+}
+
+fn create_icc_chad_tag(
+    tags_data: &mut Vec<u8>,
+    chad_matrix: &Matrix3x3<f32>,
+) -> Result<TagInfo, Error> {
+    // The tag type signature "sf32" (4 bytes).
+    let signature = b"sf32";
+    let start_offset = tags_data.len() as u32;
+    tags_data.extend_from_slice(signature);
+
+    // A reserved field (4 bytes), which must be set to 0.
+    tags_data.extend_from_slice(&0u32.to_be_bytes());
+
+    // The 9 matrix elements as s15Fixed16Number values.
+    // m[0][0], m[0][1], m[0][2], m[1][0], ..., m[2][2]
+    for row_array in chad_matrix.iter() {
+        for &value in row_array.iter() {
+            append_s15_fixed_16(tags_data, value)?;
+        }
+    }
+    Ok(TagInfo {
+        signature: *b"chad",
+        offset_in_tags_blob: start_offset,
+        size_unpadded: (tags_data.len() as u32) - start_offset,
+    })
+}
+
+/// Converts CIE xy white point coordinates to CIE XYZ values (Y is normalized to 1.0).
+fn cie_xyz_from_white_cie_xy(wx: f32, wy: f32) -> Result<[f32; 3], Error> {
+    // Check for wy being too close to zero to prevent division by zero or extreme values.
+    if wy.abs() < 1e-12 {
+        return Err(Error::IccInvalidWhitePointY(wy));
+    }
+    let factor = 1.0 / wy;
+    let x_val = wx * factor;
+    let y_val = 1.0f32;
+    let z_val = (1.0 - wx - wy) * factor;
+    Ok([x_val, y_val, z_val])
+}
+
+/// Creates the data for an ICC `para` (parametricCurveType) tag.
+/// It writes `12 + 4 * params.len()` bytes.
+fn create_icc_curv_para_tag(
+    tags_data: &mut Vec<u8>,
+    params: &[f32],
+    curve_type: u16,
+) -> Result<u32, Error> {
+    let start_offset = tags_data.len();
+    // Tag type 'para' (4 bytes)
+    tags_data.extend_from_slice(b"para");
+    // Reserved, must be 0 (4 bytes)
+    tags_data.extend_from_slice(&0u32.to_be_bytes());
+    // Function type (u16, 2 bytes)
+    tags_data.extend_from_slice(&curve_type.to_be_bytes());
+    // Reserved, must be 0 (u16, 2 bytes)
+    tags_data.extend_from_slice(&0u16.to_be_bytes());
+    // Parameters (s15Fixed16Number each)
+    for &param in params {
+        append_s15_fixed_16(tags_data, param)?;
+    }
+    Ok((tags_data.len() - start_offset) as u32)
+}
+
+fn display_from_encoded_pq(display_intensity_target: f32, mut e: f64) -> f64 {
+    const M1: f64 = 2610.0 / 16384.0;
+    const M2: f64 = (2523.0 / 4096.0) * 128.0;
+    const C1: f64 = 3424.0 / 4096.0;
+    const C2: f64 = (2413.0 / 4096.0) * 32.0;
+    const C3: f64 = (2392.0 / 4096.0) * 32.0;
+    // Handle the zero case directly.
+    if e == 0.0 {
+        return 0.0;
+    }
+
+    // Handle negative inputs by using their absolute
+    // value for the calculation and reapplying the sign at the end.
+    let original_sign = e.signum();
+    e = e.abs();
+
+    // Core PQ EOTF formula from ST 2084.
+    let xp = e.powf(1.0 / M2);
+    let num = (xp - C1).max(0.0);
+    let den = C2 - C3 * xp;
+
+    // In release builds, a zero denominator would lead to `inf` or `NaN`,
+    // which is handled by the assertion below. For valid inputs (e in [0,1]),
+    // the denominator is always positive.
+    debug_assert!(den != 0.0, "PQ transfer function denominator is zero.");
+
+    let d = (num / den).powf(1.0 / M1);
+
+    // The result `d` should always be non-negative for non-negative inputs.
+    debug_assert!(
+        d >= 0.0,
+        "PQ intermediate value `d` should not be negative."
+    );
+
+    // The libjxl implementation includes a scaling factor. Note that `d` represents
+    // a value normalized to a 10,000 nit peak.
+    let scaled_d = d * (10000.0 / display_intensity_target as f64);
+
+    // Re-apply the original sign.
+    scaled_d.copysign(original_sign)
+}
+
+/// TF_HLG_Base class for BT.2100 HLG.
+///
+/// This struct provides methods to convert between non-linear encoded HLG signals
+/// and linear display-referred light, following the definitions in BT.2100-2.
+///
+/// - **"display"**: linear light, normalized to [0, 1].
+/// - **"encoded"**: a non-linear HLG signal, nominally in [0, 1].
+/// - **"scene"**: scene-referred linear light, normalized to [0, 1].
+///
+/// The functions are designed to be unbounded to handle inputs outside the
+/// nominal [0, 1] range, which can occur during color space conversions. Negative
+/// inputs are handled by mirroring the function (`f(-x) = -f(x)`).
+#[allow(non_camel_case_types)]
+struct TF_HLG;
+
+impl TF_HLG {
+    // Constants for the HLG formula, as defined in BT.2100.
+    const A: f64 = 0.17883277;
+    const RA: f64 = 1.0 / Self::A;
+    const B: f64 = 1.0 - 4.0 * Self::A;
+    const C: f64 = 0.5599107295;
+    const INV_12: f64 = 1.0 / 12.0;
+
+    /// Converts a non-linear encoded signal to a linear display value (EOTF).
+    ///
+    /// This corresponds to `DisplayFromEncoded(e) = OOTF(InvOETF(e))`.
+    /// Since the OOTF is simplified to an identity function, this is equivalent
+    /// to calling `inv_oetf(e)`.
+    #[inline]
+    fn display_from_encoded(e: f64) -> f64 {
+        Self::inv_oetf(e)
+    }
+
+    /// Converts a linear display value to a non-linear encoded signal (inverse EOTF).
+    ///
+    /// This corresponds to `EncodedFromDisplay(d) = OETF(InvOOTF(d))`.
+    /// Since the InvOOTF is an identity function, this is equivalent to `oetf(d)`.
+    #[inline]
+    #[allow(dead_code)]
+    fn encoded_from_display(d: f64) -> f64 {
+        Self::oetf(d)
+    }
+
+    /// The private HLG OETF, converting scene-referred light to a non-linear signal.
+    fn oetf(mut s: f64) -> f64 {
+        if s == 0.0 {
+            return 0.0;
+        }
+        let original_sign = s.signum();
+        s = s.abs();
+
+        let e = if s <= Self::INV_12 {
+            (3.0 * s).sqrt()
+        } else {
+            Self::A * (12.0 * s - Self::B).ln() + Self::C
+        };
+
+        // The result should be positive for positive inputs.
+        debug_assert!(e > 0.0);
+
+        e.copysign(original_sign)
+    }
+
+    /// The private HLG inverse OETF, converting a non-linear signal back to scene-referred light.
+    fn inv_oetf(mut e: f64) -> f64 {
+        if e == 0.0 {
+            return 0.0;
+        }
+        let original_sign = e.signum();
+        e = e.abs();
+
+        let s = if e <= 0.5 {
+            // The `* (1.0 / 3.0)` is slightly more efficient than `/ 3.0`.
+            e * e * (1.0 / 3.0)
+        } else {
+            (((e - Self::C) * Self::RA).exp() + Self::B) * Self::INV_12
+        };
+
+        // The result should be non-negative for non-negative inputs.
+        debug_assert!(s >= 0.0);
+
+        s.copysign(original_sign)
+    }
+}
+
+/// Creates a lookup table for an ICC `curv` tag from a transfer function.
+///
+/// This function generates a vector of 16-bit integers representing the response
+/// of the HLG or PQ electro-optical transfer functions (EOTF).
+///
+/// ### Arguments
+/// * `n` - The number of entries in the lookup table. Must not exceed 4096.
+/// * `tf` - The transfer function to model, either `TransferFunction::HLG` or `TransferFunction::PQ`.
+/// * `tone_map` - A boolean to enable tone mapping for PQ curves. Currently a stub.
+///
+/// ### Returns
+/// A `Result` containing the `Vec<f32>` lookup table or an `Error`.
+fn create_table_curve(
+    n: usize,
+    tf: &JxlTransferFunction,
+    _tone_map: bool,
+) -> Result<Vec<f32>, Error> {
+    // ICC Specification (v4.4, section 10.6) for `curveType` with `curv`
+    // processing elements states the table can have at most 4096 entries.
+    if n > 4096 {
+        return Err(Error::IccTableSizeExceeded(n));
+    }
+
+    if !matches!(tf, JxlTransferFunction::PQ | JxlTransferFunction::HLG) {
+        return Err(Error::IccUnsupportedTransferFunction);
+    }
+
+    // The peak luminance for PQ decoding, as specified in the original C++ code.
+    const PQ_INTENSITY_TARGET: f64 = 10000.0;
+
+    let mut table = Vec::with_capacity(n);
+    for i in 0..n {
+        // `x` represents the normalized input signal, from 0.0 to 1.0.
+        let x = i as f64 / (n - 1) as f64;
+
+        // Apply the specified EOTF to get the linear light value `y`.
+        // The output `y` is normalized to the range [0.0, 1.0].
+        let y = match tf {
+            JxlTransferFunction::HLG => TF_HLG::display_from_encoded(x),
+            JxlTransferFunction::PQ => {
+                // For PQ, the output of the EOTF is absolute luminance, so we
+                // normalize it back to [0, 1] relative to the peak luminance.
+                display_from_encoded_pq(PQ_INTENSITY_TARGET as f32, x) / PQ_INTENSITY_TARGET
+            }
+            _ => unreachable!(), // Already checked above.
+        };
+
+        // Note: the tone_map parameter is unused in the default build. When
+        // kEnable3DToneMapping is true (the default, matching libjxl), HDR
+        // content takes the 3D LUT path via create_icc_lut_atob_tag_for_hdr()
+        // instead of this 1D curve, so tone_map is always false here. The
+        // parameter is retained for API compatibility with a hypothetical
+        // non-3D-LUT build.
+
+        // Clamp the final value to the valid range [0.0, 1.0]. This is
+        // particularly important for HLG, which can exceed 1.0.
+        let y_clamped = y.clamp(0.0, 1.0);
+
+        // table.push((y_clamped * 65535.0).round() as u16);
+        table.push(y_clamped as f32);
+    }
+
+    Ok(table)
+}
+
+// ============================================================================
+// HDR Tone Mapping Implementation
+// ============================================================================
+
+/// BT.2408 HDR to SDR tone mapper.
+/// Maps PQ content from source range (e.g., 0-10000 nits) to target range (e.g., 0-250 nits).
+struct Rec2408ToneMapper {
+    source_range: (f32, f32), // (min, max) in nits
+    target_range: (f32, f32),
+    luminances: [f32; 3], // RGB luminance coefficients (Y values)
+
+    // Precomputed values
+    pq_mastering_min: f32,
+    #[allow(dead_code)] // Stored for potential future use / debugging
+    pq_mastering_max: f32,
+    pq_mastering_range: f32,
+    inv_pq_mastering_range: f32,
+    min_lum: f32,
+    max_lum: f32,
+    ks: f32,
+    inv_one_minus_ks: f32,
+    normalizer: f32,
+    inv_target_peak: f32,
+}
+
+impl Rec2408ToneMapper {
+    fn new(source_range: (f32, f32), target_range: (f32, f32), luminances: [f32; 3]) -> Self {
+        let pq_mastering_min = Self::linear_to_pq(source_range.0);
+        let pq_mastering_max = Self::linear_to_pq(source_range.1);
+        let pq_mastering_range = pq_mastering_max - pq_mastering_min;
+        let inv_pq_mastering_range = 1.0 / pq_mastering_range;
+
+        let min_lum =
+            (Self::linear_to_pq(target_range.0) - pq_mastering_min) * inv_pq_mastering_range;
+        let max_lum =
+            (Self::linear_to_pq(target_range.1) - pq_mastering_min) * inv_pq_mastering_range;
+        let ks = 1.5 * max_lum - 0.5;
+
+        Self {
+            source_range,
+            target_range,
+            luminances,
+            pq_mastering_min,
+            pq_mastering_max,
+            pq_mastering_range,
+            inv_pq_mastering_range,
+            min_lum,
+            max_lum,
+            ks,
+            inv_one_minus_ks: 1.0 / (1.0 - ks).max(1e-6),
+            normalizer: source_range.1 / target_range.1,
+            inv_target_peak: 1.0 / target_range.1,
+        }
+    }
+
+    /// PQ inverse EOTF - converts luminance (nits) to PQ encoded value.
+    /// Uses the existing `linear_to_pq_precise` from color::tf.
+    fn linear_to_pq(luminance: f32) -> f32 {
+        let mut val = [luminance / 10000.0]; // Normalize to 0-1 for 10000 nits
+        linear_to_pq_precise(10000.0, &mut val);
+        val[0]
+    }
+
+    /// PQ EOTF - converts PQ encoded value to luminance (nits).
+    /// Uses the existing `pq_to_linear_precise` from color::tf.
+    fn pq_to_linear(encoded: f32) -> f32 {
+        let mut val = [encoded];
+        pq_to_linear_precise(10000.0, &mut val);
+        val[0] * 10000.0
+    }
+
+    fn t(&self, a: f32) -> f32 {
+        (a - self.ks) * self.inv_one_minus_ks
+    }
+
+    fn p(&self, b: f32) -> f32 {
+        let t_b = self.t(b);
+        let t_b_2 = t_b * t_b;
+        let t_b_3 = t_b_2 * t_b;
+        (2.0 * t_b_3 - 3.0 * t_b_2 + 1.0) * self.ks
+            + (t_b_3 - 2.0 * t_b_2 + t_b) * (1.0 - self.ks)
+            + (-2.0 * t_b_3 + 3.0 * t_b_2) * self.max_lum
+    }
+
+    /// Apply tone mapping to RGB values (in-place)
+    fn tone_map(&self, rgb: &mut [f32; 3]) {
+        let luminance = self.source_range.1
+            * (self.luminances[0] * rgb[0]
+                + self.luminances[1] * rgb[1]
+                + self.luminances[2] * rgb[2]);
+
+        let normalized_pq = ((Self::linear_to_pq(luminance) - self.pq_mastering_min)
+            * self.inv_pq_mastering_range)
+            .min(1.0);
+
+        let e2 = if normalized_pq < self.ks {
+            normalized_pq
+        } else {
+            self.p(normalized_pq)
+        };
+
+        let one_minus_e2 = 1.0 - e2;
+        let one_minus_e2_2 = one_minus_e2 * one_minus_e2;
+        let one_minus_e2_4 = one_minus_e2_2 * one_minus_e2_2;
+        let e3 = self.min_lum * one_minus_e2_4 + e2;
+        let e4 = e3 * self.pq_mastering_range + self.pq_mastering_min;
+        let d4 = Self::pq_to_linear(e4);
+        let new_luminance = d4.clamp(0.0, self.target_range.1);
+
+        let min_luminance = 1e-6;
+        let use_cap = luminance <= min_luminance;
+        let ratio = new_luminance / luminance.max(min_luminance);
+        let cap = new_luminance * self.inv_target_peak;
+        let multiplier = ratio * self.normalizer;
+
+        for c in rgb.iter_mut() {
+            *c = if use_cap { cap } else { *c * multiplier };
+        }
+    }
+}
+
+/// Apply HLG OOTF for tone mapping HLG content to SDR.
+/// This implements the HLG OOTF inline for a single pixel, based on the same math
+/// as `color::tf::hlg_scene_to_display` but avoiding the bulk-processing API.
+fn apply_hlg_ootf(rgb: &mut [f32; 3], target_luminance: f32, luminances: [f32; 3]) {
+    // HLG OOTF: scene-referred to display-referred conversion
+    // system_gamma = 1.2 * 1.111^log2(intensity_display / 1000)
+    let system_gamma = 1.2_f32 * 1.111_f32.powf((target_luminance / 1e3).log2());
+    let exp = system_gamma - 1.0;
+
+    if exp.abs() < 0.1 {
+        return;
+    }
+
+    // Compute luminance and apply OOTF
+    let mixed = rgb[0] * luminances[0] + rgb[1] * luminances[1] + rgb[2] * luminances[2];
+    let mult = crate::util::fast_powf(mixed, exp);
+    rgb[0] *= mult;
+    rgb[1] *= mult;
+    rgb[2] *= mult;
+}
+
+/// Desaturate out-of-gamut pixels while preserving luminance.
+fn gamut_map(rgb: &mut [f32; 3], luminances: &[f32; 3], preserve_saturation: f32) {
+    let luminance = luminances[0] * rgb[0] + luminances[1] * rgb[1] + luminances[2] * rgb[2];
+
+    let mut gray_mix_saturation = 0.0_f32;
+    let mut gray_mix_luminance = 0.0_f32;
+
+    for &val in rgb.iter() {
+        let val_minus_gray = val - luminance;
+        let inv_val_minus_gray = if val_minus_gray == 0.0 {
+            1.0
+        } else {
+            1.0 / val_minus_gray
+        };
+        let val_over_val_minus_gray = val * inv_val_minus_gray;
+
+        if val_minus_gray < 0.0 {
+            gray_mix_saturation = gray_mix_saturation.max(val_over_val_minus_gray);
+        }
+
+        gray_mix_luminance = gray_mix_luminance.max(if val_minus_gray <= 0.0 {
+            gray_mix_saturation
+        } else {
+            val_over_val_minus_gray - inv_val_minus_gray
+        });
+    }
+
+    let gray_mix = (preserve_saturation * (gray_mix_saturation - gray_mix_luminance)
+        + gray_mix_luminance)
+        .clamp(0.0, 1.0);
+
+    for val in rgb.iter_mut() {
+        *val = gray_mix * (luminance - *val) + *val;
+    }
+
+    let max_clr = rgb[0].max(rgb[1]).max(rgb[2]).max(1.0);
+    let normalizer = 1.0 / max_clr;
+    for v in rgb.iter_mut() {
+        *v *= normalizer;
+    }
+}
+
+/// Tone map a single pixel and convert to PCS Lab for ICC profile.
+fn tone_map_pixel(
+    transfer_function: &JxlTransferFunction,
+    primaries: &JxlPrimaries,
+    white_point: &JxlWhitePoint,
+    input: [f32; 3],
+) -> Result<[u8; 3], Error> {
+    // Get primaries coordinates
+    let primaries_coords = primaries.to_xy_coords();
+    let (rx, ry) = primaries_coords[0];
+    let (gx, gy) = primaries_coords[1];
+    let (bx, by) = primaries_coords[2];
+    let (wx, wy) = white_point.to_xy_coords();
+
+    // Get the RGB to XYZ matrix (not adapted to D50 yet)
+    let primaries_xyz = primaries_to_xyz(rx, ry, gx, gy, bx, by, wx, wy)?;
+
+    // Extract luminances from Y row of the matrix
+    let luminances = [
+        primaries_xyz[1][0] as f32,
+        primaries_xyz[1][1] as f32,
+        primaries_xyz[1][2] as f32,
+    ];
+
+    // Apply EOTF to get linear values
+    let mut linear = match transfer_function {
+        JxlTransferFunction::PQ => {
+            // PQ EOTF - convert from encoded to linear (normalized to 0-1 range for 10000 nits)
+            [
+                Rec2408ToneMapper::pq_to_linear(input[0]) / 10000.0,
+                Rec2408ToneMapper::pq_to_linear(input[1]) / 10000.0,
+                Rec2408ToneMapper::pq_to_linear(input[2]) / 10000.0,
+            ]
+        }
+        JxlTransferFunction::HLG => {
+            // Use existing hlg_to_scene from color::tf
+            let mut vals = [input[0], input[1], input[2]];
+            hlg_to_scene(&mut vals);
+            vals
+        }
+        _ => return Err(Error::IccUnsupportedTransferFunction),
+    };
+
+    // Apply tone mapping
+    match transfer_function {
+        JxlTransferFunction::PQ => {
+            let tone_mapper = Rec2408ToneMapper::new(
+                (0.0, 10000.0), // PQ source range
+                (0.0, 250.0),   // SDR target range
+                luminances,
+            );
+            tone_mapper.tone_map(&mut linear);
+        }
+        JxlTransferFunction::HLG => {
+            // Apply HLG OOTF (80 nit SDR target)
+            apply_hlg_ootf(&mut linear, 80.0, luminances);
+        }
+        _ => {}
+    }
+
+    // Gamut map
+    gamut_map(&mut linear, &luminances, 0.3);
+
+    // Get chromatic adaptation matrix
+    let chad = adapt_to_xyz_d50(wx, wy)?;
+
+    // Combine matrices: to_xyzd50 = chad * primaries_xyz
+    // Use mul_3x3_matrix from util which works with f64
+    let to_xyzd50_f64 = mul_3x3_matrix(&chad, &primaries_xyz);
+
+    // Convert to f32 for the final calculation
+    let to_xyzd50: [[f32; 3]; 3] =
+        std::array::from_fn(|r| std::array::from_fn(|c| to_xyzd50_f64[r][c] as f32));
+
+    // Apply matrix to get XYZ D50
+    let xyz = [
+        linear[0] * to_xyzd50[0][0] + linear[1] * to_xyzd50[0][1] + linear[2] * to_xyzd50[0][2],
+        linear[0] * to_xyzd50[1][0] + linear[1] * to_xyzd50[1][1] + linear[2] * to_xyzd50[1][2],
+        linear[0] * to_xyzd50[2][0] + linear[1] * to_xyzd50[2][1] + linear[2] * to_xyzd50[2][2],
+    ];
+
+    // Convert XYZ to Lab
+    // D50 reference white
+    const XN: f32 = 0.964212;
+    const YN: f32 = 1.0;
+    const ZN: f32 = 0.825188;
+    const DELTA: f32 = 6.0 / 29.0;
+
+    let lab_f = |x: f32| -> f32 {
+        if x <= DELTA * DELTA * DELTA {
+            x * (1.0 / (3.0 * DELTA * DELTA)) + 4.0 / 29.0
+        } else {
+            x.cbrt()
+        }
+    };
+
+    let f_x = lab_f(xyz[0] / XN);
+    let f_y = lab_f(xyz[1] / YN);
+    let f_z = lab_f(xyz[2] / ZN);
+
+    // Convert to ICC PCS Lab encoding (8-bit)
+    // L* = 116 * f(Y/Yn) - 16, encoded as L* / 100 * 255
+    // a* = 500 * (f(X/Xn) - f(Y/Yn)), encoded as (a* + 128) for 8-bit
+    // b* = 200 * (f(Y/Yn) - f(Z/Zn)), encoded as (b* + 128) for 8-bit
+    Ok([
+        (255.0 * (1.16 * f_y - 0.16).clamp(0.0, 1.0)).round() as u8,
+        (128.0 + (500.0 * (f_x - f_y)).clamp(-128.0, 127.0)).round() as u8,
+        (128.0 + (200.0 * (f_y - f_z)).clamp(-128.0, 127.0)).round() as u8,
+    ])
+}
+
+/// Create mAB A2B0 tag for XYB color space.
+fn create_icc_lut_atob_tag_for_xyb(tags: &mut Vec<u8>) -> Result<(), Error> {
+    use super::xyb_constants::*;
+    use byteorder::{BigEndian, WriteBytesExt};
+
+    // Tag signature: 'mAB '
+    tags.extend_from_slice(b"mAB ");
+    // 4 reserved bytes set to 0
+    tags.write_u32::<BigEndian>(0)
+        .map_err(|_| Error::InvalidIccStream)?;
+    // Number of input channels
+    tags.push(3);
+    // Number of output channels
+    tags.push(3);
+    // 2 reserved bytes for padding
+    tags.write_u16::<BigEndian>(0)
+        .map_err(|_| Error::InvalidIccStream)?;
+
+    // Offsets (calculated based on structure size)
+    // offset to first B curve: 32
+    tags.write_u32::<BigEndian>(32)
+        .map_err(|_| Error::InvalidIccStream)?;
+    // offset to matrix: 244
+    tags.write_u32::<BigEndian>(244)
+        .map_err(|_| Error::InvalidIccStream)?;
+    // offset to first M curve: 148
+    tags.write_u32::<BigEndian>(148)
+        .map_err(|_| Error::InvalidIccStream)?;
+    // offset to CLUT: 80
+    tags.write_u32::<BigEndian>(80)
+        .map_err(|_| Error::InvalidIccStream)?;
+    // offset to first A curve (reuse linear B curves): 32
+    tags.write_u32::<BigEndian>(32)
+        .map_err(|_| Error::InvalidIccStream)?;
+
+    // offset = 32: B curves (3 identity/linear curves)
+    // Each curve is 12 bytes: 'para' (4) + reserved (4) + function type (2) + reserved (2)
+    // For type 0: Y = X^gamma, with gamma = 1.0 (identity)
+    for _ in 0..3 {
+        create_icc_curv_para_tag(tags, &[1.0], 0)?;
+    }
+
+    // offset = 80: CLUT
+    // 16 bytes for grid points (only first 3 used, rest 0)
+    for i in 0..16 {
+        tags.push(if i < 3 { 2 } else { 0 });
+    }
+    // precision = 2 (16-bit)
+    tags.push(2);
+    // 3 bytes padding
+    tags.push(0);
+    tags.write_u16::<BigEndian>(0)
+        .map_err(|_| Error::InvalidIccStream)?;
+
+    // 2x2x2x3 entries of 2 bytes each = 48 bytes
+    let cube = unscaled_a2b_cube_full();
+    for row_x in &cube {
+        for row_y in row_x {
+            for out_f in row_y {
+                for &val_f in out_f {
+                    let val = (65535.0 * val_f).round().clamp(0.0, 65535.0) as u16;
+                    tags.write_u16::<BigEndian>(val)
+                        .map_err(|_| Error::InvalidIccStream)?;
+                }
+            }
+        }
+    }
+
+    // offset = 148: M curves (3 parametric curves)
+    // Type 3 parametric curve: Y = (aX + b)^gamma + c for X >= d, else Y = cX
+    // Each curve: 12 + 5*4 = 32 bytes
+    let scale = xyb_scale();
+    for i in 0..3 {
+        let b = -XYB_OFFSET[i] - NEG_OPSIN_ABSORBANCE_BIAS_RGB[i].cbrt();
+        let params = [
+            3.0,                      // gamma
+            1.0 / scale[i],           // a
+            b,                        // b
+            0.0,                      // c (unused)
+            (-b * scale[i]).max(0.0), // d (make skcms happy)
+        ];
+        create_icc_curv_para_tag(tags, &params, 3)?;
+    }
+
+    // offset = 244: Matrix (12 values as s15Fixed16)
+    // 9 matrix values + 3 intercepts = 12 * 4 = 48 bytes
+    for v in XYB_ICC_MATRIX {
+        append_s15_fixed_16(tags, v as f32)?;
+    }
+
+    // Intercepts
+    for i in 0..3 {
+        let mut intercept: f64 = 0.0;
+        for j in 0..3 {
+            intercept += XYB_ICC_MATRIX[i * 3 + j] * (NEG_OPSIN_ABSORBANCE_BIAS_RGB[j] as f64);
+        }
+        append_s15_fixed_16(tags, intercept as f32)?;
+    }
+
+    Ok(())
+}
+
+/// Create mft1 (8-bit LUT) A2B0 tag for HDR tone mapping.
+fn create_icc_lut_atob_tag_for_hdr(
+    transfer_function: &JxlTransferFunction,
+    primaries: &JxlPrimaries,
+    white_point: &JxlWhitePoint,
+    tags: &mut Vec<u8>,
+) -> Result<(), Error> {
+    const LUT_DIM: usize = 9; // 9x9x9 3D LUT
+
+    // Tag signature: 'mft1'
+    tags.extend_from_slice(b"mft1");
+    // Reserved
+    tags.extend_from_slice(&0u32.to_be_bytes());
+    // Number of input channels
+    tags.push(3);
+    // Number of output channels
+    tags.push(3);
+    // Number of CLUT grid points
+    tags.push(LUT_DIM as u8);
+    // Padding
+    tags.push(0);
+
+    // Identity matrix (3x3, s15Fixed16)
+    for i in 0..3 {
+        for j in 0..3 {
+            let val: f32 = if i == j { 1.0 } else { 0.0 };
+            append_s15_fixed_16(tags, val)?;
+        }
+    }
+
+    // Input tables (identity, 256 entries per channel)
+    for _ in 0..3 {
+        for i in 0..256 {
+            tags.push(i as u8);
+        }
+    }
+
+    // 3D CLUT
+    for ix in 0..LUT_DIM {
+        for iy in 0..LUT_DIM {
+            for ib in 0..LUT_DIM {
+                let input = [
+                    ix as f32 / (LUT_DIM - 1) as f32,
+                    iy as f32 / (LUT_DIM - 1) as f32,
+                    ib as f32 / (LUT_DIM - 1) as f32,
+                ];
+                let pcslab = tone_map_pixel(transfer_function, primaries, white_point, input)?;
+                tags.extend_from_slice(&pcslab);
+            }
+        }
+    }
+
+    // Output tables (identity, 256 entries per channel)
+    for _ in 0..3 {
+        for i in 0..256 {
+            tags.push(i as u8);
+        }
+    }
+
+    Ok(())
+}
+
+/// Create mBA B2A0 tag (no-op, required by some software like Safari).
+fn create_icc_noop_btoa_tag(tags: &mut Vec<u8>) -> Result<(), Error> {
+    // Tag signature: 'mBA '
+    tags.extend_from_slice(b"mBA ");
+    // Reserved
+    tags.extend_from_slice(&0u32.to_be_bytes());
+    // Number of input channels
+    tags.push(3);
+    // Number of output channels
+    tags.push(3);
+    // Padding
+    tags.extend_from_slice(&0u16.to_be_bytes());
+    // Offset to first B curve
+    tags.extend_from_slice(&32u32.to_be_bytes());
+    // Offset to matrix (0 = none)
+    tags.extend_from_slice(&0u32.to_be_bytes());
+    // Offset to first M curve (0 = none)
+    tags.extend_from_slice(&0u32.to_be_bytes());
+    // Offset to CLUT (0 = none)
+    tags.extend_from_slice(&0u32.to_be_bytes());
+    // Offset to first A curve (0 = none)
+    tags.extend_from_slice(&0u32.to_be_bytes());
+
+    // Three identity parametric curves (gamma = 1.0)
+    // Each curve is a 'para' type with function type 0 (simple gamma)
+    for _ in 0..3 {
+        create_icc_curv_para_tag(tags, &[1.0], 0)?;
+    }
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_md5() {
+        // Test vectors
+        let test_cases = vec![
+            ("", "d41d8cd98f00b204e9800998ecf8427e"),
+            (
+                "The quick brown fox jumps over the lazy dog",
+                "9e107d9d372bb6826bd81d3542a419d6",
+            ),
+            ("abc", "900150983cd24fb0d6963f7d28e17f72"),
+            ("message digest", "f96b697d7cb7938d525a2f31aaf161d0"),
+            (
+                "abcdefghijklmnopqrstuvwxyz",
+                "c3fcd3d76192e4007dfb496cca67e13b",
+            ),
+            (
+                "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+                "57edf4a22be3c955ac49da2e2107b67a",
+            ),
+        ];
+
+        for (input, expected) in test_cases {
+            let hash = compute_md5(input.as_bytes());
+            let hex: String = hash.iter().map(|e| format!("{:02x}", e)).collect();
+            assert_eq!(hex, expected, "Failed for input: '{}'", input);
+        }
+    }
+
+    #[test]
+    fn test_description() {
+        assert_eq!(
+            JxlColorEncoding::srgb(false).get_color_encoding_description(),
+            "RGB_D65_SRG_Rel_SRG"
+        );
+        assert_eq!(
+            JxlColorEncoding::srgb(true).get_color_encoding_description(),
+            "Gra_D65_Rel_SRG"
+        );
+        assert_eq!(
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::BT2100,
+                transfer_function: JxlTransferFunction::Gamma(1.7),
+                rendering_intent: RenderingIntent::Relative
+            }
+            .get_color_encoding_description(),
+            "RGB_D65_202_Rel_g1.7000000"
+        );
+        assert_eq!(
+            JxlColorEncoding::RgbColorSpace {
+                white_point: JxlWhitePoint::D65,
+                primaries: JxlPrimaries::P3,
+                transfer_function: JxlTransferFunction::SRGB,
+                rendering_intent: RenderingIntent::Perceptual
+            }
+            .get_color_encoding_description(),
+            "DisplayP3"
+        );
+    }
+
+    #[test]
+    fn test_rec2408_tone_mapper() {
+        // Test the Rec2408ToneMapper with BT.2100 luminances
+        let luminances = [0.2627, 0.6780, 0.0593]; // BT.2100/BT.2020
+        let tone_mapper = Rec2408ToneMapper::new((0.0, 10000.0), (0.0, 250.0), luminances);
+
+        // Test with a bright HDR pixel (should be compressed)
+        let mut rgb = [0.8, 0.8, 0.8]; // High values in PQ space = very bright
+        tone_mapper.tone_map(&mut rgb);
+        // Result should be within valid range
+        assert!(rgb[0] >= 0.0 && rgb[0] <= 1.0, "R out of range: {}", rgb[0]);
+        assert!(rgb[1] >= 0.0 && rgb[1] <= 1.0, "G out of range: {}", rgb[1]);
+        assert!(rgb[2] >= 0.0 && rgb[2] <= 1.0, "B out of range: {}", rgb[2]);
+
+        // Test with a dark pixel (should not be affected much)
+        let mut rgb_dark = [0.1, 0.1, 0.1];
+        tone_mapper.tone_map(&mut rgb_dark);
+        assert!(
+            rgb_dark[0] >= 0.0 && rgb_dark[0] <= 1.0,
+            "R out of range: {}",
+            rgb_dark[0]
+        );
+    }
+
+    #[test]
+    fn test_hlg_ootf() {
+        let luminances = [0.2627, 0.6780, 0.0593];
+
+        let mut rgb = [0.5, 0.5, 0.5];
+        apply_hlg_ootf(&mut rgb, 80.0, luminances);
+        // Result should be in valid range
+        assert!(rgb[0] >= 0.0, "R should be non-negative");
+        assert!(rgb[1] >= 0.0, "G should be non-negative");
+        assert!(rgb[2] >= 0.0, "B should be non-negative");
+    }
+
+    #[test]
+    fn test_gamut_map() {
+        let luminances = [0.2627, 0.6780, 0.0593];
+
+        // Test out-of-gamut pixel (negative value)
+        let mut rgb = [-0.1, 0.5, 0.5];
+        gamut_map(&mut rgb, &luminances, 0.3);
+        // All values should be non-negative after gamut mapping
+        assert!(rgb[0] >= 0.0, "R should be non-negative after gamut map");
+        assert!(rgb[1] >= 0.0, "G should be non-negative after gamut map");
+        assert!(rgb[2] >= 0.0, "B should be non-negative after gamut map");
+
+        // Test in-gamut pixel (should not change much)
+        let mut rgb_valid = [0.5, 0.3, 0.2];
+        gamut_map(&mut rgb_valid, &luminances, 0.3);
+        assert!(rgb_valid[0] >= 0.0 && rgb_valid[0] <= 1.0);
+        assert!(rgb_valid[1] >= 0.0 && rgb_valid[1] <= 1.0);
+        assert!(rgb_valid[2] >= 0.0 && rgb_valid[2] <= 1.0);
+    }
+
+    #[test]
+    fn test_tone_map_pixel_pq() {
+        let result = tone_map_pixel(
+            &JxlTransferFunction::PQ,
+            &JxlPrimaries::BT2100,
+            &JxlWhitePoint::D65,
+            [0.5, 0.5, 0.5],
+        );
+        assert!(result.is_ok());
+        let lab = result.unwrap();
+        // Lab L* should be in reasonable range for mid-gray after tone mapping
+        assert!(lab[0] > 0, "L* should be positive for non-black input");
+        // a* and b* should be near neutral (128) for achromatic input
+        assert!(
+            (lab[1] as i32 - 128).abs() < 10,
+            "a* should be near neutral"
+        );
+        assert!(
+            (lab[2] as i32 - 128).abs() < 10,
+            "b* should be near neutral"
+        );
+    }
+
+    #[test]
+    fn test_tone_map_pixel_hlg() {
+        let result = tone_map_pixel(
+            &JxlTransferFunction::HLG,
+            &JxlPrimaries::BT2100,
+            &JxlWhitePoint::D65,
+            [0.5, 0.5, 0.5],
+        );
+        assert!(result.is_ok());
+        let lab = result.unwrap();
+        // Lab L* should be in reasonable range
+        assert!(lab[0] > 0, "L* should be positive for non-black input");
+        // a* and b* should be near neutral (128) for achromatic input
+        assert!(
+            (lab[1] as i32 - 128).abs() < 10,
+            "a* should be near neutral"
+        );
+        assert!(
+            (lab[2] as i32 - 128).abs() < 10,
+            "b* should be near neutral"
+        );
+    }
+
+    #[test]
+    fn test_hdr_icc_profile_generation_pq() {
+        // Test that PQ HDR color encoding generates an ICC profile with A2B0/B2A0 tags.
+        // This tests the complete HDR tone mapping pipeline without needing an actual
+        // HDR JXL file - the color encoding is constructed programmatically.
+        let encoding = JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::BT2100,
+            transfer_function: JxlTransferFunction::PQ,
+            rendering_intent: RenderingIntent::Relative,
+        };
+
+        assert!(encoding.can_tone_map_for_icc());
+
+        let result = encoding.maybe_create_profile();
+        assert!(result.is_ok(), "Profile creation should succeed");
+        let profile_opt = result.unwrap();
+        assert!(profile_opt.is_some(), "Profile should be generated for PQ");
+
+        let profile = profile_opt.unwrap();
+        // Profile should be a valid ICC profile (starts with profile size, then signature)
+        assert!(profile.len() > 128, "Profile should have header + tags");
+
+        // Verify header has Lab PCS (bytes 20-23 should be "Lab ")
+        assert_eq!(
+            &profile[20..24],
+            b"Lab ",
+            "PCS should be Lab for HDR profiles"
+        );
+
+        // Check for 'mft1' (A2B0 tag type) somewhere in the profile
+        assert!(
+            profile.windows(4).any(|w| w == b"mft1"),
+            "Profile should contain mft1 tag (A2B0)"
+        );
+        assert!(
+            profile.windows(4).any(|w| w == b"mBA "),
+            "Profile should contain mBA tag (B2A0)"
+        );
+
+        // Verify CICP tag is present (for standard primaries)
+        assert!(
+            profile.windows(4).any(|w| w == b"cicp"),
+            "Profile should contain cicp tag"
+        );
+    }
+
+    #[test]
+    fn test_hdr_icc_profile_generation_hlg() {
+        // Test that HLG HDR color encoding generates an ICC profile with A2B0/B2A0 tags
+        let encoding = JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::BT2100,
+            transfer_function: JxlTransferFunction::HLG,
+            rendering_intent: RenderingIntent::Relative,
+        };
+
+        assert!(encoding.can_tone_map_for_icc());
+
+        let result = encoding.maybe_create_profile();
+        assert!(result.is_ok(), "Profile creation should succeed");
+        let profile_opt = result.unwrap();
+        assert!(profile_opt.is_some(), "Profile should be generated for HLG");
+
+        let profile = profile_opt.unwrap();
+        assert!(profile.len() > 128, "Profile should have header + tags");
+    }
+
+    #[test]
+    fn test_pq_eotf_inv_eotf_roundtrip() {
+        // Test that linear_to_pq and pq_to_linear are inverses
+        let test_values: [f32; 5] = [0.0, 100.0, 1000.0, 5000.0, 10000.0];
+        for &luminance in &test_values {
+            let encoded = Rec2408ToneMapper::linear_to_pq(luminance);
+            let decoded = Rec2408ToneMapper::pq_to_linear(encoded);
+            let diff = (luminance - decoded).abs();
+            assert!(
+                diff < 1.0,
+                "Roundtrip failed for {}: got {}, diff {}",
+                luminance,
+                decoded,
+                diff
+            );
+        }
+    }
+
+    #[test]
+    fn test_can_tone_map_for_icc() {
+        // PQ with D65 and standard primaries should be able to tone map
+        let pq_bt2100 = JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::BT2100,
+            transfer_function: JxlTransferFunction::PQ,
+            rendering_intent: RenderingIntent::Relative,
+        };
+        assert!(pq_bt2100.can_tone_map_for_icc());
+
+        // HLG with D65 and standard primaries should be able to tone map
+        let hlg_bt2100 = JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::BT2100,
+            transfer_function: JxlTransferFunction::HLG,
+            rendering_intent: RenderingIntent::Relative,
+        };
+        assert!(hlg_bt2100.can_tone_map_for_icc());
+
+        // sRGB should NOT be able to tone map (not HDR)
+        let srgb = JxlColorEncoding::srgb(false);
+        assert!(!srgb.can_tone_map_for_icc());
+
+        // Custom primaries should NOT be able to tone map
+        let custom_pq = JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::Chromaticities {
+                rx: 0.7,
+                ry: 0.3,
+                gx: 0.2,
+                gy: 0.8,
+                bx: 0.15,
+                by: 0.05,
+            },
+            transfer_function: JxlTransferFunction::PQ,
+            rendering_intent: RenderingIntent::Relative,
+        };
+        assert!(!custom_pq.can_tone_map_for_icc());
+    }
+
+    /// Integration test: decode actual HDR PQ test file and verify ICC profile
+    #[test]
+    fn test_hdr_pq_file_icc_profile() {
+        use crate::api::{JxlDecoder, JxlDecoderOptions, ProcessingResult};
+
+        let data = std::fs::read("resources/test/hdr_pq_test.jxl")
+            .expect("Failed to read hdr_pq_test.jxl - run from jxl crate directory");
+
+        let options = JxlDecoderOptions::default();
+        let decoder = JxlDecoder::new(options);
+        let mut input: &[u8] = &data;
+
+        let decoder_info = match decoder.process(&mut input).unwrap() {
+            ProcessingResult::Complete { result } => result,
+            _ => panic!("Expected complete decoding"),
+        };
+
+        // Get the color profile
+        let color_profile = decoder_info.output_color_profile();
+
+        // For HDR PQ content, we should be able to generate an ICC profile
+        let icc = color_profile.try_as_icc();
+        assert!(
+            icc.is_some(),
+            "Should generate ICC profile for HDR PQ content"
+        );
+
+        let profile = icc.unwrap();
+        // Verify it's an HDR profile with Lab PCS
+        assert_eq!(&profile[20..24], b"Lab ", "PCS should be Lab for HDR");
+        // Verify A2B0 tag exists
+        assert!(
+            profile.windows(4).any(|w| w == b"A2B0"),
+            "Should have A2B0 tag"
+        );
+        // Verify B2A0 tag exists
+        assert!(
+            profile.windows(4).any(|w| w == b"B2A0"),
+            "Should have B2A0 tag"
+        );
+    }
+
+    /// Integration test: decode actual HDR HLG test file and verify ICC profile
+    #[test]
+    fn test_hdr_hlg_file_icc_profile() {
+        use crate::api::{JxlDecoder, JxlDecoderOptions, ProcessingResult};
+
+        let data = std::fs::read("resources/test/hdr_hlg_test.jxl")
+            .expect("Failed to read hdr_hlg_test.jxl - run from jxl crate directory");
+
+        let options = JxlDecoderOptions::default();
+        let decoder = JxlDecoder::new(options);
+        let mut input: &[u8] = &data;
+
+        let decoder_info = match decoder.process(&mut input).unwrap() {
+            ProcessingResult::Complete { result } => result,
+            _ => panic!("Expected complete decoding"),
+        };
+
+        // Get the color profile
+        let color_profile = decoder_info.output_color_profile();
+
+        // For HDR HLG content, we should be able to generate an ICC profile
+        let icc = color_profile.try_as_icc();
+        assert!(
+            icc.is_some(),
+            "Should generate ICC profile for HDR HLG content"
+        );
+
+        let profile = icc.unwrap();
+        // Verify it's an HDR profile with Lab PCS
+        assert_eq!(&profile[20..24], b"Lab ", "PCS should be Lab for HDR");
+        // Verify A2B0 tag exists
+        assert!(
+            profile.windows(4).any(|w| w == b"A2B0"),
+            "Should have A2B0 tag"
+        );
+    }
+
+    #[test]
+    fn test_same_color_encoding_identical() {
+        // Identical encodings → same
+        let srgb1 = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let srgb2 = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(srgb1.same_color_encoding(&srgb2));
+    }
+
+    #[test]
+    fn test_same_color_encoding_different_transfer() {
+        // Same primaries and white point, different transfer function → NOT same
+        let srgb_gamma = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let srgb_linear = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::Linear,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(!srgb_gamma.same_color_encoding(&srgb_linear));
+        assert!(!srgb_linear.same_color_encoding(&srgb_gamma));
+    }
+
+    #[test]
+    fn test_same_color_encoding_different_primaries() {
+        // Different primaries → NOT same
+        let srgb = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let p3 = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::P3,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(!srgb.same_color_encoding(&p3));
+        assert!(!p3.same_color_encoding(&srgb));
+    }
+
+    #[test]
+    fn test_same_color_encoding_different_white_point() {
+        // Different white point → NOT same
+        let d65 = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let dci = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::DCI,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(!d65.same_color_encoding(&dci));
+    }
+
+    #[test]
+    fn test_same_color_encoding_grayscale() {
+        // Grayscale with same white point, different transfer → NOT same
+        let gray_srgb = JxlColorProfile::Simple(JxlColorEncoding::GrayscaleColorSpace {
+            white_point: JxlWhitePoint::D65,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let gray_linear = JxlColorProfile::Simple(JxlColorEncoding::GrayscaleColorSpace {
+            white_point: JxlWhitePoint::D65,
+            transfer_function: JxlTransferFunction::Linear,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(!gray_srgb.same_color_encoding(&gray_linear));
+        // But identical grayscale encodings are same
+        let gray_srgb2 = JxlColorProfile::Simple(JxlColorEncoding::GrayscaleColorSpace {
+            white_point: JxlWhitePoint::D65,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(gray_srgb.same_color_encoding(&gray_srgb2));
+    }
+
+    #[test]
+    fn test_same_color_encoding_icc_profile() {
+        let srgb = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let icc_a = JxlColorProfile::Icc(vec![0u8; 100]);
+        let icc_b = JxlColorProfile::Icc(vec![0u8; 100]); // Same bytes as icc_a
+        let icc_c = JxlColorProfile::Icc(vec![1u8; 100]); // Different bytes
+
+        // Mixed types never match
+        assert!(!srgb.same_color_encoding(&icc_a));
+        assert!(!icc_a.same_color_encoding(&srgb));
+
+        // Identical ICC bytes → same encoding (CMS is a no-op)
+        assert!(icc_a.same_color_encoding(&icc_a));
+        assert!(icc_a.same_color_encoding(&icc_b));
+
+        // Different ICC bytes → different encoding
+        assert!(!icc_a.same_color_encoding(&icc_c));
+
+        // CMYK ICC profiles are never considered same (CMS always needed for K channel)
+        let mut cmyk_data = vec![0u8; 100];
+        cmyk_data[16..20].copy_from_slice(b"CMYK");
+        let cmyk_a = JxlColorProfile::Icc(cmyk_data.clone());
+        let cmyk_b = JxlColorProfile::Icc(cmyk_data);
+        assert!(!cmyk_a.same_color_encoding(&cmyk_b));
+    }
+
+    #[test]
+    fn test_same_color_encoding_rgb_vs_grayscale() {
+        // RGB vs Grayscale → NOT same
+        let rgb = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        let gray = JxlColorProfile::Simple(JxlColorEncoding::GrayscaleColorSpace {
+            white_point: JxlWhitePoint::D65,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+        assert!(!rgb.same_color_encoding(&gray));
+        assert!(!gray.same_color_encoding(&rgb));
+    }
+
+    /// Verify XYB color profiles generate valid ICC profiles with A2B0/B2A0 tags.
+    #[test]
+    fn test_xyb_icc_profile_generation() {
+        let xyb = JxlColorProfile::Simple(JxlColorEncoding::XYB {
+            rendering_intent: RenderingIntent::Perceptual,
+        });
+
+        let icc = xyb.try_as_icc().expect("XYB should generate ICC profile");
+        assert!(!icc.is_empty());
+        assert!(icc.windows(4).any(|w| w == b"mAB "));
+        assert!(icc.windows(4).any(|w| w == b"mBA "));
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/convenience.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/convenience.rs
new file mode 100644
index 00000000..130c04df
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/convenience.rs
@@ -0,0 +1,428 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! High-level convenience API for decoding JXL images.
+//!
+//! For most use cases, [`decode`] is all you need:
+//!
+//! ```no_run
+//! let data = std::fs::read("image.jxl").unwrap();
+//! let image = zenjxl_decoder::decode(&data).unwrap();
+//! let (w, h) = (image.width, image.height);
+//! let rgba: &[u8] = &image.data;
+//! ```
+//!
+//! Use [`read_header`] to inspect metadata without decoding pixels.
+//!
+//! For streaming input, incremental decoding, or fine-grained control over
+//! pixel format and color management, use the lower-level [`JxlDecoder`]
+//! typestate API instead.
+//!
+//! [`JxlDecoder`]: super::JxlDecoder
+
+use super::{
+    GainMapBundle, JxlBasicInfo, JxlColorProfile, JxlColorType, JxlDataFormat, JxlDecoder,
+    JxlDecoderLimits, JxlDecoderOptions, JxlOutputBuffer, JxlPixelFormat, ProcessingResult, states,
+};
+use crate::error::{Error, Result};
+use crate::headers::extra_channels::ExtraChannel;
+use crate::image::{OwnedRawImage, Rect};
+
+/// A decoded JXL image with interleaved RGBA (or GrayAlpha) u8 pixel data.
+#[non_exhaustive]
+pub struct JxlImage {
+    /// Image width in pixels.
+    pub width: usize,
+    /// Image height in pixels.
+    pub height: usize,
+    /// Interleaved pixel data: RGBA or GrayAlpha, row-major, tightly packed.
+    /// Length = `width * height * channels` where channels is 4 (RGBA) or 2 (GrayAlpha).
+    pub data: Vec<u8>,
+    /// Number of channels per pixel (4 for RGBA, 2 for GrayAlpha).
+    pub channels: usize,
+    /// True if the source image is grayscale (output is GrayAlpha).
+    pub is_grayscale: bool,
+    /// Image metadata from the file header.
+    pub info: JxlBasicInfo,
+    /// The color profile of the output pixels.
+    pub output_profile: JxlColorProfile,
+    /// The color profile embedded in the file.
+    pub embedded_profile: JxlColorProfile,
+    /// HDR gain map bundle from a `jhgm` container box, if present.
+    ///
+    /// Captured whether the box precedes or follows the codestream. For
+    /// animations, boxes that follow the codestream are not read (decoding
+    /// stops after the first frame).
+    pub gain_map: Option<GainMapBundle>,
+    /// Raw EXIF data from the `Exif` container box (TIFF header offset stripped).
+    /// `None` for bare codestreams or files without an `Exif` box.
+    ///
+    /// Captured whether the box precedes or follows the codestream. For
+    /// animations, boxes that follow the codestream are not read (decoding
+    /// stops after the first frame).
+    pub exif: Option<Vec<u8>>,
+    /// Raw XMP data from the `xml ` container box.
+    /// `None` for bare codestreams or files without an `xml ` box.
+    ///
+    /// Captured whether the box precedes or follows the codestream. For
+    /// animations, boxes that follow the codestream are not read (decoding
+    /// stops after the first frame).
+    pub xmp: Option<Vec<u8>>,
+}
+
+/// Image metadata extracted from the file header, without decoding pixels.
+#[non_exhaustive]
+pub struct JxlImageInfo {
+    /// Image metadata (dimensions, bit depth, orientation, extra channels, animation).
+    pub info: JxlBasicInfo,
+    /// The color profile embedded in the file.
+    pub embedded_profile: JxlColorProfile,
+}
+
+/// Decode a JXL image from a byte slice to RGBA u8 pixels.
+///
+/// For grayscale images, returns GrayAlpha u8 (2 channels).
+/// For color images, returns RGBA u8 (4 channels).
+/// Alpha is always included; images without alpha get opaque (255) alpha.
+///
+/// Decodes only the first frame. For animation support, use the
+/// [`JxlDecoder`](super::JxlDecoder) streaming API.
+///
+/// Uses default security limits and parallel decoding (if the `threads`
+/// feature is enabled). For custom limits or cancellation, use
+/// [`decode_with`].
+///
+/// # Example
+///
+/// ```no_run
+/// let data = std::fs::read("photo.jxl").unwrap();
+/// let image = zenjxl_decoder::decode(&data).unwrap();
+/// assert_eq!(image.data.len(), image.width * image.height * image.channels);
+/// ```
+pub fn decode(data: &[u8]) -> Result<JxlImage> {
+    decode_with(data, JxlDecoderOptions::default())
+}
+
+/// Decode a JXL image with custom decoder options.
+///
+/// Same output format as [`decode`] (RGBA u8 or GrayAlpha u8), but allows
+/// configuring security limits, cancellation, parallel mode, and CMS.
+pub fn decode_with(data: &[u8], options: JxlDecoderOptions) -> Result<JxlImage> {
+    let mut input: &[u8] = data;
+
+    // Phase 1: Initialized → WithImageInfo (parse header + ICC)
+    let decoder = JxlDecoder::<states::Initialized>::new(options);
+    let mut decoder = match decoder.process(&mut input)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => {
+            return Err(Error::OutOfBounds(0));
+        }
+    };
+
+    let info = decoder.basic_info().clone();
+    let embedded_profile = decoder.embedded_color_profile().clone();
+    let (width, height) = info.size;
+
+    // Determine color type: add alpha to whatever the image naturally is
+    let is_grayscale = decoder.current_pixel_format().color_type.is_grayscale();
+    let color_type = if is_grayscale {
+        JxlColorType::GrayscaleAlpha
+    } else {
+        JxlColorType::Rgba
+    };
+    let channels = color_type.samples_per_pixel();
+
+    // Find main alpha channel for interleaving
+    let main_alpha = info
+        .extra_channels
+        .iter()
+        .position(|ec| ec.ec_type == ExtraChannel::Alpha);
+
+    let u8_format = JxlDataFormat::U8 { bit_depth: 8 };
+
+    // Set pixel format: interleave alpha into color channels, keep other extras as u8
+    let pixel_format = JxlPixelFormat {
+        color_type,
+        color_data_format: Some(u8_format),
+        extra_channel_format: info
+            .extra_channels
+            .iter()
+            .enumerate()
+            .map(|(i, _)| {
+                if Some(i) == main_alpha {
+                    None // interleaved into RGBA/GrayAlpha
+                } else {
+                    Some(u8_format)
+                }
+            })
+            .collect(),
+    };
+    decoder.set_pixel_format(pixel_format);
+
+    let output_profile = decoder.output_color_profile().clone();
+
+    // Count non-interleaved extra channels (everything except the main alpha)
+    let extra_count = info.extra_channels.len() - usize::from(main_alpha.is_some());
+
+    // Phase 2: WithImageInfo → WithFrameInfo (parse frame header)
+    let decoder = match decoder.process(&mut input)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => {
+            return Err(Error::OutOfBounds(0));
+        }
+    };
+
+    // Allocate output buffers
+    let row_bytes = width * channels; // 1 byte per sample for u8
+    let mut output = OwnedRawImage::new_uninit((row_bytes, height))?;
+    #[cfg(feature = "threads")]
+    output.prefault_parallel();
+
+    let mut extra_outputs: Vec<OwnedRawImage> = (0..extra_count)
+        .map(|_| OwnedRawImage::new_uninit((width, height)))
+        .collect::<Result<_>>()?;
+
+    // Phase 3: WithFrameInfo → decode pixels
+    let mut bufs: Vec<JxlOutputBuffer<'_>> = std::iter::once(&mut output)
+        .chain(extra_outputs.iter_mut())
+        .map(|img| {
+            let rect = Rect {
+                size: img.byte_size(),
+                origin: (0, 0),
+            };
+            JxlOutputBuffer::from_image_rect_mut(img.get_rect_mut(rect))
+        })
+        .collect();
+
+    let mut decoder = match decoder.process(&mut input, &mut bufs)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => {
+            return Err(Error::OutOfBounds(0));
+        }
+    };
+
+    // Phase 4: drain trailing container boxes, then extract box metadata.
+    // The jhgm (gain map), Exif, and xml boxes may follow the codestream —
+    // jxl-encoder's `append_gain_map_bundle` writes `signature + ftyp + jxlc
+    // + jhgm` — and the box parser only reaches them by processing past the
+    // final frame (#20). Animations stop after the first frame, so boxes
+    // trailing a multi-frame codestream stay unread; use the low-level
+    // [`JxlDecoder`] API to collect those.
+    let (gain_map, exif, xmp) = if !decoder.has_more_frames() && !input.is_empty() {
+        match decoder.process(&mut input)? {
+            ProcessingResult::Complete { mut result } => take_box_metadata(&mut result),
+            ProcessingResult::NeedsMoreInput { mut fallback, .. } => {
+                take_box_metadata(&mut fallback)
+            }
+        }
+    } else {
+        take_box_metadata(&mut decoder)
+    };
+
+    // Copy to tightly packed Vec<u8>
+    let total_bytes = row_bytes * height;
+    let mut pixels = Vec::with_capacity(total_bytes);
+    for y in 0..height {
+        pixels.extend_from_slice(output.row(y));
+    }
+
+    Ok(JxlImage {
+        width,
+        height,
+        data: pixels,
+        channels,
+        is_grayscale,
+        info,
+        output_profile,
+        embedded_profile,
+        gain_map,
+        exif,
+        xmp,
+    })
+}
+
+/// Takes the gain map, EXIF, and XMP captured by the box parser, in one call
+/// usable from any decoder state.
+fn take_box_metadata<S: states::JxlState>(
+    decoder: &mut JxlDecoder<S>,
+) -> (Option<GainMapBundle>, Option<Vec<u8>>, Option<Vec<u8>>) {
+    (
+        decoder.take_gain_map(),
+        decoder.take_exif(),
+        decoder.take_xmp(),
+    )
+}
+
+/// Reconstruct the original JPEG bytes from a JXL file that carries a JBRD
+/// (JPEG Bitstream Reconstruction Data) box — i.e. a JXL produced by lossless
+/// JPEG transcoding (`jxl_encoder::LosslessConfig::encode_jpeg_transcode`).
+///
+/// Returns `Ok(Some(bytes))` with the **byte-exact** original JPEG when the
+/// file carries reconstruction data, or `Ok(None)` when it does not (a JXL that
+/// was not produced from a JPEG). This is the pure-Rust counterpart to
+/// `djxl <in.jxl> <out.jpg> --reconstruct_jpeg`.
+///
+/// Requires the `jpeg` cargo feature.
+///
+/// # Example
+///
+/// ```no_run
+/// let jxl = std::fs::read("photo.jxl").unwrap();
+/// if let Some(jpeg) = zenjxl_decoder::reconstruct_jpeg(&jxl).unwrap() {
+///     std::fs::write("photo_reconstructed.jpg", &jpeg).unwrap();
+/// }
+/// ```
+#[cfg(feature = "jpeg")]
+pub fn reconstruct_jpeg(data: &[u8]) -> Result<Option<Vec<u8>>> {
+    reconstruct_jpeg_with(data, JxlDecoderOptions::default())
+}
+
+/// Reconstruct the original JPEG bytes with custom decoder options.
+///
+/// See [`reconstruct_jpeg`]. Drives a full frame decode (reconstruction needs
+/// the captured quantized coefficients) and then returns the JBRD-reconstructed
+/// JPEG. The decoded pixels themselves are discarded.
+#[cfg(feature = "jpeg")]
+pub fn reconstruct_jpeg_with(data: &[u8], options: JxlDecoderOptions) -> Result<Option<Vec<u8>>> {
+    let mut input: &[u8] = data;
+
+    // Phase 1: parse header.
+    let decoder = JxlDecoder::<states::Initialized>::new(options);
+    let mut decoder = match decoder.process(&mut input)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => return Err(Error::OutOfBounds(0)),
+    };
+
+    let info = decoder.basic_info().clone();
+    let (width, height) = info.size;
+
+    // Output format mirrors `decode_with`: natural color type + interleaved
+    // alpha. The pixels are discarded — we only need a complete frame decode so
+    // the JBRD coefficient capture runs.
+    let is_grayscale = decoder.current_pixel_format().color_type.is_grayscale();
+    let color_type = if is_grayscale {
+        JxlColorType::GrayscaleAlpha
+    } else {
+        JxlColorType::Rgba
+    };
+    let channels = color_type.samples_per_pixel();
+    let main_alpha = info
+        .extra_channels
+        .iter()
+        .position(|ec| ec.ec_type == ExtraChannel::Alpha);
+    let u8_format = JxlDataFormat::U8 { bit_depth: 8 };
+    let pixel_format = JxlPixelFormat {
+        color_type,
+        color_data_format: Some(u8_format),
+        extra_channel_format: info
+            .extra_channels
+            .iter()
+            .enumerate()
+            .map(|(i, _)| {
+                if Some(i) == main_alpha {
+                    None
+                } else {
+                    Some(u8_format)
+                }
+            })
+            .collect(),
+    };
+    decoder.set_pixel_format(pixel_format);
+    let extra_count = info.extra_channels.len() - usize::from(main_alpha.is_some());
+
+    // Phase 2: parse frame header.
+    let decoder = match decoder.process(&mut input)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => return Err(Error::OutOfBounds(0)),
+    };
+
+    // Phase 3: decode the frame into throwaway buffers.
+    let row_bytes = width * channels;
+    let mut output = OwnedRawImage::new_uninit((row_bytes, height))?;
+    let mut extra_outputs: Vec<OwnedRawImage> = (0..extra_count)
+        .map(|_| OwnedRawImage::new_uninit((width, height)))
+        .collect::<Result<_>>()?;
+    let mut bufs: Vec<JxlOutputBuffer<'_>> = core::iter::once(&mut output)
+        .chain(extra_outputs.iter_mut())
+        .map(|img| {
+            let rect = Rect {
+                size: img.byte_size(),
+                origin: (0, 0),
+            };
+            JxlOutputBuffer::from_image_rect_mut(img.get_rect_mut(rect))
+        })
+        .collect();
+
+    let mut decoder = match decoder.process(&mut input, &mut bufs)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => return Err(Error::OutOfBounds(0)),
+    };
+
+    // Phase 4: drain the remaining input so the box parser consumes the trailing
+    // Exif / xml metadata boxes (which follow the codestream in a JPEG-transcode
+    // container). Only then can `take_jpeg_reconstruction` stitch EXIF/XMP back
+    // into the reconstructed APPn markers. A JBRD transcode has a single frame,
+    // so this drains to `NeedsMoreInput` once the boxes are parsed.
+    loop {
+        if input.is_empty() {
+            break;
+        }
+        let before = input.len();
+        match decoder.process(&mut input)? {
+            ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                decoder = fallback;
+                if input.len() == before {
+                    break; // no progress — avoid spinning
+                }
+            }
+            // Unexpected second frame; the trailing boxes before it are parsed.
+            ProcessingResult::Complete { mut result } => {
+                return Ok(result.take_jpeg_reconstruction());
+            }
+        }
+    }
+
+    Ok(decoder.take_jpeg_reconstruction())
+}
+
+/// Read image metadata without decoding pixels.
+///
+/// Parses the file header and ICC profile. Returns dimensions, bit depth,
+/// orientation, extra channel info, animation info, and color profile.
+///
+/// This is fast (~1μs for sRGB images, ~7μs for images with ICC profiles).
+///
+/// # Example
+///
+/// ```no_run
+/// let data = std::fs::read("photo.jxl").unwrap();
+/// let header = zenjxl_decoder::read_header(&data).unwrap();
+/// let (w, h) = header.info.size;
+/// println!("{w}x{h}");
+/// ```
+pub fn read_header(data: &[u8]) -> Result<JxlImageInfo> {
+    read_header_with(data, JxlDecoderLimits::default())
+}
+
+/// Read image metadata with custom security limits.
+pub fn read_header_with(data: &[u8], limits: JxlDecoderLimits) -> Result<JxlImageInfo> {
+    let mut input: &[u8] = data;
+    let options = JxlDecoderOptions {
+        limits,
+        ..JxlDecoderOptions::default()
+    };
+    let decoder = JxlDecoder::<states::Initialized>::new(options);
+    let decoder = match decoder.process(&mut input)? {
+        ProcessingResult::Complete { result } => result,
+        ProcessingResult::NeedsMoreInput { .. } => {
+            return Err(Error::OutOfBounds(0));
+        }
+    };
+
+    Ok(JxlImageInfo {
+        info: decoder.basic_info().clone(),
+        embedded_profile: decoder.embedded_color_profile().clone(),
+    })
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/data_types.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/data_types.rs
new file mode 100644
index 00000000..cac7961d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/data_types.rs
@@ -0,0 +1,297 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{headers::extra_channels::ExtraChannel, image::DataTypeTag};
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum JxlColorType {
+    Grayscale,
+    GrayscaleAlpha,
+    Rgb,
+    Rgba,
+    Bgr,
+    Bgra,
+}
+
+impl JxlColorType {
+    pub fn has_alpha(&self) -> bool {
+        match self {
+            Self::Grayscale => false,
+            Self::GrayscaleAlpha => true,
+            Self::Rgb | Self::Bgr => false,
+            Self::Rgba | Self::Bgra => true,
+        }
+    }
+    pub fn samples_per_pixel(&self) -> usize {
+        match self {
+            Self::Grayscale => 1,
+            Self::GrayscaleAlpha => 2,
+            Self::Rgb | Self::Bgr => 3,
+            Self::Rgba | Self::Bgra => 4,
+        }
+    }
+    pub fn is_grayscale(&self) -> bool {
+        match self {
+            Self::Grayscale => true,
+            Self::GrayscaleAlpha => true,
+            Self::Rgb | Self::Bgr => false,
+            Self::Rgba | Self::Bgra => false,
+        }
+    }
+    pub fn add_alpha(&self) -> Self {
+        match self {
+            Self::Grayscale | Self::GrayscaleAlpha => Self::GrayscaleAlpha,
+            Self::Rgb | Self::Rgba => Self::Rgba,
+            Self::Bgr | Self::Bgra => Self::Bgra,
+        }
+    }
+}
+
+/// VarDCT quantizer fields recovered from a JPEG XL frame's `LfGlobal`
+/// section (the lossy quantization state).
+///
+/// These are the raw bitstream values. Mapping them to an encoder "quality"
+/// or Butteraugli distance is encoder-specific and approximate, so it lives in
+/// higher-level crates rather than the decoder.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct VardctQuantizer {
+    /// The frame's `global_scale` field. Larger = coarser quantization
+    /// (lower quality). Always >= 1.
+    pub global_scale: u32,
+    /// The frame's `quant_lf` field — the low-frequency quantization
+    /// multiplier. Always >= 1.
+    pub quant_lf: u32,
+}
+
+impl VardctQuantizer {
+    /// `2^16 / global_scale`: the inverse global scale. Larger = finer
+    /// quantization (higher quality). This is the objective dequantization
+    /// factor, independent of any encoder's quality mapping.
+    pub fn inv_global_scale(&self) -> f32 {
+        crate::frame::quantizer::GLOBAL_SCALE_DENOM as f32 / self.global_scale as f32
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Endianness {
+    LittleEndian,
+    BigEndian,
+}
+
+impl Endianness {
+    pub fn native() -> Self {
+        #[cfg(target_endian = "little")]
+        {
+            Endianness::LittleEndian
+        }
+        #[cfg(target_endian = "big")]
+        {
+            Endianness::BigEndian
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum JxlDataFormat {
+    U8 {
+        bit_depth: u8,
+    },
+    U16 {
+        endianness: Endianness,
+        bit_depth: u8,
+    },
+    F16 {
+        endianness: Endianness,
+    },
+    F32 {
+        endianness: Endianness,
+    },
+}
+
+impl JxlDataFormat {
+    pub fn bytes_per_sample(&self) -> usize {
+        match self {
+            Self::U8 { .. } => 1,
+            Self::U16 { .. } | Self::F16 { .. } => 2,
+            Self::F32 { .. } => 4,
+        }
+    }
+
+    pub fn f32() -> Self {
+        Self::F32 {
+            endianness: Endianness::native(),
+        }
+    }
+
+    pub(crate) fn data_type(&self) -> DataTypeTag {
+        match self {
+            JxlDataFormat::U8 { .. } => DataTypeTag::U8,
+            JxlDataFormat::U16 { .. } => DataTypeTag::U16,
+            JxlDataFormat::F16 { .. } => DataTypeTag::F16,
+            JxlDataFormat::F32 { .. } => DataTypeTag::F32,
+        }
+    }
+
+    /// Returns the byte representation of opaque alpha (1.0) for this format.
+    pub(crate) fn opaque_alpha_bytes(&self) -> Vec<u8> {
+        match self {
+            JxlDataFormat::U8 { bit_depth } => {
+                let val = (1u16 << bit_depth) - 1;
+                vec![val as u8]
+            }
+            JxlDataFormat::U16 {
+                endianness,
+                bit_depth,
+            } => {
+                let val = (1u32 << bit_depth) - 1;
+                let val = val as u16;
+                if *endianness == Endianness::LittleEndian {
+                    val.to_le_bytes().to_vec()
+                } else {
+                    val.to_be_bytes().to_vec()
+                }
+            }
+            JxlDataFormat::F16 { endianness } => {
+                // 1.0 in f16 is 0x3C00
+                let val: u16 = 0x3C00;
+                if *endianness == Endianness::LittleEndian {
+                    val.to_le_bytes().to_vec()
+                } else {
+                    val.to_be_bytes().to_vec()
+                }
+            }
+            JxlDataFormat::F32 { endianness } => {
+                let val: f32 = 1.0;
+                if *endianness == Endianness::LittleEndian {
+                    val.to_le_bytes().to_vec()
+                } else {
+                    val.to_be_bytes().to_vec()
+                }
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct JxlPixelFormat {
+    pub color_type: JxlColorType,
+    // None -> ignore
+    pub color_data_format: Option<JxlDataFormat>,
+    pub extra_channel_format: Vec<Option<JxlDataFormat>>,
+}
+
+impl JxlPixelFormat {
+    /// Creates an RGBA 8-bit pixel format.
+    pub fn rgba8(num_extra_channels: usize) -> Self {
+        Self {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::U8 { bit_depth: 8 }),
+            extra_channel_format: vec![
+                Some(JxlDataFormat::U8 { bit_depth: 8 });
+                num_extra_channels
+            ],
+        }
+    }
+
+    /// Creates an RGBA 16-bit pixel format.
+    pub fn rgba16(num_extra_channels: usize) -> Self {
+        Self {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::U16 {
+                endianness: Endianness::native(),
+                bit_depth: 16,
+            }),
+            extra_channel_format: vec![
+                Some(JxlDataFormat::U16 {
+                    endianness: Endianness::native(),
+                    bit_depth: 16,
+                });
+                num_extra_channels
+            ],
+        }
+    }
+
+    /// Creates an RGBA f16 pixel format.
+    pub fn rgba_f16(num_extra_channels: usize) -> Self {
+        Self {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::F16 {
+                endianness: Endianness::native(),
+            }),
+            extra_channel_format: vec![
+                Some(JxlDataFormat::F16 {
+                    endianness: Endianness::native(),
+                });
+                num_extra_channels
+            ],
+        }
+    }
+
+    /// Creates an RGBA f32 pixel format.
+    pub fn rgba_f32(num_extra_channels: usize) -> Self {
+        Self {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::F32 {
+                endianness: Endianness::native(),
+            }),
+            extra_channel_format: vec![
+                Some(JxlDataFormat::F32 {
+                    endianness: Endianness::native(),
+                });
+                num_extra_channels
+            ],
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum JxlBitDepth {
+    Int {
+        bits_per_sample: u32,
+    },
+    Float {
+        bits_per_sample: u32,
+        exponent_bits_per_sample: u32,
+    },
+}
+
+impl JxlBitDepth {
+    pub fn bits_per_sample(&self) -> u32 {
+        match self {
+            JxlBitDepth::Int { bits_per_sample: b } => *b,
+            JxlBitDepth::Float {
+                bits_per_sample: b, ..
+            } => *b,
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct JxlExtraChannel {
+    pub ec_type: ExtraChannel,
+    pub alpha_associated: bool,
+    /// Bits per sample for this extra channel.
+    pub bits_per_sample: u32,
+    /// Channel name (empty string if unnamed).
+    pub name: String,
+    /// Dimensional shift (0 = full resolution, 1 = half, etc.).
+    pub dim_shift: u32,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct JxlAnimation {
+    pub tps_numerator: u32,
+    pub tps_denominator: u32,
+    pub num_loops: u32,
+    pub have_timecodes: bool,
+}
+
+#[derive(Clone, Debug)]
+pub struct JxlFrameHeader {
+    pub name: String,
+    pub duration: Option<f64>,
+    /// Frame size (width, height)
+    pub size: (usize, usize),
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/decoder.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/decoder.rs
new file mode 100644
index 00000000..2c7cd9e4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/decoder.rs
@@ -0,0 +1,1929 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::{
+    JxlBasicInfo, JxlBitstreamInput, JxlColorProfile, JxlDecoderInner, JxlDecoderOptions,
+    JxlOutputBuffer, JxlPixelFormat, ProcessingResult,
+};
+#[cfg(test)]
+use crate::frame::Frame;
+use crate::{
+    api::{JxlFrameHeader, VardctQuantizer},
+    container::{frame_index::FrameIndexBox, gain_map::GainMapBundle},
+    error::Result,
+};
+use states::*;
+use std::marker::PhantomData;
+
+pub mod states {
+    pub trait JxlState {}
+    pub struct Initialized;
+    pub struct WithImageInfo;
+    pub struct WithFrameInfo;
+    impl JxlState for Initialized {}
+    impl JxlState for WithImageInfo {}
+    impl JxlState for WithFrameInfo {}
+}
+
+// Q: do we plan to add support for box decoding?
+// If we do, one way is to take a callback &[u8; 4] -> Box<dyn Write>.
+
+/// High level API using the typestate pattern to forbid invalid usage.
+pub struct JxlDecoder<State: JxlState> {
+    inner: Box<JxlDecoderInner>,
+    _state: PhantomData<State>,
+}
+
+#[cfg(test)]
+pub type FrameCallback = dyn FnMut(&Frame, usize) -> Result<()>;
+
+impl<S: JxlState> JxlDecoder<S> {
+    fn wrap_inner(inner: Box<JxlDecoderInner>) -> Self {
+        Self {
+            inner,
+            _state: PhantomData,
+        }
+    }
+
+    /// Sets a callback that processes all frames by calling `callback(frame, frame_index)`.
+    #[cfg(test)]
+    pub fn set_frame_callback(&mut self, callback: Box<FrameCallback>) {
+        self.inner.set_frame_callback(callback);
+    }
+
+    #[cfg(test)]
+    pub fn decoded_frames(&self) -> usize {
+        self.inner.decoded_frames()
+    }
+
+    /// Returns the reconstructed JPEG bytes if the file contained a JBRD box.
+    /// Call after decoding a frame. Returns `None` if no JBRD box was present
+    /// or the `jpeg` feature is not enabled.
+    #[cfg(feature = "jpeg")]
+    pub fn take_jpeg_reconstruction(&mut self) -> Option<Vec<u8>> {
+        self.inner.take_jpeg_reconstruction()
+    }
+
+    /// Returns the parsed frame index box, if the file contained one.
+    ///
+    /// The frame index box (`jxli`) is an optional part of the JXL container
+    /// format that provides a seek table for animated files, listing keyframe
+    /// byte offsets, timestamps, and frame counts.
+    pub fn frame_index(&self) -> Option<&FrameIndexBox> {
+        self.inner.frame_index()
+    }
+
+    /// Returns the first regular VarDCT frame's quantizer (`global_scale`,
+    /// `quant_lf`), if this is a lossy VarDCT image and that frame's `LfGlobal`
+    /// section has been decoded.
+    ///
+    /// VarDCT quality is governed by `global_scale`. Returns `None` for Modular
+    /// (lossless) images, or before the first regular frame has been reached —
+    /// e.g. immediately after image info. To recover it from a header probe,
+    /// advance one frame via `skip_frame`.
+    pub fn vardct_quantizer(&self) -> Option<VardctQuantizer> {
+        self.inner.vardct_quantizer()
+    }
+
+    /// Returns a reference to the parsed gain map bundle, if the file contained
+    /// a `jhgm` box (ISO 21496-1 HDR gain map).
+    ///
+    /// The gain map codestream is a bare JXL codestream that can be decoded
+    /// with the same decoder. The ISO 21496-1 metadata blob is stored as raw
+    /// bytes for the caller to parse.
+    ///
+    /// Note: the `jhgm` box may appear after the codestream in the container.
+    /// To capture trailing boxes, call `process` once more after the last
+    /// frame has been decoded — it drains the remaining container boxes.
+    pub fn gain_map(&self) -> Option<&GainMapBundle> {
+        self.inner.gain_map()
+    }
+
+    /// Takes the parsed gain map bundle, if the file contained a `jhgm` box.
+    /// After calling this, `gain_map()` will return `None`.
+    pub fn take_gain_map(&mut self) -> Option<GainMapBundle> {
+        self.inner.take_gain_map()
+    }
+
+    /// Returns the raw EXIF data from the `Exif` container box, if present.
+    ///
+    /// The 4-byte TIFF header offset prefix is stripped; this returns the raw
+    /// EXIF/TIFF bytes starting with the byte-order marker (`II` or `MM`).
+    /// Returns `None` for bare codestreams or files without an `Exif` box.
+    ///
+    /// Note: the `Exif` box may appear after the codestream in the container.
+    /// To capture trailing boxes, call `process` once more after the last
+    /// frame has been decoded — it drains the remaining container boxes.
+    pub fn exif(&self) -> Option<&[u8]> {
+        self.inner.exif()
+    }
+
+    /// Takes the EXIF data, leaving `None` in its place.
+    pub fn take_exif(&mut self) -> Option<Vec<u8>> {
+        self.inner.take_exif()
+    }
+
+    /// Returns the raw XMP data from the `xml ` container box, if present.
+    ///
+    /// Returns `None` for bare codestreams or files without an `xml ` box.
+    ///
+    /// Note: the `xml ` box may appear after the codestream in the container.
+    /// To capture trailing boxes, call `process` once more after the last
+    /// frame has been decoded — it drains the remaining container boxes.
+    pub fn xmp(&self) -> Option<&[u8]> {
+        self.inner.xmp()
+    }
+
+    /// Takes the XMP data, leaving `None` in its place.
+    pub fn take_xmp(&mut self) -> Option<Vec<u8>> {
+        self.inner.take_xmp()
+    }
+
+    /// Rewinds a decoder to the start of the file, allowing past frames to be displayed again.
+    pub fn rewind(mut self) -> JxlDecoder<Initialized> {
+        self.inner.rewind();
+        JxlDecoder::wrap_inner(self.inner)
+    }
+
+    fn map_inner_processing_result<SuccessState: JxlState>(
+        self,
+        inner_result: ProcessingResult<(), ()>,
+    ) -> ProcessingResult<JxlDecoder<SuccessState>, Self> {
+        match inner_result {
+            ProcessingResult::Complete { .. } => ProcessingResult::Complete {
+                result: JxlDecoder::wrap_inner(self.inner),
+            },
+            ProcessingResult::NeedsMoreInput { size_hint, .. } => {
+                ProcessingResult::NeedsMoreInput {
+                    size_hint,
+                    fallback: self,
+                }
+            }
+        }
+    }
+}
+
+impl JxlDecoder<Initialized> {
+    pub fn new(options: JxlDecoderOptions) -> Self {
+        Self::wrap_inner(Box::new(JxlDecoderInner::new(options)))
+    }
+
+    pub fn process(
+        mut self,
+        input: &mut impl JxlBitstreamInput,
+    ) -> Result<ProcessingResult<JxlDecoder<WithImageInfo>, Self>> {
+        let inner_result = self.inner.process(input, None)?;
+        Ok(self.map_inner_processing_result(inner_result))
+    }
+}
+
+impl JxlDecoder<WithImageInfo> {
+    // TODO(veluca): once frame skipping is implemented properly, expose that in the API.
+
+    /// Obtains the image's basic information.
+    pub fn basic_info(&self) -> &JxlBasicInfo {
+        self.inner.basic_info().unwrap()
+    }
+
+    /// Retrieves the file's color profile.
+    pub fn embedded_color_profile(&self) -> &JxlColorProfile {
+        self.inner.embedded_color_profile().unwrap()
+    }
+
+    /// Retrieves the current output color profile.
+    pub fn output_color_profile(&self) -> &JxlColorProfile {
+        self.inner.output_color_profile().unwrap()
+    }
+
+    /// Specifies the preferred color profile to be used for outputting data.
+    /// Same semantics as JxlDecoderSetOutputColorProfile.
+    pub fn set_output_color_profile(&mut self, profile: JxlColorProfile) -> Result<()> {
+        self.inner.set_output_color_profile(profile)
+    }
+
+    /// Retrieves the current pixel format for output buffers.
+    pub fn current_pixel_format(&self) -> &JxlPixelFormat {
+        self.inner.current_pixel_format().unwrap()
+    }
+
+    /// Specifies pixel format for output buffers.
+    ///
+    /// Setting this may also change output color profile in some cases, if the profile was not set
+    /// manually before.
+    pub fn set_pixel_format(&mut self, pixel_format: JxlPixelFormat) {
+        self.inner.set_pixel_format(pixel_format);
+    }
+
+    pub fn process(
+        mut self,
+        input: &mut impl JxlBitstreamInput,
+    ) -> Result<ProcessingResult<JxlDecoder<WithFrameInfo>, Self>> {
+        let inner_result = self.inner.process(input, None)?;
+        Ok(self.map_inner_processing_result(inner_result))
+    }
+
+    /// Draws all the pixels we have data for. This is useful for i.e. previewing LF frames.
+    ///
+    /// Note: see `process` for alignment requirements for the buffer data.
+    pub fn flush_pixels(&mut self, buffers: &mut [JxlOutputBuffer<'_>]) -> Result<()> {
+        self.inner.flush_pixels(buffers)
+    }
+
+    pub fn has_more_frames(&self) -> bool {
+        self.inner.has_more_frames()
+    }
+
+    #[cfg(test)]
+    pub(crate) fn set_use_simple_pipeline(&mut self, u: bool) {
+        self.inner.set_use_simple_pipeline(u);
+    }
+}
+
+impl JxlDecoder<WithFrameInfo> {
+    /// Skip the current frame.
+    pub fn skip_frame(
+        mut self,
+        input: &mut impl JxlBitstreamInput,
+    ) -> Result<ProcessingResult<JxlDecoder<WithImageInfo>, Self>> {
+        let inner_result = self.inner.process(input, None)?;
+        Ok(self.map_inner_processing_result(inner_result))
+    }
+
+    pub fn frame_header(&self) -> JxlFrameHeader {
+        self.inner.frame_header().unwrap()
+    }
+
+    /// Number of passes we have full data for.
+    pub fn num_completed_passes(&self) -> usize {
+        self.inner.num_completed_passes().unwrap()
+    }
+
+    /// Draws all the pixels we have data for.
+    ///
+    /// Note: see `process` for alignment requirements for the buffer data.
+    pub fn flush_pixels(&mut self, buffers: &mut [JxlOutputBuffer<'_>]) -> Result<()> {
+        self.inner.flush_pixels(buffers)
+    }
+
+    /// Guarantees to populate exactly the appropriate part of the buffers.
+    /// Wants one buffer for each non-ignored pixel type, i.e. color channels and each extra channel.
+    ///
+    /// Note: the data in `buffers` should have alignment requirements that are compatible with the
+    /// requested pixel format. This means that, if we are asking for 2-byte or 4-byte output (i.e.
+    /// u16/f16 and f32 respectively), each row in the provided buffers must be aligned to 2 or 4
+    /// bytes respectively. If that is not the case, the library may panic.
+    pub fn process<In: JxlBitstreamInput>(
+        mut self,
+        input: &mut In,
+        buffers: &mut [JxlOutputBuffer<'_>],
+    ) -> Result<ProcessingResult<JxlDecoder<WithImageInfo>, Self>> {
+        let inner_result = self.inner.process(input, Some(buffers))?;
+        Ok(self.map_inner_processing_result(inner_result))
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::api::{JxlDataFormat, JxlDecoderOptions};
+    use crate::error::Error;
+    use crate::image::{Image, Rect};
+    use jxl_macros::for_each_test_file;
+    use std::path::Path;
+
+    #[test]
+    fn decode_small_chunks() {
+        arbtest::arbtest(|u| {
+            decode(
+                &std::fs::read("resources/test/green_queen_vardct_e3.jxl").unwrap(),
+                u.arbitrary::<u8>().unwrap() as usize + 1,
+                false,
+                false,
+                None,
+            )
+            .unwrap();
+            Ok(())
+        });
+    }
+
+    /// Fully decode a (color-only) fixture and return the live decoder so the
+    /// public `vardct_quantizer()` accessor can be exercised post-decode.
+    fn quant_of(path: &str) -> Option<VardctQuantizer> {
+        let data = std::fs::read(path).unwrap();
+        let mut input: &[u8] = &data;
+        let mut options = JxlDecoderOptions::default();
+        options.limits.max_memory_bytes = None;
+        let decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut dwi = match decoder.process(&mut input).unwrap() {
+            ProcessingResult::Complete { result } => result,
+            ProcessingResult::NeedsMoreInput { .. } => panic!("need more input for header"),
+        };
+        let (w, h) = dwi.basic_info().size;
+        let cpf = dwi.current_pixel_format().clone();
+        assert!(
+            cpf.extra_channel_format.iter().all(|e| e.is_none()),
+            "fixture must be color-only for this test"
+        );
+        let fmt = JxlPixelFormat {
+            color_type: cpf.color_type,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: cpf.extra_channel_format.iter().map(|_| None).collect(),
+        };
+        dwi.set_pixel_format(fmt.clone());
+        let n = fmt.color_type.samples_per_pixel();
+        loop {
+            let mut img = Image::new_with_value((w * n, h), 0.0f32).unwrap();
+            let mut bufs = vec![JxlOutputBuffer::from_image_rect_mut(
+                img.get_rect_mut(Rect {
+                    origin: (0, 0),
+                    size: img.size(),
+                })
+                .into_raw(),
+            )];
+            // WithImageInfo -> WithFrameInfo parses the next frame's header/TOC
+            // (no pixel buffers needed); the subsequent WithFrameInfo step
+            // decodes the frame body and is where the quantizer gets stashed.
+            let dfi = match dwi.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => result,
+                ProcessingResult::NeedsMoreInput { .. } => panic!("need more input (frame info)"),
+            };
+            dwi = match dfi.process(&mut input, &mut bufs).unwrap() {
+                ProcessingResult::Complete { result } => result,
+                ProcessingResult::NeedsMoreInput { .. } => panic!("need more input (frame data)"),
+            };
+            if !dwi.has_more_frames() {
+                break;
+            }
+        }
+        dwi.vardct_quantizer()
+    }
+
+    #[test]
+    fn vardct_quantizer_lossy_exposed() {
+        let q = quant_of("resources/test/green_queen_vardct_e3.jxl")
+            .expect("VarDCT image should expose a quantizer");
+        assert!(q.global_scale >= 1, "global_scale must be >= 1");
+        assert!(q.quant_lf >= 1, "quant_lf must be >= 1");
+        assert!(q.inv_global_scale() > 0.0);
+    }
+
+    #[test]
+    fn vardct_quantizer_none_for_lossless() {
+        assert!(
+            quant_of("resources/test/3x3_srgb_lossless.jxl").is_none(),
+            "lossless/modular image must have no VarDCT quantizer"
+        );
+    }
+
+    #[allow(clippy::type_complexity)]
+    pub fn decode(
+        mut input: &[u8],
+        chunk_size: usize,
+        use_simple_pipeline: bool,
+        do_flush: bool,
+        callback: Option<Box<dyn FnMut(&Frame, usize) -> Result<(), Error>>>,
+    ) -> Result<(usize, Vec<Vec<Image<f32>>>), Error> {
+        let mut options = JxlDecoderOptions::default();
+        // Correctness tests should not be constrained by memory limits.
+        // OOM/limit tests verify those separately.
+        options.limits.max_memory_bytes = None;
+        let mut initialized_decoder = JxlDecoder::<states::Initialized>::new(options);
+
+        if let Some(callback) = callback {
+            initialized_decoder.set_frame_callback(callback);
+        }
+
+        let mut chunk_input = &input[0..0];
+
+        macro_rules! advance_decoder {
+            ($decoder: ident $(, $extra_arg: expr)? $(; $flush_arg: expr)?) => {
+                loop {
+                    chunk_input =
+                        &input[..(chunk_input.len().saturating_add(chunk_size)).min(input.len())];
+                    let available_before = chunk_input.len();
+                    let process_result = $decoder.process(&mut chunk_input $(, $extra_arg)?);
+                    input = &input[(available_before - chunk_input.len())..];
+                    match process_result.unwrap() {
+                        ProcessingResult::Complete { result } => break result,
+                        ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                            $(
+                                let mut fallback = fallback;
+                                if do_flush && !input.is_empty() {
+                                    fallback.flush_pixels($flush_arg)?;
+                                }
+                            )?
+                            if input.is_empty() {
+                                panic!("Unexpected end of input");
+                            }
+                            $decoder = fallback;
+                        }
+                    }
+                }
+            };
+        }
+
+        // Process until we have image info
+        let mut decoder_with_image_info = advance_decoder!(initialized_decoder);
+        decoder_with_image_info.set_use_simple_pipeline(use_simple_pipeline);
+
+        // Get basic info
+        let basic_info = decoder_with_image_info.basic_info().clone();
+        assert!(basic_info.bit_depth.bits_per_sample() > 0);
+
+        // Get image dimensions (after upsampling, which is the actual output size)
+        let (buffer_width, buffer_height) = basic_info.size;
+        assert!(buffer_width > 0);
+        assert!(buffer_height > 0);
+
+        // Explicitly request F32 pixel format (test helper returns Image<f32>)
+        let default_format = decoder_with_image_info.current_pixel_format();
+        let requested_format = JxlPixelFormat {
+            color_type: default_format.color_type,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: default_format
+                .extra_channel_format
+                .iter()
+                .map(|_| Some(JxlDataFormat::f32()))
+                .collect(),
+        };
+        decoder_with_image_info.set_pixel_format(requested_format);
+
+        // Get the configured pixel format
+        let pixel_format = decoder_with_image_info.current_pixel_format().clone();
+
+        let num_channels = pixel_format.color_type.samples_per_pixel();
+        assert!(num_channels > 0);
+
+        let mut frames = vec![];
+
+        loop {
+            // First channel is interleaved.
+            let mut buffers = vec![Image::new_with_value(
+                (buffer_width * num_channels, buffer_height),
+                f32::NAN,
+            )?];
+
+            for ecf in pixel_format.extra_channel_format.iter() {
+                if ecf.is_none() {
+                    continue;
+                }
+                buffers.push(Image::new_with_value(
+                    (buffer_width, buffer_height),
+                    f32::NAN,
+                )?);
+            }
+
+            let mut api_buffers: Vec<_> = buffers
+                .iter_mut()
+                .map(|b| {
+                    JxlOutputBuffer::from_image_rect_mut(
+                        b.get_rect_mut(Rect {
+                            origin: (0, 0),
+                            size: b.size(),
+                        })
+                        .into_raw(),
+                    )
+                })
+                .collect();
+
+            // Process until we have frame info
+            let mut decoder_with_frame_info =
+                advance_decoder!(decoder_with_image_info; &mut api_buffers);
+            decoder_with_image_info =
+                advance_decoder!(decoder_with_frame_info, &mut api_buffers; &mut api_buffers);
+
+            // All pixels should have been overwritten, so they should no longer be NaNs.
+            for buf in buffers.iter() {
+                let (xs, ys) = buf.size();
+                for y in 0..ys {
+                    let row = buf.row(y);
+                    for (x, v) in row.iter().enumerate() {
+                        assert!(!v.is_nan(), "NaN at {x} {y} (image size {xs}x{ys})");
+                    }
+                }
+            }
+
+            frames.push(buffers);
+
+            // Check if there are more frames
+            if !decoder_with_image_info.has_more_frames() {
+                let decoded_frames = decoder_with_image_info.decoded_frames();
+
+                // Ensure we decoded at least one frame
+                assert!(decoded_frames > 0, "No frames were decoded");
+
+                return Ok((decoded_frames, frames));
+            }
+        }
+    }
+
+    fn decode_test_file(path: &Path) -> Result<(), Error> {
+        decode(&std::fs::read(path)?, usize::MAX, false, false, None)?;
+        Ok(())
+    }
+
+    for_each_test_file!(decode_test_file);
+
+    fn decode_test_file_chunks(path: &Path) -> Result<(), Error> {
+        decode(&std::fs::read(path)?, 1, false, false, None)?;
+        Ok(())
+    }
+
+    for_each_test_file!(decode_test_file_chunks);
+
+    #[allow(dead_code)] // used by integration tests
+    fn compare_frames(
+        _path: &Path,
+        fc: usize,
+        f: &[Image<f32>],
+        sf: &[Image<f32>],
+    ) -> Result<(), Error> {
+        assert_eq!(
+            f.len(),
+            sf.len(),
+            "Frame {fc} has different channels counts",
+        );
+        for (c, (b, sb)) in f.iter().zip(sf.iter()).enumerate() {
+            assert_eq!(
+                b.size(),
+                sb.size(),
+                "Channel {c} in frame {fc} has different sizes",
+            );
+            let sz = b.size();
+            for y in 0..sz.1 {
+                for x in 0..sz.0 {
+                    assert_eq!(
+                        b.row(y)[x],
+                        sb.row(y)[x],
+                        "Pixels differ at position ({x}, {y}), channel {c}"
+                    );
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Hash all pixel rows for memory-efficient comparison.
+    fn hash_frames(frames: &[Vec<Image<f32>>]) -> Vec<Vec<Vec<u64>>> {
+        use std::hash::{Hash, Hasher};
+        frames
+            .iter()
+            .map(|channels| {
+                channels
+                    .iter()
+                    .map(|img| {
+                        let (_, ys) = img.size();
+                        (0..ys)
+                            .map(|y| {
+                                let mut h = std::hash::DefaultHasher::new();
+                                for &v in img.row(y) {
+                                    v.to_bits().hash(&mut h);
+                                }
+                                h.finish()
+                            })
+                            .collect()
+                    })
+                    .collect()
+            })
+            .collect()
+    }
+
+    fn compare_pipelines(path: &Path) -> Result<(), Error> {
+        let file = std::fs::read(path)?;
+        let reference_frames = decode(&file, usize::MAX, true, false, None)?.1;
+        // Hash and drop reference pixels before second decode to halve peak
+        // memory. Critical for 32-bit targets where two full 4K decoded
+        // outputs + decoder state exceeds address space.
+        let reference_hashes = hash_frames(&reference_frames);
+        drop(reference_frames);
+        let frames = decode(&file, usize::MAX, false, false, None)?.1;
+        let frame_hashes = hash_frames(&frames);
+        assert_eq!(
+            reference_hashes,
+            frame_hashes,
+            "{}: pipeline outputs differ",
+            path.display()
+        );
+        Ok(())
+    }
+
+    for_each_test_file!(compare_pipelines);
+
+    fn compare_incremental(path: &Path) -> Result<(), Error> {
+        let file = std::fs::read(path).unwrap();
+        // One-shot decode — hash and drop before incremental decode.
+        let (_, one_shot_frames) = decode(&file, usize::MAX, false, false, None)?;
+        let reference_hashes = hash_frames(&one_shot_frames);
+        drop(one_shot_frames);
+        // Incremental decode with arbitrary flushes.
+        let (_, frames) = decode(&file, 123, false, true, None)?;
+        let frame_hashes = hash_frames(&frames);
+        assert_eq!(
+            reference_hashes,
+            frame_hashes,
+            "{}: incremental vs one-shot outputs differ",
+            path.display()
+        );
+
+        Ok(())
+    }
+
+    for_each_test_file!(compare_incremental);
+
+    #[test]
+    fn test_preview_size_none_for_regular_files() {
+        let file = std::fs::read("resources/test/basic.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        assert!(decoder.basic_info().preview_size.is_none());
+    }
+
+    #[test]
+    fn test_preview_size_some_for_preview_files() {
+        let file = std::fs::read("resources/test/with_preview.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        assert_eq!(decoder.basic_info().preview_size, Some((16, 16)));
+    }
+
+    #[test]
+    fn test_num_completed_passes() {
+        use crate::image::{Image, Rect};
+        let file = std::fs::read("resources/test/basic.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        // Process until we have image info
+        let mut decoder_with_info = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        let info = decoder_with_info.basic_info().clone();
+        let mut decoder_with_frame = loop {
+            match decoder_with_info.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder_with_info = fallback;
+                }
+            }
+        };
+        // Before processing frame, passes should be 0
+        assert_eq!(decoder_with_frame.num_completed_passes(), 0);
+        // Process the frame
+        let mut output = Image::<f32>::new((info.size.0 * 3, info.size.1)).unwrap();
+        let rect = Rect {
+            size: output.size(),
+            origin: (0, 0),
+        };
+        let mut bufs = [JxlOutputBuffer::from_image_rect_mut(
+            output.get_rect_mut(rect).into_raw(),
+        )];
+        loop {
+            match decoder_with_frame.process(&mut input, &mut bufs).unwrap() {
+                ProcessingResult::Complete { .. } => break,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder_with_frame = fallback,
+            }
+        }
+    }
+
+    #[test]
+    fn test_set_pixel_format() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+
+        let file = std::fs::read("resources/test/basic.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let mut decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        // Check default pixel format
+        let default_format = decoder.current_pixel_format().clone();
+        assert_eq!(default_format.color_type, JxlColorType::Rgb);
+
+        // Set a new pixel format
+        let new_format = JxlPixelFormat {
+            color_type: JxlColorType::Grayscale,
+            color_data_format: Some(JxlDataFormat::U8 { bit_depth: 8 }),
+            extra_channel_format: vec![],
+        };
+        decoder.set_pixel_format(new_format.clone());
+
+        // Verify it was set
+        assert_eq!(decoder.current_pixel_format(), &new_format);
+    }
+
+    #[test]
+    fn test_set_output_color_profile() {
+        use crate::api::JxlColorProfile;
+
+        let file = std::fs::read("resources/test/basic.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let mut decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+
+        // Get the embedded profile and set it as output (should work)
+        let embedded = decoder.embedded_color_profile().clone();
+        let result = decoder.set_output_color_profile(embedded);
+        assert!(result.is_ok());
+
+        // Setting an ICC profile without CMS should fail
+        let icc_profile = JxlColorProfile::Icc(vec![0u8; 100]);
+        let result = decoder.set_output_color_profile(icc_profile);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_default_output_tf_by_pixel_format() {
+        use crate::api::{JxlColorEncoding, JxlTransferFunction};
+
+        // Using test image with ICC profile to trigger default transfer function path
+        let file = std::fs::read("resources/test/lossy_with_icc.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let mut decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+
+        // Output data format will default to F32, so output color profile will be linear sRGB
+        assert_eq!(
+            *decoder.output_color_profile().transfer_function().unwrap(),
+            JxlTransferFunction::Linear,
+        );
+
+        // Integer data format will set output color profile to sRGB
+        decoder.set_pixel_format(JxlPixelFormat::rgba8(0));
+        assert_eq!(
+            *decoder.output_color_profile().transfer_function().unwrap(),
+            JxlTransferFunction::SRGB,
+        );
+
+        decoder.set_pixel_format(JxlPixelFormat::rgba_f16(0));
+        assert_eq!(
+            *decoder.output_color_profile().transfer_function().unwrap(),
+            JxlTransferFunction::Linear,
+        );
+
+        decoder.set_pixel_format(JxlPixelFormat::rgba16(0));
+        assert_eq!(
+            *decoder.output_color_profile().transfer_function().unwrap(),
+            JxlTransferFunction::SRGB,
+        );
+
+        // Once output color profile is set by user, it will remain as is regardless of what pixel
+        // format is set
+        let profile = JxlColorProfile::Simple(JxlColorEncoding::srgb(false));
+        decoder.set_output_color_profile(profile.clone()).unwrap();
+        decoder.set_pixel_format(JxlPixelFormat::rgba_f16(0));
+        assert!(decoder.output_color_profile() == &profile);
+    }
+
+    #[test]
+    fn test_fill_opaque_alpha_both_pipelines() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+        use crate::image::{Image, Rect};
+
+        // Use basic.jxl which has no alpha channel
+        let file = std::fs::read("resources/test/basic.jxl").unwrap();
+
+        // Request RGBA format even though image has no alpha
+        let rgba_format = JxlPixelFormat {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: vec![],
+        };
+
+        // Test both pipelines (simple and low-memory)
+        for use_simple in [true, false] {
+            let options = JxlDecoderOptions::default();
+            let decoder = JxlDecoder::<states::Initialized>::new(options);
+            let mut input = file.as_slice();
+
+            // Advance to image info
+            macro_rules! advance_decoder {
+                ($decoder:expr) => {
+                    loop {
+                        match $decoder.process(&mut input).unwrap() {
+                            ProcessingResult::Complete { result } => break result,
+                            ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                                if input.is_empty() {
+                                    panic!("Unexpected end of input");
+                                }
+                                $decoder = fallback;
+                            }
+                        }
+                    }
+                };
+                ($decoder:expr, $buffers:expr) => {
+                    loop {
+                        match $decoder.process(&mut input, $buffers).unwrap() {
+                            ProcessingResult::Complete { result } => break result,
+                            ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                                if input.is_empty() {
+                                    panic!("Unexpected end of input");
+                                }
+                                $decoder = fallback;
+                            }
+                        }
+                    }
+                };
+            }
+
+            let mut decoder = decoder;
+            let mut decoder = advance_decoder!(decoder);
+            decoder.set_use_simple_pipeline(use_simple);
+
+            // Set RGBA format
+            decoder.set_pixel_format(rgba_format.clone());
+
+            let basic_info = decoder.basic_info().clone();
+            let (width, height) = basic_info.size;
+
+            // Advance to frame info
+            let mut decoder = advance_decoder!(decoder);
+
+            // Prepare buffer for RGBA (4 channels interleaved)
+            let mut color_buffer = Image::<f32>::new((width * 4, height)).unwrap();
+            let mut buffers: Vec<_> = vec![JxlOutputBuffer::from_image_rect_mut(
+                color_buffer
+                    .get_rect_mut(Rect {
+                        origin: (0, 0),
+                        size: (width * 4, height),
+                    })
+                    .into_raw(),
+            )];
+
+            // Decode frame
+            let _decoder = advance_decoder!(decoder, &mut buffers);
+
+            // Verify all alpha values are 1.0 (opaque)
+            for y in 0..height {
+                let row = color_buffer.row(y);
+                for x in 0..width {
+                    let alpha = row[x * 4 + 3];
+                    assert_eq!(
+                        alpha, 1.0,
+                        "Alpha at ({},{}) should be 1.0, got {} (use_simple={})",
+                        x, y, alpha, use_simple
+                    );
+                }
+            }
+        }
+    }
+
+    /// Test that premultiply_output=true produces premultiplied alpha output
+    /// from a source with straight (non-premultiplied) alpha.
+    #[test]
+    fn test_premultiply_output_straight_alpha() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+
+        // Use alpha_nonpremultiplied.jxl which has straight alpha (alpha_associated=false)
+        let file =
+            std::fs::read("resources/test/conformance_test_images/alpha_nonpremultiplied.jxl")
+                .unwrap();
+
+        // Alpha is included in RGBA, so we set extra_channel_format to None
+        // to indicate no separate buffer for the alpha extra channel
+        let rgba_format = JxlPixelFormat {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: vec![None],
+        };
+
+        // Test both pipelines
+        for use_simple in [true, false] {
+            let (straight_buffer, width, height) =
+                decode_with_format::<f32>(&file, &rgba_format, use_simple, false);
+            let (premul_buffer, _, _) =
+                decode_with_format::<f32>(&file, &rgba_format, use_simple, true);
+
+            // Verify premultiplied values: premul_rgb should equal straight_rgb * alpha
+            let mut found_semitransparent = false;
+            for y in 0..height {
+                let straight_row = straight_buffer.row(y);
+                let premul_row = premul_buffer.row(y);
+                for x in 0..width {
+                    let sr = straight_row[x * 4];
+                    let sg = straight_row[x * 4 + 1];
+                    let sb = straight_row[x * 4 + 2];
+                    let sa = straight_row[x * 4 + 3];
+
+                    let pr = premul_row[x * 4];
+                    let pg = premul_row[x * 4 + 1];
+                    let pb = premul_row[x * 4 + 2];
+                    let pa = premul_row[x * 4 + 3];
+
+                    // Alpha should be unchanged
+                    assert!(
+                        (sa - pa).abs() < 1e-5,
+                        "Alpha mismatch at ({},{}): straight={}, premul={} (use_simple={})",
+                        x,
+                        y,
+                        sa,
+                        pa,
+                        use_simple
+                    );
+
+                    // Check premultiplication: premul = straight * alpha
+                    let expected_r = sr * sa;
+                    let expected_g = sg * sa;
+                    let expected_b = sb * sa;
+
+                    // Allow 1% tolerance for precision differences between pipelines
+                    let tol = 0.01;
+                    assert!(
+                        (expected_r - pr).abs() < tol,
+                        "R mismatch at ({},{}): expected={}, got={} (use_simple={})",
+                        x,
+                        y,
+                        expected_r,
+                        pr,
+                        use_simple
+                    );
+                    assert!(
+                        (expected_g - pg).abs() < tol,
+                        "G mismatch at ({},{}): expected={}, got={} (use_simple={})",
+                        x,
+                        y,
+                        expected_g,
+                        pg,
+                        use_simple
+                    );
+                    assert!(
+                        (expected_b - pb).abs() < tol,
+                        "B mismatch at ({},{}): expected={}, got={} (use_simple={})",
+                        x,
+                        y,
+                        expected_b,
+                        pb,
+                        use_simple
+                    );
+
+                    if sa > 0.01 && sa < 0.99 {
+                        found_semitransparent = true;
+                    }
+                }
+            }
+
+            // Ensure the test image actually has some semi-transparent pixels
+            assert!(
+                found_semitransparent,
+                "Test image should have semi-transparent pixels (use_simple={})",
+                use_simple
+            );
+        }
+    }
+
+    /// Test that premultiply_output=true doesn't double-premultiply
+    /// when the source already has premultiplied alpha (alpha_associated=true).
+    #[test]
+    fn test_premultiply_output_already_premultiplied() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+
+        // Use alpha_premultiplied.jxl which has alpha_associated=true
+        let file = std::fs::read("resources/test/conformance_test_images/alpha_premultiplied.jxl")
+            .unwrap();
+
+        // Alpha is included in RGBA, so we set extra_channel_format to None
+        let rgba_format = JxlPixelFormat {
+            color_type: JxlColorType::Rgba,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: vec![None],
+        };
+
+        // Test both pipelines
+        for use_simple in [true, false] {
+            let (without_flag_buffer, width, height) =
+                decode_with_format::<f32>(&file, &rgba_format, use_simple, false);
+            let (with_flag_buffer, _, _) =
+                decode_with_format::<f32>(&file, &rgba_format, use_simple, true);
+
+            // Both outputs should be identical since source is already premultiplied
+            // and we shouldn't double-premultiply
+            for y in 0..height {
+                let without_row = without_flag_buffer.row(y);
+                let with_row = with_flag_buffer.row(y);
+                for x in 0..width {
+                    for c in 0..4 {
+                        let without_val = without_row[x * 4 + c];
+                        let with_val = with_row[x * 4 + c];
+                        assert!(
+                            (without_val - with_val).abs() < 1e-5,
+                            "Mismatch at ({},{}) channel {}: without_flag={}, with_flag={} (use_simple={})",
+                            x,
+                            y,
+                            c,
+                            without_val,
+                            with_val,
+                            use_simple
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Test that animations with reference frames work correctly.
+    /// This exercises the buffer index calculation fix where reference frame
+    /// save stages use indices beyond the API-provided buffer array.
+    #[test]
+    fn test_animation_with_reference_frames() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+        use crate::image::{Image, Rect};
+
+        // Use animation_spline.jxl which has multiple frames with references
+        let file =
+            std::fs::read("resources/test/conformance_test_images/animation_spline.jxl").unwrap();
+
+        let options = JxlDecoderOptions::default();
+        let decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+
+        // Advance to image info
+        let mut decoder = decoder;
+        let mut decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder = fallback;
+                }
+            }
+        };
+
+        // Set RGB format with no extra channels
+        let rgb_format = JxlPixelFormat {
+            color_type: JxlColorType::Rgb,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: vec![],
+        };
+        decoder.set_pixel_format(rgb_format);
+
+        let basic_info = decoder.basic_info().clone();
+        let (width, height) = basic_info.size;
+
+        let mut frame_count = 0;
+
+        // Decode all frames
+        loop {
+            // Advance to frame info
+            let mut decoder_frame = loop {
+                match decoder.process(&mut input).unwrap() {
+                    ProcessingResult::Complete { result } => break result,
+                    ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                        decoder = fallback;
+                    }
+                }
+            };
+
+            // Prepare buffer for RGB (3 channels interleaved)
+            let mut color_buffer = Image::<f32>::new((width * 3, height)).unwrap();
+            let mut buffers: Vec<_> = vec![JxlOutputBuffer::from_image_rect_mut(
+                color_buffer
+                    .get_rect_mut(Rect {
+                        origin: (0, 0),
+                        size: (width * 3, height),
+                    })
+                    .into_raw(),
+            )];
+
+            // Decode frame - this should not panic even though reference frame
+            // save stages target buffer indices beyond buffers.len()
+            decoder = loop {
+                match decoder_frame.process(&mut input, &mut buffers).unwrap() {
+                    ProcessingResult::Complete { result } => break result,
+                    ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                        decoder_frame = fallback;
+                    }
+                }
+            };
+
+            frame_count += 1;
+
+            // Check if there are more frames
+            if !decoder.has_more_frames() {
+                break;
+            }
+        }
+
+        // Verify we decoded multiple frames
+        assert!(
+            frame_count > 1,
+            "Expected multiple frames in animation, got {}",
+            frame_count
+        );
+    }
+
+    #[test]
+    fn test_skip_frame_then_decode_next() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+        use crate::image::{Image, Rect};
+
+        // Use animation_spline.jxl which has multiple frames
+        let file =
+            std::fs::read("resources/test/conformance_test_images/animation_spline.jxl").unwrap();
+
+        let options = JxlDecoderOptions::default();
+        let decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+
+        // Advance to image info
+        let mut decoder = decoder;
+        let mut decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder = fallback;
+                }
+            }
+        };
+
+        // Set RGB format
+        let rgb_format = JxlPixelFormat {
+            color_type: JxlColorType::Rgb,
+            color_data_format: Some(JxlDataFormat::f32()),
+            extra_channel_format: vec![],
+        };
+        decoder.set_pixel_format(rgb_format);
+
+        let basic_info = decoder.basic_info().clone();
+        let (width, height) = basic_info.size;
+
+        // Advance to frame info for first frame
+        let mut decoder_frame = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder = fallback;
+                }
+            }
+        };
+
+        // Skip the first frame (this is where the bug would leave stale frame state)
+        let mut decoder = loop {
+            match decoder_frame.skip_frame(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder_frame = fallback;
+                }
+            }
+        };
+
+        assert!(
+            decoder.has_more_frames(),
+            "Animation should have more frames"
+        );
+
+        // Advance to frame info for second frame
+        // Without the fix, this would panic at assert!(self.frame.is_none())
+        let mut decoder_frame = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder = fallback;
+                }
+            }
+        };
+
+        // Decode the second frame to verify everything works
+        let mut color_buffer = Image::<f32>::new((width * 3, height)).unwrap();
+        let mut buffers: Vec<_> = vec![JxlOutputBuffer::from_image_rect_mut(
+            color_buffer
+                .get_rect_mut(Rect {
+                    origin: (0, 0),
+                    size: (width * 3, height),
+                })
+                .into_raw(),
+        )];
+
+        let decoder = loop {
+            match decoder_frame.process(&mut input, &mut buffers).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    decoder_frame = fallback;
+                }
+            }
+        };
+
+        // If we got here without panicking, the fix works
+        // Optionally verify we can continue with more frames
+        let _ = decoder.has_more_frames();
+    }
+
+    /// Test that u8 output matches f32 output within quantization tolerance.
+    /// This test would catch bugs like the offset miscalculation in PR #586
+    /// that caused black bars in u8 output.
+    #[test]
+    fn test_output_format_u8_matches_f32() {
+        use crate::api::{JxlColorType, JxlDataFormat, JxlPixelFormat};
+
+        // Use bicycles.jxl - a larger image that exercises offset calculations
+        let file = std::fs::read("resources/test/conformance_test_images/bicycles.jxl").unwrap();
+
+        // Test both RGB and BGRA to catch channel reordering bugs
+        for (color_type, num_samples) in [(JxlColorType::Rgb, 3), (JxlColorType::Bgra, 4)] {
+            let f32_format = JxlPixelFormat {
+                color_type,
+                color_data_format: Some(JxlDataFormat::f32()),
+                extra_channel_format: vec![],
+            };
+            let u8_format = JxlPixelFormat {
+                color_type,
+                color_data_format: Some(JxlDataFormat::U8 { bit_depth: 8 }),
+                extra_channel_format: vec![],
+            };
+
+            // Test both pipelines
+            for use_simple in [true, false] {
+                let (f32_buffer, width, height) =
+                    decode_with_format::<f32>(&file, &f32_format, use_simple, false);
+                let (u8_buffer, _, _) =
+                    decode_with_format::<u8>(&file, &u8_format, use_simple, false);
+
+                // Compare values: u8 / 255.0 should match f32
+                // Tolerance: quantization error of ±0.5/255 ≈ 0.00196 plus small rounding
+                let tolerance = 0.003;
+                let mut max_error: f32 = 0.0;
+
+                for y in 0..height {
+                    let f32_row = f32_buffer.row(y);
+                    let u8_row = u8_buffer.row(y);
+                    for x in 0..(width * num_samples) {
+                        let f32_val = f32_row[x].clamp(0.0, 1.0);
+                        let u8_val = u8_row[x] as f32 / 255.0;
+                        let error = (f32_val - u8_val).abs();
+                        max_error = max_error.max(error);
+                        assert!(
+                            error < tolerance,
+                            "{:?} u8 mismatch at ({},{}): f32={}, u8={} (scaled={}), error={} (use_simple={})",
+                            color_type,
+                            x,
+                            y,
+                            f32_val,
+                            u8_row[x],
+                            u8_val,
+                            error,
+                            use_simple
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Test that u16 output matches f32 output within quantization tolerance.
+    #[test]
+    fn test_output_format_u16_matches_f32() {
+        use crate::api::{Endianness, JxlColorType, JxlDataFormat, JxlPixelFormat};
+
+        let file = std::fs::read("resources/test/conformance_test_images/bicycles.jxl").unwrap();
+
+        // Test both RGB and BGRA
+        for (color_type, num_samples) in [(JxlColorType::Rgb, 3), (JxlColorType::Bgra, 4)] {
+            let f32_format = JxlPixelFormat {
+                color_type,
+                color_data_format: Some(JxlDataFormat::f32()),
+                extra_channel_format: vec![],
+            };
+            let u16_format = JxlPixelFormat {
+                color_type,
+                color_data_format: Some(JxlDataFormat::U16 {
+                    endianness: Endianness::native(),
+                    bit_depth: 16,
+                }),
+                extra_channel_format: vec![],
+            };
+
+            for use_simple in [true, false] {
+                let (f32_buffer, width, height) =
+                    decode_with_format::<f32>(&file, &f32_format, use_simple, false);
+                let (u16_buffer, _, _) =
+                    decode_with_format::<u16>(&file, &u16_format, use_simple, false);
+
+                // Tolerance: quantization error of ±0.5/65535 plus small rounding
+                let tolerance = 0.0001;
+
+                for y in 0..height {
+                    let f32_row = f32_buffer.row(y);
+                    let u16_row = u16_buffer.row(y);
+                    for x in 0..(width * num_samples) {
+                        let f32_val = f32_row[x].clamp(0.0, 1.0);
+                        let u16_val = u16_row[x] as f32 / 65535.0;
+                        let error = (f32_val - u16_val).abs();
+                        assert!(
+                            error < tolerance,
+                            "{:?} u16 mismatch at ({},{}): f32={}, u16={} (scaled={}), error={} (use_simple={})",
+                            color_type,
+                            x,
+                            y,
+                            f32_val,
+                            u16_row[x],
+                            u16_val,
+                            error,
+                            use_simple
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Test that f16 output matches f32 output within f16 precision tolerance.
+    #[test]
+    fn test_output_format_f16_matches_f32() {
+        use crate::api::{Endianness, JxlColorType, JxlDataFormat, JxlPixelFormat};
+        use crate::util::f16;
+
+        let file = std::fs::read("resources/test/conformance_test_images/bicycles.jxl").unwrap();
+
+        // Test both RGB and BGRA
+        for (color_type, num_samples) in [(JxlColorType::Rgb, 3), (JxlColorType::Bgra, 4)] {
+            let f32_format = JxlPixelFormat {
+                color_type,
+                color_data_format: Some(JxlDataFormat::f32()),
+                extra_channel_format: vec![],
+            };
+            let f16_format = JxlPixelFormat {
+                color_type,
+                color_data_format: Some(JxlDataFormat::F16 {
+                    endianness: Endianness::native(),
+                }),
+                extra_channel_format: vec![],
+            };
+
+            for use_simple in [true, false] {
+                let (f32_buffer, width, height) =
+                    decode_with_format::<f32>(&file, &f32_format, use_simple, false);
+                let (f16_buffer, _, _) =
+                    decode_with_format::<f16>(&file, &f16_format, use_simple, false);
+
+                // f16 has about 3 decimal digits of precision
+                // For values in [0,1], the relative error is about 0.001
+                let tolerance = 0.002;
+
+                for y in 0..height {
+                    let f32_row = f32_buffer.row(y);
+                    let f16_row = f16_buffer.row(y);
+                    for x in 0..(width * num_samples) {
+                        let f32_val = f32_row[x];
+                        let f16_val = f16_row[x].to_f32();
+                        let error = (f32_val - f16_val).abs();
+                        assert!(
+                            error < tolerance,
+                            "{:?} f16 mismatch at ({},{}): f32={}, f16={}, error={} (use_simple={})",
+                            color_type,
+                            x,
+                            y,
+                            f32_val,
+                            f16_val,
+                            error,
+                            use_simple
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /// Helper function to decode an image with a specific format.
+    fn decode_with_format<T: crate::image::ImageDataType>(
+        file: &[u8],
+        pixel_format: &JxlPixelFormat,
+        use_simple: bool,
+        premultiply: bool,
+    ) -> (Image<T>, usize, usize) {
+        let options = JxlDecoderOptions {
+            premultiply_output: premultiply,
+            ..Default::default()
+        };
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file;
+
+        // Advance to image info
+        let mut decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    if input.is_empty() {
+                        panic!("Unexpected end of input");
+                    }
+                    decoder = fallback;
+                }
+            }
+        };
+        decoder.set_use_simple_pipeline(use_simple);
+        decoder.set_pixel_format(pixel_format.clone());
+
+        let basic_info = decoder.basic_info().clone();
+        let (width, height) = basic_info.size;
+
+        let num_samples = pixel_format.color_type.samples_per_pixel();
+
+        // Advance to frame info
+        let decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    if input.is_empty() {
+                        panic!("Unexpected end of input");
+                    }
+                    decoder = fallback;
+                }
+            }
+        };
+
+        let mut buffer = Image::<T>::new((width * num_samples, height)).unwrap();
+        let mut buffers: Vec<_> = vec![JxlOutputBuffer::from_image_rect_mut(
+            buffer
+                .get_rect_mut(Rect {
+                    origin: (0, 0),
+                    size: (width * num_samples, height),
+                })
+                .into_raw(),
+        )];
+
+        // Decode
+        let mut decoder = decoder;
+        loop {
+            match decoder.process(&mut input, &mut buffers).unwrap() {
+                ProcessingResult::Complete { .. } => break,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    if input.is_empty() {
+                        panic!("Unexpected end of input");
+                    }
+                    decoder = fallback;
+                }
+            }
+        }
+
+        (buffer, width, height)
+    }
+
+    /// Regression test for ClusterFuzz issue 5342436251336704
+    /// Tests that malformed JXL files with overflow-inducing data don't panic
+    #[test]
+    fn test_fuzzer_smallbuffer_overflow() {
+        use std::panic;
+
+        let data = include_bytes!("../../tests/testdata/fuzzer_smallbuffer_overflow.jxl");
+
+        // The test passes if it doesn't panic with "attempt to add with overflow"
+        // It's OK if it returns an error or panics with "Unexpected end of input"
+        let result = panic::catch_unwind(|| {
+            let _ = decode(data, 1024, false, false, None);
+        });
+
+        // If it panicked, make sure it wasn't an overflow panic
+        if let Err(e) = result {
+            let panic_msg = e
+                .downcast_ref::<&str>()
+                .map(|s| s.to_string())
+                .or_else(|| e.downcast_ref::<String>().cloned())
+                .unwrap_or_default();
+            assert!(
+                !panic_msg.contains("overflow"),
+                "Unexpected overflow panic: {}",
+                panic_msg
+            );
+        }
+    }
+
+    /// Helper to wrap a bare codestream in a JXL container with a jxli frame index box.
+    fn wrap_with_frame_index(
+        codestream: &[u8],
+        tnum: u32,
+        tden: u32,
+        entries: &[(u64, u64, u64)], // (OFF_delta, T, F)
+    ) -> Vec<u8> {
+        use crate::util::test::build_frame_index_content;
+
+        fn make_box(ty: &[u8; 4], content: &[u8]) -> Vec<u8> {
+            let len = (8 + content.len()) as u32;
+            let mut buf = Vec::new();
+            buf.extend(len.to_be_bytes());
+            buf.extend(ty);
+            buf.extend(content);
+            buf
+        }
+
+        let jxli_content = build_frame_index_content(tnum, tden, entries);
+
+        // JXL signature box
+        let sig = [
+            0x00, 0x00, 0x00, 0x0c, 0x4a, 0x58, 0x4c, 0x20, 0x0d, 0x0a, 0x87, 0x0a,
+        ];
+        // ftyp box
+        let ftyp = make_box(b"ftyp", b"jxl \x00\x00\x00\x00jxl ");
+        let jxli = make_box(b"jxli", &jxli_content);
+        let jxlc = make_box(b"jxlc", codestream);
+
+        let mut container = Vec::new();
+        container.extend(&sig);
+        container.extend(&ftyp);
+        container.extend(&jxli);
+        container.extend(&jxlc);
+        container
+    }
+
+    #[test]
+    fn test_frame_index_parsed_from_container() {
+        // Read a bare animation codestream and wrap it in a container with a jxli box.
+        let codestream =
+            std::fs::read("resources/test/conformance_test_images/animation_icos4d_5.jxl").unwrap();
+
+        // Create synthetic frame index entries (delta offsets).
+        // These are synthetic -- we don't know real frame offsets, but we can verify parsing.
+        let entries = vec![
+            (0u64, 100u64, 1u64), // Frame 0 at offset 0
+            (500, 100, 1),        // Frame 1 at offset 500
+            (600, 100, 1),        // Frame 2 at offset 1100
+        ];
+
+        let container = wrap_with_frame_index(&codestream, 1, 1000, &entries);
+
+        // Decode with a large chunk size so the jxli box is fully consumed.
+        let options = JxlDecoderOptions::default();
+        let mut dec = JxlDecoder::<states::Initialized>::new(options);
+        let mut input: &[u8] = &container;
+        let dec = loop {
+            match dec.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    if input.is_empty() {
+                        panic!("Unexpected end of input");
+                    }
+                    dec = fallback;
+                }
+            }
+        };
+
+        // Check that frame index was parsed.
+        let fi = dec.frame_index().expect("frame_index should be Some");
+        assert_eq!(fi.num_frames(), 3);
+        assert_eq!(fi.tnum, 1);
+        assert_eq!(fi.tden.get(), 1000);
+        // Verify absolute offsets (accumulated from deltas)
+        assert_eq!(fi.entries[0].codestream_offset, 0);
+        assert_eq!(fi.entries[1].codestream_offset, 500);
+        assert_eq!(fi.entries[2].codestream_offset, 1100);
+        assert_eq!(fi.entries[0].duration_ticks, 100);
+        assert_eq!(fi.entries[2].frame_count, 1);
+    }
+
+    #[test]
+    fn test_frame_index_none_for_bare_codestream() {
+        // A bare codestream has no container, so no frame index.
+        let data =
+            std::fs::read("resources/test/conformance_test_images/animation_icos4d_5.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut dec = JxlDecoder::<states::Initialized>::new(options);
+        let mut input: &[u8] = &data;
+        let dec = loop {
+            match dec.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => {
+                    if input.is_empty() {
+                        panic!("Unexpected end of input");
+                    }
+                    dec = fallback;
+                }
+            }
+        };
+        assert!(dec.frame_index().is_none());
+    }
+
+    /// Regression test for Chromium ClusterFuzz issue 474401148.
+    #[test]
+    fn test_fuzzer_xyb_icc_no_panic() {
+        use crate::api::ProcessingResult;
+
+        #[rustfmt::skip]
+        let data: &[u8] = &[
+            0xff, 0x0a, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x25, 0x00,
+        ];
+
+        let opts = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoderInner::new(opts);
+        let mut input = data;
+
+        if let Ok(ProcessingResult::Complete { .. }) = decoder.process(&mut input, None)
+            && let Some(profile) = decoder.output_color_profile()
+        {
+            let _ = profile.try_as_icc();
+        }
+    }
+
+    #[test]
+    fn test_pixel_limit_enforcement() {
+        // Load a test image - green_queen is 256x256 = 65536 pixels
+        let input = std::fs::read("resources/test/green_queen_vardct_e3.jxl").unwrap();
+
+        // Create options with a very restrictive pixel limit (smaller than the image)
+        let mut options = JxlDecoderOptions::default();
+        options.limits.max_pixels = Some(100); // Only 100 pixels allowed
+
+        let decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input_slice = &input[..];
+
+        // The decoder should fail when parsing the header with LimitExceeded error
+        let result = decoder.process(&mut input_slice);
+        match result {
+            Err(err) => {
+                assert!(
+                    matches!(
+                        err,
+                        Error::LimitExceeded {
+                            resource: "pixels",
+                            ..
+                        }
+                    ),
+                    "Expected LimitExceeded for pixels, got {:?}",
+                    err
+                );
+            }
+            Ok(ProcessingResult::NeedsMoreInput { .. }) => {
+                panic!("Expected error, got needs more input");
+            }
+            Ok(ProcessingResult::Complete { .. }) => {
+                panic!("Expected error, got success");
+            }
+        }
+    }
+
+    #[test]
+    fn test_restrictive_limits_preset() {
+        // Verify the restrictive preset is reasonable
+        let limits = crate::api::JxlDecoderLimits::restrictive();
+        assert_eq!(limits.max_pixels, Some(100_000_000));
+        assert_eq!(limits.max_extra_channels, Some(16));
+        assert_eq!(limits.max_icc_size, Some(1 << 20));
+        assert_eq!(limits.max_tree_size, Some(1 << 20));
+        assert_eq!(limits.max_patches, Some(1 << 16));
+        assert_eq!(limits.max_spline_points, Some(1 << 16));
+        assert_eq!(limits.max_reference_frames, Some(2));
+        assert_eq!(limits.max_memory_bytes, Some(1 << 30));
+    }
+
+    #[test]
+    fn test_extra_channel_metadata() {
+        let file = std::fs::read("resources/test/extra_channels.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        let info = decoder.basic_info();
+        // extra_channels.jxl should have at least one extra channel
+        assert!(
+            !info.extra_channels.is_empty(),
+            "expected at least one extra channel"
+        );
+
+        // Verify all new fields are populated
+        for ec in &info.extra_channels {
+            // bits_per_sample should be a reasonable value
+            assert!(
+                ec.bits_per_sample > 0 && ec.bits_per_sample <= 32,
+                "unexpected bits_per_sample: {}",
+                ec.bits_per_sample
+            );
+            // dim_shift should be <= 3
+            assert!(ec.dim_shift <= 3, "unexpected dim_shift: {}", ec.dim_shift);
+        }
+    }
+
+    #[test]
+    fn test_extra_channel_alpha_with_new_fields() {
+        use crate::headers::extra_channels::ExtraChannel;
+
+        // 3x3a has alpha
+        let file = std::fs::read("resources/test/3x3a_srgb_lossless.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        let info = decoder.basic_info();
+        // Should have exactly one extra channel of type Alpha
+        assert_eq!(info.extra_channels.len(), 1);
+        let alpha = &info.extra_channels[0];
+        assert_eq!(alpha.ec_type, ExtraChannel::Alpha);
+        assert!(alpha.bits_per_sample > 0);
+        // Default alpha channels typically have dim_shift 0 (full resolution)
+        assert_eq!(alpha.dim_shift, 0);
+    }
+
+    #[test]
+    fn test_preview_metadata_in_basic_info() {
+        // with_preview.jxl has a preview; basic.jxl does not
+        let file = std::fs::read("resources/test/with_preview.jxl").unwrap();
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoder::<states::Initialized>::new(options);
+        let mut input = file.as_slice();
+        let decoder = loop {
+            match decoder.process(&mut input).unwrap() {
+                ProcessingResult::Complete { result } => break result,
+                ProcessingResult::NeedsMoreInput { fallback, .. } => decoder = fallback,
+            }
+        };
+        let info = decoder.basic_info();
+        let (pw, ph) = info.preview_size.expect("expected preview_size");
+        assert!(pw > 0 && ph > 0, "preview dimensions should be positive");
+    }
+
+    #[test]
+    fn test_stop_cancellation() {
+        use almost_enough::Stopper;
+        use enough::Stop;
+
+        let stop = Stopper::new();
+        assert!(!stop.should_stop());
+        stop.cancel();
+        assert!(stop.should_stop());
+        // Verify it integrates with our error type
+        let result: crate::error::Result<()> = stop.check().map_err(Into::into);
+        assert!(matches!(result, Err(crate::error::Error::Cancelled)));
+    }
+
+    /// Regression for the preview-frame recovery option-propagation bug that
+    /// was fixed upstream in libjxl/jxl-rs #743 (commit f1514f1).
+    ///
+    /// When the input file carries a preview frame, the codestream parser
+    /// decodes the preview with `process_without_output=true`, then discovers
+    /// the main frame is a separate frame and recreates the [`DecoderState`]
+    /// in `codestream_parser::sections::handle_frame_finalized`. Before the
+    /// port, that recreation path dropped several fields (`high_precision`,
+    /// `premultiply_output`, `parallel`, `memory_tracker`,
+    /// `embedded_color_profile`) back to their constructor defaults, silently
+    /// reverting options set by the caller.
+    ///
+    /// The fix centralizes option propagation through
+    /// `non_section::apply_decoder_options` so both the primary creation path
+    /// and the preview-recovery path populate the same fields.
+    ///
+    /// The test fully decodes `with_preview.jxl` with non-default options, so
+    /// the preview frame finalize path runs and the recreation branch is
+    /// taken, then asserts every recreated field carries the configured
+    /// option value rather than the `DecoderState::new` default.
+    #[test]
+    #[allow(clippy::field_reassign_with_default)]
+    fn test_preview_recovery_preserves_decoder_options() {
+        let data = std::fs::read("resources/test/with_preview.jxl")
+            .expect("with_preview.jxl test fixture should exist");
+
+        // Flip every option the recovery path used to drop to a non-default
+        // value (`render_spot_colors=false`, `high_precision=true`,
+        // `premultiply_output=true`, `parallel=false`, restrictive
+        // `max_memory_bytes`) so a successful decode with the buggy code
+        // would visibly carry the wrong field values. `JxlDecoderOptions`
+        // is `#[non_exhaustive]`, so a struct literal with
+        // `..Default::default()` is not allowed.
+        let mut options = JxlDecoderOptions::default();
+        options.high_precision = true;
+        options.premultiply_output = true;
+        options.parallel = false;
+        options.render_spot_colors = false;
+        // Generous enough to actually decode the tiny test file but still
+        // a finite limit so memory_tracker.has_limit() is true.
+        options.limits.max_memory_bytes = Some(64 * 1024 * 1024);
+
+        let mut decoder = JxlDecoderInner::new(options);
+        let mut input = data.as_slice();
+
+        // 1. Process up to image info.
+        match decoder.process(&mut input, None) {
+            Ok(ProcessingResult::Complete { .. }) => {}
+            other => panic!("expected image-info Complete, got {other:?}"),
+        }
+        assert!(decoder.basic_info().is_some());
+
+        // 2. Process up to the (main) frame header. With the default
+        //    `skip_preview=true`, the preview frame is fully decoded with
+        //    `process_without_output=true`, then the recreate branch in
+        //    `sections::handle_frame_finalized` runs and the decoder advances
+        //    to the main frame. The main-frame `Frame::from_header_and_toc`
+        //    consumes the recreated `DecoderState`, so by the time `process`
+        //    returns here the recreated state lives inside the active Frame.
+        match decoder.process(&mut input, None) {
+            Ok(ProcessingResult::Complete { .. }) => {}
+            other => panic!("expected frame-info Complete, got {other:?}"),
+        }
+        assert!(decoder.frame_header().is_some());
+
+        // Inspect the recreated state (now inside the main-frame Frame)
+        // BEFORE the main frame finalizes and drops it.
+        let state = decoder
+            .decoder_state_for_test()
+            .expect("decoder_state must exist inside the active main frame");
+
+        // Before the fix, all of the following assertions would fail when
+        // the preview-recovery branch was taken: the recreated state reset
+        // every knob below to its DecoderState::new() default.
+        assert!(
+            state.high_precision,
+            "high_precision should survive preview-frame recovery"
+        );
+        assert!(
+            state.premultiply_output,
+            "premultiply_output should survive preview-frame recovery"
+        );
+        assert!(
+            !state.parallel,
+            "parallel=false should survive preview-frame recovery (was silently flipped back to DecoderState::new default)"
+        );
+        assert!(
+            !state.render_spotcolors,
+            "render_spotcolors=false should survive preview-frame recovery"
+        );
+        assert!(
+            state.memory_tracker.has_limit(),
+            "memory_tracker should carry the configured limit after preview-frame recovery, not revert to unlimited"
+        );
+        assert_eq!(
+            state.memory_tracker.limit(),
+            Some(64 * 1024 * 1024),
+            "memory_tracker limit should equal configured max_memory_bytes"
+        );
+        assert!(
+            state.embedded_color_profile.is_some(),
+            "embedded_color_profile must be propagated so CMYK ICC and similar code paths work after preview recovery"
+        );
+        assert_eq!(
+            state.limits.max_memory_bytes,
+            Some(64 * 1024 * 1024),
+            "limits.max_memory_bytes on DecoderState must match the configured options"
+        );
+    }
+
+    /// Chunk-drip stress test mirroring the Chrome-integration repro from
+    /// libjxl/jxl-rs #743. We don't have the seek API (upstream #678) yet, but
+    /// we can still exercise the same box-parser and codestream-parser state
+    /// machines by feeding an animation file to `flush_pixels` in 1 KiB chunks
+    /// and asserting the decoder never errors or panics on any chunk boundary.
+    #[test]
+    fn test_chunked_drip_decode_animation_newtons_cradle() {
+        let data =
+            std::fs::read("resources/test/conformance_test_images/animation_newtons_cradle.jxl")
+                .expect("animation_newtons_cradle.jxl test fixture should exist");
+
+        let options = JxlDecoderOptions::default();
+        let mut decoder = JxlDecoderInner::new(options);
+        const CHUNK: usize = 1024;
+        let mut fed = 0usize;
+
+        while fed < data.len() {
+            let end = (fed + CHUNK).min(data.len());
+            let mut chunk = &data[fed..end];
+            let before = chunk.len();
+            match decoder.process(&mut chunk, None) {
+                Ok(_) => {}
+                Err(e) => panic!("decoder errored on chunk [{fed}..{end}]: {e:?}"),
+            }
+            let consumed = before - chunk.len();
+            fed += consumed;
+            if consumed == 0 {
+                // No progress on this chunk — advance to feed more bytes.
+                fed = end;
+            }
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/box_parser.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/box_parser.rs
new file mode 100644
index 00000000..e5a4e99e
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/box_parser.rs
@@ -0,0 +1,473 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::io::IoSliceMut;
+
+use crate::container::frame_index::FrameIndexBox;
+use crate::container::gain_map::GainMapBundle;
+use crate::error::{Error, Result};
+use crate::util::NewWithCapacity;
+
+use crate::api::{
+    JxlBitstreamInput, JxlSignatureType, check_signature_internal, inner::process::SmallBuffer,
+};
+
+#[derive(Clone)]
+enum ParseState {
+    SignatureNeeded,
+    BoxNeeded,
+    CodestreamBox(u64),
+    SkippableBox(u64),
+    #[cfg(feature = "jpeg")]
+    JbrdBox(u64),
+    /// Buffering a jxli box: (remaining bytes, accumulated content).
+    BufferingFrameIndex(u64, Vec<u8>),
+    /// Buffering a jhgm box: (remaining bytes, accumulated content).
+    BufferingGainMap(u64, Vec<u8>),
+    /// Buffering an Exif box: (remaining bytes, accumulated content).
+    BufferingExif(u64, Vec<u8>),
+    /// Buffering an xml (XMP) box: (remaining bytes, accumulated content).
+    BufferingXmp(u64, Vec<u8>),
+    /// Buffering a brob (brotli-compressed) box: (remaining bytes, accumulated
+    /// content). The content is `[4-byte inner box type][brotli payload]`; once
+    /// complete it is decompressed and routed to exif/xmp by the inner type.
+    #[cfg(feature = "jpeg")]
+    BufferingBrob(u64, Vec<u8>),
+}
+
+enum CodestreamBoxType {
+    None,
+    Jxlc,
+    Jxlp(u32),
+    LastJxlp,
+}
+
+pub(super) struct BoxParser {
+    pub(super) box_buffer: SmallBuffer,
+    state: ParseState,
+    box_type: CodestreamBoxType,
+    #[cfg(feature = "jpeg")]
+    jbrd_data: Option<Vec<u8>>,
+    /// Parsed frame index box, if present in the file.
+    pub(super) frame_index: Option<FrameIndexBox>,
+    /// Parsed gain map bundle, if present in the file.
+    pub(super) gain_map: Option<GainMapBundle>,
+    /// Raw EXIF data from the `Exif` container box (without the 4-byte TIFF offset prefix).
+    pub(super) exif: Option<Vec<u8>>,
+    /// Raw XMP data from the `xml ` container box.
+    pub(super) xmp: Option<Vec<u8>>,
+}
+
+impl BoxParser {
+    pub(super) fn new() -> Self {
+        BoxParser {
+            box_buffer: SmallBuffer::new(128),
+            state: ParseState::SignatureNeeded,
+            box_type: CodestreamBoxType::None,
+            #[cfg(feature = "jpeg")]
+            jbrd_data: None,
+            frame_index: None,
+            gain_map: None,
+            exif: None,
+            xmp: None,
+        }
+    }
+
+    /// Take the accumulated JBRD box data, if any was found.
+    #[cfg(feature = "jpeg")]
+    pub(super) fn take_jbrd_data(&mut self) -> Option<Vec<u8>> {
+        self.jbrd_data.take()
+    }
+
+    // Reads input until the next byte of codestream is available.
+    // This function might over-read bytes. Thus, the contents of self.box_buffer should always be
+    // read after this function call.
+    // Returns the number of codestream bytes that will be available to be read after this call,
+    // including any bytes in self.box_buffer.
+    // Might return `u64::MAX`, indicating that the rest of the file is codestream.
+    pub(super) fn get_more_codestream(&mut self, input: &mut dyn JxlBitstreamInput) -> Result<u64> {
+        loop {
+            match self.state.clone() {
+                ParseState::SignatureNeeded => {
+                    self.box_buffer.refill(|b| input.read(b), None)?;
+                    match check_signature_internal(&self.box_buffer)? {
+                        None => return Err(Error::InvalidSignature),
+                        Some(JxlSignatureType::Codestream) => {
+                            self.state = ParseState::CodestreamBox(u64::MAX);
+                            return Ok(u64::MAX);
+                        }
+                        Some(JxlSignatureType::Container) => {
+                            self.box_buffer
+                                .consume(JxlSignatureType::Container.signature().len());
+                            self.state = ParseState::BoxNeeded;
+                        }
+                    }
+                }
+                ParseState::CodestreamBox(b) => {
+                    return Ok(b);
+                }
+                ParseState::SkippableBox(mut s) => {
+                    let num = s.min(usize::MAX as u64) as usize;
+                    let skipped = if !self.box_buffer.is_empty() {
+                        self.box_buffer.consume(num)
+                    } else {
+                        input.skip(num)?
+                    };
+                    if skipped == 0 {
+                        return Err(Error::OutOfBounds(num));
+                    }
+                    s -= skipped as u64;
+                    if s == 0 {
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::SkippableBox(s);
+                    }
+                }
+                #[cfg(feature = "jpeg")]
+                ParseState::JbrdBox(mut remaining) => {
+                    // Read jbrd box content into buffer
+                    let num = remaining.min(usize::MAX as u64) as usize;
+                    let jbrd = self.jbrd_data.get_or_insert_with(Vec::new);
+                    if !self.box_buffer.is_empty() {
+                        let avail = self.box_buffer.len().min(num);
+                        jbrd.extend_from_slice(&self.box_buffer[..avail]);
+                        self.box_buffer.consume(avail);
+                        remaining -= avail as u64;
+                    } else {
+                        // Read from input using IoSliceMut
+                        let chunk_size = num.min(65536);
+                        let start = jbrd.len();
+                        jbrd.resize(start + chunk_size, 0);
+                        let read =
+                            input.read(&mut [std::io::IoSliceMut::new(&mut jbrd[start..])])?;
+                        if read == 0 {
+                            jbrd.truncate(start);
+                            return Err(Error::OutOfBounds(num));
+                        }
+                        jbrd.truncate(start + read);
+                        remaining -= read as u64;
+                    }
+                    if remaining == 0 {
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::JbrdBox(remaining);
+                    }
+                }
+                ParseState::BufferingFrameIndex(mut remaining, mut buf) => {
+                    let num = remaining.min(usize::MAX as u64) as usize;
+                    if !self.box_buffer.is_empty() {
+                        let take = num.min(self.box_buffer.len());
+                        buf.extend_from_slice(&self.box_buffer[..take]);
+                        self.box_buffer.consume(take);
+                        remaining -= take as u64;
+                    } else {
+                        let old_len = buf.len();
+                        buf.resize(old_len + num, 0);
+                        let read = input.read(&mut [IoSliceMut::new(&mut buf[old_len..])])?;
+                        if read == 0 {
+                            return Err(Error::OutOfBounds(num));
+                        }
+                        buf.truncate(old_len + read);
+                        remaining -= read as u64;
+                    }
+                    if remaining == 0 {
+                        // Parse the buffered frame index box.
+                        self.frame_index = Some(FrameIndexBox::parse(&buf)?);
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::BufferingFrameIndex(remaining, buf);
+                    }
+                }
+                ParseState::BufferingGainMap(mut remaining, mut buf) => {
+                    let num = remaining.min(usize::MAX as u64) as usize;
+                    if !self.box_buffer.is_empty() {
+                        let take = num.min(self.box_buffer.len());
+                        buf.extend_from_slice(&self.box_buffer[..take]);
+                        self.box_buffer.consume(take);
+                        remaining -= take as u64;
+                    } else {
+                        let old_len = buf.len();
+                        buf.resize(old_len + num, 0);
+                        let read = input.read(&mut [IoSliceMut::new(&mut buf[old_len..])])?;
+                        if read == 0 {
+                            return Err(Error::OutOfBounds(num));
+                        }
+                        buf.truncate(old_len + read);
+                        remaining -= read as u64;
+                    }
+                    if remaining == 0 {
+                        // Parse the buffered gain map bundle.
+                        self.gain_map = Some(GainMapBundle::parse(&buf)?);
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::BufferingGainMap(remaining, buf);
+                    }
+                }
+                ParseState::BufferingExif(mut remaining, mut buf) => {
+                    let num = remaining.min(usize::MAX as u64) as usize;
+                    if !self.box_buffer.is_empty() {
+                        let take = num.min(self.box_buffer.len());
+                        buf.extend_from_slice(&self.box_buffer[..take]);
+                        self.box_buffer.consume(take);
+                        remaining -= take as u64;
+                    } else {
+                        let old_len = buf.len();
+                        buf.resize(old_len + num, 0);
+                        let read = input.read(&mut [IoSliceMut::new(&mut buf[old_len..])])?;
+                        if read == 0 {
+                            return Err(Error::OutOfBounds(num));
+                        }
+                        buf.truncate(old_len + read);
+                        remaining -= read as u64;
+                    }
+                    if remaining == 0 {
+                        // Exif box payload starts with a 4-byte TIFF header offset
+                        // (big-endian u32). Strip it to return raw EXIF/TIFF data.
+                        if buf.len() >= 4 {
+                            self.exif = Some(buf[4..].to_vec());
+                        }
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::BufferingExif(remaining, buf);
+                    }
+                }
+                ParseState::BufferingXmp(mut remaining, mut buf) => {
+                    let num = remaining.min(usize::MAX as u64) as usize;
+                    if !self.box_buffer.is_empty() {
+                        let take = num.min(self.box_buffer.len());
+                        buf.extend_from_slice(&self.box_buffer[..take]);
+                        self.box_buffer.consume(take);
+                        remaining -= take as u64;
+                    } else {
+                        let old_len = buf.len();
+                        buf.resize(old_len + num, 0);
+                        let read = input.read(&mut [IoSliceMut::new(&mut buf[old_len..])])?;
+                        if read == 0 {
+                            return Err(Error::OutOfBounds(num));
+                        }
+                        buf.truncate(old_len + read);
+                        remaining -= read as u64;
+                    }
+                    if remaining == 0 {
+                        self.xmp = Some(buf);
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::BufferingXmp(remaining, buf);
+                    }
+                }
+                #[cfg(feature = "jpeg")]
+                ParseState::BufferingBrob(mut remaining, mut buf) => {
+                    let num = remaining.min(usize::MAX as u64) as usize;
+                    if !self.box_buffer.is_empty() {
+                        let take = num.min(self.box_buffer.len());
+                        buf.extend_from_slice(&self.box_buffer[..take]);
+                        self.box_buffer.consume(take);
+                        remaining -= take as u64;
+                    } else {
+                        let old_len = buf.len();
+                        buf.resize(old_len + num, 0);
+                        let read = input.read(&mut [IoSliceMut::new(&mut buf[old_len..])])?;
+                        if read == 0 {
+                            return Err(Error::OutOfBounds(num));
+                        }
+                        buf.truncate(old_len + read);
+                        remaining -= read as u64;
+                    }
+                    if remaining == 0 {
+                        // brob payload = [4-byte inner box type][brotli stream].
+                        if buf.len() >= 4
+                            && let Some(out) = brotli_decompress_box(&buf[4..])
+                        {
+                            match &buf[0..4] {
+                                // Same handling as a raw Exif box: strip the
+                                // 4-byte TIFF-header offset.
+                                b"Exif" if out.len() >= 4 => self.exif = Some(out[4..].to_vec()),
+                                b"xml " => self.xmp = Some(out),
+                                _ => {}
+                            }
+                        }
+                        self.state = ParseState::BoxNeeded;
+                    } else {
+                        self.state = ParseState::BufferingBrob(remaining, buf);
+                    }
+                }
+                ParseState::BoxNeeded => {
+                    self.box_buffer.refill(|b| input.read(b), None)?;
+                    let min_len = match &self.box_buffer[..] {
+                        [0, 0, 0, 1, ..] => 16,
+                        _ => 8,
+                    };
+                    if self.box_buffer.len() <= min_len {
+                        return Err(Error::OutOfBounds(min_len - self.box_buffer.len()));
+                    }
+                    let ty: [_; 4] = self.box_buffer[4..8].try_into().unwrap();
+                    let extra_len = if &ty == b"jxlp" { 4 } else { 0 };
+                    if self.box_buffer.len() <= min_len + extra_len {
+                        return Err(Error::OutOfBounds(
+                            min_len + extra_len - self.box_buffer.len(),
+                        ));
+                    }
+                    let box_len = match &self.box_buffer[..] {
+                        [0, 0, 0, 1, ..] => {
+                            u64::from_be_bytes(self.box_buffer[8..16].try_into().unwrap())
+                        }
+                        _ => u32::from_be_bytes(self.box_buffer[0..4].try_into().unwrap()) as u64,
+                    };
+                    // Per JXL spec: jxlc box with length 0 has special meaning "extends to EOF"
+                    let content_len = if box_len == 0 && (&ty == b"jxlp" || &ty == b"jxlc") {
+                        u64::MAX
+                    } else {
+                        if box_len <= (min_len + extra_len) as u64 {
+                            return Err(Error::InvalidBox);
+                        }
+                        box_len - min_len as u64 - extra_len as u64
+                    };
+                    match &ty {
+                        b"jxlc" => {
+                            if matches!(
+                                self.box_type,
+                                CodestreamBoxType::Jxlp(..) | CodestreamBoxType::LastJxlp
+                            ) {
+                                return Err(Error::InvalidBox);
+                            }
+                            self.box_type = CodestreamBoxType::Jxlc;
+                            self.state = ParseState::CodestreamBox(content_len);
+                        }
+                        b"jxlp" => {
+                            let index = u32::from_be_bytes(
+                                self.box_buffer[min_len..min_len + 4].try_into().unwrap(),
+                            );
+                            let wanted_idx = match self.box_type {
+                                CodestreamBoxType::Jxlc | CodestreamBoxType::LastJxlp => {
+                                    return Err(Error::InvalidBox);
+                                }
+                                CodestreamBoxType::None => 0,
+                                CodestreamBoxType::Jxlp(i) => i + 1,
+                            };
+                            let last = index & 0x80000000 != 0;
+                            let idx = index & 0x7fffffff;
+                            if idx != wanted_idx {
+                                return Err(Error::InvalidBox);
+                            }
+                            self.box_type = if last {
+                                CodestreamBoxType::LastJxlp
+                            } else {
+                                CodestreamBoxType::Jxlp(idx)
+                            };
+                            self.state = ParseState::CodestreamBox(content_len);
+                        }
+                        #[cfg(feature = "jpeg")]
+                        b"jbrd" => {
+                            self.state = ParseState::JbrdBox(content_len);
+                        }
+                        b"jhgm" => {
+                            if content_len == u64::MAX {
+                                return Err(Error::InvalidBox);
+                            }
+                            // Reasonable size limit for a gain map bundle (256 MB).
+                            // Gain maps contain a full JXL codestream so they can be large.
+                            if content_len > 256 * 1024 * 1024 {
+                                self.state = ParseState::SkippableBox(content_len);
+                            } else {
+                                // Use fallible alloc — capacity reserves up to
+                                // 256 MB and a global allocator that can't
+                                // satisfy the request must surface as a graceful
+                                // error, never an `abort()` on the parser thread.
+                                self.state = ParseState::BufferingGainMap(
+                                    content_len,
+                                    Vec::<u8>::new_with_capacity(content_len as usize)?,
+                                );
+                            }
+                        }
+                        b"jxli" => {
+                            if content_len == u64::MAX {
+                                return Err(Error::InvalidBox);
+                            }
+                            // Reasonable size limit for a frame index box (16 MB).
+                            if content_len > 16 * 1024 * 1024 {
+                                self.state = ParseState::SkippableBox(content_len);
+                            } else {
+                                self.state = ParseState::BufferingFrameIndex(
+                                    content_len,
+                                    Vec::<u8>::new_with_capacity(content_len as usize)?,
+                                );
+                            }
+                        }
+                        b"Exif" => {
+                            if content_len == u64::MAX {
+                                return Err(Error::InvalidBox);
+                            }
+                            // Reasonable size limit for EXIF data (16 MB).
+                            if content_len > 16 * 1024 * 1024 {
+                                self.state = ParseState::SkippableBox(content_len);
+                            } else {
+                                self.state = ParseState::BufferingExif(
+                                    content_len,
+                                    Vec::<u8>::new_with_capacity(content_len as usize)?,
+                                );
+                            }
+                        }
+                        b"xml " => {
+                            if content_len == u64::MAX {
+                                return Err(Error::InvalidBox);
+                            }
+                            // Reasonable size limit for XMP data (16 MB).
+                            if content_len > 16 * 1024 * 1024 {
+                                self.state = ParseState::SkippableBox(content_len);
+                            } else {
+                                self.state = ParseState::BufferingXmp(
+                                    content_len,
+                                    Vec::<u8>::new_with_capacity(content_len as usize)?,
+                                );
+                            }
+                        }
+                        // Brotli-compressed metadata box. The encoder wraps EXIF
+                        // / XMP in `brob` when brotli shrinks them; decompress
+                        // and route by inner box type. Needs brotli (jpeg feat).
+                        #[cfg(feature = "jpeg")]
+                        b"brob" => {
+                            if content_len == u64::MAX || content_len > 16 * 1024 * 1024 {
+                                self.state = ParseState::SkippableBox(content_len);
+                            } else {
+                                self.state = ParseState::BufferingBrob(
+                                    content_len,
+                                    Vec::<u8>::new_with_capacity(content_len as usize)?,
+                                );
+                            }
+                        }
+                        _ => {
+                            self.state = ParseState::SkippableBox(content_len);
+                        }
+                    }
+                    self.box_buffer.consume(min_len + extra_len);
+                }
+            }
+        }
+    }
+
+    pub(super) fn consume_codestream(&mut self, amount: u64) {
+        if let ParseState::CodestreamBox(cb) = &mut self.state {
+            *cb = cb.checked_sub(amount).unwrap();
+            if *cb == 0 {
+                self.state = ParseState::BoxNeeded;
+            }
+        } else if amount != 0 {
+            unreachable!()
+        }
+    }
+}
+
+/// Brotli-decompress a `brob` box payload (the bytes after the 4-byte inner box
+/// type). Returns `None` on malformed input. Only built with the `jpeg` feature
+/// (which provides `brotli`); without it `brob` boxes are skipped.
+#[cfg(feature = "jpeg")]
+fn brotli_decompress_box(compressed: &[u8]) -> Option<Vec<u8>> {
+    use std::io::Read;
+    let mut out = Vec::new();
+    brotli::Decompressor::new(compressed, 4096)
+        .read_to_end(&mut out)
+        .ok()?;
+    Some(out)
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/mod.rs
new file mode 100644
index 00000000..5b6f8b8f
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/mod.rs
@@ -0,0 +1,545 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{
+    collections::{HashSet, VecDeque},
+    io::IoSliceMut,
+};
+
+use sections::SectionState;
+
+#[cfg(test)]
+use crate::api::FrameCallback;
+use crate::{
+    api::{
+        JxlBasicInfo, JxlBitstreamInput, JxlColorEncoding, JxlColorProfile, JxlDataFormat,
+        JxlDecoderOptions, JxlOutputBuffer, JxlPixelFormat,
+        inner::{box_parser::BoxParser, process::SmallBuffer},
+    },
+    error::{Error, Result},
+    frame::{DecoderState, Frame, Section},
+    headers::{Animation, FileHeader, frame_header::FrameHeader, toc::IncrementalTocReader},
+    icc::IncrementalIccReader,
+};
+
+mod non_section;
+mod sections;
+
+struct SectionBuffer {
+    len: usize,
+    data: Vec<u8>,
+    section: Section,
+}
+
+/// Padding bytes appended to each section buffer so BitReader::refill()
+/// can always take the fast 8-byte read path.
+const SECTION_PADDING: usize = 8;
+
+pub(super) struct CodestreamParser {
+    // TODO(veluca): this would probably be cleaner with some kind of state enum.
+    pub(super) file_header: Option<FileHeader>,
+    icc_parser: Option<IncrementalIccReader>,
+    // These fields are populated once image information is available.
+    pub(super) decoder_state: Option<DecoderState>,
+    pub(super) basic_info: Option<JxlBasicInfo>,
+    pub(super) animation: Option<Animation>,
+    pub(super) embedded_color_profile: Option<JxlColorProfile>,
+    pub(super) output_color_profile: Option<JxlColorProfile>,
+    pub(super) pixel_format: Option<JxlPixelFormat>,
+    xyb_encoded: bool,
+    is_gray: bool,
+    pub(super) output_color_profile_set_by_user: bool,
+
+    // These fields are populated when starting to decode a frame, and cleared once
+    // the frame is done.
+    frame_header: Option<FrameHeader>,
+    toc_parser: Option<IncrementalTocReader>,
+    pub(super) frame: Option<Frame>,
+
+    // Buffers.
+    non_section_buf: SmallBuffer,
+    non_section_bit_offset: u8,
+    sections: VecDeque<SectionBuffer>,
+    ready_section_data: usize,
+    skip_sections: bool,
+    // True when we need to process frames without copying them to output buffers, e.g. reference frames
+    process_without_output: bool,
+    // True once the preview frame has been processed (if there is one)
+    preview_done: bool,
+    // Saved file header for recreating decoder state after preview frame
+    saved_file_header: Option<crate::headers::FileHeader>,
+
+    section_state: SectionState,
+
+    // Or only section if in single section special case.
+    lf_global_section: Option<SectionBuffer>,
+    lf_sections: Vec<SectionBuffer>,
+    hf_global_section: Option<SectionBuffer>,
+    // indexed by group, then by pass.
+    hf_sections: Vec<Vec<Option<SectionBuffer>>>,
+    // group indices that *might* have new renderable data.
+    candidate_hf_sections: HashSet<usize>,
+
+    pub(super) has_more_frames: bool,
+
+    /// `(global_scale, quant_lf)` of the first regular VarDCT frame, captured
+    /// when its `LfGlobal` is decoded and kept for the decoder's lifetime so a
+    /// probe can recover the main image's encode quality. `None` for Modular
+    /// (lossless) files or before the first regular frame is decoded.
+    pub(super) first_vardct_quantizer: Option<(u32, u32)>,
+
+    header_needed_bytes: Option<u64>,
+
+    #[cfg(test)]
+    pub frame_callback: Option<Box<FrameCallback>>,
+    #[cfg(test)]
+    pub decoded_frames: usize,
+
+    /// JBRD box data for JPEG reconstruction.
+    #[cfg(feature = "jpeg")]
+    pub(super) jbrd_data: Option<Vec<u8>>,
+    /// Reconstruction JpegData (built after the frame decodes if jbrd present).
+    /// EXIF/XMP APPn placeholders are filled, and the bytes written, lazily in
+    /// `take_jpeg_reconstruction` — after the trailing container boxes parse.
+    #[cfg(feature = "jpeg")]
+    pub(super) jpeg_recon: Option<crate::jpeg::data::JpegData>,
+}
+
+impl CodestreamParser {
+    pub(super) fn new() -> Self {
+        Self {
+            file_header: None,
+            icc_parser: None,
+            decoder_state: None,
+            basic_info: None,
+            animation: None,
+            embedded_color_profile: None,
+            output_color_profile: None,
+            pixel_format: None,
+            xyb_encoded: false,
+            is_gray: false,
+            output_color_profile_set_by_user: false,
+            frame_header: None,
+            toc_parser: None,
+            frame: None,
+            first_vardct_quantizer: None,
+            non_section_buf: SmallBuffer::new(4096),
+            non_section_bit_offset: 0,
+            sections: VecDeque::new(),
+            ready_section_data: 0,
+            skip_sections: false,
+            process_without_output: false,
+            preview_done: false,
+            saved_file_header: None,
+            section_state: SectionState::new(0, 0),
+            lf_global_section: None,
+            lf_sections: vec![],
+            hf_global_section: None,
+            hf_sections: vec![],
+            candidate_hf_sections: HashSet::new(),
+            has_more_frames: true,
+            header_needed_bytes: None,
+            #[cfg(test)]
+            frame_callback: None,
+            #[cfg(test)]
+            decoded_frames: 0,
+            #[cfg(feature = "jpeg")]
+            jbrd_data: None,
+            #[cfg(feature = "jpeg")]
+            jpeg_recon: None,
+        }
+    }
+
+    fn has_visible_frame(&self) -> bool {
+        if let Some(frame) = &self.frame {
+            frame.header().is_visible()
+        } else {
+            false
+        }
+    }
+
+    /// Returns the number of passes that are fully completed across all groups.
+    pub(super) fn num_completed_passes(&self) -> usize {
+        self.section_state.num_completed_passes()
+    }
+
+    #[cfg(test)]
+    pub(crate) fn set_use_simple_pipeline(&mut self, u: bool) {
+        self.decoder_state
+            .as_mut()
+            .unwrap()
+            .set_use_simple_pipeline(u);
+    }
+
+    /// Rewinds for animation loop replay, keeping pixel_format setting.
+    pub(super) fn rewind(&mut self) -> Option<JxlPixelFormat> {
+        let pixel_format = self.pixel_format.take();
+        *self = Self::new();
+        self.pixel_format = pixel_format.clone();
+        pixel_format
+    }
+
+    pub(super) fn process(
+        &mut self,
+        box_parser: &mut BoxParser,
+        input: &mut dyn JxlBitstreamInput,
+        decode_options: &JxlDecoderOptions,
+        mut output_buffers: Option<&mut [JxlOutputBuffer]>,
+        do_flush: bool,
+    ) -> Result<()> {
+        if let Some(output_buffers) = &output_buffers {
+            let px = self.pixel_format.as_ref().unwrap();
+            let expected_len = std::iter::once(&px.color_data_format)
+                .chain(px.extra_channel_format.iter())
+                .filter(|x| x.is_some())
+                .count();
+            if output_buffers.len() != expected_len {
+                return Err(Error::WrongBufferCount(output_buffers.len(), expected_len));
+            }
+        }
+        // If we have sections to read, read into sections; otherwise, read into the local buffer.
+        loop {
+            if !self.sections.is_empty() {
+                // Try to pick up JBRD data that may have arrived during box parsing
+                #[cfg(feature = "jpeg")]
+                if self.jbrd_data.is_none()
+                    && let Some(data) = box_parser.take_jbrd_data()
+                {
+                    self.jbrd_data = Some(data);
+                    if let Some(frame) = &mut self.frame {
+                        frame.enable_jpeg_reconstruction();
+                    }
+                }
+
+                let regular_frame = self.has_visible_frame();
+                // Only skip sections if we don't need the frame data. Frames that can be
+                // referenced must be decoded because they serve as sources for patches,
+                // blending, or frame extension in subsequent frames.
+                let can_be_referenced = self
+                    .frame
+                    .as_ref()
+                    .is_some_and(|f| f.header().can_be_referenced);
+                if !self.process_without_output && output_buffers.is_none() && !can_be_referenced {
+                    self.skip_sections = true;
+                }
+
+                if !self.skip_sections {
+                    // This is just an estimate as there could be box bytes in the middle.
+                    let mut readable_section_data = (self.non_section_buf.len()
+                        + input.available_bytes()?
+                        + self.ready_section_data)
+                        .max(1);
+                    // Ensure enough section buffers are available for reading available data.
+                    for buf in self.sections.iter_mut() {
+                        if buf.data.is_empty() {
+                            // Allocate with SECTION_PADDING extra zero bytes so
+                            // BitReader::refill() always takes the fast 8-byte path.
+                            buf.data.resize(buf.len + SECTION_PADDING, 0);
+                        }
+                        readable_section_data = readable_section_data.saturating_sub(buf.len);
+                        if readable_section_data == 0 {
+                            break;
+                        }
+                    }
+                    // Read sections up to the end of the current box.
+                    let mut available_codestream = match box_parser.get_more_codestream(input) {
+                        Err(Error::OutOfBounds(_)) => 0,
+                        Ok(c) => c as usize,
+                        Err(e) => return Err(e),
+                    };
+                    let mut section_buffers = vec![];
+                    let mut ready = self.ready_section_data;
+                    for buf in self.sections.iter_mut() {
+                        if buf.data.is_empty() {
+                            break;
+                        }
+                        let len = buf.len;
+                        if len > ready {
+                            let readable = (available_codestream + ready).min(len);
+                            section_buffers.push(IoSliceMut::new(&mut buf.data[ready..readable]));
+                            available_codestream =
+                                available_codestream.saturating_sub(readable - ready);
+                            if available_codestream == 0 {
+                                break;
+                            }
+                        }
+                        ready = ready.saturating_sub(len);
+                    }
+                    let ready_before = self.ready_section_data;
+                    let mut buffers = &mut section_buffers[..];
+                    loop {
+                        let num = if !box_parser.box_buffer.is_empty() {
+                            box_parser.box_buffer.take(buffers)
+                        } else {
+                            input.read(buffers)?
+                        };
+                        self.ready_section_data += num;
+                        box_parser.consume_codestream(num as u64);
+                        IoSliceMut::advance_slices(&mut buffers, num);
+                        if num == 0 || buffers.is_empty() {
+                            break;
+                        }
+                    }
+                    match self.process_sections(decode_options, &mut output_buffers, do_flush) {
+                        Ok(None) => Ok(()),
+                        Ok(Some(missing)) => Err(Error::OutOfBounds(missing)),
+                        Err(Error::OutOfBounds(_)) => Err(Error::SectionTooShort),
+                        Err(err) => Err(err),
+                    }?;
+                    // If no section data was read and sections are still pending,
+                    // the input is truncated — return an error instead of looping
+                    // forever waiting for data that will never arrive.
+                    if !self.sections.is_empty()
+                        && self.ready_section_data == ready_before
+                        && input.available_bytes().unwrap_or(0) == 0
+                        && box_parser.box_buffer.is_empty()
+                    {
+                        let total_needed: usize = self.sections.iter().map(|s| s.len).sum();
+                        return Err(Error::OutOfBounds(
+                            total_needed.saturating_sub(self.ready_section_data),
+                        ));
+                    }
+                } else {
+                    let total_size = self.sections.iter().map(|x| x.len).sum::<usize>();
+                    loop {
+                        let to_skip = total_size - self.ready_section_data;
+                        if to_skip == 0 {
+                            break;
+                        }
+                        let available_codestream = box_parser.get_more_codestream(input)? as usize;
+                        let to_skip = to_skip.min(available_codestream);
+                        let skipped = if !box_parser.box_buffer.is_empty() {
+                            box_parser.box_buffer.consume(to_skip)
+                        } else {
+                            input.skip(to_skip)?
+                        };
+                        box_parser.consume_codestream(skipped as u64);
+                        self.ready_section_data += skipped;
+                        if skipped == 0 {
+                            break;
+                        }
+                    }
+                    if self.ready_section_data < total_size {
+                        return Err(Error::OutOfBounds(total_size - self.ready_section_data));
+                    } else {
+                        self.sections.clear();
+                        // Finalize the skipped frame, mirroring what process_sections does
+                        let frame = self
+                            .frame
+                            .take()
+                            .expect("frame must be set when skip_sections is true");
+                        if let Some(decoder_state) = frame.finalize()? {
+                            self.decoder_state = Some(decoder_state);
+                        } else {
+                            self.has_more_frames = false;
+                        }
+                        self.skip_sections = false;
+                    }
+                }
+                if self.sections.is_empty() {
+                    // Go back to parsing a new frame header, if any.
+                    // Only return if this was a regular visible frame that was actually decoded
+                    // (not a frame we were skipping like a preview frame)
+                    let was_skipping = self.process_without_output;
+                    self.process_without_output = false;
+                    if regular_frame && !was_skipping {
+                        // JBRD reconstruction: the trailing Exif / XMP / brob
+                        // metadata boxes follow the frame's codestream. When the
+                        // codestream is large the section reads stop exactly at
+                        // the frame end without over-reading the trailing boxes,
+                        // so drive the box parser through them now — otherwise
+                        // EXIF/XMP/ICC are silently dropped from the reconstructed
+                        // APPn markers. `OutOfBounds` is the clean EOF after the
+                        // last box; only fires when a reconstruction is pending,
+                        // so non-JPEG decodes are unaffected.
+                        #[cfg(feature = "jpeg")]
+                        if self.jpeg_recon.is_some() {
+                            match box_parser.get_more_codestream(input) {
+                                Ok(_) | Err(Error::OutOfBounds(_)) => {}
+                                Err(e) => return Err(e),
+                            }
+                        }
+                        return Ok(());
+                    }
+                    continue;
+                }
+            } else {
+                // Trying to read a frame or a file header.
+                assert!(self.frame.is_none());
+                // Defensive (mirrors libjxl/jxl-rs#749): on normal input `has_more_frames`
+                // is still set when we reach this header-reading branch, but a
+                // malformed/edge input (e.g. skipping a final preview frame, or an empty
+                // follow-up `process()` call) can re-enter here with it cleared. There is
+                // no more image data to read, so return gracefully instead of panicking
+                // on untrusted input.
+                if !self.has_more_frames {
+                    // The codestream is complete, but metadata boxes (`jhgm`
+                    // gain map, `Exif`, `xml `, `brob`) may trail it in the
+                    // container — jxl-encoder's `append_gain_map_bundle`
+                    // writes `signature + ftyp + jxlc + jhgm` (#20). Drive
+                    // the box parser through whatever input is available so
+                    // they are captured. `OutOfBounds` is the clean EOF after
+                    // the last box — or an incomplete trailing box, whose
+                    // parsing resumes if `process` is called again with more
+                    // input.
+                    match box_parser.get_more_codestream(input) {
+                        Ok(_) | Err(Error::OutOfBounds(_)) => {}
+                        Err(e) => return Err(e),
+                    }
+                    return Ok(());
+                }
+
+                // Loop to handle incremental parsing (e.g. large ICC profiles) that may need
+                // multiple buffer refills to complete.
+                loop {
+                    let available_codestream = match box_parser.get_more_codestream(input) {
+                        Err(Error::OutOfBounds(_)) => 0,
+                        Ok(c) => c as usize,
+                        Err(e) => return Err(e),
+                    };
+                    let c = self.non_section_buf.refill(
+                        |buf| {
+                            if !box_parser.box_buffer.is_empty() {
+                                Ok(box_parser.box_buffer.take(buf))
+                            } else {
+                                input.read(buf)
+                            }
+                        },
+                        Some(available_codestream),
+                    )? as u64;
+                    box_parser.consume_codestream(c);
+
+                    // If we know that non-section parsing will require more bytes than what
+                    // we added to the codestream, don't even try to parse non-section data.
+                    if let Some(needed) = self.header_needed_bytes.as_mut() {
+                        *needed = needed.saturating_sub(c);
+                        if *needed > 0 {
+                            if !self.non_section_buf.can_read_more() {
+                                self.non_section_buf.enlarge();
+                            }
+                            // Check if input still has data - if so, refill and retry
+                            if input.available_bytes().unwrap_or(0) > 0 {
+                                continue;
+                            } else {
+                                return Err(Error::OutOfBounds(*needed as usize));
+                            }
+                        }
+                    }
+
+                    let range = self.non_section_buf.range();
+                    match self.process_non_section(decode_options) {
+                        Ok(()) => {
+                            self.header_needed_bytes = None;
+                            break;
+                        }
+                        Err(Error::OutOfBounds(n)) => {
+                            let new_range = self.non_section_buf.range();
+                            // If non-section parsing consumed no bytes, and the non-section buffer
+                            // cannot accept more bytes, enlarge the buffer to allow to make progress.
+                            if new_range == range && !self.non_section_buf.can_read_more() {
+                                self.non_section_buf.enlarge();
+                            }
+                            self.header_needed_bytes = Some(n as u64);
+                            // Check if input still has data - if so, refill and retry
+                            if input.available_bytes().unwrap_or(0) > 0 {
+                                continue;
+                            } else {
+                                return Err(Error::OutOfBounds(n));
+                            }
+                        }
+                        Err(e) => return Err(e),
+                    }
+                }
+
+                if self.decoder_state.is_some() && self.frame_header.is_none() {
+                    // Return to caller if we found image info.
+                    return Ok(());
+                }
+                if self.frame.is_some() {
+                    // Transfer JBRD data from box parser and enable JPEG reconstruction
+                    #[cfg(feature = "jpeg")]
+                    if self.jbrd_data.is_none()
+                        && let Some(data) = box_parser.take_jbrd_data()
+                    {
+                        self.jbrd_data = Some(data);
+                    }
+                    #[cfg(feature = "jpeg")]
+                    if self.jbrd_data.is_some()
+                        && let Some(frame) = &mut self.frame
+                    {
+                        frame.enable_jpeg_reconstruction();
+                    }
+
+                    // Check if this is a preview frame that should be skipped
+                    let is_preview_frame = !self.preview_done
+                        && self
+                            .basic_info
+                            .as_ref()
+                            .is_some_and(|info| info.preview_size.is_some());
+                    if is_preview_frame {
+                        self.preview_done = true;
+                        if decode_options.skip_preview {
+                            self.process_without_output = true;
+                            continue;
+                        }
+                    }
+
+                    if self.has_visible_frame() {
+                        // Return to caller if we found visible frame info.
+                        return Ok(());
+                    } else {
+                        self.process_without_output = true;
+                        continue;
+                    }
+                }
+            }
+        }
+    }
+
+    pub(super) fn update_default_output_color_profile(&mut self) {
+        // Only set default output_color_profile if not already configured by user
+        if self.output_color_profile_set_by_user {
+            return;
+        }
+
+        let embedded_color_profile = self.embedded_color_profile.as_ref().unwrap();
+        let pixel_format = self.pixel_format.as_ref().unwrap();
+
+        // Determine default output color profile following libjxl logic:
+        // - For XYB: use embedded if can_output_to(), else:
+        //   - if float samples are requested: linear sRGB,
+        //   - else: sRGB
+        // - For non-XYB: use embedded color profile
+        let output_color_profile = if self.xyb_encoded {
+            // Use embedded if we can output to it, otherwise fall back to sRGB
+            let base_encoding = if embedded_color_profile.can_output_to() {
+                match &embedded_color_profile {
+                    JxlColorProfile::Simple(enc) => enc.clone(),
+                    JxlColorProfile::Icc(_) => {
+                        unreachable!("can_output_to returns false for ICC")
+                    }
+                }
+            } else {
+                let data_format = pixel_format
+                    .color_data_format
+                    .unwrap_or(JxlDataFormat::U8 { bit_depth: 8 });
+                let is_float = matches!(
+                    data_format,
+                    JxlDataFormat::F32 { .. } | JxlDataFormat::F16 { .. }
+                );
+                if is_float {
+                    JxlColorEncoding::linear_srgb(self.is_gray)
+                } else {
+                    JxlColorEncoding::srgb(self.is_gray)
+                }
+            };
+
+            JxlColorProfile::Simple(base_encoding)
+        } else {
+            embedded_color_profile.clone()
+        };
+        self.output_color_profile = Some(output_color_profile);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/non_section.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/non_section.rs
new file mode 100644
index 00000000..8fde90e6
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/non_section.rs
@@ -0,0 +1,441 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::io::IoSliceMut;
+use std::sync::Arc;
+
+use super::SECTION_PADDING;
+
+use crate::{
+    api::{
+        Endianness, JxlBasicInfo, JxlBitDepth, JxlColorEncoding, JxlColorProfile, JxlColorType,
+        JxlDataFormat, JxlDecoderOptions, JxlExtraChannel, JxlPixelFormat,
+        inner::codestream_parser::SectionState,
+    },
+    bit_reader::BitReader,
+    error::{Error, Result},
+    frame::{DecoderState, Frame, Section},
+    headers::{
+        FileHeader, JxlHeader, Orientation, color_encoding::ColorSpace,
+        encodings::UnconditionalCoder, frame_header::FrameHeader, toc::IncrementalTocReader,
+    },
+    icc::IncrementalIccReader,
+    util::{MemoryTracker, NewWithCapacity},
+};
+
+use super::{CodestreamParser, SectionBuffer};
+use crate::api::ToneMapping;
+
+/// Populate a freshly constructed [`DecoderState`] with per-run settings pulled
+/// from [`JxlDecoderOptions`] and the previously parsed embedded color profile.
+///
+/// Ported from libjxl/jxl-rs #743 (f1514f1): upstream centralized this plumbing
+/// in `DecoderState::new(file_header, &options)` to guarantee both the primary
+/// creation path and the preview-frame recovery path populate identical fields.
+/// In our tree we keep the old two-argument constructor (because our
+/// `DecoderState` has several imazen-only fields) and centralize the plumbing
+/// via this helper instead. Both call sites in `non_section.rs` and
+/// `sections.rs` MUST go through this function so that options set on the
+/// initial state are preserved after a preview-frame-triggered recreate.
+pub(super) fn apply_decoder_options(
+    state: &mut DecoderState,
+    decode_options: &JxlDecoderOptions,
+    embedded_color_profile: &Option<JxlColorProfile>,
+) {
+    state.render_spotcolors = decode_options.render_spot_colors;
+    state.high_precision = decode_options.high_precision;
+    state.premultiply_output = decode_options.premultiply_output;
+    state.adjust_orientation = decode_options.adjust_orientation;
+    state.desired_intensity_target = decode_options.desired_intensity_target;
+    state.embedded_color_profile = embedded_color_profile.clone();
+    state.limits = decode_options.limits.clone();
+    state.stop = Arc::clone(&decode_options.stop);
+    state.memory_tracker = MemoryTracker::from_limit(decode_options.limits.max_memory_bytes);
+    state.parallel = decode_options.parallel;
+}
+
+fn check_size_limit(
+    limits: &crate::api::JxlDecoderLimits,
+    (xs, ys): (usize, usize),
+    num_ec: usize,
+) -> Result<()> {
+    // Check max_pixels from new limits API
+    let total_pixels = xs.saturating_mul(ys);
+    if let Some(limit) = limits.max_pixels
+        && total_pixels > limit
+    {
+        return Err(Error::LimitExceeded {
+            resource: "pixels",
+            actual: total_pixels as u64,
+            limit: limit as u64,
+        });
+    }
+    // Check extra channels limit
+    if let Some(limit) = limits.max_extra_channels
+        && num_ec > limit
+    {
+        return Err(Error::LimitExceeded {
+            resource: "extra_channels",
+            actual: num_ec as u64,
+            limit: limit as u64,
+        });
+    }
+    Ok(())
+}
+
+impl CodestreamParser {
+    #[cold]
+    pub(super) fn process_non_section(&mut self, decode_options: &JxlDecoderOptions) -> Result<()> {
+        if self.decoder_state.is_none() && self.file_header.is_none() {
+            // We don't have a file header yet. Try parsing that.
+            let mut br = BitReader::new(&self.non_section_buf);
+            br.skip_bits(self.non_section_bit_offset as usize)?;
+            let file_header = FileHeader::read(&mut br)?;
+            let xsize = file_header.size.xsize() as usize;
+            let ysize = file_header.size.ysize() as usize;
+            check_size_limit(
+                &decode_options.limits,
+                (xsize, ysize),
+                file_header.image_metadata.extra_channel_info.len(),
+            )?;
+            if let Some(preview) = &file_header.image_metadata.preview {
+                check_size_limit(
+                    &decode_options.limits,
+                    (preview.xsize() as usize, preview.ysize() as usize),
+                    file_header.image_metadata.extra_channel_info.len(),
+                )?;
+            }
+            let data = &file_header.image_metadata;
+            self.animation = data.animation.clone();
+            // The stored (coded) dimensions, before orientation is applied.
+            let coded_size = (xsize, ysize);
+            // The display dimensions, after the stored orientation is applied.
+            let display_size = if data.orientation.is_transposing() {
+                (ysize, xsize)
+            } else {
+                (xsize, ysize)
+            };
+            // When `adjust_orientation` is set (the default), the save stage
+            // bakes the stored orientation into the output: emitted pixels are
+            // upright (display dims, residual orientation Identity). When it is
+            // cleared (Preserve mode), pixels are emitted in their stored
+            // orientation (coded dims, residual orientation = stored), and the
+            // caller bakes it later. `intrinsic_orientation` always reports the
+            // stored value so re-encoders can re-tag correctly. The render
+            // pipeline's save-stage gating in `build_render_pipeline` mirrors
+            // this exactly via `DecoderState::adjust_orientation`.
+            let (output_size, residual_orientation) = if decode_options.adjust_orientation {
+                (display_size, Orientation::Identity)
+            } else {
+                (coded_size, data.orientation)
+            };
+            self.basic_info = Some(JxlBasicInfo {
+                size: output_size,
+                coded_size,
+                bit_depth: if data.bit_depth.floating_point_sample() {
+                    JxlBitDepth::Float {
+                        bits_per_sample: data.bit_depth.bits_per_sample(),
+                        exponent_bits_per_sample: data.bit_depth.exponent_bits_per_sample(),
+                    }
+                } else {
+                    JxlBitDepth::Int {
+                        bits_per_sample: data.bit_depth.bits_per_sample(),
+                    }
+                },
+                orientation: residual_orientation,
+                intrinsic_orientation: data.orientation,
+                extra_channels: data
+                    .extra_channel_info
+                    .iter()
+                    .map(|info| JxlExtraChannel {
+                        ec_type: info.ec_type,
+                        alpha_associated: info.alpha_associated(),
+                        bits_per_sample: info.bit_depth().bits_per_sample(),
+                        name: info.name().to_owned(),
+                        dim_shift: info.dim_shift(),
+                    })
+                    .collect(),
+                animation: data
+                    .animation
+                    .as_ref()
+                    .map(|anim| crate::api::JxlAnimation {
+                        tps_numerator: anim.tps_numerator,
+                        tps_denominator: anim.tps_denominator,
+                        num_loops: anim.num_loops,
+                        have_timecodes: anim.have_timecodes,
+                    }),
+                uses_original_profile: !data.xyb_encoded,
+                tone_mapping: ToneMapping {
+                    intensity_target: data.tone_mapping.intensity_target,
+                    min_nits: data.tone_mapping.min_nits,
+                    relative_to_max_display: data.tone_mapping.relative_to_max_display,
+                    linear_below: data.tone_mapping.linear_below,
+                },
+                preview_size: data
+                    .preview
+                    .as_ref()
+                    .map(|p| (p.xsize() as usize, p.ysize() as usize)),
+                intrinsic_size: data
+                    .intrinsic_size
+                    .as_ref()
+                    .map(|s| (s.xsize() as usize, s.ysize() as usize)),
+            });
+            self.file_header = Some(file_header);
+            let bits = br.total_bits_read();
+            self.non_section_buf.consume(bits / 8);
+            self.non_section_bit_offset = (bits % 8) as u8;
+        }
+
+        if self.decoder_state.is_none() && self.embedded_color_profile.is_none() {
+            let file_header = self.file_header.as_ref().unwrap();
+
+            // Parse (or extract from file header) the ICC profile.
+            let mut br = BitReader::new(&self.non_section_buf);
+            br.skip_bits(self.non_section_bit_offset as usize)?;
+            let embedded_color_profile = if file_header.image_metadata.color_encoding.want_icc {
+                if self.icc_parser.is_none() {
+                    self.icc_parser = Some(IncrementalIccReader::new(
+                        &mut br,
+                        decode_options.limits.max_icc_size,
+                    )?);
+                }
+                let icc_parser = self.icc_parser.as_mut().unwrap();
+                let mut bits = br.total_bits_read();
+                for _ in 0..icc_parser.remaining() {
+                    match icc_parser.read_one(&mut br) {
+                        Ok(()) => bits = br.total_bits_read(),
+                        Err(Error::OutOfBounds(c)) => {
+                            self.non_section_buf.consume(bits / 8);
+                            self.non_section_bit_offset = (bits % 8) as u8;
+                            // Estimate >= one bit per remaining character to read.
+                            return Err(Error::OutOfBounds(c + icc_parser.remaining() / 8));
+                        }
+                        Err(e) => return Err(e),
+                    }
+                }
+                let icc_result = self.icc_parser.take().unwrap().finalize(&mut br);
+                self.non_section_buf.consume(bits / 8);
+                self.non_section_bit_offset = (bits % 8) as u8;
+                JxlColorProfile::Icc(icc_result?)
+            } else {
+                JxlColorProfile::Simple(JxlColorEncoding::from_internal(
+                    &file_header.image_metadata.color_encoding,
+                )?)
+            };
+            self.embedded_color_profile = Some(embedded_color_profile.clone());
+
+            let xyb_encoded = file_header.image_metadata.xyb_encoded;
+            let is_gray = file_header.image_metadata.color_encoding.color_space == ColorSpace::Gray;
+            self.xyb_encoded = xyb_encoded;
+            self.is_gray = is_gray;
+
+            // Only set default pixel_format if not already configured (e.g. via rewind)
+            if self.pixel_format.is_none() {
+                self.pixel_format = Some(JxlPixelFormat {
+                    color_type: if is_gray {
+                        JxlColorType::Grayscale
+                    } else {
+                        JxlColorType::Rgb
+                    },
+                    color_data_format: Some(JxlDataFormat::F32 {
+                        endianness: Endianness::native(),
+                    }),
+                    extra_channel_format: vec![
+                        Some(JxlDataFormat::F32 {
+                            endianness: Endianness::native()
+                        });
+                        file_header.image_metadata.extra_channel_info.len()
+                    ],
+                });
+            }
+
+            if let Some(user_profile) = &self.output_color_profile {
+                // Validate user's output color profile choice (libjxl compatibility)
+                // For non-XYB without CMS: only same encoding as embedded is allowed
+                if !xyb_encoded
+                    && decode_options.cms.is_none()
+                    && *user_profile != embedded_color_profile
+                {
+                    return Err(Error::NonXybOutputNoCMS);
+                }
+            } else {
+                self.update_default_output_color_profile();
+            }
+
+            let mut br = BitReader::new(&self.non_section_buf);
+            br.skip_bits(self.non_section_bit_offset as usize)?;
+            br.jump_to_byte_boundary()?;
+            self.non_section_buf.consume(br.total_bits_read() / 8);
+
+            // We now have image information.
+            let mut decoder_state = DecoderState::new(self.file_header.take().unwrap());
+            apply_decoder_options(
+                &mut decoder_state,
+                decode_options,
+                &self.embedded_color_profile,
+            );
+            self.decoder_state = Some(decoder_state);
+            // Reset bit offset to 0 since we've consumed everything up to a byte boundary
+            self.non_section_bit_offset = 0;
+            return Ok(());
+        }
+
+        let decoder_state = self.decoder_state.as_mut().unwrap();
+
+        if self.frame_header.is_none() {
+            // We don't have a frame header yet. Try parsing that.
+            let mut br = BitReader::new(&self.non_section_buf);
+            br.skip_bits(self.non_section_bit_offset as usize)?;
+
+            // For preview frames, use the preview dimensions instead of main image dimensions
+            let nonserialized = if !self.preview_done {
+                decoder_state
+                    .file_header
+                    .preview_frame_header_nonserialized()
+                    .unwrap_or_else(|| decoder_state.file_header.frame_header_nonserialized())
+            } else {
+                decoder_state.file_header.frame_header_nonserialized()
+            };
+
+            let mut frame_header = FrameHeader::read_unconditional(&(), &mut br, &nonserialized)?;
+            frame_header.postprocess(&nonserialized);
+            check_size_limit(
+                &decode_options.limits,
+                frame_header.size(),
+                frame_header.num_extra_channels as usize,
+            )?;
+
+            // Initialize storage buffers for available sections.
+            self.lf_global_section = None;
+            self.lf_sections.clear();
+            self.hf_global_section = None;
+            // Use fallible allocation: `num_groups()` is derived from the
+            // (untrusted) frame header dimensions and can be astronomically
+            // large for malformed inputs. Avoid aborting the process on OOM and
+            // return a recoverable error instead. (port libjxl/jxl-rs#774,
+            // fixes #770.)
+            let num_groups = frame_header.num_groups();
+            let num_passes = frame_header.passes.num_passes as usize;
+            let mut hf_sections = Vec::new_with_capacity(num_groups)?;
+            for _ in 0..num_groups {
+                let mut row = Vec::new_with_capacity(num_passes)?;
+                for _ in 0..num_passes {
+                    row.push(None);
+                }
+                hf_sections.push(row);
+            }
+            self.hf_sections = hf_sections;
+            self.candidate_hf_sections.clear();
+
+            self.frame_header = Some(frame_header);
+            let bits = br.total_bits_read();
+            self.non_section_buf.consume(bits / 8);
+            self.non_section_bit_offset = (bits % 8) as u8;
+        }
+
+        let toc = {
+            let mut br = BitReader::new(&self.non_section_buf);
+            br.skip_bits(self.non_section_bit_offset as usize)?;
+            if self.toc_parser.is_none() {
+                let num_toc_entries = self.frame_header.as_ref().unwrap().num_toc_entries();
+                self.toc_parser = Some(IncrementalTocReader::new(num_toc_entries as u32, &mut br)?);
+            }
+
+            let toc_parser = self.toc_parser.as_mut().unwrap();
+            let mut bits = br.total_bits_read();
+            while !toc_parser.is_complete() {
+                match toc_parser.read_step(&mut br) {
+                    Ok(()) => bits = br.total_bits_read(),
+                    Err(Error::OutOfBounds(c)) => {
+                        self.non_section_buf.consume(bits / 8);
+                        self.non_section_bit_offset = (bits % 8) as u8;
+                        // Estimate >= 16 bits per remaining entry to read.
+                        return Err(Error::OutOfBounds(
+                            c + toc_parser.remaining_entries() as usize * 2,
+                        ));
+                    }
+                    Err(e) => return Err(e),
+                }
+            }
+            br.jump_to_byte_boundary()?;
+
+            bits = br.total_bits_read();
+            self.non_section_buf.consume(bits / 8);
+            self.non_section_bit_offset = (bits % 8) as u8;
+            self.toc_parser.take().unwrap().finalize()
+        };
+
+        // Save file_header before creating frame (for preview frame recovery)
+        self.saved_file_header = self.decoder_state.as_ref().map(|ds| ds.file_header.clone());
+
+        let frame = Frame::from_header_and_toc(
+            self.frame_header.take().unwrap(),
+            toc,
+            self.decoder_state.take().unwrap(),
+        )?;
+
+        let mut sections: Vec<_> = frame
+            .toc()
+            .entries
+            .iter()
+            .map(|x| SectionBuffer {
+                len: *x as usize,
+                data: vec![],
+                section: Section::LfGlobal, // will be fixed later
+            })
+            .collect();
+
+        let order = if frame.toc().permuted {
+            frame.toc().permutation.0.clone()
+        } else {
+            (0..sections.len() as u32).collect()
+        };
+
+        if sections.len() > 1 {
+            let base_sections = [Section::LfGlobal, Section::HfGlobal];
+            let lf_sections = (0..frame.header().num_lf_groups()).map(|x| Section::Lf { group: x });
+            let hf_sections = (0..frame.header().passes.num_passes).flat_map(|p| {
+                (0..frame.header().num_groups()).map(move |g| Section::Hf {
+                    group: g,
+                    pass: p as usize,
+                })
+            });
+
+            for section in base_sections
+                .into_iter()
+                .chain(lf_sections)
+                .chain(hf_sections)
+            {
+                sections[order[frame.get_section_idx(section)] as usize].section = section;
+            }
+        }
+
+        self.sections = sections.into_iter().collect();
+        self.ready_section_data = 0;
+
+        // Move data from the pre-section buffer into the sections.
+        // Allocate with SECTION_PADDING extra zero bytes so BitReader::refill()
+        // always takes the fast 8-byte read path.
+        for buf in self.sections.iter_mut() {
+            if self.non_section_buf.is_empty() {
+                break;
+            }
+            let mut data = Vec::new();
+            data.try_reserve_exact(buf.len + SECTION_PADDING)?;
+            data.resize(buf.len + SECTION_PADDING, 0);
+            buf.data = data;
+            self.ready_section_data += self
+                .non_section_buf
+                .take(&mut [IoSliceMut::new(&mut buf.data[..buf.len])]);
+        }
+
+        self.section_state =
+            SectionState::new(frame.header().num_lf_groups(), frame.header().num_groups());
+
+        self.frame = Some(frame);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/sections.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/sections.rs
new file mode 100644
index 00000000..7c6ab434
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/codestream_parser/sections.rs
@@ -0,0 +1,446 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::{JxlDecoderOptions, JxlOutputBuffer},
+    bit_reader::BitReader,
+    error::Result,
+    frame::{Frame, Section},
+    headers::frame_header::FrameType,
+};
+
+use super::CodestreamParser;
+
+/// Capture the first regular VarDCT frame's quantizer into `slot` (idempotent —
+/// only the first regular frame is kept). Called right after `decode_lf_global`,
+/// once `frame.lf_global` is populated. Skips LF/progressive helper frames and
+/// previews, and Modular (lossless) frames (whose `vardct_quantizer` is `None`).
+fn capture_first_vardct_quantizer(slot: &mut Option<(u32, u32)>, frame: &Frame) {
+    if slot.is_none()
+        && frame.header().frame_type == FrameType::RegularFrame
+        && let Some(q) = frame.vardct_quantizer()
+    {
+        *slot = Some(q);
+    }
+}
+
+pub(super) struct SectionState {
+    lf_global_done: bool,
+    remaining_lf: usize,
+    hf_global_done: bool,
+    completed_passes: Vec<u8>,
+}
+
+impl SectionState {
+    pub(super) fn new(num_lf_groups: usize, num_groups: usize) -> Self {
+        Self {
+            lf_global_done: false,
+            remaining_lf: num_lf_groups,
+            hf_global_done: false,
+            completed_passes: vec![0; num_groups],
+        }
+    }
+
+    /// Returns the number of passes that are fully completed across all groups.
+    /// A pass is fully completed when all groups have decoded that pass.
+    pub(super) fn num_completed_passes(&self) -> usize {
+        self.completed_passes.iter().copied().min().unwrap_or(0) as usize
+    }
+}
+
+impl CodestreamParser {
+    pub(super) fn process_sections(
+        &mut self,
+        decode_options: &JxlDecoderOptions,
+        output_buffers: &mut Option<&mut [JxlOutputBuffer<'_>]>,
+        do_flush: bool,
+    ) -> Result<Option<usize>> {
+        let frame = self.frame.as_mut().unwrap();
+
+        let output_profile = self
+            .output_color_profile
+            .as_ref()
+            .expect("output_color_profile should be set before pipeline preparation");
+
+        if do_flush && let Some(buf) = output_buffers {
+            frame.maybe_preview_lf_frame(
+                self.pixel_format.as_ref().unwrap(),
+                buf,
+                None,
+                output_profile,
+            )?;
+        }
+
+        let frame_header = frame.header();
+
+        // Dequeue ready sections.
+        while self
+            .sections
+            .front()
+            .is_some_and(|s| s.len <= self.ready_section_data)
+        {
+            let s = self.sections.pop_front().unwrap();
+            self.ready_section_data -= s.len;
+
+            match s.section {
+                Section::LfGlobal => {
+                    self.lf_global_section = Some(s);
+                }
+                Section::HfGlobal => {
+                    self.hf_global_section = Some(s);
+                }
+                Section::Lf { .. } => {
+                    self.lf_sections.push(s);
+                }
+                Section::Hf { group, pass } => {
+                    self.hf_sections[group][pass] = Some(s);
+                    self.candidate_hf_sections.insert(group);
+                }
+            }
+        }
+
+        let mut processed_section = false;
+        let pixel_format = self.pixel_format.as_ref().unwrap();
+        'process: {
+            if frame_header.num_groups() == 1 && frame_header.passes.num_passes == 1 {
+                // Single-group special case.
+                let Some(sec) = self.lf_global_section.take() else {
+                    break 'process;
+                };
+                assert!(self.sections.is_empty());
+                let mut br = BitReader::new_padded(&sec.data, sec.len)?;
+                frame.decode_lf_global(&mut br)?;
+                capture_first_vardct_quantizer(&mut self.first_vardct_quantizer, frame);
+                frame.decode_lf_group(0, &mut br)?;
+                frame.decode_hf_global(&mut br)?;
+                frame.prepare_render_pipeline(
+                    self.pixel_format.as_ref().unwrap(),
+                    decode_options.cms.as_deref(),
+                    self.embedded_color_profile
+                        .as_ref()
+                        .expect("embedded_color_profile should be set before pipeline preparation"),
+                    output_profile,
+                )?;
+                frame.finalize_lf()?;
+                frame.decode_and_render_hf_groups(
+                    output_buffers,
+                    pixel_format,
+                    vec![(0, vec![(0, br)])],
+                    do_flush,
+                    output_profile,
+                )?;
+                processed_section = true;
+            } else {
+                let section_timing = std::env::var("JXL_PHASE_TIMING").is_ok();
+                let t0 = crate::util::Instant::now();
+
+                if let Some(lf_global) = self.lf_global_section.take() {
+                    frame.decode_lf_global(&mut BitReader::new_padded(
+                        &lf_global.data,
+                        lf_global.len,
+                    )?)?;
+                    capture_first_vardct_quantizer(&mut self.first_vardct_quantizer, frame);
+                    self.section_state.lf_global_done = true;
+                    processed_section = true;
+                }
+
+                if !self.section_state.lf_global_done {
+                    break 'process;
+                }
+
+                let lf_global_dur = t0.elapsed();
+
+                #[cfg(feature = "threads")]
+                let use_parallel_lf = frame.decoder_state.parallel && self.lf_sections.len() > 1;
+                #[cfg(not(feature = "threads"))]
+                let use_parallel_lf = false;
+
+                // When VarDCT parallel and HF global section is ready, overlap LF group
+                // decode with HF global parsing. decode_hf_global only depends on lf_global
+                // (the LF Global section), not on LF group data — so both can run concurrently.
+                #[cfg(feature = "threads")]
+                let use_overlap = use_parallel_lf
+                    && frame.header().encoding != crate::headers::frame_header::Encoding::Modular
+                    && self.hf_global_section.is_some();
+
+                #[cfg(not(feature = "threads"))]
+                let use_overlap = false;
+
+                if use_overlap {
+                    #[cfg(feature = "threads")]
+                    {
+                        let lf_sections: Vec<_> = self.lf_sections.drain(..).collect();
+                        let count = lf_sections.len();
+                        let sections: Vec<(usize, Vec<u8>, usize)> = lf_sections
+                            .into_iter()
+                            .map(|s| {
+                                let Section::Lf { group } = s.section else {
+                                    unreachable!()
+                                };
+                                (group, s.data, s.len)
+                            })
+                            .collect();
+                        let hf_sec = self.hf_global_section.take().unwrap();
+                        frame.decode_lf_and_hf_global_parallel(
+                            sections,
+                            hf_sec.data,
+                            hf_sec.len,
+                        )?;
+                        self.section_state.remaining_lf -= count;
+                        self.section_state.hf_global_done = true;
+                        processed_section = true;
+                    }
+                } else if use_parallel_lf {
+                    #[cfg(feature = "threads")]
+                    {
+                        let lf_sections: Vec<_> = self.lf_sections.drain(..).collect();
+                        let count = lf_sections.len();
+                        let sections: Vec<(usize, Vec<u8>, usize)> = lf_sections
+                            .into_iter()
+                            .map(|s| {
+                                let Section::Lf { group } = s.section else {
+                                    unreachable!()
+                                };
+                                (group, s.data, s.len)
+                            })
+                            .collect();
+                        if frame.header().encoding
+                            == crate::headers::frame_header::Encoding::Modular
+                        {
+                            frame.decode_lf_groups_modular_parallel(sections)?;
+                        } else {
+                            frame.decode_lf_groups_vardct_parallel(sections)?;
+                        }
+                        self.section_state.remaining_lf -= count;
+                        processed_section = true;
+                    }
+                } else {
+                    for lf_section in self.lf_sections.drain(..) {
+                        let Section::Lf { group } = lf_section.section else {
+                            unreachable!()
+                        };
+                        frame.decode_lf_group(
+                            group,
+                            &mut BitReader::new_padded(&lf_section.data, lf_section.len)?,
+                        )?;
+                        processed_section = true;
+                        self.section_state.remaining_lf -= 1;
+                    }
+                }
+
+                if self.section_state.remaining_lf != 0 {
+                    break 'process;
+                }
+
+                let lf_groups_dur = t0.elapsed().saturating_sub(lf_global_dur);
+
+                let mut decode_hf_dur = std::time::Duration::ZERO;
+                let mut pipeline_dur = std::time::Duration::ZERO;
+                let mut finalize_lf_dur = std::time::Duration::ZERO;
+                // If HF global was already decoded in the overlap path, skip decoding.
+                // Otherwise decode it now (sequential path or no overlap).
+                let hf_newly_done = if self.section_state.hf_global_done {
+                    // Already decoded via overlap path
+                    true
+                } else if let Some(hf_global) = self.hf_global_section.take() {
+                    let t = crate::util::Instant::now();
+                    frame.decode_hf_global(&mut BitReader::new_padded(
+                        &hf_global.data,
+                        hf_global.len,
+                    )?)?;
+                    decode_hf_dur = t.elapsed();
+                    self.section_state.hf_global_done = true;
+                    processed_section = true;
+                    true
+                } else {
+                    false
+                };
+                if hf_newly_done && frame.render_pipeline_not_ready() {
+                    let t = crate::util::Instant::now();
+
+                    #[cfg(feature = "threads")]
+                    {
+                        frame.prepare_render_pipeline(
+                            self.pixel_format.as_ref().unwrap(),
+                            decode_options.cms.as_deref(),
+                            self.embedded_color_profile.as_ref().expect(
+                                "embedded_color_profile should be set before pipeline preparation",
+                            ),
+                            self.output_color_profile.as_ref().expect(
+                                "output_color_profile should be set before pipeline preparation",
+                            ),
+                        )?;
+                        pipeline_dur = t.elapsed();
+
+                        let t = crate::util::Instant::now();
+                        frame.finalize_lf()?;
+                        finalize_lf_dur = t.elapsed();
+                    }
+
+                    #[cfg(not(feature = "threads"))]
+                    {
+                        frame.prepare_render_pipeline(
+                            self.pixel_format.as_ref().unwrap(),
+                            decode_options.cms.as_deref(),
+                            self.embedded_color_profile.as_ref().expect(
+                                "embedded_color_profile should be set before pipeline preparation",
+                            ),
+                            self.output_color_profile.as_ref().expect(
+                                "output_color_profile should be set before pipeline preparation",
+                            ),
+                        )?;
+                        pipeline_dur = t.elapsed();
+
+                        let t = crate::util::Instant::now();
+                        frame.finalize_lf()?;
+                        finalize_lf_dur = t.elapsed();
+                    }
+                }
+                if !self.section_state.hf_global_done {
+                    break 'process;
+                }
+
+                let prep_start = crate::util::Instant::now();
+                let mut group_readers = vec![];
+                let mut processed_groups = vec![];
+
+                let mut check_group = |g: usize| -> Result<()> {
+                    let mut sections = vec![];
+                    for (pass, grp) in self.hf_sections[g]
+                        .iter()
+                        .enumerate()
+                        .skip(self.section_state.completed_passes[g] as usize)
+                    {
+                        let Some(s) = &grp else {
+                            break;
+                        };
+                        self.section_state.completed_passes[g] += 1;
+                        sections.push((pass, BitReader::new_padded(&s.data, s.len)?));
+                    }
+                    if !sections.is_empty() {
+                        group_readers.push((g, sections));
+                        processed_groups.push(g);
+                    }
+                    Ok(())
+                };
+
+                if self.candidate_hf_sections.len() * 4 < self.hf_sections.len() {
+                    for g in self.candidate_hf_sections.drain() {
+                        check_group(g)?;
+                    }
+                    // Processing sections in order is more efficient because it lets us flush
+                    // the pipeline faster.
+                    group_readers.sort_by_key(|x| x.0);
+                } else {
+                    for g in 0..self.hf_sections.len() {
+                        if self.candidate_hf_sections.contains(&g) {
+                            check_group(g)?;
+                        }
+                    }
+                    self.candidate_hf_sections.clear();
+                }
+                let prep_dur = prep_start.elapsed();
+
+                if section_timing {
+                    eprintln!(
+                        "[JXL_SECTION_TIMING] lf_global: {:.2}ms | lf_groups: {:.2}ms | \
+                         decode_hf: {:.2}ms | pipeline: {:.2}ms | finalize_lf: {:.2}ms | \
+                         hf_prep: {:.2}ms | total: {:.2}ms",
+                        lf_global_dur.as_secs_f64() * 1000.0,
+                        lf_groups_dur.as_secs_f64() * 1000.0,
+                        decode_hf_dur.as_secs_f64() * 1000.0,
+                        pipeline_dur.as_secs_f64() * 1000.0,
+                        finalize_lf_dur.as_secs_f64() * 1000.0,
+                        prep_dur.as_secs_f64() * 1000.0,
+                        t0.elapsed().as_secs_f64() * 1000.0,
+                    );
+                }
+
+                frame.decode_and_render_hf_groups(
+                    output_buffers,
+                    pixel_format,
+                    group_readers,
+                    do_flush,
+                    output_profile,
+                )?;
+
+                for g in processed_groups.into_iter() {
+                    for i in 0..self.section_state.completed_passes[g] {
+                        self.hf_sections[g][i as usize] = None;
+                    }
+                    processed_section = true;
+                }
+            }
+        }
+
+        if !processed_section {
+            let data_for_next_section =
+                self.sections.front().unwrap().len - self.ready_section_data;
+            return Ok(Some(data_for_next_section));
+        }
+
+        // Frame is not yet complete.
+        if !self.sections.is_empty() {
+            return Ok(None);
+        }
+
+        #[cfg(test)]
+        {
+            self.frame_callback.as_mut().map_or(Ok(()), |cb| {
+                cb(self.frame.as_ref().unwrap(), self.decoded_frames)
+            })?;
+            self.decoded_frames += 1;
+        }
+
+        // Check if this might be a preview frame (skipped frame with preview enabled)
+        let has_preview = self
+            .basic_info
+            .as_ref()
+            .is_some_and(|info| info.preview_size.is_some());
+        let might_be_preview = self.process_without_output && has_preview;
+
+        // Build JPEG reconstruction data if we have JBRD (while the frame's
+        // coefficients are still alive — finalize() consumes them next). The
+        // EXIF/XMP APPn payloads and the final bytes are produced lazily in
+        // take_jpeg_reconstruction, once the trailing container boxes have
+        // parsed. Reconstruction failure is non-fatal; normal decode continues.
+        #[cfg(feature = "jpeg")]
+        if let Some(jbrd_data) = &self.jbrd_data
+            && let Some(frame) = &self.frame
+            && let Ok(jpeg_data) = frame.jpeg_reconstruct(jbrd_data)
+        {
+            self.jpeg_recon = Some(jpeg_data);
+        }
+
+        let decoder_state = self.frame.take().unwrap().finalize()?;
+        if let Some(state) = decoder_state {
+            self.decoder_state = Some(state);
+        } else if might_be_preview {
+            // Preview frame has is_last=true but the main frame follows.
+            // Recreate decoder state from saved file header for the main frame.
+            //
+            // Ported from libjxl/jxl-rs #743 (f1514f1): route every
+            // option-propagation step through `apply_decoder_options` so the
+            // recreated state carries the same high_precision, premultiply,
+            // parallel, memory_tracker, and embedded_color_profile fields as
+            // the primary decoder_state creation. Before this, those fields
+            // silently reverted to defaults on the main frame whenever the
+            // file had a preview — dropping security limits, disabling
+            // parallel rendering, and breaking CMYK ICC handling.
+            if let Some(fh) = self.saved_file_header.take() {
+                let mut new_state = crate::frame::DecoderState::new(fh);
+                super::non_section::apply_decoder_options(
+                    &mut new_state,
+                    decode_options,
+                    &self.embedded_color_profile,
+                );
+                self.decoder_state = Some(new_state);
+            }
+        } else {
+            self.has_more_frames = false;
+        }
+        Ok(None)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/mod.rs
new file mode 100644
index 00000000..f6e78a66
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/mod.rs
@@ -0,0 +1,253 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#[cfg(test)]
+use crate::api::FrameCallback;
+use crate::{
+    api::JxlFrameHeader,
+    error::{Error, Result},
+};
+
+use super::{JxlBasicInfo, JxlColorProfile, JxlDecoderOptions, JxlPixelFormat, VardctQuantizer};
+use crate::container::frame_index::FrameIndexBox;
+use crate::container::gain_map::GainMapBundle;
+use box_parser::BoxParser;
+use codestream_parser::CodestreamParser;
+
+mod box_parser;
+mod codestream_parser;
+mod process;
+
+/// Low-level, less-type-safe API.
+pub struct JxlDecoderInner {
+    options: JxlDecoderOptions,
+    box_parser: BoxParser,
+    codestream_parser: CodestreamParser,
+}
+
+impl JxlDecoderInner {
+    /// Creates a new decoder with the given options and, optionally, CMS.
+    pub fn new(options: JxlDecoderOptions) -> Self {
+        JxlDecoderInner {
+            options,
+            box_parser: BoxParser::new(),
+            codestream_parser: CodestreamParser::new(),
+        }
+    }
+
+    #[cfg(test)]
+    pub fn set_frame_callback(&mut self, callback: Box<FrameCallback>) {
+        self.codestream_parser.frame_callback = Some(callback);
+    }
+
+    #[cfg(test)]
+    pub fn decoded_frames(&self) -> usize {
+        self.codestream_parser.decoded_frames
+    }
+
+    /// Test-only accessor for the active [`crate::frame::DecoderState`].
+    ///
+    /// Used by regression tests that need to verify that per-run options
+    /// (limits, memory_tracker, parallel, high_precision, premultiply_output,
+    /// embedded_color_profile) survive the preview-frame recovery path in
+    /// `codestream_parser::sections::handle_frame_finalized`.
+    ///
+    /// Returns the parser-owned decoder state if it has not yet been moved
+    /// into a Frame, otherwise the in-progress frame's decoder state.
+    #[cfg(test)]
+    pub(crate) fn decoder_state_for_test(&self) -> Option<&crate::frame::DecoderState> {
+        if let Some(state) = self.codestream_parser.decoder_state.as_ref() {
+            Some(state)
+        } else {
+            self.codestream_parser
+                .frame
+                .as_ref()
+                .map(|f| &f.decoder_state)
+        }
+    }
+
+    /// Obtains the image's basic information, if available.
+    ///
+    /// Keep this aligned with typed `WithImageInfo` transitions: image info is
+    /// not observable until the embedded color profile has been parsed. This
+    /// mirrors the fix from upstream jxl-rs 28ddaeb (PR #745) so that callers
+    /// driving `set_pixel_format` off the partial info cannot race the profile
+    /// parse and observe an early-format-selection state that differs from
+    /// what the typed `WithImageInfo` transition would produce.
+    pub fn basic_info(&self) -> Option<&JxlBasicInfo> {
+        self.codestream_parser.embedded_color_profile.as_ref()?;
+        self.codestream_parser.basic_info.as_ref()
+    }
+
+    /// Retrieves the file's color profile, if available.
+    pub fn embedded_color_profile(&self) -> Option<&JxlColorProfile> {
+        self.codestream_parser.embedded_color_profile.as_ref()
+    }
+
+    /// Returns the first regular VarDCT frame's quantizer, if this is a lossy
+    /// VarDCT image whose first frame's `LfGlobal` section has been decoded.
+    ///
+    /// `None` for Modular (lossless) images, or before the first regular frame
+    /// has been parsed (e.g. right after image-info, which `read_header` stops
+    /// at). Advance one frame (e.g. `skip_frame`) to populate it from a probe.
+    pub fn vardct_quantizer(&self) -> Option<VardctQuantizer> {
+        let (global_scale, quant_lf) = self.codestream_parser.first_vardct_quantizer?;
+        Some(VardctQuantizer {
+            global_scale,
+            quant_lf,
+        })
+    }
+
+    /// Retrieves the current output color profile, if available.
+    pub fn output_color_profile(&self) -> Option<&JxlColorProfile> {
+        self.codestream_parser.output_color_profile.as_ref()
+    }
+
+    /// Specifies the preferred color profile to be used for outputting data.
+    /// Same semantics as JxlDecoderSetOutputColorProfile.
+    pub fn set_output_color_profile(&mut self, profile: JxlColorProfile) -> Result<()> {
+        if let (JxlColorProfile::Icc(_), None) = (&profile, &self.options.cms) {
+            return Err(Error::ICCOutputNoCMS);
+        }
+        self.codestream_parser.output_color_profile = Some(profile);
+        self.codestream_parser.output_color_profile_set_by_user = true;
+        Ok(())
+    }
+
+    pub fn current_pixel_format(&self) -> Option<&JxlPixelFormat> {
+        self.codestream_parser.pixel_format.as_ref()
+    }
+
+    pub fn set_pixel_format(&mut self, pixel_format: JxlPixelFormat) {
+        // TODO(veluca): return an error if we are asking for both planar and
+        // interleaved-in-color alpha.
+        self.codestream_parser.pixel_format = Some(pixel_format);
+        self.codestream_parser.update_default_output_color_profile();
+    }
+
+    pub fn frame_header(&self) -> Option<JxlFrameHeader> {
+        let frame_header = self.codestream_parser.frame.as_ref()?.header();
+        // The render pipeline always adds ExtendToImageDimensionsStage which extends
+        // frames to the full image size. So the output size is always the image size,
+        // not the frame's upsampled size.
+        let size = self.codestream_parser.basic_info.as_ref()?.size;
+        Some(JxlFrameHeader {
+            name: frame_header.name.clone(),
+            duration: self
+                .codestream_parser
+                .animation
+                .as_ref()
+                .map(|anim| frame_header.duration(anim)),
+            size,
+        })
+    }
+
+    /// Number of passes we have full data for.
+    /// Returns the minimum number of passes completed across all groups.
+    pub fn num_completed_passes(&self) -> Option<usize> {
+        Some(self.codestream_parser.num_completed_passes())
+    }
+
+    /// Fully resets the decoder to its initial state.
+    ///
+    /// This clears all state including pixel_format. For animation loop playback,
+    /// consider using [`rewind`](Self::rewind) instead which preserves pixel_format.
+    ///
+    /// After calling this, the caller should provide input from the beginning of the file.
+    pub fn reset(&mut self) {
+        // TODO(veluca): keep track of frame offsets for skipping.
+        self.box_parser = BoxParser::new();
+        self.codestream_parser = CodestreamParser::new();
+    }
+
+    /// Rewinds for animation loop replay, keeping pixel_format setting.
+    ///
+    /// This resets the decoder but preserves the pixel_format configuration,
+    /// so the caller doesn't need to re-set it after rewinding.
+    ///
+    /// After calling this, the caller should provide input from the beginning of the file.
+    /// Headers will be re-parsed, then frames can be decoded again.
+    ///
+    /// Returns `true` if pixel_format was preserved, `false` if none was set.
+    pub fn rewind(&mut self) -> bool {
+        self.box_parser = BoxParser::new();
+        self.codestream_parser.rewind().is_some()
+    }
+
+    pub fn has_more_frames(&self) -> bool {
+        self.codestream_parser.has_more_frames
+    }
+
+    /// Returns the reconstructed JPEG bytes if the file contained a JBRD box.
+    ///
+    /// The reconstruction `JpegData` is built when the frame decodes, but the
+    /// EXIF/XMP APPn payloads (lifted into container boxes that follow the
+    /// codestream) and the final byte serialization are produced here, once the
+    /// whole container has been parsed.
+    #[cfg(feature = "jpeg")]
+    pub fn take_jpeg_reconstruction(&mut self) -> Option<Vec<u8>> {
+        let mut jpeg = self.codestream_parser.jpeg_recon.take()?;
+        // The original ICC profile (if any) was lifted into the codestream color
+        // encoding; recover it to re-chunk the ICC_PROFILE APP2 markers.
+        let icc = match self.codestream_parser.embedded_color_profile.as_ref() {
+            Some(JxlColorProfile::Icc(bytes)) => Some(bytes.clone()),
+            _ => None,
+        };
+        crate::jpeg::fill_metadata(
+            &mut jpeg,
+            self.box_parser.exif.clone(),
+            self.box_parser.xmp.clone(),
+            icc.as_deref(),
+        );
+        crate::jpeg::write_jpeg(&jpeg).ok()
+    }
+
+    /// Returns the parsed frame index box, if the file contained one.
+    pub fn frame_index(&self) -> Option<&FrameIndexBox> {
+        self.box_parser.frame_index.as_ref()
+    }
+
+    /// Returns a reference to the parsed gain map bundle, if the file contained one.
+    pub fn gain_map(&self) -> Option<&GainMapBundle> {
+        self.box_parser.gain_map.as_ref()
+    }
+
+    /// Takes the parsed gain map bundle, if the file contained one.
+    /// After calling this, `gain_map()` will return `None`.
+    pub fn take_gain_map(&mut self) -> Option<GainMapBundle> {
+        self.box_parser.gain_map.take()
+    }
+
+    /// Returns the raw EXIF data from the `Exif` container box, if present.
+    ///
+    /// The 4-byte TIFF header offset prefix has been stripped; this returns
+    /// the raw EXIF/TIFF bytes starting with the byte-order marker (`II` or `MM`).
+    /// Returns `None` for bare codestreams or files without an `Exif` box.
+    pub fn exif(&self) -> Option<&[u8]> {
+        self.box_parser.exif.as_deref()
+    }
+
+    /// Takes the EXIF data, leaving `None` in its place.
+    pub fn take_exif(&mut self) -> Option<Vec<u8>> {
+        self.box_parser.exif.take()
+    }
+
+    /// Returns the raw XMP data from the `xml ` container box, if present.
+    ///
+    /// Returns `None` for bare codestreams or files without an `xml ` box.
+    pub fn xmp(&self) -> Option<&[u8]> {
+        self.box_parser.xmp.as_deref()
+    }
+
+    /// Takes the XMP data, leaving `None` in its place.
+    pub fn take_xmp(&mut self) -> Option<Vec<u8>> {
+        self.box_parser.xmp.take()
+    }
+
+    #[cfg(test)]
+    pub(crate) fn set_use_simple_pipeline(&mut self, u: bool) {
+        self.codestream_parser.set_use_simple_pipeline(u);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/process.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/process.rs
new file mode 100644
index 00000000..ecdb966d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/inner/process.rs
@@ -0,0 +1,149 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{
+    io::IoSliceMut,
+    ops::{Deref, Range},
+};
+
+use crate::error::Result;
+
+use crate::api::{JxlBitstreamInput, JxlDecoderInner, JxlOutputBuffer, ProcessingResult};
+
+// General implementation strategy:
+// - Anything that is not a section is read into a small buffer.
+// - As soon as we know section sizes, data is read directly into sections.
+// When the start of the populated range in `buf` goes past half of its length,
+// the data in the buffer is moved back to the beginning.
+
+pub(super) struct SmallBuffer {
+    buf: Vec<u8>,
+    range: Range<usize>,
+}
+
+impl SmallBuffer {
+    pub(super) fn refill(
+        &mut self,
+        mut get_input: impl FnMut(&mut [IoSliceMut]) -> Result<usize, std::io::Error>,
+        max: Option<usize>,
+    ) -> Result<usize> {
+        let mut total = 0;
+        loop {
+            if self.range.start >= self.buf.len() / 2 {
+                let start = self.range.start;
+                let len = self.range.len();
+                let (pre, post) = self.buf.split_at_mut(start);
+                pre[0..len].copy_from_slice(&post[0..len]);
+                self.range.start -= start;
+                self.range.end -= start;
+            }
+            if self.range.len() >= self.buf.len() / 2 {
+                break;
+            }
+            let stop = if let Some(max) = max {
+                self.range
+                    .end
+                    .saturating_add(max.saturating_sub(total))
+                    .min(self.buf.len())
+            } else {
+                self.buf.len()
+            };
+            let num = get_input(&mut [IoSliceMut::new(&mut self.buf[self.range.end..stop])])?;
+            total += num;
+            self.range.end += num;
+            if num == 0 {
+                break;
+            }
+        }
+        Ok(total)
+    }
+
+    pub(super) fn take(&mut self, mut buffers: &mut [IoSliceMut]) -> usize {
+        let mut num = 0;
+        while !self.range.is_empty() {
+            let Some((buf, rest)) = buffers.split_first_mut() else {
+                break;
+            };
+            buffers = rest;
+            let len = self.range.len().min(buf.len());
+            // Only copy 'len' bytes, not the entire range, to avoid panic when buf is smaller than range
+            buf[..len].copy_from_slice(&self.buf[self.range.start..self.range.start + len]);
+            self.range.start += len;
+            num += len;
+        }
+        num
+    }
+
+    pub(super) fn consume(&mut self, amount: usize) -> usize {
+        let amount = amount.min(self.range.len());
+        self.range.start += amount;
+        amount
+    }
+
+    pub(super) fn new(initial_size: usize) -> Self {
+        Self {
+            buf: vec![0; initial_size],
+            range: 0..0,
+        }
+    }
+
+    pub(super) fn range(&self) -> Range<usize> {
+        self.range.clone()
+    }
+
+    pub(super) fn enlarge(&mut self) {
+        // Note: we need a *4 here because doubling the buffer size might still not allow refill() to make progress.
+        self.buf.resize(self.buf.len() * 4, 0);
+    }
+
+    pub(super) fn can_read_more(&self) -> bool {
+        self.buf.len() > self.len() * 2 && self.range.end < self.buf.len()
+    }
+}
+
+impl Deref for SmallBuffer {
+    type Target = [u8];
+    fn deref(&self) -> &Self::Target {
+        &self.buf[self.range.clone()]
+    }
+}
+
+impl JxlDecoderInner {
+    /// Process more of the input file.
+    /// This function will return when reaching the next decoding stage (i.e. finished decoding
+    /// file/frame header, or finished decoding a frame).
+    /// If called when decoding a frame with `None` for buffers, the frame will still be read,
+    /// but pixel data will not be produced.
+    #[inline(never)]
+    pub fn process(
+        &mut self,
+        input: &mut dyn JxlBitstreamInput,
+        buffers: Option<&mut [JxlOutputBuffer]>,
+    ) -> Result<ProcessingResult<(), ()>> {
+        ProcessingResult::new(self.codestream_parser.process(
+            &mut self.box_parser,
+            input,
+            &self.options,
+            buffers,
+            false,
+        ))
+    }
+
+    /// Draws all the pixels we have data for.
+    pub fn flush_pixels(&mut self, buffers: &mut [JxlOutputBuffer]) -> Result<()> {
+        let mut input: &[u8] = &[];
+        match self.codestream_parser.process(
+            &mut self.box_parser,
+            &mut input,
+            &self.options,
+            Some(buffers),
+            true,
+        ) {
+            Ok(()) => Ok(()),
+            Err(crate::error::Error::OutOfBounds(_)) => Ok(()),
+            Err(e) => Err(e),
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/input.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/input.rs
new file mode 100644
index 00000000..5e87925e
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/input.rs
@@ -0,0 +1,82 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::io::{BufRead, BufReader, Error, IoSliceMut, Read, Seek, SeekFrom};
+
+pub trait JxlBitstreamInput {
+    /// Returns an estimate bound of the total number of bytes that can be read via `read`.
+    /// Returning a too-low estimate here can impede parallelism. Returning a too-high
+    /// estimate can increase memory usage.
+    fn available_bytes(&mut self) -> Result<usize, Error>;
+
+    /// Fills in `bufs` with more bytes, returning the number of bytes written.
+    /// Buffers are filled in order and to completion.
+    fn read(&mut self, bufs: &mut [IoSliceMut]) -> Result<usize, Error>;
+
+    /// Skips up to `bytes` bytes of input. The provided implementation just uses `read`, but in
+    /// some cases this can be implemented faster.
+    /// Returns the number of bytes that were skipped. If this returns 0, it is assumed that no
+    /// more input is available.
+    fn skip(&mut self, bytes: usize) -> Result<usize, Error> {
+        let mut bytes = bytes;
+        const BUF_SIZE: usize = 1024;
+        let mut skip_buf = [0; BUF_SIZE];
+        let mut skipped = 0;
+        while bytes > 0 {
+            let num = bytes.min(BUF_SIZE);
+            self.read(&mut [IoSliceMut::new(&mut skip_buf[..num])])?;
+            bytes -= num;
+            skipped += num;
+        }
+        Ok(skipped)
+    }
+
+    /// Un-consumes read bytes. This will only be called at the end of a file stream,
+    /// to un-read potentially over-read bytes. If ensuring that data is not read past
+    /// the file end is not required, this method can safely be implemented as a no-op.
+    /// The provided implementation does nothing.
+    fn unconsume(&mut self, _count: usize) -> Result<(), Error> {
+        Ok(())
+    }
+}
+
+impl JxlBitstreamInput for &[u8] {
+    fn available_bytes(&mut self) -> Result<usize, Error> {
+        Ok(self.len())
+    }
+
+    fn read(&mut self, bufs: &mut [IoSliceMut]) -> Result<usize, Error> {
+        self.read_vectored(bufs)
+    }
+
+    fn skip(&mut self, bytes: usize) -> Result<usize, Error> {
+        let num = bytes.min(self.len());
+        self.consume(num);
+        Ok(num)
+    }
+}
+
+impl<R: Read + Seek> JxlBitstreamInput for BufReader<R> {
+    fn available_bytes(&mut self) -> Result<usize, Error> {
+        let pos = self.stream_position()?;
+        let end = self.seek(SeekFrom::End(0))?;
+        self.seek(SeekFrom::Start(pos))?;
+        Ok(end.saturating_sub(pos) as usize)
+    }
+
+    fn read(&mut self, bufs: &mut [IoSliceMut]) -> Result<usize, Error> {
+        self.read_vectored(bufs)
+    }
+
+    fn skip(&mut self, bytes: usize) -> Result<usize, Error> {
+        let cur = self.stream_position()?;
+        self.seek(SeekFrom::Current(bytes as i64))
+            .map(|x| x.saturating_sub(cur) as usize)
+    }
+
+    fn unconsume(&mut self, count: usize) -> Result<(), Error> {
+        self.seek_relative(-(count as i64))
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/mod.rs
new file mode 100644
index 00000000..de3fbc3d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/mod.rs
@@ -0,0 +1,150 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// #![warn(missing_docs)]
+
+mod color;
+mod convenience;
+mod data_types;
+mod decoder;
+mod inner;
+mod input;
+#[cfg(feature = "cms")]
+mod moxcms_wrapper;
+mod options;
+mod signature;
+mod xyb_constants;
+
+pub use crate::image::JxlOutputBuffer;
+pub use color::*;
+pub use convenience::{JxlImage, JxlImageInfo, decode, decode_with, read_header, read_header_with};
+#[cfg(feature = "jpeg")]
+pub use convenience::{reconstruct_jpeg, reconstruct_jpeg_with};
+pub use data_types::*;
+pub use decoder::*;
+pub use enough::{Stop, Unstoppable};
+pub use inner::*;
+pub use input::*;
+#[cfg(feature = "cms")]
+pub use moxcms_wrapper::*;
+pub use options::*;
+pub use signature::*;
+
+// Error types
+pub use crate::error::{Error, Result};
+
+// Image types used by CLI/fuzz for output buffer construction
+pub use crate::image::{
+    DataTypeTag, Image, ImageDataType, ImageRect, ImageRectMut, OwnedRawImage, RawImageRect,
+    RawImageRectMut, Rect,
+};
+
+// Header types that appear in public API structs
+pub use crate::headers::color_encoding::RenderingIntent;
+pub use crate::headers::extra_channels::ExtraChannel;
+pub use crate::headers::image_metadata::Orientation;
+
+// Container box types
+pub use crate::container::gain_map::GainMapBundle;
+
+// Point type used in Error variants
+pub use crate::features::spline::Point;
+
+// Profiling (feature-gated, used by CLI)
+#[cfg(feature = "profiling")]
+pub use crate::util::profiling::print_profile_report;
+
+/// This type represents the return value of a function that reads input from a bitstream. The
+/// variant `Complete` indicates that the operation was completed successfully, and its return
+/// value is available. The variant `NeedsMoreInput` indicates that more input is needed, and the
+/// function should be called again. This variant comes with a `size_hint`, representing an
+/// estimate of the number of additional bytes needed, and a `fallback`, representing additional
+/// information that might be needed to call the function again (i.e. because it takes a decoder
+/// object by value).
+#[derive(Debug, PartialEq)]
+pub enum ProcessingResult<T, U> {
+    Complete { result: T },
+    NeedsMoreInput { size_hint: usize, fallback: U },
+}
+
+impl<T> ProcessingResult<T, ()> {
+    fn new(
+        result: Result<T, crate::error::Error>,
+    ) -> Result<ProcessingResult<T, ()>, crate::error::Error> {
+        match result {
+            Ok(v) => Ok(ProcessingResult::Complete { result: v }),
+            Err(crate::error::Error::OutOfBounds(v)) => Ok(ProcessingResult::NeedsMoreInput {
+                size_hint: v,
+                fallback: (),
+            }),
+            Err(e) => Err(e),
+        }
+    }
+}
+
+#[derive(Clone)]
+#[non_exhaustive]
+pub struct ToneMapping {
+    pub intensity_target: f32,
+    pub min_nits: f32,
+    pub relative_to_max_display: bool,
+    pub linear_below: f32,
+}
+
+#[derive(Clone)]
+#[non_exhaustive]
+pub struct JxlBasicInfo {
+    /// Dimensions of the pixel data the decoder will emit, in the order the
+    /// output buffer must be laid out (`(width, height)`).
+    ///
+    /// This depends on [`JxlDecoderOptions::adjust_orientation`]:
+    /// - When orientation is adjusted (the default, "Correct"), the stored
+    ///   orientation is baked into the output, so this is the *display* size
+    ///   (width/height are swapped relative to [`Self::coded_size`] for
+    ///   transposing orientations).
+    /// - When orientation adjustment is disabled ("Preserve"), pixels are
+    ///   emitted in their stored orientation, so this equals
+    ///   [`Self::coded_size`].
+    ///
+    /// Allocate output buffers against this size.
+    pub size: (usize, usize),
+    /// The stored (coded) dimensions of the image as written in the codestream,
+    /// `(width, height)`, *before* any orientation is applied. Unaffected by
+    /// [`JxlDecoderOptions::adjust_orientation`]. For transposing orientations
+    /// this differs from the display size; see [`Self::size`].
+    pub coded_size: (usize, usize),
+    pub bit_depth: JxlBitDepth,
+    /// Orientation of the pixels the decoder emits, i.e. the residual transform
+    /// a caller must still apply to obtain an upright image.
+    ///
+    /// This depends on [`JxlDecoderOptions::adjust_orientation`]:
+    /// - When orientation is adjusted (the default, "Correct"), the stored
+    ///   orientation has already been baked into the output pixels, so this is
+    ///   [`Orientation::Identity`].
+    /// - When orientation adjustment is disabled ("Preserve"), this is the
+    ///   image's stored orientation (equal to [`Self::intrinsic_orientation`]),
+    ///   which the caller should bake into the [`Self::coded_size`] pixels to
+    ///   display them upright.
+    pub orientation: Orientation,
+    /// The image's intrinsic (stored) EXIF/container orientation as written in
+    /// the codestream, regardless of [`JxlDecoderOptions::adjust_orientation`].
+    ///
+    /// Use this to re-tag re-encoded output or to decide how to bake the stored
+    /// orientation. In "Correct" mode the emitted pixels are already upright
+    /// even though this reports a non-Identity value; in "Preserve" mode this
+    /// equals [`Self::orientation`].
+    pub intrinsic_orientation: Orientation,
+    pub extra_channels: Vec<JxlExtraChannel>,
+    pub animation: Option<JxlAnimation>,
+    pub uses_original_profile: bool,
+    pub tone_mapping: ToneMapping,
+    pub preview_size: Option<(usize, usize)>,
+    /// Intrinsic display size, if different from coded size.
+    ///
+    /// When present, the image should be rendered at this `(width, height)`
+    /// rather than the coded `size`. Used for resolution-independence
+    /// (e.g. a 4000×3000 image meant to display at 2000×1500).
+    pub intrinsic_size: Option<(usize, usize)>,
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/moxcms_wrapper.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/moxcms_wrapper.rs
new file mode 100644
index 00000000..94a8a7c9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/moxcms_wrapper.rs
@@ -0,0 +1,281 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! moxcms-based CMS implementation for JPEG XL.
+//!
+//! This module provides a color management system implementation using the moxcms crate,
+//! enabling ICC profile-based color transforms.
+
+use std::sync::Arc;
+
+use crate::api::{JxlColorEncoding, JxlColorProfile, JxlPrimaries, JxlTransferFunction};
+use crate::error::{Error, Result};
+
+use super::color::{JxlCms, JxlCmsTransformer};
+
+/// A CMS implementation using moxcms.
+#[derive(Default, Clone)]
+pub struct MoxCms;
+
+impl MoxCms {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+/// Wrapper around moxcms TransformExecutor to implement JxlCmsTransformer.
+struct MoxCmsTransformer {
+    transform: Arc<dyn moxcms::TransformExecutor<f32> + Send + Sync>,
+    input_channels: usize,
+    output_channels: usize,
+}
+
+impl JxlCmsTransformer for MoxCmsTransformer {
+    fn do_transform(&mut self, input: &[f32], output: &mut [f32]) -> Result<()> {
+        self.transform
+            .transform(input, output)
+            .map_err(|e| Error::CmsError(format!("moxcms transform error: {:?}", e)))
+    }
+
+    fn do_transform_inplace(&mut self, inout: &mut [f32]) -> Result<()> {
+        if self.input_channels != self.output_channels {
+            return Err(Error::CmsError(
+                "in-place transform requires same input/output channel count".to_string(),
+            ));
+        }
+
+        // moxcms doesn't support in-place transforms, so we need a temporary buffer.
+        // For efficiency, we could pool these buffers, but for now just allocate.
+        let input_copy = inout.to_vec();
+        self.transform
+            .transform(&input_copy, inout)
+            .map_err(|e| Error::CmsError(format!("moxcms transform error: {:?}", e)))
+    }
+}
+
+/// Convert a JxlColorProfile to a moxcms ColorProfile.
+fn to_moxcms_profile(profile: &JxlColorProfile) -> Result<moxcms::ColorProfile> {
+    match profile {
+        JxlColorProfile::Icc(icc_data) => moxcms::ColorProfile::new_from_slice(icc_data)
+            .map_err(|e| Error::CmsError(format!("moxcms ICC parse error: {:?}", e))),
+        JxlColorProfile::Simple(encoding) => {
+            // For simple encodings, generate an ICC profile and parse it
+            if let Some(icc_data) = encoding.maybe_create_profile()? {
+                moxcms::ColorProfile::new_from_slice(&icc_data)
+                    .map_err(|e| Error::CmsError(format!("moxcms ICC parse error: {:?}", e)))
+            } else {
+                // Try to use built-in moxcms profiles for common color spaces
+                match encoding {
+                    JxlColorEncoding::RgbColorSpace {
+                        primaries: JxlPrimaries::SRGB,
+                        transfer_function: JxlTransferFunction::SRGB,
+                        ..
+                    } => Ok(moxcms::ColorProfile::new_srgb()),
+                    JxlColorEncoding::RgbColorSpace {
+                        primaries: JxlPrimaries::P3,
+                        transfer_function: JxlTransferFunction::SRGB,
+                        ..
+                    } => Ok(moxcms::ColorProfile::new_display_p3()),
+                    JxlColorEncoding::RgbColorSpace {
+                        primaries: JxlPrimaries::BT2100,
+                        transfer_function: JxlTransferFunction::PQ,
+                        ..
+                    } => Ok(moxcms::ColorProfile::new_bt2020_pq()),
+                    JxlColorEncoding::RgbColorSpace {
+                        primaries: JxlPrimaries::BT2100,
+                        transfer_function: JxlTransferFunction::HLG,
+                        ..
+                    } => Ok(moxcms::ColorProfile::new_bt2020_hlg()),
+                    JxlColorEncoding::GrayscaleColorSpace {
+                        transfer_function: JxlTransferFunction::Gamma(gamma),
+                        ..
+                    } => Ok(moxcms::ColorProfile::new_gray_with_gamma(*gamma)),
+                    _ => Err(Error::CmsError(
+                        "Cannot create ICC profile for this color encoding".to_string(),
+                    )),
+                }
+            }
+        }
+    }
+}
+
+/// ICC profile color space signatures (bytes 16-19 of ICC header)
+const ICC_CMYK_SIGNATURE: &[u8; 4] = b"CMYK";
+const ICC_GRAY_SIGNATURE: &[u8; 4] = b"GRAY";
+const ICC_RGB_SIGNATURE: &[u8; 4] = b"RGB ";
+
+/// Detect the color space from an ICC profile header.
+/// The color space signature is at bytes 16-19.
+fn detect_icc_color_space(icc_data: &[u8]) -> Option<&'static str> {
+    if icc_data.len() < 20 {
+        return None;
+    }
+    let sig = &icc_data[16..20];
+    if sig == ICC_CMYK_SIGNATURE {
+        Some("CMYK")
+    } else if sig == ICC_GRAY_SIGNATURE {
+        Some("GRAY")
+    } else if sig == ICC_RGB_SIGNATURE {
+        Some("RGB")
+    } else {
+        None
+    }
+}
+
+/// Determine the moxcms Layout for a given profile.
+fn get_layout(profile: &JxlColorProfile) -> moxcms::Layout {
+    match profile {
+        JxlColorProfile::Icc(icc_data) => {
+            // Parse ICC header to determine color space
+            match detect_icc_color_space(icc_data) {
+                Some("CMYK") => moxcms::Layout::Rgba, // CMYK uses Rgba layout (4 channels)
+                Some("GRAY") => moxcms::Layout::Gray,
+                _ => moxcms::Layout::Rgb, // Default to RGB
+            }
+        }
+        JxlColorProfile::Simple(encoding) => match encoding {
+            JxlColorEncoding::RgbColorSpace { .. } | JxlColorEncoding::XYB { .. } => {
+                moxcms::Layout::Rgb
+            }
+            JxlColorEncoding::GrayscaleColorSpace { .. } => moxcms::Layout::Gray,
+        },
+    }
+}
+
+/// Get number of channels for a layout.
+fn layout_channels(layout: moxcms::Layout) -> usize {
+    match layout {
+        moxcms::Layout::Rgb => 3,
+        moxcms::Layout::Rgba => 4,
+        moxcms::Layout::Gray => 1,
+        moxcms::Layout::GrayAlpha => 2,
+        // Multi-ink layouts (not used in JXL but must be handled for exhaustiveness)
+        _ => 4, // Default to 4 channels for unknown layouts
+    }
+}
+
+impl JxlCms for MoxCms {
+    fn initialize_transforms(
+        &self,
+        n: usize,
+        _max_pixels_per_transform: usize,
+        input: JxlColorProfile,
+        output: JxlColorProfile,
+        _intensity_target: f32,
+    ) -> Result<(usize, Vec<Box<dyn JxlCmsTransformer + Send + Sync>>)> {
+        let src_profile = to_moxcms_profile(&input)?;
+        let dst_profile = to_moxcms_profile(&output)?;
+
+        let src_layout = get_layout(&input);
+        let dst_layout = get_layout(&output);
+
+        let input_channels = layout_channels(src_layout);
+        let output_channels = layout_channels(dst_layout);
+
+        // Use Perceptual intent as default - this tends to work better for most images.
+        // Note: skcms may use profile's embedded intent, which we don't currently extract.
+        // JXL is CICP-native so allow_use_cicp_transfer stays true (default).
+        // BarycentricWeightScale::High cuts LUT interpolation error from max≤14 to max≤2
+        // vs lcms2 with no measurable perf cost.
+        let options = moxcms::TransformOptions {
+            allow_extended_range_rgb_xyz: true,
+            barycentric_weight_scale: moxcms::BarycentricWeightScale::High,
+            ..moxcms::TransformOptions::default()
+        };
+
+        let mut transforms: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> = Vec::with_capacity(n);
+
+        for _ in 0..n {
+            let transform = src_profile
+                .create_transform_f32(src_layout, &dst_profile, dst_layout, options)
+                .map_err(|e| Error::CmsError(format!("moxcms create_transform error: {:?}", e)))?;
+
+            transforms.push(Box::new(MoxCmsTransformer {
+                transform,
+                input_channels,
+                output_channels,
+            }));
+        }
+
+        Ok((output_channels, transforms))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::api::{JxlPrimaries, JxlTransferFunction, JxlWhitePoint};
+    use crate::headers::color_encoding::RenderingIntent;
+
+    #[test]
+    fn test_srgb_identity_transform() -> Result<()> {
+        let cms = MoxCms::new();
+
+        let srgb = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+
+        let (output_channels, mut transforms) =
+            cms.initialize_transforms(1, 1024, srgb.clone(), srgb, 255.0)?;
+
+        assert_eq!(output_channels, 3);
+        assert_eq!(transforms.len(), 1);
+
+        // Test a simple RGB value
+        let input = [0.5f32, 0.3, 0.8];
+        let mut output = [0.0f32; 3];
+
+        transforms[0].do_transform(&input, &mut output)?;
+
+        // sRGB to sRGB should be approximately identity
+        assert!((output[0] - 0.5).abs() < 0.01);
+        assert!((output[1] - 0.3).abs() < 0.01);
+        assert!((output[2] - 0.8).abs() < 0.01);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_srgb_to_display_p3() -> Result<()> {
+        let cms = MoxCms::new();
+
+        let srgb = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::SRGB,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+
+        let p3 = JxlColorProfile::Simple(JxlColorEncoding::RgbColorSpace {
+            white_point: JxlWhitePoint::D65,
+            primaries: JxlPrimaries::P3,
+            transfer_function: JxlTransferFunction::SRGB,
+            rendering_intent: RenderingIntent::Relative,
+        });
+
+        let (output_channels, mut transforms) =
+            cms.initialize_transforms(1, 1024, srgb, p3, 255.0)?;
+
+        assert_eq!(output_channels, 3);
+        assert_eq!(transforms.len(), 1);
+
+        // Test sRGB red in Display P3: should be less saturated
+        let srgb_red = [1.0f32, 0.0, 0.0];
+        let mut p3_output = [0.0f32; 3];
+
+        transforms[0].do_transform(&srgb_red, &mut p3_output)?;
+
+        // sRGB red when expressed in P3 should have positive G and B
+        // (because sRGB primaries fit inside P3 gamut)
+        assert!(p3_output[0] > 0.8 && p3_output[0] < 1.0);
+        assert!(p3_output[1] > 0.0); // Some green
+        assert!(p3_output[2] > 0.0); // Some blue
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/options.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/options.rs
new file mode 100644
index 00000000..74fe302f
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/options.rs
@@ -0,0 +1,180 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::api::JxlCms;
+
+use std::sync::Arc;
+
+/// Security limits for the JXL decoder to prevent resource exhaustion attacks.
+///
+/// These limits protect against "JXL bombs" - maliciously crafted files designed
+/// to exhaust memory or CPU. All limits are optional; `None` means use the default.
+///
+/// # Example
+/// ```
+/// use zenjxl_decoder::api::JxlDecoderLimits;
+///
+/// // Use restrictive preset for untrusted input
+/// let limits = JxlDecoderLimits::restrictive();
+///
+/// // Or use defaults for normal operation
+/// let defaults = JxlDecoderLimits::default();
+///
+/// // Or unlimited for trusted input (use with caution)
+/// let unlimited = JxlDecoderLimits::unlimited();
+/// ```
+#[derive(Debug, Clone)]
+#[non_exhaustive]
+pub struct JxlDecoderLimits {
+    /// Maximum total pixels (width × height). Default: 2^30 (~1 billion).
+    /// This is checked early during header parsing.
+    pub max_pixels: Option<usize>,
+
+    /// Maximum number of extra channels (alpha, depth, etc.). Default: 256.
+    /// Each extra channel requires memory proportional to image size.
+    pub max_extra_channels: Option<usize>,
+
+    /// Maximum ICC profile size in bytes. Default: 2^28 (256 MB).
+    pub max_icc_size: Option<usize>,
+
+    /// Maximum modular tree size (number of nodes). Default: 2^22.
+    /// Limits memory and CPU for tree-based entropy coding.
+    pub max_tree_size: Option<usize>,
+
+    /// Maximum number of patches. Default: derived from image size.
+    /// Set to limit patch-based attacks.
+    pub max_patches: Option<usize>,
+
+    /// Maximum number of spline control points. Default: 2^20.
+    pub max_spline_points: Option<u32>,
+
+    /// Maximum number of reference frames stored. Default: 4.
+    /// Each reference frame consumes memory equal to the image size.
+    pub max_reference_frames: Option<usize>,
+
+    /// Maximum total memory budget in bytes. Default: None (unlimited).
+    /// When set, the decoder tracks allocations and fails if budget exceeded.
+    /// This provides defense-in-depth against memory exhaustion attacks.
+    pub max_memory_bytes: Option<u64>,
+}
+
+impl Default for JxlDecoderLimits {
+    fn default() -> Self {
+        // On 32-bit targets, a 4 GB memory budget exceeds the usable address
+        // space (~3 GB). Cap at 2 GB so the guard triggers before the global
+        // allocator aborts on OOM.
+        let max_memory = if cfg!(target_pointer_width = "32") {
+            2u64 << 30 // 2 GB
+        } else {
+            4u64 << 30 // 4 GB
+        };
+        Self {
+            max_pixels: Some(1 << 28),        // ~256 megapixels
+            max_extra_channels: Some(256),    // 256 extra channels
+            max_icc_size: Some(1 << 28),      // 256 MB
+            max_tree_size: Some(1 << 22),     // 4M nodes
+            max_patches: None,                // Use image-size-based default
+            max_spline_points: Some(1 << 20), // 1M points
+            max_reference_frames: Some(4),    // 4 reference frames
+            max_memory_bytes: Some(max_memory),
+        }
+    }
+}
+
+impl JxlDecoderLimits {
+    /// Returns limits with no restrictions (all None).
+    /// Use with caution - only for trusted input.
+    pub fn unlimited() -> Self {
+        Self {
+            max_pixels: None,
+            max_extra_channels: None,
+            max_icc_size: None,
+            max_tree_size: None,
+            max_patches: None,
+            max_spline_points: None,
+            max_reference_frames: None,
+            max_memory_bytes: None,
+        }
+    }
+
+    /// Returns restrictive limits suitable for untrusted web content.
+    pub fn restrictive() -> Self {
+        Self {
+            max_pixels: Some(100_000_000),    // 100 megapixels
+            max_extra_channels: Some(16),     // 16 extra channels
+            max_icc_size: Some(1 << 20),      // 1 MB
+            max_tree_size: Some(1 << 20),     // 1M nodes
+            max_patches: Some(1 << 16),       // 64K patches
+            max_spline_points: Some(1 << 16), // 64K points
+            max_reference_frames: Some(2),    // 2 reference frames
+            max_memory_bytes: Some(1 << 30),  // 1 GB total memory
+        }
+    }
+}
+
+pub enum JxlProgressiveMode {
+    /// Renders all pixels in every call to Process.
+    Eager,
+    /// Renders pixels once passes are completed.
+    Pass,
+    /// Renders pixels only once the final frame is ready.
+    FullFrame,
+}
+
+#[non_exhaustive]
+pub struct JxlDecoderOptions {
+    pub adjust_orientation: bool,
+    pub render_spot_colors: bool,
+    pub coalescing: bool,
+    pub desired_intensity_target: Option<f32>,
+    pub skip_preview: bool,
+    pub progressive_mode: JxlProgressiveMode,
+    pub cms: Option<Box<dyn JxlCms>>,
+    /// Use high precision mode for decoding.
+    /// When false (default), uses lower precision settings that match libjxl's default.
+    /// When true, uses higher precision at the cost of performance.
+    ///
+    /// This affects multiple decoder decisions including spline rendering precision
+    /// and potentially intermediate buffer storage (e.g., using f32 vs f16).
+    pub high_precision: bool,
+    /// If true, multiply RGB by alpha before writing to output buffer.
+    /// This produces premultiplied alpha output, which is useful for compositing.
+    /// Default: false (output straight alpha)
+    pub premultiply_output: bool,
+    /// Security limits to prevent resource exhaustion attacks.
+    /// Use `JxlDecoderLimits::restrictive()` for untrusted input.
+    pub limits: JxlDecoderLimits,
+    /// Cooperative cancellation / timeout handle.
+    /// Default: `Arc::new(enough::Unstoppable)` (no cancellation).
+    pub stop: Arc<dyn enough::Stop>,
+    /// Enable parallel decoding and rendering using rayon.
+    ///
+    /// When `true` (the default when the `threads` feature is enabled),
+    /// group decoding and rendering are parallelized across rayon's global
+    /// thread pool. Control thread count via `RAYON_NUM_THREADS` or
+    /// `rayon::ThreadPoolBuilder::build_global()`.
+    ///
+    /// When `false`, all decoding is single-threaded.
+    pub parallel: bool,
+}
+
+impl Default for JxlDecoderOptions {
+    fn default() -> Self {
+        Self {
+            adjust_orientation: true,
+            render_spot_colors: true,
+            coalescing: true,
+            skip_preview: true,
+            desired_intensity_target: None,
+            progressive_mode: JxlProgressiveMode::Pass,
+            cms: None,
+            high_precision: false,
+            premultiply_output: false,
+            limits: JxlDecoderLimits::default(),
+            stop: Arc::new(enough::Unstoppable),
+            parallel: cfg!(feature = "threads"),
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/signature.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/signature.rs
new file mode 100644
index 00000000..0cd06b47
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/signature.rs
@@ -0,0 +1,162 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::ProcessingResult,
+    error::{Error, Result},
+};
+
+/// The magic bytes for a bare JPEG XL codestream.
+pub(crate) const CODESTREAM_SIGNATURE: [u8; 2] = [0xff, 0x0a];
+/// The magic bytes for a file using the JPEG XL container format.
+pub(crate) const CONTAINER_SIGNATURE: [u8; 12] =
+    [0, 0, 0, 0xc, b'J', b'X', b'L', b' ', 0xd, 0xa, 0x87, 0xa];
+
+#[derive(Debug, PartialEq)]
+pub enum JxlSignatureType {
+    Codestream,
+    Container,
+}
+
+impl JxlSignatureType {
+    pub(crate) fn signature(&self) -> &[u8] {
+        match self {
+            JxlSignatureType::Container => &CONTAINER_SIGNATURE,
+            JxlSignatureType::Codestream => &CODESTREAM_SIGNATURE,
+        }
+    }
+}
+
+pub(crate) fn check_signature_internal(file_prefix: &[u8]) -> Result<Option<JxlSignatureType>> {
+    let prefix_len = file_prefix.len();
+
+    for st in [JxlSignatureType::Codestream, JxlSignatureType::Container] {
+        let len = st.signature().len();
+        // Determine the number of bytes to compare (the length of the shorter slice)
+        let len_to_check = prefix_len.min(len);
+
+        if file_prefix[..len_to_check] == st.signature()[..len_to_check] {
+            // The prefix is a valid start. Now, is it complete?
+            return if prefix_len >= len {
+                Ok(Some(st))
+            } else {
+                Err(Error::OutOfBounds(len - prefix_len))
+            };
+        }
+    }
+    // The prefix doesn't match the start of any known signature.
+    Ok(None)
+}
+
+/// Checks if the given buffer starts with a valid JPEG XL signature.
+///
+/// # Returns
+///
+/// A `ProcessingResult` which is:
+/// - `Complete(Some(_))` if a full container or codestream signature is found.
+/// - `Complete(None)` if the prefix is definitively not a JXL signature.
+/// - `NeedsMoreInput` if the prefix matches a signature but is too short.
+pub fn check_signature(file_prefix: &[u8]) -> ProcessingResult<Option<JxlSignatureType>, ()> {
+    ProcessingResult::new(check_signature_internal(file_prefix)).unwrap()
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::api::{
+        CODESTREAM_SIGNATURE, CONTAINER_SIGNATURE, JxlSignatureType, ProcessingResult,
+        check_signature,
+    };
+
+    macro_rules! signature_test {
+        ($test_name:ident, $bytes:expr, Complete(Some($expected_type:expr))) => {
+            #[test]
+            fn $test_name() {
+                let result = check_signature($bytes);
+                match result {
+                    ProcessingResult::Complete { result } => {
+                        assert_eq!(result, Some($expected_type));
+                    }
+                    _ => panic!("Expected Complete(Some(_)), but got {:?}", result),
+                }
+            }
+        };
+        ($test_name:ident, $bytes:expr, Complete(None)) => {
+            #[test]
+            fn $test_name() {
+                let result = check_signature($bytes);
+                match result {
+                    ProcessingResult::Complete { result } => {
+                        assert_eq!(result, None);
+                    }
+                    _ => panic!("Expected Complete(None), but got {:?}", result),
+                }
+            }
+        };
+        ($test_name:ident, $bytes:expr, NeedsMoreInput($expected_hint:expr)) => {
+            #[test]
+            fn $test_name() {
+                let result = check_signature($bytes);
+                match result {
+                    ProcessingResult::NeedsMoreInput { size_hint, .. } => {
+                        assert_eq!(size_hint, $expected_hint);
+                    }
+                    _ => panic!("Expected NeedsMoreInput, but got {:?}", result),
+                }
+            }
+        };
+    }
+
+    signature_test!(
+        full_container_sig,
+        &CONTAINER_SIGNATURE,
+        Complete(Some(JxlSignatureType::Container))
+    );
+
+    signature_test!(
+        partial_container_sig,
+        &CONTAINER_SIGNATURE[..5],
+        NeedsMoreInput(CONTAINER_SIGNATURE.len() - 5)
+    );
+
+    signature_test!(
+        full_codestream_sig,
+        &CODESTREAM_SIGNATURE,
+        Complete(Some(JxlSignatureType::Codestream))
+    );
+
+    signature_test!(
+        partial_codestream_sig,
+        &CODESTREAM_SIGNATURE[..1],
+        NeedsMoreInput(CODESTREAM_SIGNATURE.len() - 1)
+    );
+
+    signature_test!(
+        empty_prefix,
+        &[],
+        NeedsMoreInput(CODESTREAM_SIGNATURE.len())
+    );
+
+    signature_test!(invalid_sig, &[0x12, 0x34, 0x56, 0x77], Complete(None));
+
+    signature_test!(
+        container_with_extra_data,
+        &{
+            let mut data = CONTAINER_SIGNATURE.to_vec();
+            data.extend_from_slice(&[0x11, 0x22, 0x33]);
+            data
+        },
+        Complete(Some(JxlSignatureType::Container))
+    );
+
+    signature_test!(
+        codestream_with_extra_data,
+        &{
+            let mut data = CODESTREAM_SIGNATURE.to_vec();
+            data.extend_from_slice(&[0x44, 0x55, 0x66]);
+            data
+        },
+        Complete(Some(JxlSignatureType::Codestream))
+    );
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/api/xyb_constants.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/xyb_constants.rs
new file mode 100644
index 00000000..eb9356b2
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/api/xyb_constants.rs
@@ -0,0 +1,86 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! XYB color space constants (matching libjxl)
+//!
+//! Allow excessive precision as these constants are copied verbatim from libjxl for compatibility
+
+#![allow(clippy::excessive_precision)]
+
+pub const OPSIN_ABSORBANCE_BIAS: f32 = 0.0037930732552754493;
+
+#[allow(dead_code)]
+pub const NEG_OPSIN_ABSORBANCE_BIAS_RGB: [f32; 3] = [
+    -OPSIN_ABSORBANCE_BIAS,
+    -OPSIN_ABSORBANCE_BIAS,
+    -OPSIN_ABSORBANCE_BIAS,
+];
+
+const SCALED_XYB_OFFSET: [f32; 3] = [0.015386134, 0.0, 0.27770459];
+const SCALED_XYB_SCALE: [f32; 3] = [22.995788804, 1.183000077, 1.502141333];
+
+const fn reciprocal_sum(r1: f32, r2: f32) -> f32 {
+    (r1 * r2) / (r1 + r2)
+}
+
+pub const XYB_OFFSET: [f32; 3] = [
+    SCALED_XYB_OFFSET[0] + SCALED_XYB_OFFSET[1],
+    SCALED_XYB_OFFSET[1] - SCALED_XYB_OFFSET[0] + (1.0 / SCALED_XYB_SCALE[0]),
+    SCALED_XYB_OFFSET[1] + SCALED_XYB_OFFSET[2],
+];
+
+pub const fn xyb_scale() -> [f32; 3] {
+    [
+        reciprocal_sum(SCALED_XYB_SCALE[0], SCALED_XYB_SCALE[1]),
+        reciprocal_sum(SCALED_XYB_SCALE[0], SCALED_XYB_SCALE[1]),
+        reciprocal_sum(SCALED_XYB_SCALE[1], SCALED_XYB_SCALE[2]),
+    ]
+}
+
+const fn xyb_corner(x: usize, y: usize, b: usize, idx: usize) -> f32 {
+    let val = match idx {
+        0 => x,
+        1 => y,
+        _ => b,
+    };
+    (val as f32 / SCALED_XYB_SCALE[idx]) - SCALED_XYB_OFFSET[idx]
+}
+
+const fn scaled_a2b_corner(x: usize, y: usize, b: usize, idx: usize) -> f32 {
+    match idx {
+        0 => xyb_corner(x, y, b, 1) + xyb_corner(x, y, b, 0),
+        1 => xyb_corner(x, y, b, 1) - xyb_corner(x, y, b, 0),
+        _ => xyb_corner(x, y, b, 2) + xyb_corner(x, y, b, 1),
+    }
+}
+
+const fn unscaled_a2b_corner(x: usize, y: usize, b: usize) -> [f32; 3] {
+    let scale = xyb_scale();
+    [
+        (scaled_a2b_corner(x, y, b, 0) + XYB_OFFSET[0]) * scale[0],
+        (scaled_a2b_corner(x, y, b, 1) + XYB_OFFSET[1]) * scale[1],
+        (scaled_a2b_corner(x, y, b, 2) + XYB_OFFSET[2]) * scale[2],
+    ]
+}
+
+/// Compute the 2x2x2 CLUT cube for XYB to linear RGB conversion.
+pub const fn unscaled_a2b_cube_full() -> [[[[f32; 3]; 2]; 2]; 2] {
+    [
+        [
+            [unscaled_a2b_corner(0, 0, 0), unscaled_a2b_corner(0, 0, 1)],
+            [unscaled_a2b_corner(0, 1, 0), unscaled_a2b_corner(0, 1, 1)],
+        ],
+        [
+            [unscaled_a2b_corner(1, 0, 0), unscaled_a2b_corner(1, 0, 1)],
+            [unscaled_a2b_corner(1, 1, 0), unscaled_a2b_corner(1, 1, 1)],
+        ],
+    ]
+}
+
+/// Matrix for XYB ICC profile (from libjxl).
+pub const XYB_ICC_MATRIX: [f64; 9] = [
+    1.5170095, -1.1065225, 0.071623, -0.050022, 0.5683655, -0.018344, -1.387676, 1.1145555,
+    0.6857255,
+];
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/bit_reader.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/bit_reader.rs
new file mode 100644
index 00000000..feb0fbf7
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/bit_reader.rs
@@ -0,0 +1,347 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use crate::{error::Error, util::tracing_wrappers::*};
+use byteorder::{ByteOrder, LittleEndian};
+
+/// Reads bits from a sequence of bytes.
+#[derive(Clone)]
+pub struct BitReader<'a> {
+    data: &'a [u8],
+    bit_buf: u64,
+    bits_in_buf: usize,
+    total_bits_read: usize,
+    initial_bits: usize,
+}
+
+impl Debug for BitReader<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "BitReader{{ data: [{} bytes], bit_buf: {:0width$b}, total_bits_read: {} }}",
+            self.data.len(),
+            self.bit_buf,
+            self.total_bits_read,
+            width = self.bits_in_buf
+        )
+    }
+}
+
+pub const MAX_BITS_PER_CALL: usize = 56;
+
+impl<'a> BitReader<'a> {
+    /// Constructs a BitReader for a given range of data.
+    pub fn new(data: &[u8]) -> BitReader<'_> {
+        BitReader {
+            data,
+            bit_buf: 0,
+            bits_in_buf: 0,
+            total_bits_read: 0,
+            initial_bits: data.len() * 8,
+        }
+    }
+
+    /// Constructs a BitReader for padded data where `real_len` bytes are valid
+    /// content and the remaining bytes are zero padding.
+    ///
+    /// The padding ensures `refill()` can always take the fast 8-byte read path
+    /// instead of falling back to byte-by-byte `refill_slow()`. The caller must
+    /// ensure `data.len() >= real_len + 8` (8 bytes of zero padding).
+    ///
+    /// `initial_bits` is set from `real_len`, so `check_for_error()` and
+    /// `total_bits_available()` report the correct content length.
+    pub fn new_padded(data: &[u8], real_len: usize) -> Result<BitReader<'_>, Error> {
+        if real_len > 0 && data.len() < real_len.saturating_add(8) {
+            return Err(Error::SectionTooShort);
+        }
+        Ok(BitReader {
+            data,
+            bit_buf: 0,
+            bits_in_buf: 0,
+            total_bits_read: 0,
+            initial_bits: real_len * 8,
+        })
+    }
+
+    /// Reads `num` bits from the buffer without consuming them.
+    ///
+    /// `num` must satisfy `num <= MAX_BITS_PER_CALL` (56). Values >= 64 would
+    /// cause `1u64 << num` to be undefined-output-in-release; values
+    /// `MAX_BITS_PER_CALL < num < 64` would silently read past `refill()`'s
+    /// fast path. Saturate to 0 in release as a defense-in-depth check — any
+    /// caller passing an out-of-range value is a bug we want surfaced via the
+    /// debug_assert *and* prevented from corrupting state in release.
+    #[inline(always)]
+    pub fn peek(&mut self, num: usize) -> u64 {
+        // Out-of-range early-return must precede the debug_assert! so the
+        // saturation contract is testable under `cargo test` (which builds
+        // with debug_assertions=on). Any caller actually exercising this
+        // path is a bug, but in release we must not corrupt state.
+        if num > MAX_BITS_PER_CALL {
+            return 0;
+        }
+        debug_assert!(num <= MAX_BITS_PER_CALL);
+        if self.bits_in_buf < num {
+            self.refill();
+        }
+        // SAFETY-NOTE: `num <= 56` is enforced above, so the shift is well-defined.
+        self.bit_buf & ((1u64 << num) - 1)
+    }
+
+    /// Advances by `num` bits. Similar to `skip_bits`, but bits must be in the buffer.
+    pub fn consume(&mut self, num: usize) -> Result<(), Error> {
+        if self.bits_in_buf < num {
+            return Err(Error::OutOfBounds((num - self.bits_in_buf).div_ceil(8)));
+        }
+        self.bit_buf >>= num;
+        self.bits_in_buf -= num;
+        self.total_bits_read = self.total_bits_read.wrapping_add(num);
+        Ok(())
+    }
+
+    #[inline(always)]
+    pub fn consume_optimistic(&mut self, num: usize) {
+        self.bit_buf >>= num;
+        self.bits_in_buf = self.bits_in_buf.saturating_sub(num);
+        self.total_bits_read = self.total_bits_read.wrapping_add(num);
+    }
+
+    /// Reads `num` bits from the buffer.
+    /// ```ignore
+    /// # use crate::bit_reader::BitReader;
+    /// let mut br = BitReader::new(&[0, 1]);
+    /// assert_eq!(br.read(8)?, 0);
+    /// assert_eq!(br.read(4)?, 1);
+    /// assert_eq!(br.read(4)?, 0);
+    /// assert_eq!(br.total_bits_read(), 16);
+    /// assert!(br.read(1).is_err());
+    /// # Ok::<(), zenjxl_decoder::api::Error>(())
+    /// ```
+    #[inline]
+    pub fn read(&mut self, num: usize) -> Result<u64, Error> {
+        let ret = self.peek(num);
+        self.consume(num)?;
+        Ok(ret)
+    }
+
+    /// inline(never) wrapper around read, for cold code paths.
+    #[inline(never)]
+    pub fn read_noinline(&mut self, num: usize) -> Result<u64, Error> {
+        self.read(num)
+    }
+
+    #[inline(always)]
+    pub fn read_optimistic(&mut self, num: usize) -> u64 {
+        let ret = self.peek(num);
+        self.consume_optimistic(num);
+        ret
+    }
+
+    pub fn check_for_error(&self) -> Result<(), Error> {
+        if self.total_bits_read > self.initial_bits {
+            Err(Error::OutOfBounds(self.total_bits_read - self.initial_bits))
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Returns the total number of bits that have been read or skipped.
+    pub fn total_bits_read(&self) -> usize {
+        self.total_bits_read
+    }
+
+    /// Returns the total number of bits that can still be read or skipped.
+    pub fn total_bits_available(&self) -> usize {
+        self.data.len() * 8 + self.bits_in_buf
+    }
+
+    /// Skips `num` bits.
+    /// ```ignore
+    /// # use crate::bit_reader::BitReader;
+    /// let mut br = BitReader::new(&[0, 1]);
+    /// assert_eq!(br.read(8)?, 0);
+    /// br.skip_bits(4)?;
+    /// assert_eq!(br.total_bits_read(), 12);
+    /// # Ok::<(), zenjxl_decoder::api::Error>(())
+    /// ```
+    #[inline(never)]
+    pub fn skip_bits(&mut self, mut n: usize) -> Result<(), Error> {
+        // Check if we can skip within the current buffer
+        if let Some(next_remaining_bits) = self.bits_in_buf.checked_sub(n) {
+            self.total_bits_read += n;
+            self.bits_in_buf = next_remaining_bits;
+            self.bit_buf >>= n;
+            return Ok(());
+        }
+
+        // Adjust the number of bits to skip and reset the buffer
+        n -= self.bits_in_buf;
+        self.total_bits_read += self.bits_in_buf;
+        self.bit_buf = 0;
+        self.bits_in_buf = 0;
+
+        // Check if the remaining bits to skip exceed the total bits in `data`
+        let bits_available = self.data.len() * 8;
+        if n > bits_available {
+            self.total_bits_read += bits_available;
+            return Err(Error::OutOfBounds(n - bits_available));
+        }
+
+        // Skip bytes directly in `data`, then handle leftover bits
+        self.total_bits_read += n / 8 * 8;
+        self.data = &self.data[n / 8..];
+        n %= 8;
+
+        // Refill the buffer and adjust for any remaining bits
+        self.refill();
+        let to_consume = self.bits_in_buf.min(n);
+        // The bits loaded by refill() haven't been counted in total_bits_read yet,
+        // so we add (not subtract) the bits we're consuming. The original code
+        // incorrectly subtracted here, causing underflow when skip_bits was called
+        // on a fresh BitReader.
+        self.total_bits_read += to_consume;
+        n -= to_consume;
+        self.bit_buf >>= to_consume;
+        self.bits_in_buf -= to_consume;
+        if n > 0 {
+            Err(Error::OutOfBounds(n))
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Return the number of bits
+    pub fn bits_to_next_byte(&self) -> usize {
+        let byte_boundary = self.total_bits_read.div_ceil(8) * 8;
+        byte_boundary - self.total_bits_read
+    }
+
+    /// Jumps to the next byte boundary. The skipped bytes have to be 0.
+    /// ```ignore
+    /// # use crate::bit_reader::BitReader;
+    /// let mut br = BitReader::new(&[0, 1]);
+    /// assert_eq!(br.read(8)?, 0);
+    /// br.skip_bits(4)?;
+    /// br.jump_to_byte_boundary()?;
+    /// assert_eq!(br.total_bits_read(), 16);
+    /// # Ok::<(), zenjxl_decoder::api::Error>(())
+    /// ```
+    #[inline(never)]
+    pub fn jump_to_byte_boundary(&mut self) -> Result<(), Error> {
+        if self.read(self.bits_to_next_byte())? != 0 {
+            return Err(Error::NonZeroPadding);
+        }
+        Ok(())
+    }
+
+    #[inline(always)]
+    fn refill(&mut self) {
+        // See Refill() in C++ code.
+        if self.data.len() >= 8 {
+            let bits = LittleEndian::read_u64(self.data);
+            self.bit_buf |= bits << self.bits_in_buf;
+            let read_bytes = (63 - self.bits_in_buf) >> 3;
+            self.bits_in_buf |= 56;
+            self.data = &self.data[read_bytes..];
+            debug_assert!(56 <= self.bits_in_buf && self.bits_in_buf < 64);
+        } else {
+            self.refill_slow()
+        }
+    }
+
+    #[inline(never)]
+    fn refill_slow(&mut self) {
+        while self.bits_in_buf < 56 {
+            if self.data.is_empty() {
+                return;
+            }
+            self.bit_buf |= (self.data[0] as u64) << self.bits_in_buf;
+            self.bits_in_buf += 8;
+            self.data = &self.data[1..];
+        }
+    }
+
+    /// Splits off a separate BitReader to handle the next `n` *full* bytes.
+    /// If `self` is not aligned to a byte boundary, it skips to the next byte boundary.
+    /// `self` is automatically advanced by `n` bytes.
+    #[allow(dead_code)] // Used by Frame::sections (TOC-based section splitting)
+    pub fn split_at(&mut self, n: usize) -> Result<BitReader<'a>, Error> {
+        self.jump_to_byte_boundary()?;
+        let mut ret = Self { ..*self };
+        self.skip_bits(n * 8)?;
+        let bytes_in_buf = ret.bits_in_buf / 8;
+        if n > bytes_in_buf {
+            // Prevent the returned bitreader from over-reading.
+            ret.data = &ret.data[..n - bytes_in_buf];
+        } else {
+            // `n * 8` must be < 64 here. `bytes_in_buf <= bits_in_buf / 8 <= 8`,
+            // so `n <= 8` => `n * 8 <= 64`. Guard the `n == 8` case to avoid the
+            // undefined `1u64 << 64` shift; for `n == 8` the mask is the full
+            // u64 (no masking needed since the buffer is already exactly 64 bits).
+            let shift = n * 8;
+            ret.bits_in_buf = shift;
+            if shift < 64 {
+                ret.bit_buf &= (1u64 << shift) - 1;
+            }
+            ret.data = &[];
+        }
+        debug!(?n, ret=?ret);
+        Ok(ret)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_peek_out_of_range_does_not_panic() {
+        // num > MAX_BITS_PER_CALL (56) used to be only a `debug_assert!`, so a
+        // release build would compute `1u64 << num` and silently corrupt state
+        // for `num >= 64` (UB-shaped behavior masked at u64). The hardened
+        // `peek` now early-returns 0 — this test pins that contract.
+        let data = [0xff_u8; 16];
+        let mut br = BitReader::new(&data);
+        assert_eq!(br.peek(64), 0);
+        assert_eq!(br.peek(70), 0);
+        assert_eq!(br.peek(usize::MAX), 0);
+        // The bit buffer state must not have been corrupted by the bad calls —
+        // legitimate reads still work.
+        assert_eq!(br.read(8).unwrap(), 0xff);
+    }
+
+    #[test]
+    fn test_split_at_eight_bytes_no_undefined_shift() {
+        // split_at(8) computes `1u64 << 64` in the masking branch when the
+        // buffer holds exactly 8 bytes. The hardened path skips the mask in
+        // that case (full-u64 mask is identity).
+        let data = [0xab_u8; 32];
+        let mut br = BitReader::new(&data);
+        // Force `bits_in_buf == 64` by issuing a refill via peek().
+        let _ = br.peek(56);
+        let split = br.split_at(8).unwrap();
+        // Both halves remain consistent; reads against the split still succeed.
+        let mut split = split;
+        assert_eq!(split.read(8).unwrap(), 0xab);
+    }
+
+    #[test]
+    fn test_skip_bits_on_fresh_reader() {
+        // This test checks if skip_bits works correctly on a fresh BitReader
+        let data = [0x12, 0x34, 0x56, 0x78];
+        let mut br = BitReader::new(&data);
+
+        // Try to skip 1 bit on a fresh reader - this should work
+        br.skip_bits(1)
+            .expect("skip_bits should work on fresh reader");
+        assert_eq!(br.total_bits_read(), 1);
+
+        // Read the next 7 bits to complete the byte
+        let val = br.read(7).expect("read should work");
+        assert_eq!(val, 0x12 >> 1); // Should get the lower 7 bits of 0x12
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/color/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/color/mod.rs
new file mode 100644
index 00000000..e9e061b9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/color/mod.rs
@@ -0,0 +1,6 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub mod tf;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/color/tf.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/color/tf.rs
new file mode 100644
index 00000000..5e07a296
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/color/tf.rs
@@ -0,0 +1,819 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#[cfg(test)]
+use crate::util::eval_rational_poly;
+use crate::util::eval_rational_poly_simd;
+use jxl_simd::{F32SimdVec, SimdDescriptor, SimdMask};
+
+/// Converts the linear samples with the sRGB transfer curve (SIMD version).
+// Max error ~5e-7
+#[inline(always)]
+pub fn linear_to_srgb_simd<D: SimdDescriptor>(d: D, samples: &mut [f32]) {
+    #[allow(clippy::excessive_precision)]
+    const P: [f32; 5] = [
+        -5.135152395e-4,
+        5.287254571e-3,
+        3.903842876e-1,
+        1.474205315,
+        7.352629620e-1,
+    ];
+
+    #[allow(clippy::excessive_precision)]
+    const Q: [f32; 5] = [
+        1.004519624e-2,
+        3.036675394e-1,
+        1.340816930,
+        9.258482155e-1,
+        2.424867759e-2,
+    ];
+
+    for vec in samples.chunks_exact_mut(D::F32Vec::LEN) {
+        let x = D::F32Vec::load(d, vec);
+        // Sign-extended sRGB: apply full curve to abs(x), then restore sign.
+        // This matches libjxl's TF_SRGB::EncodedFromDisplay behavior for
+        // out-of-gamut negative values.
+        let a = x.abs();
+        D::F32Vec::splat(d, 0.0031308)
+            .gt(a)
+            .if_then_else_f32(
+                a * D::F32Vec::splat(d, 12.92),
+                eval_rational_poly_simd(d, a.sqrt(), P, Q),
+            )
+            .copysign(x)
+            .store(vec);
+    }
+}
+
+/// Converts samples in sRGB transfer curve to linear. Inverse of `linear_to_srgb`.
+#[cfg(test)]
+pub fn srgb_to_linear(samples: &mut [f32]) {
+    #[allow(clippy::excessive_precision)]
+    const P: [f32; 5] = [
+        2.200248328e-4,
+        1.043637593e-2,
+        1.624820318e-1,
+        7.961564959e-1,
+        8.210152774e-1,
+    ];
+
+    #[allow(clippy::excessive_precision)]
+    const Q: [f32; 5] = [
+        2.631846970e-1,
+        1.076976492,
+        4.987528350e-1,
+        -5.512498495e-2,
+        6.521209011e-3,
+    ];
+
+    for x in samples {
+        // Sign-extended sRGB inverse: apply to abs, then restore sign.
+        let a = x.abs();
+        let v = if a <= 0.04045 {
+            a / 12.92
+        } else {
+            eval_rational_poly(a, P, Q)
+        };
+        *x = v.copysign(*x);
+    }
+}
+
+#[inline(always)]
+pub fn srgb_to_linear_simd<D: SimdDescriptor>(d: D, samples: &mut [f32]) {
+    #[allow(clippy::excessive_precision)]
+    const P: [f32; 5] = [
+        2.200248328e-4,
+        1.043637593e-2,
+        1.624820318e-1,
+        7.961564959e-1,
+        8.210152774e-1,
+    ];
+
+    #[allow(clippy::excessive_precision)]
+    const Q: [f32; 5] = [
+        2.631846970e-1,
+        1.076976492,
+        4.987528350e-1,
+        -5.512498495e-2,
+        6.521209011e-3,
+    ];
+
+    for vec in samples.chunks_exact_mut(D::F32Vec::LEN) {
+        let x = D::F32Vec::load(d, vec);
+        // Sign-extended sRGB inverse: apply to abs, then restore sign.
+        let a = x.abs();
+        D::F32Vec::splat(d, 0.04045)
+            .gt(a)
+            .if_then_else_f32(
+                a / D::F32Vec::splat(d, 12.92),
+                eval_rational_poly_simd(d, a, P, Q),
+            )
+            .copysign(x)
+            .store(vec);
+    }
+}
+
+/// Converts the linear samples with the BT.709 transfer curve (SIMD version).
+// Rational polynomial approximation of 1.099 * x^0.45 - 0.099 on sqrt(x).
+// Max error ~3e-7
+#[inline(always)]
+pub fn linear_to_bt709_simd<D: SimdDescriptor>(d: D, samples: &mut [f32]) {
+    // Coefficients for rational polynomial P(y)/Q(y) where y = sqrt(x)
+    // Approximates 1.099 * y^0.9 - 0.099 on [sqrt(0.018), 1]
+    #[allow(clippy::excessive_precision)]
+    const P: [f32; 5] = [
+        -9.625309705734253e-2,
+        -2.2635456919670105e-1,
+        1.935774803161621e1,
+        5.897886276245117e1,
+        2.3947298049926758e1,
+    ];
+
+    #[allow(clippy::excessive_precision)]
+    const Q: [f32; 5] = [
+        1.0,
+        1.877663230895996e1,
+        5.5292449951171875e1,
+        2.6565317153930664e1,
+        3.269049823284149e-1,
+    ];
+
+    for vec in samples.chunks_exact_mut(D::F32Vec::LEN) {
+        let x = D::F32Vec::load(d, vec);
+        // Per ICC parametric curve type 3: linear segment for all values below
+        // threshold, including negatives. Gamma branch only for x >= 0.018.
+        D::F32Vec::splat(d, 0.018)
+            .gt(x)
+            .if_then_else_f32(
+                x * D::F32Vec::splat(d, 4.5),
+                eval_rational_poly_simd(d, x.sqrt(), P, Q),
+            )
+            .store(vec);
+    }
+}
+
+/// Converts samples in BT.709 transfer curve to linear. Inverse of `linear_to_bt709_simd`.
+#[cfg(test)]
+pub fn bt709_to_linear(samples: &mut [f32]) {
+    for s in samples {
+        // Per ICC parametric curve type 3: linear segment for all values below
+        // threshold, including negatives. Gamma branch only for s >= 0.081.
+        *s = if *s <= 0.081 {
+            *s / 4.5
+        } else {
+            crate::util::fast_powf(s.mul_add(1.0 / 1.099, 0.099 / 1.099), 1.0 / 0.45)
+        };
+    }
+}
+
+/// Converts samples in BT.709 transfer curve to linear (SIMD version).
+#[inline(always)]
+pub fn bt709_to_linear_simd<D: SimdDescriptor>(d: D, xsize: usize, samples: &mut [f32]) {
+    let threshold = D::F32Vec::splat(d, 0.081);
+    let inv_4_5 = D::F32Vec::splat(d, 1.0 / 4.5);
+    let scale = D::F32Vec::splat(d, 1.0 / 1.099);
+    let offset = D::F32Vec::splat(d, 0.099 / 1.099);
+    let exp = D::F32Vec::splat(d, 1.0 / 0.45);
+
+    for vec in samples
+        .chunks_exact_mut(D::F32Vec::LEN)
+        .take(xsize.div_ceil(D::F32Vec::LEN))
+    {
+        let x = D::F32Vec::load(d, vec);
+        // Per ICC parametric curve type 3: linear segment for all values below
+        // threshold, including negatives. Gamma branch only for x >= 0.081.
+        let linear_part = x * inv_4_5;
+        let gamma_part = crate::util::fast_powf_simd(d, x.mul_add(scale, offset), exp);
+        threshold
+            .gt(x)
+            .if_then_else_f32(linear_part, gamma_part)
+            .store(vec);
+    }
+}
+
+const PQ_M1: f64 = 2610.0 / 16384.0;
+const PQ_M2: f64 = (2523.0 / 4096.0) * 128.0;
+const PQ_C1: f64 = 3424.0 / 4096.0;
+const PQ_C2: f64 = (2413.0 / 4096.0) * 32.0;
+const PQ_C3: f64 = (2392.0 / 4096.0) * 32.0;
+
+/// Converts linear sample to PQ signal using PQ inverse EOTF, where linear sample value of 1.0
+/// represents `intensity_target` display nits.
+///
+/// This version uses original EOTF using double precision arithmetic internally.
+pub fn linear_to_pq_precise(intensity_target: f32, samples: &mut [f32]) {
+    let mult = intensity_target as f64 * 10000f64.recip();
+
+    for s in samples {
+        if *s == 0.0 {
+            continue;
+        }
+
+        let a = s.abs() as f64;
+        let xp = (a * mult).powf(PQ_M1);
+        let num = PQ_C1 + xp * PQ_C2;
+        let den = 1.0 + xp * PQ_C3;
+        let e = (num / den).powf(PQ_M2);
+        *s = (e as f32).copysign(*s);
+    }
+}
+
+/// Converts PQ signal to linear sample using PQ EOTF, where linear sample value of 1.0 represents
+/// `intensity_target` display nits.
+///
+/// This version uses original EOTF using double precision arithmetic internally.
+pub fn pq_to_linear_precise(intensity_target: f32, samples: &mut [f32]) {
+    let mult = 10000.0 / intensity_target as f64;
+
+    for s in samples {
+        if *s == 0.0 {
+            continue;
+        }
+
+        let a = s.abs() as f64;
+        let xp = a.powf(PQ_M2.recip());
+        let num = (xp - PQ_C1).max(0.0);
+        let den = PQ_C2 - PQ_C3 * xp;
+        let y = (num / den).powf(PQ_M1.recip());
+        *s = ((y * mult) as f32).copysign(*s);
+    }
+}
+
+const PQ_EOTF_P: [f32; 5] = [
+    2.6297566e-4,
+    -6.235531e-3,
+    7.386023e-1,
+    2.6455317,
+    5.500349e-1,
+];
+const PQ_EOTF_Q: [f32; 5] = [
+    4.213501e2,
+    -4.2873682e2,
+    1.7436467e2,
+    -3.3907887e1,
+    2.6771877,
+];
+
+const PQ_INV_EOTF_P: [f32; 5] = [1.351392e-2, -1.095778, 5.522776e1, 1.492516e2, 4.838434e1];
+const PQ_INV_EOTF_Q: [f32; 5] = [1.012416, 2.016708e1, 9.26371e1, 1.120607e2, 2.590418e1];
+const PQ_INV_EOTF_P_SMALL: [f32; 5] = [
+    9.863406e-6,
+    3.881234e-1,
+    1.352821e2,
+    6.889862e4,
+    -2.864824e5,
+];
+const PQ_INV_EOTF_Q_SMALL: [f32; 5] =
+    [3.371868e1, 1.477719e3, 1.608477e4, -4.389884e4, -2.072546e5];
+
+/// Converts linear sample to PQ signal using PQ inverse EOTF, where linear sample value of 1.0
+/// represents `intensity_target` display nits.
+///
+/// This version uses approximate curve using rational polynomial.
+// Max error: ~7e-7 at intensity_target = 10000
+#[cfg(test)]
+pub fn linear_to_pq(intensity_target: f32, samples: &mut [f32]) {
+    let y_mult = intensity_target * 10000f32.recip();
+
+    for s in samples {
+        let a = s.abs();
+        let a_scaled = a * y_mult;
+        let a_1_4 = a_scaled.sqrt().sqrt();
+
+        let y = if a < 1e-4 {
+            eval_rational_poly(a_1_4, PQ_INV_EOTF_P_SMALL, PQ_INV_EOTF_Q_SMALL)
+        } else {
+            eval_rational_poly(a_1_4, PQ_INV_EOTF_P, PQ_INV_EOTF_Q)
+        };
+
+        *s = y.copysign(*s);
+    }
+}
+
+/// Converts linear sample to PQ signal using PQ inverse EOTF (SIMD version).
+#[inline(always)]
+pub fn linear_to_pq_simd<D: SimdDescriptor>(
+    d: D,
+    intensity_target: f32,
+    xsize: usize,
+    samples: &mut [f32],
+) {
+    let y_mult = D::F32Vec::splat(d, intensity_target * 10000f32.recip());
+    let threshold = D::F32Vec::splat(d, 1e-4);
+
+    for vec in samples
+        .chunks_exact_mut(D::F32Vec::LEN)
+        .take(xsize.div_ceil(D::F32Vec::LEN))
+    {
+        let s = D::F32Vec::load(d, vec);
+        let a = s.abs();
+        let a_scaled = a * y_mult;
+        let a_1_4 = a_scaled.sqrt().sqrt();
+
+        // Use small polynomial for a < 1e-4, regular polynomial otherwise
+        let y_small = eval_rational_poly_simd(d, a_1_4, PQ_INV_EOTF_P_SMALL, PQ_INV_EOTF_Q_SMALL);
+        let y_large = eval_rational_poly_simd(d, a_1_4, PQ_INV_EOTF_P, PQ_INV_EOTF_Q);
+        let y = threshold.gt(a).if_then_else_f32(y_small, y_large);
+
+        y.copysign(s).store(vec);
+    }
+}
+
+/// Converts PQ signal to linear sample using PQ EOTF, where linear sample value of 1.0 represents
+/// `intensity_target` display nits.
+///
+/// This version uses approximate curve using rational polynomial.
+// Max error: ~3e-6 at intensity_target = 10000
+#[cfg(test)]
+pub fn pq_to_linear(intensity_target: f32, samples: &mut [f32]) {
+    let y_mult = 10000.0 / intensity_target;
+
+    for s in samples {
+        let a = s.abs();
+        // a + a * a
+        let x = a.mul_add(a, a);
+        let y = eval_rational_poly(x, PQ_EOTF_P, PQ_EOTF_Q);
+        *s = (y * y_mult).copysign(*s);
+    }
+}
+
+/// Converts PQ signal to linear sample using PQ EOTF (SIMD version).
+#[inline(always)]
+pub fn pq_to_linear_simd<D: SimdDescriptor>(
+    d: D,
+    intensity_target: f32,
+    xsize: usize,
+    samples: &mut [f32],
+) {
+    let y_mult = D::F32Vec::splat(d, 10000.0 / intensity_target);
+
+    for vec in samples
+        .chunks_exact_mut(D::F32Vec::LEN)
+        .take(xsize.div_ceil(D::F32Vec::LEN))
+    {
+        let s = D::F32Vec::load(d, vec);
+        let a = s.abs();
+        // a + a * a
+        let x = a.mul_add(a, a);
+        let y = eval_rational_poly_simd(d, x, PQ_EOTF_P, PQ_EOTF_Q);
+        (y * y_mult).copysign(s).store(vec);
+    }
+}
+
+const HLG_A: f64 = 0.17883277;
+const HLG_B: f64 = 1.0 - 4.0 * HLG_A;
+const HLG_C: f64 = 0.5599107295;
+
+#[allow(dead_code)] // used by integration tests
+fn hlg_ootf_inner_precise(exp: f64, [lr, lg, lb]: [f32; 3], [sr, sg, sb]: [&mut [f32]; 3]) {
+    if exp.abs() < 0.1 {
+        return;
+    }
+
+    let lr = lr as f64;
+    let lg = lg as f64;
+    let lb = lb as f64;
+    for ((r, g), b) in std::iter::zip(sr, sg).zip(sb) {
+        let dr = *r as f64;
+        let dg = *g as f64;
+        let db = *b as f64;
+        let mixed = dr.mul_add(lr, dg.mul_add(lg, db * lb));
+        let mult = mixed.powf(exp);
+        *r = (dr * mult) as f32;
+        *g = (dg * mult) as f32;
+        *b = (db * mult) as f32;
+    }
+}
+
+fn hlg_ootf_inner(exp: f32, [lr, lg, lb]: [f32; 3], [sr, sg, sb]: [&mut [f32]; 3]) {
+    if exp.abs() < 0.1 {
+        return;
+    }
+
+    for ((r, g), b) in std::iter::zip(sr, sg).zip(sb) {
+        let mixed = r.mul_add(lr, g.mul_add(lg, *b * lb));
+        let mult = crate::util::fast_powf(mixed, exp);
+        *r *= mult;
+        *g *= mult;
+        *b *= mult;
+    }
+}
+
+/// Converts scene-referred linear samples to display-referred linear samples using HLG OOTF.
+///
+/// This version uses double precision arithmetic internally.
+#[allow(dead_code)] // used by integration tests
+pub fn hlg_scene_to_display_precise(
+    intensity_display: f32,
+    luminance_rgb: [f32; 3],
+    samples_rgb: [&mut [f32]; 3],
+) {
+    let system_gamma = 1.2f64 * 1.111f64.powf((intensity_display as f64 / 1e3).log2());
+    let gamma_sub_one = system_gamma - 1.0;
+    hlg_ootf_inner_precise(gamma_sub_one, luminance_rgb, samples_rgb);
+}
+
+/// Converts display-referred linear samples to scene-referred linear samples using HLG inverse
+/// OOTF.
+///
+/// This version uses double precision arithmetic internally.
+#[allow(dead_code)] // used by integration tests
+pub fn hlg_display_to_scene_precise(
+    intensity_display: f32,
+    luminance_rgb: [f32; 3],
+    samples_rgb: [&mut [f32]; 3],
+) {
+    let system_gamma = 1.2f64 * 1.111f64.powf((intensity_display as f64 / 1e3).log2());
+    let one_sub_gamma = 1.0 - system_gamma;
+    hlg_ootf_inner_precise(one_sub_gamma / system_gamma, luminance_rgb, samples_rgb);
+}
+
+/// Converts scene-referred linear samples to display-referred linear samples using HLG OOTF.
+///
+/// This version uses `fast_powf` to compute power function.
+pub fn hlg_scene_to_display(
+    intensity_display: f32,
+    luminance_rgb: [f32; 3],
+    samples_rgb: [&mut [f32]; 3],
+) {
+    let system_gamma = 1.2f32 * 1.111f32.powf((intensity_display / 1e3).log2());
+    let gamma_sub_one = system_gamma - 1.0;
+    hlg_ootf_inner(gamma_sub_one, luminance_rgb, samples_rgb);
+}
+
+/// Converts display-referred linear samples to scene-referred linear samples using HLG inverse
+/// OOTF.
+///
+/// This version uses `fast_powf` to compute power function.
+pub fn hlg_display_to_scene(
+    intensity_display: f32,
+    luminance_rgb: [f32; 3],
+    samples_rgb: [&mut [f32]; 3],
+) {
+    let system_gamma = 1.2f32 * 1.111f32.powf((intensity_display / 1e3).log2());
+    let one_sub_gamma = 1.0 - system_gamma;
+    hlg_ootf_inner(one_sub_gamma / system_gamma, luminance_rgb, samples_rgb);
+}
+
+/// Converts scene-referred linear sample to HLG signal.
+///
+/// This version uses double precision arithmetic internally.
+#[cfg(test)]
+pub fn scene_to_hlg_precise(samples: &mut [f32]) {
+    for s in samples {
+        let a = s.abs() as f64;
+        let y = if a <= 1.0 / 12.0 {
+            (3.0 * a).sqrt()
+        } else {
+            // TODO(tirr-c): maybe use mul_add?
+            HLG_A * (12.0 * a - HLG_B).ln() + HLG_C
+        };
+        *s = (y as f32).copysign(*s);
+    }
+}
+
+/// Converts HLG signal to scene-referred linear sample.
+///
+/// This version uses double precision arithmetic internally.
+#[cfg(test)]
+pub fn hlg_to_scene_precise(samples: &mut [f32]) {
+    for s in samples {
+        let a = s.abs() as f64;
+        let y = if a <= 0.5 {
+            a * a / 3.0
+        } else {
+            (((a - HLG_C) / HLG_A).exp() + HLG_B) / 12.0
+        };
+        *s = (y as f32).copysign(*s);
+    }
+}
+
+/// Converts scene-referred linear sample to HLG signal.
+///
+/// This version uses `fast_log2f` to apply logarithmic function.
+// Max error: ~5e-7
+pub fn scene_to_hlg(samples: &mut [f32]) {
+    for s in samples {
+        let a = s.abs();
+        let y = if a <= 1.0 / 12.0 {
+            (3.0 * a).sqrt()
+        } else {
+            // TODO(tirr-c): maybe use mul_add?
+            let log = crate::util::fast_log2f(12.0 * a - HLG_B as f32);
+            // log2 x = ln x / ln 2, therefore ln x = (ln 2)(log2 x)
+            (HLG_A * std::f64::consts::LN_2) as f32 * log + HLG_C as f32
+        };
+        *s = y.copysign(*s);
+    }
+}
+
+/// Converts HLG signal to scene-referred linear sample.
+///
+/// This version uses `fast_pow2f` to apply logarithmic function.
+// Max error: ~5e-6
+pub fn hlg_to_scene(samples: &mut [f32]) {
+    for s in samples {
+        let a = s.abs();
+        let y = if a <= 0.5 {
+            a * a / 3.0
+        } else {
+            const POW: f32 = (std::f64::consts::LOG2_E / HLG_A) as f32;
+            const ADD: f32 = (HLG_B / 12.0) as f32;
+            // TODO(OneDeuxTriSeiGo): replace raw constant with the below equation
+            // when std::f64::exp() can is available as a const fn.
+            //
+            // Equation: ((-HLG_B / HLG_A).exp() / 12.0)
+            // Constant: 0.003_639_807_079_052_639
+            const MUL: f32 = 0.003_639_807;
+
+            // TODO(OneDeuxTriSeiGo): maybe use mul_add?
+            crate::util::fast_pow2f(a * POW) * MUL + ADD
+        };
+        *s = y.copysign(*s);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    fn arb_samples(
+        u: &mut arbtest::arbitrary::Unstructured,
+    ) -> arbtest::arbitrary::Result<Vec<f32>> {
+        const DENOM: u32 = 1 << 24;
+
+        let mut samples = Vec::new();
+
+        // uniform distribution in [-1.0, 1.0]
+        while !u.is_empty() {
+            let a: u32 = u.int_in_range(0..=DENOM)?;
+            let signed: bool = u.arbitrary()?;
+            let x = a as f32 / DENOM as f32;
+            samples.push(if signed { -x } else { x });
+        }
+
+        Ok(samples)
+    }
+
+    /// Naive linear to sRGB using actual pow for testing.
+    fn linear_to_srgb_naive(samples: &mut [f32]) {
+        for x in samples {
+            // Sign-extended sRGB: apply curve to abs, restore sign.
+            let a = x.abs();
+            let v = if a <= 0.0031308 {
+                a * 12.92
+            } else {
+                a.powf(1.0 / 2.4).mul_add(1.055, -0.055)
+            };
+            *x = v.copysign(*x);
+        }
+    }
+
+    /// Naive linear to BT.709 using actual pow for testing.
+    fn linear_to_bt709_naive(samples: &mut [f32]) {
+        for x in samples {
+            // ICC type 3: linear segment for all x < threshold (including negatives)
+            *x = if *x <= 0.018 {
+                *x * 4.5
+            } else {
+                (*x).powf(0.45).mul_add(1.099, -0.099)
+            };
+        }
+    }
+
+    #[test]
+    fn srgb_roundtrip_arb() {
+        arbtest::arbtest(|u| {
+            let samples = arb_samples(u)?;
+            let mut output = samples.clone();
+
+            linear_to_srgb_simd(jxl_simd::ScalarDescriptor::new().unwrap(), &mut output);
+            srgb_to_linear(&mut output);
+            assert_all_almost_abs_eq(&output, &samples, 2e-6);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn bt709_roundtrip_arb() {
+        arbtest::arbtest(|u| {
+            let samples = arb_samples(u)?;
+            let mut output = samples.clone();
+
+            linear_to_bt709_simd(jxl_simd::ScalarDescriptor::new().unwrap(), &mut output);
+            bt709_to_linear(&mut output);
+            assert_all_almost_abs_eq(&output, &samples, 5e-6);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn linear_to_srgb_simd_arb() {
+        arbtest::arbtest(|u| {
+            let mut samples = arb_samples(u)?;
+            let mut simd = samples.clone();
+
+            linear_to_srgb_naive(&mut samples);
+            linear_to_srgb_simd(jxl_simd::ScalarDescriptor::new().unwrap(), &mut simd);
+            assert_all_almost_abs_eq(&samples, &simd, 1e-6);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn linear_to_bt709_simd_arb() {
+        arbtest::arbtest(|u| {
+            let mut samples = arb_samples(u)?;
+            let mut simd = samples.clone();
+
+            linear_to_bt709_naive(&mut samples);
+            linear_to_bt709_simd(jxl_simd::ScalarDescriptor::new().unwrap(), &mut simd);
+            assert_all_almost_abs_eq(&samples, &simd, 1e-6);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn linear_to_pq_arb() {
+        arbtest::arbtest(|u| {
+            let intensity_target = u.int_in_range(9900..=10100)? as f32;
+            let mut samples = arb_samples(u)?;
+            let mut precise = samples.clone();
+
+            linear_to_pq(intensity_target, &mut samples);
+            linear_to_pq_precise(intensity_target, &mut precise);
+            // Error seems to increase at intensity_target < 10000
+            assert_all_almost_abs_eq(&samples, &precise, 8e-7);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn pq_to_linear_arb() {
+        arbtest::arbtest(|u| {
+            let intensity_target = u.int_in_range(9900..=10100)? as f32;
+            let mut samples = arb_samples(u)?;
+            let mut precise = samples.clone();
+
+            pq_to_linear(intensity_target, &mut samples);
+            pq_to_linear_precise(intensity_target, &mut precise);
+            assert_all_almost_abs_eq(&samples, &precise, 3e-6);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn bt709_to_linear_simd_arb() {
+        arbtest::arbtest(|u| {
+            let mut samples = arb_samples(u)?;
+            let mut simd = samples.clone();
+            let xsize = samples.len();
+
+            bt709_to_linear(&mut samples);
+            bt709_to_linear_simd(jxl_simd::ScalarDescriptor::new().unwrap(), xsize, &mut simd);
+            assert_all_almost_abs_eq(&samples, &simd, 1e-5);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn pq_to_linear_simd_arb() {
+        arbtest::arbtest(|u| {
+            let intensity_target = u.int_in_range(9900..=10100)? as f32;
+            let mut samples = arb_samples(u)?;
+            let mut simd = samples.clone();
+            let xsize = samples.len();
+
+            pq_to_linear(intensity_target, &mut samples);
+            pq_to_linear_simd(
+                jxl_simd::ScalarDescriptor::new().unwrap(),
+                intensity_target,
+                xsize,
+                &mut simd,
+            );
+            assert_all_almost_abs_eq(&samples, &simd, 2e-5);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn linear_to_pq_simd_arb() {
+        arbtest::arbtest(|u| {
+            let intensity_target = u.int_in_range(9900..=10100)? as f32;
+            let mut samples = arb_samples(u)?;
+            let mut simd = samples.clone();
+            let xsize = samples.len();
+
+            linear_to_pq(intensity_target, &mut samples);
+            linear_to_pq_simd(
+                jxl_simd::ScalarDescriptor::new().unwrap(),
+                intensity_target,
+                xsize,
+                &mut simd,
+            );
+            assert_all_almost_abs_eq(&samples, &simd, 2e-5);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn hlg_ootf_arb() {
+        arbtest::arbtest(|u| {
+            let intensity_target = u.int_in_range(900..=1100)? as f32;
+
+            let lr = 0.2 + u.int_in_range(0..=255)? as f32 / 255.0;
+            let lb = 0.2 + u.int_in_range(0..=255)? as f32 / 255.0;
+            let lg = 1.0 - lr - lb;
+            let luminance_rgb = [lr, lg, lb];
+
+            let r = u.int_in_range(0u32..=(1 << 24))? as f32 / (1 << 24) as f32;
+            let g = u.int_in_range(0u32..=(1 << 24))? as f32 / (1 << 24) as f32;
+            let b = u.int_in_range(0u32..=(1 << 24))? as f32 / (1 << 24) as f32;
+
+            let mut fast_r = r;
+            let mut fast_g = g;
+            let mut fast_b = b;
+            let fast = [
+                std::slice::from_mut(&mut fast_r),
+                std::slice::from_mut(&mut fast_g),
+                std::slice::from_mut(&mut fast_b),
+            ];
+            hlg_display_to_scene(intensity_target, luminance_rgb, fast);
+
+            let mut precise_r = r;
+            let mut precise_g = g;
+            let mut precise_b = b;
+            let precise = [
+                std::slice::from_mut(&mut precise_r),
+                std::slice::from_mut(&mut precise_g),
+                std::slice::from_mut(&mut precise_b),
+            ];
+            hlg_display_to_scene(intensity_target, luminance_rgb, precise);
+
+            assert_all_almost_abs_eq(
+                &[fast_r, fast_g, fast_b],
+                &[precise_r, precise_g, precise_b],
+                7.2e-7,
+            );
+
+            let mut fast_r = r;
+            let mut fast_g = g;
+            let mut fast_b = b;
+            let fast = [
+                std::slice::from_mut(&mut fast_r),
+                std::slice::from_mut(&mut fast_g),
+                std::slice::from_mut(&mut fast_b),
+            ];
+            hlg_scene_to_display(intensity_target, luminance_rgb, fast);
+
+            let mut precise_r = r;
+            let mut precise_g = g;
+            let mut precise_b = b;
+            let precise = [
+                std::slice::from_mut(&mut precise_r),
+                std::slice::from_mut(&mut precise_g),
+                std::slice::from_mut(&mut precise_b),
+            ];
+            hlg_scene_to_display(intensity_target, luminance_rgb, precise);
+
+            assert_all_almost_abs_eq(
+                &[fast_r, fast_g, fast_b],
+                &[precise_r, precise_g, precise_b],
+                7.2e-7,
+            );
+
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn scene_to_hlg_arb() {
+        arbtest::arbtest(|u| {
+            let mut samples = arb_samples(u)?;
+            let mut precise = samples.clone();
+
+            scene_to_hlg(&mut samples);
+            scene_to_hlg_precise(&mut precise);
+            assert_all_almost_abs_eq(&samples, &precise, 5e-7);
+            Ok(())
+        });
+    }
+
+    #[test]
+    fn hlg_to_scene_arb() {
+        arbtest::arbtest(|u| {
+            let mut samples = arb_samples(u)?;
+            let mut precise = samples.clone();
+
+            hlg_to_scene(&mut samples);
+            hlg_to_scene_precise(&mut precise);
+            assert_all_almost_abs_eq(&samples, &precise, 5e-6);
+            Ok(())
+        });
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/container/box_header.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/box_header.rs
new file mode 100644
index 00000000..22bcc75c
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/box_header.rs
@@ -0,0 +1,114 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// Originally written for jxl-oxide.
+
+use crate::error::Error;
+
+/// Box header used in JPEG XL containers.
+#[derive(Debug, Clone)]
+pub struct ContainerBoxHeader {
+    ty: ContainerBoxType,
+    box_size: Option<u64>,
+    is_last: bool,
+}
+
+pub enum HeaderParseResult {
+    Done {
+        header: ContainerBoxHeader,
+        header_size: usize,
+    },
+    NeedMoreData,
+}
+
+impl ContainerBoxHeader {
+    pub(super) fn parse(buf: &[u8]) -> Result<HeaderParseResult, Error> {
+        let (tbox, box_size, header_size) = match *buf {
+            [
+                0,
+                0,
+                0,
+                1,
+                t0,
+                t1,
+                t2,
+                t3,
+                s0,
+                s1,
+                s2,
+                s3,
+                s4,
+                s5,
+                s6,
+                s7,
+                ..,
+            ] => {
+                let xlbox = u64::from_be_bytes([s0, s1, s2, s3, s4, s5, s6, s7]);
+                let tbox = ContainerBoxType([t0, t1, t2, t3]);
+                let xlbox = xlbox.checked_sub(16).ok_or(Error::InvalidBox)?;
+                (tbox, Some(xlbox), 16)
+            }
+            [s0, s1, s2, s3, t0, t1, t2, t3, ..] => {
+                let sbox = u32::from_be_bytes([s0, s1, s2, s3]);
+                let tbox = ContainerBoxType([t0, t1, t2, t3]);
+                let sbox = if sbox == 0 {
+                    None
+                } else if let Some(sbox) = sbox.checked_sub(8) {
+                    Some(sbox as u64)
+                } else {
+                    return Err(Error::InvalidBox);
+                };
+                (tbox, sbox, 8)
+            }
+            _ => return Ok(HeaderParseResult::NeedMoreData),
+        };
+        let is_last = box_size.is_none();
+
+        let header = Self {
+            ty: tbox,
+            box_size,
+            is_last,
+        };
+        Ok(HeaderParseResult::Done {
+            header,
+            header_size,
+        })
+    }
+}
+
+impl ContainerBoxHeader {
+    #[inline]
+    pub fn box_type(&self) -> ContainerBoxType {
+        self.ty
+    }
+
+    #[inline]
+    pub fn box_size(&self) -> Option<u64> {
+        self.box_size
+    }
+
+    #[inline]
+    pub fn is_last(&self) -> bool {
+        self.is_last
+    }
+}
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub struct ContainerBoxType(pub [u8; 4]);
+
+impl ContainerBoxType {
+    pub const JXL: Self = Self(*b"JXL ");
+    pub const FILE_TYPE: Self = Self(*b"ftyp");
+    pub const JXL_LEVEL: Self = Self(*b"jxll");
+    pub const JUMBF: Self = Self(*b"jumb");
+    pub const EXIF: Self = Self(*b"Exif");
+    pub const XML: Self = Self(*b"xml ");
+    pub const BROTLI_COMPRESSED: Self = Self(*b"brob");
+    pub const FRAME_INDEX: Self = Self(*b"jxli");
+    pub const CODESTREAM: Self = Self(*b"jxlc");
+    pub const PARTIAL_CODESTREAM: Self = Self(*b"jxlp");
+    pub const JPEG_RECONSTRUCTION: Self = Self(*b"jbrd");
+    pub const GAIN_MAP: Self = Self(*b"jhgm");
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/container/frame_index.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/frame_index.rs
new file mode 100644
index 00000000..8a81b028
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/frame_index.rs
@@ -0,0 +1,236 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Parser for the JPEG XL Frame Index box (`jxli`), as specified in
+//! the JPEG XL container specification.
+//!
+//! The frame index box provides a seek table for animated JXL files,
+//! listing keyframe byte offsets in the codestream, timestamps, and
+//! frame counts.
+
+use std::num::NonZero;
+
+use byteorder::{BigEndian, ReadBytesExt};
+
+use crate::error::{Error, Result};
+use crate::icc::read_varint_from_reader;
+use crate::util::NewWithCapacity;
+
+/// A single entry in the frame index.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct FrameIndexEntry {
+    /// Absolute byte offset of this keyframe in the codestream.
+    /// (Accumulated from the delta-coded OFFi values.)
+    pub codestream_offset: u64,
+    /// Duration in ticks from this indexed frame to the next indexed frame
+    /// (or end of stream for the last entry). A tick lasts TNUM/TDEN seconds.
+    pub duration_ticks: u64,
+    /// Number of displayed frames from this indexed frame to the next indexed
+    /// frame (or end of stream for the last entry).
+    pub frame_count: u64,
+}
+
+/// Parsed contents of a Frame Index box (`jxli`).
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct FrameIndexBox {
+    /// Tick numerator. A tick lasts `tnum / tden` seconds.
+    pub tnum: u32,
+    /// Tick denominator (non-zero per spec).
+    pub tden: NonZero<u32>,
+    /// Indexed frame entries.
+    pub entries: Vec<FrameIndexEntry>,
+}
+
+impl FrameIndexBox {
+    /// Returns the number of indexed frames.
+    pub fn num_frames(&self) -> usize {
+        self.entries.len()
+    }
+
+    /// Returns the duration of one tick in seconds.
+    pub fn tick_duration_secs(&self) -> f64 {
+        self.tnum as f64 / self.tden.get() as f64
+    }
+
+    /// Finds the index entry for the keyframe at or before the given
+    /// codestream byte offset.
+    pub fn entry_for_offset(&self, offset: u64) -> Option<&FrameIndexEntry> {
+        // Entries are sorted by codestream_offset (monotonically increasing).
+        match self
+            .entries
+            .binary_search_by_key(&offset, |e| e.codestream_offset)
+        {
+            Ok(i) => Some(&self.entries[i]),
+            Err(0) => None,
+            Err(i) => Some(&self.entries[i - 1]),
+        }
+    }
+
+    /// Parse a frame index box from its raw content bytes (after the box header).
+    pub fn parse(data: &[u8]) -> Result<Self> {
+        let mut reader = data;
+
+        let nf = read_varint_from_reader(&mut reader)?;
+        if nf > u32::MAX as u64 {
+            return Err(Error::InvalidBox);
+        }
+        let nf = nf as usize;
+
+        let tnum = reader
+            .read_u32::<BigEndian>()
+            .map_err(|_| Error::InvalidBox)?;
+        let tden = NonZero::new(
+            reader
+                .read_u32::<BigEndian>()
+                .map_err(|_| Error::InvalidBox)?,
+        )
+        .ok_or(Error::InvalidBox)?;
+
+        // Each entry requires at least 3 bytes (three varints, min 1 byte each).
+        // Cap the pre-allocation to avoid OOM from a crafted NF value.
+        // Use new_with_capacity to return Err on allocation failure instead of aborting.
+        let mut entries = Vec::new_with_capacity(nf.min(reader.len() / 3))?;
+        let mut absolute_offset: u64 = 0;
+
+        for _ in 0..nf {
+            let off_delta = read_varint_from_reader(&mut reader)?;
+            let duration_ticks = read_varint_from_reader(&mut reader)?;
+            let frame_count = read_varint_from_reader(&mut reader)?;
+
+            absolute_offset = absolute_offset
+                .checked_add(off_delta)
+                .ok_or(Error::InvalidBox)?;
+
+            entries.push(FrameIndexEntry {
+                codestream_offset: absolute_offset,
+                duration_ticks,
+                frame_count,
+            });
+        }
+
+        Ok(FrameIndexBox {
+            tnum,
+            tden,
+            entries,
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::util::test::{build_frame_index_content, encode_varint};
+
+    fn build_frame_index(tnum: u32, tden: u32, entries: &[(u64, u64, u64)]) -> Vec<u8> {
+        build_frame_index_content(tnum, tden, entries)
+    }
+
+    #[test]
+    fn test_parse_empty_index() {
+        let data = build_frame_index(1, 1000, &[]);
+        let index = FrameIndexBox::parse(&data).unwrap();
+        assert_eq!(index.num_frames(), 0);
+        assert_eq!(index.tnum, 1);
+        assert_eq!(index.tden.get(), 1000);
+    }
+
+    #[test]
+    fn test_parse_single_entry() {
+        // One frame at offset 0, duration 100 ticks, 1 frame
+        let data = build_frame_index(1, 1000, &[(0, 100, 1)]);
+        let index = FrameIndexBox::parse(&data).unwrap();
+        assert_eq!(index.num_frames(), 1);
+        assert_eq!(
+            index.entries[0],
+            FrameIndexEntry {
+                codestream_offset: 0,
+                duration_ticks: 100,
+                frame_count: 1,
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_multiple_entries_delta_coding() {
+        // Three frames with delta-coded offsets:
+        //   OFF0=100 (absolute: 100), T0=50, F0=2
+        //   OFF1=200 (absolute: 300), T1=50, F1=2
+        //   OFF2=150 (absolute: 450), T2=30, F2=1
+        let data = build_frame_index(1, 1000, &[(100, 50, 2), (200, 50, 2), (150, 30, 1)]);
+        let index = FrameIndexBox::parse(&data).unwrap();
+        assert_eq!(index.num_frames(), 3);
+        assert_eq!(index.entries[0].codestream_offset, 100);
+        assert_eq!(index.entries[1].codestream_offset, 300);
+        assert_eq!(index.entries[2].codestream_offset, 450);
+        assert_eq!(index.entries[0].duration_ticks, 50);
+        assert_eq!(index.entries[1].duration_ticks, 50);
+        assert_eq!(index.entries[2].duration_ticks, 30);
+    }
+
+    #[test]
+    fn test_parse_large_varint() {
+        // Test with a value that requires multiple varint bytes
+        let mut data = Vec::new();
+        data.extend(encode_varint(1)); // NF = 1
+        data.extend(1u32.to_be_bytes()); // TNUM
+        data.extend(1000u32.to_be_bytes()); // TDEN
+        data.extend(encode_varint(0x1234_5678_9ABC)); // large offset
+        data.extend(encode_varint(42));
+        data.extend(encode_varint(1));
+        let index = FrameIndexBox::parse(&data).unwrap();
+        assert_eq!(index.entries[0].codestream_offset, 0x1234_5678_9ABC);
+    }
+
+    #[test]
+    fn test_entry_for_offset() {
+        let data = build_frame_index(1, 1000, &[(100, 50, 2), (200, 50, 2), (150, 30, 1)]);
+        let index = FrameIndexBox::parse(&data).unwrap();
+        // Absolute offsets: 100, 300, 450
+
+        // Before first entry
+        assert!(index.entry_for_offset(50).is_none());
+        // Exact match
+        assert_eq!(index.entry_for_offset(100).unwrap().codestream_offset, 100);
+        // Between entries
+        assert_eq!(index.entry_for_offset(200).unwrap().codestream_offset, 100);
+        assert_eq!(index.entry_for_offset(350).unwrap().codestream_offset, 300);
+        // Exact match on last
+        assert_eq!(index.entry_for_offset(450).unwrap().codestream_offset, 450);
+        // Past last
+        assert_eq!(index.entry_for_offset(999).unwrap().codestream_offset, 450);
+    }
+
+    #[test]
+    fn test_zero_tden_rejected() {
+        let data = build_frame_index(1, 0, &[]);
+        assert!(FrameIndexBox::parse(&data).is_err());
+    }
+
+    #[test]
+    fn test_truncated_data() {
+        // Just NF=1, no TNUM/TDEN
+        let data = encode_varint(1);
+        assert!(FrameIndexBox::parse(&data).is_err());
+    }
+
+    #[test]
+    fn test_huge_nf_no_oom() {
+        // Crafted input: NF claims billions of entries but the data is tiny.
+        // This must not OOM -- Vec::with_capacity should be bounded by data length.
+        let mut data = Vec::new();
+        data.extend(encode_varint(u32::MAX as u64)); // NF = 4 billion
+        data.extend(1u32.to_be_bytes()); // TNUM
+        data.extend(1000u32.to_be_bytes()); // TDEN
+        // No actual entry data -- parse should fail gracefully, not OOM.
+        assert!(FrameIndexBox::parse(&data).is_err());
+    }
+
+    #[test]
+    fn test_tick_duration() {
+        let data = build_frame_index(1, 1000, &[]);
+        let index = FrameIndexBox::parse(&data).unwrap();
+        assert!((index.tick_duration_secs() - 0.001).abs() < 1e-9);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/container/gain_map.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/gain_map.rs
new file mode 100644
index 00000000..615734a0
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/gain_map.rs
@@ -0,0 +1,452 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Parser and serializer for the JPEG XL Gain Map bundle (`jhgm` box).
+//!
+//! The `jhgm` box contains an HDR gain map conforming to ISO 21496-1.
+//! In JXL, the base image is HDR and the gain map maps HDR to SDR
+//! (inverse direction from JPEG/AVIF).
+//!
+//! The gain map codestream is a bare JXL codestream (no container wrapper).
+//! The ISO 21496-1 metadata blob is stored as raw bytes for the caller
+//! to parse (e.g., via ultrahdr-core).
+
+use crate::error::{Error, Result};
+
+/// Current version of the gain map bundle format.
+const JHGM_VERSION: u8 = 0x00;
+
+/// Parsed JXL gain map bundle from a `jhgm` container box.
+///
+/// The bundle contains the ISO 21496-1 metadata, an optional JXL
+/// ColorEncoding, an optional Brotli-compressed ICC profile for the
+/// alternate rendition, and the bare JXL codestream of the gain map image.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct GainMapBundle {
+    /// ISO 21496-1 binary metadata blob (unparsed — caller parses with ultrahdr-core).
+    pub metadata: Vec<u8>,
+    /// JXL ColorEncoding for the gain map (optional, raw bytes — JXL-native bit-packed).
+    pub color_encoding: Option<Vec<u8>>,
+    /// Brotli-compressed ICC profile for alternate rendition (optional, not decompressed).
+    pub alt_icc_compressed: Option<Vec<u8>>,
+    /// Bare JXL codestream of the gain map image (no container wrapper).
+    pub gain_map_codestream: Vec<u8>,
+}
+
+impl GainMapBundle {
+    /// Parse a gain map bundle from the raw payload of a `jhgm` box.
+    ///
+    /// Wire format:
+    /// ```text
+    /// jhgm_version:            u8       // must be 0x00
+    /// gain_map_metadata_size:  u16 BE   // size of ISO 21496-1 metadata
+    /// gain_map_metadata:       [u8; N]  // ISO 21496-1 binary metadata
+    /// color_encoding_size:     u8       // 0 = absent; else byte count
+    /// color_encoding:          [u8; M]  // JXL ColorEncoding (optional)
+    /// alt_icc_size:            u32 BE   // size of Brotli-compressed ICC
+    /// alt_icc:                 [u8; K]  // Brotli-compressed ICC (optional)
+    /// gain_map:                [u8; *]  // remaining bytes = bare JXL codestream
+    /// ```
+    pub fn parse(data: &[u8]) -> Result<Self> {
+        let mut pos = 0;
+
+        // --- version ---
+        if data.is_empty() {
+            return Err(Error::InvalidGainMap("empty jhgm box".into()));
+        }
+        let version = data[pos];
+        pos += 1;
+        if version != JHGM_VERSION {
+            return Err(Error::InvalidGainMap(format!(
+                "unsupported jhgm version: {version:#04x}, expected {JHGM_VERSION:#04x}"
+            )));
+        }
+
+        // --- gain_map_metadata_size (u16 BE) ---
+        if pos + 2 > data.len() {
+            return Err(Error::InvalidGainMap(
+                "truncated: missing metadata size".into(),
+            ));
+        }
+        let metadata_size = u16::from_be_bytes([data[pos], data[pos + 1]]) as usize;
+        pos += 2;
+
+        if pos + metadata_size > data.len() {
+            return Err(Error::InvalidGainMap(format!(
+                "truncated: metadata size {metadata_size} exceeds remaining {} bytes",
+                data.len() - pos
+            )));
+        }
+        let metadata = data[pos..pos + metadata_size].to_vec();
+        pos += metadata_size;
+
+        // --- color_encoding_size (u8) ---
+        if pos >= data.len() {
+            return Err(Error::InvalidGainMap(
+                "truncated: missing color_encoding_size".into(),
+            ));
+        }
+        let color_encoding_size = data[pos] as usize;
+        pos += 1;
+
+        let color_encoding = if color_encoding_size == 0 {
+            None
+        } else {
+            if pos + color_encoding_size > data.len() {
+                return Err(Error::InvalidGainMap(format!(
+                    "truncated: color_encoding size {color_encoding_size} exceeds remaining {} bytes",
+                    data.len() - pos
+                )));
+            }
+            let ce = data[pos..pos + color_encoding_size].to_vec();
+            pos += color_encoding_size;
+            Some(ce)
+        };
+
+        // --- alt_icc_size (u32 BE) ---
+        if pos + 4 > data.len() {
+            return Err(Error::InvalidGainMap(
+                "truncated: missing alt_icc_size".into(),
+            ));
+        }
+        let alt_icc_size =
+            u32::from_be_bytes([data[pos], data[pos + 1], data[pos + 2], data[pos + 3]]) as usize;
+        pos += 4;
+
+        let alt_icc_compressed = if alt_icc_size == 0 {
+            None
+        } else {
+            if pos + alt_icc_size > data.len() {
+                return Err(Error::InvalidGainMap(format!(
+                    "truncated: alt_icc size {alt_icc_size} exceeds remaining {} bytes",
+                    data.len() - pos
+                )));
+            }
+            let icc = data[pos..pos + alt_icc_size].to_vec();
+            pos += alt_icc_size;
+            Some(icc)
+        };
+
+        // --- gain_map codestream (remainder) ---
+        let gain_map_codestream = data[pos..].to_vec();
+
+        Ok(GainMapBundle {
+            metadata,
+            color_encoding,
+            alt_icc_compressed,
+            gain_map_codestream,
+        })
+    }
+
+    /// Serialize a gain map bundle to the wire format used inside a `jhgm` box.
+    ///
+    /// Returns the raw bytes that form the payload of a `jhgm` container box.
+    pub fn serialize(&self) -> Vec<u8> {
+        let metadata_size = self.metadata.len();
+        let color_encoding_size = self.color_encoding.as_ref().map_or(0, |v| v.len());
+        let alt_icc_size = self.alt_icc_compressed.as_ref().map_or(0, |v| v.len());
+
+        // Pre-allocate: version(1) + meta_size(2) + meta(N) + ce_size(1) + ce(M)
+        //             + icc_size(4) + icc(K) + codestream
+        let total = 1
+            + 2
+            + metadata_size
+            + 1
+            + color_encoding_size
+            + 4
+            + alt_icc_size
+            + self.gain_map_codestream.len();
+        let mut buf = Vec::with_capacity(total);
+
+        // version
+        buf.push(JHGM_VERSION);
+
+        // gain_map_metadata_size + metadata
+        // Truncate to u16::MAX if somehow larger (shouldn't happen in practice)
+        let meta_len = metadata_size.min(u16::MAX as usize) as u16;
+        buf.extend_from_slice(&meta_len.to_be_bytes());
+        buf.extend_from_slice(&self.metadata[..meta_len as usize]);
+
+        // color_encoding_size + color_encoding
+        // Truncate to u8::MAX if somehow larger
+        let ce_len = color_encoding_size.min(u8::MAX as usize) as u8;
+        buf.push(ce_len);
+        if let Some(ref ce) = self.color_encoding {
+            buf.extend_from_slice(&ce[..ce_len as usize]);
+        }
+
+        // alt_icc_size + alt_icc
+        let icc_len = alt_icc_size.min(u32::MAX as usize) as u32;
+        buf.extend_from_slice(&icc_len.to_be_bytes());
+        if let Some(ref icc) = self.alt_icc_compressed {
+            buf.extend_from_slice(&icc[..icc_len as usize]);
+        }
+
+        // gain_map codestream
+        buf.extend_from_slice(&self.gain_map_codestream);
+
+        buf
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Build a minimal valid jhgm bundle by hand.
+    fn build_minimal_bundle(
+        metadata: &[u8],
+        color_encoding: Option<&[u8]>,
+        alt_icc: Option<&[u8]>,
+        gain_map: &[u8],
+    ) -> Vec<u8> {
+        let mut buf = Vec::new();
+        // version
+        buf.push(0x00);
+        // metadata size + metadata
+        buf.extend_from_slice(&(metadata.len() as u16).to_be_bytes());
+        buf.extend_from_slice(metadata);
+        // color_encoding_size + color_encoding
+        match color_encoding {
+            None => buf.push(0),
+            Some(ce) => {
+                buf.push(ce.len() as u8);
+                buf.extend_from_slice(ce);
+            }
+        }
+        // alt_icc_size + alt_icc
+        match alt_icc {
+            None => buf.extend_from_slice(&0u32.to_be_bytes()),
+            Some(icc) => {
+                buf.extend_from_slice(&(icc.len() as u32).to_be_bytes());
+                buf.extend_from_slice(icc);
+            }
+        }
+        // gain_map codestream
+        buf.extend_from_slice(gain_map);
+        buf
+    }
+
+    #[test]
+    fn test_parse_minimal_bundle() {
+        let metadata = b"\x01\x02\x03";
+        let gain_map = b"\xff\x0a"; // fake codestream signature bytes
+        let data = build_minimal_bundle(metadata, None, None, gain_map);
+
+        let bundle = GainMapBundle::parse(&data).unwrap();
+        assert_eq!(bundle.metadata, metadata);
+        assert!(bundle.color_encoding.is_none());
+        assert!(bundle.alt_icc_compressed.is_none());
+        assert_eq!(bundle.gain_map_codestream, gain_map);
+    }
+
+    #[test]
+    fn test_parse_full_bundle() {
+        let metadata = b"ISO21496-1 test metadata blob";
+        let color_encoding = b"\xAA\xBB\xCC\xDD";
+        let alt_icc = b"brotli-compressed-icc-data-here";
+        let gain_map = b"\xff\x0a\x00\x01\x02\x03\x04\x05";
+
+        let data = build_minimal_bundle(metadata, Some(color_encoding), Some(alt_icc), gain_map);
+
+        let bundle = GainMapBundle::parse(&data).unwrap();
+        assert_eq!(bundle.metadata.as_slice(), metadata.as_slice());
+        assert_eq!(
+            bundle.color_encoding.as_deref(),
+            Some(color_encoding.as_slice())
+        );
+        assert_eq!(
+            bundle.alt_icc_compressed.as_deref(),
+            Some(alt_icc.as_slice())
+        );
+        assert_eq!(bundle.gain_map_codestream.as_slice(), gain_map.as_slice());
+    }
+
+    #[test]
+    fn test_roundtrip_minimal() {
+        let original = GainMapBundle {
+            metadata: vec![0x10, 0x20, 0x30],
+            color_encoding: None,
+            alt_icc_compressed: None,
+            gain_map_codestream: vec![0xFF, 0x0A, 0x00],
+        };
+        let serialized = original.serialize();
+        let parsed = GainMapBundle::parse(&serialized).unwrap();
+        assert_eq!(original, parsed);
+    }
+
+    #[test]
+    fn test_roundtrip_full() {
+        let original = GainMapBundle {
+            metadata: vec![0x01; 100],
+            color_encoding: Some(vec![0xAA, 0xBB, 0xCC]),
+            alt_icc_compressed: Some(vec![0xDD; 256]),
+            gain_map_codestream: vec![0xFF, 0x0A, 0x00, 0x01, 0x02],
+        };
+        let serialized = original.serialize();
+        let parsed = GainMapBundle::parse(&serialized).unwrap();
+        assert_eq!(original, parsed);
+    }
+
+    #[test]
+    fn test_roundtrip_empty_gain_map() {
+        // Edge case: gain map codestream is empty (degenerate but parse should handle it)
+        let original = GainMapBundle {
+            metadata: vec![0x42],
+            color_encoding: None,
+            alt_icc_compressed: None,
+            gain_map_codestream: vec![],
+        };
+        let serialized = original.serialize();
+        let parsed = GainMapBundle::parse(&serialized).unwrap();
+        assert_eq!(original, parsed);
+    }
+
+    #[test]
+    fn test_error_empty_data() {
+        let result = GainMapBundle::parse(&[]);
+        assert!(result.is_err());
+        let err = result.unwrap_err().to_string();
+        assert!(err.contains("empty"), "unexpected error: {err}");
+    }
+
+    #[test]
+    fn test_error_wrong_version() {
+        let mut data = build_minimal_bundle(b"\x01", None, None, b"\xff");
+        data[0] = 0x01; // wrong version
+        let result = GainMapBundle::parse(&data);
+        assert!(result.is_err());
+        let err = result.unwrap_err().to_string();
+        assert!(err.contains("version"), "unexpected error: {err}");
+    }
+
+    #[test]
+    fn test_error_truncated_metadata_size() {
+        // Just version byte, no metadata size
+        let result = GainMapBundle::parse(&[0x00]);
+        assert!(result.is_err());
+        let err = result.unwrap_err().to_string();
+        assert!(err.contains("truncated"), "unexpected error: {err}");
+    }
+
+    #[test]
+    fn test_error_metadata_exceeds_data() {
+        // Version + metadata_size=1000 but only 2 bytes of actual metadata
+        let mut data = vec![0x00]; // version
+        data.extend_from_slice(&1000u16.to_be_bytes()); // metadata size = 1000
+        data.extend_from_slice(&[0x01, 0x02]); // only 2 bytes
+        let result = GainMapBundle::parse(&data);
+        assert!(result.is_err());
+        let err = result.unwrap_err().to_string();
+        assert!(err.contains("truncated"), "unexpected error: {err}");
+    }
+
+    #[test]
+    fn test_error_truncated_color_encoding_size() {
+        // Version + valid metadata but no color_encoding_size byte
+        let mut data = vec![0x00]; // version
+        data.extend_from_slice(&0u16.to_be_bytes()); // metadata size = 0
+        // missing color_encoding_size
+        let result = GainMapBundle::parse(&data);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_error_truncated_color_encoding() {
+        // color_encoding_size says 10 bytes but only 3 available
+        let mut data = vec![0x00]; // version
+        data.extend_from_slice(&0u16.to_be_bytes()); // metadata size = 0
+        data.push(10); // color_encoding_size = 10
+        data.extend_from_slice(&[0x01, 0x02, 0x03]); // only 3 bytes
+        let result = GainMapBundle::parse(&data);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_error_truncated_alt_icc_size() {
+        // Valid up to color_encoding but missing alt_icc_size
+        let mut data = vec![0x00]; // version
+        data.extend_from_slice(&0u16.to_be_bytes()); // metadata size = 0
+        data.push(0); // color_encoding_size = 0
+        // missing alt_icc_size (needs 4 bytes)
+        data.push(0x01); // only 1 byte
+        let result = GainMapBundle::parse(&data);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_error_alt_icc_exceeds_data() {
+        let mut data = vec![0x00]; // version
+        data.extend_from_slice(&0u16.to_be_bytes()); // metadata size = 0
+        data.push(0); // color_encoding_size = 0
+        data.extend_from_slice(&500u32.to_be_bytes()); // alt_icc_size = 500
+        data.extend_from_slice(&[0xAA; 10]); // only 10 bytes
+        let result = GainMapBundle::parse(&data);
+        assert!(result.is_err());
+        let err = result.unwrap_err().to_string();
+        assert!(err.contains("truncated"), "unexpected error: {err}");
+    }
+
+    #[test]
+    fn test_large_metadata() {
+        // Metadata near u16::MAX
+        let metadata = vec![0x42; 60_000];
+        let gain_map = vec![0xFF, 0x0A];
+        let original = GainMapBundle {
+            metadata,
+            color_encoding: None,
+            alt_icc_compressed: None,
+            gain_map_codestream: gain_map,
+        };
+        let serialized = original.serialize();
+        let parsed = GainMapBundle::parse(&serialized).unwrap();
+        assert_eq!(original, parsed);
+    }
+
+    #[test]
+    fn test_large_alt_icc() {
+        // Large ICC profile
+        let alt_icc = vec![0xDD; 100_000];
+        let original = GainMapBundle {
+            metadata: vec![0x01],
+            color_encoding: None,
+            alt_icc_compressed: Some(alt_icc),
+            gain_map_codestream: vec![0xFF, 0x0A],
+        };
+        let serialized = original.serialize();
+        let parsed = GainMapBundle::parse(&serialized).unwrap();
+        assert_eq!(original, parsed);
+    }
+
+    /// Test that building a jhgm box (header + payload) and extracting the payload
+    /// round-trips correctly. This simulates what the container parser does.
+    #[test]
+    fn test_box_level_roundtrip() {
+        let bundle = GainMapBundle {
+            metadata: vec![0x01, 0x02],
+            color_encoding: Some(vec![0xAA]),
+            alt_icc_compressed: Some(vec![0xBB, 0xCC]),
+            gain_map_codestream: vec![0xFF, 0x0A, 0x00],
+        };
+
+        // Serialize the bundle payload
+        let payload = bundle.serialize();
+
+        // Build a complete jhgm box: [u32 BE size][b"jhgm"][payload]
+        let box_size = (8 + payload.len()) as u32;
+        let mut jhgm_box = Vec::new();
+        jhgm_box.extend_from_slice(&box_size.to_be_bytes());
+        jhgm_box.extend_from_slice(b"jhgm");
+        jhgm_box.extend_from_slice(&payload);
+
+        // Verify the box header
+        assert_eq!(&jhgm_box[4..8], b"jhgm");
+
+        // Extract payload from box and re-parse
+        let extracted_payload = &jhgm_box[8..];
+        let parsed = GainMapBundle::parse(extracted_payload).unwrap();
+        assert_eq!(bundle, parsed);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/container/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/mod.rs
new file mode 100644
index 00000000..808e3ba5
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/mod.rs
@@ -0,0 +1,202 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// Originally written for jxl-oxide.
+
+// Container box parsing (box_header, parse) is used only by tests and
+// the ContainerParser below.  frame_index and gain_map are production.
+#[allow(dead_code)]
+pub mod box_header;
+pub mod frame_index;
+pub mod gain_map;
+#[allow(dead_code)]
+pub mod parse;
+
+#[allow(dead_code)]
+use box_header::*;
+#[allow(dead_code)]
+use parse::*;
+
+/// Container format parser.
+///
+/// Currently used only from tests (`collect_codestream` helper) but kept
+/// as public infrastructure for future streaming/container-level decoding.
+#[allow(dead_code)]
+#[derive(Debug, Default)]
+pub struct ContainerParser {
+    state: DetectState,
+    jxlp_index_state: JxlpIndexState,
+    previous_consumed_bytes: usize,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Default)]
+enum DetectState {
+    #[default]
+    WaitingSignature,
+    WaitingBoxHeader,
+    WaitingJxlpIndex(ContainerBoxHeader),
+    InAuxBox {
+        #[allow(unused)]
+        header: ContainerBoxHeader,
+        bytes_left: Option<usize>,
+    },
+    InCodestream {
+        kind: BitstreamKind,
+        bytes_left: Option<usize>,
+    },
+}
+
+/// Structure of the decoded bitstream.
+#[allow(dead_code)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub enum BitstreamKind {
+    /// Decoder can't determine structure of the bitstream.
+    Unknown,
+    /// Bitstream is a direct JPEG XL codestream without box structure.
+    BareCodestream,
+    /// Bitstream is a JPEG XL container with box structure.
+    Container,
+    /// Bitstream is not a valid JPEG XL image.
+    Invalid,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Default)]
+enum JxlpIndexState {
+    #[default]
+    Initial,
+    SingleJxlc,
+    Jxlp(u32),
+    JxlpFinished,
+}
+
+#[allow(dead_code)]
+impl ContainerParser {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn kind(&self) -> BitstreamKind {
+        match self.state {
+            DetectState::WaitingSignature => BitstreamKind::Unknown,
+            DetectState::WaitingBoxHeader
+            | DetectState::WaitingJxlpIndex(..)
+            | DetectState::InAuxBox { .. } => BitstreamKind::Container,
+            DetectState::InCodestream { kind, .. } => kind,
+        }
+    }
+
+    /// Parses input buffer and generates parser events.
+    ///
+    /// The parser might not fully consume the buffer. Use [`previous_consumed_bytes`] to get how
+    /// many bytes are consumed. Bytes not consumed by the parser should be processed again.
+    ///
+    /// [`previous_consumed_bytes`]: ContainerParser::previous_consumed_bytes
+    pub fn process_bytes<'inner, 'buf>(
+        &'inner mut self,
+        input: &'buf [u8],
+    ) -> ParseEvents<'inner, 'buf> {
+        ParseEvents::new(self, input)
+    }
+
+    /// Get how many bytes are consumed by the previous call to [`process_bytes`].
+    ///
+    /// Bytes not consumed by the parser should be processed again.
+    ///
+    /// [`process_bytes`]: ContainerParser::process_bytes
+    pub fn previous_consumed_bytes(&self) -> usize {
+        self.previous_consumed_bytes
+    }
+}
+
+#[cfg(test)]
+impl ContainerParser {
+    pub(crate) fn collect_codestream(input: &[u8]) -> crate::error::Result<Vec<u8>> {
+        let mut parser = Self::new();
+        let mut codestream = Vec::new();
+        for event in parser.process_bytes(input) {
+            match event? {
+                ParseEvent::BitstreamKind(_) => {}
+                ParseEvent::Codestream(buf) => {
+                    codestream.extend_from_slice(buf);
+                }
+            }
+        }
+        Ok(codestream)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use test_log::test;
+
+    #[rustfmt::skip]
+    const HEADER: &[u8] = &[
+        0x00, 0x00, 0x00, 0x0c, b'J', b'X', b'L', b' ', 0x0d, 0x0a, 0x87, 0x0a, 0x00, 0x00, 0x00, 0x14,
+        b'f', b't', b'y', b'p', b'j', b'x', b'l', b' ', 0x00, 0x00, 0x00, 0x00, b'j', b'x', b'l', b' ',
+    ];
+
+    #[test]
+    fn parse_partial() {
+        arbtest::arbtest(|u| {
+            // Prepare arbitrary container format data with two jxlp boxes.
+            let total_len = u.arbitrary_len::<u8>()?;
+            let mut codestream0 = vec![0u8; total_len / 2];
+            u.fill_buffer(&mut codestream0)?;
+            let mut codestream1 = vec![0u8; total_len - codestream0.len()];
+            u.fill_buffer(&mut codestream1)?;
+
+            let mut container = HEADER.to_vec();
+            container.extend_from_slice(&(12 + codestream0.len() as u32).to_be_bytes());
+            container.extend_from_slice(b"jxlp\x00\x00\x00\x00");
+            container.extend_from_slice(&codestream0);
+
+            container.extend_from_slice(&(12 + codestream1.len() as u32).to_be_bytes());
+            container.extend_from_slice(b"jxlp\x80\x00\x00\x01");
+            container.extend_from_slice(&codestream1);
+
+            let mut expected = codestream0;
+            expected.extend(codestream1);
+
+            // Create a list of arbitrary splits.
+            let mut tests = Vec::new();
+            u.arbitrary_loop(Some(1), Some(10), |u| {
+                let split_at_idx = u.choose_index(container.len())?;
+                tests.push(container.split_at(split_at_idx));
+                Ok(std::ops::ControlFlow::Continue(()))
+            })?;
+
+            // Test if split index doesn't affect final codestream.
+            for (first, second) in tests {
+                let mut codestream = Vec::new();
+                let mut parser = ContainerParser::new();
+
+                for event in parser.process_bytes(first) {
+                    let event = event.unwrap();
+                    if let ParseEvent::Codestream(data) = event {
+                        codestream.extend_from_slice(data);
+                    }
+                }
+
+                let consumed = parser.previous_consumed_bytes();
+                let mut second_chunk = first[consumed..].to_vec();
+                second_chunk.extend_from_slice(second);
+
+                for event in parser.process_bytes(&second_chunk) {
+                    let event = event.unwrap();
+                    if let ParseEvent::Codestream(data) = event {
+                        codestream.extend_from_slice(data);
+                    }
+                }
+
+                assert_eq!(codestream, expected);
+            }
+
+            Ok(())
+        });
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/container/parse.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/parse.rs
new file mode 100644
index 00000000..726516d2
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/container/parse.rs
@@ -0,0 +1,273 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// Originally written for jxl-oxide.
+
+use super::{BitstreamKind, ContainerParser, DetectState, JxlpIndexState, box_header::*};
+use crate::{
+    api::{CODESTREAM_SIGNATURE, CONTAINER_SIGNATURE},
+    error::{Error, Result},
+    util::tracing_wrappers::*,
+};
+
+/// Iterator that reads over a buffer and emits parser events.
+pub struct ParseEvents<'inner, 'buf> {
+    inner: &'inner mut ContainerParser,
+    remaining_input: &'buf [u8],
+    finished: bool,
+}
+
+impl<'inner, 'buf> ParseEvents<'inner, 'buf> {
+    pub(super) fn new(parser: &'inner mut ContainerParser, input: &'buf [u8]) -> Self {
+        parser.previous_consumed_bytes = 0;
+        Self {
+            inner: parser,
+            remaining_input: input,
+            finished: false,
+        }
+    }
+
+    fn emit_single(&mut self) -> Result<Option<ParseEvent<'buf>>> {
+        let state = &mut self.inner.state;
+        let jxlp_index_state = &mut self.inner.jxlp_index_state;
+        let buf = &mut self.remaining_input;
+
+        loop {
+            if buf.is_empty() {
+                self.finished = true;
+                return Ok(None);
+            }
+
+            match state {
+                DetectState::WaitingSignature => {
+                    if buf.starts_with(&CODESTREAM_SIGNATURE) {
+                        info!("Codestream signature found");
+                        *state = DetectState::InCodestream {
+                            kind: BitstreamKind::BareCodestream,
+                            bytes_left: None,
+                        };
+                        return Ok(Some(ParseEvent::BitstreamKind(
+                            BitstreamKind::BareCodestream,
+                        )));
+                    } else if buf.starts_with(&CONTAINER_SIGNATURE) {
+                        info!("Container signature found");
+                        *state = DetectState::WaitingBoxHeader;
+                        *buf = &buf[CONTAINER_SIGNATURE.len()..];
+                        return Ok(Some(ParseEvent::BitstreamKind(BitstreamKind::Container)));
+                    } else if !CODESTREAM_SIGNATURE.starts_with(buf)
+                        && !CONTAINER_SIGNATURE.starts_with(buf)
+                    {
+                        warn!(?buf, "Invalid signature");
+                        *state = DetectState::InCodestream {
+                            kind: BitstreamKind::Invalid,
+                            bytes_left: None,
+                        };
+                        return Ok(Some(ParseEvent::BitstreamKind(BitstreamKind::Invalid)));
+                    } else {
+                        return Ok(None);
+                    }
+                }
+                DetectState::WaitingBoxHeader => match ContainerBoxHeader::parse(buf)? {
+                    HeaderParseResult::Done {
+                        header,
+                        header_size,
+                    } => {
+                        *buf = &buf[header_size..];
+                        let tbox = header.box_type();
+                        if tbox == ContainerBoxType::CODESTREAM {
+                            match jxlp_index_state {
+                                JxlpIndexState::Initial => {
+                                    *jxlp_index_state = JxlpIndexState::SingleJxlc;
+                                }
+                                JxlpIndexState::SingleJxlc => {
+                                    warn!("Duplicate jxlc box found");
+                                    return Err(Error::InvalidBox);
+                                }
+                                JxlpIndexState::Jxlp(_) | JxlpIndexState::JxlpFinished => {
+                                    warn!("Found jxlc box instead of jxlp box");
+                                    return Err(Error::InvalidBox);
+                                }
+                            }
+
+                            *state = DetectState::InCodestream {
+                                kind: BitstreamKind::Container,
+                                bytes_left: header.box_size().map(|x| x as usize),
+                            };
+                        } else if tbox == ContainerBoxType::PARTIAL_CODESTREAM {
+                            if let Some(box_size) = header.box_size()
+                                && box_size < 4
+                            {
+                                return Err(Error::InvalidBox);
+                            }
+
+                            match jxlp_index_state {
+                                JxlpIndexState::Initial => {
+                                    *jxlp_index_state = JxlpIndexState::Jxlp(0);
+                                }
+                                JxlpIndexState::Jxlp(index) => {
+                                    *index += 1;
+                                }
+                                JxlpIndexState::SingleJxlc => {
+                                    warn!("jxlp box found after jxlc box");
+                                    return Err(Error::InvalidBox);
+                                }
+                                JxlpIndexState::JxlpFinished => {
+                                    warn!("found another jxlp box after the final one");
+                                    return Err(Error::InvalidBox);
+                                }
+                            }
+
+                            *state = DetectState::WaitingJxlpIndex(header);
+                        } else {
+                            let bytes_left = header.box_size().map(|x| x as usize);
+                            *state = DetectState::InAuxBox { header, bytes_left };
+                        }
+                    }
+                    HeaderParseResult::NeedMoreData => return Ok(None),
+                },
+                DetectState::WaitingJxlpIndex(header) => {
+                    let &[b0, b1, b2, b3, ..] = &**buf else {
+                        return Ok(None);
+                    };
+
+                    let index = u32::from_be_bytes([b0, b1, b2, b3]);
+                    *buf = &buf[4..];
+                    let is_last = index & 0x80000000 != 0;
+                    let index = index & 0x7fffffff;
+
+                    match *jxlp_index_state {
+                        JxlpIndexState::Jxlp(expected_index) if expected_index == index => {
+                            if is_last {
+                                *jxlp_index_state = JxlpIndexState::JxlpFinished;
+                            }
+                        }
+                        #[allow(unused_variables)]
+                        JxlpIndexState::Jxlp(expected_index) => {
+                            warn!(
+                                expected_index,
+                                actual_index = index,
+                                "Out-of-order jxlp box found",
+                            );
+                            return Err(Error::InvalidBox);
+                        }
+                        state => {
+                            unreachable!("invalid jxlp index state in WaitingJxlpIndex: {state:?}");
+                        }
+                    }
+
+                    *state = DetectState::InCodestream {
+                        kind: BitstreamKind::Container,
+                        bytes_left: header.box_size().map(|x| x as usize - 4),
+                    };
+                }
+                DetectState::InCodestream {
+                    bytes_left: None, ..
+                } => {
+                    let payload = *buf;
+                    *buf = &[];
+                    return Ok(Some(ParseEvent::Codestream(payload)));
+                }
+                DetectState::InCodestream {
+                    bytes_left: Some(bytes_left),
+                    ..
+                } => {
+                    let payload = if buf.len() >= *bytes_left {
+                        let (payload, remaining) = buf.split_at(*bytes_left);
+                        *state = DetectState::WaitingBoxHeader;
+                        *buf = remaining;
+                        payload
+                    } else {
+                        let payload = *buf;
+                        *bytes_left -= buf.len();
+                        *buf = &[];
+                        payload
+                    };
+                    return Ok(Some(ParseEvent::Codestream(payload)));
+                }
+                DetectState::InAuxBox {
+                    header: _,
+                    bytes_left: None,
+                } => {
+                    let _payload = *buf;
+                    *buf = &[];
+                    // FIXME: emit auxiliary box event
+                }
+                DetectState::InAuxBox {
+                    header: _,
+                    bytes_left: Some(bytes_left),
+                } => {
+                    let _payload = if buf.len() >= *bytes_left {
+                        let (payload, remaining) = buf.split_at(*bytes_left);
+                        *state = DetectState::WaitingBoxHeader;
+                        *buf = remaining;
+                        payload
+                    } else {
+                        let payload = *buf;
+                        *bytes_left -= buf.len();
+                        *buf = &[];
+                        payload
+                    };
+                    // FIXME: emit auxiliary box event
+                }
+            }
+        }
+    }
+}
+
+impl std::fmt::Debug for ParseEvents<'_, '_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ParseEvents")
+            .field("inner", &self.inner)
+            .field(
+                "remaining_input",
+                &format_args!("({} byte(s))", self.remaining_input.len()),
+            )
+            .field("finished", &self.finished)
+            .finish()
+    }
+}
+
+impl<'buf> Iterator for ParseEvents<'_, 'buf> {
+    type Item = Result<ParseEvent<'buf>>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.finished {
+            return None;
+        }
+
+        let initial_buf = self.remaining_input;
+        let event = self.emit_single();
+
+        if event.is_err() {
+            self.finished = true;
+        }
+
+        self.inner.previous_consumed_bytes += initial_buf.len() - self.remaining_input.len();
+        event.transpose()
+    }
+}
+
+/// Parser event emitted by [`ParseEvents`].
+pub enum ParseEvent<'buf> {
+    /// Bitstream structure is detected.
+    BitstreamKind(BitstreamKind),
+    /// Codestream data is read.
+    ///
+    /// Returned data may be partial. Complete codestream can be obtained by concatenating all data
+    /// of `Codestream` events.
+    Codestream(&'buf [u8]),
+}
+
+impl std::fmt::Debug for ParseEvent<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::BitstreamKind(kind) => f.debug_tuple("BitstreamKind").field(kind).finish(),
+            Self::Codestream(buf) => f
+                .debug_tuple("Codestream")
+                .field(&format_args!("{} byte(s)", buf.len()))
+                .finish(),
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/ans.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/ans.rs
new file mode 100644
index 00000000..fa7fe9e4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/ans.rs
@@ -0,0 +1,503 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// Originally written for jxl-oxide.
+
+use crate::bit_reader::BitReader;
+use crate::error::{Error, Result};
+
+const LOG_SUM_PROBS: usize = 12;
+const SUM_PROBS: u16 = 1 << LOG_SUM_PROBS;
+
+const RLE_MARKER_SYM: u16 = LOG_SUM_PROBS as u16 + 1;
+
+#[derive(Debug)]
+struct AnsHistogram {
+    // Safety invariant:
+    // - log_bucket_size <= LOG_SUM_PROBS
+    // - buckets.len() = 2^(LOG_SUM_PROBS - log_bucket_size)
+    // This relationship ensures that for any ANS state (12 bits), the bucket index
+    // computed as (state & 0xfff) >> log_bucket_size is always < buckets.len()
+    buckets: Vec<Bucket>,
+    log_bucket_size: usize,
+    bucket_mask: u32,
+    // For optimizing fast-lossless case.
+    single_symbol: Option<u32>,
+}
+
+// log_alphabet_size <= 8 and log_bucket_size <= 7, so u8 is sufficient for symbols and cutoffs.
+#[derive(Debug, Copy, Clone)]
+#[repr(C)]
+struct Bucket {
+    alias_symbol: u8,
+    alias_cutoff: u8,
+    dist: u16,
+    alias_offset: u16,
+    alias_dist_xor: u16,
+}
+
+impl AnsHistogram {
+    fn decode_dist_two_symbols(br: &mut BitReader, dist: &mut [u16]) -> Result<usize> {
+        let table_size = dist.len();
+
+        let v0 = Self::read_u8(br)? as usize;
+        let v1 = Self::read_u8(br)? as usize;
+        if v0 == v1 {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        let alphabet_size = v0.max(v1) + 1;
+        if alphabet_size > table_size {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        let prob = br.read(LOG_SUM_PROBS)? as u16;
+        dist[v0] = prob;
+        dist[v1] = SUM_PROBS - prob;
+
+        Ok(alphabet_size)
+    }
+
+    fn decode_dist_single_symbol(br: &mut BitReader, dist: &mut [u16]) -> Result<usize> {
+        let table_size = dist.len();
+
+        let val = Self::read_u8(br)? as usize;
+        let alphabet_size = val + 1;
+        if alphabet_size > table_size {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        dist[val] = SUM_PROBS;
+
+        Ok(alphabet_size)
+    }
+
+    fn decode_dist_evenly_distributed(br: &mut BitReader, dist: &mut [u16]) -> Result<usize> {
+        let table_size = dist.len();
+
+        let alphabet_size = Self::read_u8(br)? as usize + 1;
+        if alphabet_size > table_size {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        let base = SUM_PROBS as usize / alphabet_size;
+        let remainder = SUM_PROBS as usize % alphabet_size;
+        dist[0..remainder].fill(base as u16 + 1);
+        dist[remainder..alphabet_size].fill(base as u16);
+
+        Ok(alphabet_size)
+    }
+
+    fn decode_dist_complex(br: &mut BitReader, dist: &mut [u16]) -> Result<usize> {
+        let table_size = dist.len();
+
+        let mut len = 0usize;
+        while len < 3 {
+            if br.read(1)? != 0 {
+                len += 1;
+            } else {
+                break;
+            }
+        }
+
+        let shift = (br.read(len)? + (1 << len) - 1) as i16;
+        if shift > 13 {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        let alphabet_size = Self::read_u8(br)? as usize + 3;
+        if alphabet_size > table_size {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        // TODO(tirr-c): This could be an array of length `SUM_PROB / 4` (4 is from the minimum
+        // value of `repeat_count`). Change if using array is faster.
+        let mut repeat_ranges = Vec::new();
+        let mut omit_data = None;
+        let mut idx = 0;
+        while idx < alphabet_size {
+            dist[idx] = Self::read_prefix(br)?;
+            if dist[idx] == RLE_MARKER_SYM {
+                let repeat_count = Self::read_u8(br)? as usize + 4;
+                if idx + repeat_count > alphabet_size {
+                    return Err(Error::InvalidAnsHistogram);
+                }
+                repeat_ranges.push(idx..(idx + repeat_count));
+                idx += repeat_count;
+                continue;
+            }
+            match &mut omit_data {
+                Some((log, pos)) => {
+                    if dist[idx] > *log {
+                        *log = dist[idx];
+                        *pos = idx;
+                    }
+                }
+                data => {
+                    *data = Some((dist[idx], idx));
+                }
+            }
+            idx += 1;
+        }
+        let Some((_, omit_pos)) = omit_data else {
+            return Err(Error::InvalidAnsHistogram);
+        };
+        if dist.get(omit_pos + 1) == Some(&RLE_MARKER_SYM) {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        let mut repeat_range_idx = 0usize;
+        let mut acc = 0;
+        let mut prev_dist = 0u16;
+        for (idx, code) in dist.iter_mut().enumerate() {
+            if repeat_range_idx < repeat_ranges.len()
+                && repeat_ranges[repeat_range_idx].start <= idx
+            {
+                if repeat_ranges[repeat_range_idx].end == idx {
+                    repeat_range_idx += 1;
+                } else {
+                    *code = prev_dist;
+                    acc += *code;
+                    // dist[omit_pos] > 0
+                    if acc >= SUM_PROBS {
+                        return Err(Error::InvalidAnsHistogram);
+                    }
+                    continue;
+                }
+            }
+
+            if *code == 0 {
+                prev_dist = 0;
+                continue;
+            }
+            if idx == omit_pos {
+                prev_dist = 0;
+                continue;
+            }
+            if *code > 1 {
+                let zeros = (*code - 1) as i16;
+                let bitcount = (shift - ((LOG_SUM_PROBS as i16 - zeros) >> 1)).clamp(0, zeros);
+                *code = (1 << zeros) + ((br.read(bitcount as usize)? as u16) << (zeros - bitcount));
+            }
+
+            prev_dist = *code;
+            acc += *code;
+            // dist[omit_pos] > 0
+            if acc >= SUM_PROBS {
+                return Err(Error::InvalidAnsHistogram);
+            }
+        }
+        dist[omit_pos] = SUM_PROBS - acc;
+
+        Ok(alphabet_size)
+    }
+
+    fn build_alias_map(
+        alphabet_size: usize,
+        log_bucket_size: usize,
+        dist: &[u16],
+    ) -> Result<Vec<Bucket>> {
+        #[derive(Debug)]
+        struct WorkingBucket {
+            dist: u16,
+            alias_symbol: u16,
+            alias_offset: u16,
+            alias_cutoff: u16,
+        }
+
+        let bucket_size = 1u16 << log_bucket_size;
+        let mut buckets: Vec<_> = dist
+            .iter()
+            .enumerate()
+            .map(|(i, &dist)| WorkingBucket {
+                dist,
+                alias_symbol: if i < alphabet_size { i as u16 } else { 0 },
+                alias_offset: 0,
+                alias_cutoff: dist,
+            })
+            .collect();
+
+        let mut underfull = Vec::new();
+        let mut overfull = Vec::new();
+        for (idx, &WorkingBucket { dist, .. }) in buckets.iter().enumerate() {
+            match dist.cmp(&bucket_size) {
+                std::cmp::Ordering::Less => underfull.push(idx),
+                std::cmp::Ordering::Equal => {}
+                std::cmp::Ordering::Greater => overfull.push(idx),
+            }
+        }
+        while let (Some(o), Some(u)) = (overfull.pop(), underfull.pop()) {
+            let by = bucket_size - buckets[u].alias_cutoff;
+            buckets[o].alias_cutoff -= by;
+            buckets[u].alias_symbol = o as u16;
+            buckets[u].alias_offset = buckets[o].alias_cutoff;
+            match buckets[o].alias_cutoff.cmp(&bucket_size) {
+                std::cmp::Ordering::Less => underfull.push(o),
+                std::cmp::Ordering::Equal => {}
+                std::cmp::Ordering::Greater => overfull.push(o),
+            }
+        }
+
+        // If `dist` sums to `SUM_PROB`, overfull and underfull must both be empty here.
+        // A crafted bitstream could violate this invariant, so return an error instead of panicking.
+        if !overfull.is_empty() || !underfull.is_empty() {
+            return Err(Error::InvalidAnsHistogram);
+        }
+
+        Ok(buckets
+            .iter()
+            .enumerate()
+            .map(|(idx, bucket)| {
+                if bucket.alias_cutoff == bucket_size {
+                    Bucket {
+                        dist: bucket.dist,
+                        alias_symbol: idx as u8,
+                        alias_offset: 0,
+                        alias_cutoff: 0,
+                        alias_dist_xor: 0,
+                    }
+                } else {
+                    Bucket {
+                        dist: bucket.dist,
+                        alias_symbol: bucket.alias_symbol as u8,
+                        alias_offset: bucket.alias_offset - bucket.alias_cutoff,
+                        alias_cutoff: bucket.alias_cutoff as u8,
+                        alias_dist_xor: bucket.dist ^ buckets[bucket.alias_symbol as usize].dist,
+                    }
+                }
+            })
+            .collect())
+    }
+
+    // log_alphabet_size: 5 + u(2)
+    pub fn decode(br: &mut BitReader, log_alpha_size: usize) -> Result<Self> {
+        debug_assert!((5..=8).contains(&log_alpha_size));
+        let table_size = (1u16 << log_alpha_size) as usize;
+        // 4 <= log_bucket_size <= 7
+        let log_bucket_size = LOG_SUM_PROBS.checked_sub(log_alpha_size).unwrap();
+        let bucket_size = 1u16 << log_bucket_size;
+        let bucket_mask = bucket_size as u32 - 1;
+
+        let mut dist = vec![0u16; table_size];
+        let alphabet_size = if br.read(1)? != 0 {
+            if br.read(1)? != 0 {
+                Self::decode_dist_two_symbols(br, &mut dist)?
+            } else {
+                Self::decode_dist_single_symbol(br, &mut dist)?
+            }
+        } else if br.read(1)? != 0 {
+            Self::decode_dist_evenly_distributed(br, &mut dist)?
+        } else {
+            Self::decode_dist_complex(br, &mut dist)?
+        };
+        let single_symbol = dist.iter().position(|&d| d == SUM_PROBS).map(|x| x as u32);
+        let buckets = if let Some(single_sym_idx) = single_symbol {
+            dist.into_iter()
+                .enumerate()
+                .map(|(i, dist)| Bucket {
+                    dist,
+                    alias_symbol: single_sym_idx as u8,
+                    alias_offset: bucket_size * i as u16,
+                    alias_cutoff: 0,
+                    alias_dist_xor: dist ^ SUM_PROBS,
+                })
+                .collect()
+        } else {
+            Self::build_alias_map(alphabet_size, log_bucket_size, &dist)?
+        };
+
+        let expected_len = 1 << (LOG_SUM_PROBS - log_bucket_size);
+        if buckets.len() != expected_len {
+            return Err(Error::InvalidAnsHistogram);
+        }
+        // Safety note: log_bucket_size <= LOG_SUM_PROBS by construction, and we
+        // just checked that buckets.len() = 2^(LOG_SUM_PROBS - log_bucket_size)
+        Ok(Self {
+            buckets,
+            log_bucket_size,
+            bucket_mask,
+            single_symbol,
+        })
+    }
+
+    fn read_u8(bitstream: &mut BitReader) -> Result<u8> {
+        Ok(if bitstream.read(1)? != 0 {
+            let n = bitstream.read(3)?;
+            ((1 << n) + bitstream.read(n as usize)?) as u8
+        } else {
+            0
+        })
+    }
+
+    fn read_prefix(br: &mut BitReader) -> Result<u16> {
+        // Prefix code lookup table.
+        #[rustfmt::skip]
+        const TABLE: [(u8, u8); 128] = [
+            (10, 3), (12, 7), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), ( 0, 5), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), (11, 6), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), ( 0, 5), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), (13, 7), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), ( 0, 5), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), (11, 6), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+            (10, 3), ( 0, 5), (7, 3), (3, 4), (6, 3), (8, 3), (9, 3), (5, 4),
+            (10, 3), ( 4, 4), (7, 3), (1, 4), (6, 3), (8, 3), (9, 3), (2, 4),
+        ];
+
+        let index = br.peek(7);
+        let (sym, bits) = TABLE[index as usize];
+        br.consume(bits as usize)?;
+        Ok(sym as u16)
+    }
+}
+
+impl AnsHistogram {
+    #[inline(always)]
+    pub fn read(&self, br: &mut BitReader, state: &mut u32) -> u32 {
+        let idx = *state & 0xfff;
+        let i = (idx >> self.log_bucket_size) as usize;
+        let pos = idx & self.bucket_mask;
+
+        let bucket = self.buckets[i];
+        let alias_symbol = bucket.alias_symbol as u32;
+        let alias_cutoff = bucket.alias_cutoff as u32;
+        let dist = bucket.dist as u32;
+
+        let map_to_alias = (pos >= alias_cutoff) as u32;
+        let offset = (bucket.alias_offset as u32) * map_to_alias;
+        let dist_xor = (bucket.alias_dist_xor as u32) * map_to_alias;
+
+        let dist = dist ^ dist_xor;
+        let symbol = (alias_symbol * map_to_alias) | (i as u32 * (1 - map_to_alias));
+        let offset = offset + pos;
+
+        let next_state = (*state >> LOG_SUM_PROBS) * dist + offset;
+        let select_appended = (next_state < (1 << 16)) as u32;
+        let appended_state = (next_state << 16) | (br.peek(16) as u32);
+        *state = (appended_state * select_appended) | (next_state * (1 - select_appended));
+        br.consume_optimistic((16 * select_appended) as usize);
+        symbol
+    }
+
+    // For optimizing fast-lossless case.
+    #[inline]
+    pub fn single_symbol(&self) -> Option<u32> {
+        self.single_symbol
+    }
+}
+
+#[derive(Debug)]
+pub struct AnsCodes {
+    histograms: Vec<AnsHistogram>,
+}
+
+impl AnsCodes {
+    pub fn decode(num: usize, log_alpha_size: usize, br: &mut BitReader) -> Result<AnsCodes> {
+        let histograms = (0..num)
+            .map(|_| AnsHistogram::decode(br, log_alpha_size))
+            .collect::<Result<_>>()?;
+        Ok(Self { histograms })
+    }
+
+    pub fn single_symbol(&self, ctx: usize) -> Option<u32> {
+        self.histograms[ctx].single_symbol()
+    }
+}
+
+#[derive(Debug)]
+pub struct AnsReader(u32);
+
+impl AnsReader {
+    /// Expected final ANS state.
+    const CHECKSUM: u32 = 0x130000;
+
+    pub fn new_unused() -> Self {
+        Self(Self::CHECKSUM)
+    }
+
+    pub fn init(br: &mut BitReader) -> Result<Self> {
+        let initial_state = br.read(32)? as u32;
+        Ok(Self(initial_state))
+    }
+
+    #[inline(always)]
+    pub fn read(&mut self, codes: &AnsCodes, br: &mut BitReader, ctx: usize) -> u32 {
+        let histogram = &codes.histograms[ctx];
+        histogram.read(br, &mut self.0)
+    }
+
+    pub fn check_final_state(self) -> Result<()> {
+        if self.0 == Self::CHECKSUM {
+            Ok(())
+        } else {
+            Err(Error::AnsChecksumMismatch)
+        }
+    }
+
+    pub(super) fn checkpoint(&self) -> Self {
+        Self(self.0)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    fn validate_buckets(buckets: &[Bucket]) {
+        let dist_sum: u16 = buckets.iter().map(|bucket| bucket.dist).sum();
+        assert_eq!(dist_sum, SUM_PROBS);
+    }
+
+    #[test]
+    fn single_symbol() {
+        // Single symbol of 20
+        let mut br = BitReader::new(&[0b00100101, 0b01]);
+        let histogram = AnsHistogram::decode(&mut br, 5).unwrap();
+        validate_buckets(&histogram.buckets);
+        assert_eq!(histogram.buckets[20].dist, SUM_PROBS);
+        assert_eq!(histogram.single_symbol, Some(20));
+
+        // Single symbol of 32 (invalid)
+        let mut br = BitReader::new(&[0b00101101, 0b000]);
+        assert!(AnsHistogram::decode(&mut br, 5).is_err());
+    }
+
+    #[test]
+    fn two_symbols() {
+        // two symbols of 10 and 20, where the prob of symbol 10 is 256
+        let mut br = BitReader::new(&[0b10011111, 0b10010010, 0b00000000, 0b00010]);
+        let histogram = AnsHistogram::decode(&mut br, 5).unwrap();
+        validate_buckets(&histogram.buckets);
+        assert_eq!(histogram.buckets[10].dist, 256);
+        assert_eq!(histogram.buckets[20].dist, SUM_PROBS - 256);
+    }
+
+    #[test]
+    fn decode_arb() {
+        arbtest::arbtest(|u| {
+            let total_len = u.arbitrary_len::<u8>()?;
+            let mut buf = vec![0u8; total_len];
+            u.fill_buffer(&mut buf)?;
+            let mut br = BitReader::new(&buf);
+
+            loop {
+                match AnsHistogram::decode(&mut br, 8) {
+                    Ok(histogram) => validate_buckets(&histogram.buckets),
+                    Err(Error::OutOfBounds(_)) => break,
+                    Err(_) => {}
+                }
+            }
+
+            Ok(())
+        });
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/context_map.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/context_map.rs
new file mode 100644
index 00000000..808f3d71
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/context_map.rs
@@ -0,0 +1,77 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::bit_reader::BitReader;
+use crate::error::Error;
+use crate::util::TryVecExt;
+use std::collections::HashSet;
+
+use crate::entropy_coding::decode::*;
+
+fn move_to_front(v: &mut [u8], index: u8) {
+    let value = v[index as usize];
+    for i in (1..=index as usize).rev() {
+        v[i] = v[i - 1];
+    }
+    v[0] = value;
+}
+
+fn inverse_move_to_front(v: &mut [u8]) {
+    let mut mtf: [u8; 256] = std::array::from_fn(|x| x as u8);
+    for val in v.iter_mut() {
+        let index = *val;
+        *val = mtf[index as usize];
+        if index != 0 {
+            move_to_front(&mut mtf, index);
+        }
+    }
+}
+
+fn verify_context_map(ctx_map: &[u8]) -> Result<(), Error> {
+    let num_histograms = *ctx_map.iter().max().unwrap() as u32 + 1;
+    let distinct_histograms = ctx_map.iter().collect::<HashSet<_>>().len() as u32;
+    if distinct_histograms != num_histograms {
+        return Err(Error::InvalidContextMapHole(
+            num_histograms,
+            distinct_histograms,
+        ));
+    }
+    Ok(())
+}
+
+pub fn decode_context_map(num_contexts: usize, br: &mut BitReader) -> Result<Vec<u8>, Error> {
+    let is_simple = br.read(1)? != 0;
+    if is_simple {
+        let bits_per_entry = br.read(2)? as usize;
+        if bits_per_entry != 0 {
+            (0..num_contexts)
+                .map(|_| Ok(br.read(bits_per_entry)? as u8))
+                .collect()
+        } else {
+            Ok(Vec::try_from_elem(0u8, num_contexts)?)
+        }
+    } else {
+        let use_mtf = br.read(1)? != 0;
+        let histograms = Histograms::decode(1, br, /*allow_lz77=*/ num_contexts > 2)?;
+        let mut reader = SymbolReader::new(&histograms, br, None)?;
+
+        let mut ctx_map: Vec<u8> = (0..num_contexts)
+            .map(|_| {
+                let mv = reader.read_unsigned(&histograms, br, 0usize);
+                if mv > u8::MAX as u32 {
+                    Err(Error::InvalidContextMap(mv))
+                } else {
+                    Ok(mv as u8)
+                }
+            })
+            .collect::<Result<_, _>>()?;
+        reader.check_final_state(&histograms, br)?;
+        if use_mtf {
+            inverse_move_to_front(&mut ctx_map[..]);
+        }
+        verify_context_map(&ctx_map[..])?;
+        Ok(ctx_map)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/decode.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/decode.rs
new file mode 100644
index 00000000..fcfd8a33
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/decode.rs
@@ -0,0 +1,817 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use jxl_macros::UnconditionalCoder;
+
+use crate::bit_reader::BitReader;
+use crate::entropy_coding::ans::*;
+use crate::entropy_coding::context_map::*;
+use crate::entropy_coding::huffman::*;
+use crate::entropy_coding::hybrid_uint::*;
+use crate::error::{Error, Result};
+use crate::headers::encodings::*;
+use crate::util::NewWithCapacity;
+use crate::util::tracing_wrappers::*;
+
+pub fn decode_varint16(br: &mut BitReader) -> Result<u16> {
+    if br.read(1)? != 0 {
+        let nbits = br.read(4)? as usize;
+        if nbits == 0 {
+            Ok(1)
+        } else {
+            Ok((1 << nbits) + br.read(nbits)? as u16)
+        }
+    } else {
+        Ok(0)
+    }
+}
+
+#[inline(always)]
+pub fn unpack_signed(unsigned: u32) -> i32 {
+    ((unsigned >> 1) ^ ((!unsigned) & 1).wrapping_sub(1)) as i32
+}
+
+#[derive(UnconditionalCoder, Debug)]
+struct Lz77Params {
+    pub enabled: bool,
+    #[condition(enabled)]
+    #[coder(u2S(224, 512, 4096, Bits(15) + 8))]
+    pub min_symbol: Option<u32>,
+    #[condition(enabled)]
+    #[coder(u2S(3, 4, Bits(2) + 5, Bits(8) + 9))]
+    pub min_length: Option<u32>,
+}
+
+#[derive(Debug)]
+enum Codes {
+    Huffman(HuffmanCodes),
+    Ans(AnsCodes),
+}
+
+impl Codes {
+    fn single_symbol(&self, ctx: usize) -> Option<u32> {
+        match self {
+            Self::Huffman(hc) => hc.single_symbol(ctx),
+            Self::Ans(ans) => ans.single_symbol(ctx),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Histograms {
+    lz77_params: Lz77Params,
+    lz77_length_uint: Option<HybridUint>,
+    context_map: Vec<u8>,
+    /// Cluster index used for LZ77 distance reads.
+    ///
+    /// Captured at `Histograms::decode` time as the original last entry of
+    /// `context_map` (per libjxl `code->lz77.nonserialized_distance_context`,
+    /// dec_ans.cc:362). Stored separately because `resize()` may append
+    /// padding entries to `context_map` (see frame/decode.rs:789), which would
+    /// otherwise shift the "last" entry to a zero pad and corrupt LZ77
+    /// distance ANS reads. Set to 0 when LZ77 is disabled.
+    lz_dist_cluster: u8,
+    // TODO(veluca): figure out why this is unused.
+    #[allow(dead_code)]
+    log_alpha_size: usize,
+    uint_configs: Vec<HybridUint>,
+    codes: Codes,
+}
+
+#[derive(Debug)]
+pub struct Lz77State {
+    min_symbol: u32,
+    min_length: u32,
+    dist_multiplier: u32,
+    window: Vec<u32>,
+    num_to_copy: u32,
+    copy_pos: u32,
+    num_decoded: u32,
+}
+
+impl Lz77State {
+    const LOG_WINDOW_SIZE: u32 = 20;
+    const WINDOW_MASK: u32 = (1 << Self::LOG_WINDOW_SIZE) - 1;
+
+    #[rustfmt::skip]
+    const SPECIAL_DISTANCES: [(i8, u8); 120] = [
+        ( 0, 1), ( 1, 0), ( 1, 1), (-1, 1), ( 0, 2), ( 2, 0), ( 1, 2), (-1, 2), ( 2, 1), (-2, 1),
+        ( 2, 2), (-2, 2), ( 0, 3), ( 3, 0), ( 1, 3), (-1, 3), ( 3, 1), (-3, 1), ( 2, 3), (-2, 3),
+        ( 3, 2), (-3, 2), ( 0, 4), ( 4, 0), ( 1, 4), (-1, 4), ( 4, 1), (-4, 1), ( 3, 3), (-3, 3),
+        ( 2, 4), (-2, 4), ( 4, 2), (-4, 2), ( 0, 5), ( 3, 4), (-3, 4), ( 4, 3), (-4, 3), ( 5, 0),
+        ( 1, 5), (-1, 5), ( 5, 1), (-5, 1), ( 2, 5), (-2, 5), ( 5, 2), (-5, 2), ( 4, 4), (-4, 4),
+        ( 3, 5), (-3, 5), ( 5, 3), (-5, 3), ( 0, 6), ( 6, 0), ( 1, 6), (-1, 6), ( 6, 1), (-6, 1),
+        ( 2, 6), (-2, 6), ( 6, 2), (-6, 2), ( 4, 5), (-4, 5), ( 5, 4), (-5, 4), ( 3, 6), (-3, 6),
+        ( 6, 3), (-6, 3), ( 0, 7), ( 7, 0), ( 1, 7), (-1, 7), ( 5, 5), (-5, 5), ( 7, 1), (-7, 1),
+        ( 4, 6), (-4, 6), ( 6, 4), (-6, 4), ( 2, 7), (-2, 7), ( 7, 2), (-7, 2), ( 3, 7), (-3, 7),
+        ( 7, 3), (-7, 3), ( 5, 6), (-5, 6), ( 6, 5), (-6, 5), ( 8, 0), ( 4, 7), (-4, 7), ( 7, 4),
+        (-7, 4), ( 8, 1), ( 8, 2), ( 6, 6), (-6, 6), ( 8, 3), ( 5, 7), (-5, 7), ( 7, 5), (-7, 5),
+        ( 8, 4), ( 6, 7), (-6, 7), ( 7, 6), (-7, 6), ( 8, 5), ( 7, 7), (-7, 7), ( 8, 6), ( 8, 7),
+    ];
+
+    #[inline(always)]
+    fn apply_copy(&mut self, distance_sym: u32, num_to_copy: u32) {
+        let distance_sub_1 = if self.dist_multiplier == 0 {
+            distance_sym
+        } else if let Some(distance) = distance_sym.checked_sub(120) {
+            distance
+        } else {
+            let (offset, dist) = Lz77State::SPECIAL_DISTANCES[distance_sym as usize];
+            let dist = (self.dist_multiplier * dist as u32).checked_add_signed(offset as i32 - 1);
+            dist.unwrap_or(0)
+        };
+
+        let distance = (((1 << 20) - 1).min(distance_sub_1) + 1).min(self.num_decoded);
+        self.copy_pos = self.num_decoded - distance;
+        self.num_to_copy = num_to_copy;
+    }
+
+    #[inline(always)]
+    fn push_decoded_symbol(&mut self, token: u32) {
+        let offset = (self.num_decoded & Self::WINDOW_MASK) as usize;
+        if let Some(slot) = self.window.get_mut(offset) {
+            *slot = token;
+        } else {
+            debug_assert_eq!(self.window.len(), offset);
+            self.window.push(token);
+        }
+        self.num_decoded += 1;
+    }
+
+    #[inline(always)]
+    fn pull_symbol(&mut self) -> Option<u32> {
+        if let Some(next_num_to_copy) = self.num_to_copy.checked_sub(1) {
+            let sym = self.window[(self.copy_pos & Self::WINDOW_MASK) as usize];
+            self.copy_pos += 1;
+            self.num_to_copy = next_num_to_copy;
+            Some(sym)
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Debug)]
+struct RleState {
+    min_symbol: u32,
+    min_length: u32,
+    last_sym: Option<u32>,
+    repeat_count: u32,
+}
+
+impl RleState {
+    #[inline]
+    fn push_token(
+        &mut self,
+        token: u32,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+        nbits_acc: &mut u32,
+    ) {
+        if let Some(token) = token.checked_sub(self.min_symbol) {
+            let lz_length_conf = histograms.lz77_length_uint.as_ref().unwrap();
+            let count = lz_length_conf.read(token, br, nbits_acc);
+            // If this calculation overflows, the bitstream is invalid (it would be rejected
+            // on the LZ77 path), but we don't report an error.
+            self.repeat_count = count.wrapping_add(self.min_length);
+        } else {
+            let sym = histograms.uint_config(cluster).read(token, br, nbits_acc);
+            self.last_sym = Some(sym);
+            self.repeat_count = 1;
+        }
+    }
+
+    #[inline]
+    fn pull_symbol(&mut self) -> Option<u32> {
+        if self.repeat_count > 0 {
+            self.repeat_count -= 1;
+            self.last_sym
+        } else {
+            None
+        }
+    }
+}
+
+#[derive(Debug)]
+enum SymbolReaderState {
+    None,
+    Lz77(Lz77State),
+    Rle(RleState),
+}
+
+#[derive(Debug, Clone, Default)]
+struct ErrorState {
+    lz77_repeat: bool,
+    arithmetic_overflow: bool,
+    /// OR-accumulator for raw nbits from HybridUint reads. If any read produces
+    /// nbits >= 32 (invalid bitstream), bit 5+ will be set. Check via `>= 32`.
+    nbits_acc: u32,
+}
+
+impl ErrorState {
+    fn new() -> Self {
+        Self::default()
+    }
+
+    fn check_for_error(&self) -> Result<()> {
+        if self.lz77_repeat {
+            Err(Error::UnexpectedLz77Repeat)
+        } else if self.arithmetic_overflow {
+            Err(Error::ArithmeticOverflow)
+        } else if self.nbits_acc >= 32 {
+            Err(Error::IntegerTooLarge(32))
+        } else {
+            Ok(())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct SymbolReader {
+    state: SymbolReaderState,
+    ans_reader: AnsReader,
+    errors: ErrorState,
+}
+
+impl SymbolReader {
+    pub fn new(
+        histograms: &Histograms,
+        br: &mut BitReader,
+        image_width: Option<usize>,
+    ) -> Result<Self> {
+        let ans_reader = if matches!(histograms.codes, Codes::Ans(_)) {
+            AnsReader::init(br)?
+        } else {
+            AnsReader::new_unused()
+        };
+
+        let Lz77Params {
+            enabled: lz77_enabled,
+            min_symbol,
+            min_length,
+        } = histograms.lz77_params;
+
+        let state = if lz77_enabled {
+            let min_symbol = min_symbol.unwrap();
+            let min_length = min_length.unwrap();
+            let dist_multiplier = image_width.unwrap_or(0) as u32;
+
+            let lz_dist_cluster = histograms.lz_dist_cluster as usize;
+            let lz_conf = histograms.uint_config(lz_dist_cluster);
+            let is_rle = histograms.codes.single_symbol(lz_dist_cluster) == Some(1)
+                && lz_conf.is_split_exponent_zero();
+
+            if is_rle {
+                SymbolReaderState::Rle(RleState {
+                    min_symbol,
+                    min_length,
+                    last_sym: None,
+                    repeat_count: 0,
+                })
+            } else {
+                SymbolReaderState::Lz77(Lz77State {
+                    min_symbol,
+                    min_length,
+                    dist_multiplier,
+                    window: Vec::new_with_capacity(1 << Lz77State::LOG_WINDOW_SIZE)?,
+                    num_to_copy: 0,
+                    copy_pos: 0,
+                    num_decoded: 0,
+                })
+            }
+        } else {
+            SymbolReaderState::None
+        };
+
+        Ok(Self {
+            state,
+            ans_reader,
+            errors: ErrorState::new(),
+        })
+    }
+}
+
+impl SymbolReader {
+    #[inline(always)]
+    pub fn read_unsigned_inline(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        context: usize,
+    ) -> u32 {
+        let cluster = histograms.map_context_to_cluster(context);
+        self.read_unsigned_clustered_inline(histograms, br, cluster)
+    }
+
+    #[inline(never)]
+    pub fn read_unsigned(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        context: usize,
+    ) -> u32 {
+        self.read_unsigned_inline(histograms, br, context)
+    }
+
+    #[inline(always)]
+    pub fn read_signed_inline(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        context: usize,
+    ) -> i32 {
+        let unsigned = self.read_unsigned_inline(histograms, br, context);
+        unpack_signed(unsigned)
+    }
+
+    #[inline(never)]
+    pub fn read_signed(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        context: usize,
+    ) -> i32 {
+        self.read_signed_inline(histograms, br, context)
+    }
+
+    #[inline(always)]
+    pub fn read_unsigned_clustered_inline(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+    ) -> u32 {
+        match &mut self.state {
+            SymbolReaderState::None => {
+                let token = match &histograms.codes {
+                    Codes::Huffman(hc) => hc.read(br, cluster),
+                    Codes::Ans(ans) => self.ans_reader.read(ans, br, cluster),
+                };
+                histograms
+                    .uint_config(cluster)
+                    .read(token, br, &mut self.errors.nbits_acc)
+            }
+
+            SymbolReaderState::Lz77(lz77_state) => {
+                if let Some(sym) = lz77_state.pull_symbol() {
+                    lz77_state.push_decoded_symbol(sym);
+                    return sym;
+                }
+                let token = match &histograms.codes {
+                    Codes::Huffman(hc) => hc.read(br, cluster),
+                    Codes::Ans(ans) => self.ans_reader.read(ans, br, cluster),
+                };
+                let Some(lz77_token) = token.checked_sub(lz77_state.min_symbol) else {
+                    let sym =
+                        histograms
+                            .uint_config(cluster)
+                            .read(token, br, &mut self.errors.nbits_acc);
+                    lz77_state.push_decoded_symbol(sym);
+                    return sym;
+                };
+                if lz77_state.num_decoded == 0 {
+                    self.errors.lz77_repeat = true;
+                    return 0;
+                }
+
+                let num_to_copy = histograms.lz77_length_uint.as_ref().unwrap().read(
+                    lz77_token,
+                    br,
+                    &mut self.errors.nbits_acc,
+                );
+                let Some(num_to_copy) = num_to_copy.checked_add(lz77_state.min_length) else {
+                    warn!(
+                        num_to_copy,
+                        lz77_state.min_length, "LZ77 num_to_copy overflow"
+                    );
+                    self.errors.arithmetic_overflow = true;
+                    return 0;
+                };
+
+                let lz_dist_cluster = histograms.lz_dist_cluster as usize;
+                let distance_sym = match &histograms.codes {
+                    Codes::Huffman(hc) => hc.read(br, lz_dist_cluster),
+                    Codes::Ans(ans) => self.ans_reader.read(ans, br, lz_dist_cluster),
+                };
+                let distance_sym = histograms.uint_config(lz_dist_cluster).read(
+                    distance_sym,
+                    br,
+                    &mut self.errors.nbits_acc,
+                );
+                lz77_state.apply_copy(distance_sym, num_to_copy);
+
+                let sym = lz77_state.pull_symbol().unwrap();
+                lz77_state.push_decoded_symbol(sym);
+                sym
+            }
+
+            SymbolReaderState::Rle(rle_state) => {
+                if let Some(sym) = rle_state.pull_symbol() {
+                    return sym;
+                }
+
+                let token = match &histograms.codes {
+                    Codes::Huffman(hc) => hc.read(br, cluster),
+                    Codes::Ans(ans) => self.ans_reader.read(ans, br, cluster),
+                };
+                rle_state.push_token(token, histograms, br, cluster, &mut self.errors.nbits_acc);
+                if let Some(sym) = rle_state.pull_symbol() {
+                    sym
+                } else {
+                    self.errors.lz77_repeat = true;
+                    0
+                }
+            }
+        }
+    }
+
+    #[inline(never)]
+    #[allow(dead_code)] // Non-inlined variant for call sites where code size matters
+    pub fn read_unsigned_clustered(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+    ) -> u32 {
+        self.read_unsigned_clustered_inline(histograms, br, cluster)
+    }
+
+    #[inline(always)]
+    pub fn read_signed_clustered_inline(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+    ) -> i32 {
+        let unsigned = self.read_unsigned_clustered_inline(histograms, br, cluster);
+        unpack_signed(unsigned)
+    }
+
+    #[inline(never)]
+    pub fn read_signed_clustered(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+    ) -> i32 {
+        self.read_signed_clustered_inline(histograms, br, cluster)
+    }
+
+    /// Specialized fast path for when all HybridUint configs are 420.
+    ///
+    /// # Preconditions
+    /// - `histograms.can_use_config_420_fast_path()` must be true (no LZ77, all configs are 420)
+    /// - This assumes `SymbolReaderState::None` (verified by debug_assert)
+    #[inline(always)]
+    pub fn read_unsigned_clustered_config_420(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+    ) -> u32 {
+        debug_assert!(matches!(self.state, SymbolReaderState::None));
+        debug_assert!(histograms.can_use_config_420_fast_path());
+
+        let token = match &histograms.codes {
+            Codes::Huffman(hc) => hc.read(br, cluster),
+            Codes::Ans(ans) => self.ans_reader.read(ans, br, cluster),
+        };
+        HybridUint::read_config_420(token, br, &mut self.errors.nbits_acc)
+    }
+
+    /// Specialized fast path for signed reads when all configs are 420.
+    /// See [`read_unsigned_clustered_config_420`] for preconditions.
+    #[inline(always)]
+    pub fn read_signed_clustered_config_420(
+        &mut self,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        cluster: usize,
+    ) -> i32 {
+        let unsigned = self.read_unsigned_clustered_config_420(histograms, br, cluster);
+        unpack_signed(unsigned)
+    }
+
+    pub fn check_final_state(self, histograms: &Histograms, br: &mut BitReader) -> Result<()> {
+        self.errors.check_for_error()?;
+        br.check_for_error()?;
+        match &histograms.codes {
+            Codes::Huffman(_) => Ok(()),
+            Codes::Ans(_) => self.ans_reader.check_final_state(),
+        }
+    }
+
+    pub fn checkpoint<const N: usize>(&self) -> Checkpoint<N> {
+        let state = match &self.state {
+            SymbolReaderState::None => StateCheckpoint::None,
+            SymbolReaderState::Lz77(lz77_state) => {
+                let mut window = [0u32; N];
+                let start = (lz77_state.num_decoded & Lz77State::WINDOW_MASK) as usize;
+                let end = ((lz77_state.num_decoded + N as u32) & Lz77State::WINDOW_MASK) as usize;
+                if start < end {
+                    let window_first = &lz77_state.window[start..];
+                    let actual_size = window_first.len().min(N);
+                    window[..actual_size].copy_from_slice(&window_first[..actual_size]);
+                } else {
+                    let window_first = &lz77_state.window[start..];
+                    let first_len = window_first
+                        .len()
+                        .min((1 << Lz77State::LOG_WINDOW_SIZE) - start);
+                    window[..first_len].copy_from_slice(&window_first[..first_len]);
+                    window[N - end..].copy_from_slice(&lz77_state.window[..end]);
+                }
+                StateCheckpoint::Lz77 {
+                    num_to_copy: lz77_state.num_to_copy,
+                    copy_pos: lz77_state.copy_pos,
+                    num_decoded: lz77_state.num_decoded,
+                    window,
+                }
+            }
+            SymbolReaderState::Rle(rle_state) => StateCheckpoint::Rle {
+                last_sym: rle_state.last_sym,
+                repeat_count: rle_state.repeat_count,
+            },
+        };
+
+        Checkpoint {
+            state,
+            ans_reader: self.ans_reader.checkpoint(),
+            errors: self.errors.clone(),
+        }
+    }
+
+    pub fn restore<const N: usize>(&mut self, checkpoint: Checkpoint<N>) {
+        match checkpoint.state {
+            StateCheckpoint::None => {
+                if !matches!(self.state, SymbolReaderState::None) {
+                    panic!("checkpoint type mismatch");
+                }
+            }
+            StateCheckpoint::Lz77 {
+                num_to_copy,
+                copy_pos,
+                num_decoded,
+                window,
+            } => {
+                let SymbolReaderState::Lz77(lz77_state) = &mut self.state else {
+                    panic!("checkpoint type mismatch");
+                };
+
+                let num_rewind = lz77_state.num_decoded - num_decoded;
+                let rewind_window = &window[..num_rewind as usize];
+
+                let start = (num_decoded & Lz77State::WINDOW_MASK) as usize;
+                let end = ((num_decoded + num_rewind) & Lz77State::WINDOW_MASK) as usize;
+                if start < end {
+                    lz77_state.window[start..end].copy_from_slice(rewind_window);
+                } else {
+                    let window_first = &mut lz77_state.window[start..];
+                    let first_len = window_first.len();
+                    window_first.copy_from_slice(&rewind_window[..first_len]);
+                    lz77_state.window[..end].copy_from_slice(&rewind_window[first_len..]);
+                }
+
+                lz77_state.num_to_copy = num_to_copy;
+                lz77_state.copy_pos = copy_pos;
+                lz77_state.num_decoded = num_decoded;
+            }
+            StateCheckpoint::Rle {
+                last_sym,
+                repeat_count,
+            } => {
+                let SymbolReaderState::Rle(rle_state) = &mut self.state else {
+                    panic!("checkpoint type mismatch");
+                };
+
+                rle_state.last_sym = last_sym;
+                rle_state.repeat_count = repeat_count;
+            }
+        }
+
+        self.ans_reader = checkpoint.ans_reader;
+        self.errors = checkpoint.errors;
+    }
+}
+
+impl Histograms {
+    pub fn decode(num_contexts: usize, br: &mut BitReader, allow_lz77: bool) -> Result<Histograms> {
+        let lz77_params = Lz77Params::read_unconditional(&(), br, &Empty {})?;
+        if !allow_lz77 && lz77_params.enabled {
+            return Err(Error::Lz77Disallowed);
+        }
+        let (num_contexts, lz77_length_uint) = if lz77_params.enabled {
+            (
+                num_contexts + 1,
+                Some(HybridUint::decode(/*log_alpha_size=*/ 8, br)?),
+            )
+        } else {
+            (num_contexts, None)
+        };
+
+        let context_map = if num_contexts > 1 {
+            decode_context_map(num_contexts, br)?
+        } else {
+            vec![0]
+        };
+        assert_eq!(context_map.len(), num_contexts);
+
+        // Capture the LZ77 distance cluster BEFORE any later resize() pads
+        // context_map with zeros (see Histograms::resize). Mirrors libjxl's
+        // ANSCode::lz77.nonserialized_distance_context (dec_ans.cc:362).
+        let lz_dist_cluster = if lz77_params.enabled {
+            *context_map.last().unwrap()
+        } else {
+            0
+        };
+
+        let use_prefix_code = br.read(1)? != 0;
+        let log_alpha_size = if use_prefix_code {
+            HUFFMAN_MAX_BITS
+        } else {
+            br.read(2)? as usize + 5
+        };
+        let num_histograms = *context_map.iter().max().unwrap() + 1;
+        let uint_configs = ((0..num_histograms).map(|_| HybridUint::decode(log_alpha_size, br)))
+            .collect::<Result<_>>()?;
+
+        let codes = if use_prefix_code {
+            Codes::Huffman(HuffmanCodes::decode(num_histograms as usize, br)?)
+        } else {
+            Codes::Ans(AnsCodes::decode(
+                num_histograms as usize,
+                log_alpha_size,
+                br,
+            )?)
+        };
+
+        Ok(Histograms {
+            lz77_params,
+            lz77_length_uint,
+            context_map,
+            lz_dist_cluster,
+            log_alpha_size,
+            uint_configs,
+            codes,
+        })
+    }
+
+    #[inline(always)]
+    pub fn map_context_to_cluster(&self, context: usize) -> usize {
+        self.context_map[context] as usize
+    }
+
+    #[inline(always)]
+    fn uint_config(&self, cluster: usize) -> &HybridUint {
+        &self.uint_configs[cluster]
+    }
+
+    #[allow(dead_code)] // Used in debug!() tracing calls
+    pub fn num_histograms(&self) -> usize {
+        *self.context_map.iter().max().unwrap() as usize + 1
+    }
+
+    pub fn resize(&mut self, num_contexts: usize) {
+        self.context_map.resize(num_contexts, 0);
+    }
+
+    /// Returns true if the config 420 fast path can be safely used.
+    /// Config 420: split_exponent=4, msb_in_token=2, lsb_in_token=0 (common pattern)
+    /// Requires: all configs are 420 AND LZ77 is disabled
+    pub fn can_use_config_420_fast_path(&self) -> bool {
+        !self.lz77_params.enabled && self.uint_configs.iter().all(|cfg| cfg.is_config_420())
+    }
+}
+
+#[cfg(test)]
+impl Histograms {
+    /// Builds a decoder that reads an octet at a time and emits its bit-reversed value.
+    pub fn reverse_octet(num_contexts: usize) -> Self {
+        let d = HuffmanCodes::byte_histogram();
+        let codes = Codes::Huffman(d);
+        let uint_configs = vec![HybridUint::new(8, 0, 0)];
+        Self {
+            lz77_params: Lz77Params {
+                enabled: false,
+                min_symbol: None,
+                min_length: None,
+            },
+            lz77_length_uint: None,
+            uint_configs,
+            log_alpha_size: 15,
+            context_map: vec![0u8; num_contexts],
+            lz_dist_cluster: 0,
+            codes,
+        }
+    }
+
+    pub fn rle(num_contexts: usize, min_symbol: u32, min_length: u32) -> Self {
+        let d = HuffmanCodes::byte_histogram_rle();
+        let codes = Codes::Huffman(d);
+        let uint_configs = vec![HybridUint::new(8, 0, 0), HybridUint::new(0, 0, 0)];
+        let mut context_map = vec![0u8; num_contexts + 1];
+        *context_map.last_mut().unwrap() = 1;
+        let lz_dist_cluster = *context_map.last().unwrap();
+        Self {
+            lz77_params: Lz77Params {
+                enabled: true,
+                min_symbol: Some(min_symbol),
+                min_length: Some(min_length),
+            },
+            lz77_length_uint: Some(HybridUint::new(8, 0, 0)),
+            uint_configs,
+            log_alpha_size: 15,
+            context_map,
+            lz_dist_cluster,
+            codes,
+        }
+    }
+}
+
+#[derive(Debug)]
+enum StateCheckpoint<const N: usize> {
+    None,
+    Lz77 {
+        num_to_copy: u32,
+        copy_pos: u32,
+        num_decoded: u32,
+        window: [u32; N],
+    },
+    Rle {
+        last_sym: Option<u32>,
+        repeat_count: u32,
+    },
+}
+
+#[derive(Debug)]
+pub struct Checkpoint<const N: usize> {
+    state: StateCheckpoint<N>,
+    ans_reader: AnsReader,
+    errors: ErrorState,
+}
+
+#[cfg(test)]
+mod test {
+    use std::ops::ControlFlow;
+
+    use test_log::test;
+
+    use super::*;
+
+    #[test]
+    fn rle_arb() {
+        let histograms = Histograms::rle(1, 240, 3);
+
+        arbtest::arbtest(|u| {
+            let width = u.int_in_range(1usize..=256)?;
+
+            let mut bitstream = Vec::new();
+            let mut expected_bytes = Vec::new();
+            u.arbitrary_loop(None, None, |u| {
+                let do_repeat = !expected_bytes.is_empty() && u.ratio(1, 4)?;
+                let range = if do_repeat { 240u8..=255 } else { 0u8..=239 };
+                let byte = u.int_in_range(range)?;
+                bitstream.push(byte);
+
+                if do_repeat {
+                    let count = byte as usize - 237;
+                    let sym = *expected_bytes.last().unwrap();
+                    for _ in 0..count {
+                        expected_bytes.push(sym);
+                    }
+                } else {
+                    expected_bytes.push(byte);
+                }
+
+                Ok(if expected_bytes.len() >= 256 {
+                    ControlFlow::Break(())
+                } else {
+                    ControlFlow::Continue(())
+                })
+            })?;
+            for b in &mut bitstream {
+                *b = b.reverse_bits();
+            }
+
+            // Read RLE
+            let mut br = BitReader::new(&bitstream);
+            let mut reader = SymbolReader::new(&histograms, &mut br, Some(width)).unwrap();
+
+            for expected in expected_bytes {
+                let actual = reader.read_unsigned_clustered(&histograms, &mut br, 0);
+                assert_eq!(actual, expected as u32);
+            }
+
+            let SymbolReaderState::Rle(rle_state) = &reader.state else {
+                panic!()
+            };
+            assert_eq!(rle_state.repeat_count, 0);
+            assert!(reader.check_final_state(&histograms, &mut br).is_ok());
+            assert_eq!(br.total_bits_available(), 0);
+
+            Ok(())
+        });
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/huffman.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/huffman.rs
new file mode 100644
index 00000000..6f5d7837
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/huffman.rs
@@ -0,0 +1,621 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use crate::bit_reader::BitReader;
+use crate::entropy_coding::decode::*;
+use crate::error::{Error, Result};
+use crate::util::{CeilLog2, NewWithCapacity, tracing_wrappers::*};
+
+pub const HUFFMAN_MAX_BITS: usize = 15;
+const TABLE_BITS: usize = 8;
+const TABLE_SIZE: usize = 1 << TABLE_BITS;
+const CODE_LENGTHS_CODE: usize = 18;
+const DEFAULT_CODE_LENGTH: u8 = 8;
+const CODE_LENGTH_REPEAT_CODE: u8 = 16;
+
+#[derive(Clone, Copy)]
+struct TableEntry {
+    bits: u8,
+    value: u16,
+}
+
+impl Debug for TableEntry {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}l{}", self.value, self.bits)
+    }
+}
+
+#[derive(Debug)]
+struct Table {
+    entries: Vec<TableEntry>,
+}
+
+/* Returns reverse(reverse(key, len) + 1, len), where reverse(key, len) is the
+bit-wise reversal of the len least significant bits of key. */
+fn get_next_key(key: u32, len: usize) -> u32 {
+    let mut step = 1 << (len - 1);
+    while key & step != 0 {
+        step >>= 1;
+    }
+    (key & (step.wrapping_sub(1))) + step
+}
+
+/* Stores code in table[0], table[step], table[2*step], ..., table[end] */
+/* Assumes that end is an integer multiple of step */
+fn replicate_value(table: &mut [TableEntry], step: usize, value: TableEntry) {
+    for v in table.iter_mut().step_by(step) {
+        *v = value;
+    }
+}
+
+/* Returns the table width of the next 2nd level table. count is the histogram
+of bit lengths for the remaining symbols, len is the code length of the next
+processed symbol */
+fn next_table_bit_size(count: &[u16], len: usize, root_bits: usize) -> usize {
+    let mut len = len;
+    let mut left = 1 << (len - root_bits);
+    while len < HUFFMAN_MAX_BITS {
+        if left <= count[len] {
+            break;
+        }
+        left -= count[len];
+        len += 1;
+        left <<= 1;
+    }
+    len - root_bits
+}
+
+impl Table {
+    fn decode_simple_table(al_size: usize, br: &mut BitReader) -> Result<Vec<TableEntry>> {
+        let max_bits = al_size.ceil_log2();
+        let num_symbols = (br.read(2)? + 1) as usize;
+        let mut symbols = [0u16; 4];
+        for symbol in symbols.iter_mut().take(num_symbols) {
+            let sym = br.read(max_bits)? as usize;
+            if sym >= al_size {
+                return Err(Error::InvalidHuffman);
+            }
+            *symbol = sym as u16;
+        }
+        if (0..num_symbols - 1).any(|i| symbols[..i].contains(&symbols[i + 1])) {
+            return Err(Error::InvalidHuffman);
+        }
+
+        let special_4_symbols = if num_symbols == 4 {
+            br.read(1)? != 0
+        } else {
+            false
+        };
+        debug!(symbols = ?symbols[..num_symbols]);
+        match (num_symbols, special_4_symbols) {
+            (1, _) => Ok(vec![
+                TableEntry {
+                    bits: 0,
+                    value: symbols[0]
+                };
+                TABLE_SIZE
+            ]),
+            (2, _) => {
+                let mut ret = Vec::new_with_capacity(TABLE_SIZE)?;
+                symbols[0..2].sort_unstable();
+                for _ in 0..(TABLE_SIZE >> 1) {
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[1],
+                    });
+                }
+                Ok(ret)
+            }
+            (3, _) => {
+                let mut ret = Vec::new_with_capacity(TABLE_SIZE)?;
+                symbols[1..3].sort_unstable();
+                for _ in 0..(TABLE_SIZE >> 2) {
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[1],
+                    });
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[2],
+                    });
+                }
+                Ok(ret)
+            }
+            (4, false) => {
+                let mut ret = Vec::new_with_capacity(TABLE_SIZE)?;
+                symbols.sort_unstable();
+                for _ in 0..(TABLE_SIZE >> 2) {
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[2],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[1],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[3],
+                    });
+                }
+                Ok(ret)
+            }
+            (4, true) => {
+                let mut ret = Vec::new_with_capacity(TABLE_SIZE)?;
+                symbols[2..4].sort_unstable();
+                for _ in 0..(TABLE_SIZE >> 3) {
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[1],
+                    });
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 3,
+                        value: symbols[2],
+                    });
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 2,
+                        value: symbols[1],
+                    });
+                    ret.push(TableEntry {
+                        bits: 1,
+                        value: symbols[0],
+                    });
+                    ret.push(TableEntry {
+                        bits: 3,
+                        value: symbols[3],
+                    });
+                }
+                Ok(ret)
+            }
+            _ => unreachable!(),
+        }
+    }
+
+    fn decode_huffman_code_lengths(
+        code_length_code_lengths: [u8; CODE_LENGTHS_CODE],
+        al_size: usize,
+        br: &mut BitReader,
+    ) -> Result<Vec<u8>> {
+        let table = Table::build(5, &code_length_code_lengths)?;
+
+        let mut symbol = 0;
+        let mut prev_code_len = DEFAULT_CODE_LENGTH;
+        let mut repeat = 0usize;
+        let mut repeat_code_len = 0;
+        let mut space = 1usize << 15;
+
+        let mut code_lengths = vec![0u8; al_size];
+
+        while symbol < al_size && space > 0 {
+            let idx = br.peek(5) as usize;
+            br.consume(table[idx].bits as usize)?;
+            let code_len = table[idx].value as u8;
+            if code_len < CODE_LENGTH_REPEAT_CODE {
+                repeat = 0;
+                code_lengths[symbol] = code_len;
+                symbol += 1;
+                if code_len != 0 {
+                    prev_code_len = code_len;
+                    space = space
+                        .checked_sub(32768usize >> code_len)
+                        .ok_or(Error::InvalidHuffman)?;
+                }
+            } else {
+                let extra_bits = code_len - 14;
+
+                let new_len = if code_len == CODE_LENGTH_REPEAT_CODE {
+                    prev_code_len
+                } else {
+                    0
+                };
+                if repeat_code_len != new_len {
+                    repeat = 0;
+                    repeat_code_len = new_len;
+                }
+                let old_repeat = repeat;
+                if repeat > 0 {
+                    repeat -= 2;
+                    repeat <<= extra_bits;
+                }
+                repeat += br.read(extra_bits as usize)? as usize + 3;
+                let repeat_delta = repeat - old_repeat;
+                if symbol + repeat_delta > al_size {
+                    return Err(Error::InvalidHuffman);
+                }
+                for i in 0..repeat_delta {
+                    code_lengths[symbol + i] = repeat_code_len;
+                }
+                symbol += repeat_delta;
+                if repeat_code_len != 0 {
+                    space = space
+                        .checked_sub(repeat_delta << (15 - repeat_code_len))
+                        .ok_or(Error::InvalidHuffman)?;
+                }
+            }
+        }
+        if space != 0 {
+            return Err(Error::InvalidHuffman);
+        }
+        Ok(code_lengths)
+    }
+
+    #[instrument(level = "trace", ret, err)]
+    fn build(root_bits: usize, code_lengths: &[u8]) -> Result<Vec<TableEntry>> {
+        if code_lengths.len() > 1 << HUFFMAN_MAX_BITS {
+            return Err(Error::InvalidHuffman);
+        }
+        let mut counts = [0u16; HUFFMAN_MAX_BITS + 1];
+        for &v in code_lengths.iter() {
+            counts[v as usize] += 1;
+        }
+
+        /* symbols sorted by code length */
+        let mut sorted = vec![0u16; code_lengths.len()];
+
+        /* offsets in sorted table for each length */
+        let mut offset = [0; HUFFMAN_MAX_BITS + 1];
+        let mut max_length = 1;
+
+        /* generate offsets into sorted symbol table by code length */
+        {
+            let mut sum = 0;
+            for len in 1..=HUFFMAN_MAX_BITS {
+                offset[len] = sum;
+                if counts[len] != 0 {
+                    sum += counts[len];
+                    max_length = len;
+                }
+            }
+        }
+
+        /* sort symbols by length, by symbol order within each length */
+        for (symbol, len) in code_lengths.iter().enumerate() {
+            if *len != 0 {
+                sorted[offset[*len as usize] as usize] = symbol as u16;
+                offset[*len as usize] += 1;
+            }
+        }
+
+        let mut table_bits = root_bits;
+        let mut table_size = 1 << table_bits;
+        let mut table_pos = 0;
+        let mut table = vec![TableEntry { bits: 0, value: 0 }; table_size];
+
+        /* special case code with only one value */
+        if offset[HUFFMAN_MAX_BITS] == 1 {
+            for v in table.iter_mut() {
+                v.bits = 0;
+                v.value = sorted[0];
+            }
+            return Ok(table);
+        }
+
+        /* fill in root table */
+        /* let's reduce the table size to a smaller size if possible, and */
+        /* create the repetitions by memcpy if possible in the coming loop */
+        if table_bits > max_length {
+            table_bits = max_length;
+            table_size = 1 << table_bits;
+        }
+        let mut key = 0u32;
+        let mut symbol = 0;
+        let mut bits = 1u8;
+        let mut step = 2;
+        loop {
+            loop {
+                if counts[bits as usize] == 0 {
+                    break;
+                }
+                let value = sorted[symbol];
+                symbol += 1;
+                replicate_value(&mut table[key as usize..], step, TableEntry { bits, value });
+                key = get_next_key(key, bits as usize);
+                counts[bits as usize] -= 1;
+            }
+            step <<= 1;
+            bits += 1;
+            if bits as usize > table_bits {
+                break;
+            }
+        }
+
+        /* if root_bits != table_bits we only created one fraction of the */
+        /* table, and we need to replicate it now. */
+        while table.len() != table_size {
+            for i in 0..table_size {
+                table[i + table_size] = table[i];
+            }
+            table_size <<= 1;
+        }
+        trace!("table of length {}, table_size: {table_size}", table.len());
+
+        /* fill in 2nd level tables and add pointers to root table */
+        let mask = (table.len() - 1) as u32;
+        let mut low = !0u32;
+        let mut step = 2;
+        for len in root_bits + 1..=max_length {
+            loop {
+                if counts[len] == 0 {
+                    break;
+                }
+                if (key & mask) != low {
+                    table_pos += table_size;
+                    table_bits = next_table_bit_size(&counts, len, root_bits);
+                    table_size = 1 << table_bits;
+                    low = key & mask;
+                    table[low as usize].bits = (table_bits + root_bits) as u8;
+                    table[low as usize].value = (table_pos - low as usize) as u16;
+                    if table.len() < table_pos + table_size {
+                        table.resize(table_pos + table_size, TableEntry { bits: 0, value: 0 });
+                    }
+                }
+                counts[len] -= 1;
+                let bits = (len - root_bits) as u8;
+                let value = sorted[symbol];
+                symbol += 1;
+                let pos = table_pos + (key as usize >> root_bits);
+                trace!(
+                    "filling 2nd level table of len {len} starting at position {pos} ({table_pos} + {}) of {}",
+                    key as usize >> root_bits,
+                    table.len()
+                );
+                replicate_value(&mut table[pos..], step, TableEntry { bits, value });
+                key = get_next_key(key, len);
+            }
+            step <<= 1;
+        }
+        Ok(table)
+    }
+
+    #[instrument(level = "trace", skip(br), ret, err)]
+    pub fn decode(al_size: usize, br: &mut BitReader) -> Result<Table> {
+        let entries = if al_size == 1 {
+            vec![TableEntry { bits: 0, value: 0 }; TABLE_SIZE]
+        } else {
+            assert!(al_size < 1 << HUFFMAN_MAX_BITS);
+            let simple_code_or_skip = br.read(2)? as usize;
+            if simple_code_or_skip == 1 {
+                Table::decode_simple_table(al_size, br)?
+            } else {
+                let mut code_length_code_lengths = [0u8; CODE_LENGTHS_CODE];
+                let mut space = 32;
+                const STATIC_HUFF_BITS: [u8; 16] = [2, 2, 2, 3, 2, 2, 2, 4, 2, 2, 2, 3, 2, 2, 2, 4];
+                const STATIC_HUFF_VALS: [u8; 16] = [0, 4, 3, 2, 0, 4, 3, 1, 0, 4, 3, 2, 0, 4, 3, 5];
+                const CODE_LENGTH_CODE_ORDER: [u8; CODE_LENGTHS_CODE] =
+                    [1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13, 14, 15];
+                let mut num_codes = 0;
+                for i in simple_code_or_skip..CODE_LENGTHS_CODE {
+                    if space <= 0 {
+                        break;
+                    }
+                    let idx = br.peek(4) as usize;
+                    br.consume(STATIC_HUFF_BITS[idx] as usize)?;
+                    let v = STATIC_HUFF_VALS[idx];
+                    code_length_code_lengths[CODE_LENGTH_CODE_ORDER[i] as usize] = v;
+                    if v != 0 {
+                        space -= 32 >> v;
+                        num_codes += 1;
+                    }
+                }
+                if num_codes != 1 && space != 0 {
+                    return Err(Error::InvalidHuffman);
+                }
+                let code_lengths =
+                    Table::decode_huffman_code_lengths(code_length_code_lengths, al_size, br)?;
+                debug!(?code_lengths);
+                Table::build(TABLE_BITS, &code_lengths)?
+            }
+        };
+        Ok(Table { entries })
+    }
+
+    #[inline(always)]
+    pub fn read(&self, br: &mut BitReader) -> u32 {
+        let mut pos = br.peek(TABLE_BITS) as usize;
+        let mut n_bits = self.entries[pos].bits as usize;
+        if n_bits > TABLE_BITS {
+            br.consume_optimistic(TABLE_BITS);
+            n_bits -= TABLE_BITS;
+            pos += self.entries[pos].value as usize;
+            pos += br.peek(n_bits) as usize;
+        }
+        br.consume_optimistic(self.entries[pos].bits as usize);
+        self.entries[pos].value as u32
+    }
+}
+
+#[derive(Debug)]
+pub struct HuffmanCodes {
+    tables: Vec<Table>,
+}
+
+impl HuffmanCodes {
+    /// Maximum total alphabet size across all Huffman tables in a single
+    /// Histograms group. This bounds the allocation cost of constructing
+    /// Huffman code-length tables and sorted symbol arrays, preventing
+    /// malformed inputs from triggering large allocations.
+    ///
+    /// Each table allocates O(al_size) for code lengths + sorted symbols,
+    /// so total allocation is ~3 * total_alphabet bytes. Without this cap,
+    /// a crafted stream claiming many tables with large alphabets can
+    /// trigger megabytes of allocations from a few bytes of input.
+    ///
+    /// The JXL spec allows up to 256 clusters × 32768 symbols = 8,388,608.
+    /// The per-table input-proportional cap (ALPHABET_BITS_RATIO) is the
+    /// primary DoS defense; this is a backstop.
+    const MAX_TOTAL_ALPHABET_SIZE: usize = 256 * 32768;
+
+    /// Maximum alphabet size for any single Huffman table, proportional
+    /// to available input. Huffman code-length repeat codes grow
+    /// exponentially (a chain of code-17 repeats can encode hundreds of
+    /// zero-length entries in a few bits), so the ratio must be generous.
+    /// A ratio of 256 still rejects 32K-entry allocations from <128 bits
+    /// of input while allowing legitimate tables.
+    const ALPHABET_BITS_RATIO: usize = 256;
+
+    pub fn decode(num: usize, br: &mut BitReader) -> Result<HuffmanCodes> {
+        let alphabet_sizes: Vec<usize> = (0..num)
+            .map(|_| Ok(decode_varint16(br)? as usize + 1))
+            .collect::<Result<_>>()?;
+        let max = *alphabet_sizes.iter().max().unwrap();
+        if max >= (1 << HUFFMAN_MAX_BITS) {
+            return Err(Error::AlphabetTooLargeHuff(max));
+        }
+        // Bound total allocations across all tables.
+        let total_alphabet: usize = alphabet_sizes.iter().sum();
+        if total_alphabet > Self::MAX_TOTAL_ALPHABET_SIZE {
+            return Err(Error::AlphabetTooLargeHuff(total_alphabet));
+        }
+        // Bound per-table allocation relative to remaining input.
+        // A Huffman code-length stream needs at least ~1 bit per symbol
+        // (repeat codes can batch, but the code-length-code overhead
+        // consumes the savings). With only K bits remaining, an al_size
+        // of K * RATIO entries is the maximum that could plausibly be
+        // encoded; anything beyond that will fail with OutOfBounds during
+        // decode_huffman_code_lengths anyway, so reject early to avoid
+        // the allocation.
+        let available = br.total_bits_available();
+        let input_cap = available.saturating_mul(Self::ALPHABET_BITS_RATIO);
+        for &sz in &alphabet_sizes {
+            if sz > 1 && sz > input_cap {
+                return Err(Error::AlphabetTooLargeHuff(sz));
+            }
+        }
+        let tables = alphabet_sizes
+            .iter()
+            .map(|sz| Table::decode(*sz, br))
+            .collect::<Result<_>>()?;
+        Ok(HuffmanCodes { tables })
+    }
+
+    #[inline(always)]
+    pub fn read(&self, br: &mut BitReader, ctx: usize) -> u32 {
+        let table = &self.tables[ctx];
+        table.read(br)
+    }
+
+    pub fn single_symbol(&self, ctx: usize) -> Option<u32> {
+        if let TableEntry { bits: 0, value } = self.tables[ctx].entries[0] {
+            Some(value as u32)
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+impl Table {
+    fn new_single_symbol(sym: u16) -> Table {
+        Table {
+            entries: vec![
+                TableEntry {
+                    bits: 0,
+                    value: sym
+                };
+                TABLE_SIZE
+            ],
+        }
+    }
+}
+
+#[cfg(test)]
+impl HuffmanCodes {
+    /// Builds Huffman histogram of 256 8-bit symbols.
+    pub(super) fn byte_histogram() -> HuffmanCodes {
+        let mut br = BitReader::new(&[0b11101111, 0b00111111, 0, 1, 0, 0b10100000, 0b0110]);
+        HuffmanCodes::decode(1, &mut br).unwrap()
+    }
+
+    pub(super) fn byte_histogram_rle() -> HuffmanCodes {
+        let mut histogram = Self::byte_histogram();
+        histogram.tables.push(Table::new_single_symbol(1));
+        histogram
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use test_log::test;
+
+    #[test]
+    fn byte_histogram() {
+        let codes = HuffmanCodes::byte_histogram();
+
+        let expected_arr = [8u8, 13, 21, 34, 55, 89, 144, 233];
+        let bits = expected_arr.map(|v| v.reverse_bits());
+        let mut br = BitReader::new(&bits);
+
+        for expected in expected_arr {
+            assert_eq!(codes.read(&mut br, 0), expected as u32);
+        }
+    }
+
+    #[test]
+    fn long_code() {
+        // This correctly sums to 4096 table entries
+        const CODE: [u8; 520] = [
+            3, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 8, 9, 9, 9, 9, 9,
+            9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+            9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 8, 9, 9, 9, 9, 9, 8, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 8, 8, 8, 8, 9, 9, 9, 9, 8, 8, 9, 9, 9, 9, 9, 9,
+            9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+            9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 9, 9, 9, 9,
+            9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 4, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 10, 7, 9, 9, 11, 12, 12,
+        ];
+        assert!(Table::build(TABLE_BITS, &CODE).is_ok());
+    }
+
+    #[test]
+    fn test_huffman_code_lengths_underflow() {
+        let mut br = BitReader::new(&[0xff, 0xff, 0x7f, 0x7a]);
+        let _ = Table::decode_huffman_code_lengths(
+            [2, 0, 0, 0, 0, 4, 3, 4, 3, 0, 0, 4, 4, 4, 0, 0, 4, 3],
+            1791,
+            &mut br,
+        );
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/hybrid_uint.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/hybrid_uint.rs
new file mode 100644
index 00000000..164f02b3
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/hybrid_uint.rs
@@ -0,0 +1,144 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::bit_reader::BitReader;
+use crate::error::Error;
+
+use crate::util::CeilLog2;
+
+#[derive(Debug)]
+pub struct HybridUint {
+    split_token: u32,
+    split_exponent: u32,
+    msb_in_token: u32,
+    lsb_in_token: u32,
+}
+
+impl HybridUint {
+    pub(super) fn is_split_exponent_zero(&self) -> bool {
+        self.split_exponent == 0
+    }
+
+    pub fn decode(log_alpha_size: usize, br: &mut BitReader) -> Result<HybridUint, Error> {
+        let split_exponent = br.read((log_alpha_size + 1).ceil_log2())? as u32;
+        let split_token = 1u32 << split_exponent;
+        let msb_in_token;
+        let lsb_in_token;
+        if split_exponent != log_alpha_size as u32 {
+            let nbits = (split_exponent + 1).ceil_log2() as usize;
+            msb_in_token = br.read(nbits)? as u32;
+            if msb_in_token > split_exponent {
+                return Err(Error::InvalidUintConfig(split_exponent, msb_in_token, None));
+            }
+            let nbits = (split_exponent - msb_in_token + 1).ceil_log2() as usize;
+            lsb_in_token = br.read(nbits)? as u32;
+        } else {
+            msb_in_token = 0;
+            lsb_in_token = 0;
+        }
+        if lsb_in_token + msb_in_token > split_exponent {
+            return Err(Error::InvalidUintConfig(
+                split_exponent,
+                msb_in_token,
+                Some(lsb_in_token),
+            ));
+        }
+        Ok(HybridUint {
+            split_token,
+            split_exponent,
+            msb_in_token,
+            lsb_in_token,
+        })
+    }
+
+    /// Returns true if this config matches the 420 pattern (common in e3 images):
+    /// split_exponent=4, msb_in_token=2, lsb_in_token=0
+    #[inline(always)]
+    pub fn is_config_420(&self) -> bool {
+        self.split_exponent == 4
+            && self.split_token == 16
+            && self.msb_in_token == 2
+            && self.lsb_in_token == 0
+    }
+
+    /// Specialized fast path for 420 config:
+    /// split_exponent=4, msb_in_token=2, lsb_in_token=0
+    ///
+    /// `nbits_acc` accumulates raw nbits values via OR. If any call produces
+    /// nbits >= 32 (invalid bitstream), bit 5+ will be set in the accumulator.
+    /// Check `nbits_acc >= 32` after a batch of reads.
+    #[inline(always)]
+    pub fn read_config_420(symbol: u32, br: &mut BitReader, nbits_acc: &mut u32) -> u32 {
+        if symbol < 16 {
+            return symbol;
+        }
+
+        // Equivalent to: 2 + ((symbol - 16) >> 2)
+        let nbits_raw = (symbol >> 2) - 2;
+        *nbits_acc |= nbits_raw;
+        let nbits = nbits_raw & 31;
+        let bits = br.read_optimistic(nbits as usize) as u32;
+        let hi = (symbol & 3) | 4;
+
+        (hi << nbits) | bits
+    }
+
+    /// Reads a hybrid uint value from the bitstream.
+    ///
+    /// `nbits_acc` accumulates raw nbits values via OR. If any call produces
+    /// nbits >= 32 (invalid bitstream), bit 5+ will be set in the accumulator.
+    /// Check `nbits_acc >= 32` after a batch of reads.
+    #[inline(always)]
+    pub fn read(&self, symbol: u32, br: &mut BitReader, nbits_acc: &mut u32) -> u32 {
+        if symbol < self.split_token {
+            return symbol;
+        }
+        // Fast path: when msb_in_token == 0 && lsb_in_token == 0, hi is always 1
+        // and the low/shift computation is a no-op.
+        if self.msb_in_token == 0 && self.lsb_in_token == 0 {
+            let nbits_raw = self.split_exponent + symbol - self.split_token;
+            *nbits_acc |= nbits_raw;
+            let nbits = nbits_raw & 31;
+            let bits = br.read_optimistic(nbits as usize) as u32;
+            return (1 << nbits) | bits;
+        }
+        let bits_in_token = self.lsb_in_token + self.msb_in_token;
+        let nbits_raw =
+            self.split_exponent - bits_in_token + ((symbol - self.split_token) >> bits_in_token);
+        *nbits_acc |= nbits_raw;
+        let nbits = nbits_raw & 31;
+        let low = symbol & ((1 << self.lsb_in_token) - 1);
+        let symbol_nolow = symbol >> self.lsb_in_token;
+        let bits = br.read_optimistic(nbits as usize) as u32;
+        let hi = (symbol_nolow & ((1 << self.msb_in_token) - 1)) | (1 << self.msb_in_token);
+        (((hi << nbits) | bits) << self.lsb_in_token) | low
+    }
+}
+
+#[cfg(test)]
+impl HybridUint {
+    pub fn new(split_exponent: u32, msb_in_token: u32, lsb_in_token: u32) -> Self {
+        Self {
+            split_token: 1 << split_exponent,
+            split_exponent,
+            msb_in_token,
+            lsb_in_token,
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test_hybrid_uint_decode_invalid() {
+        use super::*;
+        let mut br = BitReader::new(&[10, 75, 10, 75, 168, 139, 132, 255, 244]);
+        br.skip_bits(1).unwrap();
+        if let Ok(uint) = HybridUint::decode(15, &mut br) {
+            let mut acc = 0u32;
+            uint.read(1022, &mut br, &mut acc);
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/mod.rs
new file mode 100644
index 00000000..8326873d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/entropy_coding/mod.rs
@@ -0,0 +1,10 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub mod ans;
+pub mod context_map;
+pub mod decode;
+pub mod huffman;
+pub mod hybrid_uint;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/error.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/error.rs
new file mode 100644
index 00000000..9d30e8a0
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/error.rs
@@ -0,0 +1,319 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::collections::TryReserveError;
+
+use thiserror::Error;
+
+use crate::{
+    api::{JxlColorType, JxlDataFormat},
+    entropy_coding::huffman::HUFFMAN_MAX_BITS,
+    features::spline::Point,
+    image::DataTypeTag,
+};
+
+#[derive(Error, Debug)]
+#[non_exhaustive]
+pub enum Error {
+    #[error("Invalid raw quantization table")]
+    InvalidRawQuantTable,
+    #[error("Invalid distance band {0}: {1}")]
+    InvalidDistanceBand(usize, f32),
+    #[error("Invalid AFV bands")]
+    InvalidAFVBands,
+    #[error("Invalid quantization table weight: {0}")]
+    InvalidQuantizationTableWeight(f32),
+    #[error("Read out of bounds; size hint: {0}")]
+    OutOfBounds(usize),
+    #[error("Section is too short")]
+    SectionTooShort,
+    #[error("Non-zero padding bits")]
+    NonZeroPadding,
+    #[error("Invalid signature")]
+    InvalidSignature,
+    #[error("Invalid exponent_bits_per_sample: {0}")]
+    InvalidExponent(u32),
+    #[error("Invalid mantissa_bits: {0}")]
+    InvalidMantissa(i32),
+    #[error("Invalid bits_per_sample: {0}")]
+    InvalidBitsPerSample(u32),
+    #[error("Invalid enum value {0} for {1}")]
+    InvalidEnum(u32, String),
+    #[error("Value of dim_shift {0} is too large")]
+    DimShiftTooLarge(u32),
+    #[error("Float is NaN or Inf")]
+    FloatNaNOrInf,
+    #[error("Invalid gamma value: {0}")]
+    InvalidGamma(f32),
+    #[error("Invalid color encoding: no ICC and unknown TF / ColorSpace")]
+    InvalidColorEncoding,
+    #[error("Invalid color space: should be one of RGB, Gray or XYB")]
+    InvalidColorSpace,
+    #[error("Only perceptual rendering intent implemented for XYB ICC profile.")]
+    InvalidRenderingIntent,
+    #[error("Invalid intensity_target: {0}")]
+    InvalidIntensityTarget(f32),
+    #[error("Invalid min_nits: {0}")]
+    InvalidMinNits(f32),
+    #[error("Invalid linear_below {1}, relative_to_max_display is {0}")]
+    InvalidLinearBelow(bool, f32),
+    #[error("Overflow when computing a bitstream size")]
+    SizeOverflow,
+    #[error("Invalid ISOBMMF container")]
+    InvalidBox,
+    #[error("ICC is too large")]
+    IccTooLarge,
+    #[error("Invalid ICC stream: unexpected end of stream")]
+    IccEndOfStream,
+    #[error("Invalid ICC stream")]
+    InvalidIccStream,
+    #[error("Invalid HybridUintConfig: {0} {1} {2:?}")]
+    InvalidUintConfig(u32, u32, Option<u32>),
+    #[error("LZ77 enabled when explicitly disallowed")]
+    Lz77Disallowed,
+    #[error("LZ77 repeat symbol encountered without decoding any symbols")]
+    UnexpectedLz77Repeat,
+    #[error("Huffman alphabet too large: {0}, max is {max}", max = 1 << HUFFMAN_MAX_BITS)]
+    AlphabetTooLargeHuff(usize),
+    #[error("Invalid Huffman code")]
+    InvalidHuffman,
+    #[error("Invalid ANS histogram")]
+    InvalidAnsHistogram,
+    #[error("ANS stream checksum mismatch")]
+    AnsChecksumMismatch,
+    #[error("Integer too large: nbits {0} > 29")]
+    IntegerTooLarge(u32),
+    #[error("Invalid context map: context id {0} > 255")]
+    InvalidContextMap(u32),
+    #[error("Invalid context map: number of histogram {0}, number of distinct histograms {1}")]
+    InvalidContextMapHole(u32, u32),
+    #[error(
+        "Invalid permutation: skipped elements {skip} and encoded elements {end} don't fit in permutation of size {size}"
+    )]
+    InvalidPermutationSize { size: u32, skip: u32, end: u32 },
+    #[error(
+        "Invalid permutation: Lehmer code {lehmer} out of bounds in permutation of size {size} at index {idx}"
+    )]
+    InvalidPermutationLehmerCode { size: u32, idx: u32, lehmer: u32 },
+    #[error("Invalid quant encoding mode")]
+    InvalidQuantEncodingMode,
+    #[error("Invalid quant encoding with mode {mode} and required size {required_size}")]
+    InvalidQuantEncoding { mode: u8, required_size: usize },
+    // FrameHeader format errors
+    #[error("Invalid extra channel upsampling: upsampling: {0} dim_shift: {1} ec_upsampling: {2}")]
+    InvalidEcUpsampling(u32, u32, u32),
+    #[error("Patches with mixed upsampling not supported: color {0}, ec {1}")]
+    PatchesUnsupportedMixedUpsampling(u32, u32),
+    #[error("Invalid lf level in UseLFFrame frame: {0}")]
+    InvalidLfLevel(u32),
+    #[error("Num_ds: {0} should be smaller than num_passes: {1}")]
+    NumPassesTooLarge(u32, u32),
+    #[error("Passes::downsample is non-decreasing")]
+    PassesDownsampleNonDecreasing,
+    #[error("Passes::last_pass is non-increasing")]
+    PassesLastPassNonIncreasing,
+    #[error("Passes::last_pass has too large elements")]
+    PassesLastPassTooLarge,
+    #[error("Non-patch reference frame with a crop")]
+    NonPatchReferenceWithCrop,
+    #[error("Non-444 chroma subsampling is not allowed when adaptive DC smoothing is enabled")]
+    Non444ChromaSubsampling,
+    #[error("Non-444 chroma subsampling is not allowed for bigger than 8x8 transforms")]
+    InvalidBlockSizeForChromaSubsampling,
+    #[error("Out of memory: {0}")]
+    OutOfMemory(#[from] TryReserveError),
+    #[error("Out of memory when allocating image of byte size {0}x{1}")]
+    ImageOutOfMemory(usize, usize),
+    #[error("Image size too large: {0}x{1}")]
+    ImageSizeTooLarge(usize, usize),
+    #[error("Image dimension too large: {0}")]
+    ImageDimensionTooLarge(u64),
+    #[error("Invalid image size: {0}x{1}")]
+    InvalidImageSize(usize, usize),
+    // Generic arithmetic overflow. Prefer using other errors if possible.
+    #[error("Arithmetic overflow")]
+    ArithmeticOverflow,
+    #[error(
+        "Pipeline channel type mismatch: stage {0} channel {1}, expected {2:?} but found {3:?}"
+    )]
+    PipelineChannelTypeMismatch(String, usize, DataTypeTag, DataTypeTag),
+    #[error("Invalid stage {0} after extend stage")]
+    PipelineInvalidStageAfterExtend(String),
+    #[error("Trying to copy rects of different size, src: {0}x{1} dst {2}x{3}")]
+    CopyOfDifferentSize(usize, usize, usize, usize),
+    #[error("LF quantization factor is too small: {0}")]
+    LfQuantFactorTooSmall(f32),
+    #[error("HF quantization factor is too small: {0}")]
+    HfQuantFactorTooSmall(f32),
+    #[error("Invalid modular mode predictor: {0}")]
+    InvalidPredictor(u32),
+    #[error("Invalid modular mode property: {0}")]
+    InvalidProperty(u32),
+    #[error("Invalid alpha channel for blending: {0}, limit is {1}")]
+    InvalidBlendingAlphaChannel(usize, usize),
+    #[error("Invalid alpha channel for blending: {0}, limit is {1}")]
+    PatchesInvalidAlphaChannel(usize, usize),
+    #[error("Invalid patch blend mode: {0}, limit is {1}")]
+    PatchesInvalidBlendMode(u8, u8),
+    #[error("Invalid Patch: negative {0}-coordinate: {1} base {0},  {2} delta {0}")]
+    PatchesInvalidDelta(String, usize, i32),
+    #[error(
+        "Invalid position specified in reference frame in {0}-coordinate: {0}0 + {0}size = {1} + {2} > {3} = reference_frame {0}size"
+    )]
+    PatchesInvalidPosition(String, usize, usize, usize),
+    #[error("Patches invalid reference frame at index {0}")]
+    PatchesInvalidReference(usize),
+    #[error("Invalid Patch {0}: at {1} + {2} > {3}")]
+    PatchesOutOfBounds(String, usize, usize, usize),
+    #[error("Patches cannot use frames saved post color transforms")]
+    PatchesPostColorTransform(),
+    #[error("Too many {0}: {1}, limit is {2}")]
+    PatchesTooMany(String, usize, usize),
+    #[error("Reference too large: {0}, limit is {1}")]
+    PatchesRefTooLarge(usize, usize),
+    #[error("Point list is empty")]
+    PointListEmpty,
+    #[error("Too large area for spline: {0}, limit is {1}")]
+    SplinesAreaTooLarge(u64, u64),
+    #[error("Too large manhattan_distance reached: {0}, limit is {1}")]
+    SplinesDistanceTooLarge(u64, u64),
+    #[error("Too many splines: {0}, limit is {1}")]
+    SplinesTooMany(u32, u32),
+    #[error("Spline has adjacent coinciding control points: point[{0}]: {1:?}, point[{2}]: {3:?}")]
+    SplineAdjacentCoincidingControlPoints(usize, Point, usize, Point),
+    #[error("Too many control points for splines: {0}, limit is {1}")]
+    SplinesTooManyControlPoints(u32, u32),
+    #[error(
+        "Spline point outside valid bounds: coordinates: {0:?}, out of bounds: {1}, bounds: {2:?}"
+    )]
+    SplinesPointOutOfRange(Point, i32, std::ops::Range<i32>),
+    #[error("Spline coordinates out of bounds: {0}, limit is {1}")]
+    SplinesCoordinatesLimit(isize, isize),
+    #[error("Spline delta-delta is out of bounds: {0}, limit is {1}")]
+    SplinesDeltaLimit(i64, i64),
+    #[error("Modular tree too large: {0}, limit is {1}")]
+    TreeTooLarge(usize, usize),
+    #[error("Modular tree too tall: {0}, limit is {1}")]
+    TreeTooTall(usize, usize),
+    #[error("Modular tree multiplier too large: {0}, limit is {1}")]
+    TreeMultiplierTooLarge(u32, u32),
+    #[error("Modular tree multiplier too large: {0}, multiplier log is {1}")]
+    TreeMultiplierBitsTooLarge(u32, u32),
+    #[error(
+        "Modular tree splits on property {0} at value {1}, which is outside the possible range of [{2}, {3}]"
+    )]
+    TreeSplitOnEmptyRange(u8, i32, i32, i32),
+    #[error("Modular stream requested a global tree but there isn't one")]
+    NoGlobalTree,
+    #[error("Invalid transform id")]
+    InvalidTransformId,
+    #[error("Invalid RCT type {0}")]
+    InvalidRCT(u32),
+    #[error("Invalid channel range: {0}..{1}, {2} total channels")]
+    InvalidChannelRange(usize, usize, usize),
+    #[error("Invalid transform: mixing different channels (different shape or different shift)")]
+    MixingDifferentChannels,
+    #[error("Invalid transform: squeezing meta-channels needs an in-place transform")]
+    MetaSqueezeRequiresInPlace,
+    #[error("Invalid transform: too many squeezes (shift > 30)")]
+    TooManySqueezes,
+    #[error("Invalid BlockConextMap: too big: num_lf_context: {0}, num_qf_thresholds: {1}")]
+    BlockContextMapSizeTooBig(usize, usize),
+    #[error("Invalid BlockConextMap: too many distinct contexts.")]
+    TooManyBlockContexts,
+    #[error("Base color correlation out of range.")]
+    BaseColorCorrelationOutOfRange,
+    #[error("Invalid EPF sharpness param {0}")]
+    InvalidEpfValue(i32),
+    #[error("Invalid VarDCT transform type {0}")]
+    InvalidVarDCTTransform(usize),
+    #[error("Invalid VarDCT transform map")]
+    InvalidVarDCTTransformMap,
+    #[error("VarDCT transform overflows HF group")]
+    HFBlockOutOfBounds,
+    #[error("Invalid AC: nonzeros {0} is too large for {1} 8x8 blocks")]
+    InvalidNumNonZeros(usize, usize),
+    #[error("Invalid AC: histogram index {0} is out of bounds (num_histograms = {1})")]
+    InvalidHistogramIndex(usize, usize),
+    #[error("Invalid AC: {0} nonzeros after decoding block")]
+    EndOfBlockResidualNonZeros(usize),
+    #[error("Unknown transfer function for ICC profile")]
+    TransferFunctionUnknown,
+    #[error("Attempting to write out of Bounds when writing ICC")]
+    IccWriteOutOfBounds,
+    #[error("Invalid tag string when writing ICC: {0}")]
+    IccInvalidTagString(String),
+    #[error("Invalid text for ICC MLuc string, not ascii: {0}")]
+    IccMlucTextNotAscii(String),
+    #[error("ICC value is out of range / NaN: {0}")]
+    IccValueOutOfRangeS15Fixed16(f32),
+    #[error("Y value is too small: {0}")]
+    IccInvalidWhitePointY(f32),
+    #[error("{2}: wx: {0}, wy: {1}")]
+    IccInvalidWhitePoint(f32, f32, String),
+    #[error("Determinant is zero or too small, matrix is close to singular: |det| = {0}.")]
+    MatrixInversionFailed(f64),
+    #[error("Unsupported transfer function when writing ICC")]
+    IccUnsupportedTransferFunction,
+    #[error("Table size too large when writing ICC: {0}")]
+    IccTableSizeExceeded(usize),
+    #[error("Invalid CMS configuration: requested ICC but no CMS is configured")]
+    ICCOutputNoCMS,
+    #[error("Non-XYB image requires CMS to convert to different output color profile")]
+    NonXybOutputNoCMS,
+    #[error("I/O error: {0}")]
+    IOError(#[from] std::io::Error),
+    #[error("Wrong buffer count: {0} buffers given, {1} buffers expected")]
+    WrongBufferCount(usize, usize),
+    #[error("Image is not grayscale, but grayscale output was requested")]
+    NotGrayscale,
+    #[error("Invalid output buffer byte size {0}x{1} for {2}x{3} image with type {4:?} {5:?}")]
+    InvalidOutputBufferSize(usize, usize, usize, usize, JxlColorType, JxlDataFormat),
+    #[error("Attempting to save channels with different downsample amounts: {0:?} and {1:?}")]
+    SaveDifferentDownsample((u8, u8), (u8, u8)),
+    #[error("Image has {0} extra channels, more than the maximum of 256")]
+    TooManyExtraChannels(usize),
+    #[error("No LF frame for level {0}")]
+    NoLfFrame(u32),
+    #[error(
+        "CMS transform increases channel count from {in_channels} to {out_channels}, which is not supported"
+    )]
+    CmsChannelCountIncrease {
+        in_channels: usize,
+        out_channels: usize,
+    },
+    #[error(
+        "Cannot output extra channel {channel_index} ({channel_type:?}): it was consumed by CMS color conversion"
+    )]
+    CmsConsumedChannelRequested {
+        channel_index: usize,
+        channel_type: String,
+    },
+    #[error("CMS error: {0}")]
+    CmsError(String),
+    #[error("Security limit exceeded: {resource} is {actual}, limit is {limit}")]
+    LimitExceeded {
+        resource: &'static str,
+        actual: u64,
+        limit: u64,
+    },
+    #[error("Decoding cancelled")]
+    Cancelled,
+    #[cfg(feature = "jpeg")]
+    #[error("Invalid JBRD box: {0}")]
+    InvalidJbrd(String),
+    #[error("Invalid gain map bundle (jhgm): {0}")]
+    InvalidGainMap(String),
+}
+
+impl From<enough::StopReason> for Error {
+    fn from(reason: enough::StopReason) -> Self {
+        match reason {
+            enough::StopReason::Cancelled | enough::StopReason::TimedOut | _ => Error::Cancelled,
+        }
+    }
+}
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/features/blending.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/blending.rs
new file mode 100644
index 00000000..208b28fc
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/blending.rs
@@ -0,0 +1,806 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::needless_range_loop)]
+
+use crate::headers::extra_channels::{ExtraChannel, ExtraChannelInfo};
+
+use super::patches::{PatchBlendMode, PatchBlending};
+
+#[inline]
+fn maybe_clamp(v: f32, clamp: bool) -> f32 {
+    if clamp { v.clamp(0.0, 1.0) } else { v }
+}
+
+pub fn perform_blending<T: AsRef<[f32]>, V: AsMut<[f32]>>(
+    bg: &mut [V],
+    fg: &[T],
+    color_blending: &PatchBlending,
+    ec_blending: &[PatchBlending],
+    extra_channel_info: &[ExtraChannelInfo],
+) {
+    let has_alpha = extra_channel_info
+        .iter()
+        .any(|info| info.ec_type == ExtraChannel::Alpha);
+    let num_ec = extra_channel_info.len();
+    let xsize = bg[0].as_mut().len();
+    let num_channels = 3 + num_ec;
+
+    // Flat temporary buffer: tmp[c * xsize + x] instead of tmp[c][x].
+    // Single allocation instead of (1 + num_channels) allocations.
+    let mut tmp = vec![0.0f32; num_channels * xsize];
+    let t = |c: usize, x: usize| c * xsize + x;
+
+    for i in 0..num_ec {
+        let alpha = ec_blending[i].alpha_channel;
+        let clamp = ec_blending[i].clamp;
+        let alpha_associated = extra_channel_info[alpha].alpha_associated();
+
+        match ec_blending[i].mode {
+            PatchBlendMode::Add => {
+                for x in 0..xsize {
+                    tmp[t(3 + i, x)] = bg[3 + i].as_mut()[x] + fg[3 + i].as_ref()[x];
+                }
+            }
+            PatchBlendMode::BlendAbove => {
+                if i == alpha {
+                    for x in 0..xsize {
+                        let fa = maybe_clamp(fg[3 + alpha].as_ref()[x], clamp);
+                        tmp[t(3 + i, x)] = 1.0 - (1.0 - fa) * (1.0 - bg[3 + i].as_mut()[x]);
+                    }
+                } else if alpha_associated {
+                    for x in 0..xsize {
+                        let fa = maybe_clamp(fg[3 + alpha].as_ref()[x], clamp);
+                        tmp[t(3 + i, x)] =
+                            fg[3 + i].as_ref()[x] + bg[3 + i].as_mut()[x] * (1.0 - fa);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        let fa = maybe_clamp(fg[3 + alpha].as_ref()[x], clamp);
+                        let new_a = 1.0 - (1.0 - fa) * (1.0 - bg[3 + alpha].as_mut()[x]);
+                        let rnew_a = if new_a > 0.0 { 1.0 / new_a } else { 0.0 };
+                        tmp[t(3 + i, x)] = (fg[3 + i].as_ref()[x] * fa
+                            + bg[3 + i].as_mut()[x] * bg[3 + alpha].as_mut()[x] * (1.0 - fa))
+                            * rnew_a;
+                    }
+                }
+            }
+            PatchBlendMode::BlendBelow => {
+                if i == alpha {
+                    for x in 0..xsize {
+                        let ba = maybe_clamp(bg[3 + alpha].as_mut()[x], clamp);
+                        tmp[t(3 + i, x)] = 1.0 - (1.0 - ba) * (1.0 - fg[3 + i].as_ref()[x]);
+                    }
+                } else if alpha_associated {
+                    for x in 0..xsize {
+                        let ba = maybe_clamp(bg[3 + alpha].as_mut()[x], clamp);
+                        tmp[t(3 + i, x)] =
+                            bg[3 + i].as_mut()[x] + fg[3 + i].as_ref()[x] * (1.0 - ba);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        let ba = maybe_clamp(bg[3 + alpha].as_mut()[x], clamp);
+                        let new_a = 1.0 - (1.0 - ba) * (1.0 - fg[3 + alpha].as_ref()[x]);
+                        let rnew_a = if new_a > 0.0 { 1.0 / new_a } else { 0.0 };
+                        tmp[t(3 + i, x)] = (bg[3 + i].as_mut()[x] * ba
+                            + fg[3 + i].as_ref()[x] * fg[3 + alpha].as_ref()[x] * (1.0 - ba))
+                            * rnew_a;
+                    }
+                }
+            }
+            PatchBlendMode::AlphaWeightedAddAbove => {
+                if i == alpha {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = bg[3 + i].as_mut()[x];
+                    }
+                } else if clamp {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = bg[3 + i].as_mut()[x]
+                            + fg[3 + i].as_ref()[x] * fg[3 + alpha].as_ref()[x].clamp(0.0, 1.0);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = bg[3 + i].as_mut()[x]
+                            + fg[3 + i].as_ref()[x] * fg[3 + alpha].as_ref()[x];
+                    }
+                }
+            }
+            PatchBlendMode::AlphaWeightedAddBelow => {
+                if i == alpha {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = fg[3 + i].as_ref()[x];
+                    }
+                } else if clamp {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = fg[3 + i].as_ref()[x]
+                            + bg[3 + i].as_mut()[x] * bg[3 + alpha].as_mut()[x].clamp(0.0, 1.0);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = fg[3 + i].as_ref()[x]
+                            + bg[3 + i].as_mut()[x] * bg[3 + alpha].as_mut()[x];
+                    }
+                }
+            }
+            PatchBlendMode::Mul => {
+                if clamp {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] =
+                            bg[3 + i].as_mut()[x] * fg[3 + i].as_ref()[x].clamp(0.0, 1.0);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        tmp[t(3 + i, x)] = bg[3 + i].as_mut()[x] * fg[3 + i].as_ref()[x];
+                    }
+                }
+            }
+            PatchBlendMode::Replace => {
+                for x in 0..xsize {
+                    tmp[t(3 + i, x)] = fg[3 + i].as_ref()[x];
+                }
+            }
+            PatchBlendMode::None => {
+                for x in 0..xsize {
+                    tmp[t(3 + i, x)] = bg[3 + i].as_mut()[x];
+                }
+            }
+        }
+    }
+
+    let alpha = color_blending.alpha_channel;
+    let clamp = color_blending.clamp;
+
+    match color_blending.mode {
+        PatchBlendMode::Add => {
+            for c in 0..3 {
+                for x in 0..xsize {
+                    tmp[t(c, x)] = bg[c].as_mut()[x] + fg[c].as_ref()[x];
+                }
+            }
+        }
+        PatchBlendMode::AlphaWeightedAddAbove => {
+            for c in 0..3 {
+                if !has_alpha {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] = bg[c].as_mut()[x] + fg[c].as_ref()[x];
+                    }
+                } else if clamp {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] = bg[c].as_mut()[x]
+                            + fg[c].as_ref()[x] * fg[3 + alpha].as_ref()[x].clamp(0.0, 1.0);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] =
+                            bg[c].as_mut()[x] + fg[c].as_ref()[x] * fg[3 + alpha].as_ref()[x];
+                    }
+                }
+            }
+        }
+        PatchBlendMode::AlphaWeightedAddBelow => {
+            for c in 0..3 {
+                if !has_alpha {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] = bg[c].as_mut()[x] + fg[c].as_ref()[x];
+                    }
+                } else if clamp {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] = fg[c].as_ref()[x]
+                            + bg[c].as_mut()[x] * bg[3 + alpha].as_mut()[x].clamp(0.0, 1.0);
+                    }
+                } else {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] =
+                            fg[c].as_ref()[x] + bg[c].as_mut()[x] * bg[3 + alpha].as_mut()[x];
+                    }
+                }
+            }
+        }
+        PatchBlendMode::BlendAbove => {
+            if !has_alpha {
+                for c in 0..3 {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] = fg[c].as_ref()[x];
+                    }
+                }
+            } else if extra_channel_info[alpha].alpha_associated() {
+                for x in 0..xsize {
+                    let fa = maybe_clamp(fg[3 + alpha].as_ref()[x], clamp);
+                    for c in 0..3 {
+                        tmp[t(c, x)] = fg[c].as_ref()[x] + bg[c].as_mut()[x] * (1.0 - fa);
+                    }
+                    tmp[t(3 + alpha, x)] = 1.0 - (1.0 - fa) * (1.0 - bg[3 + alpha].as_mut()[x]);
+                }
+            } else {
+                for x in 0..xsize {
+                    let fa = maybe_clamp(fg[3 + alpha].as_ref()[x], clamp);
+                    let new_a = 1.0 - (1.0 - fa) * (1.0 - bg[3 + alpha].as_mut()[x]);
+                    let rnew_a = if new_a > 0.0 { 1.0 / new_a } else { 0.0 };
+                    for c in 0..3 {
+                        tmp[t(c, x)] = (fg[c].as_ref()[x] * fa
+                            + bg[c].as_mut()[x] * bg[3 + alpha].as_mut()[x] * (1.0 - fa))
+                            * rnew_a;
+                    }
+                    tmp[t(3 + alpha, x)] = new_a;
+                }
+            }
+        }
+        PatchBlendMode::BlendBelow => {
+            if !has_alpha {
+                for c in 0..3 {
+                    for x in 0..xsize {
+                        tmp[t(c, x)] = bg[c].as_mut()[x];
+                    }
+                }
+            } else if extra_channel_info[alpha].alpha_associated() {
+                for x in 0..xsize {
+                    let ba = maybe_clamp(bg[3 + alpha].as_mut()[x], clamp);
+                    for c in 0..3 {
+                        tmp[t(c, x)] = bg[c].as_mut()[x] + fg[c].as_ref()[x] * (1.0 - ba);
+                    }
+                    tmp[t(3 + alpha, x)] = 1.0 - (1.0 - ba) * (1.0 - fg[3 + alpha].as_ref()[x]);
+                }
+            } else {
+                for x in 0..xsize {
+                    let ba = maybe_clamp(bg[3 + alpha].as_mut()[x], clamp);
+                    let new_a = 1.0 - (1.0 - ba) * (1.0 - fg[3 + alpha].as_ref()[x]);
+                    let rnew_a = if new_a > 0.0 { 1.0 / new_a } else { 0.0 };
+                    for c in 0..3 {
+                        tmp[t(c, x)] = (bg[c].as_mut()[x] * ba
+                            + fg[c].as_ref()[x] * fg[3 + alpha].as_ref()[x] * (1.0 - ba))
+                            * rnew_a;
+                    }
+                    tmp[t(3 + alpha, x)] = new_a;
+                }
+            }
+        }
+        PatchBlendMode::Mul => {
+            for c in 0..3 {
+                for x in 0..xsize {
+                    tmp[t(c, x)] = bg[c].as_mut()[x] * maybe_clamp(fg[c].as_ref()[x], clamp);
+                }
+            }
+        }
+        PatchBlendMode::Replace => {
+            for c in 0..3 {
+                for x in 0..xsize {
+                    tmp[t(c, x)] = fg[c].as_ref()[x];
+                }
+            }
+        }
+        PatchBlendMode::None => {
+            for c in 0..3 {
+                for x in 0..xsize {
+                    tmp[t(c, x)] = bg[c].as_mut()[x];
+                }
+            }
+        }
+    }
+    for c in 0..num_channels {
+        let row = &tmp[c * xsize..(c + 1) * xsize];
+        bg[c].as_mut().copy_from_slice(row);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    fn clamp(x: f32) -> f32 {
+        x.clamp(0.0, 1.0)
+    }
+
+    mod perform_blending_tests {
+        use super::{super::*, *};
+        use crate::{headers::bit_depth::BitDepth, util::test::assert_all_almost_abs_eq};
+        use test_log::test;
+
+        const ABS_DELTA: f32 = 1e-6;
+
+        // Helper for expected value calculations based on C++ logic
+
+        // Alpha compositing formula: Ao = As + Ab * (1 - As)
+        // Used for kBlend modes for the alpha channel itself.
+        fn expected_alpha_blend(fg_a: f32, bg_a: f32) -> f32 {
+            fg_a + bg_a * (1.0 - fg_a)
+        }
+
+        // Color compositing for kBlend, premultiplied alpha: Co = Cs_premult + Cb_premult * (1 - As)
+        fn expected_color_blend_premultiplied(c_fg: f32, c_bg: f32, fg_a: f32) -> f32 {
+            c_fg + c_bg * (1.0 - fg_a)
+        }
+
+        // Color compositing for kBlend, non-premultiplied alpha: Co = (Cs * As + Cb * Ab * (1 - As)) / Ao_blend
+        fn expected_color_blend_non_premultiplied(
+            c_fg: f32,
+            fg_a: f32, // Foreground color and its alpha
+            c_bg: f32,
+            bg_a: f32,            // Background color and its alpha
+            alpha_blend_out: f32, // The resulting alpha from expected_alpha_blend(fg_a, bg_a)
+        ) -> f32 {
+            if alpha_blend_out.abs() < ABS_DELTA {
+                // Avoid division by zero
+                0.0
+            } else {
+                (c_fg * fg_a + c_bg * bg_a * (1.0 - fg_a)) / alpha_blend_out
+            }
+        }
+
+        // For kAlphaWeightedAdd modes: Co = Cb + Cs * As
+        fn expected_alpha_weighted_add(c_bg: f32, c_fg: f32, fg_a: f32) -> f32 {
+            c_bg + c_fg * fg_a
+        }
+
+        // For kMul mode: Co = Cb * Cs
+        fn expected_mul_blend(c_bg: f32, c_fg: f32) -> f32 {
+            c_bg * c_fg
+        }
+
+        #[test]
+        fn test_color_replace_fg_over_bg() {
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.2];
+            let mut bg_b = [0.3];
+            let fg_r = [0.7];
+            let fg_g = [0.8];
+            let fg_b = [0.9];
+
+            let mut bg_channels: [&mut [f32]; 3] = [&mut bg_r, &mut bg_g, &mut bg_b];
+            let fg_channels: [&[f32]; 3] = [&fg_r, &fg_g, &fg_b];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::Replace,
+                alpha_channel: 0, // Not used for Replace
+                clamp: false,
+            };
+
+            let ec_blending: [PatchBlending; 0] = [];
+            let extra_channel_info: [ExtraChannelInfo; 0] = [];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            // Expected: output color is fg color
+            assert_all_almost_abs_eq(&bg_r, &fg_r, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &fg_g, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &fg_b, ABS_DELTA);
+        }
+
+        #[test]
+        fn test_color_add() {
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.2];
+            let mut bg_b = [0.3];
+            let fg_r = [0.7];
+            let fg_g = [0.6];
+            let fg_b = [0.5];
+            let expected_r = [bg_r[0] + fg_r[0]];
+            let expected_g = [bg_g[0] + fg_g[0]];
+            let expected_b = [bg_b[0] + fg_b[0]];
+
+            let mut bg_channels: [&mut [f32]; 3] = [&mut bg_r, &mut bg_g, &mut bg_b];
+            let fg_channels: [&[f32]; 3] = [&fg_r, &fg_g, &fg_b];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::Add,
+                alpha_channel: 0, // Not used
+                clamp: false,
+            };
+            let ec_blending: [PatchBlending; 0] = [];
+            let extra_channel_info: [ExtraChannelInfo; 0] = [];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            assert_all_almost_abs_eq(&bg_r, &expected_r, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &expected_g, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &expected_b, ABS_DELTA);
+        }
+
+        #[test]
+        fn test_color_blend_above_premultiplied_alpha() {
+            // BG: R=0.1, G=0.2, B=0.3, A=0.8 (premultiplied)
+            // FG: R=0.4, G=0.3, B=0.2, A=0.5 (premultiplied)
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.2];
+            let mut bg_b = [0.3];
+            let mut bg_a = [0.8];
+            let fg_r = [0.4];
+            let fg_g = [0.3];
+            let fg_b = [0.2];
+            let fg_a = [0.5];
+            let fga = fg_a[0]; // Not clamped
+            let bga = bg_a[0];
+
+            // Expected alpha: Ao = Afg + Abg * (1 - Afg)
+            let expected_a_val = expected_alpha_blend(fga, bga);
+            // Expected color: Co = Cfg_premult + Cbg_premult * (1 - Afg)
+            let expected_r_val = expected_color_blend_premultiplied(fg_r[0], bg_r[0], fga);
+            let expected_g_val = expected_color_blend_premultiplied(fg_g[0], bg_g[0], fga);
+            let expected_b_val = expected_color_blend_premultiplied(fg_b[0], bg_b[0], fga);
+
+            let mut bg_channels: [&mut [f32]; 4] = [&mut bg_r, &mut bg_g, &mut bg_b, &mut bg_a];
+            let fg_channels: [&[f32]; 4] = [&fg_r, &fg_g, &fg_b, &fg_a];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::BlendAbove,
+                alpha_channel: 0, // EC0 is the alpha channel
+                clamp: false,
+            };
+            // EC0 (alpha) blending rule.
+            // For BlendAbove color mode, the alpha channel itself is also blended using source-over.
+            // So this ec_blending rule for alpha will be effectively overridden by color blending's alpha calculation.
+            let ec_blending = [PatchBlending {
+                mode: PatchBlendMode::Replace, // Arbitrary, will be overwritten by color blend
+                alpha_channel: 0,
+                clamp: false,
+            }];
+            let extra_channel_info = [ExtraChannelInfo::new(
+                false,
+                ExtraChannel::Alpha,
+                BitDepth::f32(), // Assuming f32
+                0,
+                "alpha".to_string(),
+                true, // alpha_associated = true (premultiplied)
+                None,
+                None,
+            )];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            assert_all_almost_abs_eq(&bg_a, &[expected_a_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_r, &[expected_r_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &[expected_g_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &[expected_b_val], ABS_DELTA);
+        }
+
+        #[test]
+        fn test_color_blend_above_non_premultiplied_alpha() {
+            // BG: R=0.1, G=0.2, B=0.3 (unpremult), A=0.8
+            // FG: R=0.7, G=0.6, B=0.5 (unpremult), A=0.5
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.2];
+            let mut bg_b = [0.3];
+            let mut bg_a = [0.8];
+            let fg_r = [0.7];
+            let fg_g = [0.6];
+            let fg_b = [0.5];
+            let fg_a = [0.5];
+            let fga = fg_a[0];
+            let bga = bg_a[0];
+
+            // Expected alpha: Ao = Afg + Abg * (1 - Afg)
+            let expected_a_val = expected_alpha_blend(fga, bga);
+            // Expected color: Co = (Cfg_unpremult * Afg + Cbg_unpremult * Abg * (1 - Afg)) / Ao_blend
+            let expected_r_val =
+                expected_color_blend_non_premultiplied(fg_r[0], fga, bg_r[0], bga, expected_a_val);
+            let expected_g_val =
+                expected_color_blend_non_premultiplied(fg_g[0], fga, bg_g[0], bga, expected_a_val);
+            let expected_b_val =
+                expected_color_blend_non_premultiplied(fg_b[0], fga, bg_b[0], bga, expected_a_val);
+
+            let mut bg_channels: [&mut [f32]; 4] = [&mut bg_r, &mut bg_g, &mut bg_b, &mut bg_a];
+            let fg_channels: [&[f32]; 4] = [&fg_r, &fg_g, &fg_b, &fg_a];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::BlendAbove,
+                alpha_channel: 0, // EC0
+                clamp: false,
+            };
+            let ec_blending = [PatchBlending {
+                // This will be overwritten for the alpha channel by color blending
+                mode: PatchBlendMode::Replace,
+                alpha_channel: 0,
+                clamp: false,
+            }];
+            let extra_channel_info = [ExtraChannelInfo::new(
+                false,
+                ExtraChannel::Alpha,
+                BitDepth::f32(),
+                0,
+                "alpha".to_string(),
+                false, // alpha_associated = false (non-premultiplied)
+                None,
+                None,
+            )];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            assert_all_almost_abs_eq(&bg_a, &[expected_a_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_r, &[expected_r_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &[expected_g_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &[expected_b_val], ABS_DELTA);
+        }
+
+        #[test]
+        fn test_color_alpha_weighted_add_above() {
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.2];
+            let mut bg_b = [0.3];
+            let mut bg_a = [0.8]; // bg alpha used by ec_blending
+            let fg_r = [0.7];
+            let fg_g = [0.6];
+            let fg_b = [0.5];
+            let fg_a = [0.5]; // fg alpha used for weighting
+            let fga_for_weighting = fg_a[0]; // Not clamped as color_blending.clamp is false
+
+            // Expected color: Co = Cbg + Cfg * Afg_for_weighting
+            let expected_r_val = expected_alpha_weighted_add(bg_r[0], fg_r[0], fga_for_weighting);
+            let expected_g_val = expected_alpha_weighted_add(bg_g[0], fg_g[0], fga_for_weighting);
+            let expected_b_val = expected_alpha_weighted_add(bg_b[0], fg_b[0], fga_for_weighting);
+
+            // Expected alpha (EC0): Blended according to ec_blending[0].
+            // Mode is BlendAbove, alpha_channel is 0 (itself).
+            // C++: PerformAlphaBlending(bg[3+0], bg[3+0], fg[3+0], fg[3+0], tmp.Row(3+0), ...)
+            // This means it's the "alpha channel blends itself" case: Ao = Afg + Abg * (1 - Afg)
+            // fg_alpha_for_ec0 = fg_a[0], bg_alpha_for_ec0 = bg_a[0]. ec_blending[0].clamp is false.
+            let expected_a_val = expected_alpha_blend(fg_a[0], bg_a[0]);
+
+            let mut bg_channels: [&mut [f32]; 4] = [&mut bg_r, &mut bg_g, &mut bg_b, &mut bg_a];
+            let fg_channels: [&[f32]; 4] = [&fg_r, &fg_g, &fg_b, &fg_a];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::AlphaWeightedAddAbove,
+                alpha_channel: 0, // EC0 is alpha
+                clamp: false,
+            };
+            // For AlphaWeightedAdd color mode, the alpha channel (EC0) value is determined by its ec_blending rule.
+            // Let's make EC0 blend itself using BlendAbove mode.
+            let ec_blending = [PatchBlending {
+                mode: PatchBlendMode::BlendAbove, // Alpha channel EC0 blends itself
+                alpha_channel: 0,                 //  using itself as alpha reference
+                clamp: false,
+            }];
+            let extra_channel_info = [ExtraChannelInfo::new(
+                false,
+                ExtraChannel::Alpha,
+                BitDepth::f32(),
+                0,
+                "alpha".to_string(),
+                true, // alpha_associated (doesn't directly affect AWA color, but affects EC0's own blend)
+                None,
+                None,
+            )];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            assert_all_almost_abs_eq(&bg_r, &[expected_r_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &[expected_g_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &[expected_b_val], ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_a, &[expected_a_val], ABS_DELTA);
+        }
+
+        #[test]
+        fn test_color_mul_with_clamp() {
+            let mut bg_r = [0.5];
+            let mut bg_g = [0.8];
+            let mut bg_b = [1.0];
+            let fg_r = [1.5];
+            let fg_g = [-0.2];
+            let fg_b = [0.5]; // fg values will be clamped
+            let expected_r = [expected_mul_blend(bg_r[0], clamp(fg_r[0]))]; // 0.5 * 1.0 = 0.5
+            let expected_g = [expected_mul_blend(bg_g[0], clamp(fg_g[0]))]; // 0.8 * 0.0 = 0.0
+            let expected_b = [expected_mul_blend(bg_b[0], clamp(fg_b[0]))]; // 1.0 * 0.5 = 0.5
+
+            let mut bg_channels: [&mut [f32]; 3] = [&mut bg_r, &mut bg_g, &mut bg_b];
+            let fg_channels: [&[f32]; 3] = [&fg_r, &fg_g, &fg_b];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::Mul,
+                alpha_channel: 0, // Not used
+                clamp: true,      // Clamp fg values
+            };
+            let ec_blending: [PatchBlending; 0] = [];
+            let extra_channel_info: [ExtraChannelInfo; 0] = [];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            assert_all_almost_abs_eq(&bg_r, &expected_r, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &expected_g, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &expected_b, ABS_DELTA);
+        }
+
+        #[test]
+        fn test_ec_blend_data_with_separate_alpha_premultiplied() {
+            // Color: Replace FG over BG (to keep it simple)
+            // EC0: Data channel
+            // EC1: Alpha channel for EC0
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.1];
+            let mut bg_b = [0.1];
+            let mut bg_ec0 = [0.2];
+            let mut bg_ec1_alpha = [0.9]; // EC1 is alpha for EC0
+
+            let fg_r = [0.5];
+            let fg_g = [0.5];
+            let fg_b = [0.5];
+            let fg_ec0 = [0.6];
+            let fg_ec1_alpha = [0.4];
+
+            // EC1 (Alpha channel for EC0) blending: BlendAbove, uses itself as alpha.
+            // fg_alpha = fg_ec1_alpha[0], bg_alpha = bg_ec1_alpha[0]
+            let expected_out_ec1_alpha = expected_alpha_blend(fg_ec1_alpha[0], bg_ec1_alpha[0]);
+
+            // EC0 (Data channel) blending: BlendAbove, uses EC1 as alpha.
+            // fg_alpha_for_ec0 = fg_ec1_alpha[0] (not clamped as ec_blending[0].clamp is false)
+            // is_premultiplied = extra_channel_info[ec_blending[0].alpha_channel (is 1)].alpha_associated = true.
+            // Formula: out = fg_data + bg_data * (1.f - fg_alpha_of_data)
+            let expected_out_ec0 =
+                expected_color_blend_premultiplied(fg_ec0[0], bg_ec0[0], fg_ec1_alpha[0]);
+
+            let mut bg_channels: [&mut [f32]; 5] = [
+                &mut bg_r,
+                &mut bg_g,
+                &mut bg_b,
+                &mut bg_ec0,
+                &mut bg_ec1_alpha,
+            ];
+            let fg_channels: [&[f32]; 5] = [&fg_r, &fg_g, &fg_b, &fg_ec0, &fg_ec1_alpha];
+
+            let color_blending = PatchBlending {
+                // Simple color replace
+                mode: PatchBlendMode::Replace,
+                alpha_channel: 0,
+                clamp: false,
+            };
+
+            let ec_blending = [
+                PatchBlending {
+                    // EC0 (data) uses EC1 as alpha
+                    mode: PatchBlendMode::BlendAbove,
+                    alpha_channel: 1, // EC1 is alpha for EC0
+                    clamp: false,
+                },
+                PatchBlending {
+                    // EC1 (alpha) blends itself
+                    mode: PatchBlendMode::BlendAbove,
+                    alpha_channel: 1, // EC1 uses itself as alpha
+                    clamp: false,
+                },
+            ];
+            let extra_channel_info = [
+                ExtraChannelInfo::new(
+                    false,
+                    ExtraChannel::Unknown,
+                    BitDepth::f32(),
+                    0,
+                    "ec0".to_string(),
+                    false,
+                    None,
+                    None,
+                ), // EC0 data
+                ExtraChannelInfo::new(
+                    false,
+                    ExtraChannel::Alpha,
+                    BitDepth::f32(),
+                    0,
+                    "alpha_for_ec0".to_string(),
+                    true, // EC1 is premultiplied alpha
+                    None,
+                    None,
+                ), // EC1 alpha
+            ];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            // Expected Color (Replace)
+            assert_all_almost_abs_eq(&bg_r, &fg_r, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &fg_g, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &fg_b, ABS_DELTA);
+
+            assert_all_almost_abs_eq(&bg_ec1_alpha, &[expected_out_ec1_alpha], ABS_DELTA);
+
+            assert_all_almost_abs_eq(&bg_ec0, &[expected_out_ec0], ABS_DELTA);
+        }
+
+        #[test]
+        fn test_no_alpha_channel_blend_above_falls_back_to_copy_fg() {
+            let mut bg_r = [0.1];
+            let mut bg_g = [0.2];
+            let mut bg_b = [0.3];
+            let fg_r = [0.7];
+            let fg_g = [0.8];
+            let fg_b = [0.9];
+
+            let mut bg_channels: [&mut [f32]; 3] = [&mut bg_r, &mut bg_g, &mut bg_b];
+            let fg_channels: [&[f32]; 3] = [&fg_r, &fg_g, &fg_b];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::BlendAbove,
+                alpha_channel: 0, // Irrelevant as no alpha EIs
+                clamp: false,
+            };
+
+            let ec_blending: [PatchBlending; 0] = [];
+            // No ExtraChannelInfo means has_alpha will be false.
+            let extra_channel_info: [ExtraChannelInfo; 0] = [];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            // Expected: output color is fg color due to fallback
+            assert_all_almost_abs_eq(&bg_r, &fg_r, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_g, &fg_g, ABS_DELTA);
+            assert_all_almost_abs_eq(&bg_b, &fg_b, ABS_DELTA);
+        }
+
+        #[test]
+        fn test_empty_pixels() {
+            let mut bg_r: [f32; 0] = [];
+            let mut bg_g: [f32; 0] = [];
+            let mut bg_b: [f32; 0] = [];
+            let fg_r: [f32; 0] = [];
+            let fg_g: [f32; 0] = [];
+            let fg_b: [f32; 0] = [];
+
+            let mut bg_channels: [&mut [f32]; 3] = [&mut bg_r, &mut bg_g, &mut bg_b];
+            let fg_channels: [&[f32]; 3] = [&fg_r, &fg_g, &fg_b];
+
+            let color_blending = PatchBlending {
+                mode: PatchBlendMode::Replace,
+                alpha_channel: 0,
+                clamp: false,
+            };
+            let ec_blending: [PatchBlending; 0] = [];
+            let extra_channel_info: [ExtraChannelInfo; 0] = [];
+
+            perform_blending(
+                &mut bg_channels,
+                &fg_channels,
+                &color_blending,
+                &ec_blending,
+                &extra_channel_info,
+            );
+
+            // Expect output slices to also be empty and unchanged.
+            assert_eq!(bg_r.len(), 0);
+            assert_eq!(bg_g.len(), 0);
+            assert_eq!(bg_b.len(), 0);
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/features/epf.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/epf.rs
new file mode 100644
index 00000000..9f37477d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/epf.rs
@@ -0,0 +1,84 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::sync::Arc;
+
+use crate::{
+    error::{Error, Result},
+    frame::{HfMetadata, LfGlobalState},
+    headers::frame_header::{Encoding, FrameHeader},
+    image::Image,
+};
+
+use crate::transforms::transform_map::*;
+
+/// Source of sigma values for EPF (Edge Preserving Filter).
+/// For VarDCT encoding, sigma varies per-block based on quantization.
+/// For Modular encoding, sigma is constant across the entire image.
+#[derive(Clone)]
+pub enum SigmaSource {
+    /// Variable sigma per block (VarDCT encoding)
+    Variable(Arc<Image<f32>>),
+    /// Constant sigma for entire image (Modular encoding)
+    Constant(f32),
+}
+
+impl SigmaSource {
+    pub fn new(
+        frame_header: &FrameHeader,
+        lf_global: &LfGlobalState,
+        hf_meta: &Option<HfMetadata>,
+    ) -> Result<Self> {
+        let rf = &frame_header.restoration_filter;
+        #[allow(clippy::excessive_precision)]
+        const INV_SIGMA_NUM: f32 = -1.1715728752538099024;
+
+        if frame_header.encoding == Encoding::VarDCT {
+            let size_blocks = frame_header.size_blocks();
+            let sigma_xsize = size_blocks.0;
+            let sigma_ysize = size_blocks.1;
+            // We might over-read the sigma row slightly when applying EPF, so ensure that there is enough
+            // space to avoid having the out-of-bounds read from the row causing a panic (the value does
+            // not affect any pixels that are actually visualized, so we don't need to set it to anything
+            // special below).
+            let mut sigma_image = Image::<f32>::new((sigma_xsize + 2, sigma_ysize))?;
+
+            let hf_meta = hf_meta.as_ref().unwrap();
+            let quant_params = lf_global.quant_params.as_ref().unwrap();
+            let quant_scale = 1.0 / quant_params.inv_global_scale();
+            for by in 0..size_blocks.1 {
+                let raw_quant_row = hf_meta.raw_quant_map.row(by);
+                let transform_row = hf_meta.transform_map.row(by);
+                for bx in 0..size_blocks.0 {
+                    let raw_quant = raw_quant_row[bx];
+                    let raw_transform_id = transform_row[bx];
+                    let transform_id = raw_transform_id & 127;
+                    let is_first_block = raw_transform_id >= 128;
+                    if !is_first_block {
+                        continue;
+                    }
+                    let transform_type = HfTransformType::from_usize(transform_id as usize)
+                        .ok_or(Error::InvalidVarDCTTransform(transform_id as usize))?;
+                    let cx = covered_blocks_x(transform_type) as usize;
+                    let cy = covered_blocks_y(transform_type) as usize;
+                    let sigma_quant =
+                        rf.epf_quant_mul / (quant_scale * raw_quant as f32 * INV_SIGMA_NUM);
+                    for iy in 0..cy {
+                        for ix in 0..cx {
+                            let sharpness = hf_meta.epf_map.row(by + iy)[bx + ix] as usize;
+                            let sigma = (sigma_quant * rf.epf_sharp_lut[sharpness]).min(-1e-4);
+                            sigma_image.row_mut(by + iy)[bx + ix] = 1.0 / sigma;
+                        }
+                    }
+                }
+            }
+            Ok(SigmaSource::Variable(Arc::new(sigma_image)))
+        } else {
+            // For Modular encoding, sigma is constant - no need to allocate an image
+            let sigma = INV_SIGMA_NUM / rf.epf_sigma_for_modular;
+            Ok(SigmaSource::Constant(sigma))
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/features/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/mod.rs
new file mode 100644
index 00000000..fbbfd2ae
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/mod.rs
@@ -0,0 +1,10 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub mod blending;
+pub mod epf;
+pub mod noise;
+pub mod patches;
+pub mod spline;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/features/noise.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/noise.rs
new file mode 100644
index 00000000..5770a193
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/noise.rs
@@ -0,0 +1,40 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{bit_reader::BitReader, error::Result};
+#[derive(Debug, PartialEq, Default, Clone, Copy)]
+pub struct Noise {
+    pub lut: [f32; 8],
+}
+
+impl Noise {
+    pub fn read(br: &mut BitReader) -> Result<Noise> {
+        let mut noise = Noise::default();
+        for l in &mut noise.lut {
+            *l = (br.read(10)? as f32) / ((1 << 10) as f32);
+        }
+        Ok(noise)
+    }
+    pub fn strength(&self, vx: f32) -> f32 {
+        let k_scale = (self.lut.len() - 2) as f32;
+        let scaled_vx = f32::max(0.0, vx * k_scale);
+        let pre_floor_x = scaled_vx.floor();
+        let pre_frac_x = scaled_vx - pre_floor_x;
+        let floor_x = if scaled_vx >= k_scale + 1.0 {
+            k_scale
+        } else {
+            pre_floor_x
+        };
+        let frac_x = if scaled_vx >= k_scale + 1.0 {
+            1.0
+        } else {
+            pre_frac_x
+        };
+        let floor_x_int = floor_x as usize;
+        let low = self.lut[floor_x_int];
+        let hi = self.lut[floor_x_int + 1];
+        ((hi - low) * frac_x + low).clamp(0.0, 1.0)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/features/patches.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/patches.rs
new file mode 100644
index 00000000..f9aa254c
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/patches.rs
@@ -0,0 +1,2056 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use num_derive::FromPrimitive;
+use num_traits::FromPrimitive;
+
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::Histograms,
+    entropy_coding::decode::SymbolReader,
+    error::{Error, Result},
+    features::blending::perform_blending,
+    frame::{DecoderState, ReferenceFrame},
+    headers::extra_channels::ExtraChannelInfo,
+    util::{MemoryTracker, NewWithCapacity, SmallVec, tracing_wrappers::*},
+};
+
+// Context numbers as specified in Section C.4.5, Listing C.2:
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[repr(usize)]
+pub enum PatchContext {
+    NumRefPatch = 0,
+    ReferenceFrame = 1,
+    PatchSize = 2,
+    PatchReferencePosition = 3,
+    PatchPosition = 4,
+    PatchBlendMode = 5,
+    PatchOffset = 6,
+    PatchCount = 7,
+    PatchAlphaChannel = 8,
+    PatchClamp = 9,
+}
+
+impl PatchContext {
+    const NUM: usize = 10;
+}
+
+/// Blend modes
+#[derive(Debug, PartialEq, Eq, Clone, Copy, FromPrimitive)]
+#[repr(u8)]
+pub enum PatchBlendMode {
+    // The new values are the old ones. Useful to skip some channels.
+    None = 0,
+    // The new values (in the crop) replace the old ones: sample = new
+    Replace = 1,
+    // The new values (in the crop) get added to the old ones: sample = old + new
+    Add = 2,
+    // The new values (in the crop) get multiplied by the old ones:
+    // sample = old * new
+    // This blend mode is only supported if BlendColorSpace is kEncoded. The
+    // range of the new value matters for multiplication purposes, and its
+    // nominal range of 0..1 is computed the same way as this is done for the
+    // alpha values in kBlend and kAlphaWeightedAdd.
+    Mul = 3,
+    // The new values (in the crop) replace the old ones if alpha>0:
+    // For first alpha channel:
+    // alpha = old + new * (1 - old)
+    // For other channels if !alpha_associated:
+    // sample = ((1 - new_alpha) * old * old_alpha + new_alpha * new) / alpha
+    // For other channels if alpha_associated:
+    // sample = (1 - new_alpha) * old + new
+    // The alpha formula applies to the alpha used for the division in the other
+    // channels formula, and applies to the alpha channel itself if its
+    // blend_channel value matches itself.
+    // If using kBlendAbove, new is the patch and old is the original image; if
+    // using kBlendBelow, the meaning is inverted.
+    BlendAbove = 4,
+    BlendBelow = 5,
+    // The new values (in the crop) are added to the old ones if alpha>0:
+    // For first alpha channel: sample = sample = old + new * (1 - old)
+    // For other channels: sample = old + alpha * new
+    AlphaWeightedAddAbove = 6,
+    AlphaWeightedAddBelow = 7,
+}
+
+impl PatchBlendMode {
+    pub const NUM_BLEND_MODES: u8 = 8;
+
+    #[cfg(test)]
+    fn try_from(i: u8) -> Result<PatchBlendMode> {
+        match i {
+            0 => Ok(PatchBlendMode::None),
+            1 => Ok(PatchBlendMode::Replace),
+            2 => Ok(PatchBlendMode::Add),
+            3 => Ok(PatchBlendMode::Mul),
+            4 => Ok(PatchBlendMode::BlendAbove),
+            5 => Ok(PatchBlendMode::BlendBelow),
+            6 => Ok(PatchBlendMode::AlphaWeightedAddAbove),
+            7 => Ok(PatchBlendMode::AlphaWeightedAddBelow),
+            _ => Err(Error::PatchesInvalidBlendMode(
+                i,
+                PatchBlendMode::NUM_BLEND_MODES,
+            )),
+        }
+    }
+
+    #[cfg(test)]
+    fn random<R: rand::Rng>(rng: &mut R) -> Self {
+        use rand::distr::{Distribution, Uniform};
+        Self::try_from(
+            Uniform::new_inclusive(
+                PatchBlendMode::None as u8,
+                PatchBlendMode::AlphaWeightedAddBelow as u8,
+            )
+            .unwrap()
+            .sample(rng),
+        )
+        .unwrap()
+    }
+
+    pub fn uses_alpha(self) -> bool {
+        matches!(
+            self,
+            Self::BlendAbove
+                | Self::BlendBelow
+                | Self::AlphaWeightedAddAbove
+                | Self::AlphaWeightedAddBelow
+        )
+    }
+
+    pub fn uses_clamp(self) -> bool {
+        self.uses_alpha() || self == Self::Mul
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct PatchBlending {
+    pub mode: PatchBlendMode,
+    pub alpha_channel: usize,
+    pub clamp: bool,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct PatchReferencePosition {
+    // Not using `ref` like in the spec here, because it is a keyword.
+    reference: usize,
+    x0: usize,
+    y0: usize,
+    xsize: usize,
+    ysize: usize,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct PatchPosition {
+    x: usize,
+    y: usize,
+    ref_pos_idx: usize,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+struct PatchTreeNode {
+    left_child: isize,
+    right_child: isize,
+    y_center: usize,
+    start: usize,
+    num: usize,
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct PatchesDictionary {
+    pub positions: Vec<PatchPosition>,
+    pub ref_positions: Vec<PatchReferencePosition>,
+    blendings: Vec<PatchBlending>,
+    blendings_stride: usize,
+    patch_tree: Vec<PatchTreeNode>,
+    // Number of patches for each row.
+    num_patches: Vec<usize>,
+    sorted_patches_y0: Vec<(usize, usize)>,
+    sorted_patches_y1: Vec<(usize, usize)>,
+}
+
+impl PatchesDictionary {
+    #[cfg(test)]
+    pub fn random<R: rand::Rng>(
+        size: (usize, usize),
+        num_extra_channels: usize,
+        alpha_channel: usize,
+        reference_frames: usize,
+        rng: &mut R,
+    ) -> Self {
+        use rand::distr::{Distribution, Uniform};
+        let width_dist = Uniform::new_inclusive(0, size.0 - 1).unwrap();
+        let height_dist = Uniform::new_inclusive(0, size.1 - 1).unwrap();
+        let num_refs = Uniform::new_inclusive(1, 5).unwrap().sample(rng);
+        let ref_dist = Uniform::new_inclusive(0, num_refs - 1).unwrap();
+        let ref_frame_dist = Uniform::new_inclusive(0, reference_frames - 1).unwrap();
+        let num_patches = Uniform::new_inclusive(num_refs, 10).unwrap().sample(rng);
+        let mut result = PatchesDictionary {
+            positions: (0..num_patches)
+                .map(|_| PatchPosition {
+                    x: width_dist.sample(rng),
+                    y: height_dist.sample(rng),
+                    ref_pos_idx: ref_dist.sample(rng),
+                })
+                .collect(),
+            ref_positions: (0..num_refs)
+                .map(|_| {
+                    let mut result = PatchReferencePosition {
+                        reference: ref_frame_dist.sample(rng),
+                        x0: width_dist.sample(rng),
+                        y0: height_dist.sample(rng),
+                        xsize: 0,
+                        ysize: 0,
+                    };
+                    result.xsize = Uniform::new_inclusive(1, size.0 - result.x0)
+                        .unwrap()
+                        .sample(rng);
+                    result.ysize = Uniform::new_inclusive(1, size.1 - result.y0)
+                        .unwrap()
+                        .sample(rng);
+                    result
+                })
+                .collect(),
+            blendings: (0..num_patches)
+                .map(|_| PatchBlending {
+                    mode: PatchBlendMode::random(rng),
+                    alpha_channel,
+                    clamp: Uniform::new_inclusive(0, 1).unwrap().sample(rng) == 0,
+                })
+                .collect(),
+            blendings_stride: num_extra_channels + 1,
+            patch_tree: vec![],
+            num_patches: vec![],
+            sorted_patches_y0: vec![],
+            sorted_patches_y1: vec![],
+        };
+        result.compute_patch_tree().unwrap();
+        result
+    }
+
+    fn compute_patch_tree(&mut self) -> Result<()> {
+        #[derive(Debug, Clone, Copy)]
+        struct PatchInterval {
+            idx: usize,
+            y0: usize,
+            y1: usize,
+        }
+
+        self.patch_tree.clear();
+        self.num_patches.clear();
+        self.sorted_patches_y0.clear();
+        self.sorted_patches_y1.clear();
+
+        if self.positions.is_empty() {
+            return Ok(());
+        }
+
+        // Create a y-interval for each patch.
+        let mut intervals: Vec<PatchInterval> = Vec::new_with_capacity(self.positions.len())?;
+        for (i, pos) in self.positions.iter().enumerate() {
+            let ref_pos = self.ref_positions[pos.ref_pos_idx];
+            if ref_pos.xsize > 0 && ref_pos.ysize > 0 {
+                intervals.push(PatchInterval {
+                    idx: i,
+                    y0: pos.y,
+                    y1: pos.y + self.ref_positions[pos.ref_pos_idx].ysize,
+                });
+            }
+        }
+
+        let intervals_len = intervals.len();
+        let sort_by_y0 = |intervals: &mut Vec<PatchInterval>, start: usize, end: usize| {
+            intervals[start..end].sort_unstable_by_key(|i| i.y0);
+        };
+        let sort_by_y1 = |intervals: &mut Vec<PatchInterval>, start: usize, end: usize| {
+            intervals[start..end].sort_unstable_by_key(|i| i.y1);
+        };
+
+        // Count the number of patches for each row.
+        sort_by_y1(&mut intervals, 0, intervals_len);
+        self.num_patches
+            .resize(intervals.last().map_or(0, |iv| iv.y1), 0); //Safe last()
+        for iv in &intervals {
+            for y in iv.y0..iv.y1 {
+                self.num_patches[y] += 1;
+            }
+        }
+
+        let root = PatchTreeNode {
+            start: 0,
+            num: intervals.len(),
+            ..Default::default()
+        };
+        self.patch_tree.push(root);
+
+        let mut next = 0;
+        while next < self.patch_tree.len() {
+            let node = &mut self.patch_tree[next]; // Borrow mutably *before* accessing fields
+            let start = node.start;
+            let end = node.start + node.num;
+
+            // Choose the y_center for this node to be the median of interval starts.
+            sort_by_y0(&mut intervals, start, end);
+            let middle_idx = start + node.num / 2;
+            node.y_center = intervals[middle_idx].y0;
+
+            // Divide the intervals in [start, end) into three groups:
+            let mut right_start = middle_idx;
+            while right_start < end && intervals[right_start].y0 == node.y_center {
+                right_start += 1;
+            }
+
+            sort_by_y1(&mut intervals, start, right_start);
+            let mut left_end = right_start;
+            while left_end > start && intervals[left_end - 1].y1 > node.y_center {
+                left_end -= 1;
+            }
+
+            // Fill in sorted_patches_y0_ and sorted_patches_y1_ for the current node.
+            node.num = right_start - left_end;
+            node.start = self.sorted_patches_y0.len();
+
+            self.sorted_patches_y1
+                .try_reserve(right_start.saturating_sub(left_end))?;
+            self.sorted_patches_y0
+                .try_reserve(right_start.saturating_sub(left_end))?;
+            for i in (left_end..right_start).rev() {
+                self.sorted_patches_y1
+                    .push((intervals[i].y1, intervals[i].idx));
+            }
+            sort_by_y0(&mut intervals, left_end, right_start);
+            for interval in intervals.iter().take(right_start).skip(left_end) {
+                self.sorted_patches_y0.push((interval.y0, interval.idx));
+            }
+
+            // Create the left and right nodes (if not empty).
+            // We modify left_child/right_child on the *original* node in patch_tree,
+            // so we have to do the assignment *before* we push the new nodes.
+            self.patch_tree[next].left_child = -1;
+            self.patch_tree[next].right_child = -1;
+
+            if left_end > start {
+                let mut left = PatchTreeNode::default();
+                left.start = start;
+                left.num = left_end - left.start;
+                self.patch_tree[next].left_child = self.patch_tree.len() as isize;
+                self.patch_tree.try_reserve(1)?;
+                self.patch_tree.push(left);
+            }
+            if right_start < end {
+                let mut right = PatchTreeNode::default();
+                right.start = right_start;
+                right.num = end - right.start;
+                self.patch_tree[next].right_child = self.patch_tree.len() as isize;
+                self.patch_tree.try_reserve(1)?;
+                self.patch_tree.push(right);
+            }
+
+            next += 1;
+        }
+        Ok(())
+    }
+
+    #[instrument(level = "debug", skip(br, memory_tracker), ret, err)]
+    pub fn read(
+        br: &mut BitReader,
+        xsize: usize,
+        ysize: usize,
+        num_extra_channels: usize,
+        reference_frames: &[Option<ReferenceFrame>],
+        max_patches_limit: Option<usize>,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<PatchesDictionary> {
+        let blendings_stride = num_extra_channels + 1;
+        let patches_histograms = Histograms::decode(PatchContext::NUM, br, true)?;
+        let mut patches_reader = SymbolReader::new(&patches_histograms, br, None)?;
+        let num_ref_patch = patches_reader.read_unsigned(
+            &patches_histograms,
+            br,
+            PatchContext::NumRefPatch as usize,
+        ) as usize;
+        // Use checked arithmetic to prevent overflow attacks
+        // Fail rather than saturate - incorrect limits could allow attacks
+        let num_pixels = xsize
+            .checked_mul(ysize)
+            .ok_or(Error::ImageSizeTooLarge(xsize, ysize))?;
+        let max_ref_patches = 1024usize
+            .checked_add(num_pixels / 4)
+            .ok_or(Error::ArithmeticOverflow)?;
+        // Use image-size-based limit, but allow user to set a stricter limit
+        let max_patches_calculated = max_ref_patches
+            .checked_mul(4)
+            .ok_or(Error::ArithmeticOverflow)?;
+        let max_patches = match max_patches_limit {
+            Some(limit) => max_patches_calculated.min(limit),
+            None => max_patches_calculated,
+        };
+        let max_blending_infos = max_patches
+            .checked_mul(4)
+            .ok_or(Error::ArithmeticOverflow)?;
+        if num_ref_patch > max_ref_patches {
+            return Err(Error::PatchesTooMany(
+                "reference patches".to_string(),
+                num_ref_patch,
+                max_ref_patches,
+            ));
+        }
+        let mut total_patches = 0;
+        let mut next_size = 1;
+        let mut positions: Vec<PatchPosition> = Vec::new();
+        let mut blendings = Vec::new();
+        memory_tracker
+            .check_alloc((num_ref_patch * std::mem::size_of::<PatchReferencePosition>()) as u64)?;
+        let mut ref_positions = Vec::new_with_capacity(num_ref_patch)?;
+        for _ in 0..num_ref_patch {
+            let reference = patches_reader.read_unsigned(
+                &patches_histograms,
+                br,
+                PatchContext::ReferenceFrame as usize,
+            ) as usize;
+            if reference >= DecoderState::MAX_STORED_FRAMES {
+                return Err(Error::PatchesRefTooLarge(
+                    reference,
+                    DecoderState::MAX_STORED_FRAMES,
+                ));
+            }
+
+            let x0 = patches_reader.read_unsigned(
+                &patches_histograms,
+                br,
+                PatchContext::PatchReferencePosition as usize,
+            ) as usize;
+            let y0 = patches_reader.read_unsigned(
+                &patches_histograms,
+                br,
+                PatchContext::PatchReferencePosition as usize,
+            ) as usize;
+            let ref_pos_xsize = patches_reader.read_unsigned(
+                &patches_histograms,
+                br,
+                PatchContext::PatchSize as usize,
+            ) as usize
+                + 1;
+            let ref_pos_ysize = patches_reader.read_unsigned(
+                &patches_histograms,
+                br,
+                PatchContext::PatchSize as usize,
+            ) as usize
+                + 1;
+            let reference_frame = &reference_frames[reference];
+            // TODO(firsching): make sure this check is correct in the presence of downsampled extra channels (also in libjxl).
+            match reference_frame {
+                None => return Err(Error::PatchesInvalidReference(reference)),
+                Some(reference) => {
+                    if !reference.saved_before_color_transform {
+                        return Err(Error::PatchesPostColorTransform());
+                    }
+                    if x0 + ref_pos_xsize > reference.frame[0].size().0 {
+                        return Err(Error::PatchesInvalidPosition(
+                            "x".to_string(),
+                            x0,
+                            ref_pos_xsize,
+                            reference.frame[0].size().0,
+                        ));
+                    }
+                    if y0 + ref_pos_ysize > reference.frame[0].size().1 {
+                        return Err(Error::PatchesInvalidPosition(
+                            "y".to_string(),
+                            y0,
+                            ref_pos_ysize,
+                            reference.frame[0].size().1,
+                        ));
+                    }
+                }
+            }
+
+            let id_count = patches_reader.read_unsigned(
+                &patches_histograms,
+                br,
+                PatchContext::PatchCount as usize,
+            ) as usize
+                + 1;
+            if id_count > max_patches + 1 {
+                return Err(Error::PatchesTooMany(
+                    "patches".to_string(),
+                    id_count,
+                    max_patches,
+                ));
+            }
+            total_patches += id_count;
+
+            if total_patches > max_patches {
+                return Err(Error::PatchesTooMany(
+                    "patches".to_string(),
+                    total_patches,
+                    max_patches,
+                ));
+            }
+
+            if next_size < total_patches {
+                next_size *= 2;
+                next_size = std::cmp::min(next_size, max_patches);
+            }
+            // Use saturating_mul to prevent overflow attack bypassing the limit check
+            if next_size.saturating_mul(blendings_stride) > max_blending_infos {
+                return Err(Error::PatchesTooMany(
+                    "blending_info".to_string(),
+                    total_patches,
+                    max_patches,
+                ));
+            }
+            positions.try_reserve(next_size.saturating_sub(positions.len()))?;
+            // Use checked_mul to fail rather than silently under-allocate
+            let blendings_needed = next_size
+                .checked_mul(PatchBlendMode::NUM_BLEND_MODES as usize)
+                .ok_or(Error::ArithmeticOverflow)?;
+            blendings.try_reserve(blendings_needed.saturating_sub(blendings.len()))?;
+
+            for i in 0..id_count {
+                let mut pos = PatchPosition {
+                    x: 0,
+                    y: 0,
+                    ref_pos_idx: ref_positions.len(),
+                };
+                if i == 0 {
+                    // Read initial position
+                    pos.x = patches_reader.read_unsigned(
+                        &patches_histograms,
+                        br,
+                        PatchContext::PatchPosition as usize,
+                    ) as usize;
+                    pos.y = patches_reader.read_unsigned(
+                        &patches_histograms,
+                        br,
+                        PatchContext::PatchPosition as usize,
+                    ) as usize;
+                } else {
+                    // Read offsets and calculate new position
+                    let delta_x = patches_reader.read_signed(
+                        &patches_histograms,
+                        br,
+                        PatchContext::PatchOffset as usize,
+                    );
+                    if delta_x < 0 && (-delta_x as usize) > positions.last().unwrap().x {
+                        return Err(Error::PatchesInvalidDelta(
+                            "x".to_string(),
+                            positions.last().unwrap().x,
+                            delta_x,
+                        ));
+                    }
+                    pos.x = (positions.last().unwrap().x as i32 + delta_x) as usize;
+
+                    let delta_y = patches_reader.read_signed(
+                        &patches_histograms,
+                        br,
+                        PatchContext::PatchOffset as usize,
+                    );
+                    if delta_y < 0 && (-delta_y as usize) > positions.last().unwrap().y {
+                        return Err(Error::PatchesInvalidDelta(
+                            "y".to_string(),
+                            positions.last().unwrap().y,
+                            delta_y,
+                        ));
+                    }
+                    pos.y = (positions.last().unwrap().y as i32 + delta_y) as usize;
+                }
+
+                if pos.x + ref_pos_xsize > xsize {
+                    return Err(Error::PatchesOutOfBounds(
+                        "x".to_string(),
+                        pos.x,
+                        ref_pos_xsize,
+                        xsize,
+                    ));
+                }
+                if pos.y + ref_pos_ysize > ysize {
+                    return Err(Error::PatchesOutOfBounds(
+                        "y".to_string(),
+                        pos.y,
+                        ref_pos_ysize,
+                        ysize,
+                    ));
+                }
+
+                for _ in 0..blendings_stride {
+                    let mut alpha_channel = 0;
+                    let mut clamp = false;
+                    let maybe_blend_mode = patches_reader.read_unsigned(
+                        &patches_histograms,
+                        br,
+                        PatchContext::PatchBlendMode as usize,
+                    ) as u8;
+                    let blend_mode = match PatchBlendMode::from_u8(maybe_blend_mode) {
+                        None => {
+                            return Err(Error::PatchesInvalidBlendMode(
+                                maybe_blend_mode,
+                                PatchBlendMode::NUM_BLEND_MODES,
+                            ));
+                        }
+                        Some(blend_mode) => blend_mode,
+                    };
+
+                    if PatchBlendMode::uses_alpha(blend_mode) && blendings_stride > 2 {
+                        alpha_channel = patches_reader.read_unsigned(
+                            &patches_histograms,
+                            br,
+                            PatchContext::PatchAlphaChannel as usize,
+                        ) as usize;
+                        if alpha_channel >= num_extra_channels {
+                            return Err(Error::PatchesInvalidAlphaChannel(
+                                alpha_channel,
+                                num_extra_channels,
+                            ));
+                        }
+                    }
+
+                    if PatchBlendMode::uses_clamp(blend_mode) {
+                        clamp = patches_reader.read_unsigned(
+                            &patches_histograms,
+                            br,
+                            PatchContext::PatchClamp as usize,
+                        ) != 0;
+                    }
+                    blendings.push(PatchBlending {
+                        mode: blend_mode,
+                        alpha_channel,
+                        clamp,
+                    });
+                }
+                positions.push(pos);
+            }
+
+            ref_positions.push(PatchReferencePosition {
+                reference,
+                x0,
+                y0,
+                xsize: ref_pos_xsize,
+                ysize: ref_pos_ysize,
+            })
+        }
+
+        let mut patches_dict = PatchesDictionary {
+            positions,
+            blendings,
+            ref_positions,
+            blendings_stride,
+            num_patches: vec![],
+            sorted_patches_y0: vec![],
+            sorted_patches_y1: vec![],
+            patch_tree: vec![],
+        };
+        patches_dict.compute_patch_tree()?;
+        Ok(patches_dict)
+    }
+
+    pub fn set_patches_for_row(&self, y: usize, patches_for_row_result: &mut Vec<usize>) {
+        patches_for_row_result.clear();
+        if self.num_patches.len() <= y || self.num_patches[y] == 0 {
+            return;
+        }
+
+        let mut tree_idx: isize = 0;
+        loop {
+            if tree_idx == -1 {
+                break;
+            }
+
+            // Safe access using get() and unwrap_or().  No need for the assert.
+            let node = self.patch_tree.get(tree_idx as usize).unwrap_or_else(|| {
+                // TODO(firsching): Handle panic differently?
+                panic!("Invalid tree_idx: {tree_idx}");
+            });
+
+            if y <= node.y_center {
+                for i in 0..node.num {
+                    let p = self.sorted_patches_y0[node.start + i];
+                    if y < p.0 {
+                        break;
+                    }
+                    patches_for_row_result.push(p.1);
+                }
+                tree_idx = if y < node.y_center {
+                    node.left_child
+                } else {
+                    -1
+                };
+            } else {
+                for i in 0..node.num {
+                    let p = self.sorted_patches_y1[node.start + i];
+                    if y >= p.0 {
+                        break;
+                    }
+                    patches_for_row_result.push(p.1);
+                }
+                tree_idx = node.right_child;
+            }
+        }
+
+        // Ensure that the relative order of patches is preserved.
+        patches_for_row_result.sort();
+    }
+
+    pub fn add_one_row(
+        &self,
+        row: &mut [&mut [f32]],
+        row_pos: (usize, usize),
+        xsize: usize,
+        extra_channel_info: &[ExtraChannelInfo],
+        reference_frames: &[Option<ReferenceFrame>],
+        patches_for_row_result: &mut Vec<usize>,
+    ) {
+        let num_ec = extra_channel_info.len();
+        assert!(num_ec + 1 == self.blendings_stride);
+        let num_channels = 3 + num_ec;
+        let dummy_fg = [0f32];
+        let mut fg: SmallVec<[&[f32]; 8]> = SmallVec::new();
+        for _ in 0..num_channels {
+            fg.push(&dummy_fg[..]);
+        }
+        self.set_patches_for_row(row_pos.1, &mut *patches_for_row_result);
+        for pos_idx in patches_for_row_result.iter() {
+            let pos = &self.positions[*pos_idx];
+            assert!(row_pos.1 >= pos.y); // assert patch starts at or before current row
+            if pos.x >= row_pos.0 + xsize {
+                continue;
+            }
+
+            let ref_pos = &self.ref_positions[pos.ref_pos_idx];
+            assert!(pos.y + ref_pos.ysize > row_pos.1); // assert patch ends after current row
+            if pos.x + ref_pos.xsize < row_pos.0 {
+                continue;
+            }
+
+            let (ref_x0, out_x0, ref_xsize) = if pos.x < row_pos.0 {
+                (
+                    ref_pos.x0 + row_pos.0 - pos.x,
+                    0,
+                    ref_pos.xsize + pos.x - row_pos.0,
+                )
+            } else {
+                (ref_pos.x0, pos.x - row_pos.0, ref_pos.xsize)
+            };
+            let (ref_x1, out_x1) = if xsize - out_x0 < ref_xsize {
+                (ref_x0 + xsize - out_x0, xsize)
+            } else {
+                (ref_x0 + ref_xsize, out_x0 + ref_xsize)
+            };
+            let ref_pos_y = ref_pos.y0 + row_pos.1 - pos.y;
+
+            let ref_frame = reference_frames[ref_pos.reference].as_ref().unwrap();
+            for (c, fg_ptr) in fg.iter_mut().enumerate().take(3) {
+                *fg_ptr = &ref_frame.frame[c].row(ref_pos_y)[ref_x0..ref_x1];
+            }
+            for i in 0..num_ec {
+                fg[3 + i] = &ref_frame.frame[3 + i].row(ref_pos_y)[ref_x0..ref_x1];
+            }
+
+            let blending_idx = pos_idx * self.blendings_stride;
+            let mut bg: SmallVec<[&mut [f32]; 8]> =
+                row.iter_mut().map(|s| &mut s[out_x0..out_x1]).collect();
+            perform_blending(
+                &mut bg,
+                &fg,
+                &self.blendings[blending_idx],
+                &self.blendings[blending_idx + 1..],
+                extra_channel_info,
+            );
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    mod read_patches_tests {
+        use super::super::*;
+        use crate::util::MemoryTracker;
+        use test_log::test;
+
+        #[test]
+        fn read_single_patch_dict() -> Result<()> {
+            let mut br = BitReader::new(&[0x12, 0x4a, 0x8c, 0x63, 0x13, 0x01, 0xa6, 0x53, 0x01]);
+            let got_dict = PatchesDictionary::read(
+                &mut br,
+                1024,
+                1024,
+                0,
+                &[Some(ReferenceFrame::blank(1024, 1024, 1, true).unwrap())],
+                None,
+                &MemoryTracker::default(),
+            )?;
+            let want_dict = PatchesDictionary {
+                positions: vec![PatchPosition {
+                    x: 10,
+                    y: 20,
+                    ref_pos_idx: 0,
+                }],
+                ref_positions: vec![PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 1,
+                    ysize: 1,
+                }],
+                blendings: vec![PatchBlending {
+                    mode: PatchBlendMode::Add,
+                    alpha_channel: 0,
+                    clamp: false,
+                }],
+                blendings_stride: 1,
+                num_patches: vec![
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+                ],
+                patch_tree: vec![PatchTreeNode {
+                    left_child: -1,
+                    right_child: -1,
+                    y_center: 20,
+                    start: 0,
+                    num: 1,
+                }],
+                sorted_patches_y0: vec![(20, 0)],
+                sorted_patches_y1: vec![(21, 0)],
+            };
+            assert_eq!(got_dict, want_dict);
+            Ok(())
+        }
+
+        #[test]
+        fn read_multi_patch_dict() -> Result<()> {
+            let mut br = BitReader::new(&[
+                0x12, 0xc6, 0x26, 0x3f, 0x08, 0x4e, 0xb6, 0x0d, 0xf2, 0xde, 0xb6, 0x6d,
+            ]);
+            let got_dict = PatchesDictionary::read(
+                &mut br,
+                1024,
+                1024,
+                2,
+                &[Some(ReferenceFrame::blank(1024, 1024, 1, true).unwrap())],
+                None,
+                &MemoryTracker::default(),
+            )?;
+            let want_dict = PatchesDictionary {
+                positions: vec![
+                    PatchPosition {
+                        x: 0,
+                        y: 0,
+                        ref_pos_idx: 0,
+                    },
+                    PatchPosition {
+                        x: 5,
+                        y: 5,
+                        ref_pos_idx: 1,
+                    },
+                ],
+                ref_positions: vec![
+                    PatchReferencePosition {
+                        reference: 0,
+                        x0: 0,
+                        y0: 0,
+                        xsize: 2,
+                        ysize: 1,
+                    },
+                    PatchReferencePosition {
+                        reference: 0,
+                        x0: 0,
+                        y0: 0,
+                        xsize: 1,
+                        ysize: 2,
+                    },
+                ],
+                blendings: vec![
+                    PatchBlending {
+                        mode: PatchBlendMode::BlendAbove,
+                        alpha_channel: 1,
+                        clamp: false,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Mul,
+                        alpha_channel: 0,
+                        clamp: true,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Mul,
+                        alpha_channel: 0,
+                        clamp: true,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Mul,
+                        alpha_channel: 0,
+                        clamp: true,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Mul,
+                        alpha_channel: 0,
+                        clamp: true,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Mul,
+                        alpha_channel: 0,
+                        clamp: true,
+                    },
+                ],
+                blendings_stride: 3,
+                num_patches: vec![1, 0, 0, 0, 0, 1, 1],
+                patch_tree: vec![
+                    PatchTreeNode {
+                        left_child: 1,
+                        right_child: -1,
+                        y_center: 5,
+                        start: 0,
+                        num: 1,
+                    },
+                    PatchTreeNode {
+                        left_child: -1,
+                        right_child: -1,
+                        y_center: 0,
+                        start: 1,
+                        num: 1,
+                    },
+                ],
+                sorted_patches_y0: vec![(5, 1), (0, 0)],
+                sorted_patches_y1: vec![(7, 1), (1, 0)],
+            };
+            assert_eq!(got_dict, want_dict);
+            Ok(())
+        }
+
+        #[test]
+        fn read_large_patch_dict() -> Result<()> {
+            let mut br = BitReader::new(&[
+                0x12, 0x4e, 0x50, 0x76, 0xeb, 0x41, 0x0d, 0x7e, 0xe5, 0x8e, 0xd2, 0x5d, 0x01,
+            ]);
+            let got_dict = PatchesDictionary::read(
+                &mut br,
+                1024,
+                1024,
+                1,
+                &[Some(ReferenceFrame::blank(1024, 1024, 1, true).unwrap())],
+                None,
+                &MemoryTracker::default(),
+            )?;
+            let want_dict = PatchesDictionary {
+                positions: vec![PatchPosition {
+                    x: 2,
+                    y: 3,
+                    ref_pos_idx: 0,
+                }],
+                ref_positions: vec![PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 300,
+                    ysize: 200,
+                }],
+                blendings: vec![
+                    PatchBlending {
+                        mode: PatchBlendMode::AlphaWeightedAddBelow,
+                        alpha_channel: 0,
+                        clamp: false,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Mul,
+                        alpha_channel: 0,
+                        clamp: false,
+                    },
+                ],
+                blendings_stride: 2,
+                num_patches: vec![
+                    0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                ],
+                patch_tree: vec![PatchTreeNode {
+                    left_child: -1,
+                    right_child: -1,
+                    y_center: 3,
+                    start: 0,
+                    num: 1,
+                }],
+                sorted_patches_y0: vec![(3, 0)],
+                sorted_patches_y1: vec![(203, 0)],
+            };
+            assert_eq!(got_dict, want_dict);
+            Ok(())
+        }
+
+        #[test]
+        fn read_clamped_patch_dict() -> Result<()> {
+            let mut br = BitReader::new(&[0x12, 0xc6, 0x26, 0x1f, 0x70, 0xce, 0x06]);
+            let got_dict = PatchesDictionary::read(
+                &mut br,
+                1024,
+                1024,
+                0,
+                &[Some(ReferenceFrame::blank(1024, 1024, 1, true).unwrap())],
+                None,
+                &MemoryTracker::default(),
+            )?;
+            let want_dict = PatchesDictionary {
+                positions: vec![PatchPosition {
+                    x: 4,
+                    y: 4,
+                    ref_pos_idx: 0,
+                }],
+                ref_positions: vec![PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 1,
+                    ysize: 1,
+                }],
+                blendings: vec![PatchBlending {
+                    mode: PatchBlendMode::Mul,
+                    alpha_channel: 0,
+                    clamp: true,
+                }],
+                blendings_stride: 1,
+                num_patches: vec![0, 0, 0, 0, 1],
+                patch_tree: vec![PatchTreeNode {
+                    left_child: -1,
+                    right_child: -1,
+                    y_center: 4,
+                    start: 0,
+                    num: 1,
+                }],
+                sorted_patches_y0: vec![(4, 0)],
+                sorted_patches_y1: vec![(5, 0)],
+            };
+            assert_eq!(got_dict, want_dict);
+            Ok(())
+        }
+
+        #[test]
+        fn read_dup_patch_dict() -> Result<()> {
+            let mut br = BitReader::new(&[0x12, 0x0a, 0x8d, 0x88, 0x03, 0x31, 0xd7, 0x35]);
+            let got_dict = PatchesDictionary::read(
+                &mut br,
+                1024,
+                1024,
+                0,
+                &[Some(ReferenceFrame::blank(1024, 1024, 1, true).unwrap())],
+                None,
+                &MemoryTracker::default(),
+            )?;
+            let want_dict = PatchesDictionary {
+                positions: vec![
+                    PatchPosition {
+                        x: 0,
+                        y: 0,
+                        ref_pos_idx: 0,
+                    },
+                    PatchPosition {
+                        x: 5,
+                        y: 5,
+                        ref_pos_idx: 0,
+                    },
+                ],
+                ref_positions: vec![PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 1,
+                    ysize: 1,
+                }],
+                blendings: vec![
+                    PatchBlending {
+                        mode: PatchBlendMode::Add,
+                        alpha_channel: 0,
+                        clamp: false,
+                    },
+                    PatchBlending {
+                        mode: PatchBlendMode::Add,
+                        alpha_channel: 0,
+                        clamp: false,
+                    },
+                ],
+                blendings_stride: 1,
+                num_patches: vec![1, 0, 0, 0, 0, 1],
+                patch_tree: vec![
+                    PatchTreeNode {
+                        left_child: 1,
+                        right_child: -1,
+                        y_center: 5,
+                        start: 0,
+                        num: 1,
+                    },
+                    PatchTreeNode {
+                        left_child: -1,
+                        right_child: -1,
+                        y_center: 0,
+                        start: 1,
+                        num: 1,
+                    },
+                ],
+                sorted_patches_y0: vec![(5, 1), (0, 0)],
+                sorted_patches_y1: vec![(6, 1), (1, 0)],
+            };
+            assert_eq!(got_dict, want_dict);
+            Ok(())
+        }
+    }
+
+    mod set_patches_for_row_tests {
+        use super::super::*;
+        use test_log::test;
+
+        // Helper to create a PatchesDictionary for tests
+        fn create_dictionary(
+            positions: Vec<PatchPosition>,
+            ref_positions: Vec<PatchReferencePosition>,
+        ) -> PatchesDictionary {
+            // Using default/empty blendings for these tests as they don't affect get_patches_for_row
+            let mut dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                ..Default::default()
+            };
+            dict.compute_patch_tree().unwrap();
+            dict
+        }
+
+        #[test]
+        fn test_no_patches() {
+            let dict = create_dictionary(vec![], vec![]);
+            let mut patches_for_row_result = vec![];
+            dict.set_patches_for_row(0, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(10, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+
+        #[test]
+        fn test_single_patch_hit() {
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize: 10,
+                ysize: 5,
+            }];
+            let positions = vec![PatchPosition {
+                x: 0,
+                y: 10,
+                ref_pos_idx: 0,
+            }];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            // Patch covers rows 10, 11, 12, 13, 14
+            dict.set_patches_for_row(10, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]); // First row of patch
+            dict.set_patches_for_row(12, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]); // Middle row of patch
+            dict.set_patches_for_row(14, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]); // Last row of patch
+        }
+
+        #[test]
+        fn test_single_patch_miss() {
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize: 10,
+                ysize: 5,
+            }]; // Covers y=10 to y=14
+            let positions = vec![PatchPosition {
+                x: 0,
+                y: 10,
+                ref_pos_idx: 0,
+            }];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(9, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>); // Row before patch
+            dict.set_patches_for_row(15, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>); // Row after patch
+        }
+
+        #[test]
+        fn test_single_patch_height_one() {
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize: 10,
+                ysize: 1,
+            }]; // Covers y=5 only
+            let positions = vec![PatchPosition {
+                x: 0,
+                y: 5,
+                ref_pos_idx: 0,
+            }];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(4, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(5, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]);
+            dict.set_patches_for_row(6, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+
+        #[test]
+        fn test_multiple_patches_non_overlapping() {
+            let ref_positions = vec![
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 3,
+                }, // Patch 0: rows 5,6,7
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 2,
+                }, // Patch 1: rows 10,11
+            ];
+            let positions = vec![
+                PatchPosition {
+                    x: 0,
+                    y: 5,
+                    ref_pos_idx: 0,
+                },
+                PatchPosition {
+                    x: 0,
+                    y: 10,
+                    ref_pos_idx: 1,
+                },
+            ];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(4, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(5, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]);
+            dict.set_patches_for_row(7, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]);
+            dict.set_patches_for_row(8, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>); // Between patches
+            dict.set_patches_for_row(9, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>); // Between patches
+            dict.set_patches_for_row(10, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(11, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(12, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+
+        #[test]
+        fn test_multiple_patches_overlapping() {
+            let ref_positions = vec![
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 5,
+                }, // Patch 0: rows 10-14
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 4,
+                }, // Patch 1: rows 12-15
+            ];
+            let positions = vec![
+                PatchPosition {
+                    x: 0,
+                    y: 10,
+                    ref_pos_idx: 0,
+                }, // idx 0
+                PatchPosition {
+                    x: 0,
+                    y: 12,
+                    ref_pos_idx: 1,
+                }, // idx 1
+            ];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(10, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]); // Only patch 0
+            dict.set_patches_for_row(11, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]); // Only patch 0
+            dict.set_patches_for_row(12, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 1]); // Both patches (sorted indices)
+            dict.set_patches_for_row(13, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 1]); // Both patches
+            dict.set_patches_for_row(14, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 1]); // Patch 0 ends, Patch 1 continues
+            dict.set_patches_for_row(15, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]); // Only patch 1
+            dict.set_patches_for_row(16, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+
+        #[test]
+        fn test_multiple_patches_adjacent() {
+            let ref_positions = vec![
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 2,
+                }, // Patch 0: rows 5,6
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 3,
+                }, // Patch 1: rows 7,8,9
+            ];
+            let positions = vec![
+                PatchPosition {
+                    x: 0,
+                    y: 5,
+                    ref_pos_idx: 0,
+                },
+                PatchPosition {
+                    x: 0,
+                    y: 7,
+                    ref_pos_idx: 1,
+                },
+            ];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(4, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(5, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]);
+            dict.set_patches_for_row(6, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0]);
+            dict.set_patches_for_row(7, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]); // Patch 0 ends, Patch 1 starts
+            dict.set_patches_for_row(8, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(9, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(10, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+
+        #[test]
+        fn test_multiple_patches_same_start_different_heights() {
+            let ref_positions = vec![
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 2,
+                }, // Patch 0: rows 3,4
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 10,
+                    ysize: 4,
+                }, // Patch 1: rows 3,4,5,6
+            ];
+            let positions = vec![
+                PatchPosition {
+                    x: 0,
+                    y: 3,
+                    ref_pos_idx: 0,
+                }, // idx 0
+                PatchPosition {
+                    x: 0,
+                    y: 3,
+                    ref_pos_idx: 1,
+                }, // idx 1
+            ];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(2, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(3, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 1]); // Both cover
+            dict.set_patches_for_row(4, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 1]); // Both cover
+            dict.set_patches_for_row(5, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]); // Only patch 1 (longer)
+            dict.set_patches_for_row(6, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]); // Only patch 1
+            dict.set_patches_for_row(7, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+
+        #[test]
+        fn test_patches_out_of_order_definition() {
+            // Define patches in a non-sorted order of their y positions
+            // get_patches_for_row should still return sorted indices if multiple apply.
+            let ref_positions = vec![
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 5,
+                    ysize: 3,
+                }, // Patch 0 (idx 0): rows 10,11,12
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 5,
+                    ysize: 3,
+                }, // Patch 1 (idx 1): rows 5,6,7
+                PatchReferencePosition {
+                    reference: 0,
+                    x0: 0,
+                    y0: 0,
+                    xsize: 5,
+                    ysize: 3,
+                }, // Patch 2 (idx 2): rows 10,11,12 (overlaps with 0)
+            ];
+            let positions = vec![
+                PatchPosition {
+                    x: 0,
+                    y: 10,
+                    ref_pos_idx: 0,
+                }, // Patch 0
+                PatchPosition {
+                    x: 0,
+                    y: 5,
+                    ref_pos_idx: 1,
+                }, // Patch 1
+                PatchPosition {
+                    x: 0,
+                    y: 10,
+                    ref_pos_idx: 2,
+                }, // Patch 2
+            ];
+            let dict = create_dictionary(positions, ref_positions);
+            let mut patches_for_row_result = vec![];
+
+            dict.set_patches_for_row(4, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(5, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(6, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(7, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![1]);
+            dict.set_patches_for_row(8, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(9, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+            dict.set_patches_for_row(10, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 2]); // Patches 0 and 2, indices sorted
+            dict.set_patches_for_row(11, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 2]);
+            dict.set_patches_for_row(12, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![0, 2]);
+            dict.set_patches_for_row(13, &mut patches_for_row_result);
+            assert_eq!(patches_for_row_result, vec![] as Vec<usize>);
+        }
+    }
+
+    mod add_one_row_tests {
+        use super::super::*;
+        use crate::{
+            headers::{bit_depth::BitDepth, extra_channels::ExtraChannel},
+            image::Image,
+            util::test::assert_all_almost_abs_eq,
+        };
+
+        const MAX_ABS_DELTA: f32 = 1e-6; // Adjusted for typical f32 comparisons
+
+        fn create_reference_frame(
+            width: usize,
+            height: usize,
+            channel_values: &[f32],
+        ) -> Result<Option<ReferenceFrame>> {
+            let mut frame_channels = Vec::new();
+            for v in channel_values.iter() {
+                let img = Image::new_with_value((width, height), *v)?;
+                frame_channels.push(img);
+            }
+            Ok(Some(ReferenceFrame {
+                frame: frame_channels,
+                saved_before_color_transform: true,
+            }))
+        }
+
+        fn create_reference_frame_single_row<const N: usize>(
+            rows: &[[f32; N]],
+        ) -> Result<Option<ReferenceFrame>> {
+            let mut frame_channels = Vec::new();
+            for v in rows.iter() {
+                let mut img = Image::new((N, 1))?;
+                img.row_mut(0).copy_from_slice(v);
+                frame_channels.push(img);
+            }
+            Ok(Some(ReferenceFrame {
+                frame: frame_channels,
+                saved_before_color_transform: true,
+            }))
+        }
+
+        #[test]
+        fn test_add_one_row_simple_replace() -> Result<()> {
+            let xsize = 10;
+
+            let ref_frames = vec![create_reference_frame(xsize, 1, &[1.0; 3])?];
+            let extra_channel_info: Vec<ExtraChannelInfo> = Vec::new();
+
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0, // Points to main_ref_frame
+                x0: 2,
+                y0: 0,
+                xsize: 3,
+                ysize: 1,
+            }];
+            let positions = vec![PatchPosition {
+                x: 2,
+                y: 0,
+                ref_pos_idx: 0,
+            }];
+            let blendings = vec![PatchBlending {
+                mode: PatchBlendMode::Replace,
+                alpha_channel: 0,
+                clamp: false, // Clamping set to false
+            }];
+            let mut patches_dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                blendings,
+                blendings_stride: 1 + extra_channel_info.len(),
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            patches_dict.compute_patch_tree()?;
+
+            let mut r_data: Vec<f32> = vec![0.0; xsize];
+            let mut g_data: Vec<f32> = vec![0.0; xsize];
+            let mut b_data: Vec<f32> = vec![0.0; xsize];
+            let mut row_slices: Vec<&mut [f32]> = vec![&mut r_data, &mut g_data, &mut b_data];
+
+            let expected_r = vec![0.0, 0.0, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0];
+
+            patches_dict.add_one_row(
+                &mut row_slices,
+                (0, 0),
+                xsize,
+                &extra_channel_info,
+                &ref_frames, // Pass the Vec<ReferenceFrame>
+                &mut vec![],
+            );
+
+            assert_all_almost_abs_eq(&r_data, &expected_r, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &expected_r, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &expected_r, MAX_ABS_DELTA);
+            Ok(())
+        }
+
+        #[test]
+        fn test_add_one_row_simple_add() -> Result<()> {
+            let xsize = 10;
+            let y_coord = 0;
+
+            let ref_frames = vec![create_reference_frame(xsize, 1, &[0.2; 3])?];
+            let extra_channel_info: Vec<ExtraChannelInfo> = Vec::new();
+
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 2,
+                y0: 0,
+                xsize: 3,
+                ysize: 1,
+            }];
+            let positions = vec![PatchPosition {
+                x: 2,
+                y: 0,
+                ref_pos_idx: 0,
+            }];
+            let blendings = vec![PatchBlending {
+                mode: PatchBlendMode::Add,
+                alpha_channel: 0,
+                clamp: false, // Clamping set to false
+            }];
+            let mut patches_dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                blendings,
+                blendings_stride: 1 + extra_channel_info.len(),
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            patches_dict.compute_patch_tree()?;
+
+            let mut r_data: Vec<f32> = vec![0.5; xsize];
+            let mut g_data: Vec<f32> = vec![0.5; xsize];
+            let mut b_data: Vec<f32> = vec![0.5; xsize];
+            let mut row_slices: Vec<&mut [f32]> = vec![&mut r_data, &mut g_data, &mut b_data];
+
+            let mut expected_r: Vec<f32> = vec![0.5; xsize];
+            for r in expected_r.iter_mut().take(5).skip(2) {
+                *r = 0.5 + 0.2
+            }
+
+            patches_dict.add_one_row(
+                &mut row_slices,
+                (0, y_coord),
+                xsize,
+                &extra_channel_info,
+                &ref_frames,
+                &mut vec![],
+            );
+
+            assert_all_almost_abs_eq(&r_data, &expected_r, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &expected_r, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &expected_r, MAX_ABS_DELTA);
+            Ok(())
+        }
+
+        #[test]
+        fn test_add_one_row_overlapping_replace() -> Result<()> {
+            let xsize = 10;
+            let y_coord = 0;
+
+            let main_ref_frame1 = create_reference_frame(xsize, 1, &[1.0; 3])?;
+            let main_ref_frame2 = create_reference_frame(xsize, 1, &[2.0; 3])?;
+
+            let ref_frames = vec![main_ref_frame1, main_ref_frame2];
+            let extra_channel_info: Vec<ExtraChannelInfo> = Vec::new();
+
+            let ref_positions = vec![
+                PatchReferencePosition {
+                    reference: 0, // Points to main_ref_frame1
+                    x0: 0,
+                    y0: 0,
+                    xsize: 4,
+                    ysize: 1,
+                },
+                PatchReferencePosition {
+                    reference: 1, // Points to main_ref_frame2
+                    x0: 0,
+                    y0: 0,
+                    xsize: 3,
+                    ysize: 1,
+                },
+            ];
+            let positions = vec![
+                PatchPosition {
+                    x: 2,
+                    y: 0,
+                    ref_pos_idx: 0,
+                }, // P1: canvas [2..6] with 1.0
+                PatchPosition {
+                    x: 4,
+                    y: 0,
+                    ref_pos_idx: 1,
+                }, // P2: canvas [4..7] with 2.0
+            ];
+            let blendings = vec![
+                PatchBlending {
+                    mode: PatchBlendMode::Replace,
+                    alpha_channel: 0,
+                    clamp: false, // Clamping set to false
+                }, // For P1
+                PatchBlending {
+                    mode: PatchBlendMode::Replace,
+                    alpha_channel: 0,
+                    clamp: false, // Clamping set to false
+                }, // For P2
+            ];
+            let mut patches_dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                blendings,
+                blendings_stride: 1 + extra_channel_info.len(),
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            patches_dict.compute_patch_tree()?;
+
+            let mut r_data: Vec<f32> = vec![0.0; xsize];
+            let mut g_data: Vec<f32> = vec![0.0; xsize];
+            let mut b_data: Vec<f32> = vec![0.0; xsize];
+            let mut row_slices: Vec<&mut [f32]> = vec![&mut r_data, &mut g_data, &mut b_data];
+
+            let expected_r: Vec<f32> = vec![0.0, 0.0, 1.0, 1.0, 2.0, 2.0, 2.0, 0.0, 0.0, 0.0];
+
+            patches_dict.add_one_row(
+                &mut row_slices,
+                (0, y_coord),
+                xsize,
+                &extra_channel_info,
+                &ref_frames,
+                &mut vec![],
+            );
+
+            assert_all_almost_abs_eq(&r_data, &expected_r, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &expected_r, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &expected_r, MAX_ABS_DELTA);
+            Ok(())
+        }
+
+        #[test]
+        fn test_add_one_row_blend_above_ec_alpha_non_associated() -> Result<()> {
+            let xsize = 1;
+            let y_coord = 0;
+
+            let initial_color_val = 0.1;
+            let initial_ec0_alpha = 0.4;
+            let ref_color_val = 0.8;
+            let ref_ec0_alpha_val = 0.5;
+
+            let ec_info = vec![ExtraChannelInfo::new(
+                true,
+                ExtraChannel::Alpha,
+                BitDepth::f32(),
+                0,
+                "AlphaEC".to_string(),
+                false, // alpha_associated = false
+                None,
+                None,
+            )];
+
+            let main_ref_frame = create_reference_frame(
+                xsize,
+                1,
+                &[
+                    ref_color_val,
+                    ref_color_val,
+                    ref_color_val,
+                    ref_ec0_alpha_val,
+                ],
+            )?;
+
+            let ref_frames = vec![main_ref_frame];
+
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize: 1,
+                ysize: 1,
+            }];
+            let positions = vec![PatchPosition {
+                x: 0,
+                y: 0,
+                ref_pos_idx: 0,
+            }];
+            let blendings = vec![
+                PatchBlending {
+                    mode: PatchBlendMode::BlendAbove,
+                    alpha_channel: 0, // Alpha for color is EC0
+                    clamp: false,     // Clamping set to false
+                }, // Color
+                PatchBlending {
+                    mode: PatchBlendMode::BlendAbove,
+                    alpha_channel: 0, // Alpha for EC0 is EC0 itself
+                    clamp: false,     // Clamping set to false
+                }, // EC0
+            ];
+            let mut patches_dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                blendings,
+                blendings_stride: 1 + ec_info.len(), // Color + 1 EC
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            patches_dict.compute_patch_tree()?;
+
+            let mut r_data = vec![initial_color_val; xsize];
+            let mut g_data = vec![initial_color_val; xsize];
+            let mut b_data = vec![initial_color_val; xsize];
+            let mut ec0_data = vec![initial_ec0_alpha; xsize];
+            let mut row_slices: Vec<&mut [f32]> =
+                vec![&mut r_data, &mut g_data, &mut b_data, &mut ec0_data];
+
+            // Calculations based on C++ logic for non-associated alpha:
+            // OutputAlpha = OldAlpha + PatchAlpha * (1 - OldAlpha)
+            // OutputColor = (OldColor * OldAlpha * (1 - PatchAlpha) + PatchColor * PatchAlpha) / OutputAlpha
+            // (If OutputAlpha is very small, OutputColor is 0)
+            let canvas_alpha_val = initial_ec0_alpha; // old_alpha
+            let patch_alpha_val = ref_ec0_alpha_val; // ref_alpha
+
+            let expected_ec0 = canvas_alpha_val + patch_alpha_val * (1.0 - canvas_alpha_val);
+
+            let canvas_color_val = initial_color_val; // old_color
+            let patch_color_val = ref_color_val; // ref_color (straight)
+
+            let expected_color = if expected_ec0.abs() < 1e-5 {
+                // Threshold similar to kSmallAlpha
+                0.0
+            } else {
+                (canvas_color_val * canvas_alpha_val * (1.0 - patch_alpha_val)
+                    + patch_color_val * patch_alpha_val)
+                    / expected_ec0
+            };
+
+            patches_dict.add_one_row(
+                &mut row_slices,
+                (0, y_coord),
+                xsize,
+                &ec_info,
+                &ref_frames,
+                &mut vec![],
+            );
+
+            assert_all_almost_abs_eq(&r_data, &vec![expected_color], MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &vec![expected_color], MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &vec![expected_color], MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&ec0_data, &vec![expected_ec0], MAX_ABS_DELTA);
+            Ok(())
+        }
+
+        #[test]
+        fn test_add_one_row_blend_above_ec_alpha_associated() -> Result<()> {
+            let xsize = 1;
+            let y_coord = 0;
+
+            let initial_color_val = 0.1; // Canvas color, assumed associated
+            let initial_ec0_alpha = 0.4; // Canvas alpha
+            let ref_color_val = 0.8; // Patch color, straight (non-associated)
+            let ref_ec0_alpha_val = 0.5; // Patch alpha
+
+            let ec_info = vec![ExtraChannelInfo::new(
+                true,
+                ExtraChannel::Alpha,
+                BitDepth::f32(),
+                0,
+                "AlphaEC".to_string(),
+                true, // alpha_associated = true
+                None,
+                None,
+            )];
+
+            let main_ref_frame = create_reference_frame(
+                xsize,
+                1,
+                &[
+                    ref_color_val,
+                    ref_color_val,
+                    ref_color_val,
+                    ref_ec0_alpha_val,
+                ],
+            )?;
+
+            let ref_frames = vec![main_ref_frame];
+
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize: 1,
+                ysize: 1,
+            }];
+            let positions = vec![PatchPosition {
+                x: 0,
+                y: 0,
+                ref_pos_idx: 0,
+            }];
+            let blendings = vec![
+                PatchBlending {
+                    mode: PatchBlendMode::BlendAbove,
+                    alpha_channel: 0,
+                    clamp: false, // Clamping set to false
+                }, // Color
+                PatchBlending {
+                    mode: PatchBlendMode::BlendAbove,
+                    alpha_channel: 0,
+                    clamp: false, // Clamping set to false
+                }, // EC0
+            ];
+            let mut patches_dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                blendings,
+                blendings_stride: 1 + ec_info.len(),
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            patches_dict.compute_patch_tree()?;
+
+            let mut r_data = vec![initial_color_val; xsize];
+            let mut g_data = vec![initial_color_val; xsize];
+            let mut b_data = vec![initial_color_val; xsize];
+            let mut ec0_data = vec![initial_ec0_alpha; xsize];
+            let mut row_slices: Vec<&mut [f32]> =
+                vec![&mut r_data, &mut g_data, &mut b_data, &mut ec0_data];
+
+            let expected_ec0 = ref_ec0_alpha_val + initial_ec0_alpha * (1.0 - ref_ec0_alpha_val);
+
+            let expected_color = ref_color_val + initial_color_val * (1.0 - ref_ec0_alpha_val);
+
+            patches_dict.add_one_row(
+                &mut row_slices,
+                (0, y_coord),
+                xsize,
+                &ec_info,
+                &ref_frames,
+                &mut vec![],
+            );
+
+            assert_all_almost_abs_eq(&ec0_data, &vec![expected_ec0], MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&r_data, &vec![expected_color], MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &vec![expected_color], MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &vec![expected_color], MAX_ABS_DELTA);
+            Ok(())
+        }
+
+        #[test]
+        fn test_add_one_row_mul_blend() -> Result<()> {
+            let xsize = 2;
+            let y_coord = 0;
+
+            let initial_vals = [0.5, 2.0];
+            let ref_vals = [0.8, 0.7];
+
+            let main_ref_frame = create_reference_frame_single_row(&[ref_vals; 3])?;
+            let dummy_ref_frame1 = create_reference_frame_single_row(&[[0.0; 2]; 3])?;
+            let dummy_ref_frame2 = create_reference_frame_single_row(&[[0.0; 2]; 3])?;
+
+            let ref_frames = vec![main_ref_frame, dummy_ref_frame1, dummy_ref_frame2];
+            let extra_channel_info: Vec<ExtraChannelInfo> = Vec::new();
+
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize,
+                ysize: 1,
+            }];
+            let positions = vec![PatchPosition {
+                x: 0,
+                y: 0,
+                ref_pos_idx: 0,
+            }];
+
+            // Test Mul (always without clamp as per new instruction)
+            let blendings = vec![PatchBlending {
+                mode: PatchBlendMode::Mul,
+                alpha_channel: 0,
+                clamp: false, // Clamping set to false
+            }];
+            let mut dict = PatchesDictionary {
+                positions: positions.clone(),
+                ref_positions: ref_positions.clone(),
+                blendings,
+                blendings_stride: 1, // Only color channels
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            dict.compute_patch_tree()?;
+
+            let mut r_data = initial_vals;
+            let mut g_data = initial_vals;
+            let mut b_data = initial_vals;
+            let mut slices: Vec<&mut [f32]> = vec![&mut r_data, &mut g_data, &mut b_data];
+            dict.add_one_row(
+                &mut slices,
+                (0, y_coord),
+                xsize,
+                &extra_channel_info,
+                &ref_frames,
+                &mut vec![],
+            );
+
+            let expected_vals = [0.5 * 0.8, 2.0 * 0.7]; // [0.4, 1.4]
+            assert_all_almost_abs_eq(&r_data, &expected_vals, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &expected_vals, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &expected_vals, MAX_ABS_DELTA);
+
+            Ok(())
+        }
+
+        #[test]
+        fn test_add_one_row_none_blend() -> Result<()> {
+            let xsize = 5;
+            let y_coord = 0;
+
+            let main_ref_frame = create_reference_frame(xsize, 1, &[100.0; 3])?;
+            let dummy_ref_frame1 = create_reference_frame(xsize, 1, &[0.0; 3])?;
+            let dummy_ref_frame2 = create_reference_frame(xsize, 1, &[0.0; 3])?;
+
+            let ref_frames = vec![main_ref_frame, dummy_ref_frame1, dummy_ref_frame2];
+            let extra_channel_info: Vec<ExtraChannelInfo> = Vec::new();
+
+            let ref_positions = vec![PatchReferencePosition {
+                reference: 0,
+                x0: 0,
+                y0: 0,
+                xsize: 3,
+                ysize: 1,
+            }];
+            let positions = vec![PatchPosition {
+                x: 1,
+                y: 0,
+                ref_pos_idx: 0,
+            }];
+            let blendings = vec![PatchBlending {
+                mode: PatchBlendMode::None,
+                alpha_channel: 0,
+                clamp: false, // Clamping set to false
+            }];
+
+            let mut patches_dict = PatchesDictionary {
+                positions,
+                ref_positions,
+                blendings,
+                blendings_stride: 1, // Only color channels
+                patch_tree: Vec::new(),
+                num_patches: Vec::new(),
+                sorted_patches_y0: Vec::new(),
+                sorted_patches_y1: Vec::new(),
+            };
+            patches_dict.compute_patch_tree()?;
+
+            let initial_data: Vec<f32> = (0..xsize).map(|i| i as f32 * 0.1 + 0.05).collect();
+            let mut r_data = initial_data.clone();
+            let mut g_data = initial_data.clone();
+            let mut b_data = initial_data.clone();
+            let mut row_slices: Vec<&mut [f32]> = vec![&mut r_data, &mut g_data, &mut b_data];
+
+            patches_dict.add_one_row(
+                &mut row_slices,
+                (0, y_coord),
+                xsize,
+                &extra_channel_info,
+                &ref_frames,
+                &mut vec![],
+            );
+
+            assert_all_almost_abs_eq(&r_data, &initial_data, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&g_data, &initial_data, MAX_ABS_DELTA);
+            assert_all_almost_abs_eq(&b_data, &initial_data, MAX_ABS_DELTA);
+            Ok(())
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/features/spline.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/spline.rs
new file mode 100644
index 00000000..48c8213c
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/features/spline.rs
@@ -0,0 +1,2041 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{
+    f32::consts::{FRAC_1_SQRT_2, PI, SQRT_2},
+    iter::{self, zip},
+    ops,
+};
+
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::{Histograms, SymbolReader, unpack_signed},
+    error::{Error, Result},
+    frame::color_correlation_map::ColorCorrelationParams,
+    util::{
+        CeilLog2, MemoryTracker, NewWithCapacity, fast_cos, fast_erff_simd, tracing_wrappers::*,
+    },
+};
+use jxl_simd::{F32SimdVec, SimdDescriptor, simd_function};
+const MAX_NUM_CONTROL_POINTS: u32 = 1 << 20;
+const MAX_NUM_CONTROL_POINTS_PER_PIXEL_RATIO: u32 = 2;
+const DELTA_LIMIT: i64 = 1 << 30;
+const SPLINE_POS_LIMIT: isize = 1 << 23;
+
+const QUANTIZATION_ADJUSTMENT_CONTEXT: usize = 0;
+const STARTING_POSITION_CONTEXT: usize = 1;
+const NUM_SPLINES_CONTEXT: usize = 2;
+const NUM_CONTROL_POINTS_CONTEXT: usize = 3;
+const CONTROL_POINTS_CONTEXT: usize = 4;
+const DCT_CONTEXT: usize = 5;
+const NUM_SPLINE_CONTEXTS: usize = 6;
+const DESIRED_RENDERING_DISTANCE: f32 = 1.0;
+
+#[derive(Debug, Clone, Copy, Default)]
+pub struct Point {
+    pub x: f32,
+    pub y: f32,
+}
+
+impl Point {
+    fn new(x: f32, y: f32) -> Self {
+        Point { x, y }
+    }
+    fn abs(&self) -> f32 {
+        self.x.hypot(self.y)
+    }
+}
+
+impl PartialEq for Point {
+    fn eq(&self, other: &Self) -> bool {
+        (self.x - other.x).abs() < 1e-3 && (self.y - other.y).abs() < 1e-3
+    }
+}
+
+impl ops::Add<Point> for Point {
+    type Output = Point;
+    fn add(self, rhs: Point) -> Point {
+        Point {
+            x: self.x + rhs.x,
+            y: self.y + rhs.y,
+        }
+    }
+}
+
+impl ops::Sub<Point> for Point {
+    type Output = Point;
+    fn sub(self, rhs: Point) -> Point {
+        Point {
+            x: self.x - rhs.x,
+            y: self.y - rhs.y,
+        }
+    }
+}
+
+impl ops::Mul<f32> for Point {
+    type Output = Point;
+    fn mul(self, rhs: f32) -> Point {
+        Point {
+            x: self.x * rhs,
+            y: self.y * rhs,
+        }
+    }
+}
+
+impl ops::Div<f32> for Point {
+    type Output = Point;
+    fn div(self, rhs: f32) -> Point {
+        let inv = 1.0 / rhs;
+        Point {
+            x: self.x * inv,
+            y: self.y * inv,
+        }
+    }
+}
+
+#[derive(Default, Debug)]
+pub struct Spline {
+    control_points: Vec<Point>,
+    // X, Y, B.
+    color_dct: [Dct32; 3],
+    // Splines are drawn by normalized Gaussian splatting. This controls the
+    // Gaussian's parameter along the spline.
+    sigma_dct: Dct32,
+    // The estimated area in pixels covered by the spline.
+    estimated_area_reached: u64,
+}
+
+impl Spline {
+    pub fn validate_adjacent_point_coincidence(&self) -> Result<()> {
+        if let Some(((index, p0), p1)) = zip(
+            self.control_points
+                .iter()
+                .take(self.control_points.len() - 1)
+                .enumerate(),
+            self.control_points.iter().skip(1),
+        )
+        .find(|((_, p0), p1)| **p0 == **p1)
+        {
+            return Err(Error::SplineAdjacentCoincidingControlPoints(
+                index,
+                *p0,
+                index + 1,
+                *p1,
+            ));
+        }
+        Ok(())
+    }
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct QuantizedSpline {
+    // Double delta-encoded.
+    pub control_points: Vec<(i64, i64)>,
+    pub color_dct: [[i32; 32]; 3],
+    pub sigma_dct: [i32; 32],
+}
+
+fn inv_adjusted_quant(adjustment: i32) -> f32 {
+    if adjustment >= 0 {
+        1.0 / (1.0 + 0.125 * adjustment as f32)
+    } else {
+        1.0 - 0.125 * adjustment as f32
+    }
+}
+
+fn validate_spline_point_pos<T: num_traits::ToPrimitive>(x: T, y: T) -> Result<()> {
+    let xi = x.to_i32().unwrap();
+    let yi = y.to_i32().unwrap();
+    let ok_range = -(1i32 << 23)..(1i32 << 23);
+    if !ok_range.contains(&xi) {
+        return Err(Error::SplinesPointOutOfRange(
+            Point {
+                x: xi as f32,
+                y: yi as f32,
+            },
+            xi,
+            ok_range,
+        ));
+    }
+    if !ok_range.contains(&yi) {
+        return Err(Error::SplinesPointOutOfRange(
+            Point {
+                x: xi as f32,
+                y: yi as f32,
+            },
+            yi,
+            ok_range,
+        ));
+    }
+    Ok(())
+}
+
+const CHANNEL_WEIGHT: [f32; 4] = [0.0042, 0.075, 0.07, 0.3333];
+
+fn area_limit(image_size: u64) -> u64 {
+    // Use saturating arithmetic to prevent overflow
+    1024u64
+        .saturating_mul(image_size)
+        .saturating_add(1u64 << 32)
+        .min(1u64 << 42)
+}
+
+impl QuantizedSpline {
+    #[instrument(level = "debug", skip(br), ret, err)]
+    pub fn read(
+        br: &mut BitReader,
+        splines_histograms: &Histograms,
+        splines_reader: &mut SymbolReader,
+        max_control_points: u32,
+        total_num_control_points: &mut u32,
+    ) -> Result<QuantizedSpline> {
+        let num_control_points =
+            splines_reader.read_unsigned(splines_histograms, br, NUM_CONTROL_POINTS_CONTEXT);
+        *total_num_control_points += num_control_points;
+        if *total_num_control_points > max_control_points {
+            return Err(Error::SplinesTooManyControlPoints(
+                *total_num_control_points,
+                max_control_points,
+            ));
+        }
+        let mut control_points = Vec::new_with_capacity(num_control_points as usize)?;
+        for _ in 0..num_control_points {
+            let x =
+                splines_reader.read_signed(splines_histograms, br, CONTROL_POINTS_CONTEXT) as i64;
+            let y =
+                splines_reader.read_signed(splines_histograms, br, CONTROL_POINTS_CONTEXT) as i64;
+            control_points.push((x, y));
+            // Add check that double deltas are not outrageous (not in spec).
+            let max_delta_delta = x.abs().max(y.abs());
+            if max_delta_delta >= DELTA_LIMIT {
+                return Err(Error::SplinesDeltaLimit(max_delta_delta, DELTA_LIMIT));
+            }
+        }
+        // Decode DCTs and populate the QuantizedSpline struct
+        let mut color_dct = [[0; 32]; 3];
+        let mut sigma_dct = [0; 32];
+
+        let mut decode_dct = |dct: &mut [i32; 32]| -> Result<()> {
+            for value in dct.iter_mut() {
+                *value = splines_reader.read_signed(splines_histograms, br, DCT_CONTEXT);
+            }
+            Ok(())
+        };
+
+        for channel in &mut color_dct {
+            decode_dct(channel)?;
+        }
+        decode_dct(&mut sigma_dct)?;
+
+        Ok(QuantizedSpline {
+            control_points,
+            color_dct,
+            sigma_dct,
+        })
+    }
+
+    pub fn dequantize(
+        &self,
+        starting_point: &Point,
+        quantization_adjustment: i32,
+        y_to_x: f32,
+        y_to_b: f32,
+        image_size: u64,
+    ) -> Result<Spline> {
+        let area_limit = area_limit(image_size);
+
+        let mut result = Spline {
+            control_points: Vec::new_with_capacity(self.control_points.len() + 1)?,
+            ..Default::default()
+        };
+
+        let px = starting_point.x.round();
+        let py = starting_point.y.round();
+        validate_spline_point_pos(px, py)?;
+
+        let mut current_x = px as i32;
+        let mut current_y = py as i32;
+        result
+            .control_points
+            .push(Point::new(current_x as f32, current_y as f32));
+
+        let mut current_delta_x = 0i32;
+        let mut current_delta_y = 0i32;
+        let mut manhattan_distance = 0u64;
+
+        for &(dx, dy) in &self.control_points {
+            current_delta_x += dx as i32;
+            current_delta_y += dy as i32;
+            validate_spline_point_pos(current_delta_x, current_delta_y)?;
+
+            manhattan_distance +=
+                current_delta_x.unsigned_abs() as u64 + current_delta_y.unsigned_abs() as u64;
+
+            if manhattan_distance > area_limit {
+                return Err(Error::SplinesDistanceTooLarge(
+                    manhattan_distance,
+                    area_limit,
+                ));
+            }
+
+            current_x += current_delta_x;
+            current_y += current_delta_y;
+            validate_spline_point_pos(current_x, current_y)?;
+
+            result
+                .control_points
+                .push(Point::new(current_x as f32, current_y as f32));
+        }
+
+        let inv_quant = inv_adjusted_quant(quantization_adjustment);
+
+        for (c, weight) in CHANNEL_WEIGHT.iter().enumerate().take(3) {
+            for i in 0..32 {
+                let inv_dct_factor = if i == 0 { FRAC_1_SQRT_2 } else { 1.0 };
+                result.color_dct[c].0[i] =
+                    self.color_dct[c][i] as f32 * inv_dct_factor * weight * inv_quant;
+            }
+        }
+
+        for i in 0..32 {
+            result.color_dct[0].0[i] += y_to_x * result.color_dct[1].0[i];
+            result.color_dct[2].0[i] += y_to_b * result.color_dct[1].0[i];
+        }
+
+        let mut width_estimate = 0;
+        let mut color = [0u64; 3];
+
+        for (c, color_val) in color.iter_mut().enumerate() {
+            for i in 0..32 {
+                *color_val += (inv_quant * self.color_dct[c][i].abs() as f32).ceil() as u64;
+            }
+        }
+
+        color[0] += y_to_x.abs().ceil() as u64 * color[1];
+        color[2] += y_to_b.abs().ceil() as u64 * color[1];
+
+        let max_color = color[0].max(color[1]).max(color[2]);
+        let logcolor = 1u64.max((1u64 + max_color).ceil_log2());
+
+        let weight_limit =
+            (((area_limit as f32 / logcolor as f32) / manhattan_distance.max(1) as f32).sqrt())
+                .ceil();
+
+        for i in 0..32 {
+            let inv_dct_factor = if i == 0 { FRAC_1_SQRT_2 } else { 1.0 };
+            result.sigma_dct.0[i] =
+                self.sigma_dct[i] as f32 * inv_dct_factor * CHANNEL_WEIGHT[3] * inv_quant;
+
+            let weight_f = (inv_quant * self.sigma_dct[i].abs() as f32).ceil();
+            let weight = weight_limit.min(weight_f.max(1.0)) as u64;
+            width_estimate += weight * weight * logcolor;
+        }
+
+        result.estimated_area_reached = width_estimate * manhattan_distance;
+
+        Ok(result)
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+struct SplineSegment {
+    center_x: f32,
+    center_y: f32,
+    maximum_distance: f32,
+    inv_sigma: f32,
+    sigma_over_4_times_intensity: f32,
+    color: [f32; 3],
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct Splines {
+    pub quantization_adjustment: i32,
+    pub splines: Vec<QuantizedSpline>,
+    pub starting_points: Vec<Point>,
+    segments: Vec<SplineSegment>,
+    segment_indices: Vec<usize>,
+    segment_y_start: Vec<u64>,
+}
+
+fn draw_centripetal_catmull_rom_spline(points: &[Point]) -> Result<Vec<Point>> {
+    if points.is_empty() {
+        return Ok(vec![]);
+    }
+    if points.len() == 1 {
+        return Ok(vec![points[0]]);
+    }
+    const NUM_POINTS: usize = 16;
+    // Create a view of points with one prepended and one appended point.
+    let extended_points = iter::once(points[0] + (points[0] - points[1]))
+        .chain(points.iter().cloned())
+        .chain(iter::once(
+            points[points.len() - 1] + (points[points.len() - 1] - points[points.len() - 2]),
+        ));
+    // Pair each point with the sqrt of the distance to the next point.
+    let points_and_deltas = extended_points
+        .chain(iter::once(Point::default()))
+        .scan(Point::default(), |previous, p| {
+            let result = Some((*previous, (p - *previous).abs().sqrt()));
+            *previous = p;
+            result
+        })
+        .skip(1);
+    // Window the points with a [Point; 4] window.
+    let windowed_points = points_and_deltas
+        .scan([(Point::default(), 0.0); 4], |window, p| {
+            (window[0], window[1], window[2], window[3]) =
+                (window[1], window[2], window[3], (p.0, p.1));
+            Some([window[0], window[1], window[2], window[3]])
+        })
+        .skip(3);
+    // Create the points necessary per window, and flatten the result.
+    let result = windowed_points
+        .flat_map(|p| {
+            let mut window_result = [Point::default(); NUM_POINTS];
+            window_result[0] = p[1].0;
+            let mut t = [0.0; 4];
+            for k in 0..3 {
+                // TODO(from libjxl): Restrict d[k] with reasonable limit and spec it.
+                t[k + 1] = t[k] + p[k].1;
+            }
+            for (i, window_point) in window_result.iter_mut().enumerate().skip(1) {
+                let tt = p[0].1 + ((i as f32) / (NUM_POINTS as f32)) * p[1].1;
+                let mut a = [Point::default(); 3];
+                for k in 0..3 {
+                    // TODO(from libjxl): Reciprocal multiplication would be faster.
+                    a[k] = p[k].0 + (p[k + 1].0 - p[k].0) * ((tt - t[k]) / p[k].1);
+                }
+                let mut b = [Point::default(); 2];
+                for k in 0..2 {
+                    b[k] = a[k] + (a[k + 1] - a[k]) * ((tt - t[k]) / (p[k].1 + p[k + 1].1));
+                }
+                *window_point = b[0] + (b[1] - b[0]) * ((tt - t[1]) / p[1].1);
+            }
+            window_result
+        })
+        .chain(iter::once(points[points.len() - 1]))
+        .collect();
+    Ok(result)
+}
+
+fn for_each_equally_spaced_point<F: FnMut(Point, f32)>(
+    points: &[Point],
+    desired_distance: f32,
+    mut f: F,
+) {
+    if points.is_empty() {
+        return;
+    }
+    let mut accumulated_distance = 0.0;
+    f(points[0], desired_distance);
+    if points.len() == 1 {
+        return;
+    }
+    for index in 0..(points.len() - 1) {
+        let mut current = points[index];
+        let next = points[index + 1];
+        let segment = next - current;
+        let segment_length = segment.abs();
+        let unit_step = segment / segment_length;
+        if accumulated_distance + segment_length >= desired_distance {
+            current = current + unit_step * (desired_distance - accumulated_distance);
+            f(current, desired_distance);
+            accumulated_distance -= desired_distance;
+        }
+        accumulated_distance += segment_length;
+        while accumulated_distance >= desired_distance {
+            current = current + unit_step * desired_distance;
+            f(current, desired_distance);
+            accumulated_distance -= desired_distance;
+        }
+    }
+    f(points[points.len() - 1], accumulated_distance);
+}
+
+/// Precomputed multipliers for DCT: PI / 32.0 * i for i in 0..32
+const DCT_MULTIPLIERS: [f32; 32] = [
+    PI / 32.0 * 0.0,
+    PI / 32.0 * 1.0,
+    PI / 32.0 * 2.0,
+    PI / 32.0 * 3.0,
+    PI / 32.0 * 4.0,
+    PI / 32.0 * 5.0,
+    PI / 32.0 * 6.0,
+    PI / 32.0 * 7.0,
+    PI / 32.0 * 8.0,
+    PI / 32.0 * 9.0,
+    PI / 32.0 * 10.0,
+    PI / 32.0 * 11.0,
+    PI / 32.0 * 12.0,
+    PI / 32.0 * 13.0,
+    PI / 32.0 * 14.0,
+    PI / 32.0 * 15.0,
+    PI / 32.0 * 16.0,
+    PI / 32.0 * 17.0,
+    PI / 32.0 * 18.0,
+    PI / 32.0 * 19.0,
+    PI / 32.0 * 20.0,
+    PI / 32.0 * 21.0,
+    PI / 32.0 * 22.0,
+    PI / 32.0 * 23.0,
+    PI / 32.0 * 24.0,
+    PI / 32.0 * 25.0,
+    PI / 32.0 * 26.0,
+    PI / 32.0 * 27.0,
+    PI / 32.0 * 28.0,
+    PI / 32.0 * 29.0,
+    PI / 32.0 * 30.0,
+    PI / 32.0 * 31.0,
+];
+
+/// Precomputed cosine values for DCT at a given t value.
+/// Computed once and reused for all 4 DCT evaluations (3 color channels + sigma).
+struct PrecomputedCosines([f32; 32]);
+
+impl PrecomputedCosines {
+    /// Precompute cosines for a given t value.
+    /// Call this once per point, then use with continuous_idct_fast for each DCT.
+    #[inline]
+    fn new(t: f32) -> Self {
+        let tandhalf = t + 0.5;
+        PrecomputedCosines(core::array::from_fn(|i| {
+            fast_cos(DCT_MULTIPLIERS[i] * tandhalf)
+        }))
+    }
+}
+
+#[derive(Default, Clone, Copy, Debug)]
+struct Dct32([f32; 32]);
+
+impl Dct32 {
+    /// Fast continuous IDCT using precomputed cosines.
+    /// This avoids recomputing 32 cosines for each of the 4 DCT calls per point.
+    #[inline]
+    fn continuous_idct_fast(&self, precomputed: &PrecomputedCosines) -> f32 {
+        // Compute dot product of coeffs and precomputed cosines
+        // Using iterator for auto-vectorization
+        zip(self.0, precomputed.0)
+            .map(|(coeff, cos)| coeff * cos)
+            .sum::<f32>()
+            * SQRT_2
+    }
+}
+
+#[inline(always)]
+fn draw_segment_inner<D: SimdDescriptor>(
+    d: D,
+    row: &mut [&mut [f32]],
+    row_pos: (usize, usize),
+    x_range: (usize, usize),
+    segment: &SplineSegment,
+) {
+    let (x_start, x_end) = x_range;
+    let (row_x0, y) = row_pos;
+    let len = D::F32Vec::LEN;
+
+    let inv_sigma = D::F32Vec::splat(d, segment.inv_sigma);
+    let half = D::F32Vec::splat(d, 0.5);
+    let one_over_2s2 = D::F32Vec::splat(d, 0.353_553_38);
+    let sigma_over_4_times_intensity = D::F32Vec::splat(d, segment.sigma_over_4_times_intensity);
+    let center_x = D::F32Vec::splat(d, segment.center_x);
+    let center_y = D::F32Vec::splat(d, segment.center_y);
+    let dy = D::F32Vec::splat(d, y as f32) - center_y;
+    let dy2 = dy * dy;
+
+    let mut x_base_arr = [0.0f32; 16];
+    for (i, val) in x_base_arr.iter_mut().enumerate() {
+        *val = i as f32;
+    }
+    let vx_base = D::F32Vec::load(d, &x_base_arr);
+
+    let start_offset = x_start - row_x0;
+    let end_offset = x_end - row_x0;
+
+    let [r0, r1, r2] = row else { unreachable!() };
+
+    let mut it0 = r0[start_offset..end_offset].chunks_exact_mut(len);
+    let mut it1 = r1[start_offset..end_offset].chunks_exact_mut(len);
+    let mut it2 = r2[start_offset..end_offset].chunks_exact_mut(len);
+
+    let cm0 = D::F32Vec::splat(d, segment.color[0]);
+    let cm1 = D::F32Vec::splat(d, segment.color[1]);
+    let cm2 = D::F32Vec::splat(d, segment.color[2]);
+
+    // Process the whole range at the single dispatched width `d`: the full
+    // `len`-wide chunks, then a final zero-padded masked remainder. This makes
+    // each pixel's result depend only on its absolute x (not on chunk/offset
+    // alignment), so SIMD and scalar paths agree regardless of how `mul_add`
+    // fuses on a given ISA. (port libjxl/jxl-rs c60408d)
+    let num_chunks = (end_offset - start_offset) / len;
+    let mut x = x_start;
+    for iter in 0..=num_chunks {
+        let vx = D::F32Vec::splat(d, x as f32) + vx_base;
+        let dx = vx - center_x;
+        let sqd = dx.mul_add(dx, dy2);
+        let distance = sqd.sqrt();
+
+        let arg1 = distance.mul_add(half, one_over_2s2) * inv_sigma;
+        let arg2 = distance.mul_add(half, D::F32Vec::splat(d, -0.353_553_38)) * inv_sigma;
+        let one_dimensional_factor = fast_erff_simd(d, arg1) - fast_erff_simd(d, arg2);
+        let local_intensity =
+            sigma_over_4_times_intensity * one_dimensional_factor * one_dimensional_factor;
+
+        if iter < num_chunks {
+            let mul_accum = |cm: D::F32Vec, data: &mut [f32]| {
+                cm.mul_add(local_intensity, D::F32Vec::load(d, data))
+                    .store(data)
+            };
+            mul_accum(cm0, it0.next().unwrap());
+            mul_accum(cm1, it1.next().unwrap());
+            mul_accum(cm2, it2.next().unwrap());
+        } else {
+            let mul_accum = |cm: D::F32Vec, data: &mut [f32]| {
+                let mut full_data = [0.0; 16];
+                full_data[..data.len()].copy_from_slice(data);
+                cm.mul_add(local_intensity, D::F32Vec::load(d, &full_data))
+                    .store(&mut full_data);
+                data.copy_from_slice(&full_data[..data.len()]);
+            };
+            mul_accum(cm0, it0.into_remainder());
+            mul_accum(cm1, it1.into_remainder());
+            mul_accum(cm2, it2.into_remainder());
+            break;
+        }
+
+        x += len;
+    }
+}
+
+simd_function!(
+    draw_segment_dispatch,
+    d: D,
+    fn draw_segment_simd(
+        row: &mut [&mut [f32]],
+        row_pos: (usize, usize),
+        xsize: usize,
+        segment: &SplineSegment,
+    ) {
+        let (x0, y) = row_pos;
+        let x1 = x0 + xsize;
+        let clamped_x0 = x0.max((segment.center_x - segment.maximum_distance).round() as usize);
+        let clamped_x1 = x1.min((segment.center_x + segment.maximum_distance).round() as usize + 1);
+
+        if clamped_x1 <= clamped_x0 {
+            return;
+        }
+
+        draw_segment_inner(d, row, (x0, y), (clamped_x0, clamped_x1), segment);
+    }
+);
+
+impl Splines {
+    #[cfg(test)]
+    pub fn create(
+        quantization_adjustment: i32,
+        splines: Vec<QuantizedSpline>,
+        starting_points: Vec<Point>,
+    ) -> Splines {
+        Splines {
+            quantization_adjustment,
+            splines,
+            starting_points,
+            segments: vec![],
+            segment_indices: vec![],
+            segment_y_start: vec![],
+        }
+    }
+    pub fn draw_segments(&self, row: &mut [&mut [f32]], row_pos: (usize, usize), xsize: usize) {
+        let first_segment_index_pos = self.segment_y_start[row_pos.1];
+        let last_segment_index_pos = self.segment_y_start[row_pos.1 + 1];
+        for segment_index_pos in first_segment_index_pos..last_segment_index_pos {
+            draw_segment_dispatch(
+                row,
+                row_pos,
+                xsize,
+                &self.segments[self.segment_indices[segment_index_pos as usize]],
+            );
+        }
+    }
+
+    fn add_segment(
+        &mut self,
+        center: &Point,
+        intensity: f32,
+        color: [f32; 3],
+        sigma: f32,
+        high_precision: bool,
+        segments_by_y: &mut Vec<(u64, usize)>,
+    ) {
+        if sigma.is_infinite()
+            || sigma == 0.0
+            || (1.0 / sigma).is_infinite()
+            || intensity.is_infinite()
+        {
+            return;
+        }
+        let distance_exp: f32 = if high_precision { 5.0 } else { 3.0 };
+        let max_color = [0.01, color[0], color[1], color[2]]
+            .iter()
+            .map(|chan| (chan * intensity).abs())
+            .max_by(|a, b| a.total_cmp(b))
+            .unwrap();
+        let max_distance =
+            (-2.0 * sigma * sigma * (0.1f32.ln() * distance_exp - max_color.ln())).sqrt();
+        let segment = SplineSegment {
+            center_x: center.x,
+            center_y: center.y,
+            color,
+            inv_sigma: 1.0 / sigma,
+            sigma_over_4_times_intensity: 0.25 * sigma * intensity,
+            maximum_distance: max_distance,
+        };
+        let y0 = (center.y - max_distance).round() as i64;
+        let y1 = (center.y + max_distance).round() as i64 + 1;
+        for y in 0.max(y0)..y1 {
+            segments_by_y.push((y as u64, self.segments.len()));
+        }
+        self.segments.push(segment);
+    }
+
+    fn add_segments_from_points(
+        &mut self,
+        spline: &Spline,
+        points_to_draw: &[(Point, f32)],
+        length: f32,
+        desired_distance: f32,
+        high_precision: bool,
+        segments_by_y: &mut Vec<(u64, usize)>,
+    ) {
+        let inv_length = 1.0 / length;
+        for (point_index, (point, multiplier)) in points_to_draw.iter().enumerate() {
+            let progress = (point_index as f32 * desired_distance * inv_length).min(1.0);
+            let t = (32.0 - 1.0) * progress;
+
+            // Precompute cosines once for this point (saves 3x cosine computations)
+            let precomputed = PrecomputedCosines::new(t);
+
+            // Use precomputed cosines for all 4 DCT evaluations
+            let mut color = [0.0; 3];
+            for (index, coeffs) in spline.color_dct.iter().enumerate() {
+                color[index] = coeffs.continuous_idct_fast(&precomputed);
+            }
+            let sigma = spline.sigma_dct.continuous_idct_fast(&precomputed);
+
+            self.add_segment(
+                point,
+                *multiplier,
+                color,
+                sigma,
+                high_precision,
+                segments_by_y,
+            );
+        }
+    }
+
+    pub fn initialize_draw_cache(
+        &mut self,
+        image_xsize: u64,
+        image_ysize: u64,
+        color_correlation_params: &ColorCorrelationParams,
+        high_precision: bool,
+    ) -> Result<()> {
+        let mut total_estimated_area_reached = 0u64;
+        let mut splines = Vec::new();
+        // Use saturating_mul to prevent overflow with malicious image dimensions
+        let image_area = image_xsize.saturating_mul(image_ysize);
+        let area_limit = area_limit(image_area);
+        for (index, qspline) in self.splines.iter().enumerate() {
+            let spline = qspline.dequantize(
+                &self.starting_points[index],
+                self.quantization_adjustment,
+                color_correlation_params.y_to_x_lf(),
+                color_correlation_params.y_to_b_lf(),
+                image_area,
+            )?;
+            total_estimated_area_reached += spline.estimated_area_reached;
+            if total_estimated_area_reached > area_limit {
+                return Err(Error::SplinesAreaTooLarge(
+                    total_estimated_area_reached,
+                    area_limit,
+                ));
+            }
+            spline.validate_adjacent_point_coincidence()?;
+            splines.push(spline);
+        }
+
+        if total_estimated_area_reached
+            > (8 * image_xsize * image_ysize + (1u64 << 25)).min(1u64 << 30)
+        {
+            warn!(
+                "Large total_estimated_area_reached, expect slower decoding:{}",
+                total_estimated_area_reached
+            );
+        }
+
+        let mut segments_by_y = Vec::new();
+
+        self.segments.clear();
+        for spline in splines {
+            let mut points_to_draw = Vec::<(Point, f32)>::new();
+            let intermediate_points = draw_centripetal_catmull_rom_spline(&spline.control_points)?;
+            for_each_equally_spaced_point(
+                &intermediate_points,
+                DESIRED_RENDERING_DISTANCE,
+                |p, d| points_to_draw.push((p, d)),
+            );
+            let length = (points_to_draw.len() as isize - 2) as f32 * DESIRED_RENDERING_DISTANCE
+                + points_to_draw[points_to_draw.len() - 1].1;
+            if length <= 0.0 {
+                continue;
+            }
+            self.add_segments_from_points(
+                &spline,
+                &points_to_draw,
+                length,
+                DESIRED_RENDERING_DISTANCE,
+                high_precision,
+                &mut segments_by_y,
+            );
+        }
+
+        // TODO(from libjxl): Consider linear sorting here.
+        segments_by_y.sort_by_key(|segment| segment.0);
+
+        self.segment_indices.clear();
+        self.segment_indices.try_reserve(segments_by_y.len())?;
+        self.segment_indices.resize(segments_by_y.len(), 0);
+
+        self.segment_y_start.clear();
+        self.segment_y_start.try_reserve(image_ysize as usize + 1)?;
+        self.segment_y_start.resize(image_ysize as usize + 1, 0);
+
+        for (i, segment) in segments_by_y.iter().enumerate() {
+            self.segment_indices[i] = segment.1;
+            let y = segment.0;
+            if y < image_ysize {
+                self.segment_y_start[y as usize + 1] += 1;
+            }
+        }
+        for y in 0..image_ysize {
+            self.segment_y_start[y as usize + 1] += self.segment_y_start[y as usize];
+        }
+        Ok(())
+    }
+
+    #[instrument(level = "debug", skip(br, memory_tracker), ret, err)]
+    pub fn read(
+        br: &mut BitReader,
+        num_pixels: u32,
+        max_spline_points: Option<u32>,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<Splines> {
+        trace!(pos = br.total_bits_read());
+        let splines_histograms = Histograms::decode(NUM_SPLINE_CONTEXTS, br, true)?;
+        let mut splines_reader = SymbolReader::new(&splines_histograms, br, None)?;
+        let num_splines = splines_reader
+            .read_unsigned(&splines_histograms, br, NUM_SPLINES_CONTEXT)
+            .saturating_add(1);
+        // Use configured limit if set, otherwise use default 2^20
+        let hard_limit = max_spline_points.unwrap_or(MAX_NUM_CONTROL_POINTS);
+        let max_control_points =
+            hard_limit.min(num_pixels / MAX_NUM_CONTROL_POINTS_PER_PIXEL_RATIO);
+        if num_splines > max_control_points {
+            return Err(Error::SplinesTooMany(num_splines, max_control_points));
+        }
+
+        let mut starting_points = Vec::new();
+        let mut last_x = 0;
+        let mut last_y = 0;
+        for i in 0..num_splines {
+            let unsigned_x =
+                splines_reader.read_unsigned(&splines_histograms, br, STARTING_POSITION_CONTEXT);
+            let unsigned_y =
+                splines_reader.read_unsigned(&splines_histograms, br, STARTING_POSITION_CONTEXT);
+
+            let (x, y) = if i != 0 {
+                (
+                    unpack_signed(unsigned_x) as isize + last_x,
+                    unpack_signed(unsigned_y) as isize + last_y,
+                )
+            } else {
+                (unsigned_x as isize, unsigned_y as isize)
+            };
+            // It is not in spec, but reasonable limit to avoid overflows.
+            let max_coordinate = x.abs().max(y.abs());
+            if max_coordinate >= SPLINE_POS_LIMIT {
+                return Err(Error::SplinesCoordinatesLimit(
+                    max_coordinate,
+                    SPLINE_POS_LIMIT,
+                ));
+            }
+
+            starting_points.push(Point {
+                x: x as f32,
+                y: y as f32,
+            });
+
+            last_x = x;
+            last_y = y;
+        }
+
+        let quantization_adjustment =
+            splines_reader.read_signed(&splines_histograms, br, QUANTIZATION_ADJUSTMENT_CONTEXT);
+
+        // Check memory budget for worst-case control point allocations
+        memory_tracker
+            .check_alloc(max_control_points as u64 * std::mem::size_of::<Point>() as u64 * 2)?;
+        let mut splines = Vec::new();
+        let mut num_control_points = 0u32;
+        for _ in 0..num_splines {
+            splines.push(QuantizedSpline::read(
+                br,
+                &splines_histograms,
+                &mut splines_reader,
+                max_control_points,
+                &mut num_control_points,
+            )?);
+        }
+        splines_reader.check_final_state(&splines_histograms, br)?;
+        Ok(Splines {
+            quantization_adjustment,
+            splines,
+            starting_points,
+            ..Splines::default()
+        })
+    }
+}
+
+#[cfg(test)]
+#[allow(clippy::excessive_precision)]
+mod test_splines {
+    use std::{f32::consts::SQRT_2, iter::zip};
+    use test_log::test;
+
+    use crate::{
+        error::{Error, Result},
+        features::spline::SplineSegment,
+        frame::color_correlation_map::ColorCorrelationParams,
+        util::test::{assert_all_almost_abs_eq, assert_almost_abs_eq, assert_almost_eq},
+    };
+
+    use super::{
+        DCT_MULTIPLIERS, DESIRED_RENDERING_DISTANCE, Dct32, Point, PrecomputedCosines,
+        QuantizedSpline, Spline, Splines, draw_centripetal_catmull_rom_spline,
+        for_each_equally_spaced_point,
+    };
+    use crate::util::fast_cos;
+
+    impl Dct32 {
+        /// Original continuous_idct for testing - validates correctness against golden values.
+        fn continuous_idct(&self, t: f32) -> f32 {
+            let tandhalf = t + 0.5;
+            zip(DCT_MULTIPLIERS, self.0)
+                .map(|(multiplier, coeff)| SQRT_2 * coeff * fast_cos(multiplier * tandhalf))
+                .sum()
+        }
+    }
+
+    #[test]
+    fn dequantize() -> Result<(), Error> {
+        // Golden data generated by libjxl.
+        let quantized_and_dequantized = [
+            (
+                QuantizedSpline {
+                    control_points: vec![
+                        (109, 105),
+                        (-247, -261),
+                        (168, 427),
+                        (-46, -360),
+                        (-61, 181),
+                    ],
+                    color_dct: [
+                        [
+                            12223, 9452, 5524, 16071, 1048, 17024, 14833, 7690, 21952, 2405, 2571,
+                            2190, 1452, 2500, 18833, 1667, 5857, 21619, 1310, 20000, 10429, 11667,
+                            7976, 18786, 12976, 18548, 14786, 12238, 8667, 3405, 19929, 8429,
+                        ],
+                        [
+                            177, 712, 127, 999, 969, 356, 105, 12, 1132, 309, 353, 415, 1213, 156,
+                            988, 524, 316, 1100, 64, 36, 816, 1285, 183, 889, 839, 1099, 79, 1316,
+                            287, 105, 689, 841,
+                        ],
+                        [
+                            780, -201, -38, -695, -563, -293, -88, 1400, -357, 520, 979, 431, -118,
+                            590, -971, -127, 157, 206, 1266, 204, -320, -223, 704, -687, -276,
+                            -716, 787, -1121, 40, 292, 249, -10,
+                        ],
+                    ],
+                    sigma_dct: [
+                        139, 65, 133, 5, 137, 272, 88, 178, 71, 256, 254, 82, 126, 252, 152, 53,
+                        281, 15, 8, 209, 285, 156, 73, 56, 36, 287, 86, 244, 270, 94, 224, 156,
+                    ],
+                },
+                Spline {
+                    control_points: vec![
+                        Point { x: 109.0, y: 54.0 },
+                        Point { x: 218.0, y: 159.0 },
+                        Point { x: 80.0, y: 3.0 },
+                        Point { x: 110.0, y: 274.0 },
+                        Point { x: 94.0, y: 185.0 },
+                        Point { x: 17.0, y: 277.0 },
+                    ],
+                    color_dct: [
+                        Dct32([
+                            36.300457,
+                            39.69839859,
+                            23.20079994,
+                            67.49819946,
+                            4.401599884,
+                            71.50080109,
+                            62.29859924,
+                            32.29800034,
+                            92.19839478,
+                            10.10099983,
+                            10.79819965,
+                            9.197999954,
+                            6.098399639,
+                            10.5,
+                            79.09859467,
+                            7.001399517,
+                            24.59939957,
+                            90.79979706,
+                            5.501999855,
+                            84.0,
+                            43.80179977,
+                            49.00139999,
+                            33.49919891,
+                            78.90119934,
+                            54.49919891,
+                            77.90159607,
+                            62.10119629,
+                            51.39959717,
+                            36.40139771,
+                            14.30099964,
+                            83.70179749,
+                            35.40179825,
+                        ]),
+                        Dct32([
+                            9.386842728,
+                            53.40000153,
+                            9.525000572,
+                            74.92500305,
+                            72.67500305,
+                            26.70000076,
+                            7.875000477,
+                            0.9000000358,
+                            84.90000153,
+                            23.17500114,
+                            26.47500038,
+                            31.12500191,
+                            90.9750061,
+                            11.70000076,
+                            74.1000061,
+                            39.30000305,
+                            23.70000076,
+                            82.5,
+                            4.800000191,
+                            2.700000048,
+                            61.20000076,
+                            96.37500763,
+                            13.72500038,
+                            66.67500305,
+                            62.92500305,
+                            82.42500305,
+                            5.925000191,
+                            98.70000458,
+                            21.52500153,
+                            7.875000477,
+                            51.67500305,
+                            63.07500076,
+                        ]),
+                        Dct32([
+                            47.99487305,
+                            39.33000183,
+                            6.865000725,
+                            26.27500153,
+                            33.2650032,
+                            6.190000534,
+                            1.715000629,
+                            98.90000153,
+                            59.91000366,
+                            59.57500458,
+                            95.00499725,
+                            61.29500198,
+                            82.71500397,
+                            53.0,
+                            6.130004883,
+                            30.41000366,
+                            34.69000244,
+                            96.91999817,
+                            93.4200058,
+                            16.97999954,
+                            38.80000305,
+                            80.76500702,
+                            63.00499725,
+                            18.5850029,
+                            43.60500336,
+                            32.30500412,
+                            61.01499939,
+                            20.23000336,
+                            24.32500076,
+                            28.31500053,
+                            69.10500336,
+                            62.375,
+                        ]),
+                    ],
+                    sigma_dct: Dct32([
+                        32.75933838,
+                        21.66449928,
+                        44.32889938,
+                        1.666499972,
+                        45.66209793,
+                        90.6576004,
+                        29.33039856,
+                        59.32740021,
+                        23.66429901,
+                        85.32479858,
+                        84.6581955,
+                        27.33059883,
+                        41.99580002,
+                        83.99160004,
+                        50.66159821,
+                        17.66489983,
+                        93.65729523,
+                        4.999499798,
+                        2.666399956,
+                        69.65969849,
+                        94.9905014,
+                        51.99480057,
+                        24.33090019,
+                        18.66479874,
+                        11.99880028,
+                        95.65709686,
+                        28.66379929,
+                        81.32519531,
+                        89.99099731,
+                        31.3302002,
+                        74.65919495,
+                        51.99480057,
+                    ]),
+                    estimated_area_reached: 19843491681,
+                },
+            ),
+            (
+                QuantizedSpline {
+                    control_points: vec![
+                        (24, -32),
+                        (-178, -7),
+                        (226, 151),
+                        (121, -172),
+                        (-184, 39),
+                        (-201, -182),
+                        (301, 404),
+                    ],
+                    color_dct: [
+                        [
+                            5051, 6881, 5238, 1571, 9952, 19762, 2048, 13524, 16405, 2310, 1286,
+                            4714, 16857, 21429, 12500, 15524, 1857, 5595, 6286, 17190, 15405,
+                            20738, 310, 16071, 10952, 16286, 15571, 8452, 6929, 3095, 9905, 5690,
+                        ],
+                        [
+                            899, 1059, 836, 388, 1291, 247, 235, 203, 1073, 747, 1283, 799, 356,
+                            1281, 1231, 561, 477, 720, 309, 733, 1013, 477, 779, 1183, 32, 1041,
+                            1275, 367, 88, 1047, 321, 931,
+                        ],
+                        [
+                            -78, 244, -883, 943, -682, 752, 107, 262, -75, 557, -202, -575, -231,
+                            -731, -605, 732, 682, 650, 592, -14, -1035, 913, -188, -95, 286, -574,
+                            -509, 67, 86, -1056, 592, 380,
+                        ],
+                    ],
+                    sigma_dct: [
+                        308, 8, 125, 7, 119, 237, 209, 60, 277, 215, 126, 186, 90, 148, 211, 136,
+                        188, 142, 140, 124, 272, 140, 274, 165, 24, 209, 76, 254, 185, 83, 11, 141,
+                    ],
+                },
+                Spline {
+                    control_points: vec![
+                        Point { x: 172.0, y: 309.0 },
+                        Point { x: 196.0, y: 277.0 },
+                        Point { x: 42.0, y: 238.0 },
+                        Point { x: 114.0, y: 350.0 },
+                        Point { x: 307.0, y: 290.0 },
+                        Point { x: 316.0, y: 269.0 },
+                        Point { x: 124.0, y: 66.0 },
+                        Point { x: 233.0, y: 267.0 },
+                    ],
+                    color_dct: [
+                        Dct32([
+                            15.00070381,
+                            28.90019989,
+                            21.99959946,
+                            6.598199844,
+                            41.79839706,
+                            83.00039673,
+                            8.601599693,
+                            56.80079651,
+                            68.90100098,
+                            9.701999664,
+                            5.401199818,
+                            19.79879951,
+                            70.79940033,
+                            90.00180054,
+                            52.5,
+                            65.20079803,
+                            7.799399853,
+                            23.49899864,
+                            26.40119934,
+                            72.19799805,
+                            64.7009964,
+                            87.09959412,
+                            1.301999927,
+                            67.49819946,
+                            45.99839783,
+                            68.40119934,
+                            65.39820099,
+                            35.49839783,
+                            29.10179901,
+                            12.9989996,
+                            41.60099792,
+                            23.89799881,
+                        ]),
+                        Dct32([
+                            47.67667389,
+                            79.42500305,
+                            62.70000076,
+                            29.10000038,
+                            96.82500458,
+                            18.52500153,
+                            17.625,
+                            15.22500038,
+                            80.4750061,
+                            56.02500153,
+                            96.2250061,
+                            59.92500305,
+                            26.70000076,
+                            96.07500458,
+                            92.32500458,
+                            42.07500076,
+                            35.77500153,
+                            54.00000381,
+                            23.17500114,
+                            54.97500229,
+                            75.9750061,
+                            35.77500153,
+                            58.42500305,
+                            88.7250061,
+                            2.400000095,
+                            78.07500458,
+                            95.625,
+                            27.52500153,
+                            6.600000381,
+                            78.52500153,
+                            24.07500076,
+                            69.82500458,
+                        ]),
+                        Dct32([
+                            43.81587219,
+                            96.50500488,
+                            0.8899993896,
+                            95.11000061,
+                            49.0850029,
+                            71.16500092,
+                            25.11499977,
+                            33.56500244,
+                            75.2250061,
+                            95.01499939,
+                            82.08500671,
+                            19.67500305,
+                            10.53000069,
+                            44.90500259,
+                            49.9750061,
+                            93.31500244,
+                            83.51499939,
+                            99.5,
+                            64.61499786,
+                            53.99500275,
+                            3.525009155,
+                            99.68499756,
+                            45.2650032,
+                            82.07500458,
+                            22.42000008,
+                            37.89500427,
+                            59.99499893,
+                            32.21500015,
+                            12.62000084,
+                            4.605003357,
+                            65.51499939,
+                            96.42500305,
+                        ]),
+                    ],
+                    sigma_dct: Dct32([
+                        72.58903503,
+                        2.666399956,
+                        41.66249847,
+                        2.333099842,
+                        39.66270065,
+                        78.99209595,
+                        69.65969849,
+                        19.99799919,
+                        92.32409668,
+                        71.65950012,
+                        41.99580002,
+                        61.9937973,
+                        29.99699974,
+                        49.32839966,
+                        70.32630157,
+                        45.3288002,
+                        62.66040039,
+                        47.32859802,
+                        46.66199875,
+                        41.32920074,
+                        90.6576004,
+                        46.66199875,
+                        91.32419586,
+                        54.99449921,
+                        7.999199867,
+                        69.65969849,
+                        25.3307991,
+                        84.6581955,
+                        61.66049957,
+                        27.66390038,
+                        3.66629982,
+                        46.99530029,
+                    ]),
+                    estimated_area_reached: 25829781306,
+                },
+            ),
+            (
+                QuantizedSpline {
+                    control_points: vec![
+                        (157, -89),
+                        (-244, 41),
+                        (-58, 168),
+                        (429, -185),
+                        (-361, 198),
+                        (230, -269),
+                        (-416, 203),
+                        (167, 65),
+                        (460, -344),
+                    ],
+                    color_dct: [
+                        [
+                            5691, 15429, 1000, 2524, 5595, 4048, 18881, 1357, 14381, 3952, 22595,
+                            15167, 20857, 2500, 905, 14548, 5452, 19500, 19143, 9643, 10929, 6048,
+                            9476, 7143, 11952, 21524, 6643, 22310, 15500, 11476, 5310, 10452,
+                        ],
+                        [
+                            470, 880, 47, 1203, 1295, 211, 475, 8, 907, 528, 325, 1145, 769, 1035,
+                            633, 905, 57, 72, 1216, 780, 1, 696, 47, 637, 843, 580, 1144, 477, 669,
+                            479, 256, 643,
+                        ],
+                        [
+                            1169, -301, 1041, -725, -43, -22, 774, 134, -822, 499, 456, -287, -713,
+                            -776, 76, 449, 750, 580, -207, -643, 956, -426, 377, -64, 101, -250,
+                            -164, 259, 169, -240, 430, -22,
+                        ],
+                    ],
+                    sigma_dct: [
+                        354, 5, 75, 56, 140, 226, 84, 187, 151, 70, 257, 288, 137, 99, 100, 159,
+                        79, 176, 59, 210, 278, 68, 171, 65, 230, 263, 69, 199, 107, 107, 170, 202,
+                    ],
+                },
+                Spline {
+                    control_points: vec![
+                        Point { x: 100.0, y: 186.0 },
+                        Point { x: 257.0, y: 97.0 },
+                        Point { x: 170.0, y: 49.0 },
+                        Point { x: 25.0, y: 169.0 },
+                        Point { x: 309.0, y: 104.0 },
+                        Point { x: 232.0, y: 237.0 },
+                        Point { x: 385.0, y: 101.0 },
+                        Point { x: 122.0, y: 168.0 },
+                        Point { x: 26.0, y: 300.0 },
+                        Point { x: 390.0, y: 88.0 },
+                    ],
+                    color_dct: [
+                        Dct32([
+                            16.90140724,
+                            64.80179596,
+                            4.199999809,
+                            10.60079956,
+                            23.49899864,
+                            17.00160027,
+                            79.30019379,
+                            5.699399948,
+                            60.40019608,
+                            16.59840012,
+                            94.89899445,
+                            63.70139694,
+                            87.59939575,
+                            10.5,
+                            3.80099988,
+                            61.10159683,
+                            22.89839935,
+                            81.8999939,
+                            80.40059662,
+                            40.50059891,
+                            45.90179825,
+                            25.40159988,
+                            39.79919815,
+                            30.00059891,
+                            50.19839859,
+                            90.40079498,
+                            27.90059853,
+                            93.70199585,
+                            65.09999847,
+                            48.19919968,
+                            22.30200005,
+                            43.89839935,
+                        ]),
+                        Dct32([
+                            24.92551422,
+                            66.0,
+                            3.525000095,
+                            90.2250061,
+                            97.12500763,
+                            15.82500076,
+                            35.625,
+                            0.6000000238,
+                            68.02500153,
+                            39.60000229,
+                            24.37500191,
+                            85.875,
+                            57.67500305,
+                            77.625,
+                            47.47500229,
+                            67.875,
+                            4.275000095,
+                            5.400000095,
+                            91.20000458,
+                            58.50000381,
+                            0.07500000298,
+                            52.20000076,
+                            3.525000095,
+                            47.77500153,
+                            63.22500229,
+                            43.5,
+                            85.80000305,
+                            35.77500153,
+                            50.17500305,
+                            35.92500305,
+                            19.20000076,
+                            48.22500229,
+                        ]),
+                        Dct32([
+                            82.78805542,
+                            44.93000031,
+                            76.39500427,
+                            39.4750061,
+                            94.11500549,
+                            14.2850008,
+                            89.80500031,
+                            9.980000496,
+                            10.48500061,
+                            74.52999878,
+                            56.29500198,
+                            65.78500366,
+                            7.765003204,
+                            23.30500031,
+                            52.79500198,
+                            99.30500031,
+                            56.77500153,
+                            46.0,
+                            76.71000671,
+                            13.49000549,
+                            66.99499512,
+                            22.38000107,
+                            29.91499901,
+                            43.29500198,
+                            70.2950058,
+                            26.0,
+                            74.31999969,
+                            53.90499878,
+                            62.00500488,
+                            19.12500381,
+                            49.30000305,
+                            46.68500137,
+                        ]),
+                    ],
+                    sigma_dct: Dct32([
+                        83.43025208,
+                        1.666499972,
+                        24.99749947,
+                        18.66479874,
+                        46.66199875,
+                        75.32579803,
+                        27.99720001,
+                        62.32709885,
+                        50.32830048,
+                        23.33099937,
+                        85.65809631,
+                        95.99040222,
+                        45.66209793,
+                        32.99670029,
+                        33.32999802,
+                        52.99469757,
+                        26.33069992,
+                        58.66079712,
+                        19.66469955,
+                        69.99299622,
+                        92.65740204,
+                        22.6644001,
+                        56.99430084,
+                        21.66449928,
+                        76.65899658,
+                        87.65789795,
+                        22.99769974,
+                        66.3266983,
+                        35.6631012,
+                        35.6631012,
+                        56.6609993,
+                        67.32659912,
+                    ]),
+                    estimated_area_reached: 47263284396,
+                },
+            ),
+        ];
+        for (quantized, want_dequantized) in quantized_and_dequantized {
+            let got_dequantized = quantized.dequantize(
+                &want_dequantized.control_points[0],
+                0,
+                0.0,
+                1.0,
+                2u64 << 30,
+            )?;
+            assert_eq!(
+                got_dequantized.control_points.len(),
+                want_dequantized.control_points.len()
+            );
+            assert_all_almost_abs_eq(
+                got_dequantized
+                    .control_points
+                    .iter()
+                    .map(|p| p.x)
+                    .collect::<Vec<f32>>(),
+                want_dequantized
+                    .control_points
+                    .iter()
+                    .map(|p| p.x)
+                    .collect::<Vec<f32>>(),
+                1e-6,
+            );
+            assert_all_almost_abs_eq(
+                got_dequantized
+                    .control_points
+                    .iter()
+                    .map(|p| p.y)
+                    .collect::<Vec<f32>>(),
+                want_dequantized
+                    .control_points
+                    .iter()
+                    .map(|p| p.y)
+                    .collect::<Vec<f32>>(),
+                1e-6,
+            );
+            for index in 0..got_dequantized.color_dct.len() {
+                assert_all_almost_abs_eq(
+                    got_dequantized.color_dct[index].0,
+                    want_dequantized.color_dct[index].0,
+                    1e-4,
+                );
+            }
+            assert_all_almost_abs_eq(
+                got_dequantized.sigma_dct.0,
+                want_dequantized.sigma_dct.0,
+                1e-4,
+            );
+            assert_eq!(
+                got_dequantized.estimated_area_reached,
+                want_dequantized.estimated_area_reached,
+            );
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn centripetal_catmull_rom_spline() -> Result<(), Error> {
+        let control_points = vec![Point { x: 1.0, y: 2.0 }, Point { x: 4.0, y: 3.0 }];
+        let want_result = [
+            Point { x: 1.0, y: 2.0 },
+            Point {
+                x: 1.187500119,
+                y: 2.0625,
+            },
+            Point { x: 1.375, y: 2.125 },
+            Point {
+                x: 1.562499881,
+                y: 2.1875,
+            },
+            Point {
+                x: 1.750000119,
+                y: 2.25,
+            },
+            Point {
+                x: 1.9375,
+                y: 2.3125,
+            },
+            Point { x: 2.125, y: 2.375 },
+            Point {
+                x: 2.312500238,
+                y: 2.4375,
+            },
+            Point {
+                x: 2.500000238,
+                y: 2.5,
+            },
+            Point {
+                x: 2.6875,
+                y: 2.5625,
+            },
+            Point {
+                x: 2.875000477,
+                y: 2.625,
+            },
+            Point {
+                x: 3.062499762,
+                y: 2.6875,
+            },
+            Point { x: 3.25, y: 2.75 },
+            Point {
+                x: 3.4375,
+                y: 2.8125,
+            },
+            Point {
+                x: 3.624999762,
+                y: 2.875,
+            },
+            Point {
+                x: 3.812500238,
+                y: 2.9375,
+            },
+            Point { x: 4.0, y: 3.0 },
+        ];
+        let got_result = draw_centripetal_catmull_rom_spline(&control_points)?;
+        assert_all_almost_abs_eq(
+            got_result.iter().map(|p| p.x).collect::<Vec<f32>>(),
+            want_result.iter().map(|p| p.x).collect::<Vec<f32>>(),
+            1e-10,
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn equally_spaced_points() -> Result<(), Error> {
+        let desired_rendering_distance = 10.0f32;
+        let segments = [
+            Point { x: 0.0, y: 0.0 },
+            Point { x: 5.0, y: 0.0 },
+            Point { x: 35.0, y: 0.0 },
+            Point { x: 35.0, y: 10.0 },
+        ];
+        let want_results = [
+            (Point { x: 0.0, y: 0.0 }, desired_rendering_distance),
+            (Point { x: 10.0, y: 0.0 }, desired_rendering_distance),
+            (Point { x: 20.0, y: 0.0 }, desired_rendering_distance),
+            (Point { x: 30.0, y: 0.0 }, desired_rendering_distance),
+            (Point { x: 35.0, y: 5.0 }, desired_rendering_distance),
+            (Point { x: 35.0, y: 10.0 }, 5.0f32),
+        ];
+        let mut got_results = Vec::<(Point, f32)>::new();
+        for_each_equally_spaced_point(&segments, desired_rendering_distance, |p, d| {
+            got_results.push((p, d))
+        });
+        assert_all_almost_abs_eq(
+            got_results.iter().map(|(p, _)| p.x).collect::<Vec<f32>>(),
+            want_results.iter().map(|(p, _)| p.x).collect::<Vec<f32>>(),
+            1e-9,
+        );
+        assert_all_almost_abs_eq(
+            got_results.iter().map(|(p, _)| p.y).collect::<Vec<f32>>(),
+            want_results.iter().map(|(p, _)| p.y).collect::<Vec<f32>>(),
+            1e-9,
+        );
+        assert_all_almost_abs_eq(
+            got_results.iter().map(|(_, d)| *d).collect::<Vec<f32>>(),
+            want_results.iter().map(|(_, d)| *d).collect::<Vec<f32>>(),
+            1e-9,
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn dct32() -> Result<(), Error> {
+        let mut dct = Dct32::default();
+        for (i, coeff) in dct.0.iter_mut().enumerate() {
+            *coeff = 0.05f32 * i as f32;
+        }
+        // Golden numbers come from libjxl.
+        let want_out = [
+            16.7353153229,
+            -18.6041717529,
+            7.9931735992,
+            -7.1250801086,
+            4.6699867249,
+            -4.3367614746,
+            3.2450540066,
+            -3.0694460869,
+            2.4446771145,
+            -2.3350939751,
+            1.9243829250,
+            -1.8484034538,
+            1.5531382561,
+            -1.4964176416,
+            1.2701368332,
+            -1.2254891396,
+            1.0434474945,
+            -1.0067725182,
+            0.8544843197,
+            -0.8232427835,
+            0.6916543841,
+            -0.6642799377,
+            0.5473306179,
+            -0.5226536393,
+            0.4161090851,
+            -0.3933961987,
+            0.2940555215,
+            -0.2726306915,
+            0.1781132221,
+            -0.1574717760,
+            0.0656886101,
+            -0.0454511642,
+        ];
+        for (t, want) in want_out.iter().enumerate() {
+            let got_out = dct.continuous_idct(t as f32);
+            assert_almost_abs_eq(got_out, *want, 1e-4);
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn dct32_fast_matches_original() {
+        // Verify that continuous_idct_fast produces the same results as continuous_idct
+        let mut dct = Dct32::default();
+        for (i, coeff) in dct.0.iter_mut().enumerate() {
+            *coeff = 0.05f32 * i as f32;
+        }
+
+        for t in 0..32 {
+            let t_val = t as f32;
+            let original = dct.continuous_idct(t_val);
+            let precomputed = PrecomputedCosines::new(t_val);
+            let fast = dct.continuous_idct_fast(&precomputed);
+            assert_almost_abs_eq(fast, original, 1e-5);
+        }
+    }
+
+    fn verify_segment_almost_equal(seg1: &SplineSegment, seg2: &SplineSegment) {
+        assert_almost_eq(seg1.center_x, seg2.center_x, 1e-2, 1e-4);
+        assert_almost_eq(seg1.center_y, seg2.center_y, 1e-2, 1e-4);
+        for (got, want) in zip(seg1.color.iter(), seg2.color.iter()) {
+            assert_almost_eq(*got, *want, 1e-2, 1e-4);
+        }
+        assert_almost_eq(seg1.inv_sigma, seg2.inv_sigma, 1e-2, 1e-4);
+        assert_almost_eq(seg1.maximum_distance, seg2.maximum_distance, 1e-2, 1e-4);
+        assert_almost_eq(
+            seg1.sigma_over_4_times_intensity,
+            seg2.sigma_over_4_times_intensity,
+            1e-2,
+            1e-4,
+        );
+    }
+
+    #[test]
+    fn spline_segments_add_segment() -> Result<(), Error> {
+        let mut splines = Splines::default();
+        let mut segments_by_y = Vec::<(u64, usize)>::new();
+
+        splines.add_segment(
+            &Point { x: 10.0, y: 20.0 },
+            0.5,
+            [0.5, 0.6, 0.7],
+            0.8,
+            true,
+            &mut segments_by_y,
+        );
+        // Golden numbers come from libjxl.
+        let want_segment = SplineSegment {
+            center_x: 10.0,
+            center_y: 20.0,
+            color: [0.5, 0.6, 0.7],
+            inv_sigma: 1.25,
+            maximum_distance: 3.65961,
+            sigma_over_4_times_intensity: 0.1,
+        };
+        assert_eq!(splines.segments.len(), 1);
+        verify_segment_almost_equal(&splines.segments[0], &want_segment);
+        let want_segments_by_y = [
+            (16, 0),
+            (17, 0),
+            (18, 0),
+            (19, 0),
+            (20, 0),
+            (21, 0),
+            (22, 0),
+            (23, 0),
+            (24, 0),
+        ];
+        for (got, want) in zip(segments_by_y.iter(), want_segments_by_y.iter()) {
+            assert_eq!(got.0, want.0);
+            assert_eq!(got.1, want.1);
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn spline_segments_add_segments_from_points() -> Result<(), Error> {
+        let mut splines = Splines::default();
+        let mut segments_by_y = Vec::<(u64, usize)>::new();
+        let mut color_dct = [Dct32::default(); 3];
+        for (channel_index, channel_dct) in color_dct.iter_mut().enumerate() {
+            for (coeff_index, coeff) in channel_dct.0.iter_mut().enumerate() {
+                *coeff = 0.1 * channel_index as f32 + 0.05 * coeff_index as f32;
+            }
+        }
+        let mut sigma_dct = Dct32::default();
+        for (coeff_index, coeff) in sigma_dct.0.iter_mut().enumerate() {
+            *coeff = 0.06 * coeff_index as f32;
+        }
+        let spline = Spline {
+            control_points: vec![],
+            color_dct,
+            sigma_dct,
+            estimated_area_reached: 0,
+        };
+        let points_to_draw = vec![
+            (Point { x: 10.0, y: 20.0 }, 1.0),
+            (Point { x: 11.0, y: 21.0 }, 1.0),
+            (Point { x: 12.0, y: 21.0 }, 1.0),
+        ];
+        splines.add_segments_from_points(
+            &spline,
+            &points_to_draw,
+            SQRT_2 + 1.0,
+            DESIRED_RENDERING_DISTANCE,
+            true,
+            &mut segments_by_y,
+        );
+        // Golden numbers come from libjxl.
+        let want_segments = [
+            SplineSegment {
+                center_x: 10.0,
+                center_y: 20.0,
+                color: [16.73531532, 19.68646049, 22.63760757],
+                inv_sigma: 0.04979490861,
+                maximum_distance: 108.6400299,
+                sigma_over_4_times_intensity: 5.020593643,
+            },
+            SplineSegment {
+                center_x: 11.0,
+                center_y: 21.0,
+                color: [-0.8199231625, -0.7960500717, -0.7721766233],
+                inv_sigma: -1.016355753,
+                maximum_distance: 4.680418015,
+                sigma_over_4_times_intensity: -0.2459768653,
+            },
+            SplineSegment {
+                center_x: 12.0,
+                center_y: 21.0,
+                color: [-0.7767754197, -0.7544237971, -0.7320720553],
+                inv_sigma: -1.072811365,
+                maximum_distance: 4.423510075,
+                sigma_over_4_times_intensity: -0.2330325693,
+            },
+        ];
+        assert_eq!(splines.segments.len(), want_segments.len());
+        for (got, want) in zip(splines.segments.iter(), want_segments.iter()) {
+            verify_segment_almost_equal(got, want);
+        }
+        let want_segments_by_y: Vec<(u64, usize)> = (0..=129)
+            .map(|c| (c, 0))
+            .chain((16..=26).map(|c| (c, 1)))
+            .chain((17..=25).map(|c| (c, 2)))
+            .collect();
+        for (got, want) in zip(segments_by_y.iter(), want_segments_by_y.iter()) {
+            assert_eq!(got.0, want.0);
+            assert_eq!(got.1, want.1);
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn init_draw_cache() -> Result<(), Error> {
+        let mut splines = Splines {
+            splines: vec![
+                QuantizedSpline {
+                    control_points: vec![
+                        (109, 105),
+                        (-247, -261),
+                        (168, 427),
+                        (-46, -360),
+                        (-61, 181),
+                    ],
+                    color_dct: [
+                        [
+                            12223, 9452, 5524, 16071, 1048, 17024, 14833, 7690, 21952, 2405, 2571,
+                            2190, 1452, 2500, 18833, 1667, 5857, 21619, 1310, 20000, 10429, 11667,
+                            7976, 18786, 12976, 18548, 14786, 12238, 8667, 3405, 19929, 8429,
+                        ],
+                        [
+                            177, 712, 127, 999, 969, 356, 105, 12, 1132, 309, 353, 415, 1213, 156,
+                            988, 524, 316, 1100, 64, 36, 816, 1285, 183, 889, 839, 1099, 79, 1316,
+                            287, 105, 689, 841,
+                        ],
+                        [
+                            780, -201, -38, -695, -563, -293, -88, 1400, -357, 520, 979, 431, -118,
+                            590, -971, -127, 157, 206, 1266, 204, -320, -223, 704, -687, -276,
+                            -716, 787, -1121, 40, 292, 249, -10,
+                        ],
+                    ],
+                    sigma_dct: [
+                        139, 65, 133, 5, 137, 272, 88, 178, 71, 256, 254, 82, 126, 252, 152, 53,
+                        281, 15, 8, 209, 285, 156, 73, 56, 36, 287, 86, 244, 270, 94, 224, 156,
+                    ],
+                },
+                QuantizedSpline {
+                    control_points: vec![
+                        (24, -32),
+                        (-178, -7),
+                        (226, 151),
+                        (121, -172),
+                        (-184, 39),
+                        (-201, -182),
+                        (301, 404),
+                    ],
+                    color_dct: [
+                        [
+                            5051, 6881, 5238, 1571, 9952, 19762, 2048, 13524, 16405, 2310, 1286,
+                            4714, 16857, 21429, 12500, 15524, 1857, 5595, 6286, 17190, 15405,
+                            20738, 310, 16071, 10952, 16286, 15571, 8452, 6929, 3095, 9905, 5690,
+                        ],
+                        [
+                            899, 1059, 836, 388, 1291, 247, 235, 203, 1073, 747, 1283, 799, 356,
+                            1281, 1231, 561, 477, 720, 309, 733, 1013, 477, 779, 1183, 32, 1041,
+                            1275, 367, 88, 1047, 321, 931,
+                        ],
+                        [
+                            -78, 244, -883, 943, -682, 752, 107, 262, -75, 557, -202, -575, -231,
+                            -731, -605, 732, 682, 650, 592, -14, -1035, 913, -188, -95, 286, -574,
+                            -509, 67, 86, -1056, 592, 380,
+                        ],
+                    ],
+                    sigma_dct: [
+                        308, 8, 125, 7, 119, 237, 209, 60, 277, 215, 126, 186, 90, 148, 211, 136,
+                        188, 142, 140, 124, 272, 140, 274, 165, 24, 209, 76, 254, 185, 83, 11, 141,
+                    ],
+                },
+            ],
+            starting_points: vec![Point { x: 10.0, y: 20.0 }, Point { x: 5.0, y: 40.0 }],
+            ..Default::default()
+        };
+        splines.initialize_draw_cache(
+            1 << 15,
+            1 << 15,
+            &ColorCorrelationParams {
+                color_factor: 1,
+                base_correlation_x: 0.0,
+                base_correlation_b: 0.0,
+                ytox_lf: 0,
+                ytob_lf: 0,
+            },
+            true,
+        )?;
+        assert_eq!(splines.segments.len(), 1940);
+        let want_segments_sample = [
+            (
+                22,
+                SplineSegment {
+                    center_x: 25.77652359,
+                    center_y: 35.33295059,
+                    color: [-524.996582, -509.9048462, 43.3883667],
+                    inv_sigma: -0.00197347207,
+                    maximum_distance: 3021.377197,
+                    sigma_over_4_times_intensity: -126.6802902,
+                },
+            ),
+            (
+                474,
+                SplineSegment {
+                    center_x: -16.45600891,
+                    center_y: 78.81845856,
+                    color: [-117.6707535, -133.5515594, 343.5632629],
+                    inv_sigma: -0.002631845651,
+                    maximum_distance: 2238.376221,
+                    sigma_over_4_times_intensity: -94.9903717,
+                },
+            ),
+            (
+                835,
+                SplineSegment {
+                    center_x: -71.93701172,
+                    center_y: 230.0635529,
+                    color: [44.79507446, 298.9411621, -395.3574524],
+                    inv_sigma: 0.01869126037,
+                    maximum_distance: 316.4499207,
+                    sigma_over_4_times_intensity: 13.3752346,
+                },
+            ),
+            (
+                1066,
+                SplineSegment {
+                    center_x: -126.2593002,
+                    center_y: -22.97857094,
+                    color: [-136.4196625, 194.757019, -98.18778992],
+                    inv_sigma: 0.007531851064,
+                    maximum_distance: 769.2540283,
+                    sigma_over_4_times_intensity: 33.19237137,
+                },
+            ),
+            (
+                1328,
+                SplineSegment {
+                    center_x: 73.70871735,
+                    center_y: 56.31413269,
+                    color: [-13.44394779, 162.6139221, 93.78419495],
+                    inv_sigma: 0.003664178308,
+                    maximum_distance: 1572.710327,
+                    sigma_over_4_times_intensity: 68.2281189,
+                },
+            ),
+            (
+                1545,
+                SplineSegment {
+                    center_x: 77.48892975,
+                    center_y: -92.33877563,
+                    color: [-220.6807556, 66.13040924, -32.26184082],
+                    inv_sigma: 0.03166157752,
+                    maximum_distance: 183.6748352,
+                    sigma_over_4_times_intensity: 7.89600563,
+                },
+            ),
+            (
+                1774,
+                SplineSegment {
+                    center_x: -16.43594933,
+                    center_y: -144.8626556,
+                    color: [57.31535339, -46.36843109, 92.14952087],
+                    inv_sigma: -0.01524505392,
+                    maximum_distance: 371.4827271,
+                    sigma_over_4_times_intensity: -16.39876175,
+                },
+            ),
+            (
+                1929,
+                SplineSegment {
+                    center_x: 61.19338608,
+                    center_y: -10.70717049,
+                    color: [-69.78807068, 300.6082458, -476.5135803],
+                    inv_sigma: 0.003229281865,
+                    maximum_distance: 1841.37854,
+                    sigma_over_4_times_intensity: 77.41659546,
+                },
+            ),
+        ];
+        for (index, segment) in want_segments_sample {
+            verify_segment_almost_equal(&segment, &splines.segments[index]);
+        }
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/adaptive_lf_smoothing.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/adaptive_lf_smoothing.rs
new file mode 100644
index 00000000..0e859b81
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/adaptive_lf_smoothing.rs
@@ -0,0 +1,198 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::error::Result;
+use crate::image::Image;
+use num_traits::abs;
+
+#[allow(clippy::excessive_precision)]
+const W_SIDE: f32 = 0.20345139757231578;
+#[allow(clippy::excessive_precision)]
+const W_CORNER: f32 = 0.0334829185968739;
+const W_CENTER: f32 = 1.0 - 4.0 * (W_SIDE + W_CORNER);
+
+fn compute_pixel_channel(
+    dc_factor: f32,
+    gap: f32,
+    x: usize,
+    row_top: &[f32],
+    row: &[f32],
+    row_bottom: &[f32],
+) -> (f32, f32, f32) {
+    let tl = row_top[x - 1];
+    let tc = row_top[x];
+    let tr = row_top[x + 1];
+    let ml = row[x - 1];
+    let mc = row[x];
+    let mr = row[x + 1];
+    let bl = row_bottom[x - 1];
+    let bc = row_bottom[x];
+    let br = row_bottom[x + 1];
+    let corner = tl + tr + bl + br;
+    let side = ml + mr + tc + bc;
+    let sm = corner * W_CORNER + side * W_SIDE + mc * W_CENTER;
+    (mc, sm, gap.max(abs((mc - sm) / dc_factor)))
+}
+
+pub fn adaptive_lf_smoothing(
+    lf_factors: [f32; 3],
+    lf_image: &mut [Image<f32>; 3],
+    #[cfg(feature = "threads")] parallel: bool,
+) -> Result<()> {
+    let xsize = lf_image[0].size().0;
+    let ysize = lf_image[0].size().1;
+    if ysize <= 2 || xsize <= 2 {
+        return Ok(());
+    }
+    // Use new_uninit: every pixel is written (borders copied, interior computed).
+    let mut smoothed: [Image<f32>; 3] = [
+        Image::<f32>::new_uninit((xsize, ysize))?,
+        Image::<f32>::new_uninit((xsize, ysize))?,
+        Image::<f32>::new_uninit((xsize, ysize))?,
+    ];
+    // Copy border rows (row 0 and ysize-1) and border columns (x=0, x=xsize-1).
+    for c in 0..3 {
+        for y in [0, ysize - 1] {
+            smoothed[c].row_mut(y).copy_from_slice(lf_image[c].row(y));
+        }
+    }
+
+    #[cfg(feature = "threads")]
+    if parallel && ysize > 4 {
+        use rayon::prelude::*;
+
+        // Zero-allocation parallel smoothing: write directly into pre-allocated
+        // smoothed images via all_rows_mut(). Each parallel task writes to its
+        // own disjoint output row — no per-row Vec allocation or copy-back.
+        let [s0, s1, s2] = &mut smoothed;
+        let mut rows0 = s0.all_rows_mut();
+        let mut rows1 = s1.all_rows_mut();
+        let mut rows2 = s2.all_rows_mut();
+
+        // Split into (border_top, interior, border_bottom) so the interior
+        // rows can be processed in parallel without borrowing the border rows.
+        // Border rows were already copied above, so we just need the interior.
+        let (_, interior0) = rows0.split_at_mut(1);
+        let (interior0, _) = interior0.split_at_mut(ysize - 2);
+        let (_, interior1) = rows1.split_at_mut(1);
+        let (interior1, _) = interior1.split_at_mut(ysize - 2);
+        let (_, interior2) = rows2.split_at_mut(1);
+        let (interior2, _) = interior2.split_at_mut(ysize - 2);
+
+        // Zip the three channels' interior rows together for parallel iteration.
+        // Each tuple element is &mut &mut [f32], which we iterate over.
+        interior0
+            .par_iter_mut()
+            .zip(interior1.par_iter_mut())
+            .zip(interior2.par_iter_mut())
+            .enumerate()
+            .for_each(|(i, ((out0, out1), out2))| {
+                let y = i + 1; // rows 1..ysize-1
+                let rows_in: [(&[f32], &[f32], &[f32]); 3] = core::array::from_fn(|c| {
+                    (
+                        lf_image[c].row(y - 1),
+                        lf_image[c].row(y),
+                        lf_image[c].row(y + 1),
+                    )
+                });
+
+                // Copy border columns.
+                out0[0] = rows_in[0].1[0];
+                out0[xsize - 1] = rows_in[0].1[xsize - 1];
+                out1[0] = rows_in[1].1[0];
+                out1[xsize - 1] = rows_in[1].1[xsize - 1];
+                out2[0] = rows_in[2].1[0];
+                out2[xsize - 1] = rows_in[2].1[xsize - 1];
+
+                #[allow(clippy::needless_range_loop)] // x indexes 6+ parallel arrays
+                for x in 1..xsize - 1 {
+                    let gap = 0.5;
+                    let (mc_x, sm_x, gap) = compute_pixel_channel(
+                        lf_factors[0],
+                        gap,
+                        x,
+                        rows_in[0].0,
+                        rows_in[0].1,
+                        rows_in[0].2,
+                    );
+                    let (mc_y, sm_y, gap) = compute_pixel_channel(
+                        lf_factors[1],
+                        gap,
+                        x,
+                        rows_in[1].0,
+                        rows_in[1].1,
+                        rows_in[1].2,
+                    );
+                    let (mc_b, sm_b, gap) = compute_pixel_channel(
+                        lf_factors[2],
+                        gap,
+                        x,
+                        rows_in[2].0,
+                        rows_in[2].1,
+                        rows_in[2].2,
+                    );
+                    let factor = (3.0 - 4.0 * gap).max(0.0);
+                    out0[x] = (sm_x - mc_x) * factor + mc_x;
+                    out1[x] = (sm_y - mc_y) * factor + mc_y;
+                    out2[x] = (sm_b - mc_b) * factor + mc_b;
+                }
+            });
+    } else {
+        smooth_serial(lf_factors, lf_image, &mut smoothed, xsize, ysize);
+    }
+
+    #[cfg(not(feature = "threads"))]
+    smooth_serial(lf_factors, lf_image, &mut smoothed, xsize, ysize);
+
+    *lf_image = smoothed;
+    Ok(())
+}
+
+fn smooth_serial(
+    lf_factors: [f32; 3],
+    lf_image: &[Image<f32>; 3],
+    smoothed: &mut [Image<f32>; 3],
+    xsize: usize,
+    ysize: usize,
+) {
+    for y in 1..ysize - 1 {
+        for x in [0, xsize - 1] {
+            for c in 0..3 {
+                smoothed[c].row_mut(y)[x] = lf_image[c].row(y)[x];
+            }
+        }
+        for x in 1..xsize - 1 {
+            let gap = 0.5;
+            let (mc_x, sm_x, gap) = compute_pixel_channel(
+                lf_factors[0],
+                gap,
+                x,
+                lf_image[0].row(y - 1),
+                lf_image[0].row(y),
+                lf_image[0].row(y + 1),
+            );
+            let (mc_y, sm_y, gap) = compute_pixel_channel(
+                lf_factors[1],
+                gap,
+                x,
+                lf_image[1].row(y - 1),
+                lf_image[1].row(y),
+                lf_image[1].row(y + 1),
+            );
+            let (mc_b, sm_b, gap) = compute_pixel_channel(
+                lf_factors[2],
+                gap,
+                x,
+                lf_image[2].row(y - 1),
+                lf_image[2].row(y),
+                lf_image[2].row(y + 1),
+            );
+            let factor = (3.0 - 4.0 * gap).max(0.0);
+            smoothed[0].row_mut(y)[x] = (sm_x - mc_x) * factor + mc_x;
+            smoothed[1].row_mut(y)[x] = (sm_y - mc_y) * factor + mc_y;
+            smoothed[2].row_mut(y)[x] = (sm_b - mc_b) * factor + mc_b;
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/block_context_map.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/block_context_map.rs
new file mode 100644
index 00000000..9051f596
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/block_context_map.rs
@@ -0,0 +1,153 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::{context_map::*, decode::unpack_signed},
+    error::{Error, Result},
+    frame::coeff_order::NUM_ORDERS,
+    util::ShiftRightCeil,
+};
+
+pub const NON_ZERO_BUCKETS: usize = 37;
+
+// Supremum of zero_density_context(x, y) + 1, when x + y <= 64.
+pub const ZERO_DENSITY_CONTEXT_COUNT: usize = 458;
+// Supremum of zero_density_context(x, y) + 1.
+pub const ZERO_DENSITY_CONTEXT_LIMIT: usize = 474;
+
+pub const COEFF_FREQ_CONTEXT: [usize; 64] = [
+    0xBAD, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19,
+    19, 20, 20, 21, 21, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26, 27,
+    27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30,
+];
+
+pub const COEFF_NUM_NONZERO_CONTEXT: [usize; 64] = [
+    0xBAD, 0, 31, 62, 62, 93, 93, 93, 93, 123, 123, 123, 123, 152, 152, 152, 152, 152, 152, 152,
+    152, 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, 206, 206, 206, 206, 206, 206,
+    206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
+    206, 206, 206, 206, 206, 206,
+];
+
+#[inline(always)]
+pub fn zero_density_context(
+    nonzeros_left: usize,
+    k: usize,
+    log_num_blocks: usize,
+    prev: usize,
+) -> usize {
+    let nonzeros_left_norm = nonzeros_left.shrc(log_num_blocks);
+    let k_norm = k >> log_num_blocks;
+    debug_assert!((1..64).contains(&k_norm));
+    debug_assert!((1..64).contains(&nonzeros_left_norm));
+    (COEFF_NUM_NONZERO_CONTEXT[nonzeros_left_norm & 63] + COEFF_FREQ_CONTEXT[k_norm & 63]) * 2
+        + prev
+}
+
+#[derive(Debug)]
+pub struct BlockContextMap {
+    pub lf_thresholds: [Vec<i32>; 3],
+    pub qf_thresholds: Vec<u32>,
+    pub context_map: Vec<u8>,
+    pub num_lf_contexts: usize,
+    pub num_contexts: usize,
+}
+
+impl BlockContextMap {
+    pub fn num_ac_contexts(&self) -> usize {
+        self.num_contexts * (NON_ZERO_BUCKETS + ZERO_DENSITY_CONTEXT_COUNT)
+    }
+    pub fn read(br: &mut BitReader) -> Result<BlockContextMap, Error> {
+        if br.read(1)? == 1 {
+            Ok(BlockContextMap {
+                lf_thresholds: [vec![], vec![], vec![]],
+                qf_thresholds: vec![],
+                context_map: vec![
+                    0, 1, 2, 2, 3, 3, 4, 5, 6, 6, 6, 6, 6, //
+                    7, 8, 9, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, //
+                    7, 8, 9, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14, //
+                ],
+                num_lf_contexts: 1,
+                num_contexts: 15,
+            })
+        } else {
+            let mut num_lf_contexts: usize = 1;
+            let mut lf_thresholds: [Vec<i32>; 3] = [vec![], vec![], vec![]];
+            for thr in lf_thresholds.iter_mut() {
+                let num_lf_thresholds = br.read(4)? as usize;
+                let mut v: Vec<i32> = vec![0; num_lf_thresholds];
+                for val in v.iter_mut() {
+                    let uval = match br.read(2)? {
+                        0 => br.read(4)?,
+                        1 => br.read(8)? + 16,
+                        2 => br.read(16)? + 272,
+                        _ => br.read(32)? + 65808,
+                    };
+                    *val = unpack_signed(uval as u32)
+                }
+                *thr = v;
+                num_lf_contexts *= num_lf_thresholds + 1;
+            }
+            let num_qf_thresholds = br.read(4)? as usize;
+            let mut qf_thresholds: Vec<u32> = vec![0; num_qf_thresholds];
+            for val in qf_thresholds.iter_mut() {
+                *val = match br.read(2)? {
+                    0 => br.read(2)?,
+                    1 => br.read(3)? + 4,
+                    2 => br.read(5)? + 12,
+                    _ => br.read(8)? + 44,
+                } as u32
+                    + 1;
+            }
+            if num_lf_contexts * (num_qf_thresholds + 1) > 64 {
+                return Err(Error::BlockContextMapSizeTooBig(
+                    num_lf_contexts,
+                    num_qf_thresholds,
+                ));
+            }
+            let context_map_size = 3 * NUM_ORDERS * num_lf_contexts * (num_qf_thresholds + 1);
+            let context_map = decode_context_map(context_map_size, br)?;
+            assert_eq!(context_map.len(), context_map_size);
+            let num_contexts = *context_map.iter().max().unwrap() as usize + 1;
+            if num_contexts > 16 {
+                Err(Error::TooManyBlockContexts)
+            } else {
+                Ok(BlockContextMap {
+                    lf_thresholds,
+                    qf_thresholds,
+                    context_map,
+                    num_lf_contexts,
+                    num_contexts,
+                })
+            }
+        }
+    }
+    pub fn block_context(&self, lf_idx: usize, qf: u32, shape_id: usize, c: usize) -> usize {
+        let mut qf_idx: usize = 0;
+        for t in &self.qf_thresholds {
+            if qf > *t {
+                qf_idx += 1;
+            }
+        }
+        let mut idx = if c < 2 { c ^ 1 } else { 2 };
+        idx = idx * NUM_ORDERS + shape_id;
+        idx = idx * (self.qf_thresholds.len() + 1) + qf_idx;
+        idx = idx * self.num_lf_contexts + lf_idx;
+        self.context_map[idx] as usize
+    }
+    pub fn nonzero_context(&self, nonzeros: usize, block_context: usize) -> usize {
+        let context: usize = if nonzeros < 8 {
+            nonzeros
+        } else if nonzeros < 64 {
+            4 + nonzeros / 2
+        } else {
+            36
+        };
+        context * self.num_contexts + block_context
+    }
+    pub fn zero_density_context_offset(&self, block_context: usize) -> usize {
+        self.num_contexts * NON_ZERO_BUCKETS + ZERO_DENSITY_CONTEXT_COUNT * block_context
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/coeff_order.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/coeff_order.rs
new file mode 100644
index 00000000..c05c2770
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/coeff_order.rs
@@ -0,0 +1,187 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    BLOCK_DIM, BLOCK_SIZE,
+    bit_reader::BitReader,
+    entropy_coding::decode::SymbolReader,
+    error::Result,
+    frame::Histograms,
+    headers::permutation::Permutation,
+    util::{CeilLog2, tracing_wrappers::*},
+};
+
+use crate::transforms::transform_map::*;
+
+use std::borrow::Cow;
+use std::mem;
+use std::sync::OnceLock;
+
+pub const NUM_ORDERS: usize = 13;
+
+pub const TRANSFORM_TYPE_LUT: [HfTransformType; NUM_ORDERS] = [
+    HfTransformType::DCT,
+    HfTransformType::IDENTITY, // a.k.a. "Hornuss"
+    HfTransformType::DCT16X16,
+    HfTransformType::DCT32X32,
+    HfTransformType::DCT8X16,
+    HfTransformType::DCT8X32,
+    HfTransformType::DCT16X32,
+    HfTransformType::DCT64X64,
+    HfTransformType::DCT32X64,
+    HfTransformType::DCT128X128,
+    HfTransformType::DCT64X128,
+    HfTransformType::DCT256X256,
+    HfTransformType::DCT128X256,
+];
+
+pub const NUM_PERMUTATION_CONTEXTS: usize = 8;
+
+/// Cached natural coefficient orders per transform type.
+/// Each entry is computed lazily on first access, avoiding computation
+/// of orders for large transforms that are never used.
+static NATURAL_COEFF_ORDERS: [OnceLock<Vec<u32>>; NUM_ORDERS] = [
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+];
+
+/// Get cached natural coefficient order for a transform type index.
+/// Computes the order lazily on first access.
+fn get_natural_coeff_order(idx: usize) -> &'static Vec<u32> {
+    NATURAL_COEFF_ORDERS[idx].get_or_init(|| natural_coeff_order(TRANSFORM_TYPE_LUT[idx]))
+}
+
+pub fn natural_coeff_order(transform: HfTransformType) -> Vec<u32> {
+    let cx = covered_blocks_x(transform) as usize;
+    let cy = covered_blocks_y(transform) as usize;
+    let xsize: usize = cx * BLOCK_DIM;
+    assert!(cx >= cy);
+    // We compute the zigzag order for a cx x cx block, then discard all the
+    // lines that are not multiple of the ratio between cx and cy.
+    let xs = cx / cy;
+    let xsm = xs - 1;
+    let xss = xs.ceil_log2();
+    let mut out: Vec<u32> = vec![0; cx * cy * BLOCK_SIZE];
+    // First half of the block
+    let mut cur = cx * cy;
+    for i in 0..xsize {
+        for j in 0..(i + 1) {
+            let mut x = j;
+            let mut y = i - j;
+            if i % 2 != 0 {
+                mem::swap(&mut x, &mut y);
+            }
+            if (y & xsm) != 0 {
+                continue;
+            }
+            y >>= xss;
+            let val;
+            if x < cx && y < cy {
+                val = y * cx + x;
+            } else {
+                val = cur;
+                cur += 1;
+            }
+            out[val] = (y * xsize + x) as u32;
+        }
+    }
+    // Second half
+    for ir in 1..xsize {
+        let ip = xsize - ir;
+        let i = ip - 1;
+        for j in 0..(i + 1) {
+            let mut x = xsize - 1 - (i - j);
+            let mut y = xsize - 1 - j;
+            if !i.is_multiple_of(2) {
+                mem::swap(&mut x, &mut y);
+            }
+            if (y & xsm) != 0 {
+                continue;
+            }
+            y >>= xss;
+            let val = cur;
+            cur += 1;
+            out[val] = (y * xsize + x) as u32;
+        }
+    }
+    out
+}
+
+pub fn decode_coeff_orders(used_orders: u32, br: &mut BitReader) -> Result<Vec<Permutation>> {
+    // Use cached natural coefficient orders instead of recomputing
+    let all_component_orders = 3 * NUM_ORDERS;
+    let mut permutations: Vec<Permutation> = (0..all_component_orders)
+        .map(|o| Permutation(Cow::Borrowed(get_natural_coeff_order(o / 3))))
+        .collect();
+    if used_orders == 0 {
+        return Ok(permutations);
+    }
+    let histograms = Histograms::decode(NUM_PERMUTATION_CONTEXTS, br, true)?;
+    let mut reader = SymbolReader::new(&histograms, br, None)?;
+    for (ord, transform_type) in TRANSFORM_TYPE_LUT.iter().enumerate() {
+        if used_orders & (1 << ord) == 0 {
+            continue;
+        }
+        debug!(?transform_type);
+        let num_blocks = covered_blocks_x(*transform_type) * covered_blocks_y(*transform_type);
+        for c in 0..3 {
+            let size = num_blocks * BLOCK_SIZE as u32;
+            let permutation = Permutation::decode(
+                size,
+                num_blocks,
+                &histograms,
+                br,
+                &mut reader,
+                &crate::util::MemoryTracker::default(),
+            )?;
+            let index = 3 * ord + c;
+            permutations[index].compose(&permutation);
+        }
+    }
+    reader.check_final_state(&histograms, br)?;
+    Ok(permutations)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // Golden data generated from libjxl's `ComputeNaturalCoeffOrder` for DCT (8x8).
+    const COEFF_ORDER_1X1: [u32; 64] = [
+        0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27,
+        20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
+        58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63,
+    ];
+
+    // Golden data generated from libjxl's `ComputeNaturalCoeffOrder` for DCT8X16 (16x8).
+    const COEFF_ORDER_2X1: [u32; 128] = [
+        0, 1, 16, 2, 3, 17, 32, 18, 4, 5, 19, 33, 48, 34, 20, 6, 7, 21, 35, 49, 64, 50, 36, 22, 8,
+        9, 23, 37, 51, 65, 80, 66, 52, 38, 24, 10, 11, 25, 39, 53, 67, 81, 96, 82, 68, 54, 40, 26,
+        12, 13, 27, 41, 55, 69, 83, 97, 112, 98, 84, 70, 56, 42, 28, 14, 15, 29, 43, 57, 71, 85,
+        99, 113, 114, 100, 86, 72, 58, 44, 30, 31, 45, 59, 73, 87, 101, 115, 116, 102, 88, 74, 60,
+        46, 47, 61, 75, 89, 103, 117, 118, 104, 90, 76, 62, 63, 77, 91, 105, 119, 120, 106, 92, 78,
+        79, 93, 107, 121, 122, 108, 94, 95, 109, 123, 124, 110, 111, 125, 126, 127,
+    ];
+
+    #[test]
+    fn test_natural_coeff_order() {
+        let order_1x1 = natural_coeff_order(HfTransformType::DCT);
+        assert_eq!(order_1x1, COEFF_ORDER_1X1);
+
+        let order_2x1 = natural_coeff_order(HfTransformType::DCT8X16);
+        assert_eq!(order_2x1, COEFF_ORDER_2X1);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/color_correlation_map.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/color_correlation_map.rs
new file mode 100644
index 00000000..0c513b79
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/color_correlation_map.rs
@@ -0,0 +1,91 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    BLOCK_DIM,
+    bit_reader::BitReader,
+    error::{Error, Result},
+};
+use std::default::Default;
+
+pub const COLOR_TILE_DIM: usize = 64;
+
+const _: () = assert!(COLOR_TILE_DIM.is_multiple_of(BLOCK_DIM));
+
+pub const COLOR_TILE_DIM_IN_BLOCKS: usize = COLOR_TILE_DIM / BLOCK_DIM;
+
+pub const DEFAULT_COLOR_FACTOR: u32 = 84;
+
+#[derive(Debug, Copy, Clone)]
+pub struct ColorCorrelationParams {
+    pub color_factor: u32,
+    pub base_correlation_x: f32,
+    pub base_correlation_b: f32,
+    pub ytox_lf: i32,
+    pub ytob_lf: i32,
+}
+
+impl Default for ColorCorrelationParams {
+    fn default() -> Self {
+        Self {
+            color_factor: DEFAULT_COLOR_FACTOR,
+            base_correlation_x: 0.0,
+            base_correlation_b: 1.0,
+            ytox_lf: 0,
+            ytob_lf: 0,
+        }
+    }
+}
+
+impl ColorCorrelationParams {
+    pub fn read(br: &mut BitReader) -> Result<ColorCorrelationParams, Error> {
+        if br.read(1)? == 1 {
+            Ok(Self::default())
+        } else {
+            let color_factor = match br.read(2)? {
+                0 => DEFAULT_COLOR_FACTOR,
+                1 => 256,
+                2 => (br.read(8)? + 2) as u32,
+                _ => (br.read(16)? + 258) as u32,
+            };
+            use crate::util::f16;
+            let val_x = f16::from_bits(br.read(16)? as u16);
+            let val_b = f16::from_bits(br.read(16)? as u16);
+            if !val_x.is_finite() || !val_b.is_finite() {
+                return Err(Error::FloatNaNOrInf);
+            }
+            let base_correlation_x = val_x.to_f32();
+            let base_correlation_b = val_b.to_f32();
+            if base_correlation_x > 4.0 || base_correlation_b > 4.0 {
+                return Err(Error::BaseColorCorrelationOutOfRange);
+            }
+            let ytox_lf = br.read(8)? as i32 - 128;
+            let ytob_lf = br.read(8)? as i32 - 128;
+            Ok(ColorCorrelationParams {
+                color_factor,
+                base_correlation_x,
+                base_correlation_b,
+                ytox_lf,
+                ytob_lf,
+            })
+        }
+    }
+
+    pub fn y_to_x(&self, factor: i32) -> f32 {
+        self.base_correlation_x + (factor as f32) / (self.color_factor as f32)
+    }
+
+    pub fn y_to_x_lf(&self) -> f32 {
+        self.y_to_x(self.ytox_lf)
+    }
+
+    pub fn y_to_b(&self, factor: i32) -> f32 {
+        self.base_correlation_b + (factor as f32) / (self.color_factor as f32)
+    }
+
+    pub fn y_to_b_lf(&self) -> f32 {
+        self.y_to_b(self.ytob_lf)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/decode.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/decode.rs
new file mode 100644
index 00000000..d77c745b
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/decode.rs
@@ -0,0 +1,1482 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::collections::BTreeSet;
+use std::sync::Arc;
+
+use super::render::pipeline;
+use super::{
+    block_context_map::BlockContextMap,
+    coeff_order::decode_coeff_orders,
+    color_correlation_map::ColorCorrelationParams,
+    group::{VarDctBuffers, decode_vardct_group},
+    modular::{FullModularImage, ModularStreamId, Tree, decode_hf_metadata, decode_vardct_lf},
+    quant_weights::DequantMatrices,
+    quantizer::{LfQuantFactors, QuantizerParams},
+};
+use crate::error::Error;
+use crate::frame::block_context_map::{ZERO_DENSITY_CONTEXT_COUNT, ZERO_DENSITY_CONTEXT_LIMIT};
+use crate::headers::frame_header::FrameType;
+#[cfg(test)]
+use crate::render::SimpleRenderPipeline;
+use crate::render::buffer_splitter::BufferSplitter;
+use crate::transforms::transform_map::*;
+use crate::util::{ShiftRightCeil, mirror};
+use crate::{
+    GROUP_DIM,
+    bit_reader::BitReader,
+    entropy_coding::decode::Histograms,
+    error::Result,
+    features::{noise::Noise, patches::PatchesDictionary, spline::Splines},
+    frame::{
+        DecoderState, Frame, HfGlobalState, HfMetadata, LfGlobalState, PassState, coeff_order,
+    },
+    headers::{
+        color_encoding::ColorSpace,
+        frame_header::{Encoding, FrameHeader},
+        toc::Toc,
+    },
+    image::Image,
+    render::RenderPipeline,
+    util::{CeilLog2, Xorshift128Plus, tracing_wrappers::*},
+};
+
+#[cfg(feature = "threads")]
+use super::modular::decode_hf_metadata_into_rects;
+use crate::headers::CustomTransformData;
+#[cfg(feature = "threads")]
+use crate::image::Rect;
+use crate::render::RenderPipelineInOutStage;
+use crate::render::stages::Upsample8x;
+use crate::render::{Channels, ChannelsMut};
+
+pub(super) fn upsample_lf_group(
+    group: usize,
+    pixels: &mut [Image<f32>; 3],
+    lf_image: &[Image<f32>; 3],
+    header: &FrameHeader,
+    factors: &CustomTransformData,
+) -> Result<()> {
+    let group_dim = header.group_dim();
+    let lf_group_dim = group_dim / 8;
+    let (width_groups, _) = header.size_groups();
+    let gx = group % width_groups;
+    let gy = group / width_groups;
+
+    let upsample = Upsample8x::new(factors, 0);
+    let mut state = upsample.init_local_state(0)?.unwrap();
+
+    let max_width = pixels.iter().map(|x| x.size().0).max().unwrap();
+
+    // Temporary buffer for 8 output rows
+    // We reuse this buffer for each iteration to minimize allocation
+    let mut temp_out_buf: [_; 8] = std::array::from_fn(|_| vec![0.0f32; max_width + 128]);
+
+    let mut input_rows_storage: [_; 5] = std::array::from_fn(|_| vec![0.0; max_width / 8 + 32]);
+
+    for c in 0..3 {
+        let lf_img = &lf_image[c];
+        let out_img = &mut pixels[c];
+        let (out_width, out_height) = out_img.size();
+
+        let vs = header.vshift(c);
+        let hs = header.hshift(c);
+
+        let lf_group_dim_x = lf_group_dim >> hs;
+        let lf_group_dim_y = lf_group_dim >> vs;
+        let lf_x0 = gx * lf_group_dim_x;
+        let lf_y0 = gy * lf_group_dim_y;
+
+        let lf_width = lf_img.size().0.shrc(hs);
+        let lf_height = lf_img.size().1.shrc(hs);
+
+        let start_x = lf_x0.saturating_sub(2);
+        let lf_x1 = (lf_x0 + lf_group_dim_x).min(lf_width);
+        let end_x = (lf_x1 + 2).min(lf_width);
+        let copy_width = end_x - start_x;
+
+        for y in 0..lf_group_dim_y {
+            let cy = lf_y0 + y;
+
+            for dy in -2..=2 {
+                let iy = cy as isize + dy;
+                let iy = mirror(iy, lf_height);
+
+                let storage = &mut input_rows_storage[(dy + 2) as usize];
+
+                let save_start = if start_x == lf_x0 { 2 } else { 0 };
+                let save_end = save_start + copy_width;
+
+                storage[save_start..save_end].copy_from_slice(&lf_img.row(iy)[start_x..end_x]);
+
+                if start_x == lf_x0 {
+                    storage[0] = storage[2 + mirror(-2, copy_width)];
+                    storage[1] = storage[2 + mirror(-1, copy_width)];
+                }
+                if end_x == lf_x1 {
+                    storage[save_end] = storage[save_start + mirror(save_end as isize, save_end)];
+                    storage[save_end + 1] =
+                        storage[save_start + mirror(save_end as isize + 1, save_end)];
+                }
+            }
+
+            let input_rows_refs = input_rows_storage.iter().map(|x| &x[..]).collect();
+            let input_channels = Channels::new(input_rows_refs, 1, 5);
+
+            {
+                // Prepare output refs
+                let output_rows_refs = temp_out_buf.iter_mut().map(|x| &mut x[..]).collect();
+                let mut output_channels = ChannelsMut::new(output_rows_refs, 1, 8);
+
+                upsample.process_row_chunk(
+                    (0, 0),
+                    lf_x1 - lf_x0,
+                    &input_channels,
+                    &mut output_channels,
+                    Some(state.as_mut()),
+                );
+            }
+
+            // Copy back to out_img
+            let base_y = y * 8;
+            for (i, buf) in temp_out_buf.iter().enumerate() {
+                let out_y = base_y + i;
+                if out_y < out_height {
+                    out_img.row_mut(out_y)[..out_width].copy_from_slice(&buf[..out_width]);
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+impl Frame {
+    pub fn from_header_and_toc(
+        frame_header: FrameHeader,
+        toc: Toc,
+        mut decoder_state: DecoderState,
+    ) -> Result<Self> {
+        if frame_header.is_visible() {
+            decoder_state.visible_frame_index += 1;
+            decoder_state.nonvisible_frame_index = 0;
+        } else {
+            decoder_state.nonvisible_frame_index += 1;
+        }
+        if frame_header.frame_type == FrameType::LFFrame && frame_header.lf_level == 1 {
+            decoder_state.lf_frame_was_rendered = false;
+        }
+        let image_metadata = &decoder_state.file_header.image_metadata;
+        let is_gray = !frame_header.do_ycbcr
+            && !image_metadata.xyb_encoded
+            && image_metadata.color_encoding.color_space == ColorSpace::Gray;
+        let color_channels = if is_gray { 1 } else { 3 };
+        let size_blocks = frame_header.size_blocks();
+        let tracker = &decoder_state.memory_tracker;
+        let lf_image = if frame_header.encoding == Encoding::VarDCT {
+            if frame_header.has_lf_frame() {
+                if let Some([a, b, c]) = &decoder_state.lf_frames[frame_header.lf_level as usize] {
+                    Some([a.try_clone()?, b.try_clone()?, c.try_clone()?])
+                } else {
+                    return Err(Error::NoLfFrame(frame_header.lf_level));
+                }
+            } else {
+                Some([
+                    Image::new_tracked(size_blocks, tracker)?,
+                    Image::new_tracked(size_blocks, tracker)?,
+                    Image::new_tracked(size_blocks, tracker)?,
+                ])
+            }
+        } else {
+            None
+        };
+        let quant_lf = Image::new_tracked(size_blocks, tracker)?;
+        let size_color_tiles = (size_blocks.0.div_ceil(8), size_blocks.1.div_ceil(8));
+        let hf_meta = if frame_header.encoding == Encoding::VarDCT {
+            Some(HfMetadata {
+                ytox_map: Image::new_tracked(size_color_tiles, tracker)?,
+                ytob_map: Image::new_tracked(size_color_tiles, tracker)?,
+                raw_quant_map: Image::new_tracked(size_blocks, tracker)?,
+                transform_map: Image::new_with_value(
+                    size_blocks,
+                    HfTransformType::INVALID_TRANSFORM,
+                )?,
+                epf_map: Image::new_tracked(size_blocks, tracker)?,
+                used_hf_types: 0,
+            })
+        } else {
+            None
+        };
+
+        let reference_frame_data = if frame_header.can_be_referenced {
+            let image_size = &decoder_state.file_header.size;
+            let image_size = (image_size.xsize() as usize, image_size.ysize() as usize);
+            let sz = if frame_header.save_before_ct {
+                frame_header.size_upsampled()
+            } else {
+                image_size
+            };
+
+            let num_ref_channels = 3 + image_metadata.extra_channel_info.len();
+            Some(
+                (0..num_ref_channels)
+                    .map(|_| Image::new_tracked(sz, tracker))
+                    .collect::<Result<Vec<_>>>()?,
+            )
+        } else {
+            None
+        };
+
+        let lf_frame_data = if frame_header.lf_level != 0 {
+            let upsampled = frame_header.size_upsampled();
+            Some(
+                (0..3)
+                    .map(|_| Image::new_tracked(upsampled, tracker))
+                    .collect::<Result<Vec<_>, _>>()?
+                    .try_into()
+                    .unwrap(),
+            )
+        } else {
+            None
+        };
+
+        Ok(Self {
+            #[cfg(test)]
+            use_simple_pipeline: decoder_state.use_simple_pipeline,
+            last_rendered_pass: vec![None; frame_header.num_groups()],
+            incomplete_groups: frame_header.num_groups(),
+            header: frame_header,
+            color_channels,
+            toc,
+            lf_global: None,
+            hf_global: None,
+            hf_coefficients: None,
+            lf_image,
+            quant_lf,
+            hf_meta,
+            decoder_state,
+            render_pipeline: None,
+            reference_frame_data,
+            lf_frame_data,
+            was_flushed_once: false,
+            vardct_buffers: None,
+            #[cfg(feature = "jpeg")]
+            jpeg_coeffs: None,
+            groups_to_flush: BTreeSet::new(),
+            changed_since_last_flush: BTreeSet::new(),
+        })
+    }
+
+    pub fn allow_rendering_before_last_pass(&self) -> bool {
+        if self
+            .lf_global
+            .as_ref()
+            .is_none_or(|x| !x.modular_global.can_do_partial_render())
+        {
+            return false;
+        }
+
+        self.header.frame_type == FrameType::RegularFrame
+            || (self.header.frame_type == FrameType::LFFrame
+                && self.header.lf_level == 1
+                // TODO(veluca): this should probably be "there is no alpha".
+                && self.header.num_extra_channels == 0)
+    }
+
+    /// Given a bit reader pointing at the end of the TOC, returns a vector of `BitReader`s, each
+    /// of which reads a specific section.
+    #[allow(dead_code)] // TOC-based section splitting for future incremental decode
+    pub fn sections<'a>(&self, br: &'a mut BitReader) -> Result<Vec<BitReader<'a>>> {
+        debug!(toc = ?self.toc);
+        let ret = self
+            .toc
+            .entries
+            .iter()
+            .scan(br, |br, count| Some(br.split_at(*count as usize)))
+            .collect::<Result<Vec<_>>>()?;
+        if !self.toc.permuted {
+            return Ok(ret);
+        }
+        let mut inv_perm = vec![0; ret.len()];
+        for (i, pos) in self.toc.permutation.iter().enumerate() {
+            inv_perm[*pos as usize] = i;
+        }
+        let mut shuffled_ret = ret.clone();
+        for (br, pos) in ret.into_iter().zip(inv_perm) {
+            shuffled_ret[pos] = br;
+        }
+        Ok(shuffled_ret)
+    }
+
+    #[instrument(level = "debug", skip_all)]
+    pub fn decode_lf_global(&mut self, br: &mut BitReader) -> Result<()> {
+        // Check for cancellation at start of major decode step
+        self.decoder_state.check_cancelled()?;
+        debug!(section_size = br.total_bits_available());
+        assert!(self.lf_global.is_none());
+        trace!(pos = br.total_bits_read());
+
+        let patches = if self.header.has_patches() {
+            info!("decoding patches");
+            Some(PatchesDictionary::read(
+                br,
+                self.header.size_padded().0,
+                self.header.size_padded().1,
+                self.decoder_state.extra_channel_info().len(),
+                &self.decoder_state.reference_frames[..],
+                self.decoder_state.limits.max_patches,
+                &self.decoder_state.memory_tracker,
+            )?)
+        } else {
+            None
+        };
+
+        let splines = if self.header.has_splines() {
+            info!("decoding splines");
+            Some(Splines::read(
+                br,
+                self.header.width * self.header.height,
+                self.decoder_state.limits.max_spline_points,
+                &self.decoder_state.memory_tracker,
+            )?)
+        } else {
+            None
+        };
+
+        let noise = if self.header.has_noise() {
+            info!("decoding noise");
+            Some(Noise::read(br)?)
+        } else {
+            None
+        };
+
+        let lf_quant = LfQuantFactors::new(br)?;
+        debug!(?lf_quant);
+
+        let quant_params = if self.header.encoding == Encoding::VarDCT {
+            info!("decoding VarDCT quantizer params");
+            Some(QuantizerParams::read(br)?)
+        } else {
+            None
+        };
+        debug!(?quant_params);
+
+        let block_context_map = if self.header.encoding == Encoding::VarDCT {
+            info!("decoding block context map");
+            Some(BlockContextMap::read(br)?)
+        } else {
+            None
+        };
+        debug!(?block_context_map);
+
+        let color_correlation_params = if self.header.encoding == Encoding::VarDCT {
+            info!("decoding color correlation params");
+            Some(ColorCorrelationParams::read(br)?)
+        } else {
+            None
+        };
+        debug!(?color_correlation_params);
+
+        let tree = if br.read(1)? == 1 {
+            // Calculate dynamic size limit based on image dimensions
+            let dynamic_limit = 1024
+                + self.header.width as usize
+                    * self.header.height as usize
+                    * (self.color_channels + self.decoder_state.extra_channel_info().len())
+                    / 16;
+            // Use configured limit if set, otherwise use 2^22 default
+            let configured_limit = self.decoder_state.limits.max_tree_size.unwrap_or(1 << 22);
+            let size_limit = dynamic_limit.min(configured_limit);
+            Some(Tree::read(
+                br,
+                size_limit,
+                &self.decoder_state.memory_tracker,
+            )?)
+        } else {
+            None
+        };
+
+        let modular_global = FullModularImage::read(
+            &self.header,
+            &self.decoder_state.file_header.image_metadata,
+            self.modular_color_channels(),
+            &tree,
+            br,
+            &self.decoder_state.memory_tracker,
+        )?;
+
+        self.lf_global = Some(LfGlobalState {
+            patches: patches.map(Arc::new),
+            splines,
+            noise,
+            lf_quant,
+            quant_params,
+            block_context_map,
+            color_correlation_params,
+            tree,
+            modular_global,
+        });
+
+        Ok(())
+    }
+
+    /// The VarDCT quantizer `(global_scale, quant_lf)` for this frame, if it is
+    /// a VarDCT frame whose `LfGlobal` section has been decoded. The codestream
+    /// parser persists the first regular frame's value so a probe can recover
+    /// the main image's encode quality without rendering pixels.
+    pub(crate) fn vardct_quantizer(&self) -> Option<(u32, u32)> {
+        let qp = self.lf_global.as_ref()?.quant_params.as_ref()?;
+        Some((qp.global_scale, qp.quant_lf))
+    }
+
+    #[instrument(level = "debug", skip(self, br))]
+    pub fn decode_lf_group(&mut self, group: usize, br: &mut BitReader) -> Result<()> {
+        debug!(section_size = br.total_bits_available());
+        let lf_global = self.lf_global.as_mut().unwrap();
+        if self.header.encoding == Encoding::VarDCT && !self.header.has_lf_frame() {
+            info!("decoding VarDCT LF with group id {}", group);
+            decode_vardct_lf(
+                group,
+                &self.header,
+                &self.decoder_state.file_header.image_metadata,
+                &lf_global.tree,
+                lf_global.color_correlation_params.as_ref().unwrap(),
+                lf_global.quant_params.as_ref().unwrap(),
+                &lf_global.lf_quant,
+                lf_global.block_context_map.as_ref().unwrap(),
+                self.lf_image.as_mut().unwrap(),
+                &mut self.quant_lf,
+                br,
+                &self.decoder_state.memory_tracker,
+            )?;
+        }
+        lf_global.modular_global.read_stream(
+            ModularStreamId::ModularLF(group),
+            &self.header,
+            &lf_global.tree,
+            br,
+            &self.decoder_state.memory_tracker,
+        )?;
+        if self.header.encoding == Encoding::VarDCT {
+            info!("decoding HF metadata with group id {}", group);
+            let hf_meta = self.hf_meta.as_mut().unwrap();
+            decode_hf_metadata(
+                group,
+                &self.header,
+                &self.decoder_state.file_header.image_metadata,
+                &lf_global.tree,
+                hf_meta,
+                br,
+                &self.decoder_state.memory_tracker,
+            )?;
+        }
+        Ok(())
+    }
+
+    /// Parallel LF group decode for modular frames.
+    /// Each LF group's modular data is decoded in parallel using rayon.
+    /// Only valid for Encoding::Modular (VarDCT LF groups have shared mutable state).
+    #[cfg(feature = "threads")]
+    pub fn decode_lf_groups_modular_parallel(
+        &self,
+        sections: Vec<(usize, Vec<u8>, usize)>,
+    ) -> Result<()> {
+        use rayon::prelude::*;
+
+        assert_eq!(self.header.encoding, Encoding::Modular);
+        let lf_global = self.lf_global.as_ref().unwrap();
+        // Extract shared references to avoid capturing &Frame (which may not be Sync).
+        let modular = &lf_global.modular_global;
+        let tree = &lf_global.tree;
+        let header = &self.header;
+        let stop: &dyn enough::Stop = &*self.decoder_state.stop;
+        let tracker = &self.decoder_state.memory_tracker;
+        sections.into_par_iter().try_for_each(|(group, data, len)| {
+            stop.check()?;
+            let mut br = BitReader::new_padded(&data, len)?;
+            modular.read_stream(
+                ModularStreamId::ModularLF(group),
+                header,
+                tree,
+                &mut br,
+                tracker,
+            )
+        })
+    }
+
+    /// Parallel LF group decode for VarDCT frames.
+    ///
+    /// Each LF group decodes into locally-owned `Image` buffers (no shared
+    /// mutable state). Results are copied back into the parent images
+    /// sequentially after the parallel section.
+    #[cfg(feature = "threads")]
+    pub fn decode_lf_groups_vardct_parallel(
+        &mut self,
+        sections: Vec<(usize, Vec<u8>, usize)>,
+    ) -> Result<()> {
+        use rayon::prelude::*;
+        use std::sync::atomic::{AtomicU32, Ordering};
+
+        assert_eq!(self.header.encoding, Encoding::VarDCT);
+
+        let lf_global = self.lf_global.as_ref().unwrap();
+        // Shared (read-only) state for all groups.
+        let header = &self.header;
+        let image_metadata = &self.decoder_state.file_header.image_metadata;
+        let tree = &lf_global.tree;
+        let color_correlation = lf_global.color_correlation_params.as_ref().unwrap();
+        let quant_params = lf_global.quant_params.as_ref().unwrap();
+        let lf_quant = &lf_global.lf_quant;
+        let bctx = lf_global.block_context_map.as_ref().unwrap();
+        let modular = &lf_global.modular_global;
+        let stop: &dyn enough::Stop = &*self.decoder_state.stop;
+        let memory_tracker = &self.decoder_state.memory_tracker;
+        let has_lf_frame = header.has_lf_frame();
+        let used_hf_types = AtomicU32::new(0);
+
+        /// Per-group decode output, owned by the parallel task.
+        struct LfGroupOutput {
+            group: usize,
+            /// LF coefficients (3 channels, only if !has_lf_frame).
+            lf_local: Option<[Image<f32>; 3]>,
+            /// Quantized LF (only if !has_lf_frame).
+            quant_lf_local: Option<Image<u8>>,
+            /// HF metadata maps.
+            ytox_local: Image<i8>,
+            ytob_local: Image<i8>,
+            transform_local: Image<u8>,
+            raw_quant_local: Image<i32>,
+            epf_local: Image<u8>,
+        }
+
+        let results: Vec<LfGroupOutput> = sections
+            .into_par_iter()
+            .map(|(group, data, len)| -> Result<LfGroupOutput> {
+                stop.check()?;
+                let mut br = BitReader::new_padded(&data, len)?;
+                let r = header.lf_group_rect(group);
+
+                // Phase 1: Decode VarDCT LF coefficients into local images.
+                let (lf_local, quant_lf_local) = if !has_lf_frame {
+                    let extra_precision = br.read(2)?;
+                    let mul = 1.0 / (1 << extra_precision) as f32;
+                    let stream_id = ModularStreamId::VarDCTLF(group).get_id(header);
+                    let shrink_rect = |size: (usize, usize), c| {
+                        (size.0 >> header.hshift(c), size.1 >> header.vshift(c))
+                    };
+                    let mut buffers = [
+                        super::modular::ModularChannel::new(
+                            shrink_rect(r.size, 1),
+                            image_metadata.bit_depth,
+                        )?,
+                        super::modular::ModularChannel::new(
+                            shrink_rect(r.size, 0),
+                            image_metadata.bit_depth,
+                        )?,
+                        super::modular::ModularChannel::new(
+                            shrink_rect(r.size, 2),
+                            image_metadata.bit_depth,
+                        )?,
+                    ];
+                    super::modular::decode::decode_modular_subbitstream(
+                        buffers.iter_mut().collect(),
+                        stream_id,
+                        None,
+                        tree,
+                        &mut br,
+                        memory_tracker,
+                    )?;
+
+                    // Allocate local images for this group's rect.
+                    let lf_sizes: [(usize, usize); 3] = if header.is444() {
+                        [r.size; 3]
+                    } else {
+                        core::array::from_fn(|c| shrink_rect(r.size, c))
+                    };
+                    let mut lf_images: [Image<f32>; 3] = [
+                        Image::new(lf_sizes[0])?,
+                        Image::new(lf_sizes[1])?,
+                        Image::new(lf_sizes[2])?,
+                    ];
+                    let mut quant_lf_img = Image::<u8>::new(r.size)?;
+
+                    // dequant_lf writes into these local images.
+                    // Destructure to avoid multiple mutable borrows of the array.
+                    let full_rect = |sz: (usize, usize)| Rect {
+                        origin: (0, 0),
+                        size: sz,
+                    };
+                    let [ref mut lf0, ref mut lf1, ref mut lf2] = lf_images;
+                    let lf_rects = [
+                        lf0.get_rect_mut(full_rect(lf_sizes[0])),
+                        lf1.get_rect_mut(full_rect(lf_sizes[1])),
+                        lf2.get_rect_mut(full_rect(lf_sizes[2])),
+                    ];
+                    let quant_lf_rect = quant_lf_img.get_rect_mut(full_rect(r.size));
+                    super::modular::dequant_lf(
+                        r,
+                        lf_rects,
+                        quant_lf_rect,
+                        [&buffers[0].data, &buffers[1].data, &buffers[2].data],
+                        color_correlation,
+                        quant_params,
+                        lf_quant,
+                        mul,
+                        header,
+                        bctx,
+                    )?;
+                    (Some(lf_images), Some(quant_lf_img))
+                } else {
+                    (None, None)
+                };
+
+                // Phase 2: Modular LF stream (uses RefCell internally, already thread-safe).
+                modular.read_stream(
+                    ModularStreamId::ModularLF(group),
+                    header,
+                    tree,
+                    &mut br,
+                    memory_tracker,
+                )?;
+
+                // Phase 3: Decode HF metadata into local images.
+                let cr = Rect {
+                    origin: (r.origin.0 >> 3, r.origin.1 >> 3),
+                    size: (r.size.0.div_ceil(8), r.size.1.div_ceil(8)),
+                };
+                let mut ytox_local = Image::<i8>::new(cr.size)?;
+                let mut ytob_local = Image::<i8>::new(cr.size)?;
+                let mut transform_local =
+                    Image::<u8>::new_with_value(r.size, HfTransformType::INVALID_TRANSFORM)?;
+                let mut raw_quant_local = Image::<i32>::new(r.size)?;
+                let mut epf_local = Image::<u8>::new(r.size)?;
+                let full_cr = Rect {
+                    origin: (0, 0),
+                    size: cr.size,
+                };
+                let full_r = Rect {
+                    origin: (0, 0),
+                    size: r.size,
+                };
+                let used = decode_hf_metadata_into_rects(
+                    group,
+                    header,
+                    image_metadata,
+                    tree,
+                    r,
+                    cr,
+                    ytox_local.get_rect_mut(full_cr),
+                    ytob_local.get_rect_mut(full_cr),
+                    transform_local.get_rect_mut(full_r),
+                    raw_quant_local.get_rect_mut(full_r),
+                    epf_local.get_rect_mut(full_r),
+                    &mut br,
+                    memory_tracker,
+                )?;
+                used_hf_types.fetch_or(used, Ordering::Relaxed);
+
+                Ok(LfGroupOutput {
+                    group,
+                    lf_local,
+                    quant_lf_local,
+                    ytox_local,
+                    ytob_local,
+                    transform_local,
+                    raw_quant_local,
+                    epf_local,
+                })
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        // Sequential copy-back: write each group's local images into the parent images.
+        let lf_image = self.lf_image.as_mut().unwrap();
+        let hf_meta = self.hf_meta.as_mut().unwrap();
+
+        /// Copy rows from a local image into a rect of the parent image.
+        fn copy_image_to_rect<T: crate::image::ImageDataType + Copy>(
+            src: &Image<T>,
+            dst: &mut Image<T>,
+            dst_rect: Rect,
+        ) {
+            let src_size = src.size();
+            debug_assert_eq!(src_size, dst_rect.size);
+            for y in 0..src_size.1 {
+                let src_row = src.row(y);
+                let dst_row = dst.row_mut(dst_rect.origin.1 + y);
+                dst_row[dst_rect.origin.0..dst_rect.origin.0 + src_size.0]
+                    .copy_from_slice(&src_row[..src_size.0]);
+            }
+        }
+
+        for output in results {
+            let r = header.lf_group_rect(output.group);
+            let cr = Rect {
+                origin: (r.origin.0 >> 3, r.origin.1 >> 3),
+                size: (r.size.0.div_ceil(8), r.size.1.div_ceil(8)),
+            };
+
+            // Copy LF coefficients + quant_lf.
+            if let Some(lf_local) = &output.lf_local {
+                if header.is444() {
+                    for c in 0..3 {
+                        copy_image_to_rect(&lf_local[c], &mut lf_image[c], r);
+                    }
+                } else {
+                    for c in 0..3 {
+                        let shifted_rect = Rect {
+                            origin: (
+                                r.origin.0 >> header.hshift(c),
+                                r.origin.1 >> header.vshift(c),
+                            ),
+                            size: (r.size.0 >> header.hshift(c), r.size.1 >> header.vshift(c)),
+                        };
+                        copy_image_to_rect(&lf_local[c], &mut lf_image[c], shifted_rect);
+                    }
+                }
+            }
+            if let Some(ref quant_lf_local) = output.quant_lf_local {
+                copy_image_to_rect(quant_lf_local, &mut self.quant_lf, r);
+            }
+
+            // Copy HF metadata maps.
+            copy_image_to_rect(&output.ytox_local, &mut hf_meta.ytox_map, cr);
+            copy_image_to_rect(&output.ytob_local, &mut hf_meta.ytob_map, cr);
+            copy_image_to_rect(&output.transform_local, &mut hf_meta.transform_map, r);
+            copy_image_to_rect(&output.raw_quant_local, &mut hf_meta.raw_quant_map, r);
+            copy_image_to_rect(&output.epf_local, &mut hf_meta.epf_map, r);
+        }
+
+        // Merge the atomic used_hf_types back.
+        self.hf_meta.as_mut().unwrap().used_hf_types |= used_hf_types.load(Ordering::Relaxed);
+        Ok(())
+    }
+
+    #[instrument(level = "debug", skip_all)]
+    pub fn decode_hf_global(&mut self, br: &mut BitReader) -> Result<()> {
+        // Check for cancellation at start of major decode step
+        self.decoder_state.check_cancelled()?;
+        debug!(section_size = br.total_bits_available());
+        if self.header.encoding == Encoding::Modular {
+            return Ok(());
+        }
+        let lf_global = self.lf_global.as_mut().unwrap();
+        let dequant_matrices = DequantMatrices::decode(
+            &self.header,
+            lf_global,
+            br,
+            &self.decoder_state.memory_tracker,
+        )?;
+        let block_context_map = lf_global.block_context_map.as_mut().unwrap();
+        let num_histo_bits = self.header.num_groups().ceil_log2();
+        let num_histograms: u32 = br.read(num_histo_bits)? as u32 + 1;
+        info!(
+            "Processing HFGlobal section with {} passes and {} histograms",
+            self.header.passes.num_passes, num_histograms
+        );
+        let mut passes: Vec<PassState> = vec![];
+        #[allow(unused_variables)]
+        for i in 0..self.header.passes.num_passes as usize {
+            let used_orders = match br.read(2)? {
+                0 => 0x5f,
+                1 => 0x13,
+                2 => 0,
+                _ => br.read(coeff_order::NUM_ORDERS)?,
+            } as u32;
+            debug!(used_orders);
+            let coeff_orders = decode_coeff_orders(used_orders, br)?;
+            assert_eq!(coeff_orders.len(), 3 * coeff_order::NUM_ORDERS);
+            let num_contexts = num_histograms as usize * block_context_map.num_ac_contexts();
+            info!(
+                "Decoding histograms for pass {} with {} contexts",
+                i, num_contexts
+            );
+            let mut histograms = Histograms::decode(num_contexts, br, true)?;
+            // Pad the context map to avoid index out of bounds in decode_vardct_group (group.rs#L514@752e6a4).
+            let padding = ZERO_DENSITY_CONTEXT_LIMIT - ZERO_DENSITY_CONTEXT_COUNT;
+            histograms.resize(num_contexts + padding);
+            debug!("Found {} histograms", histograms.num_histograms());
+            passes.push(PassState {
+                coeff_orders,
+                histograms,
+            });
+        }
+        // Note that, if we have extra channels that can be rendered progressively,
+        // we might end up re-drawing some VarDCT groups. In that case, we need to
+        // keep around the coefficients, so allocate coefficients under those conditions
+        // too.
+        // TODO(veluca): evaluate whether we can make this check more precise.
+        self.hf_coefficients = if passes.len() <= 1
+            && !(self
+                .lf_global
+                .as_mut()
+                .unwrap()
+                .modular_global
+                .can_do_partial_render()
+                && self.header.num_extra_channels > 0)
+        {
+            None
+        } else {
+            let coeffs_per_group = GROUP_DIM * GROUP_DIM;
+            let num_groups = self.header.num_groups();
+            let tracker = &self.decoder_state.memory_tracker;
+            // Compute byte budget in u64 to avoid usize overflow on 32-bit
+            // targets (i686, wasm32). Without this, an attacker-supplied
+            // header with very large `num_groups` could overflow usize and
+            // bypass the memory tracker, then OOM during the actual Vec
+            // allocations below.
+            let alloc_bytes = (coeffs_per_group as u64)
+                .checked_mul(num_groups as u64)
+                .and_then(|v| v.checked_mul(3))
+                .and_then(|v| v.checked_mul(std::mem::size_of::<i32>() as u64))
+                .ok_or(Error::ArithmeticOverflow)?;
+            tracker.try_allocate(alloc_bytes)?;
+            let mut channels: [Vec<Vec<i32>>; 3] = [Vec::new(), Vec::new(), Vec::new()];
+            for ch in &mut channels {
+                ch.try_reserve_exact(num_groups)?;
+                for _ in 0..num_groups {
+                    let mut v: Vec<i32> = Vec::new();
+                    v.try_reserve_exact(coeffs_per_group)?;
+                    v.resize(coeffs_per_group, 0);
+                    ch.push(v);
+                }
+            }
+            Some(channels)
+        };
+        self.hf_global = Some(HfGlobalState {
+            num_histograms,
+            passes,
+            dequant_matrices,
+        });
+        Ok(())
+    }
+
+    /// Overlap LF group decode with HF global parsing using rayon::join.
+    ///
+    /// decode_hf_global depends only on lf_global (the LF Global section), NOT on
+    /// LF group data. So it can run concurrently with LF group decoding, saving
+    /// ~6ms at 16T by hiding HF global parse latency behind the LF group barrier.
+    #[cfg(feature = "threads")]
+    pub fn decode_lf_and_hf_global_parallel(
+        &mut self,
+        lf_sections: Vec<(usize, Vec<u8>, usize)>,
+        hf_data: Vec<u8>,
+        hf_len: usize,
+    ) -> Result<()> {
+        use rayon::prelude::*;
+        use std::sync::atomic::{AtomicU32, Ordering};
+
+        assert_eq!(self.header.encoding, Encoding::VarDCT);
+
+        // Destructure self to get disjoint borrows of individual fields.
+        let Self {
+            header,
+            lf_global,
+            hf_global,
+            hf_coefficients,
+            lf_image,
+            quant_lf,
+            hf_meta,
+            decoder_state,
+            ..
+        } = self;
+
+        let lf_global_ref = lf_global.as_ref().unwrap();
+        let image_metadata = &decoder_state.file_header.image_metadata;
+        let tree = &lf_global_ref.tree;
+        let color_correlation = lf_global_ref.color_correlation_params.as_ref().unwrap();
+        let quant_params = lf_global_ref.quant_params.as_ref().unwrap();
+        let lf_quant = &lf_global_ref.lf_quant;
+        let bctx = lf_global_ref.block_context_map.as_ref().unwrap();
+        let modular = &lf_global_ref.modular_global;
+        let stop: &dyn enough::Stop = &*decoder_state.stop;
+        let memory_tracker_ref = &decoder_state.memory_tracker;
+        let has_lf_frame = header.has_lf_frame();
+        let used_hf_types = AtomicU32::new(0);
+
+        struct LfGroupOutput {
+            group: usize,
+            lf_local: Option<[Image<f32>; 3]>,
+            quant_lf_local: Option<Image<u8>>,
+            ytox_local: Image<i8>,
+            ytob_local: Image<i8>,
+            transform_local: Image<u8>,
+            raw_quant_local: Image<i32>,
+            epf_local: Image<u8>,
+        }
+
+        struct HfGlobalOutput {
+            hf_state: HfGlobalState,
+            coefficients: Option<[Vec<Vec<i32>>; 3]>,
+        }
+
+        let phase_timing = std::env::var("JXL_PHASE_TIMING").is_ok();
+        let join_start = crate::util::Instant::now();
+
+        // Run LF group decode and HF global parse in parallel.
+        let (lf_result, hf_result) = rayon::join(
+            || -> Result<(Vec<LfGroupOutput>, std::time::Duration)> {
+                let par_start = crate::util::Instant::now();
+                let results: Vec<LfGroupOutput> = lf_sections
+                    .into_par_iter()
+                    .map(|(group, data, len)| -> Result<LfGroupOutput> {
+                        stop.check()?;
+                        let mut br = BitReader::new_padded(&data, len)?;
+                        let r = header.lf_group_rect(group);
+
+                        let (lf_local, quant_lf_local) = if !has_lf_frame {
+                            let extra_precision = br.read(2)?;
+                            let mul = 1.0 / (1 << extra_precision) as f32;
+                            let stream_id = ModularStreamId::VarDCTLF(group).get_id(header);
+                            let shrink_rect = |size: (usize, usize), c| {
+                                (size.0 >> header.hshift(c), size.1 >> header.vshift(c))
+                            };
+                            let mut buffers = [
+                                super::modular::ModularChannel::new(
+                                    shrink_rect(r.size, 1),
+                                    image_metadata.bit_depth,
+                                )?,
+                                super::modular::ModularChannel::new(
+                                    shrink_rect(r.size, 0),
+                                    image_metadata.bit_depth,
+                                )?,
+                                super::modular::ModularChannel::new(
+                                    shrink_rect(r.size, 2),
+                                    image_metadata.bit_depth,
+                                )?,
+                            ];
+                            super::modular::decode::decode_modular_subbitstream(
+                                buffers.iter_mut().collect(),
+                                stream_id,
+                                None,
+                                tree,
+                                &mut br,
+                                memory_tracker_ref,
+                            )?;
+
+                            let lf_sizes: [(usize, usize); 3] = if header.is444() {
+                                [r.size; 3]
+                            } else {
+                                core::array::from_fn(|c| shrink_rect(r.size, c))
+                            };
+                            let mut lf_images: [Image<f32>; 3] = [
+                                Image::new(lf_sizes[0])?,
+                                Image::new(lf_sizes[1])?,
+                                Image::new(lf_sizes[2])?,
+                            ];
+                            let mut quant_lf_img = Image::<u8>::new(r.size)?;
+
+                            let full_rect = |sz: (usize, usize)| Rect {
+                                origin: (0, 0),
+                                size: sz,
+                            };
+                            let [ref mut lf0, ref mut lf1, ref mut lf2] = lf_images;
+                            let lf_rects = [
+                                lf0.get_rect_mut(full_rect(lf_sizes[0])),
+                                lf1.get_rect_mut(full_rect(lf_sizes[1])),
+                                lf2.get_rect_mut(full_rect(lf_sizes[2])),
+                            ];
+                            let quant_lf_rect = quant_lf_img.get_rect_mut(full_rect(r.size));
+                            super::modular::dequant_lf(
+                                r,
+                                lf_rects,
+                                quant_lf_rect,
+                                [&buffers[0].data, &buffers[1].data, &buffers[2].data],
+                                color_correlation,
+                                quant_params,
+                                lf_quant,
+                                mul,
+                                header,
+                                bctx,
+                            )?;
+                            (Some(lf_images), Some(quant_lf_img))
+                        } else {
+                            (None, None)
+                        };
+
+                        modular.read_stream(
+                            ModularStreamId::ModularLF(group),
+                            header,
+                            tree,
+                            &mut br,
+                            memory_tracker_ref,
+                        )?;
+
+                        let cr = Rect {
+                            origin: (r.origin.0 >> 3, r.origin.1 >> 3),
+                            size: (r.size.0.div_ceil(8), r.size.1.div_ceil(8)),
+                        };
+                        let mut ytox_local = Image::<i8>::new(cr.size)?;
+                        let mut ytob_local = Image::<i8>::new(cr.size)?;
+                        let mut transform_local = Image::<u8>::new_with_value(
+                            r.size,
+                            HfTransformType::INVALID_TRANSFORM,
+                        )?;
+                        let mut raw_quant_local = Image::<i32>::new(r.size)?;
+                        let mut epf_local = Image::<u8>::new(r.size)?;
+                        let full_cr = Rect {
+                            origin: (0, 0),
+                            size: cr.size,
+                        };
+                        let full_r = Rect {
+                            origin: (0, 0),
+                            size: r.size,
+                        };
+                        let used = decode_hf_metadata_into_rects(
+                            group,
+                            header,
+                            image_metadata,
+                            tree,
+                            r,
+                            cr,
+                            ytox_local.get_rect_mut(full_cr),
+                            ytob_local.get_rect_mut(full_cr),
+                            transform_local.get_rect_mut(full_r),
+                            raw_quant_local.get_rect_mut(full_r),
+                            epf_local.get_rect_mut(full_r),
+                            &mut br,
+                            memory_tracker_ref,
+                        )?;
+                        used_hf_types.fetch_or(used, Ordering::Relaxed);
+
+                        Ok(LfGroupOutput {
+                            group,
+                            lf_local,
+                            quant_lf_local,
+                            ytox_local,
+                            ytob_local,
+                            transform_local,
+                            raw_quant_local,
+                            epf_local,
+                        })
+                    })
+                    .collect::<Result<Vec<_>>>()?;
+                Ok((results, par_start.elapsed()))
+            },
+            || -> Result<(HfGlobalOutput, std::time::Duration)> {
+                let hf_start = crate::util::Instant::now();
+                decoder_state.check_cancelled()?;
+                let mut br = BitReader::new_padded(&hf_data, hf_len)?;
+                let dequant_matrices =
+                    DequantMatrices::decode(header, lf_global_ref, &mut br, memory_tracker_ref)?;
+                let num_histo_bits = header.num_groups().ceil_log2();
+                let num_histograms: u32 = br.read(num_histo_bits)? as u32 + 1;
+                let num_ac = bctx.num_ac_contexts();
+                let mut passes: Vec<PassState> = vec![];
+                for _ in 0..header.passes.num_passes as usize {
+                    let used_orders = match br.read(2)? {
+                        0 => 0x5f,
+                        1 => 0x13,
+                        2 => 0,
+                        _ => br.read(coeff_order::NUM_ORDERS)?,
+                    } as u32;
+                    let coeff_orders = decode_coeff_orders(used_orders, &mut br)?;
+                    assert_eq!(coeff_orders.len(), 3 * coeff_order::NUM_ORDERS);
+                    let num_contexts = num_histograms as usize * num_ac;
+                    let mut histograms = Histograms::decode(num_contexts, &mut br, true)?;
+                    let padding = ZERO_DENSITY_CONTEXT_LIMIT - ZERO_DENSITY_CONTEXT_COUNT;
+                    histograms.resize(num_contexts + padding);
+                    passes.push(PassState {
+                        coeff_orders,
+                        histograms,
+                    });
+                }
+                let coefficients = if passes.len() <= 1
+                    && !(modular.can_do_partial_render() && header.num_extra_channels > 0)
+                {
+                    None
+                } else {
+                    let coeffs_per_group = GROUP_DIM * GROUP_DIM;
+                    let num_groups = header.num_groups();
+                    let tracker = &decoder_state.memory_tracker;
+                    // u64-checked path mirrors the sequential decoder above:
+                    // prevents usize overflow on 32-bit targets (i686, wasm32)
+                    // for attacker-controlled `num_groups`.
+                    let alloc_bytes = (coeffs_per_group as u64)
+                        .checked_mul(num_groups as u64)
+                        .and_then(|v| v.checked_mul(3))
+                        .and_then(|v| v.checked_mul(std::mem::size_of::<i32>() as u64))
+                        .ok_or(Error::ArithmeticOverflow)?;
+                    tracker.try_allocate(alloc_bytes)?;
+                    let mut channels: [Vec<Vec<i32>>; 3] = [Vec::new(), Vec::new(), Vec::new()];
+                    for ch in &mut channels {
+                        ch.try_reserve_exact(num_groups)?;
+                        for _ in 0..num_groups {
+                            let mut v: Vec<i32> = Vec::new();
+                            v.try_reserve_exact(coeffs_per_group)?;
+                            v.resize(coeffs_per_group, 0);
+                            ch.push(v);
+                        }
+                    }
+                    Some(channels)
+                };
+                Ok((
+                    HfGlobalOutput {
+                        hf_state: HfGlobalState {
+                            num_histograms,
+                            passes,
+                            dequant_matrices,
+                        },
+                        coefficients,
+                    },
+                    hf_start.elapsed(),
+                ))
+            },
+        );
+
+        let (lf_outputs, lf_par_dur) = lf_result?;
+        let (hf_output, hf_dur) = hf_result?;
+        let join_dur = join_start.elapsed();
+
+        // Sequential copy-back for LF group results.
+        let copyback_start = crate::util::Instant::now();
+        let lf_image = lf_image.as_mut().unwrap();
+        let hf_meta = hf_meta.as_mut().unwrap();
+
+        fn copy_image_to_rect<T: crate::image::ImageDataType + Copy>(
+            src: &Image<T>,
+            dst: &mut Image<T>,
+            dst_rect: Rect,
+        ) {
+            let src_size = src.size();
+            debug_assert_eq!(src_size, dst_rect.size);
+            for y in 0..src_size.1 {
+                let src_row = src.row(y);
+                let dst_row = dst.row_mut(dst_rect.origin.1 + y);
+                dst_row[dst_rect.origin.0..dst_rect.origin.0 + src_size.0]
+                    .copy_from_slice(&src_row[..src_size.0]);
+            }
+        }
+
+        for output in lf_outputs {
+            let r = header.lf_group_rect(output.group);
+            let cr = Rect {
+                origin: (r.origin.0 >> 3, r.origin.1 >> 3),
+                size: (r.size.0.div_ceil(8), r.size.1.div_ceil(8)),
+            };
+            if let Some(lf_local) = &output.lf_local {
+                if header.is444() {
+                    for c in 0..3 {
+                        copy_image_to_rect(&lf_local[c], &mut lf_image[c], r);
+                    }
+                } else {
+                    for c in 0..3 {
+                        let shifted_rect = Rect {
+                            origin: (
+                                r.origin.0 >> header.hshift(c),
+                                r.origin.1 >> header.vshift(c),
+                            ),
+                            size: (r.size.0 >> header.hshift(c), r.size.1 >> header.vshift(c)),
+                        };
+                        copy_image_to_rect(&lf_local[c], &mut lf_image[c], shifted_rect);
+                    }
+                }
+            }
+            if let Some(ref quant_lf_local) = output.quant_lf_local {
+                copy_image_to_rect(quant_lf_local, quant_lf, r);
+            }
+            copy_image_to_rect(&output.ytox_local, &mut hf_meta.ytox_map, cr);
+            copy_image_to_rect(&output.ytob_local, &mut hf_meta.ytob_map, cr);
+            copy_image_to_rect(&output.transform_local, &mut hf_meta.transform_map, r);
+            copy_image_to_rect(&output.raw_quant_local, &mut hf_meta.raw_quant_map, r);
+            copy_image_to_rect(&output.epf_local, &mut hf_meta.epf_map, r);
+        }
+        hf_meta.used_hf_types |= used_hf_types.load(Ordering::Relaxed);
+        let copyback_dur = copyback_start.elapsed();
+
+        // Apply HF global results.
+        *hf_global = Some(hf_output.hf_state);
+        *hf_coefficients = hf_output.coefficients;
+
+        if phase_timing {
+            eprintln!(
+                "[JXL_LF_HF_OVERLAP] lf_par: {:.2}ms | hf_parse: {:.2}ms | \
+                 join_wall: {:.2}ms | copyback: {:.2}ms | \
+                 saved: {:.2}ms",
+                lf_par_dur.as_secs_f64() * 1000.0,
+                hf_dur.as_secs_f64() * 1000.0,
+                join_dur.as_secs_f64() * 1000.0,
+                copyback_dur.as_secs_f64() * 1000.0,
+                (lf_par_dur + hf_dur).saturating_sub(join_dur).as_secs_f64() * 1000.0,
+            );
+        }
+
+        Ok(())
+    }
+
+    pub fn render_noise_for_group(
+        &mut self,
+        group: usize,
+        complete: bool,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()> {
+        // TODO(sboukortt): consider making this a dedicated stage
+        // TODO(veluca): SIMD.
+        let num_channels = self.header.num_extra_channels as usize + 3;
+
+        let group_dim = self.header.group_dim() as u32;
+        let xsize_groups = self.header.size_groups().0;
+        let gx = (group % xsize_groups) as u32;
+        let gy = (group / xsize_groups) as u32;
+        let upsampling = self.header.upsampling;
+        let upsampled_size = self.header.size_upsampled();
+
+        // Total buffer covers the upsampled region for this group
+        let buf_x1 = ((gx + 1) * upsampling * group_dim) as usize;
+        let buf_y1 = ((gy + 1) * upsampling * group_dim) as usize;
+        let buf_xsize = buf_x1.min(upsampled_size.0) - (gx * upsampling * group_dim) as usize;
+        let buf_ysize = buf_y1.min(upsampled_size.1) - (gy * upsampling * group_dim) as usize;
+
+        let bits_to_float = |bits: u32| f32::from_bits((bits >> 9) | 0x3F800000);
+
+        // Get all 3 noise channel buffers upfront
+        let mut bufs = [
+            pipeline!(self, p, p.get_buffer(num_channels)?),
+            pipeline!(self, p, p.get_buffer(num_channels + 1)?),
+            pipeline!(self, p, p.get_buffer(num_channels + 2)?),
+        ];
+
+        const FLOATS_PER_BATCH: usize =
+            Xorshift128Plus::N * std::mem::size_of::<u64>() / std::mem::size_of::<f32>();
+        let mut batch = [0u64; Xorshift128Plus::N];
+
+        // libjxl iterates through upsampling subdivisions with separate RNG seeds.
+        // For each subregion, a single RNG is shared across all 3 channels.
+        for iy in 0..upsampling {
+            for ix in 0..upsampling {
+                // Seed coordinates for this subregion (matches libjxl)
+                let x0 = (gx * upsampling + ix) * group_dim;
+                let y0 = (gy * upsampling + iy) * group_dim;
+
+                // Create RNG with this subregion's seed - shared across all 3 channels
+                let mut rng = Xorshift128Plus::new_with_seeds(
+                    self.decoder_state.visible_frame_index as u32,
+                    self.decoder_state.nonvisible_frame_index as u32,
+                    x0,
+                    y0,
+                );
+
+                // Subregion boundaries within the buffer
+                let sub_x0 = (ix * group_dim) as usize;
+                let sub_y0 = (iy * group_dim) as usize;
+                let sub_x1 = ((ix + 1) * group_dim) as usize;
+                let sub_y1 = ((iy + 1) * group_dim) as usize;
+
+                // Clamp to actual buffer size
+                let sub_xsize = sub_x1.min(buf_xsize).saturating_sub(sub_x0);
+                let sub_ysize = sub_y1.min(buf_ysize).saturating_sub(sub_y0);
+
+                // Skip if this subregion is entirely outside the buffer
+                if sub_xsize == 0 || sub_ysize == 0 {
+                    continue;
+                }
+
+                // Fill all 3 channels with this subregion's noise, sharing the RNG
+                for buf in &mut bufs {
+                    for y in 0..sub_ysize {
+                        let row = buf.row_mut(sub_y0 + y);
+                        for batch_index in 0..sub_xsize.div_ceil(FLOATS_PER_BATCH) {
+                            rng.fill(&mut batch);
+                            let batch_size =
+                                (sub_xsize - batch_index * FLOATS_PER_BATCH).min(FLOATS_PER_BATCH);
+                            for i in 0..batch_size {
+                                let x = sub_x0 + FLOATS_PER_BATCH * batch_index + i;
+                                let k = i / 2;
+                                let high_bytes = i % 2 != 0;
+                                let bits = if high_bytes {
+                                    ((batch[k] & 0xFFFFFFFF00000000) >> 32) as u32
+                                } else {
+                                    (batch[k] & 0xFFFFFFFF) as u32
+                                };
+                                row[x] = bits_to_float(bits);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Set all buffers after filling
+        let [buf0, buf1, buf2] = bufs;
+        pipeline!(
+            self,
+            p,
+            p.set_buffer_for_group(num_channels, group, complete, buf0, buffer_splitter)?
+        );
+        pipeline!(
+            self,
+            p,
+            p.set_buffer_for_group(num_channels + 1, group, complete, buf1, buffer_splitter)?
+        );
+        pipeline!(
+            self,
+            p,
+            p.set_buffer_for_group(num_channels + 2, group, complete, buf2, buffer_splitter)?
+        );
+        Ok(())
+    }
+
+    // Returns `true` if VarDCT and noise data were effectively rendered.
+    #[instrument(level = "debug", skip(self, passes, buffer_splitter))]
+    pub fn decode_hf_group(
+        &mut self,
+        group: usize,
+        passes: &mut [(usize, BitReader)],
+        buffer_splitter: &mut BufferSplitter,
+        force_render: bool,
+    ) -> Result<bool> {
+        if passes.is_empty() {
+            assert!(force_render);
+        }
+
+        let last_pass_in_file = self.header.passes.num_passes as usize - 1;
+        let was_complete = self.last_rendered_pass[group].is_some_and(|p| p >= last_pass_in_file);
+
+        if let Some((p, _)) = passes.last() {
+            self.last_rendered_pass[group] = Some(*p);
+        };
+        let pass_to_render = self.last_rendered_pass[group];
+        let complete = pass_to_render.is_some_and(|p| p >= last_pass_in_file);
+
+        if complete && !was_complete {
+            self.incomplete_groups = self.incomplete_groups.checked_sub(1).unwrap();
+        }
+
+        // Render if we are decoding the last pass, or if we are requesting an eager render and
+        // we can handle this case of eager renders.
+        let do_render = if complete {
+            true
+        } else if force_render {
+            self.allow_rendering_before_last_pass()
+        } else {
+            false
+        };
+
+        if !do_render && passes.is_empty() {
+            return Ok(false);
+        }
+
+        if self.header.has_noise() && do_render {
+            self.render_noise_for_group(group, complete, buffer_splitter)?;
+        }
+
+        let lf_global = self.lf_global.as_ref().unwrap();
+        if self.header.encoding == Encoding::VarDCT {
+            info!("Decoding VarDCT group {group}");
+            let hf_global = self.hf_global.as_ref().unwrap();
+            let hf_meta = self.hf_meta.as_ref().unwrap();
+            let hf_coeffs = self.hf_coefficients.as_mut().map(|[a, b, c]| {
+                [
+                    a[group].as_mut_slice(),
+                    b[group].as_mut_slice(),
+                    c[group].as_mut_slice(),
+                ]
+            });
+            let mut pixels = if do_render {
+                Some([
+                    pipeline!(self, p, p.get_buffer(0))?,
+                    pipeline!(self, p, p.get_buffer(1))?,
+                    pipeline!(self, p, p.get_buffer(2))?,
+                ])
+            } else {
+                None
+            };
+            let buffers = match &mut self.vardct_buffers {
+                Some(b) => b,
+                None => self.vardct_buffers.insert(VarDctBuffers::new()?),
+            };
+            if pass_to_render.is_none() && do_render {
+                upsample_lf_group(
+                    group,
+                    pixels.as_mut().unwrap(),
+                    self.lf_image.as_ref().unwrap(),
+                    &self.header,
+                    &self.decoder_state.file_header.transform_data,
+                )?;
+            } else {
+                decode_vardct_group(
+                    group,
+                    passes,
+                    &self.header,
+                    lf_global,
+                    hf_global,
+                    hf_meta,
+                    &self.lf_image,
+                    &self.quant_lf,
+                    &self
+                        .decoder_state
+                        .file_header
+                        .transform_data
+                        .opsin_inverse_matrix
+                        .quant_biases,
+                    hf_coeffs,
+                    &mut pixels,
+                    buffers,
+                    &self.decoder_state.memory_tracker,
+                    #[cfg(feature = "jpeg")]
+                    self.jpeg_coeffs.as_mut(),
+                )?;
+            }
+            if let Some(pixels) = pixels {
+                for (c, img) in pixels.into_iter().enumerate() {
+                    pipeline!(
+                        self,
+                        p,
+                        p.set_buffer_for_group(c, group, complete, img, buffer_splitter)?
+                    );
+                }
+            }
+        }
+
+        {
+            let lf_global = self.lf_global.as_ref().unwrap();
+            for (pass, br) in passes.iter_mut() {
+                lf_global.modular_global.read_stream(
+                    ModularStreamId::ModularHF { group, pass: *pass },
+                    &self.header,
+                    &lf_global.tree,
+                    br,
+                    &self.decoder_state.memory_tracker,
+                )?;
+            }
+        }
+        Ok(do_render)
+    }
+}
+
+#[cfg(test)]
+mod overflow_tests {
+    /// Regression for: `(coeffs_per_group * num_groups * 3 * size_of::<i32>())
+    /// as u64` used to compute in `usize` first, which overflows on 32-bit
+    /// targets (i686, wasm32) for attacker-controlled `num_groups`. This
+    /// pinned the sequence we now use for overflow-safe sizing.
+    #[test]
+    fn coeff_alloc_size_overflows_in_u64_when_bogus() {
+        // Mimic the saturation logic inline. `coeffs_per_group` is GROUP_DIM*GROUP_DIM
+        // (256*256 = 65536 in production). Pick `num_groups` such that
+        // `coeffs_per_group * num_groups` overflows u32 but not u64, so that
+        // a buggy 32-bit lower would have wrapped silently.
+        let coeffs_per_group: u64 = 256 * 256;
+        let num_groups: u64 = (u32::MAX as u64) / coeffs_per_group + 1;
+        let total = coeffs_per_group
+            .checked_mul(num_groups)
+            .and_then(|v| v.checked_mul(3))
+            .and_then(|v| v.checked_mul(core::mem::size_of::<i32>() as u64));
+        // Stays within u64 — we want this to be Some(...) so the tracker can
+        // reject it with LimitExceeded.
+        assert!(total.is_some());
+        // ...but above any sane usize on 32-bit (>4 GiB).
+        assert!(total.unwrap() > u32::MAX as u64);
+
+        // Now demonstrate that pathological inputs *also* saturate cleanly:
+        let huge: u64 = u64::MAX / 4;
+        let tot2 = huge
+            .checked_mul(huge)
+            .and_then(|v| v.checked_mul(3))
+            .and_then(|v| v.checked_mul(core::mem::size_of::<i32>() as u64));
+        assert!(
+            tot2.is_none(),
+            "extreme inputs must saturate to None (Error::ArithmeticOverflow path)"
+        );
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/group.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/group.rs
new file mode 100644
index 00000000..50e6dc06
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/group.rs
@@ -0,0 +1,755 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The simd_function! macro generates dispatch wrappers that inherit all params.
+#![allow(clippy::too_many_arguments)]
+
+use num_traits::Float;
+
+use crate::transforms::{transform::*, transform_map::*};
+
+use crate::{
+    BLOCK_DIM, BLOCK_SIZE, GROUP_DIM,
+    bit_reader::BitReader,
+    entropy_coding::decode::SymbolReader,
+    error::{Error, Result},
+    frame::{
+        HfGlobalState, HfMetadata, LfGlobalState, block_context_map::*,
+        color_correlation_map::COLOR_TILE_DIM_IN_BLOCKS, quant_weights::DequantMatrices,
+    },
+    headers::frame_header::FrameHeader,
+    image::{Image, ImageRect, Rect},
+    util::{CeilLog2, MemoryTracker, ShiftRightCeil, SmallVec, TryVecExt, tracing_wrappers::*},
+};
+use jxl_simd::{F32SimdVec, I32SimdVec, SimdDescriptor, SimdMask, simd_function};
+
+const LF_BUFFER_SIZE: usize = 32 * 32;
+
+/// Reusable buffers for VarDCT group decoding to avoid repeated allocations.
+pub struct VarDctBuffers {
+    pub scratch: Vec<f32>,
+    pub transform_buffer: [Vec<f32>; 3],
+    /// Coefficient storage for single-pass decoding (when hf_coefficients is None)
+    pub coeffs_storage: Vec<i32>,
+}
+
+impl VarDctBuffers {
+    /// Creates a new VarDctBuffers with fallible allocation.
+    pub fn new() -> Result<Self> {
+        Ok(Self {
+            scratch: Vec::try_from_elem(0.0, LF_BUFFER_SIZE)
+                .map_err(|_| Error::ImageOutOfMemory(LF_BUFFER_SIZE, 1))?,
+            transform_buffer: [
+                Vec::try_from_elem(0.0, MAX_COEFF_AREA)
+                    .map_err(|_| Error::ImageOutOfMemory(MAX_COEFF_AREA, 1))?,
+                Vec::try_from_elem(0.0, MAX_COEFF_AREA)
+                    .map_err(|_| Error::ImageOutOfMemory(MAX_COEFF_AREA, 1))?,
+                Vec::try_from_elem(0.0, MAX_COEFF_AREA)
+                    .map_err(|_| Error::ImageOutOfMemory(MAX_COEFF_AREA, 1))?,
+            ],
+            coeffs_storage: Vec::try_from_elem(0, 3 * GROUP_DIM * GROUP_DIM)
+                .map_err(|_| Error::ImageOutOfMemory(3 * GROUP_DIM * GROUP_DIM, 1))?,
+        })
+    }
+
+    /// Reset buffers for reuse. Only coeffs_storage needs zeroing because
+    /// coefficients are accumulated with `+=`. scratch and transform_buffer are
+    /// fully written by dequant_block/copy_from_slice before each read.
+    pub fn reset(&mut self) {
+        self.coeffs_storage.fill(0);
+    }
+}
+
+impl Default for VarDctBuffers {
+    fn default() -> Self {
+        // For Default trait, panic on OOM rather than return Result
+        Self::new().expect("failed to allocate VarDctBuffers")
+    }
+}
+
+#[inline]
+fn predict_num_nonzeros(nzeros_map: &Image<u32>, bx: usize, by: usize) -> usize {
+    if bx == 0 {
+        if by == 0 {
+            32
+        } else {
+            nzeros_map.row(by - 1)[0] as usize
+        }
+    } else if by == 0 {
+        nzeros_map.row(by)[bx - 1] as usize
+    } else {
+        (nzeros_map.row(by - 1)[bx] + nzeros_map.row(by)[bx - 1]).div_ceil(2) as usize
+    }
+}
+
+#[inline(always)]
+fn adjust_quant_bias<D: SimdDescriptor>(
+    d: D,
+    c: usize,
+    quant_i: D::I32Vec,
+    biases: &[f32; 4],
+) -> D::F32Vec {
+    let quant = quant_i.as_f32();
+    let adjusted = quant - D::F32Vec::splat(d, biases[3]) / quant;
+    D::I32Vec::splat(d, 2)
+        .gt(quant_i.abs())
+        .if_then_else_f32(quant_i.as_f32() * D::F32Vec::splat(d, biases[c]), adjusted)
+}
+
+#[allow(clippy::too_many_arguments)]
+#[inline(always)]
+fn dequant_lane<D: SimdDescriptor>(
+    d: D,
+    scaled_dequant_x: f32,
+    scaled_dequant_y: f32,
+    scaled_dequant_b: f32,
+    dequant_matrices: &[f32],
+    size: usize,
+    k: usize,
+    x_cc_mul: f32,
+    b_cc_mul: f32,
+    biases: &[f32; 4],
+    qblock: &[&[i32]; 3],
+    block: &mut [Vec<f32>; 3],
+) {
+    let x_mul =
+        D::F32Vec::load_from(d, dequant_matrices, k) * D::F32Vec::splat(d, scaled_dequant_x);
+    let y_mul =
+        D::F32Vec::load_from(d, dequant_matrices, size + k) * D::F32Vec::splat(d, scaled_dequant_y);
+    let b_mul = D::F32Vec::load_from(d, dequant_matrices, 2 * size + k)
+        * D::F32Vec::splat(d, scaled_dequant_b);
+
+    let quantized_x = D::I32Vec::load_from(d, qblock[0], k);
+    let quantized_y = D::I32Vec::load_from(d, qblock[1], k);
+    let quantized_b = D::I32Vec::load_from(d, qblock[2], k);
+
+    let dequant_x_cc = adjust_quant_bias(d, 0, quantized_x, biases) * x_mul;
+    let dequant_y = adjust_quant_bias(d, 1, quantized_y, biases) * y_mul;
+    let dequant_b_cc = adjust_quant_bias(d, 2, quantized_b, biases) * b_mul;
+
+    let dequant_x = D::F32Vec::splat(d, x_cc_mul).mul_add(dequant_y, dequant_x_cc);
+    let dequant_b = D::F32Vec::splat(d, b_cc_mul).mul_add(dequant_y, dequant_b_cc);
+    dequant_x.store_at(&mut block[0], k);
+    dequant_y.store_at(&mut block[1], k);
+    dequant_b.store_at(&mut block[2], k);
+}
+
+#[allow(clippy::too_many_arguments)]
+#[inline(always)]
+fn dequant_block<D: SimdDescriptor>(
+    d: D,
+    hf_type: HfTransformType,
+    inv_global_scale: f32,
+    quant: u32,
+    x_dm_multiplier: f32,
+    b_dm_multiplier: f32,
+    x_cc_mul: f32,
+    b_cc_mul: f32,
+    size: usize,
+    dequant_matrices: &DequantMatrices,
+    covered_blocks: usize,
+    biases: &[f32; 4],
+    qblock: &[&[i32]; 3],
+    block: &mut [Vec<f32>; 3],
+) {
+    let scaled_dequant_y = inv_global_scale / (quant as f32);
+
+    let scaled_dequant_x = scaled_dequant_y * x_dm_multiplier;
+    let scaled_dequant_b = scaled_dequant_y * b_dm_multiplier;
+
+    let matrices = dequant_matrices.matrix(hf_type, 0);
+
+    assert!(BLOCK_SIZE.is_multiple_of(D::F32Vec::LEN));
+    // Pre-loop assertions: prove buffer lengths so LLVM can eliminate bounds checks.
+    let total = covered_blocks * BLOCK_SIZE;
+    assert!(matrices.len() >= 2 * size + total);
+    for c in 0..3 {
+        assert!(qblock[c].len() >= total);
+        assert!(block[c].len() >= total);
+    }
+    for k in (0..covered_blocks * BLOCK_SIZE).step_by(D::F32Vec::LEN) {
+        dequant_lane(
+            d,
+            scaled_dequant_x,
+            scaled_dequant_y,
+            scaled_dequant_b,
+            matrices,
+            size,
+            k,
+            x_cc_mul,
+            b_cc_mul,
+            biases,
+            qblock,
+            block,
+        );
+    }
+}
+
+/// Copy rows from contiguous source to strided image rect.
+/// Dispatches to const-generic width for common sizes, enabling
+/// the compiler to inline the copy as SIMD stores instead of memcpy calls.
+#[inline(always)]
+fn scatter_rows_to_image(
+    output_rect: &mut crate::image::ImageRectMut<'_, f32>,
+    src: &[f32],
+    width: usize,
+    height: usize,
+) {
+    #[inline(always)]
+    fn inner<const W: usize>(
+        output_rect: &mut crate::image::ImageRectMut<'_, f32>,
+        src: &[f32],
+        height: usize,
+    ) {
+        let src: &[f32] = &src[..W * height];
+        for i in 0..height {
+            let row = output_rect.row(i);
+            row[..W].copy_from_slice(&src[i * W..(i + 1) * W]);
+        }
+    }
+    match width {
+        8 => inner::<8>(output_rect, src, height),
+        16 => inner::<16>(output_rect, src, height),
+        32 => inner::<32>(output_rect, src, height),
+        4 => inner::<4>(output_rect, src, height),
+        _ => {
+            for i in 0..height {
+                let offset = i * width;
+                output_rect
+                    .row(i)
+                    .copy_from_slice(&src[offset..offset + width]);
+            }
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+#[inline(always)]
+fn dequant_and_transform_to_pixels<D: SimdDescriptor>(
+    d: D,
+    quant_biases: &[f32; 4],
+    x_dm_multiplier: f32,
+    b_dm_multiplier: f32,
+    pixels: &mut [Image<f32>; 3],
+    scratch: &mut [f32],
+    inv_global_scale: f32,
+    transform_buffer: &mut [Vec<f32>; 3],
+    hshift: [usize; 3],
+    vshift: [usize; 3],
+    by: usize,
+    sby: [usize; 3],
+    bx: usize,
+    sbx: [usize; 3],
+    x_cc_mul: f32,
+    b_cc_mul: f32,
+    raw_quant: u32,
+    lf_rects: &Option<[ImageRect<f32>; 3]>,
+    transform_type: HfTransformType,
+    block_rect: Rect,
+    num_blocks: usize,
+    num_coeffs: usize,
+    qblock: &[&[i32]; 3],
+    dequant_matrices: &DequantMatrices,
+) -> Result<(), Error> {
+    crate::profile!(dequant_transform);
+    dequant_block::<D>(
+        d,
+        transform_type,
+        inv_global_scale,
+        raw_quant,
+        x_dm_multiplier,
+        b_dm_multiplier,
+        x_cc_mul,
+        b_cc_mul,
+        num_coeffs,
+        dequant_matrices,
+        num_blocks,
+        quant_biases,
+        qblock,
+        transform_buffer,
+    );
+    for c in [1, 0, 2] {
+        if (sbx[c] << hshift[c]) != bx || (sby[c] << vshift[c] != by) {
+            continue;
+        }
+        let lf = &mut scratch[..];
+        {
+            let xs = covered_blocks_x(transform_type) as usize;
+            let ys = covered_blocks_y(transform_type) as usize;
+            let rect = lf_rects.as_ref().unwrap()[c];
+            for (y, lf) in lf.chunks_exact_mut(xs).enumerate().take(ys) {
+                lf.copy_from_slice(&rect.row(y)[0..xs]);
+            }
+        }
+        transform_to_pixels_impl(d, transform_type, lf, &mut transform_buffer[c]);
+        let downsampled_rect = Rect {
+            origin: (
+                block_rect.origin.0 >> hshift[c],
+                block_rect.origin.1 >> vshift[c],
+            ),
+            size: block_rect.size,
+        };
+        let mut output_rect = pixels[c].get_rect_mut(downsampled_rect);
+        scatter_rows_to_image(
+            &mut output_rect,
+            &transform_buffer[c],
+            downsampled_rect.size.0,
+            downsampled_rect.size.1,
+        );
+    }
+    Ok(())
+}
+
+simd_function!(
+    dequant_and_transform_to_pixels_dispatch,
+    d: D,
+    #[allow(clippy::too_many_arguments)]
+    pub fn dequant_and_transform_to_pixels_fwd(
+        quant_biases: &[f32; 4],
+        x_dm_multiplier: f32,
+        b_dm_multiplier: f32,
+        pixels: &mut [Image<f32>; 3],
+        scratch: &mut [f32],
+        inv_global_scale: f32,
+        transform_buffer: &mut [Vec<f32>; 3],
+        hshift: [usize; 3],
+        vshift: [usize; 3],
+        by: usize,
+        sby: [usize; 3],
+        bx: usize,
+        sbx: [usize; 3],
+        x_cc_mul: f32,
+        b_cc_mul: f32,
+        raw_quant: u32,
+        lf_rects: &Option<[ImageRect<f32>; 3]>,
+        transform_type: HfTransformType,
+        block_rect: Rect,
+        num_blocks: usize,
+        num_coeffs: usize,
+        qblock: &[&[i32]; 3],
+        dequant_matrices: &DequantMatrices,
+    ) -> Result<(), Error> {
+        dequant_and_transform_to_pixels(
+            d,
+            quant_biases,
+            x_dm_multiplier,
+            b_dm_multiplier,
+            pixels,
+            scratch,
+            inv_global_scale,
+            transform_buffer,
+            hshift,
+            vshift,
+            by,
+            sby,
+            bx,
+            sbx,
+            x_cc_mul,
+            b_cc_mul,
+            raw_quant,
+            lf_rects,
+            transform_type,
+            block_rect,
+            num_blocks,
+            num_coeffs,
+            qblock,
+            dequant_matrices,
+        )
+    }
+);
+
+struct PassInfo<'a, 'b> {
+    histogram_index: usize,
+    reader: Option<SymbolReader>,
+    br: &'a mut BitReader<'b>,
+    shift: u32,
+    pass: usize,
+    // TODO(veluca): reuse this allocation.
+    num_nzeros: [Image<u32>; 3],
+}
+
+impl<'a, 'b> PassInfo<'a, 'b> {
+    fn new(
+        hf_global: &HfGlobalState,
+        frame_header: &FrameHeader,
+        block_group_rect: Rect,
+        pass: usize,
+        br: &'a mut BitReader<'b>,
+        tracker: &MemoryTracker,
+    ) -> Result<Self> {
+        let num_histo_bits = hf_global.num_histograms.ceil_log2();
+        debug!(?pass);
+        let histogram_index = br.read(num_histo_bits as usize)? as usize;
+        debug!(?histogram_index);
+        // `num_histo_bits` is `ceil_log2(num_histograms)`, so the bitstream can
+        // legally encode values >= `num_histograms` when it is not a power of
+        // two. Reject those here, otherwise downstream indexing into the
+        // per-pass histogram context map can go out of bounds.
+        if histogram_index >= hf_global.num_histograms as usize {
+            return Err(Error::InvalidHistogramIndex(
+                histogram_index,
+                hf_global.num_histograms as usize,
+            ));
+        }
+        let reader = Some(SymbolReader::new(
+            &hf_global.passes[pass].histograms,
+            br,
+            None,
+        )?);
+        let shift = if pass < frame_header.passes.shift.len() {
+            frame_header.passes.shift[pass]
+        } else {
+            0
+        };
+        let num_nzeros = [
+            Image::new_tracked(
+                (
+                    block_group_rect.size.0 >> frame_header.hshift(0),
+                    block_group_rect.size.1 >> frame_header.vshift(0),
+                ),
+                tracker,
+            )?,
+            Image::new_tracked(
+                (
+                    block_group_rect.size.0 >> frame_header.hshift(1),
+                    block_group_rect.size.1 >> frame_header.vshift(1),
+                ),
+                tracker,
+            )?,
+            Image::new_tracked(
+                (
+                    block_group_rect.size.0 >> frame_header.hshift(2),
+                    block_group_rect.size.1 >> frame_header.vshift(2),
+                ),
+                tracker,
+            )?,
+        ];
+
+        Ok(Self {
+            histogram_index,
+            reader,
+            br,
+            shift,
+            pass,
+            num_nzeros,
+        })
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::type_complexity)]
+pub fn decode_vardct_group(
+    group: usize,
+    passes: &mut [(usize, BitReader)],
+    frame_header: &FrameHeader,
+    lf_global: &LfGlobalState,
+    hf_global: &HfGlobalState,
+    hf_meta: &HfMetadata,
+    lf_image: &Option<[Image<f32>; 3]>,
+    quant_lf: &Image<u8>,
+    quant_biases: &[f32; 4],
+    hf_coefficients: Option<[&mut [i32]; 3]>,
+    pixels: &mut Option<[Image<f32>; 3]>,
+    buffers: &mut VarDctBuffers,
+    tracker: &MemoryTracker,
+    #[cfg(feature = "jpeg")] mut jpeg_coeffs: Option<&mut [Vec<i16>; 3]>,
+) -> Result<(), Error> {
+    crate::profile!(entropy_decode);
+    let x_dm_multiplier = (1.0 / (1.25)).powf(frame_header.x_qm_scale as f32 - 2.0);
+    let b_dm_multiplier = (1.0 / (1.25)).powf(frame_header.b_qm_scale as f32 - 2.0);
+
+    let block_group_rect = frame_header.block_group_rect(group);
+    debug!(?block_group_rect);
+    let mut pass_info = passes
+        .iter_mut()
+        .map(|(pass, br)| {
+            PassInfo::new(
+                hf_global,
+                frame_header,
+                block_group_rect,
+                *pass,
+                br,
+                tracker,
+            )
+        })
+        .collect::<Result<SmallVec<[_; 4]>>>()?;
+
+    // Reset coefficients for reuse. Only needed when using local coeffs_storage
+    // (hf_coefficients is None). When hf_coefficients is Some, coeffs_storage is unused.
+    // For single-pass images, skip the bulk zero — we zero per-block instead,
+    // which is more cache-friendly (the zeroed memory is immediately reused).
+    let uses_local_coeffs = hf_coefficients.is_none();
+    let single_pass = pass_info.len() == 1;
+    if uses_local_coeffs && !single_pass {
+        buffers.reset();
+    }
+    let scratch = &mut buffers.scratch;
+    let color_correlation_params = lf_global.color_correlation_params.as_ref().unwrap();
+    let cmap_rect = Rect {
+        origin: (
+            block_group_rect.origin.0 / COLOR_TILE_DIM_IN_BLOCKS,
+            block_group_rect.origin.1 / COLOR_TILE_DIM_IN_BLOCKS,
+        ),
+        size: (
+            block_group_rect.size.0.div_ceil(COLOR_TILE_DIM_IN_BLOCKS),
+            block_group_rect.size.1.div_ceil(COLOR_TILE_DIM_IN_BLOCKS),
+        ),
+    };
+    let quant_params = lf_global.quant_params.as_ref().unwrap();
+    let inv_global_scale = quant_params.inv_global_scale();
+    let ytox_map = hf_meta.ytox_map.get_rect(cmap_rect);
+    let ytob_map = hf_meta.ytob_map.get_rect(cmap_rect);
+    let transform_map = hf_meta.transform_map.get_rect(block_group_rect);
+    let raw_quant_map = hf_meta.raw_quant_map.get_rect(block_group_rect);
+    let quant_lf_rect = quant_lf.get_rect(block_group_rect);
+    let block_context_map = lf_global.block_context_map.as_ref().unwrap();
+    // TODO(veluca): improve coefficient storage (smaller allocations, use 16 bits if possible).
+    let mut coeffs = match hf_coefficients {
+        Some(rows) => rows,
+        None => {
+            // Use pooled buffer (zeroed by buffers.reset() for multi-pass, or per-block below)
+            let (coeffs_x, coeffs_y_b) = buffers.coeffs_storage.split_at_mut(GROUP_DIM * GROUP_DIM);
+            let (coeffs_y, coeffs_b) = coeffs_y_b.split_at_mut(GROUP_DIM * GROUP_DIM);
+            [coeffs_x, coeffs_y, coeffs_b]
+        }
+    };
+    let mut coeffs_offset = 0;
+    let transform_buffer = &mut buffers.transform_buffer;
+
+    let hshift = [
+        frame_header.hshift(0),
+        frame_header.hshift(1),
+        frame_header.hshift(2),
+    ];
+    let vshift = [
+        frame_header.vshift(0),
+        frame_header.vshift(1),
+        frame_header.vshift(2),
+    ];
+    let lf = match lf_image.as_ref() {
+        None => None,
+        Some(lf_planes) => {
+            let r: [Rect; 3] = core::array::from_fn(|i| Rect {
+                origin: (
+                    block_group_rect.origin.0 >> hshift[i],
+                    block_group_rect.origin.1 >> vshift[i],
+                ),
+                size: (
+                    block_group_rect.size.0 >> hshift[i],
+                    block_group_rect.size.1 >> vshift[i],
+                ),
+            });
+
+            let [lf_x, lf_y, lf_b] = lf_planes.each_ref();
+            Some([
+                lf_x.get_rect(r[0]),
+                lf_y.get_rect(r[1]),
+                lf_b.get_rect(r[2]),
+            ])
+        }
+    };
+    for by in 0..block_group_rect.size.1 {
+        let sby = [by >> vshift[0], by >> vshift[1], by >> vshift[2]];
+        let ty = by / COLOR_TILE_DIM_IN_BLOCKS;
+
+        let row_cmap_x = ytox_map.row(ty);
+        let row_cmap_b = ytob_map.row(ty);
+
+        for bx in 0..block_group_rect.size.0 {
+            let sbx = [bx >> hshift[0], bx >> hshift[1], bx >> hshift[2]];
+            let tx = bx / COLOR_TILE_DIM_IN_BLOCKS;
+            let x_cc_mul = color_correlation_params.y_to_x(row_cmap_x[tx] as i32);
+            let b_cc_mul = color_correlation_params.y_to_b(row_cmap_b[tx] as i32);
+            let raw_quant = raw_quant_map.row(by)[bx] as u32;
+            let quant_lf = quant_lf_rect.row(by)[bx] as usize;
+            let raw_transform_id = transform_map.row(by)[bx];
+            let transform_id = raw_transform_id & 127;
+            let is_first_block = raw_transform_id >= 128;
+            if !is_first_block {
+                continue;
+            }
+            let lf_rects = match lf.as_ref() {
+                None => None,
+                Some(lf) => {
+                    let [lf_x, lf_y, lf_b] = lf.each_ref();
+                    Some([
+                        lf_x.rect(Rect {
+                            origin: (sbx[0], sby[0]),
+                            size: (lf_x.size().0 - sbx[0], lf_x.size().1 - sby[0]),
+                        }),
+                        lf_y.rect(Rect {
+                            origin: (sbx[1], sby[1]),
+                            size: (lf_y.size().0 - sbx[1], lf_y.size().1 - sby[1]),
+                        }),
+                        lf_b.rect(Rect {
+                            origin: (sbx[2], sby[2]),
+                            size: (lf_b.size().0 - sbx[2], lf_b.size().1 - sby[2]),
+                        }),
+                    ])
+                }
+            };
+
+            let transform_type = HfTransformType::from_usize(transform_id as usize)
+                .ok_or(Error::InvalidVarDCTTransform(transform_id as usize))?;
+            let cx = covered_blocks_x(transform_type) as usize;
+            let cy = covered_blocks_y(transform_type) as usize;
+            let shape_id = block_shape_id(transform_type) as usize;
+            let block_size = (cx * BLOCK_DIM, cy * BLOCK_DIM);
+            let block_rect = Rect {
+                origin: (bx * BLOCK_DIM, by * BLOCK_DIM),
+                size: block_size,
+            };
+            let num_blocks = cx * cy;
+            let num_coeffs = num_blocks * BLOCK_SIZE;
+            let log_num_blocks = num_blocks.ilog2() as usize;
+            // For single-pass images, zero per-block coefficient ranges instead of
+            // the bulk fill(0). This is more cache-friendly: the zeroed memory stays
+            // in L1/L2 and is immediately reused by the decode loop.
+            if single_pass && uses_local_coeffs {
+                for coeff in coeffs.iter_mut() {
+                    coeff[coeffs_offset..coeffs_offset + num_coeffs].fill(0);
+                }
+            }
+            for PassInfo {
+                histogram_index,
+                reader,
+                br,
+                shift,
+                pass,
+                num_nzeros,
+            } in pass_info.iter_mut()
+            {
+                let reader = reader.as_mut().unwrap();
+                let pass_info = &hf_global.passes[*pass];
+                let context_offset = *histogram_index * block_context_map.num_ac_contexts();
+                for c in [1, 0, 2] {
+                    if (sbx[c] << hshift[c]) != bx || (sby[c] << vshift[c] != by) {
+                        continue;
+                    }
+                    trace!(
+                        "Decoding block ({},{}) channel {} with {}x{} block transform {} (shape id {})",
+                        sbx[c], sby[c], c, cx, cy, transform_id, shape_id
+                    );
+                    let predicted_nzeros = predict_num_nonzeros(&num_nzeros[c], sbx[c], sby[c]);
+                    let block_context =
+                        block_context_map.block_context(quant_lf, raw_quant, shape_id, c);
+                    let nonzero_context = block_context_map
+                        .nonzero_context(predicted_nzeros, block_context)
+                        + context_offset;
+                    let mut nonzeros =
+                        reader.read_unsigned_inline(&pass_info.histograms, br, nonzero_context)
+                            as usize;
+                    trace!(
+                        "block ({},{},{c}) predicted_nzeros: {predicted_nzeros} \
+                       nzero_ctx: {nonzero_context} (offset: {context_offset}) \
+                       nzeros: {nonzeros}",
+                        sbx[c], sby[c]
+                    );
+                    if nonzeros + num_blocks > num_coeffs {
+                        return Err(Error::InvalidNumNonZeros(nonzeros, num_blocks));
+                    }
+                    for iy in 0..cy {
+                        let nzrow = num_nzeros[c].row_mut(sby[c] + iy);
+                        for ix in 0..cx {
+                            nzrow[sbx[c] + ix] = nonzeros.shrc(log_num_blocks) as u32;
+                        }
+                    }
+                    let histo_offset = block_context_map.zero_density_context_offset(block_context)
+                        + context_offset;
+                    let mut prev = if nonzeros > num_coeffs / 16 { 0 } else { 1 };
+                    let permutation = &pass_info.coeff_orders[shape_id * 3 + c];
+                    let current_coeffs = &mut coeffs[c][coeffs_offset..coeffs_offset + num_coeffs];
+                    for k in num_blocks..num_coeffs {
+                        if nonzeros == 0 {
+                            break;
+                        }
+                        let ctx =
+                            histo_offset + zero_density_context(nonzeros, k, log_num_blocks, prev);
+                        let coeff =
+                            reader.read_signed_inline(&pass_info.histograms, br, ctx) << *shift;
+                        prev = if coeff != 0 { 1 } else { 0 };
+                        nonzeros -= prev;
+                        let coeff_index = permutation[k] as usize;
+                        current_coeffs[coeff_index] += coeff;
+                    }
+                    if nonzeros != 0 {
+                        return Err(Error::EndOfBlockResidualNonZeros(nonzeros));
+                    }
+                }
+            }
+            // Capture quantized AC coefficients for JPEG reconstruction
+            #[cfg(feature = "jpeg")]
+            if let Some(ref mut jpeg_coeffs) = jpeg_coeffs {
+                // Only DCT8 (8x8) blocks for JPEG
+                if cx == 1 && cy == 1 {
+                    let abs_bx = block_group_rect.origin.0 + bx;
+                    let abs_by = block_group_rect.origin.1 + by;
+                    // Use padded block dimensions (accounts for chroma subsampling)
+                    let (xsize_blocks, _) = frame_header.size_blocks();
+                    for c in 0..3 {
+                        let src = &coeffs[c][coeffs_offset..coeffs_offset + BLOCK_SIZE];
+                        let dst_offset = (abs_by * xsize_blocks + abs_bx) * BLOCK_SIZE;
+                        if dst_offset + BLOCK_SIZE <= jpeg_coeffs[c].len() {
+                            // Transpose: JPEG natural[y*8+x] = JXL[x*8+y]
+                            for y in 0..BLOCK_DIM {
+                                for x in 0..BLOCK_DIM {
+                                    if x == 0 && y == 0 {
+                                        continue; // DC handled separately
+                                    }
+                                    jpeg_coeffs[c][dst_offset + y * BLOCK_DIM + x] =
+                                        src[x * BLOCK_DIM + y] as i16;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if let Some(pixels) = pixels {
+                let qblock = [
+                    &coeffs[0][coeffs_offset..],
+                    &coeffs[1][coeffs_offset..],
+                    &coeffs[2][coeffs_offset..],
+                ];
+                let dequant_matrices = &hf_global.dequant_matrices;
+                dequant_and_transform_to_pixels_dispatch(
+                    quant_biases,
+                    x_dm_multiplier,
+                    b_dm_multiplier,
+                    pixels,
+                    scratch,
+                    inv_global_scale,
+                    transform_buffer,
+                    hshift,
+                    vshift,
+                    by,
+                    sby,
+                    bx,
+                    sbx,
+                    x_cc_mul,
+                    b_cc_mul,
+                    raw_quant,
+                    &lf_rects,
+                    transform_type,
+                    block_rect,
+                    num_blocks,
+                    num_coeffs,
+                    &qblock,
+                    dequant_matrices,
+                )?;
+            }
+            coeffs_offset += num_coeffs;
+        }
+    }
+    for PassInfo {
+        pass, br, reader, ..
+    } in pass_info.iter_mut()
+    {
+        std::mem::take(reader)
+            .unwrap()
+            .check_final_state(&hf_global.passes[*pass].histograms, br)?;
+    }
+    Ok(())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/lf_preview.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/lf_preview.rs
new file mode 100644
index 00000000..927edf7d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/lf_preview.rs
@@ -0,0 +1,384 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::{JxlColorProfile, JxlColorType, JxlDataFormat, JxlOutputBuffer, JxlPixelFormat},
+    error::Result,
+    frame::Frame,
+    headers::{Orientation, frame_header::FrameType},
+    image::{DataTypeTag, Rect},
+    render::{
+        Channels, ChannelsMut, RenderPipelineInOutStage, RenderPipelineInPlaceStage,
+        buffer_splitter::{BufferSplitter, SaveStageBufferInfo},
+        low_memory_pipeline::row_buffers::RowBuffer,
+        save::SaveStage,
+        stages::{
+            ConvertF32ToF16Stage, ConvertF32ToU8Stage, ConvertF32ToU16Stage, FromLinearStage,
+            OutputColorInfo, TransferFunction, Upsample8x, XybStage,
+        },
+    },
+    util::{f16, mirror},
+};
+
+impl Frame {
+    #[allow(clippy::too_many_arguments)]
+    fn render_lf_frame_rect(
+        &mut self,
+        color_type: JxlColorType,
+        data_format: JxlDataFormat,
+        rect: Rect,
+        upsampled_rect: Rect,
+        orientation: Orientation,
+        output_buffers: &mut [Option<JxlOutputBuffer<'_>>],
+        full_size: (usize, usize),
+        output_color_info: &OutputColorInfo,
+        output_tf: &TransferFunction,
+    ) -> Result<()> {
+        let save_stage = SaveStage::new(
+            if color_type.has_alpha() {
+                &[0, 1, 2, 3]
+            } else {
+                &[0, 1, 2]
+            },
+            orientation,
+            0,
+            color_type,
+            data_format,
+            color_type.has_alpha(),
+        );
+        let len = rect.size.0;
+        let ulen = len * 8;
+        enum DataFormatConverter {
+            U8(ConvertF32ToU8Stage),
+            U16(ConvertF32ToU16Stage),
+            F16(ConvertF32ToF16Stage),
+            None,
+        }
+        let (converter, constant_alpha) = match data_format {
+            JxlDataFormat::U8 { bit_depth } => (
+                DataFormatConverter::U8(ConvertF32ToU8Stage::new(0, bit_depth)),
+                RowBuffer::new_filled(
+                    DataTypeTag::U8,
+                    ulen,
+                    &(((1u16 << bit_depth) - 1) as u8).to_ne_bytes(),
+                )?,
+            ),
+            JxlDataFormat::U16 { bit_depth, .. } => (
+                DataFormatConverter::U16(ConvertF32ToU16Stage::new(0, bit_depth)),
+                RowBuffer::new_filled(
+                    DataTypeTag::U16,
+                    ulen,
+                    &(((1u32 << bit_depth) - 1) as u16).to_ne_bytes(),
+                )?,
+            ),
+            JxlDataFormat::F16 { .. } => (
+                DataFormatConverter::F16(ConvertF32ToF16Stage::new(0)),
+                RowBuffer::new_filled(
+                    DataTypeTag::F16,
+                    ulen,
+                    &(f16::from_f32(1.0).to_bits().to_ne_bytes()),
+                )?,
+            ),
+            JxlDataFormat::F32 { .. } => (
+                DataFormatConverter::None,
+                RowBuffer::new_filled(DataTypeTag::F32, ulen, &1.0f32.to_ne_bytes())?,
+            ),
+        };
+
+        let upsample_stage = Upsample8x::new(&self.decoder_state.file_header.transform_data, 0);
+        let mut upsample_state = upsample_stage.init_local_state(0)?.unwrap();
+
+        let xyb_stage = XybStage::new(0, output_color_info.clone());
+
+        let from_linear_stage = FromLinearStage::new(0, output_tf.clone());
+
+        let mut lf_rows = [
+            RowBuffer::new(DataTypeTag::F32, 2, 0, 0, len)?,
+            RowBuffer::new(DataTypeTag::F32, 2, 0, 0, len)?,
+            RowBuffer::new(DataTypeTag::F32, 2, 0, 0, len)?,
+        ];
+
+        // Converted to RGB in place.
+        let mut upsampled_rows = [
+            RowBuffer::new(DataTypeTag::F32, 0, 3, 3, ulen)?,
+            RowBuffer::new(DataTypeTag::F32, 0, 3, 3, ulen)?,
+            RowBuffer::new(DataTypeTag::F32, 0, 3, 3, ulen)?,
+        ];
+
+        let mut output_rows = [
+            RowBuffer::new(data_format.data_type(), 0, 0, 0, ulen)?,
+            RowBuffer::new(data_format.data_type(), 0, 0, 0, ulen)?,
+            RowBuffer::new(data_format.data_type(), 0, 0, 0, ulen)?,
+        ];
+
+        let src = if self.header.frame_type == FrameType::RegularFrame {
+            self.decoder_state.lf_frames[0].as_ref().unwrap()
+        } else {
+            self.lf_frame_data.as_ref().unwrap()
+        };
+
+        const LF_ROW_OFFSET: usize = 8;
+
+        let x0 = rect.origin.0;
+        let x1 = rect.end().0;
+
+        let y0 = rect.origin.1 as isize - 2;
+        let y1 = rect.end().1 as isize + 2;
+
+        let lf_size = src[0].size();
+
+        for yy in y0..y1 {
+            let sy = mirror(yy, lf_size.1);
+
+            // Fill in input.
+            for c in 0..3 {
+                let bufy = (yy + LF_ROW_OFFSET as isize) as usize;
+                let row = lf_rows[c].get_row_mut::<f32>(bufy);
+                let srow = src[c].row(sy);
+                let off = RowBuffer::x0_offset::<f32>();
+                row[off..off + len].copy_from_slice(&srow[x0..x1]);
+                row[off - 1] = srow[mirror(x0 as isize - 1, lf_size.0)];
+                row[off - 2] = srow[mirror(x0 as isize - 2, lf_size.0)];
+                row[off + len] = srow[mirror(x1 as isize, lf_size.0)];
+                row[off + len + 1] = srow[mirror(x1 as isize + 1, lf_size.0)];
+            }
+
+            if yy < y0 + 4 {
+                continue;
+            }
+
+            let y = yy as usize - 2;
+
+            // Upsample.
+            for c in 0..3 {
+                let off = RowBuffer::x0_offset::<f32>() - 2;
+                let input_rows_refs = [
+                    &lf_rows[c].get_row::<f32>(y + LF_ROW_OFFSET - 2)[off..],
+                    &lf_rows[c].get_row::<f32>(y + LF_ROW_OFFSET - 1)[off..],
+                    &lf_rows[c].get_row::<f32>(y + LF_ROW_OFFSET)[off..],
+                    &lf_rows[c].get_row::<f32>(y + LF_ROW_OFFSET + 1)[off..],
+                    &lf_rows[c].get_row::<f32>(y + LF_ROW_OFFSET + 2)[off..],
+                ]
+                .into_iter()
+                .collect();
+                let input_channels = Channels::new(input_rows_refs, 1, 5);
+
+                let output_rows_refs =
+                    upsampled_rows[c].get_rows_mut(y * 8..y * 8 + 8, RowBuffer::x0_offset::<f32>());
+                let mut output_channels = ChannelsMut::new(output_rows_refs, 1, 8);
+
+                upsample_stage.process_row_chunk(
+                    (0, 0),
+                    len,
+                    &input_channels,
+                    &mut output_channels,
+                    Some(upsample_state.as_mut()),
+                );
+            }
+
+            // un-XYB, convert and save.
+            for uy in y * 8..y * 8 + 8 {
+                // XYB
+                let [x, y, b] = &mut upsampled_rows;
+                let off = RowBuffer::x0_offset::<f32>();
+                let mut rows = [
+                    &mut x.get_row_mut(uy)[off..],
+                    &mut y.get_row_mut(uy)[off..],
+                    &mut b.get_row_mut(uy)[off..],
+                ];
+                xyb_stage.process_row_chunk((0, 0), ulen, &mut rows, None);
+                from_linear_stage.process_row_chunk((0, 0), ulen, &mut rows, None);
+
+                macro_rules! convert {
+                    ($s: expr, $t: ty) => {
+                        for c in 0..3 {
+                            let input_rows_refs = std::iter::once(
+                                &upsampled_rows[c].get_row(uy)[RowBuffer::x0_offset::<f32>()..],
+                            )
+                            .collect();
+                            let input_channels = Channels::new(input_rows_refs, 1, 1);
+                            let output_rows_refs = output_rows[c]
+                                .get_rows_mut(uy..uy + 1, RowBuffer::x0_offset::<$t>());
+                            let mut output_channels = ChannelsMut::new(output_rows_refs, 1, 1);
+                            $s.process_row_chunk(
+                                (0, 0),
+                                ulen,
+                                &input_channels,
+                                &mut output_channels,
+                                None,
+                            );
+                        }
+                    };
+                }
+
+                // Convert
+                let save_input = match &converter {
+                    DataFormatConverter::U8(s) => {
+                        convert!(s, u8);
+                        &output_rows
+                    }
+                    DataFormatConverter::U16(s) => {
+                        convert!(s, u16);
+                        &output_rows
+                    }
+                    DataFormatConverter::F16(s) => {
+                        convert!(s, f16);
+                        &output_rows
+                    }
+                    DataFormatConverter::None => &upsampled_rows,
+                };
+
+                let (r, g, b) = if matches!(color_type, JxlColorType::Bgr | JxlColorType::Bgra) {
+                    (2, 1, 0)
+                } else {
+                    (0, 1, 2)
+                };
+                let input_no_alpha = [&save_input[r], &save_input[g], &save_input[b]];
+                let input_alpha = [
+                    &save_input[r],
+                    &save_input[g],
+                    &save_input[b],
+                    &constant_alpha,
+                ];
+
+                save_stage.save_lowmem(
+                    if color_type.has_alpha() {
+                        &input_alpha
+                    } else {
+                        &input_no_alpha
+                    },
+                    output_buffers,
+                    upsampled_rect.size,
+                    uy,
+                    upsampled_rect.origin,
+                    full_size,
+                    (0, 0),
+                )?;
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn maybe_preview_lf_frame(
+        &mut self,
+        pixel_format: &JxlPixelFormat,
+        output_buffers: &mut [JxlOutputBuffer<'_>],
+        changed_regions: Option<&[Rect]>,
+        output_profile: &JxlColorProfile,
+    ) -> Result<()> {
+        if self.header.needs_blending() {
+            return Ok(());
+        }
+        if !((self.header.has_lf_frame() && self.header.frame_type == FrameType::RegularFrame)
+            || (self.header.frame_type == FrameType::LFFrame && self.header.lf_level == 1))
+        {
+            return Ok(());
+        }
+
+        let output_color_info = OutputColorInfo::from_header(&self.decoder_state.file_header)?;
+
+        let Some(output_tf) = output_profile.transfer_function().map(|tf| {
+            TransferFunction::from_api_tf(
+                tf,
+                output_color_info.intensity_target,
+                output_color_info.luminances,
+            )
+        }) else {
+            return Ok(());
+        };
+
+        if output_tf.is_linear() {
+            return Ok(());
+        }
+
+        let image_metadata = &self.decoder_state.file_header.image_metadata;
+        if !image_metadata.xyb_encoded || !image_metadata.extra_channel_info.is_empty() {
+            // We only render LF frames for XYB VarDCT images with no extra channels.
+            // TODO(veluca): we might want to relax this to "no alpha".
+            return Ok(());
+        }
+        let color_type = pixel_format.color_type;
+        let data_format = pixel_format.color_data_format.unwrap();
+        if pixel_format.color_data_format.is_none()
+            || output_buffers.is_empty()
+            || !matches!(
+                color_type,
+                JxlColorType::Rgb | JxlColorType::Rgba | JxlColorType::Bgr | JxlColorType::Bgra,
+            )
+        {
+            // We only render color data, and only to 3- or 4- channel output buffers.
+            return Ok(());
+        }
+        // We already have a fully-rendered frame and we are not requesting to re-render
+        // specific regions.
+        if self.decoder_state.lf_frame_was_rendered && changed_regions.is_none() {
+            return Ok(());
+        }
+        if changed_regions.is_none() {
+            self.decoder_state.lf_frame_was_rendered = true;
+        }
+
+        let sz = &self.decoder_state.file_header.size;
+        let xsize = sz.xsize() as usize;
+        let ysize = sz.ysize() as usize;
+
+        let mut regions_storage;
+
+        let regions = if let Some(regions) = changed_regions {
+            regions
+        } else {
+            regions_storage = vec![];
+            for i in (0..xsize.div_ceil(8)).step_by(256) {
+                let x0 = i;
+                let x1 = (i + 256).min(xsize.div_ceil(8));
+                regions_storage.push(Rect {
+                    origin: (x0, 0),
+                    size: (x1 - x0, ysize.div_ceil(8)),
+                });
+            }
+            &regions_storage[..]
+        };
+
+        let orientation = image_metadata.orientation;
+        let info = SaveStageBufferInfo {
+            downsample: (0, 0),
+            orientation,
+            byte_size: data_format.bytes_per_sample() * color_type.samples_per_pixel(),
+            after_extend: false,
+        };
+        let info = [Some(info)];
+        let mut bufs = [Some(JxlOutputBuffer::reborrow(&mut output_buffers[0]))];
+        let mut bufs = BufferSplitter::new(&mut bufs);
+        for r in regions {
+            let upsampled_rect = Rect {
+                size: (r.size.0 * 8, r.size.1 * 8),
+                origin: (r.origin.0 * 8, r.origin.1 * 8),
+            };
+            let upsampled_rect = upsampled_rect.clip((xsize, ysize));
+            let mut bufs = bufs.get_local_buffers(
+                &info,
+                upsampled_rect,
+                false,
+                (xsize, ysize),
+                (xsize, ysize),
+                (0, 0),
+            );
+            self.render_lf_frame_rect(
+                color_type,
+                data_format,
+                *r,
+                upsampled_rect,
+                orientation,
+                &mut bufs,
+                (xsize, ysize),
+                &output_color_info,
+                &output_tf,
+            )?;
+        }
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/mod.rs
new file mode 100644
index 00000000..678d2231
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/mod.rs
@@ -0,0 +1,804 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{collections::BTreeSet, sync::Arc};
+
+#[cfg(feature = "jpeg")]
+use crate::util::TryVecExt;
+use crate::{
+    api::JxlColorProfile,
+    entropy_coding::decode::Histograms,
+    error::Result,
+    features::{noise::Noise, patches::PatchesDictionary, spline::Splines},
+    headers::{
+        FileHeader,
+        extra_channels::ExtraChannelInfo,
+        frame_header::{Encoding, FrameHeader},
+        permutation::Permutation,
+        toc::Toc,
+    },
+    image::Image,
+    util::{MemoryTracker, tracing_wrappers::*},
+};
+use adaptive_lf_smoothing::adaptive_lf_smoothing;
+use block_context_map::BlockContextMap;
+use color_correlation_map::ColorCorrelationParams;
+use modular::{FullModularImage, Tree};
+use quant_weights::DequantMatrices;
+use quantizer::{LfQuantFactors, QuantizerParams};
+
+mod adaptive_lf_smoothing;
+mod block_context_map;
+mod coeff_order;
+pub mod color_correlation_map;
+pub mod decode;
+mod group;
+pub mod lf_preview;
+pub mod modular;
+mod quant_weights;
+pub mod quantizer;
+pub mod render;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum Section {
+    LfGlobal,
+    Lf { group: usize },
+    HfGlobal,
+    Hf { group: usize, pass: usize },
+}
+
+pub struct LfGlobalState {
+    patches: Option<Arc<PatchesDictionary>>,
+    splines: Option<Splines>,
+    noise: Option<Noise>,
+    lf_quant: LfQuantFactors,
+    pub quant_params: Option<QuantizerParams>,
+    block_context_map: Option<BlockContextMap>,
+    color_correlation_params: Option<ColorCorrelationParams>,
+    tree: Option<Tree>,
+    modular_global: FullModularImage,
+}
+
+pub struct PassState {
+    coeff_orders: Vec<Permutation>,
+    histograms: Histograms,
+}
+
+pub struct HfGlobalState {
+    num_histograms: u32,
+    passes: Vec<PassState>,
+    dequant_matrices: DequantMatrices,
+}
+
+#[derive(Debug)]
+pub struct ReferenceFrame {
+    pub frame: Vec<Image<f32>>,
+    pub saved_before_color_transform: bool,
+}
+
+impl ReferenceFrame {
+    #[cfg(test)]
+    pub fn blank(
+        width: usize,
+        height: usize,
+        num_channels: usize,
+        saved_before_color_transform: bool,
+    ) -> Result<Self> {
+        let frame = (0..num_channels)
+            .map(|_| Image::new((width, height)))
+            .collect::<Result<_>>()?;
+        Ok(Self {
+            frame,
+            saved_before_color_transform,
+        })
+    }
+    #[cfg(test)]
+    pub fn random<R: rand::Rng>(
+        mut rng: &mut R,
+        width: usize,
+        height: usize,
+        num_channels: usize,
+        saved_before_color_transform: bool,
+    ) -> Result<Self> {
+        let frame = (0..num_channels)
+            .map(|_| Image::new_random((width, height), &mut rng))
+            .collect::<Result<_>>()?;
+        Ok(Self {
+            frame,
+            saved_before_color_transform,
+        })
+    }
+}
+
+pub struct DecoderState {
+    pub(super) file_header: FileHeader,
+    pub(super) reference_frames: Arc<[Option<ReferenceFrame>; Self::MAX_STORED_FRAMES]>,
+    pub(super) lf_frames: [Option<[Image<f32>; 3]>; 4],
+    pub render_spotcolors: bool,
+    #[cfg(test)]
+    pub use_simple_pipeline: bool,
+    pub visible_frame_index: usize,
+    pub nonvisible_frame_index: usize,
+    pub high_precision: bool,
+    pub premultiply_output: bool,
+    /// Whether to bake the image's stored EXIF/container orientation into the
+    /// output pixels (the save stage applies the orientation transform so the
+    /// emitted image is upright). When `false`, the orientation transform is
+    /// skipped: pixels are emitted in their stored (coded) orientation and the
+    /// caller is expected to read the intrinsic orientation from the basic info
+    /// and bake it later if desired. Mirrors
+    /// [`crate::api::JxlDecoderOptions::adjust_orientation`].
+    pub adjust_orientation: bool,
+    /// The embedded color profile from the JXL file (ICC or simple color encoding).
+    /// This is needed for CMS-based color space conversion (e.g., CMYK → RGB).
+    pub embedded_color_profile: Option<JxlColorProfile>,
+    /// Security limits for decoding. Stored here to propagate through frame decoding.
+    pub limits: crate::api::JxlDecoderLimits,
+    /// Cooperative cancellation / timeout handle.
+    pub stop: std::sync::Arc<dyn enough::Stop>,
+    /// Memory tracker for enforcing max_memory_bytes limits.
+    pub memory_tracker: MemoryTracker,
+    /// Desired display intensity target in nits. When set, the decoder applies
+    /// tone mapping (Rec.2408 for PQ, OOTF for HLG) to map from the image's
+    /// embedded intensity target to this value.
+    pub desired_intensity_target: Option<f32>,
+    /// Whether parallel decoding/rendering is enabled.
+    pub(super) parallel: bool,
+    // Whether the latest level 1 LF frame was fully rendered.
+    // If this is set to `true`, early flushing in the main frame
+    // (before HF is available) will do nothing.
+    pub lf_frame_was_rendered: bool,
+}
+
+impl DecoderState {
+    pub const MAX_STORED_FRAMES: usize = 4;
+
+    pub fn new(file_header: FileHeader) -> Self {
+        Self {
+            file_header,
+            reference_frames: Arc::new([None, None, None, None]),
+            lf_frames: [None, None, None, None],
+            render_spotcolors: true,
+            #[cfg(test)]
+            use_simple_pipeline: false,
+            visible_frame_index: 0,
+            nonvisible_frame_index: 0,
+            high_precision: false,
+            premultiply_output: false,
+            adjust_orientation: true,
+            desired_intensity_target: None,
+            embedded_color_profile: None,
+            limits: crate::api::JxlDecoderLimits::default(),
+            stop: std::sync::Arc::new(enough::Unstoppable),
+            memory_tracker: MemoryTracker::unlimited(),
+            parallel: false,
+            lf_frame_was_rendered: false,
+        }
+    }
+
+    /// Check cancellation status and return error if cancelled.
+    pub fn check_cancelled(&self) -> crate::error::Result<()> {
+        Ok(self.stop.check()?)
+    }
+
+    pub fn extra_channel_info(&self) -> &Vec<ExtraChannelInfo> {
+        &self.file_header.image_metadata.extra_channel_info
+    }
+
+    #[allow(dead_code)] // Part of DecoderState public API
+    pub fn reference_frame(&self, i: usize) -> Option<&ReferenceFrame> {
+        assert!(i < Self::MAX_STORED_FRAMES);
+        self.reference_frames[i].as_ref()
+    }
+
+    #[cfg(test)]
+    pub fn set_use_simple_pipeline(&mut self, u: bool) {
+        self.use_simple_pipeline = u;
+    }
+}
+
+impl std::fmt::Debug for DecoderState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DecoderState")
+            .field("visible_frame_index", &self.visible_frame_index)
+            .field("nonvisible_frame_index", &self.nonvisible_frame_index)
+            .field("high_precision", &self.high_precision)
+            .field("parallel", &self.parallel)
+            .finish_non_exhaustive()
+    }
+}
+
+pub struct HfMetadata {
+    ytox_map: Image<i8>,
+    ytob_map: Image<i8>,
+    pub raw_quant_map: Image<i32>,
+    pub transform_map: Image<u8>,
+    pub epf_map: Image<u8>,
+    used_hf_types: u32,
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum RenderUnit {
+    /// VarDCT data
+    VarDCT,
+    /// Modular channel with the given index
+    Modular(usize),
+}
+
+pub struct Frame {
+    header: FrameHeader,
+    toc: Toc,
+    color_channels: usize,
+    lf_global: Option<LfGlobalState>,
+    hf_global: Option<HfGlobalState>,
+    /// Multi-pass HF coefficient accumulation buffer. Separate from HfGlobalState
+    /// so that `&HfGlobalState` and `&mut hf_coefficients` can be borrowed independently,
+    /// enabling parallel VarDCT group decode for single-pass frames.
+    /// Each element is a Vec of per-group coefficient buffers (one Vec<i32> per group per channel).
+    hf_coefficients: Option<[Vec<Vec<i32>>; 3]>,
+    lf_image: Option<[Image<f32>; 3]>,
+    quant_lf: Image<u8>,
+    hf_meta: Option<HfMetadata>,
+    pub(crate) decoder_state: DecoderState,
+    #[cfg(test)]
+    use_simple_pipeline: bool,
+    #[cfg(test)]
+    render_pipeline: Option<Box<dyn std::any::Any>>,
+    #[cfg(not(test))]
+    render_pipeline: Option<Box<crate::render::LowMemoryRenderPipeline>>,
+    reference_frame_data: Option<Vec<Image<f32>>>,
+    lf_frame_data: Option<[Image<f32>; 3]>,
+    was_flushed_once: bool,
+    /// Reusable buffers for VarDCT group decoding.
+    vardct_buffers: Option<group::VarDctBuffers>,
+    /// JPEG coefficient storage for JPEG reconstruction.
+    /// Per-channel arrays of i16 coefficients at image-wide block positions.
+    #[cfg(feature = "jpeg")]
+    jpeg_coeffs: Option<[Vec<i16>; 3]>,
+    // Last pass rendered so far for each HF group.
+    last_rendered_pass: Vec<Option<usize>>,
+    // Groups that should be rendered on the next call to flush().
+    groups_to_flush: BTreeSet<usize>,
+    changed_since_last_flush: BTreeSet<(usize, RenderUnit)>,
+    incomplete_groups: usize,
+}
+
+impl Frame {
+    pub fn toc(&self) -> &Toc {
+        &self.toc
+    }
+
+    pub fn header(&self) -> &FrameHeader {
+        &self.header
+    }
+
+    /// Returns true if the render pipeline has not been prepared yet.
+    pub fn render_pipeline_not_ready(&self) -> bool {
+        self.render_pipeline.is_none()
+    }
+
+    #[allow(dead_code)] // Part of Frame public API
+    pub fn total_bytes_in_toc(&self) -> usize {
+        self.toc.entries.iter().map(|x| *x as usize).sum()
+    }
+
+    #[instrument(level = "debug", skip(self), ret)]
+    pub fn get_section_idx(&self, section: Section) -> usize {
+        if self.header.num_toc_entries() == 1 {
+            0
+        } else {
+            match section {
+                Section::LfGlobal => 0,
+                Section::Lf { group } => 1 + group,
+                Section::HfGlobal => self.header.num_lf_groups() + 1,
+                Section::Hf { group, pass } => {
+                    2 + self.header.num_lf_groups() + self.header.num_groups() * pass + group
+                }
+            }
+        }
+    }
+
+    pub fn finalize_lf(&mut self) -> Result<()> {
+        if self.header.should_do_adaptive_lf_smoothing() {
+            let lf_global = self.lf_global.as_ref().unwrap();
+            let lf_quant = &lf_global.lf_quant;
+            let inv_quant_lf = lf_global.quant_params.as_ref().unwrap().inv_quant_lf();
+            adaptive_lf_smoothing(
+                [
+                    inv_quant_lf * lf_quant.quant_factors[0],
+                    inv_quant_lf * lf_quant.quant_factors[1],
+                    inv_quant_lf * lf_quant.quant_factors[2],
+                ],
+                self.lf_image.as_mut().unwrap(),
+                #[cfg(feature = "threads")]
+                self.decoder_state.parallel,
+            )
+        } else {
+            Ok(())
+        }
+    }
+
+    pub fn finalize(mut self) -> Result<Option<DecoderState>> {
+        // First, drop the render pipeline to ensure that no other references to the reference
+        // frames are around.
+        self.render_pipeline = None;
+        // Save reference frame if this frame can be referenced and was actually decoded.
+        // If reference_frame_data is None (frame was skipped), we don't save it.
+        // Subsequent frames referencing this slot may fail.
+        if self.header.can_be_referenced
+            && let Some(frame_data) = self.reference_frame_data
+        {
+            let slot = self.header.save_as_reference as usize;
+            // Check reference frame limit
+            if let Some(limit) = self.decoder_state.limits.max_reference_frames
+                && slot >= limit
+            {
+                return Err(crate::error::Error::LimitExceeded {
+                    resource: "reference_frames",
+                    actual: (slot + 1) as u64,
+                    limit: limit as u64,
+                });
+            }
+            info!("Saving frame in slot {}", self.header.save_as_reference);
+            let rf = Arc::get_mut(&mut self.decoder_state.reference_frames)
+                .expect("remaining references to reference_frames");
+            rf[slot] = Some(ReferenceFrame {
+                frame: frame_data,
+                saved_before_color_transform: self.header.save_before_ct,
+            });
+        }
+
+        if self.header.lf_level != 0 {
+            self.decoder_state.lf_frames[(self.header.lf_level - 1) as usize] = self.lf_frame_data;
+        }
+        let decoder_state = if self.header.is_last {
+            None
+        } else {
+            Some(self.decoder_state)
+        };
+        Ok(decoder_state)
+    }
+
+    fn modular_color_channels(&self) -> usize {
+        if self.header.encoding == Encoding::VarDCT {
+            0
+        } else {
+            self.color_channels
+        }
+    }
+
+    /// Enable JPEG coefficient capture for JPEG reconstruction.
+    /// Must be called before any HF group decode.
+    #[cfg(feature = "jpeg")]
+    pub fn enable_jpeg_reconstruction(&mut self) {
+        // Use padded block dimensions (accounts for chroma subsampling)
+        let (xsize_blocks, ysize_blocks) = self.header.size_blocks();
+        let block_count = xsize_blocks * ysize_blocks;
+        self.jpeg_coeffs = Some([
+            vec![0i16; block_count * 64],
+            vec![0i16; block_count * 64],
+            vec![0i16; block_count * 64],
+        ]);
+    }
+
+    /// Reconstruct the original JPEG from captured coefficients and JBRD metadata.
+    ///
+    /// Must be called after all LF and HF groups have been decoded.
+    /// Returns the byte-exact original JPEG file.
+    #[cfg(feature = "jpeg")]
+    /// Build the reconstruction [`JpegData`] (coefficients + structure). The
+    /// EXIF/XMP APPn payloads are left as empty placeholders here and filled
+    /// later in `take_jpeg_reconstruction`, from container boxes that are parsed
+    /// *after* the codestream. Run `write_jpeg` on the result for the bytes.
+    ///
+    /// [`JpegData`]: crate::jpeg::data::JpegData
+    pub fn jpeg_reconstruct(
+        &self,
+        jbrd_data: &[u8],
+    ) -> crate::error::Result<crate::jpeg::data::JpegData> {
+        use crate::jpeg::data::JpegComponentType;
+        use crate::jpeg::decode_jbrd;
+
+        // kCFLFixedPointPrecision from libjxl — fixed-point precision for CfL
+        const CFL_FP: i32 = 11;
+        // kDefaultColorFactor
+        const COLOR_FACTOR: i32 = 84;
+
+        let mut jpeg = decode_jbrd(jbrd_data, self.header.width, self.header.height)?;
+        let num_components = jpeg.components.len();
+
+        // Get raw quant table from HF global (stored during Raw quant decode)
+        let hf_global = self
+            .hf_global
+            .as_ref()
+            .ok_or_else(|| crate::error::Error::InvalidJbrd("no HF global state".into()))?;
+        let (raw_qt, _qtable_den) = hf_global
+            .dequant_matrices
+            .raw_qtable
+            .as_ref()
+            .ok_or_else(|| crate::error::Error::InvalidJbrd("no raw quant table".into()))?;
+
+        // Channel mapping: JPEG component index → JXL channel index
+        // JXL c0←JPEG Cb, c1←JPEG Y, c2←JPEG Cr
+        let jpeg_to_jxl: Vec<usize> = if num_components == 1 {
+            // Grayscale: the encoder routes the single (luma) component into the
+            // JXL Y channel (index 1) and zero-fills channels 0/2 (jxl-encoder
+            // encode.rs grayscale zero-fill). Reading channel 0 would yield an
+            // all-zero plane → an all-zero (truncated) reconstruction.
+            vec![1]
+        } else {
+            match jpeg.component_type {
+                JpegComponentType::YCbCr => vec![1, 0, 2],
+                _ => (0..num_components).collect(),
+            }
+        };
+
+        // Fill quant table values from raw_qtable (transpose JXL→JPEG natural order)
+        for (jpeg_c, &jxl_c) in jpeg_to_jxl.iter().enumerate() {
+            if jpeg_c >= jpeg.components.len() {
+                break;
+            }
+            let quant_idx = jpeg.components[jpeg_c].quant_idx as usize;
+            if quant_idx < jpeg.quant.len() {
+                for y in 0..8 {
+                    for x in 0..8 {
+                        // JXL stores transposed: raw_qt[c*64 + x*8+y] = JPEG qt[y*8+x]
+                        jpeg.quant[quant_idx].values[y * 8 + x] = raw_qt[jxl_c * 64 + x * 8 + y];
+                    }
+                }
+            }
+        }
+
+        // Set sampling factors from frame header's jpeg_upsampling
+        for (jpeg_c, &jxl_c) in jpeg_to_jxl.iter().enumerate() {
+            if jpeg_c >= jpeg.components.len() {
+                break;
+            }
+            let comp = &mut jpeg.components[jpeg_c];
+            comp.h_samp_factor = 1 << self.header.raw_hshift(jxl_c);
+            comp.v_samp_factor = 1 << self.header.raw_vshift(jxl_c);
+        }
+
+        // DC recovery parameters
+        let lf_global = self
+            .lf_global
+            .as_ref()
+            .ok_or_else(|| crate::error::Error::InvalidJbrd("no LF global state".into()))?;
+        let quant_params = lf_global
+            .quant_params
+            .as_ref()
+            .ok_or_else(|| crate::error::Error::InvalidJbrd("no quant params".into()))?;
+        let inv_quant_lf = (quantizer::GLOBAL_SCALE_DENOM as f32)
+            / (quant_params.global_scale as f32 * quant_params.quant_lf as f32);
+        let lf_factors = lf_global.lf_quant.quant_factors.map(|f| f * inv_quant_lf);
+
+        // DC offset: only applied when color_transform is kNone (not YCbCr).
+        // For JPEG YCbCr mode (do_ycbcr=true), dcoff is 0.
+        let use_dcoff = !self.header.do_ycbcr;
+
+        let lf_image = self
+            .lf_image
+            .as_ref()
+            .ok_or_else(|| crate::error::Error::InvalidJbrd("no lf_image".into()))?;
+        let jpeg_coeffs = self.jpeg_coeffs.as_ref().ok_or_else(|| {
+            crate::error::Error::InvalidJbrd("JPEG coefficient capture not enabled".into())
+        })?;
+
+        // Frame-level padded block dimensions (accounts for chroma subsampling)
+        let (frame_xblocks, _frame_yblocks) = self.header.size_blocks();
+
+        // Check if all channels are 4:4:4 (no subsampling)
+        let is_444 =
+            (0..3).all(|c| self.header.raw_hshift(c) == 0 && self.header.raw_vshift(c) == 0);
+
+        // CfL maps for undoing chroma-from-luma decorrelation
+        let hf_meta = self.hf_meta.as_ref();
+
+        // Pre-compute scaled quant table ratios for CfL undo.
+        // scaled_qtable[c][j] = (Y_qt[freq] << CFL_FP) / Chroma_qt[freq]
+        // indexed in JPEG natural order (j = row*8+col).
+        let scaled_qtable: [[i32; 64]; 3] = {
+            let mut sq = [[0i32; 64]; 3];
+            for c in [0usize, 2] {
+                for (j, sq_val) in sq[c].iter_mut().enumerate() {
+                    let jxl_pos = (j % 8) * 8 + (j / 8);
+                    let num = raw_qt[64 + jxl_pos]; // Y channel (JXL c1)
+                    let den = raw_qt[c * 64 + jxl_pos]; // Chroma channel
+                    if num > 0 && den > 0 {
+                        *sq_val = (num << CFL_FP) / den;
+                    }
+                }
+            }
+            sq
+        };
+
+        // Set per-component block dimensions from frame header
+        let maxhs = self.header.maxhs as usize;
+        let maxvs = self.header.maxvs as usize;
+        for (jpeg_c, &jxl_c) in jpeg_to_jxl.iter().enumerate() {
+            if jpeg_c >= jpeg.components.len() {
+                break;
+            }
+            let hshift_c = maxhs - self.header.raw_hshift(jxl_c);
+            let vshift_c = maxvs - self.header.raw_vshift(jxl_c);
+            let comp = &mut jpeg.components[jpeg_c];
+            comp.width_in_blocks = (frame_xblocks >> hshift_c) as u32;
+            comp.height_in_blocks = (_frame_yblocks >> vshift_c) as u32;
+        }
+
+        // Build per-component coefficient arrays
+        for (jpeg_c, &jxl_c) in jpeg_to_jxl.iter().enumerate() {
+            if jpeg_c >= jpeg.components.len() {
+                break;
+            }
+            let comp = &mut jpeg.components[jpeg_c];
+            let wb = comp.width_in_blocks as usize;
+            let hb = comp.height_in_blocks as usize;
+            let num_blocks = wb * hb;
+            comp.coeffs = Vec::try_from_elem(0i16, num_blocks * 64)?;
+
+            // HShift/VShift for mapping component blocks to frame-level block grid
+            let hshift_c = maxhs - self.header.raw_hshift(jxl_c);
+            let vshift_c = maxvs - self.header.raw_vshift(jxl_c);
+
+            let q_dc = raw_qt[jxl_c * 64];
+            let dcoff = if use_dcoff && q_dc != 0 {
+                1024 / q_dc
+            } else {
+                0
+            };
+            let fac = lf_factors[jxl_c];
+
+            for by in 0..hb {
+                for bx in 0..wb {
+                    let block_idx = by * wb + bx;
+
+                    // Map component block to frame-level block position
+                    // For subsampled channels: frame_bx = comp_bx << hshift
+                    let frame_bx = bx << hshift_c;
+                    let frame_by = by << vshift_c;
+
+                    // DC recovery from lf_image
+                    let dc_float = lf_image[jxl_c].row(by)[bx];
+                    let quant_dc_int = (dc_float / fac).round() as i32;
+                    let jpeg_dc = quant_dc_int - dcoff;
+                    comp.coeffs[block_idx * 64] = jpeg_dc.clamp(-2047, 2047) as i16;
+
+                    // AC coefficients from captured data (already transposed to JPEG order)
+                    // Captured at frame-level block position
+                    let src_offset = (frame_by * frame_xblocks + frame_bx) * 64;
+                    if src_offset + 64 <= jpeg_coeffs[jxl_c].len() {
+                        for k in 1..64 {
+                            comp.coeffs[block_idx * 64 + k] = jpeg_coeffs[jxl_c][src_offset + k];
+                        }
+                    }
+
+                    // CfL undo for chroma channels (JXL c0=Cb, c2=Cr)
+                    // libjxl's encoder applies integer CfL decorrelation for 4:4:4 JPEGs:
+                    //   stored_chroma = original_chroma - cfl_factor
+                    // We undo it:
+                    //   original_chroma = stored_chroma + cfl_factor
+                    if is_444
+                        && (jxl_c == 0 || jxl_c == 2)
+                        && let Some(meta) = hf_meta
+                    {
+                        let tile_x = frame_bx / color_correlation_map::COLOR_TILE_DIM_IN_BLOCKS;
+                        let tile_y = frame_by / color_correlation_map::COLOR_TILE_DIM_IN_BLOCKS;
+                        let map_val = if jxl_c == 0 {
+                            meta.ytox_map.row(tile_y)[tile_x] as i32
+                        } else {
+                            meta.ytob_map.row(tile_y)[tile_x] as i32
+                        };
+
+                        if map_val != 0 {
+                            // RatioJPEG: factor * (1 << CFL_FP) / kDefaultColorFactor
+                            let scale = map_val * (1 << CFL_FP) / COLOR_FACTOR;
+                            let round = 1i32 << (CFL_FP - 1);
+
+                            // Y coefficients at the same frame block position (JXL c1)
+                            let y_offset = src_offset;
+
+                            for k in 1..64 {
+                                let y_coeff = jpeg_coeffs[1][y_offset + k] as i32;
+                                let qt = scaled_qtable[jxl_c][k];
+                                let coeff_scale = (qt * scale + round) >> CFL_FP;
+                                let cfl_factor = (y_coeff * coeff_scale + round) >> CFL_FP;
+                                comp.coeffs[block_idx * 64 + k] += cfl_factor as i16;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Ok(jpeg)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::panic;
+
+    use crate::{
+        error::{Error, Result},
+        features::spline::Point,
+        util::test::assert_almost_abs_eq,
+    };
+    use test_log::test;
+
+    use super::Frame;
+
+    fn decode(
+        bytes: &[u8],
+        verify: impl Fn(&Frame, usize) -> Result<()> + 'static,
+    ) -> Result<usize> {
+        crate::api::tests::decode(bytes, usize::MAX, false, false, Some(Box::new(verify)))
+            .map(|x| x.0)
+    }
+
+    #[test]
+    fn splines() -> Result<(), Error> {
+        let verify_frame = move |frame: &Frame, _| {
+            let lf_global = frame.lf_global.as_ref().unwrap();
+            let splines = lf_global.splines.as_ref().unwrap();
+            assert_eq!(splines.quantization_adjustment, 0);
+            let expected_starting_points = [Point { x: 9.0, y: 54.0 }].to_vec();
+            assert_eq!(splines.starting_points, expected_starting_points);
+            assert_eq!(splines.splines.len(), 1);
+            let spline = splines.splines[0].clone();
+            let expected_control_points = [
+                (109, 105),
+                (-130, -261),
+                (-66, 193),
+                (227, -52),
+                (-170, 290),
+            ]
+            .to_vec();
+            assert_eq!(spline.control_points.clone(), expected_control_points);
+
+            const EXPECTED_COLOR_DCT: [[i32; 32]; 3] = [
+                {
+                    let mut row = [0; 32];
+                    row[0] = 168;
+                    row[1] = 119;
+                    row
+                },
+                {
+                    let mut row = [0; 32];
+                    row[0] = 9;
+                    row[2] = 7;
+                    row
+                },
+                {
+                    let mut row = [0; 32];
+                    row[0] = -10;
+                    row[1] = 7;
+                    row
+                },
+            ];
+            assert_eq!(spline.color_dct, EXPECTED_COLOR_DCT);
+            const EXPECTED_SIGMA_DCT: [i32; 32] = {
+                let mut dct = [0; 32];
+                dct[0] = 4;
+                dct[7] = 2;
+                dct
+            };
+            assert_eq!(spline.sigma_dct, EXPECTED_SIGMA_DCT);
+            Ok(())
+        };
+        assert_eq!(
+            decode(
+                include_bytes!("../../resources/test/splines.jxl"),
+                verify_frame
+            )?,
+            1
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn noise() -> Result<(), Error> {
+        let verify_frame = |frame: &Frame, _| {
+            let lf_global = frame.lf_global.as_ref().unwrap();
+            let noise = lf_global.noise.as_ref().unwrap();
+            let want_noise = [
+                0.000000, 0.000977, 0.002930, 0.003906, 0.005859, 0.006836, 0.008789, 0.010742,
+            ];
+            for (index, noise_param) in want_noise.iter().enumerate() {
+                assert_almost_abs_eq(noise.lut[index], *noise_param, 1e-6);
+            }
+            Ok(())
+        };
+        assert_eq!(
+            decode(
+                include_bytes!("../../resources/test/8x8_noise.jxl"),
+                verify_frame,
+            )?,
+            1
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn patches() -> Result<(), Error> {
+        let verify_frame = |frame: &Frame, frame_index| {
+            if frame_index == 0 {
+                assert!(!frame.header().has_patches());
+                assert!(frame.header().can_be_referenced);
+            } else if frame_index == 1 {
+                assert!(frame.header().has_patches());
+                assert!(!frame.header().can_be_referenced);
+            }
+            Ok(())
+        };
+        assert_eq!(
+            decode(
+                include_bytes!("../../resources/test/grayscale_patches_modular.jxl"),
+                verify_frame,
+            )?,
+            2
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn multiple_lf_420() -> Result<(), Error> {
+        let verify_frame = |frame: &Frame, _| {
+            assert!(frame.header().is420());
+            let Some(lf_image) = &frame.lf_image else {
+                panic!("no lf_image");
+            };
+            for y in 0..146 {
+                let sample_cb_row = lf_image[0].row(y);
+                let sample_cr_row = lf_image[2].row(y);
+                for x in 0..146 {
+                    let sample_cb = sample_cb_row[x];
+                    let sample_cr = sample_cr_row[x];
+                    let no_chroma = sample_cb == 0.0 && sample_cr == 0.0;
+                    if y < 128 || x < 128 {
+                        assert!(!no_chroma);
+                    } else {
+                        assert!(no_chroma);
+                    }
+                }
+            }
+            Ok(())
+        };
+        decode(
+            include_bytes!("../../resources/test/multiple_lf_420.jxl"),
+            verify_frame,
+        )?;
+        Ok(())
+    }
+
+    #[test]
+    fn xyb_grayscale_patches() -> Result<(), Error> {
+        let verify_frame = |frame: &Frame, frame_index| {
+            if frame_index == 0 {
+                assert_eq!(
+                    frame.header.frame_type,
+                    crate::headers::frame_header::FrameType::ReferenceOnly,
+                );
+                assert_eq!(
+                    frame.header.encoding,
+                    crate::headers::frame_header::Encoding::Modular,
+                );
+                assert_eq!(frame.modular_color_channels(), 3);
+            } else {
+                assert!(frame.header.has_patches());
+                assert_eq!(frame.modular_color_channels(), 0);
+            }
+            Ok(())
+        };
+        assert_eq!(
+            decode(
+                include_bytes!("../../resources/test/grayscale_patches_var_dct.jxl"),
+                verify_frame,
+            )?,
+            2
+        );
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/borrowed_buffers.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/borrowed_buffers.rs
new file mode 100644
index 00000000..29c93efa
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/borrowed_buffers.rs
@@ -0,0 +1,50 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::ops::DerefMut;
+
+use crate::{
+    error::Result,
+    frame::modular::{IMAGE_OFFSET, IMAGE_PADDING},
+    image::Image,
+    util::AtomicRefMut,
+};
+
+use super::{ModularBufferInfo, ModularChannel};
+
+pub fn with_buffers<T>(
+    buffers: &[ModularBufferInfo],
+    indices: &[usize],
+    grid: usize,
+    f: impl FnOnce(Vec<&mut ModularChannel>) -> Result<T>,
+) -> Result<T> {
+    let mut bufs = vec![];
+    for i in indices {
+        // Allocate buffers if they are not present.
+        let buf = &buffers[*i];
+        let b = &buf.buffer_grid[grid];
+        let mut data = b.data.borrow_mut();
+        if data.is_none() {
+            *data = Some(ModularChannel {
+                data: Image::new_with_padding(b.size, IMAGE_OFFSET, IMAGE_PADDING)?,
+                auxiliary_data: None,
+                shift: buf.info.shift,
+                bit_depth: buf.info.bit_depth,
+            });
+        }
+
+        // Skip zero-sized *tiles*.
+        //
+        // Note that some bitstreams can contain channels with one dimension being 0 (e.g. palette
+        // meta-channel with 0 colors has size (0, 3)). Those must still participate in channel
+        // numbering (but carry no entropy-coded pixels), so we only skip when both dimensions are 0.
+        if b.size.0 == 0 && b.size.1 == 0 {
+            continue;
+        }
+
+        bufs.push(AtomicRefMut::map(data, |x| x.as_mut().unwrap()));
+    }
+    f(bufs.iter_mut().map(|x| x.deref_mut()).collect())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/bitstream.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/bitstream.rs
new file mode 100644
index 00000000..9c258658
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/bitstream.rs
@@ -0,0 +1,103 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::channel::decode_modular_channel;
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::SymbolReader,
+    error::{Error, Result},
+    frame::modular::{ModularChannel, Tree, transforms::apply::meta_apply_local_transforms},
+    headers::{JxlHeader, modular::GroupHeader},
+    util::MemoryTracker,
+};
+
+// This function will decode a header and apply local transforms if a header is not given.
+// The intended use of passing a header is for the DcGlobal section.
+pub fn decode_modular_subbitstream(
+    buffers: Vec<&mut ModularChannel>,
+    stream_id: usize,
+    header: Option<GroupHeader>,
+    global_tree: &Option<Tree>,
+    br: &mut BitReader,
+    memory_tracker: &MemoryTracker,
+) -> Result<()> {
+    // Skip decoding if all grids are zero-sized.
+    let is_empty = buffers
+        .iter()
+        .all(|buffer| matches!(buffer.data.size(), (0, _) | (_, 0)));
+    if is_empty {
+        return Ok(());
+    }
+    let mut transform_steps = vec![];
+    let mut buffer_storage = vec![];
+
+    let buffers = buffers.into_iter().collect::<Vec<_>>();
+    let (header, mut buffers) = match header {
+        Some(h) => (h, buffers),
+        None => {
+            let h = GroupHeader::read(br)?;
+            if !h.transforms.is_empty() {
+                // Note: reassigning to `buffers` here convinces the borrow checker that the borrow of
+                // `buffer_storage` ought to outlive `buffers[..]`'s lifetime, which obviously breaks
+                // applying transforms later.
+                let new_bufs;
+                (new_bufs, transform_steps) =
+                    meta_apply_local_transforms(buffers, &mut buffer_storage, &h)?;
+                (h, new_bufs)
+            } else {
+                (h, buffers)
+            }
+        }
+    };
+
+    if header.use_global_tree && global_tree.is_none() {
+        return Err(Error::NoGlobalTree);
+    }
+    let local_tree = if !header.use_global_tree {
+        let num_local_samples = buffers
+            .iter()
+            .map(|buf| {
+                let (width, height) = buf.channel_info().size;
+                width * height
+            })
+            .sum::<usize>();
+        let size_limit = (1024 + num_local_samples).min(1 << 20);
+        Some(Tree::read(br, size_limit, memory_tracker)?)
+    } else {
+        None
+    };
+    let tree = if header.use_global_tree {
+        global_tree.as_ref().unwrap()
+    } else {
+        local_tree.as_ref().unwrap()
+    };
+
+    let image_width = buffers
+        .iter()
+        .map(|info| info.channel_info().size.0)
+        .max()
+        .unwrap_or(0);
+    let mut reader = SymbolReader::new(&tree.histograms, br, Some(image_width))?;
+
+    for i in 0..buffers.len() {
+        // Keep channel numbering stable, but skip actually decoding empty channels.
+        // This matches libjxl, which continues the loop without renumbering.
+        let (w, h) = buffers[i].data.size();
+        if w == 0 || h == 0 {
+            continue;
+        }
+        decode_modular_channel(&mut buffers, i, stream_id, &header, tree, &mut reader, br)?;
+    }
+
+    reader.check_final_state(&tree.histograms, br)?;
+
+    drop(buffers);
+
+    for step in transform_steps.iter().rev() {
+        step.local_apply(&mut buffer_storage)?;
+    }
+
+    Ok(())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/channel.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/channel.rs
new file mode 100644
index 00000000..025622fe
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/channel.rs
@@ -0,0 +1,217 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::common::precompute_references;
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::{Histograms, SymbolReader},
+    error::Result,
+    frame::modular::{
+        IMAGE_OFFSET, IMAGE_PADDING, ModularChannel, Tree,
+        decode::{
+            common::make_pixel,
+            specialized_trees::{TreeSpecialCase, specialize_tree},
+        },
+        predict::{PredictionData, WeightedPredictorState},
+        tree::{NUM_NONREF_PROPERTIES, PROPERTIES_PER_PREVCHAN, predict},
+    },
+    headers::modular::GroupHeader,
+    image::Image,
+    util::tracing_wrappers::*,
+};
+
+const SMALL_CHANNEL_THRESHOLD: usize = 64;
+
+// General case decoder, for small buffers for which it's not worth trying to detect tree special cases.
+#[inline(never)]
+fn decode_modular_channel_small(
+    buffers: &mut [&mut ModularChannel],
+    chan: usize,
+    stream_id: usize,
+    header: &GroupHeader,
+    tree: &Tree,
+    reader: &mut SymbolReader,
+    br: &mut BitReader,
+) -> Result<()> {
+    let size = buffers[chan].data.size();
+    let mut wp_state = WeightedPredictorState::new(&header.wp_header, size.0)?;
+    let mut num_ref_props = tree
+        .max_property_count()
+        .saturating_sub(NUM_NONREF_PROPERTIES);
+    // The precompute_references function stores 4 values per reference property (offset + 0,1,2,3)
+    num_ref_props = num_ref_props.div_ceil(PROPERTIES_PER_PREVCHAN) * PROPERTIES_PER_PREVCHAN;
+    let mut references = Image::<i32>::new((num_ref_props, size.0))?;
+    let num_properties = NUM_NONREF_PROPERTIES + num_ref_props;
+
+    const { assert!(IMAGE_OFFSET.1 == 2) };
+
+    let mut property_buffer: Vec<i32> = vec![0; num_properties];
+    property_buffer[0] = chan as i32;
+    property_buffer[1] = stream_id as i32;
+
+    for y in 0..size.1 {
+        precompute_references(buffers, chan, y, &mut references);
+        // Reset non-static properties for each row (keep chan/stream_id in [0] and [1])
+        property_buffer[2..].fill(0);
+        let [row, row_top, row_toptop] =
+            buffers[chan].data.distinct_full_rows_mut([y + 2, y + 1, y]);
+        let row = &mut row[IMAGE_OFFSET.0..IMAGE_OFFSET.0 + size.0];
+        let row_top = &mut row_top[IMAGE_OFFSET.0..IMAGE_OFFSET.0 + size.0];
+        let row_toptop = &mut row_toptop[IMAGE_OFFSET.0..IMAGE_OFFSET.0 + size.0];
+        for x in 0..size.0 {
+            let prediction_data = PredictionData::get_rows(row, row_top, row_toptop, x, y);
+            let prediction_result = predict(
+                &tree.nodes,
+                prediction_data,
+                size.0,
+                Some(&mut wp_state),
+                x,
+                y,
+                &references,
+                &mut property_buffer,
+                u32::MAX, // cold path: compute all properties
+            );
+            let dec = reader.read_signed(&tree.histograms, br, prediction_result.context as usize);
+            let val = make_pixel(dec, prediction_result.multiplier, prediction_result.guess);
+            row[x] = val;
+            wp_state.update_errors(val, (x, y), size.0);
+        }
+    }
+
+    Ok(())
+}
+
+pub(super) trait ModularChannelDecoder {
+    const NEEDS_TOP: bool;
+    const NEEDS_TOPTOP: bool;
+    fn init_row(&mut self, buffers: &mut [&mut ModularChannel], chan: usize, y: usize);
+    fn decode_one(
+        &mut self,
+        prediction_data: PredictionData,
+        pos: (usize, usize),
+        xsize: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32;
+}
+
+#[inline(never)]
+#[allow(clippy::needless_range_loop)] // Iterator chain (.enumerate().skip().take()) measured 1% overhead
+fn decode_modular_channel_impl<D: ModularChannelDecoder>(
+    buffers: &mut [&mut ModularChannel],
+    chan: usize,
+    mut decoder: D,
+    reader: &mut SymbolReader,
+    br: &mut BitReader,
+    histograms: &Histograms,
+) -> Result<()> {
+    let size = buffers[chan].data.size();
+    debug_assert!(size.0 >= 4);
+    debug_assert!(size.1 >= 2);
+
+    const { assert!(IMAGE_OFFSET.1 == 2) };
+
+    // Let the compiler decide whether inlining in the borders is worth it.
+    let do_decode_cold =
+        |decoder: &mut D, prediction_data, pos, reader: &mut SymbolReader, br: &mut BitReader| {
+            decoder.decode_one(prediction_data, pos, size.0, reader, br, histograms)
+        };
+
+    for y in 0..size.1 {
+        decoder.init_row(buffers, chan, y);
+        let [row, row_top, row_toptop] =
+            buffers[chan].data.distinct_full_rows_mut([y + 2, y + 1, y]);
+        let row = &mut row[IMAGE_OFFSET.0..IMAGE_OFFSET.0 + size.0];
+        let row_top = &mut row_top[IMAGE_OFFSET.0..IMAGE_OFFSET.0 + size.0];
+        let row_toptop = &mut row_toptop[IMAGE_OFFSET.0..IMAGE_OFFSET.0 + size.0];
+        let mut last = 0;
+        let mut prediction_data = PredictionData::default();
+        for x in 0..2 {
+            prediction_data = PredictionData::get_rows(row, row_top, row_toptop, x, y);
+            let val = do_decode_cold(&mut decoder, prediction_data, (x, y), reader, br);
+            row[x] = val;
+            last = val;
+        }
+        if y < 2 {
+            for x in 2..size.0 - 2 {
+                let prediction_data = PredictionData::get_rows(row, row_top, row_toptop, x, y);
+                let val = do_decode_cold(&mut decoder, prediction_data, (x, y), reader, br);
+                row[x] = val;
+            }
+        } else {
+            for x in 2..size.0 - 2 {
+                prediction_data = prediction_data.update_for_interior_row(
+                    row_top,
+                    row_toptop,
+                    x,
+                    last,
+                    D::NEEDS_TOP,
+                    D::NEEDS_TOPTOP,
+                );
+                let val =
+                    decoder.decode_one(prediction_data, (x, y), size.0, reader, br, histograms);
+                row[x] = val;
+                last = val;
+            }
+        }
+        for x in size.0 - 2..size.0 {
+            prediction_data = PredictionData::get_rows(row, row_top, row_toptop, x, y);
+            let val = do_decode_cold(&mut decoder, prediction_data, (x, y), reader, br);
+            row[x] = val;
+        }
+    }
+    Ok(())
+}
+
+#[allow(clippy::too_many_arguments)]
+#[instrument(level = "debug", skip(buffers, reader, tree))]
+pub(super) fn decode_modular_channel(
+    buffers: &mut [&mut ModularChannel],
+    chan: usize,
+    stream_id: usize,
+    header: &GroupHeader,
+    tree: &Tree,
+    reader: &mut SymbolReader,
+    br: &mut BitReader,
+) -> Result<()> {
+    crate::profile!(modular_decode);
+    debug!("reading channel");
+    let size = buffers[chan].data.size();
+    if size.0 <= IMAGE_PADDING.0
+        || size.1 <= IMAGE_PADDING.1
+        || size.0 * size.1 <= SMALL_CHANNEL_THRESHOLD
+    {
+        return decode_modular_channel_small(buffers, chan, stream_id, header, tree, reader, br);
+    }
+
+    assert_eq!(buffers[chan].data.padding().1, IMAGE_PADDING.1);
+    assert!(buffers[chan].data.padding().0 >= IMAGE_PADDING.0);
+    assert_eq!(buffers[chan].data.offset(), IMAGE_OFFSET);
+
+    // We now know the channel has size at least IMAGE_PADDING.
+
+    let special_tree = specialize_tree(tree, chan, stream_id, size.0, header)?;
+    match special_tree {
+        TreeSpecialCase::NoTree(t) => {
+            decode_modular_channel_impl(buffers, chan, t, reader, br, &tree.histograms)
+        }
+        TreeSpecialCase::NoWp(t) => {
+            decode_modular_channel_impl(buffers, chan, t, reader, br, &tree.histograms)
+        }
+        TreeSpecialCase::WpOnlyConfig420(t) => {
+            decode_modular_channel_impl(buffers, chan, t, reader, br, &tree.histograms)
+        }
+        TreeSpecialCase::GradientLookupConfig420(t) => {
+            decode_modular_channel_impl(buffers, chan, t, reader, br, &tree.histograms)
+        }
+        TreeSpecialCase::SingleGradientOnly(t) => {
+            decode_modular_channel_impl(buffers, chan, t, reader, br, &tree.histograms)
+        }
+        TreeSpecialCase::General(t) => {
+            decode_modular_channel_impl(buffers, chan, t, reader, br, &tree.histograms)
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/common.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/common.rs
new file mode 100644
index 00000000..b04da92c
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/common.rs
@@ -0,0 +1,88 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    frame::{
+        modular::{ModularChannel, predict::clamped_gradient},
+        quantizer::NUM_QUANT_TABLES,
+    },
+    headers::frame_header::FrameHeader,
+    image::Image,
+};
+use num_traits::abs;
+
+#[derive(Debug)]
+pub enum ModularStreamId {
+    GlobalData,
+    VarDCTLF(usize),
+    ModularLF(usize),
+    LFMeta(usize),
+    QuantTable(usize),
+    ModularHF { pass: usize, group: usize },
+}
+
+impl ModularStreamId {
+    pub fn get_id(&self, frame_header: &FrameHeader) -> usize {
+        match self {
+            Self::GlobalData => 0,
+            Self::VarDCTLF(g) => 1 + g,
+            Self::ModularLF(g) => 1 + frame_header.num_lf_groups() + g,
+            Self::LFMeta(g) => 1 + frame_header.num_lf_groups() * 2 + g,
+            Self::QuantTable(q) => 1 + frame_header.num_lf_groups() * 3 + q,
+            Self::ModularHF { pass, group } => {
+                1 + frame_header.num_lf_groups() * 3
+                    + NUM_QUANT_TABLES
+                    + frame_header.num_groups() * *pass
+                    + *group
+            }
+        }
+    }
+}
+
+pub(super) fn precompute_references(
+    buffers: &mut [&mut ModularChannel],
+    chan: usize,
+    y: usize,
+    references: &mut Image<i32>,
+) {
+    references.fill(0);
+    let mut offset = 0;
+    let num_extra_props = references.size().0;
+    for i in 0..chan {
+        if offset >= num_extra_props {
+            break;
+        }
+        let j = chan - i - 1;
+        if buffers[j].data.size() != buffers[chan].data.size()
+            || buffers[j].shift != buffers[chan].shift
+        {
+            continue;
+        }
+        let ref_chan_row = buffers[j].data.row(y);
+        let ref_chan_prev = buffers[j].data.row(y.saturating_sub(1));
+        for x in 0..buffers[chan].data.size().0 {
+            let ref_row = references.row_mut(x);
+            let v = ref_chan_row[x];
+            ref_row[offset] = abs(v);
+            ref_row[offset + 1] = v;
+            let vleft = if x > 0 { ref_chan_row[x - 1] } else { 0 };
+            let vtop = if y > 0 { ref_chan_prev[x] } else { vleft };
+            let vtopleft = if x > 0 && y > 0 {
+                ref_chan_prev[x - 1]
+            } else {
+                vleft
+            };
+            let vpredicted = clamped_gradient(vleft as i64, vtop as i64, vtopleft as i64);
+            ref_row[offset + 2] = abs(v as i64 - vpredicted) as i32;
+            ref_row[offset + 3] = (v as i64 - vpredicted) as i32;
+        }
+        offset += 4;
+    }
+}
+
+#[inline(always)]
+pub(super) fn make_pixel(dec: i32, mul: u32, guess: i64) -> i32 {
+    (guess + (mul as i64) * (dec as i64)) as i32
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/mod.rs
new file mode 100644
index 00000000..3a3e510e
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/mod.rs
@@ -0,0 +1,12 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+mod bitstream;
+mod channel;
+mod common;
+mod specialized_trees;
+
+pub use bitstream::decode_modular_subbitstream;
+pub use common::ModularStreamId;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/specialized_trees.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/specialized_trees.rs
new file mode 100644
index 00000000..d8589653
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/decode/specialized_trees.rs
@@ -0,0 +1,532 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{collections::VecDeque, ops::Range};
+
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::{Histograms, SymbolReader},
+    error::Result,
+    frame::modular::{
+        ModularChannel, Predictor, Tree,
+        decode::{
+            channel::ModularChannelDecoder,
+            common::{make_pixel, precompute_references},
+        },
+        predict::{PredictionData, WeightedPredictorState, clamped_gradient},
+        tree::{
+            FlatTreeNode, NUM_NONREF_PROPERTIES, PROPERTIES_PER_PREVCHAN, TreeNode, predict_flat,
+        },
+    },
+    headers::modular::GroupHeader,
+    image::Image,
+};
+
+pub struct NoWpTree {
+    flat_nodes: Vec<FlatTreeNode>,
+    references: Image<i32>,
+    property_buffer: Vec<i32>,
+    used_mask: u32,
+}
+
+impl NoWpTree {
+    fn new(
+        nodes: Vec<TreeNode>,
+        max_property_count: usize,
+        channel: usize,
+        stream: usize,
+        xsize: usize,
+    ) -> Result<Self> {
+        let num_ref_props = max_property_count
+            .saturating_sub(NUM_NONREF_PROPERTIES)
+            .next_multiple_of(PROPERTIES_PER_PREVCHAN);
+        let references = Image::<i32>::new((num_ref_props, xsize))?;
+        let num_properties = NUM_NONREF_PROPERTIES + num_ref_props;
+        let mut property_buffer: Vec<i32> = vec![0; num_properties];
+
+        property_buffer[0] = channel as i32;
+        property_buffer[1] = stream as i32;
+
+        let used_mask = Tree::compute_used_property_mask(&nodes);
+        let flat_nodes = Tree::build_flat_tree(&nodes)?;
+
+        Ok(Self {
+            flat_nodes,
+            references,
+            property_buffer,
+            used_mask,
+        })
+    }
+}
+
+impl ModularChannelDecoder for NoWpTree {
+    const NEEDS_TOP: bool = true;
+    const NEEDS_TOPTOP: bool = true;
+
+    fn init_row(&mut self, buffers: &mut [&mut ModularChannel], chan: usize, y: usize) {
+        precompute_references(buffers, chan, y, &mut self.references);
+        // Only index 9 carries state across pixels (used by property 8 = left - prev_gradient).
+        // All other properties [2..] are overwritten before being read in compute_properties.
+        self.property_buffer[9] = 0;
+    }
+
+    fn decode_one(
+        &mut self,
+        prediction_data: PredictionData,
+        pos: (usize, usize),
+        xsize: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32 {
+        let prediction_result = predict_flat(
+            &self.flat_nodes,
+            prediction_data,
+            xsize,
+            None,
+            pos.0,
+            pos.1,
+            &self.references,
+            &mut self.property_buffer,
+            self.used_mask,
+        );
+        let dec = reader.read_signed_clustered(histograms, br, prediction_result.context as usize);
+        make_pixel(dec, prediction_result.multiplier, prediction_result.guess)
+    }
+}
+
+pub struct GeneralTree {
+    no_wp_tree: NoWpTree,
+    wp_state: WeightedPredictorState,
+}
+
+impl GeneralTree {
+    fn new(
+        nodes: Vec<TreeNode>,
+        max_property_count: usize,
+        header: &GroupHeader,
+        channel: usize,
+        stream: usize,
+        xsize: usize,
+    ) -> Result<Self> {
+        let wp_state = WeightedPredictorState::new(&header.wp_header, xsize)?;
+        Ok(Self {
+            no_wp_tree: NoWpTree::new(nodes, max_property_count, channel, stream, xsize)?,
+            wp_state,
+        })
+    }
+}
+
+impl ModularChannelDecoder for GeneralTree {
+    const NEEDS_TOP: bool = true;
+    const NEEDS_TOPTOP: bool = true;
+
+    fn init_row(&mut self, buffers: &mut [&mut ModularChannel], chan: usize, y: usize) {
+        self.no_wp_tree.init_row(buffers, chan, y);
+    }
+
+    fn decode_one(
+        &mut self,
+        prediction_data: PredictionData,
+        pos: (usize, usize),
+        xsize: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32 {
+        let prediction_result = predict_flat(
+            &self.no_wp_tree.flat_nodes,
+            prediction_data,
+            xsize,
+            Some(&mut self.wp_state),
+            pos.0,
+            pos.1,
+            &self.no_wp_tree.references,
+            &mut self.no_wp_tree.property_buffer,
+            self.no_wp_tree.used_mask,
+        );
+        let dec = reader.read_signed_clustered(histograms, br, prediction_result.context as usize);
+        let val = make_pixel(dec, prediction_result.multiplier, prediction_result.guess);
+        self.wp_state.update_errors(val, pos, xsize);
+        val
+    }
+}
+
+const LUT_MAX_SPLITVAL: i32 = 1023;
+const LUT_MIN_SPLITVAL: i32 = -1024;
+const LUT_TABLE_SIZE: usize = (LUT_MAX_SPLITVAL - LUT_MIN_SPLITVAL + 1) as usize;
+const _: () = assert!(LUT_TABLE_SIZE.is_power_of_two());
+
+fn make_lut(tree: &[TreeNode]) -> Option<[u8; LUT_TABLE_SIZE]> {
+    struct RangeAndNode {
+        range: Range<i32>,
+        node: u32,
+    }
+    let mut stack = vec![RangeAndNode {
+        range: LUT_MIN_SPLITVAL..LUT_MAX_SPLITVAL + 1,
+        node: 0,
+    }];
+
+    let mut ans = [0u8; LUT_TABLE_SIZE];
+    while let Some(RangeAndNode { range, node }) = stack.pop() {
+        let v = tree[node as usize];
+        match v {
+            TreeNode::Split {
+                val, left, right, ..
+            } => {
+                let first_left = val + 1;
+                if first_left >= range.end || first_left <= range.start {
+                    return None;
+                }
+                stack.push(RangeAndNode {
+                    range: first_left..range.end,
+                    node: left,
+                });
+                stack.push(RangeAndNode {
+                    range: range.start..first_left,
+                    node: right,
+                });
+            }
+            TreeNode::Leaf {
+                offset,
+                multiplier,
+                id,
+                ..
+            } => {
+                if offset != 0 || multiplier != 1 {
+                    return None;
+                }
+                let start = range.start - LUT_MIN_SPLITVAL;
+                let end = range.end - LUT_MIN_SPLITVAL;
+                ans[start as usize..end as usize].fill(id as u8);
+            }
+        }
+    }
+
+    Some(ans)
+}
+
+/// Specialized WpOnlyLookup for when all HybridUint configs are 420
+/// This allows using the fast-path entropy decoder
+pub struct WpOnlyLookupConfig420 {
+    lut: [u8; LUT_TABLE_SIZE],
+    wp_state: WeightedPredictorState,
+}
+
+impl WpOnlyLookupConfig420 {
+    fn new(
+        tree: &[TreeNode],
+        histograms: &Histograms,
+        header: &GroupHeader,
+        xsize: usize,
+    ) -> Option<Self> {
+        if !histograms.can_use_config_420_fast_path() {
+            return None;
+        }
+        let wp_state = WeightedPredictorState::new(&header.wp_header, xsize).ok()?;
+        let lut = make_lut(tree)?;
+        Some(Self { lut, wp_state })
+    }
+}
+
+impl ModularChannelDecoder for WpOnlyLookupConfig420 {
+    const NEEDS_TOP: bool = true;
+    const NEEDS_TOPTOP: bool = true;
+
+    fn init_row(&mut self, _buffers: &mut [&mut ModularChannel], _chan: usize, _y: usize) {
+        // nothing to do
+    }
+
+    #[inline(always)]
+    fn decode_one(
+        &mut self,
+        prediction_data: PredictionData,
+        pos: (usize, usize),
+        xsize: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32 {
+        let (wp_pred, property) = self
+            .wp_state
+            .predict_and_property(pos, xsize, &prediction_data);
+        let ctx = self.lut[(property as i64 - LUT_MIN_SPLITVAL as i64)
+            .clamp(0, LUT_TABLE_SIZE as i64 - 1) as usize];
+        // Use the specialized 420 fast path
+        let dec = reader.read_signed_clustered_config_420(histograms, br, ctx as usize);
+        let val = dec.wrapping_add(wp_pred as i32);
+        self.wp_state.update_errors(val, pos, xsize);
+        val
+    }
+}
+
+/// Property 9 is the "gradient property": left + top - topleft
+const GRADIENT_PROPERTY: u8 = 9;
+
+/// Config 420 specialized version of gradient lookup for trees that split only on property 9.
+/// This uses the specialized entropy decoder for config 420 + no LZ77.
+pub struct GradientLookupConfig420 {
+    lut: [u8; LUT_TABLE_SIZE],
+}
+
+fn make_gradient_lut_config_420(
+    tree: &[TreeNode],
+    histograms: &Histograms,
+) -> Option<GradientLookupConfig420> {
+    if !histograms.can_use_config_420_fast_path() {
+        return None;
+    }
+    // Verify all splits are on property 9 and all leaves have Gradient predictor
+    for node in tree {
+        match node {
+            TreeNode::Split { property, .. } => {
+                if *property != GRADIENT_PROPERTY {
+                    return None;
+                }
+            }
+            TreeNode::Leaf { predictor, .. } => {
+                if *predictor != Predictor::Gradient {
+                    return None;
+                }
+            }
+        }
+    }
+
+    let lut = make_lut(tree)?;
+    Some(GradientLookupConfig420 { lut })
+}
+
+impl ModularChannelDecoder for GradientLookupConfig420 {
+    const NEEDS_TOP: bool = true;
+    const NEEDS_TOPTOP: bool = false;
+
+    fn init_row(&mut self, _: &mut [&mut ModularChannel], _: usize, _: usize) {}
+
+    #[inline(always)]
+    fn decode_one(
+        &mut self,
+        prediction_data: PredictionData,
+        _: (usize, usize),
+        _: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32 {
+        let prop9 = prediction_data
+            .left
+            .wrapping_add(prediction_data.top)
+            .wrapping_sub(prediction_data.topleft);
+
+        let index =
+            (prop9 as i64 - LUT_MIN_SPLITVAL as i64).clamp(0, LUT_TABLE_SIZE as i64 - 1) as usize;
+        let cluster = self.lut[index];
+
+        let pred = clamped_gradient(
+            prediction_data.left as i64,
+            prediction_data.top as i64,
+            prediction_data.topleft as i64,
+        );
+
+        // Use the specialized config 420 fast path
+        let dec = reader.read_signed_clustered_config_420(histograms, br, cluster as usize);
+        dec.wrapping_add(pred as i32)
+    }
+}
+
+pub struct SingleGradientOnly {
+    clustered_ctx: usize,
+}
+
+impl ModularChannelDecoder for SingleGradientOnly {
+    const NEEDS_TOP: bool = true;
+    const NEEDS_TOPTOP: bool = false;
+
+    fn init_row(&mut self, _: &mut [&mut ModularChannel], _: usize, _: usize) {}
+
+    #[inline(always)]
+    fn decode_one(
+        &mut self,
+        prediction_data: PredictionData,
+        _: (usize, usize),
+        _: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32 {
+        // Direct gradient path: Predictor::Gradient.predict_one reduces to
+        // clamped_gradient for this tree, and make_pixel(dec, 1, pred) equals
+        // dec.wrapping_add(pred as i32). Inlining drops the enum dispatch and
+        // the multiply in this hot single-predictor decode loop; output is
+        // bit-identical.
+        let pred = clamped_gradient(
+            prediction_data.left as i64,
+            prediction_data.top as i64,
+            prediction_data.topleft as i64,
+        );
+        let dec = reader.read_signed_clustered_inline(histograms, br, self.clustered_ctx);
+        dec.wrapping_add(pred as i32)
+    }
+}
+
+pub struct NoTree {
+    clustered_ctx: usize,
+}
+
+impl ModularChannelDecoder for NoTree {
+    const NEEDS_TOP: bool = false;
+    const NEEDS_TOPTOP: bool = false;
+
+    fn init_row(&mut self, _: &mut [&mut ModularChannel], _: usize, _: usize) {}
+
+    #[inline(always)]
+    fn decode_one(
+        &mut self,
+        _: PredictionData,
+        _: (usize, usize),
+        _: usize,
+        reader: &mut SymbolReader,
+        br: &mut BitReader,
+        histograms: &Histograms,
+    ) -> i32 {
+        let dec = reader.read_signed_clustered_inline(histograms, br, self.clustered_ctx);
+        make_pixel(dec, 1, 0)
+    }
+}
+
+#[allow(clippy::large_enum_variant)]
+pub enum TreeSpecialCase {
+    NoTree(NoTree),
+    NoWp(NoWpTree),
+    WpOnlyConfig420(WpOnlyLookupConfig420),
+    GradientLookupConfig420(GradientLookupConfig420),
+    SingleGradientOnly(SingleGradientOnly),
+    General(GeneralTree),
+}
+
+pub fn specialize_tree(
+    tree: &Tree,
+    channel: usize,
+    stream: usize,
+    xsize: usize,
+    header: &GroupHeader,
+) -> Result<TreeSpecialCase> {
+    // TODO(veluca): consider skipping the pruning if header.uses_global_tree is true.
+    let mut pruned_tree = Vec::new();
+    let mut queue = VecDeque::new();
+    pruned_tree.try_reserve(tree.nodes.len())?;
+    queue.try_reserve(tree.nodes.len())?;
+    queue.push_front(0);
+
+    let mut uses_wp = false;
+    let mut uses_non_wp = false;
+
+    // Obtain a pruned tree without nodes that are not relevant in the current channel and stream.
+    // Proceed in BFS order, so that we know that the children of a node will be adjacent.
+    // Also re-maps context IDs to cluster IDs.
+    while let Some(v) = queue.pop_front() {
+        let mut node = tree.nodes[v as usize];
+        match node {
+            TreeNode::Split {
+                property,
+                val,
+                left,
+                right,
+            } if property < 2 => {
+                // If the node splits on static properties, re-enqueue its correct child immediately.
+                let vv = if property == 0 { channel } else { stream };
+                queue.push_front(if vv as i32 > val { left } else { right });
+                continue;
+            }
+            TreeNode::Split {
+                property,
+                val,
+                left,
+                right,
+            } => {
+                // WeightedPredictor property.
+                uses_wp |= property == 15;
+                uses_non_wp |= property != 15;
+                let base = (queue.len() + pruned_tree.len() + 1) as u32;
+                pruned_tree.push(TreeNode::Split {
+                    property,
+                    val,
+                    left: base,
+                    right: base + 1,
+                });
+                queue.push_back(left);
+                queue.push_back(right);
+            }
+            TreeNode::Leaf { predictor, .. } => {
+                uses_wp |= predictor == Predictor::Weighted;
+                uses_non_wp |= predictor != Predictor::Weighted;
+                let TreeNode::Leaf { id, .. } = &mut node else {
+                    unreachable!()
+                };
+                *id = tree.histograms.map_context_to_cluster(*id as usize) as u32;
+                pruned_tree.push(node);
+            }
+        }
+    }
+
+    if let [
+        TreeNode::Leaf {
+            predictor: Predictor::Zero,
+            multiplier: 1,
+            offset: 0,
+            id,
+        },
+    ] = &*pruned_tree
+    {
+        return Ok(TreeSpecialCase::NoTree(NoTree {
+            clustered_ctx: *id as usize,
+        }));
+    }
+
+    if let [
+        TreeNode::Leaf {
+            predictor: Predictor::Gradient,
+            multiplier: 1,
+            offset: 0,
+            id,
+        },
+    ] = &*pruned_tree
+    {
+        return Ok(TreeSpecialCase::SingleGradientOnly(SingleGradientOnly {
+            clustered_ctx: *id as usize,
+        }));
+    }
+
+    if !uses_non_wp {
+        // Try the specialized 420 config version (fast path for effort 3 encoded images)
+        if let Some(wp) = WpOnlyLookupConfig420::new(&pruned_tree, &tree.histograms, header, xsize)
+        {
+            return Ok(TreeSpecialCase::WpOnlyConfig420(wp));
+        }
+    }
+
+    // Non-WP trees (includes effort 2 encoding and some groups in effort > 3)
+    if !uses_wp {
+        // Try config 420 specialized gradient LUT version (fast path for effort 2 encoded images)
+        if let Some(gl) = make_gradient_lut_config_420(&pruned_tree, &tree.histograms) {
+            return Ok(TreeSpecialCase::GradientLookupConfig420(gl));
+        }
+        return Ok(TreeSpecialCase::NoWp(NoWpTree::new(
+            pruned_tree,
+            tree.max_property_count(),
+            channel,
+            stream,
+            xsize,
+        )?));
+    }
+
+    Ok(TreeSpecialCase::General(GeneralTree::new(
+        pruned_tree,
+        tree.max_property_count(),
+        header,
+        channel,
+        stream,
+        xsize,
+    )?))
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/mod.rs
new file mode 100644
index 00000000..c4295bf5
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/mod.rs
@@ -0,0 +1,1301 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{
+    cmp::min,
+    collections::{BTreeMap, BTreeSet},
+    fmt::Debug,
+    ops::Range,
+    sync::{
+        Mutex,
+        atomic::{AtomicUsize, Ordering},
+    },
+};
+
+use crate::transforms::transform_map::*;
+use crate::{
+    bit_reader::BitReader,
+    error::{Error, Result},
+    frame::{
+        ColorCorrelationParams, HfMetadata,
+        block_context_map::BlockContextMap,
+        quantizer::{self, LfQuantFactors, QuantizerParams},
+    },
+    headers::{
+        ImageMetadata, JxlHeader,
+        bit_depth::BitDepth,
+        frame_header::FrameHeader,
+        modular::{GroupHeader, TransformId},
+    },
+    image::{Image, ImageRectMut, Rect},
+    util::{AtomicRefCell, CeilLog2, MemoryTracker, SmallVec, tracing_wrappers::*},
+};
+
+mod borrowed_buffers;
+pub(crate) mod decode;
+mod predict;
+mod transforms;
+mod tree;
+
+use borrowed_buffers::with_buffers;
+pub use decode::ModularStreamId;
+use decode::decode_modular_subbitstream;
+pub use predict::Predictor;
+use transforms::{TransformStepChunk, make_grids};
+pub use tree::Tree;
+
+// Two rows on top, two pixels to the left, two pixels to the right.
+const IMAGE_PADDING: (usize, usize) = (4, 2);
+const IMAGE_OFFSET: (usize, usize) = (2, 2);
+
+#[derive(Clone, PartialEq, Eq, Copy)]
+struct ChannelInfo {
+    // The index of the output channel in the render pipeline.
+    output_channel_idx: Option<usize>,
+    // width, height
+    size: (usize, usize),
+    shift: Option<(usize, usize)>, // None for meta-channels
+    bit_depth: BitDepth,
+}
+
+impl Debug for ChannelInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}x{}", self.size.0, self.size.1)?;
+        if let Some(shift) = self.shift {
+            write!(f, "(shift {},{})", shift.0, shift.1)?;
+        } else {
+            write!(f, "(meta)")?;
+        }
+        write!(f, "{:?}", self.bit_depth)?;
+        if let Some(oc) = self.output_channel_idx {
+            write!(f, "(output channel {})", oc)?;
+        }
+        Ok(())
+    }
+}
+
+impl ChannelInfo {
+    fn is_meta(&self) -> bool {
+        self.shift.is_none()
+    }
+
+    fn is_meta_or_small(&self, group_dim: usize) -> bool {
+        self.is_meta() || (self.size.0 <= group_dim && self.size.1 <= group_dim)
+    }
+
+    fn is_shift_in_range(&self, min: usize, max: usize) -> bool {
+        // This might be called with max < min, in which case we just return false.
+        // This matches libjxl behaviour.
+        self.shift.is_some_and(|(a, b)| {
+            let shift = a.min(b);
+            min <= shift && shift <= max
+        })
+    }
+
+    fn is_equivalent(&self, other: &ChannelInfo) -> bool {
+        self.size == other.size && self.shift == other.shift && self.bit_depth == other.bit_depth
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
+enum ModularGridKind {
+    // Single big channel.
+    None,
+    // 2048x2048 image-pixels (if modular_group_shift == 1).
+    Lf,
+    // 256x256 image-pixels (if modular_group_shift == 1).
+    Hf,
+}
+
+impl ModularGridKind {
+    fn grid_dim(&self, frame_header: &FrameHeader, shift: (usize, usize)) -> (usize, usize) {
+        let group_dim = match self {
+            ModularGridKind::None => 0,
+            ModularGridKind::Lf => frame_header.lf_group_dim(),
+            ModularGridKind::Hf => frame_header.group_dim(),
+        };
+        (group_dim >> shift.0, group_dim >> shift.1)
+    }
+    fn grid_shape(&self, frame_header: &FrameHeader) -> (usize, usize) {
+        match self {
+            ModularGridKind::None => (1, 1),
+            ModularGridKind::Lf => frame_header.size_lf_groups(),
+            ModularGridKind::Hf => frame_header.size_groups(),
+        }
+    }
+}
+
+// All the information on a specific buffer needed by Modular decoding.
+#[derive(Debug)]
+pub(crate) struct ModularChannel {
+    // Actual pixel buffer.
+    pub data: Image<i32>,
+    // Holds additional information such as the weighted predictor's error channel's last row for
+    // the transform chunk that produced this buffer.
+    auxiliary_data: Option<Image<i32>>,
+    // Shift of the channel (None if this is a meta-channel).
+    shift: Option<(usize, usize)>,
+    bit_depth: BitDepth,
+}
+
+impl ModularChannel {
+    pub fn new(size: (usize, usize), bit_depth: BitDepth) -> Result<Self> {
+        Self::new_with_shift(size, Some((0, 0)), bit_depth)
+    }
+
+    fn new_with_shift(
+        size: (usize, usize),
+        shift: Option<(usize, usize)>,
+        bit_depth: BitDepth,
+    ) -> Result<Self> {
+        Ok(ModularChannel {
+            data: Image::new_with_padding(size, IMAGE_OFFSET, IMAGE_PADDING)?,
+            auxiliary_data: None,
+            shift,
+            bit_depth,
+        })
+    }
+
+    fn try_clone(&self) -> Result<Self> {
+        Ok(ModularChannel {
+            data: self.data.try_clone()?,
+            auxiliary_data: self
+                .auxiliary_data
+                .as_ref()
+                .map(Image::try_clone)
+                .transpose()?,
+            shift: self.shift,
+            bit_depth: self.bit_depth,
+        })
+    }
+
+    fn channel_info(&self) -> ChannelInfo {
+        ChannelInfo {
+            output_channel_idx: None,
+            size: self.data.size(),
+            shift: self.shift,
+            bit_depth: self.bit_depth,
+        }
+    }
+}
+
+const BUFFER_STATUS_NOT_RENDERED: usize = 0;
+const BUFFER_STATUS_PARTIAL_RENDER: usize = 1;
+const BUFFER_STATUS_FINAL_RENDER: usize = 2;
+
+// Note: this type uses interior mutability to get mutable references to multiple buffers at once.
+// In principle, this is not needed, but the overhead should be minimal so using `unsafe` here is
+// probably not worth it.
+#[derive(Debug)]
+struct ModularBuffer {
+    data: AtomicRefCell<Option<ModularChannel>>,
+    // Number of times this buffer will be used, *including* when it is used for output.
+    remaining_uses: AtomicUsize,
+    // Transform steps that "strongly" or "weakly" use the image data in this buffer.
+    // A "strong" usage always triggers a re-render if the image data changes.
+    // A "weak" usage only triggers a re-render if the buffer is final, or if the
+    // current re-render was not only caused by weak re-renders.
+    used_by_transforms_strong: Vec<usize>,
+    used_by_transforms_weak: Vec<usize>,
+    size: (usize, usize),
+    status: AtomicUsize,
+}
+
+impl ModularBuffer {
+    fn get_status(&self) -> usize {
+        self.status.load(Ordering::Relaxed)
+    }
+
+    fn set_status(&self, val: usize) {
+        self.status.store(val, Ordering::Relaxed);
+    }
+
+    // Iterator over (transform_id, is_strong_use)
+    fn users(&self, include_weak: bool) -> impl Iterator<Item = (usize, bool)> {
+        let strong = self.used_by_transforms_strong.iter().map(|x| (*x, true));
+        let weak = if include_weak {
+            &self.used_by_transforms_weak[..]
+        } else {
+            &[]
+        }
+        .iter()
+        .map(|x| (*x, false));
+        strong.chain(weak)
+    }
+
+    // Gives out a copy of the buffer + auxiliary buffer, marking the buffer as used.
+    // If this was the last usage of the buffer, does not actually copy the buffer.
+    fn get_buffer(&self, can_consume: bool) -> Result<ModularChannel> {
+        if !can_consume {
+            return ModularChannel::try_clone(self.data.borrow().as_ref().unwrap());
+        }
+        let mut ret = None;
+        let _ = self.remaining_uses.fetch_update(
+            Ordering::Release,
+            Ordering::Acquire,
+            |remaining_pre| {
+                let remaining = remaining_pre.checked_sub(1).unwrap();
+                if ret.is_none() {
+                    if remaining == 0 {
+                        ret = Some(Ok(self.data.borrow_mut().take().unwrap()))
+                    } else {
+                        ret = self.data.borrow().as_ref().map(ModularChannel::try_clone);
+                    }
+                } else if remaining == 0 {
+                    *self.data.borrow_mut() = None;
+                }
+                Some(remaining)
+            },
+        );
+        Ok(ret.transpose()?.unwrap())
+    }
+
+    fn mark_used(&self, can_consume: bool) {
+        if !can_consume {
+            return;
+        }
+        let _ = self.remaining_uses.fetch_update(
+            Ordering::Release,
+            Ordering::Acquire,
+            |remaining_pre: usize| {
+                let remaining = remaining_pre.checked_sub(1).unwrap();
+                if remaining == 0 {
+                    *self.data.borrow_mut() = None;
+                }
+                Some(remaining)
+            },
+        );
+    }
+}
+
+#[derive(Debug)]
+struct ModularBufferInfo {
+    info: ChannelInfo,
+    // The index of coded channel in the bit-stream, or -1 for non-coded channels.
+    coded_channel_id: isize,
+    #[cfg_attr(not(feature = "tracing"), allow(dead_code))]
+    description: String,
+    grid_kind: ModularGridKind,
+    grid_shape: (usize, usize),
+    buffer_grid: Vec<ModularBuffer>,
+}
+
+impl ModularBufferInfo {
+    fn get_grid_idx(
+        &self,
+        output_grid_kind: ModularGridKind,
+        output_grid_pos: (usize, usize),
+    ) -> usize {
+        let grid_pos = match (output_grid_kind, self.grid_kind) {
+            (_, ModularGridKind::None) => (0, 0),
+            (ModularGridKind::Lf, ModularGridKind::Lf)
+            | (ModularGridKind::Hf, ModularGridKind::Hf) => output_grid_pos,
+            (ModularGridKind::Hf, ModularGridKind::Lf) => {
+                (output_grid_pos.0 / 8, output_grid_pos.1 / 8)
+            }
+            _ => unreachable!("invalid combination of output grid kind and buffer grid kind"),
+        };
+        self.grid_shape.0 * grid_pos.1 + grid_pos.0
+    }
+
+    fn get_grid_rect(
+        &self,
+        frame_header: &FrameHeader,
+        output_grid_kind: ModularGridKind,
+        output_grid_pos: (usize, usize),
+    ) -> Rect {
+        let chan_size = self.info.size;
+        if output_grid_kind == ModularGridKind::None {
+            assert_eq!(self.grid_kind, output_grid_kind);
+            return Rect {
+                origin: (0, 0),
+                size: chan_size,
+            };
+        }
+        let shift = self.info.shift.unwrap();
+        let grid_dim = output_grid_kind.grid_dim(frame_header, shift);
+        let bx = output_grid_pos.0 * grid_dim.0;
+        let by = output_grid_pos.1 * grid_dim.1;
+        let size = (
+            (chan_size.0 - bx).min(grid_dim.0),
+            (chan_size.1 - by).min(grid_dim.1),
+        );
+        let origin = match (output_grid_kind, self.grid_kind) {
+            (ModularGridKind::Lf, ModularGridKind::Lf)
+            | (ModularGridKind::Hf, ModularGridKind::Hf) => (0, 0),
+            (_, ModularGridKind::None) => (bx, by),
+            (ModularGridKind::Hf, ModularGridKind::Lf) => {
+                let lf_grid_dim = self.grid_kind.grid_dim(frame_header, shift);
+                (bx % lf_grid_dim.0, by % lf_grid_dim.1)
+            }
+            _ => unreachable!("invalid combination of output grid kind and buffer grid kind"),
+        };
+        if size.0 == 0 || size.1 == 0 {
+            Rect {
+                origin: (0, 0),
+                size: (0, 0),
+            }
+        } else {
+            Rect { origin, size }
+        }
+    }
+}
+
+/// A modular image is a sequence of channels to which one or more transforms might have been
+/// applied. We represent a modular image as a list of buffers, some of which are coded in the
+/// bitstream; other buffers are obtained as the output of one of the transformation steps.
+/// Some buffers are marked as `output`: those are the buffers corresponding to the pre-transform
+/// image channels.
+/// The buffers are internally divided in grids, matching the sizes of the groups they are coded
+/// in (with appropriate shifts), or the size of the data produced by applying the appropriate
+/// transforms to each of the groups in the input of the transforms.
+#[derive(Debug)]
+pub struct FullModularImage {
+    buffer_info: Vec<ModularBufferInfo>,
+    transform_steps: Vec<TransformStepChunk>,
+    // List of buffer indices of the channels of the modular image encoded in each kind of section.
+    // In order, LfGlobal, LfGroup, HfGroup(pass 0), ..., HfGroup(last pass).
+    section_buffer_indices: Vec<Vec<usize>>,
+    modular_color_channels: usize,
+    can_do_partial_render: bool,
+    buffers_for_channels: Vec<usize>,
+    // Buffers to _start rendering from_ on the next call to process_output.
+    // This is initially set to LF global and LF buffers, and populated with HF buffers
+    // just before we start decoding them.
+    ready_buffers_dry_run: Mutex<BTreeSet<(usize, usize)>>,
+    ready_buffers: BTreeSet<(usize, usize)>,
+    // Whether each channel is used or not by the render pipeline.
+    pipeline_used_channels: Vec<bool>,
+    /// When true, flush_output clones buffers instead of consuming them.
+    /// Used during incremental decode to preserve data for the final re-render.
+    preserve_buffers: bool,
+    log_group_dim: usize,
+    num_groups: (usize, usize),
+}
+
+impl FullModularImage {
+    pub fn can_do_partial_render(&self) -> bool {
+        self.can_do_partial_render
+    }
+
+    /// When true, flush_output clones buffers instead of consuming them.
+    pub fn set_preserve_buffers(&mut self, preserve: bool) {
+        self.preserve_buffers = preserve;
+    }
+
+    pub fn set_pipeline_used_channels(&mut self, used: &[bool]) {
+        if !self.pipeline_used_channels.is_empty() {
+            return;
+        }
+        self.pipeline_used_channels = used.to_vec();
+    }
+
+    #[instrument(level = "debug", skip_all)]
+    pub fn read(
+        frame_header: &FrameHeader,
+        image_metadata: &ImageMetadata,
+        modular_color_channels: usize,
+        global_tree: &Option<Tree>,
+        br: &mut BitReader,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<Self> {
+        let mut channels = vec![];
+        for c in 0..modular_color_channels {
+            let shift = (frame_header.hshift(c), frame_header.vshift(c));
+            let size = frame_header.size();
+            channels.push(ChannelInfo {
+                output_channel_idx: Some(c),
+                size: (size.0.div_ceil(1 << shift.0), size.1.div_ceil(1 << shift.1)),
+                shift: Some(shift),
+                bit_depth: image_metadata.bit_depth,
+            });
+        }
+
+        for (idx, ecups) in frame_header.ec_upsampling.iter().enumerate() {
+            let shift_ec = ecups.ceil_log2();
+            let shift_color = frame_header.upsampling.ceil_log2();
+            let shift = shift_ec
+                .checked_sub(shift_color)
+                .expect("ec_upsampling >= upsampling should be checked in frame header")
+                as usize;
+            let size = frame_header.size_upsampled();
+            let size = (
+                size.0.div_ceil(*ecups as usize),
+                size.1.div_ceil(*ecups as usize),
+            );
+            channels.push(ChannelInfo {
+                output_channel_idx: Some(3 + idx),
+                size,
+                shift: Some((shift, shift)),
+                bit_depth: image_metadata.bit_depth,
+            });
+        }
+
+        #[cfg(feature = "tracing")]
+        for (i, ch) in channels.iter().enumerate() {
+            trace!("Modular channel {i}: {ch:?}");
+        }
+
+        if channels.is_empty() {
+            return Ok(Self {
+                buffer_info: vec![],
+                transform_steps: vec![],
+                section_buffer_indices: vec![vec![]; 2 + frame_header.passes.num_passes as usize],
+                modular_color_channels,
+                can_do_partial_render: true,
+                buffers_for_channels: vec![],
+                ready_buffers_dry_run: Mutex::new(BTreeSet::new()),
+                ready_buffers: BTreeSet::new(),
+                pipeline_used_channels: vec![],
+                preserve_buffers: false,
+                log_group_dim: frame_header.log_group_dim(),
+                num_groups: frame_header.size_groups(),
+            });
+        }
+
+        trace!("reading modular header");
+        let header = GroupHeader::read(br)?;
+
+        // Disallow progressive rendering with multi-channel palette transforms
+        // or delta-palette.
+        let has_problematic_palette_transform = header.transforms.iter().any(|x| {
+            x.id == TransformId::Palette
+                && (x.num_channels > 1 || x.predictor_id != Predictor::Zero as u32)
+        });
+
+        let (mut buffer_info, transform_steps) =
+            transforms::apply::meta_apply_transforms(&channels, &header)?;
+
+        // Assign each (channel, group) pair present in the bitstream to the section in which it
+        // will be decoded.
+        let mut section_buffer_indices: Vec<Vec<usize>> = vec![];
+
+        let mut sorted_buffers: Vec<_> = buffer_info
+            .iter()
+            .enumerate()
+            .filter_map(|(i, b)| {
+                if b.coded_channel_id >= 0 {
+                    Some((b.coded_channel_id, i))
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        sorted_buffers.sort_by_key(|x| x.0);
+
+        section_buffer_indices.push(
+            sorted_buffers
+                .iter()
+                .take_while(|x| {
+                    buffer_info[x.1]
+                        .info
+                        .is_meta_or_small(frame_header.group_dim())
+                })
+                .map(|x| x.1)
+                .collect(),
+        );
+
+        section_buffer_indices.push(
+            sorted_buffers
+                .iter()
+                .skip_while(|x| {
+                    buffer_info[x.1]
+                        .info
+                        .is_meta_or_small(frame_header.group_dim())
+                })
+                .filter(|x| buffer_info[x.1].info.is_shift_in_range(3, usize::MAX))
+                .map(|x| x.1)
+                .collect(),
+        );
+
+        for pass in 0..frame_header.passes.num_passes as usize {
+            let (min_shift, max_shift) = frame_header.passes.downsampling_bracket(pass);
+            section_buffer_indices.push(
+                sorted_buffers
+                    .iter()
+                    .skip_while(|x| {
+                        buffer_info[x.1]
+                            .info
+                            .is_meta_or_small(frame_header.group_dim())
+                    })
+                    .filter(|x| {
+                        buffer_info[x.1]
+                            .info
+                            .is_shift_in_range(min_shift, max_shift)
+                    })
+                    .map(|x| x.1)
+                    .collect(),
+            );
+        }
+
+        // Ensure that the channel list in each group is sorted by actual channel ID.
+        for list in section_buffer_indices.iter_mut() {
+            list.sort_by_key(|x| buffer_info[*x].coded_channel_id);
+        }
+
+        trace!(?section_buffer_indices);
+        #[cfg(feature = "tracing")]
+        for (section, indices) in section_buffer_indices.iter().enumerate() {
+            let section_name = match section {
+                0 => "LF global".to_string(),
+                1 => "LF groups".to_string(),
+                _ => format!("HF groups, pass {}", section - 2),
+            };
+            trace!("Coded modular channels in {section_name}");
+            for i in indices {
+                let bi = &buffer_info[*i];
+                trace!(
+                    "Channel {i} {:?} coded id: {}",
+                    bi.info, bi.coded_channel_id
+                );
+            }
+        }
+
+        let transform_steps = make_grids(
+            frame_header,
+            transform_steps,
+            &section_buffer_indices,
+            &mut buffer_info,
+        );
+
+        #[cfg(feature = "tracing")]
+        for (i, bi) in buffer_info.iter().enumerate() {
+            trace!(
+                "Channel {i} {:?} coded_id: {} '{}' {:?} grid {:?}",
+                bi.info, bi.coded_channel_id, bi.description, bi.grid_kind, bi.grid_shape
+            );
+            for (pos, buf) in bi.buffer_grid.iter().enumerate() {
+                trace!(
+                    "Channel {i} grid {pos} ({}, {})  size: {:?}, uses: {:?}, used_by: s {:?} w {:?}",
+                    pos % bi.grid_shape.0,
+                    pos / bi.grid_shape.0,
+                    buf.size,
+                    buf.remaining_uses,
+                    buf.used_by_transforms_strong,
+                    buf.used_by_transforms_weak,
+                );
+            }
+        }
+
+        #[cfg(feature = "tracing")]
+        for (i, ts) in transform_steps.iter().enumerate() {
+            trace!("Transform {i}: {ts:?}");
+        }
+
+        let mut buffers_for_channels = vec![];
+
+        for (i, c) in buffer_info.iter().enumerate() {
+            if let Some(c) = c.info.output_channel_idx {
+                if buffers_for_channels.len() <= c {
+                    buffers_for_channels.resize(c + 1, 0);
+                }
+                buffers_for_channels[c] = i;
+            }
+        }
+
+        with_buffers(&buffer_info, &section_buffer_indices[0], 0, |bufs| {
+            decode_modular_subbitstream(
+                bufs,
+                ModularStreamId::GlobalData.get_id(frame_header),
+                Some(header),
+                global_tree,
+                br,
+                memory_tracker,
+            )
+        })?;
+
+        let mut ready_buffers = BTreeSet::new();
+        for b in section_buffer_indices[0].iter() {
+            buffer_info[*b].buffer_grid[0].set_status(BUFFER_STATUS_FINAL_RENDER);
+            ready_buffers.insert((*b, 0));
+        }
+
+        Ok(FullModularImage {
+            buffer_info,
+            transform_steps,
+            section_buffer_indices,
+            modular_color_channels,
+            can_do_partial_render: !has_problematic_palette_transform,
+            buffers_for_channels,
+            ready_buffers_dry_run: Mutex::new(ready_buffers),
+            ready_buffers: BTreeSet::new(),
+            pipeline_used_channels: vec![],
+            preserve_buffers: false,
+            log_group_dim: frame_header.log_group_dim(),
+            num_groups: frame_header.size_groups(),
+        })
+    }
+
+    pub fn mark_group_to_be_read(&self, section_id: usize, group: usize) {
+        let mut dry_run = self.ready_buffers_dry_run.lock().unwrap();
+        for b in self.section_buffer_indices[section_id].iter() {
+            self.buffer_info[*b].buffer_grid[group].set_status(BUFFER_STATUS_FINAL_RENDER);
+            dry_run.insert((*b, group));
+        }
+    }
+
+    /// Transfer items from `ready_buffers_dry_run` to `ready_buffers` without
+    /// running transforms.  Used by the parallel decode path which calls
+    /// `mark_group_to_be_read` (populates dry_run set) followed by
+    /// `process_output(false)` (asserts dry_run set is empty).
+    #[cfg(feature = "threads")]
+    pub fn drain_dry_run_to_ready(&mut self) {
+        let dry = std::mem::take(&mut *self.ready_buffers_dry_run.lock().unwrap());
+        self.ready_buffers.extend(dry);
+    }
+
+    #[allow(clippy::type_complexity)]
+    #[instrument(
+        level = "debug",
+        skip(self, frame_header, global_tree, br, memory_tracker),
+        ret
+    )]
+    pub fn read_stream(
+        &self,
+        stream: ModularStreamId,
+        frame_header: &FrameHeader,
+        global_tree: &Option<Tree>,
+        br: &mut BitReader,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<()> {
+        if self.buffer_info.is_empty() {
+            info!("No modular channels to decode");
+            return Ok(());
+        }
+        let (section_id, grid) = match stream {
+            ModularStreamId::ModularLF(group) => (1, group),
+            ModularStreamId::ModularHF { pass, group } => (2 + pass, group),
+            _ => {
+                unreachable!(
+                    "read_stream should only be used for streams that are part of the main Modular image"
+                );
+            }
+        };
+
+        with_buffers(
+            &self.buffer_info,
+            &self.section_buffer_indices[section_id],
+            grid,
+            |bufs| {
+                decode_modular_subbitstream(
+                    bufs,
+                    stream.get_id(frame_header),
+                    None,
+                    global_tree,
+                    br,
+                    memory_tracker,
+                )
+            },
+        )?;
+
+        // TODO(veluca): consider removing this from here and moving it to some appropriate place.
+        if section_id == 1 {
+            self.mark_group_to_be_read(section_id, grid);
+        }
+
+        Ok(())
+    }
+
+    fn maybe_output(
+        &self,
+        buf: usize,
+        grid: usize,
+        dry_run: bool,
+        pass_to_pipeline: &mut dyn FnMut(usize, usize, bool, Option<Image<i32>>) -> Result<()>,
+    ) -> Result<()> {
+        if let Some(chan) = self.buffer_info[buf].info.output_channel_idx {
+            // None-grid buffers hold the whole channel in a single buffer_grid
+            // cell; index 0 regardless of the requested group, and crop to the
+            // group's rect below. (port libjxl/jxl-rs#756)
+            let grid_is_none = self.buffer_info[buf].grid_kind == ModularGridKind::None;
+            let grid_idx = if grid_is_none { 0 } else { grid };
+            let is_final = self.buffer_info[buf].buffer_grid[grid_idx].get_status()
+                == BUFFER_STATUS_FINAL_RENDER;
+            let all_final = !self.preserve_buffers
+                && self.buffers_for_channels.iter().all(|x| {
+                    self.buffer_info[*x].buffer_grid[grid_idx].get_status()
+                        == BUFFER_STATUS_FINAL_RENDER
+                });
+            let channels: SmallVec<[usize; 3]> = if chan == 0 && self.modular_color_channels == 1 {
+                (0..3).filter(|x| self.pipeline_used_channels[*x]).collect()
+            } else {
+                self.pipeline_used_channels[chan]
+                    .then_some(chan)
+                    .into_iter()
+                    .collect()
+            };
+            if channels.is_empty() {
+                return Ok(());
+            }
+            if dry_run {
+                for c in channels.iter() {
+                    pass_to_pipeline(*c, grid, is_final, None)?;
+                }
+            } else {
+                debug!("Rendering channel {chan:?}, grid position {grid}");
+
+                let modular_buf = self.buffer_info[buf].buffer_grid[grid_idx]
+                    .get_buffer(all_final && !grid_is_none)?;
+                let mut image = modular_buf.data;
+
+                if grid_is_none {
+                    let (shift_x, shift_y) = self.buffer_info[buf].info.shift.unwrap_or((0, 0));
+                    let log_group_dim = self.log_group_dim;
+                    let gx = grid % self.num_groups.0;
+                    let gy = grid / self.num_groups.0;
+
+                    let rect = Rect {
+                        origin: (gx << log_group_dim, gy << log_group_dim),
+                        size: (1 << log_group_dim, 1 << log_group_dim),
+                    };
+                    let rect = rect.downsample((shift_x as u8, shift_y as u8));
+                    let full_size = self.buffer_info[buf].buffer_grid[grid_idx].size;
+                    let rect = rect.clip(full_size);
+
+                    if rect.origin != (0, 0) || rect.size != full_size {
+                        let mut cropped = Image::new(rect.size)?;
+                        let src_view = image.get_rect(rect);
+                        for y in 0..rect.size.1 {
+                            cropped.row_mut(y).copy_from_slice(src_view.row(y));
+                        }
+                        image = cropped;
+                    }
+                }
+
+                for c in channels[1..].iter() {
+                    pass_to_pipeline(*c, grid, is_final, Some(image.try_clone()?))?;
+                }
+                pass_to_pipeline(channels[0], grid, is_final, Some(image))?;
+            }
+        }
+        Ok(())
+    }
+
+    // If `dry_run` is true, this call does not modify any state, and the calls to `pass_to_pipeline`
+    // will have None as an image. Otherwise, the image will always be `Some(..)`.
+    // It is *required* to do a dry run before doing an actual run after any event that might have
+    // readied some buffers.
+    pub fn process_output(
+        &mut self,
+        frame_header: &FrameHeader,
+        dry_run: bool,
+        pass_to_pipeline: &mut dyn FnMut(usize, usize, bool, Option<Image<i32>>) -> Result<()>,
+    ) -> Result<()> {
+        // TODO(veluca): consider using `used_channel_mask` to avoid running transforms that produce
+        // channels that are not used.
+
+        // layer -> (transform -> is_strong)
+        let mut to_process_by_layer = BTreeMap::<usize, BTreeMap<usize, bool>>::new();
+        let mut buffers_to_output = vec![];
+
+        let ready_buffers = if dry_run {
+            std::mem::take(&mut *self.ready_buffers_dry_run.lock().unwrap())
+        } else {
+            assert!(self.ready_buffers_dry_run.lock().unwrap().is_empty());
+            std::mem::take(&mut self.ready_buffers)
+        };
+
+        for (buf, grid) in ready_buffers {
+            if self.buffer_info[buf].info.output_channel_idx.is_some() {
+                buffers_to_output.push((buf, grid));
+            }
+            for (t, is_strong_dep) in self.buffer_info[buf].buffer_grid[grid].users(true) {
+                let layer = self.transform_steps[t].layer;
+                let layer = to_process_by_layer.entry(layer).or_default();
+                let is_strong = layer.entry(t).or_default();
+                *is_strong |= is_strong_dep;
+            }
+            if dry_run {
+                self.ready_buffers.insert((buf, grid));
+            }
+        }
+
+        // When doing a dry run, run the same logic as the real execution, but
+        // without modifying the actual buffer status -- instead, we use local
+        // overrides.
+        // This allows us to know what buffers will be produced before producing any.
+        let mut status_overrides = BTreeMap::new();
+
+        let get_status =
+            |status_overrides: &mut BTreeMap<(usize, usize), usize>, b: usize, g: usize| {
+                if let Some(s) = status_overrides.get(&(b, g)) {
+                    *s
+                } else {
+                    self.buffer_info[b].buffer_grid[g].get_status()
+                }
+            };
+
+        let mut new_dirty_transforms = vec![];
+        while let Some((_, transforms)) = to_process_by_layer.pop_first() {
+            trace!("{transforms:?}");
+            for (t, is_strong) in transforms {
+                let tfm = &self.transform_steps[t];
+                trace!("{:?}", tfm);
+
+                let dependency_status = tfm
+                    .deps
+                    .iter()
+                    .map(|(b, g)| get_status(&mut status_overrides, *b, *g))
+                    .min()
+                    .unwrap_or(BUFFER_STATUS_FINAL_RENDER);
+
+                if dependency_status == BUFFER_STATUS_NOT_RENDERED {
+                    continue;
+                }
+                let is_final = dependency_status == BUFFER_STATUS_FINAL_RENDER;
+
+                let mut previous_output_status = None;
+                for (b, g) in tfm.outputs(&self.buffer_info) {
+                    let status = get_status(&mut status_overrides, b, g);
+                    if previous_output_status.is_none() {
+                        previous_output_status = Some(status);
+                    }
+                    assert_eq!(Some(status), previous_output_status);
+                    if dry_run {
+                        status_overrides.insert((b, g), dependency_status);
+                    } else {
+                        self.buffer_info[b].buffer_grid[g].set_status(dependency_status);
+                    }
+                }
+                let previous_output_status = previous_output_status.unwrap();
+
+                if !dry_run {
+                    tfm.do_run(frame_header, &self.buffer_info, is_final)?;
+                }
+
+                // If this was the first _or_ the last render, trigger a re-render across weak edges
+                // even if the render was caused by a weak edge.
+                // This is necessary to finish drawing those renders correctly.
+                let is_strong = is_strong
+                    || (previous_output_status == BUFFER_STATUS_NOT_RENDERED
+                        || dependency_status == BUFFER_STATUS_FINAL_RENDER);
+                for (buf, grid) in self.transform_steps[t].outputs(&self.buffer_info) {
+                    if self.buffer_info[buf].info.output_channel_idx.is_some() {
+                        buffers_to_output.push((buf, grid));
+                    }
+                    for (t, is_strong_dep) in
+                        self.buffer_info[buf].buffer_grid[grid].users(is_strong)
+                    {
+                        new_dirty_transforms.push((t, is_strong_dep));
+                    }
+                }
+            }
+
+            for (t, is_strong_dep) in new_dirty_transforms.drain(..) {
+                let layer = self.transform_steps[t].layer;
+                let layer = to_process_by_layer.entry(layer).or_default();
+                let is_strong = layer.entry(t).or_default();
+                *is_strong |= is_strong_dep;
+            }
+        }
+
+        // Pass all the output buffers to the render pipeline.
+        for (buf, grid) in buffers_to_output {
+            // A None-grid output buffer holds the whole channel; emit it once
+            // per group (cropped to each group's rect) so groups other than 0
+            // receive their data. (port libjxl/jxl-rs#756)
+            if self.buffer_info[buf].grid_kind == ModularGridKind::None {
+                for g in 0..self.num_groups.0 * self.num_groups.1 {
+                    self.maybe_output(buf, g, dry_run, pass_to_pipeline)?;
+                }
+            } else {
+                self.maybe_output(buf, grid, dry_run, pass_to_pipeline)?;
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn channel_range(&self) -> Range<usize> {
+        if self.modular_color_channels != 0 {
+            0..self.buffers_for_channels.len()
+        } else {
+            // VarDCT image.
+            3..self.buffers_for_channels.len()
+        }
+    }
+
+    pub fn flush_output(
+        &mut self,
+        group: usize,
+        chan: usize,
+        pass_to_pipeline: &mut dyn FnMut(usize, usize, bool, Image<i32>) -> Result<()>,
+    ) -> Result<()> {
+        if !self.can_do_partial_render() {
+            return Ok(());
+        }
+        let buf_idx = self.buffers_for_channels[chan];
+        // Skip channels that don't have a real buffer assignment.
+        // buffers_for_channels is zero-filled on resize, so intermediate channels
+        // (e.g. G/B when modular_color_channels==1) may alias buffer 0 incorrectly.
+        if self.buffer_info[buf_idx].info.output_channel_idx != Some(chan) {
+            return Ok(());
+        }
+        self.maybe_output(buf_idx, group, false, &mut |chan, grid, complete, img| {
+            pass_to_pipeline(chan, grid, complete, img.unwrap())
+        })
+    }
+
+    pub fn zero_fill_empty_channels(&mut self, num_passes: usize, num_groups: usize) -> Result<()> {
+        if !self.can_do_partial_render() {
+            return Ok(());
+        }
+        if self.buffer_info.is_empty() {
+            return Ok(());
+        }
+        for pass in 0..num_passes {
+            for grid in 0..num_groups {
+                // TODO(veluca): consider filling these buffers with placeholders instead of real images.
+                with_buffers(
+                    &self.buffer_info,
+                    &self.section_buffer_indices[pass + 2],
+                    grid,
+                    |_| Ok(()),
+                )?;
+                for b in self.section_buffer_indices[pass + 2].iter() {
+                    if self.buffer_info[*b].buffer_grid[grid].get_status()
+                        == BUFFER_STATUS_NOT_RENDERED
+                    {
+                        self.buffer_info[*b].buffer_grid[grid]
+                            .set_status(BUFFER_STATUS_PARTIAL_RENDER);
+                        self.ready_buffers.insert((*b, grid));
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn dequant_lf(
+    r: Rect,
+    mut lf_rects: [ImageRectMut<'_, f32>; 3],
+    mut quant_lf_rect: ImageRectMut<'_, u8>,
+    input: [&Image<i32>; 3],
+    color_correlation_params: &ColorCorrelationParams,
+    quant_params: &QuantizerParams,
+    lf_quant: &LfQuantFactors,
+    mul: f32,
+    frame_header: &FrameHeader,
+    bctx: &BlockContextMap,
+) -> Result<()> {
+    let inv_quant_lf = (quantizer::GLOBAL_SCALE_DENOM as f32)
+        / (quant_params.global_scale as f32 * quant_params.quant_lf as f32);
+    let lf_factors = lf_quant.quant_factors.map(|factor| factor * inv_quant_lf);
+
+    if frame_header.is444() {
+        let [ref mut lf_rect_0, ref mut lf_rect_1, ref mut lf_rect_2] = lf_rects;
+
+        let fac_x = lf_factors[0] * mul;
+        let fac_y = lf_factors[1] * mul;
+        let fac_b = lf_factors[2] * mul;
+        let cfl_fac_x = color_correlation_params.y_to_x_lf();
+        let cfl_fac_b = color_correlation_params.y_to_b_lf();
+        for y in 0..r.size.1 {
+            let quant_row_x = input[1].row(y);
+            let quant_row_y = input[0].row(y);
+            let quant_row_b = input[2].row(y);
+            let dec_row_x = lf_rect_0.row(y);
+            let dec_row_y = lf_rect_1.row(y);
+            let dec_row_b = lf_rect_2.row(y);
+            for x in 0..r.size.0 {
+                let in_x = quant_row_x[x] as f32 * fac_x;
+                let in_y = quant_row_y[x] as f32 * fac_y;
+                let in_b = quant_row_b[x] as f32 * fac_b;
+                dec_row_y[x] = in_y;
+                dec_row_x[x] = in_y * cfl_fac_x + in_x;
+                dec_row_b[x] = in_y * cfl_fac_b + in_b;
+            }
+        }
+    } else {
+        for (c, lf_rect) in lf_rects.iter_mut().enumerate() {
+            let fac = lf_factors[c] * mul;
+            let ch = input[if c < 2 { c ^ 1 } else { c }];
+            let rect_size = lf_rect.size();
+            for y in 0..rect_size.1 {
+                let quant_row = ch.row(y);
+                let row = lf_rect.row(y);
+                for x in 0..rect_size.0 {
+                    row[x] = quant_row[x] as f32 * fac;
+                }
+            }
+        }
+    }
+    if bctx.num_lf_contexts <= 1 {
+        for y in 0..r.size.1 {
+            quant_lf_rect.row(y).fill(0);
+        }
+    } else {
+        for y in 0..r.size.1 {
+            let qlf_row_val = quant_lf_rect.row(y);
+            let quant_row_x = input[1].row(y >> frame_header.vshift(0));
+            let quant_row_y = input[0].row(y >> frame_header.vshift(1));
+            let quant_row_b = input[2].row(y >> frame_header.vshift(2));
+            for x in 0..r.size.0 {
+                let bucket_x = bctx.lf_thresholds[0]
+                    .iter()
+                    .filter(|&t| quant_row_x[x >> frame_header.hshift(0)] > *t)
+                    .count();
+                let bucket_y = bctx.lf_thresholds[1]
+                    .iter()
+                    .filter(|&t| quant_row_y[x >> frame_header.hshift(1)] > *t)
+                    .count();
+                let bucket_b = bctx.lf_thresholds[2]
+                    .iter()
+                    .filter(|&t| quant_row_b[x >> frame_header.hshift(2)] > *t)
+                    .count();
+                let mut bucket = bucket_x;
+                bucket *= bctx.lf_thresholds[2].len() + 1;
+                bucket += bucket_b;
+                bucket *= bctx.lf_thresholds[1].len() + 1;
+                bucket += bucket_y;
+                qlf_row_val[x] = bucket as u8;
+            }
+        }
+    }
+    Ok(())
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn decode_vardct_lf(
+    group: usize,
+    frame_header: &FrameHeader,
+    image_metadata: &ImageMetadata,
+    global_tree: &Option<Tree>,
+    color_correlation_params: &ColorCorrelationParams,
+    quant_params: &QuantizerParams,
+    lf_quant: &LfQuantFactors,
+    bctx: &BlockContextMap,
+    lf_image: &mut [Image<f32>; 3],
+    quant_lf: &mut Image<u8>,
+    br: &mut BitReader,
+    memory_tracker: &MemoryTracker,
+) -> Result<()> {
+    let extra_precision = br.read(2)?;
+    debug!(?extra_precision);
+    let mul = 1.0 / (1 << extra_precision) as f32;
+    let stream_id = ModularStreamId::VarDCTLF(group).get_id(frame_header);
+    debug!(?stream_id);
+    let r = frame_header.lf_group_rect(group);
+    debug!(?r);
+    let shrink_rect = |size: (usize, usize), c| {
+        (
+            size.0 >> frame_header.hshift(c),
+            size.1 >> frame_header.vshift(c),
+        )
+    };
+    let mut buffers = [
+        ModularChannel::new(shrink_rect(r.size, 1), image_metadata.bit_depth)?,
+        ModularChannel::new(shrink_rect(r.size, 0), image_metadata.bit_depth)?,
+        ModularChannel::new(shrink_rect(r.size, 2), image_metadata.bit_depth)?,
+    ];
+    decode_modular_subbitstream(
+        buffers.iter_mut().collect(),
+        stream_id,
+        None,
+        global_tree,
+        br,
+        memory_tracker,
+    )?;
+    let lf_rects = if frame_header.is444() {
+        let [lf0, lf1, lf2] = lf_image;
+        [
+            lf0.get_rect_mut(r),
+            lf1.get_rect_mut(r),
+            lf2.get_rect_mut(r),
+        ]
+    } else {
+        let [lf0, lf1, lf2] = lf_image;
+        [
+            lf0.get_rect_mut(Rect {
+                origin: (
+                    r.origin.0 >> frame_header.hshift(0),
+                    r.origin.1 >> frame_header.vshift(0),
+                ),
+                size: (
+                    r.size.0 >> frame_header.hshift(0),
+                    r.size.1 >> frame_header.vshift(0),
+                ),
+            }),
+            lf1.get_rect_mut(Rect {
+                origin: (
+                    r.origin.0 >> frame_header.hshift(1),
+                    r.origin.1 >> frame_header.vshift(1),
+                ),
+                size: (
+                    r.size.0 >> frame_header.hshift(1),
+                    r.size.1 >> frame_header.vshift(1),
+                ),
+            }),
+            lf2.get_rect_mut(Rect {
+                origin: (
+                    r.origin.0 >> frame_header.hshift(2),
+                    r.origin.1 >> frame_header.vshift(2),
+                ),
+                size: (
+                    r.size.0 >> frame_header.hshift(2),
+                    r.size.1 >> frame_header.vshift(2),
+                ),
+            }),
+        ]
+    };
+    let quant_lf_rect = quant_lf.get_rect_mut(r);
+    dequant_lf(
+        r,
+        lf_rects,
+        quant_lf_rect,
+        [&buffers[0].data, &buffers[1].data, &buffers[2].data],
+        color_correlation_params,
+        quant_params,
+        lf_quant,
+        mul,
+        frame_header,
+        bctx,
+    )
+}
+
+pub fn decode_hf_metadata(
+    group: usize,
+    frame_header: &FrameHeader,
+    image_metadata: &ImageMetadata,
+    global_tree: &Option<Tree>,
+    hf_meta: &mut HfMetadata,
+    br: &mut BitReader,
+    memory_tracker: &MemoryTracker,
+) -> Result<()> {
+    let r = frame_header.lf_group_rect(group);
+    let cr = Rect {
+        origin: (r.origin.0 >> 3, r.origin.1 >> 3),
+        size: (r.size.0.div_ceil(8), r.size.1.div_ceil(8)),
+    };
+    let ytox_rect = hf_meta.ytox_map.get_rect_mut(cr);
+    let ytob_rect = hf_meta.ytob_map.get_rect_mut(cr);
+    let transform_rect = hf_meta.transform_map.get_rect_mut(r);
+    let raw_quant_rect = hf_meta.raw_quant_map.get_rect_mut(r);
+    let epf_rect = hf_meta.epf_map.get_rect_mut(r);
+    let used = decode_hf_metadata_into_rects(
+        group,
+        frame_header,
+        image_metadata,
+        global_tree,
+        r,
+        cr,
+        ytox_rect,
+        ytob_rect,
+        transform_rect,
+        raw_quant_rect,
+        epf_rect,
+        br,
+        memory_tracker,
+    )?;
+    hf_meta.used_hf_types |= used;
+    Ok(())
+}
+
+/// Inner implementation that writes to pre-computed rects.
+/// Returns the `used_hf_types` bitmask for the caller to merge.
+#[allow(clippy::too_many_arguments)]
+pub(crate) fn decode_hf_metadata_into_rects(
+    group: usize,
+    frame_header: &FrameHeader,
+    image_metadata: &ImageMetadata,
+    global_tree: &Option<Tree>,
+    r: Rect,
+    cr: Rect,
+    mut ytox_map_rect: ImageRectMut<'_, i8>,
+    mut ytob_map_rect: ImageRectMut<'_, i8>,
+    mut transform_map_rect: ImageRectMut<'_, u8>,
+    mut raw_quant_map_rect: ImageRectMut<'_, i32>,
+    mut epf_map_rect: ImageRectMut<'_, u8>,
+    br: &mut BitReader,
+    memory_tracker: &MemoryTracker,
+) -> Result<u32> {
+    let stream_id = ModularStreamId::LFMeta(group).get_id(frame_header);
+    debug!(?stream_id);
+    debug!(?r);
+    let upper_bound = r.size.0 * r.size.1;
+    let count_num_bits = upper_bound.ceil_log2();
+    let count: usize = br.read(count_num_bits)? as usize + 1;
+    debug!(?count);
+    let mut buffers = [
+        ModularChannel::new_with_shift(cr.size, Some((3, 3)), image_metadata.bit_depth)?,
+        ModularChannel::new_with_shift(cr.size, Some((3, 3)), image_metadata.bit_depth)?,
+        ModularChannel::new((count, 2), image_metadata.bit_depth)?,
+        ModularChannel::new(r.size, image_metadata.bit_depth)?,
+    ];
+    decode_modular_subbitstream(
+        buffers.iter_mut().collect(),
+        stream_id,
+        None,
+        global_tree,
+        br,
+        memory_tracker,
+    )?;
+    let ytox_image = &buffers[0].data;
+    let ytob_image = &buffers[1].data;
+    let i8min: i32 = i8::MIN.into();
+    let i8max: i32 = i8::MAX.into();
+    for y in 0..cr.size.1 {
+        let row_in_x = ytox_image.row(y);
+        let row_in_b = ytob_image.row(y);
+        let row_out_x = ytox_map_rect.row(y);
+        let row_out_b = ytob_map_rect.row(y);
+        for x in 0..cr.size.0 {
+            row_out_x[x] = row_in_x[x].clamp(i8min, i8max) as i8;
+            row_out_b[x] = row_in_b[x].clamp(i8min, i8max) as i8;
+        }
+    }
+    let transform_image = &buffers[2].data;
+    let epf_image = &buffers[3].data;
+    let mut num: usize = 0;
+    let mut used_hf_types: u32 = 0;
+    for y in 0..r.size.1 {
+        let epf_row_in = epf_image.row(y);
+        let epf_row_out = epf_map_rect.row(y);
+        for x in 0..r.size.0 {
+            let epf_val = epf_row_in[x];
+            if !(0..8).contains(&epf_val) {
+                return Err(Error::InvalidEpfValue(epf_val));
+            }
+            epf_row_out[x] = epf_val as u8;
+            if transform_map_rect.row(y)[x] != HfTransformType::INVALID_TRANSFORM {
+                continue;
+            }
+            if num >= count {
+                return Err(Error::InvalidVarDCTTransformMap);
+            }
+            let raw_transform = transform_image.row(0)[num];
+            let raw_quant = 1 + transform_image.row(1)[num].clamp(0, 255);
+            let transform_type = HfTransformType::from_usize(raw_transform as usize)
+                .ok_or(Error::InvalidVarDCTTransform(raw_transform as usize))?;
+            used_hf_types |= 1 << raw_transform;
+            let cx = covered_blocks_x(transform_type) as usize;
+            let cy = covered_blocks_y(transform_type) as usize;
+            if (cx > 1 || cy > 1) && !frame_header.is444() {
+                return Err(Error::InvalidBlockSizeForChromaSubsampling);
+            }
+            let next_group = ((x / 32 + 1) * 32, (y / 32 + 1) * 32);
+            if x + cx > min(r.size.0, next_group.0) || y + cy > min(r.size.1, next_group.1) {
+                return Err(Error::HFBlockOutOfBounds);
+            }
+            let transform_id = raw_transform as u8;
+            for iy in 0..cy {
+                for ix in 0..cx {
+                    transform_map_rect.row(y + iy)[x + ix] = if iy == 0 && ix == 0 {
+                        transform_id + 128 // Set highest bit to signal first block.
+                    } else {
+                        transform_id
+                    };
+                    raw_quant_map_rect.row(y + iy)[x + ix] = raw_quant;
+                }
+            }
+            num += 1;
+        }
+    }
+    Ok(used_hf_types)
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/predict.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/predict.rs
new file mode 100644
index 00000000..7234238a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/predict.rs
@@ -0,0 +1,642 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    error::{Error, Result},
+    headers::modular::WeightedHeader,
+    image::Image,
+    util::{TryVecExt, floor_log2_nonzero},
+};
+use num_derive::FromPrimitive;
+use num_traits::FromPrimitive;
+
+#[repr(u8)]
+#[derive(Debug, FromPrimitive, Clone, Copy, PartialEq, Eq)]
+pub enum Predictor {
+    Zero = 0,
+    West = 1,
+    North = 2,
+    AverageWestAndNorth = 3,
+    Select = 4,
+    Gradient = 5,
+    Weighted = 6,
+    NorthEast = 7,
+    NorthWest = 8,
+    WestWest = 9,
+    AverageWestAndNorthWest = 10,
+    AverageNorthAndNorthWest = 11,
+    AverageNorthAndNorthEast = 12,
+    AverageAll = 13,
+}
+
+impl Predictor {
+    pub fn requires_full_row(&self) -> bool {
+        matches!(
+            self,
+            Predictor::Weighted
+                | Predictor::NorthEast
+                | Predictor::AverageNorthAndNorthEast
+                | Predictor::AverageAll
+        )
+    }
+}
+
+impl TryFrom<u32> for Predictor {
+    type Error = Error;
+
+    fn try_from(value: u32) -> Result<Self> {
+        Self::from_u32(value).ok_or(Error::InvalidPredictor(value))
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+pub struct PredictionData {
+    pub left: i32,
+    pub top: i32,
+    pub toptop: i32,
+    pub topleft: i32,
+    pub topright: i32,
+    pub leftleft: i32,
+    pub toprightright: i32,
+}
+
+impl PredictionData {
+    #[inline(always)]
+    pub fn update_for_interior_row(
+        self,
+        row_top: &[i32],
+        row_toptop: &[i32],
+        x: usize,
+        cur: i32,
+        needs_top: bool,
+        needs_toptop: bool,
+    ) -> PredictionData {
+        debug_assert!(x > 1);
+        debug_assert!(x + 2 < row_top.len());
+        let left = cur;
+        let top = self.topright;
+        let topleft = self.top;
+        let topright = self.toprightright;
+        let leftleft = self.left;
+        let toptop = if needs_toptop { row_toptop[x] } else { 0 };
+        let toprightright = if needs_top { row_top[x + 2] } else { 0 };
+        Self {
+            left,
+            top,
+            toptop,
+            topleft,
+            topright,
+            leftleft,
+            toprightright,
+        }
+    }
+
+    #[inline(always)]
+    pub fn get_rows(row: &[i32], row_top: &[i32], row_toptop: &[i32], x: usize, y: usize) -> Self {
+        let left = if x > 0 {
+            row[x - 1]
+        } else if y > 0 {
+            row_top[0]
+        } else {
+            0
+        };
+        let top = if y > 0 { row_top[x] } else { left };
+        let topleft = if x > 0 && y > 0 { row_top[x - 1] } else { left };
+        let topright = if x + 1 < row.len() && y > 0 {
+            row_top[x + 1]
+        } else {
+            top
+        };
+        let leftleft = if x > 1 { row[x - 2] } else { left };
+        let toptop = if y > 1 { row_toptop[x] } else { top };
+        let toprightright = if x + 2 < row.len() && y > 0 {
+            row_top[x + 2]
+        } else {
+            topright
+        };
+        Self {
+            left,
+            top,
+            toptop,
+            topleft,
+            topright,
+            leftleft,
+            toprightright,
+        }
+    }
+
+    #[allow(dead_code)] // Convenience wrapper used by some decode paths
+    pub fn get(rect: &Image<i32>, x: usize, y: usize) -> Self {
+        Self::get_rows(
+            rect.row(y),
+            rect.row(y.saturating_sub(1)),
+            rect.row(y.saturating_sub(2)),
+            x,
+            y,
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    #[allow(dead_code)] // Cross-group neighbor variant for tiled decode
+    pub fn get_with_neighbors(
+        rect: &Image<i32>,
+        rect_left: Option<&Image<i32>>,
+        rect_top: Option<&Image<i32>>,
+        rect_top_left: Option<&Image<i32>>,
+        rect_right: Option<&Image<i32>>,
+        rect_top_right: Option<&Image<i32>>,
+        x: usize,
+        y: usize,
+        xsize: usize,
+        ysize: usize,
+    ) -> Self {
+        let row_y = rect.row(y);
+        let left = if x > 0 {
+            row_y[x - 1]
+        } else if let Some(l) = rect_left {
+            l.row(y)[xsize - 1]
+        } else if y > 0 {
+            rect.row(y - 1)[0]
+        } else if let Some(t) = rect_top {
+            t.row(ysize - 1)[0]
+        } else {
+            0
+        };
+        let leftleft = if x > 1 {
+            row_y[x - 2]
+        } else if let Some(l) = rect_left {
+            l.row(y)[xsize + x - 2]
+        } else {
+            left
+        };
+        Self::from_hoisted_neighbors(
+            left,
+            leftleft,
+            if y > 0 { Some(rect.row(y - 1)) } else { None },
+            if y > 1 { Some(rect.row(y - 2)) } else { None },
+            rect.size().0,
+            rect_left,
+            rect_top,
+            rect_top_left,
+            rect_right,
+            rect_top_right,
+            x,
+            y,
+            xsize,
+            ysize,
+        )
+    }
+
+    /// Like [`get_with_neighbors`], but takes pre-fetched values and row slices
+    /// instead of an `&Image<i32>`. This avoids per-pixel `Image::row()`
+    /// overhead when called in a tight loop.
+    ///
+    /// - `left`, `leftleft`: tracked as running variables by the caller
+    /// - `row_prev`, `row_prev2`: pre-fetched (copied) once per y-iteration
+    /// - Neighbor image refs: only accessed at grid boundaries (~1% of pixels)
+    #[allow(clippy::too_many_arguments)]
+    #[inline(always)]
+    pub fn from_hoisted_neighbors(
+        left: i32,
+        leftleft: i32,
+        row_prev: Option<&[i32]>,
+        row_prev2: Option<&[i32]>,
+        rect_width: usize,
+        rect_left: Option<&Image<i32>>,
+        rect_top: Option<&Image<i32>>,
+        rect_top_left: Option<&Image<i32>>,
+        rect_right: Option<&Image<i32>>,
+        rect_top_right: Option<&Image<i32>>,
+        x: usize,
+        y: usize,
+        xsize: usize,
+        ysize: usize,
+    ) -> Self {
+        let top = if let Some(rp) = row_prev {
+            rp[x]
+        } else if let Some(t) = rect_top {
+            t.row(ysize - 1)[x]
+        } else {
+            left
+        };
+        let topleft = if x > 0 {
+            if let Some(rp) = row_prev {
+                rp[x - 1]
+            } else if let Some(t) = rect_top {
+                t.row(ysize - 1)[x - 1]
+            } else {
+                left
+            }
+        } else if y > 0 {
+            if let Some(l) = rect_left {
+                l.row(y - 1)[xsize - 1]
+            } else {
+                left
+            }
+        } else if let Some(tl) = rect_top_left {
+            tl.row(ysize - 1)[xsize - 1]
+        } else {
+            left
+        };
+        let topright = if x + 1 < rect_width {
+            if let Some(rp) = row_prev {
+                rp[x + 1]
+            } else if let Some(t) = rect_top {
+                t.row(ysize - 1)[x + 1]
+            } else {
+                top
+            }
+        } else if y > 0 {
+            if let Some(r) = rect_right {
+                r.row(y - 1)[0]
+            } else {
+                top
+            }
+        } else if let Some(tr) = rect_top_right {
+            tr.row(ysize - 1)[0]
+        } else {
+            top
+        };
+        let toptop = if let Some(rp2) = row_prev2 {
+            rp2[x]
+        } else if let Some(t) = rect_top {
+            t.row(ysize + y - 2)[x]
+        } else {
+            top
+        };
+        let toprightright = if x + 2 < rect_width {
+            if let Some(rp) = row_prev {
+                rp[x + 2]
+            } else if let Some(t) = rect_top {
+                t.row(ysize - 1)[x + 2]
+            } else {
+                topright
+            }
+        } else if y > 0 {
+            if let Some(r) = rect_right {
+                r.row(y - 1)[x + 2 - rect_width]
+            } else {
+                topright
+            }
+        } else if let Some(tr) = rect_top_right {
+            tr.row(ysize - 1)[x + 2 - rect_width]
+        } else {
+            topright
+        };
+        Self {
+            left,
+            top,
+            toptop,
+            topleft,
+            topright,
+            leftleft,
+            toprightright,
+        }
+    }
+}
+
+#[inline(always)]
+pub fn clamped_gradient(left: i64, top: i64, topleft: i64) -> i64 {
+    // Same code/logic as libjxl.
+    let min = left.min(top);
+    let max = left.max(top);
+    let grad = left + top - topleft;
+    let grad_clamp_max = if topleft < min { max } else { grad };
+    if topleft > max { min } else { grad_clamp_max }
+}
+
+impl Predictor {
+    pub const NUM_PREDICTORS: u32 = Predictor::AverageAll as u32 + 1;
+
+    #[inline(always)]
+    pub fn predict_one(
+        &self,
+        PredictionData {
+            left,
+            top,
+            toptop,
+            topleft,
+            topright,
+            leftleft,
+            toprightright,
+        }: PredictionData,
+        wp_pred: i64,
+    ) -> i64 {
+        match self {
+            Predictor::Zero => 0,
+            Predictor::West => left as i64,
+            Predictor::North => top as i64,
+            Predictor::Select => Self::select(left as i64, top as i64, topleft as i64),
+            Predictor::Gradient => clamped_gradient(left as i64, top as i64, topleft as i64),
+            Predictor::Weighted => wp_pred,
+            Predictor::WestWest => leftleft as i64,
+            Predictor::NorthEast => topright as i64,
+            Predictor::NorthWest => topleft as i64,
+            Predictor::AverageWestAndNorth => (top as i64 + left as i64) / 2,
+            Predictor::AverageWestAndNorthWest => (left as i64 + topleft as i64) / 2,
+            Predictor::AverageNorthAndNorthWest => (top as i64 + topleft as i64) / 2,
+            Predictor::AverageNorthAndNorthEast => (top as i64 + topright as i64) / 2,
+            Predictor::AverageAll => {
+                (6 * top as i64 - 2 * toptop as i64
+                    + 7 * left as i64
+                    + leftleft as i64
+                    + toprightright as i64
+                    + 3 * topright as i64
+                    + 8)
+                    / 16
+            }
+        }
+    }
+
+    fn select(left: i64, top: i64, topleft: i64) -> i64 {
+        let p = left + top - topleft;
+        if (p - left).abs() < (p - top).abs() {
+            left
+        } else {
+            top
+        }
+    }
+}
+
+const NUM_PREDICTORS: usize = 4;
+const PRED_EXTRA_BITS: i64 = 3;
+const PREDICTION_ROUND: i64 = ((1 << PRED_EXTRA_BITS) >> 1) - 1;
+// Allows to approximate division by a number from 1 to 64.
+//  for (int i = 0; i < 64; i++) divlookup[i] = (1 << 24) / (i + 1);
+const DIVLOOKUP: [u32; 64] = [
+    16777216, 8388608, 5592405, 4194304, 3355443, 2796202, 2396745, 2097152, 1864135, 1677721,
+    1525201, 1398101, 1290555, 1198372, 1118481, 1048576, 986895, 932067, 883011, 838860, 798915,
+    762600, 729444, 699050, 671088, 645277, 621378, 599186, 578524, 559240, 541200, 524288, 508400,
+    493447, 479349, 466033, 453438, 441505, 430185, 419430, 409200, 399457, 390167, 381300, 372827,
+    364722, 356962, 349525, 342392, 335544, 328965, 322638, 316551, 310689, 305040, 299593, 294337,
+    289262, 284359, 279620, 275036, 270600, 266305, 262144,
+];
+
+#[inline(always)]
+fn add_bits(x: i32) -> i64 {
+    (x as i64) << PRED_EXTRA_BITS
+}
+
+#[inline(always)]
+fn error_weight(x: u32, maxweight: u32) -> u32 {
+    let shift = floor_log2_nonzero(x as u64 + 1) as i32 - 5;
+    if shift < 0 {
+        4u32 + maxweight * DIVLOOKUP[x as usize & 63]
+    } else {
+        4u32 + ((maxweight * DIVLOOKUP[(x as usize >> shift) & 63]) >> shift)
+    }
+}
+
+#[inline(always)]
+fn weighted_average(pixels: &[i64; NUM_PREDICTORS], weights: &mut [u32; NUM_PREDICTORS]) -> i64 {
+    let log_weight = floor_log2_nonzero(weights.iter().fold(0u64, |sum, el| sum + *el as u64));
+    let weight_sum = weights.iter_mut().fold(0, |sum, el| {
+        *el >>= log_weight - 4;
+        sum + *el
+    });
+    let sum = weights
+        .iter()
+        .enumerate()
+        .fold(((weight_sum >> 1) - 1) as i64, |sum, (i, weight)| {
+            sum + pixels[i] * *weight as i64
+        });
+    (sum * DIVLOOKUP[(weight_sum - 1) as usize] as i64) >> 24
+}
+
+#[derive(Debug)]
+pub struct WeightedPredictorState {
+    prediction: [i64; NUM_PREDICTORS],
+    pred: i64,
+    // Position-major layout: errors for same position are contiguous
+    // Layout: [pos0: p0,p1,p2,p3] [pos1: p0,p1,p2,p3] ...
+    pred_errors_buffer: Vec<u32>,
+    error: Vec<i32>,
+    wp_header: WeightedHeader,
+}
+
+impl WeightedPredictorState {
+    pub fn new(wp_header: &WeightedHeader, xsize: usize) -> Result<WeightedPredictorState> {
+        let num_errors = (xsize + 2) * 2;
+        Ok(WeightedPredictorState {
+            prediction: [0; NUM_PREDICTORS],
+            pred: 0,
+            // Position-major layout: errors for same position are contiguous
+            // Layout: [pos0: p0,p1,p2,p3] [pos1: p0,p1,p2,p3] ...
+            // This gives better cache locality when accessing all predictors for a position
+            pred_errors_buffer: Vec::try_from_elem(0u32, num_errors * NUM_PREDICTORS)?,
+            error: Vec::try_from_elem(0i32, num_errors)?,
+            wp_header: wp_header.clone(),
+        })
+    }
+
+    /// Get all predictor errors for a given position (contiguous in memory)
+    #[inline(always)]
+    fn get_errors_at_pos(&self, pos: usize) -> &[u32; NUM_PREDICTORS] {
+        // Layout: position-major, NUM_PREDICTORS elements per position.
+        // Using array_chunks avoids try_into().unwrap() overhead on every call.
+        let start = pos * NUM_PREDICTORS;
+        self.pred_errors_buffer[start..start + NUM_PREDICTORS]
+            .first_chunk()
+            .unwrap()
+    }
+
+    /// Get mutable reference to all predictor errors for a given position
+    #[inline(always)]
+    fn get_errors_at_pos_mut(&mut self, pos: usize) -> &mut [u32; NUM_PREDICTORS] {
+        let start = pos * NUM_PREDICTORS;
+        self.pred_errors_buffer[start..start + NUM_PREDICTORS]
+            .first_chunk_mut()
+            .unwrap()
+    }
+
+    pub fn save_state(&self, wp_image: &mut Image<i32>, xsize: usize) {
+        wp_image
+            .row_mut(0)
+            .copy_from_slice(&self.error[xsize + 2..]);
+    }
+
+    pub fn restore_state(&mut self, wp_image: &Image<i32>, xsize: usize) {
+        self.error[xsize + 2..].copy_from_slice(wp_image.row(0));
+    }
+
+    #[inline(always)]
+    pub fn update_errors(&mut self, correct_val: i32, pos: (usize, usize), xsize: usize) {
+        let (cur_row, prev_row) = if pos.1 & 1 != 0 {
+            (0, xsize + 2)
+        } else {
+            (xsize + 2, 0)
+        };
+        let val = add_bits(correct_val);
+        self.error[cur_row + pos.0] = (self.pred - val) as i32;
+
+        // Compute errors for all predictors
+        let mut errs = [0u32; NUM_PREDICTORS];
+        for (err, &pred) in errs.iter_mut().zip(self.prediction.iter()) {
+            *err = (((pred - val).abs() + PREDICTION_ROUND) >> PRED_EXTRA_BITS) as u32;
+        }
+
+        // Write to current position (contiguous access)
+        *self.get_errors_at_pos_mut(cur_row + pos.0) = errs;
+
+        // Update previous row position (contiguous access)
+        let prev_errors = self.get_errors_at_pos_mut(prev_row + pos.0 + 1);
+        for i in 0..NUM_PREDICTORS {
+            prev_errors[i] = prev_errors[i].wrapping_add(errs[i]);
+        }
+    }
+
+    #[inline(always)]
+    pub fn predict_and_property(
+        &mut self,
+        pos: (usize, usize),
+        xsize: usize,
+        data: &PredictionData,
+    ) -> (i64, i32) {
+        let (cur_row, prev_row) = if pos.1 & 1 != 0 {
+            (0, xsize + 2)
+        } else {
+            (xsize + 2, 0)
+        };
+        let pos_n = prev_row + pos.0;
+        let pos_ne = if pos.0 < xsize - 1 { pos_n + 1 } else { pos_n };
+        let pos_nw = if pos.0 > 0 { pos_n - 1 } else { pos_n };
+        // Get errors at the 3 neighboring positions (contiguous access per position)
+        let errors_n = self.get_errors_at_pos(pos_n);
+        let errors_ne = self.get_errors_at_pos(pos_ne);
+        let errors_nw = self.get_errors_at_pos(pos_nw);
+
+        let mut weights = [0u32; NUM_PREDICTORS];
+        for i in 0..NUM_PREDICTORS {
+            weights[i] = error_weight(
+                errors_n[i]
+                    .wrapping_add(errors_ne[i])
+                    .wrapping_add(errors_nw[i]),
+                self.wp_header.w(i).unwrap(),
+            );
+        }
+        let n = add_bits(data.top);
+        let w = add_bits(data.left);
+        let ne = add_bits(data.topright);
+        let nw = add_bits(data.topleft);
+        let nn = add_bits(data.toptop);
+
+        let te_w = if pos.0 == 0 {
+            0
+        } else {
+            self.error[cur_row + pos.0 - 1] as i64
+        };
+        let te_n = self.error[pos_n] as i64;
+        let te_nw = self.error[pos_nw] as i64;
+        let sum_wn = te_n + te_w;
+        let te_ne = self.error[pos_ne] as i64;
+
+        let mut p = te_w;
+        if te_n.abs() > p.abs() {
+            p = te_n;
+        }
+        if te_nw.abs() > p.abs() {
+            p = te_nw;
+        }
+        if te_ne.abs() > p.abs() {
+            p = te_ne;
+        }
+
+        self.prediction[0] = w + ne - n;
+        self.prediction[1] = n - (((sum_wn + te_ne) * self.wp_header.p1c as i64) >> 5);
+        self.prediction[2] = w - (((sum_wn + te_nw) * self.wp_header.p2c as i64) >> 5);
+        self.prediction[3] = n
+            - ((te_nw * (self.wp_header.p3ca as i64)
+                + (te_n * (self.wp_header.p3cb as i64))
+                + (te_ne * (self.wp_header.p3cc as i64))
+                + ((nn - n) * (self.wp_header.p3cd as i64))
+                + ((nw - w) * (self.wp_header.p3ce as i64)))
+                >> 5);
+
+        self.pred = weighted_average(&self.prediction, &mut weights);
+
+        if ((te_n ^ te_w) | (te_n ^ te_nw)) <= 0 {
+            let mx = w.max(ne.max(n));
+            let mn = w.min(ne.min(n));
+            self.pred = mn.max(mx.min(self.pred));
+        }
+        ((self.pred + PREDICTION_ROUND) >> PRED_EXTRA_BITS, p as i32)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::headers::modular::{GroupHeader, WeightedHeader};
+
+    use super::{PredictionData, WeightedPredictorState};
+
+    struct SimpleRandom {
+        out: i64,
+    }
+
+    impl SimpleRandom {
+        fn new() -> SimpleRandom {
+            SimpleRandom { out: 1 }
+        }
+        fn next(&mut self) -> i64 {
+            self.out = self.out * 48271 % 0x7fffffff;
+            self.out
+        }
+    }
+
+    fn step(
+        rng: &mut SimpleRandom,
+        state: &mut WeightedPredictorState,
+        xsize: usize,
+        ysize: usize,
+    ) -> (i64, i32) {
+        let pos = (rng.next() as usize % xsize, rng.next() as usize % ysize);
+        let res = state.predict_and_property(
+            pos,
+            xsize,
+            &PredictionData {
+                top: rng.next() as i32 % 256,
+                left: rng.next() as i32 % 256,
+                topright: rng.next() as i32 % 256,
+                topleft: rng.next() as i32 % 256,
+                toptop: rng.next() as i32 % 256,
+                leftleft: 0,
+                toprightright: 0,
+            },
+        );
+        state.update_errors((rng.next() % 256) as i32, pos, xsize);
+        res
+    }
+
+    #[test]
+    fn predict_and_update_errors() {
+        let mut rng = SimpleRandom::new();
+        let header = GroupHeader {
+            use_global_tree: false,
+            wp_header: WeightedHeader {
+                all_default: true,
+                p1c: rng.next() as u32 % 32,
+                p2c: rng.next() as u32 % 32,
+                p3ca: rng.next() as u32 % 32,
+                p3cb: rng.next() as u32 % 32,
+                p3cc: rng.next() as u32 % 32,
+                p3cd: rng.next() as u32 % 32,
+                p3ce: rng.next() as u32 % 32,
+                w0: rng.next() as u32 % 16,
+                w1: rng.next() as u32 % 16,
+                w2: rng.next() as u32 % 16,
+                w3: rng.next() as u32 % 16,
+            },
+            transforms: Vec::new(),
+        };
+        let xsize = 8;
+        let ysize = 8;
+        let mut state = WeightedPredictorState::new(&header.wp_header, xsize).unwrap();
+        // The golden number results are generated by using the libjxl predictor with the same input numbers.
+        assert_eq!(step(&mut rng, &mut state, xsize, ysize), (135i64, 0i32));
+        assert_eq!(step(&mut rng, &mut state, xsize, ysize), (110i64, -60i32));
+        assert_eq!(step(&mut rng, &mut state, xsize, ysize), (165i64, 0i32));
+        assert_eq!(step(&mut rng, &mut state, xsize, ysize), (153i64, -60i32));
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/apply.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/apply.rs
new file mode 100644
index 00000000..454d23f0
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/apply.rs
@@ -0,0 +1,1007 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use num_traits::FromPrimitive;
+
+use crate::{
+    error::{Error, Result},
+    frame::modular::{
+        ChannelInfo, ModularBufferInfo, ModularChannel, ModularGridKind, Predictor,
+        borrowed_buffers::with_buffers,
+    },
+    headers::{
+        self,
+        frame_header::FrameHeader,
+        modular::{TransformId, WeightedHeader},
+    },
+    image::Rect,
+    util::{AtomicRef, AtomicRefMut, tracing_wrappers::*},
+};
+use std::ops::Deref;
+use std::ops::DerefMut;
+
+use super::{RctOp, RctPermutation};
+
+#[derive(Debug, Clone)]
+pub enum TransformStep {
+    Rct {
+        buf_in: [usize; 3],
+        buf_out: [usize; 3],
+        op: RctOp,
+        perm: RctPermutation,
+    },
+    Palette {
+        buf_in: usize,
+        buf_pal: usize,
+        buf_out: Vec<usize>,
+        num_colors: usize,
+        num_deltas: usize,
+        predictor: Predictor,
+        wp_header: WeightedHeader,
+    },
+    HSqueeze {
+        buf_in: [usize; 2],
+        buf_out: usize,
+    },
+    VSqueeze {
+        buf_in: [usize; 2],
+        buf_out: usize,
+    },
+}
+
+#[derive(Debug)]
+pub struct TransformStepChunk {
+    pub(super) step: TransformStep,
+
+    // Grid position this transform should produce.
+    // Note that this is a lie for Palette with AverageAll or Weighted, as the transform with
+    // position (0, y) will produce the entire row of blocks (*, y) (and there will be no
+    // transforms with position (x, y) with x > 0).
+    pub(super) grid_pos: (usize, usize),
+
+    // List of (buffer, grid) that this transform depends on.
+    pub(in super::super) deps: Vec<(usize, usize)>,
+
+    // Processing layer that this transform belongs to. Layer 0 are transforms
+    // that only depend on coded channels, layer 1 are transforms that only
+    // depend on coded channels and layer 0 outputs, etc. Since transforms
+    // in the same layer have no inter-dependencies, they can be run at the
+    // same time.
+    pub(in super::super) layer: usize,
+}
+
+impl TransformStepChunk {
+    fn buf_out(&self) -> &[usize] {
+        match &self.step {
+            TransformStep::Rct { buf_out, .. } => buf_out,
+            TransformStep::Palette { buf_out, .. } => buf_out,
+            TransformStep::HSqueeze { buf_out, .. } | TransformStep::VSqueeze { buf_out, .. } => {
+                std::slice::from_ref(buf_out)
+            }
+        }
+    }
+
+    // Runs this transform. This function *will* crash if the transform is not ready.
+    #[instrument(level = "trace", skip_all)]
+    pub fn do_run(
+        &self,
+        frame_header: &FrameHeader,
+        buffers: &[ModularBufferInfo],
+        is_final: bool,
+    ) -> Result<()> {
+        let buf_out = self.buf_out();
+        let out_grid_kind = buffers[buf_out[0]].grid_kind;
+        let out_grid = buffers[buf_out[0]].get_grid_idx(out_grid_kind, self.grid_pos);
+        let out_size = buffers[buf_out[0]].info.size;
+        for bo in buf_out {
+            assert_eq!(out_grid_kind, buffers[*bo].grid_kind);
+            assert_eq!(out_size, buffers[*bo].info.size);
+        }
+
+        match &self.step {
+            TransformStep::Rct {
+                buf_in,
+                buf_out,
+                op,
+                perm,
+            } => {
+                for i in 0..3 {
+                    assert_eq!(out_grid_kind, buffers[buf_in[i]].grid_kind);
+                    assert_eq!(out_size, buffers[buf_in[i]].info.size);
+                    // Optimistically move the buffers to the output if possible.
+                    // If not, creates buffers in the output that are a copy of the input buffers.
+                    // This should be rare.
+                    *buffers[buf_out[i]].buffer_grid[out_grid].data.borrow_mut() =
+                        Some(buffers[buf_in[i]].buffer_grid[out_grid].get_buffer(is_final)?);
+                }
+                with_buffers(buffers, buf_out, out_grid, |mut bufs| {
+                    super::rct::do_rct_step(&mut bufs, *op, *perm);
+                    Ok(())
+                })?;
+            }
+            TransformStep::Palette {
+                buf_in,
+                buf_pal,
+                buf_out,
+                ..
+            } if buffers[*buf_in].info.size.0 == 0 => {
+                // Nothing to do, just bookkeeping.
+                buffers[*buf_in].buffer_grid[out_grid].mark_used(is_final);
+                buffers[*buf_pal].buffer_grid[0].mark_used(is_final);
+                with_buffers(buffers, buf_out, out_grid, |_| Ok(()))?;
+            }
+            TransformStep::Palette {
+                buf_in,
+                buf_pal,
+                buf_out,
+                num_colors,
+                num_deltas,
+                predictor,
+                ..
+            } if !predictor.requires_full_row() => {
+                assert_eq!(out_grid_kind, buffers[*buf_in].grid_kind);
+                assert_eq!(out_size, buffers[*buf_in].info.size);
+
+                {
+                    let img_in =
+                        AtomicRef::map(buffers[*buf_in].buffer_grid[out_grid].data.borrow(), |x| {
+                            x.as_ref().unwrap()
+                        });
+                    let img_pal =
+                        AtomicRef::map(buffers[*buf_pal].buffer_grid[0].data.borrow(), |x| {
+                            x.as_ref().unwrap()
+                        });
+                    // Ensure that the output buffers are present.
+                    // TODO(szabadka): Extend the callback to support many grid points.
+                    with_buffers(buffers, buf_out, out_grid, |_| Ok(()))?;
+                    let grid_shape = buffers[buf_out[0]].grid_shape;
+                    let grid_x = out_grid % grid_shape.0;
+                    let grid_y = out_grid / grid_shape.0;
+                    let border = if *predictor == Predictor::Zero { 0 } else { 1 };
+                    let grid_x0 = grid_x.saturating_sub(border);
+                    let grid_y0 = grid_y.saturating_sub(border);
+                    let grid_x1 = grid_x + 1;
+                    let grid_y1 = grid_y + 1;
+                    let mut out_bufs = vec![];
+                    for i in buf_out {
+                        for gy in grid_y0..grid_y1 {
+                            for gx in grid_x0..grid_x1 {
+                                let grid = gy * grid_shape.0 + gx;
+                                let buf = &buffers[*i];
+                                let b = &buf.buffer_grid[grid];
+                                let data = b.data.borrow_mut();
+                                out_bufs.push(AtomicRefMut::map(data, |x| x.as_mut().unwrap()));
+                            }
+                        }
+                    }
+                    let mut out_buf_refs: Vec<&mut ModularChannel> =
+                        out_bufs.iter_mut().map(|x| x.deref_mut()).collect();
+                    super::palette::do_palette_step_one_group(
+                        &img_in,
+                        &img_pal,
+                        &mut out_buf_refs,
+                        grid_x - grid_x0,
+                        grid_y - grid_y0,
+                        grid_x1 - grid_x0,
+                        grid_y1 - grid_y0,
+                        *num_colors,
+                        *num_deltas,
+                        *predictor,
+                    );
+                }
+                buffers[*buf_in].buffer_grid[out_grid].mark_used(is_final);
+                buffers[*buf_pal].buffer_grid[0].mark_used(is_final);
+            }
+            TransformStep::Palette {
+                buf_in,
+                buf_pal,
+                buf_out,
+                num_colors,
+                num_deltas,
+                predictor,
+                wp_header,
+            } => {
+                assert_eq!(out_grid_kind, buffers[*buf_in].grid_kind);
+                assert_eq!(out_size, buffers[*buf_in].info.size);
+                let grid_shape = buffers[buf_out[0]].grid_shape;
+                {
+                    assert_eq!(out_grid % grid_shape.0, 0);
+                    let grid_y = out_grid / grid_shape.0;
+                    let grid_y0 = grid_y.saturating_sub(1);
+                    let grid_y1 = grid_y + 1;
+                    let mut in_bufs = vec![];
+                    for grid_x in 0..grid_shape.0 {
+                        let grid = grid_y * grid_shape.0 + grid_x;
+                        in_bufs.push(AtomicRef::map(
+                            buffers[*buf_in].buffer_grid[grid].data.borrow(),
+                            |x| x.as_ref().unwrap(),
+                        ));
+                        // Ensure that the output buffers are present.
+                        // TODO(szabadka): Extend the callback to support many grid points.
+                        with_buffers(buffers, buf_out, out_grid + grid_x, |_| Ok(()))?;
+                    }
+                    let in_buf_refs: Vec<&ModularChannel> =
+                        in_bufs.iter().map(|x| x.deref()).collect();
+                    let img_pal =
+                        AtomicRef::map(buffers[*buf_pal].buffer_grid[0].data.borrow(), |x| {
+                            x.as_ref().unwrap()
+                        });
+                    let mut out_bufs = vec![];
+                    for i in buf_out {
+                        for grid_y in grid_y0..grid_y1 {
+                            for grid_x in 0..grid_shape.0 {
+                                let grid = grid_y * grid_shape.0 + grid_x;
+                                let buf = &buffers[*i];
+                                let b = &buf.buffer_grid[grid];
+                                let data = b.data.borrow_mut();
+                                out_bufs.push(AtomicRefMut::map(data, |x| x.as_mut().unwrap()));
+                            }
+                        }
+                    }
+                    let mut out_buf_refs: Vec<&mut ModularChannel> =
+                        out_bufs.iter_mut().map(|x| x.deref_mut()).collect();
+                    super::palette::do_palette_step_group_row(
+                        &in_buf_refs,
+                        &img_pal,
+                        &mut out_buf_refs,
+                        grid_y - grid_y0,
+                        grid_shape.0,
+                        *num_colors,
+                        *num_deltas,
+                        *predictor,
+                        wp_header,
+                    )?;
+                }
+                buffers[*buf_pal].buffer_grid[0].mark_used(is_final);
+                for grid_x in 0..grid_shape.0 {
+                    buffers[*buf_in].buffer_grid[out_grid + grid_x].mark_used(is_final);
+                }
+            }
+            TransformStep::HSqueeze { buf_in, buf_out } => {
+                let buf_avg = &buffers[buf_in[0]];
+                let buf_res = &buffers[buf_in[1]];
+                let in_grid = buf_avg.get_grid_idx(out_grid_kind, self.grid_pos);
+                let res_grid = buf_res.get_grid_idx(out_grid_kind, self.grid_pos);
+                {
+                    trace!(
+                        "HSqueeze {:?} -> {:?}, grid {out_grid} grid pos {:?}",
+                        buf_in, buf_out, self.grid_pos
+                    );
+                    let (gx, gy) = self.grid_pos;
+                    let in_avg = AtomicRef::map(buf_avg.buffer_grid[in_grid].data.borrow(), |x| {
+                        x.as_ref().unwrap()
+                    });
+                    let has_next = gx + 1 < buffers[*buf_out].grid_shape.0;
+                    let gx_next = if has_next { gx + 1 } else { gx };
+                    let next_avg_grid = buf_avg.get_grid_idx(out_grid_kind, (gx_next, gy));
+                    let in_next_avg =
+                        AtomicRef::map(buf_avg.buffer_grid[next_avg_grid].data.borrow(), |x| {
+                            x.as_ref().unwrap()
+                        });
+                    let in_next_avg_rect = if has_next {
+                        Some(in_next_avg.data.get_rect(buf_avg.get_grid_rect(
+                            frame_header,
+                            out_grid_kind,
+                            (gx_next, gy),
+                        )))
+                    } else {
+                        None
+                    };
+                    let in_res = AtomicRef::map(buf_res.buffer_grid[res_grid].data.borrow(), |x| {
+                        x.as_ref().unwrap()
+                    });
+                    let out_prev = if gx == 0 {
+                        None
+                    } else {
+                        let prev_out_grid =
+                            buffers[*buf_out].get_grid_idx(out_grid_kind, (gx - 1, gy));
+                        Some(AtomicRef::map(
+                            buffers[*buf_out].buffer_grid[prev_out_grid].data.borrow(),
+                            |x| x.as_ref().unwrap(),
+                        ))
+                    };
+
+                    with_buffers(buffers, &[*buf_out], out_grid, |mut bufs| {
+                        super::squeeze::do_hsqueeze_step(
+                            &in_avg.data.get_rect(buf_avg.get_grid_rect(
+                                frame_header,
+                                out_grid_kind,
+                                (gx, gy),
+                            )),
+                            &in_res.data.get_rect(buf_res.get_grid_rect(
+                                frame_header,
+                                out_grid_kind,
+                                (gx, gy),
+                            )),
+                            &in_next_avg_rect,
+                            &out_prev,
+                            &mut bufs,
+                        );
+                        Ok(())
+                    })?;
+                }
+                buffers[buf_in[0]].buffer_grid[in_grid].mark_used(is_final);
+                buffers[buf_in[1]].buffer_grid[res_grid].mark_used(is_final);
+            }
+            TransformStep::VSqueeze { buf_in, buf_out } => {
+                let buf_avg = &buffers[buf_in[0]];
+                let buf_res = &buffers[buf_in[1]];
+                let in_grid = buf_avg.get_grid_idx(out_grid_kind, self.grid_pos);
+                let res_grid = buf_res.get_grid_idx(out_grid_kind, self.grid_pos);
+                {
+                    trace!(
+                        "VSqueeze {:?} -> {:?} grid: {out_grid:?} grid pos: {:?}",
+                        buf_in, buf_out, self.grid_pos
+                    );
+                    let (gx, gy) = self.grid_pos;
+                    let in_avg = AtomicRef::map(buf_avg.buffer_grid[in_grid].data.borrow(), |x| {
+                        x.as_ref().unwrap()
+                    });
+                    let has_next = gy + 1 < buffers[*buf_out].grid_shape.1;
+                    let gy_next = if has_next { gy + 1 } else { gy };
+                    let next_avg_grid = buf_avg.get_grid_idx(out_grid_kind, (gx, gy_next));
+                    let in_next_avg =
+                        AtomicRef::map(buf_avg.buffer_grid[next_avg_grid].data.borrow(), |x| {
+                            x.as_ref().unwrap()
+                        });
+                    let in_next_avg_rect = if has_next {
+                        Some(in_next_avg.data.get_rect(buf_avg.get_grid_rect(
+                            frame_header,
+                            out_grid_kind,
+                            (gx, gy_next),
+                        )))
+                    } else {
+                        None
+                    };
+                    let in_res = AtomicRef::map(buf_res.buffer_grid[res_grid].data.borrow(), |x| {
+                        x.as_ref().unwrap()
+                    });
+                    let out_prev = if gy == 0 {
+                        None
+                    } else {
+                        let prev_out_grid =
+                            buffers[*buf_out].get_grid_idx(out_grid_kind, (gx, gy - 1));
+                        Some(AtomicRef::map(
+                            buffers[*buf_out].buffer_grid[prev_out_grid].data.borrow(),
+                            |x| x.as_ref().unwrap(),
+                        ))
+                    };
+                    let avg_grid_rect =
+                        buf_avg.get_grid_rect(frame_header, out_grid_kind, (gx, gy));
+                    let res_grid_rect =
+                        buf_res.get_grid_rect(frame_header, out_grid_kind, (gx, gy));
+                    with_buffers(buffers, &[*buf_out], out_grid, |mut bufs| {
+                        super::squeeze::do_vsqueeze_step(
+                            &in_avg.data.get_rect(avg_grid_rect),
+                            &in_res.data.get_rect(res_grid_rect),
+                            &in_next_avg_rect,
+                            &out_prev,
+                            &mut bufs,
+                        );
+                        Ok(())
+                    })?;
+                }
+                buffers[buf_in[0]].buffer_grid[in_grid].mark_used(is_final);
+                buffers[buf_in[1]].buffer_grid[res_grid].mark_used(is_final);
+            }
+        };
+
+        Ok(())
+    }
+
+    // Iterates over the list of outputs for this transform.
+    pub fn outputs(&self, buffers: &[ModularBufferInfo]) -> impl Iterator<Item = (usize, usize)> {
+        let buf_out = self.buf_out();
+        let out_grid_kind = buffers[buf_out[0]].grid_kind;
+        let out_grid = buffers[buf_out[0]].get_grid_idx(out_grid_kind, self.grid_pos);
+        let grid_offset_up = match &self.step {
+            TransformStep::Palette {
+                buf_in,
+                buf_out,
+                predictor,
+                ..
+            } if buffers[*buf_in].info.size.0 != 0 && predictor.requires_full_row() => {
+                buffers[buf_out[0]].grid_shape.0
+            }
+            _ => 1,
+        };
+
+        buf_out
+            .iter()
+            .flat_map(move |x| (0..grid_offset_up).map(move |y| (*x, out_grid + y)))
+    }
+}
+
+#[instrument(level = "trace", err)]
+fn check_equal_channels(
+    channels: &[(usize, ChannelInfo)],
+    first_chan: usize,
+    num: usize,
+) -> Result<()> {
+    if first_chan + num > channels.len() {
+        return Err(Error::InvalidChannelRange(
+            first_chan,
+            first_chan + num,
+            channels.len(),
+        ));
+    }
+    for inc in 1..num {
+        if !channels[first_chan]
+            .1
+            .is_equivalent(&channels[first_chan + inc].1)
+        {
+            return Err(Error::MixingDifferentChannels);
+        }
+    }
+    Ok(())
+}
+
+fn meta_apply_single_transform(
+    transform: &headers::modular::Transform,
+    header: &headers::modular::GroupHeader,
+    channels: &mut Vec<(usize, ChannelInfo)>,
+    transform_steps: &mut Vec<TransformStep>,
+    mut add_transform_buffer: impl FnMut(ChannelInfo, String) -> usize,
+) -> Result<()> {
+    match transform.id {
+        TransformId::Rct => {
+            let begin_channel = transform.begin_channel as usize;
+            let op = RctOp::from_u32(transform.rct_type % 7).unwrap();
+            let perm = RctPermutation::from_u32(transform.rct_type / 7)
+                .expect("header decoding should ensure rct_type < 42");
+            check_equal_channels(channels, begin_channel, 3)?;
+            let mut buf_in = [0; 3];
+            let buf_out = [
+                channels[begin_channel].0,
+                channels[begin_channel + 1].0,
+                channels[begin_channel + 2].0,
+            ];
+            for i in 0..3 {
+                let c = &mut channels[begin_channel + i];
+                let mut info = c.1;
+                info.output_channel_idx = None;
+                c.0 = add_transform_buffer(
+                    info,
+                    format!(
+                        "RCT (op {op:?} perm {perm:?}) starting at channel {begin_channel}, \
+			 input {i}"
+                    ),
+                );
+                buf_in[i] = c.0;
+            }
+            transform_steps.push(TransformStep::Rct {
+                buf_out,
+                buf_in,
+                op,
+                perm,
+            });
+            trace!("applied RCT: {channels:?}");
+        }
+        TransformId::Squeeze => {
+            let steps = if transform.squeezes.is_empty() {
+                super::squeeze::default_squeeze(channels)
+            } else {
+                transform.squeezes.clone()
+            };
+            for step in steps {
+                super::squeeze::check_squeeze_params(channels, &step)?;
+                let in_place = step.in_place;
+                let horizontal = step.horizontal;
+                let begin_channel = step.begin_channel as usize;
+                let num_channels = step.num_channels as usize;
+                let end_channel = begin_channel + num_channels;
+                let new_chan_offset = if in_place {
+                    end_channel
+                } else {
+                    channels.len()
+                };
+                for ic in 0..num_channels {
+                    let chan = &channels[begin_channel + ic].1;
+                    let new_shift = if let Some(shift) = chan.shift {
+                        if shift.0 > 30 || shift.1 > 30 {
+                            return Err(Error::TooManySqueezes);
+                        }
+                        if horizontal {
+                            Some((shift.0 + 1, shift.1))
+                        } else {
+                            Some((shift.0, shift.1 + 1))
+                        }
+                    } else {
+                        None
+                    };
+                    let w = chan.size.0;
+                    let h = chan.size.1;
+                    let (new_size_0, new_size_1) = if horizontal {
+                        ((w.div_ceil(2), h), (w - w.div_ceil(2), h))
+                    } else {
+                        ((w, h.div_ceil(2)), (w, h - h.div_ceil(2)))
+                    };
+                    let new_0 = ChannelInfo {
+                        output_channel_idx: None,
+                        shift: new_shift,
+                        size: new_size_0,
+                        bit_depth: chan.bit_depth,
+                    };
+                    let buf_0 = add_transform_buffer(
+                        new_0,
+                        format!("Squeezed channel, original channel {}", begin_channel + ic),
+                    );
+                    let new_1 = ChannelInfo {
+                        output_channel_idx: None,
+                        shift: new_shift,
+                        size: new_size_1,
+                        bit_depth: chan.bit_depth,
+                    };
+                    let buf_1 = add_transform_buffer(
+                        new_1,
+                        format!("Squeeze residual, original channel {}", begin_channel + ic),
+                    );
+                    if horizontal {
+                        transform_steps.push(TransformStep::HSqueeze {
+                            buf_in: [buf_0, buf_1],
+                            buf_out: channels[begin_channel + ic].0,
+                        });
+                    } else {
+                        transform_steps.push(TransformStep::VSqueeze {
+                            buf_in: [buf_0, buf_1],
+                            buf_out: channels[begin_channel + ic].0,
+                        });
+                    }
+                    channels[begin_channel + ic] = (buf_0, new_0);
+                    channels.insert(new_chan_offset + ic, (buf_1, new_1));
+                    trace!("applied squeeze: {channels:?}");
+                }
+            }
+        }
+        TransformId::Palette => {
+            let begin_channel = transform.begin_channel as usize;
+            let num_channels = transform.num_channels as usize;
+            let num_colors = transform.num_colors as usize;
+            let num_deltas = transform.num_deltas as usize;
+            let pred = Predictor::from_u32(transform.predictor_id)
+                .expect("header decoding should ensure a valid predictor");
+            check_equal_channels(channels, begin_channel, num_channels)?;
+            // We already checked the bit_depth for all channels from `begin_channel` is
+            // equal in the line above.
+            let bit_depth = channels[begin_channel].1.bit_depth;
+            let pchan_info = ChannelInfo {
+                output_channel_idx: None,
+                shift: None,
+                size: (num_colors + num_deltas, num_channels),
+                bit_depth,
+            };
+            let pchan = add_transform_buffer(
+                pchan_info,
+                format!(
+                    "Palette for palette transform starting at channel {begin_channel} with \
+		     {num_channels} channels"
+                ),
+            );
+            let mut inchan_info = channels[begin_channel].1;
+            inchan_info.output_channel_idx = None;
+            let inchan = add_transform_buffer(
+                inchan_info,
+                format!(
+                    "Pixel data for palette transform starting at channel {begin_channel} with \
+		     {num_channels} channels",
+                ),
+            );
+            transform_steps.push(TransformStep::Palette {
+                buf_in: inchan,
+                buf_pal: pchan,
+                buf_out: channels[begin_channel..(begin_channel + num_channels)]
+                    .iter()
+                    .map(|x| x.0)
+                    .collect(),
+                num_colors,
+                num_deltas,
+                predictor: pred,
+                wp_header: header.wp_header.clone(),
+            });
+            channels.drain(begin_channel + 1..begin_channel + num_channels);
+            channels[begin_channel].0 = inchan;
+            channels.insert(0, (pchan, pchan_info));
+            trace!("applied palette: {channels:?}");
+        }
+        TransformId::Invalid => {
+            unreachable!("header decoding for invalid transforms should fail");
+        }
+    }
+    Ok(())
+}
+
+#[instrument(level = "trace", ret)]
+pub fn meta_apply_transforms(
+    channels: &[ChannelInfo],
+    header: &headers::modular::GroupHeader,
+) -> Result<(Vec<ModularBufferInfo>, Vec<TransformStep>)> {
+    let mut buffer_info = vec![];
+    let mut transform_steps = vec![];
+    // (buffer id, channel info)
+    let mut channels: Vec<_> = channels.iter().cloned().enumerate().collect();
+
+    // First, add all the pre-transform channels to the buffer list.
+    for chan in channels.iter() {
+        buffer_info.push(ModularBufferInfo {
+            info: chan.1,
+            coded_channel_id: -1,
+            description: format!(
+                "Input channel {}, size {}x{}",
+                chan.0, chan.1.size.0, chan.1.size.1
+            ),
+            // To be filled by make_grids.
+            grid_kind: ModularGridKind::None,
+            grid_shape: (0, 0),
+            buffer_grid: vec![],
+        });
+    }
+
+    let mut add_transform_buffer = |info, description| {
+        buffer_info.push(ModularBufferInfo {
+            info,
+            coded_channel_id: -1,
+            description,
+            // To be filled by make_grids.
+            grid_kind: ModularGridKind::None,
+            grid_shape: (0, 0),
+            buffer_grid: vec![],
+        });
+        buffer_info.len() - 1
+    };
+
+    // Apply transforms to the channel list.
+    for transform in &header.transforms {
+        meta_apply_single_transform(
+            transform,
+            header,
+            &mut channels,
+            &mut transform_steps,
+            &mut add_transform_buffer,
+        )?;
+    }
+
+    // All the channels left over at the end of applying transforms are the channels that are
+    // actually coded.
+    for (chid, chan) in channels.iter().enumerate() {
+        buffer_info[chan.0].coded_channel_id = chid as isize;
+    }
+
+    #[cfg(feature = "tracing")]
+    for (i, transform) in transform_steps.iter().enumerate() {
+        trace!("Transform step {i}: {transform:?}");
+    }
+
+    Ok((buffer_info, transform_steps))
+}
+
+#[derive(Debug)]
+pub enum LocalTransformBuffer<'a> {
+    // This channel has been consumed by some transform.
+    Empty,
+    // This channel has not been written to yet.
+    Placeholder(ChannelInfo),
+    // Temporary, locally-allocated channel.
+    Owned(ModularChannel),
+    // Channel belonging to the global image.
+    Borrowed(&'a mut ModularChannel),
+}
+
+impl LocalTransformBuffer<'_> {
+    fn channel_info(&self) -> ChannelInfo {
+        match self {
+            LocalTransformBuffer::Empty => unreachable!("an empty buffer has no channel info"),
+            LocalTransformBuffer::Owned(m) => m.channel_info(),
+            LocalTransformBuffer::Placeholder(c) => *c,
+            LocalTransformBuffer::Borrowed(m) => m.channel_info(),
+        }
+    }
+
+    fn borrow_mut(&mut self) -> &mut ModularChannel {
+        match self {
+            LocalTransformBuffer::Owned(m) => m,
+            LocalTransformBuffer::Borrowed(m) => m,
+            LocalTransformBuffer::Empty => unreachable!("tried to borrow an empty channel"),
+            LocalTransformBuffer::Placeholder(_) => {
+                unreachable!("tried to borrow a placeholder channel")
+            }
+        }
+    }
+
+    fn take(&mut self) -> Self {
+        assert!(!matches!(self, LocalTransformBuffer::Empty));
+        let mut r = LocalTransformBuffer::Empty;
+        std::mem::swap(self, &mut r);
+        r
+    }
+
+    fn allocate_if_needed(&mut self) -> Result<()> {
+        if let LocalTransformBuffer::Placeholder(c) = self {
+            *self = LocalTransformBuffer::Owned(ModularChannel::new_with_shift(
+                c.size,
+                c.shift,
+                c.bit_depth,
+            )?);
+        }
+        Ok(())
+    }
+}
+
+#[instrument(level = "trace", ret)]
+pub fn meta_apply_local_transforms<'a, 'b>(
+    channels_in: Vec<&'a mut ModularChannel>,
+    buffer_storage: &'b mut Vec<LocalTransformBuffer<'a>>,
+    header: &headers::modular::GroupHeader,
+) -> Result<(Vec<&'b mut ModularChannel>, Vec<TransformStep>)> {
+    let mut transform_steps = vec![];
+
+    // (buffer id, channel info)
+    let mut channels: Vec<_> = channels_in
+        .iter()
+        .map(|x| x.channel_info())
+        .enumerate()
+        .collect();
+
+    debug!(?channels, "initial channels");
+
+    // First, add all the pre-transform channels to the buffer list.
+    buffer_storage.extend(channels_in.into_iter().map(LocalTransformBuffer::Borrowed));
+
+    #[allow(unused_variables)]
+    let mut add_transform_buffer = |info, description| {
+        trace!(description, ?info, "adding channel buffer");
+        buffer_storage.push(LocalTransformBuffer::Placeholder(info));
+        buffer_storage.len() - 1
+    };
+
+    // Apply transforms to the channel list.
+    for transform in &header.transforms {
+        meta_apply_single_transform(
+            transform,
+            header,
+            &mut channels,
+            &mut transform_steps,
+            &mut add_transform_buffer,
+        )?;
+    }
+
+    debug!(?channels, ?buffer_storage, "channels after transforms");
+    debug!(?transform_steps);
+
+    // Ensure that the buffer indices in `channels` appear in increasing order, by reordering them
+    // if necessary.
+    if !channels.iter().map(|x| x.0).is_sorted() {
+        let mut buf_new_position: Vec<_> = channels.iter().map(|x| x.0).collect();
+        buf_new_position.sort();
+        let buf_tmp: Vec<_> = channels
+            .iter()
+            .map(|x| {
+                let mut b = LocalTransformBuffer::Empty;
+                std::mem::swap(&mut b, &mut buffer_storage[x.0]);
+                b
+            })
+            .collect();
+
+        let mut buf_remap: Vec<_> = (0..buffer_storage.len()).collect();
+
+        for (new_pos, (ch_info, buf)) in buf_new_position
+            .iter()
+            .cloned()
+            .zip(channels.iter_mut().zip(buf_tmp))
+        {
+            assert!(matches!(
+                buffer_storage[new_pos],
+                LocalTransformBuffer::Empty
+            ));
+            buf_remap[ch_info.0] = new_pos;
+            buffer_storage[new_pos] = buf;
+            ch_info.0 = new_pos;
+        }
+
+        for step in transform_steps.iter_mut() {
+            use std::iter::once;
+            match step {
+                TransformStep::Rct {
+                    buf_in, buf_out, ..
+                } => {
+                    for b in buf_in.iter_mut().chain(buf_out.iter_mut()) {
+                        *b = buf_remap[*b];
+                    }
+                }
+                TransformStep::Palette {
+                    buf_in,
+                    buf_pal,
+                    buf_out,
+                    ..
+                } => {
+                    for b in once(buf_in).chain(once(buf_pal)).chain(buf_out.iter_mut()) {
+                        *b = buf_remap[*b];
+                    }
+                }
+                TransformStep::HSqueeze { buf_in, buf_out }
+                | TransformStep::VSqueeze { buf_in, buf_out } => {
+                    for b in once(buf_out).chain(buf_in.iter_mut()) {
+                        *b = buf_remap[*b];
+                    }
+                }
+            }
+        }
+    }
+
+    debug!(?channels, ?buffer_storage, "sorted channels");
+
+    debug!(?transform_steps);
+
+    // Since RCT steps will try to transfer buffers from the source channels to the destination
+    // channels, make sure we do the reverse transformation here (to have the caller-provided
+    // buffers be used for writing temporary data).
+    for ts in transform_steps.iter() {
+        if let TransformStep::Rct {
+            buf_in, buf_out, ..
+        } = ts
+        {
+            for c in 0..3 {
+                assert_eq!(
+                    buffer_storage[buf_in[c]].channel_info(),
+                    buffer_storage[buf_out[c]].channel_info()
+                );
+                assert!(matches!(
+                    buffer_storage[buf_in[c]],
+                    LocalTransformBuffer::Placeholder(_)
+                ));
+                buffer_storage.swap(buf_in[c], buf_out[c]);
+            }
+        }
+    }
+
+    debug!(?channels, ?buffer_storage, "RCT-adjusted channels");
+
+    // Allocate all the coded channels if they aren't yet.
+    for (buf, _) in channels.iter() {
+        buffer_storage[*buf].allocate_if_needed()?;
+    }
+
+    debug!(?channels, ?buffer_storage, "allocated buffers");
+
+    // Extract references to to-be-decoded buffers.
+    let mut coded_buffers = Vec::with_capacity(channels.len());
+    let mut buffer_tail = &mut buffer_storage[..];
+    let mut last_buffer = None;
+    for (buf, _) in channels {
+        let offset = if let Some(lb) = last_buffer {
+            buf.checked_sub(lb).unwrap()
+        } else {
+            buf + 1
+        };
+        let cur_buf;
+        (cur_buf, buffer_tail) = buffer_tail.split_at_mut(offset);
+        coded_buffers.push(cur_buf.last_mut().unwrap().borrow_mut());
+        last_buffer = Some(buf);
+    }
+
+    Ok((coded_buffers, transform_steps))
+}
+
+impl TransformStep {
+    // Marks that one dependency of this transform is ready, and potentially runs the transform,
+    // returning the new buffers that are now ready.
+    pub fn local_apply(&self, buffers: &mut [LocalTransformBuffer]) -> Result<()> {
+        match self {
+            TransformStep::Rct {
+                buf_in,
+                buf_out,
+                op,
+                perm,
+            } => {
+                for i in 0..3 {
+                    assert_eq!(
+                        buffers[buf_in[i]].channel_info(),
+                        buffers[buf_out[i]].channel_info()
+                    );
+                }
+                let [mut a, mut b, mut c] = [
+                    buffers[buf_in[0]].take(),
+                    buffers[buf_in[1]].take(),
+                    buffers[buf_in[2]].take(),
+                ];
+                {
+                    let mut bufs = [a.borrow_mut(), b.borrow_mut(), c.borrow_mut()];
+                    super::rct::do_rct_step(&mut bufs, *op, *perm);
+                }
+                buffers[buf_out[0]] = a;
+                buffers[buf_out[1]] = b;
+                buffers[buf_out[2]] = c;
+            }
+            TransformStep::Palette {
+                buf_in,
+                buf_pal,
+                buf_out,
+                num_colors,
+                num_deltas,
+                predictor,
+                wp_header,
+            } => {
+                for b in buf_out.iter() {
+                    assert_eq!(
+                        buffers[*b].channel_info().size,
+                        buffers[*buf_in].channel_info().size
+                    );
+                    buffers[*b].allocate_if_needed()?;
+                }
+                let mut img_in = buffers[*buf_in].take();
+                let mut img_pal = buffers[*buf_pal].take();
+                let mut out_bufs: Vec<_> = buf_out.iter().map(|x| buffers[*x].take()).collect();
+                {
+                    let mut bufs: Vec<_> = out_bufs.iter_mut().map(|x| x.borrow_mut()).collect();
+                    super::palette::do_palette_step_general(
+                        img_in.borrow_mut(),
+                        img_pal.borrow_mut(),
+                        &mut bufs,
+                        *num_colors,
+                        *num_deltas,
+                        *predictor,
+                        wp_header,
+                    )?;
+                }
+                for (pos, buf) in buf_out.iter().zip(out_bufs) {
+                    buffers[*pos] = buf;
+                }
+            }
+            TransformStep::HSqueeze { buf_in, buf_out } => {
+                buffers[*buf_out].allocate_if_needed()?;
+                let mut out_buf = buffers[*buf_out].take();
+                let mut in_avg = buffers[buf_in[0]].take();
+                let mut in_res = buffers[buf_in[1]].take();
+                {
+                    let mut bufs: Vec<_> = vec![out_buf.borrow_mut()];
+                    let in_avg = &in_avg.borrow_mut().data;
+                    let in_res = &in_res.borrow_mut().data;
+                    super::squeeze::do_hsqueeze_step(
+                        &in_avg.get_rect(Rect {
+                            size: in_avg.size(),
+                            origin: (0, 0),
+                        }),
+                        &in_res.get_rect(Rect {
+                            size: in_res.size(),
+                            origin: (0, 0),
+                        }),
+                        &None,
+                        &None,
+                        &mut bufs,
+                    );
+                }
+                buffers[*buf_out] = out_buf;
+            }
+            TransformStep::VSqueeze { buf_in, buf_out } => {
+                buffers[*buf_out].allocate_if_needed()?;
+                let mut out_buf = buffers[*buf_out].take();
+                let mut in_avg = buffers[buf_in[0]].take();
+                let mut in_res = buffers[buf_in[1]].take();
+                {
+                    let mut bufs: Vec<_> = vec![out_buf.borrow_mut()];
+                    let in_avg = &in_avg.borrow_mut().data;
+                    let in_res = &in_res.borrow_mut().data;
+                    super::squeeze::do_vsqueeze_step(
+                        &in_avg.get_rect(Rect {
+                            size: in_avg.size(),
+                            origin: (0, 0),
+                        }),
+                        &in_res.get_rect(Rect {
+                            size: in_res.size(),
+                            origin: (0, 0),
+                        }),
+                        &None,
+                        &None,
+                        &mut bufs,
+                    );
+                }
+                buffers[*buf_out] = out_buf;
+            }
+        };
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/mod.rs
new file mode 100644
index 00000000..6be51c22
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/mod.rs
@@ -0,0 +1,448 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
+
+use apply::TransformStep;
+pub use apply::TransformStepChunk;
+use num_derive::FromPrimitive;
+
+use crate::frame::modular::BUFFER_STATUS_NOT_RENDERED;
+use crate::frame::modular::ModularBuffer;
+use crate::headers::frame_header::FrameHeader;
+use crate::util::AtomicRefCell;
+use crate::util::tracing_wrappers::*;
+
+use super::{ModularBufferInfo, ModularGridKind, Predictor};
+
+pub(super) mod apply;
+mod palette;
+mod rct;
+mod squeeze;
+
+#[derive(Debug, FromPrimitive, PartialEq, Clone, Copy)]
+pub enum RctPermutation {
+    Rgb = 0,
+    Gbr = 1,
+    Brg = 2,
+    Rbg = 3,
+    Grb = 4,
+    Bgr = 5,
+}
+
+#[derive(Debug, FromPrimitive, PartialEq, Clone, Copy)]
+pub enum RctOp {
+    Noop = 0,
+    AddFirstToThird = 1,
+    AddFirstToSecond = 2,
+    AddFirstToSecondAndThird = 3,
+    AddAvgToSecond = 4,
+    AddFirstToThirdAndAvgToSecond = 5,
+    YCoCg = 6,
+}
+
+#[instrument(level = "trace", skip_all, ret)]
+pub fn make_grids(
+    frame_header: &FrameHeader,
+    transform_steps: Vec<TransformStep>,
+    section_buffer_indices: &[Vec<usize>],
+    buffer_info: &mut Vec<ModularBufferInfo>,
+) -> Vec<TransformStepChunk> {
+    // Initialize grid sizes, starting from coded channels.
+    for i in section_buffer_indices[1].iter() {
+        buffer_info[*i].grid_kind = ModularGridKind::Lf;
+    }
+    for buffer_indices in section_buffer_indices.iter().skip(2) {
+        for i in buffer_indices.iter() {
+            buffer_info[*i].grid_kind = ModularGridKind::Hf;
+        }
+    }
+
+    trace!(?buffer_info, "post set grid kind for coded channels");
+
+    // Transforms can be un-applied in the opposite order they appear with in the array,
+    // so we can use that information to propagate grid kinds.
+
+    for step in transform_steps.iter().rev() {
+        match step {
+            TransformStep::Rct {
+                buf_in, buf_out, ..
+            } => {
+                let grid_in = buffer_info[buf_in[0]].grid_kind;
+                for i in 0..3 {
+                    assert_eq!(grid_in, buffer_info[buf_in[i]].grid_kind);
+                }
+                for i in 0..3 {
+                    buffer_info[buf_out[i]].grid_kind = grid_in;
+                }
+            }
+            TransformStep::Palette {
+                buf_in, buf_out, ..
+            } => {
+                for buf in buf_out.iter() {
+                    buffer_info[*buf].grid_kind = buffer_info[*buf_in].grid_kind;
+                }
+            }
+            TransformStep::HSqueeze { buf_in, buf_out }
+            | TransformStep::VSqueeze { buf_in, buf_out } => {
+                let mut grid_kind = buffer_info[buf_in[0]]
+                    .grid_kind
+                    .max(buffer_info[buf_in[1]].grid_kind);
+                if grid_kind == ModularGridKind::None
+                    && !buffer_info[*buf_out]
+                        .info
+                        .is_meta_or_small(frame_header.group_dim())
+                {
+                    grid_kind = ModularGridKind::Hf;
+                }
+                buffer_info[*buf_out].grid_kind = grid_kind;
+            }
+        }
+    }
+
+    // Set grid shapes.
+    for buf in buffer_info.iter_mut() {
+        buf.grid_shape = buf.grid_kind.grid_shape(frame_header);
+    }
+
+    trace!(?buffer_info, "post propagate grid kind");
+
+    let get_grid_indices = |shape: (usize, usize)| {
+        (0..shape.1).flat_map(move |y| (0..shape.0).map(move |x| (x as isize, y as isize)))
+    };
+
+    // Create grids.
+    for g in buffer_info.iter_mut() {
+        let is_output = g.info.output_channel_idx.is_some();
+        g.buffer_grid = get_grid_indices(g.grid_shape)
+            .map(|(x, y)| ModularBuffer {
+                data: AtomicRefCell::new(None),
+                remaining_uses: AtomicUsize::new(if is_output { 1 } else { 0 }),
+                used_by_transforms_weak: vec![],
+                used_by_transforms_strong: vec![],
+                size: g
+                    .get_grid_rect(frame_header, g.grid_kind, (x as usize, y as usize))
+                    .size,
+                status: AtomicUsize::new(BUFFER_STATUS_NOT_RENDERED),
+            })
+            .collect();
+    }
+
+    trace!(?buffer_info, "with grids");
+
+    let add_transform_step =
+        |transform: &TransformStep,
+         grid_pos: (isize, isize),
+         grid_transform_steps: &mut Vec<TransformStepChunk>| {
+            let ts = grid_transform_steps.len();
+            grid_transform_steps.push(TransformStepChunk {
+                step: transform.clone(),
+                grid_pos: (grid_pos.0 as usize, grid_pos.1 as usize),
+                deps: vec![],
+                layer: 0,
+            });
+            ts
+        };
+
+    let add_grid_use = |ts: usize,
+                        input_buffer_idx: usize,
+                        output_grid_kind: ModularGridKind,
+                        output_grid_shape: (usize, usize),
+                        output_grid_pos: (isize, isize),
+                        is_weak: bool,
+                        grid_transform_steps: &mut Vec<TransformStepChunk>,
+                        buffer_info: &mut Vec<ModularBufferInfo>| {
+        let output_grid_size = (output_grid_shape.0 as isize, output_grid_shape.1 as isize);
+        if output_grid_pos.0 < 0
+            || output_grid_pos.0 >= output_grid_size.0
+            || output_grid_pos.1 < 0
+            || output_grid_pos.1 >= output_grid_size.1
+        {
+            // Skip adding uses of non-existent grid positions.
+            return;
+        }
+        let output_grid_pos = (output_grid_pos.0 as usize, output_grid_pos.1 as usize);
+        let input_grid_pos =
+            buffer_info[input_buffer_idx].get_grid_idx(output_grid_kind, output_grid_pos);
+        let grid = &mut buffer_info[input_buffer_idx].buffer_grid[input_grid_pos];
+        if !grid.used_by_transforms_weak.contains(&ts)
+            && !grid.used_by_transforms_strong.contains(&ts)
+        {
+            grid.remaining_uses.fetch_add(1, Ordering::Relaxed);
+            grid_transform_steps[ts]
+                .deps
+                .push((input_buffer_idx, input_grid_pos));
+            if is_weak {
+                grid.used_by_transforms_weak.push(ts);
+            } else {
+                grid.used_by_transforms_strong.push(ts);
+            }
+        }
+    };
+
+    // Add grid-ed transforms.
+    let mut grid_transform_steps = vec![];
+
+    for transform in transform_steps {
+        match &transform {
+            TransformStep::Rct {
+                buf_in, buf_out, ..
+            } => {
+                // Easy case: we just depend on the 3 input buffers in the same location.
+                let out_kind = buffer_info[buf_out[0]].grid_kind;
+                let out_shape = buffer_info[buf_out[0]].grid_shape;
+                for (x, y) in get_grid_indices(out_shape) {
+                    let ts = add_transform_step(&transform, (x, y), &mut grid_transform_steps);
+                    for bin in buf_in {
+                        add_grid_use(
+                            ts,
+                            *bin,
+                            out_kind,
+                            out_shape,
+                            (x, y),
+                            false,
+                            &mut grid_transform_steps,
+                            buffer_info,
+                        );
+                    }
+                }
+            }
+            TransformStep::Palette {
+                buf_in,
+                buf_pal,
+                buf_out,
+                predictor,
+                ..
+            } if predictor.requires_full_row() => {
+                // Delta palette with AverageAll or Weighted. Those are special, because we can
+                // only make progress one full image row at a time (since we need decoded values
+                // from the previous row or two rows).
+                let out_kind = buffer_info[buf_out[0]].grid_kind;
+                let out_shape = buffer_info[buf_out[0]].grid_shape;
+                let mut ts = 0;
+                for (x, y) in get_grid_indices(out_shape) {
+                    if x == 0 {
+                        ts = add_transform_step(&transform, (x, y), &mut grid_transform_steps);
+                        add_grid_use(
+                            ts,
+                            *buf_pal,
+                            out_kind,
+                            out_shape,
+                            (x, y),
+                            false,
+                            &mut grid_transform_steps,
+                            buffer_info,
+                        );
+                    }
+                    add_grid_use(
+                        ts,
+                        *buf_in,
+                        out_kind,
+                        out_shape,
+                        (x, y),
+                        false,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                    for out in buf_out.iter() {
+                        add_grid_use(
+                            ts,
+                            *out,
+                            out_kind,
+                            out_shape,
+                            (x, y - 1),
+                            false,
+                            &mut grid_transform_steps,
+                            buffer_info,
+                        );
+                    }
+                }
+            }
+            TransformStep::Palette {
+                buf_in,
+                buf_pal,
+                buf_out,
+                predictor,
+                ..
+            } => {
+                // Maybe-delta palette: we depend on the palette and the input buffer in the same
+                // location. We may also depend on other grid positions in the output buffer,
+                // according to the used predictor.
+                let out_kind = buffer_info[buf_out[0]].grid_kind;
+                let out_shape = buffer_info[buf_out[0]].grid_shape;
+                for (x, y) in get_grid_indices(out_shape) {
+                    let ts = add_transform_step(&transform, (x, y), &mut grid_transform_steps);
+                    add_grid_use(
+                        ts,
+                        *buf_pal,
+                        out_kind,
+                        out_shape,
+                        (x, y),
+                        false,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                    add_grid_use(
+                        ts,
+                        *buf_in,
+                        out_kind,
+                        out_shape,
+                        (x, y),
+                        false,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                    let offsets = match predictor {
+                        Predictor::Zero => [].as_slice(),
+                        _ => &[(0, -1), (-1, 0), (-1, -1)],
+                    };
+                    for (dx, dy) in offsets {
+                        for out in buf_out.iter() {
+                            add_grid_use(
+                                ts,
+                                *out,
+                                out_kind,
+                                out_shape,
+                                (x + dx, y + dy),
+                                false,
+                                &mut grid_transform_steps,
+                                buffer_info,
+                            );
+                        }
+                    }
+                }
+            }
+            TransformStep::HSqueeze { buf_in, buf_out } => {
+                let out_kind = buffer_info[*buf_out].grid_kind;
+                let out_shape = buffer_info[*buf_out].grid_shape;
+                for (x, y) in get_grid_indices(out_shape) {
+                    let ts = add_transform_step(&transform, (x, y), &mut grid_transform_steps);
+                    // Average and residuals from the same position
+                    for bin in buf_in {
+                        add_grid_use(
+                            ts,
+                            *bin,
+                            out_kind,
+                            out_shape,
+                            (x, y),
+                            false,
+                            &mut grid_transform_steps,
+                            buffer_info,
+                        );
+                    }
+                    // Next average
+                    add_grid_use(
+                        ts,
+                        buf_in[0],
+                        out_kind,
+                        out_shape,
+                        (x + 1, y),
+                        true,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                    // Previous decoded
+                    add_grid_use(
+                        ts,
+                        *buf_out,
+                        out_kind,
+                        out_shape,
+                        (x - 1, y),
+                        true,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                }
+            }
+            TransformStep::VSqueeze { buf_in, buf_out } => {
+                let out_kind = buffer_info[*buf_out].grid_kind;
+                let out_shape = buffer_info[*buf_out].grid_shape;
+                for (x, y) in get_grid_indices(out_shape) {
+                    let ts = add_transform_step(&transform, (x, y), &mut grid_transform_steps);
+                    // Average and residuals from the same position
+                    for bin in buf_in {
+                        add_grid_use(
+                            ts,
+                            *bin,
+                            out_kind,
+                            out_shape,
+                            (x, y),
+                            false,
+                            &mut grid_transform_steps,
+                            buffer_info,
+                        );
+                    }
+                    // Next average
+                    add_grid_use(
+                        ts,
+                        buf_in[0],
+                        out_kind,
+                        out_shape,
+                        (x, y + 1),
+                        true,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                    // Previous decoded
+                    add_grid_use(
+                        ts,
+                        *buf_out,
+                        out_kind,
+                        out_shape,
+                        (x, y - 1),
+                        true,
+                        &mut grid_transform_steps,
+                        buffer_info,
+                    );
+                }
+            }
+        }
+    }
+
+    // Compute the layer of each transform step.
+    // TODO(veluca): for parallelization purposes, it might make sense to try to ensure that
+    // transforms in the same layer are as similar in runtime as possible.
+    let mut transforms_needed_by = vec![vec![]; grid_transform_steps.len()];
+    let mut enabled_transforms = vec![vec![]; grid_transform_steps.len()];
+    for (i, s) in grid_transform_steps.iter().enumerate() {
+        for (b, g) in s.outputs(buffer_info) {
+            for (t, _) in buffer_info[b].buffer_grid[g].users(true) {
+                transforms_needed_by[t].push(i);
+                enabled_transforms[i].push(t);
+            }
+        }
+    }
+
+    let mut missing_prerequisites: Vec<_> = transforms_needed_by.iter().map(|x| x.len()).collect();
+
+    let mut stack = vec![];
+    for (i, m) in missing_prerequisites.iter().enumerate() {
+        if *m == 0 {
+            stack.push(i);
+        }
+    }
+
+    while let Some(i) = stack.pop() {
+        assert_eq!(missing_prerequisites[i], 0);
+        for e in enabled_transforms[i].iter() {
+            missing_prerequisites[*e] = missing_prerequisites[*e].checked_sub(1).unwrap();
+            if missing_prerequisites[*e] == 0 {
+                stack.push(*e);
+            }
+        }
+
+        grid_transform_steps[i].layer = transforms_needed_by[i]
+            .iter()
+            .map(|x| grid_transform_steps[*x].layer)
+            .max()
+            .unwrap_or(0)
+            + 1;
+    }
+
+    trace!(?grid_transform_steps, ?buffer_info);
+
+    grid_transform_steps
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/palette.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/palette.rs
new file mode 100644
index 00000000..1eab301e
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/palette.rs
@@ -0,0 +1,701 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    error::Result,
+    frame::modular::{
+        ModularChannel, Predictor,
+        predict::{PredictionData, WeightedPredictorState},
+    },
+    headers::modular::WeightedHeader,
+    image::Image,
+};
+
+const RGB_CHANNELS: usize = 3;
+
+// 5x5x5 color cube for the larger cube.
+const LARGE_CUBE: usize = 5;
+
+// Smaller interleaved color cube to fill the holes of the larger cube.
+const SMALL_CUBE: usize = 4;
+const SMALL_CUBE_BITS: usize = 2;
+// SMALL_CUBE ** 3
+const LARGE_CUBE_OFFSET: usize = SMALL_CUBE * SMALL_CUBE * SMALL_CUBE;
+
+fn scale<const DENOM: usize>(value: usize, bit_depth: usize) -> i32 {
+    // return (value * ((1 << bit_depth) - 1)) / DENOM;
+    // We only call this function with SMALL_CUBE or LARGE_CUBE - 1 as DENOM,
+    // allowing us to avoid a division here.
+    const {
+        assert!(DENOM == 4, "denom must be 4");
+    }
+    ((value * ((1 << bit_depth) - 1)) >> 2) as i32
+}
+
+// The purpose of this function is solely to extend the interpretation of
+// palette indices to implicit values. If index < nb_deltas, indicating that the
+// result is a delta palette entry, it is the responsibility of the caller to
+// treat it as such.
+fn get_palette_value(
+    palette: &Image<i32>,
+    index: isize,
+    c: usize,
+    palette_size: usize,
+    bit_depth: usize,
+) -> i32 {
+    if index < 0 {
+        const DELTA_PALETTE: [[i32; 3]; 72] = [
+            [0, 0, 0],
+            [4, 4, 4],
+            [11, 0, 0],
+            [0, 0, -13],
+            [0, -12, 0],
+            [-10, -10, -10],
+            [-18, -18, -18],
+            [-27, -27, -27],
+            [-18, -18, 0],
+            [0, 0, -32],
+            [-32, 0, 0],
+            [-37, -37, -37],
+            [0, -32, -32],
+            [24, 24, 45],
+            [50, 50, 50],
+            [-45, -24, -24],
+            [-24, -45, -45],
+            [0, -24, -24],
+            [-34, -34, 0],
+            [-24, 0, -24],
+            [-45, -45, -24],
+            [64, 64, 64],
+            [-32, 0, -32],
+            [0, -32, 0],
+            [-32, 0, 32],
+            [-24, -45, -24],
+            [45, 24, 45],
+            [24, -24, -45],
+            [-45, -24, 24],
+            [80, 80, 80],
+            [64, 0, 0],
+            [0, 0, -64],
+            [0, -64, -64],
+            [-24, -24, 45],
+            [96, 96, 96],
+            [64, 64, 0],
+            [45, -24, -24],
+            [34, -34, 0],
+            [112, 112, 112],
+            [24, -45, -45],
+            [45, 45, -24],
+            [0, -32, 32],
+            [24, -24, 45],
+            [0, 96, 96],
+            [45, -24, 24],
+            [24, -45, -24],
+            [-24, -45, 24],
+            [0, -64, 0],
+            [96, 0, 0],
+            [128, 128, 128],
+            [64, 0, 64],
+            [144, 144, 144],
+            [96, 96, 0],
+            [-36, -36, 36],
+            [45, -24, -45],
+            [45, -45, -24],
+            [0, 0, -96],
+            [0, 128, 128],
+            [0, 96, 0],
+            [45, 24, -45],
+            [-128, 0, 0],
+            [24, -45, 24],
+            [-45, 24, -45],
+            [64, 0, -64],
+            [64, -64, -64],
+            [96, 0, 96],
+            [45, -45, 24],
+            [24, 45, -45],
+            [64, 64, -64],
+            [128, 128, 0],
+            [0, 0, -128],
+            [-24, 45, -45],
+        ];
+        if c >= RGB_CHANNELS {
+            return 0;
+        }
+        // Do not open the brackets, otherwise INT32_MIN negation could overflow.
+        let mut index = -(index + 1) as usize;
+        index %= 1 + 2 * (DELTA_PALETTE.len() - 1);
+        const MULTIPLIER: [i32; 2] = [-1, 1];
+        let mut result = DELTA_PALETTE[(index + 1) >> 1][c] * MULTIPLIER[index & 1];
+        if bit_depth > 8 {
+            result *= 1 << (bit_depth - 8);
+        }
+        result
+    } else {
+        let mut index = index as usize;
+        if palette_size <= index && index < palette_size + LARGE_CUBE_OFFSET {
+            if c >= RGB_CHANNELS {
+                return 0;
+            }
+            index -= palette_size;
+            index >>= c * SMALL_CUBE_BITS;
+            scale::<SMALL_CUBE>(index % SMALL_CUBE, bit_depth)
+                + (1 << (0.max(bit_depth as isize - 3)))
+        } else if palette_size + LARGE_CUBE_OFFSET <= index {
+            if c >= RGB_CHANNELS {
+                return 0;
+            }
+            index -= palette_size + LARGE_CUBE_OFFSET;
+            // TODO(eustas): should we take care of ambiguity created by
+            //               index >= LARGE_CUBE ** 3 ?
+            match c {
+                0 => (),
+                1 => {
+                    index /= LARGE_CUBE;
+                }
+                2 => {
+                    index /= LARGE_CUBE * LARGE_CUBE;
+                }
+                _ => (),
+            }
+            scale::<{ LARGE_CUBE - 1 }>(index % LARGE_CUBE, bit_depth)
+        } else {
+            palette.row(c)[index]
+        }
+    }
+}
+
+pub fn do_palette_step_general(
+    buf_in: &ModularChannel,
+    buf_pal: &ModularChannel,
+    buf_out: &mut [&mut ModularChannel],
+    num_colors: usize,
+    num_deltas: usize,
+    predictor: Predictor,
+    wp_header: &WeightedHeader,
+) -> Result<()> {
+    let (w, h) = buf_in.data.size();
+    let palette = &buf_pal.data;
+    let bit_depth = buf_in.bit_depth.bits_per_sample().min(24) as usize;
+
+    if w == 0 {
+        // Nothing to do.
+        // Avoid touching "empty" channels with non-zero height.
+    } else if num_deltas == 0 && predictor == Predictor::Zero {
+        for (chan_index, out) in buf_out.iter_mut().enumerate() {
+            for y in 0..h {
+                let row_index = buf_in.data.row(y);
+                let row_out = out.data.row_mut(y);
+                for x in 0..w {
+                    let index = row_index[x];
+                    let palette_value = get_palette_value(
+                        palette,
+                        index as isize,
+                        /*c=*/ chan_index,
+                        /*palette_size=*/ num_colors,
+                        /*bit_depth=*/ bit_depth,
+                    );
+                    row_out[x] = palette_value;
+                }
+            }
+        }
+    } else if predictor == Predictor::Weighted {
+        let w = buf_in.data.size().0;
+        let mut row_prev_buf: Vec<i32> = Vec::new();
+        let mut row_prev2_buf: Vec<i32> = Vec::new();
+        for (chan_index, out) in buf_out.iter_mut().enumerate() {
+            let mut wp_state = WeightedPredictorState::new(wp_header, w)?;
+            for y in 0..h {
+                let idx = buf_in.data.row(y);
+
+                // Pre-fetch completed top rows (avoids per-pixel .row() calls)
+                std::mem::swap(&mut row_prev2_buf, &mut row_prev_buf);
+                if y > 0 {
+                    row_prev_buf.clear();
+                    row_prev_buf.extend_from_slice(out.data.row(y - 1));
+                }
+                let row_prev = if y > 0 {
+                    Some(row_prev_buf.as_slice())
+                } else {
+                    None
+                };
+                let row_prev2 = if y > 1 {
+                    Some(row_prev2_buf.as_slice())
+                } else {
+                    None
+                };
+
+                let mut last = if y > 0 { row_prev.unwrap()[0] } else { 0 };
+                let mut last_last = last;
+
+                for (x, &index) in idx.iter().enumerate() {
+                    let palette_entry = get_palette_value(
+                        palette,
+                        index as isize,
+                        /*c=*/ chan_index,
+                        /*palette_size=*/ num_colors + num_deltas,
+                        /*bit_depth=*/ bit_depth,
+                    );
+                    let left = last;
+                    let leftleft = if x > 1 { last_last } else { left };
+                    let val = if index < num_deltas as i32 {
+                        let prediction_data = PredictionData::from_hoisted_neighbors(
+                            left, leftleft, row_prev, row_prev2, w, None, None, None, None, None,
+                            x, y, w, h,
+                        );
+                        let (wp_pred, _) =
+                            wp_state.predict_and_property((x, y), w, &prediction_data);
+                        let pred = predictor.predict_one(prediction_data, wp_pred);
+                        (pred + palette_entry as i64) as i32
+                    } else {
+                        palette_entry
+                    };
+                    out.data.row_mut(y)[x] = val;
+                    wp_state.update_errors(val, (x, y), w);
+                    last_last = last;
+                    last = val;
+                }
+            }
+        }
+    } else {
+        let mut row_prev_buf: Vec<i32> = Vec::new();
+        let mut row_prev2_buf: Vec<i32> = Vec::new();
+        for (chan_index, out) in buf_out.iter_mut().enumerate() {
+            for y in 0..h {
+                let idx = buf_in.data.row(y);
+
+                // Pre-fetch completed top rows (avoids per-pixel .row() calls)
+                std::mem::swap(&mut row_prev2_buf, &mut row_prev_buf);
+                if y > 0 {
+                    row_prev_buf.clear();
+                    row_prev_buf.extend_from_slice(out.data.row(y - 1));
+                }
+                let row_prev = if y > 0 {
+                    Some(row_prev_buf.as_slice())
+                } else {
+                    None
+                };
+                let row_prev2 = if y > 1 {
+                    Some(row_prev2_buf.as_slice())
+                } else {
+                    None
+                };
+
+                let mut last = if y > 0 { row_prev.unwrap()[0] } else { 0 };
+                let mut last_last = last;
+
+                for (x, &index) in idx.iter().enumerate() {
+                    let palette_entry = get_palette_value(
+                        palette,
+                        index as isize,
+                        /*c=*/ chan_index,
+                        /*palette_size=*/ num_colors + num_deltas,
+                        /*bit_depth=*/ bit_depth,
+                    );
+                    let left = last;
+                    let leftleft = if x > 1 { last_last } else { left };
+                    let val = if index < num_deltas as i32 {
+                        let prediction_data = PredictionData::from_hoisted_neighbors(
+                            left, leftleft, row_prev, row_prev2, w, None, None, None, None, None,
+                            x, y, w, h,
+                        );
+                        let pred = predictor.predict_one(prediction_data, /*wp_pred=*/ 0);
+                        (pred + palette_entry as i64) as i32
+                    } else {
+                        palette_entry
+                    };
+                    out.data.row_mut(y)[x] = val;
+                    last_last = last;
+                    last = val;
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+/// Like `get_prediction_data` but takes pre-fetched/tracked values for the
+/// main rect, avoiding per-pixel `Image::row()` overhead.
+///
+/// - `left`, `leftleft`: tracked as running variables by the caller
+/// - `row_prev`, `row_prev2`: pre-fetched (copied) once per y-iteration
+/// - Neighbor images: only accessed at grid boundaries
+#[allow(clippy::too_many_arguments)]
+#[inline(always)]
+fn get_prediction_data_hoisted(
+    left: i32,
+    leftleft: i32,
+    row_prev: Option<&[i32]>,
+    row_prev2: Option<&[i32]>,
+    rect_width: usize,
+    buf: &[&mut ModularChannel],
+    idx: usize,
+    grid_x: usize,
+    grid_y: usize,
+    grid_xsize: usize,
+    x: usize,
+    y: usize,
+    xsize: usize,
+    ysize: usize,
+) -> PredictionData {
+    PredictionData::from_hoisted_neighbors(
+        left,
+        leftleft,
+        row_prev,
+        row_prev2,
+        rect_width,
+        if grid_x > 0 {
+            Some(&buf[idx - 1].data)
+        } else {
+            None
+        },
+        if grid_y > 0 {
+            Some(&buf[idx - grid_xsize].data)
+        } else {
+            None
+        },
+        if grid_x > 0 && grid_y > 0 {
+            Some(&buf[idx - grid_xsize - 1].data)
+        } else {
+            None
+        },
+        if grid_x + 1 < grid_xsize {
+            Some(&buf[idx + 1].data)
+        } else {
+            None
+        },
+        if grid_x + 1 < grid_xsize && grid_y > 0 {
+            Some(&buf[idx - grid_xsize + 1].data)
+        } else {
+            None
+        },
+        x,
+        y,
+        xsize,
+        ysize,
+    )
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn do_palette_step_one_group(
+    buf_in: &ModularChannel,
+    buf_pal: &ModularChannel,
+    buf_out: &mut [&mut ModularChannel],
+    grid_x: usize,
+    grid_y: usize,
+    grid_xsize: usize,
+    grid_ysize: usize,
+    num_colors: usize,
+    num_deltas: usize,
+    predictor: Predictor,
+) {
+    let h = buf_in.data.size().1;
+    let palette = &buf_pal.data;
+    let bit_depth = buf_in.bit_depth.bits_per_sample().min(24) as usize;
+    let num_c = buf_out.len() / (grid_xsize * grid_ysize);
+    let (xsize, ysize) = buf_out[0].data.size();
+
+    for c in 0..num_c {
+        let out_idx = c * grid_ysize * grid_xsize + grid_y * grid_xsize + grid_x;
+        let rect_width = buf_out[out_idx].data.size().0;
+        // Reusable buffers for pre-fetched completed rows (avoids per-pixel .row() calls)
+        let mut row_prev_buf: Vec<i32> = Vec::new();
+        let mut row_prev2_buf: Vec<i32> = Vec::new();
+
+        for y in 0..h {
+            let index_img = buf_in.data.row(y);
+
+            // Copy completed top rows — these don't change during the x-loop.
+            // row_prev2 = previous row_prev (rotate), row_prev = row just completed.
+            std::mem::swap(&mut row_prev2_buf, &mut row_prev_buf);
+            if y > 0 {
+                row_prev_buf.clear();
+                row_prev_buf.extend_from_slice(buf_out[out_idx].data.row(y - 1));
+            }
+            let row_prev = if y > 0 {
+                Some(row_prev_buf.as_slice())
+            } else {
+                None
+            };
+            let row_prev2 = if y > 1 {
+                Some(row_prev2_buf.as_slice())
+            } else {
+                None
+            };
+
+            // Track left/leftleft as running variables
+            let initial_left = if y > 0 {
+                row_prev.unwrap()[0]
+            } else if grid_y > 0 {
+                buf_out[out_idx - grid_xsize].data.row(ysize - 1)[0]
+            } else {
+                0
+            };
+            let mut last = initial_left;
+            let mut last_last = initial_left;
+
+            for (x, &index) in index_img.iter().enumerate() {
+                let palette_entry = get_palette_value(
+                    palette,
+                    index as isize,
+                    c,
+                    /*palette_size=*/ num_colors + num_deltas,
+                    /*bit_depth=*/ bit_depth,
+                );
+                // Compute left/leftleft for this pixel
+                let left = if x > 0 {
+                    last
+                } else if grid_x > 0 {
+                    buf_out[out_idx - 1].data.row(y)[xsize - 1]
+                } else {
+                    initial_left
+                };
+                let leftleft = if x > 1 {
+                    last_last
+                } else if let Some(l_img) = if grid_x > 0 {
+                    Some(&buf_out[out_idx - 1].data)
+                } else {
+                    None
+                } {
+                    l_img.row(y)[xsize + x - 2]
+                } else {
+                    left
+                };
+
+                let val = if index < num_deltas as i32 {
+                    let pred = predictor.predict_one(
+                        get_prediction_data_hoisted(
+                            left, leftleft, row_prev, row_prev2, rect_width, buf_out, out_idx,
+                            grid_x, grid_y, grid_xsize, x, y, xsize, ysize,
+                        ),
+                        /*wp_pred=*/ 0,
+                    );
+                    (pred + palette_entry as i64) as i32
+                } else {
+                    palette_entry
+                };
+                buf_out[out_idx].data.row_mut(y)[x] = val;
+                last_last = last;
+                last = val;
+            }
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn do_palette_step_group_row(
+    buf_in: &[&ModularChannel],
+    buf_pal: &ModularChannel,
+    buf_out: &mut [&mut ModularChannel],
+    grid_y: usize,
+    grid_xsize: usize,
+    num_colors: usize,
+    num_deltas: usize,
+    predictor: Predictor,
+    wp_header: &WeightedHeader,
+) -> Result<()> {
+    let palette = &buf_pal.data;
+    let h = buf_in[0].data.size().1;
+    let bit_depth = buf_in[0].bit_depth.bits_per_sample().min(24) as usize;
+    let grid_ysize = grid_y + 1;
+    let num_c = buf_out.len() / (grid_xsize * grid_ysize);
+    let total_w = buf_out[0..grid_xsize]
+        .iter()
+        .map(|buf| buf.data.size().0)
+        .sum();
+    let (xsize, ysize) = buf_out[0].data.size();
+
+    // Helper closure: compute initial "left" value for x=0 of a grid block
+    let initial_left_for = |buf_out: &[&mut ModularChannel],
+                            out_idx: usize,
+                            grid_y: usize,
+                            grid_xsize: usize,
+                            row_prev: Option<&[i32]>,
+                            ysize: usize|
+     -> i32 {
+        if let Some(rp) = row_prev {
+            rp[0]
+        } else if grid_y > 0 {
+            buf_out[out_idx - grid_xsize].data.row(ysize - 1)[0]
+        } else {
+            0
+        }
+    };
+
+    // Per-grid-x row buffers: each grid block needs its own prev/prev2 tracking
+    // because blocks may have different widths and the swap pattern must rotate
+    // per-block across y iterations, not across grid_x iterations.
+    let mut row_prev_bufs: Vec<Vec<i32>> = (0..grid_xsize).map(|_| Vec::new()).collect();
+    let mut row_prev2_bufs: Vec<Vec<i32>> = (0..grid_xsize).map(|_| Vec::new()).collect();
+
+    if predictor == Predictor::Weighted {
+        for c in 0..num_c {
+            let mut wp_state = WeightedPredictorState::new(wp_header, total_w)?;
+            let out_row_idx = c * grid_ysize * grid_xsize + grid_y * grid_xsize;
+            if grid_y > 0 {
+                let prev_row_idx = out_row_idx - grid_y * grid_xsize;
+                wp_state.restore_state(
+                    buf_out[prev_row_idx].auxiliary_data.as_ref().unwrap(),
+                    total_w,
+                );
+            }
+            for y in 0..h {
+                for (grid_x, index_buf) in buf_in.iter().enumerate().take(grid_xsize) {
+                    let index_img = index_buf.data.row(y);
+                    let out_idx = out_row_idx + grid_x;
+                    let rect_width = buf_out[out_idx].data.size().0;
+
+                    // Pre-fetch completed top rows for THIS grid block
+                    std::mem::swap(&mut row_prev2_bufs[grid_x], &mut row_prev_bufs[grid_x]);
+                    if y > 0 {
+                        row_prev_bufs[grid_x].clear();
+                        row_prev_bufs[grid_x].extend_from_slice(buf_out[out_idx].data.row(y - 1));
+                    }
+                    let row_prev = if y > 0 {
+                        Some(row_prev_bufs[grid_x].as_slice())
+                    } else {
+                        None
+                    };
+                    let row_prev2 = if y > 1 {
+                        Some(row_prev2_bufs[grid_x].as_slice())
+                    } else {
+                        None
+                    };
+
+                    let initial_left =
+                        initial_left_for(buf_out, out_idx, grid_y, grid_xsize, row_prev, ysize);
+                    let mut last = initial_left;
+                    let mut last_last = initial_left;
+
+                    for (x, &index) in index_img.iter().enumerate() {
+                        let palette_entry = get_palette_value(
+                            palette,
+                            index as isize,
+                            c,
+                            /*palette_size=*/ num_colors + num_deltas,
+                            /*bit_depth=*/ bit_depth,
+                        );
+                        let left = if x > 0 {
+                            last
+                        } else if grid_x > 0 {
+                            buf_out[out_idx - 1].data.row(y)[xsize - 1]
+                        } else {
+                            initial_left
+                        };
+                        let leftleft = if x > 1 {
+                            last_last
+                        } else if let Some(l_img) = if grid_x > 0 {
+                            Some(&buf_out[out_idx - 1].data)
+                        } else {
+                            None
+                        } {
+                            l_img.row(y)[xsize + x - 2]
+                        } else {
+                            left
+                        };
+
+                        let val = if index < num_deltas as i32 {
+                            let prediction_data = get_prediction_data_hoisted(
+                                left, leftleft, row_prev, row_prev2, rect_width, buf_out, out_idx,
+                                grid_x, grid_y, grid_xsize, x, y, xsize, ysize,
+                            );
+                            let (pred, _) = wp_state.predict_and_property(
+                                (grid_x * xsize + x, y & 1),
+                                total_w,
+                                &prediction_data,
+                            );
+                            (pred + palette_entry as i64) as i32
+                        } else {
+                            palette_entry
+                        };
+                        buf_out[out_idx].data.row_mut(y)[x] = val;
+                        wp_state.update_errors(val, (grid_x * xsize + x, y & 1), total_w);
+                        last_last = last;
+                        last = val;
+                    }
+                }
+            }
+            let mut wp_image = Image::<i32>::new((total_w + 2, 1))?;
+            wp_state.save_state(&mut wp_image, total_w);
+            buf_out[out_row_idx].auxiliary_data = Some(wp_image);
+        }
+    } else {
+        for c in 0..num_c {
+            for y in 0..h {
+                for (grid_x, index_buf) in buf_in.iter().enumerate().take(grid_xsize) {
+                    let index_img = index_buf.data.row(y);
+                    let out_idx = c * grid_ysize * grid_xsize + grid_y * grid_xsize + grid_x;
+                    let rect_width = buf_out[out_idx].data.size().0;
+
+                    // Pre-fetch completed top rows for THIS grid block
+                    std::mem::swap(&mut row_prev2_bufs[grid_x], &mut row_prev_bufs[grid_x]);
+                    if y > 0 {
+                        row_prev_bufs[grid_x].clear();
+                        row_prev_bufs[grid_x].extend_from_slice(buf_out[out_idx].data.row(y - 1));
+                    }
+                    let row_prev = if y > 0 {
+                        Some(row_prev_bufs[grid_x].as_slice())
+                    } else {
+                        None
+                    };
+                    let row_prev2 = if y > 1 {
+                        Some(row_prev2_bufs[grid_x].as_slice())
+                    } else {
+                        None
+                    };
+
+                    let initial_left =
+                        initial_left_for(buf_out, out_idx, grid_y, grid_xsize, row_prev, ysize);
+                    let mut last = initial_left;
+                    let mut last_last = initial_left;
+
+                    for (x, &index) in index_img.iter().enumerate() {
+                        let palette_entry = get_palette_value(
+                            palette,
+                            index as isize,
+                            c,
+                            /*palette_size=*/ num_colors + num_deltas,
+                            /*bit_depth=*/ bit_depth,
+                        );
+                        let left = if x > 0 {
+                            last
+                        } else if grid_x > 0 {
+                            buf_out[out_idx - 1].data.row(y)[xsize - 1]
+                        } else {
+                            initial_left
+                        };
+                        let leftleft = if x > 1 {
+                            last_last
+                        } else if let Some(l_img) = if grid_x > 0 {
+                            Some(&buf_out[out_idx - 1].data)
+                        } else {
+                            None
+                        } {
+                            l_img.row(y)[xsize + x - 2]
+                        } else {
+                            left
+                        };
+
+                        let val = if index < num_deltas as i32 {
+                            let pred = predictor.predict_one(
+                                get_prediction_data_hoisted(
+                                    left, leftleft, row_prev, row_prev2, rect_width, buf_out,
+                                    out_idx, grid_x, grid_y, grid_xsize, x, y, xsize, ysize,
+                                ),
+                                /*wp_pred=*/ 0,
+                            );
+                            (pred + palette_entry as i64) as i32
+                        } else {
+                            palette_entry
+                        };
+                        buf_out[out_idx].data.row_mut(y)[x] = val;
+                        last_last = last;
+                        last = val;
+                    }
+                }
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/rct.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/rct.rs
new file mode 100644
index 00000000..58331257
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/rct.rs
@@ -0,0 +1,161 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use jxl_simd::{I32SimdVec, ScalarDescriptor, SimdDescriptor, shr, simd_function};
+
+use crate::{
+    frame::modular::{
+        ModularChannel,
+        transforms::{RctOp, RctPermutation},
+    },
+    image::Image,
+    util::tracing_wrappers::*,
+};
+
+#[inline(always)]
+fn rct_impl<D: SimdDescriptor, const OP: u32>(
+    _: D,
+    v0: D::I32Vec,
+    v1: D::I32Vec,
+    v2: D::I32Vec,
+) -> (D::I32Vec, D::I32Vec, D::I32Vec) {
+    const { assert!(OP <= 6) };
+
+    match OP {
+        0 => (v0, v1, v2),
+        1 => (v0, v1, v2 + v0),
+        2 => (v0, v1 + v0, v2),
+        3 => (v0, v1 + v0, v2 + v0),
+        4 => {
+            let avg = shr!(v0 + v2, 1);
+            (v0, v1 + avg, v2)
+        }
+        5 => {
+            let v2 = v0 + v2;
+            let avg = shr!(v0 + v2, 1);
+            (v0, v1 + avg, v2)
+        }
+        6 => {
+            let (y, co, cg) = (v0, v1, v2);
+            let y = y - shr!(cg, 1);
+            let g = cg + y;
+            let y = y - shr!(co, 1);
+            let r = y + co;
+            (r, g, y)
+        }
+        _ => unreachable!(),
+    }
+}
+
+#[inline(always)]
+fn rct_row_impl<D: SimdDescriptor, const OP: u32>(d: D, rgb: [&mut [i32]; 3]) -> [&mut [i32]; 3] {
+    const { assert!(OP <= 6) };
+
+    let [mut it_row_r, mut it_row_g, mut it_row_b] =
+        rgb.map(|x| x.chunks_exact_mut(D::I32Vec::LEN));
+    let it = (&mut it_row_r).zip(&mut it_row_g).zip(&mut it_row_b);
+
+    for ((r, g), b) in it {
+        let v0 = D::I32Vec::load(d, r);
+        let v1 = D::I32Vec::load(d, g);
+        let v2 = D::I32Vec::load(d, b);
+        let (w0, w1, w2) = rct_impl::<D, OP>(d, v0, v1, v2);
+        w0.store(r);
+        w1.store(g);
+        w2.store(b);
+    }
+
+    [
+        it_row_r.into_remainder(),
+        it_row_g.into_remainder(),
+        it_row_b.into_remainder(),
+    ]
+}
+
+#[inline(always)]
+fn rct_loop_impl<D: SimdDescriptor, const OP: u32>(
+    d: D,
+    r: &mut Image<i32>,
+    g: &mut Image<i32>,
+    b: &mut Image<i32>,
+) {
+    const { assert!(OP <= 6) };
+
+    let h = r.size().1;
+
+    for pos_y in 0..h {
+        let mut rgb = [&mut *r, &mut *g, &mut *b].map(|x| x.row_mut(pos_y));
+
+        rgb = rct_row_impl::<D, OP>(d, rgb);
+        if D::I32Vec::LEN > 8 {
+            rgb = rct_row_impl::<_, OP>(d.maybe_downgrade_256bit(), rgb);
+        }
+        if D::I32Vec::LEN > 4 {
+            rgb = rct_row_impl::<_, OP>(d.maybe_downgrade_128bit(), rgb);
+        }
+        if D::I32Vec::LEN > 1 {
+            rct_row_impl::<_, OP>(ScalarDescriptor::new().unwrap(), rgb);
+        }
+    }
+}
+
+simd_function!(
+    rct_loop,
+    d: D,
+    fn rct_loop_fwd(r: &mut Image<i32>, g: &mut Image<i32>, b: &mut Image<i32>, op: RctOp) {
+        match op {
+            RctOp::Noop => {},
+            RctOp::AddFirstToThird => rct_loop_impl::<D, 1>(d, r, g, b),
+            RctOp::AddFirstToSecond => rct_loop_impl::<D, 2>(d, r, g, b),
+            RctOp::AddFirstToSecondAndThird => rct_loop_impl::<D, 3>(d, r, g, b),
+            RctOp::AddAvgToSecond => rct_loop_impl::<D, 4>(d, r, g, b),
+            RctOp::AddFirstToThirdAndAvgToSecond => rct_loop_impl::<D, 5>(d, r, g, b),
+            RctOp::YCoCg => rct_loop_impl::<D, 6>(d, r, g, b),
+        }
+    }
+);
+
+// Applies a RCT in-place to the given buffers.
+#[instrument(level = "debug", skip(buffers), ret)]
+pub fn do_rct_step(buffers: &mut [&mut ModularChannel], op: RctOp, perm: RctPermutation) {
+    let [r, g, b] = buffers else {
+        unreachable!("incorrect buffer count for RCT");
+    };
+
+    if op != RctOp::Noop {
+        rct_loop(&mut r.data, &mut g.data, &mut b.data, op);
+    }
+
+    // Note: Gbr and Brg use the *inverse* permutation compared to libjxl, because we *first* write
+    // to the buffers and then permute them, while in libjxl the buffers to be written to are
+    // permuted first.
+    // The same is true for Rbg/Grb/Bgr, but since those are involutions it doesn't change
+    // anything.
+    match perm {
+        RctPermutation::Rgb => {}
+        RctPermutation::Gbr => {
+            // out[1, 2, 0] = in[0, 1, 2]
+            std::mem::swap(&mut g.data, &mut b.data); // [1, 0, 2]
+            std::mem::swap(&mut r.data, &mut g.data);
+        }
+        RctPermutation::Brg => {
+            // out[2, 0, 1] = in[0, 1, 2]
+            std::mem::swap(&mut r.data, &mut b.data); // [1, 0, 2]
+            std::mem::swap(&mut r.data, &mut g.data);
+        }
+        RctPermutation::Rbg => {
+            // out[0, 2, 1] = in[0, 1, 2]
+            std::mem::swap(&mut b.data, &mut g.data);
+        }
+        RctPermutation::Grb => {
+            // out[1, 0, 2] = in[0, 1, 2]
+            std::mem::swap(&mut r.data, &mut g.data);
+        }
+        RctPermutation::Bgr => {
+            // out[2, 1, 0] = in[0, 1, 2]
+            std::mem::swap(&mut r.data, &mut b.data);
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/squeeze.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/squeeze.rs
new file mode 100644
index 00000000..ac9811c1
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/transforms/squeeze.rs
@@ -0,0 +1,675 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use jxl_simd::{
+    F32SimdVec, I32SimdVec, SimdDescriptor, SimdMask, U32SimdVec, shl, shr, simd_function,
+};
+
+use crate::{
+    error::{Error, Result},
+    frame::modular::{ChannelInfo, ModularChannel},
+    headers::modular::SqueezeParams,
+    image::{Image, ImageRect},
+    util::AtomicRef,
+};
+
+use crate::util::tracing_wrappers::*;
+
+#[instrument(level = "trace", err)]
+pub fn check_squeeze_params(
+    channels: &[(usize, ChannelInfo)],
+    params: &SqueezeParams,
+) -> Result<()> {
+    let end_channel = (params.begin_channel + params.num_channels) as usize;
+    if end_channel > channels.len() {
+        return Err(Error::InvalidChannelRange(
+            params.begin_channel as usize,
+            params.num_channels as usize,
+            channels.len(),
+        ));
+    }
+    if channels[params.begin_channel as usize].1.is_meta() != channels[end_channel - 1].1.is_meta()
+    {
+        return Err(Error::MixingDifferentChannels);
+    }
+    if channels[params.begin_channel as usize].1.is_meta() && !params.in_place {
+        return Err(Error::MetaSqueezeRequiresInPlace);
+    }
+    Ok(())
+}
+
+pub fn default_squeeze(data_channel_info: &[(usize, ChannelInfo)]) -> Vec<SqueezeParams> {
+    let num_meta_channels = data_channel_info
+        .iter()
+        .take_while(|x| x.1.is_meta())
+        .count();
+
+    let mut w = data_channel_info[num_meta_channels].1.size.0;
+    let mut h = data_channel_info[num_meta_channels].1.size.1;
+    let nc = data_channel_info.len() - num_meta_channels;
+
+    let mut params = vec![];
+
+    if nc > 2 && data_channel_info[num_meta_channels + 1].1.size == (w, h) {
+        // 420 previews
+        let sp = SqueezeParams {
+            horizontal: true,
+            in_place: false,
+            begin_channel: num_meta_channels as u32 + 1,
+            num_channels: 2,
+        };
+        if w > 1 {
+            params.push(sp);
+        }
+        if h > 1 {
+            params.push(SqueezeParams {
+                horizontal: false,
+                ..sp
+            });
+        }
+    }
+
+    const MAX_FIRST_PREVIEW_SIZE: usize = 8;
+
+    let sp = SqueezeParams {
+        begin_channel: num_meta_channels as u32,
+        num_channels: nc as u32,
+        in_place: true,
+        horizontal: false,
+    };
+
+    // vertical first on tall images
+    if w <= h && h > MAX_FIRST_PREVIEW_SIZE {
+        params.push(SqueezeParams {
+            horizontal: false,
+            ..sp
+        });
+        h = h.div_ceil(2);
+    }
+    while w > MAX_FIRST_PREVIEW_SIZE || h > MAX_FIRST_PREVIEW_SIZE {
+        if w > MAX_FIRST_PREVIEW_SIZE {
+            params.push(SqueezeParams {
+                horizontal: true,
+                ..sp
+            });
+            w = w.div_ceil(2);
+        }
+        if h > MAX_FIRST_PREVIEW_SIZE {
+            params.push(SqueezeParams {
+                horizontal: false,
+                ..sp
+            });
+            h = h.div_ceil(2);
+        }
+    }
+
+    params
+}
+
+#[inline(always)]
+fn smooth_tendency_impl<D: SimdDescriptor>(
+    d: D,
+    a: D::I32Vec,
+    b: D::I32Vec,
+    c: D::I32Vec,
+) -> D::I32Vec {
+    let a_b = a - b;
+    let b_c = b - c;
+    let a_c = a - c;
+    let abs_a_b = a_b.abs();
+    let abs_b_c = b_c.abs();
+    let abs_a_c = a_c.abs();
+    let non_monotonic = (a_b ^ b_c).lt_zero();
+    let skip = a_b.eq_zero().andnot(non_monotonic);
+    let skip = b_c.eq_zero().andnot(skip);
+
+    let abs_a_b_3 = abs_a_b.mul_wide_take_high(D::I32Vec::splat(d, 0x55555556));
+
+    let x = shr!(D::I32Vec::splat(d, 2) + abs_a_c + abs_a_b_3, 2);
+
+    let abs_a_b_2_add_x = shl!(abs_a_b, 1) + (x & D::I32Vec::splat(d, 1));
+    let x = x
+        .gt(abs_a_b_2_add_x)
+        .if_then_else_i32(shl!(abs_a_b, 1) + D::I32Vec::splat(d, 1), x);
+
+    let abs_b_c_2 = shl!(abs_b_c, 1);
+    let x = (x + (x & D::I32Vec::splat(d, 1)))
+        .gt(abs_b_c_2)
+        .if_then_else_i32(abs_b_c_2, x);
+
+    let need_neg = a_c.lt_zero();
+    let x = skip.maskz_i32(x);
+    need_neg.if_then_else_i32(-x, x)
+}
+
+#[inline(always)]
+fn smooth_tendency_scalar(b: i64, a: i64, n: i64) -> i64 {
+    let mut diff = 0;
+    if b >= a && a >= n {
+        diff = (4 * b - 3 * n - a + 6) / 12;
+        //      2c = a<<1 + diff - diff&1 <= 2b  so diff - diff&1 <= 2b - 2a
+        //      2d = a<<1 - diff - diff&1 >= 2n  so diff + diff&1 <= 2a - 2n
+        if diff - (diff & 1) > 2 * (b - a) {
+            diff = 2 * (b - a) + 1;
+        }
+        if diff + (diff & 1) > 2 * (a - n) {
+            diff = 2 * (a - n);
+        }
+    } else if b <= a && a <= n {
+        diff = (4 * b - 3 * n - a - 6) / 12;
+        //      2c = a<<1 + diff + diff&1 >= 2b  so diff + diff&1 >= 2b - 2a
+        //      2d = a<<1 - diff + diff&1 <= 2n  so diff - diff&1 >= 2a - 2n
+        if diff + (diff & 1) < 2 * (b - a) {
+            diff = 2 * (b - a) - 1;
+        }
+        if diff - (diff & 1) < 2 * (a - n) {
+            diff = 2 * (a - n);
+        }
+    }
+    diff
+}
+
+#[inline(always)]
+fn unsqueeze_impl<D: SimdDescriptor>(
+    d: D,
+    avg: D::I32Vec,
+    res: D::I32Vec,
+    next_avg: D::I32Vec,
+    prev: D::I32Vec,
+) -> (D::I32Vec, D::I32Vec) {
+    let tendency = smooth_tendency_impl(d, prev, avg, next_avg);
+    let diff = res + tendency;
+    let sign = shr!(diff.bitcast_to_u32(), 31).bitcast_to_i32();
+    let diff_2 = shr!(diff + sign, 1);
+    let a = avg + diff_2;
+    let b = a - diff;
+    (a, b)
+}
+
+#[inline(always)]
+fn unsqueeze_scalar(avg: i32, res: i32, next_avg: i32, prev: i32) -> (i32, i32) {
+    let tendency = smooth_tendency_scalar(prev as i64, avg as i64, next_avg as i64);
+    let diff = (res as i64) + tendency;
+    let a = (avg as i64) + (diff / 2);
+    let b = a - diff;
+    (a as i32, b as i32)
+}
+
+#[inline(always)]
+fn hsqueeze_impl<D: SimdDescriptor>(
+    d: D,
+    y_start: usize,
+    in_avg: &ImageRect<'_, i32>,
+    in_res: &ImageRect<'_, i32>,
+    in_next_avg: &Option<ImageRect<'_, i32>>,
+    out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+    out: &mut Image<i32>,
+) {
+    const {
+        assert!(D::I32Vec::LEN <= 16);
+        assert!(D::I32Vec::LEN.is_power_of_two());
+    }
+
+    let lanes = D::I32Vec::LEN;
+    assert_eq!(y_start % lanes, 0);
+
+    let (w, h) = in_res.size();
+    if lanes == 1 {
+        return hsqueeze_scalar(y_start, in_avg, in_res, in_next_avg, out_prev, out);
+    }
+
+    let has_tail = out.size().0 & 1 == 1;
+    if has_tail {
+        debug_assert!(in_avg.size().0 == w + 1);
+        debug_assert!(out.size().0 == 2 * w + 1);
+    }
+
+    let mask = !(lanes - 1);
+    let y_limit = if w >= lanes { h & mask } else { y_start };
+
+    let mut buf = [0f32; 512];
+    for y in (y_start..y_limit).step_by(lanes) {
+        for dy in 0..lanes {
+            buf[dy] = f32::from_bits(in_avg.row(y + dy)[0] as u32);
+            buf[lanes + dy] = f32::from_bits(in_res.row(y + dy)[0] as u32);
+        }
+        let mut avg_first = D::F32Vec::load(d, &buf).bitcast_to_i32();
+        let mut res_first = D::F32Vec::load(d, &buf[lanes..]).bitcast_to_i32();
+
+        let mut prev_b = match out_prev {
+            None => avg_first,
+            Some(mc) => {
+                let mc_w = mc.data.size().0;
+                let mc = &mc.data;
+                for (dy, out) in buf[..lanes].iter_mut().enumerate() {
+                    *out = f32::from_bits(mc.row(y + dy)[mc_w - 1] as u32);
+                }
+                D::F32Vec::load(d, &buf).bitcast_to_i32()
+            }
+        };
+
+        let remainder_start = ((w - 1) & mask) + 1;
+        let remainder_count = w - remainder_start;
+        for x in (1..remainder_start).step_by(lanes) {
+            let buf_arr = D::F32Vec::make_array_slice_mut(&mut buf);
+
+            for dy in 0..lanes {
+                let avg_row = &in_avg.row(y + dy)[x..][..lanes];
+                let res_row = &in_res.row(y + dy)[x..][..lanes];
+                let avg = D::I32Vec::load(d, avg_row);
+                let res = D::I32Vec::load(d, res_row);
+                avg.bitcast_to_f32().store_array(&mut buf_arr[2 * dy]);
+                res.bitcast_to_f32().store_array(&mut buf_arr[2 * dy + 1]);
+            }
+            D::F32Vec::transpose_square(d, buf_arr, 2);
+            D::F32Vec::transpose_square(d, &mut buf_arr[1..], 2);
+
+            for idx in 0..lanes {
+                let avg_next = D::F32Vec::load_array(d, &buf_arr[2 * idx]).bitcast_to_i32();
+                let res_next = D::F32Vec::load_array(d, &buf_arr[2 * idx + 1]).bitcast_to_i32();
+                let (a, b) = unsqueeze_impl(d, avg_first, res_first, avg_next, prev_b);
+                a.bitcast_to_f32().store_array(&mut buf_arr[2 * idx]);
+                b.bitcast_to_f32().store_array(&mut buf_arr[2 * idx + 1]);
+                avg_first = avg_next;
+                res_first = res_next;
+                prev_b = b;
+            }
+
+            D::F32Vec::transpose_square(d, buf_arr, 1);
+            D::F32Vec::transpose_square(d, &mut buf_arr[lanes..], 1);
+            for dy in 0..lanes {
+                let out_row = &mut out.row_mut(y + dy)[2 * x - 2..][..2 * lanes];
+                for group in 0..2 {
+                    let v = D::F32Vec::load_array(d, &buf_arr[dy + group * lanes]).bitcast_to_i32();
+                    v.store(&mut out_row[group * lanes..]);
+                }
+            }
+        }
+
+        let x = remainder_start;
+        if remainder_count == 0 {
+            let avg_last = if has_tail {
+                for (idx, out) in buf[..lanes].iter_mut().enumerate() {
+                    *out = f32::from_bits(in_avg.row(y + idx)[w] as u32);
+                }
+                D::F32Vec::load(d, &buf).bitcast_to_i32()
+            } else if let Some(mc) = in_next_avg {
+                for (idx, out) in buf[..lanes].iter_mut().enumerate() {
+                    *out = f32::from_bits(mc.row(y + idx)[0] as u32);
+                }
+                D::F32Vec::load(d, &buf).bitcast_to_i32()
+            } else {
+                avg_first
+            };
+
+            let buf_arr = D::F32Vec::make_array_slice_mut(&mut buf);
+            let (a, b) = unsqueeze_impl(d, avg_first, res_first, avg_last, prev_b);
+            a.bitcast_to_f32().store_array(&mut buf_arr[0]);
+            b.bitcast_to_f32().store_array(&mut buf_arr[1]);
+        } else {
+            for dy in 0..lanes {
+                let avg_row = in_avg.row(y + dy);
+                let res_row = in_res.row(y + dy);
+                for dx in 0..remainder_count {
+                    buf[dx + lanes * 2 * dy] = f32::from_bits(avg_row[x + dx] as u32);
+                    buf[dx + lanes * (2 * dy + 1)] = f32::from_bits(res_row[x + dx] as u32);
+                }
+
+                buf[remainder_count + lanes * 2 * dy] = if has_tail {
+                    f32::from_bits(avg_row[w] as u32)
+                } else if let Some(mc) = in_next_avg {
+                    f32::from_bits(mc.row(y + dy)[0] as u32)
+                } else {
+                    buf[remainder_count - 1 + lanes * 2 * dy]
+                };
+            }
+
+            let buf_arr = D::F32Vec::make_array_slice_mut(&mut buf);
+            D::F32Vec::transpose_square(d, buf_arr, 2);
+            D::F32Vec::transpose_square(d, &mut buf_arr[1..], 2);
+
+            for idx in 0..=remainder_count {
+                let avg_next = D::F32Vec::load_array(d, &buf_arr[2 * idx]).bitcast_to_i32();
+                let res_next = D::F32Vec::load_array(d, &buf_arr[2 * idx + 1]).bitcast_to_i32();
+                let (a, b) = unsqueeze_impl(d, avg_first, res_first, avg_next, prev_b);
+                a.bitcast_to_f32().store_array(&mut buf_arr[2 * idx]);
+                b.bitcast_to_f32().store_array(&mut buf_arr[2 * idx + 1]);
+                avg_first = avg_next;
+                res_first = res_next;
+                prev_b = b;
+            }
+        }
+
+        let buf_arr = D::F32Vec::make_array_slice_mut(&mut buf);
+        D::F32Vec::transpose_square(d, buf_arr, 1);
+        D::F32Vec::transpose_square(d, &mut buf_arr[lanes..], 1);
+
+        let x_limit = 2 * (remainder_count + 1);
+        for dy in 0..lanes {
+            let out_row = &mut out.row_mut(y + dy)[2 * x - 2..];
+            for (dx, out) in out_row[..x_limit].iter_mut().enumerate() {
+                let group = dx / lanes;
+                let group_x = dx % lanes;
+                *out = buf[(dy + group * lanes) * lanes + group_x].to_bits() as i32;
+            }
+        }
+
+        if has_tail {
+            for dy in 0..lanes {
+                out.row_mut(y + dy)[2 * w] = in_avg.row(y + dy)[w];
+            }
+        }
+    }
+
+    let remainder_rows = h - y_limit;
+    // We need `lanes > N` to convince the compiler that this function does not recurse
+    if lanes > 8 && remainder_rows >= 8 && w >= 8 {
+        return hsqueeze_impl(
+            d.maybe_downgrade_256bit(),
+            y_limit,
+            in_avg,
+            in_res,
+            in_next_avg,
+            out_prev,
+            out,
+        );
+    }
+    if lanes > 4 && remainder_rows >= 4 && w >= 4 {
+        return hsqueeze_impl(
+            d.maybe_downgrade_128bit(),
+            y_limit,
+            in_avg,
+            in_res,
+            in_next_avg,
+            out_prev,
+            out,
+        );
+    }
+
+    hsqueeze_scalar(y_limit, in_avg, in_res, in_next_avg, out_prev, out)
+}
+
+#[inline(always)]
+fn hsqueeze_scalar(
+    y_start: usize,
+    in_avg: &ImageRect<'_, i32>,
+    in_res: &ImageRect<'_, i32>,
+    in_next_avg: &Option<ImageRect<'_, i32>>,
+    out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+    out: &mut Image<i32>,
+) {
+    let (w, h) = in_res.size();
+
+    debug_assert!(w >= 1);
+    let has_tail = out.size().0 & 1 == 1;
+    if has_tail {
+        debug_assert!(in_avg.size().0 == w + 1);
+        debug_assert!(out.size().0 == 2 * w + 1);
+    }
+
+    for y in y_start..h {
+        let avg_row = in_avg.row(y);
+        let res_row = in_res.row(y);
+        let mut prev_b = match out_prev {
+            None => avg_row[0],
+            Some(mc) => mc.data.row(y)[mc.data.size().0 - 1],
+        };
+        // Guarantee that `avg_row[x + 1]` is available.
+        let x_end = if has_tail { w } else { w - 1 };
+        for x in 0..x_end {
+            let (a, b) = unsqueeze_scalar(avg_row[x], res_row[x], avg_row[x + 1], prev_b);
+            out.row_mut(y)[2 * x] = a;
+            out.row_mut(y)[2 * x + 1] = b;
+            prev_b = b;
+        }
+        if !has_tail {
+            let last_avg = match in_next_avg {
+                None => avg_row[w - 1],
+                Some(mc) => mc.row(y)[0],
+            };
+            let (a, b) = unsqueeze_scalar(avg_row[w - 1], res_row[w - 1], last_avg, prev_b);
+            out.row_mut(y)[2 * w - 2] = a;
+            out.row_mut(y)[2 * w - 1] = b;
+        } else {
+            // 1 last pixel
+            out.row_mut(y)[2 * w] = in_avg.row(y)[w];
+        }
+    }
+}
+
+simd_function!(
+    hsqueeze,
+    d: D,
+    pub fn hsqueeze_fwd(
+        in_avg: &ImageRect<'_, i32>,
+        in_res: &ImageRect<'_, i32>,
+        in_next_avg: &Option<ImageRect<'_, i32>>,
+        out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+        out: &mut Image<i32>,
+    ) {
+        hsqueeze_impl(d, 0, in_avg, in_res, in_next_avg, out_prev, out)
+    }
+);
+
+pub fn do_hsqueeze_step(
+    in_avg: &ImageRect<'_, i32>,
+    in_res: &ImageRect<'_, i32>,
+    in_next_avg: &Option<ImageRect<'_, i32>>,
+    out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+    buffers: &mut [&mut ModularChannel],
+) {
+    trace!("hsqueeze step in_avg: {in_avg:?} in_res: {in_res:?} in_next_avg: {in_next_avg:?}");
+    let out = buffers.first_mut().unwrap();
+    // Shortcut: guarantees that row is at least 1px in the main loop
+    if out.data.size().0 == 0 || out.data.size().1 == 0 {
+        return;
+    }
+
+    let w = in_res.size().0;
+    // Another shortcut: when output row has just 1px
+    if w == 0 {
+        let out_h = out.data.size().1;
+        for y in 0..out_h {
+            out.data.row_mut(y)[0] = in_avg.row(y)[0];
+        }
+        return;
+    }
+    // Otherwise: 2 or more in in row
+    hsqueeze(in_avg, in_res, in_next_avg, out_prev, &mut out.data);
+}
+
+#[inline(always)]
+fn vsqueeze_impl<D: SimdDescriptor>(
+    d: D,
+    x_start: usize,
+    in_avg: &ImageRect<'_, i32>,
+    in_res: &ImageRect<'_, i32>,
+    in_next_avg: &Option<ImageRect<'_, i32>>,
+    out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+    out: &mut Image<i32>,
+) {
+    const { assert!(D::I32Vec::LEN.is_power_of_two()) };
+
+    let lanes = D::I32Vec::LEN;
+    assert_eq!(x_start % lanes, 0);
+
+    let (w, h) = in_res.size();
+    if lanes == 1 {
+        return vsqueeze_scalar(x_start, in_avg, in_res, in_next_avg, out_prev, out);
+    }
+
+    let has_tail = out.size().1 & 1 == 1;
+    if has_tail {
+        debug_assert!(in_avg.size().1 == h + 1);
+        debug_assert!(out.size().1 == 2 * h + 1);
+    }
+
+    let mask = !(lanes - 1);
+    let x_limit = if w >= lanes { w & mask } else { x_start };
+
+    let prev_b_row = match out_prev {
+        None => in_avg.row(0),
+        Some(mc) => mc.data.row(mc.data.size().1 - 1),
+    };
+
+    for x in (x_start..x_limit).step_by(lanes) {
+        let mut prev_b = D::I32Vec::load(d, &prev_b_row[x..]);
+        let mut avg_first = D::I32Vec::load(d, &in_avg.row(0)[x..]);
+        let mut res_first = D::I32Vec::load(d, &in_res.row(0)[x..]);
+        for y in 0..h - 1 {
+            let avg_next = D::I32Vec::load(d, &in_avg.row(y + 1)[x..]);
+            let (a, b) = unsqueeze_impl(d, avg_first, res_first, avg_next, prev_b);
+            a.store(&mut out.row_mut(2 * y)[x..]);
+            b.store(&mut out.row_mut(2 * y + 1)[x..]);
+            prev_b = b;
+            avg_first = avg_next;
+            res_first = D::I32Vec::load(d, &in_res.row(y + 1)[x..]);
+        }
+
+        let avg_last = if has_tail {
+            D::I32Vec::load(d, &in_avg.row(h)[x..])
+        } else if let Some(mc) = in_next_avg {
+            D::I32Vec::load(d, &mc.row(0)[x..])
+        } else {
+            avg_first
+        };
+        let (a, b) = unsqueeze_impl(d, avg_first, res_first, avg_last, prev_b);
+        a.store(&mut out.row_mut(2 * h - 2)[x..]);
+        b.store(&mut out.row_mut(2 * h - 1)[x..]);
+
+        if has_tail {
+            avg_last.store(&mut out.row_mut(2 * h)[x..]);
+        }
+    }
+
+    let remainder_cols = w - x_limit;
+    // We need `lanes > N` to convince the compiler that this function does not recurse
+    if lanes > 8 && remainder_cols >= 8 {
+        return vsqueeze_impl(
+            d.maybe_downgrade_256bit(),
+            x_limit,
+            in_avg,
+            in_res,
+            in_next_avg,
+            out_prev,
+            out,
+        );
+    }
+    if lanes > 4 && remainder_cols >= 4 {
+        return vsqueeze_impl(
+            d.maybe_downgrade_128bit(),
+            x_limit,
+            in_avg,
+            in_res,
+            in_next_avg,
+            out_prev,
+            out,
+        );
+    }
+
+    vsqueeze_scalar(x_limit, in_avg, in_res, in_next_avg, out_prev, out)
+}
+
+#[inline(always)]
+fn vsqueeze_scalar(
+    x_start: usize,
+    in_avg: &ImageRect<'_, i32>,
+    in_res: &ImageRect<'_, i32>,
+    in_next_avg: &Option<ImageRect<'_, i32>>,
+    out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+    out: &mut Image<i32>,
+) {
+    let (w, h) = in_res.size();
+
+    let has_tail = out.size().1 & 1 == 1;
+    if has_tail {
+        debug_assert!(in_avg.size().1 == h + 1);
+        debug_assert!(out.size().1 == 2 * h + 1);
+    }
+
+    {
+        let prev_b_row = match out_prev {
+            None => in_avg.row(0),
+            Some(mc) => mc.data.row(mc.data.size().1 - 1),
+        };
+        let avg_row = in_avg.row(0);
+        let res_row = in_res.row(0);
+        let avg_row_next = if !has_tail && (h == 1) {
+            match in_next_avg {
+                None => in_avg.row(0),
+                Some(mc) => mc.row(0),
+            }
+        } else {
+            in_avg.row(1)
+        };
+        for x in x_start..w {
+            let (a, b) = unsqueeze_scalar(avg_row[x], res_row[x], avg_row_next[x], prev_b_row[x]);
+            out.row_mut(0)[x] = a;
+            out.row_mut(1)[x] = b;
+        }
+    }
+    for y in 1..h {
+        let avg_row = in_avg.row(y);
+        let res_row = in_res.row(y);
+        let avg_row_next = if has_tail || y < h - 1 {
+            in_avg.row(y + 1)
+        } else {
+            match in_next_avg {
+                None => avg_row,
+                Some(mc) => mc.row(0),
+            }
+        };
+        for x in x_start..w {
+            let (a, b) = unsqueeze_scalar(
+                avg_row[x],
+                res_row[x],
+                avg_row_next[x],
+                out.row(2 * y - 1)[x],
+            );
+            out.row_mut(2 * y)[x] = a;
+            out.row_mut(2 * y + 1)[x] = b;
+        }
+    }
+    if has_tail {
+        out.row_mut(2 * h)[x_start..].copy_from_slice(&in_avg.row(h)[x_start..]);
+    }
+}
+
+simd_function!(
+    vsqueeze,
+    d: D,
+    pub fn vsqueeze_fwd(
+        in_avg: &ImageRect<'_, i32>,
+        in_res: &ImageRect<'_, i32>,
+        in_next_avg: &Option<ImageRect<'_, i32>>,
+        out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+        out: &mut Image<i32>,
+    ) {
+        vsqueeze_impl(d, 0, in_avg, in_res, in_next_avg, out_prev, out)
+    }
+);
+
+pub fn do_vsqueeze_step(
+    in_avg: &ImageRect<'_, i32>,
+    in_res: &ImageRect<'_, i32>,
+    in_next_avg: &Option<ImageRect<'_, i32>>,
+    out_prev: &Option<AtomicRef<'_, ModularChannel>>,
+    buffers: &mut [&mut ModularChannel],
+) {
+    trace!("vsqueeze step in_avg: {in_avg:?} in_res: {in_res:?} in_next_avg: {in_next_avg:?}");
+    let out = &mut buffers.first_mut().unwrap().data;
+    // Shortcut: guarantees that there at least 1 output row
+    if out.size().1 == 0 || out.size().0 == 0 {
+        return;
+    }
+    // Another shortcut: when there is one output row
+    if in_res.size().1 == 0 {
+        out.row_mut(0).copy_from_slice(in_avg.row(0));
+        return;
+    }
+    // Otherwise: 2 or more rows
+
+    vsqueeze(in_avg, in_res, in_next_avg, out_prev, out);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/tree.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/tree.rs
new file mode 100644
index 00000000..ee5af339
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/modular/tree.rs
@@ -0,0 +1,644 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use super::{Predictor, predict::WeightedPredictorState};
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::Histograms,
+    entropy_coding::decode::SymbolReader,
+    error::{Error, Result},
+    frame::modular::predict::PredictionData,
+    image::Image,
+    util::{MemoryTracker, NewWithCapacity, tracing_wrappers::*},
+};
+
+#[derive(Debug, Clone, Copy)]
+pub enum TreeNode {
+    Split {
+        property: u8,
+        val: i32,
+        left: u32,
+        right: u32,
+    },
+    Leaf {
+        predictor: Predictor,
+        offset: i32,
+        multiplier: u32,
+        id: u32,
+    },
+}
+
+/// Flattened tree node for optimized traversal (matches C++ FlatDecisionNode).
+/// Stores parent + info about both children to evaluate 3 nodes per iteration.
+// TODO(hjanuschka): investigate performance of using a Rust enum here, and whether
+// separating internal nodes and leaves into two arrays could save a branch.
+#[derive(Debug, Clone, Copy)]
+pub(super) struct FlatTreeNode {
+    property0: i32,                    // Property to test, -1 if leaf
+    splitval0_or_predictor: i32,       // Split value, or predictor if leaf
+    splitvals_or_multiplier: [i32; 2], // Child splitvals, or multiplier if leaf
+    child_id: u32,                     // Index to first grandchild, or context if leaf
+    properties_or_offset: [i16; 2],    // Child properties, or offset if leaf
+    /// Pre-validated predictor enum for leaf nodes (avoids per-pixel try_from + unwrap).
+    /// Only valid when property0 < 0 (leaf node).
+    predictor: Predictor,
+}
+
+impl FlatTreeNode {
+    #[inline]
+    fn leaf(predictor: Predictor, offset: i32, multiplier: u32, context: u32) -> Self {
+        Self {
+            property0: -1,
+            splitval0_or_predictor: predictor as i32,
+            splitvals_or_multiplier: [multiplier as i32, 0],
+            child_id: context,
+            properties_or_offset: [offset as i16, 0],
+            predictor,
+        }
+    }
+}
+
+pub struct Tree {
+    pub nodes: Vec<TreeNode>,
+    pub histograms: Histograms,
+}
+
+fn validate_tree(tree: &[TreeNode], num_properties: usize) -> Result<()> {
+    const HEIGHT_LIMIT: usize = 2048;
+
+    if tree.is_empty() {
+        return Ok(());
+    }
+
+    // This mirrors libjxl's ValidateTree(), but avoids allocating
+    // `num_properties * tree.len()` entries.
+    //
+    // We do an explicit DFS and keep the property ranges only for the current root->node path.
+    // When descending into a child we update exactly one property's range (the one we split on)
+    // and store the previous range in the child frame; when returning from that child we restore
+    // it. This makes memory O(num_properties + height) instead of O(num_properties * tree_size).
+
+    #[derive(Clone, Copy, Debug)]
+    enum Stage {
+        Enter,
+        AfterLeft,
+        AfterRight,
+    }
+
+    struct Frame {
+        node: usize,
+        depth: usize,
+        stage: Stage,
+        restore: Option<(usize, (i32, i32))>,
+    }
+
+    let mut property_ranges: Vec<(i32, i32)> = vec![(i32::MIN, i32::MAX); num_properties];
+    let mut stack = vec![Frame {
+        node: 0,
+        depth: 0,
+        stage: Stage::Enter,
+        restore: None,
+    }];
+
+    while let Some(mut frame) = stack.pop() {
+        if frame.depth > HEIGHT_LIMIT {
+            return Err(Error::TreeTooTall(frame.depth, HEIGHT_LIMIT));
+        }
+
+        match (frame.stage, tree[frame.node]) {
+            (Stage::Enter, TreeNode::Leaf { .. }) => {
+                if let Some((p, old)) = frame.restore {
+                    property_ranges[p] = old;
+                }
+            }
+            (
+                Stage::Enter,
+                TreeNode::Split {
+                    property,
+                    val,
+                    left,
+                    right: _,
+                },
+            ) => {
+                let p = property as usize;
+                let (l, u) = property_ranges[p];
+                if l > val || u <= val {
+                    return Err(Error::TreeSplitOnEmptyRange(property, val, l, u));
+                }
+
+                frame.stage = Stage::AfterLeft;
+                let depth = frame.depth;
+                stack.push(frame);
+
+                // Descend into left child: range becomes (val+1, u).
+                let old = property_ranges[p];
+                property_ranges[p] = (val + 1, u);
+                stack.push(Frame {
+                    node: left as usize,
+                    depth: depth + 1,
+                    stage: Stage::Enter,
+                    restore: Some((p, old)),
+                });
+            }
+            (
+                Stage::AfterLeft,
+                TreeNode::Split {
+                    property,
+                    val,
+                    left: _,
+                    right,
+                },
+            ) => {
+                let p = property as usize;
+                let (l, u) = property_ranges[p];
+                if l > val || u <= val {
+                    return Err(Error::TreeSplitOnEmptyRange(property, val, l, u));
+                }
+
+                frame.stage = Stage::AfterRight;
+                let depth = frame.depth;
+                stack.push(frame);
+
+                // Descend into right child: range becomes (l, val).
+                let old = property_ranges[p];
+                property_ranges[p] = (l, val);
+                stack.push(Frame {
+                    node: right as usize,
+                    depth: depth + 1,
+                    stage: Stage::Enter,
+                    restore: Some((p, old)),
+                });
+            }
+            (Stage::AfterRight, TreeNode::Split { .. }) => {
+                if let Some((p, old)) = frame.restore {
+                    property_ranges[p] = old;
+                }
+            }
+            _ => unreachable!("invalid tree validation state"),
+        }
+    }
+
+    Ok(())
+}
+
+impl Debug for Tree {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Tree[{:?}]", self.nodes)
+    }
+}
+
+#[derive(Debug)]
+pub struct PredictionResult {
+    pub guess: i64,
+    pub multiplier: u32,
+    pub context: u32,
+}
+
+pub const NUM_NONREF_PROPERTIES: usize = 16;
+pub const PROPERTIES_PER_PREVCHAN: usize = 4;
+
+const SPLIT_VAL_CONTEXT: usize = 0;
+const PROPERTY_CONTEXT: usize = 1;
+const PREDICTOR_CONTEXT: usize = 2;
+const OFFSET_CONTEXT: usize = 3;
+const MULTIPLIER_LOG_CONTEXT: usize = 4;
+const MULTIPLIER_BITS_CONTEXT: usize = 5;
+const NUM_TREE_CONTEXTS: usize = 6;
+
+// Note: `property_buffer` is passed as input because this implementation relies on having the
+// previous values available for computing the local gradient property.
+// Also, the first two properties (the static properties) should be already set by the caller.
+// All other properties should be 0 on the first call in a row.
+
+/// Computes properties for tree traversal. Shared between flat and non-flat prediction.
+/// Returns the weighted predictor prediction value.
+#[inline(always)]
+#[allow(clippy::too_many_arguments)]
+fn compute_properties(
+    prediction_data: PredictionData,
+    xsize: usize,
+    wp_state: Option<&mut WeightedPredictorState>,
+    x: usize,
+    y: usize,
+    references: &Image<i32>,
+    property_buffer: &mut [i32],
+    used_mask: u32,
+) -> i64 {
+    let PredictionData {
+        left,
+        top,
+        toptop,
+        topleft,
+        topright,
+        leftleft,
+        toprightright: _,
+    } = prediction_data;
+
+    // Assert length so the compiler can eliminate bounds checks for constant indices 0..16.
+    assert!(property_buffer.len() >= NUM_NONREF_PROPERTIES);
+
+    // Position (properties 2-3)
+    if used_mask & 0b1100 != 0 {
+        property_buffer[2] = y as i32;
+        property_buffer[3] = x as i32;
+    }
+
+    // Neighbours (properties 4-7)
+    if used_mask & 0b1111_0000 != 0 {
+        property_buffer[4] = top.wrapping_abs();
+        property_buffer[5] = left.wrapping_abs();
+        property_buffer[6] = top;
+        property_buffer[7] = left;
+    }
+
+    // Local gradient (properties 8-9, always computed together)
+    if used_mask & 0b11_0000_0000 != 0 {
+        property_buffer[8] = left.wrapping_sub(property_buffer[9]);
+        property_buffer[9] = left.wrapping_add(top).wrapping_sub(topleft);
+    }
+
+    // FFV1 context properties (10-14)
+    if used_mask & 0b0111_1100_0000_0000 != 0 {
+        property_buffer[10] = left.wrapping_sub(topleft);
+        property_buffer[11] = topleft.wrapping_sub(top);
+        property_buffer[12] = top.wrapping_sub(topright);
+        property_buffer[13] = top.wrapping_sub(toptop);
+        property_buffer[14] = left.wrapping_sub(leftleft);
+    }
+
+    // Weighted predictor property (15).
+    // We always need wp_pred for the return value when wp_state is present,
+    // but only write property_buffer[15] when the tree uses it.
+    let (wp_pred, wp_prop) = wp_state
+        .map(|wp_state| wp_state.predict_and_property((x, y), xsize, &prediction_data))
+        .unwrap_or((0, 0));
+    if used_mask & (1 << 15) != 0 {
+        property_buffer[15] = wp_prop;
+    }
+
+    // Reference properties (16+).
+    if used_mask >> 16 != 0 {
+        let num_refs = references.size().0;
+        if num_refs != 0 {
+            let ref_properties = &mut property_buffer[NUM_NONREF_PROPERTIES..];
+            ref_properties[..num_refs].copy_from_slice(&references.row(x)[..num_refs]);
+        }
+    }
+
+    wp_pred
+}
+
+/// Prediction using standard tree traversal.
+/// Used for small channels where building a flat tree isn't worth it.
+#[inline]
+#[instrument(level = "trace", ret)]
+#[allow(clippy::too_many_arguments)]
+pub(super) fn predict(
+    tree: &[TreeNode],
+    prediction_data: PredictionData,
+    xsize: usize,
+    wp_state: Option<&mut WeightedPredictorState>,
+    x: usize,
+    y: usize,
+    references: &Image<i32>,
+    property_buffer: &mut [i32],
+    used_mask: u32,
+) -> PredictionResult {
+    let wp_pred = compute_properties(
+        prediction_data,
+        xsize,
+        wp_state,
+        x,
+        y,
+        references,
+        property_buffer,
+        used_mask,
+    );
+
+    trace!(?property_buffer, "new properties");
+
+    let mut tree_node = 0;
+    while let TreeNode::Split {
+        property,
+        val,
+        left,
+        right,
+    } = tree[tree_node]
+    {
+        if property_buffer[property as usize] > val {
+            trace!(
+                "left at node {tree_node} [{} > {val}]",
+                property_buffer[property as usize]
+            );
+            tree_node = left as usize;
+        } else {
+            trace!(
+                "right at node {tree_node} [{} <= {val}]",
+                property_buffer[property as usize]
+            );
+            tree_node = right as usize;
+        }
+    }
+
+    trace!(leaf = ?tree[tree_node]);
+
+    let TreeNode::Leaf {
+        predictor,
+        offset,
+        multiplier,
+        id,
+    } = tree[tree_node]
+    else {
+        unreachable!();
+    };
+
+    let pred = predictor.predict_one(prediction_data, wp_pred);
+
+    PredictionResult {
+        guess: pred + offset as i64,
+        multiplier,
+        context: id,
+    }
+}
+
+/// Optimized prediction using flat tree (matches C++ context_predict.h:351-371).
+#[inline(always)]
+#[allow(clippy::too_many_arguments)]
+pub(super) fn predict_flat(
+    flat_tree: &[FlatTreeNode],
+    prediction_data: PredictionData,
+    xsize: usize,
+    wp_state: Option<&mut WeightedPredictorState>,
+    x: usize,
+    y: usize,
+    references: &Image<i32>,
+    property_buffer: &mut [i32],
+    used_mask: u32,
+) -> PredictionResult {
+    let wp_pred = compute_properties(
+        prediction_data,
+        xsize,
+        wp_state,
+        x,
+        y,
+        references,
+        property_buffer,
+        used_mask,
+    );
+
+    // Flat tree traversal — all child_id + offset values are validated
+    // in build_flat_tree, so indexing here cannot go out of bounds.
+    let mut pos = 0;
+    loop {
+        let node = &flat_tree[pos];
+
+        if node.property0 < 0 {
+            // Leaf node — predictor was pre-validated at tree build time
+            let pred = node.predictor.predict_one(prediction_data, wp_pred);
+
+            return PredictionResult {
+                guess: pred + node.properties_or_offset[0] as i64,
+                multiplier: node.splitvals_or_multiplier[0] as u32,
+                context: node.child_id,
+            };
+        }
+
+        // Split node: C++ logic from context_predict.h:361-365
+        let p0 = property_buffer[node.property0 as usize] <= node.splitval0_or_predictor;
+        let off0 = if property_buffer[node.properties_or_offset[0] as usize]
+            <= node.splitvals_or_multiplier[0]
+        {
+            1
+        } else {
+            0
+        };
+        let off1 = if property_buffer[node.properties_or_offset[1] as usize]
+            <= node.splitvals_or_multiplier[1]
+        {
+            3
+        } else {
+            2
+        };
+
+        pos = (node.child_id + if p0 { off1 } else { off0 }) as usize;
+    }
+}
+
+impl Tree {
+    #[instrument(level = "debug", skip(br, memory_tracker), err)]
+    pub fn read(
+        br: &mut BitReader,
+        size_limit: usize,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<Tree> {
+        assert!(size_limit <= u32::MAX as usize);
+        trace!(pos = br.total_bits_read());
+        let tree_histograms = Histograms::decode(NUM_TREE_CONTEXTS, br, true)?;
+        let mut tree_reader = SymbolReader::new(&tree_histograms, br, None)?;
+        // TODO(veluca): consider early-exiting for trees known to be infinite.
+        let mut tree: Vec<TreeNode> = vec![];
+        let mut to_decode = 1;
+        let mut leaf_id = 0;
+        let mut max_property = 0;
+        while to_decode > 0 {
+            if tree.len() > size_limit {
+                return Err(Error::TreeTooLarge(tree.len(), size_limit));
+            }
+            if tree.len() >= tree.capacity() {
+                tree.try_reserve(tree.len() * 2 + 1)?;
+            }
+            to_decode -= 1;
+            let property = tree_reader.read_unsigned(&tree_histograms, br, PROPERTY_CONTEXT);
+            trace!(property);
+            if let Some(property) = property.checked_sub(1) {
+                // inner node.
+                if property > 255 {
+                    return Err(Error::InvalidProperty(property));
+                }
+                max_property = max_property.max(property);
+                let splitval = tree_reader.read_signed(&tree_histograms, br, SPLIT_VAL_CONTEXT);
+                let left_child = (tree.len() + to_decode + 1) as u32;
+                let node = TreeNode::Split {
+                    property: property as u8,
+                    val: splitval,
+                    left: left_child,
+                    right: left_child + 1,
+                };
+                trace!("split node {:?}", node);
+                to_decode += 2;
+                tree.push(node);
+            } else {
+                let predictor = Predictor::try_from(tree_reader.read_unsigned(
+                    &tree_histograms,
+                    br,
+                    PREDICTOR_CONTEXT,
+                ))?;
+                let offset = tree_reader.read_signed(&tree_histograms, br, OFFSET_CONTEXT);
+                let mul_log =
+                    tree_reader.read_unsigned(&tree_histograms, br, MULTIPLIER_LOG_CONTEXT);
+                if mul_log >= 31 {
+                    return Err(Error::TreeMultiplierTooLarge(mul_log, 31));
+                }
+                let mul_bits =
+                    tree_reader.read_unsigned(&tree_histograms, br, MULTIPLIER_BITS_CONTEXT);
+                let multiplier = (mul_bits as u64 + 1) << mul_log;
+                if multiplier > (u32::MAX as u64) {
+                    return Err(Error::TreeMultiplierBitsTooLarge(mul_bits, mul_log));
+                }
+                let node = TreeNode::Leaf {
+                    predictor,
+                    offset,
+                    id: leaf_id,
+                    multiplier: multiplier as u32,
+                };
+                leaf_id += 1;
+                trace!("leaf node {:?}", node);
+                tree.push(node);
+            }
+        }
+        tree_reader.check_final_state(&tree_histograms, br)?;
+
+        let num_properties = max_property as usize + 1;
+        validate_tree(&tree, num_properties)?;
+
+        // Check memory budget for flat tree allocation
+        memory_tracker.check_alloc((tree.len() * std::mem::size_of::<FlatTreeNode>()) as u64)?;
+
+        let histograms = Histograms::decode(tree.len().div_ceil(2), br, true)?;
+
+        Ok(Tree {
+            nodes: tree,
+            histograms,
+        })
+    }
+
+    /// Compute a bitmask of which properties the tree actually splits on.
+    /// Only those properties need to be computed per pixel in `compute_properties`.
+    pub(super) fn compute_used_property_mask(nodes: &[TreeNode]) -> u32 {
+        let mut mask = 0u32;
+        for node in nodes {
+            if let TreeNode::Split { property, .. } = node {
+                // Properties >= 32 can't be tracked in a u32 mask; set all high
+                // bits so they are always computed in compute_properties.
+                mask |= 1u32.checked_shl(*property as u32).unwrap_or(u32::MAX);
+            }
+        }
+        // Properties 8 and 9 are coupled: property 8 reads the previous value
+        // of property 9, and property 9 is written alongside 8. If either is
+        // used by the tree, both must be computed.
+        if mask & ((1 << 8) | (1 << 9)) != 0 {
+            mask |= (1 << 8) | (1 << 9);
+        }
+        mask
+    }
+
+    /// Build flat tree using BFS traversal (matches C++ encoding.cc:81-144).
+    /// Each flat node stores parent + both children info to reduce branches.
+    pub(super) fn build_flat_tree(nodes: &[TreeNode]) -> Result<Vec<FlatTreeNode>> {
+        use std::collections::VecDeque;
+
+        if nodes.is_empty() {
+            return Ok(vec![]);
+        }
+
+        let mut flat_nodes = Vec::new_with_capacity(nodes.len())?;
+        let mut queue: VecDeque<usize> = VecDeque::new();
+        queue.push_back(0); // Start with root
+
+        while let Some(cur_idx) = queue.pop_front() {
+            match &nodes[cur_idx] {
+                TreeNode::Leaf {
+                    predictor,
+                    offset,
+                    multiplier,
+                    id,
+                } => {
+                    flat_nodes.push(FlatTreeNode::leaf(*predictor, *offset, *multiplier, *id));
+                }
+                TreeNode::Split {
+                    property,
+                    val,
+                    left,
+                    right,
+                } => {
+                    // childID points to first of 4 grandchildren in output
+                    let child_id = (flat_nodes.len() + queue.len() + 1) as u32;
+
+                    let mut flat = FlatTreeNode {
+                        property0: *property as i32,
+                        splitval0_or_predictor: *val,
+                        splitvals_or_multiplier: [0, 0],
+                        child_id,
+                        properties_or_offset: [0, 0],
+                        predictor: Predictor::Zero, // unused for split nodes
+                    };
+
+                    // Process left (i=0) and right (i=1) children
+                    for (i, &child_idx) in [*left as usize, *right as usize].iter().enumerate() {
+                        match &nodes[child_idx] {
+                            TreeNode::Leaf { .. } => {
+                                // Child is leaf: set property=0 and enqueue leaf twice
+                                flat.properties_or_offset[i] = 0;
+                                flat.splitvals_or_multiplier[i] = 0;
+                                queue.push_back(child_idx);
+                                queue.push_back(child_idx);
+                            }
+                            TreeNode::Split {
+                                property: cp,
+                                val: cv,
+                                left: cl,
+                                right: cr,
+                            } => {
+                                // Child is split: store property/splitval and enqueue grandchildren
+                                flat.properties_or_offset[i] = *cp as i16;
+                                flat.splitvals_or_multiplier[i] = *cv;
+                                queue.push_back(*cl as usize);
+                                queue.push_back(*cr as usize);
+                            }
+                        }
+                    }
+
+                    flat_nodes.push(flat);
+                }
+            }
+        }
+
+        // Validate that all child_id references are within bounds.
+        // Split nodes can index up to child_id + 3 (the maximum offset from off1).
+        let len = flat_nodes.len();
+        for node in &flat_nodes {
+            if node.property0 >= 0 {
+                // Split node: child_id + 3 must be a valid index
+                let max_child = node.child_id as usize + 3;
+                if max_child >= len {
+                    return Err(Error::TreeTooLarge(max_child + 1, len));
+                }
+            }
+        }
+
+        Ok(flat_nodes)
+    }
+
+    pub fn max_property_count(&self) -> usize {
+        self.nodes
+            .iter()
+            .map(|x| match x {
+                TreeNode::Leaf { .. } => 0,
+                TreeNode::Split { property, .. } => *property,
+            })
+            .max()
+            .unwrap_or_default() as usize
+            + 1
+    }
+
+    #[allow(dead_code)] // Part of Tree analysis API
+    pub fn num_prev_channels(&self) -> usize {
+        self.max_property_count()
+            .saturating_sub(NUM_NONREF_PROPERTIES)
+            .div_ceil(PROPERTIES_PER_PREVCHAN)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/quant_weights.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/quant_weights.rs
new file mode 100644
index 00000000..13c780a7
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/quant_weights.rs
@@ -0,0 +1,2194 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{borrow::Cow, f32::consts::SQRT_2, sync::OnceLock};
+
+use crate::util::f16;
+
+use crate::transforms::transform_map::*;
+use crate::{
+    BLOCK_DIM, BLOCK_SIZE,
+    bit_reader::BitReader,
+    error::{
+        Error::{
+            HfQuantFactorTooSmall, InvalidDistanceBand, InvalidQuantEncoding,
+            InvalidQuantEncodingMode, InvalidQuantizationTableWeight, InvalidRawQuantTable,
+        },
+        Result,
+    },
+    frame::{
+        LfGlobalState,
+        modular::{ModularChannel, ModularStreamId, decode::decode_modular_subbitstream},
+    },
+    headers::{bit_depth::BitDepth, frame_header::FrameHeader},
+    image::Rect,
+    util::MemoryTracker,
+};
+
+pub const INV_LF_QUANT: [f32; 3] = [4096.0, 512.0, 256.0];
+
+pub const LF_QUANT: [f32; 3] = [
+    1.0 / INV_LF_QUANT[0],
+    1.0 / INV_LF_QUANT[1],
+    1.0 / INV_LF_QUANT[2],
+];
+
+const ALMOST_ZERO: f32 = 1e-8;
+
+const LOG2_NUM_QUANT_MODES: usize = 3;
+
+#[derive(Debug)]
+pub struct DctQuantWeightParams {
+    params: [[f32; Self::MAX_DISTANCE_BANDS]; 3],
+    num_bands: usize,
+}
+impl DctQuantWeightParams {
+    const LOG2_MAX_DISTANCE_BANDS: usize = 4;
+    const MAX_DISTANCE_BANDS: usize = 1 + (1 << Self::LOG2_MAX_DISTANCE_BANDS);
+
+    #[inline(never)]
+    pub fn from_array<const N: usize>(values: &[[f32; N]; 3]) -> Self {
+        let mut result = Self {
+            params: [[0.0; Self::MAX_DISTANCE_BANDS]; 3],
+            num_bands: N,
+        };
+        for (params, values) in result.params.iter_mut().zip(values) {
+            params[..values.len()].copy_from_slice(values);
+        }
+        result
+    }
+
+    #[inline(never)]
+    pub fn decode(br: &mut BitReader) -> Result<Self> {
+        let num_bands = br.read(Self::LOG2_MAX_DISTANCE_BANDS)? as usize + 1;
+        let mut params = [[0.0; Self::MAX_DISTANCE_BANDS]; 3];
+        for row in params.iter_mut() {
+            for item in row[..num_bands].iter_mut() {
+                *item = f32::from(f16::from_bits(br.read(16)? as u16));
+            }
+            if row[0] < ALMOST_ZERO {
+                return Err(HfQuantFactorTooSmall(row[0]));
+            }
+            row[0] *= 64.0;
+        }
+        Ok(DctQuantWeightParams { params, num_bands })
+    }
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Debug)]
+pub enum QuantEncoding {
+    Library,
+    // a.k.a. "Hornuss"
+    Identity {
+        xyb_weights: [[f32; 3]; 3],
+    },
+    Dct2 {
+        xyb_weights: [[f32; 6]; 3],
+    },
+    Dct4 {
+        params: DctQuantWeightParams,
+        xyb_mul: [[f32; 2]; 3],
+    },
+    Dct4x8 {
+        params: DctQuantWeightParams,
+        xyb_mul: [f32; 3],
+    },
+    Afv {
+        params4x8: DctQuantWeightParams,
+        params4x4: DctQuantWeightParams,
+        weights: [[f32; 9]; 3],
+    },
+    Dct {
+        params: DctQuantWeightParams,
+    },
+    Raw {
+        qtable: Vec<i32>,
+        qtable_den: f32,
+    },
+}
+
+impl QuantEncoding {
+    // TODO(veluca): figure out if this should actually be unused.
+    #[allow(dead_code)]
+    pub fn raw_from_qtable(qtable: Vec<i32>, shift: i32) -> Self {
+        Self::Raw {
+            qtable,
+            qtable_den: (1 << shift) as f32 * (1.0 / (8.0 * 255.0)),
+        }
+    }
+
+    pub fn decode(
+        mut required_size_x: usize,
+        mut required_size_y: usize,
+        index: usize,
+        header: &FrameHeader,
+        lf_global: &LfGlobalState,
+        br: &mut BitReader,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<Self> {
+        let required_size = required_size_x * required_size_y;
+        required_size_x *= BLOCK_DIM;
+        required_size_y *= BLOCK_DIM;
+        let mode = br.read(LOG2_NUM_QUANT_MODES)? as u8;
+        match mode {
+            0 => Ok(Self::Library),
+            1 => {
+                if required_size != 1 {
+                    return Err(InvalidQuantEncoding {
+                        mode,
+                        required_size,
+                    });
+                }
+                let mut xyb_weights = [[0.0; 3]; 3];
+                for row in xyb_weights.iter_mut() {
+                    for item in row.iter_mut() {
+                        *item = f32::from(f16::from_bits(br.read(16)? as u16));
+                        if item.abs() < ALMOST_ZERO {
+                            return Err(HfQuantFactorTooSmall(*item));
+                        }
+                        *item *= 64.0;
+                    }
+                }
+                Ok(Self::Identity { xyb_weights })
+            }
+            2 => {
+                if required_size != 1 {
+                    return Err(InvalidQuantEncoding {
+                        mode,
+                        required_size,
+                    });
+                }
+                let mut xyb_weights = [[0.0; 6]; 3];
+                for row in xyb_weights.iter_mut() {
+                    for item in row.iter_mut() {
+                        *item = f32::from(f16::from_bits(br.read(16)? as u16));
+                        if item.abs() < ALMOST_ZERO {
+                            return Err(HfQuantFactorTooSmall(*item));
+                        }
+                        *item *= 64.0;
+                    }
+                }
+                Ok(Self::Dct2 { xyb_weights })
+            }
+            3 => {
+                if required_size != 1 {
+                    return Err(InvalidQuantEncoding {
+                        mode,
+                        required_size,
+                    });
+                }
+                let mut xyb_mul = [[0.0; 2]; 3];
+                for row in xyb_mul.iter_mut() {
+                    for item in row.iter_mut() {
+                        *item = f32::from(f16::from_bits(br.read(16)? as u16));
+                        if item.abs() < ALMOST_ZERO {
+                            return Err(HfQuantFactorTooSmall(*item));
+                        }
+                    }
+                }
+                let params = DctQuantWeightParams::decode(br)?;
+                Ok(Self::Dct4 { params, xyb_mul })
+            }
+            4 => {
+                if required_size != 1 {
+                    return Err(InvalidQuantEncoding {
+                        mode,
+                        required_size,
+                    });
+                }
+                let mut xyb_mul = [0.0; 3];
+                for item in xyb_mul.iter_mut() {
+                    *item = f32::from(f16::from_bits(br.read(16)? as u16));
+                    if item.abs() < ALMOST_ZERO {
+                        return Err(HfQuantFactorTooSmall(*item));
+                    }
+                }
+                let params = DctQuantWeightParams::decode(br)?;
+                Ok(Self::Dct4x8 { params, xyb_mul })
+            }
+            5 => {
+                if required_size != 1 {
+                    return Err(InvalidQuantEncoding {
+                        mode,
+                        required_size,
+                    });
+                }
+                let mut weights = [[0.0; 9]; 3];
+                for row in weights.iter_mut() {
+                    for item in row.iter_mut() {
+                        *item = f32::from(f16::from_bits(br.read(16)? as u16));
+                    }
+                    for item in row[0..6].iter_mut() {
+                        *item *= 64.0;
+                    }
+                }
+                let params4x8 = DctQuantWeightParams::decode(br)?;
+                let params4x4 = DctQuantWeightParams::decode(br)?;
+                Ok(Self::Afv {
+                    params4x8,
+                    params4x4,
+                    weights,
+                })
+            }
+            6 => {
+                let params = DctQuantWeightParams::decode(br)?;
+                Ok(Self::Dct { params })
+            }
+            7 => {
+                let qtable_den = f32::from(f16::from_bits(br.read(16)? as u16));
+                if qtable_den < ALMOST_ZERO {
+                    // qtable[] values are already checked for <= 0 so the denominator may not be negative.
+                    return Err(InvalidRawQuantTable);
+                }
+                let bit_depth = BitDepth::integer_samples(8);
+                let mut image = [
+                    ModularChannel::new((required_size_x, required_size_y), bit_depth)?,
+                    ModularChannel::new((required_size_x, required_size_y), bit_depth)?,
+                    ModularChannel::new((required_size_x, required_size_y), bit_depth)?,
+                ];
+                let stream_id = ModularStreamId::QuantTable(index).get_id(header);
+                decode_modular_subbitstream(
+                    image.iter_mut().collect(),
+                    stream_id,
+                    None,
+                    &lf_global.tree,
+                    br,
+                    memory_tracker,
+                )?;
+                let mut qtable = Vec::with_capacity(required_size_x * required_size_y * 3);
+                for channel in image.iter_mut() {
+                    for entry in channel
+                        .data
+                        .get_rect(Rect {
+                            size: (required_size_x, required_size_y),
+                            origin: (0, 0),
+                        })
+                        .iter()
+                    {
+                        qtable.push(entry);
+                        if entry <= 0 {
+                            return Err(InvalidRawQuantTable);
+                        }
+                    }
+                }
+                Ok(Self::Raw { qtable, qtable_den })
+            }
+            _ => Err(InvalidQuantEncoding {
+                mode,
+                required_size,
+            }),
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+enum QuantTable {
+    // Update QuantTable::VALUES when changing this!
+    Dct,
+    Identity,
+    Dct2x2,
+    Dct4x4,
+    Dct16x16,
+    Dct32x32,
+    // Dct16x8
+    Dct8x16,
+    // Dct32x8
+    Dct8x32,
+    // Dct32x16
+    Dct16x32,
+    Dct4x8,
+    // Dct8x4
+    Afv0,
+    // Afv1
+    // Afv2
+    // Afv3
+    Dct64x64,
+    // Dct64x32,
+    Dct32x64,
+    Dct128x128,
+    // Dct128x64,
+    Dct64x128,
+    Dct256x256,
+    // Dct256x128,
+    Dct128x256,
+}
+
+impl QuantTable {
+    pub const CARDINALITY: usize = Self::VALUES.len();
+    pub const VALUES: [QuantTable; 17] = [
+        QuantTable::Dct,
+        QuantTable::Identity,
+        QuantTable::Dct2x2,
+        QuantTable::Dct4x4,
+        QuantTable::Dct16x16,
+        QuantTable::Dct32x32,
+        // QuantTable::Dct16x8
+        QuantTable::Dct8x16,
+        // QuantTable::Dct32x8
+        QuantTable::Dct8x32,
+        // QuantTable::Dct32x16
+        QuantTable::Dct16x32,
+        QuantTable::Dct4x8,
+        // QuantTable::Dct8x4
+        QuantTable::Afv0,
+        // QuantTable::Afv1
+        // QuantTable::Afv2
+        // QuantTable::Afv3
+        QuantTable::Dct64x64,
+        // QuantTable::Dct64x32,
+        QuantTable::Dct32x64,
+        QuantTable::Dct128x128,
+        // QuantTable::Dct128x64,
+        QuantTable::Dct64x128,
+        QuantTable::Dct256x256,
+        // QuantTable::Dct256x128,
+        QuantTable::Dct128x256,
+    ];
+    fn for_strategy(strategy: HfTransformType) -> QuantTable {
+        match strategy {
+            HfTransformType::DCT => QuantTable::Dct,
+            HfTransformType::IDENTITY => QuantTable::Identity,
+            HfTransformType::DCT2X2 => QuantTable::Dct2x2,
+            HfTransformType::DCT4X4 => QuantTable::Dct4x4,
+            HfTransformType::DCT16X16 => QuantTable::Dct16x16,
+            HfTransformType::DCT32X32 => QuantTable::Dct32x32,
+            HfTransformType::DCT16X8 | HfTransformType::DCT8X16 => QuantTable::Dct8x16,
+            HfTransformType::DCT32X8 | HfTransformType::DCT8X32 => QuantTable::Dct8x32,
+            HfTransformType::DCT32X16 | HfTransformType::DCT16X32 => QuantTable::Dct16x32,
+            HfTransformType::DCT4X8 | HfTransformType::DCT8X4 => QuantTable::Dct4x8,
+            HfTransformType::AFV0
+            | HfTransformType::AFV1
+            | HfTransformType::AFV2
+            | HfTransformType::AFV3 => QuantTable::Afv0,
+            HfTransformType::DCT64X64 => QuantTable::Dct64x64,
+            HfTransformType::DCT64X32 | HfTransformType::DCT32X64 => QuantTable::Dct32x64,
+            HfTransformType::DCT128X128 => QuantTable::Dct128x128,
+            HfTransformType::DCT128X64 | HfTransformType::DCT64X128 => QuantTable::Dct64x128,
+            HfTransformType::DCT256X256 => QuantTable::Dct256x256,
+            HfTransformType::DCT256X128 | HfTransformType::DCT128X256 => QuantTable::Dct128x256,
+        }
+    }
+}
+
+pub struct DequantMatrices {
+    /// 17 separate tables, one per QuantTable type.
+    /// Uses Cow to allow zero-copy borrowing from static cache for library tables.
+    tables: [Cow<'static, [f32]>; QuantTable::CARDINALITY],
+    /// Raw quantization table data for JPEG reconstruction.
+    /// Only stored when table 0 uses Raw encoding and jpeg feature is enabled.
+    #[cfg(feature = "jpeg")]
+    pub raw_qtable: Option<(Vec<i32>, f32)>,
+}
+
+/// Cached computed library tables per QuantTable type.
+/// Each entry contains the computed f32 weights for all 3 channels.
+/// Computed lazily on first access.
+static LIBRARY_TABLES: [OnceLock<Box<[f32]>>; QuantTable::CARDINALITY] = [
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+    OnceLock::new(),
+];
+
+#[allow(clippy::excessive_precision)]
+impl DequantMatrices {
+    fn dct() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [3150.0, 0.0, -0.4, -0.4, -0.4, -2.0],
+                [560.0, 0.0, -0.3, -0.3, -0.3, -0.3],
+                [512.0, -2.0, -1.0, 0.0, -1.0, -2.0],
+            ]),
+        }
+    }
+    fn id() -> QuantEncoding {
+        QuantEncoding::Identity {
+            xyb_weights: [
+                [280.0, 3160.0, 3160.0],
+                [60.0, 864.0, 864.0],
+                [18.0, 200.0, 200.0],
+            ],
+        }
+    }
+    fn dct2x2() -> QuantEncoding {
+        QuantEncoding::Dct2 {
+            xyb_weights: [
+                [3840.0, 2560.0, 1280.0, 640.0, 480.0, 300.0],
+                [960.0, 640.0, 320.0, 180.0, 140.0, 120.0],
+                [640.0, 320.0, 128.0, 64.0, 32.0, 16.0],
+            ],
+        }
+    }
+    fn dct4x4() -> QuantEncoding {
+        QuantEncoding::Dct4 {
+            params: DctQuantWeightParams::from_array(&[
+                [2200.0, 0.0, 0.0, 0.0],
+                [392.0, 0.0, 0.0, 0.0],
+                [112.0, -0.25, -0.25, -0.5],
+            ]),
+            xyb_mul: [[1.0, 1.0], [1.0, 1.0], [1.0, 1.0]],
+        }
+    }
+    fn dct16x16() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    8996.8725711814115328,
+                    -1.3000777393353804,
+                    -0.49424529824571225,
+                    -0.439093774457103443,
+                    -0.6350101832695744,
+                    -0.90177264050827612,
+                    -1.6162099239887414,
+                ],
+                [
+                    3191.48366296844234752,
+                    -0.67424582104194355,
+                    -0.80745813428471001,
+                    -0.44925837484843441,
+                    -0.35865440981033403,
+                    -0.31322389111877305,
+                    -0.37615025315725483,
+                ],
+                [
+                    1157.50408145487200256,
+                    -2.0531423165804414,
+                    -1.4,
+                    -0.50687130033378396,
+                    -0.42708730624733904,
+                    -1.4856834539296244,
+                    -4.9209142884401604,
+                ],
+            ]),
+        }
+    }
+    fn dct32x32() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    15718.40830982518931456,
+                    -1.025,
+                    -0.98,
+                    -0.9012,
+                    -0.4,
+                    -0.48819395464,
+                    -0.421064,
+                    -0.27,
+                ],
+                [
+                    7305.7636810695983104,
+                    -0.8041958212306401,
+                    -0.7633036457487539,
+                    -0.55660379990111464,
+                    -0.49785304658857626,
+                    -0.43699592683512467,
+                    -0.40180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    3803.53173721215041536,
+                    -3.060733579805728,
+                    -2.0413270132490346,
+                    -2.0235650159727417,
+                    -0.5495389509954993,
+                    -0.4,
+                    -0.4,
+                    -0.3,
+                ],
+            ]),
+        }
+    }
+
+    // dct16x8
+    fn dct8x16() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [7240.7734393502, -0.7, -0.7, -0.2, -0.2, -0.2, -0.5],
+                [1448.15468787004, -0.5, -0.5, -0.5, -0.2, -0.2, -0.2],
+                [506.854140754517, -1.4, -0.2, -0.5, -0.5, -1.5, -3.6],
+            ]),
+        }
+    }
+
+    // dct32x8
+    fn dct8x32() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    16283.2494710648897,
+                    -1.7812845336559429,
+                    -1.6309059012653515,
+                    -1.0382179034313539,
+                    -0.85,
+                    -0.7,
+                    -0.9,
+                    -1.2360638576849587,
+                ],
+                [
+                    5089.15750884921511936,
+                    -0.320049391452786891,
+                    -0.35362849922161446,
+                    -0.30340000000000003,
+                    -0.61,
+                    -0.5,
+                    -0.5,
+                    -0.6,
+                ],
+                [
+                    3397.77603275308720128,
+                    -0.321327362693153371,
+                    -0.34507619223117997,
+                    -0.70340000000000003,
+                    -0.9,
+                    -1.0,
+                    -1.0,
+                    -1.1754605576265209,
+                ],
+            ]),
+        }
+    }
+
+    // dct32x16
+    fn dct16x32() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    13844.97076442300573,
+                    -0.97113799999999995,
+                    -0.658,
+                    -0.42026,
+                    -0.22712,
+                    -0.2206,
+                    -0.226,
+                    -0.6,
+                ],
+                [
+                    4798.964084220744293,
+                    -0.61125308982767057,
+                    -0.83770786552491361,
+                    -0.79014862079498627,
+                    -0.2692727459704829,
+                    -0.38272769465388551,
+                    -0.22924222653091453,
+                    -0.20719098826199578,
+                ],
+                [
+                    1807.236946760964614,
+                    -1.2,
+                    -1.2,
+                    -0.7,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+
+    // dct8x4
+    fn dct4x8() -> QuantEncoding {
+        QuantEncoding::Dct4x8 {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    2198.050556016380522,
+                    -0.96269623020744692,
+                    -0.76194253026666783,
+                    -0.6551140670773547,
+                ],
+                [
+                    764.3655248643528689,
+                    -0.92630200888366945,
+                    -0.9675229603596517,
+                    -0.27845290869168118,
+                ],
+                [
+                    527.107573587542228,
+                    -1.4594385811273854,
+                    -1.450082094097871593,
+                    -1.5843722511996204,
+                ],
+            ]),
+            xyb_mul: [1.0, 1.0, 1.0],
+        }
+    }
+    // AFV
+    fn afv0() -> QuantEncoding {
+        let QuantEncoding::Dct4x8 {
+            params: params4x8, ..
+        } = Self::dct4x8()
+        else {
+            unreachable!();
+        };
+        let QuantEncoding::Dct4 {
+            params: params4x4, ..
+        } = Self::dct4x4()
+        else {
+            unreachable!()
+        };
+        QuantEncoding::Afv {
+            params4x8,
+            params4x4,
+            weights: [
+                [
+                    3072.0, 3072.0, // 4x4/4x8 DC tendency.
+                    256.0, 256.0, 256.0, // AFV corner.
+                    414.0, 0.0, 0.0, 0.0, // AFV high freqs.
+                ],
+                [
+                    1024.0, 1024.0, // 4x4/4x8 DC tendency.
+                    50.0, 50.0, 50.0, // AFV corner.
+                    58.0, 0.0, 0.0, 0.0, // AFV high freqs.
+                ],
+                [
+                    384.0, 384.0, // 4x4/4x8 DC tendency.
+                    12.0, 12.0, 12.0, // AFV corner.
+                    22.0, -0.25, -0.25, -0.25, // AFV high freqs.
+                ],
+            ],
+        }
+    }
+
+    fn dct64x64() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    0.9 * 26629.073922049845,
+                    -1.025,
+                    -0.78,
+                    -0.65012,
+                    -0.19041574084286472,
+                    -0.20819395464,
+                    -0.421064,
+                    -0.32733845535848671,
+                ],
+                [
+                    0.9 * 9311.3238710010046,
+                    -0.3041958212306401,
+                    -0.3633036457487539,
+                    -0.35660379990111464,
+                    -0.3443074455424403,
+                    -0.33699592683512467,
+                    -0.30180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    0.9 * 4992.2486445538634,
+                    -1.2,
+                    -1.2,
+                    -0.8,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+
+    // dct64x32
+    fn dct32x64() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    0.65 * 23629.073922049845,
+                    -1.025,
+                    -0.78,
+                    -0.65012,
+                    -0.19041574084286472,
+                    -0.20819395464,
+                    -0.421064,
+                    -0.32733845535848671,
+                ],
+                [
+                    0.65 * 8611.3238710010046,
+                    -0.3041958212306401,
+                    -0.3633036457487539,
+                    -0.35660379990111464,
+                    -0.3443074455424403,
+                    -0.33699592683512467,
+                    -0.30180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    0.65 * 4492.2486445538634,
+                    -1.2,
+                    -1.2,
+                    -0.8,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+    fn dct128x128() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    1.8 * 26629.073922049845,
+                    -1.025,
+                    -0.78,
+                    -0.65012,
+                    -0.19041574084286472,
+                    -0.20819395464,
+                    -0.421064,
+                    -0.32733845535848671,
+                ],
+                [
+                    1.8 * 9311.3238710010046,
+                    -0.3041958212306401,
+                    -0.3633036457487539,
+                    -0.35660379990111464,
+                    -0.3443074455424403,
+                    -0.33699592683512467,
+                    -0.30180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    1.8 * 4992.2486445538634,
+                    -1.2,
+                    -1.2,
+                    -0.8,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+
+    // dct128x64
+    fn dct64x128() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    1.3 * 23629.073922049845,
+                    -1.025,
+                    -0.78,
+                    -0.65012,
+                    -0.19041574084286472,
+                    -0.20819395464,
+                    -0.421064,
+                    -0.32733845535848671,
+                ],
+                [
+                    1.3 * 8611.3238710010046,
+                    -0.3041958212306401,
+                    -0.3633036457487539,
+                    -0.35660379990111464,
+                    -0.3443074455424403,
+                    -0.33699592683512467,
+                    -0.30180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    1.3 * 4492.2486445538634,
+                    -1.2,
+                    -1.2,
+                    -0.8,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+    fn dct256x256() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    3.6 * 26629.073922049845,
+                    -1.025,
+                    -0.78,
+                    -0.65012,
+                    -0.19041574084286472,
+                    -0.20819395464,
+                    -0.421064,
+                    -0.32733845535848671,
+                ],
+                [
+                    3.6 * 9311.3238710010046,
+                    -0.3041958212306401,
+                    -0.3633036457487539,
+                    -0.35660379990111464,
+                    -0.3443074455424403,
+                    -0.33699592683512467,
+                    -0.30180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    3.6 * 4992.2486445538634,
+                    -1.2,
+                    -1.2,
+                    -0.8,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+
+    // dct256x128
+    fn dct128x256() -> QuantEncoding {
+        QuantEncoding::Dct {
+            params: DctQuantWeightParams::from_array(&[
+                [
+                    2.6 * 23629.073922049845,
+                    -1.025,
+                    -0.78,
+                    -0.65012,
+                    -0.19041574084286472,
+                    -0.20819395464,
+                    -0.421064,
+                    -0.32733845535848671,
+                ],
+                [
+                    2.6 * 8611.3238710010046,
+                    -0.3041958212306401,
+                    -0.3633036457487539,
+                    -0.35660379990111464,
+                    -0.3443074455424403,
+                    -0.33699592683512467,
+                    -0.30180866526242109,
+                    -0.27321683125358037,
+                ],
+                [
+                    2.6 * 4492.2486445538634,
+                    -1.2,
+                    -1.2,
+                    -0.8,
+                    -0.7,
+                    -0.7,
+                    -0.4,
+                    -0.5,
+                ],
+            ]),
+        }
+    }
+
+    /// Get library quantization encoding for a table type index.
+    fn get_library_encoding(idx: usize) -> QuantEncoding {
+        match idx {
+            0 => Self::dct(),
+            1 => Self::id(),
+            2 => Self::dct2x2(),
+            3 => Self::dct4x4(),
+            4 => Self::dct16x16(),
+            5 => Self::dct32x32(),
+            6 => Self::dct8x16(),
+            7 => Self::dct8x32(),
+            8 => Self::dct16x32(),
+            9 => Self::dct4x8(),
+            10 => Self::afv0(),
+            11 => Self::dct64x64(),
+            12 => Self::dct32x64(),
+            // Same default for large transforms (128+) as for 64x* transforms.
+            13 => Self::dct128x128(),
+            14 => Self::dct64x128(),
+            15 => Self::dct256x256(),
+            16 => Self::dct128x256(),
+            _ => unreachable!(),
+        }
+    }
+
+    /// Get cached computed library table for a QuantTable type index.
+    /// Computes the table lazily on first access.
+    fn get_library_table(idx: usize) -> &'static [f32] {
+        LIBRARY_TABLES[idx].get_or_init(|| {
+            let encoding = Self::get_library_encoding(idx);
+            Self::compute_table(&encoding, idx).expect("library table computation should not fail")
+        })
+    }
+
+    /// Compute a single quant table from an encoding.
+    /// Returns the computed weights as a boxed slice for all 3 channels.
+    fn compute_table(encoding: &QuantEncoding, table_idx: usize) -> Result<Box<[f32]>> {
+        let wrows = 8 * Self::REQUIRED_SIZE_X[table_idx];
+        let wcols = 8 * Self::REQUIRED_SIZE_Y[table_idx];
+        let num = wrows * wcols;
+        let mut weights = vec![0f32; 3 * num];
+        match encoding {
+            QuantEncoding::Library => {
+                // Library encoding should be resolved by the caller.
+                return Err(InvalidQuantEncodingMode);
+            }
+            QuantEncoding::Identity { xyb_weights } => {
+                for c in 0..3 {
+                    for i in 0..64 {
+                        weights[64 * c + i] = xyb_weights[c][0];
+                    }
+                    weights[64 * c + 1] = xyb_weights[c][1];
+                    weights[64 * c + 8] = xyb_weights[c][1];
+                    weights[64 * c + 9] = xyb_weights[c][2];
+                }
+            }
+            QuantEncoding::Dct2 { xyb_weights } => {
+                for (c, xyb_weight) in xyb_weights.iter().enumerate() {
+                    let start = c * 64;
+                    weights[start] = 0xBAD as f32;
+                    weights[start + 1] = xyb_weight[0];
+                    weights[start + 8] = xyb_weight[0];
+                    weights[start + 9] = xyb_weight[1];
+                    for y in 0..2 {
+                        for x in 0..2 {
+                            weights[start + y * 8 + x + 2] = xyb_weight[2];
+                            weights[start + (y + 2) * 8 + x] = xyb_weight[2];
+                        }
+                    }
+                    for y in 0..2 {
+                        for x in 0..2 {
+                            weights[start + (y + 2) * 8 + x + 2] = xyb_weight[3];
+                        }
+                    }
+                    for y in 0..4 {
+                        for x in 0..4 {
+                            weights[start + y * 8 + x + 4] = xyb_weight[4];
+                            weights[start + (y + 4) * 8 + x] = xyb_weight[4];
+                        }
+                    }
+                    for y in 0..4 {
+                        for x in 0..4 {
+                            weights[start + (y + 4) * 8 + x + 4] = xyb_weight[5];
+                        }
+                    }
+                }
+            }
+            QuantEncoding::Dct4 { params, xyb_mul } => {
+                let mut weights4x4 = [0f32; 3 * 4 * 4];
+                get_quant_weights(4, 4, params, &mut weights4x4)?;
+                for c in 0..3 {
+                    for y in 0..BLOCK_DIM {
+                        for x in 0..BLOCK_DIM {
+                            weights[c * num + y * BLOCK_DIM + x] =
+                                weights4x4[c * 16 + (y / 2) * 4 + (x / 2)];
+                        }
+                    }
+                    weights[c * num + 1] /= xyb_mul[c][0];
+                    weights[c * num + BLOCK_DIM] /= xyb_mul[c][0];
+                    weights[c * num + BLOCK_DIM + 1] /= xyb_mul[c][1];
+                }
+            }
+            QuantEncoding::Dct4x8 { params, xyb_mul } => {
+                let mut weights4x8 = [0f32; 3 * 4 * 8];
+                get_quant_weights(4, 8, params, &mut weights4x8)?;
+                for c in 0..3 {
+                    for y in 0..BLOCK_DIM {
+                        for x in 0..BLOCK_DIM {
+                            weights[c * num + y * BLOCK_DIM + x] =
+                                weights4x8[c * 32 + (y / 2) * 8 + x];
+                        }
+                    }
+                    weights[c * num + BLOCK_DIM] /= xyb_mul[c];
+                }
+            }
+            QuantEncoding::Dct { params } => {
+                get_quant_weights(wrows, wcols, params, &mut weights)?;
+            }
+            QuantEncoding::Raw { qtable, qtable_den } => {
+                if qtable.len() != 3 * num {
+                    return Err(InvalidRawQuantTable);
+                }
+                for i in 0..3 * num {
+                    weights[i] = 1f32 / (qtable_den * qtable[i] as f32);
+                }
+            }
+            QuantEncoding::Afv {
+                params4x8,
+                params4x4,
+                weights: afv_weights,
+            } => {
+                const FREQS: [f32; 16] = [
+                    0xBAD as f32,
+                    0xBAD as f32,
+                    0.8517778890324296,
+                    5.37778436506804,
+                    0xBAD as f32,
+                    0xBAD as f32,
+                    4.734747904497923,
+                    5.449245381693219,
+                    1.6598270267479331,
+                    4f32,
+                    7.275749096817861,
+                    10.423227632456525,
+                    2.662932286148962,
+                    7.630657783650829,
+                    8.962388608184032,
+                    12.97166202570235,
+                ];
+                let mut weights4x8 = [0f32; 3 * 4 * 8];
+                get_quant_weights(4, 8, params4x8, &mut weights4x8)?;
+                let mut weights4x4 = [0f32; 3 * 4 * 4];
+                get_quant_weights(4, 4, params4x4, &mut weights4x4)?;
+                const LO: f32 = 0.8517778890324296;
+                const HI: f32 = 12.97166202570235f32 - LO + 1e-6f32;
+                for c in 0..3 {
+                    let mut bands = [0f32; 4];
+                    bands[0] = afv_weights[c][5];
+                    if bands[0] < ALMOST_ZERO {
+                        return Err(InvalidDistanceBand(0, bands[0]));
+                    }
+                    for i in 1..4 {
+                        bands[i] = bands[i - 1] * mult(afv_weights[c][i + 5]);
+                        if bands[i] < ALMOST_ZERO {
+                            return Err(InvalidDistanceBand(i, bands[i]));
+                        }
+                    }
+
+                    {
+                        let start = c * 64;
+                        weights[start] = 1f32;
+                        let mut set = |x, y, val| {
+                            weights[start + y * 8 + x] = val;
+                        };
+                        set(0, 1, afv_weights[c][0]);
+                        set(1, 0, afv_weights[c][1]);
+                        set(0, 2, afv_weights[c][2]);
+                        set(2, 0, afv_weights[c][3]);
+                        set(2, 2, afv_weights[c][4]);
+
+                        for y in 0..4 {
+                            for x in 0..4 {
+                                if x < 2 && y < 2 {
+                                    continue;
+                                }
+                                let val = interpolate(FREQS[y * 4 + x] - LO, HI, &bands);
+                                set(2 * x, 2 * y, val);
+                            }
+                        }
+                    }
+
+                    for y in 0..BLOCK_DIM / 2 {
+                        for x in 0..BLOCK_DIM {
+                            if x == 0 && y == 0 {
+                                continue;
+                            }
+                            weights[c * num + (2 * y + 1) * BLOCK_DIM + x] =
+                                weights4x8[c * 32 + y * 8 + x];
+                        }
+                    }
+
+                    for y in 0..BLOCK_DIM / 2 {
+                        for x in 0..BLOCK_DIM / 2 {
+                            if x == 0 && y == 0 {
+                                continue;
+                            }
+                            weights[c * num + (2 * y) * BLOCK_DIM + 2 * x + 1] =
+                                weights4x4[c * 16 + y * 4 + x];
+                        }
+                    }
+                }
+            }
+        }
+        // Convert weights in place to the final table format (1.0 / weight)
+        for weight in &mut weights {
+            if !(ALMOST_ZERO..=1.0 / ALMOST_ZERO).contains(weight) {
+                return Err(InvalidQuantizationTableWeight(*weight));
+            }
+            *weight = 1f32 / *weight;
+        }
+        Ok(weights.into_boxed_slice())
+    }
+
+    pub fn matrix(&self, quant_kind: HfTransformType, c: usize) -> &[f32] {
+        let qt_idx = QuantTable::for_strategy(quant_kind) as usize;
+        let table = &self.tables[qt_idx];
+        let num = Self::REQUIRED_SIZE_X[qt_idx] * Self::REQUIRED_SIZE_Y[qt_idx] * BLOCK_SIZE;
+        &table[c * num..]
+    }
+
+    pub fn decode(
+        header: &FrameHeader,
+        lf_global: &LfGlobalState,
+        br: &mut BitReader,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<Self> {
+        let all_default = br.read(1)? == 1;
+
+        // Compute all tables during decode
+        #[cfg(feature = "jpeg")]
+        let mut raw_qtable: Option<(Vec<i32>, f32)> = None;
+
+        let tables: [Cow<'static, [f32]>; QuantTable::CARDINALITY] = if all_default {
+            // All library tables - borrow from static cache (zero-copy)
+            std::array::from_fn(|idx| Cow::Borrowed(Self::get_library_table(idx)))
+        } else {
+            // Decode and compute each table
+            let mut tables_vec: Vec<Cow<'static, [f32]>> =
+                Vec::with_capacity(QuantTable::CARDINALITY);
+            for (i, (&required_size_x, required_size_y)) in Self::REQUIRED_SIZE_X
+                .iter()
+                .zip(Self::REQUIRED_SIZE_Y)
+                .enumerate()
+            {
+                let encoding = QuantEncoding::decode(
+                    required_size_x,
+                    required_size_y,
+                    i,
+                    header,
+                    lf_global,
+                    br,
+                    memory_tracker,
+                )?;
+
+                // Save raw quant table for JPEG reconstruction (table 0 = DCT8)
+                #[cfg(feature = "jpeg")]
+                if i == 0
+                    && let QuantEncoding::Raw { qtable, qtable_den } = &encoding
+                {
+                    raw_qtable = Some((qtable.clone(), *qtable_den));
+                }
+
+                let table = match encoding {
+                    QuantEncoding::Library => Cow::Borrowed(Self::get_library_table(i)),
+                    _ => Cow::Owned(Self::compute_table(&encoding, i)?.into_vec()),
+                };
+                tables_vec.push(table);
+            }
+            tables_vec.try_into().unwrap()
+        };
+
+        Ok(Self {
+            tables,
+            #[cfg(feature = "jpeg")]
+            raw_qtable,
+        })
+    }
+
+    pub const REQUIRED_SIZE_X: [usize; QuantTable::CARDINALITY] =
+        [1, 1, 1, 1, 2, 4, 1, 1, 2, 1, 1, 8, 4, 16, 8, 32, 16];
+
+    pub const REQUIRED_SIZE_Y: [usize; QuantTable::CARDINALITY] =
+        [1, 1, 1, 1, 2, 4, 2, 4, 4, 1, 1, 8, 8, 16, 16, 32, 32];
+
+    #[cfg(test)]
+    const SUM_REQUIRED_X_Y: usize = 2056;
+}
+
+fn get_quant_weights(
+    rows: usize,
+    cols: usize,
+    distance_bands: &DctQuantWeightParams,
+    out: &mut [f32],
+) -> Result<()> {
+    for c in 0..3 {
+        let mut bands = [0f32; DctQuantWeightParams::MAX_DISTANCE_BANDS];
+        bands[0] = distance_bands.params[c][0];
+        if bands[0] < ALMOST_ZERO {
+            return Err(InvalidDistanceBand(0, bands[0]));
+        }
+        for i in 1..distance_bands.num_bands {
+            bands[i] = bands[i - 1] * mult(distance_bands.params[c][i]);
+            if bands[i] < ALMOST_ZERO {
+                return Err(InvalidDistanceBand(i, bands[i]));
+            }
+        }
+        let scale = (distance_bands.num_bands - 1) as f32 / (SQRT_2 + 1e-6);
+        let rcpcol = scale / (cols - 1) as f32;
+        let rcprow = scale / (rows - 1) as f32;
+        for y in 0..rows {
+            let dy = y as f32 * rcprow;
+            let dy2 = dy * dy;
+            for x in 0..cols {
+                let dx = x as f32 * rcpcol;
+                let scaled_distance = (dx * dx + dy2).sqrt();
+                let weight = if distance_bands.num_bands == 1 {
+                    bands[0]
+                } else {
+                    interpolate_vec(scaled_distance, &bands)
+                };
+                out[c * cols * rows + y * cols + x] = weight;
+            }
+        }
+    }
+    Ok(())
+}
+
+fn interpolate_vec(scaled_pos: f32, array: &[f32]) -> f32 {
+    let idxf32 = scaled_pos.floor();
+    let frac = scaled_pos - idxf32;
+    let idx = idxf32 as usize;
+    let a = array[idx];
+    let b = array[1..][idx];
+    (b / a).powf(frac) * a
+}
+
+fn interpolate(pos: f32, max: f32, array: &[f32]) -> f32 {
+    let scaled_pos = pos * (array.len() - 1) as f32 / max;
+    let idx = scaled_pos as usize;
+    let a = array[idx];
+    let b = array[idx + 1];
+    a * (b / a).powf(scaled_pos - idx as f32)
+}
+
+fn mult(v: f32) -> f32 {
+    if v > 0f32 {
+        1f32 + v
+    } else {
+        1f32 / (1f32 - v)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::error::Result;
+    use crate::frame::quant_weights::DequantMatrices;
+    use crate::util::test::assert_almost_abs_eq;
+
+    #[test]
+    fn check_required_x_y() {
+        assert_eq!(
+            DequantMatrices::SUM_REQUIRED_X_Y,
+            DequantMatrices::REQUIRED_SIZE_X
+                .iter()
+                .zip(DequantMatrices::REQUIRED_SIZE_Y)
+                .map(|(&x, y)| x * y)
+                .sum::<usize>()
+        );
+    }
+
+    #[test]
+    fn check_dequant_matrix_correctness() -> Result<()> {
+        // All library tables
+        let matrices = DequantMatrices {
+            tables: std::array::from_fn(|idx| {
+                Cow::Borrowed(DequantMatrices::get_library_table(idx))
+            }),
+            #[cfg(feature = "jpeg")]
+            raw_qtable: None,
+        };
+
+        // Golden data produced by libjxl.
+        let target_table = [
+            0.000317f32,
+            0.000629f32,
+            0.000457f32,
+            0.000367f32,
+            0.000378f32,
+            0.000709f32,
+            0.000593f32,
+            0.000566f32,
+            0.000629f32,
+            0.001192f32,
+            0.000943f32,
+            0.001786f32,
+            0.003042f32,
+            0.002372f32,
+            0.001998f32,
+            0.002044f32,
+            0.003341f32,
+            0.002907f32,
+            0.002804f32,
+            0.003042f32,
+            0.004229f32,
+            0.003998f32,
+            0.001953f32,
+            0.011969f32,
+            0.011719f32,
+            0.007886f32,
+            0.008374f32,
+            0.015337f32,
+            0.011719f32,
+            0.011719f32,
+            0.011969f32,
+            0.032080f32,
+            0.025368f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.003571f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.016667f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.055556f32,
+            0.000335f32,
+            0.002083f32,
+            0.002083f32,
+            0.001563f32,
+            0.000781f32,
+            0.002083f32,
+            0.003333f32,
+            0.002083f32,
+            0.002083f32,
+            0.003333f32,
+            0.003333f32,
+            0.000335f32,
+            0.007143f32,
+            0.007143f32,
+            0.005556f32,
+            0.003125f32,
+            0.007143f32,
+            0.008333f32,
+            0.007143f32,
+            0.007143f32,
+            0.008333f32,
+            0.008333f32,
+            0.000335f32,
+            0.031250f32,
+            0.031250f32,
+            0.015625f32,
+            0.007812f32,
+            0.031250f32,
+            0.062500f32,
+            0.031250f32,
+            0.031250f32,
+            0.062500f32,
+            0.062500f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.000455f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.002551f32,
+            0.008929f32,
+            0.014654f32,
+            0.012241f32,
+            0.011161f32,
+            0.010455f32,
+            0.015352f32,
+            0.013951f32,
+            0.012706f32,
+            0.014654f32,
+            0.020926f32,
+            0.017433f32,
+            0.000111f32,
+            0.000469f32,
+            0.000258f32,
+            0.000640f32,
+            0.000388f32,
+            0.001007f32,
+            0.000566f32,
+            0.001880f32,
+            0.000946f32,
+            0.000886f32,
+            0.001880f32,
+            0.000313f32,
+            0.001168f32,
+            0.000531f32,
+            0.001511f32,
+            0.000962f32,
+            0.001959f32,
+            0.001399f32,
+            0.002531f32,
+            0.001908f32,
+            0.001850f32,
+            0.002531f32,
+            0.000864f32,
+            0.007969f32,
+            0.002684f32,
+            0.010653f32,
+            0.006434f32,
+            0.015981f32,
+            0.009743f32,
+            0.040354f32,
+            0.014631f32,
+            0.013468f32,
+            0.040354f32,
+            0.000064f32,
+            0.000135f32,
+            0.000279f32,
+            0.000521f32,
+            0.000760f32,
+            0.001145f32,
+            0.000502f32,
+            0.000647f32,
+            0.000911f32,
+            0.001286f32,
+            0.001685f32,
+            0.000137f32,
+            0.000257f32,
+            0.000464f32,
+            0.000739f32,
+            0.001126f32,
+            0.001645f32,
+            0.000706f32,
+            0.000959f32,
+            0.001327f32,
+            0.001839f32,
+            0.002404f32,
+            0.000263f32,
+            0.001155f32,
+            0.003800f32,
+            0.010779f32,
+            0.016740f32,
+            0.024003f32,
+            0.010258f32,
+            0.014299f32,
+            0.019509f32,
+            0.026824f32,
+            0.035546f32,
+            0.000138f32,
+            0.000515f32,
+            0.000425f32,
+            0.000333f32,
+            0.000362f32,
+            0.000559f32,
+            0.000507f32,
+            0.000500f32,
+            0.000538f32,
+            0.000686f32,
+            0.000666f32,
+            0.000691f32,
+            0.002504f32,
+            0.001785f32,
+            0.001353f32,
+            0.001443f32,
+            0.002721f32,
+            0.002469f32,
+            0.002432f32,
+            0.002617f32,
+            0.003340f32,
+            0.003241f32,
+            0.001973f32,
+            0.010000f32,
+            0.006529f32,
+            0.005339f32,
+            0.005497f32,
+            0.012033f32,
+            0.009689f32,
+            0.009374f32,
+            0.011033f32,
+            0.031220f32,
+            0.026814f32,
+            0.000138f32,
+            0.000515f32,
+            0.000425f32,
+            0.000333f32,
+            0.000362f32,
+            0.000559f32,
+            0.000507f32,
+            0.000500f32,
+            0.000538f32,
+            0.000686f32,
+            0.000666f32,
+            0.000691f32,
+            0.002504f32,
+            0.001785f32,
+            0.001353f32,
+            0.001443f32,
+            0.002721f32,
+            0.002469f32,
+            0.002432f32,
+            0.002617f32,
+            0.003340f32,
+            0.003241f32,
+            0.001973f32,
+            0.010000f32,
+            0.006529f32,
+            0.005339f32,
+            0.005497f32,
+            0.012033f32,
+            0.009689f32,
+            0.009374f32,
+            0.011033f32,
+            0.031220f32,
+            0.026814f32,
+            0.000061f32,
+            0.001686f32,
+            0.000890f32,
+            0.000539f32,
+            0.000524f32,
+            0.003058f32,
+            0.002221f32,
+            0.001956f32,
+            0.002130f32,
+            0.002809f32,
+            0.007926f32,
+            0.000196f32,
+            0.000734f32,
+            0.000453f32,
+            0.000376f32,
+            0.000372f32,
+            0.001148f32,
+            0.000906f32,
+            0.000822f32,
+            0.000877f32,
+            0.001084f32,
+            0.002058f32,
+            0.000294f32,
+            0.001684f32,
+            0.000872f32,
+            0.000599f32,
+            0.000587f32,
+            0.003612f32,
+            0.002411f32,
+            0.002042f32,
+            0.002282f32,
+            0.003276f32,
+            0.009683f32,
+            0.000061f32,
+            0.001686f32,
+            0.000890f32,
+            0.000539f32,
+            0.000524f32,
+            0.003058f32,
+            0.002221f32,
+            0.001956f32,
+            0.002130f32,
+            0.002809f32,
+            0.007926f32,
+            0.000196f32,
+            0.000734f32,
+            0.000453f32,
+            0.000376f32,
+            0.000372f32,
+            0.001148f32,
+            0.000906f32,
+            0.000822f32,
+            0.000877f32,
+            0.001084f32,
+            0.002058f32,
+            0.000294f32,
+            0.001684f32,
+            0.000872f32,
+            0.000599f32,
+            0.000587f32,
+            0.003612f32,
+            0.002411f32,
+            0.002042f32,
+            0.002282f32,
+            0.003276f32,
+            0.009683f32,
+            0.000072f32,
+            0.000339f32,
+            0.000172f32,
+            0.000429f32,
+            0.000308f32,
+            0.000552f32,
+            0.000422f32,
+            0.000388f32,
+            0.000557f32,
+            0.000496f32,
+            0.000935f32,
+            0.000208f32,
+            0.001118f32,
+            0.000422f32,
+            0.001498f32,
+            0.000958f32,
+            0.002133f32,
+            0.001464f32,
+            0.001310f32,
+            0.002154f32,
+            0.001903f32,
+            0.002817f32,
+            0.000553f32,
+            0.004679f32,
+            0.001639f32,
+            0.008626f32,
+            0.003998f32,
+            0.015372f32,
+            0.008305f32,
+            0.006659f32,
+            0.015623f32,
+            0.012761f32,
+            0.026404f32,
+            0.000072f32,
+            0.000339f32,
+            0.000172f32,
+            0.000429f32,
+            0.000308f32,
+            0.000552f32,
+            0.000422f32,
+            0.000388f32,
+            0.000557f32,
+            0.000496f32,
+            0.000935f32,
+            0.000208f32,
+            0.001118f32,
+            0.000422f32,
+            0.001498f32,
+            0.000958f32,
+            0.002133f32,
+            0.001464f32,
+            0.001310f32,
+            0.002154f32,
+            0.001903f32,
+            0.002817f32,
+            0.000553f32,
+            0.004679f32,
+            0.001639f32,
+            0.008626f32,
+            0.003998f32,
+            0.015372f32,
+            0.008305f32,
+            0.006659f32,
+            0.015623f32,
+            0.012761f32,
+            0.026404f32,
+            0.000455f32,
+            0.001419f32,
+            0.001007f32,
+            0.000853f32,
+            0.000733f32,
+            0.001530f32,
+            0.001456f32,
+            0.001211f32,
+            0.001672f32,
+            0.002347f32,
+            0.001967f32,
+            0.001308f32,
+            0.004385f32,
+            0.002909f32,
+            0.002409f32,
+            0.002080f32,
+            0.004796f32,
+            0.004518f32,
+            0.003629f32,
+            0.005108f32,
+            0.006026f32,
+            0.005529f32,
+            0.001897f32,
+            0.009714f32,
+            0.005643f32,
+            0.004386f32,
+            0.003585f32,
+            0.010940f32,
+            0.010108f32,
+            0.007561f32,
+            0.012828f32,
+            0.024294f32,
+            0.017414f32,
+            0.000455f32,
+            0.001419f32,
+            0.001007f32,
+            0.000853f32,
+            0.000733f32,
+            0.001530f32,
+            0.001456f32,
+            0.001211f32,
+            0.001672f32,
+            0.002347f32,
+            0.001967f32,
+            0.001308f32,
+            0.004385f32,
+            0.002909f32,
+            0.002409f32,
+            0.002080f32,
+            0.004796f32,
+            0.004518f32,
+            0.003629f32,
+            0.005108f32,
+            0.006026f32,
+            0.005529f32,
+            0.001897f32,
+            0.009714f32,
+            0.005643f32,
+            0.004386f32,
+            0.003585f32,
+            0.010940f32,
+            0.010108f32,
+            0.007561f32,
+            0.012828f32,
+            0.024294f32,
+            0.017414f32,
+            1.000000f32,
+            0.002415f32,
+            0.001007f32,
+            0.003906f32,
+            0.000733f32,
+            0.001530f32,
+            0.002415f32,
+            0.001211f32,
+            0.002415f32,
+            0.002415f32,
+            0.001967f32,
+            1.000000f32,
+            0.017241f32,
+            0.002909f32,
+            0.020000f32,
+            0.002080f32,
+            0.004796f32,
+            0.017241f32,
+            0.003629f32,
+            0.017241f32,
+            0.017241f32,
+            0.005529f32,
+            1.000000f32,
+            0.058364f32,
+            0.005643f32,
+            0.083333f32,
+            0.003585f32,
+            0.010940f32,
+            0.064815f32,
+            0.007561f32,
+            0.050237f32,
+            0.088778f32,
+            0.017414f32,
+            1.000000f32,
+            0.002415f32,
+            0.001007f32,
+            0.003906f32,
+            0.000733f32,
+            0.001530f32,
+            0.002415f32,
+            0.001211f32,
+            0.002415f32,
+            0.002415f32,
+            0.001967f32,
+            1.000000f32,
+            0.017241f32,
+            0.002909f32,
+            0.020000f32,
+            0.002080f32,
+            0.004796f32,
+            0.017241f32,
+            0.003629f32,
+            0.017241f32,
+            0.017241f32,
+            0.005529f32,
+            1.000000f32,
+            0.058364f32,
+            0.005643f32,
+            0.083333f32,
+            0.003585f32,
+            0.010940f32,
+            0.064815f32,
+            0.007561f32,
+            0.050237f32,
+            0.088778f32,
+            0.017414f32,
+            1.000000f32,
+            0.002415f32,
+            0.001007f32,
+            0.003906f32,
+            0.000733f32,
+            0.001530f32,
+            0.002415f32,
+            0.001211f32,
+            0.002415f32,
+            0.002415f32,
+            0.001967f32,
+            1.000000f32,
+            0.017241f32,
+            0.002909f32,
+            0.020000f32,
+            0.002080f32,
+            0.004796f32,
+            0.017241f32,
+            0.003629f32,
+            0.017241f32,
+            0.017241f32,
+            0.005529f32,
+            1.000000f32,
+            0.058364f32,
+            0.005643f32,
+            0.083333f32,
+            0.003585f32,
+            0.010940f32,
+            0.064815f32,
+            0.007561f32,
+            0.050237f32,
+            0.088778f32,
+            0.017414f32,
+            1.000000f32,
+            0.002415f32,
+            0.001007f32,
+            0.003906f32,
+            0.000733f32,
+            0.001530f32,
+            0.002415f32,
+            0.001211f32,
+            0.002415f32,
+            0.002415f32,
+            0.001967f32,
+            1.000000f32,
+            0.017241f32,
+            0.002909f32,
+            0.020000f32,
+            0.002080f32,
+            0.004796f32,
+            0.017241f32,
+            0.003629f32,
+            0.017241f32,
+            0.017241f32,
+            0.005529f32,
+            1.000000f32,
+            0.058364f32,
+            0.005643f32,
+            0.083333f32,
+            0.003585f32,
+            0.010940f32,
+            0.064815f32,
+            0.007561f32,
+            0.050237f32,
+            0.088778f32,
+            0.017414f32,
+            0.000042f32,
+            0.000152f32,
+            0.000298f32,
+            0.000128f32,
+            0.000268f32,
+            0.000407f32,
+            0.000268f32,
+            0.000364f32,
+            0.000299f32,
+            0.000380f32,
+            0.000623f32,
+            0.000119f32,
+            0.000213f32,
+            0.000391f32,
+            0.000195f32,
+            0.000328f32,
+            0.000571f32,
+            0.000329f32,
+            0.000525f32,
+            0.000393f32,
+            0.000542f32,
+            0.000803f32,
+            0.000223f32,
+            0.001090f32,
+            0.003367f32,
+            0.000867f32,
+            0.002454f32,
+            0.006359f32,
+            0.002462f32,
+            0.005715f32,
+            0.003396f32,
+            0.005943f32,
+            0.010539f32,
+            0.000065f32,
+            0.000136f32,
+            0.000249f32,
+            0.000399f32,
+            0.000481f32,
+            0.000616f32,
+            0.000394f32,
+            0.000449f32,
+            0.000528f32,
+            0.000700f32,
+            0.000944f32,
+            0.000179f32,
+            0.000237f32,
+            0.000329f32,
+            0.000453f32,
+            0.000619f32,
+            0.000836f32,
+            0.000444f32,
+            0.000554f32,
+            0.000714f32,
+            0.000920f32,
+            0.001172f32,
+            0.000342f32,
+            0.000788f32,
+            0.001774f32,
+            0.003270f32,
+            0.005731f32,
+            0.009499f32,
+            0.003143f32,
+            0.004679f32,
+            0.007422f32,
+            0.010736f32,
+            0.015538f32,
+            0.000065f32,
+            0.000136f32,
+            0.000249f32,
+            0.000399f32,
+            0.000481f32,
+            0.000616f32,
+            0.000394f32,
+            0.000449f32,
+            0.000528f32,
+            0.000700f32,
+            0.000944f32,
+            0.000179f32,
+            0.000237f32,
+            0.000329f32,
+            0.000453f32,
+            0.000619f32,
+            0.000836f32,
+            0.000444f32,
+            0.000554f32,
+            0.000714f32,
+            0.000920f32,
+            0.001172f32,
+            0.000342f32,
+            0.000788f32,
+            0.001774f32,
+            0.003270f32,
+            0.005731f32,
+            0.009499f32,
+            0.003143f32,
+            0.004679f32,
+            0.007422f32,
+            0.010736f32,
+            0.015538f32,
+            0.000021f32,
+            0.000148f32,
+            0.000127f32,
+            0.000094f32,
+            0.000083f32,
+            0.000212f32,
+            0.000175f32,
+            0.000163f32,
+            0.000159f32,
+            0.000164f32,
+            0.000329f32,
+            0.000060f32,
+            0.000194f32,
+            0.000149f32,
+            0.000122f32,
+            0.000113f32,
+            0.000294f32,
+            0.000251f32,
+            0.000224f32,
+            0.000217f32,
+            0.000228f32,
+            0.000420f32,
+            0.000111f32,
+            0.001651f32,
+            0.001032f32,
+            0.000701f32,
+            0.000605f32,
+            0.003305f32,
+            0.002650f32,
+            0.002162f32,
+            0.002031f32,
+            0.002222f32,
+            0.005691f32,
+            0.000033f32,
+            0.000120f32,
+            0.000234f32,
+            0.000104f32,
+            0.000213f32,
+            0.000334f32,
+            0.000214f32,
+            0.000303f32,
+            0.000236f32,
+            0.000315f32,
+            0.000521f32,
+            0.000089f32,
+            0.000161f32,
+            0.000297f32,
+            0.000148f32,
+            0.000254f32,
+            0.000444f32,
+            0.000255f32,
+            0.000412f32,
+            0.000299f32,
+            0.000424f32,
+            0.000638f32,
+            0.000171f32,
+            0.000850f32,
+            0.002654f32,
+            0.000698f32,
+            0.002002f32,
+            0.005130f32,
+            0.002014f32,
+            0.004672f32,
+            0.002695f32,
+            0.004847f32,
+            0.008953f32,
+            0.000033f32,
+            0.000120f32,
+            0.000234f32,
+            0.000104f32,
+            0.000213f32,
+            0.000334f32,
+            0.000214f32,
+            0.000303f32,
+            0.000236f32,
+            0.000315f32,
+            0.000521f32,
+            0.000089f32,
+            0.000161f32,
+            0.000297f32,
+            0.000148f32,
+            0.000254f32,
+            0.000444f32,
+            0.000255f32,
+            0.000412f32,
+            0.000299f32,
+            0.000424f32,
+            0.000638f32,
+            0.000171f32,
+            0.000850f32,
+            0.002654f32,
+            0.000698f32,
+            0.002002f32,
+            0.005130f32,
+            0.002014f32,
+            0.004672f32,
+            0.002695f32,
+            0.004847f32,
+            0.008953f32,
+            0.000010f32,
+            0.000062f32,
+            0.000026f32,
+            0.000077f32,
+            0.000055f32,
+            0.000106f32,
+            0.000076f32,
+            0.000069f32,
+            0.000108f32,
+            0.000087f32,
+            0.000165f32,
+            0.000030f32,
+            0.000072f32,
+            0.000044f32,
+            0.000103f32,
+            0.000067f32,
+            0.000147f32,
+            0.000101f32,
+            0.000086f32,
+            0.000149f32,
+            0.000124f32,
+            0.000211f32,
+            0.000056f32,
+            0.000487f32,
+            0.000166f32,
+            0.000920f32,
+            0.000424f32,
+            0.001655f32,
+            0.000897f32,
+            0.000664f32,
+            0.001683f32,
+            0.001291f32,
+            0.002862f32,
+            0.000016f32,
+            0.000115f32,
+            0.000099f32,
+            0.000073f32,
+            0.000065f32,
+            0.000164f32,
+            0.000136f32,
+            0.000127f32,
+            0.000124f32,
+            0.000128f32,
+            0.000256f32,
+            0.000045f32,
+            0.000144f32,
+            0.000111f32,
+            0.000091f32,
+            0.000084f32,
+            0.000219f32,
+            0.000187f32,
+            0.000168f32,
+            0.000162f32,
+            0.000171f32,
+            0.000314f32,
+            0.000086f32,
+            0.001260f32,
+            0.000790f32,
+            0.000537f32,
+            0.000465f32,
+            0.002528f32,
+            0.002026f32,
+            0.001657f32,
+            0.001560f32,
+            0.001709f32,
+            0.004355f32,
+            0.000016f32,
+            0.000115f32,
+            0.000099f32,
+            0.000073f32,
+            0.000065f32,
+            0.000164f32,
+            0.000136f32,
+            0.000127f32,
+            0.000124f32,
+            0.000128f32,
+            0.000256f32,
+            0.000045f32,
+            0.000144f32,
+            0.000111f32,
+            0.000091f32,
+            0.000084f32,
+            0.000219f32,
+            0.000187f32,
+            0.000168f32,
+            0.000162f32,
+            0.000171f32,
+            0.000314f32,
+            0.000086f32,
+            0.001260f32,
+            0.000790f32,
+            0.000537f32,
+            0.000465f32,
+            0.002528f32,
+            0.002026f32,
+            0.001657f32,
+            0.001560f32,
+            0.001709f32,
+            0.004355f32,
+        ];
+        let mut target_table_index = 0;
+        for i in 0..HfTransformType::CARDINALITY {
+            let hf_type = HfTransformType::from_usize(i).unwrap();
+            let qt_idx = QuantTable::for_strategy(hf_type) as usize;
+            let size = DequantMatrices::REQUIRED_SIZE_X[qt_idx]
+                * DequantMatrices::REQUIRED_SIZE_Y[qt_idx]
+                * BLOCK_SIZE;
+            for c in 0..3 {
+                let table = matrices.matrix(hf_type, c);
+                for j in (0..size).step_by(size / 10) {
+                    assert_almost_abs_eq(table[j], target_table[target_table_index], 1e-5);
+                    target_table_index += 1;
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/quantizer.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/quantizer.rs
new file mode 100644
index 00000000..0c8d4f76
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/quantizer.rs
@@ -0,0 +1,77 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    bit_reader::BitReader,
+    error::{Error, Result},
+    frame::quant_weights,
+    headers::encodings::{Empty, UnconditionalCoder},
+};
+
+pub const NUM_QUANT_TABLES: usize = 17;
+pub const GLOBAL_SCALE_DENOM: usize = 1 << 16;
+
+#[derive(Debug)]
+pub struct LfQuantFactors {
+    pub quant_factors: [f32; 3],
+    #[allow(dead_code)] // Inverse factors computed at parse time for future dequantization
+    pub inv_quant_factors: [f32; 3],
+}
+
+impl LfQuantFactors {
+    pub fn new(br: &mut BitReader) -> Result<LfQuantFactors> {
+        let mut quant_factors = [0.0f32; 3];
+        if br.read(1)? == 1 {
+            quant_factors = quant_weights::LF_QUANT;
+        } else {
+            for qf in quant_factors.iter_mut() {
+                *qf = f32::read_unconditional(&(), br, &Empty {})? / 128.0;
+                if *qf < 1e-8 {
+                    return Err(Error::LfQuantFactorTooSmall(*qf));
+                }
+            }
+        }
+
+        let inv_quant_factors = quant_factors.map(f32::recip);
+
+        Ok(LfQuantFactors {
+            quant_factors,
+            inv_quant_factors,
+        })
+    }
+}
+
+#[derive(Debug)]
+pub struct QuantizerParams {
+    pub global_scale: u32,
+    pub quant_lf: u32,
+}
+
+impl QuantizerParams {
+    pub fn read(br: &mut BitReader) -> Result<QuantizerParams> {
+        let global_scale = match br.read(2)? {
+            0 => br.read(11)? + 1,
+            1 => br.read(11)? + 2049,
+            2 => br.read(12)? + 4097,
+            _ => br.read(16)? + 8193,
+        };
+        let quant_lf = match br.read(2)? {
+            0 => 16,
+            1 => br.read(5)? + 1,
+            2 => br.read(8)? + 1,
+            _ => br.read(16)? + 1,
+        };
+        Ok(QuantizerParams {
+            global_scale: global_scale as u32,
+            quant_lf: quant_lf as u32,
+        })
+    }
+    pub fn inv_global_scale(&self) -> f32 {
+        GLOBAL_SCALE_DENOM as f32 / self.global_scale as f32
+    }
+    pub fn inv_quant_lf(&self) -> f32 {
+        self.inv_global_scale() / self.quant_lf as f32
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/render.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/render.rs
new file mode 100644
index 00000000..751e17f5
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/frame/render.rs
@@ -0,0 +1,2189 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::api::JxlCms;
+use crate::api::JxlColorEncoding;
+use crate::api::JxlColorProfile;
+use crate::api::JxlColorType;
+use crate::api::JxlDataFormat;
+use crate::api::JxlOutputBuffer;
+use crate::bit_reader::BitReader;
+use crate::error::{Error, Result};
+use crate::features::epf::SigmaSource;
+use crate::frame::RenderUnit;
+#[cfg(feature = "threads")]
+use crate::frame::decode::upsample_lf_group;
+use crate::headers::frame_header::Encoding;
+use crate::headers::frame_header::FrameType;
+use crate::headers::{Orientation, color_encoding::ColorSpace, extra_channels::ExtraChannel};
+use crate::image::Image;
+use crate::image::Rect;
+#[cfg(test)]
+use crate::render::SimpleRenderPipeline;
+use crate::render::buffer_splitter::BufferSplitter;
+use crate::render::{LowMemoryRenderPipeline, RenderPipeline, RenderPipelineBuilder, stages::*};
+use crate::{
+    api::JxlPixelFormat,
+    frame::{DecoderState, Frame, LfGlobalState},
+    headers::frame_header::FrameHeader,
+};
+
+#[cfg(test)]
+macro_rules! pipeline {
+    ($frame: expr, $pipeline: ident, $op: expr) => {
+        if $frame.use_simple_pipeline {
+            let $pipeline = $frame
+                .render_pipeline
+                .as_mut()
+                .unwrap()
+                .downcast_mut::<SimpleRenderPipeline>()
+                .unwrap();
+            $op
+        } else {
+            use crate::render::LowMemoryRenderPipeline;
+            let $pipeline = $frame
+                .render_pipeline
+                .as_mut()
+                .unwrap()
+                .downcast_mut::<LowMemoryRenderPipeline>()
+                .unwrap();
+            $op
+        }
+    };
+}
+
+#[cfg(not(test))]
+macro_rules! pipeline {
+    ($frame: expr, $pipeline: ident, $op: expr) => {{
+        let $pipeline = $frame.render_pipeline.as_mut().unwrap();
+        $op
+    }};
+}
+
+pub(crate) use pipeline;
+
+impl Frame {
+    /// Add conversion stages for non-float output formats.
+    /// This is needed before saving to U8/U16/F16 formats to convert from the pipeline's f32.
+    fn add_conversion_stages<P: RenderPipeline>(
+        mut pipeline: RenderPipelineBuilder<P>,
+        channels: &[usize],
+        data_format: JxlDataFormat,
+        clamp_range_for_f16: Option<(f32, f32)>,
+    ) -> RenderPipelineBuilder<P> {
+        use crate::render::stages::{
+            ConvertF32ToF16Stage, ConvertF32ToU8Stage, ConvertF32ToU16Stage,
+        };
+
+        match data_format {
+            JxlDataFormat::U8 { bit_depth } => {
+                for &channel in channels {
+                    pipeline =
+                        pipeline.add_inout_stage(ConvertF32ToU8Stage::new(channel, bit_depth));
+                }
+            }
+            JxlDataFormat::U16 { bit_depth, .. } => {
+                for &channel in channels {
+                    pipeline =
+                        pipeline.add_inout_stage(ConvertF32ToU16Stage::new(channel, bit_depth));
+                }
+            }
+            JxlDataFormat::F16 { .. } => {
+                for &channel in channels {
+                    pipeline = pipeline.add_inout_stage(
+                        ConvertF32ToF16Stage::new_with_clamp_range(channel, clamp_range_for_f16),
+                    );
+                }
+            }
+            // F32 doesn't need conversion - the pipeline already uses f32
+            JxlDataFormat::F32 { .. } => {}
+        }
+        pipeline
+    }
+
+    /// Check if CMS will consume a black channel that the user requested in the output.
+    fn check_cms_consumed_black_channel(
+        black_channel: Option<usize>,
+        in_channels: usize,
+        out_channels: usize,
+        pixel_format: &JxlPixelFormat,
+    ) -> Result<()> {
+        if let Some(k_pipeline_idx) = black_channel
+            && out_channels < in_channels
+        {
+            // K channel is consumed (4->3 conversion)
+            let k_ec_idx = k_pipeline_idx - 3;
+            if pixel_format
+                .extra_channel_format
+                .get(k_ec_idx)
+                .is_some_and(|f| f.is_some())
+            {
+                return Err(Error::CmsConsumedChannelRequested {
+                    channel_index: k_ec_idx,
+                    channel_type: "Black".to_string(),
+                });
+            }
+        }
+        Ok(())
+    }
+
+    pub fn decode_and_render_hf_groups(
+        &mut self,
+        api_buffers: &mut Option<&mut [JxlOutputBuffer<'_>]>,
+        pixel_format: &JxlPixelFormat,
+        groups: Vec<(usize, Vec<(usize, BitReader)>)>,
+        do_flush: bool,
+        output_profile: &JxlColorProfile,
+    ) -> Result<()> {
+        if self.render_pipeline.is_none() {
+            assert_eq!(groups.iter().map(|x| x.1.len()).sum::<usize>(), 0);
+            // We don't yet have any output ready (as the pipeline would be initialized otherwise),
+            // so exit without doing anything.
+            return Ok(());
+        }
+
+        let mut buffers: Vec<Option<JxlOutputBuffer>> = Vec::new();
+
+        macro_rules! buffers_from_api {
+            ($get_next: expr) => {
+                if pixel_format.color_data_format.is_some() {
+                    buffers.push($get_next);
+                }
+
+                for fmt in &pixel_format.extra_channel_format {
+                    if fmt.is_some() {
+                        buffers.push($get_next);
+                    }
+                }
+            };
+        }
+
+        if let Some(api_buffers) = api_buffers {
+            let mut api_buffers_iter = api_buffers.iter_mut();
+            buffers_from_api!(Some(JxlOutputBuffer::reborrow(
+                api_buffers_iter.next().unwrap(),
+            )));
+        } else {
+            buffers_from_api!(None);
+        }
+
+        // Temporarily remove the reference/lf frames to be saved; we will move them back once
+        // rendering is done.
+        let mut reference_frame_data = std::mem::take(&mut self.reference_frame_data);
+        let mut lf_frame_data = std::mem::take(&mut self.lf_frame_data);
+
+        if let Some(ref_images) = &mut reference_frame_data {
+            buffers.extend(ref_images.iter_mut().map(|img| {
+                let rect = Rect {
+                    size: img.size(),
+                    origin: (0, 0),
+                };
+                Some(JxlOutputBuffer::from_image_rect_mut(
+                    img.get_rect_mut(rect).into_raw(),
+                ))
+            }));
+        };
+
+        if let Some(lf_images) = &mut lf_frame_data {
+            buffers.extend(lf_images.iter_mut().map(|img| {
+                let rect = Rect {
+                    size: img.size(),
+                    origin: (0, 0),
+                };
+                Some(JxlOutputBuffer::from_image_rect_mut(
+                    img.get_rect_mut(rect).into_raw(),
+                ))
+            }));
+        };
+
+        let frame_timing = std::env::var("JXL_PHASE_TIMING").is_ok();
+        let frame_start = crate::util::Instant::now();
+
+        pipeline!(self, p, p.check_buffer_sizes(&mut buffers[..])?);
+
+        let mut buffer_splitter = BufferSplitter::new(&mut buffers[..]);
+
+        pipeline!(self, p, p.render_outside_frame(&mut buffer_splitter)?);
+
+        let frame_setup_dur = frame_start.elapsed();
+
+        let modular_global = &mut self.lf_global.as_mut().unwrap().modular_global;
+
+        modular_global.set_pipeline_used_channels(pipeline!(self, p, p.used_channel_mask()));
+
+        // Determine parallel vs sequential early — affects flush strategy.
+        #[cfg(all(feature = "threads", not(test)))]
+        let use_parallel = self.decoder_state.parallel && groups.len() > 1;
+        #[cfg(all(feature = "threads", test))]
+        let use_parallel =
+            self.decoder_state.parallel && groups.len() > 1 && !self.use_simple_pipeline;
+        #[cfg(not(feature = "threads"))]
+        let use_parallel = false;
+
+        // STEP 1: if we are requesting a flush, and did not flush before, mark modular channels
+        // as having been decoded as 0.
+        // Skip for parallel path — no intermediate flush rendering, so zero-fill is unnecessary.
+        // The final render (incomplete_groups==0) gets correct data from actual decoding.
+        if !self.was_flushed_once && do_flush && !use_parallel {
+            self.was_flushed_once = true;
+            self.groups_to_flush.extend(0..self.header.num_groups());
+            modular_global.zero_fill_empty_channels(
+                self.header.passes.num_passes as usize,
+                self.header.num_groups(),
+            )?;
+        }
+
+        // Preserve modular buffers when a final re-render may be needed.
+        // Sequential always re-renders; parallel re-renders only for incremental
+        // (cross-batch boundaries have partial readiness). One-shot parallel
+        // gets full readiness from the first pass, but we can't predict
+        // one-shot vs incremental here, so preserve speculatively.
+        if self.header.num_groups() > 1 && pipeline!(self, p, p.needs_border_rendering()) {
+            modular_global.set_preserve_buffers(true);
+        }
+
+        // STEP 2: ensure that groups that will be re-rendered are marked as such.
+        // VarDCT data to be rendered.
+        for (g, _) in groups.iter() {
+            self.groups_to_flush.insert(*g);
+            pipeline!(self, p, p.mark_group_to_rerender(*g));
+        }
+        // Modular data to be re-rendered.
+        // In parallel mode, modular marking is deferred to per-group processing
+        // inside decode_groups_parallel: mark_group_to_be_read sets buffer
+        // statuses to FINAL_RENDER, which would break per-group dependency
+        // checks if done for all groups up-front.
+        if !use_parallel {
+            let modular_global = &mut self.lf_global.as_mut().unwrap().modular_global;
+            for (group, passes) in groups.iter() {
+                for (pass, _) in passes.iter() {
+                    modular_global.mark_group_to_be_read(2 + *pass, *group);
+                }
+            }
+            let mut pass_to_pipeline = |_, group, _, _| {
+                self.groups_to_flush.insert(group);
+                pipeline!(self, p, p.mark_group_to_rerender(group));
+                Ok(())
+            };
+            modular_global.process_output(&self.header, true, &mut pass_to_pipeline)?;
+        }
+
+        // STEP 3: decode the groups, eagerly rendering VarDCT channels and noise.
+
+        let hf_start = crate::util::Instant::now();
+        if use_parallel {
+            #[cfg(feature = "threads")]
+            {
+                self.decode_groups_parallel(groups, &mut buffer_splitter, do_flush)?;
+                // Track incremental parallel decode: if groups remain incomplete
+                // after this batch, a final re-render will be needed to correct
+                // cross-batch border readiness.
+                if self.incomplete_groups > 0 {
+                    self.was_flushed_once = true;
+                }
+            }
+        } else {
+            for (group, mut passes) in groups {
+                // Check for cancellation between groups
+                self.decoder_state.check_cancelled()?;
+                if self.decode_hf_group(group, &mut passes, &mut buffer_splitter, do_flush)? {
+                    self.changed_since_last_flush
+                        .insert((group, RenderUnit::VarDCT));
+                }
+            }
+        }
+        let hf_dur = hf_start.elapsed();
+
+        // STEP 4: process all modular transforms that can now be processed,
+        // flushing buffers that will not be used again, if either we are forcing a render now
+        // or we are done with the file.
+        let flush_start = crate::util::Instant::now();
+        // Skip intermediate flush for parallel path — the parallel decode already renders
+        // each batch correctly. Intermediate STEP 4+5 re-rendering causes partial-readiness
+        // bugs with border-dependent stages (EPF, Gaborish). Only process when all groups
+        // are complete (one-shot final render) or in sequential mode.
+        if self.incomplete_groups == 0 || (do_flush && !use_parallel) {
+            // Final re-render with full readiness masks. Needed when groups were
+            // rendered with partial readiness:
+            // - Sequential: always (groups processed one at a time)
+            // - Parallel incremental: yes (cross-batch boundaries have partial readiness)
+            // - Parallel one-shot: NO (all groups in one batch, full readiness from
+            //   prepare_groups_parallel marking all groups ready before emission)
+            // was_flushed_once distinguishes: set in STEP 1 (sequential) or after
+            // decode_groups_parallel with incomplete groups (parallel incremental).
+            let is_final_rerender = self.incomplete_groups == 0
+                && self.was_flushed_once
+                && self.header.num_groups() > 1
+                && pipeline!(self, p, p.needs_border_rendering())
+                && (self.header.encoding != Encoding::VarDCT || self.hf_coefficients.is_some());
+            if is_final_rerender {
+                self.groups_to_flush.extend(0..self.header.num_groups());
+                self.changed_since_last_flush.clear();
+                pipeline!(self, p, p.prepare_final_rerender());
+            }
+
+            let modular_global = &mut self.lf_global.as_mut().unwrap().modular_global;
+            let mut pass_to_pipeline = |chan, group, complete, image: Option<Image<i32>>| {
+                self.changed_since_last_flush
+                    .insert((group, RenderUnit::Modular(chan)));
+                pipeline!(
+                    self,
+                    p,
+                    p.set_buffer_for_group(
+                        chan,
+                        group,
+                        complete,
+                        image.unwrap(),
+                        &mut buffer_splitter
+                    )?
+                );
+                Ok(())
+            };
+            modular_global.process_output(&self.header, false, &mut pass_to_pipeline)?;
+
+            // STEP 5: re-render VarDCT/noise data in rendered groups for which it was
+            // not rendered, or re-send to pipeline modular channels that were not
+            // updated in those groups.
+            let step5_groups: std::collections::BTreeSet<usize> =
+                std::mem::take(&mut self.groups_to_flush);
+            for g in step5_groups {
+                if self
+                    .changed_since_last_flush
+                    .take(&(g, RenderUnit::VarDCT))
+                    .is_none()
+                {
+                    self.decode_hf_group(g, &mut [], &mut buffer_splitter, true)?;
+                }
+                let modular_global = &mut self.lf_global.as_mut().unwrap().modular_global;
+                let mut pass_to_pipeline = |chan, group, complete, image| {
+                    pipeline!(
+                        self,
+                        p,
+                        p.set_buffer_for_group(chan, group, complete, image, &mut buffer_splitter)?
+                    );
+                    Ok(())
+                };
+                for c in modular_global.channel_range() {
+                    if self
+                        .changed_since_last_flush
+                        .take(&(g, RenderUnit::Modular(c)))
+                        .is_none()
+                    {
+                        modular_global.flush_output(g, c, &mut pass_to_pipeline)?;
+                    }
+                }
+            }
+
+            if is_final_rerender {
+                pipeline!(
+                    self,
+                    p,
+                    p.render_all_groups_full_readiness(&mut buffer_splitter)?
+                );
+                pipeline!(self, p, p.finish_final_rerender());
+            }
+        }
+        let flush_dur = flush_start.elapsed();
+
+        let regions = buffer_splitter.into_changed_regions();
+
+        self.reference_frame_data = reference_frame_data;
+        self.lf_frame_data = lf_frame_data;
+
+        if frame_timing {
+            let total = frame_start.elapsed();
+            let teardown = total.saturating_sub(frame_setup_dur + hf_dur + flush_dur);
+            eprintln!(
+                "[JXL_FRAME_TIMING] setup: {:.2}ms | \
+                 hf_groups: {:.2}ms | flush: {:.2}ms | teardown: {:.2}ms | \
+                 total: {:.2}ms",
+                frame_setup_dur.as_secs_f64() * 1000.0,
+                hf_dur.as_secs_f64() * 1000.0,
+                flush_dur.as_secs_f64() * 1000.0,
+                teardown.as_secs_f64() * 1000.0,
+                total.as_secs_f64() * 1000.0,
+            );
+        }
+
+        if self.header.frame_type == FrameType::LFFrame && self.header.lf_level == 1 {
+            if do_flush && let Some(buffers) = api_buffers {
+                self.maybe_preview_lf_frame(
+                    pixel_format,
+                    buffers,
+                    Some(&regions[..]),
+                    output_profile,
+                )?;
+            } else if self.incomplete_groups == 0 {
+                // If we are not requesting another flush at the end of the LF frame, we
+                // probably have a partial render. Ensure we re-render the LF frame when
+                // decoding the actual frame.
+                self.decoder_state.lf_frame_was_rendered = false;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Parallel decode + render path for both VarDCT and Modular frames.
+    ///
+    /// Processes ALL groups through a four-phase pipeline (no batching),
+    /// reducing rayon barriers from ~5×(num_groups/num_threads) to 5 total
+    /// and enabling better work-stealing across all groups.
+    ///
+    /// The four phases:
+    /// 1. Sequential: compute render decisions and allocate pixel buffers
+    /// 2. Parallel: entropy decode + dequant + IDCT (VarDCT) / read_stream (Modular)
+    /// 3. Store, render, recycle:
+    ///    - 3a. Sequential: store decoded buffers + extract borders + compute renderable work items
+    ///    - 3b. Parallel: render all work items through the pipeline (EPF, color, save)
+    ///    - 3c. Sequential: recycle buffers + update flush state
+    ///
+    /// Requirements:
+    /// - More than 1 group
+    #[cfg(feature = "threads")]
+    fn decode_groups_parallel(
+        &mut self,
+        groups: Vec<(usize, Vec<(usize, BitReader)>)>,
+        buffer_splitter: &mut BufferSplitter,
+        do_flush: bool,
+    ) -> Result<()> {
+        use super::group::{VarDctBuffers, decode_vardct_group};
+        use super::modular::ModularStreamId;
+        use crate::image::{Image, OwnedRawImage};
+        use crate::render::buffer_splitter;
+        use crate::render::low_memory_pipeline::render_group;
+
+        use crate::util::Xorshift128Plus;
+        use rayon::prelude::*;
+
+        // Helper macros to get &mut / & LowMemoryRenderPipeline from the pipeline field.
+        // In non-test builds the field is Box<LMP>; in test builds it's Box<dyn Any>.
+        macro_rules! lmp_mut {
+            () => {{
+                #[cfg(not(test))]
+                {
+                    self.render_pipeline.as_mut().unwrap()
+                }
+                #[cfg(test)]
+                {
+                    self.render_pipeline
+                        .as_mut()
+                        .unwrap()
+                        .downcast_mut::<LowMemoryRenderPipeline>()
+                        .unwrap()
+                }
+            }};
+        }
+        macro_rules! lmp_ref {
+            () => {{
+                #[cfg(not(test))]
+                {
+                    self.render_pipeline.as_ref().unwrap()
+                }
+                #[cfg(test)]
+                {
+                    self.render_pipeline
+                        .as_ref()
+                        .unwrap()
+                        .downcast_ref::<LowMemoryRenderPipeline>()
+                        .unwrap()
+                }
+            }};
+        }
+
+        let phase_timing = std::env::var("JXL_PHASE_TIMING").is_ok();
+
+        let last_pass_in_file = self.header.passes.num_passes as usize - 1;
+        let is_vardct = self.header.encoding == Encoding::VarDCT;
+
+        let stop: &dyn enough::Stop = &*self.decoder_state.stop;
+
+        struct GroupWork<'a> {
+            group: usize,
+            passes: Vec<(usize, BitReader<'a>)>,
+            complete: bool,
+            do_render: bool,
+            pixels: Option<[Image<f32>; 3]>,
+            /// Owned per-group HF coefficient buffers (multi-pass only).
+            hf_coeffs: Option<[Vec<i32>; 3]>,
+        }
+
+        struct GroupRenderInfo {
+            group: usize,
+            do_render: bool,
+            has_items: bool,
+        }
+
+        // Take ownership of per-group HF coefficient buffers before Phase 1.
+        // Each group owns its own Vec<i32> — no shared mutable state.
+        let mut hf_coefficients = self.hf_coefficients.take();
+
+        // Phase 1: Sequential — compute render decisions (NO pixel allocation).
+        // Pixel buffers are allocated on-demand in Phase 2 (parallel) to avoid
+        // the sequential allocation bottleneck that caused the 0.59x regression.
+        let phase1_start = crate::util::Instant::now();
+        let mut work: Vec<GroupWork> = Vec::with_capacity(groups.len());
+        let mut num_needs_pixels = 0usize;
+        for (group, passes) in groups {
+            let was_complete =
+                self.last_rendered_pass[group].is_some_and(|p| p >= last_pass_in_file);
+            if let Some((p, _)) = passes.last() {
+                self.last_rendered_pass[group] = Some(*p);
+            }
+            let pass_to_render = self.last_rendered_pass[group];
+            let complete = pass_to_render.is_some_and(|p| p >= last_pass_in_file);
+            if complete && !was_complete {
+                self.incomplete_groups = self.incomplete_groups.checked_sub(1).unwrap();
+            }
+            let do_render = if complete {
+                true
+            } else if do_flush {
+                self.allow_rendering_before_last_pass()
+            } else {
+                false
+            };
+
+            if is_vardct && do_render {
+                num_needs_pixels += 1;
+            }
+
+            // Take this group's owned coefficient buffers (multi-pass only).
+            let hf_coeffs = hf_coefficients.as_mut().map(|[a, b, c]| {
+                [
+                    std::mem::take(&mut a[group]),
+                    std::mem::take(&mut b[group]),
+                    std::mem::take(&mut c[group]),
+                ]
+            });
+
+            work.push(GroupWork {
+                group,
+                passes,
+                complete,
+                do_render,
+                pixels: None, // Deferred to Phase 2
+                hf_coeffs,
+            });
+        }
+
+        let num_groups = work.len();
+        let phase1_dur = phase1_start.elapsed();
+
+        // Pre-seed a shared pixel buffer pool from the scratch pool.
+        // Allocate min(num_threads, groups_needing_pixels) triples — recycled
+        // buffers from previous calls are free (no page faults). Remaining
+        // groups allocate fresh in Phase 2, but in PARALLEL across threads
+        // instead of sequentially here.
+        let num_threads = rayon::current_num_threads();
+        let pool_size = num_threads.min(num_needs_pixels);
+        let mut pixel_pool_vec: Vec<[Image<f32>; 3]> = Vec::with_capacity(pool_size);
+        for _ in 0..pool_size {
+            pixel_pool_vec.push([
+                pipeline!(self, p, p.get_buffer(0))?,
+                pipeline!(self, p, p.get_buffer(1))?,
+                pipeline!(self, p, p.get_buffer(2))?,
+            ]);
+        }
+        let pixel_pool = std::sync::Mutex::new(pixel_pool_vec);
+        // Buffer sizes for fresh allocation in Phase 2.
+        let pixel_sizes: [(usize, usize); 3] = if is_vardct && num_needs_pixels > pool_size {
+            [
+                lmp_ref!().pixel_buffer_size(0),
+                lmp_ref!().pixel_buffer_size(1),
+                lmp_ref!().pixel_buffer_size(2),
+            ]
+        } else {
+            [(0, 0); 3] // unused — all groups served from pool
+        };
+
+        // Adaptive batching: for large group counts, process in mini-batches
+        // running the full Phase 2→3a→3b→3c pipeline per batch. This allows
+        // pixel buffer recycling between batches but each batch incurs a
+        // barrier cycle. Each barrier costs ~1ms+ from thread synchronization,
+        // so we avoid batching unless group count is very high (8K+ images).
+        // At 4T/384 groups, 6 batches caused 40% overhead vs unbatched.
+        let decode_batch_size = if num_needs_pixels > num_threads * 256 {
+            num_threads * 64
+        } else {
+            num_groups // fully unbatched
+        };
+        let is_batched = decode_batch_size < num_groups;
+
+        // VarDCT scratch buffer pool — persists across all batches.
+        let mut vb_pool: Vec<VarDctBuffers> = Vec::new();
+        if let Some(buf) = self.vardct_buffers.take() {
+            vb_pool.push(buf);
+        }
+        let buffer_pool = std::sync::Mutex::new(vb_pool);
+
+        let mut setup_dur = std::time::Duration::ZERO;
+        let mut phase2_dur = std::time::Duration::ZERO;
+        let mut collect_dur = std::time::Duration::ZERO;
+        let mut phase3a_store_dur = std::time::Duration::ZERO;
+        let mut phase3a_prepare_dur = std::time::Duration::ZERO;
+        let mut phase3b_dur = std::time::Duration::ZERO;
+        let mut phase3c_dur = std::time::Duration::ZERO;
+
+        for batch_start in (0..num_groups).step_by(decode_batch_size) {
+            let batch_end = (batch_start + decode_batch_size).min(num_groups);
+
+            // Re-seed pixel pool from scratch between batches.
+            let setup_start = crate::util::Instant::now();
+            if batch_start > 0 {
+                let batch_needs = work[batch_start..batch_end]
+                    .iter()
+                    .filter(|gw| is_vardct && gw.do_render)
+                    .count();
+                let reseed = num_threads.min(batch_needs);
+                let mut pool = pixel_pool.lock().unwrap();
+                for _ in 0..reseed {
+                    match (|| -> Result<[Image<f32>; 3]> {
+                        Ok([
+                            pipeline!(self, p, p.get_buffer(0))?,
+                            pipeline!(self, p, p.get_buffer(1))?,
+                            pipeline!(self, p, p.get_buffer(2))?,
+                        ])
+                    })() {
+                        Ok(triple) => pool.push(triple),
+                        Err(_) => break,
+                    }
+                }
+            }
+
+            setup_dur += setup_start.elapsed();
+
+            // Phase 2: Parallel decode this batch.
+            let phase2_start = crate::util::Instant::now();
+            {
+                let lf_global = self.lf_global.as_ref().unwrap();
+                let header = &self.header;
+                let hf_global = self.hf_global.as_ref();
+                let hf_meta = self.hf_meta.as_ref();
+                let lf_image = &self.lf_image;
+                let quant_lf = &self.quant_lf;
+                let quant_biases = &self
+                    .decoder_state
+                    .file_header
+                    .transform_data
+                    .opsin_inverse_matrix
+                    .quant_biases;
+                let tracker = &self.decoder_state.memory_tracker;
+
+                work[batch_start..batch_end]
+                    .par_iter_mut()
+                    .try_for_each(|gw| -> Result<()> {
+                        stop.check()?;
+                        // Allocate pixel buffers on-demand from the shared pool.
+                        // This runs in PARALLEL instead of the old sequential Phase 1
+                        // allocation, distributing page fault cost across threads.
+                        if is_vardct && gw.do_render {
+                            gw.pixels = Some(match pixel_pool.lock().unwrap().pop() {
+                                Some(bufs) => bufs,
+                                None => [
+                                    Image::<f32>::new_uninit(pixel_sizes[0])?,
+                                    Image::<f32>::new_uninit(pixel_sizes[1])?,
+                                    Image::<f32>::new_uninit(pixel_sizes[2])?,
+                                ],
+                            });
+                        }
+                        if is_vardct && !gw.passes.is_empty() {
+                            let hf_global = hf_global.unwrap();
+                            let hf_meta = hf_meta.unwrap();
+                            let mut buffers = match buffer_pool.lock().unwrap().pop() {
+                                Some(b) => b,
+                                None => VarDctBuffers::new()?,
+                            };
+
+                            if !(gw.pixels.is_none() && gw.do_render) {
+                                // Each parallel task uses a distinct gw.group —
+                                // each group owns its own Vec<i32>, no shared state.
+                                let hf_coeffs = gw.hf_coeffs.as_mut().map(|[a, b, c]| {
+                                    [a.as_mut_slice(), b.as_mut_slice(), c.as_mut_slice()]
+                                });
+                                decode_vardct_group(
+                                    gw.group,
+                                    &mut gw.passes,
+                                    header,
+                                    lf_global,
+                                    hf_global,
+                                    hf_meta,
+                                    lf_image,
+                                    quant_lf,
+                                    quant_biases,
+                                    hf_coeffs,
+                                    &mut gw.pixels,
+                                    &mut buffers,
+                                    tracker,
+                                    #[cfg(feature = "jpeg")]
+                                    None,
+                                )?;
+                            }
+                            buffer_pool.lock().unwrap().push(buffers);
+                        }
+
+                        for (pass, br) in gw.passes.iter_mut() {
+                            lf_global.modular_global.read_stream(
+                                ModularStreamId::ModularHF {
+                                    group: gw.group,
+                                    pass: *pass,
+                                },
+                                header,
+                                &lf_global.tree,
+                                br,
+                                tracker,
+                            )?;
+                        }
+                        Ok(())
+                    })?;
+            }
+            phase2_dur += phase2_start.elapsed();
+
+            // Collect VarDCT pixels for parallel storage.
+            let collect_start = crate::util::Instant::now();
+            let mut pending_stores: Vec<Option<([OwnedRawImage; 3], bool)>> = if is_vardct {
+                let num_groups = lmp_ref!().num_groups();
+                let mut stores: Vec<Option<([OwnedRawImage; 3], bool)>> =
+                    (0..num_groups).map(|_| None).collect();
+                for gw in &mut work[batch_start..batch_end] {
+                    if let Some(pixels) = gw.pixels.take() {
+                        stores[gw.group] = Some((pixels.map(|p| p.into_raw()), gw.complete));
+                    }
+                }
+                stores
+            } else {
+                Vec::new()
+            };
+
+            collect_dur += collect_start.elapsed();
+
+            // Phase 3a-store: Sequential — store decoded buffers and run process_output.
+            let phase3a_start = crate::util::Instant::now();
+            let mut groups_stored: Vec<(usize, bool, bool)> =
+                Vec::with_capacity(batch_end - batch_start);
+            let mut modular_channels_output: Vec<(usize, usize)> = Vec::new();
+            for gw in &mut work[batch_start..batch_end] {
+                self.decoder_state.check_cancelled()?;
+
+                if is_vardct {
+                    if gw.pixels.is_none() && gw.do_render && gw.passes.is_empty() {
+                        let mut pixels = [
+                            pipeline!(self, p, p.get_buffer(0))?,
+                            pipeline!(self, p, p.get_buffer(1))?,
+                            pipeline!(self, p, p.get_buffer(2))?,
+                        ];
+                        upsample_lf_group(
+                            gw.group,
+                            &mut pixels,
+                            self.lf_image.as_ref().unwrap(),
+                            &self.header,
+                            &self.decoder_state.file_header.transform_data,
+                        )?;
+                        for (c, img) in pixels.into_iter().enumerate() {
+                            lmp_mut!().store_buffer_only(c, gw.group, gw.complete, img);
+                        }
+                    } else if let Some(pixels) = gw.pixels.take() {
+                        for (c, img) in pixels.into_iter().enumerate() {
+                            lmp_mut!().store_buffer_only(c, gw.group, gw.complete, img);
+                        }
+                    }
+                }
+
+                // Generate noise buffers for this group if needed.
+                if self.header.has_noise() && gw.do_render {
+                    let num_channels = self.header.num_extra_channels as usize + 3;
+                    let group_dim = self.header.group_dim() as u32;
+                    let xsize_groups = self.header.size_groups().0;
+                    let gx = (gw.group % xsize_groups) as u32;
+                    let gy = (gw.group / xsize_groups) as u32;
+                    let upsampling = self.header.upsampling;
+                    let upsampled_size = self.header.size_upsampled();
+
+                    let buf_x1 = ((gx + 1) * upsampling * group_dim) as usize;
+                    let buf_y1 = ((gy + 1) * upsampling * group_dim) as usize;
+                    let buf_xsize =
+                        buf_x1.min(upsampled_size.0) - (gx * upsampling * group_dim) as usize;
+                    let buf_ysize =
+                        buf_y1.min(upsampled_size.1) - (gy * upsampling * group_dim) as usize;
+
+                    let bits_to_float = |bits: u32| f32::from_bits((bits >> 9) | 0x3F800000);
+
+                    let mut bufs = [
+                        pipeline!(self, p, p.get_buffer(num_channels)?),
+                        pipeline!(self, p, p.get_buffer(num_channels + 1)?),
+                        pipeline!(self, p, p.get_buffer(num_channels + 2)?),
+                    ];
+
+                    const FLOATS_PER_BATCH: usize = Xorshift128Plus::N * std::mem::size_of::<u64>()
+                        / std::mem::size_of::<f32>();
+                    let mut batch = [0u64; Xorshift128Plus::N];
+
+                    for iy in 0..upsampling {
+                        for ix in 0..upsampling {
+                            let x0 = (gx * upsampling + ix) * group_dim;
+                            let y0 = (gy * upsampling + iy) * group_dim;
+                            let mut rng = Xorshift128Plus::new_with_seeds(
+                                self.decoder_state.visible_frame_index as u32,
+                                self.decoder_state.nonvisible_frame_index as u32,
+                                x0,
+                                y0,
+                            );
+                            let sub_x0 = (ix * group_dim) as usize;
+                            let sub_y0 = (iy * group_dim) as usize;
+                            let sub_x1 = ((ix + 1) * group_dim) as usize;
+                            let sub_y1 = ((iy + 1) * group_dim) as usize;
+                            let sub_xsize = sub_x1.min(buf_xsize).saturating_sub(sub_x0);
+                            let sub_ysize = sub_y1.min(buf_ysize).saturating_sub(sub_y0);
+                            if sub_xsize == 0 || sub_ysize == 0 {
+                                continue;
+                            }
+                            for buf in &mut bufs {
+                                for y in 0..sub_ysize {
+                                    let row = buf.row_mut(sub_y0 + y);
+                                    for batch_index in 0..sub_xsize.div_ceil(FLOATS_PER_BATCH) {
+                                        rng.fill(&mut batch);
+                                        let batch_size = (sub_xsize
+                                            - batch_index * FLOATS_PER_BATCH)
+                                            .min(FLOATS_PER_BATCH);
+                                        for i in 0..batch_size {
+                                            let x = sub_x0 + FLOATS_PER_BATCH * batch_index + i;
+                                            let k = i / 2;
+                                            let high_bytes = i % 2 != 0;
+                                            let bits = if high_bytes {
+                                                ((batch[k] & 0xFFFFFFFF00000000) >> 32) as u32
+                                            } else {
+                                                (batch[k] & 0xFFFFFFFF) as u32
+                                            };
+                                            row[x] = bits_to_float(bits);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    let [buf0, buf1, buf2] = bufs;
+                    lmp_mut!().store_buffer_only(num_channels, gw.group, gw.complete, buf0);
+                    lmp_mut!().store_buffer_only(num_channels + 1, gw.group, gw.complete, buf1);
+                    lmp_mut!().store_buffer_only(num_channels + 2, gw.group, gw.complete, buf2);
+                }
+
+                // Mark modular groups for reading (but don't process yet).
+                {
+                    let lf_global = self.lf_global.as_mut().unwrap();
+                    for (pass, _) in gw.passes.iter() {
+                        lf_global
+                            .modular_global
+                            .mark_group_to_be_read(2 + *pass, gw.group);
+                    }
+                }
+
+                groups_stored.push((gw.group, gw.do_render, true));
+            }
+
+            // Process modular transforms globally after marking ALL groups.
+            // This matches the sequential path's STEP 2 + STEP 4 pattern:
+            // cascading transforms (squeeze, palette) have neighbor
+            // dependencies that require all groups to be marked before
+            // process_output can resolve them correctly.
+            {
+                let lf_global = self.lf_global.as_mut().unwrap();
+                lf_global.modular_global.drain_dry_run_to_ready();
+                lf_global.modular_global.process_output(
+                    &self.header,
+                    false,
+                    &mut |chan, group, _complete, image: Option<Image<i32>>| {
+                        if !lmp_mut!().has_buffer(chan, group) {
+                            lmp_mut!().store_buffer_only(chan, group, true, image.unwrap());
+                        }
+                        modular_channels_output.push((group, chan));
+                        // Track cross-group output from cascading transforms.
+                        if !groups_stored.iter().any(|(g, _, _)| *g == group) {
+                            groups_stored.push((group, true, false));
+                        }
+                        Ok(())
+                    },
+                )?;
+            }
+
+            phase3a_store_dur += phase3a_start.elapsed();
+            let phase3a_prep_start = crate::util::Instant::now();
+
+            // Phase 3a-prepare: Parallel — extract borders and emit work items.
+            // When batching, groups from previous batches have is_ready=true,
+            // so the readiness mask correctly reflects partial-batch boundaries.
+            // Border regions at batch edges are covered by neighboring batches'
+            // emit_work_items (the pipeline was designed for incremental arrival).
+            //
+            // For VarDCT images, store_and_prepare_groups_parallel combines
+            // pending pixel storage with border extraction in a single parallel
+            // pass, eliminating the sequential pixel store bottleneck.
+            // In one-shot unbatched mode, all groups' center data stays alive
+            // through Phase 3b, so rendering can read border pixels directly
+            // from neighbors' center buffers. Skip the topbottom/leftright copy.
+            // In batched or incremental mode, center data is recycled between
+            // batches/calls, so borders must be extracted into separate buffers.
+            let is_one_shot = num_groups == self.header.num_groups();
+            // Only skip border copy in true one-shot decode (not incremental).
+            // In incremental decode, was_flushed_once is true from a prior call,
+            // and the final re-render needs border buffers to correct cross-batch
+            // boundary pixels.
+            let skip_border_copy = !is_batched && is_one_shot && !self.was_flushed_once;
+            let (all_items, group_has_items) = if is_vardct && !pending_stores.is_empty() {
+                lmp_mut!()
+                    .store_and_prepare_groups_parallel(&mut pending_stores, skip_border_copy)?
+            } else {
+                lmp_mut!().prepare_groups_parallel(skip_border_copy)?
+            };
+            let mut has_items_vec = vec![false; lmp_ref!().num_groups()];
+            for &(g, has) in &group_has_items {
+                if has {
+                    has_items_vec[g] = true;
+                }
+            }
+
+            // Build render_infos from store tracking + prepare results.
+            let mut render_infos: Vec<GroupRenderInfo> = Vec::with_capacity(groups_stored.len());
+            for &(group, do_render, is_main) in &groups_stored {
+                let has_items = has_items_vec[group];
+                if is_main || has_items {
+                    render_infos.push(GroupRenderInfo {
+                        group,
+                        do_render,
+                        has_items,
+                    });
+                }
+            }
+
+            phase3a_prepare_dur += phase3a_prep_start.elapsed();
+
+            // Phase 3b: Fragment-based parallel render.
+            //
+            // Split output buffers into per-tile disjoint fragments (row bands ×
+            // column ranges), then process ALL tiles in parallel with direct
+            // writes. No copy-back needed since each tile writes exclusively to
+            // its own fragment.
+            //
+            // Falls back to two-phase (owned buffers + copy-back) when band
+            // splitting isn't possible (single gy band with overlapping rows).
+            let phase3b_start = crate::util::Instant::now();
+            if !all_items.is_empty() {
+                let p = lmp_ref!();
+                let view = p.read_view();
+                let (frame_origin, full_image_size) = p.extend_origin_size();
+                let sbi = p.save_buffer_info();
+                let input_size = p.input_size();
+                let factory = p.context_factory();
+                let num_buffer_slots = buffer_splitter.get_full_buffers().len();
+
+                // Pre-compute channel_rects for all items.
+                let all_layouts: Vec<Vec<(usize, usize, usize, Rect)>> = all_items
+                    .iter()
+                    .map(|item| {
+                        buffer_splitter::compute_local_buffer_layouts(
+                            sbi,
+                            num_buffer_slots,
+                            item.image_area,
+                            input_size,
+                            full_image_size,
+                            frame_origin,
+                        )
+                    })
+                    .collect();
+
+                // Group items by gy (sorted ascending).
+                let mut gy_map: std::collections::BTreeMap<usize, Vec<usize>> =
+                    std::collections::BTreeMap::new();
+                for (i, item) in all_items.iter().enumerate() {
+                    gy_map.entry(item.gy).or_default().push(i);
+                }
+                let gy_items: Vec<Vec<usize>> = gy_map.into_values().collect();
+                let num_bands = gy_items.len();
+
+                // Sort items within each band by gx for consistent column ordering.
+                let gy_items: Vec<Vec<usize>> = gy_items
+                    .into_iter()
+                    .map(|mut indices| {
+                        indices.sort_by_key(|&idx| all_items[idx].gx);
+                        indices
+                    })
+                    .collect();
+
+                // Compute per-slot, per-band row ranges from channel_rects.
+                let mut slot_band_ranges: Vec<Vec<(usize, usize)>> =
+                    vec![vec![(usize::MAX, 0); num_bands]; num_buffer_slots];
+                for (band_idx, item_indices) in gy_items.iter().enumerate() {
+                    for &item_idx in item_indices {
+                        for &(slot, _, _, channel_rect) in &all_layouts[item_idx] {
+                            let start_row = channel_rect.origin.1;
+                            let end_row = start_row + channel_rect.size.1;
+                            let range = &mut slot_band_ranges[slot][band_idx];
+                            range.0 = range.0.min(start_row);
+                            range.1 = range.1.max(end_row);
+                        }
+                    }
+                }
+
+                // Verify non-overlapping bands for each active slot.
+                let can_band_split = num_bands > 1
+                    && slot_band_ranges.iter().all(|ranges| {
+                        ranges.windows(2).all(|w| {
+                            let (_, end_a) = w[0];
+                            let (start_b, _) = w[1];
+                            // Empty bands (usize::MAX, 0) never overlap.
+                            end_a == 0 || start_b == usize::MAX || end_a <= start_b
+                        })
+                    });
+
+                // Fragment path: split each slot's buffer into a tile grid,
+                // then process all tiles in parallel with direct writes.
+                if can_band_split {
+                    // Compute per-slot row split points.
+                    let slot_split_rows: Vec<Vec<usize>> = (0..num_buffer_slots)
+                        .map(|slot| {
+                            let ranges = &slot_band_ranges[slot];
+                            (0..num_bands - 1)
+                                .map(|band_idx| {
+                                    let end_row = ranges[band_idx].1;
+                                    if end_row == 0 { 0 } else { end_row }
+                                })
+                                .collect()
+                        })
+                        .collect();
+
+                    // Compute per-slot, per-band column split points.
+                    // Within each band, items are sorted by gx. For each slot,
+                    // use the column start of each item (except the first) as
+                    // the split point.
+                    let slot_split_cols_per_band: Vec<Vec<Vec<usize>>> = (0..num_buffer_slots)
+                        .map(|slot| {
+                            gy_items
+                                .iter()
+                                .map(|item_indices| {
+                                    // Collect column starts for items in this band+slot.
+                                    let col_starts: Vec<usize> = item_indices
+                                        .iter()
+                                        .filter_map(|&item_idx| {
+                                            all_layouts[item_idx]
+                                                .iter()
+                                                .find(|&&(s, _, _, _)| s == slot)
+                                                .map(|&(_, _, _, cr)| cr.origin.0)
+                                        })
+                                        .collect();
+                                    // Split points = starts of 2nd, 3rd, ... items.
+                                    col_starts.into_iter().skip(1).collect()
+                                })
+                                .collect()
+                        })
+                        .collect();
+
+                    // Split each slot's buffer into a tile grid.
+                    let output = buffer_splitter.get_full_buffers();
+                    let mut slot_grids: Vec<Option<Vec<Vec<Option<JxlOutputBuffer<'_>>>>>> = output
+                        .iter_mut()
+                        .enumerate()
+                        .map(|(slot_idx, buf_opt)| {
+                            buf_opt.as_mut().map(|buf| {
+                                let split_cols_refs: Vec<&[usize]> = slot_split_cols_per_band
+                                    [slot_idx]
+                                    .iter()
+                                    .map(|v| v.as_slice())
+                                    .collect();
+                                buf.split_into_tile_grid(
+                                    &slot_split_rows[slot_idx],
+                                    &split_cols_refs,
+                                )
+                                .into_iter()
+                                .map(|band| band.into_iter().map(Some).collect())
+                                .collect()
+                            })
+                        })
+                        .collect();
+
+                    // Build per-item fragment sets by taking from the grid.
+                    // Each item gets one fragment per slot, plus the fragment's
+                    // absolute column offset so rect() can adjust correctly.
+                    let mut item_fragments: Vec<Vec<Option<JxlOutputBuffer<'_>>>> = (0..all_items
+                        .len())
+                        .map(|_| (0..num_buffer_slots).map(|_| None).collect())
+                        .collect();
+                    let mut item_col_offsets: Vec<Vec<usize>> =
+                        vec![vec![0; num_buffer_slots]; all_items.len()];
+
+                    for (band_idx, item_indices) in gy_items.iter().enumerate() {
+                        // Track fragment index per slot (items without a rect for
+                        // a given slot don't consume a fragment in that slot).
+                        let mut slot_frag_idx: Vec<usize> = vec![0; num_buffer_slots];
+                        for &item_idx in item_indices {
+                            for slot_idx in 0..num_buffer_slots {
+                                let has_rect = all_layouts[item_idx]
+                                    .iter()
+                                    .any(|&(s, _, _, _)| s == slot_idx);
+                                if !has_rect {
+                                    continue;
+                                }
+                                let frag_idx = slot_frag_idx[slot_idx];
+                                slot_frag_idx[slot_idx] += 1;
+                                if let Some(grid) = slot_grids[slot_idx].as_mut()
+                                    && let Some(frag) =
+                                        grid[band_idx].get_mut(frag_idx).and_then(|o| o.take())
+                                {
+                                    item_fragments[item_idx][slot_idx] = Some(frag);
+                                    // Fragment col offset: 0 for first fragment,
+                                    // split_cols[frag_idx-1] for subsequent ones.
+                                    let col_offset = if frag_idx == 0 {
+                                        0
+                                    } else {
+                                        slot_split_cols_per_band[slot_idx][band_idx]
+                                            .get(frag_idx - 1)
+                                            .copied()
+                                            .unwrap_or(0)
+                                    };
+                                    item_col_offsets[item_idx][slot_idx] = col_offset;
+                                }
+                            }
+                        }
+                    }
+                    drop(slot_grids);
+
+                    // Process all tiles in parallel with direct fragment writes.
+                    item_fragments
+                        .par_iter_mut()
+                        .enumerate()
+                        .try_for_each_init(
+                            || factory.create(1).ok(),
+                            |ctx_opt, (item_idx, slot_bufs)| -> Result<()> {
+                                stop.check()?;
+                                let ctx = ctx_opt.as_mut().ok_or(Error::ImageOutOfMemory(0, 0))?;
+                                let item = &all_items[item_idx];
+                                // Create rect sub-views from fragments.
+                                // Fragments cover the full band; rect() narrows
+                                // to the tile's exact row range and resets to 0-based.
+                                let mut local_bufs: Vec<Option<JxlOutputBuffer<'_>>> = slot_bufs
+                                    .iter_mut()
+                                    .enumerate()
+                                    .map(|(slot_idx, frag_opt)| {
+                                        let frag = frag_opt.as_mut()?;
+                                        let cr = all_layouts[item_idx]
+                                            .iter()
+                                            .find(|&&(s, _, _, _)| s == slot_idx)
+                                            .map(|&(_, _, _, cr)| cr)?;
+                                        // Adjust column origin: fragment starts at
+                                        // col_offset, tile starts at cr.origin.0.
+                                        let col_offset = item_col_offsets[item_idx][slot_idx];
+                                        Some(frag.rect(Rect {
+                                            origin: (cr.origin.0 - col_offset, cr.origin.1),
+                                            size: cr.size,
+                                        }))
+                                    })
+                                    .collect();
+                                render_group::render(
+                                    ctx,
+                                    &view,
+                                    (item.gx, item.gy),
+                                    item.image_area,
+                                    &mut local_bufs,
+                                )?;
+                                Ok(())
+                            },
+                        )?;
+
+                    drop(item_fragments);
+                } else {
+                    // Fallback: two-phase render (owned buffers + copy-back).
+                    // Used when band splitting isn't possible (single gy band
+                    // or overlapping row ranges).
+                    let render_outputs: Vec<Vec<buffer_splitter::OwnedLocalBuffer>> =
+                        all_items
+                            .par_iter()
+                            .enumerate()
+                            .map_init(
+                                || factory.create(1).ok(),
+                                |ctx_opt, (idx, item)| -> Result<Vec<buffer_splitter::OwnedLocalBuffer>> {
+                                    stop.check()?;
+                                    let ctx = ctx_opt
+                                        .as_mut()
+                                        .ok_or(Error::ImageOutOfMemory(0, 0))?;
+                                    let layouts = &all_layouts[idx];
+                                    let mut owned: Vec<buffer_splitter::OwnedLocalBuffer> =
+                                        layouts
+                                            .iter()
+                                            .map(|&(slot, bpr, nr, cr)| {
+                                                buffer_splitter::OwnedLocalBuffer {
+                                                    data: vec![0u8; bpr * nr],
+                                                    bytes_per_row: bpr,
+                                                    num_rows: nr,
+                                                    channel_rect: cr,
+                                                    buffer_index: slot,
+                                                }
+                                            })
+                                            .collect();
+                                    let mut local_bufs: Vec<Option<JxlOutputBuffer<'_>>> =
+                                        (0..num_buffer_slots).map(|_| None).collect();
+                                    for olb in owned.iter_mut() {
+                                        local_bufs[olb.buffer_index] =
+                                            Some(JxlOutputBuffer::new(
+                                                &mut olb.data,
+                                                olb.num_rows,
+                                                olb.bytes_per_row,
+                                            ));
+                                    }
+                                    render_group::render(
+                                        ctx,
+                                        &view,
+                                        (item.gx, item.gy),
+                                        item.image_area,
+                                        &mut local_bufs,
+                                    )?;
+                                    drop(local_bufs);
+                                    Ok(owned)
+                                },
+                            )
+                            .collect::<Result<Vec<_>>>()?;
+
+                    // Sequential copy-back (no band split available).
+                    let output = buffer_splitter.get_full_buffers();
+                    for owned in &render_outputs {
+                        buffer_splitter::copy_back_local_buffers(owned, output);
+                    }
+                }
+            }
+            phase3b_dur += phase3b_start.elapsed();
+
+            // Phase 3c: Sequential — recycle buffers and update flush state.
+            // When batching, skip border recycling: cross-batch process_output
+            // can store data to groups from previous batches, re-readying them
+            // for rendering. Their neighbors' border buffers must stay alive.
+            // Center data IS recycled to refill the pixel pool for next batch.
+            let phase3c_start = crate::util::Instant::now();
+            for ri in &render_infos {
+                if ri.has_items {
+                    lmp_mut!().recycle_group_buffers(ri.group, !is_batched);
+                }
+                if ri.do_render {
+                    self.groups_to_flush.remove(&ri.group);
+                    // Track what was rendered so STEP 5 doesn't redundantly re-render.
+                    if is_vardct {
+                        self.changed_since_last_flush
+                            .insert((ri.group, RenderUnit::VarDCT));
+                    }
+                } else {
+                    self.groups_to_flush.insert(ri.group);
+                }
+            }
+            for &(group, chan) in &modular_channels_output {
+                self.changed_since_last_flush
+                    .insert((group, RenderUnit::Modular(chan)));
+            }
+            phase3c_dur += phase3c_start.elapsed();
+        } // end batch loop
+
+        // After all batches complete, run the deferred border recycling pass.
+        // This is a no-op when unbatched (borders were already recycled above).
+        if is_batched {
+            lmp_mut!().recycle_all_borders();
+        }
+
+        // Save one VarDCT buffer for reuse in next call.
+        self.vardct_buffers = buffer_pool.into_inner().unwrap().pop();
+
+        // Restore HF coefficient buffers after all batches complete.
+        if let Some(ref mut channels) = hf_coefficients {
+            for gw in &mut work {
+                if let Some(coeffs) = gw.hf_coeffs.take() {
+                    let [a, b, c] = coeffs;
+                    channels[0][gw.group] = a;
+                    channels[1][gw.group] = b;
+                    channels[2][gw.group] = c;
+                }
+            }
+        }
+        self.hf_coefficients = hf_coefficients;
+
+        if phase_timing {
+            let batches = num_groups.div_ceil(decode_batch_size);
+            let total = phase1_dur
+                + setup_dur
+                + phase2_dur
+                + collect_dur
+                + phase3a_store_dur
+                + phase3a_prepare_dur
+                + phase3b_dur
+                + phase3c_dur;
+            eprintln!(
+                "[JXL_PHASE_TIMING] {num_groups} groups ({batches} batches of {decode_batch_size}) | \
+                 P1: {:.2}ms | setup: {:.2}ms | P2: {:.2}ms | collect: {:.2}ms | \
+                 P3a-store: {:.2}ms | P3a-prep: {:.2}ms | \
+                 P3b: {:.2}ms | P3c: {:.2}ms | sum: {:.2}ms",
+                phase1_dur.as_secs_f64() * 1000.0,
+                setup_dur.as_secs_f64() * 1000.0,
+                phase2_dur.as_secs_f64() * 1000.0,
+                collect_dur.as_secs_f64() * 1000.0,
+                phase3a_store_dur.as_secs_f64() * 1000.0,
+                phase3a_prepare_dur.as_secs_f64() * 1000.0,
+                phase3b_dur.as_secs_f64() * 1000.0,
+                phase3c_dur.as_secs_f64() * 1000.0,
+                total.as_secs_f64() * 1000.0,
+            );
+        }
+
+        Ok(())
+    }
+
+    /// Helper function to detect CMYK ICC profile from bytes.
+    /// Returns true if the ICC profile has CMYK color space signature.
+    #[cfg(feature = "cms")]
+    fn is_cmyk_icc_profile(icc_data: &[u8]) -> bool {
+        if icc_data.len() < 20 {
+            return false;
+        }
+        // ICC color space signature is at bytes 16-19
+        &icc_data[16..20] == b"CMYK"
+    }
+
+    /// Try to create a CMS-based CMYK->RGB conversion stage.
+    /// Returns Some(stage) if successful, None if we should fall back to simple K multiplication.
+    #[cfg(feature = "cms")]
+    fn try_create_cms_cmyk_stage(
+        decoder_state: &DecoderState,
+        cms: Option<&dyn JxlCms>,
+        black_channel_offset: usize,
+    ) -> Result<Option<CmsCmykToRgbStage>> {
+        // Check if we have a CMS and a CMYK ICC profile
+        let (cms, icc_data) = match (cms, &decoder_state.embedded_color_profile) {
+            (Some(cms), Some(JxlColorProfile::Icc(icc_data))) => (cms, icc_data),
+            _ => return Ok(None),
+        };
+
+        // Check if the ICC profile is CMYK
+        if !Self::is_cmyk_icc_profile(icc_data) {
+            return Ok(None);
+        }
+
+        // Create CMYK -> sRGB transform
+        let cmyk_profile = JxlColorProfile::Icc(icc_data.clone());
+        let srgb_profile = JxlColorProfile::Simple(JxlColorEncoding::srgb(false));
+
+        // Initialize a single transformer for CMYK -> sRGB
+        let (output_channels, mut transformers) = cms.initialize_transforms(
+            1,   // We only need 1 transformer
+            256, // pixels per transform (row chunk size is typically small)
+            cmyk_profile,
+            srgb_profile,
+            decoder_state
+                .file_header
+                .image_metadata
+                .tone_mapping
+                .intensity_target,
+        )?;
+
+        // Verify we got an RGB output (3 channels)
+        if output_channels != 3 || transformers.is_empty() {
+            return Ok(None);
+        }
+
+        // Take the transformer and create the CMS stage
+        let transformer = transformers.remove(0);
+        Ok(Some(CmsCmykToRgbStage::new(
+            black_channel_offset,
+            transformer,
+        )))
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn build_render_pipeline<T: RenderPipeline>(
+        decoder_state: &DecoderState,
+        frame_header: &FrameHeader,
+        lf_global: &LfGlobalState,
+        epf_sigma: &Option<SigmaSource>,
+        pixel_format: &JxlPixelFormat,
+        cms: Option<&dyn JxlCms>,
+        input_profile: &JxlColorProfile,
+        output_profile: &JxlColorProfile,
+    ) -> Result<Box<T>> {
+        let num_channels = frame_header.num_extra_channels as usize + 3;
+        let num_temp_channels = if frame_header.has_noise() { 3 } else { 0 };
+        let metadata = &decoder_state.file_header.image_metadata;
+        // Orientation handed to the save stage. When `adjust_orientation` is set
+        // (the default), the save stage bakes the stored orientation into the
+        // output so the emitted image is upright. When it is cleared (Preserve
+        // mode), we pass `Identity` so the save stage performs no spatial
+        // transform: pixels are emitted in their stored (coded) orientation and
+        // dimensions, and the intrinsic orientation is reported on the basic
+        // info for a later baking stage to apply.
+        let save_orientation = if decoder_state.adjust_orientation {
+            metadata.orientation
+        } else {
+            Orientation::Identity
+        };
+        let mut pipeline = RenderPipelineBuilder::<T>::new(
+            num_channels + num_temp_channels,
+            frame_header.size_upsampled(),
+            frame_header.upsampling.ilog2() as usize,
+            frame_header.log_group_dim(),
+        )
+        .with_memory_tracker(decoder_state.memory_tracker.clone());
+
+        if frame_header.encoding == Encoding::Modular {
+            if decoder_state.file_header.image_metadata.xyb_encoded {
+                pipeline = pipeline
+                    .add_inout_stage(ConvertModularXYBToF32Stage::new(0, &lf_global.lf_quant))
+            } else {
+                for i in 0..3 {
+                    pipeline = pipeline
+                        .add_inout_stage(ConvertModularToF32Stage::new(i, metadata.bit_depth));
+                }
+            }
+        }
+        for i in 3..num_channels {
+            // Use each extra channel's own bit depth, not the image's metadata bit depth
+            let ec_bit_depth = metadata.extra_channel_info[i - 3].bit_depth();
+            pipeline = pipeline.add_inout_stage(ConvertModularToF32Stage::new(i, ec_bit_depth));
+        }
+
+        for c in 0..3 {
+            if frame_header.hshift(c) != 0 {
+                pipeline = pipeline.add_inout_stage(HorizontalChromaUpsample::new(c));
+            }
+            if frame_header.vshift(c) != 0 {
+                pipeline = pipeline.add_inout_stage(VerticalChromaUpsample::new(c));
+            }
+        }
+
+        let filters = &frame_header.restoration_filter;
+        if filters.gab {
+            pipeline = pipeline
+                .add_inout_stage(GaborishStage::new(
+                    0,
+                    filters.gab_x_weight1,
+                    filters.gab_x_weight2,
+                ))
+                .add_inout_stage(GaborishStage::new(
+                    1,
+                    filters.gab_y_weight1,
+                    filters.gab_y_weight2,
+                ))
+                .add_inout_stage(GaborishStage::new(
+                    2,
+                    filters.gab_b_weight1,
+                    filters.gab_b_weight2,
+                ));
+        }
+
+        let rf = &frame_header.restoration_filter;
+        if rf.epf_iters >= 3 {
+            pipeline = pipeline.add_inout_stage(Epf0Stage::new(
+                rf.epf_pass0_sigma_scale,
+                rf.epf_border_sad_mul,
+                rf.epf_channel_scale,
+                epf_sigma.clone().unwrap(),
+            ))
+        }
+        if rf.epf_iters >= 1 {
+            pipeline = pipeline.add_inout_stage(Epf1Stage::new(
+                1.0,
+                rf.epf_border_sad_mul,
+                rf.epf_channel_scale,
+                epf_sigma.clone().unwrap(),
+            ))
+        }
+        if rf.epf_iters >= 2 {
+            pipeline = pipeline.add_inout_stage(Epf2Stage::new(
+                rf.epf_pass2_sigma_scale,
+                rf.epf_border_sad_mul,
+                rf.epf_channel_scale,
+                epf_sigma.clone().unwrap(),
+            ))
+        }
+
+        let late_ec_upsample = frame_header.upsampling > 1
+            && frame_header
+                .ec_upsampling
+                .iter()
+                .all(|x| *x == frame_header.upsampling);
+
+        if !late_ec_upsample {
+            let transform_data = &decoder_state.file_header.transform_data;
+            for (ec, ec_up) in frame_header.ec_upsampling.iter().enumerate() {
+                if *ec_up > 1 {
+                    pipeline = match *ec_up {
+                        2 => pipeline.add_inout_stage(Upsample2x::new(transform_data, 3 + ec)),
+                        4 => pipeline.add_inout_stage(Upsample4x::new(transform_data, 3 + ec)),
+                        8 => pipeline.add_inout_stage(Upsample8x::new(transform_data, 3 + ec)),
+                        _ => unreachable!(),
+                    };
+                }
+            }
+        }
+
+        if frame_header.has_patches() {
+            pipeline = pipeline.add_inplace_stage(PatchesStage {
+                patches: lf_global.patches.clone().unwrap(),
+                extra_channels: metadata.extra_channel_info.clone(),
+                decoder_state: decoder_state.reference_frames.clone(),
+            })
+        }
+
+        if frame_header.has_splines() {
+            pipeline = pipeline.add_inplace_stage(SplinesStage::new(
+                lf_global.splines.clone().unwrap(),
+                frame_header.size(),
+                &lf_global.color_correlation_params.unwrap_or_default(),
+                decoder_state.high_precision,
+            )?)
+        }
+
+        if frame_header.upsampling > 1 {
+            let transform_data = &decoder_state.file_header.transform_data;
+            let nb_channels = if late_ec_upsample {
+                3 + frame_header.ec_upsampling.len()
+            } else {
+                3
+            };
+            for c in 0..nb_channels {
+                pipeline = match frame_header.upsampling {
+                    2 => pipeline.add_inout_stage(Upsample2x::new(transform_data, c)),
+                    4 => pipeline.add_inout_stage(Upsample4x::new(transform_data, c)),
+                    8 => pipeline.add_inout_stage(Upsample8x::new(transform_data, c)),
+                    _ => unreachable!(),
+                };
+            }
+        }
+
+        if frame_header.has_noise() {
+            pipeline = pipeline
+                .add_inout_stage(ConvolveNoiseStage::new(num_channels))
+                .add_inout_stage(ConvolveNoiseStage::new(num_channels + 1))
+                .add_inout_stage(ConvolveNoiseStage::new(num_channels + 2))
+                .add_inplace_stage(AddNoiseStage::new(
+                    *lf_global.noise.as_ref().unwrap(),
+                    lf_global.color_correlation_params.unwrap_or_default(),
+                    num_channels,
+                ));
+        }
+
+        // Calculate the actual number of API-provided buffers based on pixel_format.
+        // This is the number of buffers the caller provides, NOT the theoretical max.
+        // When extra_channel_format[i] is None, that channel doesn't get a buffer.
+        let num_api_buffers = std::iter::once(&pixel_format.color_data_format)
+            .chain(pixel_format.extra_channel_format.iter())
+            .filter(|x| x.is_some())
+            .count();
+        assert_eq!(
+            pixel_format.extra_channel_format.len(),
+            frame_header.num_extra_channels as usize
+        );
+
+        assert!(frame_header.lf_level == 0 || !frame_header.can_be_referenced);
+
+        if frame_header.lf_level != 0 {
+            for i in 0..3 {
+                pipeline = pipeline.add_save_stage(
+                    &[i],
+                    Orientation::Identity,
+                    num_api_buffers + i,
+                    JxlColorType::Grayscale,
+                    JxlDataFormat::f32(),
+                    false,
+                );
+            }
+        }
+        if frame_header.can_be_referenced && frame_header.save_before_ct {
+            for i in 0..num_channels {
+                pipeline = pipeline.add_save_stage(
+                    &[i],
+                    Orientation::Identity,
+                    num_api_buffers + i,
+                    JxlColorType::Grayscale,
+                    JxlDataFormat::f32(),
+                    false,
+                );
+            }
+        }
+
+        let output_color_info = OutputColorInfo::from_header(&decoder_state.file_header)?;
+
+        // Determine output TF: use output profile's TF if available, else fall back to embedded profile's TF.
+        // Note: output_color_info (luminances, opsin matrix) always comes from the embedded profile;
+        // CMS handles any primaries conversion if the output profile differs.
+        let output_tf = output_profile
+            .transfer_function()
+            .map(|tf| {
+                TransferFunction::from_api_tf(
+                    tf,
+                    output_color_info.intensity_target,
+                    output_color_info.luminances,
+                )
+            })
+            .unwrap_or_else(|| output_color_info.tf.clone());
+
+        // Clamp transfer-domain values while converting to f16 so we don't
+        // emit wild out-of-range values to downstream consumers.
+        //
+        // PQ has a bounded signal domain [0,1].
+        // HLG may carry modest overshoot/undershoot (e.g. from narrow-range
+        // workflows), so preserve headroom with a looser clamp.
+        let clamp_range_for_f16 = match &output_tf {
+            TransferFunction::Pq { .. } => Some((0.0, 1.0)),
+            TransferFunction::Hlg { .. } => Some((-0.074, 1.1)),
+            _ => None,
+        };
+
+        // Find the Black (K) extra channel if present.
+        // In JXL, CMYK is stored as 3 color channels (CMY) + K as extra channel.
+        // Pipeline index of K = extra_channel_index + 3
+        let black_channel: Option<usize> = decoder_state
+            .file_header
+            .image_metadata
+            .extra_channel_info
+            .iter()
+            .enumerate()
+            .find(|x| x.1.ec_type == ExtraChannel::Black)
+            .map(|(k_idx, _)| k_idx + 3);
+
+        let xyb_encoded = decoder_state.file_header.image_metadata.xyb_encoded;
+        let has_black_channel = black_channel.is_some();
+
+        // Pre-check: can we fuse XYB inverse + sRGB TF + u8 conversion into one stage?
+        // All conditions checked here are available before CMS; the CMS check comes later.
+        let has_spot_colors = decoder_state.render_spotcolors
+            && decoder_state
+                .file_header
+                .image_metadata
+                .extra_channel_info
+                .iter()
+                .any(|info| info.ec_type == ExtraChannel::SpotColor);
+        let mut fuse_xyb_u8: Option<(u8, TransferFunction)> = None;
+        if xyb_encoded
+            && !frame_header.do_ycbcr
+            && !output_tf.is_linear()
+            && matches!(
+                &output_tf,
+                TransferFunction::Srgb | TransferFunction::Gamma(_)
+            )
+            && let Some(JxlDataFormat::U8 { bit_depth }) = pixel_format.color_data_format
+            && !has_black_channel
+            && !frame_header.needs_blending()
+            && !has_spot_colors
+            && !decoder_state.premultiply_output
+        {
+            // Defer XybStage — will be fused with TF + u8.
+            fuse_xyb_u8 = Some((bit_depth, output_tf.clone()));
+        }
+
+        if frame_header.do_ycbcr {
+            pipeline = pipeline.add_inplace_stage(YcbcrToRgbStage::new(0));
+        } else if xyb_encoded && fuse_xyb_u8.is_none() {
+            pipeline = pipeline.add_inplace_stage(XybStage::new(0, output_color_info.clone()));
+        }
+
+        // Insert tone mapping stage if desired_intensity_target differs from
+        // the image's embedded intensity target. This matches libjxl's
+        // ToneMappingStage (stage_tone_mapping.cc). The stage operates on
+        // display-referred linear RGB, so it must come after XYB decode and
+        // before FromLinearStage / CMS.
+        let orig_intensity_target = output_color_info.intensity_target;
+        if let Some(desired) = decoder_state.desired_intensity_target
+            && (desired - orig_intensity_target).abs() > f32::EPSILON
+            && xyb_encoded
+        {
+            match &output_color_info.tf {
+                TransferFunction::Pq { .. } => {
+                    pipeline = pipeline.add_inplace_stage(ToneMappingStage::pq(
+                        0,
+                        orig_intensity_target,
+                        desired,
+                        output_color_info.luminances,
+                    ));
+                }
+                TransferFunction::Hlg { .. } => {
+                    pipeline = pipeline.add_inplace_stage(ToneMappingStage::hlg(
+                        0,
+                        orig_intensity_target,
+                        desired,
+                        output_color_info.luminances,
+                    ));
+                }
+                _ => {
+                    // Tone mapping only applies to HDR transfer functions
+                }
+            }
+        }
+
+        // Insert CMS stage if profiles differ.
+        // Following libjxl: use EITHER CMS OR FromLinearStage, never both.
+        // - If output matches original encoding: only FromLinearStage is needed
+        // - If output differs: CMS handles everything including TF conversion
+        //
+        // For XYB images, XybStage outputs LINEAR data in the embedded profile's primaries,
+        // so the CMS input should be the LINEAR version of the embedded profile.
+        // For ICC embedded profiles with XYB, XybStage outputs linear sRGB (see xyb.rs).
+        let cms_input_profile = if xyb_encoded {
+            // XYB outputs linear, so use linear version of input profile for CMS
+            input_profile.with_linear_tf().or_else(|| {
+                // For ICC profiles with XYB, XybStage outputs linear sRGB
+                Some(JxlColorProfile::Simple(JxlColorEncoding::linear_srgb(
+                    false,
+                )))
+            })
+        } else {
+            // Non-XYB: data is in the embedded profile's space including TF
+            Some(input_profile.clone())
+        };
+
+        // Compare ORIGINAL input profile (not linearized cms_input_profile) with output.
+        // This matches libjxl (53042ec5) dec_xyb.cc:184:
+        //   color_encoding_is_original = orig_color_encoding.SameColorEncoding(c_desired);
+        let color_encoding_is_original = input_profile.same_color_encoding(output_profile);
+
+        // Also check if the CMS would be a no-op: for XYB images, the CMS input is the
+        // linearized version of the embedded profile. If this matches the output profile,
+        // the CMS transform would be identity but may introduce clamping artifacts
+        // (e.g., moxcms clamps TRC LUT to [0,1], losing out-of-gamut values).
+        let cms_would_be_identity = cms_input_profile
+            .as_ref()
+            .is_some_and(|cms_in| cms_in.same_color_encoding(output_profile));
+
+        let mut cms_used = false;
+
+        // Skip CMS if channel counts differ (grayscale↔RGB) - like libjxl's not_mixing_color_and_grey.
+        // Exception: CMYK (4) → RGB (3) is allowed via CMS.
+        let src_channels = cms_input_profile
+            .as_ref()
+            .map(|p| p.channels())
+            .unwrap_or(3);
+        let dst_channels = output_profile.channels();
+        let channel_counts_compatible =
+            src_channels == dst_channels || (src_channels == 4 && dst_channels == 3);
+
+        if !color_encoding_is_original
+            && !cms_would_be_identity
+            && channel_counts_compatible
+            && let Some(cms) = cms
+            && let Some(cms_input) = cms_input_profile
+        {
+            // Use frame width as max_pixels since rows can be that wide
+            let max_pixels = frame_header.size_upsampled().0;
+            // Use CMS input profile's channel count, matching libjxl's c_src_.Channels()
+            // For CMYK, channels() returns 4; for RGB, 3; for grayscale, 1.
+            let in_channels = cms_input.channels();
+            // Create enough transformers for parallel rendering threads.
+            #[cfg(feature = "threads")]
+            let num_transforms = if decoder_state.parallel {
+                rayon::current_num_threads() + 2
+            } else {
+                1
+            };
+            #[cfg(not(feature = "threads"))]
+            let num_transforms = 1;
+            let (out_channels, transformers) = cms.initialize_transforms(
+                num_transforms,
+                max_pixels,
+                cms_input,
+                output_profile.clone(),
+                output_color_info.intensity_target,
+            )?;
+            // CMS cannot add channels - reject transforms that would
+            if out_channels > in_channels {
+                return Err(Error::CmsChannelCountIncrease {
+                    in_channels,
+                    out_channels,
+                });
+            }
+            // Only pass black_channel to CmsStage if CMS is actually processing CMYK input.
+            // For XYB images, even if original was CMYK, CMS input is linear RGB.
+            let cms_black_channel = if in_channels == 4 {
+                black_channel
+            } else {
+                None
+            };
+            Self::check_cms_consumed_black_channel(
+                cms_black_channel,
+                in_channels,
+                out_channels,
+                pixel_format,
+            )?;
+            if !transformers.is_empty() {
+                pipeline = pipeline.add_inplace_stage(CmsStage::new(
+                    transformers,
+                    in_channels,
+                    out_channels,
+                    cms_black_channel,
+                    max_pixels,
+                ));
+                cms_used = true;
+            }
+        }
+
+        // For CMYK images, we need to handle blending in CMYK color space.
+        // If ANY frame in the image needs blending, ALL frames must save their
+        // reference in CMYK space so that subsequent frames can blend correctly.
+        let cmyk_needs_deferred_cms = has_black_channel
+            && (frame_header.needs_blending()
+                || (frame_header.can_be_referenced && !frame_header.save_before_ct));
+
+        // If CMS was used, the full XYB+TF+u8 fusion is not possible — fall back.
+        // We deferred XybStage earlier, so we need to add it now plus the separate TF stage.
+        if fuse_xyb_u8.is_some() && cms_used {
+            fuse_xyb_u8 = None;
+            pipeline = pipeline.add_inplace_stage(XybStage::new(0, output_color_info.clone()));
+        }
+
+        // XYB output is linear, so apply transfer function:
+        // - Only if output is non-linear AND
+        // - CMS was not used (CMS already handles the full conversion including TF)
+        //
+        // When full XYB+TF+U8 fusion is active, skip both FromLinearStage and XybStage —
+        // XybToU8Stage handles all three in one SIMD pass.
+        // When only sRGB+U8 fusion is active (non-XYB or CMS fallback), FromLinearSrgbToU8Stage
+        // handles the TF+u8 conversion.
+        let mut fuse_srgb_to_u8_bit_depth: Option<u8> = None;
+        if fuse_xyb_u8.is_some() {
+            // Full fusion path: XYB+TF+U8 all handled at conversion stage
+        } else if xyb_encoded && !output_tf.is_linear() && !cms_used {
+            if let TransferFunction::Srgb = &output_tf
+                && let Some(JxlDataFormat::U8 { bit_depth }) = pixel_format.color_data_format
+                && !has_black_channel
+                && !frame_header.needs_blending()
+                && !has_spot_colors
+                && !decoder_state.premultiply_output
+            {
+                fuse_srgb_to_u8_bit_depth = Some(bit_depth);
+            }
+            if fuse_srgb_to_u8_bit_depth.is_none() {
+                pipeline = pipeline.add_inplace_stage(FromLinearStage::new(0, output_tf.clone()));
+            }
+        }
+
+        // For CMYK images that don't need deferred CMS, apply Black channel conversion here
+        if has_black_channel && !cmyk_needs_deferred_cms {
+            for (i, info) in decoder_state
+                .file_header
+                .image_metadata
+                .extra_channel_info
+                .iter()
+                .enumerate()
+            {
+                if info.ec_type == ExtraChannel::Black {
+                    // Try to use CMS-based CMYK conversion if we have:
+                    // 1. A CMS implementation available
+                    // 2. An embedded CMYK ICC profile
+                    #[cfg(feature = "cms")]
+                    if let Some(cms_stage) = Self::try_create_cms_cmyk_stage(decoder_state, cms, i)?
+                    {
+                        pipeline = pipeline.add_inplace_stage(cms_stage);
+                    } else {
+                        // Fall back to simple K multiplication: R = C * K, G = M * K, B = Y * K
+                        pipeline = pipeline.add_inplace_stage(BlackChannelStage::new(i));
+                    }
+                    #[cfg(not(feature = "cms"))]
+                    {
+                        let _ = cms; // suppress unused warning when cms feature is off
+                        pipeline = pipeline.add_inplace_stage(BlackChannelStage::new(i));
+                    }
+                }
+            }
+        }
+
+        if frame_header.needs_blending() {
+            pipeline = pipeline.add_inplace_stage(BlendingStage::new(
+                frame_header,
+                &decoder_state.file_header,
+                decoder_state.reference_frames.clone(),
+            )?);
+            // TODO(veluca): we might not need to add an extend stage if the image size is
+            // compatible with the frame size.
+            pipeline = pipeline.add_extend_stage(ExtendToImageDimensionsStage::new(
+                frame_header,
+                &decoder_state.file_header,
+                decoder_state.reference_frames.clone(),
+            )?);
+        }
+
+        // For CMYK images that need deferred CMS, save reference in CMYK space (before CMS)
+        // and apply CMS conversion after. This is critical: blending must happen in CMYK space.
+        if cmyk_needs_deferred_cms {
+            // Save reference in CMYK space (before CMS conversion)
+            if frame_header.can_be_referenced && !frame_header.save_before_ct {
+                for i in 0..num_channels {
+                    pipeline = pipeline.add_save_stage(
+                        &[i],
+                        Orientation::Identity,
+                        num_api_buffers + i,
+                        JxlColorType::Grayscale,
+                        JxlDataFormat::f32(),
+                        false,
+                    );
+                }
+            }
+
+            // Apply CMS conversion (CMYK -> RGB) after blending/saving
+            for (i, info) in decoder_state
+                .file_header
+                .image_metadata
+                .extra_channel_info
+                .iter()
+                .enumerate()
+            {
+                if info.ec_type == ExtraChannel::Black {
+                    #[cfg(feature = "cms")]
+                    if let Some(cms_stage) = Self::try_create_cms_cmyk_stage(decoder_state, cms, i)?
+                    {
+                        pipeline = pipeline.add_inplace_stage(cms_stage);
+                    } else {
+                        pipeline = pipeline.add_inplace_stage(BlackChannelStage::new(i));
+                    }
+                    #[cfg(not(feature = "cms"))]
+                    {
+                        let _ = cms;
+                        pipeline = pipeline.add_inplace_stage(BlackChannelStage::new(i));
+                    }
+                }
+            }
+        }
+
+        // For non-CMYK images (or CMYK that doesn't need deferred CMS), save reference after CT
+        if frame_header.can_be_referenced
+            && !frame_header.save_before_ct
+            && !cmyk_needs_deferred_cms
+        {
+            for i in 0..num_channels {
+                pipeline = pipeline.add_save_stage(
+                    &[i],
+                    Orientation::Identity,
+                    num_api_buffers + i,
+                    JxlColorType::Grayscale,
+                    JxlDataFormat::f32(),
+                    false,
+                );
+            }
+        }
+
+        if decoder_state.render_spotcolors {
+            for (i, info) in decoder_state
+                .file_header
+                .image_metadata
+                .extra_channel_info
+                .iter()
+                .enumerate()
+            {
+                if info.ec_type == ExtraChannel::SpotColor {
+                    pipeline = pipeline
+                        .add_inplace_stage(SpotColorStage::new(i, info.spot_color.unwrap()));
+                }
+            }
+        }
+
+        if frame_header.is_visible() {
+            let color_space = decoder_state
+                .file_header
+                .image_metadata
+                .color_encoding
+                .color_space;
+            let num_color_channels = if color_space == ColorSpace::Gray {
+                1
+            } else {
+                3
+            };
+            // Find the alpha channel info (index and metadata) if the color type requires alpha
+            let alpha_channel_info = if pixel_format.color_type.has_alpha() {
+                decoder_state
+                    .file_header
+                    .image_metadata
+                    .extra_channel_info
+                    .iter()
+                    .enumerate()
+                    .find(|x| x.1.ec_type == ExtraChannel::Alpha)
+            } else {
+                None
+            };
+            let alpha_in_color = alpha_channel_info.map(|x| x.0 + 3);
+            // Check if the source alpha is already premultiplied (alpha_associated)
+            let source_alpha_associated =
+                alpha_channel_info.is_some_and(|(_, info)| info.alpha_associated());
+            if pixel_format.color_type.is_grayscale() && num_color_channels == 3 {
+                return Err(Error::NotGrayscale);
+            }
+            // Determine if we need to fill opaque alpha:
+            // - color_type requests alpha (has_alpha() is true)
+            // - but no actual alpha channel exists in the image (alpha_in_color is None)
+            let fill_opaque_alpha = pixel_format.color_type.has_alpha() && alpha_in_color.is_none();
+
+            // Determine if we should premultiply:
+            // - premultiply_output is requested
+            // - there is an alpha channel in the output
+            // - source is not already premultiplied (to avoid double-premultiplication)
+            let should_premultiply = decoder_state.premultiply_output
+                && alpha_in_color.is_some()
+                && !source_alpha_associated;
+
+            // Note: We don't unpremultiply by default because djxl also doesn't by default.
+            // When source has alpha_associated=true (premultiplied), we output premultiplied
+            // unless explicitly requested otherwise via premultiply_output=false + cms option.
+            // This matches libjxl's JxlDecoderSetUnpremultiplyAlpha default of false.
+
+            let color_source_channels: &[usize] =
+                match (pixel_format.color_type.is_grayscale(), alpha_in_color) {
+                    (true, None) => &[0],
+                    (true, Some(c)) => &[0, c],
+                    (false, None) => &[0, 1, 2],
+                    (false, Some(c)) => &[0, 1, 2, c],
+                };
+            // `output_buffer_index` walks the PACKED position in the caller's
+            // api buffer list — color first (if requested), then each
+            // *requested* (`Some`) extra channel in order. This must match
+            // `num_api_buffers` above and the packed buffer Vec built at decode
+            // time. The previous absolute extra-channel index (`1 + i`) desynced
+            // from the packed buffers whenever an extra channel was unrequested
+            // (`None`, e.g. alpha folded into color) or color itself was absent,
+            // indexing past the end of `buffers` — the spot-colour decode panic.
+            let mut output_buffer_index = 0usize;
+            if let Some(df) = &pixel_format.color_data_format {
+                // Add premultiply stage if needed (before conversion to output format)
+                if should_premultiply && let Some(alpha_channel) = alpha_in_color {
+                    pipeline = pipeline.add_inplace_stage(PremultiplyAlphaStage::new(
+                        0,
+                        num_color_channels,
+                        alpha_channel,
+                    ));
+                }
+                // Add conversion stages for non-float output formats.
+                // Full fusion: XYB+TF+U8 in one stage (XybToU8Stage)
+                // Partial fusion: sRGB+U8 in one stage (FromLinearSrgbToU8Stage)
+                // No fusion: separate stages
+                if let Some((bit_depth, ref tf)) = fuse_xyb_u8 {
+                    use crate::render::stages::ConvertF32ToU8Stage;
+                    pipeline = pipeline.add_inout_stage(XybToU8Stage::new(
+                        0,
+                        output_color_info.clone(),
+                        bit_depth,
+                        tf.clone(),
+                    ));
+                    // Alpha channel still needs plain f32→u8 conversion (no TF/XYB)
+                    for &channel in color_source_channels.iter().filter(|&&c| c >= 3) {
+                        pipeline =
+                            pipeline.add_inout_stage(ConvertF32ToU8Stage::new(channel, bit_depth));
+                    }
+                } else if let Some(bit_depth) = fuse_srgb_to_u8_bit_depth {
+                    use crate::render::stages::{ConvertF32ToU8Stage, FromLinearSrgbToU8Stage};
+                    pipeline = pipeline.add_inout_stage(FromLinearSrgbToU8Stage::new(0, bit_depth));
+                    // Alpha channel still needs plain f32→u8 conversion (no TF)
+                    for &channel in color_source_channels.iter().filter(|&&c| c >= 3) {
+                        pipeline =
+                            pipeline.add_inout_stage(ConvertF32ToU8Stage::new(channel, bit_depth));
+                    }
+                } else {
+                    pipeline = Self::add_conversion_stages(
+                        pipeline,
+                        color_source_channels,
+                        *df,
+                        clamp_range_for_f16,
+                    );
+                }
+                pipeline = pipeline.add_save_stage(
+                    color_source_channels,
+                    save_orientation,
+                    output_buffer_index,
+                    pixel_format.color_type,
+                    *df,
+                    fill_opaque_alpha,
+                );
+                output_buffer_index += 1;
+            }
+            for i in 0..frame_header.num_extra_channels as usize {
+                if let Some(df) = &pixel_format.extra_channel_format[i] {
+                    // Add conversion stages for non-float output formats
+                    pipeline = Self::add_conversion_stages(pipeline, &[3 + i], *df, None);
+                    pipeline = pipeline.add_save_stage(
+                        &[3 + i],
+                        save_orientation,
+                        output_buffer_index,
+                        JxlColorType::Grayscale,
+                        *df,
+                        false,
+                    );
+                    output_buffer_index += 1;
+                }
+            }
+        }
+        pipeline.build()
+    }
+
+    pub fn prepare_render_pipeline(
+        &mut self,
+        pixel_format: &JxlPixelFormat,
+        cms: Option<&dyn JxlCms>,
+        input_profile: &JxlColorProfile,
+        output_profile: &JxlColorProfile,
+    ) -> Result<()> {
+        let lf_global = self.lf_global.as_ref().unwrap();
+        let epf_sigma = if self.header.restoration_filter.epf_iters > 0 {
+            Some(SigmaSource::new(&self.header, lf_global, &self.hf_meta)?)
+        } else {
+            None
+        };
+
+        #[cfg(test)]
+        let render_pipeline = if self.use_simple_pipeline {
+            Self::build_render_pipeline::<SimpleRenderPipeline>(
+                &self.decoder_state,
+                &self.header,
+                lf_global,
+                &epf_sigma,
+                pixel_format,
+                cms,
+                input_profile,
+                output_profile,
+            )? as Box<dyn std::any::Any>
+        } else {
+            Self::build_render_pipeline::<LowMemoryRenderPipeline>(
+                &self.decoder_state,
+                &self.header,
+                lf_global,
+                &epf_sigma,
+                pixel_format,
+                cms,
+                input_profile,
+                output_profile,
+            )? as Box<dyn std::any::Any>
+        };
+        #[cfg(not(test))]
+        let render_pipeline = Self::build_render_pipeline::<LowMemoryRenderPipeline>(
+            &self.decoder_state,
+            &self.header,
+            lf_global,
+            &epf_sigma,
+            pixel_format,
+            cms,
+            input_profile,
+            output_profile,
+        )?;
+        self.render_pipeline = Some(render_pipeline);
+        self.was_flushed_once = false;
+        Ok(())
+    }
+
+    /// Run `prepare_render_pipeline` and `finalize_lf` together, overlapping
+    /// the pipeline build with adaptive LF smoothing via `std::thread::scope`.
+    ///
+    /// Both operations access disjoint fields of `Frame`:
+    /// - Pipeline: reads header/lf_global/hf_meta/decoder_state, writes render_pipeline
+    /// - finalize_lf: reads header/lf_global, writes lf_image
+    ///
+    /// The pipeline build captures `cms: &dyn JxlCms` which is not `Sync`,
+    /// so it must stay on the main thread. `finalize_lf` (which doesn't need
+    /// `cms`) runs on a scoped OS thread.
+    #[cfg(feature = "threads")]
+    #[allow(dead_code)] // Parallel pipeline+LF preparation for threaded decode
+    pub fn prepare_pipeline_and_finalize_lf(
+        &mut self,
+        pixel_format: &JxlPixelFormat,
+        cms: Option<&dyn JxlCms>,
+        input_profile: &JxlColorProfile,
+        output_profile: &JxlColorProfile,
+    ) -> Result<()> {
+        self.prepare_render_pipeline(pixel_format, cms, input_profile, output_profile)?;
+        self.finalize_lf()
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/bit_depth.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/bit_depth.rs
new file mode 100644
index 00000000..e83217da
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/bit_depth.rs
@@ -0,0 +1,104 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{bit_reader::BitReader, error::Error, headers::encodings::*};
+use jxl_macros::UnconditionalCoder;
+
+use std::fmt::Debug;
+
+#[derive(UnconditionalCoder, Clone, Copy, PartialEq, Eq)]
+#[validate]
+pub struct BitDepth {
+    #[default(false)]
+    floating_point_sample: bool,
+    #[select_coder(floating_point_sample)]
+    #[coder_true(u2S(32, 16, 24, Bits(6)+1))]
+    #[coder_false(u2S(8, 10, 12, Bits(6)+1))]
+    #[default(8)]
+    bits_per_sample: u32,
+    #[condition(floating_point_sample)]
+    #[default(0)]
+    #[coder(Bits(4)+1)]
+    exponent_bits_per_sample: u32,
+}
+
+impl Debug for BitDepth {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self.floating_point_sample {
+            match (self.bits_per_sample, self.exponent_bits_per_sample) {
+                (32, 8) => {
+                    write!(f, "F32")
+                }
+                (16, 5) => {
+                    write!(f, "F16")
+                }
+                _ => {
+                    write!(
+                        f,
+                        "FloatE{}M{}",
+                        self.exponent_bits_per_sample,
+                        self.bits_per_sample - self.exponent_bits_per_sample - 1
+                    )
+                }
+            }
+        } else {
+            write!(f, "U{}", self.bits_per_sample)
+        }
+    }
+}
+
+impl BitDepth {
+    pub fn integer_samples(bits_per_sample: u32) -> BitDepth {
+        BitDepth {
+            floating_point_sample: false,
+            bits_per_sample,
+            exponent_bits_per_sample: 0,
+        }
+    }
+    #[cfg(test)]
+    pub fn f32() -> BitDepth {
+        BitDepth {
+            floating_point_sample: true,
+            bits_per_sample: 32,
+            exponent_bits_per_sample: 8,
+        }
+    }
+    #[cfg(test)]
+    pub fn f16() -> BitDepth {
+        BitDepth {
+            floating_point_sample: true,
+            bits_per_sample: 16,
+            exponent_bits_per_sample: 5,
+        }
+    }
+    pub fn bits_per_sample(&self) -> u32 {
+        self.bits_per_sample
+    }
+    pub fn exponent_bits_per_sample(&self) -> u32 {
+        self.exponent_bits_per_sample
+    }
+    pub fn floating_point_sample(&self) -> bool {
+        self.floating_point_sample
+    }
+    fn check(&self, _: &Empty) -> Result<(), Error> {
+        if self.floating_point_sample {
+            if self.exponent_bits_per_sample < 2 || self.exponent_bits_per_sample > 8 {
+                Err(Error::InvalidExponent(self.exponent_bits_per_sample))
+            } else {
+                let mantissa_bits =
+                    self.bits_per_sample as i32 - self.exponent_bits_per_sample as i32 - 1;
+                if !(2..=23).contains(&mantissa_bits) {
+                    Err(Error::InvalidMantissa(mantissa_bits))
+                } else {
+                    Ok(())
+                }
+            }
+        } else if self.bits_per_sample > 31 {
+            Err(Error::InvalidBitsPerSample(self.bits_per_sample))
+        } else {
+            Ok(())
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/color_encoding.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/color_encoding.rs
new file mode 100644
index 00000000..5ec6ba1d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/color_encoding.rs
@@ -0,0 +1,204 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{bit_reader::BitReader, error::Error, headers::encodings::*};
+use jxl_macros::UnconditionalCoder;
+use num_derive::FromPrimitive;
+use std::fmt;
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum ColorSpace {
+    RGB,
+    Gray,
+    XYB,
+    Unknown,
+}
+
+impl fmt::Display for ColorSpace {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                ColorSpace::RGB => "RGB",
+                ColorSpace::Gray => "Gra",
+                ColorSpace::XYB => "XYB",
+                ColorSpace::Unknown => "CS?",
+            }
+        )
+    }
+}
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum WhitePoint {
+    D65 = 1,
+    Custom = 2,
+    E = 10,
+    DCI = 11,
+}
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum Primaries {
+    SRGB = 1,
+    Custom = 2,
+    BT2100 = 9,
+    P3 = 11,
+}
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum TransferFunction {
+    BT709 = 1,
+    Unknown = 2,
+    Linear = 8,
+    SRGB = 13,
+    PQ = 16,
+    DCI = 17,
+    HLG = 18,
+}
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum RenderingIntent {
+    Perceptual = 0,
+    Relative,
+    Saturation,
+    Absolute,
+}
+
+impl fmt::Display for RenderingIntent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                RenderingIntent::Perceptual => "Per",
+                RenderingIntent::Relative => "Rel",
+                RenderingIntent::Saturation => "Sat",
+                RenderingIntent::Absolute => "Abs",
+            }
+        )
+    }
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+pub struct CustomXY {
+    #[default(0)]
+    #[coder(u2S(Bits(19), Bits(19) + 524288, Bits(20) + 1048576, Bits(21) + 2097152))]
+    pub x: i32,
+    #[default(0)]
+    #[coder(u2S(Bits(19), Bits(19) + 524288, Bits(20) + 1048576, Bits(21) + 2097152))]
+    pub y: i32,
+}
+
+impl CustomXY {
+    /// Converts the stored scaled integer coordinates to f32 (x, y) values.
+    pub fn as_f32_coords(&self) -> (f32, f32) {
+        (self.x as f32 / 1_000_000.0, self.y as f32 / 1_000_000.0)
+    }
+
+    pub fn from_f32_coords(x: f32, y: f32) -> Self {
+        Self {
+            x: (x * 1_000_000.0).round() as i32,
+            y: (y * 1_000_000.0).round() as i32,
+        }
+    }
+}
+
+pub struct CustomTransferFunctionNonserialized {
+    color_space: ColorSpace,
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[nonserialized(CustomTransferFunctionNonserialized)]
+#[validate]
+pub struct CustomTransferFunction {
+    #[condition(nonserialized.color_space != ColorSpace::XYB)]
+    #[default(false)]
+    pub have_gamma: bool,
+    #[condition(have_gamma)]
+    #[default(3333333)] // XYB gamma
+    #[coder(Bits(24))]
+    pub gamma: u32,
+    #[condition(!have_gamma && nonserialized.color_space != ColorSpace::XYB)]
+    #[default(TransferFunction::SRGB)]
+    pub transfer_function: TransferFunction,
+}
+
+impl CustomTransferFunction {
+    #[cfg(test)]
+    pub fn empty() -> CustomTransferFunction {
+        CustomTransferFunction {
+            have_gamma: false,
+            gamma: 0,
+            transfer_function: TransferFunction::Unknown,
+        }
+    }
+    pub fn gamma(&self) -> f32 {
+        assert!(self.have_gamma);
+        self.gamma as f32 * 0.0000001
+    }
+
+    pub fn check(&self, _: &CustomTransferFunctionNonserialized) -> Result<(), Error> {
+        if self.have_gamma {
+            let gamma = self.gamma();
+            if gamma > 1.0 || gamma * 8192.0 < 1.0 {
+                Err(Error::InvalidGamma(gamma))
+            } else {
+                Ok(())
+            }
+        } else {
+            Ok(())
+        }
+    }
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[validate]
+pub struct ColorEncoding {
+    // all_default is never read.
+    #[allow(dead_code)]
+    #[all_default]
+    all_default: bool,
+    #[default(false)]
+    pub want_icc: bool,
+    #[default(ColorSpace::RGB)]
+    pub color_space: ColorSpace,
+    #[condition(!want_icc && color_space != ColorSpace::XYB)]
+    #[default(WhitePoint::D65)]
+    pub white_point: WhitePoint,
+    // TODO(veluca): can this be merged in the enum?!
+    #[condition(white_point == WhitePoint::Custom)]
+    #[default(CustomXY::default(&field_nonserialized))]
+    pub white: CustomXY,
+    #[condition(!want_icc && color_space != ColorSpace::XYB && color_space != ColorSpace::Gray)]
+    #[default(Primaries::SRGB)]
+    pub primaries: Primaries,
+    #[condition(primaries == Primaries::Custom)]
+    #[default([CustomXY::default(&field_nonserialized), CustomXY::default(&field_nonserialized), CustomXY::default(&field_nonserialized)])]
+    pub custom_primaries: [CustomXY; 3],
+    #[condition(!want_icc)]
+    #[default(CustomTransferFunction::default(&field_nonserialized))]
+    #[nonserialized(color_space: color_space)]
+    pub tf: CustomTransferFunction,
+    #[condition(!want_icc)]
+    #[default(RenderingIntent::Relative)]
+    pub rendering_intent: RenderingIntent,
+}
+
+impl ColorEncoding {
+    pub fn check(&self, _: &Empty) -> Result<(), Error> {
+        if self.color_space == ColorSpace::Unknown
+            || self.tf.transfer_function == TransferFunction::Unknown
+            || self.color_space == ColorSpace::XYB
+        {
+            Err(Error::InvalidColorEncoding)
+        } else {
+            Ok(())
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/encodings.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/encodings.rs
new file mode 100644
index 00000000..cf839224
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/encodings.rs
@@ -0,0 +1,415 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::{frame_header::PermutationNonserialized, permutation::Permutation};
+use crate::{
+    bit_reader::BitReader,
+    entropy_coding::decode::{Histograms, SymbolReader, unpack_signed},
+    error::Error,
+};
+
+pub enum U32 {
+    Bits(usize),
+    BitsOffset { n: usize, off: u32 },
+    Val(u32),
+}
+
+impl U32 {
+    pub fn read(&self, br: &mut BitReader) -> Result<u32, Error> {
+        match *self {
+            U32::Bits(n) => Ok(br.read_noinline(n)? as u32),
+            U32::BitsOffset { n, off } => Ok(br.read_noinline(n)? as u32 + off),
+            U32::Val(val) => Ok(val),
+        }
+    }
+}
+
+pub enum U32Coder {
+    Direct(U32),
+    Select(U32, U32, U32, U32),
+}
+
+#[derive(Default)]
+pub struct Empty {}
+
+pub trait UnconditionalCoder<Config>
+where
+    Self: Sized,
+{
+    type Nonserialized;
+    fn read_unconditional(
+        config: &Config,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Self, Error>;
+}
+
+impl UnconditionalCoder<()> for bool {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        _: &(),
+        br: &mut BitReader,
+        _: &Self::Nonserialized,
+    ) -> Result<bool, Error> {
+        Ok(br.read_noinline(1)? != 0)
+    }
+}
+
+impl UnconditionalCoder<()> for f32 {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        _: &(),
+        br: &mut BitReader,
+        _: &Self::Nonserialized,
+    ) -> Result<f32, Error> {
+        use crate::util::f16;
+        let ret = f16::from_bits(br.read_noinline(16)? as u16);
+        if !ret.is_finite() {
+            Err(Error::FloatNaNOrInf)
+        } else {
+            Ok(ret.to_f32())
+        }
+    }
+}
+
+impl UnconditionalCoder<U32Coder> for u32 {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        config: &U32Coder,
+        br: &mut BitReader,
+        _: &Self::Nonserialized,
+    ) -> Result<u32, Error> {
+        let u = match config {
+            U32Coder::Direct(u) => u,
+            U32Coder::Select(u0, u1, u2, u3) => {
+                let selector = br.read_noinline(2)?;
+                match selector {
+                    0 => u0,
+                    1 => u1,
+                    2 => u2,
+                    _ => u3,
+                }
+            }
+        };
+        u.read(br)
+    }
+}
+
+impl UnconditionalCoder<U32Coder> for i32 {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        config: &U32Coder,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<i32, Error> {
+        let u = u32::read_unconditional(config, br, nonserialized)?;
+        Ok(unpack_signed(u))
+    }
+}
+
+impl UnconditionalCoder<()> for u64 {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        _: &(),
+        br: &mut BitReader,
+        _: &Self::Nonserialized,
+    ) -> Result<u64, Error> {
+        match br.read_noinline(2)? {
+            0 => Ok(0),
+            1 => Ok(1 + br.read_noinline(4)?),
+            2 => Ok(17 + br.read_noinline(8)?),
+            _ => {
+                let mut result: u64 = br.read_noinline(12)?;
+                let mut shift = 12;
+                while br.read_noinline(1)? == 1 {
+                    if shift >= 60 {
+                        assert_eq!(shift, 60);
+                        return Ok(result | (br.read_noinline(4)? << shift));
+                    }
+                    result |= br.read_noinline(8)? << shift;
+                    shift += 8;
+                }
+                Ok(result)
+            }
+        }
+    }
+}
+
+impl UnconditionalCoder<()> for String {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        _: &(),
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<String, Error> {
+        let len = u32::read_unconditional(
+            &U32Coder::Select(
+                U32::Val(0),
+                U32::Bits(4),
+                U32::BitsOffset { n: 5, off: 16 },
+                U32::BitsOffset { n: 10, off: 48 },
+            ),
+            br,
+            nonserialized,
+        )?;
+        let mut ret = String::new();
+        ret.reserve(len as usize);
+        for _ in 0..len {
+            match br.read_noinline(8) {
+                Ok(c) => ret.push(c as u8 as char),
+                Err(Error::OutOfBounds(n)) => {
+                    // Use saturating arithmetic to prevent underflow on malformed input
+                    // ret.len()+1 cannot overflow since ret.len() <= isize::MAX
+                    let remaining = (len as usize)
+                        .saturating_add(n)
+                        .saturating_sub(ret.len() + 1);
+                    return Err(Error::OutOfBounds(remaining));
+                }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(ret)
+    }
+}
+
+impl UnconditionalCoder<()> for Permutation {
+    type Nonserialized = PermutationNonserialized;
+    fn read_unconditional(
+        _: &(),
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Permutation, Error> {
+        // TODO: This is quadratic when incrementally parsing byte by byte,
+        // we might want to find a better way of reading the permutation.
+        let ret = if nonserialized.permuted {
+            let size = nonserialized.num_entries;
+            let num_contexts = 8;
+            let histograms = Histograms::decode(num_contexts, br, /*allow_lz77=*/ true)?;
+            let mut reader = SymbolReader::new(&histograms, br, None)?;
+            Permutation::decode(
+                size,
+                0,
+                &histograms,
+                br,
+                &mut reader,
+                &crate::util::MemoryTracker::default(),
+            )
+        } else {
+            Ok(Permutation::default())
+        };
+        br.jump_to_byte_boundary()?;
+        ret
+    }
+}
+
+impl<T: UnconditionalCoder<Config>, Config, const N: usize> UnconditionalCoder<Config> for [T; N] {
+    type Nonserialized = T::Nonserialized;
+    fn read_unconditional(
+        config: &Config,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<[T; N], Error> {
+        use array_init::try_array_init;
+        try_array_init(|_| T::read_unconditional(config, br, nonserialized))
+    }
+}
+
+pub struct VectorCoder<T: Sized> {
+    pub size_coder: U32Coder,
+    pub value_coder: T,
+}
+
+impl<Config, T: UnconditionalCoder<Config>> UnconditionalCoder<VectorCoder<Config>> for Vec<T> {
+    type Nonserialized = T::Nonserialized;
+    fn read_unconditional(
+        config: &VectorCoder<Config>,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Vec<T>, Error> {
+        let len = u32::read_unconditional(&config.size_coder, br, &Empty {})?;
+        let mut ret: Vec<T> = Vec::new();
+        ret.reserve_exact(len as usize);
+        for _ in 0..len {
+            ret.push(T::read_unconditional(
+                &config.value_coder,
+                br,
+                nonserialized,
+            )?);
+        }
+        Ok(ret)
+    }
+}
+
+pub trait ConditionalCoder<Config>
+where
+    Self: Sized,
+{
+    type Nonserialized;
+    fn read_conditional(
+        config: &Config,
+        condition: bool,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Self, Error>;
+}
+
+impl<Config, T: UnconditionalCoder<Config>> ConditionalCoder<Config> for Option<T> {
+    type Nonserialized = T::Nonserialized;
+    fn read_conditional(
+        config: &Config,
+        condition: bool,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Option<T>, Error> {
+        if condition {
+            Ok(Some(T::read_unconditional(config, br, nonserialized)?))
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl ConditionalCoder<()> for String {
+    type Nonserialized = Empty;
+    fn read_conditional(
+        _: &(),
+        condition: bool,
+        br: &mut BitReader,
+        nonserialized: &Empty,
+    ) -> Result<String, Error> {
+        if condition {
+            String::read_unconditional(&(), br, nonserialized)
+        } else {
+            Ok(String::new())
+        }
+    }
+}
+
+impl<Config, T: UnconditionalCoder<Config>> ConditionalCoder<VectorCoder<Config>> for Vec<T> {
+    type Nonserialized = T::Nonserialized;
+    fn read_conditional(
+        config: &VectorCoder<Config>,
+        condition: bool,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Vec<T>, Error> {
+        if condition {
+            Vec::read_unconditional(config, br, nonserialized)
+        } else {
+            Ok(Vec::new())
+        }
+    }
+}
+
+pub trait DefaultedElementCoder<Config, T>
+where
+    Self: Sized,
+{
+    type Nonserialized;
+    fn read_defaulted_element(
+        config: &Config,
+        condition: bool,
+        default: T,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Self, Error>;
+}
+
+impl<Config, T> DefaultedElementCoder<VectorCoder<Config>, T> for Vec<T>
+where
+    T: UnconditionalCoder<Config> + Clone,
+{
+    type Nonserialized = T::Nonserialized;
+
+    fn read_defaulted_element(
+        config: &VectorCoder<Config>,
+        condition: bool,
+        default: T,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Self, Error> {
+        let len = u32::read_unconditional(&config.size_coder, br, &Empty {})?;
+        if condition {
+            let mut ret: Vec<T> = Vec::new();
+            ret.reserve_exact(len as usize);
+            for _ in 0..len {
+                ret.push(T::read_unconditional(
+                    &config.value_coder,
+                    br,
+                    nonserialized,
+                )?);
+            }
+            Ok(ret)
+        } else {
+            Ok(vec![default; len as usize])
+        }
+    }
+}
+
+pub trait DefaultedCoder<Config>
+where
+    Self: Sized,
+{
+    type Nonserialized;
+    fn read_defaulted(
+        config: &Config,
+        condition: bool,
+        default: Self,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<Self, Error>;
+}
+
+impl<Config, T: UnconditionalCoder<Config>> DefaultedCoder<Config> for T {
+    type Nonserialized = T::Nonserialized;
+    fn read_defaulted(
+        config: &Config,
+        condition: bool,
+        default: Self,
+        br: &mut BitReader,
+        nonserialized: &Self::Nonserialized,
+    ) -> Result<T, Error> {
+        if condition {
+            Ok(T::read_unconditional(config, br, nonserialized)?)
+        } else {
+            Ok(default)
+        }
+    }
+}
+
+// TODO(veluca93): this will likely need to be implemented differently if
+// there are extensions.
+#[derive(Debug, PartialEq, Default, Clone)]
+pub struct Extensions {}
+
+impl UnconditionalCoder<()> for Extensions {
+    type Nonserialized = Empty;
+    fn read_unconditional(
+        _: &(),
+        br: &mut BitReader,
+        _: &Self::Nonserialized,
+    ) -> Result<Extensions, Error> {
+        let selector = u64::read_unconditional(&(), br, &Empty {})?;
+        let mut total_size: u64 = 0;
+        for i in 0..64 {
+            if (selector & (1u64 << i)) != 0 {
+                let size = u64::read_unconditional(&(), br, &Empty {})?;
+                let sum = total_size.checked_add(size);
+                if let Some(s) = sum {
+                    total_size = s;
+                } else {
+                    return Err(Error::SizeOverflow);
+                }
+            }
+        }
+        let total_size = usize::try_from(total_size);
+        if let Ok(ts) = total_size {
+            br.skip_bits(ts)?;
+        } else {
+            return Err(Error::SizeOverflow);
+        }
+        Ok(Extensions {})
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/extra_channels.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/extra_channels.rs
new file mode 100644
index 00000000..dcd1e4f4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/extra_channels.rs
@@ -0,0 +1,106 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    bit_reader::BitReader,
+    error::Error,
+    headers::{bit_depth::BitDepth, encodings::*},
+};
+use jxl_macros::UnconditionalCoder;
+use num_derive::FromPrimitive;
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive, Eq)]
+pub enum ExtraChannel {
+    Alpha,
+    Depth,
+    SpotColor,
+    SelectionMask,
+    Black,
+    CFA,
+    Thermal,
+    Reserved0,
+    Reserved1,
+    Reserved2,
+    Reserved3,
+    Reserved4,
+    Reserved5,
+    Reserved6,
+    Reserved7,
+    Unknown,
+    Optional,
+}
+
+// TODO(veluca): figure out if these fields should be unused.
+#[allow(dead_code)]
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[validate]
+pub struct ExtraChannelInfo {
+    #[all_default]
+    all_default: bool,
+    #[default(ExtraChannel::Alpha)]
+    pub ec_type: ExtraChannel,
+    #[default(BitDepth::default(&field_nonserialized))]
+    bit_depth: BitDepth,
+    #[coder(u2S(0, 3, 4, Bits(3) + 1))]
+    #[default(0)]
+    dim_shift: u32,
+    name: String,
+    // TODO(veluca93): if using Option<bool>, this is None when all_default.
+    #[condition(ec_type == ExtraChannel::Alpha)]
+    #[default(false)]
+    alpha_associated: bool,
+    #[condition(ec_type == ExtraChannel::SpotColor)]
+    pub spot_color: Option<[f32; 4]>,
+    #[condition(ec_type == ExtraChannel::CFA)]
+    #[coder(u2S(1, Bits(2), Bits(4) + 3, Bits(8) + 19))]
+    cfa_channel: Option<u32>,
+}
+
+impl ExtraChannelInfo {
+    #[cfg(test)]
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        all_default: bool,
+        ec_type: ExtraChannel,
+        bit_depth: BitDepth,
+        dim_shift: u32,
+        name: String,
+        alpha_associated: bool,
+        spot_color: Option<[f32; 4]>,
+        cfa_channel: Option<u32>,
+    ) -> ExtraChannelInfo {
+        ExtraChannelInfo {
+            all_default,
+            ec_type,
+            bit_depth,
+            dim_shift,
+            name,
+            alpha_associated,
+            spot_color,
+            cfa_channel,
+        }
+    }
+    pub fn dim_shift(&self) -> u32 {
+        self.dim_shift
+    }
+    pub fn alpha_associated(&self) -> bool {
+        self.alpha_associated
+    }
+    pub fn bit_depth(&self) -> BitDepth {
+        self.bit_depth
+    }
+    /// Returns the name of this extra channel, or an empty string if unnamed.
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+    fn check(&self, _: &Empty) -> Result<(), Error> {
+        if self.dim_shift > 3 {
+            Err(Error::DimShiftTooLarge(self.dim_shift))
+        } else {
+            Ok(())
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/frame_header.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/frame_header.rs
new file mode 100644
index 00000000..4111ac56
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/frame_header.rs
@@ -0,0 +1,978 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::excessive_precision)]
+
+use crate::{
+    BLOCK_DIM, GROUP_DIM,
+    bit_reader::BitReader,
+    error::Error,
+    headers::{encodings::*, extra_channels::ExtraChannelInfo},
+    image::Rect,
+    util::FloorLog2,
+};
+
+use jxl_macros::UnconditionalCoder;
+use num_derive::FromPrimitive;
+use std::cmp::min;
+
+use super::Animation;
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum FrameType {
+    RegularFrame = 0,
+    LFFrame = 1,
+    ReferenceOnly = 2,
+    SkipProgressive = 3,
+}
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum Encoding {
+    VarDCT = 0,
+    Modular = 1,
+}
+
+struct Flags;
+
+impl Flags {
+    pub const ENABLE_NOISE: u64 = 1;
+    pub const ENABLE_PATCHES: u64 = 2;
+    pub const ENABLE_SPLINES: u64 = 0x10;
+    pub const USE_LF_FRAME: u64 = 0x20;
+    pub const SKIP_ADAPTIVE_LF_SMOOTHING: u64 = 0x80;
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq)]
+pub struct Passes {
+    #[coder(u2S(1, 2, 3, Bits(3) + 4))]
+    #[default(1)]
+    pub num_passes: u32,
+
+    #[coder(u2S(0, 1, 2, Bits(1) + 3))]
+    #[default(0)]
+    #[condition(num_passes != 1)]
+    num_ds: u32,
+
+    #[size_coder(explicit(num_passes - 1))]
+    #[coder(Bits(2))]
+    #[default_element(0)]
+    #[condition(num_passes != 1)]
+    pub shift: Vec<u32>,
+
+    #[size_coder(explicit(num_ds))]
+    #[coder(u2S(1, 2, 4, 8))]
+    #[default_element(1)]
+    #[condition(num_passes != 1)]
+    downsample: Vec<u32>,
+
+    #[size_coder(explicit(num_ds))]
+    #[coder(u2S(0, 1, 2, Bits(3)))]
+    #[default_element(0)]
+    #[condition(num_passes != 1)]
+    last_pass: Vec<u32>,
+}
+
+impl Passes {
+    pub fn downsampling_bracket(&self, pass: usize) -> (usize, usize) {
+        let mut max_shift = 2;
+        let mut min_shift = 3;
+        for i in 0..pass + 1 {
+            for j in 0..self.num_ds as usize {
+                if i == self.last_pass[j] as usize {
+                    min_shift = self.downsample[j].floor_log2();
+                }
+            }
+            if i + 1 == self.num_passes as usize {
+                min_shift = 0;
+            }
+            if i != pass {
+                max_shift = min_shift.saturating_sub(1);
+            }
+        }
+        (min_shift as usize, max_shift as usize)
+    }
+}
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum BlendingMode {
+    Replace = 0,
+    Add = 1,
+    Blend = 2,
+    AlphaWeightedAdd = 3,
+    Mul = 4,
+}
+
+#[derive(Default)]
+pub struct BlendingInfoNonserialized {
+    num_extra_channels: u32,
+    full_frame: bool,
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq, Clone)]
+#[nonserialized(BlendingInfoNonserialized)]
+pub struct BlendingInfo {
+    #[coder(u2S(0, 1, 2, Bits(2) + 3))]
+    #[default(BlendingMode::Replace)]
+    pub mode: BlendingMode,
+
+    /* Spec: "Let multi_extra be true if and only if and the number of extra channels is at least two."
+    libjxl condition is num_extra_channels > 0 */
+    #[coder(u2S(0, 1, 2, Bits(3) + 3))]
+    #[default(0)]
+    #[condition(nonserialized.num_extra_channels > 0 &&
+        (mode == BlendingMode::Blend || mode == BlendingMode::AlphaWeightedAdd))]
+    pub alpha_channel: u32,
+
+    #[default(false)]
+    #[condition(nonserialized.num_extra_channels > 0 &&
+        (mode == BlendingMode::Blend || mode == BlendingMode::AlphaWeightedAdd || mode == BlendingMode::Mul))]
+    pub clamp: bool,
+
+    #[coder(u2S(0, 1, 2, 3))]
+    #[default(0)]
+    // This condition is called `resets_canvas` in the spec
+    #[condition(!(nonserialized.full_frame && mode == BlendingMode::Replace))]
+    pub source: u32,
+}
+
+pub struct RestorationFilterNonserialized {
+    encoding: Encoding,
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq)]
+#[nonserialized(RestorationFilterNonserialized)]
+pub struct RestorationFilter {
+    #[all_default]
+    all_default: bool,
+
+    #[default(true)]
+    pub gab: bool,
+
+    #[default(false)]
+    #[condition(gab)]
+    gab_custom: bool,
+
+    #[default(0.115169525)]
+    #[condition(gab_custom)]
+    pub gab_x_weight1: f32,
+
+    #[default(0.061248592)]
+    #[condition(gab_custom)]
+    pub gab_x_weight2: f32,
+
+    #[default(0.115169525)]
+    #[condition(gab_custom)]
+    pub gab_y_weight1: f32,
+
+    #[default(0.061248592)]
+    #[condition(gab_custom)]
+    pub gab_y_weight2: f32,
+
+    #[default(0.115169525)]
+    #[condition(gab_custom)]
+    pub gab_b_weight1: f32,
+
+    #[default(0.061248592)]
+    #[condition(gab_custom)]
+    pub gab_b_weight2: f32,
+
+    #[coder(Bits(2))]
+    #[default(2)]
+    pub epf_iters: u32,
+
+    #[default(false)]
+    #[condition(epf_iters > 0 && nonserialized.encoding == Encoding::VarDCT)]
+    epf_sharp_custom: bool,
+
+    #[default([0.0, 1.0 / 7.0, 2.0 / 7.0, 3.0 / 7.0, 4.0 / 7.0, 5.0 / 7.0, 6.0 / 7.0, 1.0])]
+    #[condition(epf_sharp_custom)]
+    pub epf_sharp_lut: [f32; 8],
+
+    #[default(false)]
+    #[condition(epf_iters > 0)]
+    epf_weight_custom: bool,
+
+    #[default([40.0, 5.0, 3.5])]
+    #[condition(epf_weight_custom)]
+    pub epf_channel_scale: [f32; 3],
+
+    #[default(0.45)]
+    #[condition(epf_weight_custom)]
+    epf_pass1_zeroflush: f32,
+
+    #[default(0.6)]
+    #[condition(epf_weight_custom)]
+    epf_pass2_zeroflush: f32,
+
+    #[default(false)]
+    #[condition(epf_iters > 0)]
+    epf_sigma_custom: bool,
+
+    #[default(0.46)]
+    #[condition(epf_sigma_custom && nonserialized.encoding == Encoding::VarDCT)]
+    pub epf_quant_mul: f32,
+
+    #[default(0.9)]
+    #[condition(epf_sigma_custom)]
+    pub epf_pass0_sigma_scale: f32,
+
+    #[default(6.5)]
+    #[condition(epf_sigma_custom)]
+    pub epf_pass2_sigma_scale: f32,
+
+    #[default(2.0 / 3.0)]
+    #[condition(epf_sigma_custom)]
+    pub epf_border_sad_mul: f32,
+
+    #[default(1.0)]
+    #[condition(epf_iters > 0 && nonserialized.encoding == Encoding::Modular)]
+    pub epf_sigma_for_modular: f32,
+
+    #[default(Extensions::default())]
+    extensions: Extensions,
+}
+
+pub struct PermutationNonserialized {
+    pub num_entries: u32,
+    pub permuted: bool,
+}
+
+pub struct FrameHeaderNonserialized {
+    pub xyb_encoded: bool,
+    pub num_extra_channels: u32,
+    pub extra_channel_info: Vec<ExtraChannelInfo>,
+    pub have_animation: bool,
+    pub have_timecode: bool,
+    pub img_width: u32,
+    pub img_height: u32,
+}
+
+const H_SHIFT: [usize; 4] = [0, 1, 1, 0];
+const V_SHIFT: [usize; 4] = [0, 1, 0, 1];
+
+fn compute_jpeg_shift(jpeg_upsampling: &[u32], shift_table: &[usize]) -> u32 {
+    jpeg_upsampling
+        .iter()
+        .map(|&ch| shift_table[ch as usize])
+        .max()
+        .unwrap_or(0) as u32
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq)]
+#[nonserialized(FrameHeaderNonserialized)]
+#[aligned]
+#[validate]
+pub struct FrameHeader {
+    #[all_default]
+    all_default: bool,
+
+    #[coder(Bits(2))]
+    #[default(FrameType::RegularFrame)]
+    pub frame_type: FrameType,
+
+    #[coder(Bits(1))]
+    #[default(Encoding::VarDCT)]
+    pub encoding: Encoding,
+
+    #[default(0)]
+    flags: u64,
+
+    #[default(false)]
+    #[condition(!nonserialized.xyb_encoded)]
+    pub do_ycbcr: bool,
+
+    #[coder(Bits(2))]
+    #[default([0, 0, 0])]
+    #[condition(do_ycbcr && flags & Flags::USE_LF_FRAME == 0)]
+    jpeg_upsampling: [u32; 3],
+
+    #[coder(u2S(1, 2, 4, 8))]
+    #[default(1)]
+    #[condition(flags & Flags::USE_LF_FRAME == 0)]
+    pub upsampling: u32,
+
+    #[size_coder(explicit(nonserialized.num_extra_channels))]
+    #[coder(u2S(1, 2, 4, 8))]
+    #[default_element(1)]
+    #[condition(flags & Flags::USE_LF_FRAME == 0)]
+    pub ec_upsampling: Vec<u32>,
+
+    #[coder(Bits(2))]
+    #[default(1)]
+    #[condition(encoding == Encoding::Modular)]
+    group_size_shift: u32,
+
+    #[coder(Bits(3))]
+    #[default(3)]
+    #[condition(encoding == Encoding::VarDCT && nonserialized.xyb_encoded)]
+    pub x_qm_scale: u32,
+
+    #[coder(Bits(3))]
+    #[default(2)]
+    #[condition(encoding == Encoding::VarDCT && nonserialized.xyb_encoded)]
+    pub b_qm_scale: u32,
+
+    #[condition(frame_type != FrameType::ReferenceOnly)]
+    #[default(Passes::default(&field_nonserialized))]
+    pub passes: Passes,
+
+    #[coder(u2S(1, 2, 3, 4))]
+    #[default(0)]
+    #[condition(frame_type == FrameType::LFFrame)]
+    pub lf_level: u32,
+
+    #[default(false)]
+    #[condition(frame_type != FrameType::LFFrame)]
+    have_crop: bool,
+
+    #[coder(u2S(Bits(8), Bits(11) + 256, Bits(14) + 2304, Bits(30) + 18688))]
+    #[default(0)]
+    #[condition(have_crop && frame_type != FrameType::ReferenceOnly)]
+    pub x0: i32,
+
+    #[coder(u2S(Bits(8), Bits(11) + 256, Bits(14) + 2304, Bits(30) + 18688))]
+    #[default(0)]
+    #[condition(have_crop && frame_type != FrameType::ReferenceOnly)]
+    pub y0: i32,
+
+    #[coder(u2S(Bits(8), Bits(11) + 256, Bits(14) + 2304, Bits(30) + 18688))]
+    #[default(0)]
+    #[condition(have_crop)]
+    frame_width: u32,
+
+    #[coder(u2S(Bits(8), Bits(11) + 256, Bits(14) + 2304, Bits(30) + 18688))]
+    #[default(0)]
+    #[condition(have_crop)]
+    frame_height: u32,
+
+    // The following 2 fields are not actually serialized, but just used as variables to help with
+    // defining later conditions.
+    #[default(x0 <= 0 && y0 <= 0 && (frame_width as i64 + x0 as i64) >= nonserialized.img_width as i64 &&
+        (frame_height as i64 + y0 as i64) >= nonserialized.img_height as i64)]
+    #[condition(false)]
+    completely_covers: bool,
+
+    #[default(!have_crop || completely_covers)]
+    #[condition(false)]
+    full_frame: bool,
+
+    /* "normal_frame" denotes the condition !all_default
+    && (frame_type == kRegularFrame || frame_type == kSkipProgressive) */
+    #[default(BlendingInfo::default(&field_nonserialized))]
+    #[condition(frame_type == FrameType::RegularFrame || frame_type == FrameType::SkipProgressive)]
+    #[nonserialized(num_extra_channels : nonserialized.num_extra_channels, full_frame : full_frame)]
+    pub blending_info: BlendingInfo,
+
+    #[size_coder(explicit(nonserialized.num_extra_channels))]
+    #[condition(frame_type == FrameType::RegularFrame || frame_type == FrameType::SkipProgressive)]
+    #[default_element(BlendingInfo::default(&field_nonserialized))]
+    #[nonserialized(num_extra_channels : nonserialized.num_extra_channels, full_frame: full_frame)]
+    pub ec_blending_info: Vec<BlendingInfo>,
+
+    #[coder(u2S(0, 1, Bits(8), Bits(32)))]
+    #[default(0)]
+    #[condition((frame_type == FrameType::RegularFrame ||
+        frame_type == FrameType::SkipProgressive) && nonserialized.have_animation)]
+    pub duration: u32,
+
+    #[coder(Bits(32))]
+    #[default(0)]
+    #[condition((frame_type == FrameType::RegularFrame ||
+        frame_type == FrameType::SkipProgressive) && nonserialized.have_timecode)]
+    timecode: u32,
+
+    #[default(frame_type == FrameType::RegularFrame)]
+    #[condition(frame_type == FrameType::RegularFrame || frame_type == FrameType::SkipProgressive)]
+    pub is_last: bool,
+
+    #[coder(Bits(2))]
+    #[default(0)]
+    #[condition(frame_type != FrameType::LFFrame && !is_last)]
+    pub save_as_reference: u32,
+
+    // The following 2 fields are not actually serialized, but just used as variables to help with
+    // defining later conditions.
+    #[default(!is_last && frame_type != FrameType::LFFrame && (duration == 0 || save_as_reference != 0))]
+    #[condition(false)]
+    pub can_be_referenced: bool,
+
+    #[default(can_be_referenced && blending_info.mode == BlendingMode::Replace && full_frame &&
+              (frame_type == FrameType::RegularFrame || frame_type == FrameType::SkipProgressive))]
+    #[condition(false)]
+    save_before_ct_def_false: bool,
+
+    #[default(frame_type == FrameType::LFFrame)]
+    #[condition(frame_type == FrameType::ReferenceOnly || save_before_ct_def_false)]
+    pub save_before_ct: bool,
+
+    pub name: String,
+
+    #[default(RestorationFilter::default(&field_nonserialized))]
+    #[nonserialized(encoding : encoding)]
+    pub restoration_filter: RestorationFilter,
+
+    #[default(Extensions::default())]
+    extensions: Extensions,
+
+    // The following fields are not actually serialized, but just used as variables for
+    // implementing the methods below.
+    #[coder(Bits(0))]
+    #[default(if frame_width == 0 { nonserialized.img_width } else { frame_width })]
+    #[condition(false)]
+    pub width: u32,
+
+    #[coder(Bits(0))]
+    #[default(if frame_height == 0 { nonserialized.img_height } else { frame_height })]
+    #[condition(false)]
+    pub height: u32,
+
+    #[coder(Bits(0))]
+    #[default(compute_jpeg_shift(&jpeg_upsampling, &H_SHIFT))]
+    #[condition(false)]
+    pub maxhs: u32,
+
+    #[coder(Bits(0))]
+    #[default(compute_jpeg_shift(&jpeg_upsampling, &V_SHIFT))]
+    #[condition(false)]
+    pub maxvs: u32,
+
+    #[coder(Bits(0))]
+    #[default(nonserialized.num_extra_channels)]
+    #[condition(false)]
+    pub num_extra_channels: u32,
+}
+
+impl FrameHeader {
+    pub fn log_group_dim(&self) -> usize {
+        (GROUP_DIM.ilog2() - 1 + self.group_size_shift) as usize
+    }
+    pub fn group_dim(&self) -> usize {
+        1 << self.log_group_dim()
+    }
+    pub fn lf_group_dim(&self) -> usize {
+        self.group_dim() * BLOCK_DIM
+    }
+
+    pub fn num_groups(&self) -> usize {
+        self.size_groups().0 * self.size_groups().1
+    }
+
+    pub fn num_lf_groups(&self) -> usize {
+        self.size_lf_groups().0 * self.size_lf_groups().1
+    }
+
+    pub fn num_toc_entries(&self) -> usize {
+        let num_groups = self.num_groups();
+        let num_dc_groups = self.num_lf_groups();
+
+        if num_groups == 1 && self.passes.num_passes == 1 {
+            1
+        } else {
+            2 + num_dc_groups + num_groups * self.passes.num_passes as usize
+        }
+    }
+
+    pub fn duration(&self, animation: &Animation) -> f64 {
+        (self.duration as f64) * 1000.0 * (animation.tps_denominator as f64)
+            / (animation.tps_numerator as f64)
+    }
+
+    pub fn has_patches(&self) -> bool {
+        self.flags & Flags::ENABLE_PATCHES != 0
+    }
+
+    pub fn has_noise(&self) -> bool {
+        self.flags & Flags::ENABLE_NOISE != 0
+    }
+
+    pub fn has_splines(&self) -> bool {
+        self.flags & Flags::ENABLE_SPLINES != 0
+    }
+    pub fn has_lf_frame(&self) -> bool {
+        self.flags & Flags::USE_LF_FRAME != 0
+    }
+    pub fn should_do_adaptive_lf_smoothing(&self) -> bool {
+        self.flags & Flags::SKIP_ADAPTIVE_LF_SMOOTHING == 0
+            && !self.has_lf_frame()
+            && self.encoding == Encoding::VarDCT
+    }
+    pub fn raw_hshift(&self, c: usize) -> usize {
+        H_SHIFT[self.jpeg_upsampling[c] as usize]
+    }
+    pub fn hshift(&self, c: usize) -> usize {
+        (self.maxhs as usize) - self.raw_hshift(c)
+    }
+    pub fn raw_vshift(&self, c: usize) -> usize {
+        V_SHIFT[self.jpeg_upsampling[c] as usize]
+    }
+    pub fn vshift(&self, c: usize) -> usize {
+        (self.maxvs as usize) - self.raw_vshift(c)
+    }
+    pub fn is444(&self) -> bool {
+        self.hshift(0) == 0 && self.vshift(0) == 0 &&  // Cb
+        self.hshift(2) == 0 && self.vshift(2) == 0 &&  // Cr
+        self.hshift(1) == 0 && self.vshift(1) == 0 // Y
+    }
+    #[allow(dead_code)] // Chroma subsampling query
+    pub fn is420(&self) -> bool {
+        self.hshift(0) == 1 && self.vshift(0) == 1 &&  // Cb
+        self.hshift(2) == 1 && self.vshift(2) == 1 &&  // Cr
+        self.hshift(1) == 0 && self.vshift(1) == 0 // Y
+    }
+    #[allow(dead_code)] // Chroma subsampling query
+    pub fn is422(&self) -> bool {
+        self.hshift(0) == 1 && self.vshift(0) == 0 &&  // Cb
+        self.hshift(2) == 1 && self.vshift(2) == 0 &&  // Cr
+        self.hshift(1) == 0 && self.vshift(1) == 0 // Y
+    }
+    #[allow(dead_code)] // Chroma subsampling query
+    pub fn is440(&self) -> bool {
+        self.hshift(0) == 0 && self.vshift(0) == 1 &&  // Cb
+        self.hshift(2) == 0 && self.vshift(2) == 1 &&  // Cr
+        self.hshift(1) == 0 && self.vshift(1) == 0 // Y
+    }
+
+    pub fn is_visible(&self) -> bool {
+        (self.is_last || self.duration > 0)
+            && (self.frame_type == FrameType::RegularFrame
+                || self.frame_type == FrameType::SkipProgressive)
+    }
+
+    pub fn needs_blending(&self) -> bool {
+        if !(self.frame_type == FrameType::RegularFrame
+            || self.frame_type == FrameType::SkipProgressive)
+        {
+            return false;
+        }
+        let replace_all = self.blending_info.mode == BlendingMode::Replace
+            && self
+                .ec_blending_info
+                .iter()
+                .all(|x| x.mode == BlendingMode::Replace);
+        self.have_crop || !replace_all
+    }
+
+    /// The dimensions of this frame, as coded in the codestream, excluding padding pixels.
+    pub fn size(&self) -> (usize, usize) {
+        let (width, height) = self.size_upsampled();
+        (
+            width.div_ceil(self.upsampling as usize),
+            height.div_ceil(self.upsampling as usize),
+        )
+    }
+
+    /// The dimensions of this frame, as coded in the codestream, in 8x8 blocks.
+    pub fn size_blocks(&self) -> (usize, usize) {
+        (
+            self.size().0.div_ceil(BLOCK_DIM << self.maxhs) << self.maxhs,
+            self.size().1.div_ceil(BLOCK_DIM << self.maxvs) << self.maxvs,
+        )
+    }
+
+    /// The dimensions of this frame, as coded in the codestream but including padding pixels.
+    pub fn size_padded(&self) -> (usize, usize) {
+        if self.encoding == Encoding::Modular {
+            self.size()
+        } else {
+            (
+                self.size_blocks().0 * BLOCK_DIM,
+                self.size_blocks().1 * BLOCK_DIM,
+            )
+        }
+    }
+
+    /// The dimensions of this frame, after upsampling.
+    pub fn size_upsampled(&self) -> (usize, usize) {
+        (
+            self.width.div_ceil(1 << (3 * self.lf_level)) as usize,
+            self.height.div_ceil(1 << (3 * self.lf_level)) as usize,
+        )
+    }
+
+    #[allow(dead_code)] // Frame dimension query
+    pub fn size_padded_upsampled(&self) -> (usize, usize) {
+        let (xsize, ysize) = self.size_padded();
+        (
+            xsize * self.upsampling as usize,
+            ysize * self.upsampling as usize,
+        )
+    }
+
+    /// The dimensions of this frame, in groups.
+    pub fn size_groups(&self) -> (usize, usize) {
+        (
+            self.size().0.div_ceil(self.group_dim()),
+            self.size().1.div_ceil(self.group_dim()),
+        )
+    }
+
+    /// The dimensions of this frame, in LF groups.
+    pub fn size_lf_groups(&self) -> (usize, usize) {
+        (
+            self.size_blocks().0.div_ceil(self.group_dim()),
+            self.size_blocks().1.div_ceil(self.group_dim()),
+        )
+    }
+
+    pub fn block_group_rect(&self, group: usize) -> Rect {
+        let group_dims = self.size_groups();
+        let block_dims = self.size_blocks();
+        let group_dim_in_blocks = self.group_dim() >> 3;
+        let gx = group % group_dims.0;
+        let gy = group / group_dims.0;
+        let origin = (gx * group_dim_in_blocks, gy * group_dim_in_blocks);
+        let size = (
+            min(
+                block_dims.0.checked_sub(origin.0).unwrap(),
+                group_dim_in_blocks,
+            ),
+            min(
+                block_dims.1.checked_sub(origin.1).unwrap(),
+                group_dim_in_blocks,
+            ),
+        );
+        Rect { origin, size }
+    }
+
+    pub fn lf_group_rect(&self, group: usize) -> Rect {
+        let lf_dims = self.size_lf_groups();
+        let block_dims = self.size_blocks();
+        let gx = group % lf_dims.0;
+        let gy = group / lf_dims.0;
+        let origin = (gx * self.group_dim(), gy * self.group_dim());
+        let size = (
+            min(
+                block_dims.0.checked_sub(origin.0).unwrap(),
+                self.group_dim(),
+            ),
+            min(
+                block_dims.1.checked_sub(origin.1).unwrap(),
+                self.group_dim(),
+            ),
+        );
+        Rect { origin, size }
+    }
+
+    pub fn postprocess(&mut self, nonserialized: &FrameHeaderNonserialized) {
+        if self.upsampling > 1 {
+            for i in 0..nonserialized.extra_channel_info.len() {
+                let dim_shift = nonserialized.extra_channel_info[i].dim_shift();
+                self.ec_upsampling[i] <<= dim_shift;
+            }
+        }
+        if self.encoding != Encoding::VarDCT || !nonserialized.xyb_encoded {
+            self.x_qm_scale = 2;
+        }
+    }
+
+    fn check(&self, nonserialized: &FrameHeaderNonserialized) -> Result<(), Error> {
+        if self.upsampling > 1
+            && let Some((dim_shift, effective_upsampling)) = nonserialized
+                .extra_channel_info
+                .iter()
+                .zip(&self.ec_upsampling)
+                .find_map(|(info, ec_upsampling)| {
+                    let effective_upsampling = ec_upsampling << info.dim_shift();
+                    (effective_upsampling < self.upsampling || effective_upsampling > 8)
+                        .then_some((info.dim_shift(), effective_upsampling))
+                })
+        {
+            return Err(Error::InvalidEcUpsampling(
+                self.upsampling,
+                dim_shift,
+                effective_upsampling,
+            ));
+        }
+
+        if self.has_patches()
+            && self.upsampling != 1
+            && let Some(&ec_upsampling) = self
+                .ec_upsampling
+                .iter()
+                .find(|&&ec_upsampling| ec_upsampling != self.upsampling)
+        {
+            return Err(Error::PatchesUnsupportedMixedUpsampling(
+                self.upsampling,
+                ec_upsampling,
+            ));
+        }
+
+        let num_extra_channels = nonserialized.extra_channel_info.len();
+        let uses_alpha =
+            |mode| matches!(mode, BlendingMode::Blend | BlendingMode::AlphaWeightedAdd);
+
+        debug_assert_eq!(self.ec_blending_info.len(), num_extra_channels);
+
+        if num_extra_channels > 0
+            && uses_alpha(self.blending_info.mode)
+            && self.blending_info.alpha_channel as usize >= num_extra_channels
+        {
+            return Err(Error::InvalidBlendingAlphaChannel(
+                self.blending_info.alpha_channel as usize,
+                num_extra_channels,
+            ));
+        }
+
+        for info in &self.ec_blending_info {
+            if num_extra_channels > 0
+                && uses_alpha(info.mode)
+                && info.alpha_channel as usize >= num_extra_channels
+            {
+                return Err(Error::InvalidBlendingAlphaChannel(
+                    info.alpha_channel as usize,
+                    num_extra_channels,
+                ));
+            }
+        }
+
+        if self.has_lf_frame() && self.lf_level >= 4 {
+            return Err(Error::InvalidLfLevel(self.lf_level));
+        }
+
+        if self.passes.num_ds >= self.passes.num_passes {
+            return Err(Error::NumPassesTooLarge(
+                self.passes.num_ds,
+                self.passes.num_passes,
+            ));
+        }
+
+        for w in self.passes.downsample.windows(2) {
+            let [last_ds, ds] = w else { unreachable!() };
+            if ds >= last_ds {
+                return Err(Error::PassesDownsampleNonDecreasing);
+            }
+        }
+
+        for w in self.passes.last_pass.windows(2) {
+            let [last_lp, lp] = w else { unreachable!() };
+            if lp <= last_lp {
+                return Err(Error::PassesLastPassNonIncreasing);
+            }
+        }
+
+        for &lp in self.passes.last_pass.iter() {
+            if lp >= self.passes.num_passes {
+                return Err(Error::PassesLastPassTooLarge);
+            }
+        }
+
+        if !self.save_before_ct && !self.full_frame && self.frame_type == FrameType::ReferenceOnly {
+            return Err(Error::NonPatchReferenceWithCrop);
+        }
+        if !self.is444()
+            && ((self.flags & Flags::SKIP_ADAPTIVE_LF_SMOOTHING) == 0)
+            && self.encoding == Encoding::VarDCT
+        {
+            return Err(Error::Non444ChromaSubsampling);
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod test_frame_header {
+    use super::super::bit_depth::BitDepth;
+    use super::super::extra_channels::{ExtraChannel, ExtraChannelInfo};
+    use super::super::permutation::Permutation;
+    use super::super::toc::Toc;
+    use super::*;
+    use crate::util::test::read_headers_and_toc;
+    use test_log::test;
+
+    #[test]
+    fn test_basic() {
+        let (_, frame_header, toc) =
+            read_headers_and_toc(include_bytes!("../../resources/test/basic.jxl")).unwrap();
+        assert_eq!(frame_header.frame_type, FrameType::RegularFrame);
+        assert_eq!(frame_header.encoding, Encoding::VarDCT);
+        assert_eq!(frame_header.flags, 0);
+        assert_eq!(frame_header.upsampling, 1);
+        assert_eq!(frame_header.x_qm_scale, 2);
+        assert_eq!(frame_header.b_qm_scale, 2);
+        assert!(!frame_header.have_crop);
+        assert!(!frame_header.save_before_ct);
+        assert_eq!(frame_header.name, String::from(""));
+        assert_eq!(frame_header.restoration_filter.epf_iters, 1);
+        assert_eq!(
+            toc,
+            Toc {
+                permuted: false,
+                permutation: Permutation::default(),
+                entries: [53].to_vec(),
+            }
+        )
+    }
+
+    #[test]
+    fn test_extra_channel() {
+        let frame_header =
+            read_headers_and_toc(include_bytes!("../../resources/test/extra_channels.jxl"))
+                .unwrap()
+                .1;
+        assert_eq!(frame_header.frame_type, FrameType::RegularFrame);
+        assert_eq!(frame_header.encoding, Encoding::Modular);
+        assert_eq!(frame_header.flags, 0);
+        assert_eq!(frame_header.upsampling, 1);
+        assert_eq!(frame_header.ec_upsampling, vec![1]);
+        // libjxl x_qm_scale = 2, but condition is false (should be 3 according to the draft)
+        // Doesn't actually matter since this is modular mode and the value doesn't get used.
+        assert_eq!(frame_header.x_qm_scale, 3);
+        assert_eq!(frame_header.b_qm_scale, 2);
+        assert!(!frame_header.have_crop);
+        assert!(!frame_header.save_before_ct);
+        assert_eq!(frame_header.name, String::from(""));
+        assert_eq!(frame_header.restoration_filter.epf_iters, 0);
+        assert!(!frame_header.restoration_filter.gab);
+    }
+
+    #[test]
+    fn test_invalid_blending_alpha_channel() {
+        let (file_header, mut frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../resources/test/extra_channels.jxl"))
+                .unwrap();
+        let nonserialized = file_header.frame_header_nonserialized();
+        frame_header.blending_info.mode = BlendingMode::Blend;
+        frame_header.blending_info.alpha_channel = nonserialized.extra_channel_info.len() as u32;
+
+        let err = frame_header.check(&nonserialized).unwrap_err();
+        assert!(matches!(err, Error::InvalidBlendingAlphaChannel(_, _)));
+    }
+
+    /// Regression test for the EC-upsampling-after-dim_shift validation
+    /// landed in upstream jxl-rs `1e909aa` (PR #741, "Validate effective EC
+    /// upsampling after dim_shift"). The check itself is already in our
+    /// fork at `frame_header.rs` `check()`; this test exercises it so a
+    /// future refactor cannot silently regress the constraint.
+    #[test]
+    fn test_invalid_ec_upsampling_after_dim_shift() {
+        let (file_header, mut frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../resources/test/extra_channels.jxl"))
+                .unwrap();
+        let mut nonserialized = file_header.frame_header_nonserialized();
+
+        // Force a dim_shift of 3 on the first extra channel and pair it
+        // with upsampling=8, ec_upsampling=4. The effective upsampling is
+        // `4 << 3 = 32`, which exceeds the 8x maximum.
+        nonserialized.extra_channel_info[0] = ExtraChannelInfo::new(
+            false,
+            ExtraChannel::Alpha,
+            BitDepth::integer_samples(8),
+            3,
+            String::new(),
+            false,
+            None,
+            None,
+        );
+
+        frame_header.upsampling = 8;
+        frame_header.ec_upsampling[0] = 4;
+
+        let err = frame_header.check(&nonserialized).unwrap_err();
+        assert!(
+            matches!(err, Error::InvalidEcUpsampling(8, 3, 32)),
+            "expected InvalidEcUpsampling(8, 3, 32), got {err:?}",
+        );
+    }
+
+    /// Positive companion to `test_invalid_ec_upsampling_after_dim_shift`:
+    /// a valid combination where `ec_upsampling << dim_shift == upsampling`
+    /// must pass `check()`. Without this, a future "always reject" bug in
+    /// the validation would only be caught by the negative test.
+    #[test]
+    fn test_valid_ec_upsampling_after_dim_shift() {
+        let (file_header, mut frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../resources/test/extra_channels.jxl"))
+                .unwrap();
+        let mut nonserialized = file_header.frame_header_nonserialized();
+
+        // upsampling=4, ec_upsampling=2, dim_shift=1 → effective = 2<<1 = 4
+        // which equals the frame upsampling and is <= 8.
+        nonserialized.extra_channel_info[0] = ExtraChannelInfo::new(
+            false,
+            ExtraChannel::Alpha,
+            BitDepth::integer_samples(8),
+            1,
+            String::new(),
+            false,
+            None,
+            None,
+        );
+
+        frame_header.upsampling = 4;
+        frame_header.ec_upsampling[0] = 2;
+
+        // The check must accept this combination. Note: other validation
+        // failures may still occur (e.g. blending modes), so we only
+        // assert that the *EC upsampling* error variant is not produced.
+        match frame_header.check(&nonserialized) {
+            Ok(()) => {}
+            Err(Error::InvalidEcUpsampling(_, _, _)) => {
+                panic!("valid EC upsampling rejected by check()");
+            }
+            Err(_) => {
+                // Some other check tripped on the synthetic header. That's
+                // OK — the point of this test is the EC validation alone.
+            }
+        }
+    }
+
+    /// Sanity check that the real `extra_channels.jxl` file decodes its
+    /// frame header without tripping the EC upsampling validation. This
+    /// keeps the regression suite anchored against an actual file in case
+    /// the validation logic gets generalized in a way that breaks valid
+    /// inputs.
+    #[test]
+    fn test_extra_channels_file_passes_ec_upsampling_check() {
+        let (file_header, frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../resources/test/extra_channels.jxl"))
+                .unwrap();
+        let nonserialized = file_header.frame_header_nonserialized();
+        // The bundled file uses upsampling=1, ec_upsampling=[1] which
+        // trivially satisfies the constraint.
+        assert!(frame_header.check(&nonserialized).is_ok());
+    }
+
+    #[test]
+    fn test_has_permutation() {
+        let (_, frame_header, toc) =
+            read_headers_and_toc(include_bytes!("../../resources/test/has_permutation.jxl"))
+                .unwrap();
+        assert_eq!(frame_header.frame_type, FrameType::RegularFrame);
+        assert_eq!(frame_header.encoding, Encoding::VarDCT);
+        assert_eq!(frame_header.flags, 0);
+        assert_eq!(frame_header.upsampling, 1);
+        assert_eq!(frame_header.x_qm_scale, 3);
+        assert_eq!(frame_header.b_qm_scale, 2);
+        assert!(!frame_header.have_crop);
+        assert!(!frame_header.save_before_ct);
+        assert_eq!(frame_header.name, String::from(""));
+        assert_eq!(frame_header.restoration_filter.epf_iters, 1);
+        assert_eq!(
+            toc,
+            Toc {
+                permuted: true,
+                permutation: Permutation(std::borrow::Cow::Owned(vec![
+                    0u32, 1, 42, 48, 2, 3, 4, 5, 6, 7, 8, 9, 43, 10, 11, 12, 13, 14, 15, 16, 17,
+                    44, 18, 19, 20, 21, 22, 23, 24, 25, 45, 26, 27, 28, 29, 30, 31, 32, 33, 46, 34,
+                    35, 36, 37, 38, 39, 40, 41, 47,
+                ])),
+                entries: vec![
+                    155, 992, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 9, 9, 9, 9, 9, 9, 9,
+                    9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 5, 5, 5, 5, 5, 5, 5, 697, 5, 5, 5, 5, 5, 60,
+                ],
+            },
+        )
+    }
+
+    #[test]
+    fn test_frame_name() {
+        let (_, frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../resources/test/named_frame_test.jxl"))
+                .unwrap();
+        assert_eq!(frame_header.frame_type, FrameType::RegularFrame);
+        assert_eq!(frame_header.name, "TestFrameName");
+        assert_eq!(frame_header.name.len(), 13);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/image_metadata.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/image_metadata.rs
new file mode 100644
index 00000000..c216a2ba
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/image_metadata.rs
@@ -0,0 +1,247 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    bit_reader::BitReader,
+    error::Error,
+    headers::{bit_depth::*, color_encoding::*, encodings::*, extra_channels::*, size::*},
+    image::Rect,
+};
+use jxl_macros::UnconditionalCoder;
+use num_derive::FromPrimitive;
+
+#[derive(Debug, Default, Clone)]
+pub struct Signature;
+
+impl Signature {
+    #[allow(dead_code)]
+    pub fn new() -> Signature {
+        Signature {}
+    }
+}
+
+impl crate::headers::encodings::UnconditionalCoder<()> for Signature {
+    type Nonserialized = Empty;
+    fn read_unconditional(_: &(), br: &mut BitReader, _: &Empty) -> Result<Signature, Error> {
+        let sig1 = br.read(8)? as u8;
+        let sig2 = br.read(8)? as u8;
+        if (sig1, sig2) != (0xff, 0x0a) {
+            Err(Error::InvalidSignature)
+        } else {
+            Ok(Signature {})
+        }
+    }
+}
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum Orientation {
+    Identity = 1,
+    FlipHorizontal = 2,
+    Rotate180 = 3,
+    FlipVertical = 4,
+    Transpose = 5,
+    Rotate90Cw = 6,
+    AntiTranspose = 7,
+    Rotate90Ccw = 8,
+}
+
+impl Orientation {
+    pub fn is_transposing(&self) -> bool {
+        matches!(
+            self,
+            Orientation::Transpose
+                | Orientation::AntiTranspose
+                | Orientation::Rotate90Cw
+                | Orientation::Rotate90Ccw
+        )
+    }
+
+    pub fn map_size(&self, size: (usize, usize)) -> (usize, usize) {
+        if self.is_transposing() {
+            (size.1, size.0)
+        } else {
+            size
+        }
+    }
+
+    pub fn display_pixel(&self, (x, y): (usize, usize), size: (usize, usize)) -> (usize, usize) {
+        match self {
+            Orientation::Identity => (x, y),
+            Orientation::FlipHorizontal => (size.0 - 1 - x, y),
+            Orientation::Rotate180 => (size.0 - 1 - x, size.1 - 1 - y),
+            Orientation::FlipVertical => (x, size.1 - 1 - y),
+            Orientation::Transpose => (y, x),
+            Orientation::Rotate90Cw => (size.1 - 1 - y, x),
+            Orientation::AntiTranspose => (size.1 - 1 - y, size.0 - 1 - x),
+            Orientation::Rotate90Ccw => (y, size.0 - 1 - x),
+        }
+    }
+
+    /// Returns the per-pixel step in display coordinates when iterating along
+    /// the frame's x axis. Equivalent to
+    /// `display_pixel((1, y), size) - display_pixel((0, y), size)` but works
+    /// for any non-empty `size` (the latter form would underflow when
+    /// `size.0 == 1` and the orientation flips x).
+    pub fn display_row_step(&self) -> (isize, isize) {
+        match self {
+            Orientation::Identity | Orientation::FlipVertical => (1, 0),
+            Orientation::FlipHorizontal | Orientation::Rotate180 => (-1, 0),
+            Orientation::Transpose | Orientation::Rotate90Cw => (0, 1),
+            Orientation::AntiTranspose | Orientation::Rotate90Ccw => (0, -1),
+        }
+    }
+
+    pub fn display_rect(
+        &self,
+        Rect {
+            size: (sx, sy),
+            origin: (ox, oy),
+        }: Rect,
+        size: (usize, usize),
+    ) -> Rect {
+        match self {
+            Orientation::Identity => Rect {
+                origin: (ox, oy),
+                size: (sx, sy),
+            },
+            Orientation::FlipHorizontal => Rect {
+                origin: (size.0 - sx - ox, oy),
+                size: (sx, sy),
+            },
+            Orientation::Rotate180 => Rect {
+                origin: (size.0 - sx - ox, size.1 - sy - oy),
+                size: (sx, sy),
+            },
+            Orientation::FlipVertical => Rect {
+                origin: (ox, size.1 - sy - oy),
+                size: (sx, sy),
+            },
+            Orientation::Transpose => Rect {
+                origin: (oy, ox),
+                size: (sy, sx),
+            },
+            Orientation::Rotate90Cw => Rect {
+                origin: (size.1 - sy - oy, ox),
+                size: (sy, sx),
+            },
+            Orientation::AntiTranspose => Rect {
+                origin: (size.1 - sy - oy, size.0 - sx - ox),
+                size: (sy, sx),
+            },
+            Orientation::Rotate90Ccw => Rect {
+                origin: (oy, size.0 - sx - ox),
+                size: (sy, sx),
+            },
+        }
+    }
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+pub struct Animation {
+    #[coder(u2S(100, 1000, Bits(10) + 1, Bits(30) + 1))]
+    pub tps_numerator: u32,
+    #[coder(u2S(1, 1001, Bits(8) + 1, Bits(10) + 1))]
+    pub tps_denominator: u32,
+    #[coder(u2S(0, Bits(3), Bits(16), Bits(32)))]
+    pub num_loops: u32,
+    pub have_timecodes: bool,
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[validate]
+pub struct ToneMapping {
+    #[all_default]
+    #[allow(dead_code)] // Used by UnconditionalCoder derive macro for default detection
+    pub all_default: bool,
+    #[default(255.0)]
+    pub intensity_target: f32,
+    #[default(0.0)]
+    pub min_nits: f32,
+    #[default(false)]
+    pub relative_to_max_display: bool,
+    #[default(0.0)]
+    pub linear_below: f32,
+}
+
+impl ToneMapping {
+    #[cfg(test)]
+    pub fn empty() -> ToneMapping {
+        ToneMapping {
+            all_default: false,
+            intensity_target: 0f32,
+            min_nits: 0f32,
+            relative_to_max_display: false,
+            linear_below: 0f32,
+        }
+    }
+    pub fn check(&self, _: &Empty) -> Result<(), Error> {
+        if self.intensity_target <= 0.0 {
+            Err(Error::InvalidIntensityTarget(self.intensity_target))
+        } else if self.min_nits < 0.0 || self.min_nits > self.intensity_target {
+            Err(Error::InvalidMinNits(self.min_nits))
+        } else if self.linear_below < 0.0
+            || (self.relative_to_max_display && self.linear_below > 1.0)
+        {
+            Err(Error::InvalidLinearBelow(
+                self.relative_to_max_display,
+                self.linear_below,
+            ))
+        } else {
+            Ok(())
+        }
+    }
+}
+
+#[allow(dead_code)]
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[validate]
+pub struct ImageMetadata {
+    #[all_default]
+    all_default: bool,
+    #[default(false)]
+    extra_fields: bool,
+    #[condition(extra_fields)]
+    #[default(Orientation::Identity)]
+    #[coder(Bits(3) + 1)]
+    pub orientation: Orientation,
+    #[condition(extra_fields)]
+    #[default(false)]
+    have_intrinsic_size: bool, // TODO(veluca93): fold have_ fields in Option.
+    #[condition(have_intrinsic_size)]
+    pub intrinsic_size: Option<Size>,
+    #[condition(extra_fields)]
+    #[default(false)]
+    have_preview: bool,
+    #[condition(have_preview)]
+    pub preview: Option<Preview>,
+    #[condition(extra_fields)]
+    #[default(false)]
+    have_animation: bool,
+    #[condition(have_animation)]
+    pub animation: Option<Animation>,
+    #[default(BitDepth::default(&field_nonserialized))]
+    pub bit_depth: BitDepth,
+    #[default(true)]
+    pub modular_16bit_sufficient: bool,
+    #[size_coder(implicit(u2S(0, 1, Bits(4) + 2, Bits(12) + 1)))]
+    pub extra_channel_info: Vec<ExtraChannelInfo>,
+    #[default(true)]
+    pub xyb_encoded: bool,
+    #[default(ColorEncoding::default(&field_nonserialized))]
+    pub color_encoding: ColorEncoding,
+    #[condition(extra_fields)]
+    #[default(ToneMapping::default(&field_nonserialized))]
+    pub tone_mapping: ToneMapping,
+    extensions: Option<Extensions>,
+}
+
+impl ImageMetadata {
+    fn check(&self, _: &Empty) -> Result<(), Error> {
+        if self.extra_channel_info.len() > 256 {
+            return Err(Error::TooManyExtraChannels(self.extra_channel_info.len()));
+        }
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/mod.rs
new file mode 100644
index 00000000..f980cd75
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/mod.rs
@@ -0,0 +1,82 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub mod bit_depth;
+pub mod color_encoding;
+pub mod encodings;
+pub mod extra_channels;
+pub mod frame_header;
+pub mod image_metadata;
+pub mod modular;
+pub mod permutation;
+pub mod size;
+pub mod toc;
+pub mod transform_data;
+
+use crate::{bit_reader::BitReader, error::Error, headers::encodings::*};
+use frame_header::FrameHeaderNonserialized;
+use jxl_macros::UnconditionalCoder;
+
+pub use image_metadata::*;
+pub use size::Size;
+pub use transform_data::*;
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+pub struct FileHeader {
+    #[allow(dead_code)]
+    signature: Signature,
+    pub size: Size,
+    pub image_metadata: ImageMetadata,
+    #[nonserialized(xyb_encoded : image_metadata.xyb_encoded)]
+    pub transform_data: CustomTransformData,
+}
+
+pub trait JxlHeader
+where
+    Self: Sized,
+{
+    fn read(br: &mut BitReader) -> Result<Self, Error>;
+}
+
+impl<T> JxlHeader for T
+where
+    T: UnconditionalCoder<()>,
+    T::Nonserialized: Default,
+{
+    fn read(br: &mut BitReader) -> Result<Self, Error> {
+        Self::read_unconditional(&(), br, &T::Nonserialized::default())
+    }
+}
+
+impl FileHeader {
+    pub fn frame_header_nonserialized(&self) -> FrameHeaderNonserialized {
+        self.frame_header_nonserialized_with_size(self.size.xsize(), self.size.ysize())
+    }
+
+    pub fn preview_frame_header_nonserialized(&self) -> Option<FrameHeaderNonserialized> {
+        let preview = self.image_metadata.preview.as_ref()?;
+        Some(self.frame_header_nonserialized_with_size(preview.xsize(), preview.ysize()))
+    }
+
+    fn frame_header_nonserialized_with_size(
+        &self,
+        img_width: u32,
+        img_height: u32,
+    ) -> FrameHeaderNonserialized {
+        let have_timecode = match self.image_metadata.animation {
+            Some(ref animation) => animation.have_timecodes,
+            None => false,
+        };
+        FrameHeaderNonserialized {
+            xyb_encoded: self.image_metadata.xyb_encoded,
+            num_extra_channels: self.image_metadata.extra_channel_info.len() as u32,
+            extra_channel_info: self.image_metadata.extra_channel_info.clone(),
+            have_animation: self.image_metadata.animation.is_some(),
+            have_timecode,
+            img_width,
+            img_height,
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/modular.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/modular.rs
new file mode 100644
index 00000000..5ac27093
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/modular.rs
@@ -0,0 +1,166 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    bit_reader::BitReader,
+    error::{Error, Result},
+    frame::modular::Predictor,
+    headers::encodings::*,
+};
+use jxl_macros::UnconditionalCoder;
+use num_derive::FromPrimitive;
+
+use super::encodings;
+
+#[derive(UnconditionalCoder, Debug, PartialEq, Clone)]
+pub struct WeightedHeader {
+    #[all_default]
+    pub all_default: bool,
+
+    #[coder(Bits(5))]
+    #[default(16)]
+    pub p1c: u32,
+
+    #[coder(Bits(5))]
+    #[default(10)]
+    pub p2c: u32,
+
+    #[coder(Bits(5))]
+    #[default(7)]
+    pub p3ca: u32,
+
+    #[coder(Bits(5))]
+    #[default(7)]
+    pub p3cb: u32,
+
+    #[coder(Bits(5))]
+    #[default(7)]
+    pub p3cc: u32,
+
+    #[coder(Bits(5))]
+    #[default(0)]
+    pub p3cd: u32,
+
+    #[coder(Bits(5))]
+    #[default(0)]
+    pub p3ce: u32,
+
+    #[coder(Bits(4))]
+    #[default(0xd)]
+    pub w0: u32,
+
+    #[coder(Bits(4))]
+    #[default(0xc)]
+    pub w1: u32,
+
+    #[coder(Bits(4))]
+    #[default(0xc)]
+    pub w2: u32,
+
+    #[coder(Bits(4))]
+    #[default(0xc)]
+    pub w3: u32,
+}
+
+impl WeightedHeader {
+    pub fn w(&self, i: usize) -> Result<u32> {
+        match i {
+            0 => Ok(self.w0),
+            1 => Ok(self.w1),
+            2 => Ok(self.w2),
+            3 => Ok(self.w3),
+            _ => unreachable!(
+            "WeightedHeader::w called with an out-of-bounds index: {}.
+            This indicates a logical error in the calling code, which should ensure 'i' is within 0..=3.",
+            i),
+        }
+    }
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq, Clone, Copy)]
+pub struct SqueezeParams {
+    pub horizontal: bool,
+    pub in_place: bool,
+    #[coder(u2S(Bits(3), Bits(6) + 8, Bits(10) + 72, Bits(13) + 1096))]
+    pub begin_channel: u32,
+    #[coder(u2S(1, 2, 3, Bits(4) + 4))]
+    pub num_channels: u32,
+}
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive)]
+pub enum TransformId {
+    Rct = 0,
+    Palette = 1,
+    Squeeze = 2,
+    Invalid = 3,
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq)]
+#[validate]
+pub struct Transform {
+    #[coder(Bits(2))]
+    pub id: TransformId,
+
+    #[condition(id == TransformId::Rct || id == TransformId::Palette)]
+    #[coder(u2S(Bits(3), Bits(6) + 8, Bits(10) + 72, Bits(13) + 1096))]
+    #[default(0)]
+    pub begin_channel: u32,
+
+    #[condition(id == TransformId::Rct)]
+    #[coder(u2S(6, Bits(2), Bits(4) + 2, Bits(6) + 10))]
+    #[default(6)]
+    pub rct_type: u32,
+
+    #[condition(id == TransformId::Palette)]
+    #[coder(u2S(1, 3, 4, Bits(13) + 1))]
+    #[default(3)]
+    pub num_channels: u32,
+
+    #[condition(id == TransformId::Palette)]
+    #[coder(u2S(Bits(8), Bits(10) + 256, Bits(12) + 1280, Bits(16)+5376))]
+    #[default(256)]
+    pub num_colors: u32,
+
+    #[condition(id == TransformId::Palette)]
+    #[coder(u2S(0, Bits(8)+1, Bits(10) + 257, Bits(16)+1281))]
+    #[default(0)]
+    pub num_deltas: u32,
+
+    #[condition(id == TransformId::Palette)]
+    #[coder(Bits(4))]
+    #[default(0)]
+    pub predictor_id: u32,
+
+    #[condition(id == TransformId::Squeeze)]
+    #[size_coder(implicit(u2S(0, Bits(4) + 1, Bits(6) + 9, Bits(8) + 41)))]
+    #[default(Vec::new())]
+    pub squeezes: Vec<SqueezeParams>,
+}
+
+impl Transform {
+    fn check(&self, _: &encodings::Empty) -> Result<()> {
+        if self.id == TransformId::Invalid {
+            return Err(Error::InvalidTransformId);
+        }
+
+        if self.rct_type >= 42 {
+            return Err(Error::InvalidRCT(self.rct_type));
+        }
+
+        if self.predictor_id >= Predictor::NUM_PREDICTORS {
+            return Err(Error::InvalidPredictor(self.predictor_id));
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq)]
+pub struct GroupHeader {
+    pub use_global_tree: bool,
+    pub wp_header: WeightedHeader,
+    #[size_coder(implicit(u2S(0, 1, Bits(4) + 2, Bits(8) + 18)))]
+    pub transforms: Vec<Transform>,
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/permutation.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/permutation.rs
new file mode 100644
index 00000000..fb363d3f
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/permutation.rs
@@ -0,0 +1,358 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::borrow::Cow;
+
+use crate::bit_reader::BitReader;
+use crate::entropy_coding::decode::Histograms;
+use crate::entropy_coding::decode::SymbolReader;
+use crate::error::{Error, Result};
+use crate::util::{
+    CeilLog2, MemoryTracker, NewWithCapacity, tracing_wrappers::instrument, value_of_lowest_1_bit,
+};
+
+#[derive(Debug, PartialEq, Default, Clone)]
+pub struct Permutation(pub Cow<'static, [u32]>);
+
+impl std::ops::Deref for Permutation {
+    type Target = [u32];
+
+    fn deref(&self) -> &[u32] {
+        &self.0
+    }
+}
+
+impl Permutation {
+    /// Decode a permutation from entropy-coded stream.
+    pub fn decode(
+        size: u32,
+        skip: u32,
+        histograms: &Histograms,
+        br: &mut BitReader,
+        entropy_reader: &mut SymbolReader,
+        memory_tracker: &MemoryTracker,
+    ) -> Result<Self> {
+        let end = entropy_reader.read_unsigned(histograms, br, get_context(size));
+        Self::decode_inner(size, skip, end, memory_tracker, |ctx| -> Result<u32> {
+            let r = entropy_reader.read_unsigned(histograms, br, ctx);
+            br.check_for_error()?;
+            Ok(r)
+        })
+    }
+
+    fn decode_inner(
+        size: u32,
+        skip: u32,
+        end: u32,
+        memory_tracker: &MemoryTracker,
+        mut read: impl FnMut(usize) -> Result<u32>,
+    ) -> Result<Self> {
+        if end > size - skip {
+            return Err(Error::InvalidPermutationSize { size, skip, end });
+        }
+
+        // Check memory budget for permutation allocations (lehmer + permutation vectors)
+        memory_tracker.check_alloc((size as u64) * 4)?;
+        let mut lehmer = Vec::new_with_capacity(end as usize)?;
+
+        let mut prev_val = 0u32;
+        for idx in skip..(skip + end) {
+            let val = match read(get_context(prev_val)) {
+                Ok(val) => val,
+                Err(Error::OutOfBounds(_)) => {
+                    // Estimate 1.5 bits for each remaining code
+                    let bits = (((skip + end) - idx) as usize).saturating_mul(3) / 2;
+                    return Err(Error::OutOfBounds(bits));
+                }
+                Err(e) => return Err(e),
+            };
+            if val >= size - idx {
+                return Err(Error::InvalidPermutationLehmerCode {
+                    size,
+                    idx,
+                    lehmer: val,
+                });
+            }
+            lehmer.push(val);
+            prev_val = val;
+        }
+
+        // Initialize the full permutation vector with skipped elements intact
+        let mut permutation = Vec::new_with_capacity((size - skip) as usize)?;
+        permutation.extend(0..size);
+
+        // Decode the Lehmer code into the slice starting at `skip`
+        let permuted_slice = decode_lehmer_code(&lehmer, &permutation[skip as usize..])?;
+
+        // Replace the target slice in `permutation`
+        permutation[skip as usize..].copy_from_slice(&permuted_slice);
+
+        // Ensure the permutation has the correct size
+        assert_eq!(permutation.len(), size as usize);
+
+        Ok(Self(Cow::Owned(permutation)))
+    }
+
+    pub fn compose(&mut self, other: &Permutation) {
+        assert_eq!(self.0.len(), other.0.len());
+        let mut tmp: Vec<u32> = vec![0; self.0.len()];
+        for (i, val) in tmp.iter_mut().enumerate().take(self.0.len()) {
+            *val = self.0[other.0[i] as usize]
+        }
+        self.0.to_mut().copy_from_slice(&tmp[..]);
+    }
+}
+
+// Decodes the Lehmer code in `code` and returns the permuted slice.
+#[instrument(level = "debug", ret, err)]
+fn decode_lehmer_code(code: &[u32], permutation_slice: &[u32]) -> Result<Vec<u32>> {
+    let n = permutation_slice.len();
+    if n == 0 {
+        return Err(Error::InvalidPermutationLehmerCode {
+            size: 0,
+            idx: 0,
+            lehmer: 0,
+        });
+    }
+
+    let mut permuted = Vec::new_with_capacity(n)?;
+    permuted.extend_from_slice(permutation_slice);
+
+    let padded_n = (n as u32).next_power_of_two() as usize;
+
+    // Allocate temp array inside the function
+    let mut temp = Vec::new_with_capacity(padded_n)?;
+    temp.extend((0..padded_n as u32).map(|x| value_of_lowest_1_bit(x + 1)));
+
+    for (i, permuted_item) in permuted.iter_mut().enumerate() {
+        let code_i = *code.get(i).unwrap_or(&0);
+
+        // Adjust the maximum allowed value for code_i
+        if code_i as usize > n - i - 1 {
+            return Err(Error::InvalidPermutationLehmerCode {
+                size: n as u32,
+                idx: i as u32,
+                lehmer: code_i,
+            });
+        }
+
+        let mut rank = code_i + 1;
+
+        // Extract i-th unused element via implicit order-statistics tree.
+        let mut bit = padded_n;
+        let mut next = 0usize;
+        while bit != 0 {
+            let cand = next + bit;
+            if cand == 0 || cand > padded_n {
+                return Err(Error::InvalidPermutationLehmerCode {
+                    size: n as u32,
+                    idx: i as u32,
+                    lehmer: code_i,
+                });
+            }
+            bit >>= 1;
+            if temp[cand - 1] < rank {
+                next = cand;
+                rank -= temp[cand - 1];
+            }
+        }
+
+        *permuted_item = permutation_slice[next];
+
+        next += 1;
+        while next <= padded_n {
+            temp[next - 1] -= 1;
+            next += value_of_lowest_1_bit(next as u32) as usize;
+        }
+    }
+
+    Ok(permuted)
+}
+
+// Decodes the Lehmer code in `code` and returns the permuted vector.
+#[cfg(test)]
+fn decode_lehmer_code_naive(code: &[u32], permutation_slice: &[u32]) -> Result<Vec<u32>> {
+    let n = code.len();
+    if n == 0 {
+        return Err(Error::InvalidPermutationLehmerCode {
+            size: 0,
+            idx: 0,
+            lehmer: 0,
+        });
+    }
+
+    // Ensure permutation_slice has sufficient length
+    if permutation_slice.len() < n {
+        return Err(Error::InvalidPermutationLehmerCode {
+            size: n as u32,
+            idx: 0,
+            lehmer: 0,
+        });
+    }
+
+    // Create temp array with values from permutation_slice
+    let mut temp = permutation_slice.to_vec();
+    let mut permuted = Vec::new_with_capacity(n)?;
+
+    // Iterate over the Lehmer code
+    for (i, &idx) in code.iter().enumerate() {
+        if idx as usize >= temp.len() {
+            return Err(Error::InvalidPermutationLehmerCode {
+                size: n as u32,
+                idx: i as u32,
+                lehmer: idx,
+            });
+        }
+
+        // Assign temp[idx] to permuted vector
+        permuted.push(temp.remove(idx as usize));
+    }
+
+    // Append any remaining elements from temp to permuted
+    permuted.extend(temp);
+
+    Ok(permuted)
+}
+
+fn get_context(x: u32) -> usize {
+    (x + 1).ceil_log2().min(7) as usize
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use arbtest::arbitrary::{self, Arbitrary, Unstructured};
+    use core::assert_eq;
+    use test_log::test;
+
+    #[test]
+    fn generate_permutation_arbtest() {
+        arbtest::arbtest(|u| {
+            let input = PermutationInput::arbitrary(u)?;
+
+            let permutation_slice = input.permutation.as_slice();
+
+            let perm1 = decode_lehmer_code(&input.code, permutation_slice);
+            let perm2 = decode_lehmer_code_naive(&input.code, permutation_slice);
+
+            assert_eq!(
+                perm1.map_err(|x| x.to_string()),
+                perm2.map_err(|x| x.to_string())
+            );
+            Ok(())
+        });
+    }
+
+    #[derive(Debug)]
+    struct PermutationInput {
+        code: Vec<u32>,
+        permutation: Vec<u32>,
+    }
+
+    impl<'a> Arbitrary<'a> for PermutationInput {
+        fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self, arbitrary::Error> {
+            // Generate a reasonable size to prevent tests from taking too long
+            let size_lehmer = u.int_in_range(1..=1000)?;
+
+            let mut lehmer: Vec<u32> = Vec::with_capacity(size_lehmer as usize);
+            for i in 0..size_lehmer {
+                let max_val = size_lehmer - i - 1;
+                let val = if max_val > 0 {
+                    u.int_in_range(0..=max_val)?
+                } else {
+                    0
+                };
+                lehmer.push(val);
+            }
+
+            let mut permutation = Vec::new();
+            let size_permutation = u.int_in_range(size_lehmer..=1000)?;
+            permutation.extend(0..size_permutation);
+
+            let num_of_swaps = u.int_in_range(0..=100)?;
+            for _ in 0..num_of_swaps {
+                // Randomly swap two positions
+                let pos1 = u.int_in_range(0..=size_permutation - 1)?;
+                let pos2 = u.int_in_range(0..=size_permutation - 1)?;
+                permutation.swap(pos1 as usize, pos2 as usize);
+            }
+
+            Ok(PermutationInput {
+                code: lehmer,
+                permutation,
+            })
+        }
+    }
+
+    #[test]
+    fn simple() {
+        // Lehmer code: [1, 1, 2, 3, 3, 6, 0, 1]
+        let code = vec![1u32, 1, 2, 3, 3, 6, 0, 1];
+        let skip = 4;
+        let size = 16;
+
+        let permutation_slice: Vec<u32> = (skip..size).collect();
+
+        let permuted = decode_lehmer_code(&code, &permutation_slice).unwrap();
+        let permuted_naive = decode_lehmer_code_naive(&code, &permutation_slice).unwrap();
+
+        let mut permutation = Vec::with_capacity(size as usize);
+        permutation.extend(0..skip); // Add skipped elements
+        permutation.extend(permuted.iter());
+        let expected_permutation = vec![0, 1, 2, 3, 5, 6, 8, 10, 11, 15, 4, 9, 7, 12, 13, 14];
+
+        assert_eq!(permutation, expected_permutation);
+        assert_eq!(permuted, permuted_naive);
+    }
+
+    #[test]
+    fn decode_lehmer_compare_different_length() -> Result<(), Box<dyn std::error::Error>> {
+        // Lehmer code: [1, 1, 2, 3, 3, 6, 0, 1]
+        let code = vec![1u32, 1, 2, 3, 3, 6, 0, 1];
+        let skip = 4;
+        let size = 16;
+
+        let permutation_slice: Vec<u32> = (skip..size).collect();
+
+        let permuted_optimized = decode_lehmer_code(&code, &permutation_slice)?;
+        let permuted_naive = decode_lehmer_code_naive(&code, &permutation_slice)?;
+
+        let expected_permuted = vec![5u32, 6, 8, 10, 11, 15, 4, 9, 7, 12, 13, 14];
+
+        assert_eq!(permuted_optimized, expected_permuted);
+        assert_eq!(permuted_naive, expected_permuted);
+        assert_eq!(permuted_optimized, permuted_naive);
+
+        Ok(())
+    }
+
+    #[test]
+    fn decode_lehmer_compare_same_length() -> Result<(), Box<dyn std::error::Error>> {
+        // Lehmer code: [2, 3, 0, 0, 0]
+        let code = vec![2u32, 3, 0, 0, 0];
+        let n = code.len();
+        let permutation_slice: Vec<u32> = (0..n as u32).collect();
+
+        let permuted_optimized = decode_lehmer_code(&code, &permutation_slice)?;
+        let permuted_naive = decode_lehmer_code_naive(&code, &permutation_slice)?;
+
+        let expected_permutation = vec![2u32, 4, 0, 1, 3];
+
+        assert_eq!(permuted_optimized, expected_permutation);
+        assert_eq!(permuted_naive, expected_permutation);
+        assert_eq!(permuted_optimized, permuted_naive);
+
+        Ok(())
+    }
+
+    #[test]
+    fn lehmer_out_of_bounds() {
+        let code = vec![4];
+        let permutation_slice: Vec<u32> = (4..8).collect();
+
+        let result = decode_lehmer_code(&code, &permutation_slice);
+        assert!(result.is_err());
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/size.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/size.rs
new file mode 100644
index 00000000..b921d8e3
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/size.rs
@@ -0,0 +1,160 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    bit_reader::BitReader,
+    error::Error,
+    headers::encodings::{self, *},
+};
+use jxl_macros::UnconditionalCoder;
+use num_derive::FromPrimitive;
+
+#[derive(UnconditionalCoder, Copy, Clone, PartialEq, Debug, FromPrimitive, Default)]
+enum AspectRatio {
+    #[default]
+    Unknown = 0,
+    Ratio1Over1 = 1,
+    Ratio12Over10 = 2,
+    Ratio4Over3 = 3,
+    Ratio3Over2 = 4,
+    Ratio16Over9 = 5,
+    Ratio5Over4 = 6,
+    Ratio2Over1 = 7,
+}
+
+#[derive(UnconditionalCoder, Debug, Clone, Default)]
+#[validate]
+pub struct Size {
+    small: bool,
+    #[condition(small)]
+    #[coder(Bits(5) + 1)]
+    ysize_div8: Option<u32>,
+    #[condition(!small)]
+    #[coder(1 + u2S(Bits(9), Bits(13), Bits(18), Bits(30)))]
+    ysize: Option<u32>,
+    #[coder(Bits(3))]
+    ratio: AspectRatio,
+    #[condition(small && ratio == AspectRatio::Unknown)]
+    #[coder(Bits(5) + 1)]
+    xsize_div8: Option<u32>,
+    #[condition(!small && ratio == AspectRatio::Unknown)]
+    #[coder(1 + u2S(Bits(9), Bits(13), Bits(18), Bits(30)))]
+    xsize: Option<u32>,
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[validate]
+pub struct Preview {
+    div8: bool,
+    #[condition(div8)]
+    #[coder(u2S(16, 32, Bits(5) + 1, Bits(9) + 33))]
+    ysize_div8: Option<u32>,
+    #[condition(!div8)]
+    #[coder(1 + u2S(Bits(6), Bits(8) + 64, Bits(10) + 320, Bits(12) + 1344))]
+    ysize: Option<u32>,
+    #[coder(Bits(3))]
+    ratio: AspectRatio,
+    #[condition(div8 && ratio == AspectRatio::Unknown)]
+    #[coder(u2S(16, 32, Bits(5) + 1, Bits(9) + 33))]
+    xsize_div8: Option<u32>,
+    #[condition(!div8 && ratio == AspectRatio::Unknown)]
+    #[coder(1 + u2S(Bits(6), Bits(8) + 64, Bits(10) + 320, Bits(12) + 1344))]
+    xsize: Option<u32>,
+}
+
+fn map_aspect_ratio<T: Fn() -> u64>(ysize: u32, ratio: AspectRatio, fallback: T) -> u64 {
+    match ratio {
+        AspectRatio::Unknown => fallback(),
+        AspectRatio::Ratio1Over1 => ysize as u64,
+        AspectRatio::Ratio12Over10 => ysize as u64 * 12 / 10,
+        AspectRatio::Ratio4Over3 => ysize as u64 * 4 / 3,
+        AspectRatio::Ratio3Over2 => ysize as u64 * 3 / 2,
+        AspectRatio::Ratio16Over9 => ysize as u64 * 16 / 9,
+        AspectRatio::Ratio5Over4 => ysize as u64 * 5 / 4,
+        AspectRatio::Ratio2Over1 => ysize as u64 * 2,
+    }
+}
+
+impl Size {
+    /// Hardcoded upper bound on total pixel count, checked during header parsing
+    /// before any allocations. This catches crafted headers that claim absurd
+    /// dimensions. Callers can set a lower limit via `JxlDecoderLimits::max_pixels`.
+    ///
+    /// 2^30 pixels (~1 billion) is the JXL spec limit. At 4 bytes/channel and
+    /// 3+ channels, this allows images up to ~12 GB of pixel data per channel
+    /// plane, so the memory tracker / `max_memory_bytes` provides the real defense.
+    /// This limit prevents overflow in downstream size arithmetic.
+    const MAX_TOTAL_PIXELS: u64 = 1 << 30;
+
+    pub fn ysize(&self) -> u32 {
+        if self.small {
+            self.ysize_div8.unwrap() * 8
+        } else {
+            self.ysize.unwrap()
+        }
+    }
+
+    fn compute_xsize(&self) -> Result<u32, Error> {
+        let x = map_aspect_ratio(self.ysize(), self.ratio, /* fallback */ || {
+            if self.small {
+                self.xsize_div8.unwrap() as u64 * 8
+            } else {
+                self.xsize.unwrap() as u64
+            }
+        });
+        u32::try_from(x).map_err(|_| Error::ImageDimensionTooLarge(x))
+    }
+
+    fn check(&self, _: &encodings::Empty) -> Result<(), Error> {
+        let xsize = self.compute_xsize()?;
+        let ysize = self.ysize();
+        let total = xsize as u64 * ysize as u64;
+        if total > Self::MAX_TOTAL_PIXELS {
+            return Err(Error::ImageSizeTooLarge(xsize as usize, ysize as usize));
+        }
+        if xsize == 0 || ysize == 0 {
+            return Err(Error::InvalidImageSize(xsize as usize, ysize as usize));
+        }
+        Ok(())
+    }
+
+    pub fn xsize(&self) -> u32 {
+        // Validation happens during struct decoding via #[validate].
+        // If we reach here, compute_xsize() is guaranteed to succeed.
+        self.compute_xsize().unwrap()
+    }
+}
+
+impl Preview {
+    pub fn ysize(&self) -> u32 {
+        if self.div8 {
+            self.ysize_div8.unwrap() * 8
+        } else {
+            self.ysize.unwrap()
+        }
+    }
+
+    fn compute_xsize(&self) -> Result<u32, Error> {
+        let x = map_aspect_ratio(self.ysize(), self.ratio, /* fallback */ || {
+            if self.div8 {
+                self.xsize_div8.unwrap() as u64 * 8
+            } else {
+                self.xsize.unwrap() as u64
+            }
+        });
+        u32::try_from(x).map_err(|_| Error::ImageDimensionTooLarge(x))
+    }
+
+    fn check(&self, _: &encodings::Empty) -> Result<(), Error> {
+        self.compute_xsize()?;
+        Ok(())
+    }
+
+    pub fn xsize(&self) -> u32 {
+        // Validation happens during struct decoding via #[validate].
+        // If we reach here, compute_xsize() is guaranteed to succeed.
+        self.compute_xsize().unwrap()
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/toc.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/toc.rs
new file mode 100644
index 00000000..96af5c3d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/toc.rs
@@ -0,0 +1,173 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use jxl_macros::UnconditionalCoder;
+
+use crate::{
+    bit_reader::BitReader,
+    error::{Error, Result},
+    headers::{encodings::*, frame_header::PermutationNonserialized},
+};
+
+use super::permutation::Permutation;
+
+pub struct TocNonserialized {
+    pub num_entries: u32,
+}
+
+#[derive(UnconditionalCoder, Debug, PartialEq)]
+#[nonserialized(TocNonserialized)]
+pub struct Toc {
+    #[default(false)]
+    pub permuted: bool,
+
+    // Here we don't use `condition(permuted)`, because `jump_to_byte_boundary` needs to be executed in both cases
+    #[default(Permutation::default())]
+    #[nonserialized(num_entries: nonserialized.num_entries, permuted: permuted)]
+    pub permutation: Permutation,
+
+    #[coder(u2S(Bits(10), Bits(14) + 1024, Bits(22) + 17408, Bits(30) + 4211712))]
+    #[size_coder(explicit(nonserialized.num_entries))]
+    pub entries: Vec<u32>,
+}
+
+#[derive(Debug)]
+pub struct IncrementalTocReader {
+    num_entries: u32,
+    permuted: bool,
+    permutation: Option<Permutation>,
+    entries: Vec<u32>,
+}
+
+impl IncrementalTocReader {
+    pub fn new(num_entries: u32, br: &mut BitReader) -> Result<Self> {
+        let permuted = bool::read_unconditional(&(), br, &Empty {})?;
+        let mut entries = Vec::new();
+        entries.try_reserve(num_entries as usize)?;
+        Ok(Self {
+            num_entries,
+            permuted,
+            permutation: None,
+            entries,
+        })
+    }
+
+    #[allow(dead_code)] // Part of incremental TOC reader API
+    pub fn num_read_entries(&self) -> u32 {
+        self.entries.len() as u32
+    }
+
+    pub fn remaining_entries(&self) -> u32 {
+        self.num_entries - self.entries.len() as u32
+    }
+
+    pub fn is_complete(&self) -> bool {
+        self.permutation.is_some() && self.remaining_entries() == 0
+    }
+
+    pub fn read_step(&mut self, br: &mut BitReader) -> Result<()> {
+        if self.permutation.is_none() {
+            return self.read_permutation(br);
+        }
+
+        let entry_coder = U32Coder::Select(
+            U32::Bits(10),
+            U32::BitsOffset { n: 14, off: 1024 },
+            U32::BitsOffset { n: 22, off: 17408 },
+            U32::BitsOffset {
+                n: 30,
+                off: 4211712,
+            },
+        );
+        let entry = u32::read_unconditional(&entry_coder, br, &Empty {})?;
+        self.entries.push(entry);
+        Ok(())
+    }
+
+    fn read_permutation(&mut self, br: &mut BitReader) -> Result<()> {
+        let permutation = Permutation::read_unconditional(
+            &(),
+            br,
+            &PermutationNonserialized {
+                num_entries: self.num_entries,
+                permuted: self.permuted,
+            },
+        )?;
+        self.permutation = Some(permutation);
+        Ok(())
+    }
+
+    pub fn finalize(self) -> Toc {
+        assert!(self.is_complete());
+        let permutation = self.permutation.unwrap();
+        Toc {
+            permuted: self.permuted,
+            permutation,
+            entries: self.entries,
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::ops::ControlFlow;
+
+    use test_log::test;
+
+    use super::*;
+
+    #[test]
+    fn parse_arb() {
+        arbtest::arbtest(|u| {
+            // Not permuted
+            let mut bytes = vec![0u8];
+            let mut buf = 0u64;
+            let mut buf_bits = 0u32;
+            let mut num_entries = 0u32;
+
+            u.arbitrary_loop(Some(1), Some(256), |u| {
+                let selector = u.int_in_range(0..=3)?;
+                let bits = match selector {
+                    0 => 10,
+                    1 => 14,
+                    2 => 22,
+                    _ => 30,
+                };
+                let val = u.int_in_range(0u64..=((1 << bits) - 1))?;
+                let val = (val << 2) | selector as u64;
+
+                buf |= val << buf_bits;
+                buf_bits += bits + 2;
+                if buf_bits >= 32 {
+                    let bytes_to_add = (buf as u32).to_le_bytes();
+                    bytes.extend_from_slice(&bytes_to_add);
+                    buf >>= 32;
+                    buf_bits -= 32;
+                }
+
+                num_entries += 1;
+                Ok(ControlFlow::Continue(()))
+            })?;
+            if buf_bits > 0 {
+                let bytes_to_add = (buf as u32).to_le_bytes();
+                bytes.extend_from_slice(&bytes_to_add);
+            }
+
+            let mut br = BitReader::new(&bytes);
+            let expected =
+                Toc::read_unconditional(&(), &mut br, &TocNonserialized { num_entries }).unwrap();
+
+            let mut br = BitReader::new(&bytes);
+            let mut parser = IncrementalTocReader::new(num_entries, &mut br).unwrap();
+            while !parser.is_complete() {
+                parser.read_step(&mut br).unwrap();
+            }
+            let actual = parser.finalize();
+
+            assert_eq!(actual, expected);
+            Ok(())
+        });
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/transform_data.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/transform_data.rs
new file mode 100644
index 00000000..f22e649c
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/headers/transform_data.rs
@@ -0,0 +1,342 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::excessive_precision)]
+
+use crate::{bit_reader::BitReader, error::Error, headers::encodings::*};
+use jxl_macros::UnconditionalCoder;
+#[derive(Default)]
+pub struct CustomTransformDataNonserialized {
+    pub xyb_encoded: bool,
+}
+
+#[derive(UnconditionalCoder, Debug, Clone)]
+pub struct OpsinInverseMatrix {
+    // We never read the all_default field.
+    #[allow(dead_code)]
+    #[all_default]
+    all_default: bool,
+    #[default([11.031566901960783, -9.866943921568629, -0.16462299647058826,
+               -3.254147380392157,  4.418770392156863,  -0.16462299647058826,
+               -3.6588512862745097, 2.7129230470588235, 1.9459282392156863])]
+    pub inverse_matrix: [f32; 9],
+    #[default([-0.0037930732552754493; 3])]
+    pub opsin_biases: [f32; 3],
+    #[default([1.0 - 0.05465007330715401, 1.0 - 0.07005449891748593, 1.0 - 0.049935103337343655, 0.145])]
+    pub quant_biases: [f32; 4],
+}
+
+const DEFAULT_KERN_2: [f32; 15] = [
+    -0.01716200,
+    -0.03452303,
+    -0.04022174,
+    -0.02921014,
+    -0.00624645,
+    0.14111091,
+    0.28896755,
+    0.00278718,
+    -0.01610267,
+    0.56661550,
+    0.03777607,
+    -0.01986694,
+    -0.03144731,
+    -0.01185068,
+    -0.00213539,
+];
+
+const DEFAULT_KERN_4: [f32; 55] = [
+    -0.02419067,
+    -0.03491987,
+    -0.03693351,
+    -0.03094285,
+    -0.00529785,
+    -0.01663432,
+    -0.03556863,
+    -0.03888905,
+    -0.03516850,
+    -0.00989469,
+    0.23651958,
+    0.33392945,
+    -0.01073543,
+    -0.01313181,
+    -0.03556694,
+    0.13048175,
+    0.40103025,
+    0.03951150,
+    -0.02077584,
+    0.46914198,
+    -0.00209270,
+    -0.01484589,
+    -0.04064806,
+    0.18942530,
+    0.56279892,
+    0.06674400,
+    -0.02335494,
+    -0.03551682,
+    -0.00754830,
+    -0.02267919,
+    -0.02363578,
+    0.00315804,
+    -0.03399098,
+    -0.01359519,
+    -0.00091653,
+    -0.00335467,
+    -0.01163294,
+    -0.01610294,
+    -0.00974088,
+    -0.00191622,
+    -0.01095446,
+    -0.03198464,
+    -0.04455121,
+    -0.02799790,
+    -0.00645912,
+    0.06390599,
+    0.22963888,
+    0.00630981,
+    -0.01897349,
+    0.67537268,
+    0.08483369,
+    -0.02534994,
+    -0.02205197,
+    -0.01667999,
+    -0.00384443,
+];
+
+const DEFAULT_KERN_8: [f32; 210] = [
+    -0.02928613,
+    -0.03706353,
+    -0.03783812,
+    -0.03324558,
+    -0.00447632,
+    -0.02519406,
+    -0.03752601,
+    -0.03901508,
+    -0.03663285,
+    -0.00646649,
+    -0.02066407,
+    -0.03838633,
+    -0.04002101,
+    -0.03900035,
+    -0.00901973,
+    -0.01626393,
+    -0.03954148,
+    -0.04046620,
+    -0.03979621,
+    -0.01224485,
+    0.29895328,
+    0.35757708,
+    -0.02447552,
+    -0.01081748,
+    -0.04314594,
+    0.23903219,
+    0.41119301,
+    -0.00573046,
+    -0.01450239,
+    -0.04246845,
+    0.17567618,
+    0.45220643,
+    0.02287757,
+    -0.01936783,
+    -0.03583255,
+    0.11572472,
+    0.47416733,
+    0.06284440,
+    -0.02685066,
+    0.42720050,
+    -0.02248939,
+    -0.01155273,
+    -0.04562755,
+    0.28689496,
+    0.49093869,
+    -0.00007891,
+    -0.01545926,
+    -0.04562659,
+    0.21238920,
+    0.53980934,
+    0.03369474,
+    -0.02070211,
+    -0.03866988,
+    0.14229550,
+    0.56593398,
+    0.08045181,
+    -0.02888298,
+    -0.03680918,
+    -0.00542229,
+    -0.02920477,
+    -0.02788574,
+    -0.02118180,
+    -0.03942402,
+    -0.00775547,
+    -0.02433614,
+    -0.03193943,
+    -0.02030828,
+    -0.04044014,
+    -0.01074016,
+    -0.01930822,
+    -0.03620399,
+    -0.01974125,
+    -0.03919545,
+    -0.01456093,
+    -0.00045072,
+    -0.00360110,
+    -0.01020207,
+    -0.01231907,
+    -0.00638988,
+    -0.00071592,
+    -0.00279122,
+    -0.00957115,
+    -0.01288327,
+    -0.00730937,
+    -0.00107783,
+    -0.00210156,
+    -0.00890705,
+    -0.01317668,
+    -0.00813895,
+    -0.00153491,
+    -0.02128481,
+    -0.04173044,
+    -0.04831487,
+    -0.03293190,
+    -0.00525260,
+    -0.01720322,
+    -0.04052736,
+    -0.05045706,
+    -0.03607317,
+    -0.00738030,
+    -0.01341764,
+    -0.03965629,
+    -0.05151616,
+    -0.03814886,
+    -0.01005819,
+    0.18968273,
+    0.33063684,
+    -0.01300105,
+    -0.01372950,
+    -0.04017465,
+    0.13727832,
+    0.36402234,
+    0.01027890,
+    -0.01832107,
+    -0.03365072,
+    0.08734506,
+    0.38194295,
+    0.04338228,
+    -0.02525993,
+    0.56408126,
+    0.00458352,
+    -0.01648227,
+    -0.04887868,
+    0.24585519,
+    0.62026135,
+    0.04314807,
+    -0.02213737,
+    -0.04158014,
+    0.16637289,
+    0.65027023,
+    0.09621636,
+    -0.03101388,
+    -0.04082742,
+    -0.00904519,
+    -0.02790922,
+    -0.02117818,
+    0.00798662,
+    -0.03995711,
+    -0.01243427,
+    -0.02231705,
+    -0.02946266,
+    0.00992055,
+    -0.03600283,
+    -0.01684920,
+    -0.00111684,
+    -0.00411204,
+    -0.01297130,
+    -0.01723725,
+    -0.01022545,
+    -0.00165306,
+    -0.00313110,
+    -0.01218016,
+    -0.01763266,
+    -0.01125620,
+    -0.00231663,
+    -0.01374149,
+    -0.03797620,
+    -0.05142937,
+    -0.03117307,
+    -0.00581914,
+    -0.01064003,
+    -0.03608089,
+    -0.05272168,
+    -0.03375670,
+    -0.00795586,
+    0.09628104,
+    0.27129991,
+    -0.00353779,
+    -0.01734151,
+    -0.03153981,
+    0.05686230,
+    0.28500998,
+    0.02230594,
+    -0.02374955,
+    0.68214326,
+    0.05018048,
+    -0.02320852,
+    -0.04383616,
+    0.18459474,
+    0.71517975,
+    0.10805613,
+    -0.03263677,
+    -0.03637639,
+    -0.01394373,
+    -0.02511203,
+    -0.01728636,
+    0.05407331,
+    -0.02867568,
+    -0.01893131,
+    -0.00240854,
+    -0.00446511,
+    -0.01636187,
+    -0.02377053,
+    -0.01522848,
+    -0.00333334,
+    -0.00819975,
+    -0.02964169,
+    -0.04499287,
+    -0.02745350,
+    -0.00612408,
+    0.02727416,
+    0.19446600,
+    0.00159832,
+    -0.02232473,
+    0.74982506,
+    0.11452620,
+    -0.03348048,
+    -0.01605681,
+    -0.02070339,
+    -0.00458223,
+];
+
+// TODO(firsching): remove once we use this!
+#[allow(dead_code)]
+#[derive(UnconditionalCoder, Debug, Clone)]
+#[nonserialized(CustomTransformDataNonserialized)]
+pub struct CustomTransformData {
+    #[all_default]
+    all_default: bool,
+    #[condition(nonserialized.xyb_encoded)]
+    #[default(OpsinInverseMatrix::default(&field_nonserialized))]
+    pub opsin_inverse_matrix: OpsinInverseMatrix,
+    #[default(0)]
+    #[coder(Bits(3))]
+    custom_weight_mask: u32,
+    #[condition((custom_weight_mask & 1) != 0)]
+    #[default(DEFAULT_KERN_2)]
+    pub weights2: [f32; 15],
+    #[condition((custom_weight_mask & 2) != 0)]
+    #[default(DEFAULT_KERN_4)]
+    pub weights4: [f32; 55],
+    #[condition((custom_weight_mask & 4) != 0)]
+    #[default(DEFAULT_KERN_8)]
+    pub weights8: [f32; 210],
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/header.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/header.rs
new file mode 100644
index 00000000..996dc954
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/header.rs
@@ -0,0 +1,51 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{error::Result, util::NewWithCapacity};
+
+use super::{ICC_HEADER_SIZE, IccStream};
+
+fn predict_header(idx: usize, output_size: u32, header: &[u8]) -> u8 {
+    match idx {
+        0..=3 => output_size.to_be_bytes()[idx],
+        8 => 4,
+        12..=23 => b"mntrRGB XYZ "[idx - 12],
+        36..=39 => b"acsp"[idx - 36],
+        // APPL
+        41 | 42 if header[40] == b'A' => b'P',
+        43 if header[40] == b'A' => b'L',
+        // MSFT
+        41 if header[40] == b'M' => b'S',
+        42 if header[40] == b'M' => b'F',
+        43 if header[40] == b'M' => b'T',
+        // SGI_
+        42 if header[40] == b'S' && header[41] == b'G' => b'I',
+        43 if header[40] == b'S' && header[41] == b'G' => b' ',
+        // SUNW
+        42 if header[40] == b'S' && header[41] == b'U' => b'N',
+        43 if header[40] == b'S' && header[41] == b'U' => b'W',
+        70 => 246,
+        71 => 214,
+        73 => 1,
+        78 => 211,
+        79 => 45,
+        80..=83 => header[4 + idx - 80],
+        _ => 0,
+    }
+}
+
+pub(super) fn read_header(data_stream: &mut IccStream, output_size: u64) -> Result<Vec<u8>> {
+    let header_size = output_size.min(ICC_HEADER_SIZE);
+    let header_data = data_stream.read_to_vec_exact(header_size as usize)?;
+
+    let mut profile = Vec::new_with_capacity(output_size as usize)?;
+
+    for (idx, &e) in header_data.iter().enumerate() {
+        let p = predict_header(idx, output_size as u32, &header_data);
+        profile.push(p.wrapping_add(e));
+    }
+
+    Ok(profile)
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/mod.rs
new file mode 100644
index 00000000..193d1bad
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/mod.rs
@@ -0,0 +1,260 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::io::Cursor;
+
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+
+use crate::bit_reader::*;
+use crate::entropy_coding::decode::Histograms;
+use crate::entropy_coding::decode::SymbolReader;
+use crate::error::{Error, Result};
+use crate::headers::encodings::*;
+use crate::util::NewWithCapacity;
+use crate::util::tracing_wrappers::warn;
+
+mod header;
+mod stream;
+mod tag;
+
+use header::read_header;
+use stream::IccStream;
+pub(crate) use stream::read_varint_from_reader;
+use tag::{read_single_command, read_tag_list};
+
+const ICC_CONTEXTS: usize = 41;
+const ICC_HEADER_SIZE: u64 = 128;
+
+fn read_icc_inner(stream: &mut IccStream) -> Result<Vec<u8>, Error> {
+    let output_size = stream.read_varint()?;
+    let commands_size = stream.read_varint()?;
+    if stream.bytes_read().saturating_add(commands_size) > stream.len() {
+        return Err(Error::InvalidIccStream);
+    }
+
+    // Simple check to avoid allocating too large buffer.
+    if output_size > (1 << 28) {
+        return Err(Error::IccTooLarge);
+    }
+
+    if output_size + 65536 < stream.len() {
+        return Err(Error::IccTooLarge);
+    }
+
+    // Extract command stream first.
+    let commands = stream.read_to_vec_exact(commands_size as usize)?;
+    let mut commands_stream = Cursor::new(commands);
+    // `stream` contains data stream from here.
+    let data_stream = stream;
+
+    // Decode ICC profile header.
+    let mut decoded_profile = read_header(data_stream, output_size)?;
+    if output_size <= ICC_HEADER_SIZE {
+        return Ok(decoded_profile);
+    }
+
+    // Convert to slice writer to prevent buffer from growing.
+    // `read_header` above returns buffer with capacity of `output_size`, so this doesn't realloc.
+    debug_assert_eq!(decoded_profile.capacity(), output_size as usize);
+    decoded_profile.resize(output_size as usize, 0);
+    let mut decoded_profile_writer = Cursor::new(&mut *decoded_profile);
+    decoded_profile_writer.set_position(ICC_HEADER_SIZE);
+
+    // Decode tag list.
+    let v = read_varint_from_reader(&mut commands_stream)?;
+    if let Some(num_tags) = v.checked_sub(1) {
+        if (output_size - ICC_HEADER_SIZE) / 12 < num_tags {
+            warn!(output_size, num_tags, "num_tags too large");
+            return Err(Error::InvalidIccStream);
+        }
+
+        let num_tags = num_tags as u32;
+        decoded_profile_writer
+            .write_u32::<BigEndian>(num_tags)
+            .map_err(|_| Error::InvalidIccStream)?;
+
+        read_tag_list(
+            data_stream,
+            &mut commands_stream,
+            &mut decoded_profile_writer,
+            num_tags,
+            output_size,
+        )?;
+    }
+
+    // Decode tag data.
+    // Will not enter the loop if end of stream was reached while decoding tag list.
+    while let Ok(command) = commands_stream.read_u8() {
+        read_single_command(
+            data_stream,
+            &mut commands_stream,
+            &mut decoded_profile_writer,
+            command,
+        )?;
+    }
+
+    // Validate output size.
+    let actual_len = decoded_profile_writer.position();
+    if actual_len != output_size {
+        warn!(output_size, actual_len, "ICC profile size mismatch");
+        return Err(Error::InvalidIccStream);
+    }
+
+    Ok(decoded_profile)
+}
+
+/// Struct to incrementally decode an ICC profile.
+pub struct IncrementalIccReader {
+    histograms: Histograms,
+    reader: SymbolReader,
+    out_buf: Vec<u8>,
+    len: usize,
+    // [prev, prev_prev]
+    prev_bytes: [u8; 2],
+    /// Cumulative input bits consumed across all `read_one` calls.
+    /// Tracks progress to detect degenerate entropy streams.
+    total_bits_consumed: u64,
+    /// `br.total_bits_read()` at the end of the previous `read_one` call,
+    /// used to compute per-call delta (since BitReader is recreated per chunk
+    /// in incremental mode).
+    last_br_bits_read: usize,
+}
+
+impl IncrementalIccReader {
+    pub fn new(br: &mut BitReader, max_icc_size: Option<usize>) -> Result<Self> {
+        let len = u64::read_unconditional(&(), br, &Empty {})?;
+        // Use provided limit or fall back to default 256MB
+        let limit = max_icc_size.unwrap_or(1 << 28) as u64;
+        if len > limit {
+            return Err(Error::LimitExceeded {
+                resource: "icc_size",
+                actual: len,
+                limit,
+            });
+        }
+
+        let len = len as usize;
+
+        let histograms = Histograms::decode(ICC_CONTEXTS, br, true)?;
+        let reader = SymbolReader::new(&histograms, br, None)?;
+        let last_br_bits_read = br.total_bits_read();
+        Ok(Self {
+            histograms,
+            reader,
+            len,
+            out_buf: Vec::new_with_capacity(len)?,
+            prev_bytes: [0, 0],
+            total_bits_consumed: 0,
+            last_br_bits_read,
+        })
+    }
+
+    fn get_icc_ctx(&self) -> u32 {
+        if self.out_buf.len() <= ICC_HEADER_SIZE as usize {
+            return 0;
+        }
+
+        let [b1, b2] = self.prev_bytes;
+
+        let p1 = match b1 {
+            b'a'..=b'z' | b'A'..=b'Z' => 0,
+            b'0'..=b'9' | b'.' | b',' => 1,
+            0..=1 => 2 + b1 as u32,
+            2..=15 => 4,
+            241..=254 => 5,
+            255 => 6,
+            _ => 7,
+        };
+        let p2 = match b2 {
+            b'a'..=b'z' | b'A'..=b'Z' => 0,
+            b'0'..=b'9' | b'.' | b',' => 1,
+            0..=15 => 2,
+            241..=255 => 3,
+            _ => 4,
+        };
+
+        1 + p1 + 8 * p2
+    }
+
+    pub fn num_coded_bytes(&self) -> usize {
+        self.len
+    }
+
+    pub fn remaining(&self) -> usize {
+        assert!(self.num_coded_bytes() >= self.out_buf.len());
+        self.num_coded_bytes() - self.out_buf.len()
+    }
+
+    /// Maximum output bytes per input byte before we consider the stream
+    /// degenerate. ANS/Huffman coding cannot achieve this ratio legitimately;
+    /// a crafted codestream exploiting near-zero-entropy histograms can
+    /// produce unbounded output from minimal input.
+    const MAX_AMPLIFICATION: usize = 1024;
+
+    pub fn read_one(&mut self, br: &mut BitReader) -> Result<()> {
+        let ctx = self.get_icc_ctx() as usize;
+        let checkpoint = self.reader.checkpoint::<1>();
+        let sym = self.reader.read_unsigned(&self.histograms, br, ctx);
+
+        if let Err(err) = br.check_for_error() {
+            self.reader.restore(checkpoint);
+            return Err(err);
+        }
+        if sym >= 256 {
+            warn!(sym, "Invalid symbol in ICC stream");
+            return Err(Error::InvalidIccStream);
+        }
+
+        let b = sym as u8;
+        self.out_buf.push(b);
+        self.prev_bytes = [b, self.prev_bytes[0]];
+
+        // Track cumulative input bits consumed. In incremental mode the
+        // BitReader is recreated per chunk, so we track the delta from
+        // last_br_bits_read and accumulate it.
+        let current_br_bits = br.total_bits_read();
+        if current_br_bits >= self.last_br_bits_read {
+            self.total_bits_consumed += (current_br_bits - self.last_br_bits_read) as u64;
+        } else {
+            // BitReader was recreated (new chunk) — current_br_bits is from
+            // the start of the new chunk. All bits in this chunk so far are new.
+            self.total_bits_consumed += current_br_bits as u64;
+        }
+        self.last_br_bits_read = current_br_bits;
+
+        // Amplification check: verify input bits are being consumed
+        // proportionally to output bytes produced. A degenerate histogram
+        // can produce unlimited output from zero input bits, hanging the
+        // decoder indefinitely. Check every 256 bytes to amortize cost.
+        if self.out_buf.len() & 0xFF == 0 {
+            let input_bytes = (self.total_bits_consumed / 8 + 1) as usize;
+            if self.out_buf.len() / input_bytes > Self::MAX_AMPLIFICATION {
+                return Err(Error::LimitExceeded {
+                    resource: "icc_amplification",
+                    actual: self.out_buf.len() as u64,
+                    limit: (input_bytes * Self::MAX_AMPLIFICATION) as u64,
+                });
+            }
+        }
+        Ok(())
+    }
+
+    #[allow(dead_code)] // Batch ICC read variant (vs incremental read_one)
+    pub fn read_all(&mut self, br: &mut BitReader) -> Result<()> {
+        for _ in self.out_buf.len()..self.num_coded_bytes() {
+            self.read_one(br)?;
+        }
+        Ok(())
+    }
+
+    pub fn finalize(self, br: &mut BitReader) -> Result<Vec<u8>> {
+        assert_eq!(self.num_coded_bytes(), self.out_buf.len());
+        self.reader.check_final_state(&self.histograms, br)?;
+        let mut stream = IccStream::new(self.out_buf);
+        let profile = read_icc_inner(&mut stream)?;
+        stream.finalize()?;
+        Ok(profile)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/stream.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/stream.rs
new file mode 100644
index 00000000..0de64e94
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/stream.rs
@@ -0,0 +1,118 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::io::{Read, Write};
+
+use byteorder::{ReadBytesExt, WriteBytesExt};
+
+use crate::error::{Error, Result};
+use crate::util::NewWithCapacity;
+use crate::util::tracing_wrappers::{instrument, warn};
+
+fn read_varint(mut read_one: impl FnMut() -> Result<u8>) -> Result<u64> {
+    let mut value = 0u64;
+    let mut shift = 0;
+    while shift < 63 {
+        let b = read_one()?;
+        value |= ((b & 0x7f) as u64) << shift;
+        if b & 0x80 == 0 {
+            break;
+        }
+        shift += 7;
+    }
+    Ok(value)
+}
+
+pub(crate) fn read_varint_from_reader(stream: &mut impl Read) -> Result<u64> {
+    read_varint(|| stream.read_u8().map_err(|_| Error::IccEndOfStream))
+}
+
+pub(super) struct IccStream {
+    command_stream: Vec<u8>,
+    bytes_read: u64,
+}
+
+impl IccStream {
+    pub(super) fn new(command_stream: Vec<u8>) -> Self {
+        Self {
+            command_stream,
+            bytes_read: 0,
+        }
+    }
+
+    pub fn len(&self) -> u64 {
+        self.command_stream.len() as u64
+    }
+
+    pub fn bytes_read(&self) -> u64 {
+        self.bytes_read
+    }
+
+    pub fn remaining_bytes(&self) -> u64 {
+        self.len() - self.bytes_read
+    }
+
+    fn read_one(&mut self) -> Result<u8> {
+        if self.remaining_bytes() == 0 {
+            return Err(Error::IccEndOfStream);
+        }
+        self.bytes_read += 1;
+        Ok(self.command_stream[self.bytes_read as usize - 1])
+    }
+
+    pub fn read_exact(&mut self, buf: &mut [u8]) -> Result<()> {
+        if buf.len() > self.remaining_bytes() as usize {
+            return Err(Error::IccEndOfStream);
+        }
+
+        for b in buf {
+            *b = self.read_one()?;
+        }
+
+        Ok(())
+    }
+
+    pub fn read_to_vec_exact(&mut self, len: usize) -> Result<Vec<u8>> {
+        if len > self.remaining_bytes() as usize {
+            return Err(Error::IccEndOfStream);
+        }
+
+        let mut out = Vec::new_with_capacity(len)?;
+
+        for _ in 0..len {
+            out.push(self.read_one()?);
+        }
+
+        Ok(out)
+    }
+
+    pub fn read_varint(&mut self) -> Result<u64> {
+        read_varint(|| self.read_one())
+    }
+
+    pub fn copy_bytes(&mut self, writer: &mut impl Write, len: usize) -> Result<()> {
+        if len > self.remaining_bytes() as usize {
+            return Err(Error::IccEndOfStream);
+        }
+
+        for _ in 0..len {
+            let b = self.read_one()?;
+            writer.write_u8(b).map_err(|_| Error::InvalidIccStream)?;
+        }
+
+        Ok(())
+    }
+
+    #[instrument(skip_all, err)]
+    pub fn finalize(self) -> Result<()> {
+        // Check if all bytes are read
+        if self.bytes_read == self.command_stream.len() as u64 {
+            Ok(())
+        } else {
+            warn!("ICC stream is not fully consumed");
+            Err(Error::InvalidIccStream)
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/tag.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/tag.rs
new file mode 100644
index 00000000..d6333033
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/icc/tag.rs
@@ -0,0 +1,251 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::io::{Cursor, Write};
+
+use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
+
+use crate::error::{Error, Result};
+use crate::util::NewWithCapacity;
+use crate::util::tracing_wrappers::warn;
+
+use super::{ICC_HEADER_SIZE, IccStream, read_varint_from_reader};
+
+const COMMON_TAGS: [&[u8; 4]; 19] = [
+    b"rTRC", b"rXYZ", b"cprt", b"wtpt", b"bkpt", b"rXYZ", b"gXYZ", b"bXYZ", b"kXYZ", b"rTRC",
+    b"gTRC", b"bTRC", b"kTRC", b"chad", b"desc", b"chrm", b"dmnd", b"dmdd", b"lumi",
+];
+
+const COMMON_DATA: [&[u8; 4]; 8] = [
+    b"XYZ ", b"desc", b"text", b"mluc", b"para", b"curv", b"sf32", b"gbd ",
+];
+
+pub(super) fn read_tag_list(
+    data_stream: &mut IccStream,
+    commands_stream: &mut Cursor<Vec<u8>>,
+    decoded_profile: &mut Cursor<&mut [u8]>,
+    num_tags: u32,
+    output_size: u64,
+) -> Result<()> {
+    let mut prev_tagstart = num_tags * 12 + ICC_HEADER_SIZE as u32;
+    let mut prev_tagsize = 0u32;
+
+    loop {
+        let Ok(command) = commands_stream.read_u8() else {
+            // End of commands stream
+            return Ok(());
+        };
+
+        let tagcode = command & 63;
+        let tag = match tagcode {
+            0 => break,
+            1 => {
+                let mut tag = [0u8; 4];
+                data_stream.read_exact(&mut tag)?;
+                tag
+            }
+            2..=20 => *COMMON_TAGS[(tagcode - 2) as usize],
+            _ => return Err(Error::InvalidIccStream),
+        };
+
+        let tagstart = if command & 64 == 0 {
+            prev_tagstart
+                .checked_add(prev_tagsize)
+                .ok_or(Error::InvalidIccStream)?
+        } else {
+            read_varint_from_reader(commands_stream)? as u32
+        };
+        let tagsize = match &tag {
+            _ if command & 128 != 0 => read_varint_from_reader(commands_stream)? as u32,
+            b"rXYZ" | b"gXYZ" | b"bXYZ" | b"kXYZ" | b"wtpt" | b"bkpt" | b"lumi" => 20,
+            _ => prev_tagsize,
+        };
+        if (tagstart as u64 + tagsize as u64) > output_size {
+            warn!(output_size, tagstart, tagsize, "tag size overflow");
+            return Err(Error::InvalidIccStream);
+        }
+
+        prev_tagstart = tagstart;
+        prev_tagsize = tagsize;
+
+        let tagstart_plus_size = tagstart
+            .checked_add(tagsize)
+            .ok_or(Error::InvalidIccStream)?;
+        let tagstart_plus_size_x2 = tagstart
+            .checked_add(tagsize.checked_mul(2).ok_or(Error::InvalidIccStream)?)
+            .ok_or(Error::InvalidIccStream)?;
+
+        let write_result = (|| -> std::io::Result<()> {
+            decoded_profile.write_all(&tag)?;
+            decoded_profile.write_u32::<BigEndian>(tagstart)?;
+            decoded_profile.write_u32::<BigEndian>(tagsize)?;
+            if tagcode == 2 {
+                decoded_profile.write_all(b"gTRC")?;
+                decoded_profile.write_u32::<BigEndian>(tagstart)?;
+                decoded_profile.write_u32::<BigEndian>(tagsize)?;
+                decoded_profile.write_all(b"bTRC")?;
+                decoded_profile.write_u32::<BigEndian>(tagstart)?;
+                decoded_profile.write_u32::<BigEndian>(tagsize)?;
+            } else if tagcode == 3 {
+                decoded_profile.write_all(b"gXYZ")?;
+                decoded_profile.write_u32::<BigEndian>(tagstart_plus_size)?;
+                decoded_profile.write_u32::<BigEndian>(tagsize)?;
+                decoded_profile.write_all(b"bXYZ")?;
+                decoded_profile.write_u32::<BigEndian>(tagstart_plus_size_x2)?;
+                decoded_profile.write_u32::<BigEndian>(tagsize)?;
+            }
+            Ok(())
+        })();
+        write_result.map_err(|_| Error::InvalidIccStream)?;
+    }
+
+    Ok(())
+}
+
+fn shuffle_w2(bytes: &[u8]) -> Result<Vec<u8>> {
+    let len = bytes.len();
+    let mut out = Vec::new_with_capacity(len)?;
+
+    let height = len / 2;
+    let odd = len % 2;
+    for idx in 0..height {
+        out.push(bytes[idx]);
+        out.push(bytes[idx + height + odd]);
+    }
+    if odd != 0 {
+        out.push(bytes[height]);
+    }
+    Ok(out)
+}
+
+fn shuffle_w4(bytes: &[u8]) -> Result<Vec<u8>> {
+    let len = bytes.len();
+    let mut out = Vec::new_with_capacity(len)?;
+
+    let step = len / 4;
+    let wide_count = len % 4;
+    for idx in 0..step {
+        let mut base = idx;
+        for _ in 0..wide_count {
+            out.push(bytes[base]);
+            base += step + 1;
+        }
+        for _ in wide_count..4 {
+            out.push(bytes[base]);
+            base += step;
+        }
+    }
+    for idx in 1..=wide_count {
+        out.push(bytes[(step + 1) * idx - 1]);
+    }
+    Ok(out)
+}
+
+pub(super) fn read_single_command(
+    data_stream: &mut IccStream,
+    commands_stream: &mut Cursor<Vec<u8>>,
+    decoded_profile: &mut Cursor<&mut [u8]>,
+    command: u8,
+) -> Result<()> {
+    use std::num::Wrapping;
+
+    match command {
+        1 => {
+            let num = read_varint_from_reader(commands_stream)? as usize;
+            data_stream.copy_bytes(decoded_profile, num)?;
+        }
+        2 | 3 => {
+            let num = read_varint_from_reader(commands_stream)? as usize;
+            let bytes = data_stream.read_to_vec_exact(num)?;
+            let bytes = if command == 2 {
+                shuffle_w2(&bytes)?
+            } else {
+                shuffle_w4(&bytes)?
+            };
+            decoded_profile
+                .write_all(&bytes)
+                .map_err(|_| Error::InvalidIccStream)?;
+        }
+        4 => {
+            let flags = commands_stream
+                .read_u8()
+                .map_err(|_| Error::InvalidIccStream)?;
+            let width = ((flags & 3) + 1) as usize;
+            let order = (flags >> 2) & 3;
+            if width == 3 || order == 3 {
+                return Err(Error::InvalidIccStream);
+            }
+
+            let stride = if (flags & 16) == 0 {
+                width
+            } else {
+                let stride = read_varint_from_reader(commands_stream)? as usize;
+                if stride < width {
+                    return Err(Error::InvalidIccStream);
+                }
+                stride
+            };
+            if stride.saturating_mul(4) >= decoded_profile.position() as usize {
+                return Err(Error::InvalidIccStream);
+            }
+
+            let num = read_varint_from_reader(commands_stream)? as usize;
+            let bytes = data_stream.read_to_vec_exact(num)?;
+            let bytes = match width {
+                1 => bytes,
+                2 => shuffle_w2(&bytes)?,
+                4 => shuffle_w4(&bytes)?,
+                _ => unreachable!(),
+            };
+
+            for i in (0..num).step_by(width) {
+                let base_position = decoded_profile.position() as usize;
+                let buffer_slice = decoded_profile.get_ref();
+
+                let mut prev = [Wrapping(0u32); 3];
+                for (j, p) in prev[..=order as usize].iter_mut().enumerate() {
+                    let offset = base_position - (stride * (j + 1));
+                    let mut p_bytes = [0u8; 4];
+                    p_bytes[(4 - width)..].copy_from_slice(&buffer_slice[offset..offset + width]);
+                    p.0 = u32::from_be_bytes(p_bytes);
+                }
+
+                let p = match order {
+                    0 => prev[0],
+                    1 => Wrapping(2) * prev[0] - prev[1],
+                    2 => Wrapping(3) * (prev[0] - prev[1]) + prev[2],
+                    _ => unreachable!(),
+                };
+
+                decoded_profile.set_position(base_position as u64);
+                for j in 0..width.min(num - i) {
+                    let val = Wrapping(bytes[i + j] as u32) + (p >> (8 * (width - 1 - j)));
+                    decoded_profile
+                        .write_u8(val.0 as u8)
+                        .map_err(|_| Error::InvalidIccStream)?;
+                }
+            }
+        }
+        10 => {
+            let mut bytes = [0u8; 20];
+            bytes[..4].copy_from_slice(b"XYZ ");
+            data_stream.read_exact(&mut bytes[8..])?;
+            decoded_profile
+                .write_all(&bytes)
+                .map_err(|_| Error::InvalidIccStream)?;
+        }
+        16..=23 => {
+            decoded_profile
+                .write_all(COMMON_DATA[command as usize - 16])
+                .and_then(|_| decoded_profile.write_all(&[0u8; 4]))
+                .map_err(|_| Error::InvalidIccStream)?;
+        }
+        _ => {
+            return Err(Error::InvalidIccStream);
+        }
+    }
+
+    Ok(())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/data_type.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/data_type.rs
new file mode 100644
index 00000000..8402abaa
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/data_type.rs
@@ -0,0 +1,138 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+mod private {
+    pub trait Sealed {}
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum DataTypeTag {
+    U8,
+    U16,
+    U32,
+    F32,
+    I8,
+    I16,
+    I32,
+    F16,
+    F64,
+}
+
+impl DataTypeTag {
+    // Note that the const block below asserts that the implementation of this method is correct
+    // (as in, matches the size of the types that the tag corresponds to).
+    pub const fn size(&self) -> usize {
+        match self {
+            DataTypeTag::U8 | DataTypeTag::I8 => 1,
+            DataTypeTag::U16 | DataTypeTag::F16 | DataTypeTag::I16 => 2,
+            DataTypeTag::U32 | DataTypeTag::F32 | DataTypeTag::I32 => 4,
+            DataTypeTag::F64 => 8,
+        }
+    }
+}
+
+const _: () = {
+    assert!(std::mem::size_of::<i8>() == DataTypeTag::I8.size());
+    assert!(std::mem::size_of::<u8>() == DataTypeTag::U8.size());
+    assert!(std::mem::size_of::<i16>() == DataTypeTag::I16.size());
+    assert!(std::mem::size_of::<u16>() == DataTypeTag::U16.size());
+    assert!(std::mem::size_of::<crate::util::f16>() == DataTypeTag::F16.size());
+    assert!(std::mem::size_of::<i32>() == DataTypeTag::I32.size());
+    assert!(std::mem::size_of::<u32>() == DataTypeTag::U32.size());
+    assert!(std::mem::size_of::<f32>() == DataTypeTag::F32.size());
+    assert!(std::mem::size_of::<f64>() == DataTypeTag::F64.size());
+};
+
+/// Image data type trait. Implementors must be "bag-of-bits" types with no padding,
+/// guaranteed by the `bytemuck::Pod` bound.
+pub trait ImageDataType:
+    private::Sealed + bytemuck::Pod + Copy + Default + 'static + Debug + PartialEq + Send + Sync
+{
+    /// ID of this data type. Different types *must* have different values.
+    const DATA_TYPE_ID: DataTypeTag;
+
+    fn from_f64(f: f64) -> Self;
+    fn to_f64(self) -> f64;
+    #[cfg(test)]
+    fn random<R: rand::Rng>(rng: &mut R) -> Self;
+}
+
+#[cfg(test)]
+macro_rules! type_min {
+    (f32) => {
+        0.0f32
+    };
+    (f64) => {
+        0.0f64
+    };
+    ($ty: ty) => {
+        <$ty>::MIN
+    };
+}
+
+#[cfg(test)]
+macro_rules! type_max {
+    (f32) => {
+        1.0f32
+    };
+    (f64) => {
+        1.0f64
+    };
+    ($ty: ty) => {
+        <$ty>::MAX
+    };
+}
+
+macro_rules! impl_image_data_type {
+    ($ty: ident, $id: ident) => {
+        impl private::Sealed for $ty {}
+        impl ImageDataType for $ty {
+            const DATA_TYPE_ID: DataTypeTag = DataTypeTag::$id;
+            fn from_f64(f: f64) -> $ty {
+                f as $ty
+            }
+            fn to_f64(self) -> f64 {
+                self as f64
+            }
+            #[cfg(test)]
+            fn random<R: rand::Rng>(rng: &mut R) -> Self {
+                use rand::distr::{Distribution, Uniform};
+                let min = type_min!($ty);
+                let max = type_max!($ty);
+                Uniform::new_inclusive(min, max).unwrap().sample(rng)
+            }
+        }
+    };
+}
+
+impl_image_data_type!(u8, U8);
+impl_image_data_type!(u16, U16);
+impl_image_data_type!(u32, U32);
+impl_image_data_type!(f32, F32);
+impl_image_data_type!(i8, I8);
+impl_image_data_type!(i16, I16);
+impl_image_data_type!(i32, I32);
+
+// Meant to be used by the simple render pipeline and in general for
+// testing purposes.
+impl_image_data_type!(f64, F64);
+
+impl private::Sealed for crate::util::f16 {}
+impl ImageDataType for crate::util::f16 {
+    const DATA_TYPE_ID: DataTypeTag = DataTypeTag::F16;
+    fn from_f64(f: f64) -> crate::util::f16 {
+        crate::util::f16::from_f64(f)
+    }
+    fn to_f64(self) -> f64 {
+        crate::util::f16::to_f64(self)
+    }
+    #[cfg(test)]
+    fn random<R: rand::Rng>(rng: &mut R) -> Self {
+        use rand::distr::{Distribution, Uniform};
+        Self::from_f64(Uniform::new(0.0f32, 1.0f32).unwrap().sample(rng) as f64)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/internal.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/internal.rs
new file mode 100644
index 00000000..42364eb2
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/internal.rs
@@ -0,0 +1,340 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use crate::{
+    error::{Error, Result},
+    util::{CACHE_LINE_BYTE_SIZE, tracing_wrappers::*},
+};
+
+/// Allocates zeroed memory, returning an error instead of aborting on OOM.
+///
+/// Always uses `try_reserve` to ensure proper error handling for all allocation
+/// sizes. The `vec!` macro calls the global allocator which aborts on failure,
+/// so we avoid it for any size that could plausibly fail. After `try_reserve`
+/// succeeds, `resize` is guaranteed not to re-allocate.
+fn alloc_zeroed_fallible(
+    total_len: usize,
+    bytes_per_row: usize,
+    num_rows: usize,
+) -> Result<Vec<u8>> {
+    let mut storage = Vec::new();
+    storage
+        .try_reserve(total_len)
+        .map_err(|_| Error::ImageOutOfMemory(bytes_per_row, num_rows))?;
+    storage.resize(total_len, 0);
+    Ok(storage)
+}
+
+/// Safe image buffer backed by `Vec<u8>` with cache-line alignment via offset.
+///
+/// For owned buffers, `storage` holds the allocation and `offset` points to the first
+/// cache-line-aligned byte.
+///
+/// Invariants:
+///  - If `num_rows > 0`, then `bytes_per_row > 0` and `bytes_per_row <= bytes_between_rows`.
+///  - All accessible byte ranges `[offset + i*bytes_between_rows .. offset + i*bytes_between_rows + bytes_per_row]`
+///    for i in 0..num_rows are within `storage.len()`.
+///  - The computation `bytes_between_rows * (num_rows-1) + bytes_per_row` does not overflow
+///    and has a result that is at most `isize::MAX`, or `num_rows` is 0.
+#[derive(Debug, Clone)]
+pub(super) struct RawImageBuffer {
+    storage: Vec<u8>,
+    offset: usize,
+    bytes_per_row: usize,
+    num_rows: usize,
+    bytes_between_rows: usize,
+}
+
+impl RawImageBuffer {
+    pub(super) fn check_vals(num_rows: usize, bytes_per_row: usize, bytes_between_rows: usize) {
+        if num_rows > 0 {
+            assert!(bytes_per_row > 0);
+            assert!(bytes_between_rows >= bytes_per_row);
+            assert!(
+                bytes_between_rows
+                    .checked_mul(num_rows - 1)
+                    .unwrap()
+                    .checked_add(bytes_per_row)
+                    .unwrap()
+                    <= isize::MAX as usize
+            );
+        }
+    }
+
+    /// Checks that the data pointer, bytes_per_row, and bytes_between_rows are all multiples of `align`.
+    #[inline(always)]
+    pub(super) fn is_aligned(&self, align: usize) -> bool {
+        if self.num_rows == 0 {
+            return true;
+        }
+        self.bytes_per_row.is_multiple_of(align)
+            && self.bytes_between_rows.is_multiple_of(align)
+            && self.data_ptr_addr().is_multiple_of(align)
+    }
+
+    /// Returns the address of the first data byte (for alignment checking).
+    #[inline(always)]
+    fn data_ptr_addr(&self) -> usize {
+        if self.storage.is_empty() {
+            0
+        } else {
+            (self.storage.as_ptr() as usize) + self.offset
+        }
+    }
+
+    /// Returns the minimum size that the accessible data spans, or 0 if empty.
+    pub(super) fn minimum_allocation_size(&self) -> usize {
+        if self.num_rows == 0 {
+            0
+        } else {
+            (self.num_rows - 1) * self.bytes_between_rows + self.bytes_per_row
+        }
+    }
+
+    #[inline]
+    pub(super) fn byte_size(&self) -> (usize, usize) {
+        (self.bytes_per_row, self.num_rows)
+    }
+
+    /// Returns (bytes_per_row, num_rows, bytes_between_rows).
+    #[inline]
+    pub(super) fn dimensions(&self) -> (usize, usize, usize) {
+        (self.bytes_per_row, self.num_rows, self.bytes_between_rows)
+    }
+
+    /// Returns the accessible data as an immutable slice, starting at the first row.
+    #[inline]
+    pub(super) fn data_slice(&self) -> &[u8] {
+        let size = self.minimum_allocation_size();
+        if size == 0 {
+            &[]
+        } else {
+            &self.storage[self.offset..self.offset + size]
+        }
+    }
+
+    /// Returns the accessible data as a mutable slice, starting at the first row.
+    #[inline]
+    pub(super) fn data_slice_mut(&mut self) -> &mut [u8] {
+        let size = self.minimum_allocation_size();
+        if size == 0 {
+            &mut []
+        } else {
+            let start = self.offset;
+            &mut self.storage[start..start + size]
+        }
+    }
+
+    #[inline(always)]
+    pub(super) fn row(&self, row: usize) -> &[u8] {
+        assert!(row < self.num_rows);
+        let start = self.offset + row * self.bytes_between_rows;
+        &self.storage[start..start + self.bytes_per_row]
+    }
+
+    #[inline(always)]
+    pub(super) fn row_mut(&mut self, row: usize) -> &mut [u8] {
+        assert!(row < self.num_rows);
+        let start = self.offset + row * self.bytes_between_rows;
+        &mut self.storage[start..start + self.bytes_per_row]
+    }
+
+    /// Returns mutable slices for distinct rows. Panics if any rows are equal.
+    /// Note: this is quadratic in the number of rows.
+    #[inline(always)]
+    pub(super) fn distinct_rows_mut<I: DistinctRowsIndexes>(&mut self, rows: I) -> I::Output<'_> {
+        rows.get_rows_mut(self)
+    }
+
+    /// Returns zeroed memory. The returned buffer is aligned to
+    /// CACHE_LINE_BYTE_SIZE bytes via offset.
+    pub(super) fn try_allocate(byte_size: (usize, usize), uninit: bool) -> Result<RawImageBuffer> {
+        let (bytes_per_row, num_rows) = byte_size;
+        if bytes_per_row == 0 || num_rows == 0 {
+            return Ok(RawImageBuffer {
+                storage: Vec::new(),
+                offset: 0,
+                bytes_per_row: 0,
+                num_rows: 0,
+                bytes_between_rows: 0,
+            });
+        }
+        if bytes_per_row as u64 >= i64::MAX as u64 / 4 || num_rows as u64 >= i64::MAX as u64 / 4 {
+            return Err(Error::ImageSizeTooLarge(bytes_per_row, num_rows));
+        }
+        debug!("trying to allocate image");
+        let bytes_between_rows =
+            bytes_per_row.div_ceil(CACHE_LINE_BYTE_SIZE) * CACHE_LINE_BYTE_SIZE;
+        let data_len = (num_rows - 1)
+            .checked_mul(bytes_between_rows)
+            .and_then(|v| v.checked_add(bytes_per_row))
+            .ok_or(Error::ImageSizeTooLarge(bytes_per_row, num_rows))?;
+        assert_ne!(data_len, 0);
+
+        // Allocate with extra space for alignment padding
+        let total_len = data_len
+            .checked_add(CACHE_LINE_BYTE_SIZE - 1)
+            .ok_or(Error::ImageSizeTooLarge(bytes_per_row, num_rows))?;
+        let storage = if uninit {
+            #[cfg(feature = "allow-unsafe")]
+            {
+                // Skip zeroing entirely: pages fault on first write.
+                let mut v = Vec::new();
+                v.try_reserve(total_len)
+                    .map_err(|_| Error::ImageOutOfMemory(bytes_per_row, num_rows))?;
+                #[allow(unsafe_code)]
+                // SAFETY: try_reserve succeeded so capacity >= total_len.
+                // Caller guarantees all bytes will be written before being read.
+                unsafe {
+                    v.set_len(total_len);
+                }
+                v
+            }
+            #[cfg(not(feature = "allow-unsafe"))]
+            {
+                alloc_zeroed_fallible(total_len, bytes_per_row, num_rows)?
+            }
+        } else {
+            alloc_zeroed_fallible(total_len, bytes_per_row, num_rows)?
+        };
+
+        // Compute offset to first cache-line-aligned byte
+        let base_ptr = storage.as_ptr() as usize;
+        let aligned_ptr = base_ptr.div_ceil(CACHE_LINE_BYTE_SIZE) * CACHE_LINE_BYTE_SIZE;
+        let offset = aligned_ptr - base_ptr;
+
+        Ok(RawImageBuffer {
+            storage,
+            offset,
+            bytes_per_row,
+            num_rows,
+            bytes_between_rows,
+        })
+    }
+
+    /// Returns a copy of the current buffer contents in a new buffer.
+    pub(super) fn try_clone(&self) -> Result<Self> {
+        let out = RawImageBuffer::try_allocate(self.byte_size(), true)?;
+        assert_eq!(self.bytes_per_row, out.bytes_per_row);
+        assert_eq!(self.bytes_between_rows, out.bytes_between_rows);
+        assert_eq!(self.num_rows, out.num_rows);
+        let data_len = self.minimum_allocation_size();
+        if data_len != 0 {
+            let mut result = out;
+            let src = &self.storage[self.offset..self.offset + data_len];
+            let dst = &mut result.storage[result.offset..result.offset + data_len];
+            dst.copy_from_slice(src);
+            Ok(result)
+        } else {
+            Ok(out)
+        }
+    }
+
+    /// Clears the buffer, releasing the backing Vec.
+    pub(super) fn deallocate(&mut self) {
+        self.storage = Vec::new();
+        self.offset = 0;
+        self.num_rows = 0;
+        self.bytes_per_row = 0;
+        self.bytes_between_rows = 0;
+    }
+}
+
+// RawImageBuffer is Send + Sync automatically because Vec<u8> is Send + Sync.
+
+#[allow(private_interfaces)]
+pub trait DistinctRowsIndexes {
+    type Output<'a>;
+    type CastOutput<'a, T: 'static>;
+
+    fn get_rows_mut<'a>(&self, image: &'a mut RawImageBuffer) -> Self::Output<'a>;
+
+    fn cast_rows<'a, T: crate::image::ImageDataType>(
+        rows: Self::Output<'a>,
+    ) -> Self::CastOutput<'a, T>;
+}
+
+#[allow(private_interfaces)]
+impl<const S: usize> DistinctRowsIndexes for [usize; S] {
+    type Output<'a> = [&'a mut [u8]; S];
+    type CastOutput<'a, T: 'static> = [&'a mut [T]; S];
+
+    #[inline(always)]
+    fn get_rows_mut<'a>(&self, image: &'a mut RawImageBuffer) -> Self::Output<'a> {
+        for i in 0..S {
+            assert!(self[i] < image.num_rows);
+            for j in i + 1..S {
+                assert_ne!(self[i], self[j]);
+            }
+        }
+
+        // Compute byte ranges for each row
+        let ranges: [std::ops::Range<usize>; S] = std::array::from_fn(|i| {
+            let start = image.offset + self[i] * image.bytes_between_rows;
+            start..start + image.bytes_per_row
+        });
+
+        // Use split_at_mut to safely create non-overlapping mutable slices.
+        let storage = &mut image.storage[..];
+        get_distinct_slices(storage, ranges)
+    }
+
+    #[inline(always)]
+    fn cast_rows<'a, T: crate::image::ImageDataType>(
+        rows: Self::Output<'a>,
+    ) -> Self::CastOutput<'a, T> {
+        rows.map(|row| crate::image::typed::cast_row_mut(row))
+    }
+}
+
+/// Safely extract multiple non-overlapping mutable slices from a single slice.
+fn get_distinct_slices<const S: usize>(
+    data: &mut [u8],
+    ranges: [std::ops::Range<usize>; S],
+) -> [&mut [u8]; S] {
+    // Create index-range pairs sorted by start position
+    let mut indexed: [(usize, std::ops::Range<usize>); S] =
+        std::array::from_fn(|i| (i, ranges[i].clone()));
+    // Sort by range start (simple insertion sort for small S)
+    for i in 1..S {
+        let mut j = i;
+        while j > 0 && indexed[j].1.start < indexed[j - 1].1.start {
+            indexed.swap(j, j - 1);
+            j -= 1;
+        }
+    }
+
+    // Verify non-overlapping
+    for i in 1..S {
+        assert!(
+            indexed[i].1.start >= indexed[i - 1].1.end,
+            "overlapping row ranges"
+        );
+    }
+
+    // Collect the slices using split_at_mut, then restore original order
+    let mut slices: Vec<(usize, &mut [u8])> = Vec::with_capacity(S);
+    let mut remaining = data;
+    let mut consumed = 0usize;
+    for item in indexed.iter().take(S) {
+        let (orig_idx, ref range) = *item;
+        let skip = range.start - consumed;
+        let len = range.len();
+        let (_, rest) = remaining.split_at_mut(skip);
+        let (chunk, rest2) = rest.split_at_mut(len);
+        slices.push((orig_idx, chunk));
+        remaining = rest2;
+        consumed = range.end;
+    }
+
+    // Sort back to original order
+    slices.sort_by_key(|(idx, _)| *idx);
+
+    // Convert to fixed-size array
+    let mut iter = slices.into_iter().map(|(_, s)| s);
+    std::array::from_fn(|_| iter.next().unwrap())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/mod.rs
new file mode 100644
index 00000000..da125031
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/mod.rs
@@ -0,0 +1,20 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+mod data_type;
+mod internal;
+mod output_buffer;
+mod raw;
+mod rect;
+#[cfg(test)]
+mod test;
+mod typed;
+
+pub use data_type::DataTypeTag;
+pub use data_type::ImageDataType;
+pub use output_buffer::JxlOutputBuffer;
+pub use raw::{OwnedRawImage, RawImageRect, RawImageRectMut};
+pub use rect::Rect;
+pub use typed::{Image, ImageRect, ImageRectMut};
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/output_buffer.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/output_buffer.rs
new file mode 100644
index 00000000..79899409
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/output_buffer.rs
@@ -0,0 +1,555 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use super::{RawImageRectMut, Rect, internal::RawImageBuffer};
+
+/// Internal storage for a `JxlOutputBuffer`.
+///
+/// `Contiguous`: a single mutable byte slice with a row stride.
+/// `Fragmented`: a collection of per-row mutable byte slices, used for
+/// column-split tile fragments where rows are non-contiguous in memory.
+pub(crate) enum BufferStorage<'a> {
+    Contiguous {
+        data: &'a mut [u8],
+        bytes_between_rows: usize,
+    },
+    #[allow(dead_code)] // Constructed by split methods used in threads feature
+    Fragmented { rows: Vec<&'a mut [u8]> },
+}
+
+pub struct JxlOutputBuffer<'a> {
+    storage: BufferStorage<'a>,
+    bytes_per_row: usize,
+    num_rows: usize,
+    /// Row offset for band buffers: row_mut(r) accesses storage row (r - row_offset).
+    /// Always 0 for normal buffers. Set by split_into_row_bands for band sub-buffers.
+    row_offset: usize,
+}
+
+impl<'a> JxlOutputBuffer<'a> {
+    pub fn from_image_rect_mut(raw: RawImageRectMut<'a>) -> Self {
+        Self {
+            storage: BufferStorage::Contiguous {
+                data: raw.storage,
+                bytes_between_rows: raw.bytes_between_rows,
+            },
+            bytes_per_row: raw.bytes_per_row,
+            num_rows: raw.num_rows,
+            row_offset: 0,
+        }
+    }
+
+    /// Creates a new JxlOutputBuffer from a mutable byte slice.
+    pub fn new(buf: &'a mut [u8], num_rows: usize, bytes_per_row: usize) -> Self {
+        RawImageBuffer::check_vals(num_rows, bytes_per_row, bytes_per_row);
+        let expected_len = if num_rows == 0 {
+            0
+        } else {
+            (num_rows - 1) * bytes_per_row + bytes_per_row
+        };
+        assert!(buf.len() >= expected_len);
+        Self {
+            storage: BufferStorage::Contiguous {
+                data: if expected_len == 0 {
+                    &mut []
+                } else {
+                    &mut buf[..expected_len]
+                },
+                bytes_between_rows: bytes_per_row,
+            },
+            bytes_per_row,
+            num_rows,
+            row_offset: 0,
+        }
+    }
+
+    /// Creates a new JxlOutputBuffer from raw pointers.
+    /// It is guaranteed that `buf` will never be used to write uninitialized data.
+    ///
+    /// # Safety
+    /// - `buf` must be valid for writes for all bytes in the range
+    ///   `buf[i*bytes_between_rows..i*bytes_between_rows+bytes_per_row]` for all values of `i`
+    ///   from `0` to `num_rows-1`.
+    /// - The bytes in these ranges must not be accessed as long as the returned `Self` is in scope.
+    /// - All the bytes in those ranges (and in between) must be part of the same allocated object.
+    #[cfg(feature = "allow-unsafe")]
+    #[allow(unsafe_code)]
+    pub unsafe fn new_from_ptr(
+        buf: *mut std::mem::MaybeUninit<u8>,
+        num_rows: usize,
+        bytes_per_row: usize,
+        bytes_between_rows: usize,
+    ) -> Self {
+        RawImageBuffer::check_vals(num_rows, bytes_per_row, bytes_between_rows);
+        let total_len = if num_rows == 0 {
+            0
+        } else {
+            (num_rows - 1) * bytes_between_rows + bytes_per_row
+        };
+        let data = if total_len == 0 {
+            &mut []
+        } else {
+            // SAFETY: Caller guarantees `buf` is valid for `total_len` bytes.
+            // MaybeUninit<u8> and u8 have identical layout.
+            unsafe { std::slice::from_raw_parts_mut(buf as *mut u8, total_len) }
+        };
+        Self {
+            storage: BufferStorage::Contiguous {
+                data,
+                bytes_between_rows,
+            },
+            bytes_per_row,
+            num_rows,
+            row_offset: 0,
+        }
+    }
+
+    pub(crate) fn reborrow(lender: &'a mut JxlOutputBuffer<'_>) -> JxlOutputBuffer<'a> {
+        JxlOutputBuffer {
+            storage: match &mut lender.storage {
+                BufferStorage::Contiguous {
+                    data,
+                    bytes_between_rows,
+                } => BufferStorage::Contiguous {
+                    data,
+                    bytes_between_rows: *bytes_between_rows,
+                },
+                BufferStorage::Fragmented { rows } => BufferStorage::Fragmented {
+                    rows: rows.iter_mut().map(|r| &mut **r).collect(),
+                },
+            },
+            bytes_per_row: lender.bytes_per_row,
+            num_rows: lender.num_rows,
+            row_offset: lender.row_offset,
+        }
+    }
+
+    /// Returns a mutable row as a byte slice.
+    ///
+    /// For band buffers (row_offset > 0), `row` is in the parent buffer's
+    /// coordinate system and is translated internally.
+    #[inline]
+    pub(crate) fn row_mut(&mut self, row: usize) -> &mut [u8] {
+        let local_row = row.wrapping_sub(self.row_offset);
+        assert!(
+            local_row < self.num_rows,
+            "row {row} out of range [{}, {})",
+            self.row_offset,
+            self.row_offset + self.num_rows,
+        );
+        match &mut self.storage {
+            BufferStorage::Contiguous {
+                data,
+                bytes_between_rows,
+            } => {
+                let start = local_row * *bytes_between_rows;
+                &mut data[start..start + self.bytes_per_row]
+            }
+            BufferStorage::Fragmented { rows } => &mut rows[local_row][..self.bytes_per_row],
+        }
+    }
+
+    #[inline]
+    pub fn write_bytes(&mut self, row: usize, col: usize, bytes: &[u8]) {
+        let slice = self.row_mut(row);
+        slice[col..col + bytes.len()].copy_from_slice(bytes);
+    }
+
+    pub fn byte_size(&self) -> (usize, usize) {
+        (self.bytes_per_row, self.num_rows)
+    }
+
+    /// Split this buffer into non-overlapping row bands.
+    ///
+    /// `split_rows` contains sorted row indices where splits occur, in the
+    /// buffer's own coordinate system (i.e., relative to `self.row_offset`).
+    /// Returns one sub-buffer per band: [0, split_rows[0]),
+    /// [split_rows[0], split_rows[1]), ..., [split_rows[last], num_rows).
+    ///
+    /// Each returned sub-buffer has its `row_offset` set so that callers can
+    /// use the parent buffer's coordinate system for row access.
+    ///
+    /// While the returned sub-buffers are alive, `self` cannot be used.
+    /// When they are dropped, `self` becomes available again.
+    #[cfg(feature = "threads")]
+    #[allow(dead_code)] // Parallel row-band splitting for threaded output
+    pub(crate) fn split_into_row_bands(
+        &mut self,
+        split_rows: &[usize],
+    ) -> Vec<JxlOutputBuffer<'_>> {
+        let bpr = self.bytes_per_row;
+        let nrows = self.num_rows;
+        let base_offset = self.row_offset;
+
+        match &mut self.storage {
+            BufferStorage::Contiguous {
+                data,
+                bytes_between_rows,
+            } => {
+                let btr = *bytes_between_rows;
+                let mut result = Vec::with_capacity(split_rows.len() + 1);
+                let mut remaining: &mut [u8] = data;
+                let mut current_row = 0;
+
+                for &split_row in split_rows.iter().chain(std::iter::once(&nrows)) {
+                    assert!(
+                        split_row >= current_row && split_row <= nrows,
+                        "split_rows must be sorted and <= num_rows"
+                    );
+                    let band_rows = split_row - current_row;
+
+                    if band_rows == 0 {
+                        result.push(JxlOutputBuffer {
+                            storage: BufferStorage::Contiguous {
+                                data: &mut [],
+                                bytes_between_rows: btr,
+                            },
+                            bytes_per_row: bpr,
+                            num_rows: 0,
+                            row_offset: base_offset + current_row,
+                        });
+                    } else {
+                        let span = (band_rows - 1) * btr + bpr;
+                        if split_row < nrows {
+                            let total_bytes = band_rows * btr;
+                            let tmp = remaining;
+                            let (band_full, rest) = tmp.split_at_mut(total_bytes);
+                            result.push(JxlOutputBuffer {
+                                storage: BufferStorage::Contiguous {
+                                    data: &mut band_full[..span],
+                                    bytes_between_rows: btr,
+                                },
+                                bytes_per_row: bpr,
+                                num_rows: band_rows,
+                                row_offset: base_offset + current_row,
+                            });
+                            remaining = rest;
+                        } else {
+                            let tmp = remaining;
+                            let (band, _) = tmp.split_at_mut(span);
+                            result.push(JxlOutputBuffer {
+                                storage: BufferStorage::Contiguous {
+                                    data: band,
+                                    bytes_between_rows: btr,
+                                },
+                                bytes_per_row: bpr,
+                                num_rows: band_rows,
+                                row_offset: base_offset + current_row,
+                            });
+                            remaining = &mut [];
+                        }
+                    }
+                    current_row = split_row;
+                }
+                result
+            }
+            BufferStorage::Fragmented { rows } => {
+                let mut result = Vec::with_capacity(split_rows.len() + 1);
+                let mut remaining: &mut [&'_ mut [u8]] = rows;
+                let mut current_row = 0;
+
+                for &split_row in split_rows.iter().chain(std::iter::once(&nrows)) {
+                    assert!(
+                        split_row >= current_row && split_row <= nrows,
+                        "split_rows must be sorted and <= num_rows"
+                    );
+                    let band_rows = split_row - current_row;
+
+                    let tmp = remaining;
+                    let (band_slice, rest) = tmp.split_at_mut(band_rows);
+                    result.push(JxlOutputBuffer {
+                        storage: BufferStorage::Fragmented {
+                            rows: band_slice.iter_mut().map(|r| &mut **r).collect(),
+                        },
+                        bytes_per_row: bpr,
+                        num_rows: band_rows,
+                        row_offset: base_offset + current_row,
+                    });
+                    remaining = rest;
+                    current_row = split_row;
+                }
+                result
+            }
+        }
+    }
+
+    /// Split this buffer into non-overlapping column fragments.
+    ///
+    /// `split_cols` contains sorted byte-column positions where splits occur.
+    /// Returns one sub-buffer per fragment: [0, split_cols[0]),
+    /// [split_cols[0], split_cols[1]), ..., [split_cols[last], bytes_per_row).
+    ///
+    /// Each returned sub-buffer uses `Fragmented` storage (per-row slices)
+    /// since column sub-ranges are not contiguous across rows.
+    ///
+    /// Preserves `row_offset` so callers can use the parent buffer's coordinate
+    /// system for row access.
+    #[cfg(feature = "threads")]
+    #[allow(dead_code)] // Parallel column-fragment splitting for threaded output
+    pub(crate) fn split_into_col_fragments(
+        &mut self,
+        split_cols: &[usize],
+    ) -> Vec<JxlOutputBuffer<'_>> {
+        let bpr = self.bytes_per_row;
+        let nrows = self.num_rows;
+        let base_offset = self.row_offset;
+        let num_frags = split_cols.len() + 1;
+
+        // Validate split_cols.
+        for (i, &col) in split_cols.iter().enumerate() {
+            assert!(col <= bpr, "split_col {col} exceeds bytes_per_row {bpr}");
+            if i > 0 {
+                assert!(col >= split_cols[i - 1], "split_cols must be sorted");
+            }
+        }
+
+        // Pre-allocate fragment row collectors.
+        let mut fragment_rows: Vec<Vec<&mut [u8]>> =
+            (0..num_frags).map(|_| Vec::with_capacity(nrows)).collect();
+
+        match &mut self.storage {
+            BufferStorage::Contiguous {
+                data,
+                bytes_between_rows,
+            } => {
+                let btr = *bytes_between_rows;
+                let mut remaining: &mut [u8] = data;
+
+                for row_idx in 0..nrows {
+                    // Always consume via split_at_mut so the borrow checker
+                    // sees `remaining` is moved, not aliased.
+                    let tmp = remaining;
+                    let split_point = if row_idx < nrows - 1 { btr } else { tmp.len() };
+                    let (chunk, rest) = tmp.split_at_mut(split_point);
+                    remaining = rest;
+                    let row_useful = &mut chunk[..bpr];
+
+                    // Split this row into column fragments.
+                    let mut col_remaining = row_useful;
+                    let mut prev_col = 0;
+                    for (frag_idx, &split_col) in split_cols.iter().enumerate() {
+                        let width = split_col - prev_col;
+                        let (frag, rest) = col_remaining.split_at_mut(width);
+                        fragment_rows[frag_idx].push(frag);
+                        col_remaining = rest;
+                        prev_col = split_col;
+                    }
+                    fragment_rows[num_frags - 1].push(col_remaining);
+                }
+            }
+            BufferStorage::Fragmented { rows } => {
+                for row in rows.iter_mut() {
+                    let mut col_remaining: &mut [u8] = row;
+                    let mut prev_col = 0;
+                    for (frag_idx, &split_col) in split_cols.iter().enumerate() {
+                        let width = split_col - prev_col;
+                        let (frag, rest) = col_remaining.split_at_mut(width);
+                        fragment_rows[frag_idx].push(frag);
+                        col_remaining = rest;
+                        prev_col = split_col;
+                    }
+                    fragment_rows[num_frags - 1].push(col_remaining);
+                }
+            }
+        }
+
+        // Build result buffers.
+        let mut result = Vec::with_capacity(num_frags);
+        let mut prev_col = 0;
+        for (frag_idx, rows) in fragment_rows.into_iter().enumerate() {
+            let col_end = if frag_idx < split_cols.len() {
+                split_cols[frag_idx]
+            } else {
+                bpr
+            };
+            let width = col_end - prev_col;
+            result.push(JxlOutputBuffer {
+                storage: BufferStorage::Fragmented { rows },
+                bytes_per_row: width,
+                num_rows: nrows,
+                row_offset: base_offset,
+            });
+            prev_col = col_end;
+        }
+        result
+    }
+
+    /// Split this buffer into a 2D grid of fragments (by rows then columns).
+    ///
+    /// Combines row-band splitting and column-fragment splitting in a single
+    /// method to avoid multi-level borrowing. All returned fragments borrow
+    /// directly from `self.storage`.
+    ///
+    /// `split_rows`: sorted row indices where gy bands split.
+    /// `split_cols_per_band`: for each band, sorted column indices where gx tiles split.
+    ///
+    /// Returns `result[band_idx][frag_idx]` where each fragment uses `Fragmented`
+    /// storage with `row_offset` set to the band's starting row.
+    #[cfg(feature = "threads")]
+    pub(crate) fn split_into_tile_grid(
+        &mut self,
+        split_rows: &[usize],
+        split_cols_per_band: &[&[usize]],
+    ) -> Vec<Vec<JxlOutputBuffer<'_>>> {
+        let bpr = self.bytes_per_row;
+        let nrows = self.num_rows;
+        let base_offset = self.row_offset;
+        let num_bands = split_rows.len() + 1;
+
+        assert_eq!(
+            split_cols_per_band.len(),
+            num_bands,
+            "need one set of split_cols per band"
+        );
+
+        let BufferStorage::Contiguous {
+            data,
+            bytes_between_rows,
+        } = &mut self.storage
+        else {
+            panic!("split_into_tile_grid requires Contiguous storage")
+        };
+        let btr = *bytes_between_rows;
+        let mut remaining: &mut [u8] = data;
+
+        let mut result: Vec<Vec<JxlOutputBuffer<'_>>> = Vec::with_capacity(num_bands);
+        let mut current_row = 0;
+
+        for band_idx in 0..num_bands {
+            let band_end = if band_idx < split_rows.len() {
+                split_rows[band_idx]
+            } else {
+                nrows
+            };
+            assert!(
+                band_end >= current_row && band_end <= nrows,
+                "split_rows must be sorted and <= num_rows"
+            );
+            let band_rows = band_end - current_row;
+            let split_cols = split_cols_per_band[band_idx];
+            let num_frags = split_cols.len() + 1;
+
+            // Pre-allocate per-fragment row collectors for this band.
+            let mut fragment_rows: Vec<Vec<&mut [u8]>> = (0..num_frags)
+                .map(|_| Vec::with_capacity(band_rows))
+                .collect();
+
+            for row_offset_in_band in 0..band_rows {
+                let is_last_overall_row = current_row + row_offset_in_band == nrows - 1;
+                let tmp = remaining;
+                let split_point = if is_last_overall_row { tmp.len() } else { btr };
+                let (chunk, rest) = tmp.split_at_mut(split_point);
+                remaining = rest;
+                let row_useful = &mut chunk[..bpr];
+
+                // Split row into column fragments.
+                let mut col_remaining = row_useful;
+                let mut prev_col = 0;
+                for (frag_idx, &split_col) in split_cols.iter().enumerate() {
+                    let width = split_col - prev_col;
+                    let (frag, rest) = col_remaining.split_at_mut(width);
+                    fragment_rows[frag_idx].push(frag);
+                    col_remaining = rest;
+                    prev_col = split_col;
+                }
+                fragment_rows[num_frags - 1].push(col_remaining);
+            }
+
+            // Build fragment buffers for this band.
+            let mut band_frags = Vec::with_capacity(num_frags);
+            let mut prev_col = 0;
+            for (frag_idx, rows) in fragment_rows.into_iter().enumerate() {
+                let col_end = if frag_idx < split_cols.len() {
+                    split_cols[frag_idx]
+                } else {
+                    bpr
+                };
+                let width = col_end - prev_col;
+                band_frags.push(JxlOutputBuffer {
+                    storage: BufferStorage::Fragmented { rows },
+                    bytes_per_row: width,
+                    num_rows: band_rows,
+                    row_offset: base_offset + current_row,
+                });
+                prev_col = col_end;
+            }
+            result.push(band_frags);
+            current_row = band_end;
+        }
+        result
+    }
+
+    pub fn rect(&mut self, rect: Rect) -> JxlOutputBuffer<'_> {
+        if rect.size.0 == 0 || rect.size.1 == 0 {
+            return JxlOutputBuffer {
+                storage: BufferStorage::Contiguous {
+                    data: &mut [],
+                    bytes_between_rows: 0,
+                },
+                bytes_per_row: 0,
+                num_rows: 0,
+                row_offset: 0,
+            };
+        }
+        assert!(
+            rect.origin.1 >= self.row_offset,
+            "rect origin row {} < row_offset {}",
+            rect.origin.1,
+            self.row_offset,
+        );
+        let local_y = rect.origin.1 - self.row_offset;
+        assert!(local_y + rect.size.1 <= self.num_rows);
+        assert!(rect.origin.0 + rect.size.0 <= self.bytes_per_row);
+
+        match &mut self.storage {
+            BufferStorage::Contiguous {
+                data,
+                bytes_between_rows,
+            } => {
+                let btr = *bytes_between_rows;
+                let new_start = local_y * btr + rect.origin.0;
+                let data_span = (rect.size.1 - 1) * btr + rect.size.0;
+                assert!(new_start + data_span <= data.len());
+                JxlOutputBuffer {
+                    storage: BufferStorage::Contiguous {
+                        data: &mut data[new_start..new_start + data_span],
+                        bytes_between_rows: btr,
+                    },
+                    bytes_per_row: rect.size.0,
+                    num_rows: rect.size.1,
+                    // Child views from rect() are always 0-based.
+                    row_offset: 0,
+                }
+            }
+            BufferStorage::Fragmented { rows } => {
+                let col_start = rect.origin.0;
+                let col_end = col_start + rect.size.0;
+                let sub_rows: Vec<&mut [u8]> = rows[local_y..local_y + rect.size.1]
+                    .iter_mut()
+                    .map(|row| &mut row[col_start..col_end])
+                    .collect();
+                JxlOutputBuffer {
+                    storage: BufferStorage::Fragmented { rows: sub_rows },
+                    bytes_per_row: rect.size.0,
+                    num_rows: rect.size.1,
+                    // Child views from rect() are always 0-based.
+                    row_offset: 0,
+                }
+            }
+        }
+    }
+}
+
+impl Debug for JxlOutputBuffer<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "JxlOutputBuffer {}x{}",
+            self.bytes_per_row, self.num_rows
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/raw.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/raw.rs
new file mode 100644
index 00000000..42bdcb61
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/raw.rs
@@ -0,0 +1,415 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::fmt::Debug;
+
+use crate::{
+    error::Result,
+    util::{CACHE_LINE_BYTE_SIZE, MemoryGuard, MemoryTracker},
+};
+
+use super::{Rect, internal::RawImageBuffer};
+
+pub struct OwnedRawImage {
+    // All the accessible bytes of `self.data` are initialized (Vec<u8> guarantees this).
+    // `data.is_aligned(CACHE_LINE_BYTE_SIZE)` is true.
+    pub(super) data: RawImageBuffer,
+    pub(super) offset: (usize, usize),
+    padding: (usize, usize),
+    /// If set, this image's allocation is tracked against a memory budget.
+    /// On drop, `tracked_bytes` will be released back to the tracker.
+    tracker: Option<MemoryTracker>,
+    tracked_bytes: u64,
+}
+
+impl OwnedRawImage {
+    pub fn new(byte_size: (usize, usize)) -> Result<Self> {
+        Self::new_zeroed_with_padding(byte_size, (0, 0), (0, 0))
+    }
+
+    /// Allocate an output buffer without zeroing.
+    ///
+    /// # Safety contract
+    /// The caller must ensure every byte is written before being read.
+    /// This is appropriate for output buffers that the decoder will fully populate.
+    pub fn new_uninit(byte_size: (usize, usize)) -> Result<Self> {
+        let mut padding = (0usize, 0usize);
+        if !(padding.0 + byte_size.0).is_multiple_of(CACHE_LINE_BYTE_SIZE) {
+            padding.0 += CACHE_LINE_BYTE_SIZE - (padding.0 + byte_size.0) % CACHE_LINE_BYTE_SIZE;
+        }
+        Ok(Self {
+            data: RawImageBuffer::try_allocate(
+                (byte_size.0 + padding.0, byte_size.1 + padding.1),
+                true,
+            )?,
+            offset: (0, 0),
+            padding,
+            tracker: None,
+            tracked_bytes: 0,
+        })
+    }
+
+    pub fn new_zeroed_with_padding(
+        byte_size: (usize, usize),
+        offset: (usize, usize),
+        mut padding: (usize, usize),
+    ) -> Result<Self> {
+        // Since RawImageBuffer::try_allocate will round up the length of a row to a cache line,
+        // might as well declare that as available padding space.
+        if !(padding.0 + byte_size.0).is_multiple_of(CACHE_LINE_BYTE_SIZE) {
+            padding.0 += CACHE_LINE_BYTE_SIZE - (padding.0 + byte_size.0) % CACHE_LINE_BYTE_SIZE;
+        }
+        Ok(Self {
+            data: RawImageBuffer::try_allocate(
+                (byte_size.0 + padding.0, byte_size.1 + padding.1),
+                false,
+            )?,
+            offset,
+            padding,
+            tracker: None,
+            tracked_bytes: 0,
+        })
+    }
+
+    #[inline]
+    pub fn get_rect_including_padding_mut(&mut self, rect: Rect) -> RawImageRectMut<'_> {
+        let (bpr, nr, bbr) = self.data.dimensions();
+        let storage = self.data.data_slice_mut();
+        sub_rect_mut(storage, bpr, nr, bbr, rect)
+    }
+
+    #[inline]
+    pub fn get_rect_including_padding(&self, rect: Rect) -> RawImageRect<'_> {
+        let (bpr, nr, bbr) = self.data.dimensions();
+        let storage = self.data.data_slice();
+        sub_rect(storage, bpr, nr, bbr, rect)
+    }
+
+    #[inline]
+    fn shift_rect(&self, rect: Rect) -> Rect {
+        if cfg!(debug_assertions) {
+            // Check the original rect is within the content size (without padding)
+            rect.check_within(self.byte_size());
+        }
+        Rect {
+            origin: (rect.origin.0 + self.offset.0, rect.origin.1 + self.offset.1),
+            size: rect.size,
+        }
+    }
+
+    #[inline]
+    pub fn get_rect_mut(&mut self, rect: Rect) -> RawImageRectMut<'_> {
+        self.get_rect_including_padding_mut(self.shift_rect(rect))
+    }
+
+    #[inline]
+    pub fn get_rect(&self, rect: Rect) -> RawImageRect<'_> {
+        self.get_rect_including_padding(self.shift_rect(rect))
+    }
+
+    #[inline(always)]
+    pub fn row_mut(&mut self, row: usize) -> &mut [u8] {
+        let offset = self.offset;
+        let end = offset.0 + self.byte_size().0;
+        let row = self.data.row_mut(row + offset.1);
+        &mut row[offset.0..end]
+    }
+
+    #[inline(always)]
+    pub fn row(&self, row: usize) -> &[u8] {
+        let offset = self.offset;
+        let end = offset.0 + self.byte_size().0;
+        let row = self.data.row(row + offset.1);
+        &row[offset.0..end]
+    }
+
+    #[inline]
+    pub fn byte_size(&self) -> (usize, usize) {
+        let size = self.data.byte_size();
+        (size.0 - self.padding.0, size.1 - self.padding.1)
+    }
+
+    #[inline]
+    pub fn byte_offset(&self) -> (usize, usize) {
+        self.offset
+    }
+
+    #[inline]
+    pub fn byte_padding(&self) -> (usize, usize) {
+        self.padding
+    }
+
+    /// Pre-fault all virtual memory pages by touching one byte per page in parallel.
+    /// This avoids page fault contention during rendering by spreading fault handling
+    /// across rayon worker threads before the hot rendering loop begins.
+    #[cfg(feature = "threads")]
+    pub fn prefault_parallel(&mut self) {
+        use rayon::prelude::*;
+        const PAGE_SIZE: usize = 4096;
+        let data = self.data.data_slice_mut();
+        if data.is_empty() {
+            return;
+        }
+        data.par_chunks_mut(PAGE_SIZE).for_each(|chunk| {
+            chunk[0] = 0;
+        });
+    }
+
+    /// Sets memory tracking on this image so that `tracked_bytes` are released
+    /// back to `tracker` when this image is dropped.
+    pub(super) fn set_tracker(&mut self, tracker: MemoryTracker, bytes: u64) {
+        self.tracker = Some(tracker);
+        self.tracked_bytes = bytes;
+    }
+
+    pub fn try_clone(&self) -> Result<OwnedRawImage> {
+        // If tracked, reserve budget for the clone before allocating.
+        if let Some(tracker) = &self.tracker {
+            tracker.try_allocate(self.tracked_bytes)?;
+        }
+        // Guard ensures rollback if the raw data clone fails.
+        let guard: Option<MemoryGuard> = self
+            .tracker
+            .as_ref()
+            .map(|t| MemoryGuard::new(t.clone(), self.tracked_bytes));
+
+        let clone = Self {
+            data: self.data.try_clone()?,
+            offset: self.offset,
+            padding: self.padding,
+            tracker: self.tracker.clone(),
+            tracked_bytes: self.tracked_bytes,
+        };
+
+        // Transfer budget ownership from guard to the clone's Drop.
+        if let Some(g) = guard {
+            g.disarm();
+        }
+
+        Ok(clone)
+    }
+}
+
+impl Drop for OwnedRawImage {
+    fn drop(&mut self) {
+        if let Some(tracker) = &self.tracker {
+            tracker.release(self.tracked_bytes);
+        }
+        // Vec<u8> drops automatically — no manual dealloc needed.
+        self.data.deallocate();
+    }
+}
+
+/// Helper: create an immutable sub-view from a storage slice and its dimensions.
+#[inline]
+fn sub_rect<'a>(
+    storage: &'a [u8],
+    bpr: usize,
+    nr: usize,
+    bbr: usize,
+    rect: Rect,
+) -> RawImageRect<'a> {
+    if rect.size.0 == 0 || rect.size.1 == 0 {
+        return RawImageRect {
+            storage: &[],
+            bytes_per_row: 0,
+            num_rows: 0,
+            bytes_between_rows: 0,
+        };
+    }
+    assert!(rect.origin.1 + rect.size.1 <= nr);
+    assert!(rect.origin.0 + rect.size.0 <= bpr);
+    let new_start = rect.origin.1 * bbr + rect.origin.0;
+    let data_span = (rect.size.1 - 1) * bbr + rect.size.0;
+    assert!(new_start + data_span <= storage.len());
+    RawImageRect {
+        storage: &storage[new_start..new_start + data_span],
+        bytes_per_row: rect.size.0,
+        num_rows: rect.size.1,
+        bytes_between_rows: bbr,
+    }
+}
+
+/// Helper: create a mutable sub-view from a storage slice and its dimensions.
+#[inline]
+fn sub_rect_mut<'a>(
+    storage: &'a mut [u8],
+    bpr: usize,
+    nr: usize,
+    bbr: usize,
+    rect: Rect,
+) -> RawImageRectMut<'a> {
+    if rect.size.0 == 0 || rect.size.1 == 0 {
+        return RawImageRectMut {
+            storage: &mut [],
+            bytes_per_row: 0,
+            num_rows: 0,
+            bytes_between_rows: 0,
+        };
+    }
+    assert!(rect.origin.1 + rect.size.1 <= nr);
+    assert!(rect.origin.0 + rect.size.0 <= bpr);
+    let new_start = rect.origin.1 * bbr + rect.origin.0;
+    let data_span = (rect.size.1 - 1) * bbr + rect.size.0;
+    assert!(new_start + data_span <= storage.len());
+    RawImageRectMut {
+        storage: &mut storage[new_start..new_start + data_span],
+        bytes_per_row: rect.size.0,
+        num_rows: rect.size.1,
+        bytes_between_rows: bbr,
+    }
+}
+
+/// Immutable view into image data. Holds a borrowed slice + row layout info.
+/// `Copy` because it's just a `&[u8]` + dimensions.
+#[derive(Clone, Copy)]
+pub struct RawImageRect<'a> {
+    pub(super) storage: &'a [u8],
+    pub(super) bytes_per_row: usize,
+    pub(super) num_rows: usize,
+    pub(super) bytes_between_rows: usize,
+}
+
+impl<'a> RawImageRect<'a> {
+    #[inline(always)]
+    pub fn row(&self, row: usize) -> &'a [u8] {
+        assert!(row < self.num_rows);
+        let start = row * self.bytes_between_rows;
+        &self.storage[start..start + self.bytes_per_row]
+    }
+
+    #[inline]
+    pub fn rect(&self, rect: Rect) -> RawImageRect<'a> {
+        sub_rect(
+            self.storage,
+            self.bytes_per_row,
+            self.num_rows,
+            self.bytes_between_rows,
+            rect,
+        )
+    }
+
+    #[inline]
+    pub fn byte_size(&self) -> (usize, usize) {
+        (self.bytes_per_row, self.num_rows)
+    }
+
+    #[inline]
+    pub(super) fn is_aligned(&self, align: usize) -> bool {
+        if self.num_rows == 0 {
+            return true;
+        }
+        self.bytes_per_row.is_multiple_of(align)
+            && self.bytes_between_rows.is_multiple_of(align)
+            && (self.storage.as_ptr() as usize).is_multiple_of(align)
+    }
+}
+
+/// Mutable view into image data. Holds a borrowed mutable slice + row layout info.
+pub struct RawImageRectMut<'a> {
+    pub(super) storage: &'a mut [u8],
+    pub(super) bytes_per_row: usize,
+    pub(super) num_rows: usize,
+    pub(super) bytes_between_rows: usize,
+}
+
+impl<'a> RawImageRectMut<'a> {
+    #[inline(always)]
+    pub fn row(&mut self, row: usize) -> &mut [u8] {
+        assert!(row < self.num_rows);
+        let start = row * self.bytes_between_rows;
+        &mut self.storage[start..start + self.bytes_per_row]
+    }
+
+    #[inline]
+    pub fn rect_mut(&mut self, rect: Rect) -> RawImageRectMut<'_> {
+        sub_rect_mut(
+            self.storage,
+            self.bytes_per_row,
+            self.num_rows,
+            self.bytes_between_rows,
+            rect,
+        )
+    }
+
+    pub fn as_rect(&self) -> RawImageRect<'_> {
+        RawImageRect {
+            storage: self.storage,
+            bytes_per_row: self.bytes_per_row,
+            num_rows: self.num_rows,
+            bytes_between_rows: self.bytes_between_rows,
+        }
+    }
+
+    #[inline]
+    pub fn byte_size(&self) -> (usize, usize) {
+        (self.bytes_per_row, self.num_rows)
+    }
+
+    #[inline]
+    pub(super) fn is_aligned(&self, align: usize) -> bool {
+        if self.num_rows == 0 {
+            return true;
+        }
+        self.bytes_per_row.is_multiple_of(align)
+            && self.bytes_between_rows.is_multiple_of(align)
+            && (self.storage.as_ptr() as usize).is_multiple_of(align)
+    }
+
+    /// Creates a mutable view from an external slice and dimensions.
+    #[allow(dead_code)] // Part of RawImageRectMut construction API
+    pub(super) fn from_slice(
+        buf: &'a mut [u8],
+        num_rows: usize,
+        bytes_per_row: usize,
+        bytes_between_rows: usize,
+    ) -> Self {
+        RawImageBuffer::check_vals(num_rows, bytes_per_row, bytes_between_rows);
+        let expected_len = if num_rows == 0 {
+            0
+        } else {
+            (num_rows - 1) * bytes_between_rows + bytes_per_row
+        };
+        assert!(
+            buf.len() >= expected_len,
+            "buffer too small: {} < {}",
+            buf.len(),
+            expected_len
+        );
+        RawImageRectMut {
+            storage: if expected_len == 0 {
+                &mut []
+            } else {
+                &mut buf[..expected_len]
+            },
+            bytes_per_row,
+            num_rows,
+            bytes_between_rows,
+        }
+    }
+}
+
+impl Debug for OwnedRawImage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "raw {}x{}", self.byte_size().0, self.byte_size().1)
+    }
+}
+
+impl Debug for RawImageRect<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "raw rect {}x{}", self.byte_size().0, self.byte_size().1)
+    }
+}
+
+impl Debug for RawImageRectMut<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "raw mutrect {}x{}",
+            self.byte_size().0,
+            self.byte_size().1
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/rect.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/rect.rs
new file mode 100644
index 00000000..d2f852ec
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/rect.rs
@@ -0,0 +1,61 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::DataTypeTag;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Rect {
+    pub origin: (usize, usize),
+    // width, height
+    pub size: (usize, usize),
+}
+
+impl Rect {
+    pub fn check_within(&self, size: (usize, usize)) {
+        if self.origin.0.checked_add(self.size.0).unwrap() > size.0
+            || self.origin.1.checked_add(self.size.1).unwrap() > size.1
+        {
+            panic!(
+                "Rect out of bounds: {}x{}+{}+{} rect in {}x{} view",
+                self.size.0, self.size.1, self.origin.0, self.origin.1, size.0, size.1
+            );
+        }
+    }
+
+    #[inline]
+    pub fn to_byte_rect(&self, data_type: DataTypeTag) -> Rect {
+        self.to_byte_rect_sz(data_type.size())
+    }
+
+    #[inline]
+    pub fn to_byte_rect_sz(&self, sz: usize) -> Rect {
+        Rect {
+            origin: (self.origin.0 * sz, self.origin.1),
+            size: (self.size.0 * sz, self.size.1),
+        }
+    }
+
+    pub fn downsample(&self, downsample: (u8, u8)) -> Rect {
+        Rect {
+            origin: (self.origin.0 >> downsample.0, self.origin.1 >> downsample.1),
+            size: (self.size.0 >> downsample.0, self.size.1 >> downsample.1),
+        }
+    }
+
+    pub fn end(&self) -> (usize, usize) {
+        (self.origin.0 + self.size.0, self.origin.1 + self.size.1)
+    }
+
+    pub fn clip(&self, size: (usize, usize)) -> Rect {
+        let end = self.end();
+        Rect {
+            origin: self.origin,
+            size: (
+                end.0.min(size.0).saturating_sub(self.origin.0),
+                end.1.min(size.1).saturating_sub(self.origin.1),
+            ),
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/test.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/test.rs
new file mode 100644
index 00000000..3827ecc0
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/test.rs
@@ -0,0 +1,208 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use arbtest::arbitrary::Arbitrary;
+
+use crate::error::Result;
+use crate::util::MemoryTracker;
+
+use super::{Image, ImageDataType, Rect};
+
+impl<T: ImageDataType> Image<T> {
+    #[cfg(test)]
+    pub fn new_random<R: rand::Rng>(size: (usize, usize), rng: &mut R) -> Result<Image<T>> {
+        let mut img = Self::new(size)?;
+        for y in 0..size.1 {
+            img.row_mut(y).iter_mut().for_each(|x| *x = T::random(rng));
+        }
+        Ok(img)
+    }
+
+    #[cfg(test)]
+    pub fn new_range(size: (usize, usize), start: f32, step: f32) -> Result<Image<T>> {
+        let mut img = Self::new(size)?;
+        for y in 0..size.1 {
+            img.row_mut(y).iter_mut().enumerate().for_each(|(x, val)| {
+                *val = T::from_f64((start + step * (y * size.0 + x) as f32) as f64)
+            });
+        }
+        Ok(img)
+    }
+}
+
+#[test]
+fn huge_image() {
+    assert!(Image::<u8>::new((1 << 28, 1 << 28)).is_err());
+}
+
+#[test]
+fn rect_basic() -> Result<()> {
+    let mut image = Image::<u8>::new((32, 42))?;
+    assert_eq!(
+        image
+            .get_rect_mut(Rect {
+                origin: (31, 40),
+                size: (1, 1)
+            })
+            .size(),
+        (1, 1)
+    );
+    assert_eq!(
+        image
+            .get_rect_mut(Rect {
+                origin: (0, 0),
+                size: (1, 1)
+            })
+            .size(),
+        (1, 1)
+    );
+    image
+        .get_rect_mut(Rect {
+            origin: (30, 30),
+            size: (1, 1),
+        })
+        .row(0)[0] = 1;
+    assert_eq!(image.row(30)[30], 1);
+    Ok(())
+}
+
+#[test]
+#[should_panic(expected = "image byte offset must be aligned to element size")]
+fn image_from_raw_rejects_misaligned_offset() {
+    use super::OwnedRawImage;
+    // Regression test (libjxl/jxl-rs#757): Image<T>::from_raw used to check the base
+    // RawImageBuffer alignment but not OwnedRawImage's byte offset. This safe construction
+    // leaves the allocation itself 4-byte aligned while making row(0) start one byte later;
+    // accepting it would let Image::<u32>::row create a misaligned &[u32], which is UB on the
+    // `allow-unsafe` cast path.
+    let raw = OwnedRawImage::new_zeroed_with_padding((4, 1), (1, 0), (1, 0)).unwrap();
+    let _ = Image::<u32>::from_raw(raw);
+}
+
+fn f64_conversions<T: ImageDataType + Eq + for<'a> Arbitrary<'a>>() {
+    arbtest::arbtest(|u| {
+        let t = T::arbitrary(u)?;
+        assert_eq!(t, T::from_f64(t.to_f64()));
+        Ok(())
+    });
+}
+
+#[test]
+fn u8_f64_conv() {
+    f64_conversions::<u8>();
+}
+
+#[test]
+fn u16_f64_conv() {
+    f64_conversions::<u16>();
+}
+
+#[test]
+fn u32_f64_conv() {
+    f64_conversions::<u32>();
+}
+
+#[test]
+fn i8_f64_conv() {
+    f64_conversions::<i8>();
+}
+
+#[test]
+fn i16_f64_conv() {
+    f64_conversions::<i16>();
+}
+
+#[test]
+fn i32_f64_conv() {
+    f64_conversions::<i32>();
+}
+
+#[test]
+fn f32_f64_conv() {
+    arbtest::arbtest(|u| {
+        let t = f32::arbitrary(u)?;
+        if !t.is_nan() {
+            assert_eq!(t, f32::from_f64(t.to_f64()));
+        }
+        Ok(())
+    });
+}
+
+#[test]
+fn tracked_image_releases_on_drop() {
+    let tracker = MemoryTracker::with_limit(1_000_000);
+    {
+        let _img = Image::<f32>::new_tracked((100, 100), &tracker).unwrap();
+        assert!(tracker.allocated() > 0, "budget should be reserved");
+    }
+    assert_eq!(tracker.allocated(), 0, "budget should be released on drop");
+}
+
+#[test]
+fn tracked_image_budget_is_accurate() {
+    let tracker = MemoryTracker::with_limit(1_000_000);
+    let expected = Image::<f32>::allocation_size((64, 64));
+    let _img = Image::<f32>::new_tracked((64, 64), &tracker).unwrap();
+    assert_eq!(tracker.allocated(), expected);
+}
+
+#[test]
+fn tracked_image_try_clone_reserves_and_releases() {
+    let tracker = MemoryTracker::with_limit(1_000_000);
+    let alloc_size = Image::<f32>::allocation_size((50, 50));
+    let img = Image::<f32>::new_tracked((50, 50), &tracker).unwrap();
+    assert_eq!(tracker.allocated(), alloc_size);
+
+    let clone = img.try_clone().unwrap();
+    assert_eq!(tracker.allocated(), alloc_size * 2);
+
+    drop(clone);
+    assert_eq!(tracker.allocated(), alloc_size);
+
+    drop(img);
+    assert_eq!(tracker.allocated(), 0);
+}
+
+#[test]
+fn tracked_image_exceeds_budget() {
+    let tracker = MemoryTracker::with_limit(1000);
+    // A 100x100 f32 image needs ~40000 bytes, well over the 1000 byte limit
+    assert!(Image::<f32>::new_tracked((100, 100), &tracker).is_err());
+    assert_eq!(
+        tracker.allocated(),
+        0,
+        "budget should be rolled back on failure"
+    );
+}
+
+#[test]
+fn tracked_try_clone_exceeds_budget() {
+    let alloc_size = Image::<f32>::allocation_size((50, 50));
+    // Budget for exactly one image
+    let tracker = MemoryTracker::with_limit(alloc_size);
+    let img = Image::<f32>::new_tracked((50, 50), &tracker).unwrap();
+    assert_eq!(tracker.allocated(), alloc_size);
+
+    // Clone should fail — no budget left
+    assert!(img.try_clone().is_err());
+    assert_eq!(tracker.allocated(), alloc_size, "original still tracked");
+
+    drop(img);
+    assert_eq!(tracker.allocated(), 0);
+}
+
+#[test]
+fn untracked_image_ignores_tracker() {
+    let tracker = MemoryTracker::with_limit(1_000_000);
+    {
+        let _img = Image::<f32>::new((100, 100)).unwrap();
+        assert_eq!(
+            tracker.allocated(),
+            0,
+            "untracked image should not affect tracker"
+        );
+    }
+    assert_eq!(tracker.allocated(), 0);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/image/typed.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/typed.rs
new file mode 100644
index 00000000..f979fb70
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/image/typed.rs
@@ -0,0 +1,442 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{fmt::Debug, marker::PhantomData};
+
+use crate::{
+    error::Result,
+    image::internal::DistinctRowsIndexes,
+    util::{CACHE_LINE_BYTE_SIZE, MemoryGuard, MemoryTracker, tracing_wrappers::*},
+};
+
+use super::{ImageDataType, OwnedRawImage, RawImageRect, RawImageRectMut, Rect};
+
+/// Cast a `&[u8]` row to `&[T]`.
+///
+/// With `allow-unsafe`, uses a direct pointer cast (zero overhead). The caller
+/// must uphold the alignment/size invariants established at construction time.
+/// Without `allow-unsafe`, delegates to `bytemuck::cast_slice` which validates
+/// alignment and size on every call.
+#[cfg(feature = "allow-unsafe")]
+#[inline(always)]
+pub(super) fn cast_row<T: ImageDataType>(row: &[u8]) -> &[T] {
+    let new_len = row.len() / std::mem::size_of::<T>();
+    debug_assert!(row.len().is_multiple_of(std::mem::size_of::<T>()));
+    debug_assert!((row.as_ptr() as usize).is_multiple_of(std::mem::align_of::<T>()));
+    #[allow(unsafe_code)]
+    // SAFETY: Alignment and size invariants verified at Image/ImageRect construction
+    // (from_raw asserts both data.is_aligned(T::DATA_TYPE_ID.size()) and that the byte
+    // offset is a multiple of the element size, so every row pointer is aligned to
+    // align_of::<T>()).
+    // The underlying buffer is cache-line aligned (64 bytes ≥ align_of::<T>()),
+    // bytes_per_row = width * sizeof(T), bytes_between_rows is a multiple of
+    // CACHE_LINE_BYTE_SIZE.
+    unsafe {
+        std::slice::from_raw_parts(row.as_ptr().cast::<T>(), new_len)
+    }
+}
+
+#[cfg(not(feature = "allow-unsafe"))]
+#[inline(always)]
+pub(super) fn cast_row<T: ImageDataType>(row: &[u8]) -> &[T] {
+    bytemuck::cast_slice(row)
+}
+
+/// Cast a `&mut [u8]` row to `&mut [T]`. See [`cast_row`] for safety rationale.
+#[cfg(feature = "allow-unsafe")]
+#[inline(always)]
+pub(super) fn cast_row_mut<T: ImageDataType>(row: &mut [u8]) -> &mut [T] {
+    let new_len = row.len() / std::mem::size_of::<T>();
+    debug_assert!(row.len().is_multiple_of(std::mem::size_of::<T>()));
+    debug_assert!((row.as_ptr() as usize).is_multiple_of(std::mem::align_of::<T>()));
+    #[allow(unsafe_code)]
+    // SAFETY: Same invariants as cast_row, plus exclusive (&mut) access.
+    unsafe {
+        std::slice::from_raw_parts_mut(row.as_mut_ptr().cast::<T>(), new_len)
+    }
+}
+
+#[cfg(not(feature = "allow-unsafe"))]
+#[inline(always)]
+pub(super) fn cast_row_mut<T: ImageDataType>(row: &mut [u8]) -> &mut [T] {
+    bytemuck::cast_slice_mut(row)
+}
+
+#[repr(transparent)]
+pub struct Image<T: ImageDataType> {
+    // Safety invariant: self.raw.data and self.raw.byte_offset().0 are aligned to
+    // T::DATA_TYPE_ID.size().
+    raw: OwnedRawImage,
+    _ph: PhantomData<T>,
+}
+
+impl<T: ImageDataType> Image<T> {
+    #[instrument(ret, err)]
+    pub fn new_with_padding(
+        size: (usize, usize),
+        offset: (usize, usize),
+        padding: (usize, usize),
+    ) -> Result<Image<T>> {
+        let s = T::DATA_TYPE_ID.size();
+        let img = OwnedRawImage::new_zeroed_with_padding(
+            (size.0 * s, size.1),
+            (offset.0 * s, offset.1),
+            (padding.0 * s, padding.1),
+        )?;
+        Ok(Self::from_raw(img))
+    }
+
+    #[instrument(ret, err)]
+    pub fn new(size: (usize, usize)) -> Result<Image<T>> {
+        Self::new_with_padding(size, (0, 0), (0, 0))
+    }
+
+    /// Allocates an uninitialized image buffer.
+    ///
+    /// With the `allow-unsafe` feature, the memory is left truly uninitialized
+    /// (saving page-fault and zeroing costs). Without it, the buffer is zeroed.
+    ///
+    /// # Safety contract
+    /// The caller MUST write every pixel before reading it.
+    pub fn new_uninit(size: (usize, usize)) -> Result<Image<T>> {
+        let s = T::DATA_TYPE_ID.size();
+        let img = OwnedRawImage::new_uninit((size.0 * s, size.1))?;
+        Ok(Self::from_raw(img))
+    }
+
+    pub fn new_with_value(size: (usize, usize), value: T) -> Result<Image<T>> {
+        // TODO(veluca): skip zero-initializing the allocation if this becomes
+        // performance-sensitive.
+        let mut ret = Self::new(size)?;
+        ret.fill(value);
+        Ok(ret)
+    }
+
+    /// Computes the allocation size in bytes for an image of the given dimensions.
+    /// This accounts for cache-line alignment of rows.
+    pub fn allocation_size(size: (usize, usize)) -> u64 {
+        let (width, height) = size;
+        if width == 0 || height == 0 {
+            return 0;
+        }
+        let bytes_per_row = width.saturating_mul(T::DATA_TYPE_ID.size());
+        let bytes_between_rows =
+            bytes_per_row.div_ceil(CACHE_LINE_BYTE_SIZE) * CACHE_LINE_BYTE_SIZE;
+        let total = (height - 1)
+            .saturating_mul(bytes_between_rows)
+            .saturating_add(bytes_per_row);
+        total as u64
+    }
+
+    /// Creates a new image after checking the memory tracker budget.
+    /// The image tracks its allocation and releases the budget on drop.
+    #[instrument(ret, err)]
+    pub fn new_tracked(size: (usize, usize), tracker: &MemoryTracker) -> Result<Image<T>> {
+        let alloc_size = Self::allocation_size(size);
+        tracker.try_allocate(alloc_size)?;
+        // Guard ensures budget is rolled back if the allocation below fails.
+        let guard = MemoryGuard::new(tracker.clone(), alloc_size);
+        let mut img = Self::new(size)?;
+        img.raw.set_tracker(tracker.clone(), alloc_size);
+        guard.disarm(); // Ownership transferred to OwnedRawImage's Drop.
+        Ok(img)
+    }
+
+    /// Creates a new image with padding after checking the memory tracker budget.
+    /// The image tracks its allocation and releases the budget on drop.
+    #[instrument(ret, err)]
+    pub fn new_with_padding_tracked(
+        size: (usize, usize),
+        offset: (usize, usize),
+        padding: (usize, usize),
+        tracker: &MemoryTracker,
+    ) -> Result<Image<T>> {
+        let total_width = size.0.saturating_add(offset.0).saturating_add(padding.0);
+        let total_height = size.1.saturating_add(offset.1).saturating_add(padding.1);
+        let alloc_size = Self::allocation_size((total_width, total_height));
+        tracker.try_allocate(alloc_size)?;
+        let guard = MemoryGuard::new(tracker.clone(), alloc_size);
+        let mut img = Self::new_with_padding(size, offset, padding)?;
+        img.raw.set_tracker(tracker.clone(), alloc_size);
+        guard.disarm();
+        Ok(img)
+    }
+
+    #[inline]
+    pub fn size(&self) -> (usize, usize) {
+        (
+            self.raw.byte_size().0 / T::DATA_TYPE_ID.size(),
+            self.raw.byte_size().1,
+        )
+    }
+
+    pub fn offset(&self) -> (usize, usize) {
+        (
+            self.raw.byte_offset().0 / T::DATA_TYPE_ID.size(),
+            self.raw.byte_offset().1,
+        )
+    }
+
+    pub fn padding(&self) -> (usize, usize) {
+        (
+            self.raw.byte_padding().0 / T::DATA_TYPE_ID.size(),
+            self.raw.byte_padding().1,
+        )
+    }
+
+    pub fn fill(&mut self, v: T) {
+        if self.size().0 == 0 {
+            return;
+        }
+        for y in 0..self.size().1 {
+            self.row_mut(y).fill(v);
+        }
+    }
+
+    #[inline]
+    pub fn get_rect_including_padding_mut(&mut self, rect: Rect) -> ImageRectMut<'_, T> {
+        ImageRectMut::from_raw(
+            self.raw
+                .get_rect_including_padding_mut(rect.to_byte_rect(T::DATA_TYPE_ID)),
+        )
+    }
+
+    #[inline]
+    pub fn get_rect_including_padding(&mut self, rect: Rect) -> ImageRect<'_, T> {
+        ImageRect::from_raw(
+            self.raw
+                .get_rect_including_padding(rect.to_byte_rect(T::DATA_TYPE_ID)),
+        )
+    }
+
+    #[inline]
+    pub fn get_rect_mut(&mut self, rect: Rect) -> ImageRectMut<'_, T> {
+        ImageRectMut::from_raw(self.raw.get_rect_mut(rect.to_byte_rect(T::DATA_TYPE_ID)))
+    }
+
+    #[inline]
+    pub fn get_rect(&self, rect: Rect) -> ImageRect<'_, T> {
+        ImageRect::from_raw(self.raw.get_rect(rect.to_byte_rect(T::DATA_TYPE_ID)))
+    }
+
+    pub fn try_clone(&self) -> Result<Self> {
+        Ok(Self::from_raw(self.raw.try_clone()?))
+    }
+
+    pub fn into_raw(self) -> OwnedRawImage {
+        self.raw
+    }
+
+    pub fn from_raw(raw: OwnedRawImage) -> Self {
+        const { assert!(CACHE_LINE_BYTE_SIZE.is_multiple_of(T::DATA_TYPE_ID.size())) };
+        assert!(raw.data.is_aligned(T::DATA_TYPE_ID.size()));
+        assert!(
+            raw.byte_offset().0.is_multiple_of(T::DATA_TYPE_ID.size()),
+            "image byte offset must be aligned to element size"
+        );
+        Image {
+            raw,
+            _ph: PhantomData,
+        }
+    }
+
+    #[inline(always)]
+    pub fn row(&self, row: usize) -> &[T] {
+        cast_row(self.raw.row(row))
+    }
+
+    #[inline(always)]
+    pub fn row_mut(&mut self, row: usize) -> &mut [T] {
+        cast_row_mut(self.raw.row_mut(row))
+    }
+
+    /// Note: this is quadratic in the number of rows. Indexing *ignores any padding rows*, i.e.
+    /// the row at index 0 will be the first row of the *padding*, unlike with all the other row
+    /// accessors.
+    #[inline(always)]
+    pub fn distinct_full_rows_mut<I: DistinctRowsIndexes>(
+        &mut self,
+        rows: I,
+    ) -> I::CastOutput<'_, T> {
+        let rows = self.raw.data.distinct_rows_mut(rows);
+        I::cast_rows(rows)
+    }
+
+    /// Returns mutable slices for all rows. Each slice has exactly `width`
+    /// elements where width = self.size().0. Rows are disjoint within the
+    /// underlying buffer (separated by cache-line-aligned stride).
+    pub fn all_rows_mut(&mut self) -> Vec<&mut [T]> {
+        let (bytes_per_row, num_rows, bytes_between_rows) = self.raw.data.dimensions();
+        if num_rows == 0 {
+            return Vec::new();
+        }
+        let data = self.raw.data.data_slice_mut();
+        // Use a recursive split pattern that the borrow checker can track.
+        // split_rows_recursive handles the "remaining slice" ownership chain.
+        let mut result = Vec::with_capacity(num_rows);
+        split_rows_into(
+            data,
+            bytes_per_row,
+            bytes_between_rows,
+            num_rows,
+            &mut result,
+        );
+        result
+    }
+}
+
+/// Splits a byte slice into per-row mutable `&mut [T]` slices.
+/// Each row is `bytes_per_row` bytes wide, rows are `bytes_between_rows` apart,
+/// and the total spans `num_rows` rows.
+///
+/// Uses a `while let` loop with `Option<&mut [u8]>` to satisfy the borrow
+/// checker: `take()` moves ownership out, `split_at_mut` produces two disjoint
+/// halves, and we re-insert the remainder for the next iteration.
+fn split_rows_into<'a, T: ImageDataType>(
+    data: &'a mut [u8],
+    bytes_per_row: usize,
+    bytes_between_rows: usize,
+    num_rows: usize,
+    out: &mut Vec<&'a mut [T]>,
+) {
+    let mut remaining: Option<&'a mut [u8]> = Some(data);
+    for i in 0..num_rows {
+        let data = remaining.take().unwrap();
+        if i < num_rows - 1 {
+            let (head, tail) = data.split_at_mut(bytes_between_rows);
+            out.push(cast_row_mut(&mut head[..bytes_per_row]));
+            remaining = Some(tail);
+        } else {
+            out.push(cast_row_mut(&mut data[..bytes_per_row]));
+        }
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct ImageRect<'a, T: ImageDataType> {
+    // Invariant: self.raw.is_aligned(T::DATA_TYPE_ID.size()) is true.
+    raw: RawImageRect<'a>,
+    _ph: PhantomData<T>,
+}
+
+impl<'a, T: ImageDataType> ImageRect<'a, T> {
+    #[inline(always)]
+    pub fn rect(&self, rect: Rect) -> ImageRect<'a, T> {
+        Self::from_raw(self.raw.rect(rect.to_byte_rect(T::DATA_TYPE_ID)))
+    }
+
+    #[inline]
+    pub fn size(&self) -> (usize, usize) {
+        (
+            self.raw.byte_size().0 / T::DATA_TYPE_ID.size(),
+            self.raw.byte_size().1,
+        )
+    }
+
+    #[inline(always)]
+    pub fn row(&self, row: usize) -> &'a [T] {
+        // RawImageRect::row() returns &'a [u8] (the lifetime of the underlying storage),
+        // and cast_row preserves that lifetime.
+        cast_row(self.raw.row(row))
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = T> + '_ {
+        (0..self.size().1).flat_map(|x| self.row(x).iter().cloned())
+    }
+
+    pub fn into_raw(self) -> RawImageRect<'a> {
+        self.raw
+    }
+
+    #[inline]
+    pub fn from_raw(raw: RawImageRect<'a>) -> Self {
+        const { assert!(CACHE_LINE_BYTE_SIZE.is_multiple_of(T::DATA_TYPE_ID.size())) };
+        assert!(raw.is_aligned(T::DATA_TYPE_ID.size()));
+        ImageRect {
+            raw,
+            _ph: PhantomData,
+        }
+    }
+}
+
+pub struct ImageRectMut<'a, T: ImageDataType> {
+    // Invariant: self.raw.is_aligned(T::DATA_TYPE_ID.size()) is true.
+    raw: RawImageRectMut<'a>,
+    _ph: PhantomData<T>,
+}
+
+impl<'a, T: ImageDataType> ImageRectMut<'a, T> {
+    #[inline]
+    pub fn rect(&'a mut self, rect: Rect) -> ImageRectMut<'a, T> {
+        Self::from_raw(self.raw.rect_mut(rect.to_byte_rect(T::DATA_TYPE_ID)))
+    }
+
+    #[inline]
+    pub fn size(&self) -> (usize, usize) {
+        (
+            self.raw.byte_size().0 / T::DATA_TYPE_ID.size(),
+            self.raw.byte_size().1,
+        )
+    }
+
+    #[inline(always)]
+    pub fn row(&mut self, row: usize) -> &mut [T] {
+        cast_row_mut(self.raw.row(row))
+    }
+
+    pub fn as_rect(&'a self) -> ImageRect<'a, T> {
+        ImageRect::from_raw(self.raw.as_rect())
+    }
+
+    pub fn into_raw(self) -> RawImageRectMut<'a> {
+        self.raw
+    }
+
+    #[inline]
+    pub fn from_raw(raw: RawImageRectMut<'a>) -> Self {
+        const { assert!(CACHE_LINE_BYTE_SIZE.is_multiple_of(T::DATA_TYPE_ID.size())) };
+        assert!(raw.is_aligned(T::DATA_TYPE_ID.size()));
+        ImageRectMut {
+            raw,
+            _ph: PhantomData,
+        }
+    }
+}
+
+impl<T: ImageDataType> Debug for Image<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{:?} {}x{}",
+            T::DATA_TYPE_ID,
+            self.size().0,
+            self.size().1
+        )
+    }
+}
+
+impl<T: ImageDataType> Debug for ImageRect<'_, T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{:?} rect {}x{}",
+            T::DATA_TYPE_ID,
+            self.size().0,
+            self.size().1
+        )
+    }
+}
+
+impl<T: ImageDataType> Debug for ImageRectMut<'_, T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{:?} mutrect {}x{}",
+            T::DATA_TYPE_ID,
+            self.size().0,
+            self.size().1
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/data.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/data.rs
new file mode 100644
index 00000000..212d238d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/data.rs
@@ -0,0 +1,168 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Data structures for reconstructed JPEG metadata.
+
+/// Classification of APP markers.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+pub enum AppMarkerType {
+    Unknown = 0,
+    Icc = 1,
+    Exif = 2,
+    Xmp = 3,
+}
+
+impl AppMarkerType {
+    pub(crate) fn from_u32(v: u32) -> Option<Self> {
+        match v {
+            0 => Some(Self::Unknown),
+            1 => Some(Self::Icc),
+            2 => Some(Self::Exif),
+            3 => Some(Self::Xmp),
+            _ => None,
+        }
+    }
+}
+
+/// JPEG quantization table.
+#[derive(Debug, Clone)]
+pub struct JpegQuantTable {
+    /// 64 quantization values in natural (row-major) order.
+    pub values: [i32; 64],
+    /// Precision: 0 = 8-bit, 1 = 16-bit.
+    pub precision: u32,
+    /// DQT table index (0-3).
+    pub index: u32,
+    /// Whether this is the last table in its DQT marker.
+    pub is_last: bool,
+}
+
+/// JPEG Huffman code table.
+#[derive(Debug, Clone)]
+pub struct JpegHuffmanCode {
+    /// Whether this is an AC table (true) or DC table (false).
+    pub is_ac: bool,
+    /// Table ID (0-3).
+    pub id: u32,
+    /// Whether this is the last table in its DHT marker.
+    pub is_last: bool,
+    /// Number of codes at each bit length (1-16). Index 0 = 1-bit codes.
+    pub counts: [u32; 16],
+    /// Symbol values, ordered by code length then value.
+    pub values: Vec<u8>,
+}
+
+/// JPEG image component.
+#[derive(Debug, Clone)]
+pub struct JpegComponent {
+    /// Component ID byte.
+    pub id: u32,
+    /// Horizontal sampling factor (1-4).
+    pub h_samp_factor: u32,
+    /// Vertical sampling factor (1-4).
+    pub v_samp_factor: u32,
+    /// Index into `JpegData::quant` for this component's quant table.
+    pub quant_idx: u32,
+    /// Width in 8x8 blocks.
+    pub width_in_blocks: u32,
+    /// Height in 8x8 blocks.
+    pub height_in_blocks: u32,
+    /// Reconstructed quantized DCT coefficients, block-by-block in raster order.
+    /// Each block has 64 coefficients in natural (row-major) order.
+    pub coeffs: Vec<i16>,
+}
+
+/// JPEG scan information.
+#[derive(Debug, Clone)]
+pub struct JpegScanInfo {
+    /// Number of components in this scan (1-4).
+    pub num_components: u32,
+    /// Component indices (into JpegData::components).
+    pub component_indices: Vec<u32>,
+    /// DC Huffman table index per component.
+    pub dc_tbl_idx: Vec<u32>,
+    /// AC Huffman table index per component.
+    pub ac_tbl_idx: Vec<u32>,
+    /// Start of spectral selection (Ss).
+    pub ss: u32,
+    /// End of spectral selection (Se).
+    pub se: u32,
+    /// Successive approximation high bit (Ah).
+    pub ah: u32,
+    /// Successive approximation low bit (Al).
+    pub al: u32,
+    /// Block indices where RST markers occur.
+    pub reset_points: Vec<u32>,
+    /// (block_index, num_extra_zero_runs) for extra zero runs before EOB.
+    pub extra_zero_runs: Vec<(u32, u32)>,
+    /// Last needed pass (always 0 for baseline JPEG).
+    #[allow(dead_code)] // Populated from JBRD for progressive JPEG support
+    pub last_needed_pass: u32,
+}
+
+/// JPEG component type classification.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[repr(u8)]
+pub enum JpegComponentType {
+    Gray = 0,
+    YCbCr = 1,
+    Rgb = 2,
+    Custom = 3,
+}
+
+impl JpegComponentType {
+    pub(crate) fn from_u32(v: u32) -> Option<Self> {
+        match v {
+            0 => Some(Self::Gray),
+            1 => Some(Self::YCbCr),
+            2 => Some(Self::Rgb),
+            3 => Some(Self::Custom),
+            _ => None,
+        }
+    }
+}
+
+/// Complete JPEG reconstruction data.
+///
+/// Populated from the JBRD box and reconstructed coefficients. Contains
+/// everything needed to write a byte-exact copy of the original JPEG.
+#[derive(Debug, Clone)]
+pub struct JpegData {
+    /// Image width in pixels.
+    pub width: u32,
+    /// Image height in pixels.
+    pub height: u32,
+    /// Restart interval (from DRI marker, 0 = none).
+    pub restart_interval: u32,
+    /// Raw APP marker data.
+    pub app_data: Vec<Vec<u8>>,
+    /// Classification of each APP marker.
+    #[allow(dead_code)] // Populated from JBRD for marker reconstruction
+    pub app_marker_type: Vec<AppMarkerType>,
+    /// Raw COM marker data.
+    pub com_data: Vec<Vec<u8>>,
+    /// Quantization tables.
+    pub quant: Vec<JpegQuantTable>,
+    /// Huffman code tables.
+    pub huffman_code: Vec<JpegHuffmanCode>,
+    /// Image components.
+    pub components: Vec<JpegComponent>,
+    /// Scan information.
+    pub scan_info: Vec<JpegScanInfo>,
+    /// Marker order (sequence of second bytes of 0xFF XX markers).
+    pub marker_order: Vec<u8>,
+    /// Data between markers.
+    pub inter_marker_data: Vec<Vec<u8>>,
+    /// Data after EOI marker.
+    pub tail_data: Vec<u8>,
+    /// Whether there are any non-zero padding bits.
+    #[allow(dead_code)] // Populated from JBRD for bit-exact reconstruction
+    pub has_zero_padding_bit: bool,
+    /// Individual padding bits.
+    pub padding_bits: Vec<u8>,
+    /// Component type classification.
+    pub component_type: JpegComponentType,
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/jbrd.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/jbrd.rs
new file mode 100644
index 00000000..42a4ade0
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/jbrd.rs
@@ -0,0 +1,486 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! JBRD (JPEG Bitstream Reconstruction Data) decoder.
+//!
+//! Decodes the JBRD box to recover JPEG metadata needed for byte-exact
+//! reconstruction. This is the inverse of the encoder's `encode_jbrd()`.
+
+use crate::error::{Error, Result};
+use crate::util::NewWithCapacity;
+
+use super::data::*;
+
+/// Decode a JBRD box into JPEG metadata.
+///
+/// The `jbrd_data` is the raw content of the `jbrd` ISOBMFF box.
+/// The `width` and `height` are taken from the JXL image header since
+/// the JBRD box doesn't redundantly store them.
+pub fn decode_jbrd(jbrd_data: &[u8], width: u32, height: u32) -> Result<JpegData> {
+    let mut reader = BitReader::new(jbrd_data);
+
+    // is_gray determines number of components
+    let is_gray = reader.read(1)? == 1;
+    let num_components = if is_gray { 1 } else { 3 };
+
+    // Count marker types to know how many of each to expect
+    let mut marker_order = Vec::new();
+    let mut num_scans = 0u32;
+    let mut num_app = 0u32;
+    let mut num_com = 0u32;
+    let mut num_intermarker = 0u32;
+
+    // Read marker order until EOI (0xD9)
+    loop {
+        let marker = reader.read(6)? as u8 + 0xC0;
+        marker_order.push(marker);
+        match marker {
+            0xD9 => break, // EOI
+            0xDA => num_scans += 1,
+            0xE0..=0xEF => num_app += 1,
+            0xFE => num_com += 1,
+            0xFF => num_intermarker += 1,
+            _ => {} // DQT, DHT, DRI, SOF, etc.
+        }
+    }
+
+    // APP marker types and lengths
+    let mut app_marker_type = Vec::<AppMarkerType>::new_with_capacity(num_app as usize)?;
+    let mut app_data_lengths = Vec::<u32>::new_with_capacity(num_app as usize)?;
+    for _ in 0..num_app {
+        let app_type = read_u32_jbrd(&mut reader, &[0, 1], &[(1, 2), (2, 4)])?;
+        let app_mt = AppMarkerType::from_u32(app_type)
+            .ok_or_else(|| Error::InvalidJbrd(format!("invalid app marker type: {app_type}")))?;
+        app_marker_type.push(app_mt);
+
+        let len = reader.read(16)? as u32 + 1;
+        app_data_lengths.push(len);
+    }
+
+    // COM marker lengths
+    let mut com_data_lengths = Vec::<u32>::new_with_capacity(num_com as usize)?;
+    for _ in 0..num_com {
+        let len = reader.read(16)? as u32 + 1;
+        com_data_lengths.push(len);
+    }
+
+    // Quantization tables
+    let num_quant = read_u32_jbrd(&mut reader, &[1, 2, 3, 4], &[])?;
+    let mut quant = Vec::<JpegQuantTable>::new_with_capacity(num_quant as usize)?;
+    for _ in 0..num_quant {
+        let precision = reader.read(1)? as u32;
+        let index = reader.read(2)? as u32;
+        let is_last = reader.read(1)? == 1;
+        quant.push(JpegQuantTable {
+            values: [0i32; 64], // Filled later from codestream's raw quant table
+            precision,
+            index,
+            is_last,
+        });
+    }
+
+    // Component type
+    let comp_type_val = reader.read(2)? as u32;
+    let component_type = JpegComponentType::from_u32(comp_type_val)
+        .ok_or_else(|| Error::InvalidJbrd(format!("invalid component type: {comp_type_val}")))?;
+
+    // Component IDs
+    let mut components = Vec::<JpegComponent>::new_with_capacity(num_components)?;
+    if component_type == JpegComponentType::Custom {
+        let num_comp = read_u32_jbrd(&mut reader, &[1, 2, 3, 4], &[])?;
+        if num_comp as usize != num_components {
+            return Err(Error::InvalidJbrd(format!(
+                "custom component count {num_comp} != {num_components}"
+            )));
+        }
+        for _ in 0..num_comp {
+            let id = reader.read(8)? as u32;
+            components.push(JpegComponent {
+                id,
+                h_samp_factor: 1,
+                v_samp_factor: 1,
+                quant_idx: 0,
+                width_in_blocks: 0,
+                height_in_blocks: 0,
+                coeffs: Vec::new(),
+            });
+        }
+    } else {
+        // Standard component IDs
+        let ids = match component_type {
+            JpegComponentType::Gray => vec![1],
+            JpegComponentType::YCbCr => vec![1, 2, 3],
+            JpegComponentType::Rgb => vec![b'R' as u32, b'G' as u32, b'B' as u32],
+            JpegComponentType::Custom => unreachable!(),
+        };
+        for &id in &ids {
+            components.push(JpegComponent {
+                id,
+                h_samp_factor: 1,
+                v_samp_factor: 1,
+                quant_idx: 0,
+                width_in_blocks: 0,
+                height_in_blocks: 0,
+                coeffs: Vec::new(),
+            });
+        }
+    }
+
+    // Component quant table indices
+    for comp in &mut components {
+        comp.quant_idx = reader.read(2)? as u32;
+    }
+
+    // Huffman codes
+    let num_huff = read_u32_jbrd(&mut reader, &[4], &[(3, 2), (4, 10), (6, 26)])?;
+    let mut huffman_code = Vec::<JpegHuffmanCode>::new_with_capacity(num_huff as usize)?;
+    for _ in 0..num_huff {
+        let is_ac = reader.read(1)? == 1;
+        let id = reader.read(2)? as u32;
+        let is_last = reader.read(1)? == 1;
+
+        // 17 count values (bit lengths 0-16)
+        // counts[0] is always 0 (no 0-bit codes)
+        let _count0 = read_u32_jbrd(&mut reader, &[0, 1], &[(3, 2), (8, 0)])?;
+        let mut counts = [0u32; 16];
+        let mut max_depth_idx = 0;
+        for (i, count) in counts.iter_mut().enumerate() {
+            *count = read_u32_jbrd(&mut reader, &[0, 1], &[(3, 2), (8, 0)])?;
+            if *count > 0 {
+                max_depth_idx = i;
+            }
+        }
+
+        // Remove sentinel symbol from max depth
+        if counts[max_depth_idx] == 0 {
+            return Err(Error::InvalidJbrd("huffman table has no symbols".into()));
+        }
+        counts[max_depth_idx] -= 1;
+
+        // Read symbol values (original count + 1 for sentinel)
+        let num_symbols: u32 = counts.iter().sum::<u32>() + 1; // +1 for sentinel
+        let mut values = Vec::<u8>::new_with_capacity(num_symbols as usize)?;
+        for _ in 0..num_symbols {
+            let val = read_u32_jbrd(&mut reader, &[], &[(2, 0), (2, 4), (4, 8), (8, 1)])?;
+            if val < 256 {
+                values.push(val as u8);
+            }
+            // val == 256 is the sentinel — skip it
+        }
+
+        huffman_code.push(JpegHuffmanCode {
+            is_ac,
+            id,
+            is_last,
+            counts,
+            values,
+        });
+    }
+
+    // Scan info
+    let mut scan_info = Vec::<JpegScanInfo>::new_with_capacity(num_scans as usize)?;
+    for _ in 0..num_scans {
+        let scan_nc = read_u32_jbrd(&mut reader, &[1, 2, 3, 4], &[])?;
+        let ss = reader.read(6)? as u32;
+        let se = reader.read(6)? as u32;
+        let al = reader.read(4)? as u32;
+        let ah = reader.read(4)? as u32;
+
+        let mut component_indices = Vec::<u32>::new_with_capacity(scan_nc as usize)?;
+        let mut ac_tbl_idx = Vec::<u32>::new_with_capacity(scan_nc as usize)?;
+        let mut dc_tbl_idx = Vec::<u32>::new_with_capacity(scan_nc as usize)?;
+        for _ in 0..scan_nc {
+            component_indices.push(reader.read(2)? as u32);
+            ac_tbl_idx.push(reader.read(2)? as u32);
+            dc_tbl_idx.push(reader.read(2)? as u32);
+        }
+
+        let last_needed_pass = read_u32_jbrd(&mut reader, &[0, 1, 2], &[(3, 3)])?;
+
+        scan_info.push(JpegScanInfo {
+            num_components: scan_nc,
+            component_indices,
+            dc_tbl_idx,
+            ac_tbl_idx,
+            ss,
+            se,
+            ah,
+            al,
+            reset_points: Vec::new(),
+            extra_zero_runs: Vec::new(),
+            last_needed_pass,
+        });
+    }
+
+    // Restart interval
+    let restart_interval = if marker_order.contains(&0xDD) {
+        reader.read(16)? as u32
+    } else {
+        0
+    };
+
+    // Scan more info (reset points and extra zero runs)
+    for scan in &mut scan_info {
+        let num_reset_points = read_u32_jbrd(&mut reader, &[0], &[(2, 1), (4, 4), (16, 20)])?;
+        let mut last_block_idx: i64 = -1;
+        for _ in 0..num_reset_points {
+            let diff = read_u32_jbrd(&mut reader, &[0], &[(3, 1), (5, 9), (28, 41)])?;
+            let block_idx = (last_block_idx + 1 + diff as i64) as u32;
+            scan.reset_points.push(block_idx);
+            last_block_idx = block_idx as i64;
+        }
+
+        let num_extra = read_u32_jbrd(&mut reader, &[0], &[(2, 1), (4, 4), (16, 20)])?;
+        let mut last_block_idx: i64 = -1;
+        for _ in 0..num_extra {
+            let num_runs = read_u32_jbrd(&mut reader, &[1], &[(2, 2), (4, 5), (8, 20)])?;
+            let diff = read_u32_jbrd(&mut reader, &[0], &[(3, 1), (5, 9), (28, 41)])?;
+            let block_idx = (last_block_idx + 1 + diff as i64) as u32;
+            scan.extra_zero_runs.push((block_idx, num_runs));
+            last_block_idx = block_idx as i64;
+        }
+    }
+
+    // Inter-marker data lengths
+    let mut inter_marker_data_lengths = Vec::<u32>::new_with_capacity(num_intermarker as usize)?;
+    for _ in 0..num_intermarker {
+        let len = reader.read(16)? as u32;
+        inter_marker_data_lengths.push(len);
+    }
+
+    // Tail data length
+    let tail_len = read_u32_jbrd(&mut reader, &[0], &[(8, 1), (16, 257), (22, 65793)])?;
+
+    // Padding bits
+    let has_zero_padding_bit = reader.read(1)? == 1;
+    let mut padding_bits = Vec::<u8>::new();
+    if has_zero_padding_bit {
+        let nbit = reader.read(24)? as u32;
+        padding_bits.try_reserve(nbit as usize)?;
+        for _ in 0..nbit {
+            padding_bits.push(reader.read(1)? as u8);
+        }
+    }
+
+    // Skip to byte boundary (matching encoder's zero_pad_to_byte)
+    reader.align_to_byte();
+
+    // Brotli-decompress the remaining data
+    let compressed_data = reader.remaining_bytes();
+    let decompressed = brotli_decompress(compressed_data)?;
+
+    // Read data from decompressed stream
+    let mut data_pos = 0;
+
+    // APP marker data (only Unknown type stored in data stream)
+    // Encoder format: [marker_byte, len_hi, len_lo, payload...]
+    // We strip the 3-byte prefix to store just the payload.
+    let mut app_data = Vec::<Vec<u8>>::new_with_capacity(num_app as usize)?;
+    for i in 0..num_app as usize {
+        if app_marker_type[i] != AppMarkerType::Unknown {
+            app_data.push(Vec::new()); // Placeholder for ICC/EXIF/XMP (from container boxes)
+            continue;
+        }
+        let len = app_data_lengths[i] as usize;
+        if data_pos + len > decompressed.len() {
+            return Err(Error::InvalidJbrd("truncated APP data".into()));
+        }
+        // Skip 3-byte prefix (marker_byte + 2-byte length field)
+        let skip = 3.min(len);
+        app_data.push(decompressed[data_pos + skip..data_pos + len].to_vec());
+        data_pos += len;
+    }
+
+    // COM marker data (same format as APP: [marker_byte, len_hi, len_lo, payload...])
+    let mut com_data = Vec::<Vec<u8>>::new_with_capacity(num_com as usize)?;
+    for &com_len in com_data_lengths.iter().take(num_com as usize) {
+        let len = com_len as usize;
+        if data_pos + len > decompressed.len() {
+            return Err(Error::InvalidJbrd("truncated COM data".into()));
+        }
+        let skip = 3.min(len);
+        com_data.push(decompressed[data_pos + skip..data_pos + len].to_vec());
+        data_pos += len;
+    }
+
+    // Inter-marker data
+    let mut inter_marker_data = Vec::<Vec<u8>>::new_with_capacity(num_intermarker as usize)?;
+    for &im_len in inter_marker_data_lengths
+        .iter()
+        .take(num_intermarker as usize)
+    {
+        let len = im_len as usize;
+        if data_pos + len > decompressed.len() {
+            return Err(Error::InvalidJbrd("truncated inter-marker data".into()));
+        }
+        inter_marker_data.push(decompressed[data_pos..data_pos + len].to_vec());
+        data_pos += len;
+    }
+
+    // Tail data
+    let tail_data = if tail_len > 0 {
+        let len = tail_len as usize;
+        if data_pos + len > decompressed.len() {
+            return Err(Error::InvalidJbrd("truncated tail data".into()));
+        }
+        let td = decompressed[data_pos..data_pos + len].to_vec();
+        data_pos += len;
+        td
+    } else {
+        Vec::new()
+    };
+
+    let _ = data_pos; // May have trailing bytes from Brotli padding
+
+    // Initial block dimensions assuming 4:4:4. For subsampled images,
+    // jpeg_reconstruct() overrides these using the frame header's jpeg_upsampling.
+    let xsize_blocks = width.div_ceil(8);
+    let ysize_blocks = height.div_ceil(8);
+    for comp in &mut components {
+        comp.width_in_blocks = xsize_blocks;
+        comp.height_in_blocks = ysize_blocks;
+    }
+
+    Ok(JpegData {
+        width,
+        height,
+        restart_interval,
+        app_data,
+        app_marker_type,
+        com_data,
+        quant,
+        huffman_code,
+        components,
+        scan_info,
+        marker_order,
+        inter_marker_data,
+        tail_data,
+        has_zero_padding_bit,
+        padding_bits,
+        component_type,
+    })
+}
+
+/// Read a JXL U32 value (inverse of write_u32_jbrd).
+fn read_u32_jbrd(
+    reader: &mut BitReader<'_>,
+    direct_values: &[u32],
+    bits_offset: &[(usize, u32)],
+) -> Result<u32> {
+    let selector = reader.read(2)? as usize;
+    if selector < direct_values.len() {
+        Ok(direct_values[selector])
+    } else {
+        let bo_idx = selector - direct_values.len();
+        if bo_idx >= bits_offset.len() {
+            return Err(Error::InvalidJbrd(format!(
+                "invalid u32 selector {selector}"
+            )));
+        }
+        let (bits, offset) = bits_offset[bo_idx];
+        if bits == 0 {
+            Ok(offset)
+        } else {
+            let val = reader.read(bits)? as u32;
+            Ok(val + offset)
+        }
+    }
+}
+
+/// Simple bit reader for JBRD header.
+struct BitReader<'a> {
+    data: &'a [u8],
+    byte_pos: usize,
+    bit_pos: u8, // 0-7, LSB first within each byte
+}
+
+impl<'a> BitReader<'a> {
+    fn new(data: &'a [u8]) -> Self {
+        Self {
+            data,
+            byte_pos: 0,
+            bit_pos: 0,
+        }
+    }
+
+    fn read(&mut self, num_bits: usize) -> Result<u64> {
+        let mut value: u64 = 0;
+        for i in 0..num_bits {
+            if self.byte_pos >= self.data.len() {
+                return Err(Error::InvalidJbrd("unexpected end of JBRD data".into()));
+            }
+            let bit = (self.data[self.byte_pos] >> self.bit_pos) & 1;
+            value |= (bit as u64) << i;
+            self.bit_pos += 1;
+            if self.bit_pos == 8 {
+                self.bit_pos = 0;
+                self.byte_pos += 1;
+            }
+        }
+        Ok(value)
+    }
+
+    fn align_to_byte(&mut self) {
+        if self.bit_pos > 0 {
+            self.bit_pos = 0;
+            self.byte_pos += 1;
+        }
+    }
+
+    fn remaining_bytes(&self) -> &'a [u8] {
+        if self.byte_pos >= self.data.len() {
+            &[]
+        } else {
+            &self.data[self.byte_pos..]
+        }
+    }
+}
+
+/// Brotli-decompress data.
+fn brotli_decompress(compressed: &[u8]) -> Result<Vec<u8>> {
+    use std::io::Read;
+    let mut decompressed = Vec::new();
+    let mut decoder = brotli::Decompressor::new(compressed, 4096);
+    decoder
+        .read_to_end(&mut decompressed)
+        .map_err(|e| Error::InvalidJbrd(format!("brotli decompression failed: {e}")))?;
+    Ok(decompressed)
+}
+
+#[cfg(test)]
+mod fallible_alloc_tests {
+    use super::decode_jbrd;
+    use crate::error::Error;
+
+    /// Regression: `Vec::with_capacity(num_app)` etc. used the infallible
+    /// allocator. A malformed JBRD box could have a marker order that leaves
+    /// `num_app`/`num_com`/etc. so large that capacity reservation aborted
+    /// the process. With the fallible-alloc switch the decoder must surface a
+    /// graceful error (truncated or OOM) instead.
+    #[test]
+    fn malformed_jbrd_does_not_abort_on_oversize_counts() {
+        // 1 byte of zeros: is_gray=0, then marker bits are all zero =>
+        // first marker is 0xC0 (SOF0) ≠ 0xD9 (EOI), and reader runs out of
+        // bytes — truncated. We expect `Error::OutOfBounds`, NOT a panic or
+        // an infallible-alloc abort. This pins the contract that the parser
+        // never aborts on input alone.
+        let bogus = vec![0u8; 1];
+        let res = decode_jbrd(&bogus, 8, 8);
+        match res {
+            Err(Error::OutOfBounds(_)) => {} // expected
+            Err(Error::OutOfMemory(_)) => {} // also acceptable
+            Err(_) => {}                     // other graceful errors fine
+            Ok(_) => panic!("malformed JBRD should not parse successfully"),
+        }
+    }
+
+    /// Empty input must not panic; tests a different code path than the
+    /// 1-byte case (BitReader behavior on a fresh empty buffer).
+    #[test]
+    fn empty_jbrd_returns_error_not_panic() {
+        let res = decode_jbrd(&[], 1, 1);
+        assert!(res.is_err());
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/mod.rs
new file mode 100644
index 00000000..4f5ef926
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/mod.rs
@@ -0,0 +1,95 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! JPEG reconstruction from JXL containers with JBRD boxes.
+//!
+//! When a JPEG file is losslessly transcoded to JXL, the JXL container
+//! includes a `jbrd` (JPEG Bitstream Reconstruction Data) box alongside
+//! the codestream. This module decodes that box and reconstructs the
+//! original JPEG byte-exactly.
+
+pub(crate) mod data;
+mod jbrd;
+mod writer;
+
+pub use jbrd::decode_jbrd;
+pub use writer::write_jpeg;
+
+/// Fill the EXIF / XMP APPn placeholders in a reconstruction [`data::JpegData`]
+/// with the payloads from the JXL container's `Exif` / `xml ` boxes.
+///
+/// When jxl-encoder transcodes a JPEG, it lifts the (first) EXIF and XMP APPn
+/// markers into JXL container boxes, leaving an empty placeholder in the JBRD
+/// `app_data`. Those boxes are parsed *after* the codestream, so the
+/// reconstruction `JpegData` is built with empty placeholders and filled here
+/// (at `take_jpeg_reconstruction` time) once the boxes are available.
+///
+/// `exif` is the raw TIFF payload (the box parser already stripped the JXL
+/// 4-byte offset); `xmp` is the raw XML. Each is re-wrapped with the APP1
+/// marker prefix (`Exif\0\0` / `http://ns.adobe.com/xap/1.0/\0`) the original
+/// JPEG used, so the reconstructed marker is byte-exact.
+/// ICC profile re-chunking: the standard `ICC_PROFILE` APP2 payload size used
+/// by libjpeg / ImageMagick / libjxl (65535 marker - 2 len - 12 tag - 2 seq).
+const ICC_CHUNK_PAYLOAD: usize = 65519;
+
+pub(crate) fn fill_metadata(
+    jpeg: &mut data::JpegData,
+    exif: Option<Vec<u8>>,
+    xmp: Option<Vec<u8>>,
+    icc: Option<&[u8]>,
+) {
+    use data::AppMarkerType;
+    // total_chunks for ICC = the number of empty Icc placeholders.
+    let icc_total = jpeg
+        .app_marker_type
+        .iter()
+        .zip(jpeg.app_data.iter())
+        .filter(|(t, d)| **t == AppMarkerType::Icc && d.is_empty())
+        .count();
+    let mut exif = exif;
+    let mut xmp = xmp;
+    let mut icc_chunk = 0usize;
+    for i in 0..jpeg.app_data.len() {
+        // A non-empty entry is an inline (Unknown-type) marker — leave it.
+        if !jpeg.app_data[i].is_empty() {
+            continue;
+        }
+        match jpeg.app_marker_type[i] {
+            AppMarkerType::Exif => {
+                if let Some(tiff) = exif.take() {
+                    let mut v = b"Exif\0\0".to_vec();
+                    v.extend_from_slice(&tiff);
+                    jpeg.app_data[i] = v;
+                }
+            }
+            AppMarkerType::Xmp => {
+                if let Some(xml) = xmp.take() {
+                    let mut v = b"http://ns.adobe.com/xap/1.0/\0".to_vec();
+                    v.extend_from_slice(&xml);
+                    jpeg.app_data[i] = v;
+                }
+            }
+            AppMarkerType::Icc => {
+                // ICC APP2 markers are re-chunked from the codestream's embedded
+                // ICC profile (the encoder lifts the profile into the JXL color
+                // encoding and tags each original chunk as an empty placeholder).
+                // Each chunk: "ICC_PROFILE\0" + seq(1-based) + total + payload.
+                if let Some(icc) = icc {
+                    let start = icc_chunk * ICC_CHUNK_PAYLOAD;
+                    if start < icc.len() && icc_total <= u8::MAX as usize {
+                        let end = (start + ICC_CHUNK_PAYLOAD).min(icc.len());
+                        let mut v = b"ICC_PROFILE\0".to_vec();
+                        v.push((icc_chunk + 1) as u8);
+                        v.push(icc_total as u8);
+                        v.extend_from_slice(&icc[start..end]);
+                        jpeg.app_data[i] = v;
+                    }
+                }
+                icc_chunk += 1;
+            }
+            _ => {}
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/writer.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/writer.rs
new file mode 100644
index 00000000..eba60058
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/jpeg/writer.rs
@@ -0,0 +1,1039 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! JPEG bitstream writer for reconstruction from JXL.
+//!
+//! Writes a valid JPEG file from reconstructed coefficient data and
+//! JBRD metadata (Huffman tables, quant tables, scan headers, markers).
+
+use crate::error::{Error, Result};
+
+use super::data::*;
+
+/// JPEG zigzag scan order: maps zigzag position → natural (row-major) position.
+#[rustfmt::skip]
+const ZIGZAG: [usize; 64] = [
+     0,  1,  8, 16,  9,  2,  3, 10,
+    17, 24, 32, 25, 18, 11,  4,  5,
+    12, 19, 26, 33, 40, 48, 41, 34,
+    27, 20, 13,  6,  7, 14, 21, 28,
+    35, 42, 49, 56, 57, 50, 43, 36,
+    29, 22, 15, 23, 30, 37, 44, 51,
+    58, 59, 52, 45, 38, 31, 39, 46,
+    53, 60, 61, 54, 47, 55, 62, 63,
+];
+
+/// Write a complete JPEG file from reconstructed data.
+///
+/// Returns the byte-exact original JPEG.
+pub fn write_jpeg(jpeg: &JpegData) -> Result<Vec<u8>> {
+    let mut out = Vec::new();
+
+    {
+        let mut writer = JpegWriter::new(&mut out);
+
+        // SOI
+        writer.write_marker(0xD8)?;
+
+        // Process markers in original order
+        let mut app_idx = 0usize;
+        let mut com_idx = 0usize;
+        let mut scan_idx = 0usize;
+        let mut dqt_idx = 0usize;
+        let mut dht_idx = 0usize;
+        let mut intermarker_idx = 0usize;
+
+        // Active Huffman encode tables, updated as each DHT marker is emitted.
+        // A progressive JPEG redefines the same table slots (e.g. AC table 0)
+        // between scans, so the writer must use the table in force at each SOS
+        // rather than a single set built from every huffman_code entry.
+        let mut active_dc: [Option<HuffmanEncodeTable>; 4] = [None, None, None, None];
+        let mut active_ac: [Option<HuffmanEncodeTable>; 4] = [None, None, None, None];
+
+        for &marker in &jpeg.marker_order {
+            match marker {
+                0xD9 => {
+                    // EOI
+                    writer.write_marker(0xD9)?;
+                }
+                0xDA => {
+                    // SOS - write scan header + entropy-coded data
+                    if scan_idx >= jpeg.scan_info.len() {
+                        return Err(Error::InvalidJbrd("too many SOS markers".into()));
+                    }
+                    writer.write_sos(jpeg, scan_idx, &active_dc, &active_ac)?;
+                    scan_idx += 1;
+                }
+                0xE0..=0xEF => {
+                    // APP markers
+                    if app_idx >= jpeg.app_data.len() {
+                        return Err(Error::InvalidJbrd("too many APP markers".into()));
+                    }
+                    writer.write_app_marker(marker, &jpeg.app_data[app_idx])?;
+                    app_idx += 1;
+                }
+                0xFE => {
+                    // COM
+                    if com_idx >= jpeg.com_data.len() {
+                        return Err(Error::InvalidJbrd("too many COM markers".into()));
+                    }
+                    writer.write_com_marker(&jpeg.com_data[com_idx])?;
+                    com_idx += 1;
+                }
+                0xDB => {
+                    // DQT
+                    writer.write_dqt(jpeg, &mut dqt_idx)?;
+                }
+                0xC4 => {
+                    // DHT — emits the table bytes AND updates the active tables.
+                    writer.write_dht(jpeg, &mut dht_idx, &mut active_dc, &mut active_ac)?;
+                }
+                0xC0..=0xC2 => {
+                    // SOF0 (baseline) / SOF1 (extended sequential) / SOF2
+                    // (progressive). Emit the exact SOF marker the original
+                    // used — dropping it (the old `_ =>` fall-through) lost a
+                    // whole SOF segment and corrupted the marker stream.
+                    writer.write_sof(jpeg, marker)?;
+                }
+                0xDD => {
+                    // DRI
+                    writer.write_dri(jpeg.restart_interval)?;
+                }
+                0xFF => {
+                    // Inter-marker data
+                    if intermarker_idx >= jpeg.inter_marker_data.len() {
+                        return Err(Error::InvalidJbrd("too many inter-marker data".into()));
+                    }
+                    writer.write_intermarker_data(&jpeg.inter_marker_data[intermarker_idx]);
+                    intermarker_idx += 1;
+                }
+                _ => {
+                    // Other markers (SOF1, etc.) — shouldn't appear for baseline
+                }
+            }
+        }
+    }
+
+    // Tail data (bytes after EOI)
+    out.extend_from_slice(&jpeg.tail_data);
+
+    Ok(out)
+}
+
+/// JPEG bitstream writer.
+struct JpegWriter<'a> {
+    out: &'a mut Vec<u8>,
+}
+
+impl<'a> JpegWriter<'a> {
+    fn new(out: &'a mut Vec<u8>) -> Self {
+        Self { out }
+    }
+
+    fn write_intermarker_data(&mut self, data: &[u8]) {
+        self.out.extend_from_slice(data);
+    }
+
+    fn write_marker(&mut self, marker: u8) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(marker);
+        Ok(())
+    }
+
+    fn write_app_marker(&mut self, marker: u8, data: &[u8]) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(marker);
+        // APP data includes marker_byte + length + payload in encoder format
+        // But in the JBRD decoder, data is the raw payload as stored
+        // The length field covers the payload + 2 bytes for the length itself
+        let len = (data.len() + 2) as u16;
+        self.out.extend_from_slice(&len.to_be_bytes());
+        self.out.extend_from_slice(data);
+        Ok(())
+    }
+
+    fn write_com_marker(&mut self, data: &[u8]) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(0xFE);
+        let len = (data.len() + 2) as u16;
+        self.out.extend_from_slice(&len.to_be_bytes());
+        self.out.extend_from_slice(data);
+        Ok(())
+    }
+
+    fn write_dri(&mut self, restart_interval: u32) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(0xDD);
+        self.out.extend_from_slice(&4u16.to_be_bytes()); // length = 4
+        self.out
+            .extend_from_slice(&(restart_interval as u16).to_be_bytes());
+        Ok(())
+    }
+
+    fn write_dqt(&mut self, jpeg: &JpegData, idx: &mut usize) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(0xDB);
+
+        // Collect tables until is_last
+        let start = *idx;
+        let mut total_payload = 0usize;
+        loop {
+            if *idx >= jpeg.quant.len() {
+                return Err(Error::InvalidJbrd("too many DQT tables".into()));
+            }
+            let qt = &jpeg.quant[*idx];
+            let precision_bytes = if qt.precision == 0 { 1 } else { 2 };
+            total_payload += 1 + 64 * precision_bytes; // 1 byte for Pq|Tq
+            let is_last = qt.is_last;
+            *idx += 1;
+            if is_last {
+                break;
+            }
+        }
+
+        let length = (total_payload + 2) as u16;
+        self.out.extend_from_slice(&length.to_be_bytes());
+
+        for i in start..*idx {
+            let qt = &jpeg.quant[i];
+            let pq_tq = ((qt.precision as u8) << 4) | (qt.index as u8);
+            self.out.push(pq_tq);
+            if qt.precision == 0 {
+                // 8-bit values in zigzag order
+                for &zi in &ZIGZAG {
+                    self.out.push(qt.values[zi] as u8);
+                }
+            } else {
+                // 16-bit values in zigzag order
+                for &zi in &ZIGZAG {
+                    self.out
+                        .extend_from_slice(&(qt.values[zi] as u16).to_be_bytes());
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn write_dht(
+        &mut self,
+        jpeg: &JpegData,
+        idx: &mut usize,
+        active_dc: &mut [Option<HuffmanEncodeTable>; 4],
+        active_ac: &mut [Option<HuffmanEncodeTable>; 4],
+    ) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(0xC4);
+
+        // Collect tables until is_last
+        let start = *idx;
+        let mut total_payload = 0usize;
+        loop {
+            if *idx >= jpeg.huffman_code.len() {
+                return Err(Error::InvalidJbrd("too many DHT tables".into()));
+            }
+            let hc = &jpeg.huffman_code[*idx];
+            let num_values: u32 = hc.counts.iter().sum();
+            total_payload += 1 + 16 + num_values as usize;
+            let is_last = hc.is_last;
+            *idx += 1;
+            if is_last {
+                break;
+            }
+        }
+
+        let length = (total_payload + 2) as u16;
+        self.out.extend_from_slice(&length.to_be_bytes());
+
+        for i in start..*idx {
+            let hc = &jpeg.huffman_code[i];
+            let tc_th = if hc.is_ac { 0x10 } else { 0x00 } | (hc.id as u8);
+            self.out.push(tc_th);
+            for &count in &hc.counts {
+                self.out.push(count as u8);
+            }
+            for &val in &hc.values {
+                self.out.push(val);
+            }
+            // Update the active table set for subsequent scans.
+            let table = HuffmanEncodeTable::from_counts_values(&hc.counts, &hc.values);
+            if hc.is_ac {
+                active_ac[hc.id as usize] = Some(table);
+            } else {
+                active_dc[hc.id as usize] = Some(table);
+            }
+        }
+
+        Ok(())
+    }
+
+    fn write_sof(&mut self, jpeg: &JpegData, marker: u8) -> Result<()> {
+        self.out.push(0xFF);
+        self.out.push(marker);
+
+        let nc = jpeg.components.len();
+        let length = (8 + 3 * nc) as u16;
+        self.out.extend_from_slice(&length.to_be_bytes());
+
+        self.out.push(8); // sample precision = 8 bits
+        self.out
+            .extend_from_slice(&(jpeg.height as u16).to_be_bytes());
+        self.out
+            .extend_from_slice(&(jpeg.width as u16).to_be_bytes());
+        self.out.push(nc as u8);
+
+        for comp in &jpeg.components {
+            self.out.push(comp.id as u8);
+            let hv = ((comp.h_samp_factor as u8) << 4) | (comp.v_samp_factor as u8);
+            self.out.push(hv);
+            self.out.push(comp.quant_idx as u8);
+        }
+
+        Ok(())
+    }
+
+    fn write_sos(
+        &mut self,
+        jpeg: &JpegData,
+        scan_idx: usize,
+        active_dc: &[Option<HuffmanEncodeTable>; 4],
+        active_ac: &[Option<HuffmanEncodeTable>; 4],
+    ) -> Result<()> {
+        let scan = &jpeg.scan_info[scan_idx];
+
+        // SOS header
+        self.out.push(0xFF);
+        self.out.push(0xDA);
+
+        let length = (6 + 2 * scan.num_components) as u16;
+        self.out.extend_from_slice(&length.to_be_bytes());
+        self.out.push(scan.num_components as u8);
+
+        for i in 0..scan.num_components as usize {
+            let comp_idx = scan.component_indices[i] as usize;
+            self.out.push(jpeg.components[comp_idx].id as u8);
+            let td_ta = ((scan.dc_tbl_idx[i] as u8) << 4) | (scan.ac_tbl_idx[i] as u8);
+            self.out.push(td_ta);
+        }
+
+        self.out.push(scan.ss as u8);
+        self.out.push(scan.se as u8);
+        let ah_al = ((scan.ah as u8) << 4) | (scan.al as u8);
+        self.out.push(ah_al);
+
+        // Huffman encode coefficients (using the tables in force at this SOS).
+        self.write_scan_data(jpeg, scan_idx, active_dc, active_ac)?;
+
+        Ok(())
+    }
+
+    fn write_scan_data(
+        &mut self,
+        jpeg: &JpegData,
+        scan_idx: usize,
+        dc_tables: &[Option<HuffmanEncodeTable>; 4],
+        ac_tables: &[Option<HuffmanEncodeTable>; 4],
+    ) -> Result<()> {
+        let scan = &jpeg.scan_info[scan_idx];
+
+        // Progressive / successive-approximation scans (spectral selection +
+        // EOB runs) use a different entropy structure than baseline sequential.
+        if !(scan.ss == 0 && scan.se == 63 && scan.ah == 0 && scan.al == 0) {
+            return self.write_scan_data_progressive(jpeg, scan_idx, dc_tables, ac_tables);
+        }
+
+        let mut bw = BitWriter::new();
+        let mut padding_bit_idx = 0usize;
+        let mut extra_zero_idx = 0usize;
+        // Restart (DRI): emit RSTn every `restart_interval` MCUs. Baseline
+        // restart is interval-driven — the progressive `reset_points` list is
+        // empty for baseline scans, so relying on it dropped every RST marker.
+        let restart_interval = jpeg.restart_interval;
+        let mut restart_counter: u32 = 0;
+        let mut rst_marker_idx: u32 = 0;
+
+        // Track DC predictions (one per component)
+        let mut dc_pred = vec![0i32; jpeg.components.len()];
+
+        // For baseline sequential JPEG (ss=0, se=63, ah=0, al=0):
+        // interleaved components, MCU-based ordering
+        let is_interleaved = scan.num_components > 1;
+
+        // Calculate MCU dimensions
+        let (mcu_rows, mcu_cols) = if is_interleaved {
+            let max_h: u32 = jpeg
+                .components
+                .iter()
+                .map(|c| c.h_samp_factor)
+                .max()
+                .unwrap_or(1);
+            let max_v: u32 = jpeg
+                .components
+                .iter()
+                .map(|c| c.v_samp_factor)
+                .max()
+                .unwrap_or(1);
+            let mcu_cols = jpeg.width.div_ceil(max_h * 8);
+            let mcu_rows = jpeg.height.div_ceil(max_v * 8);
+            (mcu_rows, mcu_cols)
+        } else {
+            let comp_idx = scan.component_indices[0] as usize;
+            let comp = &jpeg.components[comp_idx];
+            (comp.height_in_blocks, comp.width_in_blocks)
+        };
+
+        let mut block_count: u32 = 0;
+
+        for mcu_row in 0..mcu_rows {
+            for mcu_col in 0..mcu_cols {
+                // Restart marker every `restart_interval` MCUs (DRI). The
+                // original encoder pads the partial final byte of each entropy
+                // segment (captured in padding_bits) and resets DC prediction
+                // at the boundary.
+                if restart_interval > 0 && restart_counter == restart_interval {
+                    bw.pad_to_byte(&jpeg.padding_bits, &mut padding_bit_idx);
+                    self.out.extend_from_slice(&bw.finish());
+                    bw = BitWriter::new();
+
+                    let rst_marker = 0xD0 + ((rst_marker_idx % 8) as u8);
+                    self.out.push(0xFF);
+                    self.out.push(rst_marker);
+
+                    dc_pred.fill(0);
+                    rst_marker_idx += 1;
+                    restart_counter = 0;
+                }
+
+                for sci in 0..scan.num_components as usize {
+                    let comp_idx = scan.component_indices[sci] as usize;
+                    let comp = &jpeg.components[comp_idx];
+                    let dc_table = dc_tables[scan.dc_tbl_idx[sci] as usize]
+                        .as_ref()
+                        .ok_or_else(|| Error::InvalidJbrd("missing DC table".into()))?;
+                    let ac_table = ac_tables[scan.ac_tbl_idx[sci] as usize]
+                        .as_ref()
+                        .ok_or_else(|| Error::InvalidJbrd("missing AC table".into()))?;
+
+                    // How many blocks per MCU for this component
+                    let (h_blocks, v_blocks) = if is_interleaved {
+                        (comp.h_samp_factor, comp.v_samp_factor)
+                    } else {
+                        (1, 1)
+                    };
+
+                    for v in 0..v_blocks {
+                        for h in 0..h_blocks {
+                            let (by, bx) = if is_interleaved {
+                                (
+                                    mcu_row * comp.v_samp_factor + v,
+                                    mcu_col * comp.h_samp_factor + h,
+                                )
+                            } else {
+                                (mcu_row, mcu_col)
+                            };
+
+                            if by >= comp.height_in_blocks || bx >= comp.width_in_blocks {
+                                // Padding block — encode as zero
+                                encode_dc(&mut bw, 0, &mut dc_pred[comp_idx], dc_table);
+                                encode_ac_eob(&mut bw, ac_table);
+                            } else {
+                                let block_offset = (by * comp.width_in_blocks + bx) as usize * 64;
+                                let coeffs = &comp.coeffs[block_offset..block_offset + 64];
+
+                                // Check for extra zero runs before this block
+                                while extra_zero_idx < scan.extra_zero_runs.len()
+                                    && scan.extra_zero_runs[extra_zero_idx].0 == block_count
+                                {
+                                    let num_runs = scan.extra_zero_runs[extra_zero_idx].1;
+                                    for _ in 0..num_runs {
+                                        // Emit ZRL (15 zero run, zero amplitude)
+                                        bw.write_huffman(ac_table, 0xF0);
+                                    }
+                                    extra_zero_idx += 1;
+                                }
+
+                                encode_dc(
+                                    &mut bw,
+                                    coeffs[0] as i32,
+                                    &mut dc_pred[comp_idx],
+                                    dc_table,
+                                );
+                                encode_ac(&mut bw, coeffs, ac_table);
+                            }
+
+                            block_count += 1;
+                        }
+                    }
+                }
+
+                restart_counter += 1;
+            }
+        }
+
+        // Flush remaining bits
+        bw.pad_to_byte(&jpeg.padding_bits, &mut padding_bit_idx);
+        self.out.extend_from_slice(&bw.finish());
+
+        Ok(())
+    }
+
+    /// Write a progressive (or successive-approximation refinement) scan.
+    /// Mirrors brunsli's `DoEncodeScan` (jpeg_data_writer.cc): spectral
+    /// selection [Ss,Se] + bit-plane Al, EOB-run buffering, per-block
+    /// `reset_points` (entropy-state flush, NOT a marker) and `extra_zero_runs`.
+    fn write_scan_data_progressive(
+        &mut self,
+        jpeg: &JpegData,
+        scan_idx: usize,
+        dc_tables: &[Option<HuffmanEncodeTable>; 4],
+        ac_tables: &[Option<HuffmanEncodeTable>; 4],
+    ) -> Result<()> {
+        let scan = &jpeg.scan_info[scan_idx];
+        let ss = scan.ss as usize;
+        let se = scan.se as usize;
+        let al = scan.al;
+        let is_refinement = scan.ah > 0;
+
+        let num_comp = scan.num_components as usize;
+        let is_interleaved = num_comp > 1;
+        let max_h = jpeg
+            .components
+            .iter()
+            .map(|c| c.h_samp_factor)
+            .max()
+            .unwrap_or(1);
+        let max_v = jpeg
+            .components
+            .iter()
+            .map(|c| c.v_samp_factor)
+            .max()
+            .unwrap_or(1);
+        let base = &jpeg.components[scan.component_indices[0] as usize];
+        // Interleaved scans walk the MCU grid. Non-interleaved scans walk the
+        // component's NATURAL block grid `DivCeil(dim*samp, 8*max_samp)` — NOT
+        // its MCU-padded `width_in_blocks`, which is wider for luma when the
+        // image dimensions aren't a multiple of `8*max_samp`. Iterating the
+        // extra MCU-padding column/row would misalign `block_scan_index`
+        // (reset_points / extra_zero_runs) and the EOB-run structure. (Block
+        // indexing still uses the MCU-padded `width_in_blocks` stride below.)
+        let (mcus_per_row, mcu_rows) = if is_interleaved {
+            (
+                jpeg.width.div_ceil(8 * max_h),
+                jpeg.height.div_ceil(8 * max_v),
+            )
+        } else {
+            (
+                (jpeg.width * base.h_samp_factor).div_ceil(8 * max_h),
+                (jpeg.height * base.v_samp_factor).div_ceil(8 * max_v),
+            )
+        };
+        let restart_interval = jpeg.restart_interval;
+        let flush_ac_idx = scan.ac_tbl_idx[0] as usize;
+
+        let mut bw = BitWriter::new();
+        let mut cs = DctCodingState::new();
+        let mut padding_bit_idx = 0usize;
+        let mut last_dc = vec![0i32; jpeg.components.len()];
+        let mut restarts_to_go = restart_interval;
+        let mut next_restart_marker = 0u32;
+        let mut block_scan_index: u32 = 0;
+        let mut extra_zero_pos = 0usize;
+        let mut reset_point_pos = 0usize;
+        let zero_block = [0i16; 64];
+
+        for mcu_y in 0..mcu_rows {
+            for mcu_x in 0..mcus_per_row {
+                // Restart marker every `restart_interval` MCUs: flush the EOB
+                // run, pad to a byte, emit RSTn, reset DC prediction.
+                if restart_interval > 0 && restarts_to_go == 0 {
+                    if ss > 0
+                        && let Some(ac) = ac_tables[flush_ac_idx].as_ref()
+                    {
+                        cs.flush(&mut bw, ac);
+                    }
+                    bw.pad_to_byte(&jpeg.padding_bits, &mut padding_bit_idx);
+                    self.out.extend_from_slice(&bw.finish());
+                    bw = BitWriter::new();
+                    self.out.push(0xFF);
+                    self.out.push(0xD0 + next_restart_marker as u8);
+                    next_restart_marker = (next_restart_marker + 1) & 0x7;
+                    restarts_to_go = restart_interval;
+                    last_dc.fill(0);
+                }
+                for sci in 0..num_comp {
+                    let comp_idx = scan.component_indices[sci] as usize;
+                    let comp = &jpeg.components[comp_idx];
+                    let dc_idx = scan.dc_tbl_idx[sci] as usize;
+                    let ac_idx = scan.ac_tbl_idx[sci] as usize;
+                    let (n_blocks_y, n_blocks_x) = if is_interleaved {
+                        (comp.v_samp_factor, comp.h_samp_factor)
+                    } else {
+                        (1, 1)
+                    };
+                    for iy in 0..n_blocks_y {
+                        for ix in 0..n_blocks_x {
+                            let block_y = (mcu_y * n_blocks_y + iy) as usize;
+                            let block_x = (mcu_x * n_blocks_x + ix) as usize;
+
+                            // reset_point: flush the pending EOB run (no marker).
+                            if reset_point_pos < scan.reset_points.len()
+                                && block_scan_index == scan.reset_points[reset_point_pos]
+                            {
+                                if let Some(ac) = ac_tables[ac_idx].as_ref() {
+                                    cs.flush(&mut bw, ac);
+                                }
+                                reset_point_pos += 1;
+                            }
+                            // extra zero runs (extra ZRLs) before this block.
+                            let mut num_zero_runs = 0u32;
+                            if extra_zero_pos < scan.extra_zero_runs.len()
+                                && scan.extra_zero_runs[extra_zero_pos].0 == block_scan_index
+                            {
+                                num_zero_runs = scan.extra_zero_runs[extra_zero_pos].1;
+                                extra_zero_pos += 1;
+                            }
+
+                            // Edge MCUs reference blocks past the component grid
+                            // (MCU padding); those are all-zero.
+                            let coeffs: &[i16] = if block_y < comp.height_in_blocks as usize
+                                && block_x < comp.width_in_blocks as usize
+                            {
+                                let bi = block_y * comp.width_in_blocks as usize + block_x;
+                                &comp.coeffs[bi * 64..bi * 64 + 64]
+                            } else {
+                                &zero_block
+                            };
+
+                            // Each encoder reads only the table relevant to its
+                            // band (DC-only scans never touch the AC table, and
+                            // its DHT may not even be active yet). Supply a
+                            // non-None reference for the unused slot.
+                            let dc = dc_tables[dc_idx].as_ref();
+                            let ac = ac_tables[ac_idx].as_ref();
+                            let any = dc.or(ac).ok_or_else(|| {
+                                Error::InvalidJbrd("no active Huffman table for scan".into())
+                            })?;
+                            let dc = dc.unwrap_or(any);
+                            let ac = ac.unwrap_or(any);
+                            if is_refinement {
+                                encode_refinement(&mut bw, coeffs, ac, ss, se, al, &mut cs);
+                            } else {
+                                encode_block_progressive(
+                                    &mut bw,
+                                    coeffs,
+                                    dc,
+                                    ac,
+                                    ss,
+                                    se,
+                                    al,
+                                    num_zero_runs,
+                                    &mut cs,
+                                    &mut last_dc[comp_idx],
+                                );
+                            }
+                            block_scan_index += 1;
+                        }
+                    }
+                }
+                if restart_interval > 0 {
+                    restarts_to_go -= 1;
+                }
+            }
+        }
+        // Final flush of any pending EOB run + byte padding.
+        if ss > 0
+            && let Some(ac) = ac_tables[flush_ac_idx].as_ref()
+        {
+            cs.flush(&mut bw, ac);
+        }
+        bw.pad_to_byte(&jpeg.padding_bits, &mut padding_bit_idx);
+        self.out.extend_from_slice(&bw.finish());
+        Ok(())
+    }
+}
+
+/// Encode a DC coefficient using DPCM + Huffman.
+fn encode_dc(bw: &mut BitWriter, dc: i32, dc_pred: &mut i32, table: &HuffmanEncodeTable) {
+    let diff = dc - *dc_pred;
+    *dc_pred = dc;
+
+    let (category, extra_bits, extra_len) = categorize(diff);
+    bw.write_huffman(table, category as u8);
+    if extra_len > 0 {
+        bw.write_bits(extra_bits, extra_len);
+    }
+}
+
+/// Encode AC coefficients in zigzag order using run-length + Huffman.
+/// `block` is a 64-element block in natural (row-major) order.
+fn encode_ac(bw: &mut BitWriter, block: &[i16], table: &HuffmanEncodeTable) {
+    let mut zero_run = 0u32;
+    // Find last nonzero in zigzag order (zigzag positions 1-63)
+    let mut last_nonzero_zi = 0usize; // zigzag index (1-based)
+    for zi in (1..64).rev() {
+        if block[ZIGZAG[zi]] != 0 {
+            last_nonzero_zi = zi;
+            break;
+        }
+    }
+
+    if last_nonzero_zi == 0 {
+        // All AC zeros — emit EOB
+        bw.write_huffman(table, 0x00);
+        return;
+    }
+
+    for zi in 1..=last_nonzero_zi {
+        let coeff = block[ZIGZAG[zi]];
+        if coeff == 0 {
+            zero_run += 1;
+            continue;
+        }
+        // Emit ZRL for runs > 15
+        while zero_run > 15 {
+            bw.write_huffman(table, 0xF0); // ZRL
+            zero_run -= 16;
+        }
+        let (category, extra_bits, extra_len) = categorize(coeff as i32);
+        let symbol = ((zero_run as u8) << 4) | (category as u8);
+        bw.write_huffman(table, symbol);
+        if extra_len > 0 {
+            bw.write_bits(extra_bits, extra_len);
+        }
+        zero_run = 0;
+    }
+
+    // EOB if not at the last zigzag position (63)
+    if last_nonzero_zi < 63 {
+        bw.write_huffman(table, 0x00);
+    }
+}
+
+/// Encode AC EOB (for padding blocks).
+fn encode_ac_eob(bw: &mut BitWriter, table: &HuffmanEncodeTable) {
+    bw.write_huffman(table, 0x00);
+}
+
+/// `Log2FloorNonZero(x)` for x > 0 (== floor(log2(x))).
+#[inline]
+fn log2_floor_nz(x: u32) -> u32 {
+    31 - x.leading_zeros()
+}
+
+/// Progressive EOB-run coding state — mirrors brunsli's `DCTCodingState`.
+/// Buffers a run of end-of-band markers (coded as one `EOBn` symbol) plus the
+/// trailing correction bits emitted by AC refinement scans.
+struct DctCodingState {
+    eob_run: u32,
+    /// Buffered correction bits, one per element, in emission order.
+    refinement_bits: Vec<u8>,
+}
+
+impl DctCodingState {
+    fn new() -> Self {
+        Self {
+            eob_run: 0,
+            refinement_bits: Vec::new(),
+        }
+    }
+
+    /// Emit the buffered EOB run (as an `EOBn` Huffman symbol + extra bits)
+    /// followed by the buffered correction bits, then reset.
+    fn flush(&mut self, bw: &mut BitWriter, ac: &HuffmanEncodeTable) {
+        if self.eob_run > 0 {
+            let nbits = log2_floor_nz(self.eob_run);
+            bw.write_huffman(ac, (nbits << 4) as u8);
+            if nbits > 0 {
+                bw.write_bits(self.eob_run & ((1 << nbits) - 1), nbits);
+            }
+            self.eob_run = 0;
+        }
+        for &b in &self.refinement_bits {
+            bw.write_bits(b as u32, 1);
+        }
+        self.refinement_bits.clear();
+    }
+
+    /// Buffer one end-of-band (+ optional correction bits). Auto-flush at the
+    /// 0x7FFF run-length ceiling.
+    fn buffer_end_of_band(&mut self, new_bits: &[u8], bw: &mut BitWriter, ac: &HuffmanEncodeTable) {
+        self.eob_run += 1;
+        self.refinement_bits.extend_from_slice(new_bits);
+        if self.eob_run == 0x7FFF {
+            self.flush(bw, ac);
+        }
+    }
+}
+
+/// Progressive first-pass block (DC-first when Ss==0, else AC-first).
+/// Port of brunsli `EncodeDCTBlockProgressive`. `coeffs` is natural order.
+#[allow(clippy::too_many_arguments)]
+fn encode_block_progressive(
+    bw: &mut BitWriter,
+    coeffs: &[i16],
+    dc: &HuffmanEncodeTable,
+    ac: &HuffmanEncodeTable,
+    ss: usize,
+    se: usize,
+    al: u32,
+    num_zero_runs: u32,
+    cs: &mut DctCodingState,
+    last_dc: &mut i32,
+) {
+    let eob_run_allowed = ss > 0;
+    let mut k0 = ss;
+    if ss == 0 {
+        let temp2 = (coeffs[0] as i32) >> al;
+        let mut temp = temp2 - *last_dc;
+        *last_dc = temp2;
+        let mut t2 = temp;
+        if temp < 0 {
+            temp = -temp;
+            t2 -= 1;
+        }
+        let nbits = if temp == 0 {
+            0
+        } else {
+            log2_floor_nz(temp as u32) + 1
+        };
+        bw.write_huffman(dc, nbits as u8);
+        if nbits > 0 {
+            bw.write_bits((t2 as u32) & ((1u32 << nbits) - 1), nbits);
+        }
+        k0 = 1;
+    }
+    if k0 > se {
+        return;
+    }
+    let mut r: i32 = 0;
+    for k in k0..=se {
+        let mut temp = coeffs[ZIGZAG[k]] as i32;
+        if temp == 0 {
+            r += 1;
+            continue;
+        }
+        let t2;
+        if temp < 0 {
+            temp = -temp;
+            temp >>= al;
+            t2 = !temp;
+        } else {
+            temp >>= al;
+            t2 = temp;
+        }
+        if temp == 0 {
+            // Coefficient quantized to 0 at this bit-plane → still a zero run.
+            r += 1;
+            continue;
+        }
+        cs.flush(bw, ac);
+        while r > 15 {
+            bw.write_huffman(ac, 0xF0);
+            r -= 16;
+        }
+        let nbits = log2_floor_nz(temp as u32) + 1;
+        bw.write_huffman(ac, (((r as u32) << 4) | nbits) as u8);
+        bw.write_bits((t2 as u32) & ((1u32 << nbits) - 1), nbits);
+        r = 0;
+    }
+    if num_zero_runs > 0 {
+        cs.flush(bw, ac);
+        for _ in 0..num_zero_runs {
+            bw.write_huffman(ac, 0xF0);
+            r -= 16;
+        }
+    }
+    if r > 0 {
+        cs.buffer_end_of_band(&[], bw, ac);
+        if !eob_run_allowed {
+            cs.flush(bw, ac);
+        }
+    }
+}
+
+/// Successive-approximation refinement block (Ah > 0).
+/// Port of brunsli `EncodeRefinementBits`.
+fn encode_refinement(
+    bw: &mut BitWriter,
+    coeffs: &[i16],
+    ac: &HuffmanEncodeTable,
+    ss: usize,
+    se: usize,
+    al: u32,
+    cs: &mut DctCodingState,
+) {
+    let eob_run_allowed = ss > 0;
+    let mut k0 = ss;
+    if ss == 0 {
+        // Refine the DC: emit the next bit.
+        bw.write_bits(((coeffs[0] as i32) >> al) as u32 & 1, 1);
+        k0 = 1;
+    }
+    if k0 > se {
+        return;
+    }
+    let mut abs_values = [0i32; 64];
+    let mut eob = 0usize;
+    for k in k0..=se {
+        let abs_val = (coeffs[ZIGZAG[k]] as i32).abs();
+        abs_values[k] = abs_val >> al;
+        if abs_values[k] == 1 {
+            eob = k;
+        }
+    }
+    let mut r: i32 = 0;
+    let mut refinement_bits: Vec<u8> = Vec::new();
+    for k in k0..=se {
+        if abs_values[k] == 0 {
+            r += 1;
+            continue;
+        }
+        while r > 15 && k <= eob {
+            cs.flush(bw, ac);
+            bw.write_huffman(ac, 0xF0);
+            r -= 16;
+            for &b in &refinement_bits {
+                bw.write_bits(b as u32, 1);
+            }
+            refinement_bits.clear();
+        }
+        if abs_values[k] > 1 {
+            // Already-significant coefficient → one correction bit.
+            refinement_bits.push((abs_values[k] & 1) as u8);
+            continue;
+        }
+        // Newly-significant coefficient.
+        cs.flush(bw, ac);
+        let symbol = (((r as u32) << 4) | 1) as u8;
+        let new_nonzero_bit = if (coeffs[ZIGZAG[k]] as i32) < 0 {
+            0u32
+        } else {
+            1u32
+        };
+        bw.write_huffman(ac, symbol);
+        bw.write_bits(new_nonzero_bit, 1);
+        for &b in &refinement_bits {
+            bw.write_bits(b as u32, 1);
+        }
+        refinement_bits.clear();
+        r = 0;
+    }
+    if r > 0 || !refinement_bits.is_empty() {
+        cs.buffer_end_of_band(&refinement_bits, bw, ac);
+        if !eob_run_allowed {
+            cs.flush(bw, ac);
+        }
+    }
+}
+
+/// Categorize a coefficient value for Huffman encoding.
+/// Returns (category, extra_bits, extra_bit_length).
+fn categorize(value: i32) -> (u32, u32, u32) {
+    if value == 0 {
+        return (0, 0, 0);
+    }
+    let abs_val = value.unsigned_abs();
+    let category = 32 - abs_val.leading_zeros(); // = ceil(log2(abs+1))
+    // For positive values: extra_bits = value
+    // For negative values: extra_bits = value + (1 << category) - 1
+    let extra_bits = if value > 0 {
+        value as u32
+    } else {
+        (value + (1 << category) - 1) as u32
+    };
+    (category, extra_bits, category)
+}
+
+/// Huffman encode table: symbol → (code, length).
+struct HuffmanEncodeTable {
+    codes: [u32; 256],
+    lengths: [u8; 256],
+}
+
+impl HuffmanEncodeTable {
+    fn from_counts_values(counts: &[u32; 16], values: &[u8]) -> Self {
+        let mut codes = [0u32; 256];
+        let mut lengths = [0u8; 256];
+
+        // Generate Huffman codes from counts (JPEG standard algorithm)
+        let mut code: u32 = 0;
+        let mut val_idx = 0;
+        for (bits_minus_1, &count) in counts.iter().enumerate() {
+            let bits = bits_minus_1 as u8 + 1;
+            for _ in 0..count {
+                if val_idx < values.len() {
+                    let symbol = values[val_idx] as usize;
+                    codes[symbol] = code;
+                    lengths[symbol] = bits;
+                    val_idx += 1;
+                }
+                code += 1;
+            }
+            code <<= 1;
+        }
+
+        Self { codes, lengths }
+    }
+}
+
+/// Bitstream writer for JPEG entropy-coded data.
+struct BitWriter {
+    buffer: Vec<u8>,
+    bit_buffer: u32,
+    bits_in_buffer: u32,
+}
+
+impl BitWriter {
+    fn new() -> Self {
+        Self {
+            buffer: Vec::new(),
+            bit_buffer: 0,
+            bits_in_buffer: 0,
+        }
+    }
+
+    fn write_huffman(&mut self, table: &HuffmanEncodeTable, symbol: u8) {
+        let code = table.codes[symbol as usize];
+        let length = table.lengths[symbol as usize];
+        if length > 0 {
+            self.write_bits(code, length as u32);
+        }
+    }
+
+    fn write_bits(&mut self, value: u32, num_bits: u32) {
+        // JPEG uses MSB-first bit packing
+        // We accumulate bits MSB-first in bit_buffer
+        self.bit_buffer = (self.bit_buffer << num_bits) | (value & ((1 << num_bits) - 1));
+        self.bits_in_buffer += num_bits;
+
+        while self.bits_in_buffer >= 8 {
+            self.bits_in_buffer -= 8;
+            let byte = ((self.bit_buffer >> self.bits_in_buffer) & 0xFF) as u8;
+            self.buffer.push(byte);
+            if byte == 0xFF {
+                self.buffer.push(0x00); // byte stuffing
+            }
+        }
+    }
+
+    fn pad_to_byte(&mut self, padding_bits: &[u8], padding_idx: &mut usize) {
+        while !self.bits_in_buffer.is_multiple_of(8) {
+            let bit = if *padding_idx < padding_bits.len() {
+                let b = padding_bits[*padding_idx];
+                *padding_idx += 1;
+                b
+            } else {
+                1 // Default pad with 1s (standard JPEG)
+            };
+            self.write_bits(bit as u32, 1);
+        }
+    }
+
+    fn finish(mut self) -> Vec<u8> {
+        // Any remaining bits should have been padded already
+        debug_assert!(self.bits_in_buffer == 0);
+        std::mem::take(&mut self.buffer)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/lib.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/lib.rs
new file mode 100644
index 00000000..481faa95
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/lib.rs
@@ -0,0 +1,89 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! A JPEG XL decoder in safe Rust.
+//!
+//! `zenjxl-decoder` is a pure-Rust decoder for the JPEG XL bitstream format
+//! (ISO/IEC 18181). It is a fork of the upstream
+//! [`libjxl/jxl-rs`](https://github.com/libjxl/jxl-rs) reference decoder,
+//! which in turn tracks the C++ [`libjxl`](https://github.com/libjxl/libjxl)
+//! implementation. Upstream remains the source of truth for codec behaviour;
+//! this fork adds resource limits, cooperative cancellation, parallel decode,
+//! and a handful of bug fixes and hardening changes on top.
+//!
+//! # Crate layout
+//!
+//! Most users only need the [`api`] module:
+//!
+//! ```no_run
+//! use zenjxl_decoder::api::decode;
+//!
+//! let bytes = std::fs::read("image.jxl").unwrap();
+//! let image = decode(&bytes).unwrap();
+//! ```
+//!
+//! Pass [`api::JxlDecoderOptions`] to [`api::decode_with`] to configure
+//! resource limits, cancellation, or colour conversion.
+//!
+//! # SIMD
+//!
+//! Multi-architecture SIMD (SSE4.2, AVX2, AVX-512, NEON, WASM128) lives in
+//! the companion [`zenjxl-decoder-simd`](https://crates.io/crates/zenjxl-decoder-simd)
+//! crate and is enabled via the `all-simd` feature (or per-ISA features such
+//! as `avx`, `neon`, `wasm128`). Dispatch is runtime, via
+//! [`archmage`](https://crates.io/crates/archmage).
+//!
+//! # Safety
+//!
+//! The main `jxl` crate is `#![forbid(unsafe_code)]` by default. Enabling the
+//! `allow-unsafe` feature opts into a small set of `unsafe` fast paths guarded
+//! by safe fallbacks.
+//!
+//! # Features
+//!
+//! - `threads` -- rayon-based parallel group decode and render.
+//! - `cms` -- [`moxcms`](https://crates.io/crates/moxcms) ICC profile transforms
+//!   (required for CMYK input).
+//! - `jpeg` -- lossless JPEG reconstruction from JXL containers.
+//! - `all-simd` / `sse42` / `avx` / `avx512` / `neon` / `wasm128` -- SIMD backends.
+//! - `allow-unsafe` -- opt in to `unsafe` fast paths.
+//!
+//! # License
+//!
+//! BSD-3-Clause, matching upstream [`libjxl/jxl-rs`](https://github.com/libjxl/jxl-rs).
+
+#![cfg_attr(not(feature = "allow-unsafe"), forbid(unsafe_code))]
+#![cfg_attr(feature = "allow-unsafe", deny(unsafe_code))]
+
+pub mod api;
+pub use api::{decode, decode_with, read_header, read_header_with};
+#[cfg(feature = "jpeg")]
+pub use api::{reconstruct_jpeg, reconstruct_jpeg_with};
+pub(crate) mod bit_reader;
+pub(crate) mod color;
+pub(crate) mod container;
+pub(crate) mod entropy_coding;
+pub(crate) mod error;
+pub(crate) mod features;
+pub(crate) mod frame;
+pub(crate) mod headers;
+pub(crate) mod icc;
+pub(crate) mod image;
+pub(crate) mod render;
+pub(crate) mod transforms;
+pub(crate) mod util;
+
+#[cfg(feature = "jpeg")]
+pub(crate) mod jpeg;
+
+#[cfg(test)]
+mod tests;
+
+// TODO: Move these to a more appropriate location.
+const GROUP_DIM: usize = 256;
+const BLOCK_DIM: usize = 8;
+const BLOCK_SIZE: usize = BLOCK_DIM * BLOCK_DIM;
+#[allow(clippy::excessive_precision)]
+const MIN_SIGMA: f32 = -3.90524291751269967465540850526868;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/buffer_splitter.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/buffer_splitter.rs
new file mode 100644
index 00000000..abf5fdf4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/buffer_splitter.rs
@@ -0,0 +1,238 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{api::JxlOutputBuffer, headers::Orientation, image::Rect, util::ShiftRightCeil};
+
+// Information for splitting the output buffers.
+#[derive(Debug)]
+pub struct SaveStageBufferInfo {
+    pub downsample: (u8, u8),
+    pub orientation: Orientation,
+    pub byte_size: usize,
+    pub after_extend: bool,
+}
+
+/// Data structure responsible for handing out access to portions of the output buffers.
+pub struct BufferSplitter<'a, 'b> {
+    buffers: &'a mut [Option<JxlOutputBuffer<'b>>],
+    requested_rects: Vec<Rect>,
+}
+
+impl<'a, 'b> BufferSplitter<'a, 'b> {
+    pub fn new(bufs: &'a mut [Option<JxlOutputBuffer<'b>>]) -> Self {
+        Self {
+            buffers: bufs,
+            requested_rects: vec![],
+        }
+    }
+
+    pub(crate) fn get_local_buffers(
+        &mut self,
+        save_buffer_info: &[Option<SaveStageBufferInfo>],
+        rect: Rect,
+        outside_current_frame: bool,
+        frame_size: (usize, usize),
+        full_image_size: (usize, usize),
+        frame_origin: (isize, isize),
+    ) -> Vec<Option<JxlOutputBuffer<'_>>> {
+        self.requested_rects.push(rect);
+        let mut local_buffers = vec![];
+        let buffers = &mut *self.buffers;
+        local_buffers.reserve(buffers.len());
+        for _ in 0..buffers.len() {
+            local_buffers.push(None::<JxlOutputBuffer>);
+        }
+        let rect = if !outside_current_frame {
+            rect.clip(frame_size)
+        } else {
+            rect
+        };
+        for (i, (info, buf)) in save_buffer_info.iter().zip(buffers.iter_mut()).enumerate() {
+            let Some(bi) = info else {
+                // We never write to this buffer.
+                continue;
+            };
+            let Some(buf) = buf.as_mut() else {
+                // The buffer to write into was not provided.
+                continue;
+            };
+            if outside_current_frame && !bi.after_extend {
+                // Before-extend stages do not write to rects outside the current frame.
+                continue;
+            }
+            let mut channel_rect = rect.downsample(bi.downsample);
+            if !outside_current_frame {
+                let frame_size = (
+                    frame_size.0.shrc(bi.downsample.0),
+                    frame_size.1.shrc(bi.downsample.1),
+                );
+                channel_rect = channel_rect.clip(frame_size);
+                if bi.after_extend {
+                    // clip this rect to its visible area in the full image (in full image coordinates).
+                    let origin = (
+                        rect.origin.0 as isize + frame_origin.0,
+                        rect.origin.1 as isize + frame_origin.1,
+                    );
+                    let end = (
+                        origin.0 + rect.size.0 as isize,
+                        origin.1 + rect.size.1 as isize,
+                    );
+                    let origin = (origin.0.max(0) as usize, origin.1.max(0) as usize);
+                    let end = (
+                        end.0.min(full_image_size.0 as isize).max(0) as usize,
+                        end.1.min(full_image_size.1 as isize).max(0) as usize,
+                    );
+                    channel_rect = Rect {
+                        origin,
+                        size: (
+                            end.0.saturating_sub(origin.0),
+                            end.1.saturating_sub(origin.1),
+                        ),
+                    };
+                }
+            }
+            if channel_rect.size.0 == 0 || channel_rect.size.1 == 0 {
+                // Buffer would be empty anyway.
+                continue;
+            }
+            let channel_rect = bi.orientation.display_rect(channel_rect, full_image_size);
+            let channel_rect = channel_rect.to_byte_rect_sz(bi.byte_size);
+            local_buffers[i] = Some(buf.rect(channel_rect));
+        }
+        local_buffers
+    }
+
+    pub fn into_changed_regions(self) -> Vec<Rect> {
+        self.requested_rects
+    }
+
+    #[cfg(any(test, feature = "threads"))]
+    pub fn get_full_buffers(&mut self) -> &mut [Option<JxlOutputBuffer<'b>>] {
+        &mut *self.buffers
+    }
+}
+
+/// Computes the channel rect for a given save buffer info and image rect.
+#[cfg(feature = "threads")]
+pub(crate) fn compute_channel_rect(
+    bi: &SaveStageBufferInfo,
+    rect: Rect,
+    frame_size: (usize, usize),
+    full_image_size: (usize, usize),
+    frame_origin: (isize, isize),
+) -> Option<Rect> {
+    let mut channel_rect = rect.downsample(bi.downsample);
+    let ds_frame_size = (
+        frame_size.0.shrc(bi.downsample.0),
+        frame_size.1.shrc(bi.downsample.1),
+    );
+    channel_rect = channel_rect.clip(ds_frame_size);
+    if bi.after_extend {
+        let origin = (
+            rect.origin.0 as isize + frame_origin.0,
+            rect.origin.1 as isize + frame_origin.1,
+        );
+        let end = (
+            origin.0 + rect.size.0 as isize,
+            origin.1 + rect.size.1 as isize,
+        );
+        let origin = (origin.0.max(0) as usize, origin.1.max(0) as usize);
+        let end = (
+            end.0.min(full_image_size.0 as isize).max(0) as usize,
+            end.1.min(full_image_size.1 as isize).max(0) as usize,
+        );
+        channel_rect = Rect {
+            origin,
+            size: (
+                end.0.saturating_sub(origin.0),
+                end.1.saturating_sub(origin.1),
+            ),
+        };
+    }
+    if channel_rect.size.0 == 0 || channel_rect.size.1 == 0 {
+        return None;
+    }
+    let channel_rect = bi.orientation.display_rect(channel_rect, full_image_size);
+    Some(channel_rect.to_byte_rect_sz(bi.byte_size))
+}
+
+/// One locally-owned output buffer for a single channel of a single work item.
+/// The render pipeline writes into `data` (tightly packed rows), and the
+/// `channel_rect` records where this data should be copied in the real output.
+#[cfg(feature = "threads")]
+pub(crate) struct OwnedLocalBuffer {
+    pub(crate) data: Vec<u8>,
+    pub(crate) bytes_per_row: usize,
+    pub(crate) num_rows: usize,
+    pub(crate) channel_rect: Rect,
+    pub(crate) buffer_index: usize,
+}
+
+/// Render output from one parallel work item. Contains owned buffers
+/// that need to be copied back into the real output.
+#[cfg(feature = "threads")]
+#[allow(dead_code)] // Threaded render output container
+pub(crate) struct WorkItemOutput {
+    pub(crate) buffers: Vec<OwnedLocalBuffer>,
+}
+
+/// Computes which output buffer slots are needed for a work item and their sizes.
+/// Returns (buffer_index, bytes_per_row, num_rows, channel_rect) for each active slot.
+#[cfg(feature = "threads")]
+pub(crate) fn compute_local_buffer_layouts(
+    save_buffer_info: &[Option<SaveStageBufferInfo>],
+    num_buffer_slots: usize,
+    rect: Rect,
+    frame_size: (usize, usize),
+    full_image_size: (usize, usize),
+    frame_origin: (isize, isize),
+) -> Vec<(usize, usize, usize, Rect)> {
+    let rect = rect.clip(frame_size);
+    let mut layouts = Vec::new();
+
+    for (i, info) in save_buffer_info.iter().enumerate() {
+        let Some(bi) = info else {
+            continue;
+        };
+        if i >= num_buffer_slots {
+            continue;
+        }
+        let Some(channel_rect) =
+            compute_channel_rect(bi, rect, frame_size, full_image_size, frame_origin)
+        else {
+            continue;
+        };
+        let bytes_per_row = channel_rect.size.0;
+        let num_rows = channel_rect.size.1;
+        if bytes_per_row == 0 || num_rows == 0 {
+            continue;
+        }
+        layouts.push((i, bytes_per_row, num_rows, channel_rect));
+    }
+    layouts
+}
+
+/// Copies locally-owned render output back into the real output buffers.
+///
+/// Called sequentially after the parallel render completes.
+#[cfg(feature = "threads")]
+pub(crate) fn copy_back_local_buffers(
+    owned_buffers: &[OwnedLocalBuffer],
+    output: &mut [Option<JxlOutputBuffer<'_>>],
+) {
+    for olb in owned_buffers {
+        let Some(buf) = output[olb.buffer_index].as_mut() else {
+            continue;
+        };
+        let channel_rect = olb.channel_rect;
+        let mut target = buf.rect(channel_rect);
+        for row in 0..olb.num_rows {
+            let src_start = row * olb.bytes_per_row;
+            let src_end = src_start + olb.bytes_per_row;
+            let dst_row = target.row_mut(row);
+            dst_row[..olb.bytes_per_row].copy_from_slice(&olb.data[src_start..src_end]);
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/builder.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/builder.rs
new file mode 100644
index 00000000..ab9975a5
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/builder.rs
@@ -0,0 +1,318 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::api::{JxlColorType, JxlDataFormat};
+use crate::error::{Error, Result};
+use crate::headers::Orientation;
+use crate::render::StageSpecialCase;
+use crate::render::internal::ChannelInfo;
+use crate::render::save::SaveStage;
+use crate::render::stages::ConvertI32ToU8Stage;
+use crate::util::{MemoryTracker, ShiftRightCeil, tracing_wrappers::*};
+
+use super::internal::{RenderPipelineShared, Stage};
+use super::stages::ExtendToImageDimensionsStage;
+use super::{RenderPipeline, RenderPipelineInOutStage, RenderPipelineInPlaceStage};
+
+pub(crate) struct RenderPipelineBuilder<Pipeline: RenderPipeline> {
+    shared: RenderPipelineShared<Pipeline::Buffer>,
+}
+
+impl<Pipeline: RenderPipeline> RenderPipelineBuilder<Pipeline> {
+    #[instrument(level = "debug")]
+    pub(super) fn new_with_chunk_size(
+        num_channels: usize,
+        size: (usize, usize),
+        downsampling_shift: usize,
+        mut log_group_size: usize,
+        chunk_size: usize,
+    ) -> Self {
+        info!("creating render pipeline");
+        assert!(chunk_size <= u16::MAX as usize);
+        assert_ne!(chunk_size, 0);
+        // The number of pixels that a group encompasses in the final, upsampled image along one
+        // dimension is effectively multiplied by the upsampling factor.
+        log_group_size += downsampling_shift;
+        Self {
+            shared: RenderPipelineShared {
+                channel_info: vec![vec![
+                    ChannelInfo {
+                        ty: None,
+                        downsample: (0, 0)
+                    };
+                    num_channels
+                ]],
+                input_size: size,
+                log_group_size,
+                group_count: (size.0.shrc(log_group_size), size.1.shrc(log_group_size)),
+                stages: vec![],
+                // Use checked_mul to prevent overflow with malicious image dimensions
+                // Panics if dimensions would overflow - caller should validate earlier
+                group_chan_complete: vec![
+                    vec![false; num_channels];
+                    size.0
+                        .shrc(log_group_size)
+                        .checked_mul(size.1.shrc(log_group_size))
+                        .expect(
+                            "group count overflow - image dimensions too large"
+                        )
+                ],
+                chunk_size,
+                extend_stage_index: None,
+                memory_tracker: MemoryTracker::default(),
+                channel_is_used: vec![false; num_channels],
+            },
+        }
+    }
+
+    pub fn with_memory_tracker(mut self, tracker: MemoryTracker) -> Self {
+        self.shared.memory_tracker = tracker;
+        self
+    }
+
+    pub(super) fn add_stage_internal(mut self, stage: Stage<Pipeline::Buffer>) -> Self {
+        self.shared.stages.push(stage);
+        self
+    }
+
+    pub fn new(
+        num_channels: usize,
+        size: (usize, usize),
+        downsampling_shift: usize,
+        log_group_size: usize,
+    ) -> Self {
+        Self::new_with_chunk_size(
+            num_channels,
+            size,
+            downsampling_shift,
+            log_group_size,
+            1 << (log_group_size + downsampling_shift),
+        )
+    }
+
+    pub fn add_save_stage(
+        self,
+        channels: &[usize],
+        orientation: Orientation,
+        output_buffer_index: usize,
+        color_type: JxlColorType,
+        data_format: JxlDataFormat,
+        fill_opaque_alpha: bool,
+    ) -> Self {
+        let stage = SaveStage::new(
+            channels,
+            orientation,
+            output_buffer_index,
+            color_type,
+            data_format,
+            fill_opaque_alpha,
+        );
+        self.add_stage_internal(Stage::Save(stage))
+    }
+
+    pub fn add_extend_stage(self, extend: ExtendToImageDimensionsStage) -> Self {
+        self.add_stage_internal(Stage::Extend(extend))
+    }
+
+    pub fn add_inplace_stage<S: RenderPipelineInPlaceStage + Send + Sync>(self, stage: S) -> Self {
+        self.add_stage_internal(Stage::InPlace(Pipeline::box_inplace_stage(stage)))
+    }
+
+    pub fn add_inout_stage<S: RenderPipelineInOutStage + Send + Sync>(self, stage: S) -> Self {
+        self.add_stage_internal(Stage::InOut(Pipeline::box_inout_stage(stage)))
+    }
+
+    #[instrument(skip_all, err)]
+    pub fn build(mut self) -> Result<Box<Pipeline>> {
+        let mut stage_is_used = vec![false; self.shared.stages.len()];
+        let num_channels = self.shared.num_channels();
+        let mut channel_next_use = vec![None; num_channels];
+        // Prune unused stages.
+        for i in (0..self.shared.stages.len()).rev() {
+            let stage = &self.shared.stages[i];
+            if matches!(stage, Stage::Save(_)) {
+                for (c, next_use) in channel_next_use.iter_mut().enumerate() {
+                    if stage.uses_channel(c) {
+                        self.shared.channel_is_used[c] = true;
+                        *next_use = Some(i);
+                    }
+                }
+            }
+            for c in 0..num_channels {
+                if stage.uses_channel(c) {
+                    stage_is_used[i] |= self.shared.channel_is_used[c];
+                }
+            }
+            // Stages with non-zero shift modify channel dimensions; pruning
+            // them corrupts downstream stage channel info.
+            if stage.shift() != (0, 0) {
+                stage_is_used[i] = true;
+            }
+            if stage_is_used[i] {
+                match self.shared.stages[i].is_special_case() {
+                    None => (),
+                    Some(StageSpecialCase::F32ToU8 { .. }) => (),
+                    Some(StageSpecialCase::ModularToF32 { channel, bit_depth }) => {
+                        let n = channel_next_use[channel].unwrap();
+                        if let Some(StageSpecialCase::F32ToU8 {
+                            channel: c,
+                            bit_depth: b,
+                        }) = self.shared.stages[n].is_special_case()
+                        {
+                            assert_eq!(c, channel);
+                            if b % bit_depth == 0 {
+                                let mult = ((1 << b) - 1) / ((1 << bit_depth) - 1);
+                                // Remove the next stage, and replace the current stage with I32 -> I8
+                                // conversion.
+                                stage_is_used[n] = false;
+                                self.shared.stages[i] = Stage::InOut(Pipeline::box_inout_stage(
+                                    ConvertI32ToU8Stage::new(c, mult, (1 << b) - 1),
+                                ));
+                            }
+                        }
+                    }
+                }
+                for (c, next_use) in channel_next_use.iter_mut().enumerate() {
+                    if self.shared.stages[i].uses_channel(c) {
+                        self.shared.channel_is_used[c] = true;
+                        *next_use = Some(i);
+                    }
+                }
+            }
+        }
+        self.shared.stages = self
+            .shared
+            .stages
+            .into_iter()
+            .zip(stage_is_used)
+            .filter_map(|(s, used)| used.then_some(s))
+            .collect();
+        for (i, stage) in self.shared.stages.iter().enumerate() {
+            let input_type = stage.input_type();
+            let output_type = stage.output_type();
+            let shift = stage.shift();
+            let border = stage.border();
+            let is_extend = matches!(stage, Stage::Extend(_));
+            let current_info = self.shared.channel_info.last().unwrap().clone();
+            debug!(
+                last_stage_channel_info = ?current_info,
+                extend_stage_index= ?self.shared.extend_stage_index,
+                "adding stage '{stage}'",
+            );
+            let mut after_info = vec![];
+            for (c, info) in current_info.iter().enumerate() {
+                if !stage.uses_channel(c) {
+                    after_info.push(ChannelInfo {
+                        ty: info.ty,
+                        downsample: (0, 0),
+                    });
+                } else {
+                    if let Some(ty) = info.ty
+                        && ty != input_type
+                    {
+                        return Err(Error::PipelineChannelTypeMismatch(
+                            stage.to_string(),
+                            c,
+                            input_type,
+                            ty,
+                        ));
+                    }
+                    after_info.push(ChannelInfo {
+                        ty: Some(output_type.unwrap_or(input_type)),
+                        downsample: shift,
+                    });
+                }
+            }
+            if self.shared.extend_stage_index.is_some()
+                && (shift != (0, 0) || border != (0, 0) || is_extend)
+            {
+                return Err(Error::PipelineInvalidStageAfterExtend(stage.to_string()));
+            }
+            if is_extend {
+                self.shared.extend_stage_index = Some(i);
+            }
+            debug!(
+                new_channel_info = ?after_info,
+                extend_stage_index= ?self.shared.extend_stage_index,
+                "added stage '{stage}'",
+            );
+            self.shared.channel_info.push(after_info);
+        }
+
+        let channel_info = &mut self.shared.channel_info;
+        let mut cur_downsamples = vec![(0u8, 0u8); num_channels];
+        for (s, stage) in self.shared.stages.iter().enumerate().rev() {
+            let [current_info, next_info, ..] = &mut channel_info[s..] else {
+                unreachable!()
+            };
+            let mut save_downsample = None;
+            for chan in 0..num_channels {
+                let cur_chan = &mut current_info[chan];
+                let next_chan = &mut next_info[chan];
+                let uses_channel = stage.uses_channel(chan);
+                let input_type = stage.input_type();
+
+                if cur_chan.ty.is_none() {
+                    cur_chan.ty = if uses_channel {
+                        Some(input_type)
+                    } else {
+                        next_chan.ty
+                    }
+                }
+                // Arithmetic overflows here should be very uncommon, so custom error variants
+                // are probably unwarranted.
+                let cur_downsample = &mut cur_downsamples[chan];
+                if matches!(stage, Stage::Save(_))
+                    && save_downsample.is_some_and(|x| x != *cur_downsample)
+                {
+                    save_downsample = Some(*cur_downsample);
+                    return Err(Error::SaveDifferentDownsample(
+                        save_downsample.unwrap(),
+                        *cur_downsample,
+                    ));
+                }
+                let next_downsample = &mut next_chan.downsample;
+                let next_total_downsample = *cur_downsample;
+                cur_downsample.0 = cur_downsample
+                    .0
+                    .checked_add(next_downsample.0)
+                    .ok_or(Error::ArithmeticOverflow)?;
+                cur_downsample.1 = cur_downsample
+                    .1
+                    .checked_add(next_downsample.1)
+                    .ok_or(Error::ArithmeticOverflow)?;
+                *next_downsample = next_total_downsample;
+            }
+        }
+        for (chan, cur_downsample) in cur_downsamples.iter().enumerate() {
+            channel_info[0][chan].downsample = *cur_downsample;
+        }
+        #[cfg(feature = "tracing")]
+        {
+            for (s, (current_info, stage)) in channel_info
+                .iter()
+                .zip(self.shared.stages.iter())
+                .enumerate()
+            {
+                debug!("final channel info before stage {s} '{stage}': {current_info:?}");
+            }
+            debug!(
+                "final channel info after all stages {:?}",
+                channel_info.last().unwrap()
+            );
+        }
+
+        for (c, chinfo) in channel_info.iter().flat_map(|x| x.iter().enumerate()) {
+            if chinfo.ty.is_none() {
+                assert!(!self.shared.channel_is_used[c]);
+                for g in self.shared.group_chan_complete.iter_mut() {
+                    g[c] = true;
+                }
+            }
+        }
+
+        Ok(Box::new(Pipeline::new_from_shared(self.shared)?))
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/channels.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/channels.rs
new file mode 100644
index 00000000..abeba9e9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/channels.rs
@@ -0,0 +1,162 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::util::SmallVec;
+
+/// Multi-row channel accessor for immutable access.
+///
+/// Provides 2D indexing where `channels[ch]` returns `&[&[T]]` (all rows for a channel),
+/// and `channels[ch][row]` returns `&[T]` (pixels for a specific row).
+///
+/// This eliminates nested Vec collections while maintaining the same indexing syntax.
+pub struct Channels<'a, T> {
+    // The number of input rows should be maximized by the EPF0 stage, which has 21.
+    pub(crate) row_data: SmallVec<[&'a [T]; 32]>,
+    num_channels: usize,
+    pub(crate) rows_per_channel: usize,
+}
+
+impl<'a, T> Channels<'a, T> {
+    /// Create a new Channels accessor.
+    ///
+    /// # Arguments
+    /// * `row_data` - Flat vector of all rows for all channels (length = num_channels * rows_per_channel)
+    /// * `num_channels` - Number of channels
+    /// * `rows_per_channel` - Number of rows per channel (typically 2*BORDER+1)
+    pub fn new(
+        row_data: SmallVec<[&'a [T]; 32]>,
+        num_channels: usize,
+        rows_per_channel: usize,
+    ) -> Self {
+        debug_assert_eq!(
+            row_data.len(),
+            num_channels * rows_per_channel,
+            "row_data length must equal num_channels * rows_per_channel"
+        );
+        Self {
+            row_data,
+            num_channels,
+            rows_per_channel,
+        }
+    }
+
+    /// Returns the number of channels.
+    pub fn len(&self) -> usize {
+        self.num_channels
+    }
+
+    /// Returns true if there are no channels.
+    #[allow(dead_code)] // Companion to len()
+    pub fn is_empty(&self) -> bool {
+        self.num_channels == 0
+    }
+
+    /// Returns an iterator over channel slices.
+    #[allow(dead_code)] // Part of Channels accessor API
+    pub fn iter(&self) -> impl Iterator<Item = &[&'a [T]]> {
+        (0..self.num_channels).map(move |ch| &self[ch])
+    }
+}
+
+/// Implement indexing: channels[ch] returns &[&[T]]
+impl<'a, T> std::ops::Index<usize> for Channels<'a, T> {
+    type Output = [&'a [T]];
+
+    fn index(&self, ch: usize) -> &[&'a [T]] {
+        let start = ch * self.rows_per_channel;
+        &self.row_data[start..start + self.rows_per_channel]
+    }
+}
+
+/// Multi-row channel accessor for mutable access.
+///
+/// Provides 2D indexing where `channels[ch]` returns `&[&mut [T]]` or `&mut [&mut [T]]`,
+/// and `channels[ch][row]` returns `&mut [T]` (pixels for a specific row).
+pub struct ChannelsMut<'a, T> {
+    // The number of output rows should be maximized by the Upsample8 stage, which has 8.
+    pub(crate) row_data: SmallVec<[&'a mut [T]; 8]>,
+    num_channels: usize,
+    pub(crate) rows_per_channel: usize,
+}
+
+impl<'a, T> ChannelsMut<'a, T> {
+    /// Create a new ChannelsMut accessor.
+    ///
+    /// # Arguments
+    /// * `row_data` - Flat vector of all mutable rows for all channels
+    /// * `num_channels` - Number of channels
+    /// * `rows_per_channel` - Number of rows per channel (typically 1 << SHIFT)
+    pub fn new(
+        row_data: SmallVec<[&'a mut [T]; 8]>,
+        num_channels: usize,
+        rows_per_channel: usize,
+    ) -> Self {
+        debug_assert_eq!(
+            row_data.len(),
+            num_channels * rows_per_channel,
+            "row_data length must equal num_channels * rows_per_channel"
+        );
+        Self {
+            row_data,
+            num_channels,
+            rows_per_channel,
+        }
+    }
+
+    /// Returns the number of channels.
+    pub fn len(&self) -> usize {
+        self.num_channels
+    }
+
+    /// Returns true if there are no channels.
+    #[allow(dead_code)] // Companion to len()
+    pub fn is_empty(&self) -> bool {
+        self.num_channels == 0
+    }
+
+    /// Splits the first 3 channels into separate mutable slices.
+    /// Returns a tuple containing mutable references to each channel's rows.
+    #[allow(clippy::type_complexity)]
+    pub fn split_first_3_mut(
+        &mut self,
+    ) -> (&mut [&'a mut [T]], &mut [&'a mut [T]], &mut [&'a mut [T]]) {
+        assert!(
+            3 <= self.num_channels,
+            "requested 3 channels but only have {}",
+            self.num_channels
+        );
+        let rpc = self.rows_per_channel;
+        let (first, rest) = self.row_data.split_at_mut(rpc);
+        let (second, rest) = rest.split_at_mut(rpc);
+        let (third, _) = rest.split_at_mut(rpc);
+        (first, second, third)
+    }
+
+    /// Returns a mutable iterator over all channels.
+    /// Each item is a mutable slice of rows for that channel.
+    #[allow(dead_code)] // Part of ChannelsMut accessor API
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut [&'a mut [T]]> {
+        let rpc = self.rows_per_channel;
+        self.row_data.chunks_mut(rpc)
+    }
+}
+
+/// Implement immutable indexing: channels[ch] returns &[&mut [T]]
+impl<'a, T> std::ops::Index<usize> for ChannelsMut<'a, T> {
+    type Output = [&'a mut [T]];
+
+    fn index(&self, ch: usize) -> &[&'a mut [T]] {
+        let start = ch * self.rows_per_channel;
+        &self.row_data[start..start + self.rows_per_channel]
+    }
+}
+
+/// Implement mutable indexing: &mut channels[ch] returns &mut [&mut [T]]
+impl<'a, T> std::ops::IndexMut<usize> for ChannelsMut<'a, T> {
+    fn index_mut(&mut self, ch: usize) -> &mut [&'a mut [T]] {
+        let start = ch * self.rows_per_channel;
+        &mut self.row_data[start..start + self.rows_per_channel]
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/internal.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/internal.rs
new file mode 100644
index 00000000..1a693c26
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/internal.rs
@@ -0,0 +1,259 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::any::Any;
+use std::fmt::Display;
+
+use crate::error::Result;
+use crate::image::{DataTypeTag, ImageDataType};
+use crate::render::StageSpecialCase;
+use crate::util::{MemoryTracker, ShiftRightCeil};
+
+use super::save::SaveStage;
+use super::stages::ExtendToImageDimensionsStage;
+use super::{RenderPipelineInOutStage, RenderPipelineInPlaceStage};
+
+pub enum Stage<Buffer> {
+    InPlace(Box<dyn RunInPlaceStage<Buffer> + Send + Sync>),
+    InOut(Box<dyn RunInOutStage<Buffer> + Send + Sync>),
+    Save(SaveStage),
+    Extend(ExtendToImageDimensionsStage),
+}
+
+impl<Buffer: 'static> Stage<Buffer> {
+    pub(super) fn init_local_state(
+        &self,
+        thread_index: usize,
+    ) -> Result<Option<Box<dyn Any + Send>>> {
+        match self {
+            Stage::InPlace(s) => s.init_local_state(thread_index),
+            Stage::InOut(s) => s.init_local_state(thread_index),
+            _ => Ok(None),
+        }
+    }
+
+    pub(super) fn shift(&self) -> (u8, u8) {
+        match self {
+            Stage::InOut(s) => s.shift(),
+            _ => (0, 0),
+        }
+    }
+
+    pub(super) fn border(&self) -> (u8, u8) {
+        match self {
+            Stage::InOut(s) => s.border(),
+            _ => (0, 0),
+        }
+    }
+
+    #[cfg(test)]
+    pub(super) fn new_size(&self, size: (usize, usize)) -> (usize, usize) {
+        match self {
+            Stage::Extend(e) => e.image_size,
+            _ => size,
+        }
+    }
+
+    pub(super) fn uses_channel(&self, c: usize) -> bool {
+        match self {
+            Stage::Extend(_) => true,
+            Stage::InPlace(s) => s.uses_channel(c),
+            Stage::InOut(s) => s.uses_channel(c),
+            Stage::Save(s) => s.uses_channel(c),
+        }
+    }
+    pub(super) fn input_type(&self) -> DataTypeTag {
+        match self {
+            Stage::Extend(_) => DataTypeTag::F32,
+            Stage::InPlace(s) => s.ty(),
+            Stage::InOut(s) => s.input_type(),
+            Stage::Save(s) => s.input_type(),
+        }
+    }
+    pub(super) fn output_type(&self) -> Option<DataTypeTag> {
+        match self {
+            Stage::InOut(s) => Some(s.output_type()),
+            _ => None,
+        }
+    }
+    pub(super) fn is_special_case(&self) -> Option<StageSpecialCase> {
+        match self {
+            Stage::InOut(s) => s.is_special_case(),
+            Stage::InPlace(s) => s.is_special_case(),
+            _ => None,
+        }
+    }
+}
+
+impl<Buffer> Display for Stage<Buffer> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Stage::InOut(s) => write!(f, "{}", s),
+            Stage::InPlace(s) => write!(f, "{}", s),
+            Stage::Save(s) => write!(f, "{}", s),
+            Stage::Extend(e) => write!(f, "{}", e),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct ChannelInfo {
+    pub ty: Option<DataTypeTag>,
+    pub downsample: (u8, u8),
+}
+
+pub struct RenderPipelineShared<Buffer> {
+    pub channel_info: Vec<Vec<ChannelInfo>>,
+    pub input_size: (usize, usize),
+    pub log_group_size: usize,
+    pub group_count: (usize, usize),
+    pub group_chan_complete: Vec<Vec<bool>>,
+    pub chunk_size: usize,
+    pub stages: Vec<Stage<Buffer>>,
+    pub extend_stage_index: Option<usize>,
+    pub memory_tracker: MemoryTracker,
+    pub channel_is_used: Vec<bool>,
+}
+
+impl<Buffer> RenderPipelineShared<Buffer> {
+    pub fn group_position(&self, group_id: usize) -> (usize, usize) {
+        (group_id % self.group_count.0, group_id / self.group_count.0)
+    }
+
+    pub fn group_offset(&self, group_id: usize) -> (usize, usize) {
+        let group = self.group_position(group_id);
+        (
+            group.0 << self.log_group_size,
+            group.1 << self.log_group_size,
+        )
+    }
+
+    pub fn group_size(&self, group_id: usize) -> (usize, usize) {
+        let goffset = self.group_offset(group_id);
+        (
+            self.input_size
+                .0
+                .min(goffset.0 + (1 << self.log_group_size))
+                - goffset.0,
+            self.input_size
+                .1
+                .min(goffset.1 + (1 << self.log_group_size))
+                - goffset.1,
+        )
+    }
+
+    pub fn group_size_for_channel(
+        &self,
+        channel: usize,
+        requested_data_type: DataTypeTag,
+    ) -> (usize, usize) {
+        let ChannelInfo { downsample, ty } = self.channel_info[0][channel];
+        if ty.unwrap() != requested_data_type {
+            panic!(
+                "Invalid pipeline usage: incorrect channel type, requested {:?}, but pipeline wants {ty:?}",
+                requested_data_type
+            );
+        }
+        // 420 JPEGs are padded to 16 pixels, not to 8.
+        (
+            (1 << self.log_group_size)
+                .min(self.input_size.0)
+                .shrc(downsample.0 as usize)
+                .next_multiple_of(16),
+            (1 << self.log_group_size)
+                .min(self.input_size.1)
+                .shrc(downsample.1 as usize)
+                .next_multiple_of(16),
+        )
+    }
+
+    pub fn num_channels(&self) -> usize {
+        self.channel_is_used.len()
+    }
+
+    pub fn num_used_channels(&self) -> usize {
+        self.channel_is_used.iter().filter(|x| **x).count()
+    }
+}
+
+pub trait PipelineBuffer {
+    type InPlaceExtraInfo;
+    type InOutExtraInfo;
+}
+
+pub trait InPlaceStage: Any + Display + Send + Sync {
+    fn init_local_state(&self, thread_index: usize) -> Result<Option<Box<dyn Any + Send>>>;
+    fn uses_channel(&self, c: usize) -> bool;
+    fn ty(&self) -> DataTypeTag;
+    fn is_special_case(&self) -> Option<StageSpecialCase>;
+}
+
+pub trait RunInPlaceStage<Buffer: PipelineBuffer>: InPlaceStage + Send + Sync {
+    fn run_stage_on(
+        &self,
+        info: Buffer::InPlaceExtraInfo,
+        buffers: &mut [&mut Buffer],
+        state: Option<&mut (dyn Any + Send)>,
+    );
+}
+
+impl<T: RenderPipelineInPlaceStage + Send + Sync> InPlaceStage for T {
+    fn init_local_state(&self, thread_index: usize) -> Result<Option<Box<dyn Any + Send>>> {
+        self.init_local_state(thread_index)
+    }
+    fn uses_channel(&self, c: usize) -> bool {
+        self.uses_channel(c)
+    }
+    fn ty(&self) -> DataTypeTag {
+        T::Type::DATA_TYPE_ID
+    }
+    fn is_special_case(&self) -> Option<StageSpecialCase> {
+        self.is_special_case()
+    }
+}
+
+pub trait InOutStage: Any + Display + Send + Sync {
+    fn init_local_state(&self, thread_index: usize) -> Result<Option<Box<dyn Any + Send>>>;
+    fn shift(&self) -> (u8, u8);
+    fn border(&self) -> (u8, u8);
+    fn uses_channel(&self, c: usize) -> bool;
+    fn input_type(&self) -> DataTypeTag;
+    fn output_type(&self) -> DataTypeTag;
+    fn is_special_case(&self) -> Option<StageSpecialCase>;
+}
+
+impl<T: RenderPipelineInOutStage + Send + Sync> InOutStage for T {
+    fn init_local_state(&self, thread_index: usize) -> Result<Option<Box<dyn Any + Send>>> {
+        self.init_local_state(thread_index)
+    }
+    fn uses_channel(&self, c: usize) -> bool {
+        self.uses_channel(c)
+    }
+    fn shift(&self) -> (u8, u8) {
+        T::SHIFT
+    }
+    fn border(&self) -> (u8, u8) {
+        T::BORDER
+    }
+    fn input_type(&self) -> DataTypeTag {
+        T::InputT::DATA_TYPE_ID
+    }
+    fn output_type(&self) -> DataTypeTag {
+        T::OutputT::DATA_TYPE_ID
+    }
+    fn is_special_case(&self) -> Option<StageSpecialCase> {
+        self.is_special_case()
+    }
+}
+
+pub trait RunInOutStage<Buffer: PipelineBuffer>: InOutStage + Send + Sync {
+    fn run_stage_on(
+        &self,
+        info: Buffer::InOutExtraInfo,
+        input_buffers: &[&Buffer],
+        output_buffers: &mut [Buffer],
+        state: Option<&mut (dyn Any + Send)>,
+    );
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/group_scheduler.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/group_scheduler.rs
new file mode 100644
index 00000000..10f471fc
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/group_scheduler.rs
@@ -0,0 +1,778 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::ops::Range;
+
+use crate::error::Result;
+use crate::image::{OwnedRawImage, Rect};
+use crate::render::LowMemoryRenderPipeline;
+use crate::render::buffer_splitter::BufferSplitter;
+use crate::render::internal::{ChannelInfo, RenderPipelineShared, Stage};
+use crate::util::tracing_wrappers::*;
+
+use super::{PipelineReadView, render_group, row_buffers::RowBuffer};
+
+/// A renderable sub-rect of a group, produced by `prepare_group`.
+/// The parallel render path collects these across multiple groups
+/// and renders them concurrently.
+pub(crate) struct RenderWorkItem {
+    pub(crate) gx: usize,
+    pub(crate) gy: usize,
+    pub(crate) image_area: Rect,
+}
+
+/// Pure computation of renderable work items for a single group.
+/// All `is_ready` flags must be set before calling. No mutation needed.
+///
+/// When `full_readiness` is true, skips readiness mask computation and
+/// directly emits a single full-rect work item per group. This is the
+/// common case for one-shot parallel decode where all groups are ready.
+pub(super) fn compute_work_items(
+    g: usize,
+    is_ready: &[bool],
+    shared: &RenderPipelineShared<RowBuffer>,
+    border_size: (usize, usize),
+    full_readiness: bool,
+) -> Result<Vec<RenderWorkItem>> {
+    let (gx, gy) = shared.group_position(g);
+    let gsz = 1 << shared.log_group_size;
+    let group_rect = Rect {
+        size: (gsz, gsz),
+        origin: (gsz * gx, gsz * gy),
+    }
+    .clip(shared.input_size);
+    let group_count = shared.group_count;
+
+    // Fast path: when all groups are ready, every group gets a single
+    // full-rect work item (xrange=0..3, yrange=0..3). Skip readiness
+    // mask computation and foreach_ready_rect entirely.
+    if full_readiness {
+        let y0 = if gy == 0 {
+            group_rect.origin.1
+        } else {
+            group_rect.origin.1 - border_size.1
+        };
+        let x0 = if gx == 0 {
+            group_rect.origin.0
+        } else {
+            group_rect.origin.0 - border_size.0
+        };
+        let y1 = if gy + 1 == group_count.1 {
+            group_rect.end().1
+        } else {
+            group_rect.end().1 + border_size.1
+        };
+        let x1 = if gx + 1 == group_count.0 {
+            group_rect.end().0
+        } else {
+            group_rect.end().0 + border_size.0
+        };
+        return Ok(vec![RenderWorkItem {
+            gx,
+            gy,
+            image_area: Rect {
+                origin: (x0, y0),
+                size: (x1 - x0, y1 - y0),
+            },
+        }]);
+    }
+
+    let gxm1 = gx.saturating_sub(1);
+    let gym1 = gy.saturating_sub(1);
+    let gxp1 = (gx + 1).min(group_count.0 - 1);
+    let gyp1 = (gy + 1).min(group_count.1 - 1);
+    let gw = group_count.0;
+    let mut ready_mask = [
+        is_ready[gym1 * gw + gxm1],
+        is_ready[gym1 * gw + gx],
+        is_ready[gym1 * gw + gxp1],
+        is_ready[gy * gw + gxm1],
+        is_ready[gy * gw + gx],
+        is_ready[gy * gw + gxp1],
+        is_ready[gyp1 * gw + gxm1],
+        is_ready[gyp1 * gw + gx],
+        is_ready[gyp1 * gw + gxp1],
+    ];
+    ready_mask[0] &= ready_mask[1];
+    ready_mask[0] &= ready_mask[3];
+    ready_mask[2] &= ready_mask[1];
+    ready_mask[2] &= ready_mask[5];
+    ready_mask[6] &= ready_mask[3];
+    ready_mask[6] &= ready_mask[7];
+    ready_mask[8] &= ready_mask[5];
+    ready_mask[8] &= ready_mask[7];
+
+    let mut items = Vec::new();
+    foreach_ready_rect(ready_mask, |xrange, yrange| {
+        let y0 = match (gy == 0, yrange.start) {
+            (true, 0) => group_rect.origin.1,
+            (false, 0) => group_rect.origin.1 - border_size.1,
+            (_, 1) => group_rect.origin.1 + border_size.1,
+            _ => group_rect.end().1 - border_size.1,
+        };
+        let x0 = match (gx == 0, xrange.start) {
+            (true, 0) => group_rect.origin.0,
+            (false, 0) => group_rect.origin.0 - border_size.0,
+            (_, 1) => group_rect.origin.0 + border_size.0,
+            _ => group_rect.end().0 - border_size.0,
+        };
+        let y1 = match (gy + 1 == group_count.1, yrange.end) {
+            (true, 3) => group_rect.end().1,
+            (false, 3) => group_rect.end().1 + border_size.1,
+            (_, 2) => group_rect.end().1 - border_size.1,
+            _ => group_rect.origin.1 + border_size.1,
+        };
+        let x1 = match (gx + 1 == group_count.0, xrange.end) {
+            (true, 3) => group_rect.end().0,
+            (false, 3) => group_rect.end().0 + border_size.0,
+            (_, 2) => group_rect.end().0 - border_size.0,
+            _ => group_rect.origin.0 + border_size.0,
+        };
+        items.push(RenderWorkItem {
+            gx,
+            gy,
+            image_area: Rect {
+                origin: (x0, y0),
+                size: (x1 - x0, y1 - y0),
+            },
+        });
+        Ok(())
+    })?;
+    Ok(items)
+}
+
+pub(super) struct InputBuffer {
+    // One buffer per channel.
+    pub(super) data: Vec<Option<OwnedRawImage>>,
+    // Storage for left/right borders. Includes corners.
+    pub(super) leftright: Vec<Option<OwnedRawImage>>,
+    // Storage for top/bottom borders. Includes corners.
+    pub(super) topbottom: Vec<Option<OwnedRawImage>>,
+    // Number of ready channels in the current pass.
+    pub(super) ready_channels: usize,
+    pub(super) is_ready: bool,
+    pub(super) num_completed_groups_3x3: usize,
+}
+
+impl InputBuffer {
+    pub(super) fn has_buffer(&self, chan: usize) -> bool {
+        self.data[chan].is_some()
+    }
+
+    pub(super) fn set_buffer(&mut self, chan: usize, buf: OwnedRawImage) {
+        assert!(self.data[chan].is_none());
+        self.data[chan] = Some(buf);
+        self.ready_channels += 1;
+    }
+
+    pub(super) fn new(num_channels: usize) -> Self {
+        let b = || (0..num_channels).map(|_| None).collect();
+        Self {
+            data: b(),
+            leftright: b(),
+            topbottom: b(),
+            ready_channels: 0,
+            is_ready: false,
+            num_completed_groups_3x3: 0,
+        }
+    }
+}
+
+// Finds a small set of rectangles that cover all the "true" values in `ready_mask`,
+// and calls `f` on each such rectangle.
+fn foreach_ready_rect(
+    ready_mask: [bool; 9],
+    mut f: impl FnMut(Range<u8>, Range<u8>) -> Result<()>,
+) -> Result<()> {
+    // x range in middle row
+    let xrange = (1 - ready_mask[3] as u8)..(2 + ready_mask[5] as u8);
+    let can_extend_top = xrange.clone().all(|x| ready_mask[x as usize]);
+    let can_extend_bottom = xrange.clone().all(|x| ready_mask[6 + x as usize]);
+    let yrange = (1 - can_extend_top as u8)..(2 + can_extend_bottom as u8);
+    f(xrange.clone(), yrange)?;
+
+    if !can_extend_top {
+        if ready_mask[1] {
+            let xrange = (1 - ready_mask[0] as u8)..(2 + ready_mask[2] as u8);
+            f(xrange, 0..1)?;
+        } else {
+            if ready_mask[0] {
+                f(0..1, 0..1)?;
+            }
+            if ready_mask[2] {
+                f(2..3, 0..1)?;
+            }
+        }
+    } else {
+        if ready_mask[0] && !xrange.contains(&0) {
+            f(0..1, 0..1)?;
+        }
+        if ready_mask[2] && !xrange.contains(&2) {
+            f(2..3, 0..1)?;
+        }
+    }
+
+    if !can_extend_bottom {
+        if ready_mask[7] {
+            let xrange = (1 - ready_mask[6] as u8)..(2 + ready_mask[8] as u8);
+            f(xrange, 2..3)?;
+        } else {
+            if ready_mask[6] {
+                f(0..1, 2..3)?;
+            }
+            if ready_mask[8] {
+                f(2..3, 2..3)?;
+            }
+        }
+    } else {
+        if ready_mask[6] && !xrange.contains(&0) {
+            f(0..1, 2..3)?;
+        }
+        if ready_mask[8] && !xrange.contains(&2) {
+            f(2..3, 2..3)?;
+        }
+    }
+
+    Ok(())
+}
+
+impl LowMemoryRenderPipeline {
+    pub(super) fn maybe_get_scratch_buffer(
+        &mut self,
+        channel: usize,
+        kind: usize,
+    ) -> Option<OwnedRawImage> {
+        self.scratch_channel_buffers[channel * 3 + kind].pop()
+    }
+
+    pub(super) fn store_scratch_buffer(
+        &mut self,
+        channel: usize,
+        kind: usize,
+        image: OwnedRawImage,
+    ) {
+        self.scratch_channel_buffers[channel * 3 + kind].push(image)
+    }
+
+    /// Extracts border data from a group and computes renderable work items.
+    /// Returns an empty vec if not all channels for the group are ready yet.
+    pub(crate) fn prepare_group(&mut self, g: usize) -> Result<Vec<RenderWorkItem>> {
+        let buf = &mut self.input_buffers[g];
+        assert!(buf.ready_channels <= self.shared.num_used_channels());
+        if buf.ready_channels != self.shared.num_used_channels() {
+            return Ok(vec![]);
+        }
+        buf.ready_channels = 0;
+        let (gx, gy) = self.shared.group_position(g);
+        debug!("new data ready for group {gx},{gy}");
+
+        let gsz = 1 << self.shared.log_group_size;
+        let group_rect = Rect {
+            size: (gsz, gsz),
+            origin: (gsz * gx, gsz * gy),
+        }
+        .clip(self.shared.input_size);
+
+        {
+            for c in 0..self.shared.num_channels() {
+                if !self.shared.channel_is_used[c] {
+                    continue;
+                }
+                let (bx, by) = self.border_size;
+                let (sx, sy) = self.input_buffers[g].data[c].as_ref().unwrap().byte_size();
+                let ChannelInfo {
+                    ty,
+                    downsample: (dx, dy),
+                } = self.shared.channel_info[0][c];
+                let ty = ty.unwrap();
+                let bx = bx >> dx;
+                let by = by >> dy;
+                let mut topbottom = if let Some(b) = self.input_buffers[g].topbottom[c].take() {
+                    b
+                } else if let Some(b) = self.maybe_get_scratch_buffer(c, 1) {
+                    b
+                } else {
+                    let height = 4 * by;
+                    let width = (1 << self.shared.log_group_size) * ty.size();
+                    OwnedRawImage::new_zeroed_with_padding((width, height), (0, 0), (0, 0))?
+                };
+                let mut leftright = if let Some(b) = self.input_buffers[g].leftright[c].take() {
+                    b
+                } else if let Some(b) = self.maybe_get_scratch_buffer(c, 2) {
+                    b
+                } else {
+                    let height = 1 << self.shared.log_group_size;
+                    let width = 4 * bx * ty.size();
+                    OwnedRawImage::new_zeroed_with_padding((width, height), (0, 0), (0, 0))?
+                };
+                let input = self.input_buffers[g].data[c].as_ref().unwrap();
+                if by != 0 {
+                    for y in 0..(2 * by).min(sy) {
+                        topbottom.row_mut(y)[..sx].copy_from_slice(input.row(y));
+                        topbottom.row_mut(4 * by - 1 - y)[..sx]
+                            .copy_from_slice(input.row(sy - y - 1));
+                    }
+                }
+                if bx != 0 {
+                    let cs = (bx * 2 * ty.size()).min(sx);
+                    for y in 0..sy {
+                        let row_out = leftright.row_mut(y);
+                        let row_in = input.row(y);
+                        row_out[..cs].copy_from_slice(&row_in[..cs]);
+                        row_out[4 * bx * ty.size() - cs..].copy_from_slice(&row_in[sx - cs..]);
+                    }
+                }
+                self.input_buffers[g].leftright[c] = Some(leftright);
+                self.input_buffers[g].topbottom[c] = Some(topbottom);
+            }
+        }
+        self.input_buffers[g].is_ready = true;
+
+        // Compute readiness mask from 3x3 neighborhood.
+        let gxm1 = gx.saturating_sub(1);
+        let gym1 = gy.saturating_sub(1);
+        let gxp1 = (gx + 1).min(self.shared.group_count.0 - 1);
+        let gyp1 = (gy + 1).min(self.shared.group_count.1 - 1);
+        let gw = self.shared.group_count.0;
+        let mut ready_mask = [
+            self.input_buffers[gym1 * gw + gxm1].is_ready,
+            self.input_buffers[gym1 * gw + gx].is_ready,
+            self.input_buffers[gym1 * gw + gxp1].is_ready,
+            self.input_buffers[gy * gw + gxm1].is_ready,
+            self.input_buffers[gy * gw + gx].is_ready, // guaranteed true
+            self.input_buffers[gy * gw + gxp1].is_ready,
+            self.input_buffers[gyp1 * gw + gxm1].is_ready,
+            self.input_buffers[gyp1 * gw + gx].is_ready,
+            self.input_buffers[gyp1 * gw + gxp1].is_ready,
+        ];
+        // Corners require both adjacent sides to be ready.
+        ready_mask[0] &= ready_mask[1];
+        ready_mask[0] &= ready_mask[3];
+        ready_mask[2] &= ready_mask[1];
+        ready_mask[2] &= ready_mask[5];
+        ready_mask[6] &= ready_mask[3];
+        ready_mask[6] &= ready_mask[7];
+        ready_mask[8] &= ready_mask[5];
+        ready_mask[8] &= ready_mask[7];
+
+        // Collect renderable sub-rects.
+        let border_size = self.border_size;
+        let group_count = self.shared.group_count;
+        let mut items = Vec::new();
+        foreach_ready_rect(ready_mask, |xrange, yrange| {
+            let y0 = match (gy == 0, yrange.start) {
+                (true, 0) => group_rect.origin.1,
+                (false, 0) => group_rect.origin.1 - border_size.1,
+                (_, 1) => group_rect.origin.1 + border_size.1,
+                // (_, 2)
+                _ => group_rect.end().1 - border_size.1,
+            };
+            let x0 = match (gx == 0, xrange.start) {
+                (true, 0) => group_rect.origin.0,
+                (false, 0) => group_rect.origin.0 - border_size.0,
+                (_, 1) => group_rect.origin.0 + border_size.0,
+                // (_, 2)
+                _ => group_rect.end().0 - border_size.0,
+            };
+
+            let y1 = match (gy + 1 == group_count.1, yrange.end) {
+                (true, 3) => group_rect.end().1,
+                (false, 3) => group_rect.end().1 + border_size.1,
+                (_, 2) => group_rect.end().1 - border_size.1,
+                // (_, 1)
+                _ => group_rect.origin.1 + border_size.1,
+            };
+
+            let x1 = match (gx + 1 == group_count.0, xrange.end) {
+                (true, 3) => group_rect.end().0,
+                (false, 3) => group_rect.end().0 + border_size.0,
+                (_, 2) => group_rect.end().0 - border_size.0,
+                // (_, 1)
+                _ => group_rect.origin.0 + border_size.0,
+            };
+
+            items.push(RenderWorkItem {
+                gx,
+                gy,
+                image_area: Rect {
+                    origin: (x0, y0),
+                    size: (x1 - x0, y1 - y0),
+                },
+            });
+            Ok(())
+        })?;
+
+        Ok(items)
+    }
+
+    /// Recycles data and border buffers after rendering a group.
+    ///
+    /// When `recycle_borders` is false, only center data buffers are recycled
+    /// (border buffers are kept alive). This is used during adaptive batching
+    /// where cross-batch `process_output` stores can re-ready groups whose
+    /// neighbors' borders must remain valid.
+    pub(crate) fn recycle_group_buffers(&mut self, g: usize, recycle_borders: bool) {
+        let (gx, gy) = self.shared.group_position(g);
+
+        // Recycle center data buffers.
+        for c in 0..self.input_buffers[g].data.len() {
+            if let Some(b) = std::mem::take(&mut self.input_buffers[g].data[c]) {
+                self.store_scratch_buffer(c, 0, b);
+            }
+        }
+
+        if !recycle_borders {
+            return;
+        }
+
+        // Clear border buffers that will not be used again.
+        // This is certainly the case if *all* the groups in the 3x3 group area around
+        // the current group are complete.
+        if self.shared.group_chan_complete[g].iter().all(|x| *x) {
+            let gxm1 = gx.saturating_sub(1);
+            let gym1 = gy.saturating_sub(1);
+            let gxp1 = (gx + 1).min(self.shared.group_count.0 - 1);
+            let gyp1 = (gy + 1).min(self.shared.group_count.1 - 1);
+            let gw = self.shared.group_count.0;
+            for g in [
+                gym1 * gw + gxm1,
+                gym1 * gw + gx,
+                gym1 * gw + gxp1,
+                gy * gw + gxm1,
+                gy * gw + gx,
+                gy * gw + gxp1,
+                gyp1 * gw + gxm1,
+                gyp1 * gw + gx,
+                gyp1 * gw + gxp1,
+            ] {
+                self.input_buffers[g].num_completed_groups_3x3 += 1;
+                if self.input_buffers[g].num_completed_groups_3x3 != 9 {
+                    continue;
+                }
+                // Reset is_ready: once borders are recycled, this group must
+                // not appear "ready" in any neighbor's readiness mask, or
+                // rendering would try to read the recycled (None) buffers.
+                self.input_buffers[g].is_ready = false;
+                for c in 0..self.input_buffers[g].data.len() {
+                    if let Some(b) = std::mem::take(&mut self.input_buffers[g].topbottom[c]) {
+                        self.store_scratch_buffer(c, 1, b);
+                    }
+                    if let Some(b) = std::mem::take(&mut self.input_buffers[g].leftright[c]) {
+                        self.store_scratch_buffer(c, 2, b);
+                    }
+                }
+            }
+        }
+    }
+
+    /// Recycles all remaining border buffers (topbottom + leftright) across all
+    /// groups. Used after adaptive batching completes to free deferred borders.
+    pub(crate) fn recycle_all_borders(&mut self) {
+        for buf in &mut self.input_buffers {
+            buf.is_ready = false;
+            for c in 0..buf.data.len() {
+                if let Some(b) = std::mem::take(&mut buf.topbottom[c]) {
+                    self.scratch_channel_buffers[c * 3 + 1].push(b);
+                }
+                if let Some(b) = std::mem::take(&mut buf.leftright[c]) {
+                    self.scratch_channel_buffers[c * 3 + 2].push(b);
+                }
+            }
+        }
+    }
+
+    /// Sets is_ready and computes renderable work items for a group whose borders
+    /// have already been extracted (via `extract_borders`).
+    ///
+    /// MUST be called serially, in group index order. The is_ready flag is set
+    /// here (not in extract_borders) so that when computing the 3×3 readiness
+    /// mask, only groups that have already been emitted are marked ready. This
+    /// preserves the non-overlapping work-item guarantee: each border pixel is
+    /// rendered by exactly one group.
+    #[cfg(feature = "threads")]
+    #[allow(dead_code)] // Threaded work-item emission for parallel group rendering
+    pub(crate) fn emit_work_items(&mut self, g: usize) -> Result<Vec<RenderWorkItem>> {
+        // Set is_ready NOW (before computing the mask) so that subsequent groups
+        // see this group as ready. Earlier groups were already set in previous
+        // iterations of this serial loop.
+        self.input_buffers[g].is_ready = true;
+        let (gx, gy) = self.shared.group_position(g);
+
+        let gsz = 1 << self.shared.log_group_size;
+        let group_rect = Rect {
+            size: (gsz, gsz),
+            origin: (gsz * gx, gsz * gy),
+        }
+        .clip(self.shared.input_size);
+
+        // Compute readiness mask from 3x3 neighborhood.
+        let gxm1 = gx.saturating_sub(1);
+        let gym1 = gy.saturating_sub(1);
+        let gxp1 = (gx + 1).min(self.shared.group_count.0 - 1);
+        let gyp1 = (gy + 1).min(self.shared.group_count.1 - 1);
+        let gw = self.shared.group_count.0;
+        let mut ready_mask = [
+            self.input_buffers[gym1 * gw + gxm1].is_ready,
+            self.input_buffers[gym1 * gw + gx].is_ready,
+            self.input_buffers[gym1 * gw + gxp1].is_ready,
+            self.input_buffers[gy * gw + gxm1].is_ready,
+            self.input_buffers[gy * gw + gx].is_ready, // guaranteed true
+            self.input_buffers[gy * gw + gxp1].is_ready,
+            self.input_buffers[gyp1 * gw + gxm1].is_ready,
+            self.input_buffers[gyp1 * gw + gx].is_ready,
+            self.input_buffers[gyp1 * gw + gxp1].is_ready,
+        ];
+        // Corners require both adjacent sides to be ready.
+        ready_mask[0] &= ready_mask[1];
+        ready_mask[0] &= ready_mask[3];
+        ready_mask[2] &= ready_mask[1];
+        ready_mask[2] &= ready_mask[5];
+        ready_mask[6] &= ready_mask[3];
+        ready_mask[6] &= ready_mask[7];
+        ready_mask[8] &= ready_mask[5];
+        ready_mask[8] &= ready_mask[7];
+
+        let border_size = self.border_size;
+        let group_count = self.shared.group_count;
+        let mut items = Vec::new();
+        foreach_ready_rect(ready_mask, |xrange, yrange| {
+            let y0 = match (gy == 0, yrange.start) {
+                (true, 0) => group_rect.origin.1,
+                (false, 0) => group_rect.origin.1 - border_size.1,
+                (_, 1) => group_rect.origin.1 + border_size.1,
+                _ => group_rect.end().1 - border_size.1,
+            };
+            let x0 = match (gx == 0, xrange.start) {
+                (true, 0) => group_rect.origin.0,
+                (false, 0) => group_rect.origin.0 - border_size.0,
+                (_, 1) => group_rect.origin.0 + border_size.0,
+                _ => group_rect.end().0 - border_size.0,
+            };
+            let y1 = match (gy + 1 == group_count.1, yrange.end) {
+                (true, 3) => group_rect.end().1,
+                (false, 3) => group_rect.end().1 + border_size.1,
+                (_, 2) => group_rect.end().1 - border_size.1,
+                _ => group_rect.origin.1 + border_size.1,
+            };
+            let x1 = match (gx + 1 == group_count.0, xrange.end) {
+                (true, 3) => group_rect.end().0,
+                (false, 3) => group_rect.end().0 + border_size.0,
+                (_, 2) => group_rect.end().0 - border_size.0,
+                _ => group_rect.origin.0 + border_size.0,
+            };
+            items.push(RenderWorkItem {
+                gx,
+                gy,
+                image_area: Rect {
+                    origin: (x0, y0),
+                    size: (x1 - x0, y1 - y0),
+                },
+            });
+            Ok(())
+        })?;
+
+        Ok(items)
+    }
+
+    /// Process a group: prepare borders, render all ready sub-rects, recycle buffers.
+    pub(crate) fn render_with_new_group(
+        &mut self,
+        g: usize,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()> {
+        let items = self.prepare_group(g)?;
+        if items.is_empty() {
+            return Ok(());
+        }
+
+        let (origin, size) = if let Some(e) = self.shared.extend_stage_index {
+            let Stage::Extend(e) = &self.shared.stages[e] else {
+                unreachable!("extend stage is not an extend stage");
+            };
+            (e.frame_origin, e.image_size)
+        } else {
+            ((0, 0), self.shared.input_size)
+        };
+
+        {
+            let view = PipelineReadView {
+                shared: &self.shared,
+                input_buffers: &self.input_buffers,
+                stage_input_buffer_index: &self.stage_input_buffer_index,
+                downsampling_for_stage: &self.downsampling_for_stage,
+                stage_output_border_pixels: &self.stage_output_border_pixels,
+                input_border_pixels: &self.input_border_pixels,
+                border_size: self.border_size,
+                opaque_alpha_buffers: &self.opaque_alpha_buffers,
+                sorted_buffer_indices: &self.sorted_buffer_indices,
+            };
+            let ctx = &mut self.render_ctx;
+            let save_buffer_info = &self.save_buffer_info;
+
+            for item in &items {
+                let mut local_buffers = buffer_splitter.get_local_buffers(
+                    save_buffer_info,
+                    item.image_area,
+                    false,
+                    view.shared.input_size,
+                    size,
+                    origin,
+                );
+                render_group::render(
+                    ctx,
+                    &view,
+                    (item.gx, item.gy),
+                    item.image_area,
+                    &mut local_buffers,
+                )?;
+            }
+        }
+
+        self.recycle_group_buffers(g, !self.skip_border_recycling);
+
+        Ok(())
+    }
+}
+
+/// Extracts border data for a single group without computing work items.
+///
+/// This is the per-group workhorse for the parallel border extraction phase.
+/// It resets ready_channels, copies border data, and sets is_ready = true.
+/// Skips the scratch buffer pool (allocates fresh if needed) for thread safety.
+///
+/// When `skip_copy` is true, border data is not copied — the rendering phase
+/// will read border pixels directly from neighbors' center data buffers.
+/// This is only safe when ALL groups' center data remains alive through rendering
+/// (i.e., unbatched parallel mode where Phase 3b completes before Phase 3c recycles).
+///
+/// After all groups have had borders extracted, call `emit_work_items` serially
+/// to compute the readiness mask and work items (which reads neighbor is_ready).
+#[cfg(feature = "threads")]
+pub(super) fn extract_borders(
+    buf: &mut InputBuffer,
+    shared: &RenderPipelineShared<RowBuffer>,
+    border_size: (usize, usize),
+    skip_copy: bool,
+) -> Result<bool> {
+    // Use num_used_channels() — only channels with channel_is_used=true
+    // receive data from process_output. Matching prepare_group's check.
+    if buf.ready_channels != shared.num_used_channels() {
+        return Ok(false);
+    }
+    buf.ready_channels = 0;
+
+    if skip_copy {
+        // Direct borders mode: rendering reads from center data directly.
+        // No topbottom/leftright buffers needed.
+        return Ok(true);
+    }
+
+    // Extract border data from the group's buffers.
+    for c in 0..shared.num_channels() {
+        if !shared.channel_is_used[c] {
+            continue;
+        }
+        let (bx, by) = border_size;
+        let (sx, sy) = buf.data[c].as_ref().unwrap().byte_size();
+        let ChannelInfo {
+            ty,
+            downsample: (dx, dy),
+        } = shared.channel_info[0][c];
+        let ty = ty.unwrap();
+        let bx = bx >> dx;
+        let by = by >> dy;
+        // Take existing border buffer or allocate fresh (skip scratch pool for
+        // thread safety — no shared mutable pool access).
+        let mut topbottom = if let Some(b) = buf.topbottom[c].take() {
+            b
+        } else {
+            let height = 4 * by;
+            let width = (1 << shared.log_group_size) * ty.size();
+            OwnedRawImage::new_zeroed_with_padding((width, height), (0, 0), (0, 0))?
+        };
+        let mut leftright = if let Some(b) = buf.leftright[c].take() {
+            b
+        } else {
+            let height = 1 << shared.log_group_size;
+            let width = 4 * bx * ty.size();
+            OwnedRawImage::new_zeroed_with_padding((width, height), (0, 0), (0, 0))?
+        };
+        let input = buf.data[c].as_ref().unwrap();
+        if by != 0 {
+            for y in 0..(2 * by).min(sy) {
+                topbottom.row_mut(y)[..sx].copy_from_slice(input.row(y));
+                topbottom.row_mut(4 * by - 1 - y)[..sx].copy_from_slice(input.row(sy - y - 1));
+            }
+        }
+        if bx != 0 {
+            let cs = (bx * 2 * ty.size()).min(sx);
+            for y in 0..sy {
+                let row_out = leftright.row_mut(y);
+                let row_in = input.row(y);
+                row_out[..cs].copy_from_slice(&row_in[..cs]);
+                row_out[4 * bx * ty.size() - cs..].copy_from_slice(&row_in[sx - cs..]);
+            }
+        }
+        buf.leftright[c] = Some(leftright);
+        buf.topbottom[c] = Some(topbottom);
+    }
+    // NOTE: is_ready is NOT set here. It must be set serially during the
+    // emit_work_items phase to preserve the non-overlapping work item guarantee.
+    // See emit_work_items for details.
+
+    Ok(true)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_foreach_ready_rect() {
+        for i in 0..512 {
+            let mut ready_mask = [false; 9];
+            for j in 0..9 {
+                if (i >> j) & 1 == 1 {
+                    ready_mask[j] = true;
+                }
+            }
+            if !ready_mask[4] {
+                continue;
+            }
+
+            let mut covered = [false; 9];
+            foreach_ready_rect(ready_mask, |xr, yr| {
+                for y in yr {
+                    for x in xr.clone() {
+                        let idx = (y as usize) * 3 + (x as usize);
+                        assert!(
+                            ready_mask[idx],
+                            "Covered not ready index {} in mask {:?} (x={}, y={})",
+                            idx, ready_mask, x, y
+                        );
+                        assert!(
+                            !covered[idx],
+                            "Double coverage of index {} in mask {:?}",
+                            idx, ready_mask
+                        );
+                        covered[idx] = true;
+                    }
+                }
+                Ok(())
+            })
+            .unwrap();
+
+            for j in 0..9 {
+                if ready_mask[j] {
+                    assert!(
+                        covered[j],
+                        "Failed to cover index {} in mask {:?}",
+                        j, ready_mask
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/helpers.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/helpers.rs
new file mode 100644
index 00000000..b0748ed4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/helpers.rs
@@ -0,0 +1,86 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::low_memory_pipeline::render_group::ChannelVec;
+
+/// Returns a vector of &mut vals[idx[i].0][idx[i].1], in order of idx[i].2.
+/// Panics if any of the indices are out of bounds or
+/// (idx[i].0, idx[i].1) == (idx[j].0, idx[j].1) for i != j or indices are not
+/// sorted lexicographically.
+#[cfg(feature = "allow-unsafe")]
+#[inline]
+#[allow(unsafe_code)]
+pub(super) fn get_distinct_indices<'a, T>(
+    vals: &'a mut [impl AsMut<[T]>],
+    idx: &[(usize, usize, usize)],
+) -> ChannelVec<&'a mut T> {
+    let mut answer_buffer: ChannelVec<Option<&'a mut T>> = ChannelVec::new();
+    for _ in 0..idx.len() {
+        answer_buffer.push(None);
+    }
+
+    let mut prev_outer = usize::MAX;
+    let mut prev_inner = usize::MAX;
+    for &(outer, inner, pos) in idx {
+        assert!(
+            prev_outer == usize::MAX
+                || outer > prev_outer
+                || (outer == prev_outer && inner > prev_inner),
+            "indices must be sorted and distinct"
+        );
+        prev_outer = outer;
+        prev_inner = inner;
+
+        let buf = vals[outer].as_mut();
+        assert!(inner < buf.len(), "inner index out of bounds");
+        // SAFETY: indices are guaranteed distinct (no two (outer, inner) pairs are equal),
+        // so each &mut T points to a different element. We use raw pointers to avoid
+        // the borrow checker's inability to prove non-aliasing across loop iterations.
+        // Both pointer operations share this single safety justification.
+        let ptr = unsafe { buf.as_mut_ptr().add(inner) };
+        // SAFETY: `ptr` is in-bounds (asserted above) and unique (indices are distinct).
+        answer_buffer[pos] = Some(unsafe { &mut *ptr });
+    }
+
+    answer_buffer
+        .into_iter()
+        .map(|x| x.expect("Not all elements were found"))
+        .collect()
+}
+
+/// Safe fallback using split_at_mut to avoid aliasing mutable references.
+#[cfg(not(feature = "allow-unsafe"))]
+#[inline]
+pub(super) fn get_distinct_indices<'a, T>(
+    vals: &'a mut [impl AsMut<[T]>],
+    idx: &[(usize, usize, usize)],
+) -> ChannelVec<&'a mut T> {
+    let mut answer: ChannelVec<Option<&'a mut T>> = ChannelVec::new();
+    for _ in 0..idx.len() {
+        answer.push(None);
+    }
+
+    // Process each outer slice using split_at_mut to safely extract elements.
+    for (outer_idx, outer_val) in vals.iter_mut().enumerate() {
+        let mut remaining = outer_val.as_mut();
+        let mut base = 0usize;
+        for &(outer, inner, pos) in idx {
+            if outer != outer_idx {
+                continue;
+            }
+            debug_assert!(inner >= base, "indices must be sorted within each outer");
+            let (_, rest) = remaining.split_at_mut(inner - base);
+            let (element, after) = rest.split_first_mut().unwrap();
+            answer[pos] = Some(element);
+            remaining = after;
+            base = inner + 1;
+        }
+    }
+
+    answer
+        .into_iter()
+        .map(|x| x.expect("Not all elements were found"))
+        .collect()
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/mod.rs
new file mode 100644
index 00000000..85c4c33a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/mod.rs
@@ -0,0 +1,977 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::needless_range_loop)]
+
+use std::any::Any;
+
+use row_buffers::RowBuffer;
+
+use crate::api::JxlOutputBuffer;
+use crate::error::Result;
+use crate::image::{DataTypeTag, Image, ImageDataType, OwnedRawImage, Rect};
+use crate::render::MAX_BORDER;
+use crate::render::buffer_splitter::{BufferSplitter, SaveStageBufferInfo};
+use crate::render::internal::Stage;
+use crate::render::low_memory_pipeline::group_scheduler::InputBuffer;
+use crate::util::{ShiftRightCeil, tracing_wrappers::*};
+
+use super::RenderPipeline;
+use super::internal::{RenderPipelineShared, RunInOutStage, RunInPlaceStage};
+
+pub(crate) mod group_scheduler;
+mod helpers;
+pub(crate) mod render_group;
+pub(crate) mod row_buffers;
+mod run_stage;
+mod save;
+
+/// Per-thread mutable state used during group rendering.
+/// Extracting this from LowMemoryRenderPipeline enables parallel rendering
+/// with multiple GroupRenderContexts sharing the same immutable pipeline data.
+pub(crate) struct GroupRenderContext {
+    pub(super) row_buffers: Vec<Vec<RowBuffer>>,
+    pub(super) local_states: Vec<Option<Box<dyn Any + Send>>>,
+}
+
+/// Factory for creating `GroupRenderContext` from any thread.
+/// Captures only `Sync` data (row buffer dimensions + stage definitions).
+#[cfg(feature = "threads")]
+pub(crate) struct ContextFactory<'a> {
+    row_buffer_template: &'a [Vec<RowBuffer>],
+    shared: &'a RenderPipelineShared<RowBuffer>,
+}
+
+#[cfg(feature = "threads")]
+impl ContextFactory<'_> {
+    pub(crate) fn create(&self, thread_index: usize) -> Result<GroupRenderContext> {
+        let row_buffers = self
+            .row_buffer_template
+            .iter()
+            .map(|stage_bufs| {
+                stage_bufs
+                    .iter()
+                    .map(|buf| buf.new_like())
+                    .collect::<Result<Vec<_>>>()
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        let local_states = self
+            .shared
+            .stages
+            .iter()
+            .map(|x| x.init_local_state(thread_index))
+            .collect::<Result<Vec<_>>>()?;
+
+        Ok(GroupRenderContext {
+            row_buffers,
+            local_states,
+        })
+    }
+}
+
+/// Immutable view of pipeline data needed during rendering.
+/// Bundles all read-only references so render functions can operate
+/// without borrowing the entire pipeline.
+pub(crate) struct PipelineReadView<'a> {
+    pub(super) shared: &'a RenderPipelineShared<RowBuffer>,
+    pub(in crate::render::low_memory_pipeline) input_buffers: &'a [InputBuffer],
+    pub(super) stage_input_buffer_index: &'a [Vec<(usize, usize)>],
+    pub(super) downsampling_for_stage: &'a [(usize, usize)],
+    pub(super) stage_output_border_pixels: &'a [(usize, usize)],
+    pub(super) input_border_pixels: &'a [(usize, usize)],
+    pub(super) border_size: (usize, usize),
+    pub(super) opaque_alpha_buffers: &'a [Option<RowBuffer>],
+    pub(super) sorted_buffer_indices: &'a [Vec<(usize, usize, usize)>],
+}
+
+pub struct LowMemoryRenderPipeline {
+    shared: RenderPipelineShared<RowBuffer>,
+    input_buffers: Vec<InputBuffer>,
+    render_ctx: GroupRenderContext,
+    save_buffer_info: Vec<Option<SaveStageBufferInfo>>,
+    // The input buffer that each channel of each stage should use.
+    // This is indexed both by stage index (0 corresponds to input data, 1 to stage[0], etc) and by
+    // index *of those channels that are used*.
+    stage_input_buffer_index: Vec<Vec<(usize, usize)>>,
+    // Tracks whether we already rendered the padding around the core frame (if any).
+    padding_was_rendered: bool,
+    // The amount of pixels that each stage needs to *output* around the current group to
+    // run future stages correctly.
+    stage_output_border_pixels: Vec<(usize, usize)>,
+    // The amount of pixels that we need to read (for every channel) in non-edge groups to run all
+    // stages correctly.
+    input_border_pixels: Vec<(usize, usize)>,
+    // Size of the border, in image (i.e. non-downsampled) pixels.
+    border_size: (usize, usize),
+    // For every stage, the downsampling level of *any* channel that the stage uses at that point.
+    // Note that this must be equal across all the used channels.
+    downsampling_for_stage: Vec<(usize, usize)>,
+    // Pre-filled opaque alpha buffers for stages that need fill_opaque_alpha.
+    // Indexed by stage index; None if stage doesn't need alpha fill.
+    opaque_alpha_buffers: Vec<Option<RowBuffer>>,
+    // Sorted indices to call get_distinct_indices.
+    sorted_buffer_indices: Vec<Vec<(usize, usize, usize)>>,
+    // For each channel and the 3 kinds of buffers (center / topbottom / leftright), buffers that
+    // could be reused to store group data for that channel.
+    // Indexed by [3*channel] = center, [3*channel+1] = topbottom, [3*channel+2] = leftright.
+    scratch_channel_buffers: Vec<Vec<OwnedRawImage>>,
+    // When true, render_with_new_group skips border recycling (only recycles center data).
+    // Used during the final re-render pass to keep all groups' is_ready=true so that
+    // sequential processing produces the same readiness masks as the parallel path.
+    skip_border_recycling: bool,
+    // When true, set_buffer_for_group stores data but skips rendering.
+    // Used during the final re-render to fill all groups before the two-pass render.
+    store_only: bool,
+}
+
+impl RenderPipeline for LowMemoryRenderPipeline {
+    type Buffer = RowBuffer;
+
+    fn new_from_shared(shared: RenderPipelineShared<Self::Buffer>) -> Result<Self> {
+        let mut input_buffers = vec![];
+        let nc = shared.num_channels();
+        for _ in 0..shared.group_chan_complete.len() {
+            input_buffers.push(InputBuffer::new(nc));
+        }
+        let mut previous_inout: Vec<_> = (0..nc).map(|x| (0usize, x)).collect();
+        let mut stage_input_buffer_index = vec![];
+        let mut next_border_and_cur_downsample = vec![vec![]];
+
+        for ci in shared.channel_info[0].iter() {
+            next_border_and_cur_downsample[0].push((0, ci.downsample));
+        }
+
+        // For each stage, compute in which stage its input was buffered (the previous InOut
+        // stage). Also, compute for each InOut stage and channel the border with which the stage
+        // output is used; this will used to allocate buffers of the correct size.
+        for (i, stage) in shared.stages.iter().enumerate() {
+            stage_input_buffer_index.push(previous_inout.clone());
+            next_border_and_cur_downsample.push(vec![]);
+            if let Stage::InOut(p) = stage {
+                for (chan, (ps, pc)) in previous_inout.iter_mut().enumerate() {
+                    if !p.uses_channel(chan) {
+                        continue;
+                    }
+                    next_border_and_cur_downsample[*ps][*pc].0 = p.border().1;
+                    *ps = i + 1;
+                    *pc = next_border_and_cur_downsample[i + 1].len();
+                    next_border_and_cur_downsample[i + 1]
+                        .push((0, shared.channel_info[i + 1][chan].downsample));
+                }
+            }
+        }
+
+        let mut initial_buffers = vec![];
+        for chan in 0..nc {
+            initial_buffers.push(RowBuffer::new(
+                shared.channel_info[0][chan].ty.unwrap_or(DataTypeTag::U8),
+                next_border_and_cur_downsample[0][chan].0 as usize,
+                0,
+                0,
+                shared.chunk_size >> shared.channel_info[0][chan].downsample.0,
+            )?);
+        }
+        let mut row_buffers = vec![initial_buffers];
+
+        // Allocate buffers.
+        for (i, stage) in shared.stages.iter().enumerate() {
+            let mut stage_buffers = vec![];
+            for (next_y_border, (dsx, _)) in next_border_and_cur_downsample[i + 1].iter() {
+                stage_buffers.push(RowBuffer::new(
+                    stage.output_type().unwrap(),
+                    *next_y_border as usize,
+                    stage.shift().1 as usize,
+                    stage.shift().0 as usize,
+                    shared.chunk_size >> *dsx,
+                )?);
+            }
+            row_buffers.push(stage_buffers);
+        }
+        // Compute information to be used to compute sub-rects for "save" stages to operate on
+        // rects.
+        let mut save_buffer_info = vec![];
+        'stage: for (i, (s, ci)) in shared
+            .stages
+            .iter()
+            .zip(shared.channel_info.iter())
+            .enumerate()
+        {
+            let Stage::Save(s) = s else {
+                continue;
+            };
+            for (c, ci) in ci.iter().enumerate() {
+                if s.uses_channel(c) {
+                    let info = SaveStageBufferInfo {
+                        downsample: ci.downsample,
+                        orientation: s.orientation,
+                        byte_size: s.data_format.bytes_per_sample() * s.output_channels(),
+                        after_extend: shared.extend_stage_index.is_some_and(|e| i > e),
+                    };
+                    while save_buffer_info.len() <= s.output_buffer_index {
+                        save_buffer_info.push(None);
+                    }
+                    save_buffer_info[s.output_buffer_index] = Some(info);
+                    continue 'stage;
+                }
+            }
+        }
+
+        // Compute the amount of border pixels needed per channel, per stage.
+        let mut border_pixels = vec![(0usize, 0usize); nc];
+        let mut border_pixels_per_stage = vec![];
+        for s in shared.stages.iter().rev() {
+            let mut stage_max = (0, 0);
+            for (c, bp) in border_pixels.iter_mut().enumerate() {
+                if !s.uses_channel(c) {
+                    continue;
+                }
+                stage_max.0 = stage_max.0.max(bp.0);
+                stage_max.1 = stage_max.1.max(bp.1);
+
+                bp.0 = bp.0.shrc(s.shift().0) + s.border().0 as usize;
+                bp.1 = bp.1.shrc(s.shift().1) + s.border().1 as usize;
+            }
+            border_pixels_per_stage.push(stage_max);
+        }
+        border_pixels_per_stage.reverse();
+
+        assert!(border_pixels_per_stage[0].0 <= MAX_BORDER);
+
+        let downsampling_for_stage: Vec<_> = shared
+            .stages
+            .iter()
+            .zip(shared.channel_info.iter())
+            .map(|(s, ci)| {
+                let dowsamplings: Vec<_> = (0..nc)
+                    .filter_map(|c| {
+                        if s.uses_channel(c) {
+                            Some(ci[c].downsample)
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();
+                for &d in dowsamplings.iter() {
+                    assert_eq!(d, dowsamplings[0]);
+                }
+                (dowsamplings[0].0 as usize, dowsamplings[0].1 as usize)
+            })
+            .collect();
+
+        // Create opaque alpha buffers for save stages that need fill_opaque_alpha
+        let mut opaque_alpha_buffers = vec![];
+        for (i, stage) in shared.stages.iter().enumerate() {
+            if let Stage::Save(s) = stage {
+                if s.fill_opaque_alpha {
+                    let (dx, _dy) = downsampling_for_stage[i];
+                    let row_len = shared.chunk_size >> dx;
+                    let fill_pattern = s.data_format.opaque_alpha_bytes();
+                    let buf =
+                        RowBuffer::new_filled(s.data_format.data_type(), row_len, &fill_pattern)?;
+                    opaque_alpha_buffers.push(Some(buf));
+                } else {
+                    opaque_alpha_buffers.push(None);
+                }
+            } else {
+                opaque_alpha_buffers.push(None);
+            }
+        }
+
+        let default_channels: Vec<usize> = (0..nc).collect();
+        for (s, ibi) in stage_input_buffer_index.iter_mut().enumerate() {
+            let mut filtered = vec![];
+            // For SaveStage, use s.channels to get correct output ordering (e.g., BGRA).
+            let channels = if let Stage::Save(save_stage) = &shared.stages[s] {
+                save_stage.channels.as_slice()
+            } else {
+                default_channels.as_slice()
+            };
+            for &c in channels {
+                if shared.stages[s].uses_channel(c) {
+                    filtered.push(ibi[c]);
+                }
+            }
+            *ibi = filtered;
+        }
+
+        let sorted_buffer_indices = (0..shared.stages.len())
+            .map(|s| {
+                let mut v: Vec<_> = stage_input_buffer_index[s]
+                    .iter()
+                    .enumerate()
+                    .map(|(i, (outer, inner))| (*outer, *inner, i))
+                    .collect();
+                v.sort();
+                v
+            })
+            .collect();
+
+        let mut border_size = (0, 0);
+        for c in 0..nc {
+            border_size.0 = border_size
+                .0
+                .max(border_pixels[c].0 << shared.channel_info[0][c].downsample.0);
+            border_size.1 = border_size
+                .1
+                .max(border_pixels[c].1 << shared.channel_info[0][c].downsample.1);
+        }
+        for s in 0..shared.stages.len() {
+            border_size.0 = border_size
+                .0
+                .max(border_pixels_per_stage[s].0 << downsampling_for_stage[s].0);
+            border_size.1 = border_size
+                .1
+                .max(border_pixels_per_stage[s].1 << downsampling_for_stage[s].1);
+        }
+
+        let local_states: Vec<_> = shared
+            .stages
+            .iter()
+            .map(|x| x.init_local_state(0)) // Thread index 0 for single-threaded execution
+            .collect::<Result<_>>()?;
+
+        Ok(Self {
+            input_buffers,
+            stage_input_buffer_index,
+            render_ctx: GroupRenderContext {
+                row_buffers,
+                local_states,
+            },
+            padding_was_rendered: false,
+            save_buffer_info,
+            stage_output_border_pixels: border_pixels_per_stage,
+            border_size,
+            input_border_pixels: border_pixels,
+            shared,
+            downsampling_for_stage,
+            opaque_alpha_buffers,
+            sorted_buffer_indices,
+            scratch_channel_buffers: (0..nc * 3).map(|_| vec![]).collect(),
+            skip_border_recycling: false,
+            store_only: false,
+        })
+    }
+
+    #[instrument(skip_all, err)]
+    fn get_buffer<T: ImageDataType>(&mut self, channel: usize) -> Result<Image<T>> {
+        if let Some(b) = self.maybe_get_scratch_buffer(channel, 0) {
+            return Ok(Image::from_raw(b));
+        }
+        let sz = self.shared.group_size_for_channel(channel, T::DATA_TYPE_ID);
+        Image::<T>::new_uninit(sz)
+    }
+
+    fn set_buffer_for_group<T: ImageDataType>(
+        &mut self,
+        channel: usize,
+        group_id: usize,
+        complete: bool,
+        buf: Image<T>,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()> {
+        if self.shared.channel_is_used[channel] {
+            // Cascading transforms (squeeze, palette) may re-produce output
+            // for a channel/group already stored but not yet rendered (waiting
+            // for other channels). Skip the duplicate — the first buffer is
+            // valid and ready_channels is already incremented.
+            if self.input_buffers[group_id].has_buffer(channel) {
+                return Ok(());
+            }
+            debug!(
+                "filling data for group {}, channel {}, using type {:?}",
+                group_id,
+                channel,
+                T::DATA_TYPE_ID,
+            );
+            self.input_buffers[group_id].set_buffer(channel, buf.into_raw());
+            self.shared.group_chan_complete[group_id][channel] = complete;
+
+            if !self.store_only {
+                self.render_with_new_group(group_id, buffer_splitter)?;
+            }
+        }
+        Ok(())
+    }
+
+    fn check_buffer_sizes(&self, buffers: &mut [Option<JxlOutputBuffer>]) -> Result<()> {
+        // Check that buffer sizes are correct.
+        let mut size = self.shared.input_size;
+        for (i, s) in self.shared.stages.iter().enumerate() {
+            match s {
+                Stage::Extend(e) => size = e.image_size,
+                Stage::Save(s) => {
+                    let (dx, dy) = self.downsampling_for_stage[i];
+                    s.check_buffer_size(
+                        (size.0 >> dx, size.1 >> dy),
+                        buffers[s.output_buffer_index].as_ref(),
+                    )?
+                }
+                _ => {}
+            }
+        }
+        Ok(())
+    }
+
+    fn render_outside_frame(&mut self, buffer_splitter: &mut BufferSplitter) -> Result<()> {
+        if self.shared.extend_stage_index.is_none() || self.padding_was_rendered {
+            return Ok(());
+        }
+        self.padding_was_rendered = true;
+        // TODO(veluca): consider pre-computing those strips at pipeline construction and making
+        // smaller strips.
+        let e = self.shared.extend_stage_index.unwrap();
+        let Stage::Extend(e) = &self.shared.stages[e] else {
+            unreachable!("extend stage is not an extend stage");
+        };
+        let frame_end = (
+            e.frame_origin.0 + self.shared.input_size.0 as isize,
+            e.frame_origin.1 + self.shared.input_size.1 as isize,
+        );
+        // Split the full image area in 4 strips: left and right of the frame, and above and below.
+        // We divide each part further in strips of width self.shared.chunk_size.
+        let mut strips = vec![];
+        // Above (including left and right)
+        if e.frame_origin.1 > 0 {
+            let xend = e.image_size.0;
+            let yend = (e.frame_origin.1 as usize).min(e.image_size.1);
+            for x in (0..xend).step_by(self.shared.chunk_size) {
+                let xe = (x + self.shared.chunk_size).min(xend);
+                strips.push((x..xe, 0..yend));
+            }
+        }
+        // Below
+        if frame_end.1 < e.image_size.1 as isize {
+            let ystart = frame_end.1.max(0) as usize;
+            let yend = e.image_size.1;
+            let xend = e.image_size.0;
+            for x in (0..xend).step_by(self.shared.chunk_size) {
+                let xe = (x + self.shared.chunk_size).min(xend);
+                strips.push((x..xe, ystart..yend));
+            }
+        }
+        // Left
+        if e.frame_origin.0 > 0 {
+            let ystart = e.frame_origin.1.max(0) as usize;
+            let yend = (frame_end.1 as usize).min(e.image_size.1);
+            let xend = (e.frame_origin.0 as usize).min(e.image_size.0);
+            for x in (0..xend).step_by(self.shared.chunk_size) {
+                let xe = (x + self.shared.chunk_size).min(xend);
+                strips.push((x..xe, ystart..yend));
+            }
+        }
+        // Right
+        if frame_end.0 < e.image_size.0 as isize {
+            let xstart = frame_end.0.max(0) as usize;
+            let xend = e.image_size.0;
+            let ystart = e.frame_origin.1.max(0) as usize;
+            let yend = (frame_end.1 as usize).min(e.image_size.1);
+            for x in (xstart..xend).step_by(self.shared.chunk_size) {
+                let xe = (x + self.shared.chunk_size).min(xend);
+                strips.push((x..xe, ystart..yend));
+            }
+        }
+        let full_image_size = e.image_size;
+        for (xrange, yrange) in strips {
+            let rect_to_render = Rect {
+                origin: (xrange.start, yrange.start),
+                size: (xrange.clone().count(), yrange.clone().count()),
+            };
+            if rect_to_render.size.0 == 0 || rect_to_render.size.1 == 0 {
+                continue;
+            }
+            let mut local_buffers = buffer_splitter.get_local_buffers(
+                &self.save_buffer_info,
+                rect_to_render,
+                true,
+                full_image_size,
+                full_image_size,
+                (0, 0),
+            );
+            let view = PipelineReadView {
+                shared: &self.shared,
+                input_buffers: &self.input_buffers,
+                stage_input_buffer_index: &self.stage_input_buffer_index,
+                downsampling_for_stage: &self.downsampling_for_stage,
+                stage_output_border_pixels: &self.stage_output_border_pixels,
+                input_border_pixels: &self.input_border_pixels,
+                border_size: self.border_size,
+                opaque_alpha_buffers: &self.opaque_alpha_buffers,
+                sorted_buffer_indices: &self.sorted_buffer_indices,
+            };
+            render_group::render_outside(
+                &mut self.render_ctx,
+                &view,
+                xrange,
+                yrange,
+                &mut local_buffers,
+            )?;
+        }
+        Ok(())
+    }
+
+    fn mark_group_to_rerender(&mut self, g: usize) {
+        self.input_buffers[g].is_ready = false;
+    }
+
+    fn box_inout_stage<S: super::RenderPipelineInOutStage + Send + Sync>(
+        stage: S,
+    ) -> Box<dyn RunInOutStage<Self::Buffer> + Send + Sync> {
+        Box::new(stage)
+    }
+
+    fn box_inplace_stage<S: super::RenderPipelineInPlaceStage + Send + Sync>(
+        stage: S,
+    ) -> Box<dyn RunInPlaceStage<Self::Buffer> + Send + Sync> {
+        Box::new(stage)
+    }
+
+    fn used_channel_mask(&self) -> &[bool] {
+        &self.shared.channel_is_used
+    }
+
+    fn needs_border_rendering(&self) -> bool {
+        self.border_size != (0, 0)
+    }
+
+    fn prepare_final_rerender(&mut self) {
+        let num_groups = self.input_buffers.len();
+        for g in 0..num_groups {
+            self.input_buffers[g].is_ready = false;
+            self.input_buffers[g].num_completed_groups_3x3 = 0;
+            self.input_buffers[g].ready_channels = 0;
+            // Recycle all existing buffers so fresh data is stored.
+            for c in 0..self.input_buffers[g].data.len() {
+                if let Some(b) = std::mem::take(&mut self.input_buffers[g].data[c]) {
+                    self.store_scratch_buffer(c, 0, b);
+                }
+                if let Some(b) = std::mem::take(&mut self.input_buffers[g].topbottom[c]) {
+                    self.store_scratch_buffer(c, 1, b);
+                }
+                if let Some(b) = std::mem::take(&mut self.input_buffers[g].leftright[c]) {
+                    self.store_scratch_buffer(c, 2, b);
+                }
+            }
+        }
+        // Store-only mode: set_buffer_for_group stores data without rendering.
+        self.store_only = true;
+        self.skip_border_recycling = true;
+    }
+
+    fn render_all_groups_full_readiness(
+        &mut self,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()> {
+        let num_groups = self.shared.group_count.0 * self.shared.group_count.1;
+
+        // Pass 1: Extract borders for ALL groups, setting is_ready=true.
+        // This mirrors the parallel path's extract_borders phase — all groups
+        // become ready before any readiness masks are computed.
+        for g in 0..num_groups {
+            let _ = self.prepare_group(g)?;
+            // Work items are discarded — they reflect partial readiness since
+            // later groups aren't ready yet. We recompute with full readiness
+            // in Pass 2.
+        }
+
+        // Pass 2: All groups now have is_ready=true and borders extracted.
+        // Compute work items with full readiness masks and render.
+        let is_ready: Vec<bool> = self.input_buffers.iter().map(|b| b.is_ready).collect();
+        for g in 0..num_groups {
+            let items = group_scheduler::compute_work_items(
+                g,
+                &is_ready,
+                &self.shared,
+                self.border_size,
+                true,
+            )?;
+            if items.is_empty() {
+                continue;
+            }
+
+            let (origin, size) = if let Some(e) = self.shared.extend_stage_index {
+                let Stage::Extend(e) = &self.shared.stages[e] else {
+                    unreachable!("extend stage is not an extend stage");
+                };
+                (e.frame_origin, e.image_size)
+            } else {
+                ((0, 0), self.shared.input_size)
+            };
+
+            {
+                let view = PipelineReadView {
+                    shared: &self.shared,
+                    input_buffers: &self.input_buffers,
+                    stage_input_buffer_index: &self.stage_input_buffer_index,
+                    downsampling_for_stage: &self.downsampling_for_stage,
+                    stage_output_border_pixels: &self.stage_output_border_pixels,
+                    input_border_pixels: &self.input_border_pixels,
+                    border_size: self.border_size,
+                    opaque_alpha_buffers: &self.opaque_alpha_buffers,
+                    sorted_buffer_indices: &self.sorted_buffer_indices,
+                };
+                let ctx = &mut self.render_ctx;
+                let save_buffer_info = &self.save_buffer_info;
+
+                for item in &items {
+                    let mut local_buffers = buffer_splitter.get_local_buffers(
+                        save_buffer_info,
+                        item.image_area,
+                        false,
+                        view.shared.input_size,
+                        size,
+                        origin,
+                    );
+                    render_group::render(
+                        ctx,
+                        &view,
+                        (item.gx, item.gy),
+                        item.image_area,
+                        &mut local_buffers,
+                    )?;
+                }
+            }
+
+            self.recycle_group_buffers(g, false);
+        }
+
+        Ok(())
+    }
+
+    fn finish_final_rerender(&mut self) {
+        self.store_only = false;
+        self.skip_border_recycling = false;
+        self.recycle_all_borders();
+    }
+}
+
+/// Methods for the parallel rendering path.
+#[cfg(feature = "threads")]
+impl LowMemoryRenderPipeline {
+    /// Returns the pixel buffer size for a channel (used for parallel allocation).
+    pub(crate) fn pixel_buffer_size(&self, channel: usize) -> (usize, usize) {
+        self.shared
+            .group_size_for_channel(channel, crate::image::DataTypeTag::F32)
+    }
+
+    /// Returns true if a buffer has already been stored for this channel/group.
+    pub(crate) fn has_buffer(&self, channel: usize, group_id: usize) -> bool {
+        self.input_buffers[group_id].has_buffer(channel)
+    }
+
+    /// Stores a buffer for a group/channel without triggering rendering.
+    pub(crate) fn store_buffer_only<T: ImageDataType>(
+        &mut self,
+        channel: usize,
+        group_id: usize,
+        complete: bool,
+        buf: Image<T>,
+    ) {
+        self.input_buffers[group_id].set_buffer(channel, buf.into_raw());
+        self.shared.group_chan_complete[group_id][channel] = complete;
+    }
+
+    /// Creates a PipelineReadView borrowing the immutable state.
+    pub(crate) fn read_view(&self) -> PipelineReadView<'_> {
+        PipelineReadView {
+            shared: &self.shared,
+            input_buffers: &self.input_buffers,
+            stage_input_buffer_index: &self.stage_input_buffer_index,
+            downsampling_for_stage: &self.downsampling_for_stage,
+            stage_output_border_pixels: &self.stage_output_border_pixels,
+            input_border_pixels: &self.input_border_pixels,
+            border_size: self.border_size,
+            opaque_alpha_buffers: &self.opaque_alpha_buffers,
+            sorted_buffer_indices: &self.sorted_buffer_indices,
+        }
+    }
+
+    /// Returns the frame origin and full image size from the extend stage,
+    /// or defaults for non-extend pipelines.
+    pub(crate) fn extend_origin_size(&self) -> ((isize, isize), (usize, usize)) {
+        if let Some(e) = self.shared.extend_stage_index {
+            let Stage::Extend(e) = &self.shared.stages[e] else {
+                unreachable!("extend stage is not an extend stage");
+            };
+            (e.frame_origin, e.image_size)
+        } else {
+            ((0, 0), self.shared.input_size)
+        }
+    }
+
+    /// Returns a factory that can create GroupRenderContexts from any thread.
+    /// The returned factory is Send + Sync (captures only Sync data).
+    pub(crate) fn context_factory(&self) -> ContextFactory<'_> {
+        ContextFactory {
+            row_buffer_template: &self.render_ctx.row_buffers,
+            shared: &self.shared,
+        }
+    }
+
+    /// Returns the save buffer info for computing output sub-views.
+    pub(crate) fn save_buffer_info(&self) -> &[Option<SaveStageBufferInfo>] {
+        &self.save_buffer_info
+    }
+
+    /// Returns the input (frame) size.
+    pub(crate) fn input_size(&self) -> (usize, usize) {
+        self.shared.input_size
+    }
+
+    /// Prepares all groups that have all channels ready, in parallel.
+    ///
+    /// Phase 1 (parallel): Extracts border data for each ready group.
+    ///   Border extraction is per-group with no cross-group reads, so it
+    ///   can safely run in parallel. Skips the scratch buffer pool (allocates
+    ///   fresh if needed) for thread safety. Does NOT set is_ready.
+    ///
+    /// Phase 2 (serial): Sets is_ready and emits work items, in group index order.
+    ///   The is_ready flag is set here so that the 3×3 readiness mask reflects
+    ///   serial ordering, preserving the non-overlapping work-item guarantee.
+    ///
+    /// Returns the collected work items and a list of `(group_id, has_items)` pairs
+    /// for the caller to build render-info.
+    #[allow(clippy::type_complexity)]
+    pub(crate) fn prepare_groups_parallel(
+        &mut self,
+        skip_border_copy: bool,
+    ) -> Result<(Vec<group_scheduler::RenderWorkItem>, Vec<(usize, bool)>)> {
+        use group_scheduler::extract_borders;
+
+        let shared = &self.shared;
+        let border_size = self.border_size;
+
+        if skip_border_copy {
+            // Fast path: no border data to copy. Just check ready_channels
+            // and mark is_ready sequentially — each check is ~10ns, so rayon
+            // dispatch overhead would dominate for hundreds of groups.
+            let num_used = shared.num_used_channels();
+            let mut extracted_groups = Vec::with_capacity(self.input_buffers.len());
+            for (g, buf) in self.input_buffers.iter_mut().enumerate() {
+                if buf.ready_channels == num_used {
+                    buf.ready_channels = 0;
+                    buf.is_ready = true;
+                    extracted_groups.push(g);
+                }
+            }
+            let bs = self.border_size;
+            let mut items = Vec::with_capacity(extracted_groups.len());
+            let mut group_has_items = Vec::with_capacity(extracted_groups.len());
+            // Full readiness is common in one-shot mode.
+            let full_readiness = self.input_buffers.iter().all(|b| b.is_ready);
+            if full_readiness {
+                for &g in &extracted_groups {
+                    let empty_ready = []; // unused with full_readiness=true
+                    let group_items =
+                        group_scheduler::compute_work_items(g, &empty_ready, shared, bs, true)?;
+                    let has = !group_items.is_empty();
+                    items.extend(group_items);
+                    group_has_items.push((g, has));
+                }
+            } else {
+                let is_ready: Vec<bool> = self.input_buffers.iter().map(|b| b.is_ready).collect();
+                for &g in &extracted_groups {
+                    let group_items =
+                        group_scheduler::compute_work_items(g, &is_ready, shared, bs, false)?;
+                    let has = !group_items.is_empty();
+                    items.extend(group_items);
+                    group_has_items.push((g, has));
+                }
+            }
+            return Ok((items, group_has_items));
+        }
+
+        // Slow path: actual border extraction requires per-group mutable access
+        // to copy pixel data into topbottom/leftright buffers. Parallelize with rayon.
+        use rayon::prelude::*;
+
+        let extracted: Vec<bool> = self
+            .input_buffers
+            .par_iter_mut()
+            .map(|buf| extract_borders(buf, shared, border_size, false))
+            .collect::<Result<Vec<_>>>()?;
+
+        for (g, did_extract) in extracted.iter().enumerate() {
+            if *did_extract {
+                self.input_buffers[g].is_ready = true;
+            }
+        }
+        let is_ready: Vec<bool> = self.input_buffers.iter().map(|b| b.is_ready).collect();
+        let full_readiness = is_ready.iter().all(|&r| r);
+        let extracted_groups: Vec<usize> = extracted
+            .iter()
+            .enumerate()
+            .filter_map(|(g, &did)| if did { Some(g) } else { None })
+            .collect();
+        let shared = &self.shared;
+        let bs = self.border_size;
+        let mut items = Vec::with_capacity(extracted_groups.len());
+        let mut group_has_items = Vec::with_capacity(extracted_groups.len());
+        if full_readiness {
+            for &g in &extracted_groups {
+                let group_items =
+                    group_scheduler::compute_work_items(g, &is_ready, shared, bs, true)?;
+                let has = !group_items.is_empty();
+                items.extend(group_items);
+                group_has_items.push((g, has));
+            }
+        } else {
+            let results: Vec<(usize, Vec<group_scheduler::RenderWorkItem>)> = extracted_groups
+                .par_iter()
+                .map(|&g| {
+                    let items =
+                        group_scheduler::compute_work_items(g, &is_ready, shared, bs, false)?;
+                    Ok((g, items))
+                })
+                .collect::<Result<Vec<_>>>()?;
+            for (g, group_items) in results {
+                let has = !group_items.is_empty();
+                items.extend(group_items);
+                group_has_items.push((g, has));
+            }
+        }
+        Ok((items, group_has_items))
+    }
+
+    /// Returns the total number of groups in the pipeline.
+    pub(crate) fn num_groups(&self) -> usize {
+        self.input_buffers.len()
+    }
+
+    /// Stores pending pixel data and prepares groups in a single pass.
+    ///
+    /// `pending_stores` is indexed by group_id. Each entry is `Some((pixels, complete))`
+    /// for groups that have VarDCT pixel data to store from Phase 2, or `None` for groups
+    /// that were stored in the sequential Phase 3a-store (LF upsample, noise, modular).
+    ///
+    /// When `skip_border_copy` is true, runs sequentially (pixel store is just pointer
+    /// moves, no data copy). Otherwise parallelizes pixel store + border extraction.
+    #[allow(clippy::type_complexity)]
+    pub(crate) fn store_and_prepare_groups_parallel(
+        &mut self,
+        pending_stores: &mut [Option<([OwnedRawImage; 3], bool)>],
+        skip_border_copy: bool,
+    ) -> Result<(Vec<group_scheduler::RenderWorkItem>, Vec<(usize, bool)>)> {
+        // Set group_chan_complete for pending stores.
+        for (g, store) in pending_stores.iter().enumerate() {
+            if let Some((_, complete)) = store {
+                for c in 0..self.shared.group_chan_complete[g].len() {
+                    self.shared.group_chan_complete[g][c] = *complete;
+                }
+            }
+        }
+
+        let shared = &self.shared;
+        let border_size = self.border_size;
+
+        if skip_border_copy {
+            // Fast path: store pixels + check readiness sequentially.
+            // Pixel store is just moving OwnedRawImage pointers (~100 bytes each).
+            // Border check is comparing ready_channels to num_used_channels().
+            let num_used = shared.num_used_channels();
+            let mut extracted_groups = Vec::with_capacity(self.input_buffers.len());
+            for (g, (buf, store)) in self
+                .input_buffers
+                .iter_mut()
+                .zip(pending_stores.iter_mut())
+                .enumerate()
+            {
+                if let Some((pixels, _complete)) = store.take() {
+                    for (c, img) in pixels.into_iter().enumerate() {
+                        buf.set_buffer(c, img);
+                    }
+                }
+                if buf.ready_channels == num_used {
+                    buf.ready_channels = 0;
+                    buf.is_ready = true;
+                    extracted_groups.push(g);
+                }
+            }
+            let bs = self.border_size;
+            let mut items = Vec::with_capacity(extracted_groups.len());
+            let mut group_has_items = Vec::with_capacity(extracted_groups.len());
+            let full_readiness = self.input_buffers.iter().all(|b| b.is_ready);
+            if full_readiness {
+                for &g in &extracted_groups {
+                    let empty_ready = [];
+                    let group_items =
+                        group_scheduler::compute_work_items(g, &empty_ready, shared, bs, true)?;
+                    let has = !group_items.is_empty();
+                    items.extend(group_items);
+                    group_has_items.push((g, has));
+                }
+            } else {
+                let is_ready: Vec<bool> = self.input_buffers.iter().map(|b| b.is_ready).collect();
+                for &g in &extracted_groups {
+                    let group_items =
+                        group_scheduler::compute_work_items(g, &is_ready, shared, bs, false)?;
+                    let has = !group_items.is_empty();
+                    items.extend(group_items);
+                    group_has_items.push((g, has));
+                }
+            }
+            return Ok((items, group_has_items));
+        }
+
+        // Slow path: actual border extraction needs parallel mutable access.
+        use group_scheduler::extract_borders;
+        use rayon::prelude::*;
+
+        let extracted: Vec<bool> = self
+            .input_buffers
+            .par_iter_mut()
+            .zip(pending_stores.par_iter_mut())
+            .map(|(buf, store)| {
+                if let Some((pixels, _complete)) = store.take() {
+                    for (c, img) in pixels.into_iter().enumerate() {
+                        buf.set_buffer(c, img);
+                    }
+                }
+                extract_borders(buf, shared, border_size, false)
+            })
+            .collect::<Result<Vec<_>>>()?;
+
+        for (g, did_extract) in extracted.iter().enumerate() {
+            if *did_extract {
+                self.input_buffers[g].is_ready = true;
+            }
+        }
+        let is_ready: Vec<bool> = self.input_buffers.iter().map(|b| b.is_ready).collect();
+        let full_readiness = is_ready.iter().all(|&r| r);
+        let extracted_groups: Vec<usize> = extracted
+            .iter()
+            .enumerate()
+            .filter_map(|(g, &did)| if did { Some(g) } else { None })
+            .collect();
+        let shared = &self.shared;
+        let bs = self.border_size;
+        let mut items = Vec::with_capacity(extracted_groups.len());
+        let mut group_has_items = Vec::with_capacity(extracted_groups.len());
+        if full_readiness {
+            for &g in &extracted_groups {
+                let group_items =
+                    group_scheduler::compute_work_items(g, &is_ready, shared, bs, true)?;
+                let has = !group_items.is_empty();
+                items.extend(group_items);
+                group_has_items.push((g, has));
+            }
+        } else {
+            let results: Vec<(usize, Vec<group_scheduler::RenderWorkItem>)> = extracted_groups
+                .par_iter()
+                .map(|&g| {
+                    let items =
+                        group_scheduler::compute_work_items(g, &is_ready, shared, bs, false)?;
+                    Ok((g, items))
+                })
+                .collect::<Result<Vec<_>>>()?;
+            for (g, group_items) in results {
+                let has = !group_items.is_empty();
+                items.extend(group_items);
+                group_has_items.push((g, has));
+            }
+        }
+        Ok((items, group_has_items))
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/render_group.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/render_group.rs
new file mode 100644
index 00000000..8492b17a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/render_group.rs
@@ -0,0 +1,485 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::ops::Range;
+
+use crate::{
+    api::JxlOutputBuffer,
+    error::Result,
+    image::{DataTypeTag, Rect},
+    render::{
+        internal::{ChannelInfo, Stage},
+        low_memory_pipeline::{helpers::get_distinct_indices, run_stage::ExtraInfo},
+    },
+    util::{ShiftRightCeil, SmallVec, mirror, tracing_wrappers::*},
+};
+
+use super::{GroupRenderContext, PipelineReadView, row_buffers::RowBuffer};
+
+// Most images have at most 7 channels (RGBA + noise extra channels).
+// 8 gives a bit extra leeway and makes the size a power of two.
+pub(super) type ChannelVec<T> = SmallVec<[T; 8]>;
+
+fn apply_x_padding(
+    input_type: DataTypeTag,
+    row: &mut [u8],
+    to_pad: Range<isize>,
+    valid_pixels: Range<isize>,
+) {
+    let x0_offset = RowBuffer::x0_byte_offset() as isize;
+    let num_valid = valid_pixels.clone().count();
+    let sz = input_type.size();
+    match sz {
+        1 => {
+            for x in to_pad {
+                let sx = mirror(x - valid_pixels.start, num_valid) as isize + valid_pixels.start;
+                let from = (x0_offset + sx) as usize;
+                let to = (x0_offset + x) as usize;
+                row[to] = row[from];
+            }
+        }
+        2 => {
+            for x in to_pad {
+                let sx = mirror(x - valid_pixels.start, num_valid) as isize + valid_pixels.start;
+                let from = (x0_offset + sx * 2) as usize;
+                let to = (x0_offset + x * 2) as usize;
+                row[to] = row[from];
+                row[to + 1] = row[from + 1];
+            }
+        }
+        4 => {
+            for x in to_pad {
+                let sx = mirror(x - valid_pixels.start, num_valid) as isize + valid_pixels.start;
+                let from = (x0_offset + sx * 4) as usize;
+                let to = (x0_offset + x * 4) as usize;
+                row[to] = row[from];
+                row[to + 1] = row[from + 1];
+                row[to + 2] = row[from + 2];
+                row[to + 3] = row[from + 3];
+            }
+        }
+        _ => {
+            unimplemented!("only 1, 2 or 4 byte data types supported");
+        }
+    }
+}
+
+fn fill_initial_buffers(
+    ctx: &mut GroupRenderContext,
+    view: &PipelineReadView,
+    c: usize,
+    y: usize,
+    (x0, xsize): (usize, usize),
+    (gx, gy): (usize, usize),
+) {
+    if !view.shared.channel_is_used[c] {
+        return;
+    }
+    let ChannelInfo {
+        ty,
+        downsample: (dx, dy),
+    } = view.shared.channel_info[0][c];
+    let ty = ty.expect("Channel info should be populated at this point");
+    let group_ysize = 1 << (view.shared.log_group_size - dy as usize);
+    let group_xsize = 1 << (view.shared.log_group_size - dx as usize);
+
+    let (bx, by) = view.border_size;
+
+    let group_y0 = gy * group_ysize;
+    let group_x0 = gx << (view.shared.log_group_size - dx as usize);
+    let group_x1 = group_x0 + group_xsize;
+
+    // Determine which group row this y falls in and the row index within that group.
+    // When direct borders are active (topbottom is None), we compute center_y —
+    // the row index in the neighbor's center data. When borders are extracted
+    // (topbottom is Some), we compute the topbottom buffer index instead.
+    let direct_borders =
+        view.input_buffers[gy * view.shared.group_count.0 + gx].topbottom[c].is_none();
+
+    let (input_y, igy, is_topbottom) = if y < group_y0 {
+        let igy = gy - 1;
+        if direct_borders {
+            // center_y = y - igy * group_ysize (row in neighbor's center data)
+            (y + group_ysize - group_y0, igy, true)
+        } else {
+            (y + (by >> dy) * 4 - group_y0, igy, true)
+        }
+    } else if y >= group_y0 + group_ysize {
+        // For both direct and extracted borders, input_y = y - group_y0 - group_ysize
+        // (this is the center data row for the group below, or topbottom top-half index)
+        (y - group_y0 - group_ysize, gy + 1, true)
+    } else {
+        (y - group_y0, gy, false)
+    };
+
+    let output_row = ctx.row_buffers[0][c].get_row_mut::<u8>(y);
+
+    let copy_x0 = x0.saturating_sub(view.input_border_pixels[c].0);
+    let copy_x1 =
+        (x0 + xsize + view.input_border_pixels[c].0).min(view.shared.input_size.0.shrc(dx));
+
+    debug_assert!(copy_x1 >= group_x0);
+
+    let mut copy_byte_offset = RowBuffer::x0_byte_offset() - (x0 - copy_x0) * ty.size();
+
+    let base_gid = igy * view.shared.group_count.0 + gx;
+
+    // Previous group horizontally, if needed.
+    if copy_x0 < group_x0 {
+        let (input_buf, xs) = if direct_borders {
+            // Read directly from the neighbor's center data.
+            let buf = view.input_buffers[base_gid - 1].data[c].as_ref().unwrap();
+            let xs_bytes = buf.byte_size().0;
+            (buf, xs_bytes / ty.size())
+        } else if is_topbottom {
+            (
+                view.input_buffers[base_gid - 1].topbottom[c]
+                    .as_ref()
+                    .unwrap(),
+                group_xsize,
+            )
+        } else {
+            (
+                view.input_buffers[base_gid - 1].leftright[c]
+                    .as_ref()
+                    .unwrap(),
+                4 * (bx >> dx),
+            )
+        };
+        let input_row = input_buf.row(input_y);
+
+        let to_copy = (group_x0 - copy_x0) * ty.size();
+        let src_byte_offset = xs * ty.size() - to_copy;
+
+        output_row[copy_byte_offset..copy_byte_offset + to_copy]
+            .copy_from_slice(&input_row[src_byte_offset..src_byte_offset + to_copy]);
+        copy_byte_offset += to_copy;
+    }
+    let input_buf = if is_topbottom && !direct_borders {
+        view.input_buffers[base_gid].topbottom[c].as_ref().unwrap()
+    } else {
+        view.input_buffers[base_gid].data[c].as_ref().unwrap()
+    };
+    let input_row = input_buf.row(input_y);
+    let copy_start = copy_x0.saturating_sub(group_x0) * ty.size();
+    let copy_end = (copy_x1.min(group_x1) - group_x0) * ty.size();
+    let to_copy = copy_end - copy_start;
+    output_row[copy_byte_offset..copy_byte_offset + to_copy]
+        .copy_from_slice(&input_row[copy_start..copy_end]);
+    copy_byte_offset += to_copy;
+    // Next group horizontally, if any.
+    if copy_x1 > group_x1 {
+        let input_buf = if direct_borders {
+            view.input_buffers[base_gid + 1].data[c].as_ref().unwrap()
+        } else if is_topbottom {
+            view.input_buffers[base_gid + 1].topbottom[c]
+                .as_ref()
+                .unwrap()
+        } else {
+            view.input_buffers[base_gid + 1].leftright[c]
+                .as_ref()
+                .unwrap()
+        };
+        let input_row = input_buf.row(input_y);
+        let dx = view.shared.channel_info[0][c].downsample.0;
+        let gid = gy * view.shared.group_count.0 + gx;
+        let next_group_xsize = view.shared.group_size(gid + 1).0.shrc(dx);
+        let border_x = (copy_x1 - group_x1).min(next_group_xsize);
+        output_row[copy_byte_offset..copy_byte_offset + border_x * ty.size()]
+            .copy_from_slice(&input_row[..border_x * ty.size()]);
+        if border_x + group_x1 < copy_x1 {
+            let pad_from = (xsize + border_x) as isize;
+            let pad_to = (xsize + copy_x1 - group_x1) as isize;
+            apply_x_padding(ty, output_row, pad_from..pad_to, 0..pad_from);
+        }
+    }
+}
+
+// Renders *parts* of group's worth of data.
+// In particular, renders the sub-rectangle given in `image_area`, where (1, 1) refers to
+// the center of the group, and 0 and 2 include data from the neighbouring group (if any).
+#[instrument(skip(ctx, view, buffers))]
+pub(crate) fn render(
+    ctx: &mut GroupRenderContext,
+    view: &PipelineReadView,
+    (gx, gy): (usize, usize),
+    image_area: Rect,
+    buffers: &mut [Option<JxlOutputBuffer>],
+) -> Result<()> {
+    let start_of_row = image_area.origin.0 == 0;
+    let end_of_row = image_area.end().0 == view.shared.input_size.0;
+
+    let Rect {
+        origin: (x0, y0),
+        size: (xsize, num_rows),
+    } = image_area;
+
+    let num_channels = view.shared.num_channels();
+    let num_extra_rows = view.border_size.1;
+
+    // This follows the same implementation strategy as the C++ code in libjxl.
+    // We pretend that every stage has a vertical shift of 0, i.e. it is as tall
+    // as the final image.
+    // We call each such row a "virtual" row, because it may or may not correspond
+    // to an actual row of the current processing stage; actual processing happens
+    // when vy % (1<<vshift) == 0.
+
+    let vy0 = y0.saturating_sub(num_extra_rows);
+    let vy1 = image_area.end().1 + num_extra_rows;
+
+    for vy in vy0..vy1 {
+        let mut current_origin = (0, 0);
+        let mut current_size = view.shared.input_size;
+
+        // Step 1: read input channels.
+        for c in 0..num_channels {
+            // Same logic as below, but adapted to the input stage.
+            let (dx, dy) = view.shared.channel_info[0][c].downsample;
+            let scaled_y_border = view.input_border_pixels[c].1 << dy;
+            let stage_vy = vy as isize - num_extra_rows as isize + scaled_y_border as isize;
+            if stage_vy % (1 << dy) != 0 {
+                continue;
+            }
+            if stage_vy - (y0 as isize) < -(scaled_y_border as isize) {
+                continue;
+            }
+            let y = stage_vy >> dy;
+            // Do not produce rows in out-of-bounds areas.
+            if y < 0 || y >= view.shared.input_size.1.shrc(dy) as isize {
+                continue;
+            }
+            let y = y as usize;
+            fill_initial_buffers(ctx, view, c, y, (x0 >> dx, xsize >> dx), (gx, gy));
+        }
+        // Step 2: go through stages one by one.
+        for (i, stage) in view.shared.stages.iter().enumerate() {
+            let (dx, dy) = view.downsampling_for_stage[i];
+            // The logic below uses *virtual* y coordinates, so we need to convert the border
+            // amount appropriately.
+            let scaled_y_border = view.stage_output_border_pixels[i].1 << dy;
+            // I knew the reason behind this formula at some point, but now I don't.
+            let stage_vy = vy as isize - num_extra_rows as isize + scaled_y_border as isize;
+            if stage_vy % (1 << dy) != 0 {
+                continue;
+            }
+            if stage_vy - (y0 as isize) < -(scaled_y_border as isize) {
+                continue;
+            }
+            let y = stage_vy >> dy;
+            let shifted_ysize = view.shared.input_size.1.shrc(dy);
+            // Do not produce rows in out-of-bounds areas.
+            if y < 0 || y >= shifted_ysize as isize {
+                continue;
+            }
+            let y = y as usize;
+
+            let out_extra_x = view.stage_output_border_pixels[i].0;
+            let shifted_xsize = xsize.shrc(dx);
+
+            match stage {
+                Stage::InPlace(s) => {
+                    let mut buffers =
+                        get_distinct_indices(&mut ctx.row_buffers, &view.sorted_buffer_indices[i]);
+                    s.run_stage_on(
+                        ExtraInfo {
+                            xsize: shifted_xsize,
+                            current_row: y,
+                            group_x0: x0 >> dx,
+                            out_extra_x,
+                            start_of_row,
+                            end_of_row,
+                            image_height: shifted_ysize,
+                        },
+                        &mut buffers,
+                        ctx.local_states[i].as_deref_mut(),
+                    );
+                }
+                Stage::Save(s) => {
+                    // Find buffers for channels that will be saved.
+                    // Channel ordering is handled in stage_input_buffer_index construction.
+                    let mut input_data: ChannelVec<_> = view.stage_input_buffer_index[i]
+                        .iter()
+                        .map(|(si, ci)| &ctx.row_buffers[*si][*ci])
+                        .collect();
+                    // Append opaque alpha buffer if fill_opaque_alpha is set
+                    if let Some(ref alpha_buf) = view.opaque_alpha_buffers[i] {
+                        input_data.push(alpha_buf);
+                    }
+                    s.save_lowmem(
+                        &input_data,
+                        &mut *buffers,
+                        (xsize >> dx, num_rows >> dy),
+                        y,
+                        (x0 >> dx, y0 >> dy),
+                        current_size,
+                        current_origin,
+                    )?;
+                }
+                Stage::Extend(s) => {
+                    current_size = s.image_size;
+                    current_origin = s.frame_origin;
+                }
+                Stage::InOut(s) => {
+                    let borderx = s.border().0 as usize;
+                    let bordery = s.border().1 as isize;
+                    // Apply x padding.
+                    if gx == 0 && borderx != 0 {
+                        for (si, ci) in view.stage_input_buffer_index[i].iter() {
+                            for iy in -bordery..=bordery {
+                                let y = mirror(y as isize + iy, shifted_ysize);
+                                apply_x_padding(
+                                    s.input_type(),
+                                    ctx.row_buffers[*si][*ci].get_row_mut::<u8>(y),
+                                    -(borderx as isize)..0,
+                                    // Either xsize is the actual size of the image, or it is
+                                    // much larger than borderx, so this works out either way.
+                                    0..shifted_xsize as isize,
+                                );
+                            }
+                        }
+                    }
+                    if gx + 1 == view.shared.group_count.0 && borderx != 0 {
+                        for (si, ci) in view.stage_input_buffer_index[i].iter() {
+                            for iy in -bordery..=bordery {
+                                let y = mirror(y as isize + iy, shifted_ysize);
+                                apply_x_padding(
+                                    s.input_type(),
+                                    ctx.row_buffers[*si][*ci].get_row_mut::<u8>(y),
+                                    shifted_xsize as isize..(shifted_xsize + borderx) as isize,
+                                    // borderx..0 is either data from the neighbouring group or
+                                    // data that was filled in by the iteration above.
+                                    -(borderx as isize)..shifted_xsize as isize,
+                                );
+                            }
+                        }
+                    }
+                    let (inb, outb) = ctx.row_buffers.split_at_mut(i + 1);
+                    // Prepare pointers to input and output buffers.
+                    let input_data: ChannelVec<_> = view.stage_input_buffer_index[i]
+                        .iter()
+                        .map(|(si, ci)| &inb[*si][*ci])
+                        .collect();
+                    s.run_stage_on(
+                        ExtraInfo {
+                            xsize: shifted_xsize,
+                            current_row: y,
+                            group_x0: x0 >> dx,
+                            out_extra_x,
+                            start_of_row,
+                            end_of_row,
+                            image_height: shifted_ysize,
+                        },
+                        &input_data,
+                        &mut outb[0][..],
+                        ctx.local_states[i].as_deref_mut(),
+                    );
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+// Renders a chunk of data outside the current frame.
+#[instrument(skip(ctx, view, buffers))]
+pub(super) fn render_outside(
+    ctx: &mut GroupRenderContext,
+    view: &PipelineReadView,
+    xrange: Range<usize>,
+    yrange: Range<usize>,
+    buffers: &mut [Option<JxlOutputBuffer>],
+) -> Result<()> {
+    let num_channels = view.shared.num_channels();
+    let x0 = xrange.start;
+    let y0 = yrange.start;
+    let xsize = xrange.clone().count();
+    let ysize = yrange.clone().count();
+    // Significantly simplified version of render_group.
+    for y in yrange.clone() {
+        let extend = view.shared.extend_stage_index.unwrap();
+        // Step 1: get padding from extend stage.
+        for c in 0..num_channels {
+            let (si, ci) = view.stage_input_buffer_index[extend][c];
+            let buffer = &mut ctx.row_buffers[si][ci];
+            let Stage::Extend(extend) = &view.shared.stages[extend] else {
+                unreachable!("extend stage is not an extend stage");
+            };
+            let row = &mut buffer.get_row_mut(y)[RowBuffer::x0_offset::<f32>()..];
+            extend.process_row_chunk((x0, y), xsize, c, row);
+        }
+        // Step 2: go through remaining stages one by one.
+        for (i, stage) in view.shared.stages.iter().enumerate().skip(extend + 1) {
+            assert_eq!(view.downsampling_for_stage[i], (0, 0));
+
+            match stage {
+                Stage::InPlace(s) => {
+                    let mut buffers =
+                        get_distinct_indices(&mut ctx.row_buffers, &view.sorted_buffer_indices[i]);
+                    s.run_stage_on(
+                        ExtraInfo {
+                            xsize,
+                            current_row: y,
+                            group_x0: x0,
+                            out_extra_x: 0,
+                            start_of_row: false,
+                            end_of_row: false,
+                            image_height: view.shared.input_size.1,
+                        },
+                        &mut buffers,
+                        ctx.local_states[i].as_deref_mut(),
+                    );
+                }
+                Stage::Save(s) => {
+                    // Find buffers for channels that will be saved.
+                    // Channel ordering is handled in stage_input_buffer_index construction.
+                    let mut input_data: ChannelVec<_> = view.stage_input_buffer_index[i]
+                        .iter()
+                        .map(|(si, ci)| &ctx.row_buffers[*si][*ci])
+                        .collect();
+                    // Append opaque alpha buffer if fill_opaque_alpha is set
+                    if let Some(ref alpha_buf) = view.opaque_alpha_buffers[i] {
+                        input_data.push(alpha_buf);
+                    }
+                    s.save_lowmem(
+                        &input_data,
+                        &mut *buffers,
+                        (xsize, ysize),
+                        y,
+                        (x0, y0),
+                        (xrange.end, yrange.end), // this is not true, but works out correctly.
+                        (0, 0),
+                    )?;
+                }
+                Stage::Extend(_) => {
+                    unreachable!("duplicate extend stage");
+                }
+                Stage::InOut(s) => {
+                    assert_eq!(s.border(), (0, 0));
+                    let (inb, outb) = ctx.row_buffers.split_at_mut(i + 1);
+                    // Prepare pointers to input and output buffers.
+                    let input_data: ChannelVec<_> = view.stage_input_buffer_index[i]
+                        .iter()
+                        .map(|(si, ci)| &inb[*si][*ci])
+                        .collect();
+                    s.run_stage_on(
+                        ExtraInfo {
+                            xsize,
+                            current_row: y,
+                            group_x0: x0,
+                            out_extra_x: 0,
+                            start_of_row: false,
+                            end_of_row: false,
+                            image_height: view.shared.input_size.1,
+                        },
+                        &input_data,
+                        &mut outb[0][..],
+                        ctx.local_states[i].as_deref_mut(),
+                    );
+                }
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/row_buffers.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/row_buffers.rs
new file mode 100644
index 00000000..16cb87d6
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/row_buffers.rs
@@ -0,0 +1,128 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::ops::Range;
+
+use crate::{
+    error::Result,
+    image::{DataTypeTag, ImageDataType},
+    render::MAX_BORDER,
+    util::{
+        CACHE_LINE_BYTE_SIZE, CacheLine, SmallVec, num_per_cache_line, slice_from_cachelines,
+        slice_from_cachelines_mut,
+    },
+};
+
+/// Temporary storage for data rows. Note that the first pixel of the group is expected to be
+/// located *one cacheline worth of data* inside the row.
+pub struct RowBuffer {
+    buffer: Box<[CacheLine]>,
+    // Distance (in number of *cache lines*) between the start of two rows.
+    row_stride: usize,
+    // Number of rows that are actually stored.
+    // TODO(veluca): consider padding this to a power of 2 and using & here. In *most* cases,
+    // that's not a huge loss in memory usage (for most images, num_rows is 1/3/5/7, which would
+    // become 1/4/8/8).
+    num_rows: usize,
+}
+
+impl RowBuffer {
+    pub fn new(
+        data_type: DataTypeTag,
+        next_y_border: usize,
+        y_shift: usize,
+        x_shift: usize,
+        row_len: usize,
+    ) -> Result<Self> {
+        let num_rows = (1 << y_shift) + 2 * next_y_border;
+        let num_rows = num_rows.next_power_of_two();
+        // Input offset is at *one* cacheline, and we need up to *two* cachelines on the other
+        // side as the data might exceed xsize slightly.
+        let row_stride =
+            (row_len * data_type.size()).div_ceil(CACHE_LINE_BYTE_SIZE) + (3 << x_shift);
+        let mut buffer = Vec::<CacheLine>::new();
+        buffer.try_reserve_exact(row_stride * num_rows)?;
+        buffer.resize(row_stride * num_rows, CacheLine::default());
+        let buffer = buffer.into_boxed_slice();
+        Ok(Self {
+            buffer,
+            row_stride,
+            num_rows,
+        })
+    }
+
+    /// Creates a new zeroed row buffer with the same dimensions as this one.
+    #[cfg(feature = "threads")]
+    pub fn new_like(&self) -> Result<Self> {
+        let mut buffer = Vec::<CacheLine>::new();
+        buffer.try_reserve_exact(self.buffer.len())?;
+        buffer.resize(self.buffer.len(), CacheLine::default());
+        Ok(Self {
+            buffer: buffer.into_boxed_slice(),
+            row_stride: self.row_stride,
+            num_rows: self.num_rows,
+        })
+    }
+
+    /// Creates a new row buffer with a single row filled with a repeating pattern.
+    /// Used for constant values like opaque alpha.
+    pub fn new_filled(data_type: DataTypeTag, row_len: usize, fill_pattern: &[u8]) -> Result<Self> {
+        let mut result = Self::new(data_type, 0, 0, 0, row_len)?;
+        let row_bytes: &mut [u8] = result.get_row_mut(0);
+
+        // Fill the *entire* allocated row, including the padding on both sides,
+        // so cross-group border sampling doesn't read zeros (transparent alpha).
+        for (i, byte) in row_bytes.iter_mut().enumerate() {
+            *byte = fill_pattern[i % fill_pattern.len()];
+        }
+
+        Ok(result)
+    }
+
+    #[inline]
+    pub fn get_row<T: ImageDataType>(&self, row: usize) -> &[T] {
+        let row_idx = row & (self.num_rows - 1);
+        let start = row_idx * self.row_stride;
+        slice_from_cachelines(&self.buffer[start..start + self.row_stride])
+    }
+
+    #[inline]
+    pub fn get_row_mut<T: ImageDataType>(&mut self, row: usize) -> &mut [T] {
+        let row_idx = row & (self.num_rows - 1);
+        let stride = self.row_stride;
+        let start = row_idx * stride;
+        slice_from_cachelines_mut(&mut self.buffer[start..start + stride])
+    }
+
+    pub fn get_rows_mut<T: ImageDataType>(
+        &mut self,
+        y: Range<usize>,
+        xoffset: usize,
+    ) -> SmallVec<[&mut [T]; 8]> {
+        assert!(y.clone().count() <= self.num_rows);
+        let first_row_idx = y.start & (self.num_rows - 1);
+        let stride = self.row_stride;
+        let start = first_row_idx * stride;
+        let num_pre = (y.clone().count() + first_row_idx).saturating_sub(self.num_rows);
+        let num_post = y.clone().count() - num_pre;
+        let buf = &mut self.buffer[..];
+        let (pre, post) = buf.split_at_mut(start);
+        let pre_rows = pre.chunks_exact_mut(stride).take(num_pre);
+        let post_rows = post.chunks_exact_mut(stride).take(num_post);
+        post_rows
+            .chain(pre_rows)
+            .map(|x| &mut slice_from_cachelines_mut(x)[xoffset..])
+            .collect()
+    }
+
+    pub const fn x0_offset<T: ImageDataType>() -> usize {
+        assert!(num_per_cache_line::<T>() >= MAX_BORDER);
+        num_per_cache_line::<T>()
+    }
+
+    pub const fn x0_byte_offset() -> usize {
+        CACHE_LINE_BYTE_SIZE
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/run_stage.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/run_stage.rs
new file mode 100644
index 00000000..9c383283
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/run_stage.rs
@@ -0,0 +1,156 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::any::Any;
+
+use crate::{
+    render::{
+        Channels, ChannelsMut, RunInPlaceStage,
+        internal::{PipelineBuffer, RunInOutStage},
+        low_memory_pipeline::render_group::ChannelVec,
+    },
+    util::{ShiftRightCeil, SmallVec, mirror, tracing_wrappers::*},
+};
+
+use super::{
+    super::{RenderPipelineInOutStage, RenderPipelineInPlaceStage},
+    row_buffers::RowBuffer,
+};
+
+pub struct ExtraInfo {
+    // Number of *input* pixels to process (ignoring additional border pixels).
+    pub(super) xsize: usize,
+    // Additional border pixels requested in the output on each side, if not first/last xgroup.
+    pub(super) out_extra_x: usize,
+    pub(super) current_row: usize,
+    pub(super) group_x0: usize,
+    pub(super) start_of_row: bool,
+    pub(super) end_of_row: bool,
+    pub(super) image_height: usize,
+}
+
+impl PipelineBuffer for RowBuffer {
+    type InPlaceExtraInfo = ExtraInfo;
+    type InOutExtraInfo = ExtraInfo;
+}
+
+impl<T: RenderPipelineInPlaceStage> RunInPlaceStage<RowBuffer> for T {
+    #[instrument(skip_all)]
+    fn run_stage_on(
+        &self,
+        ExtraInfo {
+            xsize,
+            current_row,
+            group_x0,
+            out_extra_x,
+            image_height: _,
+            start_of_row,
+            end_of_row,
+        }: ExtraInfo,
+        buffers: &mut [&mut RowBuffer],
+        state: Option<&mut (dyn Any + Send)>,
+    ) {
+        let x0 = RowBuffer::x0_offset::<T::Type>();
+        let xpre = if start_of_row { 0 } else { out_extra_x };
+        let xstart = x0 - xpre;
+        let xend = x0 + xsize + if end_of_row { 0 } else { out_extra_x };
+        let mut rows: ChannelVec<_> = buffers
+            .iter_mut()
+            .map(|x| &mut x.get_row_mut::<T::Type>(current_row)[xstart..])
+            .collect();
+
+        self.process_row_chunk(
+            (group_x0 - xpre, current_row),
+            xend - xstart,
+            &mut rows[..],
+            state,
+        );
+    }
+}
+
+impl<T: RenderPipelineInOutStage> RunInOutStage<RowBuffer> for T {
+    #[instrument(skip_all)]
+    fn run_stage_on(
+        &self,
+        ExtraInfo {
+            xsize,
+            current_row,
+            group_x0,
+            out_extra_x,
+            image_height,
+            start_of_row,
+            end_of_row,
+        }: ExtraInfo,
+        input_buffers: &[&RowBuffer],
+        output_buffers: &mut [RowBuffer],
+        state: Option<&mut (dyn Any + Send)>,
+    ) {
+        let ibordery = Self::BORDER.1 as isize;
+        let x0 = RowBuffer::x0_offset::<T::InputT>();
+        let xpre = if start_of_row {
+            0
+        } else {
+            out_extra_x.shrc(T::SHIFT.0)
+        };
+        let xstart = x0 - xpre;
+        let xend = x0
+            + xsize
+            + if end_of_row {
+                0
+            } else {
+                out_extra_x.shrc(T::SHIFT.0)
+            };
+
+        // Build flat input rows: all rows for all channels in one Vec
+        let input_rows_per_channel = (2 * Self::BORDER.1 + 1) as usize;
+        let num_channels = input_buffers.len();
+        let mut input_row_data = SmallVec::new();
+        for x in input_buffers.iter() {
+            for iy in -ibordery..=ibordery {
+                input_row_data.push(
+                    &x.get_row::<T::InputT>(mirror(current_row as isize + iy, image_height))
+                        [xstart - Self::BORDER.0 as usize..],
+                );
+            }
+        }
+        let input_rows = Channels::new(input_row_data, num_channels, input_rows_per_channel);
+
+        // Build flat output rows: all rows for all channels in one Vec
+        let output_rows_per_channel = 1 << T::SHIFT.1;
+        let num_output_channels = output_buffers.len();
+        let mut output_row_data = SmallVec::new();
+        // optimize for the common case of a single output row per channel.
+        if output_rows_per_channel == 1 {
+            // Use OutputT's x0_offset, not InputT's - they differ for type conversions (e.g., f32→u8).
+            // Must apply the same offset calculation as the else branch.
+            let output_xstart = RowBuffer::x0_offset::<T::OutputT>() - (xpre << T::SHIFT.0);
+            for x in output_buffers.iter_mut() {
+                let row = x.get_row_mut::<T::OutputT>(current_row);
+                output_row_data.push(&mut row[output_xstart..]);
+            }
+        } else {
+            for x in output_buffers.iter_mut() {
+                let rows = x.get_rows_mut::<T::OutputT>(
+                    (current_row << T::SHIFT.1)..((current_row + 1) << T::SHIFT.1),
+                    RowBuffer::x0_offset::<T::OutputT>() - (xpre << T::SHIFT.0),
+                );
+                output_row_data.extend(rows);
+            }
+        }
+        let mut output_rows = ChannelsMut::new(
+            output_row_data,
+            num_output_channels,
+            output_rows_per_channel,
+        );
+
+        self.process_row_chunk(
+            (group_x0 - xpre, current_row),
+            xend - xstart,
+            &input_rows,
+            &mut output_rows,
+            state,
+        );
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/save/identity.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/save/identity.rs
new file mode 100644
index 00000000..c6b10160
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/save/identity.rs
@@ -0,0 +1,274 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::ops::Range;
+
+use jxl_simd::{F32SimdVec, SimdDescriptor, U8SimdVec, U16SimdVec, simd_function};
+
+use crate::{
+    api::{Endianness, JxlDataFormat, JxlOutputBuffer},
+    render::low_memory_pipeline::row_buffers::RowBuffer,
+};
+
+macro_rules! define_run_interleaved {
+    ($fn_name:ident, $ty:ty, $vec_trait:ident, $store_fn:ident, $cnt:expr, $($arg:ident),+) => {
+        #[inline(always)]
+        fn $fn_name<D: SimdDescriptor>(
+            d: D,
+            $($arg: &[$ty]),+,
+            out: &mut [$ty],
+        ) -> usize {
+            let len = D::$vec_trait::LEN;
+            let mut n = 0;
+            let limit = [$($arg.len()),+][0];
+
+            {
+                let out_chunks = out[..limit * $cnt].chunks_exact_mut(len * $cnt);
+                $(let mut $arg = $arg.chunks_exact(len);)+
+                for out_chunk in out_chunks {
+                    $(let $arg = D::$vec_trait::load(d, $arg.next().unwrap());)+
+                    D::$vec_trait::$store_fn($($arg),+, out_chunk);
+                    n += len;
+                }
+            }
+
+            let d256 = d.maybe_downgrade_256bit();
+            let len256 = <D::Descriptor256 as SimdDescriptor>::$vec_trait::LEN;
+            if len256 < len {
+                let out_chunks = out[n * $cnt..limit * $cnt].chunks_exact_mut(len256 * $cnt);
+                $(let mut $arg = $arg[n..limit].chunks_exact(len256);)+
+                for out_chunk in out_chunks {
+                    $(let $arg = <D::Descriptor256 as SimdDescriptor>::$vec_trait::load(d256, $arg.next().unwrap());)+
+                    <D::Descriptor256 as SimdDescriptor>::$vec_trait::$store_fn($($arg),+, out_chunk);
+                    n += len256;
+                }
+            }
+
+            let d128 = d.maybe_downgrade_128bit();
+            let len128 = <D::Descriptor128 as SimdDescriptor>::$vec_trait::LEN;
+            if len128 < len {
+                let out_chunks = out[n * $cnt..limit * $cnt].chunks_exact_mut(len128 * $cnt);
+                $(let mut $arg = $arg[n..limit].chunks_exact(len128);)+
+                for out_chunk in out_chunks {
+                    $(let $arg = <D::Descriptor128 as SimdDescriptor>::$vec_trait::load(d128, $arg.next().unwrap());)+
+                    <D::Descriptor128 as SimdDescriptor>::$vec_trait::$store_fn($($arg),+, out_chunk);
+                    n += len128;
+                }
+            }
+
+            n
+        }
+    };
+}
+
+define_run_interleaved!(
+    run_interleaved_2_f32,
+    f32,
+    F32Vec,
+    store_interleaved_2,
+    2,
+    a,
+    b
+);
+define_run_interleaved!(
+    run_interleaved_3_f32,
+    f32,
+    F32Vec,
+    store_interleaved_3,
+    3,
+    a,
+    b,
+    c
+);
+define_run_interleaved!(
+    run_interleaved_4_f32,
+    f32,
+    F32Vec,
+    store_interleaved_4,
+    4,
+    a,
+    b,
+    c,
+    e
+);
+
+simd_function!(
+    store_interleaved_f32,
+    d: D,
+    fn store_interleaved_impl_f32(
+        inputs: &[&[f32]],
+        output: &mut [f32]
+    ) -> usize {
+        match inputs.len() {
+            2 => run_interleaved_2_f32(d, inputs[0], inputs[1], output),
+            3 => run_interleaved_3_f32(d, inputs[0], inputs[1], inputs[2], output),
+            4 => run_interleaved_4_f32(d, inputs[0], inputs[1], inputs[2], inputs[3], output),
+            _ => 0,
+        }
+    }
+);
+
+define_run_interleaved!(
+    run_interleaved_2_u8,
+    u8,
+    U8Vec,
+    store_interleaved_2,
+    2,
+    a,
+    b
+);
+define_run_interleaved!(
+    run_interleaved_3_u8,
+    u8,
+    U8Vec,
+    store_interleaved_3,
+    3,
+    a,
+    b,
+    c
+);
+define_run_interleaved!(
+    run_interleaved_4_u8,
+    u8,
+    U8Vec,
+    store_interleaved_4,
+    4,
+    a,
+    b,
+    c,
+    e
+);
+
+simd_function!(
+    store_interleaved_u8,
+    d: D,
+    fn store_interleaved_impl_u8(
+        inputs: &[&[u8]],
+        output: &mut [u8]
+    ) -> usize {
+        match inputs.len() {
+            2 => run_interleaved_2_u8(d, inputs[0], inputs[1], output),
+            3 => run_interleaved_3_u8(d, inputs[0], inputs[1], inputs[2], output),
+            4 => run_interleaved_4_u8(d, inputs[0], inputs[1], inputs[2], inputs[3], output),
+            _ => 0,
+        }
+    }
+);
+
+define_run_interleaved!(
+    run_interleaved_2_u16,
+    u16,
+    U16Vec,
+    store_interleaved_2,
+    2,
+    a,
+    b
+);
+define_run_interleaved!(
+    run_interleaved_3_u16,
+    u16,
+    U16Vec,
+    store_interleaved_3,
+    3,
+    a,
+    b,
+    c
+);
+define_run_interleaved!(
+    run_interleaved_4_u16,
+    u16,
+    U16Vec,
+    store_interleaved_4,
+    4,
+    a,
+    b,
+    c,
+    e
+);
+
+simd_function!(
+    store_interleaved_u16,
+    d: D,
+    fn store_interleaved_impl_u16(
+        inputs: &[&[u16]],
+        output: &mut [u16]
+    ) -> usize {
+        match inputs.len() {
+            2 => run_interleaved_2_u16(d, inputs[0], inputs[1], output),
+            3 => run_interleaved_3_u16(d, inputs[0], inputs[1], inputs[2], output),
+            4 => run_interleaved_4_u16(d, inputs[0], inputs[1], inputs[2], inputs[3], output),
+            _ => 0,
+        }
+    }
+);
+
+pub(super) fn store(
+    input_buf: &[&RowBuffer],
+    input_y: usize,
+    xrange: Range<usize>,
+    output_buf: &mut JxlOutputBuffer,
+    output_y: usize,
+    data_format: JxlDataFormat,
+) -> usize {
+    let byte_start = xrange.start * data_format.bytes_per_sample() + RowBuffer::x0_byte_offset();
+    let byte_end = xrange.end * data_format.bytes_per_sample() + RowBuffer::x0_byte_offset();
+    let is_native_endian = match data_format {
+        JxlDataFormat::U8 { .. } => true,
+        JxlDataFormat::F16 { endianness, .. }
+        | JxlDataFormat::U16 { endianness, .. }
+        | JxlDataFormat::F32 { endianness, .. } => endianness == Endianness::native(),
+    };
+    let output_buf = output_buf.row_mut(output_y);
+    let output_buf = &mut output_buf[0..(byte_end - byte_start) * input_buf.len()];
+    match (
+        input_buf.len(),
+        data_format.bytes_per_sample(),
+        is_native_endian,
+    ) {
+        (1, _, true) => {
+            // We can just do a memcpy.
+            let input_buf = &input_buf[0].get_row::<u8>(input_y)[byte_start..byte_end];
+            assert_eq!(input_buf.len(), output_buf.len());
+            output_buf.copy_from_slice(input_buf);
+            input_buf.len() / data_format.bytes_per_sample()
+        }
+        (channels, 1, true) if (2..=4).contains(&channels) => {
+            let start_u8 = byte_start;
+            let end_u8 = byte_end;
+            let mut slices = [&[] as &[u8]; 4];
+            for (i, buf) in input_buf.iter().enumerate() {
+                slices[i] = &buf.get_row::<u8>(input_y)[start_u8..end_u8];
+            }
+            store_interleaved_u8(&slices[..channels], output_buf)
+        }
+        (channels, 2, true) if (2..=4).contains(&channels) => {
+            if let Ok(output_u16) = bytemuck::try_cast_slice_mut::<u8, u16>(output_buf) {
+                let start_u16 = byte_start / 2;
+                let end_u16 = byte_end / 2;
+                let mut slices = [&[] as &[u16]; 4];
+                for (i, buf) in input_buf.iter().enumerate() {
+                    slices[i] = &buf.get_row::<u16>(input_y)[start_u16..end_u16];
+                }
+                store_interleaved_u16(&slices[..channels], output_u16)
+            } else {
+                0
+            }
+        }
+        (channels, 4, true) if (2..=4).contains(&channels) => {
+            if let Ok(output_f32) = bytemuck::try_cast_slice_mut::<u8, f32>(output_buf) {
+                let start_f32 = byte_start / 4;
+                let end_f32 = byte_end / 4;
+                let mut slices = [&[] as &[f32]; 4];
+                for (i, buf) in input_buf.iter().enumerate() {
+                    slices[i] = &buf.get_row::<f32>(input_y)[start_f32..end_f32];
+                }
+                store_interleaved_f32(&slices[..channels], output_f32)
+            } else {
+                0
+            }
+        }
+        _ => 0,
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/save/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/save/mod.rs
new file mode 100644
index 00000000..a7bab326
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/low_memory_pipeline/save/mod.rs
@@ -0,0 +1,143 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::{Endianness, JxlDataFormat, JxlOutputBuffer},
+    error::Result,
+    headers::Orientation,
+    render::save::SaveStage,
+};
+
+use super::row_buffers::RowBuffer;
+
+mod identity;
+
+// Placeholder slow implementation.
+impl SaveStage {
+    // Takes as input only those channels that are *actually* saved.
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn save_lowmem(
+        &self,
+        data: &[&RowBuffer],
+        buffers: &mut [Option<JxlOutputBuffer>],
+        group_size: (usize, usize),
+        frame_y: usize,
+        group_origin: (usize, usize),
+        full_image_size: (usize, usize),
+        frame_origin: (isize, isize),
+    ) -> Result<()> {
+        let Some(buf) = buffers[self.output_buffer_index].as_mut() else {
+            return Ok(());
+        };
+
+        let group_y = frame_y - group_origin.1;
+
+        let relative_full_image_start = (
+            -frame_origin.0 - (group_origin.0 as isize),
+            -frame_origin.1 - (group_origin.1 as isize),
+        );
+
+        let relative_full_image_end = (
+            relative_full_image_start.0 + full_image_size.0 as isize,
+            relative_full_image_start.1 + full_image_size.1 as isize,
+        );
+
+        let save_start = (
+            relative_full_image_start.0.max(0) as usize,
+            relative_full_image_start.1.max(0) as usize,
+        );
+
+        let save_end = (
+            relative_full_image_end.0.clamp(0, group_size.0 as isize) as usize,
+            relative_full_image_end.1.clamp(0, group_size.1 as isize) as usize,
+        );
+
+        // If the visible area were empty, we'd have gotten None for the buffer.
+        assert!(save_start.0 < save_end.0);
+        assert!(save_start.1 < save_end.1);
+
+        if !(save_start.1..save_end.1).contains(&group_y) {
+            // The current row is outside the visible area - skip rendering it.
+            return Ok(());
+        }
+
+        let relative_y = group_y - save_start.1;
+
+        let save_size = (save_end.0 - save_start.0, save_end.1 - save_start.1);
+
+        let num_fast = match self.orientation {
+            Orientation::Identity => identity::store(
+                data,
+                frame_y,
+                save_start.0..save_end.0,
+                buf,
+                relative_y,
+                self.data_format,
+            ),
+            Orientation::FlipVertical => identity::store(
+                data,
+                frame_y,
+                save_start.0..save_end.0,
+                buf,
+                save_size.1 - 1 - relative_y,
+                self.data_format,
+            ),
+            _ => 0,
+        };
+
+        macro_rules! write_pixel {
+            ($px: expr, $endianness: expr, $y: expr, $x: expr) => {
+                let px = $px;
+                let px_bytes = if $endianness == Endianness::LittleEndian {
+                    px.to_le_bytes()
+                } else {
+                    px.to_be_bytes()
+                };
+                buf.write_bytes($y, $x, &px_bytes);
+            };
+        }
+
+        for (c, d) in data.iter().enumerate() {
+            let nc = self.output_channels();
+            let (x0, y0) = self.orientation.display_pixel((0, relative_y), save_size);
+            let x0 = x0 as isize;
+            let y0 = y0 as isize;
+            // Compute the per-pixel step directly from the orientation rather
+            // than via `display_pixel((1, ..))`, which would underflow when
+            // `save_size.0 == 1` and the orientation flips x.
+            let (dx, dy) = self.orientation.display_row_step();
+            match self.data_format {
+                JxlDataFormat::U8 { .. } => {
+                    let src_row = d.get_row::<u8>(frame_y);
+                    for ix in (save_start.0..save_end.0).skip(num_fast) {
+                        let px = src_row[RowBuffer::x0_offset::<u8>() + ix];
+                        let y = (y0 + (dy * (ix - save_start.0) as isize)) as usize;
+                        let x = (x0 + (dx * (ix - save_start.0) as isize)) as usize;
+                        write_pixel!(px, Endianness::LittleEndian, y, x * nc + c);
+                    }
+                }
+                JxlDataFormat::U16 { endianness, .. } | JxlDataFormat::F16 { endianness, .. } => {
+                    let src_row = d.get_row::<u16>(frame_y);
+                    for ix in (save_start.0..save_end.0).skip(num_fast) {
+                        let px = src_row[RowBuffer::x0_offset::<u16>() + ix];
+                        let y = (y0 + (dy * (ix - save_start.0) as isize)) as usize;
+                        let x = (x0 + (dx * (ix - save_start.0) as isize)) as usize;
+                        write_pixel!(px, endianness, y, (x * nc + c) * 2);
+                    }
+                }
+                JxlDataFormat::F32 { endianness, .. } => {
+                    let src_row = d.get_row::<f32>(frame_y);
+                    for ix in (save_start.0..save_end.0).skip(num_fast) {
+                        let px = src_row[RowBuffer::x0_offset::<f32>() + ix];
+                        let y = (y0 + (dy * (ix - save_start.0) as isize)) as usize;
+                        let x = (x0 + (dx * (ix - save_start.0) as isize)) as usize;
+                        write_pixel!(px, endianness, y, (x * nc + c) * 4);
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/mod.rs
new file mode 100644
index 00000000..e0fc6ac2
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/mod.rs
@@ -0,0 +1,179 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use internal::{RenderPipelineShared, RunInOutStage, RunInPlaceStage};
+use std::any::Any;
+
+use crate::{
+    api::JxlOutputBuffer,
+    error::Result,
+    image::{Image, ImageDataType},
+    render::buffer_splitter::BufferSplitter,
+};
+
+pub mod buffer_splitter;
+mod builder;
+mod channels;
+mod internal;
+pub mod low_memory_pipeline;
+pub mod save;
+mod simd_utils;
+#[cfg(test)]
+mod simple_pipeline;
+pub mod stages;
+#[cfg(test)]
+mod test;
+
+// Interesting border amounts:
+// - 0 (lossless)
+// - 1 (420 JPEG recompression)
+// - 4 (Gaborish + EPF 1 + EPF 2)
+// - 7 (Gaborish + EPF 0 + EPF 1 + EPF 2)
+// - 9 (Gaborish + EPF 0/1/2 + upsampling)
+// Note: adding 420 does *not* increase this value, because on chroma channels we get
+// 9.div_ceil(2)+1 = 6 pixels of border, below the 9 for luma.
+const MAX_BORDER: usize = 9;
+
+pub(crate) use builder::RenderPipelineBuilder;
+pub(crate) use channels::{Channels, ChannelsMut};
+pub(crate) use low_memory_pipeline::LowMemoryRenderPipeline;
+#[cfg(test)]
+pub(crate) use simple_pipeline::SimpleRenderPipeline;
+
+pub enum StageSpecialCase {
+    F32ToU8 { channel: usize, bit_depth: u8 },
+    ModularToF32 { channel: usize, bit_depth: u8 },
+}
+
+/// Modifies channels in-place.
+pub trait RenderPipelineInPlaceStage: Any + std::fmt::Display + Send + Sync {
+    type Type: ImageDataType;
+
+    fn process_row_chunk(
+        &self,
+        position: (usize, usize),
+        xsize: usize,
+        // one for each channel
+        row: &mut [&mut [Self::Type]],
+        state: Option<&mut (dyn Any + Send)>,
+    );
+
+    fn init_local_state(&self, _thread_index: usize) -> Result<Option<Box<dyn Any + Send>>> {
+        Ok(None)
+    }
+
+    fn uses_channel(&self, c: usize) -> bool;
+
+    fn is_special_case(&self) -> Option<StageSpecialCase> {
+        None
+    }
+}
+
+/// Modifies data and writes it to a new buffer, of possibly different type.
+///
+/// BORDER.0 and BORDER.1 represent the amount of padding required on the input side.
+/// SHIFT.0 and SHIFT.1 represent the base 2 log of the number of rows/columns produced
+/// for each row/column of input.
+///
+/// For each channel:
+///  - the input slice contains 1 + BORDER.1 * 2 slices, each of length
+///    xsize + BORDER.0 * 2, i.e. covering one input row and up to BORDER pixels of
+///    padding on either side.
+///  - the output slice contains 1 << SHIFT.1 slices, each of length xsize << SHIFT.0, the
+///    corresponding output pixels.
+pub trait RenderPipelineInOutStage: Any + std::fmt::Display + Send + Sync {
+    type InputT: ImageDataType;
+    type OutputT: ImageDataType;
+
+    const BORDER: (u8, u8);
+    const SHIFT: (u8, u8);
+
+    fn process_row_chunk(
+        &self,
+        position: (usize, usize),
+        xsize: usize,
+        // channel, row, column
+        input_rows: &Channels<Self::InputT>,
+        // channel, row, column
+        output_rows: &mut ChannelsMut<Self::OutputT>,
+        state: Option<&mut (dyn Any + Send)>,
+    );
+
+    fn init_local_state(&self, _thread_index: usize) -> Result<Option<Box<dyn Any + Send>>> {
+        Ok(None)
+    }
+
+    fn uses_channel(&self, c: usize) -> bool;
+
+    fn is_special_case(&self) -> Option<StageSpecialCase> {
+        None
+    }
+}
+
+// TODO(veluca): find a way to reduce the generated code due to having two builders, to integrate
+// SIMD dispatch in the pipeline, and to test consistency across instruction sets in the pipeline.
+pub(crate) trait RenderPipeline: Sized {
+    type Buffer: 'static;
+
+    fn new_from_shared(shared: RenderPipelineShared<Self::Buffer>) -> Result<Self>;
+
+    /// Obtains a buffer suitable for storing the input in channel `channel`.
+    /// This *might* be a buffer that was used to store that channel for that group in a previous
+    /// pass, a new buffer, or a re-used buffer from i.e. previously decoded frames.
+    fn get_buffer<T: ImageDataType>(&mut self, channel: usize) -> Result<Image<T>>;
+
+    /// Gives back the buffer for a channel and group to the render pipeline, marking whether
+    /// this will be the last time that this function is called for this group.
+    fn set_buffer_for_group<T: ImageDataType>(
+        &mut self,
+        channel: usize,
+        group_id: usize,
+        complete: bool,
+        buf: Image<T>,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()>;
+
+    /// Checks whether the provided buffer sizes are correct.
+    fn check_buffer_sizes(&self, buffers: &mut [Option<JxlOutputBuffer>]) -> Result<()>;
+
+    /// Renders any data outside the frame that would not be rendered by calls to
+    /// set_buffer_for_group. Can be called multiple times - it is up to the pipeline
+    /// implementation to ensure rendering only happens once.
+    fn render_outside_frame(&mut self, buffer_splitter: &mut BufferSplitter) -> Result<()>;
+
+    // Marks a group for being re-rendered later.
+    fn mark_group_to_rerender(&mut self, g: usize);
+
+    fn box_inout_stage<S: RenderPipelineInOutStage + Send + Sync>(
+        stage: S,
+    ) -> Box<dyn RunInOutStage<Self::Buffer> + Send + Sync>;
+
+    fn box_inplace_stage<S: RenderPipelineInPlaceStage + Send + Sync>(
+        stage: S,
+    ) -> Box<dyn RunInPlaceStage<Self::Buffer> + Send + Sync>;
+
+    fn used_channel_mask(&self) -> &[bool];
+
+    /// Returns true if the pipeline uses border data for rendering (EPF, etc.).
+    /// When false, readiness masks don't affect output, so no re-render is needed.
+    fn needs_border_rendering(&self) -> bool;
+
+    /// Prepares for the final re-render of all groups after incremental decode
+    /// completes. Enables store-only mode and recycles existing buffers so
+    /// fresh data can be stored without triggering rendering.
+    fn prepare_final_rerender(&mut self);
+
+    /// Renders all groups with full readiness masks, matching the one-shot
+    /// parallel path. Pass 1 extracts borders for all groups (setting
+    /// is_ready=true), then Pass 2 computes work items with all-true
+    /// readiness and renders.
+    fn render_all_groups_full_readiness(
+        &mut self,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()>;
+
+    /// Restores normal state after the final re-render.
+    fn finish_final_rerender(&mut self);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/save.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/save.rs
new file mode 100644
index 00000000..e48bb001
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/save.rs
@@ -0,0 +1,100 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::{JxlColorType, JxlDataFormat, JxlOutputBuffer},
+    error::{Error, Result},
+    headers::Orientation,
+    image::DataTypeTag,
+};
+
+#[derive(Debug)]
+pub struct SaveStage {
+    pub(super) channels: Vec<usize>,
+    pub(super) orientation: Orientation,
+    pub(super) output_buffer_index: usize,
+    pub(super) color_type: JxlColorType,
+    pub(super) data_format: JxlDataFormat,
+    /// When true, fill alpha channel with opaque (1.0) values.
+    /// Used when RGBA output is requested but image has no alpha channel.
+    pub(super) fill_opaque_alpha: bool,
+}
+
+impl SaveStage {
+    pub fn new(
+        channels: &[usize],
+        orientation: Orientation,
+        output_buffer_index: usize,
+        mut color_type: JxlColorType,
+        data_format: JxlDataFormat,
+        fill_opaque_alpha: bool,
+    ) -> SaveStage {
+        let mut channels = channels.to_vec();
+        if color_type == JxlColorType::Bgr {
+            color_type = JxlColorType::Rgb;
+            channels.swap(0, 2);
+        }
+        if color_type == JxlColorType::Bgra {
+            color_type = JxlColorType::Rgba;
+            channels.swap(0, 2);
+        }
+        Self {
+            channels,
+            orientation,
+            output_buffer_index,
+            color_type,
+            data_format,
+            fill_opaque_alpha,
+        }
+    }
+
+    /// Returns the number of output channels (including filled alpha if applicable)
+    pub fn output_channels(&self) -> usize {
+        self.color_type.samples_per_pixel()
+    }
+
+    pub fn uses_channel(&self, c: usize) -> bool {
+        self.channels.contains(&c)
+    }
+
+    pub fn input_type(&self) -> DataTypeTag {
+        self.data_format.data_type()
+    }
+
+    pub fn check_buffer_size(
+        &self,
+        size: (usize, usize),
+        buffer: Option<&JxlOutputBuffer>,
+    ) -> Result<()> {
+        let Some(buf) = buffer else {
+            return Ok(());
+        };
+        let osize = self.orientation.map_size(size);
+
+        let expected_w = self.output_channels() * self.data_format.bytes_per_sample() * osize.0;
+
+        if buf.byte_size() != (expected_w, osize.1) {
+            return Err(Error::InvalidOutputBufferSize(
+                buf.byte_size().0,
+                buf.byte_size().1,
+                osize.0,
+                osize.1,
+                self.color_type,
+                self.data_format,
+            ));
+        }
+        Ok(())
+    }
+}
+
+impl std::fmt::Display for SaveStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "save channels {:?} (type {:?} {:?})",
+            self.channels, self.color_type, self.data_format
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simd_utils.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simd_utils.rs
new file mode 100644
index 00000000..d9ba69cb
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simd_utils.rs
@@ -0,0 +1,238 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! SIMD utilities for interleaving and deinterleaving channel data.
+//!
+//! These functions assume that input buffers are padded to at least the SIMD
+//! vector length (up to 16 elements), as is standard in the render pipeline.
+
+use jxl_simd::{F32SimdVec, simd_function};
+
+simd_function!(
+    interleave_2_dispatch,
+    d: D,
+    /// Interleave 2 planar channels into packed format.
+    /// Buffers must be padded to SIMD vector length.
+    pub fn interleave_2(a: &[f32], b: &[f32], out: &mut [f32]) {
+        let len = D::F32Vec::LEN;
+        for ((chunk_a, chunk_b), chunk_out) in a
+            .chunks_exact(len)
+            .zip(b.chunks_exact(len))
+            .zip(out.chunks_exact_mut(len * 2))
+        {
+            let va = D::F32Vec::load(d, chunk_a);
+            let vb = D::F32Vec::load(d, chunk_b);
+            D::F32Vec::store_interleaved_2(va, vb, chunk_out);
+        }
+    }
+);
+
+simd_function!(
+    deinterleave_2_dispatch,
+    d: D,
+    /// Deinterleave packed format into 2 planar channels.
+    /// Buffers must be padded to SIMD vector length.
+    pub fn deinterleave_2(input: &[f32], a: &mut [f32], b: &mut [f32]) {
+        let len = D::F32Vec::LEN;
+        for ((chunk_a, chunk_b), chunk_in) in a
+            .chunks_exact_mut(len)
+            .zip(b.chunks_exact_mut(len))
+            .zip(input.chunks_exact(len * 2))
+        {
+            let (va, vb) = D::F32Vec::load_deinterleaved_2(d, chunk_in);
+            va.store(chunk_a);
+            vb.store(chunk_b);
+        }
+    }
+);
+
+simd_function!(
+    interleave_3_dispatch,
+    d: D,
+    /// Interleave 3 planar channels into packed RGB format.
+    /// Buffers must be padded to SIMD vector length.
+    pub fn interleave_3(a: &[f32], b: &[f32], c: &[f32], out: &mut [f32]) {
+        let len = D::F32Vec::LEN;
+        for (((chunk_a, chunk_b), chunk_c), chunk_out) in a
+            .chunks_exact(len)
+            .zip(b.chunks_exact(len))
+            .zip(c.chunks_exact(len))
+            .zip(out.chunks_exact_mut(len * 3))
+        {
+            let va = D::F32Vec::load(d, chunk_a);
+            let vb = D::F32Vec::load(d, chunk_b);
+            let vc = D::F32Vec::load(d, chunk_c);
+            D::F32Vec::store_interleaved_3(va, vb, vc, chunk_out);
+        }
+    }
+);
+
+simd_function!(
+    deinterleave_3_dispatch,
+    d: D,
+    /// Deinterleave packed RGB format into 3 planar channels.
+    /// Buffers must be padded to SIMD vector length.
+    pub fn deinterleave_3(input: &[f32], a: &mut [f32], b: &mut [f32], c: &mut [f32]) {
+        let len = D::F32Vec::LEN;
+        for (((chunk_a, chunk_b), chunk_c), chunk_in) in a
+            .chunks_exact_mut(len)
+            .zip(b.chunks_exact_mut(len))
+            .zip(c.chunks_exact_mut(len))
+            .zip(input.chunks_exact(len * 3))
+        {
+            let (va, vb, vc) = D::F32Vec::load_deinterleaved_3(d, chunk_in);
+            va.store(chunk_a);
+            vb.store(chunk_b);
+            vc.store(chunk_c);
+        }
+    }
+);
+
+simd_function!(
+    interleave_4_dispatch,
+    d: D,
+    /// Interleave 4 planar channels into packed RGBA format.
+    /// Buffers must be padded to SIMD vector length.
+    pub fn interleave_4(a: &[f32], b: &[f32], c: &[f32], e: &[f32], out: &mut [f32]) {
+        let len = D::F32Vec::LEN;
+        for ((((chunk_a, chunk_b), chunk_c), chunk_d), chunk_out) in a
+            .chunks_exact(len)
+            .zip(b.chunks_exact(len))
+            .zip(c.chunks_exact(len))
+            .zip(e.chunks_exact(len))
+            .zip(out.chunks_exact_mut(len * 4))
+        {
+            let va = D::F32Vec::load(d, chunk_a);
+            let vb = D::F32Vec::load(d, chunk_b);
+            let vc = D::F32Vec::load(d, chunk_c);
+            let vd = D::F32Vec::load(d, chunk_d);
+            D::F32Vec::store_interleaved_4(va, vb, vc, vd, chunk_out);
+        }
+    }
+);
+
+simd_function!(
+    deinterleave_4_dispatch,
+    d: D,
+    /// Deinterleave packed RGBA format into 4 planar channels.
+    /// Buffers must be padded to SIMD vector length.
+    pub fn deinterleave_4(
+        input: &[f32],
+        a: &mut [f32],
+        b: &mut [f32],
+        c: &mut [f32],
+        e: &mut [f32],
+    ) {
+        let len = D::F32Vec::LEN;
+        for ((((chunk_a, chunk_b), chunk_c), chunk_d), chunk_in) in a
+            .chunks_exact_mut(len)
+            .zip(b.chunks_exact_mut(len))
+            .zip(c.chunks_exact_mut(len))
+            .zip(e.chunks_exact_mut(len))
+            .zip(input.chunks_exact(len * 4))
+        {
+            let (va, vb, vc, vd) = D::F32Vec::load_deinterleaved_4(d, chunk_in);
+            va.store(chunk_a);
+            vb.store(chunk_b);
+            vc.store(chunk_c);
+            vd.store(chunk_d);
+        }
+    }
+);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_interleave_deinterleave_2_roundtrip() {
+        // Use 16 elements to ensure SIMD alignment for all backends
+        let a = vec![
+            1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0,
+        ];
+        let b = vec![
+            10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0, 120.0, 130.0,
+            140.0, 150.0, 160.0,
+        ];
+
+        let mut packed = vec![0.0; 32];
+        interleave_2_dispatch(&a, &b, &mut packed);
+
+        // Check interleaved format
+        assert_eq!(packed[0], 1.0);
+        assert_eq!(packed[1], 10.0);
+        assert_eq!(packed[2], 2.0);
+        assert_eq!(packed[3], 20.0);
+
+        // Deinterleave back
+        let mut a_out = vec![0.0; 16];
+        let mut b_out = vec![0.0; 16];
+        deinterleave_2_dispatch(&packed, &mut a_out, &mut b_out);
+
+        assert_eq!(a_out, a);
+        assert_eq!(b_out, b);
+    }
+
+    #[test]
+    fn test_interleave_deinterleave_3_roundtrip() {
+        // Use 16 elements to ensure SIMD alignment for all backends
+        let a: Vec<f32> = (1..=16).map(|x| x as f32).collect();
+        let b: Vec<f32> = (1..=16).map(|x| x as f32 * 10.0).collect();
+        let c: Vec<f32> = (1..=16).map(|x| x as f32 * 100.0).collect();
+
+        let mut packed = vec![0.0; 48];
+        interleave_3_dispatch(&a, &b, &c, &mut packed);
+
+        // Check interleaved format
+        assert_eq!(packed[0], 1.0);
+        assert_eq!(packed[1], 10.0);
+        assert_eq!(packed[2], 100.0);
+        assert_eq!(packed[3], 2.0);
+        assert_eq!(packed[4], 20.0);
+        assert_eq!(packed[5], 200.0);
+
+        // Deinterleave back
+        let mut a_out = vec![0.0; 16];
+        let mut b_out = vec![0.0; 16];
+        let mut c_out = vec![0.0; 16];
+        deinterleave_3_dispatch(&packed, &mut a_out, &mut b_out, &mut c_out);
+
+        assert_eq!(a_out, a);
+        assert_eq!(b_out, b);
+        assert_eq!(c_out, c);
+    }
+
+    #[test]
+    fn test_interleave_deinterleave_4_roundtrip() {
+        // Use 16 elements to ensure SIMD alignment for all backends
+        let a: Vec<f32> = (1..=16).map(|x| x as f32).collect();
+        let b: Vec<f32> = (1..=16).map(|x| x as f32 * 10.0).collect();
+        let c: Vec<f32> = (1..=16).map(|x| x as f32 * 100.0).collect();
+        let d: Vec<f32> = (1..=16).map(|x| x as f32 * 1000.0).collect();
+
+        let mut packed = vec![0.0; 64];
+        interleave_4_dispatch(&a, &b, &c, &d, &mut packed);
+
+        // Check interleaved format
+        assert_eq!(packed[0], 1.0);
+        assert_eq!(packed[1], 10.0);
+        assert_eq!(packed[2], 100.0);
+        assert_eq!(packed[3], 1000.0);
+        assert_eq!(packed[4], 2.0);
+        assert_eq!(packed[5], 20.0);
+
+        // Deinterleave back
+        let mut a_out = vec![0.0; 16];
+        let mut b_out = vec![0.0; 16];
+        let mut c_out = vec![0.0; 16];
+        let mut d_out = vec![0.0; 16];
+        deinterleave_4_dispatch(&packed, &mut a_out, &mut b_out, &mut c_out, &mut d_out);
+
+        assert_eq!(a_out, a);
+        assert_eq!(b_out, b);
+        assert_eq!(c_out, c);
+        assert_eq!(d_out, d);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/extend.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/extend.rs
new file mode 100644
index 00000000..8299b372
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/extend.rs
@@ -0,0 +1,94 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    image::{Image, ImageDataType},
+    render::stages::ExtendToImageDimensionsStage,
+    util::{round_up_size_to_cache_line, tracing_wrappers::*},
+};
+
+impl ExtendToImageDimensionsStage {
+    #[instrument(skip_all)]
+    pub(super) fn extend_simple(
+        &self,
+        chunk_size: usize,
+        input_buffers: &[Image<f64>],
+        output_buffers: &mut [Image<f64>],
+    ) {
+        debug!("running extend stage '{self}' in simple pipeline");
+        let numc = input_buffers.len();
+        if numc == 0 {
+            return;
+        }
+        assert_eq!(output_buffers.len(), numc);
+        let input_size = input_buffers[0].size();
+        let output_size = output_buffers[0].size();
+        for c in 1..numc {
+            assert_eq!(input_size, input_buffers[c].size());
+            assert_eq!(output_size, output_buffers[c].size());
+        }
+        assert_eq!(output_size, self.image_size);
+        let origin = self.frame_origin;
+        assert!(origin.0 <= output_size.0 as isize);
+        assert!(origin.1 <= output_size.1 as isize);
+        assert!(origin.0 + input_size.0 as isize >= 0);
+        assert!(origin.1 + input_size.1 as isize >= 0);
+        debug!("input_size = {input_size:?} output_size = {output_size:?} origin = {origin:?}");
+        // Compute the input rectangle
+        let x0 = origin.0.max(0) as usize;
+        let y0 = origin.1.max(0) as usize;
+        let x1 = (origin.0 + input_size.0 as isize).min(output_size.0 as isize) as usize;
+        let y1 = (origin.1 + input_size.1 as isize).min(output_size.1 as isize) as usize;
+        debug!("x0 = {x0} x1 = {x1} y0 = {y0} y1 = {y1}");
+        let in_x0 = (x0 as isize - origin.0) as usize;
+        let in_x1 = (x1 as isize - origin.0) as usize;
+        let in_y0 = (y0 as isize - origin.1) as usize;
+        let in_y1 = (y1 as isize - origin.1) as usize;
+        debug!("in_x0 = {in_x0} in_x1 = {in_x1} in_y0 = {in_y0} in_y1 = {in_y1}");
+        // First, copy the data in the middle.
+        for c in 0..numc {
+            for in_y in in_y0..in_y1 {
+                debug!("copy row: {in_y}");
+                let in_row = input_buffers[c].row(in_y);
+                let y = (in_y as isize + origin.1) as usize;
+                output_buffers[c].row_mut(y)[x0..x1].copy_from_slice(&in_row[in_x0..in_x1]);
+            }
+        }
+        // Fill in rows above and below the original data.
+        let mut buffer = vec![f32::default(); round_up_size_to_cache_line::<f32>(chunk_size)];
+        for y in (0..y0).chain(y1..output_size.1) {
+            for x in (0..output_size.0).step_by(chunk_size) {
+                let xsize = output_size.0.min(x + chunk_size) - x;
+                debug!("position above/below: ({x},{y}) xsize: {xsize}");
+                for (c, buf) in output_buffers.iter_mut().enumerate() {
+                    self.process_row_chunk((x, y), xsize, c, &mut buffer);
+                    for (ix, px) in buffer.iter().enumerate().take(xsize) {
+                        buf.row_mut(y)[x + ix] = px.to_f64();
+                    }
+                }
+            }
+        }
+        // Fill in left and right of the original data.
+        for y in y0..y1 {
+            for (x, xsize) in (0..x0)
+                .step_by(chunk_size)
+                .map(|x| (x, x0.min(x + chunk_size) - x))
+                .chain(
+                    (x1..output_size.0)
+                        .step_by(chunk_size)
+                        .map(|x| (x, output_size.0.min(x + chunk_size) - x)),
+                )
+            {
+                debug!("position on the side: ({x},{y}) xsize: {xsize}");
+                for (c, buf) in output_buffers.iter_mut().enumerate() {
+                    self.process_row_chunk((x, y), xsize, c, &mut buffer);
+                    for (ix, px) in buffer.iter().enumerate().take(xsize) {
+                        buf.row_mut(y)[x + ix] = px.to_f64();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/mod.rs
new file mode 100644
index 00000000..f43b23d9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/mod.rs
@@ -0,0 +1,244 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::JxlOutputBuffer,
+    error::Result,
+    image::{Image, ImageDataType},
+    render::{buffer_splitter::BufferSplitter, internal::ChannelInfo},
+    util::{MemoryTracker, ShiftRightCeil, tracing_wrappers::*},
+};
+
+use super::{
+    RenderPipeline, RenderPipelineInOutStage, RenderPipelineInPlaceStage,
+    internal::{RenderPipelineShared, Stage},
+};
+
+mod extend;
+mod run_stage;
+mod save;
+
+/// A RenderPipeline that waits for all input to be ready before doing any rendering, and
+/// prioritizes simplicity over memory usage and computational efficiency.
+/// Eventually meant to be used only for verification purposes.
+pub struct SimpleRenderPipeline {
+    shared: RenderPipelineShared<Image<f64>>,
+    input_buffers: Vec<Image<f64>>,
+    memory_tracker: MemoryTracker,
+}
+
+impl SimpleRenderPipeline {
+    #[instrument(skip_all, err)]
+    fn do_render(&mut self, buffer_splitter: &mut BufferSplitter) -> Result<()> {
+        let ready = self
+            .shared
+            .group_chan_complete
+            .iter()
+            .flat_map(|x| x.iter())
+            .all(|x| *x);
+        if !ready {
+            debug!("not yet ready");
+            return Ok(());
+        }
+        debug!("ready to render");
+
+        let mut current_buffers = clone_images(&self.input_buffers)?;
+
+        let mut current_size = self.shared.input_size;
+
+        for (i, stage) in self.shared.stages.iter().enumerate() {
+            debug!("running stage {i}: {stage}");
+            let mut output_buffers = clone_images(&current_buffers)?;
+            if stage.shift() != (0, 0) || stage.new_size(current_size) != current_size {
+                // Replace buffers of different sizes.
+                current_size = stage.new_size(current_size);
+                for (c, info) in self.shared.channel_info[i + 1].iter().enumerate() {
+                    if stage.uses_channel(c) {
+                        let xsize = current_size.0.shrc(info.downsample.0);
+                        let ysize = current_size.1.shrc(info.downsample.1);
+                        debug!("reallocating channel {c} to new size {xsize}x{ysize}");
+                        output_buffers[c] =
+                            Image::new_tracked((xsize, ysize), &self.memory_tracker)?;
+                    }
+                }
+            }
+            match stage {
+                Stage::InOut(stage) => {
+                    let input_buf: Vec<_> = current_buffers
+                        .iter()
+                        .enumerate()
+                        .filter(|x| stage.uses_channel(x.0))
+                        .map(|x| x.1)
+                        .collect();
+                    let mut output_buf = vec![];
+                    for (c, buf) in output_buffers.iter_mut().enumerate() {
+                        if stage.uses_channel(c) {
+                            let mut tmp = Image::new((0, 0)).unwrap();
+                            std::mem::swap(&mut tmp, buf);
+                            output_buf.push(tmp);
+                        }
+                    }
+                    let mut state = stage.init_local_state(0)?;
+                    stage.run_stage_on(
+                        self.shared.chunk_size,
+                        &input_buf,
+                        &mut output_buf,
+                        state.as_deref_mut(),
+                    );
+                    let repl_iter = (0..self.shared.num_channels())
+                        .filter(|c| stage.uses_channel(*c))
+                        .zip(output_buf);
+                    for (c, chan) in repl_iter {
+                        output_buffers[c] = chan;
+                    }
+                }
+                Stage::InPlace(stage) => {
+                    let mut output_buf: Vec<_> = output_buffers
+                        .iter_mut()
+                        .enumerate()
+                        .filter(|x| stage.uses_channel(x.0))
+                        .map(|x| x.1)
+                        .collect();
+                    let mut state = stage.init_local_state(0)?;
+                    stage.run_stage_on(
+                        self.shared.chunk_size,
+                        &mut output_buf,
+                        state.as_deref_mut(),
+                    );
+                }
+                Stage::Extend(e) => {
+                    e.extend_simple(
+                        self.shared.chunk_size,
+                        &current_buffers,
+                        &mut output_buffers,
+                    );
+                }
+                Stage::Save(stage) => {
+                    stage.save_simple(&output_buffers, buffer_splitter.get_full_buffers())?;
+                }
+            }
+            current_buffers = output_buffers;
+        }
+
+        Ok(())
+    }
+}
+
+fn clone_images<T: ImageDataType>(images: &[Image<T>]) -> Result<Vec<Image<T>>> {
+    images.iter().map(|x| x.try_clone()).collect()
+}
+
+impl RenderPipeline for SimpleRenderPipeline {
+    type Buffer = Image<f64>;
+
+    fn new_from_shared(shared: RenderPipelineShared<Self::Buffer>) -> Result<Self> {
+        let tracker = &shared.memory_tracker;
+        let input_buffers = shared.channel_info[0]
+            .iter()
+            .map(|x| {
+                let xsize = shared.input_size.0.shrc(x.downsample.0);
+                let ysize = shared.input_size.1.shrc(x.downsample.1);
+                Image::new_tracked((xsize, ysize), tracker)
+            })
+            .collect::<Result<Vec<_>>>()?;
+        let memory_tracker = shared.memory_tracker.clone();
+
+        Ok(Self {
+            shared,
+            input_buffers,
+            memory_tracker,
+        })
+    }
+
+    #[instrument(skip_all, err)]
+    fn get_buffer<T: ImageDataType>(&mut self, channel: usize) -> Result<Image<T>> {
+        let sz = self.shared.group_size_for_channel(channel, T::DATA_TYPE_ID);
+        Image::<T>::new_tracked(sz, &self.memory_tracker)
+    }
+
+    fn set_buffer_for_group<T: ImageDataType>(
+        &mut self,
+        channel: usize,
+        group_id: usize,
+        complete: bool,
+        buf: Image<T>,
+        buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()> {
+        debug!(
+            "filling data for group {}, channel {}, using type {:?}",
+            group_id,
+            channel,
+            T::DATA_TYPE_ID,
+        );
+        if self.shared.channel_is_used[channel] {
+            let sz = self.shared.group_size_for_channel(channel, T::DATA_TYPE_ID);
+            let goffset = self.shared.group_offset(group_id);
+            let ChannelInfo { ty, downsample } = self.shared.channel_info[0][channel];
+            let off = (goffset.0 >> downsample.0, goffset.1 >> downsample.1);
+            debug!(?sz, input_buffers_sz=?self.input_buffers[channel].size(), offset=?off, ?downsample, ?goffset);
+            let ty = ty.unwrap();
+            assert_eq!(ty, T::DATA_TYPE_ID);
+            let total_sz = self.input_buffers[channel].size();
+            for y in 0..sz.1.min(total_sz.1 - off.1) {
+                let row_in = buf.row(y);
+                let row_out = self.input_buffers[channel].row_mut(y + off.1);
+                for x in 0..sz.0.min(total_sz.0 - off.0) {
+                    row_out[x + off.0] = row_in[x].to_f64();
+                }
+            }
+            self.shared.group_chan_complete[group_id][channel] = complete;
+        }
+
+        self.do_render(buffer_splitter)
+    }
+
+    fn check_buffer_sizes(&self, _buffers: &mut [Option<JxlOutputBuffer>]) -> Result<()> {
+        // This will be checked during rendering.
+        Ok(())
+    }
+
+    fn render_outside_frame(&mut self, _buffer_splitter: &mut BufferSplitter) -> Result<()> {
+        // Nothing to do in the simple pipeline.
+        Ok(())
+    }
+
+    fn mark_group_to_rerender(&mut self, _g: usize) {}
+
+    fn box_inout_stage<S: RenderPipelineInOutStage + Send + Sync>(
+        stage: S,
+    ) -> Box<dyn super::RunInOutStage<Self::Buffer> + Send + Sync> {
+        Box::new(stage)
+    }
+
+    fn box_inplace_stage<S: RenderPipelineInPlaceStage + Send + Sync>(
+        stage: S,
+    ) -> Box<dyn super::RunInPlaceStage<Self::Buffer> + Send + Sync> {
+        Box::new(stage)
+    }
+
+    fn used_channel_mask(&self) -> &[bool] {
+        &self.shared.channel_is_used
+    }
+
+    fn needs_border_rendering(&self) -> bool {
+        false
+    }
+
+    fn prepare_final_rerender(&mut self) {
+        // No-op for simple pipeline (no group-based rendering).
+    }
+
+    fn render_all_groups_full_readiness(
+        &mut self,
+        _buffer_splitter: &mut BufferSplitter,
+    ) -> Result<()> {
+        // No-op for simple pipeline.
+        Ok(())
+    }
+
+    fn finish_final_rerender(&mut self) {
+        // No-op for simple pipeline.
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/run_stage.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/run_stage.rs
new file mode 100644
index 00000000..7ca82a28
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/run_stage.rs
@@ -0,0 +1,204 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::needless_range_loop)]
+
+use std::any::Any;
+
+use crate::{
+    image::{Image, ImageDataType},
+    render::{
+        RenderPipelineInOutStage, RenderPipelineInPlaceStage, RunInOutStage, RunInPlaceStage,
+        internal::PipelineBuffer,
+    },
+    util::{SmallVec, mirror, round_up_size_to_cache_line, tracing_wrappers::*},
+};
+
+impl PipelineBuffer for Image<f64> {
+    type InPlaceExtraInfo = usize;
+    type InOutExtraInfo = usize;
+}
+
+impl<T: RenderPipelineInPlaceStage> RunInPlaceStage<Image<f64>> for T {
+    fn run_stage_on(
+        &self,
+        chunk_size: usize,
+        buffers: &mut [&mut Image<f64>],
+        mut state: Option<&mut (dyn Any + Send)>,
+    ) {
+        debug!("running inplace stage '{self}' in simple pipeline");
+        let numc = buffers.len();
+        if numc == 0 {
+            return;
+        }
+        let size = buffers[0].size();
+        for b in buffers.iter() {
+            assert_eq!(size, b.size());
+        }
+        let mut buffer =
+            vec![
+                vec![T::Type::default(); round_up_size_to_cache_line::<T::Type>(chunk_size)];
+                numc
+            ];
+        for y in 0..size.1 {
+            for x in (0..size.0).step_by(chunk_size) {
+                let xsize = size.0.min(x + chunk_size) - x;
+                debug!("position: {x}x{y} xsize: {xsize}");
+                for c in 0..numc {
+                    let in_row = buffers[c].row(y);
+                    for ix in 0..xsize {
+                        buffer[c][ix] = T::Type::from_f64(in_row[x + ix]);
+                    }
+                }
+                let mut row: Vec<_> = buffer.iter_mut().map(|x| x as &mut [_]).collect();
+                self.process_row_chunk((x, y), xsize, &mut row, state.as_deref_mut());
+                for c in 0..numc {
+                    let out_row = buffers[c].row_mut(y);
+                    for ix in 0..xsize {
+                        out_row[x + ix] = buffer[c][ix].to_f64();
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl<T: RenderPipelineInOutStage> RunInOutStage<Image<f64>> for T {
+    #[instrument(skip_all)]
+    fn run_stage_on(
+        &self,
+        chunk_size: usize,
+        input_buffers: &[&Image<f64>],
+        output_buffers: &mut [Image<f64>],
+        mut state: Option<&mut (dyn Any + Send)>,
+    ) {
+        assert_ne!(chunk_size, 0);
+        debug!("running inout stage '{self}' in simple pipeline");
+        let numc = input_buffers.len();
+        if numc == 0 {
+            return;
+        }
+        assert_eq!(output_buffers.len(), numc);
+        let input_size = input_buffers[0].size();
+        let output_size = output_buffers[0].size();
+        for c in 1..numc {
+            assert_eq!(input_size, input_buffers[c].size());
+            assert_eq!(output_size, output_buffers[c].size());
+        }
+        debug!(
+            ?input_size,
+            ?output_size,
+            SHIFT = ?Self::SHIFT,
+            BORDER = ?Self::BORDER,
+            numc
+        );
+        assert_eq!(input_size.0, output_size.0.div_ceil(1 << Self::SHIFT.0));
+        assert_eq!(input_size.1, output_size.1.div_ceil(1 << Self::SHIFT.1));
+        let mut buffer_in = vec![
+            vec![
+                vec![
+                    T::InputT::default();
+                    // Double rounding make sure that we always have enough buffer for reading a whole SIMD lane.
+                    round_up_size_to_cache_line::<T::OutputT>(
+                        round_up_size_to_cache_line::<T::OutputT>(chunk_size)
+                            + T::BORDER.0 as usize * 2
+                    )
+                ];
+                T::BORDER.1 as usize * 2 + 1
+            ];
+            numc
+        ];
+        let mut buffer_out = vec![
+            vec![
+                vec![
+                    T::OutputT::default();
+                    round_up_size_to_cache_line::<T::OutputT>(chunk_size)
+                        << T::SHIFT.0
+                ];
+                1 << T::SHIFT.1
+            ];
+            numc
+        ];
+
+        for y in 0..input_size.1 {
+            for x in (0..input_size.0).step_by(chunk_size) {
+                let border_x = Self::BORDER.0 as isize;
+                let border_y = Self::BORDER.1 as isize;
+                let xsize = input_size.0.min(x + chunk_size) - x;
+                let xs = xsize as isize;
+                debug!("position: {x}x{y} xsize: {xsize}");
+                for c in 0..numc {
+                    for iy in -border_y..=border_y {
+                        let imgy = mirror(y as isize + iy, input_size.1);
+                        let in_row = input_buffers[c].row(imgy);
+                        let buf_in_row = &mut buffer_in[c][(iy + border_y) as usize];
+                        for ix in (-border_x..0).chain(xs..xs + border_x) {
+                            let imgx = mirror(x as isize + ix, input_size.0);
+                            buf_in_row[(ix + border_x) as usize] =
+                                T::InputT::from_f64(in_row[imgx]);
+                        }
+                        for ix in 0..xsize {
+                            buf_in_row[ix + border_x as usize] =
+                                T::InputT::from_f64(in_row[x + ix]);
+                        }
+                    }
+                }
+
+                {
+                    // Build flat input rows: all rows for all channels in one Vec
+                    let num_input_channels = buffer_in.len();
+                    let input_rows_per_channel = buffer_in[0].len();
+                    let mut input_row_data = SmallVec::new();
+                    for ch_buf in buffer_in.iter() {
+                        for row in ch_buf.iter() {
+                            input_row_data.push(row as &[_]);
+                        }
+                    }
+                    let input_rows = crate::render::Channels::new(
+                        input_row_data,
+                        num_input_channels,
+                        input_rows_per_channel,
+                    );
+
+                    // Build flat output rows: all rows for all channels in one Vec
+                    let num_output_channels = buffer_out.len();
+                    let output_rows_per_channel = buffer_out[0].len();
+                    let mut output_row_data = SmallVec::new();
+                    for ch_buf in buffer_out.iter_mut() {
+                        for row in ch_buf.iter_mut() {
+                            output_row_data.push(row as &mut [_]);
+                        }
+                    }
+                    let mut output_rows = crate::render::ChannelsMut::new(
+                        output_row_data,
+                        num_output_channels,
+                        output_rows_per_channel,
+                    );
+
+                    self.process_row_chunk(
+                        (x, y),
+                        xsize,
+                        &input_rows,
+                        &mut output_rows,
+                        state.as_deref_mut(),
+                    );
+                }
+
+                let stripe_xsize =
+                    (xsize << Self::SHIFT.0).min(output_size.0 - (x << Self::SHIFT.0));
+                let stripe_ysize =
+                    (1usize << Self::SHIFT.1).min(output_size.1 - (y << Self::SHIFT.1));
+                for c in 0..numc {
+                    for iy in 0..stripe_ysize {
+                        let out_row = output_buffers[c].row_mut((y << Self::SHIFT.1) + iy);
+                        for ix in 0..stripe_xsize {
+                            out_row[(x << Self::SHIFT.0) + ix] = buffer_out[c][iy][ix].to_f64();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/save.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/save.rs
new file mode 100644
index 00000000..b06af9f6
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/simple_pipeline/save.rs
@@ -0,0 +1,242 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::util::f16;
+
+use crate::{
+    api::{Endianness, JxlDataFormat, JxlOutputBuffer},
+    error::Result,
+    image::Image,
+    render::save::SaveStage,
+};
+
+impl SaveStage {
+    pub(super) fn save_simple(
+        &self,
+        data: &[Image<f64>],
+        buffers: &mut [Option<JxlOutputBuffer>],
+    ) -> Result<()> {
+        for i in self.channels.iter().skip(1) {
+            assert_eq!(data[self.channels[0]].size(), data[*i].size());
+        }
+        let Some(buf) = buffers[self.output_buffer_index].as_mut() else {
+            return Ok(());
+        };
+        let size = data[0].size();
+
+        self.check_buffer_size(size, Some(buf))?;
+
+        let output_channels = self.output_channels();
+
+        for (c, &chan) in self.channels.iter().enumerate() {
+            for y in 0..size.1 {
+                let src_row = data[chan].row(y);
+
+                for (x, &px) in src_row.iter().enumerate() {
+                    let (dx, dy) = self.orientation.display_pixel((x, y), size);
+                    let dx = dx * output_channels + c;
+                    let bps = self.data_format.bytes_per_sample();
+
+                    macro_rules! write_pixel {
+                        ($px: expr, $endianness: expr) => {
+                            let px = $px;
+                            let px_bytes = if $endianness == Endianness::LittleEndian {
+                                px.to_le_bytes()
+                            } else {
+                                px.to_be_bytes()
+                            };
+                            buf.write_bytes(dy, dx * bps, &px_bytes);
+                        };
+                    }
+
+                    match self.data_format {
+                        JxlDataFormat::U8 { .. } => {
+                            // Conversion stages already handle bit depth scaling
+                            write_pixel!(px as u8, Endianness::LittleEndian);
+                        }
+                        JxlDataFormat::U16 { endianness, .. } => {
+                            // Conversion stages already handle bit depth scaling
+                            write_pixel!(px as u16, endianness);
+                        }
+                        JxlDataFormat::F32 { endianness } => {
+                            write_pixel!(px as f32, endianness);
+                        }
+                        JxlDataFormat::F16 { endianness } => {
+                            write_pixel!(f16::from_f64(px), endianness);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Fill opaque alpha if needed (when RGBA requested but image has no alpha)
+        if self.fill_opaque_alpha {
+            let alpha_channel = self.channels.len(); // alpha is after the source channels
+            let opaque_bytes = self.data_format.opaque_alpha_bytes();
+            for y in 0..size.1 {
+                for x in 0..size.0 {
+                    let (dx, dy) = self.orientation.display_pixel((x, y), size);
+                    let dx = dx * output_channels + alpha_channel;
+                    let bps = self.data_format.bytes_per_sample();
+                    buf.write_bytes(dy, dx * bps, &opaque_bytes);
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{
+        api::JxlColorType, headers::Orientation, image::Rect, util::test::assert_almost_eq,
+    };
+    use rand::SeedableRng;
+    use rand_xorshift::XorShiftRng;
+    use test_log::test;
+
+    #[test]
+    fn save_stage() -> Result<()> {
+        let save_stage = SaveStage::new(
+            &[0],
+            Orientation::Identity,
+            0,
+            JxlColorType::Grayscale,
+            JxlDataFormat::U8 { bit_depth: 8 },
+            false,
+        );
+        let mut rng = XorShiftRng::seed_from_u64(0);
+        let src = [Image::<f64>::new_random((128, 128), &mut rng)?];
+        let mut dst = Image::<u8>::new_random((128, 128), &mut rng)?;
+
+        save_stage.save_simple(
+            &src,
+            &mut [Some(JxlOutputBuffer::from_image_rect_mut(
+                dst.get_rect_mut(Rect {
+                    size: (128, 128),
+                    origin: (0, 0),
+                })
+                .into_raw(),
+            ))],
+        )?;
+
+        for y in 0..128 {
+            for x in 0..128 {
+                // Conversion stages handle bit depth scaling, save stage just casts
+                let expected = src[0].row(y)[x] as u8;
+                assert_eq!(expected, dst.row(y)[x]);
+            }
+        }
+
+        Ok(())
+    }
+
+    fn do_test_orientation(
+        orientation: Orientation,
+        transform: impl Fn(usize, usize, usize, usize) -> (usize, usize),
+    ) -> Result<()> {
+        let (w, h) = (32, 16);
+        let mut rng = XorShiftRng::seed_from_u64(0);
+        let src = [Image::<f64>::new_random((w, h), &mut rng)?];
+
+        let (ow, oh) = if orientation.is_transposing() {
+            (h, w)
+        } else {
+            (w, h)
+        };
+
+        let save_stage = SaveStage::new(
+            &[0],
+            orientation,
+            0,
+            JxlColorType::Grayscale,
+            JxlDataFormat::f32(),
+            false,
+        );
+
+        let mut rng = XorShiftRng::seed_from_u64(0);
+        let mut dst = Image::<f32>::new_random((ow, oh), &mut rng)?;
+
+        save_stage.save_simple(
+            &src,
+            &mut [Some(JxlOutputBuffer::from_image_rect_mut(
+                dst.get_rect_mut(Rect {
+                    origin: (0, 0),
+                    size: (ow, oh),
+                })
+                .into_raw(),
+            ))],
+        )?;
+
+        // Iterate over the DESTINATION image pixels.
+        for y_dest in 0..oh {
+            for x_dest in 0..ow {
+                // For each destination pixel, find its corresponding source pixel.
+                let (src_x, src_y) = transform(x_dest, y_dest, w, h);
+                assert_almost_eq(
+                    dst.row(y_dest)[x_dest],
+                    src[0].row(src_y)[src_x] as f32,
+                    1e-5,
+                    1e-5,
+                );
+            }
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn orientation_identity() -> Result<()> {
+        do_test_orientation(Orientation::Identity, |x, y, _, _| (x, y))
+    }
+
+    #[test]
+    fn orientation_flip_horizontal() -> Result<()> {
+        do_test_orientation(Orientation::FlipHorizontal, |x, y, w, _| (w - 1 - x, y))
+    }
+
+    #[test]
+    fn orientation_flip_vertical() -> Result<()> {
+        do_test_orientation(Orientation::FlipVertical, |x, y, _, h| (x, h - 1 - y))
+    }
+
+    #[test]
+    fn orientation_rotate_180() -> Result<()> {
+        do_test_orientation(Orientation::Rotate180, |x, y, w, h| (w - 1 - x, h - 1 - y))
+    }
+
+    // transposing orientations
+
+    #[test]
+    fn orientation_transpose() -> Result<()> {
+        do_test_orientation(Orientation::Transpose, |x_dest, y_dest, _, _| {
+            (y_dest, x_dest)
+        })
+    }
+
+    #[test]
+    fn orientation_rotate_90_cw() -> Result<()> {
+        do_test_orientation(Orientation::Rotate90Cw, |x_dest, y_dest, _, h_src| {
+            (y_dest, h_src - 1 - x_dest)
+        })
+    }
+
+    #[test]
+    fn orientation_anti_transpose() -> Result<()> {
+        do_test_orientation(
+            Orientation::AntiTranspose,
+            |x_dest, y_dest, w_src, h_src| (w_src - 1 - y_dest, h_src - 1 - x_dest),
+        )
+    }
+
+    #[test]
+    fn orientation_rotate_90_ccw() -> Result<()> {
+        do_test_orientation(Orientation::Rotate90Ccw, |x_dest, y_dest, w_src, _| {
+            (w_src - 1 - y_dest, x_dest)
+        })
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/black.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/black.rs
new file mode 100644
index 00000000..e8c7f579
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/black.rs
@@ -0,0 +1,208 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Black (K) channel stage for CMYK to RGB conversion.
+//!
+//! In JPEG XL CMYK images, the CMY channels are stored as the first 3 color channels
+//! (like RGB), and the K (black) channel is stored as an extra channel of type Black.
+//!
+//! The values follow the convention: 0 = max ink, 1 = no ink (for normalized values).
+//! To convert CMYK to RGB: R = C * K, G = M * K, B = Y * K (all normalized to [0, 1]).
+
+use crate::render::RenderPipelineInPlaceStage;
+
+/// Applies the Black (K) channel to CMY channels to produce RGB output.
+///
+/// This stage multiplies each CMY channel by the K channel value, which converts
+/// CMYK to RGB. The K channel is consumed (set to 1.0) after application.
+pub struct BlackChannelStage {
+    /// Black channel index (offset from 3)
+    black_c: usize,
+}
+
+impl std::fmt::Display for BlackChannelStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "black channel stage for channel {}", self.black_c)
+    }
+}
+
+impl BlackChannelStage {
+    pub fn new(black_c_offset: usize) -> Self {
+        Self {
+            black_c: 3 + black_c_offset,
+        }
+    }
+}
+
+impl RenderPipelineInPlaceStage for BlackChannelStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3 || c == self.black_c
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let [row_c, row_m, row_y, row_k] = row else {
+            panic!(
+                "incorrect number of channels; expected 4, found {}",
+                row.len()
+            );
+        };
+
+        assert!(
+            xsize <= row_c.len()
+                && xsize <= row_m.len()
+                && xsize <= row_y.len()
+                && xsize <= row_k.len()
+        );
+
+        // CMYK to RGB: R = C * K, G = M * K, B = Y * K
+        // Where C, M, Y, K are all in [0, 1] with 1 = no ink
+        for idx in 0..xsize {
+            let k = row_k[idx];
+            row_c[idx] *= k;
+            row_m[idx] *= k;
+            row_y[idx] *= k;
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(|| BlackChannelStage::new(0), (500, 500), 4)
+    }
+
+    #[test]
+    fn cmyk_to_rgb_white() -> Result<()> {
+        // Pure white: CMY = 1 (no ink), K = 1 (no black)
+        let mut input_c = Image::new((3, 1))?;
+        let mut input_m = Image::new((3, 1))?;
+        let mut input_y = Image::new((3, 1))?;
+        let mut input_k = Image::new((3, 1))?;
+        input_c.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_m.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_y.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_k.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+
+        let stage = BlackChannelStage::new(0);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_c, input_m, input_y, input_k],
+            (3, 1),
+            0,
+            256,
+        )?;
+
+        // White stays white
+        assert_all_almost_abs_eq(output[0].row(0), &[1.0, 1.0, 1.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[1.0, 1.0, 1.0], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[1.0, 1.0, 1.0], 1e-6);
+
+        Ok(())
+    }
+
+    #[test]
+    fn cmyk_to_rgb_black() -> Result<()> {
+        // Pure black: CMY = 1 (no ink), K = 0 (full black)
+        let mut input_c = Image::new((3, 1))?;
+        let mut input_m = Image::new((3, 1))?;
+        let mut input_y = Image::new((3, 1))?;
+        let mut input_k = Image::new((3, 1))?;
+        input_c.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_m.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_y.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_k.row_mut(0).copy_from_slice(&[0.0, 0.0, 0.0]);
+
+        let stage = BlackChannelStage::new(0);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_c, input_m, input_y, input_k],
+            (3, 1),
+            0,
+            256,
+        )?;
+
+        // White + full black = black
+        assert_all_almost_abs_eq(output[0].row(0), &[0.0, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.0, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.0, 0.0, 0.0], 1e-6);
+
+        Ok(())
+    }
+
+    #[test]
+    fn cmyk_to_rgb_gray() -> Result<()> {
+        // 50% gray: CMY = 1 (no ink), K = 0.5 (half black)
+        let mut input_c = Image::new((3, 1))?;
+        let mut input_m = Image::new((3, 1))?;
+        let mut input_y = Image::new((3, 1))?;
+        let mut input_k = Image::new((3, 1))?;
+        input_c.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_m.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_y.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_k.row_mut(0).copy_from_slice(&[0.5, 0.5, 0.5]);
+
+        let stage = BlackChannelStage::new(0);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_c, input_m, input_y, input_k],
+            (3, 1),
+            0,
+            256,
+        )?;
+
+        // White + 50% black = 50% gray
+        assert_all_almost_abs_eq(output[0].row(0), &[0.5, 0.5, 0.5], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.5, 0.5, 0.5], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.5, 0.5, 0.5], 1e-6);
+
+        Ok(())
+    }
+
+    #[test]
+    fn cmyk_to_rgb_cyan() -> Result<()> {
+        // Cyan: C = 0 (full cyan), M = Y = 1 (no ink), K = 1 (no black)
+        let mut input_c = Image::new((3, 1))?;
+        let mut input_m = Image::new((3, 1))?;
+        let mut input_y = Image::new((3, 1))?;
+        let mut input_k = Image::new((3, 1))?;
+        input_c.row_mut(0).copy_from_slice(&[0.0, 0.0, 0.0]); // Full cyan
+        input_m.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_y.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+        input_k.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+
+        let stage = BlackChannelStage::new(0);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_c, input_m, input_y, input_k],
+            (3, 1),
+            0,
+            256,
+        )?;
+
+        // Pure cyan in RGB: R=0, G=1, B=1
+        assert_all_almost_abs_eq(output[0].row(0), &[0.0, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[1.0, 1.0, 1.0], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[1.0, 1.0, 1.0], 1e-6);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/blending.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/blending.rs
new file mode 100644
index 00000000..ecc247f4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/blending.rs
@@ -0,0 +1,180 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::sync::Arc;
+
+use smallvec::SmallVec;
+
+use crate::{
+    error::Result,
+    features::{
+        blending::perform_blending,
+        patches::{PatchBlendMode, PatchBlending},
+    },
+    frame::ReferenceFrame,
+    headers::{FileHeader, extra_channels::ExtraChannelInfo, frame_header::*},
+    render::RenderPipelineInPlaceStage,
+    util::slice,
+};
+
+pub struct BlendingStage {
+    pub frame_origin: (isize, isize),
+    pub image_size: (isize, isize),
+    pub blending_info: BlendingInfo,
+    pub ec_blending_info: Vec<BlendingInfo>,
+    pub extra_channels: Vec<ExtraChannelInfo>,
+    pub reference_frames: Arc<[Option<ReferenceFrame>; 4]>,
+    pub zeros: Vec<f32>,
+}
+
+impl From<&BlendingInfo> for PatchBlending {
+    fn from(info: &BlendingInfo) -> Self {
+        let mode = match info.mode {
+            BlendingMode::Replace => PatchBlendMode::None,
+            BlendingMode::Add => PatchBlendMode::Add,
+            BlendingMode::Mul => PatchBlendMode::Mul,
+            BlendingMode::Blend => PatchBlendMode::BlendBelow,
+            BlendingMode::AlphaWeightedAdd => PatchBlendMode::AlphaWeightedAddBelow,
+        };
+        PatchBlending {
+            mode,
+            alpha_channel: info.alpha_channel as usize,
+            clamp: info.clamp,
+        }
+    }
+}
+
+impl BlendingStage {
+    pub fn new(
+        frame_header: &FrameHeader,
+        file_header: &FileHeader,
+        reference_frames: Arc<[Option<ReferenceFrame>; 4]>,
+    ) -> Result<BlendingStage> {
+        let xsize = file_header.size.xsize();
+        Ok(BlendingStage {
+            frame_origin: (frame_header.x0 as isize, frame_header.y0 as isize),
+            image_size: (xsize as isize, file_header.size.ysize() as isize),
+            blending_info: frame_header.blending_info.clone(),
+            ec_blending_info: frame_header.ec_blending_info.clone(),
+            extra_channels: file_header.image_metadata.extra_channel_info.clone(),
+            reference_frames,
+            zeros: vec![0f32; xsize as usize],
+        })
+    }
+}
+
+impl std::fmt::Display for BlendingStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "blending")
+    }
+}
+
+impl RenderPipelineInPlaceStage for BlendingStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3 + self.extra_channels.len()
+    }
+
+    fn process_row_chunk(
+        &self,
+        position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let num_ec = self.extra_channels.len();
+        let fg_y0 = self.frame_origin.1 + position.1 as isize;
+        let mut fg_x0 = self.frame_origin.0 + position.0 as isize;
+        let mut fg_x1 = fg_x0 + xsize as isize;
+        let mut bg_x0: isize = 0;
+        let mut bg_x1: isize = xsize as isize;
+
+        if fg_x1 <= 0 || fg_x0 >= self.image_size.0 || fg_y0 < 0 || fg_y0 >= self.image_size.1 {
+            return;
+        }
+
+        if fg_x0 < 0 {
+            bg_x0 -= fg_x0;
+            fg_x0 = 0;
+        }
+        if fg_x1 > self.image_size.0 {
+            bg_x1 = bg_x0 + self.image_size.0 - fg_x0;
+            fg_x1 = self.image_size.0;
+        }
+
+        let fg_x0: usize = fg_x0 as usize;
+        let fg_x1: usize = fg_x1 as usize;
+        let bg_x0: usize = bg_x0 as usize;
+        let bg_x1: usize = bg_x1 as usize;
+        let fg_y0: usize = fg_y0 as usize;
+
+        let mut out: SmallVec<[&mut [f32]; 8]> = row.iter_mut().map(|s| &mut s[..xsize]).collect();
+
+        let mut fg: SmallVec<[&[f32]; 8]> = smallvec::smallvec![self.zeros.as_slice(); 3 + num_ec];
+
+        for (c, fg_ptr) in fg.iter_mut().enumerate().take(3) {
+            if self.reference_frames[self.blending_info.source as usize].is_some() {
+                *fg_ptr = &(self.reference_frames[self.blending_info.source as usize]
+                    .as_ref()
+                    .unwrap()
+                    .frame[c]
+                    .row(fg_y0)[fg_x0..fg_x1]);
+            }
+        }
+        for i in 0..num_ec {
+            if self.reference_frames[self.ec_blending_info[i].source as usize].is_some() {
+                fg[3 + i] = &(self.reference_frames[self.ec_blending_info[i].source as usize]
+                    .as_ref()
+                    .unwrap()
+                    .frame[3 + i]
+                    .row(fg_y0)[fg_x0..fg_x1]);
+            }
+        }
+
+        let blending_info = PatchBlending::from(&self.blending_info);
+        let ec_blending_info: Vec<PatchBlending> = self
+            .ec_blending_info
+            .iter()
+            .map(PatchBlending::from)
+            .collect();
+
+        perform_blending(
+            &mut slice!(&mut out, .., bg_x0..bg_x1),
+            &fg,
+            &blending_info,
+            &ec_blending_info,
+            &self.extra_channels,
+        );
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use rand::SeedableRng;
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::util::test::read_headers_and_toc;
+
+    #[test]
+    fn blending_consistency() -> Result<()> {
+        let (file_header, frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../../resources/test/basic.jxl")).unwrap();
+        let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+        let reference_frames = Arc::new([
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+        ]);
+        crate::render::test::test_stage_consistency(
+            || BlendingStage::new(&frame_header, &file_header, reference_frames.clone()).unwrap(),
+            (500, 500),
+            4,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/chroma_upsample.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/chroma_upsample.rs
new file mode 100644
index 00000000..24707569
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/chroma_upsample.rs
@@ -0,0 +1,236 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::{Channels, ChannelsMut, RenderPipelineInOutStage};
+use jxl_simd::{F32SimdVec, simd_function};
+
+pub struct HorizontalChromaUpsample {
+    channel: usize,
+}
+
+impl HorizontalChromaUpsample {
+    pub fn new(channel: usize) -> HorizontalChromaUpsample {
+        HorizontalChromaUpsample { channel }
+    }
+}
+
+impl std::fmt::Display for HorizontalChromaUpsample {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "chroma upsample of channel {}, horizontally",
+            self.channel
+        )
+    }
+}
+
+// SIMD horizontal chroma upsampling
+simd_function!(
+    hchroma_upsample_simd_dispatch,
+    d: D,
+    fn hchroma_upsample_simd(input: &[f32], output: &mut [f32], xsize: usize) {
+        // Precompute constants
+        let c025 = D::F32Vec::splat(d, 0.25);
+        let c075 = D::F32Vec::splat(d, 0.75);
+
+        // Use windows for input (prev, cur, next) and chunks_exact_mut for output
+        // Input has border padding so windows of size simd_width+2 work
+        // Output is 2x the size, so chunks of 2*simd_width
+        let input_iter = input.windows(D::F32Vec::LEN + 2).step_by(D::F32Vec::LEN);
+        let output_iter = output.chunks_exact_mut(2 * D::F32Vec::LEN);
+
+        for (in_win, out_chunk) in input_iter.zip(output_iter).take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            // Load: prev, cur, next
+            let prev_vec = D::F32Vec::load(d, &in_win[0..]);
+            let cur_vec = D::F32Vec::load(d, &in_win[1..]);
+            let next_vec = D::F32Vec::load(d, &in_win[2..]);
+
+            // Compute: left = 0.25 * prev + 0.75 * cur
+            let left = prev_vec.mul_add(c025, cur_vec * c075);
+
+            // Compute: right = 0.25 * next + 0.75 * cur
+            let right = next_vec.mul_add(c025, cur_vec * c075);
+
+            // Interleave and store: [left0, right0, left1, right1, ...]
+            D::F32Vec::store_interleaved_2(left, right, out_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for HorizontalChromaUpsample {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (1, 0);
+    const BORDER: (u8, u8) = (1, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        crate::profile!(chroma_upsample);
+        let input = &input_rows[0];
+        let output = &mut output_rows[0];
+        hchroma_upsample_simd_dispatch(input[0], output[0], xsize);
+    }
+}
+
+pub struct VerticalChromaUpsample {
+    channel: usize,
+}
+
+impl VerticalChromaUpsample {
+    pub fn new(channel: usize) -> VerticalChromaUpsample {
+        VerticalChromaUpsample { channel }
+    }
+}
+
+impl std::fmt::Display for VerticalChromaUpsample {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "chroma upsample of channel {}, vertically", self.channel)
+    }
+}
+
+// SIMD vertical chroma upsampling
+simd_function!(
+    vchroma_upsample_simd_dispatch,
+    d: D,
+    fn vchroma_upsample_simd(
+        input_prev: &[f32],
+        input_cur: &[f32],
+        input_next: &[f32],
+        output_up: &mut [f32],
+        output_down: &mut [f32],
+        xsize: usize,
+    ) {
+        // Precompute constants
+        let c025 = D::F32Vec::splat(d, 0.25);
+        let c075 = D::F32Vec::splat(d, 0.75);
+
+        // Use chunks_exact for all arrays (buffers are guaranteed large enough)
+        let prev_iter = input_prev.chunks_exact(D::F32Vec::LEN);
+        let cur_iter = input_cur.chunks_exact(D::F32Vec::LEN);
+        let next_iter = input_next.chunks_exact(D::F32Vec::LEN);
+        let up_iter = output_up.chunks_exact_mut(D::F32Vec::LEN);
+        let down_iter = output_down.chunks_exact_mut(D::F32Vec::LEN);
+
+        for ((((prev_chunk, cur_chunk), next_chunk), up_chunk), down_chunk) in prev_iter
+            .zip(cur_iter)
+            .zip(next_iter)
+            .zip(up_iter)
+            .zip(down_iter)
+            .take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            let prev_vec = D::F32Vec::load(d, prev_chunk);
+            let cur_vec = D::F32Vec::load(d, cur_chunk);
+            let next_vec = D::F32Vec::load(d, next_chunk);
+
+            // Compute: up = 0.25 * prev + 0.75 * cur
+            let up = prev_vec.mul_add(c025, cur_vec * c075);
+
+            // Compute: down = 0.25 * next + 0.75 * cur
+            let down = next_vec.mul_add(c025, cur_vec * c075);
+
+            // Store results
+            up.store(up_chunk);
+            down.store(down_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for VerticalChromaUpsample {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 1);
+    const BORDER: (u8, u8) = (0, 1);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        crate::profile!(chroma_upsample);
+        let input = &input_rows[0];
+        let output = &mut output_rows[0];
+        let (output_up, output_down) = output.split_at_mut(1);
+        vchroma_upsample_simd_dispatch(
+            input[0],
+            input[1],
+            input[2],
+            output_up[0],
+            output_down[0],
+            xsize,
+        );
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{error::Result, image::Image, render::test::make_and_run_simple_pipeline};
+    use test_log::test;
+
+    #[test]
+    fn hchr_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || HorizontalChromaUpsample::new(0),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn test_hchr() -> Result<()> {
+        let mut input = Image::new((3, 1))?;
+        input.row_mut(0).copy_from_slice(&[1.0f32, 2.0, 4.0]);
+        let stage = HorizontalChromaUpsample::new(0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], (6, 1), 0, 256)?;
+        assert_eq!(output[0].row(0), [1.0, 1.25, 1.75, 2.5, 3.5, 4.0]);
+        Ok(())
+    }
+
+    #[test]
+    fn vchr_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || VerticalChromaUpsample::new(0),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn test_vchr() -> Result<()> {
+        let mut input = Image::new((1, 3))?;
+        input.row_mut(0)[0] = 1.0f32;
+        input.row_mut(1)[0] = 2.0f32;
+        input.row_mut(2)[0] = 4.0f32;
+        let stage = VerticalChromaUpsample::new(0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], (1, 6), 0, 256)?;
+        assert_eq!(output[0].row(0)[0], 1.0);
+        assert_eq!(output[0].row(1)[0], 1.25);
+        assert_eq!(output[0].row(2)[0], 1.75);
+        assert_eq!(output[0].row(3)[0], 2.5);
+        assert_eq!(output[0].row(4)[0], 3.5);
+        assert_eq!(output[0].row(5)[0], 4.0);
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/cms.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/cms.rs
new file mode 100644
index 00000000..f549cc02
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/cms.rs
@@ -0,0 +1,495 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::any::Any;
+use std::sync::Mutex;
+
+use crate::api::JxlCmsTransformer;
+use crate::error::Result;
+use crate::render::RenderPipelineInPlaceStage;
+
+use crate::render::simd_utils::{
+    deinterleave_2_dispatch, deinterleave_3_dispatch, deinterleave_4_dispatch,
+    interleave_2_dispatch, interleave_3_dispatch, interleave_4_dispatch,
+};
+
+/// Thread-local state for CMS transform.
+/// Each thread exclusively owns its transformer — no shared mutable state.
+struct CmsLocalState {
+    transformer: Box<dyn JxlCmsTransformer + Send + Sync>,
+    /// Buffer for interleaved input pixels (always used).
+    input_buffer: Vec<f32>,
+    /// Buffer for interleaved output pixels (only used when in_channels != out_channels).
+    output_buffer: Vec<f32>,
+}
+
+/// Applies CMS color transform between color profiles.
+///
+/// The stage receives channels re-indexed from 0 in `process_row_chunk`:
+/// - row[0], row[1], row[2] are color channels (always present)
+/// - row[3] is the black (K) channel if `black_channel` is `Some`
+///
+/// Output is written to row[0..out_channels].
+pub struct CmsStage {
+    /// Pool of transformers dispensed to threads via `init_local_state`.
+    /// Each `init_local_state` call pops one; the thread then owns it exclusively.
+    transformer_pool: Mutex<Vec<Box<dyn JxlCmsTransformer + Send + Sync>>>,
+    /// Number of input channels (3 for RGB, 4 for CMYK).
+    in_channels: usize,
+    /// Number of output channels (typically 3 for RGB output).
+    out_channels: usize,
+    /// Pipeline index of the black (K) channel, if present.
+    /// Used by `uses_channel` to request the K channel from the pipeline.
+    black_channel: Option<usize>,
+    input_buffer_size: usize,
+    output_buffer_size: usize,
+}
+
+impl CmsStage {
+    /// Creates a new CMS stage.
+    ///
+    /// # Arguments
+    /// * `transformers` - CMS transformer instances (one per thread recommended)
+    /// * `in_channels` - Number of input channels (3 for RGB, 4 for CMYK)
+    /// * `out_channels` - Number of output channels (must be <= in_channels)
+    /// * `black_channel` - Pipeline index of K channel if present (for CMYK)
+    /// * `max_pixels` - Maximum pixels per row chunk
+    ///
+    /// Always uses separate pre-allocated input/output buffers to avoid
+    /// per-call heap allocations in CMS backends.
+    ///
+    /// # Example
+    /// ```ignore
+    /// // RGB -> RGB (same channel count)
+    /// CmsStage::new(transformers, 3, 3, None, max_pixels);
+    ///
+    /// // CMYK -> RGB where K is at pipeline channel 5
+    /// CmsStage::new(transformers, 4, 3, Some(5), max_pixels);
+    /// ```
+    pub fn new(
+        transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>>,
+        in_channels: usize,
+        out_channels: usize,
+        black_channel: Option<usize>,
+        max_pixels: usize,
+    ) -> Self {
+        // Validate ranges first for clearer error messages
+        assert!(
+            (1..=4).contains(&in_channels),
+            "CMS stage only supports 1-4 input channels, got {in_channels}"
+        );
+        assert!(
+            (1..=4).contains(&out_channels),
+            "CMS stage only supports 1-4 output channels, got {out_channels}"
+        );
+        assert!(
+            out_channels <= in_channels,
+            "out_channels ({out_channels}) must be <= in_channels ({in_channels})"
+        );
+        assert!(
+            black_channel.is_some() == (in_channels == 4),
+            "black_channel must be Some iff in_channels == 4"
+        );
+        // Pad buffer to SIMD alignment (max vector length is 16)
+        let padded_pixels = max_pixels.next_multiple_of(16);
+        Self {
+            transformer_pool: Mutex::new(transformers),
+            in_channels,
+            out_channels,
+            black_channel,
+            input_buffer_size: padded_pixels
+                .checked_mul(in_channels)
+                .expect("CMS input buffer size overflow"),
+            output_buffer_size: padded_pixels
+                .checked_mul(out_channels)
+                .expect("CMS output buffer size overflow"),
+        }
+    }
+}
+
+impl std::fmt::Display for CmsStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if let Some(k) = self.black_channel {
+            write!(
+                f,
+                "CMS transform: {} channels (K at {}) -> {} channels",
+                self.in_channels, k, self.out_channels
+            )
+        } else {
+            write!(
+                f,
+                "CMS transform: {} channels -> {} channels",
+                self.in_channels, self.out_channels
+            )
+        }
+    }
+}
+
+impl RenderPipelineInPlaceStage for CmsStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        // Color channels (0..min(in_channels, 3)) plus black channel if present
+        c < self.in_channels.min(3) || self.black_channel == Some(c)
+    }
+
+    fn init_local_state(&self, _thread_index: usize) -> Result<Option<Box<dyn Any + Send>>> {
+        let transformer = self.transformer_pool.lock().unwrap().pop();
+        let Some(transformer) = transformer else {
+            // Pool exhausted — no transformer available for this thread.
+            return Ok(None);
+        };
+
+        Ok(Some(Box::new(CmsLocalState {
+            transformer,
+            input_buffer: vec![0.0f32; self.input_buffer_size],
+            output_buffer: vec![0.0f32; self.output_buffer_size],
+        })))
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        state: Option<&mut (dyn Any + Send)>,
+    ) {
+        let Some(state) = state else {
+            return;
+        };
+        let state: &mut CmsLocalState = state.downcast_mut().unwrap();
+
+        debug_assert!(
+            xsize * self.in_channels <= state.input_buffer.len(),
+            "xsize {} exceeds buffer capacity",
+            xsize
+        );
+
+        // Single channel: use separate buffers to avoid per-call allocations
+        if self.in_channels == 1 && self.out_channels == 1 {
+            state.input_buffer[..xsize].copy_from_slice(&row[0][..xsize]);
+            state
+                .transformer
+                .do_transform(
+                    &state.input_buffer[..xsize],
+                    &mut state.output_buffer[..xsize],
+                )
+                .expect("CMS transform failed");
+            row[0][..xsize].copy_from_slice(&state.output_buffer[..xsize]);
+            return;
+        }
+
+        // Pad to SIMD alignment (pipeline rows are already padded)
+        let xsize_padded = xsize.next_multiple_of(16);
+
+        // Interleave planar -> packed using SIMD
+        // row[0..in_channels] are our input channels (re-indexed from 0 by pipeline)
+        match self.in_channels {
+            2 => {
+                interleave_2_dispatch(
+                    &row[0][..xsize_padded],
+                    &row[1][..xsize_padded],
+                    &mut state.input_buffer[..xsize_padded * 2],
+                );
+            }
+            3 => {
+                interleave_3_dispatch(
+                    &row[0][..xsize_padded],
+                    &row[1][..xsize_padded],
+                    &row[2][..xsize_padded],
+                    &mut state.input_buffer[..xsize_padded * 3],
+                );
+            }
+            4 => {
+                interleave_4_dispatch(
+                    &row[0][..xsize_padded],
+                    &row[1][..xsize_padded],
+                    &row[2][..xsize_padded],
+                    &row[3][..xsize_padded],
+                    &mut state.input_buffer[..xsize_padded * 4],
+                );
+            }
+            _ => unreachable!("CMS stage only supports 2-4 input channels here"),
+        }
+
+        // Apply transform using separate buffers (avoids per-call allocations
+        // in CMS backends that don't support true in-place transforms).
+        state
+            .transformer
+            .do_transform(
+                &state.input_buffer[..xsize * self.in_channels],
+                &mut state.output_buffer[..xsize * self.out_channels],
+            )
+            .expect("CMS transform failed");
+
+        let output_buf = &state.output_buffer;
+
+        // De-interleave packed -> planar
+        // Output goes to row[0..out_channels]
+        match self.out_channels {
+            1 => {
+                // Single output channel: copy directly from output buffer (no deinterleaving)
+                row[0][..xsize].copy_from_slice(&output_buf[..xsize]);
+            }
+            2 => {
+                let (r0, r1) = row.split_at_mut(1);
+                deinterleave_2_dispatch(
+                    &output_buf[..xsize_padded * 2],
+                    &mut r0[0][..xsize_padded],
+                    &mut r1[0][..xsize_padded],
+                );
+            }
+            3 => {
+                let (r0, rest) = row.split_at_mut(1);
+                let (r1, r2) = rest.split_at_mut(1);
+                deinterleave_3_dispatch(
+                    &output_buf[..xsize_padded * 3],
+                    &mut r0[0][..xsize_padded],
+                    &mut r1[0][..xsize_padded],
+                    &mut r2[0][..xsize_padded],
+                );
+            }
+            4 => {
+                let (r0, rest) = row.split_at_mut(1);
+                let (r1, rest) = rest.split_at_mut(1);
+                let (r2, r3) = rest.split_at_mut(1);
+                deinterleave_4_dispatch(
+                    &output_buf[..xsize_padded * 4],
+                    &mut r0[0][..xsize_padded],
+                    &mut r1[0][..xsize_padded],
+                    &mut r2[0][..xsize_padded],
+                    &mut r3[0][..xsize_padded],
+                );
+            }
+            _ => unreachable!("CMS stage only supports 1-4 output channels"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Mock transformer that copies input to output (for same channel count).
+    struct IdentityTransformer;
+
+    impl JxlCmsTransformer for IdentityTransformer {
+        fn do_transform(&mut self, input: &[f32], output: &mut [f32]) -> Result<()> {
+            output.copy_from_slice(input);
+            Ok(())
+        }
+
+        fn do_transform_inplace(&mut self, _inout: &mut [f32]) -> Result<()> {
+            // Identity - no change needed
+            Ok(())
+        }
+    }
+
+    /// Mock transformer that scales values by 2 (for testing in-place).
+    struct ScaleTransformer;
+
+    impl JxlCmsTransformer for ScaleTransformer {
+        fn do_transform(&mut self, input: &[f32], output: &mut [f32]) -> Result<()> {
+            for (o, i) in output.iter_mut().zip(input.iter()) {
+                *o = *i * 2.0;
+            }
+            Ok(())
+        }
+
+        fn do_transform_inplace(&mut self, inout: &mut [f32]) -> Result<()> {
+            for v in inout.iter_mut() {
+                *v *= 2.0;
+            }
+            Ok(())
+        }
+    }
+
+    /// Mock transformer that converts 4 channels to 3 (CMYK -> RGB style).
+    /// Simply drops the 4th channel and passes through the first 3.
+    struct FourToThreeTransformer;
+
+    impl JxlCmsTransformer for FourToThreeTransformer {
+        fn do_transform(&mut self, input: &[f32], output: &mut [f32]) -> Result<()> {
+            // Input: CMYK interleaved (4 values per pixel)
+            // Output: RGB interleaved (3 values per pixel)
+            let num_pixels = input.len() / 4;
+            for i in 0..num_pixels {
+                // Simple conversion: R = 1-C, G = 1-M, B = 1-Y (ignoring K for simplicity)
+                output[i * 3] = 1.0 - input[i * 4]; // C -> R
+                output[i * 3 + 1] = 1.0 - input[i * 4 + 1]; // M -> G
+                output[i * 3 + 2] = 1.0 - input[i * 4 + 2]; // Y -> B
+            }
+            Ok(())
+        }
+
+        fn do_transform_inplace(&mut self, _inout: &mut [f32]) -> Result<()> {
+            // Cannot do 4->3 in place
+            panic!("FourToThreeTransformer does not support in-place transform");
+        }
+    }
+
+    #[test]
+    fn test_cms_stage_rgb_inplace() {
+        // Test 3->3 channel transform (uses in-place)
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(ScaleTransformer)];
+        let stage = CmsStage::new(transformers, 3, 3, None, 16);
+
+        // Initialize state for thread 0
+        let state = stage.init_local_state(0).unwrap().unwrap();
+        let mut state_ref: Box<dyn Any + Send> = state;
+
+        // Create test data: 3 channels, 4 pixels
+        let mut ch0 = vec![1.0, 2.0, 3.0, 4.0];
+        let mut ch1 = vec![0.5, 0.5, 0.5, 0.5];
+        let mut ch2 = vec![0.1, 0.2, 0.3, 0.4];
+
+        // Pad to 16 for SIMD alignment
+        ch0.resize(16, 0.0);
+        ch1.resize(16, 0.0);
+        ch2.resize(16, 0.0);
+
+        let mut rows: Vec<&mut [f32]> = vec![&mut ch0, &mut ch1, &mut ch2];
+        stage.process_row_chunk((0, 0), 4, &mut rows, Some(state_ref.as_mut()));
+
+        // Values should be scaled by 2
+        assert_eq!(ch0[0], 2.0);
+        assert_eq!(ch0[1], 4.0);
+        assert_eq!(ch1[0], 1.0);
+        assert_eq!(ch2[0], 0.2);
+    }
+
+    #[test]
+    fn test_cms_stage_cmyk_to_rgb() {
+        // Test 4->3 channel transform (CMYK to RGB)
+        // The pipeline passes row[0..4] as CMY + K (re-indexed from 0)
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(FourToThreeTransformer)];
+        // K is at pipeline index 5, but we get it as row[3]
+        let stage = CmsStage::new(transformers, 4, 3, Some(5), 16);
+
+        let state = stage.init_local_state(0).unwrap().unwrap();
+        let mut state_ref: Box<dyn Any + Send> = state;
+
+        // Create test data: 4 channels as the pipeline would pass them (re-indexed)
+        // row[0]=C, row[1]=M, row[2]=Y, row[3]=K
+        let mut ch0 = vec![0.2, 0.5]; // C
+        let mut ch1 = vec![0.3, 0.5]; // M
+        let mut ch2 = vec![0.4, 0.5]; // Y
+        let mut ch3 = vec![0.1, 0.5]; // K
+
+        // Pad to 16 for SIMD alignment
+        ch0.resize(16, 0.0);
+        ch1.resize(16, 0.0);
+        ch2.resize(16, 0.0);
+        ch3.resize(16, 0.0);
+
+        let mut rows: Vec<&mut [f32]> = vec![&mut ch0, &mut ch1, &mut ch2, &mut ch3];
+        stage.process_row_chunk((0, 0), 2, &mut rows, Some(state_ref.as_mut()));
+
+        // Output should be RGB: R = 1-C, G = 1-M, B = 1-Y
+        assert!((ch0[0] - 0.8).abs() < 0.001);
+        assert!((ch1[0] - 0.7).abs() < 0.001);
+        assert!((ch2[0] - 0.6).abs() < 0.001);
+    }
+
+    #[test]
+    fn test_cms_stage_single_channel() {
+        // Test 1->1 channel transform (grayscale)
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(ScaleTransformer)];
+        let stage = CmsStage::new(transformers, 1, 1, None, 16);
+
+        let state = stage.init_local_state(0).unwrap().unwrap();
+        let mut state_ref: Box<dyn Any + Send> = state;
+
+        let mut ch0 = vec![1.0, 2.0, 3.0, 4.0];
+        ch0.resize(16, 0.0);
+
+        let mut rows: Vec<&mut [f32]> = vec![&mut ch0];
+        stage.process_row_chunk((0, 0), 4, &mut rows, Some(state_ref.as_mut()));
+
+        // Values should be scaled by 2
+        assert_eq!(ch0[0], 2.0);
+        assert_eq!(ch0[1], 4.0);
+        assert_eq!(ch0[2], 6.0);
+        assert_eq!(ch0[3], 8.0);
+    }
+
+    #[test]
+    fn test_cms_stage_no_transformers() {
+        // Test with empty transformers - should do nothing
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> = vec![];
+        let stage = CmsStage::new(transformers, 3, 3, None, 16);
+
+        // init_local_state should return None when no transformers
+        let state = stage.init_local_state(0).unwrap();
+        assert!(state.is_none());
+
+        // process_row_chunk should be a no-op with None state
+        let mut ch0 = vec![1.0, 2.0, 3.0, 4.0];
+        ch0.resize(16, 0.0);
+        let original = ch0.clone();
+
+        let mut rows: Vec<&mut [f32]> = vec![&mut ch0];
+        stage.process_row_chunk((0, 0), 4, &mut rows, None);
+
+        // Values should be unchanged
+        assert_eq!(ch0, original);
+    }
+
+    #[test]
+    fn test_cms_stage_display() {
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(IdentityTransformer)];
+        let stage_rgb = CmsStage::new(transformers, 3, 3, None, 16);
+        let display = format!("{}", stage_rgb);
+        assert!(display.contains("3 channels -> 3 channels"));
+
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(IdentityTransformer)];
+        let stage_cmyk = CmsStage::new(transformers, 4, 3, Some(5), 16);
+        let display = format!("{}", stage_cmyk);
+        assert!(display.contains("4 channels"));
+        assert!(display.contains("K at 5"));
+        assert!(display.contains("-> 3 channels"));
+    }
+
+    #[test]
+    fn test_cms_stage_uses_channel() {
+        // RGB only (no black channel)
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(IdentityTransformer)];
+        let stage_rgb = CmsStage::new(transformers, 3, 3, None, 16);
+        assert!(stage_rgb.uses_channel(0));
+        assert!(stage_rgb.uses_channel(1));
+        assert!(stage_rgb.uses_channel(2));
+        assert!(!stage_rgb.uses_channel(3));
+        assert!(!stage_rgb.uses_channel(5));
+
+        // CMYK with K at pipeline index 5
+        let transformers: Vec<Box<dyn JxlCmsTransformer + Send + Sync>> =
+            vec![Box::new(IdentityTransformer)];
+        let stage_cmyk = CmsStage::new(transformers, 4, 3, Some(5), 16);
+        assert!(stage_cmyk.uses_channel(0));
+        assert!(stage_cmyk.uses_channel(1));
+        assert!(stage_cmyk.uses_channel(2));
+        assert!(!stage_cmyk.uses_channel(3)); // Not K
+        assert!(!stage_cmyk.uses_channel(4)); // Not K
+        assert!(stage_cmyk.uses_channel(5)); // K channel
+        assert!(!stage_cmyk.uses_channel(6));
+    }
+
+    #[test]
+    fn test_stage_consistency_cms() -> crate::error::Result<()> {
+        // Test consistency for RGB -> RGB (3-channel identity transform)
+        // max_pixels must be >= test image width (500)
+        crate::render::test::test_stage_consistency(
+            || CmsStage::new(vec![Box::new(IdentityTransformer)], 3, 3, None, 512),
+            (500, 500),
+            3,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/cms_cmyk.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/cms_cmyk.rs
new file mode 100644
index 00000000..6517ce00
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/cms_cmyk.rs
@@ -0,0 +1,119 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! CMS-based CMYK to RGB conversion stage.
+//!
+//! This stage uses a Color Management System (moxcms) to convert CMYK data
+//! to RGB using an embedded ICC profile. This is needed for proper CMYK
+//! color reproduction, as simple mathematical conversion (R=C*K) does not
+//! account for ink characteristics, dot gain, and color gamut mapping that
+//! ICC profiles encode.
+
+use std::sync::Mutex;
+
+use crate::api::JxlCmsTransformer;
+use crate::render::RenderPipelineInPlaceStage;
+
+/// CMS-based CMYK to RGB conversion stage.
+///
+/// This stage:
+/// 1. Reads CMY from channels 0, 1, 2 and K from the specified extra channel
+/// 2. Packs them into CMYK format (4 channels)
+/// 3. Transforms through the ICC profile using moxcms
+/// 4. Outputs RGB to channels 0, 1, 2
+pub struct CmsCmykToRgbStage {
+    /// Black channel index (offset from 3)
+    black_c: usize,
+    /// The CMS transformer for CMYK → sRGB conversion (uses Mutex for interior mutability)
+    transformer: Mutex<Box<dyn JxlCmsTransformer + Send + Sync>>,
+}
+
+impl std::fmt::Display for CmsCmykToRgbStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "CMS CMYK to RGB stage for channel {}", self.black_c)
+    }
+}
+
+impl CmsCmykToRgbStage {
+    pub fn new(
+        black_c_offset: usize,
+        transformer: Box<dyn JxlCmsTransformer + Send + Sync>,
+    ) -> Self {
+        Self {
+            black_c: 3 + black_c_offset,
+            transformer: Mutex::new(transformer),
+        }
+    }
+}
+
+impl RenderPipelineInPlaceStage for CmsCmykToRgbStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3 || c == self.black_c
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let [row_c, row_m, row_y, row_k] = row else {
+            panic!(
+                "incorrect number of channels; expected 4, found {}",
+                row.len()
+            );
+        };
+
+        assert!(
+            xsize <= row_c.len()
+                && xsize <= row_m.len()
+                && xsize <= row_y.len()
+                && xsize <= row_k.len()
+        );
+
+        // Allocate buffers for CMYK input and RGB output
+        // In moxcms, CMYK uses Layout::Rgba (4 channels)
+        let mut cmyk_input = vec![0.0f32; xsize * 4];
+        let mut rgb_output = vec![0.0f32; xsize * 3];
+
+        // Pack CMYK data with inversion
+        // JXL uses reflectance convention: 1.0 = no ink (white), 0.0 = full ink
+        // ICC/moxcms uses: 0.0 = no ink, 1.0 = max ink
+        // skcms (used by libjxl) auto-inverts for CMYK profiles.
+        // We must invert to match ICC convention before passing to moxcms.
+        for idx in 0..xsize {
+            cmyk_input[idx * 4] = 1.0 - row_c[idx];
+            cmyk_input[idx * 4 + 1] = 1.0 - row_m[idx];
+            cmyk_input[idx * 4 + 2] = 1.0 - row_y[idx];
+            cmyk_input[idx * 4 + 3] = 1.0 - row_k[idx];
+        }
+
+        // Transform CMYK → RGB through ICC profile
+        let mut transformer = self.transformer.lock().unwrap();
+
+        match transformer.do_transform(&cmyk_input, &mut rgb_output) {
+            Ok(()) => {
+                // Unpack RGB output
+                for idx in 0..xsize {
+                    row_c[idx] = rgb_output[idx * 3];
+                    row_m[idx] = rgb_output[idx * 3 + 1];
+                    row_y[idx] = rgb_output[idx * 3 + 2];
+                }
+            }
+            Err(_e) => {
+                // Fall back to simple CMYK math if transform fails
+                for idx in 0..xsize {
+                    let k = row_k[idx];
+                    row_c[idx] *= k;
+                    row_m[idx] *= k;
+                    row_y[idx] *= k;
+                }
+            }
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/convert.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/convert.rs
new file mode 100644
index 00000000..b9870258
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/convert.rs
@@ -0,0 +1,746 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    frame::quantizer::LfQuantFactors,
+    headers::bit_depth::BitDepth,
+    render::{Channels, ChannelsMut, RenderPipelineInOutStage, StageSpecialCase},
+};
+use jxl_simd::{F32SimdVec, I32SimdVec, SimdMask, simd_function};
+
+#[allow(dead_code)] // U8-to-F32 conversion stage for future JPEG input paths
+pub struct ConvertU8F32Stage {
+    channel: usize,
+}
+
+#[allow(dead_code)]
+impl ConvertU8F32Stage {
+    pub fn new(channel: usize) -> ConvertU8F32Stage {
+        ConvertU8F32Stage { channel }
+    }
+}
+
+impl std::fmt::Display for ConvertU8F32Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "convert U8 data to F32 in channel {}", self.channel)
+    }
+}
+
+impl RenderPipelineInOutStage for ConvertU8F32Stage {
+    type InputT = u8;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<u8>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = &input_rows[0];
+        for i in 0..xsize {
+            output_rows[0][0][i] = input[0][i] as f32 * (1.0 / 255.0);
+        }
+    }
+}
+
+pub struct ConvertModularXYBToF32Stage {
+    first_channel: usize,
+    scale: [f32; 3],
+}
+
+impl ConvertModularXYBToF32Stage {
+    pub fn new(first_channel: usize, lf_quant: &LfQuantFactors) -> ConvertModularXYBToF32Stage {
+        ConvertModularXYBToF32Stage {
+            first_channel,
+            scale: lf_quant.quant_factors,
+        }
+    }
+}
+
+impl std::fmt::Display for ConvertModularXYBToF32Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "convert modular xyb data to F32 in channels {}..{} with scales {:?}",
+            self.first_channel,
+            self.first_channel + 2,
+            self.scale
+        )
+    }
+}
+
+impl RenderPipelineInOutStage for ConvertModularXYBToF32Stage {
+    type InputT = i32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<i32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let [scale_x, scale_y, scale_b] = self.scale;
+        assert_eq!(
+            input_rows.len(),
+            3,
+            "incorrect number of channels; expected 3, found {}",
+            input_rows.len()
+        );
+        // Input channels: [Y, X, B] (modular XYB order)
+        // Output channels: [X, Y, B] (standard XYB order)
+        let (input_y, input_x, input_b) = (&input_rows[0], &input_rows[1], &input_rows[2]);
+        let (output_x, output_y, output_b) = output_rows.split_first_3_mut();
+        for i in 0..xsize {
+            output_x[0][i] = input_x[0][i] as f32 * scale_x;
+            output_y[0][i] = input_y[0][i] as f32 * scale_y;
+            output_b[0][i] = (input_b[0][i] + input_y[0][i]) as f32 * scale_b;
+        }
+    }
+}
+
+pub struct ConvertModularToF32Stage {
+    channel: usize,
+    bit_depth: BitDepth,
+}
+
+impl ConvertModularToF32Stage {
+    pub fn new(channel: usize, bit_depth: BitDepth) -> ConvertModularToF32Stage {
+        ConvertModularToF32Stage { channel, bit_depth }
+    }
+}
+
+impl std::fmt::Display for ConvertModularToF32Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "convert modular data to F32 in channel {} with bit depth {:?}",
+            self.channel, self.bit_depth
+        )
+    }
+}
+
+// SIMD 32-bit float passthrough (bitcast i32 to f32)
+simd_function!(
+    int_to_float_32bit_simd_dispatch,
+    d: D,
+    fn int_to_float_32bit_simd(input: &[i32], output: &mut [f32], xsize: usize) {
+        let end = xsize.next_multiple_of(D::I32Vec::LEN);
+        for (in_chunk, out_chunk) in input[..end]
+            .chunks_exact(D::I32Vec::LEN)
+            .zip(output[..end].chunks_exact_mut(D::I32Vec::LEN))
+        {
+            let val = D::I32Vec::load(d, in_chunk);
+            val.bitcast_to_f32().store(out_chunk);
+        }
+    }
+);
+
+// SIMD 16-bit float (half-precision) to 32-bit float conversion
+// Uses hardware F16C/NEON instructions when available via F32Vec::load_f16_bits()
+simd_function!(
+    int_to_float_16bit_simd_dispatch,
+    d: D,
+    fn int_to_float_16bit_simd(input: &[i32], output: &mut [f32], xsize: usize) {
+        let simd_width = D::F32Vec::LEN;
+
+        // Temporary buffer for i32->u16 conversion via SIMD
+        // Note: Using constant 16 (max AVX-512 width) because D::F32Vec::LEN
+        // cannot be used as array size in Rust (const generics limitation)
+        const { assert!(D::F32Vec::LEN <= 16) }
+        let mut u16_buf = [0u16; 16];
+
+        // Process complete SIMD vectors (pre-slice to avoid .take() adapter overhead)
+        let end = xsize.next_multiple_of(simd_width);
+        for (in_chunk, out_chunk) in input[..end]
+            .chunks_exact(simd_width)
+            .zip(output[..end].chunks_exact_mut(simd_width))
+        {
+            // Use SIMD to extract lower 16 bits from each i32 lane
+            let i32_vec = D::I32Vec::load(d, in_chunk);
+            i32_vec.store_u16(&mut u16_buf[..simd_width]);
+            // Use hardware f16->f32 conversion
+            let result = D::F32Vec::load_f16_bits(d, &u16_buf[..simd_width]);
+            result.store(out_chunk);
+        }
+    }
+);
+
+// Converts custom [bits]-bit float (with [exp_bits] exponent bits) stored as
+// int back to binary32 float.
+fn int_to_float(input: &[i32], output: &mut [f32], bit_depth: &BitDepth, xsize: usize) {
+    assert_eq!(input.len(), output.len());
+    let bits = bit_depth.bits_per_sample();
+    let exp_bits = bit_depth.exponent_bits_per_sample();
+
+    // Use SIMD fast paths for common formats
+    if bits == 32 && exp_bits == 8 {
+        // 32-bit float passthrough
+        int_to_float_32bit_simd_dispatch(input, output, xsize);
+        return;
+    }
+
+    if bits == 16 && exp_bits == 5 {
+        // IEEE 754 half-precision (f16) - common HDR format
+        int_to_float_16bit_simd_dispatch(input, output, xsize);
+        return;
+    }
+
+    // Generic scalar path for other custom float formats
+    int_to_float_generic(input, output, bits, exp_bits);
+}
+
+// Generic scalar conversion for arbitrary bit-depth floats
+// TODO: SIMD optimization for custom float formats
+fn int_to_float_generic(input: &[i32], output: &mut [f32], bits: u32, exp_bits: u32) {
+    let exp_bias = (1 << (exp_bits - 1)) - 1;
+    let sign_shift = bits - 1;
+    let mant_bits = bits - exp_bits - 1;
+    let mant_shift = 23 - mant_bits;
+    for (&in_val, out_val) in input.iter().zip(output) {
+        let mut f = in_val as u32;
+        let signbit = (f >> sign_shift) != 0;
+        f &= (1 << sign_shift) - 1;
+        if f == 0 {
+            *out_val = if signbit { -0.0 } else { 0.0 };
+            continue;
+        }
+        let mut exp = (f >> mant_bits) as i32;
+        let mut mantissa = f & ((1 << mant_bits) - 1);
+        if exp == (1 << exp_bits) - 1 {
+            // NaN or infinity
+            f = if signbit { 0x80000000 } else { 0 };
+            f |= 0b11111111 << 23;
+            f |= mantissa << mant_shift;
+            *out_val = f32::from_bits(f);
+            continue;
+        }
+        mantissa <<= mant_shift;
+        // Try to normalize only if there is space for maneuver.
+        if exp == 0 && exp_bits < 8 {
+            // subnormal number
+            while (mantissa & 0x800000) == 0 {
+                mantissa <<= 1;
+                exp -= 1;
+            }
+            exp += 1;
+            // remove leading 1 because it is implicit now
+            mantissa &= 0x7fffff;
+        }
+        exp -= exp_bias;
+        // broke up the arbitrary float into its parts, now reassemble into
+        // binary32
+        exp += 127;
+        assert!(exp >= 0);
+        f = if signbit { 0x80000000 } else { 0 };
+        f |= (exp as u32) << 23;
+        f |= mantissa;
+        *out_val = f32::from_bits(f);
+    }
+}
+
+// SIMD modular to 32 bit float conversion
+simd_function!(
+    modular_to_float_32bit_simd_dispatch,
+    d: D,
+    fn modular_to_float_32bit_simd(input: &[i32], output: &mut [f32], scale: f32, xsize: usize) {
+        let simd_width = D::I32Vec::LEN;
+
+        let scale = D::F32Vec::splat(d, scale);
+
+        // Process complete SIMD vectors
+        for (in_chunk, out_chunk) in input
+            .chunks_exact(simd_width)
+            .zip(output.chunks_exact_mut(simd_width))
+            .take(xsize.div_ceil(simd_width))
+        {
+            let val = D::I32Vec::load(d, in_chunk);
+            (val.as_f32() * scale).store(out_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for ConvertModularToF32Stage {
+    type InputT = i32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<i32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = &input_rows[0];
+        if self.bit_depth.floating_point_sample() {
+            int_to_float(input[0], output_rows[0][0], &self.bit_depth, xsize);
+        } else {
+            let scale = 1.0 / ((1u64 << self.bit_depth.bits_per_sample()) - 1) as f32;
+            modular_to_float_32bit_simd_dispatch(input[0], output_rows[0][0], scale, xsize);
+        }
+    }
+
+    fn is_special_case(&self) -> Option<StageSpecialCase> {
+        if self.bit_depth.floating_point_sample() {
+            None
+        } else {
+            Some(StageSpecialCase::ModularToF32 {
+                channel: self.channel,
+                bit_depth: self.bit_depth.bits_per_sample() as u8,
+            })
+        }
+    }
+}
+
+/// Stage that converts f32 values in [0, 1] range to u8 values.
+pub struct ConvertF32ToU8Stage {
+    channel: usize,
+    bit_depth: u8,
+}
+
+impl ConvertF32ToU8Stage {
+    pub fn new(channel: usize, bit_depth: u8) -> ConvertF32ToU8Stage {
+        ConvertF32ToU8Stage { channel, bit_depth }
+    }
+}
+
+impl std::fmt::Display for ConvertF32ToU8Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "convert F32 to U8 in channel {} with bit depth {}",
+            self.channel, self.bit_depth
+        )
+    }
+}
+
+// SIMD F32 to U8 conversion
+simd_function!(
+    f32_to_u8_simd_dispatch,
+    d: D,
+    fn f32_to_u8_simd(input: &[f32], output: &mut [u8], max: f32, xsize: usize) {
+        let zero = D::F32Vec::splat(d, 0.0);
+        let one = D::F32Vec::splat(d, 1.0);
+        let scale = D::F32Vec::splat(d, max);
+
+        // Pre-slice to avoid .take() iterator adapter overhead (buffers are padded).
+        let end = xsize.next_multiple_of(D::F32Vec::LEN);
+        for (input_chunk, output_chunk) in input[..end]
+            .chunks_exact(D::F32Vec::LEN)
+            .zip(output[..end].chunks_exact_mut(D::F32Vec::LEN))
+        {
+            let val = D::F32Vec::load(d, input_chunk);
+            // Clamp to [0, 1] and scale
+            let clamped = val.max(zero).min(one);
+            let scaled = clamped * scale;
+            scaled.round_store_u8(output_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for ConvertF32ToU8Stage {
+    type InputT = f32;
+    type OutputT = u8;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u8>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = input_rows[0][0];
+        let output = &mut output_rows[0][0];
+        let max = ((1u32 << self.bit_depth) - 1) as f32;
+        f32_to_u8_simd_dispatch(input, output, max, xsize);
+    }
+
+    fn is_special_case(&self) -> Option<StageSpecialCase> {
+        Some(StageSpecialCase::F32ToU8 {
+            channel: self.channel,
+            bit_depth: self.bit_depth,
+        })
+    }
+}
+
+/// Stage that converts i32 values to u8 values, applying a multiplier.
+pub struct ConvertI32ToU8Stage {
+    channel: usize,
+    multiplier: i32,
+    max: i32,
+}
+
+impl ConvertI32ToU8Stage {
+    pub fn new(channel: usize, multiplier: i32, max: i32) -> ConvertI32ToU8Stage {
+        ConvertI32ToU8Stage {
+            channel,
+            multiplier,
+            max,
+        }
+    }
+}
+
+impl std::fmt::Display for ConvertI32ToU8Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "convert I32 to U8 in channel {} with multiplier {}",
+            self.channel, self.multiplier
+        )
+    }
+}
+
+// SIMD I32 to U8 conversion
+simd_function!(
+    i32_to_u8_simd_dispatch,
+    d: D,
+    fn i32_to_u8_simd(input: &[i32], output: &mut [u8], scale: i32, max: i32, xsize: usize) {
+        let simd_width = D::F32Vec::LEN;
+        let scale = D::I32Vec::splat(d, scale);
+        let max = D::I32Vec::splat(d, max);
+        let zero = D::I32Vec::splat(d, 0);
+
+        // Process SIMD vectors using div_ceil (buffers are padded)
+        for (input_chunk, output_chunk) in input
+            .chunks_exact(simd_width)
+            .zip(output.chunks_exact_mut(simd_width))
+            .take(xsize.div_ceil(simd_width))
+        {
+            let val = D::I32Vec::load(d, input_chunk);
+            let scaled = val * scale;
+            let zeroclip = scaled.lt_zero().if_then_else_i32(zero, scaled);
+            let clip = scaled.gt(max).if_then_else_i32(max, zeroclip);
+            clip.store_u8(output_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for ConvertI32ToU8Stage {
+    type InputT = i32;
+    type OutputT = u8;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<i32>,
+        output_rows: &mut ChannelsMut<u8>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = input_rows[0][0];
+        let output = &mut output_rows[0][0];
+        i32_to_u8_simd_dispatch(input, output, self.multiplier, self.max, xsize);
+    }
+}
+
+/// Stage that converts f32 values in [0, 1] range to u16 values.
+pub struct ConvertF32ToU16Stage {
+    channel: usize,
+    bit_depth: u8,
+}
+
+impl ConvertF32ToU16Stage {
+    pub fn new(channel: usize, bit_depth: u8) -> ConvertF32ToU16Stage {
+        ConvertF32ToU16Stage { channel, bit_depth }
+    }
+}
+
+impl std::fmt::Display for ConvertF32ToU16Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "convert F32 to U16 in channel {} with bit depth {}",
+            self.channel, self.bit_depth
+        )
+    }
+}
+
+// SIMD F32 to U16 conversion
+simd_function!(
+    f32_to_u16_simd_dispatch,
+    d: D,
+    fn f32_to_u16_simd(input: &[f32], output: &mut [u16], max: f32, xsize: usize) {
+        let zero = D::F32Vec::splat(d, 0.0);
+        let one = D::F32Vec::splat(d, 1.0);
+        let scale = D::F32Vec::splat(d, max);
+
+        // Pre-slice to avoid .take() iterator adapter overhead (buffers are padded).
+        let end = xsize.next_multiple_of(D::F32Vec::LEN);
+        for (input_chunk, output_chunk) in input[..end]
+            .chunks_exact(D::F32Vec::LEN)
+            .zip(output[..end].chunks_exact_mut(D::F32Vec::LEN))
+        {
+            let val = D::F32Vec::load(d, input_chunk);
+            // Clamp to [0, 1] and scale
+            let clamped = val.max(zero).min(one);
+            let scaled = clamped * scale;
+            scaled.round_store_u16(output_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for ConvertF32ToU16Stage {
+    type InputT = f32;
+    type OutputT = u16;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u16>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = input_rows[0][0];
+        let output = &mut output_rows[0][0];
+        let max = ((1u32 << self.bit_depth) - 1) as f32;
+        f32_to_u16_simd_dispatch(input, output, max, xsize);
+    }
+}
+
+/// Stage that converts f32 values to f16 (half-precision float) values.
+pub struct ConvertF32ToF16Stage {
+    channel: usize,
+    clamp_range: Option<(f32, f32)>,
+}
+
+impl ConvertF32ToF16Stage {
+    pub fn new(channel: usize) -> ConvertF32ToF16Stage {
+        ConvertF32ToF16Stage {
+            channel,
+            clamp_range: None,
+        }
+    }
+
+    pub fn new_with_clamp_range(
+        channel: usize,
+        clamp_range: Option<(f32, f32)>,
+    ) -> ConvertF32ToF16Stage {
+        ConvertF32ToF16Stage {
+            channel,
+            clamp_range,
+        }
+    }
+}
+
+impl std::fmt::Display for ConvertF32ToF16Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "convert F32 to F16 in channel {}", self.channel)
+    }
+}
+
+impl RenderPipelineInOutStage for ConvertF32ToF16Stage {
+    type InputT = f32;
+    type OutputT = crate::util::f16;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<crate::util::f16>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = &input_rows[0];
+        if let Some((min_value, max_value)) = self.clamp_range {
+            for i in 0..xsize {
+                output_rows[0][0][i] =
+                    crate::util::f16::from_f32(input[0][i].clamp(min_value, max_value));
+            }
+        } else {
+            for i in 0..xsize {
+                output_rows[0][0][i] = crate::util::f16::from_f32(input[0][i]);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::error::Result;
+    use crate::headers::bit_depth::BitDepth;
+    use test_log::test;
+
+    #[test]
+    fn f32_to_u8_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ConvertF32ToU8Stage::new(0, 8),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn f32_to_u16_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ConvertF32ToU16Stage::new(0, 16),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn f32_to_f16_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(|| ConvertF32ToF16Stage::new(0), (500, 500), 1)
+    }
+
+    #[test]
+    fn f32_to_f16_consistency_with_clamp() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ConvertF32ToF16Stage::new_with_clamp_range(0, Some((0.0, 1.0))),
+            (500, 500),
+            1,
+        )
+    }
+
+    /// Test ConvertModularToF32Stage consistency with different bit depths.
+    #[test]
+    fn modular_to_f32_8bit_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ConvertModularToF32Stage::new(0, BitDepth::integer_samples(8)),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn modular_to_f32_16bit_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ConvertModularToF32Stage::new(0, BitDepth::integer_samples(16)),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn test_int_to_float_32bit() {
+        // Test 32-bit float passthrough
+        let bit_depth = BitDepth::f32();
+        let test_values: Vec<f32> = vec![
+            0.0,
+            1.0,
+            -1.0,
+            0.5,
+            -0.5,
+            f32::INFINITY,
+            f32::NEG_INFINITY,
+            1e-30,
+            1e30,
+        ];
+        let input: Vec<i32> = test_values
+            .iter()
+            .map(|&f| f.to_bits() as i32)
+            .chain(std::iter::repeat(0))
+            .take(16)
+            .collect();
+        let mut output = vec![0.0f32; 16];
+
+        int_to_float(&input, &mut output, &bit_depth, test_values.len());
+
+        for (i, (&expected, &actual)) in test_values.iter().zip(output.iter()).enumerate() {
+            if expected.is_nan() {
+                assert!(actual.is_nan(), "index {}: expected NaN, got {}", i, actual);
+            } else {
+                assert_eq!(expected, actual, "index {}: mismatch", i);
+            }
+        }
+    }
+
+    #[test]
+    fn test_int_to_float_16bit() {
+        // Test 16-bit float (f16) conversion for normal values
+        let bit_depth = BitDepth::f16();
+
+        // f16 format: 1 sign, 5 exp, 10 mantissa
+        // Test cases: (f16_bits, expected_f32)
+        let test_cases: Vec<(u16, f32)> = vec![
+            (0x0000, 0.0),               // +0
+            (0x8000, -0.0),              // -0
+            (0x3C00, 1.0),               // 1.0
+            (0xBC00, -1.0),              // -1.0
+            (0x3800, 0.5),               // 0.5
+            (0x4000, 2.0),               // 2.0
+            (0x4400, 4.0),               // 4.0
+            (0x7BFF, 65504.0),           // max normal f16
+            (0x7C00, f32::INFINITY),     // +inf
+            (0xFC00, f32::NEG_INFINITY), // -inf
+            (0x0001, 5.960_464_5e-8),    // smallest positive subnormal
+            (0x03FF, 6.097_555e-5),      // largest positive subnormal
+            (0x8001, -5.960_464_5e-8),   // smallest negative subnormal
+        ];
+
+        let input: Vec<i32> = test_cases
+            .iter()
+            .map(|(bits, _)| *bits as i32)
+            .chain(std::iter::repeat(0))
+            .take(16)
+            .collect();
+        let mut output = vec![0.0f32; 16];
+
+        int_to_float(&input, &mut output, &bit_depth, test_cases.len());
+
+        for (i, (&(_, expected), &actual)) in test_cases.iter().zip(output.iter()).enumerate() {
+            assert!(
+                (expected - actual).abs() < 1e-6
+                    || expected == actual
+                    || (expected.is_sign_negative() == actual.is_sign_negative()
+                        && expected == 0.0
+                        && actual == 0.0),
+                "index {}: expected {}, got {}",
+                i,
+                expected,
+                actual
+            );
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/common.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/common.rs
new file mode 100644
index 00000000..e154cd09
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/common.rs
@@ -0,0 +1,78 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::BLOCK_DIM;
+use crate::features::epf::SigmaSource;
+
+use jxl_simd::{F32SimdVec, I32SimdVec, SimdDescriptor, SimdMask};
+
+/// Sigma row source for EPF processing.
+/// Either a slice from the variable sigma image, or a constant value.
+#[derive(Clone, Copy)]
+pub(super) enum SigmaRow<'a> {
+    Variable(&'a [f32]),
+    Constant(f32),
+}
+
+impl SigmaSource {
+    /// Get the sigma row for a given y position.
+    #[inline(always)]
+    pub(super) fn row(&self, y: usize) -> SigmaRow<'_> {
+        match self {
+            SigmaSource::Variable(image) => SigmaRow::Variable(image.row(y)),
+            SigmaSource::Constant(sigma) => SigmaRow::Constant(*sigma),
+        }
+    }
+}
+
+#[inline(always)]
+pub(super) fn prepare_sad_mul_storage(x: usize, y: usize, sm: f32, bsm: f32) -> [f32; 24] {
+    let mut sad_mul_storage = [bsm; 24];
+    if ![0, BLOCK_DIM - 1].contains(&(y % BLOCK_DIM)) {
+        for (i, s) in sad_mul_storage.iter_mut().enumerate().take(16) {
+            if ![0, BLOCK_DIM - 1].contains(&((x + i) % BLOCK_DIM)) {
+                *s = sm;
+            }
+        }
+    }
+    sad_mul_storage
+}
+
+#[inline(always)]
+pub(super) fn get_sigma<D: SimdDescriptor>(d: D, x: usize, row_sigma: SigmaRow<'_>) -> D::F32Vec {
+    match row_sigma {
+        SigmaRow::Constant(sigma) => D::F32Vec::splat(d, sigma),
+        SigmaRow::Variable(row_sigma) => get_sigma_from_row(d, x, row_sigma),
+    }
+}
+
+#[inline(always)]
+fn get_sigma_from_row<D: SimdDescriptor>(d: D, x: usize, row_sigma: &[f32]) -> D::F32Vec {
+    const { assert!(BLOCK_DIM == 8) }
+    const { assert!(D::F32Vec::LEN <= 16) }
+    let iota = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
+    let iota = D::I32Vec::load(d, &iota);
+    let sigma_start = x / BLOCK_DIM;
+    let offset = D::I32Vec::splat(d, (x - sigma_start * BLOCK_DIM) as i32) + iota;
+    if D::F32Vec::LEN > 8 {
+        let [sigma0, sigma1, sigma2, ..] = row_sigma[sigma_start..] else {
+            unreachable!();
+        };
+        let sigma0 = D::F32Vec::splat(d, sigma0);
+        let sigma1 = D::F32Vec::splat(d, sigma1);
+        let sigma2 = D::F32Vec::splat(d, sigma2);
+        let above_8 = offset.gt(D::I32Vec::splat(d, 7));
+        let above_16 = offset.gt(D::I32Vec::splat(d, 15));
+        above_16.if_then_else_f32(sigma2, above_8.if_then_else_f32(sigma1, sigma0))
+    } else {
+        let [sigma0, sigma1, ..] = row_sigma[sigma_start..] else {
+            unreachable!();
+        };
+        let sigma0 = D::F32Vec::splat(d, sigma0);
+        let sigma1 = D::F32Vec::splat(d, sigma1);
+        let above_8 = offset.gt(D::I32Vec::splat(d, 7));
+        above_8.if_then_else_f32(sigma1, sigma0)
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf0.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf0.rs
new file mode 100644
index 00000000..b1dbc716
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf0.rs
@@ -0,0 +1,268 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    BLOCK_DIM, MIN_SIGMA,
+    features::epf::SigmaSource,
+    render::{
+        Channels, ChannelsMut, RenderPipelineInOutStage,
+        stages::epf::common::{get_sigma, prepare_sad_mul_storage},
+    },
+};
+
+use jxl_simd::{F32SimdVec, SimdMask, simd_function};
+
+/// 5x5 plus-shaped kernel with 5 SADs per pixel (3x3 plus-shaped). So this makes this filter a 7x7 filter.
+pub struct Epf0Stage {
+    /// Multiplier for sigma in pass 0
+    sigma_scale: f32,
+    /// (inverse) multiplier for sigma on borders
+    border_sad_mul: f32,
+    channel_scale: [f32; 3],
+    sigma: SigmaSource,
+}
+
+impl std::fmt::Display for Epf0Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "EPF stage 0 with sigma scale: {}, border_sad_mul: {}",
+            self.sigma_scale, self.border_sad_mul
+        )
+    }
+}
+
+impl Epf0Stage {
+    pub fn new(
+        sigma_scale: f32,
+        border_sad_mul: f32,
+        channel_scale: [f32; 3],
+        sigma: SigmaSource,
+    ) -> Self {
+        Self {
+            sigma,
+            sigma_scale,
+            channel_scale,
+            border_sad_mul,
+        }
+    }
+}
+
+simd_function!(
+    epf0_process_row_chunk_dispatch,
+    d: D,
+    fn epf0_process_row_chunk_simd(
+    stage: &Epf0Stage,
+    pos: (usize, usize),
+    xsize: usize,
+    input_rows: &Channels<f32>,
+    output_rows: &mut ChannelsMut<f32>,
+) {
+    let (xpos, ypos) = pos;
+    assert_eq!(input_rows.len(), 3);
+    assert_eq!(output_rows.len(), 3);
+
+    // Extract all row references upfront and assert lengths once.
+    // This lets LLVM prove bounds checks are unnecessary in the hot loop.
+    // EPF0 has BORDER=3, so 7 input rows per channel (indices 0-6).
+    // Max column access: row[6 + x] where x goes up to xsize - VEC_LEN,
+    // and load reads VEC_LEN elements. So min row len = 6 + xsize.
+    let min_in_len = 6 + xsize;
+    let min_out_len = xsize;
+
+    let rows = &input_rows.row_data;
+    let rpc = input_rows.rows_per_channel;
+    assert!(rpc >= 7);
+    assert!(rows.len() >= 3 * rpc);
+
+    let ch0 = &rows[..rpc];
+    let ch1 = &rows[rpc..2 * rpc];
+    let ch2 = &rows[2 * rpc..3 * rpc];
+    let channels: [&[&[f32]]; 3] = [ch0, ch1, ch2];
+    for ch in &channels {
+        for r in 0..7 {
+            assert!(ch[r].len() >= min_in_len);
+        }
+    }
+
+    let out_rows = &mut output_rows.row_data;
+    let out_rpc = output_rows.rows_per_channel;
+    assert!(out_rpc >= 1);
+    assert!(out_rows.len() >= 3 * out_rpc);
+    for c in 0..3 {
+        assert!(out_rows[c * out_rpc].len() >= min_out_len);
+    }
+
+    let row_sigma = stage.sigma.row(ypos / BLOCK_DIM);
+
+    const { assert!(D::F32Vec::LEN <= 16) };
+
+    let sm = stage.sigma_scale * 1.65;
+    let bsm = sm * stage.border_sad_mul;
+    let sad_mul_storage = prepare_sad_mul_storage(xpos, ypos, sm, bsm);
+
+    let scale_vec: [D::F32Vec; 3] = stage.channel_scale.map(|s| D::F32Vec::splat(d, s));
+
+    for x in (0..xsize).step_by(D::F32Vec::LEN) {
+        let sigma = get_sigma(d, x + xpos, row_sigma);
+        let sad_mul = D::F32Vec::load_from(d, &sad_mul_storage, x % 8);
+
+        let sigma_mask = D::F32Vec::splat(d, MIN_SIGMA).gt(sigma);
+        if sigma_mask.all() {
+            for c in 0..3 {
+                D::F32Vec::load_from(d, channels[c][3], 3 + x)
+                    .store_at(out_rows[c * out_rpc], x);
+            }
+            continue;
+        }
+
+        // Compute SADs
+        let mut sads = [D::F32Vec::splat(d, 0.0); 12];
+        for c in 0..3 {
+            let ch = channels[c];
+            let scale = scale_vec[c];
+
+            let p30 = D::F32Vec::load_from(d, ch[0], 3 + x);
+            let p21 = D::F32Vec::load_from(d, ch[1], 2 + x);
+            let p31 = D::F32Vec::load_from(d, ch[1], 3 + x);
+            let p41 = D::F32Vec::load_from(d, ch[1], 4 + x);
+            let p12 = D::F32Vec::load_from(d, ch[2], 1 + x);
+            let p22 = D::F32Vec::load_from(d, ch[2], 2 + x);
+            let p32 = D::F32Vec::load_from(d, ch[2], 3 + x);
+            let p42 = D::F32Vec::load_from(d, ch[2], 4 + x);
+            let p52 = D::F32Vec::load_from(d, ch[2], 5 + x);
+            let p03 = D::F32Vec::load_from(d, ch[3], x);
+            let p13 = D::F32Vec::load_from(d, ch[3], 1 + x);
+            let p23 = D::F32Vec::load_from(d, ch[3], 2 + x);
+            let p33 = D::F32Vec::load_from(d, ch[3], 3 + x);
+            let p43 = D::F32Vec::load_from(d, ch[3], 4 + x);
+            let p53 = D::F32Vec::load_from(d, ch[3], 5 + x);
+            let p63 = D::F32Vec::load_from(d, ch[3], 6 + x);
+            let p14 = D::F32Vec::load_from(d, ch[4], 1 + x);
+            let p24 = D::F32Vec::load_from(d, ch[4], 2 + x);
+            let p34 = D::F32Vec::load_from(d, ch[4], 3 + x);
+            let p44 = D::F32Vec::load_from(d, ch[4], 4 + x);
+            let p54 = D::F32Vec::load_from(d, ch[4], 5 + x);
+            let p25 = D::F32Vec::load_from(d, ch[5], 2 + x);
+            let p35 = D::F32Vec::load_from(d, ch[5], 3 + x);
+            let p45 = D::F32Vec::load_from(d, ch[5], 4 + x);
+            let p36 = D::F32Vec::load_from(d, ch[6], 3 + x);
+            let d32_30 = (p32 - p30).abs();
+            let d32_21 = (p32 - p21).abs();
+            let d32_31 = (p32 - p31).abs();
+            let d32_41 = (p32 - p41).abs();
+            let d32_12 = (p32 - p12).abs();
+            let d32_22 = (p32 - p22).abs();
+            let d32_42 = (p32 - p42).abs();
+            let d32_52 = (p32 - p52).abs();
+            let d32_23 = (p32 - p23).abs();
+            let d32_34 = (p32 - p34).abs();
+            let d32_43 = (p32 - p43).abs();
+            let d32_33 = (p32 - p33).abs();
+            let d23_21 = (p23 - p21).abs();
+            let d23_12 = (p23 - p12).abs();
+            let d23_22 = (p23 - p22).abs();
+            let d23_03 = (p23 - p03).abs();
+            let d23_13 = (p23 - p13).abs();
+            let d23_33 = (p23 - p33).abs();
+            let d23_43 = (p23 - p43).abs();
+            let d23_14 = (p23 - p14).abs();
+            let d23_24 = (p23 - p24).abs();
+            let d23_34 = (p23 - p34).abs();
+            let d23_25 = (p23 - p25).abs();
+            let d33_31 = (p33 - p31).abs();
+            let d33_22 = (p33 - p22).abs();
+            let d33_42 = (p33 - p42).abs();
+            let d33_13 = (p33 - p13).abs();
+            let d33_43 = (p33 - p43).abs();
+            let d33_53 = (p33 - p53).abs();
+            let d33_24 = (p33 - p24).abs();
+            let d33_34 = (p33 - p34).abs();
+            let d33_44 = (p33 - p44).abs();
+            let d33_35 = (p33 - p35).abs();
+            let d43_41 = (p43 - p41).abs();
+            let d43_42 = (p43 - p42).abs();
+            let d43_52 = (p43 - p52).abs();
+            let d43_53 = (p43 - p53).abs();
+            let d43_63 = (p43 - p63).abs();
+            let d43_34 = (p43 - p34).abs();
+            let d43_44 = (p43 - p44).abs();
+            let d43_54 = (p43 - p54).abs();
+            let d43_45 = (p43 - p45).abs();
+            let d34_14 = (p34 - p14).abs();
+            let d34_24 = (p34 - p24).abs();
+            let d34_44 = (p34 - p44).abs();
+            let d34_54 = (p34 - p54).abs();
+            let d34_25 = (p34 - p25).abs();
+            let d34_35 = (p34 - p35).abs();
+            let d34_45 = (p34 - p45).abs();
+            let d34_36 = (p34 - p36).abs();
+            sads[0] = scale.mul_add(d32_30 + d23_21 + d33_31 + d43_41 + d32_34, sads[0]);
+            sads[1] = scale.mul_add(d32_21 + d23_12 + d33_22 + d32_43 + d23_34, sads[1]);
+            sads[2] = scale.mul_add(d32_31 + d23_22 + d32_33 + d43_42 + d33_34, sads[2]);
+            sads[3] = scale.mul_add(d32_41 + d32_23 + d33_42 + d43_52 + d43_34, sads[3]);
+            sads[4] = scale.mul_add(d32_12 + d23_03 + d33_13 + d23_43 + d34_14, sads[4]);
+            sads[5] = scale.mul_add(d32_22 + d23_13 + d23_33 + d33_43 + d34_24, sads[5]);
+            sads[6] = scale.mul_add(d32_42 + d23_33 + d33_43 + d43_53 + d34_44, sads[6]);
+            sads[7] = scale.mul_add(d32_52 + d23_43 + d33_53 + d43_63 + d34_54, sads[7]);
+            sads[8] = scale.mul_add(d32_23 + d23_14 + d33_24 + d43_34 + d34_25, sads[8]);
+            sads[9] = scale.mul_add(d32_33 + d23_24 + d33_34 + d43_44 + d34_35, sads[9]);
+            sads[10] = scale.mul_add(d32_43 + d23_34 + d33_44 + d43_54 + d34_45, sads[10]);
+            sads[11] = scale.mul_add(d32_34 + d23_25 + d33_35 + d43_45 + d34_36, sads[11]);
+        }
+        // Compute output based on SADs
+        let inv_sigma = sigma * sad_mul;
+        let mut w = D::F32Vec::splat(d, 1.0);
+        for sad in sads.iter_mut() {
+            *sad = sad
+                .mul_add(inv_sigma, D::F32Vec::splat(d, 1.0))
+                .max(D::F32Vec::splat(d, 0.0));
+            w += *sad;
+        }
+        let inv_w = D::F32Vec::splat(d, 1.0) / w;
+        for c in 0..3 {
+            let ch = channels[c];
+            let mut out = D::F32Vec::load_from(d, ch[3], 3 + x);
+            out = D::F32Vec::load_from(d, ch[5], 3 + x).mul_add(sads[11], out);
+            out = D::F32Vec::load_from(d, ch[4], 4 + x).mul_add(sads[10], out);
+            out = D::F32Vec::load_from(d, ch[4], 3 + x).mul_add(sads[9], out);
+            out = D::F32Vec::load_from(d, ch[4], 2 + x).mul_add(sads[8], out);
+            out = D::F32Vec::load_from(d, ch[3], 5 + x).mul_add(sads[7], out);
+            out = D::F32Vec::load_from(d, ch[3], 4 + x).mul_add(sads[6], out);
+            out = D::F32Vec::load_from(d, ch[3], 2 + x).mul_add(sads[5], out);
+            out = D::F32Vec::load_from(d, ch[3], 1 + x).mul_add(sads[4], out);
+            out = D::F32Vec::load_from(d, ch[2], 4 + x).mul_add(sads[3], out);
+            out = D::F32Vec::load_from(d, ch[2], 3 + x).mul_add(sads[2], out);
+            out = D::F32Vec::load_from(d, ch[2], 2 + x).mul_add(sads[1], out);
+            out = D::F32Vec::load_from(d, ch[1], 3 + x).mul_add(sads[0], out);
+            out *= inv_w;
+            let p33 = D::F32Vec::load_from(d, ch[3], 3 + x);
+            let out = sigma_mask.if_then_else_f32(p33, out);
+            out.store_at(out_rows[c * out_rpc], x);
+        }
+    }
+});
+
+impl RenderPipelineInOutStage for Epf0Stage {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (3, 3);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3
+    }
+
+    fn process_row_chunk(
+        &self,
+        (xpos, ypos): (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        epf0_process_row_chunk_dispatch(self, (xpos, ypos), xsize, input_rows, output_rows);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf1.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf1.rs
new file mode 100644
index 00000000..758ee29b
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf1.rs
@@ -0,0 +1,207 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    BLOCK_DIM, MIN_SIGMA,
+    features::epf::SigmaSource,
+    render::{
+        Channels, ChannelsMut, RenderPipelineInOutStage,
+        stages::epf::common::{get_sigma, prepare_sad_mul_storage},
+    },
+};
+
+use jxl_simd::{F32SimdVec, SimdMask, simd_function};
+
+/// 3x3 plus-shaped kernel with 5 SADs per pixel (3x3 plus-shaped). So this makes this filter a 5x5 filter.
+pub struct Epf1Stage {
+    /// Multiplier for sigma in pass 1
+    sigma_scale: f32,
+    /// (inverse) multiplier for sigma on borders
+    border_sad_mul: f32,
+    channel_scale: [f32; 3],
+    sigma: SigmaSource,
+}
+
+impl std::fmt::Display for Epf1Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "EPF stage 1 with sigma scale: {}, border_sad_mul: {}",
+            self.sigma_scale, self.border_sad_mul
+        )
+    }
+}
+
+impl Epf1Stage {
+    pub fn new(
+        sigma_scale: f32,
+        border_sad_mul: f32,
+        channel_scale: [f32; 3],
+        sigma: SigmaSource,
+    ) -> Self {
+        Self {
+            sigma,
+            sigma_scale,
+            channel_scale,
+            border_sad_mul,
+        }
+    }
+}
+
+simd_function!(
+epf1_process_row_chunk_dispatch,
+d: D,
+fn epf1_process_row_chunk(
+    stage: &Epf1Stage,
+    pos: (usize, usize),
+    xsize: usize,
+    input_rows: &Channels<f32>,
+    output_rows: &mut ChannelsMut<f32>,
+) {
+    let (xpos, ypos) = pos;
+    assert_eq!(input_rows.len(), 3);
+    assert_eq!(output_rows.len(), 3);
+
+    // Extract all row references upfront and assert lengths once.
+    // This lets LLVM prove bounds checks are unnecessary in the hot loop.
+    // EPF1 has BORDER=2, so 5 input rows per channel (indices 0-4).
+    // Max column access: row[4 + x] where x goes up to xsize - VEC_LEN,
+    // and load reads VEC_LEN elements. So min row len = 4 + xsize.
+    let min_in_len = 4 + xsize;
+    let min_out_len = xsize;
+
+    let rows = &input_rows.row_data;
+    let rpc = input_rows.rows_per_channel;
+    assert!(rpc >= 5);
+    assert!(rows.len() >= 3 * rpc);
+
+    // Extract channel row slices (5 rows each) with length assertions.
+    // Indexing with constants after the assertion lets LLVM eliminate
+    // bounds checks on row selection in the hot loop.
+    let ch0 = &rows[..rpc];
+    let ch1 = &rows[rpc..2 * rpc];
+    let ch2 = &rows[2 * rpc..3 * rpc];
+    let channels: [&[&[f32]]; 3] = [ch0, ch1, ch2];
+    for ch in &channels {
+        for r in 0..5 {
+            assert!(ch[r].len() >= min_in_len);
+        }
+    }
+
+    let out_rows = &mut output_rows.row_data;
+    let out_rpc = output_rows.rows_per_channel;
+    assert!(out_rpc >= 1);
+    assert!(out_rows.len() >= 3 * out_rpc);
+    for c in 0..3 {
+        assert!(out_rows[c * out_rpc].len() >= min_out_len);
+    }
+
+    let row_sigma = stage.sigma.row(ypos / BLOCK_DIM);
+
+    let sm = stage.sigma_scale * 1.65;
+    let bsm = sm * stage.border_sad_mul;
+    let sad_mul_storage = prepare_sad_mul_storage(xpos, ypos, sm, bsm);
+
+    let scale_vec: [D::F32Vec; 3] = stage.channel_scale.map(|s| D::F32Vec::splat(d, s));
+
+    for x in (0..xsize).step_by(D::F32Vec::LEN) {
+        let sigma = get_sigma(d, x + xpos, row_sigma);
+        let sad_mul = D::F32Vec::load_from(d, &sad_mul_storage, x % 8);
+
+        let sigma_mask = D::F32Vec::splat(d, MIN_SIGMA).gt(sigma);
+        if sigma_mask.all() {
+            for c in 0..3 {
+                D::F32Vec::load_from(d, channels[c][2], 2 + x)
+                    .store_at(out_rows[c * out_rpc], x);
+            }
+            continue;
+        }
+
+        // Compute SADs across all 3 channels
+        let mut sads = [D::F32Vec::splat(d, 0.0); 4];
+        for c in 0..3 {
+            let ch = channels[c];
+            let scale = scale_vec[c];
+            let p20 = D::F32Vec::load_from(d, ch[0], 2 + x);
+            let p11 = D::F32Vec::load_from(d, ch[1], 1 + x);
+            let p21 = D::F32Vec::load_from(d, ch[1], 2 + x);
+            let p31 = D::F32Vec::load_from(d, ch[1], 3 + x);
+            let p02 = D::F32Vec::load_from(d, ch[2], x);
+            let p12 = D::F32Vec::load_from(d, ch[2], 1 + x);
+            let p22 = D::F32Vec::load_from(d, ch[2], 2 + x);
+            let p32 = D::F32Vec::load_from(d, ch[2], 3 + x);
+            let p42 = D::F32Vec::load_from(d, ch[2], 4 + x);
+            let p13 = D::F32Vec::load_from(d, ch[3], 1 + x);
+            let p23 = D::F32Vec::load_from(d, ch[3], 2 + x);
+            let p33 = D::F32Vec::load_from(d, ch[3], 3 + x);
+            let p24 = D::F32Vec::load_from(d, ch[4], 2 + x);
+            let d20_21 = (p20 - p21).abs();
+            let d11_21 = (p11 - p21).abs();
+            let d22_21 = (p22 - p21).abs();
+            let d31_21 = (p31 - p21).abs();
+            let d02_12 = (p02 - p12).abs();
+            let d11_12 = (p11 - p12).abs();
+            let d12_22 = (p22 - p12).abs();
+            let d31_32 = (p31 - p32).abs();
+            let d22_32 = (p22 - p32).abs();
+            let d42_32 = (p42 - p32).abs();
+            let d13_12 = (p13 - p12).abs();
+            let d22_23 = (p22 - p23).abs();
+            let d13_23 = (p13 - p23).abs();
+            let d33_23 = (p33 - p23).abs();
+            let d33_32 = (p33 - p32).abs();
+            let d24_23 = (p24 - p23).abs();
+            sads[0] = (d20_21 + d11_12 + d22_21 + d31_32 + d22_23).mul_add(scale, sads[0]);
+            sads[1] = (d11_21 + d02_12 + d12_22 + d22_32 + d13_23).mul_add(scale, sads[1]);
+            sads[2] = (d31_21 + d12_22 + d22_32 + d42_32 + d33_23).mul_add(scale, sads[2]);
+            sads[3] = (d22_21 + d13_12 + d22_23 + d33_32 + d24_23).mul_add(scale, sads[3]);
+        }
+
+        // Compute output based on SADs
+        let inv_sigma = sigma * sad_mul;
+        let mut w = D::F32Vec::splat(d, 1.0);
+        for sad in sads.iter_mut() {
+            *sad = sad
+                .mul_add(inv_sigma, D::F32Vec::splat(d, 1.0))
+                .max(D::F32Vec::splat(d, 0.0));
+            w += *sad;
+        }
+        let inv_w = D::F32Vec::splat(d, 1.0) / w;
+        for c in 0..3 {
+            let ch = channels[c];
+            let mut out = D::F32Vec::load_from(d, ch[2], 2 + x);
+            out = D::F32Vec::load_from(d, ch[3], 2 + x).mul_add(sads[3], out);
+            out = D::F32Vec::load_from(d, ch[2], 3 + x).mul_add(sads[2], out);
+            out = D::F32Vec::load_from(d, ch[2], 1 + x).mul_add(sads[1], out);
+            out = D::F32Vec::load_from(d, ch[1], 2 + x).mul_add(sads[0], out);
+            out *= inv_w;
+            let p22 = D::F32Vec::load_from(d, ch[2], 2 + x);
+            let out = sigma_mask.if_then_else_f32(p22, out);
+            out.store_at(out_rows[c * out_rpc], x);
+        }
+    }
+});
+
+impl RenderPipelineInOutStage for Epf1Stage {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (2, 2);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3
+    }
+
+    fn process_row_chunk(
+        &self,
+        (xpos, ypos): (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        epf1_process_row_chunk_dispatch(self, (xpos, ypos), xsize, input_rows, output_rows);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf2.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf2.rs
new file mode 100644
index 00000000..f427459f
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/epf2.rs
@@ -0,0 +1,171 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    BLOCK_DIM, MIN_SIGMA,
+    features::epf::SigmaSource,
+    render::{
+        Channels, ChannelsMut, RenderPipelineInOutStage,
+        stages::epf::common::{get_sigma, prepare_sad_mul_storage},
+    },
+};
+
+use jxl_simd::{F32SimdVec, SimdMask, simd_function};
+
+/// 3x3 plus-shaped kernel with 1 SAD per pixel. So this makes this filter a 3x3 filter.
+pub struct Epf2Stage {
+    /// Multiplier for sigma in pass 2
+    sigma_scale: f32,
+    /// (inverse) multiplier for sigma on borders
+    border_sad_mul: f32,
+    channel_scale: [f32; 3],
+    sigma: SigmaSource,
+}
+
+impl std::fmt::Display for Epf2Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "EPF stage 2 with sigma scale: {}, border_sad_mul: {}",
+            self.sigma_scale, self.border_sad_mul
+        )
+    }
+}
+
+impl Epf2Stage {
+    pub fn new(
+        sigma_scale: f32,
+        border_sad_mul: f32,
+        channel_scale: [f32; 3],
+        sigma: SigmaSource,
+    ) -> Self {
+        Self {
+            sigma,
+            sigma_scale,
+            channel_scale,
+            border_sad_mul,
+        }
+    }
+}
+
+simd_function!(
+epf2_process_row_chunk_dispatch,
+d: D,
+fn epf2_process_row_chunk(
+    stage: &Epf2Stage,
+    pos: (usize, usize),
+    xsize: usize,
+    input_rows: &Channels<f32>,
+    output_rows: &mut ChannelsMut<f32>,
+) {
+    let (xpos, ypos) = pos;
+    assert_eq!(input_rows.len(), 3, "Expected 3 channels, got {}", input_rows.len());
+    let (input_x, input_y, input_b) = (&input_rows[0], &input_rows[1], &input_rows[2]);
+    let (output_x, output_y, output_b) = output_rows.split_first_3_mut();
+
+    // Pre-loop assertions: prove row lengths so LLVM can eliminate bounds checks.
+    // EPF2 has BORDER=1, so 3 input rows per channel (indices 0-2).
+    // Max column access: row[2 + x] where x goes up to xsize - VEC_LEN,
+    // and load reads VEC_LEN elements. So min row len = 2 + xsize.
+    let min_in_len = 2 + xsize;
+    let min_out_len = xsize;
+    for ch in [input_x, input_y, input_b] {
+        assert!(ch.len() >= 3);
+        for row in ch.iter().take(3) {
+            assert!(row.len() >= min_in_len);
+        }
+    }
+    assert!(output_x[0].len() >= min_out_len);
+    assert!(output_y[0].len() >= min_out_len);
+    assert!(output_b[0].len() >= min_out_len);
+
+    let row_sigma = stage.sigma.row(ypos / BLOCK_DIM);
+
+    const { assert!(D::F32Vec::LEN <= 16) };
+
+    let sm = stage.sigma_scale * 1.65;
+    let bsm = sm * stage.border_sad_mul;
+    let sad_mul_storage = prepare_sad_mul_storage(xpos, ypos, sm, bsm);
+
+    for x in (0..xsize).step_by(D::F32Vec::LEN) {
+        let sigma = get_sigma(d, x + xpos, row_sigma);
+        let sad_mul = D::F32Vec::load_from(d, &sad_mul_storage, x % 8);
+
+        let sigma_mask = D::F32Vec::splat(d, MIN_SIGMA).gt(sigma);
+        if sigma_mask.all() {
+            D::F32Vec::load_from(d, input_x[1], 1 + x).store_at(output_x[0], x);
+            D::F32Vec::load_from(d, input_y[1], 1 + x).store_at(output_y[0], x);
+            D::F32Vec::load_from(d, input_b[1], 1 + x).store_at(output_b[0], x);
+            continue;
+        }
+
+        let inv_sigma = sigma * sad_mul;
+
+        let x_cc = D::F32Vec::load_from(d, input_x[1], 1 + x);
+        let y_cc = D::F32Vec::load_from(d, input_y[1], 1 + x);
+        let b_cc = D::F32Vec::load_from(d, input_b[1], 1 + x);
+
+        let mut w_acc = D::F32Vec::splat(d, 1.0);
+        let mut x_acc = x_cc;
+        let mut y_acc = y_cc;
+        let mut b_acc = b_cc;
+
+        for (y_off, x_off) in [(0, 1), (1, 0), (1, 2), (2, 1)] {
+            let (cx, cy, cb) = (
+                D::F32Vec::load_from(d, input_x[y_off as usize], x_off + x),
+                D::F32Vec::load_from(d, input_y[y_off as usize], x_off + x),
+                D::F32Vec::load_from(d, input_b[y_off as usize], x_off + x),
+            );
+            let sad = (cx - x_cc).abs().mul_add(
+                D::F32Vec::splat(d, stage.channel_scale[0]),
+                (cy - y_cc).abs().mul_add(
+                    D::F32Vec::splat(d, stage.channel_scale[1]),
+                    (cb - b_cc).abs() * D::F32Vec::splat(d, stage.channel_scale[2]),
+                ),
+            );
+            let weight = sad
+                .mul_add(inv_sigma, D::F32Vec::splat(d, 1.0))
+                .max(D::F32Vec::splat(d, 0.0));
+            w_acc += weight;
+            x_acc = weight.mul_add(cx, x_acc);
+            y_acc = weight.mul_add(cy, y_acc);
+            b_acc = weight.mul_add(cb, b_acc);
+        }
+
+        let inv_w = D::F32Vec::splat(d, 1.0) / w_acc;
+
+        x_acc *= inv_w;
+        y_acc *= inv_w;
+        b_acc *= inv_w;
+        x_acc = sigma_mask.if_then_else_f32(D::F32Vec::load_from(d, input_x[1], 1 + x), x_acc);
+        y_acc = sigma_mask.if_then_else_f32(D::F32Vec::load_from(d, input_y[1], 1 + x), y_acc);
+        b_acc = sigma_mask.if_then_else_f32(D::F32Vec::load_from(d, input_b[1], 1 + x), b_acc);
+        x_acc.store_at(output_x[0], x);
+        y_acc.store_at(output_y[0], x);
+        b_acc.store_at(output_b[0], x);
+    }
+});
+
+impl RenderPipelineInOutStage for Epf2Stage {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (1, 1);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3
+    }
+
+    fn process_row_chunk(
+        &self,
+        (xpos, ypos): (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        epf2_process_row_chunk_dispatch(self, (xpos, ypos), xsize, input_rows, output_rows);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/mod.rs
new file mode 100644
index 00000000..e927f48d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/mod.rs
@@ -0,0 +1,16 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+mod common;
+mod epf0;
+mod epf1;
+mod epf2;
+
+pub use epf0::Epf0Stage;
+pub use epf1::Epf1Stage;
+pub use epf2::Epf2Stage;
+
+#[cfg(test)]
+mod test;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/test.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/test.rs
new file mode 100644
index 00000000..ae3ada23
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/epf/test.rs
@@ -0,0 +1,45 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::sync::Arc;
+
+use rand::SeedableRng;
+use test_log::test;
+
+use super::*;
+use crate::{error::Result, features::epf::SigmaSource, image::Image};
+
+#[test]
+fn epf0_consistency() -> Result<()> {
+    let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+    let sigma = SigmaSource::Variable(Arc::new(Image::new_random((128, 128), &mut rng).unwrap()));
+    crate::render::test::test_stage_consistency(
+        || Epf0Stage::new(0.9, 2.3 / 3.0, [40.0, 5.0, 3.5], sigma.clone()),
+        (512, 512),
+        4,
+    )
+}
+
+#[test]
+fn epf1_consistency() -> Result<()> {
+    let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+    let sigma = SigmaSource::Variable(Arc::new(Image::new_random((128, 128), &mut rng).unwrap()));
+    crate::render::test::test_stage_consistency(
+        || Epf1Stage::new(1.0, 2.3 / 3.0, [40.0, 5.0, 3.5], sigma.clone()),
+        (512, 512),
+        4,
+    )
+}
+
+#[test]
+fn epf2_consistency() -> Result<()> {
+    let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+    let sigma = SigmaSource::Variable(Arc::new(Image::new_random((128, 128), &mut rng).unwrap()));
+    crate::render::test::test_stage_consistency(
+        || Epf2Stage::new(6.5, 2.3 / 3.0, [40.0, 5.0, 3.5], sigma.clone()),
+        (512, 512),
+        4,
+    )
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/extend.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/extend.rs
new file mode 100644
index 00000000..b676bbd9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/extend.rs
@@ -0,0 +1,117 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::sync::Arc;
+
+use crate::{
+    error::Result,
+    frame::ReferenceFrame,
+    headers::{FileHeader, extra_channels::ExtraChannelInfo, frame_header::*},
+};
+
+/// Does not directly modify the current image pixels, but extends the current image with
+/// additional data.
+///
+/// `uses_channel` must always return true, and stages of this type should override
+/// `new_size` and `original_data_origin`.
+/// `process_row_chunk` will be called with the *new* image coordinates, and will only be called
+/// on row chunks outside of the original image data.
+/// After stages of this type, no stage can have a non-0 SHIFT_X, SHIFT_Y, BORDER_X or BORDER_Y.
+/// There can be at most one extend stage per image.
+pub struct ExtendToImageDimensionsStage {
+    pub frame_origin: (isize, isize),
+    pub image_size: (usize, usize),
+    pub blending_info: BlendingInfo,
+    pub ec_blending_info: Vec<BlendingInfo>,
+    #[allow(dead_code)] // Stored for future per-EC extend behavior
+    pub extra_channels: Vec<ExtraChannelInfo>,
+    pub reference_frames: Arc<[Option<ReferenceFrame>; 4]>,
+    pub zeros: Vec<f32>,
+}
+
+impl ExtendToImageDimensionsStage {
+    // TODO(veluca): should this return a Result?
+    pub fn new(
+        frame_header: &FrameHeader,
+        file_header: &FileHeader,
+        reference_frames: Arc<[Option<ReferenceFrame>; 4]>,
+    ) -> Result<ExtendToImageDimensionsStage> {
+        let xsize = file_header.size.xsize() as usize;
+        Ok(ExtendToImageDimensionsStage {
+            frame_origin: (frame_header.x0 as isize, frame_header.y0 as isize),
+            image_size: (xsize, file_header.size.ysize() as usize),
+            blending_info: frame_header.blending_info.clone(),
+            ec_blending_info: frame_header.ec_blending_info.clone(),
+            extra_channels: file_header.image_metadata.extra_channel_info.clone(),
+            reference_frames,
+            zeros: vec![0f32; xsize],
+        })
+    }
+}
+
+impl std::fmt::Display for ExtendToImageDimensionsStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "extend-to-image-dims")
+    }
+}
+
+impl ExtendToImageDimensionsStage {
+    pub(in crate::render) fn process_row_chunk(
+        &self,
+        position: (usize, usize),
+        xsize: usize,
+        c: usize,
+        row: &mut [f32],
+    ) {
+        let x0 = position.0;
+        let x1 = x0 + xsize;
+        let y0 = position.1;
+        let source = if c < 3 {
+            self.blending_info.source as usize
+        } else if c - 3 < self.ec_blending_info.len() {
+            self.ec_blending_info[c - 3].source as usize
+        } else {
+            // This is a synthetic channel such as the noise channels, which can't be extended
+            // and can't be used after extending, so nothing to do.
+            return;
+        };
+        let bg = if let Some(bg) = self.reference_frames[source].as_ref() {
+            bg.frame[c].row(y0)
+        } else {
+            self.zeros.as_slice()
+        };
+        row[0..xsize].copy_from_slice(&bg[x0..x1]);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::sync::Arc;
+
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::util::test::read_headers_and_toc;
+
+    #[test]
+    fn extend_consistency() -> Result<()> {
+        let (file_header, frame_header, _) =
+            read_headers_and_toc(include_bytes!("../../../resources/test/basic.jxl")).unwrap();
+        let reference_frames = Arc::new([None, None, None, None]);
+        crate::render::test::test_stage_consistency(
+            || {
+                ExtendToImageDimensionsStage::new(
+                    &frame_header,
+                    &file_header,
+                    reference_frames.clone(),
+                )
+                .unwrap()
+            },
+            (500, 500),
+            4,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/from_linear.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/from_linear.rs
new file mode 100644
index 00000000..b8b6557d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/from_linear.rs
@@ -0,0 +1,416 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::color::tf;
+use crate::headers::color_encoding::CustomTransferFunction;
+use crate::render::{Channels, ChannelsMut, RenderPipelineInOutStage, RenderPipelineInPlaceStage};
+use crate::util::eval_rational_poly_simd;
+use jxl_simd::{F32SimdVec, SimdMask, simd_function};
+
+/// Apply transfer function to display-referred linear color samples.
+#[derive(Debug)]
+pub struct FromLinearStage {
+    first_channel: usize,
+    tf: TransferFunction,
+}
+
+impl FromLinearStage {
+    pub fn new(first_channel: usize, tf: TransferFunction) -> Self {
+        Self { first_channel, tf }
+    }
+
+    #[allow(dead_code)] // used by integration tests
+    pub fn sdr(first_channel: usize, tf: CustomTransferFunction) -> Self {
+        let tf = TransferFunction::try_from(tf).expect("transfer function is not an SDR one");
+        Self::new(first_channel, tf)
+    }
+
+    #[cfg(test)]
+    pub fn pq(first_channel: usize, intensity_target: f32) -> Self {
+        let tf = TransferFunction::Pq { intensity_target };
+        Self::new(first_channel, tf)
+    }
+
+    #[cfg(test)]
+    pub fn hlg(first_channel: usize, intensity_target: f32, luminance_rgb: [f32; 3]) -> Self {
+        let tf = TransferFunction::Hlg {
+            intensity_target,
+            luminance_rgb,
+        };
+        Self::new(first_channel, tf)
+    }
+}
+
+impl std::fmt::Display for FromLinearStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let channel = self.first_channel;
+        write!(
+            f,
+            "Apply transfer function {:?} to channel [{},{},{}]",
+            self.tf,
+            channel,
+            channel + 1,
+            channel + 2
+        )
+    }
+}
+
+simd_function!(
+from_linear_process_dispatch,
+d: D,
+fn from_linear_process(tf: &TransferFunction, xsize: usize, row: &mut [&mut [f32]]) {
+    let [row_r, row_g, row_b] = row else {
+        panic!(
+            "incorrect number of channels; expected 3, found {}",
+            row.len()
+        );
+    };
+
+    match *tf {
+        TransferFunction::Bt709 => {
+            for row in row {
+                tf::linear_to_bt709_simd(d, &mut row[..xsize.next_multiple_of(D::F32Vec::LEN)]);
+            }
+        }
+        TransferFunction::Srgb => {
+            for row in row {
+                tf::linear_to_srgb_simd(d, &mut row[..xsize.next_multiple_of(D::F32Vec::LEN)]);
+            }
+        }
+        TransferFunction::Pq { intensity_target } => {
+            for row in row {
+                tf::linear_to_pq_simd(d, intensity_target, xsize, row);
+            }
+        }
+        TransferFunction::Hlg {
+            intensity_target,
+            luminance_rgb,
+        } => {
+            let rows = [
+                &mut row_r[..xsize],
+                &mut row_g[..xsize],
+                &mut row_b[..xsize],
+            ];
+            tf::hlg_display_to_scene(intensity_target, luminance_rgb, rows);
+
+            tf::scene_to_hlg(&mut row_r[..xsize]);
+            tf::scene_to_hlg(&mut row_g[..xsize]);
+            tf::scene_to_hlg(&mut row_b[..xsize]);
+        }
+        TransferFunction::Gamma(g) => {
+            for row in row {
+                for values in row[..xsize.next_multiple_of(D::F32Vec::LEN)]
+                    .chunks_exact_mut(D::F32Vec::LEN)
+                {
+                    let v = D::F32Vec::load(d, values);
+                    crate::util::fast_powf_simd(d, v.abs(), D::F32Vec::splat(d, g))
+                        .copysign(v)
+                        .store(values);
+                }
+            }
+        }
+    }
+});
+
+impl RenderPipelineInPlaceStage for FromLinearStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        from_linear_process_dispatch(&self.tf, xsize, row)
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum TransferFunction {
+    Bt709,
+    Srgb,
+    Pq {
+        intensity_target: f32,
+    },
+    Hlg {
+        intensity_target: f32,
+        luminance_rgb: [f32; 3],
+    },
+    /// Inverse gamma in range `(0, 1]`
+    Gamma(f32),
+}
+
+impl TransferFunction {
+    /// Returns true if this transfer function is linear (i.e., Gamma(1.0)).
+    /// When linear, FromLinearStage can be skipped as it would be a no-op.
+    pub fn is_linear(&self) -> bool {
+        matches!(self, Self::Gamma(g) if (*g - 1.0).abs() < f32::EPSILON)
+    }
+
+    /// Create a TransferFunction from a JxlTransferFunction for use in FromLinearStage.
+    /// For PQ/HLG, requires intensity_target and luminances from tone mapping info.
+    /// Note: JxlTransferFunction::Gamma stores the encoding exponent (e.g., 1/2.2 for gamma 2.2).
+    pub fn from_api_tf(
+        api_tf: &crate::api::JxlTransferFunction,
+        intensity_target: f32,
+        luminances: [f32; 3],
+    ) -> Self {
+        use crate::api::JxlTransferFunction;
+        match api_tf {
+            JxlTransferFunction::BT709 => Self::Bt709,
+            JxlTransferFunction::Linear => Self::Gamma(1.0),
+            JxlTransferFunction::SRGB => Self::Srgb,
+            JxlTransferFunction::PQ => Self::Pq { intensity_target },
+            JxlTransferFunction::DCI => Self::Gamma(2.6_f32.recip()),
+            JxlTransferFunction::HLG => Self::Hlg {
+                intensity_target,
+                luminance_rgb: luminances,
+            },
+            JxlTransferFunction::Gamma(g) => Self::Gamma(*g),
+        }
+    }
+}
+
+impl TryFrom<CustomTransferFunction> for TransferFunction {
+    type Error = ();
+
+    fn try_from(ctf: CustomTransferFunction) -> Result<Self, ()> {
+        use crate::headers::color_encoding::TransferFunction;
+
+        if ctf.have_gamma {
+            Ok(Self::Gamma(ctf.gamma()))
+        } else {
+            match ctf.transfer_function {
+                TransferFunction::BT709 => Ok(Self::Bt709),
+                TransferFunction::Unknown => Err(()),
+                TransferFunction::Linear => Ok(Self::Gamma(1.0)),
+                TransferFunction::SRGB => Ok(Self::Srgb),
+                TransferFunction::PQ => Err(()),
+                TransferFunction::DCI => Ok(Self::Gamma(2.6_f32.recip())),
+                TransferFunction::HLG => Err(()),
+            }
+        }
+    }
+}
+
+// ============================================================================
+// Fused sRGB TF + u8 conversion stage
+// ============================================================================
+
+/// Fused stage that applies sRGB transfer function and converts to u8 in a single SIMD pass.
+/// This avoids the intermediate f32 buffer write/read between separate FromLinear and ConvertF32ToU8 stages.
+pub struct FromLinearSrgbToU8Stage {
+    first_channel: usize,
+    bit_depth: u8,
+}
+
+impl FromLinearSrgbToU8Stage {
+    pub fn new(first_channel: usize, bit_depth: u8) -> Self {
+        Self {
+            first_channel,
+            bit_depth,
+        }
+    }
+}
+
+impl std::fmt::Display for FromLinearSrgbToU8Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let c = self.first_channel;
+        write!(
+            f,
+            "Fused sRGB TF + U{} conversion for channels [{},{},{}]",
+            self.bit_depth,
+            c,
+            c + 1,
+            c + 2,
+        )
+    }
+}
+
+impl RenderPipelineInOutStage for FromLinearSrgbToU8Stage {
+    type InputT = f32;
+    type OutputT = u8;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u8>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let max_val = ((1u32 << self.bit_depth) - 1) as f32;
+        fused_srgb_to_u8_channel_dispatch(max_val, xsize, input_rows, output_rows);
+    }
+}
+
+simd_function!(
+    fused_srgb_to_u8_channel_dispatch,
+    d: D,
+    fn fused_srgb_to_u8_channel(
+        max_val: f32,
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u8>,
+    ) {
+        #[allow(clippy::excessive_precision)]
+        const P: [f32; 5] = [
+            -5.135152395e-4,
+            5.287254571e-3,
+            3.903842876e-1,
+            1.474205315,
+            7.352629620e-1,
+        ];
+        #[allow(clippy::excessive_precision)]
+        const Q: [f32; 5] = [
+            1.004519624e-2,
+            3.036675394e-1,
+            1.340816930,
+            9.258482155e-1,
+            2.424867759e-2,
+        ];
+
+        assert_eq!(input_rows.len(), 3);
+        assert_eq!(output_rows.len(), 3);
+
+        let zero = D::F32Vec::splat(d, 0.0);
+        let one = D::F32Vec::splat(d, 1.0);
+        let scale = D::F32Vec::splat(d, max_val);
+        let threshold = D::F32Vec::splat(d, 0.0031308);
+        let linear_scale = D::F32Vec::splat(d, 12.92);
+
+        let end = xsize.next_multiple_of(D::F32Vec::LEN);
+
+        for c in 0..3 {
+            let input = input_rows[c][0];
+            let output = &mut output_rows[c][0];
+
+            for (in_chunk, out_chunk) in input[..end]
+                .chunks_exact(D::F32Vec::LEN)
+                .zip(output[..end].chunks_exact_mut(D::F32Vec::LEN))
+            {
+                let v = D::F32Vec::load(d, in_chunk);
+                // Clamp to [0, 1]
+                let a = v.max(zero).min(one);
+                // Apply sRGB transfer function
+                let srgb = threshold
+                    .gt(a)
+                    .if_then_else_f32(
+                        a * linear_scale,
+                        eval_rational_poly_simd(d, a.sqrt(), P, Q),
+                    );
+                // Scale and convert to u8
+                (srgb * scale).round_store_u8(out_chunk);
+            }
+        }
+    }
+);
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    const LUMINANCE_BT2020: [f32; 3] = [0.2627, 0.678, 0.0593];
+
+    #[test]
+    fn consistency_hlg() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || FromLinearStage::hlg(0, 1000f32, LUMINANCE_BT2020),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_pq() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || FromLinearStage::pq(0, 10000f32),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_srgb() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || FromLinearStage::new(0, TransferFunction::Srgb),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_bt709() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || FromLinearStage::new(0, TransferFunction::Bt709),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_gamma22() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || FromLinearStage::new(0, TransferFunction::Gamma(0.4545455)),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn sdr_white_hlg() -> Result<()> {
+        let intensity_target = 1000f32;
+        let input_r = Image::new_with_value((1, 1), 0.203)?;
+        let input_g = Image::new_with_value((1, 1), 0.203)?;
+        let input_b = Image::new_with_value((1, 1), 0.203)?;
+
+        // 75% HLG
+        let stage = FromLinearStage::hlg(0, intensity_target, LUMINANCE_BT2020);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[0.75], 1e-3);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.75], 1e-3);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.75], 1e-3);
+
+        Ok(())
+    }
+
+    #[test]
+    fn sdr_white_pq() -> Result<()> {
+        let intensity_target = 1000f32;
+        let input_r = Image::new_with_value((1, 1), 0.203)?;
+        let input_g = Image::new_with_value((1, 1), 0.203)?;
+        let input_b = Image::new_with_value((1, 1), 0.203)?;
+
+        // 58% PQ
+        let stage = FromLinearStage::pq(0, intensity_target);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[0.58], 1e-3);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.58], 1e-3);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.58], 1e-3);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/gaborish.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/gaborish.rs
new file mode 100644
index 00000000..1e0bab77
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/gaborish.rs
@@ -0,0 +1,145 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::{Channels, ChannelsMut, RenderPipelineInOutStage};
+use jxl_simd::{F32SimdVec, simd_function};
+
+/// Apply Gabor-like filter to a channel.
+#[derive(Debug)]
+pub struct GaborishStage {
+    channel: usize,
+    weight0: f32,
+    weight1: f32,
+    weight2: f32,
+}
+
+impl GaborishStage {
+    pub fn new(channel: usize, weight1: f32, weight2: f32) -> Self {
+        let weight_total = 1.0 + weight1 * 4.0 + weight2 * 4.0;
+        Self {
+            channel,
+            weight0: 1.0 / weight_total,
+            weight1: weight1 / weight_total,
+            weight2: weight2 / weight_total,
+        }
+    }
+}
+
+impl std::fmt::Display for GaborishStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Gaborish filter for channel {}", self.channel)
+    }
+}
+
+simd_function!(
+    gaborish_process_dispatch,
+    d: D,
+    fn gaborish_process(
+        stage: &GaborishStage,
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+    ) {
+        let row_out = &mut output_rows[0][0];
+
+        let w0 = D::F32Vec::splat(d, stage.weight0);
+        let w1 = D::F32Vec::splat(d, stage.weight1);
+        let w2 = D::F32Vec::splat(d, stage.weight2);
+
+        let [row_top, row_center, row_bottom] = input_rows[0] else {
+            unreachable!();
+        };
+
+        // These asserts help the compiler skip checks in the loop.
+        assert_eq!(row_top.len(), row_center.len());
+        assert_eq!(row_top.len(), row_bottom.len());
+
+        let num_vec = xsize.div_ceil(D::F32Vec::LEN);
+
+        let len = D::F32Vec::LEN;
+        let window_len = len + 2;
+
+        for (((top, center), bottom), out) in row_top
+            .windows(window_len)
+            .step_by(len)
+            .zip(row_center.windows(window_len).step_by(len))
+            .zip(row_bottom.windows(window_len).step_by(len))
+            .zip(row_out.chunks_exact_mut(D::F32Vec::LEN))
+            .take(num_vec)
+        {
+            let p00 = D::F32Vec::load(d, top);
+            let p01 = D::F32Vec::load(d, &top[1..]);
+            let p02 = D::F32Vec::load(d, &top[2..]);
+            let p10 = D::F32Vec::load(d, center);
+            let p11 = D::F32Vec::load(d, &center[1..]);
+            let p12 = D::F32Vec::load(d, &center[2..]);
+            let p20 = D::F32Vec::load(d, bottom);
+            let p21 = D::F32Vec::load(d, &bottom[1..]);
+            let p22 = D::F32Vec::load(d, &bottom[2..]);
+
+            let sum = p11 * w0;
+            let sum = w1.mul_add(p01 + p10 + p21 + p12, sum);
+            let sum = w2.mul_add(p00 + p02 + p20 + p22, sum);
+            sum.store(out);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for GaborishStage {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (1, 1);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        gaborish_process_dispatch(self, xsize, input_rows, output_rows);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || GaborishStage::new(0, 0.115169525, 0.061248592),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn checkerboard() -> Result<()> {
+        let mut image = Image::new((2, 2))?;
+        image.row_mut(0).copy_from_slice(&[0.0, 1.0]);
+        image.row_mut(1).copy_from_slice(&[1.0, 0.0]);
+
+        let stage = GaborishStage::new(0, 0.115169525, 0.061248592);
+        let output = make_and_run_simple_pipeline(stage, &[image], (2, 2), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[0.20686048, 0.7931395], 1e-6);
+        assert_all_almost_abs_eq(output[0].row(1), &[0.7931395, 0.20686048], 1e-6);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/mod.rs
new file mode 100644
index 00000000..7c713f13
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/mod.rs
@@ -0,0 +1,53 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+mod black;
+mod blending;
+mod chroma_upsample;
+mod cms;
+#[cfg(feature = "cms")]
+mod cms_cmyk;
+mod convert;
+mod epf;
+mod extend;
+mod from_linear;
+mod gaborish;
+mod noise;
+mod patches;
+mod premultiply_alpha;
+mod splines;
+mod spot;
+mod to_linear;
+mod tone_mapping;
+mod unpremultiply_alpha;
+pub mod upsample;
+mod xyb;
+mod ycbcr;
+
+#[cfg(test)]
+mod nearest_neighbor;
+
+pub use black::*;
+pub use blending::*;
+pub use chroma_upsample::*;
+pub use cms::*;
+#[cfg(feature = "cms")]
+pub use cms_cmyk::*;
+pub use convert::*;
+pub use epf::*;
+pub use extend::*;
+pub use from_linear::*;
+pub use gaborish::*;
+pub use noise::*;
+pub use patches::*;
+pub use premultiply_alpha::*;
+pub use splines::*;
+pub use spot::*;
+pub use tone_mapping::*;
+#[allow(unused_imports)] // Stage is available but not yet wired into pipeline builder
+pub use unpremultiply_alpha::*;
+pub use upsample::*;
+pub use xyb::*;
+pub use ycbcr::*;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/nearest_neighbor.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/nearest_neighbor.rs
new file mode 100644
index 00000000..ca0b6dfc
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/nearest_neighbor.rs
@@ -0,0 +1,97 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::{Channels, ChannelsMut, RenderPipelineInOutStage};
+pub struct NearestNeighbourUpsample {
+    channel: usize,
+}
+
+impl NearestNeighbourUpsample {
+    pub fn new(channel: usize) -> NearestNeighbourUpsample {
+        NearestNeighbourUpsample { channel }
+    }
+}
+
+impl std::fmt::Display for NearestNeighbourUpsample {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "2x2 nearest neighbour upsample of channel {}",
+            self.channel
+        )
+    }
+}
+
+impl RenderPipelineInOutStage for NearestNeighbourUpsample {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (1, 1);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = &input_rows[0];
+        let output = &mut output_rows[0];
+        for i in 0..xsize {
+            output[0][i * 2] = input[0][i];
+            output[0][i * 2 + 1] = input[0][i];
+            output[1][i * 2] = input[0][i];
+            output[1][i * 2 + 1] = input[0][i];
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{error::Result, image::Image, render::test::make_and_run_simple_pipeline};
+    use rand::SeedableRng;
+    use test_log::test;
+
+    #[test]
+    fn nn_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || NearestNeighbourUpsample::new(0),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn test_nn() -> Result<()> {
+        let image_size = (500, 400);
+        let input_size = (image_size.0 / 2, image_size.1 / 2);
+        let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+        let input = vec![Image::<f32>::new_random(input_size, &mut rng)?];
+        let stage = NearestNeighbourUpsample::new(0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &input, image_size, 0, 256)?;
+        assert_eq!(image_size, output[0].size());
+        for y in 0..image_size.1 {
+            for x in 0..image_size.0 {
+                let ix = x / 2;
+                let iy = y / 2;
+                let i = input[0].row(iy)[ix];
+                let o = output[0].row(y)[x];
+                assert_eq!(
+                    i, o,
+                    "mismatch at output position {x}x{y}: {i} vs output {o}"
+                );
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/noise.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/noise.rs
new file mode 100644
index 00000000..3378ad62
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/noise.rs
@@ -0,0 +1,339 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::needless_range_loop)]
+
+use crate::{
+    features::noise::Noise,
+    frame::color_correlation_map::ColorCorrelationParams,
+    render::{Channels, ChannelsMut, RenderPipelineInOutStage, RenderPipelineInPlaceStage},
+};
+use jxl_simd::{F32SimdVec, simd_function};
+
+pub struct ConvolveNoiseStage {
+    channel: usize,
+}
+
+impl ConvolveNoiseStage {
+    pub fn new(channel: usize) -> ConvolveNoiseStage {
+        ConvolveNoiseStage { channel }
+    }
+}
+
+impl std::fmt::Display for ConvolveNoiseStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "convolve noise for channel {}", self.channel,)
+    }
+}
+
+// SIMD noise convolution (5x5 kernel)
+simd_function!(
+    convolve_noise_simd_dispatch,
+    d: D,
+    fn convolve_noise_simd(input: &[&[f32]], output: &mut [f32], xsize: usize) {
+        // Precompute constants
+        let c016 = D::F32Vec::splat(d, 0.16);
+        let cn384 = D::F32Vec::splat(d, -3.84);
+
+        // Windows of size LEN+4 from each row (for offsets 0..5), stepping by LEN
+        let iter0 = input[0].windows(D::F32Vec::LEN + 4).step_by(D::F32Vec::LEN);
+        let iter1 = input[1].windows(D::F32Vec::LEN + 4).step_by(D::F32Vec::LEN);
+        let iter2 = input[2].windows(D::F32Vec::LEN + 4).step_by(D::F32Vec::LEN);
+        let iter3 = input[3].windows(D::F32Vec::LEN + 4).step_by(D::F32Vec::LEN);
+        let iter4 = input[4].windows(D::F32Vec::LEN + 4).step_by(D::F32Vec::LEN);
+        let out_iter = output.chunks_exact_mut(D::F32Vec::LEN);
+
+        for ((((w0, w1), w2), w3), (w4, out)) in iter0
+            .zip(iter1)
+            .zip(iter2)
+            .zip(iter3)
+            .zip(iter4.zip(out_iter))
+            .take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            // Load center pixel (row 2, offset +2)
+            let p00 = D::F32Vec::load(d, &w2[2..]);
+
+            // Accumulate surrounding pixels
+            let mut others = D::F32Vec::splat(d, 0.0);
+
+            // Add all 5 offsets for rows 0, 1, 3, 4
+            for i in 0..5 {
+                others += D::F32Vec::load(d, &w0[i..]);
+                others += D::F32Vec::load(d, &w1[i..]);
+                others += D::F32Vec::load(d, &w3[i..]);
+                others += D::F32Vec::load(d, &w4[i..]);
+            }
+
+            // Add row 2 neighbors (skip center at offset 2)
+            others += D::F32Vec::load(d, &w2[0..]);
+            others += D::F32Vec::load(d, &w2[1..]);
+            others += D::F32Vec::load(d, &w2[3..]);
+            others += D::F32Vec::load(d, &w2[4..]);
+
+            // Compute: others * 0.16 + center * -3.84
+            let result = others.mul_add(c016, p00 * cn384);
+            result.store(out);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for ConvolveNoiseStage {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (2, 2);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = &input_rows[0];
+        convolve_noise_simd_dispatch(input, output_rows[0][0], xsize);
+    }
+}
+
+pub struct AddNoiseStage {
+    noise: Noise,
+    first_channel: usize,
+    color_correlation: ColorCorrelationParams,
+}
+
+impl AddNoiseStage {
+    #[allow(dead_code)]
+    pub fn new(
+        noise: Noise,
+        color_correlation: ColorCorrelationParams,
+        first_channel: usize,
+    ) -> AddNoiseStage {
+        assert!(first_channel > 2);
+        AddNoiseStage {
+            noise,
+            first_channel,
+            color_correlation,
+        }
+    }
+}
+
+impl std::fmt::Display for AddNoiseStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "add noise for channels [{},{},{}]",
+            self.first_channel,
+            self.first_channel + 1,
+            self.first_channel + 2
+        )
+    }
+}
+
+impl RenderPipelineInPlaceStage for AddNoiseStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3 || (c >= self.first_channel && c < self.first_channel + 3)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let norm_const = 0.22;
+        let ytox = self.color_correlation.y_to_x_lf();
+        let ytob = self.color_correlation.y_to_b_lf();
+        for x in 0..xsize {
+            let row_rnd_r = row[3][x];
+            let row_rnd_g = row[4][x];
+            let row_rnd_c = row[5][x];
+            let vx = row[0][x];
+            let vy = row[1][x];
+            let in_g = vy - vx;
+            let in_r = vy + vx;
+            let noise_strength_g = self.noise.strength(in_g * 0.5);
+            let noise_strength_r = self.noise.strength(in_r * 0.5);
+            let addit_rnd_noise_red = row_rnd_r * norm_const;
+            let addit_rnd_noise_green = row_rnd_g * norm_const;
+            let addit_rnd_noise_correlated = row_rnd_c * norm_const;
+            let k_rg_corr = 0.9921875;
+            let k_rgn_corr = 0.0078125;
+            let red_noise = noise_strength_r
+                * (k_rgn_corr * addit_rnd_noise_red + k_rg_corr * addit_rnd_noise_correlated);
+            let green_noise = noise_strength_g
+                * (k_rgn_corr * addit_rnd_noise_green + k_rg_corr * addit_rnd_noise_correlated);
+            let rg_noise = red_noise + green_noise;
+            row[0][x] += ytox * rg_noise + red_noise - green_noise;
+            row[1][x] += rg_noise;
+            row[2][x] += ytob * rg_noise;
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        error::Result,
+        features::noise::Noise,
+        frame::color_correlation_map::ColorCorrelationParams,
+        image::Image,
+        render::{
+            stages::noise::{AddNoiseStage, ConvolveNoiseStage},
+            test::make_and_run_simple_pipeline,
+        },
+        util::test::assert_almost_abs_eq,
+    };
+    use test_log::test;
+
+    // TODO(firsching): Add more relevant ConvolveNoise tests as per discussions in https://github.com/libjxl/jxl-rs/pull/60.
+
+    #[test]
+    fn convolve_noise_process_row_chunk() -> Result<()> {
+        let input: Image<f32> = Image::new_range((2, 2), 0.0, 1.0)?;
+        let stage = ConvolveNoiseStage::new(0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], (2, 2), 0, 256)?;
+        assert_almost_abs_eq(output[0].row(0)[0], 7.2, 1e-6);
+        assert_almost_abs_eq(output[0].row(0)[1], 2.4, 1e-6);
+        assert_almost_abs_eq(output[0].row(1)[0], -2.4, 1e-6);
+        assert_almost_abs_eq(output[0].row(1)[1], -7.2, 1e-6);
+        Ok(())
+    }
+
+    #[test]
+    fn convolve_noise_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(|| ConvolveNoiseStage::new(0), (500, 500), 1)
+    }
+
+    // TODO(firsching): Add more relevant AddNoise tests as per discussions in https://github.com/libjxl/jxl-rs/pull/60.
+
+    #[test]
+    fn add_noise_process_row_chunk() -> Result<()> {
+        let xsize = 8;
+        let ysize = 8;
+        let input_c0: Image<f32> = Image::new_range((xsize, ysize), 0.1, 0.1)?;
+        let input_c1: Image<f32> = Image::new_range((xsize, ysize), 0.1, 0.1)?;
+        let input_c2: Image<f32> = Image::new_range((xsize, ysize), 0.1, 0.1)?;
+        let input_c3: Image<f32> = Image::new_range((xsize, ysize), 0.1, 0.1)?;
+        let input_c4: Image<f32> = Image::new_range((xsize, ysize), 0.1, 0.1)?;
+        let input_c5: Image<f32> = Image::new_range((xsize, ysize), 0.1, 0.1)?;
+        let stage = AddNoiseStage::new(
+            Noise {
+                lut: [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0],
+            },
+            ColorCorrelationParams::default(),
+            3,
+        );
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_c0, input_c1, input_c2, input_c3, input_c4, input_c5],
+            (xsize, ysize),
+            0,
+            256,
+        )?;
+        // Golden data generated by libjxl.
+        let want_out = [
+            [
+                [
+                    0.100000, 0.200000, 0.300000, 0.400000, 0.500000, 0.600000, 0.700000, 0.800000,
+                ],
+                [0.900000, 1.000000, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6],
+                [1.7, 1.8, 1.9, 2.000000, 2.1, 2.2, 2.3, 2.4],
+                [
+                    2.5, 2.6, 2.7, 2.799999, 2.899999, 2.999999, 3.099999, 3.199999,
+                ],
+                [
+                    3.299999, 3.399999, 3.499999, 3.599999, 3.699999, 3.799999, 3.899998, 3.999998,
+                ],
+                [
+                    4.099998, 4.199998, 4.299998, 4.399998, 4.499998, 4.599998, 4.699998, 4.799998,
+                ],
+                [
+                    4.899998, 4.999998, 5.099998, 5.199997, 5.299997, 5.399997, 5.499997, 5.599997,
+                ],
+                [
+                    5.699997, 5.799997, 5.899997, 5.999997, 6.099997, 6.199996, 6.299996, 6.399996,
+                ],
+            ],
+            [
+                [
+                    0.144000, 0.288000, 0.432000, 0.576000, 0.720000, 0.864000, 1.008, 1.152,
+                ],
+                [1.296, 1.44, 1.584, 1.728, 1.872, 2.016, 2.16, 2.304],
+                [2.448, 2.592, 2.736001, 2.88, 3.024, 3.168, 3.312, 3.456],
+                [
+                    3.6, 3.743999, 3.888, 4.031999, 4.175999, 4.319999, 4.463999, 4.607999,
+                ],
+                [
+                    4.751998, 4.895998, 5.039998, 5.183998, 5.327998, 5.471998, 5.615998, 5.759997,
+                ],
+                [
+                    5.903998, 6.047997, 6.191998, 6.335998, 6.479997, 6.623997, 6.767997, 6.911997,
+                ],
+                [
+                    7.055997, 7.199996, 7.343997, 7.487996, 7.631996, 7.775996, 7.919996, 8.063995,
+                ],
+                [
+                    8.207995, 8.351995, 8.495996, 8.639996, 8.783995, 8.927995, 9.071995, 9.215995,
+                ],
+            ],
+            [
+                [
+                    0.144000, 0.288000, 0.432000, 0.576000, 0.720000, 0.864000, 1.008, 1.152,
+                ],
+                [1.296, 1.44, 1.584, 1.728, 1.872, 2.016, 2.16, 2.304],
+                [2.448, 2.592, 2.736001, 2.88, 3.024, 3.168, 3.312, 3.456],
+                [
+                    3.6, 3.743999, 3.888, 4.031999, 4.175999, 4.319999, 4.463999, 4.607999,
+                ],
+                [
+                    4.751998, 4.895998, 5.039998, 5.183998, 5.327998, 5.471998, 5.615998, 5.759997,
+                ],
+                [
+                    5.903998, 6.047997, 6.191998, 6.335998, 6.479997, 6.623997, 6.767997, 6.911997,
+                ],
+                [
+                    7.055997, 7.199996, 7.343997, 7.487996, 7.631996, 7.775996, 7.919996, 8.063995,
+                ],
+                [
+                    8.207995, 8.351995, 8.495996, 8.639996, 8.783995, 8.927995, 9.071995, 9.215995,
+                ],
+            ],
+        ];
+        for c in 0..3 {
+            for y in 0..output[c].size().1 {
+                for x in 0..output[c].size().0 {
+                    assert_almost_abs_eq(output[c].row(y)[x], want_out[c][y][x], 1e-5);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn add_noise_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || {
+                AddNoiseStage::new(
+                    Noise {
+                        lut: [0.0, 2.0, 1.0, 0.0, 1.0, 3.0, 1.1, 2.3],
+                    },
+                    ColorCorrelationParams::default(),
+                    3,
+                )
+            },
+            (500, 500),
+            6,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/patches.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/patches.rs
new file mode 100644
index 00000000..2c60d749
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/patches.rs
@@ -0,0 +1,99 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{any::Any, sync::Arc};
+
+use crate::{
+    features::patches::PatchesDictionary, frame::ReferenceFrame,
+    headers::extra_channels::ExtraChannelInfo, render::RenderPipelineInPlaceStage,
+    util::NewWithCapacity as _,
+};
+
+pub struct PatchesStage {
+    pub patches: Arc<PatchesDictionary>,
+    pub extra_channels: Vec<ExtraChannelInfo>,
+    pub decoder_state: Arc<[Option<ReferenceFrame>; 4]>,
+}
+
+impl std::fmt::Display for PatchesStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "patches")
+    }
+}
+
+impl RenderPipelineInPlaceStage for PatchesStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3 + self.extra_channels.len()
+    }
+
+    fn process_row_chunk(
+        &self,
+        position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        state: Option<&mut (dyn Any + Send)>,
+    ) {
+        let state: &mut Vec<usize> = state.unwrap().downcast_mut().unwrap();
+        self.patches.add_one_row(
+            row,
+            position,
+            xsize,
+            &self.extra_channels,
+            &self.decoder_state[..],
+            state,
+        );
+    }
+
+    fn init_local_state(
+        &self,
+        _thread_index: usize,
+    ) -> crate::error::Result<Option<Box<dyn Any + Send>>> {
+        let patches_for_row_result = Vec::<usize>::new_with_capacity(self.patches.positions.len())?;
+        Ok(Some(Box::new(patches_for_row_result) as Box<dyn Any + Send>))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::sync::Arc;
+
+    use rand::SeedableRng;
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::util::test::read_headers_and_toc;
+
+    #[test]
+    fn patches_consistency() -> Result<()> {
+        let (file_header, _, _) =
+            read_headers_and_toc(include_bytes!("../../../resources/test/basic.jxl")).unwrap();
+        let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+        let patch_dict = Arc::new(PatchesDictionary::random(
+            (500, 500),
+            file_header.image_metadata.extra_channel_info.len(),
+            0,
+            4,
+            &mut rng,
+        ));
+        let reference_frames = Arc::new([
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+            Some(ReferenceFrame::random(&mut rng, 500, 500, 4, false)?),
+        ]);
+        crate::render::test::test_stage_consistency(
+            || PatchesStage {
+                patches: patch_dict.clone(),
+                extra_channels: file_header.image_metadata.extra_channel_info.clone(),
+                decoder_state: reference_frames.clone(),
+            },
+            (500, 500),
+            4,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/premultiply_alpha.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/premultiply_alpha.rs
new file mode 100644
index 00000000..fcb9a096
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/premultiply_alpha.rs
@@ -0,0 +1,144 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::RenderPipelineInPlaceStage;
+use jxl_simd::{F32SimdVec, simd_function};
+
+/// Premultiply color channels by alpha.
+/// This multiplies RGB values by the alpha channel value.
+pub struct PremultiplyAlphaStage {
+    /// First color channel index (typically 0 for R)
+    first_color_channel: usize,
+    /// Number of color channels (typically 3 for RGB)
+    num_color_channels: usize,
+    /// Alpha channel index
+    alpha_channel: usize,
+}
+
+impl std::fmt::Display for PremultiplyAlphaStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "premultiply alpha stage for color channels {}-{} with alpha channel {}",
+            self.first_color_channel,
+            self.first_color_channel + self.num_color_channels - 1,
+            self.alpha_channel
+        )
+    }
+}
+
+impl PremultiplyAlphaStage {
+    pub fn new(
+        first_color_channel: usize,
+        num_color_channels: usize,
+        alpha_channel: usize,
+    ) -> Self {
+        Self {
+            first_color_channel,
+            num_color_channels,
+            alpha_channel,
+        }
+    }
+}
+
+// SIMD premultiply: color = color * alpha
+simd_function!(
+    premultiply_rows_simd_dispatch,
+    d: D,
+    fn premultiply_rows_simd(color_rows: &mut [&mut [f32]], alpha_row: &[f32], xsize: usize) {
+        for color_row in color_rows.iter_mut() {
+            let iter_color = color_row.chunks_exact_mut(D::F32Vec::LEN);
+            let iter_alpha = alpha_row.chunks_exact(D::F32Vec::LEN);
+            for (color_chunk, alpha_chunk) in iter_color.zip(iter_alpha).take(xsize.div_ceil(D::F32Vec::LEN)) {
+                let color_vec = D::F32Vec::load(d, color_chunk);
+                let alpha_vec = D::F32Vec::load(d, alpha_chunk);
+                let result = color_vec * alpha_vec;
+                result.store(color_chunk);
+            }
+        }
+    }
+);
+
+impl RenderPipelineInPlaceStage for PremultiplyAlphaStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_color_channel..self.first_color_channel + self.num_color_channels).contains(&c)
+            || c == self.alpha_channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        // The row slice contains only the channels we said we use.
+        // The last channel is alpha (since alpha_channel > color channels).
+        let num_channels = row.len();
+        if num_channels < 2 {
+            return;
+        }
+
+        // Alpha is the last channel in the row slice
+        let (color_rows, alpha_row) = row.split_at_mut(num_channels - 1);
+        let alpha_row = &alpha_row[0][..];
+
+        premultiply_rows_simd_dispatch(color_rows, alpha_row, xsize);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || PremultiplyAlphaStage::new(0, 3, 3),
+            (500, 500),
+            4,
+        )
+    }
+
+    #[test]
+    fn premultiply_basic() -> Result<()> {
+        let mut input_r = Image::new((4, 1))?;
+        let mut input_g = Image::new((4, 1))?;
+        let mut input_b = Image::new((4, 1))?;
+        let mut input_a = Image::new((4, 1))?;
+
+        // Test values: full color with varying alpha
+        input_r.row_mut(0).copy_from_slice(&[1.0, 1.0, 0.5, 0.0]);
+        input_g.row_mut(0).copy_from_slice(&[0.5, 0.5, 0.5, 1.0]);
+        input_b.row_mut(0).copy_from_slice(&[0.0, 0.25, 1.0, 0.5]);
+        input_a.row_mut(0).copy_from_slice(&[1.0, 0.5, 0.0, 0.5]);
+
+        let stage = PremultiplyAlphaStage::new(0, 3, 3);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_r, input_g, input_b, input_a],
+            (4, 1),
+            0,
+            256,
+        )?;
+
+        // Expected: color * alpha
+        assert_all_almost_abs_eq(output[0].row(0), &[1.0, 0.5, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.5, 0.25, 0.0, 0.5], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.0, 0.125, 0.0, 0.25], 1e-6);
+        // Alpha unchanged
+        assert_all_almost_abs_eq(output[3].row(0), &[1.0, 0.5, 0.0, 0.5], 1e-6);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/splines.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/splines.rs
new file mode 100644
index 00000000..5118fb6e
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/splines.rs
@@ -0,0 +1,174 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    error::Result, features::spline::Splines, frame::color_correlation_map::ColorCorrelationParams,
+    render::RenderPipelineInPlaceStage,
+};
+
+pub struct SplinesStage {
+    splines: Splines,
+}
+
+impl SplinesStage {
+    pub fn new(
+        mut splines: Splines,
+        frame_size: (usize, usize),
+        color_correlation_params: &ColorCorrelationParams,
+        high_precision: bool,
+    ) -> Result<Self> {
+        splines.initialize_draw_cache(
+            frame_size.0 as u64,
+            frame_size.1 as u64,
+            color_correlation_params,
+            high_precision,
+        )?;
+        Ok(SplinesStage { splines })
+    }
+}
+
+impl std::fmt::Display for SplinesStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "splines")
+    }
+}
+
+impl RenderPipelineInPlaceStage for SplinesStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3
+    }
+
+    fn process_row_chunk(
+        &self,
+        position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        self.splines.draw_segments(row, position, xsize);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::features::spline::{Point, QuantizedSpline, Splines};
+    use crate::frame::color_correlation_map::ColorCorrelationParams;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::{self, assert_all_almost_abs_eq, read_pfm};
+    use crate::{error::Result, image::Image, render::stages::splines::SplinesStage};
+    use test_log::test;
+
+    #[test]
+    fn splines_process_row_chunk() -> Result<(), test::Error> {
+        let want_image = read_pfm(include_bytes!("../../../resources/test/splines.pfm"))?;
+        let target_images = [
+            Image::<f32>::new((320, 320))?,
+            Image::<f32>::new((320, 320))?,
+            Image::<f32>::new((320, 320))?,
+        ];
+        let size = target_images[0].size();
+        let splines = Splines::create(
+            0,
+            vec![QuantizedSpline {
+                control_points: vec![
+                    (109, 105),
+                    (-130, -261),
+                    (-66, 193),
+                    (227, -52),
+                    (-170, 290),
+                ],
+                color_dct: [
+                    [
+                        168, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0, 0,
+                    ],
+                    [
+                        9, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0,
+                    ],
+                    [
+                        -10, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0, 0,
+                    ],
+                ],
+                sigma_dct: [
+                    4, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0,
+                ],
+            }],
+            vec![Point { x: 9.0, y: 54.0 }],
+        );
+        let output: Vec<Image<f32>> = make_and_run_simple_pipeline(
+            SplinesStage::new(
+                splines.clone(),
+                size,
+                &ColorCorrelationParams::default(),
+                true,
+            )
+            .unwrap(),
+            &target_images,
+            size,
+            0,
+            256,
+        )?;
+        for c in 0..3 {
+            for row in 0..size.1 {
+                assert_all_almost_abs_eq(output[c].row(row), want_image[c].row(row), 1e-3);
+            }
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn splines_consistency() -> Result<()> {
+        let splines = Splines::create(
+            0,
+            vec![QuantizedSpline {
+                control_points: vec![
+                    (109, 105),
+                    (-130, -261),
+                    (-66, 193),
+                    (227, -52),
+                    (-170, 290),
+                ],
+                color_dct: [
+                    [
+                        168, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0, 0,
+                    ],
+                    [
+                        9, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0,
+                    ],
+                    [
+                        -10, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0, 0, 0,
+                    ],
+                ],
+                sigma_dct: [
+                    4, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0,
+                ],
+            }],
+            vec![Point { x: 9.0, y: 54.0 }],
+        );
+
+        crate::render::test::test_stage_consistency(
+            || {
+                SplinesStage::new(
+                    splines.clone(),
+                    (500, 500),
+                    &ColorCorrelationParams::default(),
+                    false,
+                )
+                .unwrap()
+            },
+            (500, 500),
+            6,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/spot.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/spot.rs
new file mode 100644
index 00000000..94932224
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/spot.rs
@@ -0,0 +1,115 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::RenderPipelineInPlaceStage;
+
+/// Render spot color
+pub struct SpotColorStage {
+    /// Spot color channel index
+    spot_c: usize,
+    /// Spot color in linear RGBA
+    spot_color: [f32; 4],
+}
+
+impl std::fmt::Display for SpotColorStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "spot color stage for channel {}", self.spot_c)
+    }
+}
+
+impl SpotColorStage {
+    #[allow(unused, reason = "remove once we actually use this")]
+    pub fn new(spot_c_offset: usize, spot_color: [f32; 4]) -> Self {
+        Self {
+            spot_c: 3 + spot_c_offset,
+            spot_color,
+        }
+    }
+}
+
+impl RenderPipelineInPlaceStage for SpotColorStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c < 3 || c == self.spot_c
+    }
+
+    // `row` should only contain color channels and the spot channel.
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let [row_r, row_g, row_b, row_s] = row else {
+            panic!(
+                "incorrect number of channels; expected 4, found {}",
+                row.len()
+            );
+        };
+
+        let scale = self.spot_color[3];
+        assert!(
+            xsize <= row_r.len()
+                && xsize <= row_g.len()
+                && xsize <= row_b.len()
+                && xsize <= row_s.len()
+        );
+        for idx in 0..xsize {
+            let mix = scale * row_s[idx];
+            row_r[idx] = mix * self.spot_color[0] + (1.0 - mix) * row_r[idx];
+            row_g[idx] = mix * self.spot_color[1] + (1.0 - mix) * row_g[idx];
+            row_b[idx] = mix * self.spot_color[2] + (1.0 - mix) * row_b[idx];
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || SpotColorStage::new(0, [0.0; 4]),
+            (500, 500),
+            4,
+        )
+    }
+
+    #[test]
+    fn srgb_primaries() -> Result<()> {
+        let mut input_r = Image::new((3, 1))?;
+        let mut input_g = Image::new((3, 1))?;
+        let mut input_b = Image::new((3, 1))?;
+        let mut input_s = Image::new((3, 1))?;
+        input_r.row_mut(0).copy_from_slice(&[1.0, 0.0, 0.0]);
+        input_g.row_mut(0).copy_from_slice(&[0.0, 1.0, 0.0]);
+        input_b.row_mut(0).copy_from_slice(&[0.0, 0.0, 1.0]);
+        input_s.row_mut(0).copy_from_slice(&[1.0, 1.0, 1.0]);
+
+        let stage = SpotColorStage::new(0, [0.5; 4]);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_r, input_g, input_b, input_s],
+            (3, 1),
+            0,
+            256,
+        )?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[0.75, 0.25, 0.25], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.25, 0.75, 0.25], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.25, 0.25, 0.75], 1e-6);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/to_linear.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/to_linear.rs
new file mode 100644
index 00000000..1d2e6a99
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/to_linear.rs
@@ -0,0 +1,233 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::color::tf;
+use crate::headers::color_encoding::CustomTransferFunction;
+use crate::render::RenderPipelineInPlaceStage;
+use crate::render::stages::from_linear;
+use jxl_simd::{F32SimdVec, simd_function};
+
+/// Convert encoded non-linear color samples to display-referred linear color samples.
+#[derive(Debug)]
+pub struct ToLinearStage {
+    first_channel: usize,
+    tf: TransferFunction,
+}
+
+impl ToLinearStage {
+    pub fn new(first_channel: usize, tf: TransferFunction) -> Self {
+        Self { first_channel, tf }
+    }
+
+    #[allow(unused, reason = "tirr-c: remove once we use this!")]
+    pub fn sdr(first_channel: usize, tf: CustomTransferFunction) -> Self {
+        let tf = TransferFunction::try_from(tf).expect("transfer function is not an SDR one");
+        Self::new(first_channel, tf)
+    }
+
+    #[allow(unused, reason = "tirr-c: remove once we use this!")]
+    pub fn pq(first_channel: usize, intensity_target: f32) -> Self {
+        let tf = TransferFunction::Pq { intensity_target };
+        Self::new(first_channel, tf)
+    }
+
+    #[allow(unused, reason = "tirr-c: remove once we use this!")]
+    pub fn hlg(first_channel: usize, intensity_target: f32, luminance_rgb: [f32; 3]) -> Self {
+        let tf = TransferFunction::Hlg {
+            intensity_target,
+            luminance_rgb,
+        };
+        Self::new(first_channel, tf)
+    }
+}
+
+impl std::fmt::Display for ToLinearStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let channel = self.first_channel;
+        write!(
+            f,
+            "Convert transfer function {:?} to display-referred linear TF for channel [{},{},{}]",
+            self.tf,
+            channel,
+            channel + 1,
+            channel + 2
+        )
+    }
+}
+
+simd_function!(
+to_linear_process_dispatch,
+d: D,
+fn to_linear_process(tf: &TransferFunction, xsize: usize, row: &mut [&mut [f32]]) {
+    let [row_r, row_g, row_b] = row else {
+        panic!(
+            "incorrect number of channels; expected 3, found {}",
+            row.len()
+        );
+    };
+
+    match *tf {
+        TransferFunction::Bt709 => {
+            for row in row {
+                tf::bt709_to_linear_simd(d, xsize, row);
+            }
+        }
+        TransferFunction::Srgb => {
+            for row in row {
+                tf::srgb_to_linear_simd(d, &mut row[..xsize.next_multiple_of(D::F32Vec::LEN)]);
+            }
+        }
+        TransferFunction::Pq { intensity_target } => {
+            for row in row {
+                tf::pq_to_linear_simd(d, intensity_target, xsize, row);
+            }
+        }
+        TransferFunction::Hlg {
+            intensity_target,
+            luminance_rgb,
+        } => {
+            tf::hlg_to_scene(&mut row_r[..xsize]);
+            tf::hlg_to_scene(&mut row_g[..xsize]);
+            tf::hlg_to_scene(&mut row_b[..xsize]);
+
+            let rows = [
+                &mut row_r[..xsize],
+                &mut row_g[..xsize],
+                &mut row_b[..xsize],
+            ];
+            tf::hlg_scene_to_display(intensity_target, luminance_rgb, rows);
+        }
+        TransferFunction::Gamma(g) => {
+            for row in row {
+                for values in
+                    row[..xsize.next_multiple_of(D::F32Vec::LEN)].chunks_exact_mut(D::F32Vec::LEN)
+                {
+                    let v = D::F32Vec::load(d, values);
+                    crate::util::fast_powf_simd(d, v.abs(), D::F32Vec::splat(d, g))
+                        .copysign(v)
+                        .store(values);
+                }
+            }
+        }
+    }
+});
+
+impl RenderPipelineInPlaceStage for ToLinearStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        to_linear_process_dispatch(&self.tf, xsize, row)
+    }
+}
+
+pub type TransferFunction = from_linear::TransferFunction;
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    const LUMINANCE_BT2020: [f32; 3] = [0.2627, 0.678, 0.0593];
+
+    #[test]
+    fn consistency_hlg() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToLinearStage::hlg(0, 1000f32, LUMINANCE_BT2020),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_pq() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToLinearStage::pq(0, 10000f32),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_srgb() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToLinearStage::new(0, TransferFunction::Srgb),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_bt709() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToLinearStage::new(0, TransferFunction::Bt709),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_gamma22() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToLinearStage::new(0, TransferFunction::Gamma(0.4545455)),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn sdr_white_hlg() -> Result<()> {
+        let intensity_target = 1000f32;
+        // Reversed version of FromLinear test
+        let input_r = Image::new_with_value((1, 1), 0.75)?;
+        let input_g = Image::new_with_value((1, 1), 0.75)?;
+        let input_b = Image::new_with_value((1, 1), 0.75)?;
+
+        // 75% HLG
+        let stage = ToLinearStage::hlg(0, intensity_target, LUMINANCE_BT2020);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[0.203], 1e-3);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.203], 1e-3);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.203], 1e-3);
+
+        Ok(())
+    }
+
+    #[test]
+    fn sdr_white_pq() -> Result<()> {
+        let intensity_target = 1000f32;
+        // Reversed version of FromLinear test
+        let input_r = Image::new_with_value((1, 1), 0.5807)?;
+        let input_g = Image::new_with_value((1, 1), 0.5807)?;
+        let input_b = Image::new_with_value((1, 1), 0.5807)?;
+
+        // 58% PQ
+        let stage = ToLinearStage::pq(0, intensity_target);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[0.203], 1e-3);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.203], 1e-3);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.203], 1e-3);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/tone_mapping.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/tone_mapping.rs
new file mode 100644
index 00000000..b4eb2c4b
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/tone_mapping.rs
@@ -0,0 +1,491 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Render pipeline stage for HDR tone mapping.
+//!
+//! This stage maps pixel values from one intensity target to another,
+//! matching libjxl's `ToneMappingStage`. It handles:
+//! - PQ content: Rec.2408 tone mapping when desired < source intensity target
+//! - HLG content: OOTF adjustment for different display luminances
+//!
+//! The stage operates on linear-light RGB data.
+
+use crate::render::RenderPipelineInPlaceStage;
+use crate::util::fast_powf;
+
+/// Render pipeline stage that applies HDR tone mapping.
+///
+/// Inserted into the pipeline when the caller requests a different
+/// `desired_intensity_target` than the image's embedded `intensity_target`.
+/// Operates on display-referred linear RGB where 1.0 = `orig_intensity_target` nits.
+#[derive(Debug)]
+pub struct ToneMappingStage {
+    first_channel: usize,
+    config: ToneMappingConfig,
+}
+
+#[derive(Debug)]
+enum ToneMappingConfig {
+    /// Rec.2408 tone mapping for PQ content.
+    Pq(Rec2408ToneMapper),
+    /// HLG OOTF adjustment between two intensity targets.
+    Hlg(HlgOotfConfig),
+}
+
+/// Precomputed Rec.2408 tone mapper (BT.2408 Annex 5).
+///
+/// Maps PQ content from source range to target range, preserving hue
+/// while compressing highlights.
+#[derive(Debug)]
+struct Rec2408ToneMapper {
+    luminances: [f32; 3],
+    source_max: f32,
+    target_max: f32,
+    pq_mastering_min: f32,
+    pq_mastering_range: f32,
+    inv_pq_mastering_range: f32,
+    min_lum: f32,
+    ks: f32,
+    max_lum: f32,
+    inv_one_minus_ks: f32,
+    normalizer: f32,
+    inv_target_peak: f32,
+}
+
+impl Rec2408ToneMapper {
+    fn new(source_range: (f32, f32), target_range: (f32, f32), luminances: [f32; 3]) -> Self {
+        let pq_mastering_min = linear_to_pq(source_range.0);
+        let pq_mastering_max = linear_to_pq(source_range.1);
+        let pq_mastering_range = pq_mastering_max - pq_mastering_min;
+        let inv_pq_mastering_range = 1.0 / pq_mastering_range;
+
+        let min_lum = (linear_to_pq(target_range.0) - pq_mastering_min) * inv_pq_mastering_range;
+        let max_lum = (linear_to_pq(target_range.1) - pq_mastering_min) * inv_pq_mastering_range;
+        let ks = 1.5 * max_lum - 0.5;
+
+        Self {
+            luminances,
+            source_max: source_range.1,
+            target_max: target_range.1,
+            pq_mastering_min,
+            pq_mastering_range,
+            inv_pq_mastering_range,
+            min_lum,
+            ks,
+            max_lum,
+            inv_one_minus_ks: 1.0 / (1.0 - ks).max(1e-6),
+            normalizer: source_range.1 / target_range.1,
+            inv_target_peak: 1.0 / target_range.1,
+        }
+    }
+
+    #[inline]
+    fn t(&self, a: f32) -> f32 {
+        (a - self.ks) * self.inv_one_minus_ks
+    }
+
+    #[inline]
+    fn p(&self, b: f32) -> f32 {
+        let t_b = self.t(b);
+        let t_b_2 = t_b * t_b;
+        let t_b_3 = t_b_2 * t_b;
+        (2.0 * t_b_3 - 3.0 * t_b_2 + 1.0) * self.ks
+            + (t_b_3 - 2.0 * t_b_2 + t_b) * (1.0 - self.ks)
+            + (-2.0 * t_b_3 + 3.0 * t_b_2) * self.max_lum
+    }
+
+    /// Tone map a single pixel in-place. Input/output is linear light
+    /// normalized so 1.0 = orig_intensity_target nits.
+    #[inline]
+    fn tone_map(&self, r: &mut f32, g: &mut f32, b: &mut f32) {
+        let luminance = self.source_max
+            * (self.luminances[0] * *r + self.luminances[1] * *g + self.luminances[2] * *b);
+
+        let normalized_pq = ((linear_to_pq(luminance) - self.pq_mastering_min)
+            * self.inv_pq_mastering_range)
+            .min(1.0);
+
+        let e2 = if normalized_pq < self.ks {
+            normalized_pq
+        } else {
+            self.p(normalized_pq)
+        };
+
+        let one_minus_e2 = 1.0 - e2;
+        let one_minus_e2_2 = one_minus_e2 * one_minus_e2;
+        let one_minus_e2_4 = one_minus_e2_2 * one_minus_e2_2;
+        let e3 = self.min_lum * one_minus_e2_4 + e2;
+        let e4 = e3 * self.pq_mastering_range + self.pq_mastering_min;
+        let new_luminance = pq_to_linear(e4).clamp(0.0, self.target_max);
+
+        let min_luminance = 1e-6;
+        let use_cap = luminance <= min_luminance;
+        let ratio = new_luminance / luminance.max(min_luminance);
+        let cap = new_luminance * self.inv_target_peak;
+        let multiplier = ratio * self.normalizer;
+
+        if use_cap {
+            *r = cap;
+            *g = cap;
+            *b = cap;
+        } else {
+            *r *= multiplier;
+            *g *= multiplier;
+            *b *= multiplier;
+        }
+    }
+}
+
+/// Config for HLG OOTF adjustment between intensity targets.
+#[derive(Debug)]
+struct HlgOotfConfig {
+    luminances: [f32; 3],
+    exponent: f32,
+}
+
+impl HlgOotfConfig {
+    fn new(
+        orig_intensity_target: f32,
+        desired_intensity_target: f32,
+        luminances: [f32; 3],
+    ) -> Self {
+        // HLG system gamma from BT.2100-2:
+        //   gamma = 1.2 * 1.111^log2(Lw / 1000)
+        // The OOTF exponent to adjust from one target to another is the
+        // difference of system gammas minus 1.
+        let orig_gamma = 1.2_f32 * 1.111_f32.powf((orig_intensity_target / 1e3).log2());
+        let desired_gamma = 1.2_f32 * 1.111_f32.powf((desired_intensity_target / 1e3).log2());
+        let exponent = desired_gamma - orig_gamma;
+
+        Self {
+            luminances,
+            exponent,
+        }
+    }
+
+    /// Apply the OOTF adjustment. Input is display-referred linear light.
+    #[inline]
+    fn apply(&self, r: &mut f32, g: &mut f32, b: &mut f32) {
+        if self.exponent.abs() < 1e-6 {
+            return;
+        }
+        let mixed = *r * self.luminances[0] + *g * self.luminances[1] + *b * self.luminances[2];
+        if mixed <= 0.0 {
+            return;
+        }
+        let mult = fast_powf(mixed, self.exponent);
+        *r *= mult;
+        *g *= mult;
+        *b *= mult;
+    }
+}
+
+/// Desaturate out-of-gamut pixels while preserving luminance.
+///
+/// Applied after tone mapping to handle pixels pushed out of gamut
+/// by the tone mapping curve.
+#[inline]
+fn gamut_map(r: &mut f32, g: &mut f32, b: &mut f32, luminances: &[f32; 3]) {
+    let luminance = luminances[0] * *r + luminances[1] * *g + luminances[2] * *b;
+
+    // Preserve_saturation = 0.3 matches libjxl's ToneMappingStage
+    let preserve_saturation: f32 = 0.3;
+
+    let mut gray_mix_saturation = 0.0_f32;
+    let mut gray_mix_luminance = 0.0_f32;
+
+    for &val in [r as &f32, g, b].iter() {
+        let val_minus_gray = *val - luminance;
+        let inv_val_minus_gray = if val_minus_gray == 0.0 {
+            1.0
+        } else {
+            1.0 / val_minus_gray
+        };
+        let val_over_val_minus_gray = *val * inv_val_minus_gray;
+
+        if val_minus_gray < 0.0 {
+            gray_mix_saturation = gray_mix_saturation.max(val_over_val_minus_gray);
+        }
+
+        gray_mix_luminance = gray_mix_luminance.max(if val_minus_gray <= 0.0 {
+            gray_mix_saturation
+        } else {
+            val_over_val_minus_gray - inv_val_minus_gray
+        });
+    }
+
+    let gray_mix = (preserve_saturation * (gray_mix_saturation - gray_mix_luminance)
+        + gray_mix_luminance)
+        .clamp(0.0, 1.0);
+
+    *r = gray_mix * (luminance - *r) + *r;
+    *g = gray_mix * (luminance - *g) + *g;
+    *b = gray_mix * (luminance - *b) + *b;
+
+    let max_clr = r.max(*g).max(*b).max(1.0);
+    let normalizer = 1.0 / max_clr;
+    *r *= normalizer;
+    *g *= normalizer;
+    *b *= normalizer;
+}
+
+/// PQ inverse EOTF: luminance (nits) → PQ encoded value [0, 1].
+fn linear_to_pq(luminance: f32) -> f32 {
+    let mut val = [luminance / 10000.0];
+    crate::color::tf::linear_to_pq_precise(10000.0, &mut val);
+    val[0]
+}
+
+/// PQ EOTF: PQ encoded value [0, 1] → luminance (nits).
+fn pq_to_linear(encoded: f32) -> f32 {
+    let mut val = [encoded];
+    crate::color::tf::pq_to_linear_precise(10000.0, &mut val);
+    val[0] * 10000.0
+}
+
+impl ToneMappingStage {
+    /// Create a tone mapping stage for PQ content.
+    ///
+    /// Applies Rec.2408 tone mapping when `desired_intensity_target < orig_intensity_target`.
+    pub fn pq(
+        first_channel: usize,
+        orig_intensity_target: f32,
+        desired_intensity_target: f32,
+        luminances: [f32; 3],
+    ) -> Self {
+        Self {
+            first_channel,
+            config: ToneMappingConfig::Pq(Rec2408ToneMapper::new(
+                (0.0, orig_intensity_target),
+                (0.0, desired_intensity_target),
+                luminances,
+            )),
+        }
+    }
+
+    /// Create a tone mapping stage for HLG content.
+    ///
+    /// Adjusts the HLG OOTF for the desired display luminance.
+    pub fn hlg(
+        first_channel: usize,
+        orig_intensity_target: f32,
+        desired_intensity_target: f32,
+        luminances: [f32; 3],
+    ) -> Self {
+        Self {
+            first_channel,
+            config: ToneMappingConfig::Hlg(HlgOotfConfig::new(
+                orig_intensity_target,
+                desired_intensity_target,
+                luminances,
+            )),
+        }
+    }
+}
+
+impl std::fmt::Display for ToneMappingStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let c = self.first_channel;
+        let kind = match &self.config {
+            ToneMappingConfig::Pq(_) => "PQ Rec.2408",
+            ToneMappingConfig::Hlg(_) => "HLG OOTF",
+        };
+        write!(
+            f,
+            "Tone mapping ({}) for channels [{},{},{}]",
+            kind,
+            c,
+            c + 1,
+            c + 2
+        )
+    }
+}
+
+impl RenderPipelineInPlaceStage for ToneMappingStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let [row_r, row_g, row_b] = row else {
+            panic!(
+                "incorrect number of channels; expected 3, found {}",
+                row.len()
+            );
+        };
+
+        let luminances = match &self.config {
+            ToneMappingConfig::Pq(tm) => tm.luminances,
+            ToneMappingConfig::Hlg(cfg) => cfg.luminances,
+        };
+
+        for i in 0..xsize {
+            let (r, g, b) = (&mut row_r[i], &mut row_g[i], &mut row_b[i]);
+
+            match &self.config {
+                ToneMappingConfig::Pq(tm) => tm.tone_map(r, g, b),
+                ToneMappingConfig::Hlg(cfg) => cfg.apply(r, g, b),
+            }
+
+            gamut_map(r, g, b, &luminances);
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+
+    const LUMINANCE_BT2020: [f32; 3] = [0.2627, 0.678, 0.0593];
+
+    #[test]
+    fn consistency_pq() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToneMappingStage::pq(0, 10000.0, 250.0, LUMINANCE_BT2020),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn consistency_hlg() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || ToneMappingStage::hlg(0, 1000.0, 300.0, LUMINANCE_BT2020),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn pq_tone_mapping_compresses_highlights() -> Result<()> {
+        // Input: two pixels at different brightness levels.
+        // In the PQ linear domain, 1.0 = orig_intensity_target nits.
+        // 0.1 = 1000 nits, 0.8 = 8000 nits relative to 10000 nit source.
+        // After tone mapping to 250 nits, the bright pixel should be compressed
+        // more than the dim one, but both map to [0, 1] of the target range.
+        let dim = 0.1_f32; // 1000 nits
+        let bright = 0.8_f32; // 8000 nits
+
+        let stage = ToneMappingStage::pq(0, 10000.0, 250.0, LUMINANCE_BT2020);
+
+        let input_dim = [
+            Image::new_with_value((1, 1), dim)?,
+            Image::new_with_value((1, 1), dim)?,
+            Image::new_with_value((1, 1), dim)?,
+        ];
+        let output_dim = make_and_run_simple_pipeline(
+            ToneMappingStage::pq(0, 10000.0, 250.0, LUMINANCE_BT2020),
+            &input_dim,
+            (1, 1),
+            0,
+            256,
+        )?;
+
+        let input_bright = [
+            Image::new_with_value((1, 1), bright)?,
+            Image::new_with_value((1, 1), bright)?,
+            Image::new_with_value((1, 1), bright)?,
+        ];
+        let output_bright = make_and_run_simple_pipeline(stage, &input_bright, (1, 1), 0, 256)?;
+
+        let dim_out = output_dim[0].row(0)[0];
+        let bright_out = output_bright[0].row(0)[0];
+
+        // Both should be in valid range
+        assert!(dim_out >= 0.0, "Dim pixel negative: {dim_out}");
+        assert!(bright_out >= 0.0, "Bright pixel negative: {bright_out}");
+
+        // The bright pixel should map higher than the dim pixel
+        assert!(
+            bright_out > dim_out,
+            "Tone mapping should preserve ordering: bright {bright_out} <= dim {dim_out}"
+        );
+
+        // The ratio between bright/dim output should be less than the input ratio,
+        // proving that highlights were compressed
+        let input_ratio = bright / dim;
+        let output_ratio = bright_out / dim_out;
+        assert!(
+            output_ratio < input_ratio,
+            "Highlights not compressed: input ratio {input_ratio}, output ratio {output_ratio}"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn pq_dark_pixel_preserved() -> Result<()> {
+        // A dim PQ pixel (0.01 linear = 100 nits) should be mostly preserved
+        let input_r = Image::new_with_value((1, 1), 0.01)?;
+        let input_g = Image::new_with_value((1, 1), 0.01)?;
+        let input_b = Image::new_with_value((1, 1), 0.01)?;
+
+        let stage = ToneMappingStage::pq(0, 10000.0, 250.0, LUMINANCE_BT2020);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        for (c, img) in output.iter().enumerate().take(3) {
+            let val = img.row(0)[0];
+            assert!(val >= 0.0, "Channel {c} value {val} is negative");
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn hlg_identity_at_same_target() -> Result<()> {
+        // When orig == desired, the OOTF exponent is 0 and output should be identity
+        let input_r = Image::new_with_value((1, 1), 0.5)?;
+        let input_g = Image::new_with_value((1, 1), 0.3)?;
+        let input_b = Image::new_with_value((1, 1), 0.1)?;
+
+        let stage = ToneMappingStage::hlg(0, 1000.0, 1000.0, LUMINANCE_BT2020);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        // Should be unchanged (identity OOTF) — gamut map is still applied but
+        // these values are in-gamut so they should pass through
+        let r = output[0].row(0)[0];
+        let g = output[1].row(0)[0];
+        let b = output[2].row(0)[0];
+        assert!((r - 0.5).abs() < 0.01, "R changed: expected ~0.5, got {r}");
+        assert!((g - 0.3).abs() < 0.01, "G changed: expected ~0.3, got {g}");
+        assert!((b - 0.1).abs() < 0.01, "B changed: expected ~0.1, got {b}");
+        Ok(())
+    }
+
+    #[test]
+    fn hlg_different_targets_changes_values() -> Result<()> {
+        let input_r = Image::new_with_value((1, 1), 0.5)?;
+        let input_g = Image::new_with_value((1, 1), 0.5)?;
+        let input_b = Image::new_with_value((1, 1), 0.5)?;
+
+        // 1000 nit source → 300 nit display (significant OOTF change)
+        let stage = ToneMappingStage::hlg(0, 1000.0, 300.0, LUMINANCE_BT2020);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_r, input_g, input_b], (1, 1), 0, 256)?;
+
+        let r = output[0].row(0)[0];
+        assert!(r > 0.0 && r <= 1.0, "R value {r} out of range");
+        // Value should be different from 0.5 due to OOTF
+        assert!(
+            (r - 0.5).abs() > 0.01,
+            "R value {r} unchanged — OOTF not applied"
+        );
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/unpremultiply_alpha.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/unpremultiply_alpha.rs
new file mode 100644
index 00000000..07be59b1
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/unpremultiply_alpha.rs
@@ -0,0 +1,204 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::RenderPipelineInPlaceStage;
+use jxl_simd::{F32SimdVec, SimdMask, simd_function};
+
+/// Unpremultiply color channels by alpha.
+/// This divides RGB values by the alpha channel value.
+/// When alpha is 0, the color output is 0 (to avoid division by zero).
+#[allow(dead_code)] // Render pipeline stage for unpremultiplied alpha output
+pub struct UnpremultiplyAlphaStage {
+    /// First color channel index (typically 0 for R)
+    first_color_channel: usize,
+    /// Number of color channels (typically 3 for RGB)
+    num_color_channels: usize,
+    /// Alpha channel index
+    alpha_channel: usize,
+}
+
+impl std::fmt::Display for UnpremultiplyAlphaStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "unpremultiply alpha stage for color channels {}-{} with alpha channel {}",
+            self.first_color_channel,
+            self.first_color_channel + self.num_color_channels - 1,
+            self.alpha_channel
+        )
+    }
+}
+
+#[allow(dead_code)]
+impl UnpremultiplyAlphaStage {
+    pub fn new(
+        first_color_channel: usize,
+        num_color_channels: usize,
+        alpha_channel: usize,
+    ) -> Self {
+        Self {
+            first_color_channel,
+            num_color_channels,
+            alpha_channel,
+        }
+    }
+}
+
+// SIMD unpremultiply: color = color / alpha (with alpha=0 -> color=0)
+simd_function!(
+    unpremultiply_rows_simd_dispatch,
+    d: D,
+    fn unpremultiply_rows_simd(color_rows: &mut [&mut [f32]], alpha_row: &[f32], xsize: usize) {
+        let zero = D::F32Vec::splat(d, 0.0);
+        let epsilon = D::F32Vec::splat(d, 1e-10); // Small value to detect near-zero alpha
+
+        for color_row in color_rows.iter_mut() {
+            let iter_color = color_row.chunks_exact_mut(D::F32Vec::LEN);
+            let iter_alpha = alpha_row.chunks_exact(D::F32Vec::LEN);
+            for (color_chunk, alpha_chunk) in iter_color.zip(iter_alpha).take(xsize.div_ceil(D::F32Vec::LEN)) {
+                let color_vec = D::F32Vec::load(d, color_chunk);
+                let alpha_vec = D::F32Vec::load(d, alpha_chunk);
+
+                // Compute color / alpha, but use 0 where alpha is very small
+                // This avoids division by zero and matches expected behavior
+                let alpha_safe = alpha_vec.max(epsilon);
+                let unpremul = color_vec / alpha_safe;
+
+                // Zero out result where alpha was near-zero
+                // if_then_else_f32(if_true, if_false): returns if_true where mask is true
+                let result = alpha_vec.gt(epsilon).if_then_else_f32(unpremul, zero);
+
+                result.store(color_chunk);
+            }
+        }
+    }
+);
+
+impl RenderPipelineInPlaceStage for UnpremultiplyAlphaStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_color_channel..self.first_color_channel + self.num_color_channels).contains(&c)
+            || c == self.alpha_channel
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        // The row slice contains only the channels we said we use.
+        // The last channel is alpha (since alpha_channel > color channels).
+        let num_channels = row.len();
+        if num_channels < 2 {
+            return;
+        }
+
+        // Alpha is the last channel in the row slice
+        let (color_rows, alpha_row) = row.split_at_mut(num_channels - 1);
+        let alpha_row = &alpha_row[0][..];
+
+        unpremultiply_rows_simd_dispatch(color_rows, alpha_row, xsize);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || UnpremultiplyAlphaStage::new(0, 3, 3),
+            (500, 500),
+            4,
+        )
+    }
+
+    #[test]
+    fn unpremultiply_basic() -> Result<()> {
+        let mut input_r = Image::new((4, 1))?;
+        let mut input_g = Image::new((4, 1))?;
+        let mut input_b = Image::new((4, 1))?;
+        let mut input_a = Image::new((4, 1))?;
+
+        // Test values: premultiplied colors with varying alpha
+        // These are the OUTPUT values from premultiply_basic test
+        input_r.row_mut(0).copy_from_slice(&[1.0, 0.5, 0.0, 0.0]);
+        input_g.row_mut(0).copy_from_slice(&[0.5, 0.25, 0.0, 0.5]);
+        input_b.row_mut(0).copy_from_slice(&[0.0, 0.125, 0.0, 0.25]);
+        input_a.row_mut(0).copy_from_slice(&[1.0, 0.5, 0.0, 0.5]);
+
+        let stage = UnpremultiplyAlphaStage::new(0, 3, 3);
+        let output = make_and_run_simple_pipeline(
+            stage,
+            &[input_r, input_g, input_b, input_a],
+            (4, 1),
+            0,
+            256,
+        )?;
+
+        // Expected: color / alpha (with alpha=0 -> color=0)
+        // Pixel 0: alpha=1.0, so unchanged
+        // Pixel 1: alpha=0.5, so double the values
+        // Pixel 2: alpha=0.0, so output 0
+        // Pixel 3: alpha=0.5, so double the values
+        assert_all_almost_abs_eq(output[0].row(0), &[1.0, 1.0, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.5, 0.5, 0.0, 1.0], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.0, 0.25, 0.0, 0.5], 1e-6);
+        // Alpha unchanged
+        assert_all_almost_abs_eq(output[3].row(0), &[1.0, 0.5, 0.0, 0.5], 1e-6);
+
+        Ok(())
+    }
+
+    #[test]
+    fn unpremultiply_roundtrip() -> Result<()> {
+        // Test that premultiply followed by unpremultiply returns original values
+        // (except where alpha=0)
+        let mut input_r = Image::new((4, 1))?;
+        let mut input_g = Image::new((4, 1))?;
+        let mut input_b = Image::new((4, 1))?;
+        let mut input_a = Image::new((4, 1))?;
+
+        // Original straight alpha values
+        input_r.row_mut(0).copy_from_slice(&[1.0, 0.8, 0.5, 0.2]);
+        input_g.row_mut(0).copy_from_slice(&[0.5, 0.6, 0.7, 0.3]);
+        input_b.row_mut(0).copy_from_slice(&[0.0, 0.4, 0.9, 0.1]);
+        input_a.row_mut(0).copy_from_slice(&[1.0, 0.5, 0.25, 0.75]);
+
+        // First premultiply
+        let premul_stage = crate::render::stages::PremultiplyAlphaStage::new(0, 3, 3);
+        let premul_output = make_and_run_simple_pipeline(
+            premul_stage,
+            &[input_r, input_g, input_b, input_a],
+            (4, 1),
+            0,
+            256,
+        )?;
+
+        // Then unpremultiply
+        let unpremul_stage = UnpremultiplyAlphaStage::new(0, 3, 3);
+        let final_output =
+            make_and_run_simple_pipeline(unpremul_stage, &premul_output, (4, 1), 0, 256)?;
+
+        // Should get back original values
+        assert_all_almost_abs_eq(final_output[0].row(0), &[1.0, 0.8, 0.5, 0.2], 1e-5);
+        assert_all_almost_abs_eq(final_output[1].row(0), &[0.5, 0.6, 0.7, 0.3], 1e-5);
+        assert_all_almost_abs_eq(final_output[2].row(0), &[0.0, 0.4, 0.9, 0.1], 1e-5);
+        // Alpha unchanged
+        assert_all_almost_abs_eq(final_output[3].row(0), &[1.0, 0.5, 0.25, 0.75], 1e-5);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/upsample.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/upsample.rs
new file mode 100644
index 00000000..ec6929f8
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/upsample.rs
@@ -0,0 +1,868 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::needless_range_loop)]
+#![allow(clippy::too_many_arguments)]
+
+use std::any::Any;
+
+use crate::{
+    headers::CustomTransformData,
+    render::{Channels, ChannelsMut, RenderPipelineInOutStage},
+};
+use jxl_simd::{F32SimdVec, simd_function};
+
+pub struct Upsample<const N: usize, const SHIFT: u8> {
+    // Precomputed flattened kernels for SIMD optimization
+    // Stored as N*N kernels in row-major order: kernel[oy][ox] -> flat_kernels[oy * N + ox]
+    flat_kernels: Vec<[f32; 25]>,
+    channel: usize,
+}
+
+impl<const N: usize, const SHIFT: u8> Upsample<N, SHIFT> {
+    pub fn new(ups_factors: &CustomTransformData, channel: usize) -> Self {
+        const { assert!(SHIFT >= 1 && SHIFT <= 3) }
+        const { assert!(1 << SHIFT == N) }
+
+        let weights: &[f32] = match N {
+            2 => &ups_factors.weights2,
+            4 => &ups_factors.weights4,
+            8 => &ups_factors.weights8,
+            _ => unreachable!(),
+        };
+
+        let mut kernel = [[[[0.0; 5]; 5]; N]; N];
+        let n = N / 2;
+        for i in 0..5 * n {
+            for j in 0..5 * n {
+                let y = i.min(j);
+                let x = i.max(j);
+                let y = y as isize;
+                let x = x as isize;
+                let n = n as isize;
+                let index = (5 * n * y - y * (y - 1) / 2 + x - y) as usize;
+                // Filling in the top left corner from the weights
+                kernel[j / 5][i / 5][j % 5][i % 5] = weights[index];
+                // Mirroring to get the rest of the kernel.
+                kernel[(2 * n as usize - 1) - j / 5][i / 5][4 - (j % 5)][i % 5] = weights[index];
+                kernel[j / 5][(2 * n as usize - 1) - i / 5][j % 5][4 - (i % 5)] = weights[index];
+                kernel[(2 * n as usize - 1) - j / 5][(2 * n as usize - 1) - i / 5][4 - (j % 5)]
+                    [4 - (i % 5)] = weights[index];
+            }
+        }
+
+        // Precompute flattened kernels for SIMD optimization
+        // Stored in row-major order: kernel[oy][ox] -> flat_kernels[oy * N + ox]
+        let mut flat_kernels = Vec::with_capacity(N * N);
+        for di in 0..N {
+            for dj in 0..N {
+                let mut k = [0.0f32; 25];
+                for i in 0..5 {
+                    for j in 0..5 {
+                        k[i * 5 + j] = kernel[di][dj][i][j];
+                    }
+                }
+                flat_kernels.push(k);
+            }
+        }
+
+        Self {
+            flat_kernels,
+            channel,
+        }
+    }
+}
+
+impl<const N: usize, const SHIFT: u8> std::fmt::Display for Upsample<N, SHIFT> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{N}x{N} upsampling of channel {}", self.channel)
+    }
+}
+
+/// State for upsampling stage containing reusable temp buffers
+struct UpsampleState {
+    col_min: Vec<f32>,
+    col_max: Vec<f32>,
+    mins: Vec<f32>,
+    maxs: Vec<f32>,
+}
+
+impl UpsampleState {
+    fn new() -> Self {
+        Self {
+            col_min: Vec::new(),
+            col_max: Vec::new(),
+            mins: Vec::new(),
+            maxs: Vec::new(),
+        }
+    }
+
+    fn ensure_capacity(&mut self, xsize: usize) {
+        // Generous padding for SIMD operations:
+        // Step 1: needs xsize + 4 (col_fill_len) elements
+        // Step 2: loads at offset + 4, needs SIMD_LEN more elements from there
+        // For AVX-512 (SIMD_LEN=16), we need: xsize + 4 + 16 = xsize + 20
+        // Add extra padding to be safe with future SIMD widths
+        let needed = xsize + 24;
+        if self.col_min.len() < needed {
+            self.col_min.resize(needed, 0.0);
+            self.col_max.resize(needed, 0.0);
+            self.mins.resize(needed, 0.0);
+            self.maxs.resize(needed, 0.0);
+        }
+    }
+}
+
+// Shared min/max computation - generic helper function called from within dispatched functions
+#[inline(always)]
+fn compute_minmax<D: jxl_simd::SimdDescriptor>(
+    d: D,
+    input: &[&[f32]],
+    xsize: usize,
+    col_min: &mut [f32],
+    col_max: &mut [f32],
+    mins: &mut [f32],
+    maxs: &mut [f32],
+) {
+    let r0 = input[0];
+    let r1 = input[1];
+    let r2 = input[2];
+    let r3 = input[3];
+    let r4 = input[4];
+
+    // Step 1: Compute column-wise min/max (vertical reduction across 5 rows)
+    // Use div_ceil to process all elements (may over-read but buffers are padded)
+    let col_fill_len = xsize + 4;
+    let num_vecs = col_fill_len.div_ceil(D::F32Vec::LEN);
+    for i in 0..num_vecs {
+        let offset = i * D::F32Vec::LEN;
+        let v0 = D::F32Vec::load(d, &r0[offset..]);
+        let v1 = D::F32Vec::load(d, &r1[offset..]);
+        let v2 = D::F32Vec::load(d, &r2[offset..]);
+        let v3 = D::F32Vec::load(d, &r3[offset..]);
+        let v4 = D::F32Vec::load(d, &r4[offset..]);
+
+        let col_min_v = v0.min(v1).min(v2).min(v3).min(v4);
+        let col_max_v = v0.max(v1).max(v2).max(v3).max(v4);
+
+        col_min_v.store(&mut col_min[offset..]);
+        col_max_v.store(&mut col_max[offset..]);
+    }
+
+    // Step 2: Compute row-wise min/max from column temps (horizontal 5-wide window)
+    let num_output_vecs = xsize.div_ceil(D::F32Vec::LEN);
+    for i in 0..num_output_vecs {
+        let offset = i * D::F32Vec::LEN;
+        let m0 = D::F32Vec::load(d, &col_min[offset..]);
+        let m1 = D::F32Vec::load(d, &col_min[offset + 1..]);
+        let m2 = D::F32Vec::load(d, &col_min[offset + 2..]);
+        let m3 = D::F32Vec::load(d, &col_min[offset + 3..]);
+        let m4 = D::F32Vec::load(d, &col_min[offset + 4..]);
+        let min_v = m0.min(m1).min(m2).min(m3).min(m4);
+        min_v.store(&mut mins[offset..]);
+
+        let m0 = D::F32Vec::load(d, &col_max[offset..]);
+        let m1 = D::F32Vec::load(d, &col_max[offset + 1..]);
+        let m2 = D::F32Vec::load(d, &col_max[offset + 2..]);
+        let m3 = D::F32Vec::load(d, &col_max[offset + 3..]);
+        let m4 = D::F32Vec::load(d, &col_max[offset + 4..]);
+        let max_v = m0.max(m1).max(m2).max(m3).max(m4);
+        max_v.store(&mut maxs[offset..]);
+    }
+}
+
+// Macro to generate the kernel convolution code (shared across 2x, 4x, 8x)
+macro_rules! kernel_conv {
+    ($d:expr, $kv:expr, $r0:expr, $r1:expr, $r2:expr, $r3:expr, $r4:expr, $x:expr) => {{
+        // Compute 5x5 kernel using FMA with 3-way ILP
+        // Row 0
+        let mut acc0 = <D::F32Vec>::load($d, &$r0[$x..]) * $kv[0];
+        let mut acc1 = <D::F32Vec>::load($d, &$r0[$x + 1..]) * $kv[1];
+        let mut acc2 = <D::F32Vec>::load($d, &$r0[$x + 2..]) * $kv[2];
+        acc0 = <D::F32Vec>::load($d, &$r0[$x + 3..]).mul_add($kv[3], acc0);
+        acc1 = <D::F32Vec>::load($d, &$r0[$x + 4..]).mul_add($kv[4], acc1);
+        // Row 1
+        acc2 = <D::F32Vec>::load($d, &$r1[$x..]).mul_add($kv[5], acc2);
+        acc0 = <D::F32Vec>::load($d, &$r1[$x + 1..]).mul_add($kv[6], acc0);
+        acc1 = <D::F32Vec>::load($d, &$r1[$x + 2..]).mul_add($kv[7], acc1);
+        acc2 = <D::F32Vec>::load($d, &$r1[$x + 3..]).mul_add($kv[8], acc2);
+        acc0 = <D::F32Vec>::load($d, &$r1[$x + 4..]).mul_add($kv[9], acc0);
+        // Row 2
+        acc1 = <D::F32Vec>::load($d, &$r2[$x..]).mul_add($kv[10], acc1);
+        acc2 = <D::F32Vec>::load($d, &$r2[$x + 1..]).mul_add($kv[11], acc2);
+        acc0 = <D::F32Vec>::load($d, &$r2[$x + 2..]).mul_add($kv[12], acc0);
+        acc1 = <D::F32Vec>::load($d, &$r2[$x + 3..]).mul_add($kv[13], acc1);
+        acc2 = <D::F32Vec>::load($d, &$r2[$x + 4..]).mul_add($kv[14], acc2);
+        // Row 3
+        acc0 = <D::F32Vec>::load($d, &$r3[$x..]).mul_add($kv[15], acc0);
+        acc1 = <D::F32Vec>::load($d, &$r3[$x + 1..]).mul_add($kv[16], acc1);
+        acc2 = <D::F32Vec>::load($d, &$r3[$x + 2..]).mul_add($kv[17], acc2);
+        acc0 = <D::F32Vec>::load($d, &$r3[$x + 3..]).mul_add($kv[18], acc0);
+        acc1 = <D::F32Vec>::load($d, &$r3[$x + 4..]).mul_add($kv[19], acc1);
+        // Row 4
+        acc2 = <D::F32Vec>::load($d, &$r4[$x..]).mul_add($kv[20], acc2);
+        acc0 = <D::F32Vec>::load($d, &$r4[$x + 1..]).mul_add($kv[21], acc0);
+        acc1 = <D::F32Vec>::load($d, &$r4[$x + 2..]).mul_add($kv[22], acc1);
+        acc2 = <D::F32Vec>::load($d, &$r4[$x + 3..]).mul_add($kv[23], acc2);
+        acc0 = <D::F32Vec>::load($d, &$r4[$x + 4..]).mul_add($kv[24], acc0);
+
+        acc0 + acc1 + acc2
+    }};
+}
+
+// 2x upsampling SIMD implementation - single dispatch with integrated minmax
+simd_function!(
+    upsample_2x_simd_dispatch,
+    d: D,
+    fn upsample_2x_simd(
+        input: &[&[f32]],
+        xsize: usize,
+        flat_kernels: &[[f32; 25]],
+        col_min: &mut [f32],
+        col_max: &mut [f32],
+        mins: &mut [f32],
+        maxs: &mut [f32],
+        output: &mut [&mut [f32]],
+    ) {
+        // Compute min/max using shared helper
+        compute_minmax(d, input, xsize, col_min, col_max, mins, maxs);
+
+        let r0 = input[0];
+        let r1 = input[1];
+        let r2 = input[2];
+        let r3 = input[3];
+        let r4 = input[4];
+
+        // Pre-broadcast kernel weights
+        // flat_kernels layout: kernel[oy][ox] -> flat_kernels[oy * 2 + ox]
+        let mut kernel_vecs = [[D::F32Vec::splat(d, 0.0); 25]; 4];
+        for idx in 0..4 {
+            let k = &flat_kernels[idx];
+            for i in 0..25 {
+                kernel_vecs[idx][i] = D::F32Vec::splat(d, k[i]);
+            }
+        }
+
+        // Process using iterators for mins/maxs, manual indexing for output
+        let mins_iter = mins.chunks_exact(D::F32Vec::LEN);
+        let maxs_iter = maxs.chunks_exact(D::F32Vec::LEN);
+
+        for ((mins_chunk, maxs_chunk), x) in mins_iter
+            .zip(maxs_iter)
+            .zip((0..xsize).step_by(D::F32Vec::LEN))
+            .take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            let minval = D::F32Vec::load(d, mins_chunk);
+            let maxval = D::F32Vec::load(d, maxs_chunk);
+            let out_x = x * 2;
+
+            // Row 0
+            let r0_0 = kernel_conv!(d, kernel_vecs[0], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+            let r0_1 = kernel_conv!(d, kernel_vecs[1], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+            D::F32Vec::store_interleaved_2(r0_0, r0_1, &mut output[0][out_x..]);
+
+            // Row 1
+            let r1_0 = kernel_conv!(d, kernel_vecs[2], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+            let r1_1 = kernel_conv!(d, kernel_vecs[3], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+            D::F32Vec::store_interleaved_2(r1_0, r1_1, &mut output[1][out_x..]);
+        }
+    }
+);
+
+// 4x upsampling SIMD implementation - single dispatch with integrated minmax
+simd_function!(
+    upsample_4x_simd_dispatch,
+    d: D,
+    fn upsample_4x_simd(
+        input: &[&[f32]],
+        xsize: usize,
+        flat_kernels: &[[f32; 25]],
+        col_min: &mut [f32],
+        col_max: &mut [f32],
+        mins: &mut [f32],
+        maxs: &mut [f32],
+        output: &mut [&mut [f32]],
+    ) {
+        // Compute min/max using shared helper
+        compute_minmax(d, input, xsize, col_min, col_max, mins, maxs);
+
+        let r0 = input[0];
+        let r1 = input[1];
+        let r2 = input[2];
+        let r3 = input[3];
+        let r4 = input[4];
+
+        // Pre-broadcast kernel weights
+        // flat_kernels layout: kernel[oy][ox] -> flat_kernels[oy * 4 + ox]
+        let mut kernel_vecs = [[D::F32Vec::splat(d, 0.0); 25]; 16];
+        for idx in 0..16 {
+            let k = &flat_kernels[idx];
+            for i in 0..25 {
+                kernel_vecs[idx][i] = D::F32Vec::splat(d, k[i]);
+            }
+        }
+
+        // Process using iterators for mins/maxs, manual indexing for output
+        let mins_iter = mins.chunks_exact(D::F32Vec::LEN);
+        let maxs_iter = maxs.chunks_exact(D::F32Vec::LEN);
+
+        for ((mins_chunk, maxs_chunk), x) in mins_iter
+            .zip(maxs_iter)
+            .zip((0..xsize).step_by(D::F32Vec::LEN))
+            .take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            let minval = D::F32Vec::load(d, mins_chunk);
+            let maxval = D::F32Vec::load(d, maxs_chunk);
+            let out_x = x * 4;
+
+            // Process all 4 output rows using a loop
+            for oy in 0..4 {
+                let base = oy * 4;
+                let v0 = kernel_conv!(d, kernel_vecs[base], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v1 = kernel_conv!(d, kernel_vecs[base + 1], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v2 = kernel_conv!(d, kernel_vecs[base + 2], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v3 = kernel_conv!(d, kernel_vecs[base + 3], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                D::F32Vec::store_interleaved_4(v0, v1, v2, v3, &mut output[oy][out_x..]);
+            }
+        }
+    }
+);
+
+// 8x upsampling SIMD implementation - single dispatch with integrated minmax
+simd_function!(
+    upsample_8x_simd_dispatch,
+    d: D,
+    fn upsample_8x_simd(
+        input: &[&[f32]],
+        xsize: usize,
+        flat_kernels: &[[f32; 25]],
+        col_min: &mut [f32],
+        col_max: &mut [f32],
+        mins: &mut [f32],
+        maxs: &mut [f32],
+        output: &mut [&mut [f32]],
+    ) {
+        // Compute min/max using shared helper
+        compute_minmax(d, input, xsize, col_min, col_max, mins, maxs);
+
+        let r0 = input[0];
+        let r1 = input[1];
+        let r2 = input[2];
+        let r3 = input[3];
+        let r4 = input[4];
+
+        // Pre-broadcast kernel weights
+        // flat_kernels layout: kernel[oy][ox] -> flat_kernels[oy * 8 + ox]
+        let mut kernel_vecs = [[D::F32Vec::splat(d, 0.0); 25]; 64];
+        for idx in 0..64 {
+            let k = &flat_kernels[idx];
+            for i in 0..25 {
+                kernel_vecs[idx][i] = D::F32Vec::splat(d, k[i]);
+            }
+        }
+
+        // Process using iterators for mins/maxs, manual indexing for output
+        let mins_iter = mins.chunks_exact(D::F32Vec::LEN);
+        let maxs_iter = maxs.chunks_exact(D::F32Vec::LEN);
+
+        for ((mins_chunk, maxs_chunk), x) in mins_iter
+            .zip(maxs_iter)
+            .zip((0..xsize).step_by(D::F32Vec::LEN))
+            .take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            let minval = D::F32Vec::load(d, mins_chunk);
+            let maxval = D::F32Vec::load(d, maxs_chunk);
+            let out_x = x * 8;
+
+            // Process all 8 output rows using a loop
+            for oy in 0..8 {
+                let base = oy * 8;
+                let v0 = kernel_conv!(d, kernel_vecs[base], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v1 = kernel_conv!(d, kernel_vecs[base + 1], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v2 = kernel_conv!(d, kernel_vecs[base + 2], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v3 = kernel_conv!(d, kernel_vecs[base + 3], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v4 = kernel_conv!(d, kernel_vecs[base + 4], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v5 = kernel_conv!(d, kernel_vecs[base + 5], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v6 = kernel_conv!(d, kernel_vecs[base + 6], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                let v7 = kernel_conv!(d, kernel_vecs[base + 7], r0, r1, r2, r3, r4, x).max(minval).min(maxval);
+                D::F32Vec::store_interleaved_8(v0, v1, v2, v3, v4, v5, v6, v7, &mut output[oy][out_x..]);
+            }
+        }
+    }
+);
+
+impl<const N: usize, const SHIFT: u8> RenderPipelineInOutStage for Upsample<N, SHIFT> {
+    type InputT = f32;
+    type OutputT = f32;
+    const SHIFT: (u8, u8) = (SHIFT, SHIFT);
+    const BORDER: (u8, u8) = (2, 2);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        c == self.channel
+    }
+
+    fn init_local_state(
+        &self,
+        _thread_index: usize,
+    ) -> crate::error::Result<Option<Box<dyn Any + Send>>> {
+        Ok(Some(Box::new(UpsampleState::new()) as Box<dyn Any + Send>))
+    }
+
+    /// Processes a chunk of a row, applying NxN upsampling using a 5x5 kernel.
+    /// Each input value expands into a NxN region in the output, based on neighboring inputs.
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<f32>,
+        state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let input = &input_rows[0];
+        let state: &mut UpsampleState = state.unwrap().downcast_mut().unwrap();
+        state.ensure_capacity(xsize);
+
+        // Dispatch to appropriate upsampling function based on N
+        // Each dispatch function computes min/max and performs upsampling in one call
+        match N {
+            2 => {
+                upsample_2x_simd_dispatch(
+                    input,
+                    xsize,
+                    self.flat_kernels.as_slice(),
+                    &mut state.col_min,
+                    &mut state.col_max,
+                    &mut state.mins,
+                    &mut state.maxs,
+                    &mut output_rows[0],
+                );
+            }
+            4 => {
+                upsample_4x_simd_dispatch(
+                    input,
+                    xsize,
+                    self.flat_kernels.as_slice(),
+                    &mut state.col_min,
+                    &mut state.col_max,
+                    &mut state.mins,
+                    &mut state.maxs,
+                    &mut output_rows[0],
+                );
+            }
+            8 => {
+                upsample_8x_simd_dispatch(
+                    input,
+                    xsize,
+                    self.flat_kernels.as_slice(),
+                    &mut state.col_min,
+                    &mut state.col_max,
+                    &mut state.mins,
+                    &mut state.maxs,
+                    &mut output_rows[0],
+                );
+            }
+            _ => unreachable!(),
+        }
+    }
+}
+
+pub type Upsample2x = Upsample<2, 1>;
+pub type Upsample4x = Upsample<4, 2>;
+pub type Upsample8x = Upsample<8, 3>;
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::{
+        error::Result, headers::CustomTransformDataNonserialized, image::Image,
+        render::test::make_and_run_simple_pipeline, util::test::assert_almost_abs_eq,
+    };
+    use test_log::test;
+
+    fn ups_factors() -> CustomTransformData {
+        CustomTransformData::default(&CustomTransformDataNonserialized { xyb_encoded: true })
+    }
+
+    #[test]
+    fn upsample2x_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || Upsample2x::new(&ups_factors(), 0),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn upsample4x_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || Upsample4x::new(&ups_factors(), 0),
+            (500, 500),
+            1,
+        )
+    }
+
+    #[test]
+    fn upsample8x_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || Upsample8x::new(&ups_factors(), 0),
+            (504, 504),
+            1,
+        )
+    }
+
+    #[test]
+    fn upsample2x_constant() -> Result<()> {
+        let image_size = (238, 412);
+        let input_size = (image_size.0 / 2, image_size.1 / 2);
+        let val = 0.777f32;
+        let input = Image::new_with_value(input_size, val)?;
+        let stage = Upsample2x::new(&ups_factors(), 0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], image_size, 0, 123)?;
+        for x in 0..image_size.0 {
+            for y in 0..image_size.1 {
+                assert_almost_abs_eq(output[0].row(y)[x], val, 0.0000001);
+            }
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn upsample4x_constant() -> Result<()> {
+        let image_size = (240, 412);
+        let input_size = (image_size.0 / 4, image_size.1 / 4);
+        let val = 0.777f32;
+        let input = Image::new_with_value(input_size, val)?;
+        let stage = Upsample4x::new(&ups_factors(), 0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], image_size, 0, 123)?;
+        for x in 0..image_size.0 {
+            for y in 0..image_size.1 {
+                assert_almost_abs_eq(output[0].row(y)[x], val, 0.00001);
+            }
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn upsample8x_constant() -> Result<()> {
+        let image_size = (240, 416);
+        let input_size = (image_size.0 / 8, image_size.1 / 8);
+        let val = 0.777f32;
+        let input = Image::new_with_value(input_size, val)?;
+        let stage = Upsample8x::new(&ups_factors(), 0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], image_size, 0, 123)?;
+        for x in 0..image_size.0 {
+            for y in 0..image_size.1 {
+                assert_almost_abs_eq(output[0].row(y)[x], val, 0.00001);
+            }
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn test_upsample2() -> Result<()> {
+        let eps = 0.0000001;
+        let mut input = Image::new((7, 7))?;
+        // Put a single "1.0" in the middle of the image.
+        input.row_mut(3)[3] = 1.0f32;
+        let ups_factors = ups_factors();
+        let stage = Upsample2x::new(&ups_factors, 0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], (14, 14), 0, 77)?;
+        assert_eq!(output[0].size(), (14, 14));
+        // Check we have a border with zeros
+        for i in 0..14 {
+            for j in 0..2 {
+                assert_almost_abs_eq(output[0].row(j)[i], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(i)[j], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(13 - j)[i], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(i)[13 - j], 0.0, eps);
+            }
+        }
+        // Define the mapping for the symmetric top-left kernel
+        let index_map = [
+            [0, 1, 2, 3, 4],
+            [1, 5, 6, 7, 8],
+            [2, 6, 9, 10, 11],
+            [3, 7, 10, 12, 13],
+            [4, 8, 11, 13, 14],
+        ];
+
+        // Validate weights from the kernel
+        let kernel_size = 5;
+        let kernel_offset = 2;
+        let weights = &ups_factors.weights2;
+        for di in 0..2 {
+            for dj in 0..2 {
+                for i in 0..kernel_size {
+                    for j in 0..kernel_size {
+                        let output_value =
+                            output[0].row(kernel_offset + di + 2 * i)[kernel_offset + dj + 2 * j];
+                        let mapped_i = if di == 0 { kernel_size - 1 - i } else { i };
+                        let mapped_j = if dj == 0 { kernel_size - 1 - j } else { j };
+                        let weight_index = index_map[mapped_i][mapped_j];
+                        assert_almost_abs_eq(
+                            output_value,
+                            weights[weight_index].clamp(0.0, 1.0),
+                            eps,
+                        );
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_upsample4() -> Result<()> {
+        let eps = 0.0000001;
+        let mut input = Image::new((7, 7))?;
+        // Put a single "1.0" in the middle of the image.
+        input.row_mut(3)[3] = 1.0f32;
+        let ups_factors = ups_factors();
+        let stage = Upsample4x::new(&ups_factors, 0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], (28, 28), 0, 1024)?;
+
+        assert_eq!(output[0].size(), (28, 28));
+
+        // Check we have a border with zeros
+        for i in 0..28 {
+            for j in 0..4 {
+                assert_almost_abs_eq(output[0].row(j)[i], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(i)[j], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(27 - j)[i], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(i)[27 - j], 0.0, eps);
+            }
+        }
+
+        // Define the mapping for the symmetric top-left kernel
+        let index_map = [
+            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+            [1, 10, 11, 12, 13, 14, 15, 16, 17, 18],
+            [2, 11, 19, 20, 21, 22, 23, 24, 25, 26],
+            [3, 12, 20, 27, 28, 29, 30, 31, 32, 33],
+            [4, 13, 21, 28, 34, 35, 36, 37, 38, 39],
+            [5, 14, 22, 29, 35, 40, 41, 42, 43, 44],
+            [6, 15, 23, 30, 36, 41, 45, 46, 47, 48],
+            [7, 16, 24, 31, 37, 42, 46, 49, 50, 51],
+            [8, 17, 25, 32, 38, 43, 47, 50, 52, 53],
+            [9, 18, 26, 33, 39, 44, 48, 51, 53, 54],
+        ];
+
+        // Validate weights from the kernel
+        let kernel_size = 5;
+        let kernel_offset = 4;
+        let weights = &ups_factors.weights4;
+        let row_size = output[0].size().0;
+        let column_size = row_size;
+        for di in 0..4 {
+            for dj in 0..4 {
+                for ki in 0..kernel_size {
+                    for kj in 0..kernel_size {
+                        let i = kernel_size * di + ki;
+                        let j = kernel_size * dj + kj;
+                        let offset_i = kernel_offset + i;
+                        let offset_j = kernel_offset + j;
+                        // Testing symmetry
+                        let output_value = output[0].row(offset_i)[offset_j];
+                        let output_value_mirrored_right =
+                            output[0].row(row_size - offset_i - 1)[offset_j];
+                        let output_value_mirrored_down =
+                            output[0].row(row_size - offset_i - 1)[column_size - offset_j - 1];
+                        let output_value_mirrored_down_right =
+                            output[0].row(row_size - offset_i - 1)[column_size - offset_j - 1];
+
+                        assert_almost_abs_eq(output_value, output_value_mirrored_right, eps);
+                        assert_almost_abs_eq(output_value, output_value_mirrored_down, eps);
+                        assert_almost_abs_eq(output_value, output_value_mirrored_down_right, eps);
+
+                        // Testing if we get the expected weights, appropriately mapped.
+                        let mapped_i = if (i % 4) < 2 {
+                            4 - (i / 4) + (i % 2) * 5
+                        } else {
+                            i / 4 + (1 - (i % 2)) * 5
+                        };
+                        let mapped_j = if (j % 4) < 2 {
+                            4 - (j / 4) + (j % 2) * 5
+                        } else {
+                            j / 4 + (1 - (j % 2)) * 5
+                        };
+                        let weight_index = index_map[mapped_i][mapped_j];
+                        assert_almost_abs_eq(
+                            output_value,
+                            weights[weight_index].clamp(0.0, 1.0),
+                            eps,
+                        );
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_upsample8() -> Result<()> {
+        let eps = 0.0000001;
+        let mut input = Image::new((7, 7))?;
+        // Put a single "1.0" in the middle of the image.
+        input.row_mut(3)[3] = 1.0f32;
+        let ups_factors = ups_factors();
+        let stage = Upsample8x::new(&ups_factors, 0);
+        let output: Vec<Image<f32>> =
+            make_and_run_simple_pipeline(stage, &[input], (56, 56), 0, 1024)?;
+
+        assert_eq!(output[0].size(), (56, 56));
+
+        // Check we have a border with zeros
+        for i in 0..56 {
+            for j in 0..8 {
+                assert_almost_abs_eq(output[0].row(j)[i], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(i)[j], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(55 - j)[i], 0.0, eps);
+                assert_almost_abs_eq(output[0].row(i)[55 - j], 0.0, eps);
+            }
+        }
+
+        // Define the mapping for the symmetric top-left kernel
+        let index_map = [
+            [
+                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
+                0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
+            ],
+            [
+                0x01, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
+                0x21, 0x22, 0x23, 0x24, 0x25, 0x26,
+            ],
+            [
+                0x02, 0x15, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32,
+                0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+            ],
+            [
+                0x03, 0x16, 0x28, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43,
+                0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+            ],
+            [
+                0x04, 0x17, 0x29, 0x3a, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53,
+                0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+            ],
+            [
+                0x05, 0x18, 0x2a, 0x3b, 0x4b, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62,
+                0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+            ],
+            [
+                0x06, 0x19, 0x2b, 0x3c, 0x4c, 0x5b, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
+                0x71, 0x72, 0x73, 0x74, 0x75, 0x76,
+            ],
+            [
+                0x07, 0x1a, 0x2c, 0x3d, 0x4d, 0x5c, 0x6a, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d,
+                0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
+            ],
+            [
+                0x08, 0x1b, 0x2d, 0x3e, 0x4e, 0x5d, 0x6b, 0x78, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+                0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+            ],
+            [
+                0x09, 0x1c, 0x2e, 0x3f, 0x4f, 0x5e, 0x6c, 0x79, 0x85, 0x90, 0x91, 0x92, 0x93, 0x94,
+                0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
+            ],
+            [
+                0x0a, 0x1d, 0x2f, 0x40, 0x50, 0x5f, 0x6d, 0x7a, 0x86, 0x91, 0x9b, 0x9c, 0x9d, 0x9e,
+                0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
+            ],
+            [
+                0x0b, 0x1e, 0x30, 0x41, 0x51, 0x60, 0x6e, 0x7b, 0x87, 0x92, 0x9c, 0xa5, 0xa6, 0xa7,
+                0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad,
+            ],
+            [
+                0x0c, 0x1f, 0x31, 0x42, 0x52, 0x61, 0x6f, 0x7c, 0x88, 0x93, 0x9d, 0xa6, 0xae, 0xaf,
+                0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5,
+            ],
+            [
+                0x0d, 0x20, 0x32, 0x43, 0x53, 0x62, 0x70, 0x7d, 0x89, 0x94, 0x9e, 0xa7, 0xaf, 0xb6,
+                0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc,
+            ],
+            [
+                0x0e, 0x21, 0x33, 0x44, 0x54, 0x63, 0x71, 0x7e, 0x8a, 0x95, 0x9f, 0xa8, 0xb0, 0xb7,
+                0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2,
+            ],
+            [
+                0x0f, 0x22, 0x34, 0x45, 0x55, 0x64, 0x72, 0x7f, 0x8b, 0x96, 0xa0, 0xa9, 0xb1, 0xb8,
+                0xbe, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+            ],
+            [
+                0x10, 0x23, 0x35, 0x46, 0x56, 0x65, 0x73, 0x80, 0x8c, 0x97, 0xa1, 0xaa, 0xb2, 0xb9,
+                0xbf, 0xc4, 0xc8, 0xc9, 0xca, 0xcb,
+            ],
+            [
+                0x11, 0x24, 0x36, 0x47, 0x57, 0x66, 0x74, 0x81, 0x8d, 0x98, 0xa2, 0xab, 0xb3, 0xba,
+                0xc0, 0xc5, 0xc9, 0xcc, 0xcd, 0xce,
+            ],
+            [
+                0x12, 0x25, 0x37, 0x48, 0x58, 0x67, 0x75, 0x82, 0x8e, 0x99, 0xa3, 0xac, 0xb4, 0xbb,
+                0xc1, 0xc6, 0xca, 0xcd, 0xcf, 0xd0,
+            ],
+            [
+                0x13, 0x26, 0x38, 0x49, 0x59, 0x68, 0x76, 0x83, 0x8f, 0x9a, 0xa4, 0xad, 0xb5, 0xbc,
+                0xc2, 0xc7, 0xcb, 0xce, 0xd0, 0xd1,
+            ],
+        ];
+
+        // Validate weights from the kernel
+        let kernel_size = 5;
+        let kernel_offset = 8;
+        let weights = &ups_factors.weights8;
+        let row_size = output[0].size().0;
+        let column_size = row_size;
+        for di in 0..8 {
+            for dj in 0..8 {
+                for ki in 0..kernel_size {
+                    for kj in 0..kernel_size {
+                        let i = kernel_size * di + ki;
+                        let j = kernel_size * dj + kj;
+                        let offset_i = kernel_offset + i;
+                        let offset_j = kernel_offset + j;
+                        // Testing symmetry
+                        let output_value = output[0].row(offset_i)[offset_j];
+                        let output_value_mirrored_right =
+                            output[0].row(row_size - offset_i - 1)[offset_j];
+                        let output_value_mirrored_down =
+                            output[0].row(row_size - offset_i - 1)[column_size - offset_j - 1];
+                        let output_value_mirrored_down_right =
+                            output[0].row(row_size - offset_i - 1)[column_size - offset_j - 1];
+
+                        assert_almost_abs_eq(output_value, output_value_mirrored_right, eps);
+                        assert_almost_abs_eq(output_value, output_value_mirrored_down, eps);
+                        assert_almost_abs_eq(output_value, output_value_mirrored_down_right, eps);
+
+                        // Testing if we get the expected weights, appropriately mapped.
+                        let mapped_i = if (i % 8) < 4 {
+                            4 - (i / 8) + (i % 4) * 5
+                        } else {
+                            i / 8 + (3 - (i % 4)) * 5
+                        };
+                        let mapped_j = if (j % 8) < 4 {
+                            4 - (j / 8) + (j % 4) * 5
+                        } else {
+                            j / 8 + (3 - (j % 4)) * 5
+                        };
+                        let weight_index = index_map[mapped_i][mapped_j];
+                        assert_almost_abs_eq(
+                            output_value,
+                            weights[weight_index].clamp(0.0, 1.0),
+                            eps,
+                        );
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/xyb.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/xyb.rs
new file mode 100644
index 00000000..02589f5a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/xyb.rs
@@ -0,0 +1,683 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::api::{
+    JxlColorEncoding, JxlPrimaries, JxlTransferFunction, JxlWhitePoint, adapt_to_xyz_d50,
+    primaries_to_xyz, primaries_to_xyz_d50,
+};
+use crate::error::Result;
+use crate::headers::{FileHeader, OpsinInverseMatrix};
+use crate::render::stages::from_linear;
+use crate::render::{Channels, ChannelsMut, RenderPipelineInOutStage, RenderPipelineInPlaceStage};
+use crate::util::{Matrix3x3, eval_rational_poly_simd, inv_3x3_matrix, mul_3x3_matrix};
+use jxl_simd::{F32SimdVec, SimdMask, simd_function};
+
+const SRGB_LUMINANCES: [f32; 3] = [0.2126, 0.7152, 0.0722];
+
+#[derive(Clone)]
+pub struct OutputColorInfo {
+    // Luminance of each primary.
+    pub luminances: [f32; 3],
+    pub intensity_target: f32,
+    pub opsin: OpsinInverseMatrix,
+    pub tf: from_linear::TransferFunction,
+}
+
+#[cfg(test)]
+impl Default for OutputColorInfo {
+    fn default() -> Self {
+        use crate::headers::encodings::Empty;
+        Self {
+            luminances: SRGB_LUMINANCES,
+            intensity_target: 255.0,
+            opsin: OpsinInverseMatrix::default(&Empty {}),
+            tf: from_linear::TransferFunction::Srgb,
+        }
+    }
+}
+
+impl OutputColorInfo {
+    fn opsin_matrix_to_matrix3x3(matrix: [f32; 9]) -> Matrix3x3<f64> {
+        [
+            [matrix[0] as f64, matrix[1] as f64, matrix[2] as f64],
+            [matrix[3] as f64, matrix[4] as f64, matrix[5] as f64],
+            [matrix[6] as f64, matrix[7] as f64, matrix[8] as f64],
+        ]
+    }
+
+    fn matrix3x3_to_opsin_matrix(matrix: Matrix3x3<f64>) -> [f32; 9] {
+        [
+            matrix[0][0] as f32,
+            matrix[0][1] as f32,
+            matrix[0][2] as f32,
+            matrix[1][0] as f32,
+            matrix[1][1] as f32,
+            matrix[1][2] as f32,
+            matrix[2][0] as f32,
+            matrix[2][1] as f32,
+            matrix[2][2] as f32,
+        ]
+    }
+
+    pub fn from_header(header: &FileHeader) -> Result<Self> {
+        let srgb_output = OutputColorInfo {
+            luminances: SRGB_LUMINANCES,
+            intensity_target: header.image_metadata.tone_mapping.intensity_target,
+            opsin: header.transform_data.opsin_inverse_matrix.clone(),
+            tf: from_linear::TransferFunction::Srgb,
+        };
+        if header.image_metadata.color_encoding.want_icc {
+            return Ok(srgb_output);
+        }
+
+        let tf;
+        let mut inverse_matrix = Self::opsin_matrix_to_matrix3x3(
+            header.transform_data.opsin_inverse_matrix.inverse_matrix,
+        );
+        let mut luminances = SRGB_LUMINANCES;
+        let desired_colorspace =
+            JxlColorEncoding::from_internal(&header.image_metadata.color_encoding)?;
+        match &desired_colorspace {
+            JxlColorEncoding::XYB { .. } => {
+                return Ok(srgb_output);
+            }
+            JxlColorEncoding::RgbColorSpace {
+                white_point,
+                primaries,
+                transfer_function,
+                ..
+            } => {
+                tf = transfer_function;
+                if *primaries != JxlPrimaries::SRGB || *white_point != JxlWhitePoint::D65 {
+                    let [r, g, b] = JxlPrimaries::SRGB.to_xy_coords();
+                    let w = JxlWhitePoint::D65.to_xy_coords();
+                    let srgb_to_xyzd50 =
+                        primaries_to_xyz_d50(r.0, r.1, g.0, g.1, b.0, b.1, w.0, w.1)?;
+                    let [r, g, b] = primaries.to_xy_coords();
+                    let w = white_point.to_xy_coords();
+                    let original_to_xyz = primaries_to_xyz(r.0, r.1, g.0, g.1, b.0, b.1, w.0, w.1)?;
+                    luminances = original_to_xyz[1].map(|lum| lum as f32);
+                    let adapt_to_d50 = adapt_to_xyz_d50(w.0, w.1)?;
+                    let original_to_xyzd50 = mul_3x3_matrix(&adapt_to_d50, &original_to_xyz);
+                    let xyzd50_to_original = inv_3x3_matrix(&original_to_xyzd50)?;
+                    let srgb_to_original = mul_3x3_matrix(&xyzd50_to_original, &srgb_to_xyzd50);
+                    inverse_matrix = mul_3x3_matrix(&srgb_to_original, &inverse_matrix);
+                }
+            }
+
+            JxlColorEncoding::GrayscaleColorSpace {
+                transfer_function, ..
+            } => {
+                tf = transfer_function;
+                let f64_luminances = luminances.map(|lum| lum as f64);
+                let srgb_to_luminance: Matrix3x3<f64> =
+                    [f64_luminances, f64_luminances, f64_luminances];
+                inverse_matrix = mul_3x3_matrix(&srgb_to_luminance, &inverse_matrix);
+            }
+        }
+
+        let mut opsin = header.transform_data.opsin_inverse_matrix.clone();
+        opsin.inverse_matrix = Self::matrix3x3_to_opsin_matrix(inverse_matrix);
+        let intensity_target = header.image_metadata.tone_mapping.intensity_target;
+        let from_linear_tf = match tf {
+            JxlTransferFunction::PQ => from_linear::TransferFunction::Pq { intensity_target },
+            JxlTransferFunction::HLG => from_linear::TransferFunction::Hlg {
+                intensity_target,
+                luminance_rgb: luminances,
+            },
+            JxlTransferFunction::BT709 => from_linear::TransferFunction::Bt709,
+            JxlTransferFunction::Linear => from_linear::TransferFunction::Gamma(1.0),
+            JxlTransferFunction::SRGB => from_linear::TransferFunction::Srgb,
+            JxlTransferFunction::DCI => from_linear::TransferFunction::Gamma(2.6_f32.recip()),
+            JxlTransferFunction::Gamma(g) => from_linear::TransferFunction::Gamma(*g),
+        };
+        Ok(OutputColorInfo {
+            luminances,
+            intensity_target,
+            opsin,
+            tf: from_linear_tf,
+        })
+    }
+}
+
+/// Convert XYB to linear RGB with appropriate primaries, where 1.0 corresponds to `intensity_target` nits.
+pub struct XybStage {
+    first_channel: usize,
+    output_color_info: OutputColorInfo,
+}
+
+impl XybStage {
+    pub fn new(first_channel: usize, output_color_info: OutputColorInfo) -> Self {
+        Self {
+            first_channel,
+            output_color_info,
+        }
+    }
+}
+
+impl std::fmt::Display for XybStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let channel = self.first_channel;
+        write!(
+            f,
+            "XYB to linear for channel [{},{},{}]",
+            channel,
+            channel + 1,
+            channel + 2
+        )
+    }
+}
+
+simd_function!(
+    xyb_process_dispatch,
+    d: D,
+    fn xyb_process(
+        opsin: &OpsinInverseMatrix,
+        intensity_target: f32,
+        xsize: usize,
+        row_x: &mut [f32],
+        row_y: &mut [f32],
+        row_b: &mut [f32],
+    ) {
+        let OpsinInverseMatrix {
+            inverse_matrix: mat,
+            opsin_biases: bias,
+            ..
+        } = opsin;
+        // TODO(veluca): consider computing the cbrt in advance.
+        let bias_cbrt = bias.map(|x| D::F32Vec::splat(d, x.cbrt()));
+        let intensity_scale = 255.0 / intensity_target;
+        let scaled_bias = bias.map(|x| D::F32Vec::splat(d, x * intensity_scale));
+        let mat = mat.map(|x| D::F32Vec::splat(d, x));
+        let intensity_scale = D::F32Vec::splat(d, intensity_scale);
+
+        // Pre-loop assertions: prove row lengths so LLVM can eliminate bounds checks.
+        assert!(row_x.len() >= xsize);
+        assert!(row_y.len() >= xsize);
+        assert!(row_b.len() >= xsize);
+
+        for idx in (0..xsize).step_by(D::F32Vec::LEN) {
+            let x = D::F32Vec::load_from(d, row_x, idx);
+            let y = D::F32Vec::load_from(d, row_y, idx);
+            let b = D::F32Vec::load_from(d, row_b, idx);
+
+            // Mix and apply bias
+            let l = y + x - bias_cbrt[0];
+            let m = y - x - bias_cbrt[1];
+            let s = b - bias_cbrt[2];
+
+            // Apply biased inverse gamma and scale (1.0 corresponds to `intensity_target` nits)
+            let l2 = l * l;
+            let m2 = m * m;
+            let s2 = s * s;
+            let scaled_l = l * intensity_scale;
+            let scaled_m = m * intensity_scale;
+            let scaled_s = s * intensity_scale;
+            let l = l2.mul_add(scaled_l, scaled_bias[0]);
+            let m = m2.mul_add(scaled_m, scaled_bias[1]);
+            let s = s2.mul_add(scaled_s, scaled_bias[2]);
+
+            // Apply opsin inverse matrix (linear LMS to linear sRGB)
+            let r = mat[0].mul_add(l, mat[1].mul_add(m, mat[2] * s));
+            let g = mat[3].mul_add(l, mat[4].mul_add(m, mat[5] * s));
+            let b = mat[6].mul_add(l, mat[7].mul_add(m, mat[8] * s));
+            r.store_at(row_x, idx);
+            g.store_at(row_y, idx);
+            b.store_at(row_b, idx);
+        }
+    }
+);
+
+impl RenderPipelineInPlaceStage for XybStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let [row_x, row_y, row_b] = row else {
+            panic!(
+                "incorrect number of channels; expected 3, found {}",
+                row.len()
+            );
+        };
+
+        xyb_process_dispatch(
+            &self.output_color_info.opsin,
+            self.output_color_info.intensity_target,
+            xsize,
+            row_x,
+            row_y,
+            row_b,
+        );
+    }
+}
+
+/// Fused XYB inverse + transfer function + u8 conversion in a single SIMD pass.
+/// Supports sRGB and gamma transfer functions. Eliminates intermediate f32 buffer
+/// writes between the three separate stages (XYB, TF, u8 conversion).
+pub struct XybToU8Stage {
+    first_channel: usize,
+    output_color_info: OutputColorInfo,
+    bit_depth: u8,
+    tf: super::from_linear::TransferFunction,
+}
+
+impl XybToU8Stage {
+    pub fn new(
+        first_channel: usize,
+        output_color_info: OutputColorInfo,
+        bit_depth: u8,
+        tf: super::from_linear::TransferFunction,
+    ) -> Self {
+        Self {
+            first_channel,
+            output_color_info,
+            bit_depth,
+            tf,
+        }
+    }
+}
+
+impl std::fmt::Display for XybToU8Stage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let c = self.first_channel;
+        write!(
+            f,
+            "Fused XYB→{:?}→U{} for channels [{},{},{}]",
+            self.tf,
+            self.bit_depth,
+            c,
+            c + 1,
+            c + 2,
+        )
+    }
+}
+
+/// Common XYB inverse that produces linear RGB values for three channels.
+/// Returns (r_lin, g_lin, b_lin) SIMD vectors.
+#[allow(clippy::too_many_arguments)]
+#[inline(always)]
+fn xyb_inverse<D: jxl_simd::SimdDescriptor>(
+    _d: D,
+    x: D::F32Vec,
+    y: D::F32Vec,
+    b: D::F32Vec,
+    bias_cbrt: &[D::F32Vec; 3],
+    intensity_scale: D::F32Vec,
+    scaled_bias: &[D::F32Vec; 3],
+    mat: &[D::F32Vec; 9],
+) -> (D::F32Vec, D::F32Vec, D::F32Vec) {
+    let l = y + x - bias_cbrt[0];
+    let m = y - x - bias_cbrt[1];
+    let s = b - bias_cbrt[2];
+
+    let l2 = l * l;
+    let m2 = m * m;
+    let s2 = s * s;
+    let scaled_l = l * intensity_scale;
+    let scaled_m = m * intensity_scale;
+    let scaled_s = s * intensity_scale;
+    let l = l2.mul_add(scaled_l, scaled_bias[0]);
+    let m = m2.mul_add(scaled_m, scaled_bias[1]);
+    let s = s2.mul_add(scaled_s, scaled_bias[2]);
+
+    let r_lin = mat[0].mul_add(l, mat[1].mul_add(m, mat[2] * s));
+    let g_lin = mat[3].mul_add(l, mat[4].mul_add(m, mat[5] * s));
+    let b_lin = mat[6].mul_add(l, mat[7].mul_add(m, mat[8] * s));
+    (r_lin, g_lin, b_lin)
+}
+
+simd_function!(
+    xyb_to_srgb_u8_dispatch,
+    d: D,
+    fn xyb_to_srgb_u8_process(
+        opsin: &OpsinInverseMatrix,
+        intensity_target: f32,
+        max_val: f32,
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u8>,
+    ) {
+        let OpsinInverseMatrix {
+            inverse_matrix: mat,
+            opsin_biases: bias,
+            ..
+        } = opsin;
+
+        let bias_cbrt = bias.map(|x| D::F32Vec::splat(d, x.cbrt()));
+        let intensity_scale_f = 255.0 / intensity_target;
+        let scaled_bias = bias.map(|x| D::F32Vec::splat(d, x * intensity_scale_f));
+        let mat = mat.map(|x| D::F32Vec::splat(d, x));
+        let intensity_scale = D::F32Vec::splat(d, intensity_scale_f);
+
+        #[allow(clippy::excessive_precision)]
+        const P: [f32; 5] = [
+            -5.135152395e-4,
+            5.287254571e-3,
+            3.903842876e-1,
+            1.474205315,
+            7.352629620e-1,
+        ];
+        #[allow(clippy::excessive_precision)]
+        const Q: [f32; 5] = [
+            1.004519624e-2,
+            3.036675394e-1,
+            1.340816930,
+            9.258482155e-1,
+            2.424867759e-2,
+        ];
+        let zero = D::F32Vec::splat(d, 0.0);
+        let one = D::F32Vec::splat(d, 1.0);
+        let scale = D::F32Vec::splat(d, max_val);
+        let threshold = D::F32Vec::splat(d, 0.0031308);
+        let linear_scale = D::F32Vec::splat(d, 12.92);
+
+        let in_x = input_rows[0][0];
+        let in_y = input_rows[1][0];
+        let in_b = input_rows[2][0];
+        let (out_r, out_g, out_b) = output_rows.split_first_3_mut();
+
+        let end = xsize.next_multiple_of(D::F32Vec::LEN);
+        // Pre-loop assertions: prove row lengths so LLVM can eliminate bounds checks.
+        assert!(in_x.len() >= end);
+        assert!(in_y.len() >= end);
+        assert!(in_b.len() >= end);
+        assert!(out_r[0].len() >= end);
+        assert!(out_g[0].len() >= end);
+        assert!(out_b[0].len() >= end);
+
+        for idx in (0..end).step_by(D::F32Vec::LEN) {
+            let x = D::F32Vec::load_from(d, in_x, idx);
+            let y = D::F32Vec::load_from(d, in_y, idx);
+            let b = D::F32Vec::load_from(d, in_b, idx);
+
+            let (r_lin, g_lin, b_lin) = xyb_inverse(
+                d, x, y, b, &bias_cbrt, intensity_scale, &scaled_bias, &mat,
+            );
+
+            // sRGB TF + u8 quantize
+            let r_c = r_lin.max(zero).min(one);
+            let r_srgb = threshold.gt(r_c).if_then_else_f32(
+                r_c * linear_scale,
+                eval_rational_poly_simd(d, r_c.sqrt(), P, Q),
+            );
+            (r_srgb * scale).round_store_u8(&mut out_r[0][idx..]);
+
+            let g_c = g_lin.max(zero).min(one);
+            let g_srgb = threshold.gt(g_c).if_then_else_f32(
+                g_c * linear_scale,
+                eval_rational_poly_simd(d, g_c.sqrt(), P, Q),
+            );
+            (g_srgb * scale).round_store_u8(&mut out_g[0][idx..]);
+
+            let b_c = b_lin.max(zero).min(one);
+            let b_srgb = threshold.gt(b_c).if_then_else_f32(
+                b_c * linear_scale,
+                eval_rational_poly_simd(d, b_c.sqrt(), P, Q),
+            );
+            (b_srgb * scale).round_store_u8(&mut out_b[0][idx..]);
+        }
+    }
+);
+
+simd_function!(
+    xyb_to_gamma_u8_dispatch,
+    d: D,
+    fn xyb_to_gamma_u8_process(
+        opsin: &OpsinInverseMatrix,
+        gamma_params: &[f32; 3],
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u8>,
+    ) {
+        let [intensity_target, gamma, max_val] = *gamma_params;
+        let OpsinInverseMatrix {
+            inverse_matrix: mat,
+            opsin_biases: bias,
+            ..
+        } = opsin;
+
+        let bias_cbrt = bias.map(|x| D::F32Vec::splat(d, x.cbrt()));
+        let intensity_scale_f = 255.0 / intensity_target;
+        let scaled_bias = bias.map(|x| D::F32Vec::splat(d, x * intensity_scale_f));
+        let mat = mat.map(|x| D::F32Vec::splat(d, x));
+        let intensity_scale = D::F32Vec::splat(d, intensity_scale_f);
+
+        let zero = D::F32Vec::splat(d, 0.0);
+        let scale = D::F32Vec::splat(d, max_val);
+        let gamma_vec = D::F32Vec::splat(d, gamma);
+
+        let in_x = input_rows[0][0];
+        let in_y = input_rows[1][0];
+        let in_b = input_rows[2][0];
+        let (out_r, out_g, out_b) = output_rows.split_first_3_mut();
+
+        let end = xsize.next_multiple_of(D::F32Vec::LEN);
+        // Pre-loop assertions: prove row lengths so LLVM can eliminate bounds checks.
+        assert!(in_x.len() >= end);
+        assert!(in_y.len() >= end);
+        assert!(in_b.len() >= end);
+        assert!(out_r[0].len() >= end);
+        assert!(out_g[0].len() >= end);
+        assert!(out_b[0].len() >= end);
+
+        for idx in (0..end).step_by(D::F32Vec::LEN) {
+            let x = D::F32Vec::load_from(d, in_x, idx);
+            let y = D::F32Vec::load_from(d, in_y, idx);
+            let b = D::F32Vec::load_from(d, in_b, idx);
+
+            let (r_lin, g_lin, b_lin) = xyb_inverse(
+                d, x, y, b, &bias_cbrt, intensity_scale, &scaled_bias, &mat,
+            );
+
+            // Gamma TF + u8 quantize: powf(abs(x), gamma) * copysign(1, x)
+            let r_abs = r_lin.abs().max(zero);
+            let r_tf = crate::util::fast_powf_simd(d, r_abs, gamma_vec).copysign(r_lin);
+            (r_tf * scale).round_store_u8(&mut out_r[0][idx..]);
+
+            let g_abs = g_lin.abs().max(zero);
+            let g_tf = crate::util::fast_powf_simd(d, g_abs, gamma_vec).copysign(g_lin);
+            (g_tf * scale).round_store_u8(&mut out_g[0][idx..]);
+
+            let b_abs = b_lin.abs().max(zero);
+            let b_tf = crate::util::fast_powf_simd(d, b_abs, gamma_vec).copysign(b_lin);
+            (b_tf * scale).round_store_u8(&mut out_b[0][idx..]);
+        }
+    }
+);
+
+impl RenderPipelineInOutStage for XybToU8Stage {
+    type InputT = f32;
+    type OutputT = u8;
+    const SHIFT: (u8, u8) = (0, 0);
+    const BORDER: (u8, u8) = (0, 0);
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        input_rows: &Channels<f32>,
+        output_rows: &mut ChannelsMut<u8>,
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        let max_val = ((1u32 << self.bit_depth) - 1) as f32;
+        match self.tf {
+            super::from_linear::TransferFunction::Srgb => {
+                xyb_to_srgb_u8_dispatch(
+                    &self.output_color_info.opsin,
+                    self.output_color_info.intensity_target,
+                    max_val,
+                    xsize,
+                    input_rows,
+                    output_rows,
+                );
+            }
+            super::from_linear::TransferFunction::Gamma(gamma) => {
+                xyb_to_gamma_u8_dispatch(
+                    &self.output_color_info.opsin,
+                    &[self.output_color_info.intensity_target, gamma, max_val],
+                    xsize,
+                    input_rows,
+                    output_rows,
+                );
+            }
+            _ => unreachable!("XybToU8Stage only supports Srgb and Gamma TFs"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::headers::encodings::Empty;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::round_up_size_to_cache_line;
+    use crate::util::test::assert_all_almost_abs_eq;
+    use jxl_simd::{ScalarDescriptor, SimdDescriptor, test_all_instruction_sets};
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || XybStage::new(0, OutputColorInfo::default()),
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn srgb_primaries() -> Result<()> {
+        let mut input_x = Image::new((3, 1))?;
+        let mut input_y = Image::new((3, 1))?;
+        let mut input_b = Image::new((3, 1))?;
+        input_x
+            .row_mut(0)
+            .copy_from_slice(&[0.028100073, -0.015386105, 0.0]);
+        input_y
+            .row_mut(0)
+            .copy_from_slice(&[0.4881882, 0.71478134, 0.2781282]);
+        input_b
+            .row_mut(0)
+            .copy_from_slice(&[0.471659, 0.43707693, 0.66613984]);
+
+        let stage = XybStage::new(0, OutputColorInfo::default());
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_x, input_y, input_b], (3, 1), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[1.0, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.0, 1.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.0, 0.0, 1.0], 1e-6);
+
+        Ok(())
+    }
+
+    fn xyb_process_scalar_equivalent<D: SimdDescriptor>(d: D) {
+        let opsin = OpsinInverseMatrix::default(&Empty {});
+        arbtest::arbtest(|u| {
+            let xsize = u.arbitrary_len::<usize>()?;
+            let intensity_target = u.arbitrary::<u8>()? as f32 * 2.0 + 1.0;
+            let mut row_x = vec![0.0; round_up_size_to_cache_line::<f32>(xsize)];
+            let mut row_y = vec![0.0; round_up_size_to_cache_line::<f32>(xsize)];
+            let mut row_b = vec![0.0; round_up_size_to_cache_line::<f32>(xsize)];
+
+            for i in 0..xsize {
+                row_x[i] = u.arbitrary::<i16>()? as f32 * (0.07 / i16::MAX as f32);
+                row_y[i] = u.arbitrary::<u16>()? as f32 * (1.0 / u16::MAX as f32);
+                row_b[i] = u.arbitrary::<u16>()? as f32 * (1.0 / u16::MAX as f32);
+            }
+
+            let mut scalar_x = row_x.clone();
+            let mut scalar_y = row_y.clone();
+            let mut scalar_b = row_b.clone();
+
+            xyb_process(
+                d,
+                &opsin,
+                intensity_target,
+                xsize,
+                &mut row_x,
+                &mut row_y,
+                &mut row_b,
+            );
+
+            xyb_process(
+                ScalarDescriptor::new().unwrap(),
+                &opsin,
+                intensity_target,
+                xsize,
+                &mut scalar_x,
+                &mut scalar_y,
+                &mut scalar_b,
+            );
+
+            for i in 0..xsize {
+                for (simd, scalar) in [
+                    (row_x[i], scalar_x[i]),
+                    (row_y[i], scalar_y[i]),
+                    (row_b[i], scalar_b[i]),
+                ] {
+                    let abs = (simd - scalar).abs();
+                    let max = simd.abs().max(scalar.abs());
+                    let rel = abs / max;
+                    assert!(
+                        abs < 1e-3 || rel < 1e-3,
+                        "simd {simd}, scalar {scalar}, abs {abs:?} rel {rel:?}",
+                    );
+                }
+            }
+
+            Ok(())
+        });
+    }
+
+    test_all_instruction_sets!(xyb_process_scalar_equivalent);
+
+    #[test]
+    fn fused_xyb_srgb_u8_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || {
+                XybToU8Stage::new(
+                    0,
+                    OutputColorInfo::default(),
+                    8,
+                    super::super::from_linear::TransferFunction::Srgb,
+                )
+            },
+            (500, 500),
+            3,
+        )
+    }
+
+    #[test]
+    fn fused_xyb_gamma_u8_consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(
+            || {
+                XybToU8Stage::new(
+                    0,
+                    OutputColorInfo::default(),
+                    8,
+                    super::super::from_linear::TransferFunction::Gamma(0.454545),
+                )
+            },
+            (500, 500),
+            3,
+        )
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/ycbcr.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/ycbcr.rs
new file mode 100644
index 00000000..3bedb942
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/stages/ycbcr.rs
@@ -0,0 +1,153 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::render::RenderPipelineInPlaceStage;
+use jxl_simd::{F32SimdVec, simd_function};
+
+/// Convert YCbCr to RGB
+pub struct YcbcrToRgbStage {
+    first_channel: usize,
+}
+
+impl YcbcrToRgbStage {
+    pub fn new(first_channel: usize) -> Self {
+        Self { first_channel }
+    }
+}
+
+impl std::fmt::Display for YcbcrToRgbStage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let channel = self.first_channel;
+        write!(
+            f,
+            "YCbCr to RGB for channel [{},{},{}]",
+            channel,
+            channel + 1,
+            channel + 2
+        )
+    }
+}
+
+// SIMD YCbCr to RGB conversion
+simd_function!(
+    ycbcr_to_rgb_simd_dispatch,
+    d: D,
+    fn ycbcr_to_rgb_simd(
+        row_cb: &mut [f32],
+        row_y: &mut [f32],
+        row_cr: &mut [f32],
+        xsize: usize,
+    ) {
+        // Precompute constants as SIMD vectors
+        let c128 = D::F32Vec::splat(d, 128.0 / 255.0);
+        let cr_to_r = D::F32Vec::splat(d, 1.402);
+        let cr_to_g = D::F32Vec::splat(d, -0.299 * 1.402 / 0.587);
+        let cb_to_g = D::F32Vec::splat(d, -0.114 * 1.772 / 0.587);
+        let cb_to_b = D::F32Vec::splat(d, 1.772);
+
+        // SIMD loop processing SIMD_WIDTH pixels at once
+        let iter_cb = row_cb.chunks_exact_mut(D::F32Vec::LEN);
+        let iter_y = row_y.chunks_exact_mut(D::F32Vec::LEN);
+        let iter_cr = row_cr.chunks_exact_mut(D::F32Vec::LEN);
+        for ((cb_chunk, y_chunk), cr_chunk) in iter_cb
+            .zip(iter_y)
+            .zip(iter_cr)
+            .take(xsize.div_ceil(D::F32Vec::LEN))
+        {
+            // Load Y, Cb, Cr vectors
+            let y_vec = D::F32Vec::load(d, y_chunk) + c128;
+            let cb_vec = D::F32Vec::load(d, cb_chunk);
+            let cr_vec = D::F32Vec::load(d, cr_chunk);
+
+            // Compute RGB using FMA (fused multiply-add)
+            // R = Y + 1.402 * Cr
+            let r_vec = cr_vec.mul_add(cr_to_r, y_vec);
+
+            // G = Y - 0.299*1.402/0.587 * Cr - 0.114*1.772/0.587 * Cb
+            let g_vec = cr_vec.mul_add(cr_to_g, cb_vec.mul_add(cb_to_g, y_vec));
+
+            // B = Y + 1.772 * Cb
+            let b_vec = cb_vec.mul_add(cb_to_b, y_vec);
+
+            // Store back to channels (R→Cb, G→Y, B→Cr to match layout)
+            r_vec.store(cb_chunk);
+            g_vec.store(y_chunk);
+            b_vec.store(cr_chunk);
+        }
+    }
+);
+
+impl RenderPipelineInPlaceStage for YcbcrToRgbStage {
+    type Type = f32;
+
+    fn uses_channel(&self, c: usize) -> bool {
+        (self.first_channel..self.first_channel + 3).contains(&c)
+    }
+
+    fn process_row_chunk(
+        &self,
+        _position: (usize, usize),
+        xsize: usize,
+        row: &mut [&mut [f32]],
+        _state: Option<&mut (dyn std::any::Any + Send)>,
+    ) {
+        // pixels are stored in `Cb Y Cr` order to mimic XYB colorspace
+        let [row_cb, row_y, row_cr] = row else {
+            panic!(
+                "incorrect number of channels; expected 3, found {}",
+                row.len()
+            );
+        };
+
+        assert!(xsize <= row_cb.len() && xsize <= row_y.len() && xsize <= row_cr.len());
+
+        // Use SIMD for YCbCr to RGB conversion
+        // Full-range BT.601 as defined by JFIF Clause 7:
+        // https://www.itu.int/rec/T-REC-T.871-201105-I/en
+        ycbcr_to_rgb_simd_dispatch(row_cb, row_y, row_cr, xsize);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use super::*;
+    use crate::error::Result;
+    use crate::image::Image;
+    use crate::render::test::make_and_run_simple_pipeline;
+    use crate::util::test::assert_all_almost_abs_eq;
+
+    #[test]
+    fn consistency() -> Result<()> {
+        crate::render::test::test_stage_consistency(|| YcbcrToRgbStage::new(0), (500, 500), 3)
+    }
+
+    #[test]
+    fn srgb_primaries() -> Result<()> {
+        let mut input_y = Image::new((3, 1))?;
+        let mut input_cb = Image::new((3, 1))?;
+        let mut input_cr = Image::new((3, 1))?;
+        input_y
+            .row_mut(0)
+            .copy_from_slice(&[-0.20296079, 0.08503921, -0.3879608]);
+        input_cb
+            .row_mut(0)
+            .copy_from_slice(&[-0.16873589, -0.3312641, 0.5]);
+        input_cr
+            .row_mut(0)
+            .copy_from_slice(&[0.5, -0.41868758, -0.08131241]);
+
+        let stage = YcbcrToRgbStage::new(0);
+        let output =
+            make_and_run_simple_pipeline(stage, &[input_cb, input_y, input_cr], (3, 1), 0, 256)?;
+
+        assert_all_almost_abs_eq(output[0].row(0), &[1.0, 0.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[1].row(0), &[0.0, 1.0, 0.0], 1e-6);
+        assert_all_almost_abs_eq(output[2].row(0), &[0.0, 0.0, 1.0], 1e-6);
+
+        Ok(())
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/render/test.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/test.rs
new file mode 100644
index 00000000..77797bc4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/render/test.rs
@@ -0,0 +1,241 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::{
+    api::{Endianness, JxlColorType, JxlDataFormat, JxlOutputBuffer},
+    error::Result,
+    headers::Orientation,
+    image::{DataTypeTag, Image, ImageDataType, Rect},
+    render::{SimpleRenderPipeline, buffer_splitter::BufferSplitter},
+    util::{
+        ShiftRightCeil,
+        test::check_equal_images,
+        tracing_wrappers::{instrument, trace},
+    },
+};
+use rand::SeedableRng;
+
+use super::{
+    RenderPipeline, RenderPipelineBuilder, RenderPipelineInOutStage, RenderPipelineInPlaceStage,
+    internal::Stage, stages::ExtendToImageDimensionsStage,
+};
+
+pub(super) trait RenderPipelineTestableStage<V> {
+    type InputT: ImageDataType;
+    type OutputT: ImageDataType;
+    fn into_stage(self) -> Stage<Image<f64>>;
+}
+
+impl RenderPipelineTestableStage<()> for ExtendToImageDimensionsStage {
+    type InputT = f32;
+    type OutputT = f32;
+    fn into_stage(self) -> Stage<Image<f64>> {
+        Stage::Extend(self)
+    }
+}
+
+impl<T: RenderPipelineInOutStage> RenderPipelineTestableStage<()> for T {
+    type InputT = T::InputT;
+    type OutputT = T::OutputT;
+    fn into_stage(self) -> Stage<Image<f64>> {
+        Stage::InOut(Box::new(self))
+    }
+}
+
+pub(super) struct Empty {}
+
+impl<T: RenderPipelineInPlaceStage> RenderPipelineTestableStage<Empty> for T {
+    type InputT = T::Type;
+    type OutputT = T::Type;
+    fn into_stage(self) -> Stage<Image<f64>> {
+        Stage::InPlace(Box::new(self))
+    }
+}
+
+fn extract_group_rect<T: ImageDataType>(
+    image: &Image<T>,
+    group_id: usize,
+    log_group_size: (usize, usize),
+) -> Result<Image<T>> {
+    let xgroups = image.size().0.shrc(log_group_size.0);
+    let group = (group_id % xgroups, group_id / xgroups);
+    let origin = (group.0 << log_group_size.0, group.1 << log_group_size.1);
+    let size = (
+        (image.size().0 - origin.0).min(1 << log_group_size.0),
+        (image.size().1 - origin.1).min(1 << log_group_size.1),
+    );
+    trace!(
+        "making rect {}x{}+{}+{} for group {group_id} in image of size {:?}, log group sizes {:?}",
+        size.0,
+        size.1,
+        origin.0,
+        origin.1,
+        image.size(),
+        log_group_size
+    );
+    let rect = image.get_rect(Rect { origin, size });
+    let mut out = Image::new(rect.size()).unwrap();
+    for y in 0..out.size().1 {
+        out.row_mut(y).copy_from_slice(rect.row(y));
+    }
+    Ok(out)
+}
+
+fn make_and_run_simple_pipeline_impl<InputT: ImageDataType, OutputT: ImageDataType>(
+    stage: Stage<Image<f64>>,
+    input_images: &[Image<InputT>],
+    image_size: (usize, usize),
+    downsampling_shift: usize,
+    chunk_size: usize,
+) -> Result<Vec<Image<OutputT>>> {
+    let shift = stage.shift();
+    let final_size = stage.new_size(image_size);
+    const LOG_GROUP_SIZE: usize = 8;
+    let all_channels = (0..input_images.len()).collect::<Vec<_>>();
+    let uses_channel: Vec<_> = all_channels
+        .iter()
+        .map(|x| stage.uses_channel(*x))
+        .collect();
+    let mut pipeline = RenderPipelineBuilder::<SimpleRenderPipeline>::new_with_chunk_size(
+        input_images.len(),
+        image_size,
+        downsampling_shift,
+        LOG_GROUP_SIZE,
+        chunk_size,
+    )
+    .add_stage_internal(stage);
+
+    let jxl_data_type = match OutputT::DATA_TYPE_ID {
+        DataTypeTag::U8 | DataTypeTag::I8 => JxlDataFormat::U8 { bit_depth: 8 },
+        DataTypeTag::U16 | DataTypeTag::I16 => JxlDataFormat::U16 {
+            bit_depth: 16,
+            endianness: Endianness::native(),
+        },
+        DataTypeTag::F32 => JxlDataFormat::f32(),
+        DataTypeTag::F16 => JxlDataFormat::F16 {
+            endianness: Endianness::native(),
+        },
+        _ => unimplemented!("unsupported data type"),
+    };
+
+    for i in 0..input_images.len() {
+        pipeline = pipeline.add_save_stage(
+            &[i],
+            Orientation::Identity,
+            i,
+            JxlColorType::Grayscale,
+            jxl_data_type,
+            false,
+        );
+    }
+    let mut pipeline = pipeline.build()?;
+
+    let num_groups = image_size.0.shrc(LOG_GROUP_SIZE) * image_size.1.shrc(LOG_GROUP_SIZE);
+
+    let mut outputs = (0..input_images.len())
+        .map(|_| Image::<OutputT>::new(final_size))
+        .collect::<Result<Vec<_>, _>>()?;
+
+    let mut buf_ptrs: Vec<_> = outputs
+        .iter_mut()
+        .map(|x| {
+            let size = x.size();
+            Some(JxlOutputBuffer::from_image_rect_mut(
+                x.get_rect_mut(Rect {
+                    size,
+                    origin: (0, 0),
+                })
+                .into_raw(),
+            ))
+        })
+        .collect();
+
+    let mut buffer_splitter = BufferSplitter::new(&mut buf_ptrs);
+
+    for g in 0..num_groups {
+        for &c in all_channels.iter() {
+            let log_group_size = if uses_channel[c] {
+                (
+                    LOG_GROUP_SIZE - shift.0 as usize,
+                    LOG_GROUP_SIZE - shift.1 as usize,
+                )
+            } else {
+                (LOG_GROUP_SIZE, LOG_GROUP_SIZE)
+            };
+            pipeline.set_buffer_for_group(
+                c,
+                g,
+                true,
+                extract_group_rect(&input_images[c], g, log_group_size)?,
+                &mut buffer_splitter,
+            )?;
+        }
+    }
+
+    Ok(outputs)
+}
+
+pub(super) fn make_and_run_simple_pipeline<S: RenderPipelineTestableStage<V>, V>(
+    stage: S,
+    input_images: &[Image<S::InputT>],
+    image_size: (usize, usize),
+    downsampling_shift: usize,
+    chunk_size: usize,
+) -> Result<Vec<Image<S::OutputT>>> {
+    make_and_run_simple_pipeline_impl(
+        stage.into_stage(),
+        input_images,
+        image_size,
+        downsampling_shift,
+        chunk_size,
+    )
+}
+
+#[instrument(skip(make_stage), err)]
+pub(super) fn test_stage_consistency<S: RenderPipelineTestableStage<V>, V>(
+    make_stage: impl Fn() -> S,
+    image_size: (usize, usize),
+    num_image_channels: usize,
+) -> Result<()> {
+    let mut rng = rand_xorshift::XorShiftRng::seed_from_u64(0);
+    let stage = make_stage().into_stage();
+    let images: Result<Vec<_>> = (0..num_image_channels)
+        .map(|c| {
+            let size = if stage.uses_channel(c) {
+                (
+                    image_size.0.shrc(stage.shift().0),
+                    image_size.1.shrc(stage.shift().1),
+                )
+            } else {
+                image_size
+            };
+            Image::new_random(size, &mut rng)
+        })
+        .collect();
+    let images = images?;
+
+    let base_output = make_and_run_simple_pipeline_impl::<S::InputT, S::OutputT>(
+        stage, &images, image_size, 0, 256,
+    )?;
+
+    arbtest::arbtest(move |p| {
+        let chunk_size = p.arbitrary::<u16>()?.saturating_add(1) as usize;
+        let output = make_and_run_simple_pipeline_impl::<S::InputT, S::OutputT>(
+            make_stage().into_stage(),
+            &images,
+            image_size,
+            0,
+            chunk_size,
+        )
+        .unwrap_or_else(|_| panic!("error running pipeline with chunk size {chunk_size}"));
+
+        for (o, bo) in output.iter().zip(base_output.iter()) {
+            check_equal_images(bo, o);
+        }
+
+        Ok(())
+    });
+    Ok(())
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct16.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct16.rs
new file mode 100644
index 00000000..9eea4962
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct16.rs
@@ -0,0 +1,355 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(unused)]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn idct_16<D: SimdDescriptor>(
+    d: D,
+    mut v0: D::F32Vec,
+    mut v1: D::F32Vec,
+    mut v2: D::F32Vec,
+    mut v3: D::F32Vec,
+    mut v4: D::F32Vec,
+    mut v5: D::F32Vec,
+    mut v6: D::F32Vec,
+    mut v7: D::F32Vec,
+    mut v8: D::F32Vec,
+    mut v9: D::F32Vec,
+    mut v10: D::F32Vec,
+    mut v11: D::F32Vec,
+    mut v12: D::F32Vec,
+    mut v13: D::F32Vec,
+    mut v14: D::F32Vec,
+    mut v15: D::F32Vec,
+) -> (
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+) {
+    let mut v16 = v0 + v8;
+    let mut v17 = v0 - v8;
+    let mut v18 = v4 + v12;
+    let mut v19 = v4 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v20 = v19 + v18;
+    let mut v21 = v19 - v18;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v22 = v20.mul_add(mul, v16);
+    let mut v23 = v20.neg_mul_add(mul, v16);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v24 = v21.mul_add(mul, v17);
+    let mut v25 = v21.neg_mul_add(mul, v17);
+    let mut v26 = v2 + v6;
+    let mut v27 = v6 + v10;
+    let mut v28 = v10 + v14;
+    let mut v29 = v2 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v30 = v29 + v27;
+    let mut v31 = v29 - v27;
+    let mut v32 = v26 + v28;
+    let mut v33 = v26 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v34 = v33 + v32;
+    let mut v35 = v33 - v32;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v36 = v34.mul_add(mul, v30);
+    let mut v37 = v34.neg_mul_add(mul, v30);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v38 = v35.mul_add(mul, v31);
+    let mut v39 = v35.neg_mul_add(mul, v31);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v40 = v36.mul_add(mul, v22);
+    let mut v41 = v36.neg_mul_add(mul, v22);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v42 = v38.mul_add(mul, v24);
+    let mut v43 = v38.neg_mul_add(mul, v24);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v44 = v39.mul_add(mul, v25);
+    let mut v45 = v39.neg_mul_add(mul, v25);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v46 = v37.mul_add(mul, v23);
+    let mut v47 = v37.neg_mul_add(mul, v23);
+    let mut v48 = v1 + v3;
+    let mut v49 = v3 + v5;
+    let mut v50 = v5 + v7;
+    let mut v51 = v7 + v9;
+    let mut v52 = v9 + v11;
+    let mut v53 = v11 + v13;
+    let mut v54 = v13 + v15;
+    let mut v55 = v1 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v56 = v55 + v51;
+    let mut v57 = v55 - v51;
+    let mut v58 = v49 + v53;
+    let mut v59 = v49 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v60 = v59 + v58;
+    let mut v61 = v59 - v58;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v62 = v60.mul_add(mul, v56);
+    let mut v63 = v60.neg_mul_add(mul, v56);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v64 = v61.mul_add(mul, v57);
+    let mut v65 = v61.neg_mul_add(mul, v57);
+    let mut v66 = v48 + v50;
+    let mut v67 = v50 + v52;
+    let mut v68 = v52 + v54;
+    let mut v69 = v48 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v70 = v69 + v67;
+    let mut v71 = v69 - v67;
+    let mut v72 = v66 + v68;
+    let mut v73 = v66 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v74 = v73 + v72;
+    let mut v75 = v73 - v72;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v76 = v74.mul_add(mul, v70);
+    let mut v77 = v74.neg_mul_add(mul, v70);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v78 = v75.mul_add(mul, v71);
+    let mut v79 = v75.neg_mul_add(mul, v71);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v80 = v76.mul_add(mul, v62);
+    let mut v81 = v76.neg_mul_add(mul, v62);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v82 = v78.mul_add(mul, v64);
+    let mut v83 = v78.neg_mul_add(mul, v64);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v84 = v79.mul_add(mul, v65);
+    let mut v85 = v79.neg_mul_add(mul, v65);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v86 = v77.mul_add(mul, v63);
+    let mut v87 = v77.neg_mul_add(mul, v63);
+    let mul = D::F32Vec::splat(d, 0.5024192861881557);
+    let mut v88 = v80.mul_add(mul, v40);
+    let mut v89 = v80.neg_mul_add(mul, v40);
+    let mul = D::F32Vec::splat(d, 0.5224986149396889);
+    let mut v90 = v82.mul_add(mul, v42);
+    let mut v91 = v82.neg_mul_add(mul, v42);
+    let mul = D::F32Vec::splat(d, 0.5669440348163577);
+    let mut v92 = v84.mul_add(mul, v44);
+    let mut v93 = v84.neg_mul_add(mul, v44);
+    let mul = D::F32Vec::splat(d, 0.6468217833599901);
+    let mut v94 = v86.mul_add(mul, v46);
+    let mut v95 = v86.neg_mul_add(mul, v46);
+    let mul = D::F32Vec::splat(d, 0.7881546234512502);
+    let mut v96 = v87.mul_add(mul, v47);
+    let mut v97 = v87.neg_mul_add(mul, v47);
+    let mul = D::F32Vec::splat(d, 1.0606776859903471);
+    let mut v98 = v85.mul_add(mul, v45);
+    let mut v99 = v85.neg_mul_add(mul, v45);
+    let mul = D::F32Vec::splat(d, 1.7224470982383342);
+    let mut v100 = v83.mul_add(mul, v43);
+    let mut v101 = v83.neg_mul_add(mul, v43);
+    let mul = D::F32Vec::splat(d, 5.1011486186891553);
+    let mut v102 = v81.mul_add(mul, v41);
+    let mut v103 = v81.neg_mul_add(mul, v41);
+    (
+        v88, v90, v92, v94, v96, v98, v100, v102, v103, v101, v99, v97, v95, v93, v91, v89,
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_idct_16<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 15 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    let mut v4 = D::F32Vec::load_array(d, &data[4 * stride]);
+    let mut v5 = D::F32Vec::load_array(d, &data[5 * stride]);
+    let mut v6 = D::F32Vec::load_array(d, &data[6 * stride]);
+    let mut v7 = D::F32Vec::load_array(d, &data[7 * stride]);
+    let mut v8 = D::F32Vec::load_array(d, &data[8 * stride]);
+    let mut v9 = D::F32Vec::load_array(d, &data[9 * stride]);
+    let mut v10 = D::F32Vec::load_array(d, &data[10 * stride]);
+    let mut v11 = D::F32Vec::load_array(d, &data[11 * stride]);
+    let mut v12 = D::F32Vec::load_array(d, &data[12 * stride]);
+    let mut v13 = D::F32Vec::load_array(d, &data[13 * stride]);
+    let mut v14 = D::F32Vec::load_array(d, &data[14 * stride]);
+    let mut v15 = D::F32Vec::load_array(d, &data[15 * stride]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    ) = idct_16(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    );
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+    v4.store_array(&mut data[4 * stride]);
+    v5.store_array(&mut data[5 * stride]);
+    v6.store_array(&mut data[6 * stride]);
+    v7.store_array(&mut data[7 * stride]);
+    v8.store_array(&mut data[8 * stride]);
+    v9.store_array(&mut data[9 * stride]);
+    v10.store_array(&mut data[10 * stride]);
+    v11.store_array(&mut data[11 * stride]);
+    v12.store_array(&mut data[12 * stride]);
+    v13.store_array(&mut data[13 * stride]);
+    v14.store_array(&mut data[14 * stride]);
+    v15.store_array(&mut data[15 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_16_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 16);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 16 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    let mut v4 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)],
+    );
+    let mut v5 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)],
+    );
+    let mut v6 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)],
+    );
+    let mut v7 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)],
+    );
+    let mut v8 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)],
+    );
+    let mut v9 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)],
+    );
+    let mut v10 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)],
+    );
+    let mut v11 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)],
+    );
+    let mut v12 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)],
+    );
+    let mut v13 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)],
+    );
+    let mut v14 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)],
+    );
+    let mut v15 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)],
+    );
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    ) = idct_16(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    );
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+    v4.store_array(&mut data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)]);
+    v5.store_array(&mut data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)]);
+    v6.store_array(&mut data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)]);
+    v7.store_array(&mut data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)]);
+    v8.store_array(&mut data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)]);
+    v9.store_array(&mut data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)]);
+    v10.store_array(&mut data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)]);
+    v11.store_array(&mut data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)]);
+    v12.store_array(&mut data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)]);
+    v13.store_array(&mut data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)]);
+    v14.store_array(&mut data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)]);
+    v15.store_array(&mut data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_16_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 8 / D::F32Vec::LEN;
+    assert!(data.len() > 15 * row_stride);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 8]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 10]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 12]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 14]);
+    let mut v8 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v9 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v10 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v11 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    let mut v12 = D::F32Vec::load_array(d, &data[row_stride * 9]);
+    let mut v13 = D::F32Vec::load_array(d, &data[row_stride * 11]);
+    let mut v14 = D::F32Vec::load_array(d, &data[row_stride * 13]);
+    let mut v15 = D::F32Vec::load_array(d, &data[row_stride * 15]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    ) = idct_16(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    );
+    v0.store_array(&mut data[row_stride * 0]);
+    v1.store_array(&mut data[row_stride * 1]);
+    v2.store_array(&mut data[row_stride * 2]);
+    v3.store_array(&mut data[row_stride * 3]);
+    v4.store_array(&mut data[row_stride * 4]);
+    v5.store_array(&mut data[row_stride * 5]);
+    v6.store_array(&mut data[row_stride * 6]);
+    v7.store_array(&mut data[row_stride * 7]);
+    v8.store_array(&mut data[row_stride * 8]);
+    v9.store_array(&mut data[row_stride * 9]);
+    v10.store_array(&mut data[row_stride * 10]);
+    v11.store_array(&mut data[row_stride * 11]);
+    v12.store_array(&mut data[row_stride * 12]);
+    v13.store_array(&mut data[row_stride * 13]);
+    v14.store_array(&mut data[row_stride * 14]);
+    v15.store_array(&mut data[row_stride * 15]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct2.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct2.rs
new file mode 100644
index 00000000..2189f23a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct2.rs
@@ -0,0 +1,59 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(unused)]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn idct_2<D: SimdDescriptor>(
+    d: D,
+    mut v0: D::F32Vec,
+    mut v1: D::F32Vec,
+) -> (D::F32Vec, D::F32Vec) {
+    let mut v2 = v0 + v1;
+    let mut v3 = v0 - v1;
+    (v2, v3)
+}
+
+#[inline(always)]
+pub(super) fn do_idct_2<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 1 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    (v0, v1) = idct_2(d, v0, v1);
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_2_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 2);
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 2 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    (v0, v1) = idct_2(d, v0, v1);
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct2d.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct2d.rs
new file mode 100644
index 00000000..3d2c191a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct2d.rs
@@ -0,0 +1,427 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[inline(always)]
+#[allow(dead_code)] // 2x2 IDCT variant
+fn idct2d_2_2_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 4, "Data length mismatch");
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let chunks = 2 / D::F32Vec::LEN;
+    for i in 0..chunks {
+        do_idct_2(d, &mut data[i..], chunks);
+    }
+    for i in 0..chunks {
+        D::F32Vec::transpose_square(d, &mut data[i * 2 + i..], chunks);
+        for j in i + 1..chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 2 + i..], chunks);
+            D::F32Vec::transpose_square(d, &mut data[i * 2 + j..], chunks);
+            for k in 0..D::F32Vec::LEN {
+                data.swap(i * 2 + j + k * chunks, j * 2 + i + k * chunks);
+            }
+        }
+        do_idct_2(d, &mut data[i..], chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_4_4_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 16, "Data length mismatch");
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let chunks = 4 / D::F32Vec::LEN;
+    for i in 0..chunks {
+        do_idct_4(d, &mut data[i..], chunks);
+    }
+    for i in 0..chunks {
+        D::F32Vec::transpose_square(d, &mut data[i * 4 + i..], chunks);
+        for j in i + 1..chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 4 + i..], chunks);
+            D::F32Vec::transpose_square(d, &mut data[i * 4 + j..], chunks);
+            for k in 0..D::F32Vec::LEN {
+                data.swap(i * 4 + j + k * chunks, j * 4 + i + k * chunks);
+            }
+        }
+        do_idct_4(d, &mut data[i..], chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_4_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 32, "Data length mismatch");
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 8 / D::F32Vec::LEN;
+    let row_chunks = 4 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        for j in 0..column_chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 8 + j..], column_chunks);
+        }
+        do_idct_8_rowblock(d, &mut data[i * 8..]);
+    }
+    for i in 0..column_chunks {
+        for j in 0..row_chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 8 + i..], column_chunks);
+        }
+        do_idct_4(d, &mut data[i..], column_chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_8_4_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 32, "Data length mismatch");
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 4 / D::F32Vec::LEN;
+    let row_chunks = 8 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        do_idct_4(d, &mut data[i..], row_chunks);
+    }
+    for i in 0..column_chunks {
+        let tr_block = |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+            D::F32Vec::transpose_square(d, &mut data[i * 8 + j + l * column_chunks..], row_chunks)
+        };
+        (0..2).for_each(|l| tr_block(data, i, i, l));
+        for j in i + 1..column_chunks {
+            (0..2).for_each(|l| tr_block(data, i, j, l));
+            (0..2).for_each(|l| tr_block(data, j, i, l));
+            for l in 0..2 {
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(
+                        i * 8 + j + k * row_chunks + l * column_chunks,
+                        j * 8 + i + k * row_chunks + l * column_chunks,
+                    );
+                }
+            }
+        }
+        do_idct_8_trh(d, &mut data[i..]);
+    }
+}
+
+#[inline(always)]
+fn idct2d_8_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 64, "Data length mismatch");
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let chunks = 8 / D::F32Vec::LEN;
+    for i in 0..chunks {
+        do_idct_8(d, &mut data[i..], chunks);
+    }
+    for i in 0..chunks {
+        D::F32Vec::transpose_square(d, &mut data[i * 8 + i..], chunks);
+        for j in i + 1..chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 8 + i..], chunks);
+            D::F32Vec::transpose_square(d, &mut data[i * 8 + j..], chunks);
+            for k in 0..D::F32Vec::LEN {
+                data.swap(i * 8 + j + k * chunks, j * 8 + i + k * chunks);
+            }
+        }
+        do_idct_8(d, &mut data[i..], chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_8_16_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 128, "Data length mismatch");
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 16 / D::F32Vec::LEN;
+    let row_chunks = 8 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        for j in 0..column_chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 16 + j..], column_chunks);
+        }
+        do_idct_16_rowblock(d, &mut data[i * 16..]);
+    }
+    for i in 0..column_chunks {
+        for j in 0..row_chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 16 + i..], column_chunks);
+        }
+        do_idct_8(d, &mut data[i..], column_chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_8_32_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 256, "Data length mismatch");
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 32 / D::F32Vec::LEN;
+    let row_chunks = 8 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        for j in 0..column_chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 32 + j..], column_chunks);
+        }
+        do_idct_32_rowblock(d, &mut data[i * 32..]);
+    }
+    for i in 0..column_chunks {
+        for j in 0..row_chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 32 + i..], column_chunks);
+        }
+        do_idct_8(d, &mut data[i..], column_chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_16_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 128, "Data length mismatch");
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 8 / D::F32Vec::LEN;
+    let row_chunks = 16 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        do_idct_8(d, &mut data[i..], row_chunks);
+    }
+    for i in 0..column_chunks {
+        let tr_block = |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+            D::F32Vec::transpose_square(d, &mut data[i * 16 + j + l * column_chunks..], row_chunks)
+        };
+        (0..2).for_each(|l| tr_block(data, i, i, l));
+        for j in i + 1..column_chunks {
+            (0..2).for_each(|l| tr_block(data, i, j, l));
+            (0..2).for_each(|l| tr_block(data, j, i, l));
+            for l in 0..2 {
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(
+                        i * 16 + j + k * row_chunks + l * column_chunks,
+                        j * 16 + i + k * row_chunks + l * column_chunks,
+                    );
+                }
+            }
+        }
+        do_idct_16_trh(d, &mut data[i..]);
+    }
+}
+
+#[inline(always)]
+fn idct2d_16_16_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 256, "Data length mismatch");
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let chunks = 16 / D::F32Vec::LEN;
+    for i in 0..chunks {
+        do_idct_16(d, &mut data[i..], chunks);
+    }
+    for i in 0..chunks {
+        D::F32Vec::transpose_square(d, &mut data[i * 16 + i..], chunks);
+        for j in i + 1..chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 16 + i..], chunks);
+            D::F32Vec::transpose_square(d, &mut data[i * 16 + j..], chunks);
+            for k in 0..D::F32Vec::LEN {
+                data.swap(i * 16 + j + k * chunks, j * 16 + i + k * chunks);
+            }
+        }
+        do_idct_16(d, &mut data[i..], chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_16_32_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 512, "Data length mismatch");
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 32 / D::F32Vec::LEN;
+    let row_chunks = 16 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        for j in 0..column_chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 32 + j..], column_chunks);
+        }
+        do_idct_32_rowblock(d, &mut data[i * 32..]);
+    }
+    for i in 0..column_chunks {
+        for j in 0..row_chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 32 + i..], column_chunks);
+        }
+        do_idct_16(d, &mut data[i..], column_chunks);
+    }
+}
+
+#[inline(always)]
+fn idct2d_32_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 256, "Data length mismatch");
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 8 / D::F32Vec::LEN;
+    let row_chunks = 32 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        do_idct_8(d, &mut data[i..], row_chunks);
+    }
+    for i in 0..column_chunks {
+        let tr_block = |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+            D::F32Vec::transpose_square(d, &mut data[i * 32 + j + l * column_chunks..], row_chunks)
+        };
+        (0..4).for_each(|l| tr_block(data, i, i, l));
+        for j in i + 1..column_chunks {
+            (0..4).for_each(|l| tr_block(data, i, j, l));
+            (0..4).for_each(|l| tr_block(data, j, i, l));
+            for l in 0..4 {
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(
+                        i * 32 + j + k * row_chunks + l * column_chunks,
+                        j * 32 + i + k * row_chunks + l * column_chunks,
+                    );
+                }
+            }
+        }
+        do_idct_32_trq(d, &mut data[i..]);
+    }
+}
+
+#[inline(always)]
+fn idct2d_32_16_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 512, "Data length mismatch");
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = 16 / D::F32Vec::LEN;
+    let row_chunks = 32 / D::F32Vec::LEN;
+    for i in 0..row_chunks {
+        do_idct_16(d, &mut data[i..], row_chunks);
+    }
+    for i in 0..column_chunks {
+        let tr_block = |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+            D::F32Vec::transpose_square(d, &mut data[i * 32 + j + l * column_chunks..], row_chunks)
+        };
+        (0..2).for_each(|l| tr_block(data, i, i, l));
+        for j in i + 1..column_chunks {
+            (0..2).for_each(|l| tr_block(data, i, j, l));
+            (0..2).for_each(|l| tr_block(data, j, i, l));
+            for l in 0..2 {
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(
+                        i * 32 + j + k * row_chunks + l * column_chunks,
+                        j * 32 + i + k * row_chunks + l * column_chunks,
+                    );
+                }
+            }
+        }
+        do_idct_32_trh(d, &mut data[i..]);
+    }
+}
+
+#[inline(always)]
+fn idct2d_32_32_impl<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    assert_eq!(data.len(), 1024, "Data length mismatch");
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let chunks = 32 / D::F32Vec::LEN;
+    for i in 0..chunks {
+        do_idct_32(d, &mut data[i..], chunks);
+    }
+    for i in 0..chunks {
+        D::F32Vec::transpose_square(d, &mut data[i * 32 + i..], chunks);
+        for j in i + 1..chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * 32 + i..], chunks);
+            D::F32Vec::transpose_square(d, &mut data[i * 32 + j..], chunks);
+            for k in 0..D::F32Vec::LEN {
+                data.swap(i * 32 + j + k * chunks, j * 32 + i + k * chunks);
+            }
+        }
+        do_idct_32(d, &mut data[i..], chunks);
+    }
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+#[allow(dead_code)] // 2x2 IDCT not currently used but part of complete set
+pub fn idct2d_2_2<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    idct2d_2_2_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_4_4<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_128bit();
+    idct2d_4_4_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_4_8<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_128bit();
+    idct2d_4_8_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_8_4<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_128bit();
+    idct2d_8_4_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_8_8<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    idct2d_8_8_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_8_16<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    idct2d_8_16_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_8_32<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    idct2d_8_32_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_16_8<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    idct2d_16_8_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_16_16<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    idct2d_16_16_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_16_32<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    idct2d_16_32_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_32_8<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    idct2d_32_8_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_32_16<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    idct2d_32_16_impl(d, data)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn idct2d_32_32<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+    idct2d_32_32_impl(d, data)
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct32.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct32.rs
new file mode 100644
index 00000000..c8746053
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct32.rs
@@ -0,0 +1,796 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(unused)]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn idct_32<D: SimdDescriptor>(
+    d: D,
+    mut v0: D::F32Vec,
+    mut v1: D::F32Vec,
+    mut v2: D::F32Vec,
+    mut v3: D::F32Vec,
+    mut v4: D::F32Vec,
+    mut v5: D::F32Vec,
+    mut v6: D::F32Vec,
+    mut v7: D::F32Vec,
+    mut v8: D::F32Vec,
+    mut v9: D::F32Vec,
+    mut v10: D::F32Vec,
+    mut v11: D::F32Vec,
+    mut v12: D::F32Vec,
+    mut v13: D::F32Vec,
+    mut v14: D::F32Vec,
+    mut v15: D::F32Vec,
+    mut v16: D::F32Vec,
+    mut v17: D::F32Vec,
+    mut v18: D::F32Vec,
+    mut v19: D::F32Vec,
+    mut v20: D::F32Vec,
+    mut v21: D::F32Vec,
+    mut v22: D::F32Vec,
+    mut v23: D::F32Vec,
+    mut v24: D::F32Vec,
+    mut v25: D::F32Vec,
+    mut v26: D::F32Vec,
+    mut v27: D::F32Vec,
+    mut v28: D::F32Vec,
+    mut v29: D::F32Vec,
+    mut v30: D::F32Vec,
+    mut v31: D::F32Vec,
+) -> (
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+) {
+    let mut v32 = v0 + v16;
+    let mut v33 = v0 - v16;
+    let mut v34 = v8 + v24;
+    let mut v35 = v8 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v36 = v35 + v34;
+    let mut v37 = v35 - v34;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v38 = v36.mul_add(mul, v32);
+    let mut v39 = v36.neg_mul_add(mul, v32);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v40 = v37.mul_add(mul, v33);
+    let mut v41 = v37.neg_mul_add(mul, v33);
+    let mut v42 = v4 + v12;
+    let mut v43 = v12 + v20;
+    let mut v44 = v20 + v28;
+    let mut v45 = v4 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v46 = v45 + v43;
+    let mut v47 = v45 - v43;
+    let mut v48 = v42 + v44;
+    let mut v49 = v42 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v50 = v49 + v48;
+    let mut v51 = v49 - v48;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v52 = v50.mul_add(mul, v46);
+    let mut v53 = v50.neg_mul_add(mul, v46);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v54 = v51.mul_add(mul, v47);
+    let mut v55 = v51.neg_mul_add(mul, v47);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v56 = v52.mul_add(mul, v38);
+    let mut v57 = v52.neg_mul_add(mul, v38);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v58 = v54.mul_add(mul, v40);
+    let mut v59 = v54.neg_mul_add(mul, v40);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v60 = v55.mul_add(mul, v41);
+    let mut v61 = v55.neg_mul_add(mul, v41);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v62 = v53.mul_add(mul, v39);
+    let mut v63 = v53.neg_mul_add(mul, v39);
+    let mut v64 = v2 + v6;
+    let mut v65 = v6 + v10;
+    let mut v66 = v10 + v14;
+    let mut v67 = v14 + v18;
+    let mut v68 = v18 + v22;
+    let mut v69 = v22 + v26;
+    let mut v70 = v26 + v30;
+    let mut v71 = v2 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v72 = v71 + v67;
+    let mut v73 = v71 - v67;
+    let mut v74 = v65 + v69;
+    let mut v75 = v65 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v76 = v75 + v74;
+    let mut v77 = v75 - v74;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v78 = v76.mul_add(mul, v72);
+    let mut v79 = v76.neg_mul_add(mul, v72);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v80 = v77.mul_add(mul, v73);
+    let mut v81 = v77.neg_mul_add(mul, v73);
+    let mut v82 = v64 + v66;
+    let mut v83 = v66 + v68;
+    let mut v84 = v68 + v70;
+    let mut v85 = v64 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v86 = v85 + v83;
+    let mut v87 = v85 - v83;
+    let mut v88 = v82 + v84;
+    let mut v89 = v82 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v90 = v89 + v88;
+    let mut v91 = v89 - v88;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v92 = v90.mul_add(mul, v86);
+    let mut v93 = v90.neg_mul_add(mul, v86);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v94 = v91.mul_add(mul, v87);
+    let mut v95 = v91.neg_mul_add(mul, v87);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v96 = v92.mul_add(mul, v78);
+    let mut v97 = v92.neg_mul_add(mul, v78);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v98 = v94.mul_add(mul, v80);
+    let mut v99 = v94.neg_mul_add(mul, v80);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v100 = v95.mul_add(mul, v81);
+    let mut v101 = v95.neg_mul_add(mul, v81);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v102 = v93.mul_add(mul, v79);
+    let mut v103 = v93.neg_mul_add(mul, v79);
+    let mul = D::F32Vec::splat(d, 0.5024192861881557);
+    let mut v104 = v96.mul_add(mul, v56);
+    let mut v105 = v96.neg_mul_add(mul, v56);
+    let mul = D::F32Vec::splat(d, 0.5224986149396889);
+    let mut v106 = v98.mul_add(mul, v58);
+    let mut v107 = v98.neg_mul_add(mul, v58);
+    let mul = D::F32Vec::splat(d, 0.5669440348163577);
+    let mut v108 = v100.mul_add(mul, v60);
+    let mut v109 = v100.neg_mul_add(mul, v60);
+    let mul = D::F32Vec::splat(d, 0.6468217833599901);
+    let mut v110 = v102.mul_add(mul, v62);
+    let mut v111 = v102.neg_mul_add(mul, v62);
+    let mul = D::F32Vec::splat(d, 0.7881546234512502);
+    let mut v112 = v103.mul_add(mul, v63);
+    let mut v113 = v103.neg_mul_add(mul, v63);
+    let mul = D::F32Vec::splat(d, 1.0606776859903471);
+    let mut v114 = v101.mul_add(mul, v61);
+    let mut v115 = v101.neg_mul_add(mul, v61);
+    let mul = D::F32Vec::splat(d, 1.7224470982383342);
+    let mut v116 = v99.mul_add(mul, v59);
+    let mut v117 = v99.neg_mul_add(mul, v59);
+    let mul = D::F32Vec::splat(d, 5.1011486186891553);
+    let mut v118 = v97.mul_add(mul, v57);
+    let mut v119 = v97.neg_mul_add(mul, v57);
+    let mut v120 = v1 + v3;
+    let mut v121 = v3 + v5;
+    let mut v122 = v5 + v7;
+    let mut v123 = v7 + v9;
+    let mut v124 = v9 + v11;
+    let mut v125 = v11 + v13;
+    let mut v126 = v13 + v15;
+    let mut v127 = v15 + v17;
+    let mut v128 = v17 + v19;
+    let mut v129 = v19 + v21;
+    let mut v130 = v21 + v23;
+    let mut v131 = v23 + v25;
+    let mut v132 = v25 + v27;
+    let mut v133 = v27 + v29;
+    let mut v134 = v29 + v31;
+    let mut v135 = v1 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v136 = v135 + v127;
+    let mut v137 = v135 - v127;
+    let mut v138 = v123 + v131;
+    let mut v139 = v123 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v140 = v139 + v138;
+    let mut v141 = v139 - v138;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v142 = v140.mul_add(mul, v136);
+    let mut v143 = v140.neg_mul_add(mul, v136);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v144 = v141.mul_add(mul, v137);
+    let mut v145 = v141.neg_mul_add(mul, v137);
+    let mut v146 = v121 + v125;
+    let mut v147 = v125 + v129;
+    let mut v148 = v129 + v133;
+    let mut v149 = v121 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v150 = v149 + v147;
+    let mut v151 = v149 - v147;
+    let mut v152 = v146 + v148;
+    let mut v153 = v146 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v154 = v153 + v152;
+    let mut v155 = v153 - v152;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v156 = v154.mul_add(mul, v150);
+    let mut v157 = v154.neg_mul_add(mul, v150);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v158 = v155.mul_add(mul, v151);
+    let mut v159 = v155.neg_mul_add(mul, v151);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v160 = v156.mul_add(mul, v142);
+    let mut v161 = v156.neg_mul_add(mul, v142);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v162 = v158.mul_add(mul, v144);
+    let mut v163 = v158.neg_mul_add(mul, v144);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v164 = v159.mul_add(mul, v145);
+    let mut v165 = v159.neg_mul_add(mul, v145);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v166 = v157.mul_add(mul, v143);
+    let mut v167 = v157.neg_mul_add(mul, v143);
+    let mut v168 = v120 + v122;
+    let mut v169 = v122 + v124;
+    let mut v170 = v124 + v126;
+    let mut v171 = v126 + v128;
+    let mut v172 = v128 + v130;
+    let mut v173 = v130 + v132;
+    let mut v174 = v132 + v134;
+    let mut v175 = v120 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v176 = v175 + v171;
+    let mut v177 = v175 - v171;
+    let mut v178 = v169 + v173;
+    let mut v179 = v169 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v180 = v179 + v178;
+    let mut v181 = v179 - v178;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v182 = v180.mul_add(mul, v176);
+    let mut v183 = v180.neg_mul_add(mul, v176);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v184 = v181.mul_add(mul, v177);
+    let mut v185 = v181.neg_mul_add(mul, v177);
+    let mut v186 = v168 + v170;
+    let mut v187 = v170 + v172;
+    let mut v188 = v172 + v174;
+    let mut v189 = v168 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v190 = v189 + v187;
+    let mut v191 = v189 - v187;
+    let mut v192 = v186 + v188;
+    let mut v193 = v186 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v194 = v193 + v192;
+    let mut v195 = v193 - v192;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v196 = v194.mul_add(mul, v190);
+    let mut v197 = v194.neg_mul_add(mul, v190);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v198 = v195.mul_add(mul, v191);
+    let mut v199 = v195.neg_mul_add(mul, v191);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v200 = v196.mul_add(mul, v182);
+    let mut v201 = v196.neg_mul_add(mul, v182);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v202 = v198.mul_add(mul, v184);
+    let mut v203 = v198.neg_mul_add(mul, v184);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v204 = v199.mul_add(mul, v185);
+    let mut v205 = v199.neg_mul_add(mul, v185);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v206 = v197.mul_add(mul, v183);
+    let mut v207 = v197.neg_mul_add(mul, v183);
+    let mul = D::F32Vec::splat(d, 0.5024192861881557);
+    let mut v208 = v200.mul_add(mul, v160);
+    let mut v209 = v200.neg_mul_add(mul, v160);
+    let mul = D::F32Vec::splat(d, 0.5224986149396889);
+    let mut v210 = v202.mul_add(mul, v162);
+    let mut v211 = v202.neg_mul_add(mul, v162);
+    let mul = D::F32Vec::splat(d, 0.5669440348163577);
+    let mut v212 = v204.mul_add(mul, v164);
+    let mut v213 = v204.neg_mul_add(mul, v164);
+    let mul = D::F32Vec::splat(d, 0.6468217833599901);
+    let mut v214 = v206.mul_add(mul, v166);
+    let mut v215 = v206.neg_mul_add(mul, v166);
+    let mul = D::F32Vec::splat(d, 0.7881546234512502);
+    let mut v216 = v207.mul_add(mul, v167);
+    let mut v217 = v207.neg_mul_add(mul, v167);
+    let mul = D::F32Vec::splat(d, 1.0606776859903471);
+    let mut v218 = v205.mul_add(mul, v165);
+    let mut v219 = v205.neg_mul_add(mul, v165);
+    let mul = D::F32Vec::splat(d, 1.7224470982383342);
+    let mut v220 = v203.mul_add(mul, v163);
+    let mut v221 = v203.neg_mul_add(mul, v163);
+    let mul = D::F32Vec::splat(d, 5.1011486186891553);
+    let mut v222 = v201.mul_add(mul, v161);
+    let mut v223 = v201.neg_mul_add(mul, v161);
+    let mul = D::F32Vec::splat(d, 0.5006029982351963);
+    let mut v224 = v208.mul_add(mul, v104);
+    let mut v225 = v208.neg_mul_add(mul, v104);
+    let mul = D::F32Vec::splat(d, 0.5054709598975436);
+    let mut v226 = v210.mul_add(mul, v106);
+    let mut v227 = v210.neg_mul_add(mul, v106);
+    let mul = D::F32Vec::splat(d, 0.5154473099226246);
+    let mut v228 = v212.mul_add(mul, v108);
+    let mut v229 = v212.neg_mul_add(mul, v108);
+    let mul = D::F32Vec::splat(d, 0.5310425910897841);
+    let mut v230 = v214.mul_add(mul, v110);
+    let mut v231 = v214.neg_mul_add(mul, v110);
+    let mul = D::F32Vec::splat(d, 0.5531038960344445);
+    let mut v232 = v216.mul_add(mul, v112);
+    let mut v233 = v216.neg_mul_add(mul, v112);
+    let mul = D::F32Vec::splat(d, 0.5829349682061339);
+    let mut v234 = v218.mul_add(mul, v114);
+    let mut v235 = v218.neg_mul_add(mul, v114);
+    let mul = D::F32Vec::splat(d, 0.6225041230356648);
+    let mut v236 = v220.mul_add(mul, v116);
+    let mut v237 = v220.neg_mul_add(mul, v116);
+    let mul = D::F32Vec::splat(d, 0.6748083414550057);
+    let mut v238 = v222.mul_add(mul, v118);
+    let mut v239 = v222.neg_mul_add(mul, v118);
+    let mul = D::F32Vec::splat(d, 0.7445362710022986);
+    let mut v240 = v223.mul_add(mul, v119);
+    let mut v241 = v223.neg_mul_add(mul, v119);
+    let mul = D::F32Vec::splat(d, 0.8393496454155268);
+    let mut v242 = v221.mul_add(mul, v117);
+    let mut v243 = v221.neg_mul_add(mul, v117);
+    let mul = D::F32Vec::splat(d, 0.9725682378619608);
+    let mut v244 = v219.mul_add(mul, v115);
+    let mut v245 = v219.neg_mul_add(mul, v115);
+    let mul = D::F32Vec::splat(d, 1.1694399334328847);
+    let mut v246 = v217.mul_add(mul, v113);
+    let mut v247 = v217.neg_mul_add(mul, v113);
+    let mul = D::F32Vec::splat(d, 1.4841646163141662);
+    let mut v248 = v215.mul_add(mul, v111);
+    let mut v249 = v215.neg_mul_add(mul, v111);
+    let mul = D::F32Vec::splat(d, 2.0577810099534108);
+    let mut v250 = v213.mul_add(mul, v109);
+    let mut v251 = v213.neg_mul_add(mul, v109);
+    let mul = D::F32Vec::splat(d, 3.4076084184687190);
+    let mut v252 = v211.mul_add(mul, v107);
+    let mut v253 = v211.neg_mul_add(mul, v107);
+    let mul = D::F32Vec::splat(d, 10.1900081235480329);
+    let mut v254 = v209.mul_add(mul, v105);
+    let mut v255 = v209.neg_mul_add(mul, v105);
+    (
+        v224, v226, v228, v230, v232, v234, v236, v238, v240, v242, v244, v246, v248, v250, v252,
+        v254, v255, v253, v251, v249, v247, v245, v243, v241, v239, v237, v235, v233, v231, v229,
+        v227, v225,
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_idct_32<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 31 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    let mut v4 = D::F32Vec::load_array(d, &data[4 * stride]);
+    let mut v5 = D::F32Vec::load_array(d, &data[5 * stride]);
+    let mut v6 = D::F32Vec::load_array(d, &data[6 * stride]);
+    let mut v7 = D::F32Vec::load_array(d, &data[7 * stride]);
+    let mut v8 = D::F32Vec::load_array(d, &data[8 * stride]);
+    let mut v9 = D::F32Vec::load_array(d, &data[9 * stride]);
+    let mut v10 = D::F32Vec::load_array(d, &data[10 * stride]);
+    let mut v11 = D::F32Vec::load_array(d, &data[11 * stride]);
+    let mut v12 = D::F32Vec::load_array(d, &data[12 * stride]);
+    let mut v13 = D::F32Vec::load_array(d, &data[13 * stride]);
+    let mut v14 = D::F32Vec::load_array(d, &data[14 * stride]);
+    let mut v15 = D::F32Vec::load_array(d, &data[15 * stride]);
+    let mut v16 = D::F32Vec::load_array(d, &data[16 * stride]);
+    let mut v17 = D::F32Vec::load_array(d, &data[17 * stride]);
+    let mut v18 = D::F32Vec::load_array(d, &data[18 * stride]);
+    let mut v19 = D::F32Vec::load_array(d, &data[19 * stride]);
+    let mut v20 = D::F32Vec::load_array(d, &data[20 * stride]);
+    let mut v21 = D::F32Vec::load_array(d, &data[21 * stride]);
+    let mut v22 = D::F32Vec::load_array(d, &data[22 * stride]);
+    let mut v23 = D::F32Vec::load_array(d, &data[23 * stride]);
+    let mut v24 = D::F32Vec::load_array(d, &data[24 * stride]);
+    let mut v25 = D::F32Vec::load_array(d, &data[25 * stride]);
+    let mut v26 = D::F32Vec::load_array(d, &data[26 * stride]);
+    let mut v27 = D::F32Vec::load_array(d, &data[27 * stride]);
+    let mut v28 = D::F32Vec::load_array(d, &data[28 * stride]);
+    let mut v29 = D::F32Vec::load_array(d, &data[29 * stride]);
+    let mut v30 = D::F32Vec::load_array(d, &data[30 * stride]);
+    let mut v31 = D::F32Vec::load_array(d, &data[31 * stride]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = idct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+    v4.store_array(&mut data[4 * stride]);
+    v5.store_array(&mut data[5 * stride]);
+    v6.store_array(&mut data[6 * stride]);
+    v7.store_array(&mut data[7 * stride]);
+    v8.store_array(&mut data[8 * stride]);
+    v9.store_array(&mut data[9 * stride]);
+    v10.store_array(&mut data[10 * stride]);
+    v11.store_array(&mut data[11 * stride]);
+    v12.store_array(&mut data[12 * stride]);
+    v13.store_array(&mut data[13 * stride]);
+    v14.store_array(&mut data[14 * stride]);
+    v15.store_array(&mut data[15 * stride]);
+    v16.store_array(&mut data[16 * stride]);
+    v17.store_array(&mut data[17 * stride]);
+    v18.store_array(&mut data[18 * stride]);
+    v19.store_array(&mut data[19 * stride]);
+    v20.store_array(&mut data[20 * stride]);
+    v21.store_array(&mut data[21 * stride]);
+    v22.store_array(&mut data[22 * stride]);
+    v23.store_array(&mut data[23 * stride]);
+    v24.store_array(&mut data[24 * stride]);
+    v25.store_array(&mut data[25 * stride]);
+    v26.store_array(&mut data[26 * stride]);
+    v27.store_array(&mut data[27 * stride]);
+    v28.store_array(&mut data[28 * stride]);
+    v29.store_array(&mut data[29 * stride]);
+    v30.store_array(&mut data[30 * stride]);
+    v31.store_array(&mut data[31 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_32_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 32);
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 32 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    let mut v4 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)],
+    );
+    let mut v5 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)],
+    );
+    let mut v6 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)],
+    );
+    let mut v7 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)],
+    );
+    let mut v8 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)],
+    );
+    let mut v9 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)],
+    );
+    let mut v10 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)],
+    );
+    let mut v11 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)],
+    );
+    let mut v12 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)],
+    );
+    let mut v13 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)],
+    );
+    let mut v14 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)],
+    );
+    let mut v15 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)],
+    );
+    let mut v16 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (16 % D::F32Vec::LEN) + (16 / D::F32Vec::LEN)],
+    );
+    let mut v17 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (17 % D::F32Vec::LEN) + (17 / D::F32Vec::LEN)],
+    );
+    let mut v18 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (18 % D::F32Vec::LEN) + (18 / D::F32Vec::LEN)],
+    );
+    let mut v19 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (19 % D::F32Vec::LEN) + (19 / D::F32Vec::LEN)],
+    );
+    let mut v20 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (20 % D::F32Vec::LEN) + (20 / D::F32Vec::LEN)],
+    );
+    let mut v21 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (21 % D::F32Vec::LEN) + (21 / D::F32Vec::LEN)],
+    );
+    let mut v22 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (22 % D::F32Vec::LEN) + (22 / D::F32Vec::LEN)],
+    );
+    let mut v23 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (23 % D::F32Vec::LEN) + (23 / D::F32Vec::LEN)],
+    );
+    let mut v24 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (24 % D::F32Vec::LEN) + (24 / D::F32Vec::LEN)],
+    );
+    let mut v25 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (25 % D::F32Vec::LEN) + (25 / D::F32Vec::LEN)],
+    );
+    let mut v26 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (26 % D::F32Vec::LEN) + (26 / D::F32Vec::LEN)],
+    );
+    let mut v27 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (27 % D::F32Vec::LEN) + (27 / D::F32Vec::LEN)],
+    );
+    let mut v28 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (28 % D::F32Vec::LEN) + (28 / D::F32Vec::LEN)],
+    );
+    let mut v29 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (29 % D::F32Vec::LEN) + (29 / D::F32Vec::LEN)],
+    );
+    let mut v30 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (30 % D::F32Vec::LEN) + (30 / D::F32Vec::LEN)],
+    );
+    let mut v31 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (31 % D::F32Vec::LEN) + (31 / D::F32Vec::LEN)],
+    );
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = idct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+    v4.store_array(&mut data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)]);
+    v5.store_array(&mut data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)]);
+    v6.store_array(&mut data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)]);
+    v7.store_array(&mut data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)]);
+    v8.store_array(&mut data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)]);
+    v9.store_array(&mut data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)]);
+    v10.store_array(&mut data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)]);
+    v11.store_array(&mut data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)]);
+    v12.store_array(&mut data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)]);
+    v13.store_array(&mut data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)]);
+    v14.store_array(&mut data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)]);
+    v15.store_array(&mut data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)]);
+    v16.store_array(&mut data[row_stride * (16 % D::F32Vec::LEN) + (16 / D::F32Vec::LEN)]);
+    v17.store_array(&mut data[row_stride * (17 % D::F32Vec::LEN) + (17 / D::F32Vec::LEN)]);
+    v18.store_array(&mut data[row_stride * (18 % D::F32Vec::LEN) + (18 / D::F32Vec::LEN)]);
+    v19.store_array(&mut data[row_stride * (19 % D::F32Vec::LEN) + (19 / D::F32Vec::LEN)]);
+    v20.store_array(&mut data[row_stride * (20 % D::F32Vec::LEN) + (20 / D::F32Vec::LEN)]);
+    v21.store_array(&mut data[row_stride * (21 % D::F32Vec::LEN) + (21 / D::F32Vec::LEN)]);
+    v22.store_array(&mut data[row_stride * (22 % D::F32Vec::LEN) + (22 / D::F32Vec::LEN)]);
+    v23.store_array(&mut data[row_stride * (23 % D::F32Vec::LEN) + (23 / D::F32Vec::LEN)]);
+    v24.store_array(&mut data[row_stride * (24 % D::F32Vec::LEN) + (24 / D::F32Vec::LEN)]);
+    v25.store_array(&mut data[row_stride * (25 % D::F32Vec::LEN) + (25 / D::F32Vec::LEN)]);
+    v26.store_array(&mut data[row_stride * (26 % D::F32Vec::LEN) + (26 / D::F32Vec::LEN)]);
+    v27.store_array(&mut data[row_stride * (27 % D::F32Vec::LEN) + (27 / D::F32Vec::LEN)]);
+    v28.store_array(&mut data[row_stride * (28 % D::F32Vec::LEN) + (28 / D::F32Vec::LEN)]);
+    v29.store_array(&mut data[row_stride * (29 % D::F32Vec::LEN) + (29 / D::F32Vec::LEN)]);
+    v30.store_array(&mut data[row_stride * (30 % D::F32Vec::LEN) + (30 / D::F32Vec::LEN)]);
+    v31.store_array(&mut data[row_stride * (31 % D::F32Vec::LEN) + (31 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_32_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 16 / D::F32Vec::LEN;
+    assert!(data.len() > 31 * row_stride);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 8]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 10]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 12]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 14]);
+    let mut v8 = D::F32Vec::load_array(d, &data[row_stride * 16]);
+    let mut v9 = D::F32Vec::load_array(d, &data[row_stride * 18]);
+    let mut v10 = D::F32Vec::load_array(d, &data[row_stride * 20]);
+    let mut v11 = D::F32Vec::load_array(d, &data[row_stride * 22]);
+    let mut v12 = D::F32Vec::load_array(d, &data[row_stride * 24]);
+    let mut v13 = D::F32Vec::load_array(d, &data[row_stride * 26]);
+    let mut v14 = D::F32Vec::load_array(d, &data[row_stride * 28]);
+    let mut v15 = D::F32Vec::load_array(d, &data[row_stride * 30]);
+    let mut v16 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v17 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v18 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v19 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    let mut v20 = D::F32Vec::load_array(d, &data[row_stride * 9]);
+    let mut v21 = D::F32Vec::load_array(d, &data[row_stride * 11]);
+    let mut v22 = D::F32Vec::load_array(d, &data[row_stride * 13]);
+    let mut v23 = D::F32Vec::load_array(d, &data[row_stride * 15]);
+    let mut v24 = D::F32Vec::load_array(d, &data[row_stride * 17]);
+    let mut v25 = D::F32Vec::load_array(d, &data[row_stride * 19]);
+    let mut v26 = D::F32Vec::load_array(d, &data[row_stride * 21]);
+    let mut v27 = D::F32Vec::load_array(d, &data[row_stride * 23]);
+    let mut v28 = D::F32Vec::load_array(d, &data[row_stride * 25]);
+    let mut v29 = D::F32Vec::load_array(d, &data[row_stride * 27]);
+    let mut v30 = D::F32Vec::load_array(d, &data[row_stride * 29]);
+    let mut v31 = D::F32Vec::load_array(d, &data[row_stride * 31]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = idct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[row_stride * 0]);
+    v1.store_array(&mut data[row_stride * 1]);
+    v2.store_array(&mut data[row_stride * 2]);
+    v3.store_array(&mut data[row_stride * 3]);
+    v4.store_array(&mut data[row_stride * 4]);
+    v5.store_array(&mut data[row_stride * 5]);
+    v6.store_array(&mut data[row_stride * 6]);
+    v7.store_array(&mut data[row_stride * 7]);
+    v8.store_array(&mut data[row_stride * 8]);
+    v9.store_array(&mut data[row_stride * 9]);
+    v10.store_array(&mut data[row_stride * 10]);
+    v11.store_array(&mut data[row_stride * 11]);
+    v12.store_array(&mut data[row_stride * 12]);
+    v13.store_array(&mut data[row_stride * 13]);
+    v14.store_array(&mut data[row_stride * 14]);
+    v15.store_array(&mut data[row_stride * 15]);
+    v16.store_array(&mut data[row_stride * 16]);
+    v17.store_array(&mut data[row_stride * 17]);
+    v18.store_array(&mut data[row_stride * 18]);
+    v19.store_array(&mut data[row_stride * 19]);
+    v20.store_array(&mut data[row_stride * 20]);
+    v21.store_array(&mut data[row_stride * 21]);
+    v22.store_array(&mut data[row_stride * 22]);
+    v23.store_array(&mut data[row_stride * 23]);
+    v24.store_array(&mut data[row_stride * 24]);
+    v25.store_array(&mut data[row_stride * 25]);
+    v26.store_array(&mut data[row_stride * 26]);
+    v27.store_array(&mut data[row_stride * 27]);
+    v28.store_array(&mut data[row_stride * 28]);
+    v29.store_array(&mut data[row_stride * 29]);
+    v30.store_array(&mut data[row_stride * 30]);
+    v31.store_array(&mut data[row_stride * 31]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_32_trq<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 8 / D::F32Vec::LEN;
+    assert!(data.len() > 31 * row_stride);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 8]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 12]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 16]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 20]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 24]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 28]);
+    let mut v8 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v9 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v10 = D::F32Vec::load_array(d, &data[row_stride * 9]);
+    let mut v11 = D::F32Vec::load_array(d, &data[row_stride * 13]);
+    let mut v12 = D::F32Vec::load_array(d, &data[row_stride * 17]);
+    let mut v13 = D::F32Vec::load_array(d, &data[row_stride * 21]);
+    let mut v14 = D::F32Vec::load_array(d, &data[row_stride * 25]);
+    let mut v15 = D::F32Vec::load_array(d, &data[row_stride * 29]);
+    let mut v16 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v17 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v18 = D::F32Vec::load_array(d, &data[row_stride * 10]);
+    let mut v19 = D::F32Vec::load_array(d, &data[row_stride * 14]);
+    let mut v20 = D::F32Vec::load_array(d, &data[row_stride * 18]);
+    let mut v21 = D::F32Vec::load_array(d, &data[row_stride * 22]);
+    let mut v22 = D::F32Vec::load_array(d, &data[row_stride * 26]);
+    let mut v23 = D::F32Vec::load_array(d, &data[row_stride * 30]);
+    let mut v24 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v25 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    let mut v26 = D::F32Vec::load_array(d, &data[row_stride * 11]);
+    let mut v27 = D::F32Vec::load_array(d, &data[row_stride * 15]);
+    let mut v28 = D::F32Vec::load_array(d, &data[row_stride * 19]);
+    let mut v29 = D::F32Vec::load_array(d, &data[row_stride * 23]);
+    let mut v30 = D::F32Vec::load_array(d, &data[row_stride * 27]);
+    let mut v31 = D::F32Vec::load_array(d, &data[row_stride * 31]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = idct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[row_stride * 0]);
+    v1.store_array(&mut data[row_stride * 1]);
+    v2.store_array(&mut data[row_stride * 2]);
+    v3.store_array(&mut data[row_stride * 3]);
+    v4.store_array(&mut data[row_stride * 4]);
+    v5.store_array(&mut data[row_stride * 5]);
+    v6.store_array(&mut data[row_stride * 6]);
+    v7.store_array(&mut data[row_stride * 7]);
+    v8.store_array(&mut data[row_stride * 8]);
+    v9.store_array(&mut data[row_stride * 9]);
+    v10.store_array(&mut data[row_stride * 10]);
+    v11.store_array(&mut data[row_stride * 11]);
+    v12.store_array(&mut data[row_stride * 12]);
+    v13.store_array(&mut data[row_stride * 13]);
+    v14.store_array(&mut data[row_stride * 14]);
+    v15.store_array(&mut data[row_stride * 15]);
+    v16.store_array(&mut data[row_stride * 16]);
+    v17.store_array(&mut data[row_stride * 17]);
+    v18.store_array(&mut data[row_stride * 18]);
+    v19.store_array(&mut data[row_stride * 19]);
+    v20.store_array(&mut data[row_stride * 20]);
+    v21.store_array(&mut data[row_stride * 21]);
+    v22.store_array(&mut data[row_stride * 22]);
+    v23.store_array(&mut data[row_stride * 23]);
+    v24.store_array(&mut data[row_stride * 24]);
+    v25.store_array(&mut data[row_stride * 25]);
+    v26.store_array(&mut data[row_stride * 26]);
+    v27.store_array(&mut data[row_stride * 27]);
+    v28.store_array(&mut data[row_stride * 28]);
+    v29.store_array(&mut data[row_stride * 29]);
+    v30.store_array(&mut data[row_stride * 30]);
+    v31.store_array(&mut data[row_stride * 31]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct4.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct4.rs
new file mode 100644
index 00000000..5eea4c28
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct4.rs
@@ -0,0 +1,104 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(unused)]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn idct_4<D: SimdDescriptor>(
+    d: D,
+    mut v0: D::F32Vec,
+    mut v1: D::F32Vec,
+    mut v2: D::F32Vec,
+    mut v3: D::F32Vec,
+) -> (D::F32Vec, D::F32Vec, D::F32Vec, D::F32Vec) {
+    let mut v4 = v0 + v2;
+    let mut v5 = v0 - v2;
+    let mut v6 = v1 + v3;
+    let mut v7 = v1 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v8 = v7 + v6;
+    let mut v9 = v7 - v6;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v10 = v8.mul_add(mul, v4);
+    let mut v11 = v8.neg_mul_add(mul, v4);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v12 = v9.mul_add(mul, v5);
+    let mut v13 = v9.neg_mul_add(mul, v5);
+    (v10, v12, v13, v11)
+}
+
+#[inline(always)]
+pub(super) fn do_idct_4<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 3 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    (v0, v1, v2, v3) = idct_4(d, v0, v1, v2, v3);
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_4_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 4);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 4 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    (v0, v1, v2, v3) = idct_4(d, v0, v1, v2, v3);
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_4_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 2 / D::F32Vec::LEN;
+    assert!(data.len() > 3 * row_stride);
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    (v0, v1, v2, v3) = idct_4(d, v0, v1, v2, v3);
+    v0.store_array(&mut data[row_stride * 0]);
+    v1.store_array(&mut data[row_stride * 1]);
+    v2.store_array(&mut data[row_stride * 2]);
+    v3.store_array(&mut data[row_stride * 3]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct8.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct8.rs
new file mode 100644
index 00000000..2364dec8
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct8.rs
@@ -0,0 +1,181 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(unused)]
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn idct_8<D: SimdDescriptor>(
+    d: D,
+    mut v0: D::F32Vec,
+    mut v1: D::F32Vec,
+    mut v2: D::F32Vec,
+    mut v3: D::F32Vec,
+    mut v4: D::F32Vec,
+    mut v5: D::F32Vec,
+    mut v6: D::F32Vec,
+    mut v7: D::F32Vec,
+) -> (
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+) {
+    let mut v8 = v0 + v4;
+    let mut v9 = v0 - v4;
+    let mut v10 = v2 + v6;
+    let mut v11 = v2 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v12 = v11 + v10;
+    let mut v13 = v11 - v10;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v14 = v12.mul_add(mul, v8);
+    let mut v15 = v12.neg_mul_add(mul, v8);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v16 = v13.mul_add(mul, v9);
+    let mut v17 = v13.neg_mul_add(mul, v9);
+    let mut v18 = v1 + v3;
+    let mut v19 = v3 + v5;
+    let mut v20 = v5 + v7;
+    let mut v21 = v1 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v22 = v21 + v19;
+    let mut v23 = v21 - v19;
+    let mut v24 = v18 + v20;
+    let mut v25 = v18 * D::F32Vec::splat(d, std::f32::consts::SQRT_2);
+    let mut v26 = v25 + v24;
+    let mut v27 = v25 - v24;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let mut v28 = v26.mul_add(mul, v22);
+    let mut v29 = v26.neg_mul_add(mul, v22);
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let mut v30 = v27.mul_add(mul, v23);
+    let mut v31 = v27.neg_mul_add(mul, v23);
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let mut v32 = v28.mul_add(mul, v14);
+    let mut v33 = v28.neg_mul_add(mul, v14);
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let mut v34 = v30.mul_add(mul, v16);
+    let mut v35 = v30.neg_mul_add(mul, v16);
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let mut v36 = v31.mul_add(mul, v17);
+    let mut v37 = v31.neg_mul_add(mul, v17);
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let mut v38 = v29.mul_add(mul, v15);
+    let mut v39 = v29.neg_mul_add(mul, v15);
+    (v32, v34, v36, v38, v39, v37, v35, v33)
+}
+
+#[inline(always)]
+pub(super) fn do_idct_8<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 7 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    let mut v4 = D::F32Vec::load_array(d, &data[4 * stride]);
+    let mut v5 = D::F32Vec::load_array(d, &data[5 * stride]);
+    let mut v6 = D::F32Vec::load_array(d, &data[6 * stride]);
+    let mut v7 = D::F32Vec::load_array(d, &data[7 * stride]);
+    (v0, v1, v2, v3, v4, v5, v6, v7) = idct_8(d, v0, v1, v2, v3, v4, v5, v6, v7);
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+    v4.store_array(&mut data[4 * stride]);
+    v5.store_array(&mut data[5 * stride]);
+    v6.store_array(&mut data[6 * stride]);
+    v7.store_array(&mut data[7 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_8_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 8);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 8 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    let mut v4 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)],
+    );
+    let mut v5 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)],
+    );
+    let mut v6 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)],
+    );
+    let mut v7 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)],
+    );
+    (v0, v1, v2, v3, v4, v5, v6, v7) = idct_8(d, v0, v1, v2, v3, v4, v5, v6, v7);
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+    v4.store_array(&mut data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)]);
+    v5.store_array(&mut data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)]);
+    v6.store_array(&mut data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)]);
+    v7.store_array(&mut data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_idct_8_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 4 / D::F32Vec::LEN;
+    assert!(data.len() > 7 * row_stride);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    (v0, v1, v2, v3, v4, v5, v6, v7) = idct_8(d, v0, v1, v2, v3, v4, v5, v6, v7);
+    v0.store_array(&mut data[row_stride * 0]);
+    v1.store_array(&mut data[row_stride * 1]);
+    v2.store_array(&mut data[row_stride * 2]);
+    v3.store_array(&mut data[row_stride * 3]);
+    v4.store_array(&mut data[row_stride * 4]);
+    v5.store_array(&mut data[row_stride * 5]);
+    v6.store_array(&mut data[row_stride * 6]);
+    v7.store_array(&mut data[row_stride * 7]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct_large.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct_large.rs
new file mode 100644
index 00000000..94c34d44
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/idct_large.rs
@@ -0,0 +1,589 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This file contains a generic implementation of large (>32x32) 2d IDCTs.
+// They are not implemented in the same way as smaller 2d IDCTs to reduce code size.
+
+#![allow(clippy::excessive_precision)]
+
+use std::f32::consts::SQRT_2;
+
+use jxl_simd::F32SimdVec;
+use jxl_simd::SimdDescriptor;
+
+use super::idct_32;
+
+const WC_WEIGHTS_64: [f32; 32] = [
+    0.500150636020651,
+    0.5013584524464084,
+    0.5037887256810443,
+    0.5074711720725553,
+    0.5124514794082247,
+    0.5187927131053328,
+    0.52657731515427,
+    0.535909816907992,
+    0.5469204379855088,
+    0.5597698129470802,
+    0.57465518403266,
+    0.5918185358574165,
+    0.6115573478825099,
+    0.6342389366884031,
+    0.6603198078137061,
+    0.6903721282002123,
+    0.7251205223771985,
+    0.7654941649730891,
+    0.8127020908144905,
+    0.8683447152233481,
+    0.9345835970364075,
+    1.0144082649970547,
+    1.1120716205797176,
+    1.233832737976571,
+    1.3892939586328277,
+    1.5939722833856311,
+    1.8746759800084078,
+    2.282050068005162,
+    2.924628428158216,
+    4.084611078129248,
+    6.796750711673633,
+    20.373878167231453,
+];
+
+const WC_WEIGHTS_128: [f32; 64] = [
+    0.5000376519155477,
+    0.5003390374428216,
+    0.5009427176380873,
+    0.5018505174842379,
+    0.5030651913013697,
+    0.5045904432216454,
+    0.5064309549285542,
+    0.5085924210498143,
+    0.5110815927066812,
+    0.5139063298475396,
+    0.5170756631334912,
+    0.5205998663018917,
+    0.524490540114724,
+    0.5287607092074876,
+    0.5334249333971333,
+    0.538499435291984,
+    0.5440022463817783,
+    0.549953374183236,
+    0.5563749934898856,
+    0.5632916653417023,
+    0.5707305880121454,
+    0.5787218851348208,
+    0.5872989370937893,
+    0.5964987630244563,
+    0.606362462272146,
+    0.6169357260050706,
+    0.6282694319707711,
+    0.6404203382416639,
+    0.6534518953751283,
+    0.6674352009263413,
+    0.6824501259764195,
+    0.6985866506472291,
+    0.7159464549705746,
+    0.7346448236478627,
+    0.7548129391165311,
+    0.776600658233963,
+    0.8001798956216941,
+    0.8257487738627852,
+    0.8535367510066064,
+    0.8838110045596234,
+    0.9168844461846523,
+    0.9531258743921193,
+    0.9929729612675466,
+    1.036949040910389,
+    1.0856850642580145,
+    1.1399486751015042,
+    1.2006832557294167,
+    1.2690611716991191,
+    1.346557628206286,
+    1.4350550884414341,
+    1.5369941008524954,
+    1.6555965242641195,
+    1.7952052190778898,
+    1.961817848571166,
+    2.163957818751979,
+    2.4141600002500763,
+    2.7316450287739396,
+    3.147462191781909,
+    3.7152427383269746,
+    4.5362909369693565,
+    5.827688377844654,
+    8.153848602466814,
+    13.58429025728446,
+    40.744688103351834,
+];
+
+const WC_WEIGHTS_256: [f32; 128] = [
+    0.5000094125358878,
+    0.500084723455784,
+    0.5002354020255269,
+    0.5004615618093246,
+    0.5007633734146156,
+    0.5011410648064231,
+    0.5015949217281668,
+    0.502125288230386,
+    0.5027325673091954,
+    0.5034172216566842,
+    0.5041797745258774,
+    0.5050208107132756,
+    0.5059409776624396,
+    0.5069409866925212,
+    0.5080216143561264,
+    0.509183703931388,
+    0.5104281670536573,
+    0.5117559854927805,
+    0.5131682130825206,
+    0.5146659778093218,
+    0.516250484068288,
+    0.5179230150949777,
+    0.5196849355823947,
+    0.5215376944933958,
+    0.5234828280796439,
+    0.52552196311921,
+    0.5276568203859896,
+    0.5298892183652453,
+    0.5322210772308335,
+    0.5346544231010253,
+    0.537191392591309,
+    0.5398342376841637,
+    0.5425853309375497,
+    0.545447171055775,
+    0.5484223888484947,
+    0.551513753605893,
+    0.554724179920619,
+    0.5580567349898085,
+    0.5615146464335654,
+    0.5651013106696203,
+    0.5688203018875696,
+    0.5726753816701664,
+    0.5766705093136241,
+    0.5808098529038624,
+    0.5850978012111273,
+    0.58953897647151,
+    0.5941382481306648,
+    0.5989007476325463,
+    0.6038318843443582,
+    0.6089373627182432,
+    0.614223200800649,
+    0.6196957502119484,
+    0.6253617177319102,
+    0.6312281886412079,
+    0.6373026519855411,
+    0.6435930279473415,
+    0.6501076975307724,
+    0.6568555347890955,
+    0.6638459418498757,
+    0.6710888870233562,
+    0.6785949463131795,
+    0.6863753486870501,
+    0.6944420255086364,
+    0.7028076645818034,
+    0.7114857693151208,
+    0.7204907235796304,
+    0.7298378629074134,
+    0.7395435527641373,
+    0.749625274727372,
+    0.7601017215162176,
+    0.7709929019493761,
+    0.7823202570613161,
+    0.7941067887834509,
+    0.8063772028037925,
+    0.8191580674598145,
+    0.83247799080191,
+    0.8463678182968619,
+    0.860860854031955,
+    0.8759931087426972,
+    0.8918035785352535,
+    0.9083345588266809,
+    0.9256319988042384,
+    0.9437459026371479,
+    0.962730784794803,
+    0.9826461881778968,
+    1.0035572754078206,
+    1.0255355056139732,
+    1.048659411496106,
+    1.0730154944316674,
+    1.0986992590905857,
+    1.1258164135986009,
+    1.1544842669978943,
+    1.184833362908442,
+    1.217009397314603,
+    1.2511754798461228,
+    1.287514812536712,
+    1.326233878832723,
+    1.3675662599582539,
+    1.411777227500661,
+    1.459169302866857,
+    1.5100890297227016,
+    1.5649352798258847,
+    1.6241695131835794,
+    1.6883285509131505,
+    1.7580406092704062,
+    1.8340456094306077,
+    1.9172211551275689,
+    2.0086161135167564,
+    2.1094945286246385,
+    2.22139377701127,
+    2.346202662531156,
+    2.486267909203593,
+    2.644541877144861,
+    2.824791402350551,
+    3.0318994541759925,
+    3.2723115884254845,
+    3.5547153325075804,
+    3.891107790700307,
+    4.298537526449054,
+    4.802076008665048,
+    5.440166215091329,
+    6.274908408039339,
+    7.413566756422303,
+    9.058751453879703,
+    11.644627325175037,
+    16.300023088031555,
+    27.163977662448232,
+    81.48784219222516,
+];
+
+#[inline(always)]
+fn idct_impl_inner<D: SimdDescriptor>(d: D, data: &mut [D::F32Vec], scratch: &mut [D::F32Vec]) {
+    let n = data.len();
+    assert!(scratch.len() >= n);
+
+    if n == 32 {
+        d.call(
+            #[inline(always)]
+            |_| {
+                (
+                    data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7],
+                    data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15],
+                    data[16], data[17], data[18], data[19], data[20], data[21], data[22], data[23],
+                    data[24], data[25], data[26], data[27], data[28], data[29], data[30], data[31],
+                ) = idct_32(
+                    d, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7],
+                    data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15],
+                    data[16], data[17], data[18], data[19], data[20], data[21], data[22], data[23],
+                    data[24], data[25], data[26], data[27], data[28], data[29], data[30], data[31],
+                )
+            },
+        );
+        return;
+    }
+
+    let wc_weights = match n {
+        64 => &WC_WEIGHTS_64[..],
+        128 => &WC_WEIGHTS_128[..],
+        256 => &WC_WEIGHTS_256[..],
+        _ => unreachable!("invalid large-dct size: {n}"),
+    };
+
+    assert_eq!(wc_weights.len(), n / 2);
+
+    let (first_half, second_half) = scratch[..n].split_at_mut(n / 2);
+    for i in 0..n / 2 {
+        first_half[i] = data[i * 2];
+        second_half[i] = data[2 * i + 1];
+    }
+
+    d.call(
+        #[inline(always)]
+        |_| idct_impl_inner(d, first_half, data),
+    );
+
+    for i in (1..n / 2).rev() {
+        second_half[i] += second_half[i - 1];
+    }
+    second_half[0] *= D::F32Vec::splat(d, SQRT_2);
+
+    d.call(
+        #[inline(always)]
+        |_| idct_impl_inner(d, second_half, data),
+    );
+
+    for i in 0..n / 2 {
+        let mul = D::F32Vec::splat(d, wc_weights[i]);
+        data[i] = second_half[i].mul_add(mul, first_half[i]);
+        data[n - i - 1] = second_half[i].neg_mul_add(mul, first_half[i]);
+    }
+}
+
+#[inline(always)]
+fn do_idct<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+    storage: &mut [D::F32Vec],
+    scratch: &mut [D::F32Vec],
+) {
+    let n = storage.len();
+    assert!((n - 1) * stride < data.len());
+    for i in 0..n {
+        storage[i] = D::F32Vec::load_array(d, &data[i * stride]);
+    }
+    d.call(
+        #[inline(always)]
+        |d| idct_impl_inner(d, storage, scratch),
+    );
+    for i in 0..n {
+        storage[i].store_array(&mut data[i * stride]);
+    }
+}
+
+#[inline(always)]
+fn do_idct_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    storage: &mut [D::F32Vec],
+    scratch: &mut [D::F32Vec],
+) {
+    let n = storage.len();
+    assert!(n.is_multiple_of(D::F32Vec::LEN));
+    assert!(data.len() >= n);
+
+    let row_stride = n / D::F32Vec::LEN;
+    for i in 0..n {
+        storage[i] = D::F32Vec::load_array(
+            d,
+            &data[row_stride * (i % D::F32Vec::LEN) + (i / D::F32Vec::LEN)],
+        );
+    }
+    d.call(
+        #[inline(always)]
+        |d| idct_impl_inner(d, storage, scratch),
+    );
+    for i in 0..n {
+        storage[i].store_array(&mut data[row_stride * (i % D::F32Vec::LEN) + (i / D::F32Vec::LEN)]);
+    }
+}
+
+#[inline(always)]
+fn do_idct_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    storage: &mut [D::F32Vec],
+    scratch: &mut [D::F32Vec],
+) {
+    let n = storage.len();
+    assert!(n.is_multiple_of(D::F32Vec::LEN));
+    assert!(data.len() >= n);
+
+    let row_stride = n / (2 * D::F32Vec::LEN);
+    for i in 0..n / 2 {
+        storage[i] = D::F32Vec::load_array(d, &data[row_stride * 2 * i]);
+        storage[i + n / 2] = D::F32Vec::load_array(d, &data[row_stride * (2 * i + 1)]);
+    }
+    d.call(
+        #[inline(always)]
+        |d| idct_impl_inner(d, storage, scratch),
+    );
+    for i in 0..n {
+        storage[i].store_array(&mut data[row_stride * i]);
+    }
+}
+
+#[inline(always)]
+fn idct2d_square<D: SimdDescriptor>(
+    d: D,
+    data: &mut [f32],
+    n: usize,
+    storage: &mut [D::F32Vec],
+    scratch: &mut [D::F32Vec],
+) {
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let chunks = n / D::F32Vec::LEN;
+    // Step 1: do column-DCTs on the first K columns.
+    for i in 0..chunks {
+        d.call(
+            #[inline(always)]
+            |_| do_idct(d, &mut data[i..], chunks, &mut storage[..n], scratch),
+        );
+    }
+    // Step 2: do column-DCTs on groups of K columns, transposing KxK blocks and
+    // swapping them in their final place as we do so.
+    for i in 0..chunks {
+        D::F32Vec::transpose_square(d, &mut data[i * n + i..], chunks);
+        for j in i + 1..chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * n + i..], chunks);
+            D::F32Vec::transpose_square(d, &mut data[i * n + j..], chunks);
+            for k in 0..D::F32Vec::LEN {
+                data.swap(i * n + j + k * chunks, j * n + i + k * chunks);
+            }
+        }
+        d.call(
+            #[inline(always)]
+            |_| do_idct(d, &mut data[i..], chunks, &mut storage[..n], scratch),
+        );
+    }
+}
+
+#[inline(always)]
+fn idct2d_wide<D: SimdDescriptor>(
+    d: D,
+    data: &mut [f32],
+    c: usize,
+    r: usize,
+    storage: &mut [D::F32Vec],
+    scratch: &mut [D::F32Vec],
+) {
+    assert!(r < c);
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = c / D::F32Vec::LEN;
+    let row_chunks = r / D::F32Vec::LEN;
+    // Step 1: do rowblock-DCTs on the first K rows, transposing KxK blocks first.
+    for i in 0..row_chunks {
+        for j in 0..column_chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * c + j..], column_chunks);
+        }
+        d.call(
+            #[inline(always)]
+            |_| do_idct_rowblock(d, &mut data[i * c..], &mut storage[..c], scratch),
+        );
+    }
+    // Step 2: do column-DCTs on groups of K columns, transposing KxK blocks back.
+    for i in 0..column_chunks {
+        for j in 0..row_chunks {
+            D::F32Vec::transpose_square(d, &mut data[j * c + i..], column_chunks);
+        }
+        d.call(
+            #[inline(always)]
+            |_| do_idct(d, &mut data[i..], column_chunks, &mut storage[..r], scratch),
+        );
+    }
+}
+
+#[inline(always)]
+fn idct2d_thin<D: SimdDescriptor>(
+    d: D,
+    data: &mut [f32],
+    c: usize,
+    r: usize,
+    storage: &mut [D::F32Vec],
+    scratch: &mut [D::F32Vec],
+) {
+    assert!(r > c);
+    let data = D::F32Vec::make_array_slice_mut(data);
+    let column_chunks = c / D::F32Vec::LEN;
+    let row_chunks = r / D::F32Vec::LEN;
+    // Note: input is transposed, so in the beginning it has ROWS *columns* and COLS *rows*.
+    // Step 1: do column-DCTs on columns.
+    for i in 0..row_chunks {
+        d.call(
+            #[inline(always)]
+            |_| do_idct(d, &mut data[i..], row_chunks, &mut storage[..c], scratch),
+        );
+    }
+    // Step 2: Incrementally transpose each square sub-block of the matrix, then do a column-IDCT which also completes the transpose.
+    for i in 0..column_chunks {
+        let tr_block = |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+            D::F32Vec::transpose_square(d, &mut data[i * r + j + l * column_chunks..], row_chunks)
+        };
+
+        (0..2).for_each(|l| tr_block(data, i, i, l));
+        for j in i + 1..column_chunks {
+            (0..2).for_each(|l| tr_block(data, i, j, l));
+            (0..2).for_each(|l| tr_block(data, j, i, l));
+            for l in 0..2 {
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(
+                        i * r + j + k * row_chunks + l * column_chunks,
+                        j * r + i + k * row_chunks + l * column_chunks,
+                    );
+                }
+            }
+        }
+        d.call(
+            #[inline(always)]
+            |_| do_idct_trh(d, &mut data[i..], &mut storage[..r], scratch),
+        );
+    }
+}
+
+macro_rules! make_idct2d {
+    ($name: ident, $h: literal, $w: literal) => {
+        pub fn $name<D: SimdDescriptor>(d: D, data: &mut [f32]) {
+            const L: usize = if $w < $h { $h } else { $w };
+            let mut storage = [D::F32Vec::zero(d); L];
+            let mut scratch = [D::F32Vec::zero(d); L];
+            if $w == $h {
+                return d.call(
+                    #[inline(always)]
+                    |_| idct2d_square(d, data, $w, &mut storage, &mut scratch),
+                );
+            }
+            if $w > $h {
+                return d.call(
+                    #[inline(always)]
+                    |_| idct2d_wide(d, data, $w, $h, &mut storage, &mut scratch),
+                );
+            }
+            return d.call(
+                #[inline(always)]
+                |_| idct2d_thin(d, data, $w, $h, &mut storage, &mut scratch),
+            );
+        }
+    };
+}
+
+make_idct2d!(idct2d_32_64, 32, 64);
+make_idct2d!(idct2d_64_32, 64, 32);
+make_idct2d!(idct2d_64_64, 64, 64);
+make_idct2d!(idct2d_64_128, 64, 128);
+make_idct2d!(idct2d_128_64, 128, 64);
+make_idct2d!(idct2d_128_128, 128, 128);
+make_idct2d!(idct2d_128_256, 128, 256);
+make_idct2d!(idct2d_256_128, 256, 128);
+make_idct2d!(idct2d_256_256, 256, 256);
+
+#[cfg(test)]
+#[inline(always)]
+pub fn do_idct_64<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    let mut storage = [D::F32Vec::zero(d); 64];
+    let mut scratch = [D::F32Vec::zero(d); 64];
+    d.call(
+        #[inline(always)]
+        |_| {
+            do_idct(d, data, stride, &mut storage, &mut scratch);
+        },
+    );
+}
+
+#[cfg(test)]
+#[inline(always)]
+pub fn do_idct_128<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    let mut storage = [D::F32Vec::zero(d); 128];
+    let mut scratch = [D::F32Vec::zero(d); 128];
+    d.call(
+        #[inline(always)]
+        |_| {
+            do_idct(d, data, stride, &mut storage, &mut scratch);
+        },
+    );
+}
+
+#[cfg(test)]
+#[inline(always)]
+pub fn do_idct_256<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    let mut storage = [D::F32Vec::zero(d); 256];
+    let mut scratch = [D::F32Vec::zero(d); 256];
+    d.call(
+        #[inline(always)]
+        |_| {
+            do_idct(d, data, stride, &mut storage, &mut scratch);
+        },
+    );
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/mod.rs
new file mode 100644
index 00000000..a7c343ba
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/mod.rs
@@ -0,0 +1,41 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+mod idct2d;
+mod reinterpreting_dct2d;
+pub mod transform;
+pub mod transform_map;
+
+mod idct16;
+mod idct2;
+mod idct32;
+mod idct4;
+mod idct8;
+mod idct_large;
+
+use idct2::*;
+use idct4::*;
+use idct8::*;
+use idct16::*;
+use idct32::*;
+
+mod reinterpreting_dct16;
+mod reinterpreting_dct2;
+mod reinterpreting_dct32;
+mod reinterpreting_dct4;
+mod reinterpreting_dct8;
+
+use reinterpreting_dct2::*;
+use reinterpreting_dct4::*;
+use reinterpreting_dct8::*;
+use reinterpreting_dct16::*;
+use reinterpreting_dct32::*;
+
+pub use idct_large::*;
+pub use idct2d::*;
+pub use reinterpreting_dct2d::*;
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct16.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct16.rs
new file mode 100644
index 00000000..f3bc267e
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct16.rs
@@ -0,0 +1,385 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn reinterpreting_dct_16<D: SimdDescriptor>(
+    d: D,
+    v0: D::F32Vec,
+    v1: D::F32Vec,
+    v2: D::F32Vec,
+    v3: D::F32Vec,
+    v4: D::F32Vec,
+    v5: D::F32Vec,
+    v6: D::F32Vec,
+    v7: D::F32Vec,
+    v8: D::F32Vec,
+    v9: D::F32Vec,
+    v10: D::F32Vec,
+    v11: D::F32Vec,
+    v12: D::F32Vec,
+    v13: D::F32Vec,
+    v14: D::F32Vec,
+    v15: D::F32Vec,
+) -> (
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+) {
+    let v16 = v0 + v15;
+    let v17 = v1 + v14;
+    let v18 = v2 + v13;
+    let v19 = v3 + v12;
+    let v20 = v4 + v11;
+    let v21 = v5 + v10;
+    let v22 = v6 + v9;
+    let v23 = v7 + v8;
+    let v24 = v16 + v23;
+    let v25 = v17 + v22;
+    let v26 = v18 + v21;
+    let v27 = v19 + v20;
+    let v28 = v24 + v27;
+    let v29 = v25 + v26;
+    let v30 = v28 + v29;
+    let v31 = v28 - v29;
+    let v32 = v24 - v27;
+    let v33 = v25 - v26;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v34 = v32 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v35 = v33 * mul;
+    let v36 = v34 + v35;
+    let v37 = v34 - v35;
+    let v38 = v36.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v37);
+    let v39 = v16 - v23;
+    let v40 = v17 - v22;
+    let v41 = v18 - v21;
+    let v42 = v19 - v20;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v43 = v39 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v44 = v40 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v45 = v41 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v46 = v42 * mul;
+    let v47 = v43 + v46;
+    let v48 = v44 + v45;
+    let v49 = v47 + v48;
+    let v50 = v47 - v48;
+    let v51 = v43 - v46;
+    let v52 = v44 - v45;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v53 = v51 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v54 = v52 * mul;
+    let v55 = v53 + v54;
+    let v56 = v53 - v54;
+    let v57 = v55.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v56);
+    let v58 = v49.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v57);
+    let v59 = v57 + v50;
+    let v60 = v50 + v56;
+    let v61 = v0 - v15;
+    let v62 = v1 - v14;
+    let v63 = v2 - v13;
+    let v64 = v3 - v12;
+    let v65 = v4 - v11;
+    let v66 = v5 - v10;
+    let v67 = v6 - v9;
+    let v68 = v7 - v8;
+    let mul = D::F32Vec::splat(d, 0.5024192861881557);
+    let v69 = v61 * mul;
+    let mul = D::F32Vec::splat(d, 0.5224986149396889);
+    let v70 = v62 * mul;
+    let mul = D::F32Vec::splat(d, 0.5669440348163577);
+    let v71 = v63 * mul;
+    let mul = D::F32Vec::splat(d, 0.6468217833599901);
+    let v72 = v64 * mul;
+    let mul = D::F32Vec::splat(d, 0.7881546234512502);
+    let v73 = v65 * mul;
+    let mul = D::F32Vec::splat(d, 1.0606776859903471);
+    let v74 = v66 * mul;
+    let mul = D::F32Vec::splat(d, 1.7224470982383342);
+    let v75 = v67 * mul;
+    let mul = D::F32Vec::splat(d, 5.1011486186891553);
+    let v76 = v68 * mul;
+    let v77 = v69 + v76;
+    let v78 = v70 + v75;
+    let v79 = v71 + v74;
+    let v80 = v72 + v73;
+    let v81 = v77 + v80;
+    let v82 = v78 + v79;
+    let v83 = v81 + v82;
+    let v84 = v81 - v82;
+    let v85 = v77 - v80;
+    let v86 = v78 - v79;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v87 = v85 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v88 = v86 * mul;
+    let v89 = v87 + v88;
+    let v90 = v87 - v88;
+    let v91 = v89.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v90);
+    let v92 = v69 - v76;
+    let v93 = v70 - v75;
+    let v94 = v71 - v74;
+    let v95 = v72 - v73;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v96 = v92 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v97 = v93 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v98 = v94 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v99 = v95 * mul;
+    let v100 = v96 + v99;
+    let v101 = v97 + v98;
+    let v102 = v100 + v101;
+    let v103 = v100 - v101;
+    let v104 = v96 - v99;
+    let v105 = v97 - v98;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v106 = v104 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v107 = v105 * mul;
+    let v108 = v106 + v107;
+    let v109 = v106 - v107;
+    let v110 = v108.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v109);
+    let v111 = v102.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v110);
+    let v112 = v110 + v103;
+    let v113 = v103 + v109;
+    let v114 = v83.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v111);
+    let v115 = v111 + v91;
+    let v116 = v91 + v112;
+    let v117 = v112 + v84;
+    let v118 = v84 + v113;
+    let v119 = v113 + v90;
+    let v120 = v90 + v109;
+    (
+        v30 * D::F32Vec::splat(d, 0.062500),
+        v114 * D::F32Vec::splat(d, 0.062599),
+        v58 * D::F32Vec::splat(d, 0.062897),
+        v115 * D::F32Vec::splat(d, 0.063398),
+        v38 * D::F32Vec::splat(d, 0.064110),
+        v116 * D::F32Vec::splat(d, 0.065042),
+        v59 * D::F32Vec::splat(d, 0.066206),
+        v117 * D::F32Vec::splat(d, 0.067622),
+        v31 * D::F32Vec::splat(d, 0.069309),
+        v118 * D::F32Vec::splat(d, 0.071294),
+        v60 * D::F32Vec::splat(d, 0.073611),
+        v119 * D::F32Vec::splat(d, 0.076300),
+        v37 * D::F32Vec::splat(d, 0.079410),
+        v120 * D::F32Vec::splat(d, 0.083003),
+        v56 * D::F32Vec::splat(d, 0.087156),
+        v109 * D::F32Vec::splat(d, 0.091963),
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_16<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 15 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    let mut v4 = D::F32Vec::load_array(d, &data[4 * stride]);
+    let mut v5 = D::F32Vec::load_array(d, &data[5 * stride]);
+    let mut v6 = D::F32Vec::load_array(d, &data[6 * stride]);
+    let mut v7 = D::F32Vec::load_array(d, &data[7 * stride]);
+    let mut v8 = D::F32Vec::load_array(d, &data[8 * stride]);
+    let mut v9 = D::F32Vec::load_array(d, &data[9 * stride]);
+    let mut v10 = D::F32Vec::load_array(d, &data[10 * stride]);
+    let mut v11 = D::F32Vec::load_array(d, &data[11 * stride]);
+    let mut v12 = D::F32Vec::load_array(d, &data[12 * stride]);
+    let mut v13 = D::F32Vec::load_array(d, &data[13 * stride]);
+    let mut v14 = D::F32Vec::load_array(d, &data[14 * stride]);
+    let mut v15 = D::F32Vec::load_array(d, &data[15 * stride]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    ) = reinterpreting_dct_16(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    );
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+    v4.store_array(&mut data[4 * stride]);
+    v5.store_array(&mut data[5 * stride]);
+    v6.store_array(&mut data[6 * stride]);
+    v7.store_array(&mut data[7 * stride]);
+    v8.store_array(&mut data[8 * stride]);
+    v9.store_array(&mut data[9 * stride]);
+    v10.store_array(&mut data[10 * stride]);
+    v11.store_array(&mut data[11 * stride]);
+    v12.store_array(&mut data[12 * stride]);
+    v13.store_array(&mut data[13 * stride]);
+    v14.store_array(&mut data[14 * stride]);
+    v15.store_array(&mut data[15 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_16_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 16);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 16 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    let mut v4 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)],
+    );
+    let mut v5 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)],
+    );
+    let mut v6 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)],
+    );
+    let mut v7 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)],
+    );
+    let mut v8 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)],
+    );
+    let mut v9 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)],
+    );
+    let mut v10 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)],
+    );
+    let mut v11 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)],
+    );
+    let mut v12 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)],
+    );
+    let mut v13 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)],
+    );
+    let mut v14 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)],
+    );
+    let mut v15 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)],
+    );
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    ) = reinterpreting_dct_16(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    );
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+    v4.store_array(&mut data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)]);
+    v5.store_array(&mut data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)]);
+    v6.store_array(&mut data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)]);
+    v7.store_array(&mut data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)]);
+    v8.store_array(&mut data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)]);
+    v9.store_array(&mut data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)]);
+    v10.store_array(&mut data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)]);
+    v11.store_array(&mut data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)]);
+    v12.store_array(&mut data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)]);
+    v13.store_array(&mut data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)]);
+    v14.store_array(&mut data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)]);
+    v15.store_array(&mut data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_16_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 8 / D::F32Vec::LEN;
+    assert!(data.len() > 15 * row_stride);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    let mut v8 = D::F32Vec::load_array(d, &data[row_stride * 8]);
+    let mut v9 = D::F32Vec::load_array(d, &data[row_stride * 9]);
+    let mut v10 = D::F32Vec::load_array(d, &data[row_stride * 10]);
+    let mut v11 = D::F32Vec::load_array(d, &data[row_stride * 11]);
+    let mut v12 = D::F32Vec::load_array(d, &data[row_stride * 12]);
+    let mut v13 = D::F32Vec::load_array(d, &data[row_stride * 13]);
+    let mut v14 = D::F32Vec::load_array(d, &data[row_stride * 14]);
+    let mut v15 = D::F32Vec::load_array(d, &data[row_stride * 15]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    ) = reinterpreting_dct_16(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+    );
+    v0.store_array(&mut data[row_stride * 0]);
+    v8.store_array(&mut data[row_stride * 1]);
+    v1.store_array(&mut data[row_stride * 2]);
+    v9.store_array(&mut data[row_stride * 3]);
+    v2.store_array(&mut data[row_stride * 4]);
+    v10.store_array(&mut data[row_stride * 5]);
+    v3.store_array(&mut data[row_stride * 6]);
+    v11.store_array(&mut data[row_stride * 7]);
+    v4.store_array(&mut data[row_stride * 8]);
+    v12.store_array(&mut data[row_stride * 9]);
+    v5.store_array(&mut data[row_stride * 10]);
+    v13.store_array(&mut data[row_stride * 11]);
+    v6.store_array(&mut data[row_stride * 12]);
+    v14.store_array(&mut data[row_stride * 13]);
+    v7.store_array(&mut data[row_stride * 14]);
+    v15.store_array(&mut data[row_stride * 15]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct2.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct2.rs
new file mode 100644
index 00000000..f5caab06
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct2.rs
@@ -0,0 +1,39 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn reinterpreting_dct_2<D: SimdDescriptor>(
+    d: D,
+    v0: D::F32Vec,
+    v1: D::F32Vec,
+) -> (D::F32Vec, D::F32Vec) {
+    let v2 = v0 + v1;
+    let v3 = v0 - v1;
+    (
+        v2 * D::F32Vec::splat(d, 0.500000),
+        v3 * D::F32Vec::splat(d, 0.554469),
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_2<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 1 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    (v0, v1) = reinterpreting_dct_2(d, v0, v1);
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct2d.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct2d.rs
new file mode 100644
index 00000000..357ce3cd
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct2d.rs
@@ -0,0 +1,645 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::*;
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[inline(always)]
+fn reinterpreting_dct2d_1_2_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 2, "Data length mismatch");
+    assert!(output.len() > 1);
+    const { assert!(1usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        do_reinterpreting_dct_2(d, data, 1);
+    }
+    for y in 0..1 {
+        for x in 0..2 {
+            output[y * 16 + x] = data[y * 2 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_2_1_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 2, "Data length mismatch");
+    assert!(output.len() > 1);
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(1usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        do_reinterpreting_dct_2(d, data, 1);
+    }
+    for y in 0..1 {
+        for x in 0..2 {
+            output[y * 16 + x] = data[y * 2 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_1_4_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 4, "Data length mismatch");
+    assert!(output.len() > 3);
+    const { assert!(1usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        do_reinterpreting_dct_4(d, data, 1);
+    }
+    for y in 0..1 {
+        for x in 0..4 {
+            output[y * 32 + x] = data[y * 4 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_4_1_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 4, "Data length mismatch");
+    assert!(output.len() > 3);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(1usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        do_reinterpreting_dct_4(d, data, 1);
+    }
+    for y in 0..1 {
+        for x in 0..4 {
+            output[y * 32 + x] = data[y * 4 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_2_2_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 4, "Data length mismatch");
+    assert!(output.len() > 17);
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let chunks = 2 / D::F32Vec::LEN;
+        for i in 0..chunks {
+            do_reinterpreting_dct_2(d, &mut data[i..], chunks);
+        }
+        for i in 0..chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 2 + i..], chunks);
+            for j in i + 1..chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 2 + i..], chunks);
+                D::F32Vec::transpose_square(d, &mut data[i * 2 + j..], chunks);
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(i * 2 + j + k * chunks, j * 2 + i + k * chunks);
+                }
+            }
+            do_reinterpreting_dct_2(d, &mut data[i..], chunks);
+        }
+    }
+    for y in 0..2 {
+        for x in 0..2 {
+            output[y * 16 + x] = data[y * 2 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_2_4_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 8, "Data length mismatch");
+    assert!(output.len() > 35);
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 4 / D::F32Vec::LEN;
+        let row_chunks = 2 / D::F32Vec::LEN;
+        for i in 0..row_chunks {
+            for j in 0..column_chunks {
+                D::F32Vec::transpose_square(d, &mut data[i * 4 + j..], column_chunks);
+            }
+            do_reinterpreting_dct_4_rowblock(d, &mut data[i * 4..]);
+        }
+        for i in 0..column_chunks {
+            for j in 0..row_chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 4 + i..], column_chunks);
+            }
+            do_reinterpreting_dct_2(d, &mut data[i..], column_chunks)
+        }
+    }
+    for y in 0..2 {
+        for x in 0..4 {
+            output[y * 32 + x] = data[y * 4 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_4_2_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 8, "Data length mismatch");
+    assert!(output.len() > 35);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 2 / D::F32Vec::LEN;
+        let row_chunks = 4 / D::F32Vec::LEN;
+        for i in 0..column_chunks {
+            do_reinterpreting_dct_4_trh(d, &mut data[i..]);
+        }
+        for l in 0..2 {
+            for i in 0..column_chunks {
+                let tr_block =
+                    |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+                        D::F32Vec::transpose_square(
+                            d,
+                            &mut data[i * 4 + j + l * column_chunks..],
+                            row_chunks,
+                        )
+                    };
+                tr_block(data, i, i, l);
+                for j in i + 1..column_chunks {
+                    tr_block(data, i, j, l);
+                    tr_block(data, j, i, l);
+                    for k in 0..D::F32Vec::LEN {
+                        data.swap(
+                            i * 4 + j + k * row_chunks + l * column_chunks,
+                            j * 4 + i + k * row_chunks + l * column_chunks,
+                        );
+                    }
+                }
+                do_reinterpreting_dct_2(d, &mut data[i + l * column_chunks..], row_chunks);
+            }
+        }
+    }
+    for y in 0..2 {
+        for x in 0..4 {
+            output[y * 32 + x] = data[y * 4 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_4_4_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 16, "Data length mismatch");
+    assert!(output.len() > 99);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let chunks = 4 / D::F32Vec::LEN;
+        for i in 0..chunks {
+            do_reinterpreting_dct_4(d, &mut data[i..], chunks);
+        }
+        for i in 0..chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 4 + i..], chunks);
+            for j in i + 1..chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 4 + i..], chunks);
+                D::F32Vec::transpose_square(d, &mut data[i * 4 + j..], chunks);
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(i * 4 + j + k * chunks, j * 4 + i + k * chunks);
+                }
+            }
+            do_reinterpreting_dct_4(d, &mut data[i..], chunks);
+        }
+    }
+    for y in 0..4 {
+        for x in 0..4 {
+            output[y * 32 + x] = data[y * 4 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_4_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 32, "Data length mismatch");
+    assert!(output.len() > 199);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 8 / D::F32Vec::LEN;
+        let row_chunks = 4 / D::F32Vec::LEN;
+        for i in 0..row_chunks {
+            for j in 0..column_chunks {
+                D::F32Vec::transpose_square(d, &mut data[i * 8 + j..], column_chunks);
+            }
+            do_reinterpreting_dct_8_rowblock(d, &mut data[i * 8..]);
+        }
+        for i in 0..column_chunks {
+            for j in 0..row_chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 8 + i..], column_chunks);
+            }
+            do_reinterpreting_dct_4(d, &mut data[i..], column_chunks)
+        }
+    }
+    for y in 0..4 {
+        for x in 0..8 {
+            output[y * 64 + x] = data[y * 8 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_8_4_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 32, "Data length mismatch");
+    assert!(output.len() > 199);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 4 / D::F32Vec::LEN;
+        let row_chunks = 8 / D::F32Vec::LEN;
+        for i in 0..column_chunks {
+            do_reinterpreting_dct_8_trh(d, &mut data[i..]);
+        }
+        for l in 0..2 {
+            for i in 0..column_chunks {
+                let tr_block =
+                    |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+                        D::F32Vec::transpose_square(
+                            d,
+                            &mut data[i * 8 + j + l * column_chunks..],
+                            row_chunks,
+                        )
+                    };
+                tr_block(data, i, i, l);
+                for j in i + 1..column_chunks {
+                    tr_block(data, i, j, l);
+                    tr_block(data, j, i, l);
+                    for k in 0..D::F32Vec::LEN {
+                        data.swap(
+                            i * 8 + j + k * row_chunks + l * column_chunks,
+                            j * 8 + i + k * row_chunks + l * column_chunks,
+                        );
+                    }
+                }
+                do_reinterpreting_dct_4(d, &mut data[i + l * column_chunks..], row_chunks);
+            }
+        }
+    }
+    for y in 0..4 {
+        for x in 0..8 {
+            output[y * 64 + x] = data[y * 8 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_8_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 64, "Data length mismatch");
+    assert!(output.len() > 455);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let chunks = 8 / D::F32Vec::LEN;
+        for i in 0..chunks {
+            do_reinterpreting_dct_8(d, &mut data[i..], chunks);
+        }
+        for i in 0..chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 8 + i..], chunks);
+            for j in i + 1..chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 8 + i..], chunks);
+                D::F32Vec::transpose_square(d, &mut data[i * 8 + j..], chunks);
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(i * 8 + j + k * chunks, j * 8 + i + k * chunks);
+                }
+            }
+            do_reinterpreting_dct_8(d, &mut data[i..], chunks);
+        }
+    }
+    for y in 0..8 {
+        for x in 0..8 {
+            output[y * 64 + x] = data[y * 8 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_8_16_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 128, "Data length mismatch");
+    assert!(output.len() > 911);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 16 / D::F32Vec::LEN;
+        let row_chunks = 8 / D::F32Vec::LEN;
+        for i in 0..row_chunks {
+            for j in 0..column_chunks {
+                D::F32Vec::transpose_square(d, &mut data[i * 16 + j..], column_chunks);
+            }
+            do_reinterpreting_dct_16_rowblock(d, &mut data[i * 16..]);
+        }
+        for i in 0..column_chunks {
+            for j in 0..row_chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 16 + i..], column_chunks);
+            }
+            do_reinterpreting_dct_8(d, &mut data[i..], column_chunks)
+        }
+    }
+    for y in 0..8 {
+        for x in 0..16 {
+            output[y * 128 + x] = data[y * 16 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_16_8_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 128, "Data length mismatch");
+    assert!(output.len() > 911);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 8 / D::F32Vec::LEN;
+        let row_chunks = 16 / D::F32Vec::LEN;
+        for i in 0..column_chunks {
+            do_reinterpreting_dct_16_trh(d, &mut data[i..]);
+        }
+        for l in 0..2 {
+            for i in 0..column_chunks {
+                let tr_block =
+                    |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+                        D::F32Vec::transpose_square(
+                            d,
+                            &mut data[i * 16 + j + l * column_chunks..],
+                            row_chunks,
+                        )
+                    };
+                tr_block(data, i, i, l);
+                for j in i + 1..column_chunks {
+                    tr_block(data, i, j, l);
+                    tr_block(data, j, i, l);
+                    for k in 0..D::F32Vec::LEN {
+                        data.swap(
+                            i * 16 + j + k * row_chunks + l * column_chunks,
+                            j * 16 + i + k * row_chunks + l * column_chunks,
+                        );
+                    }
+                }
+                do_reinterpreting_dct_8(d, &mut data[i + l * column_chunks..], row_chunks);
+            }
+        }
+    }
+    for y in 0..8 {
+        for x in 0..16 {
+            output[y * 128 + x] = data[y * 16 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_16_16_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 256, "Data length mismatch");
+    assert!(output.len() > 1935);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let chunks = 16 / D::F32Vec::LEN;
+        for i in 0..chunks {
+            do_reinterpreting_dct_16(d, &mut data[i..], chunks);
+        }
+        for i in 0..chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 16 + i..], chunks);
+            for j in i + 1..chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 16 + i..], chunks);
+                D::F32Vec::transpose_square(d, &mut data[i * 16 + j..], chunks);
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(i * 16 + j + k * chunks, j * 16 + i + k * chunks);
+                }
+            }
+            do_reinterpreting_dct_16(d, &mut data[i..], chunks);
+        }
+    }
+    for y in 0..16 {
+        for x in 0..16 {
+            output[y * 128 + x] = data[y * 16 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_16_32_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 512, "Data length mismatch");
+    assert!(output.len() > 3871);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 32 / D::F32Vec::LEN;
+        let row_chunks = 16 / D::F32Vec::LEN;
+        for i in 0..row_chunks {
+            for j in 0..column_chunks {
+                D::F32Vec::transpose_square(d, &mut data[i * 32 + j..], column_chunks);
+            }
+            do_reinterpreting_dct_32_rowblock(d, &mut data[i * 32..]);
+        }
+        for i in 0..column_chunks {
+            for j in 0..row_chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 32 + i..], column_chunks);
+            }
+            do_reinterpreting_dct_16(d, &mut data[i..], column_chunks)
+        }
+    }
+    for y in 0..16 {
+        for x in 0..32 {
+            output[y * 256 + x] = data[y * 32 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_32_16_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 512, "Data length mismatch");
+    assert!(output.len() > 3871);
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let column_chunks = 16 / D::F32Vec::LEN;
+        let row_chunks = 32 / D::F32Vec::LEN;
+        for i in 0..column_chunks {
+            do_reinterpreting_dct_32_trh(d, &mut data[i..]);
+        }
+        for l in 0..2 {
+            for i in 0..column_chunks {
+                let tr_block =
+                    |data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray], i, j, l| {
+                        D::F32Vec::transpose_square(
+                            d,
+                            &mut data[i * 32 + j + l * column_chunks..],
+                            row_chunks,
+                        )
+                    };
+                tr_block(data, i, i, l);
+                for j in i + 1..column_chunks {
+                    tr_block(data, i, j, l);
+                    tr_block(data, j, i, l);
+                    for k in 0..D::F32Vec::LEN {
+                        data.swap(
+                            i * 32 + j + k * row_chunks + l * column_chunks,
+                            j * 32 + i + k * row_chunks + l * column_chunks,
+                        );
+                    }
+                }
+                do_reinterpreting_dct_16(d, &mut data[i + l * column_chunks..], row_chunks);
+            }
+        }
+    }
+    for y in 0..16 {
+        for x in 0..32 {
+            output[y * 256 + x] = data[y * 32 + x];
+        }
+    }
+}
+
+#[inline(always)]
+fn reinterpreting_dct2d_32_32_impl<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    assert_eq!(data.len(), 1024, "Data length mismatch");
+    assert!(output.len() > 7967);
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    {
+        let data = D::F32Vec::make_array_slice_mut(data);
+        let chunks = 32 / D::F32Vec::LEN;
+        for i in 0..chunks {
+            do_reinterpreting_dct_32(d, &mut data[i..], chunks);
+        }
+        for i in 0..chunks {
+            D::F32Vec::transpose_square(d, &mut data[i * 32 + i..], chunks);
+            for j in i + 1..chunks {
+                D::F32Vec::transpose_square(d, &mut data[j * 32 + i..], chunks);
+                D::F32Vec::transpose_square(d, &mut data[i * 32 + j..], chunks);
+                for k in 0..D::F32Vec::LEN {
+                    data.swap(i * 32 + j + k * chunks, j * 32 + i + k * chunks);
+                }
+            }
+            do_reinterpreting_dct_32(d, &mut data[i..], chunks);
+        }
+    }
+    for y in 0..32 {
+        for x in 0..32 {
+            output[y * 256 + x] = data[y * 32 + x];
+        }
+    }
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_1_2<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_1_2_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_2_1<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_2_1_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_1_4<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_1_4_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_4_1<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_4_1_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_2_2<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_2_2_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_2_4<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_2_4_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_4_2<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = jxl_simd::ScalarDescriptor::new().unwrap();
+    reinterpreting_dct2d_4_2_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_4_4<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = d.maybe_downgrade_128bit();
+    reinterpreting_dct2d_4_4_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_4_8<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = d.maybe_downgrade_128bit();
+    reinterpreting_dct2d_4_8_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_8_4<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = d.maybe_downgrade_128bit();
+    reinterpreting_dct2d_8_4_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_8_8<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    reinterpreting_dct2d_8_8_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_8_16<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    reinterpreting_dct2d_8_16_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_16_8<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    let d = d.maybe_downgrade_256bit();
+    reinterpreting_dct2d_16_8_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_16_16<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    reinterpreting_dct2d_16_16_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_16_32<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    reinterpreting_dct2d_16_32_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_32_16<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    reinterpreting_dct2d_32_16_impl(d, data, output)
+}
+
+#[inline(always)]
+#[allow(unused_variables)]
+pub fn reinterpreting_dct2d_32_32<D: SimdDescriptor>(d: D, data: &mut [f32], output: &mut [f32]) {
+    reinterpreting_dct2d_32_32_impl(d, data, output)
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct32.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct32.rs
new file mode 100644
index 00000000..5e4388fc
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct32.rs
@@ -0,0 +1,791 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn reinterpreting_dct_32<D: SimdDescriptor>(
+    d: D,
+    v0: D::F32Vec,
+    v1: D::F32Vec,
+    v2: D::F32Vec,
+    v3: D::F32Vec,
+    v4: D::F32Vec,
+    v5: D::F32Vec,
+    v6: D::F32Vec,
+    v7: D::F32Vec,
+    v8: D::F32Vec,
+    v9: D::F32Vec,
+    v10: D::F32Vec,
+    v11: D::F32Vec,
+    v12: D::F32Vec,
+    v13: D::F32Vec,
+    v14: D::F32Vec,
+    v15: D::F32Vec,
+    v16: D::F32Vec,
+    v17: D::F32Vec,
+    v18: D::F32Vec,
+    v19: D::F32Vec,
+    v20: D::F32Vec,
+    v21: D::F32Vec,
+    v22: D::F32Vec,
+    v23: D::F32Vec,
+    v24: D::F32Vec,
+    v25: D::F32Vec,
+    v26: D::F32Vec,
+    v27: D::F32Vec,
+    v28: D::F32Vec,
+    v29: D::F32Vec,
+    v30: D::F32Vec,
+    v31: D::F32Vec,
+) -> (
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+) {
+    let v32 = v0 + v31;
+    let v33 = v1 + v30;
+    let v34 = v2 + v29;
+    let v35 = v3 + v28;
+    let v36 = v4 + v27;
+    let v37 = v5 + v26;
+    let v38 = v6 + v25;
+    let v39 = v7 + v24;
+    let v40 = v8 + v23;
+    let v41 = v9 + v22;
+    let v42 = v10 + v21;
+    let v43 = v11 + v20;
+    let v44 = v12 + v19;
+    let v45 = v13 + v18;
+    let v46 = v14 + v17;
+    let v47 = v15 + v16;
+    let v48 = v32 + v47;
+    let v49 = v33 + v46;
+    let v50 = v34 + v45;
+    let v51 = v35 + v44;
+    let v52 = v36 + v43;
+    let v53 = v37 + v42;
+    let v54 = v38 + v41;
+    let v55 = v39 + v40;
+    let v56 = v48 + v55;
+    let v57 = v49 + v54;
+    let v58 = v50 + v53;
+    let v59 = v51 + v52;
+    let v60 = v56 + v59;
+    let v61 = v57 + v58;
+    let v62 = v60 + v61;
+    let v63 = v60 - v61;
+    let v64 = v56 - v59;
+    let v65 = v57 - v58;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v66 = v64 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v67 = v65 * mul;
+    let v68 = v66 + v67;
+    let v69 = v66 - v67;
+    let v70 = v68.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v69);
+    let v71 = v48 - v55;
+    let v72 = v49 - v54;
+    let v73 = v50 - v53;
+    let v74 = v51 - v52;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v75 = v71 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v76 = v72 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v77 = v73 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v78 = v74 * mul;
+    let v79 = v75 + v78;
+    let v80 = v76 + v77;
+    let v81 = v79 + v80;
+    let v82 = v79 - v80;
+    let v83 = v75 - v78;
+    let v84 = v76 - v77;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v85 = v83 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v86 = v84 * mul;
+    let v87 = v85 + v86;
+    let v88 = v85 - v86;
+    let v89 = v87.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v88);
+    let v90 = v81.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v89);
+    let v91 = v89 + v82;
+    let v92 = v82 + v88;
+    let v93 = v32 - v47;
+    let v94 = v33 - v46;
+    let v95 = v34 - v45;
+    let v96 = v35 - v44;
+    let v97 = v36 - v43;
+    let v98 = v37 - v42;
+    let v99 = v38 - v41;
+    let v100 = v39 - v40;
+    let mul = D::F32Vec::splat(d, 0.5024192861881557);
+    let v101 = v93 * mul;
+    let mul = D::F32Vec::splat(d, 0.5224986149396889);
+    let v102 = v94 * mul;
+    let mul = D::F32Vec::splat(d, 0.5669440348163577);
+    let v103 = v95 * mul;
+    let mul = D::F32Vec::splat(d, 0.6468217833599901);
+    let v104 = v96 * mul;
+    let mul = D::F32Vec::splat(d, 0.7881546234512502);
+    let v105 = v97 * mul;
+    let mul = D::F32Vec::splat(d, 1.0606776859903471);
+    let v106 = v98 * mul;
+    let mul = D::F32Vec::splat(d, 1.7224470982383342);
+    let v107 = v99 * mul;
+    let mul = D::F32Vec::splat(d, 5.1011486186891553);
+    let v108 = v100 * mul;
+    let v109 = v101 + v108;
+    let v110 = v102 + v107;
+    let v111 = v103 + v106;
+    let v112 = v104 + v105;
+    let v113 = v109 + v112;
+    let v114 = v110 + v111;
+    let v115 = v113 + v114;
+    let v116 = v113 - v114;
+    let v117 = v109 - v112;
+    let v118 = v110 - v111;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v119 = v117 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v120 = v118 * mul;
+    let v121 = v119 + v120;
+    let v122 = v119 - v120;
+    let v123 = v121.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v122);
+    let v124 = v101 - v108;
+    let v125 = v102 - v107;
+    let v126 = v103 - v106;
+    let v127 = v104 - v105;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v128 = v124 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v129 = v125 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v130 = v126 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v131 = v127 * mul;
+    let v132 = v128 + v131;
+    let v133 = v129 + v130;
+    let v134 = v132 + v133;
+    let v135 = v132 - v133;
+    let v136 = v128 - v131;
+    let v137 = v129 - v130;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v138 = v136 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v139 = v137 * mul;
+    let v140 = v138 + v139;
+    let v141 = v138 - v139;
+    let v142 = v140.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v141);
+    let v143 = v134.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v142);
+    let v144 = v142 + v135;
+    let v145 = v135 + v141;
+    let v146 = v115.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v143);
+    let v147 = v143 + v123;
+    let v148 = v123 + v144;
+    let v149 = v144 + v116;
+    let v150 = v116 + v145;
+    let v151 = v145 + v122;
+    let v152 = v122 + v141;
+    let v153 = v0 - v31;
+    let v154 = v1 - v30;
+    let v155 = v2 - v29;
+    let v156 = v3 - v28;
+    let v157 = v4 - v27;
+    let v158 = v5 - v26;
+    let v159 = v6 - v25;
+    let v160 = v7 - v24;
+    let v161 = v8 - v23;
+    let v162 = v9 - v22;
+    let v163 = v10 - v21;
+    let v164 = v11 - v20;
+    let v165 = v12 - v19;
+    let v166 = v13 - v18;
+    let v167 = v14 - v17;
+    let v168 = v15 - v16;
+    let mul = D::F32Vec::splat(d, 0.5006029982351963);
+    let v169 = v153 * mul;
+    let mul = D::F32Vec::splat(d, 0.5054709598975436);
+    let v170 = v154 * mul;
+    let mul = D::F32Vec::splat(d, 0.5154473099226246);
+    let v171 = v155 * mul;
+    let mul = D::F32Vec::splat(d, 0.5310425910897841);
+    let v172 = v156 * mul;
+    let mul = D::F32Vec::splat(d, 0.5531038960344445);
+    let v173 = v157 * mul;
+    let mul = D::F32Vec::splat(d, 0.5829349682061339);
+    let v174 = v158 * mul;
+    let mul = D::F32Vec::splat(d, 0.6225041230356648);
+    let v175 = v159 * mul;
+    let mul = D::F32Vec::splat(d, 0.6748083414550057);
+    let v176 = v160 * mul;
+    let mul = D::F32Vec::splat(d, 0.7445362710022986);
+    let v177 = v161 * mul;
+    let mul = D::F32Vec::splat(d, 0.8393496454155268);
+    let v178 = v162 * mul;
+    let mul = D::F32Vec::splat(d, 0.9725682378619608);
+    let v179 = v163 * mul;
+    let mul = D::F32Vec::splat(d, 1.1694399334328847);
+    let v180 = v164 * mul;
+    let mul = D::F32Vec::splat(d, 1.4841646163141662);
+    let v181 = v165 * mul;
+    let mul = D::F32Vec::splat(d, 2.0577810099534108);
+    let v182 = v166 * mul;
+    let mul = D::F32Vec::splat(d, 3.4076084184687190);
+    let v183 = v167 * mul;
+    let mul = D::F32Vec::splat(d, 10.1900081235480329);
+    let v184 = v168 * mul;
+    let v185 = v169 + v184;
+    let v186 = v170 + v183;
+    let v187 = v171 + v182;
+    let v188 = v172 + v181;
+    let v189 = v173 + v180;
+    let v190 = v174 + v179;
+    let v191 = v175 + v178;
+    let v192 = v176 + v177;
+    let v193 = v185 + v192;
+    let v194 = v186 + v191;
+    let v195 = v187 + v190;
+    let v196 = v188 + v189;
+    let v197 = v193 + v196;
+    let v198 = v194 + v195;
+    let v199 = v197 + v198;
+    let v200 = v197 - v198;
+    let v201 = v193 - v196;
+    let v202 = v194 - v195;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v203 = v201 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v204 = v202 * mul;
+    let v205 = v203 + v204;
+    let v206 = v203 - v204;
+    let v207 = v205.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v206);
+    let v208 = v185 - v192;
+    let v209 = v186 - v191;
+    let v210 = v187 - v190;
+    let v211 = v188 - v189;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v212 = v208 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v213 = v209 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v214 = v210 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v215 = v211 * mul;
+    let v216 = v212 + v215;
+    let v217 = v213 + v214;
+    let v218 = v216 + v217;
+    let v219 = v216 - v217;
+    let v220 = v212 - v215;
+    let v221 = v213 - v214;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v222 = v220 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v223 = v221 * mul;
+    let v224 = v222 + v223;
+    let v225 = v222 - v223;
+    let v226 = v224.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v225);
+    let v227 = v218.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v226);
+    let v228 = v226 + v219;
+    let v229 = v219 + v225;
+    let v230 = v169 - v184;
+    let v231 = v170 - v183;
+    let v232 = v171 - v182;
+    let v233 = v172 - v181;
+    let v234 = v173 - v180;
+    let v235 = v174 - v179;
+    let v236 = v175 - v178;
+    let v237 = v176 - v177;
+    let mul = D::F32Vec::splat(d, 0.5024192861881557);
+    let v238 = v230 * mul;
+    let mul = D::F32Vec::splat(d, 0.5224986149396889);
+    let v239 = v231 * mul;
+    let mul = D::F32Vec::splat(d, 0.5669440348163577);
+    let v240 = v232 * mul;
+    let mul = D::F32Vec::splat(d, 0.6468217833599901);
+    let v241 = v233 * mul;
+    let mul = D::F32Vec::splat(d, 0.7881546234512502);
+    let v242 = v234 * mul;
+    let mul = D::F32Vec::splat(d, 1.0606776859903471);
+    let v243 = v235 * mul;
+    let mul = D::F32Vec::splat(d, 1.7224470982383342);
+    let v244 = v236 * mul;
+    let mul = D::F32Vec::splat(d, 5.1011486186891553);
+    let v245 = v237 * mul;
+    let v246 = v238 + v245;
+    let v247 = v239 + v244;
+    let v248 = v240 + v243;
+    let v249 = v241 + v242;
+    let v250 = v246 + v249;
+    let v251 = v247 + v248;
+    let v252 = v250 + v251;
+    let v253 = v250 - v251;
+    let v254 = v246 - v249;
+    let v255 = v247 - v248;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v256 = v254 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v257 = v255 * mul;
+    let v258 = v256 + v257;
+    let v259 = v256 - v257;
+    let v260 = v258.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v259);
+    let v261 = v238 - v245;
+    let v262 = v239 - v244;
+    let v263 = v240 - v243;
+    let v264 = v241 - v242;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v265 = v261 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v266 = v262 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v267 = v263 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v268 = v264 * mul;
+    let v269 = v265 + v268;
+    let v270 = v266 + v267;
+    let v271 = v269 + v270;
+    let v272 = v269 - v270;
+    let v273 = v265 - v268;
+    let v274 = v266 - v267;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v275 = v273 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v276 = v274 * mul;
+    let v277 = v275 + v276;
+    let v278 = v275 - v276;
+    let v279 = v277.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v278);
+    let v280 = v271.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v279);
+    let v281 = v279 + v272;
+    let v282 = v272 + v278;
+    let v283 = v252.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v280);
+    let v284 = v280 + v260;
+    let v285 = v260 + v281;
+    let v286 = v281 + v253;
+    let v287 = v253 + v282;
+    let v288 = v282 + v259;
+    let v289 = v259 + v278;
+    let v290 = v199.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v283);
+    let v291 = v283 + v227;
+    let v292 = v227 + v284;
+    let v293 = v284 + v207;
+    let v294 = v207 + v285;
+    let v295 = v285 + v228;
+    let v296 = v228 + v286;
+    let v297 = v286 + v200;
+    let v298 = v200 + v287;
+    let v299 = v287 + v229;
+    let v300 = v229 + v288;
+    let v301 = v288 + v206;
+    let v302 = v206 + v289;
+    let v303 = v289 + v225;
+    let v304 = v225 + v278;
+    (
+        v62 * D::F32Vec::splat(d, 0.031250),
+        v290 * D::F32Vec::splat(d, 0.031262),
+        v146 * D::F32Vec::splat(d, 0.031299),
+        v291 * D::F32Vec::splat(d, 0.031361),
+        v90 * D::F32Vec::splat(d, 0.031449),
+        v292 * D::F32Vec::splat(d, 0.031561),
+        v147 * D::F32Vec::splat(d, 0.031699),
+        v293 * D::F32Vec::splat(d, 0.031864),
+        v70 * D::F32Vec::splat(d, 0.032055),
+        v294 * D::F32Vec::splat(d, 0.032274),
+        v148 * D::F32Vec::splat(d, 0.032521),
+        v295 * D::F32Vec::splat(d, 0.032797),
+        v91 * D::F32Vec::splat(d, 0.033103),
+        v296 * D::F32Vec::splat(d, 0.033441),
+        v149 * D::F32Vec::splat(d, 0.033811),
+        v297 * D::F32Vec::splat(d, 0.034215),
+        v63 * D::F32Vec::splat(d, 0.034654),
+        v298 * D::F32Vec::splat(d, 0.035131),
+        v150 * D::F32Vec::splat(d, 0.035647),
+        v299 * D::F32Vec::splat(d, 0.036204),
+        v92 * D::F32Vec::splat(d, 0.036806),
+        v300 * D::F32Vec::splat(d, 0.037453),
+        v151 * D::F32Vec::splat(d, 0.038150),
+        v301 * D::F32Vec::splat(d, 0.038899),
+        v69 * D::F32Vec::splat(d, 0.039705),
+        v302 * D::F32Vec::splat(d, 0.040571),
+        v152 * D::F32Vec::splat(d, 0.041502),
+        v303 * D::F32Vec::splat(d, 0.042502),
+        v88 * D::F32Vec::splat(d, 0.043578),
+        v304 * D::F32Vec::splat(d, 0.044735),
+        v141 * D::F32Vec::splat(d, 0.045981),
+        v278 * D::F32Vec::splat(d, 0.047324),
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_32<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 31 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    let mut v4 = D::F32Vec::load_array(d, &data[4 * stride]);
+    let mut v5 = D::F32Vec::load_array(d, &data[5 * stride]);
+    let mut v6 = D::F32Vec::load_array(d, &data[6 * stride]);
+    let mut v7 = D::F32Vec::load_array(d, &data[7 * stride]);
+    let mut v8 = D::F32Vec::load_array(d, &data[8 * stride]);
+    let mut v9 = D::F32Vec::load_array(d, &data[9 * stride]);
+    let mut v10 = D::F32Vec::load_array(d, &data[10 * stride]);
+    let mut v11 = D::F32Vec::load_array(d, &data[11 * stride]);
+    let mut v12 = D::F32Vec::load_array(d, &data[12 * stride]);
+    let mut v13 = D::F32Vec::load_array(d, &data[13 * stride]);
+    let mut v14 = D::F32Vec::load_array(d, &data[14 * stride]);
+    let mut v15 = D::F32Vec::load_array(d, &data[15 * stride]);
+    let mut v16 = D::F32Vec::load_array(d, &data[16 * stride]);
+    let mut v17 = D::F32Vec::load_array(d, &data[17 * stride]);
+    let mut v18 = D::F32Vec::load_array(d, &data[18 * stride]);
+    let mut v19 = D::F32Vec::load_array(d, &data[19 * stride]);
+    let mut v20 = D::F32Vec::load_array(d, &data[20 * stride]);
+    let mut v21 = D::F32Vec::load_array(d, &data[21 * stride]);
+    let mut v22 = D::F32Vec::load_array(d, &data[22 * stride]);
+    let mut v23 = D::F32Vec::load_array(d, &data[23 * stride]);
+    let mut v24 = D::F32Vec::load_array(d, &data[24 * stride]);
+    let mut v25 = D::F32Vec::load_array(d, &data[25 * stride]);
+    let mut v26 = D::F32Vec::load_array(d, &data[26 * stride]);
+    let mut v27 = D::F32Vec::load_array(d, &data[27 * stride]);
+    let mut v28 = D::F32Vec::load_array(d, &data[28 * stride]);
+    let mut v29 = D::F32Vec::load_array(d, &data[29 * stride]);
+    let mut v30 = D::F32Vec::load_array(d, &data[30 * stride]);
+    let mut v31 = D::F32Vec::load_array(d, &data[31 * stride]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = reinterpreting_dct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+    v4.store_array(&mut data[4 * stride]);
+    v5.store_array(&mut data[5 * stride]);
+    v6.store_array(&mut data[6 * stride]);
+    v7.store_array(&mut data[7 * stride]);
+    v8.store_array(&mut data[8 * stride]);
+    v9.store_array(&mut data[9 * stride]);
+    v10.store_array(&mut data[10 * stride]);
+    v11.store_array(&mut data[11 * stride]);
+    v12.store_array(&mut data[12 * stride]);
+    v13.store_array(&mut data[13 * stride]);
+    v14.store_array(&mut data[14 * stride]);
+    v15.store_array(&mut data[15 * stride]);
+    v16.store_array(&mut data[16 * stride]);
+    v17.store_array(&mut data[17 * stride]);
+    v18.store_array(&mut data[18 * stride]);
+    v19.store_array(&mut data[19 * stride]);
+    v20.store_array(&mut data[20 * stride]);
+    v21.store_array(&mut data[21 * stride]);
+    v22.store_array(&mut data[22 * stride]);
+    v23.store_array(&mut data[23 * stride]);
+    v24.store_array(&mut data[24 * stride]);
+    v25.store_array(&mut data[25 * stride]);
+    v26.store_array(&mut data[26 * stride]);
+    v27.store_array(&mut data[27 * stride]);
+    v28.store_array(&mut data[28 * stride]);
+    v29.store_array(&mut data[29 * stride]);
+    v30.store_array(&mut data[30 * stride]);
+    v31.store_array(&mut data[31 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_32_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 32);
+    const { assert!(32usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 32 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    let mut v4 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)],
+    );
+    let mut v5 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)],
+    );
+    let mut v6 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)],
+    );
+    let mut v7 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)],
+    );
+    let mut v8 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)],
+    );
+    let mut v9 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)],
+    );
+    let mut v10 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)],
+    );
+    let mut v11 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)],
+    );
+    let mut v12 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)],
+    );
+    let mut v13 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)],
+    );
+    let mut v14 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)],
+    );
+    let mut v15 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)],
+    );
+    let mut v16 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (16 % D::F32Vec::LEN) + (16 / D::F32Vec::LEN)],
+    );
+    let mut v17 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (17 % D::F32Vec::LEN) + (17 / D::F32Vec::LEN)],
+    );
+    let mut v18 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (18 % D::F32Vec::LEN) + (18 / D::F32Vec::LEN)],
+    );
+    let mut v19 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (19 % D::F32Vec::LEN) + (19 / D::F32Vec::LEN)],
+    );
+    let mut v20 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (20 % D::F32Vec::LEN) + (20 / D::F32Vec::LEN)],
+    );
+    let mut v21 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (21 % D::F32Vec::LEN) + (21 / D::F32Vec::LEN)],
+    );
+    let mut v22 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (22 % D::F32Vec::LEN) + (22 / D::F32Vec::LEN)],
+    );
+    let mut v23 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (23 % D::F32Vec::LEN) + (23 / D::F32Vec::LEN)],
+    );
+    let mut v24 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (24 % D::F32Vec::LEN) + (24 / D::F32Vec::LEN)],
+    );
+    let mut v25 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (25 % D::F32Vec::LEN) + (25 / D::F32Vec::LEN)],
+    );
+    let mut v26 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (26 % D::F32Vec::LEN) + (26 / D::F32Vec::LEN)],
+    );
+    let mut v27 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (27 % D::F32Vec::LEN) + (27 / D::F32Vec::LEN)],
+    );
+    let mut v28 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (28 % D::F32Vec::LEN) + (28 / D::F32Vec::LEN)],
+    );
+    let mut v29 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (29 % D::F32Vec::LEN) + (29 / D::F32Vec::LEN)],
+    );
+    let mut v30 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (30 % D::F32Vec::LEN) + (30 / D::F32Vec::LEN)],
+    );
+    let mut v31 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (31 % D::F32Vec::LEN) + (31 / D::F32Vec::LEN)],
+    );
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = reinterpreting_dct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+    v4.store_array(&mut data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)]);
+    v5.store_array(&mut data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)]);
+    v6.store_array(&mut data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)]);
+    v7.store_array(&mut data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)]);
+    v8.store_array(&mut data[row_stride * (8 % D::F32Vec::LEN) + (8 / D::F32Vec::LEN)]);
+    v9.store_array(&mut data[row_stride * (9 % D::F32Vec::LEN) + (9 / D::F32Vec::LEN)]);
+    v10.store_array(&mut data[row_stride * (10 % D::F32Vec::LEN) + (10 / D::F32Vec::LEN)]);
+    v11.store_array(&mut data[row_stride * (11 % D::F32Vec::LEN) + (11 / D::F32Vec::LEN)]);
+    v12.store_array(&mut data[row_stride * (12 % D::F32Vec::LEN) + (12 / D::F32Vec::LEN)]);
+    v13.store_array(&mut data[row_stride * (13 % D::F32Vec::LEN) + (13 / D::F32Vec::LEN)]);
+    v14.store_array(&mut data[row_stride * (14 % D::F32Vec::LEN) + (14 / D::F32Vec::LEN)]);
+    v15.store_array(&mut data[row_stride * (15 % D::F32Vec::LEN) + (15 / D::F32Vec::LEN)]);
+    v16.store_array(&mut data[row_stride * (16 % D::F32Vec::LEN) + (16 / D::F32Vec::LEN)]);
+    v17.store_array(&mut data[row_stride * (17 % D::F32Vec::LEN) + (17 / D::F32Vec::LEN)]);
+    v18.store_array(&mut data[row_stride * (18 % D::F32Vec::LEN) + (18 / D::F32Vec::LEN)]);
+    v19.store_array(&mut data[row_stride * (19 % D::F32Vec::LEN) + (19 / D::F32Vec::LEN)]);
+    v20.store_array(&mut data[row_stride * (20 % D::F32Vec::LEN) + (20 / D::F32Vec::LEN)]);
+    v21.store_array(&mut data[row_stride * (21 % D::F32Vec::LEN) + (21 / D::F32Vec::LEN)]);
+    v22.store_array(&mut data[row_stride * (22 % D::F32Vec::LEN) + (22 / D::F32Vec::LEN)]);
+    v23.store_array(&mut data[row_stride * (23 % D::F32Vec::LEN) + (23 / D::F32Vec::LEN)]);
+    v24.store_array(&mut data[row_stride * (24 % D::F32Vec::LEN) + (24 / D::F32Vec::LEN)]);
+    v25.store_array(&mut data[row_stride * (25 % D::F32Vec::LEN) + (25 / D::F32Vec::LEN)]);
+    v26.store_array(&mut data[row_stride * (26 % D::F32Vec::LEN) + (26 / D::F32Vec::LEN)]);
+    v27.store_array(&mut data[row_stride * (27 % D::F32Vec::LEN) + (27 / D::F32Vec::LEN)]);
+    v28.store_array(&mut data[row_stride * (28 % D::F32Vec::LEN) + (28 / D::F32Vec::LEN)]);
+    v29.store_array(&mut data[row_stride * (29 % D::F32Vec::LEN) + (29 / D::F32Vec::LEN)]);
+    v30.store_array(&mut data[row_stride * (30 % D::F32Vec::LEN) + (30 / D::F32Vec::LEN)]);
+    v31.store_array(&mut data[row_stride * (31 % D::F32Vec::LEN) + (31 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_32_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 16 / D::F32Vec::LEN;
+    assert!(data.len() > 31 * row_stride);
+    const { assert!(16usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    let mut v8 = D::F32Vec::load_array(d, &data[row_stride * 8]);
+    let mut v9 = D::F32Vec::load_array(d, &data[row_stride * 9]);
+    let mut v10 = D::F32Vec::load_array(d, &data[row_stride * 10]);
+    let mut v11 = D::F32Vec::load_array(d, &data[row_stride * 11]);
+    let mut v12 = D::F32Vec::load_array(d, &data[row_stride * 12]);
+    let mut v13 = D::F32Vec::load_array(d, &data[row_stride * 13]);
+    let mut v14 = D::F32Vec::load_array(d, &data[row_stride * 14]);
+    let mut v15 = D::F32Vec::load_array(d, &data[row_stride * 15]);
+    let mut v16 = D::F32Vec::load_array(d, &data[row_stride * 16]);
+    let mut v17 = D::F32Vec::load_array(d, &data[row_stride * 17]);
+    let mut v18 = D::F32Vec::load_array(d, &data[row_stride * 18]);
+    let mut v19 = D::F32Vec::load_array(d, &data[row_stride * 19]);
+    let mut v20 = D::F32Vec::load_array(d, &data[row_stride * 20]);
+    let mut v21 = D::F32Vec::load_array(d, &data[row_stride * 21]);
+    let mut v22 = D::F32Vec::load_array(d, &data[row_stride * 22]);
+    let mut v23 = D::F32Vec::load_array(d, &data[row_stride * 23]);
+    let mut v24 = D::F32Vec::load_array(d, &data[row_stride * 24]);
+    let mut v25 = D::F32Vec::load_array(d, &data[row_stride * 25]);
+    let mut v26 = D::F32Vec::load_array(d, &data[row_stride * 26]);
+    let mut v27 = D::F32Vec::load_array(d, &data[row_stride * 27]);
+    let mut v28 = D::F32Vec::load_array(d, &data[row_stride * 28]);
+    let mut v29 = D::F32Vec::load_array(d, &data[row_stride * 29]);
+    let mut v30 = D::F32Vec::load_array(d, &data[row_stride * 30]);
+    let mut v31 = D::F32Vec::load_array(d, &data[row_stride * 31]);
+    (
+        v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    ) = reinterpreting_dct_32(
+        d, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+        v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+    );
+    v0.store_array(&mut data[row_stride * 0]);
+    v16.store_array(&mut data[row_stride * 1]);
+    v1.store_array(&mut data[row_stride * 2]);
+    v17.store_array(&mut data[row_stride * 3]);
+    v2.store_array(&mut data[row_stride * 4]);
+    v18.store_array(&mut data[row_stride * 5]);
+    v3.store_array(&mut data[row_stride * 6]);
+    v19.store_array(&mut data[row_stride * 7]);
+    v4.store_array(&mut data[row_stride * 8]);
+    v20.store_array(&mut data[row_stride * 9]);
+    v5.store_array(&mut data[row_stride * 10]);
+    v21.store_array(&mut data[row_stride * 11]);
+    v6.store_array(&mut data[row_stride * 12]);
+    v22.store_array(&mut data[row_stride * 13]);
+    v7.store_array(&mut data[row_stride * 14]);
+    v23.store_array(&mut data[row_stride * 15]);
+    v8.store_array(&mut data[row_stride * 16]);
+    v24.store_array(&mut data[row_stride * 17]);
+    v9.store_array(&mut data[row_stride * 18]);
+    v25.store_array(&mut data[row_stride * 19]);
+    v10.store_array(&mut data[row_stride * 20]);
+    v26.store_array(&mut data[row_stride * 21]);
+    v11.store_array(&mut data[row_stride * 22]);
+    v27.store_array(&mut data[row_stride * 23]);
+    v12.store_array(&mut data[row_stride * 24]);
+    v28.store_array(&mut data[row_stride * 25]);
+    v13.store_array(&mut data[row_stride * 26]);
+    v29.store_array(&mut data[row_stride * 27]);
+    v14.store_array(&mut data[row_stride * 28]);
+    v30.store_array(&mut data[row_stride * 29]);
+    v15.store_array(&mut data[row_stride * 30]);
+    v31.store_array(&mut data[row_stride * 31]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct4.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct4.rs
new file mode 100644
index 00000000..8e53070d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct4.rs
@@ -0,0 +1,108 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn reinterpreting_dct_4<D: SimdDescriptor>(
+    d: D,
+    v0: D::F32Vec,
+    v1: D::F32Vec,
+    v2: D::F32Vec,
+    v3: D::F32Vec,
+) -> (D::F32Vec, D::F32Vec, D::F32Vec, D::F32Vec) {
+    let v4 = v0 + v3;
+    let v5 = v1 + v2;
+    let v6 = v4 + v5;
+    let v7 = v4 - v5;
+    let v8 = v0 - v3;
+    let v9 = v1 - v2;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v10 = v8 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v11 = v9 * mul;
+    let v12 = v10 + v11;
+    let v13 = v10 - v11;
+    let v14 = v12.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v13);
+    (
+        v6 * D::F32Vec::splat(d, 0.250000),
+        v14 * D::F32Vec::splat(d, 0.256440),
+        v7 * D::F32Vec::splat(d, 0.277234),
+        v13 * D::F32Vec::splat(d, 0.317640),
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_4<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 3 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    (v0, v1, v2, v3) = reinterpreting_dct_4(d, v0, v1, v2, v3);
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_4_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 4);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 4 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    (v0, v1, v2, v3) = reinterpreting_dct_4(d, v0, v1, v2, v3);
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_4_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 2 / D::F32Vec::LEN;
+    assert!(data.len() > 3 * row_stride);
+    const { assert!(2usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    (v0, v1, v2, v3) = reinterpreting_dct_4(d, v0, v1, v2, v3);
+    v0.store_array(&mut data[row_stride * 0]);
+    v2.store_array(&mut data[row_stride * 1]);
+    v1.store_array(&mut data[row_stride * 2]);
+    v3.store_array(&mut data[row_stride * 3]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct8.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct8.rs
new file mode 100644
index 00000000..842da31c
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/reinterpreting_dct8.rs
@@ -0,0 +1,193 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::type_complexity)]
+#![allow(clippy::erasing_op)]
+#![allow(clippy::identity_op)]
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::excessive_precision)]
+#[inline(always)]
+pub(super) fn reinterpreting_dct_8<D: SimdDescriptor>(
+    d: D,
+    v0: D::F32Vec,
+    v1: D::F32Vec,
+    v2: D::F32Vec,
+    v3: D::F32Vec,
+    v4: D::F32Vec,
+    v5: D::F32Vec,
+    v6: D::F32Vec,
+    v7: D::F32Vec,
+) -> (
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+    D::F32Vec,
+) {
+    let v8 = v0 + v7;
+    let v9 = v1 + v6;
+    let v10 = v2 + v5;
+    let v11 = v3 + v4;
+    let v12 = v8 + v11;
+    let v13 = v9 + v10;
+    let v14 = v12 + v13;
+    let v15 = v12 - v13;
+    let v16 = v8 - v11;
+    let v17 = v9 - v10;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v18 = v16 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v19 = v17 * mul;
+    let v20 = v18 + v19;
+    let v21 = v18 - v19;
+    let v22 = v20.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v21);
+    let v23 = v0 - v7;
+    let v24 = v1 - v6;
+    let v25 = v2 - v5;
+    let v26 = v3 - v4;
+    let mul = D::F32Vec::splat(d, 0.5097955791041592);
+    let v27 = v23 * mul;
+    let mul = D::F32Vec::splat(d, 0.6013448869350453);
+    let v28 = v24 * mul;
+    let mul = D::F32Vec::splat(d, 0.8999762231364156);
+    let v29 = v25 * mul;
+    let mul = D::F32Vec::splat(d, 2.5629154477415055);
+    let v30 = v26 * mul;
+    let v31 = v27 + v30;
+    let v32 = v28 + v29;
+    let v33 = v31 + v32;
+    let v34 = v31 - v32;
+    let v35 = v27 - v30;
+    let v36 = v28 - v29;
+    let mul = D::F32Vec::splat(d, 0.5411961001461970);
+    let v37 = v35 * mul;
+    let mul = D::F32Vec::splat(d, 1.3065629648763764);
+    let v38 = v36 * mul;
+    let v39 = v37 + v38;
+    let v40 = v37 - v38;
+    let v41 = v39.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v40);
+    let v42 = v33.mul_add(D::F32Vec::splat(d, std::f32::consts::SQRT_2), v41);
+    let v43 = v41 + v34;
+    let v44 = v34 + v40;
+    (
+        v14 * D::F32Vec::splat(d, 0.125000),
+        v42 * D::F32Vec::splat(d, 0.125794),
+        v22 * D::F32Vec::splat(d, 0.128220),
+        v43 * D::F32Vec::splat(d, 0.132413),
+        v15 * D::F32Vec::splat(d, 0.138617),
+        v44 * D::F32Vec::splat(d, 0.147222),
+        v21 * D::F32Vec::splat(d, 0.158820),
+        v40 * D::F32Vec::splat(d, 0.174311),
+    )
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_8<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+    stride: usize,
+) {
+    assert!(data.len() > 7 * stride);
+    let mut v0 = D::F32Vec::load_array(d, &data[0 * stride]);
+    let mut v1 = D::F32Vec::load_array(d, &data[1 * stride]);
+    let mut v2 = D::F32Vec::load_array(d, &data[2 * stride]);
+    let mut v3 = D::F32Vec::load_array(d, &data[3 * stride]);
+    let mut v4 = D::F32Vec::load_array(d, &data[4 * stride]);
+    let mut v5 = D::F32Vec::load_array(d, &data[5 * stride]);
+    let mut v6 = D::F32Vec::load_array(d, &data[6 * stride]);
+    let mut v7 = D::F32Vec::load_array(d, &data[7 * stride]);
+    (v0, v1, v2, v3, v4, v5, v6, v7) = reinterpreting_dct_8(d, v0, v1, v2, v3, v4, v5, v6, v7);
+    v0.store_array(&mut data[0 * stride]);
+    v1.store_array(&mut data[1 * stride]);
+    v2.store_array(&mut data[2 * stride]);
+    v3.store_array(&mut data[3 * stride]);
+    v4.store_array(&mut data[4 * stride]);
+    v5.store_array(&mut data[5 * stride]);
+    v6.store_array(&mut data[6 * stride]);
+    v7.store_array(&mut data[7 * stride]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_8_rowblock<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    assert!(data.len() >= 8);
+    const { assert!(8usize.is_multiple_of(D::F32Vec::LEN)) };
+    let row_stride = 8 / D::F32Vec::LEN;
+    let mut v0 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)],
+    );
+    let mut v1 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)],
+    );
+    let mut v2 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)],
+    );
+    let mut v3 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)],
+    );
+    let mut v4 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)],
+    );
+    let mut v5 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)],
+    );
+    let mut v6 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)],
+    );
+    let mut v7 = D::F32Vec::load_array(
+        d,
+        &data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)],
+    );
+    (v0, v1, v2, v3, v4, v5, v6, v7) = reinterpreting_dct_8(d, v0, v1, v2, v3, v4, v5, v6, v7);
+    v0.store_array(&mut data[row_stride * (0 % D::F32Vec::LEN) + (0 / D::F32Vec::LEN)]);
+    v1.store_array(&mut data[row_stride * (1 % D::F32Vec::LEN) + (1 / D::F32Vec::LEN)]);
+    v2.store_array(&mut data[row_stride * (2 % D::F32Vec::LEN) + (2 / D::F32Vec::LEN)]);
+    v3.store_array(&mut data[row_stride * (3 % D::F32Vec::LEN) + (3 / D::F32Vec::LEN)]);
+    v4.store_array(&mut data[row_stride * (4 % D::F32Vec::LEN) + (4 / D::F32Vec::LEN)]);
+    v5.store_array(&mut data[row_stride * (5 % D::F32Vec::LEN) + (5 / D::F32Vec::LEN)]);
+    v6.store_array(&mut data[row_stride * (6 % D::F32Vec::LEN) + (6 / D::F32Vec::LEN)]);
+    v7.store_array(&mut data[row_stride * (7 % D::F32Vec::LEN) + (7 / D::F32Vec::LEN)]);
+}
+
+#[inline(always)]
+pub(super) fn do_reinterpreting_dct_8_trh<D: SimdDescriptor>(
+    d: D,
+    data: &mut [<D::F32Vec as F32SimdVec>::UnderlyingArray],
+) {
+    let row_stride = 4 / D::F32Vec::LEN;
+    assert!(data.len() > 7 * row_stride);
+    const { assert!(4usize.is_multiple_of(D::F32Vec::LEN)) };
+    let mut v0 = D::F32Vec::load_array(d, &data[row_stride * 0]);
+    let mut v1 = D::F32Vec::load_array(d, &data[row_stride * 1]);
+    let mut v2 = D::F32Vec::load_array(d, &data[row_stride * 2]);
+    let mut v3 = D::F32Vec::load_array(d, &data[row_stride * 3]);
+    let mut v4 = D::F32Vec::load_array(d, &data[row_stride * 4]);
+    let mut v5 = D::F32Vec::load_array(d, &data[row_stride * 5]);
+    let mut v6 = D::F32Vec::load_array(d, &data[row_stride * 6]);
+    let mut v7 = D::F32Vec::load_array(d, &data[row_stride * 7]);
+    (v0, v1, v2, v3, v4, v5, v6, v7) = reinterpreting_dct_8(d, v0, v1, v2, v3, v4, v5, v6, v7);
+    v0.store_array(&mut data[row_stride * 0]);
+    v4.store_array(&mut data[row_stride * 1]);
+    v1.store_array(&mut data[row_stride * 2]);
+    v5.store_array(&mut data[row_stride * 3]);
+    v2.store_array(&mut data[row_stride * 4]);
+    v6.store_array(&mut data[row_stride * 5]);
+    v3.store_array(&mut data[row_stride * 6]);
+    v7.store_array(&mut data[row_stride * 7]);
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/tests.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/tests.rs
new file mode 100644
index 00000000..5a88fda9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/tests.rs
@@ -0,0 +1,490 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use super::*;
+use jxl_simd::{ScalarDescriptor, SimdDescriptor, test_all_instruction_sets};
+use rand::RngExt;
+use rand::SeedableRng;
+use rand_chacha::ChaCha12Rng;
+use test_log::test;
+
+use std::f64::consts::FRAC_1_SQRT_2;
+use std::f64::consts::PI;
+use std::f64::consts::SQRT_2;
+
+#[inline(always)]
+fn alpha(u: usize) -> f64 {
+    if u == 0 { FRAC_1_SQRT_2 } else { 1.0 }
+}
+
+pub fn dct1d(input_matrix: &[Vec<f64>]) -> Vec<Vec<f64>> {
+    let num_rows = input_matrix.len();
+
+    if num_rows == 0 {
+        return Vec::new();
+    }
+
+    let num_cols = input_matrix[0].len();
+
+    let mut output_matrix = vec![vec![0.0f64; num_cols]; num_rows];
+
+    let scale: f64 = SQRT_2;
+
+    // Precompute the DCT matrix (size: n_rows x n_rows)
+    let mut dct_coeff_matrix = vec![vec![0.0f64; num_rows]; num_rows];
+    for (u_freq, row) in dct_coeff_matrix.iter_mut().enumerate() {
+        let alpha_u_val = alpha(u_freq);
+        for (y_spatial, coeff) in row.iter_mut().enumerate() {
+            *coeff = alpha_u_val
+                * ((y_spatial as f64 + 0.5) * u_freq as f64 * PI / num_rows as f64).cos()
+                * scale;
+        }
+    }
+
+    // Perform the DCT calculation column by column
+    for x_col_idx in 0..num_cols {
+        for u_freq_idx in 0..num_rows {
+            let mut sum = 0.0;
+            for (y_spatial_idx, col) in input_matrix.iter().enumerate() {
+                // This access `input_matrix[y_spatial_idx][x_col_idx]` assumes the input_matrix
+                // is rectangular. If not, it might panic here.
+                sum += dct_coeff_matrix[u_freq_idx][y_spatial_idx] * col[x_col_idx];
+            }
+            output_matrix[u_freq_idx][x_col_idx] = sum;
+        }
+    }
+
+    output_matrix
+}
+
+pub fn idct1d(input_matrix: &[Vec<f64>]) -> Vec<Vec<f64>> {
+    let num_rows = input_matrix.len();
+
+    if num_rows == 0 {
+        return Vec::new();
+    }
+
+    let num_cols = input_matrix[0].len();
+
+    let mut output_matrix = vec![vec![0.0f64; num_cols]; num_rows];
+
+    let scale: f64 = SQRT_2;
+
+    // Precompute the DCT matrix (size: num_rows x num_rows)
+    let mut dct_coeff_matrix = vec![vec![0.0f64; num_rows]; num_rows];
+    for (u_freq, row) in dct_coeff_matrix.iter_mut().enumerate() {
+        let alpha_u_val = alpha(u_freq);
+        for (y_def_idx, coeff) in row.iter_mut().enumerate() {
+            *coeff = alpha_u_val
+                * ((y_def_idx as f64 + 0.5) * u_freq as f64 * PI / num_rows as f64).cos()
+                * scale;
+        }
+    }
+
+    // Perform the IDCT calculation column by column
+    for x_col_idx in 0..num_cols {
+        for (y_row_idx, row) in output_matrix.iter_mut().enumerate() {
+            let mut sum = 0.0;
+            for (u_freq_idx, col) in input_matrix.iter().enumerate() {
+                // This access input_coeffs_matrix[u_freq_idx][x_col_idx] assumes input_coeffs_matrix
+                // is rectangular. If not, it might panic here.
+                sum += dct_coeff_matrix[u_freq_idx][y_row_idx] * col[x_col_idx];
+            }
+            row[x_col_idx] = sum;
+        }
+    }
+
+    output_matrix
+}
+
+fn transpose_f64(matrix: &[Vec<f64>]) -> Vec<Vec<f64>> {
+    if matrix.is_empty() {
+        return Vec::new();
+    }
+    let num_rows = matrix.len();
+    let num_cols = matrix[0].len();
+    let mut transposed = vec![vec![0.0; num_rows]; num_cols];
+    for i in 0..num_rows {
+        for j in 0..num_cols {
+            transposed[j][i] = matrix[i][j];
+        }
+    }
+    transposed
+}
+
+pub fn slow_idct2d(input: &[Vec<f64>]) -> Vec<Vec<f64>> {
+    let rows = input.len();
+    let cols = input[0].len();
+    let idct1 = if rows < cols {
+        let transposed = transpose_f64(input);
+        idct1d(&transposed)
+    } else {
+        let input: Vec<_> = input.iter().flat_map(|x| x.iter()).copied().collect();
+        let input: Vec<_> = input.chunks_exact(rows).map(|x| x.to_vec()).collect();
+        idct1d(&input)
+    };
+    let transposed1 = transpose_f64(&idct1);
+    idct1d(&transposed1)
+}
+
+pub fn scales(n: usize) -> Vec<f64> {
+    (0..n)
+        .map(|i| {
+            (i as f64 / (16 * n) as f64 * PI).cos()
+                * (i as f64 / (8 * n) as f64 * PI).cos()
+                * (i as f64 / (4 * n) as f64 * PI).cos()
+                * n as f64
+        })
+        .collect()
+}
+
+pub fn slow_reinterpreting_dct2d(input: &[Vec<f64>]) -> Vec<Vec<f64>> {
+    let rows = input.len();
+    let cols = input[0].len();
+    let dct1 = dct1d(input);
+    let tdct1 = transpose_f64(&dct1);
+    let dct2 = dct1d(&tdct1);
+    let mut res = if rows < cols {
+        transpose_f64(&dct2)
+    } else {
+        dct2
+    };
+
+    let row_scales = scales(rows);
+    let col_scales = scales(cols);
+    if rows < cols {
+        for y in 0..rows {
+            for x in 0..cols {
+                res[y][x] /= row_scales[y] * col_scales[x];
+            }
+        }
+    } else {
+        for y in 0..cols {
+            for x in 0..rows {
+                res[y][x] /= row_scales[x] * col_scales[y];
+            }
+        }
+    }
+    res
+}
+
+#[track_caller]
+fn check_close(a: f64, b: f64, max_err: f64) {
+    let abs = (a - b).abs();
+    let rel = abs / a.abs().max(b.abs());
+    assert!(
+        abs < max_err || rel < max_err,
+        "a: {a} b: {b} abs diff: {abs:?} rel diff: {rel:?}"
+    );
+}
+
+macro_rules! test_reinterpreting_dct1d_eq_slow_n {
+    ($test_name:ident, $n_val:expr, $do_idct_fun:path, $tolerance:expr) => {
+        #[test]
+        fn $test_name() {
+            const N: usize = $n_val;
+
+            let input_matrix_for_ref = random_matrix(N, 1);
+
+            let output_matrix_slow: Vec<Vec<f64>> = dct1d(&input_matrix_for_ref);
+
+            let mut output: Vec<_> = input_matrix_for_ref.iter().map(|x| x[0] as f32).collect();
+            let d = ScalarDescriptor {};
+
+            let (output_chunks, remainder) = output.as_chunks_mut::<1>();
+            assert!(remainder.is_empty());
+            $do_idct_fun(d, output_chunks, 1);
+
+            let scales = scales(N);
+
+            for i in 0..N {
+                check_close(
+                    output[i] as f64,
+                    output_matrix_slow[i][0] / scales[i],
+                    $tolerance,
+                );
+            }
+        }
+    };
+}
+
+test_reinterpreting_dct1d_eq_slow_n!(
+    test_reinterpreting_dct1d_2_eq_slow,
+    2,
+    do_reinterpreting_dct_2,
+    1e-6
+);
+test_reinterpreting_dct1d_eq_slow_n!(
+    test_reinterpreting_dct1d_4_eq_slow,
+    4,
+    do_reinterpreting_dct_4,
+    1e-6
+);
+test_reinterpreting_dct1d_eq_slow_n!(
+    test_reinterpreting_dct1d_8_eq_slow,
+    8,
+    do_reinterpreting_dct_8,
+    1e-6
+);
+test_reinterpreting_dct1d_eq_slow_n!(
+    test_reinterpreting_dct1d_16_eq_slow,
+    16,
+    do_reinterpreting_dct_16,
+    5e-6
+);
+test_reinterpreting_dct1d_eq_slow_n!(
+    test_reinterpreting_dct1d_32_eq_slow,
+    32,
+    do_reinterpreting_dct_32,
+    5e-6
+);
+
+fn random_matrix(n: usize, m: usize) -> Vec<Vec<f64>> {
+    let mut rng = ChaCha12Rng::seed_from_u64(0);
+    let mut data = vec![vec![0.0; m]; n];
+
+    data.iter_mut()
+        .flat_map(|x| x.iter_mut())
+        .for_each(|x| *x = rng.random_range(-1.0..1.0));
+
+    data
+}
+
+macro_rules! test_idct1d_eq_slow_n {
+    ($test_name:ident, $n_val:expr, $do_idct_fun:path, $tolerance:expr) => {
+        #[test]
+        fn $test_name() {
+            const N: usize = $n_val;
+
+            let input_matrix_for_ref = random_matrix(N, 1);
+
+            let output_matrix_slow: Vec<Vec<f64>> = idct1d(&input_matrix_for_ref);
+
+            let mut output: Vec<_> = input_matrix_for_ref.iter().map(|x| x[0] as f32).collect();
+            let d = ScalarDescriptor {};
+
+            let (output_chunks, remainder) = output.as_chunks_mut::<1>();
+            assert!(remainder.is_empty());
+            $do_idct_fun(d, output_chunks, 1);
+
+            for i in 0..N {
+                check_close(output[i] as f64, output_matrix_slow[i][0], $tolerance);
+            }
+        }
+    };
+}
+
+test_idct1d_eq_slow_n!(test_idct1d_2_eq_slow, 2, do_idct_2, 1e-6);
+test_idct1d_eq_slow_n!(test_idct1d_4_eq_slow, 4, do_idct_4, 1e-6);
+test_idct1d_eq_slow_n!(test_idct1d_8_eq_slow, 8, do_idct_8, 1e-6);
+test_idct1d_eq_slow_n!(test_idct1d_16_eq_slow, 16, do_idct_16, 1e-6);
+test_idct1d_eq_slow_n!(test_idct1d_32_eq_slow, 32, do_idct_32, 5e-6);
+test_idct1d_eq_slow_n!(test_idct1d_64_eq_slow, 64, do_idct_64, 5e-6);
+test_idct1d_eq_slow_n!(test_idct1d_128_eq_slow, 128, do_idct_128, 5e-5);
+test_idct1d_eq_slow_n!(test_idct1d_256_eq_slow, 256, do_idct_256, 5e-5);
+
+macro_rules! test_idct2d_eq_slow {
+    ($test_name:ident, $rows:expr, $cols:expr, $fast_idct:ident, $tol:expr) => {
+        fn $test_name<D: SimdDescriptor>(d: D) {
+            const N: usize = $rows;
+            const M: usize = $cols;
+
+            let slow_input = random_matrix(N, M);
+
+            let slow_output = slow_idct2d(&slow_input);
+
+            let mut fast_input: Vec<_> = slow_input
+                .iter()
+                .flat_map(|x| x.iter())
+                .map(|x| *x as f32)
+                .collect();
+
+            $fast_idct(d, &mut fast_input);
+
+            for r in 0..N {
+                for c in 0..M {
+                    check_close(fast_input[r * M + c] as f64, slow_output[r][c], $tol);
+                }
+            }
+        }
+        test_all_instruction_sets!($test_name);
+    };
+}
+
+test_idct2d_eq_slow!(test_idct2d_2_2_eq_slow, 2, 2, idct2d_2_2, 1e-6);
+test_idct2d_eq_slow!(test_idct2d_4_4_eq_slow, 4, 4, idct2d_4_4, 1e-6);
+test_idct2d_eq_slow!(test_idct2d_4_8_eq_slow, 4, 8, idct2d_4_8, 1e-6);
+test_idct2d_eq_slow!(test_idct2d_8_4_eq_slow, 8, 4, idct2d_8_4, 1e-6);
+test_idct2d_eq_slow!(test_idct2d_8_8_eq_slow, 8, 8, idct2d_8_8, 5e-6);
+test_idct2d_eq_slow!(test_idct2d_16_8_eq_slow, 16, 8, idct2d_16_8, 5e-6);
+test_idct2d_eq_slow!(test_idct2d_8_16_eq_slow, 8, 16, idct2d_8_16, 5e-6);
+test_idct2d_eq_slow!(test_idct2d_16_16_eq_slow, 16, 16, idct2d_16_16, 1e-5);
+test_idct2d_eq_slow!(test_idct2d_32_8_eq_slow, 32, 8, idct2d_32_8, 5e-6);
+test_idct2d_eq_slow!(test_idct2d_8_32_eq_slow, 8, 32, idct2d_8_32, 5e-6);
+test_idct2d_eq_slow!(test_idct2d_32_16_eq_slow, 32, 16, idct2d_32_16, 1e-5);
+test_idct2d_eq_slow!(test_idct2d_16_32_eq_slow, 16, 32, idct2d_16_32, 1e-5);
+test_idct2d_eq_slow!(test_idct2d_32_32_eq_slow, 32, 32, idct2d_32_32, 5e-5);
+test_idct2d_eq_slow!(test_idct2d_64_32_eq_slow, 64, 32, idct2d_64_32, 1e-4);
+test_idct2d_eq_slow!(test_idct2d_32_64_eq_slow, 32, 64, idct2d_32_64, 1e-4);
+test_idct2d_eq_slow!(test_idct2d_64_64_eq_slow, 64, 64, idct2d_64_64, 1e-4);
+test_idct2d_eq_slow!(test_idct2d_128_64_eq_slow, 128, 64, idct2d_128_64, 5e-4);
+test_idct2d_eq_slow!(test_idct2d_64_128_eq_slow, 64, 128, idct2d_64_128, 5e-4);
+test_idct2d_eq_slow!(test_idct2d_128_128_eq_slow, 128, 128, idct2d_128_128, 5e-4);
+test_idct2d_eq_slow!(test_idct2d_256_128_eq_slow, 256, 128, idct2d_256_128, 1e-3);
+test_idct2d_eq_slow!(test_idct2d_128_256_eq_slow, 128, 256, idct2d_128_256, 1e-3);
+test_idct2d_eq_slow!(test_idct2d_256_256_eq_slow, 256, 256, idct2d_256_256, 5e-3);
+
+macro_rules! test_reinterpreting_dct_eq_slow {
+    ($test_name:ident, $fun: ident, $rows:expr, $cols:expr, $tol:expr) => {
+        fn $test_name<D: SimdDescriptor>(d: D) {
+            const N: usize = $rows;
+            const M: usize = $cols;
+
+            let slow_input = random_matrix(N, M);
+
+            let slow_output = slow_reinterpreting_dct2d(&slow_input);
+
+            let mut fast_input: Vec<_> = slow_input
+                .iter()
+                .flat_map(|x| x.iter())
+                .map(|x| *x as f32)
+                .collect();
+
+            let mut output = [0.0; $rows * $cols * 64];
+
+            $fun(d, &mut fast_input, &mut output);
+
+            let on = slow_output.len();
+            let om = slow_output[0].len();
+
+            for r in 0..on {
+                for c in 0..om {
+                    check_close(output[r * om * 8 + c] as f64, slow_output[r][c], $tol);
+                }
+            }
+        }
+        test_all_instruction_sets!($test_name);
+    };
+}
+
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_1x2_eq_slow,
+    reinterpreting_dct2d_1_2,
+    1,
+    2,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_2x1_eq_slow,
+    reinterpreting_dct2d_2_1,
+    2,
+    1,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_2x2_eq_slow,
+    reinterpreting_dct2d_2_2,
+    2,
+    2,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_1x4_eq_slow,
+    reinterpreting_dct2d_1_4,
+    1,
+    4,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_4x1_eq_slow,
+    reinterpreting_dct2d_4_1,
+    4,
+    1,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_2x4_eq_slow,
+    reinterpreting_dct2d_2_4,
+    2,
+    4,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_4x2_eq_slow,
+    reinterpreting_dct2d_4_2,
+    4,
+    2,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_4x4_eq_slow,
+    reinterpreting_dct2d_4_4,
+    4,
+    4,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_8x4_eq_slow,
+    reinterpreting_dct2d_8_4,
+    8,
+    4,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_4x8_eq_slow,
+    reinterpreting_dct2d_4_8,
+    4,
+    8,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_8x8_eq_slow,
+    reinterpreting_dct2d_8_8,
+    8,
+    8,
+    1e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_8x16_eq_slow,
+    reinterpreting_dct2d_8_16,
+    8,
+    16,
+    5e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_16x8_eq_slow,
+    reinterpreting_dct2d_16_8,
+    16,
+    8,
+    5e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_16x16_eq_slow,
+    reinterpreting_dct2d_16_16,
+    16,
+    16,
+    5e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_32x16_eq_slow,
+    reinterpreting_dct2d_32_16,
+    32,
+    16,
+    5e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_16x32_eq_slow,
+    reinterpreting_dct2d_16_32,
+    16,
+    32,
+    5e-6
+);
+test_reinterpreting_dct_eq_slow!(
+    test_reinterpreting_dct_32x32_eq_slow,
+    reinterpreting_dct2d_32_32,
+    32,
+    32,
+    5e-6
+);
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/transform.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/transform.rs
new file mode 100644
index 00000000..0db451d9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/transform.rs
@@ -0,0 +1,662 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::excessive_precision)]
+#![allow(clippy::approx_constant)]
+
+use super::{transform_map::HfTransformType, *};
+use jxl_simd::SimdDescriptor;
+
+fn idct2_top_block(s: usize, block_in: &[f32], block_out: &mut [f32]) {
+    let num_2x2 = s / 2;
+    for y in 0..num_2x2 {
+        for x in 0..num_2x2 {
+            let c00 = block_in[y * 8 + x];
+            let c01 = block_in[y * 8 + num_2x2 + x];
+            let c10 = block_in[(y + num_2x2) * 8 + x];
+            let c11 = block_in[(y + num_2x2) * 8 + num_2x2 + x];
+            let r00 = c00 + c01 + c10 + c11;
+            let r01 = c00 + c01 - c10 - c11;
+            let r10 = c00 - c01 + c10 - c11;
+            let r11 = c00 - c01 - c10 + c11;
+            block_out[y * 2 * 8 + x * 2] = r00;
+            block_out[y * 2 * 8 + x * 2 + 1] = r01;
+            block_out[(y * 2 + 1) * 8 + x * 2] = r10;
+            block_out[(y * 2 + 1) * 8 + x * 2 + 1] = r11;
+        }
+    }
+}
+
+const AFV4X4BASIS: [f32; 256] = [
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.25,
+    0.876902929799142,
+    0.2206518106944235,
+    -0.10140050393753763,
+    -0.1014005039375375,
+    0.2206518106944236,
+    -0.10140050393753777,
+    -0.10140050393753772,
+    -0.10140050393753763,
+    -0.10140050393753758,
+    -0.10140050393753769,
+    -0.1014005039375375,
+    -0.10140050393753768,
+    -0.10140050393753768,
+    -0.10140050393753759,
+    -0.10140050393753763,
+    -0.10140050393753741,
+    0.0,
+    0.0,
+    0.40670075830260755,
+    0.44444816619734445,
+    0.0,
+    0.0,
+    0.19574399372042936,
+    0.2929100136981264,
+    -0.40670075830260716,
+    -0.19574399372042872,
+    0.0,
+    0.11379074460448091,
+    -0.44444816619734384,
+    -0.29291001369812636,
+    -0.1137907446044814,
+    0.0,
+    0.0,
+    0.0,
+    -0.21255748058288748,
+    0.3085497062849767,
+    0.0,
+    0.4706702258572536,
+    -0.1621205195722993,
+    0.0,
+    -0.21255748058287047,
+    -0.16212051957228327,
+    -0.47067022585725277,
+    -0.1464291867126764,
+    0.3085497062849487,
+    0.0,
+    -0.14642918671266536,
+    0.4251149611657548,
+    0.0,
+    -0.7071067811865474,
+    0.0,
+    0.0,
+    0.7071067811865476,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    -0.4105377591765233,
+    0.6235485373547691,
+    -0.06435071657946274,
+    -0.06435071657946266,
+    0.6235485373547694,
+    -0.06435071657946284,
+    -0.0643507165794628,
+    -0.06435071657946274,
+    -0.06435071657946272,
+    -0.06435071657946279,
+    -0.06435071657946266,
+    -0.06435071657946277,
+    -0.06435071657946277,
+    -0.06435071657946273,
+    -0.06435071657946274,
+    -0.0643507165794626,
+    0.0,
+    0.0,
+    -0.4517556589999482,
+    0.15854503551840063,
+    0.0,
+    -0.04038515160822202,
+    0.0074182263792423875,
+    0.39351034269210167,
+    -0.45175565899994635,
+    0.007418226379244351,
+    0.1107416575309343,
+    0.08298163094882051,
+    0.15854503551839705,
+    0.3935103426921022,
+    0.0829816309488214,
+    -0.45175565899994796,
+    0.0,
+    0.0,
+    -0.304684750724869,
+    0.5112616136591823,
+    0.0,
+    0.0,
+    -0.290480129728998,
+    -0.06578701549142804,
+    0.304684750724884,
+    0.2904801297290076,
+    0.0,
+    -0.23889773523344604,
+    -0.5112616136592012,
+    0.06578701549142545,
+    0.23889773523345467,
+    0.0,
+    0.0,
+    0.0,
+    0.3017929516615495,
+    0.25792362796341184,
+    0.0,
+    0.16272340142866204,
+    0.09520022653475037,
+    0.0,
+    0.3017929516615503,
+    0.09520022653475055,
+    -0.16272340142866173,
+    -0.35312385449816297,
+    0.25792362796341295,
+    0.0,
+    -0.3531238544981624,
+    -0.6035859033230976,
+    0.0,
+    0.0,
+    0.40824829046386274,
+    0.0,
+    0.0,
+    0.0,
+    0.0,
+    -0.4082482904638628,
+    -0.4082482904638635,
+    0.0,
+    0.0,
+    -0.40824829046386296,
+    0.0,
+    0.4082482904638634,
+    0.408248290463863,
+    0.0,
+    0.0,
+    0.0,
+    0.1747866975480809,
+    0.0812611176717539,
+    0.0,
+    0.0,
+    -0.3675398009862027,
+    -0.307882213957909,
+    -0.17478669754808135,
+    0.3675398009862011,
+    0.0,
+    0.4826689115059883,
+    -0.08126111767175039,
+    0.30788221395790305,
+    -0.48266891150598584,
+    0.0,
+    0.0,
+    0.0,
+    -0.21105601049335784,
+    0.18567180916109802,
+    0.0,
+    0.0,
+    0.49215859013738733,
+    -0.38525013709251915,
+    0.21105601049335806,
+    -0.49215859013738905,
+    0.0,
+    0.17419412659916217,
+    -0.18567180916109904,
+    0.3852501370925211,
+    -0.1741941265991621,
+    0.0,
+    0.0,
+    0.0,
+    -0.14266084808807264,
+    -0.3416446842253372,
+    0.0,
+    0.7367497537172237,
+    0.24627107722075148,
+    -0.08574019035519306,
+    -0.14266084808807344,
+    0.24627107722075137,
+    0.14883399227113567,
+    -0.04768680350229251,
+    -0.3416446842253373,
+    -0.08574019035519267,
+    -0.047686803502292804,
+    -0.14266084808807242,
+    0.0,
+    0.0,
+    -0.13813540350758585,
+    0.3302282550303788,
+    0.0,
+    0.08755115000587084,
+    -0.07946706605909573,
+    -0.4613374887461511,
+    -0.13813540350758294,
+    -0.07946706605910261,
+    0.49724647109535086,
+    0.12538059448563663,
+    0.3302282550303805,
+    -0.4613374887461554,
+    0.12538059448564315,
+    -0.13813540350758452,
+    0.0,
+    0.0,
+    -0.17437602599651067,
+    0.0702790691196284,
+    0.0,
+    -0.2921026642334881,
+    0.3623817333531167,
+    0.0,
+    -0.1743760259965108,
+    0.36238173335311646,
+    0.29210266423348785,
+    -0.4326608024727445,
+    0.07027906911962818,
+    0.0,
+    -0.4326608024727457,
+    0.34875205199302267,
+    0.0,
+    0.0,
+    0.11354987314994337,
+    -0.07417504595810355,
+    0.0,
+    0.19402893032594343,
+    -0.435190496523228,
+    0.21918684838857466,
+    0.11354987314994257,
+    -0.4351904965232251,
+    0.5550443808910661,
+    -0.25468277124066463,
+    -0.07417504595810233,
+    0.2191868483885728,
+    -0.25468277124066413,
+    0.1135498731499429,
+];
+
+#[allow(clippy::excessive_precision)]
+#[allow(clippy::approx_constant)]
+fn avfidct4x4(coeffs: &[f32], pixels: &mut [f32]) {
+    for i in 0..16 {
+        let mut pixel: f32 = 0.0;
+        for j in 0..16 {
+            pixel += coeffs[j] * AFV4X4BASIS[j * 16 + i];
+        }
+        pixels[i] = pixel;
+    }
+}
+
+#[inline(always)]
+fn afv_transform_to_pixels<D: SimdDescriptor>(
+    d: D,
+    afv_kind: usize,
+    coefficients: &[f32],
+    pixels: &mut [f32],
+) {
+    let afv_x = afv_kind & 1;
+    let afv_y = afv_kind / 2;
+    let block00 = coefficients[0];
+    let block01 = coefficients[1];
+    let block10 = coefficients[8];
+    let dcs: [f32; 3] = [
+        (block00 + block10 + block01) * 4.0,
+        block00 + block10 - block01,
+        block00 - block10,
+    ];
+    // IAFV: (even, even) positions.
+    let mut coeff: Vec<f32> = vec![0.0; 4 * 4];
+    for iy in 0..4 {
+        for ix in 0..4 {
+            coeff[iy * 4 + ix] = if ix == 0 && iy == 0 {
+                dcs[0]
+            } else {
+                coefficients[iy * 2 * 8 + ix * 2]
+            };
+        }
+    }
+    let mut block: Vec<f32> = vec![0.0; 4 * 8];
+    avfidct4x4(&coeff, &mut block);
+    for iy in 0..4 {
+        let block_y = if afv_y == 1 { 3 - iy } else { iy };
+        for ix in 0..4 {
+            let block_x = if afv_x == 1 { 3 - ix } else { ix };
+            pixels[(iy + afv_y * 4) * 8 + afv_x * 4 + ix] = block[block_y * 4 + block_x];
+        }
+    }
+    // IDCT4x4 in (odd, even) positions.
+    for iy in 0..4 {
+        for ix in 0..4 {
+            block[iy * 4 + ix] = if ix == 0 && iy == 0 {
+                dcs[1]
+            } else {
+                coefficients[iy * 2 * 8 + ix * 2 + 1]
+            };
+        }
+    }
+    idct2d_4_4(d, &mut block[0..16]);
+    for iy in 0..4 {
+        for ix in 0..4 {
+            pixels[(iy + afv_y * 4) * 8 + (1 - afv_x) * 4 + ix] = block[iy * 4 + ix];
+        }
+    }
+    // IDCT4x8.
+    for iy in 0..4 {
+        for ix in 0..8 {
+            block[iy * 8 + ix] = if ix == 0 && iy == 0 {
+                dcs[2]
+            } else {
+                coefficients[(1 + iy * 2) * 8 + ix]
+            };
+        }
+    }
+    idct2d_4_8(d, &mut block);
+    for iy in 0..4 {
+        for ix in 0..8 {
+            pixels[(iy + (1 - afv_y) * 4) * 8 + ix] = block[iy * 8 + ix];
+        }
+    }
+}
+
+#[inline]
+pub fn transform_to_pixels_impl<D: SimdDescriptor>(
+    d: D,
+    transform_type: HfTransformType,
+    lf: &mut [f32],
+    transform_buffer: &mut [f32],
+) {
+    match transform_type {
+        HfTransformType::DCT => d.call(
+            #[inline(always)]
+            |_| {
+                transform_buffer[0] = lf[0];
+                idct2d_8_8(d, &mut transform_buffer[0..64]);
+            },
+        ),
+        HfTransformType::DCT16X16 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_2_2(d, &mut lf[..4], transform_buffer);
+                idct2d_16_16(d, &mut transform_buffer[0..256]);
+            },
+        ),
+        HfTransformType::DCT32X32 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_4_4(d, &mut lf[..16], transform_buffer);
+                idct2d_32_32(d, &mut transform_buffer[0..1024]);
+            },
+        ),
+        HfTransformType::DCT16X8 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_2_1(d, &mut lf[..2], transform_buffer);
+                idct2d_16_8(d, &mut transform_buffer[0..128]);
+            },
+        ),
+        HfTransformType::DCT8X16 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_1_2(d, &mut lf[..2], transform_buffer);
+                idct2d_8_16(d, &mut transform_buffer[0..128]);
+            },
+        ),
+        HfTransformType::DCT32X8 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_4_1(d, &mut lf[..4], transform_buffer);
+                idct2d_32_8(d, &mut transform_buffer[0..256]);
+            },
+        ),
+        HfTransformType::DCT8X32 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_1_4(d, &mut lf[..4], transform_buffer);
+                idct2d_8_32(d, &mut transform_buffer[0..256]);
+            },
+        ),
+        HfTransformType::DCT32X16 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_4_2(d, &mut lf[..8], transform_buffer);
+                idct2d_32_16(d, &mut transform_buffer[0..512]);
+            },
+        ),
+        HfTransformType::DCT16X32 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_2_4(d, &mut lf[..8], transform_buffer);
+                idct2d_16_32(d, &mut transform_buffer[0..512]);
+            },
+        ),
+        HfTransformType::DCT64X64 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_8_8(d, &mut lf[..64], transform_buffer);
+                idct2d_64_64(d, &mut transform_buffer[0..4096]);
+            },
+        ),
+        HfTransformType::DCT64X32 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_8_4(d, &mut lf[..32], transform_buffer);
+                idct2d_64_32(d, &mut transform_buffer[0..2048]);
+            },
+        ),
+        HfTransformType::DCT32X64 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_4_8(d, &mut lf[..32], transform_buffer);
+                idct2d_32_64(d, &mut transform_buffer[0..2048]);
+            },
+        ),
+        HfTransformType::DCT128X128 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_16_16(d, &mut lf[..256], transform_buffer);
+                idct2d_128_128(d, &mut transform_buffer[0..16384]);
+            },
+        ),
+        HfTransformType::DCT128X64 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_16_8(d, &mut lf[..128], transform_buffer);
+                idct2d_128_64(d, &mut transform_buffer[0..8192]);
+            },
+        ),
+        HfTransformType::DCT64X128 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_8_16(d, &mut lf[..128], transform_buffer);
+                idct2d_64_128(d, &mut transform_buffer[0..8192]);
+            },
+        ),
+        HfTransformType::DCT256X256 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_32_32(d, &mut lf[..1024], transform_buffer);
+                idct2d_256_256(d, &mut transform_buffer[0..65536]);
+            },
+        ),
+        HfTransformType::DCT256X128 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_32_16(d, &mut lf[..512], transform_buffer);
+                idct2d_256_128(d, &mut transform_buffer[0..32768]);
+            },
+        ),
+        HfTransformType::DCT128X256 => d.call(
+            #[inline(always)]
+            |_| {
+                reinterpreting_dct2d_16_32(d, &mut lf[..512], transform_buffer);
+                idct2d_128_256(d, &mut transform_buffer[0..32768]);
+            },
+        ),
+        HfTransformType::AFV0 => {
+            transform_buffer[0] = lf[0];
+            let block: Vec<f32> = transform_buffer[0..64].to_vec();
+            afv_transform_to_pixels::<D>(d, 0, &block, &mut transform_buffer[0..64]);
+        }
+        HfTransformType::AFV1 => {
+            transform_buffer[0] = lf[0];
+            let block: Vec<f32> = transform_buffer[0..64].to_vec();
+            afv_transform_to_pixels::<D>(d, 1, &block, &mut transform_buffer[0..64]);
+        }
+        HfTransformType::AFV2 => {
+            transform_buffer[0] = lf[0];
+            let block: Vec<f32> = transform_buffer[0..64].to_vec();
+            afv_transform_to_pixels::<D>(d, 2, &block, &mut transform_buffer[0..64]);
+        }
+        HfTransformType::AFV3 => {
+            transform_buffer[0] = lf[0];
+            let block: Vec<f32> = transform_buffer[0..64].to_vec();
+            afv_transform_to_pixels::<D>(d, 3, &block, &mut transform_buffer[0..64]);
+        }
+        HfTransformType::IDENTITY => {
+            transform_buffer[0] = lf[0];
+            let coefficients: [f32; 64] = transform_buffer[0..64].try_into().unwrap();
+            let block00 = coefficients[0];
+            let block01 = coefficients[1];
+            let block10 = coefficients[8];
+            let block11 = coefficients[9];
+            let dcs: [f32; 4] = [
+                block00 + block01 + block10 + block11,
+                block00 + block01 - block10 - block11,
+                block00 - block01 + block10 - block11,
+                block00 - block01 - block10 + block11,
+            ];
+            for y in 0..2 {
+                for x in 0..2 {
+                    let block_dc = dcs[y * 2 + x];
+                    let mut residual_sum = 0.0;
+                    for iy in 0..4 {
+                        for ix in 0..4 {
+                            if ix == 0 && iy == 0 {
+                                continue;
+                            }
+                            residual_sum += coefficients[(y + iy * 2) * 8 + x + ix * 2];
+                        }
+                    }
+                    transform_buffer[(4 * y + 1) * 8 + 4 * x + 1] =
+                        block_dc - residual_sum * (1.0 / 16.0);
+                    for iy in 0..4 {
+                        for ix in 0..4 {
+                            if ix == 1 && iy == 1 {
+                                continue;
+                            }
+                            transform_buffer[(y * 4 + iy) * 8 + x * 4 + ix] = coefficients
+                                [(y + iy * 2) * 8 + x + ix * 2]
+                                + transform_buffer[(4 * y + 1) * 8 + 4 * x + 1];
+                        }
+                    }
+                    transform_buffer[y * 4 * 8 + x * 4] = coefficients[(y + 2) * 8 + x + 2]
+                        + transform_buffer[(4 * y + 1) * 8 + 4 * x + 1];
+                }
+            }
+        }
+        HfTransformType::DCT2X2 => {
+            transform_buffer[0] = lf[0];
+            let mut tmp: [f32; 64] = transform_buffer[0..64].try_into().unwrap();
+            idct2_top_block(2, &tmp, &mut transform_buffer[0..64]);
+            idct2_top_block(4, &transform_buffer[0..64], &mut tmp);
+            idct2_top_block(8, &tmp, &mut transform_buffer[0..64]);
+        }
+        HfTransformType::DCT4X4 => {
+            transform_buffer[0] = lf[0];
+            let coefficients: [f32; 64] = transform_buffer[0..64].try_into().unwrap();
+            let block00 = coefficients[0];
+            let block01 = coefficients[1];
+            let block10 = coefficients[8];
+            let block11 = coefficients[9];
+            let dcs: [f32; 4] = [
+                block00 + block01 + block10 + block11,
+                block00 + block01 - block10 - block11,
+                block00 - block01 + block10 - block11,
+                block00 - block01 - block10 + block11,
+            ];
+            for y in 0..2 {
+                for x in 0..2 {
+                    let mut block = [0.0; 4 * 4];
+                    block[0] = dcs[y * 2 + x];
+                    for iy in 0..4 {
+                        for ix in 0..4 {
+                            if ix == 0 && iy == 0 {
+                                continue;
+                            }
+                            block[iy * 4 + ix] = coefficients[(y + iy * 2) * 8 + x + ix * 2];
+                        }
+                    }
+                    idct2d_4_4(d, &mut block);
+                    for iy in 0..4 {
+                        for ix in 0..4 {
+                            transform_buffer[(y * 4 + iy) * 8 + x * 4 + ix] = block[iy * 4 + ix];
+                        }
+                    }
+                }
+            }
+        }
+        HfTransformType::DCT8X4 => {
+            transform_buffer[0] = lf[0];
+            let coefficients: [f32; 64] = transform_buffer[0..64].try_into().unwrap();
+            let block0 = coefficients[0];
+            let block1 = coefficients[8];
+            let dcs: [f32; 2] = [block0 + block1, block0 - block1];
+            for x in 0..2 {
+                let mut block = [0.0; 8 * 4];
+                for iy in 0..4 {
+                    for ix in 0..8 {
+                        block[iy * 8 + ix] = if ix == 0 && iy == 0 {
+                            dcs[x]
+                        } else {
+                            coefficients[(x + iy * 2) * 8 + ix]
+                        }
+                    }
+                }
+                idct2d_8_4(d, &mut block);
+                for iy in 0..8 {
+                    for ix in 0..4 {
+                        transform_buffer[iy * 8 + x * 4 + ix] = block[iy * 4 + ix];
+                    }
+                }
+            }
+        }
+        HfTransformType::DCT4X8 => {
+            transform_buffer[0] = lf[0];
+            let coefficients: [f32; 64] = transform_buffer[0..64].try_into().unwrap();
+            let block0 = coefficients[0];
+            let block1 = coefficients[8];
+            let dcs: [f32; 2] = [block0 + block1, block0 - block1];
+            for y in 0..2 {
+                let mut block = [0.0; 4 * 8];
+                for iy in 0..4 {
+                    for ix in 0..8 {
+                        block[iy * 8 + ix] = if ix == 0 && iy == 0 {
+                            dcs[y]
+                        } else {
+                            coefficients[(y + iy * 2) * 8 + ix]
+                        }
+                    }
+                }
+                idct2d_4_8(d, &mut block);
+                for iy in 0..4 {
+                    for ix in 0..8 {
+                        transform_buffer[(y * 4 + iy) * 8 + ix] = block[iy * 8 + ix];
+                    }
+                }
+            }
+        }
+    };
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/transform_map.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/transform_map.rs
new file mode 100644
index 00000000..ea1902a9
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/transforms/transform_map.rs
@@ -0,0 +1,116 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub const MAX_COEFF_BLOCKS: usize = 32;
+pub const MAX_BLOCK_DIM: usize = 8 * MAX_COEFF_BLOCKS;
+pub const MAX_COEFF_AREA: usize = MAX_BLOCK_DIM * MAX_BLOCK_DIM;
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum HfTransformType {
+    // Update HfTransformType::VALUES when changing this!
+    // Regular block size DCT
+    DCT = 0,
+    // Encode pixels without transforming
+    // a.k.a "Hornuss"
+    IDENTITY = 1,
+    // Use 2-by-2 DCT
+    DCT2X2 = 2,
+    // Use 4-by-4 DCT
+    DCT4X4 = 3,
+    // Use 16-by-16 DCT
+    DCT16X16 = 4,
+    // Use 32-by-32 DCT
+    DCT32X32 = 5,
+    // Use 16-by-8 DCT
+    DCT16X8 = 6,
+    // Use 8-by-16 DCT
+    DCT8X16 = 7,
+    // Use 32-by-8 DCT
+    DCT32X8 = 8,
+    // Use 8-by-32 DCT
+    DCT8X32 = 9,
+    // Use 32-by-16 DCT
+    DCT32X16 = 10,
+    // Use 16-by-32 DCT
+    DCT16X32 = 11,
+    // 4x8 and 8x4 DCT
+    DCT4X8 = 12,
+    DCT8X4 = 13,
+    // Corner-DCT.
+    AFV0 = 14,
+    AFV1 = 15,
+    AFV2 = 16,
+    AFV3 = 17,
+    // Larger DCTs
+    DCT64X64 = 18,
+    DCT64X32 = 19,
+    DCT32X64 = 20,
+    // No transforms smaller than 64x64 are allowed below.
+    DCT128X128 = 21,
+    DCT128X64 = 22,
+    DCT64X128 = 23,
+    DCT256X256 = 24,
+    DCT256X128 = 25,
+    DCT128X256 = 26,
+}
+
+impl HfTransformType {
+    pub const INVALID_TRANSFORM: u8 = Self::CARDINALITY as u8;
+    pub const CARDINALITY: usize = Self::VALUES.len();
+    pub const VALUES: [HfTransformType; 27] = [
+        HfTransformType::DCT,
+        HfTransformType::IDENTITY,
+        HfTransformType::DCT2X2,
+        HfTransformType::DCT4X4,
+        HfTransformType::DCT16X16,
+        HfTransformType::DCT32X32,
+        HfTransformType::DCT16X8,
+        HfTransformType::DCT8X16,
+        HfTransformType::DCT32X8,
+        HfTransformType::DCT8X32,
+        HfTransformType::DCT32X16,
+        HfTransformType::DCT16X32,
+        HfTransformType::DCT4X8,
+        HfTransformType::DCT8X4,
+        HfTransformType::AFV0,
+        HfTransformType::AFV1,
+        HfTransformType::AFV2,
+        HfTransformType::AFV3,
+        HfTransformType::DCT64X64,
+        HfTransformType::DCT64X32,
+        HfTransformType::DCT32X64,
+        HfTransformType::DCT128X128,
+        HfTransformType::DCT128X64,
+        HfTransformType::DCT64X128,
+        HfTransformType::DCT256X256,
+        HfTransformType::DCT256X128,
+        HfTransformType::DCT128X256,
+    ];
+    pub fn from_usize(idx: usize) -> Option<HfTransformType> {
+        HfTransformType::VALUES.get(idx).copied()
+    }
+}
+
+pub fn covered_blocks_x(transform: HfTransformType) -> u32 {
+    let lut: [u32; HfTransformType::CARDINALITY] = [
+        1, 1, 1, 1, 2, 4, 1, 2, 1, 4, 2, 4, 1, 1, 1, 1, 1, 1, 8, 4, 8, 16, 8, 16, 32, 16, 32,
+    ];
+    lut[transform as usize]
+}
+
+pub fn covered_blocks_y(transform: HfTransformType) -> u32 {
+    let lut: [u32; HfTransformType::CARDINALITY] = [
+        1, 1, 1, 1, 2, 4, 2, 1, 4, 1, 4, 2, 1, 1, 1, 1, 1, 1, 8, 8, 4, 16, 16, 8, 32, 32, 16,
+    ];
+    lut[transform as usize]
+}
+
+pub fn block_shape_id(transform: HfTransformType) -> u32 {
+    let lut: [u32; HfTransformType::CARDINALITY] = [
+        0, 1, 1, 1, 2, 3, 4, 4, 5, 5, 6, 6, 1, 1, 1, 1, 1, 1, 7, 8, 8, 9, 10, 10, 11, 12, 12,
+    ];
+    lut[transform as usize]
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/bits.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/bits.rs
new file mode 100644
index 00000000..fe578ea8
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/bits.rs
@@ -0,0 +1,23 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub fn value_of_lowest_1_bit(t: u32) -> u32 {
+    t & t.wrapping_neg()
+}
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_value_of_lowest_1_bit() {
+        assert_eq!(value_of_lowest_1_bit(0b0001), 1);
+        assert_eq!(value_of_lowest_1_bit(0b1111), 1);
+        assert_eq!(value_of_lowest_1_bit(0b0010), 2);
+        assert_eq!(value_of_lowest_1_bit(0b0100), 4);
+        assert_eq!(value_of_lowest_1_bit(0b1010), 2);
+        assert_eq!(value_of_lowest_1_bit(0b1000_0000), 128);
+        assert_eq!(value_of_lowest_1_bit(0), 0);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/cacheline.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/cacheline.rs
new file mode 100644
index 00000000..956420cd
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/cacheline.rs
@@ -0,0 +1,52 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::image::ImageDataType;
+
+pub const CACHE_LINE_BYTE_SIZE: usize = 64;
+
+pub const fn num_per_cache_line<T>() -> usize {
+    // Post-mono check that T is smaller than a cache line and has size a power of 2.
+    // This prevents some of the silliest mistakes.
+    const {
+        assert!(std::mem::size_of::<T>() <= CACHE_LINE_BYTE_SIZE);
+        assert!(std::mem::size_of::<T>().is_power_of_two());
+    }
+    CACHE_LINE_BYTE_SIZE / std::mem::size_of::<T>()
+}
+
+#[allow(dead_code)] // Used by SimpleRenderPipeline (test infrastructure)
+pub fn round_up_size_to_cache_line<T>(size: usize) -> usize {
+    let n = const { num_per_cache_line::<T>() };
+    size.div_ceil(n) * n
+}
+
+#[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
+#[repr(C, align(64))]
+pub struct CacheLine([u8; CACHE_LINE_BYTE_SIZE]);
+
+impl Default for CacheLine {
+    fn default() -> Self {
+        CacheLine([0; CACHE_LINE_BYTE_SIZE])
+    }
+}
+
+#[inline(always)]
+pub fn slice_from_cachelines<T: ImageDataType>(slice: &[CacheLine]) -> &[T] {
+    const { assert!(64usize.is_multiple_of(std::mem::align_of::<T>())) };
+    const { assert!(CACHE_LINE_BYTE_SIZE.is_multiple_of(std::mem::size_of::<T>())) };
+    const { assert!(CACHE_LINE_BYTE_SIZE == 64) };
+    // CacheLine: Pod, T: Pod (via ImageDataType) — safe transmutation via bytemuck.
+    // CacheLine is 64-byte aligned which satisfies T's alignment requirements.
+    bytemuck::cast_slice(bytemuck::cast_slice::<CacheLine, u8>(slice))
+}
+
+#[inline(always)]
+pub fn slice_from_cachelines_mut<T: ImageDataType>(slice: &mut [CacheLine]) -> &mut [T] {
+    const { assert!(64usize.is_multiple_of(std::mem::align_of::<T>())) };
+    const { assert!(CACHE_LINE_BYTE_SIZE.is_multiple_of(std::mem::size_of::<T>())) };
+    const { assert!(CACHE_LINE_BYTE_SIZE == 64) };
+    bytemuck::cast_slice_mut(bytemuck::cast_slice_mut::<CacheLine, u8>(slice))
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/clock.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/clock.rs
new file mode 100644
index 00000000..5f7d76da
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/clock.rs
@@ -0,0 +1,32 @@
+// exav: not part of upstream. See ../../EXAV.md.
+
+//! The clock the decoder times its phases with (`JXL_PHASE_TIMING`, off).
+//!
+//! `std::time::Instant::now()` panics on `wasm32-unknown-unknown`, which has no
+//! clock, and the decoder reads it whether or not timing is wanted. On that
+//! target the clock reads zero: nothing in the decoder depends on a time, and a
+//! browser build must not import one from its host.
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use std::time::Instant;
+
+#[cfg(target_arch = "wasm32")]
+mod wasm {
+    use std::time::Duration;
+
+    #[derive(Clone, Copy, Debug)]
+    pub struct Instant;
+
+    impl Instant {
+        pub fn now() -> Self {
+            Instant
+        }
+
+        pub fn elapsed(&self) -> Duration {
+            Duration::ZERO
+        }
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+pub use wasm::Instant;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/concat_slice.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/concat_slice.rs
new file mode 100644
index 00000000..e01c003a
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/concat_slice.rs
@@ -0,0 +1,125 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::error::Error;
+
+#[allow(dead_code)] // Container format support infrastructure, currently test-only
+pub struct ConcatSlice<'first, 'second> {
+    slices: (&'first [u8], &'second [u8]),
+    ptr: usize,
+}
+
+#[allow(dead_code)]
+impl<'first, 'second> ConcatSlice<'first, 'second> {
+    pub fn new(slice0: &'first [u8], slice1: &'second [u8]) -> Self {
+        Self {
+            slices: (slice0, slice1),
+            ptr: 0,
+        }
+    }
+
+    #[allow(clippy::len_without_is_empty)]
+    pub fn len(&self) -> usize {
+        self.slices.0.len() + self.slices.1.len()
+    }
+
+    pub fn remaining_slices(&self) -> (&'first [u8], &'second [u8]) {
+        let (slice0, slice1) = self.slices;
+        let total_len = self.len();
+        let ptr = self.ptr;
+        if ptr >= total_len {
+            (&[], &[])
+        } else if let Some(second_slice_ptr) = ptr.checked_sub(slice0.len()) {
+            (&[], &slice1[second_slice_ptr..])
+        } else {
+            (&slice0[ptr..], slice1)
+        }
+    }
+
+    pub fn advance(&mut self, bytes: usize) {
+        self.ptr += bytes;
+    }
+
+    pub fn peek<'out>(&self, out_buf: &'out mut [u8]) -> &'out mut [u8] {
+        let (slice0, slice1) = self.remaining_slices();
+        let total_len = slice0.len() + slice1.len();
+
+        let out_bytes = out_buf.len().min(total_len);
+        let out_buf = &mut out_buf[..out_bytes];
+
+        if out_bytes <= slice0.len() {
+            out_buf.copy_from_slice(&slice0[..out_bytes]);
+        } else {
+            let (out_first, out_second) = out_buf.split_at_mut(slice0.len());
+            out_first.copy_from_slice(slice0);
+            out_second.copy_from_slice(&slice1[..out_second.len()]);
+        }
+
+        out_buf
+    }
+
+    pub fn fill_vec(&mut self, max_bytes: Option<usize>, v: &mut Vec<u8>) -> Result<usize, Error> {
+        let (slice0, slice1) = self.remaining_slices();
+        let total_len = slice0.len() + slice1.len();
+
+        let out_bytes = max_bytes.unwrap_or(usize::MAX).min(total_len);
+        v.try_reserve(out_bytes)?;
+
+        if out_bytes <= slice0.len() {
+            v.extend_from_slice(&slice0[..out_bytes]);
+        } else {
+            let second_slice_len = out_bytes - slice0.len();
+            v.extend_from_slice(slice0);
+            v.extend_from_slice(&slice1[..second_slice_len]);
+        }
+
+        self.advance(out_bytes);
+        Ok(out_bytes)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn peek_advance() {
+        let mut reader = ConcatSlice::new(&[0, 1, 2, 3], &[4, 5, 6, 7]);
+        let mut buf = [0u8; 8];
+
+        let actual = reader.peek(&mut buf[..1]);
+        assert_eq!(actual, &[0]);
+        reader.advance(actual.len());
+
+        let actual = reader.peek(&mut buf[..2]);
+        assert_eq!(actual, &[1, 2]);
+        reader.advance(actual.len());
+
+        let actual = reader.peek(&mut buf[..3]);
+        assert_eq!(actual, &[3, 4, 5]);
+        reader.advance(actual.len());
+
+        let actual = reader.peek(&mut buf);
+        assert_eq!(actual, &[6, 7]);
+        reader.advance(actual.len());
+
+        let actual = reader.peek(&mut buf);
+        assert!(actual.is_empty());
+    }
+
+    #[test]
+    fn fill_vec() {
+        let mut reader = ConcatSlice::new(&[0, 1, 2, 3], &[4, 5, 6, 7]);
+        let mut v = Vec::new();
+
+        let count = reader.fill_vec(Some(3), &mut v).unwrap();
+        assert_eq!(count, 3);
+        assert_eq!(&v, &[0, 1, 2]);
+
+        let count = reader.fill_vec(None, &mut v).unwrap();
+        assert_eq!(count, 5);
+        assert_eq!(&v, &[0, 1, 2, 3, 4, 5, 6, 7]);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/fast_math.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/fast_math.rs
new file mode 100644
index 00000000..635cb8ac
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/fast_math.rs
@@ -0,0 +1,245 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(clippy::excessive_precision)]
+
+use super::{eval_rational_poly, eval_rational_poly_simd};
+use jxl_simd::{F32SimdVec, I32SimdVec, SimdDescriptor, shl, shr};
+use std::f32::consts::{PI, SQRT_2};
+
+const POW2F_NUMER_COEFFS: [f32; 3] = [1.01749063e1, 4.88687798e1, 9.85506591e1];
+const POW2F_DENOM_COEFFS: [f32; 4] = [2.10242958e-1, -2.22328856e-2, -1.94414990e1, 9.85506633e1];
+
+#[inline]
+pub fn fast_cos(x: f32) -> f32 {
+    // Step 1: range reduction to [0, 2pi)
+    let pi2 = PI * 2.0;
+    let pi2_inv = 0.5 / PI;
+    let npi2 = (x * pi2_inv).floor() * pi2;
+    let xmodpi2 = x - npi2;
+    // Step 2: range reduction to [0, pi]
+    let x_pi = xmodpi2.min(pi2 - xmodpi2);
+    // Step 3: range reduction to [0, pi/2]
+    let above_pihalf = x_pi >= PI / 2.0;
+    let x_pihalf = if above_pihalf { PI - x_pi } else { x_pi };
+    // Step 4: Taylor-like approximation, scaled by 2**0.75 to make angle
+    // duplication steps faster, on x/4.
+    let xs = x_pihalf * 0.25;
+    let x2 = xs * xs;
+    let x4 = x2 * x2;
+    let cosx_prescaling = x4 * 0.06960438 + (x2 * -0.84087373 + 1.68179268);
+    // Step 5: angle duplication.
+    let cosx_scale1 = cosx_prescaling * cosx_prescaling - SQRT_2;
+    let cosx_scale2 = cosx_scale1 * cosx_scale1 - 1.0;
+    // Step 6: change sign if needed.
+    if above_pihalf {
+        -cosx_scale2
+    } else {
+        cosx_scale2
+    }
+}
+
+#[inline]
+#[allow(dead_code)] // Error function approximation for noise generation
+pub fn fast_erff(x: f32) -> f32 {
+    // Formula from
+    // https://en.wikipedia.org/wiki/Error_function#Numerical_approximations
+    // but constants have been recomputed.
+    let absx = x.abs();
+    // Compute 1 - 1 / ((((x * a + b) * x + c) * x + d) * x + 1)**4
+    let denom1 = absx * 7.77394369e-02 + 2.05260015e-04;
+    let denom2 = denom1 * absx + 2.32120216e-01;
+    let denom3 = denom2 * absx + 2.77820801e-01;
+    let denom4 = denom3 * absx + 1.0;
+    let denom5 = denom4 * denom4;
+    let inv_denom5 = 1.0 / denom5;
+    let result = -inv_denom5 * inv_denom5 + 1.0;
+    result.copysign(x)
+}
+
+#[inline(always)]
+pub fn fast_erff_simd<D: SimdDescriptor>(d: D, x: D::F32Vec) -> D::F32Vec {
+    let absx = x.abs();
+    let denom1 = absx.mul_add(
+        D::F32Vec::splat(d, 7.77394369e-02),
+        D::F32Vec::splat(d, 2.05260015e-04),
+    );
+    let denom2 = denom1.mul_add(absx, D::F32Vec::splat(d, 2.32120216e-01));
+    let denom3 = denom2.mul_add(absx, D::F32Vec::splat(d, 2.77820801e-01));
+    let denom4 = denom3.mul_add(absx, D::F32Vec::splat(d, 1.0));
+    let denom5 = denom4 * denom4;
+    let inv_denom5 = D::F32Vec::splat(d, 1.0) / denom5;
+    let result = D::F32Vec::splat(d, 1.0) - inv_denom5 * inv_denom5;
+    result.copysign(x)
+}
+
+#[inline]
+pub fn fast_pow2f(x: f32) -> f32 {
+    let x_floor = x.floor();
+    let exp = f32::from_bits(((x_floor as i32 + 127) as u32) << 23);
+    let frac = x - x_floor;
+
+    let num = frac + POW2F_NUMER_COEFFS[0];
+    let num = num * frac + POW2F_NUMER_COEFFS[1];
+    let num = num * frac + POW2F_NUMER_COEFFS[2];
+    let num = num * exp;
+
+    let den = POW2F_DENOM_COEFFS[0] * frac + POW2F_DENOM_COEFFS[1];
+    let den = den * frac + POW2F_DENOM_COEFFS[2];
+    let den = den * frac + POW2F_DENOM_COEFFS[3];
+
+    num / den
+}
+
+#[inline(always)]
+pub fn fast_pow2f_simd<D: SimdDescriptor>(d: D, x: D::F32Vec) -> D::F32Vec {
+    let x_floor = x.floor();
+    let exp = shl!(x_floor.as_i32() + D::I32Vec::splat(d, 127), 23).bitcast_to_f32();
+    let frac = x - x_floor;
+
+    let num = frac + D::F32Vec::splat(d, POW2F_NUMER_COEFFS[0]);
+    let num = num.mul_add(frac, D::F32Vec::splat(d, POW2F_NUMER_COEFFS[1]));
+    let num = num.mul_add(frac, D::F32Vec::splat(d, POW2F_NUMER_COEFFS[2]));
+    let num = num * exp;
+
+    let den = D::F32Vec::splat(d, POW2F_DENOM_COEFFS[0])
+        .mul_add(frac, D::F32Vec::splat(d, POW2F_DENOM_COEFFS[1]));
+    let den = den.mul_add(frac, D::F32Vec::splat(d, POW2F_DENOM_COEFFS[2]));
+    let den = den.mul_add(frac, D::F32Vec::splat(d, POW2F_DENOM_COEFFS[3]));
+
+    num / den
+}
+
+const LOG2F_P: [f32; 3] = [
+    -1.8503833400518310e-6,
+    1.4287160470083755,
+    7.4245873327820566e-1,
+];
+const LOG2F_Q: [f32; 3] = [
+    9.9032814277590719e-1,
+    1.0096718572241148,
+    1.7409343003366853e-1,
+];
+
+#[inline]
+pub fn fast_log2f(x: f32) -> f32 {
+    let x_bits = x.to_bits() as i32;
+    let exp_bits = x_bits.wrapping_sub(0x3f2aaaab);
+    let exp_shifted = exp_bits >> 23;
+    let mantissa = f32::from_bits((x_bits.wrapping_sub(exp_shifted << 23)) as u32);
+    let exp_val = exp_shifted as f32;
+
+    let x = mantissa - 1.0;
+    eval_rational_poly(x, LOG2F_P, LOG2F_Q) + exp_val
+}
+
+#[inline(always)]
+pub fn fast_log2f_simd<D: SimdDescriptor>(d: D, x: D::F32Vec) -> D::F32Vec {
+    let x_bits = x.bitcast_to_i32();
+    let exp_bits = x_bits - D::I32Vec::splat(d, 0x3f2aaaab);
+    let exp_shifted = shr!(exp_bits, 23);
+    let mantissa = (x_bits - shl!(exp_shifted, 23)).bitcast_to_f32();
+    let exp_val = exp_shifted.as_f32();
+
+    let x = mantissa - D::F32Vec::splat(d, 1.0);
+    eval_rational_poly_simd(d, x, LOG2F_P, LOG2F_Q) + exp_val
+}
+
+// Max relative error: ~3e-5
+#[inline]
+pub fn fast_powf(base: f32, exp: f32) -> f32 {
+    fast_pow2f(fast_log2f(base) * exp)
+}
+
+#[inline]
+pub fn fast_powf_simd<D: SimdDescriptor>(d: D, base: D::F32Vec, exp: D::F32Vec) -> D::F32Vec {
+    fast_pow2f_simd(d, fast_log2f_simd(d, base) * exp)
+}
+
+#[inline(always)]
+pub fn floor_log2_nonzero(x: u64) -> u32 {
+    (u64::BITS as usize - 1) as u32 ^ x.leading_zeros()
+}
+
+#[cfg(test)]
+mod test {
+    use test_log::test;
+
+    use crate::util::test::assert_almost_abs_eq;
+
+    use super::*;
+
+    #[test]
+    fn test_fast_erff() {
+        // Golden data copied from https://en.wikipedia.org/wiki/Error_function#Table_of_values.
+        let golden = [
+            (0.0, 0.0),
+            (0.02, 0.022564575),
+            (0.04, 0.045111106),
+            (0.06, 0.067621594),
+            (0.08, 0.090078126),
+            (0.1, 0.112462916),
+            (0.2, 0.222702589),
+            (0.3, 0.328626759),
+            (0.4, 0.428392355),
+            (0.5, 0.520499878),
+            (0.6, 0.603856091),
+            (0.7, 0.677801194),
+            (0.8, 0.742100965),
+            (0.9, 0.796908212),
+            (1.0, 0.842700793),
+            (1.1, 0.880205070),
+            (1.2, 0.910313978),
+            (1.3, 0.934007945),
+            (1.4, 0.952285120),
+            (1.5, 0.966105146),
+            (1.6, 0.976348383),
+            (1.7, 0.983790459),
+            (1.8, 0.989090502),
+            (1.9, 0.992790429),
+            (2.0, 0.995322265),
+            (2.1, 0.997020533),
+            (2.2, 0.998137154),
+            (2.3, 0.998856823),
+            (2.4, 0.999311486),
+            (2.5, 0.999593048),
+            (3.0, 0.999977910),
+            (3.5, 0.999999257),
+        ];
+        for (x, erf_x) in golden {
+            assert_almost_abs_eq(fast_erff(x), erf_x, 6e-4);
+            assert_almost_abs_eq(fast_erff(-x), -erf_x, 6e-4);
+        }
+    }
+
+    #[test]
+    fn test_fast_cos() {
+        for i in 0..100 {
+            let x = i as f32 / 100.0 * (5.0 * PI) - (2.5 * PI);
+            assert_almost_abs_eq(fast_cos(x), x.cos(), 1e-4);
+        }
+    }
+
+    #[test]
+    fn fast_powf_arb() {
+        arbtest::arbtest(|u| {
+            // (0.0, 128.0]
+            let base = u.int_in_range(1..=1 << 24)? as f32 / (1 << 17) as f32;
+            // [-4.0, 4.0]
+            let exp = u.int_in_range(-(1i32 << 22)..=1 << 22)? as f32 / (1 << 20) as f32;
+
+            let expected = base.powf(exp);
+            let actual = fast_powf(base, exp);
+            let abs_error = (actual - expected).abs();
+            let rel_error = abs_error / expected;
+            assert!(
+                rel_error < 3e-5,
+                "base: {base}, exp: {exp}, rel_error: {rel_error}, expected: {expected}, \
+		 actual: {actual}",
+            );
+            Ok(())
+        });
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/float16.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/float16.rs
new file mode 100644
index 00000000..90286785
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/float16.rs
@@ -0,0 +1,311 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! IEEE 754 half-precision (binary16) floating-point type.
+//!
+//! This is a minimal implementation providing only the operations needed for JPEG XL decoding,
+//! avoiding external dependencies like `half` which pulls in `zerocopy`.
+
+/// IEEE 754 binary16 half-precision floating-point type.
+///
+/// Format: 1 sign bit, 5 exponent bits (bias 15), 10 mantissa bits.
+#[allow(non_camel_case_types)]
+#[derive(Copy, Clone, Default, PartialEq, Eq, Hash, bytemuck::Pod, bytemuck::Zeroable)]
+#[repr(transparent)]
+pub struct f16(u16);
+
+impl f16 {
+    /// Positive zero.
+    pub const ZERO: Self = Self(0);
+
+    /// Creates an f16 from its raw bit representation.
+    #[inline]
+    pub const fn from_bits(bits: u16) -> Self {
+        Self(bits)
+    }
+
+    /// Returns the raw bit representation.
+    #[inline]
+    pub const fn to_bits(self) -> u16 {
+        self.0
+    }
+
+    /// Converts to f32.
+    #[inline]
+    pub fn to_f32(self) -> f32 {
+        let bits = self.0;
+        let sign = ((bits >> 15) & 1) as u32;
+        let exp = ((bits >> 10) & 0x1F) as u32;
+        let mant = (bits & 0x3FF) as u32;
+
+        let f32_bits = if exp == 0 {
+            if mant == 0 {
+                // Zero (signed)
+                sign << 31
+            } else {
+                // Denormal f16 -> normalized f32
+                // Find the leading 1 bit in mantissa
+                let mut m = mant;
+                let mut e = 0u32;
+                while (m & 0x400) == 0 {
+                    m <<= 1;
+                    e += 1;
+                }
+                m &= 0x3FF; // Remove the implicit leading 1
+                let new_exp = 127 - 15 - e; // Rebias: f16 bias=15, f32 bias=127
+                (sign << 31) | (new_exp << 23) | (m << 13)
+            }
+        } else if exp == 31 {
+            // Infinity or NaN
+            if mant == 0 {
+                // Infinity
+                (sign << 31) | (0xFF << 23)
+            } else {
+                // NaN - preserve some payload bits, ensure quiet NaN
+                (sign << 31) | (0xFF << 23) | (mant << 13) | 0x0040_0000
+            }
+        } else {
+            // Normal number
+            // Rebias: f16 uses bias 15, f32 uses bias 127
+            // new_exp = exp - 15 + 127 = exp + 112
+            let new_exp = exp + 112;
+            (sign << 31) | (new_exp << 23) | (mant << 13)
+        };
+
+        f32::from_bits(f32_bits)
+    }
+
+    /// Creates an f16 from an f32.
+    #[inline]
+    pub fn from_f32(f: f32) -> Self {
+        let bits = f.to_bits();
+        let sign = ((bits >> 31) & 1) as u16;
+        let exp = ((bits >> 23) & 0xFF) as i32;
+        let mant = bits & 0x007F_FFFF;
+
+        let h_bits = if exp == 0 {
+            // Zero or f32 denormal -> f16 zero (too small)
+            sign << 15
+        } else if exp == 255 {
+            // Infinity or NaN
+            if mant == 0 {
+                (sign << 15) | (0x1F << 10) // Infinity
+            } else {
+                (sign << 15) | (0x1F << 10) | 0x0200 // Quiet NaN
+            }
+        } else {
+            let unbiased = exp - 127;
+
+            if unbiased < -24 {
+                // Too small, underflow to zero
+                sign << 15
+            } else if unbiased < -14 {
+                // Denormal f16
+                let shift = (-14 - unbiased) as u32;
+                let m = ((mant | 0x0080_0000) >> (shift + 14)) as u16;
+                (sign << 15) | m
+            } else if unbiased > 15 {
+                // Overflow to infinity
+                (sign << 15) | (0x1F << 10)
+            } else {
+                // Normal f16
+                let h_exp = (unbiased + 15) as u16;
+                let h_mant = (mant >> 13) as u16;
+
+                // Round to nearest, ties to even
+                let round_bit = (mant >> 12) & 1;
+                let sticky = mant & 0x0FFF;
+                let h_mant = if round_bit == 1 && (sticky != 0 || (h_mant & 1) == 1) {
+                    h_mant + 1
+                } else {
+                    h_mant
+                };
+
+                // Handle mantissa overflow from rounding
+                if h_mant > 0x3FF {
+                    if h_exp >= 30 {
+                        // Overflow to infinity
+                        (sign << 15) | (0x1F << 10)
+                    } else {
+                        (sign << 15) | ((h_exp + 1) << 10)
+                    }
+                } else {
+                    (sign << 15) | (h_exp << 10) | h_mant
+                }
+            }
+        };
+
+        Self(h_bits)
+    }
+
+    /// Creates an f16 from an f64.
+    #[inline]
+    pub fn from_f64(f: f64) -> Self {
+        // Convert via f32 - sufficient precision for f16
+        Self::from_f32(f as f32)
+    }
+
+    /// Converts to f64.
+    #[inline]
+    pub fn to_f64(self) -> f64 {
+        self.to_f32() as f64
+    }
+
+    /// Returns true if this is neither infinite nor NaN.
+    #[inline]
+    pub fn is_finite(self) -> bool {
+        // Exponent of 31 means infinity or NaN
+        ((self.0 >> 10) & 0x1F) != 31
+    }
+
+    /// Returns the bytes in little-endian order.
+    #[inline]
+    pub const fn to_le_bytes(self) -> [u8; 2] {
+        self.0.to_le_bytes()
+    }
+
+    /// Returns the bytes in big-endian order.
+    #[inline]
+    pub const fn to_be_bytes(self) -> [u8; 2] {
+        self.0.to_be_bytes()
+    }
+}
+
+impl From<f16> for f32 {
+    #[inline]
+    fn from(f: f16) -> f32 {
+        f.to_f32()
+    }
+}
+
+impl From<f16> for f64 {
+    #[inline]
+    fn from(f: f16) -> f64 {
+        f.to_f64()
+    }
+}
+
+impl core::fmt::Debug for f16 {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "{}", self.to_f32())
+    }
+}
+
+impl core::fmt::Display for f16 {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "{}", self.to_f32())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_zero() {
+        let z = f16::ZERO;
+        assert_eq!(z.to_bits(), 0);
+        assert_eq!(z.to_f32(), 0.0);
+        assert!(z.is_finite());
+    }
+
+    #[test]
+    fn test_one() {
+        // 1.0 in f16: sign=0, exp=15 (biased), mant=0 -> 0x3C00
+        let one = f16::from_bits(0x3C00);
+        assert!((one.to_f32() - 1.0).abs() < 1e-6);
+        assert!(one.is_finite());
+    }
+
+    #[test]
+    fn test_negative_one() {
+        // -1.0 in f16: sign=1, exp=15, mant=0 -> 0xBC00
+        let neg_one = f16::from_bits(0xBC00);
+        assert!((neg_one.to_f32() - (-1.0)).abs() < 1e-6);
+    }
+
+    #[test]
+    fn test_infinity() {
+        // +Inf: sign=0, exp=31, mant=0 -> 0x7C00
+        let inf = f16::from_bits(0x7C00);
+        assert!(inf.to_f32().is_infinite());
+        assert!(!inf.is_finite());
+
+        // -Inf: 0xFC00
+        let neg_inf = f16::from_bits(0xFC00);
+        assert!(neg_inf.to_f32().is_infinite());
+        assert!(!neg_inf.is_finite());
+    }
+
+    #[test]
+    fn test_nan() {
+        // NaN: exp=31, mant!=0 -> 0x7C01 (or any mant != 0)
+        let nan = f16::from_bits(0x7C01);
+        assert!(nan.to_f32().is_nan());
+        assert!(!nan.is_finite());
+    }
+
+    #[test]
+    fn test_denormal() {
+        // Smallest positive denormal: 0x0001
+        let tiny = f16::from_bits(0x0001);
+        let val = tiny.to_f32();
+        assert!(val > 0.0);
+        assert!(val < 1e-6);
+        assert!(tiny.is_finite());
+    }
+
+    #[test]
+    fn test_roundtrip_normal() {
+        let test_values: [f32; 8] = [0.5, 1.0, 2.0, 100.0, 0.001, -0.5, -1.0, -100.0];
+        for &v in &test_values {
+            let h = f16::from_f32(v);
+            let back = h.to_f32();
+            // f16 has limited precision, allow ~0.1% error for normal values
+            let rel_err = ((v - back) / v).abs();
+            assert!(
+                rel_err < 0.002,
+                "Roundtrip failed for {}: got {}, rel_err {}",
+                v,
+                back,
+                rel_err
+            );
+        }
+    }
+
+    #[test]
+    fn test_roundtrip_special() {
+        // Zero
+        assert_eq!(f16::from_f32(0.0).to_f32(), 0.0);
+
+        // Infinity
+        assert!(f16::from_f32(f32::INFINITY).to_f32().is_infinite());
+        assert!(f16::from_f32(f32::NEG_INFINITY).to_f32().is_infinite());
+
+        // NaN
+        assert!(f16::from_f32(f32::NAN).to_f32().is_nan());
+    }
+
+    #[test]
+    fn test_overflow_to_infinity() {
+        // f16 max is ~65504, values above should overflow to infinity
+        let big = f16::from_f32(100000.0);
+        assert!(big.to_f32().is_infinite());
+    }
+
+    #[test]
+    fn test_underflow_to_zero() {
+        // Very small values should underflow to zero
+        let tiny = f16::from_f32(1e-10);
+        assert_eq!(tiny.to_f32(), 0.0);
+    }
+
+    #[test]
+    fn test_bytes() {
+        let h = f16::from_bits(0x1234);
+        assert_eq!(h.to_le_bytes(), [0x34, 0x12]);
+        assert_eq!(h.to_be_bytes(), [0x12, 0x34]);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/linalg.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/linalg.rs
new file mode 100644
index 00000000..534a1e98
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/linalg.rs
@@ -0,0 +1,141 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use crate::error::Error;
+
+pub type Matrix3x3<T> = [[T; 3]; 3];
+pub type Vector3<T> = [T; 3];
+
+#[allow(dead_code)] // Matrix-vector multiply for color transform pipeline
+pub fn matmul3_vec(m: [f32; 9], v: [f32; 3]) -> [f32; 3] {
+    [
+        v[0] * m[0] + v[1] * m[1] + v[2] * m[2],
+        v[0] * m[3] + v[1] * m[4] + v[2] * m[5],
+        v[0] * m[6] + v[1] * m[7] + v[2] * m[8],
+    ]
+}
+
+pub fn mul_3x3_vector(matrix: &Matrix3x3<f64>, vector: &Vector3<f64>) -> Vector3<f64> {
+    std::array::from_fn(|i| {
+        matrix[i]
+            .iter()
+            .zip(vector.iter())
+            .map(|(&matrix_element, &vector_element)| matrix_element * vector_element)
+            .sum()
+    })
+}
+
+pub fn mul_3x3_matrix(mat1: &Matrix3x3<f64>, mat2: &Matrix3x3<f64>) -> Matrix3x3<f64> {
+    std::array::from_fn(|i| std::array::from_fn(|j| (0..3).map(|k| mat1[i][k] * mat2[k][j]).sum()))
+}
+
+fn det2x2(a: f64, b: f64, c: f64, d: f64) -> f64 {
+    a * d - b * c
+}
+
+fn calculate_cofactor(m: &Matrix3x3<f64>, r: usize, c: usize) -> f64 {
+    // Determine the actual row and column indices for the 2x2 submatrix
+    // by excluding the current row 'r' and column 'c'.
+    // Ensure they are taken in ascending order to form the submatrix consistently.
+    let mut sub_rows = [0; 2];
+    let mut sub_cols = [0; 2];
+
+    let mut current_idx = 0;
+    for i in 0..3 {
+        if i != r {
+            sub_rows[current_idx] = i;
+            current_idx += 1;
+        }
+    }
+
+    current_idx = 0;
+    for i in 0..3 {
+        if i != c {
+            sub_cols[current_idx] = i;
+            current_idx += 1;
+        }
+    }
+
+    let minor_val = det2x2(
+        m[sub_rows[0]][sub_cols[0]],
+        m[sub_rows[0]][sub_cols[1]],
+        m[sub_rows[1]][sub_cols[0]],
+        m[sub_rows[1]][sub_cols[1]],
+    );
+
+    // Apply the checkerboard pattern sign for the cofactor
+    if (r + c).is_multiple_of(2) {
+        minor_val
+    } else {
+        -minor_val
+    }
+}
+
+/// Calculates the inverse of a 3x3 matrix.
+pub fn inv_3x3_matrix(m: &Matrix3x3<f64>) -> Result<Matrix3x3<f64>, Error> {
+    let cofactor_matrix: [[f64; 3]; 3] = std::array::from_fn(|r_idx| {
+        std::array::from_fn(|c_idx| calculate_cofactor(m, r_idx, c_idx))
+    });
+
+    let det = m[0]
+        .iter()
+        .zip(cofactor_matrix[0].iter())
+        .map(|(&m_element, &cof_element)| m_element * cof_element)
+        .sum::<f64>();
+
+    // Check for numerical singularity.
+    const EPSILON: f64 = 1e-12;
+    if det.abs() < EPSILON {
+        return Err(Error::MatrixInversionFailed(det.abs()));
+    }
+
+    let inv_det = 1.0 / det;
+
+    let adjugate_matrix: [[f64; 3]; 3] =
+        std::array::from_fn(|r_idx| std::array::from_fn(|c_idx| cofactor_matrix[c_idx][r_idx]));
+
+    // Inverse matrix = (1/det) * Adjugate matrix.
+    Ok(std::array::from_fn(|r_idx| {
+        std::array::from_fn(|c_idx| adjugate_matrix[r_idx][c_idx] * inv_det)
+    }))
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    fn assert_matrix_eq(a: &Matrix3x3<f64>, b: &Matrix3x3<f64>, epsilon: f64) {
+        for r in 0..3 {
+            for c in 0..3 {
+                assert!(
+                    (a[r][c] - b[r][c]).abs() < epsilon,
+                    "Matrices differ at [{}][{}]: expected {}, got {}. Diff: {}",
+                    r,
+                    c,
+                    b[r][c],
+                    a[r][c],
+                    (a[r][c] - b[r][c]).abs()
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_3x3_inverse() {
+        // Random matrix (https://xkcd.com/221/)
+        let m: Matrix3x3<f64> = [[1.0f64, -3.0, -2.0], [2.0, 2.0, 1.0], [2.0, 1.0, 1.0]];
+
+        let expected_inv: Matrix3x3<f64> = [[0.2, 0.2, 0.2], [0., 1., -1.], [-0.4, -1.4, 1.6]];
+
+        match inv_3x3_matrix(&m) {
+            Ok(inv_m) => {
+                assert_matrix_eq(&inv_m, &expected_inv, 1e-12);
+            }
+            Err(e) => {
+                panic!("Matrix inversion failed unexpectedly: {e:?}");
+            }
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/log2.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/log2.rs
new file mode 100644
index 00000000..6f8ba323
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/log2.rs
@@ -0,0 +1,85 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+pub trait FloorLog2 {
+    fn floor_log2(&self) -> Self;
+}
+
+pub trait CeilLog2 {
+    fn ceil_log2(&self) -> Self;
+}
+
+impl FloorLog2 for u32 {
+    fn floor_log2(&self) -> Self {
+        debug_assert_ne!(*self, 0);
+        0u32.leading_zeros() - self.leading_zeros() - 1
+    }
+}
+
+impl FloorLog2 for u64 {
+    fn floor_log2(&self) -> Self {
+        debug_assert_ne!(*self, 0);
+        (0u64.leading_zeros() - self.leading_zeros() - 1) as u64
+    }
+}
+
+impl FloorLog2 for usize {
+    fn floor_log2(&self) -> Self {
+        debug_assert_ne!(*self, 0);
+        (0usize.leading_zeros() - self.leading_zeros() - 1) as usize
+    }
+}
+
+impl<T> CeilLog2 for T
+where
+    T: FloorLog2,
+    T: std::ops::Add<Output = Self>,
+    T: std::ops::Sub<Output = Self>,
+    T: std::ops::BitAnd<Output = Self>,
+    T: std::cmp::PartialEq,
+    T: From<u8>,
+    T: Copy,
+{
+    fn ceil_log2(&self) -> Self {
+        if (*self & (*self - 1.into())) != 0.into() {
+            self.floor_log2() + 1.into()
+        } else {
+            self.floor_log2()
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    #[test]
+    fn test_floor() {
+        assert_eq!(0, 1u32.floor_log2());
+        assert_eq!(1, 2u32.floor_log2());
+        assert_eq!(1, 3u32.floor_log2());
+        assert_eq!(2, 4u32.floor_log2());
+    }
+    #[test]
+    fn test_ceil() {
+        assert_eq!(0, 1u32.ceil_log2());
+        assert_eq!(1, 2u32.ceil_log2());
+        assert_eq!(2, 3u32.ceil_log2());
+        assert_eq!(2, 4u32.ceil_log2());
+    }
+    #[test]
+    fn test_floor_us() {
+        assert_eq!(0, 1usize.floor_log2());
+        assert_eq!(1, 2usize.floor_log2());
+        assert_eq!(1, 3usize.floor_log2());
+        assert_eq!(2, 4usize.floor_log2());
+    }
+    #[test]
+    fn test_ceil_us() {
+        assert_eq!(0, 1usize.ceil_log2());
+        assert_eq!(1, 2usize.ceil_log2());
+        assert_eq!(2, 3usize.ceil_log2());
+        assert_eq!(2, 4usize.ceil_log2());
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/memory_tracker.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/memory_tracker.rs
new file mode 100644
index 00000000..43a2e383
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/memory_tracker.rs
@@ -0,0 +1,253 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Memory tracking for decoder resource limits.
+//!
+//! Provides a thread-safe memory tracker that can be used to enforce
+//! `max_memory_bytes` limits during decoding.
+
+use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
+
+use crate::error::{Error, Result};
+
+/// A thread-safe memory tracker for enforcing memory limits.
+///
+/// Clone is cheap (Arc-based) and all clones share the same counter.
+#[derive(Debug, Clone, Default)]
+pub struct MemoryTracker {
+    inner: Option<Arc<MemoryTrackerInner>>,
+}
+
+#[derive(Debug)]
+struct MemoryTrackerInner {
+    allocated: AtomicU64,
+    limit: u64,
+}
+
+impl MemoryTracker {
+    /// Creates a new memory tracker with no limit (unlimited).
+    pub fn unlimited() -> Self {
+        Self { inner: None }
+    }
+
+    /// Creates a new memory tracker with the specified byte limit.
+    pub fn with_limit(limit: u64) -> Self {
+        Self {
+            inner: Some(Arc::new(MemoryTrackerInner {
+                allocated: AtomicU64::new(0),
+                limit,
+            })),
+        }
+    }
+
+    /// Creates a memory tracker from an optional limit.
+    pub fn from_limit(limit: Option<u64>) -> Self {
+        match limit {
+            Some(limit) => Self::with_limit(limit),
+            None => Self::unlimited(),
+        }
+    }
+
+    /// Returns true if this tracker has a limit configured.
+    pub fn has_limit(&self) -> bool {
+        self.inner.is_some()
+    }
+
+    /// Returns the current allocated bytes.
+    pub fn allocated(&self) -> u64 {
+        self.inner
+            .as_ref()
+            .map(|i| i.allocated.load(Ordering::Relaxed))
+            .unwrap_or(0)
+    }
+
+    /// Returns the limit, or None if unlimited.
+    pub fn limit(&self) -> Option<u64> {
+        self.inner.as_ref().map(|i| i.limit)
+    }
+
+    /// Attempts to allocate `bytes` from the budget.
+    /// Returns Ok(()) if successful, or Error::LimitExceeded if over budget.
+    pub fn try_allocate(&self, bytes: u64) -> Result<()> {
+        let Some(inner) = &self.inner else {
+            return Ok(());
+        };
+
+        // Use fetch_add and check after - this is slightly optimistic but avoids
+        // the complexity of a CAS loop. In the worst case we slightly exceed the
+        // limit temporarily.
+        let prev = inner.allocated.fetch_add(bytes, Ordering::Relaxed);
+        let new_total = prev.saturating_add(bytes);
+
+        if new_total > inner.limit {
+            // Rollback the allocation
+            inner.allocated.fetch_sub(bytes, Ordering::Relaxed);
+            return Err(Error::LimitExceeded {
+                resource: "memory_bytes",
+                actual: new_total,
+                limit: inner.limit,
+            });
+        }
+
+        Ok(())
+    }
+
+    /// Releases `bytes` back to the budget.
+    /// Call this when deallocating tracked memory.
+    pub fn release(&self, bytes: u64) {
+        if let Some(inner) = &self.inner {
+            inner.allocated.fetch_sub(bytes, Ordering::Relaxed);
+        }
+    }
+
+    /// Checks if allocating `bytes` would exceed the limit without actually allocating.
+    pub fn would_exceed(&self, bytes: u64) -> bool {
+        let Some(inner) = &self.inner else {
+            return false;
+        };
+        let current = inner.allocated.load(Ordering::Relaxed);
+        current.saturating_add(bytes) > inner.limit
+    }
+
+    /// Checks if allocating `bytes` would exceed the budget.
+    /// Unlike `try_allocate`, this does NOT reserve the bytes.
+    /// Use for Vec/temporary allocations where RAII release tracking is impractical.
+    pub fn check_alloc(&self, bytes: u64) -> Result<()> {
+        if self.would_exceed(bytes) {
+            let Some(inner) = &self.inner else {
+                return Ok(());
+            };
+            return Err(Error::LimitExceeded {
+                resource: "memory_bytes",
+                actual: inner
+                    .allocated
+                    .load(Ordering::Relaxed)
+                    .saturating_add(bytes),
+                limit: inner.limit,
+            });
+        }
+        Ok(())
+    }
+}
+
+/// A guard that automatically releases memory when dropped.
+/// Use this to ensure memory is released even if an error occurs.
+#[derive(Debug)]
+pub struct MemoryGuard {
+    tracker: MemoryTracker,
+    bytes: u64,
+}
+
+impl MemoryGuard {
+    /// Creates a new memory guard that will release `bytes` on drop.
+    pub fn new(tracker: MemoryTracker, bytes: u64) -> Self {
+        Self { tracker, bytes }
+    }
+
+    /// Disarms the guard so it will NOT release memory on drop.
+    /// Use when transferring ownership of the allocation to another structure
+    /// (e.g., `OwnedRawImage`'s `Drop`).
+    ///
+    /// Unlike `std::mem::forget`, this properly drops the internal `MemoryTracker`
+    /// clone, avoiding a 32-byte `Arc` leak per call.
+    pub fn disarm(mut self) {
+        self.bytes = 0;
+        // self drops normally here — tracker Arc refcount decrements,
+        // but release(0) is a no-op on the budget.
+    }
+
+    /// Consumes the guard without releasing memory.
+    ///
+    /// **Deprecated**: use [`disarm`](Self::disarm) instead. `forget` leaks the
+    /// internal `Arc` allocation (32 bytes per call) because `std::mem::forget`
+    /// prevents the destructor from running.
+    #[deprecated(note = "use disarm() instead — forget() leaks the internal Arc")]
+    #[allow(dead_code)]
+    pub fn forget(self) {
+        std::mem::forget(self);
+    }
+}
+
+impl Drop for MemoryGuard {
+    fn drop(&mut self) {
+        self.tracker.release(self.bytes);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_unlimited() {
+        let tracker = MemoryTracker::unlimited();
+        assert!(!tracker.has_limit());
+        assert!(tracker.try_allocate(u64::MAX).is_ok());
+    }
+
+    #[test]
+    fn test_with_limit() {
+        let tracker = MemoryTracker::with_limit(1000);
+        assert!(tracker.has_limit());
+        assert_eq!(tracker.limit(), Some(1000));
+
+        // Should succeed
+        assert!(tracker.try_allocate(500).is_ok());
+        assert_eq!(tracker.allocated(), 500);
+
+        // Should succeed (exactly at limit)
+        assert!(tracker.try_allocate(500).is_ok());
+        assert_eq!(tracker.allocated(), 1000);
+
+        // Should fail (over limit)
+        assert!(tracker.try_allocate(1).is_err());
+        assert_eq!(tracker.allocated(), 1000); // Unchanged after failed alloc
+
+        // Release some memory
+        tracker.release(500);
+        assert_eq!(tracker.allocated(), 500);
+
+        // Should succeed now
+        assert!(tracker.try_allocate(100).is_ok());
+        assert_eq!(tracker.allocated(), 600);
+    }
+
+    #[test]
+    fn test_clone_shares_state() {
+        let tracker1 = MemoryTracker::with_limit(1000);
+        let tracker2 = tracker1.clone();
+
+        tracker1.try_allocate(500).unwrap();
+        assert_eq!(tracker2.allocated(), 500);
+
+        tracker2.try_allocate(300).unwrap();
+        assert_eq!(tracker1.allocated(), 800);
+    }
+
+    #[test]
+    fn test_memory_guard() {
+        let tracker = MemoryTracker::with_limit(1000);
+        tracker.try_allocate(500).unwrap();
+
+        {
+            let _guard = MemoryGuard::new(tracker.clone(), 500);
+            // Memory is tracked
+        }
+        // Guard dropped, memory released
+        assert_eq!(tracker.allocated(), 0);
+    }
+
+    #[test]
+    fn test_memory_guard_disarm() {
+        let tracker = MemoryTracker::with_limit(1000);
+        tracker.try_allocate(500).unwrap();
+
+        let guard = MemoryGuard::new(tracker.clone(), 500);
+        guard.disarm();
+        // Memory NOT released (disarm zeroed the guard's bytes)
+        assert_eq!(tracker.allocated(), 500);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/mirror.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/mirror.rs
new file mode 100644
index 00000000..4d7e6c2f
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/mirror.rs
@@ -0,0 +1,18 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/// Mirror-reflects a value v to fit in a [0; s) range.
+pub fn mirror(mut v: isize, s: usize) -> usize {
+    // TODO(veluca): consider speeding this up if needed.
+    loop {
+        if v < 0 {
+            v = -v - 1;
+        } else if v >= s as isize {
+            v = s as isize * 2 - v - 1;
+        } else {
+            return v as usize;
+        }
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/mod.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/mod.rs
new file mode 100644
index 00000000..6c4bd3c6
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/mod.rs
@@ -0,0 +1,46 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#[cfg(test)]
+pub mod test;
+
+// Re-export AtomicRefCell from the atomic_refcell crate (replaces custom implementation)
+mod bits;
+mod cacheline;
+mod clock;
+mod concat_slice;
+mod fast_math;
+mod float16;
+mod linalg;
+mod log2;
+mod memory_tracker;
+mod mirror;
+pub mod ndarray;
+pub mod profiling;
+mod rational_poly;
+mod shift_right_ceil;
+// Re-export SmallVec from the smallvec crate (replaces custom implementation)
+pub mod tracing_wrappers;
+mod vec_helpers;
+mod xorshift128plus;
+
+pub use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
+pub use bits::*;
+pub use cacheline::*;
+pub use clock::Instant;
+pub use fast_math::*;
+pub use float16::f16;
+pub use linalg::*;
+pub use log2::*;
+pub use memory_tracker::*;
+pub use mirror::*;
+pub(crate) use ndarray::*;
+#[allow(unused_imports)]
+pub use profiling::*;
+pub use rational_poly::*;
+pub use shift_right_ceil::*;
+pub use smallvec::SmallVec;
+pub use vec_helpers::*;
+pub use xorshift128plus::*;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/ndarray.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/ndarray.rs
new file mode 100644
index 00000000..5b2e8363
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/ndarray.rs
@@ -0,0 +1,24 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+macro_rules! slice {
+    (&$data:expr, $range:expr) => {
+        $data[$range]
+    };
+    (&mut $data:expr, $range:expr) => {
+        $data[$range]
+    };
+    (&mut $data:expr, $range:expr $(, $rest_ranges:expr)+) => {
+        $data[$range].iter_mut().map(|inner_data| {
+            &mut slice!(&inner_data, $($rest_ranges),+)
+        }).collect::<Vec<_>>()
+    };
+    (&$data:expr, $range:expr $(, $rest_ranges:expr)+) => {
+        $data[$range].iter().map(|inner_data| {
+            &slice!(&inner_data, $($rest_ranges),+)
+        }).collect::<Vec<_>>()
+    };
+}
+pub(crate) use slice;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/profiling.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/profiling.rs
new file mode 100644
index 00000000..1cfc1660
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/profiling.rs
@@ -0,0 +1,249 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Simple profiling infrastructure for hot path timing.
+//!
+//! Enable with the `profiling` feature. When enabled, tracks cumulative time
+//! spent in instrumented functions and prints a report when `print_profile_report()`
+//! is called.
+
+#[cfg(feature = "profiling")]
+mod inner {
+    use std::sync::atomic::{AtomicU64, Ordering};
+    use std::time::Instant;
+
+    /// Profiling counters for different hot paths.
+    /// Each counter tracks cumulative nanoseconds.
+    pub struct ProfileCounters {
+        pub dequant_transform_ns: AtomicU64,
+        pub dequant_transform_calls: AtomicU64,
+        pub dct_ns: AtomicU64,
+        pub dct_calls: AtomicU64,
+        pub entropy_decode_ns: AtomicU64,
+        pub entropy_decode_calls: AtomicU64,
+        pub chroma_upsample_ns: AtomicU64,
+        pub chroma_upsample_calls: AtomicU64,
+        pub render_pipeline_ns: AtomicU64,
+        pub render_pipeline_calls: AtomicU64,
+        pub modular_decode_ns: AtomicU64,
+        pub modular_decode_calls: AtomicU64,
+    }
+
+    impl ProfileCounters {
+        pub const fn new() -> Self {
+            Self {
+                dequant_transform_ns: AtomicU64::new(0),
+                dequant_transform_calls: AtomicU64::new(0),
+                dct_ns: AtomicU64::new(0),
+                dct_calls: AtomicU64::new(0),
+                entropy_decode_ns: AtomicU64::new(0),
+                entropy_decode_calls: AtomicU64::new(0),
+                chroma_upsample_ns: AtomicU64::new(0),
+                chroma_upsample_calls: AtomicU64::new(0),
+                render_pipeline_ns: AtomicU64::new(0),
+                render_pipeline_calls: AtomicU64::new(0),
+                modular_decode_ns: AtomicU64::new(0),
+                modular_decode_calls: AtomicU64::new(0),
+            }
+        }
+
+        #[allow(dead_code)] // Available for manual profiling reset
+        pub fn reset(&self) {
+            self.dequant_transform_ns.store(0, Ordering::Relaxed);
+            self.dequant_transform_calls.store(0, Ordering::Relaxed);
+            self.dct_ns.store(0, Ordering::Relaxed);
+            self.dct_calls.store(0, Ordering::Relaxed);
+            self.entropy_decode_ns.store(0, Ordering::Relaxed);
+            self.entropy_decode_calls.store(0, Ordering::Relaxed);
+            self.chroma_upsample_ns.store(0, Ordering::Relaxed);
+            self.chroma_upsample_calls.store(0, Ordering::Relaxed);
+            self.render_pipeline_ns.store(0, Ordering::Relaxed);
+            self.render_pipeline_calls.store(0, Ordering::Relaxed);
+            self.modular_decode_ns.store(0, Ordering::Relaxed);
+            self.modular_decode_calls.store(0, Ordering::Relaxed);
+        }
+    }
+
+    pub static COUNTERS: ProfileCounters = ProfileCounters::new();
+
+    /// RAII guard that measures elapsed time and adds it to a counter.
+    pub struct ProfileGuard {
+        start: Instant,
+        ns_counter: &'static AtomicU64,
+        call_counter: &'static AtomicU64,
+    }
+
+    impl ProfileGuard {
+        #[inline]
+        pub fn new(ns_counter: &'static AtomicU64, call_counter: &'static AtomicU64) -> Self {
+            Self {
+                start: Instant::now(),
+                ns_counter,
+                call_counter,
+            }
+        }
+    }
+
+    impl Drop for ProfileGuard {
+        #[inline]
+        fn drop(&mut self) {
+            let elapsed = self.start.elapsed().as_nanos() as u64;
+            // Use separate load/store instead of fetch_add to avoid lock prefix.
+            // This generates plain `addq`/`incq` vs `lock addq`/`lock incq`.
+            // Racy but acceptable for profiling - we just want approximate counts.
+            let ns = self.ns_counter.load(Ordering::Relaxed);
+            self.ns_counter.store(ns + elapsed, Ordering::Relaxed);
+            let calls = self.call_counter.load(Ordering::Relaxed);
+            self.call_counter.store(calls + 1, Ordering::Relaxed);
+        }
+    }
+
+    /// Print a profile report to stderr.
+    pub fn print_profile_report() {
+        let c = &COUNTERS;
+
+        eprintln!("\n=== JXL-RS Profile Report ===\n");
+
+        let entries = [
+            (
+                "dequant_transform",
+                c.dequant_transform_ns.load(Ordering::Relaxed),
+                c.dequant_transform_calls.load(Ordering::Relaxed),
+            ),
+            (
+                "dct/idct",
+                c.dct_ns.load(Ordering::Relaxed),
+                c.dct_calls.load(Ordering::Relaxed),
+            ),
+            (
+                "entropy_decode",
+                c.entropy_decode_ns.load(Ordering::Relaxed),
+                c.entropy_decode_calls.load(Ordering::Relaxed),
+            ),
+            (
+                "chroma_upsample",
+                c.chroma_upsample_ns.load(Ordering::Relaxed),
+                c.chroma_upsample_calls.load(Ordering::Relaxed),
+            ),
+            (
+                "render_pipeline",
+                c.render_pipeline_ns.load(Ordering::Relaxed),
+                c.render_pipeline_calls.load(Ordering::Relaxed),
+            ),
+            (
+                "modular_decode",
+                c.modular_decode_ns.load(Ordering::Relaxed),
+                c.modular_decode_calls.load(Ordering::Relaxed),
+            ),
+        ];
+
+        let total_ns: u64 = entries.iter().map(|(_, ns, _)| ns).sum();
+
+        eprintln!(
+            "{:<20} {:>12} {:>12} {:>10} {:>8}",
+            "Function", "Time (ms)", "Calls", "Avg (µs)", "% Total"
+        );
+        eprintln!("{:-<66}", "");
+
+        for (name, ns, calls) in entries {
+            if calls > 0 {
+                let ms = ns as f64 / 1_000_000.0;
+                let avg_us = (ns as f64 / calls as f64) / 1_000.0;
+                let pct = if total_ns > 0 {
+                    (ns as f64 / total_ns as f64) * 100.0
+                } else {
+                    0.0
+                };
+                eprintln!(
+                    "{:<20} {:>12.2} {:>12} {:>10.2} {:>7.1}%",
+                    name, ms, calls, avg_us, pct
+                );
+            }
+        }
+
+        eprintln!("{:-<66}", "");
+        eprintln!("{:<20} {:>12.2}", "TOTAL", total_ns as f64 / 1_000_000.0);
+        eprintln!();
+    }
+
+    /// Reset all counters.
+    #[allow(dead_code)] // Available for manual profiling reset
+    pub fn reset_profile_counters() {
+        COUNTERS.reset();
+    }
+}
+
+#[cfg(not(feature = "profiling"))]
+#[allow(dead_code)]
+mod inner {
+    /// No-op guard when profiling is disabled.
+    #[derive(Default)]
+    pub struct ProfileGuard;
+
+    impl ProfileGuard {
+        #[inline(always)]
+        pub fn new() -> Self {
+            Self
+        }
+    }
+
+    #[inline(always)]
+    pub fn print_profile_report() {}
+
+    #[inline(always)]
+    pub fn reset_profile_counters() {}
+}
+
+#[allow(unused_imports)]
+pub use inner::*;
+
+/// Macro to create a profile guard for a specific counter.
+/// When profiling is disabled, this is a no-op.
+#[cfg(feature = "profiling")]
+#[macro_export]
+macro_rules! profile {
+    (dequant_transform) => {
+        let _guard = $crate::util::ProfileGuard::new(
+            &$crate::util::COUNTERS.dequant_transform_ns,
+            &$crate::util::COUNTERS.dequant_transform_calls,
+        );
+    };
+    (dct) => {
+        let _guard = $crate::util::ProfileGuard::new(
+            &$crate::util::COUNTERS.dct_ns,
+            &$crate::util::COUNTERS.dct_calls,
+        );
+    };
+    (entropy_decode) => {
+        let _guard = $crate::util::ProfileGuard::new(
+            &$crate::util::COUNTERS.entropy_decode_ns,
+            &$crate::util::COUNTERS.entropy_decode_calls,
+        );
+    };
+    (chroma_upsample) => {
+        let _guard = $crate::util::ProfileGuard::new(
+            &$crate::util::COUNTERS.chroma_upsample_ns,
+            &$crate::util::COUNTERS.chroma_upsample_calls,
+        );
+    };
+    (render_pipeline) => {
+        let _guard = $crate::util::ProfileGuard::new(
+            &$crate::util::COUNTERS.render_pipeline_ns,
+            &$crate::util::COUNTERS.render_pipeline_calls,
+        );
+    };
+    (modular_decode) => {
+        let _guard = $crate::util::ProfileGuard::new(
+            &$crate::util::COUNTERS.modular_decode_ns,
+            &$crate::util::COUNTERS.modular_decode_calls,
+        );
+    };
+}
+
+#[cfg(not(feature = "profiling"))]
+#[macro_export]
+macro_rules! profile {
+    ($name:ident) => {};
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/rational_poly.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/rational_poly.rs
new file mode 100644
index 00000000..12f97fb5
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/rational_poly.rs
@@ -0,0 +1,35 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use jxl_simd::{F32SimdVec, SimdDescriptor};
+
+/// Computes `(p0 + p1 x + p2 x^2 + ...) / (q0 + q1 x + q2 x^2 + ...)`.
+///
+/// # Panics
+/// Panics if either `P` or `Q` is zero.
+#[inline]
+pub fn eval_rational_poly<const P: usize, const Q: usize>(x: f32, p: [f32; P], q: [f32; Q]) -> f32 {
+    let yp = p.into_iter().rev().reduce(|yp, p| yp * x + p).unwrap();
+    let yq = q.into_iter().rev().reduce(|yq, q| yq * x + q).unwrap();
+    yp / yq
+}
+
+#[inline(always)]
+pub fn eval_rational_poly_simd<D: SimdDescriptor, const P: usize, const Q: usize>(
+    d: D,
+    x: D::F32Vec,
+    p: [f32; P],
+    q: [f32; Q],
+) -> D::F32Vec {
+    let mut yp = D::F32Vec::splat(d, p[P - 1]);
+    for i in (0..P - 1).rev() {
+        yp = yp.mul_add(x, D::F32Vec::splat(d, p[i]));
+    }
+    let mut yq = D::F32Vec::splat(d, q[Q - 1]);
+    for i in (0..Q - 1).rev() {
+        yq = yq.mul_add(x, D::F32Vec::splat(d, q[i]));
+    }
+    yp / yq
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/shift_right_ceil.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/shift_right_ceil.rs
new file mode 100644
index 00000000..3d756b2b
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/shift_right_ceil.rs
@@ -0,0 +1,41 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::ops::{Add, Shl, Shr, Sub};
+
+pub trait ShiftRightCeil: Copy {
+    fn shrc<T: Copy>(self, rhs: T) -> Self
+    where
+        Self: Shr<T, Output = Self> + Shl<T, Output = Self>;
+}
+
+impl<S: Copy + Add<Self, Output = Self> + Sub<Self, Output = Self> + From<u8>> ShiftRightCeil
+    for S
+{
+    fn shrc<T: Copy>(self, rhs: T) -> Self
+    where
+        Self: Shr<T, Output = Self> + Shl<T, Output = Self>,
+    {
+        (self + (Self::from(1u8) << rhs) - Self::from(1u8)) >> rhs
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::util::ShiftRightCeil;
+
+    #[test]
+    fn test_shrc() {
+        assert_eq!(1u8, 1u8.shrc(1u8));
+        assert_eq!(1u8, 2u8.shrc(1u8));
+        assert_eq!(2u8, 9u8.shrc(3u8));
+        assert_eq!(1u32, 1u32.shrc(1u32));
+        assert_eq!(1u32, 2u32.shrc(1u32));
+        assert_eq!(2u32, 9u32.shrc(3u32));
+        assert_eq!(1u32, 1u32.shrc(1u8));
+        assert_eq!(1u32, 2u32.shrc(1u8));
+        assert_eq!(2u32, 9u32.shrc(3u8));
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/test.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/test.rs
new file mode 100644
index 00000000..04c49801
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/test.rs
@@ -0,0 +1,420 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+use std::{
+    fmt::Debug,
+    io::{BufRead, BufReader, Cursor, Read, Write},
+    num::{ParseFloatError, ParseIntError},
+};
+
+use crate::{
+    bit_reader::BitReader,
+    container::ContainerParser,
+    error::Error as JXLError,
+    headers::{
+        FileHeader, JxlHeader,
+        encodings::*,
+        frame_header::FrameHeader,
+        toc::{Toc, TocNonserialized},
+    },
+    image::{Image, ImageDataType},
+};
+
+use num_traits::AsPrimitive;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error("Invalid PFM: {0}")]
+    InvalidPFM(String),
+}
+
+impl From<ParseFloatError> for Error {
+    fn from(value: ParseFloatError) -> Self {
+        Error::InvalidPFM(value.to_string())
+    }
+}
+
+impl From<ParseIntError> for Error {
+    fn from(value: ParseIntError) -> Self {
+        Error::InvalidPFM(value.to_string())
+    }
+}
+
+impl From<std::io::Error> for Error {
+    fn from(value: std::io::Error) -> Self {
+        Error::InvalidPFM(value.to_string())
+    }
+}
+
+impl From<JXLError> for Error {
+    fn from(value: JXLError) -> Self {
+        Error::InvalidPFM(value.to_string())
+    }
+}
+
+fn rel_error_gt<T: AsPrimitive<f64>>(left: T, right: T, max_rel_error: T) -> bool {
+    let left_f64: f64 = left.as_();
+    let right_f64: f64 = right.as_();
+    let error = (left_f64 - right_f64).abs();
+    matches!(
+        (2.0 * error / (left_f64.abs() + right_f64.abs() + 1e-16))
+            .partial_cmp(&max_rel_error.as_()),
+        Some(std::cmp::Ordering::Greater) | None
+    )
+}
+
+fn abs_error_gt<T: AsPrimitive<f64>>(left: T, right: T, max_abs_error: T) -> bool {
+    let left_f64: f64 = left.as_();
+    let right_f64: f64 = right.as_();
+    matches!(
+        (left_f64 - right_f64)
+            .abs()
+            .partial_cmp(&max_abs_error.as_()),
+        Some(std::cmp::Ordering::Greater) | None
+    )
+}
+
+pub fn assert_almost_eq<T: AsPrimitive<f64> + Debug + Copy>(
+    left: T,
+    right: T,
+    max_abs_error: T,
+    max_rel_error: T,
+) {
+    if abs_error_gt(left, right, max_abs_error) || rel_error_gt(left, right, max_rel_error) {
+        panic!(
+            "assertion failed: `(left ≈ right)`\n  left: `{left:?}`,\n right: `{right:?}`,\n max_abs_error: `{max_abs_error:?}`,\n max_rel_error: `{max_rel_error:?}`"
+        );
+    }
+}
+
+#[allow(dead_code)] // used by integration tests
+pub fn assert_almost_rel_eq<T: AsPrimitive<f64> + Debug + Copy>(
+    left: T,
+    right: T,
+    max_rel_error: T,
+) {
+    if rel_error_gt(left, right, max_rel_error) {
+        panic!(
+            "assertion failed: `(left ≈ right)`\n  left: `{left:?}`,\n right: `{right:?}`,\n max_rel_error: `{max_rel_error:?}`"
+        );
+    }
+}
+
+pub fn assert_almost_abs_eq<T: AsPrimitive<f64> + Debug + Copy>(
+    left: T,
+    right: T,
+    max_abs_error: T,
+) {
+    if abs_error_gt(left, right, max_abs_error) {
+        panic!(
+            "assertion failed: `(left ≈ right)`\n  left: `{left:?}`,\n right: `{right:?}`,\n max_abs_error: `{max_abs_error:?}`"
+        );
+    }
+}
+
+#[allow(dead_code)] // used by integration tests
+pub fn assert_almost_abs_eq_coords<T: AsPrimitive<f64> + Debug + Copy>(
+    left: T,
+    right: T,
+    max_abs_error: T,
+    pos: (usize, usize),
+    c: usize,
+) {
+    if abs_error_gt(left, right, max_abs_error) {
+        panic!(
+            "assertion failed @{pos:?}, c {c}: `(left ≈ right)`\n  left: `{left:?}`,\n right: `{right:?}`,\n abs error: `{:?}`\n max_abs_error: `{max_abs_error:?}`",
+            (left.as_() - right.as_()).abs()
+        );
+    }
+}
+
+fn assert_same_len<T: AsPrimitive<f64> + Debug + Copy>(left: &[T], right: &[T]) {
+    if left.as_ref().len() != right.as_ref().len() {
+        panic!(
+            "assertion failed: `(left ≈ right)`\n left.len(): `{}`,\n right.len(): `{}`",
+            left.as_ref().len(),
+            right.as_ref().len()
+        );
+    }
+}
+
+#[allow(dead_code)] // used by integration tests
+pub fn assert_all_almost_eq<T: AsPrimitive<f64> + Debug + Copy, V: AsRef<[T]> + Debug>(
+    left: V,
+    right: V,
+    max_abs_error: T,
+    max_rel_error: T,
+) {
+    assert_same_len(left.as_ref(), right.as_ref());
+    for (idx, (left_val, right_val)) in left
+        .as_ref()
+        .iter()
+        .copied()
+        .zip(right.as_ref().iter().copied())
+        .enumerate()
+    {
+        if abs_error_gt(left_val, right_val, max_abs_error)
+            || rel_error_gt(left_val, right_val, max_rel_error)
+        {
+            panic!(
+                "assertion failed: `(left ≈ right)`\n left: `{left:?}`,\n right: `{right:?}`,\n max_abs_error: `{max_abs_error:?}`,\n max_rel_error: `{max_rel_error:?}`,\n left[{idx}]: `{left_val:?}`,\n right[{idx}]: `{right_val:?}`",
+            );
+        }
+    }
+}
+
+#[allow(dead_code)] // used by integration tests
+pub fn assert_all_almost_rel_eq<T: AsPrimitive<f64> + Debug + Copy, V: AsRef<[T]> + Debug>(
+    left: V,
+    right: V,
+    max_rel_error: T,
+) {
+    assert_same_len(left.as_ref(), right.as_ref());
+    for (idx, (left_val, right_val)) in left
+        .as_ref()
+        .iter()
+        .copied()
+        .zip(right.as_ref().iter().copied())
+        .enumerate()
+    {
+        if rel_error_gt(left_val, right_val, max_rel_error) {
+            panic!(
+                "assertion failed: `(left ≈ right)`\n left: `{left:?}`,\n right: `{right:?}`,\n max_rel_error: `{max_rel_error:?}`,\n left[{idx}]: `{left_val:?}`,\n right[{idx}]: `{right_val:?}`",
+            );
+        }
+    }
+}
+
+pub fn assert_all_almost_abs_eq<T: AsPrimitive<f64> + Debug + Copy, V: AsRef<[T]> + Debug>(
+    left: V,
+    right: V,
+    max_abs_error: T,
+) {
+    assert_same_len(left.as_ref(), right.as_ref());
+    for (idx, (left_val, right_val)) in left
+        .as_ref()
+        .iter()
+        .copied()
+        .zip(right.as_ref().iter().copied())
+        .enumerate()
+    {
+        if abs_error_gt(left_val, right_val, max_abs_error) {
+            panic!(
+                "assertion failed: `(left ≈ right)`\n left: `{left:?}`,\n right: `{right:?}`,\n max_abs_error: `{max_abs_error:?}`,\n left[{idx}]: `{left_val:?}`,\n right[{idx}]: `{right_val:?}`",
+            );
+        }
+    }
+}
+
+pub fn check_equal_images<T: ImageDataType>(a: &Image<T>, b: &Image<T>) {
+    assert_eq!(a.size(), b.size());
+    let mismatch_info = |x: usize, y: usize| -> String {
+        let msg = format!(
+            "mismatch at position {x}x{y}, values {:?} and {:?}",
+            a.row(y)[x],
+            b.row(y)[x]
+        );
+        msg
+    };
+    for y in 0..a.size().1 {
+        for x in 0..a.size().0 {
+            assert_eq!(a.row(y)[x], b.row(y)[x], "{}", mismatch_info(x, y));
+        }
+    }
+}
+
+/// Encode a u64 value as a LEB128 varint. Useful for building test data for
+/// frame index boxes and other container structures.
+pub fn encode_varint(mut value: u64) -> Vec<u8> {
+    let mut result = Vec::new();
+    loop {
+        let mut byte = (value & 0x7f) as u8;
+        value >>= 7;
+        if value > 0 {
+            byte |= 0x80;
+        }
+        result.push(byte);
+        if value == 0 {
+            break;
+        }
+    }
+    result
+}
+
+/// Build raw jxli frame index box content bytes from tnum, tden, and
+/// delta-coded entries `(OFF_delta, T, F)`.
+pub fn build_frame_index_content(tnum: u32, tden: u32, entries: &[(u64, u64, u64)]) -> Vec<u8> {
+    let mut buf = Vec::new();
+    buf.extend(encode_varint(entries.len() as u64));
+    buf.extend(tnum.to_be_bytes());
+    buf.extend(tden.to_be_bytes());
+    for &(off, t, f) in entries {
+        buf.extend(encode_varint(off));
+        buf.extend(encode_varint(t));
+        buf.extend(encode_varint(f));
+    }
+    buf
+}
+
+pub fn read_headers_and_toc(image: &[u8]) -> Result<(FileHeader, FrameHeader, Toc), JXLError> {
+    let codestream = ContainerParser::collect_codestream(image).unwrap();
+    let mut br = BitReader::new(&codestream);
+    let file_header = FileHeader::read(&mut br)?;
+
+    let frame_header =
+        FrameHeader::read_unconditional(&(), &mut br, &file_header.frame_header_nonserialized())?;
+    let num_toc_entries = frame_header.num_toc_entries();
+    let toc = Toc::read_unconditional(
+        &(),
+        &mut br,
+        &TocNonserialized {
+            num_entries: num_toc_entries as u32,
+        },
+    )?;
+    Ok((file_header, frame_header, toc))
+}
+
+#[allow(dead_code)] // used by integration tests
+pub fn write_pfm(image: Vec<Image<f32>>, mut buf: impl Write) -> Result<(), Error> {
+    if image.len() == 1 {
+        buf.write_all(b"Pf\n")?;
+    } else if image.len() == 3 {
+        buf.write_all(b"PF\n")?;
+    } else {
+        return Err(Error::InvalidPFM(format!(
+            "invalid number of channels: {}",
+            image.len()
+        )));
+    }
+    let size = image[0].size();
+    for c in image.iter().skip(1) {
+        assert_eq!(size, c.size());
+    }
+    buf.write_fmt(format_args!("{} {}\n", size.0, size.1))?;
+    buf.write_all(b"1.0\n")?;
+    let mut b: [u8; 4];
+    for row in 0..size.1 {
+        for col in 0..size.0 {
+            for c in image.iter() {
+                b = c.row(size.1 - row - 1)[col].to_be_bytes();
+                buf.write_all(&b)?;
+            }
+        }
+    }
+    buf.flush()?;
+    Ok(())
+}
+
+pub fn read_pfm(b: &[u8]) -> Result<Vec<Image<f32>>, Error> {
+    let mut bf = BufReader::new(Cursor::new(b));
+    let mut line = String::new();
+    bf.read_line(&mut line)?;
+    let channels = match line.trim() {
+        "Pf" => 1,
+        "PF" => 3,
+        &_ => return Err(Error::InvalidPFM(format!("invalid PFM type header {line}"))),
+    };
+    line.clear();
+    bf.read_line(&mut line)?;
+    let mut dims = line.split_whitespace();
+    let xres = if let Some(xres_str) = dims.next() {
+        xres_str.trim().parse()?
+    } else {
+        return Err(Error::InvalidPFM(format!(
+            "invalid PFM resolution header {line}",
+        )));
+    };
+    let yres = if let Some(yres_str) = dims.next() {
+        yres_str.trim().parse()?
+    } else {
+        return Err(Error::InvalidPFM(format!(
+            "invalid PFM resolution header {line}",
+        )));
+    };
+    line.clear();
+    bf.read_line(&mut line)?;
+    let endianness: f32 = line.trim().parse()?;
+
+    let mut res = Vec::<Image<f32>>::new();
+    for _ in 0..channels {
+        let img = Image::new((xres, yres))?;
+        res.push(img);
+    }
+
+    let mut buf = [0u8; 4];
+    for row in 0..yres {
+        for col in 0..xres {
+            for chan in res.iter_mut() {
+                bf.read_exact(&mut buf)?;
+                chan.row_mut(yres - row - 1)[col] = if endianness < 0.0 {
+                    f32::from_le_bytes(buf)
+                } else {
+                    f32::from_be_bytes(buf)
+                }
+            }
+        }
+    }
+
+    Ok(res)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_with_floats() {
+        assert_almost_abs_eq(1.0000001f64, 1.0000002, 0.000001);
+        assert_almost_abs_eq(1.0, 1.1, 0.2);
+    }
+
+    #[test]
+    fn test_with_integers() {
+        assert_almost_abs_eq(100, 101, 2);
+        assert_almost_abs_eq(777u32, 770, 7);
+        assert_almost_abs_eq(500i64, 498, 3);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_panic_float() {
+        assert_almost_abs_eq(1.0, 1.2, 0.1);
+    }
+    #[test]
+    #[should_panic]
+    fn test_panic_integer() {
+        assert_almost_abs_eq(100, 105, 2);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_nan_comparison() {
+        assert_almost_abs_eq(f64::NAN, f64::NAN, 0.1);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_nan_tolerance() {
+        assert_almost_abs_eq(1.0, 1.0, f64::NAN);
+    }
+
+    #[test]
+    fn test_infinity_tolerance() {
+        assert_almost_abs_eq(1.0, 1.0, f64::INFINITY);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_nan_comparison_with_infinity_tolerance() {
+        assert_almost_abs_eq(f32::NAN, f32::NAN, f32::INFINITY);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_infinity_comparison_with_infinity_tolerance() {
+        assert_almost_abs_eq(f32::INFINITY, f32::INFINITY, f32::INFINITY);
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/tracing_wrappers.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/tracing_wrappers.rs
new file mode 100644
index 00000000..8d14a92d
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/tracing_wrappers.rs
@@ -0,0 +1,26 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#![allow(unused_imports)]
+
+#[cfg(feature = "tracing")]
+mod private {
+    pub use tracing::{debug, error, info, instrument, trace, warn};
+}
+
+#[cfg(not(feature = "tracing"))]
+mod private {
+    macro_rules! fake_log {
+        ($($_: tt)*) => {};
+    }
+    pub(crate) use fake_log as debug;
+    pub(crate) use fake_log as error;
+    pub(crate) use fake_log as info;
+    pub(crate) use fake_log as trace;
+    pub(crate) use fake_log as warn;
+    pub use jxl_macros::noop as instrument;
+}
+
+pub use private::*;
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/vec_helpers.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/vec_helpers.rs
new file mode 100644
index 00000000..a75a30b4
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/vec_helpers.rs
@@ -0,0 +1,142 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//! Fallible and aligned allocation utilities for safe, OOM-resistant decoding.
+//!
+//! This module provides:
+//! - `NewWithCapacity` trait for fallible `Vec` and `String` allocation
+//! - `AlignedVec` type alias for SIMD-aligned allocations (64-byte alignment for AVX-512)
+//! - Helper functions for creating aligned vectors with fallible allocation
+
+use aligned_vec::{AVec, ConstAlign};
+use std::collections::TryReserveError;
+
+/// Alignment for SIMD operations (64 bytes for AVX-512 compatibility).
+#[allow(dead_code)] // SIMD alignment infrastructure
+pub const SIMD_ALIGN: usize = 64;
+
+/// Type alias for AVX-512-aligned vectors.
+/// Uses 64-byte alignment which is compatible with all x86 SIMD (SSE, AVX, AVX-512)
+/// and ARM NEON (which only requires 16-byte alignment).
+#[allow(dead_code)] // SIMD alignment infrastructure
+pub type AlignedVec<T> = AVec<T, ConstAlign<SIMD_ALIGN>>;
+
+/// Creates a new aligned vector with the given capacity, returning an error on allocation failure.
+#[allow(dead_code)] // SIMD alignment infrastructure
+pub fn aligned_vec_with_capacity<T>(capacity: usize) -> Result<AlignedVec<T>, TryReserveError> {
+    // AVec doesn't have try_with_capacity, so we create empty and try_reserve
+    let mut vec = AVec::new(SIMD_ALIGN);
+    // Note: AVec's try_reserve returns a different error type, so we allocate
+    // conservatively by checking if the allocation would be too large
+    let size_bytes = capacity.checked_mul(std::mem::size_of::<T>());
+    if size_bytes.is_none() || size_bytes.unwrap() > isize::MAX as usize {
+        // This would fail allocation - return a synthetic TryReserveError
+        // by trying to allocate on a regular Vec which will fail the same way
+        let mut dummy: Vec<T> = Vec::new();
+        dummy.try_reserve(capacity)?;
+    }
+    vec.reserve(capacity);
+    Ok(vec)
+}
+
+/// Creates a new aligned vector filled with zeros.
+#[allow(dead_code)] // SIMD alignment infrastructure
+pub fn aligned_vec_zeroed<T: Default + Clone>(
+    len: usize,
+) -> Result<AlignedVec<T>, TryReserveError> {
+    let mut vec = aligned_vec_with_capacity(len)?;
+    vec.resize(len, T::default());
+    Ok(vec)
+}
+
+// TODO(firsching): as soon as "Vec::try_with_capacity" is available from the
+// standard library use this instead of the functions here.
+pub trait NewWithCapacity {
+    type Output;
+    type Error;
+    fn new_with_capacity(capacity: usize) -> Result<Self::Output, Self::Error>;
+}
+
+impl<T> NewWithCapacity for Vec<T> {
+    type Output = Vec<T>;
+    type Error = TryReserveError;
+
+    fn new_with_capacity(capacity: usize) -> Result<Self::Output, Self::Error> {
+        let mut vec = Vec::new();
+        vec.try_reserve(capacity)?;
+        Ok(vec)
+    }
+}
+
+impl NewWithCapacity for String {
+    type Output = String;
+    type Error = TryReserveError;
+    fn new_with_capacity(capacity: usize) -> Result<Self::Output, Self::Error> {
+        let mut s = String::new();
+        s.try_reserve(capacity)?;
+        Ok(s)
+    }
+}
+
+/// Extension trait for fallible vector operations.
+pub trait TryVecExt<T> {
+    /// Try to create a vector filled with copies of `value`.
+    fn try_from_elem(value: T, count: usize) -> Result<Vec<T>, TryReserveError>
+    where
+        T: Clone;
+
+    /// Try to extend the vector from an iterator, reserving capacity first.
+    #[allow(dead_code)]
+    fn try_extend_from_slice(&mut self, slice: &[T]) -> Result<(), TryReserveError>
+    where
+        T: Clone;
+}
+
+impl<T> TryVecExt<T> for Vec<T> {
+    fn try_from_elem(value: T, count: usize) -> Result<Vec<T>, TryReserveError>
+    where
+        T: Clone,
+    {
+        let mut vec = Vec::new();
+        vec.try_reserve(count)?;
+        vec.resize(count, value);
+        Ok(vec)
+    }
+
+    fn try_extend_from_slice(&mut self, slice: &[T]) -> Result<(), TryReserveError>
+    where
+        T: Clone,
+    {
+        self.try_reserve(slice.len())?;
+        self.extend_from_slice(slice);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_aligned_vec_with_capacity() {
+        let vec: AlignedVec<f32> = aligned_vec_with_capacity(1024).unwrap();
+        assert!((vec.as_ptr() as usize).is_multiple_of(SIMD_ALIGN));
+    }
+
+    #[test]
+    fn test_aligned_vec_zeroed() {
+        let vec: AlignedVec<f32> = aligned_vec_zeroed(1024).unwrap();
+        assert_eq!(vec.len(), 1024);
+        assert!(vec.iter().all(|&x| x == 0.0));
+        assert!((vec.as_ptr() as usize).is_multiple_of(SIMD_ALIGN));
+    }
+
+    #[test]
+    fn test_try_from_elem() {
+        let vec = Vec::<u8>::try_from_elem(42, 100).unwrap();
+        assert_eq!(vec.len(), 100);
+        assert!(vec.iter().all(|&x| x == 42));
+    }
+}
diff --git a/crates/exav-viewer/vendor/zenjxl-decoder/src/util/xorshift128plus.rs b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/xorshift128plus.rs
new file mode 100644
index 00000000..70a65728
--- /dev/null
+++ b/crates/exav-viewer/vendor/zenjxl-decoder/src/util/xorshift128plus.rs
@@ -0,0 +1,734 @@
+// Copyright (c) the JPEG XL Project Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Adapted from https://github.com/vpxyz/xorshift/blob/master/xorshift128plus/
+// (MIT-license)
+
+pub struct Xorshift128Plus {
+    s0: [u64; Self::N],
+    s1: [u64; Self::N],
+}
+
+impl Xorshift128Plus {
+    pub const N: usize = 8;
+
+    #[allow(dead_code)] // Single-seed variant of the PRNG constructor
+    pub fn new_with_seed(seed: u64) -> Self {
+        let mut s0 = [0; Self::N];
+        let mut s1 = [0; Self::N];
+
+        s0[0] = Self::split_mix_64(seed + 0x9E3779B97F4A7C15);
+        s1[0] = Self::split_mix_64(s0[0]);
+
+        for i in 1..Self::N {
+            s0[i] = Self::split_mix_64(s1[i - 1]);
+            s1[i] = Self::split_mix_64(s0[i]);
+        }
+
+        Self { s0, s1 }
+    }
+
+    pub fn new_with_seeds(seed1: u32, seed2: u32, seed3: u32, seed4: u32) -> Self {
+        let mut s0 = [0; Self::N];
+        let mut s1 = [0; Self::N];
+
+        s0[0] = Self::split_mix_64(
+            (((seed1 as u64) << 32) + seed2 as u64).wrapping_add(0x9E3779B97F4A7C15),
+        );
+        s1[0] = Self::split_mix_64(
+            (((seed3 as u64) << 32) + seed4 as u64).wrapping_add(0x9E3779B97F4A7C15),
+        );
+        for i in 1..Self::N {
+            s0[i] = Self::split_mix_64(s0[i - 1]);
+            s1[i] = Self::split_mix_64(s1[i - 1]);
+        }
+
+        Self { s0, s1 }
+    }
+
+    pub fn fill(&mut self, random_bits: &mut [u64; Self::N]) {
+        for ((s0, s1), random_bits) in self
+            .s0
+            .iter_mut()
+            .zip(self.s1.iter_mut())
+            .zip(random_bits.iter_mut())
+        {
+            let mut new_s1 = *s0;
+            *s0 = *s1;
+            let bits = new_s1.wrapping_add(*s0); // b, c
+            new_s1 ^= new_s1 << 23;
+            *random_bits = bits;
+            new_s1 ^= *s0 ^ (new_s1 >> 18) ^ (*s0 >> 5);
+            *s1 = new_s1;
+        }
+    }
+
+    fn split_mix_64(mut z: u64) -> u64 {
+        z = (z ^ (z >> 30)).wrapping_mul(0xBF58476D1CE4E5B9);
+        z = (z ^ (z >> 27)).wrapping_mul(0x94D049BB133111EB);
+        z ^ (z >> 31)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::util::xorshift128plus::Xorshift128Plus;
+
+    #[test]
+    fn xorshift128plus_golden() {
+        const NUM_VECTORS: usize = 64;
+        const EXPECTED: [[u64; Xorshift128Plus::N]; NUM_VECTORS] = [
+            [
+                0x6E901576D477CBB1,
+                0xE9E53789195DA2A2,
+                0xB681F6DDA5E0AE99,
+                0x8EFD18CE21FD6896,
+                0xA898A80DF75CF532,
+                0x50CEB2C9E2DE7E32,
+                0x3CA7C2FEB25C0DD0,
+                0xA4D0866B80B4D836,
+            ],
+            [
+                0x8CD6A1E6233D3A26,
+                0x3D4603ADE98B112D,
+                0xDC427AF674019E36,
+                0xE28B4D230705AC53,
+                0x7297E9BBA88783DD,
+                0x34D3D23CFCD9B41A,
+                0x5A223615ADBE96B8,
+                0xE5EB529027CFBD01,
+            ],
+            [
+                0xC1894CF00DFAC6A2,
+                0x18EDF8AE9085E404,
+                0x8E936625296B4CCD,
+                0x31971EF3A14A899B,
+                0xBE87535FCE0BF26A,
+                0x576F7A752BC6649F,
+                0xA44CBADCE0C6B937,
+                0x3DBA819BB17A353A,
+            ],
+            [
+                0x27CE38DFCC1C5EB6,
+                0x920BEB5606340256,
+                0x3986CBC40C9AFC2C,
+                0xE22BCB3EEB1E191E,
+                0x6E1FCDD3602A8FBA,
+                0x052CB044E5415A29,
+                0x46266646EFB9ECD7,
+                0x8F44914618D29335,
+            ],
+            [
+                0xDD30AEDF72A362C5,
+                0xBC1D824E16BB98F4,
+                0x9EA6009C2AA3D2F1,
+                0xF65C0FBBE17AF081,
+                0x22424D06A8738991,
+                0x8A62763F2B7611D2,
+                0x2F3E89F722637939,
+                0x84D338BEF50AFD50,
+            ],
+            [
+                0x00F46494898E2B0B,
+                0x81239DC4FB8E8003,
+                0x414AD93EC5773FE7,
+                0x791473C450E4110F,
+                0x87F127BF68C959AC,
+                0x6429282D695EF67B,
+                0x661082E11546CBA8,
+                0x5815D53FA5436BFD,
+            ],
+            [
+                0xB3DEADAB9BE6E0F9,
+                0xAA1B7B8F7CED0202,
+                0x4C5ED437699D279E,
+                0xA4471727F1CB39D3,
+                0xE439DA193F802F70,
+                0xF89401BB04FA6493,
+                0x3B08045A4FE898BA,
+                0x32137BFE98227950,
+            ],
+            [
+                0xFBAE4A092897FEF3,
+                0x0639F6CE56E71C8E,
+                0xF0AD6465C07F0C1E,
+                0xFF8E28563361DCE5,
+                0xC2013DB7F86BC6B9,
+                0x8EFCC0503330102F,
+                0x3F6B767EA5C4DA40,
+                0xB9864B950B2232E1,
+            ],
+            [
+                0x76EB58DE8E5EC22A,
+                0x9BBBF49A18B32F4F,
+                0xC8405F02B2B2FAB9,
+                0xC3E122A5F146BC34,
+                0xC90BB046660F5765,
+                0xB933981310DBECCF,
+                0x5A2A7BFC9126FD1C,
+                0x8BB388C94DF87901,
+            ],
+            [
+                0x753EB89AD63EF3C3,
+                0xF24AAF40C89D65AD,
+                0x23F68931C1A6AA6D,
+                0xF47E79BF702C6DD0,
+                0xA3AD113244EE7EAE,
+                0xD42CBEA28F793DC3,
+                0xD896FCF1820F497C,
+                0x042B86D2818948C1,
+            ],
+            [
+                0x8F2A4FC5A4265763,
+                0xEC499E6F95EAA10C,
+                0xE3786D4ECCD0DEB5,
+                0xC725C53D3AC4CC43,
+                0x065A4ACBBF83610E,
+                0x35C61C9FEF167129,
+                0x7B720AEAA7D70048,
+                0x14206B841377D039,
+            ],
+            [
+                0xAD27D78BF96055F6,
+                0x5F43B20FF47ADCD4,
+                0xE184C2401E2BF71E,
+                0x30B263D78990045D,
+                0xC22F00EBFF9BA201,
+                0xAE7F86522B53A562,
+                0x2853312BC039F0A4,
+                0x868D619E6549C3C8,
+            ],
+            [
+                0xFD5493D8AE9A8371,
+                0x773D5E224DF61B3B,
+                0x5377C54FBB1A8280,
+                0xCAD4DE3B8265CAFA,
+                0xCDF3F19C91EBD5F6,
+                0xC8EA0F182D73BD78,
+                0x220502D593433FF1,
+                0xB81205E612DC31B1,
+            ],
+            [
+                0x8F32A39EAEDA4C70,
+                0x1D4B0914AA4DAC7F,
+                0x56EF1570F3A8B405,
+                0x29812CB17404A592,
+                0x97A2AAF69CAE90F2,
+                0x12BF5E02778BBFE5,
+                0x9D4B55AD42A05FD2,
+                0x06C2BAB5E6086620,
+            ],
+            [
+                0x8DB4B9648302B253,
+                0xD756AD9E3AEA12C7,
+                0x68709B7F11D4B188,
+                0x7CC299DDCD707A4B,
+                0x97B860C370A7661D,
+                0xCECD314FC20E64F5,
+                0x55F412CDFB4C7EC3,
+                0x55EE97591193B525,
+            ],
+            [
+                0xCF70F3ACA96E6254,
+                0x022FEDECA2E09F46,
+                0x686823DB60AE1ECF,
+                0xFD36190D3739830E,
+                0x74E1C09027F68120,
+                0xB5883A835C093842,
+                0x93E1EFB927E9E4E3,
+                0xB2721E249D7E5EBE,
+            ],
+            [
+                0x69B6E21C44188CB8,
+                0x5D6CFB853655A7AA,
+                0x3E001A0B425A66DC,
+                0x8C57451103A5138F,
+                0x7BF8B4BE18EAB402,
+                0x494102EB8761A365,
+                0xB33796A9F6A81F0E,
+                0x10005AB3BCCFD960,
+            ],
+            [
+                0xB2CF25740AE965DC,
+                0x6F7C1DF7EF53D670,
+                0x648DD6087AC2251E,
+                0x040955D9851D487D,
+                0xBD550FC7E21A7F66,
+                0x57408F484DEB3AB5,
+                0x481E24C150B506C1,
+                0x72C0C3EAF91A40D6,
+            ],
+            [
+                0x1997A481858A5D39,
+                0x539718F4BEF50DC1,
+                0x2EC4DC4787E7E368,
+                0xFF1CE78879419845,
+                0xE219A93DD6F6DD30,
+                0x85328618D02FEC1A,
+                0xC86E02D969181B20,
+                0xEBEC8CD8BBA34E6E,
+            ],
+            [
+                0x28B55088A16CE947,
+                0xDD25AC11E6350195,
+                0xBD1F176694257B1C,
+                0x09459CCF9FCC9402,
+                0xF8047341E386C4E4,
+                0x7E8E9A9AD984C6C0,
+                0xA4661E95062AA092,
+                0x70A9947005ED1152,
+            ],
+            [
+                0x4C01CF75DBE98CCD,
+                0x0BA076CDFC7373B9,
+                0x6C5E7A004B57FB59,
+                0x336B82297FD3BC56,
+                0x7990C0BE74E8D60F,
+                0xF0275CC00EC5C8C8,
+                0x6CF29E682DFAD2E9,
+                0xFA4361524BD95D72,
+            ],
+            [
+                0x631D2A19FF62F018,
+                0x41C43863B985B3FA,
+                0xE052B2267038EFD9,
+                0xE2A535FAC575F430,
+                0xE004EEA90B1FF5B8,
+                0x42DFE2CA692A1F26,
+                0x90FB0BFC9A189ECC,
+                0x4484102BD3536BD0,
+            ],
+            [
+                0xD027134E9ACCA5A5,
+                0xBBAB4F966D476A9B,
+                0x713794A96E03D693,
+                0x9F6335E6B94CD44A,
+                0xC5090C80E7471617,
+                0x6D9C1B0C87B58E33,
+                0x1969CE82E31185A5,
+                0x2099B97E87754EBE,
+            ],
+            [
+                0x60EBAF4ED934350F,
+                0xC26FBF0BA5E6ECFF,
+                0x9E54150F0312EC57,
+                0x0973B48364ED0041,
+                0x800A523241426CFC,
+                0x03AB5EC055F75989,
+                0x8CF315935DEEB40A,
+                0x83D3FC0190BD1409,
+            ],
+            [
+                0x26D35394CF720A51,
+                0xCE9EAA15243CBAFE,
+                0xE2B45FBAF21B29E0,
+                0xDB92E98EDE73F9E0,
+                0x79B16F5101C26387,
+                0x1AC15959DE88C86F,
+                0x387633AEC6D6A580,
+                0xA6FC05807BFC5EB8,
+            ],
+            [
+                0x2D26C8E47C6BADA9,
+                0x820E6EC832D52D73,
+                0xB8432C3E0ED0EE5B,
+                0x0F84B3C4063AAA87,
+                0xF393E4366854F651,
+                0x749E1B4D2366A567,
+                0x805EACA43480D004,
+                0x244EBF3AA54400A5,
+            ],
+            [
+                0xBFDC3763AA79F75A,
+                0x9E3A74CC751F41DB,
+                0xF401302A149DBC55,
+                0x6B25F7973D7BF7BC,
+                0x13371D34FDBC3DAE,
+                0xC5E1998C8F484DCD,
+                0x7031B8AE5C364464,
+                0x3847F0C4F3DA2C25,
+            ],
+            [
+                0x24C6387D2C0F1225,
+                0x77CCE960255C67A4,
+                0x21A0947E497B10EB,
+                0xBB5DB73A825A9D7E,
+                0x26294A41999E553D,
+                0x3953E0089F87D925,
+                0x3DAE6E5D4E5EAAFE,
+                0x74B545460341A7AA,
+            ],
+            [
+                0x710E5EB08A7DB820,
+                0x7E43C4E77CAEA025,
+                0xD4C91529C8B060C1,
+                0x09AE26D8A7B0CA29,
+                0xAB9F356BB360A772,
+                0xB68834A25F19F6E9,
+                0x79B8D9894C5734E2,
+                0xC6847E7C8FFD265F,
+            ],
+            [
+                0x10C4BCB06A5111E6,
+                0x57CB50955B6A2516,
+                0xEF53C87798B6995F,
+                0xAB38E15BBD8D0197,
+                0xA51C6106EFF73C93,
+                0x83D7F0E2270A7134,
+                0x0923FD330397FCE5,
+                0xF9DE54EDFE58FB45,
+            ],
+            [
+                0x07D44833ACCD1A94,
+                0xAAD3C9E945E2F9F3,
+                0xABF4C879B876AA37,
+                0xF29C69A21B301619,
+                0x2DDCE959111C788B,
+                0x7CEDB48F8AC1729B,
+                0x93F3BA9A02B659BE,
+                0xF20A87FF17933CBE,
+            ],
+            [
+                0x8E96EBE93180CFE6,
+                0x94CAA12873937079,
+                0x05F613D9380D4189,
+                0xBCAB40C1DC79F38A,
+                0x0AD8907B7C61D19E,
+                0x88534E189D103910,
+                0x2DB2FAABA160AB8F,
+                0xA070E7506B06F15C,
+            ],
+            [
+                0x6FB1FCDAFFEF87A9,
+                0xE735CF25337A090D,
+                0x172C6EDCEFEF1825,
+                0x76957EA49EF0542D,
+                0x819BF4CD250F7C49,
+                0xD6FF23E4AD00C4D4,
+                0xE79673C1EC358FF0,
+                0xAC9C048144337938,
+            ],
+            [
+                0x4C5387FF258B3AF4,
+                0xEDB68FAEC2CB1AA3,
+                0x02A624E67B4E1DA4,
+                0x5C44797A38E08AF2,
+                0x36546A70E9411B4B,
+                0x47C17B24D2FD9675,
+                0x101957AAA020CA26,
+                0x47A1619D4779F122,
+            ],
+            [
+                0xF84B8BCDC92D9A3C,
+                0x951D7D2C74B3066B,
+                0x7AC287C06EDDD9B2,
+                0x4C38FC476608D38F,
+                0x224D793B19CB4BCD,
+                0x835A255899BF1A41,
+                0x4AD250E9F62DB4AB,
+                0xD9B44F4B58781096,
+            ],
+            [
+                0xABBAF99A8EB5C6B8,
+                0xFB568E900D3A9F56,
+                0x11EDF63D23C5DF11,
+                0xA9C3011D3FA7C5A8,
+                0xAEDD3CF11AFFF725,
+                0xABCA472B5F1EDD6B,
+                0x0600B6BB5D879804,
+                0xDB4DE007F22191A0,
+            ],
+            [
+                0xD76CC9EFF0CE9392,
+                0xF5E0A772B59BA49A,
+                0x7D1AE1ED0C1261B5,
+                0x79224A33B5EA4F4A,
+                0x6DD825D80C40EA60,
+                0x47FC8E747E51C953,
+                0x695C05F72888BF98,
+                0x1A012428440B9015,
+            ],
+            [
+                0xD754DD61F9B772BF,
+                0xC4A2FCF4C0F9D4EB,
+                0x461167CDF67A24A2,
+                0x434748490EBCB9D4,
+                0x274DD9CDCA5781DE,
+                0x36BAC63BA9A85209,
+                0x30324DAFDA36B70F,
+                0x337570DB4FE6DAB3,
+            ],
+            [
+                0xF46CBDD57C551546,
+                0x8E02507E676DA3E3,
+                0xD826245A8C15406D,
+                0xDFB38A5B71113B72,
+                0x5EA38454C95B16B5,
+                0x28C054FB87ABF3E1,
+                0xAA2724C0BA1A8096,
+                0xECA83EC980304F2F,
+            ],
+            [
+                0x6AA76EC294EB3303,
+                0x42D4CDB2A8032E3B,
+                0x7999EDF75DCD8735,
+                0xB422BFFE696CCDCC,
+                0x8F721461FD7CCDFE,
+                0x148E1A5814FDE253,
+                0x4DC941F4375EF8FF,
+                0x27B2A9E0EB5B49CF,
+            ],
+            [
+                0xCEA592EF9343EBE1,
+                0xF7D38B5FA7698903,
+                0x6CCBF352203FEAB6,
+                0x830F3095FCCDA9C5,
+                0xDBEEF4B81B81C8F4,
+                0x6D7EB9BCEECA5CF9,
+                0xC58ABB0FBE436C69,
+                0xE4B97E6DB2041A4B,
+            ],
+            [
+                0x7E40FC772978AF14,
+                0xCDDA4BBAE28354A1,
+                0xE4F993B832C32613,
+                0xD3608093C68A4B35,
+                0x9A3B60E01BEE3699,
+                0x03BEF248F3288713,
+                0x70B9294318F3E9B4,
+                0x8D2ABB913B8610DE,
+            ],
+            [
+                0x37F209128E7D8B2C,
+                0x81D2AB375BD874BC,
+                0xA716A1B7373F7408,
+                0x0CEE97BEC4706540,
+                0xA40C5FD9CDBC1512,
+                0x73CAF6C8918409E7,
+                0x45E11BCEDF0BBAA1,
+                0x612C612BFF6E6605,
+            ],
+            [
+                0xF8ECB14A12D0F649,
+                0xDA683CD7C01BA1AC,
+                0xA2203F7510E124C1,
+                0x7F83E52E162F3C78,
+                0x77D2BB73456ACADB,
+                0x37FC34FC840BBA6F,
+                0x3076BC7D4C6EBC1F,
+                0x4F514123632B5FA9,
+            ],
+            [
+                0x44D789DED935E884,
+                0xF8291591E09FEC9F,
+                0xD9CED2CF32A2E4B7,
+                0x95F70E1EB604904A,
+                0xDE438FE43C14F6AB,
+                0x4C8D23E4FAFCF8D8,
+                0xC716910A3067EB86,
+                0x3D6B7915315095D3,
+            ],
+            [
+                0x3170FDBADAB92095,
+                0x8F1963933FC5650B,
+                0x72F94F00ABECFEAB,
+                0x6E3AE826C6AAB4CE,
+                0xA677A2BF31068258,
+                0x9660CDC4F363AF10,
+                0xD81A15A152379EF1,
+                0x5D7D285E1080A3F9,
+            ],
+            [
+                0xDAD5DDFF9A2249B3,
+                0x6F9721D926103FAE,
+                0x1418CBB83FFA349A,
+                0xE71A30AD48C012B2,
+                0xBE76376C63751132,
+                0x3496467ACA713AE6,
+                0x8D7EC01369F991A3,
+                0xD8C73A88B96B154E,
+            ],
+            [
+                0x8B5D9C74AEB4833A,
+                0xF914FB3F867B912F,
+                0xB894EA034936B1DC,
+                0x8A16D21BE51C4F5B,
+                0x31FF048ED582D98E,
+                0xB95AB2F4DC65B820,
+                0x04082B9170561AF7,
+                0xA215610A5DC836FA,
+            ],
+            [
+                0xB2ADE592C092FAAC,
+                0x7A1E683BCBF13294,
+                0xC7A4DBF86858C096,
+                0x3A49940F97BFF316,
+                0xCAE5C06B82C46703,
+                0xC7F413A0F951E2BD,
+                0x6665E7BB10EB5916,
+                0x86F84A5A94EDE319,
+            ],
+            [
+                0x4EA199D8FAA79CA3,
+                0xDFA26E5BF1981704,
+                0x0F5E081D37FA4E01,
+                0x9CB632F89CD675CD,
+                0x4A09DB89D48C0304,
+                0x88142742EA3C7672,
+                0xAC4F149E6D2E9BDB,
+                0x6D9E1C23F8B1C6C6,
+            ],
+            [
+                0xD58BE47B92DEC0E9,
+                0x8E57573645E34328,
+                0x4CC094CCB5FB5126,
+                0x5F1D66AF6FB40E3C,
+                0x2BA15509132D3B00,
+                0x0D6545646120E567,
+                0x3CF680C45C223666,
+                0x96B28E32930179DA,
+            ],
+            [
+                0x5900C45853AC7990,
+                0x61881E3E8B7FF169,
+                0x4DE5F835DF2230FF,
+                0x4427A9E7932F73FF,
+                0x9B641BAD379A8C8D,
+                0xDF271E5BF98F4E5C,
+                0xDFDA16DB830FF5EE,
+                0x371C7E7CFB89C0E9,
+            ],
+            [
+                0x4410A8576247A250,
+                0x6AD2DA12B45AC0D9,
+                0x18DFC72AAC85EECC,
+                0x06FC8BB2A0EF25C8,
+                0xEB287619C85E6118,
+                0x19553ECA67F25A2C,
+                0x3B9557F1DCEC5BAA,
+                0x7BAD9E8B710D1079,
+            ],
+            [
+                0x34F365D66BD22B28,
+                0xE6E124B9F10F835D,
+                0x0573C38ABF2B24DC,
+                0xD32E6AF10A0125AE,
+                0x383590ACEA979519,
+                0x8376ED7A39E28205,
+                0xF0B7F184DCBDA435,
+                0x062A203390E31794,
+            ],
+            [
+                0xA2AFFD7E41918760,
+                0x7F90FC1BD0819C86,
+                0x5033C08E5A969533,
+                0x2707AF5C6D039590,
+                0x57BBD5980F17DF9C,
+                0xD3FE6E61D763268A,
+                0x9E0A0AE40F335A3B,
+                0x43CF4EB0A99613C5,
+            ],
+            [
+                0xD4D2A397CE1A7C2E,
+                0x3DF7CE7CC3212DAD,
+                0x0880F0D5D356C75A,
+                0xA8AFC44DD03B1346,
+                0x79263B46C13A29E0,
+                0x11071B3C0ED58E7A,
+                0xED46DC9F538406BF,
+                0x2C94974F2B94843D,
+            ],
+            [
+                0xE246E13C39AB5D5E,
+                0xAC1018489D955B20,
+                0x8601B558771852B8,
+                0x110BD4C06DB40173,
+                0x738FC8A18CCA0EBB,
+                0x6673E09BE0EA76E5,
+                0x024BC7A0C7527877,
+                0x45E6B4652E2EC34E,
+            ],
+            [
+                0xD1ED26A1A375CDC8,
+                0xAABC4E896A617CB8,
+                0x0A9C9E8E57D753C6,
+                0xA3774A75FEB4C30E,
+                0x30B816C01C93E49E,
+                0xF405BABC06D2408C,
+                0xCC0CE6B4CE788ABC,
+                0x75E7922D0447956C,
+            ],
+            [
+                0xD07C1676A698BC95,
+                0x5F9AEA4840E2D860,
+                0xD5FC10D58BDF6F02,
+                0xF190A2AD4BC2EEA7,
+                0x0C24D11F51726931,
+                0xDB646899A16B6512,
+                0x7BC10670047B1DD8,
+                0x2413A5ABCD45F092,
+            ],
+            [
+                0x4E66892190CFD923,
+                0xF10162440365EC8E,
+                0x158ACA5A6A2280AE,
+                0x0D60ED11C0224166,
+                0x7CD2E9A71B9D7488,
+                0x450D7289706AB2A3,
+                0x88FAE34EC9A0D7DC,
+                0x96FF9103575A97DA,
+            ],
+            [
+                0x77990FAC6046C446,
+                0xB174B5FB30C76676,
+                0xE352CE3EB56CF82A,
+                0xC6039B6873A9A082,
+                0xE3F80F3AE333148A,
+                0xB853BA24BA3539B9,
+                0xE8863E52ECCB0C74,
+                0x309B4CC1092CC245,
+            ],
+            [
+                0xBC2B70BEE8388D9F,
+                0xE48D92AE22216DCE,
+                0xF15F3BF3E2C15D8F,
+                0x1DD964D4812D8B24,
+                0xD56AF02FB4665E4C,
+                0x98002200595BD9A3,
+                0x049246D50BB8FA12,
+                0x1B542DF485B579B9,
+            ],
+            [
+                0x2347409ADFA8E497,
+                0x36015C2211D62498,
+                0xE9F141F32EB82690,
+                0x1F839912D0449FB9,
+                0x4E4DCFFF2D02D97C,
+                0xF8A03AB4C0F625C9,
+                0x0605F575795DAC5C,
+                0x4746C9BEA0DDA6B1,
+            ],
+            [
+                0xCA5BB519ECE7481B,
+                0xFD496155E55CA945,
+                0xF753B9DBB1515F81,
+                0x50549E8BAC0F70E7,
+                0x8614FB0271E21C60,
+                0x60C72947EB0F0070,
+                0xA6511C10AEE742B6,
+                0x48FB48F2CACCB43E,
+            ],
+        ];
+
+        let mut rng = Xorshift128Plus::new_with_seed(12345);
+        for expected_row in EXPECTED.iter() {
+            let mut row = [0; Xorshift128Plus::N];
+            rng.fill(&mut row);
+            for (&actual, &expected) in row.iter().zip(expected_row) {
+                assert_eq!(actual, expected);
+            }
+        }
+    }
+}
diff --git a/crates/exav-x86/src/lib.rs b/crates/exav-x86/src/lib.rs
index d4da7ed5..74bea92f 100644
--- a/crates/exav-x86/src/lib.rs
+++ b/crates/exav-x86/src/lib.rs
@@ -818,8 +818,8 @@ enum Slot {
 /// One `/digit` entry. `None` is a digit the group does not define.
 type Grp = Option<(Mn, F)>;
 
-use Slot::{Bad as X, B, G, I};
 use F::*;
+use Slot::{B, Bad as X, G, I};
 
 const NIL: Grp = None;
 
@@ -2802,9 +2802,11 @@ mod tests {
     /// the group's instruction with an invented operand instead of `vmcall`.
     #[test]
     fn the_modrm_keyed_table_is_sorted() {
-        assert!(generated::OF_MOD3
-            .windows(2)
-            .all(|w| (w[0].0, w[0].1, w[0].2) < (w[1].0, w[1].1, w[1].2)));
+        assert!(
+            generated::OF_MOD3
+                .array_windows()
+                .all(|[a, b]| (a.0, a.1, a.2) < (b.0, b.1, b.2))
+        );
     }
 
     /// `Mn` compares by index, so one name must never have two.
diff --git a/crates/exav-x86/tests/differential.rs b/crates/exav-x86/tests/differential.rs
index b1d791dc..c27ca25e 100644
--- a/crates/exav-x86/tests/differential.rs
+++ b/crates/exav-x86/tests/differential.rs
@@ -17,7 +17,7 @@
 //! * **disagree** — both decoded and they differ. The only failure, and the
 //!   tests below assert it never happens.
 
-use exav_x86::{decode, Mn, Op, Size};
+use exav_x86::{Mn, Op, Size, decode};
 use iced_x86::{Decoder, DecoderOptions, Instruction, Register};
 
 #[derive(Default)]
diff --git a/crates/exav-x86/tools/gen-tables/Cargo.lock b/crates/exav-x86/tools/gen-tables/Cargo.lock
index 888640ab..6cedde8c 100644
--- a/crates/exav-x86/tools/gen-tables/Cargo.lock
+++ b/crates/exav-x86/tools/gen-tables/Cargo.lock
@@ -20,6 +20,6 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
diff --git a/crates/exav-x86/tools/gen-tables/Cargo.toml b/crates/exav-x86/tools/gen-tables/Cargo.toml
index 76bac80d..641e458d 100644
--- a/crates/exav-x86/tools/gen-tables/Cargo.toml
+++ b/crates/exav-x86/tools/gen-tables/Cargo.toml
@@ -8,7 +8,7 @@
 [package]
 name = "exav-x86-gen-tables"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/crates/exav-x86/tools/gen-tables/src/main.rs b/crates/exav-x86/tools/gen-tables/src/main.rs
index b5cdba35..2f1bb5e0 100644
--- a/crates/exav-x86/tools/gen-tables/src/main.rs
+++ b/crates/exav-x86/tools/gen-tables/src/main.rs
@@ -245,7 +245,11 @@ fn probe_vex(
     // decline the destination-`xmm0` form for every gather, so the registers
     // are chosen per digit instead.
     let mod3 = modrm >= 0xc0;
-    let free = |used: [u8; 3]| (0u8..8).find(|r| !used.contains(r)).expect("8 registers, 3 used");
+    let free = |used: [u8; 3]| {
+        (0u8..8)
+            .find(|r| !used.contains(r))
+            .expect("8 registers, 3 used")
+    };
     let (modrm, sib, vvvv_a, vvvv_b) = if vsib && !mod3 {
         let digit = (modrm >> 3) & 7;
         let index = if digit == 1 { 2 } else { 1 };
@@ -270,7 +274,7 @@ fn probe_vex(
     let mut b = vex_head(pfx, map, w, vvvv_b, l, pp, op, modrm);
     b.extend(sib);
     b.extend_from_slice(&TAIL);
-    let strict_vvvv = decode(&b).map_or(true, |i| format!("{:?}", i.mnemonic()) != name);
+    let strict_vvvv = decode(&b).is_none_or(|i| format!("{:?}", i.mnemonic()) != name);
     Some(VexCell {
         name,
         imm,
@@ -480,10 +484,10 @@ fn probe_shape_at(pfx: &[u8], escape: &[u8], op: u8, digit: u8) -> Option<Shape>
         b.extend_from_slice(&TAIL);
         decode(&b)
     };
-    if let Some(m) = &mem_probe {
-        if m.op_count() < i.op_count() {
-            return None;
-        }
+    if let Some(m) = &mem_probe
+        && m.op_count() < i.op_count()
+    {
+        return None;
     }
     let mem_bytes = match mem_probe.map(|m| m.memory_size().size()) {
         Some(n) if n > 0 && n <= 16 => n as u8,
@@ -724,7 +728,17 @@ fn vsib_mem(digit: u8, vsib: bool) -> (u8, Option<u8>) {
 /// not an encoding at all the probe fails and yields 0, which reads as "do not
 /// scale". An unscaled displacement addresses the wrong memory by up to 64x.
 #[allow(clippy::too_many_arguments)]
-fn evex_disp8_n(mm: u8, w: u8, pp: u8, ll: u8, b: u8, aaa: u8, op: u8, digit: u8, vsib: bool) -> u8 {
+fn evex_disp8_n(
+    mm: u8,
+    w: u8,
+    pp: u8,
+    ll: u8,
+    b: u8,
+    aaa: u8,
+    op: u8,
+    digit: u8,
+    vsib: bool,
+) -> u8 {
     // `mod=01`, so the byte after the addressing bytes is the displacement.
     let (modrm, sib) = vsib_mem(digit, vsib);
     let modrm = 0x40 | (modrm & 0x3f);
@@ -774,7 +788,7 @@ fn probe_evex(
     let strict_vvvv = {
         let mut head = evex_head(mm, w, 0b1110, pp, 0, ll, b, aaa, op, modrm);
         head.extend(sib);
-        probe_counting(&head, head.len()).map_or(true, |(n, _)| n != name)
+        probe_counting(&head, head.len()).is_none_or(|(n, _)| n != name)
     };
     Some(EvexCell {
         name,
@@ -805,7 +819,13 @@ fn imm_code(n: u8) -> u16 {
 }
 
 /// Format one flat table of integers.
-fn emit_table<T: std::fmt::Display>(out: &mut String, doc: &str, name: &str, ty: &str, values: &[T]) {
+fn emit_table<T: std::fmt::Display>(
+    out: &mut String,
+    doc: &str,
+    name: &str,
+    ty: &str,
+    values: &[T],
+) {
     writeln!(out, "\n{doc}").unwrap();
     writeln!(
         out,
@@ -1064,7 +1084,10 @@ fn main() {
             }
         }
     }
-    assert!(evex.windows(2).all(|w| w[0].0 < w[1].0), "keys must sort");
+    assert!(
+        evex.array_windows().all(|[a, b]| a.0 < b.0),
+        "keys must sort"
+    );
     assert!(evex.last().is_none_or(|(k, _)| *k < EVEX_KEYS));
 
     // ---- emit -------------------------------------------------------------
diff --git a/crates/exav/Cargo.toml b/crates/exav/Cargo.toml
index 99db8c8e..beb892f3 100644
--- a/crates/exav/Cargo.toml
+++ b/crates/exav/Cargo.toml
@@ -31,7 +31,7 @@ path = "src/main.rs"
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("fuzzing"))'] }
 
 [features]
-default = ["yara", "all-formats", "decrypt", "dlp", "phishing", "icap", "image-hash"]
+default = ["yara", "all-formats", "decrypt", "dlp", "phishing", "icap", "image-hash", "visible-text"]
 # ICAP (RFC 3507) server, so exav can stand in for a `c-icap` container at a
 # proxy's adaptation hook. On by default (pure Rust, std-only, no extra crates)
 # because the published image has to be able to serve it. It still binds
@@ -70,6 +70,11 @@ phishing = ["exav-core/phishing"]
 # `fuzzy_img#` subsignatures, through exav-imagehash and its image decoders.
 # Without it they load as unsupported, and no image is ever decoded.
 image-hash = ["exav-core/image-hash"]
+# A Markdown document's visible text is matched as a text view, as well as its
+# bytes, through exav-render's Markdown reader. Pure Rust, `forbid(unsafe_code)`.
+visible-text = ["exav-core/visible-text"]
+visible-text-pdf = ["exav-core/visible-text-pdf"]
+visible-text-office = ["exav-core/visible-text-office"]
 decrypt = ["exav-core/decrypt"]
 
 # Archive/container formats, forwarded to exav-core, then exav-unpack. `all-formats`
@@ -83,7 +88,9 @@ bzip2 = ["exav-core/bzip2"]
 xz = ["exav-core/xz"]
 zstd = ["exav-core/zstd"]
 lzip = ["exav-core/lzip"]
-cab = ["exav-core/cab"]
+lzma = ["exav-core/lzma"]
+rpm = ["exav-core/rpm"]
+cab =["exav-core/cab"]
 chm = ["exav-core/chm"]
 sevenz = ["exav-core/sevenz"]
 rar = ["exav-core/rar"]
@@ -129,6 +136,11 @@ alz = ["exav-core/alz"]
 egg = ["exav-core/egg"]
 hwp3 = ["exav-core/hwp3"]
 ext = ["exav-core/ext"]
+exfat = ["exav-core/exfat"]
+squashfs = ["exav-core/squashfs"]
+cramfs = ["exav-core/cramfs"]
+romfs = ["exav-core/romfs"]
+erofs = ["exav-core/erofs"]
 zoo = ["exav-core/zoo"]
 ishieldz = ["exav-core/ishieldz"]
 pepack = ["exav-core/pepack"]
@@ -142,14 +154,14 @@ dwg = ["exav-core/dwg"]
 pe-emu = ["exav-core/pe-emu"]
 
 [dependencies]
-exav-core = { path = "../exav-core", version = "0.0.2", default-features = false }
+exav-core = { path = "../exav-core", version = "0.0.3", default-features = false }
 # Standalone signature updater (its own TLS stack), enabled by the `http`
 # feature so the default pure-Rust build never links it.
-exav-update = { path = "../exav-update", version = "0.0.2", optional = true }
+exav-update = { path = "../exav-update", version = "0.0.3", optional = true }
 clap.workspace = true
 walkdir.workspace = true
-libc = "0.2.186"
-regex = "1.12.4"
+libc = "0.2.191"
+regex = "1.13.1"
 # Machine-readable `--json` output.
 serde_json = "1"
 # Spilling large INSTREAM/EXINSTREAM payloads to a temp file is `src/tmpfile.rs`,
diff --git a/crates/exav/src/daemon.rs b/crates/exav/src/daemon.rs
index e77bd18f..816b8611 100644
--- a/crates/exav/src/daemon.rs
+++ b/crates/exav/src/daemon.rs
@@ -82,15 +82,34 @@ use std::fs::File;
 use std::io::{self, BufReader, Read, Write};
 use std::net::TcpListener;
 use std::path::Path;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use exav_core::{
-    analyze_all_seekable, scan_path, scan_seekable_located, AllMatchOutcome, ScanOptions,
-    ScanReport, Scanner, Verdict, VerdictCategory,
+    AllMatchOutcome, ScanOptions, ScanReport, Scanner, Verdict, VerdictCategory,
+    analyze_all_seekable, scan_path, scan_seekable_located,
 };
 use walkdir::WalkDir;
 
+/// Whether this daemon honours `SHUTDOWN` and `QUIT`, set once at startup and
+/// inherited by every forked worker, so that `VERSIONCOMMANDS` lists them only
+/// when they work.
+static SHUTDOWN_ALLOWED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+
+/// The `VERSIONCOMMANDS` reply: the version, then the verbs this daemon honours.
+fn versioncommands(version: &str, shutdown: bool, scanurl: bool) -> String {
+    format!(
+        "{version}| COMMANDS: SCAN CONTSCAN MULTISCAN ALLMATCHSCAN INSTREAM EXINSTREAM FILDES \
+         STATS VERSION VERSIONCOMMANDS RELOAD{} PING IDSESSION SESSION END{}",
+        if shutdown { " SHUTDOWN QUIT" } else { "" },
+        if cfg!(feature = "http-scan") && scanurl {
+            " SCANURL"
+        } else {
+            ""
+        }
+    )
+}
+
 /// Worker/thread count advertised as `max` in the clamd-compatible `STATS`
 /// reply. Set once at daemon startup (prefork: the configured worker count) and
 /// inherited by every forked worker via copy-on-write. `0` = unset (unit tests
@@ -109,12 +128,28 @@ fn daemon_max_workers() -> usize {
     }
 }
 
+/// The `STATS` reply: clamd's block, then exav's counters. Under the pool the
+/// counters are shared by every process (`metrics::share_across_fork`), so any
+/// process, the health child included, reports the pool's totals.
+pub(crate) fn stats_reply() -> String {
+    let max = daemon_max_workers();
+    let live = crate::metrics::in_flight();
+    format!(
+        "POOLS: 1\n\nSTATE: VALID PRIMARY\n\
+         THREADS: live {live}  idle 0 max {max} idle-timeout 30\n\
+         QUEUE: {live} items\n\tSTATS 0.000000 \n\n\
+         MEMSTATS: heap N/A mmap N/A used N/A free N/A releasable N/A \
+         pools 1 pools_used N/A pools_total N/A\n{}\nEND",
+        crate::metrics::stats_block()
+    )
+}
+
 /// The clamd-compatible `VERSION` string: `ClamAV <flevel-release>/<db-version>/
 /// <db-build-time>` when a signed container is loaded (what `clamdtop` parses
 /// into its ENGINE / DBVER / DBTIME columns), degrading to just `ClamAV
 /// <release>` for the loose-signature / built-in-baseline case (no container to
 /// report a version for).
-fn clamav_version(db: &Scanner) -> String {
+pub(crate) fn clamav_version(db: &Scanner) -> String {
     match db.db_version() {
         Some((ver, btime)) => format!(
             "ClamAV {}/{}/{}",
@@ -501,6 +536,7 @@ pub fn run(
     max_connections: usize,
 ) -> io::Result<()> {
     use std::sync::atomic::{AtomicUsize, Ordering};
+    SHUTDOWN_ALLOWED.store(allow_shutdown, Ordering::Relaxed);
     let conns = Arc::new(AtomicUsize::new(0));
     // A client that disconnects right after reading a reply delivers SIGPIPE on
     // the next write. `main` set the default disposition, which kills the
@@ -551,10 +587,9 @@ pub fn run(
                         &request_reload,
                         &shutdown,
                         allow_http_scan,
-                    ) {
-                        if !is_benign_disconnect(&e) {
-                            eprintln!("exav: connection error: {e}");
-                        }
+                    ) && !is_benign_disconnect(&e)
+                    {
+                        eprintln!("exav: connection error: {e}");
                     }
                 });
             }
@@ -591,10 +626,9 @@ pub fn run(
                         &request_reload,
                         &shutdown,
                         allow_http_scan,
-                    ) {
-                        if !is_benign_disconnect(&e) {
-                            eprintln!("exav: connection error: {e}");
-                        }
+                    ) && !is_benign_disconnect(&e)
+                    {
+                        eprintln!("exav: connection error: {e}");
                     }
                 });
             }
@@ -705,7 +739,7 @@ fn bind_listener(addr: &ListenAddr) -> io::Result<BoundListener> {
 /// owner can write (`$XDG_RUNTIME_DIR` or `/var/run`), not world-writable
 /// `/tmp`, where another local user can pre-create the path.
 #[cfg(unix)]
-fn bind_unix_socket(
+pub(crate) fn bind_unix_socket(
     path: &std::path::Path,
     mode: u32,
 ) -> io::Result<std::os::unix::net::UnixListener> {
@@ -874,8 +908,8 @@ pub(crate) const SUPERVISOR_TICK: std::time::Duration = std::time::Duration::fro
 /// replaced it.
 #[cfg(unix)]
 struct Retiring {
-    /// The side listener's child rather than a worker.
-    side: bool,
+    /// The name of the side listener this child served, `None` for a worker.
+    name: Option<&'static str>,
     since: std::time::Instant,
     /// Sent SIGTERM for outliving its grace.
     stopped: bool,
@@ -883,9 +917,9 @@ struct Retiring {
 
 #[cfg(unix)]
 impl Retiring {
-    fn new(side: bool, since: std::time::Instant) -> Self {
+    fn new(name: Option<&'static str>, since: std::time::Instant) -> Self {
         Self {
-            side,
+            name,
             since,
             stopped: false,
         }
@@ -1230,6 +1264,11 @@ pub(crate) fn fit_limits_to_job_memory(opts: &mut ScanOptions, job_memory: u64)
     };
     cap(&mut opts.limits.max_buffer_bytes, job_memory / 4);
     cap(&mut opts.deep_analysis_max, job_memory / 4);
+    cap(&mut opts.limits.max_bytecode_memory_bytes, job_memory / 4);
+    // The cache of an object read in place, and one HTTP request held while it
+    // is read, each an eighth of the job's memory at most.
+    cap(&mut opts.object_cache_bytes, job_memory / 8);
+    cap(&mut opts.http_request_bytes, job_memory / 8);
     let object = opts.limits.max_buffer_bytes.max(opts.deep_analysis_max);
     cap(
         &mut opts.limits.max_extracted_bytes,
@@ -1289,10 +1328,11 @@ fn cgroup_limit_from(proc_self_cgroup: &str, read: impl Fn(&str) -> Option<Strin
                 let raw = raw.trim();
                 // v1 reports "unlimited" as a huge page-aligned number rather
                 // than a word; anything past the host's own RAM is no ceiling.
-                if let Ok(v) = raw.parse::<u64>() {
-                    if v > 0 && v < (u64::MAX >> 10) {
-                        limit = Some(limit.map_or(v, |l| l.min(v)));
-                    }
+                if let Ok(v) = raw.parse::<u64>()
+                    && v > 0
+                    && v < (u64::MAX >> 10)
+                {
+                    limit = Some(limit.map_or(v, |l| l.min(v)));
                 }
             }
             match dir.rfind('/') {
@@ -1371,6 +1411,45 @@ fn affordable_job_memory(workers: usize, shared_db_bytes: u64) -> Option<u64> {
     Some((usable / workers.max(1) as u64).max(FLOOR))
 }
 
+/// What the one-shot run has found so far, kept where the alarm's handler can
+/// read it: an atomic is the only state an async-signal-safe handler may read.
+#[cfg(unix)]
+static ONESHOT_INFECTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+#[cfg(unix)]
+static ONESHOT_ERRORS: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+/// The exit code of a run that ran out of time and had found nothing else:
+/// what `--partial-as` gives a `LIMITS-EXCEEDED`.
+#[cfg(unix)]
+static ONESHOT_TIMEOUT_EXIT: std::sync::atomic::AtomicI32 = std::sync::atomic::AtomicI32::new(3);
+
+/// The run's detections and errors so far, for the exit code of a run the alarm
+/// ends. Cheap enough to call after every file.
+pub(crate) fn note_run(infected: u64, errors: u64) {
+    #[cfg(unix)]
+    {
+        use std::sync::atomic::Ordering::Relaxed;
+        ONESHOT_INFECTED.store(infected > 0, Relaxed);
+        ONESHOT_ERRORS.store(errors > 0, Relaxed);
+    }
+    #[cfg(not(unix))]
+    let _ = (infected, errors);
+}
+
+/// The exit code a one-shot run ends with when the alarm cuts it short, by the
+/// same precedence as a run that finished: a detection, then an error, then the
+/// file that ran out of time as `--partial-as` says.
+#[cfg(unix)]
+fn oneshot_exit_code() -> i32 {
+    use std::sync::atomic::Ordering::Relaxed;
+    if ONESHOT_INFECTED.load(Relaxed) {
+        1
+    } else if ONESHOT_ERRORS.load(Relaxed) {
+        2
+    } else {
+        ONESHOT_TIMEOUT_EXIT.load(Relaxed)
+    }
+}
+
 /// Handler for the one-shot CLI's wall-clock alarm.
 ///
 /// Separate from [`on_sigalrm`], which serves a pool worker that a parent will
@@ -1379,16 +1458,15 @@ fn affordable_job_memory(workers: usize, shared_db_bytes: u64) -> Option<u64> {
 /// handler may use.
 #[cfg(unix)]
 extern "C" fn on_oneshot_alarm(_sig: libc::c_int) {
-    const MSG: &[u8] = b"exav: scan exceeded --max-scan-secs\n";
+    const MSG: &[u8] =
+        b"exav: scan exceeded --max-scan-secs; the files after it were not scanned\n";
     unsafe {
         libc::write(2, MSG.as_ptr().cast(), MSG.len());
-        // Exit 3, the `PARTIAL` code, rather than the pool's dedicated timeout
-        // code: a scan that ran out of time is one more object exav declined to
-        // call clean, and it should sort with the others. The handler cannot
-        // consult `--partial-as` (reading it here would not be
-        // async-signal-safe), so a run that folds partials elsewhere still gets
-        // 3 from this path alone.
-        libc::_exit(3)
+        // The code the run would have had: a detection already reported stays
+        // a 1, however the run ended. The file that ran out of time counts as a
+        // `LIMITS-EXCEEDED` under `--partial-as`, read at startup because the
+        // policy cannot be consulted here.
+        libc::_exit(oneshot_exit_code())
     }
 }
 
@@ -1410,6 +1488,14 @@ pub(crate) fn apply_oneshot_limits(max_scan_time: Option<u64>, max_scan_memory:
         set_rlimit(libc::RLIMIT_AS as libc::c_int, bytes);
     }
     if let Some(secs) = max_scan_time {
+        use crate::policy::PartialStatus;
+        let code = match crate::policy::current().for_tag("LIMITS-EXCEEDED") {
+            PartialStatus::Partial => 3,
+            PartialStatus::Ok => 0,
+            PartialStatus::Found => 1,
+            PartialStatus::Error => 2,
+        };
+        ONESHOT_TIMEOUT_EXIT.store(code, std::sync::atomic::Ordering::Relaxed);
         install_handler(libc::SIGALRM, on_oneshot_alarm);
         set_timer(std::time::Duration::from_secs(secs));
     }
@@ -1566,8 +1652,9 @@ pub(crate) fn await_connection(listener: std::os::fd::RawFd, retire: std::os::fd
 /// the volume triggers a reload without sending `RELOAD`. `reload_db` re-reads the
 /// signatures; on a `RELOAD`/SIGUSR2/data-dir change the supervisor calls it,
 /// warms the result, and re-forks the pool with the new DB. A failed reload is
-/// logged and the running DB is kept. `side` is an additional listener served by
-/// one more child, forked, reaped and reloaded exactly as the workers are.
+/// logged and the running DB is kept. Each of `side` is an additional listener
+/// served by a child of its own, forked, reaped and reloaded exactly as the
+/// workers are.
 #[cfg(unix)]
 #[allow(clippy::too_many_arguments)]
 pub fn run_prefork(
@@ -1577,7 +1664,7 @@ pub fn run_prefork(
     mut cfg: PoolConfig,
     mut datadir: Option<Watch>,
     reload_db: &dyn Fn() -> Result<Scanner, String>,
-    side: Option<&SideListener>,
+    side: &[SideListener],
 ) -> io::Result<()> {
     use std::sync::atomic::Ordering;
     // Same SIGPIPE rationale as `run`.
@@ -1599,20 +1686,20 @@ pub fn run_prefork(
     // once the database is loaded and warmed, and both the per-job ceiling and
     // the in-core budget that must sit under it are decided from that figure.
     let db_bytes = current_address_space().unwrap_or(0);
-    if let Some(afford) = affordable_job_memory(cfg.workers, db_bytes) {
-        if cfg.max_memory_bytes > afford {
-            eprintln!(
-                "exav: per-job memory {} MiB x {} workers exceeds what this host can back; \
+    if let Some(afford) = affordable_job_memory(cfg.workers, db_bytes)
+        && cfg.max_memory_bytes > afford
+    {
+        eprintln!(
+            "exav: per-job memory {} MiB x {} workers exceeds what this host can back; \
                  using {} MiB per job (two thirds of RAM, less the {} MiB shared database, \
                  over the workers). Raise RAM, lower --workers, or set a smaller \
                  --max-process-bytes to silence this.",
-                cfg.max_memory_bytes >> 20,
-                cfg.workers,
-                afford >> 20,
-                db_bytes >> 20,
-            );
-            cfg.max_memory_bytes = afford;
-        }
+            cfg.max_memory_bytes >> 20,
+            cfg.workers,
+            afford >> 20,
+            db_bytes >> 20,
+        );
+        cfg.max_memory_bytes = afford;
     }
     let opts = {
         let mut opts = opts;
@@ -1658,15 +1745,21 @@ pub fn run_prefork(
     install_handler(libc::SIGUSR2, on_sigusr2);
     install_handler(libc::SIGCHLD, on_sigchld);
 
-    let mut gen = Generation::new()?;
+    // Before the first fork, so every child counts into the same block and a
+    // `STATS` answered by any of them is the pool's. Without it each process
+    // counts its own jobs, which `STATS` then reports as the pool's.
+    if let Err(e) = crate::metrics::share_across_fork() {
+        eprintln!("exav: the counters stay per process, so STATS shows one process's: {e}");
+    }
+    let mut r#gen = Generation::new()?;
     let mut children = std::collections::HashSet::new();
     for _ in 0..cfg.workers {
-        children.insert(spawn_worker(&listener, &db, &opts, &cfg, &gen)?);
+        children.insert(spawn_worker(&listener, &db, &opts, &cfg, &r#gen)?);
+    }
+    let mut side_pids: Vec<Option<libc::pid_t>> = Vec::with_capacity(side.len());
+    for s in side {
+        side_pids.push(Some(spawn_side(s, &db, &opts, &r#gen)?));
     }
-    let mut side_pid = match side {
-        Some(s) => Some(spawn_side(s, &db, &opts, &gen)?),
-        None => None,
-    };
     // Children of retired generations, still finishing their last job. They
     // are reaped but not replaced, and stopped once their grace has passed.
     let mut retiring: std::collections::HashMap<libc::pid_t, Retiring> =
@@ -1688,35 +1781,27 @@ pub fn run_prefork(
             if pid <= 0 {
                 break; // 0 = none exited yet; <0 = no children / error
             }
-            let side_name = side.map_or("worker", |s| s.name);
+            // A child that died mid-scan (its time ran out) takes its scans in
+            // flight with it.
+            crate::metrics::release(pid);
             if let Some(r) = retiring.remove(&pid) {
-                log_child_exit(pid, status, if r.side { side_name } else { "worker" }, true);
+                log_child_exit(pid, status, r.name.unwrap_or("worker"), true);
                 continue;
             }
-            let is_side = side_pid == Some(pid);
-            if is_side {
-                side_pid = None;
-            } else {
-                children.remove(&pid);
+            let which = side_pids.iter().position(|p| *p == Some(pid));
+            match which {
+                Some(i) => side_pids[i] = None,
+                None => {
+                    children.remove(&pid);
+                }
             }
-            log_child_exit(
-                pid,
-                status,
-                if is_side { side_name } else { "worker" },
-                false,
-            );
+            log_child_exit(pid, status, which.map_or("worker", |i| side[i].name), false);
             if !SHUTDOWN.load(Ordering::Relaxed) {
-                if is_side {
-                    // Unwrapping is sound: `is_side` is only ever true when a
-                    // side listener was configured in the first place.
-                    side_pid = Some(spawn_side(
-                        side.expect("a side listener exited, so there is one"),
-                        &db,
-                        &opts,
-                        &gen,
-                    )?);
-                } else {
-                    children.insert(spawn_worker(&listener, &db, &opts, &cfg, &gen)?);
+                match which {
+                    Some(i) => side_pids[i] = Some(spawn_side(&side[i], &db, &opts, &r#gen)?),
+                    None => {
+                        children.insert(spawn_worker(&listener, &db, &opts, &cfg, &r#gen)?);
+                    }
                 }
             }
         }
@@ -1725,7 +1810,7 @@ pub fn run_prefork(
         if HUP_RECEIVED.swap(false, Ordering::Relaxed) {
             for &pid in children
                 .iter()
-                .chain(side_pid.iter())
+                .chain(side_pids.iter().flatten())
                 .chain(retiring.keys())
             {
                 // SAFETY: signals a child of this process that has not been
@@ -1755,19 +1840,24 @@ pub fn run_prefork(
                     // write end. The side listener goes with them, which is the
                     // whole of its signature swap: it comes back forked from
                     // the new database.
-                    gen = Generation::new()?;
+                    r#gen = Generation::new()?;
                     let since = std::time::Instant::now();
                     retiring.extend(
                         children
                             .drain()
-                            .map(|pid| (pid, Retiring::new(false, since))),
+                            .map(|pid| (pid, Retiring::new(None, since))),
                     );
-                    retiring.extend(side_pid.take().map(|pid| (pid, Retiring::new(true, since))));
+                    for (slot, s) in side_pids.iter_mut().zip(side) {
+                        retiring.extend(
+                            slot.take()
+                                .map(|pid| (pid, Retiring::new(Some(s.name), since))),
+                        );
+                    }
                     for _ in 0..cfg.workers {
-                        children.insert(spawn_worker(&listener, &db, &opts, &cfg, &gen)?);
+                        children.insert(spawn_worker(&listener, &db, &opts, &cfg, &r#gen)?);
                     }
-                    if let Some(s) = side {
-                        side_pid = Some(spawn_side(s, &db, &opts, &gen)?);
+                    for (slot, s) in side_pids.iter_mut().zip(side) {
+                        *slot = Some(spawn_side(s, &db, &opts, &r#gen)?);
                     }
                 }
                 Err(e) => {
@@ -1787,11 +1877,7 @@ pub fn run_prefork(
                 continue;
             };
             if now >= due {
-                let what = if r.side {
-                    side.map_or("worker", |s| s.name)
-                } else {
-                    "worker"
-                };
+                let what = r.name.unwrap_or("worker");
                 eprintln!(
                     "exav: {what} {pid} of a retired generation is still busy after {}s; stopping it",
                     grace.as_secs()
@@ -1813,7 +1899,7 @@ pub fn run_prefork(
     let all: Vec<libc::pid_t> = children
         .iter()
         .copied()
-        .chain(side_pid)
+        .chain(side_pids.iter().flatten().copied())
         .chain(retiring.keys().copied())
         .collect();
     for &pid in &all {
@@ -1882,7 +1968,7 @@ fn spawn_side(
     side: &SideListener,
     db: &Arc<Scanner>,
     opts: &Arc<ScanOptions>,
-    gen: &Generation,
+    r#gen: &Generation,
 ) -> io::Result<libc::pid_t> {
     use std::io::Write as _;
     let _ = io::stderr().flush();
@@ -1893,7 +1979,7 @@ fn spawn_side(
     match pid {
         -1 => Err(io::Error::last_os_error()),
         0 => {
-            let retire = gen.enter();
+            let retire = r#gen.enter();
             child_signals();
             // After the resets above, so the SIGTERM it arranges is the default
             // disposition; a handler inherited from the supervisor would
@@ -1914,7 +2000,7 @@ fn spawn_worker(
     db: &Arc<Scanner>,
     opts: &Arc<ScanOptions>,
     cfg: &PoolConfig,
-    gen: &Generation,
+    r#gen: &Generation,
 ) -> io::Result<libc::pid_t> {
     // Flush so buffered parent output isn't duplicated into the child.
     use std::io::Write as _;
@@ -1924,7 +2010,7 @@ fn spawn_worker(
     let pid = unsafe { libc::fork() };
     match pid {
         -1 => Err(io::Error::last_os_error()),
-        0 => worker_main(listener, db, opts, cfg, supervisor, gen.enter()), // never returns
+        0 => worker_main(listener, db, opts, cfg, supervisor, r#gen.enter()), // never returns
         n => Ok(n),
     }
 }
@@ -1991,6 +2077,7 @@ fn worker_main(
     // `SHUTDOWN` likewise forwards to the supervisor (SIGTERM → graceful
     // teardown of the whole pool). Disabled → report it wasn't honoured.
     let allow_shutdown = cfg.allow_shutdown;
+    SHUTDOWN_ALLOWED.store(allow_shutdown, Ordering::Relaxed);
     let allow_http_scan = cfg.allow_http_scan;
     let shutdown = move || -> bool {
         if allow_shutdown {
@@ -2080,10 +2167,10 @@ fn worker_main(
                 },
             },
         };
-        if let Err(e) = outcome {
-            if !is_benign_disconnect(&e) {
-                eprintln!("exav: connection error: {e}");
-            }
+        if let Err(e) = outcome
+            && !is_benign_disconnect(&e)
+        {
+            eprintln!("exav: connection error: {e}");
         }
         jobs += 1;
         if cfg.max_jobs != 0 && jobs >= cfg.max_jobs {
@@ -2124,13 +2211,13 @@ fn log_child_exit(pid: libc::pid_t, status: libc::c_int, what: &str, retired: bo
 
 /// Command terminator, mirrored from the request onto the reply.
 #[derive(Clone, Copy, PartialEq)]
-enum Delim {
+pub(crate) enum Delim {
     Newline,
     Null,
 }
 
 impl Delim {
-    fn byte(self) -> u8 {
+    pub(crate) fn byte(self) -> u8 {
         match self {
             Delim::Newline => b'\n',
             Delim::Null => b'\0',
@@ -2141,7 +2228,7 @@ impl Delim {
 /// Read one command. Returns `None` at clean end-of-connection. The leading
 /// `z`/`n` prefix (if any) selects the terminator; a bare command is treated as
 /// legacy newline-terminated.
-fn read_command<R: Read>(r: &mut BufReader<R>) -> io::Result<Option<(String, Delim)>> {
+pub(crate) fn read_command<R: Read>(r: &mut BufReader<R>) -> io::Result<Option<(String, Delim)>> {
     let mut first = [0u8; 1];
     if read_full(r, &mut first)? == 0 {
         return Ok(None);
@@ -2174,7 +2261,7 @@ fn read_command<R: Read>(r: &mut BufReader<R>) -> io::Result<Option<(String, Del
                 io::ErrorKind::InvalidData,
                 "command is not valid UTF-8 (a path with non-UTF-8 bytes cannot \
                  be sent over this protocol; scan it by descriptor with FILDES)",
-            ))
+            ));
         }
     };
     Ok(Some((cmd, delim)))
@@ -2450,15 +2537,10 @@ fn dispatch<R: Read>(
         // a verb that is listed but refused is a capability nobody can use.
         // `SCANURL` is therefore listed only when this daemon would honour it:
         // built with `http-scan` and started with `--allow-http-scan`.
-        "VERSIONCOMMANDS" => vec![format!(
-            "{}| COMMANDS: SCAN CONTSCAN MULTISCAN ALLMATCHSCAN INSTREAM EXINSTREAM FILDES \
-             STATS VERSION VERSIONCOMMANDS RELOAD SHUTDOWN QUIT PING IDSESSION SESSION END{}",
-            clamav_version(db),
-            if cfg!(feature = "http-scan") && allow_http_scan {
-                " SCANURL"
-            } else {
-                ""
-            }
+        "VERSIONCOMMANDS" => vec![versioncommands(
+            &clamav_version(db),
+            SHUTDOWN_ALLOWED.load(Ordering::Relaxed),
+            allow_http_scan,
         )],
         // RELOAD is intercepted in `run_command` (it needs the supervisor hook).
         // clamd-compatible status block: POOLS/STATE/THREADS/QUEUE/MEMSTATS/END,
@@ -2473,18 +2555,7 @@ fn dispatch<R: Read>(
         // human or a scraper can read. `QUEUE` reports the scans actually in
         // flight rather than the constant `0 items` a stub would give, since a
         // saturated listener is exactly what someone runs this command to see.
-        "STATS" => {
-            let max = daemon_max_workers();
-            let live = crate::metrics::in_flight();
-            vec![format!(
-                "POOLS: 1\n\nSTATE: VALID PRIMARY\n\
-                 THREADS: live {live}  idle 0 max {max} idle-timeout 30\n\
-                 QUEUE: {live} items\n\tSTATS 0.000000 \n\n\
-                 MEMSTATS: heap N/A mmap N/A used N/A free N/A releasable N/A \
-                 pools 1 pools_used N/A pools_total N/A\n{}\nEND",
-                crate::metrics::stats_block()
-            )]
-        }
+        "STATS" => vec![stats_reply()],
         // clamd's SCAN takes a file OR a directory, and recurses into one. A
         // client that sends a directory and gets `Is a directory ERROR` back is
         // a client that works against clamd and not against exav, which is the
@@ -2512,7 +2583,9 @@ fn dispatch<R: Read>(
             vec![if allow_http_scan {
                 scan_url(db, opts, arg)
             } else {
-                format!("{arg}: SCANURL disabled (the daemon was not started with --allow-http-scan) ERROR")
+                format!(
+                    "{arg}: SCANURL disabled (the daemon was not started with --allow-http-scan) ERROR"
+                )
             }]
         }
         #[cfg(not(feature = "http-scan"))]
@@ -2524,7 +2597,12 @@ fn dispatch<R: Read>(
     Ok(reply)
 }
 
-fn write_reply<W: Write>(w: &mut W, id: Option<u64>, reply: &str, delim: Delim) -> io::Result<()> {
+pub(crate) fn write_reply<W: Write>(
+    w: &mut W,
+    id: Option<u64>,
+    reply: &str,
+    delim: Delim,
+) -> io::Result<()> {
     // In session (IDSESSION) mode each reply MESSAGE is tagged with its command
     // id on its FIRST line only; the remaining lines of a multi-line reply (the
     // STATS block) travel raw, exactly as clamd frames them. Prefixing every line
@@ -2689,13 +2767,29 @@ fn volume_set_lines(
             .collect();
         // `fetch` only ever runs for a name that parses as a part, so a
         // directory of large ordinary files is not read here at all.
-        let verdicts = exav_core::analyze_volume_sets(db, &names, opts, |name| {
+        let mut verdicts = exav_core::analyze_volume_sets(db, &names, opts, |name| {
             let mut data = Vec::new();
             File::open(dir.join(name))?
                 .take(opts.deep_analysis_max.saturating_add(1))
                 .read_to_end(&mut data)?;
             Ok(data)
         });
+        // The sets whose volumes carry their own headers (RAR, ZIP, CAB). A
+        // `.cab` is read by its head to see whether it names a neighbour, and
+        // no name is turned into a path: only names in this directory's list.
+        verdicts.extend(exav_core::analyze_split_sets(
+            db,
+            &names,
+            opts,
+            |name, head| {
+                let limit = head.map_or(opts.deep_analysis_max.saturating_add(1), |n| n as u64);
+                let mut data = Vec::new();
+                File::open(dir.join(name))?
+                    .take(limit)
+                    .read_to_end(&mut data)?;
+                Ok(data)
+            },
+        ));
         for v in verdicts {
             // Named for the archive, not the fragment: `big.7z FOUND …` tells an
             // operator what was actually found, which `big.7z.002` does not.
@@ -2797,7 +2891,11 @@ fn scan_url(db: &Scanner, opts: &ScanOptions, url: &str) -> String {
     if !(url.starts_with("http://") || url.starts_with("https://")) {
         return format!("{url}: SCANURL requires an http(s) URL ERROR");
     }
-    let reader = match exav_core::source::HttpRangeReader::open(url) {
+    let reader = match exav_core::source::HttpRangeReader::open_with(
+        url,
+        opts.object_cache_block_bytes,
+        opts.http_request_bytes,
+    ) {
         Ok(r) => r,
         Err(e) => return format!("{url}: {e} ERROR"),
     };
@@ -2917,7 +3015,7 @@ pub(crate) fn buffer_to_seekable<R: Read>(reader: &mut R) -> io::Result<Held> {
             return Ok(Held {
                 payload: StreamPayload::Mem(buf),
                 short: Some(why),
-            })
+            });
         }
         Err(SpillError::Io(e)) => return Err(e),
     };
@@ -3222,7 +3320,7 @@ fn exinstream_multi<R: Read>(
 
     // Now the multi-volume pass, which is why these are sent together at all.
     // It reads back only the payloads whose names parse as parts.
-    let verdicts = exav_core::analyze_volume_sets(db, &names, opts, |name| {
+    let held_bytes = |name: &str| {
         // First occurrence wins on a repeated name. Two files claiming one
         // volume position make the set ambiguous, and the collector refuses to
         // splice such a set rather than pick between them.
@@ -3235,7 +3333,22 @@ fn exinstream_multi<R: Read>(
             .ok_or_else(|| io::Error::other("stream was not held"))?
             .bytes_capped(opts.deep_analysis_max)?
             .ok_or_else(|| io::Error::other("stream too large to rejoin"))
-    });
+    };
+    let mut verdicts = exav_core::analyze_volume_sets(db, &names, opts, held_bytes);
+    // And the sets whose volumes carry their own headers (RAR, ZIP, CAB), the
+    // heads of `.cab` streams being read to see whether they name a neighbour.
+    verdicts.extend(exav_core::analyze_split_sets(
+        db,
+        &names,
+        opts,
+        |name, head| {
+            let mut data = held_bytes(name)?;
+            if let Some(n) = head {
+                data.truncate(n);
+            }
+            Ok(data)
+        },
+    ));
     for v in verdicts {
         let Some(i) = names.iter().position(|n| *n == v.name) else {
             continue;
@@ -3477,14 +3590,14 @@ impl<R: Read> Read for Instream<'_, R> {
             self.remaining -= n as u32;
             let before = self.total;
             self.total += n as u64;
-            if let Some(max) = self.max {
-                if self.total > max {
-                    // Hand over up to one byte past the limit, so the payload
-                    // holds everything the scan looks at and shows it is over;
-                    // the rest is only counted, by `drain`.
-                    self.over_limit = true;
-                    return Ok((max + 1 - before) as usize);
-                }
+            if let Some(max) = self.max
+                && self.total > max
+            {
+                // Hand over up to one byte past the limit, so the payload
+                // holds everything the scan looks at and shows it is over;
+                // the rest is only counted, by `drain`.
+                self.over_limit = true;
+                return Ok((max + 1 - before) as usize);
             }
             return Ok(n);
         }
@@ -3581,6 +3694,21 @@ mod tests {
         assert_eq!(opts.deep_analysis_max, 250 << 20);
     }
 
+    /// The cache of an object read in place and an HTTP request are held
+    /// memory too: an eighth of the grant each at most.
+    #[test]
+    fn the_cache_and_the_request_fit_the_grant() {
+        let mut opts = ScanOptions::default();
+        opts.object_cache_bytes = 1 << 30;
+        opts.http_request_bytes = 1 << 30;
+        fit_limits_to_job_memory(&mut opts, 400 << 20);
+        assert_eq!(opts.object_cache_bytes, 50 << 20);
+        assert_eq!(opts.http_request_bytes, 50 << 20);
+        let mut opts = ScanOptions::default();
+        fit_limits_to_job_memory(&mut opts, 818 << 20);
+        assert_eq!(opts.object_cache_bytes, 8 << 20);
+    }
+
     /// From live archives scanned with objects allowed up to 2000M in 2 GiB
     /// workers: a ~420 MB member read whole was matched through copies of it
     /// (since removed) and the worker died on the allocation. What matching
@@ -4603,6 +4731,16 @@ mod tests {
         let _ = w.write(b""); // keep w alive until reply read
     }
 
+    /// A verb is listed when it works and not when it is refused, so a client
+    /// that reads the list does not send a command that cannot do anything.
+    #[test]
+    fn versioncommands_lists_shutdown_only_when_it_is_honoured() {
+        assert!(!versioncommands("v", false, false).contains("SHUTDOWN"));
+        assert!(!versioncommands("v", false, false).contains("QUIT"));
+        assert!(versioncommands("v", true, false).contains(" SHUTDOWN QUIT "));
+        assert!(!versioncommands("v", false, false).contains("SCANURL"));
+    }
+
     #[test]
     fn versioncommands_lists_supported_commands() {
         let r = one(b"zVERSIONCOMMANDS\0", 0);
diff --git a/crates/exav/src/endpoint.rs b/crates/exav/src/endpoint.rs
index 00bc815b..1b15d1ff 100644
--- a/crates/exav/src/endpoint.rs
+++ b/crates/exav/src/endpoint.rs
@@ -305,7 +305,7 @@ fn parse_query(query: Option<&str>, whole: &str) -> Result<Options, String> {
                 return Err(format!(
                     "`{whole}`: unknown address option `{other}` \
                      (known: mode, max-connections, service)"
-                ))
+                ));
             }
         }
     }
@@ -420,6 +420,11 @@ impl std::fmt::Display for Endpoint {
 /// would leave the published image's default address unremovable from the
 /// environment, which is where a container is configured.
 pub(crate) fn listeners(values: &[String]) -> Result<Vec<Endpoint>, String> {
+    listeners_of("--listen", values)
+}
+
+/// [`listeners`] for the flag `flag`, which the errors name.
+pub(crate) fn listeners_of(flag: &str, values: &[String]) -> Result<Vec<Endpoint>, String> {
     let mut out: Vec<Endpoint> = Vec::new();
     for v in values.iter().filter(|v| !v.trim().is_empty()) {
         let e = Endpoint::parse(v)?;
@@ -428,7 +433,7 @@ pub(crate) fn listeners(values: &[String]) -> Result<Vec<Endpoint>, String> {
         // is simply never bound while appearing in the command line.
         if let Some(prev) = out.iter().find(|p| p.proto == e.proto) {
             return Err(format!(
-                "--listen {e} and --listen {prev} both serve {}; give one",
+                "{flag} {e} and {flag} {prev} both serve {}; give one",
                 e.proto.as_str()
             ));
         }
diff --git a/crates/exav/src/fuzzing.rs b/crates/exav/src/fuzzing.rs
index 1353f4ed..fc02852e 100644
--- a/crates/exav/src/fuzzing.rs
+++ b/crates/exav/src/fuzzing.rs
@@ -5,7 +5,7 @@
 use exav_core::{ScanOptions, Scanner};
 use std::io::{self, Cursor, Read};
 
-use crate::daemon::{handle_conn, FdSource};
+use crate::daemon::{FdSource, handle_conn};
 
 /// A connection's bytes, from memory. A transport that cannot pass a
 /// descriptor, as TCP cannot.
diff --git a/crates/exav/src/health.rs b/crates/exav/src/health.rs
new file mode 100644
index 00000000..e2beed8f
--- /dev/null
+++ b/crates/exav/src/health.rs
@@ -0,0 +1,352 @@
+//! Health listeners (`--listen-health`): an address that answers "are you
+//! there?" and nothing else, in the protocol of its scheme.
+//!
+//! Why a listener of its own. The clamd pool's workers take one job at a time
+//! and accept from the kernel's backlog, so a `PING` sent while every worker is
+//! in a long scan waits for one to finish, and a container health check that
+//! times out restarts a daemon that is only busy. Nothing here scans, loads a
+//! database or waits for a worker, so it answers however the rest is doing:
+//!
+//! * `clamd://…` answers `PING` with `PONG`, `VERSION` with the version line
+//!   and `STATS` with the pool's totals (the counters are shared by the
+//!   processes of the pool), and any other command with an error that names the
+//!   listener.
+//! * `icap://…` answers `OPTIONS`, and `405` to a method that would adapt
+//!   anything.
+//!
+//! Under the pool the listeners are served by one child of their own, forked,
+//! reaped and re-forked with the workers; in the thread model by threads. Each
+//! connection gets a thread, up to `?max-connections=` (64 by default), and a
+//! client has [`CLIENT_TIMEOUT`] to say its piece, so a listener nobody
+//! authenticates cannot be used to hold threads.
+
+use std::io::{self, BufRead, BufReader, Read, Write};
+use std::net::TcpListener;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::time::Duration;
+
+use crate::daemon;
+use crate::endpoint::{Addr, Endpoint, Proto};
+
+/// Connections served at once unless the address says (`?max-connections=`).
+pub(crate) const DEFAULT_MAX_CONNECTIONS: usize = 64;
+
+/// How long a client has to send its request, and to take the reply.
+const CLIENT_TIMEOUT: Duration = Duration::from_secs(5);
+
+/// The longest an ICAP request head is read.
+const ICAP_HEAD_MAX: u64 = 8192;
+
+/// What `OPTIONS` is answered with: the one method, and no body.
+const ICAP_OPTIONS: &str = "ICAP/1.0 200 OK\r\nMethods: OPTIONS\r\nService: exav health\r\n\
+                            ISTag: \"exav-health\"\r\nEncapsulated: null-body=0\r\n\
+                            Connection: close\r\n\r\n";
+
+/// What any other method is answered with.
+const ICAP_NOT_ALLOWED: &str = "ICAP/1.0 405 Method Not Allowed\r\nService: exav health\r\n\
+                                ISTag: \"exav-health\"\r\nEncapsulated: null-body=0\r\n\
+                                Connection: close\r\n\r\n";
+
+enum Sock {
+    Tcp(TcpListener),
+    #[cfg(unix)]
+    Unix(std::os::unix::net::UnixListener),
+}
+
+/// A bound health listener.
+pub(crate) struct Listener {
+    sock: Sock,
+    proto: Proto,
+    max: usize,
+    /// For the log.
+    name: String,
+}
+
+type Halves = (Box<dyn Read + Send>, Box<dyn Write + Send>);
+
+impl Listener {
+    /// Binds `e`, before anything is forked, so a busy port is reported by the
+    /// process that was asked to listen.
+    pub(crate) fn bind(e: &Endpoint) -> io::Result<Self> {
+        let sock = match &e.addr {
+            Addr::Tcp(a) => Sock::Tcp(TcpListener::bind(a)?),
+            #[cfg(unix)]
+            Addr::Unix { path, mode } => Sock::Unix(daemon::bind_unix_socket(
+                path,
+                mode.unwrap_or(daemon::DEFAULT_SOCKET_MODE),
+            )?),
+            #[cfg(not(unix))]
+            Addr::Unix { .. } => {
+                return Err(io::Error::other(
+                    "a Unix-socket address needs a Unix platform",
+                ));
+            }
+        };
+        Ok(Listener {
+            sock,
+            proto: e.proto,
+            max: e.max_connections.unwrap_or(DEFAULT_MAX_CONNECTIONS),
+            name: e.to_string(),
+        })
+    }
+
+    #[cfg(unix)]
+    fn raw_fd(&self) -> std::os::fd::RawFd {
+        use std::os::fd::AsRawFd;
+        match &self.sock {
+            Sock::Tcp(l) => l.as_raw_fd(),
+            Sock::Unix(l) => l.as_raw_fd(),
+        }
+    }
+
+    #[cfg(unix)]
+    fn set_nonblocking(&self) -> io::Result<()> {
+        match &self.sock {
+            Sock::Tcp(l) => l.set_nonblocking(true),
+            Sock::Unix(l) => l.set_nonblocking(true),
+        }
+    }
+
+    fn accept(&self) -> io::Result<Halves> {
+        match &self.sock {
+            Sock::Tcp(l) => {
+                let (s, _) = l.accept()?;
+                // An accepted socket can inherit the listener's non-blocking mode.
+                s.set_nonblocking(false)?;
+                s.set_read_timeout(Some(CLIENT_TIMEOUT))?;
+                s.set_write_timeout(Some(CLIENT_TIMEOUT))?;
+                let w = s.try_clone()?;
+                Ok((Box::new(s), Box::new(w)))
+            }
+            #[cfg(unix)]
+            Sock::Unix(l) => {
+                let (s, _) = l.accept()?;
+                s.set_nonblocking(false)?;
+                s.set_read_timeout(Some(CLIENT_TIMEOUT))?;
+                s.set_write_timeout(Some(CLIENT_TIMEOUT))?;
+                let w = s.try_clone()?;
+                Ok((Box::new(s), Box::new(w)))
+            }
+        }
+    }
+}
+
+/// The version line `VERSION` answers.
+pub(crate) type Version = Arc<dyn Fn() -> String + Send + Sync>;
+
+/// Serves `l` until the generation `retire` belongs to is retired (never, when
+/// there is none). A connection is a thread, counted against the listener's
+/// limit; one past it is closed unanswered.
+fn serve(l: &Listener, version: &Version, retire: Option<i32>) {
+    let live = Arc::new(AtomicUsize::new(0));
+    loop {
+        #[cfg(unix)]
+        if let Some(fd) = retire
+            && !daemon::await_connection(l.raw_fd(), fd)
+        {
+            return;
+        }
+        #[cfg(not(unix))]
+        let _ = retire;
+        match l.accept() {
+            Ok((r, w)) => {
+                if live.fetch_add(1, Ordering::Relaxed) >= l.max {
+                    live.fetch_sub(1, Ordering::Relaxed);
+                    continue;
+                }
+                let (live, version, proto) = (Arc::clone(&live), Arc::clone(version), l.proto);
+                std::thread::spawn(move || {
+                    handle(proto, r, w, version.as_ref());
+                    live.fetch_sub(1, Ordering::Relaxed);
+                });
+            }
+            Err(e)
+                if matches!(
+                    e.kind(),
+                    io::ErrorKind::WouldBlock | io::ErrorKind::Interrupted
+                ) => {}
+            Err(e) => {
+                eprintln!("exav: health: accept on {} failed: {e}", l.name);
+                std::thread::sleep(Duration::from_millis(50));
+            }
+        }
+    }
+}
+
+/// One connection, in the protocol of its listener.
+fn handle(
+    proto: Proto,
+    r: Box<dyn Read + Send>,
+    mut w: Box<dyn Write + Send>,
+    version: &dyn Fn() -> String,
+) {
+    match proto {
+        Proto::Clamd => clamd(r, &mut w, version),
+        Proto::Icap => icap(r, &mut w),
+    }
+}
+
+/// `PING` and `VERSION`, a few to a connection as clamd's sessions allow.
+fn clamd(r: Box<dyn Read + Send>, mut w: &mut dyn Write, version: &dyn Fn() -> String) {
+    let mut r = BufReader::new(r);
+    for _ in 0..8 {
+        let Ok(Some((cmd, delim))) = daemon::read_command(&mut r) else {
+            return;
+        };
+        let word = cmd.split_whitespace().next().unwrap_or("");
+        let reply = if word.eq_ignore_ascii_case("PING") {
+            "PONG".to_string()
+        } else if word.eq_ignore_ascii_case("VERSION") {
+            version()
+        } else if word.eq_ignore_ascii_case("STATS") {
+            daemon::stats_reply()
+        } else {
+            "health listener: only PING, VERSION and STATS are answered ERROR".to_string()
+        };
+        if daemon::write_reply(&mut w, None, &reply, delim).is_err() {
+            return;
+        }
+    }
+}
+
+/// `OPTIONS`, and a refusal of everything else. The request head is read, so a
+/// client that sent it whole is not reset on the reply.
+fn icap(r: Box<dyn Read + Send>, w: &mut dyn Write) {
+    let mut r = BufReader::new(r.take(ICAP_HEAD_MAX));
+    let mut line = String::new();
+    if r.read_line(&mut line).unwrap_or(0) == 0 {
+        return;
+    }
+    loop {
+        let mut header = String::new();
+        match r.read_line(&mut header) {
+            Ok(0) | Err(_) => break,
+            Ok(_) if header.trim().is_empty() => break,
+            Ok(_) => {}
+        }
+    }
+    let reply = if line
+        .split_whitespace()
+        .next()
+        .is_some_and(|m| m.eq_ignore_ascii_case("OPTIONS"))
+    {
+        ICAP_OPTIONS
+    } else {
+        ICAP_NOT_ALLOWED
+    };
+    let _ = w.write_all(reply.as_bytes());
+    let _ = w.flush();
+}
+
+/// The thread model: each listener on a thread of its own.
+pub(crate) fn spawn(listeners: Vec<Listener>, version: Version) {
+    for l in listeners {
+        eprintln!("exav: health listener on {}", l.name);
+        let version = Arc::clone(&version);
+        std::thread::spawn(move || serve(&l, &version, None));
+    }
+}
+
+/// The pool: one child serves every health listener. It never touches a worker
+/// or the scan path, and a reload re-forks it with the rest, which is all it
+/// needs (the version line is read from the new database).
+#[cfg(unix)]
+pub(crate) fn side_listener(listeners: Vec<Listener>) -> daemon::SideListener {
+    let listeners: Vec<Arc<Listener>> = listeners.into_iter().map(Arc::new).collect();
+    daemon::SideListener {
+        name: "health",
+        serve: Box::new(move |db, _opts, retire| {
+            let line = daemon::clamav_version(&db);
+            let version: Version = Arc::new(move || line.clone());
+            let mut threads = Vec::new();
+            for l in &listeners {
+                if let Err(e) = l.set_nonblocking() {
+                    eprintln!("exav: health: listener stopped: {e}");
+                    std::process::exit(2);
+                }
+                eprintln!("exav: health listener on {}", l.name);
+                let (l, version) = (Arc::clone(l), Arc::clone(&version));
+                threads.push(std::thread::spawn(move || {
+                    serve(&l, &version, Some(retire))
+                }));
+            }
+            let ok = threads.into_iter().all(|t| t.join().is_ok());
+            std::process::exit(if ok { 0 } else { 2 });
+        }),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::io::Cursor;
+
+    fn answer(proto: Proto, request: &[u8]) -> String {
+        let r: Box<dyn Read + Send> = Box::new(Cursor::new(request.to_vec()));
+        let out = Arc::new(std::sync::Mutex::new(Vec::new()));
+        struct Sink(Arc<std::sync::Mutex<Vec<u8>>>);
+        impl Write for Sink {
+            fn write(&mut self, b: &[u8]) -> io::Result<usize> {
+                self.0.lock().unwrap().extend_from_slice(b);
+                Ok(b.len())
+            }
+            fn flush(&mut self) -> io::Result<()> {
+                Ok(())
+            }
+        }
+        handle(proto, r, Box::new(Sink(Arc::clone(&out))), &|| {
+            "ClamAV test".to_string()
+        });
+        String::from_utf8_lossy(&out.lock().unwrap()).into_owned()
+    }
+
+    #[test]
+    fn clamd_answers_ping_and_version_in_either_framing() {
+        assert_eq!(answer(Proto::Clamd, b"zPING\0"), "PONG\0");
+        assert_eq!(answer(Proto::Clamd, b"nPING\n"), "PONG\n");
+        assert_eq!(answer(Proto::Clamd, b"PING\n"), "PONG\n");
+        assert_eq!(answer(Proto::Clamd, b"nVERSION\n"), "ClamAV test\n");
+        assert_eq!(
+            answer(Proto::Clamd, b"nping\nnVERSION\n"),
+            "PONG\nClamAV test\n"
+        );
+    }
+
+    #[test]
+    fn clamd_answers_nothing_that_scans() {
+        for cmd in [&b"nSCAN /etc/passwd\n"[..], b"nINSTREAM\n", b"nRELOAD\n"] {
+            let reply = answer(Proto::Clamd, cmd);
+            assert!(
+                reply.contains("only PING, VERSION and STATS") && reply.ends_with("ERROR\n"),
+                "{reply}"
+            );
+        }
+    }
+
+    #[test]
+    fn clamd_answers_stats_with_the_counters() {
+        let reply = answer(Proto::Clamd, b"nSTATS\n");
+        assert!(reply.starts_with("POOLS: 1"), "{reply}");
+        assert!(reply.contains("SCANSTATS: scans "), "{reply}");
+        assert!(reply.trim_end().ends_with("END"), "{reply}");
+    }
+
+    #[test]
+    fn icap_answers_options_and_refuses_the_methods_that_adapt() {
+        let options = answer(
+            Proto::Icap,
+            b"OPTIONS icap://h/avscan ICAP/1.0\r\nHost: h\r\n\r\n",
+        );
+        assert!(options.starts_with("ICAP/1.0 200 OK\r\n"), "{options}");
+        assert!(options.contains("Methods: OPTIONS"));
+        for method in ["REQMOD", "RESPMOD"] {
+            let reply = answer(
+                Proto::Icap,
+                format!("{method} icap://h/avscan ICAP/1.0\r\nHost: h\r\n\r\n").as_bytes(),
+            );
+            assert!(reply.starts_with("ICAP/1.0 405 "), "{reply}");
+        }
+        assert_eq!(answer(Proto::Icap, b""), "");
+    }
+}
diff --git a/crates/exav/src/icap/mod.rs b/crates/exav/src/icap/mod.rs
index 2f1395ae..c98af2cf 100644
--- a/crates/exav/src/icap/mod.rs
+++ b/crates/exav/src/icap/mod.rs
@@ -104,9 +104,9 @@ mod server;
 mod wire;
 
 pub(crate) use self::config::{IcapConfig, InfectionHeader};
+pub(crate) use self::server::Server;
 #[cfg(feature = "fuzzing")]
 pub(crate) use self::server::fuzz_exchange;
-pub(crate) use self::server::Server;
 
 #[cfg(unix)]
 use self::server::FixedDb;
diff --git a/crates/exav/src/icap/server.rs b/crates/exav/src/icap/server.rs
index 649991f1..7bdb0e9c 100644
--- a/crates/exav/src/icap/server.rs
+++ b/crates/exav/src/icap/server.rs
@@ -13,12 +13,12 @@ use std::net::{SocketAddr, TcpListener, TcpStream};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
 
-use exav_core::{scan_seekable_located, ScanOptions, Scanner};
+use exav_core::{ScanOptions, Scanner, scan_seekable_located};
 
-use super::chunked::{read_chunked_body, Body, BodyEnd, BodyError, BodyOutcome};
+use super::chunked::{Body, BodyEnd, BodyError, BodyOutcome, read_chunked_body};
 use super::config::IcapConfig;
 use super::response::{self, Decision};
-use super::wire::{read_head, Entity, IcapMethod, RequestHead};
+use super::wire::{Entity, IcapMethod, RequestHead, read_head};
 use crate::daemon::Held;
 
 /// Supplies the signature database to scan the next request with.
@@ -112,7 +112,7 @@ impl Server {
                         std::io::ErrorKind::WouldBlock | std::io::ErrorKind::Interrupted
                     ) =>
                 {
-                    continue
+                    continue;
                 }
                 // One failed accept (a client that vanished between the SYN and
                 // the accept, say) is not a reason to stop serving.
@@ -532,11 +532,11 @@ fn modify<R: BufRead, W: Write>(
 /// the budget first is the reason, and the later read must not overwrite it with
 /// `None`.
 fn take_rejection(slot: &mut Option<String>, outcome: &BodyOutcome) {
-    if let Some(reason) = &outcome.rejected {
-        if slot.is_none() {
-            eprintln!("exav: icap: cannot buffer this object: {reason}");
-            *slot = Some(reason.clone());
-        }
+    if let Some(reason) = &outcome.rejected
+        && slot.is_none()
+    {
+        eprintln!("exav: icap: cannot buffer this object: {reason}");
+        *slot = Some(reason.clone());
     }
 }
 
diff --git a/crates/exav/src/icap/wire.rs b/crates/exav/src/icap/wire.rs
index 67c6c605..8cf1ea82 100644
--- a/crates/exav/src/icap/wire.rs
+++ b/crates/exav/src/icap/wire.rs
@@ -95,7 +95,7 @@ pub(super) fn read_head<R: BufRead>(r: &mut R, max: usize) -> io::Result<Option<
                         io::ErrorKind::UnexpectedEof,
                         "connection closed inside an ICAP head",
                     ))
-                }
+                };
             }
         };
         let blank = line == b"\r\n" || line == b"\n";
diff --git a/crates/exav/src/main.rs b/crates/exav/src/main.rs
index 21e83a9c..5862befa 100644
--- a/crates/exav/src/main.rs
+++ b/crates/exav/src/main.rs
@@ -30,6 +30,7 @@ mod endpoint;
 // the fuzz targets (the `fuzzing` feature is that crate's).
 #[cfg(feature = "fuzzing")]
 pub mod fuzzing;
+mod health;
 #[cfg(feature = "icap")]
 mod icap;
 mod metrics;
@@ -45,7 +46,7 @@ use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 
 use clap::Parser;
-use exav_core::{loader, scan_path, ScanOptions, ScanReport, Scanner, Verdict, VerdictCategory};
+use exav_core::{ScanOptions, ScanReport, Scanner, Verdict, VerdictCategory, loader, scan_path};
 
 /// Categories the daemon names before the closing ` ERROR` when a verdict is
 /// `PARTIAL`, as opposed to a hard scan error, which has no category. The
@@ -448,6 +449,32 @@ struct Cli {
     )]
     listen: Vec<String>,
 
+    /// Also answer "are you there?" on this address, and nothing else.
+    /// Repeatable (comma-separated in the environment); no address is opened
+    /// without it. Needs --listen.
+    ///
+    ///   clamd://0.0.0.0:3311   `PING` is `PONG` and `VERSION` the version, in
+    ///                          the clamd protocol; any other command is
+    ///                          refused
+    ///   icap://0.0.0.0:1345    `OPTIONS` is answered, `REQMOD` and `RESPMOD`
+    ///                          get 405
+    ///
+    /// The scan listeners answer a `PING` when a worker is free, and under
+    /// load that can be a while: a health check that times out restarts a
+    /// daemon that is only busy. This address does no scanning and waits for
+    /// no worker, so it answers whatever the rest is doing: point the health
+    /// check at it. `exav --ping` does so on its own when the same
+    /// configuration names one. It takes `?max-connections=` like --listen
+    /// (default 64), and a client has five seconds to send its request.
+    #[arg(
+        long = "listen-health",
+        value_name = "ADDR",
+        env = "EXAV_LISTEN_HEALTH",
+        value_delimiter = ',',
+        verbatim_doc_comment
+    )]
+    listen_health: Vec<String>,
+
     /// Scan by handing each file to a daemon already running at this address,
     /// instead of loading a database here. Same address grammar as --listen,
     /// but a bare address: query options (`?mode=`, `?max-connections=`,
@@ -761,6 +788,87 @@ struct Cli {
     )]
     max_buffer_bytes: Option<u64>,
 
+    /// The most bytes of members that a format decodes whole into memory
+    /// (RAR, OLE streams, PDF streams, RTF objects, installers and the like),
+    /// summed over one scan and never released. A member streamed to the
+    /// matcher (ZIP, 7z, TAR, CAB and the stream codecs) is not counted: those
+    /// are bounded by --max-matcher-bytes. K/M/G/T suffixes; `off` or `0` means
+    /// no limit. [default: 1G, 400M under --clamav-compat]
+    ///
+    /// This is what bounds the memory a scan holds in extracted members, so
+    /// raise it with the memory to hold them: under --max-process-bytes (and in
+    /// the worker pool, which sets one) it is lowered to what fits that memory,
+    /// and raising it past that changes nothing.
+    #[arg(
+        long = "max-extracted-bytes",
+        env = "EXAV_MAX_EXTRACTED_BYTES",
+        value_name = "SIZE|off",
+        value_parser = parse_size
+    )]
+    max_extracted_bytes: Option<u64>,
+
+    /// The memory one run of a bytecode signature may hold in all: its
+    /// `malloc`s, the frames of its calls and the globals it reads. K/M/G/T
+    /// suffixes; `off` or `0` means no limit. [default: 256M]
+    ///
+    /// A run that reaches it stops as incomplete (the signature is not
+    /// evaluated, and the scan says so); no signature of ClamAV's own needs
+    /// more than a few megabytes. Under --max-process-bytes the runs of a scan
+    /// together still fit that memory.
+    #[arg(
+        long = "max-bytecode-memory-bytes",
+        env = "EXAV_MAX_BYTECODE_MEMORY_BYTES",
+        value_name = "SIZE|off",
+        value_parser = parse_size
+    )]
+    max_bytecode_memory_bytes: Option<u64>,
+
+    /// Memory of the block cache held for an object read in place instead of
+    /// held whole: a file past --max-object-bytes, a member or view spilled to
+    /// disk, a http(s):// input. One cache per such object being scanned, the
+    /// nested ones included. K/M/G/T suffixes. [default: 8M]
+    ///
+    /// A larger cache refetches less when a scan goes back to what it read
+    /// (signature verification, an archive's directory); it costs that much
+    /// memory per object. Never below two blocks.
+    #[arg(
+        long = "object-cache-bytes",
+        env = "EXAV_OBJECT_CACHE_BYTES",
+        value_name = "SIZE",
+        value_parser = parse_size
+    )]
+    object_cache_bytes: Option<u64>,
+
+    /// One block of that cache: the unit read from the object at a time, and
+    /// over http(s):// what a request at an offset away from the last one
+    /// fetches. K/M/G/T suffixes. [default: 1M]
+    ///
+    /// Larger blocks make fewer requests for reads that land at scattered
+    /// offsets, and fetch more bytes than those reads use. Against a 300 MB
+    /// object, 1M took 2.5 times less time than 64K at 100 ms a request, and
+    /// 4M no less than 1M.
+    #[arg(
+        long = "object-cache-block-bytes",
+        env = "EXAV_OBJECT_CACHE_BLOCK_BYTES",
+        value_name = "SIZE",
+        value_parser = parse_size
+    )]
+    object_cache_block_bytes: Option<u64>,
+
+    /// Over http(s)://, the most one range request fetches. A read that goes
+    /// on from where the last stopped asks for twice as much each time, from
+    /// one block up to this. K/M/G/T suffixes. [default: 8M]
+    ///
+    /// A pass through a large object costs one request per this many bytes,
+    /// and holds this much in memory while it is read.
+    #[arg(
+        long = "http-request-bytes",
+        env = "EXAV_HTTP_REQUEST_BYTES",
+        value_name = "SIZE",
+        value_parser = parse_size
+    )]
+    http_request_bytes: Option<u64>,
+
     /// The most bytes fed to the matcher for one top-level file: its members,
     /// decoded payloads and carved regions, summed. A **CPU/time** bound, not a
     /// memory one: a streamed member is scanned without being held, so this can
@@ -1284,6 +1392,18 @@ fn listeners(cli: &Cli) -> Result<Vec<endpoint::Endpoint>, String> {
     endpoint::listeners(&cli.listen)
 }
 
+/// The `VERSION` line of the database a thread-model daemon serves now.
+fn shared_version(shared: &std::sync::Arc<daemon::SharedDb>) -> health::Version {
+    let shared = std::sync::Arc::clone(shared);
+    std::sync::Arc::new(move || daemon::clamav_version(&shared.current()))
+}
+
+/// The health listeners this run asks for, a malformed one having stopped the
+/// run at startup already.
+fn health_endpoints(cli: &Cli) -> Vec<endpoint::Endpoint> {
+    endpoint::listeners_of("--listen-health", &cli.listen_health).unwrap_or_default()
+}
+
 /// The clamd endpoint, if one was asked for.
 fn clamd_endpoint(cli: &Cli) -> Option<endpoint::Endpoint> {
     listeners(cli)
@@ -1501,19 +1621,11 @@ fn clamscan_flag_hint(args: &[String]) -> Option<String> {
 /// does not, with what replaced it. The variable is checked too: clap ignores
 /// one it does not know, which would drop the setting without a word.
 fn removed_flag(args: &[String]) -> Option<String> {
-    const REMOVED: [(&str, &str, &str); 2] = [
-        (
-            "--max-extracted-bytes",
-            "EXAV_MAX_EXTRACTED_BYTES",
-            "--max-process-bytes bounds the memory a scan may use, and \
-             --max-object-bytes one object",
-        ),
-        (
-            "--build-shard-bytes",
-            "EXAV_BUILD_SHARD_BYTES",
-            "building a database no longer has a matcher to split",
-        ),
-    ];
+    const REMOVED: [(&str, &str, &str); 1] = [(
+        "--build-shard-bytes",
+        "EXAV_BUILD_SHARD_BYTES",
+        "building a database no longer has a matcher to split",
+    )];
     REMOVED.iter().find_map(|&(flag, var, instead)| {
         let said = format!("{flag} was removed in 0.0.2: {instead}");
         if args.iter().any(|a| a.split('=').next() == Some(flag)) {
@@ -1636,11 +1748,11 @@ fn main() -> ExitCode {
     // rather than after a long scan whose results then have nowhere to go, and
     // before the role is chosen so a long-running listener gets the same file a
     // one-shot scan does.
-    if let Some(path) = cli.log.clone() {
-        if let Err(e) = log_open(&path) {
-            eprintln!("exav: --log {}: {e}", path.display());
-            return ExitCode::from(2);
-        }
+    if let Some(path) = cli.log.clone()
+        && let Err(e) = log_open(&path)
+    {
+        eprintln!("exav: --log {}: {e}", path.display());
+        return ExitCode::from(2);
     }
 
     // Expand --files-from into `paths` FIRST, so every downstream mode (local,
@@ -1665,14 +1777,14 @@ fn main() -> ExitCode {
     // Fail fast like --files-from: a run that cannot read its passwords must
     // not scan under fewer than asked for. Skipped for a --connect client,
     // which hands files to the daemon and never scans itself.
-    if cli.connect.is_none() {
-        if let Some(list) = cli.passwords_from.clone() {
-            match read_password_list(&list) {
-                Ok(mut extra) => cli.password.append(&mut extra),
-                Err(e) => {
-                    eprintln!("exav: --passwords-from {}: {e}", list.display());
-                    return ExitCode::from(2);
-                }
+    if cli.connect.is_none()
+        && let Some(list) = cli.passwords_from.clone()
+    {
+        match read_password_list(&list) {
+            Ok(mut extra) => cli.password.append(&mut extra),
+            Err(e) => {
+                eprintln!("exav: --passwords-from {}: {e}", list.display());
+                return ExitCode::from(2);
             }
         }
     }
@@ -1683,6 +1795,10 @@ fn main() -> ExitCode {
         eprintln!("exav: --listen: {e}");
         return ExitCode::from(2);
     }
+    if let Err(e) = endpoint::listeners_of("--listen-health", &cli.listen_health) {
+        eprintln!("exav: --listen-health: {e}");
+        return ExitCode::from(2);
+    }
 
     // Client mode: `--connect` with paths delegates the scan to a running
     // daemon (no DB load here). The direction is the flag, so there is nothing
@@ -1721,11 +1837,9 @@ fn main() -> ExitCode {
             signatures::Reload::Watch
         };
         if cli.auto_update {
-            if updater_only {
-                if let Some(msg) = signatures::updater_only_error(&cli) {
-                    eprintln!("exav: {msg}");
-                    return ExitCode::from(2);
-                }
+            if updater_only && let Some(msg) = signatures::updater_only_error(&cli) {
+                eprintln!("exav: {msg}");
+                return ExitCode::from(2);
             }
             match signatures::start(&mut cli, reload) {
                 Ok(a) => a,
@@ -1811,18 +1925,19 @@ fn main() -> ExitCode {
         // the limit reporting this flag exists to give. A mistyped `1M` for `1G`
         // should say so rather than look like a crash in the scanner.
         const MIN_PROCESS_BYTES: u64 = 64 << 20;
-        if let Some(cap) = cli.max_scan_memory {
-            if cap != 0 && cap < MIN_PROCESS_BYTES {
-                eprintln!(
-                    "exav: --max-process-bytes {} MiB is below the {} MiB this process needs to \
+        if let Some(cap) = cli.max_scan_memory
+            && cap != 0
+            && cap < MIN_PROCESS_BYTES
+        {
+            eprintln!(
+                "exav: --max-process-bytes {} MiB is below the {} MiB this process needs to \
                      start at all: the cap covers exav itself and the signature database, not \
                      just a scan's buffers. Raise it (a real database wants ~2G), or pass `off` \
                      for no cap and bound the scan with --max-input-bytes/--max-object-bytes.",
-                    cap >> 20,
-                    MIN_PROCESS_BYTES >> 20,
-                );
-                return ExitCode::from(2);
-            }
+                cap >> 20,
+                MIN_PROCESS_BYTES >> 20,
+            );
+            return ExitCode::from(2);
         }
         // A memory cap is still meaningful for the thread-model daemon: it
         // bounds the process, which is all there is to bound.
@@ -1907,10 +2022,10 @@ fn main() -> ExitCode {
     // an address space the operator just asked for, and the kernel wins, so a
     // scan that should report a limit gets killed for hitting one.
     #[cfg(unix)]
-    if pool_workers == 0 {
-        if let Some(bytes) = cli.max_scan_memory {
-            daemon::fit_limits_to_job_memory(&mut opts, bytes);
-        }
+    if pool_workers == 0
+        && let Some(bytes) = cli.max_scan_memory
+    {
+        daemon::fit_limits_to_job_memory(&mut opts, bytes);
     }
     let opts = opts;
 
@@ -2039,10 +2154,10 @@ fn run_listeners(
     // the operator asked for, or the kernel wins and a scan that should report
     // a limit is killed instead.
     #[cfg(unix)]
-    if pool_workers == 0 {
-        if let Some(bytes) = cli.max_scan_memory {
-            daemon::fit_limits_to_job_memory(&mut opts, bytes);
-        }
+    if pool_workers == 0
+        && let Some(bytes) = cli.max_scan_memory
+    {
+        daemon::fit_limits_to_job_memory(&mut opts, bytes);
     }
     let opts = opts;
 
@@ -2081,6 +2196,20 @@ fn run_listeners(
         None
     };
 
+    // Bound with the others, before anything is forked or spawned, so a busy
+    // port is reported by the process that was asked to listen.
+    let health: Vec<health::Listener> = match health_endpoints(cli)
+        .iter()
+        .map(health::Listener::bind)
+        .collect()
+    {
+        Ok(h) => h,
+        Err(e) => {
+            eprintln!("exav: --listen-health: {e}");
+            return ExitCode::from(2);
+        }
+    };
+
     let db = std::sync::Arc::new(db);
     let opts = std::sync::Arc::new(opts);
 
@@ -2100,6 +2229,7 @@ fn run_listeners(
         // here at all and the log is the only channel the totals have.
         metrics::spawn_reporter(metrics_interval(cli), "icap");
         let shared = std::sync::Arc::new(daemon::SharedDb::new(db));
+        health::spawn(health, shared_version(&shared));
         icap::spawn(server, std::sync::Arc::clone(&shared), opts);
         daemon::supervise(&shared, watch, &reload);
     }
@@ -2148,11 +2278,16 @@ fn run_listeners(
             allow_shutdown: shutdown_allowed(cli.allow_shutdown),
             allow_http_scan: cli.allow_http_scan,
         };
+        // One child each, forked and re-forked with the workers: ICAP for its
+        // long-lived connections, and the health listeners, which no worker
+        // may be needed to answer.
+        let mut side: Vec<daemon::SideListener> = Vec::new();
         #[cfg(feature = "icap")]
-        let icap_child = icap_server.map(|s| icap::forked_child(s, metrics_interval(cli)));
-        #[cfg(not(feature = "icap"))]
-        let icap_child: Option<daemon::SideListener> = None;
-        return match daemon::run_prefork(db, addr, opts, cfg, watch, &reload, icap_child.as_ref()) {
+        side.extend(icap_server.map(|s| icap::forked_child(s, metrics_interval(cli))));
+        if !health.is_empty() {
+            side.push(health::side_listener(health));
+        }
+        return match daemon::run_prefork(db, addr, opts, cfg, watch, &reload, &side) {
             Ok(()) => ExitCode::SUCCESS,
             Err(e) => {
                 eprintln!("exav: daemon error: {e}");
@@ -2176,6 +2311,7 @@ fn run_listeners(
     // `SIG_DFL` until that thread got there: a window in which a proxy hanging
     // up mid-response kills the whole process.
     ignore_sigpipe();
+    health::spawn(health, shared_version(&shared));
     #[cfg(feature = "icap")]
     if let Some(server) = icap_server {
         icap::spawn(
@@ -2267,6 +2403,21 @@ fn build_scan_options(cli: &Cli) -> ScanOptions {
     // together, so one knob governs the largest single allocation on every
     // materialization path.
     let no_limit_at_zero = |n: u64| if n == 0 { u64::MAX } else { n };
+    if let Some(b) = cli.max_extracted_bytes.map(no_limit_at_zero) {
+        opts.limits.max_extracted_bytes = b;
+    }
+    if let Some(b) = cli.max_bytecode_memory_bytes.map(no_limit_at_zero) {
+        opts.limits.max_bytecode_memory_bytes = b;
+    }
+    if let Some(b) = cli.object_cache_bytes {
+        opts.object_cache_bytes = b;
+    }
+    if let Some(b) = cli.object_cache_block_bytes {
+        opts.object_cache_block_bytes = b;
+    }
+    if let Some(b) = cli.http_request_bytes {
+        opts.http_request_bytes = b;
+    }
     if let Some(b) = cli.max_buffer_bytes.map(no_limit_at_zero) {
         opts.limits.max_buffer_bytes = b;
         opts.deep_analysis_max = b;
@@ -2403,13 +2554,13 @@ fn configure_spill(cli: &Cli) -> Result<(), String> {
         spill::configure(cfg);
         return Ok(());
     }
-    if let Some(dir) = &cfg.dir {
-        if !dir.is_dir() {
-            return Err(format!(
-                "--spill-dir {}: not a directory (use `off` to disable spilling)",
-                dir.display()
-            ));
-        }
+    if let Some(dir) = &cfg.dir
+        && !dir.is_dir()
+    {
+        return Err(format!(
+            "--spill-dir {}: not a directory (use `off` to disable spilling)",
+            dir.display()
+        ));
     }
     // An *unlimited* per-object cap under a finite total is not the same
     // mistake: it says "the total is the only bound", which is coherent and is
@@ -2531,6 +2682,13 @@ fn check_flag_conflicts(cli: &Cli) -> Result<(), String> {
                 .to_string(),
         );
     }
+    if !health_endpoints(cli).is_empty() && !serves(cli) {
+        return Err(
+            "--listen-health answers beside the listeners of --listen and has nothing to \
+             report without one"
+                .to_string(),
+        );
+    }
     if cli.json && cli.profile {
         return Err(
             "--json and --profile are two different output formats for a file scan".to_string(),
@@ -2637,16 +2795,16 @@ fn check_flag_conflicts(cli: &Cli) -> Result<(), String> {
     // tunables, so an address carrying any is refused rather than quietly
     // dropped: a pasted listen address the operator believes is tuned. Only
     // the marked options count; a future client-side key passes through.
-    if let Some(addr) = cli.connect.as_deref() {
-        if let Ok(e) = endpoint::Endpoint::parse(addr) {
-            let dropped = e.server_side_options();
-            if !dropped.is_empty() {
-                return Err(format!(
-                    "--connect takes a bare address, but this one carries \
+    if let Some(addr) = cli.connect.as_deref()
+        && let Ok(e) = endpoint::Endpoint::parse(addr)
+    {
+        let dropped = e.server_side_options();
+        if !dropped.is_empty() {
+            return Err(format!(
+                "--connect takes a bare address, but this one carries \
                      listener settings ({}); drop the query or move it to --listen",
-                    dropped.join(", "),
-                ));
-            }
+                dropped.join(", "),
+            ));
         }
     }
     // Serving is chosen before `--build-db` is ever looked at, so without this
@@ -2666,6 +2824,7 @@ fn check_flag_conflicts(cli: &Cli) -> Result<(), String> {
     if listeners(cli)
         .unwrap_or_default()
         .iter()
+        .chain(health_endpoints(cli).iter())
         .any(|e| e.proto == endpoint::Proto::Icap)
     {
         return Err("this build has no ICAP listener (build with `--features icap`)".to_string());
@@ -2762,16 +2921,22 @@ fn scan_target(
         // name that parses as one is kept, so a tree of ordinary files costs
         // one parse each and nothing is accumulated.
         let mut parts: Vec<PathBuf> = Vec::new();
+        // The same for the volumes whose headers say how they join.
+        let mut split: Vec<PathBuf> = Vec::new();
         let walk = walk_tree(path, Some(filters), descent);
         totals.dirs += walk.dirs;
         for line in &walk.errors {
             totals.errors += 1;
             errln(line);
         }
+        daemon::note_run(totals.infected, totals.errors);
         for file in &walk.files {
             if is_volume_part(file) {
                 parts.push(file.clone());
             }
+            if is_split_candidate(file) {
+                split.push(file.clone());
+            }
             scan_one(file, db, opts, cli, totals);
         }
         // A set like `big.7z.001`, `.002`, `.003` is one archive cut into
@@ -2779,8 +2944,132 @@ fn scan_target(
         // only that each fragment is not itself malware. Rejoin and scan the
         // archives they make.
         scan_volume_sets(&parts, db, opts, cli, totals);
+        scan_split_sets(&split, None, db, opts, cli, totals);
     } else if !filters.file_skipped(path) {
         scan_one(path, db, opts, cli, totals);
+        // One volume of a set named on its own: its siblings are looked for
+        // next to it, and the archive they make is scanned too.
+        if is_split_candidate(path) {
+            let siblings = split_siblings(path);
+            scan_split_sets(&siblings, Some(path), db, opts, cli, totals);
+        }
+    }
+}
+
+/// Whether a path's *filename* says it is a part of a set that is joined: a
+/// byte-split part (`big.7z.001`), a RAR volume (`x.part1.rar`, `x.r00`), a ZIP
+/// part (`x.z01`). Names only.
+fn is_set_part(path: &Path) -> bool {
+    use exav_core::unpack::volume::{Scheme, parse};
+    is_volume_part(path)
+        || path
+            .file_name()
+            .and_then(|n| n.to_str())
+            .and_then(parse)
+            .is_some_and(|v| {
+                matches!(
+                    v.scheme,
+                    Scheme::RarPart { .. } | Scheme::RarOld | Scheme::ZipSplit
+                )
+            })
+}
+
+/// Whether a path's *filename* could be a volume of a RAR, ZIP or CAB set:
+/// a RAR volume's or a ZIP part's name, or a `.zip` (the last part of a ZIP
+/// set) or a `.cab` (whose header says whether it has neighbours). Names only.
+fn is_split_candidate(path: &Path) -> bool {
+    use exav_core::unpack::volume::{Scheme, parse};
+    let Some(name) = path.file_name().and_then(|n| n.to_str()) else {
+        return false;
+    };
+    let lower = name.to_ascii_lowercase();
+    lower.ends_with(".zip")
+        || lower.ends_with(".cab")
+        || matches!(
+            parse(name).map(|v| v.scheme),
+            Some(Scheme::RarPart { .. } | Scheme::RarOld | Scheme::ZipSplit)
+        )
+}
+
+/// The regular files next to `path` that could be volumes of the same set
+/// (itself included), by name. A directory is read as far as 100,000 entries;
+/// a symbolic link is not a sibling.
+fn split_siblings(path: &Path) -> Vec<PathBuf> {
+    let Some(dir) = path.parent().map(|p| {
+        if p.as_os_str().is_empty() {
+            Path::new(".")
+        } else {
+            p
+        }
+    }) else {
+        return Vec::new();
+    };
+    let Ok(entries) = std::fs::read_dir(dir) else {
+        return Vec::new();
+    };
+    entries
+        .take(100_000)
+        .filter_map(Result::ok)
+        .filter(|e| e.file_type().is_ok_and(|t| t.is_file()))
+        .map(|e| dir.join(e.file_name()))
+        .filter(|p| is_split_candidate(p))
+        .collect()
+}
+
+/// Rejoin the RAR, ZIP and CAB sets among `files` and scan each as one
+/// archive. As [`scan_volume_sets`], per directory, reporting the archive under
+/// its own name (`dir/big.zip`) and only when it is not clean: each volume's
+/// own line already said that the fragment is not itself malware. `only`
+/// limits the report to the set `only` is a part of.
+fn scan_split_sets(
+    files: &[PathBuf],
+    only: Option<&Path>,
+    db: &Scanner,
+    opts: &ScanOptions,
+    cli: &Cli,
+    totals: &mut Totals,
+) {
+    use std::collections::BTreeMap;
+    use std::io::Read;
+    let mut by_dir: BTreeMap<&Path, Vec<String>> = BTreeMap::new();
+    for p in files {
+        let (Some(dir), Some(name)) = (p.parent(), p.file_name().and_then(|n| n.to_str())) else {
+            continue;
+        };
+        by_dir.entry(dir).or_default().push(name.to_string());
+    }
+    for (dir, names) in by_dir {
+        let verdicts = exav_core::analyze_split_sets(db, &names, opts, |name, head| {
+            let limit = head.map_or(opts.deep_analysis_max.saturating_add(1), |n| n as u64);
+            let mut data = Vec::new();
+            std::fs::File::open(dir.join(name))?
+                .take(limit)
+                .read_to_end(&mut data)?;
+            Ok(data)
+        });
+        // The sets `only` is a part of, or every set.
+        let wanted = only.and_then(|p| p.file_name()).and_then(|n| n.to_str());
+        let relevant: std::collections::HashSet<String> = verdicts
+            .iter()
+            .filter(|v| wanted.is_none_or(|w| v.name == w))
+            .map(|v| v.set.clone())
+            .collect();
+        let mut seen = std::collections::HashSet::new();
+        for v in verdicts {
+            if !relevant.contains(&v.set) || !seen.insert(v.set.clone()) {
+                continue;
+            }
+            if matches!(v.report.verdict.category(), VerdictCategory::Clean) {
+                continue;
+            }
+            totals.scanned += 1;
+            report_result(
+                &dir.join(&v.set).display().to_string(),
+                v.report,
+                cli,
+                totals,
+            );
+        }
     }
 }
 
@@ -3048,6 +3337,7 @@ fn scan_input(
 /// difference between a consumer that can react and one that cannot tell.
 fn report_error(name: &str, message: &str, cli: &Cli, totals: &mut Totals) {
     totals.errors += 1;
+    daemon::note_run(totals.infected, totals.errors);
     if cli.json {
         println!(
             "{}",
@@ -3092,7 +3382,11 @@ fn scan_stdin(db: &Scanner, opts: &ScanOptions, cli: &Cli, totals: &mut Totals)
 #[cfg(feature = "http-scan")]
 fn scan_url(url: &str, db: &Scanner, opts: &ScanOptions, cli: &Cli, totals: &mut Totals) {
     totals.scanned += 1;
-    let reader = match exav_core::source::HttpRangeReader::open(url) {
+    let reader = match exav_core::source::HttpRangeReader::open_with(
+        url,
+        opts.object_cache_block_bytes,
+        opts.http_request_bytes,
+    ) {
         Ok(r) => r,
         Err(e) => {
             report_error(url, &e.to_string(), cli, totals);
@@ -3149,7 +3443,14 @@ fn ping_target(cli: &Cli) -> Result<endpoint::Endpoint, String> {
     if cli.connect.is_some() {
         return connect_endpoint(cli).ok_or_else(|| "--connect address is not valid".to_string());
     }
-    let found = listeners(cli)?;
+    // A health listener first: it answers while the others are busy, which is
+    // when a health check matters.
+    let health = endpoint::listeners_of("--listen-health", &cli.listen_health)?;
+    let found = if health.is_empty() {
+        listeners(cli)?
+    } else {
+        health
+    };
     found
         .iter()
         .find(|e| e.proto == endpoint::Proto::Clamd)
@@ -3179,7 +3480,7 @@ fn ping_once(target: &endpoint::Endpoint) -> io::Result<String> {
         endpoint::Addr::Unix { .. } => {
             return Err(io::Error::other(
                 "a Unix-socket address needs a Unix platform",
-            ))
+            ));
         }
     };
     let (probe, want): (&[u8], &str) = match target.proto {
@@ -3327,7 +3628,7 @@ fn read_session_replies(r: &mut impl std::io::BufRead, marker_id: u64) -> io::Re
                 return Err(io::Error::other(format!(
                     "the daemon answered command {n} while {} was outstanding",
                     marker_id - 1
-                )))
+                )));
             }
             Some(_) => {
                 if !body.is_empty() {
@@ -3656,19 +3957,34 @@ fn run_client(cli: &Cli) -> ExitCode {
         } else if p.is_dir() {
             let walk = walk_tree(p, Some(&filters), descent(cli));
             walk_errors.extend(walk.errors);
+            // The directories holding a part of a set by its name; the `.zip`
+            // that ends a ZIP set and the cabinets of one go with them.
+            let set_dirs: std::collections::HashSet<&Path> = walk
+                .files
+                .iter()
+                .filter(|f| is_set_part(f))
+                .filter_map(|f| f.parent())
+                .collect();
             if sending_contents {
                 // Grouped by the directory the parts sit in: `a/big.7z.001` and
                 // `b/big.7z.002` are unrelated files that share a name, and
                 // splicing them would join bytes nothing ever wrote.
-                for f in walk.files {
-                    match (is_volume_part(&f), f.parent()) {
-                        (true, Some(dir)) => stream_sets.entry(dir.into()).or_default().push(f),
-                        _ => files.push(f),
+                let mut in_sets = Vec::new();
+                for f in &walk.files {
+                    let together = is_set_part(f)
+                        || (is_split_candidate(f)
+                            && f.parent().is_some_and(|d| set_dirs.contains(d)));
+                    match (together, f.parent()) {
+                        (true, Some(dir)) => in_sets.push((dir.to_path_buf(), f.clone())),
+                        _ => files.push(f.clone()),
                     }
                 }
+                for (dir, f) in in_sets {
+                    stream_sets.entry(dir).or_default().push(f);
+                }
                 continue;
             }
-            if walk.files.iter().any(|f| is_volume_part(f)) {
+            if !set_dirs.is_empty() {
                 // Handed to `CONTSCAN` whole rather than scanned file by file.
                 // The daemon reports a set's verdict on each PART's line (the
                 // part is the file an operator has to act on), so asking for the
@@ -4256,6 +4572,7 @@ fn report_result(name: &str, mut report: ScanReport, cli: &Cli, totals: &mut Tot
         }
         VerdictCategory::Clean => {}
     }
+    daemon::note_run(totals.infected, totals.errors);
     if cli.json {
         emit_json_result(name, &report, cli);
         return;
@@ -4269,10 +4586,10 @@ fn report_result(name: &str, mut report: ScanReport, cli: &Cli, totals: &mut Tot
                 Some(d) if !d.is_empty() => outln!("{name}: {d} FOUND"),
                 _ => outln!("{name}: FOUND"),
             }
-            if cli.verbose {
-                if let Verdict::Infected { method, .. } = v {
-                    println!("  [method] {}", method.as_str());
-                }
+            if cli.verbose
+                && let Verdict::Infected { method, .. } = v
+            {
+                println!("  [method] {}", method.as_str());
             }
             if cli.bell {
                 print!("\x07");
@@ -4720,9 +5037,11 @@ mod tests {
         assert!(hint("--no-summary").unwrap().contains("--quiet"));
         assert!(hint("--remove").unwrap().contains("act on the exit code"));
         // Value-carrying spellings are the same flag.
-        assert!(hint("--move=/tmp/quarantine")
-            .unwrap()
-            .contains("does not move"));
+        assert!(
+            hint("--move=/tmp/quarantine")
+                .unwrap()
+                .contains("does not move")
+        );
 
         // exav's own flags, and anything else, are left to clap.
         for a in [
@@ -4785,26 +5104,28 @@ mod tests {
 
         // What the client itself does: walk, send, print. Short spellings
         // included: `-v` is `--verbose`, not an unknown flag.
-        assert!(ignored(&[
-            "--connect",
-            "/run/exav.sock",
-            "--send-as",
-            "contents",
-            "--quiet",
-            "--json",
-            "--log",
-            "/tmp/x.log",
-            "--all-matches",
-            "--no-recursive",
-            "--exclude",
-            "\\.log$",
-            "--files-from",
-            "/tmp/list",
-            "-v",
-            "-",
-            "/data",
-        ])
-        .is_empty());
+        assert!(
+            ignored(&[
+                "--connect",
+                "/run/exav.sock",
+                "--send-as",
+                "contents",
+                "--quiet",
+                "--json",
+                "--log",
+                "/tmp/x.log",
+                "--all-matches",
+                "--no-recursive",
+                "--exclude",
+                "\\.log$",
+                "--files-from",
+                "/tmp/list",
+                "-v",
+                "-",
+                "/data",
+            ])
+            .is_empty()
+        );
 
         // Every flag is named, not just the first: fixing one and rerunning into
         // the next is the slow way to learn there were three.
@@ -4825,7 +5146,8 @@ mod tests {
                 .iter()
                 .map(|(k, v)| {
                     let prev = std::env::var(k).ok();
-                    std::env::set_var(k, v);
+                    // FIXME: Audit that the environment access only happens in single-threaded code.
+                    unsafe { std::env::set_var(k, v) };
                     ((*k).to_string(), prev)
                 })
                 .collect();
@@ -4837,8 +5159,10 @@ mod tests {
         fn drop(&mut self) {
             for (k, prev) in &self.0 {
                 match prev {
-                    Some(v) => std::env::set_var(k, v),
-                    None => std::env::remove_var(k),
+                    // FIXME: Audit that the environment access only happens in single-threaded code.
+                    Some(v) => unsafe { std::env::set_var(k, v) },
+                    // FIXME: Audit that the environment access only happens in single-threaded code.
+                    None => unsafe { std::env::remove_var(k) },
                 }
             }
         }
@@ -4940,7 +5264,8 @@ mod tests {
     fn shutdown_is_refused_unless_the_operator_opts_in() {
         let _env = env_guard();
         let restore = std::env::var("EXAV_ALLOW_SHUTDOWN").ok();
-        std::env::remove_var("EXAV_ALLOW_SHUTDOWN");
+        // FIXME: Audit that the environment access only happens in single-threaded code.
+        unsafe { std::env::remove_var("EXAV_ALLOW_SHUTDOWN") };
 
         let off = Cli::parse_from(["exav", "--listen", "clamd://h:1"]);
         assert!(
@@ -4954,7 +5279,8 @@ mod tests {
             "--allow-shutdown restores clamd's behaviour"
         );
 
-        std::env::set_var("EXAV_ALLOW_SHUTDOWN", "1");
+        // FIXME: Audit that the environment access only happens in single-threaded code.
+        unsafe { std::env::set_var("EXAV_ALLOW_SHUTDOWN", "1") };
         let from_env = Cli::parse_from(["exav", "--listen", "clamd://h:1"]);
         assert!(
             shutdown_allowed(from_env.allow_shutdown),
@@ -4962,8 +5288,10 @@ mod tests {
         );
 
         match restore {
-            Some(v) => std::env::set_var("EXAV_ALLOW_SHUTDOWN", v),
-            None => std::env::remove_var("EXAV_ALLOW_SHUTDOWN"),
+            // FIXME: Audit that the environment access only happens in single-threaded code.
+            Some(v) => unsafe { std::env::set_var("EXAV_ALLOW_SHUTDOWN", v) },
+            // FIXME: Audit that the environment access only happens in single-threaded code.
+            None => unsafe { std::env::remove_var("EXAV_ALLOW_SHUTDOWN") },
         }
     }
 
@@ -5046,6 +5374,62 @@ mod tests {
         assert_eq!(opts.limits.max_members, 10_000);
     }
 
+    /// The total a scan may decode whole and what a bytecode run may hold are
+    /// settings: given, they win over the defaults and over --clamav-compat's;
+    /// `off` is no limit.
+    #[test]
+    fn the_extraction_total_and_the_bytecode_memory_are_settings() {
+        let _env = env_guard();
+        let opts = build_scan_options(&Cli::parse_from(["exav"]));
+        assert_eq!(opts.limits.max_bytecode_memory_bytes, 256 * 1024 * 1024);
+        let opts = build_scan_options(&Cli::parse_from([
+            "exav",
+            "--clamav-compat",
+            "--max-extracted-bytes",
+            "3G",
+            "--max-bytecode-memory-bytes",
+            "64M",
+        ]));
+        assert_eq!(opts.limits.max_extracted_bytes, 3 << 30);
+        assert_eq!(opts.limits.max_bytecode_memory_bytes, 64 << 20);
+        let opts = build_scan_options(&Cli::parse_from([
+            "exav",
+            "--max-extracted-bytes",
+            "off",
+            "--max-bytecode-memory-bytes",
+            "0",
+        ]));
+        assert_eq!(opts.limits.max_extracted_bytes, u64::MAX);
+        assert_eq!(opts.limits.max_bytecode_memory_bytes, u64::MAX);
+    }
+
+    /// The cache of an object read in place and the size of an HTTP request
+    /// are settings, with defaults under either mode.
+    #[test]
+    fn the_object_cache_and_http_request_are_settings() {
+        let _env = env_guard();
+        for compat in [false, true] {
+            let mut args = vec!["exav"];
+            args.extend(compat.then_some("--clamav-compat"));
+            let opts = build_scan_options(&Cli::parse_from(&args));
+            assert_eq!(opts.object_cache_bytes, 8 << 20);
+            assert_eq!(opts.object_cache_block_bytes, 1 << 20);
+            assert_eq!(opts.http_request_bytes, 8 << 20);
+            args.extend([
+                "--object-cache-bytes",
+                "32M",
+                "--object-cache-block-bytes",
+                "1M",
+                "--http-request-bytes",
+                "16M",
+            ]);
+            let opts = build_scan_options(&Cli::parse_from(&args));
+            assert_eq!(opts.object_cache_bytes, 32 << 20);
+            assert_eq!(opts.object_cache_block_bytes, 1 << 20);
+            assert_eq!(opts.http_request_bytes, 16 << 20);
+        }
+    }
+
     /// A removed flag, said as a flag or in the environment, is an error
     /// naming why rather than a setting dropped without a word.
     #[test]
@@ -5053,21 +5437,20 @@ mod tests {
         let _env = env_guard();
         let args = |a: &[&str]| a.iter().map(|s| s.to_string()).collect::<Vec<_>>();
         for (argv, why) in [
-            (&["--max-extracted-bytes", "1G"][..], "--max-process-bytes"),
-            (&["--max-extracted-bytes=1G"], "--max-process-bytes"),
-            (&["--build-shard-bytes", "1G"], "no longer"),
+            (&["--build-shard-bytes", "1G"][..], "no longer"),
             (&["--build-shard-bytes=off"], "no longer"),
         ] {
             let msg = removed_flag(&args(argv)).expect("refused");
             assert!(msg.contains(why), "{msg}");
         }
         assert_eq!(removed_flag(&args(&["--max-object-bytes", "1G"])), None);
-        for var in ["EXAV_MAX_EXTRACTED_BYTES", "EXAV_BUILD_SHARD_BYTES"] {
-            std::env::set_var(var, "1G");
-            let msg = removed_flag(&[]);
-            std::env::remove_var(var);
-            assert!(msg.is_some_and(|m| m.contains(var)), "{var}");
-        }
+        let var = "EXAV_BUILD_SHARD_BYTES";
+        // FIXME: Audit that the environment access only happens in single-threaded code.
+        unsafe { std::env::set_var(var, "1G") };
+        let msg = removed_flag(&[]);
+        // FIXME: Audit that the environment access only happens in single-threaded code.
+        unsafe { std::env::remove_var(var) };
+        assert!(msg.is_some_and(|m| m.contains(var)), "{var}");
     }
 
     /// Counts that are limits take `off`; the depth and the DLP thresholds,
@@ -5591,15 +5974,17 @@ mod tests {
 
         // A nesting that holds is accepted, and the defaults are one.
         assert!(configure_spill(&cli(&[])).is_ok());
-        assert!(configure_spill(&cli(&[
-            "--spill-threshold-bytes",
-            "1M",
-            "--max-spill-bytes",
-            "64M",
-            "--max-total-spill-bytes",
-            "256M"
-        ]))
-        .is_ok());
+        assert!(
+            configure_spill(&cli(&[
+                "--spill-threshold-bytes",
+                "1M",
+                "--max-spill-bytes",
+                "64M",
+                "--max-total-spill-bytes",
+                "256M"
+            ]))
+            .is_ok()
+        );
 
         // `0` is "no ceiling" here as on every other --max- size flag, so it
         // cannot make the nesting fail, and cannot be mistaken for the way to
@@ -5610,14 +5995,18 @@ mod tests {
         // `--spill-dir off` needs no disk budgets, and saying both is a
         // contradiction rather than a preference.
         assert!(configure_spill(&cli(&["--spill-dir", "off"])).is_ok());
-        assert!(configure_spill(&cli(&[
-            "--spill-dir",
-            "off",
-            "--spill-threshold-bytes",
-            "512M"
-        ]))
-        .is_ok());
-        assert!(err(&["--spill-dir", "off", "--max-spill-bytes", "1G"]).contains("--spill-dir off"));
+        assert!(
+            configure_spill(&cli(&[
+                "--spill-dir",
+                "off",
+                "--spill-threshold-bytes",
+                "512M"
+            ]))
+            .is_ok()
+        );
+        assert!(
+            err(&["--spill-dir", "off", "--max-spill-bytes", "1G"]).contains("--spill-dir off")
+        );
     }
 
     /// The updater-only deployment (keep the signature volume current, serve
diff --git a/crates/exav/src/metrics.rs b/crates/exav/src/metrics.rs
index 811e6ce7..559f8653 100644
--- a/crates/exav/src/metrics.rs
+++ b/crates/exav/src/metrics.rs
@@ -21,13 +21,14 @@
 //!
 //! ## Under the worker pool
 //!
-//! The prefork daemon answers each connection from a forked child, so these
-//! counters live in whichever process handled the request and cover that
-//! process's own jobs. `STATS` says so rather than presenting one worker's
-//! numbers as the pool's. The thread-model daemon (`--workers 0`) and the ICAP
-//! listener are single processes, where the totals are the whole story.
-
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+//! The prefork daemon answers each connection from a forked child. The counters
+//! are in memory the supervisor maps shared before it forks, each process
+//! writing its own slot of the in-flight gauge, so `STATS` from any process of
+//! the pool reports the pool's totals. A slot is cleared when its process is
+//! reaped. The thread-model daemon (`--workers 0`) and the ICAP listener are
+//! single processes.
+
+use std::sync::atomic::{AtomicBool, AtomicPtr, AtomicU64, Ordering};
 use std::time::Duration;
 
 use exav_core::profile::Profile;
@@ -74,34 +75,109 @@ const CELLS: usize = MATCHERS.len() + 1;
 /// Index of the catch-all cell.
 const OTHER: usize = MATCHERS.len();
 
-// `AtomicU64` is not `Copy`, so the array cannot be built with `[expr; N]` and
-// the cells have to be listed. The declared length is `CELLS`, derived from
-// `MATCHERS`, so adding a matcher name without adding a cell fails to compile
-// rather than silently dropping that matcher's numbers.
-static MATCHER_CELLS: [MatcherCell; CELLS] = [
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-    MatcherCell::new(),
-];
+/// Processes whose scans in flight are counted apart: the slot of a process is
+/// its pid modulo this.
+const SLOTS: usize = 4096;
+
+/// Everything counted, in one block so that it can sit in memory the forked
+/// processes of the pool share.
+struct Counters {
+    scans: AtomicU64,
+    bytes: AtomicU64,
+    nanos: AtomicU64,
+    slowest_ns: AtomicU64,
+    slow: AtomicU64,
+    infected: AtomicU64,
+    partial: AtomicU64,
+    /// Scans running, by process. Apart because a worker killed mid-scan (its
+    /// time ran out) would otherwise leave the gauge one too high for good;
+    /// the supervisor clears the slot of a child it reaps ([`release`]).
+    in_flight: [AtomicU64; SLOTS],
+    cells: [MatcherCell; CELLS],
+}
 
-static SCANS: AtomicU64 = AtomicU64::new(0);
-static BYTES: AtomicU64 = AtomicU64::new(0);
-static NANOS: AtomicU64 = AtomicU64::new(0);
-static SLOWEST_NS: AtomicU64 = AtomicU64::new(0);
-static SLOW: AtomicU64 = AtomicU64::new(0);
-static INFECTED: AtomicU64 = AtomicU64::new(0);
-static PARTIAL: AtomicU64 = AtomicU64::new(0);
-static IN_FLIGHT: AtomicU64 = AtomicU64::new(0);
+impl Counters {
+    const fn new() -> Self {
+        Self {
+            scans: AtomicU64::new(0),
+            bytes: AtomicU64::new(0),
+            nanos: AtomicU64::new(0),
+            slowest_ns: AtomicU64::new(0),
+            slow: AtomicU64::new(0),
+            infected: AtomicU64::new(0),
+            partial: AtomicU64::new(0),
+            in_flight: [const { AtomicU64::new(0) }; SLOTS],
+            cells: [const { MatcherCell::new() }; CELLS],
+        }
+    }
+}
+
+/// This process's own counters: where they are until the supervisor of a pool
+/// puts them somewhere its children share.
+static LOCAL: Counters = Counters::new();
+
+/// The shared block, once there is one.
+static SHARED: AtomicPtr<Counters> = AtomicPtr::new(std::ptr::null_mut());
+
+/// The counters in use.
+fn c() -> &'static Counters {
+    let shared = SHARED.load(Ordering::Acquire);
+    if shared.is_null() {
+        &LOCAL
+    } else {
+        // SAFETY: set only by `share_across_fork`, to a mapping that is never
+        // unmapped, is the size of `Counters`, and holds only atomics, which
+        // are valid at any bit pattern and meant to be used from many processes.
+        unsafe { &*shared }
+    }
+}
+
+/// Put the counters in memory shared with every process forked from here on,
+/// so that `STATS` in any of them (and in the health child) reports the whole
+/// pool and not one worker. Called once, by the supervisor, before it forks.
+/// On failure the counters stay each process's own and the reason is returned.
+#[cfg(unix)]
+pub(crate) fn share_across_fork() -> std::io::Result<()> {
+    // SAFETY: an anonymous shared mapping of the size of `Counters`, which the
+    // kernel zero-fills (every field is an atomic whose zero is its initial
+    // value). Nothing else refers to it, and it is never unmapped.
+    let ptr = unsafe {
+        libc::mmap(
+            std::ptr::null_mut(),
+            std::mem::size_of::<Counters>(),
+            libc::PROT_READ | libc::PROT_WRITE,
+            libc::MAP_SHARED | libc::MAP_ANONYMOUS,
+            -1,
+            0,
+        )
+    };
+    if ptr == libc::MAP_FAILED {
+        return Err(std::io::Error::last_os_error());
+    }
+    SHARED.store(ptr.cast(), Ordering::Release);
+    Ok(())
+}
+
+/// Clear the scans in flight of child `pid`, which has exited: whatever it was
+/// doing, it is not doing it now.
+#[cfg(unix)]
+pub(crate) fn release(pid: i32) {
+    c().in_flight[slot_of(pid)].store(0, Ordering::Relaxed);
+}
+
+fn slot_of(pid: i32) -> usize {
+    pid as usize % SLOTS
+}
+
+#[cfg(unix)]
+fn my_slot() -> usize {
+    slot_of(std::process::id() as i32)
+}
+
+#[cfg(not(unix))]
+fn my_slot() -> usize {
+    0
+}
 
 /// Whether the per-matcher breakdown is being collected.
 static PROFILING: AtomicBool = AtomicBool::new(false);
@@ -127,7 +203,10 @@ pub(crate) fn profiling() -> bool {
 /// Scans running right now, for the `QUEUE`/`THREADS` fields a clamd client
 /// polls to see whether the server is saturated.
 pub(crate) fn in_flight() -> u64 {
-    IN_FLIGHT.load(Ordering::Relaxed)
+    c().in_flight
+        .iter()
+        .map(|n| n.load(Ordering::Relaxed))
+        .sum()
 }
 
 /// Log the totals every `interval`, from whichever process is serving.
@@ -146,10 +225,10 @@ pub(crate) fn spawn_reporter(interval: Duration, what: &'static str) {
         return;
     }
     std::thread::spawn(move || {
-        let mut last = SCANS.load(Ordering::Relaxed);
+        let mut last = c().scans.load(Ordering::Relaxed);
         loop {
             std::thread::sleep(interval);
-            let now = SCANS.load(Ordering::Relaxed);
+            let now = c().scans.load(Ordering::Relaxed);
             if now == last {
                 continue;
             }
@@ -165,7 +244,7 @@ pub(crate) fn spawn_reporter(interval: Duration, what: &'static str) {
 /// what it scanned (the daemon's, Unix only).
 #[cfg(all(test, unix))]
 pub(crate) fn scans() -> u64 {
-    SCANS.load(Ordering::Relaxed)
+    c().scans.load(Ordering::Relaxed)
 }
 
 /// A scan in progress, and the counters it will land in when it finishes.
@@ -176,37 +255,54 @@ pub(crate) fn scans() -> u64 {
 /// decrements on the happy path reads as a permanently busy server.
 pub(crate) struct ScanTimer {
     start: std::time::Instant,
+    /// The gauge was given back, by `finish` or by dropping the timer.
+    released: bool,
 }
 
 impl ScanTimer {
     /// Start timing, and enable per-matcher profiling on this thread when it is
     /// switched on.
     pub(crate) fn start() -> Self {
-        IN_FLIGHT.fetch_add(1, Ordering::Relaxed);
+        c().in_flight[my_slot()].fetch_add(1, Ordering::Relaxed);
         if profiling() {
             exav_core::profile::enable();
         }
         Self {
             start: std::time::Instant::now(),
+            released: false,
+        }
+    }
+
+    /// Give the in-flight gauge back, once.
+    fn release(&mut self) {
+        if std::mem::replace(&mut self.released, true) {
+            return;
+        }
+        // Not below zero: a supervisor that cleared this slot after this
+        // process was thought dead must not wrap it.
+        let slot = &c().in_flight[my_slot()];
+        if slot.fetch_sub(1, Ordering::Relaxed) == 0 {
+            slot.fetch_add(1, Ordering::Relaxed);
         }
     }
 
     /// Record the finished scan. `target` names the object for the slow-scan
     /// line; `bytes` is its size.
-    pub(crate) fn finish(self, target: &str, bytes: u64, category: Category) {
+    pub(crate) fn finish(mut self, target: &str, bytes: u64, category: Category) {
         let elapsed = self.start.elapsed();
         let ns = elapsed.as_nanos() as u64;
-        IN_FLIGHT.fetch_sub(1, Ordering::Relaxed);
-        SCANS.fetch_add(1, Ordering::Relaxed);
-        BYTES.fetch_add(bytes, Ordering::Relaxed);
-        NANOS.fetch_add(ns, Ordering::Relaxed);
-        SLOWEST_NS.fetch_max(ns, Ordering::Relaxed);
+        let k = c();
+        self.release();
+        k.scans.fetch_add(1, Ordering::Relaxed);
+        k.bytes.fetch_add(bytes, Ordering::Relaxed);
+        k.nanos.fetch_add(ns, Ordering::Relaxed);
+        k.slowest_ns.fetch_max(ns, Ordering::Relaxed);
         match category {
             Category::Infected => {
-                INFECTED.fetch_add(1, Ordering::Relaxed);
+                k.infected.fetch_add(1, Ordering::Relaxed);
             }
             Category::Partial => {
-                PARTIAL.fetch_add(1, Ordering::Relaxed);
+                k.partial.fetch_add(1, Ordering::Relaxed);
             }
             Category::Clean => {}
         }
@@ -214,7 +310,7 @@ impl ScanTimer {
         let profile = exav_core::profile::take();
         if let Some(p) = &profile {
             for (name, stat) in p.iter() {
-                let cell = &MATCHER_CELLS[index_of(name)];
+                let cell = &k.cells[index_of(name)];
                 cell.ns.fetch_add(stat.ns, Ordering::Relaxed);
                 cell.calls.fetch_add(stat.calls, Ordering::Relaxed);
                 cell.bytes.fetch_add(stat.bytes, Ordering::Relaxed);
@@ -223,7 +319,7 @@ impl ScanTimer {
 
         let threshold = SLOW_AFTER_NS.load(Ordering::Relaxed);
         if threshold > 0 && ns >= threshold {
-            SLOW.fetch_add(1, Ordering::Relaxed);
+            k.slow.fetch_add(1, Ordering::Relaxed);
             // The point of the line is to name the object, because the next
             // question is always "which one?" and a listener holds nothing to
             // go back to. The breakdown follows when there is one.
@@ -239,6 +335,19 @@ impl ScanTimer {
     }
 }
 
+/// A scan that ends without `finish` (a panic unwinding, an early return)
+/// still gives the gauge back. It is not counted as a scan.
+impl Drop for ScanTimer {
+    fn drop(&mut self) {
+        if !self.released {
+            self.release();
+            // Profiling was enabled on this thread for a scan that did not
+            // report.
+            let _ = exav_core::profile::take();
+        }
+    }
+}
+
 /// Which column of the verdict counters a scan lands in.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) enum Category {
@@ -298,22 +407,23 @@ pub(crate) struct Snapshot {
 }
 
 fn snapshot() -> Snapshot {
+    let k = c();
     Snapshot {
-        scans: SCANS.load(Ordering::Relaxed),
-        bytes: BYTES.load(Ordering::Relaxed),
-        ns: NANOS.load(Ordering::Relaxed),
-        slowest_ns: SLOWEST_NS.load(Ordering::Relaxed),
-        slow: SLOW.load(Ordering::Relaxed),
-        infected: INFECTED.load(Ordering::Relaxed),
-        partial: PARTIAL.load(Ordering::Relaxed),
-        in_flight: IN_FLIGHT.load(Ordering::Relaxed),
+        scans: k.scans.load(Ordering::Relaxed),
+        bytes: k.bytes.load(Ordering::Relaxed),
+        ns: k.nanos.load(Ordering::Relaxed),
+        slowest_ns: k.slowest_ns.load(Ordering::Relaxed),
+        slow: k.slow.load(Ordering::Relaxed),
+        infected: k.infected.load(Ordering::Relaxed),
+        partial: k.partial.load(Ordering::Relaxed),
+        in_flight: in_flight(),
         profiling: profiling(),
         matchers: MATCHERS
             .iter()
             .chain(std::iter::once(&"other"))
             .enumerate()
             .filter_map(|(i, name)| {
-                let cell = &MATCHER_CELLS[i];
+                let cell = &k.cells[i];
                 let calls = cell.calls.load(Ordering::Relaxed);
                 (calls > 0).then(|| {
                     (
@@ -385,7 +495,7 @@ mod tests {
 
     #[test]
     fn every_matcher_has_a_cell_and_a_home() {
-        assert_eq!(MATCHER_CELLS.len(), CELLS);
+        assert_eq!(c().cells.len(), CELLS);
         for (i, name) in MATCHERS.iter().enumerate() {
             assert_eq!(index_of(name), i, "{name}");
         }
@@ -432,26 +542,65 @@ mod tests {
     fn a_timed_scan_lands_in_the_totals() {
         // Counters are process-global and this binary's tests run in parallel,
         // so the assertions are about movement, not absolute values.
-        let before = SCANS.load(Ordering::Relaxed);
-        let infected_before = INFECTED.load(Ordering::Relaxed);
+        let before = c().scans.load(Ordering::Relaxed);
+        let infected_before = c().infected.load(Ordering::Relaxed);
         let t = ScanTimer::start();
-        assert!(
-            IN_FLIGHT.load(Ordering::Relaxed) >= 1,
-            "a running scan must show as in flight"
-        );
+        assert!(in_flight() >= 1, "a running scan must show as in flight");
         t.finish("some-object", 4096, Category::Infected);
-        assert!(SCANS.load(Ordering::Relaxed) > before);
-        assert!(INFECTED.load(Ordering::Relaxed) > infected_before);
+        assert!(c().scans.load(Ordering::Relaxed) > before);
+        assert!(c().infected.load(Ordering::Relaxed) > infected_before);
+    }
+
+    /// A worker killed mid-scan never finishes it. Its scans in flight are in a
+    /// slot of its own, which the supervisor clears when it reaps the child, so
+    /// the gauge of the pool does not stay one too high for good.
+    #[test]
+    #[cfg(unix)]
+    fn a_child_that_died_mid_scan_leaves_no_scan_in_flight() {
+        // A pid no test process has: its slot is nobody's but this test's.
+        let pid = 4096 * 100 + 17;
+        let slot = &c().in_flight[slot_of(pid)];
+        let before = in_flight();
+        slot.store(2, Ordering::Relaxed);
+        assert!(in_flight() >= before + 2);
+        release(pid);
+        assert_eq!(slot.load(Ordering::Relaxed), 0);
     }
 
     #[test]
     fn the_in_flight_gauge_is_released_even_when_a_scan_leaves_early() {
         // A gauge that only decrements on the happy path reads as a permanently
         // busy server, which is the opposite of what someone polling it wants.
-        let before = IN_FLIGHT.load(Ordering::Relaxed);
+        let before = c().in_flight[my_slot()].load(Ordering::Relaxed);
         let t = ScanTimer::start();
-        assert!(IN_FLIGHT.load(Ordering::Relaxed) > before);
+        assert!(c().in_flight[my_slot()].load(Ordering::Relaxed) > before);
         t.finish("gone", 0, Category::Partial);
-        assert_eq!(IN_FLIGHT.load(Ordering::Relaxed), before);
+        assert_eq!(c().in_flight[my_slot()].load(Ordering::Relaxed), before);
+
+        // A scan that panics, or returns, without reaching `finish`.
+        let slot = &c().in_flight[my_slot()];
+        let before = slot.load(Ordering::Relaxed);
+        let scans = c().scans.load(Ordering::Relaxed);
+        let panicked = std::panic::catch_unwind(|| {
+            let _t = ScanTimer::start();
+            panic!("the scan died");
+        });
+        assert!(panicked.is_err());
+        assert_eq!(
+            slot.load(Ordering::Relaxed),
+            before,
+            "the panic leaked the gauge"
+        );
+        assert_eq!(
+            c().scans.load(Ordering::Relaxed),
+            scans,
+            "a dropped timer is not a finished scan"
+        );
+        drop(ScanTimer::start());
+        assert_eq!(
+            slot.load(Ordering::Relaxed),
+            before,
+            "an early return leaked the gauge"
+        );
     }
 }
diff --git a/crates/exav/src/signatures.rs b/crates/exav/src/signatures.rs
index 3e0699f7..6f3eab80 100644
--- a/crates/exav/src/signatures.rs
+++ b/crates/exav/src/signatures.rs
@@ -480,13 +480,13 @@ fn start_prebuilt_db(
         .database
         .clone()
         .unwrap_or_else(|| cli.sigs.join(PULLED_DB_NAME));
-    if let Some(parent) = dest.parent() {
-        if let Err(e) = std::fs::create_dir_all(parent) {
-            eprintln!(
-                "exav: warning: cannot create database dir {}: {e}",
-                parent.display()
-            );
-        }
+    if let Some(parent) = dest.parent()
+        && let Err(e) = std::fs::create_dir_all(parent)
+    {
+        eprintln!(
+            "exav: warning: cannot create database dir {}: {e}",
+            parent.display()
+        );
     }
 
     let shown = redact_url(url);
@@ -519,17 +519,19 @@ fn start_prebuilt_db(
     };
     let url = url.to_string();
     let watched = dest.clone();
-    std::thread::spawn(move || loop {
-        std::thread::sleep(poll);
-        match exav_update::fetch_db_if_changed(&url, &watched, validator.as_deref()) {
-            Ok(f) => {
-                validator = f.validator().map(String::from);
-                if f.is_updated() {
-                    eprintln!("exav: database updated from {shown}, reloading");
-                    reload.request();
+    std::thread::spawn(move || {
+        loop {
+            std::thread::sleep(poll);
+            match exav_update::fetch_db_if_changed(&url, &watched, validator.as_deref()) {
+                Ok(f) => {
+                    validator = f.validator().map(String::from);
+                    if f.is_updated() {
+                        eprintln!("exav: database updated from {shown}, reloading");
+                        reload.request();
+                    }
                 }
+                Err(e) => eprintln!("exav: database poll failed: {e}"),
             }
-            Err(e) => eprintln!("exav: database poll failed: {e}"),
         }
     });
 
@@ -564,10 +566,12 @@ impl AutoUpdate {
             let (Some(dir), Some(interval)) = (dir, interval) else {
                 return;
             };
-            std::thread::spawn(move || loop {
-                std::thread::sleep(interval);
-                if update_signatures(&sources, &dir, &mut validators) {
-                    reload.request();
+            std::thread::spawn(move || {
+                loop {
+                    std::thread::sleep(interval);
+                    if update_signatures(&sources, &dir, &mut validators) {
+                        reload.request();
+                    }
                 }
             });
         }
diff --git a/crates/exav/src/spill.rs b/crates/exav/src/spill.rs
index 694b2f4f..ad6db56e 100644
--- a/crates/exav/src/spill.rs
+++ b/crates/exav/src/spill.rs
@@ -33,8 +33,8 @@
 
 use std::io::{self, Write};
 use std::path::PathBuf;
-use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::OnceLock;
+use std::sync::atomic::{AtomicU64, Ordering};
 
 use crate::tmpfile::TempFile;
 
diff --git a/crates/exav/tests/daemon_client.rs b/crates/exav/tests/daemon_client.rs
index 9c308d4d..0776a23e 100644
--- a/crates/exav/tests/daemon_client.rs
+++ b/crates/exav/tests/daemon_client.rs
@@ -413,6 +413,31 @@ fn a_split_set_is_rejoined_when_streamed() {
     assert_eq!(code, 1, "{stdout}");
 }
 
+/// A ZIP cut into `e.z01` and `e.zip` carries its own headers: the part
+/// numbers in its directory say where each member starts. Streamed together,
+/// the daemon rejoins them as the archive they are. The EICAR line is across
+/// the place the first part ends (`tests/fixtures/split`, made by
+/// `zip -0 -s 64k`), so neither part holds it.
+#[test]
+fn a_split_zip_is_rejoined_when_streamed() {
+    let d = Daemon::start("077", &[]);
+    let dir = TempDir::new().unwrap();
+    for n in ["e.z01", "e.zip"] {
+        let from = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+            .join("tests/fixtures/split")
+            .join(n);
+        let bytes = exav_core::unpack::read_fixture(&from.to_string_lossy()).unwrap();
+        std::fs::write(dir.path().join(n), bytes).unwrap();
+    }
+    let (code, stdout) = d.client(&["--send-as", "contents"], &[dir.path()]);
+    assert_eq!(
+        stdout.matches("FOUND (in e.zip)").count(),
+        2,
+        "each part carries the archive's verdict: {stdout}"
+    );
+    assert_eq!(code, 1, "{stdout}");
+}
+
 /// `--verbose` in client mode. The daemon's reply is a verdict and nothing
 /// else, so what `-v` has to add here is which daemon answered and what it was
 /// asked. Accepting the flag and printing nothing is the defect.
diff --git a/crates/exav/tests/docs_match_cli.rs b/crates/exav/tests/docs_match_cli.rs
index e3b2d744..2cba4f44 100644
--- a/crates/exav/tests/docs_match_cli.rs
+++ b/crates/exav/tests/docs_match_cli.rs
@@ -377,7 +377,6 @@ fn every_flag_named_in_a_message_exists() {
         "max-depth",
         "password",
         // Removed from exav, named in the error that says what replaced it.
-        "max-extracted-bytes",
         "build-shard-bytes",
     ];
 
@@ -553,19 +552,18 @@ fn env_var_names_follow_the_documented_rule() {
     let mut wrong: Vec<String> = Vec::new();
     for line in help.lines() {
         let t = line.trim_start();
-        if line.len() != t.len() {
-            if let Some(rest) = t
+        if line.len() != t.len()
+            && let Some(rest) = t
                 .split_whitespace()
                 .next()
                 .and_then(|s| s.strip_prefix("--"))
-            {
-                let name: String = rest
-                    .chars()
-                    .take_while(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || *c == '-')
-                    .collect();
-                if !name.is_empty() {
-                    current = Some(name);
-                }
+        {
+            let name: String = rest
+                .chars()
+                .take_while(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || *c == '-')
+                .collect();
+            if !name.is_empty() {
+                current = Some(name);
             }
         }
         if let Some(rest) = t.strip_prefix("[env: ") {
diff --git a/crates/exav/tests/fixtures/split/e.z01.xor b/crates/exav/tests/fixtures/split/e.z01.xor
new file mode 100644
index 00000000..78fa22a4
Binary files /dev/null and b/crates/exav/tests/fixtures/split/e.z01.xor differ
diff --git a/crates/exav/tests/fixtures/split/e.zip.xor b/crates/exav/tests/fixtures/split/e.zip.xor
new file mode 100644
index 00000000..c9413fb2
Binary files /dev/null and b/crates/exav/tests/fixtures/split/e.zip.xor differ
diff --git a/crates/exav/tests/icap_server.rs b/crates/exav/tests/icap_server.rs
index ec85cafe..6bdb1d64 100644
--- a/crates/exav/tests/icap_server.rs
+++ b/crates/exav/tests/icap_server.rs
@@ -776,10 +776,11 @@ fn a_clean_reqmod_without_allow_204_gets_its_request_back() {
     assert_eq!(r.code, 200, "{r:?}");
     assert_eq!(r.encapsulated_hdr, REQ_HDR);
     assert_eq!(r.body, payload);
-    assert!(r
-        .header("Encapsulated")
-        .unwrap()
-        .starts_with("req-hdr=0, req-body="));
+    assert!(
+        r.header("Encapsulated")
+            .unwrap()
+            .starts_with("req-hdr=0, req-body=")
+    );
 }
 
 #[test]
@@ -799,10 +800,11 @@ fn eicar_over_reqmod_is_blocked_with_a_response() {
     assert!(r.has_header("X-Infection-Found"));
     // Blocking a REQMOD means handing back an HTTP *response* for the client to
     // serve instead of forwarding the request.
-    assert!(r
-        .header("Encapsulated")
-        .unwrap()
-        .starts_with("res-hdr=0, res-body="));
+    assert!(
+        r.header("Encapsulated")
+            .unwrap()
+            .starts_with("res-hdr=0, res-body=")
+    );
     assert!(String::from_utf8_lossy(&r.encapsulated_hdr).starts_with("HTTP/1.1 403 Forbidden"));
 }
 
diff --git a/crates/exav/tests/listeners.rs b/crates/exav/tests/listeners.rs
index 94feeb10..926a8e9e 100644
--- a/crates/exav/tests/listeners.rs
+++ b/crates/exav/tests/listeners.rs
@@ -1236,6 +1236,196 @@ fn the_baseline_still_answers_on_an_opted_in_run() {
     assert!(icap_respmod(icap, eicar()).contains("Exav.Test.EICAR"));
 }
 
+/// One clamd command answered in `limit`, or `None` when nothing came back.
+fn clamd_command_within(port: u16, command: &[u8], limit: Duration) -> Option<String> {
+    let mut s = TcpStream::connect(("127.0.0.1", port)).ok()?;
+    s.set_read_timeout(Some(limit)).ok()?;
+    s.write_all(command).ok()?;
+    let mut out = Vec::new();
+    let mut buf = [0u8; 256];
+    // A reply ends at its terminator; the connection may stay open after it.
+    while !out.ends_with(&[0]) && !out.ends_with(b"\n") {
+        match s.read(&mut buf) {
+            Ok(0) | Err(_) => break,
+            Ok(n) => out.extend_from_slice(&buf[..n]),
+        }
+    }
+    (!out.is_empty()).then(|| {
+        String::from_utf8_lossy(&out)
+            .trim_end_matches('\0')
+            .trim()
+            .into()
+    })
+}
+
+/// A `PING` to the scan listener waits for a worker, and a health listener
+/// does not: with the only worker held in a job, the first gets no answer and
+/// the second, and `exav --ping` pointed at the same configuration, do.
+#[test]
+fn a_health_listener_answers_while_every_worker_is_busy() {
+    let sigs = sig_dir();
+    let (clamd, health) = (free_port(), free_port());
+    let listen = format!("clamd://127.0.0.1:{clamd}");
+    let listen_health = format!("clamd://127.0.0.1:{health}");
+    let args = [
+        "--workers",
+        "1",
+        "--listen",
+        &listen,
+        "--listen-health",
+        &listen_health,
+        "--sig-dir",
+        sigs.path().to_str().unwrap(),
+    ];
+    let _server = Server::start(TempDir::new().unwrap(), &args);
+    assert_eq!(clamd_ping(clamd), "PONG");
+    // The worker, held in an INSTREAM that never ends.
+    let mut busy = dial(clamd, "clamd");
+    busy.write_all(b"zINSTREAM\0").unwrap();
+    busy.write_all(&4u32.to_be_bytes()).unwrap();
+    busy.write_all(b"ab").unwrap();
+    std::thread::sleep(Duration::from_millis(500));
+
+    assert_eq!(
+        clamd_command_within(clamd, b"zPING\0", Duration::from_secs(2)),
+        None,
+        "the scan listener has no worker to answer with"
+    );
+    let started = Instant::now();
+    let reply = until_answered("health ping", || {
+        clamd_command_within(health, b"zPING\0", Duration::from_secs(5))
+            .ok_or_else(|| io::Error::other("no reply"))
+    });
+    assert_eq!(reply, "PONG");
+    assert!(
+        started.elapsed() < Duration::from_secs(5),
+        "{:?}",
+        started.elapsed()
+    );
+    let version = clamd_command_within(health, b"zVERSION\0", Duration::from_secs(5)).unwrap();
+    assert!(version.starts_with("ClamAV "), "{version}");
+    let refused =
+        clamd_command_within(health, b"zSCAN /etc/passwd\0", Duration::from_secs(5)).unwrap();
+    assert!(
+        refused.contains("only PING, VERSION and STATS"),
+        "{refused}"
+    );
+
+    let ping = Command::new(exav_bin())
+        .args([
+            "--ping",
+            "--listen",
+            &listen,
+            "--listen-health",
+            &listen_health,
+        ])
+        .output()
+        .expect("run exav --ping");
+    assert!(
+        ping.status.success(),
+        "exav --ping: {}",
+        String::from_utf8_lossy(&ping.stderr)
+    );
+    assert!(String::from_utf8_lossy(&ping.stdout).contains(&health.to_string()));
+    drop(busy);
+}
+
+/// What a process that scanned nothing reports of the pool: the scans the
+/// workers made. Each worker counted into its own
+/// memory before, so the health child (and any worker asked) said "0".
+#[test]
+fn stats_are_the_pools_from_any_process() {
+    let sigs = sig_dir();
+    let (clamd, health) = (free_port(), free_port());
+    let _server = Server::start(
+        TempDir::new().unwrap(),
+        &[
+            "--workers",
+            "3",
+            "--listen",
+            &format!("clamd://127.0.0.1:{clamd}"),
+            "--listen-health",
+            &format!("clamd://127.0.0.1:{health}"),
+            "--sig-dir",
+            sigs.path().to_str().unwrap(),
+        ],
+    );
+    for _ in 0..6 {
+        assert!(clamd_instream(clamd, eicar()).contains("FOUND"));
+    }
+    let field = |stats: &str, name: &str| -> u64 {
+        let rest = stats.split(&format!("{name} ")).nth(1).unwrap_or_default();
+        rest.split_whitespace()
+            .next()
+            .and_then(|n| n.parse().ok())
+            .unwrap_or_else(|| panic!("no {name} in {stats}"))
+    };
+    let stats = |port: u16| {
+        until_answered("stats", || {
+            clamd_command_within(port, b"zSTATS\0", Duration::from_secs(5))
+                .map(|s| s.replace('\0', ""))
+                .ok_or_else(|| io::Error::other("no reply"))
+        })
+    };
+    let from_health = stats(health);
+    assert!(from_health.contains("SCANSTATS"), "{from_health}");
+    assert!(field(&from_health, "scans") >= 6, "{from_health}");
+    assert!(field(&from_health, "infected") >= 6, "{from_health}");
+    // The same from a worker, which has handled only some of the six.
+    assert!(field(&stats(clamd), "scans") >= 6);
+}
+
+#[test]
+fn an_icap_health_listener_answers_options_and_refuses_the_rest() {
+    for workers in ["1", "threads"] {
+        let sigs = sig_dir();
+        let (clamd, health) = (free_port(), free_port());
+        let _server = Server::start(
+            TempDir::new().unwrap(),
+            &[
+                "--workers",
+                workers,
+                "--listen",
+                &format!("clamd://127.0.0.1:{clamd}"),
+                "--listen-health",
+                &format!("icap://127.0.0.1:{health}"),
+                "--sig-dir",
+                sigs.path().to_str().unwrap(),
+            ],
+        );
+        let ask = |method: &str| {
+            until_answered("health request", || {
+                let mut s = dial(health, "icap health");
+                s.write_all(
+                    format!(
+                        "{method} icap://127.0.0.1:{health}/avscan ICAP/1.0\r\nHost: h\r\n\r\n"
+                    )
+                    .as_bytes(),
+                )?;
+                let mut out = Vec::new();
+                s.read_to_end(&mut out)?;
+                Ok(String::from_utf8_lossy(&out).into_owned())
+            })
+        };
+        assert!(ask("OPTIONS").starts_with("ICAP/1.0 200 OK"), "{workers}");
+        assert!(ask("REQMOD").starts_with("ICAP/1.0 405 "), "{workers}");
+    }
+}
+
+#[test]
+fn a_health_listener_without_a_scan_listener_is_refused() {
+    let out = Command::new(exav_bin())
+        .args(["--allow-no-db", "--listen-health", "clamd://127.0.0.1:1"])
+        .output()
+        .expect("run exav");
+    assert_eq!(out.status.code(), Some(2));
+    assert!(
+        String::from_utf8_lossy(&out.stderr).contains("--listen-health"),
+        "{}",
+        String::from_utf8_lossy(&out.stderr)
+    );
+}
+
 /// Paths outside a temp dir are never touched by this suite; the helper exists
 /// so a stray absolute path in a future test fails to compile rather than
 /// scanning the developer's disk.
diff --git a/crates/exav/tests/office_text.rs b/crates/exav/tests/office_text.rs
new file mode 100644
index 00000000..9a41b01e
--- /dev/null
+++ b/crates/exav/tests/office_text.rs
@@ -0,0 +1,106 @@
+//! The office formats' text through the command line (`visible-text-office`):
+//! a DOC, an XLS and an RTF are matched as the words a reader sees, a link is
+//! judged with `--detect phishing`, and a document whose text cannot be taken
+//! out is `PARTIAL` (exit 3), never `OK`.
+
+#![cfg(feature = "visible-text-office")]
+
+use std::path::Path;
+use std::process::Command;
+
+#[path = "../src/tmpfile.rs"]
+mod tmpfile;
+use tmpfile::TempDir;
+
+const DOC: &[u8] = include_bytes!("../../exav-render/tests/fixtures/office/docs/sample.doc");
+const XLS: &[u8] = include_bytes!("../../exav-render/tests/fixtures/office/sheets/sample.xls");
+const PPT: &[u8] = include_bytes!("../../exav-render/tests/fixtures/office/slides/sample.ppt");
+
+/// A database of one text-view signature (`Target:7`) for `words`.
+fn sigs(words: &str) -> TempDir {
+    let d = TempDir::new().unwrap();
+    let hex: String = words.bytes().map(|b| format!("{b:02x}")).collect();
+    std::fs::write(
+        d.path().join("t.ndb"),
+        format!("Test.Office.Text:7:*:{hex}\n"),
+    )
+    .unwrap();
+    d
+}
+
+/// Exit code and stdout of `exav` on `file`.
+fn scan(db: &Path, file: &Path, extra: &[&str]) -> (i32, String) {
+    let out = Command::new(env!("CARGO_BIN_EXE_exav"))
+        .arg("-d")
+        .arg(db)
+        .args(extra)
+        .arg(file)
+        .output()
+        .unwrap();
+    (
+        out.status.code().unwrap_or(-1),
+        String::from_utf8_lossy(&out.stdout).into_owned(),
+    )
+}
+
+fn put(dir: &TempDir, name: &str, bytes: &[u8]) -> std::path::PathBuf {
+    let p = dir.path().join(name);
+    std::fs::write(&p, bytes).unwrap();
+    p
+}
+
+#[test]
+fn the_words_of_a_doc_an_xls_and_a_ppt_are_found() {
+    let dir = TempDir::new().unwrap();
+    for (name, bytes, words) in [
+        ("report.doc", DOC, "revenue grew by twelve percent"),
+        ("budget.xls", XLS, "merged note across three columns"),
+        ("deck.ppt", PPT, "revenue up 12%"),
+    ] {
+        let file = put(&dir, name, bytes);
+        let db = sigs(words);
+        let (code, out) = scan(db.path(), &file, &[]);
+        assert_eq!(code, 1, "{name}: {out}");
+        assert!(out.contains("Test.Office.Text FOUND"), "{name}: {out}");
+        // Words that are not in it: clean.
+        let other = sigs("words that no fixture holds");
+        let (code, out) = scan(other.path(), &file, &[]);
+        assert_eq!(code, 0, "{name}: {out}");
+    }
+}
+
+#[test]
+fn a_link_that_says_one_site_and_goes_to_another_is_found_in_an_rtf() {
+    let dir = TempDir::new().unwrap();
+    let rtf = b"{\\rtf1\\ansi Sign in: {\\field{\\*\\fldinst HYPERLINK \"https://evil.example/steal\"}{\\fldrslt https://www.paypal.com/login}}\\par}";
+    let file = put(&dir, "mail.rtf", rtf);
+    let db = sigs("never present");
+    let (code, out) = scan(db.path(), &file, &["--detect", "phishing"]);
+    assert_eq!(code, 1, "{out}");
+    assert!(
+        out.contains("Heuristics.Phishing.Email.SpoofedDomain FOUND"),
+        "{out}"
+    );
+    let (code, _) = scan(db.path(), &file, &[]);
+    assert_eq!(code, 0);
+}
+
+#[test]
+fn an_encrypted_doc_is_partial_not_ok() {
+    let dir = TempDir::new().unwrap();
+    let mut doc = DOC.to_vec();
+    let at = (1..doc.len() / 512)
+        .map(|s| s * 512)
+        .find(|&o| doc[o] == 0xEC && doc[o + 1] == 0xA5)
+        .expect("the FIB");
+    // fEncrypted, bit 8 of the FIB's flags.
+    doc[at + 0x0B] |= 0x01;
+    let file = put(&dir, "locked.doc", &doc);
+    let db = sigs("never present");
+    let (code, out) = scan(db.path(), &file, &[]);
+    assert_eq!(code, 3, "{out}");
+    assert!(out.contains("PARTIAL"), "{out}");
+    // The same file, not encrypted: OK.
+    let ok = put(&dir, "plain.doc", DOC);
+    assert_eq!(scan(db.path(), &ok, &[]).0, 0);
+}
diff --git a/crates/exav/tests/oneshot_timeout.rs b/crates/exav/tests/oneshot_timeout.rs
new file mode 100644
index 00000000..9cfe568e
--- /dev/null
+++ b/crates/exav/tests/oneshot_timeout.rs
@@ -0,0 +1,84 @@
+//! A one-shot run that `--max-scan-secs` ends keeps the exit code of what it had
+//! already found.
+//!
+//! The alarm ends the process from a signal handler, which can read nothing but
+//! atomics. A fixed exit code there turned a run that had reported a detection
+//! into a `3`, and `--partial-as` could not change it: the order the exit codes
+//! are documented in (a detection, then an error, then a partial file) stopped
+//! applying the moment the clock did.
+
+#![cfg(unix)]
+
+use std::process::{Command, Output};
+
+#[path = "../src/tmpfile.rs"]
+mod tmpfile;
+use tmpfile::TempDir;
+
+fn exav() -> Command {
+    let mut c = Command::new(env!("CARGO_BIN_EXE_exav"));
+    c.env("EXAV_ALLOW_NO_DB", "1");
+    c
+}
+
+/// A sparse file that takes seconds to scan and no disk.
+fn slow(dir: &TempDir) -> std::path::PathBuf {
+    let f = dir.path().join("zeros.bin");
+    std::fs::File::create(&f).unwrap().set_len(4 << 30).unwrap();
+    f
+}
+
+fn run(args: &[&str], paths: &[&std::path::Path]) -> Output {
+    exav()
+        .args(["--max-scan-secs", "1"])
+        .args(args)
+        .args(paths)
+        .output()
+        .unwrap()
+}
+
+#[test]
+fn a_detection_already_reported_stays_a_one() {
+    let dir = TempDir::new().unwrap();
+    let hit = dir.path().join("a-eicar.txt");
+    std::fs::write(&hit, exav_core::unpack::eicar()).unwrap();
+    let zeros = slow(&dir);
+    let o = run(&[], &[&hit, &zeros]);
+    let out = String::from_utf8_lossy(&o.stdout);
+    let err = String::from_utf8_lossy(&o.stderr);
+    assert!(out.contains("FOUND"), "{out}{err}");
+    assert!(
+        err.contains("exceeded --max-scan-secs"),
+        "the alarm did not end the run: {err}"
+    );
+    assert_eq!(o.status.code(), Some(1), "{out}{err}");
+    // Whatever `--partial-as` says about the file that ran out of time.
+    let o = run(&["--partial-as", "ok"], &[&hit, &zeros]);
+    assert_eq!(o.status.code(), Some(1));
+}
+
+#[test]
+fn an_error_already_reported_stays_a_two() {
+    let dir = TempDir::new().unwrap();
+    let missing = dir.path().join("not-there.txt");
+    let zeros = slow(&dir);
+    let o = run(&[], &[&missing, &zeros]);
+    assert_eq!(
+        o.status.code(),
+        Some(2),
+        "{}",
+        String::from_utf8_lossy(&o.stderr)
+    );
+}
+
+#[test]
+fn the_file_that_ran_out_of_time_is_what_partial_as_says() {
+    let dir = TempDir::new().unwrap();
+    let zeros = slow(&dir);
+    let by = |policy: &[&str]| run(policy, &[&zeros]).status.code();
+    assert_eq!(by(&[]), Some(3));
+    assert_eq!(by(&["--partial-as", "ok"]), Some(0));
+    assert_eq!(by(&["--partial-as", "found"]), Some(1));
+    assert_eq!(by(&["--partial-as", "error"]), Some(2));
+    assert_eq!(by(&["--partial-as", "limits-exceeded=ok"]), Some(0));
+}
diff --git a/crates/exav/tests/split_volumes.rs b/crates/exav/tests/split_volumes.rs
new file mode 100644
index 00000000..845fb4df
--- /dev/null
+++ b/crates/exav/tests/split_volumes.rs
@@ -0,0 +1,267 @@
+//! `exav` must see the volumes of a RAR, ZIP or CAB set as the archive they are.
+//!
+//! Each volume holds part of a member, so a volume scanned alone shows nothing
+//! of it. The ZIP fixture is `zip -0 -s 64k e.zip e.bin` of 70,000 bytes with
+//! the EICAR line placed across the place the first part ends: neither part
+//! holds it, and only the rejoined archive does. The cabinets are built here
+//! with the line cut in the same way. The RAR sets are official RAR's, and
+//! are found by the MD5 of the member split across all their volumes
+//! (exav-core's `tests/fixtures/volumes`).
+
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+#[path = "../src/tmpfile.rs"]
+mod tmpfile;
+use tmpfile::TempDir;
+
+fn exav() -> Command {
+    let mut c = Command::new(env!("CARGO_BIN_EXE_exav"));
+    c.env("EXAV_ALLOW_NO_DB", "1");
+    c
+}
+
+fn fixture(dir: &str, name: &str) -> Vec<u8> {
+    let p: PathBuf = [env!("CARGO_MANIFEST_DIR"), dir, name].iter().collect();
+    exav_core::unpack::read_fixture(&p.to_string_lossy())
+        .unwrap_or_else(|e| panic!("{}: {e}", p.display()))
+}
+
+/// `exav --json -d <empty> <targets>` -> the result objects, the summary dropped.
+fn scan(db: &Path, targets: &[&Path]) -> Vec<serde_json::Value> {
+    let out = exav()
+        .arg("-d")
+        .arg(db)
+        .arg("--json")
+        .args(targets)
+        .output()
+        .expect("run exav");
+    let stdout = String::from_utf8_lossy(&out.stdout);
+    let mut objs: Vec<serde_json::Value> = stdout
+        .lines()
+        .map(|l| serde_json::from_str(l).unwrap_or_else(|e| panic!("{e} on {l:?}")))
+        .collect();
+    objs.pop();
+    objs
+}
+
+fn found<'a>(objs: &'a [serde_json::Value], file: &str) -> Option<&'a serde_json::Value> {
+    objs.iter()
+        .find(|o| o["status"] == "FOUND" && o["file"].as_str().unwrap_or("").ends_with(file))
+}
+
+fn zip_set(dir: &Path) {
+    for n in ["e.z01", "e.zip"] {
+        std::fs::write(dir.join(n), fixture("tests/fixtures/split", n)).unwrap();
+    }
+}
+
+#[test]
+fn a_split_zip_in_a_directory_is_rejoined_and_found() {
+    let dir = TempDir::new().unwrap();
+    zip_set(dir.path());
+    let db = TempDir::new().unwrap();
+    let objs = scan(db.path(), &[dir.path()]);
+    let hit = found(&objs, "e.zip")
+        .unwrap_or_else(|| panic!("the rejoined archive is not reported: {objs:#?}"));
+    assert!(
+        hit["signature"].as_str().unwrap_or("").contains("Eicar"),
+        "{hit}"
+    );
+    // Nothing is reported FOUND for a fragment.
+    assert!(found(&objs, "e.z01").is_none(), "{objs:#?}");
+}
+
+#[test]
+fn a_part_named_alone_is_scanned_with_its_siblings() {
+    let dir = TempDir::new().unwrap();
+    zip_set(dir.path());
+    let db = TempDir::new().unwrap();
+    for part in ["e.z01", "e.zip"] {
+        let objs = scan(db.path(), &[&dir.path().join(part)]);
+        assert!(
+            found(&objs, "e.zip").is_some(),
+            "{part} named alone: {objs:#?}"
+        );
+    }
+}
+
+#[test]
+fn parts_that_are_not_next_to_each_other_are_not_joined() {
+    let db = TempDir::new().unwrap();
+    let (a, b) = (TempDir::new().unwrap(), TempDir::new().unwrap());
+    std::fs::write(
+        a.path().join("e.z01"),
+        fixture("tests/fixtures/split", "e.z01"),
+    )
+    .unwrap();
+    std::fs::write(
+        b.path().join("e.zip"),
+        fixture("tests/fixtures/split", "e.zip"),
+    )
+    .unwrap();
+    for dir in [a.path(), b.path()] {
+        let objs = scan(db.path(), &[dir]);
+        assert!(objs.iter().all(|o| o["status"] != "FOUND"), "{objs:#?}");
+    }
+}
+
+#[cfg(unix)]
+#[test]
+fn a_symbolic_link_is_not_a_part() {
+    // The last part is a link to a file elsewhere: a name next to the scanned
+    // file is not a licence to read what the link points at.
+    let dir = TempDir::new().unwrap();
+    let elsewhere = TempDir::new().unwrap();
+    std::fs::write(
+        elsewhere.path().join("target.zip"),
+        fixture("tests/fixtures/split", "e.zip"),
+    )
+    .unwrap();
+    std::fs::write(
+        dir.path().join("e.z01"),
+        fixture("tests/fixtures/split", "e.z01"),
+    )
+    .unwrap();
+    std::os::unix::fs::symlink(
+        elsewhere.path().join("target.zip"),
+        dir.path().join("e.zip"),
+    )
+    .unwrap();
+    let db = TempDir::new().unwrap();
+    let objs = scan(db.path(), &[&dir.path().join("e.z01")]);
+    assert!(objs.iter().all(|o| o["status"] != "FOUND"), "{objs:#?}");
+}
+
+/// A cabinet of one uncompressed folder.
+fn cab(
+    prev: Option<&str>,
+    next: Option<&str>,
+    index: u16,
+    size: u32,
+    place: u16,
+    uncompressed: u16,
+    payload: &[u8],
+) -> Vec<u8> {
+    let flags = u16::from(prev.is_some()) | (u16::from(next.is_some()) << 1);
+    let mut links = Vec::new();
+    for n in [prev, next].into_iter().flatten() {
+        links.extend_from_slice(n.as_bytes());
+        links.extend_from_slice(b"\0disk\0");
+    }
+    let mut file = Vec::new();
+    file.extend_from_slice(&size.to_le_bytes());
+    file.extend_from_slice(&0u32.to_le_bytes());
+    file.extend_from_slice(&place.to_le_bytes());
+    file.extend_from_slice(&[0x21, 0x5a, 0x00, 0x60, 0x20, 0x00]);
+    file.extend_from_slice(b"eicar.com\0");
+    let coff_files = 36 + links.len() + 8;
+    let data_at = coff_files + file.len();
+    let mut block = Vec::new();
+    block.extend_from_slice(&0u32.to_le_bytes());
+    block.extend_from_slice(&(payload.len() as u16).to_le_bytes());
+    block.extend_from_slice(&uncompressed.to_le_bytes());
+    block.extend_from_slice(payload);
+    let mut out = b"MSCF".to_vec();
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&((data_at + block.len()) as u32).to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&(coff_files as u32).to_le_bytes());
+    out.extend_from_slice(&0u32.to_le_bytes());
+    out.extend_from_slice(&[3, 1]);
+    for v in [1u16, 1, flags, 3, index] {
+        out.extend_from_slice(&v.to_le_bytes());
+    }
+    out.extend(links);
+    out.extend_from_slice(&(data_at as u32).to_le_bytes());
+    out.extend_from_slice(&1u16.to_le_bytes());
+    out.extend_from_slice(&0u16.to_le_bytes());
+    out.extend(file);
+    out.extend(block);
+    out
+}
+
+#[test]
+fn a_cab_set_is_rejoined_by_the_names_its_headers_give() {
+    let eicar = exav_core::unpack::eicar();
+    let cut = eicar.len() / 2;
+    let one = cab(
+        None,
+        Some("disk2.cab"),
+        0,
+        eicar.len() as u32,
+        0xFFFE,
+        0,
+        &eicar[..cut],
+    );
+    let two = cab(
+        Some("disk1.cab"),
+        None,
+        1,
+        eicar.len() as u32,
+        0xFFFD,
+        eicar.len() as u16,
+        &eicar[cut..],
+    );
+    let dir = TempDir::new().unwrap();
+    std::fs::write(dir.path().join("disk1.cab"), &one).unwrap();
+    std::fs::write(dir.path().join("disk2.cab"), &two).unwrap();
+    let db = TempDir::new().unwrap();
+    let objs = scan(db.path(), &[dir.path()]);
+    assert!(found(&objs, "disk1.cab").is_some(), "{objs:#?}");
+    // A neighbour under another name is not the cabinet the header names.
+    let other = TempDir::new().unwrap();
+    std::fs::write(other.path().join("disk1.cab"), &one).unwrap();
+    std::fs::write(other.path().join("renamed.cab"), &two).unwrap();
+    let objs = scan(db.path(), &[other.path()]);
+    assert!(objs.iter().all(|o| o["status"] != "FOUND"), "{objs:#?}");
+    assert!(
+        objs.iter()
+            .any(|o| o["status"] == "PARTIAL"
+                && o["file"].as_str().unwrap_or("").ends_with("disk1.cab")),
+        "{objs:#?}"
+    );
+}
+
+#[test]
+fn a_rar_set_is_rejoined_and_its_split_member_found() {
+    let sets = [
+        (
+            "set5",
+            ["set5.part1.rar", "set5.part2.rar", "set5.part3.rar"],
+        ),
+        ("set4", ["set4.rar", "set4.r00", "set4.r01"]),
+    ];
+    // The MD5 of `noise.bin`, which every volume of both sets holds part of.
+    let db = TempDir::new().unwrap();
+    std::fs::write(
+        db.path().join("t.hdb"),
+        "147b5c8ca1767bca1ef297b3024fb0dd:20000:Test.Noise\n",
+    )
+    .unwrap();
+    for (set, parts) in sets {
+        let dir = TempDir::new().unwrap();
+        for p in parts {
+            std::fs::write(
+                dir.path().join(p),
+                fixture("../exav-core/tests/fixtures/volumes", p),
+            )
+            .unwrap();
+        }
+        let objs = scan(db.path(), &[dir.path()]);
+        let hit = found(&objs, &format!("{set}.rar")).unwrap_or_else(|| panic!("{set}: {objs:#?}"));
+        assert!(
+            hit["signature"]
+                .as_str()
+                .unwrap_or("")
+                .contains("Test.Noise"),
+            "{hit}"
+        );
+        // One of its volumes named alone finds it as well.
+        let objs = scan(db.path(), &[&dir.path().join(parts[1])]);
+        assert!(
+            found(&objs, &format!("{set}.rar")).is_some(),
+            "{set} by its second volume: {objs:#?}"
+        );
+    }
+}
diff --git a/deny.toml b/deny.toml
index cac6d6b2..dca617e6 100644
--- a/deny.toml
+++ b/deny.toml
@@ -9,6 +9,17 @@ yanked = "deny"
 # release available; none is reachable in exav's usage. Revisit on every
 # dependency bump (a fixed release should drop the ignore, not keep it).
 ignore = [
+    # The JPEG XL decoder of @exav/viewer's image module (zenjxl-decoder, the
+    # viewer workspace only) uses a proc-macro crate that is marked
+    # unmaintained. It runs at build time only: no code of it is in the wasm
+    # module, and it is not a vulnerability. `simd_function!` of
+    # zenjxl-decoder-simd expands to `paste::paste!` in the decoder, so the
+    # crate stays until that macro is rewritten.
+    "RUSTSEC-2024-0436", # paste, via zenjxl-decoder and zenjxl-decoder-simd
+    # The same decoder's derive macros (zenjxl-decoder-macros) use another
+    # proc-macro crate that its author no longer maintains. Build time only,
+    # and not a vulnerability. It goes with the decoder's own fix.
+    "RUSTSEC-2026-0173", # proc-macro-error2, via zenjxl-decoder-macros
     # NOTE: RUSTSEC-2023-0071 (`rsa` "Marvin") is intentionally NOT listed. `rsa`
     # is not in the tree: the native YARA engine does `pe` via `goblin`
     # and needs no Authenticode RSA, so the advisory has nothing to apply to.
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
new file mode 100644
index 00000000..86930598
--- /dev/null
+++ b/docs/ARCHITECTURE.md
@@ -0,0 +1,108 @@
+# Architecture
+
+How the crates fit together, where each file format is read, and the rule that
+keeps one format from being parsed twice. The format list itself is
+`formats/registry.json`, from which the format matrix of the documentation is
+generated.
+
+## Crates
+
+| Crate | Role | Depends on |
+|---|---|---|
+| `exav-unpack` | Opens containers within bounds: detects a format, walks the members of an archive, a disk image or a document, and holds the readers of the file formats (see below). Memory-safe, no C. | none of the others |
+| `exav-render` | Turns a file into something to draw: images into pixels, drawings and models into geometry, office documents into XLSX, PPTX and DOCX. Also the text a reader sees, for the scanner. | `exav-unpack` |
+| `exav-imagehash` | Perceptual hashes of the pixels `exav-render` decodes, equal to ClamAV's. | `exav-render` |
+| `exav-core` | The scanner: signature databases, pattern and hash matching, YARA, the bytecode interpreter, the scan of every object that comes out of `exav-unpack`. | `exav-unpack`; optionally `exav-render` (text views) |
+| `exav` | The CLI and the clamd and ICAP daemon around `exav-core`. | `exav-core` |
+| `exav-grep` | Search inside archives. | `exav-unpack`; optionally `exav-render` |
+| `exav-update` | Fetches signature databases. Kept apart so that the scanner links no TLS. | none |
+| `exav-pe-emu`, `exav-x86` | Emulator and decoder for runtime-packed PE files. | none |
+| `exav-unpack-wasm` | `exav-unpack` for the browser. | `exav-unpack` |
+| `exav-viewer` | The WebAssembly modules of `@exav/viewer` (images, drawings, models, office conversion), built from `exav-render`, and the TypeScript viewer around them. | `exav-render` |
+
+The arrow only points one way: the readers are at the bottom, and what draws
+or scans sits above them.
+
+## The rule: one reader per format
+
+A format is read by one piece of code, whatever asks. Two readers of the same
+bytes can disagree, and a scanner that sees one thing where the viewer shows
+another is an evasion. So:
+
+- A **reader** is a module of `exav-unpack` that turns bytes into the format's
+  own structures and nothing else: none of the scan's state (its `Budget`, its
+  member count, its depth), no model of a document. The limits it needs come in
+  as arguments (a stream is read with a cap), it never reads past its input,
+  and it never allocates by a count the file declares. It is public, so that
+  `exav-render` uses it.
+- The **scanner's adapter** sits on the reader in `exav-unpack`: it walks the
+  structures, charges the scan's budget, names the members, and reports what it
+  could not read.
+- The **converter's adapter** sits on the same reader in `exav-render`: it
+  builds the model of a document and writes it as XLSX, PPTX or DOCX.
+
+Readers that exist today:
+
+| Module (`exav_unpack::`) | Format | Used by |
+|---|---|---|
+| `cfb` | OLE2 compound files (Word, Excel, PowerPoint 97 to 2003, Publisher, Visio, MSI, the package of an encrypted OOXML file) | the scanner (`ole`), every legacy converter |
+| `biff` | BIFF, the records of Excel 2 to 2003: the record stream (CONTINUE joined), the workbook tables formulas need (sheets, names, external references) and the formula tokens, written as Excel writes them (`=EXEC("calc")`) | the scanner (Excel 4.0 macro sheets), the XLS converter |
+| `charset` | Text in a Windows code page number | the BIFF reader, the office converters |
+| `html` | HTML as tokens (html5gum), and a page's bytes as text in the encoding it names | the scanner's text view, the spreadsheet and text document converters |
+| `offcrypto` | Excel workbooks with a password: RC4, RC4 CryptoAPI, XOR | the scanner, the XLS converter |
+| `rtf` | The RTF tokenizer | the scanner (embedded objects), the RTF converter |
+| `dxf`, `dwg` | AutoCAD drawings | the scanner (embedded payloads), the drawing model of `exav-render` |
+| `text` | The text of HTML, the XML parts of office files and PDF | the scanner's text views, `exav-render`'s `text` |
+
+The readers sit behind the same Cargo features as the formats, and
+`exav-render` turns on the ones its converters need (`exav-unpack/ole`,
+`html`, `offcrypto`, `rtf`), so a build of one converter links only those.
+
+## How a file is read
+
+**Scan.** `exav-core` hands a file to `exav_unpack::walk`, which names the
+format and yields the members one at a time (decoded as they are read where the
+format allows). Each member is scanned as an object of its own, and the
+members of members the same way, within the budget of the scan. A document that
+has a text view is scanned as its text too. A format that is recognised and not
+opened is reported, never passed as clean.
+
+**View.** The viewer sniffs the file in TypeScript (`ts/core/formats.ts`, kept
+equal to the registry by a test), picks the plugin, and hands the bytes to the
+WebAssembly module built from `exav-render` for that kind of file: pixels for
+an image, geometry for a drawing, a DOCX, XLSX or PPTX for an office document.
+The viewer draws those. Archives are listed through `exav-unpack-wasm`.
+
+## Budgets
+
+The scan counts members, bytes and depth in `exav_unpack::Budget`, plus
+key derivations over the whole scan (`kdf`). The converters of `exav-render`
+count the paragraphs, cells or shapes of a model and an estimate of the memory
+it takes, each in its own `limits.rs`. The estimates follow the size of the
+model's types, so that a limit a host sets is a limit on memory. The XML tree
+(`common/xml.rs`) tells the memory it builds to the converter's budget as it
+grows, and drawings are read within `cad::limits_within(memory)`, so a
+document made of many tiny elements costs what its tree takes, not a multiple
+of its bytes.
+
+## Where the same format is still read twice
+
+These are the duplications left; each is a reader to extract into
+`exav-unpack` and have the other side use. They are in `docs/BACKLOG.md`.
+
+| Format | Scanner side | Converter side |
+|---|---|---|
+| PowerPoint records | `ole.rs` (embedded storages) | `slides/ppt/records.rs` |
+| Word FIB | `ole.rs` (the encryption flag) | `docs/doc/fib.rs` |
+| ZIP packages | `formats/zip.rs` | `common/package.rs` (the `zip` crate, its own limits) |
+| XML trees | `text/xml.rs` | `common/xml.rs` (one tree for the three converters) |
+| Code pages | `formats/codepage.rs` (drawings, by AutoCAD's names) | `formats/charset.rs` (by number, with the tables) |
+
+## Testing the readers
+
+Each reader has unit tests with the vectors of the format's own specification
+or of real files, and the test inputs of the other side are built with an
+independent writer where one exists (the `cfb` crate writes compound files for
+the tests of `exav_unpack::cfb`; `offcrypto::encrypt` is written from the
+specification apart from the decryptor). Every defect found in a reader gets a
+test that fails without the fix.
diff --git a/docs/BACKLOG.md b/docs/BACKLOG.md
index cb4ad5e4..bd1ce49e 100644
--- a/docs/BACKLOG.md
+++ b/docs/BACKLOG.md
@@ -7,11 +7,14 @@ is on exav.org.
 ## Search and text
 
 - **exav-grep `--text`**: search the text a viewer would show rather than raw
-  bytes: DWG/DXF (TEXT, MTEXT without format codes, attributes, tables, layer
-  and block names, from exav-render's drawing model), IFC names and property
-  values, OOXML paragraph text then legacy `.doc`/`.xls`, PDF text through
-  ToUnicode and font encodings, decoded HTML and email. Matches located by
-  page, sheet or entity (`plans.zip!a1.dwg!layout "A1"/MTEXT 2F3`).
+  bytes. Done: Markdown, HTML, the XML parts of OOXML and ODF files, DWG and DXF
+  (TEXT, MTEXT without format codes, attributes, layer and block names, from
+  exav-render's drawing model), PDF text (opt-in `text-pdf`) and, with
+  `text-office`, the legacy and flat office formats (DOC, XLS, PPT, RTF, Word
+  2003 XML, SpreadsheetML 2003, SYLK, FODT, FODS, FODP, FODG, Numbers, Pages,
+  Keynote), located by sheet or slide (`book.xls!text/sheet "Budget"`). To do:
+  IFC names and property values, decoded email, matches located by page and by
+  entity (`plans.zip!a1.dwg!layout "A1"/MTEXT 2F3`).
 - **exav-grep `--ocr`**: images (all exav-render formats, fax TIFF and JBIG2
   included) and scanned PDF pages rasterised by hayro, through a pure-Rust OCR
   (`ocrs`, MIT/Apache, on a pure-Rust runtime; model about 10 MB, behind a
@@ -21,86 +24,450 @@ is on exav.org.
 - **QR codes for the scanner**: decode QR codes in images and PDFs (pure-Rust
   `rqrr`, MIT/Apache) so signatures can match their URLs ("quishing").
 - **Visible-text layer for the scanner**: let signatures match a document's
-  extracted text (the `--text` extractors), not only its bytes.
-
-## Signatures
-
-- **`EP` and section offsets on ELF and Mach-O**: ClamAV resolves `EP`,
-  `Sn`, `SL` and `SEn` on both; exav builds the layout from a PE only
-  (`pe_image` in `crates/exav-core/src/lib.rs`), so such a subsignature never
-  matches there. No ELF or Mach-O signature in `daily` 28140 uses one;
-  `main` not checked.
+  extracted text (the `--text` extractors), not only its bytes. Done for
+  Markdown, HTML, the XML parts of Office and OpenDocument files, drawings,
+  (opt-in) PDF and (opt-in, `visible-text-office`) the legacy and flat office
+  formats: `visible-text` in exav-core, `exav-grep --text`, through
+  `exav_render::text::visible_text`, matched as a text view; a link's label and
+  target are in that text, and `--alert-phishing` judges them. An office
+  document whose text cannot be taken out (encrypted, past a limit, damaged)
+  marks the scan incomplete. To do: an email's headers (its bodies are members,
+  HTML and text, and are read); the hyperlinks of OOXML files, which live in
+  the `.rels` parts, apart from their labels; PDF link annotations (hayro is
+  run without annotations); IFC names and property values; speaker notes and
+  animations text of presentations (the converters leave them out); PDF text
+  without hayro's `unsafe` feature (a vendored patch of hayro-interpret, as the
+  viewer does for zenjxl-decoder) so that it can be a default; making
+  `visible-text-office` a default (the readers are the largest of the scan).
+  Markdown is known by its extension, and a Markdown file with another name is
+  not read; a compound file is read as an office document by its extension
+  (`.doc`, `.xls`, `.ppt` and their templates), so as not to read an installer
+  whole to find out.
 
 ## Formats
 
+- **One reader per format**: the compound file, the encrypted workbook, RTF,
+  BIFF (records, workbook tables, formulas) and HTML are read once for the
+  scanner and the converters ([ARCHITECTURE.md](ARCHITECTURE.md)). Left to
+  extract into `exav-unpack`: the PowerPoint records and the Word FIB (the
+  scanner reads them to find embedded storages and the encryption flag, the
+  converters to build the document), ZIP packages (the converters open them
+  with the `zip` crate and limits of their own), the XML trees, and the two
+  tables of code pages (AutoCAD's names for drawings, numbers for BIFF; both
+  end in `encoding_rs`). Merging the three `limits.rs` of the converters into
+  one budget is part of it. The scripts that generated the function table of
+  BIFF (`ftab.py`, `ftab.json` in `exav-render/scripts/office/sheets`) write a
+  file that no longer exists; the table in `biff/ftab.rs` is edited by hand.
+- **Recognised, not opened (planned for 0.0.4)**: these formats are typed and
+  reported `UNSCANNABLE` (`formats/reported.rs`, `formats/inno.rs`), never
+  clean, and none is extracted. By how much each needs:
+  - *AppleSingle and AppleDouble*: a short header and a table of entries
+    (RFC 1740); the data fork and the resource fork are members. Read the RFC
+    and write a fixture first.
+  - *InstallShield InstallScript cabinets* (`ISc(`): port of the C `unshield`
+    project, which is under the MIT licence (NOTICE entry). The format is
+    undocumented apart from that code. *InstallShield MSI* is a compound file
+    with the cabinet in a stream; to check what the cabinet reader needs.
+  - *StuffIt* (`.sit`): methods 0, 13, 14 and 15 are read by the `stuffit`
+    crate (Apache-2.0 or MIT, which names The Unarchiver as its reference: its
+    provenance has to be checked against the rule about sources read). StuffIt
+    X (`.sitx`) is not covered by it.
+  - *Inno Setup*: see the item below; innoextract (zlib licence) is the
+    reference, and the layout changes by version.
+  - *ACE*: `acefile` (BSD-2) documents ACE 1.0 and 2.0 from a 1998 format note
+    and two reference tools. There is no valid sample to check a decoder
+    against, so it stays reported until one is found.
+  - *lrzip*: defined only by GPL source that exav does not read; no
+    permissive implementation exists. Stays reported.
+  - *CryptFF*: encrypted; the right outcome is `PASSWORD-PROTECTED`, as now.
+- **Decoder oracle tests**: the LZFSE/LZVN and DCL differential tests against
+  Apple's lzfse and zlib's blast (`#[ignore]`d, built by
+  `crates/exav-unpack/tests/oracle/build.sh`) run on request only; a `make`
+  target and a place in the nightly campaign are not done.
 - **MHTML** (`.mht`, `.mhtml`): look into what exav does beyond typing it
   (`CL_TYPE_MHTML` in `crates/exav-core/src/filetype.rs`): extraction of
   parts, encodings, scripts, viewer support. To scope first.
 - **DWG before R13** (AC1009 and older): reported as an unsupported version
   today; the ODA specification does not document these releases.
-- **IFC geometry**: conical, spherical and toroidal B-rep faces, B-spline face
-  trimming, IFC4X3 alignments, sweep start and end parameters, grid
-  placements, a storey filter in the viewer (listed on the exav-render docs
-  page).
-- **CAB MSZIP and LZX** lose the block or frame being decoded when a cut or
-  damage stops it (limit of the decoding library).
-- **ZIP's buffered path** (`decode_zip_raw`, reachable only through the
-  `extract` API) does not keep a decoded prefix on error.
+- **Disks read in place, what is left** (docs/STREAMING_FORMATS.md): a
+  partition table inside a partition is not followed in place; DMG's
+  reader does not count what it decodes against the scan budget as the other
+  disks do; a truncated or damaged streamOptimized VMDK is indexed by its
+  markers, which is not how VMware finds a grain (its tables).
+
+## Large files and memory
+
+What a scan holds does not grow with a file's size for most inputs
+([Streaming & memory](https://exav.org/scanner/concepts/streaming-memory/)).
+What is left, most worth doing first.
+
+**Tabled for 0.0.4: no scan holds a whole object.** The aim is that a file
+of any size is scanned in bounded memory, with no check skipped for being large
+and no format opened only if it fits. What still holds a whole object, in the
+order to take it:
+
+1. RAR, the largest gap (the first item below).
+2. A PE's structure and the checks that follow from it, read through the block
+   cache (the second item), which takes the packed-PE readers (NSIS, AutoIt,
+   UPX) with it.
+3. One forward pass over a file past the limit, the members that spill, the
+   block cache's policy, and HTTP sources (the next four items).
+4. OLE and MSI, then email and mailboxes.
+5. 7z folders with an encrypted coder or BCJ2, and the files a filesystem stores
+   compressed.
+6. Sparse files, and exav-grep's container inside a member over the limit.
+7. The small formats read whole (CHM, ARJ, ZOO, ARC, ALZ, EGG, InstallShield Z,
+   BinHex, uuencode) and the WIM name tree, each only when someone meets one past
+   the limit.
+
+PDF stays on the block cache: its cross-reference table is at the end, and
+holding the file is what recovery needs. The `exav-render` converters hold their
+document model, bounded by `max_memory`; they are the viewer's, not the
+scanner's, and are not part of this aim.
+
+- **RAR**: `rar3_unpack.rs` and `rar5_unpack.rs` are vendored decoders that
+  build the whole output, so a RAR past `--max-object-bytes` is
+  `LIMITS-EXCEEDED` and its members are not reached, and big RARs are common.
+  Streaming them means turning both into resumable readers that keep only the
+  window, on fuzzed and differential-tested code where a subtle break costs
+  correctness on a format attackers use. A focused effort of its own.
+- **PE structure past the limit**: a PE over `--max-object-bytes` skips the
+  checks that parse it whole (layout, imports, icons, Authenticode, packer
+  unpacking, YARA's `pe`, `elf` and `dotnet` modules) and is `LIMITS-EXCEEDED`
+  unless something is found. Parsing the headers, sections and imports through
+  the block cache would cover a small executable with a large overlay and
+  installers past the limit. NSIS, AutoIt, UPX and the other packed-PE
+  readers take the executable whole too, and follow from it.
+- **One forward pass**: a file past the limit is read several times over
+  (detection and the digests share one read; the signature sweep, YARA's
+  prefilter and the checks that verify a match read again). Feeding them from
+  one pass makes a large scan faster and cheaper over HTTP. Measured over HTTP
+  with a hash, a gap and a pattern signature: 4.4 passes of a 300 MB object in
+  176 requests, which the passes alone account for (1.33 GB in requests of up
+  to 8 MiB is about 160), so verification's scattered reads are a small part
+  there; a database that matches more verifies more. The sweeps would collect
+  the places a match must be verified, and a last pass would verify them sorted
+  by offset, so each block is fetched once. Carving's lookups of the headers an
+  `MZ` points to already work that way. That also
+  settles the compressed members below, since the passes could re-run a decoder
+  instead of re-reading a spill file.
+- **The block cache's policy**: it is LRU, which is the worst policy for passes
+  over an object larger than the cache (each block is evicted just before the
+  next pass needs it; a 20 MB ZIP was read six times over with 8 MiB). Ideas, to
+  be tried on a recorded trace before any is built (log the block indexes of the
+  300 MB scan with a hash, a gap and a pattern signature, replay them offline
+  under each policy):
+  - most recently used for the sequential passes, which keeps the head of the
+    object resident, a hit rate of cache over size (about 40% for that ZIP, 2.7%
+    for the 300 MB file); no help once the object is many times the cache;
+  - scan resistance: a sequential run reads through without being inserted, or
+    into a small area of its own, so the scattered reads (verification, a
+    container's directory and headers) keep the cache;
+  - the head of the object (detection, headers, a ZIP's directory) pinned;
+  - sorting the verification reads, which is the forward pass above and beats
+    any policy: raising the cache from 8M to 32M left the requests of the 300 MB
+    scan at 176, so the scattered misses there are first touches, not reuse.
+
+  The cache also evicts by scanning its blocks for the least recently used, so a
+  cache of many small blocks (`--object-cache-block-bytes 4K` with a large
+  `--object-cache-bytes`) pays that scan at each miss; a linked list would not.
+- **Members without a spill**: every streamed member over `--max-object-bytes`
+  is written to a spill file, which bounds the member by `--max-spill-bytes`
+  (2 GiB) and needs the disk, and its normalised text views need as much again.
+  `Member` has `Bytes` and `Stream` only. Two ways to avoid it:
+  - A member that is a plain range of a seekable container (a stored ZIP
+    member, a tar member, any format whose entry is its bytes in the file) gets
+    a variant naming the range, and the walk scans it as a `Sub` of the
+    container's block cache, as a carved region is. No disk, no copy, no
+    ceiling, over a file or HTTP alike. Done first.
+  - A compressed member has no range. Either a seekable decoder under the
+    block cache, with restart points: a deflate window (32 KiB) every N MiB as
+    zlib's `zran` keeps, bzip2 blocks, xz blocks, zstd frames. The index grows
+    with the member, so the spacing must grow with it (at 20 GB and 64 MiB
+    apart it is about 10 MB), a single-stream xz or single-frame zstd or a solid
+    7z/LZMA block has no points but the start, and a scattered read decodes up
+    to N MiB, so a hostile file multiplies decode time unless that is charged to
+    `--max-matcher-bytes`. Or the forward pass above, re-running the decoder for
+    each pass in place of reading a spill file: deflate decodes at several
+    hundred MB/s, xz slower. A container inside a compressed member needs seeks
+    too and meets the same costs. Spill stays the default; streaming is for no
+    disk or a member past the ceiling.
+- **HTTP sources** (`HttpRangeReader`): a large object costs two to five times
+  its size in transfer, by how many passes the database makes. To do: write the object to a spill file on the first pass,
+  as an option, for one transfer in place of several; pin it (`If-Range` and
+  the `ETag`, so that a server cannot answer differently on each pass); a
+  timeout of the transfer's own; a limit on redirects and on where they lead
+  (a daemon with `--allow-http-scan` fetches any address); a fallback to a
+  download for a server that does not answer range requests.
+- **exav-grep, a container in a member over the limit**: such a member is
+  searched as it is read, but a container inside it is reported unreadable,
+  since opening it takes a seekable copy. A spill file (an anonymous temporary
+  file, with a directory and a budget, as the scanner has) would open it.
+- **OLE and MSI**: the compound file is read whole. Its streams are small
+  nearly always, so the loss is a large MSI, whose cabinets are streams; sector
+  by sector reading over a seekable source would take it.
+- **Email**: a message is read whole. A mailbox of gigabytes, and a message
+  with a large attachment, would be read part by part, decoding base64 as it
+  goes.
+- **Read whole, rarely large**: CHM (an index, then LZX sections with a reset
+  table), ARJ, ZOO, ARC, ALZ, EGG, InstallShield Z, BinHex and uuencode. Each
+  needs its own reader to take a source, and none is often past the limit.
+- **PDF**: not worth it. The file is held (the cross-reference table is at the
+  end, and recovery scans the whole of it) and each stream object is decoded one
+  at a time under the buffer limit, so streaming would save one object.
+- **Compressed files in filesystems past the limit**: a file stored compressed
+  by HFS+ or APFS (decmpfs) or by NTFS (LZNT1), and an EROFS file stored
+  compressed, is decoded whole under the buffer limit; past it the file is
+  reported (EROFS compressed files are not read at all).
+- **Sparse files**: a hole of a file in a filesystem comes out as zeros and
+  counts as scanned bytes, so a large sparse file (a swap file, a VM image in
+  an image) can use up `--max-matcher-bytes` and end the walk. Telling the
+  scan that a run is a hole, or charging it less, would keep the rest of the
+  volume in reach.
+- **7z**: a folder with an encrypted coder or with several packed streams
+  (BCJ2) is decoded whole under the buffer limit, and the header is held
+  whole. A member past the limit in such a folder is reported.
+- **WIM**: the directory tree (the names) is held whole under the buffer limit;
+  without it the files are scanned under the names `wim-resource-N`. LZMS
+  resources are reported, not read.
+- **xar**: only zlib members are decoded. bzip2, xz and LZMA members (rare in
+  `.pkg`, used by some `.xip`) come out as the compressed bytes, not decoded.
+- **IFC geometry**, what is left (listed on the exav-render docs page):
+  cones, which no IFC schema has as a surface (`IfcConicalSurface` does not
+  exist; a cone is an `IfcSurfaceOfRevolution`, with its sibling
+  `IfcSurfaceOfLinearExtrusion` still drawn flat); faces whose loops wind
+  round a closed surface in ways other than a sphere's cap or a band of two
+  loops (a torus cut at one circle, a tube of three); the pcurves of
+  `IfcSurfaceCurve`, which Bentley's samples write wrong; in IFC4X3,
+  `IfcSegmentedReferenceCurve` (cant), `IfcOffsetCurveByDistances`, the sine
+  and cosine spirals (the published formula uses a length it does not
+  define), `IfcSectionedSolidHorizontal` (its profile axes are described
+  with `Axis` as the profile's y), and the alignment's business-logic
+  segments (`IfcAlignmentSegment` design parameters: the `Axis` curve is
+  read instead); the grid's own axes are curves and are not drawn. A parameter
+  on an `IfcIndexedPolyCurve` with arcs has no published meaning: its sweep
+  takes the whole curve, counted.
+- **CAB LZX and Quantum** lose the frame being decoded when a cut or damage
+  stops it (at most 32 KiB of output). MSZIP and stored blocks keep the part
+  of the block decoded before the stop. LZX is decoded by `lzxd`, whose window
+  is private and which hands a frame over whole or not at all; the cheapest
+  sound route is a vendored copy of it (MIT OR Apache-2.0, about 1,800 lines,
+  as the CAB reader itself is) with a call that returns the decoded part of a
+  frame. Quantum's decoder reads zeros past its input, so a part of a frame
+  would need its own end-of-input check first.
+- **Inno Setup extraction**: `formats/inno.rs` recognises an installer and
+  reports it; no file is extracted. Licences checked: innoextract (Daniel
+  Scharrer, the reference for the layout) is under the zlib licence, so its
+  source may be read, with a crate NOTICE entry; Inno Setup's own source is
+  under a custom licence (permissive, with notice and "marked as modified"
+  terms) that is not one of the licences exav reads sources under, so it is not
+  read. What remains: the offset table and the version-tagged setup headers
+  (the structures differ by version, which innoextract carries as a table),
+  the setup-0 header block (zlib or LZMA1, CRC-32 per sub-block), the file
+  entries and locations, the setup-1 chunks (stored, zlib, bzip2, LZMA1, LZMA2,
+  the x86 call and jump filter, CRC-32, Adler-32, MD5, SHA-1 or SHA-256 per
+  file) read within the output, entry, chunk and dictionary budgets, names
+  sanitised as other formats do, and an encrypted installer (header encryption
+  or Inno 6.5's ChaCha20 chunks) reported, never clean; a sample installer
+  built by the compiler under wine or a free installer small enough to commit;
+  a fuzz target and seeds; and routing of an installer in a PE overlay to it.
 - **Cuts inside a codec header** (a UPX file cut inside its first block, an EGG
-  LZMA block cut inside its codec header) stay `Unscannable`.
+  LZMA block cut inside its codec header) stay `Unscannable` on purpose: no
+  byte of the stream is there to decode, and a packed file with none of its
+  content examined is not reported as examined.
 - **xz checksum after a full block** counts as damage, because the decoder
   cannot tell whether more blocks follow.
+- **Small gaps found by the wild-sample sweeps**:
+  a UPX-packed DOS `.exe` (`upx -t` accepts it; exav's UPX reader covers PE and
+  ELF); CHM overlays appended to PE files (PuTTY builds: 7-Zip lists them,
+  ClamAV does not scan overlays); an empty spreadsheet template (no table) reads as
+  "damaged: no sheets" instead of an empty workbook.
 - **JBIG2 symbol dictionaries** are bounded only by hayro-jbig2's own
   65,535 × 65,535 symbol limit: the symbol sizes sit inside the compressed
   data, so they cannot be counted against the memory budget before decoding,
   and the crate has no budget setting. Regions are counted (fuzz finding,
-  docs/FUZZING.md). Needs a budget hook upstream or a pre-pass that bounds
-  the dictionaries.
-- **Image decode time** is limited only through memory: a budget bounds the
-  pixels, and so the time only in proportion. Within the viewer's 1 GiB image
-  budget a JBIG2 file can still declare about 8 billion pixels of regions,
-  minutes of CPU (stopped by the decode worker's 60 s timeout in the viewer,
-  not at all in a native caller). A work budget in the decoders, or a
-  per-format pixel cap below the memory budget, would bound it.
+  docs/FUZZING.md), and so is the symbol count of a dictionary (at most eight
+  symbols a byte: one with its count changed in two bytes took 100 s and 7 GB),
+  but a dictionary within that count can still cost seconds. Needs a budget
+  hook upstream or a pre-pass that bounds the dictionaries.
+- **Image decode time**, measured on a build with optimisations: JBIG2
+  regions decode at about 230 Mpx a second when the data is empty (a few times
+  slower on real data), JPEG 2000 at about 50 Mpx a second, and the grey
+  conversion and Lanczos resize of a large JPEG (an 805-byte file that decodes
+  to a few million pixels) take 0.4 s. A decode is bounded by the
+  memory budget (at most `DECODE_MAX`, 512 MiB, for a JBIG2 file's regions and
+  for every image through `exav_render::image::decode`, and the same for the
+  PDF decoders' regions), so a native decode is seconds; the decoders have no
+  work budget of their own, which a JBIG2 symbol dictionary also escapes (see
+  above). In the viewer the worker's 60 s timeout stops what is slower.
+- **PowerPoint 2, 3 and 4**: exav-render's `slides` recognises them (Windows, Mac,
+  BinHex, `PP40` stream) and reports `unsupported`. Text-only decoding would
+  have to come from seven sample files alone; no
+  specification exists to check against.
+- **PowerPoint 95 pictures, freeforms and arcs**: the reader (`ppt95.rs`) was
+  written from one sample and leaves these out; more samples are needed.
+- **Office converters, open decisions** (exav-render's `sheets`, `slides` and `docs`):
+  - docs converter: fall back to the external converter when it says `unsupported`
+    (Pages '09, Word 1/2); make it the default for text documents even where
+    an external converter is set (it goes first only without one today: 32% of
+    DOC pages close, against 50% for native DOCX); keep
+    tracked changes in DOC as strike-through and underline in one colour, or
+    leave deleted text out; Word 2003 XML sniffing claims any `.xml` that
+    mentions `w:wordDocument`; commit a small Word 6 fixture for the fuzz seeds
+    and e2e; Pages tables, pictures and headers.
+  - `@silurus/ooxml-legacy-office` (0.89, DOC, experimental) as a first try for
+    DOC with ours as fallback: about 5 points more close pages on the 137
+    documents both draw, draws 139 of 348 against our 271, 387 KB brotli more.
+  - slides: draw the first slide while the rest converts (needs ranged
+    delivery); propose a random-access archive source to @silurus/ooxml; Keynote
+    table borders follow the style (hidden means none); about 20 ODP chart documents differ because of the sheets chart
+    writer (axes, legends).
+  - Three OfficeArt readers (`common/escher.rs`, `slides/ppt/escher.rs`,
+    `sheets/xls/escher.rs`) and two ZIP readers (`common/package.rs` and
+    `slides/package.rs`, which handles an encrypted member in its own way) are
+    still apart. The byte
+    cursor, compound file, code pages, iWork archive, base64 and the ODF colour,
+    percentage and text helpers are shared.
+- **Demo examples**: DWG, IFC, PLY, STL and some PDFs from Zenodo and figshare
+  state their licence for the record, not per file (a furniture block or logo
+  inside could come from a third party; the hospital and HVAC drawings are the
+  most exposed): keep or drop; `demo:build` downloads 87 MB (`--offline` copies
+  the committed files only; CI and the e2e rig may want it); the CAD files, the
+  ISO and the encrypted archives are not byte-reproducible; the sidebar is long
+  and wants collapsible sections; viewer gaps the examples showed: `.pages` has
+  no matcher in `ts/core/formats.ts`, G3 fax TIFF is not decoded (G4 only),
+  Minolta MRW has no preview. No clean sample exists for Pentax PEF, Sigma X3F,
+  Phase One IIQ, Hasselblad 3FR, Samsung SRW, Kodak DCR, IWA Pages or a real OBJ.
+- **Camera RAW**: the detection rule that makes a TIFF a RAW on a maker's name
+  plus a SubIFD or thumbnail (opens old Sony SRF and Nikon scanner NEF); a
+  default cap on the preview size in the viewer (today up to about 67 Mpx);
+  check the Adobe, CIPA and ISO licence wording in NOTICE 1p; CR3 previews
+  stored as HEIF, Minolta MRW and Kodak DCR thumbnails.
+- **CAD**: level of detail for large drawings (the potsdam fit frame spends 760
+  of 864 ms in strokes), annotative objects (annotation scales per owner and
+  viewport), an external file resolver (xrefs, images); 46 DWG oracle
+  differences left unexplained (36 MULTILEADER context scales in sample
+  0e74f0aa, DWG-only material dictionaries in edf22e18); 3D is out of scope.
+- **PE emulator**: TELock (11 samples, needs a trace on real Windows, see the
+  Windows VM item), Yoda's Protector, and the `PROGRESS_WINDOW` tuning.
 
 ## Viewer
 
-- **More archive formats in the viewer** (0.0.3): the archive plugin claims
-  only zip, 7z, rar, tar, gz, bz2 and xz (`archive` in
-  `crates/exav-viewer/ts/core/formats.ts`, and the table in
-  www/src/content/docs/viewer/index.md), while `@exav/unpack-wasm`'s default
-  `standard` preset already reads about 60. Add the ones a user thinks of as
-  archives: `.cab .iso .lzh/.lha .arj .ar/.deb .cpio .xar .zst .lz4 .lz .wim
-  .dmg`, each with its MIME type and extension, a sample in exav-samples, an e2e
-  test that opens it and lists its members, and a line in the docs table. Leave
-  out what is not an archive to a user (packers and installers: `upx`, `sfx`,
-  `nsis`, `inno`, `pepack`) and what another plugin opens (`pdf`, `ole`,
-  `email`, `rtf`). Check each through the viewer's tree before listing it: the
-  engine reading a format does not mean the member listing and the bounds do
-  right by it.
-- **JPEG XL**, after 0.0.2: a fork of the `jxl` crate without SIMD and with
-  its other `unsafe` rewritten, in the viewer's image module only. The plan is
-  on the roadmap page (www/src/content/docs/project/roadmap.md). The demo
-  already has a sample, `eckersberg-colosseum-arches.jxl`, in exav-samples.
+- **DWG picture export, what it leaves open**: a single viewport of a paper
+  layout cannot be addressed (the scene data on the TS side holds no viewport
+  transform, clip or frozen-layer list: it needs a viewport table in
+  `sheetJson` from the Rust side; model coordinates are reached with
+  `layout: ""`); a truncation by `maxPrimitives` is not reported on the
+  `Raster`; `rasterTile` cannot be set in the sandboxed frame; DESIGN.md of the
+  DWG module has no section on pictures yet.
+- **Format registry: generating the detection tables** (`formats/registry.json`)
+  is not planned: the scanner's and the extractor's magic tables carry offsets,
+  minimum lengths and priorities a flat table does not hold, and the checks in
+  `make test-formats` already catch a disagreement. Revisit if the viewer's
+  matchers (`ts/core/formats.ts`) are the first thing generated.
+- **Picture export, what it leaves open**: `controllers.viewport` is
+  read-only (a host reads it, changes it and passes it back as `region`); the
+  limits (16,384 px a side, 64 Mpx in all) are fixed, not a host option within
+  a cap; iOS Safari's smaller canvas ceiling makes a large export fail with
+  `too-large`; the exports have been compared with the screen in headless
+  Chromium only, not on a real GPU; a replaced document (`session.replace`)
+  keeps its zoom only when the new file is delivered the way the first was.
+- **3D model pictures, what they leave open**: the IFC outlines are one-pixel
+  lines, so at a large output size they are thin next to the model (fat lines
+  would scale them); each picture builds its own light probe, lights and
+  shaders, a few seconds on a software GPU (a kept renderer between pictures
+  would trade that against holding a context); the default tile is 2048 px
+  (not 4096) because a multisampled 4096 px tile is about half a gigabyte;
+  `lineweight` and `layout` are ignored for a model.
+- **Format registry**: `formats/registry.json` is checked against the code
+  (`make test-formats`, the viewer's `registry.test.ts`, the scanner's
+  `format_registry.rs`) and generates the format matrix and the viewer summary
+  sentence. The detection tables themselves (the extractor's and the scanner's
+  magic, the viewer's matchers) are still written by hand: generating them from
+  the registry is the next step, file by file.
+- **hayro as the viewer's PDF rasterizer**: evaluated in
+  `docs/PDF-RENDERER-EVALUATION.md` (1370 PDFs, harness in
+  `scripts/pdf-compare/`). On par with pdf.js in wasm with SIMD and closer to
+  poppler on shadings and fonts, but it opens no encrypted file, draws some
+  pages blank and has outliers, and the text layer, links and outline would
+  have to be built. The cheaper path is an optional engine with pdf.js kept for
+  the interactive parts and as the fallback.
+- **Archives in the viewer, left out on purpose**: email (`.eml`, `.msg`,
+  `.mbox`) and OLE containers, which another reader would open as documents;
+  OpenDocument and EPUB, which are documents that happen to be zips; the
+  packers and installers (`upx`, `sfx`, `nsis`, `inno`, `pepack`); and the
+  formats the engine only recognises (`.ace`, `.sit`). A `.crx` is a zip with
+  a header before it, and is not claimed.
+- **Preferring the browser's own decoder for JPEG XL**: Safari decodes it and
+  Chrome ships it from 155; the viewer's image module decodes every format it
+  claims itself, so that a file looks the same everywhere. Drawing it with
+  `<img>` where the browser can, as for the formats browsers draw, would spare
+  those users the 540 KB the module grew by (1.1 to 1.65 MB).
+- **Text previews**: line numbers, a collapsible JSON and XML tree, `mailto:`
+  links (the host only opens http and https), search in the file, reading only the first
+  2 MiB of a URL source (the source reader has no prefix read), per-record
+  `.jsonl` formatting, GFM task lists and bare-URL autolinks, and refusing a
+  binary file named `x.txt` at detection rather than at open.
+- **3D models**: glTF triangle strips and fans, `KHR_mesh_quantization`, Draco
+  and meshopt (counted as unsupported today); PLY point clouds drawn as points
+  (refused today); OFF and 3MF; smooth normals for OBJ and PLY files without
+  them; detecting the up axis of OBJ and PLY (Y up is assumed); a model-specific
+  error message in the viewer. The `mesh` fuzz target is in the nightly
+  campaign.
 - **hayro instead of pdf.js** once it supports encrypted PDFs, blend modes and
   knockout groups: the PDF path would be Rust end to end. Compare pixel output
   against pdf.js on a corpus first.
 - **wpd for WebP** (halidecx/wpd, BSD-2-Clause): revisit when it is published
   on crates.io with releases; measure its safe build (no assembly) against
   `image-webp` and `dwebp` on a corpus, and its wasm size.
-- **Replacing a document in a sandboxed frame**: `session.replace` answers
-  `false` there, as a frame holds one file, so the zoom and position start
-  over (in the page they stay). It needs a `replace` message in the frame's
-  protocol and a way to hand the frame another source over its port.
 - **The Office engines refuse a ZIP with bytes after its end record**
   ("ZIP central directory preflight failed"), which `unzip` and most libraries
   read. The viewer trims such a tail itself (`trimZipTail`); the report to
   @silurus/ooxml is still to be made, with a deck that has one stray newline
   after the end record.
+- **Pictures of Word pages and slides past 16 million pixels**: the engines
+  draw a whole page at most that large (they return a smaller bitmap without
+  saying so) and cannot draw a part of one, so a small region of a page is cut
+  from a drawing of the whole page and refused as too large past the limit.
+  A request to the engines for a sub-rectangle (or a tile size) would lift it.
+- **Pictures of an Office document share the viewer's copy**: a second copy of
+  the document is parsed for the pictures. `fromDocument`, `fromPresentation`
+  and `fromWorkbook` borrow one (a borrowed workbook draws nothing until a sheet
+  is gone to), but a delimited text has no workbook to borrow, so the CSV's
+  pictures are drawn from a workbook made of its table (`table.ts`). Sharing
+  would spare the second parse once the engine documents that start-up and
+  reads delimited text into a workbook.
+- **A sheet's viewport without a second workbook**: its page is the used
+  area, which only the worksheet model says, so the viewport is worked out from
+  the second copy once someone reads or subscribes to it. The engine offers no
+  extent of the used area on the viewer. For the same reason a sheet's
+  `get()` has the last measure and starts the next, and in the sandboxed frame
+  every `get()` does (the port is asynchronous): a synchronous read of an
+  up-to-date viewport needs the frame's answer to be awaited, which the `Store`
+  interface has no place for.
+- **The second copy is kept until the session ends**: an idle release would
+  spare memory after a one-off picture.
 - **`ViewerDialog` for hosts with a form beside the file**: an `aside` and a
   `placeholder` (while a file is chosen), a `title` with no file; the counter,
   arrow keys, download and "open in a tab" are written again by a host that
   keeps its own dialog around `ViewerBody`.
+- **Cross-browser e2e**: Firefox runs the frame, delivery, selection,
+  converted and office-raster specs, WebKit those and model-raster; the rest
+  run on Chromium only (`playwright.config.ts`). The engines' text is made the
+  same by `e2e/fonts.conf` (a bare `serif` is DejaVu Serif in Firefox and
+  WebKit, Liberation Serif in Chromium). Why the others are left out:
+  - Firefox headless here has no WebGL, so every spec that draws with it
+    (model, CAD, IFC) cannot run.
+  - The CAD specs fail in WebKit on Linux (14 of `cad-raster.spec.ts`, and the
+    viewer itself shows a black canvas): a WebGL canvas made with
+    `antialias: false` presents black, or nothing with `alpha`, even for a
+    bare context cleared to red, in every attribute combination tried; with
+    `antialias: true` or `preserveDrawingBuffer: true` it is shown. The CAD
+    renderer needs `antialias: false` (its strokes antialias in the shader).
+    Seen only in the headless WebKit build Playwright ships for Linux, on
+    software rendering; not checked on Safari or a GPU, so whether a user
+    sees it is open (`cad.spec.ts`, not run in WebKit, shares the cause).
+  - The other specs have not been tried in Firefox and WebKit.
 
 ## CI
 
@@ -111,6 +478,68 @@ is on exav.org.
 
 ## Robustness
 
+- **An LZMA-alone stream cut short gives about 20 bytes less than `xz -dc`.**
+  `LzmaStream`, the decoder `lzma-rust2` offers without I/O, will not decode the
+  symbols of the last bytes it was given, and a `Finish` call fails with no
+  output. The xz reader gets the same bytes by giving its decoder one zero byte
+  at the end of the input, which `LzmaStream` does not take: its first call
+  with one fails after a few bytes. The Read-based `LzmaReader` writes every
+  byte when read a byte at a time, but drops the output of a read that meets
+  damage, which is what `SansIo` exists to avoid. Options: a one-byte read
+  for the last chunk only, found by reading ahead of the input; or a decoder of
+  our own for the last symbols.
+- **`group()` drops a RAR set with two parts at one index.** `x.part1.rar` and
+  `x.part01.rar` name one volume twice, so `volume::group` returns no set for
+  them and each part is scanned alone (and reports `UNSCANNABLE`, as a RAR
+  volume alone does). Reporting the set, with the reason, would say what it
+  is.
+- **`is_budget_overflow` recognises an error by its text.** `stream.rs` compares
+  the message of an `io::Error` with a sentinel string to tell a budget
+  overflow from damage. A typed error carried in the `io::Error` would not
+  break when a message is reworded.
+- **`read_member` skips a member whose bytes are its container's.** A
+  `Container:`-scoped signature cannot fire on that copy. Contrived, and the
+  copy is scanned as the container.
+- **Limits set from a `u64` use `as usize` in the volume-set functions.** On
+  wasm32 a limit above 4 GiB wraps to a small one, which fails closed
+  (`Unscannable`). `usize::try_from` with a saturating fallback would say what
+  is meant.
+- **Word's `{\rt` as RTF.** exav types RTF by `{\rtf` at offset 0 only; whether
+  Word opens `{\rt` and what follows is untested.
+- **A JPEG XL file can still take a gigabyte for one section.** The vendored
+  decoder (`zenjxl-decoder`) sizes the buffer of each section of a frame from
+  the length its table of contents declares, and zero-fills it, before the data
+  is looked at. The pixel and channel limits set in `image::jxl` do not reach
+  it, so the saturation sweep leaves JPEG XL out. The fix is in the decoder:
+  read the section into a buffer that grows with what arrives, or check the
+  declared lengths against the bytes left in the file. The viewer decodes JPEG
+  XL in a tab that can be reloaded; the scanner does not decode it.
+- **A Prometheus and HTTP metrics endpoint.** The daemon has no metrics
+  endpoint, only the clamd `STATS` command. The counters behind it are shared
+  by the processes of the pool since the health listener was added, so the
+  endpoint is the small part left: `--listen-health http://host:port` serving
+  `GET /metrics` in the Prometheus text format and `GET /healthz` from the
+  health child, so Kubernetes has a native probe and Prometheus a scrape
+  target without touching the scan path.
+- **`make stack-frames` in CI.** The audit of release frames runs by hand. It
+  needs a release build of `exav` and of the `exav-render` nesting test (about
+  two minutes), which the `test` job does not otherwise make; a job of its own
+  after `msrv` would run it on every push.
+- **Nesting sweeps for the formats with no fixture or no tool here.** The
+  `nesting` suites build their documents by hand or with `zip`, `7z`, `tar`,
+  `cpio`, `ar`, `mksquashfs`, `genisoimage`, `gcab`, `gzip`, `bzip2`, `xz`,
+  `zstd` and `lz4`. A container inside itself is not yet built for LHA, ARJ,
+  ZOO, ACE, ALZ, EGG, TNEF, OLE, CHM, DMG, the virtual disks, WIM, NSIS, Inno
+  and the packers; the 26-layer chain of `matryoshka` crosses each once.
+  `scripts/stack-frames.py --all --min-kib 8` lists the frames that would
+  matter for them.
+- **Compressed EROFS.** A file stored compressed (LZ4, LZMA, DEFLATE, Zstandard
+  in logical clusters of the full or the compact layout) is reported, not read;
+  `mkfs.erofs -z` makes them, and so does most of what ships a compressed
+  image. The index of clusters (`z_erofs_map_header`, then 8-byte full or packed
+  4-byte entries) is the work; the codecs are in the tree. Other filesystems
+  that would be worth a reader: XFS, Btrfs and F2FS (larger than any here);
+  squashfs before version 4.
 - **Fuzzing the viewer's TypeScript**: property tests (fast-check, MIT, in
   vitest) for the two places a hostile document's output meets code the viewer
   trusts: the host's validation of the messages a sandboxed frame sends
@@ -121,9 +550,17 @@ is on exav.org.
   existing difftests cover the rule corpora; the fuzzer would reach
   combinations they do not. yara-x pulls wasmtime, so it needs its own fuzz
   workspace.
+- **Observe the PE emulator's `[obs]` fields on real Windows**: the TEB, PEB,
+  loader-entry and KUSER_SHARED_DATA fields in `crates/exav-pe-emu/src/win.rs`
+  that no clean written source gives (tagged `[obs]`; its NOTICE names, for
+  each, the API that reports the same value). A small 32-bit program run
+  under WoW64 on a Windows evaluation image (on this ARM host, Windows under
+  qemu emulation) would compare each field with its API and confirm the
+  emulator's layout. The x86 CONTEXT layout `run.rs` builds for exception
+  dispatch is unverified too and could be checked the same way.
 
-The arithmetic audit (`tmp/ARITHMETIC_AUDIT.md`, not committed; its row names
-are used below) found about a hundred sites where a header's number is added
+The arithmetic audit (kept outside the repository; its row names are used
+below) found about a hundred sites where a header's number is added
 to or multiplied by something unchecked. Fixed and tested: the disk-image
 formats, the signature engine's gaps, offsets, byte comparisons, PCRE group
 references and logic sums, the dotnet, elf and bytecode-PE readers, the
@@ -166,20 +603,20 @@ PE emulator's open handles, its searches and its module placement.
 
 Open:
 
-- **A sweep that finds hangs**: the `extreme` suite sets fields to fixed
-  large values and to `2^32` or `2^64` minus the field's own position, and
-  ARJ's CRCs are made right again after each change. It only sees a panic or
-  an abort. A sum that wraps to a smaller position and so loops (the EGG
-  extension walk) is not seen; that one has a unit test at the helper level.
-  A time limit on each run, which the wasm build cannot have without threads,
-  would find the next one.
+- **The sweep's hang limit on wasm32**: the `extreme` suite sets fields to
+  fixed large values and to `2^32` or `2^64` minus the field's own position,
+  and ARJ's CRCs are made right again after each change. Each walk runs in a
+  thread with a 10 s limit, so a sum that wraps to a smaller position and loops
+  (the EGG extension walk) is reported as a hang. The wasm32 build has no
+  threads: there a walk is timed after it ends, so a real hang stops the run
+  instead of failing it.
 - **`d.get(off..off + n)` in other spellings**: the 90 sites written as
   `x.get(a..a + b)` now use `crate::bytes::at` (exav-core has its own copy).
   Slices written `d[a..a + b]`, and `get` on a `&str` or a `Vec` of another
   type, were not touched.
 - **`clippy::arithmetic_side_effects`**: denied in the disk-image formats
-  (vhd, vmdk, qcow2, vhdx, ntfs, wim without its two codecs, ext, fat,
-  partition, iso, dmg, udif, udf); the codecs `wim/lzx.rs` and `wim::xpress`
+  (vhd, vmdk, qcow2, vhdx, vdisk, volumes, ntfs, wim without its two codecs, the
+  filesystem readers, lzo, partition, iso, dmg, udif, udf); the codecs `wim/lzx.rs` and `wim::xpress`
   allow it. The lint is far too noisy for the other decoders (about 2,500
   sites in `exav-unpack`). Extend it file by file as each is cleaned.
 - **The wasm32 sweep's samples**: `make test-wasm` runs the `extreme` suite,
@@ -193,3 +630,34 @@ Open:
 - **TLS without C or assembly**: `ring` (via rustls) is the only C/assembly in
   the tree, in the `http` features and the published Docker image. A pure-Rust
   rustls crypto provider would remove it once one is mature and audited.
+- **fancy-regex back to a dependency**: 0.20.0 has the two pull requests the
+  vendored copy was taken for and two of exav's three own fixes. What is left
+  is the saturating size analysis (README of `src/fancy_regex/`), whose test
+  panics inside 0.20.0. Report it upstream, then follow the README's steps
+  back; that also drops `matches`, `quickcheck` and the direct `bit-set`.
+- **`image` brings `moxcms` and `pxfm`** (about 570 `unsafe` keywords in the
+  default tree) for ICC transforms exav never calls; no feature turns them off
+  and the pin is ClamAV's version. Options: vendor the containers and codecs
+  `exav-render` uses from `image` as was done for JPEG and TIFF, or ask
+  upstream for a feature.
+- **Readers that would remove a crate**: `tar` and `filetime` (the reader is
+  80 lines over the crate; an in-tree one also drops the error-message
+  matching in `tar::is_truncation`), `bitstream-io` (ARJ's one codec), `byteorder` as a
+  direct dependency (three files), `quick-error` (the vendored TIFF decoder's
+  error type), `salzweg` beside `weezl` (two LZW crates).
+- **`encoding_rs` 0.8.40 and later depend on `simdutf8`** (135 `unsafe`
+  keywords, and `core_detect` on x86); 0.8.35 does not. Pin back, or accept.
+- **`yara-x-parser` costs 12 crates** (`rowan`, `logos`, `hashbrown` 0.14,
+  `rustc-hash` 1.x, `bstr`...; 416 `unsafe` keywords) for a parser whose AST
+  the in-tree engine then lowers. An in-tree YARA parser is the only way out
+  and a large one.
+- **`paste` is the last `deny.toml` ignore**: it is unmaintained, build-time
+  only, and comes from `zenjxl-decoder-simd`'s `simd_function!`, which expands
+  to `paste::paste!` in the decoder. Dropping it means copying that 9,000-line
+  crate (and rewriting the macro) for no change in the module; not worth it
+  until the macro changes upstream.
+- **`mail-parser` 1.0.0** (a rewrite with parse limits, needs Rust 1.98; the
+  MSRV is 1.95) and **`lzma-rust2` 0.24**: decide at the next early pass.
+- **Vendored copies with no recorded upstream version**: `cab_parse`,
+  `arj_parse`, `zoo_parse`, `azo`, `rar5_unpack`, `rar3_unpack`, `lzfse`
+  (`docs/dependencies.toml`, `version = "unrecorded"`).
diff --git a/docs/COMPARISON_NOTES.md b/docs/COMPARISON_NOTES.md
index fe1d1c38..2b74aa0d 100644
--- a/docs/COMPARISON_NOTES.md
+++ b/docs/COMPARISON_NOTES.md
@@ -66,7 +66,8 @@ confounded in at least four ways:
 An earlier revision of the website quoted a mean/median table from such a run
 and concluded a 1.27x speed ratio. That was not supportable from the data it
 cited, so it was withdrawn. A speed claim needs a dedicated benchmark (one job,
-warm cache, repeated runs, equal environments).
+warm cache, repeated runs, equal environments): `scripts/bench-speed.sh` is
+that, and its result is on the comparison page.
 
 ## Corrections
 
diff --git a/docs/DEPENDENCIES.md b/docs/DEPENDENCIES.md
index 555be4bb..773676af 100644
--- a/docs/DEPENDENCIES.md
+++ b/docs/DEPENDENCIES.md
@@ -30,6 +30,24 @@ So we are deliberate about what we pull in.
    - **YARA** (`yara`, on by default) — see the outlier note below.
    - **HTTP(S) range scanning** (`http`, off by default) — the only feature that
      links a TLS stack (`ureq → rustls → ring`).
+   - **Visible text** (`visible-text` in `exav-core` and `exav`, `text` in
+     `exav-grep`, on by default) — the text a reader sees in Markdown
+     (pulldown-cmark, `forbid(unsafe_code)` as built), HTML (html5gum's
+     tokenizer alone: `forbid(unsafe_code)`, no dependency), XML parts (quick-xml, already
+     in) and drawings (exav-render's model, already in). No C.
+   - **Office formats** (exav-render's `office-sheets`, `office-slides`,
+     `office-docs`, off by default; `visible-text-office` and `text-office` add
+     their text) — `zip`, `quick-xml`, `encoding_rs`, `md-5` and `sha1`
+     (Numbers and iWork) and what they pull in: 21 more crates than the
+     default `exav-render` tree (`cargo tree -p exav-render --features
+     office`). The viewer builds them for the browser; the scanner reads them
+     only when `visible-text-office` is on.
+   - **PDF text** (`visible-text-pdf`, `text-pdf`, off by default) — hayro. Its
+     `hayro-interpret` turns on `hayro-syntax`'s `unsafe` feature itself, which
+     switches every `flate2` to zlib-rs and adds SIMD to the image decoders, and
+     adds some 40 crates. It is built without the predefined CJK CMaps so that
+     `brotli` stays out. Making it a default means patching hayro-interpret
+     (vendoring it, as `zenjxl-decoder` is for the viewer).
 
 4. **Prefer pure-Rust, and keep the tree pruned.** The default build links no C
    and no native JIT. Concretely:
@@ -75,6 +93,16 @@ Reconstructing a disk image gives a pile of sectors. Reading the *filesystem* on
 it is what turns those into files with names, and what reassembles a
 **fragmented** file — which a raw carve can only see as disconnected pieces.
 
+**Since then every filesystem reader is in-tree** (`formats/vol.rs` and one
+file for each of NTFS, FAT, exFAT, ext, HFS+, APFS, SquashFS, cramfs, romfs and
+EROFS), validated against the tools that make the images, and the kernel's own
+view of the volumes it wrote. `fatfs` (feature `fat`), `ext4-view` and the
+`ntfs` crate were each taken first; what follows is why, kept for the numbers.
+The ones that went last, `fatfs` and `ext4-view`, went for the reasons the
+backlog gave: `fatfs` panicked on a chain through cluster 1 and needed a
+`catch_unwind` around every call, and `ext4-view` could only be given a volume
+held whole in memory.
+
 `fatfs` was taken (feature `fat`). It fits the principles above almost exactly:
 MIT, no `unsafe`, and `bitflags` + `log` are its only dependencies.
 
@@ -130,10 +158,9 @@ answered them better:
 - **Scope**: read-only access to files by path is precisely what a scanner
   needs, with none of the mount/journal-replay surface a driver carries.
 
-The one real cost is recorded in `formats/ext.rs`: `Ext4::load` takes an owned
-`Box<dyn Ext4Read>`, so the image is copied once rather than borrowed. That is a
-forced-materialization site, charged against `max_buffer_bytes` like the
-others, and an image past the budget is reported rather than skipped.
+The one real cost was that `Ext4::load` takes an owned `Box<dyn Ext4Read>`, so
+the image was copied once rather than borrowed, and an image past
+`max_buffer_bytes` was reported rather than read. That is why it was replaced.
 
 ### ZOO: vendored, after linking it broke something else
 
@@ -343,7 +370,7 @@ to show for it.
 reaches no shipped binary, and every encoding the decoder claims is checked
 against it on each test run.
 
-## Adding or bumping a dependency — checklist
+## Adding a dependency: checklist
 
 - Is there a smaller/leaf alternative, or can we do it in-crate over our bounded
   byte arena? (Several parsers are vendored for exactly this reason — see
@@ -356,6 +383,152 @@ against it on each test run.
 - CI must stay green: `cargo deny check` (advisories/bans/sources/licenses) and
   the license allowlist in `deny.toml`.
 
+## Lifecycle
+
+What we want, in this order when they conflict:
+
+1. **As few dependencies as the features need.** exav keeps a maximalist
+   feature list, so a heavy feature is not refused: its cost is moved. First
+   into an opt-in Cargo feature (principle 3), so the default build does not
+   pay it; then, where the dependency is bigger than the reader it serves,
+   into a reader written in-tree.
+2. **No `unsafe` in what ships**, ours or theirs. A dependency's `unsafe` goes
+   by turning off the feature that holds it, by vendoring the safe part, or by
+   replacing the crate. Only then is it accepted, and it is listed with its
+   reason on the site's dependencies page.
+3. **One copy of each thing**: one version of a crate in the tree, one reader
+   per format ([ARCHITECTURE.md](ARCHITECTURE.md)), one vendored copy of an
+   upstream.
+4. **Vendoring serves 1 to 3.** It is for a dependency that cannot be made to
+   do what we need, never a way to stop following upstream. Every vendored copy
+   has a condition under which it goes back to being a dependency.
+
+The default build is judged strictly and an opt-in feature loosely: a
+feature's dependencies are paid by the builds that enable it, so a new
+format with a heavy decoder lands behind a feature, and an old feature moves
+into the default only when it fits the numbers below.
+
+`docs/dependencies.toml` holds what a script cannot know: why each `=` pin
+exists and what lets it go, each `[patch]`, and every vendored copy with its
+upstream, the version it was taken from and its return condition.
+`scripts/deps-review.py` reads it with the manifests, the lock files, the
+source of every crate in them and crates.io (`make deps-review`).
+
+### The numbers
+
+Compared with the last `[[review]]` entry of the register, and written there
+at the end of every late pass:
+
+- crates in the default shipped tree of the CLI, and in the tree with every
+  feature on;
+- `unsafe` keywords in each (the same count as the site's tables: comments
+  stripped, `src/` only, so it is surface to review, not risk);
+- crates resolved at two versions;
+- vendored copies, and how many have an upstream that moved;
+- pins, patches and `deny.toml` ignores.
+
+A number that goes up is explained in the changelog or the backlog.
+
+### Two passes a release
+
+**Early**, right after the previous release is cut, while there is time to
+find what a change broke.
+
+1. Run `scripts/deps-review.py` with the network. Read the register part
+   first (pins without a reason, vendored copies whose upstream moved), then
+   the findings.
+2. Take the dependencies one by one, every direct dependency, not only the
+   flagged ones, and answer the questions below. The script answers most of
+   them.
+3. Make the changes that alter behaviour now: major upgrades, removals,
+   replacements, vendoring and un-vendoring. One change each, with its own
+   tests, so that the nightly fuzz campaign and a long round (RELEASING.md,
+   step 4) see them.
+4. A decision that is not taken goes to [BACKLOG.md](BACKLOG.md) with the
+   question it is waiting on.
+
+**Late**, at the freeze: step 2 of [RELEASING.md](RELEASING.md).
+
+1. `cargo update` in each workspace, and read the lock file diff.
+2. Run the script again and compare with the early run. What is new is an
+   advisory, a yanked release or a fix we asked for: take it. Anything else
+   waits for the next early pass. No replacement, vendoring or major upgrade
+   in this pass unless an advisory forces it.
+3. `cargo deny` and `cargo audit`; drop every `deny.toml` ignore whose crate
+   has a fixed release; `npm audit`; the MSRV.
+4. Bring the register up to date (versions of vendored copies, pins, the new
+   `[[review]]` entry), the `NOTICE` versions, and the counts in the site's
+   dependencies tables.
+
+### The questions
+
+Asked of each direct dependency, in this order. The first answer that is
+bad decides.
+
+| Question | Where the answer is | If it is bad |
+|---|---|---|
+| Is it used? | the script's "never named in its sources"; `grep` | remove it |
+| Does the default build need it? | `optional = true`, the feature graph | gate it behind a feature |
+| Is it maintained? | release age and releases a year in the report; its repository | replace, or vendor what is used |
+| How much `unsafe`, and can a feature turn it off? | the report; the crate's features | turn it off; else vendor the safe part; else replace |
+| What does it pull in alone? | `cargo tree -e no-dev -i <crate>` | replace with a leaf, or write the reader |
+| Is a smaller reader enough? | how much of the crate we call; an oracle to test against | write it in-tree, keep the crate as a dev-dependency oracle (as `iced-x86`) |
+| Is the reason for its pin, patch or vendoring still true? | `docs/dependencies.toml` | act on its `until` or `return_when` |
+
+### The moves
+
+**Upgrade.** A compatible release is taken by `cargo update` and the lock file
+diff is read. A breaking release is read in its changelog first; for a 0.x
+crate every minor is breaking. A release that needs a newer Rust than the MSRV
+waits, or raises the MSRV with a reason (`rust-version` in `Cargo.toml`). A
+pinned crate is moved by editing its pin, the register and, for the
+decoders that must match ClamAV's, the parity tests.
+
+**Remove.** Delete it from every manifest and feature list, then check the
+other workspaces (`fuzz`, the wasm crates, the viewer) and the site tables.
+A crate that is only a dev-dependency stays out of the shipped tree already
+and costs only the test build.
+
+**Replace.** Measure the candidates the way the filesystem section does:
+crates added to the lock file, `unsafe`, who maintains it and since when,
+whether a fixture and an independent oracle can be built without root. A
+crate published within the last months by one author, with a long chain
+behind it, is declined for the reason given there.
+
+**Vendor.** Allowed when one of these holds: the dependency holds `unsafe` or
+a codec that no feature turns off; a fix we need is merged and unreleased,
+and `cargo install` can only build from crates.io; its feature unification
+pulls in what bypasses the budget (the ZOO case); or it is a large tree for a
+small reader. It is done in this form:
+
+- a module under the consuming crate with `#![forbid(unsafe_code)]`;
+- a `README.md` beside it listing every difference from upstream, or the
+  header of the file for a single file;
+- the license file and a `NOTICE` entry (upstream, version, copyright);
+- upstream's tests where its license allows;
+- an entry in `docs/dependencies.toml` with `version` filled in (the upstream
+  release or commit) and a `return_when` that can be checked.
+
+**Un-vendor.** When the `return_when` holds, or the script shows a release
+newer than the copy: point the module at the crate, run the tests that
+exercise it, and remove the module, its `NOTICE` entry, its register entry and
+its doc mentions in the same change. If the crate lacks a fix of ours, report
+it upstream first and say so in the module's README; a fix that stays local is
+the reason a copy lives forever.
+
+**Patch.** `[patch.crates-io]` is for the excluded workspaces that are never
+published (the viewer). A crate that `cargo install` builds cannot carry one.
+The patched copy has an `EXAV.md` of what differs, and a register entry.
+
+**Pin.** `=` is for a version that something outside the repository fixes (a
+decoder's output that must equal ClamAV's, the `wasm-bindgen` CLI) or a 0.x
+crate whose releases we do not follow. It needs a register entry with its
+reason.
+
+**Advisory.** An ignore in `deny.toml` has a comment saying why it does not
+apply. A fixed release removes the ignore; an unmaintained crate with no
+replacement is replaced in the next early pass, not left to the ignore.
+
 ## Measuring WASM size fairly
 
 A plain `cargo build --release` `.wasm` is **not** the shipped size — it still
diff --git a/docs/DIFFTEST_TRIAGE.md b/docs/DIFFTEST_TRIAGE.md
new file mode 100644
index 00000000..2667e5d2
--- /dev/null
+++ b/docs/DIFFTEST_TRIAGE.md
@@ -0,0 +1,323 @@
+# Differential test triage: every difference explained
+
+Companion to [DIFF_TESTING.md](DIFF_TESTING.md). That file says how to run the
+harness. This one records what each difference in the 2026-10-23 full run turned
+out to be, so a corpus file does not have to be investigated twice. Files are
+named by the first 16 hex digits of their sha256 (the file name under
+`corpus/samples/**`).
+
+## The run
+
+| | |
+|---|---|
+| date | 2026-10-23 |
+| scope | all 8,979 files of the manifest (size cap 20 MB), `daily.cvd` only, 340,136 signatures |
+| ClamAV | 1.5.4, `clamav/clamav-debian`, clamd with 6000 MB, `MaxFileSize`/`MaxScanSize` 2000M |
+| exav | release build, `--clamav-compat --max-object-bytes 2000M --max-scan-secs 120`, `--detect macros,broken,broken-media,phishing,partition-intersection`, `--partial-as password-protected=found,limits-exceeded=found`, 6 workers |
+| host | 3 cores, 16 GB, `JOBS=6` |
+
+| bucket | files |
+|---|---|
+| clean for both | 5,844 |
+| identical detections | 2,836 |
+| exav only | 124 |
+| partial overlap | 80 |
+| careful (exav "not fully scanned", ClamAV OK) | 46 |
+| ClamAV error (exav answered) | 31 |
+| ClamAV gave up on its own limit | 14 |
+| missed by exav | 2 (0 real, see below) |
+| different name | 2 |
+
+Throughput under 6 concurrent jobs (a compliance run, not a benchmark): exav 602 s
+(14.9 files/s), ClamAV 3,674 s (2.3 files/s). Per file median 75 ms against
+311 ms, 95th percentile 1.3 s against 11.9 s.
+
+**Verdict: no false negative and no false positive in exav was found.** Two
+real bugs turned up in the PDF lexer while triaging, the carver counted one
+zip's entries as separate archives, and a document holding copies of itself was
+scanned once per copy (all fixed, see "Code changes").
+
+## How a difference was settled
+
+* **Oracle (the main tool).** `cargo run -p exav-unpack --example dump_members
+  --all-features -- FILE OUTDIR` writes every member exav extracts. Scanning that
+  directory with `clamscan -r --allmatch` shows whether ClamAV flags the same
+  bytes under the same name. If it does, exav reached content ClamAV never
+  unpacked.
+* **Mutation bisect.** Zero out a slice of the file and rescan with exav. The
+  slice whose removal kills the detection is where the match comes from. Halve
+  it until it is a few bytes.
+* **Instrumentation.** A temporary `eprintln!` in `core_matches` (the
+  `engine_pass` closure, `crates/exav-core/src/lib.rs`) printing object depth and
+  name tells which derived object matched (for example `upx-rebuilt-pe`). Never
+  committed.
+* **Packers.** `cargo run -p exav-unpack --example pepack_emu -- --dump DIR
+  --all FILE` runs exav's PE emulator and writes the recovered image.
+* **ClamAV debug.** `clamscan --debug` names the step that raised a heuristic
+  (`FP SIGNATURE: ...:Heuristics.Encrypted.PDF # Name: oleObject1.bin`).
+* **Standalone rerun.** A limit alert that disappears when exav runs once,
+  without the daemon's memory cap, is a harness artefact.
+* **Do not read ClamAV's source** to explain its behaviour (provenance rule).
+  Mutate the input and watch `clamscan` instead; that is how the XLM case below
+  was settled.
+
+## Findings
+
+Legend: **TP** exav is right and ClamAV does not reach it. **CFP** ClamAV is
+wrong. **Policy** a deliberate difference. **Artefact** caused by the harness.
+
+### Exav only: named signatures (73 files)
+
+All confirmed by the oracle unless noted. ClamAV, handed the right piece alone,
+reports the same name.
+
+| what | files | verdict |
+|---|---|---|
+| `Win.Tool.CobaltStrike`, `Win.Malware.Generic-10058807`, `Win.Malware.Poison`, `Win.Packed.Barys` in docx (30) and rtf (7): a PE written as hex inside the RTF (a docx carries `word/*.rtf`). ClamAV's RTF reader only dumps well-formed `\objdata`. The hex blob decoded by hand is flagged by ClamAV | 37 | TP |
+| `Win.Packed.Tedy`, `Agenttesla`, `Generic-9987673` in cab members: the exe holds a gzip-compressed .NET assembly in its resources. The inflated assembly is flagged by ClamAV | 3 | TP |
+| `Win.Trojan.Modiloader`: a gzip-named file (6) that is a `.bat` which is itself a CAB behind a 3-byte `PNG` prefix (`PNGMSCF`), holding `x.exe`; and cab `ae147ea53272`. `x.exe` of `0fd3605f5f1625a2` flagged by ClamAV, the others have the same structure or were settled by the member oracle | 7 | TP |
+| `Win.Ransomware.Ryzerlo` (cab `8fe7b55ea28e`), `Win.Malware.Generic-10008460`, `Msilperseus`, `Win.Trojan.Remcos` (3 msi), `Ole2.Dropper.Corona` (doc `6a22c0f7cafd`): members of the container, flagged by ClamAV alone | 6 | TP |
+| MPRESS-packed exe (`Darkkomet`, `Zeus`, `Tinba` extras). Exav's emulator unpacks it; ClamAV finds all six names in the unpacked image | 1 | TP |
+| Enigma-protected exe in a cab (`Zpevdo`, `Generic-9846514`, `Generic-9885003`). Same oracle | 1 | TP |
+| `Win.Tool.Valley` in two DLLs: x64 UPX nested in x64 UPX (`upx-rebuilt-pe`). ClamAV finds the name in the inner PE. 8 verified, 9 same shape | 2 | TP |
+| `Rtf.Exploit.CVE_2026_21509`, `Win.Exploit.CVE_2026_21514` | 16 | Policy, documented in [quirks](../www/src/content/docs/scanner/concepts/quirks.md) ("A pure-ASCII RTF is text"): the CLSID is upper case in the file and lower case in the signature, and exav also scans the lower-cased text view |
+| `Xls.Malware.Stratos-7506050` on `249bc00ea0798f78` | 1 | Policy, open question. Exav adds an original-case concatenation of all VBA modules (`vba_project_raw`) and the signature's four strings sit in different modules. ClamAV only builds the lower-cased dump. Likely a false positive on a benign workbook; decide whether `Target:2` signatures should see the raw copy |
+
+Signature definitions can be read from the extracted database:
+`tail -c +513 daily.cvd | tar -xz` then `grep NAME daily.ldb`.
+
+### Exav only: heuristics
+
+| class | files | verdict |
+|---|---|---|
+| `Heuristics.Encrypted.Zip` on WannaCry exe and dll (23): the PE carries an encrypted zip in a resource (`b.wnry`). ClamAV flags the zip when carved out by hand | 23 | TP, reach |
+| `Heuristics.Encrypted.7Zip`: msi installers carrying a 7z AES archive, one top-level 7z, one zip holding an msi. ClamAV 1.5.4 never reports an encrypted 7z, even for the plain 7z file. The name is not documented anywhere and `--clamav-compat` still emits it | 18 | Policy, undocumented. Document it or drop it in compat mode |
+| `Heuristics.Encrypted.RAR` on `97bbe277773cc10b`: RAR SFX payload inside `compat.exe` in a cab. ClamAV flags the carved payload | 1 | TP, reach |
+| `Heuristics.Encrypted.PDF` on `97d7221dddca52d1`: AES-128 (R4) PDF that opens with an empty password (qpdf agrees). Exav reported it password-protected | 1 | **Exav bug, fixed** (`\b` escape in the PDF string lexer broke `/O`) |
+| `Heuristics.Broken.Executable` in three MSI installers (ScreenConnect and friends): members that are broken PEs. ClamAV flags the same members alone | 3 | TP, reach |
+| `Heuristics.Broken.Media.*` (JPEG dup APP marker, PNG chunk errors, spurious bytes): pdf, xlsx, zip and apk members. ClamAV flags the same members alone | 6 | TP, reach |
+| `Heuristics.OLE2.ContainsMacros.VBA`: four xls with a default-password encrypted workbook (exav decrypts, finds the project); one xlsm named `.xls` (`26b8ea7bb37f273a`, VBA in `xl/vbaProject.bin`, ClamAV does not alert on OOXML) | 5 | TP |
+
+### Limits (85 files carry an exav-only limit alert)
+
+85 = 54 files where ClamAV answered (39 persist standalone, 15 vanish) plus 31
+where ClamAV errored (7 persist, 24 vanish). The class lists at the end split
+the 54; the 31 are under "ClamAV error".
+
+| class | files | verdict |
+|---|---|---|
+| Vanish when exav runs standalone without the daemon cap | 39 | Artefact. With 6 workers on 16 GB each scan gets 1.66 GB and may hold 415 MB in one object. A nested 866 MB zip, or a 797 MB member, is refused ("its format is read whole"). Run fewer workers or a bigger host. A nested zip over the object cap is a real exav limitation |
+| Persist standalone | 46 | see below |
+
+What the 46 are:
+
+* **Carving cap** (ppt, doc, xls, dll): "more embedded files than carving scans in
+  one object (16 executables, 32 archives)". The "archives" are the local file
+  headers of one embedded zip, each taken as its own candidate and scanned to the
+  end of the object, so a zip with N entries cost about N squared member visits.
+  **Fixed** by counting a zip once (see "Code changes"). What remains are real
+  executables: `a9de34a3741cd8b3` has 20 distinct PEs. Raising the caps to 64 and
+  256 was tried and rejected: it made `8c586cec56193cd2` 14 times slower (9 s to
+  126 s) for the same verdict. `26b8ea7bb37f273a` (5 MB, 28 s, 937 MB fed to the
+  matcher) is not this: see "Open items".
+* **Member count** (jars, apks, msi, ppt, xls): `file count > 10000`, the compat
+  limit. Exav counts members of nested archives; ClamAV scans fewer. In normal
+  mode the limit is 100,000.
+* **Compression ratio 1000** (pdf, 6 files): a blank scanned page is a Flate
+  stream at the format's ceiling of about 1032:1, so it trips a ratio of 1000
+  once past the 4 MB floor. Kept: it is a security default
+  (`Limits::max_compression_ratio`) with a test.
+* **PCRE size, compat** (`e8fe51be55737313`): a 22 KB RAR that unpacks to a
+  116 MB padded `.js`. In compat exav keeps ClamAV's 100 MB PCRE limit and
+  reports it; ClamAV skips PCRE silently. Normal mode scans it completely.
+* **Embedded 7z/zip beyond `--max-members` in msi** (`d457af10c19d93d9`,
+  `8c586cec56193cd2`): same member count limit.
+
+### ClamAV only (exav lacks it), all ClamAV false positives
+
+| class | files | explanation |
+|---|---|---|
+| `Heuristics.OLE2.ContainsMacros.XLM` | 10 | All are FILEPASS-encrypted workbooks. ClamAV reads the encrypted `BOUNDSHEET` bytes as sheet types and one byte equals 1 ("macro sheet"). Mutating the BOUNDSHEET records of the sample removes the alert. Decrypted, there is no macro sheet; exav decrypts first |
+| `Heuristics.Encrypted.PDF` on xls | 10 | An encrypted PDF embedded in an Excel object. It opens with an empty password; exav decrypts it and reads it. Alerting would be wrong |
+| `Heuristics.Encrypted.RAR` on `e8b64acacdce1f67` | 1 | A Go binary (chisel). The "RAR" is `Rar!\x1a\x07\x00` in `net/http`'s content-sniffing table. Exav correctly ignores it |
+
+### Careful: exav says "not fully scanned", ClamAV says OK (46 files)
+
+Each has a stated reason; none is a surprise.
+
+* 22: executable protected by a code virtualizer (VMProtect, Themida and the
+  like, 17 of them inside ISOs); no original code exists to recover.
+* 4 truncated 7z ("next header extends past end of file"), 4 corrupt deflate
+  streams, 4 PDF streams that do not decode, 2 zip members cut part way, 2 NSIS
+  streams cut part way, 2 MSI chunks that end early, 1 MSZIP failure, 1 AutoIt
+  member ending early, 1 UPX with a damaged `PackHeader`, 1 unknown packer, 1
+  AppleDouble container (no reader), 1 tar with a bad checksum field.
+
+### ClamAV gave up, exav completed (14 ISOs and cabs)
+
+ClamAV reports `Heuristics.Limits.Exceeded.MaxScanSize` although the limit is
+2000M. Exav scans them to the end and finds nothing.
+
+### ClamAV errors (31 files)
+
+Client timeouts (120 s) on slow archives. Exav answered all 31 within its own
+limits, and ClamAV has no verdict to compare with. Rerun with a longer `TMO` if
+the comparison is wanted.
+
+### "Missed by exav" (2) and "different name" (2)
+
+* `b3970ff836f096cb` (iso): not a real miss. A row cut off when a run was killed
+  was glued to the next one, so the "verdict" was the file size. ClamAV found
+  nothing. **Kill runs cleanly, or check the clam table for a row with no tab.**
+* `b7dacc50bebb59e3` (msi): a damaged CAB appended to the MSI (bad CFDATA
+  checksums; cabextract and 7z fail). ClamAV extracts the first 61 KB, finds a
+  truncated exe and alerts `Heuristics.Broken.Executable`. Exav reads the whole
+  2,988,896-byte exe, a valid PE with every section inside the file, and finds
+  nothing. Exav ignores CFDATA checksums on purpose. No fix.
+* `53812d7bdaf5e8e5` (pdf): both alert on a corrupt JPEG; the flate stream is
+  corrupt, so the engines salvage different amounts of it and name the error
+  differently (`CantReadSegmentSize` against `SpuriousBytesBeforeSegment`).
+  Benign.
+* `15d1a76ada779d4d` (zip): ClamAV `MaxScanTime`, exav `MaxFileSize` (memory cap
+  in the daemon; clean standalone).
+
+## Code changes made because of this triage
+
+* `crates/exav-unpack/src/formats/pdf_parse/lex.rs`: `\b` and `\f` in a PDF
+  literal string were read as the letters `b` and `f`; a short octal escape
+  (`\0)`) swallowed the byte after it, including the closing parenthesis.
+  Tests: `backspace_and_form_feed_escapes_are_decoded`,
+  `a_short_octal_escape_does_not_eat_the_next_byte`, and in `crypt.rs`
+  `an_owner_key_with_a_backspace_escape_still_opens_with_the_empty_password`
+  (the dictionary of `97d7221dddca52d1`). Each fails without its fix.
+* `crates/exav-core/src/pe.rs`, `Carving::feed`: a ZIP local header at the offset
+  the previous one says the next entry begins (`zip_next_header`: no data
+  descriptor, no encryption, no ZIP64 size) is not an archive candidate; the
+  walk of the first one reads it, wherever the central directory points. A zip
+  at offset 0 is treated the same. The caps stay at 16 and 32. Tests in `pe.rs`
+  (entries of a zip stapled in, at offset 0, headers that cannot place the next
+  one, a size that misses it) and `suites/embedded_carve.rs` (a 300-entry zip
+  stapled into a document is clean; a second zip at the offset the first names,
+  inside its span or after its end, is still found). The unit tests and the
+  300-entry test fail with the skip disabled.
+
+* `crates/exav-core/src/lib.rs` (`member_content_scan`, `clean_memo_key`) and
+  `engine/mod.rs` (`clean_seen`, `clean_seen_insert`): a container member that
+  was scanned clean and complete is remembered for the rest of the scan, by a
+  SHA-256 of its bytes and of its place (container type, forced type, the types
+  above it, name extension). An identical member in the same place at the same
+  depth or deeper is not scanned again. Only members of 64 KiB to 512 MiB; a
+  scan that raised a truncation flag is not remembered; at most 4,096 entries;
+  cleared with the truncation flags at the start of each top-level scan. A copy
+  that is not clean, or sits shallower than the one remembered, is scanned as
+  before. The scan budget is still charged when a member is decoded, so a
+  bomb of copies still trips it. Unit tests in `lib.rs` (`copies_of_a_clean_member_are_scanned_once`,
+  `members_that_differ_are_each_scanned`, `small_copies_are_each_scanned`,
+  `an_infected_member_after_clean_copies_is_found`,
+  `a_clean_copy_covers_only_the_same_depth_or_deeper`); the first and the last
+  fail when the insert or the depth rule is removed. Measured: `26b8ea7bb37f273a`
+  30.6 s to 2.8 s, same verdict; whole manifest, no verdict differs from the
+  run without the memo; CPU on 250 files of 0.2 to 8 MB, 218 s against 216 s
+  (the digest costs nothing measurable).
+
+Why skipping a zip's later entries is safe: a plain walk of a zip (no carving) reaches the local
+headers of a second zip placed anywhere after its own, in the span before its
+central directory or after its end record. So the second archive is read when
+the first is.
+
+Measured effect, old build against the final one, whole manifest (8,979 files,
+the harness flags):
+
+* Verdicts: 12 files differ and nothing else. 11 lose a `MaxFiles` alert (all
+  from the carving cap) and `97d7221dddca52d1` loses `Encrypted.PDF` (the lexer
+  fix). No detection of any kind is lost or gained.
+* `652df9c24dcf0110` (xls): 3.6 s to 0.9 s and the macro alert is kept in
+  compat mode, which it lost when only the caps were raised.
+* Time: the same. Alternating old and new per file on 300 files, wall 134 s
+  against 132 s and CPU 212 s against 209 s. The full pass took 791 s against
+  602 s for the first one, and that gap is the machine, not the code: it is
+  uniform (median 1.2 times even on files under 100 KB, where carving cannot
+  matter) and the same with the caps raised.
+
+## Open items
+
+* `26b8ea7bb37f273a` (xlsm): explained, not a bug, and now 3 s instead of 30 s
+  by the clean-copy memo (see "Code changes"). Diagnosis: `xl/embeddings/oleObject3.bin` is a 5.2 MB RAR holding a matryoshka: 152
+  members nine levels deep, 660 MB extracted from a 5.3 MB file (125 times), a
+  fan-out of 3 at the deepest levels (36 copies of the same 7.7 MB OLE object,
+  which carries three copies of a 2.5 MB jpg and the next RAR). Only 50 of the
+  152 members are distinct (113 MB). No limit trips: each member expands about
+  3 times (the ratio guard is per stream), and the totals stay under the 1 GiB
+  extracted and 10 GiB scanned budgets. Time is linear in volume: about 35 MB/s
+  in the matcher (26 s for 937 MB, which is more than 660 MB because an OLE
+  object is matched whole and again as its streams) plus about 10 s of RAR
+  decoding. ClamAV answers in 0.3 s and scans 5.4 MiB: it does not open the
+  embedded RAR.
+* Carving more than 16 executables costs a rescan of the object per executable;
+  the cap is what bounds it.
+* `Heuristics.Encrypted.7Zip` in compat mode (document or drop).
+* `vba_project_raw` and `Target:2` signatures (Stratos).
+* A nested zip past `--max-object-bytes` is not walked, because zip is read
+  whole. A spill-backed seekable source would remove the limit.
+* `difftest.sh`: let exav run with fewer workers than `JOBS` (or a larger
+  per-scan memory) so memory-capped limits do not appear as differences; note in
+  DIFF_TESTING.md that changing `JOBS` discards the ClamAV cache.
+* Leaked clamd temp files in `$SOCK_DIR` (5 GB after two killed runs) filled
+  the disk and stopped a run; clean them after a kill.
+
+## Class lists
+
+Every file that is not clean or identical, by class. 16 hex digits of the sha256.
+
+**CAREFUL (46):**
+0087b35d4460c970 0299d636802f5d8c 0aa66c62d8af0501 0d9f37e5ada1fcfc 0ea67d58d900c9ed 1d9bb14a95d46244 201cf8213fddeeb6 2171f783d2f705d4 2b104743dece0009 34c7d56bc43c8aa3 38cf37207571e68e 3bd2ce406aa9c310 431f16e6453e3c9b 44210eecc61cae50 4a241076b4b1b372 56829efc5cf4c9b5 6648302d497ee236 6b2c53eed24e6c3c 6b60813635717e89 7576a22aada711e4 77ccda79bc51c0da 86573dc0e6d066e8 86d89c68b57ffff1 8860960d7edfc8cc 8cd1cf28115cc9fd 9231e59452c8297f 939614ca17f25bf3 988c7108d9edc3cc a32c6199248e2488 a44ebeeeeffe7e9d a4f4382f361ea243 a54d2448c10f63a4 a750f3b2120e9f9d b76c5a4e63236a72 be01508c3e99f52c c2d04e162c733153 c32bdee0ec38c782 c613bf6e2b7e0f9a c8e8339ac7378085 da885760aaf9f56c e44250c76f444640 ed634afb236ae762 f3ee455a8ec625fe f9b1c6d7ef48f258 fbc0e4ee9167fa13 fd9bb6bf944bfc60
+
+**ClamAV only, Encrypted.PDF (10):**
+1d97f8703f3e94db 561cfc0f5af02ed7 7df9619f4ebfbfae 7fa36027da764a24 cbcd9d42fda0f69e d91c0e47050b3d3a e71e1bcc0bd45ce8 e9c2928799e29531 f67949219e9c1e55 fcd959770e20be2a
+
+**ClamAV only, ContainsMacros.XLM (10):**
+0f88cba6937a7f4a 1e78bfe5597be0fd 6d577060ff3bad7b 73633e1552e9b4e4 a84724da7ca93094 a9739ca257abe963 c38f7442f831322e cad4c2a58e1d8cd6 e221d54c29eeb719 f9f6314fc9f333b1
+
+**ClamAV gave up (14):**
+03d10e05ff7dfcfa 11c0447506a592e4 188f9b719f24aaf7 26a28dac52985b93 4794fecfc7532249 4b4d817797a5c425 806e0a2d8c8969ee 8108aa3ea1ff072b 82990ff6892d6d93 911406cbc8a9d8bc bbcdfc21a8d4d990 e295cf56fdf900cc e7496d72cecd5f73 e98ec2e2ecb0b4c0
+
+**ClamAV error (31):**
+0218fd850ca27f53 17b3f2dddbdacfb5 214fabef5dcd9bb9 24636cfe302fe7c7 34edcaeb64151e66 3536ccb7f3849791 42d624f5eabbfd15 4b5931e2e1c61bdc 513992d7076984d5 5fbed74e14ac6672 60241999f0f2d24b 664f2e71b527adad 7050c741d67e3335 76f50197193ece03 778ec9e6e0eb33d0 7f9a904a75df61c4 8c586cec56193cd2 b999fba4d4db5bdb be83d2ef39936814 bf5f96257e0d62bf c3001c3c4bd90844 c4b117f30786d0b3 cbede93869b3b49b ccc32204d9b5248e cfe903227ef28b4d d9d65ba90d1cb339 df3ec74c7affc6c3 e89e7065ed449be6 ea692f472d83dad2 fa14e758d5603486 ff760476038ffcc8
+
+**Exav only, Broken.Executable (3):** 51acbd2c6429c059 a299d16325dd6c79 a8a2148d6cf70d06
+
+**Exav only, Broken.Media (6):** 1ed821fcc96cd12b 3a451d6440924ddc 4d279990b1f785d5 590a05ad978d5230 ad32afe426639f17 fd8ad8f256f063e3
+
+**Exav only, ContainsMacros.VBA (5):** 26b8ea7bb37f273a 47d8113a537e43ae 8bd46e4d069be47d 91f07d3af97ccccd c1733e867b91d2f1
+
+**Exav only, Encrypted.7Zip (18):**
+39d523a5486403cf 3e041fca1afb1896 46b7a1b85bcfcf53 486a26f35e5fa61c 4893de26be7c3014 60432d6eb939fc6d 69fb8fb0615a92ba 7af9b52392570350 969fa1cca8aaba23 9fc308606f49a3e3 a497a5a4aee23b53 aeb00742bc7f53f1 c5732e595ea5e2cc c6d11a362a134273 d49a51bbc86b8626 e28825d93ba61c9e e28bc04a6fab5755 e30b63d095dbedef
+
+**Exav only, Encrypted.PDF (1, fixed):** 97d7221dddca52d1
+
+**Exav only, Encrypted.RAR (1):** 97bbe277773cc10b
+
+**Exav only, Encrypted.Zip, embedded (23):**
+0b2d6d916b7c65a1 0e42e5927b3e7628 1241d39ed7c577d2 139bf62f701613c6 17b502febe4c9576 19ede46effb82553 1d2f1a8c2962658d 1d9427b7739d112e 405eeccd5e87474b 4c0aad4c85da91d9 608371b1c6e84d84 66c883ff13b81204 66ddd0edb16bfb04 764c5e5d18af9185 a32575ab0959baee a5bbdd39bf6360c3 a9bf6b54b485f91e b4f0148df9332a4c be6b529a5d73a362 d3961de88685bcad d435698c0c6075d6 d833fe282b1e2630 f0d29fc579b7f0c9
+
+**Exav only, CVE-2026 RTF (16):**
+1ed863a32372160b 27cc24191592acbb 3cb09154a839a5de 479fd5e5bd5566a0 506e7512c897514e 5a17cfaea0cc3a82 969d2776df0674a1 b2ba51b4491da860 baad1153e58c86aa bbfd93dbf43236b7 be859b4f4576ec09 c91183175ce77360 e8889528e2114a70 f7bda19543074c78 f81e70c6951855e2 fd3f13db41cd5b44
+
+**Exav only, limit alerts that persist standalone (39).** Measured before the
+carving fix; these 11 no longer alert `MaxFiles`: 02fcfa3661eba24f
+036d5c207e08a9ca 10f7d98a3aad55a9 30a9c4190942560c 652df9c24dcf0110
+7721fa12ed38f464 a0f1d5d0b561c148 b70d94fd7da398d1 eb575107f62e36ff
+f107f93896e13db2 fd8ad8f256f063e3.
+02fcfa3661eba24f 036d5c207e08a9ca 06328e27d906ef06 0807bbceb5b347cc 10f7d98a3aad55a9 1efa9a6e2c80769b 214831e29e52473a 30a9c4190942560c 3dbc39f220287603 45415f110b7961ee 5b2ea57a1e98320b 6423a95d9bb21f69 652df9c24dcf0110 6842d3f39591663c 7721fa12ed38f464 7c19a1542080f401 7d887e39bbb67f8c 81ec61a49b5fcc4e 8d42d425d003480d 91183972e908c013 93916b2b689b390b 9f238ad7ee69f9a5 a0f1d5d0b561c148 a83d05b6e86692f1 a9de34a3741cd8b3 ab878c9b957b90ff afd6aa4c10a70772 b70d94fd7da398d1 c2d0d7e20939319d c3106f5489c1b841 c47a2e761bd82ed8 d1bceccf5d2b900a d457af10c19d93d9 d9ddf328b6151bb6 e6fd06228e30648d e8fe51be55737313 eb575107f62e36ff f107f93896e13db2 fd8ad8f256f063e3
+
+**Exav only, limit alerts from the daemon memory cap (15):**
+11936fb09c6770b6 1220d2250778f214 14ac0c55100d957d 299d637461aec046 2ea2ab216b5e157d 3415bc316b67dce3 583b4d60eef20ddc 783008a032b58cbc 79f7b67ce8b39070 85046369ce3c2d3c 8a63e287500e0342 8edbc1689fba83ce ab5d1a42babf7a6f c86b1625d01dbd8c e27696135b673b81
+
+**Exav only, named signatures (see the table above for causes):**
+Win.Tool: 0141cd8c1c36de1d 0501889bf03e8049 051a19599ed53c23 1144433760a06834 1427bf3d809e8767 153892f70403de44 221f0dfce9d3d8c7 3dd4e4abfaddb0fa 40fc5865bb2b7e10 51aae172a88c1a03 5cceb6359a30fa49 6cf095b62941364c 6f5f9a315f359101 795190db4f5689c3 866a9be2f90b18f5 8d5b587491c4d79f 94be6da9598a9ed8 a355998ff9943113 b3afa94cb798f205 b4de258f62843f57 c56e550224f2e3f6 cdc7c2d40b1e404f e29c6a8615c0203a f6051498dc45e053
+Win.Malware: 14de56ac48083584 25849d134335eebf 2a94c09245788e2e 3573fe242daee183 4903fbe3e8ee4bc4 52f6d81aa40d054f 7b6eb29b43e63f8f 9985f58f259ed1e6 9e71d743c8956c70 ac39ac04e808d8c9 c8f6c1c71ed253a5 d5df428380aaa991 dcf6fd6d07ff8c38 ea1a5491338fdb51
+Win.Packed: 1c90e49314b25bd2 3ade60b953e17c45 4f8211d757f5e212 71b906576bc68097 e31a6cc18a18d992 ee812fa860c2283d
+Win.Trojan: 0fd3605f5f1625a2 4a23c9ce67eb22b9 5201e83114e993d0 54be39b2a6c2a4b8 669f370d2e5a1c65 6ec4a56cbf21b654 86fb86b96de68b5a a2425da7336b3db5 ae147ea532725b24 f993c4798c266775
+Other: 6a22c0f7cafd717d (Ole2.Dropper.Corona) 6ec4a56cbf21b654 (MPRESS) 8fe7b55ea28e5c83 (Ryzerlo) 249bc00ea0798f78 (Stratos)
+
+**Misc:** missed `b3970ff836f096cb` (corrupt row) `b7dacc50bebb59e3` (damaged CAB); different name `15d1a76ada779d4d` `53812d7bdaf5e8e5`.
diff --git a/docs/DIFF_TESTING.md b/docs/DIFF_TESTING.md
index 6d16b72f..3282dec6 100644
--- a/docs/DIFF_TESTING.md
+++ b/docs/DIFF_TESTING.md
@@ -215,6 +215,10 @@ Key choices, and why:
 
 ## Interpreting results
 
+Every difference in the 2026-10-23 full run is explained, file by file, in
+[DIFFTEST_TRIAGE.md](DIFFTEST_TRIAGE.md), with the recipes used to settle them.
+Look a file up there before investigating it again.
+
 - **AGREE / clean**: exav matches clamscan. This is the headline metric.
 - **FN** (clamscan found, exav missed): a real gap; investigate the signature
   type (`clamscan --debug` on the file shows what it matched). Known causes
diff --git a/docs/FUZZING.md b/docs/FUZZING.md
index db655e5a..5496574f 100644
--- a/docs/FUZZING.md
+++ b/docs/FUZZING.md
@@ -41,6 +41,9 @@ panic instead of wrapping). Targets in `fuzz/fuzz_targets/`:
 
 | target          | entry point                       | covers                                   |
 |-----------------|-----------------------------------|------------------------------------------|
+| `vdisk`         | `unpack::walk()` of QCOW2, VMDK, VHD, VHDX, NTFS, FAT and partition tables | the virtual disks and the volume walker, with a buffer limit of 64 KiB so any image of a few KiB declares a disk walked in place: the tables read as units are reached, compressed units and their cache, the filesystems read through a `Read + Seek`. The first byte picks the format. Each image is walked from memory and through a block cache of 512-byte blocks, which must find the same members and end the same way, and no member held whole may pass the buffer limit. |
+| `fsimage`       | `unpack::walk()` of ext, exFAT, SquashFS, cramfs, romfs, EROFS, 7z, WIM, xar and partition tables | the filesystem readers on hostile images, and the archives read where they lie on a seekable source: the superblocks, the directories and their loops, extent trees and block maps, chunk maps, the sparse and the compressed blocks, a 7z's header and folders, a WIM's chunk tables and a xar's table of contents, with a buffer limit of 64 KiB so a volume of a few KiB declares more. A file past the limit is read as it goes, up to the 4 MiB the scan budget gives. The first byte picks the format. Each image is walked from memory and through a block cache of 512-byte blocks, and again from memory: the three must find the same members, the first two must end the same way, and no member held whole may pass the buffer limit. |
+| `lzo`           | the LZO1X decoder (`exav_unpack::lzo_decompress`) | SquashFS's LZO blocks: the decoder never panics, never writes past the size it is given, and gives the same bytes twice; a stream of literals made from the input must come back as it is. |
 | `analyze`       | `analyze()` — the whole scanner   | format detection → every extractor (recursively) → pattern/hash matching → PE/ML/fuzzy heuristics → bytecode, against the signature files of `fuzz/db/` (every signature kind, the YARA rules, a bytecode program), under options the input's last two bytes choose (`fuzz/options.rs`: the heuristics, every `alert_*`, the structured-data and phishing checks, tight or production bounds, an object read in memory or through the block cache). **Broadest; the primary target.** |
 | `full_pipeline` | the scanner as a deployment builds it | up to eight database files (a kind byte, bit 7 official, and their text) go through `loader::Builder::add_named_bytes` as the CLI does, so every kind the loader reads is reached (signatures, hashes, container and file-type rules, YARA, bytecode, phishing and allow-lists, `.crb`, passwords); then the scan, held to what the entry points promise each other: the same bytes scanned twice agree, `analyze_all` is a superset of `analyze` and a clean scan lists nothing, a stream read in pieces answers what a buffer did, and a database written out and read back scans as the one it came from. **Widest single target.** |
 | `seekable`      | `scan_seekable()` over a reader that returns a few bytes a call and fails part way | the block-cache read of an object over `deep_analysis_max`, which no other target reaches. Checked: a reader and a buffer give one answer, a reader that fails is an error unless a detection was already made, and an object read through the cache that found nothing is not `Clean`. |
@@ -60,10 +63,29 @@ panic instead of wrapping). Targets in `fuzz/fuzz_targets/`:
 | `bytecode`      | `.cbc` bytecode loader            | bytecode verification                    |
 | `rar3_ppmd`     | RAR3 PPMd decompression          | PPMd/LZSS conversion path               |
 | `pe_emulator`   | `exav_pe_emu::unpack()`               | the x86 emulator that runs packer stubs: instruction decode + semantics, the emulated Windows environment, SEH, and the dump path. **The only target where the input supplies control flow rather than data.** Its decoder, `exav-x86`, is hand-written and `forbid(unsafe_code)` like the emulator (`x86_decode` checks it against `iced-x86`); the target goes through the entry point the scanner uses. Asserts the invariant the scanner relies on: anything emitted parses as a PE. |
-| `imagehash`     | `exav_imagehash::Hasher::hash()`, `exav_render::image::decode_any()`, `exav_render::pdf_image` | every image decoder behind `fuzzy_img#` (PNG, GIF, JPEG, TIFF, BMP, WebP, ICO, PNM, QOI, DDS, farbfeld, HDR, and JPEG 2000 and JBIG2 through hayro-jpeg2000 and hayro-jbig2), then the grey conversion, resize and DCT of both presets, with a 64 MiB decode budget. The scan reaches these only when a database has a `fuzzy_img#` signature, so `analyze` rarely does. Then the JPXDecode, JBIG2Decode and CCITTFaxDecode decoders `@exav/viewer` puts in place of pdf.js's, their parameters taken from the input's length. Those do not catch panics: in the browser a panic traps the wasm instance. |
+| `imagehash`     | `exav_imagehash::Hasher::hash()`, `exav_render::image::decode_any()`, `exav_render::pdf_image` | every image decoder behind `fuzzy_img#` (PNG, GIF, JPEG, TIFF, BMP, WebP, ICO, PNM, QOI, DDS, farbfeld, HDR, and JPEG 2000 and JBIG2 through hayro-jpeg2000 and hayro-jbig2, and JPEG XL through zenjxl-decoder (the `jxl` feature, which the scanner's builds leave off)), then the grey conversion, resize and DCT of both presets, with a 4 MiB decode budget (64 MiB for the other decoders). The scan reaches these only when a database has a `fuzzy_img#` signature, so `analyze` rarely does. Then the JPXDecode, JBIG2Decode and CCITTFaxDecode decoders `@exav/viewer` puts in place of pdf.js's, their parameters taken from the input's length. Those do not catch panics: in the browser a panic traps the wasm instance. |
+| `raw_preview`   | `exav_render::image::raw::detect()` + `preview()`, `decode_any()` | camera RAW files as `@exav/viewer` opens them: detection by the bytes (TIFF-structured files told from plain TIFFs, ISO base media, Fujifilm, Sigma, CIFF and Minolta signatures), the TIFF directories (chains, SubIFDs, Exif pointers, strips, JPEGInterchangeFormat, 8 and 16-bit samples), the JPEG stream search over the whole file, the Exif orientation of the files and of the streams, and the budgets, with a 16 MiB decode budget. The scanner does not read RAW files, so no other target reaches it. A panic `preview` would catch counts: in the browser it traps the wasm instance. |
 | `drawing`       | `exav_render::dwg::Document::parse()` + `tessellate()` | DXF, ASCII and binary, and DWG (R13 to 2018), into the drawing model, then the tessellation of every layout on a light and a dark ground: what `@exav/viewer`'s DWG module runs on any file a user opens. The scanner does not read drawings, so no other target reaches it. A panic `parse` would catch counts: in the browser it traps the wasm instance. |
 | `cad_dxf`       | `exav_render::cad::read_dxf_with()` + `to_json()`, `cad::preview()` | DXF, ASCII and binary, R12 to 2018, into the drawing model: the meaning of each group code in each record (hatch boundaries, multileader context data, R12 viewport extended data, subclass splits, proxy graphics streams), and the thumbnail found from the end of the file. `unpack` and `analyze` reach DXF's tokenizer and the payload extraction through exav-unpack's `dxf` format, but not this reading of it. |
-| `ifc`           | `exav_render::ifc::read()` + `exav_render::stl::read()` | IFC (IFC2X3, IFC4, IFC4X3) and STL into triangle meshes, as `@exav/viewer`'s model module reads them: the STEP index and parameter parser, units, placements, profiles, curves, swept and tessellated solids, B-reps, booleans (BSP trees) and openings, within a 200,000-triangle budget; and binary and ASCII STL. No other target reaches them. |
+| `ifc`           | `exav_render::ifc::read()` + `exav_render::stl::read()` | IFC (IFC2X3, IFC4, IFC4X3) and STL into triangle meshes, as `@exav/viewer`'s model module reads them: the STEP index and parameter parser, units, placements (local, grid and linear), profiles, curves (alignment curve segments among them), swept and tessellated solids, B-reps with their curved faces, booleans (BSP trees) and openings, within a 200,000-triangle budget; and binary and ASCII STL. No other target reaches them. |
+| `mesh`          | `exav_render::obj::read()`, `ply::read()`, `gltf::read()` | Wavefront OBJ, Stanford PLY (ASCII and binary, both byte orders) and glTF 2.0 (`.gltf` with `data:` buffers, `.glb`) into triangle meshes, within a 200,000-triangle budget: polygon triangulation, PLY headers and list types, glTF's own JSON reader, accessors, sparse accessors, node transforms and trees, base64. The target also checks that every scene it gets back has whole triangles, indices in range and finite positions. |
+| `markdown`      | `exav_render::markdown::parse()` + `to_json()`, `visible_text()` | Markdown (CommonMark, tables, strikethrough) into the tree `@exav/viewer`'s text module draws, through pulldown-cmark: the nesting, column and node bounds, the link targets the tree may carry (http, https and mailto, no space, control, separator, bidirectional control or credentials, checked on their own terms), padded table rows, and that the JSON is balanced and ends as the page expects. |
+| `sheets_xls`    | `exav_render::sheets::convert(.., Format::Xls, ..)` | XLS into the XLSX `@exav/viewer`'s sheets module shows: the lenient compound file reader, BIFF2 to BIFF8 records and their CONTINUE joins, decryption with the default password (XOR, RC4, RC4 CryptoAPI), code pages, formulas, conditional formats, validations, the drawing layer (pictures, shapes, charts) and the XLSX writer, within 200,000 cells and 64 MiB. Checks that what converts is a ZIP whose first parts are XML without a C0 control character. No other target reaches it. |
+| `sheets_ods`    | `exav_render::sheets::convert(.., Format::Ods / Fods, ..)` | ODS (a ZIP) and FODS (anything else): the XML tree's bounds, styles and data styles, OpenFormula conversion, conditional formats and validations, frames and charts, the repeated rows and columns, then the XLSX writer, under the same limits and checks. |
+| `sheets_numbers` | `exav_render::sheets::convert(.., Format::Numbers, ..)` | Apple Numbers: the input is an IWA stream the target stores as `Index/Document.iwa`, or a Numbers '08/'09 `index.xml` when it starts with `<` (`index.xml.gz` when gzipped), or a whole document when it is a ZIP, so the mutations reach the Snappy blocks, the protobuf archives, the tiles and cell records, the '09 XML's styles, data source and formulas, not the ZIP around them. Same limits and checks. |
+| `sheets_text` | `exav_render::sheets::convert(.., Format::SpreadsheetMl / Html / Sylk, ..)` | The text formats Excel opens from a .xls file, the first byte picking the reader: XML Spreadsheet 2003 (declared encodings, styles and their parents, R1C1 formulas), HTML tables (the bounded tokenizer, CSS and `mso-` properties, spans, conditional markup, character sets) and SYLK (records, ISO 6937 escapes, shared formulas). Same limits and checks. |
+| `slides_ppt` | `exav_render::slides::convert(.., Format::Ppt, ..)` | PowerPoint 95 and 97 to 2003 into the PPTX `@exav/viewer`'s slides module shows: the input is the `PowerPoint Document` stream, which the target stores in a compound file it builds, or a whole compound file (or a file of PowerPoint 2 to 4, or BinHex text), so the mutations reach the record tree, the persist directory and user edits, the text and style atoms, the OfficeArt drawing layer (property tables, shapes, custom paths), the blip store, the PowerPoint 95 records and the OLE charts, then the PPTX writer, within 20,000 shapes and 64 MiB. Checks that what converts is a ZIP holding the parts the viewer reads first, whose XML parts have no C0 control character, and that a document of several slides also converts with its first slide alone (`convert_first`), counting the same slides. No other target reaches it. |
+| `slides_odp` | `exav_render::slides::convert(.., Format::Odp / Fodp, ..)` | ODP (a ZIP) and FODP (anything else): the XML tree's bounds, styles and their parents, list styles, masters, enhanced geometry and its formulas, SVG paths, text and fields, tables, pictures and chart objects (through the `sheets` chart writer), then the PPTX writer, under the same limits and checks. |
+| `slides_odg` | `exav_render::slides::convert(.., Format::Odg / Fodg, ..)` | OpenDocument drawings, ODG (a ZIP) and FODG (anything else), into the PPTX `@exav/viewer`'s slides module shows, a page to a slide: what `slides_odp` reaches, and the master pages' page sizes (the largest becomes the PPTX's), the layers that are not displayed and the pages' names, under the same limits and checks. |
+| `slides_vsdx` | `exav_render::slides::convert(.., Format::Vsdx, ..)` | Visio 2013 and later drawings (an Open Packaging package of XML parts) into the PPTX `@exav/viewer`'s slides module shows: the package and its relationships, document, pages and masters, shape sheets and their inheritance from masters and style sheets, formulas, geometry rows and splines, text, pictures and themes, under the same limits and checks. |
+| `slides_keynote` | `exav_render::slides::convert(.., Format::Keynote, ..)` | Apple Keynote: the input is an IWA stream the target stores as `Index/Document.iwa` (Keynote 6 and later), or a whole document when it is a ZIP, or an `.apxl` file when it starts with `<` or is gzipped (Keynote 1 to 5), so the mutations reach the Snappy blocks, the protobuf archives, the XML trees, the slides, masters, placeholders, styles, shapes, paths, tables and text storages, not the ZIP around them. Same limits and checks. |
+| `docs_doc` | `exav_render::docs::convert(.., Format::Doc, ..)` | Word 97 to 2003, and Word 6 and 95 (a `WordDocument` stream whose first word says so, which the mutations reach), into the DOCX `@exav/viewer`'s docs module shows: the input is the `WordDocument` stream, which the target stores in a compound file it builds next to table streams made of its second half, or a whole compound file, so the mutations reach the FIB, the piece table, the character and paragraph FKPs, the sprms, the stylesheet, lists, sections, tables, notes, comments, fields and the OfficeArt layer, then the DOCX writer, within 20,000 paragraphs and cells and 64 MiB. Checks that what converts is a ZIP holding the parts the viewer reads first, whose XML parts have no C0 control character. |
+| `docs_odt` | `exav_render::docs::convert(.., Format::Odt / Fodt, ..)` | ODT (a ZIP) and FODT (anything else): the XML tree's bounds, automatic and named styles and their parents, master pages, lists, tables, frames, pictures, notes and fields, then the DOCX writer, under the same limits and checks. |
+| `docs_rtf` | `exav_render::docs::convert(.., Format::Rtf, ..)` | RTF: the tokenizer, the group stack and its destinations, font and color tables, code pages, `\u` and its skip count, list tables, tables, fields, pictures in hex and `\bin`, notes and headers, then the DOCX writer, under the same limits and checks. |
+| `docs_wml` | `exav_render::docs::convert(.., Format::Wml2003, ..)` | Word 2003 XML in UTF-8 or UTF-16: styles, lists, sections, tables, fields, `binData` pictures and comments, under the same limits and checks. |
+| `docs_html` | `exav_render::docs::convert(.., Format::Html, ..)` | Web pages as documents, Word's "Save as Web Page" and its MIME form included: the tokenizer, style sheets, tables with spans, lists, links, pictures in `data:` addresses and MIME parts, then the DOCX writer, under the same limits and checks. |
+| `docs_pages` | `exav_render::docs::convert(.., Format::Pages, ..)` | Apple Pages: the input is an IWA stream the target stores as `Index/Document.iwa`, or a whole document when it is a ZIP, so the mutations reach the Snappy blocks, the protobuf archives and the text storages, not the ZIP around them. Same limits and checks. |
+| `visible_text`  | `exav_render::text::visible_text()` | The text of a document as a reader sees it, for the scanner and `exav-grep --text`: the first byte picks the reader (Markdown, HTML, each Office and OpenDocument XML part, PDF through hayro, DXF, DWG, and with `text-office` DOC, XLS, PPT, RTF, Word 2003 XML, SYLK, the flat OpenDocument files, Numbers, Pages, Keynote), the rest is hostile bytes. Checks the text stays within its cap, the links within their bound, the sections in order on character boundaries, and that `wants` announces whatever is read. The PDF path takes every stream through exav-unpack's budget first, so a decompression bomb is refused rather than inflated. |
 | `cad_dwg`       | `exav_render::cad::read_dwg_with()` + `to_json()`, `cad::preview()` | DWG, R13 to R2018, into the drawing model: exav-unpack's `dwg` bit codes, the sections the file header locates (R2004 on: the encrypted file header, the page and section maps, page checksums and the LZ77 decompression; R2007: the Reed-Solomon coded file header, maps and pages, their CRCs and copies, and its own LZ77 variant), the classes, the object map and each object's common data and string stream, then the header variables, the tables and the blocks with their entities, each entity type's own data and the proxy graphics streams of the others, and the thumbnail read alone. `unpack` and `analyze` reach the file header, the preview images and, opening the drawing, the OLE2FRAME objects. |
 | `parser_recursion` | nesting depth, constructed        | Builds deep nesting from a couple of input bytes rather than waiting for the mutator to find it — every extra level needs another well-formed delimiter pair, so byte mutation stalls at two or three while this reaches thousands. Targets the failure the panic boundary cannot contain: `catch_unwind` catches a bounds check, not a stack overflow, and `max_recursion` bounds containers-inside-containers rather than a grammar that nests into itself. A finding looks like a crash with **no panic message**. |
 | `x86_decode`    | `exav_x86::decode()`                  | **differential against `iced-x86`**, which is compiled in as the oracle. Asserts six properties per input: never claim an encoding iced rejects; agree on length; agree on mnemonic; agree on the memory operand's base/index/scale/displacement and on every register operand's file, number and position; re-decoding from exactly the reported length gives the same answer; and no proper prefix of an instruction decodes. Declining is not a failure — `None` means "not an encoding this decoder claims", which the caller reports as unsupported. |
@@ -144,7 +166,9 @@ pass as an extra, read-only corpus directory:
    they lack, one tiny DDS, farbfeld and HDR file in `fuzz/seeds/imagehash`;
    exav-render's JPEG 2000, JBIG2 and CCITT fixtures
    (`crates/exav-render/tests/fixtures/images`) and the viewer's PDF image
-   streams (`crates/exav-viewer/e2e/fixtures/pdf-images`).
+   streams (`crates/exav-viewer/e2e/fixtures/pdf-images`). For `raw_preview`:
+   the synthetic RAW files of `crates/exav-render/tests/fixtures/raw`
+   (`make.py`, one per family) and the TIFF and JPEG images above.
 3. **Drawings**, for `drawing`: exav-render's fuzz-finding fixtures and the
    viewer tests' `plan.dxf` and `plan.dwg`, which
    `crates/exav-viewer/e2e/fixtures/make-plan.py` writes with ezdxf and the
@@ -170,6 +194,60 @@ pass as an extra, read-only corpus directory:
    (`crates/exav-render/tests/fixtures/ifc` and `stl`, STEP text and STL
    written by their `make.py`, a file per kind of geometry) and the viewer
    tests' `house.ifc` and `house.stl` (`tests/fixtures/viewer`).
+   **Meshes**, for `mesh`: a few files written by the script itself (a quad
+   and a triangle as OBJ, PLY in the three encodings, and a tetrahedron as
+   glTF with an embedded buffer and as GLB).
+   **Document text**, for `visible_text`: one document of each kind the target
+   reads, behind a byte that picks its reader (HTML pages and fragments, a part
+   of each Office and OpenDocument kind, PDFs plain and deflated, a DXF, the
+   drawing seeds of `cad_dxf` and `cad_dwg`, and the office fixtures behind
+   their names: a DOC, an XLS, a PPT, an RTF, a Word 2003 XML and a
+   SpreadsheetML 2003 file, a SYLK file, the flat OpenDocument files, a
+   Numbers, a Pages and a Keynote document).
+   **Markdown**, for `markdown`: three files written by the script (every
+   construct the reader folds, the link targets it must refuse, deep quotes and
+   lists), and a dictionary of Markdown's punctuation (`fuzz/dicts/markdown.dict`).
+   **Spreadsheets**, for `sheets_xls`, `sheets_ods`, `sheets_numbers` and
+   `sheets_text` (its three text fixtures behind their reader's byte):
+   the `sheets` fixtures (`crates/exav-render/tests/fixtures/office/sheets`:
+   an Excel 97 workbook, an ODS and a FODS, a Numbers document), and for
+   `sheets_numbers` the Numbers document's IWA streams joined into one and a
+   Numbers '09 `index.xml` (`fuzz/seeds/sheets_numbers/`), plain and gzipped.
+   **Presentations and drawings**, for `slides_ppt`, `slides_odp`,
+   `slides_odg`, `slides_vsdx` and `slides_keynote` (`slides_odg` and
+   `slides_vsdx` get the ODG, FODG and VSDX files of
+   `tests/fixtures/office/draw`):
+   the `slides` fixtures (`crates/exav-render/tests/fixtures/office/slides`):
+   the PowerPoint 97 file's `PowerPoint Document` stream (the file is over
+   the size cap with its thumbnail), the ODP and the FODP, and the Keynote
+   document's IWA streams joined into one, but its package metadata, and
+   hand-written seeds (`fuzz/seeds/slides_keynote/`: a Keynote 1 and a
+   Keynote 2 to 5 `.apxl`; `fuzz/seeds/slides_ppt/`: a PowerPoint 95
+   stream).
+   **Documents**, for `docs_doc`, `docs_odt`, `docs_rtf`, `docs_wml`,
+   `docs_html` and `docs_pages`: the `docs` fixtures
+   (`crates/exav-render/tests/fixtures/office/docs`: a Word 97 file, an ODT, a FODT, an
+   RTF, a Word 2003 XML file and a web page), a Word 6 document for `docs_doc`
+   (`fuzz/seeds/docs_doc/`, written by the reader's tests) and for `docs_pages`
+   the Keynote IWA streams, which share the archive layer.
+   **Virtual disks and volumes**, for `vdisk`: the QCOW2 fixtures and the
+   hand-written images of `fuzz/seeds/vdisk/` (QCOW2, VHD and VMDK), behind the
+   byte that picks the format; and, from the filesystem fixtures, which are
+   gzipped images of mostly zeros, the part a walk reads first: the FAT image
+   up to its last used byte and the NTFS image up to the end of the first run
+   of its `$MFT`, each alone and as the partition of an MBR and of a GPT disk
+   (`scripts/fuzz-seeds-synth.py`). There is no VHDX seed: the fixture is 9 MiB, almost all
+   zeros, and its structures lie megabytes apart.
+
+   **Filesystem images and LZO blocks**, for `fsimage` and `lzo`: small images
+   of a tree of three files in each of ext2, ext4 with inline data, exFAT,
+   SquashFS (in each of its compressions), cramfs, romfs and EROFS, a 7z, a
+   WIM (whose chunks are stored as they are, so that it needs no codec) and a
+   xar, the filesystems again behind a partition table that declares more than
+   the target's buffer limit, and the first blocks `lzop` makes of two inputs at
+   its levels 1 and 9
+   (`fuzz/seeds/fsimage/make.py` and `fuzz/seeds/lzo/make.py`, which say what
+   they need).
 
 7. **Framed targets**, written by the script: `full_pipeline` and `seekable` get
    every fixture behind their header (and `full_pipeline` each file of
@@ -226,6 +304,7 @@ fixture seeds as "old"):
 | `analyze` | 183 | 44,219 | 44,958 | 19,443 |
 | `full_pipeline` | 25 | 76,707 | 77,120 | 36,647 |
 | `pe` | 56 | 1,298 | 1,298 | 426 |
+| `vdisk` | 293 | 3,818 | 4,683 | 1,544 |
 
 Where there were no seeds the gain is large (five to ten times); where the
 fixtures already open the parser it is small, and the point is the inputs the
@@ -237,6 +316,49 @@ below the moment `full_pipeline` first loaded it. `clamd` and `icap` are not
 here: their input is `arbitrary`'s encoding, which no one writes by hand, and
 they reach 17,000 edges within seconds without seeds.
 
+## Reference decoders as oracles
+
+exav-unpack's in-tree LZFSE and DCL ("implode") decoders are checked on
+damaged streams against the reference sources they were written from: Apple's
+`lzfse` (BSD-3-Clause) and zlib's `contrib/blast` (zlib licence). The sources
+are fetched and compiled by `crates/exav-unpack/tests/oracle/build.sh` (with
+AddressSanitizer and UndefinedBehaviorSanitizer, so a stream the reference
+itself mishandles is reported); nothing of them is committed. Two
+`#[ignore]`d tests feed it streams cut and damaged in many ways (bit flips,
+fields set to extremes, cuts, insertions, repeats) and compare the bytes
+written and the verdict (whole, output past the limit, cut, damaged):
+
+```sh
+crates/exav-unpack/tests/oracle/build.sh DIR
+EXAV_LZFSE_ORACLE=DIR/lzfse_oracle EXAV_DCL_ORACLE=DIR/dcl_oracle \
+  cargo test -p exav-unpack --lib -- --ignored oracle
+```
+
+They are ignored, not skipped: a run that did not ask for them lists them as
+ignored, and a run that did fails when the oracle is not built.
+`EXAV_DEBUG_ORACLE_ROUNDS` sets the streams per base (3000 and 5000 by default),
+`EXAV_DEBUG_ORACLE_DUMP` a directory to write a stream that differs to. A stream
+whose output depends on what the reference's destination held before (an LZVN
+match reaching bytes never written) is told by running it with two fills; it
+is invalid here.
+
+The reference reports a damaged LZVN payload as "destination full", counts a
+failed block's last instruction out of the bytes it returns, and writes the
+part of a match that fits a block's declared size; the tests state which of
+these differences they allow. Where the two decoders disagree on a stream the
+reference accepts, or accept one it refuses, the test fails.
+
+The unpack target reaches both decoders through `dmg/udif_lzfse.dmg` (two
+LZFSE runs, an LZVN block and FSE blocks) and the `ishieldz/` archives, which
+`scripts/fuzz-seeds.sh` takes with every fixture of at most 64 KiB. They were
+also fuzzed on their own, through the DMG extractor with one LZFSE run of the
+input's bytes and through InstallShield Z archives (whole, or the input as the
+one member of a well-formed one), in a standalone `cargo fuzz` crate outside
+the repository, under AddressSanitizer: 741,736 executions in 40 minutes for
+LZFSE and 1.4 million for InstallShield Z, no crash, hang or out-of-memory
+(one 36-second stall inside `malloc` on a loaded machine, an input that runs in
+56 ms alone).
+
 ## Running a campaign
 
 CI's `fuzz-smoke` job runs every target for 60 seconds on each push, from the
@@ -249,17 +371,29 @@ uploading `fuzz/artifacts`.
 fork mode, and reports what each one found:
 
 ```sh
-scripts/fuzz-campaign.sh                          # one hour, split evenly
-TOTAL=1800 scripts/fuzz-campaign.sh               # half an hour
+scripts/fuzz-campaign.sh                          # one hour, one worker
+TOTAL=25200 WORKERS=3 scripts/fuzz-campaign.sh    # seven hours, three at a time
 TARGETS="analyze x86_decode" scripts/fuzz-campaign.sh
 ```
 
-It builds every target **before** running any of them and refuses to start if
-one fails. That gate is not ceremony: `cargo fuzz run` per target, with its
-output piped away, turns a compile error into a target that "ran" and found
-nothing — the same shape in the log as a clean run, which is the worst possible
-way to be wrong about test coverage. It also reports only the artifacts *this*
-campaign produced, so a stale directory does not read as new findings.
+It runs every `fuzz/fuzz_targets/*.rs` unless `TARGETS` names some, `WORKERS`
+at a time (one per core). A target's slice is what is left of `TOTAL` shared
+among the targets not started, so a slow build shortens the slices and not the
+campaign. The timeout and memory limit are those of `fuzz-smoke`, so a finding
+is one CI would have made, and a unit over `SLOW` seconds (4) is kept as a
+`slow-unit-*` artifact: those time out on a slower machine. A target's binary
+is deleted once it has run (`KEEP_BINARIES=1` keeps them); each is hundreds of
+megabytes.
+
+A target that does not build is reported with its log, and the script exits
+non-zero: a compile error must not read as a target that "ran" and found
+nothing, which is the worst possible way to be wrong about test coverage. It
+reports only the artifacts *this* campaign produced, so a stale directory does
+not read as new findings. The logs are in `tmp/data/fuzzlogs/`.
+
+The seeds are `scripts/fuzz-seeds.sh`'s, which also takes the files of a
+directory of wild samples (`tmp/samples-issues`, or `WILD`) for the targets that
+read a whole file of a format (`scripts/fuzz-seeds-wild.sh`).
 
 ### Memory
 
@@ -374,6 +508,23 @@ boundary is a backstop, not an excuse to leave our own parsers panicky.
 | RAR volume numbered 65535 (RAR4) or 2^64 - 1 (RAR5) (`volumes`, overflow panic) | `formats/rar.rs` `join_rar4`, `join_rar5` | the refusal message added one to the number it had read, in its own width; release builds check overflow, so the panic was real and became `Unscannable` for the whole set instead of the volume being named | the sum in `usize` / saturating (`a_volume_numbered_65535_is_refused_by_name_not_by_a_panic`, `a_rar5_volume_numbered_2_pow_64_minus_1_is_refused_by_name_not_by_a_panic`) |
 | `"secret" xor(1-255)` over 64 KB (`analyze`, 6 execs a second after the YARA rules were added; 3 s a scan) | `yara/matcher.rs` `PatternMatcher::search` | every position was compared with every key in the range, 255 times the work, and an `xor` pattern is never gated by an atom, so every scan paid it; a 16 MiB object took 9 s | the one key a position can match with is its first byte's (`a_wide_xor_range_does_not_cost_a_comparison_per_key_per_position`, `xor_finds_each_key_where_it_was_used`) |
 | `/a.{0,32}b[^\x00-\x1f]+c\b/s` over 2 MiB of text (`full_pipeline`, timeout, all-match mode) | the YARA regex matcher | a start position's match runs to the end of the text, so the work is quadratic in it; yara's own engine has the same shape | not a bug in exav: the rule is the cost (`fuzz/db/fuzz.yar` bounds its repetition) |
+| InstallShield Z table of 498 bytes (`unpack`, 8-hour run, OOM at 1.5 GB, 10 s) | `formats/ishield_z.rs` `declared_members` | `unshield` builds an entry for each of `dirs` x `dir_files` (two `u16`) before checking anything, and a directory record whose chunk size is 0 is read again for the next, so a few bytes ask for billions of entries; the walk's `MAX_ENTRIES` came after | the members the records declare are summed first, as `unshield` walks them, and a table over `MAX_ENTRIES` is reported as unexamined (`a_table_declaring_more_members_than_the_walk_bound_is_reported_not_built`, `a_table_of_many_directories_each_declaring_many_members_stays_small`) |
+| 3.5 KB YARA rule with an error inside 15 open parentheses (`yara`, 8-hour run, timeout; 5.6 s in a release build) | `yara/compiler.rs` `check_paren_depth` | `yara-x-parser` (1.21 too) tries each `(` as a boolean group and as an arithmetic one and keeps nothing of the first try, so a rule that fails inside `d` parentheses costs about 2^d steps; its fuel (100M steps) is not configurable | nesting past 10 is refused before the parse (it was 12, until a rule with 12 took 6 s under the sanitizer), strings, comments and regular expressions skipped (`a_rule_with_an_error_deep_in_parentheses_is_refused_fast`, `a_rule_with_an_error_in_twelve_parentheses_is_refused_fast`, `nesting_up_to_the_bound_compiles_and_one_more_is_refused`) |
+| RAR5 encrypted headers asking for 2^24 PBKDF2 iterations (`full_pipeline`, 8-hour run, two slow units of 21 and 28 s under the sanitizer) | `formats/rar5_crypt.rs` `find_keys_within` | one derivation at the largest count RAR writes is 2.6 s in a release build, and the bound on a scan's derivations (2^25 iterations) allowed two. The bound was also kept in each archive's cache, and an archive inside another starts a cache of its own; RAR3's (256 derivations of 2^18 SHA-1 rounds) was kept the same way | the bound is 2^22 and the scan's (0.65 s; the two units still take 11 and 14 s under the sanitizer because `full_pipeline` scans an input four times to compare the answers), counted in `Budget`: a count past it is reported as encrypted like a member no password opens, and a refused derivation is not charged (`a_count_whose_derivation_exceeds_the_scan_bound_is_not_derived`, `archives_of_one_scan_share_the_derivation_bound`, and RAR3's `archives_of_one_scan_share_the_derivation_limit`) |
+| 805-byte JPEG declaring a large image (`imagehash`, 8-hour run, slow unit, 10 s under the sanitizer) | none | the grey conversion and Lanczos resize of a 16 MiB image: 0.44 s in a release build. A different filter would change the hash, which must be ClamAV's | not a bug; the target gives the hasher 4 MiB (`HASH_BUDGET`), as for the JPEG 2000 row above |
+| LZVN block (DMG, from the differential test against Apple's decoder, not the fuzzer) whose payload ends before its end opcode, or whose declared payload is longer than the input yet ends | `formats/lzfse.rs` `lzvn_block` | any shortfall of the payload was called "cut" when the input was shorter than declared, even when the end opcode had been read; a cut run is not reported as damaged by DMG | cut only when the payload ends without its end opcode and the input ends there; otherwise damaged (`an_lzvn_payload_longer_than_the_input_that_still_ends_is_damaged_not_cut`) |
+| LZVN instruction past the block's declared size, under a tighter output limit (same test) | `formats/lzfse.rs` `lzvn_block` | the size check ran before the limit and before the part that fits was written, so output past the limit was reported as damage and the fitting part dropped | the block's size is a lowered output limit; whichever is reached first ends the block (`an_lzvn_instruction_past_the_block_size_is_damaged_and_clipped`, `the_output_limit_comes_before_a_block_size_it_is_inside_of`) |
+| DCL stream of one byte, `02` (same test, against `blast.c`) | `formats/dcl_explode.rs` `run` | both header bytes were read before either was judged, so a bad first byte with no second one was called cut | each byte judged as read (`a_bad_header_or_distance_is_invalid`) |
+| InstallShield Z member that stops short or is damaged part way (review) | `formats/ishield_z.rs` `extract_ishield_z` | a stream that ran out of input came out as a whole member with nothing said, and one that failed part way dropped what it had decoded | the decoded start is kept and the member reported, as for NSIS (`a_member_cut_inside_its_stream_keeps_its_prefix_and_is_reported`, `a_member_damaged_part_way_keeps_its_prefix_and_is_reported`, `a_member_whose_range_runs_past_the_file_is_reported`) |
+| FAT12 volume with a directory at cluster 1, inside a sparse VMDK (`vdisk`, first run, 3 overflow panics) | `fatfs` 0.3.6 `fs.rs` `sector_from_cluster`, through `formats/fat.rs` | the crate subtracts 2 from any cluster number it reads (a directory entry's, or the next one of a chain) without looking at it; the panic reached the walk's boundary and ended the whole volume as undecodable. Upstream master has the same line | the crate was replaced by the in-tree reader, which takes no cluster number on trust; a directory at cluster 1 is reported as damage after the rest of the volume is walked, and `vdisk` and `fsimage` assert no walk ends as "panicked" (`a_directory_at_cluster_1_ends_the_walk_as_damaged_after_the_rest_of_the_volume`, `a_file_at_cluster_1_is_reported_and_the_other_files_come_out`) |
+| PowerPoint 95 paragraph with a bullet size over 4,294,967 (`slides_ppt`, 4 overflow panics) | `slides/ppt/ppt95.rs` `para_props` | the size is kept from 25 to 400, but `bool::then_some(bsize * 1000)` takes its argument whether or not the condition holds, so a `u32` that large overflowed (a panic in release builds, which check overflow, and in the viewer's wasm a wrapped value that was then dropped) | the product is taken only of a size in range (`a_bullet_size_out_of_range_is_dropped`) |
+| 1.4 MB of `Content-Type: message/rfc822` (the `nesting` suite, not the fuzzer; stack overflow) | `formats/email.rs`, `mail-parser` 0.11.9 | the parser keeps messages in messages (`PartType::Message`) with no depth limit, and dropping the chain recursed once per level | the result is taken apart without recursion (`Parsed`); the same review found that the parts of attached messages were never read, so an attachment of a forwarded mail scanned clean (`mime_parts`, `the_parts_of_an_attached_message_are_members_too`) |
+| 40 KB YARA condition of `not not not ...`, `1 << 1 << ...`, `a contains b contains ...` (the `nesting` suite; stack overflow on 2 MiB) | `yara/compiler.rs` `check_paren_depth`, `yara-x-parser` | one recursion per operator of a chain, in the parser and in the tree built from it | a chain past 256 operators, and brackets nested past 12, are refused before the parse (`a_long_chain_of_operators_is_refused_not_recursed_into`) |
+| 200,000 signs in a Visio formula (the `nesting` suite; stack overflow on 256 KB) | `slides/vsdx/formula.rs` `unary` | a call per sign, outside the step counter that bounds the rest of the parser | the signs are read in a loop, and counted (`a_formula_of_signs_is_refused_not_recursed_into`) |
+| 32 nested `draw:g` of an ODP, 11 nested Visio shapes (the `nesting` suite; stack overflow on 512 KB) | `slides/model.rs` `ListStyle` | the nine outline levels were inline (6 KB), so every `TextBody` and `Sp` on a function's stack took that, and the shape builders had frames of 28 to 40 KB | the levels, which no reader ever filled, are a list empty until one is (`odf_drawings_and_presentations`, `visio_pages`, `make stack-frames`) |
+| a ZIP in a ZIP, 15 levels (a CLI run under `ulimit -s`, then `scripts/stack-frames.py`) | `formats/zip.rs` `walk`, `formats/xz.rs` `XzReader` | a `ZipFile` (decoders inline, 40 KB) and the XZ decoder tables (30 KB) lived in the frame of the walk while a member was scanned | opened in functions of their own, and boxed (`make stack-frames`) |
+| 19 KB image whose HFS+ catalog leaves are each other's next (`vdisk`, 7-hour run, timeout: 21 s under the sanitizer, 1 s in a release build) | `formats/hfsplus.rs` `Tree::scan` | the chain was bounded by the nodes the catalog fork declares (the virtual disk's size over the node size), and each is read as valid from a disk of zeros | a leaf met again is damage (Brent's cycle check) (`a_leaf_chain_that_loops_is_damage_not_a_walk_to_the_end_of_the_fork`) |
+| PPMd header declaring a 4 GiB model (`saturate`) | `formats/ppmd7/model.rs`, `ppmd8/model.rs` | the arena was filled with zeros as it was made, so the pages were touched | `vec![0; n]`, which asks for zeroed pages (`saturate`) |
 
 Header numbers at the top of their range are what unchecked sums overflow on,
 and libFuzzer's stock mutations seldom put one in a chosen field. Two things
diff --git a/docs/GAPS.md b/docs/GAPS.md
index 37dbcad9..4ad1e9e9 100644
--- a/docs/GAPS.md
+++ b/docs/GAPS.md
@@ -13,16 +13,23 @@ exav does not ship a hand-written unpacker per packer family. Anything whose
 shape says a packer built it has its stub run under a bounded x86 interpreter,
 and the image the stub rebuilds is captured. Coverage is therefore not a list of
 families — but three packers in `corpus/packers` (23 packers, 276 samples)
-defend themselves successfully, and nothing is recovered from them:
+still defend themselves on most samples, and little or nothing is recovered from
+them:
 
 | Packer | What the stub does |
 |---|---|
-| **TELock** | Builds code on the stack and jumps to it. The stack-resident routine decodes to `EB FE` — a jump to itself — so an earlier instruction produced a wrong result. Needs a differential trace against a real x86 to find which. |
-| **Yoda's Protector** | Spins without writing memory, and ends on the progress cutoff. The shape of an anti-emulation timing or exception construct. |
-| **Alienyze** | Walks the loader module list, calls `MessageBoxW` with a module name as the caption, then dereferences null. It expects a module set the emulator does not present. |
-
-Each is a separate investigation with no shared fix, which is why they are
-recorded rather than scheduled.
+| **Yoda's Protector** | An `int3` + SEH + `call`/`ret` maze that never writes past a few stack pages. Verified instruction-for-instruction against a reference x86 (unicorn): the emulation is faithful, and even billions of instructions make no progress, so the maze's exit depends on exception-dispatch or timing state the synthetic environment does not reproduce. Nothing to fix in the interpreter. |
+| **TELock** (11 of 12 samples) | After the rotate-flag fix below, TELock runs its whole loader and then CRC32s the image it rebuilt (`esi` over the unpacked `.text` at the image base, CRC poly `edb88320`) and `jne`-aborts to `MessageBox` + `ExitProcess` when the sum does not match the value it stored at pack time. The sum mismatches because a value this environment feeds the decryptor differs from a real machine's, so the decompressed bytes differ. The check reads the **image**, not `kernel32`/`user32` code, so presenting realistic system-DLL bytes does not satisfy it (and a packer could not embed a CRC of version-specific system code anyway). Pinning the divergent input needs a real-Windows reference trace, which is why it is recorded. The twelfth sample (`telock_ComIntRep`) has a payload large enough that the entry-point heuristic captures it before the self-check runs. |
+| **Alienyze** (5 of 12 samples) | Resolves its imports by hashing export names, over `kernel32` and then `ntdll`. The synthetic DLLs advertise the real DLLs' documented export names (from Microsoft's API documentation, plus `ntdll!RtlDecompressBuffer`, added explicitly in `scripts/gen-exports.py` because the documentation lists it only under `NtosKrnl.exe`); an unimplemented one resolves to a trap that reports itself and returns failure. `GetFileAttributesExW` reports the program present with its size. With that, 7 of 12 samples unpack to real code. The other 5 are large inputs whose long read-heavy decompression pass writes few distinct pages, so the progress watchdog ends them before the payload is complete. |
+
+**The TELock rotate-flag fix.** TELock's stack-resident routine used to decode
+to `EB FE` (a jump to itself) because a 1-bit `rol`/`ror`/`rcl`/`rcr` set the
+overflow flag wrong and a decryptor branched on it. A differential trace against
+unicorn found the instruction; the fix is in `exav-pe-emu`'s interpreter
+(`cpu.rs`, `shift`).
+
+Each remaining gap is a separate investigation with no shared fix, which is
+why they are recorded rather than scheduled.
 
 Note the naming collision: **Yoda's *Cryptor* (`yC`) is a different product and
 is unpacked** — it is in `MUST_UNPACK` in
diff --git a/docs/PDF-RENDERER-EVALUATION.md b/docs/PDF-RENDERER-EVALUATION.md
new file mode 100644
index 00000000..66de0e3a
--- /dev/null
+++ b/docs/PDF-RENDERER-EVALUATION.md
@@ -0,0 +1,122 @@
+# Replacing pdf.js with hayro in @exav/viewer: what it would bring and cost
+
+Measured on 1370 PDFs (13 October 2026) with the harness in `scripts/pdf-compare/`, plus a
+reading of hayro's documentation and issues. hayro 0.8.0, pdfjs-dist 6.4.299 (the viewer's), poppler
+25.03.0 (`pdftoppm`, as the reference), Chromium from Playwright.
+
+## What was measured
+
+The corpus is the 990 PDFs of `test/pdfs` in mozilla/pdf.js, the 364 of `hayro-tests/pdfs` in
+LaurenzV/hayro, and 16 of ours, deduplicated by hash. Both projects' sets are regression tests chosen for
+hard cases (broken files, odd fonts, shadings, bombs), so they say more about edge cases than about PDFs
+in the wild, and each favours its own project. The first three pages of each were rendered at 72 dpi on
+white by hayro (native), pdf.js (in Chromium), poppler, and hayro compiled to wasm (in the same Chromium,
+with and without SIMD). A page's distance to poppler is the mean absolute difference of luminance after a
+3 by 3 blur, and the share of pixels more than 64 off ("far").
+
+## Results
+
+**Opening.** Of 1370 files, at least one page rendered for hayro 1279, pdf.js 1276, poppler 1267. Where
+poppler renders, hayro failed on 9 and pdf.js on 8; where poppler fails (103), hayro rendered 21 and pdf.js
+17. hayro cannot open an encrypted PDF at all (19 files fail with a decryption error), including at least
+one that pdf.js and poppler open without a password.
+
+**Fidelity** (1141 pages with the same size in all three):
+
+| | hayro | pdf.js |
+|---|---|---|
+| pages with under 0.5% of pixels far from poppler | 80.7% | 74.1% |
+| pages with over 5% far | 5.4% | 5.6% |
+| pages closer to poppler (by more than a point) | 42 | 26 |
+| shadings, pages under 0.5% far | 23 of 26 | 15 of 26 |
+| fonts (by file name) | 70 of 73 | 56 of 73 |
+| tiling patterns | 26 of 35 | 21 of 35 |
+| JPEG 2000 | 4 of 9 | 1 of 9 |
+| masks, blends, transparency | 30 of 41 | 30 of 41 |
+| annotations and forms | 34 of 37 | 34 of 37 |
+
+Poppler is not the truth, and hayro and poppler may share habits (anti-aliasing, hinting) that pdf.js does
+not. A page rendered **blank** by hayro where the others draw something: 18 (the non-embedded CJK fonts
+`noembed_jis7` and `noembed_sjis` among them), against 4 for pdf.js. Page sizes: pdf.js equals poppler's on
+1406 pages and differs on 72; hayro equals it on 1150, is one pixel off on 260 (rounding) and differs on 70.
+
+**Time**, per page, first three pages, in milliseconds:
+
+| | median | p90 | p99 | max |
+|---|---|---|---|---|
+| hayro, native | 1 | 8 | 64 | 3370 |
+| hayro, wasm with SIMD, in Chromium | 19 | 46 | 212 | 3979 |
+| hayro, wasm without SIMD, in Chromium | 45 | 169 | 833 | 20550 |
+| pdf.js, in Chromium | 20 | 49 | 217 | 5129 |
+
+The four rows are the 1481 pages all four rendered. Over every page a renderer drew, hayro native took
+up to 47084 ms (one page), and poppler's median was 19 ms, its p99 570 and its max 41696 (process time
+divided by pages, startup included).
+
+In the browser the SIMD build is on par with pdf.js (faster on 874 pages, slower on 603); without SIMD it is
+twice as slow at the median and four times at the tail. Two pages cost hayro native 47 s and 8 s where pdf.js
+took 0.6 s and 2.1 s.
+
+**Memory.** hayro native: median 7 MB of resident memory, p99 41 MB, but 8.9 GB (killed) on
+`bomb_giant.pdf`, a 123 KB file whose JBIG2 data declares 100000 by 100000 pixels. In wasm the memory is
+capped by the module's maximum (the viewer sets one per module), median 6 MiB after a page, p99 58 MiB, max
+211 MiB.
+
+**Size.** hayro as wasm: 4.3 MB raw, 3.0 MB with SIMD after `wasm-opt -Oz` (1.2 MB brotli), including its
+JPEG 2000, JBIG2 and CCITT decoders and the 14 standard fonts (`embed-fonts`). pdf.js: `pdf.min.mjs` 459 KB
+plus `pdf.worker.min.mjs` 1.26 MB (about 0.5 MB gzipped), 0.8 MB of standard fonts, 1.7 MB of CMaps and its
+own wasm (1.6 MB). The viewer today also ships hayro's JPEG 2000 and JBIG2 decoders as two more wasm modules
+for pdf.js; a hayro viewer would not need them.
+
+## What hayro is not (its documentation, issues and the files above)
+
+hayro is a rasterizer and an interpreter, not a viewer. It has no encryption support ("the main missing
+feature"), no blending and isolation, no knockout groups, no color-key masking, and no support for
+non-embedded CID fonts. It has no JavaScript, no XFA, and no forms beyond what appears on the page. The
+project calls itself experimental, is at 0.8 with one main maintainer, and says no work has gone into speed.
+Open issues include a `q` flood exhausting memory, a crash on large pattern steps, a panic in `ArrayIter`
+and a memory allocation failure. I found no CVE for hayro, nor any fuzzing beyond a `hayro-fuzz` crate.
+
+hayro does hand over what a text layer needs: each glyph with its Unicode (from `ToUnicode`, else its
+name) and its transform, from `Device::draw_glyph_run`. It does not build a text layer, selection, search,
+link or outline handling, page labels or thumbnails; open issues say Type 3 fonts without `ToUnicode` have no
+Unicode and that the glyph-name table is incomplete.
+
+## What the viewer would have to rebuild
+
+`ts/pdf/engine.ts` (520 lines) is the adapter to pdf.js, and `ts/pdf/reader.ts` (663) the reader on top of
+it. Of what pdf.js does for them, hayro would replace the rendering only. To rebuild: the text layer
+(positioned spans for selection and the browser's find, from glyph runs), link annotations (hayro has
+`render_annotations` but I found no link list in it), the outline and named destinations, page labels, and
+passwords. The viewer reads no password today, so encrypted files fail with both; what changes is the
+owner-password-only files pdf.js opens. Forms and annotations would be drawn but not editable, as now.
+
+## Security
+
+pdf.js has had arbitrary code execution through a crafted font (CVE-2024-4367), a class that needs `eval`
+and does not exist in a Rust renderer. hayro's core forbids `unsafe_code`, but `hayro-interpret` turns on
+`hayro-syntax`'s `unsafe` feature (zlib-rs, SIMD in the image decoders), and panics and out-of-memory are the
+failures to expect, not corruption. In the viewer a wasm module is contained by its memory cap and its
+worker (the crash costs the page it was reading); in the scanner the same OOM kills the process, which is why
+exav's PDF text reader screens a PDF before giving it to hayro (see `exav_unpack::text`).
+
+## Reading
+
+- On this corpus hayro draws as well as pdf.js or better against poppler (shadings, fonts, JPEG 2000), and
+  in wasm with SIMD it costs the same time per page; native it is twenty times faster.
+- It is not a replacement: the interactive parts of the viewer sit on pdf.js, and hayro cannot open
+  encrypted files, draws some pages blank, and has outliers (47 s, 8.9 GB) that pdf.js does not.
+- A path that costs less than a swap: an optional hayro rasterizer behind the viewer's existing engine
+  interface (`pdf({ engine: "hayro" })`), pdf.js kept for the text layer, links and outline of the same
+  document, and as the fallback for encrypted files and for pages hayro draws blank. That would drop the two
+  image-decoder modules and gain a memory-safe renderer with a bounded footprint, for 3 MB of wasm. A full
+  replacement would also mean building the text layer from glyph runs.
+- To settle it with more evidence: a corpus of real documents (the first three pages of a sample of public
+  PDFs), a human look at the pages where the three disagree, the speed with the text layer, and hayro run
+  under the viewer's CSP and memory cap.
+
+## Not measured
+
+Pages past the third. Rotation and `UserUnit` beyond the page sizes. Text layer quality. Print. Zoom
+levels other than 1. Memory of pdf.js (Chromium's, not per page). Anything on Firefox or WebKit. The harness
+runs hayro once per PDF with a 60 s limit, so a hang past it is a timeout, not a time.
diff --git a/docs/RELEASING.md b/docs/RELEASING.md
new file mode 100644
index 00000000..74aa52c7
--- /dev/null
+++ b/docs/RELEASING.md
@@ -0,0 +1,133 @@
+# Releasing
+
+Everything to do between "the fixes are in" and a published version, in order.
+`scripts/release.sh` is the last step and checks the artifact; this page is the
+rest. Do not start a step before the one above it is green: a version number
+published to crates.io is gone for good.
+
+## 1. Freeze
+
+- The tree builds from a clean checkout and `git status` is clean apart from the
+  release edits below. No work in progress is left behind a feature flag that
+  the release would ship half done.
+- Open items worth settling first are in [BACKLOG.md](BACKLOG.md); anything the
+  release changes the meaning of is written in the changelog (step 6), not
+  deferred.
+
+## 2. Dependencies
+
+This is the late pass of [DEPENDENCIES.md](DEPENDENCIES.md) ("Lifecycle"). The
+early pass, where replacements, vendoring and major upgrades are decided, is
+done right after the previous release, not here: nothing in this step may
+need a design decision. `make deps-review` prints what to compare with the last
+`[[review]]` entry of [dependencies.toml](dependencies.toml); the entry is
+rewritten at the end of this step.
+
+- `cargo update` (workspace), then in each excluded workspace too:
+  `fuzz`, `crates/exav-unpack-wasm`, `crates/exav-viewer`. Read what moved
+  (`git diff Cargo.lock`), not just that the build passes.
+- The pins stay on purpose, each with its reason and what lets it go in
+  [dependencies.toml](dependencies.toml) (the image decoders at the versions
+  libclamav links, `hayro-*`, `html5gum`, `wasm-bindgen` equal to the CLI's).
+  A pin the script reports without an entry is a finding.
+- The report's findings table lists what has a newer release; the policy of what
+  may be added is [DEPENDENCIES.md](DEPENDENCIES.md).
+- npm: `npm outdated` and `npm audit` in `crates/exav-viewer`,
+  `crates/exav-unpack-wasm` and `www`.
+- Audit: `cargo deny check advisories bans sources licenses` and `cargo audit`
+  for the workspace, and `cargo deny` for the viewer and the unpack-wasm
+  manifests as CI does (`.github/workflows/ci.yml`, job `audit`). An ignore in
+  `deny.toml` whose crate has a fixed release is dropped, not kept.
+- The MSRV: `rust-version` in `Cargo.toml` is raised only for a reason, and
+  `make msrv` builds with it. Check the toolchain pinned in the workflows.
+
+## 3. Code and format checks
+
+- `make lint` (rustfmt and every clippy pass with `-D warnings`).
+- `make test`: the native matrix, wasm32, the JS suites, the viewer (vitest,
+  package, gates, playwright) and the site. `make test-native` alone is the
+  Rust half. Read the output for skipped suites: a test that needs a tool that
+  is missing reports green having checked nothing (`make test-yara-diff` is the
+  one to name).
+- `scripts/check-features.sh`: each format feature of `exav-unpack` builds
+  alone.
+- `make av-audit` when fixtures changed (no EICAR literal committed unmasked).
+- The release build over the whole tracked tree, with the full database:
+  `git ls-files -z | xargs -0 target/release/exav -d <database>`. Nothing may
+  be `FOUND`: a fixture that holds EICAR or a signature's match, whole or inside
+  an archive, is committed masked (`.xor`). `PASSWORD-PROTECTED`,
+  `UNSCANNABLE` and `LIMITS-EXCEEDED` lines are the fixtures made for them.
+- The differential harnesses are research signals, not gates, and are run when
+  the area changed: `scripts/difftest.sh` (against ClamAV), `make test-yara-diff`.
+
+## 4. Fuzzing
+
+- CI's `fuzz-smoke` (60 seconds a target) and the nightly campaign
+  (`fuzz-nightly`, three hours) must be green on the commit to release.
+- A longer round before a release that touched a reader:
+  `TOTAL=14400 scripts/fuzz-campaign.sh`, or `TARGETS="..."` for the targets of
+  the readers that changed. It builds every target first and stops if one does
+  not build. Triage every artifact it reports ([FUZZING.md](FUZZING.md),
+  "Triage & fix workflow"): each defect found gets a test that fails without the
+  fix, and a line in the findings log.
+- Seeds for a new reader or format are added to the seed scripts before the
+  round, or it fuzzes nothing new.
+
+## 5. Formats and documentation
+
+- `formats/registry.json` is the one list of formats. After any change to it:
+  `make formats` (rewrites the format matrix of the site and the READMEs, and
+  the viewer summary sentence), then `make test-formats`.
+- The format count in the READMEs and the site, the support matrix, and the
+  pages that say what is read (`www/src/content/docs`) match the registry;
+  `make test-www` builds the site and finds broken links and bad frontmatter.
+- [GAPS.md](GAPS.md) lists what is reported and not opened; a format that
+  became readable leaves it, one that was dropped joins it.
+- Crate READMEs (`crates/*/README.md`) and the docs under `docs/` that quote a
+  version, a flag or a limit: grep for the old version number (step 7) and for
+  each option the release adds, renames or removes.
+
+## 6. Changelog
+
+- Move `[Unreleased]` to `[x.y.z] - date`, keep an empty `[Unreleased]` above
+  it.
+- Trim it to what a user of the release sees: one bullet per change in the
+  user's terms (what was wrong or missing, what it does now), the numbers that
+  show it, and the API that moved. Internal steps of a change that went in
+  and out inside the release are not told. A change that breaks an API or a
+  default is said as such.
+- Every claim in it is checked against the code (limits, defaults, option
+  names), and nothing in it names a private path or a corpus.
+
+## 7. Versions
+
+One edit of each, all to the same number:
+
+- `Cargo.toml` (`[workspace.package]` version), and the `version = "..."` of
+  every path dependency in `crates/*/Cargo.toml` (they are checked by
+  `cargo publish`, not by the build).
+- `crates/exav-unpack-wasm/Cargo.toml` and `package.json` (the release
+  workflow fails if `package.json` differs from the tag), `crates/exav-viewer/Cargo.toml`
+  and `package.json`.
+- The lockfiles of the excluded workspaces, rewritten by building each.
+- The snippets in the docs that show a version:
+  `grep -rn "<old version>" --exclude-dir=target --exclude-dir=node_modules .`
+  (`crates/exav/src/main.rs`, `docs/DATABASE.md`, `www/src/content/docs`...).
+- The Helm chart (`deploy/helm`, version 0.0.0 in the repository) takes the
+  tag's version when it is packaged; the `helm` workflow fails if the tag and
+  the workspace version differ.
+
+## 8. Gate and publish
+
+- `scripts/release.sh --gate-only`, then `make publish-check` (the gate and
+  `cargo publish --dry-run` of every crate), then `make publish`.
+  The gate checks the tree is clean, the version is free on crates.io, fmt and
+  clippy, the tests, the MSRV, the package contents, that the published
+  tarballs build on their own, and that no EICAR literal is in a tarball or in
+  the tracked tree. It stops for a human before the first upload.
+- Tag `vX.Y.Z` and push the tag: `.github/workflows/release.yml` builds the
+  binaries and the npm tarball, `docker.yml` the image. The npm packages are
+  published from their crate directories, not from `pkg/`.
+- After: install from the registry in a clean directory (`cargo install exav`,
+  `npm install @exav/viewer`), run `exav --version` and scan the EICAR test
+  file; check the release page's assets and the image.
diff --git a/docs/STREAMING_FORMATS.md b/docs/STREAMING_FORMATS.md
index c1afcfe6..f2e10839 100644
--- a/docs/STREAMING_FORMATS.md
+++ b/docs/STREAMING_FORMATS.md
@@ -4,16 +4,71 @@ exav optimises for memory, not bandwidth. `walk` hands a format's members over
 straight off the seekable source, each decoded as it is read, so peak memory is
 one member's window rather than the whole decoded object. Most containers
 already work that way (every arm of `dispatch` in `stream.rs` but the last),
-including tar, zip, 7z, cab, lz4, `.Z` and DMG; the rest are read whole
-(`read_whole`). Two of those matter, for different reasons, and only one of them
-is worth changing.
-
-**DMG: done.** The HFS+/APFS readers get the disk as a `Read + Seek` over
-`DmgReader`, which decompresses a BLKX run when the filesystem first reaches it
-and keeps the last 32 MiB of decoded runs. The virtual disk is never held
-whole. Each file is still returned whole by the filesystem crates, so a file is
-bounded by the peak-buffer limit. An encrypted image is decrypted whole, under
-the same limit.
+including tar, zip, 7z, WIM, xar, cab, lz4, `.Z`, DMG, the virtual disks and the
+filesystem and partition readers; the rest are read whole (`read_whole`). What
+is left of those is in [BACKLOG.md](BACKLOG.md), with the reason for each.
+
+**7z, WIM and xar** read their header, their directory tree or their table of
+contents from where it is in the source, and each member from its place in it,
+through `source::Reader`. A 7z folder's packed bytes are a `Read` under its
+coder chain, and its members are read in order, the ones before the one wanted
+decoded and dropped, which is charged to the scan budget before it is done. A
+WIM resource is a `ResourceReader` that decodes a chunk at a time; an xar
+member is a zlib reader over its range of the heap. What is still held is
+named in each: a 7z folder with an encrypted coder or with several packed
+streams (BCJ2) is decoded whole under the buffer limit, a 7z's header and a
+WIM's directory tree are held under it, and an xar's table of contents under
+64 MiB.
+
+**Disks: done.** A disk is read as a `Read + Seek`, and the filesystem and
+partition readers take one, so a file comes out of a disk without the disk being
+held.
+
+- *DMG.* The HFS+/APFS readers get the disk over `DmgReader`, which
+  decompresses a BLKX run when the filesystem first reaches it and keeps the
+  last 32 MiB of decoded runs. An encrypted image is decrypted whole, under the
+  buffer limit.
+- *VHD (fixed and dynamic), VHDX, QCOW2, VMDK (sparse and streamOptimized).*
+  `formats/vdisk.rs` gives each as a `VDisk`, a `Read + Seek` over a layout that
+  says where a unit (cluster, block, grain) is. The tables are read from the
+  source when a read reaches a unit, never held: a hostile L1 table, BAT or grain
+  directory costs reads, not memory. A stored unit is read straight from the
+  source, an unallocated one reads as zeros and costs nothing, and a compressed
+  one (QCOW2 deflate or zstd, a VMDK grain) is decoded into a cache of at most
+  32 MiB and decoded again if it was evicted. The one structure that is held is
+  a streamOptimized VMDK's index of grains, one entry per grain found by one
+  pass over its markers, counted against the buffer limit. What a disk decodes
+  is charged to the scan budget, and a read that would pass what is left of it
+  fails: an image that lands the filesystem walker on a different compressed unit
+  for every small read stops there.
+- *The filesystems.* Read in place over a `Read + Seek`: `ntfs.rs` follows the
+  MFT record by record through `$MFT`'s own runs; `fat.rs`, `exfat.rs`,
+  `ext.rs`, `hfsplus.rs`, `apfs.rs`, `squashfs.rs`, `cramfs.rs`, `romfs.rs` and
+  `erofs.rs` read the directories and then each file by its clusters, extents
+  or blocks (`vol.rs` is what they read through). A raw image over the buffer
+  limit is walked, not refused. A file within the buffer limit is read into
+  memory; a longer one is a `Got::Stream`, a `Read` over the file's stretches
+  (`Pieces`, a list of where on the volume each is, or a block reader for the
+  compressed ones) that the walk hands over as a streamed member, so the scan
+  puts it in a spill file as it does a ZIP member. A stretch the volume does not
+  give ends the stream with an error after the bytes before it; a hole reads as
+  zeros. A file stored compressed by the filesystem (decmpfs, LZNT1, EROFS) is
+  not read as it goes.
+- *Partitions.* `partition::stream_offsets` already took a `Read + Seek`.
+
+A disk that fits the buffer limit is still handed over as one member, so its raw
+bytes are scanned and typed one level down. A larger one is walked in place
+(`formats/volumes.rs`): the filesystem that starts it, or the volumes of its
+partition table. A volume that fits the limit is streamed whole, as a partition
+of a raw disk always was; a larger one that holds a filesystem exav reads is
+walked in place, and each file comes out under the partition's name. A larger
+one that is not is streamed from a raw file, where those bytes are the input,
+and reported from a virtual disk, where the size is only what a header declares
+and reading it could be a long walk through zeros. The bytes before the first
+partition (the boot code) come out as `<boot-area>`, up to 1 MiB.
+
+Not covered: a partition table inside a partition; differencing VHD and VHDX and QCOW2 with a
+backing file, which are reported because the parent is not in the file.
 
 **RAR: real work, deliberately not rushed.** `rar3_unpack.rs` and
 `rar5_unpack.rs` are vendored decoders that build the complete output `Vec`.
diff --git a/docs/WASM.md b/docs/WASM.md
index 3617f007..56eff7fa 100644
--- a/docs/WASM.md
+++ b/docs/WASM.md
@@ -152,7 +152,7 @@ native `catch_unwind` boundary, but at the WASM level.
 ## Building
 
 ```sh
-# Requires Rust 1.92+ and the wasm32-wasip1 target
+# Requires Rust 1.95+ and the wasm32-wasip1 target
 rustup target add wasm32-wasip1
 cargo build --release --target wasm32-wasip1 -p exav-core --features wasi-bin
 ```
diff --git a/docs/dependencies.toml b/docs/dependencies.toml
new file mode 100644
index 00000000..5dcfe0a2
--- /dev/null
+++ b/docs/dependencies.toml
@@ -0,0 +1,358 @@
+# What the dependency review reads by hand (docs/DEPENDENCIES.md, "Lifecycle").
+# `scripts/deps-review.py` checks it against the manifests and upstream.
+#
+# - [[pin]]      a `=` requirement: why, and what lets it go.
+# - [[patch]]    a `[patch]` entry.
+# - [[vendored]] source copied or ported into the tree: where from, which
+#                version, and what lets it go back to a dependency (or be dropped).
+#
+# `track` says where the script looks for upstream's newest release: "crates",
+# "github" (owner/repo), "pypi", or "none" (a port of a file with no releases).
+# `version = "unrecorded"` is a finding: say which upstream version or commit the
+# copy was taken from the next time the file is touched.
+
+# ---------------------------------------------------------------- pins
+
+[[pin]]
+crate = "image"
+why = "libclamav 1.5.4 links this version; exav-imagehash reproduces ClamAV's fuzzy image hash bit for bit from its pixels."
+until = "ClamAV moves to another release, and the hash parity tests pass on the new decoders."
+
+[[pin]]
+crate = "png"
+why = "libclamav's version (decoder parity, see image)."
+until = "as image."
+
+[[pin]]
+crate = "gif"
+why = "libclamav's version (decoder parity, see image)."
+until = "as image."
+
+[[pin]]
+crate = "zune-jpeg"
+why = "0.5.15 for JPEG (libclamav's 0.5.8 panics on some damaged files and draws baseline JPEGs with a scan for each component flat; the hashes of other JPEGs are the same, see image_codecs/README.md) and libclamav's 0.4.21 for JPEG inside TIFF (decoder parity, see image)."
+until = "0.4.21 as image; 0.5.x is the latest stable."
+
+[[pin]]
+crate = "zune-core"
+why = "zune-jpeg 0.5.15's companion, named in the code; zune-jpeg 0.4.21's own zune-core is not declared (the vendored tiff decoder reaches it as zune_jpeg_04::zune_core)."
+until = "as zune-jpeg."
+
+[[pin]]
+crate = "fax"
+why = "libclamav's version, for CCITT strips of a TIFF (decoder parity, see image)."
+until = "as image."
+
+[[pin]]
+crate = "weezl"
+why = "0.1.12 where libclamav has 0.1.10: only a debug assertion that a TIFF LZW strip without a clear code tripped is corrected; it decodes the same."
+until = "as image."
+
+[[pin]]
+crate = "bcdec_rs"
+why = "BC1 to BC7 blocks for the viewer's DDS fallback. A 0.x crate pinned with `=` so `cargo install`, which ignores Cargo.lock, builds what was tested."
+until = "1.0, or a reason to follow its releases."
+
+[[pin]]
+crate = "hayro-jpeg2000"
+why = "JPEG 2000, a 0.x crate pinned with `=` so `cargo install` builds what was tested; shared with the PDF text reader."
+until = "1.0, or a reason to follow its releases."
+
+[[pin]]
+crate = "hayro-jbig2"
+why = "JBIG2, as hayro-jpeg2000."
+until = "as hayro-jpeg2000."
+
+[[pin]]
+crate = "hayro-ccitt"
+why = "hayro-jbig2's own MMR decoder, at the version it builds with."
+until = "as hayro-jpeg2000."
+
+[[pin]]
+crate = "hayro-interpret"
+why = "PDF text. Turns on hayro-syntax's `unsafe` feature itself, which is why text-pdf is not a default; pinned with `=` so `cargo install` builds what was tested."
+until = "it can be built without that `unsafe` feature (then vendor or patch it, or make text-pdf a default)."
+
+[[pin]]
+crate = "hayro-syntax"
+why = "as hayro-interpret."
+until = "as hayro-interpret."
+
+[[pin]]
+crate = "html5gum"
+why = "HTML tokens for the shared reader; 0.x, pinned with `=` so `cargo install` builds what was tested."
+until = "1.0, or a reason to follow its releases."
+
+[[pin]]
+crate = "pulldown-cmark"
+why = "Markdown events for the viewer and the scanner's visible text; pinned with `=` so `cargo install` builds what was tested."
+until = "a reason to follow its releases."
+
+[[pin]]
+crate = "zenjxl-decoder"
+why = "JPEG XL for the viewer; the viewer builds a patched copy of this exact version (see [[patch]])."
+until = "as the patch."
+
+[[pin]]
+crate = "rustdct"
+why = "Dev-dependency: the oracle exav-imagehash's src/dct.rs is checked against. It must stay at the version that file was ported from."
+until = "dct.rs is ported from a newer rustdct, or the oracle is dropped."
+
+[[pin]]
+crate = "wasm-bindgen"
+why = "Must equal the version of the wasm-bindgen CLI that generates the glue."
+until = "never pinned apart from the CLI: bump both together."
+
+# ---------------------------------------------------------------- patches
+
+[[patch]]
+crate = "zenjxl-decoder"
+where = "crates/exav-viewer/vendor/zenjxl-decoder"
+why = "Instant::now() panics on wasm32-unknown-unknown and the decoder calls it for every frame. crates/exav-viewer/vendor/zenjxl-decoder/EXAV.md lists the differences."
+until = "upstream reads its clock only when phase timing is asked for, or takes the patch."
+
+[[patch]]
+crate = "zenjxl-decoder-macros"
+where = "crates/exav-viewer/vendor/zenjxl-decoder-macros"
+why = "Its proc-macro-error2 is unmaintained (RUSTSEC-2026-0173) and cargo reports it as future-incompatible. abort! is a local panicking macro; EXAV.md beside it."
+until = "upstream drops proc-macro-error2."
+
+# ---------------------------------------------------------------- vendored
+
+[[vendored]]
+path = "crates/exav-core/src/fancy_regex"
+upstream = "fancy-regex"
+track = "crates"
+version = "0.19.2"
+kind = "adapted copy"
+why = "Backtracking engine for PCRE lookaround, backreferences and atomic groups. Carries two upstream pull requests unreleased when taken (278 and 292, both in 0.20.0) and, of exav's three fixes, only the size analysis overflow is still missing from 0.20.0 (README)."
+return_when = "a release has saturating size arithmetic in analyze.rs and compile.rs; the README lists the steps back, checked by cargo test -p exav-core pcre against the crate."
+
+[[vendored]]
+path = "crates/exav-render/src/image_codecs/jpeg.rs"
+upstream = "image"
+track = "crates"
+version = "0.25.9"
+kind = "adapted copy"
+why = "image's JPEG decoder over zune-jpeg built without its SIMD code, which `image` cannot turn off."
+return_when = "zune-jpeg's SIMD is a feature image can leave off, or the SIMD `unsafe` is gone."
+
+[[vendored]]
+path = "crates/exav-render/src/image_codecs/tiff_image.rs"
+upstream = "image"
+track = "crates"
+version = "0.25.9"
+kind = "adapted copy"
+why = "image's TIFF decoder, as jpeg.rs."
+return_when = "as jpeg.rs."
+
+[[vendored]]
+path = "crates/exav-render/src/image_codecs/tiff"
+upstream = "tiff"
+track = "crates"
+version = "0.10.3"
+kind = "adapted copy"
+why = "The tiff decoder over zune-jpeg 0.4 without SIMD, with `half` and `zerocopy` kept out."
+return_when = "as jpeg.rs."
+
+[[vendored]]
+path = "crates/exav-imagehash/src/pillow.rs"
+upstream = "pillow"
+track = "pypi"
+version = "12.3.0"
+kind = "port"
+why = "Pillow's resampler and grey conversions, for ClamAV's imagehash preset."
+return_when = "never: ClamAV's hash is defined by this algorithm."
+
+[[vendored]]
+path = "crates/exav-imagehash/src/dct.rs"
+upstream = "rustdct"
+track = "crates"
+version = "0.7.1"
+kind = "adapted copy"
+why = "DCT-II for power-of-two lengths with bounds checks where upstream uses `unsafe`; other lengths go through rustfft's SIMD upstream."
+return_when = "never: rustdct is unmaintained and `unsafe`."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/ppmd7"
+upstream = "ppmd-rust"
+track = "crates"
+version = "1.4.0"
+kind = "adapted copy"
+why = "PPMd var.H generalised over a range-decoder trait (7-Zip's and RAR's coders)."
+return_when = "upstream makes its range-decoder trait public (pub(crate) in 1.5.2) so RAR's coder can drive the model. 1.5.2 is forbid(unsafe_code), so the copy can then go; ppmd-rust is already a dev-dependency oracle."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/ppmd8"
+upstream = "ppmd-rust"
+track = "crates"
+version = "1.5.0"
+kind = "port"
+why = "PPMd var.I rev.1 (ZIP method 98) with the sub-allocator rewritten over a bounds-checked byte arena."
+return_when = "now: ppmd-rust 1.5.2 is forbid(unsafe_code), which was the reason for the arena rewrite. Compare its Ppmd8Decoder with this copy on the ZIP method-98 fixtures and the fuzz target, and drop the copy if they agree."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/udif.rs"
+upstream = "dmg-core"
+track = "crates"
+version = "0.1.2"
+kind = "adapted copy"
+why = "UDIF block reader, with lzma-rust2 for XZ instead of lzma-rs."
+return_when = "upstream uses lzma-rust2, or it is not worth following."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/cab_parse"
+upstream = "cab"
+track = "crates"
+version = "unrecorded"
+kind = "adapted copy"
+why = "CAB reader without write support, with bounds checks added for two panics on malformed cabinets (rust-cab on GitHub)."
+return_when = "upstream fixes the panics."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/arj_parse"
+upstream = "unarc-rs"
+track = "crates"
+version = "unrecorded"
+kind = "adapted copy"
+why = "ARJ reader. Depending on unarc-rs brings a second `zip` with default features, which unifies in codecs that bypass the per-member budget."
+return_when = "unarc-rs no longer depends on zip's default codecs."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/zoo_parse.rs"
+upstream = "unarc-rs"
+track = "crates"
+version = "unrecorded"
+kind = "adapted copy"
+why = "ZOO structures, as arj_parse."
+return_when = "as arj_parse."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/bzip2_rs"
+upstream = "bzip2-rs"
+track = "crates"
+version = "0.1.2"
+kind = "adapted copy"
+why = "Pure-Rust bzip2 decoder; the streaming decoder buffers a whole compressed block (upstream issue 13), plus a mode for NSIS's headerless bzip2."
+return_when = "never while upstream stays unreleased since 2021."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/azo.rs"
+upstream = "akolman/EggDotNet"
+track = "github"
+version = "unrecorded"
+kind = "port"
+why = "AZO, the codec of EGG and ALZ; the only permissively licensed implementation."
+return_when = "never: a port from C#."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/rar5_unpack.rs"
+upstream = "libarchive/libarchive"
+track = "github"
+version = "unrecorded"
+kind = "port"
+why = "RAR5 decompression core, from archive_read_support_format_rar5.c."
+return_when = "never: a port from C."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/rar3_unpack.rs"
+upstream = "nwaples/rardecode"
+track = "github"
+version = "unrecorded"
+kind = "port"
+why = "RAR3 and RAR4 decompression core, from the Go package."
+return_when = "never: a port from Go."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/lzfse.rs"
+upstream = "lzfse/lzfse"
+track = "github"
+version = "unrecorded"
+kind = "port"
+why = "LZFSE and LZVN decoder of Apple's reference implementation, decoding a whole buffer into a capped one."
+return_when = "never: a port from C."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/decmpfs.rs"
+upstream = "cmpfs"
+track = "crates"
+version = "0.1.0"
+kind = "port"
+why = "decmpfs (files macOS compresses) for HFS+ and APFS, over exav's own LZFSE and LZVN and its bounds; cmpfs brings lzfse_rust, lzvn-core and thiserror."
+return_when = "never: the HFS+ and APFS readers around it are in-tree."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/dcl_explode.rs"
+upstream = "explode"
+track = "crates"
+version = "0.1.2"
+kind = "port"
+why = "PKWARE DCL implode (blast.c's algorithm), whole slice into a capped buffer."
+return_when = "never: upstream unreleased since 2020 and a byte-at-a-time state machine."
+
+[[vendored]]
+path = "crates/exav-unpack/src/formats/ishield_z.rs"
+upstream = "unshield"
+track = "crates"
+version = "0.2.0"
+kind = "port"
+why = "Table of contents of InstallShield .z archives."
+return_when = "never: upstream unreleased since 2020."
+
+[[vendored]]
+path = "crates/exav-core/src/yara"
+upstream = "yara-x"
+track = "crates"
+version = "1.19"
+kind = "derived"
+why = "The native YARA engine; the pe, elf, dotnet, math, hash and string modules and the compiler's base64 handling derive from yara-x's (per-file headers). yara-x-parser is a regular dependency."
+return_when = "never: yara-x's runtime would bring a WASM runtime and a JIT (docs/DEPENDENCIES.md)."
+
+[[vendored]]
+path = "crates/exav-x86/src/generated.rs"
+upstream = "iced-x86"
+track = "crates"
+version = "1.21"
+kind = "generated tables"
+why = "Opcode tables emitted by crates/exav-x86/tools/gen-tables from iced-x86's decoder; iced-x86 stays a dev-dependency oracle."
+return_when = "never: regenerate if iced-x86 gains encodings."
+
+# ---------------------------------------------------------------- reviews
+#
+# One entry per workspace at the end of a late pass, from the last block
+# scripts/deps-review.py prints. `crates` and `unsafe` are for the shipped
+# default build (the CLI for the root workspace, the union of the wasm modules
+# for the viewer); `*_all` with every feature on. `unsafe` counts the keyword in
+# each crate's src/ with comments stripped, so it includes code a feature turns
+# off: read it as surface, and compare it with the last entry, not with zero.
+# The fuzz workspace is not shipped and is not recorded.
+
+[[review]]
+workspace = "root"
+date = "2026-10-27"
+release = "0.0.2"
+crates = 143
+unsafe = 5110
+crates_all = 191
+unsafe_all = 7829
+twice = 7
+
+[[review]]
+workspace = "unpack-wasm"
+date = "2026-10-27"
+release = "0.0.2"
+crates = 83
+unsafe = 3264
+crates_all = 84
+unsafe_all = 3264
+twice = 1
+
+[[review]]
+workspace = "viewer"
+date = "2026-10-27"
+release = "0.0.2"
+crates = 69
+unsafe = 3833
+crates_all = 69
+unsafe_all = 3833
+twice = 3
diff --git a/formats/registry.json b/formats/registry.json
new file mode 100644
index 00000000..8ec9069a
--- /dev/null
+++ b/formats/registry.json
@@ -0,0 +1,171 @@
+{
+  "about": "The one table of the file formats exav handles. scripts/formats.mjs checks it against the code (the extractor's Format enum, Cargo features and streaming walkers, the scanner's FileType, the viewer's matchers and signatures) and writes the format matrix page and the summary sentences in the docs from it. Fields: id; name; kind; ext (lower case, with the dot; matched with endsWith); mime (the types the viewer sniffs, and the registered or common ones); magic (alternatives, each a list of offset:hex that must all hold); scan {type: exav-core FileType::as_str or null, mode: container | reported | view | type | none}; unpack {format: exav-unpack Format variant, feature: Cargo feature or null, read: stream | whole | reported}; sniffs (types the viewer sniffs from the bytes without claiming them); viewer (the plugin that opens it, or null); note. unpack.read is stream (members decoded as they are read), members (the container is read whole, its members stream out), whole, or reported (recognised, not decoded). The viewer's own test (ts/core/registry.test.ts) and the scanner's (tests/suites/format_registry.rs) read this file.",
+  "kinds": {
+    "archive": "Archives and compressed streams",
+    "disk": "Disk images and filesystems",
+    "installer": "Installers, self-extractors and packers",
+    "document": "Documents",
+    "mail": "Mail and encodings",
+    "image": "Images",
+    "drawing": "Drawings and 3D models",
+    "media": "Video and audio",
+    "text": "Text and code",
+    "executable": "Executables and other carriers"
+  },
+  "scanModes": {
+    "container": "opened, and every member scanned",
+    "reported": "recognised and reported UNSCANNABLE or PASSWORD-PROTECTED, not opened",
+    "view": "scanned through a text view as well as its bytes",
+    "type": "typed by its content, its signatures applied",
+    "none": "no type of its own"
+  },
+  "summaries": {
+    "viewer": "PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint and CSV, text (Markdown, JSON, XML, source code), IFC, STL, OBJ, PLY and glTF models, video, audio, and what is inside an archive",
+    "files": ["README.md", "crates/exav-viewer/README.md", "www/src/content/docs/viewer/index.md"],
+    "checks": [
+      { "file": "README.md", "terms": ["PDF", "DWG", "DXF", "Word", "Excel", "PowerPoint", "CSV", "IFC", "STL", "OBJ", "PLY", "glTF"] },
+      { "file": "crates/exav-viewer/package.json", "terms": ["PDF", "DWG", "DXF", "Word", "Excel", "PowerPoint", "CSV", "IFC", "STL", "OBJ", "PLY", "glTF"] },
+      { "file": "crates/exav-viewer/demo/src/App.tsx", "terms": ["PDF", "DWG", "DXF", "Word", "Excel", "PowerPoint", "CSV", "IFC", "STL", "OBJ", "PLY", "glTF"] },
+      { "file": "www/src/content/docs/index.mdx", "terms": ["PDF", "DWG", "DXF", "IFC", "STL", "OBJ", "PLY", "glTF"] },
+      { "file": "www/src/content/docs/viewer/index.md", "terms": ["IFC", "STL", "OBJ", "PLY", "glTF"] },
+      { "file": "www/src/content/docs/subprojects/exav-render.md", "terms": ["DWG", "DXF", "IFC", "STL", "OBJ", "PLY", "glTF"] }
+    ]
+  },
+  "formats": [
+    { "id": "zip", "name": "ZIP", "kind": "archive", "ext": [".zip"], "mime": ["application/zip"], "magic": [["0:504b0304"]], "scan": { "type": "ZIP", "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "archive" },
+    { "id": "zip-package", "name": "Packages that are ZIP files (JAR, APK, IPA, wheel, NuGet, VSIX, MSIX...)", "kind": "archive", "ext": [".jar", ".war", ".ear", ".apk", ".apks", ".xapk", ".aab", ".ipa", ".xpi", ".whl", ".nupkg", ".vsix", ".kmz", ".appx", ".appxbundle", ".msix", ".msixbundle"], "mime": [], "scan": { "type": "ZIP", "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "archive" },
+    { "id": "split-archive", "name": "First part of a split archive (.7z.001, .zip.001, .rar.001, .tar.001, .z01)", "kind": "archive", "ext": [".7z.001", ".zip.001", ".rar.001", ".tar.001", ".z01"], "mime": [], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "archive", "note": "Opened with the other parts when the files around it have them." },
+    { "id": "comic-book", "name": "Comic book archives (CBZ, CBR, CB7, CBT)", "kind": "archive", "ext": [".cbz", ".cbr", ".cb7", ".cbt"], "mime": [], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "archive", "note": "A ZIP, RAR, 7z or tar under another name." },
+    { "id": "gzip", "name": "gzip", "kind": "archive", "ext": [".gz", ".tgz"], "mime": ["application/gzip"], "magic": [["0:1f8b08"]], "scan": { "type": "GZIP", "mode": "container" }, "unpack": { "format": "Gzip", "feature": "gzip", "read": "stream" }, "viewer": "archive" },
+    { "id": "bzip2", "name": "bzip2", "kind": "archive", "ext": [".bz2", ".tbz", ".tbz2"], "mime": ["application/x-bzip2"], "magic": [["0:425a6839", "4:314159265359"]], "scan": { "type": "BZIP2", "mode": "container" }, "unpack": { "format": "Bzip2", "feature": "bzip2", "read": "stream" }, "viewer": "archive" },
+    { "id": "xz", "name": "xz", "kind": "archive", "ext": [".xz", ".txz"], "mime": ["application/x-xz"], "magic": [["0:fd377a585a00"]], "scan": { "type": "XZ", "mode": "container" }, "unpack": { "format": "Xz", "feature": "xz", "read": "stream" }, "viewer": "archive" },
+    { "id": "zstd", "name": "Zstandard", "kind": "archive", "ext": [".zst", ".tzst"], "mime": ["application/zstd"], "magic": [["0:28b52ffd"]], "scan": { "type": "ZSTD", "mode": "container" }, "unpack": { "format": "Zstd", "feature": "zstd", "read": "stream" }, "viewer": "archive" },
+    { "id": "lz4", "name": "LZ4", "kind": "archive", "ext": [".lz4"], "mime": ["application/x-lz4"], "magic": [["0:04224d18"]], "scan": { "type": "LZ4", "mode": "container" }, "unpack": { "format": "Lz4", "feature": "lz4", "read": "stream" }, "viewer": "archive" },
+    { "id": "lzma", "name": "LZMA (.lzma)", "kind": "archive", "ext": [".lzma"], "mime": ["application/x-lzma"], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Lzma", "feature": "lzma", "read": "stream" }, "viewer": "archive", "note": "LZMA-alone, as LZMA Utils wrote it. No magic number: typed by the header's own rules (properties, dictionary size, size, first range-coder byte)." },
+    { "id": "rpm", "name": "RPM package", "kind": "archive", "ext": [".rpm"], "mime": ["application/x-rpm", "application/x-redhat-package-manager"], "magic": [["0:edabeedb"]], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Rpm", "feature": "rpm", "read": "stream" }, "viewer": "archive", "note": "The install scripts and the payload (a compressed cpio) are members." },
+    { "id": "lzip", "name": "lzip", "kind": "archive", "ext": [".lz", ".tlz"], "mime": ["application/x-lzip"], "magic": [["0:4c5a4950", "4:01"]], "scan": { "type": "LZIP", "mode": "container" }, "unpack": { "format": "Lzip", "feature": "lzip", "read": "stream" }, "viewer": "archive" },
+    { "id": "compress", "name": "Unix compress (.Z)", "kind": "archive", "ext": [".z", ".taz"], "mime": ["application/x-compress"], "magic": [["0:1f9d"]], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Lzw", "feature": "lzw", "read": "stream" }, "viewer": "archive" },
+    { "id": "tar", "name": "tar", "kind": "archive", "ext": [".tar"], "mime": ["application/x-tar"], "magic": [["257:7573746172"]], "scan": { "type": "TAR", "mode": "container" }, "unpack": { "format": "Tar", "feature": "tar", "read": "stream" }, "viewer": "archive" },
+    { "id": "7z", "name": "7z", "kind": "archive", "ext": [".7z"], "mime": ["application/x-7z-compressed"], "magic": [["0:377abcaf271c"]], "scan": { "type": "7Z", "mode": "container" }, "unpack": { "format": "SevenZip", "feature": "sevenz", "read": "stream" }, "viewer": "archive" },
+    { "id": "rar", "name": "RAR (RAR3 and RAR5)", "kind": "archive", "ext": [".rar"], "mime": ["application/x-rar-compressed"], "magic": [["0:526172211a07"]], "scan": { "type": "RAR", "mode": "container" }, "unpack": { "format": "Rar", "feature": "rar", "read": "whole" }, "viewer": "archive" },
+    { "id": "cab", "name": "Cabinet (CAB)", "kind": "archive", "ext": [".cab"], "mime": ["application/vnd.ms-cab-compressed"], "magic": [["0:4d534346", "4:00000000"]], "scan": { "type": "CAB", "mode": "container" }, "unpack": { "format": "Cab", "feature": "cab", "read": "stream" }, "viewer": "archive" },
+    { "id": "chm", "name": "Compiled HTML Help (CHM)", "kind": "archive", "ext": [".chm"], "mime": ["application/vnd.ms-htmlhelp"], "magic": [["0:49545346", "5:000000"]], "scan": { "type": "CHM", "mode": "container" }, "unpack": { "format": "Chm", "feature": "chm", "read": "whole" }, "viewer": "archive" },
+    { "id": "lha", "name": "LHA / LZH", "kind": "archive", "ext": [".lzh", ".lha"], "mime": ["application/x-lzh-compressed"], "magic": [["2:2d6c68302d"], ["2:2d6c7a342d"]], "scan": { "type": "LHA", "mode": "container" }, "unpack": { "format": "Lha", "feature": "lha", "read": "stream" }, "viewer": "archive" },
+    { "id": "arj", "name": "ARJ", "kind": "archive", "ext": [".arj"], "mime": ["application/x-arj"], "magic": [["0:60ea"]], "scan": { "type": "ARJ", "mode": "container", "needs": "a header whose CRC-32 holds" }, "unpack": { "format": "Arj", "feature": "arj", "read": "whole" }, "viewer": "archive" },
+    { "id": "ar", "name": "ar (static libraries, Debian packages)", "kind": "archive", "ext": [".ar", ".a", ".deb", ".udeb"], "mime": ["application/x-archive"], "magic": [["0:213c617263683e0a"]], "scan": { "type": "AR", "mode": "container" }, "unpack": { "format": "Ar", "feature": "ar", "read": "stream" }, "viewer": "archive" },
+    { "id": "cpio", "name": "cpio (RPM payloads, initramfs)", "kind": "archive", "ext": [".cpio"], "mime": ["application/x-cpio"], "magic": [["0:303730373031"], ["0:303730373032"], ["0:303730373037"]], "scan": { "type": "CPIO", "mode": "container" }, "unpack": { "format": "Cpio", "feature": "cpio", "read": "stream" }, "viewer": "archive" },
+    { "id": "xar", "name": "xar (macOS packages)", "kind": "archive", "ext": [".xar", ".pkg", ".xip"], "mime": ["application/x-xar"], "magic": [["0:78617221", "4:00"]], "scan": { "type": "XAR", "mode": "container" }, "unpack": { "format": "Xar", "feature": "xar", "read": "stream" }, "viewer": "archive" },
+    { "id": "zoo", "name": "ZOO", "kind": "archive", "ext": [".zoo"], "mime": ["application/x-zoo"], "scan": { "type": "ZOO", "mode": "container" }, "unpack": { "format": "Zoo", "feature": "zoo", "read": "whole" }, "viewer": "archive" },
+    { "id": "arc", "name": "ARC / PKARC / PAK", "kind": "archive", "ext": [".arc"], "mime": ["application/x-arc"], "scan": { "type": "ARC", "mode": "container" }, "unpack": { "format": "Arc", "feature": "arc", "read": "whole" }, "viewer": "archive" },
+    { "id": "alz", "name": "ALZ", "kind": "archive", "ext": [".alz"], "mime": ["application/x-alz"], "scan": { "type": "ALZ", "mode": "container" }, "unpack": { "format": "Alz", "feature": "alz", "read": "whole" }, "viewer": "archive" },
+    { "id": "egg", "name": "EGG", "kind": "archive", "ext": [".egg"], "mime": [], "scan": { "type": "EGG", "mode": "container" }, "unpack": { "format": "Egg", "feature": "egg", "read": "whole" }, "viewer": "archive" },
+    { "id": "ishield-z", "name": "InstallShield .z", "kind": "archive", "ext": [], "mime": [], "scan": { "type": "InstallShieldZ", "mode": "container" }, "unpack": { "format": "IshieldZ", "feature": "ishieldz", "read": "whole" }, "viewer": null },
+    { "id": "szdd", "name": "MS-Compress (SZDD, KWAJ)", "kind": "archive", "ext": [], "mime": [], "scan": { "type": "SZDD", "mode": "container" }, "unpack": { "format": "Szdd", "feature": "szdd", "read": "stream" }, "viewer": null },
+    { "id": "tnef", "name": "TNEF (winmail.dat)", "kind": "mail", "ext": ["winmail.dat", ".tnef"], "mime": ["application/vnd.ms-tnef"], "magic": [["0:789f3e22"]], "scan": { "type": "TNEF", "mode": "container" }, "unpack": { "format": "Tnef", "feature": "tnef", "read": "stream" }, "viewer": "archive" },
+    { "id": "ace", "name": "ACE", "kind": "archive", "ext": [".ace"], "mime": [], "scan": { "type": "ACE", "mode": "reported" }, "unpack": { "format": "Ace", "feature": "ace", "read": "reported" }, "viewer": null, "note": "Recognised, never decoded: no trustworthy implementation to validate a decoder against." },
+    { "id": "stuffit", "name": "StuffIt and StuffIt X", "kind": "archive", "ext": [".sit", ".sitx"], "mime": [], "scan": { "type": "StuffIt", "mode": "reported" }, "unpack": { "format": "StuffIt", "feature": "stuffit", "read": "reported" }, "viewer": null },
+    { "id": "ishield-cab", "name": "InstallShield InstallScript cabinet", "kind": "archive", "ext": [], "mime": [], "magic": [["0:49536328"]], "scan": { "type": "InstallShieldCAB", "mode": "reported" }, "unpack": { "format": "IshieldCab", "feature": null, "read": "reported" }, "viewer": null },
+    { "id": "ishield-msi", "name": "InstallShield MSI", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "InstallShieldMSI", "mode": "reported" }, "unpack": { "format": "IshieldMsi", "feature": null, "read": "reported" }, "viewer": null },
+    { "id": "cryptff", "name": "CryptFF", "kind": "archive", "ext": [], "mime": [], "scan": { "type": "CryptFF", "mode": "reported" }, "unpack": { "format": "CryptFf", "feature": null, "read": "reported" }, "viewer": null, "note": "Encrypted: reported PASSWORD-PROTECTED." },
+    { "id": "lrzip", "name": "lrzip", "kind": "archive", "ext": [".lrz"], "mime": [], "magic": [["0:4c525a49"]], "scan": { "type": "lrzip", "mode": "reported" }, "unpack": { "format": "Lrzip", "feature": null, "read": "reported" }, "viewer": null },
+    { "id": "applesingle", "name": "AppleSingle and AppleDouble", "kind": "archive", "ext": [], "mime": [], "scan": { "type": "AppleSingle", "mode": "reported" }, "unpack": { "format": "AppleSingle", "feature": null, "read": "reported" }, "viewer": null },
+
+    { "id": "iso", "name": "ISO 9660 and UDF", "kind": "disk", "ext": [".iso"], "mime": ["application/x-iso9660-image"], "scan": { "type": "ISO", "mode": "container" }, "unpack": { "format": "Iso", "feature": "iso", "read": "stream" }, "viewer": "archive" },
+    { "id": "dmg", "name": "Apple disk image (DMG)", "kind": "disk", "ext": [".dmg"], "mime": ["application/x-apple-diskimage"], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Dmg", "feature": "dmg", "read": "stream" }, "viewer": "archive" },
+    { "id": "vhd", "name": "VHD", "kind": "disk", "ext": [".vhd"], "mime": ["application/x-vhd"], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Vhd", "feature": "vhd", "read": "stream" }, "viewer": "archive" },
+    { "id": "vhdx", "name": "VHDX", "kind": "disk", "ext": [".vhdx"], "mime": ["application/x-vhdx"], "magic": [["0:7668647866696c65"]], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Vhdx", "feature": "diskimage", "read": "stream" }, "viewer": "archive" },
+    { "id": "vmdk", "name": "VMDK (and OVA)", "kind": "disk", "ext": [".vmdk", ".ova"], "mime": ["application/x-vmdk"], "magic": [["0:4b444d56"]], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Vmdk", "feature": "diskimage", "read": "stream" }, "viewer": "archive" },
+    { "id": "qcow2", "name": "QCOW2", "kind": "disk", "ext": [".qcow2"], "mime": ["application/x-qemu-disk"], "magic": [["0:514649fb"]], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Qcow2", "feature": "diskimage", "read": "stream" }, "viewer": "archive" },
+    { "id": "wim", "name": "Windows imaging (WIM, ESD)", "kind": "disk", "ext": [".wim", ".esd"], "mime": ["application/x-ms-wim"], "magic": [["0:4d5357494d", "5:000000"]], "scan": { "type": "WIM", "mode": "container" }, "unpack": { "format": "Wim", "feature": "wim", "read": "stream" }, "viewer": "archive" },
+    { "id": "partition", "name": "Partition maps (GPT, APM, MBR) and raw disk images", "kind": "disk", "ext": [".img"], "mime": [], "scan": { "type": "partition", "mode": "container" }, "unpack": { "format": "Partition", "feature": "partition", "read": "stream" }, "viewer": "archive" },
+    { "id": "fat", "name": "FAT12, FAT16, FAT32", "kind": "disk", "ext": [], "mime": [], "scan": { "type": "FAT", "mode": "container" }, "unpack": { "format": "Fat", "feature": "fat", "read": "stream" }, "viewer": null },
+    { "id": "ntfs", "name": "NTFS", "kind": "disk", "ext": [], "mime": [], "scan": { "type": "NTFS", "mode": "container" }, "unpack": { "format": "Ntfs", "feature": "ntfs", "read": "stream" }, "viewer": null },
+    { "id": "ext", "name": "ext2, ext3, ext4", "kind": "disk", "ext": [], "mime": [], "scan": { "type": "ext", "mode": "container" }, "unpack": { "format": "Ext", "feature": "ext", "read": "stream" }, "viewer": null },
+    { "id": "exfat", "name": "exFAT", "kind": "disk", "ext": [], "mime": [], "magic": [["3:4558464154202020", "510:55aa"]], "scan": { "type": "exFAT", "mode": "container" }, "unpack": { "format": "Exfat", "feature": "exfat", "read": "stream" }, "viewer": null },
+    { "id": "squashfs", "name": "SquashFS", "kind": "disk", "ext": [".squashfs", ".sqfs", ".snap"], "mime": ["application/vnd.squashfs"], "magic": [["0:68737173"], ["0:73717368"]], "scan": { "type": "SquashFS", "mode": "container" }, "unpack": { "format": "Squashfs", "feature": "squashfs", "read": "stream" }, "viewer": null, "note": "Both byte orders; gzip, LZMA, LZO, XZ, LZ4 and Zstandard blocks." },
+    { "id": "cramfs", "name": "cramfs", "kind": "disk", "ext": [".cramfs"], "mime": [], "magic": [["0:453dcd28", "16:436f6d7072657373656420524f4d4653"]], "scan": { "type": "cramfs", "mode": "container" }, "unpack": { "format": "Cramfs", "feature": "cramfs", "read": "stream" }, "viewer": null },
+    { "id": "romfs", "name": "romfs", "kind": "disk", "ext": [".romfs"], "mime": [], "magic": [["0:2d726f6d3166732d"]], "scan": { "type": "romfs", "mode": "container" }, "unpack": { "format": "Romfs", "feature": "romfs", "read": "stream" }, "viewer": null },
+    { "id": "erofs", "name": "EROFS", "kind": "disk", "ext": [".erofs"], "mime": [], "magic": [["1024:e2e1f5e0"]], "scan": { "type": "EROFS", "mode": "container" }, "unpack": { "format": "Erofs", "feature": "erofs", "read": "stream" }, "viewer": null, "note": "Files stored plain or in chunks are read; a compressed file is reported." },
+
+    { "id": "nsis", "name": "NSIS installer", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "NSIS", "mode": "container" }, "unpack": { "format": "Nsis", "feature": "nsis", "read": "whole" }, "viewer": null },
+    { "id": "inno", "name": "Inno Setup installer", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "InnoSetup", "mode": "reported" }, "unpack": { "format": "Inno", "feature": "inno", "read": "reported" }, "viewer": null },
+    { "id": "sfx", "name": "Self-extracting archives", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "SFX", "mode": "container" }, "unpack": { "format": "Sfx", "feature": "sfx", "read": "stream" }, "viewer": null },
+    { "id": "autoit", "name": "AutoIt compiled scripts", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "AutoIt", "mode": "container" }, "unpack": { "format": "Autoit", "feature": "autoit", "read": "whole" }, "viewer": null },
+    { "id": "upx", "name": "UPX-packed executables", "kind": "installer", "ext": [], "mime": [], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Upx", "feature": "upx", "read": "whole" }, "viewer": null },
+    { "id": "pe-packed", "name": "Other packed PE executables", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "PE", "mode": "container" }, "unpack": { "format": "PePacked", "feature": "pepack", "read": "whole" }, "viewer": null, "note": "Unpacked by native decoders, or by running the stub in a bounded emulator." },
+    { "id": "machofat", "name": "Mach-O universal binaries", "kind": "installer", "ext": [], "mime": [], "scan": { "type": "Mach-O universal", "mode": "container" }, "unpack": { "format": "Machofat", "feature": "machofat", "read": "stream" }, "viewer": null },
+
+    { "id": "ole", "name": "OLE2 compound files (legacy Office, MSI)", "kind": "document", "ext": [], "mime": [], "magic": [["0:d0cf11e0a1b11ae1"]], "scan": { "type": "OLE", "mode": "container" }, "unpack": { "format": "Ole", "feature": "ole", "read": "whole" }, "viewer": null },
+    { "id": "pdf", "name": "PDF", "kind": "document", "ext": [".pdf"], "mime": ["application/pdf"], "magic": [["0:255044462d"]], "scan": { "type": "PDF", "mode": "container" }, "unpack": { "format": "Pdf", "feature": "pdf", "read": "whole" }, "viewer": "pdf" },
+    { "id": "docx", "name": "Word (DOCX)", "kind": "document", "ext": [".docx", ".docm", ".dotx"], "mime": ["application/vnd.openxmlformats-officedocument.wordprocessingml.document"], "scan": { "type": "ZIP", "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "docx" },
+    { "id": "xlsx", "name": "Excel (XLSX)", "kind": "document", "ext": [".xlsx", ".xlsm"], "mime": ["application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"], "scan": { "type": "ZIP", "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "xlsx" },
+    { "id": "pptx", "name": "PowerPoint (PPTX)", "kind": "document", "ext": [".pptx", ".pptm", ".ppsx", ".potx"], "mime": ["application/vnd.openxmlformats-officedocument.presentationml.presentation"], "scan": { "type": "ZIP", "mode": "container" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "pptx" },
+    { "id": "doc", "name": "Word 6 to 2003 (DOC)", "kind": "document", "ext": [".doc", ".dot"], "mime": ["application/msword"], "scan": { "type": "OLE", "mode": "view" }, "unpack": { "format": "Ole", "feature": "ole", "read": "whole" }, "viewer": "doc", "note": "The scanner reads its text with visible-text-office." },
+    { "id": "xls", "name": "Excel 4 to 2003 (XLS)", "kind": "document", "ext": [".xls", ".xlt"], "mime": ["application/x-msexcel"], "scan": { "type": "OLE", "mode": "view" }, "unpack": { "format": "Ole", "feature": "ole", "read": "whole" }, "viewer": "xls", "note": "The scanner reads its text with visible-text-office." },
+    { "id": "ppt", "name": "PowerPoint 95 to 2003 (PPT)", "kind": "document", "ext": [".ppt", ".pps", ".pot"], "mime": ["application/vnd.ms-powerpoint"], "scan": { "type": "OLE", "mode": "view" }, "unpack": { "format": "Ole", "feature": "ole", "read": "whole" }, "viewer": "ppt", "note": "PowerPoint 2 to 4 are recognised and reported unsupported in the viewer." },
+    { "id": "rtf", "name": "RTF", "kind": "document", "ext": [".rtf"], "mime": ["application/rtf"], "scan": { "type": "RTF", "mode": "view" }, "unpack": { "format": "Rtf", "feature": "rtf", "read": "whole" }, "viewer": "rtf" },
+    { "id": "odt", "name": "OpenDocument text (ODT)", "kind": "document", "ext": [".odt", ".ott", ".fodt"], "mime": ["application/vnd.oasis.opendocument.text"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "odt" },
+    { "id": "ods", "name": "OpenDocument spreadsheet (ODS)", "kind": "document", "ext": [".ods", ".ots", ".fods"], "mime": ["application/vnd.oasis.opendocument.spreadsheet"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "ods" },
+    { "id": "odp", "name": "OpenDocument presentation (ODP)", "kind": "document", "ext": [".odp", ".otp", ".fodp"], "mime": ["application/vnd.oasis.opendocument.presentation"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "odp" },
+    { "id": "odg", "name": "OpenDocument drawing (ODG)", "kind": "drawing", "ext": [".odg", ".otg", ".fodg"], "mime": ["application/vnd.oasis.opendocument.graphics"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "odg" },
+    { "id": "keynote", "name": "Keynote", "kind": "document", "ext": [".key"], "mime": ["application/vnd.apple.keynote"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "keynote" },
+    { "id": "numbers", "name": "Numbers", "kind": "document", "ext": [".numbers"], "mime": ["application/vnd.apple.numbers"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": "numbers" },
+    { "id": "pages", "name": "Pages", "kind": "document", "ext": [".pages"], "mime": ["application/vnd.apple.pages"], "scan": { "type": "ZIP", "mode": "view" }, "unpack": { "format": "Zip", "feature": "zip", "read": "stream" }, "viewer": null, "note": "Converted by exav-render, but the viewer has no matcher for it yet." },
+    { "id": "csv", "name": "CSV and TSV", "kind": "document", "ext": [".csv", ".tsv"], "mime": ["text/csv"], "scan": { "type": "ASCII text", "mode": "view" }, "unpack": null, "viewer": "csv" },
+    { "id": "visio", "name": "Visio", "kind": "document", "ext": [".vsd", ".vst", ".vdx", ".vtx", ".vsdx", ".vsdm", ".vstx", ".vstm"], "mime": ["application/vnd.visio"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "visio", "note": "VSDX, VSDM, VSTX and VSTM by the package's converter; the binary and XML ones by the external converter." },
+    { "id": "coreldraw", "name": "CorelDRAW", "kind": "document", "ext": [".cdr", ".cmx"], "mime": ["application/vnd.corel-draw"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "coreldraw", "note": "By the external converter." },
+    { "id": "publisher", "name": "Publisher", "kind": "document", "ext": [".pub"], "mime": ["application/vnd.ms-publisher"], "scan": { "type": "OLE", "mode": "container" }, "unpack": { "format": "Ole", "feature": "ole", "read": "whole" }, "viewer": "publisher", "note": "By the external converter." },
+    { "id": "pagemaker", "name": "PageMaker 6 to 7", "kind": "document", "ext": [".pmd", ".pm6", ".p65"], "mime": ["application/x-pagemaker"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "pagemaker", "note": "By the external converter." },
+    { "id": "freehand", "name": "FreeHand 3 to 11", "kind": "document", "ext": [".fh", ".fh3", ".fh4", ".fh5", ".fh7", ".fh8", ".fh9", ".fh10", ".fh11"], "mime": ["image/x-freehand"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "freehand", "note": "By the external converter." },
+    { "id": "quarkxpress", "name": "QuarkXPress 3.1 to 4.1", "kind": "document", "ext": [".qxd", ".qxt"], "mime": ["application/vnd.quark.quarkxpress"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "quarkxpress", "note": "By the external converter." },
+    { "id": "zonerdraw", "name": "Zoner Draw 4 and 5", "kind": "document", "ext": [".zmf"], "mime": [], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "zonerdraw", "note": "By the external converter." },
+    { "id": "wpg", "name": "WordPerfect Graphics 1 and 2", "kind": "document", "ext": [".wpg"], "mime": ["application/x-wpg"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "wpg", "note": "By the external converter." },
+    { "id": "hwp3", "name": "Hangul Word Processor 3 (HWP3)", "kind": "document", "ext": [".hwp"], "mime": [], "scan": { "type": "HWP3", "mode": "container" }, "unpack": { "format": "Hwp3", "feature": "hwp3", "read": "whole" }, "viewer": null },
+    { "id": "onenote", "name": "OneNote", "kind": "document", "ext": [".one"], "mime": [], "scan": { "type": "OneNote", "mode": "container" }, "unpack": { "format": "OneNote", "feature": "onenote", "read": "stream" }, "viewer": null },
+    { "id": "xdp", "name": "Adobe XDP", "kind": "document", "ext": [".xdp"], "mime": [], "scan": { "type": "XDP", "mode": "container" }, "unpack": { "format": "Xdp", "feature": "xdp", "read": "whole" }, "viewer": null },
+
+    { "id": "email", "name": "Email (MIME) and MHTML", "kind": "mail", "ext": [".eml", ".mht", ".mhtml"], "mime": ["message/rfc822"], "scan": { "type": "email", "mode": "container" }, "unpack": { "format": "Email", "feature": "email", "read": "whole" }, "viewer": null },
+    { "id": "binhex", "name": "BinHex", "kind": "mail", "ext": [".hqx"], "mime": [], "scan": { "type": "BinHex", "mode": "container" }, "unpack": { "format": "Binhex", "feature": "binhex", "read": "whole" }, "viewer": null },
+    { "id": "uuencode", "name": "uuencode", "kind": "mail", "ext": [".uu"], "mime": [], "scan": { "type": "uuencode", "mode": "container" }, "unpack": { "format": "Uuencode", "feature": "uuencode", "read": "whole" }, "viewer": null },
+
+    { "id": "image-web", "name": "PNG, JPEG, GIF, WebP and SVG", "kind": "image", "ext": [".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg"], "mime": ["image/png", "image/jpeg", "image/gif", "image/webp", "image/svg+xml"], "magic": [["0:89504e470d0a1a0a"], ["0:ffd8ff"], ["0:474946383761"], ["0:474946383961"], ["0:52494646", "8:57454250"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image", "note": "Drawn by the browser; SVG in an <img>, which runs no script." },
+    { "id": "image-tiff", "name": "TIFF", "kind": "image", "ext": [".tif", ".tiff"], "mime": ["image/tiff"], "magic": [["0:49492a00"], ["0:4d4d002a"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image" },
+    { "id": "image-bmp", "name": "BMP", "kind": "image", "ext": [".bmp"], "mime": ["image/bmp"], "magic": [["0:424d"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image" },
+    { "id": "image-misc", "name": "ICO, PNM, QOI, DDS, farbfeld, Radiance HDR", "kind": "image", "ext": [".ico", ".cur", ".pbm", ".pgm", ".ppm", ".pnm", ".pam", ".qoi", ".dds", ".ff", ".hdr"], "mime": ["image/x-icon", "image/x-win-bitmap", "image/x-portable-anymap", "image/qoi"], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image" },
+    { "id": "image-tga", "name": "Targa (TGA)", "kind": "image", "ext": [".tga", ".icb"], "mime": ["image/x-tga", "image/x-targa"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "image", "note": "No magic number: the viewer reads a file as Targa when its header is sane and its pixels fill it." },
+    { "id": "image-jpeg2000", "name": "JPEG 2000", "kind": "image", "ext": [".jp2", ".jpf", ".jpx", ".j2k", ".j2c"], "mime": ["image/jp2", "image/j2c"], "magic": [["0:0000000c6a5020200d0a870a"], ["0:ff4fff51"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image" },
+    { "id": "image-jbig2", "name": "JBIG2", "kind": "image", "ext": [".jb2", ".jbig2"], "mime": ["image/x-jbig2"], "magic": [["0:974a42320d0a1a0a"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image" },
+    { "id": "image-jxl", "name": "JPEG XL", "kind": "image", "ext": [".jxl"], "mime": ["image/jxl"], "magic": [["0:0000000c4a584c200d0a870a"], ["0:ff0a"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image" },
+    { "id": "image-raw", "name": "Camera RAW (DNG, CR2, CR3, NEF, ARW, ORF, RW2, RAF, PEF...)", "kind": "image", "ext": [".dng", ".gpr", ".cr2", ".cr3", ".crw", ".nef", ".nrw", ".arw", ".sr2", ".srf", ".orf", ".ori", ".rw2", ".rwl", ".raw", ".raf", ".pef", ".srw", ".3fr", ".fff", ".iiq", ".x3f", ".mrw", ".dcr", ".kdc", ".erf", ".mef", ".mos"], "mime": ["image/x-olympus-orf", "image/x-panasonic-rw2", "image/x-fuji-raf", "image/x-sigma-x3f", "image/x-canon-crw", "image/x-minolta-mrw", "image/x-canon-cr3"], "magic": [["0:4949524f"], ["0:49495253"], ["0:4d4d4f52"], ["0:49495500"], ["0:46554a4946494c4d4343442d524157"], ["0:464f5662"], ["0:49491a000000", "6:4845415043434452"], ["0:004d524d"], ["4:66747970", "8:63727820"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": "image", "note": "Shown by the preview the file embeds; the sensor data is not decoded." },
+    { "id": "image-heif", "name": "HEIC and HEIF", "kind": "image", "ext": [".heic", ".heif"], "mime": ["image/heic", "image/heif"], "magic": [["4:66747970", "8:68656963"], ["4:66747970", "8:68656978"], ["4:66747970", "8:6d696631"]], "scan": { "type": null, "mode": "type" }, "unpack": null, "viewer": null, "note": "Typed by the viewer so that it is not taken for a video; no plugin opens it." },
+
+    { "id": "dwg", "name": "AutoCAD DWG", "kind": "drawing", "ext": [".dwg"], "mime": ["image/vnd.dwg"], "magic": [["0:41433130"]], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Dwg", "feature": "dwg", "read": "whole" }, "viewer": "dwg", "note": "R13 to R2018 are drawn; older releases are reported." },
+    { "id": "dxf", "name": "AutoCAD DXF", "kind": "drawing", "ext": [".dxf"], "mime": ["image/vnd.dxf"], "scan": { "type": null, "mode": "container" }, "unpack": { "format": "Dxf", "feature": "dxf", "read": "whole" }, "viewer": "dxf" },
+    { "id": "ifc", "name": "IFC", "kind": "drawing", "ext": [".ifc"], "mime": ["model/ifc"], "magic": [["0:49534f2d31303330332d32313b"]], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "ifc" },
+    { "id": "stl", "name": "STL", "kind": "drawing", "ext": [".stl"], "mime": ["model/stl"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "stl" },
+    { "id": "obj", "name": "Wavefront OBJ", "kind": "drawing", "ext": [".obj"], "mime": ["model/obj"], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "obj" },
+    { "id": "ply", "name": "Stanford PLY", "kind": "drawing", "ext": [".ply"], "mime": ["model/ply"], "magic": [["0:706c790a"], ["0:706c790d0a"]], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "ply" },
+    { "id": "gltf", "name": "glTF 2.0 (GLTF, GLB)", "kind": "drawing", "ext": [".gltf", ".glb"], "mime": ["model/gltf-binary", "model/gltf+json"], "magic": [["0:676c5446", "4:02000000"]], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "gltf" },
+
+    { "id": "video", "name": "Video (MP4, MOV, WebM, Ogg)", "kind": "media", "ext": [".mp4", ".m4v", ".mov", ".webm", ".ogv"], "mime": ["video/mp4", "video/quicktime", "video/webm"], "magic": [["4:66747970"], ["4:66747970", "8:71742020"], ["0:1a45dfa3"]], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "video", "note": "Played by the browser, so only what the browser decodes." },
+    { "id": "audio", "name": "Audio (MP3, M4A, AAC, WAV, Ogg, Opus, FLAC)", "kind": "media", "ext": [".mp3", ".m4a", ".aac", ".wav", ".ogg", ".oga", ".opus", ".flac"], "mime": ["audio/mpeg", "audio/wav", "audio/flac"], "sniffs": ["application/ogg"], "magic": [["0:494433"], ["0:52494646", "8:57415645"], ["0:664c6143"], ["0:4f676753"]], "scan": { "type": null, "mode": "none" }, "unpack": null, "viewer": "audio" },
+
+    { "id": "markdown", "name": "Markdown", "kind": "text", "ext": [".md", ".markdown"], "mime": ["text/markdown"], "scan": { "type": "ASCII text", "mode": "view" }, "unpack": null, "viewer": "text" },
+    { "id": "json", "name": "JSON", "kind": "text", "ext": [".json", ".geojson"], "mime": ["application/json"], "scan": { "type": "ASCII text", "mode": "type" }, "unpack": null, "viewer": "text" },
+    { "id": "xml", "name": "XML (and RSS, KML, GPX, plist...)", "kind": "text", "ext": [".xml", ".xsd", ".xsl", ".xslt", ".rss", ".atom", ".kml", ".gpx", ".rdf", ".wsdl", ".plist"], "mime": ["application/xml", "text/xml"], "scan": { "type": "ASCII text", "mode": "type" }, "unpack": null, "viewer": "text" },
+    { "id": "html", "name": "HTML", "kind": "text", "ext": [".html", ".htm", ".xhtml"], "mime": ["text/html"], "scan": { "type": "HTML", "mode": "view" }, "unpack": null, "viewer": "text", "note": "Shown as its source." },
+    { "id": "diff", "name": "Diffs and patches", "kind": "text", "ext": [".diff", ".patch"], "mime": ["text/x-diff"], "scan": { "type": "ASCII text", "mode": "type" }, "unpack": null, "viewer": "text" },
+    { "id": "text", "name": "Plain text, logs, configuration, subtitles", "kind": "text", "ext": [".txt", ".text", ".log", ".jsonl", ".ndjson", ".srt", ".vtt", ".yaml", ".yml", ".toml", ".ini", ".cfg", ".conf", ".properties"], "mime": ["text/plain"], "scan": { "type": "ASCII text", "mode": "type" }, "unpack": null, "viewer": "text" },
+    { "id": "source", "name": "Source code", "kind": "text", "ext": [".js", ".mjs", ".cjs", ".jsx", ".ts", ".tsx", ".mts", ".cts", ".css", ".scss", ".py", ".sh", ".bash", ".zsh", ".bat", ".ps1", ".c", ".h", ".cc", ".cpp", ".hpp", ".cs", ".rs", ".go", ".java", ".kt", ".swift", ".rb", ".php", ".pl", ".lua", ".sql"], "mime": ["text/javascript", "text/css"], "scan": { "type": "script", "mode": "type" }, "unpack": null, "viewer": "text", "note": "Scripts also get JavaScript views." },
+
+    { "id": "pe", "name": "Windows executables (PE)", "kind": "executable", "ext": [".exe", ".dll", ".sys"], "mime": [], "magic": [["0:4d5a"]], "scan": { "type": "PE", "mode": "type" }, "unpack": null, "viewer": null },
+    { "id": "elf", "name": "ELF", "kind": "executable", "ext": [], "mime": [], "magic": [["0:7f454c46"]], "scan": { "type": "ELF", "mode": "type" }, "unpack": null, "viewer": null },
+    { "id": "macho", "name": "Mach-O", "kind": "executable", "ext": [], "mime": [], "scan": { "type": "Mach-O", "mode": "type" }, "unpack": null, "viewer": null },
+    { "id": "lnk", "name": "Windows shortcuts (LNK)", "kind": "executable", "ext": [".lnk"], "mime": [], "scan": { "type": "LNK", "mode": "container" }, "unpack": { "format": "Lnk", "feature": "lnk", "read": "whole" }, "viewer": null },
+    { "id": "pyc", "name": "Python bytecode (.pyc)", "kind": "executable", "ext": [".pyc"], "mime": [], "scan": { "type": "PYC", "mode": "container" }, "unpack": { "format": "Pyc", "feature": "pyc", "read": "stream" }, "viewer": null },
+    { "id": "javaclass", "name": "Java class files", "kind": "executable", "ext": [".class"], "mime": [], "magic": [["0:cafebabe"]], "scan": { "type": "Java class", "mode": "container", "needs": "a constant pool that parses" }, "unpack": { "format": "JavaClass", "feature": "javaclass", "read": "whole" }, "viewer": null },
+    { "id": "swf", "name": "SWF (Flash)", "kind": "executable", "ext": [".swf"], "mime": [], "scan": { "type": "SWF", "mode": "container" }, "unpack": { "format": "Swf", "feature": "swf", "read": "stream" }, "viewer": null },
+    { "id": "aimodel", "name": "AI models (pickle, safetensors)", "kind": "executable", "ext": [".pkl", ".safetensors"], "mime": [], "scan": { "type": "AI model", "mode": "container" }, "unpack": { "format": "AiModel", "feature": "aimodel", "read": "whole" }, "viewer": null },
+    { "id": "screnc", "name": "Microsoft Script Encoder", "kind": "executable", "ext": [".vbe", ".jse"], "mime": [], "scan": { "type": "Script Encoder", "mode": "container" }, "unpack": { "format": "Screnc", "feature": "screnc", "read": "whole" }, "viewer": null }
+  ]
+}
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index 758fd989..79560bf4 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -28,6 +28,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.6"
@@ -88,29 +97,47 @@ dependencies = [
 ]
 
 [[package]]
-name = "apfs"
-version = "0.2.4"
+name = "arbitrary"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1b4ecd96379464ea8b4ef2517c8eb674d8658ad364e9176bf5b8c278aa801e"
+checksum = "3bc62ac97cc33321f50863d514c3bc38a453947a8f9e781137e47c7401020aed"
 dependencies = [
- "byteorder",
- "thiserror",
+ "derive_arbitrary",
 ]
 
 [[package]]
-name = "arbitrary"
-version = "1.4.2"
+name = "archmage"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+checksum = "15785ee3576fbd41276a25f063b1e6b5bf323af9b4924632e25a8de6a3065f06"
 dependencies = [
- "derive_arbitrary",
+ "archmage-macros",
+ "safe_unaligned_simd",
+ "winarm-cpufeatures",
 ]
 
 [[package]]
-name = "arraydeque"
-version = "0.4.5"
+name = "archmage-macros"
+version = "0.9.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8"
+checksum = "ce7707714970d5cf476caccbae2d282000c6c14ca5aada878e722a10d8e1c153"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
 [[package]]
 name = "ascii_tree"
@@ -118,6 +145,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6c635b3aa665c649ad1415f1573c85957dfa47690ec27aebe7ec17efe3c643"
 
+[[package]]
+name = "atomic_refcell"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e4227379beff4205943696e6c3e0cd809bacdf3f0edd6e3dd153e2269571a4"
+
 [[package]]
 name = "autocfg"
 version = "1.5.1"
@@ -126,30 +159,34 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base64"
-version = "0.22.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
+
+[[package]]
+name = "bcdec_rs"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f09c37bc0e9f0924b7dae9988265ef3c76c88538f41a3b06caf4bed07cee5226"
 
 [[package]]
 name = "bit-set"
-version = "0.8.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+dependencies = [
+ "borsh",
+ "serde",
+]
 
 [[package]]
 name = "bitflags"
@@ -184,6 +221,30 @@ dependencies = [
  "hybrid-array",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "borsh-derive",
+ "bytes",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "bstr"
 version = "1.13.1"
@@ -206,6 +267,20 @@ name = "bytemuck"
 version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
 
 [[package]]
 name = "byteorder"
@@ -219,6 +294,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
+[[package]]
+name = "bytes"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
+
 [[package]]
 name = "cbc"
 version = "0.2.1"
@@ -230,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.5.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f360145194ee8e21db5ee7f3fcd4fe52210864c75c985dae33218202c8bbe040"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -240,17 +321,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cfb"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3"
-dependencies = [
- "fnv",
- "uuid",
- "web-time",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.5"
@@ -315,7 +385,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -348,12 +418,6 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
 
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -387,36 +451,15 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
-
 [[package]]
 name = "crc32fast"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crunchy"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
-
 [[package]]
 name = "crypto-common"
 version = "0.2.2"
@@ -428,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "ctutils"
-version = "0.4.2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+checksum = "38d28fb6aa7dd680b3ffd1a3e64e115c177bdba63c0ae7f9cd48129ff05c4fa0"
 dependencies = [
  "cmov",
 ]
@@ -443,24 +486,25 @@ checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
 
 [[package]]
 name = "delharc"
-version = "0.6.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3658b90877f637514897c3dcbd628e0d290bcc7fee551a398b3994ebdc62d51e"
+checksum = "9cfdcd2bee8dc367afd9064f3b0849156a4c29fc70d98370dae62773594d04dd"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
+ "bytemuck",
  "chrono",
  "memchr",
 ]
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+checksum = "1b034bd7d5f032402a2479444dcc6f74e36a03f31854d41680fb240ef682a1ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -504,11 +548,46 @@ dependencies = [
  "simdutf8",
 ]
 
+[[package]]
+name = "enough"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877362cb7b70d1c617f0cd3c67708bd58d894a86af5104018e2c10ebaee3c02f"
+
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
+
+[[package]]
+name = "euclid"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
+dependencies = [
+ "num-traits",
+]
 
 [[package]]
 name = "exav-cli"
@@ -524,12 +603,13 @@ dependencies = [
 
 [[package]]
 name = "exav-core"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "base64",
  "bit-set",
  "crc32fast",
  "exav-imagehash",
+ "exav-render",
  "exav-unpack",
  "exav-x86",
  "goblin",
@@ -564,6 +644,7 @@ dependencies = [
  "exav-x86",
  "iced-x86",
  "libfuzzer-sys",
+ "zip",
 ]
 
 [[package]]
@@ -572,7 +653,7 @@ version = "0.0.0"
 
 [[package]]
 name = "exav-imagehash"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "exav-render",
  "image",
@@ -580,7 +661,7 @@ dependencies = [
 
 [[package]]
 name = "exav-pe-emu"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "exav-x86",
  "rustc-hash 2.1.3",
@@ -588,39 +669,42 @@ dependencies = [
 
 [[package]]
 name = "exav-render"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
+ "bcdec_rs",
  "bytemuck",
+ "encoding_rs",
  "exav-unpack",
  "fax",
  "flate2",
  "gif",
- "half",
  "hayro-ccitt",
  "hayro-jbig2",
  "hayro-jpeg2000",
  "image",
+ "lzma-rust2",
  "png",
+ "pulldown-cmark",
  "quick-error",
+ "quick-xml",
+ "ruzstd",
  "weezl",
- "zune-core 0.4.12",
- "zune-core 0.5.0",
+ "zenjxl-decoder",
+ "zip",
+ "zune-core 0.5.3",
  "zune-jpeg 0.4.21",
- "zune-jpeg 0.5.8",
+ "zune-jpeg 0.5.15",
 ]
 
 [[package]]
 name = "exav-unpack"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "aes",
- "apfs",
  "base64",
  "bitstream-io",
  "byteorder",
  "cbc",
- "cfb",
- "constant_time_eq",
  "crc32fast",
  "deflate64",
  "delharc",
@@ -628,13 +712,12 @@ dependencies = [
  "digest",
  "encoding_rs",
  "exav-pe-emu",
- "explode",
- "ext4-view",
- "fatfs",
  "flate2",
- "hfsplus",
+ "hayro-interpret",
+ "hayro-syntax",
  "hmac",
- "lzfse_rust",
+ "html5gum",
+ "kurbo",
  "lzma-rust2",
  "lznt1",
  "lzxd",
@@ -651,44 +734,19 @@ dependencies = [
  "tar",
  "thiserror",
  "tinyvec",
- "unshield",
  "xz4rust",
  "zip",
 ]
 
 [[package]]
 name = "exav-x86"
-version = "0.0.2"
-
-[[package]]
-name = "explode"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46695dd0a1b7a2a6c3e0800604bd9738c2699682b9fc325d4886b6c1a78025ac"
-dependencies = [
- "arraydeque",
-]
-
-[[package]]
-name = "ext4-view"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ecf6379b7cfeace5e109ccc51955afc05f5f7f2466ae0cf2697bda46afd01e6"
-dependencies = [
- "bitflags 2.13.2",
- "crc",
-]
+version = "0.0.3"
 
 [[package]]
-name = "fatfs"
-version = "0.3.6"
+name = "fastrand"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05669f8e7e2d7badc545c513710f0eba09c2fbef683eb859fd79c46c355048e0"
-dependencies = [
- "bitflags 1.3.2",
- "byteorder",
- "log",
-]
+checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "fax"
@@ -719,6 +777,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "fearless_simd"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3296eb97d869113eaf148a6bdf01884e90b3828ad7ae2340b0f93362fc158611"
+
 [[package]]
 name = "filetime"
 version = "0.2.29"
@@ -731,9 +795,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "flate2"
@@ -752,6 +816,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "font-types"
+version = "0.12.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835ae9d781464a79026cde387f9cbc650c9a4909d7cf7e658b127e3c35d2f35d"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "futures-core"
 version = "0.3.34"
@@ -808,17 +881,6 @@ dependencies = [
  "scroll",
 ]
 
-[[package]]
-name = "half"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
-dependencies = [
- "cfg-if",
- "crunchy",
- "zerocopy",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -849,12 +911,41 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2866f0d976e76497480b853d5e258dab6e4b89ecfe991124e08f15dfa8fd03ad"
 
+[[package]]
+name = "hayro-cmap"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d285dc30731c8485de5fa732fbdf2b3affdf01e4da7c2135022ca6fa664bf6"
+dependencies = [
+ "hayro-postscript",
+]
+
+[[package]]
+name = "hayro-interpret"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9df074ff163a63864cec9b0bf640ccbff8abf4e44481df7369ce0ac172ffbe"
+dependencies = [
+ "bitflags",
+ "hayro-cmap",
+ "hayro-syntax",
+ "kurbo",
+ "moxcms 0.8.1",
+ "phf",
+ "rustc-hash 2.1.3",
+ "siphasher",
+ "skrifa",
+ "smallvec",
+ "yoke",
+]
+
 [[package]]
 name = "hayro-jbig2"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000e025850f4592ddcaee85640db70704151f2bafd43b6f431aa5b6a2c6a35a9"
 dependencies = [
+ "fearless_simd",
  "hayro-ccitt",
 ]
 
@@ -863,23 +954,38 @@ name = "hayro-jpeg2000"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "122c5f834c37a2260b9c851bb8be685cf539b2a8b94b704a931ef7d2525d5835"
+dependencies = [
+ "fearless_simd",
+]
 
 [[package]]
-name = "heck"
-version = "0.5.0"
+name = "hayro-postscript"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "885c5ef0654933139a9b9546fc2c69e18d37f38aa2520f079092b1be18f1fcaa"
 
 [[package]]
-name = "hfsplus"
-version = "0.2.4"
+name = "hayro-syntax"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1003d8eed80d61e8e8ea6a958bbe1afd3aef060882b9d6134e50500dd307c0dc"
+checksum = "6cdc818d8d265dcb42081d488f7599df4f73fb79e9d347ecedcd3c23809d2026"
 dependencies = [
- "byteorder",
- "thiserror",
+ "flate2",
+ "hayro-ccitt",
+ "hayro-jbig2",
+ "hayro-jpeg2000",
+ "memchr",
+ "rustc-hash 2.1.3",
+ "smallvec",
+ "zune-jpeg 0.5.15",
 ]
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hmac"
 version = "0.13.0"
@@ -889,6 +995,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "html5gum"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "428502d3ec1742c35e015871aef742bc4722a9acfcb616b8ff79b519922e1c36"
+
 [[package]]
 name = "hybrid-array"
 version = "0.4.15"
@@ -942,7 +1054,7 @@ dependencies = [
  "color_quant",
  "gif",
  "image-webp",
- "moxcms",
+ "moxcms 0.7.11",
  "num-traits",
  "png",
  "qoi",
@@ -970,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "inout"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7"
+checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f"
 dependencies = [
  "block-padding",
  "hybrid-array",
@@ -1020,6 +1132,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "kurbo"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "polycool",
+ "smallvec",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.1"
@@ -1028,9 +1152,9 @@ checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -1080,17 +1204,11 @@ dependencies = [
  "logos-codegen",
 ]
 
-[[package]]
-name = "lzfse_rust"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5edeac3ec657925dececc672bdd58fa2212291886ddcb3e08aa46924c78340c6"
-
 [[package]]
 name = "lzma-rust2"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde178a3caf126c440fa15628147772d8ee590a39477d711353fbe2e58a73a5b"
+checksum = "f1c46f3fcd2e888afdb01a07efc071cb21300e07c68d32c3e8b01b5c8cb1fcaa"
 
 [[package]]
 name = "lznt1"
@@ -1171,6 +1289,16 @@ dependencies = [
  "pxfm",
 ]
 
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
 [[package]]
 name = "multiversion_no_op"
 version = "1.0.0"
@@ -1183,7 +1311,7 @@ version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -1198,6 +1326,17 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -1219,6 +1358,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pbkdf2"
 version = "0.13.0"
@@ -1229,6 +1374,48 @@ dependencies = [
  "hmac",
 ]
 
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
@@ -1247,13 +1434,53 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
  "crc32fast",
  "fdeflate",
  "flate2",
  "miniz_oxide 0.8.9",
 ]
 
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -1263,6 +1490,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "278e9268c93b9e498a2da46c34d90ba93a3255eb99009646398f34bc73ab36eb"
+dependencies = [
+ "bitflags",
+ "memchr",
+ "unicase",
+]
+
 [[package]]
 name = "pxfm"
 version = "0.1.30"
@@ -1286,9 +1524,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
 dependencies = [
  "memchr",
 ]
@@ -1308,6 +1546,17 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "read-fonts"
+version = "0.43.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "005c8acf251756c478b0bf402885bfd88a1476020c4c7e6060edc1aa68da38ea"
+dependencies = [
+ "bytemuck",
+ "font-types",
+ "once_cell",
+]
+
 [[package]]
 name = "regex"
 version = "1.13.1"
@@ -1389,12 +1638,15 @@ checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ruzstd"
-version = "0.8.3"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8"
-dependencies = [
- "twox-hash",
-]
+checksum = "69e4ce4a039f42bf25920b95667e4d789e98749ab11bbb8d2c2936f788421bb5"
+
+[[package]]
+name = "safe_unaligned_simd"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9c874fb993656d484725d58fbfddb39dfcf98ebcadc1a1d09568aa6b39bafba"
 
 [[package]]
 name = "salzweg"
@@ -1434,7 +1686,7 @@ checksum = "e1a36a382ed65dbcc0ab47fd5e9a94112417ccd34560a392ef3b7b0f0ec39148"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1464,14 +1716,14 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.152"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1741ab7a6cc54a03a89b5d563ed60075c277d9e3cfa73ad0c1f23f23974703c6"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -1493,9 +1745,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1520,12 +1772,40 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
+[[package]]
+name = "siphasher"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256"
+
+[[package]]
+name = "skrifa"
+version = "0.46.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4febebda507fb889c545a37a135517769d1391941013561292897961d1887d6"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
+[[package]]
+name = "smallvec"
+version = "1.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
 [[package]]
 name = "stringprep"
 version = "0.1.5"
@@ -1556,15 +1836,26 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.6"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "tar"
 version = "0.4.46"
@@ -1598,7 +1889,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -1614,16 +1905,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7184dfffa0d05e10284df327c6cb52f0d62c5aa6c9a8b9236fa151d4361882f1"
 
 [[package]]
-name = "twox-hash"
-version = "2.1.4"
+name = "toml_datetime"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.17+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5283634e518fe9e82c7b20520bb4bc209009fd16c82077c802f8111ecbb0117a"
+checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c"
+dependencies = [
+ "winnow",
+]
 
 [[package]]
 name = "typed-path"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e"
+checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c"
 
 [[package]]
 name = "typenum"
@@ -1631,6 +1946,12 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
+[[package]]
+name = "unicase"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
@@ -1639,15 +1960,15 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+checksum = "75cd3fb03d5288b3ba9a1ee103ac7e9cbb59f0b03d64f8ddfcc04dd42758a85d"
 dependencies = [
  "tinyvec",
 ]
@@ -1658,32 +1979,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 
-[[package]]
-name = "unshield"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd29bc2ffd8a674b7de402169d86b3c083229373d05c388526d626408416c5c"
-dependencies = [
- "byteorder",
- "explode",
-]
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "uuid"
-version = "1.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -1726,7 +2027,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 3.0.6",
+ "syn 3.0.9",
  "wasm-bindgen-shared",
 ]
 
@@ -1739,16 +2040,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "weezl"
 version = "0.1.12"
@@ -1764,6 +2055,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "winarm-cpufeatures"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d107c80dd656e1a2c254dfb1d57ece73b7f515b8a8684c270c23cab68f4a440d"
+
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -1832,6 +2129,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "winnow"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "xz4rust"
 version = "0.2.3"
@@ -1840,12 +2146,12 @@ checksum = "606930b71bad6379f366994e4e6252a3462fa28bfc3695c33b07bef8f967d6d6"
 
 [[package]]
 name = "yara-x-parser"
-version = "1.21.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22368f8704927061c57ab970df41972a38c8717da10b3973677457272ed7b7f"
+checksum = "89313553cc4cf8961c257d282c902da1d5de568cd656b39962bdf9edd1e3935e"
 dependencies = [
  "ascii_tree",
- "bitflags 2.13.2",
+ "bitflags",
  "bstr",
  "indexmap",
  "itertools",
@@ -1856,30 +2162,97 @@ dependencies = [
 ]
 
 [[package]]
-name = "zerocopy"
-version = "0.8.59"
+name = "yoke"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb"
+checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3"
 dependencies = [
- "zerocopy-derive",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
 ]
 
 [[package]]
-name = "zerocopy-derive"
-version = "0.8.59"
+name = "yoke-derive"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82"
+checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
 dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+ "synstructure",
+]
+
+[[package]]
+name = "zenjxl-decoder"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2d68502daf17b161b6fb73657f4a4c60ba5a0491846aae769e33b34dc5ec513"
+dependencies = [
+ "aligned-vec",
+ "array-init",
+ "atomic_refcell",
+ "bytemuck",
+ "byteorder",
+ "enough",
+ "num-derive",
+ "num-traits",
+ "paste",
+ "smallvec",
+ "thiserror",
+ "zenjxl-decoder-macros",
+ "zenjxl-decoder-simd",
+]
+
+[[package]]
+name = "zenjxl-decoder-macros"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d5f705a56b0a01d283503fbe7d5e3b3e51d7321b5f1bba7b07bdeea7e2c6f3d"
+dependencies = [
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "zenjxl-decoder-simd"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237f3740d3d098854c6008515cdff29d8cbadcb6b4e3a1582e28dd3a04e3213e"
+dependencies = [
+ "archmage",
+ "paste",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+ "synstructure",
+]
+
 [[package]]
 name = "zip"
-version = "9.0.1"
+version = "9.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49ade69c4434c55dd651d36fe05f38e0578db948b773cbc01c48c4b5e560692"
+checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e"
 dependencies = [
  "bitstream-io",
  "crc32fast",
@@ -1910,9 +2283,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
 name = "zune-core"
-version = "0.5.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b"
 
 [[package]]
 name = "zune-jpeg"
@@ -1925,9 +2298,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.5.8"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
 dependencies = [
- "zune-core 0.5.0",
+ "zune-core 0.5.3",
 ]
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 731abda5..fecedbfd 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -2,7 +2,7 @@
 name = "exav-fuzz"
 version = "0.0.0"
 publish = false
-edition = "2021"
+edition = "2024"
 
 [package.metadata]
 cargo-fuzz = true
@@ -25,8 +25,9 @@ exav-fuzz-support = { path = "support" }
 # `decrypt` is enabled so the decryption code paths (ZipCrypto/WinZip-AES, 7z
 # AES, PDF/DMG crypto) are compiled in and fuzzed, not skipped.
 # `checksums` verifies the archives' own CRCs, a path the default scan skips.
-# `image-hash` is `fuzzy_img#` subsignatures.
-exav-core = { path = "../crates/exav-core", default-features = false, features = ["unstable-internals", "all-formats", "decrypt", "dlp", "phishing", "yara", "image-hash", "checksums"] }
+# `image-hash` is `fuzzy_img#` subsignatures. `visible-text` (and `-pdf`) is a
+# document's text view.
+exav-core = { path = "../crates/exav-core", default-features = false, features = ["unstable-internals", "all-formats", "decrypt", "dlp", "phishing", "yara", "image-hash", "visible-text", "visible-text-pdf", "visible-text-office", "checksums"] }
 exav-unpack = { path = "../crates/exav-unpack", default-features = false, features = ["all-formats", "decrypt", "checksums"] }
 # The clamd and ICAP parsers, over memory (`exav_cli::fuzzing`): the source of
 # the `exav` binary built as a library, which `exav` itself does not ship.
@@ -45,8 +46,16 @@ exav-imagehash = { path = "../crates/exav-imagehash", default-features = false,
 # DWG and DXF, which @exav/viewer parses in the browser from whatever a user
 # opens; the scanner does not read them. Its PDF image decoders too (the
 # `imagehash` target), which the viewer runs in place of pdf.js's own.
-exav-render = { path = "../crates/exav-render", default-features = false, features = ["dwg", "image", "jp2", "jbig2", "ccitt", "ifc", "stl"] }
+#
+# The office converters too (`office`): XLS, ODS and Numbers to XLSX, PPT, ODP
+# and Keynote to PPTX, DOC, ODT, RTF, Word 2003 XML and Pages to DOCX, which
+# @exav/viewer converts in the browser from whatever a user opens; the
+# scanner does not read them this way. `office-test-util` is the compound file
+# writer the PPT and DOC targets store their input with.
+exav-render = { path = "../crates/exav-render", default-features = false, features = ["dwg", "image", "raw", "jp2", "jbig2", "ccitt", "jxl", "ifc", "stl", "obj", "ply", "gltf", "markdown", "text-pdf", "text-office", "office", "office-test-util"] }
 iced-x86 = { version = "1", default-features = false, features = ["std", "decoder"] }
+# `zip` wraps the Numbers target's input and reads the XLSX back.
+zip = { version = "9", default-features = false, features = ["deflate-flate2"] }
 
 # Keep fuzz binaries debuggable while optimized.
 [profile.release]
@@ -82,6 +91,27 @@ test = false
 doc = false
 bench = false
 
+[[bin]]
+name = "vdisk"
+path = "fuzz_targets/vdisk.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "fsimage"
+path = "fuzz_targets/fsimage.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "lzo"
+path = "fuzz_targets/lzo.rs"
+test = false
+doc = false
+bench = false
+
 [[bin]]
 name = "full_pipeline"
 path = "fuzz_targets/full_pipeline.rs"
@@ -187,6 +217,13 @@ test = false
 doc = false
 bench = false
 
+[[bin]]
+name = "raw_preview"
+path = "fuzz_targets/raw_preview.rs"
+test = false
+doc = false
+bench = false
+
 [[bin]]
 name = "sigs"
 path = "fuzz_targets/sigs.rs"
@@ -252,3 +289,129 @@ path = "fuzz_targets/ifc.rs"
 test = false
 doc = false
 bench = false
+
+[[bin]]
+name = "mesh"
+path = "fuzz_targets/mesh.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "visible_text"
+path = "fuzz_targets/visible_text.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "markdown"
+path = "fuzz_targets/markdown.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "sheets_xls"
+path = "fuzz_targets/sheets_xls.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "sheets_ods"
+path = "fuzz_targets/sheets_ods.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "sheets_numbers"
+path = "fuzz_targets/sheets_numbers.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "sheets_text"
+path = "fuzz_targets/sheets_text.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "slides_ppt"
+path = "fuzz_targets/slides_ppt.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "slides_odp"
+path = "fuzz_targets/slides_odp.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "slides_odg"
+path = "fuzz_targets/slides_odg.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "slides_vsdx"
+path = "fuzz_targets/slides_vsdx.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "slides_keynote"
+path = "fuzz_targets/slides_keynote.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "docs_doc"
+path = "fuzz_targets/docs_doc.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "docs_odt"
+path = "fuzz_targets/docs_odt.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "docs_rtf"
+path = "fuzz_targets/docs_rtf.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "docs_wml"
+path = "fuzz_targets/docs_wml.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "docs_html"
+path = "fuzz_targets/docs_html.rs"
+test = false
+doc = false
+bench = false
+
+[[bin]]
+name = "docs_pages"
+path = "fuzz_targets/docs_pages.rs"
+test = false
+doc = false
+bench = false
diff --git a/fuzz/db.rs b/fuzz/db.rs
index d7c12b27..83579f61 100644
--- a/fuzz/db.rs
+++ b/fuzz/db.rs
@@ -5,7 +5,7 @@
 
 use std::sync::{Arc, OnceLock};
 
-use exav_core::{loader, Scanner};
+use exav_core::{Scanner, loader};
 
 /// Every file of `fuzz/db/`, by the extension the loader routes it on.
 pub const FILES: &[(&str, &[u8])] = &[
@@ -53,8 +53,16 @@ fn built() -> &'static Arc<Scanner> {
         }
         let db = b.build().expect("the fuzz signature files build");
         // A line the loader rejects is a line no input reaches.
-        assert_eq!(db.unsupported_count(), 0, "a signature of fuzz/db/ does not load");
-        let yara = FILES.iter().find(|(e, _)| *e == "yar").expect("a YARA file").1;
+        assert_eq!(
+            db.unsupported_count(),
+            0,
+            "a signature of fuzz/db/ does not load"
+        );
+        let yara = FILES
+            .iter()
+            .find(|(e, _)| *e == "yar")
+            .expect("a YARA file")
+            .1;
         exav_core::yara::compile(std::str::from_utf8(yara).expect("UTF-8"))
             .unwrap_or_else(|e| panic!("a rule of fuzz/db/fuzz.yar does not compile: {e}"));
         Arc::new(db)
diff --git a/fuzz/dicts/markdown.dict b/fuzz/dicts/markdown.dict
new file mode 100644
index 00000000..fe1d3432
--- /dev/null
+++ b/fuzz/dicts/markdown.dict
@@ -0,0 +1,51 @@
+# Markdown's own punctuation, for the markdown target.
+"# "
+"###### "
+"> "
+">>"
+"- "
+"* "
+"+ "
+"1. "
+"10) "
+"```"
+"~~~"
+"    "
+"---"
+"***"
+"___"
+"===\x0a"
+"**"
+"__"
+"~~"
+"*"
+"_"
+"`"
+"``"
+"["
+"]"
+"]("
+"]: "
+"[]"
+"![]("
+"<"
+"<https://example.com>"
+"<me@example.com>"
+"https://example.com"
+"mailto:"
+"javascript:"
+"https://user:pass@example.com/"
+"<script>"
+"<!--"
+"<div>"
+"&amp;"
+"&#x41;"
+"&hearts;"
+"\\"
+"\\\x0a"
+"  \x0a"
+"|"
+"|-|-|\x0a"
+"|:-:|\x0a"
+"\x0a\x0a"
+"\x09"
diff --git a/fuzz/exav-cli/Cargo.toml b/fuzz/exav-cli/Cargo.toml
index 409c7ac8..0dc3f790 100644
--- a/fuzz/exav-cli/Cargo.toml
+++ b/fuzz/exav-cli/Cargo.toml
@@ -2,7 +2,7 @@
 name = "exav-cli"
 version = "0.0.0"
 publish = false
-edition = "2021"
+edition = "2024"
 description = "crates/exav's src/main.rs built as a library, for the fuzz targets that drive the clamd and ICAP parsers. Not published: `exav` itself ships no library."
 
 # The same file the `exav` binary is built from, so what is fuzzed is what
@@ -29,10 +29,10 @@ http-update = []
 # here fails this crate's build, which is how it is noticed.
 [dependencies]
 exav-core = { path = "../../crates/exav-core", default-features = false }
-clap = { version = "4.5", features = ["derive", "env"] }
+clap = { version = "4.6", features = ["derive", "env"] }
 walkdir = "2.5"
-libc = "0.2.186"
-regex = "1.12.4"
+libc = "0.2.191"
+regex = "1.13.1"
 serde_json = "1"
 
 [lints.rust]
diff --git a/fuzz/fuzz_targets/analyze.rs b/fuzz/fuzz_targets/analyze.rs
index ce27a3f6..4ac74576 100644
--- a/fuzz/fuzz_targets/analyze.rs
+++ b/fuzz/fuzz_targets/analyze.rs
@@ -29,6 +29,7 @@ libfuzzer_sys::fuzz_mutator!(|data: &mut [u8], size: usize, max_size: usize, see
 });
 
 fuzz_target!(|data: &[u8]| {
+    exav_fuzz_support::panics::contained_panics();
     let (body, bits) = frame::trailer(data);
     let _ = analyze(db::scanner(), body, &options::scan_options(bits));
 });
diff --git a/fuzz/fuzz_targets/authenticode.rs b/fuzz/fuzz_targets/authenticode.rs
index cc8fae68..f29091a2 100644
--- a/fuzz/fuzz_targets/authenticode.rs
+++ b/fuzz/fuzz_targets/authenticode.rs
@@ -28,16 +28,25 @@ fuzz_target!(|data: &[u8]| {
         let subject = hex(&cert.subject_sha1);
         let mut by_subject = CrbDb::default();
         by_subject.parse_into(&format!("Fuzz.Cert;0;{subject};\n"));
-        assert!(by_subject.blocked(cert).is_some(), "a list naming the subject does not block it");
+        assert!(
+            by_subject.blocked(cert).is_some(),
+            "a list naming the subject does not block it"
+        );
 
         let mut by_serial = CrbDb::default();
         by_serial.parse_into(&format!("Fuzz.Cert;0;{subject};{};\n", cert.serial_hex));
-        assert!(by_serial.blocked(cert).is_some(), "a list naming the subject and serial does not block it");
+        assert!(
+            by_serial.blocked(cert).is_some(),
+            "a list naming the subject and serial does not block it"
+        );
 
         let mut other = CrbDb::default();
         let mut elsewhere = cert.subject_sha1;
         elsewhere[0] ^= 1;
         other.parse_into(&format!("Fuzz.Cert;0;{};\n", hex(&elsewhere)));
-        assert!(other.blocked(cert).is_none(), "a list naming another subject blocks it");
+        assert!(
+            other.blocked(cert).is_none(),
+            "a list naming another subject blocks it"
+        );
     }
 });
diff --git a/fuzz/fuzz_targets/clamd.rs b/fuzz/fuzz_targets/clamd.rs
index c6b17211..6b0f24ef 100644
--- a/fuzz/fuzz_targets/clamd.rs
+++ b/fuzz/fuzz_targets/clamd.rs
@@ -16,7 +16,7 @@
 //! the protocol's words (`OK`, `FOUND`, `ERROR` for a verdict that is partial):
 //! the daemon and the library are one scanner (`tests/suites/one_scan.rs`).
 use arbitrary::Arbitrary;
-use exav_core::{analyze, ScanOptions, VerdictCategory};
+use exav_core::{ScanOptions, VerdictCategory, analyze};
 use libfuzzer_sys::fuzz_target;
 
 #[path = "../db.rs"]
@@ -75,7 +75,12 @@ impl Stream {
         {
             return None;
         }
-        Some(self.chunks.iter().flat_map(|c| c.data.iter().copied()).collect())
+        Some(
+            self.chunks
+                .iter()
+                .flat_map(|c| c.data.iter().copied())
+                .collect(),
+        )
     }
 }
 
@@ -190,24 +195,26 @@ fuzz_target!(|data: &[u8]| {
     // A single stream, sent plainly: the daemon's answer is the library's.
     if let ([Command::Instream(s) | Command::ExInstream(s)], Session::None) =
         (connection.commands.as_slice(), &connection.session)
+        && let Some(bytes) = s.honest()
     {
-        if let Some(bytes) = s.honest() {
-            let want = status(analyze(db::scanner(), &bytes, &opts).verdict.category());
-            let reply = String::from_utf8_lossy(&out);
-            let reply = reply.trim_end_matches(['\n', '\0']);
-            let got = if matches!(connection.commands[0], Command::Instream(_)) {
-                reply.rsplit(' ').next().unwrap_or("")
-            } else {
-                // `{"v":1,"status":"OK"}`: the field's value.
-                reply
-                    .split("\"status\":\"")
-                    .nth(1)
-                    .and_then(|s| s.split('"').next())
-                    .unwrap_or("")
-            };
-            // The JSON says PARTIAL where the line says ERROR.
-            let got = if got == "PARTIAL" { "ERROR" } else { got };
-            assert_eq!(got, want, "the daemon said {reply:?} of bytes analyze calls {want}");
-        }
+        let want = status(analyze(db::scanner(), &bytes, &opts).verdict.category());
+        let reply = String::from_utf8_lossy(&out);
+        let reply = reply.trim_end_matches(['\n', '\0']);
+        let got = if matches!(connection.commands[0], Command::Instream(_)) {
+            reply.rsplit(' ').next().unwrap_or("")
+        } else {
+            // `{"v":1,"status":"OK"}`: the field's value.
+            reply
+                .split("\"status\":\"")
+                .nth(1)
+                .and_then(|s| s.split('"').next())
+                .unwrap_or("")
+        };
+        // The JSON says PARTIAL where the line says ERROR.
+        let got = if got == "PARTIAL" { "ERROR" } else { got };
+        assert_eq!(
+            got, want,
+            "the daemon said {reply:?} of bytes analyze calls {want}"
+        );
     }
 });
diff --git a/fuzz/fuzz_targets/database.rs b/fuzz/fuzz_targets/database.rs
index ce317198..398336a6 100644
--- a/fuzz/fuzz_targets/database.rs
+++ b/fuzz/fuzz_targets/database.rs
@@ -10,7 +10,7 @@
 //! The seed is a database written by `scripts/fuzz-seeds.sh` from `fuzz/db/`.
 //! Checked beyond "does not panic": a database that reads scans, and writes
 //! back to one that reads and scans the same.
-use exav_core::{analyze, database, ScanOptions};
+use exav_core::{ScanOptions, analyze, database};
 use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
@@ -26,5 +26,9 @@ fuzz_target!(|data: &[u8]| {
         return;
     }
     let back = database::read(again.as_slice()).expect("a database written out reads");
-    assert_eq!(analyze(&back, sample, &opts).verdict, first, "a database read, written and read scans differently");
+    assert_eq!(
+        analyze(&back, sample, &opts).verdict,
+        first,
+        "a database read, written and read scans differently"
+    );
 });
diff --git a/fuzz/fuzz_targets/docs_check.rs b/fuzz/fuzz_targets/docs_check.rs
new file mode 100644
index 00000000..2c8672ea
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_check.rs
@@ -0,0 +1,55 @@
+//! What the docs targets check of a conversion that succeeds.
+use std::io::Read;
+
+use exav_render::docs::{Format, Limits, convert};
+
+/// Converts `doc` and checks the DOCX.
+pub fn run(doc: &[u8], format: Format) {
+    let limits = limits();
+    let Ok(c) = convert(doc, format, &limits) else {
+        return;
+    };
+    docx(&c.docx, &limits);
+}
+
+/// Smaller than the converter's defaults, to keep runs short; the bounds
+/// are what is tested, not their size.
+pub fn limits() -> Limits {
+    Limits::default()
+        .with_max_paragraphs(20_000)
+        .with_max_cells(20_000)
+        .with_max_memory(64 << 20)
+}
+
+/// A DOCX package within the memory limit, whose parts the viewer reads
+/// first are there, and whose XML parts are XML without a C0 control
+/// character.
+pub fn docx(bytes: &[u8], limits: &Limits) {
+    assert!(bytes.len() as u64 <= limits.max_memory);
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).expect("a ZIP");
+    for part in [
+        "[Content_Types].xml",
+        "_rels/.rels",
+        "word/document.xml",
+        "word/styles.xml",
+    ] {
+        assert!(z.index_for_name(part).is_some(), "{part}");
+    }
+    for i in 0..z.len() {
+        let mut f = z.by_index(i).expect("a part");
+        let name = f.name().map(|n| n.to_string()).unwrap_or_default();
+        if !(name.ends_with(".xml") || name.ends_with(".rels")) {
+            continue;
+        }
+        let mut s = String::new();
+        f.read_to_string(&mut s)
+            .unwrap_or_else(|_| panic!("{name}: UTF-8"));
+        assert!(s.starts_with("<?xml"), "{name}");
+        // No C0 control character but white space: XML 1.0 refuses them.
+        assert!(
+            !s.chars()
+                .any(|c| (c as u32) < 0x20 && !matches!(c, '\t' | '\n' | '\r')),
+            "{name}"
+        );
+    }
+}
diff --git a/fuzz/fuzz_targets/docs_doc.rs b/fuzz/fuzz_targets/docs_doc.rs
new file mode 100644
index 00000000..efb71229
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_doc.rs
@@ -0,0 +1,28 @@
+#![no_main]
+//! Word 97 to 2003 documents on hostile bytes: exav-render's `docs` DOC
+//! reader (the lenient compound file reader, the FIB, the piece table, the
+//! character and paragraph FKPs, the sprms, the stylesheet, lists, sections,
+//! tables, notes, comments, fields, the OfficeArt layer) and the DOCX
+//! writer. A compound file is read as it is; any other input is stored as
+//! its `WordDocument` stream in one built here, next to the table streams
+//! made of the input's second half, so that the fuzzer mutates the
+//! structures and not the compound file around them. Every panic is a
+//! finding, and so is an output that is not a DOCX.
+use exav_render::docs::Format;
+use exav_render::formats::office::test_util::build_cfb as build;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "docs_check.rs"]
+mod docs_check;
+
+const CFB: &[u8] = &[0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1];
+
+fuzz_target!(|data: &[u8]| {
+    let doc = if data.starts_with(CFB) {
+        data.to_vec()
+    } else {
+        let (word, table) = data.split_at(data.len() / 2);
+        build(&[("WordDocument", word), ("0Table", table), ("1Table", table)])
+    };
+    docs_check::run(&doc, Format::Doc);
+});
diff --git a/fuzz/fuzz_targets/docs_html.rs b/fuzz/fuzz_targets/docs_html.rs
new file mode 100644
index 00000000..f10a170b
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_html.rs
@@ -0,0 +1,15 @@
+#![no_main]
+//! Web pages as documents on hostile bytes: exav-render's `docs` HTML reader
+//! (Word's "Save as Web Page", its MIME form, and other pages: the tokenizer,
+//! style sheets, tables with spans, lists, links, pictures in `data:` addresses
+//! and MIME parts) and the DOCX writer. Every panic is a finding, and so is an
+//! output that is not a DOCX.
+use exav_render::docs::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "docs_check.rs"]
+mod docs_check;
+
+fuzz_target!(|data: &[u8]| {
+    docs_check::run(data, Format::Html);
+});
diff --git a/fuzz/fuzz_targets/docs_odt.rs b/fuzz/fuzz_targets/docs_odt.rs
new file mode 100644
index 00000000..c8958754
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_odt.rs
@@ -0,0 +1,20 @@
+#![no_main]
+//! OpenDocument text on hostile bytes: exav-render's `docs` ODT and
+//! FODT readers (the XML tree's bounds, automatic and named styles and their
+//! parents, master pages, lists, tables, frames, pictures, notes, fields)
+//! and the DOCX writer. A ZIP is read as ODT, anything else as FODT. Every
+//! panic is a finding, and so is an output that is not a DOCX.
+use exav_render::docs::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "docs_check.rs"]
+mod docs_check;
+
+fuzz_target!(|data: &[u8]| {
+    let format = if data.starts_with(b"PK") {
+        Format::Odt
+    } else {
+        Format::Fodt
+    };
+    docs_check::run(data, format);
+});
diff --git a/fuzz/fuzz_targets/docs_pages.rs b/fuzz/fuzz_targets/docs_pages.rs
new file mode 100644
index 00000000..baa5ed0c
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_pages.rs
@@ -0,0 +1,32 @@
+#![no_main]
+//! Apple Pages documents on hostile bytes: exav-render's `docs` IWA reader
+//! (ZIP, Snappy, protobuf, the text storages, styles, page geometry) and
+//! the DOCX writer. The input is an IWA stream, stored as
+//! `Index/Document.iwa` in a ZIP here so that the fuzzer mutates the
+//! archives and not the ZIP around them, or a whole document when it is a
+//! ZIP. Every panic is a finding, and so is an output that is not a DOCX.
+use std::io::Write;
+
+use exav_render::docs::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "docs_check.rs"]
+mod docs_check;
+
+fuzz_target!(|data: &[u8]| {
+    let doc = if data.starts_with(b"PK") {
+        data.to_vec()
+    } else {
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        let opts = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        if z.start_file("Index/Document.iwa", opts).is_err() || z.write_all(data).is_err() {
+            return;
+        }
+        match z.finish() {
+            Ok(c) => c.into_inner(),
+            Err(_) => return,
+        }
+    };
+    docs_check::run(&doc, Format::Pages);
+});
diff --git a/fuzz/fuzz_targets/docs_rtf.rs b/fuzz/fuzz_targets/docs_rtf.rs
new file mode 100644
index 00000000..fa788dac
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_rtf.rs
@@ -0,0 +1,15 @@
+#![no_main]
+//! Rich Text Format on hostile bytes: exav-render's `docs` RTF reader
+//! (the tokenizer, the group stack and its destinations, font and color tables,
+//! code pages, `\u` and its skip count, list tables, tables, fields,
+//! pictures in hex and `\bin`, notes, headers) and the DOCX writer. Every
+//! panic is a finding, and so is an output that is not a DOCX.
+use exav_render::docs::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "docs_check.rs"]
+mod docs_check;
+
+fuzz_target!(|data: &[u8]| {
+    docs_check::run(data, Format::Rtf);
+});
diff --git a/fuzz/fuzz_targets/docs_wml.rs b/fuzz/fuzz_targets/docs_wml.rs
new file mode 100644
index 00000000..ff954102
--- /dev/null
+++ b/fuzz/fuzz_targets/docs_wml.rs
@@ -0,0 +1,14 @@
+#![no_main]
+//! Word 2003 XML on hostile bytes: exav-render's `docs` WordprocessingML
+//! 2003 reader (UTF-8 and UTF-16 input, styles, lists, sections, tables, fields,
+//! `binData` pictures, comments) and the DOCX writer. Every panic is a
+//! finding, and so is an output that is not a DOCX.
+use exav_render::docs::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "docs_check.rs"]
+mod docs_check;
+
+fuzz_target!(|data: &[u8]| {
+    docs_check::run(data, Format::Wml2003);
+});
diff --git a/fuzz/fuzz_targets/filetype.rs b/fuzz/fuzz_targets/filetype.rs
index 3aecd498..a2df52ba 100644
--- a/fuzz/fuzz_targets/filetype.rs
+++ b/fuzz/fuzz_targets/filetype.rs
@@ -1,7 +1,7 @@
 #![no_main]
 //! Content-based file-type identification on hostile bytes.
-use libfuzzer_sys::fuzz_target;
 use exav_core::filetype;
+use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
     let _ = filetype::identify(data);
diff --git a/fuzz/fuzz_targets/fsimage.rs b/fuzz/fuzz_targets/fsimage.rs
new file mode 100644
index 00000000..f56ad419
--- /dev/null
+++ b/fuzz/fuzz_targets/fsimage.rs
@@ -0,0 +1,131 @@
+#![no_main]
+//! Filesystem images on hostile bytes: ext2/3/4, exFAT, SquashFS, cramfs, romfs
+//! and EROFS, each walked in place over a `Read + Seek`, and a partitioned disk
+//! holding any of them (a volume over the buffer limit is walked where it lies,
+//! under the name of its partition). With them the three archives that are read
+//! where they lie on a seekable source rather than held: 7z, WIM and xar. The
+//! budgets are small, so the declared sizes of an image, a directory or a file
+//! of a few KiB are over them.
+//!
+//! The first byte picks the format (above the list: all of them); the rest is the
+//! image. Each is walked twice, from memory and through a block cache of tiny
+//! blocks, and the two must find the same members and end the same way: a read
+//! that depends on where the cache's blocks fall is a bug. A third walk, again
+//! from memory, must find the same as the first: nothing may depend on what an
+//! earlier walk left behind. No member held whole may pass the buffer limit, and
+//! no walk may end as a decoder that panicked.
+//!
+//! Seeds: `fuzz/seeds/fsimage` (small images of each, made by the script in that
+//! directory, and the same behind a partition table), via `scripts/fuzz-seeds.sh`.
+use exav_fuzz_support::extreme;
+use exav_unpack::source::BlockCache;
+use exav_unpack::{Budget, ByteSource, Format, LimitHit, Limits, Member, walk};
+use libfuzzer_sys::fuzz_target;
+use std::io::Cursor;
+
+libfuzzer_sys::fuzz_mutator!(|data: &mut [u8], size: usize, max_size: usize, seed: u32| {
+    if extreme::set_extreme_field(data, size, seed) {
+        size
+    } else {
+        libfuzzer_sys::fuzzer_mutate(data, size, max_size)
+    }
+});
+
+const FORMATS: [Format; 10] = [
+    Format::Ext,
+    Format::Exfat,
+    Format::Squashfs,
+    Format::Cramfs,
+    Format::Romfs,
+    Format::Erofs,
+    Format::Partition,
+    Format::SevenZip,
+    Format::Wim,
+    Format::Xar,
+];
+
+const BUFFER: u64 = 64 * 1024;
+
+fn limits() -> Limits {
+    let mut l = Limits::default();
+    l.max_buffer_bytes = BUFFER;
+    l.max_extracted_bytes = 1024 * 1024;
+    l.max_scanned_bytes = 4 * 1024 * 1024;
+    l.max_members = 400;
+    l.max_recursion = 2;
+    l
+}
+
+/// What a walk found: each member's name, size and whether it was reported, and
+/// how the walk ended.
+type Found = (Vec<(String, usize, bool)>, Result<(), LimitHit>);
+
+fn found(fmt: Format, src: &dyn ByteSource) -> Found {
+    let mut budget = Budget::new(limits());
+    let mut out = Vec::new();
+    let end = walk(fmt, src, &mut budget, &mut |meta, content, _| {
+        let n = match content {
+            None => 0,
+            Some(Member::Bytes(b)) => {
+                assert!(
+                    b.len() as u64 <= BUFFER,
+                    "{}: a member held whole passes the buffer limit",
+                    meta.name
+                );
+                b.len()
+            }
+            Some(Member::Stream(r)) => {
+                let mut n = 0;
+                let mut buf = [0u8; 8192];
+                // A stream is bounded by the scan budget it is read under.
+                while let Ok(k) = r.read(&mut buf) {
+                    if k == 0 {
+                        break;
+                    }
+                    n += k;
+                }
+                n
+            }
+        };
+        out.push((meta.name.clone(), n, meta.unsupported.is_some()));
+        None::<()>
+    });
+    if let Err(hit) = &end {
+        // Error texts may echo input bytes, so match the walk's own wording.
+        assert!(
+            !hit.reason.ends_with(" decoder panicked on malformed input"),
+            "{fmt:?}: {}",
+            hit.reason
+        );
+    }
+    (out, end.map(|_| ()))
+}
+
+fuzz_target!(|data: &[u8]| {
+    let Some((&pick, image)) = data.split_first() else {
+        return;
+    };
+    let pick = usize::from(pick);
+    let all: &[Format] = &FORMATS;
+    let one = [FORMATS[pick % FORMATS.len()]];
+    let formats: &[Format] = if pick < FORMATS.len() { &one } else { all };
+    for &fmt in formats {
+        let mem = found(fmt, &image);
+        let cached = BlockCache::with_sizes(Cursor::new(image.to_vec()), 512, 8 * 1024).unwrap();
+        let via_cache = found(fmt, &cached);
+        // The same members, in the same order; the same end, or both ended in an
+        // error (its text names offsets the cache does not change, but not what
+        // a block boundary does).
+        assert_eq!(
+            mem.0, via_cache.0,
+            "{fmt:?}: the cache changed what was found"
+        );
+        assert_eq!(
+            mem.1.is_err(),
+            via_cache.1.is_err(),
+            "{fmt:?}: the cache changed how the walk ended"
+        );
+        let again = found(fmt, &image);
+        assert_eq!(mem.0, again.0, "{fmt:?}: a second walk found something else");
+    }
+});
diff --git a/fuzz/fuzz_targets/full_pipeline.rs b/fuzz/fuzz_targets/full_pipeline.rs
index c3f6ef83..a9f9490d 100644
--- a/fuzz/fuzz_targets/full_pipeline.rs
+++ b/fuzz/fuzz_targets/full_pipeline.rs
@@ -27,8 +27,8 @@
 use std::io::{Cursor, Read, Seek, SeekFrom};
 
 use exav_core::{
-    analyze, analyze_all_with_outcome, database, loader, scan_seekable, AllMatchOutcome, ScanReport,
-    Scanner, Verdict, VerdictCategory,
+    AllMatchOutcome, ScanReport, Scanner, Verdict, VerdictCategory, analyze,
+    analyze_all_with_outcome, database, loader, scan_seekable,
 };
 use exav_fuzz_support::{extreme, frame};
 use libfuzzer_sys::fuzz_target;
@@ -86,6 +86,7 @@ fn roundtrip(db: &Scanner) -> Option<Scanner> {
 }
 
 fuzz_target!(|data: &[u8]| {
+    exav_fuzz_support::panics::contained_panics();
     let Some(f) = frame::parse(data) else {
         return;
     };
@@ -127,8 +128,15 @@ fuzz_target!(|data: &[u8]| {
             }
         }
         VerdictCategory::Clean => {
-            assert!(names.is_empty(), "analyze says clean, analyze_all lists {names:?}");
-            assert_eq!(outcome, AllMatchOutcome::Complete, "analyze says clean, analyze_all did not finish");
+            assert!(
+                names.is_empty(),
+                "analyze says clean, analyze_all lists {names:?}"
+            );
+            assert_eq!(
+                outcome,
+                AllMatchOutcome::Complete,
+                "analyze says clean, analyze_all did not finish"
+            );
         }
         VerdictCategory::Partial => {
             assert!(
@@ -141,9 +149,10 @@ fuzz_target!(|data: &[u8]| {
 
     // One scan from any source, within the limit that decides how it is read.
     let len = scan.len() as u64;
-    if len <= opts.deep_analysis_max && opts.max_scan_size.map_or(true, |m| len <= m) {
+    if len <= opts.deep_analysis_max && opts.max_scan_size.is_none_or(|m| len <= m) {
         let reader = Pieces(Cursor::new(scan), 1 + scan.len() % 7);
-        let streamed = scan_seekable(db, reader, len, &opts).expect("a memory reader does not fail");
+        let streamed =
+            scan_seekable(db, reader, len, &opts).expect("a memory reader does not fail");
         same("a stream and a buffer", &first, &streamed);
     }
 
diff --git a/fuzz/fuzz_targets/icap.rs b/fuzz/fuzz_targets/icap.rs
index 5d9b7e08..f8adcc16 100644
--- a/fuzz/fuzz_targets/icap.rs
+++ b/fuzz/fuzz_targets/icap.rs
@@ -15,7 +15,7 @@
 //! `analyze` calls the bytes anything but clean, and is not when it calls them
 //! clean (`crates/exav/src/icap/mod.rs`, the verdict table).
 use arbitrary::Arbitrary;
-use exav_core::{analyze, ScanOptions, VerdictCategory};
+use exav_core::{ScanOptions, VerdictCategory, analyze};
 use libfuzzer_sys::fuzz_target;
 
 #[path = "../db.rs"]
@@ -114,7 +114,10 @@ impl Body {
             && !self.ieof
             && self.trailer.is_empty()
             && matches!(self.eol, Eol::Crlf)
-            && self.chunks.iter().all(|c| c.lie == 0 && c.extension.is_none());
+            && self
+                .chunks
+                .iter()
+                .all(|c| c.lie == 0 && c.extension.is_none());
         plain.then(|| {
             self.chunks
                 .iter()
@@ -177,7 +180,10 @@ impl Request {
             Offsets::Raw(s) => s.clone(),
         };
 
-        out.extend_from_slice(format!("{method} icap://127.0.0.1/{service} ICAP/1.0\r\nHost: 127.0.0.1\r\n").as_bytes());
+        out.extend_from_slice(
+            format!("{method} icap://127.0.0.1/{service} ICAP/1.0\r\nHost: 127.0.0.1\r\n")
+                .as_bytes(),
+        );
         if self.allow_204 {
             out.extend_from_slice(b"Allow: 204\r\n");
         }
@@ -236,14 +242,21 @@ fuzz_target!(|data: &[u8]| {
     let opts = options();
     let out = exav_cli::fuzzing::icap(&input, db::shared(), &opts);
 
-    if let [only] = requests.as_slice() {
-        if let Some(body) = only.plain_body() {
-            if body.is_empty() {
-                return;
-            }
-            let blocked = analyze(db::scanner(), &body, &opts).verdict.category() != VerdictCategory::Clean;
-            let said = String::from_utf8_lossy(&out).contains("X-Infection-Found:");
-            assert_eq!(said, blocked, "ICAP said {:?} of bytes analyze judges {:?}", String::from_utf8_lossy(&out), blocked);
+    if let [only] = requests.as_slice()
+        && let Some(body) = only.plain_body()
+    {
+        if body.is_empty() {
+            return;
         }
+        let blocked =
+            analyze(db::scanner(), &body, &opts).verdict.category() != VerdictCategory::Clean;
+        let said = String::from_utf8_lossy(&out).contains("X-Infection-Found:");
+        assert_eq!(
+            said,
+            blocked,
+            "ICAP said {:?} of bytes analyze judges {:?}",
+            String::from_utf8_lossy(&out),
+            blocked
+        );
     }
 });
diff --git a/fuzz/fuzz_targets/imagehash.rs b/fuzz/fuzz_targets/imagehash.rs
index 9a3b62b6..7fd37bb6 100644
--- a/fuzz/fuzz_targets/imagehash.rs
+++ b/fuzz/fuzz_targets/imagehash.rs
@@ -6,15 +6,22 @@
 //! pdf.js, with parameters taken from the input's length (JBIG2 with and
 //! without a globals stream).
 use exav_imagehash::{Hasher, Params};
-use exav_render::pdf_image::{decode_ccitt, decode_jbig2, decode_jpx, CcittParams, JpxParams};
+use exav_render::pdf_image::{CcittParams, JpxParams, decode_ccitt, decode_jbig2, decode_jpx};
 use libfuzzer_sys::fuzz_target;
 
 const BUDGET: u64 = 64 << 20;
 
+/// What the hasher may decode: the grey conversion and resize of a 16 MiB
+/// image took 10 s under the sanitizer for 805 bytes of JPEG (0.4 s in
+/// release), and what they cost is not what the target looks for. The decoders
+/// still get `BUDGET` through `decode_any` below.
+const HASH_BUDGET: u64 = 4 << 20;
+
 fuzz_target!(|data: &[u8]| {
+    exav_fuzz_support::panics::contained_panics();
     for p in [Params::CLAMAV, Params::IMAGEHASH_PHASH] {
         let h = Hasher::with_params(Params {
-            max_decode_bytes: BUDGET,
+            max_decode_bytes: HASH_BUDGET,
             ..p
         })
         .expect("valid parameters");
diff --git a/fuzz/fuzz_targets/lzo.rs b/fuzz/fuzz_targets/lzo.rs
new file mode 100644
index 00000000..c4505abe
--- /dev/null
+++ b/fuzz/fuzz_targets/lzo.rs
@@ -0,0 +1,53 @@
+#![no_main]
+//! The LZO1X decoder on hostile bytes, as SquashFS feeds it. The first two bytes
+//! are the most it may write; the rest is the stream.
+//!
+//! Checked: it never panics, never writes more than it may, and what it
+//! writes is a function of the stream alone. A stream of literals, which the
+//! decoder must give back as they are, is built from the same bytes and checked
+//! too: the encoding of a run of literals is the one instruction whose length
+//! has three forms.
+use libfuzzer_sys::fuzz_target;
+
+/// The LZO1X stream of `data` as literals only, ended as a stream is.
+fn literals(data: &[u8]) -> Vec<u8> {
+    let mut s = Vec::new();
+    match data.len() {
+        0 => {}
+        // A first byte of 17 and more says how many follow it, 1 to 238.
+        n @ 1..=238 => {
+            s.push(17 + n as u8);
+            s.extend_from_slice(data);
+        }
+        n => {
+            // 0, then the run less 18 in bytes of 255 and one more, then the
+            // run: a run of 3 + t bytes, t being 15 and what is written.
+            s.push(0);
+            let mut t = n - 18;
+            while t > 255 {
+                s.push(0);
+                t -= 255;
+            }
+            s.push(t as u8);
+            s.extend_from_slice(data);
+        }
+    }
+    s.extend_from_slice(&[0x11, 0, 0]);
+    s
+}
+
+fuzz_target!(|data: &[u8]| {
+    let Some((head, stream)) = data.split_at_checked(2) else {
+        return;
+    };
+    let max = usize::from(u16::from_le_bytes([head[0], head[1]]));
+    if let Ok(out) = exav_unpack::lzo_decompress(stream, max) {
+        assert!(out.len() <= max, "wrote {} of at most {max}", out.len());
+        assert_eq!(exav_unpack::lzo_decompress(stream, max).unwrap(), out);
+    }
+    // The first 1500 bytes of the stream as literals.
+    let lits = &stream[..stream.len().min(1500)];
+    let encoded = literals(lits);
+    let decoded = exav_unpack::lzo_decompress(&encoded, usize::MAX >> 1).unwrap();
+    assert_eq!(decoded, lits);
+});
diff --git a/fuzz/fuzz_targets/markdown.rs b/fuzz/fuzz_targets/markdown.rs
new file mode 100644
index 00000000..dddf5b59
--- /dev/null
+++ b/fuzz/fuzz_targets/markdown.rs
@@ -0,0 +1,102 @@
+#![no_main]
+//! Markdown on hostile text: exav-render's reader, as @exav/viewer's text
+//! module runs it. In the browser a panic traps the wasm instance, so every
+//! one is a finding, and so is a tree that breaks one of its bounds.
+use exav_render::markdown::{
+    Block, Inline, MAX_BLOCK_DEPTH, MAX_INLINE_DEPTH, MAX_TARGET, parse, visible_text,
+};
+use libfuzzer_sys::fuzz_target;
+
+fn inline_depth(c: &[Inline]) -> usize {
+    c.iter()
+        .map(|n| match n {
+            Inline::Em(c) | Inline::Strong(c) | Inline::Del(c) => 1 + inline_depth(c),
+            Inline::Link { url, children } => {
+                // What the page is allowed to follow, checked on its own terms.
+                let lower = url.to_ascii_lowercase();
+                assert!(url.len() <= MAX_TARGET);
+                assert!(lower.starts_with("http://") || lower.starts_with("https://") || lower.starts_with("mailto:"), "{url}");
+                let bad = |c: char| {
+                    c == ' ' || c.is_control() || matches!(c, '\u{2028}' | '\u{2029}' | '\u{202a}'..='\u{202e}' | '\u{2066}'..='\u{2069}')
+                };
+                assert!(!url.chars().any(bad), "{url:?}");
+                1 + inline_depth(children)
+            }
+            _ => 0,
+        })
+        .max()
+        .unwrap_or(0)
+}
+
+fn check(blocks: &[Block], depth: usize, truncated: bool) {
+    assert!(depth <= MAX_BLOCK_DEPTH);
+    for b in blocks {
+        match b {
+            Block::Para(c) | Block::Heading { children: c, .. } => {
+                assert!(inline_depth(c) <= MAX_INLINE_DEPTH)
+            }
+            Block::Quote(c) => check(c, depth + 1, truncated),
+            Block::List { items, .. } => items.iter().for_each(|i| check(i, depth + 1, truncated)),
+            Block::Table { align, head, rows } => {
+                // A row cut by the node limit is as far as it got.
+                assert!(
+                    truncated
+                        || (rows.iter().all(|r| r.len() == align.len())
+                            && head.len() == align.len())
+                );
+                assert!(head.len() <= align.len() && rows.iter().all(|r| r.len() <= align.len()));
+                head.iter()
+                    .chain(rows.iter().flatten())
+                    .for_each(|c| assert!(inline_depth(c) <= MAX_INLINE_DEPTH));
+            }
+            Block::Code(_) | Block::Rule | Block::Raw(_) => {}
+        }
+    }
+}
+
+fuzz_target!(|data: &[u8]| {
+    // The page reads at most 2 MiB; the target keeps runs short.
+    let Ok(text) = std::str::from_utf8(&data[..data.len().min(1 << 20)])
+        .or_else(|e| std::str::from_utf8(&data[..e.valid_up_to()]))
+    else {
+        return;
+    };
+    let doc = parse(text);
+    check(&doc.blocks, 0, doc.truncated);
+    // The JSON the page parses: balanced, and ending as it should.
+    let json = doc.to_json();
+    assert!(
+        json.starts_with("{\"blocks\":[")
+            && json.ends_with(if doc.truncated {
+                ",\"truncated\":true}"
+            } else {
+                ",\"truncated\":false}"
+            })
+    );
+    let (mut depth, mut in_string, mut escaped) = (0i64, false, false);
+    for b in json.bytes() {
+        if in_string {
+            match (escaped, b) {
+                (true, _) => escaped = false,
+                (false, b'\\') => escaped = true,
+                (false, b'"') => in_string = false,
+                (false, b) => assert!(b >= 0x20),
+            }
+        } else {
+            match b {
+                b'"' => in_string = true,
+                b'{' | b'[' => depth += 1,
+                b'}' | b']' => depth -= 1,
+                _ => {}
+            }
+            assert!(depth >= 0);
+        }
+    }
+    assert!(depth == 0 && !in_string);
+    // The text a reader sees, for the scanner and for search: within its cap,
+    // and cut exactly when it says so.
+    let cap = text.len().saturating_mul(4) + (64 << 10);
+    let visible = visible_text(text, cap);
+    assert!(visible.text.len() <= cap);
+    assert!(!visible.truncated || visible.text.len() > cap - 4);
+});
diff --git a/fuzz/fuzz_targets/mesh.rs b/fuzz/fuzz_targets/mesh.rs
new file mode 100644
index 00000000..bd3e9aa7
--- /dev/null
+++ b/fuzz/fuzz_targets/mesh.rs
@@ -0,0 +1,26 @@
+#![no_main]
+//! OBJ, PLY and glTF on hostile bytes: exav-render's three mesh readers, as
+//! @exav/viewer's model module runs them, with a small triangle budget so
+//! that a run stays fast. In the browser a panic traps the wasm instance, so
+//! every one is a finding.
+use exav_render::{gltf, obj, ply};
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|data: &[u8]| {
+    for scene in [
+        obj::read(data, 200_000).ok(),
+        ply::read(data, 200_000).ok(),
+        gltf::read(data, 200_000).ok(),
+    ]
+    .into_iter()
+    .flatten()
+    {
+        // What the viewer relies on: whole triangles, in range, finite.
+        for b in &scene.batches {
+            assert_eq!(b.indices.len() % 3, 0);
+            let vertices = (b.positions.len() / 3) as u32;
+            assert!(b.indices.iter().all(|&i| i < vertices));
+            assert!(b.positions.iter().all(|v| v.is_finite()));
+        }
+    }
+});
diff --git a/fuzz/fuzz_targets/ndb_compile.rs b/fuzz/fuzz_targets/ndb_compile.rs
index d8997891..91a414c9 100644
--- a/fuzz/fuzz_targets/ndb_compile.rs
+++ b/fuzz/fuzz_targets/ndb_compile.rs
@@ -4,8 +4,8 @@
 //! panics in `parse_elems`, `compile_body`, `pick_anchor`, `parse_gap`,
 //! `parse_alt`, the anchor index build, and all the hex-wildcard parsing
 //! codepaths that no other fuzz target reaches.
-use libfuzzer_sys::fuzz_target;
 use exav_core::engine::EngineBuilder;
+use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(text) = std::str::from_utf8(data) {
diff --git a/fuzz/fuzz_targets/parser_recursion.rs b/fuzz/fuzz_targets/parser_recursion.rs
index 8be2bb17..2f945ab4 100644
--- a/fuzz/fuzz_targets/parser_recursion.rs
+++ b/fuzz/fuzz_targets/parser_recursion.rs
@@ -18,7 +18,7 @@
 //! of a stack overflow, and it is worth checking `ulimit -s` before concluding
 //! the parser is at fault.
 
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
 use libfuzzer_sys::fuzz_target;
 
 /// Small enough that a bomb cannot make the run about memory instead of depth.
@@ -57,7 +57,7 @@ fuzz_target!(|data: &[u8]| {
     // to build the nesting itself. Capped where a healthy parser is already far
     // past any legitimate document and an unhealthy one has long since died.
     let depth = usize::from(u16::from_le_bytes([data[0], data[1]])) % 20_000;
-    let shape = data[2] % 4;
+    let shape = data[2] % 6;
     let payload = &data[3..];
 
     let body = match shape {
@@ -72,12 +72,27 @@ fuzz_target!(|data: &[u8]| {
             v.extend_from_slice(b"\nendobj\ntrailer<</Root 1 0 R>>\n%%EOF");
             v
         }
+        // RTF groups.
+        3 => {
+            let mut v = b"{\\rtf1 ".to_vec();
+            v.extend_from_slice(&nest(b"{", b"}", payload, depth));
+            v.push(b'}');
+            v
+        }
+        // A message inside a message inside a message: the parser's own nesting
+        // and the drop of what it built.
+        4 => nest(
+            b"Content-Type: multipart/mixed; boundary=\"b\"\r\n\r\n--b\r\nContent-Type: message/rfc822\r\n\r\n",
+            b"\r\n--b--\r\n",
+            payload,
+            depth,
+        ),
         // XDP wraps XML around a PDF, so the markup walk and the object parser
         // are both reachable from one nested document.
         _ => nest(b"<a>", b"</a>", payload, depth),
     };
 
-    for fmt in [Format::Pdf, Format::Xdp] {
+    for fmt in [Format::Pdf, Format::Xdp, Format::Rtf, Format::Email] {
         let mut budget = Budget::new(tight_limits());
         let _ = extract(fmt, &body, &mut budget);
     }
diff --git a/fuzz/fuzz_targets/pcre.rs b/fuzz/fuzz_targets/pcre.rs
index e0033ee7..8476b19e 100644
--- a/fuzz/fuzz_targets/pcre.rs
+++ b/fuzz/fuzz_targets/pcre.rs
@@ -22,7 +22,9 @@ fuzz_target!(|input: &[u8]| {
     let [flags, lo, hi, rest @ ..] = input else {
         return;
     };
-    let len = (u16::from_le_bytes([*lo, *hi]) as usize).min(rest.len()).min(MAX_PATTERN);
+    let len = (u16::from_le_bytes([*lo, *hi]) as usize)
+        .min(rest.len())
+        .min(MAX_PATTERN);
     let (pattern, hay) = rest.split_at(len);
     let Ok(pattern) = std::str::from_utf8(pattern) else {
         return;
diff --git a/fuzz/fuzz_targets/pe.rs b/fuzz/fuzz_targets/pe.rs
index 3eedf483..1c0c9f5f 100644
--- a/fuzz/fuzz_targets/pe.rs
+++ b/fuzz/fuzz_targets/pe.rs
@@ -1,8 +1,8 @@
 #![no_main]
 //! PE structural analysis (goblin parse + section entropy + imphash) on
 //! hostile bytes.
-use libfuzzer_sys::fuzz_target;
 use exav_core::pe;
+use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
     let _ = pe::analyze(data);
diff --git a/fuzz/fuzz_targets/pe_emulator.rs b/fuzz/fuzz_targets/pe_emulator.rs
index eec7a95a..d84162a1 100644
--- a/fuzz/fuzz_targets/pe_emulator.rs
+++ b/fuzz/fuzz_targets/pe_emulator.rs
@@ -25,7 +25,7 @@
 //!
 //! Seed corpus: `fuzz/corpus/pe_emulator/` — small packed PEs, so the mutator
 //! starts inside a stub rather than rediscovering the PE header.
-use exav_pe_emu::{unpack, EmuLimits};
+use exav_pe_emu::{EmuLimits, unpack};
 use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
diff --git a/fuzz/fuzz_targets/rar3_ppmd.rs b/fuzz/fuzz_targets/rar3_ppmd.rs
index b97728f1..0d97eb2c 100644
--- a/fuzz/fuzz_targets/rar3_ppmd.rs
+++ b/fuzz/fuzz_targets/rar3_ppmd.rs
@@ -2,8 +2,8 @@
 //! Feed arbitrary bytes through the RAR3 PPMd unpacker.  The fuzzer supplies
 //! both the (possibly malformed) packed data and the metadata; the decoder
 //! must never panic regardless of input.
+use exav_unpack::{Budget, Limits, unpack29};
 use libfuzzer_sys::fuzz_target;
-use exav_unpack::{unpack29, Budget, Limits};
 
 fuzz_target!(|data: &[u8]| {
     // Interpret the first 16 bytes as little-endian metadata, rest as packed
diff --git a/fuzz/fuzz_targets/raw_preview.rs b/fuzz/fuzz_targets/raw_preview.rs
new file mode 100644
index 00000000..723e6b22
--- /dev/null
+++ b/fuzz/fuzz_targets/raw_preview.rs
@@ -0,0 +1,19 @@
+#![no_main]
+//! Camera RAW files on hostile bytes, as @exav/viewer opens them:
+//! `image::raw`'s detection and its choice of a preview (the TIFF
+//! directories, the ISO base media boxes, the JPEG stream search, the
+//! uncompressed samples and the orientation), within a small decode budget,
+//! then `decode_any`, which tries a RAW file first and reads the rest as the
+//! image it is.
+use libfuzzer_sys::fuzz_target;
+
+/// A decode of this size costs seconds under the sanitizer: what a preview of
+/// a few megapixels does, which is all the target needs to reach the decoder.
+const BUDGET: u64 = 16 << 20;
+
+fuzz_target!(|data: &[u8]| {
+    exav_fuzz_support::panics::contained_panics();
+    let _ = exav_render::image::raw::detect(data);
+    let _ = exav_render::image::raw::preview(data, BUDGET);
+    let _ = exav_render::image::decode_any(data, BUDGET);
+});
diff --git a/fuzz/fuzz_targets/seekable.rs b/fuzz/fuzz_targets/seekable.rs
index 128d6c64..cb265626 100644
--- a/fuzz/fuzz_targets/seekable.rs
+++ b/fuzz/fuzz_targets/seekable.rs
@@ -23,7 +23,7 @@
 //!   and the report says so (the crate docs).
 use std::io::{self, Cursor, Read, Seek, SeekFrom};
 
-use exav_core::{analyze, scan_seekable, Verdict, VerdictCategory};
+use exav_core::{Verdict, VerdictCategory, analyze, scan_seekable};
 use libfuzzer_sys::fuzz_target;
 
 #[path = "../db.rs"]
@@ -54,6 +54,7 @@ impl Seek for Flaky {
 }
 
 fuzz_target!(|input: &[u8]| {
+    exav_fuzz_support::panics::contained_panics();
     let [b0, b1, piece, fail, data @ ..] = input else {
         return;
     };
@@ -69,11 +70,14 @@ fuzz_target!(|input: &[u8]| {
 
     match (fail_at, answer) {
         (None, Ok(report)) => {
-            let held = len <= opts.deep_analysis_max && opts.max_scan_size.map_or(true, |m| len <= m);
+            let held = len <= opts.deep_analysis_max && opts.max_scan_size.is_none_or(|m| len <= m);
             if held {
                 let direct = analyze(db::scanner(), data, &opts);
-                assert_eq!(report.verdict, direct.verdict, "a reader and a buffer got two answers");
-            } else if opts.max_scan_size.map_or(true, |m| len <= m) {
+                assert_eq!(
+                    report.verdict, direct.verdict,
+                    "a reader and a buffer got two answers"
+                );
+            } else if opts.max_scan_size.is_none_or(|m| len <= m) {
                 assert_ne!(
                     report.verdict.category(),
                     VerdictCategory::Clean,
@@ -85,7 +89,10 @@ fuzz_target!(|input: &[u8]| {
         (Some(at), Ok(report)) => {
             // Reading stopped at `at`: only a detection can have been reached.
             if !matches!(report.verdict, Verdict::Infected { .. }) {
-                panic!("a read failed at byte {at} of {len} and the scan went on to say {:?}", report.verdict);
+                panic!(
+                    "a read failed at byte {at} of {len} and the scan went on to say {:?}",
+                    report.verdict
+                );
             }
             let whole = analyze(db::scanner(), data, &opts);
             assert_ne!(
diff --git a/fuzz/fuzz_targets/sheets_check.rs b/fuzz/fuzz_targets/sheets_check.rs
new file mode 100644
index 00000000..857cf017
--- /dev/null
+++ b/fuzz/fuzz_targets/sheets_check.rs
@@ -0,0 +1,44 @@
+//! What the sheets targets check of a conversion that succeeds.
+use std::io::Read;
+
+use exav_render::sheets::Limits;
+
+/// Smaller than the converter's defaults, to keep runs short; the bounds
+/// are what is tested, not their size.
+pub fn limits() -> Limits {
+    Limits::default()
+        .with_max_cells(200_000)
+        .with_max_memory(64 << 20)
+}
+
+/// An XLSX package within the memory limit, whose parts the viewer reads
+/// first are there and are XML: the first sheet is a worksheet or a chart
+/// sheet.
+pub fn xlsx(bytes: &[u8], limits: &Limits) {
+    assert!(bytes.len() as u64 <= limits.max_memory);
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).expect("a ZIP");
+    let first = if z.index_for_name("xl/worksheets/sheet1.xml").is_some() {
+        "xl/worksheets/sheet1.xml"
+    } else {
+        "xl/chartsheets/sheet1.xml"
+    };
+    for part in [
+        "[Content_Types].xml",
+        "xl/workbook.xml",
+        "xl/styles.xml",
+        first,
+    ] {
+        let mut s = String::new();
+        z.by_name(part)
+            .unwrap_or_else(|_| panic!("{part}"))
+            .read_to_string(&mut s)
+            .unwrap_or_else(|_| panic!("{part}: UTF-8"));
+        assert!(s.starts_with("<?xml"), "{part}");
+        // No C0 control character but white space: XML 1.0 refuses them.
+        assert!(
+            !s.chars()
+                .any(|c| (c as u32) < 0x20 && !matches!(c, '\t' | '\n' | '\r')),
+            "{part}"
+        );
+    }
+}
diff --git a/fuzz/fuzz_targets/sheets_numbers.rs b/fuzz/fuzz_targets/sheets_numbers.rs
new file mode 100644
index 00000000..fb7df865
--- /dev/null
+++ b/fuzz/fuzz_targets/sheets_numbers.rs
@@ -0,0 +1,44 @@
+#![no_main]
+//! Apple Numbers documents on hostile bytes: exav-render's `sheets` IWA reader
+//! (ZIP, Snappy, protobuf, tiles, cell records, styles, formulas), its
+//! Numbers '08 and '09 reader (XML, styles, formulas) and the XLSX writer.
+//! The input is the document's one IWA stream, or its `index.xml` when it
+//! starts with `<` (`index.xml.gz` when gzipped), stored in a ZIP here, so
+//! that the fuzzer mutates the archives and the XML and not the ZIP around
+//! them. Every panic is a finding, and so is an output that is not an XLSX.
+use std::io::Write;
+
+use exav_render::sheets::{Format, convert};
+use libfuzzer_sys::fuzz_target;
+
+#[path = "sheets_check.rs"]
+mod sheets_check;
+
+fuzz_target!(|data: &[u8]| {
+    let limits = sheets_check::limits();
+    // A whole document as it is, else the bytes as one of its members.
+    let doc = if data.starts_with(b"PK") {
+        data.to_vec()
+    } else {
+        let name = if data.starts_with(b"<") {
+            "index.xml"
+        } else if data.starts_with(&[0x1F, 0x8B]) {
+            "index.xml.gz"
+        } else {
+            "Index/Document.iwa"
+        };
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        let opts = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        if z.start_file(name, opts).is_err() || z.write_all(data).is_err() {
+            return;
+        }
+        match z.finish() {
+            Ok(c) => c.into_inner(),
+            Err(_) => return,
+        }
+    };
+    if let Ok(c) = convert(&doc, Format::Numbers, &limits) {
+        sheets_check::xlsx(&c.xlsx, &limits);
+    }
+});
diff --git a/fuzz/fuzz_targets/sheets_ods.rs b/fuzz/fuzz_targets/sheets_ods.rs
new file mode 100644
index 00000000..11060b85
--- /dev/null
+++ b/fuzz/fuzz_targets/sheets_ods.rs
@@ -0,0 +1,23 @@
+#![no_main]
+//! OpenDocument spreadsheets on hostile bytes: exav-render's `sheets` ODS
+//! reader for a ZIP, its FODS reader for anything else (styles, data styles,
+//! formulas, conditional formats, validations, frames, charts), and the XLSX
+//! writer. Every panic is a finding, and so is an output that is not an
+//! XLSX.
+use exav_render::sheets::{Format, convert};
+use libfuzzer_sys::fuzz_target;
+
+#[path = "sheets_check.rs"]
+mod sheets_check;
+
+fuzz_target!(|data: &[u8]| {
+    let limits = sheets_check::limits();
+    let format = if data.starts_with(b"PK") {
+        Format::Ods
+    } else {
+        Format::Fods
+    };
+    if let Ok(c) = convert(data, format, &limits) {
+        sheets_check::xlsx(&c.xlsx, &limits);
+    }
+});
diff --git a/fuzz/fuzz_targets/sheets_text.rs b/fuzz/fuzz_targets/sheets_text.rs
new file mode 100644
index 00000000..0eb03498
--- /dev/null
+++ b/fuzz/fuzz_targets/sheets_text.rs
@@ -0,0 +1,27 @@
+#![no_main]
+//! The text formats exav-render's `sheets` reads, on hostile bytes: Excel's
+//! XML Spreadsheet 2003 (XML tree, styles and their parents, R1C1 formulas,
+//! declared encodings), HTML tables (the tokenizer, CSS, spans, conditional
+//! markup, character sets) and SYLK (records, escapes, shared formulas),
+//! then the XLSX writer. The first byte picks the reader. Every panic is a
+//! finding, and so is an output that is not an XLSX.
+use exav_render::sheets::{Format, convert};
+use libfuzzer_sys::fuzz_target;
+
+#[path = "sheets_check.rs"]
+mod sheets_check;
+
+fuzz_target!(|data: &[u8]| {
+    let Some((&pick, doc)) = data.split_first() else {
+        return;
+    };
+    let format = match pick % 3 {
+        0 => Format::SpreadsheetMl,
+        1 => Format::Html,
+        _ => Format::Sylk,
+    };
+    let limits = sheets_check::limits();
+    if let Ok(c) = convert(doc, format, &limits) {
+        sheets_check::xlsx(&c.xlsx, &limits);
+    }
+});
diff --git a/fuzz/fuzz_targets/sheets_xls.rs b/fuzz/fuzz_targets/sheets_xls.rs
new file mode 100644
index 00000000..9cc701b0
--- /dev/null
+++ b/fuzz/fuzz_targets/sheets_xls.rs
@@ -0,0 +1,18 @@
+#![no_main]
+//! XLS on hostile bytes: exav-render's `sheets` reader (the lenient
+//! compound file reader, BIFF2 to BIFF8, decryption with the default password,
+//! formulas, drawings and charts) and the XLSX writer, as @exav/viewer's
+//! sheets module runs them. A panic traps the wasm instance in the browser,
+//! so every one is a finding, and so is an output that is not an XLSX.
+use exav_render::sheets::{Format, convert};
+use libfuzzer_sys::fuzz_target;
+
+#[path = "sheets_check.rs"]
+mod sheets_check;
+
+fuzz_target!(|data: &[u8]| {
+    let limits = sheets_check::limits();
+    if let Ok(c) = convert(data, Format::Xls, &limits) {
+        sheets_check::xlsx(&c.xlsx, &limits);
+    }
+});
diff --git a/fuzz/fuzz_targets/sigs.rs b/fuzz/fuzz_targets/sigs.rs
index b16530c8..d7a2c5b2 100644
--- a/fuzz/fuzz_targets/sigs.rs
+++ b/fuzz/fuzz_targets/sigs.rs
@@ -1,9 +1,9 @@
 #![no_main]
 //! Signature-text parsers (simple Name=HEX, hash db, fuzzy db) on arbitrary
 //! UTF-8. `.ndb` text is fuzzed through the engine by `ndb_compile`.
-use libfuzzer_sys::fuzz_target;
 use exav_core::fuzzy::FuzzyDb;
 use exav_core::hashes::HashDb;
+use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(text) = std::str::from_utf8(data) {
diff --git a/fuzz/fuzz_targets/slides_check.rs b/fuzz/fuzz_targets/slides_check.rs
new file mode 100644
index 00000000..195c0e4d
--- /dev/null
+++ b/fuzz/fuzz_targets/slides_check.rs
@@ -0,0 +1,64 @@
+//! What the slides targets check of a conversion that succeeds.
+use std::io::Read;
+
+use exav_render::slides::{Format, Limits, convert, convert_first};
+
+/// Converts `doc` whole, then, when it has more than one slide, its first
+/// slide alone; checks both.
+pub fn run(doc: &[u8], format: Format) {
+    let limits = limits();
+    let Ok(c) = convert(doc, format, &limits) else {
+        return;
+    };
+    pptx(&c.pptx, c.slides, &limits);
+    if c.slides > 1 {
+        let f = convert_first(doc, format, &limits, 1)
+            .expect("the first slide of a document that converts whole");
+        assert_eq!((f.slides, f.total_slides), (1, c.total_slides));
+        pptx(&f.pptx, 1, &limits);
+    }
+}
+
+/// Smaller than the converter's defaults, to keep runs short; the bounds
+/// are what is tested, not their size.
+pub fn limits() -> Limits {
+    Limits::default()
+        .with_max_shapes(20_000)
+        .with_max_memory(64 << 20)
+}
+
+/// A PPTX package within the memory limit, whose parts the viewer reads
+/// first are there, and whose XML parts are XML without a C0 control
+/// character.
+pub fn pptx(bytes: &[u8], slides: usize, limits: &Limits) {
+    assert!(bytes.len() as u64 <= limits.max_memory);
+    let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes)).expect("a ZIP");
+    for part in [
+        "[Content_Types].xml",
+        "ppt/presentation.xml",
+        "ppt/slideMasters/slideMaster1.xml",
+        "ppt/slideLayouts/slideLayout1.xml",
+    ] {
+        assert!(z.index_for_name(part).is_some(), "{part}");
+    }
+    if slides > 0 {
+        assert!(z.index_for_name("ppt/slides/slide1.xml").is_some());
+    }
+    for i in 0..z.len() {
+        let mut f = z.by_index(i).expect("a part");
+        let name = f.name().map(|n| n.to_string()).unwrap_or_default();
+        if !(name.ends_with(".xml") || name.ends_with(".rels")) {
+            continue;
+        }
+        let mut s = String::new();
+        f.read_to_string(&mut s)
+            .unwrap_or_else(|_| panic!("{name}: UTF-8"));
+        assert!(s.starts_with("<?xml"), "{name}");
+        // No C0 control character but white space: XML 1.0 refuses them.
+        assert!(
+            !s.chars()
+                .any(|c| (c as u32) < 0x20 && !matches!(c, '\t' | '\n' | '\r')),
+            "{name}"
+        );
+    }
+}
diff --git a/fuzz/fuzz_targets/slides_keynote.rs b/fuzz/fuzz_targets/slides_keynote.rs
new file mode 100644
index 00000000..17de2f1d
--- /dev/null
+++ b/fuzz/fuzz_targets/slides_keynote.rs
@@ -0,0 +1,38 @@
+#![no_main]
+//! Apple Keynote documents on hostile bytes: exav-render's `slides` IWA reader
+//! (ZIP, Snappy, protobuf, slides, masters, placeholders, styles, shapes,
+//! paths, text storages), its XML readers for Keynote 1 to 5 (styles and
+//! their parents, layers, placeholders, headlines, shapes, text, pictures)
+//! and the PPTX writer. The input is an IWA stream, stored as
+//! `Index/Document.iwa` in a ZIP here so that the fuzzer mutates the
+//! archives and not the ZIP around them; a whole document when it is a ZIP;
+//! an `.apxl` file on its own when it starts with `<` or is gzipped. Every
+//! panic is a finding, and so is an output that is not a PPTX.
+use std::io::Write;
+
+use exav_render::slides::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "slides_check.rs"]
+mod slides_check;
+
+fuzz_target!(|data: &[u8]| {
+    let doc = if data.starts_with(b"PK")
+        || data.first() == Some(&b'<')
+        || data.starts_with(&[0x1F, 0x8B])
+    {
+        data.to_vec()
+    } else {
+        let mut z = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
+        let opts = zip::write::SimpleFileOptions::default()
+            .compression_method(zip::CompressionMethod::Stored);
+        if z.start_file("Index/Document.iwa", opts).is_err() || z.write_all(data).is_err() {
+            return;
+        }
+        match z.finish() {
+            Ok(c) => c.into_inner(),
+            Err(_) => return,
+        }
+    };
+    slides_check::run(&doc, Format::Keynote);
+});
diff --git a/fuzz/fuzz_targets/slides_odg.rs b/fuzz/fuzz_targets/slides_odg.rs
new file mode 100644
index 00000000..452bdf98
--- /dev/null
+++ b/fuzz/fuzz_targets/slides_odg.rs
@@ -0,0 +1,20 @@
+#![no_main]
+//! OpenDocument drawings on hostile bytes: exav-render's `slides` ODG reader
+//! for a ZIP, its FODG reader for anything else (what the ODP reader does,
+//! and the page sizes of the master pages, the layers that are not
+//! displayed, the pages' names), and the PPTX writer. Every panic is a
+//! finding, and so is an output that is not a PPTX.
+use exav_render::slides::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "slides_check.rs"]
+mod slides_check;
+
+fuzz_target!(|data: &[u8]| {
+    let format = if data.starts_with(b"PK") {
+        Format::Odg
+    } else {
+        Format::Fodg
+    };
+    slides_check::run(data, format);
+});
diff --git a/fuzz/fuzz_targets/slides_odp.rs b/fuzz/fuzz_targets/slides_odp.rs
new file mode 100644
index 00000000..2609ab22
--- /dev/null
+++ b/fuzz/fuzz_targets/slides_odp.rs
@@ -0,0 +1,21 @@
+#![no_main]
+//! OpenDocument presentations on hostile bytes: exav-render's `slides` ODP
+//! reader for a ZIP, its FODP reader for anything else (styles and their
+//! parents, list styles, masters, enhanced geometry and its formulas, SVG
+//! paths, text and fields, tables, pictures, charts through
+//! the `sheets` chart writer), and the PPTX writer. Every panic is a finding,
+//! and so is an output that is not a PPTX.
+use exav_render::slides::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "slides_check.rs"]
+mod slides_check;
+
+fuzz_target!(|data: &[u8]| {
+    let format = if data.starts_with(b"PK") {
+        Format::Odp
+    } else {
+        Format::Fodp
+    };
+    slides_check::run(data, format);
+});
diff --git a/fuzz/fuzz_targets/slides_ppt.rs b/fuzz/fuzz_targets/slides_ppt.rs
new file mode 100644
index 00000000..13ab1323
--- /dev/null
+++ b/fuzz/fuzz_targets/slides_ppt.rs
@@ -0,0 +1,32 @@
+#![no_main]
+//! PowerPoint presentations on hostile bytes: exav-render's `slides` PPT
+//! reader (the lenient compound file reader, the record tree, the persist
+//! directory, text and style atoms, the OfficeArt drawing layer, the blip
+//! store, the PowerPoint 95 records, the OLE charts, the headers of
+//! versions 2 to 4 and BinHex text) and the PPTX writer. A compound file is
+//! read as it is, as is a file of PowerPoint 2 to 4 or BinHex text; any
+//! other input is stored as its `PowerPoint Document` stream in a compound
+//! file built here, so that the fuzzer mutates the records and not the
+//! compound file around them (a PowerPoint 95 stream is one of them). Every
+//! panic is a finding, and so is an output that is not a PPTX.
+use exav_render::formats::office::test_util::build_cfb as build;
+use exav_render::slides::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "slides_check.rs"]
+mod slides_check;
+
+const CFB: &[u8] = &[0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1];
+
+fuzz_target!(|data: &[u8]| {
+    let doc = if data.starts_with(CFB)
+        || data.starts_with(&[0xED, 0xDE, 0xAD, 0x0B])
+        || data.starts_with(&[0x0B, 0xAD, 0xDE, 0xED])
+        || data.starts_with(b"(This file must be converted")
+    {
+        data.to_vec()
+    } else {
+        build(&[("PowerPoint Document", data)])
+    };
+    slides_check::run(&doc, Format::Ppt);
+});
diff --git a/fuzz/fuzz_targets/slides_vsdx.rs b/fuzz/fuzz_targets/slides_vsdx.rs
new file mode 100644
index 00000000..71c08a96
--- /dev/null
+++ b/fuzz/fuzz_targets/slides_vsdx.rs
@@ -0,0 +1,15 @@
+#![no_main]
+//! Visio drawings on hostile bytes: exav-render's `slides` VSDX reader (the
+//! package and its relationships, document, pages and masters, shape sheets
+//! with their inheritance from masters and styles, formulas, geometry rows
+//! and splines, text, pictures, themes) and the PPTX writer. Every panic is
+//! a finding, and so is an output that is not a PPTX.
+use exav_render::slides::Format;
+use libfuzzer_sys::fuzz_target;
+
+#[path = "slides_check.rs"]
+mod slides_check;
+
+fuzz_target!(|data: &[u8]| {
+    slides_check::run(data, Format::Vsdx);
+});
diff --git a/fuzz/fuzz_targets/unpack.rs b/fuzz/fuzz_targets/unpack.rs
index fc3e2100..60a672c5 100644
--- a/fuzz/fuzz_targets/unpack.rs
+++ b/fuzz/fuzz_targets/unpack.rs
@@ -11,9 +11,9 @@
 //! Seeds: `scripts/fuzz-seeds.sh` (the `containers` directory, every test
 //! fixture of at most 64 KiB), so the mutator starts inside each parser instead
 //! of rediscovering magic bytes.
-use libfuzzer_sys::fuzz_target;
 use exav_fuzz_support::extreme;
-use exav_unpack::{extract, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract};
+use libfuzzer_sys::fuzz_target;
 
 // A quarter of the mutations set one header field to the top of its range, where
 // unchecked sums overflow (see `extreme.rs`).
diff --git a/fuzz/fuzz_targets/vdisk.rs b/fuzz/fuzz_targets/vdisk.rs
new file mode 100644
index 00000000..3ed420a4
--- /dev/null
+++ b/fuzz/fuzz_targets/vdisk.rs
@@ -0,0 +1,125 @@
+#![no_main]
+//! Virtual disks and the filesystems read in place, on hostile bytes: QCOW2,
+//! VMDK, VHD and VHDX through their tables and compressed units, and NTFS, FAT,
+//! HFS+ and APFS (in a DMG) and partition tables through the volume walker. The
+//! budgets are small, so an
+//! image of more than a few KiB declares a disk over the buffer limit and is
+//! walked in place rather than read into one member.
+//!
+//! The first byte picks the format (above the list: all of them); the rest is the
+//! image. Each is walked twice, from memory and through a block cache of tiny
+//! blocks, and the two must agree on what they find: a read that depends on
+//! where the cache's blocks fall is a bug. No member held whole may pass the
+//! buffer limit.
+//!
+//! Seeds: `scripts/fuzz-seeds.sh` (`fuzz/seeds/vdisk`, and the disk fixtures of
+//! at most 64 KiB).
+use exav_fuzz_support::extreme;
+use exav_unpack::source::BlockCache;
+use exav_unpack::{Budget, ByteSource, Format, LimitHit, Limits, Member, walk};
+use libfuzzer_sys::fuzz_target;
+use std::io::Cursor;
+
+libfuzzer_sys::fuzz_mutator!(|data: &mut [u8], size: usize, max_size: usize, seed: u32| {
+    if extreme::set_extreme_field(data, size, seed) {
+        size
+    } else {
+        libfuzzer_sys::fuzzer_mutate(data, size, max_size)
+    }
+});
+
+const FORMATS: [Format; 8] = [
+    Format::Qcow2,
+    Format::Vmdk,
+    Format::Vhd,
+    Format::Vhdx,
+    Format::Ntfs,
+    Format::Fat,
+    Format::Partition,
+    Format::Dmg,
+];
+
+const BUFFER: u64 = 64 * 1024;
+
+fn limits() -> Limits {
+    let mut l = Limits::default();
+    l.max_buffer_bytes = BUFFER;
+    l.max_extracted_bytes = 1024 * 1024;
+    l.max_scanned_bytes = 4 * 1024 * 1024;
+    l.max_members = 400;
+    l.max_recursion = 2;
+    l
+}
+
+/// What a walk found: each member's name, size and whether it was reported, and
+/// how the walk ended.
+type Found = (Vec<(String, usize, bool)>, Result<(), LimitHit>);
+
+fn found(fmt: Format, src: &dyn ByteSource) -> Found {
+    let mut budget = Budget::new(limits());
+    let mut out = Vec::new();
+    let end = walk(fmt, src, &mut budget, &mut |meta, content, _| {
+        let n = match content {
+            None => 0,
+            Some(Member::Bytes(b)) => {
+                assert!(
+                    b.len() as u64 <= BUFFER,
+                    "{}: a member held whole passes the buffer limit",
+                    meta.name
+                );
+                b.len()
+            }
+            Some(Member::Stream(r)) => {
+                let mut n = 0;
+                let mut buf = [0u8; 8192];
+                // A stream is bounded by the scan budget it is read under.
+                while let Ok(k) = r.read(&mut buf) {
+                    if k == 0 {
+                        break;
+                    }
+                    n += k;
+                }
+                n
+            }
+        };
+        out.push((meta.name.clone(), n, meta.unsupported.is_some()));
+        None::<()>
+    });
+    // A panic that reaches the walk's boundary ends the volume: a finding.
+    if let Err(hit) = &end {
+        // Error texts may echo input bytes, so match the walk's own wording.
+        assert!(
+            !hit.reason.ends_with(" decoder panicked on malformed input"),
+            "{fmt:?}: {}",
+            hit.reason
+        );
+    }
+    (out, end.map(|_| ()))
+}
+
+fuzz_target!(|data: &[u8]| {
+    let Some((&pick, image)) = data.split_first() else {
+        return;
+    };
+    let pick = usize::from(pick);
+    let all: &[Format] = &FORMATS;
+    let one = [FORMATS[pick % FORMATS.len()]];
+    let formats: &[Format] = if pick < FORMATS.len() { &one } else { all };
+    for &fmt in formats {
+        let mem = found(fmt, &image);
+        let cached = BlockCache::with_sizes(Cursor::new(image.to_vec()), 512, 8 * 1024).unwrap();
+        let via_cache = found(fmt, &cached);
+        // The same members, in the same order; the same end, or both ended in an
+        // error (its text names offsets the cache does not change, but not what
+        // a block boundary does).
+        assert_eq!(
+            mem.0, via_cache.0,
+            "{fmt:?}: the cache changed what was found"
+        );
+        assert_eq!(
+            mem.1.is_err(),
+            via_cache.1.is_err(),
+            "{fmt:?}: the cache changed how the walk ended"
+        );
+    }
+});
diff --git a/fuzz/fuzz_targets/visible_text.rs b/fuzz/fuzz_targets/visible_text.rs
new file mode 100644
index 00000000..a2bf17ec
--- /dev/null
+++ b/fuzz/fuzz_targets/visible_text.rs
@@ -0,0 +1,65 @@
+#![no_main]
+//! The text a reader sees, on hostile bytes: exav-render's `text::visible_text`
+//! as the scanner and `exav-grep --text` call it, under every name that picks
+//! a reader (Markdown, HTML, each Office and OpenDocument XML part, PDF, DXF,
+//! DWG, DOC, XLS, PPT, RTF, Word 2003 XML, SYLK, the flat OpenDocument files,
+//! Numbers, Pages, Keynote). The first byte picks the name, so every reader is
+//! reached whatever the rest is. A panic is a finding; so is a text past its
+//! cap, more links than the bound, sections that are not in order inside the
+//! text, or a document read that `wants` did not announce.
+use exav_render::text::{visible_text, wants};
+use exav_unpack::Limits;
+use libfuzzer_sys::fuzz_target;
+
+const NAMES: &[&str] = &[
+    "a.md",
+    "a.html",
+    "word/document.xml",
+    "xl/worksheets/sheet1.xml",
+    "xl/sharedStrings.xml",
+    "ppt/slides/slide1.xml",
+    "content.xml",
+    "a.pdf",
+    "a.dxf",
+    "a.dwg",
+    "member",
+    // The office formats the XML parts do not reach (`text-office`).
+    "a.doc",
+    "a.xls",
+    "a.ppt",
+    "a.rtf",
+    "a.xml",
+    "a.slk",
+    "a.fodt",
+    "a.fods",
+    "a.fodp",
+    "a.fodg",
+    "a.numbers",
+    "a.pages",
+    "a.key",
+];
+
+fuzz_target!(|data: &[u8]| {
+    let Some((&pick, body)) = data.split_first() else {
+        return;
+    };
+    let name = NAMES[usize::from(pick) % NAMES.len()];
+    // Small limits keep a decompression bomb cheap to refuse.
+    let mut limits = Limits::default();
+    limits.max_buffer_bytes = 16 << 20;
+    let cap = 1 << 20;
+    if let Some(v) = visible_text(name, body, cap, &limits) {
+        assert!(v.text.len() <= cap, "{} bytes", v.text.len());
+        assert!(v.links.len() <= 4096);
+        assert!(wants(name, &body[..body.len().min(1024)]));
+        // Sections are in order, inside the text, on character boundaries.
+        let mut at = 0;
+        for (_, r) in &v.sections {
+            assert!(at <= r.start && r.start <= r.end && r.end <= v.text.len());
+            assert!(v.text.is_char_boundary(r.start) && v.text.is_char_boundary(r.end));
+            at = r.end;
+        }
+        // A document whose text could not be read has none.
+        assert!(v.unreadable.is_none() || v.text.is_empty());
+    }
+});
diff --git a/fuzz/fuzz_targets/volumes.rs b/fuzz/fuzz_targets/volumes.rs
index b9780f30..68e9006a 100644
--- a/fuzz/fuzz_targets/volumes.rs
+++ b/fuzz/fuzz_targets/volumes.rs
@@ -15,7 +15,7 @@
 //! of what it joins neither panic nor overrun the budget.
 use exav_fuzz_support::frame;
 use exav_unpack::volume::{Collector, Offer};
-use exav_unpack::{extract, join_rar_volumes, Budget, Format, Limits};
+use exav_unpack::{Budget, Format, Limits, extract, join_rar_volumes};
 use libfuzzer_sys::fuzz_target;
 
 const NAMES: &[&str] = &[
@@ -67,8 +67,15 @@ fuzz_target!(|data: &[u8]| {
     let finished = collector.finish();
     for j in &finished.joined {
         // The parts' names, and between them the joined bytes.
-        let parts: Vec<_> = offered.iter().filter(|(n, _)| j.parts.contains(n)).collect();
-        assert!(!parts.is_empty(), "a joined set names parts nobody offered: {:?}", j.parts);
+        let parts: Vec<_> = offered
+            .iter()
+            .filter(|(n, _)| j.parts.contains(n))
+            .collect();
+        assert!(
+            !parts.is_empty(),
+            "a joined set names parts nobody offered: {:?}",
+            j.parts
+        );
         out.extend(j.parts.iter().map(|p| {
             let len = offered.iter().find(|(n, _)| n == p).map_or(0, |(_, l)| *l);
             (p.clone(), len)
@@ -88,7 +95,10 @@ fuzz_target!(|data: &[u8]| {
     offered_set.dedup();
     let mut out_set = key(&out);
     out_set.dedup();
-    assert_eq!(out_set, offered_set, "what was offered is not what came out");
+    assert_eq!(
+        out_set, offered_set,
+        "what was offered is not what came out"
+    );
     let joined_bytes: usize = finished.joined.iter().map(|j| j.data.len()).sum();
     let parts_bytes: usize = finished
         .joined
@@ -96,7 +106,10 @@ fuzz_target!(|data: &[u8]| {
         .flat_map(|j| j.parts.iter())
         .map(|p| offered.iter().find(|(n, _)| n == p).map_or(0, |(_, l)| *l))
         .sum();
-    assert_eq!(joined_bytes, parts_bytes, "a joined set has other bytes than its parts");
+    assert_eq!(
+        joined_bytes, parts_bytes,
+        "a joined set has other bytes than its parts"
+    );
 
     // The RAR joiner: the files, in order, as the volumes of one set.
     let volumes: Vec<&[u8]> = f.files.iter().map(|(_, b)| *b).collect();
diff --git a/fuzz/fuzz_targets/x86_decode.rs b/fuzz/fuzz_targets/x86_decode.rs
index e1636d89..40062c02 100644
--- a/fuzz/fuzz_targets/x86_decode.rs
+++ b/fuzz/fuzz_targets/x86_decode.rs
@@ -33,7 +33,7 @@
 
 #![no_main]
 
-use exav_x86::{decode, Insn, Op, Size};
+use exav_x86::{Insn, Op, Size, decode};
 use iced_x86::{Decoder, DecoderOptions, Instruction, OpKind, Register};
 use libfuzzer_sys::fuzz_target;
 
@@ -228,8 +228,9 @@ fuzz_target!(|data: &[u8]| {
             // Re-decoding from exactly the reported length must agree: a
             // decoder that reads further than it reports would still have
             // passed every check above.
-            let exact = decode(&window[..o.len], ip)
-                .unwrap_or_else(|| panic!("{window:02x?} does not decode from its own {} bytes", o.len));
+            let exact = decode(&window[..o.len], ip).unwrap_or_else(|| {
+                panic!("{window:02x?} does not decode from its own {} bytes", o.len)
+            });
             assert_eq!(exact.len, o.len, "length not self-consistent");
             assert_eq!(exact.mn, o.mn, "mnemonic not self-consistent");
 
diff --git a/fuzz/fuzz_targets/yara.rs b/fuzz/fuzz_targets/yara.rs
index 02ad7cfa..ddfba70f 100644
--- a/fuzz/fuzz_targets/yara.rs
+++ b/fuzz/fuzz_targets/yara.rs
@@ -25,7 +25,9 @@ fuzz_target!(|input: &[u8]| {
     let [lo, hi, rest @ ..] = input else {
         return;
     };
-    let len = (u16::from_le_bytes([*lo, *hi]) as usize).min(rest.len()).min(MAX_RULES);
+    let len = (u16::from_le_bytes([*lo, *hi]) as usize)
+        .min(rest.len())
+        .min(MAX_RULES);
     let (text, data) = rest.split_at(len);
     let Ok(text) = std::str::from_utf8(text) else {
         return;
diff --git a/fuzz/seeds/docs_doc/word6.cfb b/fuzz/seeds/docs_doc/word6.cfb
new file mode 100644
index 00000000..68823921
Binary files /dev/null and b/fuzz/seeds/docs_doc/word6.cfb differ
diff --git a/fuzz/seeds/fsimage/cramfs.bin b/fuzz/seeds/fsimage/cramfs.bin
new file mode 100644
index 00000000..0c259d2a
Binary files /dev/null and b/fuzz/seeds/fsimage/cramfs.bin differ
diff --git a/fuzz/seeds/fsimage/erofs.bin b/fuzz/seeds/fsimage/erofs.bin
new file mode 100644
index 00000000..2e2e57bf
Binary files /dev/null and b/fuzz/seeds/fsimage/erofs.bin differ
diff --git a/fuzz/seeds/fsimage/exfat.bin b/fuzz/seeds/fsimage/exfat.bin
new file mode 100644
index 00000000..387ac495
Binary files /dev/null and b/fuzz/seeds/fsimage/exfat.bin differ
diff --git a/fuzz/seeds/fsimage/ext2.bin b/fuzz/seeds/fsimage/ext2.bin
new file mode 100644
index 00000000..e3eb01fe
Binary files /dev/null and b/fuzz/seeds/fsimage/ext2.bin differ
diff --git a/fuzz/seeds/fsimage/ext4_inline.bin b/fuzz/seeds/fsimage/ext4_inline.bin
new file mode 100644
index 00000000..54b9252e
Binary files /dev/null and b/fuzz/seeds/fsimage/ext4_inline.bin differ
diff --git a/fuzz/seeds/fsimage/make.py b/fuzz/seeds/fsimage/make.py
new file mode 100644
index 00000000..248eb947
--- /dev/null
+++ b/fuzz/seeds/fsimage/make.py
@@ -0,0 +1,182 @@
+#!/usr/bin/env python3
+"""Write the seeds of the `fsimage` fuzz target into this directory.
+
+    python3 make.py
+
+Each seed is the byte that picks the format (the index in FORMATS of
+fuzz_targets/fsimage.rs) and a small image of a tree of three files and a
+folder. The images are made by e2fsprogs, squashfs-tools, mkcramfs
+(github.com/npitre/cramfs-tools), genromfs, erofs-utils and 7-Zip; the exFAT,
+xar and WIM ones are written here (the exFAT tool makes it too big, and the WIM
+has chunks stored as they are, so that it needs no codec). The last six are the same
+volumes behind a partition table that says each is 128 KiB, over the target's
+buffer limit, so that they are walked where they lie (and the images cut short
+at their end, as a seed is).
+"""
+import os
+import struct
+import subprocess
+import sys
+import tempfile
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+EXT, EXFAT, SQUASHFS, CRAMFS, ROMFS, EROFS, PARTITION, SEVENZ, WIM, XAR = range(10)
+
+
+def run(*cmd):
+    subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+
+def trimmed(path):
+    d = open(path, "rb").read().rstrip(b"\0")
+    return d + b"\0" * (-len(d) % 512)
+
+
+def exfat():
+    """A volume of 512-byte clusters: the root in cluster 2, `a.txt` in 3,
+    `sub` in 4 holding `b.bin` in 5 to 10."""
+    img = bytearray(8 * 512 + 100 * 512)
+    img[0] = 0xEB
+    img[3:11] = b"EXFAT   "
+    struct.pack_into("<QIIIII", img, 72, 108, 1, 4, 8, 100, 2)
+    struct.pack_into("<H", img, 104, 0x0100)
+    img[108], img[109], img[110] = 9, 0, 1
+    img[510:512] = b"\x55\xaa"
+
+    def link(c, nxt):
+        struct.pack_into("<I", img, 512 + c * 4, nxt)
+
+    def entry_set(name, attr, first, size, in_a_row):
+        units = name.encode("utf-16-le")
+        names = [units[i : i + 30] for i in range(0, len(units), 30)]
+        file = bytearray(32)
+        file[0], file[1] = 0x85, 1 + len(names)
+        struct.pack_into("<H", file, 4, attr)
+        stream = bytearray(32)
+        stream[0], stream[1], stream[3] = 0xC0, 1 | (2 if in_a_row else 0), len(units) // 2
+        struct.pack_into("<Q", stream, 8, size)
+        struct.pack_into("<I", stream, 20, first)
+        struct.pack_into("<Q", stream, 24, size)
+        out = [bytes(file), bytes(stream)]
+        for n in names:
+            out.append(bytes([0xC1, 0]) + n.ljust(30, b"\0"))
+        return b"".join(out)
+
+    def put(c, data):
+        at = 8 * 512 + (c - 2) * 512
+        img[at : at + len(data)] = data
+
+    link(2, 0xFFFFFFFF)
+    put(2, entry_set("a.txt", 0x20, 3, 6, True) + entry_set("sub", 0x10, 4, 512, True))
+    put(3, b"hello\n")
+    link(4, 0xFFFFFFFF)
+    put(4, entry_set("b.bin", 0x20, 5, 3000, True))
+    put(5, bytes((i * 7) % 251 for i in range(3000)))
+    return bytes(img)
+
+
+def xar():
+    """An archive with one member stored zlib-compressed and one as it is."""
+    import zlib
+
+    big = bytes((i * 31) % 251 for i in range(3000))
+    heap = b""
+    files = ""
+    for name, data, deflate in (("a.bin", big, True), ("b.txt", b"hello\n", False)):
+        stored = zlib.compress(data) if deflate else data
+        style = "application/x-gzip" if deflate else "application/octet-stream"
+        files += (
+            f"<file><name>{name}</name><data><offset>{len(heap)}</offset>"
+            f"<length>{len(stored)}</length><size>{len(data)}</size>"
+            f'<encoding style="{style}"/></data></file>'
+        )
+        heap += stored
+    toc = f"<xar><toc>{files}</toc></xar>".encode()
+    packed = zlib.compress(toc)
+    head = b"xar!" + struct.pack(">HHQQI", 28, 1, len(packed), len(toc), 1)
+    return head + packed + heap
+
+
+def wim():
+    """An image of one resource of three chunks, stored as they are (so that
+    no codec is needed), and one that is not compressed."""
+    chunk = 1024
+    data = bytes((i * 13) % 241 for i in range(3000))
+    table = struct.pack("<II", chunk, 2 * chunk)
+    first = table + data
+    second = bytes((i * 7) % 251 for i in range(100))
+
+    def resource(size, flags, offset, original):
+        return size.to_bytes(7, "little") + bytes([flags]) + struct.pack("<QQ", offset, original)
+
+    at_first, at_second = 208, 208 + len(first)
+    at_table = at_second + len(second)
+    entries = b"".join(
+        resource(*r) + struct.pack("<HI", 1, 1) + bytes(20)
+        for r in (
+            (len(first), 0x04, at_first, len(data)),
+            (len(second), 0x00, at_second, len(second)),
+        )
+    )
+    head = bytearray(208)
+    head[0:8] = b"MSWIM\0\0\0"
+    struct.pack_into("<III", head, 8, 208, 0x10D00, 0x2 | 0x20000)
+    struct.pack_into("<I", head, 20, chunk)
+    head[48:72] = resource(len(entries), 0x00, at_table, len(entries))
+    return bytes(head) + first + second + entries
+
+
+def mbr(volume):
+    """A disk with an MBR listing one partition of 128 KiB at 4 KiB: not at 512
+    bytes, where a cramfs with room for boot code has its superblock."""
+    table = bytearray(4096)
+    table[0x1BE + 4] = 0x83
+    struct.pack_into("<II", table, 0x1BE + 8, 8, 256)
+    table[510:512] = b"\x55\xaa"
+    return bytes(table) + volume
+
+
+def main():
+    with tempfile.TemporaryDirectory() as w:
+        tree = os.path.join(w, "tree")
+        os.makedirs(os.path.join(tree, "sub"))
+        open(os.path.join(tree, "a.txt"), "w").write("hello\n")
+        open(os.path.join(tree, "empty"), "w").close()
+        open(os.path.join(tree, "sub", "b.bin"), "wb").write(bytes((i * 7) % 251 for i in range(3000)))
+
+        def path(n):
+            return os.path.join(w, n)
+
+        images = {}
+        run("truncate", "-s", "128K", path("ext2"))
+        run("mke2fs", "-q", "-F", "-t", "ext2", "-b", "1024", "-N", "16", "-O", "^resize_inode", "-d", tree, path("ext2"))
+        images["ext2"] = (EXT, trimmed(path("ext2")))
+        run("truncate", "-s", "256K", path("ext4"))
+        run("mke2fs", "-q", "-F", "-t", "ext4", "-b", "1024", "-N", "16", "-O", "^has_journal,^resize_inode,inline_data", "-d", tree, path("ext4"))
+        images["ext4_inline"] = (EXT, trimmed(path("ext4")))
+        for c in ("gzip", "lzo", "xz", "zstd", "lz4", "lzma"):
+            run("mksquashfs", tree, path(c), "-comp", c, "-noappend", "-quiet")
+            images["squashfs_" + c] = (SQUASHFS, open(path(c), "rb").read())
+        run(os.environ.get("MKCRAMFS", "mkcramfs"), tree, path("cram"))
+        images["cramfs"] = (CRAMFS, open(path("cram"), "rb").read())
+        run("genromfs", "-f", path("rom"), "-d", tree)
+        images["romfs"] = (ROMFS, open(path("rom"), "rb").read())
+        run("mkfs.erofs", path("ero"), tree)
+        images["erofs"] = (EROFS, trimmed(path("ero")))
+        images["exfat"] = (EXFAT, exfat())
+        run("7z", "a", "-t7z", "-ms=on", "-mx=1", path("seven.7z"), tree + "/*")
+        images["sevenz"] = (SEVENZ, open(path("seven.7z"), "rb").read())
+        images["xar"] = (XAR, xar())
+        images["wim"] = (WIM, wim())
+
+    for name, (kind, image) in images.items():
+        open(os.path.join(HERE, name + ".bin"), "wb").write(bytes([kind]) + image)
+    # The same volumes behind a partition table.
+    for name in ("ext2", "squashfs_xz", "cramfs", "romfs", "erofs", "exfat"):
+        open(os.path.join(HERE, "partition_" + name + ".bin"), "wb").write(
+            bytes([PARTITION]) + mbr(images[name][1])
+        )
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/fuzz/seeds/fsimage/partition_cramfs.bin b/fuzz/seeds/fsimage/partition_cramfs.bin
new file mode 100644
index 00000000..7971a8e0
Binary files /dev/null and b/fuzz/seeds/fsimage/partition_cramfs.bin differ
diff --git a/fuzz/seeds/fsimage/partition_erofs.bin b/fuzz/seeds/fsimage/partition_erofs.bin
new file mode 100644
index 00000000..8a10232c
Binary files /dev/null and b/fuzz/seeds/fsimage/partition_erofs.bin differ
diff --git a/fuzz/seeds/fsimage/partition_exfat.bin b/fuzz/seeds/fsimage/partition_exfat.bin
new file mode 100644
index 00000000..b1b3463a
Binary files /dev/null and b/fuzz/seeds/fsimage/partition_exfat.bin differ
diff --git a/fuzz/seeds/fsimage/partition_ext2.bin b/fuzz/seeds/fsimage/partition_ext2.bin
new file mode 100644
index 00000000..033510b8
Binary files /dev/null and b/fuzz/seeds/fsimage/partition_ext2.bin differ
diff --git a/fuzz/seeds/fsimage/partition_romfs.bin b/fuzz/seeds/fsimage/partition_romfs.bin
new file mode 100644
index 00000000..f4f5fe88
Binary files /dev/null and b/fuzz/seeds/fsimage/partition_romfs.bin differ
diff --git a/fuzz/seeds/fsimage/partition_squashfs_xz.bin b/fuzz/seeds/fsimage/partition_squashfs_xz.bin
new file mode 100644
index 00000000..99430717
Binary files /dev/null and b/fuzz/seeds/fsimage/partition_squashfs_xz.bin differ
diff --git a/fuzz/seeds/fsimage/romfs.bin b/fuzz/seeds/fsimage/romfs.bin
new file mode 100644
index 00000000..380d7eba
Binary files /dev/null and b/fuzz/seeds/fsimage/romfs.bin differ
diff --git a/fuzz/seeds/fsimage/sevenz.bin b/fuzz/seeds/fsimage/sevenz.bin
new file mode 100644
index 00000000..fd7c9e62
Binary files /dev/null and b/fuzz/seeds/fsimage/sevenz.bin differ
diff --git a/fuzz/seeds/fsimage/squashfs_gzip.bin b/fuzz/seeds/fsimage/squashfs_gzip.bin
new file mode 100644
index 00000000..dd442955
Binary files /dev/null and b/fuzz/seeds/fsimage/squashfs_gzip.bin differ
diff --git a/fuzz/seeds/fsimage/squashfs_lz4.bin b/fuzz/seeds/fsimage/squashfs_lz4.bin
new file mode 100644
index 00000000..e5ce8542
Binary files /dev/null and b/fuzz/seeds/fsimage/squashfs_lz4.bin differ
diff --git a/fuzz/seeds/fsimage/squashfs_lzma.bin b/fuzz/seeds/fsimage/squashfs_lzma.bin
new file mode 100644
index 00000000..0f851aac
Binary files /dev/null and b/fuzz/seeds/fsimage/squashfs_lzma.bin differ
diff --git a/fuzz/seeds/fsimage/squashfs_lzo.bin b/fuzz/seeds/fsimage/squashfs_lzo.bin
new file mode 100644
index 00000000..1dfa71d5
Binary files /dev/null and b/fuzz/seeds/fsimage/squashfs_lzo.bin differ
diff --git a/fuzz/seeds/fsimage/squashfs_xz.bin b/fuzz/seeds/fsimage/squashfs_xz.bin
new file mode 100644
index 00000000..e31df7a3
Binary files /dev/null and b/fuzz/seeds/fsimage/squashfs_xz.bin differ
diff --git a/fuzz/seeds/fsimage/squashfs_zstd.bin b/fuzz/seeds/fsimage/squashfs_zstd.bin
new file mode 100644
index 00000000..b524ddbb
Binary files /dev/null and b/fuzz/seeds/fsimage/squashfs_zstd.bin differ
diff --git a/fuzz/seeds/fsimage/wim.bin b/fuzz/seeds/fsimage/wim.bin
new file mode 100644
index 00000000..59472db3
Binary files /dev/null and b/fuzz/seeds/fsimage/wim.bin differ
diff --git a/fuzz/seeds/fsimage/xar.bin b/fuzz/seeds/fsimage/xar.bin
new file mode 100644
index 00000000..4374e88f
Binary files /dev/null and b/fuzz/seeds/fsimage/xar.bin differ
diff --git a/fuzz/seeds/lzo/make.py b/fuzz/seeds/lzo/make.py
new file mode 100644
index 00000000..773da8b8
--- /dev/null
+++ b/fuzz/seeds/lzo/make.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+"""Write the seeds of the `lzo` fuzz target into this directory.
+
+    python3 make.py
+
+Each seed is the most the decoder may write (two bytes, little-endian) and the
+LZO1X stream of the first block of a file compressed by `lzop`, at levels 1 and
+9, of text and of bytes that are runs and noise.
+"""
+import os
+import random
+import struct
+import subprocess
+import sys
+import tempfile
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+
+def first_block(lzo):
+    """The compressed first block of an lzop file, and its uncompressed size."""
+    p = 9 + 2 + 2 + 2 + 1 + 1
+    (flags,) = struct.unpack_from(">I", lzo, p)
+    p += 4
+    if flags & 0x800:
+        p += 4
+    p += 4 + 4 + 4
+    p += 1 + lzo[p] + 4
+    usize, csize = struct.unpack_from(">II", lzo, p)
+    p += 8
+    # The checksums of the uncompressed data, and of the compressed if it is.
+    p += 4 * ((flags & 1) + ((flags >> 8) & 1))
+    if csize < usize:
+        p += 4 * (((flags >> 1) & 1) + ((flags >> 9) & 1))
+    return lzo[p : p + csize], usize
+
+
+def main():
+    rnd = random.Random(7)
+    text = (b"the quick brown fox jumps over the lazy dog. " * 40 + bytes(range(256)) * 3) * 4
+    mixed = b"".join(
+        bytes([rnd.randrange(256)]) * rnd.randrange(1, 40) if i % 3 else rnd.randbytes(rnd.randrange(1, 30))
+        for i in range(600)
+    )
+    with tempfile.TemporaryDirectory() as w:
+        for name, data in (("text", text), ("mixed", mixed)):
+            src = os.path.join(w, name)
+            open(src, "wb").write(data)
+            for level in ("-1", "-9"):
+                out = subprocess.run(
+                    ["lzop", level, "-c", src], check=True, capture_output=True
+                ).stdout
+                block, usize = first_block(out)
+                open(os.path.join(HERE, f"{name}{level}.bin"), "wb").write(
+                    struct.pack("<H", min(usize, 0xFFFF)) + block
+                )
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/fuzz/seeds/lzo/mixed-1.bin b/fuzz/seeds/lzo/mixed-1.bin
new file mode 100644
index 00000000..c2a687bf
Binary files /dev/null and b/fuzz/seeds/lzo/mixed-1.bin differ
diff --git a/fuzz/seeds/lzo/mixed-9.bin b/fuzz/seeds/lzo/mixed-9.bin
new file mode 100644
index 00000000..78a4aa61
Binary files /dev/null and b/fuzz/seeds/lzo/mixed-9.bin differ
diff --git a/fuzz/seeds/lzo/text-1.bin b/fuzz/seeds/lzo/text-1.bin
new file mode 100644
index 00000000..7c99a39e
Binary files /dev/null and b/fuzz/seeds/lzo/text-1.bin differ
diff --git a/fuzz/seeds/lzo/text-9.bin b/fuzz/seeds/lzo/text-9.bin
new file mode 100644
index 00000000..0e50c562
Binary files /dev/null and b/fuzz/seeds/lzo/text-9.bin differ
diff --git a/fuzz/seeds/sheets_numbers/index09.xml b/fuzz/seeds/sheets_numbers/index09.xml
new file mode 100644
index 00000000..fdab509e
--- /dev/null
+++ b/fuzz/seeds/sheets_numbers/index09.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<ls:document xmlns:ls="http://developer.apple.com/namespaces/ls" xmlns:sf="http://developer.apple.com/namespaces/sf" xmlns:sfa="http://developer.apple.com/namespaces/sfa" ls:version="92008102400">
+<ls:stylesheet sfa:ID="ss"><sf:styles>
+<sf:paragraphstyle sfa:ID="p" sf:ident="pb"><sf:property-map><sf:fontName><sf:string sfa:string="Cochin-Bold"/></sf:fontName><sf:fontSize><sf:number sfa:number="11"/></sf:fontSize><sf:bold><sf:number sfa:number="1"/></sf:bold><sf:alignment><sf:number sfa:number="2"/></sf:alignment></sf:property-map></sf:paragraphstyle>
+<sf:cell-style sfa:ID="c" sf:ident="cb"><sf:property-map><sf:fill><sf:color sfa:r="1" sfa:g="0" sfa:b="0" sfa:a="0.5"/></sf:fill><sf:SFTCellTextWrapProperty><sf:number sfa:number="0"/></sf:SFTCellTextWrapProperty><sf:SFTCellStylePropertyParagraphStyle><sf:paragraphstyle-ref sfa:IDREF="p"/></sf:SFTCellStylePropertyParagraphStyle></sf:property-map></sf:cell-style>
+<sf:cell-style sfa:ID="cur" sf:parent-ident="cb"><sf:property-map><sf:fill><sf:null/></sf:fill><sf:SFTCellStylePropertyFormatType><sf:number sfa:number="257"/></sf:SFTCellStylePropertyFormatType><sf:SFTCellStylePropertyNumberFormat><sf:number-format sf:format-type="1" sf:format-decimal-places="2" sf:format-currency-code="EUR" sf:format-negative-style="2" sf:format-show-thousands-separator="true" sf:format-use-accounting-style="true"/></sf:SFTCellStylePropertyNumberFormat><sf:SFTCellStylePropertyDateTimeFormat><sf:date-format sfa:ID="df" sf:fmt="EEEE, MMMM d, y"/></sf:SFTCellStylePropertyDateTimeFormat></sf:property-map></sf:cell-style>
+<sf:vector-style sfa:ID="v"><sf:property-map><sf:SFTStrokeProperty><sf:stroke sf:width="1"><sf:pattern sf:type="solid"/><sf:color sfa:w="0.8" sfa:a="1"/></sf:stroke></sf:SFTStrokeProperty></sf:property-map></sf:vector-style>
+<sf:tabular-style sfa:ID="ts"><sf:property-map><sf:SFTTableBandedRowsProperty><sf:number sfa:number="1"/></sf:SFTTableBandedRowsProperty><sf:SFTTableBandedCellFillProperty><sf:color sfa:r="0" sfa:g="0" sfa:b="1" sfa:a="0.25"/></sf:SFTTableBandedCellFillProperty><sf:SFTDefaultBodyVectorStyleProperty><sf:vector-style-ref sfa:IDREF="v"/></sf:SFTDefaultBodyVectorStyleProperty><sf:SFTDefaultHeaderRowCellStyleProperty><sf:cell-style-ref sfa:IDREF="c"/></sf:SFTDefaultHeaderRowCellStyleProperty></sf:property-map></sf:tabular-style>
+</sf:styles></ls:stylesheet>
+<ls:workspace-array><ls:workspace ls:workspace-name="Budget"><ls:page-info><sf:layers><sf:layer><sf:drawables>
+<sf:tabular-info><sf:tabular-model sf:name="T1" sf:id="0A0A" sf:num-header-rows="1" sf:num-header-columns="1" sf:num-footer-rows="1" sf:header-rows-frozen="true" sf:header-columns-frozen="true"><sf:tabular-style-ref sfa:IDREF="ts"/>
+<sf:grid sf:numcols="3" sf:numrows="5"><sf:columns><sf:grid-column sf:width="72"/><sf:grid-column sf:width="144"/><sf:grid-column sf:width="0"/></sf:columns><sf:rows><sf:grid-row sf:height="20"/><sf:grid-row sf:height="30"/></sf:rows>
+<sf:vertical-gridline-styles><sf:style-run sf:gridline-index="1"><sf:vector-style-ref sfa:IDREF="v" sf:start-index="0" sf:stop-index="5"/></sf:style-run></sf:vertical-gridline-styles>
+<sf:datasource>
+<sf:t sf:ct="0" sf:s="c" sf:col-span="2" sf:row-span="1"><sf:ct sfa:s="Head"/></sf:t><sf:s sf:ho="1"/><sf:g sf:s="c"/>
+<sf:n sf:ct="254" sf:s="cur" sf:v="-1.5"/><sf:d sf:s="cur" sf:cell-date="276048000"/><sf:cb sf:v="1"/>
+<sf:pm sf:ct="254"><sf:menu-choices><sf:t sfa:ID="ch1"><sf:ct sfa:s="Home"/></sf:t><sf:n sfa:ID="ch2" sf:v="7"/></sf:menu-choices><sf:proxied-cell-ref sfa:IDREF="ch2"/></sf:pm>
+<sf:n sf:v="1234.5"><sf:cf sf:implicit-format-type="256"><sf:number-format sf:format-type="0" sf:format-decimal-places="65534"/></sf:cf></sf:n>
+<sf:f sf:ct="511"><sf:fo sf:fs="=SUM(B)×2≠IFS($A$2,1)" sf:ht="0A0A" sf:hc="1024"/><sf:r><sf:rn sf:v="5"/></sf:r></sf:f>
+<sf:f><sf:fo sf:fs="=SFTGlobalID_0B0B :: A1:B$1&amp;&quot;x&quot;"/><sf:r><sf:rs><sf:ct sfa:s="kept"/></sf:rs></sf:r></sf:f>
+<sf:f><sf:fo sf:fs="=__CHART(A1)"/></sf:f>
+</sf:datasource></sf:grid></sf:tabular-model></sf:tabular-info>
+<sf:tabular-info><sf:tabular-model sf:name="T2" sf:id="0B0B"><sf:grid sf:numcols="2" sf:numrows="1"><sf:datasource><sf:n sf:v="1"/><sf:t><sf:ct sfa:s="b"/></sf:t></sf:datasource></sf:grid></sf:tabular-model></sf:tabular-info>
+</sf:drawables></sf:layer></sf:layers></ls:page-info></ls:workspace></ls:workspace-array>
+</ls:document>
diff --git a/fuzz/seeds/slides_keynote/keynote1.apxl b/fuzz/seeds/slides_keynote/keynote1.apxl
new file mode 100644
index 00000000..d06593fd
--- /dev/null
+++ b/fuzz/seeds/slides_keynote/keynote1.apxl
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<presentation>
+ <theme slide-size="800 600">
+  <prototype-drawables>
+   <shape stroke-color="0 0 1" stroke-width="3"><styles><fill-style fill-type="color" fill-color="0 1 0"/></styles></shape>
+   <textbox transformation="1 0 0 1 0 0"><content font-name="Helvetica" font-size="18" font-color="g 0"/></textbox>
+  </prototype-drawables>
+  <master-slides>
+   <master-slide id="m1" name="Plain">
+    <background-fill-style fill-type="color" fill-color="0.5 0.5 0.5"/>
+    <drawables>
+     <title size="700 80" location="50 30" vertical-alignment="middle"/>
+     <body size="700 400" location="50 130" bullet-indentation="0 30"/>
+    </drawables>
+    <prototype-bullets>
+     <bullet level="1" marker-type="character"><character-bullet-style size="1"><bullet-characters font-size="20">*</bullet-characters></character-bullet-style><content font-size="20"/></bullet>
+    </prototype-bullets>
+   </master-slide>
+  </master-slides>
+ </theme>
+ <slide-list>
+  <slide master-slide-id="m1">
+   <bullets>
+    <bullet level="0"><content font-size="40" font-color="1 0 0">Title one</content></bullet>
+    <bullet level="1" marker-type="inherited"><content>First point</content></bullet>
+   </bullets>
+   <drawables>
+    <title/>
+    <body/>
+    <textbox size="200 50" transformation="1 0 0 1 100 500"><content>Free <span font-size="30">text</span></content></textbox>
+    <shape path="M 0 0 L 100 0 L 100 50 Z" transformation="0 1 -1 0 300 300"/>
+   </drawables>
+  </slide>
+ </slide-list>
+</presentation>
diff --git a/fuzz/seeds/slides_keynote/keynote2.apxl b/fuzz/seeds/slides_keynote/keynote2.apxl
new file mode 100644
index 00000000..dd5b2650
--- /dev/null
+++ b/fuzz/seeds/slides_keynote/keynote2.apxl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<key:presentation xmlns:key="http://developer.apple.com/namespaces/keynote2" xmlns:sf="http://developer.apple.com/namespaces/sf" xmlns:sfa="http://developer.apple.com/namespaces/sfa">
+ <key:size sfa:w="400" sfa:h="300"/>
+ <key:theme-list><key:theme sfa:ID="th"><key:stylesheet sfa:ID="ss"><sf:styles>
+  <sf:shape-style sfa:ID="fill" sf:ident="fill"><sf:property-map><sf:fill><sf:color sfa:r="0" sfa:g="1" sfa:b="0" sfa:a="1"/></sf:fill><sf:stroke><sf:stroke sf:width="2"><sf:color sfa:r="0" sfa:g="0" sfa:b="1" sfa:a="1"/><sf:pattern sf:type="solid"/></sf:stroke></sf:stroke></sf:property-map></sf:shape-style>
+  <sf:paragraphstyle sfa:ID="big" sf:ident="big"><sf:property-map><sf:fontSize><sf:number sfa:number="48"/></sf:fontSize><sf:fontName><sf:string sfa:string="Helvetica-Bold"/></sf:fontName></sf:property-map></sf:paragraphstyle>
+  <sf:paragraphstyle sfa:ID="small" sf:ident="small" sf:parent-ident="big"><sf:property-map><sf:fontSize><sf:number sfa:number="12"/></sf:fontSize></sf:property-map></sf:paragraphstyle>
+ </sf:styles></key:stylesheet></key:theme></key:theme-list>
+ <key:master-slide-list><key:master-slide sfa:ID="m1"><key:stylesheet sfa:ID="ssm"><sf:parent-ref sfa:IDREF="ss"/><sf:styles/></key:stylesheet><key:page><sf:layers><sf:layer><sf:type><sf:string sfa:string="BGMasterSlideLayer"/></sf:type><sf:drawables>
+  <sf:shape sfa:ID="ms"><sf:geometry><sf:size sfa:w="50" sfa:h="20"/><sf:position sfa:x="0" sfa:y="0"/></sf:geometry><sf:style><sf:shape-style-ref sfa:IDREF="fill"/></sf:style></sf:shape>
+ </sf:drawables></sf:layer></sf:layers></key:page></key:master-slide></key:master-slide-list>
+ <key:slide-list><key:slide sfa:ID="s1"><key:master-ref sfa:IDREF="m1"/><key:bullets><key:headline key:depth="0"><key:text><sf:text-storage><sf:stylesheet-ref sfa:IDREF="ss"/><sf:text-body><sf:p sf:style="big">Title<sf:br/></sf:p></sf:text-body></sf:text-storage></key:text></key:headline></key:bullets><key:page><sf:layers><sf:layer><sf:drawables>
+  <sf:shape sfa:ID="a"><sf:geometry><sf:size sfa:w="100" sfa:h="80"/><sf:position sfa:x="40" sfa:y="150"/></sf:geometry><sf:style><sf:shape-style-ref sfa:IDREF="fill"/></sf:style><sf:path><sf:bezier-path><sf:bezier sfa:path="M 0 0 L 100 0 C 100 40 100 60 100 80 Z"/></sf:bezier-path></sf:path><sf:text><sf:text-storage><sf:stylesheet-ref sfa:IDREF="ss"/><sf:text-body><sf:p sf:style="small">Hello<sf:br/>again<sf:span sf:style="big">!</sf:span><sf:br/></sf:p></sf:text-body></sf:text-storage></sf:text></sf:shape>
+  <sf:media sfa:ID="pic"><sf:geometry><sf:size sfa:w="200" sfa:h="100"/><sf:position sfa:x="150" sfa:y="150"/></sf:geometry><sf:crop-geometry><sf:size sfa:w="100" sfa:h="50"/><sf:position sfa:x="200" sfa:y="175"/></sf:crop-geometry><sf:content><sf:movie-media/></sf:content></sf:media>
+ </sf:drawables></sf:layer></sf:layers></key:page></key:slide></key:slide-list>
+</key:presentation>
diff --git a/fuzz/seeds/slides_ppt/powerpoint95.bin b/fuzz/seeds/slides_ppt/powerpoint95.bin
new file mode 100644
index 00000000..4a37ec6f
Binary files /dev/null and b/fuzz/seeds/slides_ppt/powerpoint95.bin differ
diff --git a/fuzz/seeds/vdisk/dmg_apfs.bin b/fuzz/seeds/vdisk/dmg_apfs.bin
new file mode 100644
index 00000000..d6e3032d
Binary files /dev/null and b/fuzz/seeds/vdisk/dmg_apfs.bin differ
diff --git a/fuzz/seeds/vdisk/dmg_hfsplus.bin b/fuzz/seeds/vdisk/dmg_hfsplus.bin
new file mode 100644
index 00000000..87bc21d0
Binary files /dev/null and b/fuzz/seeds/vdisk/dmg_hfsplus.bin differ
diff --git a/fuzz/seeds/vdisk/qcow2.bin b/fuzz/seeds/vdisk/qcow2.bin
new file mode 100644
index 00000000..d7c87713
Binary files /dev/null and b/fuzz/seeds/vdisk/qcow2.bin differ
diff --git a/fuzz/seeds/vdisk/qcow2_deflate.bin b/fuzz/seeds/vdisk/qcow2_deflate.bin
new file mode 100644
index 00000000..bf40e199
Binary files /dev/null and b/fuzz/seeds/vdisk/qcow2_deflate.bin differ
diff --git a/fuzz/seeds/vdisk/qcow2_zstd.bin b/fuzz/seeds/vdisk/qcow2_zstd.bin
new file mode 100644
index 00000000..2489f92b
Binary files /dev/null and b/fuzz/seeds/vdisk/qcow2_zstd.bin differ
diff --git a/fuzz/seeds/vdisk/vhd.bin b/fuzz/seeds/vdisk/vhd.bin
new file mode 100644
index 00000000..f05cd9dc
Binary files /dev/null and b/fuzz/seeds/vdisk/vhd.bin differ
diff --git a/fuzz/seeds/vdisk/vmdk_sparse.bin b/fuzz/seeds/vdisk/vmdk_sparse.bin
new file mode 100644
index 00000000..53885c5f
Binary files /dev/null and b/fuzz/seeds/vdisk/vmdk_sparse.bin differ
diff --git a/fuzz/seeds/vdisk/vmdk_stream.bin b/fuzz/seeds/vdisk/vmdk_stream.bin
new file mode 100644
index 00000000..17ed37ca
Binary files /dev/null and b/fuzz/seeds/vdisk/vmdk_stream.bin differ
diff --git a/fuzz/support/Cargo.toml b/fuzz/support/Cargo.toml
index 090a8bfe..dc74ccf7 100644
--- a/fuzz/support/Cargo.toml
+++ b/fuzz/support/Cargo.toml
@@ -2,7 +2,7 @@
 name = "exav-fuzz-support"
 version = "0.0.0"
 publish = false
-edition = "2021"
+edition = "2024"
 description = "What the fuzz targets share: the custom mutator and the input framing. No dependencies, so its tests run without the sanitizer build."
 
 [dependencies]
diff --git a/fuzz/support/src/extreme.rs b/fuzz/support/src/extreme.rs
index 09141fe1..616c8187 100644
--- a/fuzz/support/src/extreme.rs
+++ b/fuzz/support/src/extreme.rs
@@ -36,7 +36,7 @@ fn next(state: &mut u32) -> u32 {
 /// `data` as it was) when `seed` does not choose to, or `size` is too small.
 pub fn set_extreme_field(data: &mut [u8], size: usize, seed: u32) -> bool {
     let mut state = seed;
-    if next(&mut state) % 4 != 0 {
+    if !next(&mut state).is_multiple_of(4) {
         return false;
     }
     let width = [2usize, 4, 8][next(&mut state) as usize % 3];
@@ -53,7 +53,11 @@ pub fn set_extreme_field(data: &mut [u8], size: usize, seed: u32) -> bool {
     };
     // Little-endian keeps the low bytes, big-endian the low bytes too (they are
     // at the end of `to_be_bytes`): the field gets the value truncated.
-    let field = if big { &bytes[8 - width..] } else { &bytes[..width] };
+    let field = if big {
+        &bytes[8 - width..]
+    } else {
+        &bytes[..width]
+    };
     data[at..at + width].copy_from_slice(field);
     true
 }
diff --git a/fuzz/support/src/lib.rs b/fuzz/support/src/lib.rs
index f009ca67..21397404 100644
--- a/fuzz/support/src/lib.rs
+++ b/fuzz/support/src/lib.rs
@@ -3,3 +3,4 @@
 
 pub mod extreme;
 pub mod frame;
+pub mod panics;
diff --git a/fuzz/support/src/panics.rs b/fuzz/support/src/panics.rs
new file mode 100644
index 00000000..9f33e8b9
--- /dev/null
+++ b/fuzz/support/src/panics.rs
@@ -0,0 +1,60 @@
+//! Panics of a dependency that exav contains.
+//!
+//! libFuzzer's panic hook aborts the process, so a panic that exav catches with
+//! `catch_unwind` and reports as a file it cannot decode is a crash for the
+//! fuzzer all the same. The ones listed here come from a dependency exav keeps
+//! at the version ClamAV links, so that its hashes are ClamAV's, and are
+//! contained where the dependency is called: the fuzzer should not stop on
+//! them, nor report every file that reaches them again.
+//!
+//! Anything else still aborts. Each entry says what the panic is and what holds
+//! it, so that an entry is removed when its dependency is replaced.
+
+use std::sync::Once;
+
+/// The source files whose panics are contained.
+const CONTAINED: &[(&str, &str)] = &[
+    // zune-jpeg 0.4.21, which decodes the JPEG strips of a TIFF (`tiff` 0.10
+    // pins it, as ClamAV's does), multiplies in its scalar IDCT without room
+    // for the largest coefficients a damaged stream gives. exav's release
+    // profile checks overflow too, so the panic is caught, and the strip is
+    // undecodable. 0.5.15 decodes the file.
+    (
+        "zune-jpeg-0.4.21/src/idct",
+        "IDCT coefficients that overflow",
+    ),
+];
+
+/// Whether a panic at `file` is one that is contained.
+pub fn is_contained(file: &str) -> bool {
+    CONTAINED.iter().any(|(path, _)| file.contains(path))
+}
+
+/// Silences the contained panics for the rest of the process: call it at the
+/// start of a target. The hook libFuzzer installed still gets every other.
+pub fn contained_panics() {
+    static ONCE: Once = Once::new();
+    ONCE.call_once(|| {
+        let previous = std::panic::take_hook();
+        std::panic::set_hook(Box::new(move |info| {
+            if !info.location().is_some_and(|l| is_contained(l.file())) {
+                previous(info);
+            }
+        }));
+    });
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn only_the_listed_files_are_contained() {
+        let idct = "/home/u/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/zune-jpeg-0.4.21/src/idct/scalar.rs";
+        assert!(is_contained(idct));
+        // Another file of the same crate, and another version, are not.
+        assert!(!is_contained(&idct.replace("idct/scalar.rs", "decoder.rs")));
+        assert!(!is_contained(&idct.replace("0.4.21", "0.4.22")));
+        assert!(!is_contained("crates/exav-render/src/formats/image.rs"));
+    }
+}
diff --git a/scripts/bench-speed.sh b/scripts/bench-speed.sh
new file mode 100755
index 00000000..bcb33071
--- /dev/null
+++ b/scripts/bench-speed.sh
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+# Scan speed of exav and clamscan over the same files, one process each.
+#
+#   scripts/bench-speed.sh                       # the *.bin up to 1 MiB of corpus/samples
+#   MAXSZ=4194304 RUNS=5 scripts/bench-speed.sh
+#   CPU=1 scripts/bench-speed.sh                 # pin each run to core 1
+#
+# WHAT IT MEASURES
+#
+#   The wall time of `clamscan -f LIST` and `exav --files-from LIST` over the
+#   same files and the same signatures (the directory freshclam keeps), with
+#   the page cache warm, and each engine on its own. The time to load the
+#   signatures is measured separately, on one tiny file, and taken off, so the
+#   figure is the time to scan, not to start.
+#
+#   The default set is every file of the corpus up to MAXSZ bytes, because the
+#   whole set has to stay in the page cache: a bigger one makes the first
+#   engine pay for the disk and the second read it warm, which is how an
+#   earlier comparison of these two ended up unusable (see
+#   docs/COMPARISON_NOTES.md).
+#
+#   Three rows: ClamAV, exav as shipped, and exav under --clamav-compat (the
+#   limits and the extractors of a stock ClamAV, so the work per file is the
+#   nearest the two come to equal).
+#
+# WHAT IT DOES NOT
+#
+#   It is one machine, one corpus and one signature set. It is no claim about
+#   other hardware, other files, or the daemons (clamd against `exav --listen`),
+#   which pay the load once and scan in parallel.
+#
+# REQUIREMENTS: a release build of exav (`cargo build --release -p exav`),
+# clamscan, /usr/bin/time, and a corpus directory. corpus/ is gitignored.
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+CORPUS="${CORPUS:-$ROOT/corpus/samples}"
+MAXSZ="${MAXSZ:-1048576}"
+# The corpus keeps a .json of metadata beside each sample; only the samples count.
+NAME="${NAME:-*.bin}"
+RUNS="${RUNS:-3}"
+DB="${DB:-/var/lib/clamav}"
+EXAV="${EXAV:-$ROOT/target/release/exav}"
+CLAMSCAN="${CLAMSCAN:-clamscan}"
+CPU="${CPU:-}"
+OUT="${OUT:-$ROOT/target/bench}"
+
+for need in "$EXAV" "$CLAMSCAN"; do
+  command -v "$need" >/dev/null 2>&1 || { echo "error: $need not found" >&2; exit 1; }
+done
+[ -d "$CORPUS" ] || { echo "error: no corpus at $CORPUS" >&2; exit 1; }
+mkdir -p "$OUT"
+
+pin=()
+[ -n "$CPU" ] && pin=(taskset -c "$CPU")
+
+LIST="$OUT/files.txt"
+find "$CORPUS" -type f -name "$NAME" -size -$((MAXSZ + 1))c | LC_ALL=C sort > "$LIST"
+FILES=$(wc -l < "$LIST")
+BYTES=$(xargs -d '\n' stat -c %s < "$LIST" | awk '{s += $1} END {print s}')
+echo "files: $FILES, bytes: $BYTES (up to $MAXSZ each)"
+echo "engines: $("$CLAMSCAN" --version | head -1); $("$EXAV" --version)"
+
+# Warm the page cache, twice, so the first timed run reads no disk.
+xargs -d '\n' cat < "$LIST" > /dev/null
+xargs -d '\n' cat < "$LIST" > /dev/null
+
+# A file every engine knows, to time the start alone.
+EICAR="$OUT/eicar.com"
+printf '%s%s' 'X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-' 'TEST-FILE!$H+H*' > "$EICAR"
+printf '%s\n' "$EICAR" > "$OUT/one.txt"
+
+# run NAME CMD...: wall user sys peak-KiB into $OUT/NAME.time, output into NAME.out
+run() {
+  local name="$1"
+  shift
+  /usr/bin/time -f '%e %U %S %M' -o "$OUT/$name.time" "${pin[@]}" "$@" > "$OUT/$name.out" 2>/dev/null || true
+  # A non-zero exit (a detection) makes time(1) add a line before its own.
+  tail -n 1 "$OUT/$name.time" > "$OUT/$name.time.tmp"
+  mv "$OUT/$name.time.tmp" "$OUT/$name.time"
+}
+
+engine_cmd() {
+  local engine="$1" list="$2"
+  case "$engine" in
+    clamscan) echo "$CLAMSCAN -d $DB --no-summary -f $list" ;;
+    exav) echo "$EXAV -d $DB --files-from $list" ;;
+    exav-compat) echo "$EXAV -d $DB --clamav-compat --files-from $list" ;;
+  esac
+}
+
+median() { sort -n | awk '{a[NR] = $1} END {print a[int((NR + 1) / 2)]}'; }
+
+declare -A LOAD
+for engine in clamscan exav exav-compat; do
+  : > "$OUT/$engine.load"
+  for i in 1 2 3; do
+    run "$engine.load" $(engine_cmd "$engine" "$OUT/one.txt")
+    cut -d' ' -f1 "$OUT/$engine.load.time" >> "$OUT/$engine.load"
+  done
+  LOAD[$engine]=$(median < "$OUT/$engine.load")
+  echo "$engine start (signatures loaded, one file): ${LOAD[$engine]} s"
+done
+
+# Interleave the engines, so a drift in the machine hits each of them.
+for r in $(seq 1 "$RUNS"); do
+  for engine in clamscan exav exav-compat; do
+    run "$engine.$r" $(engine_cmd "$engine" "$LIST")
+    echo "$engine run $r: $(cat "$OUT/$engine.$r.time")"
+  done
+done
+
+echo
+echo "| Engine | Start | Scan (median of $RUNS) | Files/s | MB/s | CPU user | Peak memory | Infected |"
+echo "|---|---|---|---|---|---|---|---|"
+for engine in clamscan exav exav-compat; do
+  wall=$(for r in $(seq 1 "$RUNS"); do cut -d' ' -f1 "$OUT/$engine.$r.time"; done | median)
+  user=$(for r in $(seq 1 "$RUNS"); do cut -d' ' -f2 "$OUT/$engine.$r.time"; done | median)
+  rss=$(for r in $(seq 1 "$RUNS"); do cut -d' ' -f4 "$OUT/$engine.$r.time"; done | median)
+  inf=$(grep -c ' FOUND$' "$OUT/$engine.1.out" || true)
+  awk -v e="$engine" -v w="$wall" -v l="${LOAD[$engine]}" -v u="$user" -v m="$rss" -v n="$FILES" -v b="$BYTES" -v i="$inf" 'BEGIN {
+    s = w - l
+    printf "| %s | %.1f s | %.1f s | %.0f | %.1f | %.1f s | %.0f MB | %d |\n", e, l, s, n / s, b / s / 1e6, u, m / 1024, i
+  }'
+done
diff --git a/scripts/deps-review.py b/scripts/deps-review.py
new file mode 100755
index 00000000..f772d67b
--- /dev/null
+++ b/scripts/deps-review.py
@@ -0,0 +1,627 @@
+#!/usr/bin/env python3
+"""Dependency review report: the facts a release's dependency pass decides on.
+
+    scripts/deps-review.py                 # every workspace, crates.io queried
+    scripts/deps-review.py --offline       # only what the lock files say
+    scripts/deps-review.py --only viewer   # one workspace
+    scripts/deps-review.py --refresh       # ignore the crates.io cache
+
+The process around it, and what each flag means, is in docs/DEPENDENCIES.md
+("Lifecycle"). The hand-kept inputs are docs/dependencies.toml (vendored code,
+pins, patches). Output is Markdown on stdout; nothing in the tree is changed.
+Needs cargo, and network access for crates.io, GitHub and PyPI unless
+--offline.
+"""
+
+import argparse
+import json
+import re
+import subprocess
+import sys
+import time
+import tomllib
+import urllib.error
+import urllib.request
+from datetime import datetime, timezone
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parent.parent
+REGISTER = ROOT / "docs" / "dependencies.toml"
+CACHE = ROOT / "target" / "deps-review-cache.json"
+UA = "exav-deps-review (https://github.com/sylvinus/exav)"
+
+# The Cargo workspaces, each with its own lock file, and the target whose
+# build is the one that ships ("host" is the machine running this).
+WORKSPACES = {
+    "root": ("Cargo.toml", "host"),
+    "fuzz": ("fuzz/Cargo.toml", "host"),
+    "unpack-wasm": ("crates/exav-unpack-wasm/Cargo.toml", "wasm32-unknown-unknown"),
+    "viewer": ("crates/exav-viewer/Cargo.toml", "wasm32-unknown-unknown"),
+}
+
+# A crate whose newest release is older than this is reported as stale.
+STALE_DAYS = 730
+# Shipped crates with at least this many `unsafe` keywords are listed.
+UNSAFE_LIST_MIN = 1
+UNSAFE_TOP = 30
+
+NOW = datetime.now(timezone.utc)
+
+
+def sh(args, cwd=ROOT):
+    r = subprocess.run(args, cwd=cwd, capture_output=True, text=True)
+    if r.returncode:
+        sys.exit(f"{' '.join(args)}: {r.stderr.strip()}")
+    return r.stdout
+
+
+def host_triple():
+    for line in sh(["rustc", "-vV"]).splitlines():
+        if line.startswith("host:"):
+            return line.split()[1]
+    sys.exit("rustc -vV: no host line")
+
+
+def metadata(manifest, features, platform):
+    """`features` is True (all), False (default) or a list of features alone."""
+    args = ["cargo", "metadata", "--format-version", "1", "--locked", "--manifest-path", manifest,
+            "--filter-platform", host_triple() if platform == "host" else platform]
+    if features is True:
+        args.append("--all-features")
+    elif features:
+        args += ["--no-default-features", "--features", ",".join(features)]
+    return json.loads(sh(args))
+
+
+# ---------------------------------------------------------------- graph
+
+
+class Graph:
+    """The resolved packages of one workspace, split by how they are reached."""
+
+    def __init__(self, manifest, features, platform):
+        m = metadata(manifest, features, platform)
+        self.pkgs = {p["id"]: p for p in m["packages"]}
+        self.members = set(m["workspace_members"])
+        self.edges = {}  # id -> [(dep id, kinds)]
+        for n in m["resolve"]["nodes"]:
+            out = []
+            for d in n["deps"]:
+                kinds = {k["kind"] for k in d["dep_kinds"]}
+                out.append((d["pkg"], kinds))
+            self.edges[n["id"]] = out
+        # A proc-macro crate runs in the compiler: it and what it pulls in are
+        # not in the binary, so the "normal" set stops at it.
+        self.macros = {
+            i for i, p in self.pkgs.items() if any("proc-macro" in t["kind"] for t in p["targets"])
+        }
+        # normal: what the binary links; build: what also runs at build time
+        # (build scripts, proc macros); any: all of it, dev-dependencies too.
+        self.normal = self._reach({None}, stop=self.macros) - self.macros
+        self.build = self._reach({None, "build"})
+        self.any = self._reach({None, "build", "dev"})
+        self.parents = {}
+        for a, deps in self.edges.items():
+            for b, kinds in deps:
+                if kinds & {None, "build"}:
+                    self.parents.setdefault(b, set()).add(a)
+
+    def _reach(self, kinds, stop=frozenset()):
+        seen = set(self.members)
+        todo = list(self.members)
+        while todo:
+            a = todo.pop()
+            if a in stop:
+                continue
+            for b, ks in self.edges.get(a, []):
+                if ks & kinds and b not in seen:
+                    seen.add(b)
+                    todo.append(b)
+        return seen
+
+    def alone(self, name):
+        """The shipped crates that leave the tree if the members stop depending
+        on `name` (it stays if something else in the tree needs it)."""
+        seen = set(self.members)
+        todo = list(self.members)
+        while todo:
+            a = todo.pop()
+            if a in self.macros:
+                continue
+            for b, ks in self.edges.get(a, []):
+                if None in ks and b not in seen and not (a in self.members and self.pkgs[b]["name"] == name):
+                    seen.add(b)
+                    todo.append(b)
+        return (self.normal - seen) - self.macros
+
+    def external(self, ids):
+        return [self.pkgs[i] for i in ids if i not in self.members and self.pkgs[i]["source"]]
+
+    def local(self, ids):
+        """Path packages outside the workspace (vendored patches)."""
+        return [self.pkgs[i] for i in ids if i not in self.members and not self.pkgs[i]["source"]]
+
+    def role(self, pid):
+        if pid in self.normal:
+            return "shipped"
+        if pid in self.build:
+            return "build"
+        return "dev"
+
+    def pulled_by(self, pid):
+        names = sorted({self.pkgs[p]["name"] for p in self.parents.get(pid, ())})
+        return names
+
+
+# ---------------------------------------------------------------- unsafe
+
+_BLOCK = re.compile(r"/\*.*?\*/", re.S)
+_LINE = re.compile(r"//.*$", re.M)
+_UNSAFE = re.compile(r"\bunsafe\b")
+_FORBID = re.compile(r"#!\[(?:forbid|deny)\(\s*unsafe_code\s*\)\]")
+_GATED = re.compile(r"#!\[cfg_attr\(([^\]]*?),\s*(?:forbid|deny)\(\s*unsafe_code\s*\)\s*\)\]", re.S)
+
+
+def unsafe_uses(pkg):
+    """(count of the `unsafe` keyword in src/ with comments stripped, how it is forbidden).
+
+    The second is "", "forbid", or "forbid when <cfg>" for a crate that forbids
+    it only under a condition (its SIMD feature off): then the count is code
+    that may not be compiled in.
+    """
+    src = Path(pkg["manifest_path"]).parent / "src"
+    n, note = 0, ""
+    if not src.is_dir():
+        return 0, ""
+    for f in src.rglob("*.rs"):
+        try:
+            text = f.read_text(errors="replace")
+        except OSError:
+            continue
+        text = _LINE.sub("", _BLOCK.sub("", text))
+        n += len(_UNSAFE.findall(text))
+        if f.name in ("lib.rs", "main.rs"):
+            if _FORBID.search(text):
+                note = "forbid"
+            elif not note and (g := _GATED.search(text)):
+                note = "forbid when " + " ".join(g.group(1).split())
+    return n, note
+
+
+# ---------------------------------------------------------------- registries
+
+
+class Net:
+    def __init__(self, offline, refresh):
+        self.offline = offline
+        self.cache = {}
+        if CACHE.exists() and not refresh:
+            try:
+                self.cache = json.loads(CACHE.read_text())
+            except ValueError:
+                self.cache = {}
+        self.last = 0.0
+        self.dirty = False
+
+    def get(self, url):
+        c = self.cache.get(url)
+        if c and time.time() - c["at"] < 86400:
+            return c["body"]
+        if self.offline:
+            return c["body"] if c else None
+        wait = 1.1 - (time.time() - self.last)  # crates.io asks for 1 request a second
+        if wait > 0:
+            time.sleep(wait)
+        self.last = time.time()
+        req = urllib.request.Request(url, headers={"User-Agent": UA})
+        try:
+            with urllib.request.urlopen(req, timeout=30) as r:
+                body = json.load(r)
+        except (urllib.error.URLError, ValueError, TimeoutError) as e:
+            print(f"<!-- {url}: {e} -->", file=sys.stderr)
+            return c["body"] if c else None
+        self.cache[url] = {"at": time.time(), "body": body}
+        self.dirty = True
+        return body
+
+    def save(self):
+        if self.dirty:
+            CACHE.parent.mkdir(parents=True, exist_ok=True)
+            CACHE.write_text(json.dumps(self.cache))
+
+    def crate(self, name):
+        return self.get(f"https://crates.io/api/v1/crates/{name}")
+
+
+def vkey(v):
+    """Sort key of a version string; pre-releases sort below their release."""
+    core, _, pre = v.partition("-")
+    nums = [int(x) if x.isdigit() else 0 for x in core.split("+")[0].split(".")]
+    return (nums + [0, 0, 0])[:3], pre == "", pre
+
+
+def breaking(a, b):
+    """True when moving from a to b is a semver-breaking change."""
+    x, y = vkey(a)[0], vkey(b)[0]
+    if x[0] != y[0]:
+        return True
+    if x[0] == 0:
+        return x[1] != y[1] or (x[1] == 0 and x[2] != y[2])
+    return False
+
+
+def parse_date(s):
+    return datetime.fromisoformat(s.replace("Z", "+00:00"))
+
+
+def crate_facts(net, name, version):
+    """What crates.io says about a resolved crate, or None."""
+    d = net.crate(name)
+    if not d or "versions" not in d:
+        return None
+    vs = d["versions"]
+    stable = [v for v in vs if not v["yanked"] and "-" not in v["num"]]
+    latest = max(stable, key=lambda v: vkey(v["num"]), default=None)
+    mine = next((v for v in vs if v["num"] == version), None)
+    year_ago = NOW.timestamp() - 365 * 86400
+    return {
+        "latest": latest["num"] if latest else None,
+        "latest_date": parse_date(latest["created_at"]) if latest else None,
+        "latest_msrv": latest.get("rust_version") if latest else None,
+        "yanked": bool(mine and mine["yanked"]),
+        "date": parse_date(mine["created_at"]) if mine else None,
+        "releases_year": sum(1 for v in vs if parse_date(v["created_at"]).timestamp() > year_ago),
+        "repository": d["crate"].get("repository"),
+    }
+
+
+def member_text(crate_dir):
+    """Every Rust source of a workspace member, to look names up in."""
+    parts = []
+    for f in crate_dir.rglob("*.rs"):
+        if "target" in f.relative_to(crate_dir).parts or "node_modules" in f.parts:
+            continue
+        try:
+            parts.append(f.read_text(errors="replace"))
+        except OSError:
+            continue
+    return "\n".join(parts)
+
+
+def msrv_of(manifest):
+    t = tomllib.loads((ROOT / manifest).read_text())
+    return t.get("workspace", {}).get("package", {}).get("rust-version")
+
+
+def newer_msrv(req, have):
+    if not req or not have:
+        return False
+    return vkey(req)[0] > vkey(have)[0]
+
+
+# ---------------------------------------------------------------- register
+
+
+def load_register():
+    if not REGISTER.exists():
+        sys.exit(f"{REGISTER.relative_to(ROOT)} is missing")
+    return tomllib.loads(REGISTER.read_text())
+
+
+def upstream_latest(net, entry):
+    """The newest upstream release of a vendored source, as text."""
+    kind = entry.get("track", "none")
+    ref = entry.get("upstream", "")
+    if kind == "crates":
+        d = net.crate(ref)
+        if d and "crate" in d:
+            c = d["crate"]
+            return f"{c['max_stable_version']} ({c['updated_at'][:10]})"
+    elif kind == "github":
+        d = net.get(f"https://api.github.com/repos/{ref}/releases/latest")
+        if d and d.get("tag_name"):
+            return f"{d['tag_name']} ({d['published_at'][:10]})"
+        d = net.get(f"https://api.github.com/repos/{ref}/tags?per_page=1")
+        if isinstance(d, list) and d:
+            return d[0]["name"]
+    elif kind == "pypi":
+        d = net.get(f"https://pypi.org/pypi/{ref}/json")
+        if d and "info" in d:
+            return d["info"]["version"]
+    return None
+
+
+def declared_pins(manifests):
+    """Every `=` requirement in a manifest: {(crate): {manifests}}."""
+    pins = {}
+    for path in manifests:
+        t = tomllib.loads(path.read_text())
+        tables = [t.get("dependencies", {}), t.get("dev-dependencies", {}), t.get("build-dependencies", {})]
+        tables.append(t.get("workspace", {}).get("dependencies", {}))
+        for tgt in t.get("target", {}).values():
+            tables += [tgt.get("dependencies", {}), tgt.get("dev-dependencies", {})]
+        for tab in tables:
+            for key, spec in tab.items():
+                req = spec if isinstance(spec, str) else spec.get("version", "")
+                if isinstance(req, str) and req.startswith("="):
+                    name = spec.get("package", key) if isinstance(spec, dict) else key
+                    pins.setdefault(name, set()).add(str(path.relative_to(ROOT)))
+    return pins
+
+
+def manifest_files():
+    out = []
+    for p in ROOT.rglob("Cargo.toml"):
+        rel = p.relative_to(ROOT).parts
+        if rel[0] in ("target", "node_modules", "tmp", "corpus") or "node_modules" in rel or "target" in rel:
+            continue
+        if "vendor" in rel or "scripts" in rel:
+            continue
+        out.append(p)
+    return out
+
+
+def patches(manifests):
+    found = {}
+    for path in manifests:
+        t = tomllib.loads(path.read_text())
+        for reg, tab in t.get("patch", {}).items():
+            for name, spec in tab.items():
+                found.setdefault(name, set()).add(str(path.relative_to(ROOT)))
+    return found
+
+
+# ---------------------------------------------------------------- report
+
+
+def table(head, rows):
+    if not rows:
+        return "_none_\n"
+    out = ["| " + " | ".join(head) + " |", "|" + "|".join("---" for _ in head) + "|"]
+    for r in rows:
+        out.append("| " + " | ".join(str(c) for c in r) + " |")
+    return "\n".join(out) + "\n"
+
+
+def age(d):
+    if not d:
+        return "?"
+    days = (NOW - d).days
+    return f"{days / 365:.1f}y" if days >= 365 else f"{days}d"
+
+
+def report_register(net, reg):
+    print("## Register\n")
+    manifests = manifest_files()
+    pins = declared_pins(manifests)
+    registered = {p["crate"]: p for p in reg.get("pin", [])}
+    rows = []
+    for name in sorted(set(pins) | set(registered)):
+        where = ", ".join(sorted(pins.get(name, ()))) or "-"
+        if name not in registered:
+            status = "**no register entry**"
+        elif name not in pins:
+            status = "**pin gone from the manifests**"
+        else:
+            status = "ok"
+        rows.append((f"`{name}`", where, status))
+    print("### Pins (`=` requirements)\n")
+    print(table(["crate", "manifests", "register"], [r for r in rows if r[2] != "ok"] or [("all pins are in the register", "", "")]))
+
+    print("### Patches (`[patch]`)\n")
+    found = patches(manifests)
+    reg_patch = {p["crate"] for p in reg.get("patch", [])}
+    rows = []
+    for name in sorted(set(found) | reg_patch):
+        rows.append((f"`{name}`", ", ".join(sorted(found.get(name, ()))) or "-",
+                     "ok" if name in found and name in reg_patch else "**mismatch with the register**"))
+    print(table(["crate", "manifests", "register"], rows))
+
+    print("### Vendored code against its upstream\n")
+    rows = []
+    for v in reg.get("vendored", []):
+        up = upstream_latest(net, v) if v.get("track", "none") != "none" else None
+        ours = v.get("version", "unrecorded")
+        flag = ""
+        if not Path(ROOT / v["path"]).exists():
+            flag = "**path is gone**"
+        elif ours == "unrecorded":
+            flag = "record the upstream version"
+        elif up and not up.lstrip("v").startswith(ours):
+            flag = "upstream moved"
+        rows.append((f"`{v['path']}`", v["upstream"], ours, up or "not tracked", v["kind"], flag))
+    print(table(["where", "upstream", "vendored", "upstream now", "kind", "flag"], rows))
+
+
+def report_workspace(name, manifest, platform, net):
+    print(f"## Workspace `{name}`\n")
+    msrv = msrv_of("Cargo.toml")
+    g_def = Graph(manifest, False, platform)
+    g_all = Graph(manifest, True, platform)
+    ext_all = g_all.external(g_all.any)
+    if manifest == "Cargo.toml":
+        # What `cargo build -p exav` links: the members' features do not unify.
+        out = sh(["cargo", "tree", "--locked", "-p", "exav", "-e", "normal", "--prefix", "none",
+                  "--format", "{p}", "--target", host_triple() if platform == "host" else platform])
+        linked = {tuple(l.split()[:2]) for l in out.splitlines() if l.strip()}
+        default_ids = {i for i in g_all.normal if i not in g_all.members
+                       and (g_all.pkgs[i]["name"], "v" + g_all.pkgs[i]["version"]) in linked}
+    elif name == "viewer":
+        # One wasm module per feature: what ships is their union, and each
+        # module carries only its own crates.
+        features = [f for f in tomllib.loads((ROOT / manifest).read_text())["features"] if f != "default"]
+        per_module, union = [], set()
+        for f in features:
+            g = Graph(manifest, [f], platform)
+            keys = {(p["name"], p["version"]) for p in g.external(g.normal)}
+            per_module.append((f, keys))
+            union |= keys
+        default_ids = {i for i in g_all.normal if i not in g_all.members
+                       and (g_all.pkgs[i]["name"], g_all.pkgs[i]["version"]) in union}
+    else:
+        default_ids = {p["id"] for p in g_def.external(g_def.normal)}
+
+    declared = {}
+    for mid in g_all.members:
+        mp = g_all.pkgs[mid]
+        for d in mp["dependencies"]:
+            if d["source"] and d["source"].startswith("registry"):
+                declared.setdefault(d["name"], set()).add((mp["name"], d["req"], d["kind"] or "normal", d["optional"]))
+
+    facts = {p["id"]: crate_facts(net, p["name"], p["version"]) for p in ext_all}
+    unsafe = {p["id"]: unsafe_uses(p) for p in ext_all + g_all.local(g_all.any)}
+
+    role_n = {"shipped": 0, "build": 0, "dev": 0}
+    for p in ext_all:
+        role_n[g_all.role(p["id"])] += 1
+    default_unsafe = sum(unsafe[i][0] for i in default_ids)
+    all_unsafe = sum(unsafe[p["id"]][0] for p in ext_all if g_all.role(p["id"]) == "shipped")
+    print(f"- {len(ext_all)} external crates with every feature on: "
+          f"{role_n['shipped']} shipped, {role_n['build']} build-time only, {role_n['dev']} dev only.")
+    shipped_names = {}
+    for p in ext_all:
+        if g_all.role(p["id"]) == "shipped":
+            shipped_names.setdefault(p["name"], []).append(p["version"])
+    twice = sum(1 for v in shipped_names.values() if len(v) > 1)
+    print(f"- Shipped for `{platform}` with default features: {len(default_ids)} crates, "
+          f"{default_unsafe} `unsafe` keywords in them; every feature on: "
+          f"{sum(len(v) for v in shipped_names.values())} crates, {all_unsafe}; "
+          f"{twice} crates at two versions.")
+    local = [p for p in g_all.local(g_all.any) if "/vendor/" in p["manifest_path"]]
+    if local:
+        print("- Patched in from the tree: " + ", ".join(f"`{p['name']} {p['version']}`" for p in local) + ".")
+    print()
+    if name == "viewer":
+        by_key = {(p["name"], p["version"]): unsafe[p["id"]][0] for p in ext_all}
+        print("### Per wasm module\n")
+        print(table(["module", "crates", "unsafe"],
+                    [(f"`{f}`", len(k), sum(by_key.get(x, 0) for x in k)) for f, k in per_module]))
+
+    # The name a crate is used by is its library target's, not its package's.
+    lib_name = {}
+    for p in g_all.pkgs.values():
+        for t in p["targets"]:
+            if "lib" in t["kind"] or "proc-macro" in t["kind"]:
+                lib_name.setdefault(p["name"], t["name"])
+    unused = []
+    for mid in sorted(g_all.members):
+        mp = g_all.pkgs[mid]
+        text = member_text(Path(mp["manifest_path"]).parent)
+        for d in mp["dependencies"]:
+            if not (d["source"] and d["source"].startswith("registry")):
+                continue
+            ident = (d.get("rename") or lib_name.get(d["name"], d["name"])).replace("-", "_")
+            if not re.search(rf"\b{re.escape(ident)}\b", text):
+                unused.append((f"`{d['name']}`", mp["name"], d["kind"] or "normal"))
+    print("### Declared and never named in the crate's sources\n")
+    print("A crate used only through a feature of another (`getrandom` for its `js` feature) is a false positive; read the manifest.\n")
+    print(table(["crate", "declared by", "kind"], unused))
+
+    # ---- findings
+    flags = []
+    names = {}
+    for p in ext_all:
+        names.setdefault(p["name"], []).append(p["version"])
+    for p in sorted(ext_all, key=lambda p: (p["name"], p["version"])):
+        f = facts[p["id"]]
+        u, forbid = unsafe[p["id"]]
+        role = g_all.role(p["id"])
+        fl = []
+        if f:
+            if f["yanked"]:
+                fl.append("**YANKED**")
+            if f["latest"] and vkey(f["latest"]) > vkey(p["version"]):
+                kind = "breaking" if breaking(p["version"], f["latest"]) else "compatible"
+                note = f"{kind} update to {f['latest']} ({age(f['latest_date'])} ago)"
+                if newer_msrv(f["latest_msrv"], msrv):
+                    note += f", needs Rust {f['latest_msrv']}"
+                fl.append(note)
+            if f["latest_date"] and (NOW - f["latest_date"]).days > STALE_DAYS:
+                fl.append(f"stale: last release {age(f['latest_date'])} ago")
+        if len(names[p["name"]]) > 1:
+            fl.append("also at " + ", ".join(v for v in sorted(names[p["name"]]) if v != p["version"]))
+        if fl:
+            flags.append((f"`{p['name']}`", p["version"], role, ", ".join(fl)))
+    print("### Findings\n")
+    print(table(["crate", "locked", "role", "flags"], flags))
+
+    print("### Direct dependencies\n")
+    rows = []
+    for dep in sorted(declared):
+        for pid in (p["id"] for p in ext_all if p["name"] == dep):
+            p = g_all.pkgs[pid]
+            f = facts[pid]
+            u, forbid = unsafe[pid]
+            users = sorted({f"{m}{' (opt)' if o else ''}{'' if k == 'normal' else ' [' + k + ']'}"
+                            for m, r, k, o in declared[dep]})
+            reqs = sorted({r for m, r, k, o in declared[dep]})
+            alone = g_all.alone(dep) if pid in g_all.normal else set()
+            alone_unsafe = sum(unsafe[i][0] for i in alone if i in unsafe)
+            rows.append((f"`{dep}`", ", ".join(f"`{r}`" for r in reqs), p["version"],
+                         f["latest"] if f else "?", age(f["date"]) if f else "?",
+                         f"{f['releases_year']}" if f else "?",
+                         f"none ({forbid})" if forbid and not u else (f"{u} ({forbid})" if forbid else (u or "none")),
+                         f"{len(alone)} / {alone_unsafe}" if alone else "-",
+                         p["license"] or "?", "; ".join(users)))
+    print("`alone`: crates that leave the shipped tree with it, and the `unsafe` in them.\n")
+    print(table(["crate", "req", "locked", "latest", "age", "rel/yr", "unsafe", "alone", "license", "declared by"], rows))
+
+    stats = {"crates": len(default_ids), "unsafe": default_unsafe,
+             "crates_all": sum(len(v) for v in shipped_names.values()), "unsafe_all": all_unsafe,
+             "twice": twice}
+
+    print("### Most `unsafe` in the shipped tree\n")
+    top = sorted(((unsafe[p["id"]][0], p) for p in ext_all if g_all.role(p["id"]) == "shipped"),
+                 key=lambda t: -t[0])
+    rows = []
+    for u, p in top[:UNSAFE_TOP]:
+        if u < UNSAFE_LIST_MIN:
+            break
+        note = unsafe[p["id"]][1]
+        rows.append((f"`{p['name']}`", p["version"], f"{u} ({note})" if note else u,
+                     "default" if p["id"] in default_ids else "feature",
+                     ", ".join(g_all.pulled_by(p["id"])[:6])))
+    print(table(["crate", "version", "unsafe", "in", "pulled in by"], rows))
+    return stats
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    ap.add_argument("--offline", action="store_true", help="use the cache and the lock files only")
+    ap.add_argument("--refresh", action="store_true", help="ignore cached crates.io answers")
+    ap.add_argument("--only", choices=sorted(WORKSPACES) + ["register"], help="one workspace, or the register alone")
+    args = ap.parse_args()
+
+    net = Net(args.offline, args.refresh)
+    reg = load_register()
+    print(f"# Dependency review, {NOW:%Y-%m-%d}\n")
+    last = {r["workspace"]: r for r in reg.get("review", [])}
+    if args.only in (None, "register"):
+        report_register(net, reg)
+    records = []
+    for name, (manifest, platform) in WORKSPACES.items():
+        if args.only in (None, name):
+            stats = report_workspace(name, manifest, platform, net)
+            before = last.get(name)
+            print("### Against the last review\n")
+            if before:
+                print(table(["", "last review (" + before["date"] + ")", "now"], [
+                    (k, before.get(k, "?"), stats[k]) for k in stats]))
+            else:
+                print("_no `[[review]]` entry for this workspace yet_\n")
+            records.append((name, stats))
+    if records and args.only != "register":
+        version = tomllib.loads((ROOT / "Cargo.toml").read_text())["workspace"]["package"]["version"]
+        print("## To record in docs/dependencies.toml at the end of the late pass\n")
+        print("```toml")
+        for name, stats in records:
+            print(f'[[review]]\nworkspace = "{name}"\ndate = "{NOW:%Y-%m-%d}"\nrelease = "{version}"')
+            for k, v in stats.items():
+                print(f"{k} = {v}")
+            print()
+        print("```")
+    net.save()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/formats.mjs b/scripts/formats.mjs
new file mode 100644
index 00000000..0a1086ef
--- /dev/null
+++ b/scripts/formats.mjs
@@ -0,0 +1,238 @@
+#!/usr/bin/env node
+// The format registry (formats/registry.json) against the code and the docs.
+//
+//     node scripts/formats.mjs check      # the registry matches the code, the docs are up to date
+//     node scripts/formats.mjs generate   # writes the generated parts of the docs
+//
+// What `check` compares, and with what:
+//   - the extractor's `Format` enum (crates/exav-unpack/src/lib.rs): every
+//     variant is in the registry, and every registry variant exists;
+//   - the streaming walkers of `dispatch` (crates/exav-unpack/src/stream.rs):
+//     a format is "stream" in the registry exactly when it has one;
+//   - the Cargo features of exav-unpack;
+//   - the scanner's `FileType::as_str` (crates/exav-core/src/filetype.rs);
+//   - the viewer's `BUILTIN_ORDER` (the matchers themselves are compared by the
+//     viewer's own test, ts/core/registry.test.ts) ;
+//   - the generated docs: the matrix page and the summary sentences.
+// The detection of the scanner is compared by a Rust test
+// (crates/exav-core/tests/suites/format_registry.rs). No dependencies.
+import { readFileSync, writeFileSync, existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const repo = join(dirname(fileURLToPath(import.meta.url)), "..");
+const read = (p) => readFileSync(join(repo, p), "utf8");
+export const registry = JSON.parse(read("formats/registry.json"));
+
+const KINDS = Object.keys(registry.kinds);
+const SCAN_MODES = Object.keys(registry.scanModes);
+const READS = ["stream", "members", "whole", "reported"];
+/** FileType values that type no file on their own. */
+const INTERNAL_TYPES = ["graphics", "data", "normalised HTML", "normalised text"];
+
+// ── Checks ───────────────────────────────────────────────────────────────────
+
+/** The text between `start` and the matching closing brace of the block opening at it. */
+function block(text, start) {
+  const open = text.indexOf("{", start);
+  let depth = 0;
+  for (let i = open; i < text.length; i++) {
+    if (text[i] === "{") depth++;
+    else if (text[i] === "}" && --depth === 0) return text.slice(open + 1, i);
+  }
+  throw new Error("unbalanced braces");
+}
+
+export function rustFormats() {
+  const lib = read("crates/exav-unpack/src/lib.rs");
+  const body = block(lib, lib.indexOf("pub enum Format"));
+  return [...body.matchAll(/^\s{4}([A-Z][A-Za-z0-9]*),/gm)].map((m) => m[1]);
+}
+
+export function streamingFormats() {
+  const text = read("crates/exav-unpack/src/stream.rs");
+  const body = block(text, text.indexOf("let walk: WalkFn<T> = match fmt"));
+  return [...body.matchAll(/Format::([A-Za-z0-9]+)\s*=>\s*f::/g)].map((m) => m[1]);
+}
+
+export function unpackFeatures() {
+  const toml = read("crates/exav-unpack/Cargo.toml");
+  const section = toml.slice(toml.indexOf("[features]"));
+  return new Set([...section.matchAll(/^([a-z0-9][a-z0-9-]*)\s*=/gm)].map((m) => m[1]));
+}
+
+export function scannerTypes() {
+  const text = read("crates/exav-core/src/filetype.rs");
+  const body = block(text, text.indexOf("pub fn as_str(self)"));
+  return [...body.matchAll(/FileType::[A-Za-z0-9]+\s*=>\s*"([^"]+)"/g)].map((m) => m[1]);
+}
+
+export function viewerPlugins() {
+  const text = read("crates/exav-viewer/ts/core/formats.ts");
+  const start = text.indexOf("export const BUILTIN_ORDER");
+  return [...text.slice(start, text.indexOf("];", start)).matchAll(/"([a-z0-9]+)"/g)].map((m) => m[1]);
+}
+
+export function problems() {
+  const out = [];
+  const add = (m) => out.push(m);
+  const ids = new Set();
+  const exts = new Map();
+  for (const f of registry.formats) {
+    const where = `format ${f.id}`;
+    if (!/^[a-z0-9][a-z0-9-]*$/.test(f.id ?? "")) add(`${where}: the id is lower-case words`);
+    if (ids.has(f.id)) add(`${where}: duplicate id`);
+    ids.add(f.id);
+    if (typeof f.name !== "string" || !f.name) add(`${where}: no name`);
+    if (!KINDS.includes(f.kind)) add(`${where}: kind ${f.kind} is none of ${KINDS.join(", ")}`);
+    if (!Array.isArray(f.ext) || !Array.isArray(f.mime)) add(`${where}: ext and mime are lists`);
+    for (const e of f.ext ?? []) {
+      if (e !== e.toLowerCase() || !(e.startsWith(".") || e === "winmail.dat")) add(`${where}: extension ${e} is lower case with its dot`);
+      if (exts.has(e)) add(`${where}: extension ${e} is also ${exts.get(e)}'s`);
+      exts.set(e, f.id);
+    }
+    for (const alt of f.magic ?? []) {
+      if (!Array.isArray(alt) || !alt.length || !alt.every((c) => /^\d+:([0-9a-f]{2})+$/.test(c))) add(`${where}: magic is a list of alternatives, each offset:hex conditions`);
+    }
+    if (!f.scan || !SCAN_MODES.includes(f.scan.mode) || !("type" in f.scan)) add(`${where}: scan is { type, mode }`);
+    if (f.unpack !== null && f.unpack !== undefined) {
+      if (!READS.includes(f.unpack.read)) add(`${where}: unpack.read is ${READS.join(", ")}`);
+    } else if (f.unpack === undefined) add(`${where}: unpack is null or an object`);
+    if (f.viewer === undefined) add(`${where}: viewer is a plugin id or null`);
+  }
+
+  // The extractor.
+  const variants = rustFormats();
+  const stream = new Set(streamingFormats());
+  const features = unpackFeatures();
+  const byFormat = new Map();
+  for (const f of registry.formats) {
+    if (!f.unpack) continue;
+    const { format, feature, read } = f.unpack;
+    if (!variants.includes(format)) add(`format ${f.id}: no Format::${format} in exav-unpack`);
+    if (feature !== null && !features.has(feature)) add(`format ${f.id}: exav-unpack has no feature ${feature}`);
+    const reads = byFormat.get(format) ?? new Set();
+    reads.add(read);
+    byFormat.set(format, reads);
+    const walks = read === "stream" || read === "members";
+    if (walks && !stream.has(format)) add(`format ${f.id}: Format::${format} has no walker in stream.rs`);
+    if (!walks && stream.has(format)) add(`format ${f.id}: Format::${format} has a walker in stream.rs, the registry says ${read}`);
+  }
+  for (const v of variants) if (!byFormat.has(v)) add(`Format::${v} is in no registry entry`);
+  for (const [format, reads] of byFormat) if (reads.size > 1) add(`Format::${format} is read ${[...reads].join(" and ")} in different entries`);
+  for (const s of stream) if (!variants.includes(s)) add(`stream.rs walks Format::${s}, which does not exist`);
+
+  // The scanner.
+  const types = new Set(scannerTypes());
+  const used = new Set();
+  for (const f of registry.formats) {
+    const t = f.scan?.type;
+    if (t == null) continue;
+    used.add(t);
+    if (!types.has(t)) add(`format ${f.id}: exav-core has no file type "${t}"`);
+  }
+  for (const t of types) if (!used.has(t) && !INTERNAL_TYPES.includes(t)) add(`exav-core's file type "${t}" is in no registry entry`);
+
+  // The viewer.
+  const plugins = viewerPlugins();
+  const claimed = new Set();
+  for (const f of registry.formats) {
+    if (!f.viewer) continue;
+    claimed.add(f.viewer);
+    if (!plugins.includes(f.viewer)) add(`format ${f.id}: the viewer has no plugin ${f.viewer}`);
+  }
+  for (const p of plugins) if (!claimed.has(p)) add(`the viewer's plugin ${p} is in no registry entry`);
+
+  // The docs.
+  for (const [file, want] of Object.entries(generated())) {
+    if (!existsSync(join(repo, file)) || read(file) !== want) out.push(`${file} is out of date: run node scripts/formats.mjs generate`);
+  }
+  for (const { file, terms } of registry.summaries.checks ?? []) {
+    const text = read(file).toLowerCase();
+    for (const t of terms) if (!text.includes(t.toLowerCase())) add(`${file} does not mention ${t}`);
+  }
+  return out;
+}
+
+// ── Generated docs ───────────────────────────────────────────────────────────
+
+const scanText = (f) => ({ container: "Opened, members scanned", reported: "Reported, not opened", view: "Scanned with its text", type: "Typed, signatures applied", none: "Bytes only" })[f.scan.mode];
+
+const unpackText = (f) => {
+  if (!f.unpack) return "No";
+  return { stream: "Streamed", members: "Read whole, members streamed", whole: "Read whole", reported: "Recognised, reported" }[f.unpack.read];
+};
+
+const viewerText = (f) => (f.viewer ? `\`${f.viewer}\`` : "No");
+
+const escapeCell = (s) => s.replaceAll("|", "\\|");
+
+function matrix() {
+  const lines = [
+    "---",
+    "title: Format matrix",
+    "description: Which of exav's tools reads each file format, the scanner, the extractor or the viewer, and whether the extractor streams it or reads it whole.",
+    "---",
+    "",
+    "<!-- Generated from formats/registry.json by scripts/formats.mjs: edit the registry. -->",
+    "",
+    "One table for \"can exav handle my file\": for each format, what the",
+    "[scanner](/scanner/reference/formats/) does with it, whether the",
+    "[extractor](/unpack/formats/) streams it or reads it whole (a format read",
+    "whole is held in memory up to the buffer limit), and which plugin of the",
+    "[viewer](/viewer/) opens it. The pages of each tool have the detail:",
+    "codecs, encryption, limits.",
+    "",
+    "- **Scanner.** " + Object.entries(registry.scanModes).map(([, d]) => d).join("; ") + ".",
+    "- **Extractor.** *Streamed*: the members are decoded as they are read, at any size. *Read whole*: the container is read into memory first; *members streamed* says the members then come out one at a time. *Recognised, reported*: the format is told apart and the file is reported as not examined, never clean.",
+    "- **Viewer.** The plugin, as `@exav/viewer` names it. *No*: the viewer does not open it.",
+    "",
+  ];
+  for (const [kind, title] of Object.entries(registry.kinds)) {
+    const rows = registry.formats.filter((f) => f.kind === kind);
+    if (!rows.length) continue;
+    lines.push(`## ${title}`, "", "| Format | Extensions | Scanner | Extractor | Viewer |", "|---|---|---|---|---|");
+    for (const f of rows) {
+      const ext = f.ext.length ? f.ext.map((e) => `\`${e}\``).join(" ") : "";
+      lines.push(`| ${escapeCell(f.name)} | ${ext} | ${scanText(f)} | ${unpackText(f)} | ${viewerText(f)} |`);
+    }
+    lines.push("");
+  }
+  return lines.join("\n");
+}
+
+/** `text` with what lies between the markers of `name` replaced. */
+export function withBlock(text, name, body) {
+  const start = `<!-- formats:${name} -->`;
+  const end = `<!-- /formats:${name} -->`;
+  const a = text.indexOf(start);
+  const b = text.indexOf(end);
+  if (a < 0 || b < a) throw new Error(`no ${start} ... ${end} in the file`);
+  return text.slice(0, a + start.length) + body + text.slice(b);
+}
+
+/** The files this script writes, and what they hold. */
+export function generated() {
+  const out = { "www/src/content/docs/project/formats.md": matrix() };
+  for (const file of registry.summaries.files ?? []) {
+    out[file] = withBlock(read(file), "viewer-summary", registry.summaries.viewer);
+  }
+  return out;
+}
+
+// ── Main ─────────────────────────────────────────────────────────────────────
+
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+  const mode = process.argv[2];
+  if (mode === "generate") {
+    for (const [file, text] of Object.entries(generated())) writeFileSync(join(repo, file), text);
+  } else if (mode === "check") {
+    const found = problems();
+    for (const p of found) console.error(`formats: ${p}`);
+    if (found.length) process.exit(1);
+    console.log(`formats: ${registry.formats.length} formats, registry and docs agree`);
+  } else {
+    console.error("usage: node scripts/formats.mjs check | generate");
+    process.exit(2);
+  }
+}
diff --git a/scripts/fuzz-campaign.sh b/scripts/fuzz-campaign.sh
index 0a23a5c7..49140c27 100755
--- a/scripts/fuzz-campaign.sh
+++ b/scripts/fuzz-campaign.sh
@@ -3,18 +3,27 @@
 #
 # WHY A DRIVER AND NOT ONE `cargo fuzz run`: libFuzzer runs one target per
 # process, so a campaign that only ever runs the broadest target never touches
-# the narrow ones — and the narrow targets are where a decoder or a signature
+# the narrow ones, and the narrow targets are where a decoder or a signature
 # compiler gets hostile input directly rather than through a format wrapper.
 # This splits a wall-clock budget across all of them and reports what each one
 # found, so "we fuzzed for an hour" is attributable rather than a slogan.
 #
+# Every `fuzz/fuzz_targets/*.rs` is run unless TARGETS names some. WORKERS
+# targets are fuzzed at a time (one per core); the builds queue behind cargo's
+# lock. A target's slice is what is left of TOTAL, shared among the targets not
+# started yet, so a slow build shortens the slices and never the campaign.
+#
 # Fork mode throughout: the parent keeps going after a child crashes, so one
 # pass yields a batch of distinct artifacts to triage instead of stopping at
-# the first. Each target's corpus persists in a gitignored work dir, so
-# coverage accumulates across campaigns.
+# the first. The timeout and memory limit are CI's (the smoke run), so a
+# finding here is one CI would have made. A unit that takes over SLOW seconds
+# is saved too (`slow-unit-*`): those are the ones that time out on a slower
+# machine. Each target's corpus persists in a gitignored work dir, so coverage
+# accumulates across campaigns. A target's binary is deleted once it has run:
+# each is hundreds of megabytes.
 #
-#   scripts/fuzz-campaign.sh              # one hour, split evenly
-#   TOTAL=1800 scripts/fuzz-campaign.sh   # half an hour
+#   scripts/fuzz-campaign.sh                       # one hour, one worker
+#   TOTAL=25200 WORKERS=3 scripts/fuzz-campaign.sh # seven hours, three at a time
 #   TARGETS="analyze x86_decode" scripts/fuzz-campaign.sh
 set -u
 
@@ -22,17 +31,32 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 cd "$ROOT" || exit 1
 
 TOTAL="${TOTAL:-3600}"
+WORKERS="${WORKERS:-1}"
 WORK="${WORK:-$ROOT/tmp/data}"
+SLOW="${SLOW:-6}"
+KEEP_BINARIES="${KEEP_BINARIES:-0}"
 # Building `exav-core` under AddressSanitizer is the memory peak of the whole
-# repository — one rustc process, one codegen unit, full instrumentation. On a
-# small host it is what the OOM killer reaches for, and a killed build is
-# indistinguishable in the log from a target that ran and found nothing. One
-# job at a time keeps the peak to a single rustc, and splitting the crate into
-# several codegen units keeps that rustc inside a few gigabytes.
-export CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-1}"
+# repository: one rustc process, full instrumentation. On a small host it is
+# what the OOM killer reaches for, and a killed build is indistinguishable in
+# the log from a target that ran and found nothing, so a failed build is
+# reported as such, with its log. Several codegen units keep that rustc inside
+# a few gigabytes.
+export CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-2}"
 CODEGEN_UNITS="${CODEGEN_UNITS:-16}"
+# On aarch64 a fuzz binary has more code than a direct branch reaches (128 MB),
+# and GNU ld stops with "relocation truncated to fit: R_AARCH64_CALL26". LLD adds
+# the branch thunks. cargo-fuzz adds its flags to RUSTFLAGS; the lld setup in
+# .cargo/config.toml does not apply once RUSTFLAGS is set.
+if command -v ld.lld >/dev/null 2>&1; then
+  export RUSTFLAGS="${RUSTFLAGS:-} -C link-arg=-fuse-ld=lld"
+fi
 # Order matters when a campaign is cut short: the broadest targets run first.
-TARGETS="${TARGETS:-analyze full_pipeline unpack seekable yara pcre clamd icap volumes x86_decode pe_emulator imagehash drawing cad_dxf cad_dwg ifc authenticode database cvd bytecode sigs ndb_compile pe filetype rar3_ppmd parser_recursion}"
+FIRST="analyze full_pipeline unpack seekable volumes fsimage vdisk imagehash parser_recursion filetype yara pcre clamd icap"
+if [ -z "${TARGETS:-}" ]; then
+  # The `[[bin]]`s: some files of fuzz_targets/ are modules the targets include.
+  all="$(sed -n 's/^name = "\(.*\)"$/\1/p' fuzz/Cargo.toml | sed 1d)"
+  TARGETS="$FIRST $(printf '%s\n' $all | grep -vxF "$(printf '%s\n' $FIRST)" | tr '\n' ' ')"
+fi
 # Strings the mutator splices in, for the targets whose input is text or a
 # protocol (fuzz/dicts/).
 dict_for() {
@@ -41,70 +65,99 @@ dict_for() {
     pcre) echo pcre ;;
     icap) echo icap ;;
     clamd) echo clamd ;;
+    markdown) echo markdown ;;
     full_pipeline | ndb_compile | sigs | cvd) echo signatures ;;
   esac
 }
 # Seeds from the test fixtures (scripts/fuzz-seeds.sh), unmasked, so outside
 # the repository.
 SEEDS="${SEEDS:-${XDG_CACHE_HOME:-$HOME/.cache}/exav-fuzz-seeds}"
+HOST="$(rustc +nightly -vV | sed -n 's/^host: //p')"
+BIN="$ROOT/fuzz/target/$HOST/release"
 
 n=$(printf '%s\n' $TARGETS | wc -l)
-slice=$((TOTAL / n))
-[ "$slice" -lt 30 ] && slice=30
+START=$(date +%s)
+DEADLINE=$((START + TOTAL))
+LOGS="$WORK/fuzzlogs"
+mkdir -p "$WORK" "$LOGS"
+QUEUE="$WORK/fuzzqueue"
+rm -rf "$QUEUE"
+mkdir -p "$QUEUE"
 
-echo "campaign: $n targets x ${slice}s"
-mkdir -p "$WORK"
+echo "campaign: $n targets, $WORKERS at a time, ${TOTAL}s"
 scripts/fuzz-seeds.sh "$SEEDS" || exit 1
 
-# Build every target up front, and refuse to start if any fails. A campaign
-# that runs `cargo fuzz run` per target and pipes the output away turns a
-# compile error into a target that "ran" and found nothing — the same shape as
-# a clean run, which is the worst possible way to be wrong about test coverage.
-for t in $TARGETS; do
-  printf 'building %s ... ' "$t"
-  if ! cargo +nightly fuzz build --codegen-units "$CODEGEN_UNITS" "$t" \
-    >/dev/null 2>"$WORK/fuzzbuild_$t.err"; then
-    echo "FAILED"
-    tail -30 "$WORK/fuzzbuild_$t.err"
-    exit 1
-  fi
-  echo ok
-done
-
 # Artifacts from earlier campaigns would be reported as this run's findings.
 before="$(find fuzz/artifacts -type f 2>/dev/null | sort)"
 
-set -o pipefail
-fail=0
-for t in $TARGETS; do
-  corpus="$WORK/fuzzwork_$t"
-  mkdir -p "$corpus"
-  # Read-only seed dirs; new inputs go to the first corpus dir only.
-  seeds=""
-  [ -d "$SEEDS/$t" ] && seeds="$SEEDS/$t"
-  dict=""
-  d="$(dict_for "$t")"
-  [ -n "$d" ] && dict="-dict=$ROOT/fuzz/dicts/$d.dict"
-  # iced-x86, the oracle `x86_decode` compares against, never frees its decoder
-  # tables, which LeakSanitizer reports at exit (docs/FUZZING.md).
-  asan=""
-  [ "$t" = x86_decode ] && asan="detect_leaks=0"
-  echo "=== $t (${slice}s, corpus $(find "$corpus" -type f | wc -l) inputs) ==="
-  # -timeout is the DoS threshold; -rss_limit_mb catches runaway allocation.
-  # The ignore_* flags are what make this a batch run rather than a bisect.
-  # `pipefail`, above, makes the pipeline's status cargo's and not `tail`'s.
-  # shellcheck disable=SC2086
-  if ! ASAN_OPTIONS="$asan" cargo +nightly fuzz run --codegen-units "$CODEGEN_UNITS" "$t" "$corpus" $seeds -- \
-    -fork=1 -ignore_crashes=1 -ignore_timeouts=1 -ignore_ooms=1 $dict \
-    -timeout=60 -rss_limit_mb=4096 -max_total_time="$slice" 2>&1 |
-    tail -20; then
-    echo "!! $t exited non-zero"
-    fail=1
-  fi
+worker() {
+  local w="$1" t left remaining slice corpus seeds dict d asan code
+  for t in $TARGETS; do
+    # Claim a target: the first worker to make its directory runs it.
+    mkdir "$QUEUE/$t" 2>/dev/null || continue
+    left=$(printf '%s\n' $TARGETS | while read -r x; do [ -d "$QUEUE/$x" ] || echo "$x"; done | wc -l)
+    remaining=$((DEADLINE - $(date +%s)))
+    # What is left, shared among this target and those not started, less the
+    # build; across WORKERS at a time.
+    slice=$(((remaining * WORKERS) / (left + 1) - 180))
+    [ "$slice" -lt 30 ] && slice=30
+    if [ "$remaining" -lt 120 ]; then
+      echo "[$w] $t skipped: out of time"
+      continue
+    fi
+    printf '[%s] building %s ... ' "$w" "$t"
+    if ! cargo +nightly fuzz build --codegen-units "$CODEGEN_UNITS" "$t" \
+      >"$LOGS/build_$t.log" 2>&1; then
+      echo "FAILED (see $LOGS/build_$t.log)"
+      tail -5 "$LOGS/build_$t.log"
+      echo "build failed" >"$QUEUE/$t/result"
+      continue
+    fi
+    echo ok
+    remaining=$((DEADLINE - $(date +%s)))
+    [ "$slice" -gt "$remaining" ] && slice=$remaining
+    corpus="$WORK/fuzzwork_$t"
+    mkdir -p "$corpus"
+    # Read-only seed dirs: the CI's corpus of the target, and the fixtures.
+    seeds=""
+    [ -d "$ROOT/fuzz/corpus/$t" ] && seeds="$ROOT/fuzz/corpus/$t"
+    [ -d "$SEEDS/$t" ] && seeds="$seeds $SEEDS/$t"
+    dict=""
+    d="$(dict_for "$t")"
+    [ -n "$d" ] && dict="-dict=$ROOT/fuzz/dicts/$d.dict"
+    # iced-x86, the oracle `x86_decode` compares against, never frees its decoder
+    # tables, which LeakSanitizer reports at exit (docs/FUZZING.md).
+    asan=""
+    [ "$t" = x86_decode ] && asan="detect_leaks=0"
+    mkdir -p "$ROOT/fuzz/artifacts/$t" "$LOGS/cwd_$t"
+    echo "[$w] === $t (${slice}s, corpus $(find "$corpus" -type f | wc -l) inputs) ==="
+    # In a directory of its own: fork mode writes `fuzz-N.log` files to the
+    # working directory.
+    # shellcheck disable=SC2086
+    (cd "$LOGS/cwd_$t" && ASAN_OPTIONS="$asan" "$BIN/$t" "$corpus" $seeds \
+      -fork=1 -ignore_crashes=1 -ignore_timeouts=1 -ignore_ooms=1 $dict \
+      -artifact_prefix="$ROOT/fuzz/artifacts/$t/" -max_len=65536 \
+      -timeout=10 -rss_limit_mb=2048 -report_slow_units="$SLOW" \
+      -max_total_time="$slice") >"$LOGS/run_$t.log" 2>&1
+    code=$?
+    echo "exit $code" >"$QUEUE/$t/result"
+    echo "[$w] $t done (exit $code): $(grep -c 'artifact_prefix' "$LOGS/run_$t.log") artifacts reported, $(tail -1 "$LOGS/run_$t.log" | cut -c1-120)"
+    [ "$KEEP_BINARIES" = 1 ] || rm -f "$BIN/$t" "$BIN"/deps/"$t"-* 2>/dev/null
+  done
+}
+
+for w in $(seq 1 "$WORKERS"); do
+  worker "$w" &
 done
+wait
 
 echo
 echo "=== artifacts found by THIS campaign ==="
 comm -13 <(printf '%s\n' "$before") <(find fuzz/artifacts -type f 2>/dev/null | sort) || true
 echo "(pre-existing artifacts are excluded; see fuzz/artifacts for all)"
-exit "$fail"
+echo "=== targets that did not build ==="
+failed="$(grep -l "build failed" "$QUEUE"/*/result 2>/dev/null | sed 's|.*/fuzzqueue/||; s|/result||')"
+printf '%s\n' "$failed"
+echo "logs: $LOGS"
+# A target that did not build was not fuzzed: that is a failed campaign.
+[ -z "$failed" ]
diff --git a/scripts/fuzz-seeds-synth.py b/scripts/fuzz-seeds-synth.py
index 61471ce0..ff68f0df 100644
--- a/scripts/fuzz-seeds-synth.py
+++ b/scripts/fuzz-seeds-synth.py
@@ -194,3 +194,74 @@ def tar_of(names):
 for i, delta in enumerate((0, 1, 8, 64)):
     put("authenticode", f"trunc{i}", signed[: len(signed) - delta])
 put("authenticode", "doubled", signed + signed[-256:])
+
+# --- vdisk: [format: u8][image] (fuzz_targets/vdisk.rs; FORMATS: 4 NTFS, 5 FAT,
+# 6 partition table; 7 and more try every format). The filesystem fixtures are gzipped
+# images of mostly zeros, so what a volume walk reads first is cut out: a FAT
+# image up to its last used byte, and the NTFS image up to the end of the
+# first run of `$MFT` (84 KiB, over the target's buffer limit, so it is walked
+# in place); each alone and as the partition of an MBR and of a GPT disk.
+# What is past the cut reads as missing.
+def unmask_gunzip(path):
+    raw = read(path, 1 << 30)
+    if path.endswith(".xor"):
+        raw = bytes(b ^ 0x5A for b in raw)
+    return gzip.decompress(raw)
+
+
+FIXTURES = "crates/exav-unpack/tests/fixtures/"
+fat = unmask_gunzip(FIXTURES + "fat/fragmented.img.gz.xor").rstrip(b"\0")
+fat += b"\0" * (-len(fat) % 512)
+ntfs = unmask_gunzip(FIXTURES + "ntfs/fragmented.img.gz.xor")[:86016]
+for kind, volume in (("fat", fat), ("ntfs", ntfs)):
+    mbr = bytearray(512)
+    mbr[0x1BE : 0x1BE + 16] = struct.pack("<B3sB3sII", 0x80, b"\0\2\0", 0x0C if kind == "fat" else 0x07, b"\0\0\0", 1, len(volume) // 512)
+    mbr[510:512] = b"\x55\xAA"
+    gpt = bytearray(3 * 512)
+    gpt[512:520] = b"EFI PART"
+    struct.pack_into("<QII", gpt, 512 + 72, 2, 1, 128)
+    gpt[1024] = 0xAB
+    struct.pack_into("<QQ", gpt, 1024 + 32, 3, 2 + len(volume) // 512)
+    put("vdisk", kind, bytes([4 if kind == "ntfs" else 5]) + volume)
+    put("vdisk", f"{kind}_in_mbr", bytes([6]) + bytes(mbr) + volume)
+    put("vdisk", f"{kind}_in_gpt", bytes([6]) + bytes(gpt) + volume)
+
+# --- imagehash: JPEG 2000 codestreams whose SIZ segment (ISO 15444-1, A.5.1:
+# Xsiz, Ysiz, XOsiz, YOsiz, XTsiz, YTsiz, XTOsiz, YTOsiz, Csiz, then Ssiz, XRsiz
+# and YRsiz per component) gives other sizes than the fixture's. What a decoder
+# does with the tiles, the subsampling and the offsets is what costs time and
+# memory, and a mutation reaches one of these fields rarely: a header that
+# implies hundreds of thousands of tiles took minutes to decode.
+J2K = "crates/exav-render/tests/fixtures/images/"
+SIZ = b"\xff\x4f\xff\x51"
+variants = (
+    ("tiles1", {"XTsiz": 1, "YTsiz": 1}),
+    ("tiles2", {"XTsiz": 2, "YTsiz": 2}),
+    ("tiles3", {"XTsiz": 3, "YTsiz": 7}),
+    ("wide", {"Xsiz": 1 << 22}),
+    ("wide_tiles16", {"Xsiz": 1 << 22, "XTsiz": 16, "YTsiz": 16}),
+    ("tall_tiles1", {"Ysiz": 1 << 22, "XTsiz": 1, "YTsiz": 1}),
+    ("huge", {"Xsiz": 0xFFFFFFFF, "Ysiz": 0xFFFFFFFF}),
+    ("offset", {"XOsiz": 1 << 20, "YOsiz": 1 << 20}),
+    ("tile_offset", {"XTOsiz": 1 << 20, "YTOsiz": 1 << 20}),
+    ("subsampled", {"XR": 130, "YR": 2}),
+    ("subsampled_max", {"XR": 255, "YR": 255}),
+    ("components", {"Csiz": 4}),
+)
+FIELDS = {"Xsiz": 8, "Ysiz": 12, "XOsiz": 16, "YOsiz": 20, "XTsiz": 24, "YTsiz": 28, "XTOsiz": 32, "YTOsiz": 36}
+for name in ("grey.j2k", "rgb.j2k", "rgb38-tiles.j2k", "grey-subsampled-tiles.j2k", "rgb.jp2", "rgba.jp2"):
+    data = read(J2K + name)
+    at = data.find(SIZ)
+    if at < 0:
+        continue
+    for tag, edit in variants:
+        d = bytearray(data)
+        for field, value in edit.items():
+            if field in FIELDS:
+                struct.pack_into(">I", d, at + FIELDS[field], value)
+            elif field == "Csiz":
+                struct.pack_into(">H", d, at + 40, value)
+            else:
+                # The first component's subsampling.
+                d[at + 43 if field == "XR" else at + 44] = value
+        put("imagehash", f"j2k_{name}_{tag}", bytes(d))
diff --git a/scripts/fuzz-seeds-wild.sh b/scripts/fuzz-seeds-wild.sh
new file mode 100755
index 00000000..0be758c7
--- /dev/null
+++ b/scripts/fuzz-seeds-wild.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Seeds from files found in the wild, for the targets whose input is a whole
+# file of a format.
+#
+#   scripts/fuzz-seeds-wild.sh OUT [DIR]    # adds OUT/<target>/wild_* from DIR
+#
+# DIR is a tree of sample files (default: tmp/samples-issues, which is not in
+# the repository). The test fixtures give a target one file of a format; a
+# directory of what other programs write gives it the variants that parsers
+# are written against, and the fuzzer starts from the structure instead of
+# finding it. Run by scripts/fuzz-seeds.sh; nothing is copied into the
+# repository, and a missing DIR is not an error.
+#
+# Files over MAX_BYTES (default 64 KiB) are left out, as in the other seeds,
+# and at most PER_TARGET (default 300) of a target's, the smallest first.
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+OUT="${1:?usage: scripts/fuzz-seeds-wild.sh OUT [DIR]}"
+DIR="${2:-$ROOT/tmp/samples-issues}"
+MAX_BYTES="${MAX_BYTES:-65536}"
+PER_TARGET="${PER_TARGET:-300}"
+
+[ -d "$DIR" ] || exit 0
+
+# wild TARGET EXT...: the files of DIR with one of the extensions.
+wild() {
+  local target="$1" ext expr=() n=0 f name
+  shift
+  for ext in "$@"; do expr+=(-o -iname "*.$ext"); done
+  mkdir -p "$OUT/$target"
+  while IFS= read -r f; do
+    name="wild_$(printf '%s' "$f" | cksum | cut -d' ' -f1)_$(basename "$f")"
+    cp "$f" "$OUT/$target/$name"
+    n=$((n + 1))
+  done < <(
+    find "$DIR" -type f -size "-$((MAX_BYTES / 1024 + 1))k" \( "${expr[@]:1}" \) -printf '%s %p\n' 2>/dev/null |
+      sort -n | head -n "$PER_TARGET" | cut -d' ' -f2-
+  )
+  echo "wild $target: $n"
+}
+
+wild docs_doc doc dot
+wild docs_odt odt ott fodt
+wild docs_rtf rtf
+wild docs_wml xml
+wild docs_html html htm
+wild docs_pages pages
+wild sheets_xls xls xlt
+wild sheets_ods ods ots fods
+wild sheets_numbers numbers
+wild sheets_text slk
+wild slides_ppt ppt pps pot
+wild slides_odp odp otp fodp
+wild slides_odg odg otg fodg
+wild slides_vsdx vsdx vsdm vstx
+wild slides_keynote key
+wild imagehash j2k jp2 jpx jb2 jbig2 png gif jpg jpeg bmp tif tiff webp ico cur dds hdr qoi pnm ppm pgm pbm
+wild raw_preview dng cr2 nef arw orf rw2 raf pef srw
+wild cad_dxf dxf
+wild cad_dwg dwg
+wild drawing dxf dwg
+wild ifc ifc stl
+wild mesh obj ply gltf glb
+wild markdown md markdown
+wild containers zip rar 7z tar gz bz2 xz cab arj lha lzh iso cpio ar deb rpm pdf eml msg
diff --git a/scripts/fuzz-seeds.sh b/scripts/fuzz-seeds.sh
index 36ba4439..57e454fe 100755
--- a/scripts/fuzz-seeds.sh
+++ b/scripts/fuzz-seeds.sh
@@ -33,7 +33,7 @@ SKIP="crates/exav-unpack/tests/fixtures/rar/ppmd_lzss_conversion.rar"
 
 cd "$ROOT"
 rm -rf "$OUT"
-mkdir -p "$OUT"/{containers,pe,drawing,imagehash,cad_dxf,cad_dwg,ifc,full_pipeline,seekable,volumes,yara,pcre,cvd,database,authenticode}
+mkdir -p "$OUT"/{containers,pe,drawing,imagehash,raw_preview,cad_dxf,cad_dwg,ifc,mesh,markdown,visible_text,full_pipeline,seekable,volumes,vdisk,fsimage,lzo,yara,pcre,cvd,database,authenticode,sheets_xls,sheets_ods,sheets_numbers,sheets_text,slides_ppt,slides_odp,slides_odg,slides_vsdx,slides_keynote,docs_doc,docs_odt,docs_rtf,docs_wml,docs_html,docs_pages}
 
 # Tracked files, and new ones not yet committed (but not ignored ones).
 files() { git ls-files -co --exclude-standard -- "$@"; }
@@ -104,7 +104,7 @@ while IFS= read -r f; do
   fi
 done < <(files 'crates/exav-render/tests/fixtures/cad/dwg/**.dwg.gz' 'crates/exav-render/tests/fixtures/cad/proxy/dwg/**.dwg.gz' 'crates/exav-unpack/tests/fixtures/dwg/*.gz')
 
-# imagehash also runs exav-render's JPEG 2000 and JBIG2 files, and the
+# imagehash also runs exav-render's JPEG 2000, JBIG2 and JPEG XL files, and the
 # viewer's JPXDecode, JBIG2Decode and CCITTFaxDecode streams.
 while IFS= read -r f; do
   case "$f" in *.py | *.json | *.pdf) continue ;; esac
@@ -114,6 +114,13 @@ done < <(
     'crates/exav-render/tests/fixtures/images/**' 'crates/exav-viewer/e2e/fixtures/pdf-images/**'
 )
 
+# raw_preview: exav-render's synthetic camera RAW files (written by their
+# make.py), and the TIFFs and JPEG that `decode_any` falls back to.
+while IFS= read -r f; do
+  case "$f" in *.py) continue ;; esac
+  add "$f" "$OUT/raw_preview"
+done < <(files 'crates/exav-render/tests/fixtures/raw/*' 'crates/exav-imagehash/tests/fixtures/img/*')
+
 # ifc: exav-render's IFC and STL fixtures (STEP text and STL written by
 # their make.py), the viewer tests' house in both.
 while IFS= read -r f; do add "$f" "$OUT/ifc"; done < <(
@@ -121,6 +128,27 @@ while IFS= read -r f; do add "$f" "$OUT/ifc"; done < <(
     'crates/exav-render/tests/fixtures/viewer/*'
 )
 
+# vdisk: the disk images written for it (fuzz/seeds/vdisk, each behind the byte
+# that picks its format), and the disk image fixtures behind 0x08, which tries
+# every format.
+cp fuzz/seeds/vdisk/* "$OUT/vdisk/"
+for f in "$OUT"/containers/*; do
+  if [ -n "$(head -c 4 "$f" | grep -a -e 'QFI' -e 'KDMV' -e 'vhdx' -e 'cone')" ]; then
+    { printf '\010'; cat "$f"; } >"$OUT/vdisk/fixture_$(basename "$f")"
+  fi
+done
+# The small DMG fixtures (HFS+ in a zlib run and in LZFSE runs), behind 0x07: a
+# koly trailer, no magic first. The APFS ones are too big for a seed.
+for f in crates/exav-unpack/tests/fixtures/dmg/hfs_plus_udzo.dmg crates/exav-unpack/tests/fixtures/dmg/udif_lzfse.dmg; do
+  { printf '\007'; cat "$f"; } >"$OUT/vdisk/fixture_$(basename "$f")"
+done
+
+# fsimage and lzo: the small images and blocks written for them
+# (fuzz/seeds/fsimage and fuzz/seeds/lzo, each behind the byte or the two bytes
+# their target reads first).
+cp fuzz/seeds/fsimage/*.bin "$OUT/fsimage/"
+cp fuzz/seeds/lzo/*.bin "$OUT/lzo/"
+
 # full_pipeline: a zero header (no option bits, no database files: the
 # signatures are fuzz/db/'s) in front of each fixture. seekable: no option
 # bits, reads of 297 bytes, no failure.
@@ -254,12 +282,191 @@ for name, parts in sets.items():
     open(f"{sys.argv[1]}/{name}", "wb").write(bytes(body))
 PY
 
+# mesh: a triangle and a quad as OBJ, PLY (ASCII and binary) and glTF (a
+# document with its buffer embedded, and a GLB), written here.
+python3 - "$OUT/mesh" <<'PY'
+import base64, json, struct, sys
+out = sys.argv[1]
+def put(name, data):
+    open(f"{out}/{name}", "wb").write(data if isinstance(data, bytes) else data.encode())
+put("quad.obj", "# a quad and a triangle\no seed\nv 0 0 0\nv 1 0 0 1 0 0\nv 1 1 0\nv 0 1 0\nvn 0 0 1\nvt 0 0\ng quad\nf 1/1/1 2/1/1 3/1/1 4/1/1\ng tri\nf -4 -3 -2\n")
+put("quad.ply", "ply\nformat ascii 1.0\ncomment seed\nelement vertex 4\nproperty float x\nproperty float y\nproperty float z\nproperty uchar red\nproperty uchar green\nproperty uchar blue\nelement face 2\nproperty list uchar int vertex_indices\nend_header\n0 0 0 255 0 0\n1 0 0 0 255 0\n1 1 0 0 0 255\n0 1 0 9 9 9\n4 0 1 2 3\n3 0 1 2\n")
+verts = [(0, 0, 0), (1, 0, 0), (0, 1, 0), (0, 0, 1)]
+faces = [(0, 2, 1), (0, 1, 3), (0, 3, 2), (1, 2, 3)]
+for order, tag in (("<", "binary_little_endian"), (">", "binary_big_endian")):
+    head = f"ply\nformat {tag} 1.0\nelement vertex 4\nproperty float x\nproperty float y\nproperty float z\nelement face 4\nproperty list uchar uint vertex_indices\nend_header\n"
+    body = b"".join(struct.pack(order + "fff", *v) for v in verts) + b"".join(struct.pack(order + "BIII", 3, *f) for f in faces)
+    put(f"tetra_{tag}.ply", head.encode() + body)
+buf = b"".join(struct.pack("<fff", *v) for v in verts) + b"".join(struct.pack("<HHH", *f) for f in faces)
+buf += b"\0" * (-len(buf) % 4)
+doc = {
+    "asset": {"version": "2.0"},
+    "scene": 0, "scenes": [{"nodes": [0]}],
+    "nodes": [{"mesh": 0, "translation": [1, 2, 3], "children": [1]}, {"scale": [2, 2, 2], "mesh": 0}],
+    "meshes": [{"primitives": [{"attributes": {"POSITION": 0}, "indices": 1, "material": 0}]}],
+    "materials": [{"pbrMetallicRoughness": {"baseColorFactor": [0.8, 0.4, 0.1, 1]}}],
+    "accessors": [
+        {"bufferView": 0, "componentType": 5126, "count": 4, "type": "VEC3"},
+        {"bufferView": 1, "componentType": 5123, "count": 12, "type": "SCALAR"},
+    ],
+    "bufferViews": [{"buffer": 0, "byteLength": 48}, {"buffer": 0, "byteOffset": 48, "byteLength": 24}],
+    "buffers": [{"byteLength": len(buf)}],
+}
+doc["buffers"][0]["uri"] = "data:application/octet-stream;base64," + base64.b64encode(buf).decode()
+put("tetra.gltf", json.dumps(doc))
+del doc["buffers"][0]["uri"]
+j = json.dumps(doc).encode()
+j += b" " * (-len(j) % 4)
+glb = struct.pack("<4sII", b"glTF", 2, 12 + 8 + len(j) + 8 + len(buf))
+glb += struct.pack("<II", len(j), 0x4E4F534A) + j + struct.pack("<II", len(buf), 0x004E4942) + buf
+put("tetra.glb", glb)
+PY
+
+# markdown: one document with every construct the reader folds, and the
+# links it must refuse.
+python3 - "$OUT/markdown" <<'PY'
+import sys
+out = sys.argv[1]
+def put(name, data):
+    open(f"{out}/{name}", "wb").write(data.encode())
+put("all.md", "# Title #\n\nSetext\n=====\n\nSome *em*, **strong**, ~~gone~~, `code` and a hard  \nbreak, &amp; &hearts; &#x41;.\n\n> quote\ncontinued\n>> nested\n\n- one\n- two\n  - sub\n\n3. three\n4. four\n\n- loose\n\n- items\n\n```rust\nfn main() {}\n```\n\n    indented\n\n---\n\n| A | B |\n|:--|--:|\n| 1 | 2 |\n| 3 |\n\n[docs](https://example.com/a \"title\") <https://example.com/x> <me@example.com>\n[ref][1] ![alt *x*](https://example.com/i.png)\n\n[1]: https://example.com/ref\n\n<div onclick=alert(1)>raw</div>\n\ntext <b>inline</b> html\n")
+put("links.md", "[a](javascript:alert(1)) [b](https://user:pass@example.com/) [c](https://a@b/) [d](data:text/html,x) [e](//host/x) [f](mailto:me@example.com) [g](<https://example.com/a b>)\n")
+put("deep.md", "> " * 30 + "x\n" + "".join("  " * i + "- l%d\n" % i for i in range(30)))
+PY
+
+# visible_text: the first byte picks the reader (the target's NAMES: Markdown,
+# HTML, the Word, sheet, shared strings, slide and OpenDocument parts, PDF, DXF,
+# DWG), the rest is a document of that kind. Drawings are the cad seeds.
+python3 - "$OUT" <<'PY'
+import glob, os, sys, zlib
+out = sys.argv[1]
+dst = f"{out}/visible_text"
+def put(name, pick, data):
+    open(f"{dst}/{name}", "wb").write(bytes([pick]) + (data if isinstance(data, bytes) else data.encode()))
+put("all.md", 0, open(f"{out}/markdown/all.md", "rb").read())
+put("page.html", 1, "<!doctype html><html><head><title>T &amp; U</title><style>p{}</style><script>var x='<b>';</script></head><body><p>Click <b>here</b> to <a href=\"https&#58;//evil.example/x?a=1&amp;b=2\">https://www.paypal.com/login</a></p><img alt=\"a diagram\" src=x><table><tr><td>a<td>b</table><!-- hid --></body></html>")
+put("fragment.html", 1, "Hi <a href='javascript:alert(1)'>run</a> <br> &hearts;&notit;&#x41;&zzz;")
+put("document.xml", 2, '<w:document xmlns:w="x"><w:body><w:p><w:r><w:t>Hello</w:t></w:r><w:r><w:instrText>HYPERLINK "http://x"</w:instrText></w:r><w:r><w:delText>gone</w:delText></w:r><w:r><w:t xml:space="preserve"> world &amp; &#65;</w:t></w:r></w:p></w:body></w:document>')
+put("sheet.xml", 3, '<worksheet><sheetData><row><c t="s"><v>0</v></c><c><f>HYPERLINK("http://x","y")</f></c></row><row><c t="inlineStr"><is><t>z</t></is></c></row></sheetData></worksheet>')
+put("shared.xml", 4, "<sst><si><t>one</t></si><si><r><t>tw</t></r><r><t>o</t></r></si></sst>")
+put("slide.xml", 5, "<p:sld><a:p><a:r><a:t>Title</a:t></a:r></a:p><a:p><a:r><a:t>Body</a:t></a:r><a:br/></a:p></p:sld>")
+put("content.xml", 6, "<office:text><text:h>Head</text:h><text:p>a <text:span>b</text:span><text:s/>c<text:line-break/>d</text:p><table:table-row><table:table-cell><text:p>x</text:p></table:table-cell></table:table-row></office:text>")
+content = "BT /F1 12 Tf 72 700 Td [(Pay to ev) 10 (il.exa) 5 (mple)] TJ 0 -20 Td (Second line) Tj ET"
+pdf = (f"%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n"
+       f"3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>endobj\n"
+       f"4 0 obj<</Length {len(content)}>>\nstream\n{content}\nendstream\nendobj\n"
+       f"5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding/WinAnsiEncoding>>endobj\ntrailer<</Root 1 0 R>>\n%%EOF\n")
+put("page.pdf", 7, pdf)
+z = zlib.compress(content.encode())
+put("flate.pdf", 7, (f"%PDF-1.4\n1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n"
+       f"3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 9 9]/Resources<</Font<</F1 5 0 R>>>>/Contents 4 0 R>>endobj\n"
+       f"4 0 obj<</Length {len(z)}/Filter/FlateDecode>>\nstream\n").encode() + z +
+       b"\nendstream\nendobj\n5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica>>endobj\ntrailer<</Root 1 0 R>>\n%%EOF\n")
+put("mtext.dxf", 8, "  0\nSECTION\n  2\nENTITIES\n  0\nMTEXT\n  8\n0\n 10\n0.0\n 20\n0.0\n 30\n0.0\n 40\n2.5\n  1\nPay\\Pnow\n  0\nENDSEC\n  0\nEOF\n")
+for pick, seeds in ((8, "cad_dxf"), (9, "cad_dwg")):
+    for path in sorted(glob.glob(f"{out}/{seeds}/*"))[:6]:
+        put("cad-" + os.path.basename(path), pick, open(path, "rb").read())
+PY
+
+# The sheets targets: the `sheets` fixtures, and for sheets_numbers the
+# fixture's IWA streams joined, which the target stores in a ZIP itself (a
+# joined stream is one stream to the reader), and a Numbers '09 index.xml,
+# plain and gzipped, which it stores the same way.
+SHEETS=crates/exav-render/tests/fixtures/office/sheets
+for f in "$SHEETS/sample.xls"; do add "$f" "$OUT/sheets_xls"; done
+for f in "$SHEETS/sample.ods" "$SHEETS/sample.fods"; do add "$f" "$OUT/sheets_ods"; done
+for f in "$SHEETS/sample.numbers" fuzz/seeds/sheets_numbers/*; do add "$f" "$OUT/sheets_numbers"; done
+python3 - "$SHEETS/sample.numbers" "$OUT/sheets_numbers/sample.iwa" fuzz/seeds/sheets_numbers/index09.xml "$OUT/sheets_numbers/index09.xml.gz" <<'PY'
+import gzip, sys, zipfile
+z = zipfile.ZipFile(sys.argv[1])
+open(sys.argv[2], "wb").write(b"".join(z.read(n) for n in z.namelist() if n.endswith(".iwa")))
+open(sys.argv[4], "wb").write(gzip.compress(open(sys.argv[3], "rb").read(), mtime=0))
+PY
+# sheets_text: the text fixtures behind the byte that picks their reader.
+python3 - "$OUT/sheets_text" <<'PY'
+import sys
+d = "crates/exav-render/tests/fixtures/office/sheets/"
+for pick, name in ((0, "sample-2003.xml"), (1, "sample.html"), (2, "sample.slk")):
+    open(f"{sys.argv[1]}/{name}", "wb").write(bytes([pick]) + open(d + name, "rb").read())
+PY
+
+# The slides targets: the `slides` fixtures. slides_ppt gets the PPT's
+# `PowerPoint Document` stream, which the target stores in a compound file
+# itself (the fixture is over MAX_BYTES with its thumbnail); slides_keynote the
+# Keynote document's IWA streams joined, but its package metadata.
+SLIDES=crates/exav-render/tests/fixtures/office/slides
+for f in "$SLIDES/sample.odp" "$SLIDES/sample.fodp" "$SLIDES/chart.fodp"; do add "$f" "$OUT/slides_odp"; done
+DRAW=crates/exav-render/tests/fixtures/office/draw
+for f in "$DRAW/sample.odg" "$DRAW/sample.fodg"; do add "$f" "$OUT/slides_odg"; done
+for f in "$DRAW/sample.vsdx" "$DRAW/themed.vsdx"; do add "$f" "$OUT/slides_vsdx"; done
+# Keynote 1 to 5's XML and a PowerPoint 95 stream, written by hand.
+for f in fuzz/seeds/slides_keynote/*; do add "$f" "$OUT/slides_keynote"; done
+add fuzz/seeds/slides_ppt/powerpoint95.bin "$OUT/slides_ppt"
+python3 - "$SLIDES" "$OUT" <<'PY'
+import struct, sys, zipfile
+d, out = sys.argv[1], sys.argv[2]
+z = zipfile.ZipFile(f"{d}/sample.key")
+iwa = [n for n in z.namelist() if n.endswith(".iwa") and not n.endswith("/Metadata.iwa")]
+open(f"{out}/slides_keynote/sample.iwa", "wb").write(b"".join(z.read(n) for n in iwa))
+# The one stream, from the FAT: version 3, its first 109 FAT sectors.
+b = open(f"{d}/sample.ppt", "rb").read()
+ss = 1 << struct.unpack_from("<H", b, 30)[0]
+sec = lambda i: b[(i + 1) * ss:(i + 2) * ss]
+fat = b"".join(sec(i) for i in struct.unpack_from("<109I", b, 76) if i < 0xFFFFFFFA)
+nxt = lambda i: struct.unpack_from("<I", fat, i * 4)[0]
+def chain(i):
+    while i < 0xFFFFFFFA:
+        yield sec(i)
+        i = nxt(i)
+dirs = b"".join(chain(struct.unpack_from("<I", b, 48)[0]))
+for o in range(0, len(dirs), 128):
+    e = dirs[o:o + 128]
+    name = e[:struct.unpack_from("<H", e, 64)[0]].decode("utf-16-le").rstrip("\0")
+    if name == "PowerPoint Document":
+        start, size = struct.unpack_from("<IQ", e, 116)
+        open(f"{out}/slides_ppt/document.bin", "wb").write(b"".join(chain(start))[:size])
+PY
+
+# The docs targets: the `docs` fixtures. docs_pages has none of its own
+# yet: the Keynote document's IWA streams are the nearest thing (same archive
+# layer).
+D=crates/exav-render/tests/fixtures/office/docs
+add "$D/sample.doc" "$OUT/docs_doc"
+# A Word 6 document, written by the reader's tests (tests/office_common).
+for f in fuzz/seeds/docs_doc/*; do add "$f" "$OUT/docs_doc"; done
+for f in "$D/sample.odt" "$D/sample.fodt"; do add "$f" "$OUT/docs_odt"; done
+add "$D/sample.rtf" "$OUT/docs_rtf"
+add "$D/sample-2003.xml" "$OUT/docs_wml"
+add "$D/sample.html" "$OUT/docs_html"
+cp "$OUT/slides_keynote/sample.iwa" "$OUT/docs_pages/sample.iwa"
+
+# visible_text, the office formats: each fixture behind the byte that picks its
+# name in the target's NAMES (11 a.doc, 12 a.xls, 13 a.ppt, 14 a.rtf, 15 a.xml,
+# 16 a.slk, 17 a.fodt, 18 a.fods, 19 a.fodp, 20 a.fodg, 21 a.numbers,
+# 22 a.pages, 23 a.key), within MAX_BYTES.
+python3 - "$OUT/visible_text" "$MAX_BYTES" crates/exav-render/tests/fixtures/office <<'PY'
+import os, sys
+dst, limit, root = sys.argv[1], int(sys.argv[2]), sys.argv[3]
+for pick, path in (
+    (11, "docs/sample.doc"), (14, "docs/sample.rtf"), (15, "docs/sample-2003.xml"), (17, "docs/sample.fodt"),
+    (12, "sheets/sample.xls"), (15, "sheets/sample-2003.xml"), (16, "sheets/sample.slk"), (18, "sheets/sample.fods"), (21, "sheets/sample.numbers"),
+    (13, "slides/sample.ppt"), (19, "slides/sample.fodp"), (23, "slides/sample.key"), (20, "draw/sample.fodg"),
+):
+    data = open(f"{root}/{path}", "rb").read()
+    if len(data) < limit:
+        open(f"{dst}/office-{path.replace('/', '-')}", "wb").write(bytes([pick]) + data)
+PY
+
+# Files found in the wild, when a directory of them is there (tmp/samples-issues,
+# or WILD): the variants of each format that the fixtures do not have.
+scripts/fuzz-seeds-wild.sh "$OUT" "${WILD:-$ROOT/tmp/samples-issues}"
+
 # Small seeds written from what each target's source reads (see the script).
 python3 scripts/fuzz-seeds-synth.py "$OUT"
 
 for t in analyze unpack filetype; do ln -sfn containers "$OUT/$t"; done
 ln -sfn pe "$OUT/pe_emulator"
 
-for d in containers pe drawing imagehash cad_dxf cad_dwg ifc full_pipeline seekable volumes yara pcre cvd database authenticode; do
+for d in containers pe drawing imagehash raw_preview cad_dxf cad_dwg ifc mesh markdown visible_text full_pipeline seekable volumes yara pcre cvd database authenticode sheets_xls sheets_ods sheets_numbers sheets_text slides_ppt slides_odp slides_odg slides_vsdx slides_keynote docs_doc docs_odt docs_rtf docs_wml docs_html docs_pages; do
   echo "$d: $(find "$OUT/$d" -type f | wc -l) seeds"
 done
diff --git a/scripts/pdf-compare/README.md b/scripts/pdf-compare/README.md
new file mode 100644
index 00000000..c3a69641
--- /dev/null
+++ b/scripts/pdf-compare/README.md
@@ -0,0 +1,19 @@
+# Comparing PDF renderers: hayro, pdf.js, poppler
+
+The harness behind `docs/PDF-RENDERER-EVALUATION.md`. It renders the first pages of every PDF of a
+directory with three renderers at 72 dpi on white, and compares them page by page, with poppler as the
+reference.
+
+| Step | Command |
+|---|---|
+| hayro, native | `cd hayro-eval && cargo build --release`, then `python3 run_hayro.py CORPUS OUT 3` |
+| pdf.js, in Chromium | `ls CORPUS/*.pdf > OUT/list.txt; node pdfjs.mjs OUT/list.txt OUT/png-pdfjs 3 > OUT/pdfjs.jsonl` (needs the viewer's `node_modules`: `EXAV_VIEWER_DIR`) |
+| poppler | `python3 run_poppler.py CORPUS OUT 3` (needs `pdftoppm`) |
+| hayro, in wasm, in Chromium | `cd hayro-wasm && cargo rustc --release --target wasm32-unknown-unknown --crate-type cdylib` (add `RUSTFLAGS="-C target-feature=+simd128"` for the SIMD build), `wasm-bindgen --target web`, `wasm-opt -Oz --enable-simd`, then `node hayro-wasm.mjs OUT/list.txt 3 > OUT/hayrowasm.jsonl` (`HAYRO_WASM_PKG`) |
+| compare | `python3 compare3.py OUT` (numpy, Pillow) |
+
+`run_hayro.py` rewrites its output whole every 25 PDFs, as the scripts here never append.
+
+The corpus of the evaluation is the 990 PDFs of `test/pdfs` in mozilla/pdf.js, the 364 of
+`hayro-tests/pdfs` in LaurenzV/hayro, and 16 of our own, deduplicated by hash. Both projects' corpora are
+regression tests chosen for hard cases, not a sample of PDFs in the wild.
diff --git a/scripts/pdf-compare/compare3.py b/scripts/pdf-compare/compare3.py
new file mode 100644
index 00000000..ee4ffaf7
--- /dev/null
+++ b/scripts/pdf-compare/compare3.py
@@ -0,0 +1,128 @@
+"""python3 -I compare3.py OUT: hayro, pdf.js and poppler on the same pages (first three of each PDF, 72 dpi).
+
+Poppler is the reference: a page's distance to it is the mean absolute luminance difference after a 3x3 box
+blur (0 to 255) and the share of pixels differing by more than 64 ("bad"). Pages over 25 million pixels are
+left out of the pixel comparison. Prints the figures the report quotes and writes OUT/compare3.json.
+"""
+import collections, json, os, re, sys
+import numpy as np
+from PIL import Image
+
+Image.MAX_IMAGE_PIXELS = None
+out = sys.argv[1]
+names = ["hayro", "pdfjs", "poppler"]
+
+def read(n):
+    rows = {}
+    for l in open(f"{out}/{n}.jsonl"):
+        l = l.strip()
+        if l.startswith("{"):
+            try:
+                r = json.loads(l)
+            except Exception:
+                continue
+            rows.setdefault(r["pdf"], []).append(r)
+    return rows
+
+logs = {n: read(n) for n in names}
+pdfs = sorted(set().union(*[set(v) for v in logs.values()]))
+
+def doc_state(n, pdf):
+    rs = logs[n].get(pdf, [])
+    if any(r["page"] >= 1 and r["status"] == "ok" for r in rs):
+        return "ok"
+    for r in rs:
+        if r["page"] == 0:
+            return r["status"].split(":")[0].split("(")[0]
+    return "none"
+
+print(f"PDFs: {len(pdfs)}")
+for n in names:
+    c = collections.Counter(doc_state(n, p) for p in pdfs)
+    print(f"  {n}: " + ", ".join(f"{k} {v}" for k, v in c.most_common()))
+both_ok_ref = [p for p in pdfs if doc_state("poppler", p) == "ok"]
+print(f"  where poppler renders ({len(both_ok_ref)}): hayro fails {sum(1 for p in both_ok_ref if doc_state('hayro', p) != 'ok')}, pdf.js fails {sum(1 for p in both_ok_ref if doc_state('pdfjs', p) != 'ok')}")
+print(f"  where poppler fails ({len(pdfs) - len(both_ok_ref)}): hayro renders {sum(1 for p in pdfs if doc_state('poppler', p) != 'ok' and doc_state('hayro', p) == 'ok')}, pdf.js renders {sum(1 for p in pdfs if doc_state('poppler', p) != 'ok' and doc_state('pdfjs', p) == 'ok')}")
+
+pages = collections.defaultdict(dict)
+for n in names:
+    for pdf, rs in logs[n].items():
+        for r in rs:
+            if r["page"] >= 1 and r["status"] == "ok":
+                pages[(pdf, r["page"])][n] = r
+
+def lum(n, pdf, page):
+    return np.asarray(Image.open(f"{out}/png-{n}/{pdf}-{page}.png").convert("L"), dtype=np.float32)
+
+def blur(x):
+    p = np.pad(x, 1, mode="edge")
+    return sum(p[i:i + x.shape[0], j:j + x.shape[1]] for i in range(3) for j in range(3)) / 9.0
+
+res = {n: [] for n in ("hayro", "pdfjs")}
+size = {n: collections.Counter() for n in ("hayro", "pdfjs")}
+for key, r in sorted(pages.items()):
+    if "poppler" not in r:
+        continue
+    pw, ph = r["poppler"]["w"], r["poppler"]["h"]
+    for n in ("hayro", "pdfjs"):
+        if n not in r:
+            continue
+        w, h = r[n]["w"], r[n]["h"]
+        if (w, h) == (pw, ph):
+            size[n]["same"] += 1
+        elif (w, h) == (ph, pw):
+            size[n]["rotated"] += 1
+        elif abs(w - pw) <= 1 and abs(h - ph) <= 1:
+            size[n]["off by one"] += 1
+        else:
+            size[n]["different"] += 1
+for n in size:
+    print(f"  page size vs poppler, {n}: " + ", ".join(f"{k} {v}" for k, v in size[n].items()))
+
+per = {}
+for key, r in sorted(pages.items()):
+    if not all(n in r for n in names):
+        continue
+    sizes = {(r[n]["w"], r[n]["h"]) for n in names}
+    if len(sizes) != 1:
+        continue
+    w, h = next(iter(sizes))
+    if w * h > 25_000_000:
+        continue
+    ref = blur(lum("poppler", *key))
+    for n in ("hayro", "pdfjs"):
+        d = np.abs(blur(lum(n, *key)) - ref)
+        res[n].append((key, float(d.mean()), float((d > 64).mean())))
+    per[key] = {n: res[n][-1][1:] for n in res}
+
+k = len(res["hayro"])
+print(f"  pages with the same size in all three: {k}")
+for n in res:
+    mad = np.array([x[1] for x in res[n]]); bad = np.array([x[2] for x in res[n]])
+    print(f"  {n} vs poppler: MAD median {np.median(mad):.2f}, p90 {np.percentile(mad, 90):.2f}; pages <0.5% pixels far {int((bad < .005).sum())} ({100 * (bad < .005).mean():.1f}%), 0.5-5% {int(((bad >= .005) & (bad < .05)).sum())}, over 5% {int((bad >= .05).sum())} ({100 * (bad >= .05).mean():.1f}%)")
+hb = np.array([x[2] for x in res["hayro"]]); pb = np.array([x[2] for x in res["pdfjs"]])
+print(f"  closer to poppler by 'bad' (more than 1 point apart): hayro {int((hb + .01 < pb).sum())}, pdf.js {int((pb + .01 < hb).sum())}, level {int((abs(hb - pb) <= .01).sum())}")
+
+# By what the file name says it tests.
+cats = {"shading": "shad", "tiling/pattern": "patt|tiling", "jpx": "jpx|jpeg2000|jp2", "jbig2": "jbig2", "ccitt": "ccitt|fax", "mask/blend/transparency": "mask|blend|transp|smask|alpha", "font": "font|glyph|type1|type3|cff|truetype|cid|cmap", "annotation/form": "annot|form|widget|acro"}
+print("  by name (pages <0.5% far from poppler / pages):")
+for c, rx in cats.items():
+    sel = [i for i, x in enumerate(res["hayro"]) if re.search(rx, x[0][0].lower())]
+    if sel:
+        print(f"    {c}: hayro {sum(1 for i in sel if res['hayro'][i][2] < .005)}/{len(sel)}, pdf.js {sum(1 for i in sel if res['pdfjs'][i][2] < .005)}/{len(sel)}")
+
+# Time.
+for n in ("hayro", "pdfjs", "poppler"):
+    ms = np.array([r[n]["ms"] for r in pages.values() if n in r])
+    print(f"  render ms per page, {n}: median {np.median(ms):.0f}, p90 {np.percentile(ms, 90):.0f}, p99 {np.percentile(ms, 99):.0f}, max {ms.max():.0f}, total {ms.sum() / 1000:.0f} s over {len(ms)} pages")
+rss = [r["rss_kb"] for rs in logs["hayro"].values() for r in rs if r["page"] == -1 and r.get("rss_kb")]
+print(f"  hayro process peak RSS: median {np.median(rss) / 1024:.0f} MB, p99 {np.percentile(rss, 99) / 1024:.0f} MB, max {max(rss) / 1024:.0f} MB")
+worst = sorted(per.items(), key=lambda kv: -kv[1]["hayro"][1])[:8]
+print("  hayro's worst against poppler (hayro bad / pdf.js bad):")
+for (pdf, page), v in worst:
+    print(f"    {pdf} p{page}: {v['hayro'][1] * 100:.1f}% / {v['pdfjs'][1] * 100:.1f}%")
+worst = sorted(per.items(), key=lambda kv: -kv[1]["pdfjs"][1])[:8]
+print("  pdf.js's worst against poppler (pdf.js bad / hayro bad):")
+for (pdf, page), v in worst:
+    print(f"    {pdf} p{page}: {v['pdfjs'][1] * 100:.1f}% / {v['hayro'][1] * 100:.1f}%")
+json.dump({f"{k[0]}:{k[1]}": v for k, v in per.items()}, open(f"{out}/compare3.json", "w"))
diff --git a/scripts/pdf-compare/hayro-eval/Cargo.toml b/scripts/pdf-compare/hayro-eval/Cargo.toml
new file mode 100644
index 00000000..a782ff6d
--- /dev/null
+++ b/scripts/pdf-compare/hayro-eval/Cargo.toml
@@ -0,0 +1,13 @@
+# Not part of the workspace: a harness (see ../README.md), with its own lock and target directory.
+[package]
+name = "hayro-eval"
+version = "0.0.0"
+edition = "2024"
+publish = false
+
+[workspace]
+
+[dependencies]
+hayro = "=0.8.0"
+hayro-interpret = "=0.8.0"
+hayro-syntax = "=0.8.0"
diff --git a/scripts/pdf-compare/hayro-eval/src/main.rs b/scripts/pdf-compare/hayro-eval/src/main.rs
new file mode 100644
index 00000000..6af9931e
--- /dev/null
+++ b/scripts/pdf-compare/hayro-eval/src/main.rs
@@ -0,0 +1,76 @@
+// hayro-eval PDF OUTDIR MAXPAGES: renders the first MAXPAGES pages of PDF at scale 1 (one point to
+// one pixel, as pdf.js's viewport at scale 1) on white, writes OUTDIR/<stem>-<page>.png and prints
+// one JSON line per page: ms to render, size, or the failure.
+use hayro::{PixmapSettings, RenderCache, RenderSettings, render};
+use hayro_interpret::InterpreterSettings;
+use hayro_syntax::Pdf;
+use std::time::Instant;
+
+fn json(s: &str) -> String {
+    s.chars()
+        .flat_map(|c| match c {
+            '"' => vec!['\\', '"'],
+            '\\' => vec!['\\', '\\'],
+            c if (c as u32) < 0x20 => vec![' '],
+            c => vec![c],
+        })
+        .collect()
+}
+
+fn main() {
+    let a: Vec<String> = std::env::args().collect();
+    let (path, out, max) = (&a[1], &a[2], a[3].parse::<usize>().unwrap());
+    let stem = std::path::Path::new(path)
+        .file_stem()
+        .unwrap()
+        .to_string_lossy()
+        .to_string();
+    let data = std::fs::read(path).unwrap();
+    let t0 = Instant::now();
+    let pdf = match Pdf::new(data) {
+        Ok(p) => p,
+        Err(e) => {
+            println!(
+                "{{\"pdf\":\"{}\",\"page\":0,\"status\":\"load: {}\"}}",
+                json(&stem),
+                json(&format!("{e:?}"))
+            );
+            return;
+        }
+    };
+    let load_ms = t0.elapsed().as_secs_f64() * 1000.0;
+    let pages = pdf.pages();
+    let cache = RenderCache::new();
+    let settings = InterpreterSettings::default();
+    let render_settings = RenderSettings::default();
+    for (i, page) in pages.iter().enumerate().take(max) {
+        let t = Instant::now();
+        let pix = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+            let ps = PixmapSettings {
+                bg_color: hayro::vello_cpu::color::palette::css::WHITE,
+                ..PixmapSettings::default()
+            };
+            render(page, &cache, &settings, &render_settings, &ps)
+        }));
+        let ms = t.elapsed().as_secs_f64() * 1000.0;
+        match pix {
+            Ok(p) => {
+                let (w, h) = (p.width(), p.height());
+                let png = p.into_png().unwrap_or_default();
+                let file = format!("{out}/{stem}-{}.png", i + 1);
+                std::fs::write(&file, &png).unwrap();
+                println!(
+                    "{{\"pdf\":\"{}\",\"page\":{},\"pages\":{},\"w\":{w},\"h\":{h},\"ms\":{ms:.1},\"load_ms\":{load_ms:.1},\"status\":\"ok\"}}",
+                    json(&stem),
+                    i + 1,
+                    pages.len()
+                );
+            }
+            Err(_) => println!(
+                "{{\"pdf\":\"{}\",\"page\":{},\"status\":\"panic\"}}",
+                json(&stem),
+                i + 1
+            ),
+        }
+    }
+}
diff --git a/scripts/pdf-compare/hayro-wasm.mjs b/scripts/pdf-compare/hayro-wasm.mjs
new file mode 100644
index 00000000..af1ba442
--- /dev/null
+++ b/scripts/pdf-compare/hayro-wasm.mjs
@@ -0,0 +1,77 @@
+// node hayro-wasm.mjs LIST MAXPAGES: hayro compiled to wasm (renderPage), run in Chromium over the first
+// MAXPAGES pages of each PDF named in LIST; one JSON line per page: ms, size, wasm memory after, or failure.
+import fs from "node:fs";
+import http from "node:http";
+import path from "node:path";
+import { createRequire } from "node:module";
+
+const root = process.env.EXAV_VIEWER_DIR ?? path.resolve(import.meta.dirname, "../../crates/exav-viewer");
+const require = createRequire(root + "/package.json");
+const { chromium } = require("playwright");
+// wasm-bindgen's --target web output of hayro-wasm, with hayro_wasm_bg.opt.wasm made by wasm-opt.
+const pkg = process.env.HAYRO_WASM_PKG ?? path.resolve(import.meta.dirname, "hayro-wasm/pkg");
+const [list, maxArg] = process.argv.slice(2);
+const max = Number(maxArg);
+const files = fs.readFileSync(list, "utf8").split("\n").filter(Boolean);
+
+const server = http.createServer((req, res) => {
+  const url = decodeURIComponent(req.url.split("?")[0]);
+  let file;
+  if (url === "/") {
+    res.setHeader("content-type", "text/html");
+    return res.end("<!doctype html><meta charset=utf-8><body>");
+  }
+  if (url.startsWith("/pkg/")) file = path.join(pkg, url.slice(5));
+  else if (url.startsWith("/file/")) file = files[Number(url.slice(6))];
+  else return res.writeHead(404).end();
+  fs.readFile(file, (e, d) => {
+    if (e) return res.writeHead(404).end();
+    res.setHeader("content-type", file.endsWith(".js") ? "text/javascript" : file.endsWith(".wasm") ? "application/wasm" : "application/octet-stream");
+    res.end(d);
+  });
+});
+await new Promise((r) => server.listen(0, "127.0.0.1", r));
+const base = `http://127.0.0.1:${server.address().port}`;
+const browser = await chromium.launch();
+for (let n = 0; n < files.length; n++) {
+  const stem = path.basename(files[n], path.extname(files[n]));
+  const page = await (await browser.newContext()).newPage();
+  const timeout = setTimeout(() => page.close().catch(() => {}), 150000);
+  try {
+    await page.goto(base + "/");
+    const results = await page.evaluate(
+      async ({ base, n, max }) => {
+        const m = await import(base + "/pkg/hayro_wasm.js");
+        const wasm = await m.default({ module_or_path: base + "/pkg/hayro_wasm_bg.opt.wasm" });
+        const buf = new Uint8Array(await (await fetch(base + "/file/" + n)).arrayBuffer());
+        let count;
+        try {
+          count = m.pageCount(buf);
+        } catch (e) {
+          return [{ page: 0, status: "load: " + String(e && e.message ? e.message : e) }];
+        }
+        const out = [];
+        for (let i = 0; i < Math.min(max, count); i++) {
+          const t = performance.now();
+          try {
+            const r = m.renderPage(buf, i);
+            const v = new DataView(r.buffer, r.byteOffset);
+            out.push({ page: i + 1, pages: count, w: v.getUint32(0, true), h: v.getUint32(4, true), ms: +(performance.now() - t).toFixed(1), mem: wasm.memory.buffer.byteLength, status: "ok" });
+          } catch (e) {
+            out.push({ page: i + 1, status: "render: " + String(e && e.message ? e.message : e).slice(0, 100) });
+            break;
+          }
+        }
+        return out;
+      },
+      { base, n, max },
+    );
+    for (const r of results) console.log(JSON.stringify({ pdf: stem, ...r }));
+  } catch (e) {
+    console.log(JSON.stringify({ pdf: stem, page: 0, status: "harness: " + String(e.message).slice(0, 120) }));
+  }
+  clearTimeout(timeout);
+  await page.context().close().catch(() => {});
+}
+await browser.close();
+server.close();
diff --git a/scripts/pdf-compare/hayro-wasm/Cargo.toml b/scripts/pdf-compare/hayro-wasm/Cargo.toml
new file mode 100644
index 00000000..8670d78c
--- /dev/null
+++ b/scripts/pdf-compare/hayro-wasm/Cargo.toml
@@ -0,0 +1,24 @@
+# Not part of the workspace: a harness (see ../README.md), with its own lock and target directory.
+[package]
+name = "hayro-wasm"
+version = "0.0.0"
+edition = "2024"
+publish = false
+
+[workspace]
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+hayro = "=0.8.0"
+hayro-interpret = "=0.8.0"
+hayro-syntax = "=0.8.0"
+wasm-bindgen = "=0.2.129"
+
+[profile.release]
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "abort"
+strip = true
diff --git a/scripts/pdf-compare/hayro-wasm/src/lib.rs b/scripts/pdf-compare/hayro-wasm/src/lib.rs
new file mode 100644
index 00000000..6c37f27c
--- /dev/null
+++ b/scripts/pdf-compare/hayro-wasm/src/lib.rs
@@ -0,0 +1,38 @@
+use hayro::{PixmapSettings, RenderCache, RenderSettings, render};
+use hayro_interpret::InterpreterSettings;
+use hayro_syntax::Pdf;
+use wasm_bindgen::prelude::*;
+
+/// Page `index` (0-based) of `data` at scale 1 on white: width and height as two u32 (LE), then RGBA.
+#[wasm_bindgen(js_name = renderPage)]
+pub fn render_page(data: &[u8], index: u32) -> Result<Vec<u8>, JsError> {
+    let pdf = Pdf::new(data.to_vec()).map_err(|e| JsError::new(&format!("{e:?}")))?;
+    let pages = pdf.pages();
+    let page = pages
+        .get(index as usize)
+        .ok_or_else(|| JsError::new("no such page"))?;
+    let cache = RenderCache::new();
+    let ps = PixmapSettings {
+        bg_color: hayro::vello_cpu::color::palette::css::WHITE,
+        ..PixmapSettings::default()
+    };
+    let pix = render(
+        page,
+        &cache,
+        &InterpreterSettings::default(),
+        &RenderSettings::default(),
+        &ps,
+    );
+    let (w, h) = (pix.width() as u32, pix.height() as u32);
+    let mut out = Vec::with_capacity(8 + (w * h * 4) as usize);
+    out.extend_from_slice(&w.to_le_bytes());
+    out.extend_from_slice(&h.to_le_bytes());
+    out.extend_from_slice(pix.data_as_u8_slice());
+    Ok(out)
+}
+
+#[wasm_bindgen(js_name = pageCount)]
+pub fn page_count(data: &[u8]) -> Result<u32, JsError> {
+    let pdf = Pdf::new(data.to_vec()).map_err(|e| JsError::new(&format!("{e:?}")))?;
+    Ok(pdf.pages().len() as u32)
+}
diff --git a/scripts/pdf-compare/pdfjs.mjs b/scripts/pdf-compare/pdfjs.mjs
new file mode 100644
index 00000000..28bc2004
--- /dev/null
+++ b/scripts/pdf-compare/pdfjs.mjs
@@ -0,0 +1,100 @@
+// node pdfjs.mjs LIST OUTDIR MAXPAGES: renders the first MAXPAGES pages of each PDF named in LIST
+// (one path a line) at scale 1 on white in headless Chromium with the pdfjs-dist of the viewer, writes
+// OUTDIR/<stem>-<page>.png, prints one JSON line per page: ms to render, size, or the failure.
+import fs from "node:fs";
+import http from "node:http";
+import path from "node:path";
+import { createRequire } from "node:module";
+
+// The viewer's node_modules (playwright, pdfjs-dist), a Linux install of it.
+const root = process.env.EXAV_VIEWER_DIR ?? path.resolve(import.meta.dirname, "../../crates/exav-viewer");
+const require = createRequire(root + "/package.json");
+const { chromium } = require("playwright");
+const pdfjs = path.join(root, "node_modules", "pdfjs-dist");
+
+const [list, out, maxArg] = process.argv.slice(2);
+const max = Number(maxArg);
+const files = fs.readFileSync(list, "utf8").split("\n").filter(Boolean);
+
+const server = http.createServer((req, res) => {
+  const url = decodeURIComponent(req.url.split("?")[0]);
+  let file;
+  if (url === "/") {
+    res.setHeader("content-type", "text/html");
+    return res.end("<!doctype html><meta charset=utf-8><body>");
+  }
+  if (url.startsWith("/pdfjs/")) file = path.join(pdfjs, url.slice(7));
+  else if (url.startsWith("/file/")) file = files[Number(url.slice(6))];
+  else return res.writeHead(404).end();
+  fs.readFile(file, (e, d) => {
+    if (e) return res.writeHead(404).end();
+    res.setHeader("content-type", file.endsWith(".mjs") ? "text/javascript" : "application/octet-stream");
+    res.end(d);
+  });
+});
+await new Promise((r) => server.listen(0, "127.0.0.1", r));
+const base = `http://127.0.0.1:${server.address().port}`;
+
+const browser = await chromium.launch();
+for (let n = 0; n < files.length; n++) {
+  const stem = path.basename(files[n], path.extname(files[n]));
+  const page = await (await browser.newContext({ deviceScaleFactor: 1 })).newPage();
+  const timeout = setTimeout(() => page.close().catch(() => {}), 120000);
+  try {
+    await page.goto(base + "/");
+    const results = await page.evaluate(
+      async ({ base, n, max }) => {
+        const pdfjs = await import(base + "/pdfjs/build/pdf.mjs");
+        pdfjs.GlobalWorkerOptions.workerSrc = base + "/pdfjs/build/pdf.worker.mjs";
+        const out = [];
+        const t0 = performance.now();
+        let doc;
+        try {
+          const buf = await (await fetch(base + "/file/" + n)).arrayBuffer();
+          doc = await pdfjs.getDocument({
+            data: new Uint8Array(buf),
+            cMapUrl: base + "/pdfjs/cmaps/",
+            cMapPacked: true,
+            standardFontDataUrl: base + "/pdfjs/standard_fonts/",
+            iccUrl: base + "/pdfjs/iccs/",
+            wasmUrl: base + "/pdfjs/wasm/",
+            isEvalSupported: false,
+          }).promise;
+        } catch (e) {
+          return [{ page: 0, status: "load: " + String(e && e.message ? e.message : e) }];
+        }
+        const loadMs = performance.now() - t0;
+        for (let i = 1; i <= Math.min(max, doc.numPages); i++) {
+          try {
+            const p = await doc.getPage(i);
+            const vp = p.getViewport({ scale: 1 });
+            const canvas = document.createElement("canvas");
+            canvas.width = Math.ceil(vp.width);
+            canvas.height = Math.ceil(vp.height);
+            const ctx = canvas.getContext("2d");
+            ctx.fillStyle = "white";
+            ctx.fillRect(0, 0, canvas.width, canvas.height);
+            const t = performance.now();
+            await p.render({ canvasContext: ctx, viewport: vp }).promise;
+            out.push({ page: i, pages: doc.numPages, w: canvas.width, h: canvas.height, ms: +(performance.now() - t).toFixed(1), load_ms: +loadMs.toFixed(1), status: "ok", png: canvas.toDataURL("image/png").split(",")[1] });
+          } catch (e) {
+            out.push({ page: i, status: "render: " + String(e && e.message ? e.message : e) });
+          }
+        }
+        return out;
+      },
+      { base, n, max },
+    );
+    for (const r of results) {
+      const { png, ...line } = r;
+      if (png) fs.writeFileSync(`${out}/${stem}-${r.page}.png`, Buffer.from(png, "base64"));
+      console.log(JSON.stringify({ pdf: stem, ...line }));
+    }
+  } catch (e) {
+    console.log(JSON.stringify({ pdf: stem, page: 0, status: "harness: " + String(e.message).slice(0, 200) }));
+  }
+  clearTimeout(timeout);
+  await page.context().close().catch(() => {});
+}
+await browser.close();
+server.close();
diff --git a/scripts/pdf-compare/run_hayro.py b/scripts/pdf-compare/run_hayro.py
new file mode 100644
index 00000000..7e1f89ea
--- /dev/null
+++ b/scripts/pdf-compare/run_hayro.py
@@ -0,0 +1,48 @@
+"""python3 -I run_hayro.py CORPUS OUT MAXPAGES: hayro-eval on every PDF of CORPUS, 60 s and one process each.
+
+Writes OUT/hayro.jsonl (the file is rewritten whole every 25 PDFs): a line per page, and per PDF a line with
+the peak RSS and the wall time of the process, or "timeout" / "crash".
+"""
+import json, os, subprocess, sys, time
+
+corpus, out, maxpages = sys.argv[1], sys.argv[2], sys.argv[3]
+os.makedirs(out + "/png-hayro", exist_ok=True)
+exe = os.environ.get("HAYRO_EVAL") or os.path.join(os.path.dirname(os.path.abspath(__file__)), "hayro-eval/target/release/hayro-eval")
+files = sorted(f for f in os.listdir(corpus) if f.endswith(".pdf"))
+lines = []
+
+def flush():
+    tmp = out + "/hayro.jsonl.tmp"
+    with open(tmp, "w") as f:
+        f.write("\n".join(json.dumps(l) for l in lines) + "\n")
+    os.replace(tmp, out + "/hayro.jsonl")
+
+for n, name in enumerate(files):
+    stem = os.path.splitext(name)[0]
+    t = time.time()
+    try:
+        p = subprocess.run(["/usr/bin/time", "-f", "RSS %M", exe, f"{corpus}/{name}", out + "/png-hayro", maxpages],
+                           capture_output=True, text=True, timeout=60)
+        wall = time.time() - t
+        rss = 0
+        for l in p.stderr.splitlines():
+            if l.startswith("RSS "):
+                rss = int(l.split()[1])
+        got = 0
+        for l in p.stdout.splitlines():
+            if l.startswith("{"):
+                try:
+                    lines.append(json.loads(l)); got += 1
+                except Exception:
+                    pass
+        if p.returncode != 0 or got == 0:
+            tail = p.stderr.strip().splitlines()[-2:] if p.stderr else []
+            lines.append({"pdf": stem, "page": 0, "status": f"crash({p.returncode}): " + " | ".join(tail)[:160]})
+        lines.append({"pdf": stem, "page": -1, "status": "proc", "rss_kb": rss, "wall_s": round(wall, 2)})
+    except subprocess.TimeoutExpired:
+        lines.append({"pdf": stem, "page": 0, "status": "timeout"})
+        lines.append({"pdf": stem, "page": -1, "status": "proc", "rss_kb": 0, "wall_s": 60})
+    if n % 25 == 24:
+        flush()
+flush()
+print("done", len(files))
diff --git a/scripts/pdf-compare/run_poppler.py b/scripts/pdf-compare/run_poppler.py
new file mode 100644
index 00000000..82006c05
--- /dev/null
+++ b/scripts/pdf-compare/run_poppler.py
@@ -0,0 +1,38 @@
+"""python3 -I run_poppler.py CORPUS OUT MAXPAGES: pdftoppm (poppler) on every PDF, 72 dpi, white page.
+
+Writes OUT/poppler.jsonl and OUT/png-poppler/<stem>-<page>.png; one line per page, and per PDF a line with
+the wall time of the process (page -1).
+"""
+import glob, json, os, subprocess, sys, time
+from PIL import Image
+
+Image.MAX_IMAGE_PIXELS = None
+corpus, out, maxpages = sys.argv[1], sys.argv[2], sys.argv[3]
+os.makedirs(out + "/png-poppler", exist_ok=True)
+lines = []
+files = sorted(f for f in os.listdir(corpus) if f.endswith(".pdf"))
+for n, name in enumerate(files):
+    stem = os.path.splitext(name)[0]
+    prefix = f"{out}/png-poppler/{stem}"
+    t = time.time()
+    try:
+        p = subprocess.run(["pdftoppm", "-r", "72", "-f", "1", "-l", maxpages, "-png", f"{corpus}/{name}", prefix],
+                           capture_output=True, text=True, timeout=60)
+        wall = time.time() - t
+        pngs = sorted(glob.glob(prefix + "-*.png"))
+        for f in pngs:
+            page = int(f.rsplit("-", 1)[1].split(".")[0])
+            # pdftoppm pads the page number to the width of the page count.
+            os.replace(f, f"{prefix}-{page}.png") if f != f"{prefix}-{page}.png" else None
+            with Image.open(f"{prefix}-{page}.png") as im:
+                w, h = im.size
+            lines.append({"pdf": stem, "page": page, "w": w, "h": h, "ms": round(1000 * wall / max(1, len(pngs)), 1), "status": "ok"})
+        if not pngs:
+            lines.append({"pdf": stem, "page": 0, "status": f"fail({p.returncode}): " + (p.stderr.strip().splitlines() or [""])[0][:120]})
+        lines.append({"pdf": stem, "page": -1, "status": "proc", "wall_s": round(wall, 2)})
+    except subprocess.TimeoutExpired:
+        lines.append({"pdf": stem, "page": 0, "status": "timeout"})
+    if n % 50 == 49:
+        open(out + "/poppler.jsonl", "w").write("\n".join(json.dumps(l) for l in lines) + "\n")
+open(out + "/poppler.jsonl", "w").write("\n".join(json.dumps(l) for l in lines) + "\n")
+print("done", len(files))
diff --git a/scripts/release.sh b/scripts/release.sh
index 508db27e..c72cb7b8 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -85,7 +85,8 @@ $CARGO clippy --all-targets --features exav-core/http -- -D warnings || fail "cl
 $CARGO clippy -p exav-core --all-targets --features unstable-internals -- -D warnings || fail "clippy (unstable-internals)"
 # exav-render's drawing and model readers sit behind features no other crate turns on.
 $CARGO clippy -p exav-render --all-targets --features dwg -- -D warnings || fail "clippy (exav-render dwg)"
-$CARGO clippy -p exav-render --all-targets --no-default-features --features ifc,stl -- -D warnings || fail "clippy (exav-render ifc,stl)"
+$CARGO clippy -p exav-render --all-targets --no-default-features --features ifc,stl,obj,ply,gltf -- -D warnings || fail "clippy (exav-render ifc,stl,obj,ply,gltf)"
+$CARGO clippy -p exav-render --all-targets --no-default-features --features office,office-test-util -- -D warnings || fail "clippy (exav-render office)"
 
 step "Tests"
 # The native matrix; `make test` additionally needs wasmtime and node.
diff --git a/scripts/stack-frames.py b/scripts/stack-frames.py
new file mode 100755
index 00000000..38f6b025
--- /dev/null
+++ b/scripts/stack-frames.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+"""Audits the stack frames of the functions that recurse into nested input.
+
+A container inside a container, a group inside a group: each level of nesting
+keeps the frames of the walk that reads it on the stack while the next level is
+read. A walk that holds a decoder or a large model value by value has a frame of
+tens of kilobytes, and sixteen levels (more with `--max-unpack-depth`) are past
+the stack of a worker thread. The size of a frame is a property of the compiled
+code, not of the source, and a release build and a test build differ, so it is
+read from the release binary.
+
+    scripts/stack-frames.py target/release/exav [more binaries...]
+    scripts/stack-frames.py --all --min-kib 8 target/release/exav
+
+Exits 1 when a function that is on a recursion path has a frame over
+`--max-kib` (16 by default). The functions are the WATCHED patterns below; add
+the walk of a format here when it is added.
+
+Needs `objdump` (binutils or LLVM's, which the toolchain's `llvm-tools` has),
+on aarch64 or x86_64.
+"""
+
+import argparse
+import re
+import shutil
+import subprocess
+import sys
+
+# Demangled names, matched anywhere in the name.
+WATCHED = [
+    # The walk of each container format and the shared streaming of members.
+    r"exav_unpack::formats::\w+::walk\b",
+    r"exav_unpack::formats::\w+::walk_\w+",
+    r"exav_unpack::stream::",
+    # The scan's own recursion into members.
+    r"exav_core::walk_members",
+    r"exav_core::scan_found",
+    r"exav_core::scan_object",
+    # The converters' walks of shapes, blocks, groups and nested values.
+    r"exav_render::formats::office::\w+::(?:\w+::)*(?:shape|group|drawable|drawables|block|list|body|inlines|walk|find_shape)\b",
+    r"exav_render::formats::(?:gltf|ifc|cad)::.*::(?:value|item|curve|profile|unit|entity|document)\b",
+]
+
+FRAME_AARCH64 = re.compile(r"\bsub\s+sp, sp, #(0x[0-9a-f]+|\d+)(?:, lsl #(\d+))?")
+PROBE_AARCH64 = re.compile(r"\bsub\s+x\d+, sp, #(0x[0-9a-f]+|\d+)(?:, lsl #(\d+))?")
+FRAME_X86 = re.compile(r"\bsub\s+\$(0x[0-9a-f]+),%rsp")
+PROBE_X86 = re.compile(r"\blea\s+-(0x[0-9a-f]+)\(%rsp\),%r11")
+PROBESTACK_X86 = re.compile(r"\bmov\s+\$(0x[0-9a-f]+),%eax")
+LABEL = re.compile(r"^[0-9a-f]+ <(.+)>:$")
+
+
+def value(match):
+    v = int(match.group(1), 0)
+    if match.lastindex and match.lastindex >= 2 and match.group(2):
+        v <<= int(match.group(2))
+    return v
+
+
+def frames(binary, objdump):
+    """Yields (frame bytes, demangled name) for every function."""
+    out = subprocess.run(
+        [objdump, "-dC", "--no-show-raw-insn", binary],
+        capture_output=True,
+        text=True,
+        errors="replace",
+        check=True,
+    ).stdout
+    name, seen, total, probed, pending_eax = None, 0, 0, False, 0
+    for line in out.splitlines():
+        label = LABEL.match(line.strip())
+        if label:
+            if name and total:
+                yield total, name
+            name, seen, total, probed, pending_eax = label.group(1), 0, 0, False, 0
+            continue
+        if name is None:
+            continue
+        seen += 1
+        if seen > 60:
+            if total:
+                yield total, name
+            name = None
+            continue
+        # aarch64: a frame over a page is probed in a loop whose limit is the
+        # whole frame, then the rest is taken off.
+        m = PROBE_AARCH64.search(line)
+        if m and not probed:
+            probed, total = True, total + value(m)
+            continue
+        m = FRAME_AARCH64.search(line)
+        if m:
+            v = value(m)
+            if not (probed and v == 4096):
+                total += v
+            continue
+        # x86_64: the same, `lea` for the limit or `__rust_probestack`.
+        m = PROBE_X86.search(line)
+        if m and not probed:
+            probed, total = True, total + int(m.group(1), 16)
+            continue
+        m = PROBESTACK_X86.search(line)
+        if m:
+            pending_eax = int(m.group(1), 16)
+            continue
+        if pending_eax and "probestack" in line:
+            total, pending_eax = total + pending_eax, 0
+            continue
+        m = FRAME_X86.search(line)
+        if m:
+            v = int(m.group(1), 16)
+            if not (probed and v == 4096):
+                total += v
+    if name and total:
+        yield total, name
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__.split("\n\n")[0])
+    ap.add_argument("binaries", nargs="+")
+    ap.add_argument("--max-kib", type=int, default=16, help="the largest frame a watched function may have")
+    ap.add_argument("--min-kib", type=int, default=0, help="with --all, the smallest frame to list")
+    ap.add_argument("--all", action="store_true", help="list every function over --min-kib, watched or not")
+    args = ap.parse_args()
+    objdump = shutil.which("objdump") or shutil.which("llvm-objdump")
+    if not objdump:
+        sys.exit("stack-frames: no objdump on the PATH")
+    watched = [re.compile(p) for p in WATCHED]
+    bad = []
+    for binary in args.binaries:
+        listed = {}
+        for size, name in frames(binary, objdump):
+            hit = any(p.search(name) for p in watched)
+            if args.all and size >= args.min_kib * 1024:
+                listed[name] = (size, hit)
+            if hit and size > args.max_kib * 1024:
+                bad.append((size, name, binary))
+        for name, (size, hit) in sorted(listed.items(), key=lambda kv: -kv[1][0]):
+            print(f"{size // 1024:>6} KiB {'*' if hit else ' '} {name[:160]}")
+    for size, name, binary in sorted(bad, reverse=True):
+        print(f"{binary}: {size // 1024} KiB frame in {name[:200]}")
+    if bad:
+        sys.exit(
+            f"stack-frames: {len(bad)} watched function(s) over {args.max_kib} KiB: "
+            "a value held by this function stays on the stack while the next level of "
+            "nesting is read; move it into a function of its own, or box it"
+        )
+    print(f"stack-frames: every watched function is within {args.max_kib} KiB")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/test-js.sh b/scripts/test-js.sh
index 0be8fb54..574d4e8f 100755
--- a/scripts/test-js.sh
+++ b/scripts/test-js.sh
@@ -42,7 +42,7 @@ if [ ! -d node_modules ]; then
 fi
 
 echo "== vitest (pure-JS helpers) =="
-npx vitest run
+npx vitest run tests/helpers.test.ts
 
 if [ "${1:-}" = "--unit" ]; then
   exit 0
@@ -59,6 +59,9 @@ fi
 # those tests do not skip — they fail, on a build that is working correctly.
 wasm-pack build --release --target web -- --features testing-faults
 
+echo "== vitest (on the built pkg/) =="
+npx vitest run tests/volumes.test.ts
+
 echo "== playwright (headless chromium, real wasm) =="
 # `--with-deps` needs root and is only wanted on a fresh CI image; locally the
 # plain download is enough and the shared libraries are already present.
diff --git a/scripts/test-www.sh b/scripts/test-www.sh
index a08a6e17..b42c7c37 100755
--- a/scripts/test-www.sh
+++ b/scripts/test-www.sh
@@ -23,6 +23,9 @@ if ! command -v node >/dev/null 2>&1; then
   exit 1
 fi
 
+# The format registry against the code, and the pages generated from it.
+node "$REPO/scripts/formats.mjs" check
+
 if [ ! -d node_modules ]; then
   npm ci || npm install
 fi
diff --git a/scripts/wasm-format-sizes.sh b/scripts/wasm-format-sizes.sh
index 95671a14..437d6cd8 100755
--- a/scripts/wasm-format-sizes.sh
+++ b/scripts/wasm-format-sizes.sh
@@ -40,7 +40,7 @@ fi
 [package]
 name = "uwsz"
 version = "0.0.0"
-edition = "2021"
+edition = "2024"
 [[bin]]
 name = "uwsz"
 path = "src/main.rs"
diff --git a/www/astro.config.mjs b/www/astro.config.mjs
index a6f1ea00..6f70dd60 100644
--- a/www/astro.config.mjs
+++ b/www/astro.config.mjs
@@ -3,10 +3,12 @@ import { defineConfig } from 'astro/config';
 import starlight from '@astrojs/starlight';
 import starlightSidebarTopics from 'starlight-sidebar-topics';
 
+const SITE = 'https://exav.org';
 const GITHUB_REPO = 'https://github.com/sylvinus/exav';
+const OG_ALT = 'exav: Memory-safe tools for untrusted files.';
 
 export default defineConfig({
-  site: 'https://exav.org',
+  site: SITE,
   redirects: {
     // Folded into Design principles; keep old links working.
     '/concepts/never-silent/': '/scanner/concepts/design-principles/#never-a-silent-clean',
@@ -88,7 +90,7 @@ export default defineConfig({
   integrations: [
     starlight({
       title: 'exav',
-      tagline: 'Memory-safe tools for untrusted files.',
+      description: 'Memory-safe tools for untrusted files.',
       // Mark only: the "exav" wordmark next to it is rendered as real text by
       // Starlight, so it uses the site font rather than whatever the viewer's
       // OS happens to substitute inside an <img>-loaded SVG.
@@ -97,6 +99,22 @@ export default defineConfig({
         alt: '',
       },
       favicon: '/favicon.svg',
+      // Starlight already writes the description, canonical link, og:title,
+      // og:description, og:type, og:url, og:site_name, og:locale and
+      // twitter:card (summary_large_image) of every page, and the `lang`
+      // attribute. What it does not: the preview image (public/og.png, drawn
+      // by scripts/make-og-image.py) and the browser's theme colour, which is
+      // the dark theme's background (the site is dark only).
+      head: [
+        { tag: 'meta', attrs: { property: 'og:image', content: `${SITE}/og.png` } },
+        { tag: 'meta', attrs: { property: 'og:image:type', content: 'image/png' } },
+        { tag: 'meta', attrs: { property: 'og:image:width', content: '1200' } },
+        { tag: 'meta', attrs: { property: 'og:image:height', content: '630' } },
+        { tag: 'meta', attrs: { property: 'og:image:alt', content: OG_ALT } },
+        { tag: 'meta', attrs: { name: 'twitter:image', content: `${SITE}/og.png` } },
+        { tag: 'meta', attrs: { name: 'twitter:image:alt', content: OG_ALT } },
+        { tag: 'meta', attrs: { name: 'theme-color', content: '#17181c' } },
+      ],
       social: [
         { icon: 'github', label: 'GitHub', href: GITHUB_REPO },
       ],
@@ -199,6 +217,7 @@ export default defineConfig({
               { label: 'React UI', slug: 'viewer/react' },
               { label: 'Core API', slug: 'viewer/api' },
               { label: 'Security', slug: 'viewer/security' },
+              { label: 'Example files', slug: 'viewer/examples' },
               { label: 'Live demo', link: '/viewer/demo/', attrs: { target: '_blank' } },
             ],
           },
@@ -233,6 +252,7 @@ export default defineConfig({
             icon: 'open-book',
             items: [
               { label: 'Technical architecture', slug: 'project/architecture' },
+              { label: 'Format matrix', slug: 'project/formats' },
               { label: 'Roadmap', slug: 'project/roadmap' },
               { label: 'Contributing', slug: 'project/contributing' },
               { label: 'Security', slug: 'project/security' },
diff --git a/www/package-lock.json b/www/package-lock.json
index 9e34adb7..86140b73 100644
--- a/www/package-lock.json
+++ b/www/package-lock.json
@@ -8,96 +8,90 @@
       "name": "exav-www",
       "version": "0.1.0",
       "dependencies": {
-        "@astrojs/starlight": "^0.41.4",
-        "astro": "^7.1.3",
-        "sharp": "^0.35.3",
-        "starlight-sidebar-topics": "0.8.0"
+        "@astrojs/starlight": "^0.42.7",
+        "astro": "^7.4.2",
+        "sharp": "^0.35.5",
+        "starlight-sidebar-topics": "0.9.0"
       },
       "devDependencies": {
-        "@astrojs/check": "^0.9.9",
+        "@astrojs/check": "^0.9.12",
         "typescript": "^6.0.3"
       }
     },
-    "node_modules/@astrojs/check": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/@astrojs/check/-/check-0.9.9.tgz",
-      "integrity": "sha512-A5UW8uIuErLWEoRQvzgXpO1gTjUFtK8r7nU2Z7GewAMxUb7bPvpk11qaKKgxqXlHJWlAvaaxy+Xg28A6bmQ1Tg==",
+    "node_modules/@astrojs/astro2tsx": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@astrojs/astro2tsx/-/astro2tsx-0.1.3.tgz",
+      "integrity": "sha512-GMDC7Eo0myBUA/QLBl0u+OcegJ8LiBhccmNZR34KmprQNP8gQUJlWlOOZWUsxNA2rNS6GuPYcGDyLoPnjmn4/Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@astrojs/language-server": "^2.16.7",
-        "chokidar": "^4.0.3",
-        "kleur": "^4.1.5",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "astro-check": "bin/astro-check.js"
+        "@emnapi/core": "1.11.3",
+        "@napi-rs/wasm-runtime": "1.2.4"
       },
-      "peerDependencies": {
-        "typescript": "^5.0.0 || ^6.0.0"
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@astrojs/check/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+    "node_modules/@astrojs/check": {
+      "version": "0.9.12",
+      "resolved": "https://registry.npmjs.org/@astrojs/check/-/check-0.9.12.tgz",
+      "integrity": "sha512-hazpqxIfZWj2VhyPyR0pOEQ/IhFDM/2nIApL96zMXABdD8NrUKYDmhxTy7h+drTDl9MQG/Sd1ET/4amadVJUUA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
+        "@astrojs/language-server": "^2.17.3",
+        "chokidar": "^5.0.0",
+        "kleur": "^4.1.5",
+        "yargs": "^18.2.0"
       },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@astrojs/check/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
+      "bin": {
+        "astro-check": "bin/astro-check.js"
       },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
+      "peerDependencies": {
+        "typescript": "^5.0.0 || ^6.0.0"
       }
     },
-    "node_modules/@astrojs/compiler": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.13.1.tgz",
-      "integrity": "sha512-f3FN83d2G/v32ipNClRKgYv30onQlMZX1vCeZMjPsMMPl1mDpmbl0+N5BYo4S/ofzqJyS5hvwacEo0CCVDn/Qg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@astrojs/compiler-binding": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding/-/compiler-binding-0.3.1.tgz",
-      "integrity": "sha512-DaAUj29AIBU2XdJ8uwcab8lW5O2pk9pY8AXkcMw0sw77nVa3oeTYRcO+Dvbbpoexf6ThMc0FMWYCQ/wN1/T7oQ==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding/-/compiler-binding-0.5.2.tgz",
+      "integrity": "sha512-lEn76+0JcMQ5RDXU0wSMWJg2ZppiZvSULpghC29cfv4o9bhvWFDbQjsCtvjjXN9iVLFQ7fL3wTR2L2UU13mP8g==",
       "license": "MIT",
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@astrojs/compiler-binding-darwin-arm64": "0.3.1",
-        "@astrojs/compiler-binding-darwin-x64": "0.3.1",
-        "@astrojs/compiler-binding-linux-arm64-gnu": "0.3.1",
-        "@astrojs/compiler-binding-linux-arm64-musl": "0.3.1",
-        "@astrojs/compiler-binding-linux-x64-gnu": "0.3.1",
-        "@astrojs/compiler-binding-linux-x64-musl": "0.3.1",
-        "@astrojs/compiler-binding-wasm32-wasi": "0.3.1",
-        "@astrojs/compiler-binding-win32-arm64-msvc": "0.3.1",
-        "@astrojs/compiler-binding-win32-x64-msvc": "0.3.1"
+        "@astrojs/compiler-binding-android-arm64": "0.5.2",
+        "@astrojs/compiler-binding-darwin-arm64": "0.5.2",
+        "@astrojs/compiler-binding-darwin-x64": "0.5.2",
+        "@astrojs/compiler-binding-linux-arm64-gnu": "0.5.2",
+        "@astrojs/compiler-binding-linux-arm64-musl": "0.5.2",
+        "@astrojs/compiler-binding-linux-x64-gnu": "0.5.2",
+        "@astrojs/compiler-binding-linux-x64-musl": "0.5.2",
+        "@astrojs/compiler-binding-wasm32-wasi": "0.5.2",
+        "@astrojs/compiler-binding-win32-arm64-msvc": "0.5.2",
+        "@astrojs/compiler-binding-win32-x64-msvc": "0.5.2"
+      }
+    },
+    "node_modules/@astrojs/compiler-binding-android-arm64": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-android-arm64/-/compiler-binding-android-arm64-0.5.2.tgz",
+      "integrity": "sha512-kckIxon6Rm/Bxzh9mGPYpRRqUbToUQoHptCmpMmE+Yt0Xumq8CqrKUidyYhrBsrHVO7bxuRzzWUUqvpf+iYceQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@astrojs/compiler-binding-darwin-arm64": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-darwin-arm64/-/compiler-binding-darwin-arm64-0.3.1.tgz",
-      "integrity": "sha512-IEmEF2fUIlTHtpeE/isyEGVOB14cEyh/LZOFYt6wn3jNyVpdC8aR5OZ+RzFUR/f+8ZDM1LaMwZKvoA7eMyJeFw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-darwin-arm64/-/compiler-binding-darwin-arm64-0.5.2.tgz",
+      "integrity": "sha512-1ZG5Ar3dD8HtodX9XH1mRmE0qBXZlvjYXSFfpgFwocqfWnvhFuqtGUNseL8wgfImiRMztIjpQqlogQFQQtgiag==",
       "cpu": [
         "arm64"
       ],
@@ -111,9 +105,9 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-darwin-x64": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-darwin-x64/-/compiler-binding-darwin-x64-0.3.1.tgz",
-      "integrity": "sha512-GF2kIxjpPDLsn94zbZNMsxEmkU828QqnmM7kiQJnaooS3jmI+I7kk6+oI6EpwOsK3femCMdcm+wmOsEqtGrmjQ==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-darwin-x64/-/compiler-binding-darwin-x64-0.5.2.tgz",
+      "integrity": "sha512-+kl35S7hiHJ2cb7eujwEsPFYYuSgE11uEE2Z20lAJ+undpgulMcW+weQqFPOSSZccEKHOiLIY+kQHkb4e4092w==",
       "cpu": [
         "x64"
       ],
@@ -127,9 +121,9 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-linux-arm64-gnu": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-arm64-gnu/-/compiler-binding-linux-arm64-gnu-0.3.1.tgz",
-      "integrity": "sha512-XJL3SDmOtVrqFhCirNcHwE91+IesJqlgNo23I4qW9QUYfwzm/TBZuH61fgqsb1ttgR1mMYz6ooPWs0JDhwMqpQ==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-arm64-gnu/-/compiler-binding-linux-arm64-gnu-0.5.2.tgz",
+      "integrity": "sha512-BqlR0EHNQLPLwgL9+xogjsAc7zGf0cHho2CPdhv0P1yqbVMwGVaGAqrANP6VYAXCqSC43AF4Czcxc2n+oqdesg==",
       "cpu": [
         "arm64"
       ],
@@ -146,9 +140,9 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-linux-arm64-musl": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-arm64-musl/-/compiler-binding-linux-arm64-musl-0.3.1.tgz",
-      "integrity": "sha512-xqE8BVbDoBueK/B47w30PtkVofUWJKGkwoMVE+EOMLf11rnoANxIAdA9FPqY+rng4oNI5ndHGsri1yPj2k8vZQ==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-arm64-musl/-/compiler-binding-linux-arm64-musl-0.5.2.tgz",
+      "integrity": "sha512-GRGyby3AZWw5d6JQzidyxPyvGgHWsSusrpgKyFVpDTKctABF7L3Pd5V1cRJbV36/rcu+Eh292/wL7pF7MkmGkQ==",
       "cpu": [
         "arm64"
       ],
@@ -165,9 +159,9 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-linux-x64-gnu": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-x64-gnu/-/compiler-binding-linux-x64-gnu-0.3.1.tgz",
-      "integrity": "sha512-1y0StU1qiCuDFH3rmbRJXcxdfHxFPrES1Rd+RLffosvUR7I2cH5SF5SFnBN9vXpzpkmyElZm3Yr47iJBPN7vVA==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-x64-gnu/-/compiler-binding-linux-x64-gnu-0.5.2.tgz",
+      "integrity": "sha512-9XAqGTMQAtIslMsjK3xdyY6OI9d59OZqcLBB6pvD/DcoR0daYswfrKx2azdDERDY4AqAnWPC7odVM1BmxYv3Vw==",
       "cpu": [
         "x64"
       ],
@@ -184,9 +178,9 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-linux-x64-musl": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-x64-musl/-/compiler-binding-linux-x64-musl-0.3.1.tgz",
-      "integrity": "sha512-16q0fYf7kpbmdObZEeZJEup8hQv/whgNwVjrSvT8umrKwLDSnNIWiQpm09lQQu6bweZB0XyIvHwlPitvJhC+hg==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-linux-x64-musl/-/compiler-binding-linux-x64-musl-0.5.2.tgz",
+      "integrity": "sha512-jOViewGeTh9bSfS8vK72ECxoy2yvmA+Pd/ZcEvBI5c7+7IcfHwZ5qA4L9fRYuOhSrAifvQ2dV4vm1XAtloaWBw==",
       "cpu": [
         "x64"
       ],
@@ -203,25 +197,48 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-wasm32-wasi": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-wasm32-wasi/-/compiler-binding-wasm32-wasi-0.3.1.tgz",
-      "integrity": "sha512-cB456shIwDv/PrVT+2QG7LFndpHkVge5HjqADKZgGaAc9JHVktCtjSrcdkRQ+3tbkPazNKaTLRjXLIiz2NIx9g==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-wasm32-wasi/-/compiler-binding-wasm32-wasi-0.5.2.tgz",
+      "integrity": "sha512-Z7p64doar1uvR5C9Xs6j1CV9lGlPVQX7OQ2aAtZ/xKC5aGS6GB13nyc2UfQXTQLvZrvVwsyaflTQy6ziY5Bekw==",
       "cpu": [
         "wasm32"
       ],
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^1.1.6"
+        "@emnapi/core": "1.11.3",
+        "@emnapi/runtime": "1.11.3",
+        "@napi-rs/wasm-runtime": "^1.2.5"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@astrojs/compiler-binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.5.tgz",
+      "integrity": "sha512-HshSvXzmBxNzqejd3k/KemgQ3hdREUYFRRrgxOZ+gPljDIsO2SDZrVZMd4Z/HsxudQbE62OVyVFE8z9BCurfjA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@tybys/wasm-util": "^0.10.3"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
+        "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
       }
     },
     "node_modules/@astrojs/compiler-binding-win32-arm64-msvc": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-win32-arm64-msvc/-/compiler-binding-win32-arm64-msvc-0.3.1.tgz",
-      "integrity": "sha512-ur/9+If/yTE69mmeX5MqSZndL0HOyx67GeNZUy3N7wVdWpLz9UTJXwyWS4UR2PUQHitghjsM5xoX0Ge56WRVQQ==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-win32-arm64-msvc/-/compiler-binding-win32-arm64-msvc-0.5.2.tgz",
+      "integrity": "sha512-Tr13bh+ahTWsjXjzctK7pFpWV+dUU4FtBfETlR7gO+ueex0F+RDch7eRr0YfKysaRhk9tWm14lsCJ5uWyFPNHQ==",
       "cpu": [
         "arm64"
       ],
@@ -235,9 +252,9 @@
       }
     },
     "node_modules/@astrojs/compiler-binding-win32-x64-msvc": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-win32-x64-msvc/-/compiler-binding-win32-x64-msvc-0.3.1.tgz",
-      "integrity": "sha512-k0W+kDBzDkNZOqu4kElDvCOIbKw5Ut9S1WZ1Krj3KTgNuBERNKXsMMsRLLcbgfdMdbe7bTekQLshZrrvmYpmwA==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-binding-win32-x64-msvc/-/compiler-binding-win32-x64-msvc-0.5.2.tgz",
+      "integrity": "sha512-SfKkI+jOQYLh6wojPvVPV0lFfQnxisweN9B+qCzRvZp7DHAuGif8Y0WcC5PUgN4jb8VKy57LggQDtggR46Du1g==",
       "cpu": [
         "x64"
       ],
@@ -251,49 +268,48 @@
       }
     },
     "node_modules/@astrojs/compiler-rs": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/compiler-rs/-/compiler-rs-0.3.1.tgz",
-      "integrity": "sha512-aT7xkgsbNoS6nriY5qKpbihK43slFHO41iqgHCTdOvn1ifaQxLCc5yXy+6GzAtiafoaC1zA7OwVXCXMsvUZOkg==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/compiler-rs/-/compiler-rs-0.5.2.tgz",
+      "integrity": "sha512-IvwYLB8t1M86rKO4oPdBi9GP4gzXcgrVlNgocjwos1jeeUuEIV8d9Crn1PvYD/5IKteWOxpIHomf7e8iYlkE+Q==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/compiler-binding": "0.3.1"
+        "@astrojs/compiler-binding": "0.5.2"
       },
       "engines": {
         "node": ">=22.12.0"
       }
     },
     "node_modules/@astrojs/internal-helpers": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/internal-helpers/-/internal-helpers-0.10.1.tgz",
-      "integrity": "sha512-5phcroT/vmOOrYuuAxtkbPixy5hePtlz9i8K4OeDv3dNK6/UQRuXPOSRTxIOBbUY5Sonw2UaxjbuVc43Mcir6Q==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/internal-helpers/-/internal-helpers-0.13.0.tgz",
+      "integrity": "sha512-20jxQqnSmpskcGyad7N5l6Xf1gz0UCa6lNde44bEBdaXGpncEYfAZJ142r2ZgzBaG4dUyzGmhqZWv1INU2eiHQ==",
       "license": "MIT",
       "dependencies": {
-        "@types/hast": "^3.0.4",
+        "@types/hast": "^3.0.5",
         "@types/mdast": "^4.0.4",
-        "js-yaml": "^4.1.1",
-        "picomatch": "^4.0.4",
+        "picomatch": "^4.0.7",
         "retext-smartypants": "^6.2.0",
-        "shiki": "^4.0.2",
-        "smol-toml": "^1.6.0",
-        "unified": "^11.0.5"
+        "shiki": "^4.5.0",
+        "smol-toml": "^1.9.1",
+        "unified": "^11.0.5",
+        "yaml": "^2.9.1"
       }
     },
     "node_modules/@astrojs/language-server": {
-      "version": "2.16.13",
-      "resolved": "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.16.13.tgz",
-      "integrity": "sha512-ekOa+CYprEq5n4EJC1qTIAhLk49HZIUQuFwrEuF+3JK/pdMaYnWoREFUI2A0KEPOJiFA2kamBzKzbYljDvUxLg==",
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.17.3.tgz",
+      "integrity": "sha512-QIAFu1e/4quJMTPdmBOm+ZPXc5NDGZE4/YQjgR3EgjhGLl/tdidaWJDr5WmO2lesVc+BW1qN/xNBURmuePDG2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@astrojs/compiler": "^2.13.1",
+        "@astrojs/astro2tsx": "^0.1.2",
         "@astrojs/yaml2ts": "^0.2.4",
-        "@jridgewell/sourcemap-codec": "^1.5.5",
         "@volar/kit": "~2.4.28",
         "@volar/language-core": "~2.4.28",
         "@volar/language-server": "~2.4.28",
         "@volar/language-service": "~2.4.28",
         "muggle-string": "^0.4.1",
-        "tinyglobby": "^0.2.16",
+        "tinyglobby": "^0.2.17",
         "volar-service-css": "0.0.71",
         "volar-service-emmet": "0.0.71",
         "volar-service-html": "0.0.71",
@@ -302,7 +318,7 @@
         "volar-service-typescript-twoslash-queries": "0.0.71",
         "volar-service-yaml": "0.0.71",
         "vscode-html-languageservice": "^5.6.2",
-        "vscode-uri": "^3.1.0"
+        "vscode-uri": "^3.2.0"
       },
       "bin": {
         "astro-ls": "bin/nodeServer.js"
@@ -320,88 +336,52 @@
         }
       }
     },
-    "node_modules/@astrojs/markdown-remark": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-7.2.1.tgz",
-      "integrity": "sha512-jPVNIqTvk+yKviikszv/Y1U4jGUSKpp/Nw48QZV4qjWgp70j4Lkq3lhSDRbWwCfgKvEyO9GHuVbV1dM2WYXy1w==",
-      "license": "MIT",
-      "dependencies": {
-        "@astrojs/internal-helpers": "0.10.1",
-        "@astrojs/prism": "4.0.2",
-        "github-slugger": "^2.0.0",
-        "hast-util-from-html": "^2.0.3",
-        "hast-util-to-text": "^4.0.2",
-        "mdast-util-definitions": "^6.0.0",
-        "rehype-raw": "^7.0.0",
-        "rehype-stringify": "^10.0.1",
-        "remark-gfm": "^4.0.1",
-        "remark-parse": "^11.0.0",
-        "remark-rehype": "^11.1.2",
-        "remark-smartypants": "^3.0.2",
-        "unified": "^11.0.5",
-        "unist-util-remove-position": "^5.0.0",
-        "unist-util-visit": "^5.1.0",
-        "unist-util-visit-parents": "^6.0.2",
-        "vfile": "^6.0.3"
-      }
-    },
     "node_modules/@astrojs/markdown-satteri": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@astrojs/markdown-satteri/-/markdown-satteri-0.3.4.tgz",
-      "integrity": "sha512-6Lvt/bQZEBW+zzdhPblvfZEy5PGEYJaUsUqaCgwHeRPxZJL1gc9I+DRLKWJjjYTWDzVUTzXlMq4WwSK+X34CVw==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@astrojs/markdown-satteri/-/markdown-satteri-0.4.5.tgz",
+      "integrity": "sha512-0IeGdoFbv0f+442KJhYS44Wg8F3MuHmRsxIEYuFyqkjRubc6dPBFZ7azor5t4AeXLQoT5A5h9HyViKpd70Dl9w==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/internal-helpers": "0.10.1",
-        "@astrojs/prism": "4.0.2",
+        "@astrojs/internal-helpers": "0.13.0",
+        "@astrojs/prism": "4.1.1",
         "github-slugger": "^2.0.0",
-        "hast-util-from-html": "^2.0.3",
-        "satteri": "^0.9.1"
+        "satteri": "^0.10.5"
       }
     },
     "node_modules/@astrojs/mdx": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-7.0.3.tgz",
-      "integrity": "sha512-RxyIwU0uFam5ftwqKOjpIdhnFxZ/kEikeimLyQy3eGXbHT8WgRGzzesOIHVU8+m9TY8ag5WVOyvV24/GyqPdPQ==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-8.1.1.tgz",
+      "integrity": "sha512-jEJUJsO2KqmKfBXaKeDHDCCj+Kerj1Fj+XndHznF9wxahvs+1onYCBeKmieM28N2+uA6mW57DOQQw5YaDLdBnA==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/internal-helpers": "0.10.1",
-        "@astrojs/markdown-remark": "7.2.1",
-        "@mdx-js/mdx": "^3.1.1",
-        "acorn": "^8.16.0",
-        "es-module-lexer": "^2.0.0",
-        "estree-util-visit": "^2.0.0",
-        "hast-util-to-html": "^9.0.5",
-        "piccolore": "^0.1.3",
-        "rehype-raw": "^7.0.0",
-        "remark-gfm": "^4.0.1",
-        "remark-smartypants": "^3.0.2",
-        "source-map": "^0.7.6",
-        "unist-util-visit": "^5.1.0",
-        "vfile": "^6.0.3"
+        "@astrojs/internal-helpers": "0.13.0",
+        "@astrojs/markdown-satteri": "0.4.5",
+        "es-module-lexer": "^3.0.3"
       },
       "engines": {
-        "node": ">=22.12.0"
+        "node": ">=22.23.4"
       },
       "peerDependencies": {
-        "@astrojs/markdown-satteri": "^0.3.1",
-        "astro": "^7.0.0"
+        "@astrojs/markdown-remark": "^7.3.0",
+        "@astrojs/markdown-satteri": "^0.4.0",
+        "astro": "^7.2.10"
       },
       "peerDependenciesMeta": {
-        "@astrojs/markdown-satteri": {
+        "@astrojs/markdown-remark": {
           "optional": true
         }
       }
     },
     "node_modules/@astrojs/prism": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-4.0.2.tgz",
-      "integrity": "sha512-KTivpmnz6lDsC6o9H4+DNm2SrE/GHzw8cNAvEJwAvUT+eoaEnn/4NtbDNfRRaxaJHdp15gf+tfHAWiXR4wB3BA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-4.1.1.tgz",
+      "integrity": "sha512-sXlAXJX6t4QfuLg+CuCDzpg7NoxWcyb4paFprgtFppLeisCBmh935h+tJ5CWXfsXEoW2IDy/ihbRMtiu28Chjw==",
       "license": "MIT",
       "dependencies": {
         "prismjs": "^1.30.0"
       },
       "engines": {
-        "node": ">=22.12.0"
+        "node": ">=22.23.4"
       }
     },
     "node_modules/@astrojs/sitemap": {
@@ -416,44 +396,43 @@
       }
     },
     "node_modules/@astrojs/starlight": {
-      "version": "0.41.4",
-      "resolved": "https://registry.npmjs.org/@astrojs/starlight/-/starlight-0.41.4.tgz",
-      "integrity": "sha512-cRCKZhM2BKYViCakBiN68aVwPn5qj/XtMMq//G54xOWdXXcvic1gMMEI+veNlIKOqqC4QmIjcjk4jiFtlZ3mMg==",
+      "version": "0.42.7",
+      "resolved": "https://registry.npmjs.org/@astrojs/starlight/-/starlight-0.42.7.tgz",
+      "integrity": "sha512-mlbit5iRjLx5eIcLf84Q2CwkrrsEgZrQwKKBK+vRf+ZGiSrwy1UGdT1hUfAIaHrMfcvkDpL+gw3aua7HobiKFg==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/markdown-satteri": "^0.3.2",
-        "@astrojs/mdx": "^7.0.0",
-        "@astrojs/sitemap": "^3.7.2",
+        "@astrojs/markdown-satteri": "^0.4.0",
+        "@astrojs/mdx": "^8.0.0",
+        "@astrojs/sitemap": "^3.7.3",
         "@pagefind/default-ui": "^1.3.0",
-        "@types/hast": "^3.0.4",
+        "@types/hast": "^3.0.5",
         "@types/js-yaml": "^4.0.9",
         "@types/mdast": "^4.0.4",
         "astro-expressive-code": "^0.44.0",
         "bcp-47": "^2.1.0",
-        "hast-util-from-html": "^2.0.3",
+        "hast-util-format": "^1.1.0",
         "hast-util-select": "^6.0.4",
+        "hast-util-to-html": "^9.0.5",
         "hast-util-to-string": "^3.0.1",
         "hastscript": "^9.0.1",
         "i18next": "^26.0.7",
         "js-yaml": "^4.1.1",
         "klona": "^2.0.6",
-        "magic-string": "^0.30.21",
+        "magic-string": "^1.2.3",
         "mdast-util-directive": "^3.1.0",
         "mdast-util-to-markdown": "^2.1.2",
         "mdast-util-to-string": "^4.0.0",
         "pagefind": "^1.5.2",
-        "rehype": "^13.0.2",
-        "rehype-format": "^5.0.1",
         "remark-directive": "^4.0.0",
-        "satteri": "^0.9.1",
+        "satteri": "^0.10.3",
         "ultrahtml": "^1.6.0",
         "unified": "^11.0.5",
         "unist-util-visit": "^5.1.0",
         "vfile": "^6.0.3"
       },
       "peerDependencies": {
-        "@astrojs/markdown-remark": "^7.2.0",
-        "astro": "^7.0.2"
+        "@astrojs/markdown-remark": "^7.3.0",
+        "astro": "^7.2.10"
       },
       "peerDependenciesMeta": {
         "@astrojs/markdown-remark": {
@@ -462,18 +441,18 @@
       }
     },
     "node_modules/@astrojs/telemetry": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.3.3.tgz",
-      "integrity": "sha512-C1TLn5sPJr0x4vk56piHWKbnqlEB8BKyte5Y45V02U+D7BGO5eMqZDH5aPjnkXQWJggvmsTXxH03QMZ9NgWLzQ==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.4.1.tgz",
+      "integrity": "sha512-SMkvMsGOpM0FMAoT5pzhgI3LZC0JSPWf7Evwop+fZ3N6UkusPM7lI+sOJjMNI5OJrVoiei1/AGo1cY7sikTc5A==",
       "license": "MIT",
       "dependencies": {
         "ci-info": "^4.4.0",
         "dset": "^3.1.4",
         "is-docker": "^4.0.0",
-        "package-manager-detector": "^1.6.0"
+        "package-manager-detector": "^1.9.0"
       },
       "engines": {
-        "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+        "node": ">=22.23.4"
       }
     },
     "node_modules/@astrojs/yaml2ts": {
@@ -505,12 +484,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
-      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
+      "version": "7.29.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz",
+      "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.7"
+        "@babel/types": "^7.29.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -520,9 +499,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
-      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.29.7",
@@ -533,9 +512,9 @@
       }
     },
     "node_modules/@bruits/satteri-darwin-arm64": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-darwin-arm64/-/satteri-darwin-arm64-0.9.5.tgz",
-      "integrity": "sha512-iw4nZgx9v30lWo/MTngQqi1pI78KI0DnkSm+lVJGYdmPLgAyDNJigVhpG42/Iq55A6c1Ll8q66ljyyRiQUxwow==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-darwin-arm64/-/satteri-darwin-arm64-0.10.5.tgz",
+      "integrity": "sha512-27KTVl4TJkVahMy/ohyA7qd4938G5UNneFUz/PsScYfpIhj0IVAS23mpcJXdPF44sa6nva198lmV/cKIb2YPyA==",
       "cpu": [
         "arm64"
       ],
@@ -546,9 +525,9 @@
       ]
     },
     "node_modules/@bruits/satteri-darwin-x64": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-darwin-x64/-/satteri-darwin-x64-0.9.5.tgz",
-      "integrity": "sha512-6T26Z5Kf3cFW2PSlk9p7zT7yVxvuBSiJvYyz9u8KjYwMTqZyIDOj2wDyNpxKV4+6yUVG7rddq2QwvG/8LJA2+Q==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-darwin-x64/-/satteri-darwin-x64-0.10.5.tgz",
+      "integrity": "sha512-IjnLe3nKspq6qaeqGgjT7MT8VrTV74yWRlaag7ZdNsI8TDAYZ0iPxMCo+9KQZHUk5EyVB+reBI/PFWL5KuFw9Q==",
       "cpu": [
         "x64"
       ],
@@ -559,9 +538,9 @@
       ]
     },
     "node_modules/@bruits/satteri-linux-arm64-gnu": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-arm64-gnu/-/satteri-linux-arm64-gnu-0.9.5.tgz",
-      "integrity": "sha512-u51id17uJwNEMK9nBlICsq6U31c+XVqQueVBkwRIzZG+gMpS8TOJctt5h5Wz33Z8xnMdTd+adtACVz0yHgGuOA==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-arm64-gnu/-/satteri-linux-arm64-gnu-0.10.5.tgz",
+      "integrity": "sha512-glkYXZCJywjP13v67eAyAMSJdF+ncvEbYvgi/wOtffL9tQ27lr/zsyzUfgs+ovjJ9d8JNQKiXeiArJcX8PJL9w==",
       "cpu": [
         "arm64"
       ],
@@ -575,9 +554,9 @@
       ]
     },
     "node_modules/@bruits/satteri-linux-arm64-musl": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-arm64-musl/-/satteri-linux-arm64-musl-0.9.5.tgz",
-      "integrity": "sha512-v39HxiwGC5Rqm01HksP6+5Y+xKLPlsuVFgIgpEAo+SiQ22c+mJVhS3u7Z6ePAKdhL5NJoK1xq70kLz3L13AhpQ==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-arm64-musl/-/satteri-linux-arm64-musl-0.10.5.tgz",
+      "integrity": "sha512-yWdgG1g17Nh2QyGVlFUxGRa3FEFwiMcpZEyMNWkbM3deC94cmVc+/i9OuyFpdKuWo3GkgoCtYVOoxk1uCnCZIA==",
       "cpu": [
         "arm64"
       ],
@@ -591,9 +570,9 @@
       ]
     },
     "node_modules/@bruits/satteri-linux-x64-gnu": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-x64-gnu/-/satteri-linux-x64-gnu-0.9.5.tgz",
-      "integrity": "sha512-F3uO8uFp3pAP5ZGXttwvh57GS7s0lL953tnNdyI2gRyP4kOOkp6pyGojNJzCjkDvWI2Cvb9iNrKok3aqQPauAw==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-x64-gnu/-/satteri-linux-x64-gnu-0.10.5.tgz",
+      "integrity": "sha512-FVaLoPT1fBgGl0J+AYebyyXJYBachGl8Oyyrf1lye4RTqCB4S0Gwkj1uM9RJyThUOvx5VUmAT1CnNh1SFHA+kw==",
       "cpu": [
         "x64"
       ],
@@ -607,9 +586,9 @@
       ]
     },
     "node_modules/@bruits/satteri-linux-x64-musl": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-x64-musl/-/satteri-linux-x64-musl-0.9.5.tgz",
-      "integrity": "sha512-bicEqglLlz++mWyADaZoP0JY20s4vDfLjaPYgQqC+NI4zZLTOOg1T4GB8aqtc822Pqji8SQBmSrTb7CrP8i08Q==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-linux-x64-musl/-/satteri-linux-x64-musl-0.10.5.tgz",
+      "integrity": "sha512-EHpVAx2bqW3GINHTKkljtxVfQmVDGWIuwOYOP5YghTj+0PkBa2o8oKPRtQ9Kbsr1Fye8jtUcDjhwj2jMNugZKg==",
       "cpu": [
         "x64"
       ],
@@ -623,9 +602,9 @@
       ]
     },
     "node_modules/@bruits/satteri-wasm32-wasi": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-wasm32-wasi/-/satteri-wasm32-wasi-0.9.5.tgz",
-      "integrity": "sha512-zauAuMwfPnKPUkd4AFixRFpXdgKwP2mKgxrIIo2gJzW0/ZneF9dbHnLkojSpaBnCCp7VUL1hIi5WWZvB1CqmAQ==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-wasm32-wasi/-/satteri-wasm32-wasi-0.10.5.tgz",
+      "integrity": "sha512-ypz8c/Zmipxp4IoeDa228Gstv6TLzVmNs3yC6wKCoNSOjx1iwpgzu87Y3hTkXFdwChVGU85qeUDuOIarGUZQLw==",
       "cpu": [
         "wasm32"
       ],
@@ -634,7 +613,7 @@
       "dependencies": {
         "@emnapi/core": "1.11.1",
         "@emnapi/runtime": "1.11.1",
-        "@napi-rs/wasm-runtime": "^1.1.6"
+        "@napi-rs/wasm-runtime": "^1.2.3"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -672,9 +651,9 @@
       }
     },
     "node_modules/@bruits/satteri-win32-arm64-msvc": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-win32-arm64-msvc/-/satteri-win32-arm64-msvc-0.9.5.tgz",
-      "integrity": "sha512-SrfE7NEsgZjBvU3c+RR6oQRu0ToXY5uVJEbieXEF0YTctIV2zAVlbaMjWLts074QCgh3a+XHWkR/lWh2VH2LUg==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-win32-arm64-msvc/-/satteri-win32-arm64-msvc-0.10.5.tgz",
+      "integrity": "sha512-siTV88nb0LRqNpkL2gXboqCwVdq95sLtzMHS1/3eONV2gLbB3NAK46wmSMvCO/yquBvI2lvaFIfd8P12ecsxBw==",
       "cpu": [
         "arm64"
       ],
@@ -685,9 +664,9 @@
       ]
     },
     "node_modules/@bruits/satteri-win32-x64-msvc": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@bruits/satteri-win32-x64-msvc/-/satteri-win32-x64-msvc-0.9.5.tgz",
-      "integrity": "sha512-5Kw9ZAtTGS8WHizyn+CJhjjfIQrw+7jcZodpmpXJjefnO15M8UexIi6JR2E5thyvsmHyhL6ZDDMUNR4bKJPd4g==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@bruits/satteri-win32-x64-msvc/-/satteri-win32-x64-msvc-0.10.5.tgz",
+      "integrity": "sha512-C3IfPvfvMXmlzBxaMPKFS1XiuV9pu2mC7YqkPk7PSvTgPZ8gbdASIpHpztDLvTTQjqZ0z1Ol8tK5X+V6XXC0wQ==",
       "cpu": [
         "x64"
       ],
@@ -710,9 +689,9 @@
       }
     },
     "node_modules/@clack/core": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@clack/core/-/core-1.4.3.tgz",
-      "integrity": "sha512-/kr3UWNtdJfxZtPgDqUOmG2pvwlmcLGheex5yiZKdwbzZJxhV+HMNR9QNmyY5cGwTNV6LrR7Jtp+KjhUAP1qBQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@clack/core/-/core-1.5.1.tgz",
+      "integrity": "sha512-iHTrHA8MtVuLl2TfZySmcKv1qO2PoyC9Z7pfSDozEuV5vtY3/wcOPKJXlqJ5Oq2Cx5DDGQGAMVx6HZfRRoVEbQ==",
       "license": "MIT",
       "dependencies": {
         "fast-wrap-ansi": "^0.2.0",
@@ -723,12 +702,12 @@
       }
     },
     "node_modules/@clack/prompts": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-1.7.0.tgz",
-      "integrity": "sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@clack/prompts/-/prompts-1.8.1.tgz",
+      "integrity": "sha512-dlT1m5e/0yUL0kRNcQn7yGLVThkgbB0Ga/1AmfDDC/8ik6AIiSf2QLQO2zPYvefsHP0aFgxO93cVLCCfDp7kzQ==",
       "license": "MIT",
       "dependencies": {
-        "@clack/core": "1.4.3",
+        "@clack/core": "1.5.1",
         "fast-string-width": "^3.0.2",
         "fast-wrap-ansi": "^0.2.0",
         "sisteransi": "^1.0.5"
@@ -812,9 +791,8 @@
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",
       "integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "@emnapi/wasi-threads": "1.2.3",
         "tslib": "^2.4.0"
@@ -824,8 +802,8 @@
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
       "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -834,646 +812,229 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
       "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
-      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@expressive-code/core": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/@expressive-code/core/-/core-0.44.1.tgz",
+      "integrity": "sha512-3dDo9N8D7hYrLNNMMWFovg3+aDUtnQm7c7z0GZc1c0LEFVBc0Q6lKG+tVT28gDadOvsgOANfCn35fgpe97Pmgg==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
+      "dependencies": {
+        "@ctrl/tinycolor": "^4.0.4",
+        "hast-util-select": "^6.0.2",
+        "hast-util-to-html": "^9.0.1",
+        "hast-util-to-text": "^4.0.1",
+        "hastscript": "^9.0.0",
+        "postcss": "^8.4.38",
+        "postcss-nested": "^6.0.1",
+        "unist-util-visit": "^5.0.0",
+        "unist-util-visit-parents": "^6.0.1"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
-      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@expressive-code/plugin-frames": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/@expressive-code/plugin-frames/-/plugin-frames-0.44.1.tgz",
+      "integrity": "sha512-HC/bdRao9225ApcgO/e3jn8ZOhldKO7ob1O/Tcipvtv7Vb5nMphZhMtD9uuywpvxkPYBHJi3504WhrKg05Dwqg==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
+      "dependencies": {
+        "@expressive-code/core": "^0.44.1"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
-      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@expressive-code/plugin-shiki": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/@expressive-code/plugin-shiki/-/plugin-shiki-0.44.1.tgz",
+      "integrity": "sha512-YApiZt3buUzBwL5tqj8G+sYC5NjMjRCHgQwr9bmGl69rtcHy6fE9dooWUeKYB978fJT2BuxT5FeHcF47rA3SEg==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
+      "dependencies": {
+        "@expressive-code/core": "^0.44.1",
+        "shiki": "^4.0.2"
       }
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
-      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@expressive-code/plugin-text-markers": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/@expressive-code/plugin-text-markers/-/plugin-text-markers-0.44.1.tgz",
+      "integrity": "sha512-B3BsJoJ8CFMlcIX9f+X9tcI3C4zPDO601+YuLi9GheSTNro7ZfqSjLptMQKBHOWZvxnAtY5zvIX7iO/qtBhNBg==",
+      "license": "MIT",
+      "dependencies": {
+        "@expressive-code/core": "^0.44.1"
+      }
+    },
+    "node_modules/@img/colour": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
+      "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==",
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
-      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
+    "node_modules/@img/sharp-darwin-arm64": {
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.5.tgz",
+      "integrity": "sha512-QRUlFQ0WxvdWyqqG/WtI3iupfD5rBzmCHXSdPsY91sAtVtTo7Q4cb6zOccZ3gqEqkr0f1As1ehLqmEpDsRf+lg==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": ">=18"
+        "node": ">=20.9.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-arm64": "1.3.4"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
-      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.5.tgz",
+      "integrity": "sha512-+BR255RhDlpygUpOc/Jdt1nT6DQ3XG/ERo5wbcdOf5Q320dKtPCKPLR1LJs9VGXRaMa8l1uUa0tkCNOXiAxZUw==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
+      "license": "Apache-2.0",
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": ">=18"
+        "node": ">=20.9.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.3.4"
+      }
+    },
+    "node_modules/@img/sharp-freebsd-wasm32": {
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.5.tgz",
+      "integrity": "sha512-Y/z91nEZ4uIBX5X3nfTovjU9lHNKFYbL2lpHCLVNmXQK03VIZvXBBt0KxbPGp2SdGSF+2mQU4e+hQaWOt86iAw==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "dependencies": {
+        "@img/sharp-wasm32": "0.35.5"
+      },
+      "engines": {
+        "node": ">=20.9.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
+    "node_modules/@img/sharp-libvips-darwin-arm64": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.4.tgz",
+      "integrity": "sha512-5R89nBYiRdUlSWJxPhO+GVtaXzXSxKnRu/xqMn3KTA3L9EB9Oy/P+Nn2f2vlhPuUdy/Zusb2DarbyTpGCfEDuw==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
-        "freebsd"
+        "darwin"
       ],
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
-      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.4.tgz",
+      "integrity": "sha512-iR2OKH80yi0U+dUplyh3/xdpFvps6YkCwsXenIJxqxR1v9o+xtKTGbS9H7cps+2Vxjc8B1j96p75NmTGjIhtpQ==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
-        "freebsd"
+        "darwin"
       ],
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
-      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
+    "node_modules/@img/sharp-libvips-linux-arm": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.4.tgz",
+      "integrity": "sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
+      "libc": [
+        "glibc"
+      ],
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
-      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.4.tgz",
+      "integrity": "sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
+      "libc": [
+        "glibc"
+      ],
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
-      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
+    "node_modules/@img/sharp-libvips-linux-ppc64": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.4.tgz",
+      "integrity": "sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ==",
       "cpu": [
-        "ia32"
+        "ppc64"
       ],
-      "license": "MIT",
+      "libc": [
+        "glibc"
+      ],
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
       ],
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
-      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
+    "node_modules/@img/sharp-libvips-linux-riscv64": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.4.tgz",
+      "integrity": "sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q==",
       "cpu": [
-        "loong64"
+        "riscv64"
       ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
-      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
-      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
-      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
-      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
-      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
-      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
-      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
-      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
-      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
-      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
-      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
-      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@expressive-code/core": {
-      "version": "0.44.1",
-      "resolved": "https://registry.npmjs.org/@expressive-code/core/-/core-0.44.1.tgz",
-      "integrity": "sha512-3dDo9N8D7hYrLNNMMWFovg3+aDUtnQm7c7z0GZc1c0LEFVBc0Q6lKG+tVT28gDadOvsgOANfCn35fgpe97Pmgg==",
-      "license": "MIT",
-      "dependencies": {
-        "@ctrl/tinycolor": "^4.0.4",
-        "hast-util-select": "^6.0.2",
-        "hast-util-to-html": "^9.0.1",
-        "hast-util-to-text": "^4.0.1",
-        "hastscript": "^9.0.0",
-        "postcss": "^8.4.38",
-        "postcss-nested": "^6.0.1",
-        "unist-util-visit": "^5.0.0",
-        "unist-util-visit-parents": "^6.0.1"
-      }
-    },
-    "node_modules/@expressive-code/plugin-frames": {
-      "version": "0.44.1",
-      "resolved": "https://registry.npmjs.org/@expressive-code/plugin-frames/-/plugin-frames-0.44.1.tgz",
-      "integrity": "sha512-HC/bdRao9225ApcgO/e3jn8ZOhldKO7ob1O/Tcipvtv7Vb5nMphZhMtD9uuywpvxkPYBHJi3504WhrKg05Dwqg==",
-      "license": "MIT",
-      "dependencies": {
-        "@expressive-code/core": "^0.44.1"
-      }
-    },
-    "node_modules/@expressive-code/plugin-shiki": {
-      "version": "0.44.1",
-      "resolved": "https://registry.npmjs.org/@expressive-code/plugin-shiki/-/plugin-shiki-0.44.1.tgz",
-      "integrity": "sha512-YApiZt3buUzBwL5tqj8G+sYC5NjMjRCHgQwr9bmGl69rtcHy6fE9dooWUeKYB978fJT2BuxT5FeHcF47rA3SEg==",
-      "license": "MIT",
-      "dependencies": {
-        "@expressive-code/core": "^0.44.1",
-        "shiki": "^4.0.2"
-      }
-    },
-    "node_modules/@expressive-code/plugin-text-markers": {
-      "version": "0.44.1",
-      "resolved": "https://registry.npmjs.org/@expressive-code/plugin-text-markers/-/plugin-text-markers-0.44.1.tgz",
-      "integrity": "sha512-B3BsJoJ8CFMlcIX9f+X9tcI3C4zPDO601+YuLi9GheSTNro7ZfqSjLptMQKBHOWZvxnAtY5zvIX7iO/qtBhNBg==",
-      "license": "MIT",
-      "dependencies": {
-        "@expressive-code/core": "^0.44.1"
-      }
-    },
-    "node_modules/@img/colour": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
-      "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.3.tgz",
-      "integrity": "sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.3.2"
-      }
-    },
-    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.3.tgz",
-      "integrity": "sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.3.2"
-      }
-    },
-    "node_modules/@img/sharp-freebsd-wasm32": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.3.tgz",
-      "integrity": "sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "dependencies": {
-        "@img/sharp-wasm32": "0.35.3"
-      },
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.2.tgz",
-      "integrity": "sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.2.tgz",
-      "integrity": "sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.2.tgz",
-      "integrity": "sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==",
-      "cpu": [
-        "arm"
-      ],
-      "libc": [
-        "glibc"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.2.tgz",
-      "integrity": "sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==",
-      "cpu": [
-        "arm64"
-      ],
-      "libc": [
-        "glibc"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-ppc64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.2.tgz",
-      "integrity": "sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "libc": [
-        "glibc"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-riscv64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.2.tgz",
-      "integrity": "sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==",
-      "cpu": [
-        "riscv64"
-      ],
-      "libc": [
-        "glibc"
-      ],
-      "license": "LGPL-3.0-or-later",
+      "libc": [
+        "glibc"
+      ],
+      "license": "LGPL-3.0-or-later",
       "optional": true,
       "os": [
         "linux"
@@ -1483,9 +1044,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.2.tgz",
-      "integrity": "sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.4.tgz",
+      "integrity": "sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ==",
       "cpu": [
         "s390x"
       ],
@@ -1502,9 +1063,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.2.tgz",
-      "integrity": "sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.4.tgz",
+      "integrity": "sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw==",
       "cpu": [
         "x64"
       ],
@@ -1521,9 +1082,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.2.tgz",
-      "integrity": "sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.4.tgz",
+      "integrity": "sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA==",
       "cpu": [
         "arm64"
       ],
@@ -1540,9 +1101,9 @@
       }
     },
     "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.2.tgz",
-      "integrity": "sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.4.tgz",
+      "integrity": "sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg==",
       "cpu": [
         "x64"
       ],
@@ -1559,9 +1120,9 @@
       }
     },
     "node_modules/@img/sharp-linux-arm": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.3.tgz",
-      "integrity": "sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.5.tgz",
+      "integrity": "sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ==",
       "cpu": [
         "arm"
       ],
@@ -1580,13 +1141,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.3.2"
+        "@img/sharp-libvips-linux-arm": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.3.tgz",
-      "integrity": "sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.5.tgz",
+      "integrity": "sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ==",
       "cpu": [
         "arm64"
       ],
@@ -1605,13 +1166,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.3.2"
+        "@img/sharp-libvips-linux-arm64": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linux-ppc64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.3.tgz",
-      "integrity": "sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.5.tgz",
+      "integrity": "sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA==",
       "cpu": [
         "ppc64"
       ],
@@ -1630,13 +1191,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-ppc64": "1.3.2"
+        "@img/sharp-libvips-linux-ppc64": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linux-riscv64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.3.tgz",
-      "integrity": "sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.5.tgz",
+      "integrity": "sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ==",
       "cpu": [
         "riscv64"
       ],
@@ -1655,13 +1216,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-riscv64": "1.3.2"
+        "@img/sharp-libvips-linux-riscv64": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.3.tgz",
-      "integrity": "sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.5.tgz",
+      "integrity": "sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA==",
       "cpu": [
         "s390x"
       ],
@@ -1680,13 +1241,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.3.2"
+        "@img/sharp-libvips-linux-s390x": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linux-x64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.3.tgz",
-      "integrity": "sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.5.tgz",
+      "integrity": "sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog==",
       "cpu": [
         "x64"
       ],
@@ -1705,13 +1266,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.3.2"
+        "@img/sharp-libvips-linux-x64": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.3.tgz",
-      "integrity": "sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.5.tgz",
+      "integrity": "sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg==",
       "cpu": [
         "arm64"
       ],
@@ -1730,13 +1291,13 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.3.2"
+        "@img/sharp-libvips-linuxmusl-arm64": "1.3.4"
       }
     },
     "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.3.tgz",
-      "integrity": "sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.5.tgz",
+      "integrity": "sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A==",
       "cpu": [
         "x64"
       ],
@@ -1755,17 +1316,17 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.3.2"
+        "@img/sharp-libvips-linuxmusl-x64": "1.3.4"
       }
     },
     "node_modules/@img/sharp-wasm32": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.3.tgz",
-      "integrity": "sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.5.tgz",
+      "integrity": "sha512-Ptsga1su4tQx+LLF1ECS9U6nz5kmrXKo6XVbtR48Ke3ZRxxgaWBu7IDtEe1quo8hiupwm6WFqxVlXaSf7IINGQ==",
       "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/runtime": "^1.11.1"
+        "@emnapi/runtime": "^1.11.3"
       },
       "engines": {
         "node": ">=20.9.0"
@@ -1775,16 +1336,16 @@
       }
     },
     "node_modules/@img/sharp-webcontainers-wasm32": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.3.tgz",
-      "integrity": "sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.5.tgz",
+      "integrity": "sha512-hfhF/FmoQyTUkA0bIKFOtw536BQSeBMe6BF6QyWlrPxT754+TFLaZ7sKKTfvvM0yJgKgaYTwnFCIZ/GuDw5SUA==",
       "cpu": [
         "wasm32"
       ],
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@img/sharp-wasm32": "0.35.3"
+        "@img/sharp-wasm32": "0.35.5"
       },
       "engines": {
         "node": ">=20.9.0"
@@ -1794,9 +1355,9 @@
       }
     },
     "node_modules/@img/sharp-win32-arm64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.3.tgz",
-      "integrity": "sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.5.tgz",
+      "integrity": "sha512-X4t7g+7ZA5DKblCBEXGjUqqemj4vczING/5viFwAL8h4N3qYeyjwdCvRLHi4EdOUI+2Z7UFlp1VM+p/AuEtm6Q==",
       "cpu": [
         "arm64"
       ],
@@ -1813,9 +1374,9 @@
       }
     },
     "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.3.tgz",
-      "integrity": "sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.5.tgz",
+      "integrity": "sha512-5Zm82LoBc43nhwNybZlG7Y1KO//Zhsn306fQl29ZOuStHLGTo3BWL83q3cznX0poxSAMuYL1On/BHBxkBeKr6A==",
       "cpu": [
         "ia32"
       ],
@@ -1832,9 +1393,9 @@
       }
     },
     "node_modules/@img/sharp-win32-x64": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.3.tgz",
-      "integrity": "sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.5.tgz",
+      "integrity": "sha512-x76eH0vEiHlcMQu8Y8IenntaACtddpT6W0wmXtWrnKcnKI7ME5DdgqhAD6SEWOEl1v2zDvkZDhFA9KnURwpfqg==",
       "cpu": [
         "x64"
       ],
@@ -1851,64 +1412,30 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "license": "MIT"
     },
-    "node_modules/@mdx-js/mdx": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.1.1.tgz",
-      "integrity": "sha512-f6ZO2ifpwAQIpzGWaBQT2TXxPv6z3RBzQKpVftEWN78Vl/YweF1uwussDx8ECAXVtr3Rs89fKyG9YlzUs9DyGQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "@types/estree-jsx": "^1.0.0",
-        "@types/hast": "^3.0.0",
-        "@types/mdx": "^2.0.0",
-        "acorn": "^8.0.0",
-        "collapse-white-space": "^2.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-is-identifier-name": "^3.0.0",
-        "estree-util-scope": "^1.0.0",
-        "estree-walker": "^3.0.0",
-        "hast-util-to-jsx-runtime": "^2.0.0",
-        "markdown-extensions": "^2.0.0",
-        "recma-build-jsx": "^1.0.0",
-        "recma-jsx": "^1.0.0",
-        "recma-stringify": "^1.0.0",
-        "rehype-recma": "^1.0.0",
-        "remark-mdx": "^3.0.0",
-        "remark-parse": "^11.0.0",
-        "remark-rehype": "^11.0.0",
-        "source-map": "^0.7.0",
-        "unified": "^11.0.0",
-        "unist-util-position-from-estree": "^2.0.0",
-        "unist-util-stringify-position": "^4.0.0",
-        "unist-util-visit": "^5.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
-      "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.4.tgz",
+      "integrity": "sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g==",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "@tybys/wasm-util": "^0.10.3"
       },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
+      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/Brooooooklyn"
       },
       "peerDependencies": {
-        "@emnapi/core": "^1.7.1",
-        "@emnapi/runtime": "^1.7.1"
+        "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
+        "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
       }
     },
     "node_modules/@oslojs/encoding": {
@@ -1918,12 +1445,12 @@
       "license": "MIT"
     },
     "node_modules/@oxc-project/types": {
-      "version": "0.139.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.139.0.tgz",
-      "integrity": "sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==",
+      "version": "0.155.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.155.0.tgz",
+      "integrity": "sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==",
       "license": "MIT",
       "funding": {
-        "url": "https://github.com/sponsors/Boshen"
+        "url": "https://github.com/sponsors/oxc-project"
       }
     },
     "node_modules/@pagefind/darwin-arm64": {
@@ -2023,10 +1550,26 @@
         "win32"
       ]
     },
+    "node_modules/@rolldown/binding-android-arm-eabi": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.15.tgz",
+      "integrity": "sha512-aLcgK9gIJ3YRvrrtfSBbRa27F5WrpiTaPulnFpsHPxpUHgFlSgnU4854MHwoRGEBhfRJDWCS2WQ7lIjskE9Olw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.5.tgz",
-      "integrity": "sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.15.tgz",
+      "integrity": "sha512-xD7DdZCrbThKuxNg7ooQmvp07ys4J/pnSEMTG3/OdOWl6daC67m/Q4fL78sRHMxTH/N4fGUbYhcPM0MF5WFHkg==",
       "cpu": [
         "arm64"
       ],
@@ -2040,9 +1583,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.5.tgz",
-      "integrity": "sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.15.tgz",
+      "integrity": "sha512-m2WuQ6r0B4OTYxyPpNLtXaMRbRDUbG8YQV2Q3KTdSSK8Th6KHCnC8jVCJt8bvYeSB5WivkkNbc85mKadaSdOxA==",
       "cpu": [
         "arm64"
       ],
@@ -2056,9 +1599,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.5.tgz",
-      "integrity": "sha512-Tm+gbfC0aHu1tBA/JvKQh32S0K6YgCHkiAF4/W6xX0K0RmNuc94VeK419dJoE65R5aRxmo+noZQSWrAMF6yb6g==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.15.tgz",
+      "integrity": "sha512-5RtnsHM36nodM9WbMy+zip0LGS/G+y5wro5RHrpOlr4ac24+1zSi9kiV2MP1myZeZ/ifEHfulQcWjnAXzc2C2A==",
       "cpu": [
         "x64"
       ],
@@ -2072,9 +1615,9 @@
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.5.tgz",
-      "integrity": "sha512-JMzDKCCXq93YccG5gz3hvOs1oXRKAf0XYpfOS88e+wZrC8Iugj6j68867vrYZkvpDDpKn/KoKORThmchMpF6TA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.15.tgz",
+      "integrity": "sha512-g3l09pyFqhu+135JKkbkwiKGQmwU5hUMUPJ4VdBADvuqR8d33L6H578rh8m7rtxbdp+VmX/+nzI7nvhSZlzpUQ==",
       "cpu": [
         "x64"
       ],
@@ -2088,9 +1631,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.5.tgz",
-      "integrity": "sha512-uML21j2K5TfPGutKxub+M+nLjZIrWjXQ5Grx4lCe/nimTj9B4L63zHpjXLl4y0L3mcm2htEQIb06oCG/szerNw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.15.tgz",
+      "integrity": "sha512-nIe3VugI97nGQtspPxDqA4sXMUpeiocKIP/CqpY/u/vgbT+alX+cVxu1C/oVBPKg4feNTmYovE91v4DgXvXNwQ==",
       "cpu": [
         "arm"
       ],
@@ -2104,9 +1647,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.5.tgz",
-      "integrity": "sha512-navSiuTMogvnQoZoM/v+l3ZWo50/NTwSHSzheABx/RCnmUPaKwq9qSo4Br2OYRs21+Fz8uFqITZM3H4opOB0/Q==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.15.tgz",
+      "integrity": "sha512-iTBjXx+B5QSvgI89lJfmqh4wTh8NabR1YZIIN3hNx4zSG0EVfVqkOvLulNpG4251pbd6/IAmZ/LefVk1Y4rPhw==",
       "cpu": [
         "arm64"
       ],
@@ -2123,9 +1666,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.5.tgz",
-      "integrity": "sha512-lAryqH7IteztmCXQXk0etKj4wBQ7Gx5S6LjKhsgp9zb8I5bsuvU/2llH1hDQcjsFeqIsovMVN339/8pUDDBXxA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.15.tgz",
+      "integrity": "sha512-uN26XOnVR7rqQupG3V9oAG2EGGatWjcJHOeDOHUFCh4TBWmP2tHTFoVN13aYbwfm0aHqJAEmcwhAu6sooIjfqQ==",
       "cpu": [
         "arm64"
       ],
@@ -2142,9 +1685,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.5.tgz",
-      "integrity": "sha512-fsK/sNBnxzBlL4O1JNrZakVQxPspqpED5dLtNsZS9oOKmtSpdNIzxH2kkol5HYTWJN47sE20ztMJPxfZ89qGOg==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.15.tgz",
+      "integrity": "sha512-9nWkcdd+H+XhaA3fQIwpHnKIrfx/PQ6rO0pivr78Og07tXlUlctBBJoEYLPfhTmCR/QxEVdn6uPjHV5SymPhdw==",
       "cpu": [
         "ppc64"
       ],
@@ -2161,9 +1704,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.5.tgz",
-      "integrity": "sha512-gLYb4BIadlfTOYT5gO503n8zQjXflgzpD0FcyKh0Mzx3rqCZKnHoJWV9xe1KXUJ5lx2JfcSHr/mhzS0PC/McAA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.15.tgz",
+      "integrity": "sha512-Ggh0ciFjLwIusLSLz7LZYEaGdxOAUJXI+Qu5JCbhPJJHEt8vP+IjRATTJheiJsdzzTYgUiHUiw3X1Ea3ZpMBdA==",
       "cpu": [
         "s390x"
       ],
@@ -2180,9 +1723,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.5.tgz",
-      "integrity": "sha512-FjcpEKUyJygHgs1o50VYNvkt5+7Le/VEdYt0AkRpkL33MnyQfwr8l5mXwMmfmTbyMPr5vJLC+8/Gd9gXnwU1QQ==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.15.tgz",
+      "integrity": "sha512-FHg60rS6DBePAYZ9X9F67x+JObFdmgn6tupA1C/a3B+CufFmTD4mX+e8M75tCiAO3foR/6xwVBI0KQiI7sn/rw==",
       "cpu": [
         "x64"
       ],
@@ -2199,9 +1742,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.5.tgz",
-      "integrity": "sha512-Me+PfPI2TMeOQk0gYWfLQZtTktrmzbr8cDboqX83XKc7UrgAi55gF+2dUkWdxd19n55Essp2yeca+O9N5rBxHg==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.15.tgz",
+      "integrity": "sha512-/cvV/7v5VGz/moiz0XKRj2dE8DzsKyhIu1KpOvJGPjRywg3yscON889UGvAe8zfiJLHup7VLjBduoGWi3HusWQ==",
       "cpu": [
         "x64"
       ],
@@ -2218,9 +1761,9 @@
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.5.tgz",
-      "integrity": "sha512-yc5WrLzXks6zCQfn9Oxr8pORKyl/pF+QjHmW/Qx3qu0oyrrNC+y2JLTU1E2rcWYAmzlnqngWXHQjy51VzW70Vw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.15.tgz",
+      "integrity": "sha512-MyzC5Hrv/sm+Z7TSGKP/j8001RO2xQm1zOpCNVL4j0cY/VhBZviludA2YFQ7i4lH6ZAXxQm0lcMdBzM+99mE7w==",
       "cpu": [
         "arm64"
       ],
@@ -2233,59 +1776,10 @@
         "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.5.tgz",
-      "integrity": "sha512-VbQGPX2b4r48TAMIM2cjgluIM1HYutm4pcTEJsle7iEP7sB1dFqtPLBVbdLAZCxy1txCcPxf4QFf4v8uvltPqA==",
-      "cpu": [
-        "wasm32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "1.11.1",
-        "@emnapi/runtime": "1.11.1",
-        "@napi-rs/wasm-runtime": "^1.1.6"
-      },
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
-    },
-    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.2",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
-      "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
-      "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.5.tgz",
-      "integrity": "sha512-gHv82k63z4qpV5+Q1y/12KrK0ltWBukVDI8nZcbT7Tt/ZlOIVwppazneq0F93oDxTo3IgAMEDIoQh3E2n6mVsw==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.15.tgz",
+      "integrity": "sha512-+PgYiS+AH5omy6L45ZLxybasauJaj3M8buoT83D+nzPmCayXlxUV9hydhciCKVyIg0B/v0BtXPDE1uGqNwCPpg==",
       "cpu": [
         "arm64"
       ],
@@ -2299,9 +1793,9 @@
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.5.tgz",
-      "integrity": "sha512-tTZuDBPw85tEN5PQi1pnEBzDy0Z49HtScLAbD5t6hyeU92A95pRWaSMw1GZZi/RwgSgUIl0xrSlXIT/9QzvYSA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.15.tgz",
+      "integrity": "sha512-HFZd2QNQYn1JbIi+Hpd7H+r/lkWxcfIu28nirZ6eCn2LafuvmExMlb/P96Sfx5tf7pPArw39IdhmCF8vmV+NhQ==",
       "cpu": [
         "x64"
       ],
@@ -2320,44 +1814,16 @@
       "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "license": "MIT"
     },
-    "node_modules/@rollup/pluginutils": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz",
-      "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-walker": "^2.0.2",
-        "picomatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@rollup/pluginutils/node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "license": "MIT"
-    },
     "node_modules/@shikijs/core": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.3.1.tgz",
-      "integrity": "sha512-ANMDxuaPsNMdDC1m4vfvhlDmJweMwkE5XitTwrq2rWHx5jM+dlm4MmHt2PP6t0uejfR77SuhrhJ0zEijIF/uhA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-4.5.0.tgz",
+      "integrity": "sha512-6CIgwq+bt2JZ3OSjb/nBkkwEf/CfpHcbam+Mg5Pllco7HAGRQ2/EFhZrrJtbyNTgKwknfVS+llsXGygiDGwJWw==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/primitive": "4.3.1",
-        "@shikijs/types": "4.3.1",
+        "@shikijs/primitive": "4.5.0",
+        "@shikijs/types": "4.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4",
+        "@types/hast": "^3.0.5",
         "hast-util-to-html": "^9.0.5"
       },
       "engines": {
@@ -2365,12 +1831,12 @@
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.3.1.tgz",
-      "integrity": "sha512-JBItcnPuYq7jVJdZo/vMj94r+szT7XEjHFX+mvFDGSEIbVAXAGyHAHzhbWzpGOwYidCZrErJLLgn2PVeiokHnQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-4.5.0.tgz",
+      "integrity": "sha512-Ed6UdEj84LyYkwnxM5CvSMWAD+id9ExTYri0/+x41U9zrgNifPSS9lZm0JqBP0VfYI8yr8tY5nbNq9+p9R0kFA==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "oniguruma-to-es": "^4.3.6"
       },
@@ -2379,12 +1845,12 @@
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.3.1.tgz",
-      "integrity": "sha512-OXyNMzg0pews+msMj4cHeqT4xiYKKvbnn6VbdAXxfoFl3SSx4fJTc8FadECuc5/H9p3BzhNAoAUXKwAu9rWYhg==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-4.5.0.tgz",
+      "integrity": "sha512-dKVmbJecVdB9recl8a/CU4jdpNXyjJQrIcesIkpS70s5HS02ohpnCSpMUbotPnEUzbAcLQ+S4hwZYbkBBiTcJw==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.5.0",
         "@shikijs/vscode-textmate": "^10.0.2"
       },
       "engines": {
@@ -2392,68 +1858,68 @@
       }
     },
     "node_modules/@shikijs/langs": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.3.1.tgz",
-      "integrity": "sha512-m0l9nsDqgBHvbZbk7A0/kXz/impK3uB/c6rAn6Gpg/uPtdZRQ+alsN/17MU5thb68XTj/4DxkZAotrM0GGSpDQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-4.5.0.tgz",
+      "integrity": "sha512-wwBTqwduXSz0X4v9Qa2EWeFaYJEw1clCncWjoRNQRbVDu3SPRTRWucnouYapKj3b8Q+sk/41Vbc4B5c8nuYzLA==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1"
+        "@shikijs/types": "4.5.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/primitive": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.3.1.tgz",
-      "integrity": "sha512-CXQRQOYy1leqQ8ceTeJdmXv/bsUY++6QyLpXJ94LZAAYj5X2SKRdc5ipguv4NPyGVKItB2PPwUpRNe0Sjh5S1A==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/primitive/-/primitive-4.5.0.tgz",
+      "integrity": "sha512-UM7ShlA8oz0OWxLLO8BmO9Ip6fVqdkt8yF0EH7nOCqHfrx1eEAzF0ZUVK7L+I8NEgeu1PEWSRlxaiPPeCb4iDg==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1",
+        "@shikijs/types": "4.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4"
+        "@types/hast": "^3.0.5"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/themes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.3.1.tgz",
-      "integrity": "sha512-dgpoJ4WqNi2yTmizQHBJ5zcX6j2lE6icN/0yt4l1kkf16jrY/pwPLoTb1ETsWMz0OBLf9ZNvwmxft+cH+N9qSA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-4.5.0.tgz",
+      "integrity": "sha512-zGb87H3UBbpuI4yoh5UguB1XbU+2BDU3kflM7UfZ+Cy2hWo9lBtqjSVK20gmLY6ukYl040hAypGXMgud9vul8Q==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/types": "4.3.1"
+        "@shikijs/types": "4.5.0"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.3.1.tgz",
-      "integrity": "sha512-CHFxE0jztBIZRHH6gxXE7DXUCFXjReEGxZ/j0rfSLGKZuwp2xBYycEP14875DSa9KLL/6700oxIq6oO6ef9K2g==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-4.5.0.tgz",
+      "integrity": "sha512-drtPrtD8N0DENyD2cyt6Ajy+IWsiCLgMxODwLTpvH1UsN6a9jf90tNTPjqwHvA+0Lzu9e0txk8DjfqH1p9UJRw==",
       "license": "MIT",
       "dependencies": {
         "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4"
+        "@types/hast": "^3.0.5"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/@shikijs/vscode-textmate": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
-      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.1.0.tgz",
+      "integrity": "sha512-cVBuhDQjBZaNMTwBquYfPydrUP+E3hE6oYGasx8h6ZrODIM7/r+gxLDXdd66oszbrggZHEntdE6j+5gYIVyMWQ==",
       "license": "MIT"
     },
     "node_modules/@tybys/wasm-util": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
       "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
+      "devOptional": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -2506,12 +1972,6 @@
         "@types/unist": "*"
       }
     },
-    "node_modules/@types/mdx": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.14.tgz",
-      "integrity": "sha512-T48PeuJtvLosNTPVhfnIp3i/n3a4g4Bad7YCq5k64D4u7NwDrAotikQ+5+sjtUvBmxCMlbo3dVL+C2dP0rWHzg==",
-      "license": "MIT"
-    },
     "node_modules/@types/ms": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
@@ -2558,80 +2018,105 @@
       "license": "ISC"
     },
     "node_modules/@volar/kit": {
-      "version": "2.4.28",
-      "resolved": "https://registry.npmjs.org/@volar/kit/-/kit-2.4.28.tgz",
-      "integrity": "sha512-cKX4vK9dtZvDRaAzeoUdaAJEew6IdxHNCRrdp5Kvcl6zZOqb6jTOfk3kXkIkG3T7oTFXguEMt5+9ptyqYR84Pg==",
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@volar/kit/-/kit-2.4.30.tgz",
+      "integrity": "sha512-VocLtumfXnqnPQEWc9Yx7uC1uOh9gyjVNlrn2+6Zx/z9aM6yTLhPK8lSqM9Ilu81XRa48I00lcYJWLi2BLxx8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-service": "2.4.28",
-        "@volar/typescript": "2.4.28",
+        "@volar/language-service": "2.4.30",
+        "@volar/typescript": "2.4.30",
         "typesafe-path": "^0.2.2",
         "vscode-languageserver-textdocument": "^1.0.11",
         "vscode-uri": "^3.0.8"
       },
       "peerDependencies": {
-        "typescript": "*"
+        "typescript": "<7"
       }
     },
     "node_modules/@volar/language-core": {
-      "version": "2.4.28",
-      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.28.tgz",
-      "integrity": "sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==",
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.30.tgz",
+      "integrity": "sha512-73fjwEV8wat6aOZ6U/y/hqtE30ocrIWECg67b0txGczOMNw+MffLmvJ5fnFfN9drVUEYZzLdaNo6VAy6G6avMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/source-map": "2.4.28"
+        "@volar/source-map": "2.4.30"
       }
     },
     "node_modules/@volar/language-server": {
-      "version": "2.4.28",
-      "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.28.tgz",
-      "integrity": "sha512-NqcLnE5gERKuS4PUFwlhMxf6vqYo7hXtbMFbViXcbVkbZ905AIVWhnSo0ZNBC2V127H1/2zP7RvVOVnyITFfBw==",
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.30.tgz",
+      "integrity": "sha512-tcP9fzzUBbsLIFHhgnRU4ncQjMn9G9Vax0ffkQmdCrXVEYqRroUepmyC5AVgiju5bCiLD6a55qen5iOTQHkb3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.28",
-        "@volar/language-service": "2.4.28",
-        "@volar/typescript": "2.4.28",
+        "@volar/language-core": "2.4.30",
+        "@volar/language-service": "2.4.30",
+        "@volar/typescript": "2.4.30",
         "path-browserify": "^1.0.1",
         "request-light": "^0.7.0",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-protocol": "^3.17.5",
         "vscode-languageserver-textdocument": "^1.0.11",
         "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "typescript": "<7"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/@volar/language-service": {
-      "version": "2.4.28",
-      "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.28.tgz",
-      "integrity": "sha512-Rh/wYCZJrI5vCwMk9xyw/Z+MsWxlJY1rmMZPsxUoJKfzIRjS/NF1NmnuEcrMbEVGja00aVpCsInJfixQTMdvLw==",
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.30.tgz",
+      "integrity": "sha512-w/xDsASiqC71ggCOm7sTDXDNk/l72XEptodeRC68tgZ0e5QM4hM3zAqBGC7mBctvhrpYwKfMG+t9xcUo2hEFtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.28",
+        "@volar/language-core": "2.4.30",
         "vscode-languageserver-protocol": "^3.17.5",
         "vscode-languageserver-textdocument": "^1.0.11",
         "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "typescript": "<7"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/@volar/source-map": {
-      "version": "2.4.28",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.28.tgz",
-      "integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==",
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.30.tgz",
+      "integrity": "sha512-zym1ob/KwDDyN+0jGVtxwbxJSRRnUvv5HspCtz3yEfVVdCG4/dzxJktMGPAgemqRuVs81O0o/y0q3qOUErR8kg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@volar/typescript": {
-      "version": "2.4.28",
-      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.28.tgz",
-      "integrity": "sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==",
+      "version": "2.4.30",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.30.tgz",
+      "integrity": "sha512-/DgA5tgYFPfrLFuSjIMXMGHk1LQv2+P8eny6+BhGNzFJELWIW7UZlc56ZLIRFhLsPpMfIFxM8/HvOPBggrjTZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@volar/language-core": "2.4.28",
+        "@volar/language-core": "2.4.30",
+        "@volar/language-service": "2.4.30",
         "path-browserify": "^1.0.1",
         "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "typescript": "<7"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/@vscode/emmet-helper": {
@@ -2662,27 +2147,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/acorn": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
-      "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
@@ -2726,9 +2190,9 @@
       }
     },
     "node_modules/am-i-vibing": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/am-i-vibing/-/am-i-vibing-0.4.0.tgz",
-      "integrity": "sha512-MxT4XZL7pzLHpuvhDKdMaQHMGGkJDLluKBLsbstn+8wv9sWcFT6h+0ve9qkml95amVTZtZV83gQe2hY+ojgHLg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/am-i-vibing/-/am-i-vibing-0.5.0.tgz",
+      "integrity": "sha512-KLcsDhqf1XRrJmJr+9I/C0EX2K+sGrAGZFgkmd84c8TJO9zJBu+/kFInjazu1KfJWFhWDKdRWkpBzEs7s35DVA==",
       "license": "MIT",
       "dependencies": {
         "process-ancestry": "^0.1.0"
@@ -2738,26 +2202,26 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.4.0.tgz",
+      "integrity": "sha512-KzTVk2tCWAHtYrvvvaP8bJKJq2pVinhLcGEQdtLIYPbmNGNyYe8QwNaTUYQp2J7/vIsUKt5QCqAfUkYyG9DkOw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -2809,90 +2273,70 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/array-iterate": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-2.0.1.tgz",
-      "integrity": "sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/astring": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz",
-      "integrity": "sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==",
-      "license": "MIT",
-      "bin": {
-        "astring": "bin/astring"
-      }
-    },
     "node_modules/astro": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/astro/-/astro-7.1.3.tgz",
-      "integrity": "sha512-4dhPyAAXthf3xLEYnG8SeL7yr/nTPPABfY7e9YF0yuO+vK9Xp+8Q5j4xzsmL3GueukQv4oNwGNTBepLOiDGeJA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/astro/-/astro-7.4.2.tgz",
+      "integrity": "sha512-FAH4cdDlFaVnQGjazLTEIC5vJqGlo5XANc1wIbzQHIqAjJTll/RWTUs+SPNW1JdezG4YGxMZllaE5A41T2kzhA==",
       "license": "MIT",
       "dependencies": {
-        "@astrojs/compiler-rs": "^0.3.1",
-        "@astrojs/internal-helpers": "0.10.1",
-        "@astrojs/markdown-satteri": "0.3.4",
-        "@astrojs/telemetry": "3.3.3",
-        "@capsizecss/unpack": "^4.0.0",
-        "@clack/prompts": "^1.1.0",
+        "@astrojs/compiler-rs": "^0.5.1",
+        "@astrojs/internal-helpers": "0.13.0",
+        "@astrojs/markdown-satteri": "0.4.5",
+        "@astrojs/telemetry": "3.4.1",
+        "@capsizecss/unpack": "^4.0.1",
+        "@clack/prompts": "^1.8.1",
         "@oslojs/encoding": "^1.1.0",
-        "@rollup/pluginutils": "^5.3.0",
-        "am-i-vibing": "^0.4.0",
+        "am-i-vibing": "^0.5.0",
         "aria-query": "^5.3.2",
         "axobject-query": "^4.1.0",
         "ci-info": "^4.4.0",
         "clsx": "^2.1.1",
         "common-ancestor-path": "^2.0.0",
         "cookie": "^2.0.1",
-        "devalue": "^5.8.1",
-        "diff": "^8.0.3",
+        "devalue": "^6.0.2",
+        "diff": "^9.0.0",
         "dset": "^3.1.4",
-        "es-module-lexer": "^2.0.0",
-        "esbuild": "^0.28.0",
+        "es-module-lexer": "^3.0.3",
         "flattie": "^1.1.1",
         "fontace": "~0.4.1",
-        "get-tsconfig": "5.0.0-beta.4",
+        "get-tsconfig": "5.0.0-beta.6",
         "github-slugger": "^2.0.0",
         "html-escaper": "3.0.3",
-        "http-cache-semantics": "^4.2.0",
-        "js-yaml": "^4.1.1",
+        "http-cache-semantics": "^4.3.0",
         "jsonc-parser": "^3.3.1",
-        "magic-string": "^0.30.21",
-        "magicast": "^0.5.2",
+        "magic-string": "^1.4.3",
+        "magicast": "^0.5.5",
         "mrmime": "^2.0.1",
         "neotraverse": "^1.0.1",
-        "obug": "^2.1.1",
-        "p-limit": "^7.3.0",
-        "p-queue": "^9.1.0",
-        "package-manager-detector": "^1.6.0",
+        "obug": "^3.0.0",
+        "p-limit": "^7.3.3",
+        "p-queue": "^9.3.5",
+        "package-manager-detector": "^1.9.0",
         "piccolore": "^0.1.3",
-        "picomatch": "^4.0.4",
-        "semver": "^7.7.4",
-        "shiki": "^4.0.2",
-        "smol-toml": "^1.6.0",
-        "svgo": "^4.0.1",
-        "tinyclip": "^0.1.12",
-        "tinyexec": "^1.0.4",
-        "tinyglobby": "^0.2.15",
-        "ultrahtml": "^1.6.0",
-        "unifont": "~0.7.4",
+        "picomatch": "^4.0.7",
+        "rolldown": "^1.2.13",
+        "shiki": "^4.5.0",
+        "smol-toml": "^1.9.1",
+        "svgo": "^4.1.0",
+        "tinyclip": "^1.0.3",
+        "tinyexec": "^1.3.1",
+        "tinyglobby": "^0.2.17",
+        "tinyps": "^0.5.0",
+        "ultrahtml": "^1.7.0",
+        "unifont": "^1.0.3",
         "unstorage": "^1.17.5",
-        "vite": "^8.0.13",
-        "vitefu": "^1.1.2",
+        "verkit": "^0.5.0",
+        "vite": "^8.3.4",
+        "vitefu": "^1.1.3",
         "xxhash-wasm": "^1.1.0",
         "yargs-parser": "^22.0.0",
-        "zod": "^4.3.6"
+        "zod": "^4.6.6"
       },
       "bin": {
         "astro": "bin/astro.mjs"
       },
       "engines": {
-        "node": ">=22.12.0",
+        "node": ">=22.23.4",
         "npm": ">=9.6.5",
         "pnpm": ">=7.1.0"
       },
@@ -2901,10 +2345,10 @@
         "url": "https://opencollective.com/astrodotbuild"
       },
       "optionalDependencies": {
-        "sharp": "^0.34.0 || ^0.35.0"
+        "sharp": "^0.35.4"
       },
       "peerDependencies": {
-        "@astrojs/markdown-remark": "7.2.1"
+        "@astrojs/markdown-remark": "^7.3.0"
       },
       "peerDependenciesMeta": {
         "@astrojs/markdown-remark": {
@@ -3056,59 +2500,47 @@
       }
     },
     "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz",
+      "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "string-width": "^7.2.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=20"
       }
     },
-    "node_modules/clsx": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
-      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/collapse-white-space": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz",
-      "integrity": "sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==",
-      "license": "MIT",
+        "node": ">=18"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
       "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/comma-separated-tokens": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
@@ -3166,16 +2598,16 @@
       }
     },
     "node_modules/css-select": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
-      "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-6.0.0.tgz",
+      "integrity": "sha512-rZZVSLle8v0+EY8QAkDWrKhpgt6SA5OtHsgBnsj6ZaLb5dmDVOWUDtQitd9ydxxvEjhewNudS6eTVU7uOyzvXw==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
+        "css-what": "^7.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.2.2",
+        "nth-check": "^2.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/fb55"
@@ -3211,9 +2643,9 @@
       }
     },
     "node_modules/css-what": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
-      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-7.0.0.tgz",
+      "integrity": "sha512-wD5oz5xibMOPHzy13CyGmogB3phdvcDaB5t0W/Nr5Z2O/agcB8YwOz6e2Lsp10pNDzBoDO9nVa3RGs/2BttpHQ==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
@@ -3328,10 +2760,13 @@
       }
     },
     "node_modules/devalue": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.8.2.tgz",
-      "integrity": "sha512-DObPPAfdtFbXjxLqK8s2Xk9ZuWz5+ZoFEhC7J76es4GU/rEiXwHTmbImoCdyoCOcBH1UF3+Cz6Z2sYD4hyl5TA==",
-      "license": "MIT"
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/devalue/-/devalue-6.0.3.tgz",
+      "integrity": "sha512-3woMEITftG1wKeO/4d/QXH1DVKctTSZg3jNGPpjp9hNr5Hos8MCFF5McTML5ZtgKDObm2R591B0spRp2IVernA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/devlop": {
       "version": "1.1.0",
@@ -3347,9 +2782,9 @@
       }
     },
     "node_modules/diff": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.4.tgz",
-      "integrity": "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-9.0.0.tgz",
+      "integrity": "sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
@@ -3382,18 +2817,6 @@
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/domelementtype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
@@ -3462,16 +2885,16 @@
       }
     },
     "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/entities": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -3481,84 +2904,11 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.1.tgz",
-      "integrity": "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-3.0.4.tgz",
+      "integrity": "sha512-BldNY5mwkVu+cQ5Ymn3e6hB9Sx8XHx4ZevWbiUyZbfKxJxYO27Hf0wfzkxIaD5CAJMaGl3YspKELj0ff/7nCMA==",
       "license": "MIT"
     },
-    "node_modules/esast-util-from-estree": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/esast-util-from-estree/-/esast-util-from-estree-2.0.0.tgz",
-      "integrity": "sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-visit": "^2.0.0",
-        "unist-util-position-from-estree": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/esast-util-from-js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/esast-util-from-js/-/esast-util-from-js-2.0.1.tgz",
-      "integrity": "sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "acorn": "^8.0.0",
-        "esast-util-from-estree": "^2.0.0",
-        "vfile-message": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
-      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.28.1",
-        "@esbuild/android-arm": "0.28.1",
-        "@esbuild/android-arm64": "0.28.1",
-        "@esbuild/android-x64": "0.28.1",
-        "@esbuild/darwin-arm64": "0.28.1",
-        "@esbuild/darwin-x64": "0.28.1",
-        "@esbuild/freebsd-arm64": "0.28.1",
-        "@esbuild/freebsd-x64": "0.28.1",
-        "@esbuild/linux-arm": "0.28.1",
-        "@esbuild/linux-arm64": "0.28.1",
-        "@esbuild/linux-ia32": "0.28.1",
-        "@esbuild/linux-loong64": "0.28.1",
-        "@esbuild/linux-mips64el": "0.28.1",
-        "@esbuild/linux-ppc64": "0.28.1",
-        "@esbuild/linux-riscv64": "0.28.1",
-        "@esbuild/linux-s390x": "0.28.1",
-        "@esbuild/linux-x64": "0.28.1",
-        "@esbuild/netbsd-arm64": "0.28.1",
-        "@esbuild/netbsd-x64": "0.28.1",
-        "@esbuild/openbsd-arm64": "0.28.1",
-        "@esbuild/openbsd-x64": "0.28.1",
-        "@esbuild/openharmony-arm64": "0.28.1",
-        "@esbuild/sunos-x64": "0.28.1",
-        "@esbuild/win32-arm64": "0.28.1",
-        "@esbuild/win32-ia32": "0.28.1",
-        "@esbuild/win32-x64": "0.28.1"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -3569,109 +2919,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/estree-util-attach-comments": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-3.0.0.tgz",
-      "integrity": "sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/estree-util-build-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/estree-util-build-jsx/-/estree-util-build-jsx-3.0.1.tgz",
-      "integrity": "sha512-8U5eiL6BTrPxp/CHbs2yMgP8ftMhR5ww1eIKoWRMlqvltHF8fZn5LRDvTKuxD3DUn+shRbLGqXemcP51oFCsGQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-is-identifier-name": "^3.0.0",
-        "estree-walker": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/estree-util-is-identifier-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz",
-      "integrity": "sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/estree-util-scope": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/estree-util-scope/-/estree-util-scope-1.0.0.tgz",
-      "integrity": "sha512-2CAASclonf+JFWBNJPndcOpA8EMJwa0Q8LUFJEKqXLW6+qBvbFZuF5gItbQOs/umBUkjviCSDCbBwU2cXbmrhQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "devlop": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/estree-util-to-js": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/estree-util-to-js/-/estree-util-to-js-2.0.0.tgz",
-      "integrity": "sha512-WDF+xj5rRWmD5tj6bIqRi6CkLIXbbNQUcxQHzGysQzvHmdYG2G7p/Tf0J0gpxGgkeMZNTIjT/AoSvC9Xehcgdg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "astring": "^1.8.0",
-        "source-map": "^0.7.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/estree-util-visit": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-2.0.0.tgz",
-      "integrity": "sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "@types/unist": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/estree-walker": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0"
-      }
-    },
     "node_modules/eventemitter3": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
@@ -3719,9 +2966,9 @@
       }
     },
     "node_modules/fast-uri": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz",
-      "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.9.tgz",
+      "integrity": "sha512-hS/0Wt3Ya043oKXs0sIxrMpKQITXhMLIrVAKKXi4gozGC9v7YRWVnXIZzjNPTO02M9BdxLCWqK1yRXgNziVyJQ==",
       "dev": true,
       "funding": [
         {
@@ -3770,6 +3017,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/fnv1a-64": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/fnv1a-64/-/fnv1a-64-0.1.2.tgz",
+      "integrity": "sha512-mJbcILTPybAR1jdOwt/lVv8N2cffeJFFP+gVbSAwLEx1ujXH27RpPd8Rokec/KX9c76UYIB6Co+H4lQzxPnJfA==",
+      "license": "MIT"
+    },
     "node_modules/fontace": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/fontace/-/fontace-0.4.1.tgz",
@@ -3815,10 +3068,23 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.7.0.tgz",
+      "integrity": "sha512-XjH1AECxf0giL2V1aU8vKyRR2ppRUb5c0EvT7zuJTokQ74bNo52zOtghqdWIqrhUD79fo3x0WfKZdOqxF6LG1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-tsconfig": {
-      "version": "5.0.0-beta.4",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-5.0.0-beta.4.tgz",
-      "integrity": "sha512-7nF7C9fIPFEMHgEMEfgIlO9wDdZ8CyHw27rWciFZfHvHDReIiPhsYuzPRXsfvBCqFy1l8RRyyWV7QLM+ZhUJsQ==",
+      "version": "5.0.0-beta.6",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-5.0.0-beta.6.tgz",
+      "integrity": "sha512-X6fBC0pmImC70gvX2zm56go9hx0MyoGVdG0tUCkg/D+Xnh5TJsOZ7iDbOdI3PvmtrDxnu1YdDufpK2QJX1Meqw==",
       "license": "MIT",
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
@@ -3886,44 +3152,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-from-html": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-from-html/-/hast-util-from-html-2.0.3.tgz",
-      "integrity": "sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "devlop": "^1.1.0",
-        "hast-util-from-parse5": "^8.0.0",
-        "parse5": "^7.0.0",
-        "vfile": "^6.0.0",
-        "vfile-message": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hast-util-from-parse5": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.3.tgz",
-      "integrity": "sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "@types/unist": "^3.0.0",
-        "devlop": "^1.0.0",
-        "hastscript": "^9.0.0",
-        "property-information": "^7.0.0",
-        "vfile": "^6.0.0",
-        "vfile-location": "^5.0.0",
-        "web-namespaces": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/hast-util-has-property": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-3.0.0.tgz",
@@ -4010,31 +3238,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-raw": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.1.0.tgz",
-      "integrity": "sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "@types/unist": "^3.0.0",
-        "@ungap/structured-clone": "^1.0.0",
-        "hast-util-from-parse5": "^8.0.0",
-        "hast-util-to-parse5": "^8.0.0",
-        "html-void-elements": "^3.0.0",
-        "mdast-util-to-hast": "^13.0.0",
-        "parse5": "^7.0.0",
-        "unist-util-position": "^5.0.0",
-        "unist-util-visit": "^5.0.0",
-        "vfile": "^6.0.0",
-        "web-namespaces": "^2.0.0",
-        "zwitch": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/hast-util-select": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/hast-util-select/-/hast-util-select-6.0.4.tgz",
@@ -4062,34 +3265,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-to-estree": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-3.1.3.tgz",
-      "integrity": "sha512-48+B/rJWAp0jamNbAAf9M7Uf//UVqAoMmgXhBdxTDJLGKY+LRnZ99qcG+Qjl5HfMpYNzS5v4EAwVEF34LeAj7w==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "@types/estree-jsx": "^1.0.0",
-        "@types/hast": "^3.0.0",
-        "comma-separated-tokens": "^2.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-attach-comments": "^3.0.0",
-        "estree-util-is-identifier-name": "^3.0.0",
-        "hast-util-whitespace": "^3.0.0",
-        "mdast-util-mdx-expression": "^2.0.0",
-        "mdast-util-mdx-jsx": "^3.0.0",
-        "mdast-util-mdxjs-esm": "^2.0.0",
-        "property-information": "^7.0.0",
-        "space-separated-tokens": "^2.0.0",
-        "style-to-js": "^1.0.0",
-        "unist-util-position": "^5.0.0",
-        "zwitch": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/hast-util-to-html": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
@@ -4113,52 +3288,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-to-jsx-runtime": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
-      "integrity": "sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "@types/hast": "^3.0.0",
-        "@types/unist": "^3.0.0",
-        "comma-separated-tokens": "^2.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-is-identifier-name": "^3.0.0",
-        "hast-util-whitespace": "^3.0.0",
-        "mdast-util-mdx-expression": "^2.0.0",
-        "mdast-util-mdx-jsx": "^3.0.0",
-        "mdast-util-mdxjs-esm": "^2.0.0",
-        "property-information": "^7.0.0",
-        "space-separated-tokens": "^2.0.0",
-        "style-to-js": "^1.0.0",
-        "unist-util-position": "^5.0.0",
-        "vfile-message": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hast-util-to-parse5": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.1.tgz",
-      "integrity": "sha512-MlWT6Pjt4CG9lFCjiz4BH7l9wmrMkfkJYCxFwKQic8+RTZgWPuWxwAfjJElsXkex7DJjfSJsQIt931ilUgmwdA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "comma-separated-tokens": "^2.0.0",
-        "devlop": "^1.0.0",
-        "property-information": "^7.0.0",
-        "space-separated-tokens": "^2.0.0",
-        "web-namespaces": "^2.0.0",
-        "zwitch": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/hast-util-to-string": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-3.0.1.tgz",
@@ -4245,9 +3374,9 @@
       }
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
-      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.3.0.tgz",
+      "integrity": "sha512-M5t5LlJpS1UHMjvwRQVdFHvPISGeLAxNcrWuJkeGh0KxsqCHZ1O3NXZU/8x7cD0BDcGW8kapxMKTvwlqrNkHkA==",
       "license": "BSD-2-Clause"
     },
     "node_modules/i18next": {
@@ -4278,12 +3407,6 @@
         }
       }
     },
-    "node_modules/inline-style-parser": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.7.tgz",
-      "integrity": "sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==",
-      "license": "MIT"
-    },
     "node_modules/iron-webcrypto": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz",
@@ -4342,16 +3465,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-hexadecimal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz",
@@ -4375,9 +3488,9 @@
       }
     },
     "node_modules/js-yaml": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
-      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
+      "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
       "funding": [
         {
           "type": "github",
@@ -4669,335 +3782,104 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.33.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
-      "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/longest-streak": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
-      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "11.5.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
-      "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.5"
-      }
-    },
-    "node_modules/magicast": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.3.tgz",
-      "integrity": "sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.29.3",
-        "@babel/types": "^7.29.0",
-        "source-map-js": "^1.2.1"
-      }
-    },
-    "node_modules/markdown-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz",
-      "integrity": "sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/markdown-table": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz",
-      "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/mdast-util-definitions": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-6.0.0.tgz",
-      "integrity": "sha512-scTllyX6pnYNZH/AIp/0ePz6s4cZtARxImwoPJ7kS42n+MnVsI4XbnG6d4ibehRIldYMWM2LD7ImQblVhUejVQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "@types/unist": "^3.0.0",
-        "unist-util-visit": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-directive": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-directive/-/mdast-util-directive-3.1.0.tgz",
-      "integrity": "sha512-I3fNFt+DHmpWCYAT7quoM6lHf9wuqtI+oCOfvILnoicNIqjh5E3dEJWiXuYME2gNe8vl1iMQwyUHa7bgFmak6Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "@types/unist": "^3.0.0",
-        "ccount": "^2.0.0",
-        "devlop": "^1.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0",
-        "parse-entities": "^4.0.0",
-        "stringify-entities": "^4.0.0",
-        "unist-util-visit-parents": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-find-and-replace": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.2.tgz",
-      "integrity": "sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "escape-string-regexp": "^5.0.0",
-        "unist-util-is": "^6.0.0",
-        "unist-util-visit-parents": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-from-markdown": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.3.tgz",
-      "integrity": "sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "@types/unist": "^3.0.0",
-        "decode-named-character-reference": "^1.0.0",
-        "devlop": "^1.0.0",
-        "mdast-util-to-string": "^4.0.0",
-        "micromark": "^4.0.0",
-        "micromark-util-decode-numeric-character-reference": "^2.0.0",
-        "micromark-util-decode-string": "^2.0.0",
-        "micromark-util-normalize-identifier": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0",
-        "unist-util-stringify-position": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-gfm": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.1.0.tgz",
-      "integrity": "sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==",
-      "license": "MIT",
-      "dependencies": {
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-gfm-autolink-literal": "^2.0.0",
-        "mdast-util-gfm-footnote": "^2.0.0",
-        "mdast-util-gfm-strikethrough": "^2.0.0",
-        "mdast-util-gfm-table": "^2.0.0",
-        "mdast-util-gfm-task-list-item": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-gfm-autolink-literal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz",
-      "integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "ccount": "^2.0.0",
-        "devlop": "^1.0.0",
-        "mdast-util-find-and-replace": "^3.0.0",
-        "micromark-util-character": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-gfm-footnote": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz",
-      "integrity": "sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "devlop": "^1.1.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0",
-        "micromark-util-normalize-identifier": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-gfm-strikethrough": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz",
-      "integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-gfm-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz",
-      "integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "devlop": "^1.0.0",
-        "markdown-table": "^3.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
+      "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/mdast-util-gfm-task-list-item": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz",
-      "integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==",
+    "node_modules/longest-streak": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
       "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "devlop": "^1.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
-      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/mdast-util-mdx": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-3.0.0.tgz",
-      "integrity": "sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==",
+    "node_modules/lru-cache": {
+      "version": "11.5.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
+      "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.3.tgz",
+      "integrity": "sha512-z12OxmaPGE0F4xlpGdjuAUckipLpQlTAuAmyGhNoD7ODpYUzvDfvtxUbjM/jwznyP178oju/KDdyi220wNJ0RQ==",
       "license": "MIT",
       "dependencies": {
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-mdx-expression": "^2.0.0",
-        "mdast-util-mdx-jsx": "^3.0.0",
-        "mdast-util-mdxjs-esm": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "@jridgewell/sourcemap-codec": "^1.6.0"
       }
     },
-    "node_modules/mdast-util-mdx-expression": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz",
-      "integrity": "sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==",
+    "node_modules/magicast": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.5.tgz",
+      "integrity": "sha512-UicdXN8zQ3JHlxVq+28afMXPr1z7WNY6+7EJnzTdQWkTAlMLF5fNCCKxJHBQwGaNGR11581EiQmQzx73+MvszA==",
       "license": "MIT",
       "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "@types/hast": "^3.0.0",
-        "@types/mdast": "^4.0.0",
-        "devlop": "^1.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "source-map-js": "^1.2.1"
       }
     },
-    "node_modules/mdast-util-mdx-jsx": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.2.0.tgz",
-      "integrity": "sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==",
+    "node_modules/mdast-util-directive": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-directive/-/mdast-util-directive-3.1.0.tgz",
+      "integrity": "sha512-I3fNFt+DHmpWCYAT7quoM6lHf9wuqtI+oCOfvILnoicNIqjh5E3dEJWiXuYME2gNe8vl1iMQwyUHa7bgFmak6Q==",
       "license": "MIT",
       "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "@types/hast": "^3.0.0",
         "@types/mdast": "^4.0.0",
         "@types/unist": "^3.0.0",
         "ccount": "^2.0.0",
-        "devlop": "^1.1.0",
+        "devlop": "^1.0.0",
         "mdast-util-from-markdown": "^2.0.0",
         "mdast-util-to-markdown": "^2.0.0",
         "parse-entities": "^4.0.0",
         "stringify-entities": "^4.0.0",
-        "unist-util-stringify-position": "^4.0.0",
-        "vfile-message": "^4.0.0"
+        "unist-util-visit-parents": "^6.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/mdast-util-mdxjs-esm": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz",
-      "integrity": "sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==",
+    "node_modules/mdast-util-from-markdown": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.3.tgz",
+      "integrity": "sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==",
       "license": "MIT",
       "dependencies": {
-        "@types/estree-jsx": "^1.0.0",
-        "@types/hast": "^3.0.0",
         "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "decode-named-character-reference": "^1.0.0",
         "devlop": "^1.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "mdast-util-to-markdown": "^2.0.0"
+        "mdast-util-to-string": "^4.0.0",
+        "micromark": "^4.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-decode-string": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unist-util-stringify-position": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5155,235 +4037,12 @@
       "license": "MIT",
       "dependencies": {
         "devlop": "^1.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-factory-whitespace": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0",
-        "parse-entities": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz",
-      "integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==",
-      "license": "MIT",
-      "dependencies": {
-        "micromark-extension-gfm-autolink-literal": "^2.0.0",
-        "micromark-extension-gfm-footnote": "^2.0.0",
-        "micromark-extension-gfm-strikethrough": "^2.0.0",
-        "micromark-extension-gfm-table": "^2.0.0",
-        "micromark-extension-gfm-tagfilter": "^2.0.0",
-        "micromark-extension-gfm-task-list-item": "^2.0.0",
-        "micromark-util-combine-extensions": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm-autolink-literal": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
-      "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
-      "license": "MIT",
-      "dependencies": {
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-sanitize-uri": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm-footnote": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
-      "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
-      "license": "MIT",
-      "dependencies": {
-        "devlop": "^1.0.0",
-        "micromark-core-commonmark": "^2.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-normalize-identifier": "^2.0.0",
-        "micromark-util-sanitize-uri": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm-strikethrough": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz",
-      "integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==",
-      "license": "MIT",
-      "dependencies": {
-        "devlop": "^1.0.0",
-        "micromark-util-chunked": "^2.0.0",
-        "micromark-util-classify-character": "^2.0.0",
-        "micromark-util-resolve-all": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm-table": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz",
-      "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==",
-      "license": "MIT",
-      "dependencies": {
-        "devlop": "^1.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm-tagfilter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz",
-      "integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==",
-      "license": "MIT",
-      "dependencies": {
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-gfm-task-list-item": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz",
-      "integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==",
-      "license": "MIT",
-      "dependencies": {
-        "devlop": "^1.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-mdx-expression": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-3.0.1.tgz",
-      "integrity": "sha512-dD/ADLJ1AeMvSAKBwO22zG22N4ybhe7kFIZ3LsDI0GlsNr2A3KYxb0LdC1u5rj4Nw+CHKY0RVdnHX8vj8ejm4Q==",
-      "funding": [
-        {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "devlop": "^1.0.0",
-        "micromark-factory-mdx-expression": "^2.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-events-to-acorn": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      }
-    },
-    "node_modules/micromark-extension-mdx-jsx": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-3.0.2.tgz",
-      "integrity": "sha512-e5+q1DjMh62LZAJOnDraSSbDMvGJ8x3cbjygy2qFEi7HCeUT4BDKCvMozPozcD6WmOt6sVvYDNBKhFSz3kjOVQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-is-identifier-name": "^3.0.0",
-        "micromark-factory-mdx-expression": "^2.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-events-to-acorn": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0",
-        "vfile-message": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-mdx-md": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-2.0.0.tgz",
-      "integrity": "sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==",
-      "license": "MIT",
-      "dependencies": {
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-mdxjs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-3.0.0.tgz",
-      "integrity": "sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==",
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.0.0",
-        "acorn-jsx": "^5.0.0",
-        "micromark-extension-mdx-expression": "^3.0.0",
-        "micromark-extension-mdx-jsx": "^3.0.0",
-        "micromark-extension-mdx-md": "^2.0.0",
-        "micromark-extension-mdxjs-esm": "^3.0.0",
-        "micromark-util-combine-extensions": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/micromark-extension-mdxjs-esm": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-3.0.0.tgz",
-      "integrity": "sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "devlop": "^1.0.0",
-        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-factory-whitespace": "^2.0.0",
         "micromark-util-character": "^2.0.0",
-        "micromark-util-events-to-acorn": "^2.0.0",
         "micromark-util-symbol": "^2.0.0",
         "micromark-util-types": "^2.0.0",
-        "unist-util-position-from-estree": "^2.0.0",
-        "vfile-message": "^4.0.0"
+        "parse-entities": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5433,33 +4092,6 @@
         "micromark-util-types": "^2.0.0"
       }
     },
-    "node_modules/micromark-factory-mdx-expression": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-2.0.3.tgz",
-      "integrity": "sha512-kQnEtA3vzucU2BkrIa8/VaSAsP+EJ3CKOvhMuJgOEGg9KDC6OAY6nSnNDVRiVNRqj7Y4SlSzcStaH/5jge8JdQ==",
-      "funding": [
-        {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "devlop": "^1.0.0",
-        "micromark-factory-space": "^2.0.0",
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-events-to-acorn": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0",
-        "unist-util-position-from-estree": "^2.0.0",
-        "vfile-message": "^4.0.0"
-      }
-    },
     "node_modules/micromark-factory-space": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
@@ -5661,31 +4293,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/micromark-util-events-to-acorn": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-2.0.3.tgz",
-      "integrity": "sha512-jmsiEIiZ1n7X1Rr5k8wVExBQCg5jy4UXVADItHmNk1zkwEVhBuIUKRu3fqv+hs4nxLISi2DQGlqIOGiFxgbfHg==",
-      "funding": [
-        {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "@types/unist": "^3.0.0",
-        "devlop": "^1.0.0",
-        "estree-util-visit": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0",
-        "vfile-message": "^4.0.0"
-      }
-    },
     "node_modules/micromark-util-html-tag-name": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz",
@@ -5838,9 +4445,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.16",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
-      "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
       "funding": [
         {
           "type": "github",
@@ -5911,9 +4518,9 @@
       }
     },
     "node_modules/obug": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz",
-      "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-3.0.0.tgz",
+      "integrity": "sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==",
       "funding": [
         "https://github.com/sponsors/sxzz",
         "https://opencollective.com/debug"
@@ -5934,12 +4541,6 @@
         "ufo": "^1.6.1"
       }
     },
-    "node_modules/ohash": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
-      "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==",
-      "license": "MIT"
-    },
     "node_modules/oniguruma-parser": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/oniguruma-parser/-/oniguruma-parser-0.12.2.tgz",
@@ -5958,9 +4559,9 @@
       }
     },
     "node_modules/p-limit": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.3.1.tgz",
-      "integrity": "sha512-0trZaiG7Y7kN/Egy9a8j47t9osC0Tch4PaIWd9yGF6bvmlk7muExRvGNYb8sXBwEKMoNKsbNN9P8EefuQekE4Q==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.3.3.tgz",
+      "integrity": "sha512-SKgVvDU5TNIxQ4r30U75BNLC6a+6GOEjngrk/ysM5+Zu3oJuk1SC5ApzIzY/7PjCEjoVPMWJ0zho/4QUiEB7TQ==",
       "license": "MIT",
       "dependencies": {
         "yocto-queue": "^1.2.1"
@@ -5973,9 +4574,9 @@
       }
     },
     "node_modules/p-queue": {
-      "version": "9.3.3",
-      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.3.3.tgz",
-      "integrity": "sha512-NXAOdnEe5FsZJfT4oK84lE1Y5cFFdWlRuOo5tww8DyNMxyRXwn39fIkUtNLKppcPC+UYU/bXujNCUGDv01y7CA==",
+      "version": "9.3.5",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-9.3.5.tgz",
+      "integrity": "sha512-Lki/zhXFVmDhesBUn/yHRLW9Bte7mE7xoFHzTR8sIomV7a2z+LxYAPkGvdfidNiu4fKSfjtawixxSHcZci5QcQ==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "^5.0.4",
@@ -5989,9 +4590,9 @@
       }
     },
     "node_modules/p-timeout": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-7.0.1.tgz",
-      "integrity": "sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-7.0.2.tgz",
+      "integrity": "sha512-prbX4Z3YszrFNgH+MW5Zoeq3baXrMtP/MQnFeET90UB/GtGcGDQ5Usg9OCy6ETjTTntOw1SL2z9fMPUppN3Guw==",
       "license": "MIT",
       "engines": {
         "node": ">=20"
@@ -6001,9 +4602,9 @@
       }
     },
     "node_modules/package-manager-detector": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.8.0.tgz",
-      "integrity": "sha512-yQA4H19AmPEoMUeavPMDIe1higySl/gH/yaQrkT/s07Qp+7pp2hYz30N3z2l5BkjVkF9Ow6o0wjJamm2y7Sn0A==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.9.0.tgz",
+      "integrity": "sha512-zAMfbta9nPA8AKkA4WdmNAT8R8s6Dk0/xwPsqNnRidMFcLo1YkLuPDTgs2f64XdzS8vbLNnoJ+uUIkgbz7oRHA==",
       "license": "MIT"
     },
     "node_modules/pagefind": {
@@ -6049,36 +4650,6 @@
       "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
       "license": "MIT"
     },
-    "node_modules/parse-latin": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/parse-latin/-/parse-latin-7.0.0.tgz",
-      "integrity": "sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/nlcst": "^2.0.0",
-        "@types/unist": "^3.0.0",
-        "nlcst-to-string": "^4.0.0",
-        "unist-util-modify-children": "^4.0.0",
-        "unist-util-visit-children": "^3.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
-      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
-      "license": "MIT",
-      "dependencies": {
-        "entities": "^6.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -6099,9 +4670,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
-      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -6111,9 +4682,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz",
-      "integrity": "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==",
+      "version": "8.5.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.31.tgz",
+      "integrity": "sha512-YUbWYCgErwnMAVkjUnYa+KlMBzGpHwiIt/DE7f0G33AuX2LH9UcTk6KgWxd3zRU+pN3u/C+Xl3EnMLM4Hea7Sg==",
       "funding": [
         {
           "type": "opencollective",
@@ -6130,9 +4701,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.16",
+        "nanoid": "^3.3.20",
         "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "source-map-js": "^1.2.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -6164,9 +4735,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz",
-      "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==",
+      "version": "6.1.5",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.5.tgz",
+      "integrity": "sha512-TEHFzb5KRDKaOgJ4TYE+0jyJtFbjLvkdVOu0fZ2b6MTWzoqZd4Le+61aEppWkvTlYePgOX4ATL1wsAIPMLTw6Q==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -6177,9 +4748,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.9.6",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz",
-      "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==",
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.10.tgz",
+      "integrity": "sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -6204,335 +4775,83 @@
     "node_modules/process-ancestry": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/process-ancestry/-/process-ancestry-0.1.0.tgz",
-      "integrity": "sha512-tGqJW/UnclpYASFcM6Xh8D8l/BMtaQ9+CSG0vlJSJTcdMM4lDRv4c6H0Pdcsfted+bVczdYSfk2fdukg2gQkZg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/property-information": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.2.0.tgz",
-      "integrity": "sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/radix3": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/radix3/-/radix3-1.1.2.tgz",
-      "integrity": "sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==",
-      "license": "MIT"
-    },
-    "node_modules/readdirp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
-      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 20.19.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/recma-build-jsx": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/recma-build-jsx/-/recma-build-jsx-1.0.0.tgz",
-      "integrity": "sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-util-build-jsx": "^3.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/recma-jsx": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/recma-jsx/-/recma-jsx-1.0.1.tgz",
-      "integrity": "sha512-huSIy7VU2Z5OLv6oFLosQGGDqPqdO1iq6bWNAdhzMxSJP7RAso4fCZ1cKu8j9YHCZf3TPrq4dw3okhrylgcd7w==",
-      "license": "MIT",
-      "dependencies": {
-        "acorn-jsx": "^5.0.0",
-        "estree-util-to-js": "^2.0.0",
-        "recma-parse": "^1.0.0",
-        "recma-stringify": "^1.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      },
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/recma-parse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/recma-parse/-/recma-parse-1.0.0.tgz",
-      "integrity": "sha512-OYLsIGBB5Y5wjnSnQW6t3Xg7q3fQ7FWbw/vcXtORTnyaSFscOtABg+7Pnz6YZ6c27fG1/aN8CjfwoUEUIdwqWQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "esast-util-from-js": "^2.0.0",
-        "unified": "^11.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/recma-stringify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/recma-stringify/-/recma-stringify-1.0.0.tgz",
-      "integrity": "sha512-cjwII1MdIIVloKvC9ErQ+OgAtwHBmcZ0Bg4ciz78FtbT8In39aAYbaA7zvxQ61xVMSPE8WxhLwLbhif4Js2C+g==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-util-to-js": "^2.0.0",
-        "unified": "^11.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz",
-      "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==",
-      "license": "MIT",
-      "dependencies": {
-        "regex-utilities": "^2.3.0"
-      }
-    },
-    "node_modules/regex-recursion": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
-      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
-      "license": "MIT",
-      "dependencies": {
-        "regex-utilities": "^2.3.0"
-      }
-    },
-    "node_modules/regex-utilities": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
-      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
-      "license": "MIT"
-    },
-    "node_modules/rehype": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/rehype/-/rehype-13.0.2.tgz",
-      "integrity": "sha512-j31mdaRFrwFRUIlxGeuPXXKWQxet52RBQRvCmzl5eCefn/KGbomK5GMHNMsOJf55fgo3qw5tST5neDuarDYR2A==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "rehype-parse": "^9.0.0",
-        "rehype-stringify": "^10.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-expressive-code": {
-      "version": "0.44.1",
-      "resolved": "https://registry.npmjs.org/rehype-expressive-code/-/rehype-expressive-code-0.44.1.tgz",
-      "integrity": "sha512-+VZgs7Evw4LXRN3owpoBNSTpYuW6GeOdjqcUT1TuY8o/4MGPtbd0EU7Bgrju7X8KrQ6SslOBAuGWJ5fV5TriJQ==",
-      "license": "MIT",
-      "dependencies": {
-        "expressive-code": "^0.44.1"
-      }
-    },
-    "node_modules/rehype-format": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/rehype-format/-/rehype-format-5.0.1.tgz",
-      "integrity": "sha512-zvmVru9uB0josBVpr946OR8ui7nJEdzZobwLOOqHb/OOD88W0Vk2SqLwoVOj0fM6IPCCO6TaV9CvQvJMWwukFQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "hast-util-format": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-parse": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-9.0.1.tgz",
-      "integrity": "sha512-ksCzCD0Fgfh7trPDxr2rSylbwq9iYDkSn8TCDmEJ49ljEUBxDVCzCHv7QNzZOfODanX4+bWQ4WZqLCRWYLfhag==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "hast-util-from-html": "^2.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-raw": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz",
-      "integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "hast-util-raw": "^9.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-recma": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-recma/-/rehype-recma-1.0.0.tgz",
-      "integrity": "sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "@types/hast": "^3.0.0",
-        "hast-util-to-estree": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/rehype-stringify": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/rehype-stringify/-/rehype-stringify-10.0.1.tgz",
-      "integrity": "sha512-k9ecfXHmIPuFVI61B9DeLPN0qFHfawM6RsuX48hoqlaKSF61RskNjSm1lI8PhBEM0MRdLxVVm4WmTqJQccH9mA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hast": "^3.0.0",
-        "hast-util-to-html": "^9.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-directive": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/remark-directive/-/remark-directive-4.0.0.tgz",
-      "integrity": "sha512-7sxn4RfF1o3izevPV1DheyGDD6X4c9hrGpfdUpm7uC++dqrnJxIZVkk7CoKqcLm0VUMAuOol7Mno3m6g8cfMuA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "mdast-util-directive": "^3.0.0",
-        "micromark-extension-directive": "^4.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "integrity": "sha512-tGqJW/UnclpYASFcM6Xh8D8l/BMtaQ9+CSG0vlJSJTcdMM4lDRv4c6H0Pdcsfted+bVczdYSfk2fdukg2gQkZg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/remark-gfm": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
-      "integrity": "sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==",
+    "node_modules/property-information": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.2.0.tgz",
+      "integrity": "sha512-IAtzIB6sUiWaJYrX9smp3V46pBGbBeLFRGdh25kg1334VcBlD8HzhPeNIWQH9zhGmo2itIe25EHt9dQP7G5hmg==",
       "license": "MIT",
-      "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "mdast-util-gfm": "^3.0.0",
-        "micromark-extension-gfm": "^3.0.0",
-        "remark-parse": "^11.0.0",
-        "remark-stringify": "^11.0.0",
-        "unified": "^11.0.0"
-      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/remark-mdx": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.1.1.tgz",
-      "integrity": "sha512-Pjj2IYlUY3+D8x00UJsIOg5BEvfMyeI+2uLPn9VO9Wg4MEtN/VTIq2NEJQfde9PnX15KgtHyl9S0BcTnWrIuWg==",
+    "node_modules/radix3": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/radix3/-/radix3-1.1.2.tgz",
+      "integrity": "sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==",
+      "license": "MIT"
+    },
+    "node_modules/readdirp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
       "license": "MIT",
-      "dependencies": {
-        "mdast-util-mdx": "^3.0.0",
-        "micromark-extension-mdxjs": "^3.0.0"
+      "engines": {
+        "node": ">= 20.19.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/remark-parse": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
-      "integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==",
+    "node_modules/regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz",
+      "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==",
       "license": "MIT",
       "dependencies": {
-        "@types/mdast": "^4.0.0",
-        "mdast-util-from-markdown": "^2.0.0",
-        "micromark-util-types": "^2.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "regex-utilities": "^2.3.0"
       }
     },
-    "node_modules/remark-rehype": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-11.1.2.tgz",
-      "integrity": "sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==",
+    "node_modules/regex-recursion": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
       "license": "MIT",
       "dependencies": {
-        "@types/hast": "^3.0.0",
-        "@types/mdast": "^4.0.0",
-        "mdast-util-to-hast": "^13.0.0",
-        "unified": "^11.0.0",
-        "vfile": "^6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "regex-utilities": "^2.3.0"
       }
     },
-    "node_modules/remark-smartypants": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-3.0.3.tgz",
-      "integrity": "sha512-gCaK+ndZ0hYezlqFegHFCVh2CQemsi0Npdh1qVM9bxlUFknjkbP6VmojWhddOCrbK0PbbacmYLWfTULRiT1eWA==",
+    "node_modules/regex-utilities": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
+      "license": "MIT"
+    },
+    "node_modules/rehype-expressive-code": {
+      "version": "0.44.1",
+      "resolved": "https://registry.npmjs.org/rehype-expressive-code/-/rehype-expressive-code-0.44.1.tgz",
+      "integrity": "sha512-+VZgs7Evw4LXRN3owpoBNSTpYuW6GeOdjqcUT1TuY8o/4MGPtbd0EU7Bgrju7X8KrQ6SslOBAuGWJ5fV5TriJQ==",
       "license": "MIT",
       "dependencies": {
-        "retext": "^9.0.0",
-        "retext-smartypants": "^6.0.0",
-        "unified": "^11.0.4",
-        "unist-util-visit": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=16.0.0"
+        "expressive-code": "^0.44.1"
       }
     },
-    "node_modules/remark-stringify": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
-      "integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
+    "node_modules/remark-directive": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/remark-directive/-/remark-directive-4.0.0.tgz",
+      "integrity": "sha512-7sxn4RfF1o3izevPV1DheyGDD6X4c9hrGpfdUpm7uC++dqrnJxIZVkk7CoKqcLm0VUMAuOol7Mno3m6g8cfMuA==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^4.0.0",
-        "mdast-util-to-markdown": "^2.0.0",
+        "mdast-util-directive": "^3.0.0",
+        "micromark-extension-directive": "^4.0.0",
         "unified": "^11.0.0"
       },
       "funding": {
@@ -6547,16 +4866,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -6576,37 +4885,6 @@
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
       }
     },
-    "node_modules/retext": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/retext/-/retext-9.0.0.tgz",
-      "integrity": "sha512-sbMDcpHCNjvlheSgMfEcVrZko3cDzdbe1x/e7G66dFp0Ff7Mldvi2uv6JkJQzdRcvLYE8CA8Oe8siQx8ZOgTcA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/nlcst": "^2.0.0",
-        "retext-latin": "^4.0.0",
-        "retext-stringify": "^4.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/retext-latin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/retext-latin/-/retext-latin-4.0.0.tgz",
-      "integrity": "sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/nlcst": "^2.0.0",
-        "parse-latin": "^7.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/retext-smartypants": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/retext-smartypants/-/retext-smartypants-6.2.0.tgz",
@@ -6622,28 +4900,13 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/retext-stringify": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/retext-stringify/-/retext-stringify-4.0.0.tgz",
-      "integrity": "sha512-rtfN/0o8kL1e+78+uxPTqu1Klt0yPzKuQ2BfWwwfgIUSayyzxpM1PJzkKt4V8803uB9qSy32MvI7Xep9khTpiA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/nlcst": "^2.0.0",
-        "nlcst-to-string": "^4.0.0",
-        "unified": "^11.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/rolldown": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.5.tgz",
-      "integrity": "sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==",
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.15.tgz",
+      "integrity": "sha512-6odND+fel5zVw3I4Yc2e69gvguDnX0CAAGiNDZSq4ik5WUcaLrkD2GLuog0XcODbor31hZ5ayEMgVDno+KPV5g==",
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.139.0",
+        "@oxc-project/types": "=0.155.0",
         "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
@@ -6653,44 +4916,44 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.1.5",
-        "@rolldown/binding-darwin-arm64": "1.1.5",
-        "@rolldown/binding-darwin-x64": "1.1.5",
-        "@rolldown/binding-freebsd-x64": "1.1.5",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.1.5",
-        "@rolldown/binding-linux-arm64-gnu": "1.1.5",
-        "@rolldown/binding-linux-arm64-musl": "1.1.5",
-        "@rolldown/binding-linux-ppc64-gnu": "1.1.5",
-        "@rolldown/binding-linux-s390x-gnu": "1.1.5",
-        "@rolldown/binding-linux-x64-gnu": "1.1.5",
-        "@rolldown/binding-linux-x64-musl": "1.1.5",
-        "@rolldown/binding-openharmony-arm64": "1.1.5",
-        "@rolldown/binding-wasm32-wasi": "1.1.5",
-        "@rolldown/binding-win32-arm64-msvc": "1.1.5",
-        "@rolldown/binding-win32-x64-msvc": "1.1.5"
+        "@rolldown/binding-android-arm-eabi": "1.2.15",
+        "@rolldown/binding-android-arm64": "1.2.15",
+        "@rolldown/binding-darwin-arm64": "1.2.15",
+        "@rolldown/binding-darwin-x64": "1.2.15",
+        "@rolldown/binding-freebsd-x64": "1.2.15",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.2.15",
+        "@rolldown/binding-linux-arm64-gnu": "1.2.15",
+        "@rolldown/binding-linux-arm64-musl": "1.2.15",
+        "@rolldown/binding-linux-ppc64-gnu": "1.2.15",
+        "@rolldown/binding-linux-s390x-gnu": "1.2.15",
+        "@rolldown/binding-linux-x64-gnu": "1.2.15",
+        "@rolldown/binding-linux-x64-musl": "1.2.15",
+        "@rolldown/binding-openharmony-arm64": "1.2.15",
+        "@rolldown/binding-win32-arm64-msvc": "1.2.15",
+        "@rolldown/binding-win32-x64-msvc": "1.2.15"
       }
     },
     "node_modules/satteri": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/satteri/-/satteri-0.9.5.tgz",
-      "integrity": "sha512-ZuWVl+vnM64y+/TtX8Kosv2c00W+hLQiiwnEL6H0UKVVrxFqMw4D2CJHHQaouVd89OAhtBBfjWLqhKi3TVUV4w==",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/satteri/-/satteri-0.10.5.tgz",
+      "integrity": "sha512-Ao1LKpAEa9Wdg0otgbVKViZHEq9ebdXe4DMrp3s9vQAU0HNIuHnFEuMuOcm0ZIXyV0Yzxj91NvhLpvXZJO/5ZQ==",
       "license": "MIT",
       "dependencies": {
         "@types/estree-jsx": "^1.0.5",
-        "@types/hast": "^3.0.4",
+        "@types/hast": "^3.0.5",
         "@types/mdast": "^4.0.4",
         "@types/unist": "^3.0.3"
       },
       "optionalDependencies": {
-        "@bruits/satteri-darwin-arm64": "0.9.5",
-        "@bruits/satteri-darwin-x64": "0.9.5",
-        "@bruits/satteri-linux-arm64-gnu": "0.9.5",
-        "@bruits/satteri-linux-arm64-musl": "0.9.5",
-        "@bruits/satteri-linux-x64-gnu": "0.9.5",
-        "@bruits/satteri-linux-x64-musl": "0.9.5",
-        "@bruits/satteri-wasm32-wasi": "0.9.5",
-        "@bruits/satteri-win32-arm64-msvc": "0.9.5",
-        "@bruits/satteri-win32-x64-msvc": "0.9.5"
+        "@bruits/satteri-darwin-arm64": "0.10.5",
+        "@bruits/satteri-darwin-x64": "0.10.5",
+        "@bruits/satteri-linux-arm64-gnu": "0.10.5",
+        "@bruits/satteri-linux-arm64-musl": "0.10.5",
+        "@bruits/satteri-linux-x64-gnu": "0.10.5",
+        "@bruits/satteri-linux-x64-musl": "0.10.5",
+        "@bruits/satteri-wasm32-wasi": "0.10.5",
+        "@bruits/satteri-win32-arm64-msvc": "0.10.5",
+        "@bruits/satteri-win32-x64-msvc": "0.10.5"
       }
     },
     "node_modules/sax": {
@@ -6715,9 +4978,9 @@
       }
     },
     "node_modules/sharp": {
-      "version": "0.35.3",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.3.tgz",
-      "integrity": "sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==",
+      "version": "0.35.5",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.5.tgz",
+      "integrity": "sha512-Ywn4OnzGukp7CDMrp08RQ50YKmuwG47brZgIVPTvBaaAfQlRlygrRqSrxdCiL9M+LlzLBiJ68IR1QqvzHyjC7g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@img/colour": "^1.1.0",
@@ -6731,31 +4994,31 @@
         "url": "https://opencollective.com/libvips"
       },
       "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.35.3",
-        "@img/sharp-darwin-x64": "0.35.3",
-        "@img/sharp-freebsd-wasm32": "0.35.3",
-        "@img/sharp-libvips-darwin-arm64": "1.3.2",
-        "@img/sharp-libvips-darwin-x64": "1.3.2",
-        "@img/sharp-libvips-linux-arm": "1.3.2",
-        "@img/sharp-libvips-linux-arm64": "1.3.2",
-        "@img/sharp-libvips-linux-ppc64": "1.3.2",
-        "@img/sharp-libvips-linux-riscv64": "1.3.2",
-        "@img/sharp-libvips-linux-s390x": "1.3.2",
-        "@img/sharp-libvips-linux-x64": "1.3.2",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.3.2",
-        "@img/sharp-libvips-linuxmusl-x64": "1.3.2",
-        "@img/sharp-linux-arm": "0.35.3",
-        "@img/sharp-linux-arm64": "0.35.3",
-        "@img/sharp-linux-ppc64": "0.35.3",
-        "@img/sharp-linux-riscv64": "0.35.3",
-        "@img/sharp-linux-s390x": "0.35.3",
-        "@img/sharp-linux-x64": "0.35.3",
-        "@img/sharp-linuxmusl-arm64": "0.35.3",
-        "@img/sharp-linuxmusl-x64": "0.35.3",
-        "@img/sharp-webcontainers-wasm32": "0.35.3",
-        "@img/sharp-win32-arm64": "0.35.3",
-        "@img/sharp-win32-ia32": "0.35.3",
-        "@img/sharp-win32-x64": "0.35.3"
+        "@img/sharp-darwin-arm64": "0.35.5",
+        "@img/sharp-darwin-x64": "0.35.5",
+        "@img/sharp-freebsd-wasm32": "0.35.5",
+        "@img/sharp-libvips-darwin-arm64": "1.3.4",
+        "@img/sharp-libvips-darwin-x64": "1.3.4",
+        "@img/sharp-libvips-linux-arm": "1.3.4",
+        "@img/sharp-libvips-linux-arm64": "1.3.4",
+        "@img/sharp-libvips-linux-ppc64": "1.3.4",
+        "@img/sharp-libvips-linux-riscv64": "1.3.4",
+        "@img/sharp-libvips-linux-s390x": "1.3.4",
+        "@img/sharp-libvips-linux-x64": "1.3.4",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.3.4",
+        "@img/sharp-libvips-linuxmusl-x64": "1.3.4",
+        "@img/sharp-linux-arm": "0.35.5",
+        "@img/sharp-linux-arm64": "0.35.5",
+        "@img/sharp-linux-ppc64": "0.35.5",
+        "@img/sharp-linux-riscv64": "0.35.5",
+        "@img/sharp-linux-s390x": "0.35.5",
+        "@img/sharp-linux-x64": "0.35.5",
+        "@img/sharp-linuxmusl-arm64": "0.35.5",
+        "@img/sharp-linuxmusl-x64": "0.35.5",
+        "@img/sharp-webcontainers-wasm32": "0.35.5",
+        "@img/sharp-win32-arm64": "0.35.5",
+        "@img/sharp-win32-ia32": "0.35.5",
+        "@img/sharp-win32-x64": "0.35.5"
       },
       "peerDependenciesMeta": {
         "@types/node": {
@@ -6764,19 +5027,19 @@
       }
     },
     "node_modules/shiki": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.3.1.tgz",
-      "integrity": "sha512-oR+qDVi2OjX1tmDpyv+3KviX01KzO6Af+0NNnKnsp9491UEGz2YpxTuJboS/6VhYpTdqzmuJBuiTlrAWWJAssw==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-4.5.0.tgz",
+      "integrity": "sha512-OcRW72ngQvc+MSVWBRIovC/BTW589iUE/Vxav7VeM4RcY9MUjqB+IR6ILG1k9nuW6LiG/nct9uma4/MBtnZbmQ==",
       "license": "MIT",
       "dependencies": {
-        "@shikijs/core": "4.3.1",
-        "@shikijs/engine-javascript": "4.3.1",
-        "@shikijs/engine-oniguruma": "4.3.1",
-        "@shikijs/langs": "4.3.1",
-        "@shikijs/themes": "4.3.1",
-        "@shikijs/types": "4.3.1",
+        "@shikijs/core": "4.5.0",
+        "@shikijs/engine-javascript": "4.5.0",
+        "@shikijs/engine-oniguruma": "4.5.0",
+        "@shikijs/langs": "4.5.0",
+        "@shikijs/themes": "4.5.0",
+        "@shikijs/types": "4.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4"
+        "@types/hast": "^3.0.5"
       },
       "engines": {
         "node": ">=20"
@@ -6808,9 +5071,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.0.tgz",
-      "integrity": "sha512-aqVvWoyO21L23mb+drl4RmMXbf6N7FdHjAhTRA9ZBL7apWBgfWC16KjrASI+1p9GAroljyMHj6fK67i0UiTNvQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.9.1.tgz",
+      "integrity": "sha512-j7WyPdf0CJoutMzMoPLF/bVXHtKZIT9Rb4eGeEbWw8X2t5oirjPgpL+OpaENZrILYaXqYwnVH+qgUwVbl+pUJQ==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 18"
@@ -6819,19 +5082,10 @@
         "url": "https://github.com/sponsors/cyyynthia"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
-      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -6848,9 +5102,9 @@
       }
     },
     "node_modules/starlight-sidebar-topics": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/starlight-sidebar-topics/-/starlight-sidebar-topics-0.8.0.tgz",
-      "integrity": "sha512-hE8+w2vNL13h6cq3UJGl05milJQ3+1BSlhaV5V4a993YzYczU6uLAj6jfUDKQ2mmgkdVWp8/UNDF4Je/rQXNQw==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/starlight-sidebar-topics/-/starlight-sidebar-topics-0.9.0.tgz",
+      "integrity": "sha512-xFwMAAtTVyqsO5DZ8Ldk0vN+2QoPdtjtDi8fbrzvQATIJvIvfaBLL9JzfXAjNHI9vMkj35VMWMd8tTICeO6RIA==",
       "license": "MIT",
       "dependencies": {
         "picomatch": "^4.0.3"
@@ -6859,9 +5113,16 @@
         "node": ">=22.12.0"
       },
       "peerDependencies": {
-        "@astrojs/starlight": ">=0.38.0"
+        "@astrojs/starlight": ">=0.42.0",
+        "astro": "^7.2.10"
       }
     },
+    "node_modules/std-env": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.3.0.tgz",
+      "integrity": "sha512-OtU/EgQ1kIm5KwqQpBC6ZEMXrZRui11w8zgfTWp8cdO9B8OaPsbA8bTHO2P+HNo1VlUTGMVBwPhydu6poeXiag==",
+      "license": "MIT"
+    },
     "node_modules/stream-replace-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/stream-replace-string/-/stream-replace-string-2.0.0.tgz",
@@ -6869,18 +5130,20 @@
       "license": "MIT"
     },
     "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.3.0.tgz",
+      "integrity": "sha512-ZbmZM0JCihQN91dWnxoipT2KOEyHqEyfRXUyjuRhW8b/xnqPDoq4gWEVApTVa9db2wN8mmoikgFBbjh71+cGeQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "get-east-asian-width": "^1.5.0",
+        "strip-ansi": "^7.1.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/stringify-entities": {
@@ -6898,49 +5161,34 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/style-to-js": {
-      "version": "1.1.21",
-      "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.21.tgz",
-      "integrity": "sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==",
-      "license": "MIT",
-      "dependencies": {
-        "style-to-object": "1.0.14"
-      }
-    },
-    "node_modules/style-to-object": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.14.tgz",
-      "integrity": "sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==",
-      "license": "MIT",
-      "dependencies": {
-        "inline-style-parser": "0.2.7"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.2.tgz",
-      "integrity": "sha512-ekx94z1rRc5LDi6oSUaeRnYhd0UOJxdtQCL2rF8xpWxD3TPAsISWOrxezqGovqS38GRZOdpDfvQe3ts6F7nsng==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.1.0.tgz",
+      "integrity": "sha512-bkxnTg1kSU0guhIBmibA6UUhrQmPVA1XsQLN+ylCd+UWzbnLkySOcXpyk1mrl05f+pcaCx2eHb+sp6BgMZWX+Q==",
       "license": "MIT",
       "dependencies": {
         "commander": "^11.1.0",
-        "css-select": "^5.1.0",
+        "css-select": "^6.0.0",
         "css-tree": "^3.0.1",
-        "css-what": "^6.1.0",
+        "css-what": "^7.0.0",
         "csso": "^5.0.5",
         "picocolors": "^1.1.1",
-        "sax": "^1.5.0"
+        "sax": "1.6.1"
       },
       "bin": {
         "svgo": "bin/svgo.js"
@@ -6960,18 +5208,18 @@
       "license": "MIT"
     },
     "node_modules/tinyclip": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/tinyclip/-/tinyclip-0.1.15.tgz",
-      "integrity": "sha512-uo33abH+Ays0xYaDysoBt494Hb3hsEczMpcC0MwFl773pazORx4fmvKhclhR1wonUbB6vvpRsvVMwnhfqeMc+A==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tinyclip/-/tinyclip-1.0.3.tgz",
+      "integrity": "sha512-nTv2raKFMzGG6JJp0lpNDsRPdfFE6UHlu2rVEjXo8vkx1ZS3LW2CVXqIaLu8xZlu+6tbFs9V58Qc/Jmk/Ii7wA==",
       "license": "MIT",
       "engines": {
         "node": "^16.14.0 || >= 17.3.0"
       }
     },
     "node_modules/tinyexec": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
-      "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.1.tgz",
+      "integrity": "sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -6993,6 +5241,12 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/tinyps": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/tinyps/-/tinyps-0.5.1.tgz",
+      "integrity": "sha512-B6Ykif5HflC3AdDkS4Zst/2muYVfeXoVMy+KorqH80s/1x4vunIORpNySH681X7fjj+dFM9MDKD6/Hsccjb87Q==",
+      "license": "MIT"
+    },
     "node_modules/trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -7017,8 +5271,8 @@
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD",
-      "optional": true
+      "devOptional": true,
+      "license": "0BSD"
     },
     "node_modules/typesafe-path": {
       "version": "0.2.2",
@@ -7069,6 +5323,15 @@
       "integrity": "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==",
       "license": "MIT"
     },
+    "node_modules/undici": {
+      "version": "8.12.3",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-8.12.3.tgz",
+      "integrity": "sha512-+fdndUTwBP86cVjihTp21hZHo7d6oj1c/47XPA3lL8mM0XHs+C4EkcjmgRsFnFk2f/UONGDy9ItBItmXsLOQHw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=22.19.0"
+      }
+    },
     "node_modules/undici-types": {
       "version": "7.18.2",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
@@ -7095,14 +5358,15 @@
       }
     },
     "node_modules/unifont": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/unifont/-/unifont-0.7.4.tgz",
-      "integrity": "sha512-oHeis4/xl42HUIeHuNZRGEvxj5AaIKR+bHPNegRq5LV1gdc3jundpONbjglKpihmJf+dswygdMJn3eftGIMemg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/unifont/-/unifont-1.0.3.tgz",
+      "integrity": "sha512-XGnEwj5sWdCbiBX01mWLSBncS0yMRjnLygau3IfdOlfjMacNIQvTGW4VH7pWBq+gGWArfSef/CensMLjMmIr/A==",
       "license": "MIT",
       "dependencies": {
         "css-tree": "^3.1.0",
-        "ofetch": "^1.5.1",
-        "ohash": "^2.0.11"
+        "fnv1a-64": "^0.1.2",
+        "std-env": "^4.2.0",
+        "undici": "^8.0.0"
       }
     },
     "node_modules/unist-util-find-after": {
@@ -7132,20 +5396,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-modify-children": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-4.0.0.tgz",
-      "integrity": "sha512-+tdN5fGNddvsQdIzUF3Xx82CU9sMM+fA0dLgR9vOmT0oPT2jH+P1nd5lSqfCfXAw+93NhcXNY2qqvTUtE4cQkw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^3.0.0",
-        "array-iterate": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/unist-util-position": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
@@ -7159,33 +5409,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-position-from-estree": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-2.0.0.tgz",
-      "integrity": "sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-remove-position": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz",
-      "integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^3.0.0",
-        "unist-util-visit": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/unist-util-stringify-position": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
@@ -7214,19 +5437,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-visit-children": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-3.0.0.tgz",
-      "integrity": "sha512-RgmdTfSBOg04sdPcpTSD1jzoNBjt9a80/ZCzp5cI9n1qPzLZWF9YdvWGN2zmTumP1HWhXKdUWexjy/Wy/lJ7tA==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/unist-util-visit-parents": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
@@ -7355,28 +5565,26 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "license": "MIT"
     },
-    "node_modules/vfile": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+    "node_modules/verkit": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/verkit/-/verkit-0.5.0.tgz",
+      "integrity": "sha512-u4J1hr6Y+C/hit34GwL3eIcUf3wngT8TlYUjK7tk0jxydKLAq3sYvifjdTDA6U3KCKRcQCQDGf/srjxfZF3l7g==",
       "license": "MIT",
-      "dependencies": {
-        "@types/unist": "^3.0.0",
-        "vfile-message": "^4.0.0"
+      "engines": {
+        "node": ">=18.12.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://github.com/sponsors/sxzz"
       }
     },
-    "node_modules/vfile-location": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz",
-      "integrity": "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==",
+    "node_modules/vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
       "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
-        "vfile": "^6.0.0"
+        "vfile-message": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -7398,15 +5606,15 @@
       }
     },
     "node_modules/vite": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.5.tgz",
-      "integrity": "sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==",
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz",
+      "integrity": "sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==",
       "license": "MIT",
       "dependencies": {
-        "lightningcss": "^1.32.0",
-        "picomatch": "^4.0.5",
-        "postcss": "^8.5.17",
-        "rolldown": "~1.1.5",
+        "lightningcss": "^1.33.0",
+        "picomatch": "^4.0.7",
+        "postcss": "^8.5.30",
+        "rolldown": "~1.2.14",
         "tinyglobby": "^0.2.17"
       },
       "bin": {
@@ -7423,7 +5631,7 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.3.0",
+        "@vitejs/devtools": "^0.7.1 || ^0.8.0",
         "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
@@ -7687,13 +5895,13 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.1.tgz",
-      "integrity": "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-10.0.0.tgz",
+      "integrity": "sha512-USSfxg0vDIpTQqlQBGxF3mBARyoS8cU7LHLpbYNh6dOJt32dlskxPWB0Irrh5TllTmyf7oNLAvqDqzklbwwnpA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=14.17.0"
       }
     },
     "node_modules/vscode-languageserver": {
@@ -7710,27 +5918,27 @@
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.18.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.2.tgz",
-      "integrity": "sha512-XRyDbT0Pp3sSNti3JmxVEUMySWCSi1hhM+/KUlCy1hV1zmrqpM1OwO12EAki8blhmLuIMpaJrYbo0OzGVfK2Qg==",
+      "version": "3.18.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.5.tgz",
+      "integrity": "sha512-FW4fBMzZ99N8xeob4py0l050wgCoRgTpEq5Xcsb9lM1bc29UKGR/wSV+4knaqFxssFHajy7OzNiKP/m3U1ZEuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.1",
-        "vscode-languageserver-types": "3.18.0"
+        "vscode-jsonrpc": "10.0.0",
+        "vscode-languageserver-types": "3.18.5"
       }
     },
     "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.16.tgz",
+      "integrity": "sha512-qeNEuOi9a3qkqRf7Gfez2WL2VwlBTLCNekHBGO9kxPVUp9XuY15yfTJ9jwvOwKI0I2MhUUfZq95NSp+LK1CLQg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.18.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.0.tgz",
-      "integrity": "sha512-8TsGPNMIMiiBdkORgRSvLjuiEIiAFtO+KssmYWxQ+uSVvlf7RjK8YKCOjPzZ+YA04jXEV7+7LvkSmHkhpNS99g==",
+      "version": "3.18.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.5.tgz",
+      "integrity": "sha512-kPd6+JQNz3HMJvjKlqUxERSlZHAntl/aGpsk7ImwIh0ewDKDcjgAEyVSYciPiOJD3ftbK9IrfiqUeTZLSbCizw==",
       "dev": true,
       "license": "MIT"
     },
@@ -7770,38 +5978,46 @@
       "license": "MIT"
     },
     "node_modules/vscode-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
-      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz",
+      "integrity": "sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/web-namespaces": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
-      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+    "node_modules/wrap-ansi": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/xxhash-wasm": {
@@ -7821,10 +6037,9 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz",
-      "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
-      "devOptional": true,
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.1.tgz",
+      "integrity": "sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
@@ -7884,22 +6099,21 @@
       }
     },
     "node_modules/yargs": {
-      "version": "17.7.3",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz",
-      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.2.0.tgz",
+      "integrity": "sha512-9OpKOLeaoNFecEp7P6iYbzze/5CqWoH7N3SMs/6y1XF4nMvFMspEGZzJ6uFi9MmQwXhyzqYoSEKO3tvA3Z/o2w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cliui": "^8.0.1",
+        "cliui": "^9.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
+        "string-width": "^8.2.1",
         "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
+        "yargs-parser": "^22.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^20.19.0 || ^22.12.0 || >=23"
       }
     },
     "node_modules/yargs-parser": {
@@ -7911,16 +6125,6 @@
         "node": "^20.19.0 || ^22.12.0 || >=23"
       }
     },
-    "node_modules/yargs/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz",
@@ -7934,9 +6138,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
-      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.6.7.tgz",
+      "integrity": "sha512-g8W2D2kU6a8untc053fX1uVBKzM7yqAxW/3zwk83+6RyF2+SKOuV+c0wBDhUwzV1PaGapmZH+rmcUzPf+3CGwg==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
diff --git a/www/package.json b/www/package.json
index 066657d3..c3743228 100644
--- a/www/package.json
+++ b/www/package.json
@@ -12,13 +12,13 @@
     "check": "astro check"
   },
   "dependencies": {
-    "@astrojs/starlight": "^0.41.4",
-    "astro": "^7.1.3",
-    "sharp": "^0.35.3",
-    "starlight-sidebar-topics": "0.8.0"
+    "@astrojs/starlight": "^0.42.7",
+    "astro": "^7.4.2",
+    "sharp": "^0.35.5",
+    "starlight-sidebar-topics": "0.9.0"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.9",
+    "@astrojs/check": "^0.9.12",
     "typescript": "^6.0.3"
   }
 }
diff --git a/www/public/og.png b/www/public/og.png
new file mode 100644
index 00000000..579a11e4
Binary files /dev/null and b/www/public/og.png differ
diff --git a/www/public/robots.txt b/www/public/robots.txt
new file mode 100644
index 00000000..3fa07649
--- /dev/null
+++ b/www/public/robots.txt
@@ -0,0 +1,4 @@
+User-agent: *
+Allow: /
+
+Sitemap: https://exav.org/sitemap-index.xml
diff --git a/www/scripts/make-og-image.py b/www/scripts/make-og-image.py
new file mode 100644
index 00000000..a359d162
--- /dev/null
+++ b/www/scripts/make-og-image.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+"""Draws www/public/og.png, the picture that link previews show for exav.org.
+
+    python3 -I www/scripts/make-og-image.py
+
+The picture is 1200 x 630 pixels: the site's mark (the teal shield with the
+2x2 "exav" monogram of src/assets/logo.svg, drawn again here), the name and the
+tagline, on the site's dark background. Everything is drawn from nothing by
+this script, with Pillow; no photograph, logo or other asset is read.
+
+Licence: the picture and this script are dedicated to the public domain under
+CC0-1.0 (https://creativecommons.org/publicdomain/zero/1.0/). The text is set
+in DejaVu Sans, a free font (Bitstream Vera licence with public domain
+additions) whose licence lets its rendered text be used freely.
+
+The output does not depend on the date or the machine beyond Pillow's
+rasteriser, so running the script again on the same version gives the same
+file.
+"""
+import os
+import sys
+
+from PIL import Image, ImageDraw, ImageFont
+from PIL.PngImagePlugin import PngInfo
+
+WIDTH, HEIGHT = 1200, 630
+SCALE = 3  # drawn this many times larger, then reduced, for smooth edges
+
+BACKGROUND = (0x17, 0x18, 0x1C)  # Starlight's dark --sl-color-black
+TEAL = (0x0F, 0x9E, 0x8E)  # --sl-color-accent in src/styles/custom.css
+WHITE = (0xFF, 0xFF, 0xFF)
+TEXT = (0xED, 0xEE, 0xF3)  # --sl-color-white
+MUTED = (0xC1, 0xC3, 0xC8)  # --sl-color-gray-2
+
+NAME = "exav"
+TAGLINE = ["Memory-safe tools", "for untrusted files."]
+ADDRESS = "exav.org"
+
+FONT_DIRS = ["/usr/share/fonts/truetype/dejavu", "/usr/share/fonts/dejavu", "/usr/share/fonts/TTF"]
+
+
+def font(name, size):
+    for directory in FONT_DIRS:
+        path = os.path.join(directory, name)
+        if os.path.exists(path):
+            return ImageFont.truetype(path, size)
+    sys.exit(f"{name} not found in {', '.join(FONT_DIRS)}: install DejaVu Sans (fonts-dejavu-core)")
+
+
+def cubic(p0, p1, p2, p3, steps=24):
+    """Points of a cubic Bezier curve, the start left out."""
+    out = []
+    for i in range(1, steps + 1):
+        t = i / steps
+        u = 1 - t
+        out.append(
+            (
+                u**3 * p0[0] + 3 * u * u * t * p1[0] + 3 * u * t * t * p2[0] + t**3 * p3[0],
+                u**3 * p0[1] + 3 * u * u * t * p1[1] + 3 * u * t * t * p2[1] + t**3 * p3[1],
+            )
+        )
+    return out
+
+
+def shield():
+    """The shield of logo.svg, in its 32 x 32 units:
+    M16 3.4 26 6.6v12.1c0 4.9-4.1 8.1-10 10-5.9-1.9-10-5.1-10-10V6.6Z"""
+    points = [(16, 3.4), (26, 6.6), (26, 18.7)]
+    points += cubic((26, 18.7), (26, 23.6), (21.9, 26.8), (16, 28.7))
+    points += cubic((16, 28.7), (10.1, 26.8), (6, 23.6), (6, 18.7))
+    points += [(6, 6.6)]
+    return points
+
+
+def draw_mark(draw, left, top, size):
+    """The mark with its top left corner at (left, top), `size` pixels wide."""
+    k = size / 32
+
+    def at(x, y):
+        return (left + x * k, top + y * k)
+
+    draw.rounded_rectangle([left, top, left + size, top + size], radius=8 * k, fill=TEAL)
+    draw.polygon([at(x, y) for x, y in shield()], fill=WHITE)
+    letters = font("DejaVuSans-Bold.ttf", round(10 * k))
+    for letter, x, y in (("e", 12.6, 15.3), ("x", 19.4, 15.3), ("a", 12.6, 22.9), ("v", 19.4, 22.9)):
+        draw.text(at(x, y), letter, font=letters, fill=TEAL, anchor="ms")
+
+
+def main():
+    image = Image.new("RGB", (WIDTH * SCALE, HEIGHT * SCALE), BACKGROUND)
+    draw = ImageDraw.Draw(image)
+
+    mark = 330
+    draw_mark(draw, 120 * SCALE, (HEIGHT - mark) // 2 * SCALE, mark * SCALE)
+
+    left = 520 * SCALE
+    draw.text((left, 292 * SCALE), NAME, font=font("DejaVuSans-Bold.ttf", 170 * SCALE), fill=TEXT, anchor="ls")
+    tagline = font("DejaVuSans.ttf", 46 * SCALE)
+    for i, line in enumerate(TAGLINE):
+        draw.text((left, (362 + i * 62) * SCALE), line, font=tagline, fill=MUTED, anchor="ls")
+    draw.text((left, 520 * SCALE), ADDRESS, font=font("DejaVuSansMono-Bold.ttf", 34 * SCALE), fill=TEAL, anchor="ls")
+
+    image = image.resize((WIDTH, HEIGHT), Image.LANCZOS)
+
+    info = PngInfo()
+    info.add_text("Title", "exav: Memory-safe tools for untrusted files.")
+    info.add_text("Copyright", "CC0-1.0: https://creativecommons.org/publicdomain/zero/1.0/")
+    out = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "public", "og.png")
+    image.save(out, optimize=True, pnginfo=info)
+    print(f"wrote {os.path.normpath(out)}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/www/src/content/docs/index.mdx b/www/src/content/docs/index.mdx
index 62edcfa3..0e315a99 100644
--- a/www/src/content/docs/index.mdx
+++ b/www/src/content/docs/index.mdx
@@ -2,6 +2,9 @@
 title: exav
 description: Memory-safe tools for untrusted files, written in Rust. A malware scanner compatible with ClamAV's signatures and protocols, an archive extractor, and a file viewer for the browser.
 template: splash
+head:
+  - tag: title
+    content: "exav: Memory-safe tools for untrusted files"
 hero:
   tagline: Memory-safe tools for untrusted files. Scan them for malware, unpack them, and view them in the browser.
   image:
@@ -49,9 +52,9 @@ Each tool is usable on its own.
     [Start here](/unpack/)
   </Card>
   <Card title="File viewer" icon="document">
-    `@exav/viewer` shows PDF, images, DWG and DXF, Office documents, IFC and
-    STL models, media and archives in the browser, and can open each file in
-    a sandboxed frame of its own.
+    `@exav/viewer` shows PDF, images, DWG and DXF, Office documents (the old
+    formats too), IFC, STL, OBJ, PLY and glTF models, media and archives in
+    the browser, and can open each file in a sandboxed frame of its own.
 
     ```sh
     npm install @exav/viewer
diff --git a/www/src/content/docs/project/architecture.md b/www/src/content/docs/project/architecture.md
index adbe776f..b91d8972 100644
--- a/www/src/content/docs/project/architecture.md
+++ b/www/src/content/docs/project/architecture.md
@@ -13,14 +13,30 @@ does in [How extraction works](/unpack/how-it-works/).
 
 The CLI (which is also the daemon) drives the scanning engine, `exav-core`,
 which also builds its own WASI binary, `exav-wasm` (feature `wasi-bin`). Two
-front ends use only the extractor, `exav-unpack`: the archive grep and
+front ends use the extractor, `exav-unpack`: the archive grep and
 `@exav/unpack-wasm`. `@exav/viewer`'s wasm modules use only `exav-render`.
 
 `exav-core` hashes images through `exav-imagehash` (the `image-hash`
 feature), which decodes them with `exav-render`. exav-render reads DWG and DXF
-with exav-unpack's drawing parsers (its `dwg` feature); the scanner draws
-nothing. `exav-update`, behind the `http-update` feature (part of `http`),
-sits to the side, feeding fresh signatures out of band.
+with exav-unpack's drawing parsers (its `dwg` feature), and its text layer
+reads HTML and the XML parts of documents with exav-unpack's (its `text`
+feature). That layer, the text a reader sees in a document, is also what the
+scanner (`exav-core`'s `visible-text` feature) and the archive grep (its
+`text` feature) read documents through; the scanner draws nothing.
+`exav-update`, behind the `http-update` feature (part of `http`), sits to the
+side, feeding fresh signatures out of band.
+
+`exav-render` is one crate, with the office converters in it as modules:
+spreadsheets (`sheets`) to XLSX, presentations and drawings (`slides`) to
+PPTX and text documents (`docs`) to DOCX, each behind a feature
+(`office-sheets`, `office-slides`, `office-docs`, or `office` for the three),
+and a `common` module they share (ZIP packages, ODF's XML, code pages,
+compound files, iWork archives) that is not public. None is in the default
+feature set. Under the office features the crate adds `zip`, `quick-xml`,
+`encoding_rs`, `md-5` and `sha1` to its dependencies (`flate2`, which they use
+too, is already there for the image decoders). The scanner links all of them
+already, through exav-unpack, so `visible-text-office` adds code but no crate.
+The viewer builds `sheets`, `slides` and `docs` into one wasm module each.
 
 Every arrow points down: nothing calls anything above it, which is what lets
 the extraction, decoding and hashing crates be taken on their own. Dashed
@@ -34,11 +50,14 @@ labelled with.
   half of @exav/viewer), exav-grep and exav-unpack-wasm. exav depends on
   exav-core, and on exav-update behind the http-update feature. exav-core also
   builds exav-wasm, its wasm32-wasip1 binary. exav-core depends on
-  exav-imagehash behind the image-hash feature, on exav-unpack, and on exav-x86
-  for the bytecode disassembly API. exav-imagehash and exav-viewer depend on
-  exav-render, which depends on exav-unpack behind its dwg feature. exav-grep
-  and exav-unpack-wasm depend on exav-unpack, which depends on exav-pe-emu
-  behind its pe-emu feature, which depends on exav-x86.</desc>
+  exav-imagehash behind the image-hash feature, on exav-render behind the
+  visible-text feature, on exav-unpack, and on exav-x86 for the bytecode
+  disassembly API. exav-imagehash and exav-viewer depend on exav-render, and
+  exav-grep does behind its text feature. exav-render, which holds the image
+  decoders, the DWG, DXF, IFC, STL, OBJ, PLY and glTF readers, the office converters and the
+  text layer, depends on exav-unpack behind its dwg and text features.
+  exav-grep and exav-unpack-wasm depend on exav-unpack, which depends on
+  exav-pe-emu behind its pe-emu feature, which depends on exav-x86.</desc>
   <defs>
     <marker id="crate-arrow" viewBox="0 0 8 8" refX="7" refY="4" markerWidth="7" markerHeight="7" orient="auto">
       <path d="M0 0 L8 4 L0 8 z" fill="currentColor"/>
@@ -52,8 +71,8 @@ labelled with.
     <rect x="636" y="24" width="150" height="70" rx="6"/>
     <rect x="4" y="150" width="146" height="62" rx="6"/>
     <rect x="160" y="150" width="180" height="96" rx="6"/>
-    <rect x="290" y="270" width="150" height="62" rx="6"/>
-    <rect x="300" y="380" width="220" height="74" rx="6"/>
+    <rect x="326" y="270" width="130" height="62" rx="6"/>
+    <rect x="300" y="380" width="220" height="90" rx="6"/>
     <rect x="190" y="510" width="596" height="78" rx="6"/>
     <rect x="300" y="640" width="190" height="62" rx="6"/>
     <rect x="300" y="750" width="190" height="62" rx="6"/>
@@ -65,7 +84,7 @@ labelled with.
     <text x="711" y="48">exav-unpack-wasm</text>
     <text x="77" y="174">exav-update</text>
     <text x="250" y="174">exav-core</text>
-    <text x="365" y="294">exav-imagehash</text>
+    <text x="391" y="294">exav-imagehash</text>
     <text x="410" y="404">exav-render</text>
     <text x="488" y="538">exav-unpack</text>
     <text x="395" y="664">exav-pe-emu</text>
@@ -84,9 +103,10 @@ labelled with.
     <text x="250" y="196">typing · patterns · hashes</text>
     <text x="250" y="214">YARA · .cbc VM</text>
     <text x="250" y="236">+ exav-wasm (WASI binary)</text>
-    <text x="365" y="316">image hashes</text>
-    <text x="410" y="426">image decoders</text>
-    <text x="410" y="444">DWG · DXF · IFC · STL</text>
+    <text x="391" y="316">image hashes</text>
+    <text x="410" y="426">image decoders · DWG · DXF</text>
+    <text x="410" y="444">IFC · STL · OBJ · PLY · glTF</text>
+    <text x="410" y="462">office converters · text layer</text>
     <text x="488" y="560">archives · disk images · documents</text>
     <text x="488" y="578">packed executables</text>
     <text x="395" y="684">packer stub emulator</text>
@@ -94,25 +114,29 @@ labelled with.
   </g>
   <g fill="currentColor" font-family="ui-monospace, SFMono-Regular, Menlo, monospace" font-size="11" opacity="0.72" text-anchor="start">
     <text x="46" y="134">http-update</text>
-    <text x="328" y="261">image-hash</text>
-    <text x="418" y="486">dwg</text>
+    <text x="346" y="194">image-hash</text>
+    <text x="294" y="362" text-anchor="end">visible-text</text>
+    <text x="506" y="300">text</text>
+    <text x="418" y="496">dwg · text</text>
     <text x="403" y="618">pe-emu</text>
     <text x="183" y="730">bytecode disasm</text>
   </g>
   <g fill="none" stroke="currentColor" stroke-width="1.5" marker-end="url(#crate-arrow)">
     <path d="M237 94 V146"/>
-    <path d="M462 94 V376"/>
+    <path d="M466 94 V376"/>
     <path d="M553 94 V506"/>
     <path d="M711 94 V506"/>
     <path d="M200 246 V506"/>
     <path d="M175 246 V781 H296"/>
-    <path d="M365 332 V376"/>
+    <path d="M391 332 V376"/>
     <path d="M395 702 V746"/>
   </g>
   <g fill="none" stroke="currentColor" stroke-width="1.5" stroke-dasharray="4 4" marker-end="url(#crate-arrow)">
     <path d="M40 94 V146"/>
-    <path d="M320 246 V266"/>
-    <path d="M410 454 V506"/>
+    <path d="M340 200 H391 V266"/>
+    <path d="M300 246 V376"/>
+    <path d="M500 94 V376"/>
+    <path d="M410 470 V506"/>
     <path d="M395 588 V636"/>
   </g>
 </svg>
diff --git a/www/src/content/docs/project/contributing.md b/www/src/content/docs/project/contributing.md
index cd364a9c..31430824 100644
--- a/www/src/content/docs/project/contributing.md
+++ b/www/src/content/docs/project/contributing.md
@@ -10,7 +10,7 @@ targets. For a vulnerability, do not open a public issue: see
 [Security](/project/security/#reporting-a-vulnerability). Contributors follow the
 [code of conduct](https://github.com/sylvinus/exav/blob/main/CODE_OF_CONDUCT.md).
 
-To start, install Rust 1.92 or newer and a C compiler (the `http` build links
+To start, install Rust 1.95 or newer and a C compiler (the `http` build links
 `ring`), clone the repository and run `make test-native`. The rest of
 `make test` also needs `wasmtime`, Node.js and `wasm-pack`
 ([below](#before-submitting)).
@@ -99,9 +99,10 @@ make lint    # CI's clippy passes (-D warnings) and cargo fmt --check
 
 | target | what it covers | needs |
 | --- | --- | --- |
-| `make test-native` | the workspace under every feature pass: default, `http`, `exav-unpack` with `checksums`, `--no-default-features`, `unstable-internals`, `testing-faults` | a C compiler |
+| `make test-native` | the workspace under every feature pass: default, `http`, `exav-unpack` with `checksums`, `--no-default-features`, `unstable-internals`, `testing-faults`, and exav-render's `office-*`, `markdown`, `text-pdf` and `text-office` passes | a C compiler |
 | `make test-wasm` | the extractor and core unit tests on 32-bit `wasm32-wasip1` | `wasmtime` |
 | `make test-js` | the WASM bindings' vitest units and Playwright browser tests | Node.js, `wasm-pack`, python3; downloads Chromium |
+| `make test-viewer` | `@exav/viewer`: its wasm modules rebuilt from the current source, vitest units, the package as `npm publish` would upload it, the sink and wasm-import gates, and the demo driven in headless browsers under its Content-Security-Policy | Node.js, `wasm-bindgen-cli` at the version the viewer pins; downloads browsers |
 | `make test-www` | `astro check`, a docs build (frontmatter, sidebar entries, rendering) and a check that every internal link and anchor resolves | Node.js |
 
 Not in `make test`:
@@ -123,7 +124,7 @@ reports green having checked nothing. Run `make test` before you push.
 
 CI runs, on every pull request and push to `main`: the `make lint` checks,
 `make test-native`, the MSRV check (`make msrv`), `make test-yara-diff`, the WASM
-builds with `make test-wasm` and `make test-js`, `make test-www`, `cargo audit`,
+builds with `make test-wasm` and `make test-js`, `make test-viewer`, `make test-www`, `cargo audit`,
 `cargo deny check`, and a `cargo-fuzz` smoke run of every target.
 
 Add a line to the `[Unreleased]` section of `CHANGELOG.md` for any change a user
diff --git a/www/src/content/docs/project/dependencies.md b/www/src/content/docs/project/dependencies.md
index c01ade68..bdad557f 100644
--- a/www/src/content/docs/project/dependencies.md
+++ b/www/src/content/docs/project/dependencies.md
@@ -28,8 +28,8 @@ dependency policy behind these choices is in the repository's
   the parsers a hostile client reaches first are exav's own.
 - **`unsafe` in dependencies.** Many dependencies use `unsafe` internally: SIMD
   byte search and hashing, OS syscalls (the daemon), and buffer handling in some
-  decoders that read scanned bytes (`lzfse_rust`, `ruzstd`, `zip`, `tar`,
-  `delharc`, `goblin`). exav's own crates contain none outside the daemon's
+  decoders that read scanned bytes (`ruzstd`, `zip`, `tar`, `delharc`,
+  `goblin`). exav's own crates contain none outside the daemon's
   `libc` calls. The tables give a count per crate, and reducing it is on the
   [roadmap](/project/roadmap/).
 - **Feature-gated capability.** Optional features (`http-scan`, `http-update`,
@@ -71,16 +71,21 @@ code, not a dependency.
 | [`regex`](https://crates.io/crates/regex) | Linear-time regex (PCRE subsignatures, phishing allowlists) | MIT OR Apache-2.0 | 1 |
 | [`regex-automata`](https://crates.io/crates/regex-automata) / [`regex-syntax`](https://crates.io/crates/regex-syntax) | Linear-time (DoS-safe) regex engine + parser (YARA regexes, the atom prefilter's required literals) | MIT OR Apache-2.0 | 55 / **none** (`forbid`) |
 | [`bit-set`](https://crates.io/crates/bit-set) | For the backtracking regex engine vendored in exav-core (below) | Apache-2.0 OR MIT | 2 |
-| [`goblin`](https://crates.io/crates/goblin) | PE / ELF / Mach-O executable parsing | MIT | 34 |
-| [`md-5`](https://crates.io/crates/md-5) / [`sha1`](https://crates.io/crates/sha1) / [`sha2`](https://crates.io/crates/sha2) | Hash signatures (whole-file / section digests), and key derivation in `decrypt` | MIT OR Apache-2.0 | 1 / 7 / 50 (CPU-feature detection, SIMD) |
+| [`goblin`](https://crates.io/crates/goblin) | PE / ELF executable parsing, built without its Mach-O, `ar` and TE parsers | MIT | 34 |
+| [`md-5`](https://crates.io/crates/md-5) / [`sha1`](https://crates.io/crates/sha1) / [`sha2`](https://crates.io/crates/sha2) | Hash signatures (whole-file / section digests), key derivation in `decrypt`, and, for `md-5` and `sha1`, the opening of an XLS encrypted with a password (Excel's default one for exav-render's `office-sheets`), in exav-unpack's `offcrypto` | MIT OR Apache-2.0 | 1 / 7 / 50 (CPU-feature detection, SIMD) |
 | [`crc32fast`](https://crates.io/crates/crc32fast) | CRC-32 (the `.exavdb` trailer, YARA's `hash` module, archive CRCs) | MIT OR Apache-2.0 | 15 (SIMD) |
 | [`base64`](https://crates.io/crates/base64) | Base64 decode (YARA `base64` modifiers; uuencode, email, XDP and embedded payloads in `exav-unpack`) | MIT OR Apache-2.0 | **none** (`forbid`) |
 | [`yara-x-parser`](https://crates.io/crates/yara-x-parser) | YARA grammar/AST parser (the native engine's front end) | BSD-3-Clause | 5 |
 | [`image`](https://crates.io/crates/image) | Image decoding for `fuzzy_img` hashing, in [exav-imagehash](/subprojects/exav-imagehash/): PNG, GIF, BMP, WebP, ICO, PNM, QOI, DDS, farbfeld and HDR itself, JPEG and TIFF through its decoders vendored there (below) | MIT OR Apache-2.0 | 6, plus its codecs below |
-| [`zune-jpeg`](https://crates.io/crates/zune-jpeg) / [`zune-core`](https://crates.io/crates/zune-core) | JPEG decoding for fuzzy image hashing (0.5.8, and 0.4.21 for JPEG-compressed TIFF), built without its SIMD features, which hold all of its `unsafe` | MIT OR Apache-2.0 OR Zlib | **none** (`forbid`) / **none** (two versions of each resolve) |
+| [`zune-jpeg`](https://crates.io/crates/zune-jpeg) / [`zune-core`](https://crates.io/crates/zune-core) | JPEG decoding for fuzzy image hashing (0.5.15, and 0.4.21 for JPEG-compressed TIFF), built without its SIMD features, which hold all of its `unsafe` | MIT OR Apache-2.0 OR Zlib | **none** (`forbid`) / **none** (two versions of each resolve) |
 | [`png`](https://crates.io/crates/png) / [`gif`](https://crates.io/crates/gif) | `image`'s PNG and GIF decoders, required at the versions libclamav links (as are the JPEG and TIFF ones), which `cargo install` would not otherwise hold | MIT OR Apache-2.0 | **none** (`forbid`) / **none** (`forbid`) |
 | [`hayro-jpeg2000`](https://crates.io/crates/hayro-jpeg2000) / [`hayro-jbig2`](https://crates.io/crates/hayro-jbig2) | JPEG 2000 and JBIG2 decoding for fuzzy image hashing, in [exav-render](/subprojects/exav-render/), built without their `simd` feature (fearless_simd); `hayro-ccitt`, below, is hayro-jbig2's | Apache-2.0 OR MIT | **none** (`forbid`) / **none** (`forbid`) |
-| [`fax`](https://crates.io/crates/fax) / [`weezl`](https://crates.io/crates/weezl) / [`half`](https://crates.io/crates/half) / [`quick-error`](https://crates.io/crates/quick-error) / [`bytemuck`](https://crates.io/crates/bytemuck) | The vendored TIFF decoder's: CCITT fax, LZW, 16-bit floats, error types, byte casts | MIT / MIT OR Apache-2.0 / MIT OR Apache-2.0 / MIT OR Apache-2.0 / Zlib OR Apache-2.0 OR MIT | **none** / **none** (`forbid`) / 84 / **none** / 323 |
+| [`zenjxl-decoder`](https://crates.io/crates/zenjxl-decoder) with `zenjxl-decoder-simd` and `zenjxl-decoder-macros` | JPEG XL decoding in `@exav/viewer`'s image module (exav-render's `jxl` feature, not a default): a fork of the libjxl team's jxl-rs with limits on pixels and memory, built without its SIMD and without `threads`; the viewer only | BSD-3-Clause | **none** (`forbid`; its `allow-unsafe` feature is off) / **none** (`forbid`) / **none** (`forbid`) |
+| [`fax`](https://crates.io/crates/fax) / [`weezl`](https://crates.io/crates/weezl) / [`quick-error`](https://crates.io/crates/quick-error) / [`bytemuck`](https://crates.io/crates/bytemuck) | The vendored TIFF decoder's: CCITT fax, LZW, error types, byte casts | MIT / MIT OR Apache-2.0 / MIT OR Apache-2.0 / Zlib OR Apache-2.0 OR MIT | **none** / **none** (`forbid`) / **none** / 323 |
+| [`bcdec_rs`](https://crates.io/crates/bcdec_rs) | BC1 to BC7 blocks of a DDS texture, in exav-render's viewer reader (`decode_any`), never in what is hashed; no dependencies | MIT | **none** |
+| [`pulldown-cmark`](https://crates.io/crates/pulldown-cmark) | Markdown (CommonMark, tables, strikethrough) read as events, into a tree of data in `@exav/viewer`'s text module and into the text a reader sees for the scanner's `visible-text` feature (on by default) and `exav-grep --text` (exav-render's `markdown` feature); without its `html` and `simd` features, so no markup is made and the crate is `forbid(unsafe_code)`. It was measured linear on 35 hostile 1 MB inputs (worst 8 ms) and without advisories | MIT | **none** (`forbid`; the 4 uses are its SIMD feature, off) |
+| [`html5gum`](https://crates.io/crates/html5gum) | HTML visible text (`visible-text`, on by default; `exav-grep --text`) and the HTML pages the office converters read (`exav_unpack::html`): a spec-compliant tokenizer alone (it passes the html5lib tokenizer tests), pulled token by token, keeping the words and where each link leads. No tree is built. Without its default `jetscii` feature it has no dependency | MIT | **none** (`forbid`) |
+| [`hayro-interpret`](https://crates.io/crates/hayro-interpret) / [`hayro-syntax`](https://crates.io/crates/hayro-syntax) | PDF visible text (`visible-text-pdf` / `text-pdf`, **not a default**): hayro interprets each page and hands over its glyphs with their Unicode (`ToUnicode`, else glyph names). It is by the author of the JPEG 2000 and JBIG2 decoders exav-render already uses, and shares them. hayro puts no bound on what a stream decompresses to (a 1 MB PDF took 2.1 GB), so exav reads a PDF with it only after its own reader has taken every stream within the budget; a panic in it is contained. Built without the predefined CJK CMaps (`embed-cmaps`, which brings `brotli`). **Why it is off by default:** `hayro-interpret` turns on `hayro-syntax`'s `unsafe` feature itself, which switches every `flate2` in the build to `zlib-rs` (damaged streams then give back other bytes: two of exav-unpack's tests fail with it) and adds SIMD to the image decoders | Apache-2.0 OR MIT | **none** (`forbid`) / 11 (a lifetime `transmute`; with its `unsafe` feature, which is on, `flate2` and SIMD) |
 | [`tlsh2`](https://crates.io/crates/tlsh2) | TLSH fuzzy hashing | Apache-2.0 OR BSD-3-Clause | **none** |
 | [`rmp-serde`](https://crates.io/crates/rmp-serde) / [`rmp`](https://crates.io/crates/rmp) / [`serde`](https://crates.io/crates/serde) | MessagePack encoding of the prebuilt `.exavdb` | MIT / MIT / MIT OR Apache-2.0 | **none** (`forbid`) / 1 / 2 |
 | [`rustc-hash`](https://crates.io/crates/rustc-hash) | Fast hashing for internal maps (also in `exav-pe-emu`) | Apache-2.0 OR MIT | **none** |
@@ -97,7 +102,8 @@ Some of exav is vendored source instead of dependencies, under its crates'
 - [exav-render](/subprojects/exav-render/)'s `src/image_codecs/`, which
   exav-imagehash decodes through: `image` 0.25.9's JPEG and TIFF decoders and
   the decoder of `tiff` 0.10.3 (MIT), so that zune-jpeg is built without its
-  SIMD code, which `image` and `tiff` cannot turn off.
+  SIMD code, which `image` and `tiff` cannot turn off. It holds 16-bit float
+  samples as their bits, which keeps `half` and `zerocopy` out.
 - exav-imagehash's `src/pillow.rs`: Pillow 12.3.0's resampler and grey
   conversions (MIT-CMU), ported for its imagehash preset.
 - exav-imagehash's `src/dct.rs`: rustdct 0.7.1's DCT-II for power-of-two
@@ -109,37 +115,57 @@ Some of exav is vendored source instead of dependencies, under its crates'
 [`exav-x86`](/subprojects/exav-x86/) only, the oracle its differential tests,
 table generator and fuzz target check against.
 
+### The office converters (`exav-render`)
+
+[exav-render](/subprojects/exav-render/#office-documents)'s `office-sheets`,
+`office-slides` and `office-docs` features (`office` for the three; none is a
+default) read ZIP packages and compound files and write XLSX, PPTX and DOCX.
+They add `exav-unpack` (its `ole`, `html`, `offcrypto` and `rtf` readers: the
+compound file and BIFF readers, the HTML tokens, the decryption of an XLS with
+Excel's default password, which brings `md-5` and `sha1`, and the RTF
+tokenizer, the same ones the scanner reads with) and three crates, all in the
+tables on this page: `zip` (without default features, deflate through
+`flate2`), `quick-xml` and `encoding_rs`; `html5gum` comes with the HTML
+tokens.
+`flate2` is already there for the image decoders, and the iWork (protobuf and
+Snappy) readers and the OfficeArt reader are exav-render's own code.
+
+Counted as above, `cargo tree -p exav-render -e no-dev --prefix none | sort -u
+| wc -l` gives 47 packages by default and 76 with `--features office` on
+Linux (73 for `wasm32-unknown-unknown`), the crate itself included. The scanner
+links every one of them already, through exav-unpack, so its
+`visible-text-office` feature adds code and no crate.
+
 ## Extraction & decompression (`exav-unpack`)
 
 Also `#![forbid(unsafe_code)]`. The decoders are pure-Rust; there is no C
 compression library in the tree. Most of these read scanned bytes. The bzip2
 decoder is not a dependency: it is vendored from `bzip2-rs` into
 `formats/bzip2_rs`, with a fix for incompressible blocks, and is as
-`unsafe`-free as the rest of the crate.
+`unsafe`-free as the rest of the crate. Nor is the InstallShield `.z` reader:
+its table of contents is read as the `unshield` crate reads it, and its PKWARE
+DCL members are decoded in `formats/dcl_explode.rs`, ported from the
+`explode` crate and Mark Adler's `blast.c`. The LZFSE and LZVN decoder of
+DMG runs is `formats/lzfse.rs`, ported from Apple's reference implementation
+(BSD-3-Clause) and checked against it, damaged streams included.
 
 | Crate | Purpose | License | `unsafe` uses |
 |---|---|---|---|
 | [`flate2`](https://crates.io/crates/flate2) | DEFLATE / gzip / zlib (pure-Rust `miniz_oxide` backend) | MIT OR Apache-2.0 | 36 (no C zlib) |
 | [`deflate64`](https://crates.io/crates/deflate64) | Deflate64 (ZIP method 9) | MIT | **none** (`forbid`) |
 | [`xz4rust`](https://crates.io/crates/xz4rust) | XZ (`.xz`, ZIP method 95, DMG) | MIT | 3 |
-| [`lzma-rust2`](https://crates.io/crates/lzma-rust2) | LZMA / LZMA2 (7z, lzip, ZIP method 14, SWF, NSIS, UPX, EGG) | Apache-2.0 | 14 |
-| [`ruzstd`](https://crates.io/crates/ruzstd) | Zstandard (pure Rust) | MIT | 39 |
+| [`lzma-rust2`](https://crates.io/crates/lzma-rust2) | LZMA / LZMA2 (7z, lzip, `.lzma`, ZIP method 14, SWF, NSIS, UPX, EGG; also the strips of an LZMA TIFF in exav-render's viewer reader (`decode_any`), never in what is hashed) | Apache-2.0 | 14 |
+| [`ruzstd`](https://crates.io/crates/ruzstd) | Zstandard (pure Rust), without its `hash` feature: exav does not check the content checksum; also the strips of a Zstandard TIFF in exav-render's viewer reader (`decode_any`), never in what is hashed | MIT | 39 |
 | [`lzxd`](https://crates.io/crates/lzxd) | LZX (CAB) | MIT OR Apache-2.0 | **none** |
-| [`lzfse_rust`](https://crates.io/crates/lzfse_rust) | LZFSE / LZVN (DMG) | MIT OR Apache-2.0 | 435 |
 | [`delharc`](https://crates.io/crates/delharc) | LHA / LZH | MIT OR Apache-2.0 | 19 |
 | [`bitstream-io`](https://crates.io/crates/bitstream-io) | Bit-level readers for decoders | MIT OR Apache-2.0 | **none** (`forbid`) |
 | [`tar`](https://crates.io/crates/tar) | tar archives (`xattr` disabled, which drops its syscall crates) | MIT OR Apache-2.0 | 26 |
-| [`zip`](https://crates.io/crates/zip) | ZIP container parsing | MIT | 32 |
-| [`cfb`](https://crates.io/crates/cfb) | OLE2 / Compound File Binary (Office) | MIT | **none** |
-| [`encoding_rs`](https://crates.io/crates/encoding_rs) | the code pages of DXF and DWG drawings before 2007, Asian double-byte ones included (features `dxf`, `dwg`), built without `simd-accel` | (Apache-2.0 OR MIT) AND BSD-3-Clause | 193 |
-| [`quick-xml`](https://crates.io/crates/quick-xml) | OOXML / XML parsing | MIT | **none** (`forbid`) |
+| [`zip`](https://crates.io/crates/zip) | ZIP container parsing; also the packages the office converters of [exav-render](/subprojects/exav-render/#office-documents) read and write (built without default features, deflate through `flate2`) | MIT | 25 |
+| [`encoding_rs`](https://crates.io/crates/encoding_rs) | the code pages of DXF and DWG drawings before 2007, Asian double-byte ones included (features `dxf`, `dwg`), and of the text of the legacy office formats (exav-render's `office-*` features), built without `simd-accel` | (Apache-2.0 OR MIT) AND BSD-3-Clause | 180 |
+| [`quick-xml`](https://crates.io/crates/quick-xml) | OOXML / XML parsing; also the OpenDocument, Visio and Word 2003 XML the office converters read and the XML they write | MIT | **none** (`forbid`) |
 | [`mail-parser`](https://crates.io/crates/mail-parser) | MIME / email parsing | Apache-2.0 OR MIT | **none** (`forbid`) |
-| [`apfs`](https://crates.io/crates/apfs) / [`hfsplus`](https://crates.io/crates/hfsplus) | DMG filesystem parsing | MIT | **none** |
-| [`ext4-view`](https://crates.io/crates/ext4-view) | ext2/3/4 filesystem walking (virtual disks) | MIT OR Apache-2.0 | **none** (`forbid`) |
-| [`fatfs`](https://crates.io/crates/fatfs) | FAT12/16/32 cluster-chain walking | MIT | 11 |
 | [`lznt1`](https://crates.io/crates/lznt1) | LZNT1 (NTFS compressed streams) | MIT | **none** (`forbid`) |
 | [`salzweg`](https://crates.io/crates/salzweg) | LZW (ZOO, Unix `compress`) | MIT | **none** |
-| [`unshield`](https://crates.io/crates/unshield) | InstallShield `.z` archives | MIT | **none** |
 | [`tinyvec`](https://crates.io/crates/tinyvec) | Inline vectors for the vendored bzip2 decoder | Zlib OR Apache-2.0 OR MIT | **none** (`forbid`) |
 | [`byteorder`](https://crates.io/crates/byteorder) | Byte-order reads | Unlicense OR MIT | 40 |
 
@@ -155,7 +181,6 @@ SIMD (AES-NI) and CPU-feature detection.
 | [`aes`](https://crates.io/crates/aes) / [`cbc`](https://crates.io/crates/cbc) | AES block cipher + CBC (ZIP, 7z, PDF, DMG, Office) | MIT OR Apache-2.0 | 60 / **none** |
 | [`des`](https://crates.io/crates/des) | Triple DES (encrypted DMG key unwrap) | MIT OR Apache-2.0 | **none** |
 | [`hmac`](https://crates.io/crates/hmac) / [`pbkdf2`](https://crates.io/crates/pbkdf2) / [`digest`](https://crates.io/crates/digest) | Key derivation + MAC | MIT OR Apache-2.0 | **none** / **none** / **none** (`forbid`) |
-| [`constant_time_eq`](https://crates.io/crates/constant_time_eq) | Constant-time comparison | CC0-1.0 OR MIT-0 OR Apache-2.0 | 2 |
 | [`stringprep`](https://crates.io/crates/stringprep) | Password normalization | MIT OR Apache-2.0 | **none** |
 
 ## Opt-in dependencies (not in the default binary)
@@ -196,8 +221,7 @@ The `unsafe` column counts occurrences of the `unsafe` keyword in each crate's
 shipped `src/` (comments stripped; tests, benches and examples excluded) at the
 version resolved when the table was written. Read it as surface to review, not as
 risk. Most of it is in `hashbrown` and `bytemuck`, neither of which parses
-scanned bytes, and in `zerocopy` (with its derive macro), which `half` pulls
-in, and `moxcms`, which `image` does. There are
+scanned bytes, and in `moxcms`, which `image` pulls in. There are
 no raw-syscall binding crates: `rustix` and `linux-raw-sys` are kept out by
 [writing the spill file in-tree](#cli--runtime-exav) and by building `tar`
 without `xattr`. Reproduce the counts with `cargo geiger`, or per crate with:
@@ -215,17 +239,19 @@ find ~/.cargo/registry/src/*/<crate>-<version>/src -name '*.rs' -print0 \
 | [`anstyle`](https://crates.io/crates/anstyle) | MIT OR Apache-2.0 | 1 | `clap` |
 | [`anstyle-parse`](https://crates.io/crates/anstyle-parse) | MIT OR Apache-2.0 | 3 | `clap` |
 | [`anstyle-query`](https://crates.io/crates/anstyle-query) | MIT OR Apache-2.0 | 1 | `clap` |
-| [`arraydeque`](https://crates.io/crates/arraydeque) | MIT/Apache-2.0 | 77 | `unshield` |
+| [`aligned-vec`](https://crates.io/crates/aligned-vec) | MIT | 56 (the aligned allocation of the decoder's buffers) | `zenjxl-decoder` |
+| [`array-init`](https://crates.io/crates/array-init) | MIT OR Apache-2.0 | 4 | `zenjxl-decoder` |
 | [`ascii_tree`](https://crates.io/crates/ascii_tree) | MIT | **none** | `yara-x-parser` |
+| [`atomic_refcell`](https://crates.io/crates/atomic_refcell) | Apache-2.0 OR MIT | 14 | `zenjxl-decoder` |
 | [`beef`](https://crates.io/crates/beef) | MIT OR Apache-2.0 | 26 | `yara-x-parser` |
 | [`bit-vec`](https://crates.io/crates/bit-vec) | Apache-2.0 OR MIT | 4 | `bit-set` |
 | [`autocfg`](https://crates.io/crates/autocfg) | Apache-2.0 OR MIT | **none** | build-time: `num-traits` and its users |
-| [`bitflags`](https://crates.io/crates/bitflags) | MIT OR Apache-2.0 | 21 (two versions resolve: 19 + 2) | `delharc`, `ext4-view`, `fatfs`, `image`, `png`, `yara-x-parser` |
+| [`bitflags`](https://crates.io/crates/bitflags) | MIT OR Apache-2.0 | 19 | `delharc`, `image`, `png`, `pulldown-cmark`, `yara-x-parser` |
 | [`block-buffer`](https://crates.io/crates/block-buffer) | MIT OR Apache-2.0 | 21 | `digest`, `hmac`, `md-5`, `pbkdf2`, `sha1`, `sha2` |
 | [`block-padding`](https://crates.io/crates/block-padding) | MIT OR Apache-2.0 | **none** | `aes`, `cbc`, `des` |
 | [`bstr`](https://crates.io/crates/bstr) | MIT OR Apache-2.0 | 39 | `yara-x-parser` |
 | [`byteorder-lite`](https://crates.io/crates/byteorder-lite) | Unlicense OR MIT | 1 | `image` |
-| [`cfg-if`](https://crates.io/crates/cfg-if) | MIT OR Apache-2.0 | **none** | `crc32fast`, `flate2`, `half`, `image`, `md-5`, `png`, `sha1`, `sha2`, `tar`, `zip` |
+| [`cfg-if`](https://crates.io/crates/cfg-if) | MIT OR Apache-2.0 | **none** | `crc32fast`, `flate2`, `image`, `md-5`, `png`, `sha1`, `sha2`, `tar`, `zip` |
 | [`chrono`](https://crates.io/crates/chrono) | MIT OR Apache-2.0 | 11 | `delharc` |
 | [`cipher`](https://crates.io/crates/cipher) | MIT OR Apache-2.0 | **none** (`forbid`) | `aes`, `cbc`, `des` |
 | [`clap_builder`](https://crates.io/crates/clap_builder) | MIT OR Apache-2.0 | **none** (`forbid`) | `clap` |
@@ -235,20 +261,19 @@ find ~/.cargo/registry/src/*/<crate>-<version>/src -name '*.rs' -print0 \
 | [`color_quant`](https://crates.io/crates/color_quant) | MIT | **none** | `gif`, `image` |
 | [`colorchoice`](https://crates.io/crates/colorchoice) | MIT OR Apache-2.0 | **none** | `clap` |
 | [`const-oid`](https://crates.io/crates/const-oid) | Apache-2.0 OR MIT | 1 | `digest`, `hmac`, `md-5`, `pbkdf2`, `sha1`, `sha2` |
+| [`core_detect`](https://crates.io/crates/core_detect) | MIT/Apache-2.0 | 7 | `encoding_rs`, on x86 and x86-64 |
 | [`countme`](https://crates.io/crates/countme) | MIT OR Apache-2.0 | 1 | `yara-x-parser` |
 | [`cpubits`](https://crates.io/crates/cpubits) | MIT OR Apache-2.0 | **none** | `aes` |
 | [`cpufeatures`](https://crates.io/crates/cpufeatures) | MIT OR Apache-2.0 | 11 | `aes`, `sha1`, `sha2` |
-| [`crc`](https://crates.io/crates/crc) | MIT OR Apache-2.0 | **none** (`forbid`) | `ext4-view` |
-| [`crc-catalog`](https://crates.io/crates/crc-catalog) | MIT OR Apache-2.0 | **none** (`forbid`) | `ext4-view` |
 | [`crypto-common`](https://crates.io/crates/crypto-common) | MIT OR Apache-2.0 | **none** (`forbid`) | `aes`, `cbc`, `des`, `digest`, `hmac`, `md-5`, `pbkdf2`, `sha1`, `sha2` |
 | [`ctutils`](https://crates.io/crates/ctutils) | Apache-2.0 OR MIT | **none** (`forbid`) | `digest`, `hmac`, `md-5`, `pbkdf2`, `sha1`, `sha2` |
 | [`either`](https://crates.io/crates/either) | MIT OR Apache-2.0 | 2 | `yara-x-parser` |
+| [`enough`](https://crates.io/crates/enough) | MIT OR Apache-2.0 | **none** (`forbid`) | `zenjxl-decoder` |
 | [`equivalent`](https://crates.io/crates/equivalent) | Apache-2.0 OR MIT | **none** | `mail-parser`, `yara-x-parser`, `zip` |
-| [`explode`](https://crates.io/crates/explode) | MIT | 5 | `unshield` |
 | [`fax_derive`](https://crates.io/crates/fax_derive) | MIT | **none** | `fax` |
 | [`fdeflate`](https://crates.io/crates/fdeflate) | MIT OR Apache-2.0 | **none** (`forbid`) | `image`, `png` |
 | [`filetime`](https://crates.io/crates/filetime) | MIT/Apache-2.0 | 9 | `tar` |
-| [`fnv`](https://crates.io/crates/fnv) | Apache-2.0 / MIT | **none** | `cfb`, `yara-x-parser` |
+| [`fnv`](https://crates.io/crates/fnv) | Apache-2.0 / MIT | **none** | `yara-x-parser` |
 | [`hashbrown`](https://crates.io/crates/hashbrown) | MIT OR Apache-2.0 | 751 (two versions resolve: 450 + 301) | `mail-parser`, `yara-x-parser`, `zip` |
 | [`hashify`](https://crates.io/crates/hashify) | Apache-2.0 OR MIT | **none** | `mail-parser` |
 | [`hayro-ccitt`](https://crates.io/crates/hayro-ccitt) | Apache-2.0 OR MIT | **none** (`forbid`) | `hayro-jbig2` |
@@ -262,46 +287,55 @@ find ~/.cargo/registry/src/*/<crate>-<version>/src -name '*.rs' -print0 \
 | [`itertools`](https://crates.io/crates/itertools) | MIT OR Apache-2.0 | 10 | `yara-x-parser` |
 | [`itoa`](https://crates.io/crates/itoa) | MIT OR Apache-2.0 | 13 | `serde_json` |
 | [`lazy_static`](https://crates.io/crates/lazy_static) | MIT OR Apache-2.0 | 2 | `yara-x-parser` |
-| [`log`](https://crates.io/crates/log) | MIT OR Apache-2.0 | 6 | `fatfs`, `goblin` |
+| [`log`](https://crates.io/crates/log) | MIT OR Apache-2.0 | 6 | `goblin` |
 | [`logos`](https://crates.io/crates/logos) | MIT OR Apache-2.0 | 18 | `yara-x-parser` |
 | [`logos-codegen`](https://crates.io/crates/logos-codegen) | MIT OR Apache-2.0 | 4 | `yara-x-parser` |
 | [`logos-derive`](https://crates.io/crates/logos-derive) | MIT OR Apache-2.0 | **none** | `yara-x-parser` |
 | [`miniz_oxide`](https://crates.io/crates/miniz_oxide) | MIT OR Zlib OR Apache-2.0 | **none** (`forbid`; two versions resolve) | `flate2`, `image`, `png`, `zip` |
 | [`moxcms`](https://crates.io/crates/moxcms) | BSD-3-Clause OR Apache-2.0 | 344 | `image` |
+| [`multiversion_no_op`](https://crates.io/crates/multiversion_no_op) | Apache-2.0 OR MIT | **none** | `encoding_rs` |
 | [`no_std_io2`](https://crates.io/crates/no_std_io2) | Apache-2.0 OR MIT | 11 | `bitstream-io`, `zip` |
+| [`num-derive`](https://crates.io/crates/num-derive) / [`paste`](https://crates.io/crates/paste) | MIT OR Apache-2.0 | **none** / **none** | `zenjxl-decoder` |
 | [`num-traits`](https://crates.io/crates/num-traits) | MIT OR Apache-2.0 | 1 | `delharc`, `image`, `rmp`, `rmp-serde`, `yara-x-parser` |
 | [`plain`](https://crates.io/crates/plain) | MIT/Apache-2.0 | 23 | `goblin` |
-| [`proc-macro2`](https://crates.io/crates/proc-macro2) | MIT OR Apache-2.0 | 6 | `apfs`, `clap`, `fax`, `goblin`, `half`, `hfsplus`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
+| [`proc-macro2`](https://crates.io/crates/proc-macro2) | MIT OR Apache-2.0 | 6 | `clap`, `fax`, `goblin`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
 | [`pxfm`](https://crates.io/crates/pxfm) | BSD-3-Clause OR Apache-2.0 | 224 | `image` |
 | [`qoi`](https://crates.io/crates/qoi) | MIT/Apache-2.0 | **none** (`forbid`) | `image` |
-| [`quote`](https://crates.io/crates/quote) | MIT OR Apache-2.0 | **none** | `apfs`, `clap`, `fax`, `goblin`, `half`, `hfsplus`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
+| [`quote`](https://crates.io/crates/quote) | MIT OR Apache-2.0 | **none** | `clap`, `fax`, `goblin`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
 | [`rowan`](https://crates.io/crates/rowan) | MIT OR Apache-2.0 | 55 | `yara-x-parser` |
 | [`rustc-hash`](https://crates.io/crates/rustc-hash) | Apache-2.0 OR MIT | **none** | a second version (1.x) for `yara-x-parser` |
 | [`rustc_version`](https://crates.io/crates/rustc_version) | MIT OR Apache-2.0 | **none** | build-time: `yara-x-parser` |
+| [`rustversion`](https://crates.io/crates/rustversion) | MIT OR Apache-2.0 | 1 | build-time: `encoding_rs` |
 | [`same-file`](https://crates.io/crates/same-file) | Unlicense/MIT | 3 | `walkdir` |
+| [`scopeguard`](https://crates.io/crates/scopeguard) | MIT OR Apache-2.0 | 3 | `encoding_rs` |
 | [`scroll`](https://crates.io/crates/scroll) | MIT | 7 | `goblin` |
 | [`scroll_derive`](https://crates.io/crates/scroll_derive) | MIT | 1 | `goblin` |
 | [`semver`](https://crates.io/crates/semver) | MIT OR Apache-2.0 | 47 | build-time: `yara-x-parser` |
 | [`serde_core`](https://crates.io/crates/serde_core) | MIT OR Apache-2.0 | 2 | `rmp-serde`, `serde`, `serde_json` |
 | [`serde_derive`](https://crates.io/crates/serde_derive) | MIT OR Apache-2.0 | **none** | `rmp-serde`, `serde` |
 | [`simd-adler32`](https://crates.io/crates/simd-adler32) | MIT | 36 | `flate2`, `image`, `png`, `zip` |
+| [`simdutf8`](https://crates.io/crates/simdutf8) | MIT OR Apache-2.0 | 135 (SIMD UTF-8 validation, on x86, x86-64, aarch64 and wasm32 with `simd128`) | `encoding_rs` |
 | [`strsim`](https://crates.io/crates/strsim) | MIT | **none** (`forbid`) | `clap` |
-| [`syn`](https://crates.io/crates/syn) | MIT OR Apache-2.0 | 152 (two versions resolve: 71 + 81) | `apfs`, `clap`, `fax`, `goblin`, `half`, `hfsplus`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
+| [`syn`](https://crates.io/crates/syn) | MIT OR Apache-2.0 | 152 (two versions resolve: 71 + 81) | `clap`, `fax`, `goblin`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
 | [`text-size`](https://crates.io/crates/text-size) | MIT OR Apache-2.0 | **none** (`forbid`) | `yara-x-parser` |
-| [`thiserror-impl`](https://crates.io/crates/thiserror-impl) | MIT OR Apache-2.0 | 1 | `apfs`, `hfsplus`, `lznt1`, `thiserror` |
-| [`twox-hash`](https://crates.io/crates/twox-hash) | MIT | 72 | `ruzstd` |
+| [`thiserror-impl`](https://crates.io/crates/thiserror-impl) | MIT OR Apache-2.0 | 1 | `lznt1`, `thiserror` |
 | [`typed-path`](https://crates.io/crates/typed-path) | MIT OR Apache-2.0 | 32 | `zip` |
 | [`typenum`](https://crates.io/crates/typenum) | MIT OR Apache-2.0 | **none** (`forbid`) | `aes`, `cbc`, `des`, `digest`, `hmac`, `md-5`, `pbkdf2`, `sha1`, `sha2` |
+| [`unicase`](https://crates.io/crates/unicase) | MIT OR Apache-2.0 | **none** | `pulldown-cmark` |
 | [`unicode-bidi`](https://crates.io/crates/unicode-bidi) | MIT OR Apache-2.0 | 1 | `stringprep` |
-| [`unicode-ident`](https://crates.io/crates/unicode-ident) | (MIT OR Apache-2.0) AND Unicode-3.0 | 2 | `apfs`, `clap`, `fax`, `goblin`, `half`, `hfsplus`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
+| [`unicode-ident`](https://crates.io/crates/unicode-ident) | (MIT OR Apache-2.0) AND Unicode-3.0 | 2 | `clap`, `fax`, `goblin`, `lznt1`, `mail-parser`, `rmp-serde`, `serde`, `thiserror`, `yara-x-parser` |
 | [`unicode-normalization`](https://crates.io/crates/unicode-normalization) | MIT OR Apache-2.0 | 5 | `stringprep` |
 | [`unicode-properties`](https://crates.io/crates/unicode-properties) | MIT/Apache-2.0 | **none** | `stringprep` |
 | [`utf8parse`](https://crates.io/crates/utf8parse) | Apache-2.0 OR MIT | 1 | `clap` |
-| [`uuid`](https://crates.io/crates/uuid) | Apache-2.0 OR MIT | 15 | `cfb` |
-| [`web-time`](https://crates.io/crates/web-time) | MIT OR Apache-2.0 | **none** | `cfb` |
-| [`zerocopy`](https://crates.io/crates/zerocopy) | BSD-2-Clause OR Apache-2.0 OR MIT | 482 | `half` |
-| [`zerocopy-derive`](https://crates.io/crates/zerocopy-derive) | BSD-2-Clause OR Apache-2.0 OR MIT | 807 | `half` |
 | [`zmij`](https://crates.io/crates/zmij) | MIT | 70 | `serde_json` |
+| [`phf`](https://crates.io/crates/phf) / `phf_shared` (two versions of each resolve) | MIT | **none** / 1 | `hayro-interpret` |
+| [`smallvec`](https://crates.io/crates/smallvec) | MIT OR Apache-2.0 | 80 | `hayro-syntax`, `hayro-interpret`, `kurbo` |
+| [`hayro-cmap`](https://crates.io/crates/hayro-cmap) / [`hayro-postscript`](https://crates.io/crates/hayro-postscript) | Apache-2.0 OR MIT | **none** (`forbid`) / **none** (`forbid`) | `hayro-interpret` |
+| [`kurbo`](https://crates.io/crates/kurbo) / `polycool` / [`arrayvec`](https://crates.io/crates/arrayvec) | Apache-2.0 OR MIT / MIT OR Apache-2.0 / MIT OR Apache-2.0 | **none** / **none** / 52 | `hayro-interpret` |
+| [`skrifa`](https://crates.io/crates/skrifa) / `read-fonts` | MIT OR Apache-2.0 | **none** (`forbid`) / **none** (`forbid`) | `hayro-interpret` (reads the PDF's embedded fonts) |
+| [`font-types`](https://crates.io/crates/font-types) / `bytemuck_derive` | MIT OR Apache-2.0 / Zlib OR Apache-2.0 OR MIT | 3 / 7 | `read-fonts` |
+| [`yoke`](https://crates.io/crates/yoke) / `yoke-derive` / `zerofrom` / `zerofrom-derive` / `stable_deref_trait` | Unicode-3.0 (and MIT OR Apache-2.0) | 91 / 11 / **none** / **none** / 28 | `read-fonts`, `skrifa` |
+| [`fastrand`](https://crates.io/crates/fastrand) | Apache-2.0 OR MIT | **none** (`forbid`) | `phf_generator` (build time) |
 
 ## Verifying this yourself
 
diff --git a/www/src/content/docs/project/formats.md b/www/src/content/docs/project/formats.md
new file mode 100644
index 00000000..d90e4b4d
--- /dev/null
+++ b/www/src/content/docs/project/formats.md
@@ -0,0 +1,193 @@
+---
+title: Format matrix
+description: Which of exav's tools reads each file format, the scanner, the extractor or the viewer, and whether the extractor streams it or reads it whole.
+---
+
+<!-- Generated from formats/registry.json by scripts/formats.mjs: edit the registry. -->
+
+One table for "can exav handle my file": for each format, what the
+[scanner](/scanner/reference/formats/) does with it, whether the
+[extractor](/unpack/formats/) streams it or reads it whole (a format read
+whole is held in memory up to the buffer limit), and which plugin of the
+[viewer](/viewer/) opens it. The pages of each tool have the detail:
+codecs, encryption, limits.
+
+- **Scanner.** opened, and every member scanned; recognised and reported UNSCANNABLE or PASSWORD-PROTECTED, not opened; scanned through a text view as well as its bytes; typed by its content, its signatures applied; no type of its own.
+- **Extractor.** *Streamed*: the members are decoded as they are read, at any size. *Read whole*: the container is read into memory first; *members streamed* says the members then come out one at a time. *Recognised, reported*: the format is told apart and the file is reported as not examined, never clean.
+- **Viewer.** The plugin, as `@exav/viewer` names it. *No*: the viewer does not open it.
+
+## Archives and compressed streams
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| ZIP | `.zip` | Opened, members scanned | Streamed | `archive` |
+| Packages that are ZIP files (JAR, APK, IPA, wheel, NuGet, VSIX, MSIX...) | `.jar` `.war` `.ear` `.apk` `.apks` `.xapk` `.aab` `.ipa` `.xpi` `.whl` `.nupkg` `.vsix` `.kmz` `.appx` `.appxbundle` `.msix` `.msixbundle` | Opened, members scanned | Streamed | `archive` |
+| First part of a split archive (.7z.001, .zip.001, .rar.001, .tar.001, .z01) | `.7z.001` `.zip.001` `.rar.001` `.tar.001` `.z01` | Opened, members scanned | Streamed | `archive` |
+| Comic book archives (CBZ, CBR, CB7, CBT) | `.cbz` `.cbr` `.cb7` `.cbt` | Opened, members scanned | Streamed | `archive` |
+| gzip | `.gz` `.tgz` | Opened, members scanned | Streamed | `archive` |
+| bzip2 | `.bz2` `.tbz` `.tbz2` | Opened, members scanned | Streamed | `archive` |
+| xz | `.xz` `.txz` | Opened, members scanned | Streamed | `archive` |
+| Zstandard | `.zst` `.tzst` | Opened, members scanned | Streamed | `archive` |
+| LZ4 | `.lz4` | Opened, members scanned | Streamed | `archive` |
+| LZMA (.lzma) | `.lzma` | Opened, members scanned | Streamed | `archive` |
+| RPM package | `.rpm` | Opened, members scanned | Streamed | `archive` |
+| lzip | `.lz` `.tlz` | Opened, members scanned | Streamed | `archive` |
+| Unix compress (.Z) | `.z` `.taz` | Opened, members scanned | Streamed | `archive` |
+| tar | `.tar` | Opened, members scanned | Streamed | `archive` |
+| 7z | `.7z` | Opened, members scanned | Streamed | `archive` |
+| RAR (RAR3 and RAR5) | `.rar` | Opened, members scanned | Read whole | `archive` |
+| Cabinet (CAB) | `.cab` | Opened, members scanned | Streamed | `archive` |
+| Compiled HTML Help (CHM) | `.chm` | Opened, members scanned | Read whole | `archive` |
+| LHA / LZH | `.lzh` `.lha` | Opened, members scanned | Streamed | `archive` |
+| ARJ | `.arj` | Opened, members scanned | Read whole | `archive` |
+| ar (static libraries, Debian packages) | `.ar` `.a` `.deb` `.udeb` | Opened, members scanned | Streamed | `archive` |
+| cpio (RPM payloads, initramfs) | `.cpio` | Opened, members scanned | Streamed | `archive` |
+| xar (macOS packages) | `.xar` `.pkg` `.xip` | Opened, members scanned | Streamed | `archive` |
+| ZOO | `.zoo` | Opened, members scanned | Read whole | `archive` |
+| ARC / PKARC / PAK | `.arc` | Opened, members scanned | Read whole | `archive` |
+| ALZ | `.alz` | Opened, members scanned | Read whole | `archive` |
+| EGG | `.egg` | Opened, members scanned | Read whole | `archive` |
+| InstallShield .z |  | Opened, members scanned | Read whole | No |
+| MS-Compress (SZDD, KWAJ) |  | Opened, members scanned | Streamed | No |
+| ACE | `.ace` | Reported, not opened | Recognised, reported | No |
+| StuffIt and StuffIt X | `.sit` `.sitx` | Reported, not opened | Recognised, reported | No |
+| InstallShield InstallScript cabinet |  | Reported, not opened | Recognised, reported | No |
+| CryptFF |  | Reported, not opened | Recognised, reported | No |
+| lrzip | `.lrz` | Reported, not opened | Recognised, reported | No |
+| AppleSingle and AppleDouble |  | Reported, not opened | Recognised, reported | No |
+
+## Disk images and filesystems
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| ISO 9660 and UDF | `.iso` | Opened, members scanned | Streamed | `archive` |
+| Apple disk image (DMG) | `.dmg` | Opened, members scanned | Streamed | `archive` |
+| VHD | `.vhd` | Opened, members scanned | Streamed | `archive` |
+| VHDX | `.vhdx` | Opened, members scanned | Streamed | `archive` |
+| VMDK (and OVA) | `.vmdk` `.ova` | Opened, members scanned | Streamed | `archive` |
+| QCOW2 | `.qcow2` | Opened, members scanned | Streamed | `archive` |
+| Windows imaging (WIM, ESD) | `.wim` `.esd` | Opened, members scanned | Streamed | `archive` |
+| Partition maps (GPT, APM, MBR) and raw disk images | `.img` | Opened, members scanned | Streamed | `archive` |
+| FAT12, FAT16, FAT32 |  | Opened, members scanned | Streamed | No |
+| NTFS |  | Opened, members scanned | Streamed | No |
+| ext2, ext3, ext4 |  | Opened, members scanned | Streamed | No |
+| exFAT |  | Opened, members scanned | Streamed | No |
+| SquashFS | `.squashfs` `.sqfs` `.snap` | Opened, members scanned | Streamed | No |
+| cramfs | `.cramfs` | Opened, members scanned | Streamed | No |
+| romfs | `.romfs` | Opened, members scanned | Streamed | No |
+| EROFS | `.erofs` | Opened, members scanned | Streamed | No |
+
+## Installers, self-extractors and packers
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| InstallShield MSI |  | Reported, not opened | Recognised, reported | No |
+| NSIS installer |  | Opened, members scanned | Read whole | No |
+| Inno Setup installer |  | Reported, not opened | Recognised, reported | No |
+| Self-extracting archives |  | Opened, members scanned | Streamed | No |
+| AutoIt compiled scripts |  | Opened, members scanned | Read whole | No |
+| UPX-packed executables |  | Opened, members scanned | Read whole | No |
+| Other packed PE executables |  | Opened, members scanned | Read whole | No |
+| Mach-O universal binaries |  | Opened, members scanned | Streamed | No |
+
+## Documents
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| OLE2 compound files (legacy Office, MSI) |  | Opened, members scanned | Read whole | No |
+| PDF | `.pdf` | Opened, members scanned | Read whole | `pdf` |
+| Word (DOCX) | `.docx` `.docm` `.dotx` | Opened, members scanned | Streamed | `docx` |
+| Excel (XLSX) | `.xlsx` `.xlsm` | Opened, members scanned | Streamed | `xlsx` |
+| PowerPoint (PPTX) | `.pptx` `.pptm` `.ppsx` `.potx` | Opened, members scanned | Streamed | `pptx` |
+| Word 6 to 2003 (DOC) | `.doc` `.dot` | Scanned with its text | Read whole | `doc` |
+| Excel 4 to 2003 (XLS) | `.xls` `.xlt` | Scanned with its text | Read whole | `xls` |
+| PowerPoint 95 to 2003 (PPT) | `.ppt` `.pps` `.pot` | Scanned with its text | Read whole | `ppt` |
+| RTF | `.rtf` | Scanned with its text | Read whole | `rtf` |
+| OpenDocument text (ODT) | `.odt` `.ott` `.fodt` | Scanned with its text | Streamed | `odt` |
+| OpenDocument spreadsheet (ODS) | `.ods` `.ots` `.fods` | Scanned with its text | Streamed | `ods` |
+| OpenDocument presentation (ODP) | `.odp` `.otp` `.fodp` | Scanned with its text | Streamed | `odp` |
+| Keynote | `.key` | Scanned with its text | Streamed | `keynote` |
+| Numbers | `.numbers` | Scanned with its text | Streamed | `numbers` |
+| Pages | `.pages` | Scanned with its text | Streamed | No |
+| CSV and TSV | `.csv` `.tsv` | Scanned with its text | No | `csv` |
+| Visio | `.vsd` `.vst` `.vdx` `.vtx` `.vsdx` `.vsdm` `.vstx` `.vstm` | Bytes only | No | `visio` |
+| CorelDRAW | `.cdr` `.cmx` | Bytes only | No | `coreldraw` |
+| Publisher | `.pub` | Opened, members scanned | Read whole | `publisher` |
+| PageMaker 6 to 7 | `.pmd` `.pm6` `.p65` | Bytes only | No | `pagemaker` |
+| FreeHand 3 to 11 | `.fh` `.fh3` `.fh4` `.fh5` `.fh7` `.fh8` `.fh9` `.fh10` `.fh11` | Bytes only | No | `freehand` |
+| QuarkXPress 3.1 to 4.1 | `.qxd` `.qxt` | Bytes only | No | `quarkxpress` |
+| Zoner Draw 4 and 5 | `.zmf` | Bytes only | No | `zonerdraw` |
+| WordPerfect Graphics 1 and 2 | `.wpg` | Bytes only | No | `wpg` |
+| Hangul Word Processor 3 (HWP3) | `.hwp` | Opened, members scanned | Read whole | No |
+| OneNote | `.one` | Opened, members scanned | Streamed | No |
+| Adobe XDP | `.xdp` | Opened, members scanned | Read whole | No |
+
+## Mail and encodings
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| TNEF (winmail.dat) | `winmail.dat` `.tnef` | Opened, members scanned | Streamed | `archive` |
+| Email (MIME) and MHTML | `.eml` `.mht` `.mhtml` | Opened, members scanned | Read whole | No |
+| BinHex | `.hqx` | Opened, members scanned | Read whole | No |
+| uuencode | `.uu` | Opened, members scanned | Read whole | No |
+
+## Images
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| PNG, JPEG, GIF, WebP and SVG | `.png` `.jpg` `.jpeg` `.webp` `.gif` `.svg` | Typed, signatures applied | No | `image` |
+| TIFF | `.tif` `.tiff` | Typed, signatures applied | No | `image` |
+| BMP | `.bmp` | Typed, signatures applied | No | `image` |
+| ICO, PNM, QOI, DDS, farbfeld, Radiance HDR | `.ico` `.cur` `.pbm` `.pgm` `.ppm` `.pnm` `.pam` `.qoi` `.dds` `.ff` `.hdr` | Typed, signatures applied | No | `image` |
+| Targa (TGA) | `.tga` `.icb` | Bytes only | No | `image` |
+| JPEG 2000 | `.jp2` `.jpf` `.jpx` `.j2k` `.j2c` | Typed, signatures applied | No | `image` |
+| JBIG2 | `.jb2` `.jbig2` | Typed, signatures applied | No | `image` |
+| JPEG XL | `.jxl` | Typed, signatures applied | No | `image` |
+| Camera RAW (DNG, CR2, CR3, NEF, ARW, ORF, RW2, RAF, PEF...) | `.dng` `.gpr` `.cr2` `.cr3` `.crw` `.nef` `.nrw` `.arw` `.sr2` `.srf` `.orf` `.ori` `.rw2` `.rwl` `.raw` `.raf` `.pef` `.srw` `.3fr` `.fff` `.iiq` `.x3f` `.mrw` `.dcr` `.kdc` `.erf` `.mef` `.mos` | Typed, signatures applied | No | `image` |
+| HEIC and HEIF | `.heic` `.heif` | Typed, signatures applied | No | No |
+
+## Drawings and 3D models
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| OpenDocument drawing (ODG) | `.odg` `.otg` `.fodg` | Scanned with its text | Streamed | `odg` |
+| AutoCAD DWG | `.dwg` | Opened, members scanned | Read whole | `dwg` |
+| AutoCAD DXF | `.dxf` | Opened, members scanned | Read whole | `dxf` |
+| IFC | `.ifc` | Bytes only | No | `ifc` |
+| STL | `.stl` | Bytes only | No | `stl` |
+| Wavefront OBJ | `.obj` | Bytes only | No | `obj` |
+| Stanford PLY | `.ply` | Bytes only | No | `ply` |
+| glTF 2.0 (GLTF, GLB) | `.gltf` `.glb` | Bytes only | No | `gltf` |
+
+## Video and audio
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| Video (MP4, MOV, WebM, Ogg) | `.mp4` `.m4v` `.mov` `.webm` `.ogv` | Bytes only | No | `video` |
+| Audio (MP3, M4A, AAC, WAV, Ogg, Opus, FLAC) | `.mp3` `.m4a` `.aac` `.wav` `.ogg` `.oga` `.opus` `.flac` | Bytes only | No | `audio` |
+
+## Text and code
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| Markdown | `.md` `.markdown` | Scanned with its text | No | `text` |
+| JSON | `.json` `.geojson` | Typed, signatures applied | No | `text` |
+| XML (and RSS, KML, GPX, plist...) | `.xml` `.xsd` `.xsl` `.xslt` `.rss` `.atom` `.kml` `.gpx` `.rdf` `.wsdl` `.plist` | Typed, signatures applied | No | `text` |
+| HTML | `.html` `.htm` `.xhtml` | Scanned with its text | No | `text` |
+| Diffs and patches | `.diff` `.patch` | Typed, signatures applied | No | `text` |
+| Plain text, logs, configuration, subtitles | `.txt` `.text` `.log` `.jsonl` `.ndjson` `.srt` `.vtt` `.yaml` `.yml` `.toml` `.ini` `.cfg` `.conf` `.properties` | Typed, signatures applied | No | `text` |
+| Source code | `.js` `.mjs` `.cjs` `.jsx` `.ts` `.tsx` `.mts` `.cts` `.css` `.scss` `.py` `.sh` `.bash` `.zsh` `.bat` `.ps1` `.c` `.h` `.cc` `.cpp` `.hpp` `.cs` `.rs` `.go` `.java` `.kt` `.swift` `.rb` `.php` `.pl` `.lua` `.sql` | Typed, signatures applied | No | `text` |
+
+## Executables and other carriers
+
+| Format | Extensions | Scanner | Extractor | Viewer |
+|---|---|---|---|---|
+| Windows executables (PE) | `.exe` `.dll` `.sys` | Typed, signatures applied | No | No |
+| ELF |  | Typed, signatures applied | No | No |
+| Mach-O |  | Typed, signatures applied | No | No |
+| Windows shortcuts (LNK) | `.lnk` | Opened, members scanned | Read whole | No |
+| Python bytecode (.pyc) | `.pyc` | Opened, members scanned | Streamed | No |
+| Java class files | `.class` | Opened, members scanned | Read whole | No |
+| SWF (Flash) | `.swf` | Opened, members scanned | Streamed | No |
+| AI models (pickle, safetensors) | `.pkl` `.safetensors` | Opened, members scanned | Read whole | No |
+| Microsoft Script Encoder | `.vbe` `.jse` | Opened, members scanned | Read whole | No |
diff --git a/www/src/content/docs/project/license.md b/www/src/content/docs/project/license.md
index b30d5a0a..5bc98435 100644
--- a/www/src/content/docs/project/license.md
+++ b/www/src/content/docs/project/license.md
@@ -25,6 +25,14 @@ primitives and the `webpki-roots` certificate store. Among the rest:
 - exav also contains code ported or derived from permissively licensed projects
   (RAR, AZO, CAB, DMG, PPMd and bzip2 decoders among them, the HWP3 layout, and
   `iced-x86`'s generated decoder tables), each attributed in `NOTICE`.
+- exav-render's office converters (spreadsheets, presentations, text
+  documents) are written from published specifications, among them
+  Microsoft's Open Specifications and the OASIS OpenDocument standard, and
+  from what other converters do with sample files, used as a black box. No code
+  of another office application is in them. The specifications, the tables and
+  message layouts taken from MIT-licensed projects (numbers-parser and
+  keynote-parser), and the test fixtures are listed in
+  [`crates/exav-render/NOTICE`](https://github.com/sylvinus/exav/blob/main/crates/exav-render/NOTICE).
 - The WASM sandbox runs exav under a WASI runtime you provide, under its own
   license; exav does not bundle it. See the [WASM sandbox guide](/scanner/guides/wasm-sandbox/).
 
diff --git a/www/src/content/docs/project/roadmap.md b/www/src/content/docs/project/roadmap.md
index 5c136617..5e244dd0 100644
--- a/www/src/content/docs/project/roadmap.md
+++ b/www/src/content/docs/project/roadmap.md
@@ -1,6 +1,6 @@
 ---
 title: Roadmap
-description: What's next for exav, from signature-matching performance and one read pass for large files to broader bytecode coverage, streaming RAR, multi-volume archives, JPEG XL in the viewer and less dependency unsafe.
+description: What's next for exav, from signature-matching performance and one read pass for large files to broader bytecode coverage, streaming RAR, multi-volume archives, the viewer's Office converters, document text search and less dependency unsafe.
 ---
 
 exav is beta and `0.0.x`: any release may change behaviour or APIs. What has
@@ -29,7 +29,7 @@ The exceptions are the documented detection gaps: unimplemented
   `inflate`) come first, with differential validation against `clamscan`.
 - **Extended and continuous fuzzing**, and a large no-silent-skip CI suite.
 
-## Large files: fewer passes, PE structure
+## Large files: fewer passes, PE structure, HTTP
 
 A file larger than `--max-object-bytes` gets the full engine, read through a
 block cache (see [Streaming & memory](/scanner/concepts/streaming-memory/)). Two things
@@ -44,13 +44,21 @@ remain:
   is `LIMITS-EXCEEDED` unless something is found. Reading only the headers and
   sections would cover the common case of a small executable with a large
   overlay. YARA's `pe`, `elf` and `dotnet` modules have the same limit.
+- **A spill file for `exav-grep`.** A container inside a member longer than
+  `--max-object-bytes` is reported unreadable, because opening it takes
+  somewhere to write it.
+- **HTTP sources.** A scan over HTTP has no timeout of its own, follows
+  redirects without filtering where they lead, and does not check that the
+  object stays the same between range requests (see
+  [HTTP sources](/scanner/concepts/streaming-memory/#http-sources)).
 
 ## Streaming the containers read whole
 
-Most containers, DMG disk images included, are walked member by member off the
-source, so peak memory is one member rather than the whole decoded object (see
-[how extraction works](/unpack/how-it-works/)). RAR, 7z, OLE, the virtual
-disks and filesystems, and a few others are still read whole (see
+Most containers, disk images and filesystems included, are walked member by
+member off the source, so peak memory is one member rather than the whole
+decoded object (see [how extraction works](/unpack/how-it-works/)), the files
+of a disk image or an archive past `--max-object-bytes` through a spill file.
+RAR, OLE, CHM, ARJ, email and a few others are still read whole (see
 [Supported formats](/scanner/reference/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)):
 past `--max-object-bytes` their own bytes get the full scan but their members are
 not extracted, and the file is `LIMITS-EXCEEDED` unless something is found.
@@ -71,20 +79,15 @@ bounded object, so streaming it would save little memory; raising
   counted, so the list of what to add is measured.
 - Verifying Authenticode signatures cryptographically. Parsing, digest checks
   and `.crb` matching exist today.
-- **Joining format-aware volume sets**: RAR `.partN`/`.rNN`, ZIP `.zNN`, and
-  multi-cabinet CAB. Byte-split sets (`x.7z.001`, `x.7z.002`, ...) are already
-  joined when their parts arrive together (see
-  [split archives](/scanner/guides/daemon/#split-archives)). A format-aware volume
-  carries its own headers and a member's data resumes past the next volume's
-  header, so the join belongs in the format's decoder. ClamAV does not join
-  them either; exav reports the split member and scans the part in the volume
-  it was given. Sibling volumes will only be looked for next to the scanned
-  file, under names generated from its own, as regular files (no symlinks). A
-  cabinet names its successor inside the file, so that name will be matched
-  against the directory listing and never opened as a path.
+- **Volume sets met inside a container.** RAR, ZIP and CAB volume sets are
+  joined when their volumes sit next to each other on disk, or arrive together
+  at the daemon (see [split archives](/scanner/guides/daemon/#split-archives)),
+  but not when the volumes are members of another archive: each is then scanned
+  on its own and the member continued in another volume is reported.
 - The unimplemented `Target:` values (internal, other, and ClamAV's reserved
-  slot 8), `EP` and section offsets on ELF and Mach-O files, and the unloaded
-  database extensions (`.cat`, `.ioc`, and the legacy `.sdb`/`.zmd`/`.rmd`).
+  slot 8), `EP` on Mach-O files (clamscan does not resolve it either), and the
+  unloaded database extensions (`.cat`, `.ioc`, and the legacy
+  `.sdb`/`.zmd`/`.rmd`).
   None appears in a stock official database; all matter for third-party feeds.
   See [Targets](/scanner/reference/comparison-with-clamav/#targets).
 
@@ -93,28 +96,45 @@ bounded object, so streaming it would save little memory; raising
 - QEMU/KVM dynamic detonation: a separate, heavyweight feature, only if there is
   demand.
 
-## File viewer: JPEG XL, after 0.0.2
-
-The viewer does not open JPEG XL yet. The decoder to build on is
-[`jxl`](https://crates.io/crates/jxl) (jxl-rs, the libjxl team's own,
-BSD-3-Clause), forked as a crate of exav's so that it can be
-`#![forbid(unsafe_code)]` like the other decoders the viewer runs:
-
-- **Without SIMD.** Its SIMD (347 `unsafe` sites) is behind features, and the
-  WebAssembly build does without it.
-- **Without the rest of its `unsafe`**, about 80 sites that no feature turns
-  off. Most are in the image buffers: allocation by hand, buffers
-  reinterpreted as another number type, rows sliced from raw pointers. They
-  become typed vectors. The others are unchecked indexing in the modular
-  predictor and the entropy decoder, a small-vector type and a few casts. Its
-  `array-init` and `byteorder` dependencies give way to the standard library.
-- **Checked** against libjxl's `djxl` on its conformance files, and fuzzed.
-- **In the viewer only,** in its WebAssembly image module: the scanner's image
-  hashing gains nothing from it, since ClamAV's image signatures do not cover
-  the format.
-
-The cost is speed (no SIMD, bounds checks), and following upstream, which
-releases about monthly, by hand.
+## Documents, search and the viewer
+
+The viewer opens JPEG XL (a fork of the libjxl team's jxl-rs, `forbid(unsafe_code)`
+and built without SIMD), camera RAW previews, and converts the old Office
+formats in the browser. What is not done:
+
+- **The text-document converter is a prototype.** On the project's test files,
+  32% of the pages of DOC files come out close to a reference rendering,
+  against 50% for DOCX drawn natively. Open decisions: falling back to the
+  external converter for what it reports unsupported (Pages '09, Word 1 and
+  2), making it the default even where an external converter is set, keeping
+  tracked changes in DOC, and Pages tables, pictures and headers.
+- **Presentations.** PowerPoint 2, 3 and 4 are recognised and reported
+  unsupported. PowerPoint 95 pictures, freeforms and arcs are left out. The
+  first slide could be drawn while the rest converts. Binary Visio, CorelDRAW,
+  Publisher and the other page layout formats are read only by an
+  [external converter](/viewer/integration/#the-external-converter).
+- **Searching documents.** `exav-grep --text` and the scanner's text view read
+  Markdown, HTML, the XML parts of Office and OpenDocument files, DXF and DWG,
+  and, behind opt-in features, PDF and the legacy and flat office formats.
+  Still to do: IFC names and property values, an email's headers, the
+  hyperlinks of OOXML files (apart from their labels), PDF link annotations,
+  the speaker notes of presentations, and matches located by page and by
+  drawing entity. PDF text and the office readers are not defaults because of
+  hayro's `unsafe` and the size of the readers. OCR for images and scanned
+  pages, and QR codes for the scanner, are proposed.
+- **Drawings and models.** DWG before R13 is reported unsupported. Large
+  drawings have no level of detail, annotative objects and linked images are
+  not resolved (external references are, from the files around the drawing),
+  and 3D is out of scope. IFC geometry has
+  [known gaps](/subprojects/exav-render/#ifc-and-stl-models). glTF with Draco
+  or meshopt, and PLY point clouds, are not drawn.
+- **Camera RAW.** The sensor data is never decoded, so a file with no preview
+  (most phones' DNG, Minolta MRW, CR3 whose preview is HEIF) shows an error.
+- **Other viewer gaps.** Replacing a document in a sandboxed frame starts the
+  zoom and position over. Archives left out on purpose: email, OLE
+  containers, OpenDocument and EPUB, packers and installers. Text previews
+  have no line numbers, tree view or search. The browser's own JPEG XL decoder
+  could spare the module's size where it exists.
 
 ## Hardening: less dependency `unsafe`
 
@@ -128,10 +148,11 @@ ongoing goal:
 - **Audit** each dependency's `unsafe` by reachability from a hostile-input scan
   path (the per-crate counts are done).
 - **Drop** dependencies exav does not need (done for `tar`'s `xattr`, which was
-  the largest source of syscall `unsafe`).
+  the largest source of syscall `unsafe`, for `half` and `zerocopy`, and for
+  zstd's checksum, `twox-hash`).
 - **Make safe** what can be: portable builds without SIMD where the speed cost is
-  acceptable, and vendoring then removing `unsafe` (the RAR PPMd decoder has
-  none).
+  acceptable, and vendoring then removing `unsafe` (the RAR PPMd, LZFSE and
+  InstallShield Z decoders have none).
 - **Reuse exav's own safe code** where it duplicates an `unsafe` dependency.
 - **Verify** the rest with `cargo-fuzz` and Miri (`make miri`), and document the
   containment (panic isolation, the prefork process boundary, the WASM build).
diff --git a/www/src/content/docs/scanner/concepts/design-principles.md b/www/src/content/docs/scanner/concepts/design-principles.md
index 2dc7ed92..ec9c9e9d 100644
--- a/www/src/content/docs/scanner/concepts/design-principles.md
+++ b/www/src/content/docs/scanner/concepts/design-principles.md
@@ -62,7 +62,7 @@ Where a deployment chooses that, with
 [`--partial-as ok`](/scanner/reference/cli/#what-an-unscannable-object-becomes), the
 choice is named per verdict and logged per object on stderr; the ICAP service
 also announces it at startup and keeps `X-Exav-Status: PARTIAL` in its response.
-The rule does not forbid accepting a risk; it forbids hiding one.
+The rule allows accepting a risk and forbids hiding one.
 
 ### Refusing empty coverage
 
diff --git a/www/src/content/docs/scanner/concepts/how-it-works.md b/www/src/content/docs/scanner/concepts/how-it-works.md
index fdf8b79e..ea2982c2 100644
--- a/www/src/content/docs/scanner/concepts/how-it-works.md
+++ b/www/src/content/docs/scanner/concepts/how-it-works.md
@@ -86,6 +86,13 @@ File type comes from the content, not the extension: an executable renamed
 `.jpg` is still scanned as an executable. The budgets every extraction runs
 under are in [How extraction works](/unpack/how-it-works/).
 
+A document is matched twice: as its bytes, and as the text a reader sees, a
+second view of the same object with its markup, escapes and run boundaries
+gone and each link followed by where it goes. That view is made by the
+`visible-text` feature, on by default; which documents it reads, and what
+happens when one cannot be read, is in
+[Supported formats](/scanner/reference/formats/#the-text-a-reader-sees).
+
 ## Signature types and runtime structures
 
 Different ClamAV signature types compile to different runtime structures rather
@@ -257,13 +264,11 @@ least as much) rules most objects out first.
 </svg>
 </div>
 
-Neither the sweep nor a check has a window to fall out of. The sweep reads the
-object once, in order, and looks up the few positions before a seam from the
-bytes on both sides of it, so an anchor split across a seam is found without
-re-reading the chunk. A check
-asks for the bytes it needs at their offset, before or after the hit, from
-memory or, past `--max-object-bytes`, from the
-[block cache](/scanner/concepts/streaming-memory/#past-it-through-a-block-cache).
+The sweep reads the object once, in order, and looks up the few positions before
+a seam from the bytes on both sides of it, so an anchor split across a seam is
+found without re-reading the chunk. A check asks for the bytes it needs at their
+offset, before or after the hit, from memory or, past `--max-object-bytes`, from
+the [block cache](/scanner/concepts/streaming-memory/#past-it-through-a-block-cache).
 
 Over an object not held in memory, regular expressions (PCRE subsignatures,
 YARA strings) run as lazy DFAs stepped through it, forward to find where a match
diff --git a/www/src/content/docs/scanner/concepts/quirks.md b/www/src/content/docs/scanner/concepts/quirks.md
index 028966e1..e55190cb 100644
--- a/www/src/content/docs/scanner/concepts/quirks.md
+++ b/www/src/content/docs/scanner/concepts/quirks.md
@@ -139,7 +139,12 @@ is a 1 KiB decoy and whose second holds the malware was a real false negative.
 **Appended archives** are carved too: ZIP, gzip, bzip2, xz, 7z, RAR and CAB
 magics after offset 0 (self-extractors, PE overlays, droppers that staple an
 archive onto a carrier). A carve that fails to decode is usually a chance byte
-run and is dropped rather than making the carrier `UNSCANNABLE`. The exception is
+run and is dropped rather than making the carrier `UNSCANNABLE`. A file that
+the magic at its start types as an archive (a PDF, a tar, a gzip, a bzip2) is
+not carved for magics, but a ZIP behind it is found by the record at the end of
+the file, which is how `unzip` finds it, and is scanned as the ZIP it is. An
+ISO 9660 or ext image whose first bytes are an archive's magic, in the space
+those formats leave free, is walked as the image too. The exception is
 an encrypted ZIP appended to a picture or a document whose central directory
 checks out: archive tools open such a polyglot through its trailing directory, so
 it is reported `PASSWORD-PROTECTED`.
@@ -292,9 +297,12 @@ detection. A macro sheet is a `BOUNDSHEET` record (`0x0085`) with sheet type 1,
 and the macros are `FORMULA` records holding `ptg` token streams in which built-in
 functions (`EXEC`, `CALL`, `ALERT`) are numeric ids. The bytes `EXEC` never
 appear in the file, so a byte-pattern signature for them cannot match. exav walks
-the record stream and produces an artifact with the macro-sheet names, the string
-constants and each formula's tokens with function ids decoded back to names, so
-signatures match the real calls and `--detect macros` fires for XLM as for VBA.
+the record stream with the reader the XLS converter uses and produces an artifact
+with the macro-sheet names, the defined names, the text cells and each formula as
+Excel shows it (`=EXEC("calc.exe")`), function ids decoded back to names, so
+signatures match the real calls and `--detect macros` fires for XLM as for VBA. A
+formula the reader cannot finish still gives the calls and strings it read before
+the token it could not.
 
 Other content that must be decoded before any signature can see it:
 
@@ -354,7 +362,10 @@ Which signatures meet which rendering follows clamscan, probed one signature
 at a time: `Target:3` and `Target:7` signatures match only the HTML and text
 renderings, never raw bytes; an HTML file has the HTML rendering and a text file
 the text one, not the other; `Target:4` (mail) signatures match a mail's raw
-bytes. An HTML signature on plain JavaScript is a match clamscan cannot make,
+bytes. The exception is the [visible text](/scanner/reference/feature-flags/) of
+a document (the `visible-text` feature, off under `--clamav-compat`): the words
+of an HTML page, a Markdown file or an Office part are also a text view, which
+`Target:7` signatures see. An HTML signature on plain JavaScript is a match clamscan cannot make,
 and one did fire on obfuscated npm code before. Java signatures (`Target:12`)
 are gated on the `cafebabe` magic because one fired on APK members, and the
 targets exav cannot positively identify are skipped (see
diff --git a/www/src/content/docs/scanner/concepts/streaming-memory.md b/www/src/content/docs/scanner/concepts/streaming-memory.md
index b2d625bc..41852264 100644
--- a/www/src/content/docs/scanner/concepts/streaming-memory.md
+++ b/www/src/content/docs/scanner/concepts/streaming-memory.md
@@ -15,6 +15,39 @@ parse it whole (below):
 
 What changes with size is where the file is while that runs.
 
+## Can a file be larger than the RAM?
+
+Most can. A file on disk is never loaded past `--max-object-bytes`, so what a
+scan holds does not grow with the file. The time does: a file past the limit is
+read several times over, and each pass goes through the whole signature
+database, so a 20 GB file takes minutes with a handful of signatures and longer
+with a full database. Served over HTTP and scanned with only the four built-in
+signatures, 20 GB objects of text, RAR, OLE and PDF took from 2 to 21 minutes
+and held 50 to 61 MB at their peak ([the figures](/scanner/guides/sizing/#what-this-host-scans-and-what-to-change-to-scan-more)).
+A real database is the larger part of the memory:
+[sizing a server](/scanner/guides/sizing/) works through a 4 GiB machine.
+
+What happens past `--max-object-bytes` (256 MiB), by kind of input:
+
+| Input | Held in memory | Needs disk | A 20 GB input |
+|---|---|---|---|
+| A file on disk: executable, script, document, raw disk or filesystem image | Block cache, 8 MiB | No | Every signature on its bytes is matched. A PE, ELF or .NET file is not [parsed](#past-it-through-a-block-cache), so the signatures and rules on its structure (sections, imports, YARA's `pe`, `elf` and `dotnet`) are not evaluated; if nothing is found, the verdict is `LIMITS-EXCEEDED` |
+| ZIP, tar, CAB, ISO, LHA, `ar`, cpio, 7z, WIM, xar, the single-stream compressors, self-extracting executables, and the formats built on them | One member, up to 256 MiB | Only for a member over 256 MiB, up to `--max-spill-bytes` (2 GiB) | Scanned member by member. A member past the spill ceiling, or any member with `--spill-dir off`, is not scanned and the file is `LIMITS-EXCEEDED`. A 7z folder with an encrypted coder or several packed streams (BCJ2) is decoded whole, under 256 MiB |
+| Disk images (VHD, VHDX, QCOW2, VMDK, DMG) and the filesystems inside them or on their own: FAT, exFAT, NTFS, ext, SquashFS, cramfs, romfs, EROFS, HFS+, APFS | A cache of up to 32 MiB (8 MiB for a raw image), and one file up to 256 MiB | Only for a file over 256 MiB, up to `--max-spill-bytes` (2 GiB) | Walked in place, each file read from where the volume has it, and one past 256 MiB goes to a spill file as a ZIP member does. A file stored compressed by the filesystem (HFS+, APFS, NTFS, EROFS) is decoded whole under the limit and reported past it. A raw image's own bytes are matched as part of the image |
+| RAR, OLE, PDF, CHM, ARJ, email and the other formats [read whole](/scanner/reference/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole) | Not held: the container is not opened | No | The file's own bytes are scanned, its members are not unpacked, and the result is `LIMITS-EXCEEDED` unless something is found. Raising `--max-object-bytes` to cover it takes that much RAM |
+| Stdin, `INSTREAM`, an ICAP body | 16 MiB | Yes: the stream is written to a temporary file to make it seekable | The first 2 GiB is scanned and the result is `LIMITS-EXCEEDED PARTIAL`. With `--spill-dir off`, the first 16 MiB. Raise `--max-spill-bytes` and give it the disk, or hand the daemon a path instead |
+| An `http(s)://` URL | See [HTTP sources](#http-sources) | No | Scanned in full, over the network about twice |
+
+Two other limits apply whatever the memory. `--max-scan-secs` stops a daemon
+job after 120 seconds by default (a one-shot run has no time limit), and a
+file past `--max-object-bytes` is read several times over, so a very large one
+can reach it. `--max-matcher-bytes` (10 GiB) counts what members and carved
+objects feed to the matcher, not the top-level file, so it did not stop the 20
+GiB file above. It does count the files of an archive or a disk image, and the
+holes of a sparse file, which read as zeros: an archive or image holding more
+than that is scanned as far as it, then reported `LIMITS-EXCEEDED`, and raising
+the limit takes it further.
+
 ## Up to `--max-object-bytes`: in memory
 
 A file up to `--max-object-bytes` (256 MiB by default) is read into memory, and
@@ -27,7 +60,7 @@ scanned in full.
 
 ## Past it: through a block cache
 
-A larger file is read through a cache of 64 KiB blocks, of which at most 8 MiB
+A larger file is read through a cache of 1 MiB blocks, of which at most 8 MiB
 are held, least recently used dropped first. So are an HTTP source of that size
 and a spill file (below). Verifying a match can still look anywhere in the
 file: the cache bounds what is held at once, not how far a check may reach, and
@@ -36,13 +69,14 @@ one, with the same results, only slower, since the file is read a few times
 over: once for format detection's search, carving and the digests (when a hash
 signature has its size), once for the signature sweep (every anchor at once),
 twice more for YARA's prefilter when rules are loaded, and again in the parts a
-check needs.
+check needs. [The block cache](#the-block-cache) below says how it works and
+what its three settings trade.
 
 <div class="diagram">
 <svg viewBox="0 0 790 392" role="img" aria-labelledby="bcn bcd" style="width:100%;height:auto;max-width:790px">
   <title id="bcn">One source, read through a block cache</title>
   <desc id="bcd">A file or an HTTP source past --max-object-bytes, or a spill
-  file, is read through a block cache of 64 KiB blocks holding 8 MiB. Every
+  file, is read through a block cache of 1 MiB blocks holding 8 MiB. Every
   check asks it for bytes at an offset: the signature sweep a chunk at a time
   in order, verification and the container walk at any offset, the regexes
   stepped through, the hashes, typing's search and carving in one shared pass.
@@ -85,7 +119,7 @@ check needs.
     <text x="93" y="66" text-anchor="middle">past --max-object-bytes</text>
     <text x="93" y="134" text-anchor="middle">past the limit too</text>
     <text x="93" y="202" text-anchor="middle">a large member or view</text>
-    <text x="345" y="136" text-anchor="middle">64 KiB blocks, 8 MiB held,</text>
+    <text x="345" y="136" text-anchor="middle">1 MiB blocks, 8 MiB held,</text>
     <text x="345" y="154" text-anchor="middle">least recently used dropped;</text>
     <text x="345" y="172" text-anchor="middle">bytes at any offset, or in</text>
     <text x="345" y="190" text-anchor="middle">1 MiB chunks in order</text>
@@ -116,8 +150,8 @@ A few things need the file whole and are not done past the limit:
 - YARA's `pe`, `elf` and `dotnet` modules;
 - a PCRE subsignature with a lookaround or a backreference, and the
   `fuzzy_img` image hash;
-- containers whose format is read whole (7z, RAR, OLE, PDF, the virtual-disk and
-  filesystem images and others; see
+- containers whose format is read whole (RAR, OLE, PDF, CHM, ARJ, email and
+  others; see
   [Supported formats](/scanner/reference/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)).
 
 A file for which one of these applied is reported `LIMITS-EXCEEDED`, naming
@@ -127,18 +161,133 @@ run, at the cost of memory.
 The normalised views of a large text file are as large as the file, so they go
 to a [spill file](#spill-files).
 
+## The block cache
+
+Picture a window of a few large blocks sliding over the object, with a short
+memory of the blocks it has just left.
+
+- **What it is.** Each object read in place (a file, an HTTP source, a spill
+  file) has one cache. It cuts the object into aligned blocks of
+  `--object-cache-block-bytes` (1 MiB) and keeps up to `--object-cache-bytes`
+  (8 MiB) of them, so 8 blocks by default. Never fewer than two.
+- **A read.** Every check asks for bytes at an offset. If the block holding them
+  is held, the bytes are copied out of memory. If not, the whole block is read
+  from the source, in one request over HTTP, and the least recently used block
+  is dropped to make room. A read that spans two blocks takes both.
+- **Two kinds of read.** The sweeps (signature sweep, hashes, typing, carving)
+  go through the object in order, so each block is read once per pass and is
+  never asked for again. Verifying a match, reading a ZIP's directory and then
+  its members, or stepping a regex, ask at scattered offsets, and each miss
+  costs a whole block, however few bytes it needed.
+- **Over HTTP, runs are merged.** A read that goes on from where the last
+  request stopped asks for twice as much as that one did, from one block up to
+  `--http-request-bytes` (8 MiB). A pass over a large object costs one request
+  per 8 MiB, not one per block, while scattered reads stay one block each.
+- **Passes.** An object larger than the cache is read again from the source at
+  each pass, as the blocks of the previous pass have been dropped by the time it
+  ends. An object that fits in the cache is read from the source once and held,
+  so every pass after the first costs no request at all.
+- **What it costs in memory.** The cache's size for each object being scanned in
+  place, plus up to one request held by the HTTP reader while it is read, plus
+  a copy of the bytes a check is looking at (a 1 MiB chunk for the sweep).
+  Objects nested in one another each have their own cache: an archive on HTTP
+  whose big member is spilled to disk holds two. A daemon with
+  `--max-process-bytes` lowers the cache and the request to an eighth of a job's
+  memory each, at most.
+- **What it does not do.** It reads nothing ahead of the block asked for (apart
+  from the doubling of HTTP requests above), shares nothing between objects,
+  does not write, and does not change what the scan finds, only how many reads
+  of the source it takes.
+
+Which setting to change:
+
+| Setting | Raise it when | What it costs |
+|---|---|---|
+| `--object-cache-block-bytes` | requests are slow (HTTP, network storage) and there are many small misses: fewer requests for the same scattered reads | each miss moves a whole block: 1 MiB to verify a 100-byte match. Past about 1 MiB the misses stop falling |
+| `--object-cache-bytes` | the object is not much bigger than the cache: every pass but the first is then free, and a few more blocks hold more of the places verification goes back to | that much memory per object being scanned in place, nested ones included |
+| `--http-request-bytes` | a pass over a large object is bound by round trips, not bandwidth | that much memory held while the object is read |
+
+What each setting did against a local server that waits before answering each
+request, so the delay stands for the round trip. The first object is a 300 MB
+file under a database with a pattern, a logical signature with a gap and the
+hash of that size. It is read about 4.4 times over, and 300 MB is past
+`--max-object-bytes`, so it goes through the cache. Block, cache and request
+sizes in the first three columns, defaults in bold:
+
+| Block | Cache | Request | Requests | Fetched | No delay | 20 ms | 100 ms |
+|---|---|---|---|---|---|---|---|
+| 64K | 8M | 8M | 506 | 1.23 GB | 4.4 s | 15.0 s | 55.9 s |
+| 256K | 8M | 8M | 361 | 1.29 GB | 4.1 s | 12.0 s | 41.2 s |
+| **1M** | **8M** | **8M** | 176 | 1.33 GB | 4.0 s | 8.0 s | 22.1 s |
+| 4M | 8M | 8M | 170 | 1.35 GB | 4.1 s | 7.9 s | 21.4 s |
+| 1M | 32M | 8M | 176 | 1.33 GB | 4.2 s | 8.2 s | 22.1 s |
+| 1M | 8M | 1M | 1,275 | 1.33 GB | 4.4 s | 31.7 s | 136.0 s |
+| 1M | 8M | 32M | 66 | 1.33 GB | 4.0 s | 5.4 s | 10.7 s |
+
+The second is a 20 MB ZIP of 2,000 small members, read in place (with
+`--max-object-bytes 1M`, as a much larger archive would be). The cache is
+smaller than the file, so the archive is read six times over; a cache that holds
+it reads it once:
+
+| Block | Cache | Requests | Fetched | No delay | 20 ms | 100 ms |
+|---|---|---|---|---|---|---|
+| 64K | 8M | 56 | 121 MB | 0.7 s | 1.8 s | 6.3 s |
+| **1M** | **8M** | 32 | 122 MB | 0.7 s | 1.3 s | 4.0 s |
+| 4M | 8M | 20 | 125 MB | 0.7 s | 1.1 s | 2.7 s |
+| 64K | 32M | 10 | 20 MB | 0.6 s | 0.8 s | 1.7 s |
+| 1M | 32M | 6 | 20 MB | 0.6 s | 0.7 s | 1.3 s |
+
+On a local disk the block size changed nothing measurable (the operating
+system's page cache absorbs it), so the defaults are chosen for the network. The
+tables measure round trips, not bandwidth: a server on the same host answered
+at several GB/s.
+
+## HTTP sources
+
+An `http(s)://` target (`--allow-http-scan`, and `SCANURL` on the daemon) is
+read by range requests and never written to disk. It takes the same two paths
+as a file, with the network in place of the disk:
+
+- **Up to `--max-object-bytes`:** fetched in full into memory, once. A 100 MB
+  object cost 16 requests, 1.0 times its size on the wire, and a 226 MB peak.
+- **Past it:** read through the [block cache](#the-block-cache), so every pass
+  over the file fetches it again. A 300 MB object, under a database with a hash
+  of that size, a gap signature and a pattern, cost 4.4 times its size on the
+  wire (1.33 GB in 176 requests). How many passes there are depends on the
+  database: detection and the signature sweep make two at least, and rules that
+  need more (YARA's prefilter reads the file twice more) transfer more. So a
+  20 GB object is tens of gigabytes of egress or more. To pay in disk instead,
+  [download it and scan the file](/scanner/guides/scanning/#scanning-over-http).
+  `--object-cache-block-bytes`, `--object-cache-bytes` and `--http-request-bytes`
+  set how many requests that takes.
+
+What the source must and must not do:
+
+- It must answer range requests with `206` and a `Content-Range` that carries
+  the total size. A server that does not is an error, not a fallback to a full
+  download.
+- The transfer has no timeout of its own. Only `--max-scan-secs` bounds it
+  (set by default for a daemon job, off for a one-shot run).
+- Up to 10 redirects are followed, and the destination is not filtered, so a
+  daemon with `--allow-http-scan` fetches any address it is given, including
+  ones only it can reach.
+- The object is not pinned. exav does not check an `ETag` or `Last-Modified`
+  between ranges, so a server can answer differently on each pass. What was
+  scanned is then not what a later download receives. For an object from a
+  server you do not control, download it once and scan the file.
+
 ## Archive members
 
-Archives decoded as they are read (ZIP, tar, CAB, ISO/UDF, DMG, LHA, `ar`, cpio,
-the single-stream compressors, self-extracting executables) are walked member by
-member at any size and any depth. Such a member is held in memory up to the same
-limit, and past it written to a temporary file and scanned from there. With
-`--spill-dir off`, or past `--max-spill-bytes`, it is not scanned and the file is
-`LIMITS-EXCEEDED`. 7z members stream the same way once the container is read.
+Archives decoded as they are read (ZIP, tar, CAB, ISO/UDF, LHA, `ar`, cpio, 7z,
+WIM, xar, the disk images and filesystems, the single-stream compressors,
+self-extracting executables) are walked member by member at any size and any
+depth. Such a member is held in memory up to the same limit, and past it written
+to a temporary file and scanned from there. With `--spill-dir off`, or past
+`--max-spill-bytes`, it is not scanned and the file is `LIMITS-EXCEEDED`.
 
-A member that has to be decoded whole (an encrypted ZIP member, a file inside a
-DMG, a member of a format read whole) is `LIMITS-EXCEEDED` past
-`--max-object-bytes`.
+A member that has to be decoded whole (an encrypted ZIP member, a 7z folder with
+an encrypted coder, a file a filesystem stores compressed, a member of a format
+read whole) is `LIMITS-EXCEEDED` past `--max-object-bytes`.
 
 ## Stdin, `INSTREAM` and ICAP bodies
 
diff --git a/www/src/content/docs/scanner/getting-started/installation.mdx b/www/src/content/docs/scanner/getting-started/installation.mdx
index 5a2c477d..9e1cf300 100644
--- a/www/src/content/docs/scanner/getting-started/installation.mdx
+++ b/www/src/content/docs/scanner/getting-started/installation.mdx
@@ -7,9 +7,8 @@ import { Steps } from '@astrojs/starlight/components';
 
 exav runs on Linux, macOS and Windows and ships as a single binary. The Linux
 release builds are static (musl); the macOS and Windows builds link the system
-libraries. On Windows there is no prefork worker pool, no per-job limits
-(`--max-scan-secs`, `--max-process-bytes`) and no `--auto-update`, which are
-Unix only.
+libraries. The prefork worker pool, the per-job limits (`--max-scan-secs`,
+`--max-process-bytes`) and `--auto-update` are Unix only.
 
 ## Prebuilt binaries
 
@@ -21,25 +20,25 @@ module `exav-wasm-<tag>-wasm32-wasip1.wasm` (see the
 checksum beside it. For example, on 64-bit Linux:
 
 ```sh
-tag=v0.0.2 target=x86_64-unknown-linux-musl
+tag=v0.0.3 target=x86_64-unknown-linux-musl
 curl -fsSLO https://github.com/sylvinus/exav/releases/download/$tag/exav-$tag-$target.tar.gz
 tar xzf exav-$tag-$target.tar.gz
 sudo install -m755 exav /usr/local/bin/exav
 exav --version
 ```
 
-They are the default build, without HTTP support: to fetch signatures with
-`--auto-update` or scan URLs, build with `--features http` below.
+The binaries are the default build, without HTTP support. To fetch signatures
+with `--auto-update` or scan URLs, build with `--features http` (below).
 
 Every archive carries the `LICENSE` and the `NOTICE` of what the binary links.
-The same releases carry the other tools in archives of their own, each
-installed as its page says: [exav-unpack](/unpack/cli/),
+The same releases carry the other tools in archives of their own, installed as
+their pages say: [exav-unpack](/unpack/cli/),
 [exav-grep](/subprojects/exav-grep/), [exav-pe-emu](/subprojects/exav-pe-emu/#cli)
 and [exav-imagehash](/subprojects/exav-imagehash/).
 
 ## From crates.io
 
-Building needs Rust 1.92 or newer (`rustc --version`; `rustup update` to
+Building needs Rust 1.95 or newer (`rustc --version`; `rustup update` to
 upgrade).
 
 ```sh
@@ -61,7 +60,7 @@ See [Feature flags](/scanner/reference/feature-flags/) for all build options.
 
 <Steps>
 
-1. Install a Rust toolchain (1.92 or newer) via [rustup](https://rustup.rs/).
+1. Install a Rust toolchain (1.95 or newer) via [rustup](https://rustup.rs/).
 
 2. Clone and build:
 
@@ -87,7 +86,7 @@ scanning and signature auto-update):
 cargo build --release -p exav --features http
 ```
 
-For a smaller binary without YARA, DLP, the phishing heuristic or ICAP:
+For a smaller binary with only the archive formats and decryption:
 
 ```sh
 cargo build --release -p exav --no-default-features --features all-formats,decrypt
diff --git a/www/src/content/docs/scanner/getting-started/introduction.mdx b/www/src/content/docs/scanner/getting-started/introduction.mdx
index ed92ff7c..ae0086c1 100644
--- a/www/src/content/docs/scanner/getting-started/introduction.mdx
+++ b/www/src/content/docs/scanner/getting-started/introduction.mdx
@@ -5,23 +5,20 @@ description: What exav is, a memory-safe malware scanner written in Rust that re
 
 import { Card, CardGrid } from '@astrojs/starlight/components';
 
-exav is a malware scanner written in memory-safe Rust. It ships as one
-MIT-licensed binary with a scanning CLI, a resident daemon and an ICAP server,
-and it drops into an existing ClamAV setup: it loads the signature databases you
-already have and answers the protocols your tooling already speaks.
-
-It reads ClamAV databases (`.cvd`/`.cld`, `.ndb`/`.ldb`/`.hdb`/`.hsb`/`.mdb`/
-`.msb`/`.cdb`/`.imp`/`.cbc`) and YARA rules (`.yar`/`.yara`), and speaks two wire
-protocols: `clamd`, so `clamdscan`, milters and existing tooling talk to it
-unchanged, and [ICAP](/scanner/guides/icap/), so it can replace a `c-icap` container
-behind a proxy or an upload service.
+exav is a malware scanner written in Rust. It ships as one MIT-licensed binary
+with a scanning CLI, a resident daemon and an ICAP server. It loads the
+signature databases you already have (ClamAV's `.cvd`/`.cld`, `.ndb`/`.ldb`/
+`.hdb`/`.hsb`/`.mdb`/`.msb`/`.cdb`/`.imp`/`.cbc`, and YARA `.yar`/`.yara`) and
+speaks two wire protocols: `clamd`, so `clamdscan`, milters and existing tooling
+talk to it unchanged, and [ICAP](/scanner/guides/icap/), so it can replace a
+`c-icap` container behind a proxy or an upload service.
 
 ## Why exav
 
 Established engines are large C codebases, and they bound their own work and then
 report a file clean without saying so. ClamAV, for instance, reads a file over
-about 2 GB, scans none of it, and answers `OK`. exav is a memory-safe rewrite
-built around one rule:
+about 2 GB, scans none of it, and answers `OK`. exav is a rewrite in a
+memory-safe language built around one rule:
 
 > Never report a file clean unless it was fully scanned.
 
@@ -34,29 +31,21 @@ for how each verdict is reported.
 
 <CardGrid>
   <Card title="Memory-safe Rust engine" icon="rocket">
-    The scanning and extraction code is safe Rust (`#![forbid(unsafe_code)]` in
-    the core crates). The default build links no C and generates no code at run
-    time, so the memory-corruption bugs behind most scanner CVEs cannot occur in
-    the code that parses hostile input.
+    The crates that parse hostile input are `#![forbid(unsafe_code)]`. The
+    default build links no C and generates no code at run time, so the
+    memory-corruption bugs behind most scanner CVEs cannot occur in exav's own
+    parsers. Dependencies are another matter: see
+    [Dependencies](/project/dependencies/).
   </Card>
   <Card title="Bounded memory" icon="bars">
     Most archives are walked member by member instead of being extracted whole,
-    and a stream waits in a temp file under
+    and a large member waits in a temp file under
     [budgets you set](/scanner/reference/cli/#buffering-a-stream-spill). A file over a
     bound is reported, not called clean.
   </Card>
   <Card title="Native YARA engine" icon="puzzle">
     Near-full YARA support through a native tree-walking evaluator: no code
-    generation at scan time, a pure-Rust dependency tree, on by default.
-  </Card>
-  <Card title="Drop-in compatible" icon="random">
-    Loads existing `.cvd`/`.ndb`/`.ldb`/`.hdb`/YARA signature databases and
-    answers the `clamd` and ICAP protocols, so `clamdscan`, milters, proxies and
-    existing tooling talk to exav unchanged.
-  </Card>
-  <Card title="Prebuilt .exavdb" icon="download">
-    Compile a large signature set once, then load it quickly and with far less
-    memory everywhere.
+    generation at scan time, and a pure-Rust dependency tree.
   </Card>
   <Card title="WASM sandbox" icon="seti:wasm">
     The whole engine compiles to a WASI module, so **untrusted** signatures can
diff --git a/www/src/content/docs/scanner/getting-started/quick-start.mdx b/www/src/content/docs/scanner/getting-started/quick-start.mdx
index d999bd5d..96049384 100644
--- a/www/src/content/docs/scanner/getting-started/quick-start.mdx
+++ b/www/src/content/docs/scanner/getting-started/quick-start.mdx
@@ -49,11 +49,12 @@ signatures loaded it refuses to run. Fetching signatures is the first step below
    eicar.com: Eicar-Test-Signature FOUND
    ```
 
-   A `SCAN SUMMARY` block follows the result lines. This first run parses the raw signatures, which takes a while and needs
-   memory to spare (see [what it costs](/scanner/guides/prebuilt-database/#what-it-costs)).
-   If the process dies with no message, it ran out of memory. exav always knows
-   EICAR, so the check that the ClamAV signatures loaded is `Known viruses` in
-   the summary: it should be in the millions.
+   A `SCAN SUMMARY` block follows the result lines. This first run parses the
+   raw signatures, which is slow and needs memory to spare (see
+   [what it costs](/scanner/guides/prebuilt-database/#what-it-costs)); a process
+   that dies with no message ran out of memory. exav always knows EICAR, so the
+   check that the ClamAV signatures loaded is `Known viruses` in the summary,
+   which should be in the millions.
 
 4. **Scan a file.** The output follows `clamscan`'s format:
 
@@ -89,8 +90,8 @@ pass. See [which code a run exits with](/scanner/reference/verdicts/#process-exi
 
 ## Faster startup: build a database once
 
-Loading the raw signatures parses millions of them on every start. Do it once
-and reuse the result:
+Parsing the raw signatures takes a while on every start. Do it once and reuse
+the result:
 
 ```sh
 exav --build-db exav.exavdb     # run daily, e.g. in CI
@@ -107,20 +108,18 @@ load cost. The daemon stays in the foreground, so run the client from a second
 terminal:
 
 ```sh
-exav --listen /tmp/exav.sock -d exav.exavdb    # load once, serve
-exav --connect /tmp/exav.sock /data            # client
+exav --listen $XDG_RUNTIME_DIR/exav.sock -d exav.exavdb    # load once, serve
+exav --connect $XDG_RUNTIME_DIR/exav.sock /data            # client
 ```
 
 A daemon can also keep its signatures current itself, fetching from a mirror
 with `--auto-update` (a `--features http` build); see
 [Signatures](/scanner/guides/signatures/#built-in-updater---auto-update).
 
-`--listen` accepts connections and `--connect` makes one. The protocol travels in
-the address: `--listen icap://0.0.0.0:1344` serves ICAP, and naming both serves
-both from one process. ClamAV's own `clamdscan` works too, given a `clamd.conf`
-whose `LocalSocket` or `TCPSocket` points at the daemon.
-
-See the [daemon guide](/scanner/guides/daemon/).
+The protocol travels in the address: `--listen icap://0.0.0.0:1344` serves ICAP,
+and naming both protocols serves both from one process. ClamAV's own `clamdscan`
+works too, given a `clamd.conf` whose `LocalSocket` or `TCPSocket` points at the
+daemon. See the [daemon guide](/scanner/guides/daemon/).
 
 ## Next
 
diff --git a/www/src/content/docs/scanner/guides/daemon.mdx b/www/src/content/docs/scanner/guides/daemon.mdx
index 8a2278b4..12581c48 100644
--- a/www/src/content/docs/scanner/guides/daemon.mdx
+++ b/www/src/content/docs/scanner/guides/daemon.mdx
@@ -48,8 +48,9 @@ or a daemon running as another user. `-` (stdin) is always sent as contents.
 
 A directory names its whole tree in all three modes, as it does for `clamdscan`.
 The client walks it and sends one request per file, so `--exclude` / `--include`
-apply to the tree and each request has one reply. The parts of a byte-split
-archive (`x.001`, `x.002`, ...) are sent together so the daemon can rejoin them
+apply to the tree and each request has one reply. The parts of a split archive
+(`x.001`, `x.002`, ...; a RAR's `x.part1.rar` or `x.r00`; a ZIP's `x.z01`
+and `x.zip`) are sent together so the daemon can rejoin them
 (see [split archives](#split-archives)). By path, a directory holding such parts
 goes as one `CONTSCAN`, and the client's filters and `--no-recursive` do not
 apply to it; with `contents` or `fd`, the parts of each directory go in one
@@ -158,9 +159,15 @@ daemon could not hold in full has what it held scanned and is answered
 scanned. The reply carries `"truncated": true` when the request ended
 before its terminator, so some files never arrived.
 
-RAR `.partN` and ZIP `.zNN` volumes are not rejoined this way: each carries its
-own headers, so concatenating them produces garbage that still looks like an
-archive. Each is scanned on its own.
+Volumes that carry their own headers are rejoined too, by the format's own
+join and not by concatenation (which would produce garbage that still looks like
+an archive): a RAR set (`x.part1.rar`, `x.part2.rar`, ..., or `x.rar`, `x.r00`,
+...), a ZIP set (`x.z01`, ..., and the `x.zip` that ends it) and a set of
+cabinets, found from the names their headers give one another. A set with a
+volume missing, or whose volumes do not fit together, is `PARTIAL`, never
+clean. The client sends a directory as one request when it holds a byte-split,
+RAR or ZIP part by name, with its `.zip` and `.cab` files; a directory of
+cabinets alone is rejoined when the daemon scans it by path (`CONTSCAN`).
 
 ## Size over the wire
 
@@ -295,19 +302,9 @@ deployment reloads on swap too, with no explicit `RELOAD`.
 ## As a managed service
 
 A systemd unit (`packaging/exav.service`, also shipped in the `.deb`) runs exav
-in place of `clamav-daemon` on the same socket, reading the raw signatures
-`freshclam` keeps in `/var/lib/clamav`. It runs as the `clamav` user, which the
-package does not create, so install it where ClamAV is installed:
-
-```sh
-sudo systemctl disable --now clamav-daemon.socket clamav-daemon.service
-sudo systemctl enable --now exav
-clamdscan --ping 1
-```
-
-Stopping `clamav-daemon.socket` matters on Debian and Ubuntu: while it holds the
-socket, the first connection starts clamd again. `systemctl reload exav` sends
-`SIGUSR2`.
-
-See [Migrating from ClamAV](/scanner/guides/migrating-from-clamav/) for the full swap,
-and the [Docker guide](/scanner/guides/docker/) for the containerised daemon.
+in place of `clamav-daemon` on the same socket. It runs as the `clamav` user,
+which the package does not create, so install it where ClamAV is installed;
+`systemctl reload exav` sends `SIGUSR2`. See
+[Migrating from ClamAV](/scanner/guides/migrating-from-clamav/#as-a-managed-service)
+for the swap, and the [Docker guide](/scanner/guides/docker/) for the
+containerised daemon.
diff --git a/www/src/content/docs/scanner/guides/docker.mdx b/www/src/content/docs/scanner/guides/docker.mdx
index 23e80041..c907e1a1 100644
--- a/www/src/content/docs/scanner/guides/docker.mdx
+++ b/www/src/content/docs/scanner/guides/docker.mdx
@@ -81,13 +81,18 @@ docker exec exav /exav --ping                       # what this container serves
 exav --ping --connect clamd://scanner.internal:3310 # from anywhere
 ```
 
+Under the worker pool the scan listener answers a `PING` when a worker is free,
+which under heavy load can be after the check's timeout. To have the check
+answered whatever the workers are doing, add a health listener
+(`EXAV_LISTEN_HEALTH=clamd://127.0.0.1:3311`); `exav --ping` then probes it
+instead, and the command of the check does not change. See
+[the health listener](/scanner/reference/cli/#health-listener).
+
 `HEALTHCHECK` is a Docker extension of the image configuration, not part of the
-OCI spec. Docker honours it either way. Podman reads it only from an image
-published with Docker mediatypes, which the publish workflow checks for images
-published after 0.0.1; on older tags, or an image a registry re-exports as OCI,
-`podman image inspect` shows no health check. Kubernetes ignores it entirely.
-Where it matters, say it in the orchestrator's own configuration, with the same
-command:
+OCI spec. Docker honours it. Podman reads it only from an image published with
+Docker mediatypes, so an image a registry re-exports as OCI shows no health
+check in `podman image inspect`. Kubernetes ignores it. Where it matters, say it
+in the orchestrator's own configuration, with the same command:
 
 ```yaml
 # Compose
diff --git a/www/src/content/docs/scanner/guides/icap.mdx b/www/src/content/docs/scanner/guides/icap.mdx
index 8553544c..fa230d30 100644
--- a/www/src/content/docs/scanner/guides/icap.mdx
+++ b/www/src/content/docs/scanner/guides/icap.mdx
@@ -302,10 +302,10 @@ hot-reload as in [daemon mode](/scanner/guides/daemon/#hot-reloading-signatures)
 
 ```http
 ICAP/1.0 200 OK
-Server: exav/0.0.2
+Server: exav/0.0.3
 ISTag: "exav-ae0b21d4572e711f"
 Methods: REQMOD, RESPMOD
-Service: exav/0.0.2 ICAP service
+Service: exav/0.0.3 ICAP service
 Allow: 204
 Max-Connections: 100
 Preview: 4096
diff --git a/www/src/content/docs/scanner/guides/prebuilt-database.mdx b/www/src/content/docs/scanner/guides/prebuilt-database.mdx
index 2ee1ee46..aff8cfb3 100644
--- a/www/src/content/docs/scanner/guides/prebuilt-database.mdx
+++ b/www/src/content/docs/scanner/guides/prebuilt-database.mdx
@@ -56,9 +56,8 @@ See [Signatures](/scanner/guides/signatures/) for the former.
 
 </Steps>
 
-Build the database daily on a capable host or in CI, distribute the file, and
-have every CLI and daemon instance load it. Constrained hosts never pay the build
-peak.
+Build daily on a capable host or in CI and have every CLI and daemon instance
+load the file, so constrained hosts never pay the build peak.
 
 ## Rebuild after an exav upgrade
 
@@ -70,12 +69,12 @@ half-understood:
 exav: loading database old.exavdb: unsupported database version 3 (this build expects 4)
 ```
 
-Rebuild after an upgrade whose changelog mentions a new format version. Nothing
-is lost: the sources are the `.cvd`/`.cld` files `freshclam` or `cvdupdate`
-already fetched. If you ship a prebuilt database to other hosts, upgrade the builder and
-the scanners together: a download is checked for integrity, not for its format
+Rebuild after an upgrade whose changelog mentions a new format version; the
+sources are the `.cvd`/`.cld` files `freshclam` or `cvdupdate` already fetched.
+If you ship a prebuilt database to other hosts, upgrade the builder and the
+scanners together: a download is checked for integrity, not for its format
 version, so a scanner offered a newer format keeps the database it has on a
-reload, and fails to start from scratch.
+reload and fails to start from scratch.
 
 <Aside type="caution">
 The database is a trusted artifact: build and fetch it over a channel you trust.
diff --git a/www/src/content/docs/scanner/guides/scanning.mdx b/www/src/content/docs/scanner/guides/scanning.mdx
index 4be3b31e..e839c216 100644
--- a/www/src/content/docs/scanner/guides/scanning.mdx
+++ b/www/src/content/docs/scanner/guides/scanning.mdx
@@ -32,9 +32,11 @@ a temporary file past 16 MiB), then gets the same scan as a file. See
 
 ### Scanning over HTTP
 
-The server must answer range requests. An object up to `--max-object-bytes` is
-read once, in full; a larger one is read in ranges as the scan needs them, some
-parts more than once (see
+The server must answer range requests, or the scan fails. An object up to
+`--max-object-bytes` is read once, in full; a larger one is read in ranges as
+the scan needs them, and costs about twice its size in transfer (see
+[HTTP sources](/scanner/concepts/streaming-memory/#http-sources) for the
+measurements and what is not checked, and
 [the block cache](/scanner/concepts/streaming-memory/#past-it-through-a-block-cache)).
 
 To pay in disk instead of transfer (metered egress, a slow link, per-request
@@ -64,8 +66,9 @@ A file that could not be fully examined ends with the reason, then the
 (The `huge.bin` line comes from a run with `--max-input-bytes 4G`; by default
 there is no input size limit.)
 
-`--quiet` suppresses the `OK` lines and the summary, never an error; `-v` adds
-detail.
+`--quiet` suppresses the `OK` lines and the summary, never an error. `-v` adds
+informational findings: the detected file type, and with
+`--detect exav-heuristics` the imphash, section entropy and static score.
 
 ### JSON output
 
@@ -94,12 +97,6 @@ exav --json /data | jq 'select(.status and .status != "OK")'     # everything no
 `signatures` and carries `"partial":true` and `partial_reasons` when the search
 stopped short.
 
-### Verbose findings
-
-`-v` / `--verbose` prints informational findings alongside the verdict: the
-detected file type, and with `--detect exav-heuristics` also the imphash, section
-entropy and the static score.
-
 ## All-match mode
 
 By default exav stops at the first matching signature per file. `--all-matches`
@@ -124,9 +121,8 @@ nested below it and lets files directly inside through. To anchor it, write
 
 ## Exit codes
 
-`0` `OK`, `1` `FOUND`, `2` `ERROR` (exav could not do its job), `3` `PARTIAL` (a
-file could not be fully examined). `3` is kept apart from `2` so that "the
-scanner broke" and "this file needs a decision" are different signals;
+`0` `OK`, `1` `FOUND`, `2` `ERROR`, `3` `PARTIAL`. `3` is kept apart from `2` so
+that "the scanner broke" and "this file needs a decision" are different signals;
 [`--partial-as`](/scanner/reference/cli/#what-an-unscannable-object-becomes) maps it to
 another status. See [which code a run exits with](/scanner/reference/verdicts/#process-exit-code).
 
diff --git a/www/src/content/docs/scanner/guides/signatures.mdx b/www/src/content/docs/scanner/guides/signatures.mdx
index c70ecc7f..c79c3a8c 100644
--- a/www/src/content/docs/scanner/guides/signatures.mdx
+++ b/www/src/content/docs/scanner/guides/signatures.mdx
@@ -14,16 +14,15 @@ supply the signatures.
 The ClamAV signature database (`main.cvd`, `daily.cvd`) is GPL-licensed. exav is
 MIT-licensed, so it does not bundle or redistribute it.
 
-- Reading the CVD format is interoperability, not redistribution.
-- You run Cisco's own updater on your machine and point exav at the directory.
-  The GPL governs distribution, not use.
-- exav does not re-implement `freshclam`'s update protocol: no DNS `TXT` version
-  probing, no `.cdiff` patching, no verification of the CVD's digital signature
-  (`dsig`). [`cvdupdate`](https://github.com/Cisco-Talos/cvdupdate)
-  (Apache-2.0) and `freshclam` are the supported way to fetch the official
-  database, and they spare Cisco's CDN. exav's own
-  [`--auto-update`](#built-in-updater---auto-update) only fetches from a mirror
-  you run.
+You run Cisco's own updater on your machine and point exav at the directory;
+the GPL governs distribution, not use.
+
+exav does not re-implement `freshclam`'s update protocol: no DNS `TXT` version
+probing, no `.cdiff` patching, no verification of the CVD's digital signature
+(`dsig`). [`cvdupdate`](https://github.com/Cisco-Talos/cvdupdate) (Apache-2.0)
+and `freshclam` are the supported way to fetch the official database, and they
+spare Cisco's CDN. exav's own [`--auto-update`](#built-in-updater---auto-update)
+only fetches from a mirror you run.
 
 ## Get the official signatures
 
@@ -94,13 +93,10 @@ Community YARA rulesets, commercial vendor feeds and add-on signature sets load
 the same way: put the files, or a nested directory of them, in the signature
 directory.
 
-- Prefer permissively licensed sets if you intend to redistribute them.
-- Feeds distributed through updater tools that lay signatures out in nested
-  directories load unchanged.
-- A database is recognised by its extension, not its contents. Anything else in
-  the directory is passed over without being read, which lets `.cdiff`, `.sign`,
-  `.info` and updater state live there safely; a signature file saved under
-  another name is skipped the same way, so rename it.
+A database is recognised by its extension, not its contents. Anything else in
+the directory is passed over without being read, which lets `.cdiff`, `.sign`,
+`.info` and updater state live there safely; a signature file saved under
+another name is skipped the same way, so rename it.
 
 ## Built-in updater (`--auto-update`)
 
diff --git a/www/src/content/docs/scanner/guides/sizing.md b/www/src/content/docs/scanner/guides/sizing.md
index b62ddef3..1b5ca86b 100644
--- a/www/src/content/docs/scanner/guides/sizing.md
+++ b/www/src/content/docs/scanner/guides/sizing.md
@@ -3,11 +3,12 @@ title: Sizing a server
 description: What to set on a 4 GiB machine running exav as a clamd or ICAP server, and how each flag divides the memory.
 ---
 
-A worked example: one machine with 4 GiB of RAM and 6 GB of free disk for
+A worked example: one machine with 4 GiB of RAM and 40 GB of free disk for
 temp files, serving the clamd protocol (and optionally ICAP) with the full
-official database. The figures were measured with exav 0.0.2 and the official
+official database. The database figures were measured with the official
 `main`, `daily` and `bytecode` databases of September 2026 (3.6 million
-signatures); a later database is somewhat larger.
+signatures); a later database is somewhat larger. The limits that follow from
+them are worked out by exav at every start and printed in its log.
 
 ## The short answer
 
@@ -15,23 +16,49 @@ signatures); a later database is somewhat larger.
 exav --listen /run/clamav/clamd.ctl \
      -d /var/lib/exav/official.exavdb \
      --workers 2 \
-     --spill-dir /var/cache/exav --max-total-spill-bytes 2G
+     --max-process-bytes 818M \
+     --max-object-bytes 204M \
+     --max-extracted-bytes 311M \
+     --max-bytecode-memory-bytes 204M \
+     --object-cache-bytes 8M \
+     --spill-threshold-bytes 16M \
+     --spill-dir /var/cache/exav \
+     --max-spill-bytes 4G --max-total-spill-bytes 12G
 ```
 
-The spill directory must exist (exav refuses to start otherwise) and be writable
-by the daemon. The packaged unit makes the filesystem read-only, so add
-`CacheDirectory=exav` with `systemctl edit exav`, which creates
-`/var/cache/exav` for the unit's user.
-
-`--max-total-spill-bytes 2G` comes from the disk. The limit is per process,
-and three processes spill here: the two workers, and the ICAP child once
-[ICAP is added](#adding-icap). 6 GB over three is 2 GB each. It cannot go
-lower without lowering `--max-spill-bytes` too: one stream may spill up to that
-(2 GB by default), and exav refuses to start with a total below it. With more
-disk, raise it; the default, 8 GB per process, would let the three use 24 GB.
-
-Everything else stays at its default, and exav fits the rest to the machine at
-startup:
+Each memory setting says how much one thing may hold, and the numbers add up
+to the machine ([where they come from](#where-the-4-gib-goes)):
+
+| Flag | Value | What it bounds | Where the value comes from |
+|---|---|---|---|
+| `--workers` | 2 | Scans at once | The memory left after the database, shared between them |
+| `--max-process-bytes` | 818M | Everything one scan holds, as address space | (4096 MiB − a third kept for the system − the 1094 MiB database) / 2 workers |
+| `--max-object-bytes` | 204M | The largest object held whole; a larger one is read through a block cache or a spill file | A quarter of the scan's memory: matching may also need an image decoded from the object and its grey copy, each as large again |
+| `--max-extracted-bytes` | 311M | What formats that decode a member whole have produced, added up over the scan | What is left after those two copies, a 16 MiB lowercase copy and a tenth to spare: 818 − 2 × 204 − 16 − 82 |
+| `--max-bytecode-memory-bytes` | 204M | What one run of a bytecode signature holds | A quarter of the scan's memory |
+| `--object-cache-bytes` | 8M | The block cache of each object read in place | The default; an eighth of the scan's memory at most. More fetches an object less often |
+| `--spill-threshold-bytes` | 16M | What a stream holds in RAM before it goes to disk | The default; each connection holds this much |
+
+exav checks each of them against the machine at startup and only ever lowers
+one that does not fit, never raises one.
+
+The disk settings come from the 40 GB. The spill directory must exist (exav
+refuses to start otherwise) and be writable by the daemon. The packaged unit
+makes the filesystem read-only, so add `CacheDirectory=exav` with
+`systemctl edit exav`, which creates `/var/cache/exav` for the unit's user.
+
+- `--max-total-spill-bytes 12G` is per process, and three processes spill here:
+  the two workers, and the ICAP child once [ICAP is added](#adding-icap).
+  Keeping 4 GB spare, 36 GB over three is 12 GB each. The default, 8 GB per
+  process, would let the three use 24 GB.
+- `--max-spill-bytes 4G` is the most one stream or one member may take. A text
+  member also needs its normalised views beside it, which came to more than the
+  member again in the [measurements below](#archives-past-the-spill-ceiling), so
+  4G keeps a member and its views inside 12G. exav refuses to start with a total
+  below `--max-spill-bytes`.
+
+Leave the memory flags out and exav works out the same values on this machine
+and prints them at startup, which is how the figures above were found:
 
 ```text
 exav: per-job memory 2048 MiB x 2 workers exceeds what this host can back; using 818 MiB per job (two thirds of RAM, less the 1094 MiB shared database, over the workers). ...
@@ -79,6 +106,52 @@ holds in all is what is left after those two copies, a 16 MiB lowercase copy
 used for case-insensitive matching, and a tenth to spare:
 818 − 2 × 204 − 16 − 82 = 311 MiB.
 
+## What this host scans, and what to change to scan more
+
+With the command above (2 workers, 818 MiB a scan, 4 GiB for one stream or member and 12 GiB of spill per process),
+by kind of input:
+
+| Input | Scanned in full | Past that | To go further |
+|---|---|---|---|
+| A file on disk, an `http(s)://` object | Any size. Up to 204 MiB it is held whole; larger, it is read through an 8 MiB block cache | A PE, ELF or .NET file is not parsed, so the signatures and rules on its structure are not evaluated, and RAR, OLE, PDF and the other [formats read whole](/scanner/reference/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole) are not opened. Either is `LIMITS-EXCEEDED` if nothing is found | `--workers 1` gives a scan 1637 MiB, and one object 409 MiB. Beyond that, more RAM |
+| Members of ZIP, tar, 7z, CAB, ISO, the compressors and the other formats decoded as read | Each member up to 4 GiB: held up to 204 MiB, and past that written to disk. All of them together up to 10 GiB fed to the matcher | A member over 4 GiB is not scanned. An archive past 10 GiB is scanned as far as that | `--max-spill-bytes` (disk for one member), `--max-total-spill-bytes` (disk for all of a process's), `--max-matcher-bytes` (the 10 GiB, a time bound) |
+| Members that have to be decoded whole: encrypted ZIP members, RAR, OLE and PDF streams, installers, files a filesystem stores compressed | 311 MiB added up over one scan, 204 MiB in one object | `LIMITS-EXCEEDED`, naming the limit | `--workers 1` raises them to 640 MiB and 409 MiB; `--max-process-bytes` sets the memory a scan gets. `--max-extracted-bytes` and `--max-object-bytes` only lower what that memory allows |
+| A stream: `INSTREAM`, an ICAP body, stdin | The first 4 GiB, 16 MiB of it in RAM and the rest on disk | The first 4 GiB is scanned and the stream is `LIMITS-EXCEEDED` | `--max-spill-bytes`, `--max-total-spill-bytes` and the disk under `--spill-dir` |
+| A bytecode signature | 204 MiB held by one run | The run stops, the scan says so | `--max-bytecode-memory-bytes`, itself capped at a quarter of a scan's memory |
+
+Scanning a file or object past 204 MiB is slow rather than limited: it is read
+from its source several times over. Over a network each read is a request, and
+`--object-cache-block-bytes`, `--object-cache-bytes` and `--http-request-bytes`
+set how many. The [block cache](/scanner/concepts/streaming-memory/#the-block-cache)
+page explains the model and shows what each setting did against a slow server.
+
+Measured on this configuration over HTTP, against a local server that makes up
+each object from its offset, so there was nothing to download and no disk to
+fill: a 20 GB object of text, RAR, OLE or PDF magic, held between 50 and 61 MB at
+its peak, and took from 2 to 21 minutes (the server answers at several GB/s, so
+this is the scan's own time). Archives holding one 20 GB member (ZIP, tar, gzip)
+peaked near 260 MB and, with the default 2 GiB spill ceiling, were reported
+`LIMITS-EXCEEDED` for the member, as was a small PE followed by 20 GB (19
+minutes, 258 MB). Raising the limits scans a member that size,
+as [the next measurements](#archives-past-the-spill-ceiling) show.
+
+### Archives past the spill ceiling
+
+A ZIP, a tar and a gzip, each holding one 5 GB text member (same server, same
+818 MiB scan), with `--max-matcher-bytes 30G` and `--max-spill-bytes` raised so
+that the member fits:
+
+| `--max-total-spill-bytes` | Result | Time | Peak memory |
+|---|---|---|---|
+| 6G | The member was scanned, but not its normalised text views: `LIMITS-EXCEEDED PARTIAL`, `no room in the 6 GiB process-wide spill budget` (all three formats) | 189 to 257 s | 261 to 269 MB |
+| 12G | tar: `OK` | 226 s | 272 MB |
+
+A text member is written to disk once as it is decoded, and its normalised
+views, which are as large as it is, are written beside it. Give the spill
+directory the member's size several times over, and set both
+`--max-spill-bytes` and `--max-total-spill-bytes` to it. Memory does not grow
+with the member: 270 MB is one 204 MiB object and the block caches.
+
 ## The flags, in the order to decide them
 
 1. **The database.** Load a prebuilt `.exavdb` (`-d file.exavdb`), not the raw
@@ -116,8 +189,8 @@ used for case-insensitive matching, and a tenth to spare:
    `--spill-dir` at a filesystem with room. `--max-total-spill-bytes` is per
    process, and every worker and the ICAP child counts separately, so set it to
    what the disk can spare divided by the number of processes, and no lower
-   than `--max-spill-bytes`: 2G each above lets the 2 workers and the ICAP child
-   use 6G together. Do not leave it on a small `/tmp` held in RAM (`tmpfs`),
+   than `--max-spill-bytes`: 12G each above lets the 2 workers and the ICAP
+   child use 36G together. Do not leave it on a small `/tmp` held in RAM (`tmpfs`),
    which is memory again.
 
 6. **`--max-input-bytes`**, if the clients should not send anything larger. The
@@ -140,7 +213,14 @@ exav --listen /run/clamav/clamd.ctl \
      --listen 'icap://0.0.0.0:1344?max-connections=4' \
      -d /var/lib/exav/official.exavdb \
      --workers 2 \
-     --spill-dir /var/cache/exav --max-total-spill-bytes 2G
+     --max-process-bytes 818M \
+     --max-object-bytes 204M \
+     --max-extracted-bytes 311M \
+     --max-bytecode-memory-bytes 204M \
+     --object-cache-bytes 8M \
+     --spill-threshold-bytes 16M \
+     --spill-dir /var/cache/exav \
+     --max-spill-bytes 4G --max-total-spill-bytes 12G
 ```
 
 The only way to lower what one scan holds is a smaller `--max-process-bytes`,
diff --git a/www/src/content/docs/scanner/guides/troubleshooting.md b/www/src/content/docs/scanner/guides/troubleshooting.md
index 271feea0..dd15ce56 100644
--- a/www/src/content/docs/scanner/guides/troubleshooting.md
+++ b/www/src/content/docs/scanner/guides/troubleshooting.md
@@ -67,8 +67,8 @@ different things, and raising the wrong one changes nothing (see
 [which one do I change](/scanner/reference/limits/#which-one-do-i-change)).
 
 The common case is a large file. One over `--max-object-bytes` (256 MiB by
-default) gets the full engine, but the checks that parse a file whole (a PE's
-structure, YARA's `pe` module, a RAR, 7z or OLE container) do not run on it.
+default) is scanned through a block cache, but the checks that parse a file whole
+(a PE's structure, YARA's `pe` module, a RAR or OLE container) do not run on it.
 With `--spill-dir off`, a large text file also skips its HTML and script views,
 and an archive member that decodes past the limit is not scanned. Raise
 `--max-object-bytes` to have those checks run, at the cost of memory. See
diff --git a/www/src/content/docs/scanner/guides/wasm-sandbox.mdx b/www/src/content/docs/scanner/guides/wasm-sandbox.mdx
index 0ccdd854..9935d2e9 100644
--- a/www/src/content/docs/scanner/guides/wasm-sandbox.mdx
+++ b/www/src/content/docs/scanner/guides/wasm-sandbox.mdx
@@ -23,7 +23,7 @@ exav costs a crashed sandbox rather than a compromised host.
 
 1. Download `exav-wasm-<tag>-wasm32-wasip1.wasm` from a
    [release](https://github.com/sylvinus/exav/releases) and rename it
-   `exav.wasm`, or build it from a clone of the repository (Rust 1.92 or newer):
+   `exav.wasm`, or build it from a clone of the repository (Rust 1.95 or newer):
 
    ```sh
    git clone https://github.com/sylvinus/exav && cd exav
diff --git a/www/src/content/docs/scanner/guides/yara.mdx b/www/src/content/docs/scanner/guides/yara.mdx
index 377a9dd6..598bdd43 100644
--- a/www/src/content/docs/scanner/guides/yara.mdx
+++ b/www/src/content/docs/scanner/guides/yara.mdx
@@ -57,9 +57,8 @@ bitwise, float, comparisons, string operators, `matches`); `for … in`,
 
 External variables: `filepath`, `filename` and `extension` (lowercased, with its
 leading dot) are set from the scanned file's path, and undefined when there is
-none. `filetype` and `owner` are
-declared, so rules using them compile, but are never set, so those conditions
-never match.
+none. `filetype` and `owner` are declared, so rules using them compile, but they
+are never set and those conditions never match.
 
 **Not supported**, and rejected as explicit compile errors rather than evaluated
 wrongly: the `macho`, `dex`, `cuckoo`, `androguard` and other modules; `include`;
@@ -83,13 +82,12 @@ out of evaluation steps. See [Limits and tuning](/scanner/reference/limits/).
 
 ## How matching is verified
 
-Matching is cross-checked against the real `yara-x` over varied inputs,
-comparing the set of matching rules (see
-[Differential testing](/scanner/concepts/differential-testing/)). The harness runs
-yara-x as a program (`yr`) rather than linking it, which would bring its
-WebAssembly runtime into exav's build. Install it with
-`cargo install yara-x-cli` and run `make test-yara-diff`; without it the harness
-skips, so read its output rather than only its exit code.
+The set of matching rules is compared with the real `yara-x` over varied inputs
+(see [Differential testing](/scanner/concepts/differential-testing/)). The
+harness runs yara-x as a program (`yr`) instead of linking it, which would bring
+its WebAssembly runtime into exav's build. Install it with
+`cargo install yara-x-cli` and run `make test-yara-diff`. Without `yr` the
+harness skips, so read its output rather than only its exit code.
 
 ## Using the engine directly
 
diff --git a/www/src/content/docs/scanner/reference/cli.md b/www/src/content/docs/scanner/reference/cli.md
index b31dc6f2..ddd40cb7 100644
--- a/www/src/content/docs/scanner/reference/cli.md
+++ b/www/src/content/docs/scanner/reference/cli.md
@@ -60,7 +60,7 @@ daemon must be able to see them; otherwise send the contents (see
 | `-d`, `--database <PATH>` | none | Load this file or directory instead of `--sig-dir`. A directory of signature files (`.cvd`/`.ndb`/`.hdb`/…) is loaded recursively, skipping hidden subdirectories. A prebuilt `.exavdb` loads only when named as the file itself; inside a directory it is skipped. |
 | `--sig-dir <DIR>` | `/var/lib/exav` | The directory signatures live in, loaded when `-d` is not given. |
 | `--allow-no-db` | off | Testing only. Run against the built-in EICAR-only baseline when no real database is present, instead of refusing. |
-| `--build-db <FILE>` | none | Compile the loaded signatures into a prebuilt `.exavdb` and exit. Refused with `--listen`. `--build-shard-bytes`, which split the build before 0.0.2, is refused with a message saying so. |
+| `--build-db <FILE>` | none | Compile the loaded signatures into a prebuilt `.exavdb` and exit. Refused with `--listen`. |
 
 `--auto-update` writes to `-d` when it is given, and to `--sig-dir` otherwise,
 so the updater and the server of a two-container deployment name the same
@@ -129,6 +129,11 @@ change. `--workers` takes a count or `threads`, and refuses `0`.
 |---|---|---|---|
 | `--max-input-bytes <SIZE\|off>` | unlimited | `100M` | Largest top-level input taken. Past it the first bytes get the whole scan, and without a detection there the input is `LIMITS-EXCEEDED`. The same for a file, stdin and every daemon verb. |
 | `--max-object-bytes <SIZE\|off>` | `256M` | unchanged, but a top-level file up to 400M is held whole | The most memory one object may take when held whole. A larger one gets the same scan through a block cache or spill file, except the checks that need it whole (PE structure, YARA's `pe`/`elf`/`dotnet`, containers read whole); if one of those applied, it is `LIMITS-EXCEEDED` unless something is found. |
+| `--max-extracted-bytes <SIZE\|off>` | `1G` | `400M` | The most bytes of members that a format decodes whole, added up over one scan and never released. A member streamed to the matcher (ZIP, 7z, TAR, CAB, the stream codecs) is not counted. Lowered by `--max-process-bytes`. |
+| `--max-bytecode-memory-bytes <SIZE\|off>` | `256M` | unchanged | What one run of a bytecode signature may hold: its `malloc`s, call frames and the globals it reads. A run that reaches it stops as incomplete. Lowered by `--max-process-bytes`. |
+| `--object-cache-bytes <SIZE>` | `8M` | unchanged | Memory of the block cache of an object read in place (a file past `--max-object-bytes`, a spilled member or view, an `http(s)://` input), for each such object being scanned, and as much again at most for the executable candidates that carving holds for a check. At least two blocks. A cache that holds the whole object reads it once from the source. Lowered by `--max-process-bytes` to an eighth of a scan's memory. [How the cache works](/scanner/concepts/streaming-memory/#the-block-cache). |
+| `--object-cache-block-bytes <SIZE>` | `1M` | unchanged | One block of that cache: what it reads from the object at a time, and over HTTP what a request away from the previous one fetches. Larger means fewer requests for scattered reads and more bytes moved by each. |
+| `--http-request-bytes <SIZE>` | `8M` | unchanged | Over HTTP, the most one range request fetches. A read that goes on from the last request asks for twice as much each time, from one block up to this. Held in memory while read. Lowered by `--max-process-bytes` to an eighth of a scan's memory. |
 | `--max-matcher-bytes <SIZE\|off>` | `10G` | unchanged | Bytes fed to the matcher across one top-level file: a CPU bound, not a memory one. `clamscan`'s `--max-scansize`. |
 | `--max-pcre-bytes <SIZE\|off>` | unlimited | `100M` | The largest object PCRE subsignatures run on; on a larger one they do not match. Per object, so a small member of a large archive is still matched. A CPU bound: an object is matched without being copied. `clamscan`'s `--pcre-max-filesize`. |
 | `--min-scan-bytes <SIZE>` | `6` | unchanged | The smallest object scanned. A smaller file or member, at any depth, is neither matched nor unpacked and counts as clean, as ClamAV scans no object under 6 bytes. `0` scans every object. |
@@ -139,9 +144,6 @@ change. `--workers` takes a count or `threads`, and refuses `0`.
 What a scan holds in total has no flag of its own and cannot be raised: it is
 1 GiB (400M under `--clamav-compat`), and `--max-process-bytes` can only lower
 it, to what fits the memory a scan gets (see [Limits](/scanner/reference/limits/)).
-`--max-extracted-bytes`, which set it before
-0.0.2, is refused with a message saying so. [Limits](/scanner/reference/limits/) has
-the details.
 
 Each bound has one spelling. `clamscan`'s names (`--max-filesize`,
 `--max-scansize`, `--max-files`) are refused, with an error naming the exav flag.
@@ -340,6 +342,7 @@ always reads it and advertises it as `Max-Connections`.
 | Flag | Default | Description |
 |---|---|---|
 | `--listen <ADDR>` | none | Serve on this address. Repeatable (comma-separated in the environment). |
+| `--listen-health <ADDR>` | none | Also answer "are you there?" on this address, and nothing else. Repeatable (comma-separated in the environment). Needs `--listen`. See [Health listener](#health-listener). |
 | `--connect <ADDR>` | none | Scan by handing each file to a daemon already running there, instead of loading a database. Listener options (`?mode=`, `?max-connections=`, `?service=`) are refused here. |
 | `--send-as <WHAT>` | `path` | What a `--connect` client hands the daemon: `path`, `contents` or `fd`. |
 | `--ping` | off | Ask a daemon whether it is answering, and exit `0` or `2`. Probes `--connect` when given, otherwise the listener this configuration would serve (so a container health check needs no address of its own), with `PING` on clamd and `OPTIONS` on ICAP. One probe; retrying is up to the caller. |
@@ -353,25 +356,50 @@ always reads it and advertises it as `Max-Connections`.
 `SHUTDOWN` is off by default because a scanner that is not running reports
 nothing, and a pipeline that reads no answer as "fine" passes everything.
 
-Naming both protocols serves both from one process over one loaded database,
-replacing a `c-icap` + `clamav` container pair:
+Naming both protocols serves both from one process over one loaded database:
 
 ```sh
 exav --listen clamd://0.0.0.0:3310 --listen icap://0.0.0.0:1344
 ```
 
-Under the worker pool the ICAP listener runs in its own child of the supervisor,
-sharing the loaded database copy-on-write and replaced along with the workers on
-a reload, since ICAP connections are keep-alive and would otherwise occupy every
-worker. Two `--listen` addresses on the same protocol are refused.
+Two `--listen` addresses on the same protocol are refused. Under the worker pool
+the ICAP listener runs in a child process of its own (see the
+[ICAP guide](/scanner/guides/icap/#with-the-clamd-listener)).
+
+### Health listener
+
+Under the worker pool, a `PING` to the clamd listener waits for a free worker,
+so while every worker is in a long scan a health check times out and restarts a
+daemon that is only busy. `--listen-health` opens an address that does no
+scanning and waits for no worker, and answers in the protocol of its scheme:
+
+```sh
+exav --listen clamd://0.0.0.0:3310 --listen-health clamd://127.0.0.1:3311
+exav --listen icap://0.0.0.0:1344  --listen-health icap://127.0.0.1:1345
+```
+
+| Scheme | Answers | Refuses |
+|---|---|---|
+| `clamd://` | `PING` (`PONG`), `VERSION`, and `STATS` | every other command, with an error |
+| `icap://` | `OPTIONS` | `REQMOD` and `RESPMOD`, with `405` |
+
+`STATS` is the pool's: the counters are kept in memory every process of the pool
+shares, so the health listener, the scan listener and a `clamdtop` pointed at
+either report the same totals. Without the pool (`--workers threads`, ICAP
+alone) there is one process and the totals are its own.
+
+The listeners are served by a child process of their own under the pool, and by
+threads otherwise. Each connection is a thread, up to `?max-connections=` (64
+by default), and a client has five seconds to send its request. No address is
+opened unless one is named. `exav --ping` probes the health listener when the
+same configuration names one, so a container health check stays `exav --ping`.
 
 ### Socket permissions
 
 The Unix socket is created `0600` (owner only); `?mode=` widens it, as
-`LocalSocketMode` does in `clamd.conf`. A milter, MTA or web server under
-another UID needs it; prefer a shared group (`660`) to `666`. The mode is octal,
-a value that is not a workable mode is refused, and the socket is created with
-no permissions and given its mode immediately, whatever the umask.
+`LocalSocketMode` does in `clamd.conf`. The mode is octal, and a value that is
+not a workable mode is refused. See
+[Who may connect](/scanner/guides/daemon/#who-may-connect).
 
 ### Sending a file the daemon cannot open
 
@@ -388,8 +416,9 @@ paths, which the daemon opens itself; `--send-as` sends the file instead:
 
 `fd` is the cheapest (no copy) and needs a Unix socket; asking for it over TCP is
 refused rather than falling back to the path. `contents` works anywhere. Both
-send the parts of a byte-split archive together (`EXINSTREAM MULTI`) so the
-archive is scanned whole; by path, the same job is a `CONTSCAN` of the directory.
+send the parts of a split archive (byte-split, RAR or ZIP volumes) together
+(`EXINSTREAM MULTI`) so the archive is scanned whole; by path, the same job is a
+`CONTSCAN` of the directory.
 
 A client walks a directory itself in every mode and sends one request per file,
 so `--exclude`, `--exclude-dir`, `--include`, `--files-from` and `--no-recursive`
@@ -470,8 +499,6 @@ the [ClamAV flag matrix](/scanner/reference/clamav-flag-matrix/).
 
 ## Exit codes
 
-`0` `OK`, clean; `1` `FOUND`, a detection; `2` `ERROR`, exav could not do its job;
-`3` `PARTIAL`, something could not be fully examined (`LIMITS-EXCEEDED`,
-`UNSCANNABLE` or `PASSWORD-PROTECTED`), unless `--partial-as` says otherwise.
-When files differ, `1` wins over `2`, and `2` over `3`; see
+`0` `OK`, `1` `FOUND`, `2` `ERROR`, `3` `PARTIAL`, unless `--partial-as` says
+otherwise. When files differ, `1` wins over `2`, and `2` over `3`; see
 [Verdicts & exit codes](/scanner/reference/verdicts/#process-exit-code).
diff --git a/www/src/content/docs/scanner/reference/comparison-with-clamav.md b/www/src/content/docs/scanner/reference/comparison-with-clamav.md
index 39112baa..04c08f83 100644
--- a/www/src/content/docs/scanner/reference/comparison-with-clamav.md
+++ b/www/src/content/docs/scanner/reference/comparison-with-clamav.md
@@ -74,9 +74,39 @@ anchor-index pass plus cheap hash lookups, checked for correctness by
 a raw database builds the signature index, which costs time and memory; the
 [prebuilt `.exavdb`](/scanner/guides/prebuilt-database/) moves that cost off the
 scanning hosts, and the resident [daemon](/scanner/guides/daemon/) pays the load once.
-Raw matching throughput on very large databases is still being optimised. No
-speed comparison is claimed: the differential harness measures agreement, not
-speed.
+
+### A measurement
+
+`clamscan` and `exav` scanned the same 5,705 samples (1.54 GB, every
+MalwareBazaar file of a local corpus up to 1 MiB: PE, ELF, Office documents,
+PDF, scripts, archives and disk images), each as one process on one core, with
+the signatures `freshclam` keeps (ClamAV 1.4.3, `main`, `daily` and `bytecode`)
+and the files in the page cache. The start, which loads the signatures, is
+timed on one small file and taken off. Each figure is the median of three runs.
+
+| | Start | Scan | Files/s | MB/s | CPU time | Peak memory |
+|---|---|---|---|---|---|---|
+| `clamscan` | 8.7 s | 1,432 s | 4.0 | 1.1 | 1,350 s | 1.3 GB |
+| `exav` | 17.6 s | 339 s | 16.8 | 4.5 | 328 s | 1.5 GB |
+| `exav --clamav-compat` | 16.1 s | 328 s | 17.4 | 4.7 | 318 s | 1.5 GB |
+
+exav scans about 4 times faster here, in wall time and in CPU time alike.
+`--clamav-compat` is the row that does no more work than ClamAV does (its
+limits, its unpackers, no extra decoders), and it is no slower. Loading the
+raw signatures takes twice as long as `clamscan`'s start; from a prebuilt
+[`.exavdb`](/scanner/guides/prebuilt-database/#what-it-costs) it takes a second
+or two.
+
+What this is not: one machine (3 cores, arm64), one corpus (malware, not
+typical files), one signature set, one thread. It says nothing about the
+daemons, which scan in parallel, nor about large files, since the set was kept
+small enough to stay in the cache. Two runs were stretched by hours of wall
+time by a pause of the virtual machine, with their CPU time unchanged, which is
+why the medians are taken. `scripts/bench-speed.sh` runs it again on any corpus.
+The detection counts differ (1,143 files for `clamscan`, 1,381 for exav, 1,305
+under `--clamav-compat`): the count is not what is measured here, and
+[differential testing](/scanner/concepts/differential-testing/) is what
+compares what each finds.
 
 Wildcard-signature verification does not backtrack. A body's token program is
 run as a simulation over reachable position intervals, so an unbounded gap costs
@@ -102,7 +132,7 @@ each axis. (For the catalogue see [Supported formats](/scanner/reference/formats
 | **Signature scope (`Target:`, TDB)** | Most `Target:` values ([details](#targets)), and every TDB attribute any engine implements. A signature with a constraint exav cannot evaluate is refused and counted ([details](#signature-metadata-tdb-attributes)). | none |
 | **YARA** | none | Seven modules work (`pe`, `elf`, `dotnet`, `math`, `hash`, `string`, `time`); rules importing another (such as `macho`, `dex` or `cuckoo`) are rejected per rule and counted, so one unsupported rule cannot drop a feed. Matching is cross-checked against `yara-x`. No wasmtime or Cranelift behind it. In ClamAV no module works; even `pe` fails to load. |
 | **Archive codecs** | none | ZIP members compressed with LZMA, bzip2, zstd, XZ or PPMd are decoded. Members whose sizes are deferred to a trailing data descriptor are carved and scanned. |
-| **Container formats** | none | Virtual disks ClamAV does not open: VHD, VHDX, QCOW2 (compressed clusters included) and VMDK (sparse and streamOptimized, as inside an OVA), reconstructed to the guest disk and rescanned, with the NTFS and FAT filesystems inside them. Also UDF, WIM, KWAJ, LZ4, ARC and Unix `compress` (`.Z`). |
+| **Container formats** | none | Virtual disks ClamAV does not open: VHD, VHDX, QCOW2 (compressed clusters included) and VMDK (sparse and streamOptimized, as inside an OVA), reconstructed to the guest disk and rescanned, with the filesystems inside them (NTFS, FAT, exFAT, ext2/3/4, HFS+, APFS). Also SquashFS, cramfs, romfs, EROFS, UDF, WIM, KWAJ, LZ4, ARC and Unix `compress` (`.Z`). |
 | **Decryption** | none | ZIP, 7z and RAR3/RAR5 (encrypted headers included), encrypted DMG, PDF and Office are decrypted with the password pool and the built-in passwords ([details](/scanner/reference/formats/#encryption-and-passwords)). What stays encrypted, PKWARE Strong Encryption included, is reported `PASSWORD-PROTECTED`; ClamAV returns `OK` for an encrypted archive unless `--alert-encrypted-archive` is passed. |
 | **PE unpacking** | none | UPX and the aPLib family are unpacked by decoders, and the result is rebuilt in ClamAV's layout so ClamAV hash signatures over its rebuilt image match. Everything else that looks packed has its stub run under a bounded x86 interpreter ([how](/scanner/concepts/pe-emulation/)); ClamAV ships a hand-written unpacker per family. |
 | **PE trust** | Authenticode is parsed and matched against a block list; the certificate chain is not verified. | none |
@@ -126,11 +156,9 @@ make exav skip content or crash, report it privately as a
 
 ## Evidence for what ClamAV does not open
 
-Each container, codec and decryption claim above was checked by building a container of the
-format with the EICAR test file inside and scanning it with ClamAV 1.4.3 and
-1.5.3: detection proves the container was decoded and walked, while recognising
-the type proves nothing. Where EICAR could not be injected, real samples were
-extracted with a third-party tool and their members hash-matched.
+Each container, codec and decryption claim above was checked by scanning a
+container of the format with the EICAR test file inside: detection proves the
+container was decoded and walked, while recognising the type proves nothing.
 
 ClamAV has no support for NTFS, FAT12/16/32, VHD, VHDX, QCOW2 or VMDK: no file
 type is defined for any of them, and images containing EICAR came back clean. It
@@ -186,8 +214,8 @@ recursive extraction the scanner uses.
 exav is younger than ClamAV and does not match it everywhere. Most gaps below
 show up as `UNSCANNABLE`, `LIMITS-EXCEEDED` or a counted skip: a gap costs
 coverage, not a false all-clear. The exceptions are detections exav does not
-implement (the [heuristics](#heuristic-alerts), and the `Target:` values and
-ELF and Mach-O offsets [below](#targets)): there
+implement (the [heuristics](#heuristic-alerts), and the `Target:` values
+[below](#targets)): there
 a file gets `OK` where ClamAV would alert. A signature with a constraint exav
 cannot evaluate is refused rather than loaded without it, since that would make
 it fire more broadly than the format allows. See the [roadmap](/project/roadmap/)
@@ -201,15 +229,65 @@ subsets where the shipped database has so far used only the implemented part).
 
 ### Formats and unpacking
 
-| Gap | ClamAV | exav |
+Measured with ClamAV 1.4.3 and 1.5.3. Where a container could hold the EICAR
+test file, it was scanned with it inside; otherwise its members were extracted
+with a third-party tool, hashed into a signature database, and the untouched
+container scanned. For everything exav does not decode, see the
+[complete gap list](/unpack/formats/#the-complete-gap-list).
+
+**Neither engine opens these.** ClamAV answers `OK` for each, and exav says the
+members went unexamined.
+
+| Format / codec | ClamAV | exav |
+|---|---|---|
+| ACE | No support: 200 members of a real ACE went unextracted | `UNSCANNABLE` |
+| StuffIt / StuffIt X | No support: real `.sit` and `.sitx` unextracted | `UNSCANNABLE` |
+| Inno Setup | No support: stops at "Recognized MS-EXE/DLL", 71 members unreached | `UNSCANNABLE` |
+| ZIP method 10 (DCL Implode) | Enumerates the entry, then `unsupported method (10)` | `UNSCANNABLE` |
+| ZIP methods 94 / 96 / 97 (MP3, JPEG, WavPack) | No support | `UNSCANNABLE` |
+| PKWARE Strong Encryption | No support | `PASSWORD-PROTECTED` |
+| WIM LZMS resources | No support for WIM at all: no `CL_TYPE_WIM`, all four test images clean | `UNSCANNABLE`; other WIM resources are decoded |
+
+Not measured, and likely a gap: RAR 1.5 and 2.x compression, which ClamAV's
+UnRAR-derived RAR support reads.
+
+**Both decode these**, or ClamAV types them. This comes from checking exav
+against ClamAV's own `CL_TYPE_*` enumeration rather than a hand-assembled list;
+`clamscan --debug` reports dedicated submodules for EGG, ALZ and HWP, all on by
+default.
+
+| Format | ClamAV | exav |
 |---|---|---|
-| **InstallShield MSI** | `CL_TYPE_ISHIELD_MSI` | Recognised, reported `UNSCANNABLE` |
-| **CRYPTFF** | `CL_TYPE_CRYPTFF` | Recognised, reported `PASSWORD-PROTECTED` |
+| **EGG** (ESTsoft, Korean) | Decodes; `Heuristics.Encrypted.EGG` shows members are parsed deeply enough to detect encryption | Decodes (store/deflate/bzip2/LZMA/AZO) |
+| **ALZ** (ESTsoft, Korean) | Decodes; magic added at flevel 210 | Decodes (store/bzip2/deflate) |
+| **HWP3** (Hangul Word Processor) | Decodes, with its own scan-option bit, `MAX_RECHWP3` and `--max-rechwp3` | Decodes (deflate body) |
+| CAB Quantum | Decodes | Decodes |
+| **InstallShield MSI** | `CL_TYPE_ISHIELD_MSI`, types and handles | Recognised, reported `UNSCANNABLE` |
+| **CRYPTFF** | `CL_TYPE_CRYPTFF`, types and handles | Recognised, reported `PASSWORD-PROTECTED` |
+
+EGG and ALZ matter for Korean-language targets, where ALZip is common; HWP3 is
+the Korean government's standard document format and a recurring spear-phishing
+carrier. SZDD is decoded regardless of layout; ClamAV accepts it only when the
+tenth byte is zero and reports "not supported" otherwise. PDF `DCTDecode`,
+`CCITTFax`, `JBIG2` and `JPXDecode` streams are decoded by neither: the raw
+stream is matched as stored.
 
-These rows come from ClamAV's own `CL_TYPE_*` enumeration (see
-[the full format status](/scanner/reference/formats/#checked-against-clamavs-own-type-list)).
-For everything exav does not decode, including formats neither engine opens, see
-the [complete gap list](/unpack/formats/#the-complete-gap-list).
+**ClamAV does not recognise these.** A format with no detection is the weaker
+failure: the file is scanned as whatever it types as, its members are never
+reached, and the scan can come back clean.
+
+| Format | ClamAV | exav |
+|---|---|---|
+| InstallShield `.z` archive | No support | Decoded |
+| ext2/3/4, exFAT, SquashFS, cramfs, romfs, EROFS | No support | Decoded |
+| ZOO | No support | Decoded |
+| VHD, VHDX, QCOW2, VMDK, NTFS, FAT, HFS+, APFS | No support | Decoded |
+| InstallShield InstallScript cabinet | No support | Recognised, reported `UNSCANNABLE` |
+| AppleSingle / AppleDouble | No support | Recognised, reported `UNSCANNABLE` |
+| lrzip | No support | Recognised, reported `UNSCANNABLE` |
+
+[Evidence for what ClamAV does not open](#evidence-for-what-clamav-does-not-open)
+has the disk image measurements.
 
 ClamAV natively unpacks 10 PE packer families. exav unpacks four of them with
 decoders (UPX, Petite, FSG, NsPack) and the other six by
@@ -306,10 +384,10 @@ positives (observed: a Java CVE signature firing on APK members).
 | 3 | HTML | Supported (restricted to HTML and RTF) |
 | 4 | Mail | Supported |
 | 5 | Graphics | Supported: an object that reads as an image, or one a `HandlerType:CL_TYPE_GRAPHICS` signature re-typed |
-| 6 | ELF | Supported, but `EP` and section offsets do not resolve (see below) |
+| 6 | ELF | Supported, with `EP` and section offsets (see below) |
 | 7 | ASCII text | Supported |
 | 8 | *(unused)* | Not implemented; a reserved slot in ClamAV too |
-| 9 | Mach-O | Supported, but `EP` and section offsets do not resolve (see below) |
+| 9 | Mach-O | Supported, with section offsets; `EP` does not resolve, as in clamscan (see below) |
 | 10 | PDF | Supported |
 | 11 | Flash / SWF | Supported (`FWS` uncompressed, `CWS`/`ZWS` compressed) |
 | 12 | Java class | Supported (gated on the `cafebabe` magic) |
@@ -325,11 +403,16 @@ reads: it hashes as the same pixels do in a PNG. A build without the
 is matched against them whatever its target. The hash is ClamAV's to the bit
 ([exav-imagehash](/subprojects/exav-imagehash/)).
 
-The entry point and sections are read from a PE only. ClamAV also resolves
-`EP`, `Sn`, `SL` and `SEn` offsets on ELF and Mach-O files; in exav a
-subsignature anchored that way on one never matches, and the file can come
-back `OK` where ClamAV alerts. None of the 5,767 ELF and Mach-O signatures in
-`daily` 28140 (October 2026) uses such an offset.
+The entry point and sections are read from the headers of a PE, an ELF or a
+Mach-O. On an ELF, `EP` is the entry point's file offset, found through the
+loadable segment that maps it (the memory past the segment's bytes included),
+and `Sn`, `SL` and `SEn` are the section headers' file ranges, counted from the
+null section; on a Mach-O, `Sn`, `SL` and `SEn` count the sections of every
+segment in load order. Each was measured against clamscan 1.4.3 with a
+signature at the offset and a control three bytes off. `EP` on a Mach-O is not
+resolved, by exav or by clamscan (neither `LC_MAIN` nor `LC_UNIXTHREAD`, in
+32 and 64 bits). None of the 5,767 ELF and Mach-O signatures in `daily` 28140
+(October 2026) uses such an offset.
 
 ### Signature-format coverage
 
@@ -469,21 +552,6 @@ recognition rather than extraction.
 * **RAR volume sets** are not joined by either engine. exav reports the split
   member and scans the part present in the volume it was given.
 
-### Things that look like gaps and are not
-
-Formats neither engine decodes, or both do:
-
-| Format | ClamAV | exav |
-|---|---|---|
-| ACE, StuffIt, Inno Setup | No support | Recognised, reported |
-| ZIP method 10 (DCL Implode) | Enumerates the entry, cannot extract | Reported per member |
-| PDF `DCTDecode` / `CCITTFax` / `JBIG2` / `JPXDecode` | Not decoded; falls back to the raw stream | Not decoded |
-| CAB Quantum | Decodes | Decodes |
-| EGG (store, deflate, bzip2, LZMA, AZO), ALZ, HWP3 | Decodes | Decodes |
-
-SZDD is decoded regardless of layout; ClamAV accepts it only when the tenth byte
-is zero and reports "not supported" otherwise.
-
 ## Out of scope for now
 
 exav prioritises CLI and server use: scanning files and directories, and
diff --git a/www/src/content/docs/scanner/reference/configuration.md b/www/src/content/docs/scanner/reference/configuration.md
index c11fdc72..e1028744 100644
--- a/www/src/content/docs/scanner/reference/configuration.md
+++ b/www/src/content/docs/scanner/reference/configuration.md
@@ -55,10 +55,11 @@ have no flag or variable: they go on the `--listen` address. See
 
 ### Removed variables
 
-The variables of two removed flags are still read, only to stop the run with a
-message naming what replaced them: `EXAV_MAX_EXTRACTED_BYTES` (see
-[Limits](/scanner/reference/limits/)) and `EXAV_BUILD_SHARD_BYTES`. Delete them from an
-image or unit file when upgrading to 0.0.2.
+The variable of a removed flag is still read, only to stop the run with a
+message naming what replaced it: `EXAV_BUILD_SHARD_BYTES`. Delete it from an
+image or unit file when upgrading. (`EXAV_MAX_EXTRACTED_BYTES` was removed in
+0.0.2 and is the variable of `--max-extracted-bytes` again; see
+[Limits](/scanner/reference/limits/).)
 
 ### Diagnostics
 
@@ -70,12 +71,8 @@ production.
 | `EXAV_DEBUG_BC_WARN` | Set: warn once per stubbed bytecode API a signature calls. See [Bytecode sandbox](/scanner/concepts/bytecode-sandbox/). |
 | `EXAV_DEBUG_BC_TRACE`, `EXAV_DEBUG_BC_FN=<n>` | Trace bytecode execution, optionally for one function. |
 
-The test suites and examples read a few more, each described where it is
-used: `EXAV_DEBUG_YR_BIN` (the `yr` binary the YARA differential tests run),
-`EXAV_DEBUG_YARA_CORPUS`, `EXAV_DEBUG_YARA_BENCH_RULES`,
-`EXAV_DEBUG_PARITY_DB`, `EXAV_DEBUG_PARITY_CORPUS`, `EXAV_DEBUG_PARITY_LIMIT`,
-`EXAV_DEBUG_RAR_CORPUS` (a directory of RAR samples whose members the RAR
-decoder checks against their stored CRCs) and `EXAV_DEBUG_BC_FORCED`.
+The test suites and examples read a few more `EXAV_DEBUG_*` variables, described
+where they are used.
 
 ## Migrating a ClamAV container
 
diff --git a/www/src/content/docs/scanner/reference/feature-flags.md b/www/src/content/docs/scanner/reference/feature-flags.md
index dbc1b6c5..2a25c160 100644
--- a/www/src/content/docs/scanner/reference/feature-flags.md
+++ b/www/src/content/docs/scanner/reference/feature-flags.md
@@ -16,7 +16,7 @@ pages: [exav-core](/subprojects/exav-core/#features),
 ## Default features
 
 ```toml
-default = ["yara", "all-formats", "decrypt", "dlp", "phishing", "icap", "image-hash"]
+default = ["yara", "all-formats", "decrypt", "dlp", "phishing", "icap", "image-hash", "visible-text"]
 ```
 
 The default build is pure Rust and links no TLS stack; HTTP is opt-in.
@@ -31,6 +31,9 @@ The default build is pure Rust and links no TLS stack; HTTP is opt-in.
 | `dlp` | yes | The structured-data leak heuristics (`--dlp-credit-cards` / `--dlp-ssns`). |
 | `phishing` | yes | The phishing heuristic `--detect phishing` runs, and the `.pdb`/`.gdb`/`.wdb` URL lists it reads. |
 | `image-hash` | yes | `fuzzy_img#` subsignatures, through [exav-imagehash](/subprojects/exav-imagehash/) and its image decoders. Without it those signatures load as unsupported (counted, with the reason), and no image is ever decoded. |
+| `visible-text` | yes | [The text a reader sees](/scanner/reference/formats/#the-text-a-reader-sees) of Markdown, HTML, the XML parts of Office and OpenDocument files, and DXF/DWG drawings, matched as one more text view. Read by [exav-render](/subprojects/exav-render/#text)'s `text` (pulldown-cmark, html5gum's tokenizer, quick-xml). Not under `--clamav-compat`. |
+| `visible-text-pdf` | **no** | And PDF's, read by hayro. Off by default because `hayro-interpret` turns on `hayro-syntax`'s `unsafe` feature, which switches every `flate2` in the build to zlib-rs (a damaged stream then gives back other bytes) and adds SIMD to the image decoders, and because it adds some 40 crates. hayro puts no bound on what a stream decompresses to, so a PDF is given to it only after exav's own reader has taken every stream within the limits. |
+| `visible-text-office` | **no** | And the legacy and flat office formats (DOC, XLS, PPT, RTF, SYLK, Numbers, Pages, Keynote and others, listed under [the text a reader sees](/scanner/reference/formats/#the-text-a-reader-sees)), read by [exav-render](/subprojects/exav-render/#text)'s `text-office`. Safe Rust and within the scan's limits, but the largest readers of the scan, so not a default. Speaker notes and the text of animations are not in the view. |
 | `icap` | yes | The [ICAP (RFC 3507) server](/scanner/guides/icap/) and its `--icap-*` flags. Pure Rust, no extra dependencies; binds nothing unless an `icap://` address is given. |
 | `http` | **no** | HTTP(S) support: both halves below, and the only thing that links a TLS stack (`ureq` → `rustls` → `ring`). In `exav-core`, `http` is only the range-request backend (`dep:ureq`); in `exav` it is `http = ["http-scan", "http-update"]`. |
 | `http-scan` | no | Scanning an `http(s)://` argument, and the daemon's `SCANURL` command. Both also need `--allow-http-scan` at run time. |
@@ -82,9 +85,8 @@ member name and offers `__exav_panic__`, `__exav_oom__` and `__exav_stack__`.
 
 A panic must come back as a reported result rather than a dead process. An abort
 or a stack overflow cannot be contained inside the process; the tests check that
-both are reported, not taken for clean. `make test-native` runs `panic_containment` in `exav-unpack` and the
-`decoder_crash` suite in `exav` with the feature on; without it those tests skip.
-The browser package runs the same checks in `npm run test:e2e`.
+both are reported, not taken for clean. `make test-native` runs the checks with
+the feature on, and the browser package runs them in `npm run test:e2e`.
 
 It is never in a shipped build: the container image, release binaries and npm
 package are built without it, and no default enables it.
@@ -94,7 +96,8 @@ package are built without it, and no default enables it.
 Turn off the defaults and pick what you need:
 
 ```sh
-# Pure-Rust scanner: no TLS, YARA, DLP, phishing or ICAP
+# Archive formats and decryption only: no YARA, DLP, phishing, ICAP,
+# image hashing or visible-text views
 cargo build --release -p exav --no-default-features --features all-formats,decrypt
 
 # A ZIP scanner with YARA
diff --git a/www/src/content/docs/scanner/reference/formats.md b/www/src/content/docs/scanner/reference/formats.md
index 0a4e256a..c4e38ef6 100644
--- a/www/src/content/docs/scanner/reference/formats.md
+++ b/www/src/content/docs/scanner/reference/formats.md
@@ -12,7 +12,9 @@ reported `UNSCANNABLE`, `PASSWORD-PROTECTED` or `LIMITS-EXCEEDED`, never
 
 Containers are opened by the extractor, [exav-unpack](/unpack/). Its
 [Supported formats](/unpack/formats/) page has the codec-level detail; this
-page is what the scanner does with each kind of file.
+page is what the scanner does with each kind of file, and the
+[format matrix](/project/formats/) has every format, with what the extractor
+and the viewer do with it.
 
 ## File types
 
@@ -23,14 +25,14 @@ rules. On top of that:
 | Type | What the scanner does with it | Signatures that apply to it alone |
 |---|---|---|
 | PE (Windows executables and DLLs) | Reads the entry point, sections, imports, icons, version information and Authenticode signer; unpacks a packed file ([below](#packed-executables)) | `Target:1`; `EP`, section and `VI` offsets; section hashes (`.mdb`, `.msb`), import hashes (`.imp`), icons (`.idb`), signer block list (`.crb`); YARA `pe` and `dotnet` |
-| ELF | Scanned as it is; a UPX-packed one is unpacked | `Target:6`; YARA `elf`. `EP` and section offsets do not resolve ([gap](/scanner/reference/comparison-with-clamav/#targets)) |
-| Mach-O | A universal binary is split per architecture; each is scanned as it is, and a UPX-packed one unpacked | `Target:9`, with the same offset gap |
+| ELF | Scanned as it is; a UPX-packed one is unpacked | `Target:6`, with `EP` and section offsets ([how](/scanner/reference/comparison-with-clamav/#targets)); YARA `elf` |
+| Mach-O | A universal binary is split per architecture; each is scanned as it is, and a UPX-packed one unpacked | `Target:9`, with section offsets (`EP` does not resolve, as in clamscan) |
 | OLE2 (legacy Office, MSI) | Every stream; VBA macros decompressed, Excel 4.0 (XLM) macros, `Ole10Native` payloads; encrypted Excel decrypted | `Target:2` |
 | OOXML (`.docx`, `.xlsx`, `.pptx`) | Opened as the ZIP it is; told apart as Word, Excel or PowerPoint for `Container:`; encrypted documents decrypted | as for its members |
-| PDF | Streams decoded through their filters (Flate, LZW, ASCII85, ASCIIHex, RunLength), JavaScript and URI and launch targets collected, the document decrypted. Image streams (DCT, JBIG2, JPX, CCITT) are matched as stored | `Target:10` |
+| PDF | Streams decoded through their filters (Flate, LZW, ASCII85, ASCIIHex, RunLength; a filter given as a reference is followed, and the identity `/Crypt` is passed over), JavaScript and URI and launch targets collected, the document decrypted. Image streams (DCT, JBIG2, JPX, CCITT) are matched as stored; a stream with any other filter is reported. The header may follow up to a kilobyte of other bytes, and an object that does not end does not hide the ones after it | `Target:10` |
 | HTML | A normalised view (entities decoded, lowercased, whitespace collapsed) and, for script, a normalised and a deobfuscated JavaScript view; inline base64 assets extracted | `Target:3`, on the normalised view |
 | RTF | Both an HTML and a text view; embedded objects extracted | `Target:3` and `Target:7` |
-| Email (MIME), MHTML | Every part decoded and scanned; a MIME document with no mail envelope is a saved web page (MHTML) | `Target:4`, on the raw message |
+| Email (MIME), MHTML | Every part decoded and scanned, the last part of a multipart nothing closed included, a base64 part read as far as it decodes, and a file uuencoded into a text part; a message is known by its header block (any first field, in any case), and a MIME document with no mail envelope is a saved web page (MHTML) | `Target:4`, on the raw message |
 | Text, scripts | A normalised text view, and JavaScript views when the content looks like script; Script Encoder (`#@~^`) decoded; base64-encoded executables decoded ([below](#found-inside-other-files)) | `Target:7`, on the normalised view |
 | Images | PNG, GIF, JPEG, TIFF, BMP; with the `image-hash` feature (on by default) also WebP, ICO, PNM, QOI, DDS, farbfeld, HDR, JPEG 2000 and JBIG2. Each is hashed as ClamAV's `sigtool --fuzzy-img` hashes it | `Target:5`; `fuzzy_img#` |
 | SWF | Compressed movies (`CWS`, `ZWS`) decompressed and rescanned | `Target:11` |
@@ -41,6 +43,25 @@ not run. `HandlerType:` re-types an object and scans it again as the new
 type, as in ClamAV. [Comparison with ClamAV](/scanner/reference/comparison-with-clamav/#targets)
 covers the targets in detail.
 
+### The text a reader sees
+
+Beside its bytes, a document is matched through its visible text: the words
+without the marks, tags, escapes or run boundaries, entities decoded, and each
+link followed by where it goes (`label (target)`). That text is one more view,
+which `Target:0` and `Target:7` signatures see, and `--detect phishing` judges
+its links. It is the `visible-text` [feature](/scanner/reference/feature-flags/),
+off under `--clamav-compat`.
+
+| Read in the default build | Read with an opt-in feature |
+|---|---|
+| Markdown (`.md`, `.markdown`), HTML, the XML parts of Word, PowerPoint, Excel and OpenDocument files, DXF and DWG drawings | PDF (`visible-text-pdf`); DOC, XLS, PPT, RTF, Word 2003 XML, SpreadsheetML 2003, SYLK, flat OpenDocument (FODT, FODS, FODP, FODG), Numbers, Pages and Keynote (`visible-text-office`) |
+
+A document of a kind that has such a text, whose text cannot be taken out
+(encrypted, past a limit, damaged), is still scanned as bytes, and the scan is
+`PARTIAL`, never `OK`. A compound file (`.doc`, `.xls`, `.ppt` and their
+templates) is read as an office document by its extension only, so that an
+installer is not read whole to find out.
+
 ## Containers
 
 Every format exav-unpack opens is opened when scanning, and its members
@@ -48,11 +69,14 @@ scanned in turn:
 
 - **Archives:** ZIP (every common method), 7z, RAR3 and RAR5, tar, CAB, CHM,
   ARJ, LHA, ZOO, ARC, ALZ, EGG, InstallShield `.z`, `ar`, cpio, xar.
-- **Compressed streams:** gzip, bzip2, xz, zstd, lzip, LZ4, Unix `compress`
-  (`.Z`), SZDD, KWAJ.
+- **Compressed streams:** gzip, bzip2, xz, zstd, lzip, `.lzma`, LZ4, Unix
+  `compress` (`.Z`), SZDD, KWAJ.
+- **Packages:** RPM (scripts and payload). A ZIP behind other bytes (a stub, a
+  header, padding) is opened when its end record agrees with where it starts.
 - **Disk images:** ISO 9660 and UDF, Apple DMG, the virtual disks VHD, VHDX,
   QCOW2 and VMDK reconstructed to the guest disk, GPT, APM and MBR partition
-  maps, and the FAT, NTFS and ext2/3/4 filesystems inside them, WIM.
+  maps, and the filesystems inside them (FAT, exFAT, NTFS, ext2/3/4, HFS+,
+  APFS), SquashFS, cramfs, romfs and EROFS images, WIM.
 - **Documents:** OLE2, OOXML, PDF, RTF, HWP3, OneNote, Adobe XDP, Word and
   Excel 2003 flat XML.
 - **Mail:** MIME, TNEF (`winmail.dat`), BinHex, uuencode.
@@ -63,8 +87,13 @@ scanned in turn:
   (their embedded objects and preview images; a drawing is not rendered).
 
 A set split into byte-numbered parts (`x.7z.001`, `x.7z.002`, ...) and met
-inside one container is joined and scanned whole. RAR and ZIP volume sets are
-not joined; a member continued in another volume is reported.
+inside one container is joined and scanned whole. RAR, ZIP and CAB volume sets
+met there are not joined; a member continued in another volume is reported.
+Next to each other on disk, or sent together to the daemon, they are: a RAR set
+(`x.part1.rar`, `x.r00`), a ZIP set (`x.z01`, ..., `x.zip`) and a CAB set (each
+cabinet's header names the next). Scanning one volume of such a set by name
+scans the archive its siblings make as well, looked for in the same directory
+among regular files (a symbolic link is not a sibling).
 
 ### Found inside other files
 
@@ -77,10 +106,15 @@ them in every object:
   own type: up to 16 images of each kind and 32 archives per object. An
   object holding more is reported `LIMITS-EXCEEDED` unless something is
   found, and the other members of its container are still scanned.
-- **Base64.** A base64-encoded executable in a text file (a PE in a PowerShell
-  one-liner) is decoded and scanned, and so are the `data:` URIs and base64
-  assets of HTML and flat-XML Office documents. `--no-decode base64` turns it
-  off (see [Detection](/scanner/reference/cli/#detection)).
+- **Base64.** A base64-encoded executable or archive (ZIP, gzip, 7z, RAR, xz)
+  in a text file (a PE in a PowerShell one-liner, a ZIP in an `atob` string) is
+  decoded and scanned, and so are the `data:` URIs and base64 assets of HTML
+  and flat-XML Office documents. A text file is one with a stretch that is
+  mostly text, sampled from its start to its end. Up to 8 executables or
+  archives, from 64 runs that start like one, are decoded in a text file, and 16
+  assets in a page; a file with more is reported `LIMITS-EXCEEDED` unless
+  something is found. `--no-decode base64` turns it off (see
+  [Detection](/scanner/reference/cli/#detection)).
 
 ### Packed executables
 
@@ -96,24 +130,22 @@ signatures unpack is scanned too.
 
 ## Size: what is read as it goes, and what is read whole
 
-These are decoded as they are read, at any size: ZIP, tar, CAB, ISO/UDF, LHA,
-`ar`, cpio, TNEF, OneNote, SWF, SZDD, partition maps, self-extracting
-executables, universal Mach-O, `.pyc`, and the single-stream compressors. A
-member that decodes past `--max-object-bytes` goes to a
+[Which formats the extractor reads as it goes](/unpack/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)
+(ZIP, tar, 7z, WIM, xar, disk images and the filesystems in them, and more) is
+on its page. In the scanner, a member or a file in a filesystem that is past
+`--max-object-bytes` goes to a
 [spill file](/scanner/reference/cli/#buffering-a-stream-spill) and is scanned
-from there, or is reported `LIMITS-EXCEEDED` with spilling off. The
-exceptions: ZIP Shrink, Reduce and Implode members, and encrypted ZIP
-members, are decoded whole under that limit.
+from there, or is reported `LIMITS-EXCEEDED` with spilling off. A file a
+filesystem stores compressed (HFS+ and APFS decmpfs, NTFS LZNT1) is decoded
+whole under that limit and reported `UNSCANNABLE` past it, and the walk goes on.
 
-A DMG is walked at any size, but each file in it is held whole, under
-`--max-object-bytes`; an encrypted DMG is decrypted whole under the same limit.
+Every format the extractor reads whole (RAR, OLE, PDF, CHM, ARJ and email, among
+others) is reported `LIMITS-EXCEEDED` when larger than `--max-object-bytes`
+(256 MiB by default), and its members are not scanned. Raise the limit where
+such files are expected.
 
-Every other container is read whole: one larger than `--max-object-bytes`
-(256 MiB by default) is reported `LIMITS-EXCEEDED` and its members are not
-scanned. That includes RAR, OLE, PDF, CHM, ARJ, xar, email, WIM, and the
-virtual disks and filesystems (VHD, VHDX, QCOW2, VMDK, FAT, NTFS, ext), which
-are often larger than that: raise `--max-object-bytes` where such images are
-expected. 7z is read whole too, but its members stream out of it.
+For what a scan holds, and what needs disk, by kind of input, see
+[Streaming & memory](/scanner/concepts/streaming-memory/#can-a-file-be-larger-than-the-ram).
 
 A file of any size is scanned through a block cache rather than loaded. The
 checks that parse an object whole (a PE's structure, YARA's `pe`, `elf` and
@@ -179,70 +211,5 @@ ClamAV, not the unpacking of executables.
 
 ## Compared with ClamAV
 
-The measurements below come from ClamAV 1.4.3 and 1.5.3. Where a container
-could hold the EICAR test file, it was scanned with it inside; otherwise its
-members were extracted with a third-party tool, hashed into a signature
-database, and the untouched container scanned.
-
-### Formats neither opens
-
-| Format / codec | ClamAV | exav |
-|---|---|---|
-| ACE | No support: 200 members of a real ACE went unextracted | `UNSCANNABLE` |
-| StuffIt / StuffIt X | No support: real `.sit` and `.sitx` unextracted | `UNSCANNABLE` |
-| Inno Setup | No support: stops at "Recognized MS-EXE/DLL", 71 members unreached | `UNSCANNABLE` |
-| ZIP method 10 (DCL Implode) | No support: enumerates the entry, then `unsupported method (10)` | `UNSCANNABLE` |
-| ZIP methods 94 / 96 / 97 (MP3, JPEG, WavPack) | No support | `UNSCANNABLE` |
-| PKWARE Strong Encryption | No support | `PASSWORD-PROTECTED` |
-| WIM LZMS resources | No support for WIM at all: no `CL_TYPE_WIM`, all four test images clean | `UNSCANNABLE`; other WIM resources are decoded |
-
-None of these is a capability gap against ClamAV, but ClamAV answers `OK`
-for each, and exav says the members went unexamined. Not measured, and
-likely a gap: RAR 1.5 and 2.x compression, which ClamAV's UnRAR-derived RAR
-support reads.
-
-### Checked against ClamAV's own type list
-
-These come from checking exav against ClamAV's own `CL_TYPE_*` enumeration
-rather than a hand-assembled list. `clamscan --debug` reports dedicated
-submodules for EGG, ALZ and HWP, all on by default, and its shipped magic
-database types all five formats below.
-
-| Format | ClamAV | exav | Evidence of decoding in ClamAV |
-|---|---|---|---|
-| **EGG** (ESTsoft, Korean) | Decodes | **Decodes** (store/deflate/bzip2/LZMA/AZO) | `EGG` submodule on by default; `Heuristics.Encrypted.EGG` exists, so members are parsed deeply enough to detect encryption |
-| **ALZ** (ESTsoft, Korean) | Decodes | **Decodes** (store/bzip2/deflate) | `ALZ` submodule on by default; magic added at flevel 210 |
-| **HWP3** (Hangul Word Processor) | Decodes | **Decodes** (deflate body) | `HWP` submodule on by default, with its own scan-option bit, engine option `MAX_RECHWP3` and `--max-rechwp3` flag |
-| **ISHIELD_MSI** (InstallShield MSI) | Types and handles | Recognised, reported `UNSCANNABLE` | dedicated `CL_TYPE_ISHIELD_MSI` |
-| **CRYPTFF** | Types and handles | Recognised, reported `PASSWORD-PROTECTED` | dedicated `CL_TYPE_CRYPTFF` |
-
-EGG and ALZ matter for Korean-language targets, where ALZip is common; HWP3 is
-the Korean government's standard document format and a recurring
-spear-phishing carrier.
-
-### Formats ClamAV does not recognise
-
-A format with no detection is the weaker failure: the file is scanned as
-whatever it types as, its members are never reached, and the scan can come
-back clean.
-
-| Format | ClamAV | exav |
-|---|---|---|
-| InstallShield `.z` archive | No support | Decoded |
-| ext2/3/4 | No support | Decoded |
-| ZOO | No support | Decoded |
-| VHD, VHDX, QCOW2, VMDK, NTFS, FAT | No support | Decoded |
-| InstallShield InstallScript cabinet | No support | Recognised, reported `UNSCANNABLE` |
-| AppleSingle / AppleDouble | No support | Recognised, reported `UNSCANNABLE` |
-| lrzip | No support | Recognised, reported `UNSCANNABLE` |
-
-[Evidence for what ClamAV does not open](/scanner/reference/comparison-with-clamav/#evidence-for-what-clamav-does-not-open)
-has the disk image measurements.
-
-### Packers
-
-ClamAV natively unpacks 10 packer families, each with a hand-written
-submodule. exav unpacks four of them with dedicated decoders and the rest
-through the emulator. SUE and Yoda's Protector (not Yoda's Cryptor) are
-detection-only in ClamAV, covered by PUA packer signatures in the optional
-`.?du` databases, and so is MPRESS outside its bytecode signature.
+Which formats ClamAV opens and exav does not, and the reverse, is in
+[Comparison with ClamAV](/scanner/reference/comparison-with-clamav/#formats-and-unpacking).
diff --git a/www/src/content/docs/scanner/reference/limits.md b/www/src/content/docs/scanner/reference/limits.md
index 7c471635..9e82dce4 100644
--- a/www/src/content/docs/scanner/reference/limits.md
+++ b/www/src/content/docs/scanner/reference/limits.md
@@ -25,7 +25,11 @@ column is for [library users](/subprojects/exav-core/) (`Limits` in exav-unpack,
 | `--max-pe-emulation-steps` | `Limits::max_pe_emulation_steps` | 1,000,000,000 | Emulator instructions across all packed executables in one file |
 | `--max-unpack-depth` | `Limits::max_recursion` | 16 | Nesting depth, containers inside containers |
 | `--max-members` | `Limits::max_members` | 100000 | Member-count blowup |
-| none (lowered by `--max-process-bytes`) | `Limits::max_extracted_bytes` | 1 GiB | What extractors hold at once across the whole recursion |
+| `--max-extracted-bytes` (lowered by `--max-process-bytes`) | `Limits::max_extracted_bytes` | 1 GiB (400M under `--clamav-compat`) | What formats that decode a member whole have produced so far in one scan; never released. Members streamed to the matcher are not counted (ZIP, 7z, TAR, CAB and the stream codecs scan past it, bounded by `--max-matcher-bytes`) |
+| `--max-bytecode-memory-bytes` (lowered by `--max-process-bytes`) | `Limits::max_bytecode_memory_bytes` | 256 MiB | What one run of a bytecode signature holds: its `malloc`s, its call frames and the globals it reads; past it the run stops as incomplete |
+| `--object-cache-bytes` (lowered by `--max-process-bytes`) | `ScanOptions::object_cache_bytes` | 8 MiB | Memory held by the block cache of each object read in place; not a limit on what is scanned, only on how often the source is read again |
+| `--object-cache-block-bytes` | `ScanOptions::object_cache_block_bytes` | 1 MiB | The unit of that cache, and of a request that does not continue the previous one over HTTP |
+| `--http-request-bytes` (lowered by `--max-process-bytes`) | `ScanOptions::http_request_bytes` | 8 MiB | The most one HTTP range request fetches, and holds while it is read |
 | none | `Limits::max_compression_ratio` | 1000 | One stream that expands past the ratio |
 | none | none (fixed) | 16 of each kind | PE, ELF or Mach-O images [carved](/scanner/reference/formats/#found-inside-other-files) from one object |
 | none | none (fixed) | 32 | Archives carved from one object |
@@ -34,16 +38,20 @@ Each bound has one spelling; `clamscan`'s names (`--max-filesize`,
 `--max-scansize`, `--max-files`) are refused with an error naming the exav flag.
 See [the flag matrix](/scanner/reference/clamav-flag-matrix/).
 
-The total a scan may hold has no flag of its own, and no flag raises it. It is
-1 GiB (400M under `--clamav-compat`), and `--max-process-bytes` can only lower
-it, together with `--max-object-bytes`, to what fits the memory a scan gets (see
+`--max-extracted-bytes` is the total a scan may decode whole. It counts the
+members that a format decodes into memory (RAR, OLE streams, PDF streams, RTF
+objects, installers and the like), added up over the scan; a member streamed to
+the matcher is not in it, so a ZIP, 7z, TAR or CAB that unpacks to several
+gigabytes is scanned, within `--max-matcher-bytes`. It is 1 GiB (400M under
+`--clamav-compat`), `off` or `0` removes it, and `--max-process-bytes` lowers
+it, together with `--max-object-bytes` and `--max-bytecode-memory-bytes`, to what fits
+the memory a scan gets (see
 [the kernel backstops](#the-kernel-backstops)): beside an object held whole, an
 image decoded from it and its grey copy can take as much again twice, so one
 object is kept to a quarter of that memory, and the total to what leaves room
 for those plus a tenth. Matching makes no other copy of an object but a
 lowercase one of at most 16 MiB. The
 default 2 G changes neither the default limits nor `--clamav-compat`'s.
-`--max-extracted-bytes`, which set it before 0.0.2, is refused.
 
 `--clamav-compat` sets `--max-input-bytes` to 100M, `--max-unpack-depth` to 17
 and `--max-members` to 10000, and holds 400M per file, both in total and as the
@@ -113,7 +121,7 @@ a third-party decoder, or a loop that produces no output.
 
 | Flag | Bounds | Default | Where it applies |
 |---|---|---|---|
-| `--max-scan-secs SECS` | Wall clock, and CPU time in the pool | 120 in the pool, unset otherwise | Per job in the clamd worker pool; the whole run in a one-shot scan. Refused on any other listener (`--workers threads`, ICAP alone). |
+| `--max-scan-secs SECS` | Wall clock, and CPU time in the pool | 120 in the pool, unset otherwise | Per job in the clamd worker pool; the whole run in a one-shot scan, which the limit ends where it is, the files after it unscanned, with the exit status of what was found by then (`1` for a detection, `2` for an error) and otherwise the one `--partial-as` gives a `LIMITS-EXCEEDED` (`3`). Refused on any other listener (`--workers threads`, ICAP alone). |
 | `--max-process-bytes SIZE` | Address space (`RLIMIT_AS`) | 2G in the pool, unset otherwise | Per clamd worker in the pool; the whole process in a one-shot scan or any other listener. |
 
 ICAP scans get no `--max-scan-secs` in any mode. Under the pool the ICAP
@@ -123,8 +131,9 @@ budgets, fitted to `--max-process-bytes`, are what bound its scans.
 Setting `--max-process-bytes` also keeps what a scan holds inside it:
 `--max-object-bytes` is lowered to a quarter of it, and the 1 GiB extraction
 total to what leaves room for an image decoded from the largest object and its
-grey copy (twice its size) plus a tenth. The in-core cap then fires first and reports a limit
-instead of the kernel killing the scan. In the pool, the per-worker figure is
+grey copy (twice its size) plus a tenth. `--object-cache-bytes` and
+`--http-request-bytes` are each lowered to an eighth of it. The in-core cap
+then fires first and reports a limit instead of the kernel killing the scan. In the pool, the per-worker figure is
 also lowered to what the host can back: RAM, less a third for the rest of the
 system, less the shared database, divided by `--workers`. A daemon job stopped
 by `--max-scan-secs` is answered `LIMITS-EXCEEDED` before its worker exits.
@@ -163,14 +172,21 @@ The verdict reason names the budget that stopped the scan. Read it first: the
 flags bound different quantities, and raising the wrong one changes nothing.
 
 - A large archive of ordinary files: `--max-members`.
-- The total a scan holds: no flag raises it past 1 GiB (400M under
-  `--clamav-compat`). If `--max-process-bytes` lowered it (exav says so at
-  startup, with the figures), raising that gives the total back (in the pool,
-  only as far as the host's RAM allows); past that point it changes nothing.
+- The total a scan decodes whole: `--max-extracted-bytes`. If
+  `--max-process-bytes` lowered it (exav says so at startup, with the figures),
+  raise that first (in the pool, only as far as the host's RAM allows); past
+  that point raising this one changes nothing.
+- A bytecode signature that stops as incomplete: `--max-bytecode-memory-bytes`.
 - One large file, or one large member of an archive: `--max-object-bytes` (and
   `--max-input-bytes` if you set one). Under `--max-process-bytes` it is also
   capped at a quarter of that.
 - A member streamed past the matcher budget: `--max-matcher-bytes`.
+- A scan of a large file or an `http(s)://` object that works but is slow: not a
+  limit, so no verdict names it. The object is read from its source several times
+  over, and a request or read per block; see `--object-cache-block-bytes`,
+  `--object-cache-bytes` and `--http-request-bytes`, and the
+  [block cache](/scanner/concepts/streaming-memory/#the-block-cache) for the
+  figures.
 - Deeply nested archives: `--max-unpack-depth`.
 - Many packed executables in one file: `--max-pe-emulation-steps`.
 - A stream past a spill budget: `--max-spill-bytes`, `--max-total-spill-bytes`,
diff --git a/www/src/content/docs/subprojects/exav-core.md b/www/src/content/docs/subprojects/exav-core.md
index acce730a..44bdade3 100644
--- a/www/src/content/docs/subprojects/exav-core.md
+++ b/www/src/content/docs/subprojects/exav-core.md
@@ -39,6 +39,10 @@ scan.
 - **The native [YARA engine](/scanner/guides/yara/)** and a step-capped
   [bytecode interpreter](/scanner/concepts/bytecode-sandbox/) for `.cbc` programs, both
   without runtime code generation.
+- **A text view of documents** (`visible-text`): a document's words as a
+  reader sees them, with each link followed by where it goes, are matched
+  beside its bytes, through [exav-render](/subprojects/exav-render/#text). A
+  document whose text cannot be taken out marks the scan incomplete.
 - **Content-based file typing**, PE parsing, fuzzy and similarity scoring, the
   prebuilt-`.exavdb` builder, and an HTTP range-reader backend (`http`
   feature) that scans a large remote file through the block cache instead of
@@ -223,7 +227,10 @@ names.
 
 | Feature | What it does |
 |---|---|
-| default | `yara`, `all-formats`, `decrypt`, `dlp`, `phishing`, `image-hash`: the `exav` binary's defaults minus its `icap` |
+| default | `yara`, `all-formats`, `decrypt`, `dlp`, `phishing`, `image-hash`, `visible-text`: the `exav` binary's defaults minus its `icap` |
+| `visible-text` | [The text a reader sees](/scanner/reference/formats/#the-text-a-reader-sees) of a document is matched as a text view |
+| `visible-text-pdf` | And PDF's, through hayro; not a default (see [feature flags](/scanner/reference/feature-flags/)) |
+| `visible-text-office` | And the legacy and flat office formats, through exav-render's office converters; not a default |
 | `http` | The HTTP range-request reader (`dep:ureq`) |
 | `checksums` | Lets `ScanOptions::verify_checksums` make a container checksum mismatch an error |
 | `unstable-internals` | Makes the engine internals (`engine`, `bytecode`, `pe`, …) public, for tools; no stability promise |
diff --git a/www/src/content/docs/subprojects/exav-grep.md b/www/src/content/docs/subprojects/exav-grep.md
index 1df82924..5fc33c57 100644
--- a/www/src/content/docs/subprojects/exav-grep.md
+++ b/www/src/content/docs/subprojects/exav-grep.md
@@ -74,16 +74,74 @@ needs:
 | Flag | Purpose |
 |---|---|
 | `--passwords <PASSWORD>` | Try on encrypted members (repeatable), before the [built-in passwords](/unpack/formats/#encryption-support) |
-| `--max-object-bytes <BYTES>` | Cap on what any single member may decompress to, and on the size of an input file (default 256 MiB) |
+| `--max-object-bytes <BYTES>` | The most held in memory at once for one file or member (default 256 MiB); see [Memory](#memory) |
 | `--max-members <N>` | Cap on members visited inside each input file |
 | `--max-unpack-depth <N>` | Cap on archive-within-archive nesting |
 | `--quiet-unreadable` | Suppress unreadable-member reports |
+| `--text` | Search the text a reader sees rather than the bytes, for the files that have one ([below](#searching-the-text)). Needs the `text` feature, which is a default. A text cut at its size limit is reported unreadable (exit `3`) |
 
 The limits are the scanner's decompression-bomb budget, spelled as
 [`exav`](/scanner/reference/cli/#scan-limits) spells them, so pointing it at a hostile
-archive is safe. Each input file is read whole into memory, so one larger than
-`--max-object-bytes` is reported unreadable (exit `3`) rather than read; raise
-the flag to search it.
+archive is safe.
+
+## Memory
+
+A file is read as the search needs it, and never whole past 16 MiB. A container
+is walked through a block cache; anything else is searched a megabyte at a time,
+a line at a time. A 3.4 GB log was searched with an 18 MB peak, and a 1.5 GB
+stored member of a ZIP with 280 MB, under a 700 MB memory limit.
+
+`--max-object-bytes` is what may be held at once. A member up to it is held, so
+that a container inside it can be opened. A longer one is searched as it is
+read, whatever its size. Two things are then reported unreadable (exit `3`),
+never skipped quietly: a container inside such a member, which cannot be opened
+without holding it, and a line longer than the limit. Nothing is written to
+disk, so there is no spill file to hold a nested container: that is
+[on the roadmap](/project/roadmap/). A format the extractor [reads
+whole](/unpack/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)
+(RAR, OLE, PDF and others) is reported unreadable past the limit, as it is by
+the scanner.
+
+## Searching the text
+
+`--text` searches the words a reader sees instead of the bytes of the file,
+for the kinds of file that have some, in an archive too:
+
+- Markdown, HTML, the XML parts of Office and OpenDocument files, and DXF and
+  DWG drawings, in the default build;
+- PDF, with the `text-pdf` feature, which is not a default;
+- the legacy and flat office formats, with the `text-office` feature, which is
+  not a default either.
+
+[The scanner's page](/scanner/reference/formats/#the-text-a-reader-sees) lists
+the formats of each.
+
+Entities are decoded, and each link is followed by where it goes,
+`label (target)`. Matches are reported under `file!text`, with the text's line
+numbers. A workbook or a presentation is searched sheet by sheet and slide by
+slide, and a match says which:
+
+```text
+$ exav-grep --text -F "Second sheet" book.xls
+book.xls!text/sheet "Notes":2:Second sheet	1
+$ exav-grep --text -F "Second slide" deck.ppt
+deck.ppt!text/slide 2:2:Second slide text
+$ exav-grep --text -F costs report.doc
+report.doc!text:2:Revenue grew by twelve percent over the quarter, while costs stayed flat.
+```
+
+A document that is also a container (a PDF, a drawing) is walked for its
+members as before. A compound file is read as an office document only by its
+extension, so that an installer is not read whole to find out.
+
+A document of those kinds whose text cannot be taken out (encrypted, past a
+limit, damaged) is reported unreadable, with the reason, and its bytes are
+searched instead. With no match the exit code is `3`, never `1`: finding
+nothing in a document it could not read is not a clean answer.
+
+```bash
+cargo install exav-grep --features text-office
+```
 
 ## What it searches
 
diff --git a/www/src/content/docs/subprojects/exav-render.md b/www/src/content/docs/subprojects/exav-render.md
index 16de5c8c..a33390e2 100644
--- a/www/src/content/docs/subprojects/exav-render.md
+++ b/www/src/content/docs/subprojects/exav-render.md
@@ -1,6 +1,6 @@
 ---
 title: exav-render
-description: Memory-safe decoders that turn a file into something to draw, raster images into pixels, DWG and DXF drawings and IFC and STL models into GPU-ready buffers, behind @exav/viewer and exav-imagehash.
+description: Memory-safe decoders that turn a file into something to draw, raster images into pixels, DWG and DXF drawings and IFC, STL, OBJ, PLY and glTF models into GPU-ready buffers, and spreadsheets, presentations and text documents into XLSX, PPTX and DOCX, behind @exav/viewer and exav-imagehash.
 ---
 
 **Memory-safe decoders that turn a file into something to draw.** The Rust
@@ -11,9 +11,10 @@ so is the DWG reader it vendors.
 
 ```toml
 [dependencies]
-exav-render = "0.0.2"                                            # images
-exav-render = { version = "0.0.2", features = ["dwg"] }           # and drawings
-exav-render = { version = "0.0.2", features = ["ifc", "stl"] }    # and models
+exav-render = "0.0.3"                                            # images
+exav-render = { version = "0.0.3", features = ["dwg"] }           # and drawings
+exav-render = { version = "0.0.3", features = ["ifc", "stl"] }    # and models
+exav-render = { version = "0.0.3", features = ["office"] }        # and office documents
 ```
 
 ## Images
@@ -55,6 +56,280 @@ exav-imagehash hashes them like the other formats, so a `fuzzy_img#`
 signature made from a PNG matches the same picture stored as JPEG 2000 or
 JBIG2.
 
+JPEG XL (feature `jxl`, not a default: libclamav does not decode it and it is
+the largest decoder here) is decoded by
+[zenjxl-decoder](https://crates.io/crates/zenjxl-decoder) (BSD-3-Clause), a
+fork of the libjxl team's jxl-rs that is `forbid(unsafe_code)` unless its
+`allow-unsafe` feature is on, and is built without its SIMD. The first frame
+comes back as 8-bit grey with alpha or RGBA, in sRGB, a codestream or a
+container alike. The caller's budget is the decoder's: its pixel and memory
+limits are set from it, so a file declaring more than the budget is refused
+from its header. `@exav/viewer`'s image module has it.
+
+## Camera RAW
+
+Feature `raw`, a default. A RAW file holds the sensor data and, beside it,
+JPEG previews of several sizes, sometimes an uncompressed RGB one. The reader
+(`exav_render::image::raw`) finds them and `decode_any` shows the largest the
+budget allows, as 8-bit pixels with the Exif orientation applied (the JPEG's
+own, else the file's). The sensor data is never decoded: a file with no
+preview, such as most phones' DNG, is `Error::NoPreview`, not a blank.
+
+```rust
+use exav_render::image::{decode_any, raw, DECODE_MAX};
+
+let bytes = std::fs::read("IMG_0001.CR3")?;
+assert_eq!(raw::detect(&bytes), Some(raw::Kind::Cr3));
+let pixels = decode_any(&bytes, DECODE_MAX)?;
+# Ok::<(), Box<dyn std::error::Error>>(())
+```
+
+| Family | Read as |
+|---|---|
+| DNG (and the Leica, Ricoh, Pentax, GoPro and phone files that are DNG), Canon CR2, Phase One IIQ | TIFF directories |
+| Olympus ORF (`IIRO`, `IIRS`, `MMOR`), Panasonic RW2, RAW and Leica RWL (`IIU`) | TIFF directories with the makers' own magic numbers |
+| Nikon NEF and NRW, Sony ARW, SR2 and SRF, Pentax PEF, Samsung SRW, Hasselblad 3FR, Kodak, Epson, Mamiya, Leaf | TIFF/EP directories: told from a plain TIFF by sensor data in the file (a colour filter array, a maker's compression, the DNG tags), or by a camera maker's name beside a SubIFD or a thumbnail |
+| Canon CR3 | an ISO base media file (`ftyp` brand `crx `); the orientation is in its metadata boxes |
+| Fujifilm RAF, Sigma X3F, Canon CRW | a signature, then a search for the JPEG streams |
+| Minolta MRW | a signature; it holds no JPEG, so it is `NoPreview` |
+
+Detection is by the first bytes and, for a TIFF-structured file, its
+directories, never the name. A plain TIFF, even one that kept a camera's Make
+tag, is not claimed: `Format::detect` and `decode` read every TIFF as TIFF
+(which is what exav-imagehash must do), and only `decode_any` and
+`raw::decode` try a RAW file first.
+
+The previews of a TIFF-structured file are listed from the tags the
+specifications give them: JPEGInterchangeFormat, and strips of JPEG or of
+8 or 16-bit RGB or grey (taken by their high byte), in every directory the
+chain, the SubIFDs and the Exif pointer reach. Every file is also searched for
+JPEG streams, which is where the makers keep theirs (maker notes, boxes,
+sections): a stream counts when its marker segments are well formed up to a
+first scan, with a baseline, extended sequential or progressive frame of
+8 bits. Lossless JPEG, which is what sensor data is compressed with, is not
+read, and neither is the baseline JPEG of a lossy DNG's linear raw data, which
+the directory that holds it tells apart. The reader takes the largest, tries
+the next when one does not decode, and counts each as the RGBA the page holds
+(four bytes a pixel, six when it must be turned) against the budget, so a
+preview over it gives way to a smaller one.
+
+Every offset and count in the file is checked against the data. A directory is
+read once, at most 64 are read, nested at most 3 deep, with at most 1,024
+entries and 65,536 strips each; at most 512 JPEG start markers are tried and
+64 streams kept, each walked once. A file that panics a decoder is
+`Undecodable`. The `raw_preview` fuzz target runs all of it.
+
+## Markdown
+
+Feature `markdown`, not a default. CommonMark with tables and strikethrough is
+read by [pulldown-cmark](https://crates.io/crates/pulldown-cmark) (MIT), built
+without its `html` and `simd` features so that no markup is made and the crate
+is `forbid(unsafe_code)`, and folded into a tree of `Block`s and `Inline`s
+with no step that recurses on the input.
+
+```rust
+use exav_render::markdown::{parse, Block};
+
+let doc = parse("# Title\n\nSome *text* and [a link](https://example.com).");
+assert!(matches!(doc.blocks[0], Block::Heading { level: 1, .. }));
+let json = doc.to_json(); // the shape @exav/viewer's page reads
+```
+
+Raw HTML is text (a `<script>` is the characters `<script>`), and an image is
+its alt text. A link is kept only for an absolute `http:`, `https:` or
+`mailto:` address of at most 2048 bytes without a space, control, line or
+paragraph separator or bidirectional control character and, for the web ones,
+without credentials
+(`https://bank.example@evil.example`); any other is its label alone. Quotes and
+lists nest to 10 and what is deeper is kept as text, inlines to 32, a table
+has at most 64 columns, and past 100,000 nodes the rest of the document is
+left out and `Document::truncated` says so. It reads in linear time on every
+hostile input tried (1 MB of unclosed brackets, emphasis runs, backticks,
+nested quotes and lists, wide tables), and the `markdown` fuzz target checks
+the bounds and the JSON.
+
+## Office documents
+
+Features `office-sheets`, `office-slides` and `office-docs`, or `office` for
+the three; none is a default. The modules `exav_render::sheets`, `slides` and
+`docs` turn a document that an Open XML renderer cannot read into the Open XML
+package it can: a spreadsheet into XLSX, a presentation or a drawing into
+PPTX, a text document into DOCX. This is how `@exav/viewer` opens them: the
+three modules run in workers, one wasm module each. They are written from
+published specifications and from what other converters do with sample files
+(their output, never their code); the notices are in the crate's `NOTICE`.
+
+```rust
+use exav_render::sheets::{convert, Format, Limits};
+
+let bytes = std::fs::read("budget.ods")?;
+let xlsx = convert(&bytes, Format::Ods, &Limits::default())?.xlsx;
+# Ok::<(), Box<dyn std::error::Error>>(())
+```
+
+Nothing is recalculated and no macro runs: a formula keeps its text and its
+cached result. A password-protected file is refused (`Error::Encrypted`),
+except an XLS encrypted with Excel's default password, which opens.
+
+| Module | To | Reads |
+|---|---|---|
+| `sheets` | XLSX | Excel 2.x to 2003 (BIFF2 to BIFF8, templates and workspaces; a lenient compound file reader), ODS, FODS and OTS, Apple Numbers (3 and later, '08 and '09), and the text formats Excel opens from a .xls name: XML Spreadsheet 2003, HTML tables and SYLK |
+| `slides` | PPTX | PowerPoint 95 and 97 to 2003 (.ppt, .pps, .pot; 2 to 4 are recognised and reported as unsupported), ODP, FODP and OTP, Apple Keynote of every version; and drawings: ODG, OTG and FODG, and Visio 2013 and later (VSDX, VSDM, VSTX, VSTM) |
+| `docs` | DOCX | Word 6 to 2003 (.doc, .dot), ODT, OTT and FODT, RTF, Word 2003 XML, Word's HTML (and its MHT form) and Apple Pages (text, page size and margins) |
+
+What each keeps:
+
+- **Spreadsheets**: values, formulas as text with their cached results, styles
+  and number formats, merges, conditional formats, validations, comments,
+  links, pictures, shapes and charts.
+- **Presentations**: masters, placeholders, styles, shapes with their
+  geometry, text, pictures, tables and charts, every property resolved in the
+  PPTX written. `convert_first` converts the first slides only, and
+  `convert_first_from` reads a package part by part from any `Read + Seek`
+  source, so that one that fetches byte ranges fetches only what the slides
+  converted need.
+- **Drawings**: a page becomes a slide, named as the page is, in the size of
+  the largest page. An ODG, OTG or FODG drawing leaves out the layers that are
+  not displayed. A Visio drawing is read through its masters and styles, the
+  formulas where a master's depend on the instance, geometry rows and
+  splines, text, pictures, layers, hyperlinks and the theme's colours. The
+  Visio reader is written from Microsoft's published Visio file format
+  reference and [MS-VSDX]. The binary `.vsd` and the Visio 2003 XML `.vdx`
+  are not read: `@exav/viewer` sends them to an external converter.
+- **Text documents**: styles stay styles; sections with their headers and
+  footers, lists, tables, notes, comments, fields, pictures and OfficeArt
+  shapes. Tracked changes in a DOC are drawn as strike-through and underline.
+
+Every conversion is bounded by `Limits`, one per module, and fails with
+`Error::TooLarge` rather than convert part of a document. The error's `kind()`
+is `not-format`, `encrypted`, `unsupported`, `too-large` or `malformed`.
+
+| Limit | `sheets` | `slides` | `docs` |
+|---|---|---|---|
+| Input | 256 MiB | 512 MiB | 512 MiB |
+| Memory the model and the output may take | 1 GiB | 1 GiB | 1 GiB |
+| One decompressed part | 256 MiB | 256 MiB | 256 MiB |
+| Cells | 4,000,000 | | 2,000,000 |
+| Sheets | 4,096 | | |
+| Slides | | 10,000 | |
+| Shapes | | 1,000,000 | |
+| Paragraphs | | | 5,000,000 |
+
+The `sheets_*`, `slides_*` and `docs_*` fuzz targets run the readers and the
+writers (`docs/FUZZING.md`).
+
+### How close the pages come
+
+`@silurus/ooxml` draws the converted file, and the page is compared with the
+same page of a reference rendering (a PDF of the original made by an office suite), by structural similarity
+(SSIM). A page is **close** or **near** when its score is in the upper bands;
+close is the stricter. These are results on the project's own collections of
+public sample files, which are not part of the repository, and the figures
+move with the drawing engine.
+
+| Format | Files | Pages close | Pages near | Documents close | Median SSIM |
+|---|---|---|---|---|---|
+| ODG | 63, of which 61 convert (two are not drawings) | 43 of 73 (58.9%) | 51 of 73 (69.9%) | 36 of 60 | 0.981 |
+| FODG | | 28 of 52 (53.8%) | | | 0.951 |
+| VSDX | 48, all convert | 58 of 71 (81.7%) | 66 of 71 (93.0%) | 36 of 45 (80%) | 0.983 |
+| DOC | | 32% of pages | | | |
+
+The ODG and VSDX rows were measured with @silurus/ooxml 0.88.0; the ODG
+results are the same with 0.89.1, which `@exav/viewer` uses now, and FODG
+with 0.89.1 is 28 of 52 pages close (27 with 0.88.0). For comparison, a DOCX
+file drawn natively comes out close on 50% of its pages: the `docs` converter
+is a prototype.
+
+### Speed
+
+Release build, native. A drawing converts in a few milliseconds:
+ODG in a median 1 ms (90th percentile 2.6 ms, slowest 19 ms), FODG in a median
+1 ms (90th percentile 4.8 ms), VSDX in a median 3 ms (90th percentile 32 ms;
+the slowest, a 13 MB file, 1.2 s). In wasm it is several times slower. Reading
+only the text of a document is faster than converting it:
+
+| Format | Text only | Converted |
+|---|---|---|
+| Spreadsheets (`sheets`) | 38 MB/s | 21.5 MB/s |
+| Text documents (`docs`) | 37 MB/s | 16 MB/s |
+| PPT | 113 MB/s | 67 MB/s |
+| FODP | 33 MB/s | 22 MB/s |
+| Keynote | 193 MB/s | 128 MB/s |
+
+The median document of `docs` takes 0.36 ms to read and 0.52 ms to convert.
+
+### In the viewer
+
+The converters are the wasm modules `exav_viewer_sheets`, `exav_viewer_slides`
+and `exav_viewer_docs` (sizes on the [viewer's Integration page](/viewer/integration/#two-kinds-of-files)).
+Each is built with a 2 GiB memory cap and imports nothing but wasm-bindgen's
+plumbing ([Security](/viewer/security/)).
+
+## Text
+
+Features `text`, `text-pdf` and `text-office`, for a scanner or a search: the
+text a reader sees in a document, one entry for every kind that has some. It
+is not used by `@exav/viewer`.
+
+```rust
+use exav_render::text::visible_text;
+
+let limits = exav_unpack::Limits::default();
+let v = visible_text("page.html", b"<p>Click <b>here</b></p>", 1 << 20, &limits).unwrap();
+assert_eq!(v.text, "Click here\n");
+```
+
+Markdown is read as above. HTML goes through html5gum's tokenizer alone (no
+tree), with a sink that keeps the words and drops comments, scripts, styles,
+templates and iframes; an image is its `alt`. The XML parts of Word,
+PowerPoint, Excel and OpenDocument files (known by their path in the package)
+are read by quick-xml, without field codes and deleted text. DXF and DWG
+drawings give their TEXT and MTEXT, attributes with their tags and prompts,
+dimension overrides, multileaders' text, and block and layer names. PDF
+(`text-pdf`) is read by [hayro](https://crates.io/crates/hayro-interpret): each
+page is interpreted, its glyphs come with their Unicode, and they are put back
+in lines and words from where they sit. In all of them a link is its label
+followed by its target, `label (target)`, whatever the target is, and
+`Visible::links` lists the pairs whose label is not the target, for a check of
+what a link says against where it goes.
+
+With `text-office` (not a default; it turns on `office`) the legacy and flat
+office formats the XML parts do not reach are read too: DOC, XLS, PPT, RTF,
+Word 2003 XML, SpreadsheetML 2003, SYLK, the flat OpenDocument files (FODT,
+FODS, FODP, FODG), Numbers, Pages and Keynote. Their text comes from the
+model the converters above read, without writing an Open XML package first,
+and is cut into sections that say where a match is, in `Visible::sections`: a
+sheet (`sheet "Budget"`), a slide (`slide 2`), a header or a note. A table row
+is a line, its cells apart by tabs.
+
+```rust
+use exav_render::text::visible_text;
+
+let limits = exav_unpack::Limits::default();
+let v = visible_text("book.xls", &std::fs::read("book.xls")?, 1 << 20, &limits).unwrap();
+for (label, range) in &v.sections {
+    println!("{label}: {} bytes", range.len()); // sheet "Budget": 123 bytes
+}
+# Ok::<(), Box<dyn std::error::Error>>(())
+```
+
+A compound file is read as an office document only by its extension (`.doc`,
+`.dot`, `.xls`, `.xlt`, `.xlw`, `.ppt`, `.pps`, `.pot`), so as not to read an
+installer or a message whole to find out. RTF, Word 2003 XML, SpreadsheetML,
+flat OpenDocument files and SYLK are told by their first bytes, and the iWork
+files by the name (`.key`, `.keynote`, `.numbers`, `.pages`). A document of
+those kinds whose text could not be taken out (encrypted, past a limit,
+damaged) is never an empty text: `Visible::unreadable` says why, and a scanner
+marks the scan incomplete. Speaker notes and the text of animations are left
+out, as the converters leave them out.
+
+hayro puts no bound on what a PDF stream decompresses to (a 1 MB file took
+2.1 GB), so a PDF is handed to it only after exav-unpack's reader has taken
+every stream within `Limits`; one that goes past them is cut, not read. A
+panic in hayro is contained. `hayro-interpret` turns on `hayro-syntax`'s
+`unsafe` feature itself, which switches every `flate2` in the build to zlib-rs;
+that is why `text-pdf` is not a default of the crates that use it.
+
 ## PDF images
 
 `pdf_image` decodes the JPXDecode, JBIG2Decode (with `/JBIG2Globals`) and
@@ -102,9 +377,12 @@ tables, dimensions, leaders and multileaders, blocks with their attributes,
 in their linetypes and lineweights, paper layouts through their
 viewports, and custom objects (ACAD_PROXY_ENTITY, an application's own
 entities such as TArch's walls or Civil 3D's alignments) from the proxy
-graphics they were saved with. External references are counted in
-`Drawing`'s warnings, not drawn, and so are custom objects saved without
-graphics (`proxy_without_graphics`).
+graphics they were saved with. An external reference is drawn
+when the caller has the file it names (`Document::xref_paths` lists the paths,
+`Document::attach_xref` binds a file into the references to it, nested ones
+included, to a depth of eight); otherwise it is counted in `Drawing`'s
+warnings and its path is drawn where it is inserted. Custom objects saved
+without graphics are counted too (`proxy_without_graphics`).
 
 A damaged file is meant to be an error, not a panic, a hang or an
 allocation of gigabytes: the readers' panics are caught where unwinding is
@@ -192,7 +470,8 @@ meshes each product's body in metres: placements and mapped items with
 their transformation operators, extrusions (tapered too) of every profile
 type, revolutions, swept disks, sweeps along a directrix, tessellated and
 polygonal face sets, faceted B-reps with voids, advanced B-reps (planar,
-cylindrical and B-spline faces), shell and face based surface models,
+cylindrical, spherical, toroidal and B-spline faces, each meshed in its
+surface's parameters), shell and face based surface models,
 bounded planes, CSG primitives, booleans with half-spaces and polygonal
 bounded ones, and the openings of `IfcRelVoidsElement` cut out of their
 host. Colours come from styled items, else from the element's material or
@@ -207,18 +486,97 @@ drawn is counted in `scene.warnings`. The tests check each kind of
 geometry against closed-form volumes and extents, and compare elements
 with web-ifc's meshes.
 
-Not drawn faithfully yet:
-
-- B-rep faces on conical, spherical and toroidal surfaces are drawn as flat
-  polygons through their edges (counted in the warnings).
-- B-spline faces are drawn whole: their trimming boundaries are ignored.
-- IFC4X3 alignments and the geometry placed along them are not read.
-- The start and end parameters of sweeps are ignored: the whole directrix
-  is swept.
-- Grid placements (`IfcGridPlacement`) sit at their parent's placement.
-- The viewer lists storeys in the selection only: there is no storey
-  filter.
+Curved faces, sweeps, alignments, grids and storeys:
+
+- **Faces on curved surfaces.** The boundary of a face on a sphere, a
+  torus, a cylinder or a B-spline surface is unrolled into the surface's
+  parameters, the polygon it bounds is meshed there (a regular grid when it
+  is a rectangle, else its triangles are bisected until a side's midpoint is
+  as near the surface as a 32-chord circle's), and the points are those of the
+  surface. A sphere's cap (one loop round a pole) is read, so is a band
+  between two loops with no seam (some writers leave a tube so); a B-spline
+  face is cut by its bounds, their points projected on the surface, and
+  holes are holes. A face whose bounds are not on its surface, or whose
+  edges do not make a loop, is drawn whole (a B-spline) or flat through its
+  edges, and counted in `warnings.unsupported` under its surface's class.
+  Points added in the parameters between two samples of an edge are on the
+  surface, not on the edge: up to a chord's sag off it, more near a pole.
+  There is no cone: no IFC schema has a conical surface (a cone is an
+  `IfcSurfaceOfRevolution`, still drawn flat, with the surfaces of linear
+  extrusion).
+- **Sweeps.** `StartParam` and `EndParam` of `IfcSweptDiskSolid` and the
+  directrix-curve swept area solids are read by each curve's published
+  parametrisation: the index of a polyline's points, the sum of the
+  parametric lengths of a composite curve's segments, an angle in the file's
+  unit on a circle, the multiple of the vector on a line, the knot values
+  of a B-spline. Parameters beyond the curve are its ends; an end before
+  the start sweeps the other way. A curve whose parameters are not published
+  (an indexed poly curve with arcs) is swept whole, and counted.
+- **Alignments (IFC4X3).** `IfcCompositeCurve` of `IfcCurveSegment`s
+  (parents: `IfcLine`, `IfcCircle`, the clothoid and the second, third and
+  seventh order polynomial spirals, `IfcPolynomialCurve`; a negative
+  segment length runs against the parent's sense) and `IfcGradientCurve`
+  (a plan curve and a profile in distance and height) are curves a sweep
+  can follow, and `IfcLinearPlacement` without a Cartesian position is
+  worked out along its curve (the writer's `CartesianPosition` is used when
+  it has one). The alignment's own axis is a curve, which is not drawn.
+- **Grid placements.** `IfcGridPlacement` sits at the intersection of its
+  two axes (lines, polylines, trimmed curves), offset as
+  `IfcVirtualGridIntersection` says, its x axis along the first axis, an
+  explicit direction or towards a second intersection. The grid's own axes
+  are curves, which are not drawn.
+- **Storeys.** `Element::storey` is the building storey an element is in
+  (its container's, or the nearest above it in the spatial tree),
+  `Node::elevation` a storey's elevation in metres, and a `Batch` holds the
+  elements of one storey only (`Batch::storey`), so that a viewer can hide a
+  storey by batch. `@exav/viewer` has a `storeys` controller.
+
+Not read yet: `IfcSegmentedReferenceCurve` (cant), offset curves, the sine
+and cosine spirals, `IfcSectionedSolidHorizontal`, the design parameters of
+`IfcAlignmentSegment`, the parameter curves (`IfcPcurve`) of surface curves.
+
+The evaluation of surfaces and curves is counted as well as the triangles:
+a file may cost about twenty million evaluations, past which a face is
+drawn flat or left out and counted.
 
 `stl::read` takes binary and ASCII STL (a binary file whose header begins
 with "solid" included), the VisCAM and Materialise facet colours, and
 checks a binary file's declared count against its size.
+
+## OBJ, PLY and glTF meshes
+
+Features `obj`, `ply` and `gltf`; `obj::read`, `ply::read` and `gltf::read`
+take the bytes and a triangle budget (200,000 in the fuzz targets, 6 million
+by default in the viewer) and give a `mesh::Scene` of one batch, with one
+element per OBJ group or object, per glTF node that has a mesh, and one for a
+PLY. Triangles are not welded; each has the file's normals where it gives
+usable ones, else its own. No dependency: glTF's JSON is read by a small
+reader of its own.
+
+- **OBJ**: `v` (with `r g b`), `vn`, `f` in the `v`, `v/vt`, `v//vn` and
+  `v/vt/vn` forms with negative indices, `g`, `o`, continued lines. Texture
+  coordinates, materials (`usemtl`; an `.mtl` is never opened) and every other
+  statement are ignored; lines, points and curves are counted in
+  `warnings.unsupported`.
+- **PLY**: ASCII and binary in either byte order; `x y z`, `nx ny nz`, byte,
+  16-bit or float colours; face lists of any count and index type; other
+  elements and properties are skipped by type. A file without faces is a
+  point cloud: an error.
+- **glTF**: `.gltf` with base64 `data:` buffers and `.glb`; node trees with
+  `matrix` or TRS; triangle primitives with 8, 16 or 32-bit indices,
+  `POSITION`, `NORMAL`, `COLOR_0`, strides and sparse accessors; the
+  material's `baseColorFactor` (linear, converted to sRGB). Buffers in other
+  files or at a URL are `Error::External`. Points, lines, strips, fans, Draco
+  and meshopt primitives are counted as unsupported. Textures, animations,
+  skins and morph targets are ignored.
+
+Limits, for files that are hostile: polygons of up to 64 corners are
+ear-clipped within 20 million steps in all, the rest are fanned (linear);
+a polygon past the budget is cut at it. Coordinates that are not finite or
+past 10^12 drop their triangles (`warnings.invalid`). At most 10,000 elements
+(later triangles join the last). glTF: nodes nested at most 256 deep, a node
+with two parents or a cycle is refused, at most 2 million JSON values and 64
+levels of JSON, every accessor and sparse list checked against its view and
+buffer in 64-bit arithmetic before anything is allocated, and the triangles
+looked at, instances of a mesh included, limited to four times the budget (at
+least a million). OBJ and PLY keep the file's axes; glTF is Y up.
diff --git a/www/src/content/docs/subprojects/index.md b/www/src/content/docs/subprojects/index.md
index b0cab0b9..4892db21 100644
--- a/www/src/content/docs/subprojects/index.md
+++ b/www/src/content/docs/subprojects/index.md
@@ -12,7 +12,7 @@ are useful without ever running a virus scan.
 
 | Crate | What it is |
 |---|---|
-| [exav-grep](/subprojects/exav-grep/) | grep for the inside of archives: search recursively through zip/rar/7z/tar/iso/OLE/PDF/email members |
+| [exav-grep](/subprojects/exav-grep/) | grep for the inside of archives: search recursively through zip/rar/7z/tar/iso/OLE/PDF/email members, and with `--text` through the words of documents |
 | [exav-imagehash](/subprojects/exav-imagehash/) | Perceptual image hashes with every step a parameter, reproducing ClamAV's `fuzzy_img` hash and Python imagehash's `phash` bit for bit, as a library and a CLI |
 | [exav-pe-emu](/subprojects/exav-pe-emu/) | A sandboxed x86-32 emulator that unpacks packed Windows executables by running their stub, as a library and a CLI |
 
@@ -21,7 +21,7 @@ are useful without ever running a virus scan.
 | Crate | What it is |
 |---|---|
 | [exav-core](/subprojects/exav-core/) | The scanning engine: database parsing, pattern and hash matching, file typing, and the verdict model, to embed in a program |
-| [exav-render](/subprojects/exav-render/) | Memory-safe decoders that turn raster images, DWG and DXF drawings and IFC and STL models into something to draw, behind `@exav/viewer` and exav-imagehash |
+| [exav-render](/subprojects/exav-render/) | Memory-safe decoders that turn raster images (camera RAW previews included), DWG and DXF drawings, 3D models, and spreadsheets, presentations and text documents (to XLSX, PPTX and DOCX) into something to draw, behind `@exav/viewer` and exav-imagehash; and the text a reader sees in a document, for a scanner or a search |
 | [exav-x86](/subprojects/exav-x86/) | A decode-only x86-32 instruction decoder with no dependencies, checked against an independent decoder over real samples |
 | [exav-update](/subprojects/exav-update/) | The signature-fetching library behind `--auto-update` |
 
diff --git a/www/src/content/docs/unpack/cli.md b/www/src/content/docs/unpack/cli.md
index dbbe5e20..1951bc84 100644
--- a/www/src/content/docs/unpack/cli.md
+++ b/www/src/content/docs/unpack/cli.md
@@ -131,8 +131,9 @@ On purpose:
   members exits 82; when other members came out, the run exits 1 and each
   member left behind is reported `skipping: NAME  incorrect password`. `-t`
   checks without writing anything.
-- A symbolic link whose target leaves the extraction directory is not made, and
-  nothing is written through a link already there. A member name's `..` and
+- A symbolic link whose target leaves the extraction directory is not made,
+  the target being followed through the links already made, and nothing is
+  written through a link already there. A member name's `..` and
   root (`/`, a drive letter) are dropped, so every file lands under the
   extraction directory. Links are made last, once every member is out.
 - Every member is `extracting:`, whatever its compression.
@@ -143,6 +144,7 @@ It restores what the archive records: modification times, the permission bits
 for ZIP and tar. Other formats record less.
 
 Members are written as they are decoded and the archive is read from disk as
-needed, so neither is held in memory whole, except where a format's decoder
-needs it (a 7z solid block, a RAR archive, a CAB folder). A packed executable
-(UPX, or a PE the emulator unpacks) is read whole, up to `--max-memory`.
+needed, so neither is held in memory whole, except for the formats
+[read whole](/unpack/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)
+(RAR, OLE and others), up to `--max-memory`. So is a packed executable (UPX, or
+a PE the emulator unpacks).
diff --git a/www/src/content/docs/unpack/formats.md b/www/src/content/docs/unpack/formats.md
index 39645d86..8d6e92be 100644
--- a/www/src/content/docs/unpack/formats.md
+++ b/www/src/content/docs/unpack/formats.md
@@ -13,14 +13,16 @@ format, and how it reports such content, is on the scanner's
 [Supported formats](/scanner/reference/formats/) page.
 
 Each format is a Cargo feature; see [the crate's features](/unpack/rust/#features)
-to build a subset.
+to build a subset. The [format matrix](/project/formats/) puts what the
+scanner, the extractor and the viewer do with each format side by side.
 
 ## Archives
 
 | Format | Notes |
 |---|---|
 | ZIP | Every common method (see [codecs](#codec-level-coverage)) and [decryption](#encryption-support); orphan local headers and deferred-size members are carved too |
-| gzip · bzip2 · xz · zstd · lzip · `.Z` (LZW) · LZ4 | Streaming decompressors: a member is decoded as it is read, at any size. Concatenated streams and frames are followed for all of them |
+| gzip · bzip2 · xz · zstd · lzip · `.lzma` · `.Z` (LZW) · LZ4 | Streaming decompressors: a member is decoded as it is read, at any size. Concatenated streams and frames are followed for all of them. An xz stream with a check the decoder does not read (SHA-256, the reserved types) is decoded without it, as liblzma does; a `.lzma` file is known by its extension and a plausible header |
+| RPM | The package's install scripts, one member each, and its payload (usually a compressed cpio) |
 | ARC (SEA ARC / PKARC / PAK) | the pre-ZIP archiver; a member failing its CRC-16 after a full decode is still returned, as in ZIP |
 | tar | POSIX/GNU |
 | 7z | Every common coder (see [codecs](#codec-level-coverage)) and AES-256 [decryption](#encryption-support) |
@@ -29,14 +31,18 @@ to build a subset.
 | ARJ · LHA | classic archivers |
 | ALZ · EGG | ESTsoft's Korean archivers: ALZ stored, deflate and bzip2 members; EGG stored, deflate, bzip2, LZMA and AZO members (a block failing its CRC after a full decode is still returned, as in ZIP) |
 | InstallShield `.z` | the older installer archive (PKWARE DCL implode) |
-| ISO · UDF | CD/DVD/Blu-ray images: the ISO 9660 tree (with Joliet) and the UDF tree, including UDF-only images with no ISO 9660 descriptor. A bridge image carrying both is walked once per file |
-| `ar` (.deb / .a) · cpio (RPM) · xar (.pkg) | Unix and package archives |
+| ISO · UDF | CD/DVD/Blu-ray images: the ISO 9660 tree (with Joliet) and the UDF tree, including UDF-only images with no ISO 9660 descriptor. A bridge image carrying both is walked once per file (a file is its first sector and its length) |
+| `ar` (.deb / .a) · cpio (RPM) · xar (.pkg) | Unix and package archives. A cpio is read to the end of the file, every archive of an initramfs in turn, and bytes that are not a header are scanned as they lie |
 | DMG | Apple UDIF, including [encrypted](#encryption-support), with HFS+/APFS extraction; recognised by its trailer when its data opens with a bzip2 or xz run |
 | FAT12/16/32 | files inside a disk image, with their paths, reassembled from the cluster chain, so a fragmented file comes back whole |
-| ext2/3/4 | files inside a Linux disk image, with their paths, reassembled from the inode's extent tree or block map. Symlinks and device nodes hold no bytes and are skipped |
+| exFAT | files inside a disk image or a memory card's, with their paths, reassembled from the cluster chain (or the run a file with no chain is in). What is past a file's valid length reads as zeros |
+| ext2/3/4 | files inside a Linux disk image, with their paths, reassembled from the inode's extent tree or block map (inline data, meta block groups and bigalloc included; a preallocated extent reads as zeros). A file in an encrypted directory is reported. Symlinks and device nodes hold no bytes and are skipped. The journal is not replayed |
+| SquashFS | firmware, live and snap images: gzip, LZMA, LZO, XZ, LZ4 and Zstandard blocks, fragments and sparse blocks, both byte orders; version 4 |
+| cramfs · romfs | the small read-only filesystems of boot images; cramfs in both byte orders, with room for boot code and with holes; romfs with its hard links read as the files they name |
+| EROFS | files stored plain, with their tail after the inode, or in chunks with holes; a file stored compressed is reported |
 | ZOO | Rahul Dhesi's 1986 archiver, both codecs (LZD, a 13-bit LZW, and LZH). A member failing its CRC-16 is still returned, as in ZIP. Deleted members are extracted too: ZOO flags them and leaves the bytes in place |
 | NTFS | files inside a disk image, walked through the MFT: reassembled from their data runs (including across `$ATTRIBUTE_LIST`), read in place when resident, LZNT1-decompressed when compressed. Data runs short of the declared size are reported. The MFT walk also surfaces deleted-but-resident records a directory walk cannot see |
-| WIM (`.wim`/`.esd`) | Windows imaging format: file resources with their paths, uncompressed, XPRESS or LZX. A resource failing its SHA-1 after a full decode is still returned, as in ZIP; LZMS resources are reported |
+| WIM (`.wim`/`.esd`) | Windows imaging format: file resources with their paths, uncompressed, XPRESS or LZX. When checksums are verified (the `checksums` feature), a resource failing its SHA-1 delivers its bytes and then ends its stream with an error; LZMS resources are reported |
 | VHD · VHDX · QCOW2 · VMDK | virtual disks, reconstructed to the guest disk, then opened in turn: VHD fixed and dynamic, VHDX through its block allocation table, QCOW2 including deflate-compressed clusters, VMDK sparse and streamOptimized (the shape inside an OVA). Delta images against a parent (differencing VHD/VHDX, QCOW2 with a backing file) are reported, not skipped |
 
 ALZ and EGG matter for Korean-language targets, where ALZip is common, and so
@@ -58,25 +64,37 @@ The bound on what is held in memory at once is `Limits::max_buffer_bytes`
 (256 MiB by default; `--max-memory` on the command, 1 GiB).
 
 These are decoded as they are read, at any size, and their members come out as
-a `Member::Stream`: ZIP, tar, CAB, ISO/UDF, LHA, `ar`, cpio, TNEF, OneNote,
-SWF, SZDD, partition maps, self-extracting executables, universal Mach-O,
-`.pyc`, and the single-stream compressors above. The exceptions: ZIP Shrink,
-Reduce and Implode members, and encrypted ZIP members, are decoded whole under
-that bound.
-
-A DMG is walked at any size, but each file in it is held whole, under the
-bound; an encrypted DMG is decrypted whole under the same bound. Only data
-forks are read. A file macOS compressed (decmpfs) keeps its bytes in an
-attribute or its resource fork instead: on HFS+, a file with a resource fork
-is reported unsupported; on APFS, and for small HFS+ files compressed into the
-attribute alone, such a file reads as empty.
+a `Member::Stream`: ZIP, tar, CAB, ISO/UDF, LHA, `ar`, cpio, 7z, WIM, xar,
+TNEF, OneNote, SWF, SZDD, partition maps, self-extracting executables,
+universal Mach-O, `.pyc`, and the single-stream compressors above. The
+exceptions: ZIP Shrink, Reduce and Implode members, encrypted ZIP members, and
+the folders of a 7z with an encrypted coder or with several packed streams
+(BCJ2), are decoded whole under that bound. A 7z reads its header and a WIM its
+directory tree whole under it too; the rest of each is read from where it lies
+in the source, so the archive is never held.
+
+Disk images are walked at any size, and a file in one comes out as a stream,
+read from where the volume has it, when it is past the bound; a file within it
+is held. That covers a DMG (an encrypted one is decrypted whole under the same
+bound), the virtual disks VHD, VHDX, QCOW2 and VMDK, which are read as a
+seekable disk (a unit is fetched when a read reaches it, and decoded units are
+cached up to 32 MiB), and the partition maps and filesystems on them or on
+their own: FAT, exFAT, NTFS, ext, SquashFS, cramfs, romfs, EROFS, HFS+ and APFS,
+read in place. A file a filesystem stores compressed is decoded whole under the
+bound and reported, not read, past it, and the walk goes on. A stream that
+fails where the volume stops giving the file ends with an error after the
+bytes there were. A hole of a sparse file reads as zeros, and a file can
+declare a length far past what the volume backs: what a stream gives is bounded
+by the scan budget (`Limits::max_scanned_bytes`). Every APFS volume of a container is walked. A file macOS
+compressed (decmpfs) keeps its bytes in an attribute or its resource fork
+instead, and is unpacked (zlib, LZVN, LZFSE). Any other resource fork is
+reported, not read, and the data fork is read beside it. An encrypted APFS
+volume is reported.
 
 Every other format is read whole: a container larger than the bound is a
 `LimitHit` and its members are not reached. That includes RAR, OLE, PDF, CHM,
-ARJ, xar, email, WIM, and the virtual disks and filesystems (VHD, VHDX, QCOW2,
-VMDK, FAT, NTFS, ext), which are often larger than that: raise the bound where
-such images are expected. 7z is read whole too, but its members stream out of
-it. The scanner's own bounds for the same formats are on its
+ARJ and email, so raise the bound where such files are expected. The
+scanner's own bounds for the same formats are on its
 [Supported formats](/scanner/reference/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)
 page.
 
@@ -126,6 +144,11 @@ cheaper than decoding and removes that hole on its own:
 | InstallShield InstallScript cabinet | Recognised, reported | `ISc(` at 0 |
 | InstallShield `.z` archive | **Decoded** | `13 5D 65 8C` at 0, confirmed against the header's own arithmetic (declared archive size, table-of-contents offset) |
 | ext2/3/4 | **Decoded** | `0xEF53` at offset 1080; nothing at offset 0 identifies the image |
+| exFAT | **Decoded** | `EXFAT   ` at 3, zeros to 64 and `55 AA` at 510 |
+| SquashFS | **Decoded** | `hsqs` (or `sqsh`, big-endian) at 0, and the 96 bytes of the superblock |
+| cramfs | **Decoded** | the magic in either byte order and `Compressed ROMFS` at 16, at 0 or 512 |
+| romfs | **Decoded** | `-rom1fs-` at 0 |
+| EROFS | **Decoded** | `E2 E1 F5 E0` at 1024 |
 | ZOO | **Decoded** | tag `0xFDC4A7DC` at 20 plus a non-zero version byte at 32; the leading `ZOO ?.?? Archive.` text may be anything |
 | AppleSingle / AppleDouble | Recognised, reported | `0x00051600` / `0x00051607` |
 | lrzip | Recognised, reported | `LRZI` at 0 |
@@ -200,7 +223,8 @@ are still returned. The command joins a volume set it is given
 intervals missing.
 
 **Disk images:** ISO 9660 + Joliet, UDF, DMG (HFS+/APFS, LZFSE/LZVN, encrypted),
-VHD, VHDX, QCOW2, VMDK, FAT12/16/32, NTFS and ext2/3/4. Images whose payload
+VHD, VHDX, QCOW2, VMDK, FAT12/16/32, exFAT, NTFS, ext2/3/4, SquashFS, cramfs,
+romfs and EROFS. Images whose payload
 lives in a parent file (differencing VHD/VHDX, QCOW2 with a backing file) are
 reported rather than partially reconstructed.
 
@@ -240,7 +264,7 @@ it reads back as a valid PE. See [PE stub emulation](/scanner/concepts/pe-emulat
 | PDF | object streams (FlateDecode, LZW, ASCII85, ASCIIHex, RunLength and filter chains), JavaScript, URI and launch-action harvesting; [decryption](#encryption-support) |
 | HWP3 (Hangul Word Processor 3) | the deflate-compressed body |
 | RTF | embedded hex objects |
-| MIME email | decoded attachments and parts |
+| MIME email | decoded attachments and parts, and those of attached messages (64 deep) |
 | TNEF (`winmail.dat`) · OneNote · Adobe XDP | embedded-file carriers |
 
 ## Executables
diff --git a/www/src/content/docs/unpack/how-it-works.md b/www/src/content/docs/unpack/how-it-works.md
index 9de2aa7e..b3badfeb 100644
--- a/www/src/content/docs/unpack/how-it-works.md
+++ b/www/src/content/docs/unpack/how-it-works.md
@@ -92,14 +92,13 @@ of it. (A magic at the start does not always settle it: a DMG whose data opens
 with a bzip2 or xz run, as macOS writes compressed images, starts with that
 run's magic, and its trailer is what names it a disk image.) `walk()` then
 hands the members to a visitor one at a time. A format whose
-decoder reads forward (ZIP, tar, CAB, ISO, the single-stream compressors, …)
-produces each member as a reader that decodes as it is read, so neither the
-container nor the member is resident. A format whose decoder needs random access
-over the whole container (7z, RAR, OLE, PDF, CHM, the virtual disks and
-filesystem images, …) is read
-whole, bounded before it is allocated, up to `--max-object-bytes`; past it the
-container is `LIMITS-EXCEEDED`. 7z's members still stream once the container is
-in memory. Which it is is a property of the decoder, not of how exav was
+decoder reads forward, or finds its members by an index it reads from where it
+is (ZIP, tar, CAB, ISO, 7z, WIM, xar, the filesystems, the single-stream
+compressors, …) produces each member as a reader that decodes as it is read,
+so neither the container nor the member is resident. A format whose decoder
+needs random access over the whole container (RAR, OLE, PDF, CHM, ARJ, …) is
+read whole, bounded before it is allocated, up to `--max-object-bytes`; past it
+the container is `LIMITS-EXCEEDED`. Which it is is a property of the decoder, not of how exav was
 invoked; [Supported formats](/unpack/formats/#size-what-is-read-as-it-goes-and-what-is-read-whole)
 lists both.
 
@@ -142,15 +141,21 @@ zip-slip, path traversal and symlink attacks still have nowhere to write.
 ## Containers have two indexes
 
 A ZIP lists its members twice: a local file header before each member's data, and
-a central directory at the end. Every normal reader trusts the central directory,
-because that is what the specification says is authoritative.
+a central directory at the end. The specification says the central directory is
+authoritative, and many readers go by it. Others, `unzip` among them, go by the
+local header.
 
-So a member can be hidden: leave it out of the central directory and keep its
-local header and data in the file. Plenty of extractors still write it out.
+So a member can be hidden in two ways: leave it out of the central directory and
+keep its local header and data in the file, or give the directory's record a
+method, a size or a name that is not the local header's, so that the two kinds of
+reader read two different members. Plenty of extractors still write both out.
 
 exav does dual indexing: after the central-directory pass it scans the raw bytes
-for local headers the directory did not cover, and extracts those too. The same
-path is the salvage route when the central directory is corrupt, forged or
+for local headers the directory did not cover, and extracts those too. A member
+whose local header says another method, another compressed size (when the header
+carries one) or another name than its directory record is read as its local
+header says as well, and claims none of the space of the members around it. The
+same path is the salvage route when the central directory is corrupt, forged or
 truncated. On a ZIP read from its source rather than held in memory, the search
 covers at most 16 MiB of unclaimed bytes, and a search cut short there is
 reported, not taken as complete.
@@ -166,7 +171,9 @@ it from readers that check the method.
 ISO images have the same shape: a CD image carries several volume descriptors,
 each with its own directory tree over the same sectors. A malicious ISO lists its
 payload only in the Joliet tree and leaves the primary tree empty, so a reader
-that parses the primary one sees an empty disc. exav walks every tree.
+that parses the primary one sees an empty disc. exav walks every tree. A file
+is its first sector and its length: a record of no length at the start of
+another file's extent does not take that file's place.
 
 ## Recovering what a naive reader would skip
 
@@ -193,6 +200,9 @@ holds for a bzip2, Zstandard, xz or lzip file cut short, and for the last member
 of a ZIP, NSIS, EGG, ALZ, XAR, SWF, HWP 3.0 or UPX file cut short, or the last
 grain or cluster of a VMDK or qcow2 image. bzip2 and Zstandard decode by block,
 so the block the cut falls in gives nothing: its content went with the cut.
+A cabinet's MSZIP and stored blocks are the exception, giving the part decoded
+before the cut or the damage; its LZX and Quantum frames (32 KiB at most) go
+whole.
 Indexed formats are different: a damaged ZIP index can leave member data
 present but never enumerated, which is why dual indexing exists. A 7z archive
 keeps its index at its end, so one cut short cannot be listed and is
diff --git a/www/src/content/docs/unpack/index.md b/www/src/content/docs/unpack/index.md
index 322472d7..334ec2de 100644
--- a/www/src/content/docs/unpack/index.md
+++ b/www/src/content/docs/unpack/index.md
@@ -23,7 +23,7 @@ attacker picks the delivery format: ZIP with every method in common use, 7z,
 RAR3 and RAR5, tar, gzip, bzip2, xz, zstd, lzip, LZ4, Unix `compress`, CAB,
 ARJ, LHA, ZOO, ARC, ALZ, EGG, ISO 9660 and UDF, `ar`, cpio, xar, WIM, Apple
 DMG, virtual disks (VHD, VHDX, QCOW2, VMDK) reconstructed to the guest disk,
-with the NTFS, FAT and ext2/3/4 filesystems inside them walked for their
+with the filesystems inside them (NTFS, FAT, exFAT, ext2/3/4, HFS+, APFS) walked for their
 files, OLE2 and PDF documents, MIME email and TNEF, installers, UPX and other
 packed executables, and more.
 
diff --git a/www/src/content/docs/unpack/rust.md b/www/src/content/docs/unpack/rust.md
index ccd8feac..82e1d4bc 100644
--- a/www/src/content/docs/unpack/rust.md
+++ b/www/src/content/docs/unpack/rust.md
@@ -30,8 +30,9 @@ to prevent.
 
 **It opens containers most extractors decline.** Virtual disks (VHD, VHDX, QCOW2,
 VMDK) are reconstructed to the guest disk, and the filesystems inside them (NTFS
-through an MFT walk, FAT through the cluster chain, ext2/3/4) are walked for files with
-their paths; UDF, WIM and Unix `compress` are handled natively. See
+through an MFT walk, FAT and exFAT through the cluster chain, ext2/3/4, HFS+, APFS) are
+walked for files with their paths; SquashFS, cramfs, romfs and EROFS images, UDF,
+WIM and Unix `compress` are handled natively. See
 [Supported formats](/unpack/formats/).
 
 **It survives adversarial archives.** ZIP members hidden from the central
@@ -101,26 +102,20 @@ A ZIP's walk runs past its central directory: members with a local header and
 no directory entry are visited too, after the directory's own.
 
 With the `dxf` feature, `exav_unpack::dxf` is the low layer of a DXF reader:
-`Tags` reads ASCII and binary DXF's group code and value pairs, `Records`
-groups them by group code 0, `Parts` splits a record into its subclasses,
-application groups and extended data, and `Decoder` decodes strings in the
-drawing's code page. It interprets nothing; exav-render's drawing model is
-built on it. As a container, a DXF's members are the files it embeds, such as
-an OLE2FRAME's object.
-
-With the `dwg` feature, `exav_unpack::dwg` is the low layer of a DWG reader,
-R13 to 2018, following the Open Design Specification for .dwg
-files: `Bits` reads the bit codes, `Dwg` the sections (located by the file
-header to R2000; from 2004 found by name in a paged container whose maps it
-decrypts and whose pages it checks and decompresses, within a byte limit;
-2007's container is Reed-Solomon coded, with a compression of its own):
-the header variables, left to the reader, the classes and the object map.
-`Dwg::object` reads any object the map holds, with its extended data, its
-common entity data and the streams its own data, strings and handles are
-read from. As a container, a DWG's members are its preview images and the
-object each OLE2FRAME embeds (`ole2frame-<handle>.ole`, the compound file);
-a drawing whose objects cannot be read is reported as not fully examined,
-and so is a drawing of a release before R13 (`pre_r13_version`), as one
+`Tags` reads group code and value pairs (ASCII or binary), `Records` groups them
+by group code 0, `Parts` splits a record into subclasses, application groups and
+extended data, and `Decoder` decodes strings in the drawing's code page. It
+interprets nothing; exav-render's drawing model is built on it. As a container,
+a DXF's members are the files it embeds, such as an OLE2FRAME's object.
+
+With the `dwg` feature, `exav_unpack::dwg` is the low layer of a DWG reader, R13
+to 2018, following the Open Design Specification for .dwg files: `Bits` reads
+the bit codes, `Dwg` the sections (the classes, the object map and the raw
+header variables, which are left to the reader), and `Dwg::object` any object
+the map holds, with its extended data and common entity data. As a container, a
+DWG's members are its preview images and the object each OLE2FRAME embeds
+(`ole2frame-<handle>.ole`). A drawing whose objects cannot be read, or one
+before R13 (`pre_r13_version`), is reported as not fully examined, as one
 unsupported `dwg-<version ID>` entry.
 
 ## Features
@@ -129,7 +124,7 @@ Every format is a Cargo feature, so you build only what you use:
 
 ```toml
 # a ZIP-only extractor
-exav-unpack = { version = "0.0.2", default-features = false, features = ["zip"] }
+exav-unpack = { version = "0.0.3", default-features = false, features = ["zip"] }
 ```
 
 The defaults are `all-formats`, `decrypt` and `cli`.
@@ -145,12 +140,17 @@ The defaults are `all-formats`, `decrypt` and `cli`.
 The per-format features, which `all-formats` turns on:
 
 ```text
-zip · gzip · tar · bzip2 · xz · zstd · lzip · lzw · lz4 · cab · chm · sevenz
+zip · gzip · tar · bzip2 · xz · zstd · lzip · lzma · lzw · lz4 · rpm · cab · chm · sevenz
 rar · arj · arc · ace · lha · iso · ole · pdf · email · dmg · vhd · diskimage
-fat · ext · ntfs · wim · upx · inno · nsis · ar · cpio · xar · uuencode · xdp · szdd
+fat · exfat · ext · ntfs · squashfs · cramfs · romfs · erofs · wim · upx · inno · nsis · ar · cpio · xar · uuencode · xdp · szdd
 tnef · swf · binhex · lnk · partition · pyc · autoit · onenote · rtf
 machofat · sfx · stuffit · alz · egg · hwp3 · zoo · ishieldz · pepack
 javaclass · aimodel · screnc · base64scan · dxf · dwg · pe-emu
+
+Not formats, and not in `all-formats`: `text` (the `exav_unpack::text` module,
+the text a reader sees in HTML and in the XML parts of Office and OpenDocument
+files: html5gum's tokenizer and quick-xml) and `text-pdf` (PDF's, through
+hayro, see [exav-render](/subprojects/exav-render/#text)).
 ```
 
 A ZIP member compressed with bzip2, LZMA, zstd or XZ also needs that codec's
diff --git a/www/src/content/docs/unpack/wasm.md b/www/src/content/docs/unpack/wasm.md
index 6c2eb248..3aeb8fd3 100644
--- a/www/src/content/docs/unpack/wasm.md
+++ b/www/src/content/docs/unpack/wasm.md
@@ -118,14 +118,16 @@ await archive.close();
 |---|---|
 | `Archive.open(source, limits?, options?)` | Open a `File`/`Blob` (in the Worker), or a `Uint8Array`/`ArrayBuffer`/sync reader (in-process). |
 | `archive.format()` | The detected format's name, known since `open`. |
-| `archive.list(passwords?)` | Every member's metadata, decoding nothing it can avoid: where the archive carries an index (a ZIP's central directory, a tar's headers) nothing is decompressed. `uncompressedSize` is what the archive declares, or -1 where it declares none (a gzip or xz stream). A format read whole (7z, RAR) is decoded to be listed. Where a limit stops the listing, the last entry says so. |
+| `archive.list(passwords?)` | Every member's metadata, decoding nothing it can avoid: where the archive carries an index (a ZIP's central directory, a tar's headers) nothing is decompressed. `uncompressedSize` is what the archive declares, or -1 where it declares none (a gzip or xz stream). A solid 7z block, or a format read whole (RAR), is decoded to be listed. Where a limit stops the listing, the last entry says so. |
 | `archive.extract(index, passwords?)` | One member, as an `Entry`. The archive is walked up to it, skipping the members before it undecoded where the format allows. |
-| `archive.extractAll(passwords?)` | Every member, under one budget for the whole archive. Where a limit stops the walk, the last entry says so. For a format read whole (7z, RAR) this is one pass, where `extract(i)` over every `i` is many. |
+| `archive.extractAll(passwords?)` | Every member, under one budget for the whole archive. Where a limit stops the walk, the last entry says so. For a solid 7z or a format read whole (RAR) this is one pass, where `extract(i)` over every `i` is many. |
 | `archive.close()` | Release the archive and its reader. Safe to call twice. |
 | `unpack(bytes, passwords?, limits?)` | `open` + `extractAll` in one call, for bytes in memory. |
 | `detectFormat(bytes)` | The format these magic bytes name, or `undefined`. Like the next two, synchronous: call `await init()` once before using it. |
 | `isVolumePart(name)` | Whether a filename marks one part of a byte-split archive (`big.7z.001`). Names only, cheap enough to run over a whole drop. |
 | `joinVolumes(files)` | Rejoin the split archives among files dropped together, into data `Archive.open` can take. |
+| `volumeSet(name, names)` | The volumes of the set `name` belongs to among `names` (the file names of one directory), in order, with their scheme (`"split"`, `"rar"`, `"zip"`) and whether every volume is there; `null` for a name that is not one of two or more volumes. Names only. |
+| `joinSet(scheme, parts)` | A complete set's volumes, in order, as the one archive they make, for `Archive.open`: RAR and ZIP volumes by their decoders' joiners. |
 
 An `Entry` is `{ name, bytes: Uint8Array, data: ReadableStream, encrypted,
 unsupported }`. `unsupported` is empty when the member decoded, and otherwise says
@@ -186,10 +188,22 @@ for (const s of sets) {
 not, with `data` holding the pieces that were present rather than dropping
 them. Files that are not part of a set are absent from the result.
 
-RAR `.partN` and ZIP `.zNN` volumes are not rejoined here: each carries its own
-headers, and a member's data resumes past the next volume's header, so
-concatenating them gives something that still looks like an archive but is
-not. The [command](/unpack/cli/) reads those sets.
+RAR `.partN` and ZIP `.zNN` volumes are not rejoined by `joinVolumes`: each
+carries its own headers, and a member's data resumes past the next volume's
+header, so concatenating them gives something that still looks like an archive
+but is not. `volumeSet` and `joinSet` read all three kinds of set: the first
+tells a set from the names of a folder, the second joins a complete one the way
+the format needs (the RAR decoder's joiner, the ZIP spanning reader):
+
+```js
+const set = volumeSet("x.part1.rar", namesInTheFolder);   // { parts, scheme, complete } or null
+if (set?.complete) {
+  const volumes = await Promise.all(set.parts.map(read));  // Uint8Arrays, in order
+  const archive = await Archive.open(joinSet(set.scheme, volumes));
+}
+```
+
+The [command](/unpack/cli/) reads those sets from the files themselves.
 
 ## Builds
 
@@ -208,7 +222,7 @@ yourself (`wasm-pack`, from `crates/exav-unpack-wasm`):
 
 These formats are also features one by one, for a build narrower than
 `minimal` (`wasm-pack build --release --target web -- --no-default-features --features zip,rar`):
-`zip`, `gzip`, `tar`, `bzip2`, `xz`, `zstd`, `lzip`, `cab`, `sevenz`, `rar`,
+`zip`, `gzip`, `tar`, `bzip2`, `xz`, `zstd`, `lzip`, `lzma`, `rpm`, `cab`, `sevenz`, `rar`,
 `arj`, `lha`, `iso`, `ole`, `pdf`, `email`, `dmg`, `upx`, `ar`, `cpio`, `xar`.
 For the rest, pick a preset.
 
diff --git a/www/src/content/docs/viewer/api.md b/www/src/content/docs/viewer/api.md
index 03d58d01..d6694e90 100644
--- a/www/src/content/docs/viewer/api.md
+++ b/www/src/content/docs/viewer/api.md
@@ -6,9 +6,11 @@ description: "@exav/viewer without React: the viewer, files and sources, session
 `@exav/viewer` is the framework-free core. It mounts a file into an element
 and reports on it through stores; it draws no chrome. `@exav/viewer/react`
 is one UI on top of it, and a host can write another from the same stores.
-`@exav/viewer/styles.css` is needed either way: it lays out what the engines
-draw into (the drawing's canvas, the PDF's pages, the image stage) as well as
-the default UI. The element given to `mount` must have a size.
+With the engines in the page, `@exav/viewer/styles.css` is needed either
+way: it lays out what the engines draw into (the drawing's canvas, the PDF's
+pages, the image stage) as well as the default UI. In a sandboxed frame the
+page needs none: the frame fills the element, and its own page has the
+stylesheet. The element given to `mount` must have a size.
 
 ## The viewer
 
@@ -49,7 +51,7 @@ import { createSandboxedViewer } from "@exav/viewer/frame";
 
 const viewer = createSandboxedViewer({
   url: "https://viewer-frame.example-files.com/exav-frame/index.html",
-  formats: ["pdf", "image", "dwg", "dxf"], // default: every built-in format
+  formats: ["pdf", "image", "dwg", "dxf"], // default: every built-in format but the converted Office ones (BUILTIN_ORDER names all)
   options: { cad: { ground: "dark" }, image: { maxDecodeBytes: 128 * 2 ** 20 } },
   confirmLink: (url) => window.confirm(`Open ${url}?`), // the default asks the same
 });
@@ -79,6 +81,24 @@ frame. The differences:
   the origins the frame's policy names, as it was deployed
   ([Integration](/viewer/integration/#how-the-bytes-reach-the-frame)).
   A frame reporting other ones is an error.
+- `keys` (default `NAV_KEYS`: Escape, the arrows, Page Up and Down, Home,
+  End): the keys handed back from the frame when the document does not use
+  them, dispatched as a `keydown` on the `<iframe>` that bubbles to the
+  page's own listeners, so that arrows move between files and Escape closes
+  the viewer while the focus is in the document. An arrow the document
+  scrolls with stays in the frame. Never a key with Ctrl, Alt or Meta,
+  never one that types, at most 30 a second, with `isTrusted` false; `false`
+  takes none.
+- `theme` (default `"inherit"`): the frame's colours and sizes. The frame's
+  page does not inherit the host's styles, so with `"inherit"` the `TOKENS`
+  in force where each file is mounted are read, resolved to plain values
+  (`themeOf(element)`) and sent to it: the page's CSS custom properties
+  restyle the document's own surfaces (a text file, Markdown, an archive
+  member) as they restyle the default UI, and the frame takes the page's
+  colour scheme. A `FrameTheme` sets them instead; `null` keeps the frame's
+  defaults. `viewer.restyle()` sends them again to every frame shown, after
+  the page's theme changed; with `"inherit"`, a change of the device's
+  colour scheme does so by itself.
 
 `createSandboxedViewer` throws on a delivery it does not know, an origin
 that is not `scheme://host[:port]`, or `"url"` without an origin to allow
@@ -100,6 +120,7 @@ interface ViewerFile<Meta = unknown> {
   size?: number;
   source: FileSource | null;
   placeholder?: { state: "pending" | "unavailable"; label?: string };
+  tree?: FileTree;       // the files around this one
   format?: FormatId;     // skips detection
   meta?: Meta;           // the host's own data, for options resolved per file
 }
@@ -123,6 +144,40 @@ pages on screen, an archive's directory and the members opened), and whole,
 4 MiB at a time, by the other engines. The sandboxed frame reads files this
 way, over its port.
 
+### The files around a file
+
+```ts
+interface FileTree {
+  path: string;                       // this file's, "/" separated from the root of the tree
+  paths: readonly string[];           // every file of the tree, this one included
+  open(path: string, signal: AbortSignal): Promise<FileSource>;
+}
+```
+
+A format that points at other files finds them in the tree instead of asking
+the user for each: a folder the user opened, the files dropped together, the
+members of an archive. The demo gives every file of a drop or of a folder a
+tree of the others, and an archive gives each member a tree of the other
+members. What uses it today:
+
+- **Drawings.** A DWG or DXF's external references are looked for by the path
+  the drawing wrote (`.\Plans\title.dwg`, `C:\Projects\title.dwg`, a bare
+  name): beside the file, then by the end of the path, down to the name alone,
+  the nearest winning; case and accents' form are not told apart. A reference
+  found is bound in before the drawing is drawn, and the references it makes
+  are looked for in turn (at most 64 files, eight deep). One not found is drawn
+  as its path and counted in the warnings, as before.
+- **glTF.** The files its buffers name (`"uri": "scene.bin"`, or percent-encoded
+  `my%20scene.bin`) are read from the tree the same way. Textures are not read.
+- **Split archives.** A part of a split archive, with the rest in the same
+  folder of the tree, opens as the one archive: `big.7z.001` with `.002`...,
+  `x.part1.rar` or `x.rar` with `x.r00`..., `x.z01` with `x.zip`. A set with a
+  part missing is not joined.
+
+`resolveInTree(tree, reference, extensions?)` is the lookup, for a plugin of
+your own. In the sandboxed frame, `open` is answered by the host over the
+port, for the paths it listed ([security](/viewer/security/#the-messages)).
+
 A type of `""`, `application/octet-stream` or `binary/octet-stream` is
 unknown, and the extension decides. A container type yields to the
 extension for the formats that are containers (a `.docx` sent as
@@ -166,11 +221,15 @@ preview, a plan with a new mark) does not want to lose the zoom and the place
 the reader was at. `session.replace(file)` shows `file`, the same id with
 other bytes, in place of the current document, and resolves `true` when it
 did. PDFs and images keep their zoom and position (an image of another shape
-is fitted); the old document stays on screen until the new one is shown, and
-if the new one cannot be read the old one stays, under an error status.
-`false` means this session cannot (another format, a plugin of the host
-without `replace`, a file in a sandboxed frame) and changed nothing: mount a
-new session, as for a new file.
+is fitted), in the page and in the sandboxed frame alike; the old document
+stays on screen until the new one is shown, and if the new one cannot be read
+the old one stays, under an error status. `false` means this session cannot
+(another format, a plugin of the host without `replace`, a frame that has not
+started yet, a file delivered another way than the first, say an image given
+by URL after one given as bytes) and changed nothing: mount a new session, as
+for a new file. In a frame, one replacement is with the frame at a time:
+call it again before it resolves and the earlier call resolves `true` without
+having been shown.
 
 The React UI does it for you: give `ViewerBody` the same `file.id` with a
 different `source` and the document is replaced in place, or the session
@@ -183,13 +242,32 @@ for the same bytes.
 
 ```ts
 type Status =
-  | { phase: "loading"; progress?: number; label?: string }
-  | { phase: "converting"; progress?: number; label?: string }   // a step after the fetch that reports its progress
+  | { phase: "loading"; progress?: number; label?: string; step?: LoadStep }
+  | { phase: "converting"; progress?: number; label?: string; step?: LoadStep }   // a step after the fetch that reports its progress
   | { phase: "ready"; partial?: boolean }        // partial: something drew, then the engine failed
   | { phase: "empty" }                           // parsed, nothing to draw
-  | { phase: "error"; error: { code: "pdf" | "image" | "drawing" | "drawing_version" | "office" | "media" | "model" | "archive" | "file" | (string & {}); message?: string; cause?: unknown } };
+  | { phase: "error"; error: { code: "pdf" | "image" | "image_no_preview" | "drawing" | "drawing_version" | "office" | "needs_converter" | "media" | "model" | "archive" | "text" | "text_binary" | "file" | (string & {}); message?: string; cause?: unknown } };
 ```
 
+`step` says what a load is doing, for a progress display, and `progress`
+(0 to 1) how much of that step is done, where it is counted:
+
+| Step | What | Counted |
+|---|---|---|
+| `file` | the file's bytes arrive (every format, while its plugin says nothing more precise) | bytes, when the size is known |
+| `engine` | an [external converter](/viewer/integration/#the-external-converter)'s code and data arrive, the first time (its `download` stage) | bytes, when the converter knows the total |
+| `start` | the external converter starts (its `start` stage) | no |
+| `read` | the document is read: by the PDF or model reader, or by the external converter (its `load` stage) | what the converter reports, `done` of `total` |
+| `convert` | it is converted to what is shown: by the package's converters (no count) or by the external converter (its `export` stage) | what the external converter reports, `done` of `total` |
+| `render` | what is shown is drawn: a converted file's PDF, XLSX, PPTX or DOCX, a model's scene | no |
+
+A plugin goes through the steps it has, in this order: a PDF or a drawing
+reads, a model reads then renders, a file the package converts (an XLS, a
+PPT, a DOC...) converts then renders, and a file an external converter takes
+goes through all of them (`engine` only the first time). The default status overlay words each step and
+draws a bar when `progress` is given; a host that draws its own reads
+`status.step` and `status.progress`, through the sandboxed frame too.
+
 `label` and `message` are for a plugin of the host: text worded for the user
 in the host's language, shown by the default status overlay instead of the
 stock message of the phase or of `code`. A photo being decoded is then not
@@ -201,6 +279,17 @@ none. The sandboxed frame does not carry labels, messages or codes of its own
 
 `drawing_version`: a DWG of a release the engine does not read (R12 and
 older), said as such rather than as a drawing that would not parse.
+`image_no_preview`: a camera RAW file that embeds no preview, whose sensor
+data is not decoded.
+`office`: a converted Office file that could not be converted or shown. Its
+`cause` says why: a `SheetConversionError`, `SlideConversionError` or
+`DocConversionError` (`format`, and `kind`: `"not-format"`, `"encrypted"`,
+`"unsupported"`, `"too-large"`, `"malformed"`, `"timeout"` or `"crashed"`) from
+the package's converters, or an `ExternalConversionError` (`kind` `"failed"` or
+`"timeout"`) from an external one.
+`needs_converter`: a format only an external converter reads, and none is set;
+the `cause` is a `NeedsConverterError` (`kind` `"needs-converter"`, `format` the
+viewer's name for the file).
 
 `errorCode(format)` gives the code a format's errors carry.
 
@@ -211,17 +300,22 @@ Each is present when the format has it. All are stores.
 | Controller | Formats | What it holds, what it does |
 |---|---|---|
 | `pages` | PDF, Word (pages), PowerPoint (slides) | `{ unit, current, total }`; `goTo(page)`, and `next()`, `prev()` for slides |
-| `zoom` | PDF, images, drawings | `{ scale, min, max }`; `setScale(scale, anchor?)`, `fit()` |
+| `zoom` | PDF, images, drawings, Word, Excel, CSV | `{ scale, min, max }`, where `scale` is 1 at the fitted view (a page to the width, a sheet at 100 %, an image or drawing whole) and more or less when zoomed in or out, so a button back to it is wanted when it is not 1; `setScale(scale, anchor?)`, `fit()` |
+| `sheets` | Excel | `{ items: { index, name }[], current }`; `select(index)`. The engine draws no tabs: the UI does (the default UI below the sheet) |
+| `pictures` | every format that draws something (not text or archives) | `{ count, space }`; `raster(page, options)`, `toBlob(page, options)` and `render(page, longEdge)`: a page drawn again at the size and region asked for, as an `ImageBitmap` or an image file ([Pictures of pages](#pictures-of-pages), below). In the sandboxed frame, the picture is pixels sent out of it, checked for their size |
+| `viewport` | the same | what the session shows now, as a region of one page, in the coordinates of `pictures.space`: `{ space, page, layout?, region }`, or `null` while nothing is drawn. Read-only, and worked out only while it is followed or read ([below](#pictures-of-pages)) |
+| `media` | video, audio | `{ kind, paused, ended, currentTime, duration, buffered, volume, muted, rate, waiting, blocked }`; `play()`, `pause()`, `seek(seconds)`, `setVolume(v)`, `setMuted(m)`, `setRate(r)`, for a host drawing its own player (`video({ controls: "none" })`). `blocked`: the browser refused to start without a click on the player itself |
 | `drag` | PDF | what a mouse drag does: `{ mode: "pan" \| "select", available }`; `choose(mode)`. `available` is true once the page is larger than the viewer, which is when the choice matters; below that a drag always selects text. Hand ("pan") is the default |
 | `outline` | PDF | the document's own outline, flattened: `{ title, page, depth, offset }`; `goTo(entry)` |
 | `layers` | DWG, DXF (layers), IFC (categories) | `{ kind, items: { id, name, color, visible }[] }`; `setVisible(id, visible)`, `setAll(visible)` |
+| `storeys` | IFC (a model with two or more building storeys that hold something) | `{ items: { id, name, elevation, visible }[] }`, highest first (`elevation` in metres, or `null`); `setVisible(id, visible)`, `setAll(visible)`. A hidden storey's elements, outlines included, are not drawn, not picked, and not in pictures; the default UI lists them above the categories |
 | `layouts` | DWG, DXF | model space and each paper layout; `select(id)`, `""` being model space |
 | `ground` | DWG, DXF, IFC | `"light"` or `"dark"`; `set(ground)`, which never fetches the file again and keeps hidden layers hidden |
 | `selection` | IFC | the element last tapped: `{ name, category, storey? }` |
 | `info` | STL | `{ triangles }` |
 | `image` | images | the image surface: transforms, and layers to draw on |
 | `archive` | archives | the members; `open(index)`, `back()`, and `opened`: the member's own session |
-| `warnings` | DWG, DXF, IFC, STL | what the picture lacks, as message keys and counts: for a drawing, its external references, which are not drawn (`external_references`), the entities left out past `maxPrimitives` (`scene_truncated`) and custom objects saved without their graphics (`proxy_without_graphics`); for a model, the elements left out past `maxTriangles` (`model_truncated`, STL: `model_partial`), geometry of a kind not drawn (`model_unsupported`), a damaged file (`model_damaged`); in the sandboxed frame, any format: a file to be read by ranges that the server sent whole (`source_read_whole`) |
+| `warnings` | DWG, DXF, IFC, STL | what the picture lacks, as message keys and counts, with `names` when there is something to name: for a drawing, its external references, which are not drawn (`external_references`, the files they name), entities of a kind not drawn (`unknown_entities`, their types), its thumbnail shown because nothing in it is drawn (`preview_shown`), the entities left out past `maxPrimitives` (`scene_truncated`) and custom objects saved without their graphics (`proxy_without_graphics`); for a model, the elements left out past `maxTriangles` (`model_truncated`, STL: `model_partial`), geometry of a kind not drawn (`model_unsupported`), a damaged file (`model_damaged`); in the sandboxed frame, any format: a file to be read by ranges that the server sent whole (`source_read_whole`) |
 
 An archive's member is a session like any other, in `archive.opened.session`:
 its status and controllers are followed the same way, an archive inside it
@@ -231,10 +325,13 @@ included.
 
 | Plugin | Options |
 |---|---|
-| `pdf()` | `minZoom`, `maxZoom` (multiples of the page fitted to the width, default 1 and 6), `drag` (what a mouse drag does on a page larger than the viewer: `"pan"`, the default, or `"select"`; the user can switch, see the `drag` controller), `prerenderMargin`, `pageMaxPixels`, `detailMaxPixels`, `outlineMaxDepth`, `outlineMaxEntries` |
-| `image()` | `wasmDecoders` (default false: the plugin then claims only the four formats every browser draws, PNG, JPEG, WebP and GIF; true adds what exav-render decodes in WebAssembly, TIFF, BMP, ICO, PNM, QOI, DDS, Farbfeld, Radiance HDR, JPEG 2000 and JBIG2, in a file of its own and as the members an archive opens), `maxDecodeBytes` (default 256 MiB), `overlay(file)` and `detail(file)` (below), `onTap(file, point, context)`, `minScale`, `maxScale`, `wheelStep`, `wheel` (what a plain wheel or two-finger scroll does: `"zoom"` about the pointer, the default, or `"pan"` the sheet, as a document reader scrolls; Ctrl or ⌘ with the wheel, a trackpad pinch, zooms in both, a mouse notch by a step of about 35%), `tapSlop`, `crossOrigin` (the `<img>`'s, default `"anonymous"` so that pixels can be read back; `null` shows an image from a server without CORS, unreadable) |
-| `dwg()`, `dxf()` | `ground`, `colors` (`{ light, dark }`), `fontsUrl` (a directory serving the bundled fonts, for a host that publishes them itself), `timeoutMs` (default 120,000: past it the engine is stopped and the file reported unreadable), `maxPrimitives` (default 8,000,000 strokes and fill vertices per layout, about 220 MB of buffers: past it the rest of the drawing is left out, with a warning), `maxDecompressedBytes` (default 512 MiB: what the compressed sections of a 2004 or later DWG may expand to; past it the file is reported unreadable). While a drawing parses, the thumbnail it was saved with (PNG or BMP), if any, stands in for it |
-| `docx()`, `xlsx()`, `pptx()`, `csv()` | `useGoogleFonts` (default false), `mode` (`"main"`, the default: parse in a worker made from an inline module and paint on the page; `"worker"`: both in a worker started from a file, what the sandboxed frame uses) |
+| `pdf()` | `minZoom`, `maxZoom` (multiples of the page fitted to the width, default 0.25, which shows a whole page on any screen, and 6), `drag` (what a mouse drag does on a page larger than the viewer: `"pan"`, the default, or `"select"`; the user can switch, see the `drag` controller), `prerenderMargin`, `pageMaxPixels`, `detailMaxPixels`, `outlineMaxDepth`, `outlineMaxEntries` |
+| `image()` | `wasmDecoders` (default false: the plugin then claims only the formats every browser draws, PNG, JPEG, WebP, GIF and SVG; true adds what exav-render decodes in WebAssembly, TIFF, BMP, ICO, PNM, QOI, DDS, Farbfeld, Radiance HDR, JPEG 2000, JBIG2 and JPEG XL, and camera RAW files, shown by the largest preview they embed that fits `maxDecodeBytes`, in a file of its own and as the members an archive opens), `maxDecodeBytes` (default 256 MiB), `overlay(file)` and `detail(file)` (below), `onTap(file, point, context)`, `minScale`, `maxScale`, `wheelStep`, `wheel` (what a plain wheel or two-finger scroll does: `"zoom"` about the pointer, the default, or `"pan"` the sheet, as a document reader scrolls; Ctrl or ⌘ with the wheel, a trackpad pinch, zooms in both, a mouse notch by a step of about 35%), `tapSlop`, `crossOrigin` (the `<img>`'s, default `"anonymous"` so that pixels can be read back; `null` shows an image from a server without CORS, unreadable) |
+| `dwg()`, `dxf()` | `ground`, `colors` (`{ light, dark }`), `lineweights` (`"drawing"`, the default, as the drawing's `$LWDISPLAY` says; `"always"`; `"never"`, every line a pixel), `monochrome` (everything in ink, as monochrome.ctb plots; default false), `fontsUrl` (a directory serving the bundled fonts, for a host that publishes them itself), `timeoutMs` (default 120,000: past it the engine is stopped and the file reported unreadable), `maxPrimitives` (default 8,000,000 strokes and fill vertices per layout, up to 256 MB of buffers: past it the rest of the drawing is left out, with a warning), `maxDecompressedBytes` (default 512 MiB: what the compressed sections of a 2004 or later DWG may expand to; past it the file is reported unreadable), `maxEntities` (default 1,000,000, about 512 MiB of the module's memory: past it the rest of the drawing is left out, with a warning). While a drawing parses, the thumbnail it was saved with (PNG or BMP), if any, stands in for it |
+| `docx()`, `xlsx()`, `pptx()`, `csv()` | `useGoogleFonts` (default false), `mode` (`"main"`, the default: parse in a worker made from an inline module and paint on the page; `"worker"`: both in a worker started from a file, what the sandboxed frame uses), `maxArchiveEntries` (the most entries a document's ZIP may list, default 20000) |
+| `rtf()`, `doc()`, `odt()`, `ppt()`, `odp()`, `keynote()`, `xls()`, `ods()`, `numbers()`, `odg()`, `visio()`, `coreldraw()`, `publisher()`, `pagemaker()`, `freehand()`, `quarkxpress()`, `zonerdraw()`, `wpg()` | `converter` (`"exav"`, the default: the package's converters, then the external one for what they do not read, and for text documents the external one first when there is one; `"external"`: the external converter alone, for every format), `externalConverter` (a package name that `@exav/viewer/vite` or `exav-viewer-assets` copied, or the URL of an ES module; default none, see [Integration](/viewer/integration/#the-external-converter)), `timeoutMs` (default 120,000: past it the conversion's worker, or the wait for the external converter, is stopped and the file reported unreadable), `maxMemory` (bytes a conversion may take. The package's converters count their own: 1 GiB by default, at most 1.5 GiB; past it the file is reported unreadable rather than shown with pictures missing. The external converter gets the number as set, and none when it is not). What the bytes are decides within each kind: an RTF saved as .doc is read as RTF, an XLSX named .xls is shown as it is |
+| `video()`, `audio()` | `controls` (`"native"`, the default: the browser's player; `"none"`: no controls in the surface, for a host drawing its own from the `media` controller; a click on a video plays or pauses it). FLAC is claimed with the rest of what browsers play |
+| `text()` | none: it reads at most 2 MiB and 50,000 lines of a file, and cuts a line at 10,000 characters |
 | `ifc()` | `ground`, `colors`, `highlight`, `timeoutMs` (default 120,000), `maxTriangles` (default 6,000,000, about 330 MB of buffers: past it the remaining elements are left out, with a warning) |
 | `stl()` | `surface` (a colour), `zUp` (default true), `timeoutMs` (default 120,000), `maxTriangles` (default 6,000,000) |
 | `archive()` | `maxExtractedBytes` (512 MiB), `maxMembers` (5000), `maxCompressionRatio` (200) |
@@ -272,6 +369,114 @@ fonts, the CMaps, ICC profiles and image decoders served from `assetBase`),
 and `pdfjsAssetDir(assetBase, version)` and `pdfjsWasmDir(assetBase,
 version)` say where those are published.
 
+### Printing
+
+The sandboxed frame cannot open the print dialog, and a browser cannot print
+a TIFF or a JPEG 2000 from its URL. `printPictures(pictures, options?)` from
+`@exav/viewer` draws the pages through a session's `pictures` controller,
+then prints them from a hidden frame of the page, built element by element:
+
+```ts
+const pictures = session.controllers.get().pictures;
+if (pictures) await printPictures(pictures, { longEdge: 2480, onProgress: (done, total) => {} });
+```
+
+`pages` picks some pages, `signal` stops it. It resolves `false` when
+nothing was printed. The page's policy must allow `blob:` images.
+
+### Pictures of pages
+
+Every format that draws something can be exported as a picture through
+`controllers.pictures` (text and archive views have none). A picture is drawn
+again from the document's own data (vectors, geometry, text) at the size
+asked for, never read off the screen, so it is sharp at any zoom.
+
+```ts
+const pictures = session.controllers.get().pictures;
+if (pictures) {
+  // A page, as an ImageBitmap the caller owns and closes:
+  const { bitmap, region, width, height } = await pictures.raster(1, { longEdge: 2000 });
+  // What the user sees now, as an image file the host can save:
+  const { blob } = await pictures.toBlob(1, { width: 1200, height: 800, region: "current", type: "jpeg", quality: 0.9 });
+}
+```
+
+`pictures.get()` is `{ count, space }`: the number of pages and the
+coordinates a `region` is written in. A page is 1-based: a PDF or Word page, a
+PowerPoint slide, a spreadsheet's sheet, 1 for an image or a model, a CAD
+layout in the order of the `layouts` controller (model space first), 1 for a
+video (the frame being shown).
+
+| `RasterOptions` | |
+|---|---|
+| `longEdge`, or `width` and/or `height` | The size, in pixels. `longEdge` is held to the limits; a `width` and a `height` past them are refused (`"too-large"`). One of `width` and `height` alone takes the other from the region's shape. The limits are `MAX_PICTURE_EDGE` (16,384 a side) and `MAX_PICTURE_PIXELS` (64 Mi pixels in all), the same for a host in the page and in the sandboxed frame |
+| `region` | What to draw, in the coordinates of `space` (below), or `"current"`: what `controllers.viewport` holds. Default: the whole page, the drawing's extents, the model framed as the viewer first frames it |
+| `layout` | CAD: the layout (its `layouts` id) the region is in |
+| `fit` | When the picture's shape is not the region's: `"contain"` (default) widens the region to the picture's shape so that all of it is drawn; `"cover"` narrows it so that the picture is filled. The picture is never stretched |
+| `lineweight` | CAD: `"screen"` (default) draws lines as many pixels wide as the viewer does at its own zoom; `"scaled"` scales them with the picture, as if the viewer's zoom were raised to the picture's size |
+| `background` | A CSS colour (hex or a colour function) or `"transparent"`. Default: white for a document, transparent for an image, the viewer's ground for a drawing or a model. A format that cannot draw on transparency rejects it (`"unsupported"`) |
+| `signal` | An `AbortSignal`: the promise rejects with `"aborted"`, and the work and its memory are released |
+
+`raster` resolves to the bitmap, its `width` and `height`, the `page`, the
+`layout` for CAD, the `space` and the **`region` actually drawn**, after
+`fit`, in the same coordinates as the one asked for, so that a caller can map
+pixels back to the document. `toBlob` takes the same options and `type`
+(`"png"`, the default, `"jpeg"` or `"webp"`) and `quality` (0 to 1), and resolves
+to the same fields with a `blob` instead of the bitmap. The encoding is done
+by the page that owns the session, from pixels: in the sandboxed frame the
+document's code never writes the file, nor touches the host's canvases.
+JPEG has no transparency: it is drawn on `background`, or white. A browser
+without an encoder for a type (Safari has none for WebP) rejects with
+`"unsupported"` instead of handing back a PNG. `render(page, longEdge)`,
+which `printPictures` uses, is `raster` with a longest side, null where `raster`
+would reject.
+
+| `space` | Formats | A `region` is |
+|---|---|---|
+| `"page"` | PDF, Word, PowerPoint, spreadsheets, the converted office formats | `{ x, y, width, height }`, fractions of the page (0 to 1), origin at the top left. It may reach past the page: the background shows there |
+| `"pixels"` | images | `{ x, y, width, height }`, pixels of the source image, origin at the top left |
+| `"drawing"` | DWG, DXF | `{ x, y, width, height }` in drawing units, y up, of the layout named by `layout` (model space, or a paper layout in paper units) |
+| `"camera"` | IFC, STL, OBJ, PLY, glTF | `{ position, target, up?, projection, aspect }`: a perspective (vertical `fov`, in degrees) or orthographic (`height`) camera, in the model's world coordinates; `aspect` is the width over the height it was framed for, which `fit` keeps |
+| `"frame"` | video | none: the frame being shown |
+
+A failed picture rejects with a `RasterError` (exported by `@exav/viewer`),
+whose `code` is `"unsupported"` (the format cannot draw it), `"too-large"`
+(past the limits, or more than the device can hold), `"aborted"`, `"invalid"`
+(a size, region or page that is none) or `"failed"`.
+
+`controllers.viewport` is the part of the document in view, in the same
+coordinates: `{ space, page, layout?, region }`, updated as the user pans,
+zooms or orbits, and `null` while nothing is drawn. It is read-only. Read it,
+change the region, and give it back as `region` to draw something near what
+the user sees; `region: "current"` draws exactly that.
+
+A session that never uses the viewport pays nothing for it. For the formats
+where working it out costs (Word, PowerPoint, Excel, CSV, PDF: boxes to
+measure, and for a sheet a second copy of the workbook), it is worked out
+while the store has a listener, and once for each `get()` without one. A
+spreadsheet's is measured asynchronously: its `get()` returns the last
+measure and starts the next, so subscribe to follow it. For images,
+drawings and models it is read off the view's own state, a few arithmetic
+operations, and kept up to date. `region: "current"` does not need the
+viewport to be followed.
+
+In the sandboxed frame the options cross the port as plain data, checked on
+both sides, and a picture is an `ImageBitmap` of at most the limits above,
+which the host checks against the size it asked for: a bitmap of another size
+is a failure. At most 8 pictures are asked for at once. A request the frame
+finds malformed is answered with a `RasterError` `"invalid"`. The frame
+follows the viewport only from the host's first listener to its last, and a
+`get()` without one returns the last value the frame reported and asks it for
+a fresh one: subscribe to follow the viewport there.
+
+### Strings
+
+`builtinTranslate(locale)` and `MESSAGES` from `@exav/viewer` are the
+built-in strings (English, French, German, Spanish, Dutch: the language of
+the locale, English otherwise), for a host drawing its own UI that wants
+exav's wording of its statuses and warnings (`error_<code>`,
+`warning_<key>`, `archive_members`...).
+
 ### PDF pages off the main thread
 
 `createPdfRasterizer()` from `@exav/viewer/pdf` renders pages in a worker,
diff --git a/www/src/content/docs/viewer/examples.md b/www/src/content/docs/viewer/examples.md
new file mode 100644
index 00000000..ed6ae2fd
--- /dev/null
+++ b/www/src/content/docs/viewer/examples.md
@@ -0,0 +1,363 @@
+---
+title: Example files
+description: "The files of the @exav/viewer demo: what each is, who made it, where it comes from and its licence."
+---
+
+<!-- Written by crates/exav-viewer/demo/examples/generate/make-attributions.mjs from examples.json. Do not edit. -->
+
+The [demo](/viewer/demo/) lists 235 example files, one or more for each format the viewer reads. Each is public domain, CC0,
+CC-BY, or an MIT, BSD or Apache test file, and its licence was read at the source page named below.
+Most are made for the demo by scripts of the repository and given to the public domain (CC0-1.0); the others
+are credited here and in the demo's licence notice. A file is downloaded only when it is opened.
+
+The facts are in [`examples.json`](https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/examples.json)
+and [`NOTICE.md`](https://github.com/sylvinus/exav/blob/main/crates/exav-viewer/demo/examples/NOTICE.md): the page
+that states each licence, the words read there, the SHA-256 of the file, and how it was made or fetched.
+
+## PDF
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `field-report.pdf` | pdf | 104 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `application-form.pdf` | pdf-form | 19 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `annotations.pdf` | pdf-annotations | 6.1 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scan-mixed.pdf` | pdf-scan | 201 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `vector-art.pdf` | pdf | 4.3 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `handbook-tagged.pdf` | pdf | 188 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `arxiv-rational-cherednik-torus-knots.pdf` | pdf | 421 KB | Xinchun Ma | [arxiv.org](https://arxiv.org/abs/2402.18770v1) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `nist-sp-800-63-4-digital-identity.pdf` | pdf | 838 KB | David Temoshok, Diana Proud-Madruga, Yee-Yin Choong et al., NIST | [csrc.nist.gov](https://csrc.nist.gov/pubs/sp/800/63/4/final) | public-domain (US federal government work, 17 U.S.C. 105; the PDF says so itself) |
+| `scan-cfa-minutes-1971.pdf` | pdf-scan | 1.1 MB | U.S. Commission of Fine Arts; scanned by the Internet Archive | [archive.org](https://archive.org/details/cfaminutes21april1971) | public-domain (US federal government work, 17 U.S.C. 105) |
+| `scan-blm-land-survey-records.pdf` | pdf-scan | 2.1 MB | United States Bureau of Land Management; scanned by the Internet Archive | [archive.org](https://archive.org/details/landsurveyrecord00unit) | public-domain (US federal government work, 17 U.S.C. 105) |
+| `form-uscis-i9.pdf` | pdf-form | 512 KB | U.S. Citizenship and Immigration Services (DHS) | [uscis.gov](https://www.uscis.gov/i-9) | public-domain (US federal government work, 17 U.S.C. 105) |
+| `map-nps-canyonlands.pdf` | pdf-map | 341 KB | National Park Service | [home.nps.gov](https://home.nps.gov/cany/planyourvisit/maps.htm) | public-domain (US federal government work, 17 U.S.C. 105) |
+| `slides-unige-open-access.pdf` | pdf | 782 KB | Floriane Muller, Anouk Santos (University of Geneva) | [zenodo.org](https://zenodo.org/records/23478694) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `paper-ja-labor-law.pdf` | pdf | 860 KB | Takashi Fujiki (藤木 貴史) | [zenodo.org](https://zenodo.org/records/23469422) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+
+## Word, Excel, PowerPoint
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `handbook.docx` | docx | 25 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `workbook.xlsx` | xlsx | 23 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `deck.pptx` | pptx | 30 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `docx4j-getting-started.docx` | docx | 153 KB | Jason Harrop and the docx4j contributors | [github.com](https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docs/Docx4j_GettingStarted.docx) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `docx4j-two-charts.docx` | docx | 41 KB | Jason Harrop and the docx4j contributors | [github.com](https://github.com/plutext/docx4j/blob/c95b55be6832ff716131ffdbd7006755db92f696/docx4j-chart-render/src/test/resources/charts/render/office/p3-two-charts.docx) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `gsa-policy-review-template.xlsx` | xlsx | 217 KB | U.S. General Services Administration and the agencies that wrote the documents (Section508.gov) | [github.com](https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Policy%20Review%20Template.xlsx) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `closedxml-pivot-tables.xlsx` | xlsx | 30 KB | ClosedXML contributors | [github.com](https://github.com/ClosedXML/ClosedXML/blob/09f2f21a60e821ce7fb18ca3576b272e5dd6d921/ClosedXML.Tests/Resource/Examples/PivotTables/PivotTables.xlsx) | [MIT](https://spdx.org/licenses/MIT.html) |
+| `xlsxwriter-bar-chart.xlsx` | xlsx | 14 KB | John McNamara (XlsxWriter) | [github.com](https://github.com/jmcnamara/XlsxWriter/blob/5d4606d89a955226d2d0825a0f44309043ae7251/xlsxwriter/test/comparison/xlsx_files/chart_bar14.xlsx) | [BSD-2-Clause](https://spdx.org/licenses/BSD-2-Clause.html) |
+| `python-pptx-chart-types.pptx` | pptx | 1.3 MB | Steve Canny (python-pptx) | [github.com](https://github.com/scanny/python-pptx/blob/278b47b1dedd5b46ee84c286e77cdfb0bf4594be/features/steps/test_files/cht-chart-type.pptx) | [MIT](https://spdx.org/licenses/MIT.html) |
+| `cdc-lifecycle-508.pptx` | pptx | 598 KB | Mark D. Urban, CDC Section 508 Coordinator (US federal government) | [github.com](https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Integrating%20Section%20508%20Requirements%20in%20the%20Development%20Lifecycle.pptx) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+
+## Other office formats
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `handbook.doc` | doc | 66 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `handbook.odt` | odt | 41 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `handbook.fodt` | fodt | 76 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `handbook.rtf` | rtf | 94 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `workbook.xls` | xls | 29 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `workbook.ods` | ods | 45 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `workbook.fods` | fods | 118 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `deck.ppt` | ppt | 480 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `deck.odp` | odp | 71 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `deck.fodp` | fodp | 31 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `diagram.odg` | odg | 26 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `diagram.fodg` | fodg | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `poi-sample.doc` | doc | 27 KB | Apache POI committers | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/SampleDoc.doc) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `poi-word95.doc` | doc | 100 KB | Nick Burch (Apache POI) | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/document/Word95.doc) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `dhs-directive-139-02.doc` | doc | 81 KB | U.S. Department of Homeland Security | [github.com](https://github.com/GSA/Assets.Section508.gov/blob/c1d8f46b9cca483e744772229b91bbfcb8665381/assets/files/Directive_139.2_Final_10-28-2008.doc) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `poi-formula-eval.xls` | xls | 174 KB | Apache POI committers | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/FormulaEvalTestData.xls) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `poi-conditional-formats.xls` | xls | 44 KB | Nick Burch (Apache POI) | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/NewStyleConditionalFormattings.xls) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `poi-excel5.xls` | xls | 7.5 KB | Apache POI committers | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/spreadsheet/testEXCEL_5.xls) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `poi-sample-show.ppt` | ppt | 123 KB | Apache POI committers | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/slideshow/SampleShow.ppt) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tika-rtf-various.rtf` | rtf | 64 KB | Michael McCandless (Apache Tika) | [github.com](https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/resources/test-documents/testRTFVarious.rtf) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tdf-thesis-template.odt` | odt | 66 KB | Phorious (Document Foundation wiki user) | [wiki.documentfoundation.org](https://wiki.documentfoundation.org/File:Tesis-v1.0.4.odt) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `tika-odt-ooo3.odt` | odt | 24 KB | Apache Tika committers | [github.com](https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/test/resources/test-documents/testODFwithOOo3.odt) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tdf-household-budget.ods` | ods | 21 KB | Hrbrgr (Document Foundation wiki user) | [wiki.documentfoundation.org](https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods) | [CC-BY-3.0](https://creativecommons.org/licenses/by/3.0/) |
+| `odfdo-flat.fods` | fods | 32 KB | Jérôme Dumonteil (odfdo) | [github.com](https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/test_flat_lo.fods) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tdf-presentation-template.odp` | odp | 403 KB | Phorious (Document Foundation wiki user) | [wiki.documentfoundation.org](https://wiki.documentfoundation.org/File:Presenta.odp) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `odfdo-example.odp` | odp | 54 KB | Jérôme Dumonteil (odfdo) | [github.com](https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/example.odp) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tdf-diagram-gallery.odg` | odg | 89 KB | Hrbrgr (Document Foundation wiki user) | [wiki.documentfoundation.org](https://wiki.documentfoundation.org/File:Diagramme.odg) | [CC-BY-3.0](https://creativecommons.org/licenses/by/3.0/) |
+| `odfdo-shapes.odg` | odg | 10 KB | Jérôme Dumonteil (odfdo) | [github.com](https://github.com/jdum/odfdo/blob/39e89938bd9df704c5e3760f845f91db513fd3e5/tests/samples/base_shapes.odg) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tika-keynote09.key` | keynote | 217 KB | Jukka Zitting (Apache Tika) | [github.com](https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote.key) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tika-keynote2013.key` | keynote | 268 KB | Tim Allison (Apache Tika) | [github.com](https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testKeynote2013.key) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `tika-numbers09-charts.numbers` | numbers | 102 KB | Michael McCandless (Apache Tika) | [github.com](https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testNumbersCharts.numbers) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `numbers-formulas.numbers` | numbers | 323 KB | Jon Connell (numbers-parser) | [github.com](https://github.com/masaccio/numbers-parser/blob/a6affe5599c8373f575192ac5777d0c6426da696/tests/data/create-formulas.numbers) | [MIT](https://spdx.org/licenses/MIT.html) |
+| `poi-network.vsdx` | visio | 43 KB | A reporter of Apache POI bug 60489 (committed by Tim Allison) | [github.com](https://github.com/apache/poi/blob/d91a76448f0963a93b6cd95fb97fbe1d8bad82c6/test-data/diagram/60489.vsdx) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+| `vsdx-house.vsdx` | visio | 20 KB | Dave Howard (vsdx library) | [github.com](https://github.com/dave-howard/vsdx/blob/6703e6c2c906bea4051f43525ec9af9dcf735c13/tests/test3_house.vsdx) | [BSD-3-Clause](https://spdx.org/licenses/BSD-3-Clause.html) |
+
+## Text and code
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `field-guide.md` | markdown | 2.3 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `field-notes.txt` | text | 1.6 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `recipes.json` | json | 2.4 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `config.yaml` | yaml | 585 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `pyproject.toml` | toml | 440 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `feed.xml` | xml | 1.3 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `route.gpx` | xml | 6.3 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `places.kml` | xml | 1.0 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `harbour-log.csv` | csv | 19 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `tides.tsv` | csv | 833 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `prix.csv` | csv | 255 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `life.py` | source | 1.0 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `lru.rs` | source | 1.6 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `tokens.ts` | source | 2.2 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bits.c` | source | 1.4 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `report.sql` | source | 1.3 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `deploy.sh` | source | 989 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `style.css` | source | 1.1 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `page.html` | html | 1.1 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `changes.diff` | diff | 879 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `subtitles.srt` | text | 338 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `server.log` | text | 8.9 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+
+## Images
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `scene.png` | png | 26 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-alpha.png` | png | 48 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-indexed.png` | png | 5.0 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `gradient-grey16.png` | png | 47 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bounce.png` | apng | 40 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.jpg` | jpeg | 24 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-progressive.jpg` | jpeg | 20 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-orientation6.jpg` | jpeg | 22 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-grey.jpg` | jpeg | 17 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-cmyk.jpg` | jpeg | 51 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bounce.gif` | gif | 100 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.gif` | gif | 25 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.webp` | webp | 8.8 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-lossless.webp` | webp | 18 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-alpha.webp` | webp | 18 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bounce.webp` | webp | 20 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-lzw.tif` | tiff | 94 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-jpeg.tif` | tiff | 56 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-cmyk-packbits.tif` | tiff | 49 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `gradient-grey16.tif` | tiff | 91 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-pages.tif` | tiff | 83 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `fax-g4.tif` | tiff-fax | 22 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `fax-g4-3pages.tif` | tiff-fax | 66 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-24.bmp` | bmp | 56 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-8.bmp` | bmp | 20 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-32.bmp` | bmp | 75 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-1bit.bmp` | bmp | 24 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-rle8.bmp` | bmp | 11 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `icon.ico` | ico | 25 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `icon-legacy.ico` | ico | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.ppm` | pnm | 36 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-ascii.ppm` | pnm | 17 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-grey16.pgm` | pnm | 24 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.pbm` | pnm | 6.0 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-alpha.pam` | pnm | 48 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.qoi` | qoi | 38 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-alpha.qoi` | qoi | 89 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.ff` | farbfeld | 54 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sunset.hdr` | hdr | 54 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sunset-flat.hdr` | hdr | 48 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-bc1.dds` | dds | 32 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-bc3.dds` | dds | 64 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.jp2` | jpeg2000 | 80 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene.j2k` | jpeg2000 | 48 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-grey.jp2` | jpeg2000 | 19 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-alpha.jp2` | jpeg2000 | 77 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `page-generic.jb2` | jbig2 | 8.4 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `page-symbol.jb2` | jbig2 | 5.4 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-lossy.jxl` | jpeg-xl | 23 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-lossless.jxl` | jpeg-xl | 26 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `scene-alpha.jxl` | jpeg-xl | 35 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bounce.jxl` | jpeg-xl | 60 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `monet-gardeners-house-antibes.jpg` | jpeg | 395 KB | Claude Monet, Cleveland Museum of Art (open access) | [clevelandart.org](https://clevelandart.org/art/1916.1044) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `queen-mab-cave.jpg` | jpeg | 213 KB | Imitator of J. M. W. Turner, Cleveland Museum of Art (open access) | [clevelandart.org](https://clevelandart.org/art/1916.1036) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `rembrandt-st-francis.jpg` | jpeg | 362 KB | Rembrandt van Rijn, Cleveland Museum of Art (open access) | [clevelandart.org](https://clevelandart.org/art/2024.64) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `nolli-rome-plate.jpg` | jpeg | 315 KB | Giovanni Battista Nolli et al., Cleveland Museum of Art (open access) | [clevelandart.org](https://clevelandart.org/art/2020.276.3) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `pallid-swift.jpg` | jpeg | 348 KB | Hobbyfotowiki | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Pallid_swift_(in_flight).jpg) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `cyclotron-patent.png` | png | 202 KB | Ernest O. Lawrence (US Patent Office) | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Cyclotron_patent_p1.png) | public-domain (US patent text and drawings published before 1989) |
+| `mature-flower-diagram.svg` | svg | 121 KB | Mariana Ruiz Villarreal (LadyofHats) | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Mature_flower_diagram.svg) | public-domain (released by its author) |
+| `entamoeba-life-cycle.svg` | svg | 267 KB | Mariana Ruiz Villarreal (LadyofHats) | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Entamoeba_histolytica_life_cycle-en.svg) | public-domain (released by its author) |
+| `sieve-of-eratosthenes.svg` | svg | 22 KB | Ricordisamoa, with later edits by Jc86035, HereToHelp and Glrx | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Sieve_of_Eratosthenes_animation.svg) | public-domain (ineligible for copyright, Wikimedia Commons PD-ineligible) |
+| `muybridge-horse.gif` | gif | 555 KB | Eadweard Muybridge (photographs, 1887); animation by Waugsberg | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Muybridge_race_horse_animated.gif) | public-domain (the author died in 1904) |
+| `geneva-mechanism.gif` | gif | 224 KB | Mike1024 | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Geneva_mechanism_6spoke_animation.gif) | public-domain (released by its author) |
+| `abundance-nemo-g4-6pages.tif` | tiff-fax | 323 KB | Jean d'Abundance (16th century); scanned by the Bibliothèque nationale de France | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Abundance_-_Les_grans_et_merveilleux_faictz_du_seigneur_Nemo%2C_avec_les_privil%C3%A8ges_qu%E2%80%99il_a.tif) | public-domain (a mechanical scan of a public domain book, Wikimedia Commons PD-scan) |
+
+## Camera RAW
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `canon-eos-40d-sraw.cr2` | raw-cr2 | 5.5 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon-eos-r6.cr3` | raw-cr3 | 5.0 MB | Uploader to raw.pixls.us; EXIF artist Johannes Kimmel | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon-powershot-g1.crw` | raw-crw | 2.2 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `nikon-d70s.nef` | raw-nef | 5.0 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sony-ilce-7s.arw` | raw-arw | 5.9 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `olympus-c5060wz.orf` | raw-orf | 7.3 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `panasonic-dmc-lx7.rw2` | raw-rw2 | 3.2 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `fujifilm-finepix-s5000.raf` | raw-raf | 6.5 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `adobe-dng-canon-5d3.dng` | raw-dng | 2.4 MB | Uploader to raw.pixls.us; EXIF artist Simon Harhues | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+
+## CAD
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `house-plan.dxf` | dxf | 85 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `house-plan-r2000.dxf` | dxf | 82 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `house-elevations.dxf` | dxf | 95 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `hatch-gallery.dxf` | dxf | 142 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `dimensions.dxf` | dxf | 55 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `linetypes.dxf` | dxf | 35 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `text-styles.dxf` | dxf | 30 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `blocks.dxf` | dxf | 30 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bracket.dxf` | dxf | 42 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `site-plan.dxf` | dxf | 84 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `legacy-r12.dxf` | dxf | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `barraca-valenciana-0100-r2010.dwg` | dwg | 278 KB | Òscar Selfa | [zenodo.org](https://zenodo.org/records/14293897) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `barraca-valenciana-0300-r2010.dwg` | dwg | 1.0 MB | Òscar Selfa | [zenodo.org](https://zenodo.org/records/14293897) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `barraca-valenciana-0400-r2010.dwg` | dwg | 499 KB | Òscar Selfa | [zenodo.org](https://zenodo.org/records/14293897) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `building-survey-plans-r2000.dwg` | dwg | 2.0 MB | Giovanni De Gasperis, Sante Dino Facchini, Asif Saeed | [zenodo.org](https://zenodo.org/records/15076037) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `golden-tile-palace-r2004.dwg` | dwg | 746 KB | Jing Zhang, Yunying Ren, Xiaofan An | [figshare.com](https://figshare.com/articles/dataset/Figure_of_surveying_and_mapping_of_Golden_Tile_Palace_/21374221) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `residential-site-plan-r2007.dwg` | dwg | 926 KB | Yijun Fan | [figshare.com](https://figshare.com/articles/dataset/Drainage_System_Layout_of_Old_Urban_Residential_Communities_In_Beijing/28188725) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `hospital-floor-plan-r2013.dwg` | dwg | 1.2 MB | Toka Ehab | [zenodo.org](https://zenodo.org/records/10520508) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `commercial-building-hvac-plans-r2018.dwg` | dwg | 495 KB | Kevin Anthony do Bem | [zenodo.org](https://zenodo.org/records/10407941) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `ezdxf-dim-linear-tutorial-r2013.dwg` | dwg | 36 KB | Manfred Moitzi (ezdxf) | [github.com](https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/docs/graphics/dim_linear_tutorial.dwg) | [MIT](https://spdx.org/licenses/MIT.html) |
+| `hospital-ward-wing-plan-section.dxf` | dxf | 300 KB | Innerscene (original model) | [innerscene.com](https://www.innerscene.com/tools/library/drawings/hospital-ward-wing-1200-square-metres-plan-and-section-73a3f4dd) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `grocery-store-plan-section.dxf` | dxf | 128 KB | Innerscene (original model) | [innerscene.com](https://www.innerscene.com/tools/library/drawings/grocery-store-600-square-metres-plan-and-section-2a67d041) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `ezdxf-uncommon-entities.dxf` | dxf | 335 KB | Manfred Moitzi (ezdxf) | [github.com](https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/uncommon.dxf) | [MIT](https://spdx.org/licenses/MIT.html) |
+| `ezdxf-hatches-1.dxf` | dxf | 127 KB | Manfred Moitzi (ezdxf) | [github.com](https://github.com/mozman/ezdxf/blob/748e211c9a0b977b9e15845a6bcad8e1b9743e26/examples_dxf/hatches_1.dxf) | [MIT](https://spdx.org/licenses/MIT.html) |
+
+## 3D
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `gear.stl` | stl | 42 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bracket-ascii.stl` | stl | 8.8 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `knot.obj` | obj | 98 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `terrain.ply` | ply | 117 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `icosphere-ascii.ply` | ply | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `arm.glb` | glb | 28 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `table.gltf` | gltf | 7.6 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `house.ifc` | ifc | 65 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `bsi-building-architecture-ifc2x3.ifc` | ifc | 90 KB | buildingSMART International Ltd. | [github.com](https://github.com/buildingSMART/Sample-Test-Files) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `bsi-building-architecture-ifc4x3.ifc` | ifc | 139 KB | buildingSMART International Ltd. | [github.com](https://github.com/buildingSMART/Sample-Test-Files) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `bsi-wall-with-opening-and-window-ifc4.ifc` | ifc | 12 KB | Peter Bonsma, RDF Ltd. (file header), distributed by buildingSMART International Ltd. | [github.com](https://github.com/buildingSMART/Sample-Test-Files) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `duplex-apartment-ifc2x3.ifc` | ifc | 2.3 MB | Provided to the US Army Construction Engineering Research Laboratory, republished by buildingSMART International | [github.com](https://github.com/buildingsmart-community/Community-Sample-Test-Files/tree/7ddf57a201f88a0c213d5322b02ed15e94a60a40/IFC%202.3.0.1%20(IFC%202x3)/Duplex%20Apartment) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `barraca-valenciana-ifc4.ifc` | ifc | 1.5 MB | Òscar Selfa | [zenodo.org](https://zenodo.org/records/14293897) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `office-archetype-1970-ifc4x3.ifc` | ifc | 1.4 MB | Verena Dannapfel, Moritz Müller, Rita Streblow, Dirk Müller et al., RWTH Aachen University | [zenodo.org](https://zenodo.org/records/21820756) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `fox.glb` | glb | 159 KB | PixelMannen (model, CC0), tomkranis (rigging and animation, CC BY 4.0), glTF conversion by Asobo Studio and the Khronos Group | [github.com](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/Fox) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `riggedfigure.gltf` | gltf | 98 KB | Cesium | [github.com](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/RiggedFigure) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `vertexcolortest.glb` | glb | 26 KB | Ed Mackey, Analytical Graphics, Inc. (Cesium) | [github.com](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/VertexColorTest) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `metalroughspheres.glb` | glb | 284 KB | Krill Gavrilov / Draw Harness script (Open CASCADE Technology) | [github.com](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/MetalRoughSpheresNoTextures) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `iridescencesuzanne.glb` | glb | 496 KB | Mathias Kanzler (UX3D), Pascal Schoen | [github.com](https://github.com/KhronosGroup/glTF-Sample-Assets/tree/edc7c9e67c639d230715049ee31f9a96a6babbbe/Models/IridescenceSuzanne) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `ratchet-cam.stl` | stl | 75 KB | NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:Stationary_Ratchet_Cam_v11_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `ratchet-spur-gear.stl` | stl | 148 KB | NASA Johnson Space Center, transferred to the Smithsonian Institution; model published on Wikimedia Commons | [commons.wikimedia.org](https://commons.wikimedia.org/wiki/File:N=19,_P=28_-_Stat._Ratchet_Spur_Gear_v13_(Hatch,_Crew,_Apollo_11_by_NASA_and_Smithsonian_Institution).stl) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `petri-dish-holder-base.stl` | stl | 148 KB | Kevin A. Adkins, Kaiyu Li, M. N. Blasko, J. L. Cabrera, B. H. Neal, James et al. | [zenodo.org](https://zenodo.org/records/12193898) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `chickpea-mesh.ply` | ply | 198 KB | William T. Salter, Arjina Shrestha, Margaret M. Barbour | [zenodo.org](https://zenodo.org/records/4018242) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `ruthwell-lamb-of-god.ply` | ply | 873 KB | Gurpreet Singh | [zenodo.org](https://zenodo.org/records/3348342) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+
+## Audio and video
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `canon.wav` | wav | 131 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon.mp3` | mp3 | 25 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon.flac` | flac | 73 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon.ogg` | ogg | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon.opus` | opus | 16 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `canon.m4a` | m4a | 24 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `testcard.mp4` | mp4 | 41 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `testcard.webm` | webm | 41 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+
+## Archives
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `sample.zip` | zip | 15 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.tar` | tar | 50 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.tar.gz` | tar.gz | 15 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.tar.bz2` | tar.bz2 | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.tar.xz` | tar.xz | 13 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.tar.zst` | tar.zst | 14 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `server.log.gz` | gz | 1.3 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `server.log.bz2` | bz2 | 1.1 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `server.log.xz` | xz | 820 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.7z` | 7z | 13 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.rar` | rar | 34 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.iso` | iso | 130 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `matryoshka.zip` | zip | 7.1 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `encrypted-aes.zip` | zip | 16 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `encrypted-zipcrypto.zip` | zip | 16 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `encrypted.7z` | 7z | 13 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `example.jar` | jar | 793 B | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `pages.cbz` | cbz | 10 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.cab` | cab | 6.1 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `exav-example.deb` | deb | 2.2 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `libexample.a` | ar | 1.9 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `sample.cpio` | cpio | 7.0 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+
+## Unsupported
+
+| File | Format | Size | Author | Source | Licence |
+| --- | --- | ---: | --- | --- | --- |
+| `fax-g3-1d.tif` | tiff-fax | 60 KB | exav project | made for the demo | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `minolta-dimage-5.mrw` | raw-mrw | 6.1 MB | Uploader to raw.pixls.us (the site gives no name) | [raw.pixls.us](https://raw.pixls.us/#repo) | [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/) |
+| `chickpea-pointcloud-ascii.ply` | ply | 3.3 MB | William T. Salter, Arjina Shrestha, Margaret M. Barbour | [zenodo.org](https://zenodo.org/records/4018242) | [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) |
+| `tika-pages09-layout.pages` | pages | 65 KB | Michael McCandless (Apache Tika) | [github.com](https://github.com/apache/tika/blob/f58e44c022a9952252f3e094dcc40abd931f7ecd/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-apple-module/src/test/resources/test-documents/testPagesLayout.pages) | [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) |
+
+## Attributions
+
+The lines the licences ask to keep:
+
+- `barraca-valenciana-0100-r2010.dwg`: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- `barraca-valenciana-0300-r2010.dwg`: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- `barraca-valenciana-0400-r2010.dwg`: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- `building-survey-plans-r2000.dwg`: De Gasperis, G., Facchini, S. D., Saeed, A., Building Ledger Dossier: Seismic Prevention and Building Documentation Tracking through a Digital Twin Approach (4_Architectural_Building_Survey.dwg), Zenodo, doi:10.5281/zenodo.15076037, CC BY 4.0. No changes.
+- `golden-tile-palace-r2004.dwg`: Jing Zhang, Yunying Ren, Xiaofan An, Figure of surveying and mapping of Golden Tile Palace, supplementary file S1 of PLOS ONE doi:10.1371/journal.pone.0262155, figshare, CC BY 4.0. No changes.
+- `residential-site-plan-r2007.dwg`: Yijun Fan, Drainage System Layout of Old Urban Residential Communities In Beijing (Site Plan.dwg), figshare, doi:10.6084/m9.figshare.28188725.v1, CC BY 4.0. No changes.
+- `hospital-floor-plan-r2013.dwg`: Toka Ehab, Nanotechnology Applications in Interior Design of hospitals to enhance thermal comfort and decrease the infection spread for the occupants (Elite hospital plan.dwg), Zenodo, doi:10.5281/zenodo.10520508, CC BY 4.0. No changes.
+- `commercial-building-hvac-plans-r2018.dwg`: Kevin Anthony do Bem, Projeto de Climatização de um Edifício de Comércio e Serviços (F04 Plantas- Rede aerolica.dwg), Zenodo, doi:10.5281/zenodo.10407941, CC BY 4.0. No changes.
+- `ezdxf-dim-linear-tutorial-r2013.dwg`: Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.
+- `ezdxf-uncommon-entities.dxf`: Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.
+- `ezdxf-hatches-1.dxf`: Copyright (c) 2020 Manfred Moitzi, ezdxf, MIT License. No changes.
+- `bsi-building-architecture-ifc2x3.ifc`: buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.
+- `bsi-building-architecture-ifc4x3.ifc`: buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.
+- `bsi-wall-with-opening-and-window-ifc4.ifc`: buildingSMART International, Sample-Test-Files, https://github.com/buildingSMART/Sample-Test-Files, licensed CC BY 4.0. No changes.
+- `duplex-apartment-ifc2x3.ifc`: BSI (2020) Duplex Apartment Test Files, buildingSMART International, https://github.com/buildingsmart-community/Community-Sample-Test-Files, CC BY 4.0. No changes.
+- `barraca-valenciana-ifc4.ifc`: Òscar Selfa, Barraca Valenciana de Llauradors: Model BIM i Estudi de la Tipologia Arquitectònica, Zenodo, doi:10.5281/zenodo.14293897, CC BY 4.0. No changes.
+- `office-archetype-1970-ifc4x3.ifc`: Dannapfel, V., Müller, M., Streblow, R., Müller, D. et al., Archetypes for German Office Buildings of Construction Years 1970, 1998 and 2026, Zenodo, doi:10.5281/zenodo.21820756, CC BY 4.0. No changes.
+- `fox.glb`: Fox: model by PixelMannen (CC0, https://opengameart.org/content/fox-and-shiba), rigging and animation by tomkranis (CC BY 4.0, https://sketchfab.com/3d-models/low-poly-fox-by-pixelmannen-animated-371dea88d7e04a76af5763f2a36866bc), glTF conversion by Asobo Studio and the Khronos Group. Unmodified.
+- `riggedfigure.gltf`: Rigged Figure by Cesium, CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/RiggedFigure. Unmodified.
+- `vertexcolortest.glb`: Vertex Color Test by Ed Mackey, Copyright 2018 Analytical Graphics, Inc., CC BY 4.0, https://github.com/KhronosGroup/glTF-Sample-Assets/tree/main/Models/VertexColorTest. Unmodified.
+- `petri-dish-holder-base.stl`: Components of the spore capture device in A simple mechanism for uncrewed aircraft bioaerosol sampling in the lower atmosphere (Inspire1Petri_Dish_Holder_Base.stl), Kevin A. Adkins et al., Zenodo 2024, doi:10.5281/zenodo.12193898, CC BY 4.0. No changes.
+- `chickpea-mesh.ply`: 3D photogrammetric reconstructions of individual chickpea plants (PBASlasher_S3s_Wk1_meshed.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.
+- `ruthwell-lamb-of-god.ply`: Small Panel PLY (Lamb of God panel from the Ruthwell Cross), Gurpreet Singh, Zenodo 2019, doi:10.5281/zenodo.3348342, CC BY 4.0. No changes.
+- `chickpea-pointcloud-ascii.ply`: 3D photogrammetric reconstructions of individual chickpea plants (SonSla_3_groundtruth_pointcloud.ply), William T. Salter, Arjina Shrestha and Margaret M. Barbour, Zenodo 2020, doi:10.5281/zenodo.4018242, CC BY 4.0. No changes.
+- `arxiv-rational-cherednik-torus-knots.pdf`: Xinchun Ma, Rational Cherednik Algebras and Torus Knot Invariants, arXiv:2402.18770v1, CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/). Not modified.
+- `slides-unige-open-access.pdf`: Floriane Muller and Anouk Santos, Open Access publishing at no cost thanks to UNIGE agreements, in 15 minutes, Zenodo, https://doi.org/10.5281/zenodo.23478694, CC BY 4.0. Not modified.
+- `paper-ja-labor-law.pdf`: 藤木 貴史, アメリカ労働法からみた憲法の影響, アメリカ憲法の理論と実践 創刊号, Zenodo, https://doi.org/10.5281/zenodo.23469422, CC BY 4.0. Not modified.
+- `docx4j-getting-started.docx`: docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes.
+- `docx4j-two-charts.docx`: docx4j, Jason Harrop / Plutext, https://github.com/plutext/docx4j, Apache-2.0. No changes.
+- `closedxml-pivot-tables.xlsx`: Copyright (c) 2016 ClosedXML, MIT, https://github.com/ClosedXML/ClosedXML. No changes.
+- `xlsxwriter-bar-chart.xlsx`: Copyright (c) 2013-2025, John McNamara, BSD-2-Clause, https://github.com/jmcnamara/XlsxWriter. No changes.
+- `python-pptx-chart-types.pptx`: Copyright (c) 2013 Steve Canny, MIT, https://github.com/scanny/python-pptx. No changes.
+- `poi-sample.doc`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `poi-word95.doc`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `poi-formula-eval.xls`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `poi-conditional-formats.xls`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `poi-excel5.xls`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `poi-sample-show.ppt`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `tika-rtf-various.rtf`: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- `tika-odt-ooo3.odt`: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- `tdf-household-budget.ods`: Hrbrgr (Document Foundation wiki user), Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, https://wiki.documentfoundation.org/File:Housekeeping_book_-_Haushaltsbuch_-_in_Calc_final.ods, CC BY 3.0. No changes.
+- `odfdo-flat.fods`: Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.
+- `odfdo-example.odp`: Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.
+- `tdf-diagram-gallery.odg`: Hrbrgr (Document Foundation wiki user), Diagramme.odg, https://wiki.documentfoundation.org/File:Diagramme.odg, CC BY 3.0. No changes.
+- `odfdo-shapes.odg`: Copyright Jérôme Dumonteil, odfdo, Apache-2.0, https://github.com/jdum/odfdo. No changes.
+- `tika-keynote09.key`: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- `tika-keynote2013.key`: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- `tika-numbers09-charts.numbers`: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+- `numbers-formulas.numbers`: Copyright 2021 Jon Connell, numbers-parser, MIT, https://github.com/masaccio/numbers-parser. No changes.
+- `poi-network.vsdx`: Apache POI test data, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/poi. No changes.
+- `vsdx-house.vsdx`: Copyright (c) 2020, Dave Howard, BSD-3-Clause, https://github.com/dave-howard/vsdx. No changes.
+- `tika-pages09-layout.pages`: Apache Tika test document, Copyright The Apache Software Foundation, Apache-2.0, https://github.com/apache/tika. No changes.
+
diff --git a/www/src/content/docs/viewer/index.md b/www/src/content/docs/viewer/index.md
index 6536b1e0..704a4f3d 100644
--- a/www/src/content/docs/viewer/index.md
+++ b/www/src/content/docs/viewer/index.md
@@ -1,17 +1,19 @@
 ---
 title: File viewer
-description: "@exav/viewer, a file viewer for the browser: PDF, images, DWG and DXF, Office documents, IFC and STL models, media and archives, each engine loaded on first use, every asset from the host's own origin."
+description: "@exav/viewer, a file viewer for the browser: PDF, images, DWG and DXF, Office documents, IFC, STL, OBJ, PLY and glTF models, media and archives, each engine loaded on first use, every asset from the host's own origin."
 ---
 
 **A file viewer for the browser, as one npm package, `@exav/viewer`.** It
-shows PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint and CSV, IFC
-and STL models, video and audio, and the files inside an archive. Each
-format is a plugin; a host lists the ones it opens, and only their engines
-are bundled. An engine's code is fetched when the first file of its format
-opens, never before.
-
-**[Try the demo](/viewer/demo/)**: its samples are public-domain or
-CC0 files ([exav-samples](https://github.com/sylvinus/exav-samples)), and a
+shows <!-- formats:viewer-summary -->PDF, images, DWG and DXF drawings, Word, Excel, PowerPoint and CSV, text (Markdown, JSON, XML, source code), IFC, STL, OBJ, PLY and glTF models, video, audio, and what is inside an archive<!-- /formats:viewer-summary -->. It also reads, by
+converting them in the browser, the 1997 Office formats, RTF, OpenDocument,
+Numbers, Keynote and Visio files. Each format is a plugin; a host lists the
+ones it opens, and only their engines are bundled. An engine's code is
+fetched when the first file of its format opens, never before.
+
+**[Try the demo](/viewer/demo/)**: its samples are public-domain, CC0,
+CC-BY, MIT, BSD or Apache files, most of them made for the demo
+([exav-samples](https://github.com/sylvinus/exav-samples) and the
+[example files](/viewer/examples/), with each author and licence), and a
 file you open in it stays in your browser.
 
 - **A hostile file reaches nothing.** In the sandboxed mode each file opens
@@ -23,10 +25,14 @@ file you open in it stays in your browser.
   browser, and the checks that keep them.
 - **exav's own decoders in WebAssembly.** The image formats browsers do not
   draw (TIFF in most of them, BMP variants, ICO, PNM, QOI, DDS, farbfeld,
-  HDR, JPEG 2000, JBIG2), the JPEG 2000, JBIG2 and fax images inside PDFs,
-  DWG and DXF drawings, and IFC and STL models are decoded by
+  HDR, JPEG 2000, JBIG2, JPEG XL, camera RAW files shown by their embedded
+  preview), the JPEG 2000, JBIG2 and fax images inside PDFs,
+  DWG and DXF drawings, and IFC, STL, OBJ, PLY and glTF models are decoded by
   [exav-render](/subprojects/exav-render/), safe Rust compiled to wasm and
-  run in a worker. The modules import nothing but wasm-bindgen's plumbing:
+  run in a worker. So are the converters of the formats the Office engines do
+  not read: spreadsheets (XLS, ODS, Numbers) to XLSX, presentations and
+  drawings (PPT, ODP, Keynote, ODG, Visio) to PPTX, and text documents (DOC,
+  ODT, RTF) to DOCX. The modules import nothing but wasm-bindgen's plumbing:
   no network, no global object, no clock. A crafted file can fail to open,
   or be stopped after a time limit or at its module's memory cap; what the
   decoder does stays in its worker.
@@ -48,26 +54,117 @@ file you open in it stays in your browser.
 | Format | Plugin | Engine | Install beside the package |
 |---|---|---|---|
 | PDF | `pdf()`, `@exav/viewer/pdf` | pdf.js, in a worker | `pdfjs-dist` 5 or 6 |
-| PNG, JPEG, GIF, WebP | `image()`, `@exav/viewer/image` | the browser | |
-| TIFF, BMP, ICO, PNM, QOI, DDS, farbfeld, HDR, JPEG 2000 (.jp2, .jpf, .j2k), JBIG2 (.jb2) | `image({ wasmDecoders: true })` | exav-render, in a worker | |
+| PNG, JPEG, GIF, WebP, SVG | `image()`, `@exav/viewer/image` | the browser | |
+| TIFF, BMP, ICO, PNM, QOI, DDS, farbfeld, HDR, JPEG 2000 (.jp2, .jpf, .j2k), JBIG2 (.jb2), JPEG XL (.jxl) | `image({ wasmDecoders: true })` | exav-render, in a worker | |
+| Camera RAW: DNG, CR2, CR3, CRW, NEF, NRW, ARW, SR2, SRF, ORF, RW2, RAW, RWL, RAF, PEF, SRW, 3FR, IIQ, X3F, MRW, DCR, KDC, ERF, MEF, MOS | `image({ wasmDecoders: true })` | exav-render, in a worker: the largest JPEG or RGB preview the file embeds, turned by its Exif orientation; the sensor data is not decoded, so a file with no preview shows an error | |
 | DWG (R13 to 2018), DXF | `dwg()`, `dxf()`, `@exav/viewer/cad` | exav-render, in a worker; WebGL2 | |
 | Word, Excel, PowerPoint | `docx()`, `xlsx()`, `pptx()`, `@exav/viewer/office` | @silurus/ooxml | `@silurus/ooxml` |
 | CSV, TSV | `csv()` | the separator and encoding read off the bytes | `@silurus/ooxml` |
+| XLS (.xls, .xlt; Excel 2.1 to 2003); ODS (.ods, .ots, .fods); Numbers (.numbers); an XML Spreadsheet 2003, HTML table or SYLK file saved as .xls | `xls()`, `ods()`, `numbers()`, `@exav/viewer/office`, with `xlsx()` | exav-render's `sheets`, in a worker: converted to XLSX, shown by `xlsx()` | `@silurus/ooxml` |
+| PPT (.ppt, .pps, .pot; PowerPoint 95 and 97 to 2003); ODP (.odp, .otp, .fodp); Keynote (.key, every version); ODG (.odg, .otg, .fodg); Visio 2013 and later (.vsdx, .vsdm, .vstx, .vstm) | `ppt()`, `odp()`, `keynote()`, `odg()`, `visio()`, `@exav/viewer/office`, with `pptx()` | exav-render's `slides`, in a worker: converted to PPTX, shown by `pptx()`; a page of a drawing is a slide | `@silurus/ooxml` |
+| RTF (.rtf); DOC (.doc, .dot; Word 6 to 2003); ODT (.odt, .ott, .fodt) | `rtf()`, `doc()`, `odt()`, `@exav/viewer/office`, with `docx()` | exav-render's `docs` (a prototype), in a worker: converted to DOCX, shown by `docx()` | `@silurus/ooxml` |
+| What none of those converters reads: binary Visio (.vsd, .vst), Visio 2003 XML (.vdx, .vtx), CorelDRAW (.cdr, .cmx), Publisher (.pub), PageMaker (6 to 7), FreeHand (3 to 11), QuarkXPress (3.1 to 4.1), Zoner Draw (4, 5), WordPerfect Graphics (.wpg); a CSV or DIF saved as .xls | `visio()`, `coreldraw()`, `publisher()`, `pagemaker()`, `freehand()`, `quarkxpress()`, `zonerdraw()`, `wpg()`, `@exav/viewer/office`, with `pdf()` and `xlsx()` | an [external converter](/viewer/integration/#the-external-converter) the host names; without one the file ends in the `needs_converter` error | the converter's package |
+| Text: .txt, .text, .log; Markdown (.md, .markdown); JSON (.json, .geojson); XML (.xml, .xsd, .xsl, .xslt, .rss, .atom, .kml, .gpx, .rdf, .wsdl, .plist); HTML as source (.html, .htm, .xhtml); YAML, TOML, INI and conf files, .jsonl, .srt and .vtt subtitles, diffs (.diff, .patch); source code and scripts (.js, .ts, .py, .sh, .css, .c, .h, .rs, .go, .java and the like) | `text()`, `@exav/viewer/text` | written for the viewer, in TypeScript; no dependency | |
 | IFC (IFC2X3, IFC4, IFC4X3) | `ifc()`, `@exav/viewer/ifc` | exav-render, in a worker; drawn with three.js | `three` |
 | STL (binary, ASCII) | `stl()`, `@exav/viewer/model` | exav-render, in a worker; drawn with three.js | `three` |
-| Video, audio | `video()`, `audio()`, `@exav/viewer/media` | the browser | |
-| zip, 7z, rar, tar, gz, bz2, xz | `archive()`, `@exav/viewer/archive` | [exav-unpack](/unpack/wasm/) in wasm | `@exav/unpack-wasm` |
+| Wavefront OBJ (.obj), Stanford PLY (.ply, ASCII and binary), glTF 2.0 (.gltf with `data:` buffers or buffer files among the files given with it, .glb) | `obj()`, `ply()`, `gltf()`, `@exav/viewer/model` | exav-render, in a worker; drawn with three.js. Geometry, groups and nodes, vertex and material colours; no textures, materials files or animations, and no file or URL named by the model is fetched, only files of the [tree](/viewer/api/#the-files-around-a-file) the viewer is given (a glTF whose buffers are other files that are not there, and a PLY point cloud, show the error) | `three` |
+| Video, audio (MP4, MOV, WebM, Ogg; MP3, M4A, AAC, WAV, Ogg, Opus, FLAC) | `video()`, `audio()`, `@exav/viewer/media` | the browser, with its controls or the host's | |
+| Archives: zip, 7z, rar, tar, cab, lzh, arj, ar and deb, cpio, xar and pkg, zoo, arc, alz, egg; compressed files: gz, bz2, xz, zst, lz4, lz, Z; packages that are zips (jar, war, apk, aab, ipa, xpi, whl, nupkg, vsix, kmz); comic books (cbz, cbr, cb7, cbt); disc and disk images: iso, dmg, wim, vhd, vhdx, vmdk, qcow2; chm help files; `winmail.dat` | `archive()`, `@exav/viewer/archive` | [exav-unpack](/unpack/wasm/) in wasm | `@exav/unpack-wasm` |
+
+The peer ranges: `@silurus/ooxml` `>=0.87.0 <1` (the package is built and
+tested with 0.89.1), `pdfjs-dist` `>=5.0.0 <7`, `three` `>=0.170.0 <1`,
+React 19. All are optional.
 
 `@exav/viewer/all` exports `allPlugins()`, every plugin at once, for a host
 that installs every engine.
 
+## Converted formats
+
+The Office engines read Open XML. A file in another Office format is
+converted first, in a worker of its own, and the result is shown by the
+engine of the Open XML format it became:
+
+- **Spreadsheets** (XLS, ODS, Numbers, and the XML, HTML and SYLK files Excel
+  opens from a .xls name) become XLSX, shown as a workbook.
+- **Presentations and drawings** (PPT, ODP, Keynote, ODG, Visio 2013 and
+  later) become PPTX. A page of a drawing is a slide, in the size of the
+  largest page.
+- **Text documents** (DOC, ODT, RTF) become DOCX. This converter is a
+  prototype: on the project's test files, 32% of the pages of DOC files come
+  out close to a reference rendering, against 50% for DOCX files drawn
+  natively.
+
+The converters are [exav-render](/subprojects/exav-render/#office-documents)'s
+`sheets`, `slides` and `docs`, compiled to three wasm modules that ship inside
+the package (`exav_viewer_sheets`, `exav_viewer_slides`,
+`exav_viewer_docs`; their [sizes](/viewer/integration/#two-kinds-of-files)
+are on the Integration page). A host installs nothing for them, and nothing is
+fetched but the module. Values are shown as the file stored them: nothing is
+recalculated and no macro runs.
+
+A file a converter recognises and cannot convert (encrypted with a password,
+too large, damaged, in a version it does not read) ends in the Office error,
+and its cause says why. It is never handed to the external converter.
+
+Binary Visio (.vsd), CorelDRAW, Publisher, PageMaker, FreeHand, QuarkXPress,
+Zoner Draw, WordPerfect Graphics, and a CSV or DIF named .xls are read by no
+converter of the package. They go to an **external converter**, a module the
+host names, and end in the `needs_converter` error when it names none.
+[Integration](/viewer/integration/#the-external-converter) gives its contract.
+The live demo is built with none.
+
+## Text
+
+The text plugin claims the names and content types in the table and no
+other: a file is not opened as text because it happens to be text. `.svg` is
+not claimed (it is an image, below), and HTML is shown as
+its source, never as a page. It is also what opens the text files inside an
+archive, by their names.
+
+- **Nothing is interpreted.** The page is built with `createElement` and
+  `textContent`; no markup string from the file is ever parsed, so a
+  `<script>`, an `onerror` image or an entity in a file is text on the page.
+  JSON and XML are reindented by a tokenizer, not parsed to a tree: JSON
+  numbers keep their text (12345678901234567890 and 1.10 stay as written),
+  and an XML entity or DTD is neither expanded nor fetched.
+- **Markdown** is CommonMark with tables and strikethrough, read in
+  WebAssembly (pulldown-cmark, in exav-render) into a tree of data that the
+  page draws element by element: headings, emphasis, strong, strike, code spans
+  and fences, quotes, nested lists, tables, rules, links, entities, reference
+  links and hard breaks. Raw HTML is shown as text, and an image is its alt
+  text in brackets: nothing is loaded. A
+  link to an absolute `http:`, `https:` or `mailto:` address (without
+  credentials) is drawn as its label with the address written beside it, and
+  an `http:` or `https:` one opens on a click or Enter as a PDF's links do: in
+  the sandboxed frame the host asks first, in the page it opens a new tab
+  with no opener. A `mailto:` link is text, and any other target
+  (`javascript:`, `data:`, `file:`, a relative path) leaves the label alone.
+  A link is not an anchor, so the document itself never navigates.
+- **What the bytes say.** A byte-order mark picks UTF-8 or UTF-16;
+  otherwise UTF-8 if the bytes are valid in it, else windows-1252. A file
+  with a NUL byte in its first 64 KiB, or mostly control characters, is
+  not text, and the viewer says so instead of drawing noise. Control
+  characters show as their Control Pictures glyph, and bidirectional
+  embeddings, overrides and isolates (CVE-2021-42574) and the line and
+  paragraph separators show as `<U+202E>` and the like, so a file cannot
+  reorder or hide what it says.
+- **Limits.** The first 2 MiB and 50,000 lines are read, a line is cut at
+  10,000 characters, a Markdown document is cut at 100,000 nodes and
+  nests quotes and lists ten deep, JSON nests a hundred deep. A warning
+  (`text_truncated`, `text_long_lines`) says when anything was left out.
+  Text is drawn in blocks of 200 lines, the rest after the first paint, so
+  that a large file does not freeze the tab. A URL source is downloaded
+  whole before it is cut.
+
 IFC models are read and meshed by exav's own engine, written from
 buildingSMART's schemas and documentation: placements, mapped items,
 extrusions of every profile type, revolutions, sweeps along a curve,
-tessellated face sets, faceted B-reps, advanced B-reps (planar, cylindrical
-and B-spline faces), surface models, CSG
-primitives, booleans with half-spaces, and openings cut out of their walls.
-Elements a file gives no colour take their category's. A model is framed on
+tessellated face sets, faceted B-reps, advanced B-reps (planar, cylindrical,
+spherical, toroidal and B-spline faces, the last cut by their bounds),
+surface models, CSG primitives, booleans with half-spaces, and openings cut
+out of their walls. Categories can be hidden, and so can the building
+storeys of a model that has two or more (the `storeys` controller, listed
+above the categories). Elements a file gives no colour take their category's. A model is framed on
 its elements, less any standing apart from all the others (an object an
 export left a kilometre away, a geo-referencing marker), which are still
 drawn; the wheel zooms towards the pointer.
@@ -90,9 +187,9 @@ decoders (C++) compiled to wasm; the viewer does not copy them, and gives
 pdf.js exav-render's in their place (hayro-jpeg2000, hayro-jbig2 and
 hayro-ccitt, safe Rust). They draw the same pixels, except lossy JPEG 2000,
 one level apart on a few samples, and 16-bit JPEG 2000, one level apart at
-most. SVG is
-not offered: an SVG is a
-document that can carry script, not a picture.
+most. An SVG is a document that can carry script, so it is drawn as an
+`<img>`, where the browser runs none of it and fetches nothing it names,
+and drawn again sharp when zoomed.
 
 ## Install
 
@@ -165,8 +262,8 @@ import { SandboxedViewerProvider } from "@exav/viewer/react/sandbox";
 ## In this section
 
 - [Integration](/viewer/integration/): the assets and
-  where they are served from, bundlers other than Vite, caching and
-  offline use, the Content-Security-Policy.
+  where they are served from, bundlers other than Vite, the external
+  converter, caching and offline use, the Content-Security-Policy.
 - [React UI](/viewer/react/): components, overrides,
   CSS custom properties, messages.
 - [Core API](/viewer/api/): files and sources, sessions
@@ -174,14 +271,18 @@ import { SandboxedViewerProvider } from "@exav/viewer/react/sandbox";
 - [Security](/viewer/security/): the threat model, the
   sandboxed frame and the in-page mode, the headers to serve, the checks,
   what remains.
+- [Example files](/viewer/examples/): the files of the [demo](/viewer/demo/),
+  one or more for each format, with their authors, sources and licences.
+- [Format matrix](/project/formats/): every format, with what the scanner,
+  the extractor and the viewer do with it.
 
 The Rust decoders behind the wasm modules, and what they do not draw
 faithfully yet, are documented under [exav-render](/subprojects/exav-render/).
 
 ## Where it lives
 
-`crates/exav-viewer` in the repository: the Rust crate compiled to the five
-wasm modules (`src/`), the TypeScript sources of the package (`ts/`, the
+`crates/exav-viewer` in the repository: the Rust crate compiled to the seven
+wasm modules and the two decoders pdf.js loads (`src/`), the TypeScript sources of the package (`ts/`, the
 sandboxed frame's in `ts/frame/`), the demo (`demo/`) and its browser tests
 (`e2e/`). The tests run against the demo built for production, as a host
 would bundle the package, each file in the frame and in the page, under
@@ -193,6 +294,7 @@ MIT. The DWG module contains the NewStroke stroke font, CC0-1.0, and
 encoding_rs, whose WHATWG data is BSD-3-Clause; the bundled fonts (Arimo,
 Cousine, Tinos) are under the SIL Open Font License. The
 package's `NOTICE` lists the rest. The engines installed beside it keep
-their own licenses: pdf.js is Apache-2.0, the others MIT.
+their own licenses: pdf.js is Apache-2.0, the others MIT. An external
+converter a host installs keeps its own.
 The sandboxed frame app bundles those engines, with their license files in
 its `licenses/`.
diff --git a/www/src/content/docs/viewer/integration.md b/www/src/content/docs/viewer/integration.md
index f2895f88..87769ed1 100644
--- a/www/src/content/docs/viewer/integration.md
+++ b/www/src/content/docs/viewer/integration.md
@@ -14,8 +14,25 @@ drawing renderer uses. The code references each one with
 `new URL("...", import.meta.url)`, so the host's bundler finds them, gives
 them hashed names and emits them with the rest of the build. A host does
 nothing for these. They are fetched when the first file of their format
-opens: the DWG module, 1.9 MB (816 KB gzipped), only when a drawing does;
-the IFC and STL module, 290 KB (131 KB gzipped), only when a model does.
+opens: the DWG module only when a drawing does, the spreadsheet converter
+only when an XLS, ODS or Numbers file does, and so on. The modules, as built
+from the current source:
+
+| Module | Opens | Size | Brotli | Gzip |
+|---|---|---|---|---|
+| `exav_viewer_image` | TIFF, BMP, ICO, PNM, QOI, DDS, farbfeld, HDR, JPEG 2000, JBIG2, JPEG XL, camera RAW | 1,887,799 | 545,639 | 692,041 |
+| `exav_viewer_dwg` | DWG, DXF | 910,004 | 364,922 | 443,809 |
+| `exav_viewer_model` | IFC, STL, OBJ, PLY, glTF | 343,651 | 130,295 | 156,216 |
+| `exav_viewer_text` | Markdown | 188,193 | 68,594 | 82,022 |
+| `exav_viewer_sheets` | XLS, ODS, FODS, Numbers, SpreadsheetML 2003, HTML tables, SYLK, to XLSX | 1,081,680 | 450,494 | 543,282 |
+| `exav_viewer_slides` | PPT, ODP, FODP, Keynote, ODG, Visio (VSDX), to PPTX | 1,015,358 | 434,088 | 521,416 |
+| `exav_viewer_docs` | DOC, ODT, FODT, RTF, to DOCX | 826,632 | 359,102 | 432,727 |
+
+Sizes are in bytes, of the `.wasm` files in the package's `wasm/`. A server
+that compresses sends about the brotli or gzip column. pdf.js's two
+replacement decoders are inside their JavaScript fallbacks
+(`openjpeg_nowasm_fallback.js`, 269 KB, and `jbig2_nowasm_fallback.js`,
+318 KB, each holding its module in base64).
 
 **The engines' runtime files**, which no import reaches: pdf.js's CMaps,
 standard fonts, ICC profiles and image decoders. They come from the host's own `node_modules`, so their
@@ -189,6 +206,44 @@ The frame reports its policy when it starts, and the viewer refuses one
 whose origins differ from its `origins`: rebuild the frame with the same
 flags after changing them.
 
+### A host that draws its own UI
+
+The frame draws the document and nothing else; the rest can be the host's
+own components, from a design system say, with no exav React code and no
+exav stylesheet in the page. `demo/headless.html` in the package is such a
+host, in plain DOM:
+
+```ts
+import { builtinTranslate, printPictures } from "@exav/viewer";
+import { createSandboxedViewer } from "@exav/viewer/frame";
+
+const viewer = createSandboxedViewer({
+  url: "https://viewer-frame.example-files.com/exav-frame/index.html",
+  options: { media: { controls: "none" } }, // the page draws the player's controls
+});
+const session = viewer.mount(element, file); // the frame fills `element`
+session.status.subscribe(showSpinnerOrError);
+session.controllers.subscribe((c) => {
+  // c.pages, c.zoom, c.sheets, c.media, c.pictures, c.outline, c.layers, c.archive...
+});
+```
+
+- Page field, zoom buttons, sheet tabs, player controls, the outline and the
+  layers are the page's, driven by the controllers ([Core API](/viewer/api/#controllers)).
+- Thumbnails: `c.pictures.render(page, longEdge)` gives an `ImageBitmap`
+  drawn by the frame; a `bitmaprenderer` canvas shows it.
+- Printing: `printPictures(c.pictures)`.
+- Fullscreen: the frame may not; request it on the element that holds it.
+- Keys: the arrows and Escape the document does not use reach the page's
+  `keydown` listeners from the `<iframe>`.
+- Colours: the frame takes the `--exav-viewer-*` custom properties in force where
+  it is mounted; map them to the design system's tokens on an ancestor, and
+  call `viewer.restyle()` when the page's theme changes.
+- Strings: `builtinTranslate(locale)` for exav's own (statuses, warnings,
+  archive members), or the host's i18n.
+- An archive's open member is a session of its own, in
+  `c.archive.get().opened.session`: follow its controllers the same way.
+
 ## Choosing the formats
 
 A host imports the plugins of the formats it opens, from their subpaths,
@@ -206,7 +261,142 @@ the host offers a download instead. `viewer.detect(info)` answers from the
 name and type alone, synchronously, to decide before opening anything.
 
 `@exav/viewer/all` imports every plugin, so every peer dependency must be
-installed.
+installed. It leaves out the converted Office formats, which a host names to
+open them: `rtf()`, `doc()`, `odt()`, `ppt()`, `odp()`, `keynote()`,
+`xls()`, `ods()`, `numbers()`, `odg()` and `visio()` from
+`@exav/viewer/office`, with the plugin that shows the result beside them:
+`docx()` for text documents, `xlsx()` for spreadsheets, `pptx()` for
+presentations and drawings.
+
+```ts
+import {
+  doc, docx, keynote, numbers, odg, odp, ods, odt, ppt, pptx, rtf, visio, xls, xlsx,
+} from "@exav/viewer/office";
+
+const plugins = [docx(), xlsx(), pptx(), rtf(), doc(), odt(), ppt(), odp(), keynote(), xls(), ods(), numbers(), odg(), visio()];
+```
+
+The converters are the package's own wasm modules ([above](#two-kinds-of-files)):
+a host installs `@silurus/ooxml`, which draws the result, and copies nothing
+else. Their options (`converter`, `externalConverter`, `timeoutMs`,
+`maxMemory`) are in [Core API](/viewer/api/#plugin-options). In the
+sandboxed frame, `sandbox.formats` must name them: `formats: BUILTIN_ORDER`
+(from `@exav/viewer`) lists every format.
+
+## The external converter
+
+The package's converters do not read every format the plugins above claim.
+These go to an external converter, a module the host installs and names:
+
+- binary Visio (`.vsd`, `.vst`) and Visio 2003 XML (`.vdx`, `.vtx`), CorelDRAW,
+  Publisher, PageMaker, FreeHand, QuarkXPress, Zoner Draw and WordPerfect
+  Graphics (`visio()`, `coreldraw()`, `publisher()`, `pagemaker()`,
+  `freehand()`, `quarkxpress()`, `zonerdraw()`, `wpg()`);
+- a spreadsheet saved as .xls that is not one (a CSV or a DIF, say), through
+  `xls()`.
+
+With none set, such a file ends in the `needs_converter` error, with the
+format's name. A file one of the package's converters recognises and cannot
+convert (encrypted, too large, damaged) is not handed over: it fails with the
+converter's reason.
+
+`converter` chooses the order. `"exav"`, the default, tries the package's
+converters first for spreadsheets, presentations and drawings, and the
+external one for what they do not read. Text documents (DOC, ODT, RTF) are the
+exception: the external converter takes them first when there is one, since
+the package's `docs` converter is a prototype, and the package's converter
+reads them when there is none. `converter: "exav"` set on a plugin asks for
+the package's converter for text documents even where an external one is
+set. `"external"` sends every format to the external converter alone.
+
+### Naming it
+
+`externalConverter` is the URL of an ES module (absolute, rooted, or relative
+to the page), or the name of a package installed beside the viewer, copied
+with the assets:
+
+```ts
+// vite.config.ts
+export default { plugins: [exavViewer({ externalConverter: "my-converter" })] };
+```
+
+```bash
+# other bundlers
+npx exav-viewer-assets public/exav-viewer --external-converter my-converter
+```
+
+The package's published files (`files` in its `package.json`, else all but
+`node_modules`) go under `assetBase` in `converters/<name>/<version>/`, with
+its `LICENSE` and `NOTICE`, and `manifest.json` lists the entry (`converters`;
+the package's `exports["."]` or `main`). The copy fails when the package is
+not installed. Then the plugins take its name:
+
+```ts
+const conversion = { externalConverter: "my-converter" };
+const plugins = [pdf(), xlsx(), visio(conversion), coreldraw(conversion), publisher(conversion), xls(conversion)];
+```
+
+The converter's output is shown by the viewer's own `pdf()` or `xlsx()`: they
+must be registered too.
+
+### The contract
+
+The module exports `convert`, and may export `prefetch`:
+
+```ts
+export function convert(bytes: Uint8Array, options: {
+  hint: string;          // what the viewer took the file for: "rtf", "doc", "odt", "ppt", "odp",
+                         // "keynote", "xls", "ods", "numbers", "odg", "visio", "coreldraw",
+                         // "publisher", "pagemaker", "freehand", "quarkxpress", "zonerdraw" or "wpg".
+                         // A hint: the bytes decide.
+  maxMemory?: number;    // bytes, when the host set the `maxMemory` option
+  signal?: AbortSignal;  // aborted when the file is closed or `timeoutMs` passes: reject
+  onProgress?: (p: ConvertProgress) => void;
+}): Promise<{ format: "pdf" | "xlsx"; bytes: Uint8Array }>;
+
+// URLs, relative to the module, that `viewer.prefetch([...])` fetches with it
+export function prefetch?(hint: string): string[] | Promise<string[]>;
+```
+
+`ConvertProgress` is `{ stage: "download"; loaded; total }` (the module's code
+and data arriving, `total` 0 when not known), `{ stage: "start" }`, and
+`{ stage: "load" | "export"; done; total }`. The viewer shows them as the
+`engine`, `start`, `read` and `convert` [steps](/viewer/api/#status) of its
+status, with a bar where a share is given. A converter that reports nothing
+leaves the status at plain loading until it answers.
+
+The module gets a copy of the bytes. The viewer stops waiting after
+`timeoutMs` (default 120,000) whether or not the module looks at its signal.
+The failures a host can tell apart:
+
+| Error | `kind` | When |
+|---|---|---|
+| `NeedsConverterError`, the cause of the status error with code `needs_converter` | `"needs-converter"` | no external converter is set for a format only one reads; `format` names it |
+| `ExternalConversionError`, the cause of the Office error | `"failed"` | the module rejected, threw, or resolved to something that is not `{ format, bytes }`; its error is the cause |
+| `ExternalConversionError`, the cause of the Office error | `"timeout"` | it did not answer in `timeoutMs` |
+
+Both are exported from `@exav/viewer/office`. A minimal module that implements
+the contract is `e2e/fixtures/fake-converter.js` in the repository.
+
+### In the sandboxed frame
+
+The conversion options are plain data: `sandbox.options.conversion` takes
+`timeoutMs`, `maxMemory`, `converter` and `externalConverter`, and the frame
+checks each. `externalConverter` there is a package name that the frame's
+manifest lists, or a path or an `http(s)` URL; anything else is dropped. The
+module is imported inside the frame, under the frame's policy, which loads
+scripts from the frame's own origin: copy the package beside the frame app
+with `exavViewer({ frameDir, externalConverter: "my-converter" })` (or
+`--frame` with `--external-converter`), which also adds it to the frame's
+manifest.
+
+```tsx
+const sandbox = {
+  url: "https://viewer-frame.example-files.com/exav-frame/index.html",
+  formats: BUILTIN_ORDER,
+  options: { conversion: { externalConverter: "my-converter" } },
+};
+```
 
 ## Caching and the reverse proxy
 
@@ -267,9 +457,9 @@ await viewer.prefetch(["pdf"]);
 What a precache list should keep out is what is large and used only when a
 file of its format is opened: the engines' workers and wasm (`*.worker-*.js`,
 `*_bg-*.wasm`, whose names keep a stable prefix after the bundler hashes
-them), `three`, the `@silurus/ooxml` engines and the CAD fonts. On a real
-app this was 21.8 MB of precache against 3.6 MB without them; the
-runtime cache above takes them when a file needs them.
+them), `three`, the `@silurus/ooxml` engines and the CAD fonts (the wasm
+[sizes](#two-kinds-of-files) are above). The runtime cache above takes them
+when a file needs them.
 
 `prefetch` loads each format's code and fetches the assets its plugin
 lists, six at a time; for PDF, the CMaps, standard fonts, ICC profiles and
@@ -340,6 +530,11 @@ Files from users are untrusted. Every engine bounds what a file may cost:
 the image decoders refuse more than 256 MiB of pixels (`maxDecodeBytes`),
 a drawing's layout stops at eight million strokes and fill vertices
 (`maxPrimitives`; lower it for devices with little memory) and a DWG's
-compressed sections at 512 MiB expanded (`maxDecompressedBytes`), archives stop at 512 MiB extracted, 5000 members and a ratio of 200 (the
-`archive()` options). exav's own decoders run in workers, and one that
-fails on a file is replaced for the next; the page is not affected.
+compressed sections at 512 MiB expanded (`maxDecompressedBytes`) and the
+entities read at a million (`maxEntities`), archives
+stop at 512 MiB extracted, 5000 members and a ratio of 200 (the `archive()`
+options), a document's ZIP at 20000 entries (`maxArchiveEntries`), and a
+conversion at 120 seconds (`timeoutMs`) and 1 GiB of memory (`maxMemory`;
+exav-render's converters count it themselves, up to 1.5 GiB). exav's own
+decoders run in workers, and one that fails on a file is replaced for the
+next; the page is not affected.
diff --git a/www/src/content/docs/viewer/react.md b/www/src/content/docs/viewer/react.md
index 63889ec8..8b5e501b 100644
--- a/www/src/content/docs/viewer/react.md
+++ b/www/src/content/docs/viewer/react.md
@@ -1,6 +1,6 @@
 ---
 title: React UI
-description: "@exav/viewer/react: ViewerProvider, ViewerBody and ViewerDialog, replacing any piece of the UI, the CSS custom properties, and the built-in English and French strings."
+description: "@exav/viewer/react: ViewerProvider, ViewerBody and ViewerDialog, replacing any piece of the UI, the CSS custom properties, and the built-in strings in five languages."
 ---
 
 `@exav/viewer/react` is the default UI, on React 19. It can be taken at
@@ -22,7 +22,7 @@ One viewer for the components inside it.
 | `plugins` | The plugins, run in the page. Keep the list stable (a module constant, or `useMemo`): a new list starts a new viewer. |
 | `viewer` | Instead of `plugins`: a viewer built elsewhere, used as it is (`createViewer`, or `createSandboxedViewer` from `@exav/viewer/frame`). |
 | `assetBase` | Where the [runtime files](/viewer/integration/) are served. Default `"/exav-viewer/"`. Not used with `viewer`. |
-| `locale` | Picks the built-in strings: `"fr"` and its variants for French, English otherwise. |
+| `locale` | Picks the built-in strings by language (`"fr"`, `"de-AT"`...): English, French, German, Spanish or Dutch; English otherwise. |
 | `translate` | Replaces the built-in strings: `(key, vars) => string`, for a host with its own i18n. |
 | `components` | Replaces pieces of the UI (below). |
 
@@ -30,7 +30,7 @@ One viewer for the components inside it.
 
 One file, filling its parent (give the parent a height). Its rails (a PDF's
 sections; a drawing's layouts, ground and layers) sit on its right, folded
-under 1024 px.
+under 1024 px. A button among the zoom buttons folds and unfolds them.
 
 | Prop | |
 |---|---|
@@ -68,7 +68,7 @@ import { SandboxedViewer, SandboxedViewerProvider } from "@exav/viewer/react/san
 <SandboxedViewer sandbox={{ url: "https://viewer-frame.example-files.com/exav-frame/index.html" }} file={file} locale="fr" />
 ```
 
-`sandbox` is `{ url, formats?, options?, confirmLink?, startTimeoutMs?, delivery?, origins? }`
+`sandbox` is `{ url, formats?, options?, confirmLink?, startTimeoutMs?, delivery?, origins?, keys?, theme? }`
 ([Core API](/viewer/api/#the-viewer-in-a-sandboxed-frame), [Security](/viewer/security/)),
 read once. The question before a document's link opens is the `link_confirm`
 string; `confirmLink` replaces it. `SandboxedViewerProvider` takes the
@@ -76,8 +76,11 @@ provider's `locale`, `translate` and `components`.
 
 In the sandboxed mode the rails, pager, archive list and dialog are the
 host page's, as in the page; what the engine draws is in the frame, whose
-inside the host's styles do not reach. A frame holds one file: a replaced
-source gets a new frame, and the zoom and position start over.
+inside the host's styles do not reach: the custom properties below are read
+where the file is mounted and sent to it (`theme`). The arrow keys and
+Escape pressed while the focus is in the document reach the dialog and the
+page, unless the document scrolls with them. A frame holds one file: a
+replaced source gets a new frame, and the zoom and position start over.
 
 ## ViewerDialog
 
@@ -125,16 +128,41 @@ const components = {
 | `OutlineRail` | `outline` | a PDF's sections |
 | `DrawingRail` | `layers`, `layouts`, `ground`, `selection` | drawings and models |
 | `SlidePager` | `pages` | a presentation's "Slide 2 / 9" |
+| `SheetTabs` | `sheets` | a workbook's sheets, as tabs below it, when there are several |
 | `ArchiveList` | `archive` | an archive's members |
 | `ArchiveBack` | `archive`, `name` | the bar back out of a member |
-| `InfoBadge` | `format`, `info` | an STL's triangle count |
 | `Warnings` | `warnings` | what a drawing or model lacks, or that the file was downloaded whole (with a button to dismiss it) |
-| `ZoomControls` | `zoom` | zoom out, zoom in (a quarter each) and fit, over the surface; shown for a mouse (`any-pointer: fine`) or when the browser reports no pointer (`none`), not on a touch screen, which pinches |
+| `ZoomControls` | `zoom` | zoom out, zoom in (a quarter each), and back to the fitted view once the zoom is not it, over the surface; shown for a mouse (`any-pointer: fine`) or when the browser reports no pointer (`none`), not on a touch screen, which pinches |
 | `DragToggle` | `drag` | a PDF zoomed past the viewer: a hand to move the page by dragging (the default), a text cursor to select text |
+| `FullscreenToggle` | none | the viewer's box in full screen and back, where the browser has full screen; it is the host page that asks for it, so the frame needs no permission |
+| `PanelToggle` | `open`, `title`, `hideLabel`, `icon`, `controls`, `toggle` | folds and unfolds the side panel; there when a rail is, on a touch screen too |
 
-The two last ones sit together at the bottom right of the surface. Replace one
+The four last ones sit together at the bottom right of the surface. The two
+toggles are buttons in one group, full screen then the panel's. Replace one
 with `() => null` to drop it, or with your own, which receives the controller.
 
+On a touch screen, which pinches and has no use for buttons for a mouse, the
+element that has the attribute `data-pointer-only` is hidden, and a group left
+with nothing else with it. The default zoom and drag groups and the full screen
+button have it; so does a replacement of yours that should go as they do. One
+without it is shown everywhere, which is what the panel toggle does.
+
+### Hooks for your own controls
+
+- `useFullscreen(() => element)` returns `{ supported, active, toggle }` for
+  the element you give (your own box, or a viewer's `.exav-viewer-body`). The
+  host page asks for full screen, so a sandboxed frame needs no permission. It
+  is what `FullscreenToggle` is made of.
+- `usePanel(info?)` returns `{ open, setOpen }`, the fold state of the side
+  panel, shared by the rails and the toggle (outside a viewer, always open). A
+  rail of your own gives `info` (`title`, `hideLabel`, `icon`, `controls`: its
+  id) and the default toggle shows for as long as it is mounted; draw nothing
+  when `open` is false. Without `info` it only reads and sets the state, as a
+  `PanelToggle` of your own may.
+- The zoom controller's `scale` is 1 at the fitted view: show your button back
+  to it when `Math.abs(scale - 1)` is more than a hundredth, as `ZoomControls`
+  does.
+
 ## Without the components
 
 ```tsx
@@ -165,25 +193,28 @@ Every colour, radius and size is a custom property, set on an ancestor or
 
 | Property | Default |
 |---|---|
-| `--exv-surface` | `#f1f5f9`, behind the file |
-| `--exv-panel` | `#ffffff`, rails and bars |
-| `--exv-border` | `#e2e8f0` |
-| `--exv-text`, `--exv-text-strong`, `--exv-muted`, `--exv-faint` | `#334155`, `#0f172a`, `#64748b`, `#94a3b8` |
-| `--exv-hover`, `--exv-active` | `#f8fafc`, `#f1f5f9` |
-| `--exv-accent`, `--exv-on-accent` | `#0f172a`, `#ffffff` |
-| `--exv-error`, `--exv-warning` | `#b91c1c`, `#b45309` |
-| `--exv-media-bg` | `#0f172a`, behind video |
-| `--exv-model-bg` | a light radial gradient, behind models |
-| `--exv-radius` | `0.375rem` |
-| `--exv-rail-width` | `15rem` |
-| `--exv-tap` | `2.75rem`, the smallest control |
-| `--exv-font` | `inherit` |
+| `--exav-viewer-surface` | `#f1f5f9`, behind the file |
+| `--exav-viewer-panel` | `#ffffff`, rails and bars |
+| `--exav-viewer-border` | `#e2e8f0` |
+| `--exav-viewer-text`, `--exav-viewer-text-strong`, `--exav-viewer-muted`, `--exav-viewer-faint` | `#334155`, `#0f172a`, `#64748b`, `#94a3b8` |
+| `--exav-viewer-hover`, `--exav-viewer-active` | `#f8fafc`, `#f1f5f9` |
+| `--exav-viewer-accent`, `--exav-viewer-on-accent` | `#0f172a`, `#ffffff` |
+| `--exav-viewer-error`, `--exav-viewer-warning` | `#b91c1c`, `#b45309` |
+| `--exav-viewer-media-bg` | `#0f172a`, behind video |
+| `--exav-viewer-model-bg` | a light radial gradient, behind models |
+| `--exav-viewer-radius` | `0.375rem` |
+| `--exav-viewer-rail-width` | `15rem` |
+| `--exav-viewer-tap` | `2.75rem`, the smallest control |
+| `--exav-viewer-pager-room` | `4.5rem`, kept free below a slide for the pager over it |
+| `--exav-viewer-font` | `inherit` |
 
 The demo sets them for a dark theme under `prefers-color-scheme: dark`.
 
 ## Strings
 
-`MESSAGES` holds the built-in English and French strings, by key. Plural
+`MESSAGES` holds the built-in English, French, German, Spanish and Dutch
+strings, by key; `locale` picks one by its language, English otherwise
+(also exported from `@exav/viewer`, for a host without React). Plural
 keys end in `_one` and `_other`; a `translate` function receives the key
 without the suffix and a `count`. Variables are written `{{name}}`:
 
diff --git a/www/src/content/docs/viewer/security.md b/www/src/content/docs/viewer/security.md
index 816f68a2..a480341c 100644
--- a/www/src/content/docs/viewer/security.md
+++ b/www/src/content/docs/viewer/security.md
@@ -41,7 +41,10 @@ const sandbox = { url: "https://viewer-frame.example-files.com/index.html" };
 ```
 
 The default UI (rails, pager, archive list, dialog) stays in the host page;
-what the engine draws is in the frame.
+what the engine draws is in the frame. A host that draws its own UI does the
+same from the session's controllers ([Core API](/viewer/api/#the-viewer-in-a-sandboxed-frame)):
+page fields, zoom, sheet tabs, a player's controls, thumbnails and printing
+all live in the page, and the frame holds the document alone.
 
 ### What makes it hold
 
@@ -55,9 +58,13 @@ These are properties of the browser, not of the viewer's code:
 - **No way out of the frame.** Without `allow-popups`,
   `allow-top-navigation`, `allow-downloads`, `allow-forms` or
   `allow-modals`, it cannot open a window, navigate the page, start a
-  download, submit a form or show a dialog. `allow=""` refuses it every
-  powerful feature (camera, microphone, location, clipboard, fullscreen,
-  payment...).
+  download, submit a form or show a dialog. `allow="autoplay"` and the
+  frame's `Permissions-Policy` refuse it every powerful feature (camera,
+  microphone, location, clipboard, fullscreen, payment...) but autoplay:
+  without it, a player started by the page's own controls would refuse to
+  play, as the click was in the page and not in the frame. What a
+  compromised frame gains from it is sound or video starting by itself,
+  once the user has interacted with the page.
 - **Its own policy.** The frame's page is served with this
   Content-Security-Policy:
 
@@ -94,17 +101,62 @@ be named) and carries nothing else. Everything else goes over the port:
 
 | From | Messages |
 |---|---|
-| host | `open` (the file as its delivery says, below; its name and type, the formats, the plugin options as plain data), `command` (go to a page, zoom, fit, a layer on or off, a layout, the ground, open or leave an archive member), `bytes` (the answer to a `read`) |
-| frame | `ready` (with its page's policy), `status`, `controllers` and `state` (each controller's value), `done` (a command finished), `link`, `read` and `cancel` (bytes of a file read by ranges) |
+| host | `open` (the file as its delivery says, below; its name and type, the paths of the files around it when it has a tree, the formats, the plugin options as plain data, the theme), `command` (go to a page, zoom, fit, a layer on or off, a layout, the ground, open or leave an archive member, a sheet, play, pause, seek, the volume), `bytes` (the answer to a `read` or a `fetch`), `theme` (the page's colours again), `replace` (the next document of the session, delivered as `open` delivers the first), `raster` and `unraster` (a page as a picture, with its size and region; stop drawing it), `watch` and `unwatch` (follow the viewport, whose upkeep costs: from a first listener or a read to the last one leaving) |
+| frame | `ready` (with its page's policy), `status`, `controllers` and `state` (each controller's value; the viewport's only while the host watches it), `done` (a command finished), `replaced` (a `replace` finished, or refused), `link`, `read` and `cancel` (bytes of a file read by ranges, the read naming the document it is for), `fetch` (a whole file of the tree the host listed, by its path), `key` (a key the document did not use), `rastered` (the picture asked for, with the region it shows, or why there is none) |
+
+The protocol is versioned: the frame says which in `ready` (`PROTOCOL`, now 5),
+and a host that does not speak it refuses the frame, so the page and the frame
+must come from the same release. Version 5 added `replace`, `raster`,
+`unraster`, `watch`, `unwatch` and the `viewport` controller, put the document
+in each `read`, and replaced `draw` and `drawn`. A `raster` the frame finds
+malformed is answered by a `rastered` that says `invalid`.
+
+A file shown with others around it (a drawing with the files its external
+references name, a split archive's parts) has a tree: the host lists the paths
+in `open`, and the frame asks for a file by one of them with `fetch`. The host
+answers only for a path it listed, spelled as it listed it, reads at most
+256 MiB for it and keeps eight reads and fetches outstanding at most; any other
+path, a file too large or a tree the file has none of is refused. A frame can
+know, then, only the names the user gave the page together with the file, and
+read no file the page did not hold.
+
+A `replace` puts the next document in the frame's session, so that the zoom
+and the scroll position stay (PDF, images). Only one is with the frame at a
+time: while it is, the next is read by the host and waits for the answer,
+and a newer call supersedes one still being read. Both documents' bytes stay
+readable by their own `generation` until the frame answers `replaced`; after
+it, a read of the old one is refused, so the frame can never be answered with
+the new file's bytes for the old document's read. The host sends a
+replacement only if the file's format is the one on screen and it is
+delivered the way the first was (an image shown from a URL stays one: its
+engine was made for it); otherwise `session.replace` resolves `false` and the
+caller mounts a new session.
 
 The host treats every message from the frame as hostile: each is checked
 against the protocol's shapes (`ts/frame/protocol.ts`), copied field by
 field, and dropped whole if any part does not match. Strings have length
-limits and lists item limits; a colour must be hex, `rgb()` or `hsl()` of
+limits and lists item limits; a colour must be hex or a colour function of
 numbers (a CSS value could otherwise be a `url()` the host would fetch);
-message keys are plain words. The default UI shows every string as text.
-A frame that loads a second document, having navigated itself away, is
-removed and its file reported unreadable.
+message keys are plain words; a player's numbers are within their ranges.
+The default UI shows every string as text. A frame that loads a second
+document, having navigated itself away, is removed and its file reported
+unreadable.
+
+A picture is an `ImageBitmap` of at most 16,384 pixels a side and 64 Mi
+pixels in all, transferred: pixels only, which the host draws, prints or
+encodes itself (the document's code never writes an image file or touches
+the host's canvases); anything else is no picture, one that is not the size
+asked for is a failure, and at most 8 are asked for at once. The options of a
+`raster` (size, region, layout, fit, line weight, background) are checked
+on both sides: numbers finite and bounded, a colour a hex value or a colour
+function, never a `url()`. A key is one of Escape, the arrows,
+Page Up and Down, Home and End, without Ctrl, Alt or Meta, at most 30 a
+second, and only those the host listed (`keys`); it reaches the page as a
+`keydown` dispatched on the `<iframe>`, `isTrusted` false. A frame could
+press those keys at will (move to the next file, close the viewer), never
+type or press a shortcut. The theme goes the other way, and the frame
+checks it too: known properties only, colours, lengths and font names, so
+that nothing in it is a URL.
 
 A link the user follows in a document (a PDF's links, Word, Excel and
 PowerPoint hyperlinks) becomes a `link` message. The host takes absolute `http:` and
@@ -191,7 +243,7 @@ Every file under the frame's directory gets these headers:
 | Header | Value |
 |---|---|
 | `Content-Security-Policy` | the policy above, then `; frame-ancestors https://app.example.com; sandbox allow-scripts` |
-| `Permissions-Policy` | every feature refused: `accelerometer=(), autoplay=(), camera=(), clipboard-read=(), clipboard-write=(), display-capture=(), encrypted-media=(), fullscreen=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), identity-credentials-get=(), idle-detection=(), local-fonts=(), magnetometer=(), microphone=(), midi=(), otp-credentials=(), payment=(), picture-in-picture=(), publickey-credentials-create=(), publickey-credentials-get=(), screen-wake-lock=(), serial=(), storage-access=(), usb=(), window-management=(), xr-spatial-tracking=()` |
+| `Permissions-Policy` | every feature refused but autoplay: `autoplay=*, accelerometer=(), camera=(), clipboard-read=(), clipboard-write=(), display-capture=(), encrypted-media=(), fullscreen=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), identity-credentials-get=(), idle-detection=(), local-fonts=(), magnetometer=(), microphone=(), midi=(), otp-credentials=(), payment=(), picture-in-picture=(), publickey-credentials-create=(), publickey-credentials-get=(), screen-wake-lock=(), serial=(), storage-access=(), usb=(), window-management=(), xr-spatial-tracking=()` |
 | `Referrer-Policy` | `no-referrer` |
 | `X-Content-Type-Options` | `nosniff` |
 | `Access-Control-Allow-Origin` | `*`: required, the opaque-origin frame and its workers fetch their own scripts and wasm in CORS mode |
@@ -201,7 +253,7 @@ Every file under the frame's directory gets these headers:
 frame stays sandboxed even when opened on its own) work only as headers. The
 frame's `index.html` carries the policy in a meta tag as well, for static
 hosts that set no headers (GitHub Pages): there, the iframe's `sandbox`
-attribute is what isolates it. `frameHeaders(frameAncestors, origin)` from
+attribute is what isolates it. `frameHeaders(frameAncestors, origin, origins)` from
 `@exav/viewer/frame` returns these headers, and the Vite plugin sets them
 in development and `vite preview`.
 
@@ -223,7 +275,7 @@ full list above):
 ```nginx
 location /exav-frame/ {
     add_header Content-Security-Policy "default-src 'none'; script-src 'self' https://viewer-frame.example-files.com 'wasm-unsafe-eval'; worker-src blob:; connect-src 'self' https://viewer-frame.example-files.com; img-src 'self' https://viewer-frame.example-files.com blob: data:; font-src 'self' https://viewer-frame.example-files.com blob: data:; media-src blob:; style-src 'self' https://viewer-frame.example-files.com 'sha256-cNjvEN1YtFd5aB7iXA1oXslKUFoYbgxutdTl7pOEOTA='; base-uri 'none'; form-action 'none'; object-src 'none'; frame-src 'none'; require-trusted-types-for 'script'; trusted-types exav-worker default; frame-ancestors https://app.example.com; sandbox allow-scripts" always;
-    add_header Permissions-Policy "camera=(), microphone=(), geolocation=(), payment=(), usb=(), clipboard-read=(), clipboard-write=(), fullscreen=()" always;
+    add_header Permissions-Policy "autoplay=*, camera=(), microphone=(), geolocation=(), payment=(), usb=(), clipboard-read=(), clipboard-write=(), fullscreen=()" always;
     add_header Referrer-Policy "no-referrer" always;
     add_header X-Content-Type-Options "nosniff" always;
     add_header Access-Control-Allow-Origin "*" always;
@@ -238,7 +290,7 @@ Caddy:
 @frame path /exav-frame/*
 header @frame {
 	Content-Security-Policy "default-src 'none'; script-src 'self' https://viewer-frame.example-files.com 'wasm-unsafe-eval'; worker-src blob:; connect-src 'self' https://viewer-frame.example-files.com; img-src 'self' https://viewer-frame.example-files.com blob: data:; font-src 'self' https://viewer-frame.example-files.com blob: data:; media-src blob:; style-src 'self' https://viewer-frame.example-files.com 'sha256-cNjvEN1YtFd5aB7iXA1oXslKUFoYbgxutdTl7pOEOTA='; base-uri 'none'; form-action 'none'; object-src 'none'; frame-src 'none'; require-trusted-types-for 'script'; trusted-types exav-worker default; frame-ancestors https://app.example.com; sandbox allow-scripts"
-	Permissions-Policy "camera=(), microphone=(), geolocation=(), payment=(), usb=(), clipboard-read=(), clipboard-write=(), fullscreen=()"
+	Permissions-Policy "autoplay=*, camera=(), microphone=(), geolocation=(), payment=(), usb=(), clipboard-read=(), clipboard-write=(), fullscreen=()"
 	Referrer-Policy "no-referrer"
 	X-Content-Type-Options "nosniff"
 	Access-Control-Allow-Origin "*"
@@ -253,7 +305,8 @@ package is updated. The frame's files are named without hashes: serve them
 
 The host page needs `frame-src` (or `child-src`) to allow the frame's
 origin. In this mode it needs none of what the engines need: no
-`'wasm-unsafe-eval'`, no `worker-src blob:`, no `blob:` sources.
+`'wasm-unsafe-eval'`, no `worker-src blob:`, no `blob:` sources, no
+`'unsafe-inline'` styles; `img-src blob:` only to print (`printPictures`).
 
 ## Per browser
 
@@ -277,8 +330,8 @@ Playwright runs:
 | a frame that navigates away is dropped | tested | tested | tested |
 | every format opens | tested | tested, but WebGL formats (DWG, DXF, IFC, STL): no WebGL in the headless Firefox of the test machine | tested |
 
-Browsers implement `Permissions-Policy` unevenly; the iframe's `allow=""`
-refuses the same features from the host's side. In Firefox and WebKit, a
+Browsers implement `Permissions-Policy` unevenly; the iframe's
+`allow` attribute refuses the same features from the host's side. In Firefox and WebKit, a
 frame that tries a download navigates itself to the file instead: the
 host's `frame-src` refuses it, and the host drops the frame.
 
@@ -313,7 +366,7 @@ policy's SVG rule, and the reviewed sinks in the dependencies (below).
 
   | Module | May import | Memory |
   |---|---|---|
-  | exav_viewer_image, exav_viewer_dwg, exav_viewer_model, the two pdf.js decoders | wasm-bindgen's plumbing (errors, its tables): no global, clock, randomness or I/O | capped: 1 GiB, 2 GiB, 3 GiB, 1 GiB, 1 GiB |
+  | exav_viewer_image, exav_viewer_dwg, exav_viewer_model, exav_viewer_text, exav_viewer_sheets, exav_viewer_slides, exav_viewer_docs, the two pdf.js decoders | wasm-bindgen's plumbing (errors, its tables): no global, clock, randomness or I/O | capped: 1 GiB, 2 GiB, 3 GiB, 256 MiB, 2 GiB, 2 GiB, 2 GiB, 1 GiB, 1 GiB |
   | @exav/unpack-wasm | plumbing, `FileReaderSync` on the archive's `Blob`, a reader function the caller passes, arrays of members | 4 GiB |
   | @silurus/ooxml's three parsers | plumbing, and a panic's message to `console.error` | 4 GiB |
   | pdf.js's qcms | plumbing, a callback copying converted colours out | 4 GiB |
@@ -328,7 +381,10 @@ policy's SVG rule, and the reviewed sinks in the dependencies (below).
   once), 2 GiB for drawings (the largest real drawing measured, 14 MB with
   75 layouts, peaks at 1.2 GiB), 3 GiB for IFC and STL models (the file,
   its index and the meshes twice for the default 6 million triangles fit in
-  1.5), 1 GiB for each image pdf.js hands its
+  1.5), 256 MiB for Markdown (a 2 MiB file, a tree of at most 100,000
+  nodes), 2 GiB for each Office converter (the file, and the document and
+  the package written, which the converter counts against its own limit of
+  1 GiB by default), 1 GiB for each image pdf.js hands its
   decoders. A test decodes a picture whose RGBA copy needs more than its
   module's cap, and expects the trap and a fresh instance to work.
 - **The policies, in the browser**: the demo's browser tests run each
@@ -346,6 +402,13 @@ policy's SVG rule, and the reviewed sinks in the dependencies (below).
   others) inside its frame. Timeouts stop exav's decoders; the frame is
   removed when the user moves on. In Chromium a cross-site frame has a
   process of its own; a same-site one may share the host's.
+- **An external converter.** It is code the host chooses and installs, and it
+  reads the hostile file with whatever engine it carries. In the sandboxed
+  mode it runs in the frame, under the frame's policy like every engine; in
+  the page, it has the page's rights. Its memory is the browser's: the
+  `maxMemory` it is handed is a request it has to honour, and the viewer stops
+  waiting after `timeoutMs`. The package's own converters (spreadsheets,
+  presentations, drawings, text documents) need none.
 - **Misleading content.** A document draws what it likes in its frame,
   including what looks like the host's own UI or a message telling the user
   to visit an address. It cannot submit a form, open a window or send